diff --git a/.eslintrc b/.eslintrc
new file mode 100644
index 0000000..452f3ec
--- /dev/null
+++ b/.eslintrc
@@ -0,0 +1,136 @@
+{
+	"env": {
+		"browser": true,
+		"node": true,
+		"es6": true
+	},
+	"extends": "eslint:recommended",
+	"rules": {
+		"indent": [
+			"error",
+			"tab",
+			{ "SwitchCase": 1 }
+		],
+		"linebreak-style": [
+			"error",
+			"unix"
+		],
+		"quotes": [
+			"off"
+		],
+		"semi": [
+			"warn",
+			"always"
+		],
+		"camelcase": [
+			"off"
+		],
+		"no-unused-vars": [
+			"warn"
+		],
+		"no-redeclare": [
+			"warn"
+		],
+		"no-console": [
+			"warn"
+		],
+		"no-extra-boolean-cast": [
+			"off"
+		],
+		"no-control-regex": [
+			"off"
+		],
+		"spaced-comment": [
+			"warn"
+		],
+		"no-trailing-spaces": [
+			"warn"
+		]
+	},
+	"root": true,
+	"globals": {
+		"frappe": true,
+		"erpnext": true,
+		"schools": true,
+
+		"$": true,
+		"jQuery": true,
+		"moment": true,
+		"hljs": true,
+		"Awesomplete": true,
+		"CalHeatMap": true,
+		"Sortable": true,
+		"Showdown": true,
+		"Taggle": true,
+		"Gantt": true,
+		"Slick": true,
+		"PhotoSwipe": true,
+		"PhotoSwipeUI_Default": true,
+		"fluxify": true,
+		"io": true,
+		"c3": true,
+		"__": true,
+		"_p": true,
+		"_f": true,
+		"repl": true,
+		"Class": true,
+		"locals": true,
+		"cint": true,
+		"cstr": true,
+		"cur_frm": true,
+		"cur_dialog": true,
+		"cur_page": true,
+		"cur_list": true,
+		"cur_tree": true,
+		"msg_dialog": true,
+		"is_null": true,
+		"in_list": true,
+		"has_common": true,
+		"has_words": true,
+		"validate_email": true,
+		"get_number_format": true,
+		"format_number": true,
+		"format_currency": true,
+		"round_based_on_smallest_currency_fraction": true,
+		"roundNumber": true,
+		"comment_when": true,
+		"replace_newlines": true,
+		"open_url_post": true,
+		"toTitle": true,
+		"lstrip": true,
+		"strip": true,
+		"strip_html": true,
+		"replace_all": true,
+		"flt": true,
+		"precision": true,
+		"md5": true,
+		"CREATE": true,
+		"AMEND": true,
+		"CANCEL": true,
+		"copy_dict": true,
+		"get_number_format_info": true,
+		"print_table": true,
+		"Layout": true,
+		"web_form_settings": true,
+		"$c": true,
+		"$a": true,
+		"$i": true,
+		"$bg": true,
+		"$y": true,
+		"$c_obj": true,
+		"$c_obj_csv": true,
+		"refresh_many": true,
+		"refresh_field": true,
+		"toggle_field": true,
+		"get_field_obj": true,
+		"get_query_params": true,
+		"unhide_field": true,
+		"hide_field": true,
+		"set_field_options": true,
+		"getCookie": true,
+		"getCookies": true,
+		"get_url_arg": true,
+		"get_server_fields": true,
+		"set_multiple": true
+	}
+}
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index f9eb269..a6b5b72 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.0.47'
+__version__ = '8.0.50'
 
 
 def get_default_company(user=None):
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index 4c04fc6..8a9a439 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -2,26 +2,26 @@
 // License: GNU General Public License v3. See license.txt
 
 
-cur_frm.cscript.refresh = function(doc, cdt, cdn) {
-	if(doc.__islocal) {
-		msgprint(__("Please create new account from Chart of Accounts."));
+cur_frm.cscript.refresh = function (doc, cdt, cdn) {
+	if (doc.__islocal) {
+		frappe.msgprint(__("Please create new account from Chart of Accounts."));
 		throw "cannot create";
 	}
 
 	cur_frm.toggle_display('account_name', doc.__islocal);
 
 	// hide fields if group
-	cur_frm.toggle_display(['account_type', 'tax_rate'], cint(doc.is_group)==0)
+	cur_frm.toggle_display(['account_type', 'tax_rate'], cint(doc.is_group) == 0)
 
 	// disable fields
 	cur_frm.toggle_enable(['account_name', 'is_group', 'company'], false);
 
-	if(cint(doc.is_group)==0) {
+	if (cint(doc.is_group) == 0) {
 		cur_frm.toggle_display('freeze_account', doc.__onload && doc.__onload.can_freeze_account);
 	}
 
 	// read-only for root accounts
-	if(!doc.parent_account) {
+	if (!doc.parent_account) {
 		cur_frm.set_read_only();
 		cur_frm.set_intro(__("This is a root account and cannot be edited."));
 	} else {
@@ -38,53 +38,53 @@
 cur_frm.add_fetch('parent_account', 'report_type', 'report_type');
 cur_frm.add_fetch('parent_account', 'root_type', 'root_type');
 
-cur_frm.cscript.account_type = function(doc, cdt, cdn) {
-	if(doc.is_group==0) {
+cur_frm.cscript.account_type = function (doc, cdt, cdn) {
+	if (doc.is_group == 0) {
 		cur_frm.toggle_display(['tax_rate'], doc.account_type == 'Tax');
-		cur_frm.toggle_display('warehouse', doc.account_type=='Stock');
+		cur_frm.toggle_display('warehouse', doc.account_type == 'Stock');
 	}
 }
 
-cur_frm.cscript.add_toolbar_buttons = function(doc) {
+cur_frm.cscript.add_toolbar_buttons = function (doc) {
 	cur_frm.add_custom_button(__('Chart of Accounts'),
-		function() { frappe.set_route("Tree", "Account"); });
+		function () { frappe.set_route("Tree", "Account"); });
 
 	if (doc.is_group == 1) {
 		cur_frm.add_custom_button(__('Group to Non-Group'),
-			function() { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
+			function () { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
 	} else if (cint(doc.is_group) == 0) {
-		cur_frm.add_custom_button(__('Ledger'), function() {
+		cur_frm.add_custom_button(__('Ledger'), function () {
 			frappe.route_options = {
 				"account": doc.name,
-				"from_date": sys_defaults.year_start_date,
-				"to_date": sys_defaults.year_end_date,
+				"from_date": frappe.sys_defaults.year_start_date,
+				"to_date": frappe.sys_defaults.year_end_date,
 				"company": doc.company
 			};
 			frappe.set_route("query-report", "General Ledger");
 		});
 
 		cur_frm.add_custom_button(__('Non-Group to Group'),
-			function() { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
+			function () { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
 	}
 }
 
-cur_frm.cscript.convert_to_ledger = function(doc, cdt, cdn) {
-  return $c_obj(cur_frm.doc,'convert_group_to_ledger','',function(r,rt) {
-    if(r.message == 1) {
-	  cur_frm.refresh();
-    }
-  });
+cur_frm.cscript.convert_to_ledger = function (doc, cdt, cdn) {
+	return $c_obj(cur_frm.doc, 'convert_group_to_ledger', '', function (r, rt) {
+		if (r.message == 1) {
+			cur_frm.refresh();
+		}
+	});
 }
 
-cur_frm.cscript.convert_to_group = function(doc, cdt, cdn) {
-  return $c_obj(cur_frm.doc,'convert_ledger_to_group','',function(r,rt) {
-    if(r.message == 1) {
-	  cur_frm.refresh();
-    }
-  });
+cur_frm.cscript.convert_to_group = function (doc, cdt, cdn) {
+	return $c_obj(cur_frm.doc, 'convert_ledger_to_group', '', function (r, rt) {
+		if (r.message == 1) {
+			cur_frm.refresh();
+		}
+	});
 }
 
-cur_frm.fields_dict['parent_account'].get_query = function(doc) {
+cur_frm.fields_dict['parent_account'].get_query = function (doc) {
 	return {
 		filters: {
 			"is_group": 1,
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 3c9f233..0489f9a 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 1, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "beta": 0, 
@@ -407,35 +408,6 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warehouse", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fieldname": "balance_must_be", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -545,18 +517,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-money", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:22:49.249075", 
+ "modified": "2017-04-21 17:22:41.150984", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Account", 
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 189d377..0787a1f 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -35,7 +35,6 @@
 		self.validate_group_or_ledger()
 		self.set_root_and_report_type()
 		self.validate_mandatory()
-		self.validate_warehouse_account()
 		self.validate_frozen_accounts_modifier()
 		self.validate_balance_must_be_debit_or_credit()
 		self.validate_account_currency()
@@ -162,46 +161,6 @@
 		if not self.report_type:
 			throw(_("Report Type is mandatory"))
 
-	def validate_warehouse_account(self):
-		'''If perpetual inventory is set, and warehouse is linked,
-		the account balance and stock balance as of now must always match.
-		'''
-		from erpnext.accounts.utils import get_balance_on
-		from erpnext.stock.utils import get_stock_value_on
-		if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
-			return
-
-		if self.account_type == "Stock":
-			if self.is_group == 0 and not self.warehouse:
-				frappe.throw(_("Warehouse is mandatory for non group Accounts of type Stock"))
-
-			if self.warehouse:
-				# company must be same
-				if frappe.get_value('Warehouse', self.warehouse, 'company') != self.company:
-					frappe.throw(_("Warehouse company must be same as Account company"))
-
-				# balance must be same
-				stock_balance = get_stock_value_on(self.warehouse)
-				if self.is_new():
-					account_balance = 0.0
-				else:
-					account_balance = get_balance_on(self.name)
-
-				if account_balance != stock_balance:
-					frappe.throw(_('Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same')
-						.format(fmt_money(account_balance, currency=self.account_currency), self.name, 
-							fmt_money(stock_balance, currency=self.account_currency), self.warehouse))
-
-		elif self.warehouse:
-			self.warehouse = None
-
-	def validate_warehouse(self, warehouse):
-		lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
-
-		if lft and rgt:
-			if frappe.db.sql_list("""select sle.name from `tabStock Ledger Entry` sle where exists (select wh.name from
-				tabWarehouse wh where lft >= %s and rgt <= %s and sle.warehouse = wh.name)""", (lft, rgt)):
-				throw(_("Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it").format(warehouse))
 
 	def update_nsm_model(self):
 		"""update lft, rgt indices for nested set model"""
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 1fbbf4f..b803984 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -37,16 +37,6 @@
 		},
 		{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
 			depends_on: 'eval:doc.is_group==0&&doc.account_type=="Tax"'},
-		{fieldtype:'Link', fieldname:'warehouse', label:__('Warehouse'), options:"Warehouse",
-			depends_on: 'eval:(!doc.is_group&&doc.account_type=="Stock")',
-			get_query: function() {
-				return {
-					filters:{
-						"company": frappe.treeview_settings.filters["company"]
-					}
-				}
-			}
-		},
 		{fieldtype:'Link', fieldname:'account_currency', label:__('Currency'), options:"Currency",
 			description: __("Optional. Sets company's default currency, if not specified.")}
 	],
@@ -72,8 +62,8 @@
 			click: function(node, btn) {
 				frappe.route_options = {
 					"account": node.label,
-					"from_date": sys_defaults.year_start_date,
-					"to_date": sys_defaults.year_end_date,
+					"from_date": frappe.sys_defaults.year_start_date,
+					"to_date": frappe.sys_defaults.year_end_date,
 					"company": frappe.defaults.get_default('company') ? frappe.defaults.get_default('company'): ""
 				};
 				frappe.set_route("query-report", "General Ledger");
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 a5c551f..adb7bc1 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
@@ -117,7 +117,7 @@
 
 def get_account_tree_from_existing_company(existing_company):
 	all_accounts = frappe.get_all('Account', 
-		filters={'company': existing_company, "warehouse": ""}, 
+		filters={'company': existing_company}, 
 		fields = ["name", "account_name", "parent_account", "account_type", 
 			"is_group", "root_type", "tax_rate"], 
 		order_by="lft, rgt")
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 9d610dc..cae4c3c 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
@@ -88,7 +88,6 @@
                         "Items Delivered to Customs on temprary Base": {}
                     }, 
                     "Stock in Hand": {
-						"is_group": 1,
                         "account_type": "Stock"
                     }
                 }, 
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json
index 834cf3d..ec12810 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json
@@ -65,8 +65,9 @@
                 "account_type": "Fixed Asset"
             }, 
             "Stock": {
-                "account_type": "Stock", 
-                "is_group": 1
+                "Stock in Hand": {
+                    "account_type": "Stock"
+                }
             }, 
             "root_type": "Asset"
         }, 
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 b3c7891..2f5dbf3 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
@@ -26,8 +26,9 @@
 	                "Earnest Money": {}
 	            },
 	            "Stock Assets": {
-	                "account_type": "Stock",
-					"is_group": 1
+					"Stock in Hand": {
+		                "account_type": "Stock"							
+					}
 	            },
 	            "Tax Assets": {
 					"is_group": 1
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
index 976150f..594ab99 100644
--- 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
@@ -40,8 +40,9 @@
                     "Rental Deposits": {}
                 }, 
                 "Stock Assets": {
-					"is_group": 1,
-                    "account_type": "Stock"
+                    "Stock in Hand": {
+                        "account_type": "Stock"
+                    }
                 }, 
                 "Tax Assets": {
                     "GST-Input": {}
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
index 15c2468..444465d 100644
--- 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
@@ -40,8 +40,9 @@
 					"Rental Deposits": {}
 				},
 				"Stock Assets": {
-					"account_type": "Stock",
-					"is_group": 1
+                    "Stock in Hand": {
+                        "account_type": "Stock"
+                    }
 				},
 				"Tax Assets": {
 					"GST-Input": {}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
index 1a541ca..5452040 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py
@@ -30,8 +30,10 @@
 	                _("Earnest Money"): {}
 	            },
 	            _("Stock Assets"): {
+	                _("Stock In Hand"): {
+	                    "account_type": "Stock"
+	                },
 	                "account_type": "Stock",
-					"is_group": 1
 	            },
 	            _("Tax Assets"): {
 					"is_group": 1
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index 5744721..c609443 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -3,6 +3,8 @@
 
 from __future__ import unicode_literals
 import frappe
+from erpnext.stock import get_warehouse_account, get_company_default_inventory_account
+
 
 def _make_test_records(verbose):
 	from frappe.test_runner import make_test_objects
@@ -63,3 +65,24 @@
 			} for account_name, parent_account, is_group, account_type, currency in accounts])
 
 	return test_objects
+
+def get_inventory_account(company, warehouse=None):
+	account = None
+	if warehouse:
+		account = get_warehouse_account(warehouse, company)
+	else:
+		account = get_company_default_inventory_account(company)
+
+	return account
+
+def create_account(**kwargs):
+	account = frappe.get_doc(dict(
+		doctype = "Account",
+		account_name = kwargs.get('account_name'),
+		account_type = kwargs.get('account_type'),
+		parent_account = kwargs.get('parent_account'),
+		company = kwargs.get('company')
+	))
+	
+	account.save()
+	return account.name
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
index 52e1b63..4246755 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.py
@@ -20,15 +20,9 @@
 				company.flags.ignore_permissions = True
 				company.save()
 
-			# Create account head for warehouses
-			warehouse_list = frappe.db.sql("""select name, company from tabWarehouse 
-				where disabled=0""", as_dict=1)
-			warehouse_with_no_company = [d.name for d in warehouse_list if not d.company]
+			# validate warehouse linked to company
+			warehouse_with_no_company = frappe.db.sql_list("""select name from tabWarehouse 
+				where disabled=0 and company is null or company = ''""")
 			if warehouse_with_no_company:
 				frappe.throw(_("Company is missing in warehouses {0}")
-					.format(comma_and(warehouse_with_no_company)))
-					
-			for wh in warehouse_list:
-				wh_doc = frappe.get_doc("Warehouse", wh.name)
-				wh_doc.flags.ignore_permissions = True
-				wh_doc.save()
+					.format(comma_and(warehouse_with_no_company)))
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset/asset.js b/erpnext/accounts/doctype/asset/asset.js
index a1b3dd3..7c4eeae 100644
--- a/erpnext/accounts/doctype/asset/asset.js
+++ b/erpnext/accounts/doctype/asset/asset.js
@@ -14,7 +14,7 @@
 				}
 			};
 		});
-		
+
 		frm.set_query("warehouse", function() {
 			return {
 				"filters": {
@@ -24,12 +24,12 @@
 			};
 		});
 	},
-	
+
 	refresh: function(frm) {
 		frappe.ui.form.trigger("Asset", "is_existing_asset");
 		frm.toggle_display("next_depreciation_date", frm.doc.docstatus < 1);
 		frm.events.make_schedules_editable(frm);
-				
+
 		if (frm.doc.docstatus==1) {
 			if (frm.doc.status=='Submitted' && !frm.doc.is_existing_asset && !frm.doc.purchase_invoice) {
 				frm.add_custom_button("Make Purchase Invoice", function() {
@@ -40,60 +40,60 @@
 				frm.add_custom_button("Transfer Asset", function() {
 					erpnext.asset.transfer_asset(frm);
 				});
-				
+
 				frm.add_custom_button("Scrap Asset", function() {
 					erpnext.asset.scrap_asset(frm);
 				});
-				
+
 				frm.add_custom_button("Sell Asset", function() {
 					erpnext.asset.make_sales_invoice(frm);
 				});
-				
+
 			} else if (frm.doc.status=='Scrapped') {
 				frm.add_custom_button("Restore Asset", function() {
 					erpnext.asset.restore_asset(frm);
 				});
 			}
-			
+
 			frm.trigger("show_graph");
 		}
 	},
-	
-	show_graph: function(frm) {		
+
+	show_graph: function(frm) {
 		var x_intervals = ["x", frm.doc.purchase_date];
 		var asset_values = ["Asset Value", frm.doc.gross_purchase_amount];
 		var last_depreciation_date = frm.doc.purchase_date;
-		
+
 		if(frm.doc.opening_accumulated_depreciation) {
-			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date, 
+			last_depreciation_date = frappe.datetime.add_months(frm.doc.next_depreciation_date,
 				-1*frm.doc.frequency_of_depreciation);
-			
+
 			x_intervals.push(last_depreciation_date);
-			asset_values.push(flt(frm.doc.gross_purchase_amount) - 
+			asset_values.push(flt(frm.doc.gross_purchase_amount) -
 				flt(frm.doc.opening_accumulated_depreciation));
 		}
-		
+
 		$.each(frm.doc.schedules || [], function(i, v) {
 			x_intervals.push(v.schedule_date);
-			asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
-			if(v.journal_entry) {				
+			var asset_value = flt(frm.doc.gross_purchase_amount) - flt(v.accumulated_depreciation_amount);
+			if(v.journal_entry) {
 				last_depreciation_date = v.schedule_date;
 				asset_values.push(asset_value)
 			} else {
 				if (in_list(["Scrapped", "Sold"], frm.doc.status)) {
-	 				asset_values.push(null)
+					asset_values.push(null)
 				} else {
 					asset_values.push(asset_value)
 				}
 			}
 		})
-		
+
 		if(in_list(["Scrapped", "Sold"], frm.doc.status)) {
 			x_intervals.push(frm.doc.disposal_date);
 			asset_values.push(0);
 			last_depreciation_date = frm.doc.disposal_date;
 		}
-		
+
 		frm.dashboard.setup_chart({
 			data: {
 				x: 'x',
@@ -117,9 +117,9 @@
 					padding: {bottom: 10}
 				}
 			}
-		});		
+		});
 	},
-	
+
 	item_code: function(frm) {
 		if(frm.doc.item_code) {
 			frappe.call({
@@ -137,27 +137,27 @@
 			})
 		}
 	},
-	
+
 	is_existing_asset: function(frm) {
 		frm.toggle_enable("supplier", frm.doc.is_existing_asset);
 		frm.toggle_reqd("next_depreciation_date", !frm.doc.is_existing_asset);
 	},
-	
+
 	opening_accumulated_depreciation: function(frm) {
 		erpnext.asset.set_accululated_depreciation(frm);
 	},
-	
+
 	depreciation_method: function(frm) {
 		frm.events.make_schedules_editable(frm);
 	},
-	
+
 	make_schedules_editable: function(frm) {
 		var is_editable = frm.doc.depreciation_method==="Manual" ? true : false;
 		frm.toggle_enable("schedules", is_editable);
 		frm.fields_dict["schedules"].grid.toggle_enable("schedule_date", is_editable);
 		frm.fields_dict["schedules"].grid.toggle_enable("depreciation_amount", is_editable);
 	}
-	
+
 });
 
 frappe.ui.form.on('Depreciation Schedule', {
@@ -177,7 +177,7 @@
 			})
 		}
 	},
-	
+
 	depreciation_amount: function(frm, cdt, cdn) {
 		erpnext.asset.set_accululated_depreciation(frm);
 	}
@@ -186,11 +186,11 @@
 
 erpnext.asset.set_accululated_depreciation = function(frm) {
 	if(frm.doc.depreciation_method != "Manual") return;
-	
-	accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
+
+	var accumulated_depreciation = flt(frm.doc.opening_accumulated_depreciation);
 	$.each(frm.doc.schedules || [], function(i, row) {
 		accumulated_depreciation  += flt(row.depreciation_amount);
-		frappe.model.set_value(row.doctype, row.name, 
+		frappe.model.set_value(row.doctype, row.name,
 			"accumulated_depreciation_amount", accumulated_depreciation);
 	})
 }
@@ -260,9 +260,9 @@
 		title: __("Transfer Asset"),
 		fields: [
 			{
-				"label": __("Target Warehouse"), 
+				"label": __("Target Warehouse"),
 				"fieldname": "target_warehouse",
-				"fieldtype": "Link", 
+				"fieldtype": "Link",
 				"options": "Warehouse",
 				"get_query": function () {
 					return {
@@ -271,13 +271,13 @@
 							["Warehouse", "is_group", "=", 0]
 						]
 					}
-				}, 
-				"reqd": 1 
+				},
+				"reqd": 1
 			},
 			{
-				"label": __("Date"), 
+				"label": __("Date"),
 				"fieldname": "transfer_date",
-				"fieldtype": "Datetime", 
+				"fieldtype": "Datetime",
 				"reqd": 1,
 				"default": frappe.datetime.now_datetime()
 			}
@@ -285,7 +285,7 @@
 	});
 
 	dialog.set_primary_action(__("Transfer"), function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		dialog.hide();
 		return frappe.call({
diff --git a/erpnext/accounts/doctype/asset/asset.py b/erpnext/accounts/doctype/asset/asset.py
index 070461e..986beb7 100644
--- a/erpnext/accounts/doctype/asset/asset.py
+++ b/erpnext/accounts/doctype/asset/asset.py
@@ -19,7 +19,8 @@
 		self.validate_asset_values()
 		self.make_depreciation_schedule()
 		self.set_accumulated_depreciation()
-		self.validate_expected_value_after_useful_life()
+		if self.get("schedules"):
+			self.validate_expected_value_after_useful_life()
 		# Validate depreciation related accounts
 		get_depreciation_accounts(self)
 
diff --git a/erpnext/accounts/doctype/asset/asset_list.js b/erpnext/accounts/doctype/asset/asset_list.js
index 961ab3f..8e262f1 100644
--- a/erpnext/accounts/doctype/asset/asset_list.js
+++ b/erpnext/accounts/doctype/asset/asset_list.js
@@ -1,3 +1,3 @@
 frappe.listview_settings['Asset'] = {
-    add_fields: ['image']
+	add_fields: ['image']
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.js b/erpnext/accounts/doctype/asset_movement/asset_movement.js
index 808f01a..70c4080 100644
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.js
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.js
@@ -4,7 +4,7 @@
 frappe.ui.form.on('Asset Movement', {
 	onload: function(frm) {
 		frm.add_fetch("asset", "warehouse", "source_warehouse");
-		
+
 		frm.set_query("target_warehouse", function() {
 			return {
 				filters: [
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
index 4993202..0439b73 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.js
@@ -20,11 +20,11 @@
 		});
 	},
 	start_date: function(frm) {
-		end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
+		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
 	},
 	validity: function(frm) {
-		end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
+		var end_date = frappe.datetime.add_days(cur_frm.doc.start_date, cur_frm.doc.validity - 1);
 		cur_frm.set_value("end_date", end_date);
 	}
 });
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index a59fd18..29531ec 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -11,6 +12,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -21,6 +23,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -39,6 +42,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -49,6 +53,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Series", 
@@ -63,10 +68,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -77,6 +83,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "C-Form No", 
@@ -94,6 +101,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,6 +112,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Received Date", 
@@ -121,6 +130,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,6 +141,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Customer", 
@@ -149,6 +160,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -159,6 +171,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -177,6 +190,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -187,6 +201,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Company", 
@@ -205,6 +220,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -215,6 +231,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 1, 
    "label": "Quarter", 
@@ -233,6 +250,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -243,6 +261,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Amount", 
@@ -261,6 +280,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -271,6 +291,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "State", 
@@ -288,6 +309,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -298,6 +320,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -314,6 +337,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -324,6 +348,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Invoices", 
@@ -342,6 +367,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -352,6 +378,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Total Invoiced Amount", 
@@ -370,6 +397,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -380,6 +408,7 @@
    "ignore_user_permissions": 1, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
@@ -398,18 +427,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-file-text", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2016-11-07 05:51:03.273512", 
+ "modified": "2017-06-13 14:28:56.667292", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "C-Form", 
@@ -425,7 +454,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -446,7 +474,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -467,7 +494,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 1, 
    "print": 0, 
    "read": 1, 
@@ -482,7 +508,9 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_order": "DESC", 
  "timeline_field": "customer", 
+ "track_changes": 0, 
  "track_seen": 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 5d11005..cbc37ff 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -43,7 +43,7 @@
 
 cur_frm.cscript.parent_cost_center = function(doc, cdt, cdn) {
 	if(!doc.company){
-		msgprint(__('Please enter company name first'));
+		frappe.msgprint(__('Please enter company name first'));
 	}
 }
 
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index a516557..4dc6433 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -13,7 +13,7 @@
 		this.frm.toggle_enable('year_start_date', doc.__islocal)
 		this.frm.toggle_enable('year_end_date', doc.__islocal)
 
-		if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
+		if (!doc.__islocal && (doc.name != frappe.sys_defaults.fiscal_year)) {
 			this.frm.add_custom_button(__("Default"),
 				this.frm.cscript.set_as_default, "fa fa-star");
 			this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
@@ -30,7 +30,7 @@
 	year_start_date: function(doc, dt, dn) {
 		var me = this;
 
-		year_end_date =
+		var year_end_date =
 			frappe.datetime.add_days(frappe.datetime.add_months(this.frm.doc.year_start_date, 12), -1);
 		this.frm.set_value("year_end_date", year_end_date);
 	},
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index bb01103..4880224 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -62,11 +62,10 @@
 		if(this.frm.doc.__islocal && this.frm.doc.company) {
 			frappe.model.set_default_values(this.frm.doc);
 			$.each(this.frm.doc.accounts || [], function(i, jvd) {
-					frappe.model.set_default_values(jvd);
-				}
-			);
+				frappe.model.set_default_values(jvd);
+			});
 
-			if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || get_today();
+			if(!this.frm.doc.amended_from) this.frm.doc.posting_date = this.frm.posting_date || frappe.datetime.get_today();
 		}
 	},
 
@@ -124,7 +123,7 @@
 				// account filter
 				frappe.model.validate_missing(jvd, "account");
 
-				party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
+				var party_account_field = jvd.reference_type==="Sales Invoice" ? "debit_to": "credit_to";
 				out.filters.push([jvd.reference_type, party_account_field, "=", jvd.account]);
 			} else {
 				// party_type and party mandatory
@@ -243,7 +242,7 @@
 cur_frm.cscript.get_balance = function(doc,dt,dn) {
 	cur_frm.cscript.update_totals(doc);
 	return $c_obj(cur_frm.doc, 'get_balance', '', function(r, rt){
-	cur_frm.refresh();
+		cur_frm.refresh();
 	});
 }
 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index fb93121..57e83b0 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,10 +135,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -164,6 +169,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -225,6 +232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -255,6 +263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -286,6 +295,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -313,6 +323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -344,6 +355,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -374,6 +386,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -404,6 +417,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -431,6 +445,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -462,6 +477,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -493,6 +509,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -525,6 +542,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -555,6 +573,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -584,6 +603,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -614,6 +634,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -643,6 +664,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -671,6 +693,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -700,6 +723,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -730,6 +754,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -761,6 +786,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -788,6 +814,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -818,6 +845,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -848,6 +876,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -878,6 +907,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -908,6 +938,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -939,6 +970,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -969,6 +1001,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -997,6 +1030,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1027,6 +1061,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1056,6 +1091,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1084,6 +1120,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1112,6 +1149,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1141,6 +1179,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1172,6 +1211,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1202,6 +1242,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1231,6 +1272,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1264,11 +1306,12 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:inList([\"Credit Note\", \"Debit Note\"], doc.voucher_type)", 
+   "depends_on": "eval:in_list([\"Credit Note\", \"Debit Note\"], doc.voucher_type)", 
    "fieldname": "stock_entry", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1295,6 +1338,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1338,7 +1382,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-04-10 12:07:44.599804", 
+ "modified": "2017-06-13 14:29:09.794076", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Journal Entry", 
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 34d9de7..a3de8da 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -871,14 +871,9 @@
 		if reference_type in ("Sales Invoice", "Purchase Invoice") and reference_name:
 			exchange_rate = frappe.db.get_value(reference_type, reference_name, "conversion_rate")
 
-		elif account_details and account_details.account_type == "Bank" and \
-			((account_details.root_type == "Asset" and flt(credit) > 0) or
-				(account_details.root_type == "Liability" and debit)):
-			exchange_rate = get_average_exchange_rate(account)
-
 		# The date used to retreive the exchange rate here is the date passed
 		# in as an argument to this function.
-		if not exchange_rate and account_currency and posting_date:
+		elif (not exchange_rate or exchange_rate==1) and account_currency and posting_date:
 			exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
 	else:
 		exchange_rate = 1
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index bf7261a..49367ab 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -4,6 +4,7 @@
 from __future__ import unicode_literals
 import unittest, frappe
 from frappe.utils import flt
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.exceptions import InvalidAccountCurrency
 
 
@@ -83,7 +84,8 @@
 
 		jv = frappe.copy_doc(test_records[0])
 		jv.get("accounts")[0].update({
-			"account": "_Test Warehouse - _TC",
+			"account": get_inventory_account('_Test Company'),
+			"company": "_Test Company",
 			"party_type": None,
 			"party": None
 		})
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
index 36d54b6..fcf94ce 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
@@ -25,4 +25,5 @@
 		for entry in self.accounts:
 			"""Error when Company of Ledger account doesn't match with Company Selected"""
 			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
-				frappe.throw(_("Account does not match with Company"))
+				frappe.throw(_("Account {0} does not match with Company {1} in Mode of Account: {2}")
+					.format(entry.default_account, entry.company, self.name))
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
index 6f3c1c4..7b489de 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.js
@@ -2,13 +2,13 @@
 // License: GNU General Public License v3. See license.txt
 
 cur_frm.cscript.onload = function(doc,cdt,cdn){
-  if(doc.__islocal){
-    var callback1 = function(r,rt){
-      refresh_field('percentages');
-    }
+	if(doc.__islocal){
+		var callback1 = function(r,rt){
+			refresh_field('percentages');
+		}
 
-    return $c('runserverobj',args={'method':'get_months', 'docs':doc}, callback1);
-  }
+		return $c('runserverobj', {'method':'get_months', 'docs':doc}, callback1);
+	}
 }
 
 cur_frm.cscript.refresh = function(doc,cdt,cdn){
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 2eef79c..5bfd4d9 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -36,7 +36,7 @@
 		frm.set_query("paid_to", function() {
 			var party_account_type = frm.doc.party_type=="Customer" ? "Receivable" : "Payable";
 			var account_types = in_list(["Receive", "Internal Transfer"], frm.doc.payment_type) ?
-	 			["Bank", "Cash"] : party_account_type;
+				["Bank", "Cash"] : party_account_type;
 
 			return {
 				filters: {
@@ -78,6 +78,20 @@
 				filters: { "name": ["in", doctypes] }
 			};
 		});
+
+		frm.set_query("reference_name", "references", function(doc, cdt, cdn) {
+			child = locals[cdt][cdn];
+			filters = {"docstatus": 1, "company": doc.company};
+			party_type_doctypes = ['Sales Invoice', 'Sales Order', 'Purchase Invoice', 'Purchase Order'];
+
+			if (in_list(party_type_doctypes, child.reference_doctype)) {
+				filters[doc.party_type.toLowerCase()] = doc.party;
+			}
+
+			return {
+				filters: filters
+			};
+		});
 	},
 
 	refresh: function(frm) {
@@ -182,8 +196,8 @@
 		if(frm.doc.payment_type == "Internal Transfer") {
 			$.each(["party", "party_balance", "paid_from", "paid_to",
 				"references", "total_allocated_amount"], function(i, field) {
-					frm.set_value(field, null);
-			})
+				frm.set_value(field, null);
+			});
 		} else {
 			if(!frm.doc.party)
 				frm.set_value("party_type", frm.doc.payment_type=="Receive" ? "Customer" : "Supplier");
@@ -200,9 +214,10 @@
 			$.each(["party", "party_balance", "paid_from", "paid_to",
 				"paid_from_account_currency", "paid_from_account_balance",
 				"paid_to_account_currency", "paid_to_account_balance",
-				"references", "total_allocated_amount"], function(i, field) {
+				"references", "total_allocated_amount"],
+				function(i, field) {
 					frm.set_value(field, null);
-			})
+				})
 		}
 	},
 
@@ -317,10 +332,12 @@
 			frm.set_value("source_exchange_rate", 1);
 		} else if (frm.doc.paid_from){
 			if (in_list(["Internal Transfer", "Pay"], frm.doc.payment_type)) {
+				var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
 				frappe.call({
-					method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_average_exchange_rate",
+					method: "erpnext.setup.utils.get_exchange_rate",
 					args: {
-						account: frm.doc.paid_from
+						from_currency: frm.doc.paid_from_account_currency,
+						to_currency: company_currency
 					},
 					callback: function(r, rt) {
 						frm.set_value("source_exchange_rate", r.message);
@@ -487,13 +504,17 @@
 						}
 					});
 
-					if((frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
-						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")) {
-							if(total_positive_outstanding > total_negative_outstanding)
-								frm.set_value("paid_amount",
-									total_positive_outstanding - total_negative_outstanding);
-					} else if (total_negative_outstanding &&
-							(total_positive_outstanding < total_negative_outstanding)) {
+					if(
+						(frm.doc.payment_type=="Receive" && frm.doc.party_type=="Customer") ||
+						(frm.doc.payment_type=="Pay" && frm.doc.party_type=="Supplier")
+					) {
+						if(total_positive_outstanding > total_negative_outstanding)
+							frm.set_value("paid_amount",
+								total_positive_outstanding - total_negative_outstanding);
+					} else if (
+						total_negative_outstanding &&
+						total_positive_outstanding < total_negative_outstanding
+					) {
 						frm.set_value("received_amount",
 							total_negative_outstanding - total_positive_outstanding);
 					}
@@ -561,9 +582,11 @@
 			row.allocated_amount = 0 //If allocate payment amount checkbox is unchecked, set zero to allocate amount
 			if(frm.doc.allocate_payment_amount){
 				if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
-					if(row.outstanding_amount >= allocated_positive_outstanding)
-							row.allocated_amount = allocated_positive_outstanding;
-					else row.allocated_amount = row.outstanding_amount;
+					if(row.outstanding_amount >= allocated_positive_outstanding) {
+						row.allocated_amount = allocated_positive_outstanding;
+					} else {
+						row.allocated_amount = row.outstanding_amount;
+					}
 
 					allocated_positive_outstanding -= flt(row.allocated_amount);
 				} else if (row.outstanding_amount < 0 && allocated_negative_outstanding) {
@@ -581,7 +604,8 @@
 	},
 
 	set_total_allocated_amount: function(frm) {
-		var total_allocated_amount = base_total_allocated_amount = 0.0;
+		var total_allocated_amount = 0.0;
+		var base_total_allocated_amount = 0.0;
 		$.each(frm.doc.references || [], function(i, row) {
 			if (row.allocated_amount) {
 				total_allocated_amount += flt(row.allocated_amount);
@@ -653,19 +677,21 @@
 				return;
 			}
 
-			if(frm.doc.party_type=="Customer"
-				&& !in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.reference_doctype)) {
-					frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
-					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry", [row.idx]));
-					return false;
-				}
+			if(frm.doc.party_type=="Customer" &&
+				!in_list(["Sales Order", "Sales Invoice", "Journal Entry"], row.reference_doctype)
+			) {
+				frappe.model.set_value(row.doctype, row.name, "reference_doctype", null);
+				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry", [row.idx]));
+				return false;
+			}
 
-			if(frm.doc.party_type=="Supplier" && !in_list(["Purchase Order",
-				"Purchase Invoice", "Journal Entry"], row.reference_doctype)) {
-					frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
-					frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
-					return false;
-				}
+			if(frm.doc.party_type=="Supplier" &&
+				!in_list(["Purchase Order", "Purchase Invoice", "Journal Entry"], row.reference_doctype)
+			) {
+				frappe.model.set_value(row.doctype, row.name, "against_voucher_type", null);
+				frappe.msgprint(__("Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry", [row.idx]));
+				return false;
+			}
 		}
 
 		if (row) {
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index 7c6ed84..a59223d 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -68,10 +70,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -102,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +134,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -160,6 +165,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -190,6 +196,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -220,6 +227,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -250,6 +258,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -282,6 +291,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -313,6 +323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -341,6 +352,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -372,6 +384,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -401,6 +414,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -431,6 +445,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -462,6 +477,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -493,6 +509,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -524,6 +541,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -552,6 +570,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -583,6 +602,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -614,6 +634,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -645,6 +666,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -676,6 +698,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -707,6 +730,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -737,6 +761,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -768,6 +793,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -796,6 +822,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -827,6 +854,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -857,6 +885,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -888,6 +917,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -919,6 +949,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -950,6 +981,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -981,6 +1013,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1011,6 +1044,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1041,6 +1075,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1072,6 +1107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1101,6 +1137,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1129,6 +1166,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1159,6 +1197,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1190,6 +1229,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1220,6 +1260,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1251,6 +1292,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1281,6 +1323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1310,6 +1353,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1340,6 +1384,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1368,6 +1413,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1398,6 +1444,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1428,6 +1475,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1459,6 +1507,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1490,6 +1539,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1519,6 +1569,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1547,6 +1598,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1577,6 +1629,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1607,6 +1660,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1636,6 +1690,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1675,7 +1730,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-10 12:06:22.176045", 
+ "modified": "2017-06-13 14:29:04.244537", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Entry", 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index d42bcd5..c6559f8 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -48,6 +48,8 @@
 		self.validate_transaction_reference()
 		self.set_title()
 		self.set_remarks()
+		self.validate_duplicate_entry()
+		self.validate_allocated_amount()
 		
 	def on_submit(self):
 		self.setup_party_account_field()
@@ -61,7 +63,22 @@
 		self.make_gl_entries(cancel=1)
 		self.update_advance_paid()
 		self.delink_advance_entry_references()
+
+	def validate_duplicate_entry(self):
+		reference_names = []
+		for d in self.get("references"):
+			if (d.reference_doctype, d.reference_name) in reference_names:
+				frappe.throw(_("Row #{0}: Duplicate entry in References {1} {2}").format(d.idx, d.reference_doctype, d.reference_name))
+			reference_names.append((d.reference_doctype, d.reference_name))
 	
+	
+	def validate_allocated_amount(self):
+		for d in self.get("references"):
+			if (flt(d.allocated_amount))> 0:
+				if flt(d.allocated_amount) > flt(d.outstanding_amount):
+					frappe.throw(_("Row #{0}: Allocated Amount cannot be greater than outstanding amount.").format(d.idx))
+
+
 	def delink_advance_entry_references(self):
 		for reference in self.references:
 			if reference.reference_doctype in ("Sales Invoice", "Purchase Invoice"):
@@ -149,8 +166,6 @@
 		if self.paid_from and not self.source_exchange_rate:
 			if self.paid_from_account_currency == self.company_currency:
 				self.source_exchange_rate = 1
-			elif self.payment_type in ("Pay", "Internal Transfer"):
-				self.source_exchange_rate = get_average_exchange_rate(self.paid_from)
 			else:
 				self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency, 
 					self.company_currency, self.posting_date)
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 8be5f6d..ccf114f 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -112,6 +112,34 @@
 		
 		outstanding_amount = flt(frappe.db.get_value("Sales Invoice", si.name, "outstanding_amount"))
 		self.assertEqual(outstanding_amount, 80)
+
+	def test_payment_entry_retrieves_last_exchange_rate(self):
+		from erpnext.setup.doctype.currency_exchange.test_currency_exchange import test_records, save_new_records
+
+		test_records = test_records
+		save_new_records(test_records)
+
+		pe = frappe.new_doc("Payment Entry")
+		pe.payment_type = "Pay"
+		pe.company = "_Test Company"
+		pe.posting_date = "2016-01-10"
+		pe.paid_from = "_Test Bank USD - _TC"
+		pe.paid_to = "_Test Bank - _TC"
+		pe.paid_amount = 100
+		pe.reference_no = "3"
+		pe.reference_date = "2016-01-10"
+		pe.party_type = "Supplier"
+		pe.party = "_Test Supplier USD"
+
+		pe.setup_party_account_field()
+		pe.set_missing_values()
+		pe.set_exchange_rate()
+		pe.set_amounts()
+
+		self.assertEqual(
+			pe.source_exchange_rate, 65.1,
+			"{0} is not equal to {1}".format(pe.source_exchange_rate, 65.1)
+		)
 		
 	def test_internal_transfer_usd_to_inr(self):
 		pe = frappe.new_doc("Payment Entry")
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index 272e474..ebd9439 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -14,7 +14,7 @@
 
 		this.frm.set_query('receivable_payable_account', function() {
 			if(!me.frm.doc.company || !me.frm.doc.party_type) {
-				msgprint(__("Please select Company and Party Type first"));
+				frappe.msgprint(__("Please select Company and Party Type first"));
 			} else {
 				return{
 					filters: {
@@ -29,7 +29,7 @@
 
 		this.frm.set_query('bank_cash_account', function() {
 			if(!me.frm.doc.company) {
-				msgprint(__("Please select Company first"));
+				frappe.msgprint(__("Please select Company first"));
 			} else {
 				return{
 					filters:[
@@ -96,10 +96,11 @@
 	},
 
 	set_invoice_options: function() {
+		var me = this;
 		var invoices = [];
 
 		$.each(me.frm.doc.invoices || [], function(i, row) {
-			if (row.invoice_number && !inList(invoices, row.invoice_number))
+			if (row.invoice_number && !in_list(invoices, row.invoice_number))
 				invoices.push(row.invoice_type + " | " + row.invoice_number);
 		});
 
@@ -108,7 +109,7 @@
 				me.frm.doc.name).options = "\n" + invoices.join("\n");
 
 			$.each(me.frm.doc.payments || [], function(i, p) {
-				if(!inList(invoices, cstr(p.invoice_number))) p.invoice_number = null;
+				if(!in_list(invoices, cstr(p.invoice_number))) p.invoice_number = null;
 			});
 		}
 
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 451c03a..5a6292b 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -41,7 +41,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -728,7 +728,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-05-18 12:18:39.187714", 
+ "modified": "2017-06-13 14:29:20.388372", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Payment Request", 
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py
index bf3e24f..06231eb 100644
--- a/erpnext/accounts/doctype/payment_request/test_payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -87,8 +87,8 @@
 		
 		expected_gle = dict((d[0], d) for d in [
 			["_Test Receivable USD - _TC", 0, 5000, si_usd.name],
-			[pr.payment_account, 6000.0, 0, None],
-			["_Test Exchange Gain/Loss - _TC", 0, 1000, None]
+			[pr.payment_account, 6290.0, 0, None],
+			["_Test Exchange Gain/Loss - _TC", 0, 1290, None]
 		])
 		
 		gl_entries = frappe.db.sql("""select account, debit, credit, against_voucher
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index c5ded6d..03b8f93 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on('Period Closing Voucher', {
 	onload: function(frm) {
-		if (!frm.doc.transaction_date) frm.doc.transaction_date = dateutil.obj_to_str(new Date());
+		if (!frm.doc.transaction_date) frm.doc.transaction_date = frappe.datetime.obj_to_str(new Date());
 	},
 	
 	setup: function(frm) {
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index c1aa0c3..83016a9 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -35,8 +35,8 @@
 			'company': doc.company,
 			'account_type': "Income Account"
 		}
-	}
-}
+	};
+};
 
 
 // Cost Center
@@ -47,8 +47,8 @@
 			'company': doc.company,
 			'is_group': 0
 		}
-	}
-}
+	};
+};
 
 
 // Expense Account
@@ -60,8 +60,8 @@
 			"company": doc.company,
 			"is_group": 0
 		}
-	}
-}
+	};
+};
 
 // ------------------ Get Print Heading ------------------------------------
 cur_frm.fields_dict['select_print_heading'].get_query = function(doc, cdt, cdn) {
@@ -69,13 +69,13 @@
 		filters:[
 			['Print Heading', 'docstatus', '!=', 2]
 		]
-	}
-}
+	};
+};
 
 
 cur_frm.fields_dict.user.get_query = function(doc,cdt,cdn) {
-	return{	query:"frappe.core.doctype.user.user.user_query"}
-}
+	return{	query:"frappe.core.doctype.user.user.user_query"};
+};
 
 cur_frm.fields_dict.write_off_account.get_query = function(doc) {
 	return{
@@ -84,16 +84,16 @@
 			'is_group': 0,
 			'company': doc.company
 		}
-	}
-}
+	};
+};
 
 // Write off cost center
-//-----------------------
+// -----------------------
 cur_frm.fields_dict.write_off_cost_center.get_query = function(doc) {
 	return{
 		filters:{
 			'is_group': 0,
 			'company': doc.company
 		}
-	}
-}
+	};
+};
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 9232cd3..c2c75e1 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -12,6 +12,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,10 +40,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,10 +72,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,6 +140,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -166,6 +171,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -225,6 +232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -256,6 +264,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -286,6 +295,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,6 +327,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -346,6 +357,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -375,6 +387,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -404,6 +417,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -432,6 +446,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -462,6 +477,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -490,6 +506,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +537,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -548,6 +566,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -578,6 +597,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -606,6 +626,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -637,6 +658,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -668,6 +690,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -699,6 +722,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -730,6 +754,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -758,6 +783,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -790,6 +816,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -821,6 +848,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -850,6 +878,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -882,6 +911,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -910,6 +940,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -941,6 +972,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -971,6 +1003,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1001,6 +1034,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1032,6 +1066,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1060,6 +1095,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1091,6 +1127,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1121,6 +1158,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1163,8 +1201,8 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-10 16:53:56.390210", 
- "modified_by": "rohit@erpnext.com", 
+ "modified": "2017-06-15 20:07:55.682137", 
+ "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "POS Profile", 
  "owner": "Administrator", 
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 03bb7ae..120329b 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -2,63 +2,65 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
-	var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
-		'<tr><td>',
-			'<h4><i class="fa fa-hand-right"></i> ',
-				__('Notes'),
-			':</h4>',
-			'<ul>',
-				'<li>',
-					__("Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria."),
-				'</li>',
-				'<li>',
-					__("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."),
-				'</li>',
-				'<li>',
-					__('Discount Percentage can be applied either against a Price List or for all Price List.'),
-				'</li>',
-				'<li>',
-					__('To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.'),
-				'</li>',
-			'</ul>',
-		'</td></tr>',
-		'<tr><td>',
-			'<h4><i class="fa fa-question-sign"></i> ',
-				__('How Pricing Rule is applied?'),
-			'</h4>',
-			'<ol>',
-				'<li>',
-					__("Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand."),
-				'</li>',
-				'<li>',
-					__("Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc."),
-				'</li>',
-				'<li>',
-					__('Pricing Rules are further filtered based on quantity.'),
-				'</li>',
-				'<li>',
-					__('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.'),
-				'</li>',
-				'<li>',
-					__('Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:'),
-					'<ul>',
-						'<li>',
-							__('Item Code > Item Group > Brand'),
-						'</li>',
-						'<li>',
-							__('Customer > Customer Group > Territory'),
-						'</li>',
-						'<li>',
-							__('Supplier > Supplier Type'),
-						'</li>',
-					'</ul>',
-				'</li>',
-				'<li>',
-					__('If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.'),
-				'</li>',
-			'</ol>',
-		'</td></tr>',
-	'</table>'].join("\n");
+	var help_content =
+		`<table class="table table-bordered" style="background-color: #f9f9f9;">
+			<tr><td>
+				<h4>
+					<i class="fa fa-hand-right"></i>
+					${__('Notes')}
+				</h4>
+				<ul>
+					<li>
+						${__("Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.")}
+					</li>
+					<li>
+						${__("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.")}
+					</li>
+					<li>
+						${__('Discount Percentage can be applied either against a Price List or for all Price List.')}
+					</li>
+					<li>
+						${__('To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.')}
+					</li>
+				</ul>
+			</td></tr>
+			<tr><td>
+				<h4><i class="fa fa-question-sign"></i>
+					${__('How Pricing Rule is applied?')}
+				</h4>
+				<ol>
+					<li>
+						${__("Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.")}
+					</li>
+					<li>
+						${__("Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.")}
+					</li>
+					<li>
+						${__('Pricing Rules are further filtered based on quantity.')}
+					</li>
+					<li>
+						${__('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.')}
+					</li>
+					<li>
+						${__('Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:')}
+						<ul>
+							<li>
+								${__('Item Code > Item Group > Brand')}
+							</li>
+							<li>
+								${__('Customer > Customer Group > Territory')}
+							</li>
+							<li>
+								${__('Supplier > Supplier Type')}
+							</li>
+						</ul>
+					</li>
+					<li>
+						${__('If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.')}
+					</li>
+				</ol>
+			</td></tr>
+		</table>`;
 
 	set_field_options("pricing_rule_help", help_content);
 
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index cada95f..ad5ecc1 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -101,8 +101,8 @@
 				account: this.frm.doc.credit_to,
 				price_list: this.frm.doc.buying_price_list,
 			}, function() {
-			me.apply_pricing_rule();
-		})
+				me.apply_pricing_rule();
+			})
 	},
 
 	credit_to: function() {
@@ -130,7 +130,7 @@
 		if(cint(this.frm.doc.is_paid)) {
 			if(!this.frm.doc.company) {
 				this.frm.set_value("is_paid", 0)
-				msgprint(__("Please specify Company to proceed"));
+				frappe.msgprint(__("Please specify Company to proceed"));
 			}
 		}
 		this.calculate_outstanding_amount();
@@ -195,19 +195,19 @@
 // Hide Fields
 // ------------
 function hide_fields(doc) {
-	parent_fields = ['due_date', 'is_opening', 'advances_section', 'from_date', 'to_date'];
+	var parent_fields = ['due_date', 'is_opening', 'advances_section', 'from_date', 'to_date'];
 
 	if(cint(doc.is_paid) == 1) {
 		hide_field(parent_fields);
 	} else {
-		for (i in parent_fields) {
+		for (var i in parent_fields) {
 			var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
 			if(!docfield.hidden) unhide_field(parent_fields[i]);
 		}
 
 	}
 
-	item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
+	var item_fields_stock = ['warehouse_section', 'received_qty', 'rejected_qty'];
 
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
 		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index ba73a15..36db684 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -72,7 +72,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -3767,7 +3767,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-17 10:35:40.729350", 
+ "modified": "2017-06-13 14:28:57.930167", 
  "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 530d08a..394ad49 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -11,7 +11,7 @@
 from erpnext.accounts.party import get_party_account, get_due_date
 from erpnext.accounts.utils import get_account_currency, get_fiscal_year
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import update_billed_amount_based_on_po
-from erpnext.controllers.stock_controller import get_warehouse_account
+from erpnext.stock import get_warehouse_account_map
 from erpnext.accounts.general_ledger import make_gl_entries, merge_similar_entries, delete_gl_entries
 from erpnext.accounts.doctype.gl_entry.gl_entry import update_outstanding_amt
 from erpnext.buying.utils import check_for_closed_status
@@ -59,6 +59,7 @@
 		self.check_for_closed_status()
 		self.validate_with_previous_doc()
 		self.validate_uom_is_integer("uom", "qty")
+		self.validate_uom_is_integer("stock_uom", "stock_qty")
 		self.set_expense_account(for_validate=True)
 		self.set_against_expense_account()
 		self.validate_write_off_account()
@@ -172,7 +173,7 @@
 		if self.update_stock:
 			self.validate_item_code()
 			self.validate_warehouse()
-			warehouse_account = get_warehouse_account()
+			warehouse_account = get_warehouse_account_map()
 
 		for item in self.get("items"):
 			# in case of auto inventory accounting,
@@ -185,7 +186,7 @@
 					not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")):
 
 				if self.update_stock:
-					item.expense_account = warehouse_account[item.warehouse]["name"]
+					item.expense_account = warehouse_account[item.warehouse]["account"]
 				else:
 					item.expense_account = stock_not_billed_account
 
@@ -204,14 +205,14 @@
 		if frappe.db.get_value("Buying Settings", None, "po_required") == 'Yes':
 			for d in self.get('items'):
 				if not d.purchase_order:
-					throw(_("Purchase Order number required for Item {0}").format(d.item_code))
+					throw(_("As per the Buying Settings if Purchase Order Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Order first for item {0}").format(d.item_code))
 
 	def pr_required(self):
 		stock_items = self.get_stock_items()
 		if frappe.db.get_value("Buying Settings", None, "pr_required") == 'Yes':
 			for d in self.get('items'):
 				if not d.purchase_receipt and d.item_code in stock_items:
-					throw(_("Purchase Receipt number required for Item {0}").format(d.item_code))
+					throw(_("As per the Buying Settings if Purchase Reciept Required == 'YES', then for creating Purchase Invoice, user need to create Purchase Receipt first for item {0}").format(d.item_code))
 
 	def validate_write_off_account(self):
 		if self.write_off_amount and not self.write_off_account:
@@ -377,7 +378,7 @@
 		# item gl entries
 		stock_items = self.get_stock_items()
 		expenses_included_in_valuation = self.get_company_default("expenses_included_in_valuation")
-		warehouse_account = get_warehouse_account()
+		warehouse_account = get_warehouse_account_map()
 
 		for item in self.get("items"):
 			if flt(item.base_net_amount):
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index dffe72e..cf0ec57 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -12,6 +12,7 @@
 	test_records as pr_test_records
 from erpnext.exceptions import InvalidCurrency
 from erpnext.stock.doctype.stock_entry.test_stock_entry import get_qty_after_transaction
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
 test_dependencies = ["Item", "Cost Center"]
 test_ignore = ["Serial No"]
@@ -118,6 +119,19 @@
 			self.assertEquals(expected_values[gle.account][1], gle.debit)
 			self.assertEquals(expected_values[gle.account][2], gle.credit)
 
+	def test_purchase_invoice_change_naming_series(self):
+		pi = frappe.copy_doc(test_records[1])
+		pi.insert()
+		pi.naming_series = 'TEST-'
+
+		self.assertRaises(frappe.CannotChangeConstantError, pi.save)
+
+		pi = frappe.copy_doc(test_records[0])
+		pi.insert()
+		pi.naming_series = 'TEST-'
+
+		self.assertRaises(frappe.CannotChangeConstantError, pi.save)
+
 	def test_gl_entries_with_aia_for_non_stock_items(self):
 		set_perpetual_inventory()
 		self.assertEqual(cint(frappe.defaults.get_global_default("auto_accounting_for_stock")), 1)
@@ -357,10 +371,11 @@
 			order by account asc""", pi.name, as_dict=1)
 
 		self.assertTrue(gl_entries)
+		stock_in_hand_account = get_inventory_account(pi.company, pi.get("items")[0].warehouse)
 
 		expected_gl_entries = dict((d[0], d) for d in [
 			[pi.credit_to, 0.0, 250.0],
-			[pi.items[0].warehouse, 250.0, 0.0]
+			[stock_in_hand_account, 250.0, 0.0]
 		])
 
 		for i, gle in enumerate(gl_entries):
@@ -377,12 +392,13 @@
 				sum(credit) as credit, debit_in_account_currency, credit_in_account_currency
 			from `tabGL Entry` where voucher_type='Purchase Invoice' and voucher_no=%s
 			group by account, voucher_no order by account asc;""", pi.name, as_dict=1)
-
+		
+		stock_in_hand_account = get_inventory_account(pi.company, pi.get("items")[0].warehouse)
 		self.assertTrue(gl_entries)
 
 		expected_gl_entries = dict((d[0], d) for d in [
 			[pi.credit_to, 250.0, 250.0],
-			[pi.items[0].warehouse, 250.0, 0.0],
+			[stock_in_hand_account, 250.0, 0.0],
 			["Cash - _TC", 0.0, 250.0]
 		])
 
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
index a1d8bf8..eb0ea7f 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js
@@ -9,11 +9,11 @@
 	var d = locals[cdt][cdn];
 
 	if(!d.category && d.add_deduct_tax) {
-		msgprint(__("Please select Category first"));
+		frappe.msgprint(__("Please select Category first"));
 		d.add_deduct_tax = '';
 	}
 	else if(d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
-		msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
+		frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Valuation and Total'"));
 		d.add_deduct_tax = '';
 	}
 	refresh_field('add_deduct_tax', d.name, 'taxes');
@@ -23,7 +23,7 @@
 	var d = locals[cdt][cdn];
 
 	if (d.category != 'Total' && d.add_deduct_tax == 'Deduct') {
-		msgprint(__("Cannot deduct when category is for 'Valuation' or 'Vaulation and Total'"));
+		frappe.msgprint(__("Cannot deduct when category is for 'Valuation' or 'Vaulation and Total'"));
 		d.add_deduct_tax = '';
 	}
 	refresh_field('add_deduct_tax', d.name, 'taxes');
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 1f8aa1d..2107581 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -175,8 +175,8 @@
 				account: this.frm.doc.debit_to,
 				price_list: this.frm.doc.selling_price_list,
 			}, function() {
-			me.apply_pricing_rule();
-		})
+				me.apply_pricing_rule();
+			})
 	},
 
 	debit_to: function() {
@@ -267,7 +267,7 @@
 		if(this.frm.doc.is_pos) {
 			if(!this.frm.doc.company) {
 				this.frm.set_value("is_pos", 0);
-				msgprint(__("Please specify Company to proceed"));
+				frappe.msgprint(__("Please specify Company to proceed"));
 			} else {
 				var me = this;
 				return this.frm.call({
@@ -312,19 +312,20 @@
 // Hide Fields
 // ------------
 cur_frm.cscript.hide_fields = function(doc) {
-	parent_fields = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances',
+	var parent_fields = ['project', 'due_date', 'is_opening', 'source', 'total_advance', 'get_advances',
 		'advances', 'sales_partner', 'commission_rate', 'total_commission', 'advances', 'from_date', 'to_date'];
 
 	if(cint(doc.is_pos) == 1) {
 		hide_field(parent_fields);
 	} else {
-		for (i in parent_fields) {
+		for (var i in parent_fields) {
 			var docfield = frappe.meta.docfield_map[doc.doctype][parent_fields[i]];
 			if(!docfield.hidden) unhide_field(parent_fields[i]);
 		}
 	}
 
-	item_fields_stock = ['serial_no', 'batch_no', 'actual_qty', 'expense_account', 'warehouse', 'expense_account', 'warehouse']
+	var item_fields_stock = ['batch_no', 'actual_batch_qty', 'actual_qty', 'expense_account',
+		'warehouse', 'expense_account', 'quality_inspection']
 	cur_frm.fields_dict['items'].grid.set_column_disp(item_fields_stock,
 		(cint(doc.update_stock)==1 || cint(doc.is_return)==1 ? true : false));
 
@@ -400,7 +401,7 @@
 });
 
 // expense account
-if (sys_defaults.auto_accounting_for_stock) {
+if (frappe.sys_defaults.auto_accounting_for_stock) {
 	cur_frm.fields_dict['items'].grid.get_field('expense_account').get_query = function(doc) {
 		return {
 			filters: {
@@ -442,11 +443,12 @@
 	})
 
 	if(cur_frm.doc.is_pos) {
-		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:frappe.new_doc(cur_frm.doctype);">{1}</a>', [
-			__('Print'), __('New')
-		]));
+		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="javascript:frappe.new_doc(cur_frm.doctype);">
+				${__('New')}</a>`
+			);
 
 	} 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 d08716fd..f257efe 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -103,7 +103,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -330,6 +330,37 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "pos_profile", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "POS Profile", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "POS Profile", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "column_break1", 
    "fieldtype": "Column Break", 
    "hidden": 0, 
@@ -4565,7 +4596,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-07 11:00:01.903429", 
+ "modified": "2017-06-16 17:07:55.483734", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice", 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index ab49fc0..24da970 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -57,7 +57,8 @@
 		self.so_dn_required()
 		self.validate_proj_cust()
 		self.validate_with_previous_doc()
-		self.validate_uom_is_integer("stock_uom", "qty")
+		self.validate_uom_is_integer("stock_uom", "stock_qty")
+		self.validate_uom_is_integer("uom", "qty")
 		self.check_close_sales_order("sales_order")
 		self.validate_debit_to_acc()
 		self.clear_unallocated_advances("Sales Invoice Advance", "advances")
@@ -88,6 +89,8 @@
 		self.validate_c_form()
 		self.validate_time_sheets_are_submitted()
 		self.validate_multiple_billing("Delivery Note", "dn_detail", "amount", "items")
+		if not self.is_return:
+			self.validate_serial_numbers()
 		self.update_packing_list()
 		self.set_billing_hours_and_amount()
 		self.update_timesheet_billing_for_project()
@@ -125,6 +128,7 @@
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
 			self.check_credit_limit()
+			self.update_serial_no()
 
 		if not cint(self.is_pos) == 1 and not self.is_return:
 			self.update_against_document_in_jv()
@@ -155,6 +159,7 @@
 
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
+			self.update_serial_no(in_cancel=True)
 
 		self.validate_c_form_on_cancel()
 
@@ -781,6 +786,61 @@
 
 		self.due_date = None
 
+	def update_serial_no(self, in_cancel=False):
+		""" update Sales Invoice refrence in Serial No """
+
+		for item in self.items:
+			if not item.serial_no:
+				continue
+
+			serial_nos = ["'%s'"%serial_no for serial_no in item.serial_no.split("\n")]
+
+			frappe.db.sql(""" update `tabSerial No` set sales_invoice='{invoice}'
+				where name in ({serial_nos})""".format(
+					invoice='' if in_cancel else self.name,
+					serial_nos=",".join(serial_nos)
+				)
+			)
+
+	def validate_serial_numbers(self):
+		"""
+			validate serial number agains Delivery Note and Sales Invoice
+		"""
+		self.validate_serial_against_delivery_note()
+		self.validate_serial_against_sales_invoice()
+
+	def validate_serial_against_delivery_note(self):
+		""" 
+			validate if the serial numbers in Sales Invoice Items are same as in
+			Delivery Note Item
+		"""
+
+		for item in self.items:
+			if not item.delivery_note or not item.dn_detail:
+				continue
+
+			serial_nos = frappe.db.get_value("Delivery Note Item", item.dn_detail, "serial_no") or ""
+			dn_serial_nos = set(serial_nos.split("\n"))
+
+			serial_nos = item.serial_no or ""
+			si_serial_nos = set(serial_nos.split("\n"))
+
+			if si_serial_nos - dn_serial_nos:
+				frappe.throw(_("Serial Numbers in row {0} does not match with Delivery Note".format(item.idx)))
+
+	def validate_serial_against_sales_invoice(self):
+		""" check if serial number is already used in other sales invoice """
+		for item in self.items:
+			if not item.serial_no:
+				continue
+
+			for serial_no in item.serial_no.split("\n"):
+				sales_invoice = frappe.db.get_value("Serial No", serial_no, "sales_invoice")
+				if sales_invoice and self.name != sales_invoice:
+					frappe.throw(_("Serial Number: {0} is already referenced in Sales Invoice: {1}".format(
+						serial_no, sales_invoice
+					)))
+
 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/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index 20d4613..bc9d766 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -11,8 +11,7 @@
 			'Sales Invoice': 'return_against'
 		},
 		'internal_links': {
-			'Sales Order': ['items', 'sales_order'],
-			'Delivery Note': ['items', 'delivery_note'],
+			'Sales Order': ['items', 'sales_order']
 		},
 		'transactions': [
 			{
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 0ada847..cb05ac8 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -12,6 +12,7 @@
 from erpnext.exceptions import InvalidAccountCurrency, InvalidCurrency
 from erpnext.stock.doctype.serial_no.serial_no import SerialNoWarehouseError
 from frappe.model.naming import make_autoname
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
 class TestSalesInvoice(unittest.TestCase):
 	def make(self):
@@ -42,6 +43,19 @@
 		time.sleep(1)
 		self.assertRaises(frappe.TimestampMismatchError, w2.save)
 
+	def test_sales_invoice_change_naming_series(self):
+		si = frappe.copy_doc(test_records[2])
+		si.insert()
+		si.naming_series = 'TEST-'
+
+		self.assertRaises(frappe.CannotChangeConstantError, si.save)
+
+		si = frappe.copy_doc(test_records[1])
+		si.insert()
+		si.naming_series = 'TEST-'
+
+		self.assertRaises(frappe.CannotChangeConstantError, si.save)
+
 	def test_sales_invoice_calculation_base_currency(self):
 		si = frappe.copy_doc(test_records[2])
 		si.insert()
@@ -582,7 +596,7 @@
 			order by account asc, debit asc""", si.name, as_dict=1)
 		self.assertTrue(gl_entries)
 
-		stock_in_hand = frappe.db.get_value("Account", {"warehouse": "_Test Warehouse - _TC"})
+		stock_in_hand = get_inventory_account('_Test Company')
 
 		expected_gl_entries = sorted([
 			[si.debit_to, 630.0, 0.0],
@@ -737,6 +751,12 @@
 		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"))
 		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0],
 			"delivery_document_no"), si.name)
+		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0], "sales_invoice"),
+			si.name)
+
+		# check if the serial number is already linked with any other Sales Invoice
+		_si = frappe.copy_doc(si.as_dict())
+		self.assertRaises(frappe.ValidationError, _si.insert)
 
 		return si
 
@@ -750,6 +770,7 @@
 		self.assertEquals(frappe.db.get_value("Serial No", serial_nos[0], "warehouse"), "_Test Warehouse - _TC")
 		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0],
 			"delivery_document_no"))
+		self.assertFalse(frappe.db.get_value("Serial No", serial_nos[0], "sales_invoice"))
 
 	def test_serialize_status(self):
 		serial_no = frappe.get_doc({
@@ -768,6 +789,27 @@
 
 		self.assertRaises(SerialNoWarehouseError, si.submit)
 
+	def test_serial_numbers_against_delivery_note(self):
+		""" 
+			check if the sales invoice item serial numbers and the delivery note items
+			serial numbers are same
+		"""
+		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
+		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
+		from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_invoice
+		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
+
+		se = make_serialized_item()
+		serial_nos = get_serial_nos(se.get("items")[0].serial_no)
+
+		dn = create_delivery_note(item=se.get("items")[0].item_code, serial_no=serial_nos[0])
+		dn.submit()
+
+		si = make_sales_invoice(dn.name)
+		si.save()
+
+		self.assertEquals(si.get("items")[0].serial_no, dn.get("items")[0].serial_no)
+
 	def test_invoice_due_date_against_customers_credit_days(self):
 		# set customer's credit days
 		frappe.db.set_value("Customer", "_Test Customer", "credit_days_based_on", "Fixed Days")
@@ -809,11 +851,11 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEquals(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
-
+		stock_in_hand_account = get_inventory_account('_Test Company', si1.items[0].warehouse)
 
 		# Check gl entry
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Sales Invoice",
-			"voucher_no": si1.name, "account": "_Test Warehouse - _TC"}, "debit")
+			"voucher_no": si1.name, "account": stock_in_hand_account}, "debit")
 
 		self.assertEquals(gle_warehouse_amount, stock_value_difference)
 
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index 606d067..36f4221 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -7,7 +7,7 @@
 from frappe import _
 from frappe.model.document import Document
 from frappe.utils import cstr, cint
-from frappe.geo.doctype.address.address import get_default_address
+from frappe.contacts.doctype.address.address import get_default_address
 
 class IncorrectCustomerGroup(frappe.ValidationError): pass
 class IncorrectSupplierType(frappe.ValidationError): pass
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index c9345f2..5541cc0 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -104,7 +104,7 @@
 	if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \
 		and gl_map[0].voucher_type=="Journal Entry":
 			aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
-				where account_type = 'Stock' and (warehouse != '' and warehouse is not null) and is_group=0""")]
+				where account_type = 'Stock' and is_group=0""")]
 
 			for entry in gl_map:
 				if entry.account in aii_accounts:
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 14b26db..abe81a2 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -114,7 +114,7 @@
 
 	email_prompt: function() {
 		var me = this;
-		fields = [{label:__("To"), fieldtype:"Data", reqd: 0, fieldname:"recipients",length:524288},
+		var fields = [{label:__("To"), fieldtype:"Data", reqd: 0, fieldname:"recipients",length:524288},
 			{fieldtype: "Section Break", collapsible: 1, label: "CC & Standard Reply"},
 			{fieldtype: "Section Break"},
 			{label:__("Subject"), fieldtype:"Data", reqd: 1,
@@ -399,7 +399,7 @@
 		this.make_item_list();
 		this.make_discount_field()
 	},
-	
+
 	make_control: function() {
 		this.frm = {}
 		this.frm.doc = this.doc
@@ -545,7 +545,7 @@
 			me.toggle_totals_area();
 		});
 	},
-	
+
 	bind_numeric_keypad: function() {
 		var me = this;
 		$(this.numeric_keypad).find('.pos-operation').on('click', function(){
@@ -574,7 +574,7 @@
 				me.selected_field.closest('.pos-list-row').addClass('active');
 			}
 		})
-		
+
 		$(this.numeric_keypad).find('.numeric-del').click(function(){
 			me.selected_field = $(me.wrapper).find('.selected-item').find('.' + me.numeric_id)
 			me.numeric_val = cstr(flt(me.selected_field.val())).slice(0, -1);
@@ -582,7 +582,7 @@
 			me.selected_field.trigger("change")
 			// me.render_selected_item()
 		})
-		
+
 		$(this.numeric_keypad).find('.pos-pay').click(function(){
 			me.validate();
 			me.update_paid_amount_status(true);
@@ -604,7 +604,7 @@
 		var html = "";
 		if(this.si_docs.length) {
 			this.si_docs.forEach(function (data, i) {
-				for (key in data) {
+				for (var key in data) {
 					html += frappe.render_template("pos_invoice_list", {
 						sr: i + 1,
 						name: key,
@@ -984,7 +984,7 @@
 	make_item_list: function () {
 		var me = this;
 		if (!this.price_list) {
-			msgprint(__("Price List not found or disabled"));
+			frappe.msgprint(__("Price List not found or disabled"));
 			return;
 		}
 
@@ -1007,7 +1007,7 @@
 					})).tooltip().appendTo($wrap);
 				}
 			});
-			
+
 			$wrap.append(`
 				<div class="image-view-item btn-more text-muted text-center">
 					<div class="image-view-body">
@@ -1089,7 +1089,7 @@
 			});
 		}
 	},
-	
+
 	bind_items_event: function() {
 		var me = this;
 		$(this.wrapper).on('click', '.pos-bill-item', function() {
@@ -1126,7 +1126,7 @@
 			var qty = flt($(this).parents(".pos-bill-item").find('.pos-item-qty').val()) - 1;
 			me.update_qty(item_code, qty)
 		})
-		
+
 		$(this.wrapper).on("change", ".pos-item-disc", function () {
 			var item_code = $(this).parents(".pos-selected-item-action").attr("data-item-code");
 			var discount = $(this).val();
@@ -1252,7 +1252,7 @@
 
 	remove_zero_qty_item: function () {
 		var me = this;
-		idx = 0
+		var idx = 0;
 		this.items = []
 		$.each(this.frm.doc["items"] || [], function (i, d) {
 			if (!in_list(me.remove_item, d.idx)) {
@@ -1270,7 +1270,7 @@
 
 		this.wrapper.find('input.discount-percentage').on("change", function () {
 			me.frm.doc.additional_discount_percentage = flt($(this).val(), precision("additional_discount_percentage"));
-			total = me.frm.doc.grand_total
+			var total = me.frm.doc.grand_total
 
 			if (me.frm.doc.apply_discount_on == 'Net Total') {
 				total = me.frm.doc.net_total
@@ -1461,7 +1461,7 @@
 
 		if (this.frm.doc.docstatus == 1) {
 			this.page.set_secondary_action(__("Print"), function () {
-				html = frappe.render(me.print_template_data, me.frm.doc)
+				var html = frappe.render(me.print_template_data, me.frm.doc)
 				me.print_document(html)
 			})
 			this.page.add_menu_item(__("Email"), function () {
@@ -1484,19 +1484,18 @@
 	print_dialog: function () {
 		var me = this;
 
-		this.msgprint = frappe.msgprint(format('<a class="btn btn-primary print_doc" \
-			style="margin-right: 5px;">{0}</a>\
-			<a class="btn btn-default new_doc">{1}</a>', [
-				__('Print'), __('New')
-			]));
+		this.frappe.msgprint = frappe.msgprint(
+			`<a class="btn btn-primary print_doc"
+				style="margin-right: 5px;">${__('Print')}</a>
+			<a class="btn btn-default new_doc">${__('New')}</a>`);
 
 		$('.print_doc').click(function () {
-			html = frappe.render(me.print_template_data, me.frm.doc)
+			var html = frappe.render(me.print_template_data, me.frm.doc)
 			me.print_document(html)
 		})
 
 		$('.new_doc').click(function () {
-			me.msgprint.hide()
+			me.frappe.msgprint.hide()
 			me.make_new_cart()
 		})
 	},
@@ -1525,9 +1524,9 @@
 
 		//Remove the sold serial no from the cache
 		$.each(this.frm.doc.items, function(index, data) {
-			sn = data.serial_no.split('\n')
+			var sn = data.serial_no.split('\n')
 			if(sn.length) {
-				serial_no_list = me.serial_no_data[data.item_code]
+				var serial_no_list = me.serial_no_data[data.item_code]
 				if(serial_no_list) {
 					$.each(sn, function(i, serial_no) {
 						if(in_list(Object.keys(serial_no_list), serial_no)) {
@@ -1550,7 +1549,7 @@
 
 	toggle_input_field: function () {
 		var pointer_events = 'inherit'
-		disabled = this.frm.doc.docstatus == 1 ? true: false;
+		var disabled = this.frm.doc.docstatus == 1 ? true: false;
 		$(this.wrapper).find('input').attr("disabled", disabled);
 		$(this.wrapper).find('select').attr("disabled", disabled);
 		$(this.wrapper).find('input').attr("disabled", disabled);
@@ -1578,6 +1577,7 @@
 			this.frm.doc.offline_pos_name = this.name;
 			this.frm.doc.posting_date = frappe.datetime.get_today();
 			this.frm.doc.posting_time = frappe.datetime.now_time();
+			this.frm.doc.pos_profile = this.pos_profile_data['name'];
 			invoice_data[this.name] = this.frm.doc
 			this.si_docs.push(invoice_data)
 			this.update_localstorage();
@@ -1590,7 +1590,7 @@
 		var me = this;
 		this.si_docs = this.get_doc_from_localstorage();
 		$.each(this.si_docs, function (index, data) {
-			for (key in data) {
+			for (var key in data) {
 				if (key == me.name) {
 					me.si_docs[index][key] = me.frm.doc;
 					me.update_localstorage();
@@ -1661,10 +1661,10 @@
 	get_submitted_invoice: function () {
 		var invoices = [];
 		var index = 1;
-		docs = this.get_doc_from_localstorage();
+		var docs = this.get_doc_from_localstorage();
 		if (docs) {
 			invoices = $.map(docs, function (data) {
-				for (key in data) {
+				for (var key in data) {
 					if (data[key].docstatus == 1 && index < 50) {
 						index++
 						data[key].docstatus = 0;
@@ -1683,7 +1683,7 @@
 		this.new_si_docs = [];
 		if (this.removed_items) {
 			$.each(this.si_docs, function (index, data) {
-				for (key in data) {
+				for (var key in data) {
 					if (!in_list(me.removed_items, key)) {
 						me.new_si_docs.push(data);
 					}
@@ -1742,8 +1742,9 @@
 
 	validate_serial_no: function () {
 		var me = this;
-		var item_code = serial_no = '';
-		for (key in this.item_serial_no) {
+		var item_code = ''
+		var serial_no = '';
+		for (var key in this.item_serial_no) {
 			item_code = key;
 			serial_no = me.item_serial_no[key][0];
 		}
@@ -1790,16 +1791,24 @@
 	mandatory_batch_no: function () {
 		var me = this;
 		if (this.items[0].has_batch_no && !this.item_batch_no[this.items[0].item_code]) {
-			frappe.throw(__(repl("Error: Batch no is mandatory for item %(item)s", {
-				'item': this.items[0].item_code
-			})))
+			frappe.prompt([{
+				'fieldname': 'batch',
+				'fieldtype': 'Select',
+				'label': __('Batch No'),
+				'reqd': 1,
+				'options': this.batch_no_data[this.items[0].item_code]
+			}],
+			function(values){
+				me.item_batch_no[me.items[0].item_code] = values.batch;
+			},
+			__('Select Batch No'))
 		}
 	},
 
 	apply_pricing_rule: function () {
 		var me = this;
 		$.each(this.frm.doc["items"], function (n, item) {
-			pricing_rule = me.get_pricing_rule(item)
+			var pricing_rule = me.get_pricing_rule(item)
 			me.validate_pricing_rule(pricing_rule)
 			if (pricing_rule.length) {
 				item.pricing_rule = pricing_rule[0].name;
@@ -1815,7 +1824,7 @@
 				item.pricing_rule = null;
 				me.apply_pricing_rule_on_item(item)
 			}
-			
+
 			if(item.discount_percentage > 0) {
 				me.apply_pricing_rule_on_item(item)
 			}
@@ -1859,7 +1868,7 @@
 
 	validate_condition: function (data) {
 		//This method check condition based on applicable for
-		condition = this.get_mapper_for_pricing_rule(data)[data.applicable_for]
+		var condition = this.get_mapper_for_pricing_rule(data)[data.applicable_for]
 		if (in_list(condition[1], condition[0])) {
 			return true
 		}
@@ -1892,7 +1901,7 @@
 				}
 			})
 
-			count = 0
+			var count = 0
 			$.each(priority_list, function (index, value) {
 				if (value == priority) {
 					count++
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index a6ca3b6..5c6a6df 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -9,8 +9,8 @@
 from frappe.defaults import get_user_permissions
 from frappe.utils import add_days, getdate, formatdate, get_first_day, date_diff, \
 	add_years, get_timestamp, nowdate, flt
-from frappe.geo.doctype.address.address import get_address_display, get_default_address
-from frappe.email.doctype.contact.contact import get_contact_details, get_default_contact
+from frappe.contacts.doctype.address.address import get_address_display, get_default_address
+from frappe.contacts.doctype.contact.contact import get_contact_details, get_default_contact
 from erpnext.exceptions import PartyFrozen, InvalidCurrency, PartyDisabled, InvalidAccountCurrency
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext import get_default_currency
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index 3ab522e..0c24feb 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -20,13 +20,13 @@
 			"fieldname":"report_date",
 			"label": __("As on Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"ageing_based_on",
 			"label": __("Ageing Based On"),
 			"fieldtype": "Select",
-			"options": 'Posting Date' + NEWLINE + 'Due Date',
+			"options": 'Posting Date\nDue Date',
 			"default": "Posting Date"
 		},
 		{
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 0a1734a..6277cc7 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -20,13 +20,13 @@
 			"fieldname":"report_date",
 			"label": __("Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"ageing_based_on",
 			"label": __("Ageing Based On"),
 			"fieldtype": "Select",
-			"options": 'Posting Date' + NEWLINE + 'Due Date',
+			"options": 'Posting Date\nDue Date',
 			"default": "Posting Date"
 		},
 		{
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
index ba847c0..b798d2b 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.html
@@ -1,4 +1,4 @@
-{% var letterhead= filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head"); %}
+{% var letterhead= filters.letter_head || (frappe.get_doc(":Company", filters.company) && frappe.get_doc(":Company", filters.company).default_letter_head) || frappe.defaults.get_default("letter_head"); %}
 {% if(letterhead) { %} 
 <div style="margin-bottom: 7px;" class="text-center">
 	{%= frappe.boot.letter_heads[letterhead].header %}
@@ -21,11 +21,13 @@
 				<th style="width: 40%">{%= __("Party") %}</th>
 				<th style="width: 15%">{%= __("Invoiced Amount") %}</th>
 				<th style="width: 15%">{%= __("Paid Amount") %}</th>
+				<th style="width: 15%">{%= report.report_name === "Accounts Receivable" ? __('Credit Note') : __('Debit Note') %}</th>
 				<th style="width: 15%">{%= __("Outstanding Amount") %}</th>
 			{% } else { %}
 				<th style="width: 40%">{%= __("Party") %}</th>
 				<th style="width: 15%">{%= __("Total Invoiced Amount") %}</th>
 				<th style="width: 15%">{%= __("Total Paid Amount") %}</th>
+				<th style="width: 15%">{%= report.report_name === "Accounts Receivable Summary" ? __('Credit Note Amount') : __('Debit Note Amount') %}</th>
 				<th style="width: 15%">{%= __("Total Outstanding Amount") %}</th>
 			{% } %}
 		</tr>
@@ -45,17 +47,20 @@
 					<td style="text-align: right">
 						{%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
 					<td style="text-align: right">
+						{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"]) : format_currency(data[i]["Debit Note"], data[i]["currency"])  %}</td>
+					<td style="text-align: right">
 						{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
 				{% } else { %}
 					<td></td>
 					<td></td>
 					<td><b>{%= __("Total") %}</b></td>
 					<td style="text-align: right">
-						{%= format_currency(data[i]["Invoiced Amount"]) %}</td>
+						{%= format_currency(data[i]["Invoiced Amount"], data[i]["currency"] ) %}</td>
 					<td style="text-align: right">
-						{%= format_currency(data[i]["Paid Amount"]) %}</td>
+						{%= format_currency(data[i]["Paid Amount"], data[i]["currency"]) %}</td>
+					<td style="text-align: right">{%= report.report_name === "Accounts Receivable" ? format_currency(data[i]["Credit Note"], data[i]["currency"])  : format_currency(data[i]["Debit Note"], data[i]["currency"])  %} </td>
 					<td style="text-align: right">
-						{%= format_currency(data[i]["Outstanding Amount"]) %}</td>
+						{%= format_currency(data[i]["Outstanding Amount"], data[i]["currency"]) %}</td>
 				{% } %}
 			{% } else { %}
 				{% if(data[i][__("Customer")] || data[i][__("Supplier")]|| "&nbsp;") { %}
@@ -65,9 +70,10 @@
 					{% } else { %}
 						<td><b>{%= __("Total") %}</b></td>
 					{% } %}
-					<td style="text-align: right">{%= format_currency(data[i][__("Total Invoiced Amt")]) %}</td>
-					<td style="text-align: right">{%= format_currency(data[i][__("Total Paid Amt")]) %}</td>
-					<td style="text-align: right">{%= format_currency(data[i][__("Total Outstanding Amt")]) %}</td>
+					<td style="text-align: right">{%= format_currency(data[i][__("Total Invoiced Amt")], data[i]["currency"]) %}</td>
+					<td style="text-align: right">{%= format_currency(data[i][__("Total Paid Amt")], data[i]["currency"]) %}</td>
+					<td style="text-align: right">{%= report.report_name === "Accounts Receivable Summary" ? format_currency(data[i][__("Credit Note Amt")], data[i]["currency"]) : format_currency(data[i][__("Debit Note Amt")], data[i]["currency"]) %}</td>
+					<td style="text-align: right">{%= format_currency(data[i][__("Total Outstanding Amt")], data[i]["currency"]) %}</td>
 				{% } %}
 			{% } %}
 			</tr>
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index f98d037..55d8639 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -26,7 +26,7 @@
 			"fieldname":"credit_days_based_on",
 			"label": __("Credit Days Based On"),
 			"fieldtype": "Select",
-			"options": "" + NEWLINE + "Fixed Days" + NEWLINE + "Last Day of the Next Month"
+			"options": "\nFixed Days\nLast Day of the Next Month"
 		},
 		{
 			"fieldtype": "Break",
@@ -35,13 +35,13 @@
 			"fieldname":"report_date",
 			"label": __("As on Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"ageing_based_on",
 			"label": __("Ageing Based On"),
 			"fieldtype": "Select",
-			"options": 'Posting Date' + NEWLINE + 'Due Date',
+			"options": 'Posting Date\nDue Date',
 			"default": "Posting Date"
 		},
 		{
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 a18c1a7..ceed5e5 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -26,7 +26,7 @@
 			"fieldname":"credit_days_based_on",
 			"label": __("Credit Days Based On"),
 			"fieldtype": "Select",
-			"options": "" + NEWLINE + "Fixed Days" + NEWLINE + "Last Day of the Next Month"
+			"options": "\nFixed Days\nLast Day of the Next Month"
 		},
 		{
 			"fieldtype": "Break",
@@ -35,13 +35,13 @@
 			"fieldname":"report_date",
 			"label": __("Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"ageing_based_on",
 			"label": __("Ageing Based On"),
 			"fieldtype": "Select",
-			"options": 'Posting Date' + NEWLINE + 'Due Date',
+			"options": 'Posting Date\nDue Date',
 			"default": "Posting Date"
 		},
 		{
@@ -70,7 +70,7 @@
 	onload: function(report) {
 		report.page.add_inner_button(__("Accounts Receivable"), function() {
 			var filters = report.get_values();
-			frappe.set_route('query-report', 'Accounts Receivable', {company: filters.company});
+			frappe.set_route('query-report', 'Accounts Receivable', { company: filters.company });
 		});
 	}
 }
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
index e4f0384..dbee022 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.js
@@ -14,7 +14,7 @@
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"account",
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
index e420fb9..0f9fdd7 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js
@@ -25,7 +25,7 @@
 			"fieldname":"report_date",
 			"label": __("Date"),
 			"fieldtype": "Date",
-			"default": get_today(),
+			"default": frappe.datetime.get_today(),
 			"reqd": 1
 		},
 	]
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 2b7f1f3..1315b25 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -8,7 +8,7 @@
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: sys_defaults.fiscal_year,
+			default: frappe.sys_defaults.fiscal_year,
 			reqd: 1
 		},
 		{
diff --git a/erpnext/accounts/report/financial_statements.html b/erpnext/accounts/report/financial_statements.html
index cd92139..dc9815b 100644
--- a/erpnext/accounts/report/financial_statements.html
+++ b/erpnext/accounts/report/financial_statements.html
@@ -13,7 +13,7 @@
 		height: 37px;
 	}
 </style>
-{% var letterhead= filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head"); %}
+{% var letterhead= filters.letter_head || (frappe.get_doc(":Company", filters.company) && frappe.get_doc(":Company", filters.company).default_letter_head) || frappe.defaults.get_default("letter_head"); %}
 {% if(letterhead) { %} 
 <div style="margin-bottom: 7px;" class="text-center">
 	{%= frappe.boot.letter_heads[letterhead].header %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index b0ca19f..0a25225 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -1,4 +1,4 @@
-{% var letterhead= filters.letter_head || frappe.get_doc(":Company", filters.company).default_letter_head || frappe.defaults.get_default("letter_head"); %}
+{% var letterhead= filters.letter_head || (frappe.get_doc(":Company", filters.company) && frappe.get_doc(":Company", filters.company).default_letter_head) || frappe.defaults.get_default("letter_head"); %}
 {% if(letterhead) { %} 
 <div style="margin-bottom: 7px;" class="text-center">
 	{%= frappe.boot.letter_heads[letterhead].header %}
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 bad826e..8d33524 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
@@ -14,7 +14,7 @@
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname": "item_code",
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 142a55f..65cec51 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
@@ -14,7 +14,7 @@
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"customer",
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 5c20510..9d4a352 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
@@ -21,7 +21,7 @@
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: get_today()
+			default: frappe.datetime.get_today()
 		},
 		{
 			fieldname:"payment_type",
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 95085b9..6729d67 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
@@ -34,28 +34,31 @@
 	return columns, data, None, chart
 
 def get_net_profit_loss(income, expense, period_list, company):
-	if income and expense:
-		total = 0
-		net_profit_loss = {
-			"account_name": "'" + _("Net Profit / Loss") + "'",
-			"account": "'" + _("Net Profit / Loss") + "'",
-			"warn_if_negative": True,
-			"currency": frappe.db.get_value("Company", company, "default_currency")
-		}
+	total = 0
+	net_profit_loss = {
+		"account_name": "'" + _("Net Profit / Loss") + "'",
+		"account": "'" + _("Net Profit / Loss") + "'",
+		"warn_if_negative": True,
+		"currency": frappe.db.get_value("Company", company, "default_currency")
+	}
 
-		has_value = False
+	has_value = False
 
-		for period in period_list:
-			net_profit_loss[period.key] = flt(income[-2][period.key] - expense[-2][period.key], 3)
+	for period in period_list:
+		total_income = flt(income[-2][period.key], 3) if income else 0
+		total_expense = flt(expense[-2][period.key], 3) if expense else 0
 
-			if net_profit_loss[period.key]:
-				has_value=True
+		net_profit_loss[period.key] = total_income - total_expense
 
-			total += flt(net_profit_loss[period.key])
-			net_profit_loss["total"] = total
+		if net_profit_loss[period.key]:
+			has_value=True
 
-		if has_value:
-			return net_profit_loss
+		total += flt(net_profit_loss[period.key])
+		net_profit_loss["total"] = total
+
+	if has_value:
+		return net_profit_loss
+
 
 def get_chart_data(filters, columns, income, expense, net_profit_loss):
 	x_intervals = ['x'] + [d.get("label") for d in columns[2:]]
diff --git a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
index cc00b2a..a95cfac 100644
--- a/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
+++ b/erpnext/accounts/report/purchase_invoice_trends/purchase_invoice_trends.js
@@ -3,6 +3,6 @@
 
 frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
 	frappe.query_reports["Purchase Invoice Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_purchase_trends_filters()
 	}
 });
\ No newline at end of file
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.js b/erpnext/accounts/report/purchase_register/purchase_register.js
index d32f7b6..cd79531 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.js
+++ b/erpnext/accounts/report/purchase_register/purchase_register.js
@@ -14,7 +14,7 @@
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"supplier",
diff --git a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
index 0f92223..2d320f5 100644
--- a/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
+++ b/erpnext/accounts/report/sales_invoice_trends/sales_invoice_trends.js
@@ -3,6 +3,6 @@
 
 frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
 	frappe.query_reports["Sales Invoice Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_sales_trends_filters()
 	}
 });
\ No newline at end of file
diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
index d7aac5a..2ac4ae8 100644
--- a/erpnext/accounts/report/sales_register/sales_register.js
+++ b/erpnext/accounts/report/sales_register/sales_register.js
@@ -14,7 +14,7 @@
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		},
 		{
 			"fieldname":"customer",
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 1721fa9..560ba4d 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -216,7 +216,8 @@
 			else:
 				dr_or_cr = "debit" if fieldname == "invoiced_amount" else "credit"
 				cr_or_dr = "credit" if fieldname == "invoiced_amount" else "debit"
-				select_fields = "ifnull(sum(credit-debit),0)" if fieldname == "invoiced_amount" else "ifnull(sum(debit-credit),0)"
+				select_fields = "ifnull(sum(credit-debit),0)" \
+					if fieldname == "invoiced_amount" else "ifnull(sum(debit-credit),0)"
 
 				if ((not gle.against_voucher) or (gle.against_voucher_type in ["Sales Order", "Purchase Order"]) or
 				(gle.against_voucher==gle.voucher_no and gle.get(dr_or_cr) > 0)):
@@ -224,8 +225,10 @@
 						SELECT {0}
 						FROM `tabGL Entry` gle
 						WHERE docstatus < 2 and posting_date <= %(date)s and against_voucher = %(voucher_no)s
-						and party = %(party)s and name != %(name)s""".format(select_fields),
-						{"date": date, "voucher_no": gle.voucher_no, "party": gle.party, "name": gle.name})[0][0]
+						and party = %(party)s and name != %(name)s"""
+						.format(select_fields),
+						{"date": date, "voucher_no": gle.voucher_no, 
+							"party": gle.party, "name": gle.name})[0][0]
 
 					outstanding_amount = flt(gle.get(dr_or_cr)) - flt(gle.get(cr_or_dr)) - payment_amount
 					currency_precision = get_currency_precision() or 2
@@ -519,20 +522,19 @@
 
 def get_stock_and_account_difference(account_list=None, posting_date=None):
 	from erpnext.stock.utils import get_stock_value_on
+	from erpnext.stock import get_warehouse_account_map
 
 	if not posting_date: posting_date = nowdate()
 
 	difference = {}
+	warehouse_account = get_warehouse_account_map()
 
-	account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount
-		where account_type = 'Stock' and (warehouse is not null and warehouse != '') and is_group=0
-		and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list))
-
-	for account, warehouse in account_warehouse.items():
-		account_balance = get_balance_on(account, posting_date, in_account_currency=False)
-		stock_value = get_stock_value_on(warehouse, posting_date)
-		if abs(flt(stock_value) - flt(account_balance)) > 0.005:
-			difference.setdefault(account, flt(stock_value) - flt(account_balance))
+	for warehouse, account_data in warehouse_account.items():
+		if account_data.get('account') in account_list:
+			account_balance = get_balance_on(account_data.get('account'), posting_date, in_account_currency=False)
+			stock_value = get_stock_value_on(warehouse, posting_date)
+			if abs(flt(stock_value) - flt(account_balance)) > 0.005:
+				difference.setdefault(account, flt(stock_value) - flt(account_balance))
 
 	return difference
 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index cfd3336..c533e6b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -55,7 +55,7 @@
 
 			if(is_drop_ship && doc.status!="Delivered"){
 				cur_frm.add_custom_button(__('Delivered'),
-					 this.delivered_by_supplier, __("Status"));
+					this.delivered_by_supplier, __("Status"));
 
 				cur_frm.page.set_inner_btn_group_as_primary(__("Status"));
 			}
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index ecce118..3816049 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -99,10 +102,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -135,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,6 +170,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -195,6 +201,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -223,6 +230,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -253,6 +261,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +293,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -315,6 +325,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -347,6 +358,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -377,6 +389,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -408,6 +421,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -438,6 +452,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -466,6 +481,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -497,6 +513,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -526,6 +543,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -555,6 +573,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -585,6 +604,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -614,6 +634,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -643,6 +664,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -672,6 +694,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -701,6 +724,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -729,6 +753,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -757,6 +782,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -785,6 +811,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -813,6 +840,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -844,6 +872,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -873,6 +902,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -902,6 +932,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -933,6 +964,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -965,6 +997,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -992,6 +1025,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1021,6 +1055,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1050,6 +1085,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1079,6 +1115,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1107,6 +1144,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1137,6 +1175,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1168,6 +1207,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1198,6 +1238,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1228,6 +1269,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1255,6 +1297,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1285,6 +1328,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1316,6 +1360,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1343,6 +1388,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1373,6 +1419,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1404,6 +1451,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1434,6 +1482,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1466,6 +1515,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1497,6 +1547,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1526,6 +1577,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1556,6 +1608,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1587,6 +1640,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1618,6 +1672,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1649,6 +1704,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1677,6 +1733,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1708,6 +1765,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1739,6 +1797,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1769,6 +1828,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1799,6 +1859,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1830,6 +1891,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1860,6 +1922,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1888,6 +1951,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1917,6 +1981,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1947,6 +2012,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1975,6 +2041,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2006,6 +2073,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2037,6 +2105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2068,6 +2137,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2096,6 +2166,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2127,6 +2198,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2157,6 +2229,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2186,6 +2259,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2217,6 +2291,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2248,6 +2323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2278,6 +2354,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2307,6 +2384,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2339,6 +2417,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2369,6 +2448,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2399,6 +2479,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2427,6 +2508,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2459,6 +2541,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2491,6 +2574,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2522,6 +2606,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2553,6 +2638,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2584,6 +2670,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2612,6 +2699,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2642,6 +2730,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2673,6 +2762,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2705,6 +2795,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2736,6 +2827,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2767,6 +2859,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2795,6 +2888,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2825,6 +2919,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2856,6 +2951,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2887,6 +2983,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2917,6 +3014,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2947,6 +3045,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2977,6 +3076,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3008,6 +3108,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3039,6 +3140,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3070,6 +3172,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3098,6 +3201,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3128,6 +3232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3158,6 +3263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3199,7 +3305,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-18 18:49:49.535066", 
+ "modified": "2017-06-13 14:29:21.066814", 
  "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 e7b0d1a..b96245e 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -43,7 +43,7 @@
 		self.check_for_closed_status()
 
 		self.validate_uom_is_integer("uom", "qty")
-		self.validate_uom_is_integer("stock_uom", ["qty", "required_qty"])
+		self.validate_uom_is_integer("stock_uom", "stock_qty")
 
 		self.validate_with_previous_doc()
 		self.validate_for_subcontracting()
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
index 50382d5..df10a54 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py
@@ -10,7 +10,7 @@
 		'internal_links': {
 			'Material Request': ['items', 'material_request'],
 			'Supplier Quotation': ['items', 'supplier_quotation'],
-			'Project': ['project'],
+			'Project': ['items', 'project'],
 		},
 		'transactions': [
 			{
@@ -30,4 +30,4 @@
 				'items': ['Stock Entry']
 			}
 		]
-	}
\ No newline at end of file
+	}
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
index f6e7eeb..99f372b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js
@@ -1,34 +1,34 @@
 frappe.listview_settings['Purchase Order'] = {
 	add_fields: ["base_grand_total", "company", "currency", "supplier",
 		"supplier_name", "per_received", "per_billed", "status"],
-	get_indicator: function(doc) {
-        if(doc.status==="Closed"){
+	get_indicator: function (doc) {
+		if (doc.status === "Closed") {
 			return [__("Closed"), "green", "status,=,Closed"];
-		} else if (doc.status==="Delivered") {
+		} else if (doc.status === "Delivered") {
 			return [__("Delivered"), "green", "status,=,Closed"];
-		}else if(flt(doc.per_received, 2) < 100 && doc.status!=="Closed") {
-			if(flt(doc.per_billed, 2) < 100) {
+		} else if (flt(doc.per_received, 2) < 100 && doc.status !== "Closed") {
+			if (flt(doc.per_billed, 2) < 100) {
 				return [__("To Receive and Bill"), "orange",
 					"per_received,<,100|per_billed,<,100|status,!=,Closed"];
 			} else {
 				return [__("To Receive"), "orange",
 					"per_received,<,100|per_billed,=,100|status,!=,Closed"];
 			}
-		} else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) < 100 && doc.status!=="Closed") {
+		} else if (flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) < 100 && doc.status !== "Closed") {
 			return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Closed"];
-		} else if(flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) == 100 && doc.status!=="Closed") {
+		} else if (flt(doc.per_received, 2) == 100 && flt(doc.per_billed, 2) == 100 && doc.status !== "Closed") {
 			return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Closed"];
 		}
 	},
-	onload: function(listview) {
+	onload: function (listview) {
 		var method = "erpnext.buying.doctype.purchase_order.purchase_order.close_or_unclose_purchase_orders";
 
-		listview.page.add_menu_item(__("Close"), function() {
-			listview.call_for_selected_items(method, {"status": "Closed"});
+		listview.page.add_menu_item(__("Close"), function () {
+			listview.call_for_selected_items(method, { "status": "Closed" });
 		});
 
-		listview.page.add_menu_item(__("Re-open"), function() {
-			listview.call_for_selected_items(method, {"status": "Submitted"});
+		listview.page.add_menu_item(__("Re-open"), function () {
+			listview.call_for_selected_items(method, { "status": "Submitted" });
 		});
 	}
 };
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
index 593f667..ce759aa 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js
@@ -56,17 +56,17 @@
 		var dialog = new frappe.ui.Dialog({
 			title: __("For Supplier"),
 			fields: [
-				{"fieldtype": "Select", "label": __("Supplier"),
-					"fieldname": "supplier", "options":"Supplier",
-					"options": $.map(doc.suppliers,
-						function(d) { return d.supplier }), "reqd": 1 },
-				{"fieldtype": "Button", "label": __("Make Supplier Quotation"),
-					"fieldname": "make_supplier_quotation", "cssClass": "btn-primary"},
+				{	"fieldtype": "Select", "label": __("Supplier"),
+					"fieldname": "supplier",
+					"options": doc.suppliers.map(d => d.supplier),
+					"reqd": 1 },
+				{	"fieldtype": "Button", "label": __("Make Supplier Quotation"),
+					"fieldname": "make_supplier_quotation", "cssClass": "btn-primary" },
 			]
 		});
 
 		dialog.fields_dict.make_supplier_quotation.$input.click(function() {
-			args = dialog.get_values();
+			var args = dialog.get_values();
 			if(!args) return;
 			dialog.hide();
 			return frappe.call({
@@ -117,7 +117,7 @@
 			+"&supplier_idx="+encodeURIComponent(child.idx)
 			+"&no_letterhead=0"));
 		if(!w) {
-			msgprint(__("Please enable pop-ups")); return;
+			frappe.msgprint(__("Please enable pop-ups")); return;
 		}
 	}
 })
@@ -144,44 +144,44 @@
 						}
 					})
 				}, __("Get items from"));
-				// Get items from open Material Requests based on supplier
-				this.frm.add_custom_button(__('Possible Supplier'), function() {
-					// Create a dialog window for the user to pick their supplier
-					var d = new frappe.ui.Dialog({
-						title: __('Select Possible Supplier'),
-						fields: [
-						{fieldname: 'supplier', fieldtype:'Link', options:'Supplier', label:'Supplier', reqd:1},
-						{fieldname: 'ok_button', fieldtype:'Button', label:'Get Items from Material Requests'},
-						]
-					});
+			// Get items from open Material Requests based on supplier
+			this.frm.add_custom_button(__('Possible Supplier'), function() {
+				// Create a dialog window for the user to pick their supplier
+				var d = new frappe.ui.Dialog({
+					title: __('Select Possible Supplier'),
+					fields: [
+					{fieldname: 'supplier', fieldtype:'Link', options:'Supplier', label:'Supplier', reqd:1},
+					{fieldname: 'ok_button', fieldtype:'Button', label:'Get Items from Material Requests'},
+					]
+				});
 
-					// On the user clicking the ok button
-					d.fields_dict.ok_button.input.onclick = function() {
-						var btn = d.fields_dict.ok_button.input;
-						var v = d.get_values();
-						if(v) {
-							$(btn).set_working();
+				// On the user clicking the ok button
+				d.fields_dict.ok_button.input.onclick = function() {
+					var btn = d.fields_dict.ok_button.input;
+					var v = d.get_values();
+					if(v) {
+						$(btn).set_working();
 
-							erpnext.utils.map_current_doc({
-								method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_item_from_material_requests_based_on_supplier",
-								source_name: v.supplier,
-								target: me.frm,
-								setters: {
-									company: me.frm.doc.company
-								},
-								get_query_filters: {
-									material_request_type: "Purchase",
-									docstatus: 1,
-									status: ["!=", "Stopped"],
-									per_ordered: ["<", 99.99]
-								}
-							});
-							$(btn).done_working();
-							d.hide();
-						}
+						erpnext.utils.map_current_doc({
+							method: "erpnext.buying.doctype.request_for_quotation.request_for_quotation.get_item_from_material_requests_based_on_supplier",
+							source_name: v.supplier,
+							target: me.frm,
+							setters: {
+								company: me.frm.doc.company
+							},
+							get_query_filters: {
+								material_request_type: "Purchase",
+								docstatus: 1,
+								status: ["!=", "Stopped"],
+								per_ordered: ["<", 99.99]
+							}
+						});
+						$(btn).done_working();
+						d.hide();
 					}
-					d.show();
-				}, __("Get items from"));
+				}
+				d.show();
+			}, __("Get items from"));
 
 		}
 	},
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index c626f22..ac345d9 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,10 +42,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -77,6 +80,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -108,6 +112,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -139,6 +144,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -170,6 +176,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -199,6 +206,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -229,6 +237,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -260,6 +269,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -292,6 +302,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -302,6 +313,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Link to material requests", 
@@ -320,6 +333,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -349,6 +363,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -379,6 +394,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -408,6 +424,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -440,6 +457,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -472,6 +490,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -503,6 +522,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -532,6 +552,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -564,6 +585,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -596,6 +618,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -627,6 +650,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -659,6 +683,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -691,6 +716,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -719,6 +745,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -748,18 +775,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-shopping-cart", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-28 16:44:39.531065", 
+ "modified": "2017-06-13 14:29:13.171291", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Request for Quotation", 
@@ -918,4 +945,4 @@
  "title_field": "", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index 7e5e045..7fae7b9 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -2,10 +2,10 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Supplier", {
-	setup: function(frm) {
-		frm.set_query('default_price_list', { 'buying': 1});
-		frm.set_query('account', 'accounts', function(doc, cdt, cdn) {
-			var d  = locals[cdt][cdn];
+	setup: function (frm) {
+		frm.set_query('default_price_list', { 'buying': 1 });
+		frm.set_query('account', 'accounts', function (doc, cdt, cdn) {
+			var d = locals[cdt][cdn];
 			return {
 				filters: {
 					'account_type': 'Payable',
@@ -15,30 +15,30 @@
 			}
 		});
 	},
-	refresh: function(frm) {
-		frappe.dynamic_link = {doc: frm.doc, fieldname: 'name', doctype: 'Supplier'}
+	refresh: function (frm) {
+		frappe.dynamic_link = { doc: frm.doc, fieldname: 'name', doctype: 'Supplier' }
 
-		if(frappe.defaults.get_default("supp_master_name")!="Naming Series") {
+		if (frappe.defaults.get_default("supp_master_name") != "Naming Series") {
 			frm.toggle_display("naming_series", false);
 		} else {
 			erpnext.toggle_naming_series();
 		}
 
-		if(frm.doc.__islocal){
-	    	hide_field(['address_html','contact_html']);
-			frappe.geo.clear_address_and_contact(frm);
+		if (frm.doc.__islocal) {
+			hide_field(['address_html','contact_html']);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 		else {
-		  	unhide_field(['address_html','contact_html']);
-			frappe.geo.render_address_and_contact(frm);
+			unhide_field(['address_html','contact_html']);
+			frappe.contacts.render_address_and_contact(frm);
 
 			// custom buttons
-			frm.add_custom_button(__('Accounting Ledger'), function() {
+			frm.add_custom_button(__('Accounting Ledger'), function () {
 				frappe.set_route('query-report', 'General Ledger',
-					{party_type:'Supplier', party:frm.doc.name});
+					{ party_type: 'Supplier', party: frm.doc.name });
 			});
-			frm.add_custom_button(__('Accounts Payable'), function() {
-				frappe.set_route('query-report', 'Accounts Payable', {supplier:frm.doc.name});
+			frm.add_custom_button(__('Accounts Payable'), function () {
+				frappe.set_route('query-report', 'Accounts Payable', { supplier: frm.doc.name });
 			});
 
 			// indicators
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 746dd22..58a1fc7 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -74,7 +74,7 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -850,7 +850,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-05-17 12:21:21.218428", 
+ "modified": "2017-06-13 14:29:16.310834", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier", 
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index 3b6ae62..b2b9063 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -6,7 +6,7 @@
 import frappe.defaults
 from frappe import msgprint, _
 from frappe.model.naming import make_autoname
-from frappe.geo.address_and_contact import load_address_and_contact, delete_contact_and_address
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 from erpnext.utilities.transaction_base import TransactionBase
 from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
index 6bcbdba..3767248 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -5,7 +5,7 @@
 {% include 'erpnext/public/js/controllers/buying.js' %};
 
 frappe.ui.form.on('Suppier Quotation', {
-	setup: function() {
+	setup: function(frm) {
 		frm.custom_make_buttons = {
 			'Purchase Order': 'Purchase Order'
 		}
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 4eb8788..4c4603f 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -71,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -98,10 +102,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -134,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -192,6 +199,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -254,6 +263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -286,6 +296,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -315,6 +326,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -344,6 +356,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -373,6 +386,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -401,6 +415,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -429,6 +444,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -457,6 +473,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -486,6 +503,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -515,6 +533,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -546,6 +565,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -578,6 +598,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -607,6 +628,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -636,6 +658,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -666,6 +689,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -696,6 +720,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -724,6 +749,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -754,6 +780,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -785,6 +812,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -795,6 +823,8 @@
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Link to material requests", 
@@ -813,6 +843,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -840,6 +871,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -870,6 +902,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -901,6 +934,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -928,6 +962,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -958,6 +993,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -989,6 +1025,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1019,6 +1056,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1051,6 +1089,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1082,6 +1121,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1111,6 +1151,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1141,6 +1182,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1172,6 +1214,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1203,6 +1246,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1234,6 +1278,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1262,6 +1307,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1293,6 +1339,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1324,6 +1371,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1354,6 +1402,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1384,6 +1433,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1415,6 +1465,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1445,6 +1496,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1473,6 +1525,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1502,6 +1555,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1532,6 +1586,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1560,6 +1615,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1591,6 +1647,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1622,6 +1679,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1653,6 +1711,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1681,6 +1740,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1712,6 +1772,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1742,6 +1803,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1773,6 +1835,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1804,6 +1867,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1834,6 +1898,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1863,6 +1928,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1894,6 +1960,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1925,6 +1992,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1954,6 +2022,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1984,6 +2053,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2015,6 +2085,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2042,6 +2113,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2072,6 +2144,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2101,6 +2174,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2131,19 +2205,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-shopping-cart", 
  "idx": 29, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-02-28 16:45:32.200667", 
+ "modified": "2017-06-13 14:28:54.466450", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
@@ -2261,4 +2335,4 @@
  "title_field": "title", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.js b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
index 10d1321..de3d337 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.js
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.js
@@ -10,7 +10,6 @@
 
 	new erpnext.PurchaseAnalytics(wrapper);
 
-
 	frappe.breadcrumbs.add("Buying");
 }
 
@@ -18,7 +17,6 @@
 	init: function(wrapper) {
 		this._super({
 			title: __("Purchase Analytics"),
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Item", "Item Group", "Supplier", "Supplier Type", "Company", "Fiscal Year",
@@ -193,13 +191,13 @@
 	},
 	prepare_balances: function() {
 		var me = this;
-		var from_date = dateutil.str_to_obj(this.from_date);
-		var to_date = dateutil.str_to_obj(this.to_date);
+		var from_date = frappe.datetime.str_to_obj(this.from_date);
+		var to_date = frappe.datetime.str_to_obj(this.to_date);
 		var is_val = this.value_or_qty == 'Value';
 
 		$.each(this.tl[this.based_on], function(i, tl) {
 			if (me.is_default('company') ? true : tl.company === me.company) {
-				var posting_date = dateutil.str_to_obj(tl.posting_date);
+				var posting_date = frappe.datetime.str_to_obj(tl.posting_date);
 				if (posting_date >= from_date && posting_date <= to_date) {
 					var item = me.item_by_name[tl[me.tree_grid.item_key]] ||
 						me.item_by_name['Not Set'];
diff --git a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
index f7fe90f..83d25d8 100644
--- a/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
+++ b/erpnext/buying/report/purchase_order_trends/purchase_order_trends.js
@@ -3,6 +3,6 @@
 
 frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
 	frappe.query_reports["Purchase Order Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_purchase_trends_filters()
 	}
 });
\ No newline at end of file
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
index 9b0b243..ad6ea7d 100644
--- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
@@ -3,30 +3,26 @@
 
 frappe.query_reports["Quoted Item Comparison"] = {
 	"filters": [
-	{
-		"fieldname":"supplier_quotation",
-		"label": __("Supplier Quotation"),
-		"fieldtype": "Link",
-		"options": "Supplier Quotation",
-		"default": "",
-		"get_query": function() {
-				return {
-					filters: {"docstatus": ["<",2]}
-				}
+		{
+			"fieldname": "supplier_quotation",
+			"label": __("Supplier Quotation"),
+			"fieldtype": "Link",
+			"options": "Supplier Quotation",
+			"default": "",
+			"get_query": function () {
+				return { filters: { "docstatus": ["<", 2] } }
 			}
-		
-		
-	},{
-		"fieldname":"item",
-		"label": __("Item"),
-		"fieldtype": "Link",
-		"options": "Item",
-		"default": "",
-		"reqd": 1,
-		"get_query": function() {
+		},
+		{
+			"fieldname": "item",
+			"label": __("Item"),
+			"fieldtype": "Link",
+			"options": "Item",
+			"default": "",
+			"reqd": 1,
+			"get_query": function () {
 				var quote = frappe.query_report_filters_by_name.supplier_quotation.get_value();
-				if (quote != "")
-				{
+				if (quote != "") {
 					return {
 						query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
 						filters: {
@@ -35,79 +31,74 @@
 						}
 					}
 				}
-				else{
-					return{
-						filters: {"disabled":0}
+				else {
+					return {
+						filters: { "disabled": 0 }
 					}
 				}
 			}
-	}
+		}
 	],
-	onload: function(report) {
-		//Create a button for setting the default supplier
-		report.page.add_inner_button(__("Select Default Supplier"), function() {
+	onload: function (report) {
+		// Create a button for setting the default supplier
+		report.page.add_inner_button(__("Select Default Supplier"), function () {
 
 			var reporter = frappe.query_reports["Quoted Item Comparison"];
-			
+
 			//Always make a new one so that the latest values get updated
 			reporter.make_default_supplier_dialog(report);
 			report.dialog.show();
-			setTimeout(function() { report.dialog.input.focus(); }, 1000);
-				
+			setTimeout(function () { report.dialog.input.focus(); }, 1000);
+
 		}, 'Tools');
-		
+
 	},
 	"make_default_supplier_dialog": function (report) {
-		//Get the name of the item to change
+		// Get the name of the item to change
 		var filters = report.get_values();
 		var item_code = filters.item;
-		
-		//Get a list of the suppliers (with a blank as well) for the user to select
+
+		// Get a list of the suppliers (with a blank as well) for the user to select
 		var select_options = "";
-		for (let supplier of report.data)
-		{
-			select_options += supplier.supplier_name+ '\n'
+		for (let supplier of report.data) {
+			select_options += supplier.supplier_name + '\n'
 		}
-		
-		//Create a dialog window for the user to pick their supplier
+
+		// Create a dialog window for the user to pick their supplier
 		var d = new frappe.ui.Dialog({
 			title: __('Select Default Supplier'),
 			fields: [
-			{fieldname: 'supplier', fieldtype:'Select', label:'Supplier', reqd:1,options:select_options},
-			{fieldname: 'ok_button', fieldtype:'Button', label:'Set Default Supplier'},
+				{ fieldname: 'supplier', fieldtype: 'Select', label: 'Supplier', reqd: 1, options: select_options },
+				{ fieldname: 'ok_button', fieldtype: 'Button', label: 'Set Default Supplier' },
 			]
 		});
-		
-		//On the user clicking the ok button
-		d.fields_dict.ok_button.input.onclick = function() {
+
+		// On the user clicking the ok button
+		d.fields_dict.ok_button.input.onclick = function () {
 			var btn = d.fields_dict.ok_button.input;
 			var v = report.dialog.get_values();
-			if(v) {
+			if (v) {
 				$(btn).set_working();
-				
-				//Set the default_supplier field of the appropriate Item to the selected supplier
+
+				// Set the default_supplier field of the appropriate Item to the selected supplier
 				frappe.call({
 					method: "frappe.client.set_value",
 					args: {
-						doctype: "Item", 
+						doctype: "Item",
 						name: item_code,
 						fieldname: "default_supplier",
-						value: v.supplier, 
+						value: v.supplier,
 					},
-					callback: function (r){
+					callback: function (r) {
 						$(btn).done_working();
-						msgprint("Successfully Set Supplier");
+						frappe.msgprint("Successfully Set Supplier");
 						report.dialog.hide();
-
 					}
 				});
 			}
 		}
 		report.dialog = d;
-		
-		
 	}
-	
 }
 
 
diff --git a/erpnext/commands/__init__.py b/erpnext/commands/__init__.py
new file mode 100644
index 0000000..a991cf9
--- /dev/null
+++ b/erpnext/commands/__init__.py
@@ -0,0 +1,49 @@
+# Copyright (c) 2015, Web Notes Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals, absolute_import, print_function
+import click
+import frappe
+from frappe.commands import pass_context, get_site
+
+def call_command(cmd, context):
+	return click.Context(cmd, obj=context).forward(cmd)
+
+@click.command('make-demo')
+@click.option('--site', help='site name')
+@click.option('--domain', default='Manufacturing')
+@click.option('--days', default=100,
+	help='Run the demo for so many days. Default 100')
+@click.option('--resume', default=False, is_flag=True,
+	help='Continue running the demo for given days')
+@click.option('--reinstall', default=False, is_flag=True,
+	help='Reinstall site before demo')
+@pass_context
+def make_demo(context, site, domain='Manufacturing', days=100,
+	resume=False, reinstall=False):
+	"Reinstall site and setup demo"
+	from frappe.commands.site import _reinstall
+	from frappe.installer import install_app
+
+	site = get_site(context)
+
+	if resume:
+		with frappe.init_site(site):
+			frappe.connect()
+			from erpnext.demo import demo
+			demo.simulate(days=days)
+	else:
+		if reinstall:
+			_reinstall(site, yes=True)
+		with frappe.init_site(site=site):
+			frappe.connect()
+			if not 'erpnext' in frappe.get_installed_apps():
+				install_app('erpnext')
+
+			# import needs site
+			from erpnext.demo import demo
+			demo.make(domain, days)
+
+commands = [
+	make_demo
+]
\ No newline at end of file
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index bbae245..fef902e 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -121,7 +121,7 @@
 					"type": "report",
 					"is_query_report": True,
 					"name": "Addresses And Contacts",
-					"label": "Sales Partner Addresses And Contacts",
+					"label": _("Sales Partner Addresses And Contacts"),
 					"doctype": "Address",
 					"route_options": {
 						"party_type": "Sales Partner"
@@ -226,7 +226,7 @@
 					"type": "report",
 					"is_query_report": True,
 					"name": "Addresses And Contacts",
-					"label": "Customer Addresses And Contacts",
+					"label": _("Customer Addresses And Contacts"),
 					"doctype": "Address",
 					"route_options": {
 						"party_type": "Customer"
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 3a3e873..ba38b1f 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -274,7 +274,9 @@
 		if not account_currency:
 			account_currency = get_account_currency(gl_dict.account)
 
-		if self.doctype not in ["Journal Entry", "Period Closing Voucher", "Payment Entry"]:
+		if gl_dict.account and self.doctype not in ["Journal Entry", 
+			"Period Closing Voucher", "Payment Entry"]:
+			
 			self.validate_account_currency(gl_dict.account, account_currency)
 			set_balance_in_account_currency(gl_dict, account_currency, self.get("conversion_rate"), self.company_currency)
 
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 5bc8bb3..d770af3 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -73,10 +73,13 @@
 
 	def validate_stock_or_nonstock_items(self):
 		if self.meta.get_field("taxes") and not self.get_stock_items():
-			tax_for_valuation = [d.account_head for d in self.get("taxes")
+			tax_for_valuation = [d for d in self.get("taxes")
 				if d.category in ["Valuation", "Valuation and Total"]]
+
 			if tax_for_valuation:
-				frappe.throw(_("Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items"))
+				for d in tax_for_valuation:
+					d.category = 'Total'
+				msgprint(_('Tax Category has been changed to "Total" because all the Items are non-stock items'))
 
 	def set_landed_cost_voucher_amount(self):
 		for d in self.get("items"):
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 45447d7..0074560 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -71,7 +71,7 @@
 	already_returned_items = get_already_returned_items(doc)
 
 	# ( not mandatory when it is Purchase Invoice or a Sales Invoice without Update Stock )
-	warehouse_mandatory = not (doc.doctype=="Purchase Invoice" or (doc.doctype=="Sales Invoice" and not doc.update_stock))
+	warehouse_mandatory = not ((doc.doctype=="Purchase Invoice" or doc.doctype=="Sales Invoice") and not doc.update_stock)
 
 	items_returned = False
 	for d in doc.get("items"):
@@ -101,8 +101,9 @@
 								frappe.throw(_("Row # {0}: Serial No {1} does not match with {2} {3}")
 									.format(d.idx, s, doc.doctype, doc.return_against))
 
-				if warehouse_mandatory and not d.get("warehouse"):
-					frappe.throw(_("Warehouse is mandatory"))
+				if warehouse_mandatory and frappe.db.get_value("Item", d.item_code, "is_stock_item") \
+					and not d.get("warehouse"):
+						frappe.throw(_("Warehouse is mandatory"))
 
 			items_returned = True
 
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index 3649cc1..822712f 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -10,6 +10,7 @@
 from erpnext.accounts.general_ledger import make_gl_entries, delete_gl_entries, process_gl_map
 from erpnext.controllers.accounts_controller import AccountsController
 from erpnext.stock.stock_ledger import get_valuation_rate
+from erpnext.stock import get_warehouse_account_map
 
 class StockController(AccountsController):
 	def validate(self):
@@ -21,7 +22,7 @@
 			delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
 		if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
-			warehouse_account = get_warehouse_account()
+			warehouse_account = get_warehouse_account_map()
 
 			if self.docstatus==1:
 				if not gl_entries:
@@ -37,7 +38,7 @@
 			default_cost_center=None):
 
 		if not warehouse_account:
-			warehouse_account = get_warehouse_account()
+			warehouse_account = get_warehouse_account_map()
 
 		sle_map = self.get_stock_ledger_details()
 		voucher_details = self.get_voucher_details(default_expense_account, default_cost_center, sle_map)
@@ -66,7 +67,7 @@
 							sle = self.update_stock_ledger_entries(sle)
 
 						gl_list.append(self.get_gl_dict({
-							"account": warehouse_account[sle.warehouse]["name"],
+							"account": warehouse_account[sle.warehouse]["account"],
 							"against": item_row.expense_account,
 							"cost_center": item_row.cost_center,
 							"remarks": self.get("remarks") or "Accounting Entry for Stock",
@@ -76,7 +77,7 @@
 						# to target warehouse / expense account
 						gl_list.append(self.get_gl_dict({
 							"account": item_row.expense_account,
-							"against": warehouse_account[sle.warehouse]["name"],
+							"against": warehouse_account[sle.warehouse]["account"],
 							"cost_center": item_row.cost_center,
 							"remarks": self.get("remarks") or "Accounting Entry for Stock",
 							"credit": flt(sle.stock_value_difference, 2),
@@ -88,10 +89,7 @@
 		if warehouse_with_no_account:
 			for wh in warehouse_with_no_account:
 				if frappe.db.get_value("Warehouse", wh, "company"):
-					frappe.throw(_("Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.").format(wh))
-
-			msgprint(_("No accounting entries for the following warehouses") + ": \n" +
-				"\n".join(warehouse_with_no_account))
+					frappe.throw(_("Warehouse {0} is not linked to any account, please mention the account in  the warehouse record or set default inventory account in company {1}.").format(wh, self.company))
 
 		return process_gl_map(gl_list)
 
@@ -341,7 +339,7 @@
 			where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no))
 
 	if not warehouse_account:
-		warehouse_account = get_warehouse_account()
+		warehouse_account = get_warehouse_account_map()
 
 	future_stock_vouchers = get_future_stock_vouchers(posting_date, posting_time, for_warehouses, for_items)
 	gle = get_voucherwise_gl_entries(future_stock_vouchers, posting_date)
@@ -405,22 +403,4 @@
 			tuple([posting_date] + [d[1] for d in future_stock_vouchers]), as_dict=1):
 				gl_entries.setdefault((d.voucher_type, d.voucher_no), []).append(d)
 
-	return gl_entries
-
-def get_warehouse_account():
-	if not frappe.flags.warehouse_account_map or frappe.flags.in_test:
-		warehouse_account = frappe._dict()
-
-		for d in frappe.db.sql("""select
-				warehouse, name, account_currency
-			from
-				tabAccount
-			where
-				account_type = 'Stock'
-				and (warehouse is not null and warehouse != '')
-				and is_group=0 """, as_dict=1):
-			warehouse_account.setdefault(d.warehouse, d)
-
-		frappe.flags.warehouse_account_map = warehouse_account
-
-	return frappe.flags.warehouse_account_map
+	return gl_entries
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.js b/erpnext/crm/doctype/lead/lead.js
index 7e22125..f2f3937 100644
--- a/erpnext/crm/doctype/lead/lead.js
+++ b/erpnext/crm/doctype/lead/lead.js
@@ -7,27 +7,28 @@
 erpnext.LeadController = frappe.ui.form.Controller.extend({
 	setup: function() {
 		this.frm.fields_dict.customer.get_query = function(doc, cdt, cdn) {
-				return { query: "erpnext.controllers.queries.customer_query" } }
+			return { query: "erpnext.controllers.queries.customer_query" } }
 	},
 
 	onload: function() {
 		if(cur_frm.fields_dict.lead_owner.df.options.match(/^User/)) {
 			cur_frm.fields_dict.lead_owner.get_query = function(doc, cdt, cdn) {
-				return { query:"frappe.core.doctype.user.user.user_query" } }
+				return { query: "frappe.core.doctype.user.user.user_query" }
+			}
 		}
 
 		if(cur_frm.fields_dict.contact_by.df.options.match(/^User/)) {
 			cur_frm.fields_dict.contact_by.get_query = function(doc, cdt, cdn) {
-				return { query:"frappe.core.doctype.user.user.user_query" } }
+				return { query: "frappe.core.doctype.user.user.user_query" } }
 		}
 	},
 
 	refresh: function() {
 		var doc = this.frm.doc;
 		erpnext.toggle_naming_series();
-		frappe.dynamic_link = {doc: this.frm.doc, fieldname: 'name', doctype: 'Lead'}
+		frappe.dynamic_link = {doc: doc, fieldname: 'name', doctype: 'Lead'}
 
-		if(!this.frm.doc.__islocal && this.frm.doc.__onload && !this.frm.doc.__onload.is_customer) {
+		if(!doc.__islocal && doc.__onload && !doc.__onload.is_customer) {
 			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"));
@@ -35,9 +36,9 @@
 		}
 
 		if(!this.frm.doc.__islocal) {
-			frappe.geo.render_address_and_contact(cur_frm);
+			frappe.contacts.render_address_and_contact(cur_frm);
 		} else {
-			frappe.geo.clear_address_and_contact(cur_frm);
+			frappe.contacts.clear_address_and_contact(cur_frm);
 		}
 	},
 
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 17c4022..40b0e50 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,6 +71,37 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
+   "set_only_once": 1, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salutation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salutation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salutation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
@@ -102,25 +136,26 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "company_name", 
-   "fieldtype": "Data", 
+   "fieldname": "gender", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
+   "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Organization Name", 
+   "label": "Gender", 
    "length": 0, 
    "no_copy": 0, 
-   "oldfieldname": "company_name", 
-   "oldfieldtype": "Data", 
+   "options": "Gender", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -132,6 +167,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -163,6 +199,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -191,6 +228,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +261,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -255,6 +294,37 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "company_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Organization Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "company_name", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -287,6 +357,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -320,6 +391,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -349,6 +421,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -377,6 +450,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -409,6 +483,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -437,6 +512,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -469,6 +545,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -501,6 +578,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -531,6 +609,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -560,6 +639,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -588,6 +668,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -615,6 +696,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -645,6 +727,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -675,6 +758,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -705,6 +789,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -735,6 +820,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -767,6 +853,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -797,6 +884,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -828,6 +916,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -859,6 +948,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -890,6 +980,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -921,6 +1012,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -950,6 +1042,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -981,6 +1074,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1009,6 +1103,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1037,6 +1132,7 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-user", 
@@ -1044,15 +1140,15 @@
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-22 18:53:16.231035", 
+ "modified": "2017-06-13 14:29:12.567700", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Lead", 
+ "name_case": "Title Case", 
  "owner": "Administrator", 
  "permissions": [
   {
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index ccbb536..a05bacd 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -4,11 +4,11 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import (cstr, validate_email_add, cint, comma_and, has_gravatar, now)
+from frappe.utils import (cstr, validate_email_add, cint, comma_and, has_gravatar, now, getdate, nowdate)
 from frappe.model.mapper import get_mapped_doc
 
 from erpnext.controllers.selling_controller import SellingController
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 from erpnext.accounts.party import set_taxes
 
 sender_field = "email_id"
@@ -46,7 +46,7 @@
 			if self.is_new() or not self.image:
 				self.image = has_gravatar(self.email_id)
 
-		if self.contact_date and self.contact_date < now():
+		if self.contact_date and getdate(self.contact_date) < getdate(nowdate()):
 			frappe.throw(_("Next Contact Date cannot be in the past"))
 
 	def on_update(self):
@@ -150,8 +150,7 @@
 		{"Lead": {
 			"doctype": "Quotation",
 			"field_map": {
-				"name": "lead",
-				"lead_name": "customer_name",
+				"name": "lead"
 			}
 		}}, target_doc)
 	target_doc.quotation_to = "Lead"
diff --git a/erpnext/crm/doctype/opportunity/opportunity.js b/erpnext/crm/doctype/opportunity/opportunity.js
index 96d6ac5..ebef4b4 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.js
+++ b/erpnext/crm/doctype/opportunity/opportunity.js
@@ -122,7 +122,8 @@
 
 		$.each([["lead", "lead"],
 			["customer", "customer"],
-			["contact_person", "contact_query"]], function(i, opts) {
+			["contact_person", "contact_query"]],
+			function(i, opts) {
 				me.frm.set_query(opts[0], erpnext.queries[opts[1]]);
 			});
 	},
@@ -153,7 +154,7 @@
 					$.each(r.message, function(k, v) {
 						frappe.model.set_value(cdt, cdn, k, v);
 					});
-				refresh_field('image_view', d.name, 'items');
+					refresh_field('image_view', d.name, 'items');
 				}
 			}
 		})
@@ -180,7 +181,7 @@
 	});
 
 	dialog.fields_dict.update.$input.click(function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		return cur_frm.call({
 			doc: cur_frm.doc,
@@ -188,7 +189,7 @@
 			args: args.reason,
 			callback: function(r) {
 				if(r.exc) {
-					msgprint(__("There were errors."));
+					frappe.msgprint(__("There were errors."));
 				} else {
 					dialog.hide();
 					cur_frm.refresh();
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 3f7a814..18a97ac 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -14,6 +14,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,10 +72,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,6 +108,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -137,6 +141,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -169,6 +174,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -198,6 +204,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -227,6 +234,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -256,6 +264,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -288,6 +297,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -320,6 +330,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -349,6 +360,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -378,6 +390,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -407,6 +420,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -438,6 +452,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -470,6 +485,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -501,6 +517,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -531,6 +548,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -561,6 +579,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -592,6 +611,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -625,6 +645,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -652,6 +673,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -682,6 +704,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -711,6 +734,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -740,6 +764,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -769,6 +794,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -800,6 +826,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -831,6 +858,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -864,6 +892,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -893,6 +922,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -924,6 +954,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -956,6 +987,7 @@
    "width": "50px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -986,6 +1018,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1019,6 +1052,7 @@
    "width": "75px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1050,6 +1084,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1079,6 +1114,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1109,6 +1145,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1152,7 +1189,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-04 01:21:02.165730", 
+ "modified": "2017-06-13 14:29:07.077697", 
  "modified_by": "Administrator", 
  "module": "CRM", 
  "name": "Opportunity", 
diff --git a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
index 2b25f1d..0bc77a3 100644
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.js
@@ -1,19 +1,19 @@
 // Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
 // For license information, please see license.txt
 frappe.query_reports["Campaign Efficiency"] = {
-		"filters": [
-			{
-				"fieldname": "from_date",
-				"label": __("From Date"),
-				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_start_date"),
-			},
-			{
-				"fieldname": "to_date",
-				"label": __("To Date"),
-				"fieldtype": "Date",
-				"default": frappe.defaults.get_user_default("year_end_date"),
-			}
-		]
-	};
+	"filters": [
+		{
+			"fieldname": "from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
+			"default": frappe.defaults.get_user_default("year_start_date"),
+		},
+		{
+			"fieldname": "to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
+			"default": frappe.defaults.get_user_default("year_end_date"),
+		}
+	]
+};
 
diff --git a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
index b1e4917..d9c4c8b 100644
--- a/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
+++ b/erpnext/crm/report/minutes_to_first_response_for_opportunity/minutes_to_first_response_for_opportunity.js
@@ -2,40 +2,40 @@
 // For license information, please see license.txt
 
 frappe.query_reports["Minutes to First Response for Opportunity"] = {
-    "filters": [
-        {
-            "fieldname":"from_date",
-            "label": __("From Date"),
-            "fieldtype": "Date",
+	"filters": [
+		{
+			"fieldname": "from_date",
+			"label": __("From Date"),
+			"fieldtype": "Date",
 			'reqd': 1,
-            "default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
-        },
-        {
-            "fieldname":"to_date",
-            "label": __("To Date"),
-            "fieldtype": "Date",
+			"default": frappe.datetime.add_days(frappe.datetime.nowdate(), -30)
+		},
+		{
+			"fieldname": "to_date",
+			"label": __("To Date"),
+			"fieldtype": "Date",
 			'reqd': 1,
-            "default":frappe.datetime.nowdate()
-        },
-    ],
-	get_chart_data: function(columns, result) {
+			"default": frappe.datetime.nowdate()
+		},
+	],
+	get_chart_data: function (columns, result) {
 		return {
 			data: {
 				x: 'Date',
 				columns: [
-					['Date'].concat($.map(result, function(d) { return d[0]; })),
-					['Mins to first response'].concat($.map(result, function(d) { return d[1]; }))
+					['Date'].concat($.map(result, function (d) { return d[0]; })),
+					['Mins to first response'].concat($.map(result, function (d) { return d[1]; }))
 				]
 				// rows: [['Date', 'Mins to first response']].concat(result)
 			},
-		    axis: {
-		        x: {
-		            type: 'timeseries',
-		            tick: {
-		                format: frappe.ui.py_date_format
-		            }
-		        }
-		    },
+			axis: {
+				x: {
+					type: 'timeseries',
+					tick: {
+						format: frappe.ui.py_date_format
+					}
+				}
+			},
 			chart_type: 'line',
 
 		}
diff --git a/erpnext/demo/data/assessment_criteria.json b/erpnext/demo/data/assessment_criteria.json
new file mode 100644
index 0000000..8295682
--- /dev/null
+++ b/erpnext/demo/data/assessment_criteria.json
@@ -0,0 +1,18 @@
+[
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Aptitude"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Application"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Understanding"
+	},
+	{
+		"doctype": "Assessment Criteria",
+		"assessment_criteria": "Knowledge"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/grading_scale.json b/erpnext/demo/data/grading_scale.json
new file mode 100644
index 0000000..0760919
--- /dev/null
+++ b/erpnext/demo/data/grading_scale.json
@@ -0,0 +1,17 @@
+[
+	{
+		"doctype": "Grading Scale",
+		"grading_scale_name": "Standard Grading",
+		"description": "Standard Grading Scale",
+		"intervals": [
+			{"threshold": 100.0, "grade_code": "A", "grade_description": "Excellent"},
+			{"threshold": 89.9, "grade_code": "B+", "grade_description": "Close to Excellence"},
+			{"threshold": 80.0, "grade_code": "B", "grade_description": "Good"},
+			{"threshold": 69.9, "grade_code": "C+", "grade_description": "Almost Good"},
+			{"threshold": 60.0, "grade_code": "C", "grade_description": "Average"},
+			{"threshold": 50.0, "grade_code": "D+", "grade_description": "Have to Work"},
+			{"threshold": 40.0, "grade_code": "D", "grade_description": "Not met Baseline Expectations"},
+			{"threshold": 0.0, "grade_code": "F", "grade_description": "Have to work a lot"}
+		]
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/data/item_schools.json b/erpnext/demo/data/item_schools.json
index 5eb6082..077fcaa 100644
--- a/erpnext/demo/data/item_schools.json
+++ b/erpnext/demo/data/item_schools.json
@@ -57,6 +57,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Computer",
   "item_code": "Computer",
   "item_name": "Computer",
@@ -64,6 +65,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Mobile",
   "item_code": "Mobile",
   "item_name": "Mobile",
@@ -71,6 +73,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "ERP",
   "item_code": "ERP",
   "item_name": "ERP",
@@ -78,6 +81,7 @@
  },
  {
   "is_stock_item": 0,
+  "default_warehouse": "Stores",
   "description": "Autocad",
   "item_code": "Autocad",
   "item_name": "Autocad",
@@ -85,6 +89,7 @@
  },
  {
   "default_warehouse": "Stores",
+  "default_warehouse": "Stores",
   "item_code": "Service",
   "item_group": "Services",
   "item_name": "Service",
diff --git a/erpnext/demo/data/program.json b/erpnext/demo/data/program.json
index 8638311..9c2ec77 100644
--- a/erpnext/demo/data/program.json
+++ b/erpnext/demo/data/program.json
@@ -1,102 +1,46 @@
 [
 	{
 		"doctype": "Program",
+		"name": "MCA",
 		"program_name": "Masters of Computer Applications",
 		"program_code": "MCA",
 		"department": "Information Technology",
 		"courses": [
-			{
-				"course": "Microprocessor",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Probability and Statistics",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Programing in Java",
-				"academic_term": "Semester 2"
-			}
+			{ "course": "MCA4010" },
+			{ "course": "MCA4020" },
+			{ "course": "MCA4030" }
 		]
 	},
 	{
 		"doctype": "Program",
+		"name": "BCA",
 		"program_name": "Bachelor of Computer Applications",
 		"program_code": "BCA",
 		"department": "Information Technology",
 		"courses": [
-			{
-				"course": "Communication Skiils",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Object Oriented Programing - C++",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Basic Mathematics",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Data Structures and Algorithm",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Digital Logic",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Fundamentals of IT & Programing",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Operating System",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Programing in C",
-				"academic_term": "Semester 1"
-			}
+			{ "course": "BCA2030" },
+			{ "course": "BCA1030" },
+			{ "course": "BCA2020" },
+			{ "course": "BCA1040" },
+			{ "course": "BCA1010" },
+			{ "course": "BCA2010" },
+			{ "course": "BCA1020" }
 		]
 	},
 	{
 		"doctype": "Program",
+		"name": "BBA",
 		"program_name": "Bachelor of Business Administration",
 		"program_code": "BBA",
 		"department": "Management Studies",
 		"courses": [
-			{
-				"course": "Organizational Behavior",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Management Development and Skills",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Legal and Regulatory Framework",
-				"academic_term": "Semester 1"
-			},
-			{
-				"course": "Human Resource Management",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Entrepreneurship Management",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Communication Skills",
-				"academic_term": "Semester 2"
-			},
-			{
-				"course": "Business Environment",
-				"academic_term": "Semester 3"
-			},
-			{
-				"course": "Advertising and Sales",
-				"academic_term": "Semester 3"
-			}
+			{ "course": "BBA 101" },
+			{ "course": "BBA 102" },
+			{ "course": "BBA 103" },
+			{ "course": "BBA 301" },
+			{ "course": "BBA 302" },
+			{ "course": "BBA 304" },
+			{ "course": "BBA 505" }
 		]
 	}
 ]
\ No newline at end of file
diff --git a/erpnext/demo/data/student_batch_name.json b/erpnext/demo/data/student_batch_name.json
new file mode 100644
index 0000000..ef3f18d
--- /dev/null
+++ b/erpnext/demo/data/student_batch_name.json
@@ -0,0 +1,10 @@
+[
+	{
+		"doctype": "Student Batch Name",
+		"batch_name": "Section-A"
+	},
+	{
+		"doctype": "Student Batch Name",
+		"batch_name": "Section-B"
+	}
+]
\ No newline at end of file
diff --git a/erpnext/demo/demo.py b/erpnext/demo/demo.py
index aeaa1f0..9fde264 100644
--- a/erpnext/demo/demo.py
+++ b/erpnext/demo/demo.py
@@ -22,7 +22,7 @@
 
 """
 
-def make(domain='Manufacturing'):
+def make(domain='Manufacturing', days=100):
 	frappe.flags.domain = domain
 	frappe.flags.mute_emails = True
 	setup_data.setup(domain)
@@ -35,16 +35,18 @@
 	frappe.destroy()
 	frappe.init(site)
 	frappe.connect()
-	simulate(domain)
 
-def simulate(domain='Manufacturing'):
-	runs_for = frappe.flags.runs_for or 150
+	simulate(domain, days)
+
+def simulate(domain='Manufacturing', days=100):
+	runs_for = frappe.flags.runs_for or days
 	frappe.flags.company = erpnext.get_default_company()
 	frappe.flags.mute_emails = True
 
 	if not frappe.flags.start_date:
 		# start date = 100 days back
-		frappe.flags.start_date = frappe.utils.add_days(frappe.utils.nowdate(), -1 * runs_for)
+		frappe.flags.start_date = frappe.utils.add_days(frappe.utils.nowdate(),
+			-1 * runs_for)
 
 	current_date = frappe.utils.getdate(frappe.flags.start_date)
 
@@ -73,7 +75,7 @@
 			stock.work()
 			accounts.work()
 			projects.run_projects(current_date)
-			#run_messages()
+			# run_messages()
 
 			if domain=='Manufacturing':
 				sales.work()
diff --git a/erpnext/demo/setup/education.py b/erpnext/demo/setup/education.py
index b164057..a124ee7 100644
--- a/erpnext/demo/setup/education.py
+++ b/erpnext/demo/setup/education.py
@@ -15,6 +15,7 @@
 	make_student_group()
 	make_fees_category()
 	make_fees_structure()
+	make_assessment_groups()
 	frappe.db.commit()
 	frappe.clear_cache()
 
@@ -24,6 +25,9 @@
 	import_json("Instructor")
 	import_json("Course")
 	import_json("Program")
+	import_json("Student Batch Name")
+	import_json("Assessment Criteria")
+	import_json("Grading Scale")
 	frappe.db.commit()
 
 def setup_item():
@@ -81,13 +85,24 @@
 			count+=1
 
 def make_student_group():
-	for d in frappe.db.get_list("Academic Term"):
-		sg_tool = frappe.new_doc("Student Group Creation Tool")
-		sg_tool.academic_year = "2016-17"
-		sg_tool.academic_term = d.name
-		sg_tool.courses = sg_tool.get_courses()
-		sg_tool.create_student_groups()
-		frappe.db.commit()
+	for term in frappe.db.get_list("Academic Term"):
+		for program in frappe.db.get_list("Program"):
+			sg_tool = frappe.new_doc("Student Group Creation Tool")
+			sg_tool.academic_year = "2017-18"
+			sg_tool.academic_term = term.name
+			sg_tool.program = program.name
+			for d in sg_tool.get_courses():
+				d = frappe._dict(d)
+				student_group = frappe.new_doc("Student Group")
+				student_group.student_group_name = d.student_group_name
+				student_group.group_based_on = d.group_based_on
+				student_group.program = program.name
+				student_group.course = d.course
+				student_group.batch = d.batch
+				student_group.academic_term = term.name
+				student_group.academic_year = "2017-18"
+				student_group.save()
+			frappe.db.commit()
 
 def make_fees_category():
 	fee_type = ["Tuition Fee", "Hostel Fee", "Logistics Fee",
@@ -111,7 +126,7 @@
 def make_fees_structure():
 	for d in frappe.db.get_list("Program"):
 		program = frappe.get_doc("Program", d.name)
-		for academic_term in ["Semester 1", "Semester 2", "Semester 3"]:
+		for academic_term in ["2017-18 (Semester 1)", "2017-18 (Semester 2)", "2017-18 (Semester 3)"]:
 			fee_structure = frappe.new_doc("Fee Structure")
 			fee_structure.program = d.name
 			fee_structure.academic_term = random.choice(frappe.db.get_list("Academic Term")).name
@@ -123,6 +138,27 @@
 		program.save()
 	frappe.db.commit()
 
+def make_assessment_groups():
+	for year in frappe.db.get_list("Academic Year"):
+		ag = frappe.new_doc('Assessment Group')
+		ag.assessment_group_name = year.name
+		ag.parent_assessment_group = "All Assessment Groups"
+		ag.is_group = 1
+		ag.insert()
+		for term in frappe.db.get_list("Academic Term", filters = {"academic_year": year.name}):
+			ag1 = frappe.new_doc('Assessment Group')
+			ag1.assessment_group_name = term.name
+			ag1.parent_assessment_group = ag.name
+			ag1.is_group = 1
+			ag1.insert()
+			for assessment_group in ['Term I', 'Term II']:
+				ag2 = frappe.new_doc('Assessment Group')
+				ag2.assessment_group_name = ag1.name + " " + assessment_group
+				ag2.parent_assessment_group = ag1.name
+				ag2.insert()
+	frappe.db.commit()
+
+
 def get_json_path(doctype):
 		return frappe.get_app_path('erpnext', 'demo', 'data', frappe.scrub(doctype) + '.json')
 		
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 3675f0f..33f945f 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -116,7 +116,7 @@
 	for u in json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data', 'user.json')).read()):
 		user = frappe.new_doc("User")
 		user.update(u)
-		user.flags.no_welcome_mail
+		user.flags.no_welcome_mail = True
 		user.new_password = 'demo'
 		user.insert()
 
diff --git a/erpnext/demo/user/schools.py b/erpnext/demo/user/schools.py
index 6388f9a..422c31a 100644
--- a/erpnext/demo/user/schools.py
+++ b/erpnext/demo/user/schools.py
@@ -8,30 +8,22 @@
 from frappe.utils import cstr
 from frappe.utils.make_random import get_random
 from datetime import timedelta
-from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, get_fee_schedule, collect_fees
+from erpnext.schools.api import get_student_group_students, make_attendance_records, enroll_student, \
+								get_fee_schedule, collect_fees, get_course
+from erpnext.schools.doctype.program_enrollment.program_enrollment import get_program_courses
+from erpnext.schools.doctype.student_group.student_group import get_students
 
 def work():
 	frappe.set_user(frappe.db.get_global('demo_schools_user'))
 	for d in xrange(20):
 		approve_random_student_applicant()
 		enroll_random_student(frappe.flags.current_date)
-	if frappe.flags.current_date.weekday()== 0:
-		make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
+	# if frappe.flags.current_date.weekday()== 0:
+	# 	make_course_schedule(frappe.flags.current_date, frappe.utils.add_days(frappe.flags.current_date, 5))	
 	mark_student_attendance(frappe.flags.current_date)
+	# make_assessment_plan()
 	make_fees()
 
-def mark_student_attendance(current_date):
-	status = ["Present", "Absent"]
-	for d in frappe.db.get_list("Course Schedule", filters={"schedule_date": current_date}, fields=("name", "student_group")):
-		students = get_student_group_students(d.student_group)
-		for stud in students:
-			make_attendance_records(stud.student, stud.student_name, d.name, status[weighted_choice([9,4])])
-			
-def make_fees():
-	for d in range(1,10):
-		random_fee = get_random("Fees", {"paid_amount": 0})
-		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))
-	
 def approve_random_student_applicant():
 	random_student = get_random("Student Applicant", {"application_status": "Applied"})
 	if random_student:
@@ -39,31 +31,59 @@
 		frappe.db.set_value("Student Applicant", random_student, "application_status", status[weighted_choice([9,3])])
 
 def enroll_random_student(current_date):
+	batch = ["Section-A", "Section-B"]
 	random_student = get_random("Student Applicant", {"application_status": "Approved"})
 	if random_student:
 		enrollment = enroll_student(random_student)
 		enrollment.academic_year = get_random("Academic Year")
 		enrollment.enrollment_date = current_date
+		enrollment.student_batch_name = batch[weighted_choice([9,3])]
 		fee_schedule = get_fee_schedule(enrollment.program)
 		for fee in fee_schedule:
 			enrollment.append("fees", fee)
+		enrolled_courses = get_course(enrollment.program)
+		for course in enrolled_courses:
+			enrollment.append("courses", course)
 		enrollment.submit()
 		frappe.db.commit()
-		assign_student_group(enrollment.student, enrollment.program)
+		assign_student_group(enrollment.student, enrollment.student_name, enrollment.program,
+			enrolled_courses, enrollment.student_batch_name)
 		
-def assign_student_group(student, program):
-	courses = []
-	for d in frappe.get_list("Program Course", fields=("course"), filters={"parent": program }):
-		courses.append(d.course)
+def assign_student_group(student, student_name, program, courses, batch):
+	course_list = [d["course"] for d in courses]
+	for d in frappe.get_list("Student Group", fields=("name"), filters={"program": program, "course":("in", course_list)}):
+		student_group = frappe.get_doc("Student Group", d.name)
+		student_group.append("students", {"student": student, "student_name": student_name,
+			"group_roll_number":len(student_group.students)+1, "active":1})
+		student_group.save()
+	student_batch = frappe.get_list("Student Group", fields=("name"), filters={"program": program, "group_based_on":"Batch", "batch":batch})[0]
+	student_batch_doc = frappe.get_doc("Student Group", student_batch.name)
+	student_batch_doc.append("students", {"student": student, "student_name": student_name,
+		"group_roll_number":len(student_batch_doc.students)+1, "active":1})
+	student_batch_doc.save()
+	frappe.db.commit()
 
-	for d in xrange(3):
-		course = random.choice(courses)
-		random_sg = get_random("Student Group", {"course": course})
-		if random_sg:
-			student_group = frappe.get_doc("Student Group", random_sg)
-			student_group.append("students", {"student": student})
-			student_group.save()
-		courses.remove(course)
+def mark_student_attendance(current_date):
+	status = ["Present", "Absent"]
+	for d in frappe.db.get_list("Student Group", filters={"group_based_on": "Batch"}):
+		students = get_student_group_students(d.name)
+		for stud in students:
+			make_attendance_records(stud.student, stud.student_name, status[weighted_choice([9,4])], None, d.name, current_date)
+			
+def make_fees():
+	for d in range(1,10):
+		random_fee = get_random("Fees", {"paid_amount": 0})
+		collect_fees(random_fee, frappe.db.get_value("Fees", random_fee, "outstanding_amount"))	
+
+def make_assessment_plan(date):
+	for d in range(1,4):
+		random_group = get_random("Student Group", {"group_based_on": "Course"}, True)
+		doc = frappe.new_doc("Assessment Plan")
+		doc.student_group = random_group.name
+		doc.course = random_group.course
+		doc.assessment_group = get_random("Assessment Group", {"is_group": 0, "parent": "2017-18 (Semester 2)"})
+		doc.grading_scale = get_random("Grading Scale")
+		doc.maximum_assessment_score = 100
 		
 def make_course_schedule(start_date, end_date):
 	for d in frappe.db.get_list("Student Group"):
diff --git a/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png b/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png
new file mode 100644
index 0000000..cc3132c
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/bank-reconciliation-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/chart-of-cost-center.png b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
new file mode 100644
index 0000000..7e36be2
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/chart-of-cost-center.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-2.png b/erpnext/docs/assets/img/accounts/perpetual-2.png
deleted file mode 100644
index 5a2b20b..0000000
--- a/erpnext/docs/assets/img/accounts/perpetual-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-3.png b/erpnext/docs/assets/img/accounts/perpetual-3.png
deleted file mode 100644
index faa7724..0000000
--- a/erpnext/docs/assets/img/accounts/perpetual-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png b/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png
new file mode 100644
index 0000000..190280f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-dn-gl-5.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png b/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png
new file mode 100644
index 0000000..79b0ca1
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-dn-sl-4.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png b/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png
new file mode 100644
index 0000000..7b6f7e3
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-inv-gl-7.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png b/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png
new file mode 100644
index 0000000..d7f4c61
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-inv-sl-6.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png b/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png
new file mode 100644
index 0000000..054a002
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-pinv-gl-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png b/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png
new file mode 100644
index 0000000..e6190ec
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-receipt-gl-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png b/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png
new file mode 100644
index 0000000..5f88638
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-receipt-sl-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png
new file mode 100644
index 0000000..2579463
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-issue-gl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png
new file mode 100644
index 0000000..dc9b1b5
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-issue-sl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png
new file mode 100644
index 0000000..ff192ce
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-gl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png
new file mode 100644
index 0000000..6d183b6
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-receipt-sl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png
new file mode 100644
index 0000000..551ebbc
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-gl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png
new file mode 100644
index 0000000..a848d66
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/perpetual-st-transfer-sl.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/calendar-7.png b/erpnext/docs/assets/img/collaboration-tools/calendar-7.png
deleted file mode 100644
index ac7a93c..0000000
--- a/erpnext/docs/assets/img/collaboration-tools/calendar-7.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png b/erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png
similarity index 76%
rename from erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
rename to erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png
index 1d95ef4..e8c9a4c 100644
--- a/erpnext/docs/assets/old_images/erpnext/calender-email-digest.png
+++ b/erpnext/docs/assets/img/collaboration-tools/calender-email-digest.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png b/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png
new file mode 100644
index 0000000..9554a03
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/delete-a-doc.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif b/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif
new file mode 100644
index 0000000..1e80da5
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/deleted-docs-list.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png b/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png
new file mode 100644
index 0000000..0a39928
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/enable-versioning.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png b/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png
new file mode 100644
index 0000000..f34c7a4
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/restore-a-doc.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/restored-doc.png b/erpnext/docs/assets/img/collaboration-tools/restored-doc.png
new file mode 100644
index 0000000..27d7026
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/restored-doc.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/version-details.png b/erpnext/docs/assets/img/collaboration-tools/version-details.png
new file mode 100644
index 0000000..8feacf3
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/version-details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/collaboration-tools/version-links.png b/erpnext/docs/assets/img/collaboration-tools/version-links.png
new file mode 100644
index 0000000..ecb12d5
--- /dev/null
+++ b/erpnext/docs/assets/img/collaboration-tools/version-links.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/__init__.py b/erpnext/docs/assets/img/schools/assessment/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/__init__.py
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png b/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png
new file mode 100644
index 0000000..4fc5fd7
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-criteria.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png b/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png
new file mode 100644
index 0000000..0982d99
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-group-details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png b/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png
new file mode 100644
index 0000000..37e90da
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-group-term.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png b/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png
new file mode 100644
index 0000000..3780a04
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-plan-criteria.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png b/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png
new file mode 100644
index 0000000..b4ff979
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-plan-details.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png b/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png
new file mode 100644
index 0000000..b70f0df
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-result-tool.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/assessment-result.png b/erpnext/docs/assets/img/schools/assessment/assessment-result.png
new file mode 100644
index 0000000..ae25cd4
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/assessment-result.png
Binary files differ
diff --git a/erpnext/docs/assets/img/schools/assessment/grading-scale.png b/erpnext/docs/assets/img/schools/assessment/grading-scale.png
new file mode 100644
index 0000000..f48f617
--- /dev/null
+++ b/erpnext/docs/assets/img/schools/assessment/grading-scale.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-actions.png b/erpnext/docs/assets/img/setup/email/email-actions.png
new file mode 100644
index 0000000..eab88c6
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-actions.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-domain.png b/erpnext/docs/assets/img/setup/email/email-domain.png
new file mode 100644
index 0000000..cae8fb2
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-domain.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-folders.png b/erpnext/docs/assets/img/setup/email/email-folders.png
new file mode 100644
index 0000000..68c823b
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-folders.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-inbox.png b/erpnext/docs/assets/img/setup/email/email-inbox.png
new file mode 100644
index 0000000..486f76a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-inbox.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-password.png b/erpnext/docs/assets/img/setup/email/email-password.png
new file mode 100644
index 0000000..7c1edf7
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-password.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-service.png b/erpnext/docs/assets/img/setup/email/email-service.png
new file mode 100644
index 0000000..b63ff4e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-service.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-user-link.png b/erpnext/docs/assets/img/setup/email/email-user-link.png
new file mode 100644
index 0000000..64f88d4
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-user-link.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/email-user.png b/erpnext/docs/assets/img/setup/email/email-user.png
new file mode 100644
index 0000000..54b85a6
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/email-user.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/email/make-from-email.png b/erpnext/docs/assets/img/setup/email/make-from-email.png
new file mode 100644
index 0000000..c7c35fb
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/email/make-from-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/users/user-login-email.png b/erpnext/docs/assets/img/setup/users/user-login-email.png
new file mode 100644
index 0000000..71050af
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-login-email.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/users/user-login-mobile.png b/erpnext/docs/assets/img/setup/users/user-login-mobile.png
new file mode 100644
index 0000000..1d7af14
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/users/user-login-mobile.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/customer-portal-order.png b/erpnext/docs/assets/img/website/customer-portal-order.png
new file mode 100644
index 0000000..83fd57e
--- /dev/null
+++ b/erpnext/docs/assets/img/website/customer-portal-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/invoice-paid.png b/erpnext/docs/assets/img/website/invoice-paid.png
new file mode 100644
index 0000000..ce242c2
--- /dev/null
+++ b/erpnext/docs/assets/img/website/invoice-paid.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/invoice-unpaid.png b/erpnext/docs/assets/img/website/invoice-unpaid.png
new file mode 100644
index 0000000..16c3325
--- /dev/null
+++ b/erpnext/docs/assets/img/website/invoice-unpaid.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/portal-menu.png b/erpnext/docs/assets/img/website/portal-menu.png
new file mode 100644
index 0000000..6b7ee0a
--- /dev/null
+++ b/erpnext/docs/assets/img/website/portal-menu.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-login.png b/erpnext/docs/assets/img/website/website-login.png
index 6943098..ba57937 100644
--- a/erpnext/docs/assets/img/website/website-login.png
+++ b/erpnext/docs/assets/img/website/website-login.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-signup-details.png b/erpnext/docs/assets/img/website/website-signup-details.png
new file mode 100644
index 0000000..aa96d7f
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-signup-details.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png
deleted file mode 100644
index eea5d73..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-10.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png
deleted file mode 100644
index a29c0e5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-11.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png
deleted file mode 100644
index 9143371..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-12.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png
deleted file mode 100644
index a250fd0..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-13.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png
deleted file mode 100644
index 5ce57e8..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-14.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png
deleted file mode 100644
index 9370e86..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png
deleted file mode 100644
index cbe25e7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-5.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png
deleted file mode 100644
index 3050931..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-6.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png
deleted file mode 100644
index dbe669e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-7.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png
deleted file mode 100644
index bfa9516..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-8.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png b/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png
deleted file mode 100644
index 4f3fa7e..0000000
--- a/erpnext/docs/assets/old_images/erpnext/accounting-for-stock-9.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/auto-notification.png b/erpnext/docs/assets/old_images/erpnext/auto-notification.png
deleted file mode 100644
index 1331a72..0000000
--- a/erpnext/docs/assets/old_images/erpnext/auto-notification.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/backup-manager.png b/erpnext/docs/assets/old_images/erpnext/backup-manager.png
deleted file mode 100644
index 3483a1f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/backup-manager.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png b/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png
deleted file mode 100644
index 2fec1e6..0000000
--- a/erpnext/docs/assets/old_images/erpnext/bank-reconciliation-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png b/erpnext/docs/assets/old_images/erpnext/budgeting-4.png
deleted file mode 100644
index 17683e3..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/budgeting.png b/erpnext/docs/assets/old_images/erpnext/budgeting.png
deleted file mode 100644
index 809d6d1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/budgeting.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png b/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
deleted file mode 100644
index dc6eb8b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-lead.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png b/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
deleted file mode 100644
index 84cb343..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-manually.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png b/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
deleted file mode 100644
index fa1e4ff..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-notification.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png b/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
deleted file mode 100644
index 783f968..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-permission.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png b/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
deleted file mode 100644
index 6147cf5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/calender-event-recurring.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png b/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
deleted file mode 100644
index ff14072..0000000
--- a/erpnext/docs/assets/old_images/erpnext/chart-of-cost-centers.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png b/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
deleted file mode 100644
index 6791d32..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-document.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png b/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
deleted file mode 100644
index 6eacdf1..0000000
--- a/erpnext/docs/assets/old_images/erpnext/custom-field-insert.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
deleted file mode 100644
index 459d503..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-login.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
deleted file mode 100644
index f7ff81b..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
deleted file mode 100644
index 7693877..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png b/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
deleted file mode 100644
index 771de78..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customer-portal-sign-up-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png b/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
deleted file mode 100644
index d3e1143..0000000
--- a/erpnext/docs/assets/old_images/erpnext/customize-form-custom-field.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png b/erpnext/docs/assets/old_images/erpnext/dropbox-access.png
deleted file mode 100644
index 7aa6cec..0000000
--- a/erpnext/docs/assets/old_images/erpnext/dropbox-access.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png b/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
deleted file mode 100644
index 0993cb5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-invoice-paid.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-menu.png b/erpnext/docs/assets/old_images/erpnext/portal-menu.png
deleted file mode 100644
index 0f9ea82..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-menu.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png b/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
deleted file mode 100644
index e92e8dc..0000000
--- a/erpnext/docs/assets/old_images/erpnext/portal-order-billed.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/user/manual/de/accounts/budgeting.md b/erpnext/docs/user/manual/de/accounts/budgeting.md
index 1a2082c..88ef179 100644
--- a/erpnext/docs/user/manual/de/accounts/budgeting.md
+++ b/erpnext/docs/user/manual/de/accounts/budgeting.md
@@ -11,29 +11,29 @@
 
 #### Schritt 1: Klicken Sie auf "Öffnen
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-1.png)  
-
-<img alt="Forderungen" class="screenshot" src="{{docs_base_url}}/assets/img/accounts/accounts-receivable.png">
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
 
 #### Schritt 2: Monatliche Verteilung eingeben
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-2-1.png)
+
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png">
 
 Wenn Sie die Verteilungs-ID leer lassen, kalkuliert ERPNext auf einer jährlichen Basis und bricht auf die Monate herunter.
 
 #### Schritt 3: Fügen Sie eine neue Zeile hinzu und wählen Sie das Budget-Konto
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-3.png)  
+
+<img class="screenshot" alt="Budget" src="{{docs_base_url}}/assets/img/accounts/budget-account.png"> 
 
 ### Anlegen einer neuen Verteilungs-ID
 
 ERPNext erlaubt es Ihnen einige Aktionen für Budgets einzustellen. Das legt fest, ob bei Überschreiten des Budgets gestoppt, gewarnte oder ignoriert werden soll.
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4.png)
+<img class="screenshot" alt="Monthly Distribution" src="{{docs_base_url}}/assets/img/accounts/monthly-budget-distribution.png">
 
 Das kann über die Firmenstammdaten eingestellt werden.
 
-![]({{docs_base_url}}/assets/old_images/erpnext/budgeting-4-1.png)  
+<img class="screenshot" alt="Budget Variance Report" src="{{docs_base_url}}/assets/img/accounts/budget-variance-report.png">
 
 Auch dann, wenn Sie für überschrittene Budgets "ignorieren" auswählen, bekommen Sie eine Fülle von Informationen über den Bericht zur Abweichung zwischen Budget und Istwert. Dieser Bericht zeigt Ihnen auf monatlicher Basis die tatsächlichen Ausgaben verglichen mit den budgetierten Ausgaben.
 
diff --git a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
index 22f5e46..be42c80 100644
--- a/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/de/accounts/setup/cost-center.md
@@ -22,7 +22,7 @@
 
 >Rechnungswesen > Einstellungen > Kostenstellenplan
 
-![Kostenstellenplan]({{docs_base_url}}/assets/old_images/erpnext/chart-of-cost-centers.png)
+<img class="screenshot" alt="Kostenstellenplan" src="{{docs_base_url}}/assets/img/accounts/budgeting-cost-center.png">
 
 Kostenstellen helfen Ihnen bei der Erstellung von Budgets für Geschäftstätigkeiten.
 
diff --git a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
index 52b613b..a379ec8 100644
--- a/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/de/buying/setup/supplier-type.md
@@ -15,6 +15,4 @@
 
 Wenn Sie Ihre Lieferanten in verschiedene Typen unterteilen, erleichtert Ihnen das die Buchhaltung und die Rechnungslegung.
 
-Geben Sie Ihre neue Lieferantenkategorie ein und speichern Sie.
-
-{next}
+Geben Sie Ihre neue Lieferantenkategorie ein und speichern Sie.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
index 6b8459e..c74029b 100644
--- a/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
+++ b/erpnext/docs/user/manual/de/customer-portal/customer-orders-invoices-and-shipping.md
@@ -4,18 +4,18 @@
 Das Webportal von ERPNext gibt Ihren Kunden einen schnellen Zugriff auf Ihre Aufträge, Rechnungen und Sendungen.
 Kunden können den Status Ihrer Bestellungen, Rechnungen und des Versandes nachprüfen, indem sie sich auf der Webseite einloggen.
 
-![Portalmenü]({{docs_base_url}}/assets/old_images/erpnext/portal-menu.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
 
 Sobald eine Bestellung aufgegeben wurde, entweder über den Einkaufswagen oder aus ERPNext heraus, kann Ihr Kunde die Bestellung ansehen und den Abrechnungs- und Versandstatus nachverfolgen. Wenn die Rechnung und die Zahlung zu einer Bestellung übertragen wurden, kann der Kunde auch hier den aktuellen Stand auf einen Blick nachvollziehen.
 
-![Kundenportal]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-orders-1.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 ### Rechnung mit Status "gezahlt"
 
-![Rechnung gezahlt]({{docs_base_url}}/assets/old_images/erpnext/portal-invoice-paid.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
 
 ### Rechnung mit Status "abgerechnet"
 
-![Rechnung berechnet]({{docs_base_url}}/assets/old_images/erpnext/portal-order-billed.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/portal-login.md b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
index d5cc22e..455dfac 100644
--- a/erpnext/docs/user/manual/de/customer-portal/portal-login.md
+++ b/erpnext/docs/user/manual/de/customer-portal/portal-login.md
@@ -3,6 +3,6 @@
 
 Um sich in ein Kundenkonto einzuloggen, muss der Kunde seine Email-ID und das Passwort angeben, welche ihm von ERPNext während des Registrierungsprozesses zugesendet wurden.
 
-![Login]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-login.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/de/customer-portal/sign-up.md b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
index 5ffc307..0a91145 100644
--- a/erpnext/docs/user/manual/de/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/de/customer-portal/sign-up.md
@@ -1,20 +1,17 @@
 # Registrieren
+
 <span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
 
 Kunden müssen sich über die Webseite als Kunden registrieren.
 
-### Schritt 1: Klicken Sie auf das Login-Symbol
+### Schritt 1: Klicken Sie auf das Registrieren-Symbol
 
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-1.png)
-
-### Schritt 2: Klicken Sie auf das Registrieren-Symbol
-
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-2.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 ### Schritt 3: Geben Sie Ihren Kundennamen und Ihre ID ein
 
-![Registrieren]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-3.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
 
 Wenn der Registrierungsprozess abgeschlossen ist, wird dem Kunden eine E-Mail mit dem Passwort zugeschickt.
 
-{next}
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index 25c40e1..feeb7d9 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -28,31 +28,31 @@
 
 Wählen Sie die Transaktion oder die Vorlage, in die sie ein benutzerdefiniertes Feld einfügen wollen. Nehmen wir an, dass Sie ein benutzerdefiniertes Verknüpfungsfeld in ein Angebotsformular einfügen wollen; das Dokument soll "Angebot" heißen.
 
-![Dokument mit benutzerdefiniertem Feld]({{docs_base_url}}/assets/old_images/erpnext/custom-field-document.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-1.gif">
 
 ### Feldbezeichnung einstellen
 
 Die Bezeichnung des benutzerdefinierten Feldes wird basierend auf seinem Namen eingestellt. Wenn Sie ein benutzerdefiniertes Feld mit einem bestimmten Namen erstellen wollen, aber mit einer sich davon unterscheidenden Bezeichnung, dann sollten Sie erst die Bezeichnung angeben, da Sie den Feldnamen noch einstellen wollen. Nach dem Speichern des benutzerdefinierten Feldes können Sie die Feldbezeichnung wieder ändern.
 
-![Bezeichnung des benutzerdefinierten Feldes]({{docs_base_url}}/assets/old_images/erpnext/custom-field-label.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-2.gif">
 
 ### Einstellen, nach welchem Element eingefügt werden soll ("Einfügen nach")
 
 Diese Auswahl enthält alle bereits existierenden Felder des ausgewählten Formulars/des DocTypes. Ihr benutzerdefiniertes Feld wird nach dem Feld eingefügt, das Sie unter "Einfügen nach" auswählen.
 
-![Benutzerdefiniertes Feld einfügen]({{docs_base_url}}/assets/old_images/erpnext/custom-field-insert.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-3.png">
 
 ### Feldtyp auswählen
 
 Klicken Sie hier um weitere Informationen über Feldtypen, die Sie bei einem benutzerdefinierten Feld auswählen können, zu erhalten.
 
-![Typ des benutzerdefinierten Feldes]({{docs_base_url}}/assets/old_images/erpnext/custom-field-type.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-4.png">
 
 ### Optionen einstellen
 
 Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
 
-![Verknüpfung mit einem benutzerdefinierten Feld]({{docs_base_url}}/assets/old_images/erpnext/custom-field-link.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-5.png">
 
 Wenn der Feldtyp als Auswahlfeld (Drop Down-Feld) angegeben ist, dann sollten alle möglichen Ergebnisse für dieses Feld im Optionen-Feld aufgelistet werden. Die möglichen Ergebnisse sollten alle in einer eigenen Zeile stehen.
 
@@ -71,7 +71,7 @@
 5. Schreibgeschützt: Wenn diese Option aktiviert ist, kann das benutzerdefinierte Feld nicht geändert werden.
 6. Beim Übertragen zulassen: Wenn diese Option ausgewählt wird, ist es erlaubt den Wert des Feldes zu ändern, wenn er in einer Transaktion übertragen wird.
 
-![Eigenschaften von benutzerdefinierten Feldern]({{docs_base_url}}/assets/old_images/erpnext/custom-field-properties.png)
+<img alt="Select Document Type" class="screenshot" src="{{docs_base_url}}/assets/img/customize/custom-field-6.png">
 
 ### Benutzerdefiniertes Feld löschen
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
index 5bd2901..540d5cb 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
@@ -3,8 +3,8 @@
 
 	frappe.ui.form.on("Event", "validate", function(frm) {
         if (frm.doc.from_date < get_today()) {
-            msgprint(__("You can not select past date in From Date"));
-            throw "past date selected"
+            frappe.msgprint(__("You can not select past date in From Date"));
+            frappe.throw(__("past date selected"))
         }
 	});
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
index d445a65..9e5ab13 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -4,12 +4,12 @@
 Fügen Sie dem Ereignis custom_before_cancel eine Steuerungsfunktion hinzu:
 
     cur_frm.cscript.custom_before_cancel = function(doc) {
-        if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+        if (frappe.user_roles.indexOf("Accounts User")!=-1 && frappe.user_roles.indexOf("Accounts Manager")==-1
                 && user_roles.indexOf("System Manager")==-1) {
             if (flt(doc.grand_total) > 10000) {
-                msgprint("You can not cancel this transaction, because grand total \
+                frappe.msgprint("You can not cancel this transaction, because grand total \
                     is greater than 10000");
-                validated = false;
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
index bb925e1..a1cb769 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -3,8 +3,8 @@
 
     frappe.ui.form.on("Material Request", "validate", function(frm) {
         if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
-            msgprint("You are only allowed Material Receipt");
-            throw "Not allowed";
+            frappe.msgprint("You are only allowed Material Receipt");
+            frappe.throw(__("Not allowed"));
         }
     }
 
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
index db725f2..652409f 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -3,17 +3,16 @@
 
     // restrict certain warehouse to Material Manager
     cur_frm.cscript.custom_validate = function(doc) {
-        if(user_roles.indexOf("Material Manager")==-1) {
-
-            var restricted_in_source = wn.model.get("Stock Entry Detail",
+        if(frappe.user_roles.indexOf("Material Manager")==-1) {
+            var restricted_in_source = frappe.model.get_list("Stock Entry Detail", 
                 {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
 
-            var restricted_in_target = wn.model.get("Stock Entry Detail",
-                {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
+            var restricted_in_target = frappe.model.get_list("Stock Entry Detail", 
+                {parent:cur_frm.doc.name, t_warehouse:"Restricted"});
 
             if(restricted_in_source.length || restricted_in_target.length) {
-                msgprint("Only Material Manager can make entry in Restricted Warehouse");
-                validated = false;
+                frappe.msgprint(__("Only Material Manager can make entry in Restricted Warehouse"));
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
index e04def5..c793463 100644
--- a/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/de/setting-up/data/bulk-rename.md
@@ -13,6 +13,4 @@
 
 Um mehrere Datensätze umzubenennen, laden Sie eine CSV-Datei mit den alten Namen in der ersten Spalte und den neuen Namen in der zweiten Spalte hoch indem Sie auf "Hochladen" klicken.
 
-<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
-
-{next}
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md b/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
deleted file mode 100644
index ba53f5e..0000000
--- a/erpnext/docs/user/manual/de/setting-up/third-party-backups.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Drittpartei-Datensicherungen
-<span class="text-muted contributed-by">Beigetragen von CWT Connector & Wire Technology GmbH</span>
-
-Wenn Sie Ihre Daten regelmäßig auf Dropbox sichern möchten, können Sie das direkt über ERPNext tun.
-
-> Einstellungen > Einbindungen > Dropbox-Datensicherung
-
-**Schritt 1:** Klicken Sie auf Einstellungen, dann auf Einbindungen
-
-**Schritt 2:** Klicken Sie auf Dropbox-Datensicherung
-
-### Abbildung 1: Dropbox-Datensicherung
-
-![Drittparteien-Datensicherung]({{docs_base_url}}/assets/old_images/erpnext/third-party-backups.png)
-
-Geben Sie auf der Seite "Dropbox-Datensicherung" die E-Mail-Adressen der Menschen ein, die über den Sicherungsstatus informiert werden sollen. Unter dem Punkt "Häufigkeit des Hochladens" geben Sie an, ob die Daten täglich oder wöchentlich gesichert werden sollen.
-
-**Schritt 3:** Klicken Sie auf **Dropbox-Zugang zulassen**
-
-> Tipp: Wenn Sie in der Zukunft keine Datensicherungen mehr auf Dropbox sichern wollen, dann demarkieren Sie das Feld "Datensicherungen zur Dropbox senden".
-
-### Abbildung 2: "Dropbox-Zugang zulassen"
-
-![Backup Manager]({{docs_base_url}}/assets/old_images/erpnext/backup-manager.png)
-
-Sie müssen sich mit Ihrer ID und Ihrem Passwort an Ihrem Dropbox-Konto anmelden.
-
-![Dropbox-Zugriff]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png)
-
-## Für OpenSource-Nutzer
-
-Voreinstellungen:
-
-pip install dropbox
-
-pip install google-api-python-client
-
-### Erstellen Sie in der Dropbox eine Anwendung
-
-Legen Sie zuerst ein Dropbox-Konto an und erstellen Sie dann eine neue Anwendung (https://www.dropbox.com/developers/apps). Wenn Sie das Konto erfolgreich angelegt haben, erhalten Sie app_key, app_secret und access_type. Bearbeiten Sie nun site_config.json Ihrer Seite (/frappe-bench/sites/your-site/) und fügen Sie die folgenden Zeilen hinzu: 
-
-* "dropbox_access_key": "app_key", und
-* "dropbox_secret_key": "app_secret"
-
-Dann können Sie zum Modul "Einbindungen" gehen und "Dropbox-Zugang zulassen".
-
-> Hinweis: Bitte stellen Sie sicher, dass Ihr Browser Popups zulässt.
-
-{next}
diff --git a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 9a7f431..f0e1f7a 100644
--- a/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/de/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -66,9 +66,9 @@
 
 #### Kaufbeleg
 
-Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück des Artikels "Tisch" zu **100€** vom Lieferanten "East Wind Inc." eingekauft. Im Folgenden finden Sie die Details des Kaufbelegs:
+Nehmen wir an, Sie haben 10 Stück des Artikels "RM0001" zu 200€ und 5 Stück des Artikels "Tisch" zu **100€** vom Lieferanten "Arcu Vel Quam Fabricators" eingekauft. Im Folgenden finden Sie die Details des Kaufbelegs:
 
-**Supplier:** East Wind Inc.
+**Supplier:** Arcu Vel Quam Fabricators
 
 **Artikel:**
 
@@ -133,11 +133,11 @@
 <p><strong>Lagerbuch</strong>
 </p>
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-2.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
 
 **Hauptbuch:**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-3.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
 
 Um ein System der doppelten Buchhaltung zu erhalten, werden dadurch, dass sich der Kontensaldo durch den Kaufbeleg erhöht, die Konten "In Verkaufsstellen" und "Anlagevermögen im Lager" belastet und das temporäre Konto "Lagerware erhalten aber noch nicht abgerechnet" entlastet. Zum selben Zeitpunkt wird eine negative Aufwendung auf das Konto "In der Bewertung enthaltene Kosten" verbucht, um die Bewertung hinzuzufügen und um eine doppelte Aufwandsverbuchung zu vermeiden.
 
@@ -149,7 +149,7 @@
 
 #### Hauptbuch
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
 
 Hier wird das Konto "Lagerware erhalten aber noch nicht bewertet" belastet und hebt den Effekt des Kaufbeleges auf.
 
@@ -157,9 +157,9 @@
 
 ### Lieferschein
 
-Nehmen wir an, dass Sie eine Kundenbestellung von "Jane Doe" über 5 Stück des Artikels "RM0001" zu 300€ haben. Im Folgenden sehen Sie die Details des Lieferscheins.
+Nehmen wir an, dass Sie eine Kundenbestellung von "Utah Automation Services" über 5 Stück des Artikels "RM0001" zu 300€ haben. Im Folgenden sehen Sie die Details des Lieferscheins.
 
-**Kunde:** Jane Doe
+**Kunde:** Utah Automation Services
 
 **Artikel:**
 
@@ -206,18 +206,15 @@
 
 **Lagerbuch**
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
 
 **Hauptbuch**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-6.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
 
 Da der Artikel aus dem Lager "In Verkaufsstellen" geliefert wird, wird das Konto "In Verkaufsstellen" entlastet und ein Betrag in gleicher Höhe dem Aufwandskonto "Selbstkosten" belastet. Der belastete/entlastete Betrag ist gleich dem Gesamtwert (Einkaufskosten) des Verkaufsartikels. Und der Wert wird gemäß der bevorzugten Bewertungsmethode (FIFO/Gleitender Durchschnitt) oder den tatsächlichen Kosten eines serialisierten Artikels kalkuliert.
 
-
-    
-    
-        
+      
     In diesem Beispiel gehen wir davon aus, dass wir als Berwertungsmethode FIFO verwenden. 
     Bewertungpreis  = Einkaufpreis + In der Bewertung enthaltene Abgaben/Gebühren 
                     = 200 + (250 * (2000 / 2500) / 10) 
@@ -225,20 +222,20 @@
     Gesamtsumme der Bewertung = 220 * 5 
                             = 1100
         
-    
 
 * * *
 
 ### Ausgangsrechnung mit Lageraktualisierung
+
 Nehmen wir an, dass Sie zur obigen Bestellung keinen Lieferschein erstellt haben sondern direkt eine Ausgangsrechnung mit der Option "Lager aktualisieren" erstellt haben. Die Details der Ausgangsrechnung sind die gleichen wie bei obigem Lieferschein.
 
 **Lagerbuch**
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
 
 **Hauptbuch**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-8.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
 
 Hier werden, im Gegensatz zu den normalen Buchungen für Rechnungen, die Konten "In Verkaufsstellen" und "Selbstkosten" basierend auf der Bewertung beeinflusst.
 
@@ -271,11 +268,11 @@
 
 **Lagerbuch**
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
 
 **Hauptbuch**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
 
 * * *
 
@@ -306,11 +303,11 @@
 
 **Lagerbuch**
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
 
 **Hauptbuch**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png)
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
 
 * * *
 
@@ -343,22 +340,8 @@
 
 **Lagerbuch**
 
-![Lagerbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png)
+<img class="screenshot" alt="Lagerbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
 
 **Hauptbuch**
 
-![Hauptbuch]({{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+<img class="screenshot" alt="Hauptbuch" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/accounts/index.md b/erpnext/docs/user/manual/en/accounts/index.md
index ab93126..84c901d 100644
--- a/erpnext/docs/user/manual/en/accounts/index.md
+++ b/erpnext/docs/user/manual/en/accounts/index.md
@@ -6,7 +6,7 @@
 
   * Sales Invoice: The bills that you raise to your Customers for the products or services you provide.
   * Purchase Invoice: Bills that your Suppliers give you for their products or services.
-  * Journal Entrys: For accounting entries, like payments, credit and other types.
+  * Journal Entries: For accounting entries, like payments, credit and other types.
 
 ### Topics
 
diff --git a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
index 433219c..3ffd930 100644
--- a/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/purchase-invoice.md
@@ -3,18 +3,29 @@
 accrue expenses to your Supplier. Making a Purchase Invoice is very similar to
 making a Purchase Order.
 
-To make a new Purchase Invoice, go to:
-
-> Accounts > Documents > Purchase Invoice > New Purchase Invoice
+To make a new Purchase Invoice:
+> type "new purchase invoice" into the search bar then select "New Purchase 
+Invoice" from the drop down
 
 or click on “Make Purchase Invoice” in Purchase Order or Purchase Receipt.
 
+You can also create a Purchase Invoice from:
+> Accounts > Billing > Purchase Invoice > New Purchase Invoice
+
 <img class="screenshot" alt="Purchase Invoice" src="{{docs_base_url}}/assets/img/accounts/purchase-invoice.png">
 
 The concept of “Posting Date” is again same as Sales Invoice. “Bill No” and
 “Bill Date” helps to track the bill number as set by your Supplier for
 reference.
 
+#### Is Paid option
+The **Is Paid** checkbox should be checked if there is a part or full payment 
+on the invoice at posting date.
+
+#### Update Stock
+The **Update Stock** checkbox should be checked if you want ERPNext to automatically
+ update your inventory. Consequently, there will be no need for a Delivery Note.
+
 #### Accounting Impact
 
 Like in Sales Invoice, you have to enter an Expense or an Asset account for
@@ -34,7 +45,18 @@
 Credits:
 
   * Supplier
+  
+##### Accounting Treatment When **Is Paid** is checked
+If **Is Paid** is checked, ERPNext will also make the following
+accounting entries:
 
+Debits:
+
+  * Supplier
+  
+Credits:
+  * Bank/Cash Account
+  
 To see entries in your Purchase Invoice after you “Submit”, click on “View
 Ledger”.
 
diff --git a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
index 16b5431..5ed3802 100644
--- a/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
+++ b/erpnext/docs/user/manual/en/accounts/setup/cost-center.md
@@ -32,6 +32,6 @@
 
 > Accounts > Setup > Chart of Cost Centers
 
-![Chart of Cost Center]({{docs_base_url}}/assets/old_images/erpnext/chart-of-cost-centers.png)
+<img class="screenshot" alt="Cost Center" src="{{docs_base_url}}/assets/img/chart-of-cost-center.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
index 8df8201..87348ee 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/bank-reconciliation.md
@@ -1,26 +1,20 @@
 ### Bank Reconciliation Statement
 
-If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have
-mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entrys using the “Bank Reconciliation”
-tool.
+If you are receiving payments or making payments via cheques, the bank statements will not accurately match the dates of your entry, this is because the bank usually takes time to “clear” these payments. Also you may have mailed a cheque to your Supplier and it may be a few days before it is received and deposited by the Supplier. In ERPNext you can synchronise your bank statements and your Journal Entries using the “Bank Reconciliation” tool.
 
 The Bank Reconciliation Report provide the difference between the bank balance shown in an organisation's bank statement, as provided by the ban against amount shown in the companies Chart of Accounts.
 
 ####Bank Reconciliation Statement
 
-![]({{docs_base_url}}/assets/old_images/erpnext/bank-reconciliation-2.png)  
+<img class="screenshot" alt="Bank Reconciliation statement" src="{{docs_base_url}}/assets/img/accounts/bank-reconciliation-2.png">  
 
 In the report, check whether the field 'Balance as per bank' matches the Bank Account Statement. If it is matching, it means that Clearance Date is correctly updated for all the bank entries. If there is a mismatch, Its because of bank entries for which Cleanrane Date is not yet updated.
 
-To add clearance entries go to:
-
-> Accounts > Tools > Bank Reconciliation
-
 ###Bank Reconciliation Tool
 
-o use this, go to:
+To add clearance entries go to:
 
-> Accounts > Tools > Bank Reconciliation
+`Accounts > Tools > Bank Reconciliation`
 
 Select your “Bank” Account and enter the dates of your statement. Here you
 will get all the “Bank Voucher” type entries. In each of the entry on the
diff --git a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
index 2b2ec36..d0e765a 100644
--- a/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
+++ b/erpnext/docs/user/manual/en/accounts/tools/payment-tool.md
@@ -1,5 +1,5 @@
 ###Payment Tool
-The Payment Tool Feature allows non-accounting personnel to generate Journal Entrys by populating relevant fields in the Journal Entry with account and payment details.
+The Payment Tool Feature allows non-accounting personnel to generate Journal Entries by populating relevant fields in the Journal Entry with account and payment details.
 
 To go to Payment Tool, click on Accounts > Tools > Payment Tool.
 
diff --git a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
index 61f65fa..2e88601 100644
--- a/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
+++ b/erpnext/docs/user/manual/en/buying/setup/supplier-type.md
@@ -23,6 +23,4 @@
 Classifying your supplier into different types facilitates accounting and
 payments.
 
-Type your new supplier category and Save.
-
-{next}
+Type your new supplier category and Save.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
index 83d7bf6..257370e 100644
--- a/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
+++ b/erpnext/docs/user/manual/en/customer-portal/customer-orders-invoices-and-shipping-status.md
@@ -1,22 +1,17 @@
-ERPNext Web Portal gives your customers quick access to their Orders, Invoices
-and Shipments Customers can check the status of their orders, invoices, and
-shipping status by logging on to the web.
+ERPNext Web Portal gives your customers quick access to their Orders, Invoices and Shipments Customers can check the status of their orders, invoices, and shipping status by logging on to the web.
 
-![Portal Menu]({{docs_base_url}}/assets/old_images/erpnext/portal-menu.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/portal-menu.png">
 
-Once an order is raised, either using the Shopping Cart or from within
-ERPNext, your customer can view the order and keep an eye on the billing and
-shipment status. When the invoice and payment against these orders are
-submitted, the customer can see the updated status on the portal, at a glance.
+Once an order is raised, either using the Shopping Cart or from within ERPNext, your customer can view the order and keep an eye on the billing and shipment status. When the invoice and payment against these orders are submitted, the customer can see the updated status on the portal, at a glance.
 
-![Customer Portal]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-orders-1.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
-#### Invoice with paid status.
+#### Outstanding Sales Invoice
 
-![Invoice Paid]({{docs_base_url}}/assets/old_images/erpnext/portal-invoice-paid.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-unpaid.png">
 
-#### Invoice with billed status.
+#### Paid Sales Invoice
 
-![Billed Invoice]({{docs_base_url}}/assets/old_images/erpnext/portal-order-billed.png)
+<img class="screenshot" alt="Customer Portal Order 1" src="{{docs_base_url}}/assets/img/website/invoice-paid.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/customer-portal/sign-up.md b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
index 43c2f08..554285c 100644
--- a/erpnext/docs/user/manual/en/customer-portal/sign-up.md
+++ b/erpnext/docs/user/manual/en/customer-portal/sign-up.md
@@ -1,22 +1,15 @@
-Customers have to log-in to the Company Website, and sign-up as a customer.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
 
-#### Step 1: Click on Login Icon
+#### Step 1: Signup
 
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-1.png)
+On the Login Page, you will find option to Signup.
 
-  
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
-#### Step 2: Click on Sign Up Icon
+#### Step 2: Enter Customer Name and ID
 
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-2.png)
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-signup-details.png">
 
-  
-
-#### Step 3: Enter Customer Name and ID
-
-![Sign Up]({{docs_base_url}}/assets/old_images/erpnext/customer-portal-sign-up-3.png)
-
-After the sign up process, a mail will be sent to the customers Email Address with
-the password details.
+After the sign up process, an email will be sent to the customers Email Address with the password details.
 
 {next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
index d68ab56..6e560cb 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/date-validation.md
@@ -3,8 +3,8 @@
 
 	frappe.ui.form.on("Task", "validate", function(frm) {
         if (frm.doc.from_date < get_today()) {
-            msgprint(__("You can not select past date in From Date"));
-            validated = false;
+            frappe.msgprint(__("You can not select past date in From Date"));
+            frappe.validated = false;
         }
 	});
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
index e5037fe..79fe9a5 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-cancel-rights.md
@@ -3,12 +3,12 @@
 
 
     cur_frm.cscript.custom_before_cancel = function(doc) {
-        if (user_roles.indexOf("Accounts User")!=-1 && user_roles.indexOf("Accounts Manager")==-1
+        if (frappe.user_roles.indexOf("Accounts User")!=-1 && frappe.user_roles.indexOf("Accounts Manager")==-1
                 && user_roles.indexOf("System Manager")==-1) {
             if (flt(doc.grand_total) > 10000) {
-                msgprint("You can not cancel this transaction, because grand total \
+                frappe.msgprint("You can not cancel this transaction, because grand total \
                     is greater than 10000");
-                validated = false;
+                frappe.validated = false;
             }
         }
     }
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
index 9b37eb5..f3efd98 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-purpose-of-stock-entry.md
@@ -1,8 +1,8 @@
 
     frappe.ui.form.on("Material Request", "validate", function(frm) {
-        if(user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
-            msgprint("You are only allowed Material Receipt");
-            throw "Not allowed";
+        if(frappe.user=="user1@example.com" && frm.doc.purpose!="Material Receipt") {
+            frappe.msgprint("You are only allowed Material Receipt");
+            frappe.throw(__("Not allowed"));
         }
     }
 
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
index 6c36a14..849e686 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/custom-scripts/custom-script-examples/restrict-user-based-on-child-record.md
@@ -1,16 +1,16 @@
 
     // restrict certain warehouse to Material Manager
     cur_frm.cscript.custom_validate = function(doc) {
-        if(user_roles.indexOf("Material Manager")==-1) {
+        if(frappe.user_roles.indexOf("Material Manager")==-1) {
 
-            var restricted_in_source = wn.model.get("Stock Entry Detail",
+            var restricted_in_source = frappe.model.get_list("Stock Entry Detail",
                 {parent:cur_frm.doc.name, s_warehouse:"Restricted"});
 
-            var restricted_in_target = wn.model.get("Stock Entry Detail",
+            var restricted_in_target = frappe.model.get_list("Stock Entry Detail",
                 {parent:cur_frm.doc.name, t_warehouse:"Restricted"})
 
             if(restricted_in_source.length || restricted_in_target.length) {
-                msgprint("Only Material Manager can make entry in Restricted Warehouse");
+                frappe.msgprint(__("Only Material Manager can make entry in Restricted Warehouse"));
                 validated = false;
             }
         }
diff --git a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
index 2be5a86..7e261b8 100644
--- a/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
+++ b/erpnext/docs/user/manual/en/introduction/concepts-and-terms.md
@@ -105,7 +105,7 @@
 
 A document that contains General Ledger (GL) entries and the sum of Debits and
 Credits of those entries is the same. In ERPNext you can update Payments,
-Returns, etc., using Journal Entrys.
+Returns, etc., using Journal Entries.
 
 > Accounts > Journal Entry
 
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/__init__.py b/erpnext/docs/user/manual/en/schools/Assessment/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/__init__.py
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
new file mode 100644
index 0000000..1538463
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_criteria.md
@@ -0,0 +1,13 @@
+#Assessment Criteria
+
+Assessment Criteria is the parameter based on which you assess the Student.
+
+<img class="screenshot" alt="Assessment Criteria" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-criteria.png">
+
+After assessment is conducted for a Course, marks earned are entered based on the Assessment Criteria. For example, if assessment was conducted for science subject, then you can evaluate Student in Science on various criteria like Writing, Practicals, Presentation etc.
+
+Assessment Criteria is be used when scheduling Assessment Plan for Student Group and Course.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-plan-criteria.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
new file mode 100644
index 0000000..ae67dba
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_group.md
@@ -0,0 +1,13 @@
+#Assessment Group
+
+Assessment Group tree is a master where you can define the hierarchy for examination conducted in your education institute.
+
+For example, if you conduct two assessment in a academic year, then setup Assessment Group as following.
+
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-group-term.png">
+
+On the same lines, you can also define multiple Assessment Group bases on assessment conducted in your institute.
+
+<img class="screenshot" alt="Assessment Group Term" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-group-details.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
new file mode 100644
index 0000000..85b03bf
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_plan.md
@@ -0,0 +1,19 @@
+#Assessment Plan
+
+To schedule an assessment/examination for a Student Group, for specific Course, create Assessment Plan. In the Assessment Plan, you can also capture details like:
+
+1. Grading Scale based on which grades will be assigned to students.
+
+2. Schedule Date of Assessment
+
+3. Room where assessment will be conducted
+
+4. Examiner and Supervisor
+
+<img class="screenshot" alt="Assessment Plan Details" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-plan-details.png">
+
+5. Assessment Criteria is list of criteria based which each student in will be evaluated and grades will be assigned.
+
+<img class="screenshot" alt="Assessment Plan Criteria" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-plan-criteria.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
new file mode 100644
index 0000000..68d17e1
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result.md
@@ -0,0 +1,7 @@
+#Assessment Result
+
+Assessment Result is a log of marks/grades earned by the student for specific Assessment. Assessment Result is created in the backend based on the marks entered in the [Assessment Result Tool]({{docs_base_url}}/user/manual/en/schools/assessment/assessment_result_tool.html).
+
+<img class="screenshot" alt="Assessment Result" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-result.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
new file mode 100644
index 0000000..a1111eb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/assessment_result_tool.md
@@ -0,0 +1,9 @@
+#Assessment Result Tool
+
+Assessment Result Tool help you entering marks earned by the Students for specific course. In this tool, based on the Assessment Plan, all the Student will be fetched into Assessment Result Tool. Also, Columns for Assessment Criteria will be where marks earned can be entered for each Student.
+
+<img class="screenshot" alt="Assessment Result Tool" src="{{docs_base_url}}/assets/img/schools/assessment/assessment-result-tool.png">
+
+As you go on entering marks for a Student, and switch to next student, in the backend, Student Result record will be auto-created for that Student.
+
+{next}
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
new file mode 100644
index 0000000..c0a39cb
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/grading_scale.md
@@ -0,0 +1,7 @@
+#Grading Scale
+
+In the Grading Scale, you can define various grades and threshold for them. Based on the score earned by an Student for an Assessment, Grade will be assigned.
+
+<img class="screenshot" alt="Grading Scale" src="{{docs_base_url}}/assets/img/schools/assessment/grading-scale.png">
+
+{next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.md b/erpnext/docs/user/manual/en/schools/Assessment/index.md
new file mode 100644
index 0000000..3dab62a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/index.md
@@ -0,0 +1,17 @@
+#Assessment
+
+Every education institute organizes assessment / examination to evaluates progress of their Students. In ERPNext, you can manage complete assessment processing for your ERPNext account.
+
+Following is the order in which you should setup masters in the Assessment module.
+
+1. Assessment Criteria
+2. Assessment Group
+3. Grading Scale
+
+Once you have also defined the Student Group and Courses, you can schedule an assessment / examination by creating Assessment Plan.
+
+Based on the performance of Student in the assessment, you can create Assessment Result for an Student. You can create Assessment Results in bulk using Assessment Result Tool. In this tool, on selection of Assessment Plan, all the students (for Student Group) will be fetched. You can quickly enter marks earned by each Student for each Assessment Criteria in a single row.
+
+### Topics
+
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/Assessment/index.txt b/erpnext/docs/user/manual/en/schools/Assessment/index.txt
new file mode 100644
index 0000000..61d744c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/schools/Assessment/index.txt
@@ -0,0 +1,6 @@
+assessment_criteria
+assessment_group
+grading_scale
+assessment_plan
+assessment_result_tool
+assessment_result
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/schools/index.txt b/erpnext/docs/user/manual/en/schools/index.txt
index f054827..b485fdc 100644
--- a/erpnext/docs/user/manual/en/schools/index.txt
+++ b/erpnext/docs/user/manual/en/schools/index.txt
@@ -2,4 +2,5 @@
 admission
 schedule
 fees
-setup
\ No newline at end of file
+setup
+assessment
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
index d4cb0ba..e1c8b13 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/bulk-rename.md
@@ -12,6 +12,4 @@
 
 To rename multiple records, upload a **.csv** file with the old name in the first column and the new name in the second column and click on **Upload**.
 
-<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
-
-{next}
+<img class="screenshot" alt="Bulk Rename" src="{{docs_base_url}}/assets/img/setup/data/rename.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-account.md b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
index f020362..ad448b0 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/email-account.md
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-account.md
@@ -1,8 +1,8 @@
 # Email Accounts
 
-You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be atleast one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us.
+You can manage multiple incoming and outgoing Email Accounts in ERPNext. There has to be at-least one default outgoing account and one default incoming account. If you are on the ERPNext cloud, the default outgoing email is set by us.
 
-> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like GMail will restrict you to a limited number of emails per day.
+> **Note for self implementers:** For outgoing emails, you should setup your own SMTP server or sign up with an SMTP relay service like mandrill.com or sendgrid.com that allows a larger number of transactional emails to be sent. Regular email services like Gmail will restrict you to a limited number of emails per day.
 
 ### Default Email Accounts
 
diff --git a/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
new file mode 100644
index 0000000..d098d0c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/email/email-inbox.md
@@ -0,0 +1,86 @@
+# Email Inbox
+
+Business involves many transactional emails exchanges with parties like Customers and Suppliers, and within a company. Email Inbox feature allows you pull all your business emails into your ERPNext account. Accessing all the business emails with other transactions details makes ERPNext a single platform for accessing complete business information in one place.
+
+In ERPNext, you can configure Email Inbox for each System User. Following are the detailed steps to configure Email Inbox for a User.
+
+#### Step 1: Create User
+
+As mentioned above, you can configure Email Inbox for a System User only. Hence ensure that you have added yourself and your colleagues as a User and assigned them required permissions.
+
+To add new User, go to:
+
+`Setup > User > New User`
+
+<img class="screenshot" alt="Email User" src="{{docs_base_url}}/assets/img/setup/email/email-user.png">
+
+#### Step 2: Create Email Domain
+
+To be able to send and receive emails into your ERPNext from other email service (like WebMail or Gmail), you should setup an Email Domain master. In this master, email gateway details like SMTP Address, Port No., IMAP/POP3 address details are captured. If you have ever configured a local email client (like Outlook), Email Domain master requires details to be fed in the similar way.
+
+To add new Email Domain, go to:
+
+`Setup > Emails > Email Domain > New`
+
+<img class="screenshot" alt="Email Domain" src="{{docs_base_url}}/assets/img/setup/email/email-domain.png">
+
+Once you have configured an Email Domain for your Email Service, it will be used for creating Email Accounts for all the Users in your ERPNext account.
+
+<div class=well>If you use one of the following Email Service, then you need not create Email Domain in your ERPNext account. In ERPNext, Email Domain for the following Services is available out-of-the-box and you can directly proceed to creating Email Account.
+<ul>
+<li>Gmail</li>
+<li>Yahoo</li>
+<li>Sparkpost</li>
+<li>SendGrid</li>
+<li>Outlook.com</li>
+<li>Yandex.mail</li>
+<ul>
+</div>
+
+#### Step 3: Email Account
+
+Create an Email Account based on the Email ID of the User. For each User who's email account is to be integrated with ERPNext, an Email Account master should be created for it. 
+
+If you are creating an Email Account for your colleague who's Email Password is unknown to you, then check field "Awaiting Password". As per this setting, a User (for whom Email Account is created) will get a prompt to enter email password when accessing his/her ERPNext Account.
+
+<img class="screenshot" alt="Email Password" src="{{docs_base_url}}/assets/img/setup/email/email-password.png">
+
+In the Email Account, select Email Domain only if you are using Email Service other than Email Services listed above. Else, you can just select Email Service, leave Email Domain blank and proceed forward.
+
+<img class="screenshot" alt="Email Service" src="{{docs_base_url}}/assets/img/setup/email/email-service.png">
+
+>If you are creating an Email Account for Email Inbox of a User, then leave Append To field as blank.
+
+For more details on how to setup Email Account, [click here]({{docs_base_url}}/user/manual/en/setting-up/email/email-account.html").
+
+#### Step 4: Linking Email Account in User master
+
+Once an Email Account is created for an User, select that Email Account in the User. This will ensure that emails pulled from the said Email ID will accessible only to this User in your ERPNext account.
+
+<img class="screenshot" alt="Email User Link" src="{{docs_base_url}}/assets/img/setup/email/email-user-link.png">
+
+## Email Inbox
+
+If you have correctly configured Email Inbox as instructed above, then on the login of a User, Email Inbox icon will be visible. This will navigate user to Email Inbox view within the ERPNext account. All the Emails received on that email will be fetch and listed in the Email Inbox view. User will be able to open emails and take various actions against it.
+
+<img class="screenshot" alt="Email Inbox" src="{{docs_base_url}}/assets/img/setup/email/email-inbox.png">
+
+#### Folders
+
+In ERPNext, you can link multiple Email Accounts with the single User. To switch to Inbox of different email account and access other folders like Sent Emails, Spam, Trash, check Email Inbox option in the left bar.
+
+<img class="screenshot" alt="Email Folders" src="{{docs_base_url}}/assets/img/setup/email/email-folders.png">
+
+#### Actions
+
+On the emails in your inbox, you can take various actions like Reply, Forward, Mark as Spam or Trash.
+
+<img class="screenshot" alt="Email Actions" src="{{docs_base_url}}/assets/img/setup/email/email-actions.png">
+
+#### Make Options
+
+The Email Inbox within ERPNext also allow you to quickly create ERPNext transaction based on email received. From an Email itself, you can a Issue, Lead or Opportunity based on the context of the email.
+
+<img class="screenshot" alt="Make from Email" src="{{docs_base_url}}/assets/img/setup/email/make-from-email.png">
+
+
diff --git a/erpnext/docs/user/manual/en/setting-up/email/index.txt b/erpnext/docs/user/manual/en/setting-up/email/index.txt
index 7ca1b94..778fc81 100644
--- a/erpnext/docs/user/manual/en/setting-up/email/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/email/index.txt
@@ -1,4 +1,5 @@
 email-account
+email-inbox
 email-alerts
 email-digest
 email-reports
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
index 053b4f1..b436b46 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/system-settings.md
@@ -2,6 +2,8 @@
 
 You can localize ERPNext to use particular timezone, date, number or currency format and also set global session expiry via System Settings.
 
+By checking the 'Allow Login using Mobile Number' checkbox, you can login to ERPNext using a valid mobile number set in your User account. 
+
 To open System Settings, go to:
 
 > Setup > Settings > System Settings
diff --git a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md b/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
deleted file mode 100644
index c4e74ca..0000000
--- a/erpnext/docs/user/manual/en/setting-up/third-party-backups.md
+++ /dev/null
@@ -1,54 +0,0 @@
-If you wish to store your backups on a periodic basis,on Dropbox, you can do
-it directly through ERPNext.
-
-> Setup > Manage 3rd Party Backups
-
-__Step 1:__ Click on Setup.
-
-__Step 2:__ Click on Manage Third Party Backup
-
-#### Figure 1: Manage Third Party Backup
-
-![Third Party Backups]({{docs_base_url}}/assets/old_images/erpnext/third-party-backups.png)
-
-On the Backup Manager page, enter the email addresses of those people whom you
-wish to notify about the upload status. Under the topic 'Sync with Dropbox',
-select whether you wish to upload Daily, Weekly or Never. 
-
-__Step 3__ Click on **Allow Dropbox Access**.
-
-> Tip: In future, if you wish to discontinue uploading backups to dropbox,
-then select the Never option.
-
-#### Figure 2: Allow Dropbox Access
-
-![Backup Manager]({{docs_base_url}}/assets/old_images/erpnext/backup-manager.png)
-
-You need to login to your dropbox account, with your user id and password.
-
-![Dropbox Access]({{docs_base_url}}/assets/old_images/erpnext/dropbox-access.png)
-
-## Open Source Users
-
-Installing Pre-Requisites
-
-    
-    
-    pip install dropbox
-    pip install google-api-python-client
-    
-
-  
-
-#### Create an App in Dropbox
-
-First create your Dropbox account and create a new app (https://www.dropbox.com/developers/apps).
-After successful creation of account you will receive `app_key`, `app_secret` and `access_type`. Now edit `site_config.json` of your site (/frappe-bench/sites/your-site/) and add the following lines:
-- `"dropbox_access_key": "app_key",` and 
-- `"dropbox_secret_key": "app_secret"`
-
-Then you can go to the "Integrations" module and Allow Dropbox Access.
-
-> Note: Please ensure Allow Pop-ups are enabled in your browser.
-
-{next}
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 517c674..6fb64df 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
@@ -20,7 +20,10 @@
 
 Add user details such as First Name, Last Name, Email etc.
 
-The user's Email will become the user id.
+The user's Email will become the user id. Mobile No can also be used to log in if you check the Allow Login using Mobile No checkbox under the Security section in System Settings. While Mobile No will be unique, it will not be treated as a user id.
+
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-email.png" alt="Email Login">
+<img class="screenshot" src="{{docs_base_url}}/assets/img/setup/users/user-login-mobile.png" alt="Mobile No Login">
 
 After adding these details, save the user.
 
diff --git a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
index 84fe545..92e0544 100644
--- a/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
+++ b/erpnext/docs/user/manual/en/stock/accounting-of-inventory-stock/perpetual-inventory.md
@@ -1,26 +1,29 @@
 As per the perpetual inventory system, accounts posting is done for every stock transaction.
 
-On creating new Warehouse, the system will automatically create an Account in the Chart of Accout, with the same name as Warehouse Name.
+On creating new Warehouse, the system will automatically create an Account in the Chart of Account, with the same name as Warehouse Name.
 
 On receipt of items in a particular warehouse, the balance in the Warehouse Account will increase. Similarly when items are delivered from the Warehouse, an expense will be booked, and balance in the Warehouse Account will reduce.
 
 ##Activation
 
-  1. Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
-
-    * Stock Received But Not Billed
-    * Stock Adjustment Account
-    * Expenses Included In Valuation
-    * Cost Center
-	
-  2. Ensure each Warehouse is an Account in the Chart of Accounts master. As per the default configuration, Accounts for Warehouse are created under `Assets > Current Asset > Stock Assets > (Warehouse)`
-
-  3. Activate Perpetual Inventory
+  * Activate Perpetual Inventory
 
 	 > Explore > Accounts > Accounts Settings > "Make Accounting Entry For Every Stock Movement"
 
 <img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-1.png">
 
+  * Setup the following default accounts for each Company. These accounts are created automatically in the new ERPNext accounts.
+
+	* Default Inventory Account
+    * Stock Received But Not Billed
+    * Stock Adjustment Account
+    * Expenses Included In Valuation	
+    * Cost Center
+
+  * If user wants to set an individual account for each warehouse, create account head for each account under `Assets > Current Asset > Stock Assets > (Warehouse)` and set it on the respective warehouse under field 'Account'.
+
+  * For stock transactions, general ledger entries made against the account head set on the warehouse, if user had not set the account for the warhouse then system gets the account head from the parent warehouse. If account had not set for parent warehouse then system gets the account(Default Inventory Account) from the company master.
+
 * * *
 
 ##Example
@@ -69,9 +72,9 @@
 
 ###Purchase Receipt
 
-Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "East Wind Inc". Following are the details of Purchase Receipt:
+Suppose you have purchased _10 nos_ of item "RM0001" at _$200_ and _5 nos_ of item "Base Plate" at **$100** from supplier "Arcu Vel Quam Fabricators". Following are the details of Purchase Receipt:
 
-**Supplier:** East Wind Inc.
+**Supplier:** Arcu Vel Quam Fabricators
 
 **Items:**
 
@@ -128,11 +131,11 @@
 
 **Stock Ledger**
 
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-2.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-sl-1.png">
 
 **General Ledger**
 
-<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-3.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-receipt-gl-2.png">
 
 As stock balance increases through Purchase Receipt, "Store" accounts are debited and a temporary account "Stock Receipt But Not Billed" account is credited, to maintain double entry accounting system. At the same time, negative expense is booked in account "Expense included in Valuation" for the amount added for valuation purpose, to avoid double expense booking.
 
@@ -144,7 +147,7 @@
 
 **General Ledger**
 
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-4.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-pinv-gl-3.png">
 
 Here "Stock Received But Not Billed" account is debited and nullified the
 effect of Purchase Receipt.
@@ -153,10 +156,10 @@
 
 ###Delivery Note
 
-Lets say, you have an order from "Jane Doe" to deliver 5 nos of item "RM0001"
+Lets say, you have an order from "Utah Automation Services" to deliver 5 nos of item "RM0001"
 at $300. Following are the details of Delivery Note:
 
-**Customer:** Jane Doe
+**Customer:** Utah Automation Services
 
 **Items:**
 <table class="table table-bordered">
@@ -202,21 +205,20 @@
 
 **Stock Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-5.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-sl-4.png">
 
 **General Ledger**
 
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-6.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-dn-gl-5.png">
 
 As item is delivered from "Stores" warehouse, "Stores" account is credited and
 equal amount is debited to the expense account "Cost of Goods Sold". The
 debit/credit amount is equal to the total valuation amount (buying cost) of
-the selling items. And valuation amount is calculated based on your prefferred
+the selling items. And valuation amount is calculated based on your preferred
 valuation method (FIFO / Moving Average) or actual cost of serialized items.
 
     
-    
-        
+     
     In this example, we have considered valuation method as FIFO. 
     Valuation Rate  = Purchase Rate + Charges Included in Valuation 
                     = 200 + (250 * (2000 / 2500) / 10) 
@@ -236,11 +238,11 @@
 
 **Stock Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-7.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-sl-6.png">
 
 **General Ledger**
 
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-8.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-inv-gl-7.png">
 
 Here, apart from normal account entries for invoice, "Stores" and "Cost of
 Goods Sold" accounts are also affected based on the valuation amount.
@@ -274,11 +276,11 @@
 
 **Stock Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-9.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-sl.png">
 
 **General Ledger**
 
-<img alt="General" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-10.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-receipt-gl.png">
 
 * * *
 
@@ -309,11 +311,11 @@
 
 **Stock Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-11.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-sl.png">
 
 **General Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-12.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-issue-gl.png">
 
 * * *
 
@@ -346,10 +348,10 @@
 
 **Stock Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-13.png">
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-sl.png">
 
 **General Ledger**
 
-<img alt="Stock" class="screenshot" src="{{docs_base_url}}/assets/old_images/erpnext/accounting-for-stock-14.png">
-
+<img class="screenshot" alt="Perpetual Inventory" src="{{docs_base_url}}/assets/img/accounts/perpetual-st-transfer-gl.png">
+	
 {next}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/stock/delivery-note.md b/erpnext/docs/user/manual/en/stock/delivery-note.md
index 236e24b..ad5f2c8 100644
--- a/erpnext/docs/user/manual/en/stock/delivery-note.md
+++ b/erpnext/docs/user/manual/en/stock/delivery-note.md
@@ -28,7 +28,7 @@
 If your Items are serialized, then for Product Bundle type of Items, you will have
 to update the Serial Number in the “Packing List” table.
 
-### Packing Items in to Cases, for Container Shipment
+### Packing Items into Cases, for Container Shipment
 
 If you are doing container shipment or by weight, then you can use the Packing
 Slip to breakup your Delivery Note into smaller units. To make a Packing Slip
diff --git a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
index 9344870..fc5ef00 100644
--- a/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
+++ b/erpnext/docs/user/manual/en/stock/item/item-valuation-fifo-and-moving-average.md
@@ -24,5 +24,3 @@
   * **Moving Average:** In this method, ERPNext assumes that the value of the item at any point is the average price of the units of that Item in stock. For example, if the value of an Item is X in a Warehouse with quantity Y and another quantity Y1 is added to the Warehouse at cost X1, the new value X2 would be:
 
 > New Value X2 = (X * Y + X1 * Y1) / (Y + Y1)
-
-{next}
diff --git a/erpnext/docs/user/manual/en/stock/stock-entry.md b/erpnext/docs/user/manual/en/stock/stock-entry.md
index a47d863..fb784c4 100644
--- a/erpnext/docs/user/manual/en/stock/stock-entry.md
+++ b/erpnext/docs/user/manual/en/stock/stock-entry.md
@@ -23,7 +23,7 @@
 
 **Additional Costs:**
 
-If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) assotiated with the process. The additional costs will be considered to calculate valuation rate of the items.
+If the stock entry is an incoming entry i.e any item is receiving at a target warehouse, you can add related additional costs (like Shipping Charges, Customs Duty, Operating Costs etc) associated with the process. The additional costs will be considered to calculate valuation rate of the items.
 
 To add additional costs, enter the description and amount of the cost in the Additional Costs table.
 
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
index 3378b2d..a753358 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/bulk-rename.md
@@ -22,4 +22,6 @@
 
 ![Upload Data]({{docs_base_url}}/assets/img/articles/Selection_0173436a8.png) 
 
+{next}
+
 <!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/using-erpnext/calendar.md b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
index 5e0ae29..c674bf6 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/calendar.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/calendar.md
@@ -1,56 +1,49 @@
-The Calendar is a tool where you can create and share Events and also see
-auto-generated events from the system.
+The Calendar is a tool where you can create and share Events and also see auto-generated events from the system.
 
 You can switch calender view based on Month, Week and Day.
 
-###Creating Events in Calender
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-1.png">
 
-####Creating Event Manually
+### Creating Events in Calender
+
+#### Creating Event Manually
 
 To create event manually, you should first determine Calender View. If Event's start and end time will be within one day, then you should first switch to Day view.
 
 This view will 24 hours of a day broken in various slots. You should click on slot for Event Start Time, and drag it down till you reach event end time.
 
-![Calender Event Manually]({{docs_base_url}}/assets/old_images/erpnext/calender-event-manually.png)
+<img class="screenshot" alt="Calendar" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-2.gif">
 
 Based on the selection of time slot, Start Time and End Time will be updated in the Event master. Then you can set subject for an event, and save it.
 
-####Event Based on Lead
+#### Event Based on Lead
 
 In the Lead form, you will find a field called Next Contact By and Next Contact Date. Event will be auto created for date and person specified in this field.
 
-![Calender Event Lead]({{docs_base_url}}/assets/old_images/erpnext/calender-event-lead.png)
+<img class="screenshot" alt="Lead Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-3.png">
 
-####Birthday Event
+#### Birthday Event
 
 Birthday Event is created based on Date of Birth specified in the Employee master.
 
-###Recurring Events
+### Recurring Events
 
 You can set events as recurring in specific interval by Checking the "Repeat This
 Event".
 
-![Calender Event Recurring]({{docs_base_url}}/assets/old_images/erpnext/calender-event-recurring.png)
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-4.png">
 
-###Permission for Event
-
-You can set Event as Private or Public. Private Events will be visible only to you, and you can also assign permission for event based on Role in the participants table.
-
-Public Event, like Birthday will be visible to all.
-
-![Calender Event Permission]({{docs_base_url}}/assets/old_images/erpnext/calender-event-permission.png)
-
-###Event Reminders
+### Event Reminders
 
 There are two ways you can receive email reminder for an event.
 
-####Enable Reminder in Event
+#### Enable Reminder in Event
 
 In the Event master, checking "Send an email reminder in the morning" will trigger notification email to all the participants for this event.
 
-![Calender Event Notification]({{docs_base_url}}/assets/old_images/erpnext/calender-event-notification.png)
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calendar-6.png">
 
-####Create Email Digest
+#### Create Email Digest
 
 To get email reminders for event, you should set Email Digest for Calender Events.
 
@@ -58,6 +51,6 @@
 
 `Setup > Email > Email Digest`
 
-![Calender Email Digest]({{docs_base_url}}/assets/old_images/erpnext/calender-email-digest.png)
+<img class="screenshot" alt="Calendar Recurring Event" src="{{docs_base_url}}/assets/img/collaboration-tools/calender-email-digest.png">
 
 {next}
diff --git a/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
new file mode 100644
index 0000000..bbcdc55
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/document-versioning.md
@@ -0,0 +1,21 @@
+#Document Versioning
+
+The document versioning feature allows you to track all the changes made in the form over the period. It will be very helpful in audit trial to check which user edited what value, and when exactly.
+
+####Enable Document Versioning
+
+Document Versioning can be enabled for one Document Type as a time. Let's assume that we need to enable it from Purchase Order. Then, we will check Customize Form tool for Purchase Order and check field `Track Changes`. With this, document versioning will be enabled for all the Purchase Orders create and edited hence forth.
+
+<img class="screenshot" alt="Enable Versioning" src="{{docs_base_url}}/assets/img/collaboration-tools/enable-versioning.png">
+
+####Version Log
+
+Following is link of version in a Purchase Order form. Each time a document is edited, a version's link will be added in that document. To check more details on specific version, click on it's link.
+
+<img class="screenshot" alt="Version Links" src="{{docs_base_url}}/assets/img/collaboration-tools/version-links.png">
+
+####Version Details
+
+In the Version document, you will find log of all the fields and values changes in it.
+
+<img class="screenshot" alt="Version Details" src="{{docs_base_url}}/assets/img/collaboration-tools/version-details.png">
\ 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 c3a6aa4..66bfc1e 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/index.txt
+++ b/erpnext/docs/user/manual/en/using-erpnext/index.txt
@@ -1,4 +1,6 @@
 to-do
+restore-deleted-docs
+document-versioning
 collaborating-around-forms
 chat
 notes
diff --git a/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
new file mode 100644
index 0000000..2c60d35
--- /dev/null
+++ b/erpnext/docs/user/manual/en/using-erpnext/restore-deleted-docs.md
@@ -0,0 +1,31 @@
+#Restore Deleted Documents
+
+In ERPNext, you can delete a records if not needed. They can be masters like Items, Customer or transactions like Sales Order, Payment Entries etc.
+
+<img class="screenshot" alt="Delete a Docuemnt" src="{{docs_base_url}}/assets/img/collaboration-tools/delete-a-doc.png">
+
+If you have deleted an entry by mistake and wish to restore it back into your ERPNext account.
+
+> Only User having System Manager role assigned can restore deleted documents.
+
+Steps below to restore a deleted document.
+
+####Step 1: Go to Deleted Documents
+
+For the list of deleted document, just type Deleted Document in the Search Bar and go to list.
+
+<img class="screenshot" alt="Deleted Docs List" src="{{docs_base_url}}/assets/img/collaboration-tools/deleted-docs-list.gif">
+
+####Step 2: Open Doc and Restore
+
+Open the document to be restored from the list. Click on Restore button.
+
+<img class="screenshot" alt="Restored Doc" src="{{docs_base_url}}/assets/img/collaboration-tools/restore-a-doc.png">
+
+####Step 3: Restored
+
+Once a document is restored, you will be able to use it for creating entries in your ERPNext account. 
+
+<img class="screenshot" alt="Restored Doc" src="{{docs_base_url}}/assets/img/collaboration-tools/restored-doc.png">
+
+> If canceled document is deleted, then it will not be restored.
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
index c4f0b77..b2250e0 100644
--- 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
@@ -1,8 +1,8 @@
-#Managing User Sign Up via Website
+#Customer / Supplier Signup
 
-Users can sign up for ERPNext account via the ERPNext Website.
+Your Customer and Suppliers can signup to your ERPNext account by following Signup option on the Login Page.
 
-<img src="{{docs_base_url}}/assets/img/website/website-login.png">
+<img class="screenshot" alt="Website User Signup" src="{{docs_base_url}}/assets/img/website/website-login.png">
 
 As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
 
diff --git a/erpnext/docs/user/videos/learn/budgeting.md b/erpnext/docs/user/videos/learn/budgeting.md
index 35e2b75..02f1c3b 100644
--- a/erpnext/docs/user/videos/learn/budgeting.md
+++ b/erpnext/docs/user/videos/learn/budgeting.md
@@ -1,7 +1,7 @@
 # Budgeting
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/pDDhR-D45eI" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/wWHkB0jlXNk" frameborder="0" allowfullscreen></iframe>
 
 **Duration: 3:26**
 
-Budgeting feature will help you from over-spending. In ERPNext, you can define budgets based on Cost Center and Projects.
\ No newline at end of file
+Budgeting feature will help you from over-spending. In ERPNext, you can define budgets based on Cost Center and Projects.
diff --git a/erpnext/docs/user/videos/learn/bulk-update.md b/erpnext/docs/user/videos/learn/bulk-update.md
index a0b80a3..7155fac 100644
--- a/erpnext/docs/user/videos/learn/bulk-update.md
+++ b/erpnext/docs/user/videos/learn/bulk-update.md
@@ -1,7 +1,7 @@
 # Bulk Update Data
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/J46-6qtyZ9U" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/pDDhR-D45eI" frameborder="0" allowfullscreen></iframe>
 
 **Duration: 1:38**
 
-Bulk Update Tool help you in over-writing value in the specific field of exitsting records.
\ No newline at end of file
+Bulk Update Tool help you in over-writing value in the specific field of exitsting records.
diff --git a/erpnext/docs/user/videos/learn/report-builder.md b/erpnext/docs/user/videos/learn/report-builder.md
index 72fdc25..f661120 100644
--- a/erpnext/docs/user/videos/learn/report-builder.md
+++ b/erpnext/docs/user/videos/learn/report-builder.md
@@ -1,7 +1,7 @@
 # Report Builder
 
-<iframe width="660" height="371" src="https://www.youtube.com/embed/y0o5iYZOioU" frameborder="0" allowfullscreen></iframe>
+<iframe width="660" height="371" src="https://www.youtube.com/embed/ECRyhMvIf6Q" frameborder="0" allowfullscreen></iframe>
 
 **Duration: 4:27**
 
-This tutorial covers creating custom reports in ERPNext using Report Builder.
\ No newline at end of file
+This tutorial covers creating custom reports in ERPNext using Report Builder.
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index d64409d..b8abd8a 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -146,7 +146,7 @@
 		"on_cancel": "erpnext.stock.doctype.material_request.material_request.update_completed_and_requested_qty"
 	},
 	"User": {
-		"after_insert": "frappe.email.doctype.contact.contact.update_contact",
+		"after_insert": "frappe.contacts.doctype.contact.contact.update_contact",
 		"validate": "erpnext.hr.doctype.employee.employee.validate_employee_role",
 		"on_update": ["erpnext.hr.doctype.employee.employee.update_user_permissions",
 			"erpnext.portal.utils.set_default_role"]
diff --git a/erpnext/hr/doctype/appraisal/appraisal.js b/erpnext/hr/doctype/appraisal/appraisal.js
index 728e5c2..64d6f40 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.js
+++ b/erpnext/hr/doctype/appraisal/appraisal.js
@@ -46,11 +46,11 @@
 	var d = locals[cdt][cdn];
 	if (d.score){
 		if (flt(d.score) > 5) {
-			msgprint(__("Score must be less than or equal to 5"));
+			frappe.msgprint(__("Score must be less than or equal to 5"));
 			d.score = 0;
 			refresh_field('score', d.name, 'goals');
 		}
-		total = flt(d.per_weightage*d.score)/100;
+		var total = flt(d.per_weightage*d.score)/100;
 		d.score_earned = total.toPrecision(2);
 		refresh_field('score_earned', d.name, 'goals');
 	}
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 5a557da..823fbd7 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -67,10 +70,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,6 +141,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -167,6 +173,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -197,6 +204,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -230,6 +238,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -261,6 +270,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -292,6 +302,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -323,6 +334,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -354,6 +366,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -384,6 +397,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -414,6 +428,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -442,6 +457,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -471,6 +487,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -500,6 +517,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -531,6 +549,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -559,6 +578,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -591,18 +611,18 @@
    "width": "150px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-thumbs-up", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:55:49.559295", 
+ "modified": "2017-06-13 14:28:49.914065", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Appraisal", 
diff --git a/erpnext/hr/doctype/attendance/attendance.js b/erpnext/hr/doctype/attendance/attendance.js
index 7f2b18f..c3c3cb8 100644
--- a/erpnext/hr/doctype/attendance/attendance.js
+++ b/erpnext/hr/doctype/attendance/attendance.js
@@ -5,7 +5,7 @@
 cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
 
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
-	if(doc.__islocal) cur_frm.set_value("attendance_date", get_today());
+	if(doc.__islocal) cur_frm.set_value("attendance_date", frappe.datetime.get_today());
 }
 
 cur_frm.fields_dict.employee.get_query = function(doc,cdt,cdn) {
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index d142f80..2078eab 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -69,10 +72,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -104,6 +108,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -134,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -166,6 +172,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -198,6 +205,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -227,6 +235,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -257,6 +266,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -288,6 +298,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,18 +328,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-ok", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:55:33.866723", 
+ "modified": "2017-06-13 14:29:11.771376", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Attendance", 
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index c53e497..87f0537 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -13,6 +13,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,6 +72,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -97,16 +100,17 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "salutation", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -119,7 +123,7 @@
    "no_copy": 0, 
    "oldfieldname": "salutation", 
    "oldfieldtype": "Select", 
-   "options": "\nMr\nMs", 
+   "options": "Salutation", 
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -132,6 +136,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +167,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -191,6 +197,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -221,6 +228,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -251,6 +259,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -280,6 +289,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -308,6 +318,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -338,6 +349,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -368,6 +380,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -399,12 +412,13 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
    "fieldname": "gender", 
-   "fieldtype": "Select", 
+   "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
@@ -417,7 +431,7 @@
    "no_copy": 0, 
    "oldfieldname": "gender", 
    "oldfieldtype": "Select", 
-   "options": "\nMale\nFemale\nOther", 
+   "options": "Gender",
    "permlevel": 0, 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
@@ -430,6 +444,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -458,6 +473,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -490,6 +506,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -521,6 +538,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -553,6 +571,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -580,6 +599,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -610,6 +630,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -640,6 +661,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -670,6 +692,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -700,6 +723,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -728,6 +752,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -759,6 +784,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -790,6 +816,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -821,6 +848,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -853,6 +881,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -883,6 +912,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -913,6 +943,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -944,6 +975,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -975,6 +1007,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1006,6 +1039,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1034,6 +1068,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1065,6 +1100,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1095,6 +1131,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1123,6 +1160,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1154,6 +1192,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1184,6 +1223,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1212,6 +1252,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1241,6 +1282,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1269,6 +1311,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1297,6 +1340,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1325,6 +1369,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -1353,6 +1398,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1381,6 +1427,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1410,6 +1457,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1438,6 +1486,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1467,6 +1516,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1495,6 +1545,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1523,6 +1574,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1552,6 +1604,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1580,6 +1633,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1608,6 +1662,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1636,6 +1691,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1664,6 +1720,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1692,6 +1749,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1720,6 +1778,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1749,6 +1808,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1778,6 +1838,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1807,6 +1868,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1836,6 +1898,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1864,6 +1927,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1893,6 +1957,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1922,6 +1987,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1951,6 +2017,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1980,6 +2047,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2009,6 +2077,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2038,6 +2107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2068,6 +2138,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2098,6 +2169,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2128,6 +2200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2159,6 +2232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2189,6 +2263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2220,6 +2295,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2250,6 +2326,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2281,6 +2358,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2311,6 +2389,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2353,10 +2432,11 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-14 17:04:27.247238", 
+ "modified": "2017-06-13 14:29:13.694009", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Employee", 
+ "name_case": "Title Case", 
  "owner": "Administrator", 
  "permissions": [
   {
@@ -2431,4 +2511,4 @@
  "title_field": "employee_name", 
  "track_changes": 1, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/employee/employee_dashboard.py b/erpnext/hr/doctype/employee/employee_dashboard.py
index 7de305d..be92074 100644
--- a/erpnext/hr/doctype/employee/employee_dashboard.py
+++ b/erpnext/hr/doctype/employee/employee_dashboard.py
@@ -15,6 +15,10 @@
 				'items': ['Salary Structure', 'Salary Slip', 'Timesheet']
 			},
 			{
+				'label': _('Training Events/Results'),
+				'items': ['Training Event', 'Training Result']
+			},
+			{
 				'label': _('Expense'),
 				'items': ['Expense Claim']
 			},
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index c0c0ef0..376d0c0 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -5,7 +5,7 @@
 	
 	onload: function(frm) {
 		frm.doc.department = frm.doc.branch = frm.doc.company = "All";
-		frm.set_value("date", get_today());
+		frm.set_value("date", frappe.datetime.get_today());
 		erpnext.employee_attendance_tool.load_employees(frm);
 	},
 
diff --git a/erpnext/hr/doctype/employee_loan/employee_loan.js b/erpnext/hr/doctype/employee_loan/employee_loan.js
index 71b6356..9720bcb 100644
--- a/erpnext/hr/doctype/employee_loan/employee_loan.js
+++ b/erpnext/hr/doctype/employee_loan/employee_loan.js
@@ -2,8 +2,8 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Employee Loan', {
-	onload: function(frm) {
-		frm.set_query("employee_loan_application", function() {
+	onload: function (frm) {
+		frm.set_query("employee_loan_application", function () {
 			return {
 				"filters": {
 					"employee": frm.doc.employee,
@@ -12,19 +12,19 @@
 				}
 			};
 		});
-		
-		frm.set_query("interest_income_account", function() {
+
+		frm.set_query("interest_income_account", function () {
 			return {
 				"filters": {
-						"company": frm.doc.company,
-						"root_type": "Income",
-						"is_group": 0
+					"company": frm.doc.company,
+					"root_type": "Income",
+					"is_group": 0
 				}
 			};
 		});
 
-		$.each(["payment_account", "employee_loan_account"], function(i, field) {
-			frm.set_query(field, function() {
+		$.each(["payment_account", "employee_loan_account"], function (i, field) {
+			frm.set_query(field, function () {
 				return {
 					"filters": {
 						"company": frm.doc.company,
@@ -36,16 +36,16 @@
 		})
 	},
 
-	refresh: function(frm) {
+	refresh: function (frm) {
 		if (frm.doc.docstatus == 1 && (frm.doc.status == "Sanctioned" || frm.doc.status == "Partially Disbursed")) {
-			frm.add_custom_button(__('Make Disbursement Entry'), function() {
+			frm.add_custom_button(__('Make Disbursement Entry'), function () {
 				frm.trigger("make_jv");
 			})
 		}
 		frm.trigger("toggle_fields");
 	},
 
-	make_jv: function(frm) {
+	make_jv: function (frm) {
 		frappe.call({
 			args: {
 				"employee_loan": frm.doc.name,
@@ -56,36 +56,36 @@
 				"payment_account": frm.doc.payment_account
 			},
 			method: "erpnext.hr.doctype.employee_loan.employee_loan.make_jv_entry",
-			callback: function(r) {
+			callback: function (r) {
 				if (r.message)
 					var doc = frappe.model.sync(r.message)[0];
-					frappe.set_route("Form", doc.doctype, doc.name);
+				frappe.set_route("Form", doc.doctype, doc.name);
 			}
 		})
 	},
-	mode_of_payment: function(frm) {
+	mode_of_payment: function (frm) {
 		frappe.call({
 			method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
 			args: {
 				"mode_of_payment": frm.doc.mode_of_payment,
 				"company": frm.doc.company
 			},
-			callback: function(r, rt) {
-				if(r.message) {
+			callback: function (r, rt) {
+				if (r.message) {
 					frm.set_value("payment_account", r.message.account);
 				}
 			}
 		});
 	},
 
-	employee_loan_application: function(frm) {
+	employee_loan_application: function (frm) {
 		return frappe.call({
 			method: "erpnext.hr.doctype.employee_loan.employee_loan.get_employee_loan_application",
 			args: {
 				"employee_loan_application": frm.doc.employee_loan_application
 			},
-			callback: function(r){
-				if(!r.exc && r.message) {
+			callback: function (r) {
+				if (!r.exc && r.message) {
 					frm.set_value("loan_type", r.message.loan_type);
 					frm.set_value("loan_amount", r.message.loan_amount);
 					frm.set_value("repayment_method", r.message.repayment_method);
@@ -97,12 +97,12 @@
 		})
 	},
 
-	repayment_method: function(frm) {
+	repayment_method: function (frm) {
 		frm.trigger("toggle_fields")
 	},
 
-	toggle_fields: function(frm) {
-		frm.toggle_enable("monthly_repayment_amount", frm.doc.repayment_method=="Repay Fixed Amount per Period")
-		frm.toggle_enable("repayment_periods", frm.doc.repayment_method=="Repay Over Number of Periods")
+	toggle_fields: function (frm) {
+		frm.toggle_enable("monthly_repayment_amount", frm.doc.repayment_method == "Repay Fixed Amount per Period")
+		frm.toggle_enable("repayment_periods", frm.doc.repayment_method == "Repay Over Number of Periods")
 	}
 });
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 95877cf..4ce91c4 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -52,7 +52,7 @@
 		cur_frm.set_value("approval_status", "Draft")
 
 	if (doc.__islocal) {
-		cur_frm.set_value("posting_date", dateutil.get_today());
+		cur_frm.set_value("posting_date", frappe.datetime.get_today());
 		if(doc.amended_from)
 			cur_frm.set_value("approval_status", "Draft");
 		cur_frm.cscript.clear_sanctioned(doc);
@@ -81,15 +81,15 @@
 	refresh_many(['sanctioned_amount', 'total_sanctioned_amount']);
 }
 
-cur_frm.cscript.refresh = function(doc,cdt,cdn){
+cur_frm.cscript.refresh = function(doc,cdt,cdn) {
 	cur_frm.cscript.set_help(doc);
 
 	if(!doc.__islocal) {
 		cur_frm.toggle_enable("exp_approver", doc.approval_status=="Draft");
-		cur_frm.toggle_enable("approval_status", (doc.exp_approver==user && doc.docstatus==0));
+		cur_frm.toggle_enable("approval_status", (doc.exp_approver==frappe.session.user && doc.docstatus==0));
 
-		if (doc.docstatus==0 && doc.exp_approver==user && doc.approval_status=="Approved")
-			 cur_frm.savesubmit();
+		if (doc.docstatus==0 && doc.exp_approver==frappe.session.user && doc.approval_status=="Approved")
+			cur_frm.savesubmit();
 
 		if (doc.docstatus===1 && doc.approval_status=="Approved") {
 			if (cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount) && frappe.model.can_create("Journal Entry")) {
@@ -97,6 +97,8 @@
 				cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
 			}
 
+			/* eslint-disable */
+			// no idea how `me` works here 
 			if (cint(doc.total_amount_reimbursed) > 0 && frappe.model.can_read("Journal Entry")) {
 				cur_frm.add_custom_button(__('Bank Entries'), function() {
 					frappe.route_options = {
@@ -107,17 +109,18 @@
 					frappe.set_route("List", "Journal Entry");
 				}, __("View"));
 			}
+			/* eslint-enable */
 		}
 	}
 }
 
 cur_frm.cscript.set_help = function(doc) {
 	cur_frm.set_intro("");
-	if(doc.__islocal && !in_list(roles, "HR User")) {
+	if(doc.__islocal && !in_list(frappe.user_roles, "HR User")) {
 		cur_frm.set_intro(__("Fill the form and save it"))
 	} else {
 		if(doc.docstatus==0 && doc.approval_status=="Draft") {
-			if(user==doc.exp_approver) {
+			if(frappe.session.user==doc.exp_approver) {
 				cur_frm.set_intro(__("You are the Expense Approver for this record. Please Update the 'Status' and Save"));
 			} else {
 				cur_frm.set_intro(__("Expense Claim is pending approval. Only the Expense Approver can update status."));
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 6f74388..48dcfbb 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -40,10 +41,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -106,6 +109,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -139,6 +143,7 @@
    "width": "160px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -168,6 +173,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -200,6 +206,7 @@
    "width": "160px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -232,6 +239,7 @@
    "width": "160px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -261,6 +269,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -292,6 +301,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -320,6 +330,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -351,6 +362,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -382,6 +394,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -413,6 +426,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -443,6 +457,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -473,6 +488,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -503,6 +519,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -530,6 +547,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -560,6 +578,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -590,6 +609,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -620,6 +640,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -650,6 +671,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -679,6 +701,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -710,6 +733,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -741,6 +765,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -769,6 +794,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -800,6 +826,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -830,6 +857,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -859,6 +887,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -890,6 +919,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -934,7 +964,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-04-10 12:15:20.363859", 
+ "modified": "2017-06-13 14:29:16.914609", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Expense Claim", 
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
index 5e6a7a8..2595506 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.py
@@ -10,7 +10,7 @@
 	def validate(self):
 		self.validate_accounts()
 		self.validate_repeating_companies()
-	
+
 	def validate_repeating_companies(self):
 		"""Error when Same Company is entered multiple times in accounts"""
 		accounts_list = []
@@ -24,4 +24,5 @@
 		for entry in self.accounts:
 			"""Error when Company of Ledger account doesn't match with Company Selected"""
 			if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
-				frappe.throw(_("Account does not match with Company"))
\ No newline at end of file
+				frappe.throw(_("Account {0} does not match with Company {1}"
+					).format(entry.default_account, entry.company))
\ No newline at end of file
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.js b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
index b7e1f45..4b4bfaf 100755
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.js
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.js
@@ -5,7 +5,7 @@
 
 frappe.ui.form.on("Leave Allocation", {
 	onload: function(frm) {
-		if(!frm.doc.from_date) frm.set_value("from_date", get_today());
+		if(!frm.doc.from_date) frm.set_value("from_date", frappe.datetime.get_today());
 
 		frm.set_query("employee", function() {
 			return {
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index f2ed766..d6285f7 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -67,10 +70,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -102,6 +106,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +164,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,6 +196,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,6 +225,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -248,6 +257,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -277,6 +287,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -306,6 +317,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -334,6 +346,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -362,6 +375,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -391,6 +405,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -420,6 +435,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -448,6 +464,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -479,18 +496,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-ok", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 16:51:05.744921", 
+ "modified": "2017-06-13 14:29:01.066538", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 
diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js
index 3bf41bb..2eb155d 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.js
+++ b/erpnext/hr/doctype/leave_application/leave_application.js
@@ -7,7 +7,7 @@
 frappe.ui.form.on("Leave Application", {
 	onload: function(frm) {
 		if (!frm.doc.posting_date) {
-			frm.set_value("posting_date", get_today());
+			frm.set_value("posting_date", frappe.datetime.get_today());
 		}
 
 		frm.set_query("leave_approver", function() {
@@ -76,9 +76,9 @@
 		frm.set_value('half_day_date', '');
 		var half_day_datepicker = frm.fields_dict.half_day_date.datepicker;
 		half_day_datepicker.update({
-				minDate: frappe.datetime.str_to_obj(frm.doc.from_date),
-				maxDate: frappe.datetime.str_to_obj(frm.doc.to_date)
-			})
+			minDate: frappe.datetime.str_to_obj(frm.doc.from_date),
+			maxDate: frappe.datetime.str_to_obj(frm.doc.to_date)
+		})
 	},
 
 	get_leave_balance: function(frm) {
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index ca69417..7afbc4d 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "LAP/.#####", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,10 +41,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -101,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +164,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -186,6 +193,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -214,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -242,6 +251,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -270,6 +280,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -300,6 +311,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -329,6 +341,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -358,6 +371,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -386,6 +400,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -414,6 +429,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -443,6 +459,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -471,6 +488,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -499,6 +517,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -529,6 +548,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -558,6 +578,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -586,6 +607,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -615,6 +637,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -644,6 +667,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -671,6 +695,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -700,6 +725,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -729,6 +755,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -758,18 +785,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 3, 
- "modified": "2017-02-24 07:33:08.907824", 
+ "modified": "2017-06-13 14:28:52.426044", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Application", 
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
index 3720f2f..0eb6414 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js
@@ -1,19 +1,19 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-cur_frm.cscript.onload = function(doc, dt, dn){
-	if(!doc.posting_date)
-		set_multiple(dt, dn, {posting_date: get_today()});
-	if(!doc.leave_transaction_type)
-		set_multiple(dt, dn, {leave_transaction_type: 'Allocation'});
+cur_frm.cscript.onload = function (doc, dt, dn) {
+	if (!doc.posting_date)
+		set_multiple(dt, dn, { posting_date: frappe.datetime.get_today() });
+	if (!doc.leave_transaction_type)
+		set_multiple(dt, dn, { leave_transaction_type: 'Allocation' });
 }
 
-cur_frm.cscript.to_date = function(doc, cdt, cdn) {
-	return $c('runserverobj', args={'method':'to_date_validation','docs':doc},
-		function(r, rt) {
+cur_frm.cscript.to_date = function (doc, cdt, cdn) {
+	return $c('runserverobj', { 'method': 'to_date_validation', 'docs': doc },
+		function (r, rt) {
 			var doc = locals[cdt][cdn];
 			if (r.message) {
-				msgprint(__("To date cannot be before from date"));
+				frappe.msgprint(__("To date cannot be before from date"));
 				doc.to_date = '';
 				refresh_field('to_date');
 			}
@@ -21,11 +21,11 @@
 	);
 }
 
-cur_frm.cscript.allocation_type = function (doc, cdt, cdn){
+cur_frm.cscript.allocation_type = function (doc, cdt, cdn) {
 	doc.no_of_days = '';
 	refresh_field('no_of_days');
 }
 
-frappe.ui.form.on("Leave Control Panel", "refresh", function(frm) {
+frappe.ui.form.on("Leave Control Panel", "refresh", function (frm) {
 	frm.disable_save();
 });
\ No newline at end of file
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.js b/erpnext/hr/doctype/offer_letter/offer_letter.js
index 125a425..c0d397b 100755
--- a/erpnext/hr/doctype/offer_letter/offer_letter.js
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.js
@@ -4,18 +4,18 @@
 frappe.provide("erpnext.offer_letter");
 
 frappe.ui.form.on("Offer Letter", {
-	select_terms: function(frm) {
-		erpnext.utils.get_terms(frm.doc.select_terms, frm.doc, function(r) {
-			if(!r.exc) {
-				me.frm.set_value("terms", r.message);
+	select_terms: function (frm) {
+		erpnext.utils.get_terms(frm.doc.select_terms, frm.doc, function (r) {
+			if (!r.exc) {
+				frm.set_value("terms", r.message);
 			}
 		});
 	},
 
-	refresh:function(frm){
-		if((!frm.doc.__islocal) && (frm.doc.status=='Accepted') && (frm.doc.docstatus===1)){
+	refresh: function (frm) {
+		if ((!frm.doc.__islocal) && (frm.doc.status == 'Accepted') && (frm.doc.docstatus === 1)) {
 			frm.add_custom_button(__('Make Employee'),
-				function() {
+				function () {
 					erpnext.offer_letter.make_employee(frm)
 				}
 			);
@@ -24,7 +24,7 @@
 
 });
 
-erpnext.offer_letter.make_employee = function(frm) {
+erpnext.offer_letter.make_employee = function (frm) {
 	frappe.model.open_mapped_doc({
 		method: "erpnext.hr.doctype.offer_letter.offer_letter.make_employee",
 		frm: frm
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
index e1bea62..0ec7f70 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -2,7 +2,7 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Process Payroll", {
-	onload: function(frm) {
+	onload: function (frm) {
 		frm.doc.posting_date = frappe.datetime.nowdate();
 		frm.doc.start_date = '';
 		frm.doc.end_date = '';
@@ -10,8 +10,8 @@
 		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
 	},
 
-	setup: function(frm) {
-		frm.set_query("payment_account", function() {
+	setup: function (frm) {
+		frm.set_query("payment_account", function () {
 			var account_types = ["Bank", "Cash"];
 			return {
 				filters: {
@@ -21,57 +21,57 @@
 				}
 			}
 		}),
-		frm.set_query("cost_center", function() {
-			return {
-				filters: {
-					"is_group": 0,
-					company: frm.doc.company
+			frm.set_query("cost_center", function () {
+				return {
+					filters: {
+						"is_group": 0,
+						company: frm.doc.company
+					}
 				}
-			}
-		}),
-		frm.set_query("project", function() {
-			return {
-				filters: {
-					company: frm.doc.company
+			}),
+			frm.set_query("project", function () {
+				return {
+					filters: {
+						company: frm.doc.company
+					}
 				}
-			}
-		})
+			})
 	},
 
-	refresh: function(frm) {
+	refresh: function (frm) {
 		frm.disable_save();
 	},
 
-	payroll_frequency: function(frm) {
+	payroll_frequency: function (frm) {
 		frm.trigger("set_start_end_dates");
 	},
 
-	start_date: function(frm) {
+	start_date: function (frm) {
 		frm.trigger("set_start_end_dates");
 	},
 
-	end_date: function(frm) {
+	end_date: function (frm) {
 		frm.trigger("set_start_end_dates");
 	},
 
-	salary_slip_based_on_timesheet: function(frm) {
+	salary_slip_based_on_timesheet: function (frm) {
 		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
 	},
 
-	payment_account: function(frm) {
-		frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account!="" && frm.doc.payment_account!="undefined"));
+	payment_account: function (frm) {
+		frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account != "" && frm.doc.payment_account != "undefined"));
 	},
 
-	set_start_end_dates: function(frm) {
-		if (!frm.doc.salary_slip_based_on_timesheet){
+	set_start_end_dates: function (frm) {
+		if (!frm.doc.salary_slip_based_on_timesheet) {
 			frappe.call({
-				method:'erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates',
-				args:{
+				method: 'erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates',
+				args: {
 					payroll_frequency: frm.doc.payroll_frequency,
 					start_date: frm.doc.start_date || frm.doc.posting_date
 				},
-				callback: function(r){
-					if (r.message){
+				callback: function (r) {
+					if (r.message) {
 						frm.set_value('start_date', r.message.start_date);
 						frm.set_value('end_date', r.message.end_date);
 					}
@@ -81,60 +81,60 @@
 	},
 })
 
-cur_frm.cscript.display_activity_log = function(msg) {
-	if(!cur_frm.ss_html)
-		cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
-	if(msg) {
+cur_frm.cscript.display_activity_log = function (msg) {
+	if (!cur_frm.ss_html)
+		cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper, 'div');
+	if (msg) {
 		cur_frm.ss_html.innerHTML =
-			'<div class="padding"><h4>'+__("Activity Log:")+'</h4>'+msg+'</div>';
+			'<div class="padding"><h4>' + __("Activity Log:") + '</h4>' + msg + '</div>';
 	} else {
 		cur_frm.ss_html.innerHTML = "";
 	}
 }
 
-//Create salary slip
-//-----------------------
-cur_frm.cscript.create_salary_slip = function(doc, cdt, cdn) {
+// Create salary slip
+// -----------------------
+cur_frm.cscript.create_salary_slip = function (doc, cdt, cdn) {
 	cur_frm.cscript.display_activity_log("");
-	var callback = function(r, rt){
+	var callback = function (r, rt) {
 		if (r.message)
 			cur_frm.cscript.display_activity_log(r.message);
 	}
-	return $c('runserverobj', args={'method':'create_salary_slips','docs':doc},callback);
+	return $c('runserverobj', { 'method': 'create_salary_slips', 'docs': doc }, callback);
 }
 
-cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
+cur_frm.cscript.submit_salary_slip = function (doc, cdt, cdn) {
 	cur_frm.cscript.display_activity_log("");
 
-	frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.start_date, doc.end_date]), function() {
+	frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.start_date, doc.end_date]), function () {
 		// clear all in locals
-		if(locals["Salary Slip"]) {
-			$.each(locals["Salary Slip"], function(name, d) {
+		if (locals["Salary Slip"]) {
+			$.each(locals["Salary Slip"], function (name, d) {
 				frappe.model.remove_from_locals("Salary Slip", name);
 			});
 		}
 
-		var callback = function(r, rt){
+		var callback = function (r, rt) {
 			if (r.message)
 				cur_frm.cscript.display_activity_log(r.message);
 		}
 
-		return $c('runserverobj', args={'method':'submit_salary_slips','docs':doc},callback);
+		return $c('runserverobj', { 'method': 'submit_salary_slips', 'docs': doc }, callback);
 	});
 }
 
-cur_frm.cscript.make_bank_entry = function(doc, cdt, cdn){
-    if(doc.company && doc.start_date && doc.end_date){
+cur_frm.cscript.make_bank_entry = function (doc, cdt, cdn) {
+	if (doc.company && doc.start_date && doc.end_date) {
 		return frappe.call({
 			doc: cur_frm.doc,
 			method: "make_payment_entry",
-			callback: function(r) {
+			callback: function (r) {
 				if (r.message)
 					var doc = frappe.model.sync(r.message)[0];
-					frappe.set_route("Form", doc.doctype, doc.name);
+				frappe.set_route("Form", doc.doctype, doc.name);
 			}
 		});
-    } else {
-  	  msgprint(__("Company, From Date and To Date is mandatory"));
-    }
+	} else {
+		frappe.msgprint(__("Company, From Date and To Date is mandatory"));
+	}
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index 09c5337..a96347a 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -39,7 +39,7 @@
 	refresh: function(frm) {
 		frm.trigger("toggle_fields")
 		frm.trigger("toggle_reqd_fields")
-		salary_detail_fields = ['formula', 'abbr', 'statistical_component']
+		var salary_detail_fields = ['formula', 'abbr', 'statistical_component']
 		cur_frm.fields_dict['earnings'].grid.set_column_disp(salary_detail_fields,false);
 		cur_frm.fields_dict['deductions'].grid.set_column_disp(salary_detail_fields,false);
 	},	
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index 0bc67a7..68c5f25 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -7,8 +7,8 @@
 
 
 cur_frm.cscript.onload = function(doc, dt, dn){
-	e_tbl = doc.earnings || [];
-	d_tbl = doc.deductions || [];
+	var e_tbl = doc.earnings || [];
+	var d_tbl = doc.deductions || [];
 	if (e_tbl.length == 0 && d_tbl.length == 0)
 		return function(r, rt) { refresh_many(['earnings', 'deductions']);};
 }
@@ -16,7 +16,7 @@
 frappe.ui.form.on('Salary Structure', {
 	onload: function(frm) {
 		frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet),
-		
+
 		frm.set_query("salary_component", "earnings", function() {
 			return {
 				filters: {
@@ -40,19 +40,19 @@
 			}
 		});
 	},
-	
+
 	refresh: function(frm) {
 		frm.trigger("toggle_fields");
 		frm.fields_dict['earnings'].grid.set_column_disp("default_amount", false);
 		frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
-		
+
 		frm.add_custom_button(__("Preview Salary Slip"),
 			function() { frm.trigger('preview_salary_slip'); }, "fa fa-sitemap", "btn-default");
 
 		frm.add_custom_button(__("Add Employees"),function () {
 			frm.trigger('add_employees')
 		})
-		
+
 	},
 
 	add_employees:function (frm) {
@@ -108,21 +108,24 @@
 	salary_slip_based_on_timesheet: function(frm) {
 		frm.trigger("toggle_fields")
 	},
-	
+
 	preview_salary_slip: function(frm) {
 		var d = new frappe.ui.Dialog({
 			title: __("Preview Salary Slip"),
 			fields: [
-				{"fieldname":"employee", "fieldtype":"Select", "label":__("Employee"),
-				options: $.map(frm.doc.employees, function(d) { return d.employee }), reqd: 1, label:"Employee"},
-				{fieldname:"fetch", "label":__("Show Salary Slip"), "fieldtype":"Button"}
+				{	"fieldname":"employee", "fieldtype":"Select", "label":__("Employee"),
+					options: $.map(frm.doc.employees, function(d) { return d.employee }), reqd: 1 },
+				{	fieldname:"fetch", "label":__("Show Salary Slip"), "fieldtype":"Button"}
 			]
 		});
 		d.get_input("fetch").on("click", function() {
 			var values = d.get_values();
 			if(!values) return;
-			frm.doc.salary_slip_based_on_timesheet?print_format="Salary Slip based on Timesheet":print_format="Salary Slip Standard";
-				
+			var print_format;
+			frm.doc.salary_slip_based_on_timesheet ?
+				print_format="Salary Slip based on Timesheet" :
+				print_format="Salary Slip Standard";
+
 			frappe.call({
 				method: "erpnext.hr.doctype.salary_structure.salary_structure.make_salary_slip",
 				args: {
@@ -140,7 +143,7 @@
 		});
 		d.show();
 	},
-	
+
 	toggle_fields: function(frm) {
 		frm.toggle_display(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
 		frm.toggle_reqd(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
@@ -184,11 +187,11 @@
 	amount: function(frm) {
 		calculate_totals(frm.doc);
 	},
-	
+
 	earnings_remove: function(frm) {
 		calculate_totals(frm.doc);
-	}, 
-	
+	},
+
 	deductions_remove: function(frm) {
 		calculate_totals(frm.doc);
 	}
diff --git a/erpnext/hr/doctype/training_result/training_result.js b/erpnext/hr/doctype/training_result/training_result.js
index 3a3d70a..62ac383 100644
--- a/erpnext/hr/doctype/training_result/training_result.js
+++ b/erpnext/hr/doctype/training_result/training_result.js
@@ -3,13 +3,15 @@
 
 frappe.ui.form.on('Training Result', {
 	onload: function(frm) {
-		if (frm.doc.training_event) {
-			frm.trigger("training_event");
-		}
+		frm.trigger("training_event");
 	},
-	
+
 	training_event: function(frm) {
-		if (frm.doc.training_event) { 
+		frm.trigger("training_event");
+	},
+
+	training_event: function(frm) {
+		if (frm.doc.training_event && !frm.doc.docstatus && !frm.doc.employees) { 
 			frappe.call({
 				method: "erpnext.hr.doctype.training_result.training_result.get_employees",
 				args: {
diff --git a/erpnext/hr/doctype/training_result/training_result.json b/erpnext/hr/doctype/training_result/training_result.json
index 52b9a16..e5fbb5f 100644
--- a/erpnext/hr/doctype/training_result/training_result.json
+++ b/erpnext/hr/doctype/training_result/training_result.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 1, 
  "autoname": "TRES.#####", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -23,6 +25,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Training Event", 
@@ -34,6 +37,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -41,6 +45,7 @@
    "unique": 1
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -51,6 +56,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "length": 0, 
@@ -60,6 +66,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -67,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -77,6 +85,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Employees", 
@@ -88,13 +97,15 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,6 +116,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Amended From", 
@@ -115,6 +127,7 @@
    "print_hide": 1, 
    "print_hide_if_no_value": 0, 
    "read_only": 1, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -122,17 +135,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-11-04 08:53:48.597031", 
+ "modified": "2017-06-15 08:16:01.566531", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Training Result", 
@@ -149,7 +162,6 @@
    "export": 1, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -164,8 +176,10 @@
  "quick_entry": 0, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
  "sort_field": "modified", 
  "sort_order": "DESC", 
  "title_field": "training_event", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.js b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
index c49720c..f639898 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.js
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.js
@@ -7,8 +7,8 @@
 
 erpnext.hr.AttendanceControlPanel = frappe.ui.form.Controller.extend({
 	onload: function() {
-		this.frm.set_value("att_fr_date", get_today());
-		this.frm.set_value("att_to_date", get_today());
+		this.frm.set_value("att_fr_date", frappe.datetime.get_today());
+		this.frm.set_value("att_to_date", frappe.datetime.get_today());
 	},
 
 	refresh: function() {
@@ -18,7 +18,7 @@
 
 	get_template:function() {
 		if(!this.frm.doc.att_fr_date || !this.frm.doc.att_to_date) {
-			msgprint(__("Attendance From Date and Attendance To Date is mandatory"));
+			frappe.msgprint(__("Attendance From Date and Attendance To Date is mandatory"));
 			return;
 		}
 		window.location.href = repl(frappe.request.url +
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.js b/erpnext/hr/doctype/vehicle_log/vehicle_log.js
index 818a595..e8c6b7e 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.js
+++ b/erpnext/hr/doctype/vehicle_log/vehicle_log.js
@@ -3,7 +3,7 @@
 
 frappe.ui.form.on("Vehicle Log", {
 	refresh: function(frm,cdt,cdn) {
-		vehicle_log=frappe.model.get_doc(cdt,cdn);
+		var vehicle_log=frappe.model.get_doc(cdt,cdn);
 		if (vehicle_log.license_plate) {
 			frappe.call({
 				method: "erpnext.hr.doctype.vehicle_log.vehicle_log.get_make_model",
@@ -26,16 +26,16 @@
 	},
 
 	expense_claim: function(frm){
-			frappe.call({
-				method: "erpnext.hr.doctype.vehicle_log.vehicle_log.make_expense_claim",
-				args:{
-					docname: frm.doc.name
-				},
-				callback: function(r){
-					var doc = frappe.model.sync(r.message);
-					frappe.set_route('Form', 'Expense Claim', r.message.name);
-					}
-			})
+		frappe.call({
+			method: "erpnext.hr.doctype.vehicle_log.vehicle_log.make_expense_claim",
+			args:{
+				docname: frm.doc.name
+			},
+			callback: function(r){
+				var doc = frappe.model.sync(r.message);
+				frappe.set_route('Form', 'Expense Claim', r.message.name);
+			}
+		});
 	}
 });
 
diff --git a/erpnext/hr/doctype/vehicle_log/vehicle_log.json b/erpnext/hr/doctype/vehicle_log/vehicle_log.json
index fde34d7..cbecba9 100644
--- a/erpnext/hr/doctype/vehicle_log/vehicle_log.json
+++ b/erpnext/hr/doctype/vehicle_log/vehicle_log.json
@@ -70,7 +70,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -625,7 +625,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-05-15 13:17:59.575317", 
+ "modified": "2017-06-13 14:29:08.103882", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Vehicle Log", 
diff --git a/erpnext/hr/page/team_updates/team_updates.js b/erpnext/hr/page/team_updates/team_updates.js
index e701b5f..d6dd1f4 100644
--- a/erpnext/hr/page/team_updates/team_updates.js
+++ b/erpnext/hr/page/team_updates/team_updates.js
@@ -54,17 +54,18 @@
 		data.avatar = frappe.avatar(data.sender);
 		data.when = comment_when(data.creation);
 
-		var date = dateutil.str_to_obj(data.creation);
+		var date = frappe.datetime.str_to_obj(data.creation);
 		var last = me.last_feed_date;
 
-		if((last && dateutil.obj_to_str(last) != dateutil.obj_to_str(date)) || (!last)) {
-			var diff = dateutil.get_day_diff(dateutil.get_today(), dateutil.obj_to_str(date));
+		if((last && frappe.datetime.obj_to_str(last) != frappe.datetime.obj_to_str(date)) || (!last)) {
+			var diff = frappe.datetime.get_day_diff(frappe.datetime.get_today(), frappe.datetime.obj_to_str(date));
+			var pdate;
 			if(diff < 1) {
 				pdate = 'Today';
 			} else if(diff < 2) {
 				pdate = 'Yesterday';
 			} else {
-				pdate = dateutil.global_date_format(date);
+				pdate = frappe.datetime.global_date_format(date);
 			}
 			data.date_sep = pdate;
 			data.date_class = pdate=='Today' ? "date-indicator blue" : "date-indicator";
diff --git a/erpnext/hr/report/salary_register/salary_register.js b/erpnext/hr/report/salary_register/salary_register.js
index 8b0faf5..794dcb5 100644
--- a/erpnext/hr/report/salary_register/salary_register.js
+++ b/erpnext/hr/report/salary_register/salary_register.js
@@ -7,7 +7,7 @@
 			"fieldname":"date_range",
 			"label": __("Date Range"),
 			"fieldtype": "DateRange",
-			"default": [frappe.datetime.add_months(get_today(),-1), frappe.datetime.get_today()],
+			"default": [frappe.datetime.add_months(frappe.datetime.get_today(),-1), frappe.datetime.get_today()],
 			"reqd": 1
 		},
 		{
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
index 84c66b5..de7cd8c 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js
@@ -71,7 +71,7 @@
 
 		if (item.start_date && item.end_date && item.periodicity) {
 			if(item.start_date > item.end_date) {
-				msgprint(__("Row {0}:Start Date must be before End Date", [item.idx]));
+				frappe.msgprint(__("Row {0}:Start Date must be before End Date", [item.idx]));
 				return;
 			}
 
@@ -97,7 +97,7 @@
 	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
 
 	if(doc.__islocal){
-		set_multiple(dt,dn,{transaction_date:get_today()});
+		set_multiple(dt,dn,{transaction_date: frappe.datetime.get_today()});
 	}
 
 	// set add fetch for item_code's item_name and description
@@ -108,12 +108,12 @@
 
 cur_frm.cscript.generate_schedule = function(doc, cdt, cdn) {
 	if (!doc.__islocal) {
-		return $c('runserverobj', args={'method':'generate_schedule', 'docs':doc},
+		return $c('runserverobj', {'method':'generate_schedule', 'docs':doc},
 			function(r, rt) {
 				refresh_field('schedules');
 			});
 	} else {
-		msgprint(__("Please save the document before generating maintenance schedule"));
+		frappe.msgprint(__("Please save the document before generating maintenance schedule"));
 	}
 }
 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index a1bcf15..d1de7e3 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,10 +71,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,6 +136,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -163,6 +169,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -193,6 +200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -254,6 +263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +294,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -313,6 +324,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -344,6 +356,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -372,6 +385,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -403,6 +417,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -433,6 +448,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -462,6 +478,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -491,6 +508,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -519,6 +537,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -546,6 +565,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -576,6 +596,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -604,6 +625,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -637,6 +659,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -668,6 +691,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -699,6 +723,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -728,18 +753,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-calendar", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:07:02.336621", 
+ "modified": "2017-06-13 14:29:01.615516", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Schedule", 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 36e375d..fa3bcf5 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -66,8 +66,7 @@
 				parent=%s""", (d.sales_person, d.item_code, self.name), as_dict=1)
 
 			for key in scheduled_date:
-				description = frappe._("Reference: %s, Item Code: %s and Customer: %s") % \
-					(self.name, d.item_code, self.customer)
+				description =frappe._("Reference: {0}, Item Code: {1} and Customer: {2}").format(self.name, d.item_code, self.customer)	
 				frappe.get_doc({
 					"doctype": "Event",
 					"owner": email_map.get(d.sales_person, self.owner),
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
index e1f501b..a4f3abc 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js
@@ -2,8 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.provide("erpnext.maintenance");
-me.frm.set_query('contact_person', erpnext.queries.contact_query);
-
 
 frappe.ui.form.on('Maintenance Visit', {
 	setup: function(frm) {
@@ -85,7 +83,7 @@
 
 cur_frm.cscript.onload = function(doc, dt, dn) {
 	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
-	if(doc.__islocal) set_multiple(dt,dn,{mntc_date:get_today()});
+	if(doc.__islocal) set_multiple(dt,dn,{mntc_date: frappe.datetime.get_today()});
 
 	// set add fetch for item_code's item_name and description
 	cur_frm.add_fetch('item_code', 'item_name', 'item_name');
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index c840600..431f19a 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,6 +73,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -96,10 +100,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -131,6 +136,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -159,6 +165,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -187,6 +194,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -215,6 +223,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -243,6 +252,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -271,6 +281,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -300,6 +311,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -331,6 +343,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -361,6 +374,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -391,6 +405,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -422,6 +437,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -449,6 +465,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -481,6 +498,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -510,6 +528,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -541,6 +560,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -571,6 +591,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -601,6 +622,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -628,6 +650,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -660,6 +683,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -692,6 +716,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -723,6 +748,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -753,6 +779,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -782,6 +809,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -811,6 +839,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -838,6 +867,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -868,6 +898,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -898,18 +929,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-file-text", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:08:30.893833", 
+ "modified": "2017-06-13 14:28:53.754182", 
  "modified_by": "Administrator", 
  "module": "Maintenance", 
  "name": "Maintenance Visit", 
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index 576e46d..83e0950 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -63,11 +63,15 @@
 	
 	item_code: function(doc, cdt, cdn){
 		var scrap_items = false;
-		child = locals[cdt][cdn];
+		var child = locals[cdt][cdn];
 		if(child.doctype == 'BOM Scrap Item') {
 			scrap_items = true;
 		}
 
+		if (child.bom_no) {
+			child.bom_no = '';
+		}
+
 		get_bom_material_detail(doc, cdt, cdn, scrap_items);
 	},
 })
@@ -132,12 +136,12 @@
 	var d = locals[cdt][cdn];
 	var scrap_items = false;
 
-	if(child.doctype == 'BOM Scrap Item') {
+	if(cdt == 'BOM Scrap Item') {
 		scrap_items = true;
 	}
 
 	if (d.bom_no) {
-		msgprint(__("You can not change rate if BOM mentioned agianst any item"));
+		frappe.msgprint(__("You can not change rate if BOM mentioned agianst any item"));
 		get_bom_material_detail(doc, cdt, cdn, scrap_items);
 	} else {
 		erpnext.bom.calculate_rm_cost(doc);
@@ -159,8 +163,8 @@
 	doc.base_operating_cost = 0.0;
 
 	for(var i=0;i<op.length;i++) {
-		operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
-		base_operating_cost = flt(flt(op[i].base_hour_rate) * flt(op[i].time_in_mins) / 60, 2);
+		var operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
+		var base_operating_cost = flt(flt(op[i].base_hour_rate) * flt(op[i].time_in_mins) / 60, 2);
 		frappe.model.set_value('BOM Operation',op[i].name, "operating_cost", operating_cost);
 		frappe.model.set_value('BOM Operation',op[i].name, "base_operating_cost", base_operating_cost);
 
@@ -173,11 +177,11 @@
 // rm : raw material
 erpnext.bom.calculate_rm_cost = function(doc) {
 	var rm = doc.items || [];
-	total_rm_cost = 0;
-	base_total_rm_cost = 0;
+	var total_rm_cost = 0;
+	var base_total_rm_cost = 0;
 	for(var i=0;i<rm.length;i++) {
-		amount = flt(rm[i].rate) * flt(rm[i].qty);
-		base_amount = flt(rm[i].rate) * flt(doc.conversion_rate) * flt(rm[i].qty);
+		var amount = flt(rm[i].rate) * flt(rm[i].qty);
+		var base_amount = flt(rm[i].rate) * flt(doc.conversion_rate) * flt(rm[i].qty);
 		frappe.model.set_value('BOM Item', rm[i].name, 'base_rate', flt(rm[i].rate) * flt(doc.conversion_rate))
 		frappe.model.set_value('BOM Item', rm[i].name, 'amount', amount)
 		frappe.model.set_value('BOM Item', rm[i].name, 'qty_consumed_per_unit', flt(rm[i].qty)/flt(doc.quantity))
@@ -192,13 +196,13 @@
 //sm : scrap material
 erpnext.bom.calculate_scrap_materials_cost = function(doc) {
 	var sm = doc.scrap_items || [];
-	total_sm_cost = 0;
-	base_total_sm_cost = 0;
+	var total_sm_cost = 0;
+	var base_total_sm_cost = 0;
 
 	for(var i=0;i<sm.length;i++) {
-		base_rate = flt(sm[i].rate) * flt(doc.conversion_rate);
-		amount =	flt(sm[i].rate) * flt(sm[i].qty);
-		base_amount =	flt(sm[i].rate) * flt(sm[i].qty) * flt(doc.conversion_rate);
+		var base_rate = flt(sm[i].rate) * flt(doc.conversion_rate);
+		var amount =	flt(sm[i].rate) * flt(sm[i].qty);
+		var base_amount =	flt(sm[i].rate) * flt(sm[i].qty) * flt(doc.conversion_rate);
 		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_rate', base_rate);
 		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'amount', amount);
 		frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_amount', base_amount);
@@ -213,15 +217,15 @@
 
 // Calculate Total Cost
 erpnext.bom.calculate_total = function(doc) {
-	total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost) - flt(doc.scrap_material_cost);
-	base_total_cost = flt(doc.base_operating_cost) + flt(doc.base_raw_material_cost) - flt(doc.base_scrap_material_cost);
+	var total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost) - flt(doc.scrap_material_cost);
+	var base_total_cost = flt(doc.base_operating_cost) + flt(doc.base_raw_material_cost) - flt(doc.base_scrap_material_cost);
 	cur_frm.set_value("total_cost", total_cost);
 	cur_frm.set_value("base_total_cost", base_total_cost);
 }
 
 
 cur_frm.fields_dict['item'].get_query = function(doc) {
- 	return{
+	return{
 		query: "erpnext.controllers.queries.item_query"
 	}
 }
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index c42403c..7dc6f2c 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -1586,7 +1586,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-10 12:13:59.630780", 
+ "modified": "2017-05-20 13:10:59.630780", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "BOM", 
@@ -1595,26 +1595,6 @@
   {
    "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": "All", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
    "cancel": 1, 
    "create": 1, 
    "delete": 1, 
@@ -1662,4 +1642,4 @@
  "sort_order": "DESC", 
  "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index b8a8ae8..bbfdc9a 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -138,8 +138,6 @@
 
 		if arg.get('scrap_items'):
 			rate = self.get_valuation_rate(arg)
-		elif arg['bom_no']:
-			rate = self.get_bom_unitcost(arg['bom_no'])
 		elif arg:
 			if self.rm_cost_as_per == 'Valuation Rate':
 				rate = self.get_valuation_rate(arg)
@@ -151,6 +149,9 @@
 				rate = frappe.db.get_value("Item Price", {"price_list": self.buying_price_list,
 					"item_code": arg["item_code"]}, "price_list_rate") or 0
 
+		if not rate and arg['bom_no']:
+			rate = self.get_bom_unitcost(arg['bom_no'])
+
 		return rate
 
 	def update_cost(self):
@@ -244,6 +245,14 @@
 
 	def validate_materials(self):
 		""" Validate raw material entries """
+
+		def get_duplicates(lst):
+			seen = set()
+			seen_add = seen.add
+			for item in lst:
+				if item.item_code in seen or seen_add(item.item_code):
+					yield item
+
 		if not self.get('items'):
 			frappe.throw(_("Raw Materials cannot be blank."))
 		check_list = []
@@ -252,10 +261,16 @@
 				validate_bom_no(m.item_code, m.bom_no)
 			if flt(m.qty) <= 0:
 				frappe.throw(_("Quantity required for Item {0} in row {1}").format(m.item_code, m.idx))
-			check_list.append(cstr(m.item_code))
-		unique_chk_list = set(check_list)
-		if len(unique_chk_list)	!= len(check_list):
-			frappe.throw(_("Same item has been entered multiple times."))
+			check_list.append(m)
+
+		duplicate_items = list(get_duplicates(check_list))
+		if duplicate_items:
+			li = []
+			for i in duplicate_items:
+				li.append("{0} on row {1}".format(i.item_code, i.idx))
+			duplicate_list = '<br>' + '<br>'.join(li)
+
+			frappe.throw(_("Same item has been entered multiple times. {list}").format(list=duplicate_list))
 
 	def check_recursion(self):
 		""" Check whether recursion occurs in any bom"""
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.js b/erpnext/manufacturing/doctype/production_order/production_order.js
index d2540de..6465cec 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.js
+++ b/erpnext/manufacturing/doctype/production_order/production_order.js
@@ -65,10 +65,10 @@
 			'width': (frm.doc.produced_qty / frm.doc.qty * 100) + '%',
 			'progress_class': 'progress-bar-success'
 		});
-		if(bars[0].width=='0%') {
-			 bars[0].width = '0.5%';
-			 added_min = 0.5;
-		 }
+		if (bars[0].width == '0%') {
+			bars[0].width = '0.5%';
+			added_min = 0.5;
+		}
 		message = title;
 
 		// pending qty
@@ -126,10 +126,10 @@
 
 			if(!frm.doc.skip_transfer){
 				if ((flt(doc.material_transferred_for_manufacturing) < flt(doc.qty)) && frm.doc.status != 'Stopped') {
-				frm.has_start_btn = true;
-				var btn = frm.add_custom_button(__('Start'),
-					cur_frm.cscript['Transfer Raw Materials']);
-				btn.addClass('btn-primary');
+					frm.has_start_btn = true;
+					var btn = frm.add_custom_button(__('Start'),
+						cur_frm.cscript['Transfer Raw Materials']);
+					btn.addClass('btn-primary');
 				}
 			}
 
@@ -161,7 +161,7 @@
 			var op = doc.operations;
 			doc.planned_operating_cost = 0.0;
 			for(var i=0;i<op.length;i++) {
-				planned_operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
+				var planned_operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
 				frappe.model.set_value('Production Order Operation',op[i].name, "planned_operating_cost", planned_operating_cost);
 
 				doc.planned_operating_cost += planned_operating_cost;
@@ -198,7 +198,7 @@
 					query: "erpnext.controllers.queries.bom",
 					filters: {item: cstr(doc.production_item)}
 				}
-			} else msgprint(__("Please enter Production Item first"));
+			} else frappe.msgprint(__("Please enter Production Item first"));
 		});
 	},
 
@@ -227,9 +227,9 @@
 		frappe.call({
 			method: "erpnext.manufacturing.doctype.production_order.production_order.get_item_details",
 			args: {
-					item: doc.production_item,
-					project: doc.project
-					},
+				item: doc.production_item,
+				project: doc.project
+			},
 			callback: function(r) {
 				$.each(["description", "stock_uom", "project", "bom_no"], function(i, field) {
 					cur_frm.set_value(field, r.message[field]);
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 8d28907..94b6b95 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,10 +70,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -105,6 +108,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,6 +140,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -167,6 +172,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -200,6 +206,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -230,6 +237,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -259,6 +267,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -289,6 +298,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -320,6 +330,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -350,6 +361,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -382,6 +394,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -415,6 +428,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -444,6 +458,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -475,6 +490,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -504,6 +520,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -531,6 +548,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -562,6 +580,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -592,6 +611,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -622,6 +642,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -651,6 +672,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -681,6 +703,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -710,6 +733,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -738,6 +762,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -767,6 +792,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -796,6 +822,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -827,6 +854,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -858,6 +886,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -889,6 +918,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -919,6 +949,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -949,6 +980,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -979,6 +1011,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1007,6 +1040,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1037,6 +1071,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1066,6 +1101,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1096,6 +1132,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1125,6 +1162,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1153,6 +1191,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1185,6 +1224,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1216,6 +1256,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1244,6 +1285,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1275,6 +1317,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1304,6 +1347,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1346,7 +1390,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-21 16:31:19.509721", 
+ "modified": "2017-06-13 14:29:00.457874", 
  "modified_by": "Administrator", 
  "module": "Manufacturing", 
  "name": "Production Order", 
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 a0e9ce7..f541e5b 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js
@@ -19,9 +19,8 @@
 
 frappe.ui.form.on("Production Planning Tool", {
 	onload_post_render: function(frm) {
-	 		frm.get_field("items").grid.set_multiple_add("item_code", "planned_qty");
-	 },	
-	 
+		frm.get_field("items").grid.set_multiple_add("item_code", "planned_qty");
+	},
 	get_sales_orders: function(frm) {
 		frappe.call({
 			doc: frm.doc,
@@ -96,11 +95,11 @@
 		args["customer"] = doc.customer;
 	}
 
- 	return { filters: args }
+	return { filters: args }
 }
 
 cur_frm.fields_dict['items'].grid.get_field('item_code').get_query = function(doc) {
- 	return erpnext.queries.item({
+	return erpnext.queries.item({
 		'is_stock_item': 1
 	});
 }
@@ -112,7 +111,7 @@
 			query: "erpnext.controllers.queries.bom",
 			filters:{'item': cstr(d.item_code)}
 		}
-	} else msgprint(__("Please enter Item first"));
+	} else frappe.msgprint(__("Please enter Item first"));
 }
 
 cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
diff --git a/erpnext/manufacturing/page/production_analytics/production_analytics.js b/erpnext/manufacturing/page/production_analytics/production_analytics.js
index cac4b3a..1fb1ef2 100644
--- a/erpnext/manufacturing/page/production_analytics/production_analytics.js
+++ b/erpnext/manufacturing/page/production_analytics/production_analytics.js
@@ -9,7 +9,6 @@
 	});
 
 	new erpnext.ProductionAnalytics(wrapper);
-		
 
 	frappe.breadcrumbs.add("Manufacturing");
 }
@@ -18,7 +17,6 @@
 	init: function(wrapper) {
 		this._super({
 			title: __("Production Analytics"),
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Item", "Company", "Fiscal Year", "Production Order"]
@@ -73,8 +71,8 @@
 	},
 	set_default_values: function() {
 		var values = {
-			from_date: dateutil.str_to_user(dateutil.add_months(dateutil.now_datetime(),-12) ),
-			to_date: dateutil.str_to_user(dateutil.add_months(dateutil.now_datetime(),1))
+			from_date: frappe.datetime.str_to_user(frappe.datetime.add_months(frappe.datetime.now_datetime(),-12) ),
+			to_date: frappe.datetime.str_to_user(frappe.datetime.add_months(frappe.datetime.now_datetime(),1))
 		}
 
 		var me = this;
@@ -100,17 +98,17 @@
 			checked:true};	
 
 		$.each(frappe.report_dump.data["Production Order"], function(i, d) {
-			var dateobj = dateutil.str_to_obj(d.creation);
-			var date = dateutil.str_to_user(d.creation.split(" ")[0]);
+			var dateobj = frappe.datetime.str_to_obj(d.creation);
+			var date = frappe.datetime.str_to_user(d.creation.split(" ")[0]);
 
 			$.each(me.columns, function(i,col) {
 				if (i > 1){
-					var start_period = dateutil.user_to_obj(dateutil.str_to_user(col.id));
-					var end_period = dateutil.user_to_obj(dateutil.str_to_user(col.name));
-					var astart_date = dateutil.user_to_obj(dateutil.str_to_user(d.actual_start_date));
-					var planned_start_date = dateutil.user_to_obj(dateutil.str_to_user(d.planned_start_date));
-					var aend_date = dateutil.user_to_obj(dateutil.str_to_user(d.actual_end_date));
-					var modified = dateutil.user_to_obj(dateutil.str_to_user(d.modified));
+					var start_period = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(col.id));
+					var end_period = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(col.name));
+					var astart_date = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(d.actual_start_date));
+					var planned_start_date = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(d.planned_start_date));
+					var aend_date = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(d.actual_end_date));
+					var modified = frappe.datetime.user_to_obj(frappe.datetime.str_to_user(d.modified));
 					
 					if (dateobj <= start_period || dateobj <= end_period) {
 						all_open_orders[col.field] = flt(all_open_orders[col.field]) + 1;
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
index 8aed965..95c78e6 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.js
@@ -1,17 +1,17 @@
 frappe.query_reports["BOM Stock Report"] = {
-    "filters": [
-        {
-            "fieldname":"bom",
-            "label": __("BOM"),
-            "fieldtype": "Link",
-            "options": "BOM",
+	"filters": [
+		{
+			"fieldname": "bom",
+			"label": __("BOM"),
+			"fieldtype": "Link",
+			"options": "BOM",
 			"reqd": 1
-        },{
-            "fieldname":"warehouse",
-            "label": __("Warehouse"),
-            "fieldtype": "Link",
-            "options": "Warehouse",
+		}, {
+			"fieldname": "warehouse",
+			"label": __("Warehouse"),
+			"fieldtype": "Link",
+			"options": "Warehouse",
 			"reqd": 1
-        }
-    ]
+		}
+	]
 }
diff --git a/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.js b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.js
index 917af5d..94e326d 100644
--- a/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.js
+++ b/erpnext/manufacturing/report/production_order_stock_report/production_order_stock_report.js
@@ -3,12 +3,11 @@
 
 frappe.query_reports["Production Order Stock Report"] = {
 	"filters": [
-	{
-		"fieldname":"warehouse",
-		"label": __("Warehouse"),
-		"fieldtype": "Link",
-		"options": "Warehouse"
-		
-	}
+		{
+			"fieldname": "warehouse",
+			"label": __("Warehouse"),
+			"fieldtype": "Link",
+			"options": "Warehouse"
+		}
 	]
 }
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 7dc7e3c..8068ea6 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -8,7 +8,7 @@
 erpnext.patches.v4_0.move_warehouse_user_to_restrictions
 erpnext.patches.v4_0.global_defaults_to_system_settings
 erpnext.patches.v4_0.update_incharge_name_to_sales_person_in_maintenance_schedule
-execute:frappe.reload_doc('stock', 'doctype', 'warehouse')
+execute:frappe.reload_doc('stock', 'doctype', 'warehouse') # 2017-04-24
 execute:frappe.reload_doc('accounts', 'doctype', 'sales_invoice') # 2016-08-31
 execute:frappe.reload_doc('selling', 'doctype', 'sales_order') # 2014-01-29
 execute:frappe.reload_doc('selling', 'doctype', 'quotation') # 2014-01-29
@@ -396,6 +396,11 @@
 erpnext.patches.v8_0.rename_total_margin_to_rate_with_margin # 11-05-2017
 erpnext.patches.v8_0.fix_status_for_invoices_with_negative_outstanding
 erpnext.patches.v8_0.make_payments_table_blank_for_non_pos_invoice
+erpnext.patches.v8_0.set_sales_invoice_serial_number_from_delivery_note
 erpnext.patches.v8_0.delete_schools_depricated_doctypes
 erpnext.patches.v8_0.update_customer_pos_id
 erpnext.patches.v8_0.rename_items_in_status_field_of_material_request
+erpnext.patches.v8_0.delete_bin_indexes
+erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
+erpnext.patches.v8_0.change_in_words_varchar_length
+erpnext.patches.v8_0.create_domain_docs	#16-05-2017
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/create_warehouse_nestedset.py b/erpnext/patches/v7_0/create_warehouse_nestedset.py
index 8ae86f7..8c52c3e 100644
--- a/erpnext/patches/v7_0/create_warehouse_nestedset.py
+++ b/erpnext/patches/v7_0/create_warehouse_nestedset.py
@@ -90,8 +90,7 @@
 		"warehouse_name": _("All Warehouses"),
 		"is_group": 1,
 		"company": company.name if company else "",
-		"parent_warehouse": "",
-		"create_account_under": stock_account_group
+		"parent_warehouse": ""
 	})
 
 	if ignore_mandatory:
diff --git a/erpnext/patches/v7_0/repost_future_gle_for_purchase_invoice.py b/erpnext/patches/v7_0/repost_future_gle_for_purchase_invoice.py
index f0874a1..f5aee15 100644
--- a/erpnext/patches/v7_0/repost_future_gle_for_purchase_invoice.py
+++ b/erpnext/patches/v7_0/repost_future_gle_for_purchase_invoice.py
@@ -4,7 +4,8 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.utils import cint
-from erpnext.controllers.stock_controller import get_warehouse_account, update_gl_entries_after
+from erpnext.stock import get_warehouse_account_map
+from erpnext.controllers.stock_controller import update_gl_entries_after
 
 def execute():
 	if not cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
@@ -13,7 +14,7 @@
 	frappe.reload_doc('accounts', 'doctype', 'sales_invoice')
 	
 	frappe.reload_doctype("Purchase Invoice")	
-	wh_account = get_warehouse_account()
+	wh_account = get_warehouse_account_map()
 	
 	for pi in frappe.get_all("Purchase Invoice", filters={"docstatus": 1, "update_stock": 1}):
 		pi_doc = frappe.get_doc("Purchase Invoice", pi.name)
diff --git a/erpnext/patches/v8_0/change_in_words_varchar_length.py b/erpnext/patches/v8_0/change_in_words_varchar_length.py
new file mode 100644
index 0000000..68ff95b
--- /dev/null
+++ b/erpnext/patches/v8_0/change_in_words_varchar_length.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	doctypes = frappe.db.sql_list("""select parent from tabDocField where fieldname = 'in_words'""")
+		
+	for dt in doctypes:
+		for fieldname in ("in_words", "base_in_words"):
+			frappe.db.sql("alter table `tab{0}` change column `{1}` `{2}` varchar(255)"
+				.format(dt, fieldname, fieldname))
+				
+	frappe.db.sql("""alter table `tabJournal Entry` 
+		change column `total_amount_in_words` `total_amount_in_words` varchar(255)""")
diff --git a/erpnext/patches/v8_0/create_domain_docs.py b/erpnext/patches/v8_0/create_domain_docs.py
new file mode 100644
index 0000000..2f376db
--- /dev/null
+++ b/erpnext/patches/v8_0/create_domain_docs.py
@@ -0,0 +1,52 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+import erpnext
+
+def execute():
+	"""Create domain documents"""
+	frappe.reload_doc("core", "doctype", "domain")
+	frappe.reload_doc("core", "doctype", "domain_settings")
+	frappe.reload_doc("core", "doctype", "has_domain")
+
+	for domain in ("Distribution", "Manufacturing", "Retail", "Services", "Education"):
+		if not frappe.db.exists({"doctype": "Domain", "domain": domain}):
+			create_domain(domain)
+
+	# set domain in domain settings based on company domain
+
+	domains = []
+	condition = ""
+	company = erpnext.get_default_company()
+	if company:
+		condition = " and name='{0}'".format(company)
+
+	domains = frappe.db.sql_list("select distinct domain from `tabCompany` where domain != 'Other' {0}".format(condition))
+
+	if not domains:
+		return
+
+	domain_settings = frappe.get_doc("Domain Settings", "Domain Settings")
+	checked_domains = [row.domain for row in domain_settings.active_domains]
+
+	for domain in domains:
+		# check and ignore if the domains is already checked in domain settings
+		if domain in checked_domains:
+			continue
+
+		if not frappe.db.get_value("Domain", domain):
+			# user added custom domain in companies domain field
+			create_domain(domain)
+
+		row = domain_settings.append("active_domains", dict(domain=domain))
+
+	domain_settings.save(ignore_permissions=True)
+
+def create_domain(domain):
+	# create new domain
+
+	doc = frappe.new_doc("Domain")
+	doc.domain = domain
+	doc.db_update()
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/delete_bin_indexes.py b/erpnext/patches/v8_0/delete_bin_indexes.py
new file mode 100644
index 0000000..12cacdb
--- /dev/null
+++ b/erpnext/patches/v8_0/delete_bin_indexes.py
@@ -0,0 +1,16 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+# -*- coding: utf-8 -*-
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	# delete bin indexes
+	unwanted_indexes = ["item_code", "warehouse"]
+
+	for k in unwanted_indexes:
+		try:
+			frappe.db.sql("drop index {0} on `tabBin`".format(k))
+		except:
+			pass
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py b/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py
new file mode 100644
index 0000000..b59d818
--- /dev/null
+++ b/erpnext/patches/v8_0/move_account_head_from_account_to_warehouse_for_inventory.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2017, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doctype("Warehouse")
+	frappe.db.sql("""
+		update 
+			`tabWarehouse` 
+		set 
+			account = (select name from `tabAccount` 
+				where account_type = 'Stock' and 
+				warehouse = `tabWarehouse`.name and is_group = 0 limit 1)""")
\ No newline at end of file
diff --git a/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py b/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
new file mode 100644
index 0000000..2ae74cd
--- /dev/null
+++ b/erpnext/patches/v8_0/set_sales_invoice_serial_number_from_delivery_note.py
@@ -0,0 +1,42 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from erpnext.stock.stock_balance import update_bin_qty, get_reserved_qty
+
+def execute():
+	""" Set the Serial Numbers in Sales Invoice Item from Delivery Note Item """
+
+	frappe.reload_doc("stock", "doctype", "serial_no")
+
+	frappe.db.sql(""" update `tabSales Invoice Item` sii inner join 
+		`tabDelivery Note Item` dni on sii.dn_detail=dni.name and  sii.qty=dni.qty
+		set sii.serial_no=dni.serial_no where sii.parent IN (select si.name 
+			from `tabSales Invoice` si where si.update_stock=0 and si.docstatus=1)""")
+
+	items = frappe.db.sql(""" select  sii.parent, sii.serial_no from  `tabSales Invoice Item` sii
+		left join `tabSales Invoice` si on sii.parent=si.name
+		where si.docstatus=1 and si.update_stock=0""", as_dict=True)
+
+	for item in items:
+		sales_invoice = item.get("parent", None)
+		serial_nos = item.get("serial_no", "")
+
+		if not sales_invoice or not serial_nos:
+			continue
+
+		serial_nos = ["'%s'"%no for no in serial_nos.split("\n")]
+
+		frappe.db.sql("""
+			UPDATE 
+				`tabSerial No`
+			SET 
+				sales_invoice='{sales_invoice}'
+			WHERE
+				name in ({serial_nos})
+			""".format(
+				sales_invoice=sales_invoice,
+				serial_nos=",".join(serial_nos)
+			)
+		)
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 5f48a93..78cdb13 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -13,12 +13,12 @@
 		}
 
 		frm.set_query('customer', 'erpnext.controllers.queries.customer_query');
-		
+
 		frm.set_query("user", "users", function() {
-					return {
-						query:"erpnext.projects.doctype.project.project.get_users_for_project"
-					}
-				});
+			return {
+				query:"erpnext.projects.doctype.project.project.get_users_for_project"
+			}
+		});
 
 		// sales order
 		frm.set_query('sales_order', function() {
@@ -89,7 +89,7 @@
 		if(doc.task_id) {
 			frappe.set_route("Form", "Task", doc.task_id);
 		} else {
-			msgprint(__("Save the document first."));
+			frappe.msgprint(__("Save the document first."));
 		}
 	},
 	status: function(frm, doctype, name) {
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 0345f05..66df901 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -47,7 +47,10 @@
 			self.append("tasks", task_map)
 
 	def get_tasks(self):
-		return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
+		if self.name is None:
+			return {}
+		else:
+			return frappe.get_all("Task", "*", {"project": self.name}, order_by="exp_start_date asc")
 
 	def validate(self):
 		self.validate_dates()
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index f9485e9..e4ab5a7 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "TASK.#####", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -134,6 +139,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,6 +171,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -193,6 +200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -223,6 +231,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -255,6 +264,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +294,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -312,6 +323,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -342,6 +354,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -371,6 +384,37 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "is_milestone", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Is Milestone", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -400,6 +444,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -432,6 +477,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -461,6 +507,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -491,6 +538,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +568,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -552,6 +601,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -582,6 +632,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -614,6 +665,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -642,6 +694,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -672,6 +725,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -700,6 +754,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -731,6 +786,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -761,6 +817,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -789,6 +846,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -818,6 +876,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -846,6 +905,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -877,6 +937,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -908,6 +969,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -935,6 +997,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -964,19 +1027,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-check", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-02-24 01:47:05.438887", 
+ "modified": "2017-05-23 11:28:28.161600", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Task", 
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 01fa160..2edfa9e 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -1,9 +1,9 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
-cur_frm.add_fetch('employee', 'employee_name', 'employee_name');
 
 frappe.ui.form.on("Timesheet", {
 	setup: function(frm) {
+		frm.add_fetch('employee', 'employee_name', 'employee_name');
 		frm.fields_dict.employee.get_query = function() {
 			return {
 				filters:{
@@ -13,7 +13,7 @@
 		}
 
 		frm.fields_dict['time_logs'].grid.get_field('task').get_query = function(frm, cdt, cdn) {
-			child = locals[cdt][cdn];
+			var child = locals[cdt][cdn];
 			return{
 				filters: {
 					'project': child.project,
@@ -51,8 +51,8 @@
 		}
 
 		if(frm.doc.per_billed > 0) {
-			cur_frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
-			cur_frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
+			frm.fields_dict["time_logs"].grid.toggle_enable("billing_hours", false);
+			frm.fields_dict["time_logs"].grid.toggle_enable("billable", false);
 		}
 	},
 
@@ -77,7 +77,7 @@
 	},
 
 	from_time: function(frm, cdt, cdn) {
-		calculate_end_time(frm, cdt, cdn)
+		calculate_end_time(frm, cdt, cdn);
 	},
 
 	to_time: function(frm, cdt, cdn) {
@@ -109,25 +109,27 @@
 	},
 
 	activity_type: function(frm, cdt, cdn) {
-		child = locals[cdt][cdn];
+		frm.script_manager.copy_from_first_row('time_logs', frm.selected_doc,
+			'project');
+
 		frappe.call({
 			method: "erpnext.projects.doctype.timesheet.timesheet.get_activity_cost",
 			args: {
 				employee: frm.doc.employee,
-				activity_type: child.activity_type
+				activity_type: frm.selected_doc.activity_type
 			},
 			callback: function(r){
 				if(r.message){
 					frappe.model.set_value(cdt, cdn, 'billing_rate', r.message['billing_rate']);
 					frappe.model.set_value(cdt, cdn, 'costing_rate', r.message['costing_rate']);
-					calculate_billing_costing_amount(frm, cdt, cdn)
+					calculate_billing_costing_amount(frm, cdt, cdn);
 				}
 			}
 		})
 	}
 });
 
-calculate_end_time = function(frm, cdt, cdn){
+var calculate_end_time = function(frm, cdt, cdn) {
 	var child = locals[cdt][cdn];
 
 	var d = moment(child.from_time);
@@ -142,8 +144,9 @@
 }
 
 var calculate_billing_costing_amount = function(frm, cdt, cdn){
-	child = locals[cdt][cdn]
-	billing_amount = costing_amount = 0.0;
+	var child = locals[cdt][cdn]
+	var billing_amount = 0.0;
+	var costing_amount = 0.0;
 
 	if(child.billing_hours && child.billable){
 		billing_amount = (child.billing_hours * child.billing_rate);
@@ -157,10 +160,10 @@
 
 var calculate_time_and_amount = function(frm) {
 	var tl = frm.doc.time_logs || [];
-	total_working_hr = 0;
-	total_billing_hr = 0;
-	total_billable_amount = 0;
-	total_costing_amount = 0;
+	var total_working_hr = 0;
+	var total_billing_hr = 0;
+	var total_billable_amount = 0;
+	var total_costing_amount = 0;
 	for(var i=0; i<tl.length; i++) {
 		if (tl[i].hours) {
 			total_working_hr += tl[i].hours;
@@ -173,8 +176,8 @@
 		}
 	}
 
-	cur_frm.set_value("total_billable_hours", total_billing_hr);
-	cur_frm.set_value("total_hours", total_working_hr);
-	cur_frm.set_value("total_billable_amount", total_billable_amount);
-	cur_frm.set_value("total_costing_amount", total_costing_amount);
+	frm.set_value("total_billable_hours", total_billing_hr);
+	frm.set_value("total_hours", total_working_hr);
+	frm.set_value("total_billable_amount", total_billable_amount);
+	frm.set_value("total_costing_amount", total_costing_amount);
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 2fd544b..239bd62 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "editable_grid": 1, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -38,10 +40,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -161,6 +167,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -191,6 +198,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -222,6 +230,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -254,6 +263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -285,6 +295,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -315,6 +326,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -343,6 +355,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -372,6 +385,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -401,6 +415,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -432,6 +447,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -462,6 +478,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -489,6 +506,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -518,6 +536,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -546,6 +565,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -576,6 +596,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -605,6 +626,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -634,6 +656,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -663,6 +686,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -692,6 +716,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -720,6 +745,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -752,6 +778,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -781,6 +808,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -810,6 +838,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -838,6 +867,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -867,6 +897,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -896,18 +927,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-time", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-17 17:23:35.196740", 
+ "modified": "2017-06-13 14:28:51.838769", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Timesheet", 
diff --git a/erpnext/public/js/account_tree_grid.js b/erpnext/public/js/account_tree_grid.js
index ac8784d..5769298 100644
--- a/erpnext/public/js/account_tree_grid.js
+++ b/erpnext/public/js/account_tree_grid.js
@@ -18,7 +18,6 @@
 	init: function(wrapper, title) {
 		this._super({
 			title: title,
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Company", "Fiscal Year", "Account", "GL Entry", "Cost Center"],
@@ -77,8 +76,8 @@
 			var fy = $(this).val();
 			$.each(frappe.report_dump.data["Fiscal Year"], function(i, v) {
 				if (v.name==fy) {
-					me.filter_inputs.from_date.val(dateutil.str_to_user(v.year_start_date));
-					me.filter_inputs.to_date.val(dateutil.str_to_user(v.year_end_date));
+					me.filter_inputs.from_date.val(frappe.datetime.str_to_user(v.year_start_date));
+					me.filter_inputs.to_date.val(frappe.datetime.str_to_user(v.year_end_date));
 				}
 			});
 			me.refresh();
@@ -124,8 +123,8 @@
 		var gl = frappe.report_dump.data['GL Entry'];
 		var me = this;
 
-		this.opening_date = dateutil.user_to_obj(this.filter_inputs.from_date.val());
-		this.closing_date = dateutil.user_to_obj(this.filter_inputs.to_date.val());
+		this.opening_date = frappe.datetime.user_to_obj(this.filter_inputs.from_date.val());
+		this.closing_date = frappe.datetime.user_to_obj(this.filter_inputs.to_date.val());
 		this.set_fiscal_year();
 		if (!this.fiscal_year) return;
 
@@ -135,7 +134,7 @@
 		});
 
 		$.each(gl, function(i, v) {
-			var posting_date = dateutil.str_to_obj(v.posting_date);
+			var posting_date = frappe.datetime.str_to_obj(v.posting_date);
 			var account = me.item_by_name[v.account];
 			me.update_balances(account, posting_date, v);
 		});
@@ -146,7 +145,7 @@
 		// opening
 		if (posting_date < this.opening_date || v.is_opening === "Yes") {
 			if (account.report_type === "Profit and Loss" &&
-				posting_date <= dateutil.str_to_obj(this.fiscal_year[1])) {
+				posting_date <= frappe.datetime.str_to_obj(this.fiscal_year[1])) {
 				// balance of previous fiscal_year should
 				//	not be part of opening of pl account balance
 			} else {
@@ -208,21 +207,21 @@
 
 	set_fiscal_year: function() {
 		if (this.opening_date > this.closing_date) {
-			msgprint(__("Opening Date should be before Closing Date"));
+			frappe.msgprint(__("Opening Date should be before Closing Date"));
 			return;
 		}
 
 		this.fiscal_year = null;
 		var me = this;
 		$.each(frappe.report_dump.data["Fiscal Year"], function(i, v) {
-			if (me.opening_date >= dateutil.str_to_obj(v.year_start_date) &&
-				me.closing_date <= dateutil.str_to_obj(v.year_end_date)) {
-					me.fiscal_year = v;
-				}
+			if (me.opening_date >= frappe.datetime.str_to_obj(v.year_start_date) &&
+				me.closing_date <= frappe.datetime.str_to_obj(v.year_end_date)) {
+				me.fiscal_year = v;
+			}
 		});
 
 		if (!this.fiscal_year) {
-			msgprint(__("Opening Date and Closing Date should be within same Fiscal Year"));
+			frappe.msgprint(__("Opening Date and Closing Date should be within same Fiscal Year"));
 			return;
 		}
 	},
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
index 9d54f84..5ce57b6 100644
--- a/erpnext/public/js/communication.js
+++ b/erpnext/public/js/communication.js
@@ -8,7 +8,7 @@
 			}, "Make");
 		}
 
-		if(!inList(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
+		if(!in_list(["Lead", "Opportunity"], frm.doc.reference_doctype)) {
 			frm.add_custom_button(__("Lead"), function() {
 				frappe.confirm("Are you sure you want to create Lead from this email", function(){
 					frm.trigger('make_lead_from_communication');	
diff --git a/erpnext/public/js/controllers/accounts.js b/erpnext/public/js/controllers/accounts.js
index c1c3553..644f0f5 100644
--- a/erpnext/public/js/controllers/accounts.js
+++ b/erpnext/public/js/controllers/accounts.js
@@ -89,7 +89,7 @@
 	}
 })
 
-get_payment_mode_account = function(frm, mode_of_payment, callback){
+var get_payment_mode_account = function(frm, mode_of_payment, callback){
 	return  frappe.call({
 		method: "erpnext.accounts.doctype.sales_invoice.sales_invoice.get_bank_cash_account",
 		args: {
@@ -108,7 +108,7 @@
 cur_frm.cscript.account_head = function(doc, cdt, cdn) {
 	var d = locals[cdt][cdn];
 	if(!d.charge_type && d.account_head){
-		msgprint("Please select Charge Type first");
+		frappe.msgprint("Please select Charge Type first");
 		frappe.model.set_value(cdt, cdn, "account_head", "");
 	} else if(d.account_head && d.charge_type!=="Actual") {
 		frappe.call({
@@ -152,7 +152,7 @@
 		}
 	}
 	if(msg) {
-		validated = false;
+		frappe.validated = false;
 		refresh_field("taxes");
 		frappe.throw(msg);
 	}
@@ -176,9 +176,10 @@
 			// inclusive tax cannot be of type Actual
 			actual_type_error();
 		} else if(tax.charge_type == "On Previous Row Amount" &&
-			!cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_print_rate)) {
-				// referred row should also be an inclusive tax
-				on_previous_row_error(tax.row_id);
+			!cint(this.frm.doc["taxes"][tax.row_id - 1].included_in_print_rate)
+		) {
+			// referred row should also be an inclusive tax
+			on_previous_row_error(tax.row_id);
 		} else if(tax.charge_type == "On Previous Row Total") {
 			var taxes_not_included = $.map(this.frm.doc["taxes"].slice(0, tax.row_id),
 				function(t) { return cint(t.included_in_print_rate) ? null : t; });
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a8c80fe..d46e9da 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -18,17 +18,20 @@
 		this.setup_queries();
 		this._super();
 
+		/* eslint-disable */
+		// no idea where me is coming from
 		if(this.frm.get_field('shipping_address')) {
-			this.frm.set_query("shipping_address", function(){
-				if(me.frm.doc.customer){
+			this.frm.set_query("shipping_address", function() {
+				if(me.frm.doc.customer) {
 					return {
-						query: 'frappe.geo.doctype.address.address.address_query',
+						query: 'frappe.contacts.doctype.address.address.address_query',
 						filters: { link_doctype: 'Customer', link_name: me.frm.doc.customer }
 					};
 				} else
 					return erpnext.queries.company_address_query(me.frm.doc)
 			});
 		}
+		/* eslint-enable */
 	},
 
 	setup_queries: function() {
@@ -206,73 +209,73 @@
 	shipping_address: function(){
 		var me = this;
 		erpnext.utils.get_address_display(this.frm, "shipping_address",
-			"shipping_address_display", is_your_company_address=true)
+			"shipping_address_display", true);
 	},
 
 	tc_name: function() {
 		this.get_terms();
 	},
 	link_to_mrs: function() {
-				my_items = [];
-				for (var i in cur_frm.doc.items) {
-					if(!cur_frm.doc.items[i].material_request){
-						my_items.push(cur_frm.doc.items[i].item_code);
-					}
-				}
-				frappe.call({
-					method: "erpnext.buying.utils.get_linked_material_requests",
-					args:{
-						items: my_items
-					},
-					callback: function(r) {
-						var i = 0;
-						var item_length = cur_frm.doc.items.length;
-						while (i < item_length) {
-							var qty = cur_frm.doc.items[i].qty;
-							(r.message[0] || []).forEach(function(d) {
-								if (d.qty > 0 && qty > 0 && cur_frm.doc.items[i].item_code == d.item_code && !cur_frm.doc.items[i].material_request_item)
+		var my_items = [];
+		for (var i in cur_frm.doc.items) {
+			if(!cur_frm.doc.items[i].material_request){
+				my_items.push(cur_frm.doc.items[i].item_code);
+			}
+		}
+		frappe.call({
+			method: "erpnext.buying.utils.get_linked_material_requests",
+			args:{
+				items: my_items
+			},
+			callback: function(r) {
+				var i = 0;
+				var item_length = cur_frm.doc.items.length;
+				while (i < item_length) {
+					var qty = cur_frm.doc.items[i].qty;
+					(r.message[0] || []).forEach(function(d) {
+						if (d.qty > 0 && qty > 0 && cur_frm.doc.items[i].item_code == d.item_code && !cur_frm.doc.items[i].material_request_item)
+						{
+							cur_frm.doc.items[i].material_request = d.mr_name;
+							cur_frm.doc.items[i].material_request_item = d.mr_item;
+							var my_qty = Math.min(qty, d.qty);
+							qty = qty - my_qty;
+							d.qty = d.qty  - my_qty;
+							cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor;
+							cur_frm.doc.items[i].qty = my_qty;
+
+							frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
+							if (qty > 0)
+							{
+								frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
+								var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
+								item_length++;
+
+								for (var key in cur_frm.doc.items[i])
 								{
-									cur_frm.doc.items[i].material_request = d.mr_name;
-									cur_frm.doc.items[i].material_request_item = d.mr_item;
-									my_qty = Math.min(qty, d.qty);
-									qty = qty - my_qty;
-									d.qty = d.qty  - my_qty;
-									cur_frm.doc.items[i].stock_qty = my_qty*cur_frm.doc.items[i].conversion_factor;
-									cur_frm.doc.items[i].qty = my_qty;
-
-									frappe.msgprint("Assigning " + d.mr_name + " to " + d.item_code + " (row " + cur_frm.doc.items[i].idx + ")");
-									if (qty > 0)
-									{
-										frappe.msgprint("Splitting " + qty + " units of " + d.item_code);
-										var newrow = frappe.model.add_child(cur_frm.doc, cur_frm.doc.items[i].doctype, "items");
-										item_length++;
-
-										for (key in cur_frm.doc.items[i])
-										{
-											newrow[key] = cur_frm.doc.items[i][key];
-										}
-
-										newrow.idx = item_length;
-										newrow["stock_qty"] = newrow.conversion_factor*qty;
-										newrow["qty"] = qty;
-
-										newrow["material_request"] = "";
-										newrow["material_request_item"] = "";
-
-									}
-
-
-
+									newrow[key] = cur_frm.doc.items[i][key];
 								}
 
-							});
-							i++;
+								newrow.idx = item_length;
+								newrow["stock_qty"] = newrow.conversion_factor*qty;
+								newrow["qty"] = qty;
+
+								newrow["material_request"] = "";
+								newrow["material_request_item"] = "";
+
+							}
+
+
+
 						}
-						refresh_field("items");
-						//cur_frm.save();
-					}
-				});
+
+					});
+					i++;
+				}
+				refresh_field("items");
+				//cur_frm.save();
 			}
+		});
+	}
 });
 
 cur_frm.add_fetch('project', 'cost_center', 'cost_center');
@@ -324,7 +327,7 @@
 	});
 
 	dialog.fields_dict.get_items.$input.click(function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		dialog.hide();
 		return frappe.call({
diff --git a/erpnext/public/js/controllers/taxes_and_totals.js b/erpnext/public/js/controllers/taxes_and_totals.js
index 1437ee9..c4d8155 100644
--- a/erpnext/public/js/controllers/taxes_and_totals.js
+++ b/erpnext/public/js/controllers/taxes_and_totals.js
@@ -14,7 +14,7 @@
 		item.rate = flt(item.rate_with_margin , precision("rate", item));
 
 		if(item.discount_percentage){
-			discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
+			var discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
 			item.rate = flt((item.rate_with_margin) - (discount_value), precision('rate', item));
 		}
 	},
@@ -26,8 +26,8 @@
 
 		// Advance calculation applicable to Sales /Purchase Invoice
 		if(in_list(["Sales Invoice", "Purchase Invoice"], this.frm.doc.doctype)
-			 && this.frm.doc.docstatus < 2 && !this.frm.doc.is_return) {
-				 this.calculate_total_advance(update_paid_amount);
+			&& this.frm.doc.docstatus < 2 && !this.frm.doc.is_return) {
+			this.calculate_total_advance(update_paid_amount);
 		}
 
 		// Sales person's commission
@@ -108,13 +108,14 @@
 
 		$.each(this.frm.doc["taxes"] || [], function(i, tax) {
 			tax.item_wise_tax_detail = {};
-			tax_fields = ["total", "tax_amount_after_discount_amount",
+			var tax_fields = ["total", "tax_amount_after_discount_amount",
 				"tax_amount_for_current_item", "grand_total_for_current_item",
 				"tax_fraction_for_current_item", "grand_total_fraction_for_current_item"]
 
 			if (cstr(tax.charge_type) != "Actual" &&
-				!(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total"))
-					tax_fields.push("tax_amount");
+				!(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total")) {
+				tax_fields.push("tax_amount");
+			}
 
 			$.each(tax_fields, function(i, fieldname) { tax[fieldname] = 0.0 });
 
@@ -190,7 +191,7 @@
 	},
 
 	_get_tax_rate: function(tax, item_tax_map) {
-		return (keys(item_tax_map).indexOf(tax.account_head) != -1) ?
+		return (Object.keys(item_tax_map).indexOf(tax.account_head) != -1) ?
 			flt(item_tax_map[tax.account_head], precision("rate", tax)) : tax.rate;
 	},
 
@@ -236,8 +237,9 @@
 
 				// accumulate tax amount into tax.tax_amount
 				if (tax.charge_type != "Actual" &&
-					!(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total"))
-						tax.tax_amount += current_tax_amount;
+					!(me.discount_amount_applied && me.frm.doc.apply_discount_on=="Grand Total")) {
+					tax.tax_amount += current_tax_amount;
+				}
 
 				// store tax_amount for current item as it will be used for
 				// charge type = 'On Previous Row Amount'
@@ -492,7 +494,7 @@
 				if (tax.charge_type == "Actual")
 					actual_taxes_dict[tax.idx] = tax.tax_amount;
 				else if (actual_taxes_dict[tax.row_id] !== null) {
-					actual_tax_amount = flt(actual_taxes_dict[tax.row_id]) * flt(tax.rate) / 100;
+					var actual_tax_amount = flt(actual_taxes_dict[tax.row_id]) * flt(tax.rate) / 100;
 					actual_taxes_dict[tax.idx] = actual_tax_amount;
 				}
 			});
@@ -571,7 +573,7 @@
 
 	set_default_payment: function(total_amount_to_pay, update_paid_amount){
 		var me = this;
-		payment_status = true;
+		var payment_status = true;
 		if(this.frm.doc.is_pos && (update_paid_amount===undefined || update_paid_amount)){
 			$.each(this.frm.doc['payments'] || [], function(index, data){
 				if(data.type == "Cash" && payment_status && total_amount_to_pay > 0) {
@@ -587,7 +589,8 @@
 
 	calculate_paid_amount: function(){
 		var me = this;
-		var paid_amount = base_paid_amount = 0.0;
+		var paid_amount = 0.0;
+		var base_paid_amount = 0.0;
 		if(this.frm.doc.is_pos) {
 			$.each(this.frm.doc['payments'] || [], function(index, data){
 				data.base_amount = flt(data.amount * me.frm.doc.conversion_rate, precision("base_amount"));
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index b508fcb..8ad64d2 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -16,11 +16,11 @@
 					// or set discount
 					item.discount_percentage = 0;
 					item.margin_type = 'Amount';
-					item.margin_rate_or_amount = flt(item.rate - item.price_list_rate, 
+					item.margin_rate_or_amount = flt(item.rate - item.price_list_rate,
 						precision("margin_rate_or_amount", item));
 					item.rate_with_margin = item.rate;
 				} else {
-					item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0, 
+					item.discount_percentage = flt((1 - item.rate / item.price_list_rate) * 100.0,
 						precision("discount_percentage", item));
 					item.margin_type = '';
 					item.margin_rate_or_amount = 0;
@@ -109,7 +109,7 @@
 	onload: function() {
 		var me = this;
 		if(this.frm.doc.__islocal) {
-			var today = get_today(),
+			var today = frappe.datetime.get_today(),
 				currency = frappe.defaults.get_user_default("currency");
 
 			$.each({
@@ -202,10 +202,10 @@
 		var me = this;
 		if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
 			&& !(this.frm.doc.__onload ? this.frm.doc.__onload.load_after_mapping : false)) {
-				this.apply_default_taxes();
+			this.apply_default_taxes();
 		} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
 			&& !this.frm.doc.is_pos) {
-				me.calculate_taxes_and_totals();
+			me.calculate_taxes_and_totals();
 		}
 		if(frappe.meta.get_docfield(this.frm.doc.doctype + " Item", "item_code")) {
 			this.setup_item_selector();
@@ -250,7 +250,7 @@
 	},
 
 	send_sms: function() {
-		var sms_man = new SMSManager(this.frm.doc);
+		var sms_man = new erpnext.SMSManager(this.frm.doc);
 	},
 
 	barcode: function(doc, cdt, cdn) {
@@ -288,8 +288,7 @@
 							currency: me.frm.doc.currency,
 							update_stock: in_list(['Sales Invoice', 'Purchase Invoice'], me.frm.doc.doctype) ? cint(me.frm.doc.update_stock) : 0,
 							conversion_rate: me.frm.doc.conversion_rate,
-							price_list: me.frm.doc.selling_price_list ||
-								 me.frm.doc.buying_price_list,
+							price_list: me.frm.doc.selling_price_list || me.frm.doc.buying_price_list,
 							price_list_currency: me.frm.doc.price_list_currency,
 							plc_conversion_rate: me.frm.doc.plc_conversion_rate,
 							company: me.frm.doc.company,
@@ -430,10 +429,10 @@
 
 		if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
 			in_list(['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'], this.frm.doctype)){
-				erpnext.utils.get_shipping_address(this.frm, function(){
-					set_party_account(set_pricing);
-				})
-		}else{
+			erpnext.utils.get_shipping_address(this.frm, function(){
+				set_party_account(set_pricing);
+			})
+		} else {
 			set_party_account(set_pricing);
 		}
 
@@ -512,7 +511,7 @@
 		}
 		if(this.frm.doc.currency === this.frm.doc.price_list_currency &&
 			this.frm.doc.plc_conversion_rate !== this.frm.doc.conversion_rate) {
-				this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
+			this.frm.set_value("plc_conversion_rate", this.frm.doc.conversion_rate);
 		}
 
 		if(flt(this.frm.doc.conversion_rate)>0.0) {
@@ -562,7 +561,7 @@
 		} else if(this.frm.doc.price_list_currency === this.frm.doc.currency
 			&& this.frm.doc.plc_conversion_rate && cint(this.frm.doc.plc_conversion_rate) != 1 &&
 			cint(this.frm.doc.plc_conversion_rate) != cint(this.frm.doc.conversion_rate)) {
-				this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
+			this.frm.set_value("conversion_rate", this.frm.doc.plc_conversion_rate);
 		}
 
 		if(!this.in_apply_price_list) {
@@ -603,8 +602,10 @@
 
 	toggle_conversion_factor: function(item) {
 		// toggle read only property for conversion factor field if the uom and stock uom are same
-		this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
-			(item.uom != item.stock_uom)? true: false)
+		if(this.frm.get_field('items').grid.fields_map.conversion_factor) {
+			this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
+				(item.uom != item.stock_uom)? true: false);
+		}
 	},
 
 	qty: function(doc, cdt, cdn) {
@@ -757,7 +758,7 @@
 		if(this.frm.doc.ignore_pricing_rule) {
 			var me = this;
 			var item_list = [];
-			
+
 			$.each(this.frm.doc["items"] || [], function(i, d) {
 				if (d.item_code) {
 					item_list.push({
@@ -988,10 +989,10 @@
 		$.each(["company", "customer"], function(i, fieldname) {
 			if(frappe.meta.has_field(me.frm.doc.doctype, fieldname) && me.frm.doc.doctype != "Purchase Order") {
 				if (!me.frm.doc[fieldname]) {
-					msgprint(__("Please specify") + ": " +
+					frappe.msgprint(__("Please specify") + ": " +
 						frappe.meta.get_label(me.frm.doc.doctype, fieldname, me.frm.doc.name) +
 						". " + __("It is needed to fetch Item Details."));
-						valid = false;
+					valid = false;
 				}
 			}
 		});
@@ -1083,7 +1084,7 @@
 
 	set_gross_profit: function(item) {
 		if (this.frm.doc.doctype == "Sales Order" && item.valuation_rate) {
-			rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
+			var rate = flt(item.rate) * flt(this.frm.doc.conversion_rate || 1);
 			item.gross_profit = flt(((rate - item.valuation_rate) * item.stock_qty), precision("amount", item));
 		}
 	},
@@ -1092,9 +1093,9 @@
 		// TODO: remove item selector
 
 		return;
-		if(!this.item_selector) {
-			this.item_selector = new erpnext.ItemSelector({frm: this.frm});
-		}
+		// if(!this.item_selector) {
+		// 	this.item_selector = new erpnext.ItemSelector({frm: this.frm});
+		// }
 	},
 
 	get_advances: function() {
@@ -1125,7 +1126,7 @@
 	},
 
 	get_method_for_payment: function(){
-		method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"
+		var method = "erpnext.accounts.doctype.payment_entry.payment_entry.get_payment_entry"
 		if(cur_frm.doc.__onload && cur_frm.doc.__onload.make_payment_via_journal_entry){
 			if(in_list(['Sales Invoice', 'Purchase Invoice'],  cur_frm.doc.doctype)){
 				method = "erpnext.accounts.doctype.journal_entry.journal_entry.get_payment_entry_against_invoice"
@@ -1145,7 +1146,7 @@
 
 		if(!item.item_code) {
 			frappe.throw(__("Please enter Item Code to get batch no"));
-		} else if (doc.doctype == "Purchase Receipt" || 
+		} else if (doc.doctype == "Purchase Receipt" ||
 			(doc.doctype == "Purchase Invoice" && doc.update_stock)) {
 
 			return {
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index 66daf0d..1eeb896 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -48,15 +48,15 @@
 		report.page.add_inner_button(__("Balance Sheet"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Balance Sheet', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 		report.page.add_inner_button(__("Profit and Loss"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Profit and Loss Statement', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 		report.page.add_inner_button(__("Cash Flow Statement"), function() {
 			var filters = report.get_values();
 			frappe.set_route('query-report', 'Cash Flow', {company: filters.company});
-		}, 'Financial Statements');
+		}, __('Financial Statements'));
 	}
 };
 
diff --git a/erpnext/public/js/help_links.js b/erpnext/public/js/help_links.js
index 3595d77..6ac60c2 100644
--- a/erpnext/public/js/help_links.js
+++ b/erpnext/public/js/help_links.js
@@ -1,11 +1,35 @@
 frappe.provide('frappe.help.help_links');
 
 frappe.help.help_links['Form/Rename Tool'] = [
-	{ label: 'Bulk Rename', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/bulk-rename.html' },
+	{ label: 'Bulk Rename', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/bulk-rename' },
 ]
 
-frappe.help.help_links['List/Customer'] = [
-	{ label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer.html' },
+//Setup
+
+frappe.help.help_links['List/User'] = [
+	{ label: 'New User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/adding-users' },
+	{ label: 'Rename User', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/rename-user' },
+]
+
+frappe.help.help_links['permission-manager'] = [
+	{ label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' },
+	{ label: 'Managing Perm Level in Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-perm-level' },
+	{ label: 'User Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/user-permissions' },
+	{ label: 'Sharing', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/sharing' },
+	{ label: 'Password', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/change-password' },
+]
+
+frappe.help.help_links['Form/System Settings'] = [
+	{ label: 'Naming Series', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/settings/system-settings' },
+]
+
+frappe.help.help_links['data-import-tool'] = [
+	{ label: 'Importing and Exporting Data', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/data-import-tool' },
+	{ label: 'Overwriting Data from Data Import Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' },
+]
+
+frappe.help.help_links['module_setup'] = [
+	{ label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' },
 ]
 
 frappe.help.help_links['Form/Naming Series'] = [
@@ -41,10 +65,147 @@
 	{ label: 'Cheque Print Template', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/cheque-print-template' },
 ]
 
+frappe.help.help_links['List/Email Account'] = [
+	{ label: 'Email Account', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-account' },
+]
+
+frappe.help.help_links['List/Email Alert'] = [
+	{ label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' },
+]
+
+frappe.help.help_links['Form/Email Alert'] = [
+	{ label: 'Email Alert', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-alerts' },
+]
+
+frappe.help.help_links['List/Email Digest'] = [
+	{ label: 'Email Digest', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-digest' },
+]
+
+frappe.help.help_links['List/Auto Email Report'] = [
+	{ label: 'Auto Email Reports', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/email/email-reports' },
+]
+
+frappe.help.help_links['Form/Print Settings'] = [
+	{ label: 'Print Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' },
+]
+
+frappe.help.help_links['print-format-builder'] = [
+	{ label: 'Print Format Builder', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-settings' },
+]
+
+frappe.help.help_links['List/Print Heading'] = [
+	{ label: 'Print Heading', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/print/print-headings' },
+]
+
+//setup-integrations
+
+frappe.help.help_links['Form/PayPal Settings'] = [
+	{ label: 'PayPal Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/paypal-integration' },
+]
+
+frappe.help.help_links['Form/Razorpay Settings'] = [
+	{ label: 'Razorpay Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/razorpay-integration' },
+]
+
+frappe.help.help_links['Form/Dropbox Settings'] = [
+	{ label: 'Dropbox Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/dropbox-backup' },
+]
+
+frappe.help.help_links['Form/LDAP Settings'] = [
+	{ label: 'LDAP Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/ldap-integration' },
+]
+
+frappe.help.help_links['Form/Stripe Settings'] = [
+	{ label: 'Stripe Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/integrations/stripe-integration' },
+]
+
+//Sales
+
+frappe.help.help_links['Form/Quotation'] = [
+	{ label: 'Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/quotation' },
+	{ label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' },
+	{ label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' },
+	{ label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' },
+]
+
+frappe.help.help_links['List/Customer'] = [
+	{ label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' },
+	{ label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' },
+]
+
+frappe.help.help_links['Form/Customer'] = [
+	{ label: 'Customer', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/customer' },
+	{ label: 'Credit Limit', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/credit-limit' },
+]
+
 frappe.help.help_links['List/Sales Taxes and Charges Template'] = [
 	{ label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' },
 ]
 
+frappe.help.help_links['Form/Sales Taxes and Charges Template'] = [
+	{ label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' },
+]
+
+frappe.help.help_links['List/Sales Order'] = [
+	{ label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' },
+	{ label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
+	{ label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' },
+]
+
+frappe.help.help_links['Form/Sales Order'] = [
+	{ label: 'Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/sales-order' },
+	{ label: 'Recurring Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
+	{ label: 'Applying Discount', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount' },
+	{ label: 'Drop Shipping', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/drop-shipping' },
+	{ label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions' },
+	{ label: 'Close Sales Order', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/close-sales-order' },
+	{ label: 'Applying Margin', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/articles/adding-margin' },
+]
+
+frappe.help.help_links['Form/Product Bundle'] = [
+	{ label: 'Product Bundle', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/product-bundle' },
+]
+
+frappe.help.help_links['Form/Selling Settings'] = [
+	{ label: 'Selling Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/selling-settings' },
+]
+
+//Buying
+
+frappe.help.help_links['List/Supplier'] = [
+	{ label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' },
+]
+
+frappe.help.help_links['Form/Supplier'] = [
+	{ label: 'Supplier', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier' },
+]
+
+frappe.help.help_links['Form/Request for Quotation'] = [
+	{ label: 'Request for Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/request-for-quotation' },
+	{ label: 'RFQ Video', url: 'https://frappe.github.io/erpnext/user/videos/learn/request-for-quotation.html' },
+]
+
+frappe.help.help_links['Form/Supplier Quotation'] = [
+	{ label: 'Supplier Quotation', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/supplier-quotation' },
+]
+
+frappe.help.help_links['Form/Buying Settings'] = [
+	{ label: 'Buying Settings', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/setup/buying-settings' },
+]
+
+frappe.help.help_links['List/Purchase Order'] = [
+	{ label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' },
+	{ label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
+]
+
+frappe.help.help_links['Form/Purchase Order'] = [
+	{ label: 'Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/purchase-order' },
+	{ label: 'Item UoM', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/purchasing-in-different-unit' },
+	{ label: 'Supplier Item Code', url: 'https://frappe.github.io/erpnext/user/manual/en/buying/articles/maintaining-suppliers-part-no-in-item' },
+	{ label: 'Recurring Purchase Order', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
+	{ label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' },
+]
+
 frappe.help.help_links['List/Purchase Taxes and Charges Template'] = [
 	{ label: 'Setting Up Taxes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/setting-up-taxes' },
 ]
@@ -88,16 +249,6 @@
 	{ label: 'Delete All Related Transactions for a Company', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/delete-a-company-and-all-related-transactions' },
 ]
 
-frappe.help.help_links['permission-manager'] = [
-	{ label: 'Role Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/users-and-permissions/role-based-permissions' },
-	{ label: 'Managing Perm Level in Permissions Manager', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-perm-level' },
-]
-
-frappe.help.help_links['data-import-tool'] = [
-	{ label: 'Importing and Exporting Data', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/data/data-import-tool.html' },
-	{ label: 'Overwriting Data from Data Import Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool' },
-]
-
 //Accounts
 
 frappe.help.help_links['modules/Accounts'] = [
@@ -108,23 +259,41 @@
 
 frappe.help.help_links['Tree/Account'] = [
 	{ label: 'Chart of Accounts', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/chart-of-accounts' },
+	{ label: 'Managing Tree Mastes', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' },
+]
+
+frappe.help.help_links['Form/Sales Invoice'] = [
+	{ label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' },
+	{ label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' },
+	{ label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' },
+	{ label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
 ]
 
 frappe.help.help_links['List/Sales Invoice'] = [
 	{ label: 'Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/sales-invoice' },
+	{ label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' },
+	{ label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' },
+	{ label: 'Recurring Sales Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
 ]
 
 frappe.help.help_links['pos'] = [
 	{ label: 'Point of Sale Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/point-of-sale-pos-invoice' },
 ]
 
+frappe.help.help_links['List/POS Profile'] = [
+	{ label: 'Point of Sale Profile', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/pos-setting' },
+]
+
 frappe.help.help_links['List/Purchase Invoice'] = [
 	{ label: 'Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/purchase-invoice' },
+	{ label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' },
+	{ label: 'Recurring Purchase Invoice', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/recurring-orders-and-invoices' },
 ]
 
 frappe.help.help_links['List/Journal Entry'] = [
 	{ label: 'Journal Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/journal-entry' },
 	{ label: 'Advance Payment Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/advance-payment-entry' },
+	{ label: 'Accounts Opening Balance', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/opening-accounts' },
 ]
 
 frappe.help.help_links['List/Payment Entry'] = [
@@ -139,24 +308,221 @@
 	{ label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' },
 ]
 
+frappe.help.help_links['List/Asset Category'] = [
+	{ label: 'Asset Category', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' },
+]
+
 frappe.help.help_links['Tree/Cost Center'] = [
 	{ label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' },
 ]
 
 frappe.help.help_links['List/Item'] = [
-	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/bar-code' },
+	{ label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' },
+	{ label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' },	
+	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' },
 	{ label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' },
+	{ label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' },
+	{ label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' },
+	{ label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' },	
+	{ label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' },				
+]
+
+frappe.help.help_links['Form/Item'] = [
+	{ label: 'Item', url: 'http://frappe.github.io/erpnext/user/manual/en/stock/item' },
+	{ label: 'Item Price', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-price' },	
+	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' },
+	{ label: 'Item Wise Taxation', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/item-wise-taxation' },
+	{ label: 'Managing Fixed Assets', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/managing-fixed-assets' },
+	{ label: 'Item Codification', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-codification' },
+	{ label: 'Item Variants', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-variants' },	
+	{ label: 'Item Valuation', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/item/item-valuation-fifo-and-moving-average' },				
 ]
 
 frappe.help.help_links['List/Purchase Receipt'] = [
-	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/bar-code' },
+	{ label: 'Purchase Receipt', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/purchase-receipt' },
+	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' },
 ]
 
 frappe.help.help_links['List/Delivery Note'] = [
-	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/bar-code' },
+	{ label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' },
+	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' },
+	{ label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' },
 ]
 
+frappe.help.help_links['Form/Delivery Note'] = [
+	{ label: 'Delivery Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/delivery-note' },
+	{ label: 'Sales Return', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/sales-return' },
+	{ label: 'Barcode', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/track-items-using-barcode' },
+	{ label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' },
+]
+
+frappe.help.help_links['List/Installation Note'] = [
+	{ label: 'Installation Note', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/installation-note' },
+]
+
+
 frappe.help.help_links['Tree'] = [
 	{ label: 'Managing Tree Structure Masters', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/articles/managing-tree-structure-masters' },
 ]
 
+frappe.help.help_links['List/Budget'] = [
+	{ label: 'Budgeting', url: 'https://frappe.github.io/erpnext/user/manual/en/accounts/budgeting' },
+]
+
+//Stock
+
+frappe.help.help_links['List/Material Request'] = [
+	{ label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' },
+	{ label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' },
+]
+
+frappe.help.help_links['Form/Material Request'] = [
+	{ label: 'Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/material-request' },
+	{ label: 'Auto-creation of Material Request', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/auto-creation-of-material-request' },
+]
+
+frappe.help.help_links['Form/Stock Entry'] = [
+	{ label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' },
+	{ label: 'Stock Entry Types', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/stock-entry-purpose' },
+	{ label: 'Repack Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/repack-entry' },
+	{ label: 'Opening Stock', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' },
+	{ label: 'Subcontracting', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/subcontracting' },
+]
+
+frappe.help.help_links['List/Stock Entry'] = [
+	{ label: 'Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/stock-entry' },
+]
+
+frappe.help.help_links['Tree/Warehouse'] = [
+	{ label: 'Warehouse', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/warehouse' },
+]
+
+frappe.help.help_links['List/Serial No'] = [
+	{ label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' },
+]
+
+frappe.help.help_links['Form/Serial No'] = [
+	{ label: 'Serial No', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/serial-no' },
+]
+
+frappe.help.help_links['Form/Batch'] = [
+	{ label: 'Batch', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/batch' },
+]
+
+frappe.help.help_links['Form/Packing Slip'] = [
+	{ label: 'Packing Slip', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/packing-slip' },
+]
+
+frappe.help.help_links['Form/Quality Inspection'] = [
+	{ label: 'Quality Inspection', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/quality-inspection' },
+]
+
+frappe.help.help_links['Form/Landed Cost Voucher'] = [
+	{ label: 'Landed Cost Voucher', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/tools/landed-cost-voucher' },
+]
+
+frappe.help.help_links['Tree/Item Group'] = [
+	{ label: 'Item Group', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-group' },
+]
+
+frappe.help.help_links['Form/Item Attribute'] = [
+	{ label: 'Item Attribute', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/setup/item-attribute' },
+]
+
+frappe.help.help_links['Form/UOM'] = [
+	{ label: 'Fractions in UOM', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/articles/managing-fractions-in-uom' },
+]
+
+frappe.help.help_links['Form/Stock Reconciliation'] = [
+	{ label: 'Opening Stock Entry', url: 'https://frappe.github.io/erpnext/user/manual/en/stock/opening-stock' },
+]
+
+//CRM
+
+frappe.help.help_links['Form/Lead'] = [
+	{ label: 'Lead', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/lead' },
+]
+
+frappe.help.help_links['Form/Opportunity'] = [
+	{ label: 'Opportunity', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/opportunity' },
+]
+
+frappe.help.help_links['Form/Address'] = [
+	{ label: 'Address', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' },
+]
+
+frappe.help.help_links['Form/Contact'] = [
+	{ label: 'Contact', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/contact' },
+]
+
+frappe.help.help_links['Form/Newsletter'] = [
+	{ label: 'Newsletter', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/newsletter' },
+]
+
+frappe.help.help_links['Form/Campaign'] = [
+	{ label: 'Campaign', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/campaign' },
+]
+
+frappe.help.help_links['Tree/Sales Person'] = [
+	{ label: 'Sales Person', url: 'https://frappe.github.io/erpnext/user/manual/en/CRM/setup/sales-person' },
+]
+
+frappe.help.help_links['Form/Sales Person'] = [
+	{ label: 'Sales Person Target', url: 'https://frappe.github.io/erpnext/user/manual/en/selling/setup/sales-person-target-allocation' },
+]
+
+//Support
+
+frappe.help.help_links['List/Feedback Trigger'] = [
+	{ label: 'Feedback Trigger', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/setting-up-feedback' },
+]
+
+frappe.help.help_links['List/Feedback Request'] = [
+	{ label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' },
+]
+
+frappe.help.help_links['List/Feedback Request'] = [
+	{ label: 'Feedback Request', url: 'https://frappe.github.io/erpnext/user/manual/en/setting-up/feedback/submit-feedback' },
+]
+
+//Manufacturing
+
+frappe.help.help_links['Form/BOM'] = [
+	{ label: 'Bill of Material', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/bill-of-materials' },
+	{ label: 'Nested BOM Structure', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/articles/nested-bom-structure' },
+]
+
+frappe.help.help_links['Form/Production Order'] = [
+	{ label: 'Production Order', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/production-order' },
+]
+
+frappe.help.help_links['Form/Workstation'] = [
+	{ label: 'Workstation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/workstation' },
+]
+
+frappe.help.help_links['Form/Operation'] = [
+	{ label: 'Operation', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/operation' },
+]
+
+frappe.help.help_links['Form/Production Planning Tool'] = [
+	{ label: 'Production Planning Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/production-planning-tool' },
+]
+
+frappe.help.help_links['Form/BOM Replace Tool'] = [
+	{ label: 'BOM Replace Tool', url: 'https://frappe.github.io/erpnext/user/manual/en/manufacturing/tools/bom-replace-tool' },
+]
+
+//Customize
+
+frappe.help.help_links['Form/Customize Form'] = [
+	{ label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' },
+	{ label: 'Customize Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/customize-form' },
+]
+
+frappe.help.help_links['Form/Custom Field'] = [
+	{ label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' },
+]
+
+frappe.help.help_links['Form/Custom Field'] = [
+	{ label: 'Custom Field', url: 'https://frappe.github.io/erpnext/user/manual/en/customize-erpnext/custom-field' },
+]
\ No newline at end of file
diff --git a/erpnext/public/js/payment/payments.js b/erpnext/public/js/payment/payments.js
index 438ad79..77209e0 100644
--- a/erpnext/public/js/payment/payments.js
+++ b/erpnext/public/js/payment/payments.js
@@ -55,7 +55,7 @@
 
 	show_payment_details: function(){
 		var me = this;
-		multimode_payments = $(this.$body).find('.multimode-payments').empty();
+		var multimode_payments = $(this.$body).find('.multimode-payments').empty();
 		if(this.frm.doc.payments.length){
 			$.each(this.frm.doc.payments, function(index, data){
 				$(frappe.render_template('payment_details', {
@@ -126,7 +126,7 @@
 
 	highlight_selected_row: function(){
 		var me = this;
-		selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']",{'idx': this.idx}));
+		var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']",{'idx': this.idx}));
 		$(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode')
 		selected_row.addClass('selected-payment-mode')
 		$(this.$body).find('.amount').attr('disabled', true);
@@ -195,7 +195,7 @@
 	update_paid_amount: function(update_write_off) {
 		var me = this;
 		if(in_list(['change_amount', 'write_off_amount'], this.idx)){
-			value = me.selected_mode.val();
+			var value = me.selected_mode.val();
 			if(me.idx == 'change_amount'){
 				me.change_amount(value)
 			} else{
diff --git a/erpnext/public/js/purchase_trends_filters.js b/erpnext/public/js/purchase_trends_filters.js
index b2d882c..117d4eb 100644
--- a/erpnext/public/js/purchase_trends_filters.js
+++ b/erpnext/public/js/purchase_trends_filters.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-var get_filters = function(){
+erpnext.get_purchase_trends_filters = function() {
 	return [
 		{
 			"fieldname":"period",
@@ -44,7 +44,7 @@
 			"label": __("Fiscal Year"),
 			"fieldtype": "Link",
 			"options":'Fiscal Year',
-			"default": sys_defaults.fiscal_year
+			"default": frappe.sys_defaults.fiscal_year
 		},
 		{
 			"fieldname":"company",
diff --git a/erpnext/public/js/queries.js b/erpnext/public/js/queries.js
index bf7143a..38f89a4 100644
--- a/erpnext/public/js/queries.js
+++ b/erpnext/public/js/queries.js
@@ -50,7 +50,7 @@
 			}
 
 			return {
-				query: 'frappe.email.doctype.contact.contact.contact_query',
+				query: 'frappe.contacts.doctype.contact.contact.contact_query',
 				filters: { link_doctype: frappe.dynamic_link.doctype, link_name: doc[frappe.dynamic_link.fieldname] } };
 		}
 	},
@@ -63,14 +63,14 @@
 			}
 
 			return {
-				query: 'frappe.geo.doctype.address.address.address_query',
+				query: 'frappe.contacts.doctype.address.address.address_query',
 				filters: { link_doctype: frappe.dynamic_link.doctype, link_name: doc[frappe.dynamic_link.fieldname] } };
 		}
 	},
 
 	company_address_query: function(doc) {
 		return {
-			query: 'frappe.geo.doctype.address.address.address_query',
+			query: 'frappe.contacts.doctype.address.address.address_query',
 			filters: { is_your_company_address: 1, link_doctype: 'Company', link_name: doc.company || '' }
 		};
 	},
diff --git a/erpnext/public/js/sales_trends_filters.js b/erpnext/public/js/sales_trends_filters.js
index f28e8f7..b272fdd 100644
--- a/erpnext/public/js/sales_trends_filters.js
+++ b/erpnext/public/js/sales_trends_filters.js
@@ -1,8 +1,8 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-var get_filters = function(){
- 	return[
+erpnext.get_sales_trends_filters = function() {
+	return[
 		{
 			"fieldname":"period",
 			"label": __("Period"),
@@ -45,7 +45,7 @@
 			"label": __("Fiscal Year"),
 			"fieldtype": "Link",
 			"options":'Fiscal Year',
-			"default": sys_defaults.fiscal_year
+			"default": frappe.sys_defaults.fiscal_year
 		},
 		{
 			"fieldname":"company",
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 658c4fe..488d3c4 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -1,7 +1,7 @@
 frappe.provide("erpnext.wiz");
 
 frappe.pages['setup-wizard'].on_page_load = function(wrapper) {
-	if(sys_defaults.company) {
+	if(frappe.sys_defaults.company) {
 		frappe.set_route("desk");
 		return;
 	}
@@ -38,17 +38,17 @@
 			fields: [
 				{fieldname:'company_name',
 					label: frappe.wiz.domain==='Education' ?
-					 	__('Institute Name') : __('Company Name'),
+						__('Institute Name') : __('Company Name'),
 					fieldtype:'Data', reqd:1},
 				{fieldname:'company_abbr',
 					label: frappe.wiz.domain==='Education' ?
-					 	__('Institute Abbreviation') : __('Company Abbreviation'),
+						__('Institute Abbreviation') : __('Company Abbreviation'),
 					fieldtype:'Data'},
 				{fieldname:'company_tagline',
 					label: __('What does it do?'),
 					fieldtype:'Data',
 					placeholder: frappe.wiz.domain==='Education' ?
-					 	__('e.g. "Primary School" or "University"') :
+						__('e.g. "Primary School" or "University"') :
 						__('e.g. "Build tools for builders"'),
 					reqd:1},
 				{fieldname:'bank_account', label: __('Bank Name'), fieldtype:'Data', reqd:1},
@@ -75,12 +75,12 @@
 			validate: function() {
 				// validate fiscal year start and end dates
 				if (this.values.fy_start_date=='Invalid date' || this.values.fy_end_date=='Invalid date') {
-					msgprint(__("Please enter valid Financial Year Start and End Dates"));
+					frappe.msgprint(__("Please enter valid Financial Year Start and End Dates"));
 					return false;
 				}
 
 				if ((this.values.company_name || "").toLowerCase() == "company") {
-					msgprint(__("Company Name cannot be Company"));
+					frappe.msgprint(__("Company Name cannot be Company"));
 					return false;
 				}
 
@@ -102,7 +102,7 @@
 					}
 					
 					var year_start_date = current_year + "-" + fy[0];
-					if(year_start_date > get_today()) {
+					if(year_start_date > frappe.datetime.get_today()) {
 						next_year = current_year
 						current_year -= 1;
 					}
@@ -145,7 +145,7 @@
 
 				slide.get_input("company_abbr").on("change", function() {
 					if(slide.get_input("company_abbr").val().length > 5) {
-						msgprint("Company Abbreviation cannot have more than 5 characters");
+						frappe.msgprint("Company Abbreviation cannot have more than 5 characters");
 						slide.get_field("company_abbr").set_input("");
 					}
 				});
@@ -420,7 +420,7 @@
 		"Thailand": ["10-01", "09-30"],
 		"United Kingdom": ["04-01", "03-31"],
 	};
-};
+}
 
 frappe.wiz.on("before_load", function() {
 	load_erpnext_slides();
@@ -447,7 +447,7 @@
 	}
 });
 
-test_values_edu = {
+var test_values_edu = {
 	"language":"english",
 	"domain":"Education",
 	"country":"India",
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 2a69deb..e4e7440 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -2,9 +2,11 @@
 // License: GNU General Public License v3. See license.txt
 
 // shopping cart
-frappe.provide("shopping_cart");
+frappe.provide("erpnext.shopping_cart");
+var shopping_cart = erpnext.shopping_cart;
 
 frappe.ready(function() {
+	var full_name = frappe.session && frappe.session.user_fullname;
 	// update user
 	if(full_name) {
 		$('.navbar li[data-label="User"] a')
@@ -34,7 +36,7 @@
 	},
 
 	update_cart: function(opts) {
-		if(!full_name || full_name==="Guest") {
+		if(frappe.session.user==="Guest") {
 			if(localStorage) {
 				localStorage.setItem("last_visited", window.location.pathname);
 			}
@@ -110,19 +112,19 @@
 	},
 
 
-	bind_dropdown_cart_buttons: function() {
+	bind_dropdown_cart_buttons: function () {
 		$(".cart-icon").on('click', '.number-spinner button', function () {
 			var btn = $(this),
 				input = btn.closest('.number-spinner').find('input'),
 				oldValue = input.val().trim(),
 				newVal = 0;
 
-				if (btn.attr('data-dir') == 'up') {
-					newVal = parseInt(oldValue) + 1;
-				} else {
-					if (oldValue > 1) {
-						newVal = parseInt(oldValue) - 1;
-					}
+			if (btn.attr('data-dir') == 'up') {
+				newVal = parseInt(oldValue) + 1;
+			} else {
+				if (oldValue > 1) {
+					newVal = parseInt(oldValue) - 1;
+				}
 			}
 			input.val(newVal);
 			var item_code = input.attr("data-item-code");
diff --git a/erpnext/public/js/sms_manager.js b/erpnext/public/js/sms_manager.js
index d6293ea..13e226f 100644
--- a/erpnext/public/js/sms_manager.js
+++ b/erpnext/public/js/sms_manager.js
@@ -1,7 +1,7 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-function SMSManager(doc) {
+erpnext.SMSManager = function SMSManager(doc) {
 	var me = this;
 	this.setup = function() {
 		var default_msg = {
@@ -42,7 +42,7 @@
 				ref_name: ref_name
 			},
 			callback: function(r) {
-				if(r.exc) { msgprint(r.exc); return; }
+				if(r.exc) { frappe.msgprint(r.exc); return; }
 				me.number = r.message;
 				me.show_dialog();
 			}
@@ -92,7 +92,7 @@
 					},
 					callback: function(r) {
 						$(btn).done_working();
-						if(r.exc) {msgprint(r.exc); return; }
+						if(r.exc) {frappe.msgprint(r.exc); return; }
 						me.dialog.hide();
 					}
 				});
diff --git a/erpnext/public/js/stock_analytics.js b/erpnext/public/js/stock_analytics.js
index 28ff55d..74f5c03 100644
--- a/erpnext/public/js/stock_analytics.js
+++ b/erpnext/public/js/stock_analytics.js
@@ -6,7 +6,6 @@
 	init: function(wrapper, opts) {
 		var args = {
 			title: __("Stock Analytics"),
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
@@ -120,8 +119,8 @@
 	},
 	prepare_balances: function() {
 		var me = this;
-		var from_date = dateutil.str_to_obj(this.from_date);
-		var to_date = dateutil.str_to_obj(this.to_date);
+		var from_date = frappe.datetime.str_to_obj(this.from_date);
+		var to_date = frappe.datetime.str_to_obj(this.to_date);
 		var data = frappe.report_dump.data["Stock Ledger Entry"];
 
 		this.item_warehouse = {};
@@ -130,7 +129,7 @@
 		for(var i=0, j=data.length; i<j; i++) {
 			var sl = data[i];
 			sl.posting_datetime = sl.posting_date + " " + sl.posting_time;
-			var posting_datetime = dateutil.str_to_obj(sl.posting_datetime);
+			var posting_datetime = frappe.datetime.str_to_obj(sl.posting_datetime);
 
 			if(me.is_default("warehouse") ? true : me.warehouse == sl.warehouse) {
 				var item = me.item_by_name[sl.item_code];
@@ -139,7 +138,7 @@
 				if(me.value_or_qty!="Quantity") {
 					var wh = me.get_item_warehouse(sl.warehouse, sl.item_code);
 					var valuation_method = item.valuation_method ?
-						item.valuation_method : sys_defaults.valuation_method;
+						item.valuation_method : frappe.sys_defaults.valuation_method;
 					var is_fifo = valuation_method == "FIFO";
 
 					if(sl.voucher_type=="Stock Reconciliation") {
@@ -185,7 +184,7 @@
 
 				var parent = me.parent_map[item.name];
 				while(parent) {
-					parent_group = me.item_by_name[parent];
+					var parent_group = me.item_by_name[parent];
 					$.each(me.columns, function(c, col) {
 						if (col.formatter == me.currency_formatter) {
 							parent_group[col.field] =
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index d618fbe..9650862 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -248,7 +248,7 @@
 			"Delivery Note", "Purchase Receipt", "Sales Invoice"], function(i, d) {
 			frappe.ui.form.on(d, "onload", function(frm) {
 				cur_frm.set_df_property("posting_time", "description",
-					sys_defaults.time_zone);
+					frappe.sys_defaults.time_zone);
 			});
 		});
 	}
diff --git a/erpnext/public/js/utils/item_selector.js b/erpnext/public/js/utils/item_selector.js
index 87d2fc8..98a17f2 100644
--- a/erpnext/public/js/utils/item_selector.js
+++ b/erpnext/public/js/utils/item_selector.js
@@ -55,7 +55,7 @@
 		$.each(this.frm.doc.items || [], function(i, d) {
 			if(d.item_code===item_code) {
 				frappe.model.set_value(d.doctype, d.name, 'qty', d.qty + 1);
-				show_alert(__("Added {0} ({1})", [item_code, d.qty]));
+				frappe.show_alert(__("Added {0} ({1})", [item_code, d.qty]));
 				added = true;
 				return false;
 			}
@@ -69,7 +69,7 @@
 			frappe.after_ajax(function() {
 				setTimeout(function() {
 					frappe.model.set_value(d.doctype, d.name, 'qty', 1);
-					show_alert(__("Added {0} ({1})", [item_code, 1]));
+					frappe.show_alert(__("Added {0} ({1})", [item_code, 1]));
 				}, 100);
 			});
 		}
diff --git a/erpnext/public/js/utils/party.js b/erpnext/public/js/utils/party.js
index 19fe277..cc19a11 100644
--- a/erpnext/public/js/utils/party.js
+++ b/erpnext/public/js/utils/party.js
@@ -57,7 +57,7 @@
 		var prev_route = frappe.get_prev_route();
 		if(prev_route[1]==='Item' && !(frm.doc.items && frm.doc.items.length)) {
 			// add row
-			item = frm.add_child('items');
+			var item = frm.add_child('items');
 			frm.refresh_field('items');
 
 			// set item
@@ -80,7 +80,7 @@
 	if(!display_field) display_field = "address_display";
 	if(frm.doc[address_field]) {
 		frappe.call({
-			method: "frappe.geo.doctype.address.address.get_address_display",
+			method: "frappe.contacts.doctype.address.address.get_address_display",
 			args: {"address_dict": frm.doc[address_field] },
 			callback: function(r) {
 				if(r.message) {
@@ -98,8 +98,8 @@
 	if(frappe.meta.get_docfield(frm.doc.doctype, "taxes") && !is_your_company_address) {
 		if(!erpnext.utils.validate_mandatory(frm, "Lead/Customer/Supplier",
 			frm.doc.customer || frm.doc.supplier || frm.doc.lead, address_field)) {
-				return;
-			}
+			return;
+		}
 
 		if(!erpnext.utils.validate_mandatory(frm, "Posting/Transaction Date",
 			frm.doc.posting_date || frm.doc.transaction_date, address_field)) {
@@ -144,7 +144,7 @@
 
 	if(frm.doc["contact_person"]) {
 		frappe.call({
-			method: "frappe.email.doctype.contact.contact.get_contact_details",
+			method: "frappe.contacts.doctype.contact.contact.get_contact_details",
 			args: {contact: frm.doc.contact_person },
 			callback: function(r) {
 				if(r.message)
@@ -166,7 +166,7 @@
 
 erpnext.utils.get_shipping_address = function(frm, callback){
 	frappe.call({
-		method: "frappe.geo.doctype.address.address.get_shipping_address",
+		method: "frappe.contacts.doctype.address.address.get_shipping_address",
 		args: {company: frm.doc.company},
 		callback: function(r){
 			if(r.message){
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index 43d2438..db65a69 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -10,6 +10,14 @@
 from frappe.utils import flt, cstr
 from frappe.email.doctype.email_group.email_group import add_subscribers
 
+def get_course(program):
+	'''Return list of courses for a particular program
+	:param program: Program
+	'''
+	courses = frappe.db.sql('''select course, course_name from `tabProgram Course` where parent=%s''',
+			(program), as_dict=1)
+	return courses
+
 @frappe.whitelist()
 def enroll_student(source_name):
 	"""Creates a Student Record and returns a Program Enrollment.
diff --git a/erpnext/schools/doctype/assessment_plan/assessment_plan.js b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
index abdb0c8..fa4b500 100644
--- a/erpnext/schools/doctype/assessment_plan/assessment_plan.js
+++ b/erpnext/schools/doctype/assessment_plan/assessment_plan.js
@@ -28,30 +28,30 @@
         }
     },
 
-    course: function(frm) {
-        if (frm.doc.course && frm.doc.maximum_assessment_score) {
-            frappe.call({
-                method: "erpnext.schools.api.get_assessment_criteria",
-                args: {
-                    course: frm.doc.course
-                },
-                callback: function(r) {
-                    if (r.message) {
-                        frm.doc.assessment_criteria = [];
-                        $.each(r.message, function(i, d) {
-                            var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
-                            row.assessment_criteria = d.assessment_criteria;
-                            row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
-                        });
-                    }
-                    refresh_field("assessment_criteria");
+	course: function(frm) {
+		if (frm.doc.course && frm.doc.maximum_assessment_score) {
+			frappe.call({
+				method: "erpnext.schools.api.get_assessment_criteria",
+				args: {
+					course: frm.doc.course
+				},
+				callback: function(r) {
+					if (r.message) {
+						frm.doc.assessment_criteria = [];
+						$.each(r.message, function(i, d) {
+							var row = frappe.model.add_child(frm.doc, "Assessment Plan Criteria", "assessment_criteria");
+							row.assessment_criteria = d.assessment_criteria;
+							row.maximum_score = d.weightage / 100 * frm.doc.maximum_assessment_score;
+						});
+					}
+					refresh_field("assessment_criteria");
 
-                }
-            });
-        }
-    },
+				}
+			});
+		}
+	},
 
-    maximum_assessment_score: function(frm) {
-        frm.trigger("course");
-    }
+	maximum_assessment_score: function(frm) {
+		frm.trigger("course");
+	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result/assessment_result.js b/erpnext/schools/doctype/assessment_result/assessment_result.js
index 0af5adc..e75f314 100644
--- a/erpnext/schools/doctype/assessment_result/assessment_result.js
+++ b/erpnext/schools/doctype/assessment_result/assessment_result.js
@@ -6,46 +6,46 @@
 cur_frm.add_fetch("assessment_plan", "maximum_assessment_score", "maximum_score");
 
 frappe.ui.form.on("Assessment Result", {
-    assessment_plan: function(frm) {
-        frappe.call({
-            method: "erpnext.schools.api.get_assessment_details",
-            args: {
-                assessment_plan: frm.doc.assessment_plan
-            },
-            callback: function(r) {
-                if (r.message) {
-                    frm.doc.details = [];
-                    $.each(r.message, function(i, d) {
-                        var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
-                        row.assessment_criteria = d.assessment_criteria;
-                        row.maximum_score = d.maximum_score;
-                    });
-                }
-                refresh_field("details");
-            }
-        });
-    }
+	assessment_plan: function(frm) {
+		frappe.call({
+			method: "erpnext.schools.api.get_assessment_details",
+			args: {
+				assessment_plan: frm.doc.assessment_plan
+			},
+			callback: function(r) {
+				if (r.message) {
+					frm.doc.details = [];
+					$.each(r.message, function(i, d) {
+						var row = frappe.model.add_child(frm.doc, "Assessment Result Detail", "details");
+						row.assessment_criteria = d.assessment_criteria;
+						row.maximum_score = d.maximum_score;
+					});
+				}
+				refresh_field("details");
+			}
+		});
+	}
 });
 
 frappe.ui.form.on("Assessment Result Detail", {
-    score: function(frm, cdt, cdn) {
-        var d  = locals[cdt][cdn];
-        if (d.score >= d.maximum_score) {
-            frappe.throw(_("Score cannot be greater than Maximum Score"));
-        }
-        else {
-            frappe.call({
-                method: "erpnext.schools.api.get_grade",
-                args: {
-                    grading_scale: frm.doc.grading_scale,
-                    percentage: ((d.score/d.maximum_score) * 100)
-                },
-                callback: function(r) {
-                    if (r.message) {
-                        frappe.model.set_value(cdt, cdn, "grade", r.message);
-                    }
-                }
-            });
-        }
-    }
+	score: function(frm, cdt, cdn) {
+		var d  = locals[cdt][cdn];
+		if (d.score >= d.maximum_score) {
+			frappe.throw(__("Score cannot be greater than Maximum Score"));
+		}
+		else {
+			frappe.call({
+				method: "erpnext.schools.api.get_grade",
+				args: {
+					grading_scale: frm.doc.grading_scale,
+					percentage: ((d.score/d.maximum_score) * 100)
+				},
+				callback: function(r) {
+					if (r.message) {
+						frappe.model.set_value(cdt, cdn, "grade", r.message);
+					}
+				}
+			});
+		}
+	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
index 3cadea6..a2eecef 100644
--- a/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
+++ b/erpnext/schools/doctype/assessment_result_tool/assessment_result_tool.js
@@ -6,6 +6,7 @@
 
 frappe.ui.form.on('Assessment Result Tool', {
 	refresh: function(frm) {
+		frm.trigger("assessment_plan");
 		if (frappe.route_options) {
 			frm.set_value("student_group", frappe.route_options.student_group);
 			frm.set_value("assessment_plan", frappe.route_options.assessment_plan);
diff --git a/erpnext/schools/doctype/course/course.js b/erpnext/schools/doctype/course/course.js
index f84c59f..c667eca 100644
--- a/erpnext/schools/doctype/course/course.js
+++ b/erpnext/schools/doctype/course/course.js
@@ -1,18 +1,30 @@
 frappe.ui.form.on("Course", "refresh", function(frm) {
 	if(!cur_frm.doc.__islocal) {
 		frm.add_custom_button(__("Program"), function() {
+			frappe.route_options = {
+				"Program Course.course": frm.doc.name
+			}
 			frappe.set_route("List", "Program");
 		});
 		
 		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Student Group");
 		});
 		
 		frm.add_custom_button(__("Course Schedule"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Course Schedule");
 		});
 		
 		frm.add_custom_button(__("Assessment Plan"), function() {
+			frappe.route_options = {
+				course: frm.doc.name
+			}
 			frappe.set_route("List", "Assessment Plan");
 		});
 	}
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
index 6521469..7778a6e 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.js
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.js
@@ -2,15 +2,15 @@
 
 cur_frm.add_fetch("student_group", "course", "course")
 frappe.ui.form.on("Course Schedule", {
-    refresh: function(frm) {
-        if (!frm.doc.__islocal) {
-            frm.add_custom_button(__("Attendance"), function() {
-                frappe.route_options = {
-                    based_on: "Course Schedule",
-                    course_schedule: frm.doc.name
-                }
-                frappe.set_route("Form", "Student Attendance Tool");
-            });
-        }
-    }
+	refresh: function(frm) {
+		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Attendance"), function() {
+				frappe.route_options = {
+					based_on: "Course Schedule",
+					course_schedule: frm.doc.name
+				}
+				frappe.set_route("Form", "Student Attendance Tool");
+			});
+		}
+	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index f70db4e..117a321 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -164,7 +164,7 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -420,7 +420,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-02 12:12:35.785061", 
+ "modified": "2017-06-13 14:29:02.531695", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Course Schedule", 
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
index b835ce0..f92f738 100644
--- a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
@@ -8,13 +8,13 @@
 
 frappe.ui.form.on("Course Scheduling Tool", {
 
-    refresh: function(frm) {
-        frm.disable_save();
-        frm.page.set_primary_action(__("Schedule Course"), function() {
-            frappe.call({
-                method: "schedule_course",
-                doc: frm.doc
-            })
-        });
-    }
+	refresh: function(frm) {
+		frm.disable_save();
+		frm.page.set_primary_action(__("Schedule Course"), function() {
+			frappe.call({
+				method: "schedule_course",
+				doc: frm.doc
+			})
+		});
+	}
 });
\ No newline at end of file
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.js b/erpnext/schools/doctype/fee_structure/fee_structure.js
index 391c935..fa46278 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.js
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on("Fee Component", {
 	amount: function(frm) {
-		total_amount = 0;
+		var total_amount = 0;
 		for(var i=0;i<frm.doc.components.length;i++) {
 			total_amount += frm.doc.components[i].amount;
 		}
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index 03b4fb8..c0c6969 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -45,6 +47,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -71,10 +74,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -136,6 +141,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -166,6 +172,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +201,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -224,6 +232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -252,6 +261,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -281,19 +291,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-flag", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-02-17 17:17:25.543140", 
+ "modified": "2017-06-13 14:28:53.153233", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fee Structure", 
diff --git a/erpnext/schools/doctype/fees/fees.js b/erpnext/schools/doctype/fees/fees.js
index 7c35de4..e5a840a 100644
--- a/erpnext/schools/doctype/fees/fees.js
+++ b/erpnext/schools/doctype/fees/fees.js
@@ -2,7 +2,7 @@
 cur_frm.add_fetch("student", "title", "student_name");
 
 frappe.ui.form.on("Fees", {
-	
+
 	onload: function(frm){
 		cur_frm.set_query("academic_term",function(){
 			return{
@@ -11,7 +11,7 @@
 				}
 			};
 		});
-		
+
 		cur_frm.set_query("fee_structure",function(){
 			return{
 				"filters":{
@@ -20,7 +20,7 @@
 			};
 		});
 	},
-	
+
 	refresh: function(frm) {
 		if (frm.doc.docstatus === 1 && (frm.doc.total_amount > frm.doc.paid_amount)) {
 			frm.add_custom_button(__("Collect Fees"), function() {
@@ -42,7 +42,7 @@
 			});
 		}
 	},
-	
+
 	program: function(frm) {
 		if (frm.doc.program && frm.doc.academic_term) {
 			frappe.call({
@@ -86,9 +86,9 @@
 			});
 		}
 	},
-	
+
 	calculate_total_amount: function(frm) {
-		total_amount = 0;
+		var total_amount = 0;
 		for(var i=0;i<frm.doc.components.length;i++) {
 			total_amount += frm.doc.components[i].amount;
 		}
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
index 076bbe0..5d69242 100644
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -103,6 +107,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -133,6 +138,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -190,6 +197,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -219,6 +227,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -245,10 +254,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -279,6 +289,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -309,6 +320,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -339,6 +351,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -367,6 +380,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -397,6 +411,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -425,6 +440,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -454,6 +470,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -482,6 +499,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -512,6 +530,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -542,6 +561,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -572,18 +592,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-02-17 17:22:49.264775", 
+ "modified": "2017-06-13 14:29:07.744289", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Fees", 
diff --git a/erpnext/schools/doctype/fees/fees_list.js b/erpnext/schools/doctype/fees/fees_list.js
index 6b985e3..2b5c9f6 100644
--- a/erpnext/schools/doctype/fees/fees_list.js
+++ b/erpnext/schools/doctype/fees/fees_list.js
@@ -1,8 +1,9 @@
 frappe.listview_settings['Fees'] = {
 	add_fields: [ "total_amount", "paid_amount", "due_date"],
 	get_indicator: function(doc) {
+		var { get_today } = frappe.datetime;
 		if ((doc.total_amount > doc.paid_amount) && doc.due_date < get_today()) {
-			return [__("Overdue"), "red", ["due_date,<,"+get_today()], ["due_date,<,"+get_today()]];
+			return [__("Overdue"), "red", ["due_date,<," + get_today()], ["due_date,<," + get_today()]];
 		}
 		else if (doc.total_amount > doc.paid_amount) {
 			return [__("Pending"), "orange"];
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
index db14aef..db31668 100644
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -126,10 +131,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -160,6 +166,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,19 +196,19 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "idx": 0, 
  "image_field": "image", 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-02-17 17:19:03.465228", 
+ "modified": "2017-06-13 14:29:20.102059", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Instructor", 
diff --git a/erpnext/schools/doctype/program/program.js b/erpnext/schools/doctype/program/program.js
index cc09d0e..5146a19 100644
--- a/erpnext/schools/doctype/program/program.js
+++ b/erpnext/schools/doctype/program/program.js
@@ -6,22 +6,37 @@
 frappe.ui.form.on("Program", "refresh", function(frm) {
 	if(!frm.doc.__islocal) {
 		frm.add_custom_button(__("Student Applicant"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Student Applicant");
 		});
 		
 		frm.add_custom_button(__("Program Enrollment"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Program Enrollment");
 		});
 		
 		frm.add_custom_button(__("Student Group"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Student Group");
 		});
 		
 		frm.add_custom_button(__("Fee Structure"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Fee Structure");
 		});
 		
 		frm.add_custom_button(__("Fees"), function() {
+			frappe.route_options = {
+				program: frm.doc.name
+			}
 			frappe.set_route("List", "Fees");
 		});
 	}
diff --git a/erpnext/schools/doctype/program_course/program_course.json b/erpnext/schools/doctype/program_course/program_course.json
index 8c82666..cfe167d 100644
--- a/erpnext/schools/doctype/program_course/program_course.json
+++ b/erpnext/schools/doctype/program_course/program_course.json
@@ -13,6 +13,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -71,6 +73,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -101,6 +104,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -114,7 +118,7 @@
    "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
-   "label": "Required", 
+   "label": "Mandatory", 
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -141,7 +145,7 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-04-07 17:59:12.504949", 
+ "modified": "2017-06-12 18:20:59.255302", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Course", 
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.js b/erpnext/schools/doctype/program_enrollment/program_enrollment.js
index 207e6a1..dcdaabc 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.js
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.js
@@ -3,7 +3,7 @@
 
 cur_frm.add_fetch('fee_structure', 'total_amount', 'amount');
 
-frappe.ui.form.on("Program Enrollment", {	
+frappe.ui.form.on("Program Enrollment", {
 	onload: function(frm, cdt, cdn){
 		frm.set_query("academic_term", "fees", function(){
 			return{
@@ -12,7 +12,7 @@
 				}
 			};
 		});
-				
+
 		frm.fields_dict['fees'].grid.get_field('fee_structure').get_query = function(doc, cdt, cdn) {
 			var d = locals[cdt][cdn];
 			return {
@@ -25,7 +25,7 @@
 				return{
 					query: "erpnext.schools.doctype.program_enrollment.program_enrollment.get_program_courses",
 					filters: {
-						'program': frm.doc.program	
+						'program': frm.doc.program
 					}
 				}
 			});
@@ -43,34 +43,27 @@
 				callback: function(r) {
 					if(r.message) {
 						frm.set_value("fees" ,r.message);
+						frm.events.get_courses(frm);
 					}
 				}
 			});
 		}
 	},
-	
+
 	student_category: function() {
 		frappe.ui.form.trigger("Program Enrollment", "program");
 	},
 
 	get_courses: function(frm) {
-		if (frm.doc.program) {
-			frm.set_value("courses",[]);
-			frappe.call({
-				method: "get_courses",
-				doc:frm.doc,
-				callback: function(r) {
-					if(r.message) {
-						frm.set_value("courses", r.message);
-					}
-					else {
-						frappe.msgprint(__("There is no mandatory course for the program {0}",[frm.doc.program]));
-					}
+		frm.set_value("courses",[]);
+		frappe.call({
+			method: "get_courses",
+			doc:frm.doc,
+			callback: function(r) {
+				if(r.message) {
+					frm.set_value("courses", r.message);
 				}
-			})
-		}
-		else {
-			frappe.throw(__("Select the Program to fetch mandatory courses."))
-		}
+			}
+		})
 	}
 });
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
index f2bc416..d8c6861 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
@@ -81,19 +81,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "academic_year", 
+   "fieldname": "student_category", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Academic Year", 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Student Category", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Academic Year", 
+   "options": "Student Category", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -101,7 +101,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 1, 
+   "reqd": 0, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -112,7 +112,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "academic_term", 
+   "fieldname": "school_house", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -121,10 +121,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Academic Term", 
+   "label": "School House", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Academic Term", 
+   "options": "School House", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -243,7 +243,7 @@
    "in_global_search": 1, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Batch", 
+   "label": "Student Batch", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Student Batch Name", 
@@ -265,19 +265,19 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "student_category", 
+   "fieldname": "academic_year", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Student Category", 
+   "in_list_view": 1, 
+   "in_standard_filter": 1, 
+   "label": "Academic Year", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "Student Category", 
+   "options": "Academic Year", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -285,7 +285,7 @@
    "read_only": 0, 
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
-   "reqd": 0, 
+   "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
@@ -296,7 +296,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "school_house", 
+   "fieldname": "academic_term", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -305,10 +305,10 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "School House", 
+   "label": "Academic Term", 
    "length": 0, 
    "no_copy": 0, 
-   "options": "School House", 
+   "options": "Academic Term", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -474,36 +474,6 @@
   }, 
   {
    "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "get_courses", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Get Courses", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -668,7 +638,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-06-02 15:29:05.812335", 
+ "modified": "2017-06-12 18:14:35.875103", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Program Enrollment", 
diff --git a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
index 3dd00c0..bf6f3e0 100644
--- a/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
+++ b/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.js
@@ -7,7 +7,7 @@
 	"refresh": function(frm) {
 		frm.disable_save();
 	},
-	
+
 	"get_students": function(frm) {
 		frm.set_value("students",[]);
 		frappe.call({
@@ -20,13 +20,13 @@
 			}
 		})
 	},
-	
+
 	"enroll_students": function(frm) {
 		frappe.call({
 			method: "enroll_students",
 			doc:frm.doc,
 			callback: function(r) {
-					frm.set_value("students", []);
+				frm.set_value("students", []);
 			}
 		})
 	}
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index 1654c3b..8806817 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -14,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +74,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -100,6 +103,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -129,6 +133,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +163,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -187,6 +193,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -215,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -241,10 +249,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -274,6 +283,7 @@
    "unique": 1
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -304,6 +314,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -334,6 +345,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -364,6 +376,7 @@
    "width": "10"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -394,6 +407,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -423,6 +437,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -453,6 +468,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -481,6 +497,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -511,6 +528,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -541,6 +559,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -571,6 +590,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -600,6 +620,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -630,6 +651,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -659,6 +681,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -688,6 +711,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -717,6 +741,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -746,6 +771,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -774,6 +800,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -803,6 +830,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -832,6 +860,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -862,6 +891,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -892,6 +922,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -921,6 +952,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -950,6 +982,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -979,6 +1012,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1007,6 +1041,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1036,6 +1071,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1078,7 +1114,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-03-29 12:57:26.293876", 
+ "modified": "2017-06-13 14:28:57.189648", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student", 
@@ -1135,4 +1171,4 @@
  "title_field": "title", 
  "track_changes": 0, 
  "track_seen": 0
-}
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.js b/erpnext/schools/doctype/student_applicant/student_applicant.js
index 9b08ee5..974d972 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.js
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.js
@@ -28,7 +28,7 @@
 
 		frappe.realtime.on("enroll_student_progress", function(data) {
 			if(data.progress) {
-				frappe.hide_msgprint(true);
+				frappe.hide_frappe.msgprint(true);
 				frappe.show_progress(__("Enrolling student"), data.progress[0],data.progress[1]);
 			}
 		})
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
index d405b7f..4ad3858 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -15,6 +15,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -44,6 +45,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -102,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -132,6 +136,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -161,6 +166,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,6 +195,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -215,10 +222,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -250,6 +258,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -281,6 +290,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -311,6 +321,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -341,6 +352,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -370,6 +382,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -400,6 +413,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -429,6 +443,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -459,6 +474,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -489,6 +505,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -517,6 +534,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -546,6 +564,7 @@
    "unique": 1
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -575,6 +594,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -606,6 +626,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -635,6 +656,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -664,6 +686,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -693,6 +716,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -722,6 +746,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -750,6 +775,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -779,6 +805,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -808,6 +835,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -837,6 +865,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -867,6 +896,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -896,6 +926,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -926,6 +957,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -954,6 +986,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -983,6 +1016,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1024,7 +1058,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-03-15 17:49:15.345022", 
+ "modified": "2017-06-13 14:29:22.461344", 
  "modified_by": "Administrator", 
  "module": "Schools", 
  "name": "Student Applicant", 
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
index 8fe8f8c..93c83f3 100644
--- a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -14,6 +14,12 @@
 	},
 
 	refresh: function(frm) {
+		if (frappe.route_options) {
+			frm.set_value("based_on", frappe.route_options.based_on);
+			frm.set_value("student_group", frappe.route_options.student_group);
+			frm.set_value("course_schedule", frappe.route_options.course_schedule);
+			frappe.route_options = null;
+		}
 		frm.disable_save();
 	},
 
@@ -102,17 +108,6 @@
 				});
 			});
 
-		var get_present_student = function(student) {
-			return students.filter(function(s) {
-				return s.group_roll_number === group_roll_number;
-			})
-		}
-		var get_absent_student = function(group_roll_number) {
-			return students.filter(function(s) {
-				return s.group_roll_number === group_roll_number;
-			})
-		}
-
 		student_toolbar.find(".btn-mark-att")
 			.html(__('Mark Attendence'))
 			.on("click", function() {
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index ed94690..83fe094 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -13,11 +13,23 @@
 
 	refresh: function(frm) {
 		if (!frm.doc.__islocal) {
+			frm.add_custom_button(__("Attendance"), function() {
+				frappe.route_options = {
+					based_on: "Student Group",
+					student_group: frm.doc.name
+				}
+				frappe.set_route("List", "Student Attendance Tool");
+			});
 			frm.add_custom_button(__("Course Schedule"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
 				frappe.set_route("List", "Course Schedule");
 			});
-
 			frm.add_custom_button(__("Assessment Plan"), function() {
+				frappe.route_options = {
+					student_group: frm.doc.name
+				}
 				frappe.set_route("List", "Assessment Plan");
 			});
 			frm.add_custom_button(__("Update Email Group"), function() {
@@ -30,6 +42,9 @@
 				});
 			});
 			frm.add_custom_button(__("Newsletter"), function() {
+				frappe.route_options = {
+					"Newsletter Email Group.email_group": frm.doc.name
+				}
 				frappe.set_route("List", "Newsletter");
 			});
 		}
diff --git a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
index dd909b2..146f11c 100644
--- a/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
+++ b/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js
@@ -7,10 +7,10 @@
 		})
 	});
 	frappe.realtime.on("student_group_creation_progress", function(data) {
-			if(data.progress) {
-				frappe.hide_msgprint(true);
-				frappe.show_progress(__("Creating student groups"), data.progress[0],data.progress[1]);
-			}
+		if(data.progress) {
+			frappe.hide_frappe.msgprint(true);
+			frappe.show_progress(__("Creating student groups"), data.progress[0],data.progress[1]);
+		}
 	});
 });
 
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/schools/report/absent_student_report/absent_student_report.js
index 7515f22..bf2d10d 100644
--- a/erpnext/schools/report/absent_student_report/absent_student_report.js
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.js
@@ -8,7 +8,7 @@
 			"fieldname":"date",
 			"label": __("Date"),
 			"fieldtype": "Date",
-			"default": get_today(),
+			"default": frappe.datetime.get_today(),
 			"reqd": 1
 		}
 	]
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/schools/report/absent_student_report/absent_student_report.py
index 0949831..8e6ce51 100644
--- a/erpnext/schools/report/absent_student_report/absent_student_report.py
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.py
@@ -13,9 +13,13 @@
 		msgprint(_("Please select date"), raise_exception=1)
 	
 	columns = get_columns(filters)
+	date = filters.get("date")
 
-	absent_students = get_absent_students(filters.get("date"))
-	leave_applicants = get_leave_applications(filters.get("date"))
+	absent_students = get_absent_students(date)
+	leave_applicants = get_leave_applications(date)
+	if absent_students:
+		student_list = [d["student"] for d in absent_students]
+		transportation_details = get_transportation_details(date, student_list)
 
 	data = []
 	for student in absent_students:
@@ -32,6 +36,8 @@
 				row+=[stud_details.student_mobile_number]
 			else:
 				row+= [""]
+			if transportation_details.get(student.student):
+				row += transportation_details.get(student.student)
 				
 			data.append(row)
 	
@@ -44,6 +50,8 @@
 		_("Student Group") + "::180",
 		_("Student Email Address") + "::180",
 		_("Student Mobile No.") + "::150",
+		_("Mode of Transportation") + "::150",
+		_("Vehicle/Bus Number") + "::150",
 	]
 	return columns
 
@@ -57,4 +65,20 @@
 	for student in frappe.db.sql("""select student from `tabStudent Leave Application` 
 	where docstatus = 1 and from_date <= %s and to_date >= %s""", (date, date)):
 		leave_applicants.append(student[0])
-	return leave_applicants
\ No newline at end of file
+	return leave_applicants
+
+def get_transportation_details(date, student_list):
+	academic_year = frappe.get_all("Academic Year", filters=[["year_start_date", "<=", date],["year_end_date", ">=", date]])
+	if academic_year:
+		academic_year = academic_year[0].name
+	elif frappe.defaults.get_defaults().academic_year:
+		academic_year = frappe.defaults.get_defaults().academic_year
+	else:
+		return {}
+
+	transportation_details = frappe.get_all("Program Enrollment", fields=["student", "mode_of_transportation", "vehicle_no"],
+		filters={"student": ("in", student_list), "academic_year": academic_year, "docstatus": ("not in", ["2"])})
+	transportation_map = {}
+	for d in transportation_details:
+		transportation_map[d.student] = [d.mode_of_transportation, d.vehicle_no]
+	return transportation_map
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
index 51f7346..ad04356 100644
--- a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
@@ -2,11 +2,11 @@
 // For license information, please see license.txt
 
 frappe.query_reports["Student Batch-Wise Attendance"] = {
-    "filters": [{
-        "fieldname": "date",
-        "label": __("Date"),
-        "fieldtype": "Date",
-        "default": get_today(),
-        "reqd": 1
-    }]
+	"filters": [{
+		"fieldname": "date",
+		"label": __("Date"),
+		"fieldtype": "Date",
+		"default": frappe.datetime.get_today(),
+		"reqd": 1
+	}]
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
index 57927fa..943238e 100644
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
@@ -3,40 +3,40 @@
 
 
 frappe.query_reports["Student Monthly Attendance Sheet"] = {
-    "filters": [{
-            "fieldname": "month",
-            "label": __("Month"),
-            "fieldtype": "Select",
-            "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
-            "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
-                "Dec"
-            ][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
-        },
-        {
-            "fieldname": "year",
-            "label": __("Year"),
-            "fieldtype": "Select",
-            "reqd": 1
-        },
-        {
-            "fieldname": "student_group",
-            "label": __("Student Group"),
-            "fieldtype": "Link",
-            "options": "Student Group",
-            "reqd": 1
-        }
-    ],
+	"filters": [{
+		"fieldname": "month",
+		"label": __("Month"),
+		"fieldtype": "Select",
+		"options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+		"default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+			"Dec"
+		][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+	},
+	{
+		"fieldname": "year",
+		"label": __("Year"),
+		"fieldtype": "Select",
+		"reqd": 1
+	},
+	{
+		"fieldname": "student_group",
+		"label": __("Student Group"),
+		"fieldtype": "Link",
+		"options": "Student Group",
+		"reqd": 1
+	}
+	],
 
-    "onload": function() {
-        return frappe.call({
-            method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
-            callback: function(r) {
-                var year_filter = frappe.query_report_filters_by_name.year;
-                year_filter.df.options = r.message;
-                year_filter.df.default = r.message.split("\n")[0];
-                year_filter.refresh();
-                year_filter.set_input(year_filter.df.default);
-            }
-        });
-    }
+	"onload": function() {
+		return frappe.call({
+			method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
+			callback: function(r) {
+				var year_filter = frappe.query_report_filters_by_name.year;
+				year_filter.df.options = r.message;
+				year_filter.df.default = r.message.split("\n")[0];
+				year_filter.refresh();
+				year_filter.set_input(year_filter.df.default);
+			}
+		});
+	}
 }
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
index 91f6c36..1e79a93 100644
--- a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -61,7 +61,7 @@
 	students_with_leave_application = get_students_with_leave_application(from_date, to_date, students_list)
 	for d in attendance_list:
 		att_map.setdefault(d.student, frappe._dict()).setdefault(d.date, "")
-		if students_with_leave_application and d.student in students_with_leave_application.get(d.date):
+		if students_with_leave_application.get(d.date) and d.student in students_with_leave_application.get(d.date):
 			att_map[d.student][d.date] = "Present"
 		else:
 			att_map[d.student][d.date] = d.status
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 9487540..7b45572 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "naming_series:", 
@@ -13,16 +14,20 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "campaign", 
    "fieldtype": "Section Break", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign", 
    "length": 0, 
    "no_copy": 0, 
@@ -31,6 +36,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -38,16 +44,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "campaign_name", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Campaign Name", 
    "length": 0, 
    "no_copy": 0, 
@@ -57,6 +67,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
@@ -64,16 +75,20 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "naming_series", 
    "fieldtype": "Select", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
+   "in_standard_filter": 0, 
    "label": "Naming Series", 
    "length": 0, 
    "no_copy": 0, 
@@ -82,23 +97,28 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "description", 
    "fieldtype": "Text", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
+   "in_standard_filter": 0, 
    "label": "Description", 
    "length": 0, 
    "no_copy": 0, 
@@ -108,6 +128,7 @@
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
+   "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
@@ -116,18 +137,18 @@
    "width": "300px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-bullhorn", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-07-25 05:24:26.355291", 
+ "modified": "2017-06-13 14:28:49.471846", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Campaign", 
@@ -197,5 +218,7 @@
  "quick_entry": 1, 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 540ec28..d85f5c1 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -37,7 +37,7 @@
 		frm.toggle_display(['address_html','contact_html'], !frm.doc.__islocal);
 
 		if(!frm.doc.__islocal) {
-			frappe.geo.render_address_and_contact(frm);
+			frappe.contacts.render_address_and_contact(frm);
 
 			// custom buttons
 			frm.add_custom_button(__('Accounting Ledger'), function() {
@@ -53,7 +53,7 @@
 			erpnext.utils.set_party_dashboard_indicators(frm);
 
 		} else {
-			frappe.geo.clear_address_and_contact(frm);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 
 		var grid = cur_frm.get_field("sales_team").grid;
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 8157013..989dfbc 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -72,12 +72,42 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
    "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "salutation", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Salutation", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Salutation", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
    "columns": 0, 
@@ -112,6 +142,36 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "gender", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Gender", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Gender", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "customer_type", 
    "fieldtype": "Select", 
    "hidden": 0, 
@@ -1137,7 +1197,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-05 13:58:19.258783", 
+ "modified": "2017-06-13 14:29:11.114613", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Customer", 
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index c0b3b84..3b9d675 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -9,8 +9,8 @@
 from frappe.utils import flt, cint, cstr
 from frappe.desk.reportview import build_match_conditions
 from erpnext.utilities.transaction_base import TransactionBase
-from frappe.geo.address_and_contact import load_address_and_contact, delete_contact_and_address
-from erpnext.accounts.party import validate_party_accounts, get_dashboard_info, get_timeline_data # keep this
+from erpnext.accounts.party import validate_party_accounts, get_dashboard_info # keep this
+from frappe.contacts.address_and_contact import load_address_and_contact, delete_contact_and_address
 
 class Customer(TransactionBase):
 	def get_feed(self):
@@ -88,11 +88,18 @@
 					address.append('links', dict(link_doctype='Customer', link_name=self.name))
 					address.save()
 
-			lead = frappe.db.get_value("Lead", self.lead_name, ["lead_name", "email_id", "phone", "mobile_no"], as_dict=True)
+			lead = frappe.db.get_value("Lead", self.lead_name, ["lead_name", "email_id", "phone", "mobile_no", "gender", "salutation"], as_dict=True)
+
+			lead.lead_name = lead.lead_name.split(" ")
+			lead.first_name = lead.lead_name[0]
+			lead.last_name = " ".join(lead.lead_name[1:])
 
 			# create contact from lead
 			contact = frappe.new_doc('Contact')
-			contact.first_name = lead.lead_name
+			contact.first_name = lead.first_name
+			contact.last_name = lead.last_name
+			contact.gender = lead.gender
+			contact.salutation = lead.salutation
 			contact.email_id = lead.email_id
 			contact.phone = lead.phone
 			contact.mobile_no = lead.mobile_no
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 9aff74a..ab35574 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -16,9 +16,13 @@
 // TODO commonify this code
 erpnext.selling.InstallationNote = frappe.ui.form.Controller.extend({
 	onload: function() {
-		if(!this.frm.doc.status) set_multiple(dt,dn,{ status:'Draft'});
-		if(this.frm.doc.__islocal) set_multiple(this.frm.doc.doctype, this.frm.doc.name,
-				{inst_date: get_today()});
+		if(!this.frm.doc.status) {
+			set_multiple(this.frm.doc.doctype, this.frm.doc.name, { status:'Draft'});
+		}
+		if(this.frm.doc.__islocal) {
+			set_multiple(this.frm.doc.doctype, this.frm.doc.name,
+				{inst_date: frappe.datetime.get_today()});
+		}
 
 		this.setup_queries();
 	},
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index aa66193..2c8b022 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -70,6 +73,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -97,10 +101,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -132,6 +137,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -192,6 +199,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -222,6 +230,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -250,6 +259,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -278,6 +288,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -307,6 +318,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -337,6 +349,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -368,6 +381,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -399,6 +413,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -428,6 +443,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -458,6 +474,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -488,6 +505,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -520,6 +538,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -552,6 +571,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -583,6 +603,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -613,6 +634,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -643,6 +665,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -674,18 +697,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-wrench", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:23:58.072172", 
+ "modified": "2017-06-13 14:29:12.141921", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Installation Note", 
diff --git a/erpnext/selling/doctype/quotation/quotation.js b/erpnext/selling/doctype/quotation/quotation.js
index 940daaa..64af35d 100644
--- a/erpnext/selling/doctype/quotation/quotation.js
+++ b/erpnext/selling/doctype/quotation/quotation.js
@@ -94,7 +94,7 @@
 
 	validate_company_and_party: function(party_field) {
 		if(!this.frm.doc.quotation_to) {
-			msgprint(__("Please select a value for {0} quotation_to {1}", [this.frm.doc.doctype, this.frm.doc.name]));
+			frappe.msgprint(__("Please select a value for {0} quotation_to {1}", [this.frm.doc.doctype, this.frm.doc.name]));
 			return false;
 		} else if (this.frm.doc.quotation_to == "Lead") {
 			return true;
@@ -149,7 +149,7 @@
 	});
 
 	dialog.fields_dict.update.$input.click(function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		return cur_frm.call({
 			method: "declare_order_lost",
@@ -157,7 +157,7 @@
 			args: args.reason,
 			callback: function(r) {
 				if(r.exc) {
-					msgprint(__("There were errors."));
+					frappe.msgprint(__("There were errors."));
 					return;
 				}
 				dialog.hide();
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 2f2a7ed..b1ddb0a 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -102,7 +102,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -2542,7 +2542,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2017-05-15 13:05:39.469590", 
+ "modified": "2017-06-13 14:29:18.553722", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation", 
diff --git a/erpnext/selling/doctype/sales_order/sales_order.js b/erpnext/selling/doctype/sales_order/sales_order.js
index 7850119..2ba2aba 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.js
+++ b/erpnext/selling/doctype/sales_order/sales_order.js
@@ -10,7 +10,8 @@
 			'Delivery Note': 'Delivery',
 			'Sales Invoice': 'Invoice',
 			'Material Request': 'Material Request',
-			'Purchase Order': 'Purchase Order'
+			'Purchase Order': 'Purchase Order',
+			'Project': 'Project'
 		}
 		frm.add_fetch('customer', 'tax_id', 'tax_id');
 	},
@@ -69,9 +70,9 @@
 				if (this.frm.has_perm("submit")) {
 					// close
 					if(flt(doc.per_delivered, 2) < 100 || flt(doc.per_billed) < 100) {
-							this.frm.add_custom_button(__('Close'),
-								function() { me.close_sales_order() }, __("Status"))
-						}
+						this.frm.add_custom_button(__('Close'),
+							function() { me.close_sales_order() }, __("Status"))
+					}
 				}
 
 				// delivery note
@@ -93,8 +94,8 @@
 				// material request
 				if(!doc.order_type || ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1
 					&& flt(doc.per_delivered, 2) < 100) {
-						this.frm.add_custom_button(__('Material Request'),
-							function() { me.make_material_request() }, __("Make"));
+					this.frm.add_custom_button(__('Material Request'),
+						function() { me.make_material_request() }, __("Make"));
 				}
 
 				// make purchase order
@@ -120,6 +121,12 @@
 						function() { me.make_maintenance_schedule() }, __("Make"));
 				}
 
+				// project
+				if(flt(doc.per_delivered, 2) < 100 && ["Sales", "Shopping Cart"].indexOf(doc.order_type)!==-1 && allow_delivery) {
+						this.frm.add_custom_button(__('Project'),
+							function() { me.make_project() }, __("Make"));
+				}
+
 			} else {
 				if (this.frm.has_perm("submit")) {
 					// un-close
@@ -196,7 +203,7 @@
 						title: __('Select Items to Manufacture'),
 						fields: fields,
 						primary_action: function() {
-							data = d.get_values();
+							var data = d.get_values();
 							me.frm.call({
 								method: 'make_production_orders',
 								args: {
@@ -264,6 +271,13 @@
 		})
 	},
 
+	make_project: function() {
+		frappe.model.open_mapped_doc({
+			method: "erpnext.selling.doctype.sales_order.sales_order.make_project",
+			frm: this.frm
+		})
+	},
+
 	make_maintenance_visit: function() {
 		frappe.model.open_mapped_doc({
 			method: "erpnext.selling.doctype.sales_order.sales_order.make_maintenance_visit",
@@ -288,7 +302,7 @@
 		});
 
 		dialog.fields_dict.make_purchase_order.$input.click(function() {
-			args = dialog.get_values();
+			var args = dialog.get_values();
 			if(!args) return;
 			dialog.hide();
 			return frappe.call({
@@ -314,12 +328,13 @@
 	},
 	update_status: function(label, status){
 		var doc = this.frm.doc;
+		var me = this;
 		frappe.ui.form.is_saving = true;
 		frappe.call({
 			method: "erpnext.selling.doctype.sales_order.sales_order.update_status",
 			args: {status: status, name: doc.name},
 			callback: function(r){
-				this.frm.reload_doc();
+				me.frm.reload_doc();
 			},
 			always: function() {
 				frappe.ui.form.is_saving = false;
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 7621f4c..7c995f2 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -14,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +74,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -102,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -129,10 +133,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -164,6 +169,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -192,6 +198,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -225,6 +232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -254,6 +262,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -286,6 +295,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -319,6 +329,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -351,6 +362,7 @@
    "width": "160px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -383,7 +395,8 @@
    "width": "160px"
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -416,7 +429,8 @@
    "width": "100px"
   }, 
   {
-   "allow_on_submit": 0, 
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
@@ -449,6 +463,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -479,6 +494,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -510,6 +526,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -539,6 +556,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -567,6 +585,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -596,6 +615,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -624,6 +644,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -652,6 +673,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -681,6 +703,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -709,6 +732,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -738,6 +762,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -766,6 +791,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -796,6 +822,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -826,6 +853,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -855,6 +883,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -887,6 +916,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -920,6 +950,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -948,6 +979,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -980,6 +1012,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1009,6 +1042,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1039,6 +1073,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1067,6 +1102,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1097,6 +1133,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1128,6 +1165,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1155,6 +1193,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1182,6 +1221,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1212,6 +1252,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1244,6 +1285,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1271,6 +1313,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1301,6 +1344,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1330,6 +1374,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1360,6 +1405,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1391,6 +1437,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1418,6 +1465,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1448,6 +1496,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1475,6 +1524,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1506,6 +1556,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1535,6 +1586,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1562,6 +1614,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1594,6 +1647,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1622,6 +1676,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1651,6 +1706,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1681,6 +1737,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1712,6 +1769,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1742,6 +1800,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1769,6 +1828,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1799,6 +1859,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1829,6 +1890,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1859,6 +1921,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1891,6 +1954,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1923,6 +1987,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1955,6 +2020,7 @@
    "width": "200px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1984,6 +2050,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2016,6 +2083,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -2048,6 +2116,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2079,6 +2148,7 @@
    "width": "200px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2108,6 +2178,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2140,6 +2211,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2171,6 +2243,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2202,6 +2275,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2233,6 +2307,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2263,6 +2338,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2294,6 +2370,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2326,6 +2403,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2356,6 +2434,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2384,6 +2463,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2415,6 +2495,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2447,6 +2528,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2476,6 +2558,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2505,6 +2588,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2536,6 +2620,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2565,6 +2650,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2596,6 +2682,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2625,6 +2712,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2655,6 +2743,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2688,6 +2777,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2717,6 +2807,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2750,6 +2841,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2777,6 +2869,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2810,6 +2903,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2839,6 +2933,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -2870,6 +2965,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2902,6 +2998,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2930,6 +3027,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2961,6 +3059,7 @@
    "width": "100px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -2992,6 +3091,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -3021,6 +3121,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3052,6 +3153,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -3083,6 +3185,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3112,6 +3215,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3142,6 +3246,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3173,6 +3278,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3204,6 +3310,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3234,6 +3341,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3264,6 +3372,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3294,6 +3403,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3325,6 +3435,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3356,6 +3467,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3387,6 +3499,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3415,6 +3528,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3445,6 +3559,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3475,6 +3590,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -3516,7 +3632,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-18 20:02:54.895559", 
+ "modified": "2017-06-19 13:06:31.736384", 
  "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 c55dc9f..ccaa07c 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -32,7 +32,7 @@
 		self.validate_mandatory()
 		self.validate_proj_cust()
 		self.validate_po()
-		self.validate_uom_is_integer("stock_uom", "qty")
+		self.validate_uom_is_integer("stock_uom", "stock_qty")
 		self.validate_uom_is_integer("uom", "qty")
 		self.validate_for_items()
 		self.validate_warehouse()
@@ -263,6 +263,7 @@
 		pass
 
 	def before_update_after_submit(self):
+		self.validate_po()
 		self.validate_drop_ship()
 		self.validate_supplier_after_submit()
 
@@ -408,6 +409,34 @@
 	return doc
 
 @frappe.whitelist()
+def make_project(source_name, target_doc=None):
+	def postprocess(source, doc):
+		doc.project_type = "External"
+		doc.project_name = source.name
+
+	doc = get_mapped_doc("Sales Order", source_name, {
+		"Sales Order": {
+			"doctype": "Project",
+			"validation": {
+				"docstatus": ["=", 1]
+			},
+			"field_map":{
+				"name" : "sales_order",
+				"delivery_date" : "expected_end_date",
+				"base_grand_total" : "estimated_costing",
+			}
+		},
+		"Sales Order Item": {
+			"doctype": "Project Task",
+			"field_map": {
+				"description": "title",
+			},
+		}
+	}, target_doc, postprocess)
+
+	return doc
+
+@frappe.whitelist()
 def make_delivery_note(source_name, target_doc=None):
 	def set_missing_values(source, target):
 		if source.po_no:
@@ -579,7 +608,7 @@
 	from frappe.desk.calendar import get_event_conditions
 	conditions = get_event_conditions("Sales Order", filters)
 
-	data = frappe.db.sql("""select name, customer_name, delivery_status, billing_status, delivery_date
+	data = frappe.db.sql("""select name, customer_name, status, 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)
diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js
index 7a38f90..cb412cf 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js
@@ -33,7 +33,7 @@
 	get_events_method: "erpnext.selling.doctype.sales_order.sales_order.get_events",
 	get_css_class: function(data) {
 		if(data.status=="Closed") {
-			return "";
+			return "success";
 		} if(data.delivery_status=="Not Delivered") {
 			return "danger";
 		} else if(data.delivery_status=="Partly Delivered") {
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js
index 53b2818..d1ac6d9 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_list.js
+++ b/erpnext/selling/doctype/sales_order/sales_order_list.js
@@ -2,10 +2,10 @@
 	add_fields: ["base_grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed",
 		"status", "order_type"],
 	get_indicator: function(doc) {
-        if(doc.status==="Closed"){
-        	return [__("Closed"), "green", "status,=,Closed"];
+		if(doc.status==="Closed"){
+			return [__("Closed"), "green", "status,=,Closed"];
 
-        } else if (doc.order_type !== "Maintenance"
+		} else if (doc.order_type !== "Maintenance"
 			&& flt(doc.per_delivered, 2) < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) {
 			// to bill & overdue
 			return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Closed"];
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.js b/erpnext/selling/page/sales_analytics/sales_analytics.js
index bb47f98..5e603ba 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.js
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.js
@@ -18,7 +18,6 @@
 	init: function(wrapper) {
 		this._super({
 			title: __("Sales Analytics"),
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Item", "Item Group", "Customer", "Customer Group", "Company", "Territory",
@@ -194,13 +193,13 @@
 	},
 	prepare_balances: function() {
 		var me = this;
-		var from_date = dateutil.str_to_obj(this.from_date);
-		var to_date = dateutil.str_to_obj(this.to_date);
+		var from_date = frappe.datetime.str_to_obj(this.from_date);
+		var to_date = frappe.datetime.str_to_obj(this.to_date);
 		var is_val = this.value_or_qty == 'Value';
 
 		$.each(this.tl[this.based_on], function(i, tl) {
 			if (me.is_default('company') ? true : tl.company === me.company) {
-				var posting_date = dateutil.str_to_obj(tl.posting_date);
+				var posting_date = frappe.datetime.str_to_obj(tl.posting_date);
 				if (posting_date >= from_date && posting_date <= to_date) {
 					var item = me.item_by_name[tl[me.tree_grid.item_key]] ||
 						me.item_by_name['Not Set'];
@@ -217,7 +216,7 @@
 		$.each(this.data, function(i, item) {
 			var parent = me.parent_map[item.name];
 			while(parent) {
-				parent_group = me.item_by_name[parent];
+				var parent_group = me.item_by_name[parent];
 
 				$.each(me.columns, function(c, col) {
 					if (col.formatter == me.currency_formatter) {
diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.js b/erpnext/selling/report/quotation_trends/quotation_trends.js
index 294aea0..f00ca27 100644
--- a/erpnext/selling/report/quotation_trends/quotation_trends.js
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.js
@@ -3,7 +3,7 @@
 
 frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
 	frappe.query_reports["Quotation Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_sales_trends_filters()
 	}
 });
 
diff --git a/erpnext/selling/report/sales_order_trends/sales_order_trends.js b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
index 863afb8..ea320d6 100644
--- a/erpnext/selling/report/sales_order_trends/sales_order_trends.js
+++ b/erpnext/selling/report/sales_order_trends/sales_order_trends.js
@@ -3,6 +3,6 @@
 
 frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
 	frappe.query_reports["Sales Order Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_sales_trends_filters()
 	}
 });
\ No newline at end of file
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 f1cb3b7..8987a74 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
@@ -8,7 +8,7 @@
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: sys_defaults.fiscal_year
+			default: frappe.sys_defaults.fiscal_year
 		},
 		{
 			fieldname: "period",
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 9258730..90244ce 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
@@ -26,7 +26,7 @@
 			fieldname:"to_date",
 			label: __("To Date"),
 			fieldtype: "Date",
-			default: get_today()
+			default: frappe.datetime.get_today()
 		},
 		{
 			fieldname:"company",
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 7631fcb..55a13d9 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
@@ -8,7 +8,7 @@
 			label: __("Fiscal Year"),
 			fieldtype: "Link",
 			options: "Fiscal Year",
-			default: sys_defaults.fiscal_year
+			default: frappe.sys_defaults.fiscal_year
 		},
 		{
 			fieldname: "period",
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 6233f05..43be392 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -152,7 +152,7 @@
 					__(frappe.meta.get_label(this.frm.doc.doctype, "total_commission",
 						this.frm.doc.name)) + " > " +
 					__(frappe.meta.get_label(this.frm.doc.doctype, "base_net_total", this.frm.doc.name)));
-				msgprint(msg);
+				frappe.msgprint(msg);
 				throw msg;
 			}
 
@@ -191,7 +191,7 @@
 					serial_no: item.serial_no || ""
 				},
 				callback:function(r){
-					if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
+					if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
 						me.batch_no(doc, cdt, cdn);
 					}
 				}
@@ -213,7 +213,7 @@
 			if(this.frm.doc.commission_rate > 100) {
 				var msg = __(frappe.meta.get_label(this.frm.doc.doctype, "commission_rate", this.frm.doc.name)) +
 					" " + __("cannot be greater than 100");
-				msgprint(msg);
+				frappe.msgprint(msg);
 				throw msg;
 			}
 
@@ -225,13 +225,13 @@
 	calculate_contribution: function() {
 		var me = this;
 		$.each(this.frm.doc.doctype.sales_team || [], function(i, sales_person) {
-				frappe.model.round_floats_in(sales_person);
-				if(sales_person.allocated_percentage) {
-					sales_person.allocated_amount = flt(
-						me.frm.doc.base_net_total * sales_person.allocated_percentage / 100.0,
-						precision("allocated_amount", sales_person));
-				}
-			});
+			frappe.model.round_floats_in(sales_person);
+			if(sales_person.allocated_percentage) {
+				sales_person.allocated_amount = flt(
+					me.frm.doc.base_net_total * sales_person.allocated_percentage / 100.0,
+					precision("allocated_amount", sales_person));
+			}
+		});
 	},
 
 	shipping_rule: function() {
@@ -254,16 +254,16 @@
 		var item = frappe.get_doc(cdt, cdn);
 
 		if(item.warehouse && item.item_code && item.batch_no) {
-		    return this.frm.call({
-		        method: "erpnext.stock.get_item_details.get_batch_qty",
-		        child: item,
-		        args: {
-		           "batch_no": item.batch_no,
-		           "warehouse": item.warehouse,
-		           "item_code": item.item_code
-		        },
-		         "fieldname": "actual_batch_qty"
-		    });
+			return this.frm.call({
+				method: "erpnext.stock.get_item_details.get_batch_qty",
+				child: item,
+				args: {
+					"batch_no": item.batch_no,
+					"warehouse": item.warehouse,
+					"item_code": item.item_code
+				},
+				"fieldname": "actual_batch_qty"
+			});
 		}
 	},
 
@@ -277,15 +277,15 @@
 		if ((doc.packed_items || []).length) {
 			$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(true);
 
-			if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
-				help_msg = "<div class='alert alert-warning'>" +
+			if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
+				var help_msg = "<div class='alert alert-warning'>" +
 					__("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.")+
 				"</div>";
 				frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = help_msg;
 			}
 		} else {
 			$(cur_frm.fields_dict.packing_list.row.wrapper).toggle(false);
-			if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
+			if (in_list(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
 				frappe.meta.get_docfield(doc.doctype, 'product_bundle_help', doc.name).options = '';
 			}
 		}
@@ -311,7 +311,7 @@
 
 	margin_rate_or_amount: function(doc, cdt, cdn) {
 		// calculated the revised total margin and rate on margin rate changes
-		item = locals[cdt][cdn];
+		var item = locals[cdt][cdn];
 		this.apply_pricing_rule_on_item(item)
 		this.calculate_taxes_and_totals();
 		cur_frm.refresh_fields();
@@ -319,7 +319,7 @@
 
 	margin_type: function(doc, cdt, cdn){
 		// calculate the revised total margin and rate on margin type changes
-		item = locals[cdt][cdn];
+		var item = locals[cdt][cdn];
 		if(!item.margin_type) {
 			frappe.model.set_value(cdt, cdn, "margin_rate_or_amount", 0);
 		} else {
@@ -341,7 +341,7 @@
 						$.each(frm.doc["items"] || [], function(i, row) {
 							if(r.message) {
 								frappe.model.set_value(row.doctype, row.name, "cost_center", r.message);
-								msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
+								frappe.msgprint(__("Cost Center For Item with Item Code '"+row.item_name+"' has been Changed to "+ r.message));
 							}
 						})
 					}
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index ca60b11..0c55ec4 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -15,7 +15,7 @@
 
 		frm.toggle_display('address_html', !frm.doc.__islocal);
 		if(!frm.doc.__islocal) {
-			frappe.geo.render_address_and_contact(frm);
+			frappe.contacts.render_address_and_contact(frm);
 
 			frm.toggle_enable("default_currency", (frm.doc.__onload &&
 				!frm.doc.__onload.transactions_exist));
@@ -47,31 +47,32 @@
 				fieldname: "company_name",
 				label: __("Please re-type company name to confirm"),
 				reqd: 1,
-				description: __("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.")},
-					function(data) {
-						if(data.company_name !== frm.doc.name) {
-							frappe.msgprint("Company name not same");
-							return;
-						}
-						frappe.call({
-							method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
-							args: {
-								company_name: data.company_name
-							},
-							freeze: true,
-							callback: function(r, rt) {
-								if(!r.exc)
-									frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
-							},
-							onerror: function() {
-								frappe.msgprint(__("Wrong Password"));
-							}
-						});
-					}, __("Delete all the Transactions for this Company"), __("Delete")
-				);
-				d.get_primary_btn().addClass("btn-danger");
-			}
-		);
+				description: __("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.")
+			},
+			function(data) {
+				if(data.company_name !== frm.doc.name) {
+					frappe.msgprint("Company name not same");
+					return;
+				}
+				frappe.call({
+					method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
+					args: {
+						company_name: data.company_name
+					},
+					freeze: true,
+					callback: function(r, rt) {
+						if(!r.exc)
+							frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
+					},
+					onerror: function() {
+						frappe.msgprint(__("Wrong Password"));
+					}
+				});
+			},
+			__("Delete all the Transactions for this Company"), __("Delete")
+			);
+			d.get_primary_btn().addClass("btn-danger");
+		});
 	}
 });
 
@@ -106,7 +107,7 @@
 	});
 
 	dialog.fields_dict.update.$input.click(function() {
-		args = dialog.get_values();
+		var args = dialog.get_values();
 		if(!args) return;
 		return frappe.call({
 			method: "erpnext.setup.doctype.company.company.replace_abbr",
@@ -117,7 +118,7 @@
 			},
 			callback: function(r) {
 				if(r.exc) {
-					msgprint(__("There were errors."));
+					frappe.msgprint(__("There were errors."));
 					return;
 				} else {
 					cur_frm.set_value("abbr", args.new_abbr);
@@ -147,6 +148,7 @@
 			{"root_type": "Asset", "account_type": "Accumulated Depreciation"}],
 		["depreciation_expense_account", {"root_type": "Expense", "account_type": "Depreciation"}],
 		["disposal_account", {"report_type": "Profit and Loss"}],
+		["default_inventory_account", {"account_type": "Stock"}],
 		["cost_center", {}],
 		["round_off_cost_center", {}],
 		["depreciation_cost_center", {}]
@@ -154,7 +156,7 @@
 		erpnext.company.set_custom_query(frm, v);
 	});
 
-	if (sys_defaults.auto_accounting_for_stock) {
+	if (frappe.sys_defaults.auto_accounting_for_stock) {
 		$.each([
 			["stock_adjustment_account", 
 				{"root_type": "Expense", "account_type": "Stock Adjustment"}],
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index c5e8c5c..cd11057 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1128,20 +1128,21 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "stock_received_but_not_billed", 
+   "fieldname": "default_inventory_account", 
    "fieldtype": "Link", 
    "hidden": 0, 
-   "ignore_user_permissions": 1, 
+   "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Stock Received But Not Billed", 
+   "label": "Default Inventory Account", 
    "length": 0, 
-   "no_copy": 1, 
+   "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -1217,6 +1218,35 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
+   "fieldname": "stock_received_but_not_billed", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 1, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock Received But Not Billed", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
    "fieldname": "expenses_included_in_valuation", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -1747,7 +1777,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-09 11:06:33.629948", 
+ "modified": "2017-06-14 11:06:33.629948", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Company", 
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 39ad556..0ddadf0 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -10,7 +10,7 @@
 
 
 from frappe.model.document import Document
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class Company(Document):
 	def onload(self):
@@ -50,9 +50,11 @@
 			frappe.throw(_("Abbreviation already used for another company"))
 
 	def validate_default_accounts(self):
-		for field in ["default_bank_account", "default_cash_account", "default_receivable_account", "default_payable_account",
-			"default_expense_account", "default_income_account", "stock_received_but_not_billed",
-			"stock_adjustment_account", "expenses_included_in_valuation", "default_payroll_payable_account"]:
+		for field in ["default_bank_account", "default_cash_account", 
+			"default_receivable_account", "default_payable_account", 
+			"default_expense_account", "default_income_account", 
+			"stock_received_but_not_billed", "stock_adjustment_account", 
+			"expenses_included_in_valuation", "default_payroll_payable_account"]:
 				if self.get(field):
 					for_company = frappe.db.get_value("Account", self.get(field), "company")
 					if for_company != self.name:
@@ -111,8 +113,7 @@
 						"is_group": wh_detail["is_group"],
 						"company": self.name,
 						"parent_warehouse": "{0} - {1}".format(_("All Warehouses"), self.abbr) \
-							if not wh_detail["is_group"] else "",
-						"create_account_under": stock_group
+							if not wh_detail["is_group"] else ""
 					})
 					warehouse.flags.ignore_permissions = True
 					warehouse.insert()
@@ -147,6 +148,7 @@
 
 		if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")):
 			self._set_default_account("stock_received_but_not_billed", "Stock Received But Not Billed")
+			self._set_default_account("default_inventory_account", "Stock")
 			self._set_default_account("stock_adjustment_account", "Stock Adjustment")
 			self._set_default_account("expenses_included_in_valuation", "Expenses Included In Valuation")
 			self._set_default_account("default_expense_account", "Cost of Goods Sold")
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index 4b864c4..7f23bf1 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -74,7 +74,7 @@
 							"company": template,
 							"account_type": account_type
 						}
-						if account_type in ["Bank", "Cash", "Stock"]:
+						if account_type in ["Bank", "Cash"]:
 							filters["is_group"] = 1
 
 						self.assertTrue(frappe.get_all("Account", filters))
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
index 181f072..d4c9df3 100644
--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -6,15 +6,42 @@
 import frappe, unittest
 test_records = frappe.get_test_records('Currency Exchange')
 
+
+def save_new_records(test_records):
+	for record in test_records:
+		kwargs = dict(
+			doctype=record.get("doctype"),
+			docname=record.get("date") + '-' + record.get("from_currency") + '-' + record.get("to_currency"),
+			fieldname="exchange_rate",
+			value=record.get("exchange_rate"),
+		)
+
+		try:
+			frappe.set_value(**kwargs)
+		except frappe.DoesNotExistError:
+			curr_exchange = frappe.new_doc(record.get("doctype"))
+			curr_exchange.date = record["date"]
+			curr_exchange.from_currency = record["from_currency"]
+			curr_exchange.to_currency = record["to_currency"]
+			curr_exchange.exchange_rate = record["exchange_rate"]
+			curr_exchange.insert()
+
+
 class TestCurrencyExchange(unittest.TestCase):
 	def test_exchnage_rate(self):
 		from erpnext.setup.utils import get_exchange_rate
-		
-		# Exchange rate as on 15th Jan, 2016, should be fetched from Currency Exchange record
-		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
+
+		save_new_records(test_records)
+
+		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-01")
 		self.assertEqual(exchange_rate, 60.0)
+
+		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
+		self.assertEqual(exchange_rate, 65.1)
+
+		exchange_rate = get_exchange_rate("USD", "INR", "2016-01-30")
+		self.assertEqual(exchange_rate, 62.9)
 		
 		# Exchange rate as on 15th Dec, 2015, should be fetched from fixer.io
 		exchange_rate = get_exchange_rate("USD", "INR", "2015-12-15")
-		self.assertFalse(exchange_rate==60)
-		
\ No newline at end of file
+		self.assertFalse(exchange_rate==60)
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/test_records.json b/erpnext/setup/doctype/currency_exchange/test_records.json
index 23edd8a..d2f658b 100644
--- a/erpnext/setup/doctype/currency_exchange/test_records.json
+++ b/erpnext/setup/doctype/currency_exchange/test_records.json
@@ -19,5 +19,19 @@
   "exchange_rate": 0.0167, 
   "from_currency": "INR", 
   "to_currency": "USD"
+ },
+ {
+  "doctype": "Currency Exchange",
+  "date": "2016-01-10",
+  "exchange_rate": 65.1,
+  "from_currency": "USD",
+  "to_currency": "INR"
+ },
+  {
+  "doctype": "Currency Exchange",
+  "date": "2016-01-30",
+  "exchange_rate": 62.9,
+  "from_currency": "USD",
+  "to_currency": "INR"
  }
 ]
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
index d822a75..fcd0b0e 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.js
+++ b/erpnext/setup/doctype/email_digest/email_digest.js
@@ -23,21 +23,21 @@
 		});
 	}, "fa fa-eye-open", "btn-default");
 
-	if(user==="Administrator") {
+	if(frappe.session.user==="Administrator") {
 		cur_frm.add_custom_button(__('Send Now'), function() {
 			doc = locals[dt][dn];
 			if(doc.__unsaved != 1) {
 				return $c_obj(doc, 'send', '', function(r, rt) {
 					if(r.exc) {
-						msgprint(err_msg);
+						frappe.msgprint(err_msg);
 						console.log(r.exc);
 					} else {
 						//console.log(arguments);
-						msgprint(__('Message Sent'));
+						frappe.msgprint(__('Message Sent'));
 					}
 				});
 			} else {
-				msgprint(save_msg);
+				frappe.msgprint(save_msg);
 			}
 		}, "fa fa-envelope", "btn-default");
 	}
@@ -47,7 +47,7 @@
 	// Get user list
 	return $c_obj(doc, 'get_users', '', function(r, rt) {
 		if(r.exc) {
-			msgprint(r.exc);
+			frappe.msgprint(r.exc);
 		} else {
 			// Open a dialog and display checkboxes against email addresses
 			doc = locals[dt][dn];
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index b66fd4d..c85a541 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -58,7 +58,7 @@
 				if msg_for_this_receipient:
 					frappe.sendmail(
 						recipients=user_id,
-						subject="{frequency} Digest".format(frequency=self.frequency),
+						subject=_("{frequency} Digest").format(frequency=self.frequency),
 						message=msg_for_this_receipient,
 						reference_doctype = self.doctype,
 						reference_name = self.name,
@@ -77,7 +77,7 @@
 		self.set_title(context)
 		self.set_style(context)
 		self.set_accounting_cards(context)
-		
+
 		if self.get("calendar_events"):
 			context.events, context.event_count = self.get_calendar_events()
 		if self.get("todo_list"):
@@ -146,7 +146,7 @@
 		from frappe.desk.doctype.event.event import get_events
 		events = get_events(self.future_from_date.strftime("%Y-%m-%d"),
 			self.future_to_date.strftime("%Y-%m-%d")) or []
-		
+
 		event_count = 0
 		for i, e in enumerate(events):
 			e.starts_on_label = format_time(e.starts_on)
@@ -171,13 +171,13 @@
 			t.link = get_url_to_form("ToDo", t.name)
 
 		return todo_list
-	
+
 	def get_todo_count(self, user_id=None):
 		"""Get count of Todo"""
 		if not user_id:
 			user_id = frappe.session.user
 
-		return frappe.db.sql("""select count(*) from `tabToDo` 
+		return frappe.db.sql("""select count(*) from `tabToDo`
 			where status='Open' and (owner=%s or assigned_by=%s)""",
 			(user_id, user_id))[0][0]
 
@@ -185,7 +185,7 @@
 		"""Get issue list"""
 		if not user_id:
 			user_id = frappe.session.user
-		
+
 		meta = frappe.get_meta("Issue")
 		role_permissions = frappe.permissions.get_role_permissions(meta, user_id)
 		if not role_permissions.get("read"):
@@ -199,7 +199,7 @@
 			t.link = get_url_to_form("Issue", t.name)
 
 		return issue_list
-	
+
 	def get_issue_count(self):
 		"""Get count of Issue"""
 		return frappe.db.sql("""select count(*) from `tabIssue`
@@ -267,7 +267,7 @@
 							card.delivered = "% Delivered " + str(card.delivered)
 						else:
 							card.delivered = "% Received " + str(card.delivered)
-						
+
 					if key =="credit_balance":
 						card.value = card.value *-1
 					card.value = self.fmt_money(card.value,False if key in ("bank_balance", "credit_balance") else True)
@@ -313,7 +313,7 @@
 	def get_bank_balance(self):
 		# account is of type "Bank" and root_type is Asset
 		return self.get_type_balance('bank_balance', 'Bank', root_type='Asset')
-	
+
 	def get_credit_balance(self):
 		# account is of type "Bank" and root_type is Liability
 		return self.get_type_balance('credit_balance', 'Bank', root_type='Liability')
@@ -351,7 +351,7 @@
 		return balance, past_balance, count
 
 	def get_type_balance(self, fieldname, account_type, root_type=None):
-		
+
 		if root_type:
 			accounts = [d.name for d in \
 				frappe.db.get_all("Account", filters={"account_type": account_type,
@@ -364,10 +364,10 @@
 		balance = prev_balance = 0.0
 		count = 0
 		for account in accounts:
-			balance += get_balance_on(account, date=self.future_to_date)
+			balance += get_balance_on(account, date=self.future_to_date, in_account_currency=False)
 			count += get_count_on(account, fieldname, date=self.future_to_date)
-			prev_balance += get_balance_on(account, date=self.past_to_date)
-		
+			prev_balance += get_balance_on(account, date=self.past_to_date, in_account_currency=False)
+
 		if fieldname in ("bank_balance","credit_balance"):
 			return {
 				'label': self.meta.get_label(fieldname),
@@ -380,7 +380,7 @@
 				'last_value': prev_balance,
 				'count': count
 			}
-	
+
 
 	def get_root_type_accounts(self, root_type):
 		if not root_type in self._accounts:
@@ -390,13 +390,13 @@
 		return self._accounts[root_type]
 
 	def get_purchase_order(self):
-		
+
 		return self.get_summary_of_doc("Purchase Order","purchase_order")
 
 	def get_sales_order(self):
 
 		return self.get_summary_of_doc("Sales Order","sales_order")
-    
+
 	def get_pending_purchase_orders(self):
 
 		return self.get_summary_of_pending("Purchase Order","pending_purchase_orders","per_received")
@@ -412,15 +412,15 @@
 	def get_pending_quotations(self):
 
 		return self.get_summary_of_pending_quotations("pending_quotations")
-	
+
 	def get_summary_of_pending(self, doc_type, fieldname, getfield):
 
-		value, count, billed_value, delivered_value = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*), 
+		value, count, billed_value, delivered_value = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*),
 			ifnull(sum(grand_total*per_billed/100),0), ifnull(sum(grand_total*{0}/100),0)  from `tab{1}`
 			where (transaction_date <= %(to_date)s)
 			and status not in ('Closed','Cancelled', 'Completed') """.format(getfield, doc_type),
 			{"to_date": self.future_to_date})[0]
-		
+
 		return {
 			"label": self.meta.get_label(fieldname),
             		"value": value,
@@ -428,7 +428,7 @@
 			"delivered_value": delivered_value,
             		"count": count
 		}
-	
+
 	def get_summary_of_pending_quotations(self, fieldname):
 
 		value, count = frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tabQuotation`
@@ -438,7 +438,7 @@
 		last_value = frappe.db.sql("""select ifnull(sum(grand_total),0) from `tabQuotation`
 			where (transaction_date <= %(to_date)s)
 			and status not in ('Ordered','Cancelled', 'Lost') """,{"to_date": self.past_to_date})[0][0]
-		
+
 		return {
 			"label": self.meta.get_label(fieldname),
             		"value": value,
@@ -447,9 +447,9 @@
 		}
 
 	def get_summary_of_doc(self, doc_type, fieldname):
-		
+
 		value = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0]
-		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[1] 
+		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[1]
 
 		last_value =self.get_total_on(doc_type, self.past_from_date, self.past_to_date)[0]
 
@@ -459,9 +459,9 @@
             		"last_value": last_value,
 			"count": count
 		}
-	
+
 	def get_total_on(self, doc_type, from_date, to_date):
-		
+
 		return frappe.db.sql("""select ifnull(sum(grand_total),0), count(*) from `tab{0}`
 			where (transaction_date between %(from_date)s and %(to_date)s) and status not in ('Cancelled')""".format(doc_type),
 			{"from_date": from_date, "to_date": to_date})[0]
diff --git a/erpnext/setup/doctype/email_digest/templates/default.html b/erpnext/setup/doctype/email_digest/templates/default.html
index 78acbd9..5a657d2 100644
--- a/erpnext/setup/doctype/email_digest/templates/default.html
+++ b/erpnext/setup/doctype/email_digest/templates/default.html
@@ -1,6 +1,6 @@
 {% macro show_card(card) %}
 <div style="width: 50%; float:left; min-height: 80px; padding-top: 20px;">
-    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ card.label }}
+    <h6 style="color: {{ text_muted }}; font-size: 12px; margin-bottom: 0px; margin-top: 0px;">{{ _(card.label) }}
     {% if card.count %}
     <span class="badge">({{ card.count }})</span>
     {% endif %}</h6>
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.js b/erpnext/setup/doctype/global_defaults/global_defaults.js
index 1dd456f..a78461d 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.js
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.js
@@ -4,7 +4,7 @@
 $.extend(cur_frm.cscript, {
 	validate: function(doc, cdt, cdn) {
 		return $c_obj(doc, 'get_defaults', '', function(r, rt){
-			sys_defaults = r.message;
+			frappe.sys_defaults = r.message;
 		});
 	}
 });
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index 98404a4..9c2a400 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -37,10 +37,11 @@
 		if not self.route:
 			self.route = ''
 			if self.parent_item_group:
-				parent_route = frappe.get_doc('Item Group', self.parent_item_group).route
+				parent_item_group = frappe.get_doc('Item Group', self.parent_item_group)
 
-				if parent_route:
-					self.route = parent_route + '/'
+				# make parent route only if not root
+				if parent_item_group.parent_item_group and parent_item_group.route:
+					self.route = parent_item_group.route + '/'
 
 			self.route += self.scrub(self.item_group_name)
 
@@ -100,7 +101,7 @@
 				or name like %(search)s)"""
 		search = "%" + cstr(search) + "%"
 
-	query += """order by weightage desc, modified desc limit %s, %s""" % (start, limit)
+	query += """order by weightage desc, item_name, modified desc limit %s, %s""" % (start, limit)
 
 	data = frappe.db.sql(query, {"product_group": product_group,"search": search, "today": nowdate()}, as_dict=1)
 
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.js b/erpnext/setup/doctype/sales_partner/sales_partner.js
index 84cf749..b1c18d6 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.js
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.js
@@ -7,11 +7,11 @@
 
 		if(frm.doc.__islocal){
 			hide_field(['address_html', 'contact_html', 'address_contacts']);
-			frappe.geo.clear_address_and_contact(frm);
+			frappe.contacts.clear_address_and_contact(frm);
 		}
 		else{
 			unhide_field(['address_html', 'contact_html', 'address_contacts']);
-			frappe.geo.render_address_and_contact(frm);
+			frappe.contacts.render_address_and_contact(frm);
 		}
 	}
 });
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index 96211af..e6b26ee 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.py
@@ -5,7 +5,7 @@
 import frappe
 from frappe.utils import cstr, filter_strip_join
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.geo.address_and_contact import load_address_and_contact
+from frappe.contacts.address_and_contact import load_address_and_contact
 
 class SalesPartner(WebsiteGenerator):
 	website = frappe._dict(
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index 0069e88..f0aaf02 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -105,8 +105,9 @@
 
 	if data.allow_roles:
 		# remove all roles other than allowed roles
+		active_domains = frappe.get_active_domains()
 		data.allow_roles += ['Administrator', 'Guest', 'System Manager', 'All']
-		for role in frappe.get_all('Role'):
+		for role in frappe.get_all('Role', filters = {"restrict_to_domain": ("not in", active_domains)}):
 			if not (role.name in data.allow_roles):
 				remove_role(role.name)
 
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index ef276a0..43baf2f 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -13,6 +13,13 @@
 
 def install(country=None):
 	records = [
+		# domains
+		{ 'doctype': 'Domain', 'domain': _('Distribution')},
+		{ 'doctype': 'Domain', 'domain': _('Manufacturing')},
+		{ 'doctype': 'Domain', 'domain': _('Retail')},
+		{ 'doctype': 'Domain', 'domain': _('Services')},
+		{ 'doctype': 'Domain', 'domain': _('Education')},
+
 		# address template
 		{'doctype':"Address Template", "country": country},
 
@@ -35,7 +42,7 @@
 		{'doctype': 'Salary Component', 'salary_component': _('Basic'), 'description': _('Basic'), 'type': 'Earning'},
 		{'doctype': 'Salary Component', 'salary_component': _('Arrear'), 'description': _('Arrear'), 'type': 'Earning'},
 		{'doctype': 'Salary Component', 'salary_component': _('Leave Encashment'), 'description': _('Leave Encashment'), 'type': 'Earning'},
-		
+
 
 		# expense claim type
 		{'doctype': 'Expense Claim Type', 'name': _('Calls'), 'expense_type': _('Calls')},
@@ -197,7 +204,7 @@
 		# Assessment Group
 		{'doctype': 'Assessment Group', 'assessment_group_name': _('All Assessment Groups'),
 			'is_group': 1, 'parent_assessment_group': ''},
-	
+
 	]
 
 	from erpnext.setup.setup_wizard.industry_type import get_industry_types
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 940d35c..5daa4e4 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -198,6 +198,10 @@
 	hr_settings.emp_created_by = "Naming Series"
 	hr_settings.save()
 
+	domain_settings = frappe.get_doc("Domain Settings")
+	domain_settings.append('active_domains', dict(domain=args.domain))
+	domain_settings.save()
+
 def create_feed_and_todo():
 	"""update Activity feed and create todo for creation of item, customer, vendor"""
 	add_info_comment(**{
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 66e9f4c..5c7d825 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -6,7 +6,7 @@
 from frappe import throw, _
 import frappe.defaults
 from frappe.utils import cint, flt, get_fullname, cstr
-from frappe.geo.doctype.address.address import get_address_display
+from frappe.contacts.doctype.address.address import get_address_display
 from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import get_shopping_cart_settings
 from frappe.utils.nestedset import get_root_of
 from erpnext.accounts.utils import get_account_name
@@ -75,9 +75,15 @@
 def update_cart(item_code, qty, with_items=False):
 	quotation = _get_cart_quotation()
 
+	empty_card = False
 	qty = flt(qty)
 	if qty == 0:
-		quotation.set("items", quotation.get("items", {"item_code": ["!=", item_code]}))
+		quotation_items = quotation.get("items", {"item_code": ["!=", item_code]})
+		if quotation_items:
+			quotation.set("items", quotation_items)
+		else:
+			empty_card = True
+
 	else:
 		quotation_items = quotation.get("items", {"item_code": item_code})
 		if not quotation_items:
@@ -92,7 +98,11 @@
 	apply_cart_settings(quotation=quotation)
 
 	quotation.flags.ignore_permissions = True
-	quotation.save()
+	if not empty_card:
+		quotation.save()
+	else:
+		quotation.delete()
+		quotation = None
 
 	set_cart_count(quotation)
 
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index c5efdf8..ed782ad 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -13,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +42,67 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Attachments can be shown without enabling the shopping cart", 
+   "fieldname": "show_attachments", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Show Public Attachments", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,6 +130,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -97,6 +160,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -128,6 +192,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -157,6 +222,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -184,6 +250,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -214,6 +281,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -242,6 +310,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -272,6 +341,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -301,6 +371,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -333,6 +404,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -361,6 +433,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -402,7 +475,7 @@
  "issingle": 1, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-03-21 15:42:08.574497", 
+ "modified": "2017-05-19 09:31:38.078110", 
  "modified_by": "Administrator", 
  "module": "Shopping Cart", 
  "name": "Shopping Cart Settings", 
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index 4e24d2e..aa4f163 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -89,3 +89,7 @@
 	if not get_shopping_cart_settings().enabled:
 		frappe.throw(_("You need to enable Shopping Cart"), ShoppingCartSetupError)
 
+def show_attachments():
+        return get_shopping_cart_settings().show_attachments
+
+
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index eb5c5d9..e447415 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -1,4 +1,6 @@
 from __future__ import unicode_literals
+import frappe
+
 install_docs = [
 	{"doctype":"Role", "role_name":"Stock Manager", "name":"Stock Manager"},
 	{"doctype":"Role", "role_name":"Item Manager", "name":"Item Manager"},
@@ -8,3 +10,39 @@
 	{"doctype":"Item Group", "item_group_name":"Default", 
 		"parent_item_group":"All Item Groups", "is_group": 0},
 ]
+
+def get_warehouse_account_map():
+	if not frappe.flags.warehouse_account_map or frappe.flags.in_test:
+		warehouse_account = frappe._dict()
+
+		for d in frappe.get_all('Warehouse', filters = {"is_group": 0},
+			fields = ["name", "account", "parent_warehouse", "company"]):
+			if not d.account:
+				d.account = get_warehouse_account(d.name, d.company)
+
+			if d.account:
+				d.account_currency = frappe.db.get_value('Account', d.account, 'account_currency')
+				warehouse_account.setdefault(d.name, d)
+			
+		frappe.flags.warehouse_account_map = warehouse_account
+	return frappe.flags.warehouse_account_map
+
+def get_warehouse_account(warehouse, company):
+	lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
+	account = frappe.db.sql("""
+		select
+			account from `tabWarehouse`
+		where
+			lft <= %s and rgt >= %s and company = %s
+			and account is not null and ifnull(account, '') !=''
+		order by lft desc limit 1""", (lft, rgt, company), as_list=1)
+
+	account = account[0][0] if account else None
+	
+	if not account:
+		account = get_company_default_inventory_account(company)
+	
+	return account
+	
+def get_company_default_inventory_account(company):
+	return frappe.db.get_value('Company', company, 'default_inventory_account')
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 1f69ad1..e949989 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -171,7 +171,7 @@
 				var doc = frappe.model.get_new_doc('Stock Entry');
 				doc.from_warehouse = dialog.get_value('source');
 				doc.to_warehouse = dialog.get_value('target');
-				row = frappe.model.add_child(doc, 'items');
+				var row = frappe.model.add_child(doc, 'items');
 				row.item_code = dialog.get_value('item_code');
 				row.f_warehouse = dialog.get_value('target');
 				row.t_warehouse = dialog.get_value('target');
diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py
index 28ea045..0d75a9a 100644
--- a/erpnext/stock/dashboard/item_dashboard.py
+++ b/erpnext/stock/dashboard/item_dashboard.py
@@ -31,6 +31,8 @@
 		tabBin b, tabItem i
 	where
 		b.item_code = i.name
+		and
+		(b.projected_qty != 0 or b.reserved_qty != 0 or b.reserved_qty_for_production != 0 or b.actual_qty != 0)
 		{conditions}
 	order by
 		{sort_by} {sort_order}
diff --git a/erpnext/stock/doctype/batch/batch.js b/erpnext/stock/doctype/batch/batch.js
index 8a3906e..1822a06 100644
--- a/erpnext/stock/doctype/batch/batch.js
+++ b/erpnext/stock/doctype/batch/batch.js
@@ -66,31 +66,31 @@
 					rows.find('.btn-move').on('click', function() {
 						var $btn = $(this);
 						frappe.prompt({
-								fieldname: 'to_warehouse',
-								label: __('To Warehouse'),
-								fieldtype: 'Link',
-								options: 'Warehouse'
-							},
-							(data) => {
-								frappe.call({
-									method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
-									args: {
-										item_code: frm.doc.item,
-										batch_no: frm.doc.name,
-										qty: $btn.attr('data-qty'),
-										from_warehouse: $btn.attr('data-warehouse'),
-										to_warehouse: data.to_warehouse
-									},
-									callback: (r) => {
-										frappe.show_alert(__('Stock Entry {0} created',
-											['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
-										frm.refresh();
-									},
-								});
-							},
-							__('Select Target Warehouse'),
-							__('Move')
-						)
+							fieldname: 'to_warehouse',
+							label: __('To Warehouse'),
+							fieldtype: 'Link',
+							options: 'Warehouse'
+						},
+						(data) => {
+							frappe.call({
+								method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
+								args: {
+									item_code: frm.doc.item,
+									batch_no: frm.doc.name,
+									qty: $btn.attr('data-qty'),
+									from_warehouse: $btn.attr('data-warehouse'),
+									to_warehouse: data.to_warehouse
+								},
+								callback: (r) => {
+									frappe.show_alert(__('Stock Entry {0} created',
+										['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
+									frm.refresh();
+								},
+							});
+						},
+						__('Select Target Warehouse'),
+						__('Move')
+						);
 					});
 
 					// split - ask for new qty and batch ID (optional)
@@ -98,34 +98,34 @@
 					rows.find('.btn-split').on('click', function() {
 						var $btn = $(this);
 						frappe.prompt([{
-								fieldname: 'qty',
-								label: __('New Batch Qty'),
-								fieldtype: 'Float',
-								'default': $btn.attr('data-qty')
-							},
-							{
-								fieldname: 'new_batch_id',
-								label: __('New Batch ID (Optional)'),
-								fieldtype: 'Data',
-							}],
-							(data) => {
-								frappe.call({
-									method: 'erpnext.stock.doctype.batch.batch.split_batch',
-									args: {
-										item_code: frm.doc.item,
-										batch_no: frm.doc.name,
-										qty: data.qty,
-										warehouse: $btn.attr('data-warehouse'),
-										new_batch_id: data.new_batch_id
-									},
-									callback: (r) => {
-										frm.refresh();
-									},
-								});
-							},
-							__('Split Batch'),
-							__('Split')
-						)
+							fieldname: 'qty',
+							label: __('New Batch Qty'),
+							fieldtype: 'Float',
+							'default': $btn.attr('data-qty')
+						},
+						{
+							fieldname: 'new_batch_id',
+							label: __('New Batch ID (Optional)'),
+							fieldtype: 'Data',
+						}],
+						(data) => {
+							frappe.call({
+								method: 'erpnext.stock.doctype.batch.batch.split_batch',
+								args: {
+									item_code: frm.doc.item,
+									batch_no: frm.doc.name,
+									qty: data.qty,
+									warehouse: $btn.attr('data-warehouse'),
+									new_batch_id: data.new_batch_id
+								},
+								callback: (r) => {
+									frm.refresh();
+								},
+							});
+						},
+						__('Split Batch'),
+						__('Split')
+						);
 					})
 
 					frm.dashboard.show();
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 0481cfc..1f6e9e1 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "BIN/.#######", 
@@ -12,6 +13,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -22,6 +24,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Warehouse", 
@@ -37,11 +40,12 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -52,6 +56,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 1, 
    "label": "Item Code", 
@@ -67,11 +72,12 @@
    "remember_last_selected_value": 0, 
    "report_hide": 0, 
    "reqd": 0, 
-   "search_index": 1, 
+   "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -83,6 +89,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Reserved Quantity", 
@@ -102,6 +109,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -113,6 +121,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Actual Quantity", 
@@ -132,6 +141,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -143,6 +153,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 1, 
    "in_standard_filter": 0, 
    "label": "Ordered Quantity", 
@@ -162,6 +173,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -173,6 +185,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Requested Quantity", 
@@ -192,6 +205,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -202,6 +216,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Planned Qty", 
@@ -221,6 +236,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -231,6 +247,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Projected Qty", 
@@ -250,6 +267,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -260,6 +278,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Reserved Qty for Production", 
@@ -278,6 +297,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -288,6 +308,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Moving Average Rate", 
@@ -307,6 +328,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -317,6 +339,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 1, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "UOM", 
@@ -337,6 +360,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -347,6 +371,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "FCFS Rate", 
@@ -366,6 +391,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -376,6 +402,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Valuation Rate", 
@@ -395,6 +422,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -405,6 +433,7 @@
    "ignore_user_permissions": 0, 
    "ignore_xss_filter": 0, 
    "in_filter": 0, 
+   "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
    "label": "Stock Value", 
@@ -424,17 +453,17 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 1, 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 1, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:51:43.312590", 
+ "modified": "2017-06-13 13:06:32.601505", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Bin", 
@@ -450,7 +479,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -471,7 +499,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -492,7 +519,6 @@
    "export": 0, 
    "if_owner": 0, 
    "import": 0, 
-   "is_custom": 0, 
    "permlevel": 0, 
    "print": 1, 
    "read": 1, 
@@ -508,6 +534,8 @@
  "read_only": 0, 
  "read_only_onload": 0, 
  "search_fields": "item_code,warehouse", 
+ "show_name_in_global_search": 0, 
  "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index ece8220..75510de 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -31,6 +31,7 @@
 		is_group_warehouse(self.warehouse)
 
 	def update_stock(self, args, allow_negative_stock=False, via_landed_cost_voucher=False):
+		'''Called from erpnext.stock.utils.update_bin'''
 		self.update_qty(args)
 
 		if args.get("actual_qty") or args.get("voucher_type") == "Stock Reconciliation":
@@ -55,15 +56,6 @@
 		if args.get("voucher_type")=="Stock Reconciliation":
 			if args.get('is_cancelled') == 'No':
 				self.actual_qty = args.get("qty_after_transaction")
-			else:
-				qty_after_transaction = frappe.db.get_value("""select qty_after_transaction
-					from `tabStock Ledger Entry`
-					where item_code=%s and warehouse=%s
-					and not (voucher_type='Stock Reconciliation' and voucher_no=%s)
-					order by posting_date desc limit 1""",
-					(self.item_code, self.warehouse, args.get('voucher_no')))
-
-				self.actual_qty = flt(qty_after_transaction[0][0]) if qty_after_transaction else 0.0
 		else:
 			self.actual_qty = flt(self.actual_qty) + flt(args.get("actual_qty"))
 
@@ -72,7 +64,8 @@
 		self.indented_qty = flt(self.indented_qty) + flt(args.get("indented_qty"))
 		self.planned_qty = flt(self.planned_qty) + flt(args.get("planned_qty"))
 
-		self.save()
+		self.set_projected_qty()
+		self.db_update()
 
 	def set_projected_qty(self):
 		self.projected_qty = (flt(self.actual_qty) + flt(self.ordered_qty)
@@ -111,3 +104,6 @@
 	frappe.db.sql('''update tabItem set
 		total_projected_qty = ifnull((select sum(projected_qty) from tabBin where item_code=%s), 0)
 		where name=%s''', (item_code, item_code))
+
+def on_doctype_update():
+	frappe.db.add_index("Bin", ["item_code", "warehouse"])
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index eb8a750..faa1fac 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -38,7 +38,7 @@
 			}
 		});
 
-		if (sys_defaults.auto_accounting_for_stock) {
+		if (frappe.sys_defaults.auto_accounting_for_stock) {
 			frm.set_query('expense_account', 'items', function(doc, cdt, cdn) {
 				return {
 					filters: {
@@ -166,7 +166,7 @@
 		erpnext.stock.delivery_note.set_print_hide(doc, dt, dn);
 
 		// unhide expense_account and cost_center is auto_accounting_for_stock enabled
-		var aii_enabled = cint(sys_defaults.auto_accounting_for_stock)
+		var aii_enabled = cint(frappe.sys_defaults.auto_accounting_for_stock)
 		this.frm.fields_dict["items"].grid.set_column_disp(["expense_account", "cost_center"], aii_enabled);
 	},
 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 9d49b57..b8e7079 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -133,7 +133,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -3396,7 +3396,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-17 10:34:30.190081", 
+ "modified": "2017-06-13 14:29:05.182585", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 441b637..7523409 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -102,7 +102,7 @@
 		self.check_close_sales_order("against_sales_order")
 		self.validate_for_items()
 		self.validate_warehouse()
-		self.validate_uom_is_integer("stock_uom", "qty")
+		self.validate_uom_is_integer("stock_uom", "stock_qty")
 		self.validate_uom_is_integer("uom", "qty")
 		self.validate_with_previous_doc()
 
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index fdb6ac9..0f3099f 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -19,8 +19,19 @@
 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
+from erpnext.accounts.doctype.account.test_account import get_inventory_account, create_account
 
 class TestDeliveryNote(unittest.TestCase):
+	def tearDown(self):
+		target_warehouse = "_Test Warehouse 1 - _TC"
+		company = "_Test Company"
+		if not frappe.db.exists("Account", target_warehouse):
+			parent_account = frappe.db.get_value('Account',
+				{'company': company, 'is_group':1, 'account_type': 'Stock'},'name')
+			account = create_account(account_name="_Test Warehouse 1", \
+				account_type="Stock", parent_account= parent_account, company=company)
+			frappe.db.set_value('Warehouse', target_warehouse, 'account', account)
+
 	def test_over_billing_against_dn(self):
 		frappe.db.set_value("Stock Settings", None, "allow_negative_stock", 1)
 
@@ -63,7 +74,7 @@
 
 		make_stock_entry(target="_Test Warehouse - _TC", qty=5, basic_rate=100)
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"warehouse": "_Test Warehouse - _TC"})
+		stock_in_hand_account = get_inventory_account('_Test Company')
 		prev_bal = get_balance_on(stock_in_hand_account)
 
 		dn = create_delivery_note()
@@ -113,7 +124,7 @@
 		make_stock_entry(item_code="_Test Item Home Desktop 100",
 			target="_Test Warehouse - _TC", qty=10, basic_rate=100)
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"warehouse": "_Test Warehouse - _TC"})
+		stock_in_hand_account = get_inventory_account('_Test Company')
 		prev_bal = get_balance_on(stock_in_hand_account)
 
 		dn = create_delivery_note(item_code="_Test Product Bundle Item")
@@ -212,9 +223,10 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEquals(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
+		stock_in_hand_account = get_inventory_account('_Test Company', dn1.items[0].warehouse)
 
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Delivery Note",
-			"voucher_no": dn1.name, "account": "_Test Warehouse - _TC"}, "debit")
+			"voucher_no": dn1.name, "account": stock_in_hand_account}, "debit")
 
 		self.assertEquals(gle_warehouse_amount, stock_value_difference)
 
@@ -250,10 +262,11 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEquals(flt(incoming_rate, 3), abs(flt(outgoing_rate, 3)))
+		stock_in_hand_account = get_inventory_account('_Test Company', dn1.items[0].warehouse)
 
 		# Check gl entry for warehouse
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Delivery Note",
-			"voucher_no": dn1.name, "account": "_Test Warehouse - _TC"}, "debit")
+			"voucher_no": dn1.name, "account": stock_in_hand_account}, "debit")
 
 		self.assertEquals(gle_warehouse_amount, stock_value_difference)
 
@@ -262,11 +275,20 @@
 	def test_return_entire_bundled_items(self):
 		set_perpetual_inventory()
 
-		create_stock_reconciliation(item_code="_Test Item", target="_Test Warehouse - _TC", qty=50, rate=100)
-		create_stock_reconciliation(item_code="_Test Item Home Desktop 100", target="_Test Warehouse - _TC",
-			qty=50, rate=100)
+		create_stock_reconciliation(item_code="_Test Item",
+			target="_Test Warehouse - _TC", qty=50, rate=100)
+		create_stock_reconciliation(item_code="_Test Item Home Desktop 100",
+			target="_Test Warehouse - _TC", qty=50, rate=100)
 
-		dn = create_delivery_note(item_code="_Test Product Bundle Item", qty=5, rate=500)
+		actual_qty = get_qty_after_transaction()
+		self.assertEquals(actual_qty, 50)
+
+		dn = create_delivery_note(item_code="_Test Product Bundle Item",
+			qty=5, rate=500)
+
+		# qty after return
+		actual_qty = get_qty_after_transaction()
+		self.assertEquals(actual_qty, 25)
 
 		#  return bundled item
 		dn1 = create_delivery_note(item_code='_Test Product Bundle Item', is_return=1,
@@ -282,10 +304,11 @@
 			["incoming_rate", "stock_value_difference"])
 
 		self.assertEquals(incoming_rate, 100)
+		stock_in_hand_account = get_inventory_account('_Test Company', dn1.items[0].warehouse)
 
 		# Check gl entry for warehouse
 		gle_warehouse_amount = frappe.db.get_value("GL Entry", {"voucher_type": "Delivery Note",
-			"voucher_no": dn1.name, "account": "_Test Warehouse - _TC"}, "debit")
+			"voucher_no": dn1.name, "account": stock_in_hand_account}, "debit")
 
 		self.assertEquals(gle_warehouse_amount, 1400)
 
@@ -339,7 +362,6 @@
 				target=warehouse, qty=100, rate=100)
 
 		opening_qty_test_warehouse_1 = get_qty_after_transaction(warehouse="_Test Warehouse 1 - _TC")
-
 		dn = create_delivery_note(item_code="_Test Product Bundle Item",
 			qty=5, rate=500, target_warehouse="_Test Warehouse 1 - _TC", do_not_submit=True)
 
@@ -390,7 +412,7 @@
 			and warehouse='_Test Warehouse - _TC'""", dn.name)[0][0])
 
 		expected_values = {
-			"_Test Warehouse - _TC": [0.0, stock_value_difference],
+			"Stock In Hand - _TC": [0.0, stock_value_difference],
 			"_Test Warehouse 1 - _TC": [stock_value_difference, 0.0]
 		}
 		for i, gle in enumerate(gl_entries):
@@ -519,9 +541,9 @@
 def create_delivery_note(**args):
 	dn = frappe.new_doc("Delivery Note")
 	args = frappe._dict(args)
-	dn.posting_date = args.posting_date or today()
-	if args.posting_time:
-		dn.posting_time = args.posting_time
+	dn.posting_date = args.posting_date or nowdate()
+	dn.posting_time = args.posting_time or nowtime()
+	dn.set_posting_time = 1
 
 	dn.company = args.company or "_Test Company"
 	dn.customer = args.customer or "_Test Customer"
diff --git a/erpnext/stock/doctype/delivery_note/test_records.json b/erpnext/stock/doctype/delivery_note/test_records.json
deleted file mode 100644
index c76bab2..0000000
--- a/erpnext/stock/doctype/delivery_note/test_records.json
+++ /dev/null
@@ -1,39 +0,0 @@
-[
- {
-  "company": "_Test Company",
-  "conversion_rate": 1.0,
-  "currency": "INR",
-  "customer": "_Test Customer",
-  "customer_name": "_Test Customer",
-  "items": [
-   {
-    "base_amount": 100.0,
-    "base_rate": 100.0,
-    "cost_center": "Main - _TC",
-    "description": "CPU",
-    "doctype": "Delivery Note Item",
-    "expense_account": "Cost of Goods Sold - _TC",
-    "item_code": "_Test Item",
-    "item_name": "_Test Item",
-    "parentfield": "items",
-    "qty": 1.0,
-    "rate": 100.0,
-	"uom": "_Test UOM",
-	"conversion_factor": 1,
-    "stock_uom": "_Test UOM",
-    "warehouse": "_Test Warehouse - _TC"
-   }
-  ],
-  "doctype": "Delivery Note",
-  "base_grand_total": 100.0,
-  "grand_total": 100.0,
-  "naming_series": "_T-Delivery Note-",
-  "base_net_total": 100.0,
-  "plc_conversion_rate": 1.0,
-  "posting_date": "2013-02-21",
-  "price_list_currency": "INR",
-  "selling_price_list": "_Test Price List",
-  "status": "Draft",
-  "territory": "_Test Territory"
- }
-]
diff --git a/erpnext/stock/doctype/item/item.js b/erpnext/stock/doctype/item/item.js
index 1667741..1af0807 100644
--- a/erpnext/stock/doctype/item/item.js
+++ b/erpnext/stock/doctype/item/item.js
@@ -151,7 +151,7 @@
 frappe.ui.form.on('Item Reorder', {
 	reorder_levels_add: function(frm, cdt, cdn) {
 		var row = frappe.get_doc(cdt, cdn);
-		type = frm.doc.default_material_request_type
+		var type = frm.doc.default_material_request_type
 		row.material_request_type = (type == 'Material Transfer')? 'Transfer' : type;
 	}
 })
@@ -262,8 +262,8 @@
 
 	weight_to_validate: function(frm){
 		if((frm.doc.nett_weight || frm.doc.gross_weight) && !frm.doc.weight_uom) {
-			msgprint(__('Weight is mentioned,\nPlease mention "Weight UOM" too'));
-			validated = 0;
+			frappe.msgprint(__('Weight is mentioned,\nPlease mention "Weight UOM" too'));
+			frappe.validated = 0;
 		}
 	},
 
@@ -334,7 +334,7 @@
 		});
 
 		d.set_primary_action(__("Make"), function() {
-			args = d.get_values();
+			var args = d.get_values();
 			if(!args) return;
 			frappe.call({
 				method:"erpnext.controllers.item_variant.get_variant",
@@ -346,14 +346,14 @@
 					// returns variant item
 					if (r.message) {
 						var variant = r.message;
-						var msgprint_dialog = frappe.msgprint(__("Item Variant {0} already exists with same attributes",
+						frappe.msgprint_dialog = frappe.msgprint(__("Item Variant {0} already exists with same attributes",
 							[repl('<a href="#Form/Item/%(item_encoded)s" class="strong variant-click">%(item)s</a>', {
 								item_encoded: encodeURIComponent(variant),
 								item: variant
 							})]
 						));
-						msgprint_dialog.hide_on_page_refresh = true;
-						msgprint_dialog.$wrapper.find(".variant-click").on("click", function() {
+						frappe.msgprint_dialog.hide_on_page_refresh = true;
+						frappe.msgprint_dialog.$wrapper.find(".variant-click").on("click", function() {
 							d.hide();
 						});
 					} else {
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 25f3055..19d3f47 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -73,7 +73,7 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -2748,7 +2748,7 @@
    "in_standard_filter": 0, 
    "label": "Route", 
    "length": 0, 
-   "no_copy": 0, 
+   "no_copy": 1, 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -3143,7 +3143,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 1, 
- "modified": "2017-05-15 11:49:47.525859", 
+ "modified": "2017-06-13 14:29:03.003680", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Item", 
@@ -3320,4 +3320,4 @@
  "title_field": "item_name", 
  "track_changes": 1, 
  "track_seen": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index f2780bf..6e21e67d 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -37,7 +37,7 @@
 		if frappe.db.get_default("item_naming_by")=="Naming Series":
 			if self.variant_of:
 				if not self.item_code:
-					self.item_code = make_variant_item_code(self.variant_of, self)
+					self.item_code = make_variant_item_code(self.variant_of, self.item_name, self)
 			else:
 				from frappe.model.naming import make_autoname
 				self.item_code = make_autoname(self.naming_series+'.#####')
@@ -248,7 +248,7 @@
 		self.set_attribute_context(context)
 		self.set_disabled_attributes(context)
 
-		context.parents = self.get_parents(context)
+		self.get_parents(context)
 
 		return context
 
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 3ae61b9..edc3444 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -8,7 +8,7 @@
 	setup: function() {
 		var me = this;
 		this.frm.fields_dict.purchase_receipts.grid.get_field('receipt_document').get_query =
-			function(doc, cdt ,cdn) {
+			function (doc, cdt, cdn) {
 				var d = locals[cdt][cdn]
 
 				var filters = [
@@ -16,15 +16,15 @@
 					[d.receipt_document_type, 'company', '=', me.frm.doc.company],
 				]
 
-				if(d.receipt_document_type == "Purchase Invoice") {
+				if (d.receipt_document_type == "Purchase Invoice") {
 					filters.push(["Purchase Invoice", "update_stock", "=", "1"])
 				}
 
-				if(!me.frm.doc.company) msgprint(__("Please enter company first"));
+				if (!me.frm.doc.company) frappe.msgprint(__("Please enter company first"));
 				return {
-					filters:filters
+					filters: filters
 				}
-		};
+			};
 
 		this.frm.add_fetch("receipt_document", "supplier", "supplier");
 		this.frm.add_fetch("receipt_document", "posting_date", "posting_date");
@@ -33,32 +33,33 @@
 	},
 
 	refresh: function(frm) {
-		var help_content = [
-			'<br><br>',
-			'<table class="table table-bordered" style="background-color: #f9f9f9;">',
-				'<tr><td>',
-					'<h4><i class="fa fa-hand-right"></i> ',
-						__('Notes'),
-					':</h4>',
-					'<ul>',
-						'<li>',
-							__("Charges will be distributed proportionately based on item qty or amount, as per your selection"),
-						'</li>',
-						'<li>',
-							__("Remove item if charges is not applicable to that item"),
-						'</li>',
-						'<li>',
-							__("Charges are updated in Purchase Receipt against each item"),
-						'</li>',
-						'<li>',
-							__("Item valuation rate is recalculated considering landed cost voucher amount"),
-						'</li>',
-						'<li>',
-							__("Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"),
-						'</li>',
-					'</ul>',
-				'</td></tr>',
-			'</table>'].join("\n");
+		var help_content =
+			`<br><br>
+			<table class="table table-bordered" style="background-color: #f9f9f9;">
+				<tr><td>
+					<h4>
+						<i class="fa fa-hand-right"></i> 
+						${__("Notes")}:
+					</h4>
+					<ul>
+						<li>
+							${__("Charges will be distributed proportionately based on item qty or amount, as per your selection")}
+						</li>
+						<li>
+							${__("Remove item if charges is not applicable to that item")}
+						</li>
+						<li>
+							${__("Charges are updated in Purchase Receipt against each item")}
+						</li>
+						<li>
+							${__("Item valuation rate is recalculated considering landed cost voucher amount")}
+						</li>
+						<li>
+							${__("Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts")}
+						</li>
+					</ul>
+				</td></tr>
+			</table>`;
 
 		set_field_options("landed_cost_help", help_content);
 	},
@@ -66,7 +67,7 @@
 	get_items_from_purchase_receipts: function() {
 		var me = this;
 		if(!this.frm.doc.purchase_receipts.length) {
-			msgprint(__("Please enter Purchase Receipt first"));
+			frappe.msgprint(__("Please enter Purchase Receipt first"));
 		} else {
 			return this.frm.call({
 				doc: me.frm.doc,
@@ -84,7 +85,7 @@
 	},
 
 	set_total_taxes_and_charges: function() {
-		total_taxes_and_charges = 0.0;
+		var total_taxes_and_charges = 0.0;
 		$.each(this.frm.doc.taxes || [], function(i, d) {
 			total_taxes_and_charges += flt(d.amount)
 		});
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index b935acd..5bb13b4 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,10 +41,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -72,6 +75,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -101,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -158,6 +164,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -187,6 +194,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,6 +225,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -246,6 +255,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -274,6 +284,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -303,6 +314,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -331,6 +343,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -362,6 +375,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -391,6 +405,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -419,6 +434,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -448,18 +464,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "icon-usd", 
  "idx": 0, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:31:34.383926", 
+ "modified": "2017-06-13 14:28:59.973022", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Landed Cost Voucher", 
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 eb8f8b8..bad3bac 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
@@ -9,6 +9,7 @@
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt \
 	import set_perpetual_inventory, get_gl_entries, test_records as pr_test_records, make_purchase_receipt
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
 class TestLandedCostVoucher(unittest.TestCase):
 	def test_landed_cost_voucher(self):
@@ -46,16 +47,23 @@
 
 		self.assertTrue(gl_entries)
 
-		stock_in_hand_account = pr.get("items")[0].warehouse
-		fixed_asset_account = pr.get("items")[1].warehouse
+		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
+		fixed_asset_account = get_inventory_account(pr.company, pr.get("items")[1].warehouse)  
 
-
-		expected_values = {
-			stock_in_hand_account: [400.0, 0.0],
-			fixed_asset_account: [400.0, 0.0],
-			"Stock Received But Not Billed - _TC": [0.0, 500.0],
-			"Expenses Included In Valuation - _TC": [0.0, 300.0]
-		}
+		if stock_in_hand_account == fixed_asset_account:
+			expected_values = {
+				stock_in_hand_account: [800.0, 0.0],
+				"Stock Received But Not Billed - _TC": [0.0, 500.0],
+				"Expenses Included In Valuation - _TC": [0.0, 300.0]
+			}
+			
+		else:
+			expected_values = {
+				stock_in_hand_account: [400.0, 0.0],
+				fixed_asset_account: [400.0, 0.0],
+				"Stock Received But Not Billed - _TC": [0.0, 500.0],
+				"Expenses Included In Valuation - _TC": [0.0, 300.0]
+			}
 
 		for gle in gl_entries:
 			self.assertEquals(expected_values[gle.account][0], gle.debit)
@@ -99,9 +107,10 @@
 		gl_entries = get_gl_entries("Purchase Invoice", pi.name)
 
 		self.assertTrue(gl_entries)
+		stock_in_hand_account = get_inventory_account(pi.company, pi.get("items")[0].warehouse)
 
 		expected_values = {
-			pi.get("items")[0].warehouse: [300.0, 0.0],
+			stock_in_hand_account: [300.0, 0.0],
 			"Creditors - _TC": [0.0, 250.0],
 			"Expenses Included In Valuation - _TC": [0.0, 50.0]
 		}
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 5c3bbc9..3361020 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -30,14 +30,17 @@
 });
 
 frappe.ui.form.on("Material Request Item", {
-	"qty": function(frm, doctype, name) {
-			var d = locals[doctype][name];
-			if (flt(d.qty) < flt(d.min_order_qty)) {
-				alert(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
-			}
+	qty: function (frm, doctype, name) {
+		var d = locals[doctype][name];
+		if (flt(d.qty) < flt(d.min_order_qty)) {
+			frappe.msgprint(__("Warning: Material Requested Qty is less than Minimum Order Qty"));
 		}
+	},
+	item_code: function(frm, doctype, name) {
+		frm.script_manager.copy_from_first_row('items', frm.selected_doc,
+			'schedule_date');
 	}
-);
+});
 
 erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.extend({
 	onload: function(doc) {
@@ -119,18 +122,6 @@
 
 	},
 
-	schedule_date: function(doc, cdt, cdn) {
-		var val = locals[cdt][cdn].schedule_date;
-		if(val) {
-			$.each((doc.items || []), function(i, d) {
-				if(!d.schedule_date) {
-					d.schedule_date = val;
-				}
-			});
-			refresh_field("items");
-		}
-	},
-
 	get_items_from_bom: function() {
 		var d = new frappe.ui.Dialog({
 			title: __("Get Items from BOM"),
@@ -140,7 +131,7 @@
 						return {filters: { docstatus:1 }}
 					}},
 				{"fieldname":"warehouse", "fieldtype":"Link", "label":__("Warehouse"),
-					options:"Warehouse", reqd: 1, label:"For Warehouse"},
+					options:"Warehouse", reqd: 1},
 				{"fieldname":"fetch_exploded", "fieldtype":"Check",
 					"label":__("Fetch exploded BOM (including sub-assemblies)"), "default":1},
 				{fieldname:"fetch", "label":__("Get Items from BOM"), "fieldtype":"Button"}
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index fc174a4..ed647d6 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -160,7 +160,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -686,7 +686,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-31 15:06:44.611826", 
+ "modified": "2017-06-13 14:29:18.032657", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Material Request", 
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.js b/erpnext/stock/doctype/packing_slip/packing_slip.js
index 2ea1ba9..69d12eb 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.js
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.js
@@ -48,14 +48,14 @@
 cur_frm.cscript.validate_case_nos = function(doc) {
 	doc = locals[doc.doctype][doc.name];
 	if(cint(doc.from_case_no)==0) {
-		msgprint(__("Case No. cannot be 0"))
-		validated = false;
+		frappe.msgprint(__("Case No. cannot be 0"))
+		frappe.validated = false;
 	} else if(!cint(doc.to_case_no)) {
 		doc.to_case_no = doc.from_case_no;
 		refresh_field('to_case_no');
 	} else if(cint(doc.to_case_no) < cint(doc.from_case_no)) {
-		msgprint(__("'To Case No.' cannot be less than 'From Case No.'"));
-		validated = false;
+		frappe.msgprint(__("'To Case No.' cannot be less than 'From Case No.'"));
+		frappe.validated = false;
 	}
 }
 
@@ -75,14 +75,14 @@
 	for(var i=0; i<ps_detail.length; i++) {
 		for(var j=0; j<ps_detail.length; j++) {
 			if(i!=j && ps_detail[i].item_code && ps_detail[i].item_code==ps_detail[j].item_code) {
-				msgprint(__("You have entered duplicate items. Please rectify and try again."));
-				validated = false;
+				frappe.msgprint(__("You have entered duplicate items. Please rectify and try again."));
+				frappe.validated = false;
 				return;
 			}
 		}
 		if(flt(ps_detail[i].qty)<=0) {
-			msgprint(__("Invalid quantity specified for item {0}. Quantity should be greater than 0.", [ps_detail[i].item_code]));
-			validated = false;
+			frappe.msgprint(__("Invalid quantity specified for item {0}. Quantity should be greater than 0.", [ps_detail[i].item_code]));
+			frappe.validated = false;
 		}
 	}
 }
@@ -97,15 +97,15 @@
 	for(var i=0; i<ps_detail.length; i++) {
 		var item = ps_detail[i];
 		if(item.weight_uom != doc.net_weight_uom) {
-			msgprint(__("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."));
-			validated = false;
+			frappe.msgprint(__("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."));
+			frappe.validated = false;
 		}
 		net_weight_pkg += flt(item.net_weight) * flt(item.qty);
 	}
 
-	doc.net_weight_pkg = _round(net_weight_pkg, 2);
+	doc.net_weight_pkg = roundNumber(net_weight_pkg, 2);
 	if(!flt(doc.gross_weight_pkg)) {
-		doc.gross_weight_pkg = doc.net_weight_pkg
+		doc.gross_weight_pkg = doc.net_weight_pkg;
 	}
 	refresh_many(['net_weight_pkg', 'net_weight_uom', 'gross_weight_uom', 'gross_weight_pkg']);
 }
@@ -113,8 +113,8 @@
 var make_row = function(title,val,bold){
 	var bstart = '<b>'; var bend = '</b>';
 	return '<tr><td class="datalabelcell">'+(bold?bstart:'')+title+(bold?bend:'')+'</td>'
-	 +'<td class="datainputcell" style="text-align:left;">'+ val +'</td>'
-	 +'</tr>'
+	+'<td class="datainputcell" style="text-align:left;">'+ val +'</td>'
+	+'</tr>'
 }
 
 cur_frm.pformat.net_weight_pkg= function(doc){
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 297e370..4186aad 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "PS.#######", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -41,6 +43,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,6 +71,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -98,6 +102,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -125,6 +130,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -150,10 +156,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -181,6 +188,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -208,6 +216,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -238,6 +247,7 @@
    "width": "50px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -265,6 +275,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -295,6 +306,7 @@
    "width": "50px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -323,6 +335,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -351,6 +364,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -380,6 +394,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -408,6 +423,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -437,6 +453,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -466,6 +483,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -493,6 +511,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -522,6 +541,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -551,6 +571,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -580,6 +601,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 1, 
    "bold": 0, 
    "collapsible": 0, 
@@ -610,6 +632,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -638,6 +661,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -667,18 +691,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-suitcase", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:28:31.182390", 
+ "modified": "2017-06-13 14:29:17.446439", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Packing Slip", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index b4cfcaa..c998140 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -53,9 +53,9 @@
 		}
 
 		if(!this.frm.doc.is_return && this.frm.doc.status!="Closed") {
-			if(this.frm.doc.docstatus==0) {
+			if (this.frm.doc.docstatus == 0) {
 				this.frm.add_custom_button(__('Purchase Order'),
-					function() {
+					function () {
 						erpnext.utils.map_current_doc({
 							method: "erpnext.buying.doctype.purchase_order.purchase_order.make_purchase_receipt",
 							source_doctype: "Purchase Order",
@@ -70,7 +70,7 @@
 								company: me.frm.doc.company
 							}
 						})
-				}, __("Get items from"));
+					}, __("Get items from"));
 			}
 
 			if(this.frm.doc.docstatus == 1 && this.frm.doc.status!="Closed") {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index e3e106f..bb0f96f 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -134,7 +134,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -2939,7 +2939,7 @@
  "istable": 0, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2017-05-17 10:35:15.908575", 
+ "modified": "2017-06-13 14:29:08.605354", 
  "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 c11965e..647eb67 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -189,7 +189,7 @@
 					if not stock_value_diff:
 						continue
 					gl_entries.append(self.get_gl_dict({
-						"account": warehouse_account[d.warehouse]["name"],
+						"account": warehouse_account[d.warehouse]["account"],
 						"against": stock_rbnb,
 						"cost_center": d.cost_center,
 						"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
@@ -200,7 +200,7 @@
 					stock_rbnb_currency = get_account_currency(stock_rbnb)
 					gl_entries.append(self.get_gl_dict({
 						"account": stock_rbnb,
-						"against": warehouse_account[d.warehouse]["name"],
+						"against": warehouse_account[d.warehouse]["account"],
 						"cost_center": d.cost_center,
 						"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 						"credit": flt(d.base_net_amount, d.precision("base_net_amount")),
@@ -214,7 +214,7 @@
 					if flt(d.landed_cost_voucher_amount):
 						gl_entries.append(self.get_gl_dict({
 							"account": expenses_included_in_valuation,
-							"against": warehouse_account[d.warehouse]["name"],
+							"against": warehouse_account[d.warehouse]["account"],
 							"cost_center": d.cost_center,
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 							"credit": flt(d.landed_cost_voucher_amount),
@@ -225,7 +225,7 @@
 					if flt(d.rm_supp_cost) and warehouse_account.get(self.supplier_warehouse):
 						gl_entries.append(self.get_gl_dict({
 							"account": warehouse_account[self.supplier_warehouse]["name"],
-							"against": warehouse_account[d.warehouse]["name"],
+							"against": warehouse_account[d.warehouse]["account"],
 							"cost_center": d.cost_center,
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 							"credit": flt(d.rm_supp_cost)
@@ -246,7 +246,7 @@
 
 						gl_entries.append(self.get_gl_dict({
 							"account": loss_account,
-							"against": warehouse_account[d.warehouse]["name"],
+							"against": warehouse_account[d.warehouse]["account"],
 							"cost_center": d.cost_center,
 							"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 							"debit": divisional_loss,
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 7fe2722..4ea0add 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -9,6 +9,7 @@
 from frappe.utils import cint, flt, cstr, today
 from erpnext.stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 from erpnext import set_perpetual_inventory
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
 class TestPurchaseReceipt(unittest.TestCase):
 	def setUp(self):
@@ -59,17 +60,22 @@
 
 		self.assertTrue(gl_entries)
 
-		stock_in_hand_account = frappe.db.get_value("Account",
-			{"warehouse": pr.get("items")[0].warehouse})
-		fixed_asset_account = frappe.db.get_value("Account",
-			{"warehouse": pr.get("items")[1].warehouse})
+		stock_in_hand_account = get_inventory_account(pr.company, pr.get("items")[0].warehouse)
+		fixed_asset_account = get_inventory_account(pr.company, pr.get("items")[1].warehouse)
 
-		expected_values = {
-			stock_in_hand_account: [375.0, 0.0],
-			fixed_asset_account: [375.0, 0.0],
-			"Stock Received But Not Billed - _TC": [0.0, 500.0],
-			"Expenses Included In Valuation - _TC": [0.0, 250.0]
-		}
+		if stock_in_hand_account == fixed_asset_account:
+			expected_values = {
+				stock_in_hand_account: [750.0, 0.0],
+				"Stock Received But Not Billed - _TC": [0.0, 500.0],
+				"Expenses Included In Valuation - _TC": [0.0, 250.0]
+			}
+		else:
+			expected_values = {
+				stock_in_hand_account: [375.0, 0.0],
+				fixed_asset_account: [375.0, 0.0],
+				"Stock Received But Not Billed - _TC": [0.0, 500.0],
+				"Expenses Included In Valuation - _TC": [0.0, 250.0]
+			}
 
 		for gle in gl_entries:
 			self.assertEquals(expected_values[gle.account][0], gle.debit)
@@ -141,9 +147,10 @@
 		gl_entries = get_gl_entries("Purchase Receipt", return_pr.name)
 
 		self.assertTrue(gl_entries)
+		stock_in_hand_account = get_inventory_account(return_pr.company)
 
 		expected_values = {
-			"_Test Warehouse - _TC": [0.0, 100.0],
+			stock_in_hand_account: [0.0, 100.0],
 			"Stock Received But Not Billed - _TC": [100.0, 0.0],
 		}
 
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
index a46a3b4..4dd109c 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -13,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -38,10 +40,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -73,6 +76,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -101,6 +105,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -132,6 +137,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -194,6 +201,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -222,6 +230,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -253,6 +262,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +294,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -315,6 +326,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -345,6 +357,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -374,6 +387,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -403,6 +417,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -434,6 +449,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -462,6 +478,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -494,6 +511,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -524,6 +542,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -552,6 +571,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -582,6 +602,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -613,6 +634,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -643,6 +665,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -672,6 +695,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -703,18 +727,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-search", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 1, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:31:09.483782", 
+ "modified": "2017-06-13 14:29:02.080120", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Quality Inspection", 
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 3b65ff8..b37713b 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:serial_no", 
@@ -13,6 +14,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -42,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -69,6 +72,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -99,6 +103,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -130,6 +135,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -162,6 +168,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -189,6 +196,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -217,6 +225,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -248,6 +257,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -280,6 +290,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -311,6 +322,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -339,6 +351,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -367,6 +380,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -396,6 +410,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -425,6 +440,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -455,6 +471,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -483,6 +500,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -514,6 +532,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -542,6 +561,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -571,6 +591,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -599,6 +620,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -628,6 +650,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -657,6 +680,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -686,6 +710,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -716,6 +741,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -744,6 +770,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -775,6 +802,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -803,6 +831,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -834,6 +863,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -864,6 +894,68 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "invoice_details", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Invoice Details", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sales_invoice", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Sales Invoice", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Sales Invoice", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
+  }, 
+  {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -892,6 +984,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -920,6 +1013,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -952,6 +1046,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -983,6 +1078,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1011,6 +1107,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1042,6 +1139,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1073,6 +1171,7 @@
    "width": "150px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1101,6 +1200,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1129,6 +1229,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1158,18 +1259,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-barcode", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:26:55.864960", 
+ "modified": "2017-05-15 18:22:23.685286", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Serial No", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 4e381ea..6303df1 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -26,7 +26,7 @@
 				if (in_list(["Material Transfer for Manufacture", "Manufacture", "Repack", "Subcontract"], doc.purpose)) {
 					var filters = {
 						'item_code': item.item_code,
-						'posting_date': frm.doc.posting_date || nowdate()
+						'posting_date': frm.doc.posting_date || frappe.datetime.nowdate()
 					}
 				} else {
 					var filters = {
@@ -143,7 +143,7 @@
 	item_code: function(frm, cdt, cdn) {
 		var d = locals[cdt][cdn];
 		if(d.item_code) {
-			args = {
+			var args = {
 				'item_code'			: d.item_code,
 				'warehouse'			: cstr(d.s_warehouse) || cstr(d.t_warehouse),
 				'transfer_qty'		: d.transfer_qty,
@@ -173,7 +173,7 @@
 	expense_account: function(frm, cdt, cdn) {
 		erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "expense_account");
 	},
-	cost_center: function(doc, cdt, cdn) {
+	cost_center: function(frm, cdt, cdn) {
 		erpnext.utils.copy_value_in_all_row(frm.doc, cdt, cdn, "items", "cost_center");
 	}
 });
@@ -216,14 +216,14 @@
 		if(cint(frappe.defaults.get_default("auto_accounting_for_stock"))) {
 			this.frm.add_fetch("company", "stock_adjustment_account", "expense_account");
 			this.frm.fields_dict.items.grid.get_field('expense_account').get_query =
-					function() {
-				return {
-					filters: {
-						"company": me.frm.doc.company,
-						"is_group": 0
+				function() {
+					return {
+						filters: {
+							"company": me.frm.doc.company,
+							"is_group": 0
+						}
 					}
 				}
-			}
 		}
 
 		this.frm.set_indicator_formatter('item_code',
@@ -243,9 +243,9 @@
 			}
 		});
 
-		if(!this.item_selector && false) {
-			this.item_selector = new erpnext.ItemSelector({frm: this.frm});
-		}
+		// if(!this.item_selector && false) {
+		// 	this.item_selector = new erpnext.ItemSelector({frm: this.frm});
+		// }
 	},
 
 	refresh: function() {
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index fd0863b..f68690c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -103,7 +103,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -1739,7 +1739,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-05-17 10:35:58.696189", 
+ "modified": "2017-06-13 14:28:47.818067", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 169bfd9..c31d7ac 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -83,7 +83,8 @@
 				frappe.throw(_("Row {0}: Qty is mandatory").format(item.idx))
 			if not flt(item.conversion_factor):
 				frappe.throw(_("Row {0}: UOM Conversion Factor is mandatory").format(item.idx))
-			item.transfer_qty = flt(item.qty * item.conversion_factor, self.precision("transfer_qty", item))
+			item.transfer_qty = flt(flt(item.qty) * flt(item.conversion_factor),
+				self.precision("transfer_qty", item))
 
 	def validate_item(self):
 		stock_items = self.get_stock_items()
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.js b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
index 0e5aeb7..69d21dd 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_list.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
@@ -4,7 +4,7 @@
 	column_render: {
 		"from_warehouse": function(doc) {
 			var html = "";
-	 		if(doc.from_warehouse) {
+			if(doc.from_warehouse) {
 				html += '<span class="filterable h6"\
 					data-filter="from_warehouse,=,'+doc.from_warehouse+'">'+doc.from_warehouse+' </span>';
 			}
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index b16dee9..2451a9b 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -13,6 +13,7 @@
 from erpnext.stock.doctype.stock_reconciliation.test_stock_reconciliation import create_stock_reconciliation
 from frappe.tests.test_permissions import set_user_permission_doctypes
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
+from erpnext.accounts.doctype.account.test_account import get_inventory_account
 
 def get_sle(**args):
 	condition, values = "", []
@@ -127,9 +128,7 @@
 		mr = make_stock_entry(item_code="_Test Item", target="_Test Warehouse - _TC",
 			qty=50, basic_rate=100, expense_account="Stock Adjustment - _TC")
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
-			"warehouse": mr.get("items")[0].t_warehouse})
-
+		stock_in_hand_account = get_inventory_account(mr.company, mr.get("items")[0].t_warehouse)
 		self.check_stock_ledger_entries("Stock Entry", mr.name,
 			[["_Test Item", "_Test Warehouse - _TC", 50.0]])
 
@@ -160,9 +159,7 @@
 		self.check_stock_ledger_entries("Stock Entry", mi.name,
 			[["_Test Item", "_Test Warehouse - _TC", -40.0]])
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
-			"warehouse": "_Test Warehouse - _TC"})
-
+		stock_in_hand_account = get_inventory_account(mi.company, "_Test Warehouse - _TC")
 		stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
 			"voucher_no": mi.name}, "stock_value_difference"))
 
@@ -192,21 +189,25 @@
 		self.check_stock_ledger_entries("Stock Entry", mtn.name,
 			[["_Test Item", "_Test Warehouse - _TC", -45.0], ["_Test Item", "_Test Warehouse 1 - _TC", 45.0]])
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
-			"warehouse": mtn.get("items")[0].s_warehouse})
-
-		fixed_asset_account = frappe.db.get_value("Account", {"account_type": "Stock",
-			"warehouse": mtn.get("items")[0].t_warehouse})
-
-		stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
-			"voucher_no": mtn.name, "warehouse": "_Test Warehouse - _TC"}, "stock_value_difference"))
-
-		self.check_gl_entries("Stock Entry", mtn.name,
-			sorted([
-				[stock_in_hand_account, 0.0, stock_value_diff],
-				[fixed_asset_account, stock_value_diff, 0.0],
-			])
-		)
+		stock_in_hand_account = get_inventory_account(mtn.company, mtn.get("items")[0].s_warehouse)
+		
+		fixed_asset_account = get_inventory_account(mtn.company, mtn.get("items")[0].t_warehouse)
+			
+		if stock_in_hand_account == fixed_asset_account:
+			# no gl entry as both source and target warehouse has linked to same account.
+			self.assertFalse(frappe.db.sql("""select * from `tabGL Entry`
+				where voucher_type='Stock Entry' and voucher_no=%s""", mtn.name))
+			
+		else:
+			stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
+				"voucher_no": mtn.name, "warehouse": "_Test Warehouse - _TC"}, "stock_value_difference"))
+		
+			self.check_gl_entries("Stock Entry", mtn.name,
+				sorted([
+					[stock_in_hand_account, 0.0, stock_value_diff],
+					[fixed_asset_account, stock_value_diff, 0.0],
+				])
+			)
 
 		mtn.cancel()
 		self.assertFalse(frappe.db.sql("""select * from `tabStock Ledger Entry`
@@ -260,9 +261,7 @@
 		repack.insert()
 		repack.submit()
 
-		stock_in_hand_account = frappe.db.get_value("Account", {"account_type": "Stock",
-			"warehouse": repack.get("items")[1].t_warehouse})
-
+		stock_in_hand_account = get_inventory_account(repack.company, repack.get("items")[1].t_warehouse)
 		rm_stock_value_diff = abs(frappe.db.get_value("Stock Ledger Entry", {"voucher_type": "Stock Entry",
 			"voucher_no": repack.name, "item_code": "_Test Item"}, "stock_value_difference"))
 
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 4d96c42..58bcff0 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -1,1241 +1,1282 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2013-03-29 18:22:12",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
+ "allow_import": 0, 
+ "allow_rename": 0, 
+ "autoname": "hash", 
+ "beta": 0, 
+ "creation": "2013-03-29 18:22:12", 
+ "custom": 0, 
+ "docstatus": 0, 
+ "doctype": "DocType", 
+ "document_type": "Other", 
+ "editable_grid": 1, 
+ "engine": "InnoDB", 
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "barcode",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Barcode",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "barcode", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Barcode", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "section_break_2",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "section_break_2", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "s_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Source Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "s_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "s_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Source Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "s_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break1", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 2,
-   "fieldname": "t_warehouse",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Target Warehouse",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "t_warehouse",
-   "oldfieldtype": "Link",
-   "options": "Warehouse",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 2, 
+   "fieldname": "t_warehouse", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Target Warehouse", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "t_warehouse", 
+   "oldfieldtype": "Link", 
+   "options": "Warehouse", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "sec_break1",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "sec_break1", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "item_code",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Item Code",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "item_code",
-   "oldfieldtype": "Link",
-   "options": "Item",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "item_code", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Item Code", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "item_code", 
+   "oldfieldtype": "Link", 
+   "options": "Item", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break2", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "item_name",
-   "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 1,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Item Name",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "item_name", 
+   "fieldtype": "Data", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 1, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Item Name", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 1,
-   "columns": 0,
-   "fieldname": "section_break_8",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 1, 
+   "columns": 0, 
+   "fieldname": "section_break_8", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "print_width": "300px",
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text Editor", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "description", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "print_width": "300px", 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0, 
    "width": "300px"
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "column_break_10",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "column_break_10", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image",
-   "fieldtype": "Attach",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image", 
+   "fieldtype": "Attach", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "image_view",
-   "fieldtype": "Image",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Image View",
-   "length": 0,
-   "no_copy": 0,
-   "options": "image",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "image_view", 
+   "fieldtype": "Image", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Image View", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "image", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "quantity_and_rate",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Quantity and Rate",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "quantity_and_rate", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Quantity and Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 3,
-   "fieldname": "qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Qty",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 3, 
+   "fieldname": "qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 1, 
+   "in_standard_filter": 0, 
+   "label": "Qty", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Rate (as per Stock UOM)",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "incoming_rate",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 1, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Rate (as per Stock UOM)", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "incoming_rate", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "basic_amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Basic Amount",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "basic_amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Basic Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "additional_cost",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Additional Cost",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "additional_cost", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Additional Cost", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "amount",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Amount",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "amount",
-   "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "amount", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Amount", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "amount", 
+   "oldfieldtype": "Currency", 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "valuation_rate",
-   "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Valuation Rate",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "valuation_rate", 
+   "fieldtype": "Currency", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Valuation Rate", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Company:company:default_currency", 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break3", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "conversion_factor",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Conversion Factor",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "conversion_factor",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "conversion_factor", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Conversion Factor", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "conversion_factor", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "stock_uom",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "stock_uom",
-   "oldfieldtype": "Link",
-   "options": "UOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "stock_uom", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "stock_uom", 
+   "oldfieldtype": "Link", 
+   "options": "UOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "transfer_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Qty as per Stock UOM",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "transfer_qty",
-   "oldfieldtype": "Currency",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "transfer_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Qty as per Stock UOM", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "transfer_qty", 
+   "oldfieldtype": "Currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 1, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no_batch",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial No / Batch",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no_batch", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No / Batch", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "serial_no",
-   "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Serial No",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "serial_no",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "serial_no", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Serial No", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "serial_no", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break4", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "batch_no",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Batch No",
-   "length": 0,
-   "no_copy": 0,
-   "oldfieldname": "batch_no",
-   "oldfieldtype": "Link",
-   "options": "Batch",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "batch_no", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Batch No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "oldfieldname": "batch_no", 
+   "oldfieldtype": "Link", 
+   "options": "Batch", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "accounting",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Accounting",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "accounting", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Accounting", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "expense_account",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Difference Account",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Account",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "depends_on": "eval:cint(frappe.sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "expense_account", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Difference Account", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Account", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break5",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break5", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": ":Company",
-   "depends_on": "eval:cint(sys_defaults.auto_accounting_for_stock)",
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Cost Center",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Cost Center",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "default": ":Company", 
+   "depends_on": "eval:cint(frappe.sys_defaults.auto_accounting_for_stock)", 
+   "fieldname": "cost_center", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Cost Center", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "Cost Center", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "more_info",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "More Information",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "more_info", 
+   "fieldtype": "Section Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "More Information", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "allow_zero_valuation_rate",
-   "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Allow Zero Valuation Rate",
-   "length": 0,
-   "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "allow_zero_valuation_rate", 
+   "fieldtype": "Check", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Allow Zero Valuation Rate", 
+   "length": 0, 
+   "no_copy": 1, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 1,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "actual_qty",
-   "fieldtype": "Float",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Actual Qty (at source/target)",
-   "length": 0,
-   "no_copy": 1,
-   "oldfieldname": "actual_qty",
-   "oldfieldtype": "Read Only",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 1, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "actual_qty", 
+   "fieldtype": "Float", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Actual Qty (at source/target)", 
+   "length": 0, 
+   "no_copy": 1, 
+   "oldfieldname": "actual_qty", 
+   "oldfieldtype": "Read Only", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 1, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "BOM No. for a Finished Good Item",
-   "fieldname": "bom_no",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "BOM No",
-   "length": 0,
-   "no_copy": 0,
-   "options": "BOM",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "BOM No. for a Finished Good Item", 
+   "fieldname": "bom_no", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "BOM No", 
+   "length": 0, 
+   "no_copy": 0, 
+   "options": "BOM", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "col_break6",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "col_break6", 
+   "fieldtype": "Column Break", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "description": "Material Request used to make this Stock Entry",
-   "fieldname": "material_request",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "description": "Material Request used to make this Stock Entry", 
+   "fieldname": "material_request", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
-  },
+  }, 
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "material_request_item",
-   "fieldtype": "Link",
-   "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Material Request Item",
-   "length": 0,
-   "no_copy": 1,
-   "options": "Material Request Item",
-   "permlevel": 0,
-   "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
+   "allow_bulk_edit": 0, 
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "columns": 0, 
+   "fieldname": "material_request_item", 
+   "fieldtype": "Link", 
+   "hidden": 1, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_global_search": 0, 
+   "in_list_view": 0, 
+   "in_standard_filter": 0, 
+   "label": "Material Request Item", 
+   "length": 0, 
+   "no_copy": 1, 
+   "options": "Material Request Item", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 1, 
+   "remember_last_selected_value": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
    "unique": 0
   }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2017-04-21 02:56:48.306627",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Stock Entry Detail",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_order": "ASC",
- "track_changes": 0,
+ ], 
+ "has_web_view": 0, 
+ "hide_heading": 0, 
+ "hide_toolbar": 0, 
+ "idx": 1, 
+ "image_view": 0, 
+ "in_create": 0, 
+ "is_submittable": 0, 
+ "issingle": 0, 
+ "istable": 1, 
+ "max_attachments": 0, 
+ "modified": "2017-06-08 10:38:10.914780", 
+ "modified_by": "prateeksha@erpnext.com", 
+ "module": "Stock", 
+ "name": "Stock Entry Detail", 
+ "owner": "Administrator", 
+ "permissions": [], 
+ "quick_entry": 0, 
+ "read_only": 0, 
+ "read_only_onload": 0, 
+ "show_name_in_global_search": 0, 
+ "sort_order": "ASC", 
+ "track_changes": 0, 
  "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index f5aced3..8275c84 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -694,7 +694,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2016-12-15 14:45:07.733480", 
+ "modified": "2017-06-09 14:45:07.888888", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Ledger Entry", 
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index 55a307c..b5d2e3f 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -129,3 +129,5 @@
 		frappe.db.commit()
 		frappe.db.sql("""alter table `tabStock Ledger Entry`
 			add index posting_sort_index(posting_date, posting_time, name)""")
+
+	frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
index 636b2af..a6d5383 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.js
@@ -133,7 +133,7 @@
 	set_default_expense_account: function() {
 		var me = this;
 		if(this.frm.doc.company) {
-			if (sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
+			if (frappe.sys_defaults.auto_accounting_for_stock && !this.frm.doc.expense_account) {
 				return this.frm.call({
 					method: "erpnext.accounts.utils.get_company_default",
 					args: {
@@ -155,7 +155,7 @@
 
 		this.setup_posting_date_time_check();
 
-		if (sys_defaults.auto_accounting_for_stock) {
+		if (frappe.sys_defaults.auto_accounting_for_stock) {
 			this.frm.add_fetch("company", "stock_adjustment_account", "expense_account");
 			this.frm.add_fetch("company", "cost_center", "cost_center");
 
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 84ab7c3..3d37053 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -41,7 +41,7 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
@@ -477,7 +477,7 @@
  "istable": 0, 
  "max_attachments": 1, 
  "menu_index": 0, 
- "modified": "2017-04-21 16:58:53.475787", 
+ "modified": "2017-06-13 14:28:56.013804", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Reconciliation", 
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index 31d1926..d010313 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -6,6 +6,7 @@
 from frappe.utils import cint
 from erpnext import set_perpetual_inventory
 from frappe.test_runner import make_test_records
+from erpnext.accounts.doctype.account.test_account import get_inventory_account, create_account
 
 import frappe
 import unittest
@@ -33,21 +34,16 @@
 	def test_warehouse_renaming(self):
 		set_perpetual_inventory(1)
 		create_warehouse("Test Warehouse for Renaming 1")
-
-		self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 1 - _TC"))
-		self.assertTrue(frappe.db.get_value("Account",
-			filters={"warehouse": "Test Warehouse for Renaming 1 - _TC"}))
+		account = get_inventory_account("_Test Company", "Test Warehouse for Renaming 1 - _TC")
+		self.assertTrue(frappe.db.get_value("Warehouse", filters={"account": account}))
 
 		# Rename with abbr
 		if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 2 - _TC"):
 			frappe.delete_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC")
 		rename_doc("Warehouse", "Test Warehouse for Renaming 1 - _TC", "Test Warehouse for Renaming 2 - _TC")
 
-		self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 2 - _TC"))
-		self.assertTrue(frappe.db.get_value("Account",
-			filters={"warehouse": "Test Warehouse for Renaming 2 - _TC"}))
-		self.assertFalse(frappe.db.get_value("Account",
-			filters={"warehouse": "Test Warehouse for Renaming 1 - _TC"}))
+		self.assertTrue(frappe.db.get_value("Warehouse",
+			filters={"account": "Test Warehouse for Renaming 1 - _TC"}))
 
 		# Rename without abbr
 		if frappe.db.exists("Warehouse", "Test Warehouse for Renaming 3 - _TC"):
@@ -55,19 +51,14 @@
 
 		rename_doc("Warehouse", "Test Warehouse for Renaming 2 - _TC", "Test Warehouse for Renaming 3")
 
-		self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Renaming 3 - _TC"))
-		self.assertTrue(frappe.db.get_value("Account",
-			filters={"warehouse": "Test Warehouse for Renaming 3 - _TC"}))
+		self.assertTrue(frappe.db.get_value("Warehouse",
+			filters={"account": "Test Warehouse for Renaming 1 - _TC"}))
 
 		# Another rename with multiple dashes
 		if frappe.db.exists("Warehouse", "Test - Warehouse - Company - _TC"):
 			frappe.delete_doc("Warehouse", "Test - Warehouse - Company - _TC")
 		rename_doc("Warehouse", "Test Warehouse for Renaming 3 - _TC", "Test - Warehouse - Company")
 
-		self.assertTrue(frappe.db.exists("Account", "Test - Warehouse - Company - _TC"))
-		self.assertTrue(frappe.db.get_value("Account", filters={"warehouse": "Test - Warehouse - Company - _TC"}))
-		self.assertFalse(frappe.db.get_value("Account", filters={"warehouse": "Test Warehouse for Renaming 3 - _TC"}))
-
 	def test_warehouse_merging(self):
 		set_perpetual_inventory(1)
 
@@ -96,10 +87,8 @@
 
 		self.assertEqual(bin_qty, existing_bin_qty)
 
-		self.assertFalse(frappe.db.exists("Account", "Test Warehouse for Merging 1 - _TC"))
-		self.assertTrue(frappe.db.exists("Account", "Test Warehouse for Merging 2 - _TC"))
-		self.assertTrue(frappe.db.get_value("Account",
-			filters={"warehouse": "Test Warehouse for Merging 2 - _TC"}))
+		self.assertTrue(frappe.db.get_value("Warehouse",
+			filters={"account": "Test Warehouse for Merging 2 - _TC"}))
 
 def create_warehouse(warehouse_name):
 	if not frappe.db.exists("Warehouse", warehouse_name + " - _TC"):
@@ -107,8 +96,13 @@
 		w.warehouse_name = warehouse_name
 		w.parent_warehouse = "_Test Warehouse Group - _TC"
 		w.company = "_Test Company"
+		make_account_for_warehouse(warehouse_name, w)
+		w.account = warehouse_name + " - _TC"
 		w.save()
 
-	if not frappe.get_value('Account', dict(warehouse=warehouse_name + ' - _TC')):
-		print 'Warehouse {0} not linked'.format(warehouse_name)
-
+def make_account_for_warehouse(warehouse_name, warehouse_obj):
+	if not frappe.db.exists("Account", warehouse_name + " - _TC"):
+		parent_account = frappe.db.get_value('Account', 
+			{'company': warehouse_obj.company, 'is_group':1, 'account_type': 'Stock'},'name')
+		account = create_account(account_name=warehouse_name, \
+				account_type="Stock", parent_account= parent_account, company=warehouse_obj.company)
\ No newline at end of file
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 8a9ecbd..5c23a97 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -28,7 +28,7 @@
 				function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
 		}
 		
-		cur_frm.toggle_enable(['is_group', 'company'], false);
+		frm.toggle_enable(['is_group', 'company'], false);
 
 		frm.fields_dict['parent_warehouse'].get_query = function(doc) {
 			return {
@@ -37,17 +37,18 @@
 				}
 			}
 		}
-	}
-});
 
-cur_frm.set_query("create_account_under", function() {
-	return {
-		filters: {
-			"company": cur_frm.doc.company,
-			'is_group': 1
+		frm.fields_dict['account'].get_query = function(doc) {
+			return {
+				filters: {
+					"is_group": 0,
+					"account_type": "Stock",
+					"company": frm.doc.company
+				}
+			}
 		}
 	}
-})
+});
 
 function convert_to_group_or_ledger(frm){
 	frappe.call({
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 9beea6c..275bdef 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 1, 
  "beta": 0, 
@@ -193,9 +194,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "depends_on": "eval:sys_defaults.auto_accounting_for_stock", 
-   "description": "Account for the warehouse (Perpetual Inventory) will be created under this Account.", 
-   "fieldname": "create_account_under", 
+   "fieldname": "account", 
    "fieldtype": "Link", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -204,11 +203,12 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Parent Account", 
+   "label": "Account", 
    "length": 0, 
    "no_copy": 0, 
    "options": "Account", 
    "permlevel": 0, 
+   "precision": "", 
    "print_hide": 0, 
    "print_hide_if_no_value": 0, 
    "read_only": 0, 
@@ -666,18 +666,18 @@
    "unique": 0
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-building", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:27:03.696714", 
+ "modified": "2017-04-21 16:49:19.018576", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Warehouse", 
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 15c5e2a..b0335d7 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -4,8 +4,9 @@
 from __future__ import unicode_literals
 import frappe, erpnext
 from frappe.utils import cint, validate_email_add
-from frappe import throw, msgprint, _
+from frappe import throw, _
 from frappe.utils.nestedset import NestedSet
+from erpnext.stock import get_warehouse_account
 
 class Warehouse(NestedSet):
 	nsm_parent_field = 'parent_warehouse'
@@ -20,8 +21,7 @@
 
 	def onload(self):
 		'''load account name for General Ledger Report'''
-		account = frappe.db.get_value("Account", {
-			"account_type": "Stock", "company": self.company, "warehouse": self.name, "is_group": 0})
+		account = self.account or get_warehouse_account(self.name, self.company)
 
 		if account:
 			self.set_onload('account', account)
@@ -30,77 +30,9 @@
 		if self.email_id:
 			validate_email_add(self.email_id, True)
 
-		self.update_parent_account()
-
-	def update_parent_account(self):
-		if not getattr(self, "__islocal", None) \
-			and cint(frappe.defaults.get_global_default("auto_accounting_for_stock")) \
-			and (self.create_account_under != frappe.db.get_value("Warehouse", self.name, "create_account_under")):
-
-				self.validate_parent_account()
-
-				warehouse_account = frappe.db.get_value("Account",
-					{"account_type": "Stock", "company": self.company, "warehouse": self.name, "is_group": 0},
-					["name", "parent_account"])
-
-				if warehouse_account and warehouse_account[1] != self.create_account_under:
-					acc_doc = frappe.get_doc("Account", warehouse_account[0])
-					acc_doc.parent_account = self.create_account_under
-					acc_doc.save()
-
 	def on_update(self):
-		self.create_account_head()
 		self.update_nsm_model()
 
-	def create_account_head(self):
-		'''Create new account head if there is no account linked to this Warehouse'''
-		from erpnext.accounts.doctype.account.account import BalanceMismatchError
-		if cint(frappe.defaults.get_global_default("auto_accounting_for_stock")):
-			if not self.get_account():
-				if self.get("__islocal") or not frappe.db.get_value(
-						"Stock Ledger Entry", {"warehouse": self.name}):
-
-					self.validate_parent_account()
-					ac_doc = frappe.get_doc({
-						"doctype": "Account",
-						'account_name': self.warehouse_name,
-						'parent_account': self.parent_warehouse if self.parent_warehouse \
-							else self.create_account_under,
-						'is_group': self.is_group,
-						'company':self.company,
-						"account_type": "Stock",
-						"warehouse": self.name,
-						"freeze_account": "No"
-					})
-					ac_doc.flags.ignore_permissions = True
-					ac_doc.flags.ignore_mandatory = True
-					try:
-						ac_doc.insert()
-						msgprint(_("Account head {0} created").format(ac_doc.name), indicator='green', alert=True)
-
-					except frappe.DuplicateEntryError:
-						msgprint(_("Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists").format(frappe.bold(self.name)),
-							indicator='orange')
-
-					except BalanceMismatchError:
-						msgprint(_("Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse"))
-
-	def validate_parent_account(self):
-		if not self.company:
-			frappe.throw(_("Warehouse {0}: Company is mandatory").format(self.name))
-
-		if not self.create_account_under:
-			parent_account = frappe.db.sql("""select name from tabAccount
-				where account_type='Stock' and company=%s and is_group=1
-				and (warehouse is null or warehouse = '')""", self.company)
-
-			if parent_account:
-				frappe.db.set_value("Warehouse", self.name, "create_account_under", parent_account[0][0])
-				self.create_account_under = parent_account[0][0]
-		elif frappe.db.get_value("Account", self.create_account_under, "company") != self.company:
-			frappe.throw(_("Warehouse {0}: Parent account {1} does not bolong to the company {2}")
-				.format(self.name, self.create_account_under, self.company))
-
 	def update_nsm_model(self):
 		frappe.utils.nestedset.update_nsm(self)
 
@@ -115,10 +47,6 @@
 			else:
 				frappe.db.sql("delete from `tabBin` where name = %s", d['name'])
 
-		warehouse_account = self.get_account()
-		if warehouse_account:
-			frappe.delete_doc("Account", warehouse_account)
-
 		if self.check_if_sle_exists():
 			throw(_("Warehouse can not be deleted as stock ledger entry exists for this warehouse."))
 
@@ -146,36 +74,8 @@
 			if self.company != frappe.db.get_value("Warehouse", new_warehouse, "company"):
 				frappe.throw(_("Both Warehouse must belong to same Company"))
 
-		self.rename_account_for(old_name, new_warehouse, merge)
-
 		return new_warehouse
 
-	def rename_account_for(self, old_name, new_name, merge):
-		old_account_name = frappe.get_value('Account', dict(warehouse=old_name))
-
-		if old_account_name:
-			if not merge:
-				# old account name is same as old name, so rename the account too
-				if old_account_name == erpnext.encode_company_abbr(old_name, self.company):
-					frappe.rename_doc("Account", old_account_name, new_name)
-			else:
-				# merge
-				target_account = frappe.get_value('Account', dict(warehouse=new_name))
-				if target_account:
-					# target warehouse has account, merge into target account
-					frappe.rename_doc("Account", old_account_name,
-						target_account, merge=True)
-				else:
-					# target warehouse does not have account, use this account
-					frappe.rename_doc("Account", old_account_name,
-						new_name, merge=False)
-
-					# rename link
-					frappe.db.set_value('Account', new_name, 'warehouse', new_name)
-
-	def get_account(self):
-		return frappe.get_value('Account', dict(warehouse=self.name))
-
 	def after_rename(self, old_name, new_name, merge=False):
 		new_warehouse_name = self.get_new_warehouse_name_without_abbr(new_name)
 		self.db_set("warehouse_name", new_warehouse_name)
@@ -222,12 +122,6 @@
 		elif self.check_if_sle_exists():
 			throw(_("Warehouses with existing transaction can not be converted to ledger."))
 		else:
-			account_name = self.get_account()
-			if account_name:
-				doc = frappe.get_doc("Account", account_name)
-				doc.warehouse = self.name
-				doc.convert_group_to_ledger()
-
 			self.is_group = 0
 			self.save()
 			return 1
@@ -236,12 +130,6 @@
 		if self.check_if_sle_exists():
 			throw(_("Warehouses with existing transaction can not be converted to group."))
 		else:
-			account_name = self.get_account()
-			if account_name:
-				doc = frappe.get_doc("Account", account_name)
-				doc.flags.exclude_account_type_check = True
-				doc.convert_ledger_to_group()
-
 			self.is_group = 1
 			self.save()
 			return 1
@@ -285,4 +173,4 @@
 @frappe.whitelist()
 def convert_to_group_or_ledger():
 	args = frappe.form_dict
-	return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
+	return frappe.get_doc("Warehouse", args.docname).convert_to_group_or_ledger()
\ No newline at end of file
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
index eeeb9ad..a7d7149 100644
--- a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.js
@@ -8,7 +8,7 @@
 			"label": __("From Date"),
 			"fieldtype": "Date",
 			"width": "80",
-			"default": sys_defaults.year_start_date,
+			"default": frappe.sys_defaults.year_start_date,
 		},
 		{
 			"fieldname":"to_date",
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
index a60b3eb..b23c908 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.js
@@ -8,7 +8,7 @@
 			"label": __("From Date"),
 			"fieldtype": "Date",
 			"width": "80",
-			"default": sys_defaults.year_start_date,
+			"default": frappe.sys_defaults.year_start_date,
 		},
 		{
 			"fieldname":"to_date",
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index fca91d6..e7cb9ad 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -23,7 +23,8 @@
 				if qty_dict.opening_qty or qty_dict.in_qty or qty_dict.out_qty or qty_dict.bal_qty:
 					data.append([item, item_map[item]["item_name"], item_map[item]["description"], wh, batch,
 						flt(qty_dict.opening_qty, float_precision), flt(qty_dict.in_qty, float_precision),
-						flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision)
+						flt(qty_dict.out_qty, float_precision), flt(qty_dict.bal_qty, float_precision),
+						 item_map[item]["stock_uom"]
 					])
 
 	return columns, data
@@ -33,7 +34,9 @@
 
 	columns = [_("Item") + ":Link/Item:100"] + [_("Item Name") + "::150"] + [_("Description") + "::150"] + \
 	[_("Warehouse") + ":Link/Warehouse:100"] + [_("Batch") + ":Link/Batch:100"] + [_("Opening Qty") + ":Float:90"] + \
-	[_("In Qty") + ":Float:80"] + [_("Out Qty") + ":Float:80"] + [_("Balance Qty") + ":Float:90"]
+	[_("In Qty") + ":Float:80"] + [_("Out Qty") + ":Float:80"] + [_("Balance Qty") + ":Float:90"] + \
+	[_("UOM") + "::90"]
+
 
 	return columns
 
@@ -87,7 +90,7 @@
 
 def get_item_details(filters):
 	item_map = {}
-	for d in frappe.db.sql("select name, item_name, description from tabItem", as_dict=1):
+	for d in frappe.db.sql("select name, item_name, description, stock_uom from tabItem", as_dict=1):
 		item_map.setdefault(d.name, d)
 
 	return item_map
diff --git a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
index 0e12907..ade004c 100644
--- a/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
+++ b/erpnext/stock/report/delivery_note_trends/delivery_note_trends.js
@@ -3,7 +3,7 @@
 
 frappe.require("assets/erpnext/js/sales_trends_filters.js", function() {
 	frappe.query_reports["Delivery Note Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_sales_trends_filters()
 	}
 });
 
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
index ba61ee5..2482cf8 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js
@@ -7,13 +7,13 @@
 			"fieldname":"from_date",
 			"label": __("From Date"),
 			"fieldtype": "Date",
-			"default": sys_defaults.year_start_date
+			"default": frappe.sys_defaults.year_start_date
 		},
 		{
 			"fieldname":"to_date",
 			"label": __("To Date"),
 			"fieldtype": "Date",
-			"default": get_today()
+			"default": frappe.datetime.get_today()
 		}
 	]
 }
\ No newline at end of file
diff --git a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
index d94b49e..63d53fb 100644
--- a/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
+++ b/erpnext/stock/report/purchase_receipt_trends/purchase_receipt_trends.js
@@ -3,7 +3,7 @@
 
 frappe.require("assets/erpnext/js/purchase_trends_filters.js", function() {
 	frappe.query_reports["Purchase Receipt Trends"] = {
-		filters: get_filters()
+		filters: erpnext.get_sales_trends_filters()
 	}
 });
 
diff --git a/erpnext/stock/report/stock_balance/stock_balance.js b/erpnext/stock/report/stock_balance/stock_balance.js
index 36d018c..90f4de0 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.js
+++ b/erpnext/stock/report/stock_balance/stock_balance.js
@@ -9,7 +9,7 @@
 			"fieldtype": "Date",
 			"width": "80",
 			"reqd": 1,
-			"default": sys_defaults.year_start_date,
+			"default": frappe.sys_defaults.year_start_date,
 		},
 		{
 			"fieldname":"to_date",
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index d14dba4..5e373d6 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, getdate
+from frappe.utils import flt, cint, getdate
 
 def execute(filters=None):
 	if not filters: filters = {}
@@ -158,8 +158,9 @@
 		qty_dict = iwb_map[(company, item, warehouse)]
 		
 		no_transactions = True
+		float_precision = cint(frappe.db.get_default("float_precision")) or 3
 		for key, val in qty_dict.items():
-			val = flt(val, 3)
+			val = flt(val, float_precision)
 			qty_dict[key] = val
 			if key != "val_rate" and val:
 				no_transactions = False
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 6ee0e85..529ae89 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -14,6 +14,7 @@
  "engine": "InnoDB", 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -43,6 +44,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -68,10 +70,11 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -100,6 +103,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -129,6 +133,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -156,6 +161,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -188,6 +194,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -220,6 +227,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -251,6 +259,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -280,6 +289,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -311,6 +321,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -339,6 +350,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -370,6 +382,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -398,6 +411,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -427,6 +441,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -456,6 +471,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -485,6 +501,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -513,6 +530,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -543,6 +561,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -573,6 +592,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -602,6 +622,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -633,6 +654,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -662,6 +684,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -693,6 +716,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -723,6 +747,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -752,6 +777,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -780,6 +806,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -820,7 +847,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-04-05 21:42:23.740187", 
+ "modified": "2017-06-13 14:29:19.581715", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Issue", 
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 652927e..868c61f 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_guest_to_view": 0, 
  "allow_import": 1, 
  "allow_rename": 0, 
  "autoname": "naming_series:", 
@@ -12,6 +13,7 @@
  "editable_grid": 0, 
  "fields": [
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -39,10 +41,11 @@
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
-   "set_only_once": 0, 
+   "set_only_once": 1, 
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -75,6 +78,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -106,6 +110,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -135,6 +140,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -165,6 +171,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -196,6 +203,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -224,6 +232,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -254,6 +263,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -284,6 +294,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -315,6 +326,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -346,6 +358,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -378,6 +391,7 @@
    "width": "300px"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -407,6 +421,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -436,6 +451,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -464,6 +480,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -492,6 +509,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -523,6 +541,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -553,6 +572,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -584,6 +604,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -614,6 +635,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -644,6 +666,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 1, 
    "collapsible": 0, 
@@ -673,6 +696,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -702,6 +726,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -731,6 +756,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -760,6 +786,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -789,6 +816,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -822,6 +850,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -853,6 +882,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -881,6 +911,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -910,6 +941,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -939,6 +971,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -971,6 +1004,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 1, 
@@ -1000,6 +1034,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1031,6 +1066,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1059,6 +1095,7 @@
    "width": "50%"
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1089,6 +1126,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1119,6 +1157,7 @@
    "unique": 0
   }, 
   {
+   "allow_bulk_edit": 0, 
    "allow_on_submit": 0, 
    "bold": 0, 
    "collapsible": 0, 
@@ -1151,18 +1190,18 @@
    "width": "150px"
   }
  ], 
+ "has_web_view": 0, 
  "hide_heading": 0, 
  "hide_toolbar": 0, 
  "icon": "fa fa-bug", 
  "idx": 1, 
  "image_view": 0, 
  "in_create": 0, 
- "in_dialog": 0, 
  "is_submittable": 0, 
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-02-20 13:33:02.669154", 
+ "modified": "2017-06-13 14:29:10.442536", 
  "modified_by": "Administrator", 
  "module": "Support", 
  "name": "Warranty Claim", 
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 01b7b48..bca5987 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -19,7 +19,6 @@
 	init: function(wrapper) {
 		this._super({
 			title: __("Support Analtyics"),
-			page: wrapper,
 			parent: $(wrapper).find('.layout-main'),
 			page: wrapper.page,
 			doctypes: ["Issue", "Fiscal Year"],
@@ -67,7 +66,7 @@
 
 
 		$.each(frappe.report_dump.data["Issue"], function(i, d) {
-			var dateobj = dateutil.str_to_obj(d.creation);
+			var dateobj = frappe.datetime.str_to_obj(d.creation);
 			var date = d.creation.split(" ")[0];
 			var col = me.column_map[date];
 			if(col) {
@@ -77,17 +76,17 @@
 					total_closed[col.field] = flt(total_closed[col.field]) + 1;
 
 					days_to_close[col.field] = flt(days_to_close[col.field])
-						+ dateutil.get_diff(d.resolution_date, d.creation);
+						+ frappe.datetime.get_diff(d.resolution_date, d.creation);
 
 					hours_to_close[col.field] = flt(hours_to_close[col.field])
-						+ dateutil.get_hour_diff(d.resolution_date, d.creation);
+						+ frappe.datetime.get_hour_diff(d.resolution_date, d.creation);
 
 				}
 				if (d.first_responded_on) {
 					total_responded[col.field] = flt(total_responded[col.field]) + 1;
 
 					hours_to_respond[col.field] = flt(hours_to_respond[col.field])
-						+ dateutil.get_hour_diff(d.first_responded_on, d.creation);
+						+ frappe.datetime.get_hour_diff(d.first_responded_on, d.creation);
 				}
 			}
 		});
diff --git a/erpnext/templates/generators/item.html b/erpnext/templates/generators/item.html
index c0399a7..de54493 100644
--- a/erpnext/templates/generators/item.html
+++ b/erpnext/templates/generators/item.html
@@ -87,7 +87,7 @@
 				<table class="table borderless" style="width: 100%">
 				{% for d in website_specifications -%}
 					<tr>
-						<td class="uppercase text-muted" style="width: 30%;">{{ d.label }}</td>
+						<td class="text-muted" style="width: 30%;">{{ d.label }}</td>
 						<td>{{ d.description }}</td>
 					</tr>
 				{%- endfor %}
diff --git a/erpnext/templates/includes/cart.js b/erpnext/templates/includes/cart.js
index ee98b23..51be954 100644
--- a/erpnext/templates/includes/cart.js
+++ b/erpnext/templates/includes/cart.js
@@ -4,7 +4,8 @@
 // js inside blog page
 
 // shopping cart
-frappe.provide("shopping_cart");
+frappe.provide("erpnext.shopping_cart");
+var shopping_cart = erpnext.shopping_cart;
 
 $.extend(shopping_cart, {
 	show_error: function(title, text) {
@@ -18,7 +19,7 @@
 		shopping_cart.bind_change_qty();
 		shopping_cart.bind_dropdown_cart_buttons();
 	},
-	
+
 	bind_address_select: function() {
 		$(".cart-addresses").find('input[data-address-name]').on("click", function() {
 			if($(this).prop("checked")) {
@@ -65,13 +66,13 @@
 			var newVal = $(this).val();
 			shopping_cart.shopping_cart_update(item_code, newVal);
 		});
-		
-		$(".cart-items").on('click', '.number-spinner button', function () {  
+
+		$(".cart-items").on('click', '.number-spinner button', function () {
 			var btn = $(this),
 				input = btn.closest('.number-spinner').find('input'),
 				oldValue = input.val().trim(),
 				newVal = 0;
-	
+
 			if (btn.attr('data-dir') == 'up') {
 				newVal = parseInt(oldValue) + 1;
 			} else {
@@ -80,17 +81,17 @@
 				}
 			}
 			input.val(newVal);
-			var item_code = input.attr("data-item-code"); 
+			var item_code = input.attr("data-item-code");
 			shopping_cart.shopping_cart_update(item_code, newVal);
 		});
 	},
-	
+
 	render_tax_row: function($cart_taxes, doc, shipping_rules) {
 		var shipping_selector;
 		if(shipping_rules) {
 			shipping_selector = '<select class="form-control">' + $.map(shipping_rules, function(rule) {
-					return '<option value="' + rule[0] + '">' + rule[1] + '</option>' }).join("\n") +
-				'</select>';
+				return '<option value="' + rule[0] + '">' + rule[1] + '</option>' }).join("\n") +
+			'</select>';
 		}
 
 		var $tax_row = $(repl('<div class="row">\
@@ -162,6 +163,6 @@
 });
 
 function show_terms() {
-  var html = $(".cart-terms").html();
-    frappe.msgprint(html);
+	var html = $(".cart-terms").html();
+	frappe.msgprint(html);
 }
diff --git a/erpnext/templates/includes/order/order_taxes.html b/erpnext/templates/includes/order/order_taxes.html
index 24ae088..471576f 100644
--- a/erpnext/templates/includes/order/order_taxes.html
+++ b/erpnext/templates/includes/order/order_taxes.html
@@ -6,11 +6,13 @@
 </div>
 {% endif %}
 {% for d in doc.taxes %}
+{% if d.base_tax_amount > 0 %}
 <div class="row tax-row">
     <div class="col-xs-8 text-right">{{ d.description }}</div>
     <div class="col-xs-4 text-right">
         {{ d.get_formatted("base_tax_amount") }}</div>
 </div>
+{% endif %}
 {% endfor %}
 <div class="row tax-grand-total-row">
     <div class="col-xs-8 text-right text-uppercase h6 text-muted">{{ _("Grand Total") }}</div>
diff --git a/erpnext/templates/includes/product_list.js b/erpnext/templates/includes/product_list.js
index 28c626f..2f9d978 100644
--- a/erpnext/templates/includes/product_list.js
+++ b/erpnext/templates/includes/product_list.js
@@ -13,7 +13,6 @@
 	$.ajax({
 		method: "GET",
 		url: "/",
-		dataType: "json",
 		data: {
 			cmd: "erpnext.templates.pages.product_search.get_product_list",
 			start: window.start,
@@ -40,10 +39,10 @@
 	if(data.length < 10) {
 		if(!table) {
 			$(".more-btn")
-				.replaceWith("<div class='alert alert-warning'>No products found.</div>");
+				.replaceWith("<div class='alert alert-warning'>{{ _("No products found.") }}</div>");
 		} else {
 			$(".more-btn")
-				.replaceWith("<div class='text-muted'>Nothing more to show.</div>");
+				.replaceWith("<div class='text-muted'>{{ _("Nothing more to show.") }}</div>");
 		}
 	} else {
 		$(".more-btn").toggle(true)
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index 4d1446b..3905959 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -15,18 +15,18 @@
 			$(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.in_stock));
 			if(r.message && r.message.price) {
 				$(".item-price")
-					.html(r.message.price.formatted_price + " per " + r.message.uom);
+					.html(r.message.price.formatted_price + " {{ _("per") }} " + r.message.uom);
 
 				if(r.message.in_stock==0) {
-					$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> Not in stock</div>");
+					$(".item-stock").html("<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>");
 				}
 				else if(r.message.in_stock==1) {
-					qty_display = "In stock"
+					var qty_display = "{{ _("In stock") }}";
 					if (r.message.show_stock_qty) {
-						qty_display = "Available ("+r.message.stock_qty+ " in stock)"
+						qty_display += " ("+r.message.stock_qty+")";
 					}
 					$(".item-stock").html("<div style='color: green'>\
-						<i class='fa fa-check'></i> "+__(qty_display)+"</div>");
+						<i class='fa fa-check'></i> "+qty_display+"</div>");
 				}
 
 				if(r.message.qty) {
@@ -40,7 +40,9 @@
 	})
 
 	$("#item-add-to-cart button").on("click", function() {
-		shopping_cart.update_cart({
+		frappe.provide('erpnext.shopping_cart');
+
+		erpnext.shopping_cart.update_cart({
 			item_code: get_item_code(),
 			qty: 1,
 			callback: function(r) {
@@ -66,7 +68,7 @@
 			var item_code = find_closest_match(attribute, attribute_value);
 
 			if (!item_code) {
-				msgprint(__("Cannot find a matching Item. Please select some other value for {0}.", [attribute]))
+				frappe.msgprint(__("Cannot find a matching Item. Please select some other value for {0}.", [attribute]))
 				throw e;
 			}
 		}
@@ -87,7 +89,8 @@
 }
 
 function get_item_code() {
-	if(window.variant_info) {
+	var variant_info = window.variant_info;
+	if(variant_info) {
 		var attributes = get_selected_attributes();
 		var no_of_attributes = Object.keys(attributes).length;
 
@@ -102,9 +105,10 @@
 			var match = true;
 			for(var j in variant.attributes) {
 				if(attributes[variant.attributes[j].attribute]
-					!= variant.attributes[j].attribute_value) {
-						match = false;
-						break;
+					!= variant.attributes[j].attribute_value
+				) {
+					match = false;
+					break;
 				}
 			}
 			if(match) {
@@ -113,7 +117,7 @@
 		}
 		throw "Unable to match variant";
 	} else {
-		return item_code;
+		return window.item_code;
 	}
 }
 
@@ -126,6 +130,7 @@
 	var previous_no_of_attributes = 0;
 	var matched;
 
+	var variant_info = window.variant_info;
 	for(var i in variant_info) {
 		var variant = variant_info[i];
 		var match_score = 0;
diff --git a/erpnext/templates/pages/order.html b/erpnext/templates/pages/order.html
index 7129178..da9eb33 100644
--- a/erpnext/templates/pages/order.html
+++ b/erpnext/templates/pages/order.html
@@ -86,6 +86,24 @@
 			{% endif %}
 		{% endif %}
 	</div>
+	
+{% if attachments %}
+<div class="order-item-table">
+	<div class="row order-items order-item-header text-muted">
+		<div class="col-sm-12 h6 text-uppercase">
+			{{ _("Attachments") }}
+		</div>
+	</div>
+	<div class="row order-items">
+		<div class="col-sm-12">
+			{% for attachment in attachments %}
+			<p class="small">
+				<a href="{{ attachment.file_url }}" target="blank"> {{ attachment.file_name }} </a>
+			</p>
+			{% endfor %}
+		</div>
+	</div>
 </div>
-
+{% endif %}
+</div>
 {% endblock %}
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 296b907..b453c7e 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -5,6 +5,7 @@
 import frappe
 
 from frappe import _
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import show_attachments
 
 def get_context(context):
 	context.no_cache = 1
@@ -13,6 +14,9 @@
 	if hasattr(context.doc, "set_indicator"):
 		context.doc.set_indicator()
 
+	if show_attachments():
+                context.attachments = get_attachments(frappe.form_dict.doctype, frappe.form_dict.name)
+
 	context.parents = frappe.form_dict.parents
 	context.payment_ref = frappe.db.get_value("Payment Request",
 		{"reference_name": frappe.form_dict.name}, "name")
@@ -21,3 +25,7 @@
 
 	if not frappe.has_website_permission(context.doc):
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
+
+def get_attachments(dt, dn):
+        return frappe.get_all("File", fields=["name", "file_name", "file_url", "is_private"],
+                              filters = {"attached_to_name": dn, "attached_to_doctype": dt, "is_private":0})
diff --git a/erpnext/templates/pages/projects.js b/erpnext/templates/pages/projects.js
index ecacc34..99f0663 100644
--- a/erpnext/templates/pages/projects.js
+++ b/erpnext/templates/pages/projects.js
@@ -47,7 +47,6 @@
 				project: '{{ doc.name }}',
 				item_status: item_status,
 			},
-			dataType: "json",
 			success: function(data) {
 				if(typeof data.message == 'undefined') {
 					$('.project-'+ item).html("No "+ item_status +" "+ item);
@@ -68,8 +67,7 @@
 	}
 
 	var more_items = function(item, item_status){
-		if(item_status)
-		{
+		if(item_status) {
 			var item_status = $('.project-'+ item +'-section .btn-group .bold').hasClass('btn-closed-'+ item)
 				? 'closed' : 'open';
 		}
@@ -83,14 +81,13 @@
 				start: start,
 				item_status: item_status,
 			},
-			dataType: "json",
 			success: function(data) {
 
 				$(data.message).appendTo('.project-'+ item);
 				if(typeof data.message == 'undefined') {
 					$(".more-"+ item).toggle(false);
 				}
-			start = start+10;
+				start = start+10;
 			}
 		});
 	}
diff --git a/erpnext/templates/print_formats/includes/taxes.html b/erpnext/templates/print_formats/includes/taxes.html
index 55e0443..b0bd1d4 100644
--- a/erpnext/templates/print_formats/includes/taxes.html
+++ b/erpnext/templates/print_formats/includes/taxes.html
@@ -1,7 +1,7 @@
 {%- macro render_discount_amount(doc) -%}
 	{%- if doc.discount_amount -%}
 		<div class="row">
-			<div class="col-xs-5 text-right">
+			<div class="col-xs-5 {%- if not doc._align_labels_left %} text-right{%- endif -%}">
 				<label>{{ _("Discount Amount") }}</label></div>
 			<div class="col-xs-7 text-right">
 				- {{ doc.get_formatted("discount_amount", doc) }}
@@ -19,7 +19,7 @@
 		{%- for charge in data -%}
 			{%- if not charge.included_in_print_rate -%}
 			<div class="row">
-				<div class="col-xs-5 text-right">
+				<div class="col-xs-5 {%- if not doc._align_labels_left %} text-right{%- endif -%}">
 					<label>{{ charge.get_formatted("description") }}</label></div>
 				<div class="col-xs-7 text-right">
 					{{ frappe.format_value(frappe.utils.flt(charge.tax_amount),
diff --git a/erpnext/templates/utils.py b/erpnext/templates/utils.py
index 81dbdc9..e46fed6 100644
--- a/erpnext/templates/utils.py
+++ b/erpnext/templates/utils.py
@@ -19,13 +19,13 @@
         and c.email_id='{email_id}'""".format(email_id=sender))
 
     if not customer:
-    	lead = frappe.db.get_value('Lead', dict(email_id=sender))
-    if not lead:
-    	new_lead = frappe.get_doc(dict(
-    		doctype='Lead',
-    		email_id = sender,
-    		lead_name = sender.split('@')[0].title()
-    	)).insert(ignore_permissions=True)
+		lead = frappe.db.get_value('Lead', dict(email_id=sender))
+		if not lead:
+			new_lead = frappe.get_doc(dict(
+				doctype='Lead',
+				email_id = sender,
+				lead_name = sender.split('@')[0].title()
+			)).insert(ignore_permissions=True)
 
     opportunity = frappe.get_doc(dict(
     	doctype='Opportunity',
diff --git a/erpnext/translations/am.csv b/erpnext/translations/am.csv
index e13128b..a134658 100644
--- a/erpnext/translations/am.csv
+++ b/erpnext/translations/am.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ተከራይቷል
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ተጠቃሚ ተገቢነት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","አቁሟል የምርት ትዕዛዝ ሊሰረዝ አይችልም, ለመሰረዝ መጀመሪያ Unstop"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","አቁሟል የምርት ትዕዛዝ ሊሰረዝ አይችልም, ለመሰረዝ መጀመሪያ Unstop"
 DocType: Vehicle Service,Mileage,ርቀት
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,እርግጠኛ ነዎት ይህን ንብረት ቁራጭ ትፈልጋለህ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ይምረጡ ነባሪ አቅራቢ
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ይምረጡ ነባሪ አቅራቢ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},የምንዛሬ ዋጋ ዝርዝር ያስፈልጋል {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ግብይቱ ላይ ይሰላሉ.
 DocType: Purchase Order,Customer Contact,የደንበኛ ያግኙን
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ያልተከፈሉ {0} ሊሆን አይችልም ከ ዜሮ ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 ደቂቃ ነባሪ
 DocType: Leave Type,Leave Type Name,አይነት ስም ውጣ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ክፍት አሳይ
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ክፍት አሳይ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,ተከታታይ በተሳካ ሁኔታ ዘምኗል
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ጨርሰህ ውጣ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ጆርናል Entry ተረክቧል
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ባች ንጥል የሚቃጠልበት ሁኔታ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ባንክ ረቂቅ
 DocType: Mode of Payment Account,Mode of Payment Account,የክፍያ መለያ ሁነታ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,አሳይ አይነቶች
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,አሳይ አይነቶች
 DocType: Academic Term,Academic Term,ትምህርታዊ የሚቆይበት ጊዜ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ቁሳዊ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ብዛት
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,ብዛት
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,መለያዎች ሰንጠረዥ ባዶ መሆን አይችልም.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ብድር (ተጠያቂነቶች)
 DocType: Employee Education,Year of Passing,ያለፉት ዓመት
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","ማጣቀሻ:% s, ንጥል ኮድ:% s እና የደንበኛ:% s"
 DocType: Item,Country of Origin,የትውልድ ቦታ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ለሽያጭ የቀረበ እቃ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ክፍት ጉዳዮች
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,የጤና ጥበቃ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ክፍያ መዘግየት (ቀኖች)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,የአገልግሎት የወጪ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,የዋጋ ዝርዝር
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},መለያ ቁጥር: {0} አስቀድሞ የሽያጭ ደረሰኝ ውስጥ የተጠቆመው ነው: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,የዋጋ ዝርዝር
 DocType: Maintenance Schedule Item,Periodicity,PERIODICITY
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,በጀት ዓመት {0} ያስፈልጋል
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,የሚጠበቀው የመላኪያ ቀን የሽያጭ ትዕዛዝ ቀን በፊት ሊሆን ነው
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ሁለት ዓምዶች, አሮጌውን ስም አንዱ አዲስ ስም አንድ ጋር .csv ፋይል አያይዝ"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} እንጂ ማንኛውም ገባሪ በጀት ዓመት ውስጥ.
 DocType: Packed Item,Parent Detail docname,የወላጅ ዝርዝር DOCNAME
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ማጣቀሻ: {0}, የእቃ ኮድ: {1} እና የደንበኞች: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,ኪግ
 DocType: Student Log,Log,ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,የሥራ ዕድል።
 DocType: Item Attribute,Increment,ጨምር
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,መጋዘን ይምረጡ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,መጋዘን ይምረጡ ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ማስታወቂያ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,በዚሁ ኩባንያ ከአንድ ጊዜ በላይ ገባ ነው
 DocType: Employee,Married,ያገባ
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},አይፈቀድም {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ከ ንጥሎችን ያግኙ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},አይፈቀድም {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,ከ ንጥሎችን ያግኙ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},የአክሲዮን አሰጣጥ ማስታወሻ ላይ መዘመን አይችልም {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},የምርት {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,የተዘረዘሩት ምንም ንጥሎች የሉም
 DocType: Payment Reconciliation,Reconcile,ያስታርቅ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ግሮሰሪ
 DocType: Quality Inspection Reading,Reading 1,1 ማንበብ
 DocType: Process Payroll,Make Bank Entry,ባንክ Entry አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,የጡረታ ፈንድ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ቀጣይ የእርጅና ቀን ግዢ ቀን በፊት ሊሆን አይችልም
 DocType: SMS Center,All Sales Person,ሁሉም ሽያጭ ሰው
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ወርሃዊ ስርጭት ** የእርስዎን ንግድ ውስጥ ወቅታዊ ቢኖራችሁ ወራት በመላ በጀት / ዒላማ ለማሰራጨት ይረዳል.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ንጥሎች አልተገኘም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,ንጥሎች አልተገኘም
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ደመወዝ መዋቅር ይጎድላል
 DocType: Lead,Person Name,ሰው ስም
 DocType: Sales Invoice Item,Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ለምሳሌ &quot;አንደኛ ደረጃ ትምህርት ቤት&quot; ወይም &quot;ዩኒቨርሲቲ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,የክምችት ሪፖርቶች
 DocType: Warehouse,Warehouse Detail,የመጋዘን ዝርዝር
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},የክሬዲት ገደብ ደንበኛ ተሻገሩ ተደርጓል {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,የሚለው ቃል መጨረሻ ቀን በኋላ የሚለው ቃል ጋር የተያያዘ ነው ይህም ወደ የትምህርት ዓመት ዓመት መጨረሻ ቀን በላይ መሆን አይችልም (የትምህርት ዓመት {}). ቀናት ለማረም እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",የንብረት ዘገባ ንጥል ላይ አለ እንደ ካልተደረገበት ሊሆን አይችልም &quot;ቋሚ ንብረት ነው&quot;
 DocType: Vehicle Service,Brake Oil,ፍሬን ኦይል
 DocType: Tax Rule,Tax Type,የግብር አይነት
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ከእናንተ በፊት ግቤቶችን ማከል ወይም ዝማኔ ስልጣን አይደለም {0}
 DocType: BOM,Item Image (if not slideshow),ንጥል ምስል (የተንሸራታች አይደለም ከሆነ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,አንድ የደንበኛ በተመሳሳይ ስም አለ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ሰዓት ተመን / 60) * ትክክለኛ ኦፕሬሽን ሰዓት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ይምረጡ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,ይምረጡ BOM
 DocType: SMS Log,SMS Log,ኤስ ኤም ኤስ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,የደረሱ ንጥሎች መካከል ወጪ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ላይ ያለው የበዓል ቀን ጀምሮ እና ቀን ወደ መካከል አይደለም
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,ትምህርት ቤቶች
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ሠራተኛ አልተገኘም ምንም ፈቃድ መዝገብ {0} ለ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,መጀመሪያ ኩባንያ ያስገቡ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,መጀመሪያ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ጠቅላላ ወጪ
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,የይገባኛል መጠን
 DocType: Employee,Mr,አቶ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,የ cutomer ቡድን ሠንጠረዥ ውስጥ አልተገኘም አባዛ ደንበኛ ቡድን
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,አቅራቢው አይነት / አቅራቢዎች
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,አቅራቢው አይነት / አቅራቢዎች
 DocType: Naming Series,Prefix,ባዕድ መነሻ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,ደረጃ
 DocType: Sales Invoice Item,Delivered By Supplier,አቅራቢ በ ደርሷል
 DocType: SMS Center,All Contact,ሁሉም እውቂያ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,የምርት ትዕዛዝ አስቀድሞ BOM ጋር ሁሉም ንጥሎች የተፈጠሩ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ዓመታዊ ደመወዝ
 DocType: Daily Work Summary,Daily Work Summary,ዕለታዊ የስራ ማጠቃለያ
 DocType: Period Closing Voucher,Closing Fiscal Year,በጀት ዓመት መዝጊያ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} የታሰሩ ነው
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} የታሰሩ ነው
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,መለያዎች ገበታ ለመፍጠር የወቅቱ ኩባንያ ይምረጡ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,የክምችት ወጪ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ዒላማ መጋዘን ይምረጡ
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra የሚመዘገብ መረጃ
 DocType: Journal Entry Account,Credit in Company Currency,ኩባንያ የምንዛሬ ውስጥ የብድር
 DocType: Delivery Note,Installation Status,መጫን ሁኔታ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",እናንተ በስብሰባው ማዘመን ይፈልጋሉ? <br> አቅርብ: {0} \ <br> ብርቅ: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ብዛት ተቀባይነት አላገኘም ተቀባይነት + ንጥል ለማግኘት የተቀበልከው ብዛት ጋር እኩል መሆን አለባቸው {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,አቅርቦት ጥሬ እቃዎች ግዢ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,የክፍያ ቢያንስ አንድ ሁነታ POS መጠየቂያ ያስፈልጋል.
 DocType: Products Settings,Show Products as a List,አሳይ ምርቶች አንድ እንደ ዝርዝር
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ወደ መለጠፊያ አውርድ ተገቢ የውሂብ መሙላት እና የተሻሻለው ፋይል ማያያዝ. በተመረጠው ክፍለ ጊዜ ውስጥ ሁሉም ቀኖች እና ሠራተኛ ጥምረት አሁን ያሉ ክትትል መዛግብት ጋር, በአብነት ውስጥ ይመጣል"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,የእርጅና Entry አድርግ
 DocType: Appraisal Template Goal,KRA,ክራ
 DocType: Lead,Request Type,ጥያቄ አይነት
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,የሰራተኛ አድርግ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,የሰራተኛ አድርግ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ብሮድካስቲንግ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ማስፈጸም
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ስለ ስራዎች ዝርዝሮች ፈጽሟል.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,የጥገና ጉብኝት ያቅዱ.
 DocType: SMS Settings,Enter url parameter for message,መልዕክት ዩአርኤል መስፈርት አስገባ
 DocType: POS Profile,Customer Groups,የደንበኛ ቡድኖች
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,የሂሳብ መግለጫዎቹ
 DocType: Guardian,Students,ተማሪዎች
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ለዋጋ እና ቅናሽ ተግባራዊ ደንቦች.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,የዋጋ ዝርዝር መግዛት እና መሸጥ ተፈጻሚ መሆን አለበት
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},አስቀድሞ መጠን መብለጥ አይችልም {0} {1}
 DocType: Naming Series,Series List for this Transaction,ለዚህ ግብይት ተከታታይ ዝርዝር
 DocType: Company,Default Payroll Payable Account,ነባሪ የደመወዝ ክፍያ የሚከፈል መለያ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,አዘምን የኢሜይል ቡድን
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,አዘምን የኢሜይል ቡድን
 DocType: Sales Invoice,Is Opening Entry,Entry በመክፈት ላይ ነው
 DocType: Customer Group,Mention if non-standard receivable account applicable,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ተገቢነት ካለው
 DocType: Course Schedule,Instructor Name,አስተማሪ ስም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,መጋዘን አስገባ በፊት ያስፈልጋል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,ሻጭ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ከተመረጠ, ቁሳዊ ጥያቄዎች ውስጥ ያልሆኑ-የአክሲዮን ንጥሎች ያካትታል."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,የሽያጭ ደረሰኝ ንጥል ላይ
 ,Production Orders in Progress,በሂደት ላይ የምርት ትዕዛዞች
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,በገንዘብ ከ የተጣራ ገንዘብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","የአካባቢ ማከማቻ ሙሉ ነው, ሊያድን አይችልም ነበር"
 DocType: Lead,Address & Contact,አድራሻ እና ዕውቂያ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ወደ ቀዳሚው አመዳደብ ጀምሮ ጥቅም ላይ ያልዋለ ቅጠሎችን አክል
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ቀጣይ ተደጋጋሚ {0} ላይ ይፈጠራል {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(ጊዜ ሉህ በኩል) ጠቅላላ ዋጋና መጠን
 DocType: Item Website Specification,Item Website Specification,ንጥል የድር ጣቢያ ዝርዝር
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ውጣ የታገዱ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ባንክ ግቤቶችን
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ንጥል {0} ላይ ሕይወት ፍጻሜው ላይ ደርሷል {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ባንክ ግቤቶችን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ዓመታዊ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,የክምችት ማስታረቅ ንጥል
 DocType: Stock Entry,Sales Invoice No,የሽያጭ ደረሰኝ የለም
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,ማዕከል ውስጥ አትም
 DocType: Student Admission,Student Admission,የተማሪ ምዝገባ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} ንጥል ተሰርዟል
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ቁሳዊ ጥያቄ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} ንጥል ተሰርዟል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,ቁሳዊ ጥያቄ
 DocType: Bank Reconciliation,Update Clearance Date,አዘምን መልቀቂያ ቀን
 DocType: Item,Purchase Details,የግዢ ዝርዝሮች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},የግዥ ትዕዛዝ ውስጥ &#39;ጥሬ እቃዎች አቅርቦት&#39; ሠንጠረዥ ውስጥ አልተገኘም ንጥል {0} {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ያልተከፈሉ Cheques እና ማጽዳት ተቀማጭ
 DocType: Item,Synced With Hub,ማዕከል ጋር ተመሳስሏል
 DocType: Vehicle,Fleet Manager,መርከቦች ሥራ አስኪያጅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},የረድፍ # {0}: {1} ንጥል አሉታዊ ሊሆን አይችልም {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,የተሳሳተ የይለፍ ቃል
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},የረድፍ # {0}: {1} ንጥል አሉታዊ ሊሆን አይችልም {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,የተሳሳተ የይለፍ ቃል
 DocType: Item,Variant Of,ነው ተለዋጭ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',ይልቅ &#39;ብዛት ለማምረት&#39; ተጠናቋል ብዛት የበለጠ መሆን አይችልም
 DocType: Period Closing Voucher,Closing Account Head,የመለያ ኃላፊ በመዝጋት ላይ
 DocType: Employee,External Work History,ውጫዊ የስራ ታሪክ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ክብ ማጣቀሻ ስህተት
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ራስ-ሰር የቁስ ጥያቄ መፍጠር ላይ በኢሜይል አሳውቅ
 DocType: Journal Entry,Multi Currency,ባለብዙ ምንዛሬ
 DocType: Payment Reconciliation Invoice,Invoice Type,የደረሰኝ አይነት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,የመላኪያ ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,የመላኪያ ማስታወሻ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ግብሮች በማቀናበር ላይ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,የተሸጠ ንብረት ዋጋ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,አንተም አፈረሰ በኋላ የክፍያ Entry ተቀይሯል. እንደገና ጎትተው እባክህ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
-DocType: Grade Interval,Min Score,ዝቅተኛ ውጤት
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ንጥል ግብር ውስጥ ሁለት ጊዜ ገብቶ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,በዚህ ሳምንት እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Student Applicant,Admitted,አምኗል
 DocType: Workstation,Rent Cost,የቤት ኪራይ ወጪ
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,የትዕዛዝ ዋጋ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ፓርቲ ላይ ወይም የውስጥ ለማስተላለፍ ባንክ / ጥሬ ገንዘብ ግብይቶች
 DocType: Shipping Rule,Valid for Countries,አገሮች የሚሰራ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ይህ ንጥል አብነት ነው ግብይቶች ላይ ሊውል አይችልም. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ንጥል ባህሪዎች ልዩነቶች ወደ ላይ ይገለበጣሉ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,እንደሆነ የመሠከሩለት ጠቅላላ ትዕዛዝ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","የተቀጣሪ ስያሜ (ለምሳሌ ሥራ አስፈጻሚ, ዳይሬክተር ወዘተ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ያስገቡ የመስክ እሴት «ቀን ቀን ወር መካከል ላይ ድገም &#39;እባክህ
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},የረድፍ # {0}: የግዢ ደረሰኝ አንድ ነባር ንብረት ላይ ማድረግ አይቻልም {1}
 DocType: Item Tax,Tax Rate,የግብር ተመን
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} አስቀድሞ የሰራተኛ የተመደበው {1} ወደ ጊዜ {2} ለ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ንጥል ምረጥ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,ንጥል ምረጥ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,የደረሰኝ {0} አስቀድሞ ገብቷል ነው ይግዙ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},የረድፍ # {0}: የጅምላ ምንም እንደ አንድ አይነት መሆን አለበት {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ያልሆኑ ቡድን መቀየር
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,አንድ ንጥል ባች (ዕጣ).
 DocType: C-Form Invoice Detail,Invoice Date,የደረሰኝ ቀን
 DocType: GL Entry,Debit Amount,ዴት መጠን
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ብቻ በ ኩባንያ በአንድ 1 መለያ ሊኖር ይችላል {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,አባሪ ይመልከቱ
 DocType: Purchase Order,% Received,% ደርሷል
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,የተማሪ ቡድኖች ይፍጠሩ
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,ትዕምርተ ጥያቄ
 DocType: Salary Slip Timesheet,Working Hours,የስራ ሰዓት
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,አንድ ነባር ተከታታይ ጀምሮ / የአሁኑ ቅደም ተከተል ቁጥር ለውጥ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
-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.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,አዲስ ደንበኛ ይፍጠሩ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","በርካታ የዋጋ ደንቦች አይችሉአትም የሚቀጥሉ ከሆነ, ተጠቃሚዎች ግጭት ለመፍታት በእጅ ቅድሚያ ለማዘጋጀት ይጠየቃሉ."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,የግዢ ትዕዛዞች ፍጠር
 ,Purchase Register,የግዢ ይመዝገቡ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ተገቢነት ክፍያዎች
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ሚና ሊኖረው ይገባል &#39;አይተውህም አጽዳቂ&#39;
 DocType: Purchase Receipt,Vehicle Date,የተሽከርካሪ ቀን
 DocType: Student Log,Medical,የሕክምና
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ማጣት ለ ምክንያት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ማጣት ለ ምክንያት
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,በእርሳስ ባለቤቱ ግንባር ጋር ተመሳሳይ ሊሆን አይችልም
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,የተመደበ መጠን ያልተስተካከለ መጠን አይበልጥም ይችላል
 DocType: Announcement,Receiver,ተቀባይ
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ብዛት እና ደረጃ ይስጡ
 DocType: Delivery Note,% Installed,% ተጭኗል
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ክፍሎች / ንግግሮች መርሐግብር ይቻላል የት ቤተ ሙከራ ወዘተ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢ አይነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,የመጀመሪያ የኩባንያ ስም ያስገቡ
 DocType: Purchase Invoice,Supplier Name,አቅራቢው ስም
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,የ ERPNext መመሪያ ያንብቡ
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,የድሮ ወላጅ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,አስገዳጅ መስክ - የትምህርት ዓመት
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,በዛ ኢሜይል አንድ ክፍል ሆኖ ይሄዳል ያለውን የመግቢያ ጽሑፍ ያብጁ. እያንዳንዱ ግብይት የተለየ የመግቢያ ጽሑፍ አለው.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},ኩባንያው ነባሪ ተከፋይ መለያ ለማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,"በሙሉ አቅማቸው ባለማምረታቸው, ሂደቶች ዓለም አቀፍ ቅንብሮች."
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen እስከሁለት መለያዎች
 DocType: SMS Log,Sent On,ላይ የተላከ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,አይነታ {0} አይነታዎች ሠንጠረዥ ውስጥ በርካታ ጊዜ ተመርጠዋል
 DocType: HR Settings,Employee record is created using selected field. ,የተቀጣሪ መዝገብ የተመረጠው መስክ በመጠቀም የተፈጠረ ነው.
 DocType: Sales Order,Not Applicable,ተፈፃሚ የማይሆን
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,የበዓል ጌታ.
 DocType: Request for Quotation Item,Required Date,ተፈላጊ ቀን
 DocType: Delivery Note,Billing Address,የመክፈያ አድራሻ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,ንጥል ኮድ ያስገቡ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,ንጥል ኮድ ያስገቡ.
 DocType: BOM,Costing,ዋጋና
 DocType: Tax Rule,Billing County,አከፋፈል ካውንቲ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ከተመረጠ ቀደም አትም ተመን / አትም መጠን ውስጥ የተካተተ ሆኖ, ቀረጥ መጠን እንመረምራለን"
@@ -500,6 +504,7 @@
 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,ዋስትና እና ተቀማጭ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ይህን የለውም ይህም አንዳንድ ንጥሎች ላይ ግብይቶችን አሉ እንደ ግምቱ ስልት መቀየር አይቻልም የራሱን ከግምቱ ዘዴ ነው
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,የተመደበ ጠቅላላ ቅጠሎች የግዴታ ነው
 DocType: Job Opening,Description of a Job Opening,የክፍት ሥራው ዝርዝር
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,በዛሬው ጊዜ በመጠባበቅ ላይ እንቅስቃሴዎች
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,አስተዳደር ክፍል ኃላፊ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ኮርስ ይምረጡ
 DocType: Timesheet Detail,Hrs,ሰዓቶች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,ኩባንያ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,ኩባንያ ይምረጡ
 DocType: Stock Entry Detail,Difference Account,ልዩነት መለያ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,በሥሯ ተግባር {0} ዝግ አይደለም የቅርብ ተግባር አይችሉም.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,የቁስ ጥያቄ ይነሣል ለዚህም መጋዘን ያስገቡ
 DocType: Production Order,Additional Operating Cost,ተጨማሪ ስርዓተ ወጪ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,መዋቢያዎች
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ማዋሃድ, የሚከተሉትን ንብረቶች ሁለቱም ንጥሎች ጋር ተመሳሳይ መሆን አለበት"
 DocType: Shipping Rule,Net Weight,የተጣራ ክብደት
 DocType: Employee,Emergency Phone,የአደጋ ጊዜ ስልክ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ግዛ
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ገደብ 0% የሚሆን ክፍል ለመወሰን እባክዎ
 DocType: Sales Order,To Deliver,ለማዳን
 DocType: Purchase Invoice Item,Item,ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,ተከታታይ ምንም ንጥል ክፍልፋይ ሊሆን አይችልም
 DocType: Journal Entry,Difference (Dr - Cr),ልዩነት (ዶክተር - CR)
 DocType: Account,Profit and Loss,ትርፍ ማጣት
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ማኔጂንግ Subcontracting
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ጭማሬ 0 መሆን አይችልም
 DocType: Production Planning Tool,Material Requirement,ቁሳዊ ተፈላጊ
 DocType: Company,Delete Company Transactions,ኩባንያ ግብይቶች ሰርዝ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ማጣቀሻ የለም እና የማጣቀሻ ቀን ባንክ ግብይት ግዴታ ነው
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ አርትዕ ግብሮች እና ክፍያዎች ያክሉ
 DocType: Purchase Invoice,Supplier Invoice No,አቅራቢ ደረሰኝ የለም
 DocType: Territory,For reference,ለማጣቀሻ
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,የአጫጫን ማስታወሻ ንጥል
 DocType: Production Plan Item,Pending Qty,በመጠባበቅ ላይ ብዛት
 DocType: Budget,Ignore,ችላ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ንቁ አይደለም
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ንቁ አይደለም
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ኤስ ኤም ኤስ የሚከተሉትን ቁጥሮች ላከ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,የህትመት ማዋቀር ቼክ ልኬቶችን
 DocType: Salary Slip,Salary Slip Timesheet,የቀጣሪ Timesheet
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,ጠቅላላ ኮሚሽን
 DocType: Pricing Rule,Sales Partner,የሽያጭ አጋር
 DocType: Buying Settings,Purchase Receipt Required,የግዢ ደረሰኝ ያስፈልጋል
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,የመክፈቻ የአክሲዮን ገብቶ ከሆነ ግምቱ ተመን የግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,በ የደረሰኝ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,በመጀመሪያ ኩባንያ እና የፓርቲ አይነት ይምረጡ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,የፋይናንስ / የሂሳብ ዓመት ነው.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ሲጠራቀሙ እሴቶች
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ይቅርታ, ተከታታይ ቁጥሮች ሊዋሃዱ አይችሉም"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,የሽያጭ ትዕዛዝ አድርግ
 DocType: Project Task,Project Task,ፕሮጀክት ተግባር
 ,Lead Id,ቀዳሚ መታወቂያ
 DocType: C-Form Invoice Detail,Grand Total,አጠቃላይ ድምር
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,ከቆመበት ቀጥል አባሪ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ተደጋጋሚ ደንበኞች
 DocType: Leave Control Panel,Allocate,አካፈለ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,የሽያጭ ተመለስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,የሽያጭ ተመለስ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ማስታወሻ: ጠቅላላ የተመደበ ቅጠሎች {0} አስቀድሞ ተቀባይነት ቅጠሎች ያነሰ መሆን የለበትም {1} ወደ ጊዜ
 DocType: Announcement,Posted By,በ ተለጥፏል
 DocType: Item,Delivered by Supplier (Drop Ship),አቅራቢው ደርሷል (ጣል መርከብ)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,ወደ ጥቅስ
 DocType: Lead,Middle Income,የመካከለኛ ገቢ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),በመክፈት ላይ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,የተመደበ መጠን አሉታዊ መሆን አይችልም
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ካምፓኒው ማዘጋጀት እባክዎ
 DocType: Purchase Order Item,Billed Amt,የሚከፈል Amt
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,የሽያጭ ደረሰኝ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ማጣቀሻ የለም እና ማጣቀሻ ቀን ያስፈልጋል {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ይምረጡ የክፍያ መለያ ባንክ የሚመዘገብ ለማድረግ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ቅጠሎች, ወጪዎች እና የመክፈል ዝርዝር ለማስተዳደር የሰራተኛ መዝገብ ይፍጠሩ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,እውቀት ቤዝን ወደ አክል
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ሐሳብ መጻፍ
 DocType: Payment Entry Deduction,Payment Entry Deduction,የክፍያ Entry ተቀናሽ
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} »{1}» አይደለም በጀት ዓመት ውስጥ {2}
 DocType: Buying Settings,Settings for Buying Module,ሞዱል ስለመግዛት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},የንብረት {0} ኩባንያ የእርሱ ወገን አይደለም {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,በመጀመሪያ የግዢ ደረሰኝ ያስገቡ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","በዚያን ጊዜ የዋጋ አሰጣጥ ደንቦቹ ወዘተ የደንበኞች, የደንበኞች ቡድን, ክልል, አቅራቢው, አቅራቢው ዓይነት, ዘመቻ, የሽያጭ ባልደረባ ላይ የተመሠረቱ ውጭ ይጣራሉ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ቆጠራ ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,የሰራተኛ የብድር አስተዳደር
 DocType: Employee,Passport Number,የፓስፖርት ቁጥር
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ጋር በተያያዘ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,አስተዳዳሪ
 DocType: Payment Entry,Payment From / To,/ ከ ወደ ክፍያ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ቀን ክልል
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},አዲስ የክሬዲት ገደብ ለደንበኛው ከአሁኑ የላቀ መጠን ያነሰ ነው. የክሬዲት ገደብ ላይ ቢያንስ መሆን አለበት {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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;ላይ የተመሠረተ »ጋር ተመሳሳይ መሆን አይችልም
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,ደቂቃዎች ውስጥ
 DocType: Issue,Resolution Date,ጥራት ቀን
 DocType: Student Batch Name,Batch Name,ባች ስም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ተፈጥሯል:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet ተፈጥሯል:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},የክፍያ ሁነታ ላይ ነባሪ በጥሬ ገንዘብ ወይም በባንክ መለያ ማዘጋጀት እባክዎ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ይመዝገቡ
 DocType: Selling Settings,Customer Naming By,በ የደንበኛ አሰያየም
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,የተማሪ ወርሃዊ ክትትል ሪፖርት ውስጥ ያቅርቡ ተማሪው ያሳያል
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,ትክክለኛው የማስጀመሪያ ሰዓት
 DocType: BOM Operation,Operation Time,ኦፕሬሽን ሰዓት
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,ጪረሰ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,መሠረት
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,መሠረት
 DocType: Timesheet,Total Billed Hours,ጠቅላላ የሚከፈል ሰዓቶች
 DocType: Journal Entry,Write Off Amount,መጠን ጠፍቷል ይጻፉ
 DocType: Journal Entry,Bill No,ቢል ምንም
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,የተማሪ የትምህርት ክትትል
 DocType: Sales Invoice Timesheet,Time Sheet,የጊዜ ሉህ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ጥሬ እቃዎች ላይ የተመረኮዘ ላይ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ንጥል ዝርዝሮችን ያስገቡ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ንጥል ዝርዝሮችን ያስገቡ
 DocType: Interest,Interest,ዝንባሌ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ቅድመ ሽያጭ
 DocType: Purchase Receipt,Other Details,ሌሎች ዝርዝሮች
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,የክፍያ Entry አስቀድሞ የተፈጠረ ነው
 DocType: Purchase Receipt Item Supplied,Current Stock,የአሁኑ የአክሲዮን
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},የረድፍ # {0}: {1} የንብረት ንጥል ጋር የተገናኘ አይደለም {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ቅድመ-የቀጣሪ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ቅድመ-የቀጣሪ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,መለያ {0} በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Account,Expenses Included In Valuation,ወጪዎች ግምቱ ውስጥ ተካቷል
 DocType: Hub Settings,Seller City,ሻጭ ከተማ
 ,Absent Student Report,ብርቅ የተማሪ ሪፖርት
 DocType: Email Digest,Next email will be sent on:,ቀጣይ ኢሜይል ላይ ይላካል:
 DocType: Offer Letter Term,Offer Letter Term,ደብዳቤ የሚቆይበት ጊዜ ሊያቀርብ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ንጥል ተለዋጮች አለው.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ንጥል ተለዋጮች አለው.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ንጥል {0} አልተገኘም
 DocType: Bin,Stock Value,የክምችት እሴት
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ኩባንያ {0} የለም
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,የዛፍ አይነት
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,የዛፍ አይነት
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ብዛት አሃድ በእያንዳንዱ ፍጆታ
 DocType: Serial No,Warranty Expiry Date,የዋስትና የሚቃጠልበት ቀን
 DocType: Material Request Item,Quantity and Warehouse,ብዛት እና መጋዘን
 DocType: Sales Invoice,Commission Rate (%),ኮሚሽን ተመን (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; የስያሜ ተከታታይ ለ ተከታታይ የስያሜ ለማዘጋጀት እባክዎ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,እባክዎ ይምረጡ ፕሮግራም
 DocType: Project,Estimated Cost,የተገመተው ወጪ
 DocType: Purchase Order,Link to material requests,ቁሳዊ ጥያቄዎች አገናኝ
@@ -753,7 +756,7 @@
 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,ነባሪ መለያ
 DocType: Payment Entry,Received Amount (Company Currency),ተቀብሏል መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,ዕድል አመራር የተሰራ ከሆነ ግንባር መዘጋጀት አለበት
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ሳምንታዊ ጠፍቷል ቀን ይምረጡ
 DocType: Production Order Operation,Planned End Time,የታቀደ መጨረሻ ሰዓት
 ,Sales Person Target Variance Item Group-Wise,የሽያጭ ሰው ዒላማ ልዩነት ንጥል ቡድን ጥበበኛ
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,ከ አጋጣሚ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ወርሃዊ ደመወዝ መግለጫ.
 DocType: BOM,Website Specifications,የድር ጣቢያ ዝርዝር
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ማዋቀር ቁጥር ተከታታይ&gt; Setup በኩል ክትትል ተከታታይ ቁጥር እባክዎ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ከ {0} አይነት {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ረድፍ {0}: የልወጣ ምክንያት የግዴታ ነው
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,ባንክ የ A / C ቁጥር
 DocType: Bank Guarantee,Project,ፕሮጀክት
 DocType: Quality Inspection Reading,Reading 7,7 ማንበብ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,በከፊል የዕቃው መረጃ
 DocType: Expense Claim Detail,Expense Claim Type,የወጪ የይገባኛል ጥያቄ አይነት
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ወደ ግዢ ሳጥን ጨመር ነባሪ ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ጆርናል Entry በኩል በመዛጉ ንብረት {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,ቢሮ ጥገና ወጪዎች
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,የኢሜይል መለያ በማቀናበር ላይ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,መጀመሪያ ንጥል ያስገቡ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,መጀመሪያ ንጥል ያስገቡ
 DocType: Account,Liability,ኃላፊነት
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ማዕቀብ መጠን ረድፍ ውስጥ የይገባኛል ጥያቄ መጠን መብለጥ አይችልም {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,የዋጋ ዝርዝር አልተመረጠም
 DocType: Employee,Family Background,የቤተሰብ ዳራ
 DocType: Request for Quotation Supplier,Send Email,ኢሜይል ይላኩ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ማስጠንቀቂያ: ልክ ያልሆነ አባሪ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ምንም ፍቃድ
 DocType: Company,Default Bank Account,ነባሪ የባንክ ሂሳብ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",የድግስ ላይ የተመሠረተ ለማጣራት ይምረጡ ፓርቲ በመጀመሪያ ይተይቡ
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ምንም ሰራተኛ አልተገኘም
 DocType: Supplier Quotation,Stopped,አቁሟል
 DocType: Item,If subcontracted to a vendor,አንድ አቅራቢው subcontracted ከሆነ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,የተማሪ ቡድን አስቀድሞ የዘመነ ነው.
 DocType: SMS Center,All Customer Contact,ሁሉም የደንበኛ ያግኙን
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV በኩል የአክሲዮን ቀሪ ይስቀሉ.
 DocType: Warehouse,Tree Details,ዛፍ ዝርዝሮች
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ዝቅተኛው የደረሰኝ የገንዘብ መጠን
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: የወጪ ማዕከል {2} ኩባንያ የእርሱ ወገን አይደለም {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: መለያ {2} አንድ ቡድን ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ንጥል ረድፍ {idx}: {doctype} {DOCNAME} ከላይ ውስጥ የለም &#39;{doctype} »ሰንጠረዥ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} አስቀድሞ የተጠናቀቁ ወይም ተሰርዟል
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ምንም ተግባራት
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ራስ መጠየቂያ 05, 28, ወዘተ ለምሳሌ ይፈጠራል ይህም ላይ ያለው ወር ቀን"
 DocType: Asset,Opening Accumulated Depreciation,ክምችት መቀነስ በመክፈት ላይ
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,አማካኝ ደረጃ በመውሰድ ላይ
 DocType: Production Planning Tool,Select Items,ይምረጡ ንጥሎች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ቢል ላይ {1} የተዘጋጀው {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,የኮርስ ፕሮግራም
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,የኮርስ ፕሮግራም
 DocType: Maintenance Visit,Completion Status,የማጠናቀቂያ ሁኔታ
 DocType: HR Settings,Enter retirement age in years,ዓመታት ውስጥ ጡረታ ዕድሜ ያስገቡ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ዒላማ መጋዘን
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ይህ በመቶ እስከሁለት ርክክብ ወይም ደረሰኝ ላይ ፍቀድ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,አስመጣ ክትትል
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ሁሉም ንጥል ቡድኖች
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ሁሉም ንጥል ቡድኖች
 DocType: Process Payroll,Activity Log,የእንቅስቃሴ ምዝግብ ማስታወሻ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,የተጣራ ትርፍ / ማጣት
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,በራስ-ሰር ግብይቶች ማቅረቢያ ላይ መልዕክት ያዘጋጁ.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ክፍያ ትዕዛዝ መግዛት
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ፕሮጀክት ብዛት
 DocType: Sales Invoice,Payment Due Date,ክፍያ መጠናቀቅ ያለበት ቀን
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ንጥል ተለዋጭ {0} ቀድሞውኑ ተመሳሳይ ባሕርያት ጋር አለ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;በመክፈት ላይ&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ማድረግ ወደ ክፈት
 DocType: Notification Control,Delivery Note Message,የመላኪያ ማስታወሻ መልዕክት
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,ዳግም-ትዕዛዝ ብዛት
 DocType: Leave Block List Date,Leave Block List Date,አግድ ዝርዝር ቀን ውጣ
 DocType: Pricing Rule,Price or Discount,ዋጋ ወይም ቅናሽ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,የግዢ ደረሰኝ ንጥሎች ሰንጠረዥ ውስጥ ጠቅላላ የሚመለከታቸው ክፍያዎች ጠቅላላ ግብሮች እና ክፍያዎች እንደ አንድ አይነት መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,የግዢ ደረሰኝ ንጥሎች ሰንጠረዥ ውስጥ ጠቅላላ የሚመለከታቸው ክፍያዎች ጠቅላላ ግብሮች እና ክፍያዎች እንደ አንድ አይነት መሆን አለበት
 DocType: Sales Team,Incentives,ማበረታቻዎች
 DocType: SMS Log,Requested Numbers,ተጠይቋል ዘኍልቍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ብቻ ጥሬ እቃዎች ያግኙ
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted ነው
 DocType: Item Attribute,Item Attribute Values,ንጥል መገለጫ ባህሪ እሴቶች
 DocType: Examination Result,Examination Result,ምርመራ ውጤት
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,የግዢ ደረሰኝ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,የግዢ ደረሰኝ
 ,Received Items To Be Billed,ተቀብሏል ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ገብቷል ደመወዝ ቡቃያ
 DocType: Employee,Ms,ወይዘሪት
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,ምንዛሬ ተመን ጌታቸው.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},ማጣቀሻ Doctype ውስጥ አንዱ መሆን አለበት {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},ማጣቀሻ Doctype ውስጥ አንዱ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ድርጊቱ ለ ቀጣዩ {0} ቀናት ውስጥ ጊዜ ማስገቢያ ማግኘት አልተቻለም {1}
 DocType: Production Order,Plan material for sub-assemblies,ንዑስ-አብያተ ክርስቲያናት ለ እቅድ ቁሳዊ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,የሽያጭ አጋሮች እና ግዛት
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,አስቀድሞ መለያ ውስጥ የአክሲዮን ሚዛን አለ እንደ በራስ-ሰር መለያ መፍጠር አይችሉም. በዚህ መጋዘን ላይ አንድ ግቤት ማድረግ ከመቻልዎ በፊት የ የሚዛመድ መለያ መፍጠር አለብዎት
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,ነባሪ ተከፋይ መለያዎች
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ተቀጣሪ ንቁ አይደለም ወይም የለም
 DocType: Fee Structure,Components,ክፍሎች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ንጥል አይነቶች {0} ዘምኗል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ንጥል ውስጥ የንብረት ምድብ ያስገቡ {0}
 DocType: Quality Inspection Reading,Reading 6,6 ማንበብ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,አይደለም {0} {1} {2} ያለ ማንኛውም አሉታዊ ግሩም መጠየቂያ ማድረግ ይችላል
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,የደረሰኝ የቅድሚያ ግዢ
 DocType: Hub Settings,Sync Now,አሁን አመሳስል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ረድፍ {0}: የሥዕል ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,የግዢ ንጥል ነው
 DocType: Asset,Purchase Invoice,የግዢ ደረሰኝ
 DocType: Stock Ledger Entry,Voucher Detail No,የቫውቸር ዝርዝር የለም
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,አዲስ የሽያጭ ደረሰኝ
 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,ቀን እና መዝጊያ ቀን በመክፈት ተመሳሳይ በጀት ዓመት ውስጥ መሆን አለበት
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ቀን እና መዝጊያ ቀን በመክፈት ተመሳሳይ በጀት ዓመት ውስጥ መሆን አለበት
 DocType: Lead,Request for Information,መረጃ ጥያቄ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,አመሳስል ከመስመር ደረሰኞች
 DocType: Payment Request,Paid,የሚከፈልበት
 DocType: Program Fee,Program Fee,ፕሮግራም ክፍያ
 DocType: Salary Slip,Total in words,ቃላት ውስጥ አጠቃላይ
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,ማዕቀብ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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; ይገለበጣሉ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; ይገለበጣሉ."
 DocType: Job Opening,Publish on website,ድር ላይ ያትሙ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ደንበኞች ወደ ላኩ.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,አቅራቢው ደረሰኝ ቀን መለጠፍ ቀን በላይ ሊሆን አይችልም
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ልዩነት
 ,Company Name,የድርጅት ስም
 DocType: SMS Center,Total Message(s),ጠቅላላ መልዕክት (ዎች)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ሰደዳ ይምረጡ ንጥል
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ቼክ ገቢ የት ባንኩ መለያ ምረጥ ራስ.
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ረድፍ {0}: ሽያጮች / የግዥ ትዕዛዝ ላይ ክፍያ ሁልጊዜ አስቀድሞ እንደ ምልክት ሊደረግባቸው ይገባል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ኬሚካል
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ይህ ሁነታ በሚመረጥ ጊዜ ነባሪ ባንክ / በጥሬ ገንዘብ መለያ በራስ-ሰር ደመወዝ ጆርናል የሚመዘገብ ውስጥ ይዘምናል.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ክፍል ኮድ ለ ክፍተቶች {0} ሌሎች ክፍሎች ኛ ክፍል ልዩነት ጋር ይደራረባል. ያረጋግጡ ክፍተቶች {0} እና {1} እና እንደገና ይሞክሩ
 DocType: BOM,Raw Material Cost(Company Currency),ጥሬ ሐሳብ ወጪ (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ሁሉም ንጥሎች አስቀድሞ በዚህ የምርት ትዕዛዝ ለ ተላልፈዋል.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},የረድፍ # {0}: ተመን ላይ የዋለውን መጠን መብለጥ አይችልም {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM የድር ጣቢያ ንጥል
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,የእርስዎን ደብዳቤ ራስ እና አርማ ይስቀሉ. (ቆይተው አርትዕ ማድረግ ይችላሉ).
 DocType: Timesheet Detail,Bill,ቢል
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ቀጣይ የእርጅና ቀን ባለፈው ቀን እንደ ገባ ነው
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ነጭ
 DocType: SMS Center,All Lead (Open),ሁሉም ቀዳሚ (ክፈት)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ረድፍ {0}: ለ ብዛት አይገኝም {4} መጋዘን ውስጥ {1} መግቢያ ጊዜ መለጠፍ (በ {2} {3})
 DocType: Purchase Invoice,Get Advances Paid,እድገት የሚከፈልበት ያግኙ
 DocType: Item,Automatically Create New Batch,በራስ-ሰር አዲስ ባች ፍጠር
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,አድርግ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,አድርግ
 DocType: Student Admission,Admission Start Date,ምዝገባ መጀመሪያ ቀን
 DocType: Journal Entry,Total Amount in Words,ቃላት ውስጥ ጠቅላላ መጠን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,አንድ ስህተት ነበር. አንዱ ሊሆን ምክንያት በቅጹ አላስቀመጡም ሊሆን ይችላል. ችግሩ ከቀጠለ support@erpnext.com ያነጋግሩ.
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,ብዛት በመክፈት ላይ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ለውጥ መጠን ለ መለያ ያስገቡ
 DocType: Student Batch Name,Student Batch Name,የተማሪ የቡድን ስም
 DocType: Holiday List,Holiday List Name,የበዓል ዝርዝር ስም
 DocType: Repayment Schedule,Balance Loan Amount,ቀሪ የብድር መጠን
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ይጥቀሱ እባክዎ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ብዛት ወይም ዋጋ ላይ ምንም ለውጥ ጋር የተወገዱ ንጥሎች.
 DocType: Delivery Note,Delivery To,ወደ መላኪያ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,አይነታ ሠንጠረዥ የግዴታ ነው
 DocType: Production Planning Tool,Get Sales Orders,የሽያጭ ትዕዛዞች ያግኙ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} አሉታዊ መሆን አይችልም
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,የዋጋ ቅናሽ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,የዋጋ ቅናሽ
 DocType: Asset,Total Number of Depreciations,Depreciations አጠቃላይ ብዛት
 DocType: Sales Invoice Item,Rate With Margin,ኅዳግ ጋር ፍጥነት
 DocType: Workstation,Wages,ደመወዝ
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,የሽያጭ ትዕዛዝ / ያለቀለት ዕቃዎች መጋዘን ውስጥ የተያዘ መጋዘን
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ሽያጭ መጠን
 DocType: Repayment Schedule,Interest Amount,የወለድ መጠን
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,ይህን መዝገብ ኪሳራውን አጽዳቂ ናቸው. የ «ሁኔታ» እና አስቀምጥ አዘምን እባክዎ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,ይህን መዝገብ ኪሳራውን አጽዳቂ ናቸው. የ «ሁኔታ» እና አስቀምጥ አዘምን እባክዎ
 DocType: Serial No,Creation Document No,ፍጥረት ሰነድ የለም
 DocType: Issue,Issue,ርዕሰ ጉዳይ
 DocType: Asset,Scrapped,በመዛጉ
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ንጥል አይነቶች ለ ባህርያት. ለምሳሌ መጠን, ቀለም ወዘተ"
 DocType: Purchase Invoice,Returns,ይመልሳል
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP መጋዘን
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},ተከታታይ አይ {0} እስከሁለት ጥገና ኮንትራት ስር ነው {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},ተከታታይ አይ {0} እስከሁለት ጥገና ኮንትራት ስር ነው {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ምልመላ
 DocType: Lead,Organization Name,የድርጅት ስም
 DocType: Tax Rule,Shipping State,መላኪያ መንግስት
 ,Projected Quantity as Source,ምንጭ ፕሮጀክት ብዛት
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ንጥል አዝራር &#39;የግዢ ደረሰኞች ከ ንጥሎች ያግኙ&#39; በመጠቀም መታከል አለበት
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ንጥል አዝራር &#39;የግዢ ደረሰኞች ከ ንጥሎች ያግኙ&#39; በመጠቀም መታከል አለበት
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,ያልሆኑ-የአክሲዮን ንጥሎችን አካትት
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,የሽያጭ ወጪዎች
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,ላይ
 DocType: Item,Default Selling Cost Center,ነባሪ ሽያጭ ወጪ ማዕከል
 DocType: Sales Partner,Implementation Partner,የትግበራ አጋር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,አካባቢያዊ መለያ ቁጥር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,አካባቢያዊ መለያ ቁጥር
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},የሽያጭ ትዕዛዝ {0} ነው {1}
 DocType: Opportunity,Contact Info,የመገኛ አድራሻ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,የክምችት ግቤቶችን ማድረግ
 DocType: Packing Slip,Net Weight UOM,የተጣራ ክብደት UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ውጤቶች
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ውጤቶች
 DocType: Item,Default Supplier,ነባሪ አቅራቢ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,የምርት በል መቶኛ በላይ
 DocType: Employee Loan,Repayment Schedule,ብድር መክፈል ፕሮግራም
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ሳምንታዊ ጠፍቷል ቀኖች ያግኙ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,የማብቂያ ቀን ከመጀመሪያ ቀን ያነሰ መሆን አይችልም
 DocType: Sales Person,Select company name first.,በመጀመሪያ ይምረጡ የኩባንያ ስም.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ዶ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ዶ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ጥቅሶች አቅራቢዎች ደርሷል.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ወደ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,አማካይ ዕድሜ
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,ቁልፍ አፈጻጸም አካባቢ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,መጓጓዣ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ልክ ያልሆነ መገለጫ ባህሪ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} መቅረብ አለበት
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ብዛት ይልቅ ያነሰ ወይም እኩል መሆን አለበት {0}
 DocType: SMS Center,Total Characters,ጠቅላላ ቁምፊዎች
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},ንጥል ለ BOM መስክ ውስጥ BOM ይምረጡ {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,አከፋፋይ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ወደ ግዢ ሳጥን ጨመር መላኪያ ደንብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,የምርት ትዕዛዝ {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ለማዘጋጀት &#39;ላይ ተጨማሪ ቅናሽ ተግብር&#39; እባክህ
 ,Ordered Items To Be Billed,የዕቃው ንጥሎች እንዲከፍሉ ለማድረግ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ክልል ያነሰ መሆን አለበት ከ ይልቅ ወደ ክልል
 DocType: Global Defaults,Global Defaults,ዓለም አቀፍ ነባሪዎች
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,የጀመረበት ዓመት
 DocType: Purchase Invoice,Start date of current invoice's period,የአሁኑ መጠየቂያ ያለው ጊዜ የመጀመሪያ ቀን
 DocType: Salary Slip,Leave Without Pay,Pay ያለ ውጣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,የአቅም ዕቅድ ስህተት
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,የአቅም ዕቅድ ስህተት
 ,Trial Balance for Party,ፓርቲው በችሎት ባላንስ
 DocType: Lead,Consultant,አማካሪ
 DocType: Salary Slip,Earnings,ገቢዎች
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ይህ ተለዋጭ ያለውን ንጥል ኮድ ተጨምሯል ይሆናል. የእርስዎ በምህፃረ ቃል &quot;SM&quot; ነው; ለምሳሌ ያህል, ንጥል ኮድ &quot;ቲሸርት&quot;, &quot;ቲሸርት-SM&quot; ይሆናል ተለዋጭ ያለውን ንጥል ኮድ ነው"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,የ የቀጣሪ ለማዳን አንዴ (ቃላት) የተጣራ ክፍያ የሚታይ ይሆናል.
 DocType: Purchase Invoice,Is Return,መመለሻ ነው
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ተመለስ / ዴቢት ማስታወሻ
 DocType: Price List Country,Price List Country,የዋጋ ዝርዝር አገር
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} ንጥል ትክክለኛ ተከታታይ ቁጥሮች {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ባች ቁጥር ለማግኘት ንጥል ኮድ ያስገቡ
 DocType: Stock Settings,Default Item Group,ነባሪ ንጥል ቡድን
 DocType: Employee Loan,Partially Disbursed,በከፊል በመገኘቱ
-DocType: Grading Structure,Grading System Name,አሰጣጥ ስርዓት ስም
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,አቅራቢው ጎታ.
 DocType: Account,Balance Sheet,ወጭና ገቢ ሂሳብ መመዝገቢያ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',&#39;ንጥል ኮድ ጋር ንጥል ለማግኘት ማዕከል ያስከፍላል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","የክፍያ ሁነታ አልተዋቀረም. የመለያ ክፍያዎች ሁነታ ላይ ወይም POS መገለጫ ላይ ተዘጋጅቷል እንደሆነ, ያረጋግጡ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,የእርስዎ የሽያጭ ሰው የደንበኛ ለማነጋገር በዚህ ቀን ላይ አስታዋሽ ያገኛሉ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ብዙ ጊዜ ተመሳሳይ ንጥል ሊገቡ አይችሉም.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ተጨማሪ መለያዎች ቡድኖች ስር ሊሆን ይችላል, ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል"
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,የክምችት የሒሳብ መዝገብ ግቤቶች እና GL ግቤቶችን ለተመረጠው የግዢ ደረሰኞች ለ ዳግም ከተለጠፈ ነው
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,የክምችት የሒሳብ መዝገብ ግቤቶች እና GL ግቤቶችን ለተመረጠው የግዢ ደረሰኞች ለ ዳግም ከተለጠፈ ነው
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ንጥል 1
 DocType: Holiday,Holiday,የበዓል ቀን
 DocType: Support Settings,Close Issue After Days,ቀናት በኋላ ዝጋ እትም
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ሥራ ተከናውኗል
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,በ አይነታዎች ሰንጠረዥ ውስጥ ቢያንስ አንድ መገለጫ ባህሪ ይግለጹ
 DocType: Announcement,All Students,ሁሉም ተማሪዎች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ይመልከቱ የሒሳብ መዝገብ
 DocType: Grading Scale,Intervals,ክፍተቶች
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,የጥንቶቹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","አንድ ንጥል ቡድን በተመሳሳይ ስም አለ, ወደ ንጥል ስም መቀየር ወይም ንጥል ቡድን ዳግም መሰየም እባክዎ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ወደ ተቀረው ዓለም
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,የ ንጥል {0} ባች ሊኖረው አይችልም
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},ወደ {0} ከ ደመወዝ ክፍያ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},የታሰረው መለያ አርትዕ ለማድረግ ፈቃድ የለውም {0}
 DocType: Journal Entry,Get Outstanding Invoices,ያልተከፈሉ ደረሰኞች ያግኙ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,የሽያጭ ትዕዛዝ {0} ልክ ያልሆነ ነው
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,የግዢ ትዕዛዞች ዕቅድ ለማገዝ እና ግዢዎች ላይ መከታተል
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ይቅርታ, ኩባንያዎች ይዋሃዳሉ አይችልም"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ሐሳብ ጥያቄ ውስጥ ጠቅላላ እትም / ማስተላለፍ ብዛት {0} {1} \ ንጥል ለ የተጠየቀው ብዛት {2} በላይ ሊሆን አይችልም {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ትንሽ
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,በተዘዋዋሪ ወጪዎች
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ረድፍ {0}: ብዛት የግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ግብርና
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,አመሳስል መምህር ውሂብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,አመሳስል መምህር ውሂብ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,የእርስዎ ምርቶች ወይም አገልግሎቶች
 DocType: Mode of Payment,Mode of Payment,የክፍያ ሁነታ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,የድር ጣቢያ ምስል ይፋዊ ፋይል ወይም ድር ጣቢያ ዩ አር ኤል መሆን አለበት
 DocType: Student Applicant,AP,የ AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ይህ ሥር ንጥል ቡድን ነው እና አርትዕ ሊደረግ አይችልም.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,የቡድን ጥቅል ቁጥር
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}: ብቻ የክሬዲት መለያዎች ሌላ ዴቢት ግቤት ላይ የተገናኘ ሊሆን ይችላል
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ሁሉ ተግባር ክብደት ጠቅላላ 1. መሰረት በሁሉም የፕሮጀክቱ ተግባራት ክብደት ለማስተካከል እባክዎ መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,የመላኪያ ማስታወሻ {0} ማቅረብ አይደለም
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","የዋጋ ደ መጀመሪያ ላይ በመመስረት ነው ንጥል, ንጥል ቡድን ወይም የምርት ስም ሊሆን ይችላል, ይህም መስክ ላይ ተግብር. &#39;"
 DocType: Hub Settings,Seller Website,ሻጭ ድር ጣቢያ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,የሽያጭ ቡድን ጠቅላላ የተመደበ መቶኛ 100 መሆን አለበት
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},የምርት ትዕዛዝ ሁኔታ ነው {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},የምርት ትዕዛዝ ሁኔታ ነው {0}
 DocType: Appraisal Goal,Goal,ግብ
 DocType: Sales Invoice Item,Edit Description,አርትዕ መግለጫ
 ,Team Updates,ቡድን ዝማኔዎች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,አቅራቢ ለ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,አቅራቢ ለ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,የመለያ አይነት በማዘጋጀት ላይ ግብይቶችን በዚህ መለያ በመምረጥ ረገድ ይረዳል.
 DocType: Purchase Invoice,Grand Total (Company Currency),ጠቅላላ ድምር (የኩባንያ የምንዛሬ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,አትም ቅርጸት ፍጠር
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,በሂደት ላይ {0} ንጥሎች
 DocType: Workstation,Workstation Name,ከገቢር ስም
-DocType: Grade Interval,Grade Code,ኛ ክፍል ኮድ
+DocType: Grading Scale Interval,Grade Code,ኛ ክፍል ኮድ
 DocType: POS Item Group,POS Item Group,POS ንጥል ቡድን
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ጥንቅር ኢሜይል:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ንጥል የእርሱ ወገን አይደለም {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ሃርድዌር
 DocType: Sales Order,Recurring Upto,ተደጋጋሚ እስከሁለት
 DocType: Attendance,HR Manager,የሰው ሀይል አስተዳደር
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,አንድ ኩባንያ እባክዎ ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,መብት ውጣ
 DocType: Purchase Invoice,Supplier Invoice Date,አቅራቢው ደረሰኝ ቀን
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,አንተ ወደ ግዢ ሳጥን ጨመር ማንቃት አለብዎት
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ምግብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ጥበቃና ክልል 3
 DocType: Maintenance Schedule Item,No of Visits,ጉብኝቶች አይ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ማርቆስ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,ማርቆስ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ጥገና ፕሮግራም {0} ላይ አለ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,የተመዝጋቢው ተማሪ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},የ በመዝጋት መለያ ምንዛሬ መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ለሁሉም ግቦች ነጥቦች ድምር ነው 100. መሆን አለበት {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,አማካኝ ዕለታዊ የወጪ
 DocType: POS Profile,Campaign,ዘመቻ
 DocType: Supplier,Name and Type,ስም እና አይነት
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ &#39;የጸደቀ&#39; ወይም &#39;ተቀባይነት አላገኘም »መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',የማጽደቅ ሁኔታ &#39;የጸደቀ&#39; ወይም &#39;ተቀባይነት አላገኘም »መሆን አለበት
 DocType: Purchase Invoice,Contact Person,የሚያነጋግሩት ሰው
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;የሚጠበቀው መጀመሪያ ቀን&#39; ከዜሮ በላይ &#39;የሚጠበቀው መጨረሻ ቀን&#39; ሊሆን አይችልም
 DocType: Course Scheduling Tool,Course End Date,የኮርስ መጨረሻ ቀን
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,የሚላክበት አድራሻ ስም
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,መለያዎች ገበታ
 DocType: Material Request,Terms and Conditions Content,ውል እና ሁኔታዎች ይዘት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,የበለጠ ከ 100 በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} ንጥል ከአክሲዮን ንጥል አይደለም
 DocType: Maintenance Visit,Unscheduled,E ሶችን
 DocType: Employee,Owned,ባለቤትነት የተያዘ
 DocType: Salary Detail,Depends on Leave Without Pay,ይክፈሉ ያለ ፈቃድ ላይ የተመካ ነው
 DocType: Pricing Rule,"Higher the number, higher the priority",ቁጥሩ ከፍ ከፍ ቅድሚያ
 ,Purchase Invoice Trends,የደረሰኝ በመታየት ላይ ይግዙ
 DocType: Employee,Better Prospects,የተሻለ ተስፋ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","የረድፍ # {0}: የ ስብስብ {1} ብቻ {2} ብዛት አለው. የሚገኙ {3} ብዛት ያለው ሌላ ስብስብ ለመምረጥ ወይም በርካታ ቡድኖች ከ / ጉዳይ ለማድረስ, በርካታ ረድፎች ወደ ረድፍ ተከፋፍለው እባክዎ"
 DocType: Vehicle,License Plate,ታርጋ ቁጥር
 DocType: Appraisal,Goals,ግቦች
 DocType: Warranty Claim,Warranty / AMC Status,የዋስትና / AMC ሁኔታ
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,የተቀጣሪ ራሱን ሪፖርት አይችልም.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","መለያ የታሰሩ ከሆነ, ግቤቶች የተገደቡ ተጠቃሚዎች ይፈቀዳል."
 DocType: Email Digest,Bank Balance,ባንክ ሒሳብ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ብቻ ነው ምንዛሬ ውስጥ ሊደረጉ ይችላሉ: {0} ለ በኢኮኖሚክስ የሚመዘገብ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ኢዮብ መገለጫ, ብቃት ያስፈልጋል ወዘተ"
 DocType: Journal Entry Account,Account Balance,የመለያ ቀሪ ሂሳብ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ግብይቶች ለ የግብር ሕግ.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ያልተዘጋ በጀት ዓመት አ &amp; ኤል ሚዛን አሳይ
 DocType: Shipping Rule,Shipping Account,መላኪያ መለያ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: መለያ {2} ንቁ አይደለም
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,የሽያጭ ትዕዛዞች የእርስዎን ሥራ ዕቅድ ለመርዳት ላይ-ጊዜ ለማቅረብ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,የሽያጭ ትዕዛዞች የእርስዎን ሥራ ዕቅድ ለመርዳት ላይ-ጊዜ ለማቅረብ አድርግ
 DocType: Quality Inspection,Readings,ንባብ
 DocType: Stock Entry,Total Additional Costs,ጠቅላላ ተጨማሪ ወጪዎች
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,እሴት ወደ
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ማሸጊያ የማያፈስ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ማሸጊያ የማያፈስ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,የቢሮ ኪራይ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,አዋቅር ኤስ ፍኖት ቅንብሮች
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ማስመጣት አልተሳካም!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,አገልግሎቶች
 DocType: HR Settings,Email Salary Slip to Employee,የተቀጣሪ ወደ የኢሜይል የቀጣሪ
 DocType: Cost Center,Parent Cost Center,የወላጅ ወጪ ማዕከል
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ይቻላል አቅራቢ ይምረጡ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ይቻላል አቅራቢ ይምረጡ
 DocType: Sales Invoice,Source,ምንጭ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,አሳይ ተዘግቷል
 DocType: Leave Type,Is Leave Without Pay,ይክፈሉ ያለ ውጣ ነው
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,የንብረት ምድብ ቋሚ ንብረት ንጥል ግዴታ ነው
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,በክፍያ ሠንጠረዥ ውስጥ አልተገኘም ምንም መዝገቦች
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ይህን {0} ግጭቶች {1} ለ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ተማሪዎች ኤችቲኤምኤል
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,መተው ቀን
 DocType: Pricing Rule,For Price List,የዋጋ ዝርዝር ለ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,አስፈፃሚ ፍለጋ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,እርሳሶች ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,እርሳሶች ፍጠር
 DocType: Maintenance Schedule,Schedules,መርሐግብሮች
 DocType: Purchase Invoice Item,Net Amount,የተጣራ መጠን
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ዝርዝር የለም
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ፕሮግራም የመመዝገቢያ
 DocType: Sales Invoice Item,Brand Name,የምርት ስም
 DocType: Purchase Receipt,Transporter Details,አጓጓዥ ዝርዝሮች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,ነባሪ መጋዘን የተመረጠው ንጥል ያስፈልጋል
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ሳጥን
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,በተቻለ አቅራቢ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,በተቻለ አቅራቢ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ድርጅቱ
 DocType: Budget,Monthly Distribution,ወርሃዊ ስርጭት
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ተቀባይ ዝርዝር ባዶ ነው. ተቀባይ ዝርዝር ይፍጠሩ
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,የሽያጭ ባልደረባ ዒላማ
 DocType: Loan Type,Maximum Loan Amount,ከፍተኛ የብድር መጠን
 DocType: Pricing Rule,Pricing Rule,የዋጋ አሰጣጥ ደንብ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ተማሪ የተባዙ ጥቅል ቁጥር {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ተማሪ የተባዙ ጥቅል ቁጥር {0}
 DocType: Budget,Action if Annual Budget Exceeded,እርምጃ ዓመታዊ በጀት የታለፈው ከሆነ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ትዕዛዝ ግዢ ቁሳዊ ጥያቄ
 DocType: Shopping Cart Settings,Payment Success URL,ክፍያ ስኬት ዩ አር ኤል
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,ብድር መክፈል ስልት
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ከተመረጠ, መነሻ ገጽ ድር ነባሪ ንጥል ቡድን ይሆናል"
 DocType: Quality Inspection Reading,Reading 4,4 ማንበብ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} ፕሮጀክት አልተገኘም ነባሪ BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} ፕሮጀክት አልተገኘም ነባሪ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ኩባንያ ወጪ የይገባኛል.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ተማሪዎች ሥርዓት ልብ ላይ, ሁሉም ተማሪዎች ማከል ነው"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ተማሪዎች ሥርዓት ልብ ላይ, ሁሉም ተማሪዎች ማከል ነው"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},የረድፍ # {0}: የከፈሉ ቀን {1} ቼክ ቀን በፊት ሊሆን አይችልም {2}
 DocType: Company,Default Holiday List,የበዓል ዝርዝር ነባሪ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ረድፍ {0}: ታይም እና ወደ ጊዜ ጀምሮ {1} ጋር ተደራቢ ነው {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,እርስዎ ፈቃድ የሚያመለክቱ ናቸው ላይ ያለው ቀን (ዎች) በዓላት ናቸው. እናንተ ፈቃድን ለማግኘት ማመልከት አይገባም.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,የክፍያ ኢሜይል ላክ
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,አዲስ ተግባር
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ትዕምርተ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ትዕምርተ አድርግ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ሌሎች ሪፖርቶች
 DocType: Dependent Task,Dependent Task,ጥገኛ ተግባር
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},የመለኪያ ነባሪ ክፍል ለ ልወጣ ምክንያቶች ረድፍ ውስጥ 1 መሆን አለበት {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},አይነት ፈቃድ {0} በላይ ሊሆን አይችልም {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,አስቀድሞ X ቀኖች ለ ቀዶ ዕቅድ ይሞክሩ.
 DocType: HR Settings,Stop Birthday Reminders,አቁም የልደት ቀን አስታዋሾች
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ኩባንያ ውስጥ ነባሪ የደመወዝ ክፍያ ሊከፈል መለያ ማዘጋጀት እባክዎ {0}
 DocType: SMS Center,Receiver List,ተቀባይ ዝርዝር
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,የፍለጋ ንጥል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,የፍለጋ ንጥል
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ፍጆታ መጠን
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,በጥሬ ገንዘብ ውስጥ የተጣራ ለውጥ
 DocType: Assessment Plan,Grading Scale,አሰጣጥ በስምምነት
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ቀድሞውኑ ተጠናቋል
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ይለኩ {0} መለኪያ የልወጣ ምክንያቶች የርዕስ ማውጫ ውስጥ ከአንድ ጊዜ በላይ ገባ ተደርጓል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ቀድሞውኑ ተጠናቋል
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},የክፍያ መጠየቂያ አስቀድሞ አለ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,የተሰጠው ንጥሎች መካከል ወጪ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},ብዛት የበለጠ መሆን አለበት {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,የሚያጠብ የገባበት አድርግ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ረድፍ {0}: አቅራቢው ላይ በቅድሚያ ዘዴዎ መሆን አለበት
 DocType: Company,Default Values,ነባሪ ዋጋዎች
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ድግግሞሽ} ጥንቅር
 DocType: Expense Claim,Total Amount Reimbursed,ጠቅላላ መጠን ይመለስላቸዋል
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ይሄ በዚህ ተሽከርካሪ ላይ መዝገቦች ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ይሰብስቡ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},አቅራቢው ላይ የደረሰኝ {0} የተዘጋጀው {1}
 DocType: Customer,Default Price List,ነባሪ ዋጋ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,የንብረት እንቅስቃሴ መዝገብ {0} ተፈጥሯል
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,አንተ መሰረዝ አይችሉም በጀት ዓመት {0}. በጀት ዓመት {0} አቀፍ ቅንብሮች ውስጥ እንደ ነባሪ ተዘጋጅቷል
 DocType: Journal Entry,Entry Type,ግቤት አይነት
 ,Customer Credit Balance,የደንበኛ የሥዕል ቀሪ
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,የግዥ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ንጥሎች መካከል አንዳቸውም መጠን ወይም ዋጋ ላይ ምንም ዓይነት ለውጥ የላቸውም.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,አስገዳጅ መስክ - ፕሮግራም
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,የዋስትና የይገባኛል ጥያቄ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,የዋስትና የይገባኛል ጥያቄ
 ,Lead Details,ቀዳሚ ዝርዝሮች
 DocType: Salary Slip,Loan repayment,ብድር ብድር መክፈል
 DocType: Purchase Invoice,End date of current invoice's period,የአሁኑ መጠየቂያ ያለው ክፍለ ጊዜ መጨረሻ ቀን
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,ቀዋሚ አድራሻ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ታላቅ ድምር ከ \ {0} {1} የበለጠ ሊሆን አይችልም ላይ የሚከፈልበት አስቀድሞ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ንጥል ኮድ ይምረጡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,ንጥል ኮድ ይምረጡ
 DocType: Student Sibling,Studying in Same Institute,ተመሳሳይ ተቋም ውስጥ በማጥናት
 DocType: Territory,Territory Manager,ግዛት አስተዳዳሪ
 DocType: Packed Item,To Warehouse (Optional),መጋዘን ወደ (አማራጭ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; ብራንድ
 DocType: Payment Entry,Paid Amount (Company Currency),የሚከፈልበት መጠን (የኩባንያ የምንዛሬ)
 DocType: Purchase Invoice,Additional Discount,ተጨማሪ ቅናሽ
 DocType: Selling Settings,Selling Settings,ቅንብሮች መሸጥ
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ጨመር ውስጥ ይመልከቱ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,የገበያ ወጪ
 ,Item Shortage Report,ንጥል እጥረት ሪፖርት
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","የክብደት \ n ደግሞ &quot;የክብደት UOM&quot; አውሳ, ተጠቅሷል"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ቁሳዊ ጥያቄ ይህ የአክሲዮን የሚመዘገብ ለማድረግ ስራ ላይ የሚውለው
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ቀጣይ የእርጅና ቀን አዲስ ንብረት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ቀጣይ የእርጅና ቀን አዲስ ንብረት ግዴታ ነው
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,እያንዳንዱ ባች ለ የተለየ አካሄድ የተመሠረተ ቡድን
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,አንድ ንጥል ላይ ነጠላ አሃድ.
 DocType: Fee Category,Fee Category,ክፍያ ምድብ
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: የወጪ ማዕከል &#39;ትርፍ እና ኪሳራ&#39; መለያ ያስፈልጋል {2}. ካምፓኒው ነባሪ ዋጋ ማዕከል ያዘጋጁ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,አንድ የደንበኛ ቡድን በተመሳሳይ ስም አለ ያለውን የደንበኛ ስም መቀየር ወይም የደንበኛ ቡድን ዳግም መሰየም እባክዎ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 ማንበብ
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,ንጥል-ጥበብ የሽያጭ መመዝገቢያ
 DocType: Asset,Gross Purchase Amount,አጠቃላይ የግዢ መጠን
 DocType: Asset,Depreciation Method,የእርጅና ስልት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ከመስመር ውጭ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ከመስመር ውጭ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,መሰረታዊ ተመን ውስጥ ተካትቷል ይህ ታክስ ነው?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ጠቅላላ ዒላማ
 DocType: Program Course,Required,የሚያስፈልግ
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ማስታረቅ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,በጣም ብዙ አምዶች. ሪፖርቱን ለመላክ እና የተመን መተግበሪያ በመጠቀም ያትሙ.
 DocType: Purchase Invoice Item,Batch No,የጅምላ የለም
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,አንድ የደንበኛ የግዢ ትዕዛዝ ላይ በርካታ የሽያጭ ትዕዛዞች ፍቀድ
 DocType: Student Group Instructor,Student Group Instructor,የተማሪ ቡድን አስተማሪ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ተንቀሳቃሽ አይ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ዋና
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ተለዋጭ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ዋና
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ተለዋጭ
 DocType: Naming Series,Set prefix for numbering series on your transactions,በእርስዎ ግብይቶች ላይ ተከታታይ ቁጥር አዘጋጅ ቅድመ ቅጥያ
 DocType: Employee Attendance Tool,Employees HTML,ተቀጣሪዎች ኤችቲኤምኤል
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ነባሪ BOM ({0}) ይህ ንጥል ወይም አብነት ገባሪ መሆን አለበት
 DocType: Employee,Leave Encashed?,Encashed ይውጡ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,መስክ ከ አጋጣሚ የግዴታ ነው
 DocType: Email Digest,Annual Expenses,ዓመታዊ ወጪዎች
 DocType: Item,Variants,ተለዋጮች
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,የግዢ ትዕዛዝ አድርግ
 DocType: SMS Center,Send To,ወደ ላክ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},አይተውህም አይነት የሚበቃ ፈቃድ ቀሪ የለም {0}
 DocType: Payment Reconciliation Payment,Allocated amount,በጀት መጠን
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,የስራ-በ-እድገት መጋዘን አስገባ በፊት ያስፈልጋል
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,የስራ-በ-እድገት መጋዘን አስገባ በፊት ያስፈልጋል
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ሥራ አመልካች
 DocType: Purchase Order Item,Warehouse and Reference,መጋዘን እና ማጣቀሻ
 DocType: Supplier,Statutory info and other general information about your Supplier,የእርስዎ አቅራቢው ስለ ህጋዊ መረጃ እና ሌሎች አጠቃላይ መረጃ
 DocType: Item,Serial Nos and Batches,ተከታታይ ቁጥሮች እና ቡድኖች
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,የተማሪ ቡድን ጥንካሬ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ጆርናል ላይ የሚመዘገብ {0} ማንኛውም ያላገኘውን {1} ግቤት የለውም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ጆርናል ላይ የሚመዘገብ {0} ማንኛውም ያላገኘውን {1} ግቤት የለውም
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ማስተመኖች
 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: Grading Structure,Grading Intervals,አሰጣጥ ጣልቃ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ያስገቡ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ረድፍ ውስጥ ንጥል {0} ለ overbill አይቻልም {1} ይልቅ {2}. በላይ-አከፋፈል መፍቀድ, ቅንብሮች መግዛት ውስጥ ለማዘጋጀት እባክዎ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ንጥል ወይም መጋዘን ላይ የተመሠረተ ማጣሪያ ማዘጋጀት እባክዎ
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} መቅረብ አለበት
 DocType: Authorization Control,Authorization Control,ፈቀዳ ቁጥጥር
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},የረድፍ # {0}: መጋዘን አላገኘም ውድቅ ንጥል ላይ ግዴታ ነው {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ክፍያ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,የእርስዎን ትዕዛዞች ያቀናብሩ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ክፍያ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,የእርስዎን ትዕዛዞች ያቀናብሩ
 DocType: Production Order Operation,Actual Time and Cost,ትክክለኛው ጊዜ እና ወጪ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ከፍተኛው {0} ቁሳዊ ጥያቄ {1} የሽያጭ ትዕዛዝ ላይ ንጥል የተሰራ ሊሆን ይችላል {2}
 DocType: Employee,Salutation,ሰላምታ
 DocType: Course,Course Abbreviation,የኮርስ ምህፃረ ቃል
 DocType: Student Leave Application,Student Leave Application,የተማሪ ፈቃድ ማመልከቻ
 DocType: Item,Will also apply for variants,በተጨማሪም ተለዋጮች ማመልከት ይሆን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","አስቀድሞ እንደ ንብረት, ሊሰረዝ አይችልም {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ላይ ግማሽ ቀን ላይ ሠራተኛ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ጠቅላላ የሥራ ሰዓቶች ከፍተኛ የሥራ ሰዓት በላይ መሆን የለበትም {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ላይ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,በሽያጭ ጊዜ ላይ ጥቅል ንጥሎች.
 DocType: Quotation Item,Actual Qty,ትክክለኛ ብዛት
 DocType: Sales Invoice Item,References,ማጣቀሻዎች
@@ -1775,7 +1776,7 @@
 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 +91,Associate,የሥራ ጓደኛ
 DocType: Asset Movement,Asset Movement,የንብረት ንቅናቄ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,አዲስ ጨመር
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,አዲስ ጨመር
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} ንጥል አንድ serialized ንጥል አይደለም
 DocType: SMS Center,Create Receiver List,ተቀባይ ዝርዝር ፍጠር
 DocType: Vehicle,Wheels,መንኮራኩሮች
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,የምርት ትዕዛዞች ላይ ጊዜ ምዝግብ መፍጠር ያሰናክላል. ክወናዎች የምርት ትዕዛዝ ላይ ክትትል የለበትም
 DocType: Student,Student Mobile Number,የተማሪ የተንቀሳቃሽ ስልክ ቁጥር
 DocType: Item,Has Variants,ተለዋጮች አለው
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ከዚህ ቀደም ከ ንጥሎች ተመርጠዋል ሊሆን {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ወደ ወርሃዊ ስርጭት ስም
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ባች መታወቂያ ግዴታ ነው
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ባች መታወቂያ ግዴታ ነው
 DocType: Sales Person,Parent Sales Person,የወላጅ ሽያጭ ሰው
 DocType: Purchase Invoice,Recurring Invoice,ተደጋጋሚ ደረሰኝ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ፕሮጀክቶች ማስተዳደር
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,በጀት ዓመት
 DocType: Vehicle Log,Fuel Price,የነዳጅ ዋጋ
 DocType: Budget,Budget,ባጀት
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,የተወሰነ የንብረት ንጥል ያልሆነ-የአክሲዮን ንጥል መሆን አለበት.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ይህ የገቢ ወይም የወጪ መለያ አይደለም እንደ በጀት, ላይ {0} ሊመደብ አይችልም"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,አሳክቷል
 DocType: Student Admission,Application Form Route,ማመልከቻ ቅጽ መስመር
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,ግዛት / የደንበኛ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,ግዛት / የደንበኛ
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ለምሳሌ: 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ይህ ክፍያ ያለ መተው ነው ጀምሮ ዓይነት {0} ይመደባል አይችልም ይነሱ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ረድፍ {0}: የተመደበ መጠን {1} ከ ያነሰ መሆን ወይም የላቀ መጠን ደረሰኝ ጋር እኩል መሆን አለበት {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,ተከታታይ ምንም ሁኔታ
 DocType: Payment Entry Reference,Outstanding,ያልተከፈለ
 ,Daily Timesheet Summary,ዕለታዊ Timesheet ማጠቃለያ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ረድፍ {0}: ለማቀናበር {1} PERIODICITY, እንዲሁም ቀን \ ወደ መካከል ልዩነት ይልቅ የበለጠ ወይም እኩል መሆን አለበት {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ይህ የአክሲዮን እንቅስቃሴ ላይ የተመሠረተ ነው. ይመልከቱ {0} ዝርዝር መረጃ ለማግኘት
 DocType: Pricing Rule,Selling,ሽያጭ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},የገንዘብ መጠን {0} {1} ላይ የሚቀነስ {2}
 DocType: Employee,Salary Information,ደመወዝ መረጃ
 DocType: Sales Person,Name and Employee ID,ስም እና የሰራተኛ መታወቂያ
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,መጠናቀቅ ያለበት ቀን ቀን መለጠፍ በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,ተግባርና ግብሮች
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,የማጣቀሻ ቀን ያስገቡ
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ይህ የክፍያ ዓይነት የአሁኑ ረድፍ ቁጥር ይበልጣል ወይም እኩል ረድፍ ቁጥር ሊያመለክት አይችልም
 DocType: Asset,Sold,የተሸጠ
 ,Item-wise Purchase History,ንጥል-ጥበብ የግዢ ታሪክ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ተከታታይ ምንም ንጥል ታክሏል ለማምጣት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ተከታታይ ምንም ንጥል ታክሏል ለማምጣት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ {0}
 DocType: Account,Frozen,የቀዘቀዘ
 ,Open Production Orders,ክፈት ምርት ትዕዛዞች
 DocType: Sales Invoice Payment,Base Amount (Company Currency),የመሠረት መጠን (የኩባንያ የምንዛሬ)
 DocType: Payment Reconciliation Payment,Reference Row,ማጣቀሻ ረድፍ
 DocType: Installation Note,Installation Time,መጫን ሰዓት
 DocType: Sales Invoice,Accounting Details,አካውንቲንግ ዝርዝሮች
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ይህ ኩባንያ ሁሉም ግብይቶች ሰርዝ
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ኢንቨስትመንት
 DocType: Issue,Resolution Details,ጥራት ዝርዝሮች
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,ዉይይት
 DocType: Payment Entry,Transaction ID,የግብይት መታወቂያ
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,የዋጋ ደንቦች ተጨማሪ በብዛት ላይ ተመስርተው ይጣራሉ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ሠራተኛ ለማግኘት በመቀላቀል ቀን ማዘጋጀት እባክዎ {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ጠቅላላ የሂሳብ አከፋፈል መጠን (ጊዜ ሉህ በኩል)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ድገም የደንበኛ ገቢ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ሚና &#39;የወጪ አጽዳቂ&#39; ሊኖረው ይገባል
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ሚና &#39;የወጪ አጽዳቂ&#39; ሊኖረው ይገባል
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ሁለት
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ለምርት BOM እና ብዛት ይምረጡ
 DocType: Asset,Depreciation Schedule,የእርጅና ፕሮግራም
 DocType: Bank Reconciliation Detail,Against Account,መለያ ላይ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ግማሽ ቀን ቀን ቀን ጀምሮ እና ቀን ወደ መካከል መሆን አለበት
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},ኩባንያ ውስጥ &#39;የንብረት የእርጅና ወጪ ማዕከል&#39; ለማዘጋጀት እባክዎ {0}
 ,Maintenance Schedules,ጥገና ፕሮግራም
 DocType: Task,Actual End Date (via Time Sheet),ትክክለኛው መጨረሻ ቀን (ሰዓት ሉህ በኩል)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},የገንዘብ መጠን {0} {1} ላይ {2} {3}
 ,Quotation Trends,በትዕምርተ ጥቅስ አዝማሚያዎች
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ንጥል ቡድን ንጥል ንጥል ጌታ ውስጥ የተጠቀሰው አይደለም {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,መለያ ወደ ዴቢት አንድ የሚሰበሰብ መለያ መሆን አለበት
 DocType: Shipping Rule Condition,Shipping Amount,መላኪያ መጠን
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,በመጠባበቅ ላይ ያለ መጠን
 DocType: Purchase Invoice Item,Conversion Factor,የልወጣ መንስኤ
 DocType: Purchase Order,Delivered,ደርሷል
 ,Vehicle Expenses,የተሽከርካሪ ወጪ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
+DocType: Serial No,Invoice Details,የደረሰኝ ዝርዝሮች
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ጠቃሚ ሕይወት በኋላ የተጠበቀው ዋጋ ይበልጣል ወይም እኩል መሆን አለበት {0}
 DocType: Purchase Receipt,Vehicle Number,የተሽከርካሪ ቁጥር
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ተደጋጋሚ መጠየቂያ ማቆም ይሆናል ከተደረገባቸው ቀን
 DocType: Employee Loan,Loan Amount,የብድር መጠን
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,የሰው ኃይል ቅንብሮች
 DocType: Salary Slip,net pay info,የተጣራ ክፍያ መረጃ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ወጪ የይገባኛል ጥያቄ ተቀባይነት በመጠባበቅ ላይ ነው. ብቻ ኪሳራውን አጽዳቂ ሁኔታ ማዘመን ይችላሉ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ወጪ የይገባኛል ጥያቄ ተቀባይነት በመጠባበቅ ላይ ነው. ብቻ ኪሳራውን አጽዳቂ ሁኔታ ማዘመን ይችላሉ.
 DocType: Email Digest,New Expenses,አዲስ ወጪዎች
 DocType: Purchase Invoice,Additional Discount Amount,ተጨማሪ የቅናሽ መጠን
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",የረድፍ # {0}: ንጥል ቋሚ ንብረት ነው እንደ ብዛት: 1 መሆን አለበት. በርካታ ብዛት የተለያየ ረድፍ ይጠቀሙ.
 DocType: Leave Block List Allow,Leave Block List Allow,አግድ ዝርዝር ፍቀድ ይነሱ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ባዶ ወይም ባዶ መሆን አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ያልሆኑ ቡድን ቡድን
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ስፖርት
 DocType: Loan Type,Loan Name,ብድር ስም
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,የደንበኛ ማግኛ እና ታማኝነት
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,እናንተ ተቀባይነት ንጥሎች የአክሲዮን ጠብቆ የት መጋዘን
 DocType: Production Order,Skip Material Transfer,የቁስ ማስተላለፍ ዝለል
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ለ ምንዛሬ ተመን ማግኘት አልተቻለም {0} ወደ {1} ቁልፍ ቀን {2}. እራስዎ ምንዛሪ ልውውጥ መዝገብ ለመፍጠር እባክዎ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,የፋይናንስ ዓመት ላይ ያበቃል
 DocType: POS Profile,Price List,የዋጋ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ነባሪ በጀት ዓመት አሁን ነው. ለውጡ ተግባራዊ ለማግኘት እባክዎ አሳሽዎን ያድሱ.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},መለያ {0} ልክ ያልሆነ ነው. መለያ ምንዛሬ መሆን አለበት {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM የመለወጥ ምክንያት ረድፍ ውስጥ ያስፈልጋል {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የሽያጭ ትዕዛዝ አንዱ ሽያጭ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት
 DocType: Salary Component,Deduction,ቅናሽ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ረድፍ {0}: ሰዓት ጀምሮ እና ሰዓት ወደ የግዴታ ነው.
 DocType: Stock Reconciliation Item,Amount Difference,መጠን ያለው ልዩነት
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},ንጥል ዋጋ ለ ታክሏል {0} የዋጋ ዝርዝር ውስጥ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ይህ የሽያጭ ሰው የሰራተኛ መታወቂያ ያስገቡ
 DocType: Territory,Classification of Customers by region,ክልል በ ደንበኞች መካከል ምደባ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ልዩነት መጠን ዜሮ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ልዩነት መጠን ዜሮ መሆን አለበት
 DocType: Project,Gross Margin,ግዙፍ ኅዳግ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,በመጀመሪያ የምርት ንጥል ያስገቡ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,የተሰላው ባንክ መግለጫ ቀሪ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ተሰናክሏል ተጠቃሚ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ጥቅስ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ጥቅስ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ጠቅላላ ተቀናሽ
 ,Production Analytics,የምርት ትንታኔ
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ማስጠንቀቂያ: አባሪ ላይ ልክ ያልሆነ SSL ሰርቲፊኬት {0}
 DocType: Student Admission,Eligibility,የብቁነት
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","እርሳሶች የንግድ, ሁሉም እውቂያዎች እና ተጨማሪ ይመራል እንደ ለማከል ለማገዝ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","እርሳሶች የንግድ, ሁሉም እውቂያዎች እና ተጨማሪ ይመራል እንደ ለማከል ለማገዝ"
 DocType: Production Order Operation,Actual Operation Time,ትክክለኛው ኦፕሬሽን ሰዓት
 DocType: Authorization Rule,Applicable To (User),የሚመለከታቸው ለማድረግ (ተጠቃሚ)
 DocType: Purchase Taxes and Charges,Deduct,ቀነሰ
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,የስራ አድራሻ
 DocType: Appraisal,Calculate Total Score,አጠቃላይ ነጥብ አስላ
 DocType: Request for Quotation,Manufacturing Manager,የማምረቻ አስተዳዳሪ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},ተከታታይ አይ {0} እስከሁለት ዋስትና ስር ነው {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ተከታታይ አይ {0} እስከሁለት ዋስትና ስር ነው {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ጥቅሎች ወደ ክፈል ማቅረቢያ ማስታወሻ.
 apps/erpnext/erpnext/hooks.py +87,Shipments,ማዕድኑን
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,የመለያ ቀሪ ሂሳብ ({0}) {1} እና የአክሲዮን ዋጋ ለ ({2}) መጋዘን ለ {3} ተመሳሳይ መሆን አለበት
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,ጠቅላላ ፈቃድ ቀናት
 DocType: Email Digest,Note: Email will not be sent to disabled users,ማስታወሻ: የኢሜይል ተሰናክሏል ተጠቃሚዎች አይላክም
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ምንጭጌ ብዛት
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ኩባንያ ይምረጡ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ኩባንያ ይምረጡ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ሁሉም ክፍሎች እየታሰቡ ከሆነ ባዶውን ይተው
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","የሥራ ዓይነቶች (ቋሚ, ውል, እሥረኛ ወዘተ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ንጥል ግዴታ ነው {1}
 DocType: Process Payroll,Fortnightly,በየሁለት ሳምንቱ
 DocType: Currency Exchange,From Currency,ምንዛሬ ከ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ቢያንስ አንድ ረድፍ ውስጥ የተመደበ መጠን, የደረሰኝ አይነት እና የደረሰኝ ቁጥር እባክዎ ይምረጡ"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),መጠን (የኩባንያ የምንዛሬ)
 DocType: Student Guardian,Others,ሌሎች
 DocType: Payment Entry,Unallocated Amount,unallocated መጠን
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,አንድ ተዛማጅ ንጥል ማግኘት አልተቻለም. ለ {0} ሌላ ዋጋ ይምረጡ.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,ምንም ተጨማሪ ዝማኔዎች
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,የመጀመሪያውን ረድፍ ለ &#39;ቀዳሚ ረድፍ ጠቅላላ ላይ&#39; &#39;ቀዳሚ የረድፍ መጠን ላይ&#39; እንደ ክፍያ አይነት መምረጥ ወይም አይቻልም
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,የልጅ ንጥል አንድ ምርት ጥቅል መሆን የለበትም. ንጥል ለማስወገድ `{0}` እና ያስቀምጡ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ባንኪንግ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ያክሉ
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ያክሉ
 DocType: Vehicle Service,Service Item,የአገልግሎት ንጥል
 DocType: Bank Guarantee,Bank Guarantee,ባንክ ዋስትና
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,ፕሮግራም ለማግኘት &#39;ፍጠር ፕሮግራም »ላይ ጠቅ ያድርጉ
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},የረድፍ # {0}: የንብረት {1} አስቀድሞ ነው; {2}
 DocType: Quotation Item,Stock Balance,የአክሲዮን ቀሪ
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ክፍያ የሽያጭ ትዕዛዝ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ውቅረት&gt; በቅንብሮች&gt; የስያሜ ተከታታይ ለ ተከታታይ የስያሜ ለማዘጋጀት እባክዎ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,ዋና ሥራ አስኪያጅ
 DocType: Expense Claim Detail,Expense Claim Detail,የወጪ የይገባኛል ጥያቄ ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,ትክክለኛውን መለያ ይምረጡ
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,የዋጋ ዝርዝር ካልተዋቀረ ዋጋዎች አይታይም
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ለዚህ መላኪያ አገዛዝ አንድ አገር መግለጽ ወይም ዓለም አቀፍ መላኪያ ያረጋግጡ
 DocType: Stock Entry,Total Incoming Value,ጠቅላላ ገቢ ዋጋ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ዴት ወደ ያስፈልጋል
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ዴት ወደ ያስፈልጋል
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets በእርስዎ ቡድን እንዳደረገ activites ጊዜ, ወጪ እና የማስከፈያ እንዲከታተሉ ለመርዳት"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,የግዢ ዋጋ ዝርዝር
 DocType: Offer Letter Term,Offer Term,ቅናሽ የሚቆይበት ጊዜ
 DocType: Quality Inspection,Quality Manager,የጥራት ሥራ አስኪያጅ
 DocType: Job Applicant,Job Opening,ክፍት የሥራ ቦታ
 DocType: Payment Reconciliation,Payment Reconciliation,የክፍያ ማስታረቅ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Incharge ሰው ስም ይምረጡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge ሰው ስም ይምረጡ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ቴክኖሎጂ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},ጠቅላላ የማይከፈላቸው: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ድር ጣቢያ ኦፕሬሽን
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,የጠፋ ምክንያት
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,አዲስ አድራሻ
 DocType: Quality Inspection,Sample Size,የናሙና መጠን
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ሁሉም ንጥሎች ቀደም ሲል ደረሰኝ ተደርጓል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ደረሰኝ ሰነድ ያስገቡ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ተጨማሪ ወጪ ማዕከላት ቡድኖች ስር ሊሆን ይችላል ነገር ግን ግቤቶች ያልሆኑ ቡድኖች ላይ ሊሆን ይችላል
 DocType: Project,External,ውጫዊ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ተጠቃሚዎች እና ፈቃዶች
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},የምርት ትዕዛዞች ተፈጠረ: {0}
 DocType: Branch,Branch,ቅርንጫፍ
 DocType: Guardian,Mobile Number,ስልክ ቁጥር
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ፕሪንቲንግ እና የምርት
 DocType: Bin,Actual Quantity,ትክክለኛ ብዛት
 DocType: Shipping Rule,example: Next Day Shipping,ለምሳሌ: ቀጣይ ቀን መላኪያ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,አልተገኘም ተከታታይ ምንም {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,አልተገኘም ተከታታይ ምንም {0}
 DocType: Scheduling Tool,Student Batch,የተማሪ ባች
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,የእርስዎ ደንበኞች
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,የተማሪ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,የተማሪ አድርግ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},እርስዎ ፕሮጀክት ላይ ተባበር ተጋብዘዋል: {0}
 DocType: Leave Block List Date,Block Date,አግድ ቀን
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,አሁኑኑ ያመልክቱ
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,ወደ ተልኳል
 DocType: Payment Request,Make Sales Invoice,የሽያጭ ደረሰኝ አድርግ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ሶፍትዌሮችን
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ቀጣይ የእውቂያ ቀን ያለፈ መሆን አይችልም
 DocType: Company,For Reference Only.,ማጣቀሻ ያህል ብቻ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ምረጥ የጅምላ አይ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ልክ ያልሆነ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,የቅድሚያ ክፍያ መጠን
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,የጉዳይ ቁጥር 0 መሆን አይችልም
 DocType: Item,Show a slideshow at the top of the page,በገጹ ላይኛው ክፍል ላይ አንድ ስላይድ ትዕይንት አሳይ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,መደብሮች
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,መደብሮች
 DocType: Serial No,Delivery Time,የማስረከቢያ ቀን ገደብ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ላይ የተመሠረተ ጥበቃና
 DocType: Item,End of Life,የሕይወት መጨረሻ
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,መሣሪያ ዳግም ሰይም
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,አዘምን ወጪ
 DocType: Item Reorder,Item Reorder,ንጥል አስይዝ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,አሳይ የቀጣሪ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,አስተላልፍ ሐሳብ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,አሳይ የቀጣሪ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,አስተላልፍ ሐሳብ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","የ ክወናዎች, የክወና ወጪ ይጥቀሱ እና ቀዶ ሕክምና ምንም ልዩ ክወና መስጠት."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ይህ ሰነድ በ ገደብ በላይ ነው {0} {1} ንጥል {4}. እናንተ እያደረግን ነው በዚያው ላይ ሌላ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,በማስቀመጥ ላይ በኋላ ተደጋጋሚ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ይምረጡ ለውጥ መጠን መለያ
 DocType: Purchase Invoice,Price List Currency,የዋጋ ዝርዝር ምንዛሬ
 DocType: Naming Series,User must always select,ተጠቃሚው ሁልጊዜ መምረጥ አለብዎ
 DocType: Stock Settings,Allow Negative Stock,አሉታዊ የአክሲዮን ፍቀድ
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,የበጀት መለያ
 DocType: Quality Inspection,Verified By,በ የተረጋገጡ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ነባር ግብይቶች አሉ ምክንያቱም, ኩባንያ ነባሪ ምንዛሬ መለወጥ አይቻልም. ግብይቶች ነባሪውን ምንዛሬ ለመቀየር ተሰርዟል አለበት."
-DocType: Grade Interval,Grade Description,ኛ መግለጫ
+DocType: Grading Scale Interval,Grade Description,ኛ መግለጫ
 DocType: Stock Entry,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,የቀጣሪ ፍጠር
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,ቀን ወደ በስብሰባው
 DocType: Warranty Claim,Raised By,በ አስነስቷል
 DocType: Payment Gateway Account,Payment Account,የክፍያ መለያ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,ለመቀጠል ኩባንያ ይግለጹ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,መለያዎች የሚሰበሰብ ሂሳብ ውስጥ የተጣራ ለውጥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,የማካካሻ አጥፋ
 DocType: Offer Letter,Accepted,ተቀባይነት አግኝቷል
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,በእርግጥ ይህ ኩባንያ ሁሉንም ግብይቶችን መሰረዝ ይፈልጋሉ እርግጠኛ ይሁኑ. ነው እንደ ዋና ውሂብ ይቆያል. ይህ እርምጃ ሊቀለበስ አይችልም.
 DocType: Room,Room Number,የክፍል ቁጥር
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},ልክ ያልሆነ ማጣቀሻ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ታቅዶ quanitity መብለጥ አይችልም ({2}) በምርት ላይ ትእዛዝ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ታቅዶ quanitity መብለጥ አይችልም ({2}) በምርት ላይ ትእዛዝ {3}
 DocType: Shipping Rule,Shipping Rule Label,መላኪያ ደንብ መሰየሚያ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,የተጠቃሚ መድረክ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ጥሬ እቃዎች ባዶ መሆን አይችልም.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","የአክሲዮን ማዘመን አልተቻለም, መጠየቂያ ጠብታ መላኪያ ንጥል ይዟል."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ፈጣን ጆርናል የሚመዘገብ መረጃ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ማንኛውም ንጥል agianst የተጠቀሰው ከሆነ መጠን መቀየር አይችሉም
 DocType: Employee,Previous Work Experience,ቀዳሚ የሥራ ልምድ
 DocType: Stock Entry,For Quantity,ብዛት ለ
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ውል እና Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ተቋሙ ስም ስለ እናንተ ይህ ሥርዓት ማዋቀር ነው.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ከዚህ ቀን ድረስ በበረዶ ዲግሪ ግቤት, ማንም / ማድረግ ከዚህ በታች በተጠቀሰው ሚና በስተቀር ግቤት መቀየር ይችላል."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,የጥገና ፕሮግራም ለማመንጨት በፊት ሰነዱን ያስቀምጡ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,የፕሮጀክት ሁኔታ
 DocType: UOM,Check this to disallow fractions. (for Nos),ክፍልፋዮች እንዲከለክል ይህን ይመልከቱ. (ቁጥሮች ለ)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,የሚከተሉት የምርት ትዕዛዞች ተፈጥረው ነበር:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,አንድ በዓል ላይ የሚሰሩ ሰራተኞች
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ማርቆስ አቅርብ
 DocType: Project,% Complete Method,% ተጠናቋል ስልት
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ጥገና መጀመሪያ ቀን መለያ አይ ለ የመላኪያ ቀን በፊት ሊሆን አይችልም {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ጥገና መጀመሪያ ቀን መለያ አይ ለ የመላኪያ ቀን በፊት ሊሆን አይችልም {0}
 DocType: Production Order,Actual End Date,ትክክለኛ መጨረሻ ቀን
 DocType: BOM,Operating Cost (Company Currency),የክወና ወጪ (የኩባንያ የምንዛሬ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ተቀባይነት ፈቃድ ማመልከቻ መዛግብት ጋር አይዛመድም Pay ያለ ይነሱ
 DocType: Campaign,Campaign-.####,የዘመቻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ቀጣይ እርምጃዎች
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,ምርጥ በተቻለ ፍጥነት በተጠቀሰው ንጥሎች አቅርብ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ቀናት በኋላ ራስ የቅርብ አጋጣሚ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,የመጨረሻ ዓመት
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / በእርሳስ%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ብዛት
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ክፍያ መዛግብት ፈጥሯል - {0}
 DocType: Asset Category Account,Asset Category Account,የንብረት ምድብ መለያ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},የሽያጭ ትዕዛዝ ብዛት የበለጠ ንጥል {0} ማፍራት የማይችሉ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,የክምችት Entry {0} ማቅረብ አይደለም
 DocType: Payment Reconciliation,Bank / Cash Account,ባንክ / በጥሬ ገንዘብ መለያ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,ቀጣይ የእውቂያ በ ቀዳሚ የኢሜይል አድራሻ ጋር ተመሳሳይ ሊሆን አይችልም
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,መልቀቂያ ቀን የተጠቀሰው አይደለም
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ፕሮዳክሽን
 DocType: Guardian,Occupation,ሞያ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሀብት ውስጥ HR ቅንብሮች ስርዓት እየሰየሙ ማዋቀር የሰራተኛ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ረድፍ {0}: የመጀመሪያ ቀን ከመጨረሻ ቀን በፊት መሆን አለበት
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ጠቅላላ (ብዛት)
 DocType: Sales Invoice,This Document,ይህ ሰነድ
 DocType: Installation Note Item,Installed Qty,ተጭኗል ብዛት
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ችግር ሪፖርት ያድርጉ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,መገልገያ ወጪ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-በላይ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,የረድፍ # {0}: ጆርናል የሚመዘገብ {1} መለያ የለውም {2} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,የረድፍ # {0}: ጆርናል የሚመዘገብ {1} መለያ የለውም {2} ወይም አስቀድሞ በሌላ ቫውቸር ጋር ይዛመዳሉ
 DocType: Buying Settings,Default Buying Price List,ነባሪ መግዛትና ዋጋ ዝርዝር
 DocType: Process Payroll,Salary Slip Based on Timesheet,Timesheet ላይ የተመሠረተ የቀጣሪ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ከላይ የተመረጡ መመዘኛዎች ወይም የቀጣሪ ምንም ሠራተኛ አስቀድሞ የተፈጠረ
 DocType: Notification Control,Sales Order Message,የሽያጭ ትዕዛዝ መልዕክት
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ወዘተ ኩባንያ, የምንዛሬ, የአሁኑ የበጀት ዓመት, እንደ አዘጋጅ ነባሪ እሴቶች"
 DocType: Payment Entry,Payment Type,የክፍያ አይነት
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ንጥል አንድ ባች ይምረጡ {0}. ይህን መስፈርት በሚያሟላ አንድ ነጠላ ባች ማግኘት አልተቻለም
 DocType: Process Payroll,Select Employees,ይምረጡ ሰራተኞች
 DocType: Opportunity,Potential Sales Deal,እምቅ የሽያጭ የስምምነት
 DocType: Payment Entry,Cheque/Reference Date,ቼክ / የማጣቀሻ ቀን
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ቀደም ሲል ኩባንያ የተፈጠሩ የአለም POS መገለጫ {0} {1}
 DocType: Purchase Order,Ref SQ,ማጣቀሻ ካሬ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ሁሉም BOMs ውስጥ ንጥል / BOM ተካ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ደረሰኝ ሰነድ ማቅረብ ይኖርባቸዋል
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ደረሰኝ ሰነድ ማቅረብ ይኖርባቸዋል
 DocType: Purchase Invoice Item,Received Qty,ተቀብሏል ብዛት
 DocType: Stock Entry Detail,Serial No / Batch,ተከታታይ አይ / ባች
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,አይደለም የሚከፈልበት እና ደርሷል አይደለም
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ምንም ጊዜ ሉሆች
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} መሸከም-ማስተላለፍ አይቻልም አይነት ይነሱ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ጥገና ፕሮግራም ሁሉም ንጥሎች የመነጨ አይደለም. &#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
 ,To Produce,ለማምረት
 apps/erpnext/erpnext/config/hr.py +93,Payroll,የመክፈል ዝርዝር
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ረድፍ {0} ውስጥ {1}. ንጥል መጠን ውስጥ ከ {2} ማካተት, ረድፎች {3} ደግሞ መካተት አለበት"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ተጠቃሚ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ተጠቃሚ አድርግ
 DocType: Packing Slip,Identification of the package for the delivery (for print),የማቅረብ ያለውን ጥቅል መታወቂያ (የህትመት ለ)
 DocType: Bin,Reserved Quantity,የተያዘ ብዛት
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ልክ የሆነ የኢሜይል አድራሻ ያስገቡ
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,የተሰናከለ አብነት ነባሪ አብነት መሆን የለበትም
 DocType: Account,Income Account,የገቢ መለያ
 DocType: Payment Request,Amount in customer's currency,ደንበኛ ምንዛሬ መጠን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ርክክብ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ርክክብ
 DocType: Stock Reconciliation Item,Current Qty,የአሁኑ ብዛት
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ተመልከት የኳንቲቲ ክፍል ውስጥ &quot;ቁሳቁሶች መሰረት ያደረገ ላይ ነው ይስጡት&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,የቀድሞው
 DocType: Appraisal Goal,Key Responsibility Area,ቁልፍ ኃላፊነት አካባቢ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","የተማሪ ቡድኖች እናንተ ተማሪዎች ክትትልን, ግምገማዎች እና ክፍያዎች ይከታተሉ ለመርዳት"
 DocType: Payment Entry,Total Allocated Amount,ጠቅላላ የተመደበ መጠን
 DocType: Item Reorder,Material Request Type,ቁሳዊ ጥያቄ አይነት
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} ከ ደምወዝ ለ Accural ጆርናል የሚመዘገብ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage ሙሉ ነው, ሊያድን አይችልም ነበር"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage ሙሉ ነው, ሊያድን አይችልም ነበር"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ረድፍ {0}: UOM የልወጣ ምክንያት የግዴታ ነው
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,ማጣቀሻ
 DocType: Budget,Cost Center,የወጭ ማዕከል
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,የሽያጭ ግብይቶች ከ የደንበኛ የግብር መታወቂያ ደብቅ
 DocType: Upload Attendance,Upload HTML,ስቀል ኤችቲኤምኤል
 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.","የዋጋ ደ በአንዳንድ መስፈርቶች ላይ የተመሠረቱ, / ዋጋ ዝርዝር እንዲተኩ ቅናሽ መቶኛ ለመግለጽ ነው."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","የዋጋ ደ በአንዳንድ መስፈርቶች ላይ የተመሠረቱ, / ዋጋ ዝርዝር እንዲተኩ ቅናሽ መቶኛ ለመግለጽ ነው."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,መጋዘን ብቻ የክምችት Entry በኩል ሊቀየር ይችላል / የመላኪያ ማስታወሻ / የግዢ ደረሰኝ
 DocType: Employee Education,Class / Percentage,ክፍል / መቶኛ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ማርኬቲንግ እና ሽያጭ ክፍል ኃላፊ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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;ደረጃ »መስክ ውስጥ ማምጣት ይሆናል."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","የተመረጠውን የዋጋ ደ &#39;ዋጋ ለ&#39; ነው ከሆነ, የዋጋ ዝርዝር እንዲተኩ ያደርጋል. የዋጋ አሰጣጥ ደንብ ዋጋ የመጨረሻው ዋጋ ነው, ስለዚህ ምንም ተጨማሪ ቅናሽ የሚሠራ መሆን ይኖርበታል. በመሆኑም, ወዘተ የሽያጭ ትዕዛዝ, የግዥ ትዕዛዝ እንደ ግብይቶችን, ይልቁን &#39;የዋጋ ዝርዝር ተመን&#39; እርሻ ይልቅ &#39;ደረጃ »መስክ ውስጥ ማምጣት ይሆናል."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,የትራክ ኢንዱስትሪ ዓይነት ይመራል.
 DocType: Item Supplier,Item Supplier,ንጥል አቅራቢ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,ባች ምንም ለማግኘት ንጥል ኮድ ያስገቡ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to እሴት ይምረጡ {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ሁሉም አድራሻዎች.
 DocType: Company,Stock Settings,የክምችት ቅንብሮች
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","የሚከተሉትን ባሕሪያት በሁለቱም መዝገቦች ላይ ተመሳሳይ ከሆነ ሕዋሶችን ብቻ ነው. ቡድን, ሥር ዓይነት, ኩባንያ ነው?"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ሁኔታ ጋር ሠራተኞች ክስተት ኢሜይል ይልካል &#39;Open&#39;
 DocType: Task,Depends on Tasks,ተግባራት ላይ ይመረኮዛል
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,የደንበኛ ቡድን ዛፍ ያቀናብሩ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,አባሪዎች ወደ ግዢ ሳጥን ጨመር በማንቃት ያለ ሊታዩ ይችላሉ
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,አዲስ የወጪ ማዕከል ስም
 DocType: Leave Control Panel,Leave Control Panel,የመቆጣጠሪያ ፓነል ውጣ
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,ወደ ዴቢት
 DocType: Delivery Note,Required only for sample item.,ብቻ ናሙና ንጥል ያስፈልጋል.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ግብይት በኋላ ትክክለኛው ብዛት
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,አቅራቢው&gt; አቅራቢ አይነት
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},መካከል ምንም ደመወዝ ወረቀት {0} እና {1}
 ,Pending SO Items For Purchase Request,የግዢ ጥያቄ ስለዚህ ንጥሎች በመጠባበቅ ላይ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,የተማሪ ምዝገባ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ተሰናክሏል
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ተሰናክሏል
 DocType: Supplier,Billing Currency,አከፋፈል ምንዛሬ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,በጣም ትልቅ
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,መነሻ ገጽ ተለይተው የቀረቡ ምርት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ሁሉም የግምገማ ቡድኖች
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,አዲስ መጋዘን ስም
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ጠቅላላ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ጠቅላላ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ግዛት
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,የሚያስፈልግ ጉብኝቶች ምንም መጥቀስ እባክዎ
 DocType: Stock Settings,Default Valuation Method,ነባሪ ዋጋ ትመና ዘዴው
 DocType: Vehicle Log,Fuel Qty,የነዳጅ ብዛት
 DocType: Production Order Operation,Planned Start Time,የታቀደ መጀመሪያ ጊዜ
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,የዋጋ ዝርዝር መምህር
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ማዘጋጀት እና ዒላማዎች ለመከታተል እንዲችሉ ሁሉም የሽያጭ ግብይቶች በርካታ ** የሽያጭ አካላት ** ላይ መለያ ተሰጥተዋቸዋል ይችላል.
 ,S.O. No.,ምት ቁ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ቀዳሚ ከ ደንበኛ ለመፍጠር እባክዎ {0}
 DocType: Price List,Applicable for Countries,አገሮች የሚመለከታቸው
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ብቻ ማቅረብ ይችላሉ &#39;ተቀባይነት አላገኘም&#39; &#39;ጸድቋል »እና ሁኔታ ጋር መተግበሪያዎች ውጣ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},የተማሪ ቡድን ስም ረድፍ ላይ ግዴታ ነው {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,ከ ተገልብጧል
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},ስም ስህተት: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,እጦት
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ጋር የተያያዘ አይደለም {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ጋር የተያያዘ አይደለም {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ሠራተኛ {0} ክትትልን አስቀድሞ ምልክት ነው
 DocType: Packing Slip,If more than one package of the same type (for print),ከሆነ ተመሳሳይ ዓይነት ከአንድ በላይ ጥቅል (የህትመት ለ)
 ,Salary Register,ደመወዝ ይመዝገቡ
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ወደ ግዢ ሳጥን ጨመር ተጠቀም
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},እሴት {0} አይነታ {1} ንጥል ለ እሴቶች የአይነት ልክ ንጥል ዝርዝር ውስጥ የለም {2}
 DocType: BOM Item,Scrap %,ቁራጭ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ክፍያዎች ተመጣጣኝ መጠን በእርስዎ ምርጫ መሠረት, ንጥል ብዛት ወይም መጠን ላይ በመመርኮዝ መሰራጨት ይሆናል"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ክፍያዎች ተመጣጣኝ መጠን በእርስዎ ምርጫ መሠረት, ንጥል ብዛት ወይም መጠን ላይ በመመርኮዝ መሰራጨት ይሆናል"
 DocType: Maintenance Visit,Purposes,ዓላማዎች
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ቢያንስ አንድ ንጥል መመለሻ ሰነድ ላይ አሉታዊ ብዛት ጋር መግባት አለበት
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ድርጊቱ {0} ከገቢር ውስጥ ማንኛውም የሚገኙ የሥራ ሰዓት በላይ {1}, በርካታ ስራዎች ወደ ቀዶ አፈርሳለሁ"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ግዛት ዛፍ ያቀናብሩ.
 DocType: Journal Entry Account,Sales Invoice,የሽያጭ ደረሰኝ
 DocType: Journal Entry Account,Party Balance,የድግስ ሒሳብ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ቅናሽ ላይ ተግብር እባክዎ ይምረጡ
 DocType: Company,Default Receivable Account,ነባሪ የሚሰበሰብ መለያ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ከላይ የተመረጡ መስፈርት የሚከፈለው ጠቅላላ ደመወዝ ስለ ባንክ የሚመዘገብ መረጃ ይፍጠሩ
 DocType: Stock Entry,Material Transfer for Manufacture,ማምረት ቁሳዊ ማስተላለፍ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,የቅናሽ መቶኛ አንድ ዋጋ ዝርዝር ላይ ወይም ሁሉንም የዋጋ ዝርዝር ለማግኘት ወይም ተግባራዊ ሊሆኑ ይችላሉ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,የቅናሽ መቶኛ አንድ ዋጋ ዝርዝር ላይ ወይም ሁሉንም የዋጋ ዝርዝር ለማግኘት ወይም ተግባራዊ ሊሆኑ ይችላሉ.
 DocType: Purchase Invoice,Half-yearly,ግማሽ-ዓመታዊ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,የአክሲዮን ለ አካውንቲንግ Entry
 DocType: Vehicle Service,Engine Oil,የሞተር ዘይት
 DocType: Sales Invoice,Sales Team1,የሽያጭ Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ንጥል {0} የለም
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ንጥል {0} የለም
 DocType: Sales Invoice,Customer Address,የደንበኛ አድራሻ
 DocType: Employee Loan,Loan Details,ብድር ዝርዝሮች
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ረድፍ {0}: ተጠናቋል ብዛት ከዜሮ በላይ መሆን አለበት.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,ስርወ አይነት
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},የረድፍ # {0}: በላይ መመለስ አይቻልም {1} ንጥል ለ {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ሴራ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},የዒላማ የመጋዘን ረድፍ ግዴታ ነው {0}
 DocType: Cheque Print Template,Primary Settings,ዋና ቅንብሮች
 DocType: Purchase Invoice,Select Supplier Address,ይምረጡ አቅራቢው አድራሻ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ሰራተኞችን አክል
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ሰራተኞችን አክል
 DocType: Purchase Invoice Item,Quality Inspection,የጥራት ምርመራ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,የበለጠ አነስተኛ
 DocType: Company,Standard Template,መደበኛ አብነት
 DocType: Training Event,Theory,ፍልስፍና
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,ማስጠንቀቂያ: ብዛት ጠይቀዋል ሐሳብ ያለው አነስተኛ ትዕዛዝ ብዛት ያነሰ ነው
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,መለያ {0} የታሰሩ ነው
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ወደ ድርጅት ንብረት መለያዎች የተለየ ሰንጠረዥ ጋር ሕጋዊ አካሌ / ንዑስ.
 DocType: Payment Request,Mute Email,ድምጸ-ኢሜይል
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","የምግብ, መጠጥ እና ትንባሆ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},ብቻ ላይ ክፍያ ማድረግ ትችላለህ ያለተጠየቀበት {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ኮሚሽን መጠን ከዜሮ በላይ 100 ሊሆን አይችልም
 DocType: Stock Entry,Subcontract,በሰብ
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,በመጀመሪያ {0} ያስገቡ
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,አሁን ያሉ ግብይት ጋር መጋዘኖችን ቡድን ሊቀየር አይችልም.
 DocType: Assessment Result Tool,Result HTML,ውጤት ኤችቲኤምኤል
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ጊዜው የሚያልፍበት
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ተማሪዎች ያክሉ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ተማሪዎች ያክሉ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},እባክዎ ይምረጡ {0}
 DocType: C-Form,C-Form No,ሲ-ቅጽ የለም
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,በጀት ዓመት ይምረጡ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,አስይዝ ደረጃ
 DocType: Company,Chart Of Accounts Template,መለያዎች አብነት ነው ገበታ
 DocType: Attendance,Attendance Date,በስብሰባው ቀን
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,የተባዛ ግቤት
 DocType: Program Enrollment Tool,Get Students,ተማሪዎች ያግኙ
 DocType: Serial No,Under Warranty,የዋስትና በታች
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ስህተት]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ስህተት]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,አንተ ወደ የሽያጭ ትዕዛዝ ለማዳን አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 ,Employee Birthday,የሰራተኛ የልደት ቀን
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,የተማሪ ባች ክትትል መሣሪያ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ገደብ የምታገናኝ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ቬንቸር ካፒታል
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ይህ &#39;የትምህርት ዓመት&#39; ጋር አንድ የትምህርት ቃል {0} እና &#39;ተርም ስም «{1} አስቀድሞ አለ. እነዚህ ግቤቶችን ይቀይሩ እና እንደገና ይሞክሩ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",ንጥል {0} ላይ ነባር ግብይቶች አሉ እንደ አንተ ያለውን ዋጋ መለወጥ አይችሉም {1}
 DocType: UOM,Must be Whole Number,ሙሉ ቁጥር መሆን አለበት
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ቀኖች ውስጥ) የተመደበ አዲስ ቅጠሎች
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,ተከታታይ አይ {0} የለም
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ቁሳቁሶችን% ይህን የሽያጭ ትዕዛዝ ላይ እንዲከፍሉ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ክፍለ ጊዜ መዝጊያ Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል ቡድን ሊቀየር አይችልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},የገንዘብ መጠን {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},የገንዘብ መጠን {0} {1} {2} {3}
 DocType: Account,Depreciation,የእርጅና
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),አቅራቢው (ዎች)
 DocType: Employee Attendance Tool,Employee Attendance Tool,የሰራተኛ ክትትል መሣሪያ
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,ወደ ቀጣዩ ወር የመጨረሻ ቀን
 DocType: Support Settings,Auto close Issue after 7 days,7 ቀናት በኋላ ራስ የቅርብ እትም
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","በፊት የተመደበ አይችልም ይተዉት {0}, ፈቃድ ቀሪ አስቀድሞ የማስቀመጫ-በሚተላለፈው ወደፊት ፈቃድ አመዳደብ መዝገብ ውስጥ ቆይቷል እንደ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ማስታወሻ: የፍትህ / ማጣቀሻ ቀን {0} ቀን አይፈቀድም የደንበኛ ክሬዲት ቀናት አልፏል (ዎች)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,የተማሪ ማመልከቻ
 DocType: Asset Category Account,Accumulated Depreciation Account,ሲጠራቀሙ የእርጅና መለያ
 DocType: Stock Settings,Freeze Stock Entries,አርጋ Stock ግቤቶችን
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,የክምችት ትንታኔ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ክወናዎች ባዶ ሊተው አይችልም
 DocType: Maintenance Visit Purpose,Against Document Detail No,የሰነድ ዝርዝር ላይ የለም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,የድግስ አይነት ግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,የድግስ አይነት ግዴታ ነው
 DocType: Quality Inspection,Outgoing,የወጪ
 DocType: Material Request,Requested For,ለ ተጠይቋል
 DocType: Quotation Item,Against Doctype,Doctype ላይ
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,ንጥል ኮድ
 DocType: Production Planning Tool,Create Production Orders,የምርት ትዕዛዞች ፍጠር
 DocType: Serial No,Warranty / AMC Details,የዋስትና / AMC ዝርዝሮች
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,የ እንቅስቃሴ ላይ የተመሠረተ ቡድን በእጅ ይምረጡ ተማሪዎች
 DocType: Journal Entry,User Remark,የተጠቃሚ አስተያየት
 DocType: Lead,Market Segment,ገበያ ክፍሉ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},የሚከፈልበት መጠን ጠቅላላ አሉታዊ የላቀ መጠን መብለጥ አይችልም {0}
 DocType: Employee Internal Work History,Employee Internal Work History,የተቀጣሪ ውስጣዊ የስራ ታሪክ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),የመመዝገቢያ ጊዜ (ዶክተር)
 DocType: Cheque Print Template,Cheque Size,ቼክ መጠን
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,ቁሳዊ ጥያቄዎች ፍጠር
 DocType: Employee Education,School/University,ትምህርት ቤት / ዩኒቨርስቲ
 DocType: Payment Request,Reference Details,የማጣቀሻ ዝርዝሮች
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ጠቃሚ ሕይወት በኋላ የሚጠበቀው ዋጋ ጠቅላላ የግዢ መጠን ያነሰ መሆን አለበት
 DocType: Sales Invoice Item,Available Qty at Warehouse,መጋዘን ላይ ይገኛል ብዛት
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,የሚከፈል መጠን
 DocType: Asset,Double Declining Balance,ድርብ ካልተቀበሉት ቀሪ
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ይህ የክምችት ማስታረቅ አንድ በመክፈት Entry በመሆኑ ልዩነት መለያ, አንድ ንብረት / የተጠያቂነት ዓይነት መለያ መሆን አለበት"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},በመገኘቱ መጠን የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ንጥል ያስፈልጋል ትዕዛዝ ቁጥር ይግዙ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,የምርት ትዕዛዝ አልተፈጠረም
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ቀን ጀምሮ&#39; በኋላ &#39;እስከ ቀን&#39; መሆን አለበት
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ተማሪ ሁኔታ መለወጥ አይቻልም {0} የተማሪ ማመልከቻ ጋር የተያያዘ ነው {1}
 DocType: Asset,Fully Depreciated,ሙሉ በሙሉ የቀነሰበት
 ,Stock Projected Qty,የክምችት ብዛት የታቀደበት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ይኸው የእርሱ ወገን አይደለም {0} የደንበኛ ፕሮጀክት ወደ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ምልክት ተደርጎበታል ክትትል ኤችቲኤምኤል
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ጥቅሶች, የእርስዎ ደንበኞች ልከዋል ተጫራቾች ሀሳቦች ናቸው"
 DocType: Sales Order,Customer's Purchase Order,ደንበኛ የግዢ ትዕዛዝ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ተከታታይ የለም እና ባች
 DocType: Warranty Claim,From Company,ኩባንያ ከ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ግምገማ መስፈርት በበርካታ ድምር {0} መሆን አለበት.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,እሴት ወይም ብዛት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations ብዛት የተመዘገበ ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,እሴት ወይም ብዛት
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ፕሮዳክሽን ትዕዛዞች ስለ ማጽደቅም የተነሣውን አይችልም:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ደቂቃ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ግብሮች እና ክፍያዎች ይግዙ
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,ሁሉም መጋዘኖችን
 DocType: Sales Partner,Retailer,ቸርቻሪ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,መለያ ወደ ክሬዲት ሚዛን ሉህ መለያ መሆን አለበት
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ሁሉም አቅራቢው አይነቶች
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ሁሉም አቅራቢው አይነቶች
 DocType: Global Defaults,Disable In Words,ቃላት ውስጥ አሰናክል
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"ንጥል በራስ-ሰር ቁጥር አይደለም, ምክንያቱም ንጥል ኮድ የግዴታ ነው"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},ጥቅስ {0} ሳይሆን አይነት {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,የተገኙና
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ባንክ ኦቨርድራፍት መለያ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,የቀጣሪ አድርግ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,የረድፍ # {0}: የተመደበ መጠን የላቀ መጠን የበለጠ ሊሆን አይችልም.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,አስስ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,ደህንነቱ የተጠበቀ ብድሮች
 DocType: Purchase Invoice,Edit Posting Date and Time,አርትዕ የመለጠፍ ቀን እና ሰዓት
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},አይደለም በላይ የቆዩ የአክሲዮን ግብይቶችን ለማዘመን አይፈቀድላቸውም {0}
 DocType: Purchase Invoice Item,PR Detail,የህዝብ ግንኙነት ዝርዝር
 DocType: Sales Order,Fully Billed,ሙሉ በሙሉ የሚከፈል
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ሰራተኛው ላይ ነባሪ የሚከፈለው መለያ ማዘጋጀት እባክዎ {0}
 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 +127,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),የጥቅል ያለው አጠቃላይ ክብደት. አብዛኛውን ጊዜ የተጣራ ክብደት + ጥቅል ቁሳዊ ክብደት. (የህትመት ለ)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,የቡድን የተመረኮዘ ላይ
 DocType: Journal Entry,Bill Date,ቢል ቀን
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","የአገልግሎት ንጥል, ዓይነት, ብዛት እና ወጪ መጠን ያስፈልጋሉ"
-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:","ከፍተኛ ቅድሚያ ጋር በርካታ የዋጋ ደንቦች አሉ እንኳ, ከዚያም የሚከተሉትን የውስጥ ቅድሚያ ተግባራዊ ይሆናሉ:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ከፍተኛ ቅድሚያ ጋር በርካታ የዋጋ ደንቦች አሉ እንኳ, ከዚያም የሚከተሉትን የውስጥ ቅድሚያ ተግባራዊ ይሆናሉ:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},በእርግጥ {0} ወደ ሁሉ የቀጣሪ አስገባ ይፈልጋሉ {1}
 DocType: Cheque Print Template,Cheque Height,ቼክ ቁመት
 DocType: Supplier,Supplier Details,አቅራቢ ዝርዝሮች
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,የደረሰኝ ዳኛ
 DocType: Purchase Order,Recurring Order,ተደጋጋሚ ትዕዛዝ
 DocType: Company,Default Income Account,ነባሪ ገቢ መለያ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,የደንበኛ ቡድን / የደንበኛ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,የደንበኛ ቡድን / የደንበኛ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ያልተዘጋ የፊስካል ዓመት ትርፍ / ኪሣራ (ምንጭ)
 DocType: Sales Invoice,Time Sheets,ሰዓት ሉሆች
 DocType: Payment Gateway Account,Default Payment Request Message,ነባሪ የክፍያ መጠየቂያ መልዕክት
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,ትዕምርተ መልዕክት
 DocType: Employee Loan,Employee Loan Application,የሰራተኛ ብድር ማመልከቻ
 DocType: Issue,Opening Date,መክፈቻ ቀን
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,በስብሰባው ላይ በተሳካ ሁኔታ ምልክት ተደርጎበታል.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,በስብሰባው ላይ በተሳካ ሁኔታ ምልክት ተደርጎበታል.
 DocType: Journal Entry,Remark,አመለከተ
 DocType: Purchase Receipt Item,Rate and Amount,ደረጃ ይስጡ እና መጠን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},የመለያ አይነት {0} ይህ ሊሆን ግድ ነውና {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},የመለያ አይነት {0} ይህ ሊሆን ግድ ነውና {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ቅጠሎች እና የበዓል
 DocType: School Settings,Current Academic Term,የአሁኑ የትምህርት የሚቆይበት ጊዜ
 DocType: Sales Order,Not Billed,የሚከፈል አይደለም
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,የተማሪ ቡድን
 DocType: Shopping Cart Settings,Quotation Series,በትዕምርተ ጥቅስ ተከታታይ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","አንድ ንጥል በተመሳሳይ ስም አለ ({0}), ወደ ንጥል የቡድን ስም መቀየር ወይም ንጥል ዳግም መሰየም እባክዎ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,የደንበኛ ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,የደንበኛ ይምረጡ
 DocType: C-Form,I,እኔ
 DocType: Company,Asset Depreciation Cost Center,የንብረት ዋጋ መቀነስ ወጪ ማዕከል
 DocType: Sales Order Item,Sales Order Date,የሽያጭ ትዕዛዝ ቀን
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,ኢንሹራንስ ዝርዝሮች
 DocType: Account,Payable,ትርፍ የሚያስገኝ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,የሚያየን ክፍለ ጊዜዎች ያስገቡ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ተበዳሪዎች ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ተበዳሪዎች ({0})
 DocType: Pricing Rule,Margin,ህዳግ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,አዲስ ደንበኞች
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,አጠቃላይ ትርፍ%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,መልቀቂያ ቀን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,አጠቃላይ የግዢ መጠን የግዴታ ነው
 DocType: Lead,Address Desc,DESC አድራሻ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ፓርቲ የግዴታ ነው
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,ፓርቲ የግዴታ ነው
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ርዕስ ስም
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,የ መሸጥ ወይም መግዛትና ውስጥ ቢያንስ አንድ መመረጥ አለበት
-DocType: Grading Structure,Grade Intervals,ኛ ጣልቃ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,የንግድ ተፈጥሮ ይምረጡ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},የረድፍ # {0}: ማጣቀሻዎች ውስጥ ግቤት አባዛ {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"ባለማምረታቸው, ቀዶ የት ተሸክመው ነው."
 DocType: Asset Movement,Source Warehouse,ምንጭ መጋዘን
 DocType: Installation Note,Installation Date,መጫን ቀን
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,የህትመት አብነቶች ለ ደብዳቤ ኃላፊዎች.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,የህትመት አብነቶች ለ የማዕረግ Proforma የደረሰኝ ምህበርን.
 DocType: Student Guardian,Student Guardian,የተማሪ አሳዳጊ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,ግምቱ አይነት ክፍያዎች ያካተተ ምልክት ተደርጎበታል አይችልም
 DocType: POS Profile,Update Stock,አዘምን 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 ተመን
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,የ Exchange ቅሰም / ማጣት መለያ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,የሰራተኛ እና ክትትል
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ዓላማ ውስጥ አንዱ መሆን አለበት {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ቅጹን መሙላት እና ማስቀመጥ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,የማህበረሰብ መድረክ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,በክምችት ውስጥ ትክክለኛው ብዛት
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,አስይዝ ብዛት
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,የአሁኑ ክፍት የሥራ ቦታዎች
 DocType: Company,Stock Adjustment Account,የአክሲዮን የማስተካከያ መለያ
-DocType: Journal Entry,Write Off,ሰረዘ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ሰረዘ
 DocType: Timesheet Detail,Operation 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}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,አቅራቢው የደንበኛ ወደ ያድነዋል
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ፎርም / ንጥል / {0}) የአክሲዮን ውጭ ነው
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ቀጣይ ቀን መለጠፍ ቀን የበለጠ መሆን አለበት
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,አሳይ የግብር ከፋይ-ምትኬ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ምክንያት / ማጣቀሻ ቀን በኋላ መሆን አይችልም {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,የውሂብ ያስመጡ እና ወደ ውጪ ላክ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","የአክሲዮን ግቤቶች በመሆኑም ዳግም መመደብ ወይም መቀየር አይችሉም, {0} መጋዘን ላይ የለም"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ምንም ተማሪዎች አልተገኙም
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ምንም ተማሪዎች አልተገኙም
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,የደረሰኝ መለጠፍ ቀን
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,ይሽጡ
 DocType: Sales Invoice,Rounded Total,የከበበ ጠቅላላ
 DocType: Product Bundle,List items that form the package.,የጥቅል እንድናቋቁም ዝርዝር ንጥሎች.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,መቶኛ ምደባዎች 100% ጋር እኩል መሆን አለበት
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,ፓርቲ በመምረጥ በፊት መለጠፍ ቀን ይምረጡ
 DocType: Program Enrollment,School House,ትምህርት ቤት
 DocType: Serial No,Out of AMC,AMC ውጪ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ጥቅሶች ይምረጡ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ጥቅሶች ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,የተመዘገበ Depreciations ቁጥር Depreciations አጠቃላይ ብዛት በላይ ሊሆን አይችልም
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,የጥገና ጉብኝት አድርግ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,የሽያጭ መምህር አስተዳዳሪ {0} ሚና ያላቸው ተጠቃሚው ወደ ያነጋግሩ
 DocType: Company,Default Cash Account,ነባሪ በጥሬ ገንዘብ መለያ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ኩባንያ (አይደለም የደንበኛ ወይም አቅራቢው) ጌታው.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ይህ የዚህ ተማሪ በስብሰባው ላይ የተመሠረተ ነው
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,ምንም ተማሪዎች ውስጥ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ተጨማሪ ንጥሎች ወይም ክፍት ሙሉ ቅጽ ያክሉ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;የሚጠበቀው የመላኪያ ቀን&#39; ያስገቡ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,የመላኪያ ማስታወሻዎች {0} ይህን የሽያጭ ትዕዛዝ በመሰረዝ በፊት ተሰርዟል አለበት
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ንጥል 3
 DocType: Purchase Order,Customer Contact Email,የደንበኛ የዕውቂያ ኢሜይል
 DocType: Warranty Claim,Item and Warranty Details,ንጥል እና ዋስትና መረጃ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ንጥል ኮድ&gt; ንጥል ቡድን&gt; ብራንድ
 DocType: Sales Team,Contribution (%),መዋጮ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ማስታወሻ: የክፍያ Entry ጀምሮ አይፈጠርም &#39;በጥሬ ገንዘብ ወይም በባንክ አካውንት&#39; አልተገለጸም
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,የግዴታ ኮርሶች ለማምጣት የሚያስችል ፕሮግራም ይምረጡ.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,እርቅ በፊት
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ወደ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ግብሮች እና ክፍያዎች ታክሏል (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ንጥል ግብር ረድፍ {0} አይነት ታክስ ወይም ገቢ ወይም የወጪ ወይም እንዳንከብድበት ምክንያት ሊኖረው ይገባል
 DocType: Sales Order,Partly Billed,በከፊል የሚከፈል
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ንጥል {0} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ንጥል {0} አንድ ቋሚ የንብረት ንጥል መሆን አለበት
 DocType: Item,Default BOM,ነባሪ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ዳግም-ዓይነት ኩባንያ ስም ለማረጋገጥ እባክዎ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ጠቅላላ ያልተወራረደ Amt
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,አውቶሞቲቭ
 DocType: Vehicle,Insurance Company,ኢንሹራንስ ኩባንያ
 DocType: Asset Category Account,Fixed Asset Account,የተወሰነ የንብረት መለያ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ተለዋጭ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,የመላኪያ ማስታወሻ ከ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ተለዋጭ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,የመላኪያ ማስታወሻ ከ
 DocType: Student,Student Email Address,የተማሪ የኢሜይል አድራሻ
 DocType: Timesheet Detail,From Time,ሰዓት ጀምሮ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ለሽያጭ የቀረበ እቃ:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,የዋጋ ዝርዝር ምንዛሪ ተመን
 DocType: Purchase Invoice Item,Rate,ደረጃ ይስጡ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,እሥረኛ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,አድራሻ ስም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,አድራሻ ስም
 DocType: Stock Entry,From BOM,BOM ከ
 DocType: Assessment Code,Assessment Code,ግምገማ ኮድ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,መሠረታዊ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} በበረዶ በፊት የአክሲዮን ዝውውሮች
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;አመንጭ ፕሮግራም »ላይ ጠቅ ያድርጉ
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ለምሳሌ ኪግ, ክፍል, ቁጥሮች, ሜ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,አንተ የማጣቀሻ ቀን ያስገቡት ከሆነ ማጣቀሻ ምንም የግዴታ ነው
 DocType: Bank Reconciliation Detail,Payment Document,የክፍያ ሰነድ
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,ደመወዝ መዋቅር
 DocType: Account,Bank,ባንክ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,የአየር መንገድ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,እትም ይዘት
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,እትም ይዘት
 DocType: Material Request Item,For Warehouse,መጋዘን ለ
 DocType: Employee,Offer Date,ቅናሽ ቀን
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ጥቅሶች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,ከመስመር ውጪ ሁነታ ላይ ነው ያሉት. እርስዎ መረብ ድረስ ዳግም አይችሉም.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ምንም የተማሪ ቡድኖች ተፈጥሯል.
 DocType: Purchase Invoice Item,Serial No,መለያ ቁጥር
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ወርሃዊ የሚያየን መጠን ብድር መጠን በላይ ሊሆን አይችልም
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,በመጀመሪያ Maintaince ዝርዝሮችን ያስገቡ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,በመጀመሪያ Maintaince ዝርዝሮችን ያስገቡ
 DocType: Purchase Invoice,Print Language,የህትመት ቋንቋ
 DocType: Salary Slip,Total Working Hours,ጠቅላላ የሥራ ሰዓቶች
 DocType: Stock Entry,Including items for sub assemblies,ንዑስ አብያተ ክርስቲያናት ለ ንጥሎችን በማካተት ላይ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,ያስገቡ እሴት አዎንታዊ መሆን አለበት
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ሁሉም ግዛቶች
 DocType: Purchase Invoice,Items,ንጥሎች
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ተማሪው አስቀድሞ ተመዝግቧል.
@@ -3254,16 +3263,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ተለዋጭ ለ ይለኩ ነባሪ ክፍል «{0}» መለጠፊያ ውስጥ እንደ አንድ አይነት መሆን አለበት &#39;{1} »
 DocType: Shipping Rule,Calculate Based On,የተመረኮዘ ላይ ማስላት
 DocType: Delivery Note Item,From Warehouse,መጋዘን ከ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,ዕቃዎች መካከል ቢል ጋር ምንም ንጥሎች ለማምረት
 DocType: Assessment Plan,Supervisor Name,ሱፐርቫይዘር ስም
 DocType: Program Enrollment Course,Program Enrollment Course,ፕሮግራም ምዝገባ ኮርስ
-DocType: Grading Structure,Grading Structure,አሰጣጥ መዋቅር
 DocType: Purchase Taxes and Charges,Valuation and Total,ግምቱ እና ጠቅላላ
 DocType: Tax Rule,Shipping City,የመርከብ ከተማ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ይህ ንጥል {0} (መለጠፊያ) አንድ ተለዋጭ ነው. &#39;ምንም ቅዳ »ከተዋቀረ በስተቀር ባህርያት ወደ አብነት ላይ ይገለበጣሉ
 DocType: Notification Control,Customize the Notification,የ ማሳወቂያ አብጅ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ክወናዎች ከ የገንዘብ ፍሰት
 DocType: Sales Invoice,Shipping Rule,መላኪያ ደንብ
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},ምንም ነባሪ BOM ንጥል የለም {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,በመጀመሪያ መለጠፍ ቀን ይምረጡ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ቀን በመክፈት ቀን መዝጋት በፊት መሆን አለበት
 DocType: Leave Control Panel,Carry Forward,አስተላልፍ መሸከም
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,አሁን ያሉ ግብይቶችን ጋር ወጪ ማዕከል የሒሳብ መዝገብ ላይ ሊቀየር አይችልም
 DocType: Department,Days for which Holidays are blocked for this department.,ቀኖች ስለ በዓላት በዚህ ክፍል ታግደዋል.
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,ጠቅላላ
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,የደብዳቤ አባሪ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,የመጨረሻው ኮሙኒኬሽን
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',በምድብ «ግምቱ &#39;ወይም&#39; ግምቱ እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},Serialized ንጥል ሲሪያል ቁጥሮች ያስፈልጋል {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ደረሰኞች ጋር አዛምድ ክፍያዎች
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ጠቅላላ (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,መዝናኛ እና መዝናኛዎች
 DocType: Quality Inspection,Item Serial No,ንጥል ተከታታይ ምንም
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,የሰራተኛ መዛግብት ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,የሰራተኛ መዛግብት ፍጠር
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ጠቅላላ አቅርብ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,አካውንቲንግ መግለጫ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ሰአት
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,ያልታወቀ
 DocType: Shipping Rule,Shipping Rule Conditions,የመርከብ ደ ሁኔታዎች
 DocType: BOM Replace Tool,The new BOM after replacement,ምትክ በኋላ ወደ አዲሱ BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,የሽያጭ ነጥብ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,የሽያጭ ነጥብ
 DocType: Payment Entry,Received Amount,የተቀበልከው መጠን
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,እባክዎ&gt; የሰው ሀብት ውስጥ HR ቅንብሮች ስርዓት እየሰየሙ ማዋቀር የሰራተኛ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",ሙሉ ብዛት ይፍጠሩ ለ ትዕዛዝ ላይ አስቀድሞ ብዛት ችላ
 DocType: Account,Tax,ግብር
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ምልክት ተደርጎበታል አይደለም
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,ደረሰኞች
 DocType: Batch,Source Document Name,ምንጭ ሰነድ ስም
 DocType: Job Opening,Job Title,የስራ መደቡ መጠሪያ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ተጠቃሚዎች ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ተጠቃሚዎች ፍጠር
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ግራም
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ለማምረት ብዛት 0 የበለጠ መሆን አለበት.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,የጥገና ጥሪ ሪፖርት ይጎብኙ.
 DocType: Stock Entry,Update Rate and Availability,አዘምን ደረጃ እና ተገኝነት
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,መቶኛ መቀበል ወይም አዘዘ መጠን ላይ ተጨማሪ ማድረስ ይፈቀዳል. ለምሳሌ: 100 ቤቶች ትእዛዝ ከሆነ. እና በል ከዚያም 110 ቤቶች ለመቀበል የተፈቀደላቸው 10% ነው.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ወጪ መለያ ንጥል ግዴታ ነው {0}
 DocType: BOM,Website Description,የድር ጣቢያ መግለጫ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ፍትህ ውስጥ የተጣራ ለውጥ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,በመጀመሪያ የግዢ ደረሰኝ {0} ይቅር እባክዎ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","የኢሜይል አድራሻ አስቀድሞ ስለ አለ, ልዩ መሆን አለበት {0}"
 DocType: Serial No,AMC Expiry Date,AMC የሚቃጠልበት ቀን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ደረሰኝ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ደረሰኝ
 ,Sales Register,የሽያጭ መመዝገቢያ
 DocType: Daily Work Summary Settings Company,Send Emails At,ላይ ኢሜይሎች ላክ
 DocType: Quotation,Quotation Lost Reason,ጥቅስ የጠፋ ምክንያት
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,የጎራ ይምረጡ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},የግብይት ማጣቀሻ ምንም {0} የተዘጋጀው {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,አርትዕ ለማድረግ ምንም ነገር የለም.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,በዚህ ወር እና በመጠባበቅ ላይ ያሉ እንቅስቃሴዎች ማጠቃለያ
 DocType: Customer Group,Customer Group Name,የደንበኛ የቡድን ስም
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ገና ምንም ደንበኞች!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,የገንዘብ ፍሰት መግለጫ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},የብድር መጠን ከፍተኛ የብድር መጠን መብለጥ አይችልም {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ፈቃድ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ሲ-ቅጽ ይህን የደረሰኝ {0} ያስወግዱ እባክዎ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,መለያ ጠፍቷል ይጻፉ ያስገቡ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,የመጨረሻ ትዕዛዝ ቀን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},መለያ {0} ነው ኩባንያ ንብረት አይደለም {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} ረድፍ ላይ መለያ ቁጥር አሰጣጥ ማስታወሻ ጋር አይዛመድም
 DocType: Student,Guardian Details,አሳዳጊ ዝርዝሮች
 DocType: C-Form,C-Form,ሲ-ቅጽ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,በርካታ ሠራተኞች ምልክት ክትትል
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ረድፍ {0} # መለያ አይነት መሆን አለበት &#39;ቋሚ ንብረት&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ብዛት ውጪ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ደንቦች አንድ የሚሸጥ የመላኪያ መጠን ለማስላት
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ተከታታይ ግዴታ ነው
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ተከታታይ ግዴታ ነው
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,የፋይናንስ አገልግሎቶች
 DocType: Student Sibling,Student ID,የተማሪ መታወቂያ
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ጊዜ ምዝግብ እንቅስቃሴዎች አይነቶች
 DocType: Tax Rule,Sales,የሽያጭ
 DocType: Stock Entry Detail,Basic Amount,መሰረታዊ መጠን
 DocType: Training Event,Exam,ፈተና
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},የመጋዘን የአክሲዮን ንጥል ያስፈልጋል {0}
 DocType: Leave Allocation,Unused leaves,ያልዋለ ቅጠሎች
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,CR
 DocType: Tax Rule,Billing State,አከፋፈል መንግስት
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ያስተላልፉ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ፓርቲ መለያዎ ጋር የሚዛመድ አይደለም {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ፓርቲ መለያዎ ጋር የሚዛመድ አይደለም {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(ንዑስ-አብያተ ክርስቲያናት ጨምሮ) ፈንድቶ BOM ሰብስብ
 DocType: Authorization Rule,Applicable To (Employee),የሚመለከታቸው ለማድረግ (ሰራተኛ)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,መጠናቀቅ ያለበት ቀን የግዴታ ነው
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,አይነታ ጭማሬ {0} 0 መሆን አይችልም
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,ያልነቁ ደንበኞች
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,የግዢ ደረሰኞች
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,እንዴት የዋጋ ደንብ ተግባራዊ ነው?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,እንዴት የዋጋ ደንብ ተግባራዊ ነው?
 DocType: Stock Entry,Delivery Note No,የመላኪያ ማስታወሻ የለም
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","ከተመረጠ, ብቻ የመጨረሻ ጥሬ ዕቃዎች ቁሳዊ ጥያቄዎች የቁሳዊ ጥያቄዎች ውስጥ ይካተታል ይግዙ. አለበለዚያ, ወላጅ ንጥሎች ቁሳዊ ጥያቄዎች የተፈጠሩ ይሆናል"
 DocType: Cheque Print Template,Message to show,መልዕክት ለማሳየት
 DocType: Company,Retail,ችርቻሮ
 DocType: Attendance,Absent,ብርቅ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,የምርት ጥቅል
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,የምርት ጥቅል
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ረድፍ {0}: ልክ ያልሆነ ማጣቀሻ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ግብር እና ክፍያዎች አብነት ይግዙ
 DocType: Upload Attendance,Download Template,አውርድ አብነት
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,መለያ ከ የሚከፈልበት
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ጥሬ ሐሳብ ያለው ንጥል ኮድ
 DocType: Journal Entry,Write Off Based On,ላይ የተመሠረተ ላይ ጠፍቷል ይጻፉ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ሊድ አድርግ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ሊድ አድርግ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,አትም የጽህፈት
 DocType: Stock Settings,Show Barcode Field,አሳይ ባርኮድ መስክ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,አቅራቢው ኢሜይሎች ላክ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ደመወዝ አስቀድሞ {0} እና {1}, ለዚህ የቀን ክልል መካከል ሊሆን አይችልም የማመልከቻ ጊዜ ተወው መካከል ለተወሰነ ጊዜ በሂደት ላይ."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,አንድ መለያ ቁጥር መጫን መዝገብ
 DocType: Guardian Interest,Guardian Interest,አሳዳጊ የወለድ
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,ምላሽ በመጠባበቅ ላይ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ከላይ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ልክ ያልሆነ አይነታ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,መጥቀስ መደበኛ ያልሆኑ ተከፋይ ሂሳብ ከሆነ
 DocType: Salary Slip,Earning & Deduction,ገቢ እና ተቀናሽ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ከተፈለገ. ይህ ቅንብር በተለያዩ ግብይቶችን ለማጣራት ጥቅም ላይ ይውላል.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,አሉታዊ ግምቱ ተመን አይፈቀድም
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,የምርት ትዕዛዝ ንጥል
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ምንም መዝገብ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,በመዛጉ ንብረት ዋጋ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,በከፊል ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ወጪ ማዕከል ንጥል ግዴታ ነው; {2}
 DocType: Vehicle,Policy No,መመሪያ የለም
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,የምርት ጥቅል ከ ንጥሎች ያግኙ
 DocType: Asset,Straight Line,ቀጥተኛ መስመር
 DocType: Project User,Project User,የፕሮጀክት ተጠቃሚ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ሰነጠቀ
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,ከ ተማሪዎች ያግኙ
 DocType: Hub Settings,Seller Country,ሻጭ አገር
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ድህረ ገጽ ላይ ንጥሎች አትም
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ቀድመህ ቡድን የእርስዎን ተማሪዎች
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ቀድመህ ቡድን የእርስዎን ተማሪዎች
 DocType: Authorization Rule,Authorization Rule,የፈቃድ አሰጣጥ ደንብ
 DocType: Sales Invoice,Terms and Conditions Details,ውል እና ሁኔታዎች ዝርዝር
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,መግለጫዎች
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ቼክ ቀን
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},መለያ {0}: የወላጅ መለያ {1} ኩባንያ የእርሱ ወገን አይደለም: {2}
 DocType: Program Enrollment Tool,Student Applicants,የተማሪ አመልካቾች
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,በተሳካ ሁኔታ ከዚህ ድርጅት ጋር የተያያዙ ሁሉም ግብይቶች ተሰርዟል!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,በተሳካ ሁኔታ ከዚህ ድርጅት ጋር የተያያዙ ሁሉም ግብይቶች ተሰርዟል!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ቀን ላይ እንደ
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,የምዝገባ ቀን
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,የሥራ ልማድ የሚፈትን ጊዜ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ደመወዝ ክፍሎች
 DocType: Program Enrollment Tool,New Academic Year,አዲስ የትምህርት ዓመት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,ተመለስ / ክሬዲት ማስታወሻ
 DocType: Stock Settings,Auto insert Price List rate if missing,ራስ-ያስገቡ ዋጋ ዝርዝር መጠን ይጎድለዋል ከሆነ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ጠቅላላ የሚከፈልበት መጠን
 DocType: Production Order Item,Transferred Qty,ተላልፈዋል ብዛት
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ድንገተኛ እንደ ቅጠል አይነት, ታሞ ወዘተ"
 DocType: Email Digest,Send regular summary reports via Email.,በኢሜይል በኩል መደበኛ የማጠቃለያ ሪፖርቶች ላክ.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},የወጪ የይገባኛል ጥያቄ አይነት ውስጥ ነባሪ መለያ ማዘጋጀት እባክዎ {0}
 DocType: Assessment Result,Student Name,የተማሪ ስም
 DocType: Brand,Item Manager,ንጥል አስተዳዳሪ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,ተከፋይ የመክፈል ዝርዝር
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,የሽያጭ ማጥለያ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ምህጻረ ቃል የግዴታ ነው
 DocType: Project,Task Progress,ተግባር ሂደት
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ጋሪ
 ,Qty to Transfer,ያስተላልፉ ዘንድ ብዛት
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,የሚመራ ወይም ደንበኞች ወደ በመጥቀስ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ሚና የታሰረው የአክሲዮን አርትዕ ማድረግ ተፈቅዷል
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ንጥል ጥበበኛ የግብር ዝርዝር
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ተቋም ምህፃረ ቃል
 ,Item-wise Price List Rate,ንጥል-ጥበብ ዋጋ ዝርዝር ተመን
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,አቅራቢው ትዕምርተ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,አቅራቢው ትዕምርተ
 DocType: Quotation,In Words will be visible once you save the Quotation.,የ ትዕምርተ ማስቀመጥ አንዴ ቃላት ውስጥ የሚታይ ይሆናል.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ብዛት ({0}) ረድፍ ውስጥ ክፍልፋይ ሊሆን አይችልም {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ክፍያዎች ሰብስብ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},የአሞሌ {0} አስቀድሞ ንጥል ውስጥ ጥቅም ላይ {1}
 DocType: Lead,Add to calendar on this date,በዚህ ቀን ላይ ወደ ቀን መቁጠሪያ አክል
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,የመላኪያ ወጪዎች ለማከል ደንቦች.
 DocType: Item,Opening Stock,በመክፈት ላይ የአክሲዮን
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",ደቂቃዎች ውስጥ «ጊዜ Log&quot; በኩል ዘምኗል
 DocType: Customer,From Lead,ሊድ ከ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ትዕዛዞች ምርት ከእስር.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,በጀት ዓመት ይምረጡ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS መገለጫ POS የሚመዘገብ ለማድረግ ያስፈልጋል
 DocType: Program Enrollment Tool,Enroll Students,ተማሪዎች ይመዝገቡ
 DocType: Hub Settings,Name Token,ስም ማስመሰያ
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,መደበኛ ሽያጭ
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} የሽያጭ ደረሰኝ ላይ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,የፕሮጀክት ስም
-DocType: Supplier,Mention if non-standard receivable account,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ከሆነ
+DocType: Customer,Mention if non-standard receivable account,ጥቀስ መደበኛ ያልሆነ እንደተቀበለ መለያ ከሆነ
 DocType: Journal Entry Account,If Income or Expense,ገቢ ወይም የወጪ ከሆነ
 DocType: Production Order,Required Items,ተፈላጊ ንጥሎች
 DocType: Stock Ledger Entry,Stock Value Difference,የአክሲዮን ዋጋ ያለው ልዩነት
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,አዘጋጅ ግቦች ንጥል ቡድን-ጥበብ ይህን የሽያጭ ሰው ነውና.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],እሰር አክሲዮኖች የቆየ ይልቅ [ቀኖች]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,የረድፍ # {0}: ንብረት ቋሚ ንብረት ግዢ / ለሽያጭ ግዴታ ነው
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ሁለት ወይም ከዚያ በላይ የዋጋ ደንቦች ከላይ ሁኔታዎች ላይ ተመስርቶ አልተገኙም ከሆነ, ቅድሚያ ተፈጻሚ ነው. ነባሪ እሴት ዜሮ (ባዶ) ነው እያለ ቅድሚያ 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.,የሚከተሉት ተጠቃሚዎች የማገጃ ቀናት ፈቃድ መተግበሪያዎች ማጽደቅ ፍቀድ.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ይህ ጀምሮ ችላ ንጥል {0} አንድ የአክሲዮን ንጥል አይደለም
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",በተወሰነ ግብይት ውስጥ የዋጋ ሕግ ተግባራዊ ሳይሆን ወደ ሁሉም የሚመለከታቸው የዋጋ ደንቦች መሰናከል ያለበት.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",በተወሰነ ግብይት ውስጥ የዋጋ ሕግ ተግባራዊ ሳይሆን ወደ ሁሉም የሚመለከታቸው የዋጋ ደንቦች መሰናከል ያለበት.
 DocType: Assessment Group,Parent Assessment Group,የወላጅ ግምገማ ቡድን
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ሥራዎች
 ,Sales Order Trends,የሽያጭ ትዕዛዝ አዝማሚያዎች
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,ተጨማሪ ወጪ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,የፋይናንስ ዓመት መጨረሻ ቀን
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ቫውቸር ምንም ላይ የተመሠረተ ማጣሪያ አይችሉም, ቫውቸር በ ተመድበው ከሆነ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,አቅራቢው ትዕምርተ አድርግ
 DocType: Quality Inspection,Incoming,ገቢ
 DocType: BOM,Materials Required (Exploded),ቁሳቁሶች (የፈነዳ) ያስፈልጋል
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ራስህን ሌላ, የእርስዎ ድርጅት ተጠቃሚዎችን ያክሉ"
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,ኩባንያ ውስጥ ታሪክ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ጋዜጣዎች
 DocType: Stock Ledger Entry,Stock Ledger Entry,የክምችት የሒሳብ መዝገብ የሚመዘገብ መረጃ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,የደንበኛ&gt; የደንበኛ ቡድን&gt; ግዛት
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ተመሳሳይ ንጥል በርካታ ጊዜ ገብቷል ታይቷል
 DocType: Department,Leave Block List,አግድ ዝርዝር ውጣ
 DocType: Sales Invoice,Tax ID,የግብር መታወቂያ
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,የሽያጭ አጋር እና ኮሚሽን
 DocType: Employee Loan,Rate of Interest (%) / Year,በፍላጎት ላይ (%) / የዓመቱ ይስጡት
 ,Project Quantity,የፕሮጀክት ብዛት
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ጠቅላላ {0} ሁሉም ንጥሎች እናንተ &#39;ላይ የተመሠረተ ክፍያዎች ያሰራጩ&#39; መቀየር አለበት ሊሆን ይችላል, ዜሮ ነው"
 DocType: Opportunity,To Discuss,ለመወያየት
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ክፍሎች {1} {2} ይህን ግብይት ለማጠናቀቅ ያስፈልጋል.
 DocType: Loan Type,Rate of Interest (%) Yearly,የወለድ ምጣኔ (%) ዓመታዊ
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,ተመለስ
 DocType: Production Order Operation,Production Order Operation,የምርት ትዕዛዝ ኦፕሬሽን
 DocType: Pricing Rule,Disable,አሰናክል
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,የክፍያ ሁነታ ክፍያ ለመሥራት የግድ አስፈላጊ ነው
 DocType: Project Task,Pending Review,በመጠባበቅ ላይ ያለ ክለሳ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",አስቀድሞ እንደ የንብረት {0} በመዛጉ አይችልም {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(የወጪ የይገባኛል በኩል) ጠቅላላ የወጪ የይገባኛል ጥያቄ
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ማርቆስ የተዉ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ረድፍ {0}: ወደ BOM # ምንዛሬ {1} በተመረጠው ምንዛሬ እኩል መሆን አለበት {2}
 DocType: Journal Entry Account,Exchange Rate,የመለወጫ ተመን
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,የሽያጭ ትዕዛዝ {0} ማቅረብ አይደለም
 DocType: Homepage,Tag Line,መለያ መስመር
 DocType: Fee Component,Fee Component,የክፍያ ክፍለ አካል
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,መርከቦች አስተዳደር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,ከ ንጥሎችን ያክሉ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,ከ ንጥሎችን ያክሉ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},መጋዘን {0}: የወላጅ መለያ {1} ኩባንያው bolong አይደለም {2}
 DocType: Cheque Print Template,Regular,መደበኛ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,ሁሉም የግምገማ መስፈርት ጠቅላላ Weightage 100% መሆን አለበት
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,የተመረጠው ንጥል ባች ሊኖረው አይችልም
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ግምቱ መጠን ለ የሂሳብ ግቤቶች ማድረግ ያስፈልጋል ይህም ንጥል {0}, ለ አልተገኘም {1} {2}. ንጥል ውስጥ ናሙና ንጥል እንደ ልውውጥ ከሆነ {1} ን, {1} ንጥል ሠንጠረዥ ውስጥ መጥቀስ እባክህ. አለበለዚያ, / ካስረከቡ ይሞክሩ ይህን ግቤት በመሰረዝ ከዚያም ንጥል መዝገብ ውስጥ ንጥል ወይም የተጠቀሰ ነገር ግምቱ መጠን አንድ ገቢ የአክሲዮን ግብይት መፍጠር, እና እባክህ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ቁሳቁሶችን% ይህን የመላኪያ ማስታወሻ ላይ አሳልፎ
 DocType: Project,Customer Details,የደንበኛ ዝርዝሮች
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ተቀባይ ቁጥሮች ለ አር ኤል ግቤት ያስገቡ
 DocType: Payment Entry,Paid Amount,የሚከፈልበት መጠን
 DocType: Assessment Plan,Supervisor,ተቆጣጣሪ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,የመስመር ላይ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,የመስመር ላይ
 ,Available Stock for Packing Items,ማሸግ ንጥሎች አይገኝም የአክሲዮን
 DocType: Item Variant,Item Variant,ንጥል ተለዋጭ
 DocType: Assessment Result Tool,Assessment Result Tool,ግምገማ ውጤት መሣሪያ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ቁራጭ ንጥል
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,የተረከቡት ትዕዛዞች ሊሰረዝ አይችልም
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,የጥራት ሥራ አመራር
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} ንጥል ተሰናክሏል
 DocType: Employee Loan,Repay Fixed Amount per Period,ክፍለ ጊዜ በአንድ ቋሚ መጠን ብድራትን
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ንጥል ለ ብዛት ያስገቡ {0}
 DocType: Employee External Work History,Employee External Work History,የተቀጣሪ ውጫዊ የስራ ታሪክ
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,የተማሪ የኢሜይል መታወቂያ
 DocType: Employee,Notice (days),ማስታወቂያ (ቀናት)
 DocType: Tax Rule,Sales Tax Template,የሽያጭ ግብር አብነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ወደ መጠየቂያ ለማስቀመጥ ንጥሎችን ምረጥ
 DocType: Employee,Encashment Date,Encashment ቀን
 DocType: Training Event,Internet,በይነመረብ
 DocType: Account,Stock Adjustment,የአክሲዮን ማስተካከያ
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,አይነታ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,ክልል ወደ / ከ ይግለጹ
 DocType: Serial No,Under AMC,AMC በታች
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,ንጥል ግምቱ መጠን አርፏል ዋጋ ያላቸው የቫውቸር መጠን ከግምት recalculated ነው
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,ንጥል ግምቱ መጠን አርፏል ዋጋ ያላቸው የቫውቸር መጠን ከግምት recalculated ነው
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ግብይቶች መሸጥ ነባሪ ቅንብሮች.
 DocType: Guardian,Guardian Of ,ነው አሳዳጊ
 DocType: Grading Scale Interval,Threshold,ምድራክ
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ዴት ማስታወሻ ቀርቧል
 DocType: Production Order,Warehouses,መጋዘኖችን
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ንብረት ማስተላለፍ አይቻልም
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ይህ ንጥል {0} (አብነት) የሆነ ተለዋጭ ነው.
 DocType: Workstation,per hour,በ ሰዓት
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,የግዥ
 DocType: Announcement,Announcement,ማስታወቂያ
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,የሚሰበሰብ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,የረድፍ # {0}: የግዢ ትዕዛዝ አስቀድሞ አለ እንደ አቅራቢው ለመለወጥ አይፈቀድም
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ካልተዋቀረ የብድር ገደብ መብለጥ መሆኑን ግብይቶችን ማቅረብ አይፈቀድም ነው ሚና.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ለማምረት ንጥሎች ይምረጡ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","መምህር ውሂብ ማመሳሰል, ይህ የተወሰነ ጊዜ ሊወስድ ይችላል"
 DocType: Item,Material Issue,ቁሳዊ ችግር
 DocType: Hub Settings,Seller Description,ሻጭ መግለጫ
 DocType: Employee Education,Qualification,እዉቀት
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,የዕቃው መረጃ
 DocType: Salary Detail,Component,ክፍል
 DocType: Assessment Criteria,Assessment Criteria Group,የግምገማ መስፈርት ቡድን
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ክምችት የእርጅና በመክፈት ጋር እኩል ያነሰ መሆን አለበት {0}
 DocType: Warehouse,Warehouse Name,የመጋዘን ስም
 DocType: Naming Series,Select Transaction,ይምረጡ የግብይት
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ሚና በማፅደቅ ወይም የተጠቃሚ በማፅደቅ ያስገቡ
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,ገብቷል የክምችት Entry {0} መኖሩን ምክንያቱም ማስቀረት አይቻልም
 DocType: Employee Loan,Disbursement Date,ከተዛወሩ ቀን
 DocType: Vehicle,Vehicle,ተሽከርካሪ
 DocType: Purchase Invoice,In Words,ቃላት ውስጥ
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / በእርሳስ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,የንብረት Depreciations እና ሚዛን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},የገንዘብ መጠን {0} {1} ይተላለፋል {2} ወደ {3}
 DocType: Sales Invoice,Get Advances Received,እድገት ተቀብሏል ያግኙ
 DocType: Email Digest,Add/Remove Recipients,ተቀባዮች አክል / አስወግድ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ግብይት ቆሟል ምርት ላይ አይፈቀድም ትዕዛዝ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ነባሪ በዚህ በጀት ዓመት ለማዘጋጀት &#39;ነባሪ አዘጋጅ »ላይ ጠቅ ያድርጉ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ተቀላቀል
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,እጥረት ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ንጥል ተለዋጭ {0} ተመሳሳይ ባሕርያት ጋር አለ
 DocType: Employee Loan,Repay from Salary,ደመወዝ ከ ልከፍለው
 DocType: Leave Application,LAP/,ጭን /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ላይ ክፍያ በመጠየቅ ላይ {0} {1} መጠን ለ {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ግምገማ ውጤት ዝርዝር
 DocType: Employee Education,Employee Education,የሰራተኛ ትምህርት
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ንጥል ቡድን ሠንጠረዥ ውስጥ አልተገኘም አባዛ ንጥል ቡድን
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ይህ የዕቃው መረጃ ማምጣት ያስፈልጋል.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} አስቀድሞ ደርሷል
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",መጋዘን {0} ማንኛውም መለያ ጋር የተገናኘ አይደለም; / መጋዘን ለ ተጓዳኝ (ንብረት) መለያ አገናኝ ፍጠር.
 DocType: Purchase Invoice,Recurring Id,ተደጋጋሚ መታወቂያ
 DocType: Customer,Sales Team Details,የሽያጭ ቡድን ዝርዝሮች
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,እስከመጨረሻው ይሰረዝ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,እስከመጨረሻው ይሰረዝ?
 DocType: Expense Claim,Total Claimed Amount,ጠቅላላ የቀረበበት የገንዘብ መጠን
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,መሸጥ የሚሆን እምቅ ዕድል.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ልክ ያልሆነ {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,ፒን
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ውስጥ ማዋቀር ትምህርት ቤት
 DocType: Sales Invoice,Base Change Amount (Company Currency),የመሠረት ለውጥ መጠን (የኩባንያ የምንዛሬ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,የሚከተሉትን መጋዘኖችን ምንም የሂሳብ ግቤቶች
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,የመጨረሻ ትዕዛዝ መጠን
+DocType: Task,Is Milestone,ያበረከተ ነው
 DocType: Daily Work Summary,Email Sent To,ኢሜይል ተልኳል
 DocType: Budget,Warn,አስጠንቅቅ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ሌሎች ማንኛውም አስተያየት, መዝገቦች ውስጥ መሄድ ዘንድ ትኩረት የሚስብ ጥረት."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,ዋጋ ይስጡ
 ,Itemwise Recommended Reorder Level,Itemwise አስይዝ ደረጃ የሚመከር
 DocType: Salary Detail,Salary Detail,ደመወዝ ዝርዝር
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,በመጀመሪያ {0} እባክዎ ይምረጡ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,ንጥል ባች {0} {1} ጊዜው አልፎበታል.
 DocType: Sales Invoice,Commission,ኮሚሽን
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,የአምራች ሰዓት ሉህ.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`እሰር አክሲዮኖች የቆየ Than`% d ቀኖች ያነሰ መሆን ይኖርበታል.
 DocType: Tax Rule,Purchase Tax Template,የግብር አብነት ግዢ
 ,Project wise Stock Tracking,ፕሮጀክት ጥበበኛ የአክሲዮን ክትትል
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ጥገና ፕሮግራም {0} ላይ አለ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ምንጭ / ዒላማ ላይ) ትክክለኛ ብዛት
 DocType: Item Customer Detail,Ref Code,ማጣቀሻ ኮድ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,የሰራተኛ መዝገቦች.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ቀጣይ የእርጅና ቀን ማዘጋጀት እባክዎ
 DocType: HR Settings,Payroll Settings,ከደመወዝ ክፍያ ቅንብሮች
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ያልሆኑ የተገናኘ ደረሰኞች እና ክፍያዎች አዛምድ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ቦታ አያያዝ
 DocType: Email Digest,New Purchase Orders,አዲስ የግዢ ትዕዛዞች
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ሥር አንድ ወላጅ የወጪ ማዕከል ሊኖረው አይችልም
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ይምረጡ የምርት ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ይምረጡ የምርት ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,እንደ ላይ የእርጅና ሲጠራቀሙ
 DocType: Sales Invoice,C-Form Applicable,ሲ-ቅጽ የሚመለከታቸው
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ኦፕሬሽን ጊዜ ክወና ለ ከ 0 በላይ መሆን አለበት {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,መጋዘን የግዴታ ነው
 DocType: Supplier,Address and Contacts,አድራሻ እና እውቂያዎች
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ልወጣ ዝርዝር
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px በማድረግ (ዋ) ድር ተስማሚ 900px ያቆዩት (ሸ)
 DocType: Program,Program Abbreviation,ፕሮግራም ምህፃረ ቃል
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,የምርት ትዕዛዝ አንድ ንጥል መለጠፊያ ላይ ይነሣሉ አይችልም
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,የምርት ትዕዛዝ አንድ ንጥል መለጠፊያ ላይ ይነሣሉ አይችልም
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ክፍያዎች እያንዳንዱ ንጥል ላይ የግዢ ደረሰኝ ውስጥ መዘመን ነው
 DocType: Warranty Claim,Resolved By,በ የተፈታ
 DocType: Bank Guarantee,Start Date,ቀን ጀምር
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ለተወሰነ ጊዜ ቅጠል ይመድባሉ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques እና ተቀማጭ ትክክል ጸድቷል
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,መለያ {0}: አንተ ወላጅ መለያ ራሱን እንደ መመደብ አይችሉም
 DocType: Purchase Invoice Item,Price List Rate,የዋጋ ዝርዝር ተመን
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,የደንበኛ ጥቅሶችን ፍጠር
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,የደንበኛ ጥቅሶችን ፍጠር
 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 +38,Bill of Materials (BOM),ዕቃዎች መካከል ቢል (BOM)
 DocType: Item,Average time taken by the supplier to deliver,አቅራቢው የተወሰደው አማካይ ጊዜ ለማቅረብ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,ግምገማ ውጤት
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ሰዓቶች
 DocType: Project,Expected Start Date,የሚጠበቀው መጀመሪያ ቀን
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ክስ ይህ ንጥል ተገቢነት አይደለም ከሆነ ንጥል አስወግድ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,የግብይት ምንዛሬ ክፍያ ማስተናገጃ ምንዛሬ ጋር አንድ አይነት መሆን አለበት
 DocType: Payment Entry,Receive,ተቀበል
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,ማስኬጃ ወጪዎች
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,እርምጃ ወርኃዊ በጀት የታለፈው ሲጠራቀሙ ከሆነ
 DocType: Purchase Invoice,Submit on creation,ፍጥረት ላይ አስገባ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},የመገበያያ ገንዘብ {0} ይህ ሊሆን ግድ ነውና {1}
 DocType: Asset,Disposal Date,ማስወገድ ቀን
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","እነርሱ በዓል ከሌለዎት ኢሜይሎችን, በተሰጠው ሰዓት ላይ ኩባንያ ሁሉ ንቁ ሠራተኞች ይላካል. ምላሾች ማጠቃለያ እኩለ ሌሊት ላይ ይላካል."
 DocType: Employee Leave Approver,Employee Leave Approver,የሰራተኛ ፈቃድ አጽዳቂ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ረድፍ {0}: አንድ አስይዝ ግቤት አስቀድመው የዚህ መጋዘን ለ አለ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ትዕምርተ ተደርጓል ምክንያቱም, እንደ የጠፋ ማወጅ አይቻልም."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ስልጠና ግብረ መልስ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ትዕዛዝ {0} መቅረብ አለበት ፕሮዳክሽን
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ንጥል ለ የመጀመሪያ ቀን እና ማብቂያ ቀን ይምረጡ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ንጥል ለ የመጀመሪያ ቀን እና ማብቂያ ቀን ይምረጡ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ኮርስ ረድፍ ላይ ግዴታ ነው {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ቀን ወደ ቀን ጀምሮ በፊት መሆን አይችልም
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ አርትዕ ዋጋዎች አክል
 DocType: Batch,Parent Batch,የወላጅ ባች
 DocType: Cheque Print Template,Cheque Print Template,ቼክ የህትመት አብነት
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,ወጪ ማዕከላት ገበታ
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,የዕቃው ንጥሎች እስኪደርስ ድረስ
 DocType: Account,Income,ገቢ
 DocType: Industry Type,Industry Type,ኢንዱስትሪ አይነት
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,የሆነ ስህተት ተከስቷል!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,የሆነ ስህተት ተከስቷል!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,ማስጠንቀቂያ: ውጣ መተግበሪያ የሚከተለውን የማገጃ ቀናት ይዟል
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,የደረሰኝ {0} አስቀድሞ ገብቷል የሽያጭ
 DocType: Assessment Result Detail,Score,ግብ
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,ተለዋጭ የተመረኮዘ ላይ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% መሆን አለበት የተመደበ ጠቅላላ weightage. ይህ ነው {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,የእርስዎ አቅራቢዎች
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,የሽያጭ ትዕዛዝ ነው እንደ የጠፋ እንደ ማዘጋጀት አልተቻለም.
 DocType: Request for Quotation Item,Supplier Part No,አቅራቢው ክፍል የለም
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ከ ተቀብሏል
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',በምድብ «ግምቱ &#39;ወይም&#39; Vaulation እና ጠቅላላ &#39;ነው ጊዜ ቀነሰ አይቻልም
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ከ ተቀብሏል
 DocType: Lead,Converted,የተቀየሩ
 DocType: Item,Has Serial No,ተከታታይ ምንም አለው
 DocType: Employee,Date of Issue,የተሰጠበት ቀን
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ከ {0} ለ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: ከ {0} ለ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},የረድፍ # {0}: ንጥል አዘጋጅ አቅራቢው {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ረድፍ {0}: ሰዓቶች ዋጋ ከዜሮ በላይ መሆን አለበት.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ንጥል {1} ጋር ተያይዞ ድር ጣቢያ ምስል {0} ሊገኝ አልቻለም
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,ድር ላይ በርካታ ቡድኖች ውስጥ ይህን ንጥል ዘርዝር.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,አንተ ቀጥ እሴት ለማዘጋጀት ፍቃድ አይደለም
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ግቤቶችን ያግኙ
 DocType: Payment Reconciliation,From Invoice Date,የደረሰኝ ቀን ጀምሮ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,አከፋፈል ምንዛሬ ወይም ነባሪ comapany ምንዛሬ ወይም ወገን መለያ ምንዛሬ ጋር እኩል መሆን አለባቸው
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Encashment ውጣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ምን ያደርጋል?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,መጋዘን ወደ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ሁሉም የተማሪ ምዝገባ
 ,Average Commission Rate,አማካኝ ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;አዎ&#39; መሆን ያልሆኑ-የአክሲዮን ንጥል አይችልም &#39;መለያ ምንም አለው&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,በስብሰባው ወደፊት ቀናት ምልክት ሊሆን አይችልም
 DocType: Pricing Rule,Pricing Rule Help,የዋጋ አሰጣጥ ደንብ እገዛ
 DocType: School House,House Name,ቤት ስም
 DocType: Purchase Taxes and Charges,Account Head,መለያ ኃላፊ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ንጥሎች አርፏል ወጪ ማስላት ተጨማሪ ወጪዎች ያዘምኑ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ኤሌክትሪክ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,የእርስዎ ተጠቃሚዎች እንደ ድርጅት የቀረውን ያክሉ. በተጨማሪም አድራሻዎች ከእነርሱ በማከል ፖርታል ወደ ደንበኞች መጋበዝ ማከል ይችላሉ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,የእርስዎ ተጠቃሚዎች እንደ ድርጅት የቀረውን ያክሉ. በተጨማሪም አድራሻዎች ከእነርሱ በማከል ፖርታል ወደ ደንበኞች መጋበዝ ማከል ይችላሉ
 DocType: Stock Entry,Total Value Difference (Out - In),ጠቅላላ ዋጋ ያለው ልዩነት (ውጭ - ውስጥ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,የደንበኛ ኮድ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ለ የልደት አስታዋሽ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,የመጨረሻ ትዕዛዝ ጀምሮ ቀናት
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,መለያ ወደ ዴቢት አንድ ሚዛን ሉህ መለያ መሆን አለበት
 DocType: Buying Settings,Naming Series,መሰየምን ተከታታይ
 DocType: Leave Block List,Leave Block List Name,አግድ ዝርዝር ስም ውጣ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ኢንሹራንስ የመጀመሪያ ቀን መድን የመጨረሻ ቀን ያነሰ መሆን አለበት
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ሠራተኛ ደመወዝ ማዘዥ {0} አስቀድሞ ጊዜ ወረቀት የተፈጠሩ {1}
 DocType: Vehicle Log,Odometer,ቆጣሪው
 DocType: Sales Order Item,Ordered Qty,የዕቃው መረጃ ብዛት
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ንጥል {0} ተሰናክሏል
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ንጥል {0} ተሰናክሏል
 DocType: Stock Settings,Stock Frozen Upto,የክምችት Frozen እስከሁለት
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ማንኛውም የአክሲዮን ንጥል አልያዘም
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ጀምሮ እና ክፍለ ጊዜ ተደጋጋሚ ግዴታ ቀናት ወደ ጊዜ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,የፕሮጀክት እንቅስቃሴ / ተግባር.
 DocType: Vehicle Log,Refuelling Details,Refuelling ዝርዝሮች
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,የመጨረሻው የግዢ መጠን አልተገኘም
 DocType: Purchase Invoice,Write Off Amount (Company Currency),መጠን ጠፍቷል ጻፍ (የኩባንያ የምንዛሬ)
 DocType: Sales Invoice Timesheet,Billing Hours,አከፋፈል ሰዓቶች
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} አልተገኘም ነባሪ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,የረድፍ # {0}: ዳግምስርዓትአስይዝ ብዛት ማዘጋጀት እባክዎ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,እዚህ ላይ ማከል ንጥሎችን መታ
 DocType: Fees,Program Enrollment,ፕሮግራም ምዝገባ
 DocType: Landed Cost Voucher,Landed Cost Voucher,አረፈ ወጪ ቫውቸር
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ማዘጋጀት እባክዎ {0}
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,ጥገና ቀን
 DocType: Purchase Invoice Item,Rejected Serial No,ውድቅ ተከታታይ ምንም
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,ዓመት መጀመሪያ ቀን ወይም የመጨረሻ ቀን {0} ጋር ተደራቢ ነው. ኩባንያ ለማዘጋጀት እባክዎ ለማስቀረት
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},ንጥል የማብቂያ ቀን ያነሰ መሆን አለበት የመጀመሪያ ቀን {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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.","ምሳሌ:. ተከታታይ ከተዋቀረ እና ተከታታይ ምንም ግብይቶች ላይ የተጠቀሰው አይደለም ከሆነ ለልጆች #####, ከዚያም ራስ-ሰር መለያ ቁጥር በዚህ ተከታታይ ላይ የተመሠረተ ይፈጠራል. ሁልጊዜ በግልጽ ለዚህ ንጥል መለያ ቁጥሮች መጥቀስ የሚፈልጉ ከሆነ. ይህንን ባዶ ይተዉት."
 DocType: Upload Attendance,Upload Attendance,ስቀል ክትትል
@@ -4261,7 +4273,6 @@
 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,በርካታ ቡድኖች ውስጥ ንጥል መስቀል ዝርዝር
-DocType: Grade Interval,Grade Interval,ኛ ክፍል ክፍተት
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},በጀት ዓመት የመጀመሪያ ቀን እና በጀት ዓመት መጨረሻ ቀን አስቀድሞ በጀት ዓመት ውስጥ ነው የሚዘጋጁት {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,መልቀቂያ ቀን ዘምኗል
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ክፈል ባች
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,ለምርት ብዛት የተያዘ
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,እርስዎ ኮርስ ላይ የተመሠረቱ ቡድኖች በማድረግ ላይ ሳለ ባች ከግምት የማይፈልጉ ከሆነ አልተመረጠም ተወው.
 DocType: Asset,Frequency of Depreciation (Months),የእርጅና ድግግሞሽ (ወራት)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,የብድር መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,የብድር መለያ
 DocType: Landed Cost Item,Landed Cost Item,አረፈ ወጪ ንጥል
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ዜሮ እሴቶች አሳይ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ንጥል መጠን በጥሬ ዕቃዎች የተሰጠው መጠን ከ እየቀናነሱ / ማኑፋክቸሪንግ በኋላ አገኘሁ
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ማዋቀር የእኔ ድርጅት ለማግኘት ቀላል ድር ጣቢያ
 DocType: Payment Reconciliation,Receivable / Payable Account,የሚሰበሰብ / ሊከፈል መለያ
 DocType: Delivery Note Item,Against Sales Order Item,የሽያጭ ትዕዛዝ ንጥል ላይ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},አይነታ እሴት የአይነት ይግለጹ {0}
 DocType: Item,Default Warehouse,ነባሪ መጋዘን
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},በጀት ቡድን መለያ ላይ ሊመደብ አይችልም {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ወላጅ የወጪ ማዕከል ያስገቡ
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,መሰረታዊ ደረጃ
 DocType: GL Entry,Credit Amount,የብድር መጠን
 DocType: Cheque Print Template,Signatory Position,ፈራሚ የስራ መደቡ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,የጠፋ እንደ አዘጋጅ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,የጠፋ እንደ አዘጋጅ
 DocType: Timesheet,Total Billable Hours,ጠቅላላ የሚከፈልበት ሰዓቶች
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,የክፍያ ደረሰኝ ማስታወሻ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ይሄ በዚህ የደንበኛ ላይ ግብይቶችን ላይ የተመሠረተ ነው. ዝርዝሮችን ለማግኘት ከታች ያለውን የጊዜ ይመልከቱ
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,ንጥሎች ተጠይቋል መሆን ወደ
 DocType: Purchase Order,Get Last Purchase Rate,የመጨረሻው ግዢ ተመን ያግኙ
 DocType: Company,Company Info,የኩባንያ መረጃ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,ይምረጡ ወይም አዲስ ደንበኛ ለማከል
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,በወጪ ማዕከል አንድ ወጪ የይገባኛል ጥያቄ መያዝ ያስፈልጋል
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ፈንድ (ንብረት) ውስጥ ማመልከቻ
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ይህ የዚህ ሰራተኛ መካከል በስብሰባው ላይ የተመሠረተ ነው
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ዴት መለያ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ዴት መለያ
 DocType: Fiscal Year,Year Start Date,ዓመት መጀመሪያ ቀን
 DocType: Attendance,Employee Name,የሰራተኛ ስም
 DocType: Sales Invoice,Rounded Total (Company Currency),የከበበ ጠቅላላ (የኩባንያ የምንዛሬ)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,በሚቀጥሉት ቀኖች ላይ ፈቃድ መተግበሪያዎች በማድረጉ ተጠቃሚዎች አቁም.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,የግዢ መጠን
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,አቅራቢው ትዕምርተ {0} ተፈጥሯል
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,የመጨረሻ ዓመት የጀመረበት ዓመት በፊት ሊሆን አይችልም
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,የሰራተኛ ጥቅማ ጥቅም
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},የተቀጣሪ ነባሪ በዓል ዝርዝር ለማዘጋጀት እባክዎ {0} ወይም ኩባንያ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ነው አይደለም አለ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ደንበኞች ከሞት ደረሰኞች.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,የፕሮጀክት መታወቂያ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ረድፍ አይ {0}: መጠን የወጪ የይገባኛል ጥያቄ {1} ላይ የገንዘብ መጠን በመጠባበቅ በላይ ሊሆን አይችልም. በመጠባበቅ መጠን ነው {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 ማንበብ
 ,Hub,ማዕከል
 DocType: GL Entry,Voucher Type,የቫውቸር አይነት
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,የዋጋ ዝርዝር አልተገኘም ወይም ተሰናክሏል አይደለም
 DocType: Employee Loan Application,Approved,ጸድቋል
 DocType: Pricing Rule,Price,ዋጋ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} መዘጋጀት አለበት ላይ እፎይታ ሠራተኛ &#39;ግራ&#39; እንደ
 DocType: Guardian,Guardian,ሞግዚት
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ግምገማ {0} {1} በተሰጠው ቀን ክልል ውስጥ የሰራተኛ የተፈጠሩ
 DocType: Employee,Education,ትምህርት
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,በ የዘመቻ አሰያየም
 DocType: Employee,Current Address Is,የአሁኑ አድራሻ ነው
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,የተቀየረው
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ከተፈለገ. ካልተገለጸ ከሆነ, ኩባንያ ነባሪ ምንዛሬ ያዘጋጃል."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ዲግሪ መጽሔት ግቤቶች.
 DocType: Delivery Note Item,Available Qty at From Warehouse,መጋዘን ከ ላይ ይገኛል ብዛት
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ረድፍ {0}: ፓርቲ / መለያዎ ጋር አይመሳሰልም {1} / {2} ውስጥ {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,የወጪ ሒሳብ ያስገቡ
 DocType: Account,Stock,አክሲዮን
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","የረድፍ # {0}: የማጣቀሻ ሰነድ ዓይነት የግዢ ትዕዛዝ አንዱ, የግዥ ደረሰኝ ወይም ጆርናል የሚመዘገብ መሆን አለበት"
 DocType: Employee,Current Address,ወቅታዊ አድራሻ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","በግልጽ ካልተገለጸ በስተቀር ንጥል ከዚያም መግለጫ, ምስል, ዋጋ, ግብር አብነቱን ከ ማዘጋጀት ይሆናል ወዘተ ሌላ ንጥል ተለዋጭ ከሆነ"
 DocType: Serial No,Purchase / Manufacture Details,የግዢ / ማምረት ዝርዝሮች
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,ማዕከል ቅንብሮች
 DocType: Project,Gross Margin %,ግዙፍ ኅዳግ %
 DocType: BOM,With Operations,ክወናዎች ጋር
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ዲግሪ ግቤቶች አስቀድሞ ምንዛሬ ተደርገዋል {0} ድርጅት {1}. ምንዛሬ ጋር አንድ እንደተቀበለ ወይም ተከፋይ ሂሳብ ይምረጡ {0}.
 DocType: Asset,Is Existing Asset,ንብረት አሁን ነው
 DocType: Salary Detail,Statistical Component,ስታስቲክስ ክፍለ አካል
 ,Monthly Salary Register,ወርሃዊ ደመወዝ ይመዝገቡ
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,ክፍል
 DocType: Purchase Order,Advance Paid,የቅድሚያ ክፍያ የሚከፈልበት
 DocType: Item,Item Tax,ንጥል ግብር
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,አቅራቢው ቁሳዊ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,አቅራቢው ቁሳዊ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ኤክሳይስ ደረሰኝ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ከአንድ ጊዜ በላይ ይመስላል
 DocType: Expense Claim,Employees Email Id,ሰራተኞች ኢሜይል መታወቂያ
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,አርማ ያያይዙ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,የክምችት ደረጃዎች
 DocType: Customer,Commission Rate,ኮሚሽን ተመን
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ተለዋጭ አድርግ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ተለዋጭ አድርግ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,መምሪያ አግድ ፈቃድ መተግበሪያዎች.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","የክፍያ ዓይነት, ተቀበል አንዱ መሆን ይክፈሉ እና የውስጥ ትልልፍ አለበት"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ትንታኔ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ጋሪ ባዶ ነው
 DocType: Vehicle,Model,ሞዴል
@@ -4510,6 +4523,7 @@
 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 +161,Capital Stock,አቢይ Stock
+DocType: Shopping Cart Settings,Show Public Attachments,የህዝብ አባሪዎች አሳይ
 DocType: Packing Slip,Package Weight Details,የጥቅል ክብደት ዝርዝሮች
 DocType: Payment Gateway Account,Payment Gateway Account,ክፍያ ፍኖት መለያ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,የክፍያ ማጠናቀቂያ በኋላ የተመረጠውን ገጽ ተጠቃሚ አቅጣጫ አዙር.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,የአገልግሎት ማብቂያ ጊዜ
 ,Supplier Addresses and Contacts,አቅራቢው አድራሻዎች እና እውቂያዎች
 ,accounts-browser,መለያዎች-አሳሽ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,የመጀመሪያው ምድብ ይምረጡ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,የመጀመሪያው ምድብ ይምረጡ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ፕሮጀክት ዋና.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","የክምችት ቅንብሮች ወይም ንጥል ላይ &quot;አበል&quot; ማዘመን, አከፋፈል ላይ ወይም በላይ-ትዕዛዝን መፍቀድ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ምንዛሬዎች ወደ ወዘተ $ እንደ ማንኛውም ምልክት ቀጥሎ አታሳይ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ግማሽ ቀን)
 DocType: Supplier,Credit Days,የሥዕል ቀኖች
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,የተማሪ ባች አድርግ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,የተማሪ ባች አድርግ
 DocType: Leave Type,Is Carry Forward,አስተላልፍ አኗኗራችሁ ነው
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM ከ ንጥሎች ያግኙ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ሰዓት ቀኖች ሊመራ
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},የረድፍ # {0}: ቀን መለጠፍ የግዢ ቀን ጋር ተመሳሳይ መሆን አለበት {1} ንብረት {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ከላይ በሰንጠረዡ ውስጥ የሽያጭ ትዕዛዞች ያስገቡ
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ማዕቀብ መጠን
 DocType: GL Entry,Is Opening,በመክፈት ላይ ነው
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ረድፍ {0}: ዴት ግቤት ጋር ሊገናኝ አይችልም አንድ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ማዋቀር ቁጥር ተከታታይ&gt; Setup በኩል ክትትል ተከታታይ ቁጥር እባክዎ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,መለያ {0} የለም
 DocType: Account,Cash,ጥሬ ገንዘብ
 DocType: Employee,Short biography for website and other publications.,ድር ጣቢያ እና ሌሎች ጽሑፎች አጭር የሕይወት ታሪክ.
diff --git a/erpnext/translations/ar.csv b/erpnext/translations/ar.csv
index ca6f37d..37b43ae 100644
--- a/erpnext/translations/ar.csv
+++ b/erpnext/translations/ar.csv
@@ -5,7 +5,7 @@
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +33,Cancel Material Visit {0} before cancelling this Warranty Claim,إلغاء مادة زيارة موقع {0} قبل إلغاء هذه المطالبة الضمان
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +19,Consumer Products,المنتجات الاستهلاكية
 DocType: Item,Customer Items,منتجات العميل
-DocType: Project,Costing and Billing,حساب التكلفة والفواتير
+DocType: Project,Costing and Billing,التكلفة و الفواتير
 apps/erpnext/erpnext/accounts/doctype/account/account.py +53,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 +88,Email Notifications,إشعارات البريد الإلكتروني
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,مؤجر
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ينطبق على العضو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",لا يمكن إلغاء توقفت أمر الإنتاج، نزع السدادة لأول مرة إلغاء
 DocType: Vehicle Service,Mileage,عدد الأميال
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,هل تريد حقا أن التخلي عن هذه الأصول؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,حدد الافتراضي مزود
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,حدد الافتراضي مزود
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},مطلوب العملة لقائمة الأسعار {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* سيتم احتسابه في المعاملة.
 DocType: Purchase Order,Customer Contact,معلومات اتصال العميل
@@ -41,13 +41,13 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقيقة
 DocType: Leave Type,Leave Type Name,اسم نوع الاجازة
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,عرض مفتوح
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,عرض مفتوح
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,تم تحديث الترقيم المتسلسل بنجاح
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,الدفع
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural إدخال دفتر اليومية ارسل
 DocType: Pricing Rule,Apply On,تنطبق على
 DocType: Item Price,Multiple Item prices.,أسعار الإغلاق متعددة .
-,Purchase Order Items To Be Received,أمر شراء الأصناف التي سترد
+,Purchase Order Items To Be Received,تم استلام اصناف امر الشراء
 DocType: SMS Center,All Supplier Contact,بيانات اتصال جميع الموردين
 DocType: Support Settings,Support Settings,إعدادات الدعم
 DocType: SMS Parameter,Parameter,المعلمة
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,دفعة وضع البند انتهاء الصلاحية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,مسودة بنك
 DocType: Mode of Payment Account,Mode of Payment Account,طريقة حساب الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,اظهار المتغيرات
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,اظهار المتغيرات
 DocType: Academic Term,Academic Term,الفصل الدراسي
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مادة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,كمية
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,كمية
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جدول الحسابات لا يمكن أن يكون فارغا.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),القروض ( المطلوبات )
 DocType: Employee Education,Year of Passing,سنة التخرج
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",إشارة:٪ الصورة، البند الرمز:٪ الصورة والعملاء:٪ ق
 DocType: Item,Country of Origin,بلد المنشأ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,في الأوراق المالية
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,القضايا المفتوحة
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,الرعاية الصحية
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),التأخير في الدفع (أيام)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,نفقات الخدمة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,فاتورة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},الرقم التسلسلي: {0} تم الإشارة إليه من قبل في فاتورة المبيعات: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,فاتورة
 DocType: Maintenance Schedule Item,Periodicity,دورية
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,السنة المالية {0} مطلوب
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,التاريخ المتوقع للتسليم هو أن يكون قبل ترتيب المبيعات تاريخ
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",إرفاق ملف csv مع عمودين، واحدة للاسم القديم واحدة للاسم الجديد
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} غير موجود في أي سنة مالية نشطة.
 DocType: Packed Item,Parent Detail docname,الأم تفاصيل docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",المرجع: {0}، رمز العنصر: {1} والعميل: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,كجم
 DocType: Student Log,Log,سجل
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,.فتح للحصول على وظيفة
 DocType: Item Attribute,Increment,الزيادة
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,حدد مستودع ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,حدد مستودع ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,إعلان
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,يتم إدخال نفس الشركة أكثر من مرة
 DocType: Employee,Married,متزوج
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لا يجوز لل{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,الحصول على البنود من
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},لا يجوز لل{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,الحصول على البنود من
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},لا يمكن تحديث المخزون ضد تسليم مذكرة {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},المنتج {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,لم يتم إدراج أية عناصر
 DocType: Payment Reconciliation,Reconcile,توفيق
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,بقالة
 DocType: Quality Inspection Reading,Reading 1,قراءة 1
 DocType: Process Payroll,Make Bank Entry,أنشئ قيد محاسبي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صناديق التقاعد
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,الاستهلاك المقبل التاريخ لا يمكن أن يكون قبل تاريخ الشراء
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,التاريخ التالي للأهلاك لا يمكن ان يكون قبل تاريخ الشراء
 DocType: SMS Center,All Sales Person,كل مندوبى البيع
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** التوزيع الشهري ** يساعدك على توزيع  الهدف أو الميزانية على مدى عدة شهور إذا كان لديك موسمية في عملك.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,لا وجدت وحدات
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,لا وجدت وحدات
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,هيكلية راتب مفقودة
 DocType: Lead,Person Name,اسم الشخص
 DocType: Sales Invoice Item,Sales Invoice Item,فاتورة مبيعات السلعة
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",على سبيل المثال &quot;المدرسة الابتدائية&quot; أو &quot;جامعة&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,تقارير المخزون
 DocType: Warehouse,Warehouse Detail,تفاصيل المستودع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},وقد عبرت الحد الائتماني للعميل {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاريخ نهاية المدة لا يمكن أن يكون في وقت لاحق من تاريخ نهاية السنة للعام الدراسي الذي يرتبط مصطلح (السنة الأكاديمية {}). يرجى تصحيح التواريخ وحاول مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""هل الأصول ثابتة"" لا يمكن إزالة اختياره, لأن سجل الأصول  موجود ضد هذا البند"
 DocType: Vehicle Service,Brake Oil,زيت الفرامل
 DocType: Tax Rule,Tax Type,نوع الضريبة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},غير مصرح لك لإضافة أو تحديث الإدخالات قبل {0}
 DocType: BOM,Item Image (if not slideshow),صورة البند (إن لم يكن عرض الشرائح)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,موجود على العملاء مع نفس الاسم
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(سعر الساعة / 60) * وقت العمل الفعلي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,حدد مكتب الإدارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,حدد مكتب الإدارة
 DocType: SMS Log,SMS Log,SMS سجل رسائل
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,تكلفة البنود المسلمة
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,عطلة على {0} ليست بين من تاريخ وإلى تاريخ
@@ -159,18 +161,18 @@
 DocType: Journal Entry,Opening Entry,فتح دخول
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,حساب لدفع فقط
 DocType: Employee Loan,Repay Over Number of Periods,سداد أكثر من عدد فترات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} غير مسجل في {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1}لم يسجل التحديد {2}
 DocType: Stock Entry,Additional Costs,تكاليف إضافية
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,لا يمكن تحويل حساب جرت عليه أي عملية إلى مجموعة.
 DocType: Lead,Product Enquiry,الإستفسار عن المنتج
 DocType: Academic Term,Schools,مرفق تعليمي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},لا يوجد سجل إجازة تم العثور عليه للموظف {0} في {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,يرجى إدخال الشركة الأولى
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,يرجى تحديد الشركة أولا
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,فضلا ادخل الشركة اولا
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,يرجى تحديد الشركة أولا
 DocType: Employee Education,Under Graduate,دبلومة
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,الهدف في
 DocType: BOM,Total Cost,التكلفة الكلية لل
-DocType: Journal Entry Account,Employee Loan,سلفة موظف
+DocType: Journal Entry Account,Employee Loan,قرض الموظف
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,:سجل النشاط
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,البند {0} غير موجود في النظام أو قد انتهت صلاحيتها
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,العقارات
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,المطالبة المبلغ
 DocType: Employee,Mr,السيد
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,مجموعة العملاء مكررة موجودة في جدول المجموعة كوتومير
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,المورد نوع / المورد
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,المورد نوع / المورد
 DocType: Naming Series,Prefix,بادئة
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,الاستهلاكية
 DocType: Employee,B-,ب-
@@ -190,24 +192,24 @@
 DocType: Training Result Employee,Grade,درجة
 DocType: Sales Invoice Item,Delivered By Supplier,سلمت من قبل المورد
 DocType: SMS Center,All Contact,جميع الاتصالات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,أمر الإنتاج التي تم إنشاؤها بالفعل لجميع البنود مع مكتب الإدارة
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,أمر الإنتاج التي تم إنشاؤها بالفعل لجميع البنود مع مكتب الإدارة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,الراتب السنوي
 DocType: Daily Work Summary,Daily Work Summary,ملخص العمل اليومي
 DocType: Period Closing Voucher,Closing Fiscal Year,إغلاق السنة المالية
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} غير المجمدة
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} غير المجمدة
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,يرجى تحديد الشركة الحالية لإنشاء مخطط الحسابات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,مصاريف المخزون
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,حدد مستودع الهدف
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,الرجاء إدخال البريد الإلكتروني لجهة الاتصال المفضلة
 DocType: Journal Entry,Contra Entry,الدخول كونترا
-DocType: Journal Entry Account,Credit in Company Currency,الائتمان في الشركة العملات
+DocType: Journal Entry Account,Credit in Company Currency,المدين في عملة الشركة
 DocType: Delivery Note,Installation Status,حالة تثبيت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",هل تريد تحديث الحضور؟ <br> الحاضر: {0} \ <br> غائبة: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},الكمية المقبولة + المرفوضة يجب أن تساوي الكمية المستلمة من الصنف {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,توريد مواد خام للشراء
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,مطلوب واسطة واحدة على الأقل من دفع لنقاط البيع فاتورة.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,مطلوب واسطة واحدة على الأقل من دفع لنقاط البيع فاتورة.
 DocType: Products Settings,Show Products as a List,عرض المنتجات كقائمة
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","تنزيل نموذج، وملء البيانات المناسبة وإرفاق الملف المعدل.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,انشئ مدخل استهلاك
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,طلب نوع
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,أنشئ موظف
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,أنشئ موظف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,إذاعة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,إعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,حملت تفاصيل العمليات بها.
@@ -238,16 +240,17 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,خطة للزيارات الصيانة.
 DocType: SMS Settings,Enter url parameter for message,ادخل معمل العنوان للرسالة
 DocType: POS Profile,Customer Groups,المجموعات العملاء
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,القوائم المالية
 DocType: Guardian,Students,الطلاب
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,قواعد لتطبيق التسعير والخصم .
-apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب أن تكون قائمة الأسعار المعمول بها لشراء أو بيع
+apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,يجب ان تكون قائمة الأسعار منطبقه للشراء او البيع
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},تاريخ التثبيت لا يمكن أن يكون قبل تاريخ التسليم القطعة ل {0}
 DocType: Pricing Rule,Discount on Price List Rate (%),معدل الخصم على قائمة الأسعار (٪)
 DocType: Offer Letter,Select Terms and Conditions,اختر الشروط والأحكام
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +51,Out Value,القيمة خارج
 DocType: Production Planning Tool,Sales Orders,أوامر البيع
 DocType: Purchase Taxes and Charges,Valuation,تقييم
-,Purchase Order Trends,شراء اتجاهات ترتيب
+,Purchase Order Trends,اتجهات امر الشراء
 apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,طلب للحصول على الاقتباس يمكن الوصول إليها من خلال النقر على الرابط التالي
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,تخصيص الاجازات لهذا العام.
 DocType: SG Creation Tool Course,SG Creation Tool Course,سان جرمان إنشاء ملعب أداة
@@ -262,12 +265,12 @@
 DocType: Production Order Operation,Updated via 'Time Log',"تحديث عبر 'وقت دخول """
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}
 DocType: Naming Series,Series List for this Transaction,قائمة متسلسلة لهذه العملية
-DocType: Company,Default Payroll Payable Account,افتراضي المرتبات حساب المدفوعات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,تحديث البريد الإلكتروني من مجموعة
+DocType: Company,Default Payroll Payable Account,حساب مدفوعات المرتب المعتاد
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,تحديث البريد الإلكتروني من مجموعة
 DocType: Sales Invoice,Is Opening Entry,تم افتتاح الدخول
 DocType: Customer Group,Mention if non-standard receivable account applicable,أذكر إذا غير القياسية حساب القبض ينطبق
 DocType: Course Schedule,Instructor Name,اسم المدرب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ل مطلوب في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,بائع التجزئة
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",إذا تم، سيكون لتضمين عناصر غير الأسهم في طلبات المواد.
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,مقابل فاتورة المبيعات
 ,Production Orders in Progress,أوامر الإنتاج في التقدم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,صافي النقد من التمويل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",التخزين المحلي كامل، لم ينقذ
 DocType: Lead,Address & Contact,معلومات الاتصال والعنوان
 DocType: Leave Allocation,Add unused leaves from previous allocations,إضافة الاجازات غير المستخدمة من المخصصات السابقة
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},المتكرر التالي {0} سيتم إنشاؤها على {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),إجمالي حساب التكاليف المبلغ (عبر ورقة الوقت)
 DocType: Item Website Specification,Item Website Specification,البند مواصفات الموقع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,إجازة محظورة
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,مدخلات البنك
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},البند {0} قد بلغ نهايته من الحياة على {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,مدخلات البنك
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سنوي
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,جرد عناصر المخزون
 DocType: Stock Entry,Sales Invoice No,فاتورة مبيعات لا
@@ -320,11 +323,11 @@
 DocType: Item,Publish in Hub,نشر في المحور
 DocType: Student Admission,Student Admission,قبول الطلاب
 ,Terretory,إقليم
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,البند {0} تم إلغاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,طلب المواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,البند {0} تم إلغاء
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,طلب المواد
 DocType: Bank Reconciliation,Update Clearance Date,تحديث تاريخ التخليص
 DocType: Item,Purchase Details,تفاصيل شراء
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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 +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"الصنف {0} غير موجودة في ""مواد الخام المتوفره"" الجدول في أمر الشراء {1}"
 DocType: Employee,Relation,علاقة
 DocType: Shipping Rule,Worldwide Shipping,الشحن في جميع أنحاء العالم
 DocType: Student Guardian,Mother,أم
@@ -357,11 +360,11 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,الشيكات المعلقة والودائع لمسح
 DocType: Item,Synced With Hub,مزامن مع المحور
 DocType: Vehicle,Fleet Manager,مدير القافلة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},صف # {0}: {1} لا يمكن أن يكون سلبيا لمادة {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,كلمة مرور خاطئة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},صف # {0}: {1} لا يمكن أن يكون سلبيا لمادة {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,كلمة مرور خاطئة
 DocType: Item,Variant Of,البديل من
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المنتهية لا يمكن أن تكون أكبر من ""كمية لتصنيع"""
-DocType: Period Closing Voucher,Closing Account Head,إغلاق حساب رئيس
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"الكمية المنتهية لا يمكن أن تكون أكبر من ""كمية لتصنيع"""
+DocType: Period Closing Voucher,Closing Account Head,اقفال حساب المركز الرئيسي
 DocType: Employee,External Work History,تاريخ العمل الخارجي
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطأ مرجع دائري
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,اسم Guardian1
@@ -373,24 +376,23 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,إبلاغ عن طريق البريد الإلكتروني على خلق مادة التلقائي طلب
 DocType: Journal Entry,Multi Currency,متعدد العملات
 DocType: Payment Reconciliation Invoice,Invoice Type,نوع الفاتورة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ملاحظة التسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ملاحظة التسليم
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,إعداد الضرائب
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,تكلفة الأصول المباعة
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,لقد تم تعديل دفع الدخول بعد سحبها. يرجى تسحبه مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
-DocType: Grade Interval,Min Score,دقيقة نتيجة
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} دخلت مرتين في ضريبة الصنف
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ملخص لهذا الأسبوع والأنشطة المعلقة
 DocType: Student Applicant,Admitted,قُبل
 DocType: Workstation,Rent Cost,الإيجار التكلفة
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,المبلغ بعد الاستهلاك
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,الأحداث القادمة
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,الرجاء اختيار الشهر والسنة
-DocType: Employee,Company Email,شركة البريد الإلكتروني
+DocType: Employee,Company Email,البريد الألكتروني للشركة
 DocType: GL Entry,Debit Amount in Account Currency,مقدار الخصم في حساب العملات
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ثمن الطلب
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,المعاملات المصرفية / النقدية ضد طرف أو لنقل الداخلي
 DocType: Shipping Rule,Valid for Countries,صالحة للبلدان
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين ""لا نسخ '"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,إجمالي الطلب المعتبر
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",تعيين موظف (مثل الرئيس التنفيذي ، مدير الخ ) .
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"الرجاء إدخال ' كرر في يوم من الشهر "" قيمة الحقل"
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},الصف # {0}: لا يمكن أن يتم شراء فاتورة مقابل الأصول الموجودة {1}
 DocType: Item Tax,Tax Rate,ضريبة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} مخصصة أصلا للموظف {1} للفترة من {2} إلى {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,اختر البند
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,شراء الفاتورة {0} يقدم بالفعل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,اختر البند
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,فاتورة الشراء {0} تم ترحيلها من قبل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},الصف # {0}: لا دفعة ويجب أن يكون نفس {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تحويل لغير المجموعه
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,رقم المجموعة للصنف
 DocType: C-Form Invoice Detail,Invoice Date,تاريخ الفاتورة
 DocType: GL Entry,Debit Amount,قيمة الخصم
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,يرجى الإطلاع على المرفقات
 DocType: Purchase Order,% Received,تم استلام٪
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,إنشاء مجموعات الطلاب
@@ -422,8 +424,8 @@
 DocType: Leave Application,Leave Approver Name,أسم الموافق علي الاجازة
 DocType: Depreciation Schedule,Schedule Date,جدول التسجيل
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",المكاسب و الخصومات و مكونات المرتب الاخرى
-DocType: Packed Item,Packed Item,ملاحظة التوصيل التغليف
-apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,الإعدادات الافتراضية لشراء صفقة.
+DocType: Packed Item,Packed Item,عنصر معبأ
+apps/erpnext/erpnext/config/buying.py +65,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/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,حقل إلزامي - الحصول على الطلاب من
 DocType: Program Enrollment,Enrolled courses,الدورات المسجلة
@@ -435,17 +437,17 @@
 DocType: Request for Quotation,Request for Quotation,طلب للحصول على الاقتباس
 DocType: Salary Slip Timesheet,Working Hours,ساعات العمل
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغيير رقم تسلسل بدء / الحالي من سلسلة الموجودة.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,إنشاء العملاء جديد
-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.",إذا استمرت قواعد التسعير متعددة أن تسود، يطلب من المستخدمين تعيين الأولوية يدويا لحل الصراع.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,إنشاء أوامر الشراء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,إنشاء العملاء جديد
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",إذا استمرت قواعد التسعير متعددة أن تسود، يطلب من المستخدمين تعيين الأولوية يدويا لحل الصراع.
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,إنشاء أوامر الشراء
 ,Purchase Register,سجل شراء
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,الرسوم المطبقة
 DocType: Workstation,Consumable Cost,التكلفة الاستهلاكية
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1})يجب أن يمتلك صلاحية (الموافق علي الايجازة)
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) يجب ان تكون صلاحياتك 'مصادق علي الأجازه '
 DocType: Purchase Receipt,Vehicle Date,مركبة التسجيل
 DocType: Student Log,Medical,طبي
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,السبب لفقدان
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,السبب لفقدان
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,قيادي المالك لا يمكن أن يكون نفس الرصاص
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,المبلغ المخصص لا يمكن ان يكون أكبر من القيمة غير المعدلة
 DocType: Announcement,Receiver,المتلقي
@@ -456,17 +458,18 @@
 DocType: Account,Cost of Goods Sold,تكلفة السلع المباعة
 DocType: Purchase Invoice,Yearly,سنويا
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,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 +71,Avg. Selling Rate,متوسط نسبه المبيعات
 DocType: Assessment Plan,Examiner Name,اسم الفاحص
 DocType: Purchase Invoice Item,Quantity and Rate,كمية وقيم
 DocType: Delivery Note,% Installed,٪ تم تثبيت
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,الفصول الدراسية / مختبرات الخ حيث يمكن جدولة المحاضرات.
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,الرجاء إدخال اسم الشركة الأولى
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,فضلا ادخل اسم الشركة  اولا
 DocType: Purchase Invoice,Supplier Name,اسم المورد
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,قراءة دليل ERPNext
 DocType: Account,Is Group,غير المجموعة
-DocType: Email Digest,Pending Purchase Orders,في انتظار أوامر الشراء
+DocType: Email Digest,Pending Purchase Orders,اوامر الشراء المعلقة
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,حدد الرقم التسلسلي بناءً على FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,الاختيار فاتورة المورد عدد تفرد
 DocType: Vehicle Service,Oil Change,تغيير زيت
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,العمر الرئيسي
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,حقل إلزامي - السنة الأكاديمية
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,تخصيص النص الاستهلالي الذي يذهب كجزء من أن البريد الإلكتروني. كل معاملة له نص منفصل استهلالي.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},يرجى تعيين الحساب الافتراضي المستحق للشركة {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,إعدادات العالمية لجميع عمليات التصنيع.
 DocType: Accounts Settings,Accounts Frozen Upto,حسابات مجمدة حتى
 DocType: SMS Log,Sent On,ارسلت في
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,السمة {0} اختيار عدة مرات في سمات الجدول
 DocType: HR Settings,Employee record is created using selected field. ,يتم إنشاء سجل الموظف باستخدام الحقل المحدد.
 DocType: Sales Order,Not Applicable,لا ينطبق
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,العطلة الرئيسية
 DocType: Request for Quotation Item,Required Date,تاريخ المطلوبة
 DocType: Delivery Note,Billing Address,عنوان الفواتير
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,الرجاء إدخال رمز المدينة .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,الرجاء إدخال رمز المدينة .
 DocType: BOM,Costing,تكلف
 DocType: Tax Rule,Billing County,إقليم الفواتير
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",إذا كانت محددة، سيتم النظر في مقدار ضريبة كمدرجة بالفعل في قيم الطباعة / مقدار الطباعة
@@ -501,6 +505,7 @@
 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,الأوراق المالية و الودائع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",لا یمکن تغییر طریقة التقییم حیث أن ھناك معاملات مقابل بعض البنود التي لیس لدیھا طریقة تقییم خاصة
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع الإجازات المخصصة إلزامية
 DocType: Job Opening,Description of a Job Opening,وصف وظيفة شاغرة
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,الأنشطة في انتظار لهذا اليوم
@@ -517,17 +522,17 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,قائمة قليلة من الزبائن. يمكن أن تكون المنظمات أو الأفراد.
 ,Enough Parts to Build,يكفي لبناء أجزاء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,الدخل المباشر
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن تصفية استنادا إلى الحساب ، إذا جمعت بواسطة حساب
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",لا يمكن اعتماد الفلتره علي الحساب في حالة انه مجمع الحساب
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,موظف إداري
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,الرجاء تحديد الدورة التدريبية
 DocType: Timesheet Detail,Hrs,ساعات
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,يرجى تحديد الشركة
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,يرجى تحديد الشركة
 DocType: Stock Entry Detail,Difference Account,حساب الفرق
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,لا يمكن عمل أقرب لم يتم إغلاق المهمة التابعة لها {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,من فضلك ادخل مستودع لل والتي سيتم رفع طلب المواد
 DocType: Production Order,Additional Operating Cost,تكاليف تشغيل  اضافية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,مستحضرات التجميل
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين
 DocType: Shipping Rule,Net Weight,الوزن الصافي
 DocType: Employee,Emergency Phone,الهاتف في حالات الطوارئ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,يشترى
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,يرجى تحديد الدرجة لعتبة 0٪
 DocType: Sales Order,To Deliver,لتسليم
 DocType: Purchase Invoice Item,Item,بند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,المسلسل أي بند لا يمكن أن يكون جزء
 DocType: Journal Entry,Difference (Dr - Cr),الفرق ( الدكتور - الكروم )
 DocType: Account,Profit and Loss,الربح والخسارة
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,إدارة التعاقد من الباطن
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,الاضافة لا يمكن أن يكون 0
 DocType: Production Planning Tool,Material Requirement,متطلبات المواد
 DocType: Company,Delete Company Transactions,حذف المعاملات الشركة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,إشارة لا ومرجعية التسجيل إلزامي لالمعاملات المصرفية
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,إضافة / تعديل الضرائب والرسوم
 DocType: Purchase Invoice,Supplier Invoice No,رقم فاتورة المورد
 DocType: Territory,For reference,للرجوع إليها
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,ملاحظة تثبيت الإغلاق
 DocType: Production Plan Item,Pending Qty,الكمية التي قيد الانتظار
 DocType: Budget,Ignore,تجاهل
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} غير نشطة
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} غير نشطة
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},رسائل SMS أرسلت الى الارقام التالية: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,أبعاد الاختيار الإعداد للطباعة
 DocType: Salary Slip,Salary Slip Timesheet,كشف راتب معتمد علي سجل التوقيت
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,مجموع العمولة
 DocType: Pricing Rule,Sales Partner,شريك المبيعات
 DocType: Buying Settings,Purchase Receipt Required,مطلوب إيصال الشراء
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,تقييم أسعار إلزامي إذا فتح المخزون دخل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,لا توجد في جدول الفاتورة السجلات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,يرجى تحديد الشركة وحزب النوع الأول
-apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,المالية / المحاسبة العام.
+apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,السنة المالية / المحاسبة.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,القيم المتراكمة
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",عذراَ ، ارقام المسلسل لا يمكن دمجها
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,أنشئ طلب بيع
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,أنشئ طلب بيع
 DocType: Project Task,Project Task,عمل مشروع
 ,Lead Id,معرف مبادرة البيع
 DocType: C-Form Invoice Detail,Grand Total,المجموع الإجمالي
@@ -594,8 +599,8 @@
 DocType: Job Applicant,Resume Attachment,السيرة الذاتية
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,العملاء المكررين
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,مبيعات المعاده
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الأوراق المخصصة {0} لا ينبغي أن يكون أقل من الأوراق وافق بالفعل {1} للفترة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,مبيعات المعاده
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ملاحظة: مجموع الاجازات المخصصة {0} لا ينبغي أن يكون أقل من الاجازات الموافق عليها {1} للفترة
 DocType: Announcement,Posted By,منشور من طرف
 DocType: Item,Delivered by Supplier (Drop Ship),سلمت من قبل مزود (هبوط السفينة)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,قاعدة بيانات من العملاء المحتملين.
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,تسعيرة إلى
 DocType: Lead,Middle Income,الدخل المتوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (الكروم )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,المبلغ المخصص لا يمكن أن تكون سلبية
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,يرجى تعيين الشركة
 DocType: Purchase Order Item,Billed Amt,فوترة AMT
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاتورة المبيعات الجدول الزمني
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مطلوب المرجعية لا والمراجع التسجيل لل {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,اختار الحساب الذي سوف تدفع منه
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات الموظفين لإدارة الإجازات ، ومطالبات النفقات والرواتب
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",إنشاء سجلات الموظفين لإدارة الإجازات ، ومطالبات النفقات والرواتب
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,إضافة إلى قاعدة المعارف
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,الكتابة الاقتراح
 DocType: Payment Entry Deduction,Payment Entry Deduction,دفع الاشتراك خصم
@@ -625,7 +630,7 @@
 DocType: Assessment Plan,Maximum Assessment Score,نتيجة تقييم القصوى
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,تواريخ عملية البنك التحديث
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,تتبع الوقت
-DocType: Fiscal Year Company,Fiscal Year Company,الشركة السنة المالية
+DocType: Fiscal Year Company,Fiscal Year Company,السنة الحالية للشركة
 DocType: Packing Slip Item,DN Detail,DN التفاصيل
 DocType: Training Event,Conference,مؤتمر
 DocType: Timesheet,Billed,توصف
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ليس في السنة المالية {2}
 DocType: Buying Settings,Settings for Buying Module,إعدادات لشراء وحدة
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},الأصول {0} لا تنتمي إلى شركة {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,من فضلك ادخل شراء استلام أولا
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",ثم يتم تصفيت قاعدة التسعير على أساس العملاء، مجموعة العملاء، الأرض، المورد، نوع المورد ، الحملة، شريك المبيعات الخ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,صافي التغير في المخزون
-apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,إدارة القروض موظف
+apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,لجنة ادارة قرض الموظف
 DocType: Employee,Passport Number,رقم جواز السفر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,العلاقة مع Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
 DocType: Payment Entry,Payment From / To,الدفع من / إلى
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,نطاق الموعد
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد الائتماني الجديد هو أقل من المبلغ المستحق الحالي للعميل. الحد الائتماني يجب أن يكون أتلست {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},الحد الائتماني الجديد هو أقل من المبلغ المستحق الحالي للعميل. الحد الائتماني يجب أن يكون أتلست {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,""" بناء على "" و "" مجمع بــ ' لا يمكن أن يتطابقا"
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,في دقائق
 DocType: Issue,Resolution Date,تاريخ القرار
 DocType: Student Batch Name,Batch Name,اسم دفعة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,الجدول الزمني الانشاء:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,الجدول الزمني الانشاء:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},الرجاء تعيين النقدية الافتراضي أو حساب مصرفي في طريقة الدفع {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,تسجل
 DocType: Selling Settings,Customer Naming By,تسمية العملاء بواسطة
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,سوف تظهر الطالب كما موجود في طالب تقرير الحضور الشهري
@@ -675,12 +679,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,تحويل إلى المجموعة
 DocType: Activity Cost,Activity Type,نوع النشاط
 DocType: Request for Quotation,For individual supplier,عن مورد فردي
-DocType: BOM Operation,Base Hour Rate(Company Currency),أسعار ساعة قاعدة (شركة العملات)
+DocType: BOM Operation,Base Hour Rate(Company Currency),سعر الساعه الأساسي ( عملة الشركة )
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,المقدار المسلم
 DocType: Supplier,Fixed Days,يوم الثابتة
 DocType: Quotation Item,Item Balance,البند الميزان
 DocType: Sales Invoice,Packing List,قائمة التعبئة
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,أوامر الشراء نظرا للموردين.
+apps/erpnext/erpnext/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,مستهلك
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,الفعلي وقت البدء
 DocType: BOM Operation,Operation Time,عملية الوقت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,نهاية
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,الاساسي
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,الاساسي
 DocType: Timesheet,Total Billed Hours,مجموع الساعات وصفت
 DocType: Journal Entry,Write Off Amount,شطب المبلغ
 DocType: Journal Entry,Bill No,رقم الفاتورة
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,الحضور طالب
 DocType: Sales Invoice Timesheet,Time Sheet,ورقة الوقت
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush المواد الخام مبني على
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,يرجى إدخال تفاصيل البند
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,يرجى إدخال تفاصيل البند
 DocType: Interest,Interest,فائدة
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,قبل المبيعات
 DocType: Purchase Receipt,Other Details,تفاصيل أخرى
@@ -720,29 +724,28 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,يتم إنشاء دفع الاشتراك بالفعل
 DocType: Purchase Receipt Item Supplied,Current Stock,المخزون الحالية
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},الصف # {0}: الأصول {1} لا ترتبط البند {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,معاينة كشف الراتب
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,معاينة كشف الراتب
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,الحساب {0} تم إدخاله عدة مرات
 DocType: Account,Expenses Included In Valuation,النفقات المشملة في التقييم
 DocType: Hub Settings,Seller City,مدينة البائع
 ,Absent Student Report,تقرير طالب متغيب
 DocType: Email Digest,Next email will be sent on:,سيتم إرسال البريد الإلكتروني التالي على:
 DocType: Offer Letter Term,Offer Letter Term,تقديم رسالة الأجل
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,البند لديه المتغيرات.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,البند لديه المتغيرات.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,البند {0} لم يتم العثور على
 DocType: Bin,Stock Value,قيمة المخزون
-apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,لا توجد شركة {0}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,نوع الشجرة
+apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,الشركة ليست موجوده {0}
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,نوع الشجرة
 DocType: BOM Explosion Item,Qty Consumed Per Unit,الكمية المستهلكة لكل وحدة
 DocType: Serial No,Warranty Expiry Date,ضمان تاريخ الانتهاء
 DocType: Material Request Item,Quantity and Warehouse,الكمية والنماذج
 DocType: Sales Invoice,Commission Rate (%),نسبة العمولة (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,يرجى تحديد البرنامج
 DocType: Project,Estimated Cost,التكلفة التقديرية
 DocType: Purchase Order,Link to material requests,رابط لطلبات المادية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,الفضاء
 DocType: Journal Entry,Credit Card Entry,إدخال بطاقة إئتمان
-apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,شركة والحسابات
+apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,الشركة و دليل الحسابات
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,تلقى السلع من الموردين.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,في القيمة
 DocType: Lead,Campaign Name,اسم الحملة
@@ -754,12 +757,12 @@
 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,الافتراضي حساب
 DocType: Payment Entry,Received Amount (Company Currency),تلقى المبلغ (شركة العملات)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,يجب تحديد مبادرة البيع اذ كانة فرصة البيع من مبادرة بيع
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,الرجاء اختيار يوم عطلة أسبوعي
 DocType: Production Order Operation,Planned End Time,وقت الانتهاء المخطط له
 ,Sales Person Target Variance Item Group-Wise,الشخص المبيعات المستهدفة الفرق البند المجموعة الحكيم
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,لا يمكن تحويل حساب جرت عليه أي عملية إلى حساب أستاذ (دفتر أستاذ)
-DocType: Delivery Note,Customer's Purchase Order No,رقم طلب شراء العميل
+DocType: Delivery Note,Customer's Purchase Order No,رقم امر الشراء العميل
 DocType: Budget,Budget Against,الميزانية ضد
 DocType: Employee,Cell Number,رقم الهاتف
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,إنشاء طلب مواد تلقائي
@@ -770,7 +773,8 @@
 DocType: Opportunity,Opportunity From,فرصة من
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بيان الراتب الشهري.
 DocType: BOM,Website Specifications,موقع المواصفات
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} من {0} من نوع {1}
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: من {0} النوع {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,الصف {0}: تحويل عامل إلزامي
 DocType: Employee,A+,أ+
@@ -823,26 +827,27 @@
 DocType: Employee,Bank A/C No.,رقم الحساب المصرفي.
 DocType: Bank Guarantee,Project,مشروع
 DocType: Quality Inspection Reading,Reading 7,قراءة 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,طلبت جزئيا
 DocType: Expense Claim Detail,Expense Claim Type,نوع  المطالبة  بالنفقات
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,الإعدادات الافتراضية لسلة التسوق
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},الأصول ألغت عبر إدخال دفتر اليومية {0}
-DocType: Employee Loan,Interest Income Account,الحساب الخاص بإيرادات الفائدة
+DocType: Employee Loan,Interest Income Account,حساب الدخل من الفائدة
 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 +107,Office Maintenance Expenses,مصاريف صيانة المكاتب
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,إعداد حساب بريد إلكتروني
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,الرجاء إدخال العنصر الأول
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,الرجاء إدخال العنصر الأول
 DocType: Account,Liability,مسئولية
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,لا يمكن أن يكون المبلغ الموافق عليه أكبر من مبلغ المطالبة في الصف {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,قائمة الأسعار غير محددة
 DocType: Employee,Family Background,معلومات عن العائلة
 DocType: Request for Quotation Supplier,Send Email,إرسال بريد الإلكتروني
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},تحذير: مرفق غير صالح {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,لا يوجد تصريح
 DocType: Company,Default Bank Account,حساب البنك الافتراضي
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",لتصفية استنادا الحزب، حدد حزب النوع الأول
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},&quot;الأوراق المالية التحديث&quot; لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}
-DocType: Vehicle,Acquisition Date,اكتساب التسجيل
+DocType: Vehicle,Acquisition Date,تاريخ الاكتساب
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,غ
 DocType: Item,Items with higher weightage will be shown higher,سيتم عرض البنود مع أعلى الترجيح أعلى
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,تفاصيل تسوية البنك
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,لا يوجد موظف
 DocType: Supplier Quotation,Stopped,توقف
 DocType: Item,If subcontracted to a vendor,إذا الباطن للبائع
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,تم تحديث مجموعة الطلاب بالفعل.
 DocType: SMS Center,All Customer Contact,جميع العملاء الاتصال
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,تحميل المال عن طريق التوازن CSV.
 DocType: Warehouse,Tree Details,تفاصيل شجرة
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,الحد الأدنى للمبلغ الفاتورة
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: مركز التكلفة {2} لا تنتمي إلى شركة {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: الحساب {2} لا يمكن أن تكون المجموعة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,البند الصف {IDX}: {DOCTYPE} {} DOCNAME لا وجود له في أعلاه &#39;{DOCTYPE} المائدة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,الجدول الزمني {0} بالفعل منتهي أو ملغى
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,أية مهام
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",في يوم من الشهر الذي سيتم إنشاء فاتورة السيارات سبيل المثال 05، 28 الخ
 DocType: Asset,Opening Accumulated Depreciation,فتح الاستهلاك المتراكم
@@ -878,7 +883,7 @@
 DocType: Bin,Moving Average Rate,الانتقال متوسط معدل
 DocType: Production Planning Tool,Select Items,اختر العناصر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} مقابل الفاتورة {1} بتاريخ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,الجدول الدراسي
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,الجدول الدراسي
 DocType: Maintenance Visit,Completion Status,استكمال الحالة
 DocType: HR Settings,Enter retirement age in years,أدخل سن التقاعد بالسنوات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,المستودع المستهدف
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,سماح على تسليم أو استلام تصل هذه النسبة
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,سجل الحضور
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,جميع مجموعات الصنف
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,جميع مجموعات الصنف
 DocType: Process Payroll,Activity Log,سجل النشاط
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,صافي الربح / الخسارة
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,شكل رسالة تلقائياً عند تثبيت المعاملة
@@ -894,10 +899,10 @@
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} الوضع هو {2}
 DocType: Employee,Provide Email Address registered in company,تقديم عنوان البريد الإلكتروني المسجل في شركة
 DocType: Shopping Cart Settings,Enable Checkout,تمكين الخروج
-apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,أمر الشراء إلى الدفع
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,مدفوعات امر الشراء
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,الكمية المتوقعة
 DocType: Sales Invoice,Payment Due Date,تاريخ استحقاق السداد
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,البند البديل {0} موجود بالفعل مع نفس الصفات
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;فتح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,توسيع المهام
 DocType: Notification Control,Delivery Note Message,ملاحظة تسليم رسالة
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,إعادة ترتيب الكميه
 DocType: Leave Block List Date,Leave Block List Date,تواريخ الإجازات المحظورة
 DocType: Pricing Rule,Price or Discount,السعر أو الخصم
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم
 DocType: Sales Team,Incentives,الحوافز
 DocType: SMS Log,Requested Numbers,أرقام طلب
 DocType: Production Planning Tool,Only Obtain Raw Materials,الحصول فقط مواد أولية
@@ -927,7 +932,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"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,المطالبة حساب رفض رسالة
+DocType: Notification Control,Expense Claim Rejected Message,رسالة رفض  طلب النفقات
 ,Available Qty,الكمية المتاحة
 DocType: Purchase Taxes and Charges,On Previous Row Total,على إجمالي الصف السابق
 DocType: Purchase Invoice Item,Rejected Qty,الكمية المرفوضة
@@ -942,16 +947,16 @@
 DocType: Supplier Quotation,Is Subcontracted,وتعاقد من الباطن
 DocType: Item Attribute,Item Attribute Values,قيم سمة العنصر
 DocType: Examination Result,Examination Result,نتيجة الفحص
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ايصال شراء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ايصال شراء
 ,Received Items To Be Billed,العناصر الواردة إلى أن توصف
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,الموافقة على كشوفات الرواتب
 DocType: Employee,Ms,السيدة
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,أسعار صرف العملات الرئيسية .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},يجب أن يكون إشارة DOCTYPE واحد من {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},يجب أن يكون إشارة DOCTYPE واحد من {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},تعذر العثور على فتحة الزمنية في {0} الأيام القليلة القادمة للعملية {1}
 DocType: Production Order,Plan material for sub-assemblies,المواد خطة للجمعيات الفرعي
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,المناديب و المناطق
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,لا يمكن تلقائيا إنشاء حساب كما أن هناك بالفعل توازن الأسهم في الحساب. يجب عليك إنشاء حساب مطابقة قبل أن تتمكن من إجراء الدخول على هذا المستودع
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,لا يمكن إنشاء الحساب تلقائي في حال وجود رصيد مخزني في الحساب . يجب عليك إنشأ حساب مطابقة قبل عمل الأدخال في المخزون
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,فاتورة الموارد {0} يجب أن تكون نشطة
 DocType: Journal Entry,Depreciation Entry,انخفاض الدخول
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,الرجاء اختيار نوع الوثيقة الأولى
@@ -971,28 +976,27 @@
 DocType: Supplier,Default Payable Accounts,الحسابات الدائنة الافتراضي
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,موظف {0} غير نشط أو غير موجود
 DocType: Fee Structure,Components,مكونات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,البند المتغيرات {0} تحديث
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},الرجاء إدخال الأصول الفئة في البند {0}
 DocType: Quality Inspection Reading,Reading 6,قراءة 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
-DocType: Purchase Invoice Advance,Purchase Invoice Advance,مقدم فاتورة الشراء
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,لا يمكن {0} {1} {2} من دون أي فاتورة المعلقة السلبية
+DocType: Purchase Invoice Advance,Purchase Invoice Advance,عربون  فاتورة الشراء
 DocType: Hub Settings,Sync Now,مزامنة الآن
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: لا يمكن ربط دخول الائتمان مع {1}
 apps/erpnext/erpnext/config/accounts.py +215,Define budget for a financial year.,تحديد ميزانية او مخصصات السنة المالية
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,سيتم الافتراضي بنك / الصرف حساب الفاتورة تلقائيا تحديث في POS عند تحديد هذا الوضع.
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في فاتورة نقاط البيع عند اختيار الوضع
 DocType: Lead,LEAD-,قيادة-
 DocType: Employee,Permanent Address Is,العنوان الدائم هو
 DocType: Production Order Operation,Operation completed for how many finished goods?,اكتمال عملية لكيفية العديد من السلع تامة الصنع؟
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,العلامة التجارية
-DocType: Employee,Exit Interview Details,تفاصيل مقابلة مغادرة الشركة
-DocType: Item,Is Purchase Item,هو شراء مادة
+DocType: Employee,Exit Interview Details,تفاصيل مقابلة ترك الخدمه
+DocType: Item,Is Purchase Item,شراء صنف
 DocType: Asset,Purchase Invoice,فاتورة شراء
 DocType: Stock Ledger Entry,Voucher Detail No,تفاصيل قسيمة لا
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,فاتورة مبيعات جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,فاتورة مبيعات جديدة
 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,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,يجب فتح التسجيل وتاريخ الإنتهاء تكون ضمن نفس السنة المالية
 DocType: Lead,Request for Information,طلب المعلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,تزامن غير متصل الفواتير
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,تزامن غير متصل الفواتير
 DocType: Payment Request,Paid,مدفوع
 DocType: Program Fee,Program Fee,رسوم البرنامج
 DocType: Salary Slip,Total in words,إجمالي بالحروف
@@ -1002,18 +1006,18 @@
 DocType: Employee Loan,Sanctioned,تقرها
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; الجدول.
 DocType: Job Opening,Publish on website,نشر على الموقع الإلكتروني
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,الشحنات للعملاء.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,المورد تاريخ الفاتورة لا يمكن أن يكون أكبر من تاريخ النشر
-DocType: Purchase Invoice Item,Purchase Order Item,شراء السلعة ترتيب
+DocType: Purchase Invoice Item,Purchase Order Item,صنف امر الشراء
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,الدخل غير المباشرة
 DocType: Student Attendance Tool,Student Attendance Tool,أداة طالب الحضور
 DocType: Cheque Print Template,Date Settings,إعدادات التاريخ
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,فرق
 ,Company Name,اسم الشركة
 DocType: SMS Center,Total Message(s),مجموع الرسائل ( ق )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,اختر البند لنقل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,حدد رئيس حساب في البنك حيث أودع الاختيار.
@@ -1023,9 +1027,7 @@
 						Please enter a valid Invoice",صف {0}: فاتورة {1} غير صالح، قد يتم إلغاء / لا وجود لها. \ الرجاء إدخال الفاتورة صحيحة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: الدفع مقابل مبيعات / طلب شراء ينبغي دائما أن تكون علامة مسبقا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,مادة كيميائية
-DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,البنك الافتراضي / سيتم تحديث الحساب النقدي تلقائيا في الراتب دفتر اليومية عندما يتم تحديد هذا الوضع.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",وتيرة كود العلمية {0} يتداخل مع فترات الصف للصفوف الأخرى. يرجى التحقق من فترات {0} و {1} وحاول مرة أخرى
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,حساب الخزنه / البنك المعتاد سوف يعدل تلقائي في القيود اليوميه للمرتب عند اختيار الوضع.
 DocType: BOM,Raw Material Cost(Company Currency),الخام المواد التكلفة (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,كل الأصناف قد تم ترحيلها من قبل لأمر الانتاج هذا.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},الصف # {0}: لا يمكن أن يكون المعدل أكبر من المعدل المستخدم في {1} {2}
@@ -1036,14 +1038,14 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,نقلها
 DocType: BOM Website Item,BOM Website Item,BOM موقع البند
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,تحميل رئيس رسالتكم والشعار. (يمكنك تحريرها لاحقا).
-DocType: Timesheet Detail,Bill,فاتورة حساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
+DocType: Timesheet Detail,Bill,فاتورة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,يتم إدخال الاستهلاك المقبل التاريخ كتاريخ الماضي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,أبيض
 DocType: SMS Center,All Lead (Open),جميع العملاء المحتملين (فتح)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: الكمية لا تتوفر لل{4} في مستودع {1} في بالإرسال وقت دخول ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,الحصول على السلف المدفوعة
 DocType: Item,Automatically Create New Batch,إنشاء دفعة جديدة تلقائيا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,إنشاء
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,إنشاء
 DocType: Student Admission,Admission Start Date,تاريخ بداية القبول
 DocType: Journal Entry,Total Amount in Words,المبلغ الكلي في كلمات
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,كان هناك خطأ . يمكن أن يكون أحد الأسباب المحتملة التي قد لا يتم حفظ النموذج. يرجى الاتصال support@erpnext.com إذا استمرت المشكلة.
@@ -1051,30 +1053,30 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,فتح الكمية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,الرجاء إدخال حساب لتغيير المبلغ
 DocType: Student Batch Name,Student Batch Name,طالب اسم دفعة
 DocType: Holiday List,Holiday List Name,اسم قائمة العطلات
 DocType: Repayment Schedule,Balance Loan Amount,التوازن مبلغ القرض
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,دورة الجدول الزمني
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,خيارات المخزون
-DocType: Journal Entry Account,Expense Claim,حساب المطالبات
+DocType: Journal Entry Account,Expense Claim,طلب النفقات
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,هل تريد حقا أن استعادة هذه الأصول ألغت؟
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},الكمية ل{0}
 DocType: Leave Application,Leave Application,طلب اجازة
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,أداة تخصيص الإجازة
 DocType: Leave Block List,Leave Block List Dates,التواريخ الممنوع اخذ اجازة فيها
 DocType: Workstation,Net Hour Rate,صافي معدل ساعة
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,هبطت استلام تكلفة الشراء
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,تكاليف المشتريات المستلمة
 DocType: Company,Default Terms,الشروط الافتراضية
-DocType: Packing Slip Item,Packing Slip Item,التعبئة الإغلاق زلة
+DocType: Packing Slip Item,Packing Slip Item,مادة كشف التعبئة
 DocType: Purchase Invoice,Cash/Bank Account,حساب النقد / البنك
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},الرجاء تحديد {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,العناصر إزالتها مع أي تغيير في كمية أو قيمة.
 DocType: Delivery Note,Delivery To,التسليم إلى
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,الجدول السمة إلزامي
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,الجدول السمة إلزامي
 DocType: Production Planning Tool,Get Sales Orders,الحصول على أوامر البيع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} لا يمكن أن تكون سلبية
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,خصم
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,خصم
 DocType: Asset,Total Number of Depreciations,إجمالي عدد التلفيات
 DocType: Sales Invoice Item,Rate With Margin,معدل مع الهامش
 DocType: Workstation,Wages,أجور
@@ -1083,13 +1085,13 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,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: Landed Cost Item,Purchase Receipt Item,اصناف استلام الشراء
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
 DocType: POS Profile,Sales Invoice Payment,فاتورة مبيعات الدفع
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,مستودع محجوزة في ترتيب المبيعات / السلع تامة الصنع في معرض النماذج
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,كمية البيع
 DocType: Repayment Schedule,Interest Amount,مبلغ الفائدة
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,أنت الموافق المصروفات لهذا السجل.الرجاء تحديث الحالة و حفظ البيانات
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,أنت الموافق المصروفات لهذا السجل.الرجاء تحديث الحالة و حفظ البيانات
 DocType: Serial No,Creation Document No,إنشاء وثيقة لا
 DocType: Issue,Issue,قضية
 DocType: Asset,Scrapped,ألغت
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",سمات البدائل للصنف. على سبيل المثال الحجم واللون الخ
 DocType: Purchase Invoice,Returns,عائدات
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,مستودع WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},رقم المسلسل {0} هو بموجب عقد صيانة لغاية {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},رقم المسلسل {0} هو بموجب عقد صيانة لغاية {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,تجنيد
 DocType: Lead,Organization Name,اسم المنظمة
 DocType: Tax Rule,Shipping State,الدولة الشحن
 ,Projected Quantity as Source,المتوقع الكمية كمصدر
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"يجب إضافة البند باستخدام ""الحصول على السلع من شراء إيصالات 'زر"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"الصنف يجب اضافته مستخدما  مفتاح ""احصل علي الأصناف من المشتريات المستلمة """
 DocType: Employee,A-,أ-
 DocType: Production Planning Tool,Include non-stock items,وتشمل البنود غير المالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,مصاريف المبيعات
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,ضد
 DocType: Item,Default Selling Cost Center,الافتراضي البيع مركز التكلفة
 DocType: Sales Partner,Implementation Partner,شريك التنفيذ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,الرمز البريدي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,الرمز البريدي
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},اوامر البيع {0} {1}
 DocType: Opportunity,Contact Info,معلومات الاتصال
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,جعل الأسهم مقالات
 DocType: Packing Slip,Net Weight UOM,الوزن الصافي لوحدة القياس
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} النتائج
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} النتائج
 DocType: Item,Default Supplier,مزود الافتراضي
 DocType: Manufacturing Settings,Over Production Allowance Percentage,أكثر من الإنتاج بدل النسبة المئوية
 DocType: Employee Loan,Repayment Schedule,جدول السداد
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,الحصول على مواعيد الإيقاف الأسبوعي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,تاريخ النهاية لا يمكن أن يكون أقل من تاريخ البدء
 DocType: Sales Person,Select company name first.,حدد اسم الشركة الأول.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,الدكتور
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,الدكتور
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,الاقتباسات الواردة من الموردين.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},إلى {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,متوسط العمر
@@ -1141,18 +1143,18 @@
 DocType: Appraisal Template Goal,Key Performance Area,معيار التقييم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,النقل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,سمة غير صالح
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} يجب أن يؤكّد
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},يجب أن تكون الكمية أقل من أو يساوي إلى {0}
 DocType: SMS Center,Total Characters,مجموع أحرف
 apps/erpnext/erpnext/controllers/buying_controller.py +154,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 +42,Contribution %,المساهمة٪
-DocType: Company,Company registration numbers for your reference. Tax numbers etc.,أرقام تسجيل الشركة للرجوع اليها. أرقام الضرائب الخ.
+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 +224,Production Order {0} must be cancelled before cancelling this Sales Order,إنتاج النظام {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',الرجاء تعيين &#39;تطبيق خصم إضافي على&#39;
 ,Ordered Items To Be Billed,أمرت البنود التي يتعين صفت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,من المدى يجب أن يكون أقل من أن تتراوح
 DocType: Global Defaults,Global Defaults,افتراضيات العالمية
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,بداية السنة
 DocType: Purchase Invoice,Start date of current invoice's period,تاريخ بدء فترة الفاتورة الحالية
 DocType: Salary Slip,Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,خطأ القدرة على التخطيط
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,خطأ القدرة على التخطيط
 ,Trial Balance for Party,ميزان المراجعة للحزب
 DocType: Lead,Consultant,مستشار
 DocType: Salary Slip,Earnings,الكسب
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","سيتم إلحاق هذا إلى بند رمز للمتغير. على سبيل المثال، إذا اختصار الخاص بك هو ""SM""، ورمز البند هو ""T-SHIRT""، رمز العنصر المتغير سيكون ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,صافي الأجر (بالحروف) تكون مرئية بمجرد حفظ كشف راتب.
 DocType: Purchase Invoice,Is Return,هو العائد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,عودة / الخصم ملاحظة
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,عودة / الخصم ملاحظة
 DocType: Price List Country,Price List Country,قائمة الأسعار البلد
 DocType: Item,UOMs,وحدات القياس
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} أرقام متسلسلة صالحة للصنف {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,الرجاء إدخال رمز المدينة للحصول على رقم الدفعة
 DocType: Stock Settings,Default Item Group,المجموعة الافتراضية للمواد
 DocType: Employee Loan,Partially Disbursed,المصروفة جزئيا
-DocType: Grading Structure,Grading System Name,اسم نظام الدرجات
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,مزود قاعدة البيانات.
 DocType: Account,Balance Sheet,الميزانية العمومية
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",لم يتم تكوين طريقة الدفع. يرجى مراجعة، وإذا كان قد تم إعداد الحساب على طريقة الدفع أو على الملف الشخصي نقاط البيع.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',"مركز تكلفة بالنسبة للبند مع رمز المدينة """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",لم يتم تكوين طريقة الدفع. يرجى مراجعة، وإذا كان قد تم إعداد الحساب على طريقة الدفع أو على الملف الشخصي نقاط البيع.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,سيرسل تذكير لمندوب المبيعات الخاص بك في هذا التاريخ ليتصل بالعميل
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,لا يمكن إدخال البند نفسه عدة مرات.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حسابات أخرى يمكن أن يتم ضمن مجموعات، ولكن يمكن أن يتم مقالات ضد المجموعات غير-
@@ -1200,10 +1201,10 @@
 DocType: Course,Course Intro,مقدمة الدورة
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,الأسهم الدخول {0} خلق
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,الصف # {0} مرفوض الكمية لا يمكن إدخالها في شراء العودة
-,Purchase Order Items To Be Billed,أمر الشراء البنود لتكون وصفت
+,Purchase Order Items To Be Billed,تم اصدار فاتورة لأصناف امر الشراء
 DocType: Purchase Invoice Item,Net Rate,صافي معدل
-DocType: Purchase Invoice Item,Purchase Invoice Item,شراء السلعة الفاتورة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
+DocType: Purchase Invoice Item,Purchase Invoice Item,اصناف فاتورة المشتريات
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ويرسل الأوراق المالية ليدجر مقالات وGL مقالات لشراء شهادات مختارة
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,البند 1
 DocType: Holiday,Holiday,عطلة
 DocType: Support Settings,Close Issue After Days,العدد قريب بعد يوم
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,العمل المنجز
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,يرجى تحديد سمة واحدة على الأقل في الجدول سمات
 DocType: Announcement,All Students,جميع الطلاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,البند {0} يجب أن يكون البند غير الأسهم
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,عرض ليدجر
 DocType: Grading Scale,Intervals,فترات
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,اسبق
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",يوجد اسم مجموعة أصناف بنفس الاسم، الرجاء تغيير اسم الصنف أو إعادة تسمية المجموعة
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,رقم الطالب موبايل
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,بقية العالم
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,العنصر {0} لا يمكن أن يكون دفعة
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},دفع الراتب من {0} إلى {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},غير مخول لتحرير الحساب المجمد {0}
 DocType: Journal Entry,Get Outstanding Invoices,الحصول على فواتير معلقة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,اوامر البيع {0} غير صالحه
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,أوامر الشراء تساعدك على تخطيط والمتابعة على مشترياتك
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",عذراً، الشركات لا يمكن دمجها
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",إجمالي كمية العدد / نقل {0} في المواد طلب {1} \ لا يمكن أن يكون أكبر من الكمية المطلوبة {2} لالبند {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,صغير
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,المصاريف غير المباشرة
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,الصف {0}: الكمية إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,مزامنة البيانات الرئيسية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,مزامنة البيانات الرئيسية
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,المنتجات أو الخدمات الخاصة بك
 DocType: Mode of Payment,Mode of Payment,طريقة الدفع
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وينبغي أن يكون موقع صورة ملف العامة أو عنوان الموقع
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,فاتورة المواد
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها.
@@ -1312,20 +1313,20 @@
 DocType: Serial No,Serial No Details,تفاصيل المسلسل
 DocType: Purchase Invoice Item,Item Tax Rate,البند ضريبة
 DocType: Student Group Student,Group Roll Number,رقم لفة المجموعة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",ل{0}، فقط حسابات الائتمان يمكن ربط ضد دخول السحب أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",لـ {0} فقط إنشاء حسابات ممكن توصيله مقابل ادخال دائن اخر
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,يجب أن يكون مجموع كل الأوزان مهمة 1. الرجاء ضبط أوزان جميع المهام المشروع وفقا لذلك
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,تسليم مذكرة {0} لم تقدم
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.",يتم تحديد قاعدة الأسعار على أساس حقل 'تطبق في' ، التي يمكن أن تكون بند، مجموعة بنود او علامة التجارية.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",يتم تحديد قاعدة الأسعار على أساس حقل 'تطبق في' ، التي يمكن أن تكون بند، مجموعة بنود او علامة التجارية.
 DocType: Hub Settings,Seller Website,البائع موقع
 DocType: Item,ITEM-,بند-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},مركز الإنتاج للطلب هو {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},مركز الإنتاج للطلب هو {0}
 DocType: Appraisal Goal,Goal,الغاية
 DocType: Sales Invoice Item,Edit Description,تحرير الوصف
 ,Team Updates,فريق التحديثات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,ل مزود
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,ل مزود
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تحديد نوع الحساب يساعد في تحديد هذا الحساب في المعاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),المجموع الكلي (العملات شركة)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,إنشاء تنسيق طباعة
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,إدخال دفتر اليومية
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} البنود قيد الأستخدام
 DocType: Workstation,Workstation Name,اسم محطة العمل
-DocType: Grade Interval,Grade Code,كود الصف
+DocType: Grading Scale Interval,Grade Code,كود الصف
 DocType: POS Item Group,POS Item Group,POS البند المجموعة
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,أرسل دايجست:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} لا تنتمي إلى الصنف {1}
@@ -1357,14 +1358,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,خردوات
 DocType: Sales Order,Recurring Upto,المتكررة لغاية
 DocType: Attendance,HR Manager,مدير الموارد البشرية
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,الرجاء اختيار الشركة
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,الرجاء اختيار الشركة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتياز الإجازة
 DocType: Purchase Invoice,Supplier Invoice Date,المورد فاتورة التسجيل
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تحتاج إلى تمكين سلة التسوق
 DocType: Payment Entry,Writeoff,لا تصلح
 DocType: Appraisal Template Goal,Appraisal Template Goal,معيار نموذج التقييم
 DocType: Salary Component,Earning,الكسب
-DocType: Purchase Invoice,Party Account Currency,حزب حساب العملات
+DocType: Purchase Invoice,Party Account Currency,عملة حساب الطرف
 ,BOM Browser,BOM متصفح
 DocType: Purchase Taxes and Charges,Add or Deduct,إضافة أو خصم
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +80,Overlapping conditions found between:,الظروف المتداخلة وجدت بين:
@@ -1373,9 +1374,10 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,طعام
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,العمر مدى 3
 DocType: Maintenance Schedule Item,No of Visits,لا الزيارات
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,علامة إن حضور
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,علامة إن حضور
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},جدول الصيانة {0} موجود ضد {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,طالب انتساب
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},يجب أن تكون عملة الحساب الختامي {0}
+apps/erpnext/erpnext/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}
 DocType: Project,Start and End Dates,تواريخ البدء والانتهاء
 ,Delivered Items To Be Billed,وحدات تسليمها الى أن توصف
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,متوسط الصادرات اليومية
 DocType: POS Profile,Campaign,حملة
 DocType: Supplier,Name and Type,اسم ونوع
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"يجب أن تكون حالة  ""موافقة "" أو ""مرفوضة"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"يجب أن تكون حالة  ""موافقة "" أو ""مرفوضة"""
 DocType: Purchase Invoice,Contact Person,الشخص الذي يمكن الاتصال به
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' تاريخ البدء المتوقع ' لا يمكن أن يكون أكبر من ' تاريخ الانتهاء المتوقع '
 DocType: Course Scheduling Tool,Course End Date,تاريخ انتهاء المقرر
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,الشحن العنوان الاسم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,دليل الحسابات
 DocType: Material Request,Terms and Conditions Content,الشروط والأحكام المحتوى
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,لا يمكن أن يكون أكبر من 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,البند {0} ليس الأسهم الإغلاق
 DocType: Maintenance Visit,Unscheduled,غير المجدولة
 DocType: Employee,Owned,مالك
 DocType: Salary Detail,Depends on Leave Without Pay,يعتمد على إجازة بدون مرتب
 DocType: Pricing Rule,"Higher the number, higher the priority",الرقم الأعلى له أولوية أكبر
-,Purchase Invoice Trends,شراء اتجاهات الفاتورة
+,Purchase Invoice Trends,اتجهات فاتورة الشراء
 DocType: Employee,Better Prospects,آفاق أفضل
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",الصف # {0}: الدفعة {1} فقط {2} الكمية. يرجى تحديد دفعة أخرى توفر {3} الكمية أو تقسيم الصف إلى صفوف متعددة، لتسليم / إصدار من دفعات متعددة
 DocType: Vehicle,License Plate,لوحة معدنية
 DocType: Appraisal,Goals,الغايات
 DocType: Warranty Claim,Warranty / AMC Status,الضمان / AMC الحالة
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,الموظف لا يمكن أن يقدم تقريرا إلى نفسه.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",إذا تم تجميد الحساب، ويسمح للمستخدمين إدخالات مقيدة.
 DocType: Email Digest,Bank Balance,الرصيد المصرفي
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},القيد المحاسبي ل{0}: {1} يمكن إجراؤه بالعملة: {2} فقط
 DocType: Job Opening,"Job profile, qualifications required etc.",الملف الوظيفي ، المؤهلات المطلوبة الخ
 DocType: Journal Entry Account,Account Balance,رصيد حسابك
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,القاعدة الضريبية للمعاملات.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,تظهر P &amp; L أرصدة السنة المالية غير مغلق ل
 DocType: Shipping Rule,Shipping Account,حساب الشحن
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: الحساب {2} غير نشط
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,جعل أوامر البيع لمساعدتك على خطة العمل الخاصة بك وتسليم في الوقت المحدد
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,جعل أوامر البيع لمساعدتك على خطة العمل الخاصة بك وتسليم في الوقت المحدد
 DocType: Quality Inspection,Readings,قراءات
 DocType: Stock Entry,Total Additional Costs,مجموع التكاليف الإضافية
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,إلى القيمة
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,زلة التعبئة
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,زلة التعبئة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,مكتب للإيجار
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,إعدادات العبارة  SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,فشل الاستيراد !
@@ -1481,21 +1484,21 @@
 DocType: Quality Inspection,QI-,QI-
 DocType: Opportunity,With Items,مع الأصناف
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,In Qty,في الكمية
-DocType: Notification Control,Expense Claim Rejected,المطالبة حساب مرفوض
+DocType: Notification Control,Expense Claim Rejected,تم رفض طلب النفقات
 DocType: Item,Item Attribute,البند السمة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,حكومة
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,حساب النفقات {0} موجود بالفعل لسجل المركبة
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,طلب النفقات {0} موجود بالفعل لسجل المركبة
 apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,اسم المعهد
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,الرجاء إدخال سداد المبلغ
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,المتغيرات البند
 DocType: Company,Services,الخدمات
 DocType: HR Settings,Email Salary Slip to Employee,إرسال كشف الراتب للموظفين بالبريد الالكتروني
 DocType: Cost Center,Parent Cost Center,الأم تكلفة مركز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,اختر مزود ممكن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,اختر مزود ممكن
 DocType: Sales Invoice,Source,المصدر
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,مشاهدة مغلقة
 DocType: Leave Type,Is Leave Without Pay,إجازة بدون راتب
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,الأصول الفئة إلزامي للبند الأصول الثابتة
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,الأصول الفئة إلزامي للبند الأصول الثابتة
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,لا توجد في جدول الدفع السجلات
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},هذا {0} يتعارض مع {1} عن {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلاب HTML
@@ -1503,17 +1506,17 @@
 DocType: POS Profile,Apply Discount,تطبيق الخصم
 DocType: Employee External Work History,Total Experience,مجموع الخبرة
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,مشاريع مفتوحة
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,زلة التعبئة (ق ) إلغاء
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,تم إلغاء كشف/كشوف التعبئة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,تدفق النقد من الاستثمار
 DocType: Program Course,Program Course,دورة برنامج
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,الشحن و التخليص الرسوم
-DocType: Homepage,Company Tagline for website homepage,سطر الوصف شركة لموقعه الإلكتروني
+DocType: Homepage,Company Tagline for website homepage,توجية الشركة للصفحة الرئيسيه بالموقع الألكتروني
 DocType: Item Group,Item Group Name,البند اسم المجموعة
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,مأخوذ
 DocType: Student,Date of Leaving,تاريخ مغادرة
 DocType: Pricing Rule,For Price List,لائحة الأسعار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,البحث التنفيذي
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,إنشاء العروض
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,إنشاء العروض
 DocType: Maintenance Schedule,Schedules,جداول
 DocType: Purchase Invoice Item,Net Amount,صافي القيمة
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفاصيل لا
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,التسجيلات برنامج
 DocType: Sales Invoice Item,Brand Name,العلامة التجارية اسم
 DocType: Purchase Receipt,Transporter Details,تفاصيل نقل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,المخزن الافتراضي مطلوب للمادة المختارة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,المخزن الافتراضي مطلوب للمادة المختارة
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,صندوق
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,مزود الممكن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,مزود الممكن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,منظمة
 DocType: Budget,Monthly Distribution,التوزيع الشهري
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,قائمة المتلقي هو فارغ. يرجى إنشاء قائمة استقبال
@@ -1551,9 +1554,9 @@
 DocType: Sales Partner,Sales Partner Target,المبلغ المطلوب للمندوب
 DocType: Loan Type,Maximum Loan Amount,أعلى قيمة للقرض
 DocType: Pricing Rule,Pricing Rule,قاعدة التسعير
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},رقم لفة مكرر للطالب {0}
 DocType: Budget,Action if Annual Budget Exceeded,العمل إذا تجاوز الميزانية السنوية
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,طلب المادي لأمر الشراء
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,الخامات المطلوبه لأمر الشراء
 DocType: Shopping Cart Settings,Payment Success URL,رابط نجاح الدفع
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},لا يوجد عاد هذا البند {1} في {2} {3} الصف # {0}
 DocType: Purchase Receipt,PREC-,PREC-
@@ -1564,7 +1567,7 @@
 DocType: C-Form,III,الثالث
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,فتح البورصة الميزان
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} يجب أن تظهر مرة واحدة فقط
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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 +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},غير مسموح بتحويل اكثر {0} من {1} مقابل امر الشراء {2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},اجازات مخصصة بنجاح ل {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,لا توجد عناصر لحزمة
 DocType: Shipping Rule Condition,From Value,من القيمة
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,طريقة السداد
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",إذا تحققت، الصفحة الرئيسية ستكون المجموعة الافتراضية البند للموقع
 DocType: Quality Inspection Reading,Reading 4,قراءة 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM الافتراضي ل{0} لم يتم العثور على مشروع {1}
-apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,مطالبات لحساب الشركة.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM الافتراضي ل{0} لم يتم العثور على مشروع {1}
+apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,مستحقات لمصروفات الشركة
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",الطلاب في قلب النظام، إضافة كل ما تبذلونه من الطلاب
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},الصف # {0}: تاريخ التخليص {1} لا يمكن أن يكون قبل تاريخ شيكات {2}
 DocType: Company,Default Holiday List,قائمة العطل الافتراضية
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: من الوقت وإلى وقت {1} ومتداخلة مع {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,اليوم (أيام) التي تقدم بطلب للحصول على إجازة هي العطل.لا تحتاج إلى تقديم طلب للحصول الإجازة.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,إعادة إرسال البريد الإلكتروني الدفع
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,مهمة جديدة
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,جعل الاقتباس
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,جعل الاقتباس
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,تقارير أخرى
 DocType: Dependent Task,Dependent Task,العمل تعتمد
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},معامل تحويل وحدة القياس الافتراضية يجب أن تكون 1 في الصف {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},إجازة من نوع {0} لا يمكن أن تكون أطول من {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,محاولة التخطيط لعمليات لX أيام مقدما.
 DocType: HR Settings,Stop Birthday Reminders,ايقاف التذكير بأعياد الميلاد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},الرجاء تعيين الحساب الافتراضي لدفع الرواتب في الشركة {0}
 DocType: SMS Center,Receiver List,قائمة المرسل اليهم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,بحث البند
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,بحث البند
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,الكمية المستهلكة
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,صافي التغير في النقد
 DocType: Assessment Plan,Grading Scale,مقياس الدرجات
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,أنجزت بالفعل
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,وحدة القياس {0} تم إدخال أكثر من مرة واحدة في معامل التحويل الجدول
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,أنجزت بالفعل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},دفع طلب بالفعل {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تكلفة عناصر صدر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},لا يجب أن تكون الكمية أكثر من {0}
@@ -1617,7 +1620,7 @@
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{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 +229,Purchase Receipt {0} is not submitted,شراء استلام {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,استلام المشتريات {0} غير مرحل
 DocType: Company,Default Payable Account,حساب Paybal الافتراضي
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",إعدادات عربة التسوق مثل قواعد الشحن، وقائمة الأسعار الخ
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0} فوترت٪
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,جعل صرف الدخول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,الصف {0}: تقدم ضد مورد يجب بخصم
 DocType: Company,Default Values,قيم افتراضية
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{التردد} الخلاصه
 DocType: Expense Claim,Total Amount Reimbursed,مجموع المبلغ المسدد
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,وذلك بناء على سجلات ضد هذه السيارات. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},مقابل فاتورة المورد {0} بتاريخ {1}
 DocType: Customer,Default Price List,قائمة الأسعار الافتراضي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,سجل حركة الأصول {0} خُلق
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,سجل حركة الأصول {0} خُلق
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,لا يمكنك حذف السنة المالية {0}. تم تعيين السنة المالية {0} كما الافتراضي في إعدادات العالمية
 DocType: Journal Entry,Entry Type,نوع الدخول
 ,Customer Credit Balance,رصيد العميل
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,المشتريات
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,لا شيء من هذه البنود يكون أي تغيير في كمية أو قيمة.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,حقل إلزامي - البرنامج
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,مطالبة الضمان
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,مطالبة الضمان
 ,Lead Details,تفاصيل مبادرة بيع
 DocType: Salary Slip,Loan repayment,سداد القروض
 DocType: Purchase Invoice,End date of current invoice's period,تاريخ نهاية فترة الفاتورة الحالية
@@ -1673,12 +1677,11 @@
 DocType: Employee,Permanent Address,العنوان الدائم
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",المدفوعة مسبقا مقابل {0} {1} لا يمكن أن يكون أكبر \ من المجموع الكلي {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,الرجاء اختيار رمز العنصر
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,الرجاء اختيار رمز العنصر
 DocType: Student Sibling,Studying in Same Institute,الذين يدرسون في نفس المعهد
 DocType: Territory,Territory Manager,مدير إقليمي
 DocType: Packed Item,To Warehouse (Optional),إلى مستودع (اختياري)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
-DocType: Payment Entry,Paid Amount (Company Currency),المبلغ المدفوع (شركة العملات)
+DocType: Payment Entry,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,مزادات على الانترنت
@@ -1687,14 +1690,14 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,عرض في العربة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مصاريف التسويق
 ,Item Shortage Report,البند تقرير نقص
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","يذكر الوزن، \n يرجى ذكر ""الوزن UOM"" للغاية"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,طلب المواد المستخدمة لانشاء الحركة المخزنية
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,الاستهلاك المقبل التاريخ إلزامي للأصول جديدة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,الاستهلاك المقبل التاريخ إلزامي للأصول جديدة
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,مجموعة منفصلة بالطبع مقرها لكل دفعة
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,واحد وحدة من عنصر.
 DocType: Fee Category,Fee Category,رسوم الفئة
 ,Student Fee Collection,طالب رسوم مجموعة
-DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,جعل الدخول المحاسبة للحصول على كل حركة الأسهم
+DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,اكتب قيد يوميه لكل حركة مخزنية ؟
 DocType: Leave Allocation,Total Leaves Allocated,إجمالي الاجازات المخصصة
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},مستودع المطلوبة في صف لا {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,الرجاء إدخال ساري المفعول بداية السنة المالية وتواريخ نهاية
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,الوزن
 DocType: Packing Slip,PS-,ملحوظة:
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مطلوب مركز التكلفة ل &#39;الربح والخسارة &quot;حساب {2}. يرجى انشاء مركز التكلفة الافتراضية للشركة.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,يوجد مجموعة العملاء بنفس الاسم الرجاء تغيير اسم العميل أو إعادة تسمية مجموعة العملاء
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1721,9 +1723,9 @@
 DocType: Quotation,Order Type,نوع الطلب
 DocType: Purchase Invoice,Notification Email Address,عنوان البريد الإلكتروني الإخطار
 ,Item-wise Sales Register,مبيعات البند الحكيم سجل
-DocType: Asset,Gross Purchase Amount,الإجمالي المبلغ شراء
+DocType: Asset,Gross Purchase Amount,اجمالي مبلغ المشتريات
 DocType: Asset,Depreciation Method,طريقة الاستهلاك
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,غير متصل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,غير متصل
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,هل هذه الضريبة متضمنة في الاسعار الأساسية؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,إجمالي المستهدف
 DocType: Program Course,Required,مطلوب
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,المصالحة JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,عدد كبير جدا من الأعمدة. تصدير التقرير وطباعته باستخدام تطبيق جدول البيانات.
 DocType: Purchase Invoice Item,Batch No,رقم دفعة
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},تعذر العثور سعر الصرف ل{0} إلى {1} لتاريخ الرئيسي {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,السماح بعدة أوامر البيع ضد طلب شراء العميل
 DocType: Student Group Instructor,Student Group Instructor,مجموعة الطالب
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 رقم الجوال
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,رئيسي
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,مختلف
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,رئيسي
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,مختلف
 DocType: Naming Series,Set prefix for numbering series on your transactions,تحديد بادئة للترقيم المتسلسل على المعاملات الخاصة بك
 DocType: Employee Attendance Tool,Employees HTML,الموظفين HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM الافتراضي ({0}) يجب أن تكون نشطة لهذا البند أو قالبها
 DocType: Employee,Leave Encashed?,إجازات مصروفة نقداً؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصة من الحقل إلزامي
 DocType: Email Digest,Annual Expenses,المصروفات السنوية
 DocType: Item,Variants,المتغيرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,انشئ طلب شراء
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,قم بعمل امر الشراء
 DocType: SMS Center,Send To,أرسل إلى
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ليس هناك ما يكفي من توازن إجازة لإجازة نوع {0}
 DocType: Payment Reconciliation Payment,Allocated amount,المبلغ المخصص
@@ -1754,17 +1755,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,مطلوب العمل في و التقدم في معرض النماذج ثلاثية قبل إرسال
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,المتقدم للحصول على الوظيفة.
 DocType: Purchase Order Item,Warehouse and Reference,مستودع والمراجع
 DocType: Supplier,Statutory info and other general information about your Supplier,معلومات قانونية ومعلومات عامة أخرى عن بريدا
 DocType: Item,Serial Nos and Batches,الرقم التسلسلي ودفعات
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,قوة الطالب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه أي لا مثيل لها {1} دخول
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,مقابل قيد اليومية {0} ليس لديه أي لا مثيل لها {1} دخول
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تقييمات
 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: Grading Structure,Grading Intervals,فترات الدرجات
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,تفضل
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",لا يمكن overbill عن البند {0} في الصف {1} أكثر من {2}. للسماح على الفواتير، يرجى ضبط إعدادات في شراء
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,الرجاء تعيين مرشح بناء على البند أو مستودع
@@ -1772,21 +1772,22 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,الرجاء إنشاء حساب لهذا مستودع وربطه. لا يمكن القيام بذلك تلقائيا حساب مع اسم {0} موجود بالفعل
 DocType: Sales Order,To Deliver and Bill,لتسليم وبيل
 DocType: Student Group,Instructors,المدربين
-DocType: GL Entry,Credit Amount in Account Currency,مبلغ الدائن بعملة الحساب
+DocType: GL Entry,Credit Amount in Account Currency,إنشاء المبلغ في حساب العملة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} يجب أن تعتمد
 DocType: Authorization Control,Authorization Control,إذن التحكم
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},الصف # {0}: رفض مستودع إلزامي ضد رفض البند {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,دفع
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,إدارة طلباتك
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,دفعة
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,إدارة طلباتك
 DocType: Production Order Operation,Actual Time and Cost,الوقت الفعلي والتكلفة
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},طلب المواد من الحد الأقصى {0} يمكن إجراء القطعة ل {1} ضد ترتيب المبيعات {2}
 DocType: Employee,Salutation,تحية
 DocType: Course,Course Abbreviation,اختصار بالطبع
 DocType: Student Leave Application,Student Leave Application,طالب ترك التطبيق
 DocType: Item,Will also apply for variants,سوف تطبق أيضا على المتغيرات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",لا يمكن إلغاء الأصول، كما هو بالفعل {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},موظف {0} في نصف يوم في{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},عدد ساعات العمل الكلي يجب ألا يكون أكثر من العدد الأقصى لساعات العمل {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,في
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,حزمة الأصناف في وقت البيع.
 DocType: Quotation Item,Actual Qty,الكمية الفعلية
 DocType: Sales Invoice Item,References,المراجع
@@ -1796,7 +1797,7 @@
 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 +91,Associate,مساعد
 DocType: Asset Movement,Asset Movement,حركة الأصول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,سلة جديدة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,سلة جديدة
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,البند {0} ليس البند المتسلسلة
 DocType: SMS Center,Create Receiver List,إنشاء قائمة استقبال
 DocType: Vehicle,Wheels,عجلات
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,تعطيل إنشاء سجلات المرة ضد أوامر الإنتاج. لا يجوز تعقب عمليات ضد ترتيب الإنتاج
 DocType: Student,Student Mobile Number,طالب عدد موبايل
 DocType: Item,Has Variants,يحتوي على متغيرات
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},لقد حددت العناصر من {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,اسم التوزيع الشهري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,معرف الدفعة إلزامي
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,معرف الدفعة إلزامي
 DocType: Sales Person,Parent Sales Person,رجل المبيعات الرئيسي
 DocType: Purchase Invoice,Recurring Invoice,فاتورة المتكررة
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,إدارة المشاريع
@@ -1838,16 +1839,16 @@
 DocType: Budget,Fiscal Year,السنة المالية
 DocType: Vehicle Log,Fuel Price,أسعار الوقود
 DocType: Budget,Budget,ميزانية
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,يجب أن تكون ثابتة البند الأصول عنصر غير الأسهم.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,يجب أن تكون ثابتة البند الأصول عنصر غير الأسهم.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",الموازنة لا يمكن تحديدها مقابل {0}، لانها ليست حساب الإيرادات أوالمصروفات
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حقق
 DocType: Student Admission,Application Form Route,مسار إستمارة التقديم
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,إقليم / العملاء
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,إقليم / العملاء
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,على سبيل المثال 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ترك نوع {0} لا يمكن تخصيصها لأنها إجازة بدون راتب
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},يجب أن يكون المبلغ المخصص {1} أقل من أو يساوي الفاتورة المبلغ المستحق {2} الصف {0}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,وبعبارة تكون مرئية بمجرد حفظ فاتورة المبيعات.
-DocType: Item,Is Sales Item,هو المبيعات الإغلاق
+DocType: Item,Is Sales Item,صنف المبيعات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +21,Item Group Tree,شجرة مجموعة البند
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,البند {0} ليس الإعداد لل سيد رقم التسلسلي تاريخ المغادرة
 DocType: Maintenance Visit,Maintenance Time,وقت الصيانة
@@ -1862,15 +1863,15 @@
 ,Serial No Status,حالة رقم المسلسل
 DocType: Payment Entry Reference,Outstanding,معلقة
 ,Daily Timesheet Summary,ملخص سجل الدوام اليومي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","صف {0} لضبط {1} دورية، يجب أن يكون الفرق بين من وإلى تاريخ \
  أكبر من أو يساوي {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ويستند هذا على حركة المخزون. راجع {0} لمزيد من التفاصيل
 DocType: Pricing Rule,Selling,بيع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم ضد {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},مبلغ {0} {1} خصم ضد {2}
 DocType: Employee,Salary Information,معلومات عن الراتب
 DocType: Sales Person,Name and Employee ID,الاسم والرقم الوظيفي
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,بسبب التاريخ لا يمكن أن يكون قبل المشاركة في التسجيل
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,الرسوم والضرائب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,من فضلك ادخل تاريخ المرجعي
@@ -1881,15 +1882,15 @@
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,شجرة مجموعات البنود .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول
 DocType: Asset,Sold,تم البيع
-,Item-wise Purchase History,البند الحكيم تاريخ الشراء
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
+,Item-wise Purchase History,الحركة التاريخيه للمشتريات وفقا للصنف
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},الرجاء انقر على ' إنشاء الجدول ' لجلب رقم المسلسل أضاف القطعة ل {0}
 DocType: Account,Frozen,تجميد
 ,Open Production Orders,أوامر الانتاج المفتوحة
 DocType: Sales Invoice Payment,Base Amount (Company Currency),المبلغ الأساسي (عملة الشركة )
 DocType: Payment Reconciliation Payment,Reference Row,إشارة الصف
 DocType: Installation Note,Installation Time,تثبيت الزمن
 DocType: Sales Invoice,Accounting Details,تفاصيل المحاسبة
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,حذف جميع المعاملات لهذه الشركة
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,الاستثمارات
 DocType: Issue,Resolution Details,قرار تفاصيل
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,نقاش
 DocType: Payment Entry,Transaction ID,رقم المعاملات
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,يتم تصفية قواعد التسعير على أساس الكمية .
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},يرجى تحديد تاريخ الالتحاق بالموظف {0}
 DocType: Task,Total Billing Amount (via Time Sheet),المبلغ الكلي الفواتير (عبر ورقة الوقت)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,الإيرادات العملاء المكررين
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (موافق النفقات)
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) يجب أن يمتلك صلاحية (موافق النفقات)
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,زوج
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,حدد مكتب الإدارة والكمية للإنتاج
 DocType: Asset,Depreciation Schedule,جدول الاستهلاك
 DocType: Bank Reconciliation Detail,Against Account,ضد الحساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,يجب أن يكون تاريخ نصف يوم ما بين التاريخ والتاريخ
@@ -1935,22 +1936,23 @@
 DocType: Item,Has Batch No,ودفعة واحدة لا
 apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},الفواتير السنوية:  {0}
 DocType: Delivery Note,Excise Page Number,المكوس رقم الصفحة
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",شركة، من تاريخ وإلى تاريخ إلزامي
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","اجباري الشركة , من تاريخ و الي تاريخ"
 DocType: Asset,Purchase Date,تاريخ الشراء
 DocType: Employee,Personal Details,تفاصيل شخصية
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},الرجاء تعيين &quot;الأصول مركز الاستهلاك الكلفة&quot; في شركة {0}
 ,Maintenance Schedules,جداول الصيانة
 DocType: Task,Actual End Date (via Time Sheet),تاريخ الإنتهاء الفعلي (عبر ورقة الوقت)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مبلغ {0} {1} من {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},مبلغ {0} {1} من {2} {3}
 ,Quotation Trends,مجرى التسعيرات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},المجموعة البند لم يرد ذكرها في البند الرئيسي لمادة {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,يجب أن يكون الخصم لحساب حساب المقبوضات
 DocType: Shipping Rule Condition,Shipping Amount,مبلغ الشحن
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,في انتظار المبلغ
 DocType: Purchase Invoice Item,Conversion Factor,معامل التحويل
 DocType: Purchase Order,Delivered,تسليم
 ,Vehicle Expenses,مصاريف السيارة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
+DocType: Serial No,Invoice Details,تفاصيل الفاتورة
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},يجب أن تكون القيمة المتوقعة بعد العمر الإنتاجي أكبر من أو يساوي {0}
 DocType: Purchase Receipt,Vehicle Number,عدد المركبات
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,التاريخ الذي سيتم فاتورة المتكررة وقف
 DocType: Employee Loan,Loan Amount,مبلغ القرض
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,الجداول الزمنية
 DocType: HR Settings,HR Settings,إعدادات الموارد البشرية
 DocType: Salary Slip,net pay info,معلومات صافي الأجر
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,حساب المطالبة بانتظار الموافقة. فقط الموافق المصروفات يمكن تحديث الحالة.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,"اعتماد طلب النفقات معلق , فقط اعتماده ممكن تغير الحالة."
 DocType: Email Digest,New Expenses,مصاريف جديدة
 DocType: Purchase Invoice,Additional Discount Amount,مقدار الخصم الاضافي
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",الصف # {0}: يجب أن يكون العدد 1، والبند هو أصل ثابت. الرجاء استخدام صف منفصل عن الكمية متعددة.
 DocType: Leave Block List Allow,Leave Block List Allow,تفعيل قائمة الإجازات المحظورة
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,"الاسم المختصر لا يمكن أن يكون فارغاً أو ""مسافة"""
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,مجموعة لغير المجموعه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,الرياضة
 DocType: Loan Type,Loan Name,اسم قرض
@@ -1984,10 +1986,11 @@
 ,Customer Acquisition and Loyalty,اكتساب العملاء و الولاء
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,مستودع حيث كنت الحفاظ على المخزون من المواد رفضت
 DocType: Production Order,Skip Material Transfer,تخطي نقل المواد
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,تعذر العثور على سعر الصرف من {0} إلى {1} لتاريخ المفتاح {2}. يرجى إنشاء سجل صرف العملات يدويا
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,السنة المالية تنتهي في الخاص
 DocType: POS Profile,Price List,قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} هي السنة المالية الافتراضية الآن،  يرجى تحديث المتصفح ليصبح التغيير نافذ المفعول.
-apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,مطالبات حساب
+apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,طلب النفقات
 DocType: Issue,Support,الدعم
 ,BOM Search,BOM البحث
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),إغلاق (فتح + المجاميع)
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},معامل تحويل وحدة القياس مطلوب في الصف: {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من ترتيب المبيعات، مبيعات فاتورة أو إدخال دفتر اليومية
 DocType: Salary Component,Deduction,استقطاع
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,صف {0}: من الوقت وإلى وقت إلزامي.
 DocType: Stock Reconciliation Item,Amount Difference,مقدار الفرق
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},وأضاف البند سعر {0} في قائمة الأسعار {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,الرجاء إدخال رقم الموظف من رجل المبيعات هذا
 DocType: Territory,Classification of Customers by region,تصنيف العملاء حسب المنطقة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,يجب أن يكون الفرق المبلغ صفر
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,يجب أن يكون الفرق المبلغ صفر
 DocType: Project,Gross Margin,هامش الربح الإجمالي
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,من فضلك ادخل إنتاج السلعة الأولى
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محسوب التوازن بيان البنك
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,المستخدم معطل
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,تسعيرة
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,تسعيرة
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,مجموع الخصم
 ,Production Analytics,تحليلات إنتاج
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},تحذير: شهادة SSL غير صالحة في المرفق {0}
 DocType: Student Admission,Eligibility,جدارة
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",يؤدي مساعدتك في الحصول على العمل، إضافة كافة جهات الاتصال الخاصة بك وأكثر من ذلك كما يؤدي بك
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",يؤدي مساعدتك في الحصول على العمل، إضافة كافة جهات الاتصال الخاصة بك وأكثر من ذلك كما يؤدي بك
 DocType: Production Order Operation,Actual Operation Time,الفعلي وقت التشغيل
 DocType: Authorization Rule,Applicable To (User),تنطبق على (المستخدم)
 DocType: Purchase Taxes and Charges,Deduct,خصم
@@ -2038,31 +2041,31 @@
 DocType: Guardian,Work Address,عنوان العمل
 DocType: Appraisal,Calculate Total Score,حساب النتيجة الإجمالية
 DocType: Request for Quotation,Manufacturing Manager,مدير التصنيع
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},رقم المسلسل {0} هو تحت الضمان لغاية {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},رقم المسلسل {0} هو تحت الضمان لغاية {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ملاحظة تقسيم التوصيل في حزم.
 apps/erpnext/erpnext/hooks.py +87,Shipments,شحنات
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,يجب أن يكون رصيد الحساب ({0}) ل {1} وقيمة المخزون ({2}) للمستودع {3} هو نفسه
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,رصيد حساب GL ({0}) ل {1} وقيمة المخزون ({2}) للمستودع {3} يجب ان يكونوا متساويين
 DocType: Payment Entry,Total Allocated Amount (Company Currency),إجمالي المبلغ المخصص (شركة العملات)
 DocType: Purchase Order Item,To be delivered to customer,ليتم تسليمها إلى العملاء
 DocType: BOM,Scrap Material Cost,التكلفة الخردة المواد
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,رقم المسلسل {0} لا تنتمي إلى أي مستودع
-DocType: Purchase Invoice,In Words (Company Currency),في كلمات (عملة الشركة)
+DocType: Purchase Invoice,In Words (Company Currency),في الأحرف ( عملة الشركة )
 DocType: Asset,Supplier,المورد
 DocType: C-Form,Quarter,ربع
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,المصروفات المتنوعة
 DocType: Global Defaults,Default Company,الشركة الافتراضية
-apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,حساب أو حساب الفرق إلزامي القطعة ل {0} لأنها آثار قيمة المخزون الإجمالية
+apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,اجباري حساب النفقات او الفروق للصنف {0} تأثير شامل لقيمة المخزون
 DocType: Payment Request,PR,العلاقات العامة
 DocType: Cheque Print Template,Bank Name,اسم البنك
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-أعلى
-DocType: Employee Loan,Employee Loan Account,حساب القرض موظف
+DocType: Employee Loan,Employee Loan Account,حساب GL قرض الموظف
 DocType: Leave Application,Total Leave Days,مجموع أيام الإجازة
 DocType: Email Digest,Note: Email will not be sent to disabled users,ملاحظة: لن يتم إرسالها إلى البريد الإلكتروني للمستخدمين ذوي الاحتياجات الخاصة
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,عدد التفاعل
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,حدد الشركة ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,حدد الشركة ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,اتركها فارغه اذا كنت تريد تطبيقها لجميع الأقسام
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",أنواع التوظيف (دائم أو عقد او متدرب الخ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} إلزامي للصنف {1}
 DocType: Process Payroll,Fortnightly,مرة كل اسبوعين
 DocType: Currency Exchange,From Currency,من العملات
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",يرجى تحديد المبلغ المخصص، نوع الفاتورة ورقم الفاتورة في أتلست صف واحد
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),معدل (عملة الشركة)
 DocType: Student Guardian,Others,آخرون
 DocType: Payment Entry,Unallocated Amount,المبلغ غير المخصصة
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,لا يمكن العثور على مطابقة البند. الرجاء تحديد قيمة أخرى ل{0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,لا مزيد من التحديثات
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي "" ل لصف الأول"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,طفل البند لا ينبغي أن يكون حزمة المنتج. الرجاء إزالة البند `{0}` وحفظ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,مصرفي
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,إضافة الجداول الزمنية
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,إضافة الجداول الزمنية
 DocType: Vehicle Service,Service Item,خدمة البند
 DocType: Bank Guarantee,Bank Guarantee,ضمان بنكي
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,الرجاء انقر على ' إنشاء الجدول ' للحصول على الجدول الزمني
@@ -2095,13 +2098,14 @@
 apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,جرد المتسلسلة
 DocType: Employee Loan,Account Info,معلومات الحساب
 DocType: Activity Type,Default Billing Rate,افتراضي الفواتير أسعار
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} تم إنشاء مجموعات الطلاب.
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} تم إنشاء مجموعات الطالب.
 DocType: Sales Invoice,Total Billing Amount,المبلغ الكلي الفواتير
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,يجب أن يكون هناك حساب البريد الإلكتروني الافتراضي واردة لهذا العمل. يرجى إعداد حساب بريد إلكتروني واردة الافتراضي (POP / IMAP) وحاول مرة أخرى.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,حساب المستحق
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},الصف # {0}: الأصول {1} هو بالفعل {2}
 DocType: Quotation Item,Stock Balance,رصيد المخزون
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ترتيب مبيعات لدفع
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,يرجى تعيين سلسلة التسمية ل {0} عبر الإعداد&gt; إعدادات&gt; تسمية السلسلة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,المدير التنفيذي
 DocType: Expense Claim Detail,Expense Claim Detail,تفاصيل  المطالبة بالنفقات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,يرجى تحديد الحساب الصحيح
@@ -2121,19 +2125,19 @@
 DocType: Employee,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.",إذا قمت بإنشاء قالب قياسي في قالب الضرائب على المبيعات والرسوم، اختر واحدا وانقر على الزر أدناه.
-DocType: BOM Scrap Item,Basic Amount (Company Currency),المبلغ الأساسي (شركة العملات)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),المبلغ الأساسي ( عملة الشركة )
 DocType: Student,Guardians,أولياء الأمور
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,لن تظهر الأسعار إذا لم يتم تعيين قائمة الأسعار
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,يرجى تحديد بلد لهذا الشحن القاعدة أو تحقق من جميع أنحاء العالم الشحن
 DocType: Stock Entry,Total Incoming Value,إجمالي القيمة الواردة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,مطلوب الخصم ل
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,شراء قائمة الأسعار
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,مطلوب الخصم ل
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",الجداول الزمنية تساعد على الحفاظ على المسار من الوقت والتكلفة وإعداد الفواتير للنشاطات الذي قام به فريقك
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قائمة اسعار المشتريات
 DocType: Offer Letter Term,Offer Term,عرض عمل
 DocType: Quality Inspection,Quality Manager,مدير الجودة
 DocType: Job Applicant,Job Opening,وظيفة شاغرة
 DocType: Payment Reconciliation,Payment Reconciliation,دفع المصالحة
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,يرجى تحديد اسم الشخص المكلف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تكنولوجيا
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},عدد غير مدفوع: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM موقع عملية
@@ -2144,10 +2148,10 @@
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,بحث منتوج
 DocType: Timesheet Detail,To Time,إلى وقت
 DocType: Authorization Rule,Approving Role (above authorized value),الموافقة دور (أعلى قيمة أذن)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,حساب دائن الى يجب أن يكون من حسابات المدفوعات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,لإنشاء الحساب يجب ان يكون دائنون / مدفوعات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,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 +148,"For {0}, only debit accounts can be linked against another credit entry",ل{0}، فقط حسابات الخصم يمكن ربط ضد دخول ائتمان أخرى
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",لـ {0} فقط إنشاء حسابات ممكن توصيله مقابل ادخال مدين اخر
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,قائمة الأسعار {0} تم تعطيل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},صف {0}: اكتمال الكمية لا يمكن أن يكون أكثر من {1} لتشغيل {2}
 DocType: Manufacturing Settings,Allow Overtime,تسمح العمل الإضافي
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,فقد السبب
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,عنوان جديد
 DocType: Quality Inspection,Sample Size,حجم العينة
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,كل الأصناف قد تم فوترتها من قبل
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,الرجاء إدخال الوثيقة إيصال
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مراكز تكلفة إضافية يمكن أن تكون ضمن مجموعات ولكن يمكن أن تكون إدخالات ضد المجموعات غير-
 DocType: Project,External,خارجي
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,المستخدمين والأذونات
 DocType: Vehicle Log,VLOG.,مدونة فيديو.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},أوامر إنتاج المنشأة: {0}
 DocType: Branch,Branch,فرع
 DocType: Guardian,Mobile Number,رقم الهاتف المحمول
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,الطباعة و العلامات التجارية
 DocType: Bin,Actual Quantity,الكمية الفعلية
 DocType: Shipping Rule,example: Next Day Shipping,مثال:شحن اليوم التالي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,المسلسل لا {0} لم يتم العثور
 DocType: Scheduling Tool,Student Batch,دفعة طالب
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,العملاء
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,جعل الطلاب
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,جعل الطلاب
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}
 DocType: Leave Block List Date,Block Date,تاريخ الحظر
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,قدم الآن
@@ -2197,10 +2201,11 @@
 DocType: SMS Log,Sender Name,اسم المرسل
 DocType: POS Profile,[Select],[اختر ]
 DocType: SMS Log,Sent To,يرسل الى
-DocType: Payment Request,Make Sales Invoice,أنشئ فاتورة مبيعات
+DocType: Payment Request,Make Sales Invoice,انشاء فاتورة المبيعات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,برامج
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,التالي اتصل بنا التسجيل لا يمكن أن يكون في الماضي
 DocType: Company,For Reference Only.,للاشارة فقط.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,حدد الدفعة رقم
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلة {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,المبلغ مقدما
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,القضية رقم لا يمكن أن يكون 0
 DocType: Item,Show a slideshow at the top of the page,تظهر الشرائح في أعلى الصفحة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,مخازن
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,مخازن
 DocType: Serial No,Delivery Time,وقت التسليم
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,العمر بناءا على
 DocType: Item,End of Life,نهاية الحياة
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,إعادة تسمية أداة
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,تحديث التكلفة
 DocType: Item Reorder,Item Reorder,البند إعادة ترتيب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,عرض كشف الراتب
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,نقل المواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,عرض كشف الراتب
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,نقل المواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",تحديد العمليات ، وتكلفة التشغيل وإعطاء عملية فريدة من نوعها لا لل عمليات الخاصة بك.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,حساب كمية حدد التغيير
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,الرجاء تعيين المتكررة بعد إنقاذ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,حساب كمية حدد التغيير
 DocType: Purchase Invoice,Price List Currency,قائمة الأسعار العملات
 DocType: Naming Series,User must always select,يجب دائما مستخدم تحديد
 DocType: Stock Settings,Allow Negative Stock,السماح بالقيم السالبة للمخزون
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,حساب الميزانية
 DocType: Quality Inspection,Verified By,التحقق من
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",لا يمكن تغيير العملة الافتراضية الشركة ، وذلك لأن هناك معاملات القائمة. يجب أن يتم إلغاء المعاملات لتغيير العملة الافتراضية.
-DocType: Grade Interval,Grade Description,الصف الوصف
+DocType: Grading Scale Interval,Grade Description,الصف الوصف
 DocType: Stock Entry,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,إنشاء كشف الرواتب
@@ -2253,7 +2258,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} فوترت بشكل كامل
 DocType: Training Event,End Time,وقت الانتهاء
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,هيكل الراتب نشط {0} تم العثور عليها ل موظف {1} للتواريخ معينة
-DocType: Payment Entry,Payment Deductions or Loss,الخصومات الدفع أو الخسارة
+DocType: Payment Entry,Payment Deductions or Loss,خصومات الدفع أو الخسارة
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,شروط العقد القياسية للمبيعات أو للمشتريات .
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,المجموعة بواسطة قسيمة
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,خط أنابيب المبيعات
@@ -2263,7 +2268,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},الرجاء تحديد BOM لعنصر في الصف {0}
 apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},محدد BOM {0} غير موجود القطعة ل{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,{0} يجب أن يتم إلغاء جدول الصيانة قبل إلغاء هذا الأمر المبيعات
-DocType: Notification Control,Expense Claim Approved,المطالبة حساب المعتمدة
+DocType: Notification Control,Expense Claim Approved,اعتمد طلب النفقات
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,كشف راتب الموظف {0} تم إنشاؤه مسبقا لهذه الفترة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,الأدوية
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,تكلفة البنود التي تم شراؤها
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,الحضور إلى تاريخ
 DocType: Warranty Claim,Raised By,التي أثارها
 DocType: Payment Gateway Account,Payment Account,حساب الدفع
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,يرجى تحديد الشركة للمضي قدما
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,صافي التغير في حسابات المقبوضات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,التعويضية
 DocType: Offer Letter,Accepted,مقبول
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,من فضلك تأكد من حقا تريد حذف جميع المعاملات لهذه الشركة. ستبقى البيانات الرئيسية الخاصة بك كما هو. لا يمكن التراجع عن هذا الإجراء.
 DocType: Room,Room Number,رقم الغرفة
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},مرجع غير صالح {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) لا يمكن أن تتخطي الكمية المخططة {2} في أمر الانتاج {3}
 DocType: Shipping Rule,Shipping Rule Label,ملصق قاعدة الشحن
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,المنتدى المستعمل
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,المواد الخام لا يمكن أن يكون فارغا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,خيارات مجلة الدخول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",تعذر تحديث المخزون، فاتورة تحتوي انخفاض الشحن البند.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,خيارات مجلة الدخول
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,لا يمكنك تغيير المعدل إذا BOM اشير اليها مقابل أي بند
 DocType: Employee,Previous Work Experience,خبرة العمل السابقة
 DocType: Stock Entry,For Quantity,لالكمية
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,1 الشروط والأحكام
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,اسم المعهد الذي كنت تقوم بإعداد هذا النظام.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",موقوف - فيما عدا الدور الموضح بأسفل / لا يمكن لأحد عمل حركات محاسبية حتى هذا التاريخ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,الرجاء حفظ المستند قبل إنشاء جدول الصيانة
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,الرجاء حفظ المستند قبل إنشاء جدول الصيانة
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,حالة المشروع
 DocType: UOM,Check this to disallow fractions. (for Nos),الاختيار هذه لكسور عدم السماح بها. (لNOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,تم إنشاء أوامر الإنتاج التالية:
@@ -2324,7 +2329,7 @@
 DocType: Supplier Quotation,Opportunity,فرصة
 ,Completed Production Orders,أوامر الإنتاج المنتهية
 DocType: Operation,Default Workstation,محطة العمل الافتراضية
-DocType: Notification Control,Expense Claim Approved Message,المطالبة حساب المعتمدة رسالة
+DocType: Notification Control,Expense Claim Approved Message,رسالة اعتماد طلب النفقات
 DocType: Payment Entry,Deductions or Loss,الخصومات أو الخسارة
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} مغلقة
 DocType: Email Digest,How frequently?,كيف كثير من الأحيان؟
@@ -2334,9 +2339,9 @@
 ,Employees working on a holiday,الموظفون يعملون في يوم العطلة
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,حدد الحاضر
 DocType: Project,% Complete Method,الطريقة الكاملة٪
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},صيانة تاريخ بداية لا يمكن أن يكون قبل تاريخ التسليم لل رقم المسلسل {0}
 DocType: Production Order,Actual End Date,تاريخ الإنتهاء الفعلي
-DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل (شركة العملات)
+DocType: BOM,Operating Cost (Company Currency),تكاليف التشغيل ( بعملة الشركة )
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),تنطبق على (الدور)
 DocType: Stock Entry,Purpose,غرض
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,إجازة بدون راتب لا تتطابق مع سجلات نماذج الإجازة الموافق عليها
 DocType: Campaign,Campaign-.####,حملة # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,خطوات القادمة
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,يرجى تزويد البنود المحددة بأفضل الأسعار الممكنة
 DocType: Selling Settings,Auto close Opportunity after 15 days,السيارات فرصة قريبة بعد 15 يوما
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,نهاية السنة
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,كوت / ليد٪
@@ -2407,8 +2412,8 @@
 DocType: Homepage,Homepage,الصفحة الرئيسية
 DocType: Purchase Receipt Item,Recd Quantity,Recd الكمية
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},السجلات رسوم المنشأة - {0}
-DocType: Asset Category Account,Asset Category Account,حساب الأصول الفئة
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
+DocType: Asset Category Account,Asset Category Account,حساب فئة الأصل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},لا يمكن أن تنتج أكثر تفاصيل {0} من المبيعات كمية الطلب {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,الحركة المخزنية {0} غير مسجلة
 DocType: Payment Reconciliation,Bank / Cash Account,البنك حساب / النقدية
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,التالي اتصل بنا عن طريق لا يمكن أن يكون نفس عنوان البريد الإلكتروني الرصاص
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,إزالة التاريخ لم يرد ذكرها
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,الإنتاج
 DocType: Guardian,Occupation,الاحتلال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,الصف {0} : يجب أن يكون تاريخ بدء قبل تاريخ الانتهاء
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),إجمالي (الكمية)
 DocType: Sales Invoice,This Document,هذا المستند
 DocType: Installation Note Item,Installed Qty,الكميات الثابتة
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,أبلغ عن مشكلة
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,مصاريف فائدة
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 وفوق
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: إدخال دفتر اليومية {1} لا يكن لديك حساب {2} أو بالفعل يضاهي ضد قسيمة أخرى
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,الصف # {0}: إدخال دفتر اليومية {1} لا يكن لديك حساب {2} أو بالفعل يضاهي ضد قسيمة أخرى
 DocType: Buying Settings,Default Buying Price List,قائمة اسعار الشراء الافتراضية
 DocType: Process Payroll,Salary Slip Based on Timesheet,كشف الرواتب بناء على سجل التوقيت
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,لا يوجد موظف للمعايير المحددة أعلاه أو كشف راتب تم إنشاؤها مسبقا
 DocType: Notification Control,Sales Order Message,رسالة اوامر البيع
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تعيين القيم الافتراضية مثل الشركة، والعملة، والسنة المالية الحالية، وما إلى ذلك.
 DocType: Payment Entry,Payment Type,الدفع نوع
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,الرجاء تحديد دفعة للعنصر {0}. تعذر العثور على دفعة واحدة تستوفي هذا المطلب
 DocType: Process Payroll,Select Employees,حدد الموظفين
 DocType: Opportunity,Potential Sales Deal,المبيعات المحتملة صفقة
 DocType: Payment Entry,Cheque/Reference Date,تاريخ الصك / السند المرجع
@@ -2467,10 +2473,10 @@
 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 +27,Global POS Profile {0} already created for company {1},الملف POS العالمي {0} تم إنشاؤها مسبقا لشركة {1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},الصورة الشامه لنقاط البيع {0}  تم انشأها من قبل للشركة {1}
 DocType: Purchase Order,Ref SQ,المرجع SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,استبدال السلعة / BOM في جميع BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,يجب تقديم وثيقة استلام
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,يجب تقديم وثيقة استلام
 DocType: Purchase Invoice Item,Received Qty,تلقى الكمية
 DocType: Stock Entry Detail,Serial No / Batch,رقم المسلسل / الدفعة
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,لا المدفوع ويتم تسليم
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,لا أوراق الزمن
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,ترك نوع {0} لا يمكن إعادة توجيهها ترحيل
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',لم يتم إنشاء الجدول الصيانة ل كافة العناصر. الرجاء انقر على ' إنشاء الجدول '
 ,To Produce,لإنتاج
 apps/erpnext/erpnext/config/hr.py +93,Payroll,دفع الرواتب
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لصف {0} في {1}. لتشمل {2} في سعر البند، {3} يجب أيضا أن يدرج الصفوف
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,جعل العضو
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,جعل العضو
 DocType: Packing Slip,Identification of the package for the delivery (for print),تحديد حزمة لتسليم (للطباعة)
 DocType: Bin,Reserved Quantity,الكمية المحجوزة
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,الرجاء إدخال عنوان بريد إلكتروني صالح
@@ -2495,34 +2501,35 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,لا يجب أن يكون قالب تعطيل القالب الافتراضي
 DocType: Account,Income Account,دخل الحساب
 DocType: Payment Request,Amount in customer's currency,المبلغ بعملة العميل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,تسليم
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,تسليم
 DocType: Stock Reconciliation Item,Current Qty,الكمية الحالية
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",انظر &quot;نسبة المواد على أساس&quot; التكلفة في القسم
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,السابق
 DocType: Appraisal Goal,Key Responsibility Area,معيار التقييم
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",دفعات طالب تساعدك على تتبع الحضور، وتقييمات والرسوم للطلاب
 DocType: Payment Entry,Total Allocated Amount,إجمالي المبلغ المخصص
 DocType: Item Reorder,Material Request Type,طلب نوع المواد
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural إدخال دفتر اليومية للرواتب من {0} إلى {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",التخزين المحلي هو الكامل، لم ينقذ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",التخزين المحلي هو الكامل، لم ينقذ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,الصف {0}: معامل تحويل وحدة القياس إلزامي
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,المرجع
 DocType: Budget,Cost Center,مركز التكلفة
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,سند #
-DocType: Notification Control,Purchase Order Message,رسالة طلب شراء
+DocType: Notification Control,Purchase Order Message,رسالة امر الشراء
 DocType: Tax Rule,Shipping Country,دولة الشحن
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,إخفاء المعرف الضريبي العملاء من المعاملات المبيعات
 DocType: Upload Attendance,Upload HTML,رفع HTML
 DocType: Employee,Relieving Date,تاريخ المغادرة
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قاعدة الاسعار تم تكوينها لتستبدل قوائم الاسعار / عرف نسبة الخصم  بناء على معيير معينة
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قاعدة الاسعار تم تكوينها لتستبدل قوائم الاسعار / عرف نسبة الخصم  بناء على معيير معينة
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,لا يمكن إلا أن تتغير مستودع عبر الحركات المخزنية/ التوصيل ملاحظة / شراء الإيصال
 DocType: Employee Education,Class / Percentage,الفئة / النسبة المئوية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,رئيس التسويق والمبيعات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","إذا تم اختيار قاعدة التسعير  ل 'الأسعار'، فإنه سيتم الكتابة فوق قائمة الأسعار. سعر قاعدة التسعير  هو السعر النهائي، لذلك يجب تطبيق أي خصم آخر. وبالتالي، في المعاملات مثل ترتيب المبيعات، طلب شراء غيرها، وسيتم جلبها في الحقل 'تقييم'، بدلا من الحقل ""قائمة الأسعار ""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","إذا تم اختيار قاعدة التسعير  ل 'الأسعار'، فإنه سيتم الكتابة فوق قائمة الأسعار. سعر قاعدة التسعير  هو السعر النهائي، لذلك يجب تطبيق أي خصم آخر. وبالتالي، في المعاملات مثل ترتيب المبيعات، طلب شراء غيرها، وسيتم جلبها في الحقل 'تقييم'، بدلا من الحقل ""قائمة الأسعار ""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,المسار يؤدي حسب نوع الصناعة .
 DocType: Item Supplier,Item Supplier,البند مزود
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,الرجاء إدخال رمز المدينة للحصول على دفعة لا
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},يرجى تحديد قيمة ل {0} {1} quotation_to
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,جميع العناوين.
 DocType: Company,Stock Settings,إعدادات المخزون
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",دمج غير ممكن إلا إذا الخصائص التالية هي نفسها في كل السجلات. هي المجموعة، نوع الجذر، شركة
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"سيتم إرسال البريد الإلكتروني حول الحدث إلى الموظفين مع وضع حالة ""فتح"";"
 DocType: Task,Depends on Tasks,يعتمد على المهام
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,إدارة مجموعة العملاء شجرة .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,يمكن عرض المرفقات بدون تمكين سلة التسوق
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,اسم مركز تكلفة جديد
 DocType: Leave Control Panel,Leave Control Panel,لوحة تحكم الأجازات
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,الخصم ل
 DocType: Delivery Note,Required only for sample item.,المطلوب فقط لمادة العينة.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,الكمية الفعلية بعد العملية
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,المورد&gt; المورد نوع
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},لا قسيمة الراتب وجدت بين {0} و {1}
-,Pending SO Items For Purchase Request,العناصر المعلقة وذلك لطلب الشراء
+,Pending SO Items For Purchase Request,اصناف كتيرة معلقة  لطلب الشراء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,قبول الطلاب
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} معطل {1}
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} معطل {1}
 DocType: Supplier,Billing Currency,الفواتير العملات
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,كبير جدا
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,الصفحة الرئيسية المنتج المميز
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,جميع المجموعات التقييم
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,الجديد اسم المخزن
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),إجمالي {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),إجمالي {0} ({1})
 DocType: C-Form Invoice Detail,Territory,إقليم
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,يرجى ذكر أي من الزيارات المطلوبة
 DocType: Stock Settings,Default Valuation Method,أسلوب التقييم الافتراضي
 DocType: Vehicle Log,Fuel Qty,الوقود الكمية
 DocType: Production Order Operation,Planned Start Time,المخططة بداية
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,قائمة الأسعار ماستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,جميع معاملات البيع يمكن ان تكون مشارة لعدة ** موظفين مبيعات** بحيث يمكنك تعيين و مراقبة اهداف البيع المحددة
 ,S.O. No.,S.O. رقم
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},يرجى إنشاء العملاء من الرصاص {0}
 DocType: Price List,Applicable for Countries,ينطبق على البلدان
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"يمكن فقط الموافقة علي طلب ايجازة في الحالة ""مقبولة"" و ""مرفوض"""
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},طالب اسم المجموعة هو إلزامي في الصف {0}
@@ -2622,15 +2629,15 @@
  1. معالجة والاتصال من الشركة الخاصة بك."
 DocType: Attendance,Leave Type,نوع الاجازة
 DocType: Purchase Invoice,Supplier Invoice Details,المورد تفاصيل الفاتورة
-apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"حساب / حساب الفرق ({0}) يجب أن يكون الربح أو الخسارة ""حساب"
+apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر
 DocType: Project,Copied From,تم نسخها من
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},اسم خطأ : {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,نقص
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} غير مترابط مع {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} غير مترابط مع {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,الحضور للموظف {0} تم وضع علامة بالفعل
 DocType: Packing Slip,If more than one package of the same type (for print),إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)
 ,Salary Register,راتب التسجيل
-DocType: Warehouse,Parent Warehouse,مستودع الوالدين
+DocType: Warehouse,Parent Warehouse,المستودع الأصل
 DocType: C-Form Invoice Detail,Net Total,مجموع صافي
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,تحديد أنواع القروض المختلفة
 DocType: Bin,FCFS Rate,FCFS قيم
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,استخدم لسلة التسوق
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},قيمة {0} لسمة {1} غير موجود في قائمة صحيحة البند السمة قيم البند {2}
 DocType: BOM Item,Scrap %,الغاء٪
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",وسيتم توزيع تستند رسوم متناسب على الكمية البند أو كمية، حسب اختيارك
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",وسيتم توزيع تستند رسوم متناسب على الكمية البند أو كمية، حسب اختيارك
 DocType: Maintenance Visit,Purposes,أغراض
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,على الأقل يجب إدخال عنصر واحد بقيمة سالبة في الوثيقة العوائد
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملية {0} أطول من أي ساعات العمل المتاحة في محطة {1}، وتحطيم العملية في عمليات متعددة
@@ -2661,21 +2668,21 @@
 DocType: Course,Course Code,رمز المقرر
 apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},التفتيش الجودة المطلوبة القطعة ل {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,المعدل الذي يتم تحويل العملة إلى عملة العميل قاعدة الشركة
-DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي معدل (شركة العملات)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),صافي السعر ( بعملة الشركة )
 DocType: Salary Detail,Condition and Formula Help,مساعدة باستخدام الصيغ و الشروط
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,إدارة شجرة الإقليم.
 DocType: Journal Entry Account,Sales Invoice,فاتورة مبيعات
 DocType: Journal Entry Account,Party Balance,ميزان الحزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,الرجاء حدد تطبيق خصم على
 DocType: Company,Default Receivable Account,حساب المقبوضات الافتراضي
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,أنشئ قيد محاسبي إجمالي للرواتب المدفوعة وفقاً للمعايير المحددة أعلاه
 DocType: Stock Entry,Material Transfer for Manufacture,نقل المواد لتصنيع
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,نسبة خصم يمكن تطبيقها إما ضد قائمة الأسعار أو لجميع قائمة الأسعار.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,نسبة خصم يمكن تطبيقها إما ضد قائمة الأسعار أو لجميع قائمة الأسعار.
 DocType: Purchase Invoice,Half-yearly,نصف سنوية
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,القيود المحاسبية لمخزون
 DocType: Vehicle Service,Engine Oil,زيت المحرك
 DocType: Sales Invoice,Sales Team1,مبيعات Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,البند {0} غير موجود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,البند {0} غير موجود
 DocType: Sales Invoice,Customer Address,عنوان العميل
 DocType: Employee Loan,Loan Details,تفاصيل القرض
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,صف {0}: يجب أن تكتمل الكمية أكبر من الصفر.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,نوع الجذر
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},الصف # {0}: لا يمكن إرجاع أكثر من {1} للالبند {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,مؤامرة
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,مؤامرة
 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}
 DocType: Cheque Print Template,Primary Settings,الإعدادات الأولية
 DocType: Purchase Invoice,Select Supplier Address,حدد مزود العناوين
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,إضافة موظفين
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,إضافة موظفين
 DocType: Purchase Invoice Item,Quality Inspection,فحص الجودة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,اضافية الصغيرة
 DocType: Company,Standard Template,قالب قياسي
 DocType: Training Event,Theory,نظرية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,الحساب {0} مجمّد
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,كيان قانوني / الفرعية مع مخطط مستقل للحسابات تابعة للمنظمة.
 DocType: Payment Request,Mute Email,كتم البريد الإلكتروني
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",الغذاء و المشروبات و التبغ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},ان تجعل دفع فواتير فقط ضد {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,معدل العمولة لا يمكن أن يكون أكبر من 100
 DocType: Stock Entry,Subcontract,قام بمقاولة فرعية
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,الرجاء إدخال {0} أولا
@@ -2711,7 +2718,7 @@
 DocType: Production Order Operation,Estimated Time and Cost,الوقت المقدر والتكلفة
 DocType: Bin,Bin,صندوق
 DocType: SMS Log,No of Sent SMS,رقم رسائل SMS  التي أرسلت
-DocType: Account,Expense Account,حساب المصروفات
+DocType: Account,Expense Account,حساب النفقات
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,البرمجيات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,اللون
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,معايير خطة تقييم
@@ -2734,12 +2741,12 @@
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,الحفاظ على ساعات الفواتير وساعات العمل نفسه على الجدول الزمني
 DocType: Maintenance Visit Purpose,Against Document No,مقابل المستند رقم
 DocType: BOM,Scrap,خردة
-apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,إدارة المبيعات الشركاء.
+apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,ادارة شركاء المبيعات.
 DocType: Quality Inspection,Inspection Type,نوع التفتيش
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,المستودعات مع الصفقة الحالية لا يمكن أن يتم تحويلها إلى المجموعة.
 DocType: Assessment Result Tool,Result HTML,نتيجة HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,تنتهي صلاحيته في
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,إضافة الطلاب
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,إضافة الطلاب
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},الرجاء اختيار {0}
 DocType: C-Form,C-Form No,رقم النموذج - س
 DocType: BOM,Exploded_items,Exploded_items
@@ -2753,12 +2760,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,نوع الجذر إلزامي
 DocType: BOM,Total Cost(Company Currency),التكلفة الإجمالية (شركة العملات)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,المسلسل لا {0} خلق
-DocType: Homepage,Company Description for website homepage,وصف الشركة للصفحة الرئيسية
+DocType: Homepage,Company Description for website homepage,وصف الشركة للصفة الرئيسيه بالموقع الألكتروني
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",لراحة العملاء، ويمكن استخدام هذه الرموز في أشكال الطباعة مثل الفواتير والسندات التسليم
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,اسم Suplier
 DocType: Sales Invoice,Time Sheet List,الساعة قائمة ورقة
 DocType: Employee,You can enter any date manually,يمكنك إدخال أي تاريخ يدويا
-DocType: Asset Category Account,Depreciation Expense Account,حساب الاستهلاك النفقات
+DocType: Asset Category Account,Depreciation Expense Account,حساب مصروفات الأهلاك
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,Probationary Period,فترة الاختبار
 DocType: Customer Group,Only leaf nodes are allowed in transaction,ويسمح العقد ورقة فقط في المعاملة
 DocType: Expense Claim,Expense Approver,موافق النفقات
@@ -2781,9 +2788,9 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,اختر السنة المالية
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,إعادة ترتيب مستوى
-DocType: Company,Chart Of Accounts Template,الرسم البياني من قالب الحسابات
+DocType: Company,Chart Of Accounts Template,قالب دليل الحسابات
 DocType: Attendance,Attendance Date,تاريخ الحضور
 apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},العنصر السعر تحديث ل{0} في قائمة الأسعار {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,تقسيم الراتب بناءَ على الكسب والاستقطاع.
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,تكرار دخول
 DocType: Program Enrollment Tool,Get Students,الحصول على الطلاب
 DocType: Serial No,Under Warranty,تحت الضمان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[خطأ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[خطأ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,وبعبارة تكون مرئية بمجرد حفظ ترتيب المبيعات.
 ,Employee Birthday,عيد ميلاد موظف
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,طالب أداة دفعة الحضور
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,الحد عبرت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,رأس المال الاستثماري
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,والفصل الدراسي مع هذا &#39;السنة الأكاديمية&#39; {0} و &quot;اسم مصطلح &#39;{1} موجود بالفعل. يرجى تعديل هذه الإدخالات وحاول مرة أخرى.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",كما أن هناك المعاملات الموجودة على البند {0}، لا يمكنك تغيير قيمة {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",كما أن هناك المعاملات الموجودة على البند {0}، لا يمكنك تغيير قيمة {1}
 DocType: UOM,Must be Whole Number,يجب أن يكون عدد صحيح
 DocType: Leave Control Panel,New Leaves Allocated (In Days),الإجازات الجديدة المخصصة (بالأيام)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,رقم المسلسل {0} غير موجود
@@ -2814,7 +2821,7 @@
 DocType: Employee Leave Approver,Leave Approver,الموافق علي الاجازات
 DocType: Assessment Group,Assessment Group Name,اسم المجموعة التقييم
 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","""المستخدم الذي لديه صلاحية ""الموافقة علي النفقات"
 DocType: Landed Cost Item,Receipt Document Type,استلام نوع الوثيقة
 DocType: Daily Work Summary Settings,Select Companies,اختر الشركات
 ,Issued Items Against Production Order,الأصناف التي صدرت بحق أمر الإنتاج
@@ -2823,7 +2830,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,٪ من المواد فوترت مقابل أمر المبيعات
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,بدء فترة الإغلاق
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى مجموعة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},مبلغ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},مبلغ {0} {1} {2} {3}
 DocType: Account,Depreciation,خفض
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),المورد (ق)
 DocType: Employee Attendance Tool,Employee Attendance Tool,أداة حضور والانصراف للموظفين
@@ -2841,12 +2848,12 @@
 DocType: Production Planning Tool,Include sub-contracted raw materials,وتشمل المواد الخام مع مقاولين من الباطن
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,قالب الشروط أو العقد.
 DocType: Purchase Invoice,Address and Contact,العناوين و التواصل
-DocType: Cheque Print Template,Is Account Payable,هو حساب المدفوعات
+DocType: Cheque Print Template,Is Account Payable,حساب المدينون / المدفوعات
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},لا يمكن تحديث المخزون ضد إيصال الشراء {0}
 DocType: Supplier,Last Day of the Next Month,اليوم الأخير من الشهر المقبل
 DocType: Support Settings,Auto close Issue after 7 days,السيارات العدد قريبة بعد 7 أيام
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",إجازة لا يمكن تخصيصها قبل {0}، كما كان رصيد الإجازة بالفعل في السجل تخصيص إجازة في المستقبل إعادة توجيهها تحمل {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ملاحظة: نظرا / المرجعي تاريخ يتجاوز المسموح أيام الائتمان العملاء التي كتبها {0} يوم (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,مقدم الطلب طالب
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب الاهلاك المتراكم
 DocType: Stock Settings,Freeze Stock Entries,تجميد مقالات المالية
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,تحليلات المخزون
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,عمليات لا يمكن أن تترك فارغة
 DocType: Maintenance Visit Purpose,Against Document Detail No,مقابل المستند التفصيلى رقم
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,النوع حزب إلزامي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,النوع حزب إلزامي
 DocType: Quality Inspection,Outgoing,المنتهية ولايته
 DocType: Material Request,Requested For,طلب لل
 DocType: Quotation Item,Against Doctype,DOCTYPE ضد
@@ -2874,11 +2881,11 @@
 DocType: Asset,Item Code,رمز البند
 DocType: Production Planning Tool,Create Production Orders,إنشاء أوامر الإنتاج
 DocType: Serial No,Warranty / AMC Details,الضمان / AMC تفاصيل
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,حدد الطلاب يدويا لمجموعة الأنشطة القائمة
 DocType: Journal Entry,User Remark,ملاحظة المستخدم
 DocType: Lead,Market Segment,سوق القطاع
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
-DocType: Employee Internal Work History,Employee Internal Work History,تاريخ عمل الموظف داخل الشركة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ المستحق السلبي {0}
+DocType: Employee Internal Work History,Employee Internal Work History,الحركة التاريخيه لعمل الموظف الداخلي
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),إغلاق (الدكتور)
 DocType: Cheque Print Template,Cheque Size,مقاس الصك
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,رقم المسلسل {0} ليس في الأوراق المالية
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,إنشاء طلبات المواد
 DocType: Employee Education,School/University,مدرسة / جامعة
 DocType: Payment Request,Reference Details,إشارة تفاصيل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,القيمة المتوقعة بعد حياة مفيدة يجب أن يكون أقل من إجمالي شراء المبلغ
 DocType: Sales Invoice Item,Available Qty at Warehouse,الكمية المتاحة في مستودع
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,مبلغ الفاتورة
 DocType: Asset,Double Declining Balance,الرصيد المتناقص المزدوج
@@ -2910,23 +2917,23 @@
 DocType: Sales Order,Fully Delivered,سلمت بالكامل
 DocType: Lead,Lower Income,دخل أدنى
 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_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",يجب أن يكون حساب الفرق حساب نوع الأصول / الخصوم، لأن هذا المخزون المصالحة هو الدخول افتتاح
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","حساب الفروقات سجب ان يكون نوع حساب الأصول / الخصوم, بحيث مطابقة المخزون بأدخال الأفتتاحي"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},المبلغ صرف لا يمكن أن يكون أكبر من مبلغ القرض {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},عدد طلب شراء مطلوب القطعة ل {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,إنتاج النظام لم يخلق
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},مطلوب رقم امر الشراء للصنف {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,إنتاج النظام لم يخلق
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""من تاريخ "" يجب أن يكون بعد "" إلى تاريخ """
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},لا يمكن تغيير الوضع كما طالب {0} يرتبط مع تطبيق طالب {1}
 DocType: Asset,Fully Depreciated,استهلكت بالكامل
 ,Stock Projected Qty,كمية المخزون المتوقعة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},العميل{0} لا تنتمي لمشروع {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},العميل{0} لا تنتمي لمشروع {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,تم تسجيل حضور HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",الاقتباسات هي المقترحات، والعطاءات التي تم إرسالها لعملائك
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",الاقتباسات هي المقترحات، والعطاءات التي تم إرسالها لعملائك
 DocType: Sales Order,Customer's Purchase Order,طلب شراء الزبون
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,رقم المسلسل و الدفعة
 DocType: Warranty Claim,From Company,من شركة
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع العشرات من معايير التقييم يجب أن يكون {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,الرجاء تعيين عدد من التلفيات حجز
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,القيمة أو الكمية
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,الرجاء تعيين عدد من التلفيات حجز
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,القيمة أو الكمية
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,لا يمكن أن تثار أوامر الإنتاج من أجل:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقيقة
 DocType: Purchase Invoice,Purchase Taxes and Charges,الضرائب والرسوم الشراء
@@ -2937,8 +2944,8 @@
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,الخصم (٪) على سعر قائمة السعر مع الهامش
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,جميع المستودعات
 DocType: Sales Partner,Retailer,متاجر التجزئة
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,حساب دائن الى يجب أن يكون من حسابات الميزانية العمومية
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,جميع أنواع  الموردين
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,لإنشاء حساب يجب ان يكون حساب الميزانية
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,جميع أنواع  الموردين
 DocType: Global Defaults,Disable In Words,تعطيل في الكلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,كود البند إلزامي لأن السلعة بسهولة و غير مرقمة تلقائيا
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},اقتباس {0} ليست من نوع {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,الموالية
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,حساب السحب على المكشوف المصرفي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,أنشئ كشف راتب
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,الصف # {0}: المبلغ المخصص لا يمكن أن يكون أكبر من المبلغ المستحق.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,تصفح فاتورة الموارد
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,القروض المضمونة
 DocType: Purchase Invoice,Edit Posting Date and Time,تحرير تاريخ النشر والوقت
@@ -2972,7 +2980,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,لا يمكن جعل حساب له حسابات فرعيه دفتر الحسابات
 DocType: C-Form,II,الثاني
 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: Purchase Invoice Item,Net Amount (Company Currency),صافي المبلغ  ( بعملة الشركة )
 DocType: Salary Slip,Hour Rate,سعرالساعة
 DocType: Stock Settings,Item Naming By,البند تسمية بواسطة
 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}
@@ -2987,7 +2995,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},لا يسمح لتحديث المعاملات المخزنية أقدم من {0}
 DocType: Purchase Invoice Item,PR Detail,PR التفاصيل
 DocType: Sales Order,Fully Billed,وصفت تماما
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},الرجاء تعيين حساب المستحق الافتراضي في الموظف {0}
 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 +127,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),الوزن الكلي للحزمة. الوزن الصافي عادة + تغليف المواد الوزن. (للطباعة)
@@ -2997,7 +3004,7 @@
 DocType: Student Group,Group Based On,المجموعة بناء على
 DocType: Journal Entry,Bill Date,تاريخ الفاتورة
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",خدمة البند، نوع، تردد و حساب المبلغ المطلوبة
-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:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية نفسها، يتم تطبيق الأولويات الداخلية كالتالي:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتى لو كانت هناك قوانين التسعير متعددة مع الأولوية نفسها، يتم تطبيق الأولويات الداخلية كالتالي:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},هل تريد حقا الموافقة على كل كشوفات الرواتب من {0} إلى {1}
 DocType: Cheque Print Template,Cheque Height,ارتفاع الصك
 DocType: Supplier,Supplier Details,تفاصيل المورد
@@ -3009,7 +3016,7 @@
 DocType: Vehicle Log,Invoice Ref,فاتورة المرجع
 DocType: Purchase Order,Recurring Order,ترتيب متكرر
 DocType: Company,Default Income Account,حساب الدخل الافتراضي
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,مجموعة العميل/ العملاء
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,مجموعة العميل/ العملاء
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),غير مغلقة سنتين الماليتين الربح / الخسارة (الائتمان)
 DocType: Sales Invoice,Time Sheets,جداول زمنية
 DocType: Payment Gateway Account,Default Payment Request Message,الافتراضي الدفع طلب رسالة
@@ -3021,18 +3028,18 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +321,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 +225,Purchase Order {0} is not submitted,طلب شراء {0} لم تقدم
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,امر الشراء {0} لم يرحل
 DocType: Customs Tariff Number,Tariff Number,عدد التعرفة
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,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 +163,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,ملاحظة : سوف النظام لا تحقق الإفراط التسليم و الإفراط في حجز القطعة ل {0} حيث الكمية أو المبلغ 0
 DocType: Notification Control,Quotation Message,رسالة التسعيرة
-DocType: Employee Loan,Employee Loan Application,موظف طلب القرض
+DocType: Employee Loan,Employee Loan Application,طلب قرض للموظف
 DocType: Issue,Opening Date,تاريخ الفتح
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,تم وضع علامة الحضور بنجاح.
 DocType: Journal Entry,Remark,كلام
 DocType: Purchase Receipt Item,Rate and Amount,معدل والمبلغ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},نوع الحساب {0} يجب ان يكون {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},نوع الحساب {0} يجب ان يكون {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,الإجازات والعطلات
 DocType: School Settings,Current Academic Term,المدة الأكاديمية الحالية
 DocType: Sales Order,Not Billed,لا صفت
@@ -3050,11 +3057,11 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,البند 4
 DocType: Student Admission,Admission End Date,تاريخ انتهاء القبول
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +29,Sub-contracting,التعاقد من الباطن
-DocType: Journal Entry Account,Journal Entry Account,حساب إدخال دفتر اليومية
+DocType: Journal Entry Account,Journal Entry Account,حساب إدخال القيود اليومية
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,المجموعة الطلابية
 DocType: Shopping Cart Settings,Quotation Series,سلسلة تسعيرات
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",يوجد صنف بنفس الإسم ( {0} ) ، الرجاء تغيير اسم مجموعة الصنف أو إعادة تسمية هذا الصنف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,الرجاء تحديد العملاء
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,الرجاء تحديد العملاء
 DocType: C-Form,I,أنا
 DocType: Company,Asset Depreciation Cost Center,مركز تكلفة إستهلاك الأصول
 DocType: Sales Order Item,Sales Order Date,تاريخ اوامر البيع
@@ -3073,20 +3080,20 @@
 DocType: Vehicle,Insurance Details,تفاصيل التأمين
 DocType: Account,Payable,المستحقة
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,الرجاء إدخال فترات السداد
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),المدينين ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),المدينين ({0})
 DocType: Pricing Rule,Margin,هامش
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,الزبائن الجدد
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,الربح الإجمالي٪
 DocType: Appraisal Goal,Weightage (%),الوزن(٪)
 DocType: Bank Reconciliation Detail,Clearance Date,إزالة التاريخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,الإجمالي المبلغ شراء إلزامي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,اجباري اجمالي مبلغ المشتريات
 DocType: Lead,Address Desc,معالجة التفاصيل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,حزب إلزامي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,الطرف إلزامي
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,اسم الموضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,يجب اختيار واحدة على الاقل من المبيعات او المشتريات
-DocType: Grading Structure,Grade Intervals,فترات الصف
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,حدد طبيعة عملك.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},الصف # {0}: إدخال مكرر في المراجع {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,حيث تتم عمليات التصنيع.
 DocType: Asset Movement,Source Warehouse,مصدر مستودع
 DocType: Installation Note,Installation Date,تثبيت تاريخ
@@ -3118,12 +3125,12 @@
 DocType: Cheque Print Template,Starting position from top edge,بدءا من موقف من أعلى الحافة
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,تم إدخال المورد نفسه عدة مرات
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,الربح الإجمالي / الخسارة
-DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,شراء السلعة ترتيب الموردة
-apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن أن تكون الشركة
+DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,الأصناف المزوده بامر الشراء
+apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,اسم الشركة لا يمكن تكون شركة
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,عنوان الرسالة لطباعة النماذج
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوين نماذج الطباعة مثل الفاتورة الأولية.
 DocType: Student Guardian,Student Guardian,الجارديان طالب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,اتهامات نوع التقييم لا يمكن وضع علامة الشاملة
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 أسعار
@@ -3135,8 +3142,8 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,يرجى ذكر جولة معطلة مركز التكلفة في الشركة
 DocType: Purchase Invoice,Terms,الأحكام
 DocType: Academic Term,Term Name,اسم المدى
-DocType: Buying Settings,Purchase Order Required,أمر الشراء المطلوبة
-,Item-wise Sales History,تاريخ المبيعات بناء على البنود
+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,ملاحظة تسليم السلعة
@@ -3147,10 +3154,10 @@
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",إذا تم تحديده، فإن القيمة المحددة أو المحسوبة في هذا المكون لن تساهم في الأرباح أو الاستقطاعات. ومع ذلك، فإنه يمكن الإشارة إلى القيمة من قبل المكونات الأخرى التي يمكن أن تضاف أو خصمها.
 ,Stock Ledger,سجل المخزن
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},معدل: {0}
-DocType: Company,Exchange Gain / Loss Account,صرف أرباح / حساب الخسارة
+DocType: Company,Exchange Gain / Loss Account,حساب خسائر او ارباح تحويلات
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,الموظف والحضور
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},يجب أن يكون هدف واحد من {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,تعبئة النموذج وحفظه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,منتديات
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,الكمية الفعلية في المخزون
@@ -3165,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,إعادة ترتيب الكميه
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرص العمل الحالية
 DocType: Company,Stock Adjustment Account,حساب تسوية الأوراق المالية
-DocType: Journal Entry,Write Off,لا تصلح
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لا تصلح
 DocType: Timesheet Detail,Operation ID,عملية ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",هوية مستخدم النظام (تسجيل الدخول). إذا وضع، وسوف تصبح الافتراضية لكافة أشكال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0} من {1}
@@ -3176,26 +3183,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,المورد يسلم للعميل
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# نموذج / البند / {0}) هو من المخزون
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,يجب أن يكون التاريخ القادم أكبر من تاريخ النشر
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,مشاهدة الضرائب تفكك
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,مشاهدة الضرائب تفكك
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},المقرر / المرجع تاريخ لا يمكن أن يكون بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,استيراد وتصدير البيانات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",توجد مدخلات المخزون ضد مستودع {0}، وبالتالي لا يمكنك إعادة تعيين أو تعديله
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,أي طالب يتم العثور
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,أي طالب يتم العثور
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,الفاتورة تاريخ النشر
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,يبيع
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,باع
 DocType: Sales Invoice,Rounded Total,تقريب إجمالي
 DocType: Product Bundle,List items that form the package.,عناصر القائمة التي تشكل الحزمة.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,يجب أن تكون نسبة تخصيص تساوي 100 ٪
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,يرجى تحديد تاريخ النشر قبل اختيار الحزب
 DocType: Program Enrollment,School House,مدرسة دار
 DocType: Serial No,Out of AMC,من AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,يرجى تحديد عروض الأسعار
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد من التلفيات حجز لا يمكن أن يكون أكبر من إجمالي عدد من التلفيات
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,انشئ زيارة صيانة
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,يرجى تحديد عروض الأسعار
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,عدد من التلفيات حجز لا يمكن أن يكون أكبر من إجمالي عدد من التلفيات
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,انشئ زيارة صيانة
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,يرجى الاتصال للمستخدم الذين لديهم مدير المبيعات ماستر {0} دور
 DocType: Company,Default Cash Account,الحساب النقدي الافتراضي
-apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شركة (وليس العميل أو المورد) الرئيسي.
+apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,(الشركة الأصليه ( ليست لعميل او مورد
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ويستند هذا على حضور هذا الطالب
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,لا يوجد طلاب في
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,إضافة المزيد من العناصر أو إستمارة كاملة مفتوح
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"يرجى إدخال "" التاريخ المتوقع تسليم '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,تسليم ملاحظات {0} يجب أن يتم إلغاء هذا الأمر قبل إلغاء المبيعات
@@ -3214,7 +3222,7 @@
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,تحقق من سعر البيع للالبند ضد سعر الشراء أو معدل التقييم
 DocType: Program,Fee Schedule,جدول التكاليف
 DocType: Hub Settings,Publish Availability,نشر توافر
-DocType: Company,Create Chart Of Accounts Based On,إنشاء مخطط من حسابات مبني على
+DocType: Company,Create Chart Of Accounts Based On,إنشاء دليل الحسابات معتمد علي
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,تاريخ الميلاد لا يمكن أن يكون أكبر مما هو عليه اليوم.
 ,Stock Ageing,الأسهم شيخوخة
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},طالب {0} موجودة ضد طالب طالب {1}
@@ -3227,11 +3235,12 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,البند 3
 DocType: Purchase Order,Customer Contact Email,العملاء الاتصال البريد الإلكتروني
 DocType: Warranty Claim,Item and Warranty Details,البند والضمان تفاصيل
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,رمز البند&gt; مجموعة المنتجات&gt; العلامة التجارية
 DocType: Sales Team,Contribution (%),مساهمة (٪)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"ملاحظة : لن يتم إنشاء الدفع منذ دخول ' النقد أو البنك الحساب "" لم يتم تحديد"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,حدد البرنامج لجلب دورات إلزامية.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,المسؤوليات
-DocType: Expense Claim Account,Expense Claim Account,حساب المطالبة النفقات
+DocType: Expense Claim Account,Expense Claim Account,حساب مطالبات  النفقات
 DocType: Sales Person,Sales Person Name,اسم رجل المبيعات
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,الرجاء إدخال الاقل فاتورة 1 في الجدول
 apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,إضافة مستخدمين
@@ -3241,9 +3250,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل المصالحة
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},إلى {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),الضرائب والرسوم المضافة (عملة الشركة)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
-DocType: Sales Order,Partly Billed,وصفت جزئيا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,البند {0} يجب أن تكون ثابتة بند الأصول
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,البند ضريبة صف {0} يجب أن يكون في الاعتبار نوع ضريبة الدخل أو المصاريف أو إتهام أو
+DocType: Sales Order,Partly Billed,تم فوترتها جزئيا
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,البند {0} يجب أن تكون ثابتة بند الأصول
 DocType: Item,Default BOM,الافتراضي BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,الرجاء إعادة الكتابة اسم الشركة لتأكيد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,إجمالي المعلقة AMT
@@ -3251,26 +3260,26 @@
 DocType: Sales Invoice,Include Payment (POS),تشمل الدفع (POS)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان .
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,السيارات
-DocType: Vehicle,Insurance Company,شركة تأمين
+DocType: Vehicle,Insurance Company,شركة التأمين
 DocType: Asset Category Account,Fixed Asset Account,حساب الأصول الثابتة
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,متغير
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,من التسليم ملاحظة
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,متغير
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,من التسليم ملاحظة
 DocType: Student,Student Email Address,طالب عنوان البريد الإلكتروني
 DocType: Timesheet Detail,From Time,من وقت
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,في المخزن:
 DocType: Notification Control,Custom Message,رسالة مخصصة
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,الخدمات المصرفية الاستثمارية
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,نقدا أو الحساب المصرفي إلزامي لجعل الدخول الدفع
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,اجباري حساب الخزنه او البنك لادخال المدفوعات
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,عنوان الطالب
 DocType: Purchase Invoice,Price List Exchange Rate,معدل سعر صرف قائمة
 DocType: Purchase Invoice Item,Rate,معدل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,المتدرب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,اسم عنوان
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,اسم عنوان
 DocType: Stock Entry,From BOM,من BOM
 DocType: Assessment Code,Assessment Code,كود التقييم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,الأساسية
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,يتم تجميد المعاملات المخزنية قبل {0}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',الرجاء انقر على ' إنشاء الجدول '
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",على سبيل المثال كجم، وحدة، غ م أ، م
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,المرجعية لا إلزامي إذا كنت دخلت التاريخ المرجعي
 DocType: Bank Reconciliation Detail,Payment Document,وثيقة الدفع
@@ -3278,19 +3287,19 @@
 DocType: Salary Slip,Salary Structure,هيكل المرتبات
 DocType: Account,Bank,مصرف
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شركة الطيران
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,قضية المواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,قضية المواد
 DocType: Material Request Item,For Warehouse,لمستودع
 DocType: Employee,Offer Date,تاريخ العرض
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,الاقتباسات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,كنت في وضع غير متصل بالشبكة. أنت لن تكون قادرة على تحميل حتى يكون لديك شبكة
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,لا مجموعات الطلاب خلقت.
 DocType: Purchase Invoice Item,Serial No,رقم المسلسل
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,السداد الشهري المبلغ لا يمكن أن يكون أكبر من مبلغ القرض
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,الرجاء إدخال تفاصيل أول من Maintaince
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,الرجاء إدخال تفاصيل أول من Maintaince
 DocType: Purchase Invoice,Print Language,لغة الطباعة
 DocType: Salary Slip,Total Working Hours,مجموع ساعات العمل
 DocType: Stock Entry,Including items for sub assemblies,بما في ذلك البنود عن المجالس الفرعية
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,يجب أن يكون إدخال قيمة ايجابية
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,جميع الأقاليم
 DocType: Purchase Invoice,Items,البنود
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,والتحق بالفعل طالب.
@@ -3305,20 +3314,18 @@
 apps/erpnext/erpnext/config/selling.py +23,Customers,الزبائن
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,أوردر / كوت٪
 DocType: Student Sibling,Institution,مؤسسة
-DocType: Asset,Partially Depreciated,انخفضت جزئيا
+DocType: Asset,Partially Depreciated,استهلكت جزئيا
 DocType: Issue,Opening Time,يفتح من الساعة
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,من و إلى مواعيد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,الأوراق المالية والبورصات
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',وحدة القياس الافتراضية للخيار &#39;{0}&#39; يجب أن يكون نفس في قالب &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,إحسب الربح بناء على
 DocType: Delivery Note Item,From Warehouse,من مستودع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,لا الأصناف مع بيل من مواد لتصنيع
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,لا الأصناف مع بيل من مواد لتصنيع
 DocType: Assessment Plan,Supervisor Name,اسم المشرف
 DocType: Program Enrollment Course,Program Enrollment Course,دورة التسجيل في البرنامج
-DocType: Grading Structure,Grading Structure,هيكل الدرجات
 DocType: Purchase Taxes and Charges,Valuation and Total,التقييم وتوتال
 DocType: Tax Rule,Shipping City,مدينة الشحن
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"هذا البند هو البديل من {0} (قالب). سيتم نسخ سمات على من القالب ما لم يتم تعيين ""لا نسخ '"
 DocType: Notification Control,Customize the Notification,تخصيص تنبيهات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,التدفق النقدي من العمليات
 DocType: Sales Invoice,Shipping Rule,قواعد الشحن
@@ -3336,11 +3343,11 @@
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,ملخص إعدادات العمل اليومي
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},عملة قائمة الأسعار {0} ليست مماثلة مع العملة المختارة {1}
 DocType: Payment Entry,Internal Transfer,نقل داخلي
-apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,موجود حساب الطفل لهذا الحساب . لا يمكنك حذف هذا الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},لا توجد BOM الافتراضي القطعة ل {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,يرجى تحديد تاريخ النشر لأول مرة
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,يجب فتح التسجيل يكون قبل تاريخ الإنتهاء
 DocType: Leave Control Panel,Carry Forward,المضي قدما
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مركز التكلفة مع المعاملات القائمة لا يمكن تحويلها إلى دفتر الأستاذ
 DocType: Department,Days for which Holidays are blocked for this department.,أيام العطلات غير المسموح بأخذ إجازة فيها لهذا القسم
@@ -3352,7 +3359,7 @@
 DocType: Mode of Payment,General,عام
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,إرفق عنوان خطاب
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخر الاتصالات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',لا يمكن أن تقتطع عند الفئة هو ل ' التقييم ' أو ' تقييم وتوتال '
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',لا يمكن أن تقتطع عند الفئة هو ل ' التقييم ' أو ' تقييم وتوتال '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,سداد الفواتير من التحصيلات
@@ -3368,11 +3375,11 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),إجمالي (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,الترفيه والترويح
 DocType: Quality Inspection,Item Serial No,البند رقم المسلسل
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,إنشاء سجلات الموظفين
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,إنشاء سجلات الموظفين
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,إجمالي الحضور
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,القوائم المالية
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,الساعة
-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,المسلسل الجديد لا يمكن أن يكون المستودع. يجب تعيين مستودع من قبل دخول الأسهم أو شراء الإيصال
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة
 DocType: Lead,Lead Type,نوع مبادرة البيع
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,غير مصرح لك الموافقة على المغادرات التي في التواريخ المحظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,All these items have already been invoiced,لقد تم من قبل فوترت جميع الأصناف
@@ -3381,9 +3388,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,غير معروف
 DocType: Shipping Rule,Shipping Rule Conditions,شروط قاعدة الشحن
 DocType: BOM Replace Tool,The new BOM after replacement,وBOM الجديدة بعد استبدال
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,نقطة بيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,نقااط البيع
 DocType: Payment Entry,Received Amount,المبلغ الوارد
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,الرجاء الإعداد نظام تسمية الموظف في الموارد البشرية&gt; إعدادات الموارد البشرية
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",إنشاء لكمية كاملة، وتجاهل كمية بالفعل على النظام
 DocType: Account,Tax,ضريبة
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,لم يتم وضع علامة
@@ -3394,39 +3400,41 @@
 DocType: C-Form,Invoices,الفواتير
 DocType: Batch,Source Document Name,اسم المستند المصدر
 DocType: Job Opening,Job Title,المسمى الوظيفي
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,إنشاء المستخدمين
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,إنشاء المستخدمين
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,قرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,يجب أن تكون الكمية لصنع أكبر من 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,تقرير زيارة للدعوة الصيانة.
 DocType: Stock Entry,Update Rate and Availability,معدل التحديث والتوفر
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,النسبة المئوية يسمح لك لتلقي أو تقديم المزيد من ضد الكمية المطلوبة. على سبيل المثال: إذا كنت قد أمرت 100 وحدة. و10٪ ثم يسمح بدل الخاص بك لتلقي 110 وحدة.
 DocType: POS Customer Group,Customer Group,مجموعة العميل
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),معرف الدفعة الجديد (اختياري)
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},حساب المصاريف إلزامي لمادة {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اجباري حساب النفقات للصنف {0}
 DocType: BOM,Website Description,وصف الموقع
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,صافي التغير في حقوق المساهمين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,يرجى إلغاء شراء الفاتورة {0} لأول مرة
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريدة من نوعها، موجود بالفعل ل{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,فضلا  اشطب قاتورة المشتريات {0} أولا
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",يجب أن يكون عنوان البريد الإلكتروني فريدة من نوعها، موجود بالفعل ل{0}
 DocType: Serial No,AMC Expiry Date,AMC تاريخ انتهاء الاشتراك
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,إيصال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,إيصال
 ,Sales Register,سجل مبيعات
 DocType: Daily Work Summary Settings Company,Send Emails At,إرسال رسائل البريد الإلكتروني في
 DocType: Quotation,Quotation Lost Reason,خسارة التسعيرة بسبب
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,حدد المجال الخاص بك
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},إشارة عملية لا {0} بتاريخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,لا يوجد شيء لتحريره
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ملخص لهذا الشهر والأنشطة المعلقة
 DocType: Customer Group,Customer Group Name,أسم مجموعة العميل
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,لا العملاء حتى الآن!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,بيان التدفقات النقدية
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},مبلغ القرض لا يمكن أن يتجاوز مبلغ القرض الحد الأقصى ل{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,رخصة
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},الرجاء إزالة هذا فاتورة {0} من C-نموذج {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,الرجاء إدخال شطب الحساب
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاريخ آخر أمر
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},الحساب {0} لا ينتمي إلى الشركة {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,لا تتطابق الأرقام التسلسلية في الصف {0} مع ملاحظة التسليم
 DocType: Student,Guardian Details,تفاصيل ولي الأمر
 DocType: C-Form,C-Form,نموذج C-
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,وضع علامة الحضور لعدة موظفين
@@ -3443,7 +3451,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},من تاريخ {0} للموظف {1} لا يمكن أن يكون قبل تاريخ انضمامه {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,تجاري
 DocType: Payment Entry,Account Paid To,حساب مدفوع ل
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,الأم البند {0} لا يجب أن يكون البند الأسهم
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,البند الأصل {0} لا يجب أن يكون بند مخزون
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,جميع المنتجات أو الخدمات.
 DocType: Expense Claim,More Details,مزيد من التفاصيل
 DocType: Supplier Quotation,Supplier Address,عنوان المورد
@@ -3451,20 +3459,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',صف {0} يجب أن يكون # حساب من نوع &quot;الأصول الثابتة&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,من الكمية
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,قواعد لحساب كمية الشحن لبيع
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,الترقيم المتسلسل إلزامي
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,الترقيم المتسلسل إلزامي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,الخدمات المالية
 DocType: Student Sibling,Student ID,هوية الطالب
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,أنواع الأنشطة لسجلات الوقت
 DocType: Tax Rule,Sales,مبيعات
 DocType: Stock Entry Detail,Basic Amount,المبلغ الأساسي
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},مستودع الأسهم المطلوبة لل تفاصيل {0}
 DocType: Leave Allocation,Unused leaves,إجازات غير مستخدمة
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,كر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,كر
 DocType: Tax Rule,Billing State,الدولة الفواتير
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,نقل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} لا يرتبط مع حساب الطرف {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} لا يرتبط مع حساب الطرف {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),جلب BOM انفجرت (بما في ذلك المجالس الفرعية)
 DocType: Authorization Rule,Applicable To (Employee),تنطبق على (موظف)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,يرجع تاريخ إلزامي
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,الاضافة للسمة {0} لا يمكن أن يكون 0
@@ -3475,13 +3483,13 @@
 ,Inactive Customers,العملاء الغير النشطين
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,إيصالات شراء
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,كيف يتم تطبيق قاعدة التسعير ؟
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,كيف يتم تطبيق قاعدة التسعير ؟
 DocType: Stock Entry,Delivery Note No,ملاحظة لا تسليم
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",إذا تحققت، شراء فقط وسيتم إدراج طلبات المواد على المواد الخام النهائية في طلبات المواد. خلاف ذلك، سيتم إنشاء طلبات المواد لبنود الأم
 DocType: Cheque Print Template,Message to show,رسالة لاظهار
 DocType: Company,Retail,بيع بالتجزئة
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,حزمة المنتج
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},الصف {0}: إشارة غير صالحة {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,شراء قالب الضرائب والرسوم
 DocType: Upload Attendance,Download Template,تنزيل نموذج
@@ -3491,21 +3499,22 @@
 DocType: Payment Entry,Account Paid From,حساب مدفوع من
 DocType: Purchase Order Item Supplied,Raw Material Item Code,قانون المواد الخام المدينة
 DocType: Journal Entry,Write Off Based On,شطب بناء على
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,جعل الرصاص
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,جعل الرصاص
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,طباعة وقرطاسية
 DocType: Stock Settings,Show Barcode Field,مشاهدة الباركود الميدان
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,إرسال رسائل البريد الإلكتروني مزود
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",الراتب تمت انجازه بالفعل للفترة بين {0} و {1}،طلب اجازة لا يمكن أن تكون بين هذا النطاق الزمني.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,سجل لتثبيت الرقم التسلسلي
 DocType: Guardian Interest,Guardian Interest,الجارديان الفائدة
 apps/erpnext/erpnext/config/hr.py +177,Training,التدريب
-DocType: Timesheet,Employee Detail,تفاصيل موظف
+DocType: Timesheet,Employee Detail,تفاصيل الموظف
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 معرف البريد الإلكتروني
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,اليوم التالي التاريخ وكرر في يوم من شهر يجب أن يكون على قدم المساواة
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,إعدادات موقعه الإلكتروني
 DocType: Offer Letter,Awaiting Response,انتظار الرد
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,فوق
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},السمة غير صالحة {0} {1}
+DocType: Supplier,Mention if non-standard payable account,أذكر إذا كان الحساب غير القياسي مستحق الدفع
 DocType: Salary Slip,Earning & Deduction,الكسب و الخصم
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختياري . سيتم استخدام هذا الإعداد لتصفية في المعاملات المختلفة.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,لا يسمح السلبية قيم التقييم
@@ -3521,10 +3530,9 @@
 DocType: Production Order Item,Production Order Item,الإنتاج ترتيب البند
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,العثور على أي سجل
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,تكلفة الأصول ملغى
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,أوردريد جزئيا
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مركز التكلفة إلزامي  للصنف {2}
 DocType: Vehicle,Policy No,السياسة لا
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,الحصول على أصناف من حزمة المنتج
 DocType: Asset,Straight Line,خط مستقيم
 DocType: Project User,Project User,المشروع العضو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,انشق، مزق
@@ -3539,13 +3547,13 @@
 DocType: Program Enrollment Tool,Get Students From,الحصول على الطلاب من
 DocType: Hub Settings,Seller Country,بلد البائع
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,نشر عناصر على الموقع
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,مجموعة الطلاب على دفعات
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,مجموعة الطلاب على دفعات
 DocType: Authorization Rule,Authorization Rule,قاعدة السماح
 DocType: Sales Invoice,Terms and Conditions Details,تفاصيل الشروط والأحكام
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مواصفات
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,قالب الضرائب على المبيعات والرسوم
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),الإجمالي (الائتمان)
-DocType: Repayment Schedule,Payment Date,تاريخ الدفع
+DocType: Repayment Schedule,Payment Date,تاريخ الدفعة
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,جديد دفعة الكمية
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,ملابس واكسسوارات
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,رقم الطلب
@@ -3580,7 +3588,7 @@
 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 +125,No Item with Serial No {0},أي عنصر مع المسلسل لا {0}
 DocType: Email Digest,Open Notifications,الإخطارات المفتوحة
-DocType: Payment Entry,Difference Amount (Company Currency),الفرق المبلغ (شركة العملات)
+DocType: Payment Entry,Difference Amount (Company Currency),فروق المبلغ ( عملة الشركة ) .
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,المصاريف المباشرة
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} هو عنوان بريد إلكتروني غير صالح في &quot;إعلام \ عنوان البريد الإلكتروني&quot;
@@ -3591,14 +3599,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,تاريخ الشيك
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},الحساب {0}: حسابه الرئيسي {1} لا ينتمي إلى الشركة: {2}
 DocType: Program Enrollment Tool,Student Applicants,المتقدمين طالب
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,تم حذف جميع المعاملات المتعلقة بهذه الشركة!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,كما في تاريخ
 DocType: Appraisal,HR,الموارد البشرية
 DocType: Program Enrollment,Enrollment Date,تاريخ التسجيل
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,امتحان
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,مكون الراتب
 DocType: Program Enrollment Tool,New Academic Year,العام الدراسي الجديد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,عودة / الائتمان ملاحظة
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,عودة / الائتمان ملاحظة
 DocType: Stock Settings,Auto insert Price List rate if missing,إدراج تلقائي لقائمة الأسعار إن لم تكن موجودة
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,إجمالي المبلغ المدفوع
 DocType: Production Order Item,Transferred Qty,نقل الكمية
@@ -3615,10 +3623,10 @@
 DocType: Leave Application,Half Day Date,تاريخ نصف اليوم
 DocType: Academic Year,Academic Year Name,اسم العام الدراسي
 DocType: Sales Partner,Contact Desc,الاتصال التفاصيل
-apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع الإيجاز مثل عارضة، مريضة الخ.
+apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع الإجازة مثل اضطرارية، مرضية الخ.
 DocType: Email Digest,Send regular summary reports via Email.,إرسال تقارير موجزة منتظمة عبر البريد الإلكتروني.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في نوع المطالبة النفقات {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},الرجاء تعيين الحساب الافتراضي في نوع المطالبة النفقات {0}
 DocType: Assessment Result,Student Name,أسم الطالب
 DocType: Brand,Item Manager,مدير البند
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,الرواتب مستحقة الدفع
@@ -3639,6 +3647,7 @@
 ,Sales Funnel,قمع المبيعات
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,الاسم المختصر إلزامي
 DocType: Project,Task Progress,تقدم مهمة
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,عربة
 ,Qty to Transfer,الكمية للنقل
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,اقتباسات لعروض أو العملاء.
 DocType: Stock Settings,Role Allowed to edit frozen stock,دور الأليفة لتحرير الأسهم المجمدة
@@ -3666,12 +3675,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,الحكيم البند ضريبة التفاصيل
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,اختصار معهد
 ,Item-wise Price List Rate,البند الحكيمة قائمة الأسعار قيم
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,اقتباس المورد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,اقتباس المورد
 DocType: Quotation,In Words will be visible once you save the Quotation.,وبعبارة تكون مرئية بمجرد حفظ اقتباس.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},الكمية ({0}) لا يمكن أن تكون جزءا من الصف {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,جمع الرسوم
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},الباركود {0} مستخدم بالفعل في الصنف {1}
 DocType: Lead,Add to calendar on this date,إضافة إلى التقويم في هذا التاريخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,قواعد لإضافة تكاليف الشحن.
 DocType: Item,Opening Stock,فتح المخزون
@@ -3689,8 +3698,8 @@
  تحديث عبر 'وقت دخول """
 DocType: Customer,From Lead,من العميل المحتمل
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,أوامر الإفراج عن الإنتاج.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,اختر السنة المالية ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,اختر السنة المالية ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS الملف المطلوب لجعل الدخول POS
 DocType: Program Enrollment Tool,Enroll Students,تسجيل الطلاب
 DocType: Hub Settings,Name Token,اسم رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,البيع القياسية
@@ -3701,7 +3710,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} مقابل فاتورة المبيعات {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,اسم المشروع
-DocType: Supplier,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
+DocType: Customer,Mention if non-standard receivable account,أذكر إذا غير القياسية حساب المستحق
 DocType: Journal Entry Account,If Income or Expense,إذا دخل أو مصروف
 DocType: Production Order,Required Items,الأصناف المطلوبة
 DocType: Stock Ledger Entry,Stock Value Difference,فرق قيمة المخزون
@@ -3722,7 +3731,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],تجميد الأرصدة أقدم من [ أيام]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,الصف # {0}: الأصول إلزامي لشراء الأصول الثابتة / بيع
-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 والقيمة الافتراضية هي 0. القيمة الاعلى تعني انها ستاخذ الاولوية عندما يكون هناك قواعد أسعار بنفس الشروط."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","اذا كانت اثنتان او اكثر من قواعد الاسعار مبنية على الشروط المذكورة فوق, الاولوية تطبق. الاولوية هي رقم بين 0 و 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.,السماح للمستخدمين التاليين للموافقة على طلبات الحصول على إجازة في الأيام المحظورة
@@ -3747,7 +3756,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,البند {0} تجاهلها لأنه ليس بند الأوراق المالية
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",للا ينطبق قاعدة التسعير في معاملة معينة، يجب تعطيل جميع قوانين التسعير المعمول بها.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",للا ينطبق قاعدة التسعير في معاملة معينة، يجب تعطيل جميع قوانين التسعير المعمول بها.
 DocType: Assessment Group,Parent Assessment Group,المجموعة تقييم الوالدين
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,وظائف
 ,Sales Order Trends,مجرى طلبات البيع
@@ -3758,7 +3767,7 @@
 DocType: Stock Entry Detail,Additional Cost,تكلفة إضافية
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,تاريخ نهاية السنة المالية
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",لا يمكن تصفية استنادا قسيمة لا، إذا تم تجميعها حسب قسيمة
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,أنشئ تسعيرة مورد
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,أنشئ تسعيرة مورد
 DocType: Quality Inspection,Incoming,الوارد
 DocType: BOM,Materials Required (Exploded),المواد المطلوبة (انفجرت)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",إضافة مستخدمين إلى مؤسستك، وغيرها من نفسك
@@ -3783,9 +3792,10 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,العمل مقاولة
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,متوسط. سعر شراء
 DocType: Task,Actual Time (in Hours),الوقت الفعلي (بالساعات)
-DocType: Employee,History In Company,تاريخه في الشركة
+DocType: Employee,History In Company,الحركة التاريخيه في الشركة
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,النشرات الإخبارية
 DocType: Stock Ledger Entry,Stock Ledger Entry,حركة سجل المخزن
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,العميل&gt; مجموعة العملاء&gt; الإقليم
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,تم إدخال البند نفسه عدة مرات
 DocType: Department,Leave Block List,قائمة الإجازات المحظورة
 DocType: Sales Invoice,Tax ID,البطاقة الضريبية
@@ -3795,7 +3805,7 @@
 DocType: Customer,Sales Partner and Commission,مبيعات الشريك واللجنة
 DocType: Employee Loan,Rate of Interest (%) / Year,معدل الفائدة (٪) / السنة
 ,Project Quantity,مشروع الكمية
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",إجمالي {0} لجميع المواد والصفر، قد يكون عليك تغيير &quot;توزيع التكاليف على أساس &#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",إجمالي {0} لجميع المواد والصفر، قد يكون عليك تغيير &quot;توزيع التكاليف على أساس &#39;
 DocType: Opportunity,To Discuss,لمناقشة
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} الوحدات التي في {1} مطلوبة في {2} لإتمام هذه العمليه.
 DocType: Loan Type,Rate of Interest (%) Yearly,معدل الفائدة (٪) سنوي
@@ -3810,7 +3820,7 @@
 DocType: Purchase Invoice,Return,عودة
 DocType: Production Order Operation,Production Order Operation,أمر الإنتاج عملية
 DocType: Pricing Rule,Disable,تعطيل
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,طريقة الدفع مطلوبة لإجراء الدفع
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,طريقة الدفع مطلوبة لإجراء الدفع
 DocType: Project Task,Pending Review,في انتظار المراجعة
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",الأصول {0} لا يمكن تفكيكها، كما هو بالفعل {1}
 DocType: Task,Total Expense Claim (via Expense Claim),مجموع المطالبة المصاريف (عبر مطالبات مصاريف)
@@ -3818,11 +3828,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,حدد الغائب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},صف {0}: عملة BOM # {1} يجب أن تكون مساوية العملة المختارة {2}
 DocType: Journal Entry Account,Exchange Rate,سعر الصرف
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,اوامر البيع {0} لم ترسل
 DocType: Homepage,Tag Line,شعار
 DocType: Fee Component,Fee Component,مكون رسوم
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,إدارة سريعة
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,إضافة عناصر من
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,إضافة عناصر من
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},مستودع {0}: حساب الرئيسي {1} لا بولونغ للشركة {2}
 DocType: Cheque Print Template,Regular,منتظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,يجب أن يكون الترجيح الكلي لجميع معايير التقييم 100٪
@@ -3835,7 +3845,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,العنصر المحدد لا يمكن أن يكون دفعة
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",معدل التقييم لم يتم العثور على هذا البند {0}، وهو مطلوب للقيام القيود المحاسبية لل{1} {2}. إذا كان العنصر هو يتعاملون كبند عينة في {1}، يرجى ذكر ذلك في {1} الجدول البند. خلاف ذلك، يرجى إنشاء معاملة الأسهم واردة بالنسبة لمعدل تقييم البند أو ذكر في السجل عنصر، ثم حاول سوبميتنغ / إلغاء هذا الدخول
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ من المواد الموردة  سلمت من أمر التوصيل
 DocType: Project,Customer Details,تفاصيل العميل
@@ -3844,19 +3854,19 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ادخل معامل العنوان لمشغل شبكة المستقبل
 DocType: Payment Entry,Paid Amount,المبلغ المدفوع
 DocType: Assessment Plan,Supervisor,مشرف
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,على الانترنت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,على الانترنت
 ,Available Stock for Packing Items,المخزون المتاج للأصناف المعبأة
 DocType: Item Variant,Item Variant,البديل البند
 DocType: Assessment Result Tool,Assessment Result Tool,أداة نتيجة التقييم
 DocType: BOM Scrap Item,BOM Scrap Item,BOM خردة البند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,لا يمكن حذف أوامر المقدمة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,لا يمكن حذف أوامر المقدمة
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,إدارة الجودة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,تم تعطيل البند {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,تم تعطيل البند {0}
 DocType: Employee Loan,Repay Fixed Amount per Period,سداد مبلغ ثابت في الفترة
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},الرجاء إدخال كمية القطعة ل {0}
 DocType: Employee External Work History,Employee External Work History,تاريخ عمل الموظف خارج الشركة
-DocType: Tax Rule,Purchase,شراء
+DocType: Tax Rule,Purchase,الشراء
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,الكمية المتاحة
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,الأهداف لا يمكن أن تكون فارغة
 DocType: Item Group,Parent Item Group,الأم الإغلاق المجموعة
@@ -3878,7 +3888,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,طالب معرف البريد الإلكتروني
 DocType: Employee,Notice (days),إشعار (أيام )
 DocType: Tax Rule,Sales Tax Template,قالب ضريبة المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,تحديد عناصر لحفظ الفاتورة
 DocType: Employee,Encashment Date,تاريخ التحصيل
 DocType: Training Event,Internet,الإنترنت
 DocType: Account,Stock Adjustment,الأسهم التكيف
@@ -3901,7 +3911,7 @@
 DocType: Item Variant Attribute,Attribute,سمة
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,يرجى تحديد من / أن يتراوح
 DocType: Serial No,Under AMC,تحت AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,يتم حساب معدل تقييم البند النظر هبطت تكلفة مبلغ قسيمة
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,يتم حساب معدل تقييم البند النظر هبطت تكلفة مبلغ قسيمة
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,الإعدادات الافتراضية لبيع صفقة.
 DocType: Guardian,Guardian Of ,الجارديان
 DocType: Grading Scale Interval,Threshold,العتبة
@@ -3911,6 +3921,7 @@
 DocType: Purchase Invoice,Debit Note Issued,الخصم مذكرة صادرة
 DocType: Production Order,Warehouses,المستودعات
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} الأصول لا يمكن نقلها
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,هذا العنصر هو متغير {0} (قالب).
 DocType: Workstation,per hour,كل ساعة
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,المشتريات
 DocType: Announcement,Announcement,إعلان
@@ -3926,8 +3937,8 @@
 DocType: Account,Receivable,القبض
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,الصف # {0}: غير مسموح لتغيير مورد السلعة كما طلب شراء موجود بالفعل
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,الدور الذي يسمح بتقديم المعاملات التي تتجاوز حدود الائتمان تعيين.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,حدد العناصر لتصنيع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,حدد العناصر لتصنيع
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",مزامنة البيانات الرئيسية، قد يستغرق بعض الوقت
 DocType: Item,Material Issue,صرف مواد
 DocType: Hub Settings,Seller Description,وصف البائع
 DocType: Employee Education,Qualification,المؤهل
@@ -3939,7 +3950,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,أمر
 DocType: Salary Detail,Component,مكون
 DocType: Assessment Criteria,Assessment Criteria Group,معايير تقييم المجموعة
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},فتح الاستهلاك المتراكم يجب أن يكون أقل من يساوي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},فتح الاستهلاك المتراكم يجب أن يكون أقل من يساوي {0}
 DocType: Warehouse,Warehouse Name,اسم المستودع
 DocType: Naming Series,Select Transaction,حدد المعاملات
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,الرجاء إدخال الموافقة أو الموافقة دور العضو
@@ -3947,12 +3958,12 @@
 DocType: BOM,Rate Of Materials Based On,معدل المواد التي تقوم على
 apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +21,Support Analtyics,Analtyics الدعم
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +142,Uncheck all,الغاء الكل
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},شركة مفقود في المستودعات {0}
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},الشركة ناقصة في المستودعات  {0}
 DocType: POS Profile,Terms and Conditions,الشروط والأحكام
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},إلى التسجيل يجب أن يكون ضمن السنة المالية. على افتراض إلى تاريخ = {0}
 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 +199,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,لا يمكن إلغاء الاشتراك بسبب الحركة المخزنية {0} موجود
 DocType: Employee Loan,Disbursement Date,صرف التسجيل
 DocType: Vehicle,Vehicle,مركبة
 DocType: Purchase Invoice,In Words,في كلمات
@@ -3966,14 +3977,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,أوب / ليد٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,إستهلاك الأصول والأرصدة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},مبلغ {0} {1} نقلها من {2} إلى {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},مبلغ {0} {1} نقلها من {2} إلى {3}
 DocType: Sales Invoice,Get Advances Received,الحصول على السلف المتلقاة
 DocType: Email Digest,Add/Remove Recipients,إضافة / إزالة المستلمين
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},الصفقة لا يسمح ضد توقفت أمر الإنتاج {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","لتعيين هذه السنة المالية كما الافتراضي، انقر على ' تعيين كافتراضي """
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,انضم
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,نقص الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,البديل البند {0} موجود مع نفس الصفات
 DocType: Employee Loan,Repay from Salary,سداد من الراتب
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},طلب دفع مقابل {0} {1} لمبلغ {2}
@@ -3991,7 +4002,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,تقييم النتيجة التفاصيل
 DocType: Employee Education,Employee Education,المستوى التعليمي للموظف
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,مجموعة البند مكررة موجودة في جدول المجموعة البند
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,هناك حاجة لجلب البند التفاصيل.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} وقد وردت بالفعل
@@ -4000,7 +4011,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",لا يرتبط مستودع {0} إلى أي حساب، الرجاء إنشاء / ربط (الأصول) حساب المقابل للمستودع.
 DocType: Purchase Invoice,Recurring Id,رقم المتكررة
 DocType: Customer,Sales Team Details,تفاصيل فريق المبيعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,حذف بشكل دائم؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,حذف بشكل دائم؟
 DocType: Expense Claim,Total Claimed Amount,إجمالي المبلغ المطالب به
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرص محتملة للبيع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلة {0}
@@ -4011,13 +4022,14 @@
 DocType: Warehouse,PIN,دبوس
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,إعداد مدرستك في ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),مدى تغيير المبلغ الأساسي (عملة الشركة )
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,لا القيود المحاسبية للمستودعات التالية
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,كمية آخر طلب
+DocType: Task,Is Milestone,هو معلم
 DocType: Daily Work Summary,Email Sent To,تم ارسال الايميل الي
 DocType: Budget,Warn,تحذير
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",أي ملاحظات أخرى، والجهود الجديرة بالذكر التي ينبغي أن تذهب في السجلات.
@@ -4038,7 +4050,7 @@
 DocType: Item Attribute Value,Attribute Value,السمة القيمة
 ,Itemwise Recommended Reorder Level,يوصى به Itemwise إعادة ترتيب مستوى
 DocType: Salary Detail,Salary Detail,تفاصيل الراتب
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,الرجاء اختيار {0} الأولى
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,الرجاء اختيار {0} الأولى
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,دفعة {0} من البند {1} قد انتهت صلاحيتها.
 DocType: Sales Invoice,Commission,عمولة
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورقة الوقت للتصنيع.
@@ -4050,41 +4062,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` تجميد المخزون الأقدم من يجب أن يكون أقل من ٪ d يوم ` .
 DocType: Tax Rule,Purchase Tax Template,شراء قالب الضرائب
 ,Project wise Stock Tracking,مشروع تتبع حركة الأسهم الحكمة
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},جدول الصيانة {0} موجود ضد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),الكمية الفعلية (في المصدر / الهدف)
 DocType: Item Customer Detail,Ref Code,الرمز المرجعي
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سجلات الموظفين
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,الرجاء ضبط الاستهلاك المقبل التاريخ
 DocType: HR Settings,Payroll Settings,إعدادات دفع الرواتب
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غير مطابقة الفواتير والمدفوعات المرتبطة.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,طلب مكان
-DocType: Email Digest,New Purchase Orders,أوامر الشراء الجديدة
+DocType: Email Digest,New Purchase Orders,اوامر الشراء الجديده
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,الجذر لا يمكن أن يكون مركز تكلفة الأصل
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,اختر الماركة ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,اختر الماركة ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,مجمع الإستهلاك كما في
 DocType: Sales Invoice,C-Form Applicable,C-نموذج قابل للتطبيق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},عملية الوقت يجب أن تكون أكبر من 0 لعملية {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,المستودع إلزامي
 DocType: Supplier,Address and Contacts,عناوين واتصالات
 DocType: UOM Conversion Detail,UOM Conversion Detail,تفاصيل تحويل وحدة القياس
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),يبقيه على شبكة الإنترنت 900px دية ( ث ) من قبل 100px (ح )
 DocType: Program,Program Abbreviation,اختصار برنامج
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,يتم تحديث الرسوم في شراء استلام ضد كل بند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,لا يمكن رفع إنتاج النظام ضد قالب البند
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,تحديث الرسوم في اضافة المشتريات لكل صنف
 DocType: Warranty Claim,Resolved By,حلها عن طريق
 DocType: Bank Guarantee,Start Date,تاريخ البدء
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,تخصيص الإجازات لفترة.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,الشيكات والودائع مسح غير صحيح
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,الحساب {0}: لا يمكنك جعله حساباً رئيسياً لنفسه
 DocType: Purchase Invoice Item,Price List Rate,قائمة الأسعار قيم
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,خلق ونقلت العملاء
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,خلق ونقلت العملاء
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","تظهر ""في المخزن"" أو ""ليس في المخزن"" على أساس التواجد  في هذا المخزن."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),مشروع القانون المواد (BOM)
 DocType: Item,Average time taken by the supplier to deliver,متوسط الوقت المستغرق من قبل المورد للتسليم
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,نتائج التقييم
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعات
 DocType: Project,Expected Start Date,تاريخ البدأ المتوقع
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,إزالة البند إذا الرسوم لا تنطبق على هذا البند
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع
 DocType: Payment Entry,Receive,تسلم
@@ -4095,19 +4106,19 @@
 DocType: Workstation,Operating Costs,تكاليف التشغيل
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,العمل إذا مجمع الميزانيه الشهري تجاوز
 DocType: Purchase Invoice,Submit on creation,إرسال على خلق
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},العملة ل{0} يجب أن يكون {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},العملة ل{0} يجب أن يكون {1}
 DocType: Asset,Disposal Date,التخلص من التسجيل
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",سيتم إرسال رسائل البريد الإلكتروني لجميع الموظفين العاملين في الشركة في ساعة معينة، إذا لم يكن لديهم عطلة. سيتم إرسال ملخص ردود في منتصف الليل.
 DocType: Employee Leave Approver,Employee Leave Approver,الموافق علي اجازة الموظف
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: إدخال إعادة ترتيب موجود بالفعل لهذا المستودع {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",لا يمكن ان تعلن بانها فقدت ، لأن أحرز اقتباس .
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ملاحظات تدريب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,إنتاج النظام {0} يجب أن تقدم
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},يرجى تحديد تاريخ بدء و نهاية التاريخ القطعة ل {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},بالطبع إلزامي في الصف {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,حتى الآن لا يمكن أن يكون قبل تاريخ من
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,إضافة / تحرير الأسعار
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,إضافة / تحرير الأسعار
 DocType: Batch,Parent Batch,دفعة الأم
 DocType: Cheque Print Template,Cheque Print Template,قالب طباعة الشيكات
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,دليل مراكز التكلفة
@@ -4120,7 +4131,7 @@
 ,Ordered Items To Be Delivered,البنود المطلبة للتسليم
 DocType: Account,Income,دخل
 DocType: Industry Type,Industry Type,نوع صناعة
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,حدث خطأ!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,حدث خطأ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,تحذير: طلب اجازة يحتوي على تواريخ محظورة
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,{0} سبق أن قدمت فاتورة المبيعات
 DocType: Assessment Result Detail,Score,أحرز هدفاً
@@ -4151,17 +4162,17 @@
 DocType: Item,Variant Based On,البديل القائم على
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},يجب أن يكون مجموع الترجيح تعيين 100 ٪ . فمن {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,الموردون
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,لا يمكن تعيين كما فقدت كما يرصد ترتيب المبيعات .
 DocType: Request for Quotation Item,Supplier Part No,رقم قطعة المورد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',لا يمكن أن تقتطع عند الفئة هي ل &#39;تقييم&#39; أو &#39;Vaulation وتوتال&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,مستلم من
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',لا يمكن أن تقتطع عند الفئة هي ل &#39;تقييم&#39; أو &#39;Vaulation وتوتال&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,مستلم من
 DocType: Lead,Converted,تحويل
 DocType: Item,Has Serial No,يحتوي على رقم تسلسلي
 DocType: Employee,Date of Issue,تاريخ الإصدار
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0} من {0} ب {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0} من {0} ب {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},الصف # {0}: تعيين مورد للالبند {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,صف {0}: يجب أن تكون قيمة ساعات أكبر من الصفر.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,الموقع صورة {0} تعلق على البند {1} لا يمكن العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,قائمة هذا البند في مجموعات متعددة على شبكة الانترنت.
@@ -4170,20 +4181,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,لا يحق لك تعيين القيمة المجمدة
 DocType: Payment Reconciliation,Get Unreconciled Entries,الحصول على مدخلات لم تتم تسويتها
 DocType: Payment Reconciliation,From Invoice Date,من تاريخ الفاتورة
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,يجب أن تكون عملة الفواتير تساوي عملة الشركة او عملة حساب الطرف
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,عملة الفاتوره يجب ان تساوي عملة الشركة المعتاد او عملة الحساب GL الرئيسي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,إجازات صرفت نقدا
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,مجال عمل الشركة؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,لمستودع
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,قبولات كل الطلبة
 ,Average Commission Rate,متوسط العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""لهُ رقم تسلسل""  لا يمكن ان يكون ""نعم"" لبند غير قابل للتخزين"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,لا يمكن أن ىكون تاريخ الحضور تاريخ مستقبلي
 DocType: Pricing Rule,Pricing Rule Help,تعليمات قاعدة التسعير
 DocType: School House,House Name,اسم المنزل
 DocType: Purchase Taxes and Charges,Account Head,رئيس حساب
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,تحديث تكاليف إضافية لحساب تكلفة هبطت من البنود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,كهربائي
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,تضاف بقية المؤسسة أن المستخدمين لديك. يمكنك أيضا إضافة تدعو العملاء إلى موقع البوابة عن طريق إضافتها من اتصالات
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,تضاف بقية المؤسسة أن المستخدمين لديك. يمكنك أيضا إضافة تدعو العملاء إلى موقع البوابة عن طريق إضافتها من اتصالات
 DocType: Stock Entry,Total Value Difference (Out - In),إجمالي قيمة الفرق (خارج - في)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4192,7 +4203,7 @@
 DocType: Item,Customer Code,كود العميل
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},تذكير عيد ميلاد ل{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,عدد الأيام منذ آخر أمر
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,يجب أن يكون الخصم لحساب حساب الميزانية العمومية
 DocType: Buying Settings,Naming Series,تسمية تسلسلية
 DocType: Leave Block List,Leave Block List Name,اسم قائمة الإجازات المحظورة
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,يجب أن يكون تاريخ بدء التأمين أقل من تاريخ التأمين النهاية
@@ -4203,29 +4214,30 @@
 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} يجب أن يكون من نوع المسؤولية / حقوق المساهمين
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,حساب الأقفال {0} يجب ان يكون نوعه خصوم  / حقوق الملكيه
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},كشف راتب الموظف {0} تم إنشاؤه مسبقا على سجل التوقيت {1}
 DocType: Vehicle Log,Odometer,عداد المسافات
 DocType: Sales Order Item,Ordered Qty,أمرت الكمية
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,البند هو تعطيل {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,البند هو تعطيل {0}
 DocType: Stock Settings,Stock Frozen Upto,المخزون المجمدة لغاية
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM لا يحتوي على أي بند الأوراق المالية
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},فترة من وفترة لمواعيد إلزامية لالمتكررة {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,مشروع النشاط / المهمة.
 DocType: Vehicle Log,Refuelling Details,تفاصيل إعادة التزود بالوقود
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,إنشاء كشوفات الرواتب
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,يجب أن يكون الخصم أقل من 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,آخر سعر شراء لم يتم العثور على
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,سعر اخر شراء غير موجود
 DocType: Purchase Invoice,Write Off Amount (Company Currency),شطب المبلغ (شركة العملات)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعات الفواتير
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM الافتراضي ل{0} لم يتم العثور
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,الصف # {0}: الرجاء تعيين كمية إعادة الطلب
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انقر على العناصر لإضافتها هنا
 DocType: Fees,Program Enrollment,برنامج التسجيل
 DocType: Landed Cost Voucher,Landed Cost Voucher,هبطت التكلفة قسيمة
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},الرجاء تعيين {0}
 DocType: Purchase Invoice,Repeat on Day of Month,تكرار في يوم من شهر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} هو طالب غير نشط
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} طالب غير نشط
 DocType: Employee,Health Details,تفاصيل الحالة الصحية
 DocType: Offer Letter,Offer Letter Terms,شروط عرض عمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,لإنشاء مستند مرجع طلب الدفع مطلوب
@@ -4234,7 +4246,7 @@
 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 Order,Partly Delivered,سلمت جزئيا
 DocType: Email Digest,Receivables,المستحقات
 DocType: Lead Source,Lead Source,مصدر مبادرة البيع
 DocType: Customer,Additional information regarding the customer.,معلومات إضافية عن العميل.
@@ -4242,7 +4254,7 @@
 DocType: Maintenance Visit,Maintenance Date,تاريخ الصيانة
 DocType: Purchase Invoice Item,Rejected Serial No,رقم المسلسل رفض
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,تاريخ بداية السنة او نهايتها متداخل مع {0}. لتجنب ذلك الرجاء تعيين الشركة
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},يجب أن يكون تاريخ البدء أقل من تاريخ انتهاء القطعة ل {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### 
  إذا تم تعيين سلسلة وليس المذكورة لا المسلسل في المعاملات، سيتم إنشاء الرقم التسلسلي ثم تلقائي على أساس هذه السلسلة. إذا كنت تريد دائما أن يذكر صراحة المسلسل رقم لهذا البند. ترك هذا فارغا."
@@ -4257,7 +4269,7 @@
 DocType: Manufacturing Settings,Manufacturing Settings,إعدادات التصنيع
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,إعداد البريد الإلكتروني
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Guardian1 رقم الجوال
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,الرجاء إدخال العملة الافتراضية في شركة ماستر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,فضلا ادخل العملة المعتاده في الشركة الرئيسيه
 DocType: Stock Entry Detail,Stock Entry Detail,تفاصيل ادخال المخزون
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,تذكير اليومية
 DocType: Products Settings,Home Page is Products,الصفحة الرئيسية المنتجات غير
@@ -4318,7 +4330,6 @@
 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,قائمة صليب البند في مجموعات متعددة
-DocType: Grade Interval,Grade Interval,الصف الفاصل
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},تم تعيين تاريخ بدء السنة المالية و تاريخ انتهاء السنة المالية  بالفعل في السنة المالية {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,إزالة تاريخ تحديث
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,تقسيم دفعة
@@ -4363,14 +4374,14 @@
 DocType: Bin,Reserved Qty for Production,محفوظة الكمية للإنتاج
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ترك دون تحديد إذا كنت لا ترغب في النظر في دفعة مع جعل مجموعات مقرها بالطبع.
 DocType: Asset,Frequency of Depreciation (Months),تردد من الاستهلاك (أشهر)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,حساب الائتمان
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,حساب الائتمان
 DocType: Landed Cost Item,Landed Cost Item,هبطت تكلفة السلعة
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,إظهار القيم صفر
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,كمية البند تم الحصول عليها بعد تصنيع / إعادة التعبئة من كميات معينة من المواد الخام
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,إعداد موقع بسيط لمنظمتي
 DocType: Payment Reconciliation,Receivable / Payable Account,القبض / حساب الدائنة
 DocType: Delivery Note Item,Against Sales Order Item,مقابل عنصر أمر المبيعات
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},يرجى تحديد قيمة السمة للسمة {0}
 DocType: Item,Default Warehouse,النماذج الافتراضية
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},الميزانيه لا يمكن تحديدها مقابل حساب جماعي{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,الرجاء إدخال مركز تكلفة الأصل
@@ -4413,7 +4424,7 @@
 DocType: Opportunity Item,Basic Rate,قيم الأساسية
 DocType: GL Entry,Credit Amount,مبلغ الائتمان
 DocType: Cheque Print Template,Signatory Position,الوظيفة الموقعة
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,على النحو المفقودة
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,على النحو المفقودة
 DocType: Timesheet,Total Billable Hours,مجموع الساعات فوترة
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,إيصال دفع ملاحظة
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ويستند هذا على المعاملات ضد هذا العميل. انظر الجدول الزمني أدناه للاطلاع على التفاصيل
@@ -4425,45 +4436,47 @@
 apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,العملاء في قائمة الانتظار
 DocType: Student,Nationality,جنسية
 ,Items To Be Requested,البنود يمكن طلبه
-DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر تسعيرة شراء
+DocType: Purchase Order,Get Last Purchase Rate,الحصول على آخر سعر شراء
 DocType: Company,Company Info,معلومات عن الشركة
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,تحديد أو إضافة عميل جديد
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,مطلوب مراكز التكلفة لحجز مطالبة حساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,تحديد أو إضافة عميل جديد
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,مركز التكلفة مطلوب لدفتر طلب المصروفات
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),تطبيق الأموال (الأصول )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ويستند هذا على حضور هذا الموظف
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,حساب الخصم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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 +100,Cannot covert to Group because Account Type is selected.,لا يمكن سرية لمجموعة حيث يتم تحديد نوع الحساب.
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,لا يمكن اخفاء المجموعه لأن نوع الحساب تم اختياره من قبل .
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,وقف المستخدمين من طلب إجازة في الأيام التالية.
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,شراء المبلغ
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ الشراء
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,المورد الاقتباس {0} خلق
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,نهاية السنة لا يمكن أن يكون قبل بدء السنة
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,فوائد الموظف
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},الكمية معبأة يجب أن يساوي كمية القطعة ل {0} في {1} الصف
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},يرجى تحديد قائمة العطل الافتراضية للموظف {0} وشركة {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} غير موجود
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} {1} غير موجود
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,رفعت فواتير للعملاء.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,معرف المشروع
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},الصف لا {0}: مبلغ لا يمكن أن يكون أكبر من ريثما المبلغ من النفقات المطالبة {1}. في انتظار المبلغ {2}
 DocType: Maintenance Schedule,Schedule,جدول
-DocType: Account,Parent Account,الأصل حساب
+DocType: Account,Parent Account,الحساب الأصل
 DocType: Quality Inspection Reading,Reading 3,قراءة 3
 ,Hub,محور
 DocType: GL Entry,Voucher Type,نوع السند
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,قائمة الأسعار لم يتم العثور أو تعطيلها
 DocType: Employee Loan Application,Approved,وافق
 DocType: Pricing Rule,Price,السعر
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',الموظف معفى على {0} يجب أن يتم تعيينه ' مغادر '
 DocType: Guardian,Guardian,وصي
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,التقييم {0} تم إنشاؤه للموظف {1} في النطاق الزمني المحدد
 DocType: Employee,Education,تعليم
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ديل
 DocType: Selling Settings,Campaign Naming By,حملة التسمية بواسطة
 DocType: Employee,Current Address Is,العنوان الحالي هو
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,تم التعديل
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختياري. ضبط العملة الافتراضية للشركة، إذا لم يكن محددا.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,القيود المحاسبية
 DocType: Delivery Note Item,Available Qty at From Warehouse,الكمية المتوفرة في المستودعات من
@@ -4472,7 +4485,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,الرجاء إدخال حساب المصاريف
 DocType: Account,Stock,المخزون
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من طلب شراء، شراء فاتورة أو إدخال دفتر اليومية
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",الصف # {0}: يجب أن يكون مرجع نوع الوثيقة واحدة من طلب شراء، شراء فاتورة أو إدخال دفتر اليومية
 DocType: Employee,Current Address,العنوان الحالي
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",إذا كان البند هو البديل من بند آخر ثم وصف، صورة، والتسعير، والضرائب سيتم تعيين غيرها من القالب، ما لم يذكر صراحة
 DocType: Serial No,Purchase / Manufacture Details,تفاصيل شراء / تصنيع
@@ -4488,7 +4501,7 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,مجموع الضرائب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,For Quantity (Manufactured Qty) is mandatory,لالكمية (الكمية المصنعة) إلزامي
 DocType: Stock Entry,Default Target Warehouse,الهدف الافتراضي مستودع
-DocType: Purchase Invoice,Net Total (Company Currency),المجموع الصافي (عملة الشركة)
+DocType: Purchase Invoice,Net Total (Company Currency),صافي الأجمالي ( بعملة الشركة )
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,تاريخ نهاية السنة لا يمكن أن يكون أقدم من تاريخ بداية السنة. يرجى تصحيح التواريخ وحاول مرة أخرى.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,الصف {0}: نوع الحزب والحزب لا ينطبق إلا على المقبوضات / حسابات المدفوعات
 DocType: Notification Control,Purchase Receipt Message,رسالة إيصال شراء
@@ -4500,7 +4513,7 @@
 DocType: Hub Settings,Hub Settings,إعدادات المحور
 DocType: Project,Gross Margin %,هامش إجمالي٪
 DocType: BOM,With Operations,مع عمليات
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,تم إجراء القيود المحاسبية بالعملة {0} مسبقاً لشركة {1}. يرجى تحديد حساب يمكن استلامه أو دفعه بالعملة {0}.
 DocType: Asset,Is Existing Asset,والقائمة الأصول
 DocType: Salary Detail,Statistical Component,العنصر الإحصائي
 ,Monthly Salary Register,سجل الراتب الشهري
@@ -4523,7 +4536,7 @@
 DocType: Assessment Plan,Room,غرفة
 DocType: Purchase Order,Advance Paid,مسبقا المدفوعة
 DocType: Item,Item Tax,البند الضرائب
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,المواد للمورد ل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,المواد للمورد ل
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,المكوس الفاتورة
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ يظهر أكثر من مرة
 DocType: Expense Claim,Employees Email Id,البريد الإلكتروني  للموظف
@@ -4554,9 +4567,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,إرفاق صورة الشعار/العلامة التجارية
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,تحديد المستوى
 DocType: Customer,Commission Rate,نسبة العمولة
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,أنشئ متغير
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,أنشئ متغير
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,إجازة محجوزة من قبل الأدارة
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",يجب أن يكون نوع دفعة واحدة من استلام والدفع ونقل الداخلي
 apps/erpnext/erpnext/config/selling.py +179,Analytics,التحليلات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,السلة فارغة
 DocType: Vehicle,Model,نموذج
@@ -4565,12 +4578,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,لا يمكن تحرير الجذر.
 DocType: Item,Units of Measure,وحدات القياس
 DocType: Manufacturing Settings,Allow Production on Holidays,السماح الإنتاج على عطلات
-DocType: Sales Order,Customer's Purchase Order Date,تاريخ طلب شراء العميل
+DocType: Sales Order,Customer's Purchase Order Date,تاريخ امر الشراء العميل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,أسهم رأس المال
+DocType: Shopping Cart Settings,Show Public Attachments,عرض المرفقات العامة
 DocType: Packing Slip,Package Weight Details,تفاصيل حزمة الوزن
 DocType: Payment Gateway Account,Payment Gateway Account,دفع حساب البوابة
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,اعاده توجيه المستخدم الى الصفحات المحدده بعد اكتمال عمليه الدفع
-DocType: Company,Existing Company,الشركة القائمة
+DocType: Company,Existing Company,الشركة القائمه
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,يرجى تحديد ملف CSV
 DocType: Student Leave Application,Mark as Present,إجعلها الحاضر
 DocType: Purchase Order,To Receive and Bill,لتلقي وبيل
@@ -4581,19 +4595,19 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Cost Center is required in row {0} in Taxes table for type {1},مطلوب مركز تكلفة في الصف {0} في جدول الضرائب لنوع {1}
 DocType: Program,Program Code,رمز البرنامج
 DocType: Terms and Conditions,Terms and Conditions Help,الشروط والأحكام مساعدة
-,Item-wise Purchase Register,البند من الحكمة الشراء تسجيل
+,Item-wise Purchase Register,سجل حركة المشتريات وفقا للصنف
 DocType: Batch,Expiry Date,تاريخ انتهاء الصلاحية
 ,Supplier Addresses and Contacts,العناوين المورد و اتصالات
 ,accounts-browser,متصفح الحسابات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,الرجاء اختيار الفئة الأولى
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,الرجاء اختيار الفئة الأولى
 apps/erpnext/erpnext/config/projects.py +13,Project master.,المشروع الرئيسي.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",للسماح الإفراط في الفواتير أو الإفراط في الطلب، وتحديث &quot;بدل&quot; في إعدادات المالية أو البند.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,لا تظهر أي رمز مثل $ الخ بجانب العملات.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نصف يوم)
 DocType: Supplier,Credit Days,الائتمان أيام
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,جعل دفعة الطلبة
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,جعل دفعة الطلبة
 DocType: Leave Type,Is Carry Forward,هل تضاف في العام التالي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM الحصول على أصناف من
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM الحصول على أصناف من
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,يوم ووقت مبادرة البيع
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},الصف # {0}: تاريخ النشر يجب أن يكون نفس تاريخ الشراء {1} من الأصول {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,الرجاء إدخال أوامر البيع في الجدول أعلاه
@@ -4605,12 +4619,11 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},الصف {0}: مطلوب نوع الحزب وحزب المقبوضات / حسابات المدفوعات {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,المرجع التسجيل
 DocType: Employee,Reason for Leaving,سبب ترك العمل
-DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل (شركة العملات)
+DocType: BOM Operation,Operating Cost(Company Currency),تكاليف التشغيل ( بعملة الشركة )
 DocType: Employee Loan Application,Rate of Interest,معدل الفائدة
 DocType: Expense Claim Detail,Sanctioned Amount,القيمة المقرر صرفه
 DocType: GL Entry,Is Opening,وفتح
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},لا يمكن ربط الخصم المباشر الإدخال مع {1} الصف {0}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,يرجى إعداد سلسلة الترقيم للحضور عن طريق الإعداد&gt; سلسلة الترقيم
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 0bef084..7423abd 100644
--- a/erpnext/translations/bg.csv
+++ b/erpnext/translations/bg.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Отдаден под наем
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Приложимо за User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Спряно производство Поръчка не може да бъде отменено, отпуши го първо да отмените"
 DocType: Vehicle Service,Mileage,километраж
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Наистина ли искате да се бракувате от този актив?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Избор на доставчик по подразбиране
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Избор на доставчик по подразбиране
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Изисква се валута за Ценоразпис {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ще се изчисли при транзакция.
 DocType: Purchase Order,Customer Contact,Клиент - Контакти
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Изключително за {0} не може да бъде по-малък от нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,По подразбиране 10 минути
 DocType: Leave Type,Leave Type Name,Тип отсъствие - Име
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Покажи отворен
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Покажи отворен
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Номерацията е успешно обновена
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Поръчка
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Начисляване на заплати - Изпратено
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Партида - Статус на срок на годност
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банков чек
 DocType: Mode of Payment Account,Mode of Payment Account,Вид на разплащателна сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Покажи Варианти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Покажи Варианти
 DocType: Academic Term,Academic Term,Академик Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Списъка със сметки не може да бъде празен.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Заеми (пасиви)
 DocType: Employee Education,Year of Passing,Година на изтичане
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Справка:% S, Код:% S и гостите:% S"
 DocType: Item,Country of Origin,Страна на произход
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,В наличност
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,открити въпроси
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Грижа за здравето
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Забавяне на плащане (дни)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериен номер: {0} вече е посочен в фактурата за продажби: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} се изисква
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Очаквана дата на доставка е било преди Продажби Дата на поръчката
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепете .csv файл с две колони, по един за старото име и един за новото име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не в някоя активна фискална година.
 DocType: Packed Item,Parent Detail docname,Родител Подробности docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референция: {0}, кода на елемента: {1} и клиента: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Кг
 DocType: Student Log,Log,Журнал
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Откриване на работа.
 DocType: Item Attribute,Increment,Увеличение
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Изберете склад ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изберете склад ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Същата фирма се вписват повече от веднъж
 DocType: Employee,Married,Омъжена
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не е разрешен за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Вземете елементи от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не е разрешен за {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Вземете елементи от
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фондова не може да бъде актуализиран срещу Бележка за доставка {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Каталог на {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Няма изброени елементи
 DocType: Payment Reconciliation,Reconcile,Съгласувайте
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Хранителни стоки
 DocType: Quality Inspection Reading,Reading 1,Четене 1
 DocType: Process Payroll,Make Bank Entry,Направи Bank Влизане
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионни фондове
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следваща дата на амортизация не може да бъде преди датата на покупка
 DocType: SMS Center,All Sales Person,Всички продажби Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Месечно Разпределение ** ви помага да разпределите бюджета / целеви разходи през месеците, ако имате сезонност в бизнеса си."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не са намерени
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Не са намерени
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Заплата Структура Липсващ
 DocType: Lead,Person Name,Лице Име
 DocType: Sales Invoice Item,Sales Invoice Item,Фактурата за продажба - позиция
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",например &quot;Основно училище&quot; или &quot;университет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Сток Доклади
 DocType: Warehouse,Warehouse Detail,Скалд - Детайли
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е бил надхвърлен за клиенти {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term крайна дата не може да бъде по-късно от края на годината Дата на учебната година, към който е свързан терминът (Academic Година {}). Моля, коригирайте датите и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Е фиксиран актив"" не може да бъде размаркирано, докато съществува запис за елемента"
 DocType: Vehicle Service,Brake Oil,Спирачна течност
 DocType: Tax Rule,Tax Type,Данъчна тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Вие не можете да добавяте или актуализация записи преди {0}
 DocType: BOM,Item Image (if not slideshow),Позиция - снимка (ако не слайдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Съществува Customer със същото име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(надница на час / 60) * действително отработено време
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Изберете BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Изберете BOM
 DocType: SMS Log,SMS Log,SMS Журнал
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Разходи за доставени изделия
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Отпускът на {0} не е между От Дата и До  дата
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,училища
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Няма запис за отпуск за служител {0} за {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Моля, въведете първата компания"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Моля, изберете първо фирма"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,"Моля, изберете първо фирма"
 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 +27,Target On,Target On
 DocType: BOM,Total Cost,Обща Цена
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Изискайте Сума
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,"Duplicate клиентска група, намерени в таблицата на cutomer група"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Доставчик тип / Доставчик
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Доставчик тип / Доставчик
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Консумативи
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Клас
 DocType: Sales Invoice Item,Delivered By Supplier,Доставени от доставчик
 DocType: SMS Center,All Contact,Всички контакти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Производство Поръчка вече е създаден за всички артикули с BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишна заплата
 DocType: Daily Work Summary,Daily Work Summary,Ежедневната работа Резюме
 DocType: Period Closing Voucher,Closing Fiscal Year,Приключване на финансовата година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} е замразен
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} е замразен
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Моля изберете съществуващо дружество за създаване на сметкоплан
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Сток Разходи
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Изберете Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Обратно записване
 DocType: Journal Entry Account,Credit in Company Currency,Кредит във валута на фирмата
 DocType: Delivery Note,Installation Status,Монтаж - Статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Искате ли да се актуализира и обслужване? <br> Подарък: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прието + Отхвърлено Количество трябва да бъде равно на Получено количество за {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Доставка на суровини за поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,се изисква най-малко един режим на плащане за POS фактура.
 DocType: Products Settings,Show Products as a List,Показване на продукти като Списък
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Изтеглете шаблони, попълнете необходимите данни и се прикрепва на текущото изображение. Всички дати и служител комбинация в избрания период ще дойде в шаблона, със съществуващите записи посещаемост"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Направи Амортизация Влизане
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Заявка Тип
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направи Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Направи Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радиопредаване
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Изпълнение
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Подробности за извършените операции.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посещения за поддръжка.
 DocType: SMS Settings,Enter url parameter for message,Въведете URL параметър за съобщение
 DocType: POS Profile,Customer Groups,Групи клиенти
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансови отчети
 DocType: Guardian,Students,Ученици
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила за прилагане на ценообразуване и отстъпка.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Цена списък трябва да бъде приложимо за покупка или продажба
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Адванс сума не може да бъде по-голяма от {0} {1}
 DocType: Naming Series,Series List for this Transaction,Списък с номерации за тази транзакция
 DocType: Company,Default Payroll Payable Account,По подразбиране ТРЗ Задължения сметка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Актуализация Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Актуализация Email Group
 DocType: Sales Invoice,Is Opening Entry,Се отваря Влизане
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Споменете, ако нестандартно вземане предвид приложимо"
 DocType: Course Schedule,Instructor Name,инструктор Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,За склад се изисква преди изпращане
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако е избрано, ще включва не-склад продукта в материала искания."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Срещу ред от фактура за продажба
 ,Production Orders in Progress,Производствени поръчки в процес на извършване
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Net Cash от Финансиране
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage е пълен, не беше записан"
 DocType: Lead,Address & Contact,Адрес и контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добави неизползвани отпуски от предишни разпределения
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следваща повтарящо {0} ще бъде създаден на {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общо Остойностяване сума (чрез Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Позиция Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставете Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банкови записи
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Позиция {0} е достигнала края на своя живот на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Банкови записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Склад за помирение Точка
 DocType: Stock Entry,Sales Invoice No,Фактура за продажба - Номер
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Публикувай в Hub
 DocType: Student Admission,Student Admission,прием на студенти
 ,Terretory,Територия
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Точка {0} е отменена
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Заявка за материал
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Точка {0} е отменена
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Заявка за материал
 DocType: Bank Reconciliation,Update Clearance Date,Актуализация Клирънсът Дата
 DocType: Item,Purchase Details,Изкупните Детайли
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Позиция {0} не е открита в ""суровини Доставени""в Поръчката {1}"
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Неуредени Чекове и Депозити
 DocType: Item,Synced With Hub,Синхронизирано С Hub
 DocType: Vehicle,Fleet Manager,Мениджър на автопарк
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Ред {0} {1} не може да бъде отрицателен за позиция {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Грешна Парола
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Ред {0} {1} не може да бъде отрицателен за позиция {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Грешна Парола
 DocType: Item,Variant Of,Вариант на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Изпълнено Количество не може да бъде по-голямо от ""Количество за производство"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Изпълнено Количество не може да бъде по-голямо от ""Количество за производство"""
 DocType: Period Closing Voucher,Closing Account Head,Закриване на профила Head
 DocType: Employee,External Work History,Външно работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклична референция - Грешка
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Изпращайте по имейл за създаване на автоматично искане за материали
 DocType: Journal Entry,Multi Currency,Много валути
 DocType: Payment Reconciliation Invoice,Invoice Type,Вид фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Складова разписка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Складова разписка
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Създаване Данъци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Разходи за продадения актив
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Заплащане вписване е променен, след като го извади. Моля, изтеглете го отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
-DocType: Grade Interval,Min Score,Минимален рейтинг
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} е въведен два пъти в данък за позиция
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме за тази седмица и предстоящи дейности
 DocType: Student Applicant,Admitted,Допуснати
 DocType: Workstation,Rent Cost,Разход за наем
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Стойност на поръчката
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банкови / Касови операции по партньор или за вътрешно прехвърляне
 DocType: Shipping Rule,Valid for Countries,Важи за Държави
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Тази позиция е шаблон и не може да се използва в сделките. Елемент атрибути ще бъдат копирани в вариантите освен &quot;Не Copy&quot; е зададен
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Общо Поръчка Смятан
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Наименование на служителите (например главен изпълнителен директор, директор и т.н.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Моля, въведете &quot;Повторение на Ден на месец поле стойност"
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row {0}: Покупка на фактура не може да се направи срещу съществуващ актив {1}
 DocType: Item Tax,Tax Rate,Данъчна Ставка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},"{0} вече разпределена за Служител {1} за период {2} {3}, за да"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Изберете Точка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Изберете Точка
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Фактурата за покупка {0} вече се представя
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Не трябва да е същото като {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Конвертиране в не-Група
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партида на дадена позиция.
 DocType: C-Form Invoice Detail,Invoice Date,Дата на фактура
 DocType: GL Entry,Debit Amount,Дебит сума
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може да има само един акаунт нза тази фирма в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Моля, вижте прикачения файл"
 DocType: Purchase Order,% Received,% Получени
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Създаване на ученически групи
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Запитване за оферта
 DocType: Salary Slip Timesheet,Working Hours,Работно Време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промяна на изходния / текущия номер за последователност на съществуваща серия.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Създаване на нов клиент
-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.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Създаване на поръчки за покупка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Създаване на нов клиент
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако няколко ценови правила продължават да преобладават, потребителите се приканват да се настрои приоритет ръчно да разрешите конфликт."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Създаване на поръчки за покупка
 ,Purchase Register,Покупка Регистрация
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Приложимите цени
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) трябва да има роля в ""Одобряващ напускане"""
 DocType: Purchase Receipt,Vehicle Date,Камион Дата
 DocType: Student Log,Medical,Медицински
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина за загубата
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Причина за загубата
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Собственикът на Потенциален клиент не може да бъде същия като потенциалния клиент
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Разпределени сума може да не по-голяма от некоригирана стойност
 DocType: Announcement,Receiver,Получател
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Брой и процент
 DocType: Delivery Note,% Installed,% Инсталиран
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Класните стаи / лаборатории и т.н., където може да бъдат насрочени лекции."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Моля, въведете име на компанията първа"
 DocType: Purchase Invoice,Supplier Name,Доставчик Наименование
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочетете инструкциите ERPNext
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Предишен родител
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Задължително поле - академична година
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Персонализирайте уводен текст, който върви като част от този имейл. Всяка транзакция има отделен въвеждащ текст."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},"Моля, задайте по подразбиране платим акаунт за фирмата {0}"
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобални настройки за всички производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Замразени Сметки до
 DocType: SMS Log,Sent On,Изпратено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Умение {0} избрани няколко пъти в атрибути на маса
 DocType: HR Settings,Employee record is created using selected field. ,Запис на служителите е създаден с помощта на избран област.
 DocType: Sales Order,Not Applicable,Не Е Приложимо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Основен празник
 DocType: Request for Quotation Item,Required Date,Изисвани - Дата
 DocType: Delivery Note,Billing Address,Адрес на фактуриране
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Моля, въведете Код."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Моля, въведете Код."
 DocType: BOM,Costing,Остойностяване
 DocType: Tax Rule,Billing County,(Фактура) Област
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е избрано, размерът на данъка ще се считат за която вече е включена в Print Курсове / Print размер"
@@ -500,6 +504,7 @@
 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,Ценни книжа и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да се промени методът на оценка, тъй като има транзакции срещу някои позиции, които нямат собствен метод за оценка"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Общо отсъствия разпределени е задължително
 DocType: Job Opening,Description of a Job Opening,Описание на позиция за работа
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Предстоящите дейности за днес
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Административният директор
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Моля, изберете Курс"
 DocType: Timesheet Detail,Hrs,Часове
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Моля изберете Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Моля изберете Company
 DocType: Stock Entry Detail,Difference Account,Разлика Акаунт
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Не може да се затвори задача, тъй като зависим задача {0} не е затворена."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +538,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","За да се слеят, следните свойства трябва да са едни и същи и за двете позиции"
 DocType: Shipping Rule,Net Weight,Нето Тегло
 DocType: Employee,Emergency Phone,Телефон за спешни
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купи
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Моля, определете степен за Threshold 0%"
 DocType: Sales Order,To Deliver,Да достави
 DocType: Purchase Invoice Item,Item,Артикул
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Сериен № - позиция не може да бъде част
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Dr - Cr)
 DocType: Account,Profit and Loss,Приходи и разходи
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управление Подизпълнители
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Увеличаване не може да бъде 0
 DocType: Production Planning Tool,Material Requirement,Материал Изискване
 DocType: Company,Delete Company Transactions,Изтриване на транзакциите на фирма
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Референтен Не и Референтен Дата е задължително за Bank сделка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавяне / Редактиране на данъци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Доставчик - Фактура номер
 DocType: Territory,For reference,За референция
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Монтаж Забележка Точка
 DocType: Production Plan Item,Pending Qty,Чакащо Количество
 DocType: Budget,Ignore,Игнорирай
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS изпратен на следните номера: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Проверете настройките размери за печат
 DocType: Salary Slip,Salary Slip Timesheet,Заплата Slip график
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Общо комисионна
 DocType: Pricing Rule,Sales Partner,Търговски партньор
 DocType: Buying Settings,Purchase Receipt Required,Покупка Квитанция Задължително
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Оценка процент е задължително, ако влезе Откриване Фондова"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не са намерени записи в таблицата с фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Моля изберете Company и Party Type първи
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансови / Счетоводство година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Натрупаните стойности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Съжаляваме, серийни номера не могат да бъдат слети"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Направи поръчка за продажба
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Направи поръчка за продажба
 DocType: Project Task,Project Task,Проект Task
 ,Lead Id,Потенциален клиент - Номер
 DocType: C-Form Invoice Detail,Grand Total,Общо
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повторете клиенти
 DocType: Leave Control Panel,Allocate,Разпределяйте
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажбите Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Продажбите Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забележка: Общо отпуснати листа {0} не трябва да бъдат по-малки от вече одобрените листа {1} за периода
 DocType: Announcement,Posted By,Публикувано от
 DocType: Item,Delivered by Supplier (Drop Ship),Доставени от доставчик (Drop Ship)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Оферта до
 DocType: Lead,Middle Income,Среден доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Откриване (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Отпусната сума не може да бъде отрицателна
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Моля, задайте фирмата"
 DocType: Purchase Order Item,Billed Amt,Фактурирана Сума
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Фактурата за продажба - График
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен номер по &amp; Референтен Дата се изисква за {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Изберете профил на плащане, за да се направи Bank Влизане"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Създаване на записи на наети да управляват листа, претенции за разходи и заплати"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Добави в базата знания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Предложение за писане
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плащането Влизане Приспадане
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},"{0} ""{1}"" не е във Фискална година {2}"
 DocType: Buying Settings,Settings for Buying Module,Настройки за закупуване Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} не принадлежи на компания {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Моля, въведете Покупка Квитанция първия"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Моля, въведете Покупка Квитанция първия"
 DocType: Buying Settings,Supplier Naming By,"Доставчик наименуването им,"
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогава към цените правилник се филтрират базирани на гостите, група клиенти, територия, доставчик, доставчик Type, Кампания, продажба Partner т.н."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Нетна промяна в Инвентаризация
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Служител за управление на кредита
 DocType: Employee,Passport Number,Номер на паспорт
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Връзка с Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Мениджър
 DocType: Payment Entry,Payment From / To,Плащане от / към
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Период от време
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е по-малко от сегашната изключително количество за клиента. Кредитен лимит трябва да бъде поне {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""Въз основа на"" и ""Групиране По"" не могат да бъдат еднакви"
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,В минути
 DocType: Issue,Resolution Date,Резолюция Дата
 DocType: Student Batch Name,Batch Name,Партида Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,График създаден:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,График създаден:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Моля, задайте по подразбиране брой или банкова сметка в начинът на плащане {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Записване
 DocType: Selling Settings,Customer Naming By,Задаване на име на клиента от
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ще покажем на студента като настояще в Студентски Месечен Присъствие Доклад
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Действително Начално Време
 DocType: BOM Operation,Operation Time,Операция - време
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,завършек
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,база
 DocType: Timesheet,Total Billed Hours,Общо Фактурирани Часа
 DocType: Journal Entry,Write Off Amount,Сума за отписване
 DocType: Journal Entry,Bill No,Фактура - Номер
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Student Присъствие
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Изписване на суровини въз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Моля, въведете данните т"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Моля, въведете данните т"
 DocType: Interest,Interest,Лихва
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предварителни продажби
 DocType: Purchase Receipt,Other Details,Други детайли
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Заплащане Влизане вече е създаден
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличност
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row {0}: Asset {1} не свързан с т {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Преглед на фиш за заплата
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Преглед на фиш за заплата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е била въведена на няколко пъти
 DocType: Account,Expenses Included In Valuation,"Разходи, включени в остойностяване"
 DocType: Hub Settings,Seller City,Продавач - Град
 ,Absent Student Report,Доклад за отсъствия на учащи се
 DocType: Email Digest,Next email will be sent on:,Следващият имейл ще бъде изпратен на:
 DocType: Offer Letter Term,Offer Letter Term,Оферта - Писмо - Условия
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Позицията има варианти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Позицията има варианти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е намерена
 DocType: Bin,Stock Value,Стойността на акциите
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не съществува
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количество Консумирано на бройка
 DocType: Serial No,Warranty Expiry Date,Гаранция - Дата на изтичане
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комисионен процент (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Моля, изберете Програма"
 DocType: Project,Estimated Cost,Очаквани разходи
 DocType: Purchase Order,Link to material requests,Препратка към материални искания
@@ -753,7 +756,7 @@
 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,Сметка по подрозбиране
 DocType: Payment Entry,Received Amount (Company Currency),Получената сума (фирмена валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Потенциален клиент трябва да се настрои, ако възможност е създадена за потенциален клиент"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Моля изберете седмичен почивен ден
 DocType: Production Order Operation,Planned End Time,Планирано Крайно време
 ,Sales Person Target Variance Item Group-Wise,Продажбите Person Target Вариацията т Group-Wise
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,Възможност - От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечно извлечение заплата.
 DocType: BOM,Website Specifications,Сайт Спецификации
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране за участие чрез настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} от вид {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Превръщане Factor е задължително
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Банкова сметка номер
 DocType: Bank Guarantee,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Четене 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Частична поръчано
 DocType: Expense Claim Detail,Expense Claim Type,Expense претенция Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройките по подразбиране за пазарската количка
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset бракуват чрез вестник Влизане {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,Разходи за поддръжка на офис
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Създаване на имейл акаунт
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Моля, въведете Точка първа"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Моля, въведете Точка първа"
 DocType: Account,Liability,Отговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да бъде по-голяма от претенция Сума в Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Себестойност на продадените стоки - Сметка по подразбиране
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ценова листа не избран
 DocType: Employee,Family Background,Семейна среда
 DocType: Request for Quotation Supplier,Send Email,Изпрати е-мейл
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Внимание: Невалиден прикачен файл {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Няма разрешение
 DocType: Company,Default Bank Account,Банкова сметка по подразб.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За да филтрирате базирани на партия, изберете страна Напишете първия"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Няма намерен служител
 DocType: Supplier Quotation,Stopped,Спряно
 DocType: Item,If subcontracted to a vendor,Ако възложи на продавача
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентската група вече е актуализирана.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентската група вече е актуализирана.
 DocType: SMS Center,All Customer Contact,Всички клиенти Контакти
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Качване на наличности на склад чрез CSV.
 DocType: Warehouse,Tree Details,Дърво - Детайли
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимална сума на фактурата
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Разходен център {2} не принадлежи на компания {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да бъде група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,График {0} вече е завършено или анулирано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка Row {IDX}: {DOCTYPE} {DOCNAME} не съществува в по-горе &quot;{DOCTYPE}&quot; на маса
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,График {0} вече е завършено или анулирано
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Няма задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Денят от месеца, на която автоматичната фактура ще бъде генерирана например 05, 28 и т.н."
 DocType: Asset,Opening Accumulated Depreciation,Откриване на начислената амортизация
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,Пълзяща средна стойност - Курс
 DocType: Production Planning Tool,Select Items,Изберете артикули
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} срещу Сметка {1} от {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,График на курса
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,График на курса
 DocType: Maintenance Visit,Completion Status,Статус на Завършване
 DocType: HR Settings,Enter retirement age in years,Въведете пенсионна възраст в години
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целеви склад
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Оставя се в продължение на доставка или получаване до запълването този процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Импорт - Присъствие
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Всички стокови групи
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всички стокови групи
 DocType: Process Payroll,Activity Log,Журнал на дейностите
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нетна печалба / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично композира съобщение при представяне на сделките.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Поръчка за покупка на плащане
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозно Количество
 DocType: Sales Invoice,Payment Due Date,Дължимото плащане Дата
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Позиция Variant {0} вече съществува с едни и същи атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Начален баланс"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Складова разписка - Съобщение
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Поръчка Количество
 DocType: Leave Block List Date,Leave Block List Date,Оставете Block List Дата
 DocType: Pricing Rule,Price or Discount,Цена или Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Общо приложими такси в Покупка получаване артикули маса трябва да са същите, както Общо данъци и такси"
 DocType: Sales Team,Incentives,Стимули
 DocType: SMS Log,Requested Numbers,Желани номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Снабдете Само суровини
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Преотстъпват
 DocType: Item Attribute,Item Attribute Values,Позиция атрибут - Стойности
 DocType: Examination Result,Examination Result,Разглеждане Резултати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Покупка Разписка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Покупка Разписка
 ,Received Items To Be Billed,"Приети артикули, които да се фактирират"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Добавен на заплатите Подхлъзвания
 DocType: Employee,Ms,Госпожица
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Обмяна На Валута - основен курс
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Референтен Doctype трябва да бъде един от {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Референтен Doctype трябва да бъде един от {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Не може да се намери време слот за следващия {0} ден за операция {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал за частите
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Търговски дистрибутори и територия
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Не може автоматично да създадете сметка като там има наличност в сметката. Трябва да се създаде съвпадение сметка, преди да може да се правят операции в този склад"
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,По подразбиране Платими сметки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Служител {0} не е активен или не съществува
 DocType: Fee Structure,Components,Компоненти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Позиция Варианти {0} актуализиран
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Моля, въведете Asset Категория т {0}"
 DocType: Quality Inspection Reading,Reading 6,Четене 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да {0} {1} {2} без отрицателна неплатена фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактурата за покупка Advance
 DocType: Hub Settings,Sync Now,Синхронизирай сега
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit влизане не може да бъде свързана с {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,Дали Покупка Точка
 DocType: Asset,Purchase Invoice,Фактура за покупка
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Деайли Номер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Нова фактурата за продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Нова фактурата за продажба
 DocType: Stock Entry,Total Outgoing Value,Общо Изходящ Value
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Откриване Дата и крайния срок трябва да бъде в рамките на същата фискална година
 DocType: Lead,Request for Information,Заявка за информация
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Синхронизиране на офлайн Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Синхронизиране на офлайн Фактури
 DocType: Payment Request,Paid,Платен
 DocType: Program Fee,Program Fee,Такса програма
 DocType: Salary Slip,Total in words,Общо - СЛОВОМ
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,санкционирана
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; маса."
 DocType: Job Opening,Publish on website,Публикуване на интернет страницата
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Пратки към клиенти
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,"Дата Доставчик на фактура не може да бъде по-голяма, отколкото Публикуване Дата"
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Вариране
 ,Company Name,Име на фирмата
 DocType: SMS Center,Total Message(s),Общо съобщения
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Изберете артикул за прехвърляне
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,"Изберете акаунт шеф на банката, в която е депозирана проверка."
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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,Химически
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash сметка ще се актуализира автоматично в Заплата вестник Влизане когато е избран този режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервалите за Grade Код {0} се припокрива с интервалите клас за други класове. Вашето интервали {0} и {1} и опитайте отново
 DocType: BOM,Raw Material Cost(Company Currency),Разходи за суровини (фирмена валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Всички предмети са били прехвърлени вече за тази производствена поръчка.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Ред # {0}: Процентът не може да бъде по-голям от курса, използван в {1} {2}"
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website позиция
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Качете ваш дизайн за заглавно писмо и лого. (Можете да ги редактирате по-късно).
 DocType: Timesheet Detail,Bill,Фактура
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следваща дата на амортизация е въведена като минала дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бял
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Кол не е на разположение за {4} в склад {1} при публикуване време на влизането ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Вземи платени аванси
 DocType: Item,Automatically Create New Batch,Автоматично създаване на нова папка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Правя
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Правя
 DocType: Student Admission,Admission Start Date,Допускане Начална дата
 DocType: Journal Entry,Total Amount in Words,Обща сума - Словом
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Имаше грешка. Една вероятна причина може да бъде, че не сте запаметили формата. Моля, свържете се support@erpnext.com ако проблемът не бъде отстранен."
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,Начално Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Моля, въведете Account за промяна сума"
 DocType: Student Batch Name,Student Batch Name,Student Batch Име
 DocType: Holiday List,Holiday List Name,Име на списък на празниците
 DocType: Repayment Schedule,Balance Loan Amount,Баланс на заема
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},"Моля, посочете {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Премахнати артикули с никаква промяна в количеството или стойността.
 DocType: Delivery Note,Delivery To,Доставка до
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Умение маса е задължително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Умение маса е задължително
 DocType: Production Planning Tool,Get Sales Orders,Вземи поръчките за продажби
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да бъде отрицателно
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Отстъпка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Отстъпка
 DocType: Asset,Total Number of Depreciations,Общ брой на амортизации
 DocType: Sales Invoice Item,Rate With Margin,Оцени с марджин
 DocType: Workstation,Wages,Заплати
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Включено Warehouse в продажбите Поръчка / готова продукция Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Продажба Сума
 DocType: Repayment Schedule,Interest Amount,Сума на лихва
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте &quot;Състояние&quot; и спести
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте за сметка одобряващ за този запис. Моля Актуализирайте &quot;Състояние&quot; и спести
 DocType: Serial No,Creation Document No,Създаване документ №
 DocType: Issue,Issue,Изписване
 DocType: Asset,Scrapped,Брак
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за т варианти. например размер, цвят и т.н."
 DocType: Purchase Invoice,Returns,Се завръща
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Сериен № {0} е по силата на договор за техническо обслужване до  {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Сериен № {0} е по силата на договор за техническо обслужване до  {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,назначаване на работа
 DocType: Lead,Organization Name,Наименование на организацията
 DocType: Tax Rule,Shipping State,Доставка - състояние
 ,Projected Quantity as Source,Прогнозно количество като Източник
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Позициите трябва да се добавят с помощта на ""Вземи от поръчка за покупки"" бутона"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Позициите трябва да се добавят с помощта на ""Вземи от поръчка за покупки"" бутона"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включване на неналични продукти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Продажби Разходи
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,Срещу
 DocType: Item,Default Selling Cost Center,Разходен център за продажби по подразбиране
 DocType: Sales Partner,Implementation Partner,Партньор за внедряване
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Пощенски код
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Пощенски код
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Поръчка за продажба {0} е {1}
 DocType: Opportunity,Contact Info,Информация за контакт
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Въвеждане на складови записи
 DocType: Packing Slip,Net Weight UOM,Нето тегло мерна единица
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Резултати
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Резултати
 DocType: Item,Default Supplier,Доставчик по подразбиране
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Свръхпроизводство - позволен процент
 DocType: Employee Loan,Repayment Schedule,погасителен план
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Вземи Седмичен дати
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Крайна дата не може да бъде по-малка от началната дата
 DocType: Sales Person,Select company name first.,Изберете име на компанията на първо място.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Оферти получени от доставчици.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},За  {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средна възраст
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Ключова област на ефективността
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Невалиден атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} трябва да бъде изпратено
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} трябва да бъде изпратено
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количеството трябва да бъде по-малка или равна на {0}
 DocType: SMS Center,Total Characters,Общо знаци
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Моля изберете BOM BOM в полето за позиция {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,Дистрибутор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Количка за пазаруване - Правила за доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производство Поръчка {0} трябва да се отмени преди анулира тази поръчка за продажба
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Моля, задайте &quot;Прилагане Допълнителна отстъпка от &#39;"
 ,Ordered Items To Be Billed,"Поръчани артикули, които да се фактурират"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,От диапазон трябва да бъде по-малко от До диапазон
 DocType: Global Defaults,Global Defaults,Глобални настройки по подразбиране
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Старт Година
 DocType: Purchase Invoice,Start date of current invoice's period,Начална дата на периода на текущата фактура за
 DocType: Salary Slip,Leave Without Pay,Неплатен отпуск
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Грешка при Планиране на капацитета
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Грешка при Планиране на капацитета
 ,Trial Balance for Party,Оборотка за партньор
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Печалба
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Това ще бъде приложена към Кодекса Точка на варианта. Например, ако вашият съкращението е &quot;SM&quot;, а кодът на елемент е &quot;ТЕНИСКА&quot;, кодът позиция на варианта ще бъде &quot;ТЕНИСКА-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Pay (словом) ще бъде видим след като спаси квитанцията за заплата.
 DocType: Purchase Invoice,Is Return,Дали Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Връщане / дебитно известие
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Връщане / дебитно известие
 DocType: Price List Country,Price List Country,Ценоразпис Country
 DocType: Item,UOMs,Мерни единици
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} валидни серийни номера за Артикул {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Моля, въведете Код, за да получите Batch Номер"
 DocType: Stock Settings,Default Item Group,Група елементи по подразбиране
 DocType: Employee Loan,Partially Disbursed,Частично Изплатени
-DocType: Grading Structure,Grading System Name,Наименование на оценъчната система
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Доставчик на база данни.
 DocType: Account,Balance Sheet,Баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Разходен център за позиция с Код '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режимът на плащане не е конфигуриран. Моля, проверете, дали сметката е настроен на режим на плащания или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Вашият търговец ще получи напомняне на тази дата, за да се свърже с клиента"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Същата позиция не може да бъде въведена  няколко пъти.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Допълнителни сметки могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Леджър Вписванията и GL Записите са изказани за избраните покупка Приходите
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Леджър Вписванията и GL Записите са изказани за избраните покупка Приходите
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Позиция 1
 DocType: Holiday,Holiday,Празник
 DocType: Support Settings,Close Issue After Days,Затваряне на проблем след брой дни
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,"Работата, извършена"
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Моля, посочете поне един атрибут в таблицата с атрибути"
 DocType: Announcement,All Students,Всички студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Позиция {0} трябва да е позиция, която не се с наличности"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Позиция {0} трябва да е позиция, която не се с наличности"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Виж Ledger
 DocType: Grading Scale,Intervals,Интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Най-ранната
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Артикул Group съществува със същото име, моля да промените името на елемент или преименувате група т"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Останалата част от света
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Продуктът {0} не може да има партида
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Изплащане на заплата от {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не е разрешено да редактирате замразена сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Вземи неплатените фактури
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Поръчка за продажба {0} не е валидна
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Поръчки помогнат да планирате и проследяване на вашите покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Съжаляваме, компаниите не могат да бъдат слети"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общото количество на емисията / Transfer {0} в Подемно-Искане {1} \ не може да бъде по-голяма от поискани количества {2} за т {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Малък
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Непреки разходи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Кол е задължително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земеделие
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синхронизиране на основни данни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Синхронизиране на основни данни
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Вашите продукти или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плащане
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сайт на снимката трябва да бъде държавна файл или уеб сайт URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Това е главната позиция група и не може да се редактира.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,Номер на ролката в групата
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки могат да бъдат свързани с друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Общо за всички работни тежести трябва да бъде 1. Моля, коригира теглото на всички задачи по проекта съответно"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Складова разписка {0} не е подадена
 apps/erpnext/erpnext/stock/get_item_details.py +141,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 или търговска марка."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ценообразуване правило е първият избран на базата на &quot;Нанесете върху&quot; област, която може да бъде т, т Group или търговска марка."
 DocType: Hub Settings,Seller Website,Продавач Website
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Общо разпределят процентно за екип по продажбите трябва да бъде 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Състояние на поръчката за производство е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Състояние на поръчката за производство е {0}
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Редактиране на Описание
 ,Team Updates,Екип - промени
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,За доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,За доставчик
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Задаване типа на профила ви помага при избора на този профил в сделките.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общо (фирмена валута)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Създаване на формат за печат
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,Вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} артикула са в производство
 DocType: Workstation,Workstation Name,Workstation Име
-DocType: Grade Interval,Grade Code,Код на клас
+DocType: Grading Scale Interval,Grade Code,Код на клас
 DocType: POS Item Group,POS Item Group,POS Позиция Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email бюлетин:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не принадлежи към позиция {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Хардуер
 DocType: Sales Order,Recurring Upto,повтарящо Upto
 DocType: Attendance,HR Manager,ЧР мениджър
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Моля изберете фирма
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Моля изберете фирма
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege отпуск
 DocType: Purchase Invoice,Supplier Invoice Date,Доставчик Дата Invoice
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Трябва да се активира функционалността за количка за пазаруване
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Застаряването на населението Range 3
 DocType: Maintenance Schedule Item,No of Visits,Брои на Посещения
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Маркирай като присъстващ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Маркирай като присъстващ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Графикът за поддръжка {0} съществува срещу {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,записване на студентите
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на Затварянето Сметката трябва да е {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума от точки за всички цели трябва да бъде 100. Това е {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ср Daily Outgoing
 DocType: POS Profile,Campaign,Кампания
 DocType: Supplier,Name and Type,Име и вид
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Одобрение Status трябва да бъде &quot;Одобрена&quot; или &quot;Отхвърлени&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Одобрение Status трябва да бъде &quot;Одобрена&quot; или &quot;Отхвърлени&quot;
 DocType: Purchase Invoice,Contact Person,Лице за контакт
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очаквана начална дата"" не може да бъде след ""Очаквана крайна дата"""
 DocType: Course Scheduling Tool,Course End Date,Курс Крайна дата
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,Адрес за доставка Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметкоплан
 DocType: Material Request,Terms and Conditions Content,Правила и условия - съдържание
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може да бъде по-голямо от 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,не може да бъде по-голямо от 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Позиция {0} е не-в-наличност позиция
 DocType: Maintenance Visit,Unscheduled,Нерепаративен
 DocType: Employee,Owned,Собственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи от неплатен отпуск
 DocType: Pricing Rule,"Higher the number, higher the priority","По-голямо число, по-висок приоритет"
 ,Purchase Invoice Trends,Фактурата за покупка Trends
 DocType: Employee,Better Prospects,По-добри перспективи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Партидата {1} има само {2} qty. Моля, изберете друга партида, която има {3} qty на разположение или разделете реда на няколко реда, за да достави / издаде от няколко партиди"
 DocType: Vehicle,License Plate,Регистрационен номер
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гаранция / AMC Status
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Служител не може да докладва пред самия себе си.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако сметката е замразено, записи право да ограничават потребителите."
 DocType: Email Digest,Bank Balance,Баланс на банка
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Счетоводен запис за {0}: {1} може да се направи само във валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профил на работа, необходими квалификации и т.н."
 DocType: Journal Entry Account,Account Balance,Баланс на Сметка
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Данъчно правило за транзакции.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Покажи незатворен фискална година L баланси P &amp;
 DocType: Shipping Rule,Shipping Account,Доставка Акаунт
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивна
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Направи Поръчки за продажби да ви помогнат да планират работата си и доставят по-време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Направи Поръчки за продажби да ви помогнат да планират работата си и доставят по-време
 DocType: Quality Inspection,Readings,Четения
 DocType: Stock Entry,Total Additional Costs,Общо допълнителни разходи
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,До стойност
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Приемо-предавателен протокол
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Приемо-предавателен протокол
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Офис под наем
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Setup SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Импортирането неуспешно!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,Email Заплата поднасяне на служителите
 DocType: Cost Center,Parent Cost Center,Разходен център - Родител
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Изберете Възможен доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Изберете Възможен доставчик
 DocType: Sales Invoice,Source,Източник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Покажи затворен
 DocType: Leave Type,Is Leave Without Pay,Дали си тръгне без Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Категория е задължително за Фиксирана позиция в актива
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не са намерени в таблицата за плащане записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Този {0} е в конфликт с {1} за {2} {3}
 DocType: Student Attendance Tool,Students HTML,"Студентите, HTML"
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,Дата на напускане
 DocType: Pricing Rule,For Price List,За Ценовата листа
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Създаване потенциален клиент
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Създаване потенциален клиент
 DocType: Maintenance Schedule,Schedules,Графици
 DocType: Purchase Invoice Item,Net Amount,Нетна сума
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Детайли Номер
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Програмни записвания
 DocType: Sales Invoice Item,Brand Name,Марка Име
 DocType: Purchase Receipt,Transporter Details,Превозвач Детайли
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Изисква се склад по подразбиране за избрания елемент
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Кутия
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Възможен доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Възможен доставчик
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацията
 DocType: Budget,Monthly Distribution,Месечно разпределение
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Списък Receiver е празна. Моля, създайте Списък Receiver"
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,Търговски партньор - Цел
 DocType: Loan Type,Maximum Loan Amount,Максимален Размер на заема
 DocType: Pricing Rule,Pricing Rule,Ценообразуване Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Дублиран номер на ролката за ученик {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Дублиран номер на ролката за ученик {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Действие в случай, че, Годишния Бюджет е превишен"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Заявка за материал към поръчка за покупка
 DocType: Shopping Cart Settings,Payment Success URL,Успешно плащане URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,Възстановяване Метод
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако е избрано, на началната страница ще бъде по подразбиране т Групата за сайта"
 DocType: Quality Inspection Reading,Reading 4,Четене 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM по подразбиране за {0} не е намерен за проект {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM по подразбиране за {0} не е намерен за проект {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Искане за фирмен разход.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Учениците са в основата на системата, добавят всички вашите ученици"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Учениците са в основата на системата, добавят всички вашите ученици"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row {0}: дата Клирънсът {1} не може да бъде преди Чек Дата {2}
 DocType: Company,Default Holiday List,Списък на почивни дни по подразбиране
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: От време и До време на {1} се припокрива с {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Деня (и), на който кандидатствате за отпуск е празник. Не е нужно да кандидатствате за отпуск."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно изпращане на плащане Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нова задача
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направи оферта
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направи оферта
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Други справки
 DocType: Dependent Task,Dependent Task,Зависима задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коефициент на преобразуване за неизпълнение единица мярка трябва да бъде 1 в ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Разрешение за типа {0} не може да бъде по-дълъг от {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Опитайте планира операции за Х дни предварително.
 DocType: HR Settings,Stop Birthday Reminders,Stop напомняне за рождени дни
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Моля, задайте по подразбиране ТРЗ Задължения профил в Company {0}"
 DocType: SMS Center,Receiver List,Списък Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Търсене позиция
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Търсене позиция
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Консумирана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нетна промяна в Cash
 DocType: Assessment Plan,Grading Scale,Оценъчна скала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,вече приключи
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Мерна единица {0} е въведен повече от веднъж в реализациите Factor Таблица
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,вече приключи
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Вече съществува заявка за плащане {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Разходите за изписани стоки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Количество не трябва да бъде повече от {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Направи Изплащането Влизане
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance срещу доставчик трябва да се задължи
 DocType: Company,Default Values,Стойности по подразбиране
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Обща сума възстановена
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Това се основава на трупи срещу това превозно средство. Вижте график по-долу за повече подробности
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,събирам
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Срещу фактура от доставчик {0} от {1}
 DocType: Customer,Default Price List,Ценоразпис по подразбиране
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,запис Движение Asset {0} е създаден
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,запис Движение Asset {0} е създаден
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вие не можете да изтривате фискална година {0}. Фискална година {0} е зададена по подразбиране в Global Settings
 DocType: Journal Entry,Entry Type,Влизане Type
 ,Customer Credit Balance,Клиентско кредитно салдо
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,доставяне
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,"Нито един от елементите, има ли промяна в количеството или стойността."
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Задължително поле - Програма
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Гаранционен иск
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Гаранционен иск
 ,Lead Details,Потенциален клиент - Детайли
 DocType: Salary Slip,Loan repayment,Погасяване на кредита
 DocType: Purchase Invoice,End date of current invoice's period,Крайна дата на периода на текущата фактура за
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,Постоянен Адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Изплатения аванс срещу {0} {1} не може да бъде по-голям \ от Grand Total {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Моля изберете код артикул
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Моля изберете код артикул
 DocType: Student Sibling,Studying in Same Institute,Обучение в същия институт
 DocType: Territory,Territory Manager,Мениджър на територия
 DocType: Packed Item,To Warehouse (Optional),До склад (по избор)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Payment Entry,Paid Amount (Company Currency),Платената сума (фирмена валути)
 DocType: Purchase Invoice,Additional Discount,Допълнителна отстъпка
 DocType: Selling Settings,Selling Settings,Продажби - Настройка
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Виж в кошницата
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Разходите за маркетинг
 ,Item Shortage Report,Позиция Недостиг Доклад
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тегло се споменава, \ nМоля спомена &quot;Тегло мерна единица&quot; твърде"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материал Заявка използва за направата на този запас Влизане
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следваща дата на амортизация е задължителна за нов актив
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следваща дата на амортизация е задължителна за нов актив
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Разделна курсова група за всяка партида
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Единична единица на дадена позиция.
 DocType: Fee Category,Fee Category,Категория Такса
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Не се изисква Разходен Център за сметка ""Печалби и загуби"" {2}. Моля, задайте  Разходен Център по подразбиране за компанията."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група Клиенти съществува със същото име. Моля, променете името на Клиента или преименувайте Група Клиенти"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,Точка-мъдър Продажби Регистрация
 DocType: Asset,Gross Purchase Amount,Брутна сума на покупката
 DocType: Asset,Depreciation Method,Метод на амортизация
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Извън линия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Извън линия
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,"Това ли е данък, включен в основната ставка?"
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Общо Цел
 DocType: Program Course,Required,Изискван
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Равнение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Твърде много колони. Износ на доклада и да го отпечатате с помощта на приложение за електронни таблици.
 DocType: Purchase Invoice Item,Batch No,Партиден №
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се намери на обменния курс за {0} до {1} за ключова дата {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Оставя множество Продажби Поръчки срещу поръчка на клиента,"
 DocType: Student Group Instructor,Student Group Instructor,Инструктор на група студенти
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Не
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Основен
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Основен
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Определете префикс за номериране серия от вашите сделки
 DocType: Employee Attendance Tool,Employees HTML,Служители на HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM по подразбиране ({0}) трябва да бъде активен за тази позиция или шаблон
 DocType: Employee,Leave Encashed?,Отсъствието е платено?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Възможност - От"" полето е задължително"
 DocType: Email Digest,Annual Expenses,годишните разходи
 DocType: Item,Variants,Варианти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Направи поръчка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Направи поръчка
 DocType: SMS Center,Send To,Изпрати на
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Няма достатъчно отпуск баланс за отпуск Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Отпусната сума
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,Склад за Незавършено производство се изисква преди изпращане
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Склад за Незавършено производство се изисква преди изпращане
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявител на Йов.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочник
 DocType: Supplier,Statutory info and other general information about your Supplier,Законова информация и друга обща информация за вашия доставчик
 DocType: Item,Serial Nos and Batches,Серийни номера и партиди
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студентска група
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Against Journal Entry {0} does not have any unmatched {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценки
 apps/erpnext/erpnext/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: Grading Structure,Grading Intervals,Интервали на окачествяването
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Моля, въведете"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може да се overbill за позиция {0} в ред {1} повече от {2}. За да позволите на свръх-фактуриране, моля, задайте в Купуването Настройки"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Моля, задайте филтър на базата на т или Warehouse"
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} трябва да бъде изпратен
 DocType: Authorization Control,Authorization Control,Разрешение Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: отхвърля Warehouse е задължително срещу отхвърли т {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плащане
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управление на вашите поръчки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Плащане
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управление на вашите поръчки
 DocType: Production Order Operation,Actual Time and Cost,Действителното време и разходи
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Искане на максимална {0} може да се направи за позиция {1} срещу Продажби Поръчка {2}
 DocType: Employee,Salutation,Поздрав
 DocType: Course,Course Abbreviation,Курс - Съкращение
 DocType: Student Leave Application,Student Leave Application,Student оставите приложението
 DocType: Item,Will also apply for variants,Ще се прилага и за варианти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не може да бъде отменено, тъй като вече е {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Служител {0} на половин ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Общо работно време не трябва да са по-големи от работното време макс {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Пакетни позиции в момент на продажба.
 DocType: Quotation Item,Actual Qty,Действително Количество
 DocType: Sales Invoice Item,References,Препратки
@@ -1775,7 +1776,7 @@
 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 +91,Associate,Сътрудник
 DocType: Asset Movement,Asset Movement,Asset движение
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова пазарска количка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Нова пазарска количка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Позиция {0} не е сериализирани позиция
 DocType: SMS Center,Create Receiver List,Създаване на списък за получаване
 DocType: Vehicle,Wheels,Колела
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Забранява създаването на времеви трупи срещу производствени поръчки. Операциите не се проследяват срещу производствена поръчка
 DocType: Student,Student Mobile Number,Student мобилен номер
 DocType: Item,Has Variants,Има варианти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Вие вече сте избрали елементи от {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месец Дистрибуцията
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификационният номер на партидата е задължителен
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификационният номер на партидата е задължителен
 DocType: Sales Person,Parent Sales Person,Родител Продажби Person
 DocType: Purchase Invoice,Recurring Invoice,Повтарящо Invoice
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление на Проекти
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,Фискална Година
 DocType: Vehicle Log,Fuel Price,цена на гориво
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Дълготраен актив позиция трябва да бъде елемент не-склад.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не могат да бъдат причислени към {0}, тъй като това не е сметка за приход или разход"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнато
 DocType: Student Admission,Application Form Route,Заявление форма Път
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Територия / Клиент
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Територия / Клиент
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,например 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Тип отсъствие {0} не може да бъде разпределено, тъй като то е без заплащане"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: отпусната сума {1} трябва да е по-малка или равна на фактурира непогасения {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,Сериен № - Статус
 DocType: Payment Entry Reference,Outstanding,неизплатен
 ,Daily Timesheet Summary,Daily график Резюме
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: Към комплектът {1} периодичност, разлика между от и към днешна дата \ трябва да бъде по-голямо от или равно на {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Това се основава на склад движение. Вижте {0} за подробности
 DocType: Pricing Rule,Selling,Продажба
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Сума {0} {1} приспада срещу {2}
 DocType: Employee,Salary Information,Заплата
 DocType: Sales Person,Name and Employee ID,Име и Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Падежа, не може да бъде, преди дата на осчетоводяване"
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Мита и такси
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Моля, въведете Референтна дата"
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се отнесе поредни номера по-голям или равен на текущия брой ред за този тип Charge
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мъдър История на покупките
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да донесе Пореден № добавя за позиция {0}"
 DocType: Account,Frozen,Замръзен
 ,Open Production Orders,Отворените нареждания за производство
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовата сума (Валута на компанията)
 DocType: Payment Reconciliation Payment,Reference Row,Референтен Ред
 DocType: Installation Note,Installation Time,Време за монтаж
 DocType: Sales Invoice,Accounting Details,Счетоводство Детайли
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Изтриване на всички транзакции за тази фирма
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолюция Детайли
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,дискусия
 DocType: Payment Entry,Transaction ID,Номер на транзакцията
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Правилата за ценообразуване са допълнително филтрирани въз основа на количеството.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Моля, задайте датата на присъединяване за служител {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Обща сума за плащане (чрез Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете Приходи Customer
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) трябва да има роля ""Одобряващ разходи"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Двойка
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изберете BOM и Количество за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Изберете BOM и Количество за производство
 DocType: Asset,Depreciation Schedule,Амортизационен план
 DocType: Bank Reconciliation Detail,Against Account,Срещу Сметка
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,"Половин ден Дата трябва да бъде между ""От Дата"" и ""До дата"""
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},"Моля, задайте &quot;Асет Амортизация Cost Center&quot; в компания {0}"
 ,Maintenance Schedules,Графици за поддръжка
 DocType: Task,Actual End Date (via Time Sheet),Действително Крайна дата (чрез Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Сума {0} {1} срещу {2} {3}
 ,Quotation Trends,Оферта Тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Позиция Group не са посочени в т майстор за т {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебитиране на сметката трябва да е сметка за вземания
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Сума
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефициент на преобразуване
 DocType: Purchase Order,Delivered,Доставени
 ,Vehicle Expenses,Камион Разходи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
+DocType: Serial No,Invoice Details,Данни за фактурите
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Очаквана стойност след полезен живот трябва да бъде по-голяма или равна на {0}
 DocType: Purchase Receipt,Vehicle Number,Номер на превозно средство
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Датата, на която повтарящите се фактури ще бъдат спрени"
 DocType: Employee Loan,Loan Amount,Заета сума
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,очет
 DocType: HR Settings,HR Settings,Настройки на човешките ресурси (ЧР)
 DocType: Salary Slip,net pay info,Нет Инфо.БГ заплащане
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense претенция изчаква одобрение. Само за сметка одобряващ да актуализирате състоянието.
 DocType: Email Digest,New Expenses,Нови разходи
 DocType: Purchase Invoice,Additional Discount Amount,Допълнителна отстъпка сума
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row {0}: Кол трябва да бъде 1, като елемент е дълготраен актив. Моля, използвайте отделен ред за множествена бр."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставете Block List Позволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Съкращение не може да бъде празно или интервал
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група към не-група
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортове
 DocType: Loan Type,Loan Name,Заем - Име
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,Спечелени и лоялност на клиенти
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, в койт се поддържа запас от отхвърлените артикули"
 DocType: Production Order,Skip Material Transfer,Пропуснете прехвърлянето на материали
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Не може да се намери валутен курс за {0} до {1} за ключова дата {2}. Моля, създайте ръчно запис на валута"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Вашата финансовата година приключва на
 DocType: POS Profile,Price List,Ценова Листа
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} сега е по подразбиране фискална година. Моля, опреснете браузъра си за да влезе в сила промяната."
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Сметка {0} е невалидна. Валутата на сметката трябва да е {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Мерна единица - фактор на превръщане се изисква на ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от продажбите Поръчка, продажба на фактура или вестник Влизане"
 DocType: Salary Component,Deduction,Намаление
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Ред {0}: От време и До време - е задължително.
 DocType: Stock Reconciliation Item,Amount Difference,сума Разлика
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Елемент Цена добавя за {0} в Ценовата листа {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Моля, въведете Id Служител на този търговец"
 DocType: Territory,Classification of Customers by region,Класификация на клиентите по регион
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Разликата в сумата трябва да бъде нула
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разликата в сумата трябва да бъде нула
 DocType: Project,Gross Margin,Брутна печалба
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Моля, въведете Производство Точка първа"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Изчисли Баланс на банково извлечение
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,забранени потребители
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Оферта
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Оферта
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Общо Приспадане
 ,Production Analytics,Производствени Analytics
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Внимание: Invalid сертификат SSL за закрепване {0}
 DocType: Student Admission,Eligibility,избираемост
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads ви помогне да получите бизнес, добавете всичките си контакти и повече като си клиенти"
 DocType: Production Order Operation,Actual Operation Time,Действително време за операцията
 DocType: Authorization Rule,Applicable To (User),Приложими по отношение на (User)
 DocType: Purchase Taxes and Charges,Deduct,Приспада
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,Служебен адрес
 DocType: Appraisal,Calculate Total Score,Изчисли Общ резултат
 DocType: Request for Quotation,Manufacturing Manager,Мениджър производство
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Сериен № {0} е в гаранция до  {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериен № {0} е в гаранция до  {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Бележка за доставка в пакети.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Пратки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Салдото на профила ({0}) за {1} и стойността на запаса ({2}) за склад {3} трябва да бъдат еднакви
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,Общо дни отсъствие
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забележка: Email няма да бъдат изпратени на ползвателите с увреждания
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Брой взаимодействия
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете компания ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компания ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставете празно, ако важи за всички отдели"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видове наемане на работа (постоянни, договорни, стажант и т.н.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} е задължително за Артикул {1}
 DocType: Process Payroll,Fortnightly,всеки две седмици
 DocType: Currency Exchange,From Currency,От валута
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Моля изберете отпусната сума, Тип фактура и фактура Номер в поне един ред"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company валути)
 DocType: Student Guardian,Others,Други
 DocType: Payment Entry,Unallocated Amount,Неразпределена сума
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Няма съвпадащи записи. Моля изберете някоя друга стойност за {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Не повече актуализации
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можете да изберете тип заряд като &quot;На предишния ред Сума&quot; или &quot;На предишния ред Total&quot; за първи ред
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Дете позиция не трябва да бъде пакетен продукт. Моля, премахнете позиция `{0}` и запишете"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банки и разплащания
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Добави графици
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Добави графици
 DocType: Vehicle Service,Service Item,Service точка
 DocType: Bank Guarantee,Bank Guarantee,Банкова гаранция
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Моля, кликнете върху &quot;Генериране Schedule&quot;, за да получите график"
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row {0}: Asset {1} е вече {2}
 DocType: Quotation Item,Stock Balance,Фондова Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Поръчка за продажба до Плащане
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Моля, задайте Naming Series за {0} чрез Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Изпълнителен директор
 DocType: Expense Claim Detail,Expense Claim Detail,Expense претенция Подробности
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Моля изберете правилния акаунт
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цените няма да се показват, ако ценова листа не е настроено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Моля, посочете държава за тази доставка правило или проверете Worldwide Доставка"
 DocType: Stock Entry,Total Incoming Value,Общо Incoming Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебит сметка се изисква
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването за занимания, извършени от вашия екип"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебит сметка се изисква
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Графици, за да следите на времето, разходите и таксуването за занимания, извършени от вашия екип"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Ценоразпис
 DocType: Offer Letter Term,Offer Term,Оферта Условия
 DocType: Quality Inspection,Quality Manager,Мениджър по качеството
 DocType: Job Applicant,Job Opening,Откриване на работа
 DocType: Payment Reconciliation,Payment Reconciliation,Плащания - Засичане
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Моля изберете име Incharge Лице
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Моля изберете име Incharge Лице
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Общо Неплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Операция
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,Причина за загубата
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нов адрес
 DocType: Quality Inspection,Sample Size,Размер на извадката
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Моля, въведете Получаване на документация"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Всички елементи вече са фактурирани
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Моля, въведете Получаване на документация"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Допълнителни разходни центрове могат да бъдат направени по групи, но записи могат да бъдат направени по отношение на не-групи"
 DocType: Project,External,Външен
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Потребители и права
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производствени поръчки Създаден: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Производствени поръчки Създаден: {0}
 DocType: Branch,Branch,Клон
 DocType: Guardian,Mobile Number,Мобилен номер
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печат и Branding
 DocType: Bin,Actual Quantity,Действителното количество
 DocType: Shipping Rule,example: Next Day Shipping,Например: Доставка на следващия ден
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериен № {0} не е намерен
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериен № {0} не е намерен
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Направи Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Направи Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вие сте били поканени да си сътрудничат по проекта: {0}
 DocType: Leave Block List Date,Block Date,Блокиране - Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Запиши се сега
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,Изпратени На
 DocType: Payment Request,Make Sales Invoice,Направи фактурата за продажба
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,софтуери
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следваща дата за контакт не може да е в миналото
 DocType: Company,For Reference Only.,Само за справка.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Изберете партида №
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Авансова сума
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело Номер не може да бъде 0
 DocType: Item,Show a slideshow at the top of the page,Покажи на слайдшоу в горната част на страницата
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,списъците с материали
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазини
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазини
 DocType: Serial No,Delivery Time,Време За Доставка
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Застаряването на населението на базата на
 DocType: Item,End of Life,Края на живота
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,Преименуване на Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Актуализация на стойността
 DocType: Item Reorder,Item Reorder,Позиция Пренареждане
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Покажи фиш за заплата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Прехвърляне на материал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Покажи фиш за заплата
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Прехвърляне на материал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Посочете операции, оперативни разходи и да даде уникална операция не на вашите операции."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Този документ е над ограничението от {0} {1} за елемент {4}. Възможно ли е да направи друг {3} срещу същите {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,количество сметка Select промяна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Моля, задайте повтарящи след спасяването"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,количество сметка Select промяна
 DocType: Purchase Invoice,Price List Currency,Ценоразпис на валути
 DocType: Naming Series,User must always select,Потребителят трябва винаги да избере
 DocType: Stock Settings,Allow Negative Stock,Оставя Negative Фондова
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,Сметка за бюджет
 DocType: Quality Inspection,Verified By,Проверени от
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени валута по подразбиране на фирмата, защото има съществуващи операции. Те трябва да бъдат отменени, за да промените валута по подразбиране."
-DocType: Grade Interval,Grade Description,Клас - Описание
+DocType: Grading Scale Interval,Grade Description,Клас - Описание
 DocType: Stock Entry,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,Създаване на фиш за заплата
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,Присъствие към днешна дата
 DocType: Warranty Claim,Raised By,Повдигнат от
 DocType: Payment Gateway Account,Payment Account,Разплащателна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Моля, посочете фирма, за да продължите"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нетна промяна в Вземания
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсаторни Off
 DocType: Offer Letter,Accepted,Приет
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Моля, уверете се, че наистина искате да изтриете всички сделки за тази компания. Вашите основни данни ще останат, тъй като е. Това действие не може да бъде отменено."
 DocType: Room,Room Number,Номер на стая
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Невалидна референция {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да бъде по-голямо от планирано количество ({2}) в производствена поръчка {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да бъде по-голямо от планирано количество ({2}) в производствена поръчка {3}
 DocType: Shipping Rule,Shipping Rule Label,Доставка Правило Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,потребителски форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, които не могат да бъдат празни."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick вестник Влизане
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не можа да се актуализира склад, фактура съдържа капка корабоплаването т."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick вестник Влизане
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Вие не можете да променяте скоростта, ако BOM споменато agianst всеки елемент"
 DocType: Employee,Previous Work Experience,Предишен трудов опит
 DocType: Stock Entry,For Quantity,За Количество
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Условия за ползване - 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Името на института, за който искате да създадете тази система."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Счетоводен запис, замразени до тази дата, никой не може да направи / промени  записите с изключение на ролята посочена по-долу"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Моля, запишете документа преди да генерира план за поддръжка"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Маркирайте това да забраниш фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Създадени са следните производствени поръчки:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,"Служителите, които работят на почивка"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Отбележи присъствие
 DocType: Project,% Complete Method,% Изпълнен Метод
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Старт поддръжка дата не може да бъде преди датата на доставка в сериен № {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Старт поддръжка дата не може да бъде преди датата на доставка в сериен № {0}
 DocType: Production Order,Actual End Date,Действителна Крайна дата
 DocType: BOM,Operating Cost (Company Currency),Експлоатационни разходи (фирмена валута)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Неплатен отпуск не съвпада с одобрените записи оставите приложението
 DocType: Campaign,Campaign-.####,Кампания -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следващи стъпки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Моля, доставете определени елементи на възможно най-добрите цени"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Моля, доставете определени елементи на възможно най-добрите цени"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto близо възможност в 15-дневен срок
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Край Година
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Цитат / Водещ%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Количество
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Такса - записи създадени - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Категория профил
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече позиция {0} от количеството в поръчка за продажба {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Не може да се произвежда повече позиция {0} от количеството в поръчка за продажба {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Склад за вписване {0} не е подадена
 DocType: Payment Reconciliation,Bank / Cash Account,Банкова / Кеш Сметка
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Следваща Контакт не може да бъде същата като на Водещия имейл адрес
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Дата на клирънс не е определена
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,Професия
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Началната дата трябва да е преди крайната дата
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Общо (количество)
 DocType: Sales Invoice,This Document,Този документ
 DocType: Installation Note Item,Installed Qty,Инсталирано количество
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Докладвай проблем
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Комунални Разходи
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90 -
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row {0}: вестник Влизане {1} Няма профил {2} или вече съчетани срещу друг ваучер
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row {0}: вестник Влизане {1} Няма профил {2} или вече съчетани срещу друг ваучер
 DocType: Buying Settings,Default Buying Price List,Ценови лист за закупуване по подразбиране
 DocType: Process Payroll,Salary Slip Based on Timesheet,Заплата Slip Въз основа на график
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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.","Задайте стойности по подразбиране, като Company, валути, текущата фискална година, и т.н."
 DocType: Payment Entry,Payment Type,Вид на плащане
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Моля, изберете партида за елемент {0}. Не може да се намери една партида, която отговаря на това изискване"
 DocType: Process Payroll,Select Employees,Изберете Служители
 DocType: Opportunity,Potential Sales Deal,Потенциални Продажби Deal
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референция Дата
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобален POS профил {0} вече е създаден за компанията {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменете т / BOM във всички спецификации на материали
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,трябва да се представи разписка документ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,трябва да се представи разписка документ
 DocType: Purchase Invoice Item,Received Qty,Получено количество
 DocType: Stock Entry Detail,Serial No / Batch,Сериен № / Партида
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не е платен и не е доставен
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Няма време листове
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Оставете Type {0} не може да се извърши-препрати
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График за поддръжка не се генерира за всички предмети. Моля, кликнете върху &quot;Генериране Schedule&quot;"
 ,To Produce,Да Произвежда
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ведомост
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За ред {0} в {1}. За да {2} включат в курс ред, редове {3} трябва да се включат и те"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Създаване на потребител
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Създаване на потребител
 DocType: Packing Slip,Identification of the package for the delivery (for print),Наименование на пакета за доставка (за печат)
 DocType: Bin,Reserved Quantity,Запазено Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Моля, въведете валиден имейл адрес"
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Забраненият шаблон не трябва да е този по подразбиране
 DocType: Account,Income Account,Сметка за доход
 DocType: Payment Request,Amount in customer's currency,Сума във валута на клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущо количество
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Вижте &quot;Курсове на материали на основата на&quot; в Остойностяване Раздел
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предишна
 DocType: Appraisal Goal,Key Responsibility Area,Ключова област на отговорност
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентски Партидите ви помогне да следите на посещаемост, оценки и такси за студенти"
 DocType: Payment Entry,Total Allocated Amount,Общата отпусната сума
 DocType: Item Reorder,Material Request Type,Заявка за материал - тип
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Начисляване на заплати от {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage е пълен, не беше записан"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage е пълен, не беше записан"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: мерна единица реализациите Factor е задължително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Разходен център
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скриване на данъчния идентификационен номер на клиента от сделки за продажба
 DocType: Upload Attendance,Upload HTML,Качи HTML
 DocType: Employee,Relieving Date,Облекчаване Дата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ценообразуване правило се прави, за да презапише Ценоразпис / определи отстъпка процент, базиран на някои критерии."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складът  може да се променя само чрез Стокова разписка / Бележка за доставка / Разписка за Покупка
 DocType: Employee Education,Class / Percentage,Клас / Процент
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Ръководител на отдел Маркетинг и Продажби
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Ако избран ценообразуване правило се прави за &quot;Цена&quot;, той ще замени ценовата листа. Ценообразуване Правило цена е крайната цена, така че не се колебайте отстъпка трябва да се прилага. Следователно, при сделки, като продажби поръчка за покупка и т.н., то ще бъдат изведени в поле &quot;Оцени&quot;, а не поле &quot;Ценоразпис Курсове&quot;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако избран ценообразуване правило се прави за &quot;Цена&quot;, той ще замени ценовата листа. Ценообразуване Правило цена е крайната цена, така че не се колебайте отстъпка трябва да се прилага. Следователно, при сделки, като продажби поръчка за покупка и т.н., то ще бъдат изведени в поле &quot;Оцени&quot;, а не поле &quot;Ценоразпис Курсове&quot;."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Изводи от Industry Type.
 DocType: Item Supplier,Item Supplier,Позиция - Доставчик
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Моля, въведете Код, за да получите партиден №"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Моля изберете стойност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всички адреси.
 DocType: Company,Stock Settings,Сток Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Сливането е възможно само ако следните свойства са същите и в двете записи. Дали Group, Root Type, Company"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ще изпрати съобщение за събитието на служители със статут на &quot;Open&quot;
 DocType: Task,Depends on Tasks,Зависи от Задачи
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление на дърво с групи на клиенти.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,"Прикачените файлове могат да се показват, без да се разрешава кошчето за пазаруване"
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Име на нов разходен център
 DocType: Leave Control Panel,Leave Control Panel,Контролен панел - отстъствия
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,Дебит към
 DocType: Delivery Note,Required only for sample item.,Изисква се само за проба т.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Действително Количество След Трансакция
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Доставчик&gt; Тип доставчик
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Няма фишове за заплата намерени между {0} и {1}
 ,Pending SO Items For Purchase Request,Чакащи позиции от поръчки за продажба по искане за покупка
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Учебен
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} е деактивиран
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} е деактивиран
 DocType: Supplier,Billing Currency,(Фактура) Валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Много Голям
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Начална страница Featured Каталог
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Всички оценка Групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нов Склад Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Общо {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Общо {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територия
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Моля, не споменете на посещенията, изисквани"
 DocType: Stock Settings,Default Valuation Method,Метод на оценка по подразбиране
 DocType: Vehicle Log,Fuel Qty,Количество на горивото
 DocType: Production Order Operation,Planned Start Time,Планиран начален час
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,Ценоразпис магистър
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Всички продажби Сделки могат да бъдат маркирани с множество ** продавачи **, така че можете да настроите и да наблюдават цели."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Моля, създайте Customer от Lead {0}"
 DocType: Price List,Applicable for Countries,Приложимо за Държави
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само приложения със статут &quot;Одобрен&quot; и &quot;Отхвърлени&quot; може да бъде подадено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Име на групата е задължително в ред {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,Копирано от
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Наименование грешка: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недостиг
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} не е свързан с {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} не е свързан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Присъствие на служител {0} вече е маркирана
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повече от един пакет от същия тип (за печат)
 ,Salary Register,Заплата Регистрирайте се
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Използвайте за количката
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},"Стойност {0} за Умение {1}, не съществува в списъка с валиден т Умение Стойности за т {2}"
 DocType: BOM Item,Scrap %,Скрап%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Таксите ще бъдат разпределени пропорционално на базата на т Количество или количество, според вашия избор"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Таксите ще бъдат разпределени пропорционално на базата на т Количество или количество, според вашия избор"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Поне един елемент следва да бъде вписано с отрицателна величина в замяна документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} по-дълго от всички налични работни часа в работно {1}, съборят операцията в множество операции"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление на дърво на територията
 DocType: Journal Entry Account,Sales Invoice,Фактурата за продажба
 DocType: Journal Entry Account,Party Balance,Компания - баланс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Моля изберете ""Прилагане на остъпка на"""
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Моля изберете ""Прилагане на остъпка на"""
 DocType: Company,Default Receivable Account,Сметка за  вземания по подразбиране
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Създайте Bank вписване на обща заплата за над избрани критерии
 DocType: 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.,Отстъпка Процент може да бъде приложена или за ценоразпис или за всички ценови листи (ценоразписи).
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Отстъпка Процент може да бъде приложена или за ценоразпис или за всички ценови листи (ценоразписи).
 DocType: Purchase Invoice,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Счетоводен запис за Складова наличност
 DocType: Vehicle Service,Engine Oil,Моторно масло
 DocType: Sales Invoice,Sales Team1,Търговски отдел1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не съществува
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Точка {0} не съществува
 DocType: Sales Invoice,Customer Address,Клиент - Адрес
 DocType: Employee Loan,Loan Details,Заем - Детайли
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Завършен во трябва да е по-голяма от нула.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Не може да се върне повече от {1} за позиция {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Парцел
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Парцел
 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}
 DocType: Cheque Print Template,Primary Settings,Основни настройки
 DocType: Purchase Invoice,Select Supplier Address,Изберете доставчик Адрес
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Добави Служители
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Добави Служители
 DocType: Purchase Invoice Item,Quality Inspection,Проверка на качеството
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Стандартен шаблон
 DocType: Training Event,Theory,Теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал Заявени Количество е по-малко от минималното Поръчка Количество
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Сметка {0} е замразена
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическо лице / Дъщерно дружество с отделен сметкоплан, част от организацията."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храни, напитки и тютюневи изделия"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Мога да направи плащане само срещу нетаксуван {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Мога да направи плащане само срещу нетаксуван {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Ставка на Комисията не може да бъде по-голяма от 100
 DocType: Stock Entry,Subcontract,Подизпълнение
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Моля, въведете {0} първа"
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Складове с действащото сделка не може да се превърнат в група.
 DocType: Assessment Result Tool,Result HTML,Резултати HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Изтича на
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Добави студенти
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Добави студенти
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Моля изберете {0}
 DocType: C-Form,C-Form No,Си-форма номер
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Изберете фискална година
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане Level
 DocType: Company,Chart Of Accounts Template,Сметкоплан - Шаблон
 DocType: Attendance,Attendance Date,Присъствие Дата
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate влизане
 DocType: Program Enrollment Tool,Get Students,Вземете студентите
 DocType: Serial No,Under Warranty,В гаранция
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Словом ще бъде видим след като запазите поръчката за продажба.
 ,Employee Birthday,Рожден ден на Служител
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Присъствие Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Преминат лимит
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Един учебен план с това &quot;Учебна година&quot; {0} и &quot;Срок име&quot; {1} вече съществува. Моля, променете тези записи и опитайте отново."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Тъй като има съществуващи операции срещу т {0}, не можете да промените стойността на {1}"
 DocType: UOM,Must be Whole Number,Трябва да е цяло число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови листа Отпуснати (в дни)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Сериен № {0} не съществува
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% от материали начислени по тази Поръчка за Продажба
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Месечно приключване - запис
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Разходен център със съществуващи операции не може да бъде превърнат в група
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Доставчик (ци)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Инструмент - Служител Присъствие
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,Последен ден на следващия месец
 DocType: Support Settings,Auto close Issue after 7 days,Auto близо Issue след 7 дни
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Отпуск не могат да бъдат разпределени преди {0}, като баланс отпуск вече е ръчен изпраща в записа на бъдещото разпределение отпуск {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забележка: Поради / Референция Дата надвишава право кредитни клиент дни от {0} ден (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Заявител
 DocType: Asset Category Account,Accumulated Depreciation Account,Сметка за Натрупана амортизация
 DocType: Stock Settings,Freeze Stock Entries,Фиксиране на вписване в запасите
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,Сток Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Операциите не могат да бъдат оставени празни
 DocType: Maintenance Visit Purpose,Against Document Detail No,Against Document Detail No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Тип Компания е задължително
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Тип Компания е задължително
 DocType: Quality Inspection,Outgoing,Изходящ
 DocType: Material Request,Requested For,Поискана за
 DocType: Quotation Item,Against Doctype,Срещу Вид Документ
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,Код
 DocType: Production Planning Tool,Create Production Orders,Създаване на производствени поръчки
 DocType: Serial No,Warranty / AMC Details,Гаранция / AMC Детайли
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,"Изберете ръчно студентите за групата, базирана на дейности"
 DocType: Journal Entry,User Remark,Потребителска забележка
 DocType: Lead,Market Segment,Пазарен сегмент
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Платената сума не може да бъде по-голям от общия изключително отрицателна сума {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Служител Вътрешен - История на работа
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Закриване (Dr)
 DocType: Cheque Print Template,Cheque Size,Чек Размер
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,Създаване на искане за материали
 DocType: Employee Education,School/University,Училище / Университет
 DocType: Payment Request,Reference Details,Референтен Детайли
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очакваната стойност След полезния живот трябва да бъде по-малко от Gross Сума на покупката
 DocType: Sales Invoice Item,Available Qty at Warehouse,В наличност Количество в склада
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирана Сума
 DocType: Asset,Double Declining Balance,Двоен неснижаем остатък
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика трябва да се вида на актива / Отговорност сметка, тъй като това Фондова Помирението е Откриване Влизане"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Платената сума не може да бъде по-голяма от кредит сума {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Поръчка за покупка брой, необходим за т {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производство Поръчка не е създаден
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Производство Поръчка не е създаден
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""От дата"" трябва да е преди ""До дата"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не може да се промени статута си на студент {0} е свързан с прилагането студент {1}
 DocType: Asset,Fully Depreciated,напълно амортизирани
 ,Stock Projected Qty,Фондова Прогнозно Количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежи на проекта {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Маркирано като присъствие HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Оферта са предложения, оферти, изпратени до клиентите"
 DocType: Sales Order,Customer's Purchase Order,Поръчка на Клиента
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериен № и Партида
 DocType: Warranty Claim,From Company,От фирма
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сума на рекордите на критериите за оценка трябва да бъде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Стойност или Количество
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Моля, задайте Брой амортизации Резервирано"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Стойност или Количество
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions поръчки не могат да бъдат повдигнати за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка данъци и такси
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Всички Складове
 DocType: Sales Partner,Retailer,Търговец на дребно
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Кредит на сметката трябва да бъде балансова сметка
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Всички Видове Доставчик
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Всички Видове Доставчик
 DocType: Global Defaults,Disable In Words,Изключване с думи
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Код е задължително, тъй като номерацията не е автоматична"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Оферта {0} не от типа {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Банков Овърдрафт Акаунт
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Направи фиш за заплата
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Разпределената сума не може да бъде по-голяма от остатъка.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Разгледай BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Обезпечени кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Редактиране на Дата и час на публикуване
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е позволено да се актуализира борсови сделки по-стари от {0}
 DocType: Purchase Invoice Item,PR Detail,PR Подробности
 DocType: Sales Order,Fully Billed,Напълно фактуриран
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Моля, задайте по подразбиране платим сметката в служителя {0}"
 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 +127,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),Брутното тегло на опаковката. Обикновено нетно тегло + опаковъчен материал тегло. (За печат)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,Групирано на
 DocType: Journal Entry,Bill Date,Фактура - Дата
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","се изисква Service т, тип, честота и количество разход"
-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:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дори и да има няколко ценови правила с най-висок приоритет, се прилагат след това следните вътрешни приоритети:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Наистина ли искате да отнесат всички Заплата Slip от {0} до {1}
 DocType: Cheque Print Template,Cheque Height,Чек Височина
 DocType: Supplier,Supplier Details,Доставчик - детайли
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,Фактура Референция
 DocType: Purchase Order,Recurring Order,Повтарящо Поръчка
 DocType: Company,Default Income Account,Сметка за приходи - по подразбиране
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клиенти / Клиент
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Група клиенти / Клиент
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Незатворено данъчни години печалба / загуба (кредит)
 DocType: Sales Invoice,Time Sheets,Време Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Съобщение за заявка за плащане по подразбиране
@@ -2974,12 +2981,12 @@
 DocType: Notification Control,Quotation Message,Оферта - Съобщение
 DocType: Employee Loan,Employee Loan Application,Служител Искане за кредит
 DocType: Issue,Opening Date,Откриване Дата
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Присъствие е маркирано успешно.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Присъствие е маркирано успешно.
 DocType: Journal Entry,Remark,Забележка
 DocType: Purchase Receipt Item,Rate and Amount,Процент и размер
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Тип акаунт за {0} трябва да е {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Тип акаунт за {0} трябва да е {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Отпуски и Празници
-DocType: School Settings,Current Academic Term,Настоящ академичен термин
+DocType: School Settings,Current Academic Term,Настоящ академичен срок
 DocType: Sales Order,Not Billed,Не Обявен
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,И двата склада трябва да принадлежат към една и съща фирма
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,"Не са добавени контакти, все още."
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Оферта Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Една статия, съществува със същото име ({0}), моля да промените името на стокова група или преименувате елемента"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Моля изберете клиент
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Моля изберете клиент
 DocType: C-Form,I,аз
 DocType: Company,Asset Depreciation Cost Center,Център за амортизация на разходите Асет
 DocType: Sales Order Item,Sales Order Date,Поръчка за продажба - Дата
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,Застраховка Детайли
 DocType: Account,Payable,Платим
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Моля, въведете Възстановяване Периоди"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Длъжници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Длъжници ({0})
 DocType: Pricing Rule,Margin,марж
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Брутна Печалба %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Клирънсът Дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Брутна Сума на покупката е задължителна
 DocType: Lead,Address Desc,Адрес Описание
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Компания е задължителна
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Компания е задължителна
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Тема Наименование
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Поне една от продажба или закупуване трябва да бъдат избрани
-DocType: Grading Structure,Grade Intervals,Интервали на клас
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете естеството на вашия бизнес.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Ред # {0}: дублиращ се запис в &quot;Референции&quot; {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Когато се извършват производствени операции.
 DocType: Asset Movement,Source Warehouse,Източник Склад
 DocType: Installation Note,Installation Date,Дата на инсталация
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Бланки за шаблони за печат.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Заглавия за шаблони за печат, например проформа фактура."
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Такси тип оценка не може маркирани като 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.,"Different мерна единица за елементи ще доведе до неправилно (Total) Нетна стойност на теглото. Уверете се, че нетното тегло на всеки артикул е в една и съща мерна единица."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Курс
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Печалба / загуба на профила
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Служител и Присъствие
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Цел трябва да бъде един от {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Попълнете формата и да го запишете
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Реално количество в наличност
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Пренареждане Количество
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущи свободни работни места
 DocType: Company,Stock Adjustment Account,Склад за приспособяване Акаунт
-DocType: Journal Entry,Write Off,Отписвам
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписвам
 DocType: Timesheet Detail,Operation ID,Операция ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Потребител (вход) ID. Ако е зададено, че ще стане по подразбиране за всички форми на човешките ресурси."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Доставчик доставя на Клиента
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Форма / позиция / {0}) е изчерпана
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следваща дата за контакт трябва да е по-голяма от датата на публикуване
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Покажи данък разпадането
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Покажи данък разпадането
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Поради / Референтен дата не може да бъде след {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Внос и експорт на данни
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток записи съществуват срещу Warehouse {0}, затова не можете да прехвърляте повторно или да го модифицирате"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Няма намерени студенти
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Няма намерени студенти
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Фактура - дата на осчетоводяване
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,продажба
 DocType: Sales Invoice,Rounded Total,Общо (закръглено)
 DocType: Product Bundle,List items that form the package.,"Списък на елементите, които формират пакета."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процентно разпределение следва да е равно на 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Моля, изберете дата на завеждане, преди да изберете страна"
 DocType: Program Enrollment,School House,училище Къща
 DocType: Serial No,Out of AMC,Няма AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Моля, изберете Цитати"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Направи поддръжка посещение
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Моля, изберете Цитати"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Брой на амортизации Договорени не може да бъде по-голям от общия брой амортизации
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направи поддръжка посещение
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Моля, свържете се с потребител, който има {0} роля Продажби Майстор на мениджъра"
 DocType: Company,Default Cash Account,Каса - сметка по подразбиране
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (не клиент или доставчик) майстор.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Това се основава на присъствието на този Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Няма студенти в
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавете още предмети или отворен пълна форма
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Моля, въведете &quot;Очаквана дата на доставка&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Складовата разписка {0} трябва да се отмени преди да анулирате тази поръчка за продажба
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Позиция 3
 DocType: Purchase Order,Customer Contact Email,Клиент - email за контакти
 DocType: Warranty Claim,Item and Warranty Details,Позиция и подробности за гаранцията
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код на елемента&gt; Група на елементите&gt; Марка
 DocType: Sales Team,Contribution (%),Принос (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Забележка: Плащане Влизане няма да се създали от &quot;пари или с банкова сметка&quot; Не е посочено
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,"Изберете програмата, за да изтеглите задължителни курсове."
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Преди изравняване
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},За  {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Данъци и такси - Добавени (фирмена валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Позиция Tax Row {0} Трябва да имате предвид тип данък или приход или разход или Дължими
 DocType: Sales Order,Partly Billed,Частично фактурирани
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Позиция {0} трябва да е дълготраен актив
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Позиция {0} трябва да е дълготраен актив
 DocType: Item,Default BOM,BOM по подразбиране
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Моля име повторно вид фирма, за да потвърдите"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общият размер на неизплатените Amt
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилен
 DocType: Vehicle,Insurance Company,Застрахователно дружество
 DocType: Asset Category Account,Fixed Asset Account,Дълготраен актив - Сметка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,променлив
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,От Бележка за доставка
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,променлив
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,От Бележка за доставка
 DocType: Student,Student Email Address,Student имейл адрес
 DocType: Timesheet Detail,From Time,От време
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наличност:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ценоразпис Валутен курс
 DocType: Purchase Invoice Item,Rate,Ед. Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Интерниран
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адрес Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Адрес Име
 DocType: Stock Entry,From BOM,От BOM
 DocType: Assessment Code,Assessment Code,Код за оценка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основен
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток сделки преди {0} са замразени
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Моля, кликнете върху &quot;Генериране Schedule&quot;"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","напр кг, брой, метри"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Референтен Не е задължително, ако сте въвели, Референция Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платежен документ
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,Структура Заплата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиолиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Изписване на материал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Изписване на материал
 DocType: Material Request Item,For Warehouse,За склад
 DocType: Employee,Offer Date,Оферта - Дата
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Оферти
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Вие сте в офлайн режим. Вие няма да бъдете в състояние да презареждате, докато нямате мрежа."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Няма създаден студентски групи.
 DocType: Purchase Invoice Item,Serial No,Сериен Номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна погасителна сума не може да бъде по-голяма от Размер на заема
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Моля, въведете Maintaince Детайли първа"
 DocType: Purchase Invoice,Print Language,Print Език
 DocType: Salary Slip,Total Working Hours,Общо работни часове
 DocType: Stock Entry,Including items for sub assemblies,Включително артикули за под събрания
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,"Въведете стойност, която да бъде положителна"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,"Въведете стойност, която да бъде положителна"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Всички територии
 DocType: Purchase Invoice,Items,Позиции
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student вече е регистриран.
@@ -3254,16 +3263,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default мерната единица за Variant &#39;{0}&#39; трябва да бъде същото, както в Template &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Изчислете на основата на
 DocType: Delivery Note Item,From Warehouse,От склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Не артикули с Бил на материали за производство на
 DocType: Assessment Plan,Supervisor Name,Наименование на надзорник
 DocType: Program Enrollment Course,Program Enrollment Course,Курс за записване на програмата
-DocType: Grading Structure,Grading Structure,Оценъчна - Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Обща сума
 DocType: Tax Rule,Shipping City,Доставка Град
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Персонализиране на Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Парични потоци от операции
 DocType: Sales Invoice,Shipping Rule,Доставка Правило
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Няма спецификация на материал по подразбиране за позиция {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Моля, изберете първо счетоводна дата"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Откриване Дата трябва да е преди крайната дата
 DocType: Leave Control Panel,Carry Forward,Пренасяне
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Разходен център със съществуващи операции не може да бъде превърнат в книга
 DocType: Department,Days for which Holidays are blocked for this department.,Дни за които Holidays са блокирани за този отдел.
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,Общ
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Прикрепете бланки
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последно съобщение
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Оценка и Total&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}"
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Краен Плащания с фактури
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Общо (сума)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забавление и отдих
 DocType: Quality Inspection,Item Serial No,Позиция Сериен №
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Създаване на запис на нает персонал
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Създаване на запис на нает персонал
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Общо Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Счетоводни отчети
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,неизвестен
 DocType: Shipping Rule,Shipping Rule Conditions,Доставка Правило Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новият BOM след подмяна
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,получената сума
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Моля, настройте система за наименуване на служители в Човешки ресурси&gt; Настройки за персонала"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Създаване на пълен количество, без да обръща внимание количество вече по поръчка"
 DocType: Account,Tax,Данък
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Не е маркирано
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,Фактури
 DocType: Batch,Source Document Name,Име на изходния документ
 DocType: Job Opening,Job Title,Длъжност
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Създаване на потребители
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Създаване на потребители
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количество за Производство трябва да е по-голямо от 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете доклад за поддръжка повикване.
 DocType: Stock Entry,Update Rate and Availability,Актуализация Курсове и Наличност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Процент ви е позволено да получи или достави повече от поръчаното количество. Например: Ако сте поръчали 100 единици. и си Allowance е 10% след което се оставя да се получи 110 единици.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Разходна сметка е задължително за покупка {0}
 DocType: BOM,Website Description,Website Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нетна промяна в собствения капитал
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Моля анулирайте фактурата за покупка {0} първо
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адрес трябва да бъде уникален, вече съществува за {0}"
 DocType: Serial No,AMC Expiry Date,AMC срок на годност
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Касова бележка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Касова бележка
 ,Sales Register,Продажбите Регистрация
 DocType: Daily Work Summary Settings Company,Send Emails At,Изпрати имейли до
 DocType: Quotation,Quotation Lost Reason,Оферта Причина за загубване
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Изберете вашия домейн
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Справка за сделката не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Няма нищо, за да редактирате."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме за този месец и предстоящи дейности
 DocType: Customer Group,Customer Group Name,Група клиенти - Име
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Все още няма клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Отчет за паричните потоци
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Размер на кредита не може да надвишава сума на максимален заем  {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Разрешително
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Моля, премахнете тази фактура {0} от C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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,Атрибутите
+DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Моля, въведете отпишат Акаунт"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последна Поръчка Дата
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Сметка {0} не принадлежи на фирма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серийните номера в ред {0} не съвпадат с бележката за доставка
 DocType: Student,Guardian Details,Guardian Детайли
 DocType: C-Form,C-Form,Cи-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Маркирай присъствие за множество служители
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # партида трябва да е от тип &quot;дълготраен актив&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Изх. Количество
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за изчисляване на сумата на пратката за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Номерацията е задължителна
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Номерацията е задължителна
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансови Услуги
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Видове дейности за времето за Logs
 DocType: Tax Rule,Sales,Търговски
 DocType: Stock Entry Detail,Basic Amount,Основна сума
 DocType: Training Event,Exam,Изпит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Склад се изисква за артикул {0}
 DocType: Leave Allocation,Unused leaves,Неизползваните отпуски
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,(Фактура) Състояние
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Прехвърляне
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} не е свързан с клиентска сметка {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} не е свързан с клиентска сметка {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Изважда се взриви BOM (включително монтажните възли)
 DocType: Authorization Rule,Applicable To (Employee),Приложими по отношение на (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Срок за плащане е задължителен
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Увеличаване на атрибут {0} не може да бъде 0
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,Неактивни Клиенти
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Изкупните Приходи
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как правилото за ценообразуване се прилага?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как правилото за ценообразуване се прилага?
 DocType: Stock Entry,Delivery Note No,Складова разписка - Номер
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ако е избрано, само за покупка материални искания за окончателни суровини ще бъдат включени в материала искания. В противен случай, ще бъдат създадени Материал Исканията за предмети майки"
 DocType: Cheque Print Template,Message to show,Съобщение за показване
 DocType: Company,Retail,На дребно
 DocType: Attendance,Absent,Липсващ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Каталог Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Каталог Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Невалидно позоваване {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Покупка данъци и такси Template
 DocType: Upload Attendance,Download Template,Изтеглете шаблони
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,Сметка за плащане от
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина - Код
 DocType: Journal Entry,Write Off Based On,Отписване на базата на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Направи Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Направи Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печат и консумативи
 DocType: Stock Settings,Show Barcode Field,Покажи Barcode Невярно
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Изпрати Доставчик имейли
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Изпрати Доставчик имейли
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Заплата вече обработени за период между {0} и {1}, Оставете период заявление не може да бъде между този период от време."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Монтаж запис за сериен номер
 DocType: Guardian Interest,Guardian Interest,Guardian Интерес
@@ -3448,9 +3456,10 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Идентификационен номер на имейл за Guardian1
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,ден Next Дата и Повторение на Ден на месец трябва да бъде равна
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Настройки за уебсайт страница
-DocType: Offer Letter,Awaiting Response,Очаква Response
+DocType: Offer Letter,Awaiting Response,Очаква отговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Горе
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Посочете дали е нестандартна платима сметка
 DocType: Salary Slip,Earning & Deduction,Приходи & Удръжки
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"По избор. Тази настройка ще бъде използван, за да филтрирате по различни сделки."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицателна оценка процент не е позволено
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,Поръчка за производство - Позиция
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не са намерени записи
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Разходите за Брак на активи
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Частична поръчани
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Разходен Център е задължително за {2}
 DocType: Vehicle,Policy No,Полица номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Получават от продукта Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Получават от продукта Bundle
 DocType: Asset,Straight Line,Права
 DocType: Project User,Project User,Потребителят Project
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,разцепване
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,Вземете студентите от
 DocType: Hub Settings,Seller Country,Продавач - Държава
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Публикуване Теми на Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група вашите ученици в партиди
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група вашите ученици в партиди
 DocType: Authorization Rule,Authorization Rule,Разрешение Правило
 DocType: Sales Invoice,Terms and Conditions Details,Условия за ползване - Детайли
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Сметка {0}: Родителска сметка {1} не принадлежи на фирмата: {2}
 DocType: Program Enrollment Tool,Student Applicants,студентските Кандидатите
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Успешно изтрити всички транзакции, свързани с тази компания!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Успешно изтрити всички транзакции, свързани с тази компания!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Както по Дата
 DocType: Appraisal,HR,ЧР
 DocType: Program Enrollment,Enrollment Date,Записването Дата
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Изпитание
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Заплата Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новата учебна година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Връщане / кредитно известие
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Връщане / кредитно известие
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto вложка Ценоразпис ставка, ако липсва"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Общо платената сума
 DocType: Production Order Item,Transferred Qty,Прехвърлено Количество
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Вид на листа като случайни, болни и т.н."
 DocType: Email Digest,Send regular summary reports via Email.,Изпрати редовни обобщени доклади чрез електронна поща.
 DocType: Payment Entry,PE-,РЕ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Моля, задайте профила по подразбиране в Expense претенция Type {0}"
 DocType: Assessment Result,Student Name,Student Име
 DocType: Brand,Item Manager,Мениджъра на позиция
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,ТРЗ Задължения
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,Продажбите на фунията
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Съкращението е задължително
 DocType: Project,Task Progress,Задача Прогрес
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Количка
 ,Qty to Transfer,Количество за прехвърляне
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Оферта до потенциални клиенти или клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роля за редактиране замразена
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Позиция Wise Tax Подробности
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Институт Съкращение
 ,Item-wise Price List Rate,Точка-мъдър Ценоразпис Курсове
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Доставчик оферта
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Доставчик оферта
 DocType: Quotation,In Words will be visible once you save the Quotation.,Словом ще бъде видим след като запазите офертата.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количеството ({0}) не може да бъде част от реда {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Такса за събиране
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Баркод {0} вече се използва в ред {1}
 DocType: Lead,Add to calendar on this date,Добави в календара на тази дата
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за добавяне на транспортни разходи.
 DocType: Item,Opening Stock,Начална наличност
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",в протокола Updated чрез &quot;Time Log&quot;
 DocType: Customer,From Lead,От потенциален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поръчки пуснати за производство.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискална година ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS профил изисква да направи POS Влизане
 DocType: Program Enrollment Tool,Enroll Students,приемат студенти
 DocType: Hub Settings,Name Token,Име Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} по Фактура за продажба {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проекта
-DocType: Supplier,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
+DocType: Customer,Mention if non-standard receivable account,"Споменете, ако нестандартно вземане предвид"
 DocType: Journal Entry Account,If Income or Expense,Ако приход или разход
 DocType: Production Order,Required Items,Необходими неща
 DocType: Stock Ledger Entry,Stock Value Difference,Склад за Value Разлика
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Дефинират целите т Group-мъдър за тази Продажби Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Запаси по-стари от [Days]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row {0}: Asset е задължително за дълготраен актив покупка / продажба
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повече ценови правила са открити на базата на горните условия, се прилага приоритет. Приоритет е число между 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.,Позволете на следните потребители да одобрят Оставете Applications за блокови дни.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Позиция {0} е игнорирана, тъй като тя не е елемент от склад"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","За да не се прилага ценообразуване правило в дадена сделка, всички приложими правила за ценообразуване трябва да бъдат забранени."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","За да не се прилага ценообразуване правило в дадена сделка, всички приложими правила за ценообразуване трябва да бъдат забранени."
 DocType: Assessment Group,Parent Assessment Group,Родител Група оценка
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Работни места
 ,Sales Order Trends,Поръчка за продажба - Тенденции
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,Допълнителна Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Финансова година Крайна дата
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрира по Ваучер Не, ако е групирано по ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Въведи оферта на доставчик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Въведи оферта на доставчик
 DocType: Quality Inspection,Incoming,Входящ
 DocType: BOM,Materials Required (Exploded),Необходими материали (в детайли)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Добавте на потребители към вашата организация, различни от себе си"
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,История във фирмата
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Бютелини с новини
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фондова Ledger Влизане
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Група клиенти&gt; Територия
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Същата позиция е въведена много пъти
 DocType: Department,Leave Block List,Оставете Block List
 DocType: Sales Invoice,Tax ID,Данъчен номер
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,Търговски партньор и комисионни
 DocType: Employee Loan,Rate of Interest (%) / Year,Лихвен процент (%) / Година
 ,Project Quantity,Проект Количество
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Общо {0} за всички позиции е равна на нула, може да е необходимо да се промени &quot;Разпределете такси на базата на&quot;"
 DocType: Opportunity,To Discuss,Да обсъдим
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} единици от {1} необходимо в {2}, за да завършите тази транзакция."
 DocType: Loan Type,Rate of Interest (%) Yearly,Лихвен процент (%) Годишен
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,Връщане
 DocType: Production Order Operation,Production Order Operation,Поръчка за производство - Операция
 DocType: Pricing Rule,Disable,Изключване
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Начин на плащане се изисква за извършване на плащане
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Начин на плащане се изисква за извършване на плащане
 DocType: Project Task,Pending Review,До Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може да се бракува, тъй като вече е {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Общо разход претенция (чрез Expense претенция)
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Маркирай като отсъстващ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Валута на BOM # {1} трябва да бъде равна на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,Обменен курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Поръчка за продажба {0} не е изпратена
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Такса Компонент
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление на автопарка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Добавяне на елементи от
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Добавяне на елементи от
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Основна сметка {1} не принадлежи на компанията {2}
 DocType: Cheque Print Template,Regular,Редовен
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Общо Weightage на всички Критерии за оценка трябва да бъде 100%
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не съществува
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирайте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечено процентно разпределение
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Избраният елемент не може да има партида
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Избраният елемент не може да има партида
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","скорост на оценка не е намерен за позицията от {0}, което е необходимо да направите, счетоводни записвания за {1} {2}. Ако елементът е сключване на сделки като елемент проба в {1}, моля се спомене, че в {1} таблицата елемент. В противен случай, моля, създайте входящо фондова сделка за скоростта на оценка елемент или споменава в регистъра на т, и след това опитайте да изпращате / анулиране на този пост"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% от материали доставени по тази Бележка за доставка
 DocType: Project,Customer Details,Клиент - Детайли
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Въведете URL параметър за приемник с номера
 DocType: Payment Entry,Paid Amount,Платената сума
 DocType: Assessment Plan,Supervisor,Ръководител
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,На линия
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,На линия
 ,Available Stock for Packing Items,"Свободно фондова за артикули, Опаковки"
 DocType: Item Variant,Item Variant,Артикул вариант
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка Резултати Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM позиция за брак
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Подадените поръчки не могат да бъдат изтрити
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Управление на качеството
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Позиция {0} е деактивирана
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Позиция {0} е деактивирана
 DocType: Employee Loan,Repay Fixed Amount per Period,Погасяване фиксирана сума за Период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Моля, въведете количество за т {0}"
 DocType: Employee External Work History,Employee External Work History,Служител за външна работа
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Известие (дни)
 DocType: Tax Rule,Sales Tax Template,Данъка върху продажбите Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Изберете артикули, за да запазите фактурата"
 DocType: Employee,Encashment Date,Инкасо Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Склад за приспособяване
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Моля, посочете от / до интервал"
 DocType: Serial No,Under AMC,Под AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,"Позиция процент за оценка се преизчислява за това, се приземи ваучер сума на разходите"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,"Позиция процент за оценка се преизчислява за това, се приземи ваучер сума на разходите"
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Настройките по подразбиране за продажба.
 DocType: Guardian,Guardian Of ,пазител на
 DocType: Grading Scale Interval,Threshold,праг
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебитно известие - Издадено
 DocType: Production Order,Warehouses,Складове
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} активът не може да се прехвърля
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Тази позиция е вариант на {0} (шаблон).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупуване
 DocType: Announcement,Announcement,обявление
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,За получаване
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Не е позволено да се промени Доставчик като вече съществува поръчка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роля, която е оставена да се представят сделки, които надвишават кредитни лимити, определени."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изберете артикули за Производство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Изберете артикули за Производство
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Магистър синхронизиране на данни, това може да отнеме известно време,"
 DocType: Item,Material Issue,Изписване на материал
 DocType: Hub Settings,Seller Description,Продавач Описание
 DocType: Employee Education,Qualification,Квалификация
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Поръчан
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии за оценка Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Откриване на начислената амортизация трябва да бъде по-малко от равна на {0}
 DocType: Warehouse,Warehouse Name,Склад - Име
 DocType: Naming Series,Select Transaction,Изберете транзакция
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Моля, въведете Приемане Role или одобряването на потребителя"
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се отмени, защото {0} съществуват операции за този материал"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Не може да се отмени, защото {0} съществуват операции за този материал"
 DocType: Employee Loan,Disbursement Date,Изплащане - Дата
 DocType: Vehicle,Vehicle,Превозно средство
 DocType: Purchase Invoice,In Words,Словом
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Оп / Олово%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активи амортизации и баланси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} прехвърля от {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Вземи Получени аванси
 DocType: Email Digest,Add/Remove Recipients,Добавяне / Премахване на Получатели
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Транзакцията не е разрешена срещу спряна поръчка за производство {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","За да зададете тази фискална година, като по подразбиране, щракнете върху &quot;По подразбиране&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Присъедини
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостиг Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Съществува т вариант {0} със същите атрибути
 DocType: Employee Loan,Repay from Salary,Погасяване от Заплата
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Искане за плащане срещу {0} {1} за количество {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оценка Резултати Подробности
 DocType: Employee Education,Employee Education,Служител - Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate група т намерена в таблицата на т група
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Той е необходим, за да донесе точка Details."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Сметка
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Сериен № {0} е бил вече получен
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не е свързана с всяка сметка, моля, създайте / свързване на съответния (Asset) сметка за склада."
 DocType: Purchase Invoice,Recurring Id,Повтарящо Id
 DocType: Customer,Sales Team Details,Търговски отдел - Детайли
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Изтриете завинаги?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Изтриете завинаги?
 DocType: Expense Claim,Total Claimed Amount,Общо заявена Сума
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциалните възможности за продажби.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невалиден {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Настройте своето училище в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовата ресто сума (Валута на компанията)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Няма счетоводни записвания за следните складове
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Няма счетоводни записвания за следните складове
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Записване на документа на първо място.
 DocType: Account,Chargeable,Платим
 DocType: Company,Change Abbreviation,Промени Съкращение
 DocType: Expense Claim Detail,Expense Date,Expense Дата
 DocType: Item,Max Discount (%),Максимална отстъпка (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Последна Поръчка Сума
+DocType: Task,Is Milestone,Е Milestone
 DocType: Daily Work Summary,Email Sent To,"Писмо, изпратено до"
 DocType: Budget,Warn,Предупреждавам
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Всякакви други забележки, отбелязване на усилието, които трябва да отиде в регистрите."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,Атрибут Стойност
 ,Itemwise Recommended Reorder Level,Itemwise Препоръчано Пренареждане Level
 DocType: Salary Detail,Salary Detail,Заплата Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Моля изберете {0} първо
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Моля изберете {0} първо
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Партида {0} на артикул {1} е изтекла.
 DocType: Sales Invoice,Commission,Комисионна
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet за производство.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрази наличности по-стари от` трябва да бъде по-малък от %d дни.
 DocType: Tax Rule,Purchase Tax Template,Покупка Tax Template
 ,Project wise Stock Tracking,Проект мъдър фондова Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Съществува план за поддръжка {0} срещу {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Действително Количество (at source/target)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Записи на служителите.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Моля, задайте Следваща Амортизация Дата"
 DocType: HR Settings,Payroll Settings,Настройки ТРЗ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Съвпадение без свързана фактури и плащания.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Направи поръчка
 DocType: Email Digest,New Purchase Orders,Нови поръчки за покупка
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root не може да има център на разходите майка
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Изберете Марка ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Изберете Марка ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Натрупана амортизация към
 DocType: Sales Invoice,C-Form Applicable,Cи-форма приложима
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Операция - времето трябва да е по-голямо от 0 за операция {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операция - времето трябва да е по-голямо от 0 за операция {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Склад е задължителен
 DocType: Supplier,Address and Contacts,Адрес и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Мерна единица - превръщане - детайли
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Запази го пригодено за уеб 900 пиксела (ширина) на 100пиксела (височина)
 DocType: Program,Program Abbreviation,програма Съкращение
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производство на поръчката не може да бъде повдигнато срещу т Template
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Такси се обновяват на изкупните Квитанция за всяка стока
 DocType: Warranty Claim,Resolved By,Разрешен от
 DocType: Bank Guarantee,Start Date,Начална Дата
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Разпределяне на листа за период.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекове Депозити и неправилно изчистени
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Сметка {0}: Не можете да назначите себе си за родителска сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценоразпис Курсове
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Създаване на оферти на клиенти
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Създаване на оферти на клиенти
 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 +38,Bill of Materials (BOM),Спецификация на материал (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Средното време взети от доставчика да достави
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Резултати за оценка
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часове
 DocType: Project,Expected Start Date,Очаквана начална дата
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Махни позиция, ако цените не се отнася за тази позиция"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Валута на транзакция трябва да бъде същата като Плащане Портал валута
 DocType: Payment Entry,Receive,Получавам
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,Оперативни разходи
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие в случай, че сумарния месечен Бюджет е превишен"
 DocType: Purchase Invoice,Submit on creation,Подаване на създаване
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Валутна за {0} трябва да е {1}
 DocType: Asset,Disposal Date,Отписване - Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Имейли ще бъдат изпратени на всички активни служители на компанията в даден час, ако те не разполагат с почивка. Обобщение на отговорите ще бъдат изпратени в полунощ."
 DocType: Employee Leave Approver,Employee Leave Approver,Служител одобряващ отпуски
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не може да се обяви като загубена, защото е направена оферта."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Един запис Пренареждане вече съществува за този склад {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не може да се обяви като загубена, защото е направена оферта."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обучение Обратна връзка
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производство Поръчка {0} трябва да бъде представено
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за позиция {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Моля изберете Начална дата и крайна дата за позиция {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс е задължителен на ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Към днешна дата не може да бъде преди от дата
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Добавяне / Редактиране на цените
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Добавяне / Редактиране на цените
 DocType: Batch,Parent Batch,Родителска партида
 DocType: Cheque Print Template,Cheque Print Template,Чек шаблони за печат
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Списък на Разходни центрове
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,Поръчани артикули да бъдат доставени
 DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Вид индустрия
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Нещо се обърка!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нещо се обърка!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Внимание: Оставете заявка съдържа следните дати блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Фактурата за продажба {0} вече е била подадена
 DocType: Assessment Result Detail,Score,резултат
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,Вариант на базата на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Общо weightage определен да бъде 100%. Това е {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Вашите доставчици
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се определи като загубена тъй като поръчка за продажба е направена.
 DocType: Request for Quotation Item,Supplier Part No,Доставчик Част номер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Получени от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Не може да се приспадне при категория е за &quot;оценка&quot; или &quot;Vaulation и Total&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Получени от
 DocType: Lead,Converted,Преобразуван
 DocType: Item,Has Serial No,Има сериен номер
 DocType: Employee,Date of Issue,Дата на издаване
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: От {0} за {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: От {0} за {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Определете доставчик за т {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Часове стойност трябва да е по-голяма от нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Сайт на снимката {0}, прикрепена към т {1} не може да бъде намерена"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Списък този продукт в няколко групи в сайта.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Вие не можете да настроите Frozen стойност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Вземи неизравнени записвания
 DocType: Payment Reconciliation,From Invoice Date,От Дата на фактура
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Валутата за фактуриране трябва да бъде същата като валута на фирмата или на клиентската сметка
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставете Инкасо
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Какво прави?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,До склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Всички Учебен
 ,Average Commission Rate,Средна Комисията Курсове
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Има сериен номер' не може да бъде 'Да' за нескладируеми стоки
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Присъствие не може да бъде маркиран за бъдещи дати
 DocType: Pricing Rule,Pricing Rule Help,Ценообразуване Правило Помощ
 DocType: School House,House Name,Наименование Къща
 DocType: Purchase Taxes and Charges,Account Head,Главна Сметка
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,"Актуализиране на допълнителни разходи, за да се изчисли приземи разходи за предмети"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електрически
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавете останалата част от вашата организация, както на потребителите си. Можете да добавите и покани на клиентите да си портал, като ги добавите от Контакти"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавете останалата част от вашата организация, както на потребителите си. Можете да добавите и покани на клиентите да си портал, като ги добавите от Контакти"
 DocType: Stock Entry,Total Value Difference (Out - In),Общо Разлика (Изх - Вх)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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},User ID не е конфигуриран за служител {0}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,Клиент - Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напомняне за рожден ден за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни след последната поръчка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебит на сметка трябва да бъде балансова сметка
 DocType: Buying Settings,Naming Series,Именуване Series
 DocType: Leave Block List,Leave Block List Name,Оставете Block List Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Застраховка Начална дата трябва да бъде по-малка от застраховка Крайна дата
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Заплата поднасяне на служител {0} вече е създаден за времето лист {1}
 DocType: Vehicle Log,Odometer,одометър
 DocType: Sales Order Item,Ordered Qty,Поръчано Количество
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Точка {0} е деактивирана
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Точка {0} е деактивирана
 DocType: Stock Settings,Stock Frozen Upto,Фондова Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не съдържа материали / стоки
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM не съдържа материали / стоки
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},"Период От и Период До, са задължителни за повтарящи записи {0}"
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Дейността на проект / задача.
 DocType: Vehicle Log,Refuelling Details,Зареждане с гориво - Детайли
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Курс при последна покупка не е намерен
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Сума за отписване (фирмена валута)
 DocType: Sales Invoice Timesheet,Billing Hours,Фактурирани часове
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM по подразбиране за {0} не е намерен
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM по подразбиране за {0} не е намерен
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Row # {0}: Моля, задайте повторна поръчка количество"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Докоснете елементи, за да ги добавите тук"
 DocType: Fees,Program Enrollment,програма за записване
 DocType: Landed Cost Voucher,Landed Cost Voucher,Поземлен Cost Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Моля, задайте {0}"
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,Поддръжка Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отхвърлени Пореден №
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Година на начална дата или крайна дата се припокриват с {0}. За да се избегне моля, задайте компания"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Начална дата трябва да бъде по-малко от крайната дата за позиция {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,Качи Присъствие
@@ -4261,7 +4273,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Търговия на дребно и едро
 DocType: Issue,First Responded On,Първо отговорили на
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Обява на артикул в няколко групи
-DocType: Grade Interval,Grade Interval,Клас - интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Начални дата и фискална година Крайна дата вече са определени в Фискална година {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дата на клирънсът е актуализирана
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Разделна партида
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,Резервирано Количество за производство
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставете без отметка, ако не искате да разгледате партида, докато правите курсови групи."
 DocType: Asset,Frequency of Depreciation (Months),Честота на амортизация (месеца)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Поземлен Cost Точка
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Покажи нулеви стойности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Брой на т получен след производството / препакетиране от дадени количества суровини
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup прост сайт за моята организация
 DocType: Payment Reconciliation,Receivable / Payable Account,Вземания / дължими суми Акаунт
 DocType: Delivery Note Item,Against Sales Order Item,Срещу ред от поръчка за продажба
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Моля, посочете Умение Цена атрибут {0}"
 DocType: Item,Default Warehouse,Склад по подразбиране
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджетът не може да бъде назначен срещу Group Account {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Моля, въведете разходен център майка"
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,Основен курс
 DocType: GL Entry,Credit Amount,Кредитна сметка
 DocType: Cheque Print Template,Signatory Position,подписалите Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Задай като Загубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Задай като Загубени
 DocType: Timesheet,Total Billable Hours,Общо Billable Часа
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Заплащане Получаване Забележка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Това се основава на сделки срещу този клиент. Вижте график по-долу за повече подробности
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,Позиции които да бъдат поискани
 DocType: Purchase Order,Get Last Purchase Rate,Вземи курс от последна покупка
 DocType: Company,Company Info,Информация за компанията
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изберете или добавите нов клиент
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Изберете или добавите нов клиент
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,"Разходен център е необходим, за да осчетоводите разход"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Прилагане на средства (активи)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Това се основава на присъствието на този служител
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебит сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Дебит сметка
 DocType: Fiscal Year,Year Start Date,Година Начална дата
 DocType: Attendance,Employee Name,Служител Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Общо закръглено (фирмена валута)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Спрете потребители от извършване Оставете Заявленията за следните дни.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,сума на покупката
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Оферта на доставчик  {0} е създадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Край година не може да бъде преди Start Година
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Доходи на наети лица
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Моля, задайте по подразбиране Holiday Списък на служителите {0} или Фирма {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не съществува
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не съществува
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Фактури издадени на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id Project
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row Не {0}: сума не може да бъде по-голяма, отколкото До сума срещу Expense претенция {1}. До сума е {2}"
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,Четене 3
 ,Hub,Главина
 DocType: GL Entry,Voucher Type,Тип Ваучер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценова листа не е намерен или инвалиди
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Ценова листа не е намерен или инвалиди
 DocType: Employee Loan Application,Approved,Одобрен
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Служител облекчение на {0} трябва да се зададе като &quot;Ляв&quot;
 DocType: Guardian,Guardian,пазач
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} е създадена за Employee {1} в даден период от време
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Дел
 DocType: Selling Settings,Campaign Naming By,Задаване на име на кампания
 DocType: Employee,Current Address Is,Настоящият адрес е
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифициран
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","По избор. Задава валута по подразбиране компания, ако не е посочено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Счетоводни записи в дневник
 DocType: Delivery Note Item,Available Qty at From Warehouse,В наличност Количество в От Warehouse
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Сметка не съвпада с {1} / {2} в {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Моля, въведете Expense Account"
 DocType: Account,Stock,Наличност
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row {0}: Референтен Document Type трябва да бъде един от поръчка за покупка, покупка на фактура или вестник Влизане"
 DocType: Employee,Current Address,Настоящ Адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако елемент е вариант на друга позиция след това описание, изображение, ценообразуване, данъци и т.н., ще бъдат определени от шаблона, освен ако изрично е посочено"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Детайли
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Брутна печалба %
 DocType: BOM,With Operations,С Operations
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Счетоводни записи вече са направени във валута {0} за компанията {1}. Моля изберете вземания или платима сметка с валута {0}.
 DocType: Asset,Is Existing Asset,Е съществуваща дълготр.актив
 DocType: Salary Detail,Statistical Component,Статистически компонент
 ,Monthly Salary Register,Месечна заплата Регистрация
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,Стая
 DocType: Purchase Order,Advance Paid,Авансово изплатени суми
 DocType: Item,Item Tax,Позиция - Данък
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Материал на доставчик
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Материал на доставчик
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Акцизите Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Праг за {0}% се появява повече от веднъж
 DocType: Expense Claim,Employees Email Id,Служители Email Id
@@ -4484,7 +4497,7 @@
 DocType: Purchase Invoice,Next Date,Следващата дата
 DocType: Employee Education,Major/Optional Subjects,Основни / избираеми предмети
 DocType: Sales Invoice Item,Drop Ship,Капка Корабно
-DocType: Training Event,Attendees,Присъстващите
+DocType: Training Event,Attendees,Присъстващи
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children","Тук можете да поддържат семейните детайли като името и професията на майка, съпруга и деца"
 DocType: Academic Term,Term End Date,Срок Крайна дата
 DocType: Hub Settings,Seller Name,Продавач Име
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепете Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,запасите
 DocType: Customer,Commission Rate,Комисионен Курс
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Направи вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Направи вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокиране на молби за отсъствия по отдел.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от получаване, плащане или вътрешен трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Вид на плащане трябва да бъде един от получаване, плащане или вътрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Количката е празна
 DocType: Vehicle,Model,Модел
@@ -4510,6 +4523,7 @@
 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 +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Показване на публичните прикачени файлове
 DocType: Packing Slip,Package Weight Details,Тегло на пакет - Детайли
 DocType: Payment Gateway Account,Payment Gateway Account,Плащане Портал Акаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,След плащане завършване пренасочи потребителското към избраната страница.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,Срок На Годност
 ,Supplier Addresses and Contacts,Доставчик Адреси и контакти
 ,accounts-browser,сметки-браузър
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Моля, изберете Категория първо"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Моля, изберете Категория първо"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстор Project.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","За да се позволи на над-фактуриране или над-поръчка, актуализира &quot;квота&quot; в Сток Settings или елемента."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Да не се показва символи като $ и т.н. до валути.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половин ден)
 DocType: Supplier,Credit Days,Дни - Кредит
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Направи Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Направи Student Batch
 DocType: Leave Type,Is Carry Forward,Е пренасяне
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Вземи позициите от BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Вземи позициите от BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Време за въвеждане - Дни
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row {0}: Публикуване Дата трябва да е същото като датата на покупка {1} на актив {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Моля, въведете Поръчки за продажби в таблицата по-горе"
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционирани Сума
 DocType: GL Entry,Is Opening,Се отваря
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: дебитна не може да бъде свързана с {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Моля, настройте сериите за номериране за участие чрез настройка&gt; Серия за номериране"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 1bf0fb3..69de882 100644
--- a/erpnext/translations/bn.csv
+++ b/erpnext/translations/bn.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ভাড়াটে
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ব্যবহারকারী জন্য প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","থামানো উৎপাদন অর্ডার বাতিল করা যাবে না, বাতিল করতে এটি প্রথম দুর"
 DocType: Vehicle Service,Mileage,যত মাইল দীর্ঘ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,আপনি কি সত্যিই এই সম্পদ স্ক্র্যাপ করতে চান?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,নির্বাচন ডিফল্ট সরবরাহকারী
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,নির্বাচন ডিফল্ট সরবরাহকারী
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},মুদ্রাটির মূল্য তালিকা জন্য প্রয়োজন {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* লেনদেনে গণনা করা হবে.
 DocType: Purchase Order,Customer Contact,গ্রাহকের পরিচিতি
@@ -32,7 +32,7 @@
 DocType: Bank Guarantee,Customer,ক্রেতা
 DocType: Purchase Receipt Item,Required By,ক্সসে
 DocType: Delivery Note,Return Against Delivery Note,হুণ্ডি বিরুদ্ধে ফিরে
-DocType: Purchase Order,% Billed,% দেখানো হয়েছিল
+DocType: Purchase Order,% Billed,% চালান করা হয়েছে
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),এক্সচেঞ্জ রেট হিসাবে একই হতে হবে {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,ক্রেতার নাম
 DocType: Vehicle,Natural Gas,প্রাকৃতিক গ্যাস
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),বিশিষ্ট {0} হতে পারে না শূন্য কম ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 মিনিট ডিফল্ট
 DocType: Leave Type,Leave Type Name,প্রকার নাম ত্যাগ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,খোলা দেখাও
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,খোলা দেখাও
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,সিরিজ সফলভাবে আপডেট
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,চেকআউট
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural জার্নাল এন্ট্রি জমা
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ব্যাচ আইটেম মেয়াদ শেষ হওয়ার স্থিতি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ব্যাংক খসড়া
 DocType: Mode of Payment Account,Mode of Payment Account,পেমেন্ট একাউন্ট এর মোড
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,দেখান রুপভেদ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,দেখান রুপভেদ
 DocType: Academic Term,Academic Term,একাডেমিক টার্ম
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,উপাদান
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,পরিমাণ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,অ্যাকাউন্ট টেবিল খালি রাখা যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ঋণ (দায়)
 DocType: Employee Education,Year of Passing,পাসের সন
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","রেফারেন্স:% s এর, আইটেম কোড:% s এবং গ্রাহক হয়েছে:% s"
 DocType: Item,Country of Origin,মাত্রিভূমি
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,স্টক ইন
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,এমনকি আপনি যদি
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,স্বাস্থ্যের যত্ন
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),পেমেন্ট মধ্যে বিলম্ব (দিন)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,পরিষেবা ব্যায়ের
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,চালান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},ক্রমিক সংখ্যা: {0} ইতিমধ্যে বিক্রয় চালান উল্লেখ করা হয়: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,চালান
 DocType: Maintenance Schedule Item,Periodicity,পর্যাবৃত্তি
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,অর্থবছরের {0} প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,প্রত্যাশিত প্রসবের তারিখ সামনে বিক্রয় আদেশ তারিখ হতে হয়
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","দুই কলাম, পুরাতন নাম জন্য এক এবং নতুন নামের জন্য এক সঙ্গে CSV ফাইল সংযুক্ত"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} কোনো সক্রিয় অর্থবছরে না.
 DocType: Packed Item,Parent Detail docname,মূল বিস্তারিত docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","রেফারেন্স: {0}, আইটেম কোড: {1} এবং গ্রাহক: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,কেজি
 DocType: Student Log,Log,লগিন
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,একটি কাজের জন্য খোলা.
 DocType: Item Attribute,Increment,বৃদ্ধি
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ওয়ারহাউস নির্বাচন ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,বিজ্ঞাপন
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,একই কোম্পানীর একবারের বেশি প্রবেশ করানো হয়
 DocType: Employee,Married,বিবাহিত
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},অনুমোদিত নয় {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,থেকে আইটেম পান
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},অনুমোদিত নয় {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,থেকে আইটেম পান
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},শেয়ার হুণ্ডি বিরুদ্ধে আপডেট করা যাবে না {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},প্রোডাক্ট {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,তালিকাভুক্ত কোনো আইটেম
 DocType: Payment Reconciliation,Reconcile,মিলনসাধন করা
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,মুদিখানা
 DocType: Quality Inspection Reading,Reading 1,1 পঠন
 DocType: Process Payroll,Make Bank Entry,ব্যাংক এন্ট্রি করতে
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,অবসর বৃত্তি পেনশন ভাতা তহবিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,পরবর্তী অবচয় তারিখ আগে ক্রয়ের তারিখ হতে পারে না
 DocType: SMS Center,All Sales Person,সব বিক্রয় ব্যক্তি
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** মাসিক বিতরণ ** আপনি যদি আপনার ব্যবসার মধ্যে ঋতু আছে আপনি মাস জুড়ে বাজেট / উদ্দিষ্ট বিতরণ করতে সাহায্য করে.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,না আইটেম পাওয়া যায়নি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,না আইটেম পাওয়া যায়নি
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,বেতন কাঠামো অনুপস্থিত
 DocType: Lead,Person Name,ব্যক্তির নাম
 DocType: Sales Invoice Item,Sales Invoice Item,বিক্রয় চালান আইটেম
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","যেমন, &quot;প্রাথমিক স্কুল&quot; বা &quot;বিশ্ববিদ্যালয়&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,স্টক রিপোর্ট
 DocType: Warehouse,Warehouse Detail,ওয়ারহাউস বিস্তারিত
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ক্রেডিট সীমা গ্রাহকের জন্য পার হয়েছে {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,টার্ম শেষ তারিখ পরে একাডেমিক ইয়ার বছর শেষ তারিখ যা শব্দটি সংযুক্ত করা হয় না হতে পারে (শিক্ষাবর্ষ {}). তারিখ সংশোধন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", অবারিত হতে পারে না যেমন অ্যাসেট রেকর্ড আইটেমটি বিরুদ্ধে বিদ্যমান &quot;ফিক্সড সম্পদ&quot;"
 DocType: Vehicle Service,Brake Oil,ব্রেক অয়েল
 DocType: Tax Rule,Tax Type,ট্যাক্স ধরন
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},আপনি আগে এন্ট্রি যোগ করতে অথবা আপডেট করার জন্য অনুমতিপ্রাপ্ত নন {0}
 DocType: BOM,Item Image (if not slideshow),আইটেম ইমেজ (ছবি না হলে)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,একটি গ্রাহক এই একই নামের
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ঘন্টা হার / ৬০) * প্রকৃত অপারেশন টাইম
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM নির্বাচন
 DocType: SMS Log,SMS Log,এসএমএস লগ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,বিতরণ আইটেম খরচ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,এ {0} ছুটির মধ্যে তারিখ থেকে এবং তারিখ থেকে নয়
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,শিক্ষক
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},কোন ছুটি রেকর্ড কর্মচারী জন্য পাওয়া {0} জন্য {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,প্রথম কোম্পানি লিখুন দয়া করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,প্রথম কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,মোট খরচ
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,দাবি পরিমাণ
 DocType: Employee,Mr,জনাব
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,ডুপ্লিকেট গ্রাহকের গ্রুপ cutomer গ্রুপ টেবিল অন্তর্ভুক্ত
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,সরবরাহকারী ধরন / সরবরাহকারী
 DocType: Naming Series,Prefix,উপসর্গ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,বি-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,শ্রেণী
 DocType: Sales Invoice Item,Delivered By Supplier,সরবরাহকারী দ্বারা বিতরণ
 DocType: SMS Center,All Contact,সমস্ত যোগাযোগ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,উত্পাদনের অর্ডার ইতিমধ্যে BOM সঙ্গে সব আইটেম জন্য সৃষ্টি
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,বার্ষিক বেতন
 DocType: Daily Work Summary,Daily Work Summary,দৈনন্দিন কাজ সারাংশ
 DocType: Period Closing Voucher,Closing Fiscal Year,ফিস্ক্যাল বছর সমাপ্তি
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} হিমায়িত হয়
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} হিমায়িত করা
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,দয়া করে হিসাব চার্ট তৈরি করার জন্য বিদ্যমান কোম্পানী নির্বাচন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,স্টক খরচ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,নির্বাচন উদ্দিষ্ট ওয়্যারহাউস
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,বিরূদ্ধে এণ্ট্রি
 DocType: Journal Entry Account,Credit in Company Currency,কোম্পানি একক ঋণ
 DocType: Delivery Note,Installation Status,ইনস্টলেশনের অবস্থা
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",আপনি উপস্থিতি আপডেট করতে চান না? <br> বর্তমান: {0} \ <br> অনুপস্থিত: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty পরিত্যক্ত গৃহীত + আইটেম জন্য গৃহীত পরিমাণ সমান হতে হবে {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,সাপ্লাই কাঁচামালের ক্রয় জন্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,পেমেন্ট অন্তত একটি মোড পিওএস চালান জন্য প্রয়োজন বোধ করা হয়.
 DocType: Products Settings,Show Products as a List,দেখান পণ্য একটি তালিকা হিসাবে
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", টেমপ্লেট ডাউনলোড উপযুক্ত তথ্য পূরণ করুন এবং পরিবর্তিত ফাইল সংযুক্ত. আপনার নির্বাচিত সময়ের মধ্যে সব তারিখগুলি এবং কর্মচারী সমন্বয় বিদ্যমান উপস্থিতি রেকর্ড সঙ্গে, টেমপ্লেট আসবে"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,অবচয় এণ্ট্রি করুন
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,অনুরোধ টাইপ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,কর্মচারী করুন
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,কর্মচারী করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,সম্প্রচার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,সম্পাদন
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,অপারেশনের বিবরণ সম্পন্ন.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,রক্ষণাবেক্ষণ পরিদর্শন জন্য পরিকল্পনা.
 DocType: SMS Settings,Enter url parameter for message,বার্তা জন্য URL প্যারামিটার লিখুন
 DocType: POS Profile,Customer Groups,গ্রাহকের গ্রুপ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,আর্থিক বিবৃতি
 DocType: Guardian,Students,শিক্ষার্থীরা
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,প্রাইসিং এবং ডিসকাউন্ট প্রয়োগের জন্য বিধি.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,মূল্যতালিকা কেনা বা বিক্রি জন্য প্রযোজ্য হতে হবে
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},অগ্রিম পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0} {1}
 DocType: Naming Series,Series List for this Transaction,এই লেনদেনে সিরিজ তালিকা
 DocType: Company,Default Payroll Payable Account,ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,আপডেট ইমেল গ্রুপ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,আপডেট ইমেল গ্রুপ
 DocType: Sales Invoice,Is Opening Entry,এন্ট্রি খোলা হয়
 DocType: Customer Group,Mention if non-standard receivable account applicable,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য যদি প্রযোজ্য
 DocType: Course Schedule,Instructor Name,প্রশিক্ষক নাম
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,গুদাম জন্য জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,রিসেলার
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","যদি চেক করা, উপাদান অনুরোধ অ স্টক আইটেম অন্তর্ভুক্ত করা হবে."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,বিক্রয় চালান আইটেমটি বিরুদ্ধে
 ,Production Orders in Progress,প্রগতি উৎপাদন আদেশ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,অর্থায়ন থেকে নিট ক্যাশ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
 DocType: Lead,Address & Contact,ঠিকানা ও যোগাযোগ
 DocType: Leave Allocation,Add unused leaves from previous allocations,আগের বরাদ্দ থেকে অব্যবহৃত পাতার করো
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},পরবর্তী আবর্তক {0} উপর তৈরি করা হবে {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),মোট খোয়াতে পরিমাণ (টাইম শিট মাধ্যমে)
 DocType: Item Website Specification,Item Website Specification,আইটেম ওয়েবসাইট স্পেসিফিকেশন
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ত্যাগ অবরুদ্ধ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ব্যাংক দাখিলা
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},আইটেম {0} জীবনের তার শেষ পৌঁছেছে {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ব্যাংক দাখিলা
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,বার্ষিক
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,শেয়ার রিকনসিলিয়েশন আইটেম
 DocType: Stock Entry,Sales Invoice No,বিক্রয় চালান কোন
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,হাব প্রকাশ
 DocType: Student Admission,Student Admission,ছাত্র-ছাত্রী ভর্তি
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,উপাদানের জন্য অনুরোধ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} আইটেম বাতিল করা হয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,উপাদানের জন্য অনুরোধ
 DocType: Bank Reconciliation,Update Clearance Date,আপডেট পরিস্কারের তারিখ
 DocType: Item,Purchase Details,ক্রয় বিবরণ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ক্রয় করার &#39;কাঁচামাল সরবরাহ করা&#39; টেবিলের মধ্যে পাওয়া আইটেম {0} {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,বিশিষ্ট চেক এবং পরিষ্কার আমানত
 DocType: Item,Synced With Hub,হাব সঙ্গে synced
 DocType: Vehicle,Fleet Manager,দ্রুত ব্যবস্থাপক
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},সারি # {0}: {1} আইটেমের জন্য নেতিবাচক হতে পারে না {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,ভুল গুপ্তশব্দ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},সারি # {0}: {1} আইটেমের জন্য নেতিবাচক হতে পারে না {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,ভুল গুপ্তশব্দ
 DocType: Item,Variant Of,মধ্যে variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',চেয়ে &#39;স্টক প্রস্তুত করতে&#39; সম্পন্ন Qty বৃহত্তর হতে পারে না
 DocType: Period Closing Voucher,Closing Account Head,অ্যাকাউন্ট হেড সমাপ্তি
 DocType: Employee,External Work History,বাহ্যিক কাজের ইতিহাস
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,সার্কুলার রেফারেন্স ত্রুটি
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,স্বয়ংক্রিয় উপাদান অনুরোধ নির্মাণের ইমেইল দ্বারা সূচিত
 DocType: Journal Entry,Multi Currency,বিভিন্ন দেশের মুদ্রা
 DocType: Payment Reconciliation Invoice,Invoice Type,চালান প্রকার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,চালান পত্র
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,চালান পত্র
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,করের আপ সেট
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,বিক্রি অ্যাসেট খরচ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,আপনি এটি টানা পরে পেমেন্ট ভুক্তি নথীটি পরিবর্তিত হয়েছে. আবার এটি টান করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্স দুইবার প্রবেশ
-DocType: Grade Interval,Min Score,ন্যূনতম স্কোর
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} আইটেম ট্যাক্সে দুইবার প্রবেশ করা হয়েছে
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,এই সপ্তাহে এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Student Applicant,Admitted,ভর্তি
 DocType: Workstation,Rent Cost,ভাড়া খরচ
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,আদেশ মান
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ব্যাংক / ক্যাশ দলের বিরুদ্ধে বা অভ্যন্তরীণ স্থানান্তরের জন্য লেনদেন
 DocType: Shipping Rule,Valid for Countries,দেশ সমূহ জন্য বৈধ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"এই আইটেমটি একটি টেমপ্লেট এবং লেনদেনের ক্ষেত্রে ব্যবহার করা যাবে না. &#39;কোন কপি করো&#39; সেট করা হয়, যদি না আইটেম বৈশিষ্ট্যাবলী ভিন্নতা মধ্যে ধরে কপি করা হবে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,বিবেচিত মোট আদেশ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","কর্মচারী উপাধি (যেমন সিইও, পরিচালক ইত্যাদি)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,প্রবেশ ক্ষেত্রের মান &#39;দিন মাস পুনরাবৃত্তি&#39; দয়া করে
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},সারি # {0}: ক্রয় চালান একটি বিদ্যমান সম্পদ বিরুদ্ধে করা যাবে না {1}
 DocType: Item Tax,Tax Rate,করের হার
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ইতিমধ্যে কর্মচারী জন্য বরাদ্দ {1} সময়ের {2} জন্য {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,পছন্দ করো
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,পছন্দ করো
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,চালান {0} ইতিমধ্যেই জমা ক্রয়
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},সারি # {0}: ব্যাচ কোন হিসাবে একই হতে হবে {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,অ দলের রূপান্তর
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,একটি আইটেম এর ব্যাচ (অনেক).
 DocType: C-Form Invoice Detail,Invoice Date,চালান তারিখ
 DocType: GL Entry,Debit Amount,ডেবিট পরিমাণ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},শুধুমাত্র এ কোম্পানির প্রতি 1 অ্যাকাউন্ট থাকতে পারে {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,অনুগ্রহ পূর্বক সংযুক্তি দেখুন
 DocType: Purchase Order,% Received,% গৃহীত
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ছাত্র সংগঠনগুলো তৈরি করুন
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,উদ্ধৃতি জন্য অনুরোধ
 DocType: Salary Slip Timesheet,Working Hours,কর্মঘন্টা
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,একটি বিদ্যমান সিরিজের শুরু / বর্তমান ক্রম সংখ্যা পরিবর্তন করুন.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
-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.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,একটি নতুন গ্রাহক তৈরি করুন
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",একাধিক দামে ব্যাপা চলতে থাকে তবে ব্যবহারকারীরা সংঘাতের সমাধান করতে নিজে অগ্রাধিকার সেট করতে বলা হয়.
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ক্রয় আদেশ তৈরি করুন
 ,Purchase Register,ক্রয় নিবন্ধন
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,চার্জ প্রযোজ্য
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ভূমিকা থাকতে হবে &#39;ছুটি রাজসাক্ষী&#39;
 DocType: Purchase Receipt,Vehicle Date,যানবাহন তারিখ
 DocType: Student Log,Medical,মেডিকেল
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,হারানোর জন্য কারণ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,হারানোর জন্য কারণ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,লিড মালিক লিড হিসাবে একই হতে পারে না
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,বরাদ্দ পরিমাণ অনিয়ন্ত্রিত পরিমাণ তার চেয়ে অনেক বেশী করতে পারেন না
 DocType: Announcement,Receiver,গ্রাহক
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,পরিমাণ ও হার
 DocType: Delivery Note,% Installed,% ইনস্টল করা হয়েছে
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,শ্রেণীকক্ষ / গবেষণাগার ইত্যাদি যেখানে বক্তৃতা নির্ধারণ করা যাবে.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,প্রথম কোম্পানি নাম লিখুন
 DocType: Purchase Invoice,Supplier Name,সরবরাহকারী নাম
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ম্যানুয়াল পড়ুন
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,প্রাচীন মূল
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,আবশ্যিক ক্ষেত্র - শিক্ষাবর্ষ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,যে ইমেইল এর একটি অংশ হিসাবে যে যায় পরিচায়ক টেক্সট কাস্টমাইজ করুন. প্রতিটি লেনদেনের একটি পৃথক পরিচায়ক টেক্সট আছে.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},কোম্পানির জন্য ডিফল্ট প্রদেয় অ্যাকাউন্ট সেট দয়া করে {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,সব উত্পাদন প্রক্রিয়া জন্য গ্লোবাল সেটিংস.
 DocType: Accounts Settings,Accounts Frozen Upto,হিমায়িত পর্যন্ত অ্যাকাউন্ট
 DocType: SMS Log,Sent On,পাঠানো
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,গুন {0} আরোপ ছক মধ্যে একাধিক বার নির্বাচিত
 DocType: HR Settings,Employee record is created using selected field. ,কর্মচারী রেকর্ড নির্বাচিত ক্ষেত্র ব্যবহার করে নির্মিত হয়.
 DocType: Sales Order,Not Applicable,প্রযোজ্য নয়
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,হলিডে মাস্টার.
 DocType: Request for Quotation Item,Required Date,প্রয়োজনীয় তারিখ
 DocType: Delivery Note,Billing Address,বিলিং ঠিকানা
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,আইটেম কোড প্রবেশ করুন.
 DocType: BOM,Costing,খোয়াতে
 DocType: Tax Rule,Billing County,বিলিং কাউন্টি
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","চেক যদি ইতিমধ্যে প্রিন্ট হার / প্রিন্ট পরিমাণ অন্তর্ভুক্ত হিসাবে, ট্যাক্স পরিমাণ বিবেচনা করা হবে"
@@ -500,6 +504,7 @@
 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,সিকিউরিটিজ এবং আমানত
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","মূল্যনির্ধারণ পদ্ধতি পরিবর্তন করা যাবে না, যেহেতু কিছু আইটেম বিরুদ্ধে লেনদেনের যার ফলে এটি নেই হয় নিজের মূল্যনির্ধারণ পদ্ধতি"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,বরাদ্দ মোট পাতার বাধ্যতামূলক
 DocType: Job Opening,Description of a Job Opening,একটি কাজের খোলার বর্ণনা
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,আজকের জন্য মুলতুবি কার্যক্রম
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,প্রশাসনিক কর্মকর্তা
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,দয়া করে কোর্সের নির্বাচন
 DocType: Timesheet Detail,Hrs,ঘন্টা
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,কোম্পানি নির্বাচন করুন
 DocType: Stock Entry Detail,Difference Account,পার্থক্য অ্যাকাউন্ট
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,তার নির্ভরশীল টাস্ক {0} বন্ধ না হয় বন্ধ টাস্ক না পারেন.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"উপাদান অনুরোধ উত্থাপিত হবে, যার জন্য গুদাম লিখুন দয়া করে"
 DocType: Production Order,Additional Operating Cost,অতিরিক্ত অপারেটিং খরচ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,অঙ্গরাগ
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",মার্জ করার জন্য নিম্নলিখিত বৈশিষ্ট্য উভয় আইটেম জন্য একই হতে হবে
 DocType: Shipping Rule,Net Weight,প্রকৃত ওজন
 DocType: Employee,Emergency Phone,জরুরী ফোন
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,কেনা
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,দয়া করে প্রারম্ভিক মান 0% গ্রেড নির্ধারণ
 DocType: Sales Order,To Deliver,প্রদান করা
 DocType: Purchase Invoice Item,Item,আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,সিরিয়াল কোন আইটেমের একটি ভগ্নাংশ হতে পারে না
 DocType: Journal Entry,Difference (Dr - Cr),পার্থক্য (ডাঃ - CR)
 DocType: Account,Profit and Loss,লাভ এবং ক্ষতি
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ম্যানেজিং প্রণীত
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,বর্ধিত 0 হতে পারবেন না
 DocType: Production Planning Tool,Material Requirement,উপাদান প্রয়োজন
 DocType: Company,Delete Company Transactions,কোম্পানি লেনদেন মুছে
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,রেফারেন্স কোন ও রেফারেন্স তারিখ ব্যাংক লেনদেনের জন্য বাধ্যতামূলক
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ সম্পাদনা কর ও চার্জ যোগ
 DocType: Purchase Invoice,Supplier Invoice No,সরবরাহকারী চালান কোন
 DocType: Territory,For reference,অবগতির জন্য
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,ইনস্টলেশন নোট আইটেম
 DocType: Production Plan Item,Pending Qty,মুলতুবি Qty
 DocType: Budget,Ignore,উপেক্ষা করা
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} সক্রিয় নয়
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} সক্রিয় নয়
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},এসএমএস নিম্নলিখিত সংখ্যা পাঠানো: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,সেটআপ চেক মুদ্রণের জন্য মাত্রা
 DocType: Salary Slip,Salary Slip Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,মোট কমিশন
 DocType: Pricing Rule,Sales Partner,বিক্রয় অংশীদার
 DocType: Buying Settings,Purchase Receipt Required,কেনার রসিদ প্রয়োজনীয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,যদি খোলা স্টক প্রবেশ মূল্যনির্ধারণ হার বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,চালান টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,প্রথম কোম্পানি ও অনুষ্ঠান প্রকার নির্বাচন করুন
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,আর্থিক / অ্যাকাউন্টিং বছর.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,সঞ্চিত মূল্যবোধ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","দুঃখিত, সিরিয়াল আমরা মার্জ করা যাবে না"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,বিক্রয় আদেশ তৈরি করুন
 DocType: Project Task,Project Task,প্রকল্প টাস্ক
 ,Lead Id,লিড আইডি
 DocType: C-Form Invoice Detail,Grand Total,সর্বমোট
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,পুনঃসূচনা সংযুক্তি
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,পুনরাবৃত্ত গ্রাহকদের
 DocType: Leave Control Panel,Allocate,বরাদ্দ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,সেলস প্রত্যাবর্তন
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,সেলস প্রত্যাবর্তন
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,দ্রষ্টব্য: মোট বরাদ্দ পাতা {0} ইতিমধ্যে অনুমোদন পাতার চেয়ে কম হওয়া উচিত নয় {1} সময়ের জন্য
 DocType: Announcement,Posted By,কারো দ্বারা কোন কিছু ডাকঘরে পাঠানো
 DocType: Item,Delivered by Supplier (Drop Ship),সরবরাহকারীকে বিতরণ (ড্রপ জাহাজ)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,উদ্ধৃতি
 DocType: Lead,Middle Income,মধ্য আয়
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),খোলা (যোগাযোগ Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,বরাদ্দ পরিমাণ নেতিবাচক হতে পারে না
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,কোম্পানির সেট করুন
 DocType: Purchase Order Item,Billed Amt,দেখানো হয়েছিল মাসিক
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,সেলস চালান শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},রেফারেন্স কোন ও রেফারেন্স তারিখ জন্য প্রয়োজন বোধ করা হয় {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,নির্বাচন পেমেন্ট একাউন্ট ব্যাংক এণ্ট্রি করতে
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","পাতা, ব্যয় দাবী এবং মাইনে পরিচালনা করতে কর্মচারী রেকর্ড তৈরি করুন"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,নলেজ বেস জুড়ুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,প্রস্তাবনা লিখন
 DocType: Payment Entry Deduction,Payment Entry Deduction,পেমেন্ট এণ্ট্রি সিদ্ধান্তগ্রহণ
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; না অর্থবছরে {2}
 DocType: Buying Settings,Settings for Buying Module,মডিউল কেনা জন্য সেটিংস
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},অ্যাসেট {0} কোম্পানির অন্তর্গত নয় {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,প্রথম কেনার রসিদ লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","তারপর দামে ইত্যাদি গ্রাহক, ক্রেতা গ্রুপ, টেরিটরি, সরবরাহকারী, কারখানা, সরবরাহকারী ধরন, প্রচারাভিযান, বিক্রয় অংশীদার উপর ভিত্তি করে ফিল্টার আউট হয়"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,পরিসংখ্যা মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,কর্মচারী ঋণ ব্যবস্থাপনা
 DocType: Employee,Passport Number,পাসপোর্ট নম্বার
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 সাথে সর্ম্পক
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ম্যানেজার
 DocType: Payment Entry,Payment From / To,পেমেন্ট থেকে / প্রতি
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,তারিখের পরিসীমা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},নতুন ক্রেডিট সীমা গ্রাহকের জন্য বর্তমান অসামান্য রাশির চেয়ে কম হয়. ক্রেডিট সীমা অন্তত হতে হয়েছে {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'গ্রুপ দ্বারা' এবং 'উপর ভিত্তি করে' একই হতে পারে না
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,মিনিটের মধ্যে
 DocType: Issue,Resolution Date,রেজোলিউশন তারিখ
 DocType: Student Batch Name,Batch Name,ব্যাচ নাম
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড তৈরি করা হয়েছে:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},পেমেন্ট মোডে ডিফল্ট ক্যাশ বা ব্যাংক একাউন্ট সেট করুন {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,নথিভুক্ত করা
 DocType: Selling Settings,Customer Naming By,গ্রাহক নেমিং
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ছাত্র ছাত্র মাসের এ্যাটেনডেন্স প্রতিবেদন হিসেবে বর্তমান দেখাবে
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,প্রকৃত আরম্ভের সময়
 DocType: BOM Operation,Operation Time,অপারেশন টাইম
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,শেষ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ভিত্তি
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,ভিত্তি
 DocType: Timesheet,Total Billed Hours,মোট বিল ঘন্টা
 DocType: Journal Entry,Write Off Amount,পরিমাণ বন্ধ লিখুন
 DocType: Journal Entry,Bill No,বিল কোন
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,ছাত্র এ্যাটেনডেন্স
 DocType: Sales Invoice Timesheet,Time Sheet,টাইম শিট
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush কাঁচামালের ভিত্তিতে
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,আইটেম বিবরণ লিখুন দয়া করে
 DocType: Interest,Interest,স্বার্থ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,প্রাক সেলস
 DocType: Purchase Receipt,Other Details,অন্যান্য বিস্তারিত
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,পেমেন্ট ভুক্তি ইতিমধ্যে তৈরি করা হয়
 DocType: Purchase Receipt Item Supplied,Current Stock,বর্তমান তহবিল
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},সারি # {0}: অ্যাসেট {1} আইটেম লিঙ্ক নেই {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,প্রি বেতন স্লিপ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,প্রি বেতন স্লিপ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,অ্যাকাউন্ট {0} একাধিক বার প্রবেশ করানো হয়েছে
 DocType: Account,Expenses Included In Valuation,খরচ মূল্যনির্ধারণ অন্তর্ভুক্ত
 DocType: Hub Settings,Seller City,বিক্রেতা সিটি
 ,Absent Student Report,অনুপস্থিত শিক্ষার্থীর প্রতিবেদন
 DocType: Email Digest,Next email will be sent on:,পরবর্তী ইমেলে পাঠানো হবে:
 DocType: Offer Letter Term,Offer Letter Term,পত্র টার্ম প্রস্তাব
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,আইটেম ভিন্নতা আছে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,আইটেম ভিন্নতা আছে.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,আইটেম {0} পাওয়া যায়নি
 DocType: Bin,Stock Value,স্টক মূল্য
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,কোম্পানির {0} অস্তিত্ব নেই
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,বৃক্ষ ধরন
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,দয়া করে নির্বাচন করুন প্রোগ্রাম
 DocType: Project,Estimated Cost,আনুমানিক খরচ
 DocType: Purchase Order,Link to material requests,উপাদান অনুরোধ লিংক
@@ -753,7 +756,7 @@
 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,ডিফল্ট একাউন্ট
 DocType: Payment Entry,Received Amount (Company Currency),প্রাপ্তঃ পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,সুযোগ লিড থেকে তৈরি করা হয় তাহলে লিড নির্ধারণ করা আবশ্যক
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,সাপ্তাহিক ছুটির দিন নির্বাচন করুন
 DocType: Production Order Operation,Planned End Time,পরিকল্পনা শেষ সময়
 ,Sales Person Target Variance Item Group-Wise,সেলস পারসন উদ্দিষ্ট ভেদাংক আইটেমটি গ্রুপ-প্রজ্ঞাময়
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,থেকে সুযোগ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,মাসিক বেতন বিবৃতি.
 DocType: BOM,Website Specifications,ওয়েবসাইট উল্লেখ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স জন্য সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: টাইপ {1} এর {0} থেকে
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,সারি {0}: রূপান্তর ফ্যাক্টর বাধ্যতামূলক
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,ব্যাংক / সি নং
 DocType: Bank Guarantee,Project,প্রকল্প
 DocType: Quality Inspection Reading,Reading 7,7 পঠন
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,আংশিকভাবে আদেশ
 DocType: Expense Claim Detail,Expense Claim Type,ব্যয় দাবি প্রকার
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,শপিং কার্ট জন্য ডিফল্ট সেটিংস
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},অ্যাসেট জার্নাল এন্ট্রি মাধ্যমে বাতিল {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,অফিস রক্ষণাবেক্ষণ খরচ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ইমেইল অ্যাকাউন্ট সেট আপ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,প্রথম আইটেম লিখুন দয়া করে
 DocType: Account,Liability,দায়
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,অনুমোদিত পরিমাণ সারি মধ্যে দাবি করে বেশি পরিমাণে হতে পারে না {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,মূল্যতালিকা নির্বাচিত না
 DocType: Employee,Family Background,পারিবারিক ইতিহাস
 DocType: Request for Quotation Supplier,Send Email,বার্তা পাঠাও
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},সতর্কবাণী: অবৈধ সংযুক্তি {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,অনুমতি নেই
 DocType: Company,Default Bank Account,ডিফল্ট ব্যাঙ্ক অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","পার্টি উপর ভিত্তি করে ফিল্টার করুন, নির্বাচন পার্টি প্রথম টাইপ"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,কোন কর্মচারী পাওয়া
 DocType: Supplier Quotation,Stopped,বন্ধ
 DocType: Item,If subcontracted to a vendor,একটি বিক্রেতা আউটসোর্স করে
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,শিক্ষার্থীর গোষ্ঠী ইতিমধ্যেই আপডেট করা হয়।
 DocType: SMS Center,All Customer Contact,সব গ্রাহকের যোগাযোগ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV মাধ্যমে স্টক ব্যালেন্স আপলোড করুন.
 DocType: Warehouse,Tree Details,বৃক্ষ বিস্তারিত
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,নূন্যতম চালান পরিমাণ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: খরচ কেন্দ্র {2} কোম্পানির অন্তর্গত নয় {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: অ্যাকাউন্ট {2} একটি গ্রুপ হতে পারে না
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,আইটেম সারি {idx}: {DOCTYPE} {DOCNAME} উপরে বিদ্যমান নেই &#39;{DOCTYPE}&#39; টেবিল
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড {0} ইতিমধ্যে সম্পন্ন বা বাতিল করা হয়েছে
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,কোন কর্ম
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","অটো চালান 05, 28 ইত্যাদি যেমন তৈরি করা হবে যা মাসের দিন"
 DocType: Asset,Opening Accumulated Depreciation,খোলা সঞ্চিত অবচয়
@@ -857,8 +862,8 @@
 DocType: HR Settings,Retirement Age,কর্ম - ত্যাগ বয়ম
 DocType: Bin,Moving Average Rate,গড় হার মুভিং
 DocType: Production Planning Tool,Select Items,আইটেম নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} বিল বিরুদ্ধে {1} তারিখের {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,কোর্স সুচী
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} বিল বিপরীতে {1} তারিখের {2}
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,কোর্স সুচী
 DocType: Maintenance Visit,Completion Status,শেষ অবস্থা
 DocType: HR Settings,Enter retirement age in years,বছরে অবসরের বয়স লিখুন
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,উদ্দিষ্ট ওয়্যারহাউস
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,এই শতাংশ পর্যন্ত বিতরণ বা প্রাপ্তি ধরে মঞ্জুরি
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,আমদানি এ্যাটেনডেন্স
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,সকল আইটেম গ্রুপ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,সকল আইটেম গ্রুপ
 DocType: Process Payroll,Activity Log,কার্য বিবরণ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,নিট লাভ / ক্ষতি
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,স্বয়ংক্রিয়ভাবে লেনদেন জমা বার্তা রচনা.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,পেমেন্ট করার আদেশ ক্রয়
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,অভিক্ষিপ্ত Qty
 DocType: Sales Invoice,Payment Due Date,পরিশোধযোগ্য তারিখ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,আইটেম ভেরিয়েন্ট {0} ইতিমধ্যে একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',' শুরু'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,কি জন্য উন্মুক্ত
 DocType: Notification Control,Delivery Note Message,হুণ্ডি পাঠান
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,পুনরায় আদেশ Qty
 DocType: Leave Block List Date,Leave Block List Date,ব্লক তালিকা তারিখ ত্যাগ
 DocType: Pricing Rule,Price or Discount,দাম বা ডিসকাউন্ট
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ক্রয় রশিদ সামগ্রী টেবিলের মোট প্রযোজ্য চার্জ মোট কর ও চার্জ হিসাবে একই হতে হবে
 DocType: Sales Team,Incentives,ইনসেনটিভ
 DocType: SMS Log,Requested Numbers,অনুরোধ করা নাম্বার
 DocType: Production Planning Tool,Only Obtain Raw Materials,শুধু তাই কাঁচামালের
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,আউটসোর্স হয়
 DocType: Item Attribute,Item Attribute Values,আইটেম বৈশিষ্ট্য মূল্যবোধ
 DocType: Examination Result,Examination Result,পরীক্ষার ফলাফল
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,কেনার রশিদ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,কেনার রশিদ
 ,Received Items To Be Billed,গৃহীত চলছে বিল তৈরি করা
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Submitted বেতন Slips
 DocType: Employee,Ms,শ্রীমতি
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,মুদ্রা বিনিময় হার মাস্টার.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},রেফারেন্স DOCTYPE এক হতে হবে {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},রেফারেন্স DOCTYPE এক হতে হবে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},অপারেশন জন্য পরের {0} দিন টাইম স্লটে এটি অক্ষম {1}
 DocType: Production Order,Plan material for sub-assemblies,উপ-সমাহারকে পরিকল্পনা উপাদান
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,সেলস অংশীদার এবং টেরিটরি
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,স্বয়ংক্রিয়ভাবে অ্যাকাউন্ট তৈরি করা যাবে না যেমন আছে ইতিমধ্যে অ্যাকাউন্টে স্টক ভারসাম্য. আগে আপনি এই গুদাম উপর একটি এন্ট্রি করতে পারবেন আপনি একটি মিলে অ্যাকাউন্ট তৈরি করতে হবে
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,ডিফল্ট পরিশোধযোগ্য অংশ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} কর্মচারী সক্রিয় নয় বা কোন অস্তিত্ব নেই
 DocType: Fee Structure,Components,উপাদান
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,আইটেম রুপভেদ {0} আপডেট
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},আইটেম মধ্যে লিখুন দয়া করে অ্যাসেট শ্রেণী {0}
 DocType: Quality Inspection Reading,Reading 6,6 পঠন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,না {0} {1} {2} ছাড়া কোনো নেতিবাচক অসামান্য চালান Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,চালান অগ্রিম ক্রয়
 DocType: Hub Settings,Sync Now,সিঙ্ক এখন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},সারি {0}: ক্রেডিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,ক্রয় আইটেম
 DocType: Asset,Purchase Invoice,ক্রয় চালান
 DocType: Stock Ledger Entry,Voucher Detail No,ভাউচার বিস্তারিত কোন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,নতুন সেলস চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,নতুন সেলস চালান
 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,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,তারিখ এবং শেষ তারিখ খোলার একই অর্থবছরের মধ্যে হওয়া উচিত
 DocType: Lead,Request for Information,তথ্যের জন্য অনুরোধ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,সিঙ্ক অফলাইন চালান
 DocType: Payment Request,Paid,প্রদত্ত
 DocType: Program Fee,Program Fee,প্রোগ্রাম ফি
 DocType: Salary Slip,Total in words,কথায় মোট
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,অনুমোদিত
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;থেকে কপি করা হবে."
 DocType: Job Opening,Publish on website,ওয়েবসাইটে প্রকাশ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,গ্রাহকদের চালানে.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,সরবরাহকারী চালান তারিখ পোস্টিং তারিখ তার চেয়ে অনেক বেশী হতে পারে না
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,অনৈক্য
 ,Company Name,কোমপানির নাম
 DocType: SMS Center,Total Message(s),মোট বার্তা (গুলি)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,স্থানান্তর জন্য নির্বাচন আইটেম
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,চেক জমা ছিল ব্যাংকের নির্বাচন অ্যাকাউন্ট মাথা.
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,সারি {0}: সেলস / ক্রয় আদেশের বিরুদ্ধে পেমেন্ট সবসময় অগ্রিম হিসেবে চিহ্নিত করা উচিত
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,রাসায়নিক
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ডিফল্ট ব্যাংক / ক্যাশ অ্যাকাউন্ট স্বয়ংক্রিয়ভাবে যখন এই মোড নির্বাচন করা হয় বেতন জার্নাল এন্ট্রিতে আপডেট করা হবে.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",গ্রেড কোড অন্তর {0} অন্যান্য বাংলাদেশের জন্য গ্রেড অন্তর সাথে ওভারল্যাপ করে. অনুগ্রহ করে পরীক্ষা করুন অন্তর {0} এবং {1} এবং আবার চেষ্টা করুন
 DocType: BOM,Raw Material Cost(Company Currency),কাঁচামাল খরচ (কোম্পানির মুদ্রা)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,সকল আইটেম ইতিমধ্যে এই উৎপাদন অর্ডার জন্য স্থানান্তর করা হয়েছে.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},সারি # {0}: হার ব্যবহৃত হার তার চেয়ে অনেক বেশী হতে পারে না {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM ওয়েবসাইট আইটেম
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,আপনার চিঠি মাথা এবং লোগো আপলোড করুন. (আপনি তাদের পরে সম্পাদনা করতে পারেন).
 DocType: Timesheet Detail,Bill,বিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,পরবর্তী অবচয় তারিখ অতীত তারিখ হিসাবে প্রবেশ করানো হয়
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,সাদা
 DocType: SMS Center,All Lead (Open),সব নেতৃত্ব (ওপেন)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),সারি {0}: Qty জন্য পাওয়া যায় না {4} গুদামে {1} এন্ট্রির সময় পোস্টিং এ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,উন্নতির প্রদত্ত করুন
 DocType: Item,Automatically Create New Batch,নিউ ব্যাচ স্বয়ংক্রিয়ভাবে তৈরি করুন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,করা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,করা
 DocType: Student Admission,Admission Start Date,ভর্তি শুরুর তারিখ
 DocType: Journal Entry,Total Amount in Words,শব্দ মধ্যে মোট পরিমাণ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,সেখানে একটা ভুল ছিল. এক সম্ভাব্য কারণ আপনার ফর্ম সংরক্ষণ করেন নি যে হতে পারে. সমস্যা থেকে গেলে support@erpnext.com সাথে যোগাযোগ করুন.
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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 খোলা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,পরিমাণ পরিবর্তন অ্যাকাউন্ট প্রবেশ করুন
 DocType: Student Batch Name,Student Batch Name,ছাত্র ব্যাচ নাম
 DocType: Holiday List,Holiday List Name,ছুটির তালিকা নাম
 DocType: Repayment Schedule,Balance Loan Amount,ব্যালেন্স ঋণের পরিমাণ
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},উল্লেখ করুন একটি {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,পরিমাণ বা মান কোন পরিবর্তনের সঙ্গে সরানো আইটেম.
 DocType: Delivery Note,Delivery To,বিতরণ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,গুন টেবিল বাধ্যতামূলক
 DocType: Production Planning Tool,Get Sales Orders,বিক্রয় আদেশ পান
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} নেতিবাচক হতে পারে না
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ডিসকাউন্ট
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ডিসকাউন্ট
 DocType: Asset,Total Number of Depreciations,মোট Depreciations সংখ্যা
 DocType: Sales Invoice Item,Rate With Margin,মার্জিন সঙ্গে হার
 DocType: Workstation,Wages,মজুরি
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,বিক্রয় আদেশ / সমাপ্ত পণ্য গুদাম সংরক্ষিত ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,বিক্রয় পরিমাণ
 DocType: Repayment Schedule,Interest Amount,সুদের পরিমাণ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- &#39;status&#39; এবং সংরক্ষণ আপডেট করুন
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,আপনি এই রেকর্ডের জন্য ব্যয় রাজসাক্ষী হয়. ‧- &#39;status&#39; এবং সংরক্ষণ আপডেট করুন
 DocType: Serial No,Creation Document No,ক্রিয়েশন ডকুমেন্ট
 DocType: Issue,Issue,ইস্যু
 DocType: Asset,Scrapped,বাতিল
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","আইটেম রূপের জন্য আরোপ করা. যেমন, আকার, রঙ ইত্যাদি"
 DocType: Purchase Invoice,Returns,রিটার্নস
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP ওয়্যারহাউস
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},সিরিয়াল কোন {0} পর্যন্ত রক্ষণাবেক্ষণ চুক্তির অধীন হয় {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,সংগ্রহ
 DocType: Lead,Organization Name,প্রতিষ্ঠানের নাম
 DocType: Tax Rule,Shipping State,শিপিং রাজ্য
 ,Projected Quantity as Source,উত্স হিসাবে অভিক্ষিপ্ত পরিমাণ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,আইটেম বাটন &#39;ক্রয় রসিদ থেকে জানানোর পান&#39; ব্যবহার করে যোগ করা হবে
 DocType: Employee,A-,এ-
 DocType: Production Planning Tool,Include non-stock items,অ স্টক আইটেম অন্তর্ভুক্ত
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,সেলস খরচ
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,বিরুদ্ধে
 DocType: Item,Default Selling Cost Center,ডিফল্ট বিক্রি খরচ কেন্দ্র
 DocType: Sales Partner,Implementation Partner,বাস্তবায়ন অংশীদার
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,জিপ কোড
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,জিপ কোড
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},বিক্রয় আদেশ {0} হল {1}
 DocType: Opportunity,Contact Info,যোগাযোগের তথ্য
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,শেয়ার দাখিলা তৈরীর
 DocType: Packing Slip,Net Weight UOM,নিট ওজন UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ফলাফল
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ফলাফল
 DocType: Item,Default Supplier,ডিফল্ট সরবরাহকারী
 DocType: Manufacturing Settings,Over Production Allowance Percentage,উত্পাদনের ভাতা শতকরা ওভার
 DocType: Employee Loan,Repayment Schedule,ঋণ পরিশোধের সময় নির্ধারণ
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,সাপ্তাহিক ছুটি তারিখগুলি করুন
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,শেষ তারিখ জন্ম কম হতে পারে না
 DocType: Sales Person,Select company name first.,প্রথমটি বেছে নিন কোম্পানির নাম.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ডাঃ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ডাঃ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,এবার সরবরাহকারী থেকে প্রাপ্ত.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},করুন {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,গড় বয়স
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,কী পারফরমেন্স ফোন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,পরিবহন
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,অবৈধ অ্যাট্রিবিউট
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} দাখিল করতে হবে
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},পরিমাণ থেকে কম বা সমান হতে হবে {0}
 DocType: SMS Center,Total Characters,মোট অক্ষর
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},আইটেম জন্য BOM ক্ষেত্রের মধ্যে BOM নির্বাচন করুন {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,পরিবেশক
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,শপিং কার্ট শিপিং রুল
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,উৎপাদন অর্ডার {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',সেট &#39;অতিরিক্ত ডিসকাউন্ট প্রযোজ্য&#39; দয়া করে
 ,Ordered Items To Be Billed,আদেশ আইটেম বিল তৈরি করা
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,বিন্যাস কম হতে হয়েছে থেকে চেয়ে পরিসীমা
 DocType: Global Defaults,Global Defaults,আন্তর্জাতিক ডিফল্ট
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,শুরুর বছর
 DocType: Purchase Invoice,Start date of current invoice's period,বর্তমান চালান এর সময়সীমার তারিখ শুরু
 DocType: Salary Slip,Leave Without Pay,পারিশ্রমিক বিহীন ছুটি
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ক্ষমতা পরিকল্পনা ত্রুটি
 ,Trial Balance for Party,পার্টি জন্য ট্রায়াল ব্যালেন্স
 DocType: Lead,Consultant,পরামর্শকারী
 DocType: Salary Slip,Earnings,উপার্জন
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","এই বৈকল্পিক আইটেম কোড যোগ করা হবে. আপনার সমাহার &quot;এস এম&quot;, এবং উদাহরণস্বরূপ, যদি আইটেমটি কোড &quot;টি-শার্ট&quot;, &quot;টি-শার্ট-এস এম&quot; হতে হবে বৈকল্পিক আইটেমটি কোড"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,আপনি বেতন স্লিপ সংরক্ষণ একবার (কথায়) নিট পে দৃশ্যমান হবে.
 DocType: Purchase Invoice,Is Return,ফিরে যেতে হবে
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,রিটার্ন / ডেবিট নোট
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,রিটার্ন / ডেবিট নোট
 DocType: Price List Country,Price List Country,মূল্যতালিকা দেশ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} আইটেম জন্য বৈধ সিরিয়াল আমরা {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ব্যাচ নম্বর পেতে আইটেম কোড লিখুন দয়া করে
 DocType: Stock Settings,Default Item Group,ডিফল্ট আইটেম গ্রুপ
 DocType: Employee Loan,Partially Disbursed,আংশিকভাবে বিতরণ
-DocType: Grading Structure,Grading System Name,গ্রেডিং সিস্টেম নাম
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,সরবরাহকারী ডাটাবেস.
 DocType: Account,Balance Sheet,হিসাবনিকাশপত্র
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',&#39;আইটেম কোড দিয়ে আইটেমের জন্য কেন্দ্র উড়ানের তালিকাটি
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","পেমেন্ট মোড কনফিগার করা হয়নি. অনুগ্রহ করে পরীক্ষা করুন, কিনা অ্যাকাউন্ট পেমেন্ট মোড বা পিওএস প্রোফাইল উপর স্থাপন করা হয়েছে."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,আপনার বিক্রয় ব্যক্তির গ্রাহকের পরিচিতি এই তারিখে একটি অনুস্মারক পাবেন
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,একই আইটেম একাধিক বার প্রবেশ করানো যাবে না.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","আরও অ্যাকাউন্ট দলের অধীনে করা যেতে পারে, কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে"
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,স্টক লেজার দাখিলা এবং GL সাজপোশাকটি নির্বাচিত ক্রয় রসিদ জন্য রিপোস্ট হয়
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,স্টক লেজার দাখিলা এবং GL সাজপোশাকটি নির্বাচিত ক্রয় রসিদ জন্য রিপোস্ট হয়
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,আইটেম 1
 DocType: Holiday,Holiday,ছুটির দিন
 DocType: Support Settings,Close Issue After Days,বন্ধ ইস্যু দিন পরে
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,কাজ শেষ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,আরোপ করা টেবিলের মধ্যে অন্তত একটি বৈশিষ্ট্য উল্লেখ করুন
 DocType: Announcement,All Students,সকল শিক্ষার্থীরা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,আইটেম {0} একটি অ স্টক আইটেমটি হতে হবে
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,দেখুন লেজার
 DocType: Grading Scale,Intervals,অন্তর
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,পুরনো
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","একটি আইটেম গ্রুপ একই নামের সঙ্গে বিদ্যমান, আইটেমের নাম পরিবর্তন বা আইটেম গ্রুপ নামান্তর করুন"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,শিক্ষার্থীর মোবাইল নং
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,বিশ্বের বাকি
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,আইটেম {0} ব্যাচ থাকতে পারে না
@@ -1251,15 +1252,15 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} থেকে বেতন পরিশোধ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},হিমায়িত অ্যাকাউন্ট সম্পাদনা করার জন্য অনুমোদিত নয় {0}
 DocType: Journal Entry,Get Outstanding Invoices,অসামান্য চালানে পান
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,বিক্রয় আদেশ {0} বৈধ নয়
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ক্রয় আদেশ আপনি পরিকল্পনা সাহায্য এবং আপনার ক্রয়ের উপর ফলোআপ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","দুঃখিত, কোম্পানি মার্জ করা যাবে না"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",মোট ইস্যু / স্থানান্তর পরিমাণ {0} উপাদান অনুরোধ মধ্যে {1} \ আইটেম জন্য অনুরোধ পরিমাণ {2} তার চেয়ে অনেক বেশী হতে পারে না {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,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}
-DocType: Project,% Completed,% সম্পন্ন
+DocType: Project,% Completed,% সম্পন্ন হয়েছে
 ,Invoiced Amount (Exculsive Tax),Invoiced পরিমাণ (Exculsive ট্যাক্স)
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,আইটেম 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,অ্যাকাউন্ট মাথা {0} সৃষ্টি
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,পরোক্ষ খরচ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,সারি {0}: Qty বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,কৃষি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,সিঙ্ক মাস্টার ডেটা
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,সিঙ্ক মাস্টার ডেটা
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,আপনার পণ্য বা সেবা
 DocType: Mode of Payment,Mode of Payment,পেমেন্ট মোড
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ওয়েবসাইট চিত্র একটি পাবলিক ফাইল বা ওয়েবসাইট URL হওয়া উচিত
 DocType: Student Applicant,AP,পি
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,এটি একটি root আইটেমটি গ্রুপ এবং সম্পাদনা করা যাবে না.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,গ্রুপ রোল নম্বর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, শুধুমাত্র ক্রেডিট অ্যাকাউন্ট অন্য ডেবিট এন্ট্রি বিরুদ্ধে সংযুক্ত করা যাবে জন্য"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,সব কাজের ওজন মোট হওয়া উচিত 1. অনুযায়ী সব প্রকল্পের কাজগুলো ওজন নিয়ন্ত্রন করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,হুণ্ডি {0} দাখিল করা হয় না
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","প্রাইসিং রুল প্রথম উপর ভিত্তি করে নির্বাচন করা হয় আইটেম, আইটেম গ্রুপ বা ব্র্যান্ড হতে পারে, যা ক্ষেত্র &#39;প্রয়োগ&#39;."
 DocType: Hub Settings,Seller Website,বিক্রেতা ওয়েবসাইট
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,সেলস টিম জন্য মোট বরাদ্দ শতাংশ 100 হওয়া উচিত
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},উৎপাদন অর্ডার অবস্থা হয় {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},উৎপাদন অর্ডার অবস্থা হয় {0}
 DocType: Appraisal Goal,Goal,লক্ষ্য
 DocType: Sales Invoice Item,Edit Description,সম্পাদনা বিবরণ
 ,Team Updates,টিম আপডেট
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,সরবরাহকারী
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,অ্যাকাউন্ট টাইপ সেটিং লেনদেন এই অ্যাকাউন্টটি নির্বাচন করতে সাহায্য করে.
 DocType: Purchase Invoice,Grand Total (Company Currency),সর্বমোট (কোম্পানি একক)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,প্রিন্ট বিন্যাস তৈরি করুন
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} প্রগতিতে আইটেম
 DocType: Workstation,Workstation Name,ওয়ার্কস্টেশন নাম
-DocType: Grade Interval,Grade Code,গ্রেড কোড
+DocType: Grading Scale Interval,Grade Code,গ্রেড কোড
 DocType: POS Item Group,POS Item Group,পিওএস আইটেম গ্রুপ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ডাইজেস্ট ইমেল:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} আইটেম অন্তর্গত নয় {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,হার্ডওয়্যারের
 DocType: Sales Order,Recurring Upto,পুনরাবৃত্ত পর্যন্ত
 DocType: Attendance,HR Manager,মানবসম্পদ ব্যবস্থাপক
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,একটি কোম্পানি নির্বাচন করুন
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,একটি কোম্পানি নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,সুবিধা বাতিল ছুটি
 DocType: Purchase Invoice,Supplier Invoice Date,সরবরাহকারী চালান তারিখ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,আপনি শপিং কার্ট সক্রিয় করতে হবে
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,খাদ্য
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,বুড়ো রেঞ্জ 3
 DocType: Maintenance Schedule Item,No of Visits,ভিজিট কোন
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,মার্ক উপস্থিতি
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,মার্ক উপস্থিতি
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,নথিভুক্ত হচ্ছে ছাত্র
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},অ্যাকাউন্ট বন্ধ মুদ্রা হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},সব লক্ষ্য জন্য পয়েন্ট সমষ্টি এটা হয় 100 হতে হবে {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,গড় দৈনিক আউটগোয়িং
 DocType: POS Profile,Campaign,প্রচারাভিযান
 DocType: Supplier,Name and Type,নাম এবং টাইপ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',অনুমোদন অবস্থা &#39;অনুমোদিত&#39; বা &#39;পরিত্যক্ত&#39; হতে হবে
 DocType: Purchase Invoice,Contact Person,ব্যক্তি যোগাযোগ
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','প্রত্যাশিত শুরুর তারিখ' কখনও 'প্রত্যাশিত শেষ তারিখ' এর চেয়ে বড় হতে পারে না
 DocType: Course Scheduling Tool,Course End Date,কোর্স শেষ তারিখ
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,শিপিং ঠিকানা নাম
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,হিসাবরক্ষনের তালিকা
 DocType: Material Request,Terms and Conditions Content,শর্তাবলী কনটেন্ট
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,এর চেয়ে বড় 100 হতে পারে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} আইটেম একটি স্টক আইটেম নয়
 DocType: Maintenance Visit,Unscheduled,অনির্ধারিত
 DocType: Employee,Owned,মালিক
 DocType: Salary Detail,Depends on Leave Without Pay,বিনা বেতনে ছুটি উপর নির্ভর করে
 DocType: Pricing Rule,"Higher the number, higher the priority","উচ্চ নম্বর, উচ্চ অগ্রাধিকার"
 ,Purchase Invoice Trends,চালান প্রবণতা ক্রয়
 DocType: Employee,Better Prospects,ভাল সম্ভাবনা
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","সারি # {0}: ব্যাচ {1} শুধুমাত্র {2} Qty এ হয়েছে। দয়া করে অন্য একটি ব্যাচ যা {3} Qty এ উপলব্ধ নির্বাচন করুন অথবা একাধিক সারি মধ্যে সারি বিভক্ত, একাধিক ব্যাচ থেকে আমাদের প্রদান / সমস্যাটি"
 DocType: Vehicle,License Plate,অনুমতি ফলক
 DocType: Appraisal,Goals,গোল
 DocType: Warranty Claim,Warranty / AMC Status,পাটা / এএমসি স্থিতি
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,কর্মচারী নিজেকে প্রতিবেদন করতে পারবে না.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","অ্যাকাউন্ট নিথর হয় তাহলে, এন্ট্রি সীমিত ব্যবহারকারীদের অনুমতি দেওয়া হয়."
 DocType: Email Digest,Bank Balance,অধিকোষস্থিতি
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} শুধুমাত্র মুদ্রা তৈরি করা যাবে: {0} জন্য অ্যাকাউন্টিং এণ্ট্রি {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","পেশা প্রফাইল, যোগ্যতা প্রয়োজন ইত্যাদি"
 DocType: Journal Entry Account,Account Balance,হিসাবের পরিমান
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,লেনদেনের জন্য ট্যাক্স রুল.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,বন্ধ না অর্থবছরে পি &amp; এল ভারসাম্যকে দেখান
 DocType: Shipping Rule,Shipping Account,শিপিং অ্যাকাউন্ট
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: অ্যাকাউন্ট {2} নিষ্ক্রীয়
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,সেলস আদেশ আপনি আপনার কাজ পরিকল্পনা সাহায্য এবং আপনার জন্য-সময় বিলি করুন
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,সেলস আদেশ আপনি আপনার কাজ পরিকল্পনা সাহায্য এবং আপনার জন্য-সময় বিলি করুন
 DocType: Quality Inspection,Readings,রিডিং
 DocType: Stock Entry,Total Additional Costs,মোট অতিরিক্ত খরচ
 DocType: Course Schedule,SH,শুট আউট
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,মান
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,প্যাকিং স্লিপ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,প্যাকিং স্লিপ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,অফিস ভাড়া
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,সেটআপ এসএমএস গেটওয়ে সেটিংস
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,আমদানি ব্যর্থ!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,সেবা
 DocType: HR Settings,Email Salary Slip to Employee,কর্মচারী ইমেল বেতন স্লিপ
 DocType: Cost Center,Parent Cost Center,মূল খরচ কেন্দ্র
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,সম্ভাব্য সরবরাহকারী নির্বাচন
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,সম্ভাব্য সরবরাহকারী নির্বাচন
 DocType: Sales Invoice,Source,উত্স
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,দেখান বন্ধ
 DocType: Leave Type,Is Leave Without Pay,বিনা বেতনে ছুটি হয়
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,অ্যাসেট শ্রেণী ফিক্সড অ্যাসেট আইটেমের জন্য বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,পেমেন্ট টেবিল অন্তর্ভুক্ত কোন রেকর্ড
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},এই {0} সঙ্গে দ্বন্দ্ব {1} জন্য {2} {3}
 DocType: Student Attendance Tool,Students HTML,শিক্ষার্থীরা এইচটিএমএল
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,ছেড়ে যাওয়া তারিখ
 DocType: Pricing Rule,For Price List,মূল্য তালিকা জন্য
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,নির্বাহী অনুসন্ধান
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,বাড়ে তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,বাড়ে তৈরি করুন
 DocType: Maintenance Schedule,Schedules,সূচী
 DocType: Purchase Invoice Item,Net Amount,থোক
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM বিস্তারিত কোন
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,প্রোগ্রাম enrollments
 DocType: Sales Invoice Item,Brand Name,পরিচিতিমুলক নাম
 DocType: Purchase Receipt,Transporter Details,স্থানান্তরকারী বিস্তারিত
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,ডিফল্ট গুদাম নির্বাচিত আইটেমের জন্য প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,বক্স
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,সম্ভাব্য সরবরাহকারী
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,সম্ভাব্য সরবরাহকারী
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,প্রতিষ্ঠান
 DocType: Budget,Monthly Distribution,মাসিক বন্টন
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,রিসিভার তালিকা শূণ্য. রিসিভার তালিকা তৈরি করুন
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,বিক্রয় অংশীদার উদ্দিষ্ট
 DocType: Loan Type,Maximum Loan Amount,সর্বোচ্চ ঋণের পরিমাণ
 DocType: Pricing Rule,Pricing Rule,প্রাইসিং রুল
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},শিক্ষার্থীর জন্য ডুপ্লিকেট রোল নম্বর {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},শিক্ষার্থীর জন্য ডুপ্লিকেট রোল নম্বর {0}
 DocType: Budget,Action if Annual Budget Exceeded,যদি বার্ষিক বাজেট অতিক্রম করেছে অ্যাকশন
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,আদেশ ক্রয় উপাদানের জন্য অনুরোধ
 DocType: Shopping Cart Settings,Payment Success URL,পেমেন্ট সাফল্য ইউআরএল
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,পরিশোধ পদ্ধতি
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","যদি চেক করা, হোম পেজে ওয়েবসাইটের জন্য ডিফল্ট আইটেম গ্রুপ হতে হবে"
 DocType: Quality Inspection Reading,Reading 4,4 পঠন
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},জন্য {0} প্রকল্পের জন্য পাওয়া যায়নি ডিফল্ট BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},জন্য {0} প্রকল্পের জন্য পাওয়া যায়নি ডিফল্ট BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,কোম্পানি ব্যয় জন্য দাবি করে.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","শিক্ষার্থীরা সিস্টেম অন্তরে হয়, আপনার সব ছাত্র যোগ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","শিক্ষার্থীরা সিস্টেম অন্তরে হয়, আপনার সব ছাত্র যোগ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},সারি # {0}: পরিস্কারের তারিখ {1} আগে চেক তারিখ হতে পারে না {2}
 DocType: Company,Default Holiday List,হলিডে তালিকা ডিফল্ট
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},সারি {0}: থেকে সময় এবং টাইম {1} সঙ্গে ওভারল্যাপিং হয় {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"আপনি ছুটি জন্য আবেদন করেন, যা প্রথম দিন (গুলি) ছুটির হয়. আপনি চলে জন্য আবেদন করার প্রয়োজন নেই."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,পেমেন্ট ইমেইল পুনরায় পাঠান
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ত্যে
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,উদ্ধৃতি করা
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,উদ্ধৃতি করা
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,অন্যান্য রিপোর্ট
 DocType: Dependent Task,Dependent Task,নির্ভরশীল কার্য
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},মেজার ডিফল্ট ইউনিট জন্য রূপান্তর গুণনীয়ক সারিতে 1 হতে হবে {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ধরনের ছুটি {0} চেয়ে বেশি হতে পারেনা {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,অগ্রিম এক্স দিনের জন্য অপারেশন পরিকল্পনা চেষ্টা করুন.
 DocType: HR Settings,Stop Birthday Reminders,বন্ধ করুন জন্মদিনের রিমাইন্ডার
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},কোম্পানির মধ্যে ডিফল্ট বেতনের প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 DocType: SMS Center,Receiver List,রিসিভার তালিকা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,অনুসন্ধান আইটেম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,অনুসন্ধান আইটেম
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ক্ষয়প্রাপ্ত পরিমাণ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ক্যাশ মধ্যে নিট পরিবর্তন
 DocType: Assessment Plan,Grading Scale,শূন্য স্কেল
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ইতিমধ্যে সম্পন্ন
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,মেজার {0} এর ইউনিট রূপান্তর ফ্যাক্টর ছক একাধিকবার প্রবেশ করানো হয়েছে
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ইতিমধ্যে সম্পন্ন
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},পেমেন্ট অনুরোধ ইতিমধ্যেই বিদ্যমান {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,প্রথম প্রকাশ আইটেম খরচ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},পরিমাণ বেশী হবে না {0}
@@ -1593,13 +1596,13 @@
 DocType: Purchase Order Item,Supplier Part Number,সরবরাহকারী পার্ট সংখ্যা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,রূপান্তরের হার 0 বা 1 হতে পারে না
 DocType: Sales Invoice,Reference Document,রেফারেন্স নথি
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{0} {1} is cancelled or stopped,{0} {1} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{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 +229,Purchase Receipt {0} is not submitted,কেনার রসিদ {0} দাখিল করা হয় না
 DocType: Company,Default Payable Account,ডিফল্ট প্রদেয় অ্যাকাউন্ট
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","যেমন গ্রেপ্তার নিয়ম, মূল্যতালিকা ইত্যাদি হিসাবে অনলাইন শপিং কার্ট এর সেটিংস"
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% দেখানো হয়েছিল
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% চালান করা হয়েছে
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,সংরক্ষিত Qty
 DocType: Party Account,Party Account,পক্ষের অ্যাকাউন্টে
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,মানব সম্পদ
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,বিতরণ এণ্ট্রি করুন
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,সারি {0}: সরবরাহকারীর বিরুদ্ধে অগ্রিম ডেবিট করা হবে
 DocType: Company,Default Values,ডিফল্ট মান
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ফ্রিকোয়েন্সি} ডাইজেস্ট
 DocType: Expense Claim,Total Amount Reimbursed,মোট পরিমাণ শিশুবের
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,এই যানবাহন বিরুদ্ধে লগ উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,সংগ্রহ করা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},সরবরাহকারী বিরুদ্ধে চালান {0} তারিখের {1}
 DocType: Customer,Default Price List,ডিফল্ট মূল্য তালিকা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,অ্যাসেট আন্দোলন রেকর্ড {0} সৃষ্টি
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,আপনি মুছে ফেলতে পারবেন না অর্থবছরের {0}. অর্থবছরের {0} গ্লোবাল সেটিংস এ ডিফল্ট হিসাবে সেট করা হয়
 DocType: Journal Entry,Entry Type,এন্ট্রি টাইপ
 ,Customer Credit Balance,গ্রাহকের ক্রেডিট ব্যালেন্স
@@ -1628,12 +1632,12 @@
 DocType: Project,Total Sales Cost (via Sales Order),মোট বিক্রয় খরচ (বিক্রয় আদেশ এর মাধ্যমে)
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,{0} এই ছাত্র দলের জন্য ছাত্রদের তুলনায় আরো নথিভুক্ত করা যায় না.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,লিড কাউন্ট
-apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} 0 অনেক বেশী হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,"{0}, 0 থেকে বেশী হতে হবে"
 DocType: Manufacturing Settings,Capacity Planning For (Days),(দিন) জন্য ক্ষমতা পরিকল্পনা
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,আসাদন
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,আইটেম কোনটিই পরিমাণ বা মান কোনো পরিবর্তন আছে.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,আবশ্যিক ক্ষেত্র - কার্যক্রমের
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,পাটা দাবি
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,পাটা দাবি
 ,Lead Details,সীসা বিবরণ
 DocType: Salary Slip,Loan repayment,ঋণ পরিশোধ
 DocType: Purchase Invoice,End date of current invoice's period,বর্তমান চালান এর সময়ের শেষ তারিখ
@@ -1647,16 +1651,15 @@
 DocType: Sales Invoice,Packed Items,বস্তাবন্দী আইটেম
 apps/erpnext/erpnext/config/support.py +27,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; টেবিলের পুনর্জীবিত হবে
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',&#39;টোটাল&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',সর্বমোট
 DocType: Shopping Cart Settings,Enable Shopping Cart,শপিং কার্ট সক্রিয়
 DocType: Employee,Permanent Address,স্থায়ী ঠিকানা
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",সর্বমোট চেয়ে \ {0} {1} বেশী হতে পারবেন না বিরুদ্ধে পরিশোধিত আগাম {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,আইটেমটি কোড নির্বাচন করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,আইটেমটি কোড নির্বাচন করুন
 DocType: Student Sibling,Studying in Same Institute,একই ইনস্টিটিউটে অধ্যয়নরত
 DocType: Territory,Territory Manager,আঞ্চলিক ব্যবস্থাপক
 DocType: Packed Item,To Warehouse (Optional),গুদাম থেকে (ঐচ্ছিক)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,আইটেম code&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Payment Entry,Paid Amount (Company Currency),প্রদত্ত পরিমাণ (কোম্পানি একক)
 DocType: Purchase Invoice,Additional Discount,অতিরিক্ত ছাড়
 DocType: Selling Settings,Selling Settings,সেটিংস বিক্রি
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,কার্ট দেখুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,বিপণন খরচ
 ,Item Shortage Report,আইটেম পত্র
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ওজন \ n দয়া খুব &quot;ওজন UOM&quot; উল্লেখ, উল্লেখ করা হয়"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,উপাদানের জন্য অনুরোধ এই স্টক এন্ট্রি করতে ব্যবহৃত
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,পরবর্তী অবচয় তারিখ নতুন সম্পদের জন্য বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,পরবর্তী অবচয় তারিখ নতুন সম্পদের জন্য বাধ্যতামূলক
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,প্রত্যেক ব্যাচ জন্য আলাদা কোর্স ভিত্তিক গ্রুপ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,একটি আইটেম এর একক.
 DocType: Fee Category,Fee Category,ফি শ্রেণী
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,গুরুত্ব
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: খরচ কেন্দ্র &#39;লাভ-ক্ষতির&#39; অ্যাকাউন্টের জন্য প্রয়োজন বোধ করা হয় {2}. অনুগ্রহ করে এখানে ক্লিক করুন জন্য একটি ডিফল্ট মূল্য কেন্দ্র স্থাপন করা.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,একটি গ্রাহক গ্রুপ একই নামের সঙ্গে বিদ্যমান গ্রাহকের নাম পরিবর্তন বা ক্রেতা গ্রুপ নামান্তর করুন
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 পড়া
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,আইটেম-জ্ঞানী সেলস নিবন্ধন
 DocType: Asset,Gross Purchase Amount,গ্রস ক্রয়ের পরিমাণ
 DocType: Asset,Depreciation Method,অবচয় পদ্ধতি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,অফলাইন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,অফলাইন
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,মৌলিক হার মধ্যে অন্তর্ভুক্ত এই খাজনা?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,মোট লক্ষ্যমাত্রা
 DocType: Program Course,Required,প্রয়োজনীয়
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,রিকনসিলিয়েশন JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,অনেক কলাম. প্রতিবেদন এবং রফতানি একটি স্প্রেডশীট অ্যাপ্লিকেশন ব্যবহার করে তা প্রিন্ট করা হবে.
 DocType: Purchase Invoice Item,Batch No,ব্যাচ নাম্বার
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},জন্য বিনিময় হার খুঁজে পেতে অসমর্থ {0} থেকে {1} মূল তারিখ জন্য {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,একটি গ্রাহকের ক্রয় আদেশের বিরুদ্ধে একাধিক বিক্রয় আদেশ মঞ্জুরি
 DocType: Student Group Instructor,Student Group Instructor,শিক্ষার্থীর গ্রুপ প্রশিক্ষক
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 মোবাইল কোন
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,প্রধান
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,বৈকল্পিক
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,প্রধান
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,বৈকল্পিক
 DocType: Naming Series,Set prefix for numbering series on your transactions,আপনার লেনদেনের উপর সিরিজ সংখ্যায়ন জন্য সেট উপসর্গ
 DocType: Employee Attendance Tool,Employees HTML,এমপ্লয়িজ এইচটিএমএল
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ডিফল্ট BOM ({0}) এই আইটেমটি বা তার টেমপ্লেট জন্য সক্রিয় হতে হবে
 DocType: Employee,Leave Encashed?,Encashed ত্যাগ করবেন?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ক্ষেত্রের থেকে সুযোগ বাধ্যতামূলক
 DocType: Email Digest,Annual Expenses,বার্ষিক খরচ
 DocType: Item,Variants,রুপভেদ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ক্রয় আদেশ করা
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ক্রয় আদেশ করা
 DocType: SMS Center,Send To,পাঠানো
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ছুটি টাইপ জন্য যথেষ্ট ছুটি ভারসাম্য নেই {0}
 DocType: Payment Reconciliation Payment,Allocated amount,বরাদ্দ পরিমাণ
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,কাজ-অগ্রগতি ওয়্যারহাউস জমা করার আগে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,একটি কাজের জন্য আবেদনকারী.
 DocType: Purchase Order Item,Warehouse and Reference,ওয়ারহাউস ও রেফারেন্স
 DocType: Supplier,Statutory info and other general information about your Supplier,আপনার সরবরাহকারীর সম্পর্কে বিধিবদ্ধ তথ্য এবং অন্যান্য সাধারণ তথ্য
 DocType: Item,Serial Nos and Batches,সিরিয়াল আমরা এবং ব্যাচ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,শিক্ষার্থীর গ্রুপ স্ট্রেংথ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,জার্নাল বিরুদ্ধে এণ্ট্রি {0} কোনো অপ্রতিম {1} এন্ট্রি নেই
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
 apps/erpnext/erpnext/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: Grading Structure,Grading Intervals,শূন্য অন্তরাল
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,অনুগ্রহ করে প্রবেশ করুন
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","সারিতে আইটেম {0} এর জন্য overbill করা যাবে না {1} চেয়ে আরো অনেক কিছু {2}। ওভার বিলিং অনুমতি দিতে, সেটিংস কেনার সেট করুন"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,দয়া করে আইটেম বা গুদাম উপর ভিত্তি করে ফিল্টার সেট
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} দাখিল করতে হবে
 DocType: Authorization Control,Authorization Control,অনুমোদন কন্ট্রোল
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},সারি # {0}: ওয়্যারহাউস প্রত্যাখ্যাত প্রত্যাখ্যান আইটেম বিরুদ্ধে বাধ্যতামূলক {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,প্রদান
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,আপনার আদেশ পরিচালনা
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,প্রদান
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,আপনার আদেশ পরিচালনা
 DocType: Production Order Operation,Actual Time and Cost,প্রকৃত সময় এবং খরচ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},সর্বাধিক {0} এর উপাদানের জন্য অনুরোধ {1} সেলস আদেশের বিরুদ্ধে আইটেম জন্য তৈরি করা যেতে পারে {2}
 DocType: Employee,Salutation,অভিবাদন
 DocType: Course,Course Abbreviation,কোর্সের সমাহার
 DocType: Student Leave Application,Student Leave Application,শিক্ষার্থীর ছুটি আবেদন
 DocType: Item,Will also apply for variants,এছাড়াও ভিন্নতা জন্য আবেদন করতে হবে
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","অ্যাসেট, বাতিল করা যাবে না হিসাবে এটি আগে থেকেই {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},কর্মচারী {0} হাফ দিনে {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},মোট কাজ ঘন্টা সর্বোচ্চ কর্মঘন্টা চেয়ে বেশী করা উচিত হবে না {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,উপর
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,বিক্রয়ের সময়ে সমষ্টি জিনিস.
 DocType: Quotation Item,Actual Qty,প্রকৃত স্টক
 DocType: Sales Invoice Item,References,তথ্যসূত্র
@@ -1775,7 +1776,7 @@
 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 +91,Associate,সহযোগী
 DocType: Asset Movement,Asset Movement,অ্যাসেট আন্দোলন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,নিউ কার্ট
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,নিউ কার্ট
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} আইটেম ধারাবাহিকভাবে আইটেম নয়
 DocType: SMS Center,Create Receiver List,রিসিভার তালিকা তৈরি করুন
 DocType: Vehicle,Wheels,চাকা
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,উত্পাদনের অবাধ্য সময় লগ সৃষ্টি নিষ্ক্রিয় করা হয়. অপারেশনস উত্পাদনের আদেশের বিরুদ্ধে ট্র্যাক করা হবে না
 DocType: Student,Student Mobile Number,শিক্ষার্থীর মোবাইল নম্বর
 DocType: Item,Has Variants,ধরন আছে
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},আপনি ইতিমধ্যে থেকে আইটেম নির্বাচন করা আছে {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,মাসিক বন্টন নাম
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ব্যাচ আইডি বাধ্যতামূলক
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ব্যাচ আইডি বাধ্যতামূলক
 DocType: Sales Person,Parent Sales Person,মূল সেলস পারসন
 DocType: Purchase Invoice,Recurring Invoice,পুনরাবৃত্ত চালান
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,প্রকল্প পরিচালনার
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,অর্থবছর
 DocType: Vehicle Log,Fuel Price,জ্বালানীর দাম
 DocType: Budget,Budget,বাজেট
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,পরিসম্পদ আইটেম একটি অ স্টক আইটেম হতে হবে.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",এটি একটি আয় বা ব্যয় অ্যাকাউন্ট না হিসাবে বাজেট বিরুদ্ধে {0} নিয়োগ করা যাবে না
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,অর্জন
 DocType: Student Admission,Application Form Route,আবেদনপত্র রুট
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,টেরিটরি / গ্রাহক
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,টেরিটরি / গ্রাহক
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,যেমন 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ত্যাগ প্রকার {0} বরাদ্দ করা যাবে না যেহেতু এটা বিনা বেতনে ছুটি হয়
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},সারি {0}: বরাদ্দ পরিমাণ {1} কম হতে পারে অথবা বকেয়া পরিমাণ চালান সমান নয় {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,সিরিয়াল কোন স্ট্যাটাস
 DocType: Payment Entry Reference,Outstanding,অনিষ্পন্ন
 ,Daily Timesheet Summary,দৈনিক শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড সারাংশ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","সারি {0}: সেট করুন {1} পর্যায়কাল, থেকে এবং তারিখ \ করার মধ্যে পার্থক্য এর চেয়ে বড় বা সমান হবে {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,এই স্টক আন্দোলনের উপর ভিত্তি করে তৈরি. দেখুন {0} বিস্তারিত জানতে
 DocType: Pricing Rule,Selling,বিক্রি
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},পরিমাণ {0} {1} বিরুদ্ধে কাটা {2}
 DocType: Employee,Salary Information,বেতন তথ্য
 DocType: Sales Person,Name and Employee ID,নাম ও কর্মী ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,দরুন জন্ম তারিখ পোস্ট করার আগে হতে পারে না
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,কর্তব্য এবং কর
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,রেফারেন্স তারিখ লিখুন দয়া করে
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,এই চার্জ ধরণ জন্য বর্তমান সারির সংখ্যা এর চেয়ে বড় বা সমান সারির সংখ্যা পড়ুন করতে পারবেন না
 DocType: Asset,Sold,বিক্রীত
 ,Item-wise Purchase History,আইটেম-বিজ্ঞ ক্রয় ইতিহাস
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},সিরিয়াল কোন আইটেম জন্য যোগ সংগ্রহ করার &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন {0}
 DocType: Account,Frozen,হিমায়িত
 ,Open Production Orders,ওপেন উত্পাদনের আদেশ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),বেজ পরিমাণ (কোম্পানি মুদ্রা)
 DocType: Payment Reconciliation Payment,Reference Row,রেফারেন্স সারি
 DocType: Installation Note,Installation Time,ইনস্টলেশনের সময়
 DocType: Sales Invoice,Accounting Details,অ্যাকাউন্টিং এর বর্ণনা
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,এই কোম্পানির জন্য সব লেনদেন মুছে
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,বিনিয়োগ
 DocType: Issue,Resolution Details,রেজোলিউশনের বিবরণ
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,আলোচনা
 DocType: Payment Entry,Transaction ID,লেনদেন নাম্বার
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,দামে আরও পরিমাণের উপর ভিত্তি করে ফিল্টার করা হয়.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},কর্মচারী জন্য যোগদানের তারিখ সেট করুন {0}
 DocType: Task,Total Billing Amount (via Time Sheet),মোট বিলিং পরিমাণ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,পুনরাবৃত্ত গ্রাহক রাজস্ব
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ভূমিকা &#39;ব্যয় রাজসাক্ষী&#39; থাকতে হবে
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,জুড়ি
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,উত্পাদনের জন্য BOM এবং Qty নির্বাচন
 DocType: Asset,Depreciation Schedule,অবচয় সূচি
 DocType: Bank Reconciliation Detail,Against Account,অ্যাকাউন্টের বিরুদ্ধে
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,অর্ধদিবস তারিখ তারিখ থেকে এবং তারিখ থেকে মধ্যবর্তী হওয়া উচিত
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},কোম্পানি &#39;অ্যাসেট অবচয় খরচ কেন্দ্র&#39; নির্ধারণ করুন {0}
 ,Maintenance Schedules,রক্ষণাবেক্ষণ সময়সূচী
 DocType: Task,Actual End Date (via Time Sheet),প্রকৃত শেষ তারিখ (টাইম শিট মাধ্যমে)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},পরিমাণ {0} {1} বিরুদ্ধে {2} {3}
 ,Quotation Trends,উদ্ধৃতি প্রবণতা
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},আইটেমটি গ্রুপ আইটেমের জন্য আইটেম মাস্টার উল্লেখ না {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,অ্যাকাউন্ট ডেবিট একটি গ্রহনযোগ্য অ্যাকাউন্ট থাকতে হবে
 DocType: Shipping Rule Condition,Shipping Amount,শিপিং পরিমাণ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,অপেক্ষারত পরিমাণ
 DocType: Purchase Invoice Item,Conversion Factor,রূপান্তর ফ্যাক্টর
 DocType: Purchase Order,Delivered,নিষ্কৃত
 ,Vehicle Expenses,গাড়ির খরচ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
+DocType: Serial No,Invoice Details,চালান বিস্তারিত
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},দরকারী জীবন পর প্রত্যাশিত মান এর চেয়ে বড় বা সমান হতে হবে {0}
 DocType: Purchase Receipt,Vehicle Number,গাড়ির সংখ্যা
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,আবর্তক চালান বন্ধ করা হবে কোন তারিখে
 DocType: Employee Loan,Loan Amount,ঋণের পরিমাণ
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,এইচআর সেটিংস
 DocType: Salary Slip,net pay info,নেট বিল তথ্য
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ব্যয় দাবি অনুমোদনের জন্য স্থগিত করা হয়. শুধু ব্যয় রাজসাক্ষী স্ট্যাটাস আপডেট করতে পারবেন.
 DocType: Email Digest,New Expenses,নিউ খরচ
 DocType: Purchase Invoice,Additional Discount Amount,অতিরিক্ত মূল্য ছাড়ের পরিমাণ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","সারি # {0}: Qty, 1 হবে যেমন আইটেম একটি নির্দিষ্ট সম্পদ. একাধিক Qty এ জন্য পৃথক সারি ব্যবহার করুন."
 DocType: Leave Block List Allow,Leave Block List Allow,ব্লক মঞ্জুর তালিকা ত্যাগ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,সংক্ষিপ্তকরণ ফাঁকা বা স্থান হতে পারে না
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,অ-গ্রুপ গ্রুপ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,স্পোর্টস
 DocType: Loan Type,Loan Name,ঋণ নাম
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,গ্রাহক অধিগ্রহণ ও বিশ্বস্ততা
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,অগ্রাহ্য আইটেম শেয়ার রয়েছে সেখানে ওয়্যারহাউস
 DocType: Production Order,Skip Material Transfer,কর উপাদান স্থানান্তর
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,জন্য বিনিময় হার খুঁজে পাওয়া যায়নি {0} এ {1} কী তারিখের জন্য {2}। একটি মুদ্রা বিনিময় রেকর্ড ম্যানুয়ালি তৈরি করুন
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,তোমার আর্থিক বছরের শেষ
 DocType: POS Profile,Price List,মূল্য তালিকা
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ডিফল্ট অর্থবছরের এখন হয়. পরিবর্তন কার্যকর করার জন্য আপনার ব্রাউজার রিফ্রেশ করুন.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},অ্যাকাউন্ট {0} অবৈধ. অ্যাকাউন্টের মুদ্রা হতে হবে {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM রূপান্তর ফ্যাক্টর সারিতে প্রয়োজন বোধ করা হয় {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার সেলস অর্ডার এক, সেলস চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Salary Component,Deduction,সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,সারি {0}: সময় থেকে এবং সময় বাধ্যতামূলক.
 DocType: Stock Reconciliation Item,Amount Difference,পরিমাণ পার্থক্য
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},আইটেমের মূল্য জন্য যোগ {0} মূল্যতালিকা {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,এই বিক্রয় ব্যক্তির কর্মী ID লিখুন দয়া করে
 DocType: Territory,Classification of Customers by region,অঞ্চল গ্রাহকের সাইট
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,পার্থক্য পরিমাণ শূন্য হতে হবে
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,পার্থক্য পরিমাণ শূন্য হতে হবে
 DocType: Project,Gross Margin,গ্রস মার্জিন
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,প্রথম উত্পাদন আইটেম লিখুন দয়া করে
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,হিসাব ব্যাংক ব্যালেন্সের
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,প্রতিবন্ধী ব্যবহারকারী
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,উদ্ধৃতি
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,মোট সিদ্ধান্তগ্রহণ
 ,Production Analytics,উত্পাদনের অ্যানালিটিক্স
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},সতর্কবাণী: সংযুক্তি অবৈধ SSL সার্টিফিকেট {0}
 DocType: Student Admission,Eligibility,নির্বাচিত হইবার যোগ্যতা
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","বিশালাকার আপনি ব্যবসা, আপনার বিশালাকার হিসাবে সব আপনার পরিচিতি এবং আরো যোগ পেতে সাহায্য"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","বিশালাকার আপনি ব্যবসা, আপনার বিশালাকার হিসাবে সব আপনার পরিচিতি এবং আরো যোগ পেতে সাহায্য"
 DocType: Production Order Operation,Actual Operation Time,প্রকৃত অপারেশন টাইম
 DocType: Authorization Rule,Applicable To (User),প্রযোজ্য (ব্যবহারকারী)
 DocType: Purchase Taxes and Charges,Deduct,বিয়োগ করা
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,কাজের ঠিকানা
 DocType: Appraisal,Calculate Total Score,মোট স্কোর গণনা করা
 DocType: Request for Quotation,Manufacturing Manager,উৎপাদন ম্যানেজার
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},সিরিয়াল কোন {0} পর্যন্ত ওয়ারেন্টি বা তার কম বয়সী {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,প্যাকেজ বিভক্ত হুণ্ডি.
 apps/erpnext/erpnext/hooks.py +87,Shipments,চালানে
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,অ্যাকাউন্ট ব্যালেন্স ({0}) {1} এবং স্টক মান ({2}) গুদাম জন্য {3} একই হতে হবে
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,মোট ছুটি দিন
 DocType: Email Digest,Note: Email will not be sent to disabled users,উল্লেখ্য: এটি ইমেল প্রতিবন্ধী ব্যবহারকারীদের পাঠানো হবে না
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,মিথস্ক্রিয়া সংখ্যা
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,কোম্পানি নির্বাচন ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,কোম্পানি নির্বাচন ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,সব বিভাগের জন্য বিবেচিত হলে ফাঁকা ছেড়ে দিন
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","কর্মসংস্থান প্রকারভেদ (স্থায়ী, চুক্তি, অন্তরীণ ইত্যাদি)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} আইটেমের জন্য বাধ্যতামূলক {1}
 DocType: Process Payroll,Fortnightly,পাক্ষিক
 DocType: Currency Exchange,From Currency,মুদ্রা থেকে
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","অন্তত একটি সারিতে বরাদ্দ পরিমাণ, চালান প্রকার এবং চালান নম্বর নির্বাচন করুন"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),হার (কোম্পানি একক)
 DocType: Student Guardian,Others,অন্যরা
 DocType: Payment Entry,Unallocated Amount,অব্যবহৃত পরিমাণ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,একটি মিল খুঁজে খুঁজে পাচ্ছেন না. জন্য {0} অন্য কোনো মান নির্বাচন করুন.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,আর কোনো আপডেট
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,প্রথম সারির &#39;পূর্ববর্তী সারি মোট&#39; &#39;পূর্ববর্তী সারি পরিমাণ&#39; হিসেবে অভিযোগ টাইপ নির্বাচন করা বা না করা
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,শিশু আইটেম একটি প্রোডাক্ট বান্ডেল করা উচিত হবে না. আইটেম অপসারণ `{0} &#39;এবং সংরক্ষণ করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ব্যাংকিং
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets যোগ করুন
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets যোগ করুন
 DocType: Vehicle Service,Service Item,সেবা আইটেম
 DocType: Bank Guarantee,Bank Guarantee,ব্যাংক গ্যারান্টি
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,সময়সূচী পেতে &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
@@ -2068,7 +2071,7 @@
 DocType: Production Order,In Process,প্রক্রিয়াধীন
 DocType: Authorization Rule,Itemwise Discount,Itemwise ছাড়
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,আর্থিক হিসাব বৃক্ষ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} সেলস আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} সেলস আদেশের বিপরীতে {1}
 DocType: Account,Fixed Asset,নির্দিষ্ট সম্পত্তি
 apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,ধারাবাহিকভাবে পরিসংখ্যা
 DocType: Employee Loan,Account Info,অ্যাকাউন্ট তথ্য
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},সারি # {0}: অ্যাসেট {1} ইতিমধ্যে {2}
 DocType: Quotation Item,Stock Balance,স্টক ব্যালেন্স
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,অর্থ প্রদান বিক্রয় আদেশ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} সেটআপ&gt; সেটিংস মাধ্যমে&gt; নামকরণ সিরিজ জন্য সিরিজ নামকরণ সেট করুন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,সিইও
 DocType: Expense Claim Detail,Expense Claim Detail,ব্যয় দাবি বিস্তারিত
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,সঠিক অ্যাকাউন্ট নির্বাচন করুন
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,দাম দেখানো হবে না যদি মূল্য তালিকা নির্ধারণ করা হয় না
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,এই নৌ-শাসনের জন্য একটি দেশ উল্লেখ বা বিশ্বব্যাপী শিপিং চেক করুন
 DocType: Stock Entry,Total Incoming Value,মোট ইনকামিং মূল্য
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ডেবিট প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets সাহায্য আপনার দলের দ্বারা সম্পন্ন তৎপরতা জন্য সময়, খরচ এবং বিলিং ট্র্যাক রাখতে"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ক্রয়মূল্য তালিকা
 DocType: Offer Letter Term,Offer Term,অপরাধ টার্ম
 DocType: Quality Inspection,Quality Manager,গুনগতমান ব্যবস্থাপক
 DocType: Job Applicant,Job Opening,কর্মখালির
 DocType: Payment Reconciliation,Payment Reconciliation,পেমেন্ট রিকনসিলিয়েশন
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ইনচার্জ ব্যক্তির নাম নির্বাচন করুন
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,প্রযুক্তি
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},মোট অপ্রদত্ত: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ওয়েবসাইট অপারেশন
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,লস্ট কারণ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,নতুন ঠিকানা
 DocType: Quality Inspection,Sample Size,সাধারন মাপ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,সকল আইটেম ইতিমধ্যে invoiced হয়েছে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,রশিদ ডকুমেন্ট লিখুন দয়া করে
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,অতিরিক্ত খরচ সেন্টার গ্রুপ অধীন করা যেতে পারে কিন্তু এন্ট্রি অ গ্রুপের বিরুদ্ধে করা যেতে পারে
 DocType: Project,External,বহিরাগত
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ব্যবহারকারী এবং অনুমতি
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},উত্পাদনের আদেশ তৈরী করা হয়েছে: {0}
 DocType: Branch,Branch,শাখা
 DocType: Guardian,Mobile Number,মোবাইল নম্বর
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ছাপানো ও ব্র্যান্ডিং
 DocType: Bin,Actual Quantity,প্রকৃত পরিমাণ
 DocType: Shipping Rule,example: Next Day Shipping,উদাহরণস্বরূপ: আগামী দিন গ্রেপ্তার
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,পাওয়া না সিরিয়াল কোন {0}
 DocType: Scheduling Tool,Student Batch,ছাত্র ব্যাচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,তোমার গ্রাহকরা
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,স্টুডেন্ট করুন
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,স্টুডেন্ট করুন
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},আপনি প্রকল্পের সহযোগীতা করার জন্য আমন্ত্রণ জানানো হয়েছে: {0}
 DocType: Leave Block List Date,Block Date,ব্লক তারিখ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,এখন আবেদন কর
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,প্রেরিত
 DocType: Payment Request,Make Sales Invoice,বিক্রয় চালান করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,সফটওয়্যার
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,পরবর্তী যোগাযোগ তারিখ অতীতে হতে পারে না
 DocType: Company,For Reference Only.,শুধুমাত্র রেফারেন্সের জন্য.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ব্যাচ নির্বাচন কোন
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},অকার্যকর {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,অগ্রিম পরিমাণ
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,মামলা নং 0 হতে পারবেন না
 DocType: Item,Show a slideshow at the top of the page,পৃষ্ঠার উপরের একটি স্লাইডশো প্রদর্শন
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,দোকান
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,দোকান
 DocType: Serial No,Delivery Time,প্রসবের সময়
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,উপর ভিত্তি করে বুড়ো
 DocType: Item,End of Life,জীবনের শেষে
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,টুল পুনঃনামকরণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,আপডেট খরচ
 DocType: Item Reorder,Item Reorder,আইটেম অনুসারে পুনঃক্রম করুন
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,বেতন দেখান স্লিপ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ট্রান্সফার উপাদান
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,বেতন দেখান স্লিপ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ট্রান্সফার উপাদান
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","অপারেশন, অপারেটিং খরচ উল্লেখ করুন এবং আপনার কাজকর্মকে কোন একটি অনন্য অপারেশন দিতে."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,এই দস্তাবেজটি দ্বারা সীমা উত্তীর্ণ {0} {1} আইটেমের জন্য {4}. আপনি তৈরি করছেন আরেকটি {3} একই বিরুদ্ধে {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,সংরক্ষণ পরে আবর্তক নির্ধারণ করুন
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,নির্বাচন পরিবর্তনের পরিমাণ অ্যাকাউন্ট
 DocType: Purchase Invoice,Price List Currency,মূল্যতালিকা মুদ্রা
 DocType: Naming Series,User must always select,ব্যবহারকারী সবসময় নির্বাচন করতে হবে
 DocType: Stock Settings,Allow Negative Stock,নেতিবাচক শেয়ার মঞ্জুরি
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,বাজেট অ্যাকাউন্ট
 DocType: Quality Inspection,Verified By,কর্তৃক যাচাইকৃত
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","বিদ্যমান লেনদেন আছে, কারণ, কোম্পানির ডিফল্ট মুদ্রা পরিবর্তন করতে পারবেন. লেনদেন ডিফল্ট মুদ্রা পরিবর্তন বাতিল করতে হবে."
-DocType: Grade Interval,Grade Description,গ্রেড বর্ণনা
+DocType: Grading Scale Interval,Grade Description,গ্রেড বর্ণনা
 DocType: Stock Entry,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,বেতন স্লিপ তৈরি
@@ -2228,7 +2233,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),তহবিলের উৎস (দায়)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +380,Quantity in row {0} ({1}) must be same as manufactured quantity {2},সারিতে পরিমাণ {0} ({1}) শিল্পজাত পরিমাণ হিসাবে একই হতে হবে {2}
 DocType: Appraisal,Employee,কর্মচারী
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} সম্পূর্ণরূপে বিল করা হয়েছে
 DocType: Training Event,End Time,শেষ সময়
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,সক্রিয় বেতন কাঠামো {0} দেওয়া তারিখগুলি জন্য কর্মচারী {1} পাওয়া যায়নি
 DocType: Payment Entry,Payment Deductions or Loss,পেমেন্ট Deductions বা হ্রাস
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,তারিখ উপস্থিতি
 DocType: Warranty Claim,Raised By,দ্বারা উত্থাপিত
 DocType: Payment Gateway Account,Payment Account,টাকা পরিষদের অ্যাকাউন্ট
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,এগিয়ে যেতে কোম্পানি উল্লেখ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,গ্রহনযোগ্য অ্যাকাউন্ট মধ্যে নিট পরিবর্তন
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,পূরক অফ
 DocType: Offer Letter,Accepted,গৃহীত
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"আপনি কি সত্যিই এই কোম্পানির জন্য সব লেনদেন মুছে ফেলতে চান, নিশ্চিত করুন. হিসাবে এটা আপনার মাস্টার ডেটা থাকবে. এই ক্রিয়াটি পূর্বাবস্থায় ফেরানো যাবে না."
 DocType: Room,Room Number,রুম নম্বর
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},অবৈধ উল্লেখ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) পরিকল্পনা quanitity তার চেয়ে অনেক বেশী হতে পারে না ({2}) উত্পাদন আদেশ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) পরিকল্পনা quanitity তার চেয়ে অনেক বেশী হতে পারে না ({2}) উত্পাদন আদেশ {3}
 DocType: Shipping Rule,Shipping Rule Label,শিপিং রুল ট্যাগ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ব্যবহারকারী ফোরাম
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,কাঁচামালের ফাঁকা থাকতে পারে না.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","স্টক আপডেট করা যায়নি, চালান ড্রপ শিপিং আইটেমটি রয়েছে."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,দ্রুত জার্নাল এন্ট্রি
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM কোন আইটেম agianst উল্লেখ তাহলে আপনি হার পরিবর্তন করতে পারবেন না
 DocType: Employee,Previous Work Experience,আগের কাজের অভিজ্ঞতা
 DocType: Stock Entry,For Quantity,পরিমাণ
@@ -2280,12 +2285,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} দাখিল করা হয় না
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,আইটেম জন্য অনুরোধ.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,পৃথক উত্পাদন যাতে প্রতিটি সমাপ্ত ভাল আইটেমের জন্য তৈরি করা হবে.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} রিটার্ন নথিতে নেতিবাচক হবে
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} রিটার্ন নথিতে অবশ্যই নেতিবাচক হতে হবে
 ,Minutes to First Response for Issues,সমস্যার জন্য প্রথম প্রতিক্রিয়া মিনিট
 DocType: Purchase Invoice,Terms and Conditions1,শর্তাবলী এবং Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"ইনস্টিটিউটের নাম, যার জন্য আপনি এই সিস্টেম সেট আপ করা হয়."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","এই ডেট নিথর অ্যাকাউন্টিং এন্ট্রি, কেউ / না নিম্নোল্লিখিত শর্ত ভূমিকা ছাড়া এন্ট্রি পরিবর্তন করতে পারেন."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,রক্ষণাবেক্ষণ সময়সূচী উৎপাদিত আগে নথি সংরক্ষণ করুন
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,প্রোজেক্ট অবস্থা
 DocType: UOM,Check this to disallow fractions. (for Nos),ভগ্নাংশ অননুমোদন এই পরীক্ষা. (আমরা জন্য)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,নিম্নলিখিত উত্পাদনের আদেশ তৈরি করা হয়েছে:
@@ -2304,7 +2309,7 @@
 DocType: Operation,Default Workstation,ডিফল্ট ওয়ার্কস্টেশন
 DocType: Notification Control,Expense Claim Approved Message,ব্যয় দাবি অনুমোদিত পাঠান
 DocType: Payment Entry,Deductions or Loss,Deductions বা হ্রাস
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} বন্ধ হয়
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} বন্ধ করা
 DocType: Email Digest,How frequently?,কত তারাতারি?
 DocType: Purchase Receipt,Get Current Stock,বর্তমান স্টক পান
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,উপকরণ বিল বৃক্ষ
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,একটি ছুটিতে কাজ এমপ্লয়িজ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,মার্ক বর্তমান
 DocType: Project,% Complete Method,% সম্পূর্ণ পদ্ধতি
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ আরম্ভের তারিখ সিরিয়াল কোন জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},রক্ষণাবেক্ষণ আরম্ভের তারিখ সিরিয়াল কোন জন্য ডেলিভারি তারিখের আগে হতে পারে না {0}
 DocType: Production Order,Actual End Date,প্রকৃত শেষ তারিখ
 DocType: BOM,Operating Cost (Company Currency),অপারেটিং খরচ (কোম্পানি মুদ্রা)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,14 +2334,14 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,বিনা বেতনে ছুটি অনুমোদিত ছুটি অ্যাপ্লিকেশন রেকর্ডের সঙ্গে মিলছে না
 DocType: Campaign,Campaign-.####,প্রচারাভিযান -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,পরবর্তী ধাপ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,সম্ভাব্য সর্বোত্তম হারে নির্দিষ্ট আইটেম সরবরাহ অনুগ্রহ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 দিন পর অটো বন্ধ সুযোগ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,শেষ বছর
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / লিড%
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,চুক্তি শেষ তারিখ যোগদান তারিখ থেকে বড় হওয়া উচিত
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,একটি কমিশন জন্য কোম্পানি পণ্য বিক্রি একটি তৃতীয় পক্ষের যারা পরিবেশক / ব্যাপারী / কমিশন এজেন্ট / অধিভুক্ত / রিসেলার.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} ক্রয় আদেশের বিপরীতে {1}
 DocType: SMS Settings,"Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)","এখানে স্ট্যাটিক URL পরামিতি লিখুন (যেমন. প্রেরকের = ERPNext, ব্যবহারকারীর নাম = ERPNext, পাসওয়ার্ড = 1234 ইত্যাদি)"
 DocType: Task,Actual Start Date (via Time Sheet),প্রকৃত স্টার্ট তারিখ (টাইম শিট মাধ্যমে)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,এই একটি উদাহরণ ওয়েবসাইট ERPNext থেকে স্বয়ংক্রিয় উত্পন্ন হয়
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd পরিমাণ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ফি রেকর্ডস নির্মিত - {0}
 DocType: Asset Category Account,Asset Category Account,অ্যাসেট শ্রেণী অ্যাকাউন্ট
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},সেলস আদেশ পরিমাণ বেশী আইটেম {0} সৃষ্টি করতে পারে না {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,শেয়ার এণ্ট্রি {0} দাখিল করা হয় না
 DocType: Payment Reconciliation,Bank / Cash Account,ব্যাংক / নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,পরবর্তী সংস্পর্শের মাধ্যমে লিড ইমেল ঠিকানা হিসাবে একই হতে পারে না
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,পরিস্কারের তারিখ উল্লেখ না
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,উত্পাদনের
 DocType: Guardian,Occupation,পেশা
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,দয়া করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিং
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,সারি {0}: আরম্ভের তারিখ শেষ তারিখের আগে হওয়া আবশ্যক
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),মোট (Qty)
 DocType: Sales Invoice,This Document,এই নথীটি
 DocType: Installation Note Item,Installed Qty,ইনস্টল Qty
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,একটি সমস্যা রিপোর্ট
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ইউটিলিটি খরচ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-উপরে
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,সারি # {0}: জার্নাল এন্ট্রি {1} অ্যাকাউন্ট নেই {2} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,সারি # {0}: জার্নাল এন্ট্রি {1} অ্যাকাউন্ট নেই {2} বা ইতিমধ্যেই অন্য ভাউচার বিরুদ্ধে মিলেছে
 DocType: Buying Settings,Default Buying Price List,ডিফল্ট ক্রয় মূল্য তালিকা
 DocType: Process Payroll,Salary Slip Based on Timesheet,বেতন স্লিপ শ্রমিকের খাটুনিঘণ্টা লিপিবদ্ধ কার্ড উপর ভিত্তি করে
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,উপরে নির্বাচিত মানদণ্ডের বা বেতন স্লিপ জন্য কোন কর্মচারী ইতিমধ্যে তৈরি
 DocType: Notification Control,Sales Order Message,বিক্রয় আদেশ পাঠান
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ইত্যাদি কোম্পানি, মুদ্রা, চলতি অর্থবছরে, মত ডিফল্ট মান"
 DocType: Payment Entry,Payment Type,শোধের ধরণ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,দয়া করে আইটেমটি জন্য একটি ব্যাচ নির্বাচন {0}। একটি একক ব্যাচ যে এই প্রয়োজনীয়তা পরিপূর্ণ খুঁজে পাওয়া যায়নি
 DocType: Process Payroll,Select Employees,নির্বাচন এমপ্লয়িজ
 DocType: Opportunity,Potential Sales Deal,সম্ভাব্য বিক্রয় ডীল
 DocType: Payment Entry,Cheque/Reference Date,চেক / রেফারেন্স তারিখ
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ইতিমধ্যে কোম্পানির জন্য তৈরি গ্লোবাল পিওএস প্রোফাইল {0} {1}
 DocType: Purchase Order,Ref SQ,সুত্র সাকা
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,সব BOMs আইটেম / BOM প্রতিস্থাপন
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,রশিদ ডকুমেন্ট দাখিল করতে হবে
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,রশিদ ডকুমেন্ট দাখিল করতে হবে
 DocType: Purchase Invoice Item,Received Qty,গৃহীত Qty
 DocType: Stock Entry Detail,Serial No / Batch,সিরিয়াল কোন / ব্যাচ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,না দেওয়া এবং বিতরিত হয় নি
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,ডিএন RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,কোন সময় শীট
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} বহন-ফরওয়ার্ড করা যাবে না প্রকার ত্যাগ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',রক্ষণাবেক্ষণ সূচি সব আইটেম জন্য উত্পন্ন করা হয় না. &#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 ,To Produce,উৎপাদন করা
 apps/erpnext/erpnext/config/hr.py +93,Payroll,বেতনের
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","সারিতে জন্য {0} মধ্যে {1}. আইটেম হার {2} অন্তর্ভুক্ত করার জন্য, সারি {3} এছাড়াও অন্তর্ভুক্ত করা আবশ্যক"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,করুন নিচে
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,করুন নিচে
 DocType: Packing Slip,Identification of the package for the delivery (for print),প্রসবের জন্য প্যাকেজের আইডেন্টিফিকেশন (প্রিন্ট জন্য)
 DocType: Bin,Reserved Quantity,সংরক্ষিত পরিমাণ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,বৈধ ইমেইল ঠিকানা লিখুন
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,অক্ষম করা হয়েছে টেমপ্লেট ডিফল্ট টেমপ্লেট হবে না
 DocType: Account,Income Account,আয় অ্যাকাউন্ট
 DocType: Payment Request,Amount in customer's currency,গ্রাহকের মুদ্রার পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,বিলি
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,বিলি
 DocType: Stock Reconciliation Item,Current Qty,বর্তমান স্টক
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",দেখুন খোয়াতে বিভাগে &quot;সামগ্রী ভিত্তি করে হার&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,পূর্ববর্তী
 DocType: Appraisal Goal,Key Responsibility Area,কী দায়িত্ব ফোন
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ছাত্র ব্যাচ আপনি উপস্থিতি, মূল্যায়ন এবং ছাত্রদের জন্য ফি ট্র্যাক সাহায্য"
 DocType: Payment Entry,Total Allocated Amount,সর্বমোট পরিমাণ
 DocType: Item Reorder,Material Request Type,উপাদান অনুরোধ টাইপ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},থেকে {0} বেতন জন্য Accural জার্নাল এন্ট্রি {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","স্থানীয় সঞ্চয়স্থান পূর্ণ, সংরক্ষণ করা হয়নি"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,সারি {0}: UOM রূপান্তর ফ্যাক্টর বাধ্যতামূলক
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,সুত্র
 DocType: Budget,Cost Center,খরচ কেন্দ্র
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,সেলস লেনদেন থেকে গ্রাহকের ট্যাক্স আইডি লুকান
 DocType: Upload Attendance,Upload HTML,আপলোড এইচটিএমএল
 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.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","প্রাইসিং রুল কিছু মানদণ্ডের উপর ভিত্তি করে, / মূল্য তালিকা মুছে ফেলা ডিসকাউন্ট শতাংশ নির্ধারণ করা হয়."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,গুদাম শুধুমাত্র স্টক এন্ট্রি এর মাধ্যমে পরিবর্তন করা যাবে / হুণ্ডি / কেনার রসিদ
 DocType: Employee Education,Class / Percentage,ক্লাস / শতাংশ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,মার্কেটিং ও সেলস হেড
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","নির্বাচিত প্রাইসিং রুল &#39;মূল্য&#39; জন্য তৈরি করা হয় তাহলে, এটি মূল্য তালিকা মুছে ফেলা হবে. প্রাইসিং রুল মূল্য চূড়ান্ত দাম, তাই কোন অতিরিক্ত ছাড় প্রয়োগ করতে হবে. অত: পর, ইত্যাদি বিক্রয় আদেশ, ক্রয় আদেশ মত লেনদেন, এটা বরং &#39;মূল্য তালিকা হার&#39; ক্ষেত্র ছাড়া, &#39;হার&#39; ক্ষেত্র সংগৃহীত হবে."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ট্র্যাক শিল্প টাইপ দ্বারা অনুসন্ধান.
 DocType: Item Supplier,Item Supplier,আইটেম সরবরাহকারী
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,ব্যাচ কোন পেতে আইটেম কোড প্রবেশ করুন
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to জন্য একটি মান নির্বাচন করুন {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,সব ঠিকানাগুলি.
 DocType: Company,Stock Settings,স্টক সেটিংস
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","নিম্নলিখিত বৈশিষ্ট্য উভয় রেকর্ডে একই হলে মার্জ শুধুমাত্র সম্ভব. গ্রুপ, root- র ধরন, কোম্পানী"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',অবস্থা কর্মচারীদের ঘটনা সম্পর্কে একটি ইমেল পাঠাতে হবে &#39;ওপেন&#39;
 DocType: Task,Depends on Tasks,কার্যগুলি উপর নির্ভর করে
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,গ্রাহক গ্রুপ গাছ পরিচালনা.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,সংযুক্তি শপিং কার্ট সক্রিয় না করেও দেখানো যেতে পারে
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,নতুন খরচ কেন্দ্রের নাম
 DocType: Leave Control Panel,Leave Control Panel,কন্ট্রোল প্যানেল ছেড়ে চলে
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,ডেবিট
 DocType: Delivery Note,Required only for sample item.,শুধুমাত্র নমুনা আইটেমের জন্য প্রয়োজনীয়.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,লেনদেন পরে আসল Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,সরবরাহকারী&gt; সরবরাহকারী প্রকার
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},কোন বেতন স্লিপ মধ্যে পাওয়া {0} এবং {1}
 ,Pending SO Items For Purchase Request,ক্রয় অনুরোধ জন্য তাই চলছে অপেক্ষারত
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,স্টুডেন্ট অ্যাডমিশন
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} নিষ্ক্রিয় করা
 DocType: Supplier,Billing Currency,বিলিং মুদ্রা
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,অতি বৃহদাকার
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,হোম পেজ বৈশিষ্ট্যযুক্ত পণ্য
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,সকল অ্যাসেসমেন্ট গোষ্ঠীসমূহ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,নতুন গুদাম নাম
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),মোট {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),মোট {0} ({1})
 DocType: C-Form Invoice Detail,Territory,এলাকা
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,প্রয়োজনীয় ভিজিট কোন উল্লেখ করুন
 DocType: Stock Settings,Default Valuation Method,ডিফল্ট মূল্যনির্ধারণ পদ্ধতি
 DocType: Vehicle Log,Fuel Qty,জ্বালানীর Qty
 DocType: Production Order Operation,Planned Start Time,পরিকল্পনা শুরুর সময়
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,মূল্য তালিকা মাস্টার
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,আপনি সেট এবং নির্দেশকের লক্ষ্যমাত্রা নজর রাখতে পারেন যাতে সব বিক্রয় লেনদেন একাধিক ** বিক্রয় ব্যক্তি ** বিরুদ্ধে ট্যাগ করা যায়.
 ,S.O. No.,তাই নং
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},লিড থেকে গ্রাহক তৈরি করুন {0}
 DocType: Price List,Applicable for Countries,দেশ সমূহ জন্য প্রযোজ্য
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,শুধু ত্যাগ অবস্থা অ্যাপ্লিকেশন অনুমোদিত &#39;&#39; এবং &#39;প্রত্যাখ্যাত&#39; জমা করা যেতে পারে
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},স্টুডেন্ট গ্রুপের নাম সারিতে বাধ্যতামূলক {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,থেকে অনুলিপি
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},নাম ত্রুটি: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,স্বল্পতা
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} সঙ্গে যুক্ত নেই {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} সঙ্গে যুক্ত নেই {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,কর্মচারী {0} উপস্থিতির ইতিমধ্যে চিহ্নিত করা হয়
 DocType: Packing Slip,If more than one package of the same type (for print),তাহলে একই ধরনের একাধিক বাক্স (প্রিন্ট জন্য)
 ,Salary Register,বেতন নিবন্ধন
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,শপিং কার্ট জন্য ব্যবহার করুন
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},মূল্য {0} অ্যাট্রিবিউট জন্য {1} বৈধ বিষয়ের তালিকায় বিদ্যমান নয় আইটেম জন্য মূল্যবোধ অ্যাট্রিবিউট {2}
 DocType: BOM Item,Scrap %,স্ক্র্যাপ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","চার্জ আনুপাতিক আপনার নির্বাচন অনুযায়ী, আইটেম Qty বা পরিমাণ উপর ভিত্তি করে বিতরণ করা হবে"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","চার্জ আনুপাতিক আপনার নির্বাচন অনুযায়ী, আইটেম Qty বা পরিমাণ উপর ভিত্তি করে বিতরণ করা হবে"
 DocType: Maintenance Visit,Purposes,উদ্দেশ্যসমূহ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,অন্তত একটি আইটেম ফিরে নথিতে নেতিবাচক পরিমাণ সঙ্গে প্রবেশ করা উচিত
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","অপারেশন {0} ওয়ার্কস্টেশন কোনো উপলব্ধ কাজের সময় চেয়ে দীর্ঘতর {1}, একাধিক অপারেশন মধ্যে অপারেশন ভাঙ্গিয়া"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,টেরিটরি গাছ পরিচালনা.
 DocType: Journal Entry Account,Sales Invoice,বিক্রয় চালান
 DocType: Journal Entry Account,Party Balance,পার্টি ব্যালেন্স
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ডিসকাউন্ট উপর প্রয়োগ নির্বাচন করুন
 DocType: Company,Default Receivable Account,ডিফল্ট গ্রহনযোগ্য অ্যাকাউন্ট
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,উপরে নির্বাচিত মানদণ্ডের জন্য প্রদত্ত মোট বেতন জন্য ব্যাংক এনট্রি নির্মাণ
 DocType: Stock Entry,Material Transfer for Manufacture,প্রস্তুত জন্য উপাদান স্থানান্তর
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ডিসকাউন্ট শতাংশ একটি মূল্য তালিকা বিরুদ্ধে বা সব মূল্য তালিকা জন্য হয় প্রয়োগ করা যেতে পারে.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ডিসকাউন্ট শতাংশ একটি মূল্য তালিকা বিরুদ্ধে বা সব মূল্য তালিকা জন্য হয় প্রয়োগ করা যেতে পারে.
 DocType: Purchase Invoice,Half-yearly,অর্ধ বার্ষিক
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,স্টক জন্য অ্যাকাউন্টিং এণ্ট্রি
 DocType: Vehicle Service,Engine Oil,ইঞ্জিনের তেল
 DocType: Sales Invoice,Sales Team1,সেলস team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,আইটেম {0} অস্তিত্ব নেই
 DocType: Sales Invoice,Customer Address,গ্রাহকের ঠিকানা
 DocType: Employee Loan,Loan Details,ঋণ বিবরণ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,সারি {0}: সমাপ্ত Qty শূন্য অনেক বেশী হতে হবে.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,Root- র ধরন
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},সারি # {0}: বেশী ফিরে যাবে না {1} আইটেম জন্য {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,চক্রান্ত
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},উদ্দিষ্ট গুদাম সারিতে জন্য বাধ্যতামূলক {0}
 DocType: Cheque Print Template,Primary Settings,প্রাথমিক সেটিংস
 DocType: Purchase Invoice,Select Supplier Address,সরবরাহকারী ঠিকানা নির্বাচন
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,এমপ্লয়িজ যোগ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,এমপ্লয়িজ যোগ
 DocType: Purchase Invoice Item,Quality Inspection,উচ্চমানের তদন্ত
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,অতিরিক্ত ছোট
 DocType: Company,Standard Template,স্ট্যান্ডার্ড টেমপ্লেট
 DocType: Training Event,Theory,তত্ত্ব
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,সতর্কতা: Qty অনুরোধ উপাদান নূন্যতম অর্ডার QTY কম হয়
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,অ্যাকাউন্ট {0} নিথর হয়
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,সংস্থার একাত্মতার অ্যাকাউন্টের একটি পৃথক চার্ট সঙ্গে আইনি সত্তা / সাবসিডিয়ারি.
 DocType: Payment Request,Mute Email,নিঃশব্দ ইমেইল
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","খাদ্য, পানীয় ও তামাকের"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},শুধুমাত্র বিরুদ্ধে পেমেন্ট করতে পারবেন যেতে উদ্ভাবনী উপায় {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,কমিশন হার তার চেয়ে অনেক বেশী 100 হতে পারে না
 DocType: Stock Entry,Subcontract,ঠিকা
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,প্রথম {0} লিখুন দয়া করে
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,বিদ্যমান লেনদেনের সঙ্গে গুদাম গ্রুপে রূপান্তর করা যাবে না.
 DocType: Assessment Result Tool,Result HTML,ফল এইচটিএমএল
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,মেয়াদ শেষ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,শিক্ষার্থীরা যোগ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,শিক্ষার্থীরা যোগ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},দয়া করে নির্বাচন করুন {0}
 DocType: C-Form,C-Form No,সি-ফরম কোন
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ফিস্ক্যাল বছর নির্বাচন
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,পুনর্বিন্যাস স্তর
 DocType: Company,Chart Of Accounts Template,একাউন্টস টেমপ্লেটের চার্ট
 DocType: Attendance,Attendance Date,এ্যাটেনডেন্স তারিখ
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ডুপ্লিকেট এন্ট্রি
 DocType: Program Enrollment Tool,Get Students,শিক্ষার্থীরা পান
 DocType: Serial No,Under Warranty,ওয়ারেন্টিযুক্ত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ত্রুটি]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ত্রুটি]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,আপনি বিক্রয় আদেশ সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 ,Employee Birthday,কর্মচারী জন্মদিনের
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ছাত্র ব্যাচ এ্যাটেনডেন্স টুল
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,সীমা অতিক্রম
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ভেনচার ক্যাপিটাল
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,এই &#39;একাডেমিক ইয়ার&#39; দিয়ে একটি একাডেমিক শব্দটি {0} এবং &#39;টার্ম নাম&#39; {1} আগে থেকেই আছে. এই এন্ট্রি পরিবর্তন করে আবার চেষ্টা করুন.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","আইটেম {0} বিরুদ্ধে বিদ্যমান লেনদেন আছে, আপনার মান পরিবর্তন করতে পারবেন না {1}"
 DocType: UOM,Must be Whole Number,গোটা সংখ্যা হতে হবে
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(দিন) বরাদ্দ নতুন পাতার
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,সিরিয়াল কোন {0} অস্তিত্ব নেই
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,উপকরণ% এই বিক্রয় আদেশের বিরুদ্ধে বিল
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,সময়কাল সমাপন ভুক্তি
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র গ্রুপ রূপান্তরিত করা যাবে না
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},পরিমাণ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},পরিমাণ {0} {1} {2} {3}
 DocType: Account,Depreciation,অবচয়
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),সরবরাহকারী (গুলি)
 DocType: Employee Attendance Tool,Employee Attendance Tool,কর্মী হাজিরা টুল
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,পরবর্তী মাসের শেষ দিন
 DocType: Support Settings,Auto close Issue after 7 days,7 দিন পরে অটো বন্ধ ইস্যু
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","আগে বরাদ্দ করা না যাবে ছেড়ে {0}, ছুটি ভারসাম্য ইতিমধ্যে হ্যান্ড ফরওয়ার্ড ভবিষ্যতে ছুটি বরাদ্দ রেকর্ড হয়েছে হিসাবে {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),উল্লেখ্য: দরুন / রেফারেন্স তারিখ {0} দিন দ্বারা অনুমোদিত গ্রাহকের ক্রেডিট দিন অতিক্রম (গুলি)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ছাত্র আবেদনকারীর
 DocType: Asset Category Account,Accumulated Depreciation Account,সঞ্চিত অবচয় অ্যাকাউন্ট
 DocType: Stock Settings,Freeze Stock Entries,ফ্রিজ শেয়ার সাজপোশাকটি
@@ -2803,11 +2810,11 @@
 ,Stock Analytics,স্টক বিশ্লেষণ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,অপারেশনস ফাঁকা রাখা যাবে না
 DocType: Maintenance Visit Purpose,Against Document Detail No,ডকুমেন্ট বিস্তারিত বিরুদ্ধে কোন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,পার্টির প্রকার বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,পার্টির প্রকার বাধ্যতামূলক
 DocType: Quality Inspection,Outgoing,বহির্গামী
 DocType: Material Request,Requested For,জন্য অনুরোধ করা
 DocType: Quotation Item,Against Doctype,Doctype বিরুদ্ধে
-apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা হয়
+apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} বাতিল বা বন্ধ করা
 DocType: Delivery Note,Track this Delivery Note against any Project,কোন প্রকল্পের বিরুদ্ধে এই হুণ্ডি সন্ধান
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,বিনিয়োগ থেকে নিট ক্যাশ
 ,Is Primary Address,প্রাথমিক ঠিকানা
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,পণ্য সংকেত
 DocType: Production Planning Tool,Create Production Orders,উত্পাদনের আদেশ করুন
 DocType: Serial No,Warranty / AMC Details,পাটা / এএমসি বিস্তারিত
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ভ্রমণ ভিত্তিক গ্রুপ জন্য ম্যানুয়ালি ছাত্র নির্বাচন
 DocType: Journal Entry,User Remark,ব্যবহারকারী মন্তব্য
 DocType: Lead,Market Segment,মার্কেটের অংশ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Paid পরিমাণ মোট নেতিবাচক অসামান্য পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 DocType: Employee Internal Work History,Employee Internal Work History,কর্মচারী অভ্যন্তরীণ কাজের ইতিহাস
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),বন্ধ (ড)
 DocType: Cheque Print Template,Cheque Size,চেক সাইজ
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,উপাদান অনুরোধ করুন
 DocType: Employee Education,School/University,স্কুল / বিশ্ববিদ্যালয়
 DocType: Payment Request,Reference Details,রেফারেন্স বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,প্রত্যাশিত মান দরকারী জীবন পর গ্রস ক্রয়ের পরিমাণ কম হওয়া আবশ্যক
 DocType: Sales Invoice Item,Available Qty at Warehouse,ওয়্যারহাউস এ উপলব্ধ Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,বিলের পরিমাণ
 DocType: Asset,Double Declining Balance,ডাবল পড়ন্ত ব্যালেন্স
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","এই স্টক রিকনসিলিয়েশন একটি খোলা এণ্ট্রি যেহেতু পার্থক্য অ্যাকাউন্ট, একটি সম্পদ / দায় ধরনের অ্যাকাউন্ট থাকতে হবে"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},বিতরণ পরিমাণ ঋণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},আইটেম জন্য প্রয়োজন ক্রম সংখ্যা ক্রয় {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,উত্পাদনের অর্ডার তৈরি করা না
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','তারিখ থেকে' অবশ্যই 'তারিখ পর্যন্ত' এর পরে হতে হবে
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ছাত্র হিসাবে অবস্থা পরিবর্তন করা যাবে না {0} ছাত্র আবেদনপত্রের সাথে সংযুক্ত করা হয় {1}
 DocType: Asset,Fully Depreciated,সম্পূর্ণরূপে মূল্যমান হ্রাস
 ,Stock Projected Qty,স্টক Qty অনুমিত
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},অন্তর্গত নয় {0} গ্রাহক প্রকল্পের {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,চিহ্নিত এ্যাটেনডেন্স এইচটিএমএল
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","উদ্ধৃতি প্রস্তাব, দর আপনি আপনার গ্রাহকদের কাছে পাঠানো হয়েছে"
 DocType: Sales Order,Customer's Purchase Order,গ্রাহকের ক্রয় আদেশ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ক্রমিক নং এবং ব্যাচ
 DocType: Warranty Claim,From Company,কোম্পানীর কাছ থেকে
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,মূল্যায়ন মানদণ্ড স্কোর যোগফল {0} হতে হবে.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,মূল্য বা স্টক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations সংখ্যা বুক নির্ধারণ করুন
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,মূল্য বা স্টক
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,প্রোডাকসন্স আদেশ জন্য উত্থাপিত করা যাবে না:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,মিনিট
 DocType: Purchase Invoice,Purchase Taxes and Charges,কর ও শুল্ক ক্রয়
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,সকল গুদাম
 DocType: Sales Partner,Retailer,খুচরা বিক্রেতা
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,একাউন্টে ক্রেডিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,সমস্ত সরবরাহকারী প্রকারভেদ
 DocType: Global Defaults,Disable In Words,শব্দ অক্ষম
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"আইটেম স্বয়ংক্রিয়ভাবে গণনা করা হয়, কারণ আইটেমটি কোড বাধ্যতামূলক"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},উদ্ধৃতি {0} না টাইপ {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,গণমুখী
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ব্যাংক ওভারড্রাফ্ট অ্যাকাউন্ট
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,বেতন স্লিপ করুন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,সারি # {0}: বরাদ্দ বকেয়া পরিমাণ পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না।
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ব্রাউজ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,নিরাপদ ঋণ
 DocType: Purchase Invoice,Edit Posting Date and Time,পোস্টিং তারিখ এবং সময় সম্পাদনা
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},বেশী না পুরোনো স্টক লেনদেন হালনাগাদ করার অনুমতি {0}
 DocType: Purchase Invoice Item,PR Detail,জনসংযোগ বিস্তারিত
 DocType: Sales Order,Fully Billed,সম্পূর্ণ দেখানো হয়েছিল
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},কর্মচারী এর ডিফল্ট প্রদেয় অ্যাকাউন্ট নির্ধারণ করুন {0}
 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 +127,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),প্যাকেজের গ্রস ওজন. সাধারণত নেট ওজন + প্যাকেজিং উপাদান ওজন. (প্রিন্ট জন্য)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,গ্রুপ উপর ভিত্তি করে
 DocType: Journal Entry,Bill Date,বিল তারিখ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","সেবা আইটেম, প্রকার, ফ্রিকোয়েন্সি এবং ব্যয় পরিমাণ প্রয়োজন বোধ করা হয়"
-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:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","সর্বোচ্চ অগ্রাধিকার দিয়ে একাধিক প্রাইসিং নিয়ম আছে, এমনকি যদি তারপর নিচের অভ্যন্তরীণ অগ্রাধিকার প্রয়োগ করা হয়:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},আপনি সত্যিই থেকে {0} সমস্ত বেতন স্লিপ জমা দিতে চান {1}
 DocType: Cheque Print Template,Cheque Height,চেক উচ্চতা
 DocType: Supplier,Supplier Details,সরবরাহকারী
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,চালান সুত্র
 DocType: Purchase Order,Recurring Order,আবর্তক অর্ডার
 DocType: Company,Default Income Account,ডিফল্ট আয় অ্যাকাউন্ট
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,গ্রাহক গ্রুপ / গ্রাহক
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),বন্ধ না অর্থবছরে লাভ / ক্ষতি (ক্রেডিট)
 DocType: Sales Invoice,Time Sheets,হাজিরা খাতা
 DocType: Payment Gateway Account,Default Payment Request Message,ডিফল্ট পেমেন্ট অনুরোধ পাঠান
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,উদ্ধৃতি পাঠান
 DocType: Employee Loan,Employee Loan Application,কর্মচারী ঋণ আবেদন
 DocType: Issue,Opening Date,খোলার তারিখ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,এ্যাটেনডেন্স সফলভাবে হিসাবে চিহ্নিত হয়েছে.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,এ্যাটেনডেন্স সফলভাবে হিসাবে চিহ্নিত হয়েছে.
 DocType: Journal Entry,Remark,মন্তব্য
 DocType: Purchase Receipt Item,Rate and Amount,হার এবং পরিমাণ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},অ্যাকাউন্ট ধরন {0} হবে জন্য {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},অ্যাকাউন্ট ধরন {0} হবে জন্য {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,পত্রাদি এবং হলিডে
 DocType: School Settings,Current Academic Term,বর্তমান একাডেমিক টার্ম
 DocType: Sales Order,Not Billed,বিল না
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,শিক্ষার্থীর গ্রুপ
 DocType: Shopping Cart Settings,Quotation Series,উদ্ধৃতি সিরিজের
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","একটি আইটেম একই নামের সঙ্গে বিদ্যমান ({0}), আইটেম গ্রুপের নাম পরিবর্তন বা আইটেম নামান্তর করুন"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,দয়া করে গ্রাহক নির্বাচন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,দয়া করে গ্রাহক নির্বাচন
 DocType: C-Form,I,আমি
 DocType: Company,Asset Depreciation Cost Center,অ্যাসেট অবচয় মূল্য কেন্দ্র
 DocType: Sales Order Item,Sales Order Date,বিক্রয় আদেশ তারিখ
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,বীমা বিবরণ
 DocType: Account,Payable,প্রদেয়
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,পরিশোধ সময়কাল প্রবেশ করুন
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ঋণ গ্রহিতা ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ঋণ গ্রহিতা ({0})
 DocType: Pricing Rule,Margin,মার্জিন
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,নতুন গ্রাহকরা
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,পুরো লাভ %
 DocType: Appraisal Goal,Weightage (%),গুরুত্ব (%)
 DocType: Bank Reconciliation Detail,Clearance Date,পরিস্কারের তারিখ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,গ্রস ক্রয়ের পরিমাণ বাধ্যতামূলক
 DocType: Lead,Address Desc,নিম্নক্রমে ঠিকানার
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,পার্টির বাধ্যতামূলক
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,পার্টির বাধ্যতামূলক
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,টপিক নাম
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,বিক্রি বা কেনার অন্তত একটি নির্বাচন করতে হবে
-DocType: Grading Structure,Grade Intervals,গ্রেড অন্তরাল
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,আপনার ব্যবসার প্রকৃতি নির্বাচন করুন.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},সারি # {0}: সদৃশ তথ্যসূত্র মধ্যে এন্ট্রি {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,উত্পাদন অপারেশন কোথায় সম্পন্ন হয়.
 DocType: Asset Movement,Source Warehouse,উত্স ওয়্যারহাউস
 DocType: Installation Note,Installation Date,ইনস্টলেশনের তারিখ
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,মুদ্রণ টেমপ্লেট জন্য পত্র নেতৃবৃন্দ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,মুদ্রণ টেমপ্লেট শিরোনাম চালানকল্প যেমন.
 DocType: Student Guardian,Student Guardian,ছাত্র গার্ডিয়ান
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,মূল্যনির্ধারণ টাইপ চার্জ সমেত হিসাবে চিহ্নিত করতে পারেন না
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 হার
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,এক্সচেঞ্জ লাভ / ক্ষতির অ্যাকাউন্ট
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,কর্মচারী এবং অ্যাটেনডেন্স
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},"উদ্দেশ্য, এক হতে হবে {0}"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ফর্ম পূরণ করুন এবং এটি সংরক্ষণ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,কমিউনিটি ফোরাম
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,স্টক মধ্যে প্রকৃত Qty এ
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,রেকর্ডার Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,বর্তমান জব
 DocType: Company,Stock Adjustment Account,শেয়ার সামঞ্জস্য অ্যাকাউন্ট
-DocType: Journal Entry,Write Off,খরচ লেখা
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,খরচ লেখা
 DocType: Timesheet Detail,Operation 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} থেকে
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,সরবরাহকারী গ্রাহক যাও বিতরণ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ফরম / আইটেম / {0}) স্টক আউট
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,পরবর্তী তারিখ পোস্টিং তারিখ অনেক বেশী হতে হবে
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,দেখান ট্যাক্স ব্রেক আপ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},দরুন / রেফারেন্স তারিখ পরে হতে পারে না {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ডেটা আমদানি ও রপ্তানি
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","স্টক এন্ট্রি, {0} ওয়্যারহাউস বিরুদ্ধে অস্তিত্ব অত: পর আপনি পুনরায় দায়িত্ব অর্পণ করা বা এটা পরিবর্তন করতে পারেন"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,কোন ছাত্র পাওয়া
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,কোন ছাত্র পাওয়া
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,চালান পোস্টিং তারিখ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,বিক্রি করা
 DocType: Sales Invoice,Rounded Total,গোলাকৃতি মোট
 DocType: Product Bundle,List items that form the package.,বাক্স গঠন করে তালিকা আইটেম.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,শতকরা বরাদ্দ 100% সমান হওয়া উচিত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,দয়া করে পার্টির নির্বাচন সামনে পোস্টিং তারিখ নির্বাচন
 DocType: Program Enrollment,School House,স্কুল হাউস
 DocType: Serial No,Out of AMC,এএমসি আউট
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,উদ্ধৃতি দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,বুক Depreciations সংখ্যা মোট Depreciations সংখ্যা তার চেয়ে অনেক বেশী হতে পারে না
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,রক্ষণাবেক্ষণ দর্শন করা
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,সেলস মাস্টার ম্যানেজার {0} ভূমিকা আছে যারা ব্যবহারকারীর সাথে যোগাযোগ করুন
 DocType: Company,Default Cash Account,ডিফল্ট নগদ অ্যাকাউন্ট
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,কোম্পানি (না গ্রাহক বা সরবরাহকারীর) মাস্টার.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,এই শিক্ষার্থী উপস্থিতির উপর ভিত্তি করে
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,কোন শিক্ষার্থীরা
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,আরো আইটেম বা খোলা পূর্ণ ফর্ম যোগ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;প্রত্যাশিত প্রসবের তারিখ&#39; দয়া করে প্রবেশ করুন
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,প্রসবের নোট {0} এই সেলস অর্ডার বাতিলের আগে বাতিল করা হবে
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,আইটেম 3
 DocType: Purchase Order,Customer Contact Email,গ্রাহক যোগাযোগ ইমেইল
 DocType: Warranty Claim,Item and Warranty Details,আইটেম এবং পাটা বিবরণ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,আইটেম code&gt; আইটেম গ্রুপ&gt; ব্র্যান্ড
 DocType: Sales Team,Contribution (%),অবদান (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,উল্লেখ্য: পেমেন্ট ভুক্তি থেকে তৈরি করা হবে না &#39;ক্যাশ বা ব্যাংক একাউন্ট&#39; উল্লেখ করা হয়নি
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,প্রোগ্রাম বাধ্যতামূলক কোর্স আনতে নির্বাচন করুন।
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,পুনর্মিলন আগে
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},করুন {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),কর ও চার্জ যোগ (কোম্পানি একক)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,আইটেমটি ট্যাক্স সারি {0} টাইপ ট্যাক্স বা আয় বা ব্যয় বা প্রদেয় এর একাউন্ট থাকতে হবে
 DocType: Sales Order,Partly Billed,আংশিক দেখানো হয়েছিল
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,আইটেম {0} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,আইটেম {0} একটি ফিক্সড অ্যাসেট আইটেম হতে হবে
 DocType: Item,Default BOM,ডিফল্ট BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,পুনরায় টাইপ কোম্পানি নাম নিশ্চিত অনুগ্রহ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,মোট বিশিষ্ট মাসিক
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,স্বয়ংচালিত
 DocType: Vehicle,Insurance Company,বীমা কোম্পানী
 DocType: Asset Category Account,Fixed Asset Account,পরিসম্পদ অ্যাকাউন্ট
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,পরিবর্তনশীল
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ডেলিভারি নোট থেকে
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,পরিবর্তনশীল
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ডেলিভারি নোট থেকে
 DocType: Student,Student Email Address,ছাত্র ইমেইল ঠিকানা
 DocType: Timesheet Detail,From Time,সময় থেকে
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,স্টক ইন:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,মূল্য তালিকা বিনিময় হার
 DocType: Purchase Invoice Item,Rate,হার
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,অন্তরীণ করা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ঠিকানা নাম
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ঠিকানা নাম
 DocType: Stock Entry,From BOM,BOM থেকে
 DocType: Assessment Code,Assessment Code,অ্যাসেসমেন্ট কোড
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,মৌলিক
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} নিথর হয় আগে স্টক লেনদেন
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;নির্মাণ সূচি&#39; তে ক্লিক করুন
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","যেমন কেজি, ইউনিট, আমরা, এম"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,আপনি রেফারেন্স তারিখ প্রবেশ যদি রেফারেন্স কোন বাধ্যতামূলক
 DocType: Bank Reconciliation Detail,Payment Document,পেমেন্ট ডকুমেন্ট
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,বেতন কাঠামো
 DocType: Account,Bank,ব্যাংক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,বিমানসংস্থা
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ইস্যু উপাদান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ইস্যু উপাদান
 DocType: Material Request Item,For Warehouse,গুদাম জন্য
 DocType: Employee,Offer Date,অপরাধ তারিখ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,উদ্ধৃতি
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,আপনি অফলাইন মোডে হয়. আপনি যতক্ষণ না আপনি নেটওয়ার্ক আছে রিলোড করতে সক্ষম হবে না.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,কোন ছাত্র সংগঠনের সৃষ্টি.
 DocType: Purchase Invoice Item,Serial No,ক্রমিক নং
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,মাসিক পরিশোধ পরিমাণ ঋণের পরিমাণ তার চেয়ে অনেক বেশী হতে পারে না
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,প্রথম Maintaince বিবরণ লিখুন দয়া করে
 DocType: Purchase Invoice,Print Language,প্রিন্ট ভাষা
 DocType: Salary Slip,Total Working Hours,মোট ওয়ার্কিং ঘন্টা
 DocType: Stock Entry,Including items for sub assemblies,সাব সমাহারকে জিনিস সহ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,লিখুন মান ধনাত্মক হবে
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,লিখুন মান ধনাত্মক হবে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,সমস্ত অঞ্চল
 DocType: Purchase Invoice,Items,চলছে
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ছাত্র ইতিমধ্যে নথিভুক্ত করা হয়.
@@ -3254,16 +3263,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',বৈকল্পিক জন্য মেজার ডিফল্ট ইউনিট &#39;{0}&#39; টেমপ্লেট হিসাবে একই হতে হবে &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ভিত্তি করে গণনা
 DocType: Delivery Note Item,From Warehouse,গুদাম থেকে
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,সামগ্রী বিল দিয়ে কোন সামগ্রী উত্পাদনপ্রণালী
 DocType: Assessment Plan,Supervisor Name,সুপারভাইজার নাম
 DocType: Program Enrollment Course,Program Enrollment Course,প্রোগ্রাম তালিকাভুক্তি কোর্সের
-DocType: Grading Structure,Grading Structure,শূন্য গঠন
 DocType: Purchase Taxes and Charges,Valuation and Total,মূল্যনির্ধারণ এবং মোট
 DocType: Tax Rule,Shipping City,শিপিং সিটি
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,বিজ্ঞপ্তি কাস্টমাইজ করুন
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,অপারেশন থেকে নগদ প্রবাহ
 DocType: Sales Invoice,Shipping Rule,শিপিং রুল
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},কোন ডিফল্ট BOM আইটেমটি জন্য বিদ্যমান {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,প্রথম পোস্টিং তারিখ নির্বাচন করুন
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,তারিখ খোলার তারিখ বন্ধ করার আগে করা উচিত
 DocType: Leave Control Panel,Carry Forward,সামনে আগাও
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,বিদ্যমান লেনদেন সঙ্গে খরচ কেন্দ্র খতিয়ান রূপান্তরিত করা যাবে না
 DocType: Department,Days for which Holidays are blocked for this department.,"দিন, যার জন্য ছুটির এই বিভাগের জন্য ব্লক করা হয়."
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,সাধারণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,লেটারহেড সংযুক্ত
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,গত কমিউনিকেশন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',বিভাগ &#39;মূল্যনির্ধারণ&#39; বা &#39;মূল্যনির্ধারণ এবং মোট&#39; জন্য যখন বিয়োগ করা যাবে
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,চালানসমূহ সঙ্গে ম্যাচ পেমেন্টস্
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),মোট (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,বিনোদন ও অবকাশ
 DocType: Quality Inspection,Item Serial No,আইটেম সিরিয়াল কোন
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,কর্মচারী রেকর্ডস তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,কর্মচারী রেকর্ডস তৈরি করুন
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,মোট বর্তমান
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,অ্যাকাউন্টিং বিবৃতি
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ঘন্টা
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,অজানা
 DocType: Shipping Rule,Shipping Rule Conditions,শিপিং রুল শর্তাবলী
 DocType: BOM Replace Tool,The new BOM after replacement,প্রতিস্থাপন পরে নতুন BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,বিক্রয় বিন্দু
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,বিক্রয় বিন্দু
 DocType: Payment Entry,Received Amount,প্রাপ্তঃ পরিমাণ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,দয়া করে সেটআপ কর্মচারী হিউম্যান রিসোর্স মধ্যে নামকরণ সিস্টেম&gt; এইচআর সেটিং
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","পূর্ণ পরিমাণ জন্য তৈরি করুন, যাতে উপর ইতিমধ্যে পরিমাণ উপেক্ষা"
 DocType: Account,Tax,কর
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,চিহ্নিত করা
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,চালান
 DocType: Batch,Source Document Name,উত্স দস্তাবেজের নাম
 DocType: Job Opening,Job Title,কাজের শিরোনাম
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,তৈরি করুন ব্যবহারকারীরা
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,তৈরি করুন ব্যবহারকারীরা
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,গ্রাম
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,প্রস্তুত পরিমাণ 0 থেকে বড় হওয়া উচিত.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,রক্ষণাবেক্ষণ কল জন্য প্রতিবেদন দেখুন.
 DocType: Stock Entry,Update Rate and Availability,হালনাগাদ হার এবং প্রাপ্যতা
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,শতকরা আপনি পাবেন বা আদেশ পরিমাণ বিরুদ্ধে আরো বিলি করার অনুমতি দেওয়া হয়. উদাহরণস্বরূপ: আপনি 100 ইউনিট আদেশ আছে. এবং আপনার ভাতা তারপর আপনি 110 ইউনিট গ্রহণ করার অনুমতি দেওয়া হয় 10% হয়.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ব্যয় অ্যাকাউন্ট আইটেমের জন্য বাধ্যতামূলক {0}
 DocType: BOM,Website Description,ওয়েবসাইট বর্ণনা
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ইক্যুইটি মধ্যে নিট পরিবর্তন
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ক্রয় চালান {0} বাতিল অনুগ্রহ প্রথম
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ই-মেইল ঠিকানা অবশ্যই ইউনিক হতে হবে, ইতিমধ্যে অস্তিত্বমান {0}"
 DocType: Serial No,AMC Expiry Date,এএমসি মেয়াদ শেষ হওয়ার তারিখ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,প্রাপ্তি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,প্রাপ্তি
 ,Sales Register,সেলস নিবন্ধন
 DocType: Daily Work Summary Settings Company,Send Emails At,ইমেইল পাঠান এ
 DocType: Quotation,Quotation Lost Reason,উদ্ধৃতি লস্ট কারণ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,আপনার ডোমেইন নির্বাচন করুন
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},লেনদেন রেফারেন্স কোন {0} তারিখের {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,সম্পাদনা করার কিছুই নেই.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,এই মাস এবং স্থগিত কার্যক্রম জন্য সারসংক্ষেপ
 DocType: Customer Group,Customer Group Name,গ্রাহক গ্রুপ নাম
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,এখনও কোন গ্রাহকরা!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ক্যাশ ফ্লো বিবৃতি
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ঋণের পরিমাণ সর্বোচ্চ ঋণের পরিমাণ বেশি হতে পারে না {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,লাইসেন্স
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},সি-ফরম থেকে এই চালান {0} মুছে ফেলুন দয়া করে {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,"অ্যাকাউন্ট বন্ধ লিখতে লিখতে, অনুগ্রহ করে"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,শেষ আদেশ তারিখ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},অ্যাকাউন্ট {0} আছে কোম্পানীর জন্যে না {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} সারিতে সিরিয়াল নম্বর দিয়ে ডেলিভারি নোট মেলে না
 DocType: Student,Guardian Details,গার্ডিয়ান বিবরণ
 DocType: C-Form,C-Form,সি-ফরম
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,একাধিক কর্মীদের জন্য মার্ক এ্যাটেনডেন্স
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',সারি {0} # অ্যাকাউন্ট ধরনের হতে হবে &#39;ফিক্সড অ্যাসেট&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty আউট
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,বিধি একটি বিক্রয়ের জন্য শিপিং পরিমাণ নিরূপণ করা
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,সিরিজ বাধ্যতামূলক
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,সিরিজ বাধ্যতামূলক
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,অর্থনৈতিক সেবা
 DocType: Student Sibling,Student ID,শিক্ষার্থী আইডি
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,টাইম লগ জন্য ক্রিয়াকলাপ প্রকারভেদ
 DocType: Tax Rule,Sales,সেলস
 DocType: Stock Entry Detail,Basic Amount,বেসিক পরিমাণ
 DocType: Training Event,Exam,পরীক্ষা
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},গুদাম স্টক আইটেম জন্য প্রয়োজন {0}
 DocType: Leave Allocation,Unused leaves,অব্যবহৃত পাতার
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,CR
 DocType: Tax Rule,Billing State,বিলিং রাজ্য
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,হস্তান্তর
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} পার্টির অ্যাকাউন্টের সাথে যুক্ত না {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} পার্টির অ্যাকাউন্টের সাথে যুক্ত না {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(সাব-সমাহারগুলি সহ) অপ্রমাণিত BOM পান
 DocType: Authorization Rule,Applicable To (Employee),প্রযোজ্য (কর্মচারী)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,দরুন জন্ম বাধ্যতামূলক
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,অ্যাট্রিবিউট জন্য বর্ধিত {0} 0 হতে পারবেন না
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,নিষ্ক্রিয় গ্রাহকরা
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ক্রয় রসিদের
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,কিভাবে প্রাইসিং নিয়ম প্রয়োগ করা হয়?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,কিভাবে প্রাইসিং নিয়ম প্রয়োগ করা হয়?
 DocType: Stock Entry,Delivery Note No,হুণ্ডি কোন
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","যদি চেক করা, শুধুমাত্র ক্রয় চূড়ান্ত কাঁচামাল উপাদান অনুরোধ উপাদান অনুরোধ অন্তর্ভুক্ত করা হবে. অন্যথায়, পিতা বা মাতা আইটেম জন্য উপাদান অনুরোধ তৈরি করা হবে"
 DocType: Cheque Print Template,Message to show,বার্তা দেখাতে
 DocType: Company,Retail,খুচরা
 DocType: Attendance,Absent,অনুপস্থিত
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,পণ্য সমষ্টি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,পণ্য সমষ্টি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},সারি {0}: অবৈধ উল্লেখ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,কর ও শুল্ক টেমপ্লেট ক্রয়
 DocType: Upload Attendance,Download Template,ডাউনলোড টেমপ্লেট
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,অ্যাকাউন্ট থেকে অর্থ প্রদান করা
 DocType: Purchase Order Item Supplied,Raw Material Item Code,কাঁচামাল আইটেম কোড
 DocType: Journal Entry,Write Off Based On,ভিত্তি করে লিখুন বন্ধ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,লিড করুন
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,লিড করুন
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,মুদ্রণ করুন এবং স্টেশনারি
 DocType: Stock Settings,Show Barcode Field,দেখান বারকোড ফিল্ড
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,সরবরাহকারী ইমেইল পাঠান
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","বেতন ইতিমধ্যে মধ্যে {0} এবং {1}, আবেদন সময়ের ত্যাগ এই তারিখ সীমার মধ্যে হতে পারে না সময়ের জন্য প্রক্রিয়া."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,একটি সিরিয়াল নং জন্য ইনস্টলেশন রেকর্ড
 DocType: Guardian Interest,Guardian Interest,গার্ডিয়ান সুদ
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,প্রতিক্রিয়ার জন্য অপেক্ষা
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,উপরে
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},অবৈধ অ্যাট্রিবিউট {0} {1}
+DocType: Supplier,Mention if non-standard payable account,উল্লেখ করো যদি অ-মানক প্রদেয় অ্যাকাউন্ট
 DocType: Salary Slip,Earning & Deduction,রোজগার &amp; সিদ্ধান্তগ্রহণ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ঐচ্ছিক. এই সেটিং বিভিন্ন লেনদেন ফিল্টার ব্যবহার করা হবে.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,নেতিবাচক মূল্যনির্ধারণ হার অনুমোদিত নয়
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,উত্পাদনের আদেশ আইটেম
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,পাওয়া কোন রেকর্ড
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,বাতিল অ্যাসেট খরচ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,আংশিকভাবে ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: খরচ কেন্দ্র আইটেম জন্য বাধ্যতামূলক {2}
 DocType: Vehicle,Policy No,নীতি কোন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,পণ্য সমষ্টি থেকে আইটেম পেতে
 DocType: Asset,Straight Line,সোজা লাইন
 DocType: Project User,Project User,প্রকল্প ব্যবহারকারী
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,বিভক্ত করা
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,থেকে শিক্ষার্থীরা পান
 DocType: Hub Settings,Seller Country,বিক্রেতা দেশ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ওয়েবসাইটে আইটেম প্রকাশ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ব্যাচে Group আপনার ছাত্র
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ব্যাচে Group আপনার ছাত্র
 DocType: Authorization Rule,Authorization Rule,অনুমোদন রুল
 DocType: Sales Invoice,Terms and Conditions Details,শর্তাবলী বিস্তারিত
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,বিশেষ উল্লেখ
@@ -3519,7 +3527,7 @@
 DocType: Vehicle,Last Carbon Check,সর্বশেষ কার্বন চেক
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,আইনি খরচ
 DocType: Purchase Invoice,Posting Time,পোস্টিং সময়
-DocType: Timesheet,% Amount Billed,% পরিমাণ দেখানো হয়েছিল
+DocType: Timesheet,% Amount Billed,% পরিমাণ চালান করা হয়েছে
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,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.,আপনি সংরক্ষণের আগে একটি সিরিজ নির্বাচন করুন ব্যবহারকারীর বাধ্য করতে চান তাহলে এই পরীক্ষা. আপনি এই পরীক্ষা যদি কোন ডিফল্ট থাকবে.
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,চেক তারিখ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},অ্যাকাউন্ট {0}: মূল অ্যাকাউন্ট {1} কোম্পানি অন্তর্গত নয়: {2}
 DocType: Program Enrollment Tool,Student Applicants,ছাত্র আবেদনকারীদের
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,সফলভাবে এই কোম্পানীর সাথে সম্পর্কিত সব লেনদেন মোছা!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,আজকের তারিখে
 DocType: Appraisal,HR,এইচআর
 DocType: Program Enrollment,Enrollment Date,তালিকাভুক্তি তারিখ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,পরীক্ষাকাল
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,বেতন উপাদান
 DocType: Program Enrollment Tool,New Academic Year,নতুন শিক্ষাবর্ষ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,রিটার্ন / ক্রেডিট নোট
 DocType: Stock Settings,Auto insert Price List rate if missing,অটো সন্নিবেশ মূল্য তালিকা হার অনুপস্থিত যদি
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,মোট প্রদত্ত পরিমাণ
 DocType: Production Order Item,Transferred Qty,স্থানান্তর করা Qty
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","নৈমিত্তিক মত পাতা ধরণ, অসুস্থ ইত্যাদি"
 DocType: Email Digest,Send regular summary reports via Email.,ইমেইলের মাধ্যমে নিয়মিত সংক্ষিপ্ত রিপোর্ট পাঠান.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},এ ব্যায়ের দাবি প্রকার ডিফল্ট অ্যাকাউন্ট সেট করুন {0}
 DocType: Assessment Result,Student Name,শিক্ষার্থীর নাম
 DocType: Brand,Item Manager,আইটেম ম্যানেজার
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,বেতনের প্রদেয়
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,বিক্রয় ফানেল
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,সমাহার বাধ্যতামূলক
 DocType: Project,Task Progress,টাস্ক অগ্রগতি
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,কার্ট
 ,Qty to Transfer,স্থানান্তর করতে Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,বিশালাকার বা গ্রাহকরা কোট.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ভূমিকা হিমায়িত শেয়ার সম্পাদনা করতে পারবেন
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,আইটেম অনুযায়ী ট্যাক্স বিস্তারিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ইনস্টিটিউট সমাহার
 ,Item-wise Price List Rate,আইটেম-জ্ঞানী মূল্য তালিকা হার
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,সরবরাহকারী উদ্ধৃতি
 DocType: Quotation,In Words will be visible once you save the Quotation.,আপনি উধৃতি সংরক্ষণ একবার শব্দ দৃশ্যমান হবে.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},পরিমাণ ({0}) সারিতে ভগ্নাংশ হতে পারে না {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ফি সংগ্রহ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},বারকোড {0} ইতিমধ্যে আইটেম ব্যবহৃত {1}
 DocType: Lead,Add to calendar on this date,এই তারিখে ক্যালেন্ডারে যোগ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,শিপিং খরচ যোগ করার জন্য বিধি.
 DocType: Item,Opening Stock,খোলা স্টক
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",মিনিটের মধ্যে &#39;টাইম ইন&#39; র মাধ্যমে আপডেট
 DocType: Customer,From Lead,লিড
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,আদেশ উৎপাদনের জন্য মুক্তি.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ফিস্ক্যাল বছর নির্বাচন ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,পিওএস প্রোফাইল পিওএস এন্ট্রি করতে প্রয়োজন
 DocType: Program Enrollment Tool,Enroll Students,শিক্ষার্থীরা তালিকাভুক্ত
 DocType: Hub Settings,Name Token,নাম টোকেন
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,স্ট্যান্ডার্ড বিক্রি
@@ -3642,10 +3651,10 @@
 DocType: Serial No,Out of Warranty,পাটা আউট
 DocType: BOM Replace Tool,Replace,প্রতিস্থাপন করা
 DocType: Production Order,Unstopped,মুক্ত
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিরুদ্ধে {1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} বিক্রয় চালান বিপরীতে {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,প্রকল্পের নাম
-DocType: Supplier,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
+DocType: Customer,Mention if non-standard receivable account,উল্লেখ অ স্ট্যান্ডার্ড প্রাপ্য তাহলে
 DocType: Journal Entry Account,If Income or Expense,আয় বা ব্যয় যদি
 DocType: Production Order,Required Items,প্রয়োজনীয় সামগ্রী
 DocType: Stock Ledger Entry,Stock Value Difference,শেয়ার মূল্য পার্থক্য
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,সেট লক্ষ্যমাত্রা আইটেমটি গ্রুপ-ভিত্তিক এই বিক্রয় ব্যক্তি.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ফ্রিজ স্টক চেয়ে পুরোনো [দিন]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,সারি # {0}: অ্যাসেট স্থায়ী সম্পদ ক্রয় / বিক্রয়ের জন্য বাধ্যতামূলক
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","দুই বা ততোধিক দামে উপরোক্ত অবস্থার উপর ভিত্তি করে পাওয়া যায়, অগ্রাধিকার প্রয়োগ করা হয়. ডিফল্ট মান শূন্য (ফাঁকা) যখন অগ্রাধিকার 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.,নিম্নলিখিত ব্যবহারকারীদের ব্লক দিনের জন্য চলে যায় অ্যাপ্লিকেশন অনুমোদন করার অনুমতি দিন.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,এটা যেহেতু উপেক্ষা আইটেম {0} একটি স্টক আইটেমটি নয়
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","একটি নির্দিষ্ট লেনদেনে প্রাইসিং নিয়ম প্রযোজ্য না করার জন্য, সমস্ত প্রযোজ্য দামে নিষ্ক্রিয় করা উচিত."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","একটি নির্দিষ্ট লেনদেনে প্রাইসিং নিয়ম প্রযোজ্য না করার জন্য, সমস্ত প্রযোজ্য দামে নিষ্ক্রিয় করা উচিত."
 DocType: Assessment Group,Parent Assessment Group,পেরেন্ট অ্যাসেসমেন্ট গ্রুপ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,জবস
 ,Sales Order Trends,বিক্রয় আদেশ প্রবণতা
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,অতিরিক্ত খরচ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,আর্থিক বছরের শেষ তারিখ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ভাউচার কোন উপর ভিত্তি করে ফিল্টার করতে পারবে না, ভাউচার দ্বারা গ্রুপকৃত যদি"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,সরবরাহকারী উদ্ধৃতি করা
 DocType: Quality Inspection,Incoming,ইনকামিং
 DocType: BOM,Materials Required (Exploded),উপকরণ (অপ্রমাণিত) প্রয়োজন
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","নিজেকে ছাড়া অন্য, আপনার প্রতিষ্ঠানের ব্যবহারকারীদের যুক্ত করুন"
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,কোম্পানি ইন ইতিহাস
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,নিউজ লেটার
 DocType: Stock Ledger Entry,Stock Ledger Entry,স্টক লেজার এণ্ট্রি
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,গ্রাহক&gt; গ্রাহক গ্রুপের&gt; টেরিটরি
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,একই আইটেমকে একাধিক বার প্রবেশ করা হয়েছে
 DocType: Department,Leave Block List,ব্লক তালিকা ত্যাগ
 DocType: Sales Invoice,Tax ID,ট্যাক্স আইডি
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,বিক্রয় অংশীদার এবং কমিশন
 DocType: Employee Loan,Rate of Interest (%) / Year,ইন্টারেস্ট (%) / বর্ষসেরা হার
 ,Project Quantity,প্রকল্প পরিমাণ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","মোট {0} সব আইটেম জন্য শূন্য, আপনি &#39;উপর ভিত্তি করে চার্জ বিতরণ&#39; পরিবর্তন করা উচিত হতে পারে"
 DocType: Opportunity,To Discuss,আলোচনা করতে
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} একক {1} {2} এই লেনদেন সম্পন্ন করার জন্য প্রয়োজন.
 DocType: Loan Type,Rate of Interest (%) Yearly,সুদের হার (%) বাত্সরিক
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,প্রত্যাবর্তন
 DocType: Production Order Operation,Production Order Operation,উৎপাদন অর্ডার অপারেশন
 DocType: Pricing Rule,Disable,অক্ষম
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,পেমেন্ট মোড একটি পেমেন্ট করতে প্রয়োজন বোধ করা হয়
 DocType: Project Task,Pending Review,মুলতুবি পর্যালোচনা
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","অ্যাসেট {0}, বাতিল করা যাবে না এটা আগে থেকেই {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ব্যয় দাবি মাধ্যমে) মোট ব্যয় দাবি
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,মার্ক অনুপস্থিত
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},সারি {0}: BOM # মুদ্রা {1} নির্বাচিত মুদ্রার সমান হতে হবে {2}
 DocType: Journal Entry Account,Exchange Rate,বিনিময় হার
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,বিক্রয় আদেশ {0} দাখিল করা হয় না
 DocType: Homepage,Tag Line,ট্যাগ লাইন
 DocType: Fee Component,Fee Component,ফি কম্পোনেন্ট
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,দ্রুতগামী ব্যবস্থাপনা
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,থেকে আইটেম যোগ করুন
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,থেকে আইটেম যোগ করুন
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},ওয়ারহাউস {0}: মূল অ্যাকাউন্ট {1} কোম্পানী bolong না {2}
 DocType: Cheque Print Template,Regular,নিয়মিত
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,সব অ্যাসেসমেন্ট নির্ণায়ক মোট গুরুত্ব 100% হতে হবে
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,নির্বাচিত আইটেমের ব্যাচ থাকতে পারে না
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","মূল্যনির্ধারণ হার আইটেম {0}, যার জন্য অ্যাকাউন্টিং এন্ট্রি করতে প্রয়োজন বোধ করা হয় জন্য পাওয়া যায়নি {1} {2}. আইটেম একটি নমুনা আইটেম হিসাবে লেনদেন করা হলে {1}, যে {1} আইটেম টেবিলে উল্লেখ করুন. অন্যথায়, দয়া করে আইটেম রেকর্ডে আইটেমটি বা উল্লেখ মূল্যনির্ধারণ হার জন্য একটি ইনকামিং স্টক লেনদেনের তৈরি করুন এবং তারপর / সাবমিট চেষ্টা এই এন্ট্রি বাতিলের"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,উপকরণ% এই হুণ্ডি বিরুদ্ধে বিতরণ
 DocType: Project,Customer Details,কাস্টমার বিস্তারিত
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,রিসিভার আমরা জন্য URL প্যারামিটার লিখুন
 DocType: Payment Entry,Paid Amount,দেওয়া পরিমাণ
 DocType: Assessment Plan,Supervisor,কর্মকর্তা
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,অনলাইন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,অনলাইন
 ,Available Stock for Packing Items,প্যাকিং আইটেম জন্য উপলব্ধ স্টক
 DocType: Item Variant,Item Variant,আইটেম ভেরিয়েন্ট
 DocType: Assessment Result Tool,Assessment Result Tool,অ্যাসেসমেন্ট রেজাল্ট টুল
 DocType: BOM Scrap Item,BOM Scrap Item,BOM স্ক্র্যাপ আইটেম
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,জমা করা অফার মোছা যাবে না
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,গুনমান ব্যবস্থাপনা
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,আইটেম {0} অক্ষম করা হয়েছে
 DocType: Employee Loan,Repay Fixed Amount per Period,শোধ সময়কাল প্রতি নির্দিষ্ট পরিমাণ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},আইটেমের জন্য পরিমাণ লিখুন দয়া করে {0}
 DocType: Employee External Work History,Employee External Work History,কর্মচারী বাহ্যিক কাজের ইতিহাস
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,স্টুডেন্ট ইমেইল আইডি
 DocType: Employee,Notice (days),নোটিশ (দিন)
 DocType: Tax Rule,Sales Tax Template,সেলস ট্যাক্স টেমপ্লেট
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,চালান সংরক্ষণ আইটেম নির্বাচন করুন
 DocType: Employee,Encashment Date,নগদীকরণ তারিখ
 DocType: Training Event,Internet,ইন্টারনেটের
 DocType: Account,Stock Adjustment,শেয়ার সামঞ্জস্য
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,গুণ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,পরিসীমা থেকে / উল্লেখ করুন
 DocType: Serial No,Under AMC,এএমসি অধীনে
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,আইটেম মূল্যনির্ধারণ হার অবতরণ খরচ ভাউচার পরিমাণ বিবেচনা পুনঃগণনা করা হয়
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,আইটেম মূল্যনির্ধারণ হার অবতরণ খরচ ভাউচার পরিমাণ বিবেচনা পুনঃগণনা করা হয়
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,লেনদেন বিক্রয় জন্য ডিফল্ট সেটিংস.
 DocType: Guardian,Guardian Of ,অভিভাবক
 DocType: Grading Scale Interval,Threshold,গোবরাট
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ডেবিট নোট ইস্যু
 DocType: Production Order,Warehouses,ওয়ারহাউস
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} সম্পদ স্থানান্তরিত করা যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,এই আইটেম {0} (টেমপ্লেট) এর ভেরিয়েন্ট হয়।
 DocType: Workstation,per hour,প্রতি ঘণ্টা
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ক্রয়
 DocType: Announcement,Announcement,ঘোষণা
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,প্রাপ্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,সারি # {0}: ক্রয় আদেশ ইতিমধ্যেই বিদ্যমান হিসাবে সরবরাহকারী পরিবর্তন করার অনুমতি নেই
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,সেট ক্রেডিট সীমা অতিক্রম লেনদেন জমা করার অনুমতি দেওয়া হয় যে ভূমিকা.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,উত্পাদনপ্রণালী চলছে নির্বাচন
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","মাস্টার ডেটা সিঙ্ক করা, এটা কিছু সময় নিতে পারে"
 DocType: Item,Material Issue,উপাদান ইস্যু
 DocType: Hub Settings,Seller Description,বিক্রেতা বিবরণ
 DocType: Employee Education,Qualification,যোগ্যতা
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,আদেশ
 DocType: Salary Detail,Component,উপাদান
 DocType: Assessment Criteria,Assessment Criteria Group,অ্যাসেসমেন্ট নির্ণায়ক গ্রুপ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},খোলা সঞ্চিত অবচয় সমান চেয়ে কম হতে হবে {0}
 DocType: Warehouse,Warehouse Name,ওয়ারহাউস নাম
 DocType: Naming Series,Select Transaction,নির্বাচন লেনদেন
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ভূমিকা অনুমোদন বা ব্যবহারকারী অনুমদন লিখুন দয়া করে
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,জমা স্টক এণ্ট্রি {0} থাকার কারণে বাতিল করতে পারেন না
 DocType: Employee Loan,Disbursement Date,ব্যয়ন তারিখ
 DocType: Vehicle,Vehicle,বাহন
 DocType: Purchase Invoice,In Words,শব্দসমূহে
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / লিড%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,অ্যাসেট Depreciations এবং উদ্বৃত্ত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},পরিমাণ {0} {1} থেকে স্থানান্তরিত {2} থেকে {3}
 DocType: Sales Invoice,Get Advances Received,উন্নতির গৃহীত করুন
 DocType: Email Digest,Add/Remove Recipients,প্রাপক Add / Remove
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},লেনদেন বন্ধ উত্পাদনের বিরুদ্ধে অনুমতি না করার {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",", ডিফল্ট হিসাবে চলতি অর্থবছরেই সেট করতে &#39;ডিফল্ট হিসাবে সেট করুন&#39; ক্লিক করুন"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,যোগদান
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ঘাটতি Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,আইটেম বৈকল্পিক {0} একই বৈশিষ্ট্যাবলী সঙ্গে বিদ্যমান
 DocType: Employee Loan,Repay from Salary,বেতন থেকে শুধা
 DocType: Leave Application,LAP/,ভাঁজ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},বিরুদ্ধে পেমেন্ট অনুরোধ {0} {1} পরিমাণ জন্য {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,অ্যাসেসমেন্ট রেজাল্ট বিস্তারিত
 DocType: Employee Education,Employee Education,কর্মচারী শিক্ষা
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ডুপ্লিকেট আইটেম গ্রুপ আইটেম গ্রুপ টেবিল অন্তর্ভুক্ত
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,এটি একটি আইটেম বিবরণ পেতে প্রয়োজন হয়.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ইতিমধ্যে গৃহীত হয়েছে
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","গুদাম {0} কোনো অ্যাকাউন্ট সংযুক্ত করা হয় না, মনে রাখবেন / গুদাম জন্য সংশ্লিষ্ট (অ্যাসেট) অ্যাকাউন্ট লিঙ্ক তৈরি করুন."
 DocType: Purchase Invoice,Recurring Id,পুনরাবৃত্ত আইডি
 DocType: Customer,Sales Team Details,সেলস টিম বিবরণ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,স্থায়ীভাবে মুছে ফেলতে চান?
 DocType: Expense Claim,Total Claimed Amount,দাবি মোট পরিমাণ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,বিক্রি জন্য সম্ভাব্য সুযোগ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},অকার্যকর {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,পিন
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,সেটআপ ERPNext আপনার স্কুল
 DocType: Sales Invoice,Base Change Amount (Company Currency),বেস পরিবর্তন পরিমাণ (কোম্পানি মুদ্রা)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,নিম্নলিখিত গুদাম জন্য কোন হিসাব এন্ট্রি
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,শেষ আদেশ পরিমাণ
+DocType: Task,Is Milestone,মাইলফলক
 DocType: Daily Work Summary,Email Sent To,ইমেইল পাঠানো
 DocType: Budget,Warn,সতর্ক করো
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","অন্য কোন মন্তব্য, রেকর্ড মধ্যে যেতে হবে যে উল্লেখযোগ্য প্রচেষ্টা."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,মূল্য গুন
 ,Itemwise Recommended Reorder Level,Itemwise রেকর্ডার শ্রেনী প্রস্তাবিত
 DocType: Salary Detail,Salary Detail,বেতন বিস্তারিত
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,প্রথম {0} দয়া করে নির্বাচন করুন
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,আইটেম এর ব্যাচ {0} {1} মেয়াদ শেষ হয়ে গেছে.
 DocType: Sales Invoice,Commission,কমিশন
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,উত্পাদন জন্য টাইম শিট.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ফ্রিজ স্টক পুরাতন Than`% D দিন চেয়ে কম হওয়া দরকার.
 DocType: Tax Rule,Purchase Tax Template,ট্যাক্স টেমপ্লেট ক্রয়
 ,Project wise Stock Tracking,প্রকল্প জ্ঞানী স্টক ট্র্যাকিং
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},রক্ষণাবেক্ষণ সূচি {0} বিরুদ্ধে বিদ্যমান {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(উৎস / লক্ষ্য) প্রকৃত স্টক
 DocType: Item Customer Detail,Ref Code,সুত্র কোড
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,কর্মচারী রেকর্ড.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,নির্ধারণ করুন পরবর্তী অবচয় তারিখ
 DocType: HR Settings,Payroll Settings,বেতনের সেটিংস
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,অ লিঙ্ক চালান এবং পেমেন্টস্ মেলে.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,প্লেস আদেশ
 DocType: Email Digest,New Purchase Orders,নতুন ক্রয় আদেশ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root- র একটি ঊর্ধ্বতন খরচ কেন্দ্র থাকতে পারে না
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,নির্বাচন ব্র্যান্ড ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,নির্বাচন ব্র্যান্ড ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,যেমন উপর অবচয় সঞ্চিত
 DocType: Sales Invoice,C-Form Applicable,সি-ফরম প্রযোজ্য
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},অপারেশন টাইম অপারেশন জন্য তার চেয়ে অনেক বেশী 0 হতে হবে {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ওয়ারহাউস বাধ্যতামূলক
 DocType: Supplier,Address and Contacts,ঠিকানা এবং পরিচিতি
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM রূপান্তর বিস্তারিত
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px দ্বারা এটি (W) ওয়েব বান্ধব 900px রাখুন (H)
 DocType: Program,Program Abbreviation,প্রোগ্রাম সমাহার
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,উৎপাদন অর্ডার একটি আইটেম টেমপ্লেট বিরুদ্ধে উত্থাপিত হতে পারবেন না
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,চার্জ প্রতিটি আইটেমের বিরুদ্ধে কেনার রসিদ মধ্যে আপডেট করা হয়
 DocType: Warranty Claim,Resolved By,দ্বারা এই সমস্যাগুলি সমাধান
 DocType: Bank Guarantee,Start Date,শুরুর তারিখ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,একটি নির্দিষ্ট সময়ের জন্য পাতার বরাদ্দ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,চেক এবং আমানত ভুল সাফ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,অ্যাকাউন্ট {0}: আপনি অভিভাবক অ্যাকাউন্ট হিসাবে নিজেকে ধার্য করতে পারবেন না
 DocType: Purchase Invoice Item,Price List Rate,মূল্যতালিকা হার
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,গ্রাহকের কোট তৈরি করুন
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,গ্রাহকের কোট তৈরি করুন
 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 +38,Bill of Materials (BOM),উপকরণ বিল (BOM)
 DocType: Item,Average time taken by the supplier to deliver,সরবরাহকারী কর্তৃক গৃহীত মাঝামাঝি সময় বিলি
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,অ্যাসেসমেন্ট রেজাল্ট
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ঘন্টা
 DocType: Project,Expected Start Date,প্রত্যাশিত স্টার্ট তারিখ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,চার্জ যে আইটেমটি জন্য প্রযোজ্য নয় যদি আইটেমটি মুছে ফেলুন
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,লেনদেনের কারেন্সি পেমেন্ট গেটওয়ে মুদ্রা একক হিসাবে একই হতে হবে
 DocType: Payment Entry,Receive,গ্রহণ করা
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,অপারেটিং খরচ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,অ্যাকশন যদি সঞ্চিত মাসিক বাজেট অতিক্রম করেছে
 DocType: Purchase Invoice,Submit on creation,জমা দিন সৃষ্টির উপর
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},মুদ্রা {0} হবে জন্য {1}
 DocType: Asset,Disposal Date,নিষ্পত্তি তারিখ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ইমেল দেওয়া ঘন্টা এ কোম্পানির সব সক্রিয় এমপ্লয়িজ পাঠানো হবে, যদি তারা ছুটির দিন না. প্রতিক্রিয়া সংক্ষিপ্তসার মধ্যরাতে পাঠানো হবে."
 DocType: Employee Leave Approver,Employee Leave Approver,কর্মী ছুটি রাজসাক্ষী
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},সারি {0}: একটি রেকর্ডার এন্ট্রি ইতিমধ্যে এই গুদাম জন্য বিদ্যমান {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","উদ্ধৃতি দেয়া হয়েছে, কারণ যত হারিয়ে ডিক্লেয়ার করতে পারেন না."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,প্রশিক্ষণ প্রতিক্রিয়া
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,অর্ডার {0} দাখিল করতে হবে উৎপাদন
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},আইটেম জন্য আরম্ভের তারিখ ও শেষ তারিখ নির্বাচন করুন {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},কোর্সের সারিতে বাধ্যতামূলক {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,তারিখ থেকে তারিখের আগে হতে পারে না
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ সম্পাদনা বর্ণনা করো
 DocType: Batch,Parent Batch,মূল ব্যাচ
 DocType: Cheque Print Template,Cheque Print Template,চেক প্রিন্ট টেমপ্লেট
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,খরচ কেন্দ্র এর চার্ট
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,আদেশ আইটেম বিতরণ করা
 DocType: Account,Income,আয়
 DocType: Industry Type,Industry Type,শিল্প শ্রেণী
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,কিছু ভুল হয়েছে!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,কিছু ভুল হয়েছে!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,সতর্কতা: ছুটি আবেদন নিম্নলিখিত ব্লক তারিখ রয়েছে
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,চালান {0} ইতিমধ্যেই জমা দেওয়া হয়েছে বিক্রয়
 DocType: Assessment Result Detail,Score,স্কোর
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,ভেরিয়েন্ট উপর ভিত্তি করে
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% হওয়া উচিত নির্ধারিত মোট গুরুত্ব. এটা হল {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,আপনার সরবরাহকারীদের
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,বিক্রয় আদেশ তৈরি করা হয় যেমন বিচ্ছিন্ন সেট করা যায় না.
 DocType: Request for Quotation Item,Supplier Part No,সরবরাহকারী পার্ট কোন
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,থেকে পেয়েছি
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',কেটে যাবে না যখন আরো মূল্যনির্ধারণ &#39;বা&#39; Vaulation এবং মোট &#39;জন্য নয়
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,থেকে পেয়েছি
 DocType: Lead,Converted,ধর্মান্তরিত
 DocType: Item,Has Serial No,সিরিয়াল কোন আছে
 DocType: Employee,Date of Issue,প্রদান এর তারিখ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} থেকে {1} এর জন্য
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},সারি # {0}: আইটেমের জন্য সেট সরবরাহকারী {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,সারি {0}: ঘন্টা মান শূন্য থেকে বড় হওয়া উচিত.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,আইটেম {1} সংযুক্ত ওয়েবসাইট চিত্র {0} পাওয়া যাবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,ওয়েবসাইটে একাধিক গ্রুপ এই আইটেম তালিকা.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,আপনি হিমায়িত মূল্য নির্ধারণ করার জন্য অনুমতিপ্রাপ্ত নন
 DocType: Payment Reconciliation,Get Unreconciled Entries,অসমর্পিত এন্ট্রি পেতে
 DocType: Payment Reconciliation,From Invoice Date,চালান তারিখ থেকে
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,বিলিং মুদ্রা পারেন ডিফল্ট comapany মুদ্রা বা পক্ষের অ্যাকাউন্টে মুদ্রার সমান হতে হবে
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,নগদীকরণ ত্যাগ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,এটার কাজ কি?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,গুদাম থেকে
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,সকল স্টুডেন্ট অ্যাডমিশন
 ,Average Commission Rate,গড় কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'সিরিয়াল নং আছে' কখনই নন-ষ্টক আইটেমের ক্ষেত্রে 'হ্যাঁ' হতে পারবে না
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,এ্যাটেনডেন্স ভবিষ্যতে তারিখগুলি জন্য চিহ্নিত করা যাবে না
 DocType: Pricing Rule,Pricing Rule Help,প্রাইসিং শাসন সাহায্য
 DocType: School House,House Name,হাউস নাম
 DocType: Purchase Taxes and Charges,Account Head,অ্যাকাউন্ট হেড
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,আইটেম অবতরণ খরচ নিরূপণ করার জন্য অতিরিক্ত খরচ আপডেট
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,বৈদ্যুতিক
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,আপনার প্রতিষ্ঠানের বাকি আপনার ব্যবহারকারী হিসেবে যুক্ত করো. এছাড়াও আপনি তাদের পরিচিতি থেকে যোগ করে আপনার পোর্টাল গ্রাহকরা আমন্ত্রণ যোগ করতে পারেন
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,আপনার প্রতিষ্ঠানের বাকি আপনার ব্যবহারকারী হিসেবে যুক্ত করো. এছাড়াও আপনি তাদের পরিচিতি থেকে যোগ করে আপনার পোর্টাল গ্রাহকরা আমন্ত্রণ যোগ করতে পারেন
 DocType: Stock Entry,Total Value Difference (Out - In),মোট মূল্য পার্থক্য (আউট - ইন)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,গ্রাহক কোড
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},জন্য জন্মদিনের স্মারক {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,শেষ আদেশ থেকে দিনের
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,অ্যাকাউন্ট ডেবিট একটি ব্যালান্স শিটের অ্যাকাউন্ট থাকতে হবে
 DocType: Buying Settings,Naming Series,নামকরণ সিরিজ
 DocType: Leave Block List,Leave Block List Name,ব্লক তালিকা নাম
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,বীমা তারিখ শুরু তুলনায় বীমা শেষ তারিখ কম হওয়া উচিত
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},কর্মচারীর বেতন স্লিপ {0} ইতিমধ্যে সময় শীট জন্য নির্মিত {1}
 DocType: Vehicle Log,Odometer,দূরত্বমাপণী
 DocType: Sales Order Item,Ordered Qty,আদেশ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,আইটেম {0} নিষ্ক্রিয় করা হয়
 DocType: Stock Settings,Stock Frozen Upto,শেয়ার হিমায়িত পর্যন্ত
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM কোনো স্টক আইটেম নেই
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},থেকে এবং আবর্তক সময়সীমার জন্য বাধ্যতামূলক তারিখ সময়ের {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,প্রকল্পের কার্যকলাপ / টাস্ক.
 DocType: Vehicle Log,Refuelling Details,ফুয়েলিং বিস্তারিত
@@ -4163,13 +4174,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,সর্বশেষ ক্রয় হার পাওয়া যায়নি
 DocType: Purchase Invoice,Write Off Amount (Company Currency),পরিমাণ বন্ধ লিখুন (কোম্পানি একক)
 DocType: Sales Invoice Timesheet,Billing Hours,বিলিং ঘন্টা
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,জন্য {0} পাওয়া ডিফল্ট BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,সারি # {0}: পুনর্বিন্যাস পরিমাণ সেট করুন
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,তাদের এখানে যোগ করার জন্য আইটেম ট্যাপ
 DocType: Fees,Program Enrollment,প্রোগ্রাম তালিকাভুক্তি
 DocType: Landed Cost Voucher,Landed Cost Voucher,ল্যান্ড কস্ট ভাউচার
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},সেট করুন {0}
 DocType: Purchase Invoice,Repeat on Day of Month,মাস দিন পুনরাবৃত্তি
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্রী
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} নিষ্ক্রিয় ছাত্র-ছাত্রী
 DocType: Employee,Health Details,স্বাস্থ্য বিবরণ
 DocType: Offer Letter,Offer Letter Terms,পত্র ব্যাপারে প্রস্তাব
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,একটি পেমেন্ট অনুরোধ রেফারেন্স ডকুমেন্ট প্রয়োজন বোধ করা হয় তৈরি করতে
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,রক্ষণাবেক্ষণ তারিখ
 DocType: Purchase Invoice Item,Rejected Serial No,প্রত্যাখ্যাত সিরিয়াল কোন
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,বছর শুরুর তারিখ বা শেষ তারিখ {0} সঙ্গে ওভারল্যাপিং হয়. এড়ানোর জন্য কোম্পানির সেট দয়া
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},আইটেম জন্য শেষ তারিখ চেয়ে কম হওয়া উচিত তারিখ শুরু {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,আপলোড এ্যাটেনডেন্স
@@ -4261,7 +4273,6 @@
 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,একাধিক গ্রুপ আইটেমের ক্রস তালিকা
-DocType: Grade Interval,Grade Interval,গ্রেড ব্যবধান
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},অর্থবছরের আরম্ভের তারিখ ও ফিস্ক্যাল বছর শেষ তারিখ ইতিমধ্যে অর্থবছরে নির্ধারণ করা হয় {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,পরিস্কারের তারিখ আপডেট
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,স্প্লিট ব্যাচ
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,উত্পাদনের জন্য Qty সংরক্ষিত
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,চেকমুক্ত রেখে যান আপনি ব্যাচ বিবেচনা করার সময় অবশ্যই ভিত্তিক দলের উপার্জন করতে চাই না।
 DocType: Asset,Frequency of Depreciation (Months),অবচয় এর ফ্রিকোয়েন্সি (মাস)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ক্রেডিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ক্রেডিট অ্যাকাউন্ট
 DocType: Landed Cost Item,Landed Cost Item,ল্যান্ড খরচ আইটেমটি
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,শূন্য মান দেখাও
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,আইটেমের পরিমাণ কাঁচামাল দেওয়া পরিমাণে থেকে repacking / উত্পাদন পরে প্রাপ্ত
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,সেটআপ আমার প্রতিষ্ঠানের জন্য একটি সহজ ওয়েবসাইট
 DocType: Payment Reconciliation,Receivable / Payable Account,গ্রহনযোগ্য / প্রদেয় অ্যাকাউন্ট
 DocType: Delivery Note Item,Against Sales Order Item,বিক্রয় আদেশ আইটেমটি বিরুদ্ধে
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},অ্যাট্রিবিউট মূল্য গুন উল্লেখ করুন {0}
 DocType: Item,Default Warehouse,ডিফল্ট ওয়্যারহাউস
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},বাজেট গ্রুপ অ্যাকাউন্ট বিরুদ্ধে নিয়োগ করা যাবে না {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ঊর্ধ্বতন খরচ কেন্দ্র লিখুন দয়া করে
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,মৌলিক হার
 DocType: GL Entry,Credit Amount,ক্রেডিট পরিমাণ
 DocType: Cheque Print Template,Signatory Position,স্বাক্ষরকারী অবস্থান
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,লস্ট হিসেবে সেট
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,লস্ট হিসেবে সেট
 DocType: Timesheet,Total Billable Hours,মোট বিলযোগ্য ঘন্টা
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,পরিশোধের রশিদের উল্লেখ্য
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,এই গ্রাহকের বিরুদ্ধে লেনদেনের উপর ভিত্তি করে তৈরি. বিস্তারিত জানার জন্য নিচের টাইমলাইনে দেখুন
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,চলছে অনুরোধ করা
 DocType: Purchase Order,Get Last Purchase Rate,শেষ কেনার হার পেতে
 DocType: Company,Company Info,প্রতিষ্ঠানের তথ্য
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,নির্বাচন বা নতুন গ্রাহক যোগ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,খরচ কেন্দ্র একটি ব্যয় দাবি বুক করতে প্রয়োজন বোধ করা হয়
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ফান্ডস (সম্পদ) এর আবেদন
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,এই কর্মচারী উপস্থিতি উপর ভিত্তি করে
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ডেবিট অ্যাকাউন্ট
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ডেবিট অ্যাকাউন্ট
 DocType: Fiscal Year,Year Start Date,বছরের শুরু তারিখ
 DocType: Attendance,Employee Name,কর্মকর্তার নাম
 DocType: Sales Invoice,Rounded Total (Company Currency),গোলাকৃতি মোট (কোম্পানি একক)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,নিম্নলিখিত দিন ছুটি অ্যাপ্লিকেশন তৈরি করা থেকে ব্যবহারকারীদের বিরত থাকুন.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ক্রয় মূল
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,সরবরাহকারী উদ্ধৃতি {0} সৃষ্টি
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,শেষ বছরের শুরুর বছর আগে হতে পারবে না
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,কর্মচারীর সুবিধা
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},একটি ডিফল্ট কর্মচারী জন্য হলিডে তালিকা নির্ধারণ করুন {0} বা কোম্পানির {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} বিদ্যমান নয়
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,গ্রাহকরা উত্থাপিত বিল.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,প্রকল্প আইডি
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},সারি কোন {0}: পরিমাণ ব্যয় দাবি {1} বিরুদ্ধে পরিমাণ অপেক্ষারত তার চেয়ে অনেক বেশী হতে পারে না. অপেক্ষারত পরিমাণ {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 পড়া
 ,Hub,হাব
 DocType: GL Entry,Voucher Type,ভাউচার ধরন
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,মূল্য তালিকা পাওয়া বা প্রতিবন্ধী না
 DocType: Employee Loan Application,Approved,অনুমোদিত
 DocType: Pricing Rule,Price,মূল্য
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} নির্ধারণ করা আবশ্যক উপর অব্যাহতিপ্রাপ্ত কর্মচারী &#39;বাম&#39; হিসাবে
 DocType: Guardian,Guardian,অভিভাবক
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,মূল্যায়ন {0} {1} প্রদত্ত সময়সীমার মধ্যে কর্মচারী জন্য তৈরি
 DocType: Employee,Education,শিক্ষা
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,দেল
 DocType: Selling Settings,Campaign Naming By,প্রচারে নেমিং
 DocType: Employee,Current Address Is,বর্তমান ঠিকানা
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,পরিবর্তিত
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ঐচ্ছিক. নির্ধারিত না হলে কোম্পানির ডিফল্ট মুদ্রা সেট.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,অ্যাকাউন্টিং জার্নাল এন্ট্রি.
 DocType: Delivery Note Item,Available Qty at From Warehouse,গুদাম থেকে এ উপলব্ধ Qty
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},সারি {0}: পার্টি / অ্যাকাউন্টের সাথে মেলে না {1} / {2} এ {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ব্যয় অ্যাকাউন্ট লিখুন দয়া করে
 DocType: Account,Stock,স্টক
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","সারি # {0}: রেফারেন্স ডকুমেন্ট প্রকার ক্রয় আদেশ এক, ক্রয় চালান বা জার্নাল এন্ট্রি করতে হবে"
 DocType: Employee,Current Address,বর্তমান ঠিকানা
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","স্পষ্টভাবে উল্লেখ তবে আইটেমটি তারপর বর্ণনা, চিত্র, প্রাইসিং, করের টেমপ্লেট থেকে নির্ধারণ করা হবে ইত্যাদি অন্য আইটেম একটি বৈকল্পিক যদি"
 DocType: Serial No,Purchase / Manufacture Details,ক্রয় / প্রস্তুত বিস্তারিত
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,হাব সেটিংস
 DocType: Project,Gross Margin %,গ্রস মার্জিন%
 DocType: BOM,With Operations,অপারেশন সঙ্গে
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,হিসাব থেকে ইতিমধ্যে মুদ্রা তৈরি করা হয়েছে {0} কোম্পানির জন্য {1}. মুদ্রা একক সঙ্গে একটি প্রাপ্য বা প্রদেয় অ্যাকাউন্ট নির্বাচন করুন {0}.
 DocType: Asset,Is Existing Asset,বিদ্যমান সম্পদ
 DocType: Salary Detail,Statistical Component,পরিসংখ্যানগত কম্পোনেন্ট
 ,Monthly Salary Register,মাসিক বেতন নিবন্ধন
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,কক্ষ
 DocType: Purchase Order,Advance Paid,অগ্রিম প্রদত্ত
 DocType: Item,Item Tax,আইটেমটি ট্যাক্স
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,সরবরাহকারী উপাদান
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,সরবরাহকারী উপাদান
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,আবগারি চালান
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ট্রেশহোল্ড {0}% একবারের বেশি প্রদর্শিত
 DocType: Expense Claim,Employees Email Id,এমপ্লয়িজ ইমেইল আইডি
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,লোগো সংযুক্ত
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,স্টক মাত্রা
 DocType: Customer,Commission Rate,কমিশন হার
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ভেরিয়েন্ট করুন
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ভেরিয়েন্ট করুন
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ডিপার্টমেন্ট দ্বারা ব্লক ছেড়ে অ্যাপ্লিকেশন.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","পেমেন্ট টাইপ, জখন এক হতে হবে বেতন ও ইন্টারনাল ট্রান্সফার"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,বৈশ্লেষিক ন্যায়
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,কার্ট খালি হয়
 DocType: Vehicle,Model,মডেল
@@ -4510,6 +4523,7 @@
 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 +161,Capital Stock,মূলধন
+DocType: Shopping Cart Settings,Show Public Attachments,জন সংযুক্তিসমূহ দেখান
 DocType: Packing Slip,Package Weight Details,প্যাকেজ ওজন বিস্তারিত
 DocType: Payment Gateway Account,Payment Gateway Account,পেমেন্ট গেটওয়ে অ্যাকাউন্টে
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,পেমেন্ট সম্পন্ন করার পর নির্বাচিত পৃষ্ঠাতে ব্যবহারকারী পুনর্নির্দেশ.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,মেয়াদ শেষ হওয়ার তারিখ
 ,Supplier Addresses and Contacts,সরবরাহকারী ঠিকানা এবং পরিচিতি
 ,accounts-browser,হিসাব-ব্রাউজার
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,প্রথম শ্রেণী নির্বাচন করুন
 apps/erpnext/erpnext/config/projects.py +13,Project master.,প্রকল্প মাস্টার.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ওভার বিলিং বা ওভার ক্রম মঞ্জুরির জন্য &quot;ভাতা&quot; আপডেট স্টক সেটিং বা আইটেম মধ্যে.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,মুদ্রা ইত্যাদি $ মত কোন প্রতীক পরের প্রদর্শন না.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(অর্ধদিবস)
 DocType: Supplier,Credit Days,ক্রেডিট দিন
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,স্টুডেন্ট ব্যাচ করুন
 DocType: Leave Type,Is Carry Forward,এগিয়ে বহন করা হয়
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM থেকে জানানোর পান
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM থেকে জানানোর পান
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,সময় দিন লিড
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},সারি # {0}: পোস্টিং তারিখ ক্রয় তারিখ হিসাবে একই হতে হবে {1} সম্পত্তির {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,উপরে টেবিল এ সেলস অর্ডার প্রবেশ করুন
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,অনুমোদিত পরিমাণ
 DocType: GL Entry,Is Opening,খোলার
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},সারি {0}: ডেবিট এন্ট্রি সঙ্গে যুক্ত করা যাবে না একটি {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,দয়া করে সেটআপ সেটআপ মাধ্যমে এ্যাটেনডেন্স জন্য সিরিজ সংখ্যায়ন&gt; সংখ্যায়ন সিরিজ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 58c2321..1e9c956 100644
--- a/erpnext/translations/bs.csv
+++ b/erpnext/translations/bs.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Iznajmljuje
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Primjenjivo za korisnika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavila proizvodnju Naredba se ne može otkazati, odčepiti to prvi koji će otkazati"
 DocType: Vehicle Service,Mileage,kilometraža
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Da li zaista želite da ukine ove imovine?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Izaberite snabdjevač
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Izaberite snabdjevač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potreban za Cjenovnik {0}
 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,Kontakt kupca
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Uobičajeno 10 min
 DocType: Leave Type,Leave Type Name,Ostavite ime tipa
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Pokaži otvoren
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaži otvoren
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serija Updated uspješno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Postavio
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Stavka Status isteka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Varijante
 DocType: Academic Term,Academic Term,akademski Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materijal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Računi stol ne može biti prazan.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Tekuća godina
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referenca:% s, Šifra:% s i klijenata:% s"
 DocType: Item,Country of Origin,Zemlja porijekla
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,U Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otvorena pitanja
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Zdravstvena zaštita
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (Dani)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servis rashodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} je već spomenut u prodaje Faktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Očekivani Datum isporuke je da je ispred prodajnog naloga Datum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Priložiti .csv datoteku s dvije kolone, jedan za stari naziv i jedna za novo ime"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne u bilo kojem aktivnom fiskalne godine.
 DocType: Packed Item,Parent Detail docname,Roditelj Detalj docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, Šifra: {1} i kupaca: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Prijavite
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Prirast
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Odaberite Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Odaberite Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Get stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dozvoljeno za {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Get stavke iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No stavke navedene
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija datum ne može biti prije Datum kupovine
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mjesečna distribucija ** će Vam pomoći distribuirati budžeta / Target preko mjeseca ako imate sezonalnost u vaše poslovanje.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nije pronađenim predmetima
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nije pronađenim predmetima
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plaća Struktura Missing
 DocType: Lead,Person Name,Ime osobe
 DocType: Sales Invoice Item,Sales Invoice Item,Stavka fakture prodaje
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Univerzitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Izvještaji
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešla za kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termin Završni datum ne može biti kasnije od kraja godine Datum akademske godine za koji je vezana pojam (akademska godina {}). Molimo ispravite datume i pokušajte ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Da li je osnovno sredstvo&quot; ne može biti označeno, kao rekord imovine postoji u odnosu na stavku"
 DocType: Vehicle Service,Brake Oil,Brake ulje
 DocType: Tax Rule,Tax Type,Vrste poreza
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni za dodati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Satnica / 60) * Puna radno vrijeme
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Izaberite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Izaberite BOM
 DocType: SMS Log,SMS Log,SMS log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih Predmeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Na odmor na {0} nije između Od datuma i Do datuma
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,škole
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nema odmora Snimanje pronađena za zaposlenog {0} za {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Molimo najprije odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target Na
 DocType: BOM,Total Cost,Ukupan trošak
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G-din
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplikat grupe potrošača naći u tabeli Cutomer grupa
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Potrošni
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,razred
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučuje dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Proizvodnog naloga već stvorena za sve stavke sa BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Godišnja zarada
 DocType: Daily Work Summary,Daily Work Summary,Svakodnevni rad Pregled
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je smrznuto
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je smrznuto
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Molimo odaberite postojećeg društva za stvaranje Kontni plan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Skladište
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company valuta
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Da li želite da ažurirate prisustvo? <br> Prisutni: {0} \ <br> Odsutni: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply sirovine za kupovinu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Najmanje jedan način plaćanja je potreban za POS računa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Najmanje jedan način plaćanja je potreban za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao listu
 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.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Amortizacija Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Make zaposlenih
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make zaposlenih
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,radiodifuzija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalji o poslovanju obavlja.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za poruke
 DocType: POS Profile,Customer Groups,Customer grupe
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansijski izvještaji
 DocType: Guardian,Students,studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za primjenu cijene i popust .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},iznos Advance ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Default Payroll Payable Account,Uobičajeno zarade plaćaju nalog
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update-mail Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update-mail Group
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenite ako nestandardnih potraživanja računa važećim
 DocType: Course Schedule,Instructor Name,instruktor ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primljen
 DocType: Sales Partner,Reseller,Prodavač
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ako je označeno, će uključivati ne-stanju proizvodi u Industrijska zahtjevima."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje fakture Item
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto gotovine iz aktivnosti finansiranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage je puna, nije spasio"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorišteni lišće iz prethodnog izdvajanja
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sljedeća Ponavljajući {0} će biti kreiran na {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno Costing Iznos (preko Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice artikla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Ostavite blokirani
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,banka unosi
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikal {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,banka unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pomirenje Item
 DocType: Stock Entry,Sales Invoice No,Faktura prodaje br
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Objavite u Hub
 DocType: Student Admission,Student Admission,student Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikal {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materijal zahtjev
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikal {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti očistiti
 DocType: Item,Synced With Hub,Pohranjen Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ne može biti negativan za stavku {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Pogrešna lozinka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ne može biti negativan za stavku {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Pogrešna lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Završene Qty ne može biti veća od 'Količina za proizvodnju'
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski History Work
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružna Reference Error
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijesti putem e-pošte na stvaranje automatskog Materijal Zahtjeva
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Poreza
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodate imovine
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}pritisnite dva puta u sifri poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Pregled za ovaj tjedan i aktivnostima na čekanju
 DocType: Student Applicant,Admitted,Prihvaćen
 DocType: Workstation,Rent Cost,Rent cost
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Da bi vrijednost
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,transakcije protiv stranke ili za internu Transakcija / Cash
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ovaj proizvod predložak i ne može se koristiti u transakcijama. Stavka atributi će se kopirati u više varijanti, osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Order Smatran
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Zvanje zaposlenog ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: fakturi ne može se protiv postojeće imovine {1}
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već izdvojeno za zaposlenog {1} {2} za razdoblje do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Odaberite Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Odaberite Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Kupnja Račun {0} već je podnijela
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: serijski br mora biti isti kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvoriti u non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum fakture
 DocType: GL Entry,Debit Amount,Debit Iznos
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po kompanije u {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Primljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Napravi studentske grupe
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Salary Slip Timesheet,Working Hours,Radno vrijeme
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Kreiranje novog potrošača
-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.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Napravi Narudžbenice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Kreiranje novog potrošača
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Napravi Narudžbenice
 ,Purchase Register,Kupnja Registracija
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Mjerodavno Optužbe
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imati ulogu 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Vozilo Datum
 DocType: Student Log,Medical,liječnički
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog za gubljenje
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Razlog za gubljenje
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti isti kao olovo
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od neprilagođena iznosa
 DocType: Announcement,Receiver,prijemnik
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,Instalirano%
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratorije, itd, gdje se mogu zakazati predavanja."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; dobavljač Tip
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext Manual
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Stari Roditelj
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obavezna polja - akademska godina
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Prilagodite uvodni tekst koji ide kao dio tog e-maila. Svaka transakcija ima zaseban uvodni tekst.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Molimo postavite zadani plaća račun za kompaniju {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslano na adresu
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} odabrani više puta u atributi tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Zapis o radniku je kreiran odabirom polja .
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
 DocType: Request for Quotation Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Tax Rule,Billing County,Billing županije
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ne možete promijeniti način vrednovanja, jer postoje transakcije protiv nekih stvari koje nemaju svoj vlastiti način vrednovanja"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće dodijeljena je obavezno
 DocType: Job Opening,Description of a Job Opening,Opis posla Otvaranje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivnostima na čekanju za danas
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Molimo odaberite predmeta
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Molimo odaberite Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Molimo odaberite Company
 DocType: Stock Entry Detail,Difference Account,Konto razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ne možete zatvoriti zadatak kao zavisne zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni operativnih troškova
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Hitna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kupiti
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Molimo vas da definirati razred za Threshold 0%
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Artikl
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serijski br stavka ne može biti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Subcontracting
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirast ne može biti 0
 DocType: Production Planning Tool,Material Requirement,Materijal Zahtjev
 DocType: Company,Delete Company Transactions,Izbrišite Company Transakcije
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Poziv na broj i referentni datum je obavezan za transakcije banke
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi poreze i troškove
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U očekivanju Količina
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslati na sljedeće brojeve: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimenzije ček setup za štampanje
 DocType: Salary Slip,Salary Slip Timesheet,Plaća Slip Timesheet
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 DocType: Buying Settings,Purchase Receipt Required,Kupnja Potvrda Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje Rate je obavezno ako ušla Otvaranje Stock
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni u tablici fakturu
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Molimo najprije odaberite Društva i Party Tip
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financijska / obračunska godina .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akumulirani Vrijednosti
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Provjerite prodajnog naloga
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Provjerite prodajnog naloga
 DocType: Project Task,Project Task,Projektni zadatak
 ,Lead Id,Lead id
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Kupci
 DocType: Leave Control Panel,Allocate,Dodijeli
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupna izdvojena lišće {0} ne smije biti manja od već odobrenih lišće {1} za period
 DocType: Announcement,Posted By,Postavljeno od
 DocType: Item,Delivered by Supplier (Drop Ship),Isporučuje Dobavljač (Drop Ship)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),P.S. (Pot)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Molimo vas da postavite poduzeća
 DocType: Purchase Order Item,Billed Amt,Naplaćeni izn
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izaberite plaćanje računa da banke Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Kreiranje evidencije zaposlenih za upravljanje lišće, trošak potraživanja i platnom spisku"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj u bazi znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Entry Odbitak
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} ' {1} ' nije u fiskalnoj godini {2}
 DocType: Buying Settings,Settings for Buying Module,Postavke za kupovinu modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} ne pripada kompaniji {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Molimo prvo unesite Kupovina prijem
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Molimo prvo unesite Kupovina prijem
 DocType: Buying Settings,Supplier Naming By,Dobavljač nazivanje
 DocType: Activity Type,Default Costing Rate,Uobičajeno Costing Rate
 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.","Zatim Cjenovna Pravila filtriraju se temelji na Kupca, Kupac Group, Teritorij, dobavljač, proizvođač tip, Kampanja, prodajni partner i sl."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Neto promjena u zalihama
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Zaposlenik kredit za upravljanje
 DocType: Employee,Passport Number,Putovnica Broj
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Odnos sa Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,menadžer
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datum Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manje od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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 'Grupisanje po ' ne mogu biti isti
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
 DocType: Student Batch Name,Batch Name,Batch ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet created:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet created:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,upisati
 DocType: Selling Settings,Customer Naming By,Kupac Imenovanje By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Će pokazati student kao sadašnjost u Studentskom Mjesečni Posjeta izvještaj
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Stvarni Start Time
 DocType: BOM Operation,Operation Time,Operacija Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,završiti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,baza
 DocType: Timesheet,Total Billed Hours,Ukupno Fakturisana Hours
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Račun br
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,student Posjeta
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush sirovine na osnovu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Unesite Detalji
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Ostali detalji
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Plaćanje Ulaz je već stvorena
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutni Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne povezano sa Stavka {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Plaća Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Plaća Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je ušao više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Hub Settings,Seller City,Prodavač City
 ,Absent Student Report,Odsutan Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeća e-mail će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda Pismo Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompanija {0} ne postoji
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tip stabla
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tip stabla
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kol Potrošeno po jedinici
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Molimo odaberite program
 DocType: Project,Estimated Cost,Procijenjeni troškovi
 DocType: Purchase Order,Link to material requests,Link za materijal zahtjeva
@@ -754,7 +757,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ne postoji na zalihama.
 DocType: Mode of Payment Account,Default Account,Podrazumjevani konto
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Prodaja Osoba Target varijance artikla Group - Wise
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: BOM,Website Specifications,Web Specifikacije
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za prisustvo na Setup&gt; numeracije serije
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} {1} tipa
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,Bankovni  A/C br.
 DocType: Bank Guarantee,Project,Projekat
 DocType: Quality Inspection Reading,Reading 7,Čitanje 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,parcijalno uređenih
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Početne postavke za Košarica
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset odbačen preko Journal Entry {0}
@@ -830,14 +835,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Postavljanje e-pošte
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Unesite predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionisano Iznos ne može biti veći od potraživanja Iznos u nizu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Uobičajeno Nabavna vrednost prodate robe računa
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Bez dozvole
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Da biste filtrirali na osnovu stranke, izaberite Party prvog tipa"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Niti jedan zaposlenik pronađena
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podizvođača na dobavljača
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Grupa je već ažurirana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Grupa je već ažurirana.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,Tree Detalji
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} ne pripada kompaniji {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore &#39;{doctype}&#39; sto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka Row {idx}: {doctype} {docname} ne postoji u gore &#39;{doctype}&#39; sto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} je već završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No zadataka
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Na dan u mjesecu na kojima auto faktura će biti generiran npr 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Ispravka vrijednosti
@@ -878,7 +883,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} protiv placanje {1}  od {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Raspored za golf
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored za golf
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za odlazak u penziju u godinama
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dozvolite preko isporuke ili primitka upto ovu posto
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Sve grupe artikala
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve grupe artikala
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski nova poruka na podnošenje transakcija .
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Purchase Order na isplatu
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektovana kolicina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Stavka Variant {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Otvaranje&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Količina
 DocType: Leave Block List Date,Leave Block List Date,Ostavite Date Popis Block
 DocType: Pricing Rule,Price or Discount,Cijena i popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno Primjenjivo Optužbe na račun za prodaju Predmeti sto mora biti isti kao Ukupni porezi i naknada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno Primjenjivo Optužbe na račun za prodaju Predmeti sto mora biti isti kao Ukupni porezi i naknada
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Nabavite samo sirovine
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
 DocType: Item Attribute,Item Attribute Values,Stavka Atributi vrijednosti
 DocType: Examination Result,Examination Result,ispitivanje Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Račun kupnje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Račun kupnje
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Postavio Plaća Slips
 DocType: Employee,Ms,G-đa
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Majstor valute .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referentni Doctype mora biti jedan od {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referentni Doctype mora biti jedan od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},U nemogućnosti da pronađe termin u narednih {0} dana za operaciju {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za podsklopove
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i teritorija
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Ne možete automatski stvoriti obzir već postoji zaliha balans na računu. Morate stvoriti odgovarajuće nalog da biste mogli da unos na to skladište
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Uobičajeno Računi dobavljača
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Radnik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Molimo vas da unesete imovine Kategorija tačke {0}
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izuzetan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Narudzbine avans
 DocType: Hub Settings,Sync Now,Sync Sada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Kredit stavka ne može se povezati sa {1}
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Asset,Purchase Invoice,Narudzbine
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Prodaja novih Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Prodaja novih Račun
 DocType: Stock Entry,Total Outgoing Value,Ukupna vrijednost Odlazni
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum otvaranja i zatvaranja datum bi trebao biti u istoj fiskalnoj godini
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Datum otvaranja i zatvaranja datum bi trebao biti u istoj fiskalnoj godini
 DocType: Lead,Request for Information,Zahtjev za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Fakture
 DocType: Payment Request,Paid,Plaćen
 DocType: Program Fee,Program Fee,naknada za program
 DocType: Salary Slip,Total in words,Ukupno je u riječima
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,sankcionisani
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,Obavezan unos. Možda nije kreirana valuta 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Objaviti na web stranici
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Isporuke kupcima.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Dobavljač Datum računa ne može biti veći od Datum knjiženja
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Naziv preduzeća
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Izaberite Stavka za transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Uobičajeno Banka / Cash račun će se automatski ažurirati u Plaća Journal Entry kada je izabran ovaj režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervale za razred Kod {0} preklapa sa intervalima razred za ostale razrede. Molimo provjerite intervalima {0} i {1} i pokušajte ponovo
 DocType: BOM,Raw Material Cost(Company Currency),Sirovina troškova (poduzeća Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Svi predmeti su već prebačen za ovu proizvodnju Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Rate ne može biti veća od stope koristi u {1} {2}
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Web Stavka
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Unos glavu pismo i logo. (Možete ih kasnije uređivanje).
 DocType: Timesheet Detail,Bill,račun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija datum se unosi kao proteklih dana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bijel
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Količina nije dostupan za {4} u skladištu {1} na postavljanje trenutku stupanja ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 DocType: Item,Automatically Create New Batch,Automatski Create New Batch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Napraviti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Napraviti
 DocType: Student Admission,Admission Start Date,Prijem Ozljede Datum
 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 .
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tip narudžbe mora biti jedan od {0}
 DocType: Lead,Next Contact Date,Datum sledeceg kontaktiranja
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Otvaranje Kol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Unesite račun za promjene Iznos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Unesite račun za promjene Iznos
 DocType: Student Batch Name,Student Batch Name,Student Batch Ime
 DocType: Holiday List,Holiday List Name,Naziv liste odmora
 DocType: Repayment Schedule,Balance Loan Amount,Balance Iznos kredita
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Ukloniti stavke bez promjene u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribut sto je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut sto je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj Amortizacija
 DocType: Sales Invoice Item,Rate With Margin,Stopu sa margina
 DocType: Workstation,Wages,Plata
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Vi steRashodi Odobritelj za ovaj rekord . Molimo Ažuriranje "" status"" i Save"
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Tiketi
 DocType: Asset,Scrapped,odbačen
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Osobine Stavka Varijante. npr veličina, boja i sl"
 DocType: Purchase Invoice,Returns,povraćaj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Skladište
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,regrutacija
 DocType: Lead,Organization Name,Naziv organizacije
 DocType: Tax Rule,Shipping State,State dostava
 ,Projected Quantity as Source,Projektovanih količina kao izvor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodan pomoću 'Get stavki iz Kupovina Primici' gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Uključuju ne-stanju proizvodi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajni troškovi
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodajnog naloga {0} je {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izrada Stock unosi
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} rezultata
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} rezultata
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjom Ispravka Procenat
 DocType: Employee Loan,Repayment Schedule,otplata Raspored
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv preduzeća.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobijene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Područje djelovanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Prevoznik
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Invalid Atributi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} mora biti podnesen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Molimo odaberite BOM BOM u polje za Stavka {0}
@@ -1152,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Molimo podesite &#39;primijeniti dodatne popusta na&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Od opseg mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Početak godine
 DocType: Purchase Invoice,Start date of current invoice's period,Početak datum tekućeg razdoblja dostavnice
 DocType: Salary Slip,Leave Without Pay,Ostavite bez plaće
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapaciteta za planiranje Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapaciteta za planiranje Error
 ,Trial Balance for Party,Suđenje Balance za stranke
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Zarada
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ovo će biti dodan na Šifra za varijantu. Na primjer, ako je vaš skraćenica ""SM"", a stavka kod je ""T-SHIRT"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Povratak / Debit Napomena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Povratak / Debit Napomena
 DocType: Price List Country,Price List Country,Cijena Lista država
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} valjani serijski broj za artikal {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Unesite Šifra da Batch Broj
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
 DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-DocType: Grading Structure,Grading System Name,Pravilo System Ime
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Šifarnik dobavljača
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Troška Za Stavke sa Šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Način plaćanja nije konfiguriran. Molimo provjerite da li račun je postavljena o načinu plaćanja ili na POS profilu.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti stavka ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalje računa može biti pod Grupe, ali unosa može biti protiv ne-Grupe"
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Narudžbenica Proizvodi se naplaćuje
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Narudzbine stavki
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger unosi i GL unosi se ponovo postavila za odabrane Kupovina Primici
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger unosi i GL unosi se ponovo postavila za odabrane Kupovina Primici
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavku 1
 DocType: Holiday,Holiday,Odmor
 DocType: Support Settings,Close Issue After Days,Zatvori Issue Nakon nekoliko dana
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Molimo navedite barem jedan atribut atribute tabeli
 DocType: Announcement,All Students,Svi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock stavka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na kupovinu
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupne emisije / Transfer količina {0} u Industrijska Zahtjev {1} \ ne može biti veća od tražene količine {2} za Stavka {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Sajt slika treba da bude javni datoteke ili web stranice URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Grupa Roll Broj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kredit računa može biti povezan protiv drugog ulaska debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupno sve težine zadatka treba da bude 1. Molimo prilagodite težine svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 DocType: Hub Settings,Seller Website,Prodavač Website
 DocType: Item,ITEM-,Artikl-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status radnog naloga je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status radnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi opis
 ,Team Updates,Team Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Napravi Print Format
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Časopis Stupanje
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
-DocType: Grade Interval,Grade Code,Grade Kod
+DocType: Grading Scale Interval,Grade Code,Grade Kod
 DocType: POS Item Group,POS Item Group,POS Stavka Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada Stavka {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,Ponavljajući Upto
 DocType: Attendance,HR Manager,Šef ljudskih resursa
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Molimo odaberite poduzeća
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Molimo odaberite poduzeća
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Trebate omogućiti Košarica
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Range 3
 DocType: Maintenance Schedule Item,No of Visits,Bez pregleda
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Održavanje Raspored {0} postoji protiv {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,upisa student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbir bodova za sve ciljeve bi trebao biti 100. To je {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odlazni
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Naziv i tip
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',""" Očekivani datum početka ' ne može biti veći od očekivanog datuma završetka"""
 DocType: Course Scheduling Tool,Course End Date,Naravno Završni datum
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Dostava adresa Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,ne može biti veća od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ne može biti veća od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Stavka {0} nijestock Stavka
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o neplaćeni odmor
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi kupnje proizvoda
 DocType: Employee,Better Prospects,Bolji izgledi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Odgovor batch {1} ima samo {2} Količina. Molimo odaberite neku drugu seriju koja ima {3} Količina dostupna ili podijeliti red u više redova, za isporuku / pitanje iz više serija"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposleni ne može prijaviti samog sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Knjiženju za {0}: {1} može se vršiti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla , kvalifikacijama i sl."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Porez pravilo za transakcije.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaži Neriješeni fiskalnu godinu P &amp; L salda
 DocType: Shipping Rule,Shipping Account,Konto transporta
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktivan
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Make Prodajni nalozi će vam pomoći da planirate svoj rad i dostaviti na vreme
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Make Prodajni nalozi će vam pomoći da planirate svoj rad i dostaviti na vreme
 DocType: Quality Inspection,Readings,Očitavanja
 DocType: Stock Entry,Total Additional Costs,Ukupno dodatnih troškova
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio!
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Usluge
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Plaća Slip na zaposlenog
 DocType: Cost Center,Parent Cost Center,Roditelj troška
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Odaberite Moguće dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Odaberite Moguće dobavljač
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show zatvoren
 DocType: Leave Type,Is Leave Without Pay,Ostavi se bez plate
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obavezno za Fixed stavku imovine
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ovo {0} sukobe sa {1} za {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Datum odlaska
 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/utilities/activation.py +64,Create Leads,Napravi Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Napravi Leads
 DocType: Maintenance Schedule,Schedules,Rasporedi
 DocType: Purchase Invoice Item,Net Amount,Neto iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Upis
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Uobičajeno skladište je potreban za izabranu stavku
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutija
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,moguće dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,moguće dobavljač
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
 DocType: Budget,Monthly Distribution,Mjesečni Distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
 DocType: Pricing Rule,Pricing Rule,cijene Pravilo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplikat broj roll za studentske {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplikat broj roll za studentske {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akcija ako Godišnji budžet Exceeded
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materijal Zahtjev za narudžbenice
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,otplata Način
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ako je označeno, na početnu stranicu će biti default Stavka grupe za web stranicu"
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Uobičajeno sastavnice za {0} nije pronađen za projektne {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Uobičajeno sastavnice za {0} nije pronađen za projektne {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti su u srcu sistema, dodajte sve svoje studente"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti su u srcu sistema, dodajte sve svoje studente"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: datum razmak {1} ne može biti prije Ček Datum {2}
 DocType: Company,Default Holiday List,Uobičajeno Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: Od vremena i do vremena od {1} je preklapaju s {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljujete za odmor su praznici. Vi ne trebate podnijeti zahtjev za dozvolu.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovo pošaljite mail plaćanja
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,novi zadatak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make ponudu
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Make ponudu
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostali izveštaji
 DocType: Dependent Task,Dependent Task,Zavisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ostavite tipa {0} ne može biti duži od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planiraju operacije za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Molimo podesite Uobičajeno plaće plaćaju račun poduzeća {0}
 DocType: SMS Center,Receiver List,Lista primalaca
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Traži Stavka
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumed Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,Pravilo Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,već završena
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Plaćanje Zahtjev već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Troškovi Izdata Predmeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Količina ne smije biti više od {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Make isplata Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora biti debitne
 DocType: Company,Default Values,Default vrijednosti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencija} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Ukupan iznos nadoknađeni
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ovo se zasniva na rezanje protiv ovog vozila. Pogledajte vremenski okvir ispod za detalje
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Protiv Dobavljač fakture {0} od {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,rekord Asset pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati fiskalnu godinu {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Journal Entry,Entry Type,Entry Tip
 ,Customer Credit Balance,Customer Credit Balance
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,nabavka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nijedan od stavki imaju bilo kakve promjene u količini ili vrijednosti.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obavezna polja - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantni  rok
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantni  rok
 ,Lead Details,Detalji potenciajalnog kupca
 DocType: Salary Slip,Loan repayment,otplata kredita
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Odaberite Šifra
 DocType: Student Sibling,Studying in Same Institute,Studiranje u istom institutu
 DocType: Territory,Territory Manager,Manager teritorije
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (Opcionalno)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Uplaćeni iznos (poduzeća Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Podešavanja prodaje
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za artikal
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spominje, \n Navedite ""Težina UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materijal Zahtjev se koristi da bi se ova Stock unos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum je obavezan za nove imovine
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum je obavezan za nove imovine
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Poseban grupe na osnovu naravno za svaku seriju
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,naknada Kategorija
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Troškovi Centar je potreban za &quot;dobiti i gubitka računa {2}. Molimo vas da se uspostavi default troškova Centra za kompanije.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupu korisnika&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Novi kontakt
 DocType: Territory,Parent Territory,Roditelj Regija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Kupovina Iznos
 DocType: Asset,Depreciation Method,Način Amortizacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Ukupna ciljna
 DocType: Program Course,Required,potreban
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopustite više prodajnih naloga protiv narudžbenicu Kupca
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Nema
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Uobičajeno BOM ({0}) mora biti aktivna za ovu stavku ili njegove predložak
 DocType: Employee,Leave Encashed?,Ostavite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika iz polja je obavezna
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Provjerite narudžbenice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Provjerite narudžbenice
 DocType: SMS Center,Send To,Pošalji na adresu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Izdvojena iznosu
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Regija Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 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
 DocType: Item,Serial Nos and Batches,Serijski brojevi i Paketi
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Student Group Strength
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Journal Entry {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Appraisals
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Pravilo Intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molimo unesite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ne može overbill za Stavka {0} u redu {1} više od {2}. Kako bi se omogućilo preko-računa, molimo vas da postavite u kupovini Postavke"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Molimo podesite filter na osnovu Item ili Skladište
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} mora biti dostavljena
 DocType: Authorization Control,Authorization Control,Odobrenje kontrole
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Odbijena Skladište je obavezno protiv odbijen Stavka {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plaćanje
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljanje narudžbe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Plaćanje
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljanje narudžbe
 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
 DocType: Course,Course Abbreviation,Skraćenica za golf
 DocType: Student Leave Application,Student Leave Application,Student Leave aplikacije
 DocType: Item,Will also apply for variants,Primjenjivat će se i za varijante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Imovine ne može biti otkazan, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na Poludnevni na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Ukupno radnog vremena ne smije biti veća od max radnog vremena {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bala stavke na vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli duple stavke . Molimo ispraviti i pokušajte ponovno .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Pomoćnik
 DocType: Asset Movement,Asset Movement,Asset pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Stavka {0} nijeserijaliziranom predmeta
 DocType: SMS Center,Create Receiver List,Kreiraj listu primalaca
 DocType: Vehicle,Wheels,Wheels
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogućava stvaranje vremena za rezanje protiv nalozi. Operacije neće biti bager protiv proizvodnog naloga
 DocType: Student,Student Mobile Number,Student Broj mobilnog
 DocType: Item,Has Variants,Ima Varijante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Vi ste već odabrane stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv Mjesečni distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID je obavezno
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID je obavezno
 DocType: Sales Person,Parent Sales Person,Roditelj Prodaja Osoba
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Vehicle Log,Fuel Price,Cena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Osnovnih sredstava Stavka mora biti ne-stock stavku.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžet se ne može dodijeliti protiv {0}, jer to nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareni
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Teritorij / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Teritorij / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,na primjer 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Ostavite Tip {0} ne može se dodijeliti jer se ostavi bez plate
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: {1} Izdvojena iznos mora biti manji od ili jednak naplatiti preostali iznos {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Serijski Bez Status
 DocType: Payment Entry Reference,Outstanding,izvanredan
 ,Daily Timesheet Summary,Dnevni Timesheet Pregled
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: {1} Za postavljanje periodici, razlika između od i do danas \
  mora biti veći ili jednak {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To se temelji na zalihama pokreta. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Broj {0} {1} oduzeti protiv {2}
 DocType: Employee,Salary Information,Plaća informacije
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 DocType: Asset,Sold,prodan
 ,Item-wise Purchase History,Stavka-mudar Kupnja Povijest
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Iznos (Company Valuta)
 DocType: Payment Reconciliation Payment,Reference Row,referentni Row
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Izbrisati sve transakcije za ovu kompaniju
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investicije
 DocType: Issue,Resolution Details,Detalji o rjesenju problema
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,rasprava
 DocType: Payment Entry,Transaction ID,transakcija ID
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Molimo vas da postavite datum ulaska za zaposlenog {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Ukupno Billing Iznos (preko Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer prihoda
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imati rolu 'odobravanje troskova'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Odaberite BOM i količina za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni datum treba biti između Od datuma i Do datuma
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo podesite &#39;Asset Amortizacija troškova Center&#39; u kompaniji {0}
 ,Maintenance Schedules,Rasporedi održavanja
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Završni datum (preko Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Broj {0} {1} protiv {2} {3}
 ,Quotation Trends,Trendovi ponude
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka artikla se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 ,Vehicle Expenses,Troškovi vozila
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
+DocType: Serial No,Invoice Details,Račun Detalji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon koristan život mora biti veći ili jednak {0}
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos kredita
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Podešavanja ljudskih resursa
 DocType: Salary Slip,net pay info,neto plata info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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 .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,novi Troškovi
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Količina mora biti 1, kao stavka je osnovno sredstvo. Molimo koristite posebnom redu za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Ostavite Blok Popis Dopustite
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skraćeno ne može biti prazan ili prostora
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa Non-grupa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 DocType: Loan Type,Loan Name,kredit ime
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Skladište gdje ste održavanju zaliha odbijenih stavki
 DocType: Production Order,Skip Material Transfer,Preskočite Prijenos materijala
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Molimo vas da ručno stvoriti Mjenjačnica rekord
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je podrazumijevana Fiskalna godina . Osvježite svoj browserda bi se izmjene primijenile.
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeća. Račun valuta mora biti {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od prodajnog naloga, prodaje fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i do vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Razlika
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Stavka Cijena je dodao za {0} u {1} Cjenik
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite zaposlenih Id ove prodaje osoba
 DocType: Territory,Classification of Customers by region,Klasifikacija Kupci po regiji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika iznos mora biti nula
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika iznos mora biti nula
 DocType: Project,Gross Margin,Bruto marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato Banka bilans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invaliditetom korisnika
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Ponude
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Ponude
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 ,Production Analytics,proizvodnja Analytics
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Artikal {0} je već vraćen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalna godina ** predstavlja finansijske godine. Svi računovodstvene stavke i drugih većih transakcija se prate protiv ** Fiskalna godina **.
 DocType: Opportunity,Customer / Lead Address,Kupac / Adresa Lead-a
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL certifikat o prilogu {0}
 DocType: Student Admission,Eligibility,kvalifikovanost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads biste se lakše poslovanje, dodati sve svoje kontakte i još kao vodi"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operation Time
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,rad Adresa
 DocType: Appraisal,Calculate Total Score,Izračunaj ukupan rezultat
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Pošiljke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,stanje na računu ({0}) za {1} i vrijednosti zaliha ({2}) za skladište {3} mora biti isti
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan invalide
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Broj Interaction
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Odaberite preduzeće...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite preduzeće...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako smatra za sve odjele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obavezno za tu stavku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 DocType: Student Guardian,Others,Drugi
 DocType: Payment Entry,Unallocated Amount,neraspoređenih Iznos
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći stavku koja se podudara. Molimo odaberite neki drugi vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvoda ili usluge koja je kupio, prodati ili držati u čoporu."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nema više ažuriranja
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Molimo vas da uklonite stavku `{0}` i uštedite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj Timesheets
 DocType: Vehicle Service,Service Item,Servis Stavka
 DocType: Bank Guarantee,Bank Guarantee,Bankarska garancija
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je već {2}
 DocType: Quotation Item,Stock Balance,Kataloški bilanca
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Naloga prodaje na isplatu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Molimo podesite Imenovanje serije za {0} preko Postavljanje&gt; Postavke&gt; Imenovanje serije
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Molimo odaberite ispravan račun
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazan ako nije postavljena Cjenik
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Molimo navedite zemlju za ovaj Dostava pravilo ili provjeriti dostavom diljem svijeta
 DocType: Stock Entry,Total Incoming Value,Ukupna vrijednost Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,To je potrebno Debit
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,To je potrebno Debit
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vremena, troškova i naplate za aktivnostima obavlja svoj tim"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupoprodajna cijena List
 DocType: Offer Letter Term,Offer Term,Ponuda Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Operacija
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,Razlog gubitka
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Unesite dokument o prijemu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Svi artikli su već fakturisani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Unesite dokument o prijemu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Dalje troška mogu biti pod Grupe, ali unosa može biti protiv ne-Grupe"
 DocType: Project,External,Vanjski
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Radne naloge Napisano: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Radne naloge Napisano: {0}
 DocType: Branch,Branch,Ogranak
 DocType: Guardian,Mobile Number,Broj mobitela
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nije pronađena
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nije pronađena
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Make Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Make Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Vi ste pozvani da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Blok Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavite se sada
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,Poslati
 DocType: Payment Request,Make Sales Invoice,Ostvariti prodaju fakturu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softvera
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za referencu samo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Izaberite serijski br
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},{1}: Invalid {0}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Iznos avansa
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,prodavaonice
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,prodavaonice
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje alat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba artikla
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Pokaži Plaća Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Pokaži Plaća Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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 ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Da li što još {3} u odnosu na isti {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Izaberite promjene iznos računa
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Molimo podesite ponavljaju nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Izaberite promjene iznos računa
 DocType: Purchase Invoice,Price List Currency,Cjenik valuta
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,računa budžeta
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
-DocType: Grade Interval,Grade Description,Grade Opis
+DocType: Grading Scale Interval,Grade Description,Grade Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,Gledatelja do danas
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Plaćanje računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto promjena u Potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompenzacijski Off
 DocType: Offer Letter,Accepted,Prihvaćeno
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Broj sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Invalid referentni {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirana kolicina ({2}) u proizvodnoj porudzbini {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći nego što je planirana kolicina ({2}) u proizvodnoj porudzbini {3}
 DocType: Shipping Rule,Shipping Rule Label,Naziv pravila transporta
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Sirovine ne može biti prazan.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzi unos u dnevniku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nije mogao ažurirati zaliha, faktura sadrži drop shipping stavke."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Brzi unos u dnevniku
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,U ime Instituta za koju se postavljanje ovog sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,stvoreni su sljedeći nalozi:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,Radnici koji rade na odmoru
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Način
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Održavanje datum početka ne može biti prije datuma isporuke za rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: BOM,Operating Cost (Company Currency),Operativni trošak (Company Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plate ne odgovara odobrenim Records Ostaviti Primjena
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Molimo vas da dostavite navedene stavke na najbolji mogući stope
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Opportunity nakon 15 dana
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,do kraja godine
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Naknada Records Kreirano - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorija računa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock upis {0} nije podnesen
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Sljedeća kontaktirati putem ne može biti isti kao Lead-mail adresa
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,proizvodnja
 DocType: Guardian,Occupation,okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da postavljanje zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Qty)
 DocType: Sales Invoice,This Document,ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Iznad 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nema nalog {2} ili već usklađeni protiv drugog vaučer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nema nalog {2} ili već usklađeni protiv drugog vaučer
 DocType: Buying Settings,Default Buying Price List,Zadani cjenik kupnje
 DocType: Process Payroll,Salary Slip Based on Timesheet,Plaća za klađenje na Timesheet osnovu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Molimo odaberite serijom za Stavka {0}. Nije moguće pronaći jednu seriju koja ispunjava ovaj zahtjev
 DocType: Process Payroll,Select Employees,Odaberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencijalni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS profil {0} već kreirali za poduzeće {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamijenite predmet / BOM u svim sastavnicama
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,mora biti dostavljen dokument o prijemu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,mora biti dostavljen dokument o prijemu
 DocType: Purchase Invoice Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plaća i ne dostave
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nema vremena listova
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} se ne može nositi-proslijeđen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Raspored održavanja ne stvara za sve stavke . Molimo kliknite na ""Generiraj raspored '"
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,platni spisak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} u {1}. Uključiti {2} u tačka stope, redova {3} mora biti uključena"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Make korisnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Make korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Molimo vas da unesete važeću e-mail adresu
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,predložak invaliditetom ne smije biti zadani predložak
 DocType: Account,Income Account,Konto prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Količina
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Područje odgovornosti
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Paketi pomoći da pratiti prisustvo, procjene i naknade za studente"
 DocType: Payment Entry,Total Allocated Amount,Ukupan dodijeljeni iznos
 DocType: Item Reorder,Material Request Type,Materijal Zahtjev Tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry za plate od {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage je puna, nije spasio"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage je puna, nije spasio"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM Faktor konverzije je obavezno
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref.
 DocType: Budget,Cost Center,Troška
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Sakriti poreza Id klijenta iz transakcija prodaje
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
 DocType: Employee,Relieving Date,Rasterećenje Datum
-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.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Stock Stupanje / Dostavnica / kupiti primitka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Voditelj marketinga i prodaje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Porez na dohodak
-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.","Ako je odabrano cijene Pravilo je napravljen za 'Cijena', to će prepisati cijenu s liste. Pravilnik o cenama cijena konačnu cijenu, tako da nema daljnje popust treba primijeniti. Stoga, u transakcijama poput naloga prodaje, narudžbenice itd, to će biti učitani u 'Rate' na terenu, nego 'Cijena List Rate ""na terenu."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako je odabrano cijene Pravilo je napravljen za 'Cijena', to će prepisati cijenu s liste. Pravilnik o cenama cijena konačnu cijenu, tako da nema daljnje popust treba primijeniti. Stoga, u transakcijama poput naloga prodaje, narudžbenice itd, to će biti učitani u 'Rate' na terenu, nego 'Cijena List Rate ""na terenu."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Pratite Potencijalnog kupca prema tip industrije .
 DocType: Item Supplier,Item Supplier,Dobavljač artikla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Stock Postavke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Hoće li poslati e-mail o događaju zaposlenima sa statusom &#39;Open&#39;
 DocType: Task,Depends on Tasks,Ovisi o Zadaci
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Upravljanje vrstama djelatnosti
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Priloge mogu biti prikazani bez omogućavanje košarica
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novi troška Naziv
 DocType: Leave Control Panel,Leave Control Panel,Ostavite Upravljačka ploča
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; dobavljač Tip
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Bez plaće slip pronađena između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorena SO Proizvodi za zahtjev za kupnju
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Prijemni
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogućena
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogućena
 DocType: Supplier,Billing Currency,Valuta plaćanja
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra veliki
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Istaknuti proizvoda
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Sve procjene Grupe
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladište Ime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 DocType: Vehicle Log,Fuel Qty,gorivo Količina
 DocType: Production Order Operation,Planned Start Time,Planirani Start Time
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve Sales Transakcije mogu biti označena protiv više osoba ** ** Sales, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,S.O. Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Kreirajte Kupca iz Poslovne prilike {0}
 DocType: Price List,Applicable for Countries,Za zemlje u
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo Prijave sa statusom &quot;Odobreno &#39;i&#39; Odbijena &#39;se može podnijeti
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Ime grupe je obavezno u redu {0}
@@ -2626,7 +2633,7 @@
 DocType: Project,Copied From,kopira iz
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Ime greška: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,nedostatak
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ne u vezi sa {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ne u vezi sa {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
 ,Salary Register,Plaća Registracija
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Koristiti za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrijednost {0} za Atributi {1} ne postoji u listu važećih Stavka Atributi vrijednosti za Stavka {2}
 DocType: BOM Item,Scrap %,Otpad%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Naknade će se distribuirati proporcionalno na osnovu stavka količina ili iznos, po svom izboru"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Naknade će se distribuirati proporcionalno na osnovu stavka količina ili iznos, po svom izboru"
 DocType: Maintenance Visit,Purposes,Namjene
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više od bilo koje dostupne radnog vremena u radnu stanicu {1}, razbijaju rad u više operacija"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Spisak teritorija - upravljanje.
 DocType: Journal Entry Account,Sales Invoice,Faktura prodaje
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Molimo odaberite Apply popusta na
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Molimo odaberite Apply popusta na
 DocType: Company,Default Receivable Account,Uobičajeno Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Kreirajte banke unos za ukupne zarade isplaćene za gore odabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
-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.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Računovodstvo Entry za Stock
 DocType: Vehicle Service,Engine Oil,Motorno ulje
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikal {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikal {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Employee Loan,Loan Details,kredit Detalji
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završena Količina mora biti veća od nule.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: ne mogu vratiti više od {1} {2} za tačka
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,zemljište
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,zemljište
 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}
 DocType: Cheque Print Template,Primary Settings,primarni Postavke
 DocType: Purchase Invoice,Select Supplier Address,Izaberite dobavljač adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj zaposlenog
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Dodaj zaposlenog
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna osoba / Podružnica sa zasebnim kontnom pripadaju Organizacije.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Mogu samo napraviti uplatu protiv nenaplaćenu {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Unesite {0} prvi
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišta sa postojećim transakcija se ne može pretvoriti u grupi.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ističe
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj Studenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj Studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-Obrazac br
 DocType: BOM,Exploded_items,Exploded_items
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,novinski izdavači
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ponovno red Level
 DocType: Company,Chart Of Accounts Template,Kontni plan Template
 DocType: Attendance,Attendance Date,Gledatelja Datum
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Dupli unos
 DocType: Program Enrollment Tool,Get Students,Get Studenti
 DocType: Serial No,Under Warranty,Pod jamstvo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Greska]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Greska]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendani zaposlenih
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Posjeta Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Preduzetnički kapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademski pojam sa ovim &quot;akademska godina&quot; {0} i &#39;Term Ime&#39; {1} već postoji. Molimo vas da mijenjati ove stavke i pokušati ponovo.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što je već postoje transakcije protiv stavku {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
@@ -2823,7 +2830,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 +49,Period Closing Entry,Period zatvaranja Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Broj {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Broj {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat za evidenciju dolaznosti radnika
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan narednog mjeseca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu izdanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao odsustvo ravnoteža je već carry-proslijeđen u budućnosti rekord raspodjeli odsustvo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: Zbog / Reference Datum premašuje dozvoljeni dana kreditnu kupca {0} dan (a)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student zahtjeva
 DocType: Asset Category Account,Accumulated Depreciation Account,Ispravka vrijednosti računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operacije se ne može ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Tip je obavezno
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party Tip je obavezno
 DocType: Quality Inspection,Outgoing,Društven
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
@@ -2874,10 +2881,10 @@
 DocType: Asset,Item Code,Šifra artikla
 DocType: Production Planning Tool,Create Production Orders,Stvaranje radne naloge
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izbor studenata ručno za grupe aktivnosti na osnovu
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog broja negativnih preostali iznos {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Istorija rada zaposlenog u preduzeću
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zatvaranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,Stvaranje materijalni zahtijevi
 DocType: Employee Education,School/University,Škola / Univerzitet
 DocType: Payment Request,Reference Details,Reference Detalji
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost Nakon Korisni Život mora biti manja od bruto Kupovina Iznos
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
 DocType: Asset,Double Declining Balance,Double degresivne
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika račun mora biti tip imovine / odgovornošću obzir, jer je to Stock Pomirenje je otvor za ulaz"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni iznos ne može biti veći od Iznos kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnog naloga kreiranu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Proizvodnog naloga kreiranu
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"' Od datuma ' mora biti poslije ' Do datuma"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može promijeniti status studenta {0} je povezana s primjenom student {1}
 DocType: Asset,Fully Depreciated,potpuno je oslabio
 ,Stock Projected Qty,Projektovana kolicina na zalihama
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kupac {0} ne pripada projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Posjećenost HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali svojim kupcima"
 DocType: Sales Order,Customer's Purchase Order,Narudžbenica kupca
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i Batch
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Zbir desetine Kriteriji procjene treba da bude {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,"Vrijednost, ili kol"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo podesite Broj Amortizacija Booked
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,"Vrijednost, ili kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions naloga ne može biti podignuta za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kupnja Porezi i naknade
@@ -2938,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Svi Skladišta
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Sve vrste dobavljača
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Sve vrste dobavljača
 DocType: Global Defaults,Disable In Words,Onemogućena u Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Provjerite plaće slip
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: dodijeljeni iznos ne može biti veći od preostalog iznosa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,osigurani krediti
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit knjiženja datuma i vremena
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno osvježavanje burzovnih transakcija stariji od {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Molimo podesite default plaća račun u zaposlenog {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za zaliha stavku {0}
 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)
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,Grupa na osnovu
 DocType: Journal Entry,Bill Date,Datum računa
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Servis proizvoda, tip, frekvencija i iznos trošak su potrebne"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Da li zaista želite da dostavi sve Plaća listić od {0} do {1}
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Račun Ref
 DocType: Purchase Order,Recurring Order,Ponavljajući Order
 DocType: Company,Default Income Account,Zadani račun prihoda
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vrsta djelatnosti Kupaca / Kupci
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Vrsta djelatnosti Kupaca / Kupci
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neriješeni fiskalne godine dobit / gubitak (kredit)
 DocType: Sales Invoice,Time Sheets,Time listovi
 DocType: Payment Gateway Account,Default Payment Request Message,Uobičajeno plaćanje poruka zahtjeva
@@ -3028,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Employee Loan,Employee Loan Application,Zaposlenik Zahtjev za kredit
 DocType: Issue,Opening Date,Otvaranje Datum
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Posjećenost je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Posjećenost je uspješno označen.
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tip naloga za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tip naloga za {0} mora biti {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lišće i privatnom
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
 DocType: Sales Order,Not Billed,Ne Naplaćeno
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Citat serije
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Molimo odaberite kupac
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Molimo odaberite kupac
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Amortizacija troškova Center
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe kupca
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,osiguranje Detalji
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite rokovi otplate
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi Kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Kupovina Iznos je obavezno
 DocType: Lead,Address Desc,Adresa silazno
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je obavezno
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party je obavezno
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-DocType: Grading Structure,Grade Intervals,Grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite priroda vašeg poslovanja.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: duplikat unosa u Reference {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se obavljaju proizvodne operacije.
 DocType: Asset Movement,Source Warehouse,Izvorno skladište
 DocType: Installation Note,Installation Date,Instalacija Datum
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Naslovi za ispis predložaka pr Predračuna.
 DocType: Student Guardian,Student Guardian,student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Prijava tip vrednovanja ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažurirajte Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange dobitak / gubitak računa
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposleni i dolaznost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Svrha mora biti jedan od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stvarne Količina na lageru
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ponovno red Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni Otvori Posao
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
-DocType: Journal Entry,Write Off,Otpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} Od
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja kupaca
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# obrazac / Stavka / {0}) je out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od Datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaži porez break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Pokaži porez break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zbog / Reference Datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Podataka uvoz i izvoz
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","unosa Stock postoje protiv Skladište {0}, stoga ne možete ponovno dodijeliti ili mijenjati"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No studenti Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,No studenti Found
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun Datum knjiženja
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,prodati
 DocType: Sales Invoice,Rounded Total,Zaokruženi iznos
 DocType: Product Bundle,List items that form the package.,Popis stavki koje čine paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja trebala bi biti jednaka 100 %
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Molimo odaberite Datum knjiženja prije izbora stranke
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Molimo odaberite Citati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Molimo odaberite Citati
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj Amortizacija Booked ne može biti veća od Ukupan broj Amortizacija
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte za korisnike koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No Studenti u
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj više stavki ili otvoreni punu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
@@ -3226,6 +3234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Stavka 3
 DocType: Purchase Order,Customer Contact Email,Email kontakta kupca
 DocType: Warranty Claim,Item and Warranty Details,Stavka i garancija Detalji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra&gt; stavka Group&gt; Brand
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Odaberite program da donese obaveznih predmeta.
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije nego pomirenje
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično Naplaćeno
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti osnovna sredstva stavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti osnovna sredstva stavka
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 DocType: Vehicle,Insurance Company,Insurance Company
 DocType: Asset Category Account,Fixed Asset Account,Osnovnih sredstava računa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,varijabla
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,varijabla
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Od otpremnici
 DocType: Student,Student Email Address,Student-mail adresa
 DocType: Timesheet Detail,From Time,S vremena
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na raspolaganju:
@@ -3264,12 +3273,12 @@
 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 +66,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresa ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adresa ime
 DocType: Stock Entry,From BOM,Iz BOM
 DocType: Assessment Code,Assessment Code,procjena Kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","npr. kg, Jedinica, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 DocType: Bank Reconciliation Detail,Payment Document,plaćanje Document
@@ -3277,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Tiketi - materijal
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Tiketi - materijal
 DocType: Material Request Item,For Warehouse,Za galeriju
 DocType: Employee,Offer Date,ponuda Datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citati
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Vi ste u isključenom modu. Nećete biti u mogućnosti da ponovo sve dok imate mrežu.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,No studentskih grupa stvorio.
 DocType: Purchase Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečna otplate iznos ne može biti veći od iznos kredita
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 DocType: Purchase Invoice,Print Language,print Jezik
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Stock Entry,Including items for sub assemblies,Uključujući i stavke za pod sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Unesite vrijednost mora biti pozitivan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Unesite vrijednost mora biti pozitivan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Artikli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisana.
@@ -3308,16 +3317,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Uobičajeno mjerna jedinica za varijantu &#39;{0}&#39; mora biti isti kao u obrascu &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun zasnovan na
 DocType: Delivery Note Item,From Warehouse,Od Skladište
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nema artikala sa Bill materijala za proizvodnju
 DocType: Assessment Plan,Supervisor Name,Supervizor ime
 DocType: Program Enrollment Course,Program Enrollment Course,Program Upis predmeta
-DocType: Grading Structure,Grading Structure,Pravilo Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Prilagodite Obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Novčani tok iz poslovanja
 DocType: Sales Invoice,Shipping Rule,Pravilo transporta
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Ne default BOM postoji točke {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Molimo najprije odaberite Datum knjiženja
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije zatvaranja datum
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
@@ -3351,7 +3358,7 @@
 DocType: Mode of Payment,General,Opšti
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Priložiti zaglavlje
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje Komunikacija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","List poreza glave (npr PDV-a, carina itd, oni treba da imaju jedinstvena imena), a njihov standard stope. Ovo će stvoriti standardni obrazac koji možete uređivati i dodati još kasnije."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Meč plaćanja fakture
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj artikla
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Kreiranje zaposlenih Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Kreiranje zaposlenih Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,knjigovodstvene isprave
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,nepoznat
 DocType: Shipping Rule,Shipping Rule Conditions,Uslovi pravila transporta
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Primljeni Iznos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Molimo vas da postavljanje zaposlenih Imenovanje sistema u ljudskim resursima&gt; HR Postavke
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Napravite za punu količinu, već ignoriranje količina po narudžbi"
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neobilježen
@@ -3393,9 +3399,9 @@
 DocType: C-Form,Invoices,Fakture
 DocType: Batch,Source Document Name,Izvor Document Name
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,kreiranje korisnika
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,kreiranje korisnika
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Posjetite izvješće za održavanje razgovora.
 DocType: Stock Entry,Update Rate and Availability,Ažuriranje Rate i raspoloživost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
@@ -3404,28 +3410,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Web stranica Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Molimo vas da otkaže fakturi {0} prvi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Settings Company,Send Emails At,Pošalji e-mailova
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Odaberite Domain
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transakcija Ref {0} od {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sažetak za ovaj mjesec i aktivnostima na čekanju
 DocType: Customer Group,Customer Group Name,Naziv vrste djelatnosti Kupca
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ne Kupci još!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanim tokovima
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od Maksimalni iznos kredita od {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Datum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Računa {0} ne pripada kompaniji {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u nizu {0} ne odgovara otpremnica
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Prisustvo za više zaposlenih
@@ -3450,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;osnovna sredstva&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,financijske usluge
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Trupci
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,ispit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,State billing
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prijenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ne povezani s Party nalog {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ne povezani s Party nalog {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prirast za Atributi {0} ne može biti 0
@@ -3474,13 +3482,13 @@
 ,Inactive Customers,neaktivnih kupaca
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kupovina Primici
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Stock Entry,Delivery Note No,Otpremnica br
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ako je označeno, samo o kupovini materijala zahtjeva za konačnu sirovina će biti uključeni u Industrijska zahtjevima. U suprotnom, bit će stvoren Materijal Zahtjevi za roditelja stavke"
 DocType: Cheque Print Template,Message to show,Poruke za prikaz
 DocType: Company,Retail,Maloprodaja
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3490,10 +3498,10 @@
 DocType: Payment Entry,Account Paid From,Računa isplaćuju iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Make Olovo
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Make Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print i pribora
 DocType: Stock Settings,Show Barcode Field,Pokaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošalji dobavljač Email
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Pošalji dobavljač Email
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća je već pripremljena za period od {0} i {1}, Ostavi period aplikacija ne može da bude između tog datuma opseg."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 DocType: Guardian Interest,Guardian Interest,Guardian interesa
@@ -3505,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,Čeka se odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iznad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nevažeći atributa {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Navesti ukoliko nestandardnog plaća račun
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
@@ -3520,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,Proizvodnog naloga Stavka
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ne rekord naći
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Troškovi Rashodovan imovine
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Djelomično ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: trošak je obvezan za artikal {2}
 DocType: Vehicle,Policy No,Politika Nema
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Saznajte Predmeti od Bundle proizvoda
 DocType: Asset,Straight Line,Duž
 DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Podijeliti
@@ -3538,7 +3546,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get Studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite Artikli na sajtu
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa svojim učenicima u serijama
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa svojim učenicima u serijama
 DocType: Authorization Rule,Authorization Rule,Autorizacija Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,tehnički podaci
@@ -3590,14 +3598,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Datum čeka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Nadređeni konto {1} ne pripada preduzeću: {2}
 DocType: Program Enrollment Tool,Student Applicants,student Kandidati
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Uspješno obrisane sve transakcije koje se odnose na ove kompanije!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,upis Datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povratak / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Povratak / Credit Note
 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 +28,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovne zbirne izvještaje putem e-maila.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Molimo podesite zadani račun u Rashodi Preuzmi Tip {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Molimo podesite zadani račun u Rashodi Preuzmi Tip {0}
 DocType: Assessment Result,Student Name,ime studenta
 DocType: Brand,Item Manager,Stavka Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll plaćaju
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,Tok prodaje (Funnel)
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skraćenica je obavezno
 DocType: Project,Task Progress,zadatak Napredak
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kolica
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Skraćenica
 ,Item-wise Price List Rate,Stavka - mudar Cjenovnik Ocijenite
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u nizu {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,naplatu naknada
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} se već koristi u artiklu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Pravila za dodavanjem troškove prijevoza .
 DocType: Item,Opening Stock,otvaranje Stock
@@ -3688,8 +3697,8 @@
  ažurirano preko 'Time Log'"
 DocType: Customer,From Lead,Od Lead-a
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil potrebno da bi POS upis
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -3700,7 +3709,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} protiv prodaje fakture {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naziv projekta
-DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
+DocType: Customer,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: Production Order,Required Items,potrebna Predmeti
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3721,7 +3730,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset je obavezan za osnovno sredstvo kupovinu / prodaju
-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.","Ako su dva ili više Pravila cijene se nalaze na osnovu gore uvjetima, Prioritet se primjenjuje. Prioritet je broj od 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost, ako postoji više pravila cijenama s istim uslovima."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako su dva ili više Pravila cijene se nalaze na osnovu gore uvjetima, Prioritet se primjenjuje. Prioritet je broj od 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost, ako postoji više pravila cijenama s istim uslovima."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
@@ -3746,7 +3755,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Artikal {0} se ignorira budući da nije skladišni artikal
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Assessment Group,Parent Assessment Group,Parent Procjena Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posao
 ,Sales Order Trends,Prodajnog naloga trendovi
@@ -3757,7 +3766,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Financijska godina End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Provjerite Supplier kotaciji
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Provjerite Supplier kotaciji
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Materijali Obavezno (eksplodirala)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
@@ -3785,6 +3794,7 @@
 DocType: Employee,History In Company,Povijest tvrtke
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Stupanje
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; grupu korisnika&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Isto artikal je ušao više puta
 DocType: Department,Leave Block List,Ostavite Block List
 DocType: Sales Invoice,Tax ID,Porez ID
@@ -3794,7 +3804,7 @@
 DocType: Customer,Sales Partner and Commission,Prodajnog partnera i Komisije
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatnu stopu (%) / godina
 ,Project Quantity,projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke je nula, možda biste trebali promijeniti &#39;Rasporedite Optužbe na osnovu&#39;"
 DocType: Opportunity,To Discuss,Za diskusiju
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinicama {1} potrebno {2} za završetak ove transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatnu stopu (%) Godišnji
@@ -3809,7 +3819,7 @@
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodnja Order Operation
 DocType: Pricing Rule,Disable,Ugasiti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Način plaćanja je potrebno izvršiti uplatu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Način plaćanja je potrebno izvršiti uplatu
 DocType: Project Task,Pending Review,Na čekanju
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ne može biti ukinuta, jer je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi potraživanja (preko rashodi potraživanje)
@@ -3817,11 +3827,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnicu # {1} treba da bude jednaka odabrane valute {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Dodaj stavke iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Dodaj stavke iz
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Skladište {0}: Parent račun {1} ne Bolong tvrtki {2}
 DocType: Cheque Print Template,Regular,redovan
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Ukupno weightage svih Kriteriji ocjenjivanja mora biti 100%
@@ -3834,7 +3844,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracije ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni Distribucija Procenat
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrana stavka ne može imati Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","stopa vrednovanja nije pronađen za Stavka {0}, koja je potrebna da uradi unosa računovodstvo za {1} {2}. Ako je stavka transakcijama kao uzorak stavka u {1}, molimo Vas da spomenuti da je u {1} Stavka stola. U suprotnom, molim te stvoriti dolazni zaliha transakcija za stopa vrednovanja stavku ili spominje u Stavka zapisnik, a zatim pokušajte podnošenja i popunjavanja / otkazivanje ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materijala dostavljenih protiv ove otpremnici
 DocType: Project,Customer Details,Korisnički podaci
@@ -3843,15 +3853,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,online
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpad Stavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,upravljanja kvalitetom
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Stavka {0} je onemogućena
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućena
 DocType: Employee Loan,Repay Fixed Amount per Period,Otplatiti fiksni iznos po periodu
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Istorija rada zaposlenog izvan preduzeća
@@ -3877,7 +3887,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student-mail ID
 DocType: Employee,Notice (days),Obavijest (dani )
 DocType: Tax Rule,Sales Tax Template,Porez na promet Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Odaberite stavke za spremanje fakture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Odaberite stavke za spremanje fakture
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Podešavanje
@@ -3900,7 +3910,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Molimo navedite iz / u rasponu
 DocType: Serial No,Under AMC,Pod AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Stavka stopa vrednovanja izračunava se razmatra sletio troškova voucher iznosu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Stavka stopa vrednovanja izračunava se razmatra sletio troškova voucher iznosu
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Zadane postavke za transakciju prodaje.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,prag
@@ -3910,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Napomena Zadani
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovine ne može se prenositi
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ovaj artikal je varijanta {0} (Template).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,objava
@@ -3925,8 +3936,8 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nije dozvoljeno da se promijeniti dobavljača kao narudžbenicu već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Odaberi stavke za proizvodnju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Odaberi stavke za proizvodnju
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master podataka sinhronizaciju, to bi moglo da potraje"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
@@ -3938,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Salary Detail,Component,sastavni
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji procjene Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje Ispravka vrijednosti mora biti manji od jednak {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
@@ -3951,7 +3962,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Ne mogu otkazati , jer podnijela Stock Stupanje {0} postoji"
 DocType: Employee Loan,Disbursement Date,datuma isplate
 DocType: Vehicle,Vehicle,vozilo
 DocType: Purchase Invoice,In Words,Riječima
@@ -3965,14 +3976,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine Amortizacija i vage
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Broj {0} {1} je prešao iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primaoce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pristupiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Stavka varijanta {0} postoji sa istim atributima
 DocType: Employee Loan,Repay from Salary,Otplatiti iz Plata
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Tražeći isplatu protiv {0} {1} za iznos {2}
@@ -3990,7 +4001,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Procjena Rezultat Detail
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenog
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplikat stavka grupa naći u tabeli stavka grupa
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Potrebno je da se donese Stavka Detalji.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3999,7 +4010,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladište {0} nije vezan za bilo koji račun, kreirajte / link odgovarajući (Asset) račun za skladište."
 DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Customer,Sales Team Details,Prodaja Team Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Obrisati trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Obrisati trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4010,13 +4021,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Podešavanje vaše škole u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Promijeni Iznos (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nema računovodstvene unosi za sljedeće skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni Skraćenica
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Max rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Last Order Iznos
+DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail poslat
 DocType: Budget,Warn,Upozoriti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bilo koji drugi primjedbe, napomenuti napor koji treba da ide u evidenciji."
@@ -4037,7 +4049,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise Preporučio redoslijeda Level
 DocType: Salary Detail,Salary Detail,Plaća Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Odaberite {0} Prvi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} od {1} Stavka je istekla.
 DocType: Sales Invoice,Commission,Provizija
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet za proizvodnju.
@@ -4049,41 +4061,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`blokiraj zalihe starije od podrazumijevanog manje od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Porez na promet Template
 ,Project wise Stock Tracking,Supervizor pracenje zaliha
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarna kol (na izvoru/cilju)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaposlenih evidencija.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo podesite Sljedeća Amortizacija Datum
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Place Order
 DocType: Email Digest,New Purchase Orders,Novi narudžbenice kupnje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Odaberite Marka ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Odaberite Marka ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Ispravka vrijednosti kao na
 DocType: Sales Invoice,C-Form Applicable,C-obrascu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Vrijeme rada mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Držite ga prijateljski web 900px ( w ) by 100px ( h )
 DocType: Program,Program Abbreviation,program Skraćenica
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja Nalog ne može biti podignuta protiv Item Template
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Naknade se ažuriraju u Kupovina Prijem protiv svaku stavku
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Bank Guarantee,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodijeli odsustva za period.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depoziti pogrešno spašava
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Napravi citati kupac
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Napravi citati kupac
 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 +38,Bill of Materials (BOM),Sastavnice (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme koje je dobavljač isporuči
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,procjena rezultata
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Uklonite stavku ako naknada nije primjenjiv na tu stavku
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transakcija valuta mora biti isti kao i Payment Gateway valutu
 DocType: Payment Entry,Receive,Primiti
@@ -4094,19 +4105,19 @@
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akcija ako Akumulirani Mjesečni budžet Exceeded
 DocType: Purchase Invoice,Submit on creation,Dostavi na stvaranju
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odlaganje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E će biti poslana svim aktivnih radnika kompanije u datom sat, ako nemaju odmor. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Osoba koja odobrava izlaske zaposlenima
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Unos Ponovno red već postoji za to skladište {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne može proglasiti izgubili , jer citat je napravio ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs je obavezno u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,roditelja Batch
 DocType: Cheque Print Template,Cheque Print Template,Ček Ispis Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
@@ -4119,7 +4130,7 @@
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Nešto nije bilo u redu!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nešto nije bilo u redu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 DocType: Assessment Result Detail,Score,skor
@@ -4150,17 +4161,17 @@
 DocType: Item,Variant Based On,Varijanta na osnovu
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
+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 .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač dio br
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Dobili od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada kategorija je za &#39;Vrednovanje&#39; ili &#39;Vaulation i Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Dobili od
 DocType: Lead,Converted,Pretvoreno
 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 +19,{0}: From {0} for {1},{0}: Od {0} {1} za
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Od {0} {1} za
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set dobavljač za stavku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Red {0}: Radno vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4169,20 +4180,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Billing valuti mora biti jednak ili default comapany valuta ili stranka račun valuti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Ostavite unovčenja
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Što učiniti ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Student Prijemni
 ,Average Commission Rate,Prosječna stopa komisija
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' Ima serijski broj ' ne može biti ' Da ' za artikle bez zalihe
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Cijene Pravilo Pomoć
 DocType: School House,House Name,nazivu
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje konta
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Električna
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak organizacije kao korisnika. Također možete dodati pozvati kupce da vaš portal dodavanjem iz kontakata
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak organizacije kao korisnika. Također možete dodati pozvati kupce da vaš portal dodavanjem iz kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost Razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4191,7 +4202,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Zaduženja na račun mora biti bilans stanja računa
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Ostavite popis imena Block
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum osiguranje Početak bi trebao biti manji od datuma osiguranje Kraj
@@ -4206,9 +4217,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plaća listić od zaposlenika {0} već kreirali za vrijeme stanja {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Stavka {0} je onemogućeno
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Stavka {0} je onemogućeno
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ne sadrži nikakve zaliha stavka
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Period od perioda i datumima obavezno ponavljaju {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektna aktivnost / zadatak.
 DocType: Vehicle Log,Refuelling Details,Dopuna goriva Detalji
@@ -4218,8 +4229,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Zadnje kupovinu stopa nije pronađen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis Iznos (poduzeća Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Uobičajeno sastavnice za {0} nije pronađen
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Molimo set Ponovno redj količinu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Upis program
 DocType: Landed Cost Voucher,Landed Cost Voucher,Sleteo Cost vaučera
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
@@ -4241,7 +4253,7 @@
 DocType: Maintenance Visit,Maintenance Date,Održavanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,datum početka godine ili datum završetka je preklapaju sa {0}. Da bi se izbjegla molimo vas da postavite kompanija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {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.","Primjer:. ABCD ##### 
  Ako serije je postavljen i serijski broj se ne spominje u transakcijama, a zatim automatski serijski broj će biti kreiran na osnovu ove serije. Ako želite uvijek izričito spomenuti Serial Nos za ovu stavku. ovo ostavite prazno."
@@ -4317,7 +4329,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Trgovina na veliko i
 DocType: Issue,First Responded On,Prvi put odgovorio dana
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Oglas tačke u više grupa
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurira
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4362,14 +4373,14 @@
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnju
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite nekontrolisano ako ne želite uzeti u obzir batch prilikom donošenja grupe naravno na bazi.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost amortizacije (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Sletio Troškovi artikla
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Pokazati nulte 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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup jednostavan website za moju organizaciju
 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 +666,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Molimo navedite vrijednost atributa za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžet se ne može dodijeliti protiv grupe računa {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Unesite roditelj troška
@@ -4412,7 +4423,7 @@
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Iznos kredita
 DocType: Cheque Print Template,Signatory Position,potpisnik Pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Postavi kao Lost
 DocType: Timesheet,Total Billable Hours,Ukupno naplative Hours
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje potvrda o primitku
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ovo se zasniva na transakcije protiv ovog kupaca. Pogledajte vremenski okvir ispod za detalje
@@ -4426,11 +4437,11 @@
 ,Items To Be Requested,Potraživani artikli
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o preduzeću
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Odaberite ili dodati novi kupac
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Odaberite ili dodati novi kupac
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Troška je potrebno rezervirati trošak tvrdnju
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo ovog zaposlenih
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Zaduži račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Zaduži račun
 DocType: Fiscal Year,Year Start Date,Početni datum u godini
 DocType: Attendance,Employee Name,Ime i prezime radnika
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaobljeni Ukupno (Društvo valuta)
@@ -4439,13 +4450,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kupovina Iznos
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavljač Ponuda {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Kraja godine ne može biti prije početka godine
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Molimo podesite default odmor Lista za zaposlenog {0} ili kompanije {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne postoji
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ne postoji
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},No red {0}: Iznos ne može biti veći od čekanju Iznos protiv rashodi potraživanje {1}. Na čekanju iznos je {2}
@@ -4454,15 +4465,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Čvor
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Cjenik nije pronađena ili invaliditetom
 DocType: Employee Loan Application,Approved,Odobreno
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Guardian,Guardian,staratelj
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificirani
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcionalno. Postavlja kompanije Zadana valuta, ako nije navedeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Računovodstvene stavke
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina na Od Skladište
@@ -4471,7 +4484,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: Party / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Zaliha
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenca Vrsta dokumenta mora biti jedan od Narudžbenice, fakturi ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako proizvod varijanta druge stavke onda opis, slike, cijene, poreze itd će biti postavljena iz predloška, osim ako izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Kupnja / Proizvodnja Detalji
@@ -4499,7 +4512,7 @@
 DocType: Hub Settings,Hub Settings,Hub Settings
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvo stavke su već učinjeni u valuti {0} {1} za firmu. Molimo odaberite potraživanja ili platiti račun s valutnom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći imovine
 DocType: Salary Detail,Statistical Component,statistička komponenta
 ,Monthly Salary Register,Mjesečna plaća Registracija
@@ -4522,7 +4535,7 @@
 DocType: Assessment Plan,Room,soba
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Porez artikla
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materijal dobavljaču
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materijal dobavljaču
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Akcizama Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
@@ -4553,9 +4566,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložiti logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Nivoi
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Plaćanje Tip mora biti jedan od Primi, Pay i unutrašnje Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Plaćanje Tip mora biti jedan od Primi, Pay i unutrašnje Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je prazna
 DocType: Vehicle,Model,model
@@ -4566,6 +4579,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite Production o praznicima
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitala
+DocType: Shopping Cart Settings,Show Public Attachments,Pokaži Javna Prilozi
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway računa
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka uplate preusmjeriti korisnika na odabrani stranicu.
@@ -4584,15 +4598,15 @@
 DocType: Batch,Expiry Date,Datum isteka
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 ,accounts-browser,računi pretraživač
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Molimo odaberite kategoriju prvi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Direktor Projekata
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Da biste omogućili nad-naplate ili preko-naručivanje, ažurirati &quot;Ispravka&quot; raspoloživo Settings ili stavku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol poput $ iza valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Slanje poruka Datum mora biti isti kao i datum kupovine {1} od imovine {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Molimo unesite Prodajni nalozi u gornjoj tablici
@@ -4609,7 +4623,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molimo vas da postavljanje broji serija za prisustvo na Setup&gt; numeracije serije
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 ee779d1..63c98eb 100644
--- a/erpnext/translations/ca.csv
+++ b/erpnext/translations/ca.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Llogat
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Aplicable per a l&#39;usuari
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Detingut ordre de producció no es pot cancel·lar, unstop primer per cancel·lar"
 DocType: Vehicle Service,Mileage,quilometratge
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,De veres voleu rebutjar aquest actiu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Tria un proveïdor predeterminat
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Tria un proveïdor predeterminat
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Informa de la divisa pera la Llista de preus {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Es calcularà en la transacció.
 DocType: Purchase Order,Customer Contact,Client Contacte
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excedent per {0} no pot ser menor que zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Per defecte 10 minuts
 DocType: Leave Type,Leave Type Name,Deixa Tipus Nom
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostra oberts
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra oberts
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Sèrie actualitzat correctament
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,caixa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural entrada de diari Enviat
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Lots article Estat de caducitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Lletra bancària
 DocType: Mode of Payment Account,Mode of Payment Account,Mode de Compte de Pagament
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostra variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra variants
 DocType: Academic Term,Academic Term,període acadèmic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantitat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Quantitat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La taula de comptes no pot estar en blanc.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Préstecs (passius)
 DocType: Employee Education,Year of Passing,Any de defunció
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referència:% s, Codi de l&#39;article:% s i el Client:% s"
 DocType: Item,Country of Origin,País d&#39;origen
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En estoc
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,qüestions obertes
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sanitari
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard en el pagament (dies)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,despesa servei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de sèrie: {0} ja es fa referència en factura de venda: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Any fiscal {0} és necessari
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Data de lliurament esperada és sempre davant d&#39;ordres de venda Data
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjunta el fitxer .csv amb dues columnes, una per al nom antic i un altre per al nou nom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en qualsevol any fiscal activa.
 DocType: Packed Item,Parent Detail docname,Docname Detall de Pares
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referència: {0}, Codi de l&#39;article: {1} i el Client: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Sessió
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,L'obertura per a una ocupació.
 DocType: Item Attribute,Increment,Increment
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Seleccioneu Magatzem ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleccioneu Magatzem ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitat
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Obtenir articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No està permès per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Obtenir articles de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},L'estoc no es pot actualitzar contra la Nota de Lliurament {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producte {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hi ha elements que s&#39;enumeren
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Botiga
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Següent Depreciació La data no pot ser anterior a la data de compra
 DocType: SMS Center,All Sales Person,Tot el personal de vendes
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribució mensual ajuda a distribuir el pressupost / Target a través de mesos si té l&#39;estacionalitat del seu negoci.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,No articles trobats
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,No articles trobats
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura salarial
 DocType: Lead,Person Name,Nom de la Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Factura Sales Item
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","per exemple, &quot;escola primària&quot; o &quot;Universitat&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Informes d&#39;arxiu
 DocType: Warehouse,Warehouse Detail,Detall Magatzem
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límit de crèdit s'ha creuat pel client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La data final de durada no pot ser posterior a la data de cap d&#39;any de l&#39;any acadèmic a què està vinculat el terme (any acadèmic {}). Si us plau, corregeixi les dates i torna a intentar-ho."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""És actiu fix"" no pot estar sense marcar, ja que hi ha registre d'actius contra l'element"
 DocType: Vehicle Service,Brake Oil,oli dels frens
 DocType: Tax Rule,Tax Type,Tipus d&#39;Impostos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No té permisos per afegir o actualitzar les entrades abans de {0}
 DocType: BOM,Item Image (if not slideshow),Imatge de l'article (si no hi ha presentació de diapositives)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Hi ha un client amb el mateix nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hora Tarifa / 60) * Temps real de l&#39;Operació
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleccioneu la llista de materials
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Seleccioneu la llista de materials
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost dels articles lliurats
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El dia de festa en {0} no és entre De la data i Fins a la data
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,escoles
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No hi ha registre de vacances trobats per als empleats {0} de {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Si us plau ingressi empresa primer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Si us plau seleccioneu l'empresa primer
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target On
 DocType: BOM,Total Cost,Cost total
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Reclamació Import
 DocType: Employee,Mr,Sr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicar grup de clients que es troba a la taula de grups cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tipus de Proveïdor / distribuïdor
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumible
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,grau
 DocType: Sales Invoice Item,Delivered By Supplier,Lliurat per proveïdor
 DocType: SMS Center,All Contact,Tots els contactes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Ordre de producció ja s&#39;ha creat per a tots els elements amb la llista de materials
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salari Anual
 DocType: Daily Work Summary,Daily Work Summary,Resum diari de Treball
 DocType: Period Closing Voucher,Closing Fiscal Year,Tancant l'Any Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} està congelat
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} està congelat
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Seleccioneu empresa ja existent per a la creació del pla de comptes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despeses d'estoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecciona una destinació de dipòsit
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Entrada Contra
 DocType: Journal Entry Account,Credit in Company Currency,Crèdit en moneda Companyia
 DocType: Delivery Note,Installation Status,Estat d'instal·lació
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vols actualitzar l'assistència? <br> Present: {0} \ <br> Absents: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ Acceptat Rebutjat Quantitat ha de ser igual a la quantitat rebuda per article {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Materials Subministrament primeres per a la Compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Es requereix com a mínim una manera de pagament de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar els productes en forma de llista
 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.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Fer l&#39;entrada de Depreciació
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipus de sol·licitud
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,fer Empleat
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,fer Empleat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifusió
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execució
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Els detalls de les operacions realitzades.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Pla de visites de manteniment.
 DocType: SMS Settings,Enter url parameter for message,Introdueixi paràmetre url per al missatge
 DocType: POS Profile,Customer Groups,Grups de clients
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Estats financers
 DocType: Guardian,Students,els estudiants
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regles per a l'aplicació de preus i descomptes.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Llista de preus ha de ser aplicable per comprar o vendre
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},quantitat d&#39;avanç no pot ser més gran que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Llista de Sèries per a aquesta transacció
 DocType: Company,Default Payroll Payable Account,La nòmina per defecte del compte per pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Grup alerta per correu electrònic
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Grup alerta per correu electrònic
 DocType: Sales Invoice,Is Opening Entry,És assentament d'obertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Esmenteu si compta per cobrar no estàndard aplicable
 DocType: Course Schedule,Instructor Name,nom instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Cal informar del magatzem destí abans de presentar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Rebuda el
 DocType: Sales Partner,Reseller,Revenedor
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si se selecciona, s&#39;inclouran productes no estan en estoc en les sol·licituds de materials."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venda d'articles
 ,Production Orders in Progress,Ordres de producció en Construcció
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectiu net de Finançament
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage està ple, no va salvar"
 DocType: Lead,Address & Contact,Direcció i Contacte
 DocType: Leave Allocation,Add unused leaves from previous allocations,Afegir les fulles no utilitzats de les assignacions anteriors
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Següent Recurrent {0} es crearà a {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Càlcul del cost total Monto (a través de fulla d&#39;hores)
 DocType: Item Website Specification,Item Website Specification,Especificacions d'article al Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absència bloquejada
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,entrades bancàries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Article {0} ha arribat a la seva fi de vida del {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,entrades bancàries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Estoc Reconciliació article
 DocType: Stock Entry,Sales Invoice No,Factura No
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admissió d&#39;Estudiants
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,L'article {0} està cancel·lat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Sol·licitud de materials
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,L'article {0} està cancel·lat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Xecs pendents i Dipòsits per aclarir
 DocType: Item,Synced With Hub,Sincronitzat amb Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Contrasenya Incorrecta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no pot ser negatiu per a l&#39;element {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Contrasenya Incorrecta
 DocType: Item,Variant Of,Variant de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Completat Quantitat no pot ser major que 'Cant de Fabricació'
 DocType: Period Closing Voucher,Closing Account Head,Tancant el Compte principal
 DocType: Employee,External Work History,Historial de treball extern
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referència Circular Error
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificació per correu electrònic a la creació de la Sol·licitud de materials automàtica
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipus de Factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Nota de lliurament
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuració d&#39;Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost d&#39;actiu venut
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
-DocType: Grade Interval,Min Score,puntuació min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrat dues vegades en l'Impost d'article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resum per a aquesta setmana i activitats pendents
 DocType: Student Applicant,Admitted,acceptat
 DocType: Workstation,Rent Cost,Cost de lloguer
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor de l&#39;ordre
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Operacions bancàries / efectiu contra la part que pertanyin a
 DocType: Shipping Rule,Valid for Countries,Vàlid per als Països
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Aquest article és una plantilla i no es pot utilitzar en les transaccions. Atributs article es copiaran en les variants menys que s'estableix 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la comanda Considerat
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designació de l'empleat (per exemple, director general, director, etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Si us plau, introdueixi 'Repetiu el Dia del Mes' valor del camp"
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no es pot fer front a un actiu existent {1}
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ja assignat a empleat {1} per al període {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleccioneu Producte
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Seleccioneu Producte
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Factura de compra {0} ja està Presentada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lot No ha de ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir la no-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lots (lot) d'un element.
 DocType: C-Form Invoice Detail,Invoice Date,Data de la factura
 DocType: GL Entry,Debit Amount,Suma Dèbit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Només pot haver 1 compte per l&#39;empresa en {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Si us plau, vegeu el document adjunt"
 DocType: Purchase Order,% Received,% Rebut
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grups d&#39;estudiants
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Sol · licitud de pressupost
 DocType: Salary Slip Timesheet,Working Hours,Hores de Treball
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Canviar el número de seqüència inicial/actual d'una sèrie existent.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Crear un nou client
-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 hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Crear ordres de compra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Crear un nou client
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si hi ha diverses regles de preus vàlides, es demanarà als usuaris que estableixin la prioritat manualment per resoldre el conflicte."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Crear ordres de compra
 ,Purchase Register,Compra de Registre
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Càrrecs aplicables
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ha de tenir rol 'Aprovador d'absències'
 DocType: Purchase Receipt,Vehicle Date,Data de Vehicles
 DocType: Student Log,Medical,Metge
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motiu de pèrdua
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motiu de pèrdua
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Propietari plom no pot ser la mateixa que la de plom
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,import assignat no pot superar l&#39;import no ajustat
 DocType: Announcement,Receiver,receptor
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantitat i taxa
 DocType: Delivery Note,% Installed,% Instal·lat
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aules / laboratoris, etc., on les conferències es poden programar."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Si us plau introdueix el nom de l'empresa primer
 DocType: Purchase Invoice,Supplier Name,Nom del proveïdor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Llegiu el Manual ERPNext
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Antic Pare
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Camp obligatori - Any Acadèmic
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalitza el text d'introducció que va com una part d'aquest correu electrònic. Cada transacció té un text introductori independent.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Configureu compte per pagar per defecte per a l&#39;empresa {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,La configuració global per a tots els processos de fabricació.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes bloquejats fins a
 DocType: SMS Log,Sent On,Enviar on
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} seleccionat diverses vegades en la taula Atributs
 DocType: HR Settings,Employee record is created using selected field. ,Es crea el registre d'empleat utilitzant el camp seleccionat.
 DocType: Sales Order,Not Applicable,No Aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mestre de vacances.
 DocType: Request for Quotation Item,Required Date,Data Requerit
 DocType: Delivery Note,Billing Address,Direcció De Enviament
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Si us plau, introduïu el codi d'article."
 DocType: BOM,Costing,Costejament
 DocType: Tax Rule,Billing County,Comtat de facturació
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Del paquet número
 DocType: Item Attribute,To Range,Per Abast
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valors i Dipòsits
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No es pot canviar el mètode de valoració, ja que hi ha transaccions en contra d&#39;alguns articles que no tenen el seu propi mètode de valoració"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Fulles totals assignats és obligatori
 DocType: Job Opening,Description of a Job Opening,Descripció d'una oferta de treball
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activitats pendents per avui
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Oficial Administratiu
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Seleccioneu de golf
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Seleccioneu de l&#39;empresa
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Seleccioneu de l&#39;empresa
 DocType: Stock Entry Detail,Difference Account,Compte de diferències
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,No es pot tancar tasca com no tanca la seva tasca depèn {0}.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Si us plau indica el Magatzem en què es faràa la Sol·licitud de materials
 DocType: Production Order,Additional Operating Cost,Cost addicional de funcionament
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Productes cosmètics
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Per fusionar, propietats han de ser el mateix per a tots dos articles"
 DocType: Shipping Rule,Net Weight,Pes Net
 DocType: Employee,Emergency Phone,Telèfon d'Emergència
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,comprar
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Si us plau, defineixi el grau de Llindar 0%"
 DocType: Sales Order,To Deliver,Per Lliurar
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Nº de sèrie article no pot ser una fracció
 DocType: Journal Entry,Difference (Dr - Cr),Diferència (Dr - Cr)
 DocType: Account,Profit and Loss,Pèrdues i Guanys
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Subcontractació Gestió
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Increment no pot ser 0
 DocType: Production Planning Tool,Material Requirement,Requirement de Material
 DocType: Company,Delete Company Transactions,Eliminar Transaccions Empresa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,No de referència i data de referència és obligatòria per a les transaccions bancàries
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Afegeix / Edita les taxes i càrrecs
 DocType: Purchase Invoice,Supplier Invoice No,Número de Factura de Proveïdor
 DocType: Territory,For reference,Per referència
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Nota d'instal·lació de l'article
 DocType: Production Plan Item,Pending Qty,Pendent Quantitat
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} no està actiu
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} no està actiu
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviat als telèfons: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensions de verificació de configuració per a la impressió
 DocType: Salary Slip,Salary Slip Timesheet,Part d&#39;hores de salari de lliscament
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Total Comissió
 DocType: Pricing Rule,Sales Partner,Soci de vendes
 DocType: Buying Settings,Purchase Receipt Required,Es requereix rebut de compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Valoració dels tipus és obligatòria si l&#39;obertura Stock entrar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No es troben en la taula de registres de factures
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Seleccioneu de l'empresa i el Partit Tipus primer
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Exercici comptabilitat /.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Els valors acumulats
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Fes la teva comanda de vendes
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Fes la teva comanda de vendes
 DocType: Project Task,Project Task,Tasca del projecte
 ,Lead Id,Identificador del client potencial
 DocType: C-Form Invoice Detail,Grand Total,Gran Total
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunt currículum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repetiu els Clients
 DocType: Leave Control Panel,Allocate,Assignar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devolucions de vendes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Devolucions de vendes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Els fulls totals assignats {0} no ha de ser inferior a les fulles ja aprovats {1} per al període
 DocType: Announcement,Posted By,Publicat per
 DocType: Item,Delivered by Supplier (Drop Ship),Lliurat pel proveïdor (nau)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,Oferta per
 DocType: Lead,Middle Income,Ingrés Mig
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Obertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Suma assignat no pot ser negatiu
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Si us plau ajust la Companyia
 DocType: Purchase Order Item,Billed Amt,Quantitat facturada
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venda de parts d&#39;hores
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},No de referència i obres de consulta Data es requereix per {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar el compte de pagament per fer l&#39;entrada del Banc
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crear registres dels empleats per gestionar les fulles, les reclamacions de despeses i nòmina"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Afegir a la Base de Coneixement
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Redacció de propostes
 DocType: Payment Entry Deduction,Payment Entry Deduction,El pagament Deducció d&#39;entrada
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no es troba en l'exercici fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Ajustaments del mòdul de Compres
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Actius {0} no pertany a l&#39;empresa {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Si us plau primer entra el rebut de compra
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Si us plau primer entra el rebut de compra
 DocType: Buying Settings,Supplier Naming By,NOmenament de proveïdors per
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Canvi net en l&#39;Inventari
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Administració de Préstecs empleat
 DocType: Employee,Passport Number,Nombre de Passaport
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relació amb Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerent
 DocType: Payment Entry,Payment From / To,El pagament de / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rang de dates
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nou límit de crèdit és menor que la quantitat pendent actual per al client. límit de crèdit ha de ser almenys {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,En qüestió de minuts
 DocType: Issue,Resolution Date,Resolució Data
 DocType: Student Batch Name,Batch Name,Nom del lot
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Part d&#39;hores de creació:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Part d&#39;hores de creació:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Si us plau, estableix pagament en efectiu o Compte bancari predeterminat a la Forma de pagament {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,inscriure
 DocType: Selling Settings,Customer Naming By,Customer Naming By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrarà a l&#39;estudiant com Estudiant Present en informes mensuals d&#39;assistència
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Temps real d'inici
 DocType: BOM Operation,Operation Time,Temps de funcionament
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,acabat
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,base
 DocType: Timesheet,Total Billed Hours,Total d&#39;hores facturades
 DocType: Journal Entry,Write Off Amount,Anota la quantitat
 DocType: Journal Entry,Bill No,Factura Número
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Assistència de l&#39;estudiant
 DocType: Sales Invoice Timesheet,Time Sheet,Horari
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush matèries primeres Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Entra els detalls de l'article
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Entra els detalls de l'article
 DocType: Interest,Interest,interès
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,abans de la compra
 DocType: Purchase Receipt,Other Details,Altres detalls
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Ja està creat Entrada Pagament
 DocType: Purchase Receipt Item Supplied,Current Stock,Estoc actual
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Actius no vinculat a l&#39;element {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Salari vista prèvia de lliscament
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Salari vista prèvia de lliscament
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Compte {0} s&#39;ha introduït diverses vegades
 DocType: Account,Expenses Included In Valuation,Despeses incloses en la valoració
 DocType: Hub Settings,Seller City,Ciutat del venedor
 ,Absent Student Report,Informe de l&#39;alumne absent
 DocType: Email Digest,Next email will be sent on:,El següent correu electrònic s'enviarà a:
 DocType: Offer Letter Term,Offer Letter Term,Present Carta Termini
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,L&#39;article té variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Companyia {0} no existeix
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tipus Arbre
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tipus Arbre
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Quantitat consumida per unitat
 DocType: Serial No,Warranty Expiry Date,Data final de garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantitat i Magatzem
 DocType: Sales Invoice,Commission Rate (%),Comissió (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través d&#39;Configuració&gt; Configuració&gt; Sèrie Naming
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccioneu Programa
 DocType: Project,Estimated Cost,cost estimat
 DocType: Purchase Order,Link to material requests,Enllaç a les sol·licituds de materials
@@ -754,7 +757,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Quantitat rebuda (Companyia de divises)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,S'ha d'indicar el client potencial si la oportunitat té el seu origen en un client potencial
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Si us plau seleccioni el dia lliure setmanal
 DocType: Production Order Operation,Planned End Time,Planificació de Temps Final
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Variance Item Group-Wise
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Oportunitat De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nòmina mensual.
 DocType: BOM,Website Specifications,Especificacions del lloc web
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través d&#39;Configuració&gt; sèries de numeració
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Des {0} de tipus {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Fila {0}: el factor de conversió és obligatori
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,Número de Compte Corrent
 DocType: Bank Guarantee,Project,Projecte
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,parcialment ordenat
 DocType: Expense Claim Detail,Expense Claim Type,Expense Claim Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustos predeterminats del Carro de Compres
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Actius rebutjat a través d&#39;entrada de diari {0}
@@ -830,14 +835,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Despeses de manteniment d'oficines
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuració de comptes de correu electrònic
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Si us plau entra primer l'article
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Si us plau entra primer l'article
 DocType: Account,Liability,Responsabilitat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Import sancionat no pot ser major que la reclamació Quantitat a la fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Cost per defecte del compte mercaderies venudes
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Llista de preus no seleccionat
 DocType: Employee,Family Background,Antecedents de família
 DocType: Request for Quotation Supplier,Send Email,Enviar per correu electrònic
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advertència: no vàlida Adjunt {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,No permission
 DocType: Company,Default Bank Account,Compte bancari per defecte
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrar la base de la festa, seleccioneu Partit Escrigui primer"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No s'ha trobat cap empeat
 DocType: Supplier Quotation,Stopped,Detingut
 DocType: Item,If subcontracted to a vendor,Si subcontractat a un proveïdor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grup d&#39;alumnes ja està actualitzat.
 DocType: SMS Center,All Customer Contact,Contacte tot client
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Puja saldo d'existències a través csv.
 DocType: Warehouse,Tree Details,Detalls de l&#39;arbre
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Volum mínim Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centre de cost {2} no pertany a l&#39;empresa {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Compte {2} no pot ser un grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Element Fila {} idx: {} {DOCTYPE docname} no existeix en l&#39;anterior &#39;{} tipus de document&#39; taula
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Part d&#39;hores {0} ja s&#39;hagi completat o cancel·lat
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hi ha tasques
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","El dia del mes en què es generarà factura acte per exemple 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,L&#39;obertura de la depreciació acumulada
@@ -878,7 +883,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} contra Factura {1} {2} de data
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Horari del curs
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horari del curs
 DocType: Maintenance Visit,Completion Status,Estat de finalització
 DocType: HR Settings,Enter retirement age in years,Introdueixi l&#39;edat de jubilació en anys
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magatzem destí
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permetre sobre el lliurament o recepció fins aquest percentatge
 DocType: Stock Entry,STE-,Stephen
 DocType: Upload Attendance,Import Attendance,Importa Assistència
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tots els grups d'articles
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tots els grups d'articles
 DocType: Process Payroll,Activity Log,Registre d'activitat
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Guany/Pèrdua neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compondre automàticament el missatge en la presentació de les transaccions.
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordre de compra de Pagament
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Quantitat projectada
 DocType: Sales Invoice,Payment Due Date,Data de pagament
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Article Variant {0} ja existeix amb els mateixos atributs
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Obertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Obert a fer
 DocType: Notification Control,Delivery Note Message,Missatge de la Nota de lliurament
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Quantitat
 DocType: Leave Block List Date,Leave Block List Date,Deixa Llista de bloqueig Data
 DocType: Pricing Rule,Price or Discount,Preu o Descompte
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total d&#39;comissions aplicables en la compra Taula de rebuts Els articles han de ser iguals que les taxes totals i càrrecs
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total d&#39;comissions aplicables en la compra Taula de rebuts Els articles han de ser iguals que les taxes totals i càrrecs
 DocType: Sales Team,Incentives,Incentius
 DocType: SMS Log,Requested Numbers,Números sol·licitats
 DocType: Production Planning Tool,Only Obtain Raw Materials,Només obtenció de matèries primeres
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Es subcontracta
 DocType: Item Attribute,Item Attribute Values,Element Valors d'atributs
 DocType: Examination Result,Examination Result,examen Resultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Albarà de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Albarà de compra
 ,Received Items To Be Billed,Articles rebuts per a facturar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,nòmines presentades
 DocType: Employee,Ms,Sra
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Tipus de canvi principal.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referència Doctype ha de ser un {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referència Doctype ha de ser un {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Incapaç de trobar la ranura de temps en els pròxims {0} dies per a l&#39;operació {1}
 DocType: Production Order,Plan material for sub-assemblies,Material de Pla de subconjunts
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Punts de venda i Territori
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,No es pot crear automàticament del compte com ja hi ha saldo d&#39;existències en compte. Ha de crear un compte de joc abans de poder realitzar una entrada en aquest magatzem
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Comptes per Pagar per defecte
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,L'Empleat {0} no està actiu o no existeix
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Article Variants {0} actualitza
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Si us plau, introdueixi categoria d&#39;actius en el punt {0}"
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,No es pot {0} {1} {2} sense cap factura pendent negatiu
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Hub Settings,Sync Now,Sincronitza ara
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: entrada de crèdit no pot vincular amb un {1}
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,És Compra d'articles
 DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Número de detall del comprovant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nova factura de venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nova factura de venda
 DocType: Stock Entry,Total Outgoing Value,Valor Total sortint
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d&#39;obertura ha de ser dins el mateix any fiscal
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Data i Data de Tancament d&#39;obertura ha de ser dins el mateix any fiscal
 DocType: Lead,Request for Information,Sol·licitud d'Informació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Les factures sincronització sense connexió
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Les factures sincronització sense connexió
 DocType: Payment Request,Paid,Pagat
 DocType: Program Fee,Program Fee,tarifa del programa
 DocType: Salary Slip,Total in words,Total en paraules
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;."
 DocType: Job Opening,Publish on website,Publicar al lloc web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Enviaments a clients.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveïdor La data no pot ser major que la data de publicació
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Desacord
 ,Company Name,Nom de l'Empresa
 DocType: SMS Center,Total Message(s),Total Missatge(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Seleccionar element de Transferència
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Defecte del compte bancari / efectiu s&#39;actualitzarà automàticament en el Salari entrada de diari quan es selecciona aquesta manera.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Els intervals de Codi Grau {0} es superposa amb els intervals de grau per als altres graus. Gràcies per confirmar intervals {0} i {1} i torneu a provar
 DocType: BOM,Raw Material Cost(Company Currency),Prima Cost de Materials (Companyia de divises)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Fila # {0}: taxa no pot ser més gran que la taxa utilitzada en {1} {2}
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM lloc web d&#39;articles
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Puja el teu cap lletra i logotip. (Pots editar més tard).
 DocType: Timesheet Detail,Bill,projecte de llei
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La depreciació propera data s&#39;introdueix com a data passada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanc
 DocType: SMS Center,All Lead (Open),Tots els clients potencials (Obert)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Quantitat no està disponible per {4} al magatzem {1} a publicar moment de l&#39;entrada ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtenir bestretes pagades
 DocType: Item,Automatically Create New Batch,Crear nou lot de forma automàtica
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Fer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Fer
 DocType: Student Admission,Admission Start Date,L&#39;entrada Data d&#39;Inici
 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."
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Si us plau, introdueixi el compte per al Canvi Monto"
 DocType: Student Batch Name,Student Batch Name,Lot Nom de l&#39;estudiant
 DocType: Holiday List,Holiday List Name,Nom de la Llista de vacances
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del Préstec Monto
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Si us plau especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elements retirats sense canvi en la quantitat o el valor.
 DocType: Delivery Note,Delivery To,Lliurar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Taula d&#39;atributs és obligatori
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taula d&#39;atributs és obligatori
 DocType: Production Planning Tool,Get Sales Orders,Rep ordres de venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no pot ser negatiu
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Descompte
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Descompte
 DocType: Asset,Total Number of Depreciations,Nombre total d&#39;amortitzacions
 DocType: Sales Invoice Item,Rate With Margin,Amb la taxa de marge
 DocType: Workstation,Wages,Salari
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Magatzem Reservat a Ordres de venda / Magatzem de productes acabats
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Quantitat de Venda
 DocType: Repayment Schedule,Interest Amount,Suma d&#39;interès
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Ets l'aprovador de despeses per a aquest registre. Actualitza l '""Estat"" i Desa"
 DocType: Serial No,Creation Document No,Creació document nº
 DocType: Issue,Issue,Incidència
 DocType: Asset,Scrapped,rebutjat
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributs per Punt variants. per exemple, mida, color, etc."
 DocType: Purchase Invoice,Returns,les devolucions
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Magatzem
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} està sota contracte de manteniment fins {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,reclutament
 DocType: Lead,Organization Name,Nom de l'organització
 DocType: Tax Rule,Shipping State,Estat de l&#39;enviament
 ,Projected Quantity as Source,Quantitat projectada com Font
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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ó
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incloure elements no estan en estoc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Despeses de venda
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Per defecte Centre de Cost de Venda
 DocType: Sales Partner,Implementation Partner,Soci d'Aplicació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Codi ZIP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Codi ZIP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Vendes Sol·licitar {0} és {1}
 DocType: Opportunity,Contact Info,Informació de Contacte
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Fer comentaris Imatges
 DocType: Packing Slip,Net Weight UOM,Pes net UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Resultats
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Resultats
 DocType: Item,Default Supplier,Per defecte Proveïdor
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Sobre Producció Assignació Percentatge
 DocType: Employee Loan,Repayment Schedule,Calendari de reemborsament
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Dates
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de finalització no pot ser inferior a data d'inici
 DocType: Sales Person,Select company name first.,Seleccioneu el nom de l'empresa en primer lloc.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ofertes rebudes dels proveïdors.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edat mitjana
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Àrea Clau d'Acompliment
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transports
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut no vàlid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} s'ha de Presentar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} s'ha de Presentar
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantitat ha de ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Personatges totals
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Seleccioneu la llista de materials en el camp de llista de materials per al punt {0}
@@ -1152,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',"Si us plau, estableix &quot;Aplicar descompte addicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,De Gamma ha de ser menor que en la nostra gamma
 DocType: Global Defaults,Global Defaults,Valors per defecte globals
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Any d&#39;inici
 DocType: Purchase Invoice,Start date of current invoice's period,Data inicial del període de facturació actual
 DocType: Salary Slip,Leave Without Pay,Absències sense sou
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Planificació de la capacitat d&#39;error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Això s'afegeix al Codi de l'article de la variant. Per exemple, si la seva abreviatura és ""SM"", i el codi de l'article és ""samarreta"", el codi de l'article de la variant serà ""SAMARRETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,El sou net (en paraules) serà visible un cop que es guardi la nòmina.
 DocType: Purchase Invoice,Is Return,És la tornada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retorn / dèbit Nota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retorn / dèbit Nota
 DocType: Price List Country,Price List Country,Preu de llista País
 DocType: Item,UOMs,UOMS
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} amb números de sèrie vàlids per Punt {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Si us plau, introdueixi el codi d&#39;article per obtenir el nombre de lot"
 DocType: Stock Settings,Default Item Group,Grup d'articles predeterminat
 DocType: Employee Loan,Partially Disbursed,parcialment Desemborsament
-DocType: Grading Structure,Grading System Name,Nom del sistema de classificació
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de dades de proveïdors.
 DocType: Account,Balance Sheet,Balanç
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centre de cost per l'article amb Codi d'article '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode de pagament no està configurat. Si us plau, comproveu, si el compte s&#39;ha establert en la manera de pagament o en punts de venda perfil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,La seva persona de vendes es posarà un avís en aquesta data per posar-se en contacte amb el client
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mateix article no es pot introduir diverses vegades.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Altres comptes es poden fer en grups, però les entrades es poden fer contra els no Grups"
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Ordre de Compra articles a facturar
 DocType: Purchase Invoice Item,Net Rate,Taxa neta
 DocType: Purchase Invoice Item,Purchase Invoice Item,Compra Factura article
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Les entrades d'ajust d'estocs i les entrades de GL estan inserits en els rebuts de compra seleccionats
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Les entrades d'ajust d'estocs i les entrades de GL estan inserits en els rebuts de compra seleccionats
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
 DocType: Holiday,Holiday,Festiu
 DocType: Support Settings,Close Issue After Days,Tancar Problema Després Dies
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Treballs Realitzats
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Si us plau, especifiqui almenys un atribut a la taula d&#39;atributs"
 DocType: Announcement,All Students,tots els alumnes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} ha de ser una posició no de magatzem
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Veure Ledger
 DocType: Grading Scale,Intervals,intervals
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Earliest
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Hi ha un grup d'articles amb el mateix nom, si us plau, canvieu el nom de l'article o del grup d'articles"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nº d&#39;Estudiants mòbil
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},El pagament del salari de {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Vendes Sol·licitar {0} no és vàlid
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Les ordres de compra li ajudarà a planificar i donar seguiment a les seves compres
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Ho sentim, les empreses no poden fusionar-"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantitat total d&#39;emissió / Transferència {0} en la Sol·licitud de material {1} \ no pot ser major que la quantitat sol·licitada {2} per a l&#39;article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Despeses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Quantitat és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronització de dades mestres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sincronització de dades mestres
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Lloc web imatge ha de ser un arxiu públic o URL del lloc web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,This is a root item group and cannot be edited.
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Nombre Rotllo Grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, només els comptes de crèdit es poden vincular amb un altre seient de dèbit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de tots els pesos de tasques ha de ser 1. Si us plau ajusta els pesos de totes les tasques del projecte en conseqüència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,La Nota de lliurament {0} no està presentada
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regla preus es selecciona per primera basada en 'Aplicar On' camp, que pot ser d'article, grup d'articles o Marca."
 DocType: Hub Settings,Seller Website,Venedor Lloc Web
 DocType: Item,ITEM-,ARTICLE-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,El Percentatge del total assignat per a l'equip de vendes ha de ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Estat de l'ordre de producció és {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Estat de l'ordre de producció és {0}
 DocType: Appraisal Goal,Goal,Meta
 DocType: Sales Invoice Item,Edit Description,Descripció
 ,Team Updates,actualitzacions equip
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Per Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Format d&#39;impressió
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Entrada de diari
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articles en procés
 DocType: Workstation,Workstation Name,Nom de l'Estació de treball
-DocType: Grade Interval,Grade Code,codi grau
+DocType: Grading Scale Interval,Grade Code,codi grau
 DocType: POS Item Group,POS Item Group,POS Grup d&#39;articles
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar Resum:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} no pertany a Punt {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Maquinari
 DocType: Sales Order,Recurring Upto,Fins que es repeteix
 DocType: Attendance,HR Manager,Gerent de Recursos Humans
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Seleccioneu una Empresa
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Seleccioneu una Empresa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Data Factura Proveïdor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Has d'habilitar el carro de la compra
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Menjar
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rang 3 Envelliment
 DocType: Maintenance Schedule Item,No of Visits,Número de Visites
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marc Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Marc Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Programa de manteniment {0} existeix en contra de {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,estudiant que s&#39;inscriu
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Divisa del compte de clausura ha de ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de punts per a totes les metes ha de ser 100. És {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Mitjana diària sortint
 DocType: POS Profile,Campaign,Campanya
 DocType: Supplier,Name and Type,Nom i Tipus
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Estat d'aprovació ha de ser ""Aprovat"" o ""Rebutjat"""
 DocType: Purchase Invoice,Contact Person,Persona De Contacte
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',La 'Data Prevista d'Inici' no pot ser major que la 'Data de Finalització Prevista'
 DocType: Course Scheduling Tool,Course End Date,Curs Data de finalització
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adreça d'enviament
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,no pot ser major que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Article {0} no és un article d'estoc
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,no pot ser major que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Article {0} no és un article d'estoc
 DocType: Maintenance Visit,Unscheduled,No programada
 DocType: Employee,Owned,Propietat de
 DocType: Salary Detail,Depends on Leave Without Pay,Depèn de la llicència sense sou
 DocType: Pricing Rule,"Higher the number, higher the priority","Més gran sigui el nombre, més gran és la prioritat"
 ,Purchase Invoice Trends,Tendències de les Factures de Compra
 DocType: Employee,Better Prospects,Millors perspectives
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lot {1} té solament {2} Quant. Si us plau seleccioni un altre lot que té {3} Cant disponible o dividir la fila en diverses files, per lliurar / tema des de diversos lots"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objectius
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estat de l'AMC
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleat no pot informar-se a si mateix.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si el compte està bloquejat, només es permeten entrades alguns usuaris."
 DocType: Email Digest,Bank Balance,Balanç de Banc
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entrada de Comptabilitat per a {0}: {1} només pot fer-se en moneda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil del lloc, formació necessària, etc."
 DocType: Journal Entry Account,Account Balance,Saldo del compte
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regla fiscal per a les transaccions.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra P &amp; L saldos sense tancar l&#39;exercici fiscal
 DocType: Shipping Rule,Shipping Account,Compte d'Enviaments
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Compte {2} està inactiu
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Fan comandes de client per ajudar-lo a planificar el seu treball i lliurament del temps de funcionament
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Fan comandes de client per ajudar-lo a planificar el seu treball i lliurament del temps de funcionament
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total de despeses addicionals
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Per Valor
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Llista de presència
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Llista de presència
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,lloguer de l'oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Paràmetres de configuració de Porta de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Error en importar!
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Serveis
 DocType: HR Settings,Email Salary Slip to Employee,Enviar correu electrònic am salari a l'empleat
 DocType: Cost Center,Parent Cost Center,Centre de Cost de Pares
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Seleccionar Possible Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Seleccionar Possible Proveïdor
 DocType: Sales Invoice,Source,Font
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra tancada
 DocType: Leave Type,Is Leave Without Pay,Es llicencia sense sou
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoria actiu és obligatori per a la partida de l&#39;actiu fix
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No hi ha registres a la taula de Pagaments
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Aquest {0} conflictes amb {1} de {2} {3}
 DocType: Student Attendance Tool,Students HTML,Els estudiants HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Data de baixa
 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/utilities/activation.py +64,Create Leads,crear Vendes
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,crear Vendes
 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
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Les inscripcions del programa
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalls Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Es requereix dipòsit per omissió per a l&#39;element seleccionat
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caixa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,possible Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,possible Proveïdor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L'Organització
 DocType: Budget,Monthly Distribution,Distribució Mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La llista de receptors és buida. Si us plau, crea la Llista de receptors"
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,La quantitat màxima del préstec
 DocType: Pricing Rule,Pricing Rule,Regla preus
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},nombre de rotllo duplicat per a l&#39;estudiant {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acció Si el pressupost anual va superar
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Sol·licitud de materials d&#39;Ordre de Compra
 DocType: Shopping Cart Settings,Payment Success URL,Pagament URL Èxit
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,Mètode d&#39;amortització
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si se selecciona, la pàgina d&#39;inici serà el grup per defecte de l&#39;article per al lloc web"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM per defecte per {0} no trobat per a Projecte {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM per defecte per {0} no trobat per a Projecte {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Les reclamacions per compte de l'empresa.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Els estudiants estan en el cor del sistema, se sumen tots els seus estudiants"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Els estudiants estan en el cor del sistema, se sumen tots els seus estudiants"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: data de liquidació {1} no pot ser anterior Xec Data {2}
 DocType: Company,Default Holiday List,Per defecte Llista de vacances
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del temps i Temps de {1} es solapen amb {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El dia (s) en el qual està sol·licitant la llicència són els dies festius. Vostè no necessita sol·licitar l&#39;excedència.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Torneu a enviar el pagament per correu electrònic
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nova tasca
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Fer Cita
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Fer Cita
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,altres informes
 DocType: Dependent Task,Dependent Task,Tasca dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de conversió per a la unitat de mesura per defecte ha de ser d'1 a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Una absència del tipus {0} no pot ser de més de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Intenta operacions per a la planificació de X dies d&#39;antelació.
 DocType: HR Settings,Stop Birthday Reminders,Aturar recordatoris d'aniversari
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Si us plau, estableix nòmina compte per pagar per defecte en l&#39;empresa {0}"
 DocType: SMS Center,Receiver List,Llista de receptors
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,cerca article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,cerca article
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantitat consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Canvi Net en Efectiu
 DocType: Assessment Plan,Grading Scale,Escala de Qualificació
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ja acabat
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,La unitat de mesura {0} s'ha introduït més d'una vegada a la taula de valors de conversió
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ja acabat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Sol·licitud de pagament ja existeix {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost d'articles Emeses
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},La quantitat no ha de ser més de {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Fer l&#39;entrada de desemborsament
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avanç contra el Proveïdor ha de afeblir
 DocType: Company,Default Values,Valors Predeterminats
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} La freqüència Digest
 DocType: Expense Claim,Total Amount Reimbursed,Suma total reemborsat
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Això es basa en els registres contra aquest vehicle. Veure cronologia avall per saber més
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,recollir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contra Proveïdor Factura {0} {1} datat
 DocType: Customer,Default Price List,Llista de preus per defecte
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,registrar el moviment d&#39;actius {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No es pot eliminar l&#39;any fiscal {0}. Any fiscal {0} s&#39;estableix per defecte en la configuració global
 DocType: Journal Entry,Entry Type,Tipus d&#39;entrada
 ,Customer Credit Balance,Saldo de crèdit al Client
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,obtenció
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Cap dels articles tenen qualsevol canvi en la quantitat o el valor.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Camp obligatori - Programa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Reclamació de la Garantia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamació de la Garantia
 ,Lead Details,Detalls del client potencial
 DocType: Salary Slip,Loan repayment,reemborsament dels préstecs
 DocType: Purchase Invoice,End date of current invoice's period,Data de finalització del període de facturació actual
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Adreça Permanent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Seleccioneu el codi de l'article
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Seleccioneu el codi de l'article
 DocType: Student Sibling,Studying in Same Institute,Estudiar en el mateix Institut
 DocType: Territory,Territory Manager,Gerent de Territory
 DocType: Packed Item,To Warehouse (Optional),Per magatzems (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Suma Pagat (Companyia moneda)
 DocType: Purchase Invoice,Additional Discount,Descompte addicional
 DocType: Selling Settings,Selling Settings,La venda d'Ajustaments
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,veure Cistella
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despeses de Màrqueting
 ,Item Shortage Report,Informe d'escassetat d'articles
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","S'esmenta Pes, \n Si us plau, ""Pes UOM"" massa"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Sol·licitud de material utilitzat per fer aquesta entrada Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciació propera data és obligatori per als nous actius
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grup basat curs separat per a cada lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitat individual d'un article
 DocType: Fee Category,Fee Category,Fee Categoria
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: es requereix de centres de cost de &#39;pèrdues i guanys&#39; compte {2}. Si us plau, establir un centre de cost per defecte per a la Companyia."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nou contacte
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lectura 2
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Tema-savi Vendes Registre
 DocType: Asset,Gross Purchase Amount,Compra import brut
 DocType: Asset,Depreciation Method,Mètode de depreciació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,desconnectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,desconnectat
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Aqeust impost està inclòs a la tarifa bàsica?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totals de l'objectiu
 DocType: Program Course,Required,necessari
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliació JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Massa columnes. Exporta l'informe i utilitza una aplicació de full de càlcul.
 DocType: Purchase Invoice Item,Batch No,Lot número
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},No es pot trobar el tipus de canvi per a {0} a {1} per a la data clau {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permetre diverses ordres de venda en contra d&#39;un client Ordre de Compra
 DocType: Student Group Instructor,Student Group Instructor,Instructor grup d&#39;alumnes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Sense Guardian2 mòbil
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Inici
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Inici
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establir prefix de numeracions seriades a les transaccions
 DocType: Employee Attendance Tool,Employees HTML,Els empleats HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Per defecte la llista de materials ({0}) ha d&#39;estar actiu per aquest material o la seva plantilla
 DocType: Employee,Leave Encashed?,Leave Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitat de camp és obligatori
 DocType: Email Digest,Annual Expenses,Les despeses anuals
 DocType: Item,Variants,Variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Feu l'Ordre de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Feu l'Ordre de Compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},There is not enough leave balance for Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto assignat
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Del client Codi de l'article
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliació d'Estoc
 DocType: Territory,Territory Name,Nom del Territori
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Es requereix Magatzem de treballs en procés abans de Presentar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sol·licitant d'ocupació.
 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
 DocType: Item,Serial Nos and Batches,Nº de sèrie i lots
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Força grup d&#39;alumnes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Contra Diari entrada {0} no té cap {1} entrada inigualable
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxacions
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,intervals de qualificació
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Si us plau, entra"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No es pot cobrar massa a Punt de {0} a la fila {1} més {2}. Per permetre que l&#39;excés de facturació, si us plau, defineixi en la compra d&#39;Ajustaments"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Si us plau, configurar el filtre basada en l&#39;apartat o Magatzem"
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} ha de ser presentat
 DocType: Authorization Control,Authorization Control,Control d'Autorització
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Magatzem Rebutjat és obligatori en la partida rebutjada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagament
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionar les seves comandes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pagament
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionar les seves comandes
 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ó
 DocType: Course,Course Abbreviation,Abreviatura de golf
 DocType: Student Leave Application,Student Leave Application,Aplicació Deixar estudiant
 DocType: Item,Will also apply for variants,També s'aplicarà per a les variants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Actiu no es pot cancel·lar, com ja ho és {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleat {0} del mig dia del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total d&#39;hores de treball no han de ser més grans que les hores de treball max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,En
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articles agrupats en el moment de la venda.
 DocType: Quotation Item,Actual Qty,Actual Quantitat
 DocType: Sales Invoice Item,References,Referències
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Has introduït articles duplicats. Si us plau, rectifica-ho i torna a intentar-ho."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associat
 DocType: Asset Movement,Asset Movement,moviment actiu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nou carro
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,nou carro
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Article {0} no és un article serialitzat
 DocType: SMS Center,Create Receiver List,Crear Llista de receptors
 DocType: Vehicle,Wheels,rodes
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creació de registres de temps en contra de les ordres de fabricació. Les operacions no seran objecte de seguiment contra l&#39;Ordre de Producció
 DocType: Student,Student Mobile Number,Nombre mòbil Estudiant
 DocType: Item,Has Variants,Té variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ja ha seleccionat articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Distribució Mensual
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identificació del lot és obligatori
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identificació del lot és obligatori
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Factura Recurrent
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestió de Projectes
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Any Fiscal
 DocType: Vehicle Log,Fuel Price,Preu del combustible
 DocType: Budget,Budget,Pressupost
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Actius Fixos L&#39;article ha de ser una posició no de magatzem.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Pressupost no es pot assignar en contra {0}, ja que no és un compte d&#39;ingressos o despeses"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Aconseguit
 DocType: Student Admission,Application Form Route,Ruta Formulari de Sol·licitud
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Localitat / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Localitat / Client
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,per exemple 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Deixa Tipus {0} no pot ser assignat ja que es deixa sense paga
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: quantitat assignada {1} ha de ser menor o igual a quantitat pendent de facturar {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Estat del número de sèrie
 DocType: Payment Entry Reference,Outstanding,Excepcional
 ,Daily Timesheet Summary,Resum diari d&#39;hores
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: 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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Això es basa en el moviment de valors. Veure {0} per a més detalls
 DocType: Pricing Rule,Selling,Vendes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Suma {0} {1} presenta disminuint {2}
 DocType: Employee,Salary Information,Informació sobre sous
 DocType: Sales Person,Name and Employee ID,Nom i ID d'empleat
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Data de venciment no pot ser anterior Data de comptabilització
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Taxes i impostos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Si us plau, introduïu la data de referència"
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,No es pot fer referència número de la fila superior o igual al nombre de fila actual d'aquest tipus de càrrega
 DocType: Asset,Sold,venut
 ,Item-wise Purchase History,Historial de compres d'articles
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Si us plau, feu clic a ""Generar Planificació 'per reservar números de sèrie per l'article {0}"
 DocType: Account,Frozen,Bloquejat
 ,Open Production Orders,Obertes les ordres de producció
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Import base (Companyia de divises)
 DocType: Payment Reconciliation Payment,Reference Row,referència Fila
 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 +70,Delete all the Transactions for this Company,Eliminar totes les transaccions per aquesta empresa
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Inversions
 DocType: Issue,Resolution Details,Resolució Detalls
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,discussió
 DocType: Payment Entry,Transaction ID,ID de transacció
 DocType: Employee,Resignation Letter Date,Carta de renúncia Data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regles de les tarifes es filtren més basat en la quantitat.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Si us plau ajust la data d&#39;incorporació dels empleats {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Facturació quantitat total (a través de fulla d&#39;hores)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetiu els ingressos dels clients
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ha de tenir rol 'aprovador de despeses'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Parell
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Seleccioneu la llista de materials i d&#39;Unitats de Producció
 DocType: Asset,Depreciation Schedule,Programació de la depreciació
 DocType: Bank Reconciliation Detail,Against Account,Contra Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Mig dia de la data ha d&#39;estar entre De la data i Fins a la data
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ajust &#39;Centre de l&#39;amortització del cost de l&#39;actiu&#39; a l&#39;empresa {0}
 ,Maintenance Schedules,Programes de manteniment
 DocType: Task,Actual End Date (via Time Sheet),Data de finalització real (a través de fulla d&#39;hores)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Suma {0} {1} {2} contra {3}
 ,Quotation Trends,Quotation Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grup L'article no esmenta en mestre d'articles per a l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,A l'espera de l'Import
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversió
 DocType: Purchase Order,Delivered,Alliberat
 ,Vehicle Expenses,Les despeses de vehicles
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
+DocType: Serial No,Invoice Details,Detalls de la factura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valor esperat després de la vida útil ha de ser major o igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Nombre de vehicles
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data en què s'atura la factura recurrent
 DocType: Employee Loan,Loan Amount,Total del préstec
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,taula de temps
 DocType: HR Settings,HR Settings,Configuració de recursos humans
 DocType: Salary Slip,net pay info,Dades de la xarxa de pagament
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Les noves despeses
 DocType: Purchase Invoice,Additional Discount Amount,Import addicional de descompte
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Quantitat ha de ser 1, com a element és un actiu fix. Si us plau, utilitzeu fila separada per al qty múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Leave Block List Allow
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,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 +276,Abbr can not be blank or space,Abbr no pot estar en blanc o l&#39;espai
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup de No-Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esports
 DocType: Loan Type,Loan Name,Nom del préstec
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Captació i Fidelització
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magatzem en què es desen les existències dels articles rebutjats
 DocType: Production Order,Skip Material Transfer,Saltar de transferència de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"No s&#39;ha pogut trobar el tipus de canvi per a {0} a {1} per a la data clau {2}. Si us plau, crear un registre de canvi manual"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,El seu exercici acaba el
 DocType: POS Profile,Price List,Llista de preus
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} és ara l'Any Fiscal.oer defecte Si us plau, actualitzi el seu navegador perquè el canvi tingui efecte."
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Compte {0} no és vàlid. Compte moneda ha de ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Es requereix el factor de conversió de la UOM a la fila {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser una d&#39;ordres de venda, factura de venda o entrada de diari"
 DocType: Salary Component,Deduction,Deducció
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del temps i el temps és obligatori.
 DocType: Stock Reconciliation Item,Amount Difference,diferència suma
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Article Preu afegit per {0} en Preu de llista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Introdueixi Empleat Id d&#39;aquest venedor
 DocType: Territory,Classification of Customers by region,Classificació dels clients per regió
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferència La quantitat ha de ser zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Diferència La quantitat ha de ser zero
 DocType: Project,Gross Margin,Marge Brut
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Si us plau indica primer l'Article a Producció
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat equilibri extracte bancari
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,desactivat usuari
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Oferta
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Oferta
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducció total
 ,Production Analytics,Anàlisi de producció
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,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 +210,Warning: Invalid SSL certificate on attachment {0},Avís: certificat SSL no vàlid en la inclinació {0}
 DocType: Student Admission,Eligibility,Elegibilitat
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Cables ajuden a obtenir negoci, posar tots els seus contactes i més com els seus clients potencials"
 DocType: Production Order Operation,Actual Operation Time,Temps real de funcionament
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuari)
 DocType: Purchase Taxes and Charges,Deduct,Deduir
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,Direcció del treball
 DocType: Appraisal,Calculate Total Score,Calcular Puntuació total
 DocType: Request for Quotation,Manufacturing Manager,Gerent de Fàbrica
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},El número de sèrie {0} està en garantia fins {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de lliurament en paquets.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Els enviaments
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,saldo del compte ({0}) per {1} i valor de les accions ({2}) per al magatzem {3} ha de ser igual
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Dies totals d'absències
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correu electrònic no serà enviat als usuaris amb discapacitat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d&#39;Interacció
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleccioneu l'empresa ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccioneu l'empresa ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixar en blanc si es considera per a tots els departaments
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipus d'ocupació (permanent, contractats, intern etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} és obligatori per l'article {1}
 DocType: Process Payroll,Fortnightly,quinzenal
 DocType: Currency Exchange,From Currency,De la divisa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Companyia moneda)
 DocType: Student Guardian,Others,Altres
 DocType: Payment Entry,Unallocated Amount,Suma sense assignar
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Si no troba un article a joc. Si us plau seleccioni un altre valor per {0}.
 DocType: POS Profile,Taxes and Charges,Impostos i càrrecs
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producte o un servei que es compra, es ven o es manté en estoc."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hi ha més actualitzacions
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No es pot seleccionar el tipus de càrrega com 'Suma de la fila anterior' o 'Total de la fila anterior' per la primera fila
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Nen Article no ha de ser un paquet de productes. Si us plau remoure l&#39;article `` {0} i guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Afegir parts d&#39;hores
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Afegir parts d&#39;hores
 DocType: Vehicle Service,Service Item,servei d&#39;articles
 DocType: Bank Guarantee,Bank Guarantee,garantia bancària
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Si us plau, feu clic a ""Generar la Llista d'aconseguir horari"
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} d&#39;actius ja és {2}
 DocType: Quotation Item,Stock Balance,Saldos d'estoc
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ordres de venda al Pagament
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Si us plau ajust de denominació de la sèrie de {0} a través d&#39;Configuració&gt; Configuració&gt; Sèrie Naming
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Reclamació de detall de despesa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Seleccioneu el compte correcte
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Els preus no es mostren si la llista de preus no s&#39;ha establert
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Si us plau, especifiqui un país d&#39;aquesta Regla de la tramesa o del check Enviament mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total entrant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Es requereix dèbit per
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Es requereix dèbit per
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Taula de temps ajuden a mantenir la noció del temps, el cost i la facturació d&#39;activitats realitzades pel seu equip"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Llista de preus de Compra
 DocType: Offer Letter Term,Offer Term,Oferta Termini
 DocType: Quality Inspection,Quality Manager,Gerent de Qualitat
 DocType: Job Applicant,Job Opening,Obertura de treball
 DocType: Payment Reconciliation,Payment Reconciliation,Reconciliació de Pagaments
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Si us plau, seleccioneu el nom de la persona al càrrec"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total no pagat: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operació Pàgina Web de llista de materials
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,Raó Perdut
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,S'han facturat tots els articles
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Si us plau, introdueixi recepció de documents"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centres de costos addicionals es poden fer en grups, però les entrades es poden fer contra els no Grups"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuaris i permisos
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordres de fabricació creades: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ordres de fabricació creades: {0}
 DocType: Branch,Branch,Branca
 DocType: Guardian,Mobile Number,Número de mòbil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing and Branding
 DocType: Bin,Actual Quantity,Quantitat real
 DocType: Shipping Rule,example: Next Day Shipping,exemple: Enviament Dia següent
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no trobat
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no trobat
 DocType: Scheduling Tool,Student Batch,lot estudiant
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Els teus Clients
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,fer Estudiant
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,fer Estudiant
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Se li ha convidat a col·laborar en el projecte: {0}
 DocType: Leave Block List Date,Block Date,Bloquejar Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar ara
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,Enviat A
 DocType: Payment Request,Make Sales Invoice,Fer Factura Vendes
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programaris
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Següent Contacte La data no pot ser en el passat
 DocType: Company,For Reference Only.,Només de referència.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Seleccioneu Lot n
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No vàlida {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Quantitat Anticipada
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas No. No pot ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostra una presentació de diapositives a la part superior de la pàgina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Botigues
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Botigues
 DocType: Serial No,Delivery Time,Temps de Lliurament
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Envelliment basat en
 DocType: Item,End of Life,Final de la Vida
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,Eina de canvi de nom
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Actualització de Costos
 DocType: Item Reorder,Item Reorder,Punt de reorden
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip Mostra Salari
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferir material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip Mostra Salari
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Aquest document està per sobre del límit de {0} {1} per a l&#39;element {4}. Estàs fent una altra {3} contra el mateix {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seleccioneu el canvi import del compte
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Si us plau conjunt recurrent després de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seleccioneu el canvi import del compte
 DocType: Purchase Invoice,Price List Currency,Price List Currency
 DocType: Naming Series,User must always select,Usuari sempre ha de seleccionar
 DocType: Stock Settings,Allow Negative Stock,Permetre existències negatives
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,compte pressupostària
 DocType: Quality Inspection,Verified By,Verified Per
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No es pot canviar moneda per defecte de l'empresa, perquè hi ha operacions existents. Les transaccions han de ser cancel·lades a canviar la moneda per defecte."
-DocType: Grade Interval,Grade Description,grau Descripció
+DocType: Grading Scale Interval,Grade Description,grau Descripció
 DocType: Stock Entry,Purchase Receipt No,Número de rebut de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Diners Earnest
 DocType: Process Payroll,Create Salary Slip,Crear fulla de nòmina
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,Assistència fins a la Data
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Compte de Pagament
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Si us plau, especifiqui l'empresa per a procedir"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Canvi net en els comptes per cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Compensatori
 DocType: Offer Letter,Accepted,Acceptat
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Número d&#39;habitació
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Invàlid referència {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no pot ser major que quanitity planejat ({2}) en l'ordre de la producció {3}
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta d'enviament
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fòrum d&#39;Usuaris
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matèries primeres no poden estar en blanc.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Seient Ràpida
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Seient Ràpida
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termes i Condicions 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,El nom de l&#39;institut per al qual està configurant aquest sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Assentament comptable congelat fins ara, ningú pot fer / modificar entrada excepte paper s'especifica a continuació."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Si us plau, guardi el document abans de generar el programa de manteniment"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estat del Projecte
 DocType: UOM,Check this to disallow fractions. (for Nos),Habiliteu aquesta opció per no permetre fraccions. (Per números)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Es van crear les següents ordres de fabricació:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,Els empleats que treballen en un dia festiu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marc Present
 DocType: Project,% Complete Method,Mètode complet%
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data d'inici de manteniment no pot ser abans de la data de lliurament pel número de sèrie {0}
 DocType: Production Order,Actual End Date,Data de finalització actual
 DocType: BOM,Operating Cost (Company Currency),Cost de funcionament (Companyia de divises)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Llicència sense sou no coincideix amb els registres de llicències d&#39;aplicacions aprovades
 DocType: Campaign,Campaign-.####,Campanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Propers passos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Si us plau subministrar els elements especificats en les millors taxes possibles
 DocType: Selling Settings,Auto close Opportunity after 15 days,Tancament automàtic després de 15 dies d&#39;Oportunitats
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,De cap d&#39;any
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Plom
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Quantitat
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Els registres d&#39;honoraris creats - {0}
 DocType: Asset Category Account,Asset Category Account,Compte categoria d&#39;actius
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Entrada de la {0} no es presenta
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancari / Efectiu
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Per següent Contacte no pot ser la mateixa que la de plom Adreça de correu electrònic
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,No s'esmenta l'espai de dates
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producció
 DocType: Guardian,Occupation,ocupació
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració Empleat Sistema de noms de Recursos Humans&gt; Configuració de recursos humans
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Data d'inici ha de ser anterior Data de finalització
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Quantitat)
 DocType: Sales Invoice,This Document,aquest document
 DocType: Installation Note Item,Installed Qty,Quantitat instal·lada
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informa d'un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,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 +64,90-Above,Per sobre de 90-
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Seient {1} no té en compte {2} o ja compara amb un altre bo
 DocType: Buying Settings,Default Buying Price List,Llista de preus per defecte
 DocType: Process Payroll,Salary Slip Based on Timesheet,Sobre la base de nòmina de part d&#39;hores
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Tipus de Pagament
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccioneu un lot d&#39;articles per {0}. No és possible trobar un únic lot que compleix amb aquest requisit
 DocType: Process Payroll,Select Employees,Seleccioneu Empleats
 DocType: Opportunity,Potential Sales Deal,Tracte de vendes potencials
 DocType: Payment Entry,Cheque/Reference Date,Xec / Data de referència
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS Perfil Global {0} ja creat per la companyia de {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Reemplaça element / BOM en totes les llistes de materials
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,document de recepció ha de ser presentat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,document de recepció ha de ser presentat
 DocType: Purchase Invoice Item,Received Qty,Quantitat rebuda
 DocType: Stock Entry Detail,Serial No / Batch,Número de sèrie / lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"No satisfets, i no lliurats"
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,De llistes d&#39;assistència
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deixar tipus {0} no es poden enviar-portar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de manteniment no es genera per a tots els articles Si us plau, feu clic a ""Generar Planificació"""
 ,To Produce,Per a Produir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,nòmina de sous
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per a la fila {0} a {1}. Per incloure {2} en la taxa d&#39;article, files {3} també han de ser inclosos"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,fer usuari
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,fer usuari
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificació del paquet per al lliurament (per imprimir)
 DocType: Bin,Reserved Quantity,Quantitat reservades
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Si us plau, introdueixi l&#39;adreça de correu electrònic vàlida"
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,plantilla persones amb discapacitat no ha de ser plantilla per defecte
 DocType: Account,Income Account,Compte d'ingressos
 DocType: Payment Request,Amount in customer's currency,Suma de la moneda del client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Lliurament
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Lliurament
 DocType: Stock Reconciliation Item,Current Qty,Quantitat actual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Vegeu ""Taxa de materials basats en"" a la Secció Costea"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,anterior
 DocType: Appraisal Goal,Key Responsibility Area,Àrea de Responsabilitat clau
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Els lots dels estudiants ajuden a realitzar un seguiment d&#39;assistència, avaluacions i quotes per als estudiants"
 DocType: Payment Entry,Total Allocated Amount,total assignat
 DocType: Item Reorder,Material Request Type,Material de Sol·licitud Tipus
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Entrada de diari Accural per a salaris de {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage està plena, no va salvar"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Fila {0}: UOM factor de conversió és obligatori
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Àrbitre
 DocType: Budget,Cost Center,Centre de Cost
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Amaga ID d&#39;Impostos del client segons Transaccions de venda
 DocType: Upload Attendance,Upload HTML,Pujar HTML
 DocType: Employee,Relieving Date,Data Alleujar
-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.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regla de preus està feta per a sobreescriure la llista de preus/defineix percentatge de descompte, en base a algun criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magatzem només es pot canviar a través d'entrada d'estoc / Nota de lliurament / recepció de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentatge
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Director de Màrqueting i Vendes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Impost sobre els guanys
-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.","Si Regla preus seleccionada està fet per a 'Preu', sobreescriurà Llista de Preus. Regla preu El preu és el preu final, així que no hi ha descompte addicional s'ha d'aplicar. Per tant, en les transaccions com comandes de venda, ordres de compra, etc, es va anar a buscar al camp ""Rate"", en lloc de camp 'Preu de llista Rate'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si Regla preus seleccionada està fet per a 'Preu', sobreescriurà Llista de Preus. Regla preu El preu és el preu final, així que no hi ha descompte addicional s'ha d'aplicar. Per tant, en les transaccions com comandes de venda, ordres de compra, etc, es va anar a buscar al camp ""Rate"", en lloc de camp 'Preu de llista Rate'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seguiment dels clients potencials per tipus d'indústria.
 DocType: Item Supplier,Item Supplier,Article Proveïdor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Si us plau, introduïu el codi d'article per obtenir lots no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Please select a value for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Totes les direccions.
 DocType: Company,Stock Settings,Ajustaments d'estocs
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enviarà un correu electrònic sobre l&#39;esdeveniment als empleats amb l&#39;estat &#39;obert&#39;
 DocType: Task,Depends on Tasks,Depèn de Tasques
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar grup Client arbre.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Els arxius adjunts poden mostrar-se sense habilitar el carret de la compra
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nou nom de centres de cost
 DocType: Leave Control Panel,Leave Control Panel,Deixa Panell de control
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,Per Dèbit
 DocType: Delivery Note,Required only for sample item.,Només és necessari per l'article de mostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Actual Quantitat Després de Transacció
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveïdor&gt; Tipus de proveïdor
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sense nòmina trobat entre {0} i {1}
 ,Pending SO Items For Purchase Request,A l'espera dels Articles de la SO per la sol·licitud de compra
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissió d&#39;Estudiants
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} està desactivat
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} està desactivat
 DocType: Supplier,Billing Currency,Facturació moneda
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra gran
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pàgina d&#39;inici Producte destacat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tots els grups d&#39;avaluació
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Magatzem nou nom
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territori
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Si us plau, no de visites requerides"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Si us plau, no de visites requerides"
 DocType: Stock Settings,Default Valuation Method,Mètode de valoració predeterminat
 DocType: Vehicle Log,Fuel Qty,Quantitat de combustible
 DocType: Production Order Operation,Planned Start Time,Planificació de l'hora d'inici
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,Llista de preus Mestre
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Totes les transaccions de venda es poden etiquetar contra múltiples venedors ** ** perquè pugui establir i monitoritzar metes.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Si us plau, crea Client a partir del client potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Només Deixa aplicacions amb estat &quot;Aprovat&quot; i &quot;Rebutjat&quot; pot ser presentat
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Estudiant Nom del grup és obligatori a la fila {0}
@@ -2626,7 +2633,7 @@
 DocType: Project,Copied From,de copiat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nom d&#39;error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,escassetat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} no associada a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} no associada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistència per a l'empleat {0} ja està marcat
 DocType: Packing Slip,If more than one package of the same type (for print),Si més d'un paquet del mateix tipus (per impressió)
 ,Salary Register,salari Registre
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,L&#39;ús per Compres
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},El valor {0} per a l&#39;atribut {1} no existeix a la llista de valors d&#39;atributs d&#39;article vàlid per al punt {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Els càrrecs es distribuiran proporcionalment basen en Quantitat o import de l'article, segons la teva selecció"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Els càrrecs es distribuiran proporcionalment basen en Quantitat o import de l'article, segons la teva selecció"
 DocType: Maintenance Visit,Purposes,Propòsits
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operació {0} ja que qualsevol temps de treball disponibles a l&#39;estació de treball {1}, trencar l&#39;operació en múltiples operacions"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrar Territori arbre.
 DocType: Journal Entry Account,Sales Invoice,Factura de vendes
 DocType: Journal Entry Account,Party Balance,Equilibri Partit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Seleccioneu Aplicar descompte en les
 DocType: Company,Default Receivable Account,Predeterminat Compte per Cobrar
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear entrada del banc per al sou total pagat pels criteris anteriorment seleccionats
 DocType: Stock Entry,Material Transfer for Manufacture,Transferència de material per a la fabricació
-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.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El percentatge de descompte es pot aplicar ja sigui contra una llista de preus o per a tot Llista de Preus.
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entrada Comptabilitat de Stock
 DocType: Vehicle Service,Engine Oil,d&#39;oli del motor
 DocType: Sales Invoice,Sales Team1,Equip de Vendes 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} no existeix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Article {0} no existeix
 DocType: Sales Invoice,Customer Address,Direcció del client
 DocType: Employee Loan,Loan Details,Detalls de préstec
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Complet Quantitat ha de ser més gran que zero.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,Escrigui root
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No es pot tornar més de {1} per a l&#39;article {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plot
 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}
 DocType: Cheque Print Template,Primary Settings,ajustos primaris
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar adreça del proveïdor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Afegir Empleats
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Afegir Empleats
 DocType: Purchase Invoice Item,Quality Inspection,Inspecció de Qualitat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Petit
 DocType: Company,Standard Template,plantilla estàndard
 DocType: Training Event,Theory,teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Advertència: La quantitat de Material sol·licitada és inferior a la Quantitat mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,El compte {0} està bloquejat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitat Legal / Subsidiari amb un gràfic separat de comptes que pertanyen a l'Organització.
 DocType: Payment Request,Mute Email,Silenciar-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentació, begudes i tabac"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Només es pot fer el pagament contra facturats {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,La Comissió no pot ser major que 100
 DocType: Stock Entry,Subcontract,Subcontracte
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Si us plau, introdueixi {0} primer"
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Complexos de transacció existents no poden ser convertits en grup.
 DocType: Assessment Result Tool,Result HTML,El resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Caduca el
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Afegir estudiants
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Afegir estudiants
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Seleccioneu {0}
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduïu el nom de la campanya si la font de la investigació és la campanya
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editors de Newspapers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccioneu l'any fiscal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccioneu l'any fiscal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivell de Reabastecimiento
 DocType: Company,Chart Of Accounts Template,Gràfic de la plantilla de Comptes
 DocType: Attendance,Attendance Date,Assistència Data
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entrada duplicada
 DocType: Program Enrollment Tool,Get Students,obtenir estudiants
 DocType: Serial No,Under Warranty,Sota Garantia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En paraules seran visibles un cop que es guarda la comanda de vendes.
 ,Employee Birthday,Aniversari d'Empleat
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Eina de lots d&#39;Assistència de l&#39;Estudiant
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,límit creuades
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un terme acadèmic amb això &#39;Any Acadèmic&#39; {0} i &#39;Nom terme&#39; {1} ja existeix. Si us plau, modificar aquestes entrades i torneu a intentar."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Com que hi ha transaccions existents contra l&#39;element {0}, no es pot canviar el valor de {1}"
 DocType: UOM,Must be Whole Number,Ha de ser nombre enter
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Noves Fulles Assignats (en dies)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,El número de sèrie {0} no existeix
@@ -2823,7 +2830,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 +49,Period Closing Entry,Entrada de Tancament de Període
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de costos amb transaccions existents no es pot convertir en grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciació
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveïdor (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Empleat Eina Assistència
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,Últim dia del mes
 DocType: Support Settings,Auto close Issue after 7 days,Tancament automàtic d&#39;emissió després de 7 dies
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixi no poden ser distribuïdes abans {0}, com a balanç de la llicència ja ha estat remès equipatge al futur registre d&#39;assignació de permís {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A causa / Data de referència supera permesos dies de crèdit de clients per {0} dia (es)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiant sol·licitant
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte de depreciació acumulada
 DocType: Stock Settings,Freeze Stock Entries,Freeze Imatges entrades
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,Imatges Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Les operacions no poden deixar-se en blanc
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra Detall del document núm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipus del partit és obligatori
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Tipus del partit és obligatori
 DocType: Quality Inspection,Outgoing,Extravertida
 DocType: Material Request,Requested For,Requerida Per
 DocType: Quotation Item,Against Doctype,Contra Doctype
@@ -2874,10 +2881,10 @@
 DocType: Asset,Item Code,Codi de l'article
 DocType: Production Planning Tool,Create Production Orders,Crear ordres de producció
 DocType: Serial No,Warranty / AMC Details,Detalls de la Garantia/AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Estudiants seleccionats de forma manual per al grup basat en activitats
 DocType: Journal Entry,User Remark,Observació de l'usuari
 DocType: Lead,Market Segment,Sector de mercat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},La quantitat pagada no pot ser superior a la quantitat pendent negativa total de {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de treball intern de l'empleat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Tancament (Dr)
 DocType: Cheque Print Template,Cheque Size,xec Mida
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,Crear sol·licituds de materials
 DocType: Employee Education,School/University,Escola / Universitat
 DocType: Payment Request,Reference Details,Detalls Referència
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperat després de la vida útil ha de ser inferior a l&#39;import brut de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Disponible Quantitat en magatzem
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Quantitat facturada
 DocType: Asset,Double Declining Balance,Doble saldo decreixent
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Compte diferència ha de ser un tipus de compte d&#39;Actius / Passius, ja que aquest arxiu reconciliació és una entrada d&#39;Obertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma desemborsat no pot ser més gran que Suma del préstec {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Número d'ordre de Compra per {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordre de producció no s&#39;ha creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Ordre de producció no s&#39;ha creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Des de la data' ha de ser després de 'A data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No es pot canviar l&#39;estat d&#39;estudiant {0} està vinculada amb l&#39;aplicació de l&#39;estudiant {1}
 DocType: Asset,Fully Depreciated,Estant totalment amortitzats
 ,Stock Projected Qty,Quantitat d'estoc previst
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Client {0} no pertany a projectar {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Assistència marcat HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Les cites són propostes, les ofertes que ha enviat als seus clients"
 DocType: Sales Order,Customer's Purchase Order,Àrea de clients Ordre de Compra
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de sèrie i de lot
 DocType: Warranty Claim,From Company,Des de l'empresa
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de les puntuacions de criteris d&#39;avaluació ha de ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor o Quantitat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Si us plau, ajusteu el número d&#39;amortitzacions Reservats"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor o Quantitat
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Comandes produccions no poden ser criats per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Compra Impostos i Càrrecs
@@ -2938,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,tots els cellers
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Tots els tipus de proveïdors
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tots els tipus de proveïdors
 DocType: Global Defaults,Disable In Words,En desactivar Paraules
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Cita {0} no del tipus {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Overdraft Account
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Feu nòmina
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: quantitat assignada no pot ser més gran que la quantitat pendent.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Navegar per llista de materials
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Préstecs Garantits
 DocType: Purchase Invoice,Edit Posting Date and Time,Edita data i hora d&#39;enviament
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No es permet actualitzar les transaccions de valors més grans de {0}
 DocType: Purchase Invoice Item,PR Detail,Detall PR
 DocType: Sales Order,Fully Billed,Totalment Anunciat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Si us plau, estableix compte per pagar per defecte en l&#39;empleat {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectiu disponible
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Magatzem de lliurament requerit per tema de valors {0}
 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)"
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,Grup d&#39;acord amb
 DocType: Journal Entry,Bill Date,Data de la factura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","es requereix la reparació d&#39;articles, tipus, freqüència i quantitat de despeses"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Fins i tot si hi ha diverses regles de preus amb major prioritat, s'apliquen prioritats internes:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},De debò vols que presentin tots nòmina de {0} a {1}
 DocType: Cheque Print Template,Cheque Height,xec Alçada
 DocType: Supplier,Supplier Details,Detalls del proveïdor
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref factura
 DocType: Purchase Order,Recurring Order,Ordre Recurrent
 DocType: Company,Default Income Account,Compte d'Ingressos predeterminat
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup de Clients / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup de Clients / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sense tancar els anys fiscals guanys / pèrdues (de crèdit)
 DocType: Sales Invoice,Time Sheets,Els fulls d&#39;assistència
 DocType: Payment Gateway Account,Default Payment Request Message,Defecte de sol·licitud de pagament del missatge
@@ -3028,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,Cita Missatge
 DocType: Employee Loan,Employee Loan Application,Sol·licitud de Préstec empleat
 DocType: Issue,Opening Date,Data d'obertura
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,L&#39;assistència ha estat marcada amb èxit.
 DocType: Journal Entry,Remark,Observació
 DocType: Purchase Receipt Item,Rate and Amount,Taxa i Quantitat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tipus de compte per {0} ha de ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tipus de compte per {0} ha de ser {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Les fulles i les vacances
 DocType: School Settings,Current Academic Term,Període acadèmic actual
 DocType: Sales Order,Not Billed,No Anunciat
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grup d&#39;Estudiants
 DocType: Shopping Cart Settings,Quotation Series,Sèrie Cotització
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Hi ha un element amb el mateix nom ({0}), canvieu el nom de grup d'articles o canviar el nom de l'element"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Seleccioneu al client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Seleccioneu al client
 DocType: C-Form,I,jo
 DocType: Company,Asset Depreciation Cost Center,Centre de l&#39;amortització del cost dels actius
 DocType: Sales Order Item,Sales Order Date,Sol·licitar Sales Data
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,Detalls d&#39;Assegurances
 DocType: Account,Payable,Pagador
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Si us plau, introdueixi terminis d&#39;amortització"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deutors ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deutors ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clients Nous
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Benefici Brut%
 DocType: Appraisal Goal,Weightage (%),Ponderació (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidació
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Compra import brut és obligatori
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra import brut és obligatori
 DocType: Lead,Address Desc,Descripció de direcció
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Part és obligatòria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Part és obligatòria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Has de marcar compra o venda
-DocType: Grading Structure,Grade Intervals,intervals de grau
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccioneu la naturalesa del seu negoci.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Fila # {0}: Duplicar entrada a les Referències {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,On es realitzen les operacions de fabricació.
 DocType: Asset Movement,Source Warehouse,Magatzem d'origen
 DocType: Installation Note,Installation Date,Data d'instal·lació
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Caps de lletres per a les plantilles d'impressió.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títols per a plantilles d'impressió, per exemple, factura proforma."
 DocType: Student Guardian,Student Guardian,Guardià de l&#39;estudiant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Càrrecs de tipus de valoració no poden marcat com Inclòs
 DocType: POS Profile,Update Stock,Actualització de Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDMs diferents per als articles provocarà pesos nets (Total) erronis. Assegureu-vos que pes net de cada article és de la mateixa UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Guany de canvi de compte / Pèrdua
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,I assistència d&#39;empleats
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Propòsit ha de ser un de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Ompliu el formulari i deseu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Cant que aquesta en estoc
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Quantitat per a generar comanda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertes d&#39;ocupació actuals
 DocType: Company,Stock Adjustment Account,Compte d'Ajust d'estocs
-DocType: Journal Entry,Write Off,Cancel
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancel
 DocType: Timesheet Detail,Operation ID,Operació ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. If set, it will become default for all HR forms."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Des {1}
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Proveïdor lliura al Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Form/Item/{0}) està esgotat
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Següent data ha de ser major que la data de publicació
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar impostos ruptura
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mostrar impostos ruptura
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},A causa / Data de referència no pot ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Les dades d&#39;importació i exportació
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Hi entrades en existències de magatzem en contra {0}, per tant, no es pot tornar a assignar o modificar"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No s&#39;han trobat estudiants
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,No s&#39;han trobat estudiants
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data de la factura d&#39;enviament
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vendre
 DocType: Sales Invoice,Rounded Total,Total Arrodonit
 DocType: Product Bundle,List items that form the package.,Llista d'articles que formen el paquet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentatge d'assignació ha de ser igual a 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Seleccioneu Data d&#39;entrada abans de seleccionar la festa
 DocType: Program Enrollment,School House,Casa de l&#39;escola
 DocType: Serial No,Out of AMC,Fora d'AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleccioneu Cites
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Feu Manteniment Visita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Seleccioneu Cites
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre de Depreciacions reserva no pot ser més gran que el nombre total d&#39;amortitzacions
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Feu Manteniment Visita
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Si us plau, poseu-vos en contacte amb l'usuari que té vendes Mestre Director de {0} paper"
 DocType: Company,Default Cash Account,Compte de Tresoreria predeterminat
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Companyia (no client o proveïdor) mestre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Això es basa en la presència d&#39;aquest Estudiant
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No Estudiants en
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Afegir més elements o forma totalment oberta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Si us plau, introdueixi 'la data prevista de lliurament'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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
@@ -3226,6 +3234,7 @@
 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: Warranty Claim,Item and Warranty Details,Objecte i de garantia Detalls
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codi de l&#39;article&gt; Grup Element&gt; Marca
 DocType: Sales Team,Contribution (%),Contribució (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Seleccioneu el programa a cercar cursos obligatoris.
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Abans de la reconciliació
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos i Càrrecs Afegits (Divisa de la Companyia)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La fila de l'impost d'article {0} ha de tenir en compte el tipus d'impostos o ingressos o despeses o imposable
 DocType: Sales Order,Partly Billed,Parcialment Facturat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} ha de ser un element d&#39;actiu fix
 DocType: Item,Default BOM,BOM predeterminat
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automòbil
 DocType: Vehicle,Insurance Company,Companyia asseguradora
 DocType: Asset Category Account,Fixed Asset Account,Compte d&#39;actiu fix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,De la nota de lliurament
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,De la nota de lliurament
 DocType: Student,Student Email Address,Estudiant Adreça de correu electrònic
 DocType: Timesheet Detail,From Time,From Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock:
@@ -3265,12 +3274,12 @@
 DocType: Purchase Invoice Item,Rate,Tarifa
 DocType: Purchase Invoice Item,Rate,Tarifa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,nom direcció
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,nom direcció
 DocType: Stock Entry,From BOM,A partir de la llista de materials
 DocType: Assessment Code,Assessment Code,codi avaluació
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Bàsic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacions borsàries abans de {0} es congelen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Si us plau, feu clic a ""Generar Planificació"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","per exemple kg, unitat, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference No és obligatori si introduir Data de Referència
 DocType: Bank Reconciliation Detail,Payment Document,El pagament del document
@@ -3278,19 +3287,19 @@
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aerolínia
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Material Issue
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Vostè està en mode fora de línia. Vostè no serà capaç de recarregar fins que tingui la xarxa.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,No hi ha grups d&#39;estudiants van crear.
 DocType: Purchase Invoice Item,Serial No,Número de sèrie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Quantitat Mensual La devolució no pot ser més gran que Suma del préstec
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Si us plau entra primer els detalls de manteniment
 DocType: Purchase Invoice,Print Language,Llenguatge d&#39;impressió
 DocType: Salary Slip,Total Working Hours,Temps de treball total
 DocType: Stock Entry,Including items for sub assemblies,Incloent articles per subconjunts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Introduir el valor ha de ser positiu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Introduir el valor ha de ser positiu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tots els territoris
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiant ja està inscrit.
@@ -3309,16 +3318,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitat de mesura per defecte per Variant &#39;{0}&#39; ha de ser el mateix que a la plantilla &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcula a causa del
 DocType: Delivery Note Item,From Warehouse,De Magatzem
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,No hi ha articles amb la llista de materials per a la fabricació de
 DocType: Assessment Plan,Supervisor Name,Nom del supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,I matrícula Programa
-DocType: Grading Structure,Grading Structure,Estructura de classificació
 DocType: Purchase Taxes and Charges,Valuation and Total,Valoració i total
 DocType: Tax Rule,Shipping City,Enviaments City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Personalitza la Notificació
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de caixa operatiu
 DocType: Sales Invoice,Shipping Rule,Regla d'enviament
@@ -3339,8 +3346,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Seleccioneu Data de comptabilització primer
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Seleccioneu Data de comptabilització primer
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data d&#39;obertura ha de ser abans de la data de Tancament
 DocType: Leave Control Panel,Carry Forward,Portar endavant
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centre de costos de les transaccions existents no es pot convertir en llibre major
 DocType: Department,Days for which Holidays are blocked for this department.,Dies de festa que estan bloquejats per aquest departament.
@@ -3352,7 +3359,7 @@
 DocType: Mode of Payment,General,General
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Afegir capçalera de carta
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,última Comunicació
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No es pot deduir quan categoria és per a 'Valoració' o 'Valoració i Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Enumereu els seus caps fiscals (per exemple, l&#39;IVA, duanes, etc., sinó que han de tenir noms únics) i les seves tarifes estàndard. Això crearà una plantilla estàndard, que pot editar i afegir més tard."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Els pagaments dels partits amb les factures
@@ -3368,7 +3375,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entreteniment i Oci
 DocType: Quality Inspection,Item Serial No,Número de sèrie d'article
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crear registres d&#39;empleats
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crear registres d&#39;empleats
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Present total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Les declaracions de comptabilitat
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3381,9 +3388,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,desconegut
 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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punt de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Punt de Venda
 DocType: Payment Entry,Received Amount,quantitat rebuda
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Si us plau configuració Empleat Sistema de noms de Recursos Humans&gt; Configuració de recursos humans
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear per la quantitat completa, fent cas omís de la quantitat que ja estan en ordre"
 DocType: Account,Tax,Impost
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,no Marcat
@@ -3394,9 +3400,9 @@
 DocType: C-Form,Invoices,Factures
 DocType: Batch,Source Document Name,Font Nom del document
 DocType: Job Opening,Job Title,Títol Professional
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,crear usuaris
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,crear usuaris
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantitat de Fabricació ha de ser major que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita informe de presa de manteniment.
 DocType: Stock Entry,Update Rate and Availability,Actualització de tarifes i disponibilitat
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentatge que se li permet rebre o lliurar més en contra de la quantitat demanada. Per exemple: Si vostè ha demanat 100 unitats. i el subsidi és de 10%, llavors se li permet rebre 110 unitats."
@@ -3405,28 +3411,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},El compte de despeses és obligatòria per a cada element {0}
 DocType: BOM,Website Description,Descripció del lloc web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Canvi en el Patrimoni Net
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Si us plau, cancel·lar Factura de Compra {0} primera"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adreça de correu electrònic ha de ser únic, ja existeix per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data de caducitat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,rebut
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,rebut
 ,Sales Register,Registre de vendes
 DocType: Daily Work Summary Settings Company,Send Emails At,En enviar correus electrònics
 DocType: Quotation,Quotation Lost Reason,Cita Perduda Raó
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Seleccioni el seu domini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referència de la transacció no {0} {1} datat
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hi ha res a editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Els clients no hi ha encara!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estat de fluxos d&#39;efectiu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma del préstec no pot excedir quantitat màxima del préstec de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,llicència
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Si us plau indica el Compte d'annotació
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Darrera Data de comanda
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Compte {0} no pertany a la companyia de {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Números de sèrie en fila {0} no coincideix amb la nota de lliurament
 DocType: Student,Guardian Details,guardià detalls
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marc d&#39;Assistència per a diversos empleats
@@ -3451,20 +3459,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # El compte ha de ser de tipus &quot;Actiu Fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Quantitat de sortida
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regles per calcular l'import d'enviament per a una venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sèries és obligatori
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sèries és obligatori
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serveis Financers
 DocType: Student Sibling,Student ID,Identificació de l&#39;estudiant
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipus d&#39;activitats per als registres de temps
 DocType: Tax Rule,Sales,Venda
 DocType: Stock Entry Detail,Basic Amount,Suma Bàsic
 DocType: Training Event,Exam,examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magatzem necessari per a l'article d'estoc {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Estat de facturació
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferència
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} no associada al compte de {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} no associada al compte de {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch exploded BOM (including sub-assemblies)
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a (Empleat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Data de venciment és obligatori
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Increment de Atribut {0} no pot ser 0
@@ -3475,13 +3483,13 @@
 ,Inactive Customers,Els clients inactius
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Rebut de compra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Com s'aplica la regla de preus?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Com s'aplica la regla de preus?
 DocType: Stock Entry,Delivery Note No,Número d'albarà de lliurament
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Si està marcada, només les sol·licituds de compra de material per a les matèries primeres finals s&#39;inclouen en les sol·licituds de materials. Altrament, es crearan sol·licituds de material per a articles pare"
 DocType: Cheque Print Template,Message to show,Missatge a mostrar
 DocType: Company,Retail,Venda al detall
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle Producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle Producte
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3491,10 +3499,10 @@
 DocType: Payment Entry,Account Paid From,De compte de pagament
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Matèria Prima Codi de l'article
 DocType: Journal Entry,Write Off Based On,Anotació basada en
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,fer plom
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,fer plom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impressió i papereria
 DocType: Stock Settings,Show Barcode Field,Mostra Camp de codi de barres
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Enviar missatges de correu electrònic del proveïdor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salari ja processada per al període entre {0} i {1}, Deixa període d&#39;aplicació no pot estar entre aquest interval de dates."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Registre d'instal·lació per a un nº de sèrie
 DocType: Guardian Interest,Guardian Interest,guardià interès
@@ -3506,6 +3514,7 @@
 DocType: Offer Letter,Awaiting Response,Espera de la resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Per sobre de
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut no vàlid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Esmentar si compta per pagar no estàndard
 DocType: Salary Slip,Earning & Deduction,Guanyar i Deducció
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Aquest ajust s'utilitza per filtrar en diverses transaccions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,No es permeten els ràtios de valoració negatius
@@ -3521,10 +3530,9 @@
 DocType: Production Order Item,Production Order Item,Article de l&#39;ordre de producció
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No s'ha trobat registre
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Cost d&#39;Actius Scrapped
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parcialment ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Cost és obligatori per l'article {2}
 DocType: Vehicle,Policy No,sense política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obtenir elements del paquet del producte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obtenir elements del paquet del producte
 DocType: Asset,Straight Line,Línia recta
 DocType: Project User,Project User,usuari projecte
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,divisió
@@ -3539,7 +3547,7 @@
 DocType: Program Enrollment Tool,Get Students From,Rep estudiants de
 DocType: Hub Settings,Seller Country,Venedor País
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar articles per pàgina web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Agrupar seus estudiants en lots
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Agrupar seus estudiants en lots
 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 +85,Specifications,Especificacions
@@ -3591,14 +3599,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data Xec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: el compte Pare {1} no pertany a la companyia: {2}
 DocType: Program Enrollment Tool,Student Applicants,Els sol·licitants dels estudiants
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Eliminat correctament totes les transaccions relacionades amb aquesta empresa!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Data d&#39;inscripció
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probation
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,components de sous
 DocType: Program Enrollment Tool,New Academic Year,Nou Any Acadèmic
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retorn / Nota de Crèdit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retorn / Nota de Crèdit
 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 +28,Total Paid Amount,Suma total de pagament
 DocType: Production Order Item,Transferred Qty,Quantitat Transferida
@@ -3618,7 +3626,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipus de fulles com casual, malalts, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes periòdics resumits per correu electrònic.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Si us plau, estableix per defecte en compte Tipus de Despeses {0}"
 DocType: Assessment Result,Student Name,Nom de l&#39;estudiant
 DocType: Brand,Item Manager,Administració d&#39;elements
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,nòmina per pagar
@@ -3639,6 +3647,7 @@
 ,Sales Funnel,Sales Funnel
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abreviatura és obligatori
 DocType: Project,Task Progress,Grup de Progrés
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carro
 ,Qty to Transfer,Quantitat a Transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotitzacions a clients potencials o a clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Paper animals d'editar estoc congelat
@@ -3666,12 +3675,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detall d'impostos de tots els articles
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Abreviatura
 ,Item-wise Price List Rate,Llista de Preus de tarifa d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Cita Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Cita Proveïdor
 DocType: Quotation,In Words will be visible once you save the Quotation.,En paraules seran visibles un cop que es guarda la Cotització.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantitat ({0}) no pot ser una fracció a la fila {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,cobrar tarifes
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ja utilitzat en el punt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Regles per afegir les despeses d'enviament.
 DocType: Item,Opening Stock,l&#39;obertura de la
@@ -3689,8 +3698,8 @@
  Actualitzat a través de 'Hora de registre'"
 DocType: Customer,From Lead,De client potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comandes llançades per a la producció.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccioneu l'Any Fiscal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS perfil requerit per fer l&#39;entrada POS
 DocType: Program Enrollment Tool,Enroll Students,inscriure els estudiants
 DocType: Hub Settings,Name Token,Nom Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3701,7 +3710,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra factura Vendes {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nom del projecte
-DocType: Supplier,Mention if non-standard receivable account,Esmenteu si compta per cobrar no estàndard
+DocType: Customer,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: Production Order,Required Items,elements necessaris
 DocType: Stock Ledger Entry,Stock Value Difference,Diferència del valor d'estoc
@@ -3722,7 +3731,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establir Grup d'articles per aquest venedor.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congela els estocs més vells de [dies]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: l&#39;element és obligatori per als actius fixos de compra / venda
-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.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o més regles de preus es troben basats en les condicions anteriors, s'aplica Prioritat. La prioritat és un nombre entre 0 a 20 mentre que el valor per defecte és zero (en blanc). Un nombre més alt significa que va a prevaler si hi ha diverses regles de preus amb mateixes condicions."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Any fiscal: {0} no existeix
 DocType: Currency Exchange,To Currency,Per moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Deixi els següents usuaris per aprovar sol·licituds de llicència per a diversos dies de bloc.
@@ -3747,7 +3756,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Article {0} ignorat ja que no és un article d'estoc
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Presentar aquesta ordre de producció per al seu posterior processament.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per no aplicar la Regla de preus en una transacció en particular, totes les normes sobre tarifes aplicables han de ser desactivats."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per no aplicar la Regla de preus en una transacció en particular, totes les normes sobre tarifes aplicables han de ser desactivats."
 DocType: Assessment Group,Parent Assessment Group,Pares Grup d&#39;Avaluació
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ocupacions
 ,Sales Order Trends,Sales Order Trends
@@ -3758,7 +3767,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost addicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data de finalització de l'exercici fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Fer Oferta de Proveïdor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Fer Oferta de Proveïdor
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Materials necessaris (explotat)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Afegir usuaris a la seva organització, que no sigui vostè"
@@ -3786,6 +3795,7 @@
 DocType: Employee,History In Company,Història a la Companyia
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Butlletins
 DocType: Stock Ledger Entry,Stock Ledger Entry,Ledger entrada Stock
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de Clients&gt; Territori
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,El mateix article s&#39;ha introduït diverses vegades
 DocType: Department,Leave Block List,Deixa Llista de bloqueig
 DocType: Sales Invoice,Tax ID,Identificació Tributària
@@ -3795,7 +3805,7 @@
 DocType: Customer,Sales Partner and Commission,Soci de vendes i de la Comissió
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa d&#39;interès (%) / Any
 ,Project Quantity,projecte Quantitat
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total d&#39;{0} per a tots els elements és zero, pot ser que vostè ha de canviar a &quot;Distribuir els càrrecs basats en &#39;"
 DocType: Opportunity,To Discuss,Per Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unitats de {1} necessària en {2} per completar aquesta transacció.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa d&#39;interès (%) anual
@@ -3810,7 +3820,7 @@
 DocType: Purchase Invoice,Return,Retorn
 DocType: Production Order Operation,Production Order Operation,Ordre de Producció Operació
 DocType: Pricing Rule,Disable,Desactiva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Forma de pagament es requereix per fer un pagament
 DocType: Project Task,Pending Review,Pendent de Revisió
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Actius {0} no pot ser rebutjada, com ja ho és {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reclamació de despeses totals (a través de despeses)
@@ -3818,11 +3828,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marc Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la llista de materials # {1} ha de ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipus De Canvi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Comanda de client {0} no es presenta
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Quota de components
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestió de Flotes
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Afegir elements de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Afegir elements de
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficient de ponderació total de tots els criteris d&#39;avaluació ha de ser del 100%
@@ -3835,7 +3845,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,El magatzem {0} no existeix
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Els percentatges de distribució mensuals
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L'element seleccionat no pot tenir per lots
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorització no trobat per a l&#39;element {0}, que es requereix per fer assentaments comptables per {1} {2}. Si l&#39;article està tramitant com un element de la mostra en el {1}, si us plau esmentar que a la taula {1} article. Altrament, si us plau crea una transacció d&#39;accions d&#39;entrada per a la taxa de valorització article o menció en el registre d&#39;articles i, a continuació, tractar d&#39;enviar / cancel·lació d&#39;aquesta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materials lliurats d'aquesta Nota de Lliurament
 DocType: Project,Customer Details,Dades del client
@@ -3844,15 +3854,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Introdueix els paràmetres URL per als receptors
 DocType: Payment Entry,Paid Amount,Quantitat pagada
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,en línia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,en línia
 ,Available Stock for Packing Items,Estoc disponible per articles d'embalatge
 DocType: Item Variant,Item Variant,Article Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Eina resultat de l&#39;avaluació
 DocType: BOM Scrap Item,BOM Scrap Item,La llista de materials de ferralla d&#39;articles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,comandes presentats no es poden eliminar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,comandes presentats no es poden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Gestió de la Qualitat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} ha estat desactivat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} ha estat desactivat
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una quantitat fixa per Període
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Introduïu la quantitat d'articles per {0}
 DocType: Employee External Work History,Employee External Work History,Historial de treball d'Empleat extern
@@ -3878,7 +3888,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Estudiant ID de correu electrònic
 DocType: Employee,Notice (days),Avís (dies)
 DocType: Tax Rule,Sales Tax Template,Plantilla d&#39;Impost a les Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Seleccioneu articles per estalviar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Seleccioneu articles per estalviar la factura
 DocType: Employee,Encashment Date,Data Cobrament
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajust d'estoc
@@ -3901,7 +3911,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Si us plau, especifiqui des de / fins oscil·lar"
 DocType: Serial No,Under AMC,Sota AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,La taxa de valorització de l'article es torna a calcular tenint en compte landed cost voucher amount
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,La taxa de valorització de l'article es torna a calcular tenint en compte landed cost voucher amount
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Ajustos predeterminats per a les transaccions de venda
 DocType: Guardian,Guardian Of ,El guarda de
 DocType: Grading Scale Interval,Threshold,Llindar
@@ -3911,6 +3921,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de dèbit Publicat
 DocType: Production Order,Warehouses,Magatzems
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actiu no es pot transferir
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Aquest article és una variant de {0} (plantilla).
 DocType: Workstation,per hour,per hores
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,adquisitiu
 DocType: Announcement,Announcement,anunci
@@ -3926,8 +3937,8 @@
 DocType: Account,Receivable,Compte per cobrar
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No es permet canviar de proveïdors com l&#39;Ordre de Compra ja existeix
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol al que es permet presentar les transaccions que excedeixin els límits de crèdit establerts.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Seleccionar articles a Fabricació
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Seleccionar articles a Fabricació
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Mestre sincronització de dades, que podria portar el seu temps"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Venedor Descripció
 DocType: Employee Education,Qualification,Qualificació
@@ -3939,7 +3950,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenat
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criteris d&#39;avaluació del Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;obertura de la depreciació acumulada ha de ser inferior a igual a {0}
 DocType: Warehouse,Warehouse Name,Nom Magatzem
 DocType: Naming Series,Select Transaction,Seleccionar Transacció
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Si us plau entra el rol d'aprovació o l'usuari aprovador
@@ -3952,7 +3963,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,No es pot cancel·lar perquè l'entrada d'estoc {0} ja ha estat Presentada
 DocType: Employee Loan,Disbursement Date,Data de desemborsament
 DocType: Vehicle,Vehicle,vehicle
 DocType: Purchase Invoice,In Words,En Paraules
@@ -3966,14 +3977,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /% Plom
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Les depreciacions d&#39;actius i saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferit des {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir les bestretes rebudes
 DocType: Email Digest,Add/Remove Recipients,Afegir / Treure Destinataris
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},No es permet la transacció cap a l'ordre de producció aturada {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per establir aquest any fiscal predeterminat, feu clic a ""Estableix com a predeterminat"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,unir-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Quantitat escassetat
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,Item variant {0} exists with same attributes,Hi ha la variant d&#39;article {0} amb mateixos atributs
 DocType: Employee Loan,Repay from Salary,Pagar del seu sou
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Sol·licitant el pagament contra {0} {1} per la quantitat {2}
@@ -3991,7 +4002,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Avaluació de Resultats Detall
 DocType: Employee Education,Employee Education,Formació Empleat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,grup d&#39;articles duplicat trobat en la taula de grup d&#39;articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Es necessita a cercar Detalls de l&#39;article.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nombre de sèrie {0} ja s'ha rebut
@@ -4000,7 +4011,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magatzem {0} no està vinculada a cap compte, si us plau crear / enllaçar el compte corresponent (Actiu) per al magatzem."
 DocType: Purchase Invoice,Recurring Id,Recurrent Aneu
 DocType: Customer,Sales Team Details,Detalls de l'Equip de Vendes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar de forma permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Eliminar de forma permanent?
 DocType: Expense Claim,Total Claimed Amount,Suma total del Reclamat
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Els possibles oportunitats de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No vàlida {0}
@@ -4011,13 +4022,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configuració del seu School a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantitat de canvi (moneda de l&#39;empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No hi ha assentaments comptables per als següents magatzems
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Deseu el document primer.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Canvi Abreviatura
 DocType: Expense Claim Detail,Expense Date,Data de la Despesa
 DocType: Item,Max Discount (%),Descompte màxim (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Darrera Quantitat de l'ordre
+DocType: Task,Is Milestone,és Milestone
 DocType: Daily Work Summary,Email Sent To,Correu electrònic enviat a
 DocType: Budget,Warn,Advertir
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Altres observacions, esforç notable que ha d&#39;anar en els registres."
@@ -4038,7 +4050,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Valor
 ,Itemwise Recommended Reorder Level,Nivell d'articles recomanat per a tornar a passar comanda
 DocType: Salary Detail,Salary Detail,Detall de sous
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Seleccioneu {0} primer
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Seleccioneu {0} primer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Lot {0} de {1} article ha expirat.
 DocType: Sales Invoice,Commission,Comissió
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Full de temps per a la fabricació.
@@ -4050,41 +4062,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bloqueja els estocs més antics que' ha de ser menor de %d dies.
 DocType: Tax Rule,Purchase Tax Template,Compra Plantilla Tributària
 ,Project wise Stock Tracking,Projecte savi Stock Seguiment
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Hi Manteniment Programa de {0} contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Actual Quantitat (en origen / destinació)
 DocType: Item Customer Detail,Ref Code,Codi de Referència
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registres d'empleats.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Si us plau, estableix Següent Depreciació Data"
 DocType: HR Settings,Payroll Settings,Ajustaments de Nòmines
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincideixen amb les factures i pagaments no vinculats.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Poseu l&#39;ordre
 DocType: Email Digest,New Purchase Orders,Noves ordres de compra
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root no pot tenir un centre de costos pares
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Seleccioneu una marca ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Seleccioneu una marca ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciació acumulada com a
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Temps de funcionament ha de ser major que 0 per a l&#39;operació {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magatzem és obligatori
 DocType: Supplier,Address and Contacts,Direcció i contactes
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detall UOM Conversió
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Manteniu 900px web amigable (w) per 100px (h)
 DocType: Program,Program Abbreviation,abreviatura programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordre de fabricació no es pot aixecar en contra d&#39;una plantilla d&#39;article
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Els càrrecs s'actualitzen amb els rebuts de compra contra cada un dels articles
 DocType: Warranty Claim,Resolved By,Resolta Per
 DocType: Bank Guarantee,Start Date,Data De Inici
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Assignar absències per un període.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Els xecs i dipòsits esborren de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Crear cites de clients
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Crear cites de clients
 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 +38,Bill of Materials (BOM),Llista de materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Temps mitjà pel proveïdor per lliurar
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,avaluació de resultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,hores
 DocType: Project,Expected Start Date,Data prevista d'inici
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Treure article si els càrrecs no és aplicable a aquest
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Moneda de la transacció ha de ser la mateixa que la moneda de pagament de porta d&#39;enllaç
 DocType: Payment Entry,Receive,Rebre
@@ -4095,19 +4106,19 @@
 DocType: Workstation,Operating Costs,Costos Operatius
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acció si s&#39;acumula pressupost mensual excedit
 DocType: Purchase Invoice,Submit on creation,Presentar a la creació
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Moneda per {0} ha de ser {1}
 DocType: Asset,Disposal Date,disposició Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Els correus electrònics seran enviats a tots els empleats actius de l&#39;empresa a l&#39;hora determinada, si no tenen vacances. Resum de les respostes serà enviat a la mitjanit."
 DocType: Employee Leave Approver,Employee Leave Approver,Empleat Deixar aprovador
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada Reordenar ja existeix per aquest magatzem {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No es pot declarar com perdut, perquè s'han fet ofertes"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formació de vots
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'Ordre de Producció {0} ha d'estar Presentada
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Seleccioneu data d'inici i data de finalització per a l'article {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Per descomptat és obligatori a la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Fins a la data no pot ser anterior a partir de la data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Afegeix / Edita Preus
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Afegeix / Edita Preus
 DocType: Batch,Parent Batch,lots dels pares
 DocType: Cheque Print Template,Cheque Print Template,Plantilla d&#39;impressió de xecs
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Gràfic de centres de cost
@@ -4120,7 +4131,7 @@
 ,Ordered Items To Be Delivered,Els articles demanats per ser lliurats
 DocType: Account,Income,Ingressos
 DocType: Industry Type,Industry Type,Tipus d'Indústria
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Quelcom ha fallat!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Quelcom ha fallat!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Advertència: Deixa aplicació conté dates bloc
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Factura {0} ja s'ha presentat
 DocType: Assessment Result Detail,Score,puntuació
@@ -4151,17 +4162,17 @@
 DocType: Item,Variant Based On,En variant basada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},El pes total assignat ha de ser 100%. És {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Els seus Proveïdors
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,No es pot establir tan perdut com està feta d'ordres de venda.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Proveïdor de part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Rebut des
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',No es pot deduir que és la categoria de &#39;de Valoració &quot;o&quot; Vaulation i Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Rebut des
 DocType: Lead,Converted,Convertit
 DocType: Item,Has Serial No,No té de sèrie
 DocType: Employee,Date of Issue,Data d'emissió
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Des {0} de {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Des {0} de {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Conjunt de Proveïdors per a l&#39;element {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Hores ha de ser més gran que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4170,20 +4181,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturació ha de ser igual a la moneda o divisa de compte del partit, ja sigui per defecte de comapany"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,deixa Cobrament
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Què fa?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Magatzem destí
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tots Admissió d&#39;Estudiants
 ,Average Commission Rate,Comissió de Tarifes mitjana
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,No es poden entrar assistències per dates futures
 DocType: Pricing Rule,Pricing Rule Help,Ajuda de la Regla de preus
 DocType: School House,House Name,Nom de la casa
 DocType: Purchase Taxes and Charges,Account Head,Cap Compte
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elèctric
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Afegir la resta de la seva organització com als seus usuaris. També podeu afegir convidar els clients al seu portal amb l&#39;addició d&#39;ells des Contactes
 DocType: Stock Entry,Total Value Difference (Out - In),Diferència Total Valor (Out - En)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4192,7 +4203,7 @@
 DocType: Item,Customer Code,Codi de Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatori d'aniversari per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dies des de l'última comanda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Dèbit al compte ha de ser un compte de Balanç
 DocType: Buying Settings,Naming Series,Sèrie de nomenclatura
 DocType: Leave Block List,Leave Block List Name,Deixa Nom Llista de bloqueig
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,data d&#39;inici d&#39;assegurança ha de ser inferior a la data d&#39;Assegurances Fi
@@ -4207,9 +4218,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},La relliscada de sou de l&#39;empleat {0} ja creat per al full de temps {1}
 DocType: Vehicle Log,Odometer,comptaquilòmetres
 DocType: Sales Order Item,Ordered Qty,Quantitat demanada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Article {0} està deshabilitat
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Article {0} està deshabilitat
 DocType: Stock Settings,Stock Frozen Upto,Estoc bloquejat fins a
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no conté cap article comuna
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM no conté cap article comuna
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Activitat del projecte / tasca.
 DocType: Vehicle Log,Refuelling Details,Detalls de repostatge
@@ -4219,8 +4230,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,taxa de compra d&#39;última no trobat
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Escriu Off Import (Companyia moneda)
 DocType: Sales Invoice Timesheet,Billing Hours,Hores de facturació
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM per defecte per {0} no trobat
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM per defecte per {0} no trobat
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Configureu la quantitat de comanda
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toc els articles a afegir aquí
 DocType: Fees,Program Enrollment,programa d&#39;Inscripció
 DocType: Landed Cost Voucher,Landed Cost Voucher,Val Landed Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Si us plau, estableix {0}"
@@ -4242,7 +4254,7 @@
 DocType: Maintenance Visit,Maintenance Date,Manteniment Data
 DocType: Purchase Invoice Item,Rejected Serial No,Número de sèrie Rebutjat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Any d'inici o any finalització es solapa amb {0}. Per evitar, configuri l'empresa"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La data d'inici ha de ser anterior a la data de finalització per l'article {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.","Exemple :. ABCD ##### 
  Si la sèrie s'estableix i Nombre de sèrie no s'esmenta en les transaccions, nombre de sèrie a continuació automàtica es crearà sobre la base d'aquesta sèrie. Si sempre vol esmentar explícitament els números de sèrie per a aquest article. deixeu en blanc."
@@ -4318,7 +4330,6 @@
 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
-DocType: Grade Interval,Grade Interval,grau d&#39;interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Any fiscal Data d'Inici i Final de l'exercici fiscal data ja es troben en l'Any Fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidació Data s&#39;actualitza
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
@@ -4363,14 +4374,14 @@
 DocType: Bin,Reserved Qty for Production,Quantitat reservada per a la Producció
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixa sense marcar si no vol tenir en compte per lots alhora que els grups basats en curs.
 DocType: Asset,Frequency of Depreciation (Months),Freqüència de Depreciació (Mesos)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Compte de Crèdit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Compte de Crèdit
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost article
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configuració d&#39;un lloc web senzill per a la meva organització
 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 +666,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 +649,Please specify Attribute Value for attribute {0},"Si us plau, especifiqui Atribut Valor de l&#39;atribut {0}"
 DocType: Item,Default Warehouse,Magatzem predeterminat
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Pressupost no es pot assignar contra comptes de grup {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Si us plau, introduïu el centre de cost dels pares"
@@ -4413,7 +4424,7 @@
 DocType: Opportunity Item,Basic Rate,Tarifa Bàsica
 DocType: GL Entry,Credit Amount,Suma de crèdit
 DocType: Cheque Print Template,Signatory Position,posició signatari
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Establir com a Perdut
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Establir com a Perdut
 DocType: Timesheet,Total Billable Hours,Total d&#39;hores facturables
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagament de rebuts Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Això es basa en transaccions en contra d&#39;aquest client. Veure cronologia avall per saber més
@@ -4427,11 +4438,11 @@
 ,Items To Be Requested,Articles que s'han de demanar
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir Darrera Tarifa de compra
 DocType: Company,Company Info,Qui Som
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seleccionar o afegir nou client
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Seleccionar o afegir nou client
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Centre de cost és requerit per reservar una reclamació de despeses
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicació de Fons (Actius)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Això es basa en la presència d&#39;aquest empleat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Compte Dèbit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4440,13 +4451,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Import de la compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Cita Proveïdor {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Any de finalització no pot ser anterior inici any
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficis als empleats
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Si us plau, estableix una llista predeterminada de festa per Empleat {0} o de la seva empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existeix
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} no existeix
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila n {0}: Munto no pot ser major que l&#39;espera Monto al Compte de despeses de {1}. A l&#39;espera de Monto és {2}
@@ -4455,15 +4466,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Cub
 DocType: GL Entry,Voucher Type,Tipus de Vals
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,La llista de preus no existeix o està deshabilitada
 DocType: Employee Loan Application,Approved,Aprovat
 DocType: Pricing Rule,Price,Preu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Empleat rellevat en {0} ha de ser establert com 'Esquerra'
 DocType: Guardian,Guardian,tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} creat per Empleat {1} en l'interval de dates determinat
 DocType: Employee,Education,Educació
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Naming de Campanya Per
 DocType: Employee,Current Address Is,L'adreça actual és
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificat
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Estableix moneda per defecte de l&#39;empresa, si no s&#39;especifica."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Entrades de diari de Comptabilitat.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponible Quantitat a partir de Magatzem
@@ -4472,7 +4485,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Fila {0}: Festa / Compte no coincideix amb {1} / {2} en {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Si us plau ingressi Compte de Despeses
 DocType: Account,Stock,Estoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipus de document de referència ha de ser un l&#39;ordre de compra, factura de compra o d&#39;entrada de diari"
 DocType: Employee,Current Address,Adreça actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article és una variant d'un altre article llavors descripció, imatges, preus, impostos etc s'establirà a partir de la plantilla a menys que s'especifiqui explícitament"
 DocType: Serial No,Purchase / Manufacture Details,Compra / Detalls de Fabricació
@@ -4500,7 +4513,7 @@
 DocType: Hub Settings,Hub Settings,Ajustaments Hub
 DocType: Project,Gross Margin %,Marge Brut%
 DocType: BOM,With Operations,Amb Operacions
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Assentaments comptables ja s&#39;han fet en moneda {0} per a la companyia de {1}. Seleccioneu un compte per cobrar o per pagar amb la moneda {0}.
 DocType: Asset,Is Existing Asset,És existent d&#39;actius
 DocType: Salary Detail,Statistical Component,component estadística
 ,Monthly Salary Register,Registre de Salari mensual
@@ -4523,7 +4536,7 @@
 DocType: Assessment Plan,Room,habitació
 DocType: Purchase Order,Advance Paid,Bestreta pagada
 DocType: Item,Item Tax,Impost d'article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materials de Proveïdor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materials de Proveïdor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Impostos Especials Factura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Llindar {0}% apareix més d&#39;una vegada
 DocType: Expense Claim,Employees Email Id,Empleats Identificació de l'email
@@ -4554,9 +4567,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Els nivells d&#39;existències
 DocType: Customer,Commission Rate,Percentatge de comissió
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Fer Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Fer Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquejar sol·licituds d'absències per departament.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipus de pagament ha de ser un Rebre, Pagar i Transferència interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analítica
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,El carret està buit
 DocType: Vehicle,Model,model
@@ -4567,6 +4580,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Mostra adjunts Públiques
 DocType: Packing Slip,Package Weight Details,Pes del paquet Detalls
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passarel·la de Pagament
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Després de la realització del pagament redirigir l&#39;usuari a la pàgina seleccionada.
@@ -4585,15 +4599,15 @@
 DocType: Batch,Expiry Date,Data De Caducitat
 ,Supplier Addresses and Contacts,Adreces i contactes dels proveïdors
 ,accounts-browser,comptes en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Si us plau, Selecciona primer la Categoria"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Si us plau, Selecciona primer la Categoria"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projecte mestre.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per permetre que l&#39;excés de facturació o excés de comandes, actualitzar &quot;Assignació&quot; a l&#39;arxiu Configuració o l&#39;article."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No mostrar qualsevol símbol com $ etc costat de monedes.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mig dia)
 DocType: Supplier,Credit Days,Dies de Crèdit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Fer lots Estudiant
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Fer lots Estudiant
 DocType: Leave Type,Is Carry Forward,Is Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtenir elements de la llista de materials
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obtenir elements de la llista de materials
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Temps de Lliurament Dies
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Data de comptabilització ha de ser la mateixa que la data de compra {1} d&#39;actius {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Si us plau, introdueixi les comandes de client a la taula anterior"
@@ -4610,7 +4624,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si us plau configuració sèries de numeració per a l&#39;assistència a través d&#39;Configuració&gt; sèries de numeració
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 93e7d5e..b586b3c 100644
--- a/erpnext/translations/cs.csv
+++ b/erpnext/translations/cs.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Použitelné pro Uživatele
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednat nelze zrušit, uvolnit ho nejprve zrušit"
 DocType: Vehicle Service,Mileage,Najeto
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Opravdu chcete zrušit tuto pohledávku?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vybrat Výchozí Dodavatel
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vybrat Výchozí Dodavatel
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 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
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Výchozí 10 min
 DocType: Leave Type,Leave Type Name,Jméno typu absence
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Ukázat otevřené
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Ukázat otevřené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásit se
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Zápis do deníku Vložené
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch položky vypršení platnosti Stav
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Zobrazit Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobrazit Varianty
 DocType: Academic Term,Academic Term,Akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Množství
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Množství
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Účty tabulka nemůže být prázdné.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Odkaz:% s, Kód Item:% s a Zákazník:% s"
 DocType: Item,Country of Origin,Země původu
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Na skladě
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otevřené problémy
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zpoždění s platbou (dny)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} je již uvedeno v prodejní faktuře: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskální rok {0} je vyžadována
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Očekává datum dodání je být před Sales pořadí Datum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Připojit CSV soubor se dvěma sloupci, jeden pro starý název a jeden pro nový název"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} není v žádném aktivní fiskální rok.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Přírůstek
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Vyberte Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vyberte Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Stejný Společnost je zapsána více než jednou
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Není dovoleno {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Položka získaná z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Není dovoleno {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Položka získaná z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Žádné položky nejsou uvedeny
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedle Odpisy datum nemůže být před zakoupením Datum
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Měsíční Distribuce ** umožňuje distribuovat Rozpočet / Target celé měsíce, pokud máte sezónnosti ve vaší firmě."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nebyl nalezen položek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nebyl nalezen položek
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plat Struktura Chybějící
 DocType: Lead,Person Name,Osoba Jméno
 DocType: Sales Invoice Item,Sales Invoice Item,Položka prodejní faktury
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",například &quot;Základní škola&quot; nebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Datum ukončení nemůže být později než v roce Datum ukončení akademického roku, ke kterému termín je spojena (akademický rok {}). Opravte data a zkuste to znovu."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemůže být bez povšimnutí, protože existuje Asset záznam proti položce"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Daňové Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodinová sazba / 60) * Skutečný čas operace
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vybrat BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Vybrat BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolená na {0} není mezi Datum od a do dnešního dne
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,školy
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Žádný záznam volno nalezených pro zaměstnance {0} na {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicitní skupinu zákazníků uvedeny v tabulce na knihy zákazníků skupiny
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Spotřební
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Školní známka
 DocType: Sales Invoice Item,Delivered By Supplier,Dodává se podle dodavatele
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Výrobní zakázka již vytvořili u všech položek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Roční Plat
 DocType: Daily Work Summary,Daily Work Summary,Denní práce Souhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zmrazený
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vyberte existující společnosti pro vytváření účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte objekt Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úvěrové společnosti v měně
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Chcete aktualizovat docházku? <br> Present: {0} \ <br> Chybí: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamítnuté množství se musí rovnat množství Přijaté u položky {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pro nákup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,pro POS fakturu je nutná alespoň jeden způsob platby.
 DocType: Products Settings,Show Products as a List,Zobrazit produkty jako seznam
 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.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Udělat Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Udělat zaměstnance
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Udělat zaměstnance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprávy
 DocType: POS Profile,Customer Groups,Skupiny zákazníků
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finanční výkazy
 DocType: Guardian,Students,studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Množství předem nemůže být větší než {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Default Payroll Payable Account,"Výchozí mzdy, splatnou Account"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizace Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizace Email Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmínka v případě nestandardní pohledávky účet použitelná
 DocType: Course Schedule,Instructor Name,instruktor Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Přijaté On
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Zda zaškrtnuto, zahrne neskladové položky v požadavcích materiálu."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peněžní tok z financování
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Místní úložiště je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Přidat nevyužité listy z předchozích přídělů
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulace Částka (přes Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Absence blokována
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankovní Příspěvky
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,bankovní Příspěvky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,Student Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Položka {0} je zrušen
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Položka {0} je zrušen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikající Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Řádek # {0}: {1} nemůže být negativní na položku {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Špatné Heslo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Řádek # {0}: {1} nemůže být negativní na položku {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Špatné Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenční Chyba
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Více měn
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavení Daně
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady prodaných aktiv
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vloženo dvakrát v Daňové Položce
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Shrnutí pro tento týden a probíhajícím činnostem
 DocType: Student Applicant,Admitted,"připustil,"
 DocType: Workstation,Rent Cost,Rent Cost
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Hodnota objednávky
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Hotovostní operace proti osobě nebo pro interní převod
 DocType: Shipping Rule,Valid for Countries,"Platí pro země,"
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Řádek # {0}: faktury nelze provést vůči stávajícímu aktivu {1}
 DocType: Item Tax,Tax Rate,Tax Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} již přidělené pro zaměstnance {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí být stejné, jako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Převést na non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Šarže položky.
 DocType: C-Form Invoice Detail,Invoice Date,Datum Fakturace
 DocType: GL Entry,Debit Amount,Debetní Částka
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tam může být pouze 1 účet na společnosti v {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Přijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvoření skupiny studentů
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Žádost o cenovou nabídku
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Vytvořit nový zákazník
-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.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Vytvoření objednávek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Vytvořit nový zákazník
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Vytvoření objednávek
 ,Purchase Register,Nákup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mít roli ""Schvalovatel dovolených"""
 DocType: Purchase Receipt,Vehicle Date,Datum Vehicle
 DocType: Student Log,Medical,Lékařský
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Olovo Majitel nemůže být stejný jako olovo
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Přidělená částka nemůže větší než množství neupravené
 DocType: Announcement,Receiver,Přijímač
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Množství a cena
 DocType: Delivery Note,% Installed,% Instalováno
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učebny / etc laboratoře, kde mohou být naplánovány přednášky."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosím, zadejte nejprve název společnosti"
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Přečtěte si ERPNext Manuál
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Staré nadřazené
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Povinná oblast - Akademický rok
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Nastavte prosím výchozí splatný účet společnosti {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} vybraný několikrát v atributech tabulce
 DocType: HR Settings,Employee record is created using selected field. ,Záznam Zaměstnanec je vytvořena pomocí vybrané pole.
 DocType: Sales Order,Not Applicable,Nehodí se
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday master.
 DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Tax Rule,Billing County,fakturace County
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda oceňování nelze změnit, neboť existují transakce proti některým položkám, které nemají vlastní metodu oceňování"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkem listy přidělené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevyřízené aktivity pro dnešek
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Správní ředitel
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnost Kurz
 DocType: Timesheet Detail,Hrs,hod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Prosím, vyberte Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nelze zavřít úkol, jak jeho závislý úkol {0} není uzavřen."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Koupit
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Zadejte prosím stupeň pro Threshold 0%
 DocType: Sales Order,To Deliver,Dodat
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Sériové žádná položka nemůže být zlomkem
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Přírůstek nemůže být 0
 DocType: Production Planning Tool,Material Requirement,Požadavek materiálu
 DocType: Company,Delete Company Transactions,Smazat transakcí Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referenční číslo a referenční datum je povinný pro bankovní transakce
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodavatelské faktury č
 DocType: Territory,For reference,Pro srovnání
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čekající Množství
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} není aktivní
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} není aktivní
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslal do následujících čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Zkontrolujte nastavení rozměry pro tisk
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenění Rate je povinné, pokud zadaná počátečním stavem zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Ocenění Rate je povinné, pokud zadaná počátečním stavem zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Neuhrazená Hodnoty
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Ujistěte se prodejní objednávky
 DocType: Project Task,Project Task,Úkol Project
 ,Lead Id,Id leadu
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Opakujte zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by neměla být menší než které již byly schváleny listy {1} pro období
 DocType: Announcement,Posted By,Přidal
 DocType: Item,Delivered by Supplier (Drop Ship),Dodává Dodavatelem (Drop Ship)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,Nabídka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte společnost
 DocType: Purchase Order Item,Billed Amt,Účtovaného Amt
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodejní faktury časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrat Platební účet, aby Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Vytvořit Zaměstnanecké záznamy pro správu listy, prohlášení o výdajích a mezd"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Přidat do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukce
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' není v fiskálním roce {2}
 DocType: Buying Settings,Settings for Buying Module,Nastavení pro nákup modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Aktiva {0} nepatří do společnosti {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
 DocType: Buying Settings,Supplier Naming By,Dodavatel Pojmenování By
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Čistá Změna stavu zásob
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Zaměstnanec úvěru Vedení
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Souvislost s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manažer
 DocType: Payment Entry,Payment From / To,Platba z / do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Časové období
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úvěrový limit je nižší než aktuální dlužné částky za zákazníka. Úvěrový limit musí být aspoň {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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é"
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,V minutách
 DocType: Issue,Resolution Date,Rozlišení Datum
 DocType: Student Batch Name,Batch Name,Batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Časového rozvrhu vytvoření:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Časového rozvrhu vytvoření:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Zapsat
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ukáže studenta přítomnému v Student měsíční návštěvnost Zpráva
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Čas operace
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Dokončit
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Báze
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Báze
 DocType: Timesheet,Total Billed Hours,Celkem Předepsané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Student Účast
 DocType: Sales Invoice Timesheet,Time Sheet,Rozvrh hodin
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Se zpětným suroviny na základě
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosím, zadejte podrobnosti položky"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,Zajímat
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Předprodej
 DocType: Purchase Receipt,Other Details,Další podrobnosti
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Vstup Platba je již vytvořili
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Řádek # {0}: Asset {1} není spojena s item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview výplatní pásce
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview výplatní pásce
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} byl zadán vícekrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Hub Settings,Seller City,Prodejce City
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Nabídka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Společnost {0} neexistuje
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Množství spotřebované na jednotku
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množství a sklad
 DocType: Sales Invoice,Commission Rate (%),Výše provize (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Série jmen
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte prosím Program
 DocType: Project,Estimated Cost,Odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálních požadavků
@@ -754,7 +757,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Přijaté Částka (Company měna)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead musí být nastaven pokud je Příležitost vyrobena z leadu
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosím, vyberte týdenní off den"
 DocType: 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
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: BOM,Website Specifications,Webových stránek Specifikace
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte sérii číslování pro Účast přes Nastavení&gt; Série číslování"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,"Č, bank. účtu"
 DocType: Bank Guarantee,Project,Zakázka
 DocType: Quality Inspection Reading,Reading 7,Čtení 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,částečně uspořádané
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset vyhozen přes položka deníku {0}
@@ -830,14 +835,14 @@
 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 +107,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavení e-mailový účet
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Prosím, nejdřív zadejte položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionována Částka nemůže být větší než reklamace Částka v řádku {0}.
 DocType: Company,Default Cost of Goods Sold Account,Výchozí Náklady na prodané zboží účtu
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varování: Neplatná Příloha {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,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 +50,"To filter based on Party, select Party Type first","Chcete-li filtrovat na základě Party, vyberte typ Party první"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Žádný zaměstnanec nalezeno
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Pokud se subdodávky na dodavatele
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentská skupina je již aktualizována.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentská skupina je již aktualizována.
 DocType: SMS Center,All Customer Contact,Vše Kontakt Zákazník
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimální částka faktury
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: náklady Center {2} nepatří do společnosti {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemůže být skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím &#39;{typ_dokumentu}&#39; tabulka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v předchozím &#39;{typ_dokumentu}&#39; tabulka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Časového rozvrhu {0} je již dokončena nebo zrušena
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žádné úkoly
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Asset,Opening Accumulated Depreciation,Otevření Oprávky
@@ -878,7 +883,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} proti účtence {1} ze dne {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,rozvrh
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadejte věk odchodu do důchodu v letech
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Nechte přes dodávku nebo příjem aľ tohoto procenta
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čistý zisk / ztráta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Objednávka na platební
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Bod Variant {0} již existuje se stejnými vlastnostmi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otevření&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otevřená dělat
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkový počet použitelných poplatcích v dokladu o koupi zboží, které tabulky musí být stejná jako celkem daní a poplatků"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkový počet použitelných poplatcích v dokladu o koupi zboží, které tabulky musí být stejná jako celkem daní a poplatků"
 DocType: Sales Team,Incentives,Pobídky
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vypsat pouze slkadový materiál
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetření Výsledek
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Vložené výplatních páskách
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Devizový kurz master.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referenční Doctype musí být jedním z {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referenční Doctype musí být jedním z {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nelze najít časový úsek v příštích {0} dní k provozu {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneři a teritoria
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Nelze automaticky vytvoří účet protože je zde již stock zůstatku na účtu. Je nutné vytvořit odpovídající účet, než budete moci provést zápis o tomto skladu"
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,Komponenty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Bod Varianty {0} aktualizováno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Prosím, zadejte Kategorie majetku v položce {0}"
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Nelze {0} {1} {2} bez negativních vynikající faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Hub Settings,Sync Now,Sync teď
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Asset,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nová prodejní faktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nová prodejní faktura
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Datum zahájení a datem ukončení by mělo být v rámci stejného fiskální rok
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Datum zahájení a datem ukončení by mělo být v rámci stejného fiskální rok
 DocType: Lead,Request for Information,Žádost o informace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Faktury
 DocType: Payment Request,Paid,Placený
 DocType: Program Fee,Program Fee,Program Fee
 DocType: Salary Slip,Total in words,Celkem slovy
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,schválený
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publikovat na webových stránkách
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Zásilky zákazníkům.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Dodavatel Datum faktury nemůže být větší než Datum zveřejnění
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Název společnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Vybrat položku pro převod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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ý
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Výchozí banka / Peněžní účet budou automaticky aktualizovány v plat položka deníku je-li zvolen tento režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervaly pro platové třídy zákoníku {0} překrývá s stupeň intervaly pro ostatních tříd. Prosím zkontrolujte intervaly {0} a {1} a zkuste to znovu
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Company měna)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Řádek # {0}: Míra nemůže být větší než rychlost použitá v {1} {2}
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Nahrajte svůj dopis hlavu a logo. (Můžete je upravit později).
 DocType: Timesheet Detail,Bill,Účet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedle Odpisy Datum se zadává jako uplynulém dni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bílá
 DocType: SMS Center,All Lead (Open),Všechny Lead (Otevřeny)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Řádek {0}: Množství není k dispozici pro {4} ve skladu {1} při účtování čas vložení údajů ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 DocType: Item,Automatically Create New Batch,Automaticky vytvořit novou dávku
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Dělat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Dělat
 DocType: Student Admission,Admission Start Date,Vstupné Datum zahájení
 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á."
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Prosím, zadejte účet pro změnu Částka"
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Název seznamu dovolené
 DocType: Repayment Schedule,Balance Loan Amount,Balance Výše úvěru
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Zadejte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstraněné položky bez změny množství nebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribut tabulka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribut tabulka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemůže být negativní
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Míra s marží
 DocType: Workstation,Wages,Mzdy
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Prodejní Částka
 DocType: Repayment Schedule,Interest Amount,Zájem Částka
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,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"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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
 DocType: Asset,Scrapped,sešrotován
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 DocType: Purchase Invoice,Returns,výnos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Nábor
 DocType: Lead,Organization Name,Název organizace
 DocType: Tax Rule,Shipping State,Přepravní State
 ,Projected Quantity as Source,Množství projekcí as Zdroj
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidána pomocí tlačítka""položka získaná z dodacího listu"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Položka musí být přidána pomocí tlačítka""položka získaná z dodacího listu"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Včetně neskladových položek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodejní náklady
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,PSČ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodejní objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Tvorba přírůstků zásob
 DocType: Packing Slip,Net Weight UOM,Hmotnost UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} výsledků
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} výsledků
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Procento příspěvcích
 DocType: Employee Loan,Repayment Schedule,splátkový kalendář
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,Vyberte název společnosti jako první.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Nabídka obdržená od Dodavatelů.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neplatný Atribut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} musí být odeslaný
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Množství musí být menší než nebo rovno {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
@@ -1152,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použít dodatečnou slevu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,"Z rozsahu, musí být nižší než na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začátek Rok
 DocType: Purchase Invoice,Start date of current invoice's period,Datum období současného faktury je Začátek
 DocType: Salary Slip,Leave Without Pay,Volno bez nároku na mzdu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Plánování kapacit Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / vrubopis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / vrubopis
 DocType: Price List Country,Price List Country,Ceník Země
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} platí pořadová čísla pro položky {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Prosím, zadejte kód položky se dostat číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 DocType: Employee Loan,Partially Disbursed,částečně Vyplacené
-DocType: Grading Structure,Grading System Name,Jméno systém třídění
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba není nakonfigurován. Prosím zkontrolujte, zda je účet byl nastaven na režim plateb nebo na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Stejnou položku nelze zadat vícekrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Další účty mohou být vyrobeny v rámci skupiny, ale údaje lze proti non-skupin"
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá míra
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
 DocType: Holiday,Holiday,Dovolená
 DocType: Support Settings,Close Issue After Days,V blízkosti Issue po několika dnech
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Uveďte prosím alespoň jeden atribut v tabulce atributy
 DocType: Announcement,All Students,Všichni studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} musí být non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Objednávky pomohou při plánování a navázat na vašich nákupech
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emise / přenosu množství {0} v hmotné Request {1} \ nemůže být vyšší než požadované množství {2} pro položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Zemědělství
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Webové stránky Image by měla být veřejná souboru nebo webové stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Číslo role skupiny
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Součet všech vah úkol by měl být 1. Upravte váhy všech úkolů projektu v souladu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 DocType: Hub Settings,Seller Website,Prodejce Website
 DocType: Item,ITEM-,POLOŽKA-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cíl
 DocType: Sales Invoice Item,Edit Description,Upravit popis
 ,Team Updates,tým Aktualizace
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Vytvořit formát tisku
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} položky v probíhající
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
-DocType: Grade Interval,Grade Code,Grade Code
+DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakující Až
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vyberte společnost
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vyberte společnost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dodavatelské faktury Datum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musíte povolit Nákupní košík
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje proti {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,učící studenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Měna závěrečného účtu, musí být {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Součet bodů za všech cílů by mělo být 100. Je {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: POS Profile,Campaign,Kampaň
 DocType: Supplier,Name and Type,Název a typ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Purchase Invoice,Contact Person,Kontaktní osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Očekávané datum započetí"" nemůže být větší než ""Očekávané datum ukončení"""
 DocType: Course Scheduling Tool,Course End Date,Konec Samozřejmě Datum
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Název dodací adresy
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,nemůže být větší než 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nemůže být větší než 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolené bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Řádek # {0}: Dávka {1} má pouze {2} qty. Vyberte prosím jinou dávku, která má k dispozici {3} qty nebo rozdělit řádek do více řádků, doručit / vydávat z více dávek"
 DocType: Vehicle,License Plate,poznávací značka
 DocType: Appraisal,Goals,Cíle
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Účetní záznam pro {0}: {1} mohou být prováděny pouze v měně: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Daňové Pravidlo pro transakce.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázat P &amp; L zůstatky neuzavřený fiskální rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktivní
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Udělat Prodejní objednávky, které vám pomohou plánovat svou práci a doručit na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Udělat Prodejní objednávky, které vám pomohou plánovat svou práci a doručit na čas"
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkem Dodatečné náklady
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Balící list
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Balící list
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavení SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Služby
 DocType: HR Settings,Email Salary Slip to Employee,Email výplatní pásce pro zaměstnance
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Vyberte Možné dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Vyberte Možné dodavatele
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show uzavřen
 DocType: Leave Type,Is Leave Without Pay,Je odejít bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategorie je povinný pro položku dlouhodobých aktiv
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tato {0} je v rozporu s {1} o {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Datem odchodu
 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/utilities/activation.py +64,Create Leads,vytvoření vede
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,vytvoření vede
 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
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Přihlášky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Výchozí sklad je vyžadováno pro vybraná položka
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Krabice
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,možné Dodavatel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,možné Dodavatel
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizace
 DocType: Budget,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximální výše úvěru
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicitní číslo role pro studenty {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicitní číslo role pro studenty {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akční Pokud jde o roční rozpočet překročen
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiál Žádost o příkazu k nákupu
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspěch URL
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,splácení Metoda
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Pokud je zaškrtnuto, domovská stránka bude výchozí bod skupina pro webové stránky"
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Výchozí BOM pro {0} nenalezen Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Výchozí BOM pro {0} nenalezen Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti jsou jádrem systému, přidejte všechny své studenty"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti jsou jádrem systému, přidejte všechny své studenty"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Řádek # {0}: datum Světlá {1} nemůže být před Cheque Datum {2}
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Řádek {0}: čas od času i na čas z {1} se překrývá s {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V den, kdy (y), na které žádáte o povolení jsou prázdniny. Nemusíte požádat o volno."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslat e-mail Payment
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nová úloha
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Vytvořit nabídku
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Vytvořit nabídku
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatní zprávy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Absence typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Zkuste plánování operací pro X dní předem.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosím nastavit výchozí mzdy, splatnou účet ve firmě {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Hledání položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Hledání položky
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá změna v hotovosti
 DocType: Assessment Plan,Grading Scale,Klasifikační stupnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,již byly dokončeny
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,již byly dokončeny
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Platba Poptávka již existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Udělat vyplácení Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Řádek {0}: Advance proti dodavatelem musí být odepsat
 DocType: Company,Default Values,Výchozí hodnoty
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvence} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Celkové částky proplacené
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založeno na protokolech proti tomuto vozidlu. Viz časovou osu níže podrobnosti
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sbírat
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvořil
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nelze odstranit fiskální rok {0}. Fiskální rok {0} je nastaven jako výchozí v globálním nastavení
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Procurement
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Žádný z těchto položek má žádnou změnu v množství nebo hodnotě.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Povinná oblast - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Záruční reklamace
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Záruční reklamace
 ,Lead Details,Detaily leadu
 DocType: Salary Slip,Loan repayment,splácení úvěru
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Prosím, vyberte položku kód"
 DocType: Student Sibling,Studying in Same Institute,Studium se ve stejném ústavu
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (volitelné)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Payment Entry,Paid Amount (Company Currency),Uhrazená částka (firemní měna)
 DocType: Purchase Invoice,Additional Discount,Další slevy
 DocType: Selling Settings,Selling Settings,Prodejní Nastavení
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobrazit Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnost je uvedeno, \n uveďte prosím ""váha UOM"" příliš"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zadaný požadavek materiálu k výrobě této skladové karty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Vedle Odpisy Datum je povinné pro nové aktivum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedle Odpisy Datum je povinné pro nové aktivum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina založená na kurzu pro každou dávku
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single jednotka položky.
 DocType: Fee Category,Fee Category,poplatek Kategorie
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Je zapotřebí nákladového střediska pro &#39;zisku a ztráty &quot;účtu {2}. Prosím nastavit výchozí nákladového střediska pro společnost.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Částka nákupu
 DocType: Asset,Depreciation Method,odpisy Metoda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Celkem Target
 DocType: Program Course,Required,Požadovaný
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepodařilo se najít kurz pro {0} až {1} pro klíčové datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povolit více Prodejní objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Instruktor skupiny studentů
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Žádné
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hlavní
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hlavní
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,zaměstnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Výchozí BOM ({0}) musí být aktivní pro tuto položku nebo jeho šablony
 DocType: Employee,Leave Encashed?,Dovolená proplacena?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,roční náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 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
 DocType: Item,Serial Nos and Batches,Sériové čísla a dávky
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Síla skupiny studentů
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenění
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,třídění Intervaly
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vstupte
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nelze overbill k bodu {0} v řadě {1} více než {2}. Aby bylo možné přes-fakturace, je třeba nastavit při nákupu Nastavení"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prosím nastavit filtr na základě výtisku nebo ve skladu
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Řádek # {0}: Zamítnutí Warehouse je povinná proti zamítnuté bodu {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Platba
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Správa objednávek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Platba
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Správa objednávek
 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í
 DocType: Course,Course Abbreviation,Zkratka hřiště
 DocType: Student Leave Application,Student Leave Application,Student nechat aplikaci
 DocType: Item,Will also apply for variants,Bude platit i pro varianty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nelze zrušit, protože je již {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaměstnanec {0} na půl dne na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Celkem pracovní doba by neměla být větší než maximální pracovní doby {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,New košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kola
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Zakáže vytváření časových protokolů proti výrobní zakázky. Operace nesmějí být sledovány proti výrobní zakázky
 DocType: Student,Student Mobile Number,Student Číslo mobilního telefonu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Již jste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektů
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Fiskální rok
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musí být non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nelze přiřadit proti {0}, protože to není výnos nebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,Přihláška Trasa
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territory / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territory / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,např. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Nechat Typ {0} nemůže být přidělena, neboť se odejít bez zaplacení"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Vynikající
 ,Daily Timesheet Summary,Denní časový rozvrh Souhrn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To je založeno na akciovém pohybu. Viz {0} Podrobnosti
 DocType: Pricing Rule,Selling,Prodejní
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Množství {0} {1} odečíst proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Jméno a ID zaměstnance
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Odvody a daně
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 DocType: Asset,Sold,Prodáno
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základna Částka (Company měna)
 DocType: Payment Reconciliation Payment,Reference Row,referenční Row
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účetní detaily
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Odstraňte všechny transakce pro tuto společnost
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,Diskuse
 DocType: Payment Entry,Transaction ID,ID transakce
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Nastavte prosím datum zapojení pro zaměstnance {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Celková částka Billing (přes Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mít roli ""Schvalovatel výdajů"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Vyberte BOM a Množství pro výrobu
 DocType: Asset,Depreciation Schedule,Plán odpisy
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by měla být v rozmezí Datum od a do dnešního dne
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové středisko&quot; ve firmě {0}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutečné datum ukončení (přes Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Množství {0} {1} na {2} {3}
 ,Quotation Trends,Uvozovky Trendy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 ,Vehicle Expenses,Náklady pro auta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
+DocType: Serial No,Invoice Details,Podrobnosti faktury
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Očekávané hodnoty po celou dobu životnosti, musí být větší než nebo rovna {0}"
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Employee Loan,Loan Amount,Částka půjčky
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 DocType: Salary Slip,net pay info,Čistý plat info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Nové výdaje
 DocType: Purchase Invoice,Additional Discount Amount,Dodatečná sleva Částka
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Řádek # {0}: Množství musí být 1, když je položka investičního majetku. Prosím použít samostatný řádek pro vícenásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Zkratka nemůže být prázdný znak nebo mezera
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 DocType: Loan Type,Loan Name,půjčka Name
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Zákazník Akvizice a loajality
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
 DocType: Production Order,Skip Material Transfer,Přeskočit přenos materiálu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nelze najít kurz {0} až {1} pro klíčový den {2}. Ručně vytvořte záznam o směnném kurzu
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Váš finanční rok končí
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je nyní výchozí fiskální rok. Prosím aktualizujte svůj prohlížeč aby se změny projevily.
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatný. Měna účtu musí být {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním ze zakázky odběratele, prodejní faktury nebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Řádek {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,výše Rozdíl
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Položka Cena přidán pro {0} v Ceníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadejte ID zaměstnance z tohoto prodeje osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Rozdíl Částka musí být nula
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Rozdíl Částka musí být nula
 DocType: Project,Gross Margin,Hrubá marže
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočtená výpis z bankovního účtu zůstatek
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Nabídka
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Nabídka
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 ,Production Analytics,výrobní Analytics
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,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 +210,Warning: Invalid SSL certificate on attachment {0},Varování: Neplatný certifikát SSL na přílohu {0}
 DocType: Student Admission,Eligibility,Způsobilost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vede vám pomohou podnikání, přidejte všechny své kontakty a více jak svých potenciálních zákazníků"
 DocType: Production Order Operation,Actual Operation Time,Aktuální Provozní doba
 DocType: Authorization Rule,Applicable To (User),Vztahující se na (Uživatel)
 DocType: Purchase Taxes and Charges,Deduct,Odečíst
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,pracovní adresa
 DocType: Appraisal,Calculate Total Score,Vypočítat Celková skóre
 DocType: Request for Quotation,Manufacturing Manager,Výrobní ředitel
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Zásilky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Zůstatek účtu ({0}) pro {1} a hodnotu akcie ({2}) pro skladu {3} musí být stejná
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Celkový počet dnů dovolené
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail se nepodařilo odeslat pro zdravotně postižené uživatele
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Počet interakcí
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vyberte společnost ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je povinná k položce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je povinná k položce {1}
 DocType: Process Payroll,Fortnightly,Čtrnáctidenní
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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ě"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 DocType: Student Guardian,Others,Ostatní
 DocType: Payment Entry,Unallocated Amount,nepřidělené Částka
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nelze najít odpovídající položku. Vyberte nějakou jinou hodnotu pro {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Žádné další aktualizace
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dítě Položka by neměla být produkt Bundle. Odeberte položku `{0}` a uložit
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Přidat Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Přidat Timesheets
 DocType: Vehicle Service,Service Item,servis Položka
 DocType: Bank Guarantee,Bank Guarantee,Bankovní záruka
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Prosím, klikněte na ""Generovat Schedule"", aby se plán"
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Řádek # {0}: Asset {1} je již {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Prodejní objednávky na platby
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte prosím jmenovací řadu pro {0} přes Nastavení&gt; Nastavení&gt; Série jmen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,výkonný ředitel
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Prosím, vyberte správný účet"
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nebude zobrazeno, pokud Ceník není nastaven"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím zemi, k tomuto Shipping pravidla nebo zkontrolovat Celosvětová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetní K je vyžadováno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetní K je vyžadováno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomůže udržet přehled o času, nákladů a účtování pro aktivit hotový svého týmu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Nabídka Term
 DocType: Quality Inspection,Quality Manager,Manažer kvality
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Celkové nezaplacené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webové stránky Provoz
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,Důvod ztráty
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Prosím, zadejte převzetí dokumentu"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Další nákladová střediska mohou být vyrobeny v rámci skupiny, ale položky mohou být provedeny proti non-skupin"
 DocType: Project,External,Externí
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Výrobní zakázky Vytvořeno: {0}
 DocType: Branch,Branch,Větev
 DocType: Guardian,Mobile Number,Telefonní číslo
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
 DocType: Bin,Actual Quantity,Skutečné Množství
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Udělat Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Udělat Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Byli jste pozváni ke spolupráci na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Použít teď
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,Odeslána
 DocType: Payment Request,Make Sales Invoice,Proveďte prodejní faktuře
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programy
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Následující Kontakt datum nemůže být v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Vyberte číslo šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Zásoba
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Zásoba
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,Přejmenování
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Show výplatní pásce
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Show výplatní pásce
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicí {0} {1} pro položku {4}. Děláte si jiný {3} proti stejné {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prosím nastavte opakující se po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vybrat změna výše účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Prosím nastavte opakující se po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vybrat změna výše účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
-DocType: Grade Interval,Grade Description,Grade Popis
+DocType: Grading Scale Interval,Grade Description,Grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,Účast na data
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Čistá změna objemu pohledávek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Vyrovnávací Off
 DocType: Offer Letter,Accepted,Přijato
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Číslo pokoje
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Neplatná reference {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemůže být větší, než plánované množství ({2}), ve výrobní objednávce {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rychlý vstup Journal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nelze aktualizovat zásob, faktura obsahuje pokles lodní dopravy zboží."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Rychlý vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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í
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Název institutu pro který nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Následující Výrobní zakázky byly vytvořeny:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,Zaměstnanci pracující na dovolenou
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Současnost
 DocType: Project,% Complete Method,Dokončeno% Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: BOM,Operating Cost (Company Currency),Provozní náklady (Company měna)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Nechat bez nároku na odměnu nesouhlasí se schválenými záznamů nechat aplikaci
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Další kroky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Prosím dodávat uvedené položky na nejlepší možné ceny
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto v blízkosti Příležitost po 15 dnech
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,konec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Vytvořil - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategorie Account
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Nelze produkují více položku {0} než prodejní objednávky množství {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Skladová karta {0} není založena
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Následující Kontakt Tím nemůže být stejný jako hlavní e-mailovou adresu
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Výroba
 DocType: Guardian,Occupation,Povolání
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,Tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásit problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Řádek # {0}: Journal Entry {1} nemá účet {2} nebo již uzavřeno proti jinému poukazu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Řádek # {0}: Journal Entry {1} nemá účet {2} nebo již uzavřeno proti jinému poukazu
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 DocType: Process Payroll,Salary Slip Based on Timesheet,Plat Slip na základě časového rozvrhu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pro položku {0}. Nelze najít jednu dávku, která splňuje tento požadavek"
 DocType: Process Payroll,Select Employees,Vybrat Zaměstnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenční datum
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} již vytvořili pro firmu {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníků
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Příjem dokument musí být předložen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Příjem dokument musí být předložen
 DocType: Purchase Invoice Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nezaplatil a není doručení
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Žádné pracovní výkazy
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Nechte typ {0} nelze provádět předávány
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzdy
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pro řádek {0} v {1}. Chcete-li v rychlosti položku jsou {2}, řádky {3} musí být také zahrnuty"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Udělat uživatele
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Udělat uživatele
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadejte platnou e-mailovou adresu
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Bezbariérový šablona nesmí být výchozí šablonu
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Částka v měně zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuální Množství
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Předch
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Šarže pomůže sledovat docházku, posudky a poplatků pro studenty"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná částka
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Zápis do deníku na platy od {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Místní úložiště je plné, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Místní úložiště je plné, nezachránil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Řádek {0}: UOM Konverzní faktor je povinné
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Nákladové středisko
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Inkognito daně zákazníka z prodejních transakcí
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
 DocType: Employee,Relieving Date,Uvolnění Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Skladová karta / dodací list / nákupní doklad
 DocType: Employee Education,Class / Percentage,Třída / Procento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Vedoucí marketingu a prodeje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Daň z příjmů
-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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Stock Nastavení
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Pošle e-mail o této události, aby zaměstnanci se statusem &quot;otevřený&quot;"
 DocType: Task,Depends on Tasks,Závisí na Úkoly
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Přílohy lze zobrazit bez povolení nákupního vozíku
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,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
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodavatel&gt; Typ dodavatele
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Žádné výplatní pásce nalezena mezi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Přijímací
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je zakázán
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je zakázán
 DocType: Supplier,Billing Currency,Fakturace Měna
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Velké
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodní Doporučené zboží
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Všechny skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Celkem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Celkem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 DocType: Vehicle Log,Fuel Qty,palivo Množství
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prosím vytvořte Zákazník z olova {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechte pouze aplikace, které mají status &quot;schváleno&quot; i &quot;Zamítnuto&quot; může být předložena"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Název skupiny je povinné v řadě {0}
@@ -2626,7 +2633,7 @@
 DocType: Project,Copied From,Zkopírován z
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Název chyba: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Nedostatek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} není spojeno s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} není spojeno s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
 ,Salary Register,plat Register
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Použití pro Košík
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Hodnota {0} atributu {1} neexistuje v seznamu platného bodu Hodnoty atributů pro položky {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Provoz {0} déle, než všech dostupných pracovních hodin v pracovní stanici {1}, rozložit provoz do několika operací"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Prosím, vyberte Použít Sleva na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
-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.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
 DocType: Purchase Invoice,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Vehicle Service,Engine Oil,Motorový olej
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Employee Loan,Loan Details,půjčka Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Řádek {0}: Dokončené množství musí být větší než nula.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Řádek # {0}: Nelze vrátit více než {1} pro bodu {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Spiknutí
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Spiknutí
 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}
 DocType: Cheque Print Template,Primary Settings,primární Nastavení
 DocType: Purchase Invoice,Select Supplier Address,Vybrat Dodavatel Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Přidejte Zaměstnanci
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Přidejte Zaměstnanci
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Malé
 DocType: Company,Standard Template,standardní šablona
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Lze provést pouze platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Prosím, zadejte {0} jako první"
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sklady se stávajícími transakce nelze převést na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledek HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,vyprší dne
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Přidejte studenty
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Přidejte studenty
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelé novin
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Vyberte Fiskální rok
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablony
 DocType: Attendance,Attendance Date,Účast Datum
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicitní záznam
 DocType: Program Enrollment Tool,Get Students,Získat studenty
 DocType: Serial No,Under Warranty,V rámci záruky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Účast Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit zkříženými
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s tímto &quot;akademický rok &#39;{0} a&quot; Jméno Termín&#39; {1} již existuje. Upravte tyto položky a zkuste to znovu.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Stejně jako existují nějaké transakce proti položce {0} nelze změnit hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
@@ -2823,7 +2830,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 +49,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Množství {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Docházky zaměstnanců Tool
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,Poslední den následujícího měsíce
 DocType: Support Settings,Auto close Issue after 7 days,Auto v blízkosti Issue po 7 dnech
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolená nemůže být přiděleny před {0}, protože rovnováha dovolené již bylo carry-předávány v budoucí přidělení dovolenou záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Žadatel
 DocType: Asset Category Account,Accumulated Depreciation Account,Účet oprávek
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operace nemůže být prázdné
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Detail dokumentu č
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Typ strana je povinná
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Typ strana je povinná
 DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
@@ -2874,10 +2881,10 @@
 DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte studenty ručně pro skupinu založenou na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplacená částka nemůže být vyšší než celkový negativní dlužné částky {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,Šek Velikost
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit požadavek na materiál
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekávaná hodnota Po celou dobu životnosti musí být menší než Gross částky nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná částka
 DocType: Asset,Double Declining Balance,Double degresivní
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdíl účet musí být typu aktiv / Odpovědnost účet, protože to Reklamní Smíření je Entry Otevření"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplacené částky nemůže být větší než Výše úvěru {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Výrobní příkaz nebyl vytvořen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Výrobní příkaz nebyl vytvořen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Datum DO"" musí být po ""Datum OD"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemůže změnit statut studenta {0} je propojen s aplikací studentské {1}
 DocType: Asset,Fully Depreciated,plně odepsán
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účast HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citace jsou návrhy, nabídky jste svým zákazníkům odeslané"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pořadové číslo a Batch
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Součet skóre hodnotících kritérií musí být {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Hodnota nebo Množství
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervováno
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Objednávky nemůže být zvýšena pro:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
@@ -2938,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Celý sklad
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Všechny typy Dodavatele
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Všechny typy Dodavatele
 DocType: Global Defaults,Disable In Words,Zakázat ve slovech
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Nabídka {0} není typu {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Vytvořit výplatní pásku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Řádek # {0}: Přidělená částka nesmí být vyšší než zůstatek.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Procházet kusovník
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Zajištěné úvěry
 DocType: Purchase Invoice,Edit Posting Date and Time,Úpravy účtování Datum a čas
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Prosím nastavit výchozí splatné účet zaměstnance {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Dodávka sklad potřebný pro živočišnou položku {0}
 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)
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,Skupina založená na
 DocType: Journal Entry,Bill Date,Datum účtu
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","je nutný servisní položky, typ, frekvence a množství náklady"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},"Opravdu chcete, aby předložily všechny výplatní pásce z {0} až {1}"
 DocType: Cheque Print Template,Cheque Height,Šek Výška
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Faktura Ref
 DocType: Purchase Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Zákazník Group / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavřený fiskálních let Zisk / ztráta (Credit)
 DocType: Sales Invoice,Time Sheets,čas listy
 DocType: Payment Gateway Account,Default Payment Request Message,Výchozí Platba Request Message
@@ -3028,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,Zpráva Nabídky
 DocType: Employee Loan,Employee Loan Application,Zaměstnanec žádost o úvěr
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Účast byla úspěšně označena.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Účast byla úspěšně označena.
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Cena a částka
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Typ účtu pro {0} musí být {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Typ účtu pro {0} musí být {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: School Settings,Current Academic Term,Aktuální akademické označení
 DocType: Sales Order,Not Billed,Ne Účtovaný
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná řada nabídek
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Položka existuje se stejným názvem ({0}), prosím, změnit název skupiny položky nebo přejmenovat položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Vyberte zákazníka
 DocType: C-Form,I,já
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového střediska
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,pojištění Podrobnosti
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadejte dobu splácení"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dlužníci ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dlužníci ({0})
 DocType: Pricing Rule,Margin,Marže
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Částka nákupu je povinná
 DocType: Lead,Address Desc,Popis adresy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je povinná
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Název tématu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svého podnikání.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Řádek # {0}: Duplicitní záznam v odkazu {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Hlavičkové listy pro tisk šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Poplatky typu ocenění může není označen jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Zisk / ztráty
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaměstnanců a docházky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,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 +117,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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 aktuální stav stav zásob, který obsahuje všechny položky"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Aktuální množství na skladě
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuální pracovní příležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
-DocType: Journal Entry,Write Off,Odepsat
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odepsat
 DocType: Timesheet Detail,Operation ID,Provoz ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dodavatel doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) není na skladě
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Další Datum musí být větší než Datum zveřejnění
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dat a export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Přírůstky zásob existují proti skladu {0}, a proto není možné přeřadit nebo upravovat"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Žádní studenti Nalezené
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Žádní studenti Nalezené
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Datum zveřejnění
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Prodat
 DocType: Sales Invoice,Rounded Total,Celkem zaokrouhleno
 DocType: Product Bundle,List items that form the package.,"Seznam položek, které tvoří balíček."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Prosím, vyberte Datum zveřejnění před výběrem Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citace
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citace
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervováno nemůže být větší než celkový počet Odpisy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založeno na účasti tohoto studenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Žádné studenty v
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Přidat další položky nebo otevřené plné formě
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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
@@ -3226,6 +3234,7 @@
 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: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položek&gt; Značka
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Zvolte program pro získání povinných kurzů.
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Před smíření
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} musí být dlouhodobá aktiva položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí být dlouhodobá aktiva položka
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 DocType: Vehicle,Insurance Company,Pojišťovna
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Proměnná
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Proměnná
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Z Dodacího Listu
 DocType: Student,Student Email Address,Student E-mailová adresa
 DocType: Timesheet Detail,From Time,Času od
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na skladě:
@@ -3264,12 +3273,12 @@
 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 +66,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Jméno
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,adresa Jméno
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","např Kg, ks, č, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 DocType: Bank Reconciliation Detail,Payment Document,platba Document
@@ -3277,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Jste v režimu offline. Nebudete moci obnovit stránku, dokud nebudete na síťi."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Žádné studentské skupiny vytvořen.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Měsíční splátka částka nemůže být větší než Výše úvěru
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,Tisk Language
 DocType: Salary Slip,Total Working Hours,Celkové pracovní doby
 DocType: Stock Entry,Including items for sub assemblies,Včetně položek pro podsestav
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Zadejte hodnota musí být kladná
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Zadejte hodnota musí být kladná
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Všechny území
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je již zapsáno.
@@ -3308,16 +3317,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Výchozí měrná jednotka varianty &#39;{0}&#39; musí být stejný jako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítat založené na
 DocType: Delivery Note Item,From Warehouse,Ze skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Žádné položky s Billem materiálů k výrobě
 DocType: Assessment Plan,Supervisor Name,Jméno Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program pro zápis do programu
-DocType: Grading Structure,Grading Structure,třídění Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Dodací město
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow z provozních činností
 DocType: Sales Invoice,Shipping Rule,Pravidlo dopravy
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Prosím, vyberte nejprve Datum zveřejnění"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Datum zahájení by měla být před uzávěrky
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
@@ -3351,7 +3358,7 @@
 DocType: Mode of Payment,General,Obecný
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Připojit Hlavičkový
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Poslední komunikace
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Seznam vaše daňové hlavy (např DPH, cel atd, by měli mít jedinečné názvy) a jejich standardní sazby. Tím se vytvoří standardní šablonu, kterou můžete upravit a přidat další později."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zápas platby fakturami
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Vytvořit Zaměstnanecké záznamů
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Vytvořit Zaměstnanecké záznamů
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,účetní závěrka
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Neznámý
 DocType: Shipping Rule,Shipping Rule Conditions,Přepravní Článek Podmínky
 DocType: BOM Replace Tool,The new BOM after replacement,Nový BOM po změně
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,přijaté Částka
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pro pojmenování zaměstnanců v oblasti lidských zdrojů&gt; Nastavení HR"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvořit na celé množství, ignoruje již objednané množství"
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neoznačený
@@ -3393,9 +3399,9 @@
 DocType: C-Form,Invoices,Faktury
 DocType: Batch,Source Document Name,Název zdrojového dokumentu
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Vytvořit uživatele
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Vytvořit uživatele
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Množství, které má výroba musí být větší než 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 DocType: Stock Entry,Update Rate and Availability,Obnovovací rychlost a dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procento máte možnost přijímat nebo dodávat více proti objednaného množství. Například: Pokud jste si objednali 100 kusů. a váš příspěvek je 10%, pak máte možnost získat 110 jednotek."
@@ -3404,28 +3410,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá změna ve vlastním kapitálu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Zrušte faktuře {0} první
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí být jedinečná, již existuje pro {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Příjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Příjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Posílat e-maily At
 DocType: Quotation,Quotation Lost Reason,Důvod ztráty nabídky
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vyberte si doménu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referenční transakce no {0} ze dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Shrnutí pro tento měsíc a probíhajícím činnostem
 DocType: Customer Group,Customer Group Name,Zákazník Group Name
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Zatím žádné zákazníky!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Přehled o peněžních tocích
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výše úvěru nesmí být vyšší než Maximální výše úvěru částku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Datum poslední objednávky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nepatří společnosti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sériová čísla v řádku {0} neodpovídají poznámce k doručení
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark docházky pro více zaměstnanců
@@ -3450,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Řádek {0} # účet musí být typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typy činností pro Time Záznamy
 DocType: Tax Rule,Sales,Prodej
 DocType: Stock Entry Detail,Basic Amount,Základní částka
 DocType: Training Event,Exam,Zkouška
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturace State
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Převod
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} není spojen s účtem Party {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} není spojen s účtem Party {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Datum splatnosti je povinné
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Přírůstek pro atribut {0} nemůže být 0
@@ -3474,13 +3482,13 @@
 ,Inactive Customers,neaktivní zákazníci
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak je pravidlo platby aplikováno?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak je pravidlo platby aplikováno?
 DocType: Stock Entry,Delivery Note No,Dodacího listu
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Je-li zaškrtnuto, lze zakoupit pouze materiální Žádost o poskytnutí konečných surovin budou zahrnuty v materiálu požadavky. V opačném případě bude vytvořen Materiál Žádosti o mateřské kusů"
 DocType: Cheque Print Template,Message to show,Zpráva ukázat
 DocType: Company,Retail,Maloobchodní
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3490,10 +3498,10 @@
 DocType: Payment Entry,Account Paid From,Účet jsou placeni z prostředků
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Udělat Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Udělat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tisk a papírnictví
 DocType: Stock Settings,Show Barcode Field,Show čárového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Poslat Dodavatel e-maily
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Poslat Dodavatel e-maily
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat již zpracovány pro období mezi {0} a {1}, ponechte dobu použitelnosti nemůže být mezi tomto časovém období."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 DocType: Guardian Interest,Guardian Interest,Guardian Zájem
@@ -3505,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,Čeká odpověď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Výše
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neplatný atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Uvedete-li neštandardní splatný účet
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
@@ -3520,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,Výroba objednávku Položka
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Náklady na sešrotována aktiv
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,částečně ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové středisko je povinný údaj pro položku {2}
 DocType: Vehicle,Policy No,Ne politika
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Položka získaná ze souboru výrobků
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Položka získaná ze souboru výrobků
 DocType: Asset,Straight Line,Přímka
 DocType: Project User,Project User,projekt Uživatel
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdělit
@@ -3538,7 +3546,7 @@
 DocType: Program Enrollment Tool,Get Students From,Získat studenty z
 DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovat položky na webových stránkách
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina vaši studenti v dávkách
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina vaši studenti v dávká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 +85,Specifications,Specifikace
@@ -3590,14 +3598,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Žadatelé
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,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/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,zápis Datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / dobropis
 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 +28,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Prosím nastavit výchozí účet v Expense reklamační typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Prosím nastavit výchozí účet v Expense reklamační typu {0}
 DocType: Assessment Result,Student Name,Jméno studenta
 DocType: Brand,Item Manager,Manažer Položka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Mzdové Splatné
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Zkratka je povinná
 DocType: Project,Task Progress,Pokrok úkol
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Vozík
 ,Qty to Transfer,Množství pro přenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Nabídka pro Lead nebo pro Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,institut Zkratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Dodavatel Nabídka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Dodavatel Nabídka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množství ({0}) nemůže být zlomek v řádku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,vybírat poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 DocType: Item,Opening Stock,otevření Sklad
@@ -3688,8 +3697,8 @@
  aktualizovat přes ""Time Log"""
 DocType: Customer,From Lead,Od Leadu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiskálního roku ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profile požadováno, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapsat studenti
 DocType: Hub Settings,Name Token,Jméno Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
@@ -3700,7 +3709,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} proti vystavené faktuře {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Název projektu
-DocType: Supplier,Mention if non-standard receivable account,Zmínka v případě nestandardní pohledávky účet
+DocType: Customer,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: Production Order,Required Items,Povinné předměty
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3721,7 +3730,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Řádek # {0}: Prostředek je povinné pro dlouhodobého majetku nákupu / prodeji
-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.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskální rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
@@ -3746,7 +3755,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Assessment Group,Parent Assessment Group,Mateřská skupina Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Prodejní objednávky Trendy
@@ -3757,7 +3766,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatečné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Finanční rok Datum ukončení
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Vytvořit nabídku dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,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ý)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Přidání uživatelů do vaší organizace, jiné než vy"
@@ -3785,6 +3794,7 @@
 DocType: Employee,History In Company,Historie ve Společnosti
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Zpravodaje
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Skupina zákazníků&gt; Území
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Stejný bod byl zadán vícekrát
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Sales Invoice,Tax ID,DIČ
@@ -3794,7 +3804,7 @@
 DocType: Customer,Sales Partner and Commission,Prodej Partner a Komise
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sazba (%) / rok
 ,Project Quantity,projekt Množství
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Celkem {0} pro všechny položky je nula, může být byste měli změnit &quot;Rozdělte poplatků založený na&quot;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotek {1} zapotřebí {2} pro dokončení této transakce.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sazba (%) Roční
@@ -3809,7 +3819,7 @@
 DocType: Purchase Invoice,Return,Zpáteční
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Způsob platby je povinen provést platbu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Způsob platby je povinen provést platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Aktiva {0} nemůže být vyhozen, jak je tomu již {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
@@ -3817,11 +3827,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Řádek {0}: Měna BOM # {1} by se měla rovnat vybrané měně {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatek Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Přidat položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Přidat položky z
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: Cheque Print Template,Regular,Pravidelný
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Celková weightage všech hodnotících kritérií musí být 100%
@@ -3834,7 +3844,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenění sazba nebyl nalezen na výtisku {0}, který je k tomu účetních zápisů pro požadovanou {1} {2}. Pokud je položka transakci jako položka vzorek v {1}, prosím zmínit, že v {1} položky tabulky. V opačném případě vytvořte příchozí transakce akcie za položku nebo zmínka sazby ocenění v záznamu položku a potom zkuste odevzdání / zrušení této položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiálů doručeno proti tomuto dodacímu listu
 DocType: Project,Customer Details,Podrobnosti zákazníků
@@ -3843,15 +3853,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 DocType: Assessment Plan,Supervisor,Dozorce
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Položka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledek
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Předložené objednávky nelze smazat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Předložené objednávky nelze smazat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Řízení kvality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} byl zakázán
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} byl zakázán
 DocType: Employee Loan,Repay Fixed Amount per Period,Splatit pevná částka na období
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Zadejte prosím množství produktů, bod {0}"
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
@@ -3877,7 +3887,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID e-mailu
 DocType: Employee,Notice (days),Oznámení (dny)
 DocType: Tax Rule,Sales Tax Template,Daň z prodeje Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Vyberte položky, které chcete uložit fakturu"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Reklamní Nastavení
@@ -3900,7 +3910,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Uveďte prosím z / do rozmezí
 DocType: Serial No,Under AMC,Podle AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: Guardian,Guardian Of ,strážce
 DocType: Grading Scale Interval,Threshold,Práh
@@ -3910,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Vydání dluhopisu
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} pohledávka nemůže být převedena
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Tato položka je variantou {0} (šablony).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nákup
 DocType: Announcement,Announcement,Oznámení
@@ -3925,8 +3936,8 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Řádek # {0}: Není povoleno měnit dodavatele, objednávky již existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vyberte položky do Výroba
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Kmenová data synchronizace, může to trvat nějaký čas"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
@@ -3938,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotící kritéria Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otevření Oprávky musí být menší než rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
@@ -3951,7 +3962,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 můžete upravovat svou 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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože existuje skladový záznam {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože existuje skladový záznam {0}"
 DocType: Employee Loan,Disbursement Date,výplata Datum
 DocType: Vehicle,Vehicle,Vozidlo
 DocType: Purchase Invoice,In Words,Slovy
@@ -3965,14 +3976,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zůstatků
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Množství {0} {1} převedena z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Připojit
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Bod varianta {0} existuje s stejné atributy
 DocType: Employee Loan,Repay from Salary,Splatit z platu
 DocType: Leave Application,LAP/,ÚSEK/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Požadovala vyplacení proti {0} {1} na částku {2}
@@ -3990,7 +4001,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Posuzování Detail Výsledek
 DocType: Employee Education,Employee Education,Vzdělávání zaměstnanců
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicitní skupinu položek uvedeny v tabulce na položku ve skupině
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Je třeba, aby přinesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -3999,7 +4010,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sklad {0} není vázáno na žádný účet, vytvořte / odkazují na příslušném účtu (aktiv) na skladu."
 DocType: Purchase Invoice,Recurring Id,Opakující se Id
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Smazat trvale?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Smazat trvale?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4010,13 +4021,14 @@
 DocType: Warehouse,PIN,KOLÍK
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základna Změna Částka (Company měna)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument jako první.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Změna zkratky
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Částka poslední objednávky
+DocType: Task,Is Milestone,Je milník
 DocType: Daily Work Summary,Email Sent To,E-mailem odeslaným
 DocType: Budget,Warn,Varovat
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jakékoli jiné poznámky, pozoruhodné úsilí, které by měly jít v záznamech."
@@ -4037,7 +4049,7 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Prosím, nejprve vyberte {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Šarže {0} položky {1} vypršela.
 DocType: Sales Invoice,Commission,Provize
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas list pro výrobu.
@@ -4049,41 +4061,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmrazit zásoby starší než` by mělo být nižší než %d dnů.
 DocType: Tax Rule,Purchase Tax Template,Spotřební daň šablony
 ,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedle odpisů Datum"
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Objednat
 DocType: Email Digest,New Purchase Orders,Nové vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Select Brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Select Brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Oprávky i na
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Čas operace musí být větší než 0 pro operaci {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Čas operace musí být větší než 0 pro operaci {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konverze Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Zachovejte to přátelské pro web 900px (w) na 100px (h)
 DocType: Program,Program Abbreviation,Program Zkratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Výrobní zakázka nemůže být vznesena proti šablony položky
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Bank Guarantee,Start Date,Datum zahájení
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávně vymazány
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Vytvořit citace zákazníků
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Vytvořit citace zákazníků
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Průměrná doba pořízena dodavatelem dodat
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Hodnocení výsledků
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Měna transakce musí být stejná jako platební brána měnu
 DocType: Payment Entry,Receive,Příjem
@@ -4094,19 +4105,19 @@
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akční pokud souhrnné měsíční rozpočet překročen
 DocType: Purchase Invoice,Submit on creation,Předložení návrhu na vytvoření
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Měna pro {0} musí být {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Měna pro {0} musí být {1}
 DocType: Asset,Disposal Date,Likvidace Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budou zaslány všem aktivním zaměstnancům společnosti v danou hodinu, pokud nemají dovolenou. Shrnutí odpovědí budou zaslány do půlnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Trénink Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Samozřejmě je povinné v řadě {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Přidat / Upravit ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Přidat / Upravit ceny
 DocType: Batch,Parent Batch,Nadřazená dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablony tisku
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram nákladových středisek
@@ -4119,7 +4130,7 @@
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
 DocType: Industry Type,Industry Type,Typ Průmyslu
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Něco se pokazilo!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 DocType: Assessment Result Detail,Score,Skóre
@@ -4150,17 +4161,17 @@
 DocType: Item,Variant Based On,Varianta založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši Dodavatelé
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
+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."
 DocType: Request for Quotation Item,Supplier Part No,Žádný dodavatel Part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Přijaté Od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemůže odečíst, pokud kategorie je pro &quot;ocenění&quot; nebo &quot;Vaulation a Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Přijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Řádek # {0}: Nastavte Dodavatel pro položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Řádek {0}: doba hodnota musí být větší než nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4169,20 +4180,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturační měna se musí rovnat měny nebo účtu strana peněz buď výchozího comapany je
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Nechat inkasa
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Co to dělá?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všechny Student Přijímací
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Jméno dům
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrický
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Přidejte zbytek vaší organizace jako uživatele. Můžete také přidat pozvat zákazníky na portálu tím, že přidáním z Kontaktů"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Přidejte zbytek vaší organizace jako uživatele. Můžete také přidat pozvat zákazníky na portálu tím, že přidáním z Kontaktů"
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Řádek {0}: Exchange Rate je povinné
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID není nastavena pro zaměstnance {0}
@@ -4191,7 +4202,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debetní Na účet musí být účtu Rozvaha
 DocType: Buying Settings,Naming Series,Číselné řady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum pojištění startu by měla být menší než pojištění koncovým datem
@@ -4206,9 +4217,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Výplatní pásce zaměstnance {0} již vytvořili pro časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo ujetých kilometrů
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Položka {0} je zakázána
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Položka {0} je zakázána
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM neobsahuje žádnou skladovou položku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projektová činnost / úkol.
 DocType: Vehicle Log,Refuelling Details,Tankovací Podrobnosti
@@ -4218,8 +4229,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Poslední cena při platbě nebyl nalezen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odepsat Částka (Company měny)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hodiny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Výchozí BOM pro {0} nebyl nalezen
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Řádek # {0}: Prosím nastavte množství objednací
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Klepnutím na položky je můžete přidat zde
 DocType: Fees,Program Enrollment,Registrace do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
@@ -4241,7 +4253,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Odmítnuté sériové číslo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Rok datum zahájení nebo ukončení se překrývá s {0}. Aby se zabránilo nastavte firmu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {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.","Příklad:. ABCD ##### 
  Je-li série nastavuje a pořadové číslo není uvedeno v transakcích, bude vytvořen poté automaticky sériové číslo na základě této série. Pokud chcete vždy výslovně uvést pořadová čísla pro tuto položku. ponechte prázdné."
@@ -4317,7 +4329,6 @@
 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
-DocType: Grade Interval,Grade Interval,třída Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Světlá Datum aktualizováno
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4362,14 +4373,14 @@
 DocType: Bin,Reserved Qty for Production,Vyhrazeno Množství pro výrobu
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechte nekontrolované, pokud nechcete dávat pozor na dávku při sestavování kurzových skupin."
 DocType: Asset,Frequency of Depreciation (Months),Frekvence odpisy (měsíce)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Úvěrový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Úvěrový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavení jednoduché webové stránky pro mou organizaci
 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 +666,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte prosím atributu Hodnota atributu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemůže být přiřazena na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
@@ -4412,7 +4423,7 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Výše úvěru
 DocType: Cheque Print Template,Signatory Position,Signatář Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Nastavit jako Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Nastavit jako Lost
 DocType: Timesheet,Total Billable Hours,Celkem zúčtovatelné hodiny
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplacení Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To je založeno na transakcích proti tomuto zákazníkovi. Viz časovou osu níže podrobnosti
@@ -4426,11 +4437,11 @@
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Společnost info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vyberte nebo přidání nového zákazníka
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Vyberte nebo přidání nového zákazníka
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Nákladové středisko je nutné rezervovat výdajů nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založeno na účasti základu tohoto zaměstnance
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetní účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4439,13 +4450,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Částka nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dodavatel Cen {0} vytvořil
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Konec roku nemůže být před uvedením do provozu roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zaměstnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastavit výchozí Holiday List pro zaměstnance {0} nebo {1} Company
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Řádek č {0}: Částka nemůže být větší než Čekající Částka proti Expense nároku {1}. Do doby, než množství je {2}"
@@ -4454,15 +4465,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Employee Loan Application,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdělání
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Upravené
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Volitelné. Nastaví výchozí měně společnosti, není-li uvedeno."
 apps/erpnext/erpnext/config/accounts.py +61,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
@@ -4471,7 +4484,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Řádek {0}: Party / Account neshoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Řádek # {0}: Reference Document Type musí být jedním z objednávky, faktury nebo Journal Entry"
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -4499,7 +4512,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marže %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účetnictví již byly provedeny v měně, {0} pro firmu {1}. Vyberte pohledávky a závazku účet s měnou {0}."
 DocType: Asset,Is Existing Asset,Je existujícímu aktivu
 DocType: Salary Detail,Statistical Component,Statistická složka
 ,Monthly Salary Register,Měsíční plat Register
@@ -4522,7 +4535,7 @@
 DocType: Assessment Plan,Room,Pokoj
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiál Dodavateli
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiál Dodavateli
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Spotřební Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Práh {0}% objeví více než jednou
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
@@ -4553,9 +4566,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Připojit Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Sklad Úrovně
 DocType: Customer,Commission Rate,Výše provize
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Udělat Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Udělat Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí být jedním z příjem Pay a interní převod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí být jedním z příjem Pay a interní převod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košík je prázdný
 DocType: Vehicle,Model,Model
@@ -4566,6 +4579,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základní kapitál
+DocType: Shopping Cart Settings,Show Public Attachments,Zobrazit veřejné přílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platební brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby přesměrovat uživatele na vybrané stránky.
@@ -4584,15 +4598,15 @@
 DocType: Batch,Expiry Date,Datum vypršení platnosti
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 ,accounts-browser,Účty-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Nejdřív vyberte kategorii
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Chcete-li povolit over-fakturaci nebo over-objednávání, aktualizujte &quot;příspěvek&quot; v Nastavení skladem, nebo výtisku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nevykazují žádný symbol jako $ atd vedle měnám.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(půlden)
 DocType: Supplier,Credit Days,Úvěrové dny
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Udělat Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Udělat Student Batch
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Položka získaná z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Položka získaná z BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dodací lhůta dny
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Řádek # {0}: Vysílání datum musí být stejné jako datum nákupu {1} aktiva {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadejte Prodejní objednávky v tabulce výše"
@@ -4609,7 +4623,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte sérii číslování pro Účast přes Nastavení&gt; Série číslování"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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
new file mode 100644
index 0000000..e3566ee
--- /dev/null
+++ b/erpnext/translations/da-DK.csv
@@ -0,0 +1,30 @@
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Åbning'
+DocType: Lead,Lead,Bly
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for at sælge transaktioner.
+DocType: Timesheet,% Amount Billed,% Beløb Billed
+DocType: Purchase Order,% Billed,% Billed
+,Lead Id,Bly Id
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','Total'
+DocType: Selling Settings,Selling Settings,Salg af indstillinger
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Selling Beløb
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Bly skal indstilles, hvis Opportunity er lavet af Lead"
+DocType: Item,Default Selling Cost Center,Standard Selling Cost center
+apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
+DocType: Pricing Rule,Selling,Selling
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,Ultima Actualización : Fecha inválida
+DocType: Sales Order,%  Delivered,% Leveres
+DocType: Lead,Lead Owner,Bly Owner
+apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Udgiftområde er obligatorisk for varen {2}
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Skat skabelon til at sælge transaktioner.
+apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,o
+DocType: Sales Order,% of materials billed against this Sales Order,% Af materialer faktureret mod denne Sales Order
+DocType: SMS Center,All Lead (Open),Alle Bly (Open)
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Hent opdateringer
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},"'Opdater lager' kan ikke markeres, varerne ikke leveres via {0}"
+apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
+,Lead Details,Bly Detaljer
+DocType: Selling Settings,Settings for Selling Module,Indstillinger for Selling modul
+,Lead Name,Bly navn
+apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,'Notification Email Adresser' er ikke angivet for tilbagevendende %s
+DocType: Vehicle Service,Half Yearly,Halvdelen Årlig
+DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæfte .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
diff --git a/erpnext/translations/da.csv b/erpnext/translations/da.csv
index 6eb1c34..932a437 100644
--- a/erpnext/translations/da.csv
+++ b/erpnext/translations/da.csv
@@ -17,21 +17,21 @@
 DocType: Employee,Rented,Lejet
 DocType: Purchase Order,PO-,IO-
 DocType: POS Profile,Applicable for User,Gældende for bruger
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
-DocType: Vehicle Service,Mileage,Kilometertal
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produktionsordre kan ikke annulleres, Unstop det første til at annullere"
+DocType: Vehicle Service,Mileage,Kilometerpenge
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vil du virkelig kassere dette anlægsaktiv?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vælg Standard Leverandør
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vælg Standard Leverandør
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil blive beregnet i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundeservicekontakt
 DocType: Job Applicant,Job Applicant,Ansøger
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner imod denne leverandør. Se tidslinje nedenfor for detaljer
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Dette er baseret på transaktioner for denne leverandør. Se tidslinje nedenfor for detaljer
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Ikke flere resultater.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,Juridisk
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},"Faktiske type skat, kan ikke indgå i vare sats i række {0}"
 DocType: Bank Guarantee,Customer,Kunde
 DocType: Purchase Receipt Item,Required By,Kræves By
-DocType: Delivery Note,Return Against Delivery Note,Retur Against følgeseddel
+DocType: Delivery Note,Return Against Delivery Note,Retur mod følgeseddel
 DocType: Purchase Order,% Billed,% Faktureret
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +43,Exchange Rate must be same as {0} {1} ({2}),Vekselkurs skal være det samme som {0} {1} ({2})
 DocType: Sales Invoice,Customer Name,Kundennavn
@@ -41,11 +41,11 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre end nul ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 min
 DocType: Leave Type,Leave Type Name,Fraværstypenavn
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Vis åben
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series opdateret
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åben
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Nummerserien opdateret
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,bestilling
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Kassekladde Indsendt
-DocType: Pricing Rule,Apply On,Påfør On
+DocType: Pricing Rule,Apply On,Gælder for
 DocType: Item Price,Multiple Item prices.,Flere varepriser.
 ,Purchase Order Items To Be Received,"Købsordre, der modtages"
 DocType: SMS Center,All Supplier Contact,Alle Leverandør Kontakt
@@ -54,17 +54,16 @@
 apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,Forventet slutdato kan ikke være mindre end forventet startdato
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Row # {0}: Pris skal være samme som {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,Ny fraværs Application
-,Batch Item Expiry Status,Batch Item Udløb status
+,Batch Item Expiry Status,Partivare-udløbsstatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
-DocType: Mode of Payment Account,Mode of Payment Account,Mode Betalingskonto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Vis varianter
+DocType: Mode of Payment Account,Mode of Payment Account,Betalingsmådekonto
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis varianter
 DocType: Academic Term,Academic Term,Akademisk Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Mængde
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Mængde
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Regnskab tabel kan ikke være tom.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Lån (passiver)
 DocType: Employee Education,Year of Passing,År for Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Reference:% s, Varenr.:% og Kunde:% s"
 DocType: Item,Country of Origin,Oprindelsesland
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,På lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Åbne spørgsmål
@@ -73,15 +72,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dage)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede refereret i salgsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Hyppighed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskabsår {0} er påkrævet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,"Forventet leveringsdato er være, før Sales Order Dato"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Forsvar
 DocType: Salary Component,Abbr,Forkortelse
 DocType: Appraisal Goal,Score (0-5),Score (0-5)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,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 +75,Row # {0}:,Row # {0}:
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Række {0}: {1} {2} passer ikke med {3}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +75,Row # {0}:,Række # {0}:
 DocType: Timesheet,Total Costing Amount,Total Costing Beløb
 DocType: Delivery Note,Vehicle No,Køretøjsnr.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Vælg venligst prisliste
@@ -92,11 +92,11 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Revisor
 DocType: Cost Center,Stock User,Lagerbruger
 DocType: Company,Phone No,Telefonnr.
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursus Tidsplaner oprettet:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Kursusskema oprettet:
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Ny {0}: # {1}
 ,Sales Partners Commission,Salgs Partneres Kommission
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,Forkortelse kan ikke have mere end 5 tegn
-DocType: Payment Request,Payment Request,Betaling Request
+DocType: Payment Request,Payment Request,Betalingsanmodning
 DocType: Asset,Value After Depreciation,Værdi efter afskrivninger
 DocType: Employee,O+,O +
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relaterede
@@ -108,45 +108,47 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Vedhæft .csv fil med to kolonner, en for det gamle navn og et til det nye navn"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ikke i noget aktivt regnskabsår.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, varekode: {1} og kunde: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Rekruttering
 DocType: Item Attribute,Increment,Tilvækst
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Vælg lager ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vælg lager ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklame
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Samme firma er indtastet 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/purchase_invoice/purchase_invoice.js +556,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan ikke opdateres mod følgeseddel {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tilladt for {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Hent varer fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Lager kan ikke opdateres mod følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen emner opført
 DocType: Payment Reconciliation,Reconcile,Forene
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Købmand
 DocType: Quality Inspection Reading,Reading 1,Læsning 1
 DocType: Process Payroll,Make Bank Entry,Make Bank indtastning
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasserne
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Næste Afskrivninger Dato kan ikke være før Købsdato
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionskasser
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næste afskrivningsdato kan ikke være før købsdatoen
 DocType: SMS Center,All Sales Person,Alle salgsmedarbejdere
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Månedlig Distribution ** hjælper dig distribuere Budget / Target tværs måneder, hvis du har sæsonudsving i din virksomhed."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ikke varer fundet
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Løn Struktur Missing
-DocType: Lead,Person Name,Person Name
-DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ikke varer fundet
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lønstruktur mangler
+DocType: Lead,Person Name,Navn
+DocType: Sales Invoice Item,Sales Invoice Item,Salgsfakturavare
 DocType: Account,Credit,Kredit
 DocType: POS Profile,Write Off Cost Center,Afskriv omkostningssted
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",fx &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Rapporter
 DocType: Warehouse,Warehouse Detail,Lagerinformation
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af akademiske år, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Credit grænsen er krydset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Slutdato kan ikke være senere end året Slutdato af skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Er anlægsaktiv"" kan ikke være umarkeret, da der eksisterer et anlægsaktiv på varen"
 DocType: Vehicle Service,Brake Oil,Bremse Oil
 DocType: Tax Rule,Tax Type,Skat Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har ikke tilladelse til at tilføje eller opdatere poster før {0}
-DocType: BOM,Item Image (if not slideshow),Item Billede (hvis ikke lysbilledshow)
+DocType: BOM,Item Image (if not slideshow),Varebillede (hvis ikke lysbilledshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Kunde eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timesats / 60) * TidsforbrugIMinutter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vælg stykliste
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Vælg stykliste
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Omkostninger ved Leverede varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellem Fra dato og Til dato
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Skoler
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen orlov rekord fundet for medarbejderen {0} for {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Indtast venligst firma først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vælg venligst firma først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Vælg venligst firma 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 +27,Target On,Target On
 DocType: BOM,Total Cost,Omkostninger i alt
@@ -178,23 +180,23 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Lægemidler
 DocType: Purchase Invoice Item,Is Fixed Asset,Er anlægsaktiv
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}","Tilgængelige qty er {0}, du har brug for {1}"
-DocType: Expense Claim Detail,Claim Amount,Krav Beløb
-DocType: Employee,Mr,Hr
+DocType: Expense Claim Detail,Claim Amount,Beløb
+DocType: Employee,Mr,Hr.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Doppelt kundegruppe forefindes i Kundegruppetabellen
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Leverandørtype / leverandør
 DocType: Naming Series,Prefix,Præfiks
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Forbrugsmaterialer
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Import-log
-DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Træk Materiale Anmodning af typen Fremstilling på grundlag af de ovennævnte kriterier
+DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Hent materialeanmodning af typen Fremstilling på grundlag af de ovennævnte kriterier
 DocType: Training Result Employee,Grade,Grad
 DocType: Sales Invoice Item,Delivered By Supplier,Leveret af Leverandøren
 DocType: SMS Center,All Contact,Alle Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Produktionsordre allerede skabt for alle poster med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årsløn
 DocType: Daily Work Summary,Daily Work Summary,Daglige arbejde Summary
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukning regnskabsår
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosset
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vælg eksisterende firma for at danne kontoplanen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Udgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vælg Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra indtastning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit (firmavaluta)
 DocType: Delivery Note,Installation Status,Installation status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ønsker du at opdatere fremmøde? <br> Present: {0} \ <br> Fraværende: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Accepteret + Afvist skal være lig med Modtaget mængde for vare {0}
 DocType: Request for Quotation,RFQ-,AT-
 DocType: Item,Supply Raw Materials for Purchase,Supply råstoffer til Indkøb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Mindst én form for betaling er nødvendig for POS faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Mindst én form for betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkterne på en liste
 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"
@@ -220,8 +222,8 @@
 DocType: BOM Replace Tool,New BOM,Ny stykliste
 DocType: Depreciation Schedule,Make Depreciation Entry,Foretag Afskrivninger indtastning
 DocType: Appraisal Template Goal,KRA,KRA
-DocType: Lead,Request Type,Anmodning Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Opret medarbejder
+DocType: Lead,Request Type,Anmodningstype
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Opret medarbejder
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Udførelse
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Oplysninger om de gennemførte transaktioner.
@@ -233,10 +235,11 @@
 DocType: Customer,Individual,Individuel
 DocType: Interest,Academics User,akademikere Bruger
 DocType: Cheque Print Template,Amount In Figure,Beløb I figur
-DocType: Employee Loan Application,Loan Info,lån Info
+DocType: Employee Loan Application,Loan Info,Låneinformation
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedligeholdelse besøg.
 DocType: SMS Settings,Enter url parameter for message,Indtast url parameter for besked
 DocType: POS Profile,Customer Groups,Kundegrupper
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansrapporter
 DocType: Guardian,Students,Studerende
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler for anvendelse af priser og rabat.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste skal være gældende for at købe eller sælge
@@ -256,43 +259,43 @@
 DocType: Bank Guarantee,Bank Account,Bankkonto
 DocType: Leave Type,Allow Negative Balance,Tillad Negativ Balance
 DocType: Employee,Create User,Opret bruger
-DocType: Selling Settings,Default Territory,Standard Territory
+DocType: Selling Settings,Default Territory,Standardområde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +53,Television,Fjernsyn
 DocType: Production Order Operation,Updated via 'Time Log',Opdateret via &#39;Time Log&#39;
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beløb kan ikke være større end {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Liste for denne transaktion
 DocType: Company,Default Payroll Payable Account,Standard Payroll Betales konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Opdatér E-mailgruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Opdatér E-mailgruppe
 DocType: Sales Invoice,Is Opening Entry,Åbningspost
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nævne, hvis ikke-standard tilgodehavende konto gældende"
 DocType: Course Schedule,Instructor Name,Instruktør Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,"For Warehouse er nødvendig, før Indsend"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Til lager skal angives før godkendelse
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Modtaget On
 DocType: Sales Partner,Reseller,Forhandler
-DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis markeret, vil omfatte ikke-lagervarer i Material anmodninger."
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis markeret, vil ikke-lagervarer i materialeanmodningerne blive medtaget."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,Indtast firma
-DocType: Delivery Note Item,Against Sales Invoice Item,Mod Sales Invoice varer
-,Production Orders in Progress,Produktionsordrer i Progress
+DocType: Delivery Note Item,Against Sales Invoice Item,Mod salgsfakturavarer
+,Production Orders in Progress,Igangværende produktionsordrer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontant fra Finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage er fuld, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontaktperson
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tilføj ubrugte blade fra tidligere tildelinger
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Næste gentagende {0} vil blive oprettet den {1}
 DocType: Sales Partner,Partner website,Partner hjemmeside
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Tilføj vare
 ,Contact Name,Kontaktnavn
-DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier Kursus Assessment
+DocType: Course Assessment Criteria,Course Assessment Criteria,Kriterier for kursusvurdering
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Opretter lønseddel for ovennævnte kriterier.
-DocType: POS Customer Group,POS Customer Group,POS Customer Group
+DocType: POS Customer Group,POS Customer Group,Kassesystem-kundegruppe
 DocType: Cheque Print Template,Line spacing for amount in words,Linjeafstand for beløb i ord
 DocType: Vehicle,Additional Details,Yderligere detaljer
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ingen beskrivelse
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Indkøbsanmodning.
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Dette er baseret på de timesedler oprettes imod denne sag
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Nettoløn kan ikke være mindre end 0
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,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/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Kun den valgte fraværsgodkender kan godkende denne fraværsansøgning
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,Lindre Dato skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Blade pr år
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Fravær pr. år
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Række {0}: Tjek venligst &quot;Er Advance &#39;mod konto {1}, hvis dette er et forskud post."
 apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},Lager {0} ikke hører til firmaet {1}
 DocType: Email Digest,Profit & Loss,Profit &amp; Loss
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale omkostninger (via tidsregistrering)
 DocType: Item Website Specification,Item Website Specification,Item Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Fravær blokeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Vare {0} har nået slutningen af sin levetid på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årligt
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Afstemning Item
 DocType: Stock Entry,Sales Invoice No,Salgsfakturanr.
@@ -312,20 +315,20 @@
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,Den unikke id til at spore alle tilbagevendende fakturaer. Det genereres på send.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Software Developer
 DocType: Item,Minimum Order Qty,Minimum Antal
-DocType: Pricing Rule,Supplier Type,Leverandør Type
-DocType: Course Scheduling Tool,Course Start Date,Kursusstart
-,Student Batch-Wise Attendance,Student Batch-Wise Fremmøde
-DocType: POS Profile,Allow user to edit Rate,Tillad brugeren at redigere Rate
+DocType: Pricing Rule,Supplier Type,Leverandørtype
+DocType: Course Scheduling Tool,Course Start Date,Kursusstartdato
+,Student Batch-Wise Attendance,Fremmøde efter elevgrupper
+DocType: POS Profile,Allow user to edit Rate,Tillad brugeren at redigere satsen
 DocType: Item,Publish in Hub,Offentliggør i Hub
 DocType: Student Admission,Student Admission,Studerende optagelse
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Vare {0} er aflyst
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiale Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Vare {0} er aflyst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Materialeanmodning
 DocType: Bank Reconciliation,Update Clearance Date,Opdatering Clearance Dato
 DocType: Item,Purchase Details,Indkøbsdetaljer
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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
+DocType: Shipping Rule,Worldwide Shipping,Levering til hele verden
 DocType: Student Guardian,Mother,Mor
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Bekræftede ordrer fra kunder.
 DocType: Purchase Receipt Item,Rejected Quantity,Afvist Mængde
@@ -341,83 +344,82 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,Vælg Charge Type først
 DocType: Student Group Student,Student Group Student,Elev i elevgruppe
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Seneste
-DocType: Vehicle Service,Inspection,Inspektion
+DocType: Vehicle Service,Inspection,Kontrol
 DocType: Email Digest,New Quotations,Nye tilbud
-DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Emails lønseddel til medarbejderen baseret på foretrukne e-mail er valgt i Medarbejder
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,"Lønseddel sendes til medarbejderen på e-mail, på baggrund af den foretrukne e-mailadresse der er valgt for medarbejderen"
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,"Den første fraværsgodkender i listen, vil blive markeret som standard-fraværsgodkender"
-DocType: Tax Rule,Shipping County,Forsendelse County
+DocType: Tax Rule,Shipping County,Anvendes ikke
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Hjælp
-DocType: Asset,Next Depreciation Date,Næste Afskrivninger Dato
+DocType: Asset,Next Depreciation Date,Næste afskrivningsdato
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Aktivitet Omkostninger per Medarbejder
 DocType: Accounts Settings,Settings for Accounts,Indstillinger for regnskab
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Leverandør faktura nr eksisterer i købsfaktura {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrer Sales Person Tree.
-DocType: Job Applicant,Cover Letter,Cover Letter
+DocType: Job Applicant,Cover Letter,Følgebrev
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Udestående Checks og Indlån at rydde
 DocType: Item,Synced With Hub,Synkroniseret med Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Forkert Adgangskode
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Rækken # {0}: {1} kan ikke være negativ for vare {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Forkert adgangskode
 DocType: Item,Variant Of,Variant af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Afsluttet Antal kan ikke være større end &#39;antal til Fremstilling&#39;
 DocType: Period Closing Voucher,Closing Account Head,Lukning konto Hoved
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkulær reference Fejl
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Guardian1 Navn
-DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I Words (eksport) vil være synlig, når du gemmer følgesedlen."
+DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,"I ord (udlæsning) vil være synlig, når du gemmer følgesedlen."
 DocType: Cheque Print Template,Distance from left edge,Afstand fra venstre kant
 apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} enheder af [{1}] (# Form / vare / {1}) findes i [{2}] (# Form / Warehouse / {2})
-DocType: Lead,Industry,Industri
+DocType: Lead,Industry,Branche
 DocType: Employee,Job Profile,Stillingsprofil
-DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på mail om oprettelse af automatiske Materiale Request
+DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Give besked på e-mail om oprettelse af automatiske materialeanmodninger
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Fakturatype
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Følgeseddel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Følgeseddel
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Opsætning Skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Udgifter Solgt Asset
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} indtastet to gange i vareafgift
-DocType: Grade Interval,Min Score,Min score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} indtastet to gange i varemoms
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumé for denne uge og verserende aktiviteter
 DocType: Student Applicant,Admitted,Advokat
 DocType: Workstation,Rent Cost,Leje Omkostninger
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Beløb efter afskrivninger
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommende Kalender Events
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Kommende kalenderbegivenheder
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Vælg måned og år
 DocType: Employee,Company Email,Firma e-mail
 DocType: GL Entry,Debit Amount in Account Currency,Debetbeløb i Kontoens valuta
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ordreværdi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaktioner mod fest eller til intern overførsel
 DocType: Shipping Rule,Valid for Countries,Gælder for lande
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dette element er en skabelon, og kan ikke anvendes i transaktioner. Item attributter kopieres over i varianterne medmindre &#39;Ingen Copy &quot;er indstillet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Samlet Order Anses
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Medarbejderbetegnelse (fx CEO, direktør osv.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Indtast en værdi i feltet 'Gentagelsedag i måneden »felt værdi
 DocType: Sales Invoice,Rate at which Customer Currency is converted to customer's base currency,"Hastighed, hvormed kunden Valuta omdannes til kundens basisvaluta"
-DocType: Course Scheduling Tool,Course Scheduling Tool,Kursus Planlægning Tool
+DocType: Course Scheduling Tool,Course Scheduling Tool,Kursusplanlægningsværktøj
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Køb Faktura kan ikke foretages mod en eksisterende aktiv {1}
 DocType: Item Tax,Tax Rate,Skat
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede afsat til Medarbejder {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Vælg Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede sendt
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch nr skal være det samme som {1} {2}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Vælg Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Købsfaktura {0} er allerede godkendt
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Række # {0}: Partinr. skal være det samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (parti) af en vare.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debetbeløb
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Der kan kun være 1 konto pr. firma i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Se venligst vedhæftede fil
 DocType: Purchase Order,% Received,% Modtaget
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opret Elevgrupper
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Opsætning Allerede Complete !!
 ,Finished Goods,Færdigvarer
 DocType: Delivery Note,Instructions,Instruktioner
-DocType: Quality Inspection,Inspected By,Inspiceres af
-DocType: Maintenance Visit,Maintenance Type,Vedligeholdelse Type
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Løbenummer {0} ikke hører til følgeseddel {1}
+DocType: Quality Inspection,Inspected By,Kontrolleret af
+DocType: Maintenance Visit,Maintenance Type,Vedligeholdelsestype
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Serienummer {0} hører ikke til følgeseddel {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,ERPNext Demo
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Tilføj varer
-DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Item Quality Inspection Parameter
+DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,Kvalitetskontrolparameter
 DocType: Leave Application,Leave Approver Name,Fraværsgodkendernavn
 DocType: Depreciation Schedule,Schedule Date,Tidsplan Dato
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Tillæg, fradrag og andre lønarter"
@@ -427,16 +429,16 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Obligatorisk felt - Få studerende fra
 DocType: Program Enrollment,Enrolled courses,Indskrevne kurser
 DocType: Currency Exchange,Currency Exchange,Valutaveksling
-DocType: Asset,Item Name,Item Name
+DocType: Asset,Item Name,Varenavn
 DocType: Authorization Rule,Approving User  (above authorized value),Godkendelse Bruger (over autoriserede værdi)
 DocType: Email Digest,Credit Balance,Kreditsaldo
 DocType: Employee,Widowed,Enke
 DocType: Request for Quotation,Request for Quotation,Anmodning om tilbud
 DocType: Salary Slip Timesheet,Working Hours,Arbejdstider
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Skift start / aktuelle sekvensnummer af en eksisterende serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Opret ny kunde
-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.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Opret indkøbsordrer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Opret ny kunde
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Priser Regler fortsat gældende, er brugerne bedt om at indstille prioritet manuelt for at løse konflikter."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Opret indkøbsordrer
 ,Purchase Register,Indkøb Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gældende gebyrer
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), skal have rollen 'Godkendelse af fravær'"
 DocType: Purchase Receipt,Vehicle Date,Køretøj dato
 DocType: Student Log,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Årsag til at miste
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Tabsårsag
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Emneejer kan ikke være den samme som emnet
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Allokeret beløb kan ikke større end ikke-justerede beløb
 DocType: Announcement,Receiver,Modtager
@@ -456,40 +458,42 @@
 DocType: Purchase Invoice,Yearly,Årlig
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,Indtast omkostningssted
 DocType: Journal Entry Account,Sales Order,Salgsordre
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Gns. Salgskurs
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Gns. Salgssats
 DocType: Assessment Plan,Examiner Name,Censornavn
 DocType: Purchase Invoice Item,Quantity and Rate,Mængde og Pris
 DocType: Delivery Note,% Installed,% Installeret
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasseværelser / Laboratorier osv hvor foredrag kan planlægges.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Indtast venligst firmanavn først
-DocType: Purchase Invoice,Supplier Name,Leverandør Navn
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext Manual
-DocType: Account,Is Group,Is Group
-DocType: Email Digest,Pending Purchase Orders,Afventer indkøbsordrer
-DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Automatisk Serial nr baseret på FIFO
+DocType: Purchase Invoice,Supplier Name,Leverandørnavn
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Læs ERPNext-håndbogen
+DocType: Account,Is Group,Er en kontogruppe
+DocType: Email Digest,Pending Purchase Orders,Afventende indkøbsordrer
+DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Angiv serienumrene automatisk baseret på FIFO-princippet
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Tjek entydigheden af  leverandørfakturanummeret
 DocType: Vehicle Service,Oil Change,Olieskift
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Til sag nr.' kan ikke være mindre end 'Fra sag nr.'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
-DocType: Production Order,Not Started,Ikke igang
+DocType: Production Order,Not Started,Ikke igangsat
 DocType: Lead,Channel Partner,Channel Partner
 DocType: Account,Old Parent,Gammel Parent
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - skoleår
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tilpas den indledende tekst, der går som en del af denne e-mail. Hver transaktion har en separat indledende tekst."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Indtast venligst standardbetalt konto for virksomheden {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale indstillinger for alle produktionsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskab Frozen Op
 DocType: SMS Log,Sent On,Sendt On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valgt flere gange i attributter Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Medarbejder rekord er oprettet ved hjælp valgte felt.
 DocType: Sales Order,Not Applicable,ikke gældende
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Ferie mester.
 DocType: Request for Quotation Item,Required Date,Forfaldsdato
 DocType: Delivery Note,Billing Address,Faktureringsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Indtast venligst Varenr.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Indtast venligst Varenr.
 DocType: BOM,Costing,Koster
-DocType: Tax Rule,Billing County,Fakturering County
+DocType: Tax Rule,Billing County,Anvendes ikke
 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 inkluderet i Print Sats / Print Beløb"
-DocType: Request for Quotation,Message for Supplier,Besked til Leverandøren
+DocType: Request for Quotation,Message for Supplier,Besked til leverandøren
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Antal i alt
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2 Email ID
 DocType: Item,Show in Website (Variant),Vis i Website (Variant)
@@ -500,9 +504,10 @@
 DocType: Packing Slip,From Package No.,Fra pakkenr.
 DocType: Item Attribute,To Range,At Rækkevidde
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Værdipapirer og Indlån
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke ændre værdiansættelsesmetode, da der er transaktioner mod nogle poster, der ikke har egen værdiansættelsesmetode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tildelt fravær allokeret i alt er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse af en ledig stilling
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for dag
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afventende aktiviteter for i dag
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,Fremmøde rekord.
 DocType: Salary Structure,Salary Component for timesheet based payroll.,Lønart til tidsregistering
 DocType: Sales Order Item,Used for Production Plan,Bruges til Produktionsplan
@@ -511,35 +516,35 @@
 DocType: Customer,Buyer of Goods and Services.,Køber af varer og tjenesteydelser.
 DocType: Journal Entry,Accounts Payable,Kreditor
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,De valgte styklister er ikke for den samme vare
-DocType: Pricing Rule,Valid Upto,Gyldig Op
+DocType: Pricing Rule,Valid Upto,Gyldig til
 DocType: Training Event,Workshop,Værksted
-apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Nævne et par af dine kunder. De kunne være organisationer eller enkeltpersoner.
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Nævn et par af dine kunder. Disse kunne være firmaer eller enkeltpersoner.
 ,Enough Parts to Build,Nok Dele til Build
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Direkte indkomst
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Kan ikke filtrere baseret på konto, hvis grupperet efter konto"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Kontorfuldmægtig
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vælg venligst Kursus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vælg kursus
 DocType: Timesheet Detail,Hrs,timer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vælg firma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Vælg firma
 DocType: Stock Entry Detail,Difference Account,Forskel konto
-apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Opgave kan ikke lukkes, da den afhængig opgave {0} ikke er lukket."
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst Warehouse for hvilke Materiale Request vil blive rejst
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Opgaven kan ikke lukkes, da dens afhængige opgave {0} ikke er lukket."
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Indtast venligst lager for hvilket materialeanmodning vil blive rejst
 DocType: Production Order,Additional Operating Cost,Yderligere driftsomkostninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","At fusionere, skal følgende egenskaber være ens for begge poster"
 DocType: Shipping Rule,Net Weight,Nettovægt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Køb
 ,Serial No Warranty Expiry,Serienummer garantiudløb
-DocType: Sales Invoice,Offline POS Name,Offline POS Navn
+DocType: Sales Invoice,Offline POS Name,Offline-kassesystemnavn
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Angiv venligst lønklasse for Tærskel 0%
 DocType: Sales Order,To Deliver,Til at levere
 DocType: Purchase Invoice Item,Item,Vare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seriel ingen post kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serienummervare kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Difference (Dr - Cr)
 DocType: Account,Profit and Loss,Resultatopgørelse
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Håndtering af underleverancer
-DocType: Project,Project will be accessible on the website to these users,Projekt vil være tilgængelig på hjemmesiden for at disse brugere
+DocType: Project,Project will be accessible on the website to these users,Sagen vil være tilgængelig på hjemmesiden for disse brugere
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,"Hastighed, hvormed Prisliste valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/setup/doctype/company/company.py +59,Account {0} does not belong to company: {1},Konto {0} tilhører ikke virksomheden: {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation already used for another company,Forkortelse allerede brugt til et andet selskab
@@ -550,50 +555,50 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tilvækst kan ikke være 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slet Company Transaktioner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referencenummer og reference Dato er obligatorisk for Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tilføj / rediger Skatter og Afgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør fakturanr.
 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/stock/doctype/serial_no/serial_no.py +154,"Cannot delete Serial No {0}, as it is used in stock transactions","Kan ikke slette serienummer {0}, eftersom det bruges på lagertransaktioner"
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Lukning (Cr)
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flyt Item
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,Flyt vare
 DocType: Serial No,Warranty Period (Days),Garantiperiode (dage)
 DocType: Installation Note Item,Installation Note Item,Installation Bemærk Vare
-DocType: Production Plan Item,Pending Qty,Afventer Antal
+DocType: Production Plan Item,Pending Qty,Afventende antal
 DocType: Budget,Ignore,Ignorér
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS sendt til følgende numre: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Opsætning kontrol dimensioner til udskrivning
 DocType: Salary Slip,Salary Slip Timesheet,Lønseddel Timeseddel
-apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise kvittering
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Leverandør Warehouse obligatorisk for underentreprise købskvittering
 DocType: Pricing Rule,Valid From,Gyldig fra
 DocType: Sales Invoice,Total Commission,Samlet Kommissionen
 DocType: Pricing Rule,Sales Partner,Salgs Partner
 DocType: Buying Settings,Purchase Receipt Required,Købskvittering påkrævet
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelse Rate er obligatorisk, hvis Åbning Stock indtastet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Værdiansættelsesværdi er obligatorisk, hvis Åbning Stock indtastet"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster i faktureringstabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vælg Company og Party Type først
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansiel / regnskabsår.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akkumulerede værdier
-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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Opret salgsordre
-DocType: Project Task,Project Task,Project Task
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Beklager, serienumre kan ikke blive slået sammen"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Opret salgsordre
+DocType: Project Task,Project Task,Sagsopgave
 ,Lead Id,Emne-Id
 DocType: C-Form Invoice Detail,Grand Total,Beløb i alt
 DocType: Training Event,Course,Kursus
 DocType: Timesheet,Payslip,Lønseddel
-apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Vare kurv
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,Varekurv
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,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: Issue,Resolution,Løsning
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Leveret: {0}
 DocType: Expense Claim,Payable Account,Betales konto
-DocType: Payment Entry,Type of Payment,Type af betaling
-DocType: Sales Order,Billing and Delivery Status,Fakturering og levering status
-DocType: Job Applicant,Resume Attachment,Genoptag Attachment
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gentag kunder
+DocType: Payment Entry,Type of Payment,Betalingsmåde
+DocType: Sales Order,Billing and Delivery Status,Fakturering og leveringsstatus
+DocType: Job Applicant,Resume Attachment,Vedhæft CV
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gamle kunder
 DocType: Leave Control Panel,Allocate,Tildele
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Salg Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Salg Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Bemærk: I alt tildelt blade {0} bør ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Announcement,Posted By,Bogført af
 DocType: Item,Delivered by Supplier (Drop Ship),Leveret af Leverandøren (Drop Ship)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Tilbud til
 DocType: Lead,Middle Income,Midterste indkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åbning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Tildelte beløb kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Angiv venligst selskabet
 DocType: Purchase Order Item,Billed Amt,Billed Amt
@@ -611,15 +616,15 @@
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Et logisk lager hvor lagerændringer foretages.
 DocType: Repayment Schedule,Principal Amount,hovedstol
 DocType: Employee Loan Application,Total Payable Interest,Samlet Betales Renter
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timesheet
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salgsfaktura tidsregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referencenummer &amp; Reference Dato er nødvendig for {0}
-DocType: Process Payroll,Select Payment Account to make Bank Entry,Vælg Betalingskonto at gøre Bank indtastning
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
-apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tilføj til Knowledge Base
+DocType: Process Payroll,Select Payment Account to make Bank Entry,Vælg Betalingskonto til bankbetalingerne
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Opret Medarbejder optegnelser til at styre blade, udgiftsopgørelser og løn"
+apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tilføj til vidensbasen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Forslag Skrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling indtastning Fradrag
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,En anden salgsmedarbejder {0} eksisterer med samme Medarbejder-id
-DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Hvis markeret, råmaterialer til varer, der er i underentreprise vil indgå i materialet Anmodning"
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Hvis markeret, vil råmaterialer til varer, der er i underentreprise indgå i materialeanmodningerne"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Masters
 DocType: Assessment Plan,Maximum Assessment Score,Maksimal Score Assessment
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Opdatering Bank transaktionstidspunkterne
@@ -628,11 +633,11 @@
 DocType: Packing Slip Item,DN Detail,DN Detail
 DocType: Training Event,Conference,Konference
 DocType: Timesheet,Billed,Billed
-DocType: Batch,Batch Description,Batch Beskrivelse
+DocType: Batch,Batch Description,Partibeskrivelse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Oprettelse af elevgrupper
 apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Betaling Gateway konto ikke oprettet, skal du oprette en manuelt."
 DocType: Sales Invoice,Sales Taxes and Charges,Salg Skatter og Afgifter
-DocType: Employee,Organization Profile,Organisation profil
+DocType: Employee,Organization Profile,Organisationsprofil
 DocType: Student,Sibling Details,søskende Detaljer
 DocType: Vehicle Service,Vehicle Service,Køretøj service
 apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,udløser automatisk feedback anmodning baseret på betingelser.
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ikke i regnskabsåret {2}
 DocType: Buying Settings,Settings for Buying Module,Indstillinger til køb modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} hører ikke til selskab {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Indtast venligst kvittering først
-DocType: Buying Settings,Supplier Naming By,Leverandør Navngivning Af
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Indtast venligst købskvittering først
+DocType: Buying Settings,Supplier Naming By,Leverandørnavngivning af
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Så vil prisreglerne blive filtreret på kunde, kundegruppe, område, leverandør, leverandørtype, kampagne, salgspartner etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Netto Ændring i Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Medarbejder Lån Management
 DocType: Employee,Passport Number,Pasnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Forholdet til Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leder
 DocType: Payment Entry,Payment From / To,Betaling fra/til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datointerval
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kreditmaksimum er mindre end nuværende udestående beløb for kunden. Credit grænse skal være mindst {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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 'Sortér efter ' ikke kan være samme
@@ -664,9 +668,9 @@
 DocType: Installation Note,IN-,I-
 DocType: Production Order Operation,In minutes,I minutter
 DocType: Issue,Resolution Date,Løsningsdato
-DocType: Student Batch Name,Batch Name,Batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeseddel oprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
+DocType: Student Batch Name,Batch Name,Partinavn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timeseddel oprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Indstil standard Kontant eller bank konto i mode for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Indskrive
 DocType: Selling Settings,Customer Naming By,Kundenavngivning af
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Vil vise den studerende som Present i Student Månedlig Deltagelse Rapport
@@ -680,7 +684,7 @@
 DocType: Quotation Item,Item Balance,Item Balance
 DocType: Sales Invoice,Packing List,Pakkeliste
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Indkøbsordrer givet til leverandører.
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publishing
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Udgivning
 DocType: Activity Cost,Projects User,Sagsbruger
 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 +157,{0}: {1} not found in Invoice Details table,{0}: {1} blev ikke fundet i Invoice Detaljer tabel
@@ -694,21 +698,21 @@
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Slutte
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Grundlag
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Grundlag
 DocType: Timesheet,Total Billed Hours,Total Billed Timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløb
 DocType: Journal Entry,Bill No,Bill Ingen
 DocType: Company,Gain/Loss Account on Asset Disposal,Gevinst/tabskonto vedr. salg af anlægsaktiv
 DocType: Vehicle Log,Service Details,Service Detaljer
 DocType: Purchase Invoice,Quarterly,Kvartalsvis
-DocType: Selling Settings,Delivery Note Required,Følgeseddel Nødvendig
+DocType: Selling Settings,Delivery Note Required,Følgeseddel er påkrævet
 DocType: Bank Guarantee,Bank Guarantee Number,Bankgaranti nummer
 DocType: Assessment Criteria,Assessment Criteria,vurderingskriterier
 DocType: BOM Item,Basic Rate (Company Currency),Basissats (firmavaluta)
 DocType: Student Attendance,Student Attendance,Student Fremmøde
 DocType: Sales Invoice Timesheet,Time Sheet,Tidsregistrering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush råstoffer baseret på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Indtast venligst varedetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Indtast venligst varedetaljer
 DocType: Interest,Interest,Interesse
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre-Sale
 DocType: Purchase Receipt,Other Details,Andre detaljer
@@ -717,28 +721,27 @@
 DocType: Vehicle,Odometer Value (Last),Kilometerstand (sidste aflæsning)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Betalingspost er allerede dannet
-DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel Stock
+DocType: Purchase Receipt Item Supplied,Current Stock,Aktuel lagerbeholdning
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke er knyttet til Vare {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Eksempel lønseddel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Eksempel lønseddel
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er indtastet flere gange
 DocType: Account,Expenses Included In Valuation,Udgifter inkluderet i Værdiansættelse
 DocType: Hub Settings,Seller City,Sælger By
 ,Absent Student Report,Fraværende studerende rapport
 DocType: Email Digest,Next email will be sent on:,Næste email vil blive sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Ansættelsesvilkår
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Vare 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/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} findes ikke
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal Consumed Per Unit
 DocType: Serial No,Warranty Expiry Date,Garanti udløbsdato
 DocType: Material Request Item,Quantity and Warehouse,Mængde og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommissionen Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserie for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vælg venligst Program
 DocType: Project,Estimated Cost,Anslåede omkostninger
-DocType: Purchase Order,Link to material requests,Link til materiale anmodninger
+DocType: Purchase Order,Link to material requests,Link til materialeanmodninger
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aerospace
 DocType: Journal Entry,Credit Card Entry,Credit Card indtastning
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Firma og regnskab
@@ -748,14 +751,14 @@
 DocType: Selling Settings,Close Opportunity After Days,Luk salgsmulighed efter dage
 ,Reserved,Reserveret
 DocType: Purchase Order,Supply Raw Materials,Supply råmaterialer
-DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Den dato, hvor næste faktura vil blive genereret. Det genereres på send."
+DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,"Datoen, hvor den næste faktura vil blive dannet. Den dannes ved godkendelsen."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Omsætningsaktiver
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ikke en lagervare
 DocType: Mode of Payment Account,Default Account,Standard-konto
 DocType: Payment Entry,Received Amount (Company Currency),Modtaget beløb (firmavaluta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
-apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlige off dag
-DocType: Production Order Operation,Planned End Time,Planned Sluttid
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"""Er emne"" skal markeres, hvis salgsmulighed er lavet fra emne"
+apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vælg ugentlig fridag
+DocType: Production Order Operation,Planned End Time,Planlagt sluttid
 ,Sales Person Target Variance Item Group-Wise,Salg Person Target Variance Item Group-Wise
 apps/erpnext/erpnext/accounts/doctype/account/account.py +97,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
@@ -769,9 +772,10 @@
 DocType: Opportunity,Opportunity From,Salgsmulighed fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedlige lønseddel.
 DocType: BOM,Website Specifications,Website Specifikationer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} af typen {1}
 DocType: Warranty Claim,CI-,Cl-
-apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Række {0}: Konvertering Factor er obligatorisk
+apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Række {0}: konverteringsfaktor er obligatorisk
 DocType: Employee,A+,A +
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}","Flere Pris Regler eksisterer med samme kriterier, skal du løse konflikter ved at tildele prioritet. Pris Regler: {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +434,Cannot deactivate or cancel BOM as it is linked with other BOMs,"Kan ikke deaktivere eller annullere en stykliste, som det er forbundet med andre styklister"
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Sager
 DocType: Quality Inspection Reading,Reading 7,Reading 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Delvist Bestilt
 DocType: Expense Claim Detail,Expense Claim Type,Udlægstype
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardindstillinger for Indkøbskurv
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Anlægsasset er kasseret via finanspost {0}
@@ -810,14 +815,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Kontorholdudgifter
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Opsætning Email-konto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Indtast vare først
-DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioneret Beløb kan ikke være større end krav Beløb i Row {0}.
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Indtast vare først
+DocType: Account,Liability,Passiver
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bevilliget beløb kan ikke være større end udlægsbeløbet i række {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard vareforbrug konto
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prisliste ikke valgt
-DocType: Employee,Family Background,Familie Baggrund
+DocType: Employee,Family Background,Familiebaggrund
 DocType: Request for Quotation Supplier,Send Email,Send e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advarsel: Ugyldig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advarsel: ugyldig vedhæftet fil {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ingen Tilladelse
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere baseret på Party, skal du vælge Party Type først"
@@ -826,23 +831,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,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/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Row # {0}: Asset {1} skal indsendes
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Række # {0}: Aktiv {1} skal godkendes
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen medarbejder fundet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Hvis underentreprise til en sælger
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede opdateret.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede opdateret.
 DocType: SMS Center,All Customer Contact,Alle kundekontakter
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload lager balance via csv.
 DocType: Warehouse,Tree Details,Tree Detaljer
 DocType: Training Event,Event Status,begivenhed status
-,Support Analytics,Support Analytics
+,Support Analytics,Supportanalyser
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.","Hvis du har spørgsmål, er du velkommen til at kontakte os."
 DocType: Item,Website Warehouse,Webside-Lager
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindste fakturabeløb
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: omkostningssted {2} tilhører ikke firma {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} kan ikke være en gruppe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående &#39;{doctype}&#39; tabel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DOCNAME} findes ikke i ovenstående &#39;{doctype}&#39; tabel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tidsregistreringskladde {0} er allerede afsluttet eller annulleret
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Ingen opgaver
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dag i den måned, hvor auto faktura vil blive genereret f.eks 05, 28 osv"
 DocType: Asset,Opening Accumulated Depreciation,Åbning Akkumulerede afskrivninger
@@ -850,15 +855,15 @@
 DocType: Program Enrollment Tool,Program Enrollment Tool,Program Tilmelding Tool
 apps/erpnext/erpnext/config/accounts.py +299,C-Form records,C-Form optegnelser
 apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,Kunde og leverandør
-DocType: Email Digest,Email Digest Settings,E-mail-Digest-indstillinger
+DocType: Email Digest,Email Digest Settings,Indstillinger for e-mail nyhedsbreve
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +346,Thank you for your business!,Tak for din forretning!
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Support forespørgsler fra kunder.
 ,Production Order Stock Report,Produktionsordre Stock Report
-DocType: HR Settings,Retirement Age,pensionsalder
+DocType: HR Settings,Retirement Age,Pensionsalder
 DocType: Bin,Moving Average Rate,Glidende gennemsnit Rate
 DocType: Production Planning Tool,Select Items,Vælg varer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} mod regning {1} dateret {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursus Schedule
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursusskema
 DocType: Maintenance Visit,Completion Status,Afslutning status
 DocType: HR Settings,Enter retirement age in years,Indtast pensionsalderen i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,9 +871,9 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillad løbet levering eller modtagelse op denne procent
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Importér fremmøde
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Activity Log
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto Resultat / Loss
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Nettoresultat
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisk skrive besked på indsendelse af transaktioner.
 DocType: Production Order,Item To Manufacture,Item Til Fremstilling
 apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1} status er {2}
@@ -877,10 +882,10 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Indkøbsordre til betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Forventet antal
 DocType: Sales Invoice,Payment Due Date,Sidste betalingsdato
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Variant {0} findes allerede med samme attributter
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Åbner'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åbn Opgaver
-DocType: Notification Control,Delivery Note Message,Levering Note Message
+DocType: Notification Control,Delivery Note Message,Følgeseddelmeddelelse
 DocType: Expense Claim,Expenses,Udgifter
 DocType: Item Variant Attribute,Item Variant Attribute,Item Variant Attribut
 ,Purchase Receipt Trends,Købskvittering Tendenser
@@ -891,9 +896,9 @@
 DocType: Company,Registration Details,Registrering Detaljer
 DocType: Timesheet,Total Billed Amount,Samlet Faktureret beløb
 DocType: Item Reorder,Re-Order Qty,Re-prisen evt
-DocType: Leave Block List Date,Leave Block List Date,Lad Block List Dato
+DocType: Leave Block List Date,Leave Block List Date,Fraværsblokeringsdato
 DocType: Pricing Rule,Price or Discount,Pris eller rabat
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total gældende takster i kvittering Elementer tabel skal være det samme som de samlede skatter og afgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total gældende takster i købskvitteringsvaretabel skal være det samme som de samlede skatter og afgifter
 DocType: Sales Team,Incentives,Incitamenter
 DocType: SMS Log,Requested Numbers,Anmodet Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Kun Opnå råstoffer
@@ -901,8 +906,8 @@
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivering »anvendelse til indkøbskurv"", som indkøbskurv er aktiveret, og der skal være mindst én momsregel til Indkøbskurven"
 apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Betaling indtastning {0} er forbundet mod Order {1}, kontrollere, om det skal trækkes forhånd i denne faktura."
 DocType: Sales Invoice Item,Stock Details,Stock Detaljer
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projekt Value
-apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Point-of-Sale
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Sagsværdi
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Kassesystem
 DocType: Vehicle Log,Odometer Reading,kilometerstand
 apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'","Konto balance er kredit, Du har ikke lov til at ændre 'Balancetype' til 'debet'"
 DocType: Account,Balance must be,Balance skal være
@@ -912,7 +917,7 @@
 DocType: Purchase Taxes and Charges,On Previous Row Total,På Forrige Row Total
 DocType: Purchase Invoice Item,Rejected Qty,afvist Antal
 DocType: Salary Slip,Working Days,Arbejdsdage
-DocType: Serial No,Incoming Rate,Indgående Rate
+DocType: Serial No,Incoming Rate,Indgående sats
 DocType: Packing Slip,Gross Weight,Bruttovægt
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,"Navnet på dit firma, som du oprette i dette system."
 DocType: HR Settings,Include holidays in Total no. of Working Days,Medtag helligdage i det totale antal arbejdsdage
@@ -922,21 +927,21 @@
 DocType: Supplier Quotation,Is Subcontracted,Underentreprise
 DocType: Item Attribute,Item Attribute Values,Item Egenskab Værdier
 DocType: Examination Result,Examination Result,eksamensresultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Købskvittering
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Købskvittering
 ,Received Items To Be Billed,Modtagne varer skal faktureres
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Indsendte lønsedler
-DocType: Employee,Ms,Ms
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Godkendte lønsedler
+DocType: Employee,Ms,Fru
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Henvisning Doctype skal være en af {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Henvisning Doctype skal være en af {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Kan ikke finde Time Slot i de næste {0} dage til Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale til sub-enheder
-apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Områder
+apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgspartnere og områder
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Kan ikke automatisk oprette konto, da der allerede bestand balance i kontoen. Du skal oprette en matchende konto, før du kan foretage en post på dette lager"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,Stykliste {0} skal være aktiv
 DocType: Journal Entry,Depreciation Entry,Afskrivninger indtastning
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,Vælg dokumenttypen først
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +65,Cancel Material Visits {0} before cancelling this Maintenance Visit,"Annuller Materiale Besøg {0}, før den annullerer denne vedligeholdelse Besøg"
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Løbenummer {0} ikke hører til Vare {1}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +209,Serial No {0} does not belong to Item {1},Serienummer {0} hører ikke til vare {1}
 DocType: Purchase Receipt Item Supplied,Required Qty,Nødvendigt antal
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +223,Warehouses with existing transaction can not be converted to ledger.,Lager med eksisterende transaktioner kan ikke konverteres til Finans.
 DocType: Bank Reconciliation,Total Amount,Samlet beløb
@@ -947,14 +952,13 @@
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +69,Publish to sync items,Udgive synkronisere emner
 DocType: Bank Reconciliation,Account Currency,Konto Valuta
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,Henvis Round Off-konto i selskabet
-DocType: Purchase Receipt,Range,Range
+DocType: Purchase Receipt,Range,Periode
 DocType: Supplier,Default Payable Accounts,Standard betales Konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbejder {0} er ikke aktiv eller findes ikke
 DocType: Fee Structure,Components,Lønarter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varianter {0} opdateret
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Indtast Asset kategori i Item {0}
 DocType: Quality Inspection Reading,Reading 6,Læsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uden nogen negativ udestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Købsfaktura Advance
 DocType: Hub Settings,Sync Now,Synkroniser nu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Række {0}: Kredit indgang ikke kan knyttes med en {1}
@@ -963,16 +967,16 @@
 DocType: Lead,LEAD-,EMNE-
 DocType: Employee,Permanent Address Is,Fast 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 +167,The Brand,Brand
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,Varemærket
 DocType: Employee,Exit Interview Details,Exit Interview Detaljer
 DocType: Item,Is Purchase Item,Er Indkøb Item
 DocType: Asset,Purchase Invoice,Købsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Nej
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nye salgsfaktura
-DocType: Stock Entry,Total Outgoing Value,Samlet Udgående Value
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nye salgsfaktura
+DocType: Stock Entry,Total Outgoing Value,Samlet værdi udgående
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Åbning Dato og Closing Datoen skal ligge inden samme regnskabsår
 DocType: Lead,Request for Information,Anmodning om information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synkroniser Offline fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synkroniser Offline fakturaer
 DocType: Payment Request,Paid,Betalt
 DocType: Program Fee,Program Fee,Program Fee
 DocType: Salary Slip,Total in words,I alt i ord
@@ -981,8 +985,8 @@
 DocType: Cheque Print Template,Has Print Format,Har Print Format
 DocType: Employee Loan,Sanctioned,sanktioneret
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Række # {0}: Angiv serienummer for vare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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 produktpakke-varer, lagre, serienumre og partier vil blive betragtet fra pakkelistetabellen. Hvis lager og parti er ens for alle pakkede varer for enhver produktpakkevare, kan disse værdier indtastes for den vigtigste vare, og værdierne vil blive kopieret til pakkelistetabellen."
 DocType: Job Opening,Publish on website,Udgiv på hjemmesiden
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunder.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Leverandørfakturadato kan ikke være større end bogføringsdatoen
@@ -993,75 +997,73 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Firmaets navn
 DocType: SMS Center,Total Message(s),Besked (er) i alt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Vælg Item for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Vælg Item for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Ekstra rabatprocent
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle de hjælpevideoer
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Se en liste over alle hjælpevideoerne
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"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
+DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Tillad brugeren at redigere prislistesatsen i transaktioner
+DocType: Pricing Rule,Max Qty,Maksimal mængde
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
 						Please enter a valid Invoice","Række {0}: Faktura {1} er ugyldig, kan det blive annulleret / findes ikke. \ Indtast en gyldig faktura"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / Kontant konto vil automatisk blive opdateret i Løn Kassekladde når denne tilstand er valgt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallerne for Grade kode {0} overlapper med intervaller kvalitet for andre kvaliteter. Tjek venligst intervaller {0} og {1} og prøv igen
 DocType: BOM,Raw Material Cost(Company Currency),Råmaterialeomkostninger (firmavaluta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle varer er allerede blevet overført til denne produktionsordre.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Prisen kan ikke være større end den sats, der anvendes i {1} {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Måler
 DocType: Workstation,Electricity Cost,Elektricitetsomkostninger
 DocType: HR Settings,Don't send Employee Birthday Reminders,Send ikke medarbejderfødselsdags- påmindelser
-DocType: Item,Inspection Criteria,Inspektion Kriterier
+DocType: Item,Inspection Criteria,Kontrolkriterier
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Overført
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload dit brevhoved og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Næste Afskrivninger Dato indtastes som tidligere dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næste afskrivningsdato er indtastet som tidligere dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Hvid
 DocType: SMS Center,All Lead (Open),Alle emner (åbne)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Række {0}: Antal ikke tilgængelig for {4} i lageret {1} på udstationering tid af posten ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Få forskud
-DocType: Item,Automatically Create New Batch,Opret automatisk nyt batch automatisk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Opret
+DocType: Item,Automatically Create New Batch,Opret automatisk et nyt parti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Opret
 DocType: Student Admission,Admission Start Date,Optagelse Startdato
 DocType: Journal Entry,Total Amount in Words,Samlet beløb i Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Der opstod en fejl. En sandsynlig årsag kan være, at du ikke har gemt formularen. Kontakt venligst support@erpnext.com hvis problemet fortsætter."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Indkøbskurv
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Bestil type skal være en af {0}
-DocType: Lead,Next Contact Date,Næste Kontakt Dato
+DocType: Lead,Next Contact Date,Næste kontakt d.
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Åbning Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Indtast konto for ændring beløb
-DocType: Student Batch Name,Student Batch Name,Student Kladdenavn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Indtast konto for returbeløb
+DocType: Student Batch Name,Student Batch Name,Elevgruppenavn
 DocType: Holiday List,Holiday List Name,Helligdagskalendernavn
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lånebeløb
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Skema Kursus
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Kursusskema
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Aktieoptioner
 DocType: Journal Entry Account,Expense Claim,Udlæg
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vil du virkelig gendanne dette kasserede anlægsaktiv?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},Antal for {0}
 DocType: Leave Application,Leave Application,Ansøg om fravær
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lad Tildeling Tool
-DocType: Leave Block List,Leave Block List Dates,Lad Block List Datoer
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Fraværstildelingsværktøj
+DocType: Leave Block List,Leave Block List Dates,Fraværsblokeringsdatoer
 DocType: Workstation,Net Hour Rate,Netto timeløn
-DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost kvittering
+DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost købskvittering
 DocType: Company,Default Terms,Standard Vilkår
 DocType: Packing Slip Item,Packing Slip Item,Pakkeseddelvare
 DocType: Purchase Invoice,Cash/Bank Account,Kontant / Bankkonto
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Angiv en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernede elementer uden nogen ændringer i mængde eller værdi.
 DocType: Delivery Note,Delivery To,Levering Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,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 +67,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabat
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabat
 DocType: Asset,Total Number of Depreciations,Samlet antal afskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margen
 DocType: Workstation,Wages,Løn
 DocType: Project,Internal,Intern
-DocType: Task,Urgent,Urgent
+DocType: Task,Urgent,Hurtigst muligt
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},Angiv en gyldig Row ID for rækken {0} i tabel {1}
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynde at bruge ERPNext
+apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +23,Go to the Desktop and start using ERPNext,Gå til skrivebordet og begynd at bruge ERPNext
 DocType: Item,Manufacturer,Producent
 DocType: Landed Cost Item,Purchase Receipt Item,Købskvittering vare
 DocType: Purchase Receipt,PREC-RET-,PREC-Retsinformation
@@ -1069,20 +1071,20 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveret Warehouse i kundeordre / færdigvarer Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Salgsbeløb
 DocType: Repayment Schedule,Interest Amount,Renter Beløb
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er bekostning Godkender til denne oplysning. Venligst Opdater &quot;Status&quot; og Gem
-DocType: Serial No,Creation Document No,Creation dokument nr
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du er udlægsgodkender til denne oplysning. Opdater ""Status"" og gem"
+DocType: Serial No,Creation Document No,Oprettet med dok.-nr.
 DocType: Issue,Issue,Issue
 DocType: Asset,Scrapped,Skrottet
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,Konto stemmer ikke overens med Firma
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varer Varianter. f.eks størrelse, farve etc."
 DocType: Purchase Invoice,Returns,Retur
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Varer-i-arbejde-lager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Løbenummer {0} er under vedligeholdelse kontrakt op {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serienummer {0} er under vedligeholdelseskontrakt ind til d. {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
 DocType: Lead,Organization Name,Organisationens navn
 DocType: Tax Rule,Shipping State,Forsendelse stat
-,Projected Quantity as Source,Forventet Mængde som kilde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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
+,Projected Quantity as Source,Forventet mængde som kilde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Varer skal tilføjes ved hjælp af knappen: ""Hent varer fra købskvitteringer"""
 DocType: Employee,A-,EN-
 DocType: Production Planning Tool,Include non-stock items,Medtag ikke-lagervarer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Salgsomkostninger
@@ -1090,38 +1092,38 @@
 DocType: GL Entry,Against,Imod
 DocType: Item,Default Selling Cost Center,Standard salgsomkostningssted
 DocType: Sales Partner,Implementation Partner,Implementering Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Angivelser
 DocType: Packing Slip,Net Weight UOM,Nettovægt vægtenhed
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Resultater
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Resultater
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produktion GODTGØRELSESPROCENT
 DocType: Employee Loan,Repayment Schedule,tilbagebetaling Schedule
 DocType: Shipping Rule Condition,Shipping Rule Condition,Forsendelsesregelbetingelse
-DocType: Holiday List,Get Weekly Off Dates,Få ugentlige Off Datoer
+DocType: Holiday List,Get Weekly Off Dates,Hent ugentlige fridage til kalenderen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdato kan ikke være mindre end Startdato
 DocType: Sales Person,Select company name first.,Vælg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr.
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilbud modtaget fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gennemsnitlig alder
-DocType: School Settings,Attendance Freeze Date,Deltagelsesfrysedato
-DocType: Opportunity,Your sales person who will contact the customer in future,"Dit salg person, som vil kontakte kunden i fremtiden"
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Nævne et par af dine leverandører. De kunne være organisationer eller enkeltpersoner.
+DocType: School Settings,Attendance Freeze Date,Tilmelding senest d.
+DocType: Opportunity,Your sales person who will contact the customer in future,"Din salgsmedarbejder, som vil kontakte kunden i fremtiden"
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Nævn et par af dine leverandører. Disse kunne være firmaer eller enkeltpersoner.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Se alle produkter
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Mindste levealder (dage)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Alle styklister
 DocType: Company,Default Currency,Standardvaluta
 DocType: Expense Claim,From Employee,Fra Medarbejder
-apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke overfakturering, da beløbet til konto {0} i {1} er nul"
+apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,"Advarsel: Systemet vil ikke tjekke for overfakturering, da beløbet for vare {0} i {1} er nul"
 DocType: Journal Entry,Make Difference Entry,Make Difference indtastning
 DocType: Upload Attendance,Attendance From Date,Fremmøde fradato
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ugyldig Attribut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} skal indsendes
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} skal godkendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antal skal være mindre end eller lig med {0}
 DocType: SMS Center,Total Characters,Total tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vælg BOM i BOM vilkår for Item {0}
@@ -1132,23 +1134,23 @@
 DocType: Sales Partner,Distributor,Distributør
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Indkøbskurv forsendelsesregler
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,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 +52,Please set 'Apply Additional Discount On',Venligst sæt &#39;Anvend Ekstra Rabat på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Fra Range skal være mindre end at ligge
-DocType: Global Defaults,Global Defaults,Globale standarder
+DocType: Global Defaults,Global Defaults,Globale indstillinger
 apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Invitation til sagssamarbejde
 DocType: Salary Slip,Deductions,Fradrag
 DocType: Leave Allocation,LAL/,LAL /
-apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start År
+apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Startår
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nuværende fakturaperiode
 DocType: Salary Slip,Leave Without Pay,Fravær uden løn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapacitetsplanlægningsfejl
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapacitetsplanlægningsfejl
 ,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 +390,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 +87,Opening Accounting Balance,Åbning Regnskab Balance
-DocType: Sales Invoice Advance,Sales Invoice Advance,Salg Faktura Advance
+DocType: Sales Invoice Advance,Sales Invoice Advance,Salgsfaktura Advance
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,Intet at anmode om
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},En anden Budget rekord &#39;{0}&#39; findes allerede mod {1} &#39;{2}&#39; for regnskabsåret {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Faktisk startdato' kan ikke være større end 'Faktisk slutdato'
@@ -1157,37 +1159,36 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil blive føjet til varen af varianten. For eksempel, hvis dit forkortelse er ""SM"", og varenummeret er ""T-SHIRT"", så vil variantens varenummer blive ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettoløn (i ord) vil være synlig, når du gemmer lønsedlen."
 DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retur / debetnota
-DocType: Price List Country,Price List Country,Prisliste Land
-DocType: Item,UOMs,UOMs
-apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldige løbenr for vare {1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retur / debetnota
+DocType: Price List Country,Price List Country,Prislisteland
+DocType: Item,UOMs,Enheder
+apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldige serienumre for vare {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Varenr. kan ikke ændres for Serienummer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profil {0} allerede oprettet for bruger: {1} og selskab {2}
 DocType: Sales Invoice Item,UOM Conversion Factor,UOM Conversion Factor
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få batchnr.
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Indtast venligst varenr. for at få partinr.
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Employee Loan,Partially Disbursed,Delvist udbetalt
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling tilstand er ikke konfigureret. Kontroller, om konto er blevet indstillet på Mode betalinger eller på POS profil."
-DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Dit salg person vil få en påmindelse på denne dato for at kontakte kunden
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Omkostningssted for vare med varenr. '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalingsmåde er ikke konfigureret. Kontroller, om konto er blevet indstillet på betalingsmåden eller på Kassesystemprofilen."
+DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din salgsmedarbejder vil få en påmindelse på denne dato om at kontakte kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme vare kan ikke indtastes flere gange.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Kan gøres yderligere konti under grupper, men oplysningerne kan gøres mod ikke-grupper"
 DocType: Lead,Lead,Emne
 DocType: Email Digest,Payables,Gæld
-DocType: Course,Course Intro,Kursus Intro
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Stock indtastning {0} skabt
+DocType: Course,Course Intro,Kursusintroduktion
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,Lagerindtastning {0} oprettet
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,Row # {0}: Afvist Antal kan ikke indtastes i Indkøb Return
 ,Purchase Order Items To Be Billed,Indkøbsordre varer til fakturering
-DocType: Purchase Invoice Item,Net Rate,Net Rate
+DocType: Purchase Invoice Item,Net Rate,Nettosats
 DocType: Purchase Invoice Item,Purchase Invoice Item,Købsfaktura Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Poster og GL Entries er reposted for de valgte Køb Kvitteringer
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lagerposter og finansposter er posteret om  for de valgte købskvitteringer
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Vare 1
 DocType: Holiday,Holiday,Holiday
 DocType: Support Settings,Close Issue After Days,Luk Issue efter dage
-DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det anses for alle brancher
+DocType: Leave Control Panel,Leave blank if considered for all branches,Lad stå tomt hvis det skal gælde for alle filialer
 DocType: Bank Guarantee,Validity in Days,Gyldighed i dage
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-formen er ikke for faktura: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Ikke-afstemte Betalingsoplysninger
@@ -1197,7 +1198,7 @@
 DocType: Global Defaults,Disable Rounded Total,Deaktiver Afrundet Total
 DocType: Employee Loan Application,Repayment Info,tilbagebetaling Info
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Indlæg' kan ikke være tomt
-apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicate række {0} med samme {1}
+apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplikér række {0} med samme {1}
 ,Trial Balance,Trial Balance
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,Regnskabsår {0} blev ikke fundet
 apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,Opsætning af Medarbejdere
@@ -1205,31 +1206,31 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,Vælg venligst præfiks først
 DocType: Employee,O-,O-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Research,Forskning
-DocType: Maintenance Visit Purpose,Work Done,Arbejde Udført
+DocType: Maintenance Visit Purpose,Work Done,Arbejdet udført
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Angiv mindst én attribut i Attributter tabellen
 DocType: Announcement,All Students,Alle studerende
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Vare {0} skal være en ikke-lagervare
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vis Ledger
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Vare {0} skal være en ikke-lagervare
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se kladde
 DocType: Grading Scale,Intervals,Intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Der eksisterer en varegruppe med samme navn, og du bedes derfor ændre varenavnet eller omdøbe varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studerende mobiltelefonnr.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Vare {0} kan ikke have parti
 ,Budget Variance Report,Budget Variance Report
 DocType: Salary Slip,Gross Pay,Gross Pay
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitet Typen er obligatorisk.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Række {0}: Aktivitetstypen er obligatorisk.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Betalt udbytte
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Regnskab Ledger
 DocType: Stock Reconciliation,Difference Amount,Differencebeløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Overført overskud
 DocType: Vehicle Log,Service Detail,service Detail
-DocType: BOM,Item Description,Punkt Beskrivelse
+DocType: BOM,Item Description,Varebeskrivelse
 DocType: Student Sibling,Student Sibling,Student Søskende
 DocType: Purchase Invoice,Is Recurring,Er Tilbagevendende
 DocType: Purchase Invoice,Supplied Items,Medfølgende varer
 DocType: Student,STUD.,STUD.
-DocType: Production Order,Qty To Manufacture,Antal Til Fremstilling
+DocType: Production Order,Qty To Manufacture,Antal at producere
 DocType: Email Digest,New Income,Ny Indkomst
 DocType: School Settings,School Settings,Skoleindstillinger
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Bevar samme sats i hele køb cyklus
@@ -1251,33 +1252,33 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Udbetaling af løn fra {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ikke autoriseret til at redigere låst konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Få udestående fakturaer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Indkøbsordrer hjælpe dig med at planlægge og følge op på dine køb
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Beklager, kan virksomhederne ikke slås sammen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
-							cannot be greater than requested quantity {2} for Item {3}",Den samlede Udstedelse / Transfer mængde {0} i Material Request {1} \ ikke kan være større end ønskede mængde {2} for Item {3}
+							cannot be greater than requested quantity {2} for Item {3}",Den samlede overførselsmængde {0} i materialeanmodning {1} \ kan ikke være større end den anmodede mængde {2} for vare {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lille
 DocType: Employee,Employee Number,Medarbejdernr.
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},"(E), der allerede er i brug Case Ingen. Prøv fra sag {0}"
-DocType: Project,% Completed,% Afsluttet
+DocType: Project,% Completed,% afsluttet
 ,Invoiced Amount (Exculsive Tax),Faktureret beløb (exculsive Tax)
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Punkt 2
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +14,Item 2,Vare 2
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Konto head {0} oprettet
 DocType: Supplier,SUPP-,SUPP-
 DocType: Training Event,Training Event,Træning begivenhed
 DocType: Item,Auto re-order,Auto re-ordre
 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
+DocType: Employee,Place of Issue,Udstedelsessted
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,Kontrakt
 DocType: Email Digest,Add Quote,Tilføj tilbud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,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 +90,Indirect Expenses,Indirekte udgifter
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Række {0}: Antal er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbrug
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
+DocType: Mode of Payment,Mode of Payment,Betalingsmåde
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Billede bør være en offentlig fil eller webadresse
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stykliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rod-varegruppe og kan ikke redigeres.
@@ -1289,23 +1290,23 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +394,"{0}: Employee email not found, hence email not sent","{0}: Medarbejderens e-mail er ikke fundet, og derfor er e-mailen ikke sendt"
 DocType: Item,Foreign Trade Details,Udenrigshandel Detaljer
 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
+DocType: Serial No,Serial No Details,Serienummeroplysninger
+DocType: Purchase Invoice Item,Item Tax Rate,Varemoms-%
 DocType: Student Group Student,Group Roll Number,Gruppe Roll nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan kun kredit konti knyttes mod en anden debet post
-apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,I alt for alle task vægte skal være 1. Juster vægten af alle Projekt opgaver i overensstemmelse hermed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Levering Note {0} er ikke indsendt
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totalen for vægtningen af alle opgaver skal være 1. Juster vægten af alle sagsopgaver i overensstemmelse hermed
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Følgeseddel {0} er ikke godkendt
 apps/erpnext/erpnext/stock/get_item_details.py +141,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ættelsesregel først valgt baseret på ""Apply On 'felt, som kan være vare, varegruppe eller Brand."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prisfastsættelsesregel skal først baseres på feltet 'Gælder for', som kan indeholde vare, varegruppe eller varemærke."
 DocType: Hub Settings,Seller Website,Sælger Website
 DocType: Item,ITEM-,VARE-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Samlede fordelte procentdel for salgsteam bør være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Produktionsordre status er {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produktionsordre status er {0}
 DocType: Appraisal Goal,Goal,Goal
 DocType: Sales Invoice Item,Edit Description,Rediger beskrivelse
 ,Team Updates,Team opdateringer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,For Leverandøren
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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),Beløb i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opret Print Format
@@ -1319,11 +1320,11 @@
 DocType: Purchase Invoice,Total (Company Currency),I alt (firmavaluta)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Serienummer {0} indtastet mere end én gang
 DocType: Depreciation Schedule,Journal Entry,Kassekladde
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementer igangværende
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} igangværende varer
 DocType: Workstation,Workstation Name,Workstation Navn
-DocType: Grade Interval,Grade Code,Grade kode
-DocType: POS Item Group,POS Item Group,POS-varegruppe
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
+DocType: Grading Scale Interval,Grade Code,Grade kode
+DocType: POS Item Group,POS Item Group,Kassesystem-varegruppe
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail nyhedsbrev:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stykliste {0} hører ikke til vare {1}
 DocType: Sales Partner,Target Distribution,Target Distribution
 DocType: Salary Slip,Bank Account No.,Bankkonto No.
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,tilbagevendende Op
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vælg firma
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vælg firma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Forlad
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du skal aktivere Indkøbskurven
@@ -1353,16 +1354,17 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mad
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besøg
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Vedligeholdelsesplanen {0} eksisterer imod {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,tilmelding elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta for Lukning Der skal være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum af point for alle mål skal være 100. Det er {0}
 DocType: Project,Start and End Dates,Start- og slutdato
 ,Delivered Items To Be Billed,Leverede varer at blive faktureret
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Åben stykliste {0}
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for Serial No.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,Lager kan ikke ændres for serienummeret
 DocType: Authorization Rule,Average Discount,Gennemsnitlig rabat
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Enhed
 DocType: Rename Tool,Utilities,Forsyningsvirksomheder
 DocType: Purchase Invoice Item,Accounting,Regnskab
 DocType: Employee,EMP/,EMP /
@@ -1378,13 +1380,13 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gennemsnitlig Daily Udgående
 DocType: POS Profile,Campaign,Kampagne
 DocType: Supplier,Name and Type,Navn og type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Godkendelsesstatus skal &quot;Godkendt&quot; eller &quot;Afvist&quot;
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Forventet startdato' kan ikke være større end 'Forventet slutdato '
-DocType: Course Scheduling Tool,Course End Date,Kursus Slutdato
+DocType: Course Scheduling Tool,Course End Date,Kursus slutdato
 DocType: Holiday List,Holidays,Helligdage
-DocType: Sales Order Item,Planned Quantity,Planlagt Mængde
-DocType: Purchase Invoice Item,Item Tax Amount,Item Skat Beløb
+DocType: Sales Order Item,Planned Quantity,Planlagt mængde
+DocType: Purchase Invoice Item,Item Tax Amount,Varemomsbeløb
 DocType: Item,Maintain Stock,Vedligehold lageret
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,Stock Entries allerede skabt til produktionsordre
 DocType: Employee,Prefered Email,foretrukket Email
@@ -1398,17 +1400,18 @@
 apps/erpnext/erpnext/config/support.py +17,Communication log.,Kommunikation log.
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +151,"Request for Quotation is disabled to access from portal, for more check portal settings.",Adgang til portal er deaktiveret for anmodning om tilbud. Check portal instillinger
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,Køb Beløb
-DocType: Sales Invoice,Shipping Address Name,Forsendelse Adresse Navn
+DocType: Sales Invoice,Shipping Address Name,Leveringsadressenavn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,må ikke være større end 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,må ikke være større end 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Vare {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Uplanlagt
 DocType: Employee,Owned,Ejet
 DocType: Salary Detail,Depends on Leave Without Pay,Afhænger af fravær uden løn
-DocType: Pricing Rule,"Higher the number, higher the priority","Højere tallet er, jo højere prioritet"
+DocType: Pricing Rule,"Higher the number, higher the priority","Desto højere tallet er, jo højere prioritet"
 ,Purchase Invoice Trends,Købsfaktura Trends
 DocType: Employee,Better Prospects,Bedre udsigter
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Række # {0}: Parti {1} har kun {2} mængde. Vælg venligst et andet parti, der har {3} antal tilgængelige eller opdel rækken i flere rækker for at kunne levere fra flere partier"
 DocType: Vehicle,License Plate,Nummerplade
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC status
@@ -1416,7 +1419,7 @@
 DocType: Payment Entry Reference,Payment Entry Reference,Betalingspost reference
 DocType: GL Entry,GL Entry,GL indtastning
 DocType: HR Settings,Employee Settings,Medarbejderindstillinger
-,Batch-Wise Balance History,Batch-Wise Balance History
+,Batch-Wise Balance History,Historik sorteret pr. parti
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Udskriftsindstillinger opdateret i respektive print format
 DocType: Package Code,Package Code,Pakkekode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,Lærling
@@ -1426,29 +1429,29 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Medarbejder kan ikke referere til sig selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er frossen, er poster lov til begrænsede brugere."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskab Punktet om {0}: {1} kan kun foretages i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Stillingsprofil, kvalifikationskrav mv."
 DocType: Journal Entry Account,Account Balance,Kontosaldo
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Momsregel til transaktioner.
 DocType: Rename Tool,Type of document to rename.,Type dokument omdøbe.
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Vi køber denne vare
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Kunden er påkrævet mod Tilgodehavende konto {2}
-DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Total Skatter og Afgifter (Company valuta)
+DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Moms i alt (firmavaluta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis uafsluttede finanspolitiske års P &amp; L balancer
 DocType: Shipping Rule,Shipping Account,Forsendelse konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} er inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Opret salgsordrer til at hjælpe dig med at planlægge dit arbejde og levere til tiden
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Opret salgsordrer til at hjælpe dig med at planlægge dit arbejde og levere til tiden
 DocType: Quality Inspection,Readings,Aflæsninger
-DocType: Stock Entry,Total Additional Costs,Total Yderligere omkostninger
+DocType: Stock Entry,Total Additional Costs,Yderligere omkostninger i alt
 DocType: Course Schedule,SH,SH
 DocType: BOM,Scrap Material Cost(Company Currency),Skrot materialeomkostninger (firmavaluta)
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Sub forsamlinger
-DocType: Asset,Asset Name,Asset Name
-DocType: Project,Task Weight,Opgave Vægt
+DocType: Asset,Asset Name,Aktivnavn
+DocType: Project,Task Weight,Opgavevægtning
 DocType: Shipping Rule Condition,To Value,Til Value
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Pakkeseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakkeseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontorleje
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Opsætning SMS gateway-indstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislykkedes!
@@ -1458,7 +1461,7 @@
 DocType: Item,Inventory,Inventory
 DocType: Item,Sales Details,Salg Detaljer
 DocType: Quality Inspection,QI-,QI-
-DocType: Opportunity,With Items,Med Varer
+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
 DocType: Notification Control,Expense Claim Rejected,Udlæg afvist
 DocType: Item,Item Attribute,Item Attribut
@@ -1469,12 +1472,12 @@
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,Item Varianter
 DocType: Company,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,E-mail lønseddel til medarbejder
-DocType: Cost Center,Parent Cost Center,Parent omkostningssted
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Vælg Mulig leverandør
+DocType: Cost Center,Parent Cost Center,Overordnet omkostningssted
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Vælg Mulig leverandør
 DocType: Sales Invoice,Source,Kilde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis lukket
 DocType: Leave Type,Is Leave Without Pay,Er fravær uden løn
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Aktivkategori er obligatorisk for en anlægsaktivvare
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen resultater i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Dette {0} konflikter med {1} for {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studerende HTML
@@ -1484,7 +1487,7 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,Åbne sager
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,Pakkeseddel (ler) annulleret
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,Pengestrømme fra investeringsaktiviteter
-DocType: Program Course,Program Course,Program Kursus
+DocType: Program Course,Program Course,Kursusprogram
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Fragt og Forwarding Afgifter
 DocType: Homepage,Company Tagline for website homepage,Firma Tagline for website hjemmeside
 DocType: Item Group,Item Group Name,Varegruppenavn
@@ -1492,14 +1495,14 @@
 DocType: Student,Date of Leaving,Dato for Leaving
 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/utilities/activation.py +64,Create Leads,Opret emner
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Opret emner
 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: Landed Cost Voucher,Additional Charges,Ekstragebyrer
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Ekstra rabatbeløb (firmavaluta)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,Opret ny konto fra kontoplanen.
-DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelse Besøg
+DocType: Maintenance Visit,Maintenance Visit,Vedligeholdelsesbesøg
 DocType: Student,Leaving Certificate Number,Leaving Certificate Number
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Tilgængeligt batch-antal på lageret
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Opdater Print Format
@@ -1509,78 +1512,78 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Debitor Resumé
 DocType: Employee Loan,Monthly Repayment Amount,Månedlige ydelse Beløb
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Indstil Bruger-id feltet i en Medarbejder rekord at indstille Medarbejder Rolle
-DocType: UOM,UOM Name,UOM Navn
+DocType: UOM,UOM Name,Enhedsnavn
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Bidrag Beløb
-DocType: Purchase Invoice,Shipping Address,Forsendelse Adresse
+DocType: Purchase Invoice,Shipping Address,Leveringsadresse
 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.,Dette værktøj hjælper dig med at opdatere eller fastsætte mængden og værdiansættelse på lager i systemet. Det bruges typisk til at synkronisere systemets værdier og hvad der rent faktisk eksisterer i dine lagre.
-DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"I Ord vil være synlig, når du gemmer følgesedlen."
-DocType: Expense Claim,EXP,EXP
-apps/erpnext/erpnext/config/stock.py +200,Brand master.,Brand mester.
+DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,"""I ord"" vil være synlig, når du gemmer følgesedlen."
+DocType: Expense Claim,EXP,UDL
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,Varemærke-master.
 apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Student {0} - {1} forekommer flere gange i træk {2} &amp; {3}
 DocType: Program Enrollment Tool,Program Enrollments,program Tilmeldingsaftaler
-DocType: Sales Invoice Item,Brand Name,Brandnavn
+DocType: Sales Invoice Item,Brand Name,Varemærkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standardlageret er påkrævet for den valgte vare
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kasse
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mulig leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mulig leverandør
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisationen
 DocType: Budget,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Modtager List er tom. Opret Modtager liste
 DocType: Production Plan Sales Order,Production Plan Sales Order,Produktion Plan kundeordre
 DocType: Sales Partner,Sales Partner Target,Salgs Partner Mål
-DocType: Loan Type,Maximum Loan Amount,Maksimale lånebeløb
+DocType: Loan Type,Maximum Loan Amount,Maksimalt lånebeløb
 DocType: Pricing Rule,Pricing Rule,Prisfastsættelsesregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dupliceringsrulle nummer for studerende {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action hvis årlige budgetplan overskredet
-apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiale Anmodning om at Indkøbsordre
-DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materialeanmodning til indkøbsordre
+DocType: Shopping Cart Settings,Payment Success URL,Betaling gennemført URL
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},Row # {0}: returnerede vare {1} ikke eksisterer i {2} {3}
 DocType: Purchase Receipt,PREC-,PREC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +16,Bank Accounts,Bankkonti
 ,Bank Reconciliation Statement,Bank Saldoopgørelsen
 ,Lead Name,Emnenavn
-,POS,POS
+,POS,Kassesystem
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Åbning Stock Balance
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} må kun optræde én gang
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},Ikke tilladt at overføre mere {0} end {1} mod indkøbsordre {2}
-apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Blade Tildelt Succesfuld for {0}
+apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},Fravær blev succesfuldt tildelt til {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,Ingen varer at pakke
 DocType: Shipping Rule Condition,From Value,Fra Value
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,Produktionmængde er obligatorisk
 DocType: Employee Loan,Repayment Method,tilbagebetaling Metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis markeret, vil hjemmesiden være standard varegruppe til hjemmesiden"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM for {0} ikke fundet for Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Standard stykliste for {0} ikke fundet for sag {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav om selskabets regning.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studerende er i hjertet af systemet, tilføje alle dine elever"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studerende er i hjertet af systemet, tilføje alle dine elever"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"Row # {0}: Clearance dato {1} kan ikke være, før Cheque Dato {2}"
 DocType: Company,Default Holiday List,Standard helligdagskalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Række {0}: Fra tid og til tid af {1} overlapper med {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Stock Passiver
 DocType: Purchase Invoice,Supplier Warehouse,Leverandør Warehouse
 DocType: Opportunity,Contact Mobile No,Kontakt mobiltelefonnr.
-,Material Requests for which Supplier Quotations are not created,Materialebehov uden hvilket et leverandørtilbud ikke oprettes
+,Material Requests for which Supplier Quotations are not created,Materialeanmodninger under hvilke leverandørtilbud ikke er oprettet
 DocType: Student Group,Set 0 for no limit,Sæt 0 for ingen grænse
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Den dag (e), som du ansøger om orlov er helligdage. Du har brug for ikke søge om orlov."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gensend Betaling E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny opgave
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make Citat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Opret tilbud
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Andre rapporter
 DocType: Dependent Task,Dependent Task,Afhængig opgave
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ferie af typen {0} må ikke være længere end {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Måleenhed skal være 1 i række {0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Fravær af typen {0} må ikke vare længere end {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv at planlægge operationer for X dage i forvejen.
 DocType: HR Settings,Stop Birthday Reminders,Stop Fødselsdag Påmindelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Venligst sæt Standard Payroll Betales konto i Company {0}
-DocType: SMS Center,Receiver List,Modtager liste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Søg Vare
+DocType: SMS Center,Receiver List,Modtageroversigt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Søg Vare
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrugt Mængde
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoændring i kontanter
 DocType: Assessment Plan,Grading Scale,karakterbekendtgørelsen
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Allerede afsluttet
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betaling Anmodning findes allerede {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Måleenhed {0} er indtastet mere end én gang i Conversion Factor Table
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Allerede afsluttet
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalingsanmodning findes allerede {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Omkostninger ved Udstedte Varer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Antal må ikke være mere end {0}
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,Foregående regnskabsår er ikke lukket
@@ -1588,19 +1591,19 @@
 DocType: Quotation Item,Quotation Item,Tilbudt vare
 DocType: Account,Account Name,Kontonavn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +43,Supplier Type master.,Leverandør Type mester.
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +194,Serial No {0} quantity {1} cannot be a fraction,Serienummer {0} mængde {1} kan ikke være en brøkdel
+apps/erpnext/erpnext/config/buying.py +43,Supplier Type master.,Leverandørtype-master.
 DocType: Purchase Order Item,Supplier Part Number,Leverandør Part Number
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,Omregningskurs kan ikke være 0 eller 1
 DocType: Sales Invoice,Reference Document,referencedokument
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{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 +229,Purchase Receipt {0} is not submitted,Købskvittering {0} er ikke sendt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,Købskvittering {0} er ikke godkendt
 DocType: Company,Default Payable Account,Standard Betales konto
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Indstillinger for online indkøbskurv, såsom forsendelsesregler, prisliste mv."
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}% Faktureret
-apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret Antal
+apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,Reserveret mængde
 DocType: Party Account,Party Account,Party Account
 apps/erpnext/erpnext/config/setup.py +122,Human Resources,Medarbejdere
 DocType: Lead,Upper Income,Upper Indkomst
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Make Udbetaling indtastning
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Række {0}: Advance mod Leverandøren skal debitere
 DocType: Company,Default Values,Standardværdier
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Samlede godtgjorte beløb
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er baseret på kørebogen for køretøjet. Se tidslinje nedenfor for detaljer
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Indsamle
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Imod Leverandør Faktura {0} dateret {1}
 DocType: Customer,Default Price List,Standardprisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement rekord {0} skabt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement rekord {0} skabt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette Fiscal År {0}. Regnskabsår {0} er indstillet som standard i Globale indstillinger
 DocType: Journal Entry,Entry Type,Posttype
 ,Customer Credit Balance,Customer Credit Balance
@@ -1633,30 +1637,29 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,indkøb
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ingen af varerne har nogen ændring i mængde eller værdi.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligatorisk felt - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantikrav
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantikrav
 ,Lead Details,Emnedetaljer
-DocType: Salary Slip,Loan repayment,lån tilbagebetaling
+DocType: Salary Slip,Loan repayment,Tilbagebetaling af lån
 DocType: Purchase Invoice,End date of current invoice's period,Slutdato for aktuelle faktura menstruation
 DocType: Pricing Rule,Applicable For,Gældende For
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Fjern link Betaling ved Annullering af faktura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Aktuel kilometerstand indtastet bør være større end Køretøjets indledende kilometerstand {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Forsendelsesregelland
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Fravær og fremmøde
-DocType: Maintenance Visit,Partially Completed,Delvist Afsluttet
+DocType: Maintenance Visit,Partially Completed,Delvist afsluttet
 DocType: Leave Type,Include holidays within leaves as leaves,Medtag helligdage indenfor fraværsperioden som fravær
 DocType: Sales Invoice,Packed Items,Pakkede varer
-apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garanti krav mod Serial No.
+apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garantikrav mod serienummer
 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","Udskift en bestemt BOM i alle andre styklister, hvor det bruges. Det vil erstatte den gamle BOM linket, opdatere omkostninger og regenerere &quot;BOM Explosion Item&quot; tabel som pr ny BOM"
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',&#39;Total&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','I alt'
 DocType: Shopping Cart Settings,Enable Shopping Cart,Aktiver Indkøbskurv
 DocType: Employee,Permanent Address,Permanent adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vælg Varenr.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Vælg Varenr.
 DocType: Student Sibling,Studying in Same Institute,At studere i samme institut
-DocType: Territory,Territory Manager,Territory manager
+DocType: Territory,Territory Manager,Områdechef
 DocType: Packed Item,To Warehouse (Optional),Til lager (valgfrit)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Payment Entry,Paid Amount (Company Currency),Betalt beløb (firmavaluta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabat
 DocType: Selling Settings,Selling Settings,Salgsindstillinger
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Se i indkøbskurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringsomkostninger
 ,Item Shortage Report,Item Mangel Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"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/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Næste Afskrivning Dato er obligatorisk for nye aktiver
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vægt er nævnt, \ nVenligst nævne &quot;Weight UOM&quot; for"
+DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialeanmodning brugt til denne lagerpost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næste afskrivningsdato er obligatorisk for nye aktiver
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursusbaseret gruppe for hver batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkelt enhed af et element.
 DocType: Fee Category,Fee Category,Gebyr Kategori
@@ -1676,96 +1679,94 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Lav Regnskab indtastning For hver Stock Movement
 DocType: Leave Allocation,Total Leaves Allocated,Tildelt fravær i alt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Lager kræves på rækkenr. {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Indtast venligst gyldigt Regnskabsår start- og slutdatoer
+apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,Indtast venligst det gyldige regnskabsårs start- og slutdatoer
 DocType: Employee,Date Of Retirement,Dato for pensionering
-DocType: Upload Attendance,Get Template,Få skabelon
+DocType: Upload Attendance,Get Template,Hent skabelon
 DocType: Vehicle,Doors,Døre
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext opsætning er afsluttet !
 DocType: Course Assessment Criteria,Weightage,Vægtning
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: omkostningssted er påkrævet for resultatopgørelsekonto {2}. Opret venligst et standard omkostningssted for firmaet.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Ny kontakt
-DocType: Territory,Parent Territory,Parent Territory
+DocType: Territory,Parent Territory,Overordnet område
 DocType: Quality Inspection Reading,Reading 2,Reading 2
 DocType: Stock Entry,Material Receipt,Materiale Kvittering
 DocType: Homepage,Products,Produkter
 DocType: Announcement,Instructor,Instruktør
 DocType: Employee,AB+,AB +
 DocType: Item,"If this item has variants, then it cannot be selected in sales orders etc.","Hvis denne vare har varianter, så det kan ikke vælges i salgsordrer mv"
-DocType: Lead,Next Contact By,Næste Kontakt ved
+DocType: Lead,Next Contact By,Næste kontakt af
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,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 +114,Warehouse {0} can not be deleted as quantity exists for Item {1},"Lager {0} kan ikke slettes, da der eksisterer et antal varer {1} på lageret"
 DocType: Quotation,Order Type,Bestil Type
 DocType: Purchase Invoice,Notification Email Address,Meddelelse E-mailadresse
 ,Item-wise Sales Register,Vare-wise Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttokøbesum
-DocType: Asset,Depreciation Method,afskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+DocType: Asset,Depreciation Method,Afskrivningsmetode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er denne Tax inkluderet i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Samlet Target
 DocType: Program Course,Required,Nødvendig
 DocType: Job Applicant,Applicant for a Job,Ansøger
-DocType: Production Plan Material Request,Production Plan Material Request,Produktion Plan Materiale Request
+DocType: Production Plan Material Request,Production Plan Material Request,Produktionsplan-Materialeanmodning
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +235,No Production Orders created,Ingen produktionsordrer oprettet
 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: Purchase Invoice Item,Batch No,Batch Nej
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Kan ikke finde valutakurs for {0} til {1} for centrale dato {2}
+apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Udlæs rapporten og udskriv den ved hjælp af et regnearksprogram.
+DocType: Purchase Invoice Item,Batch No,Partinr.
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillad flere salgsordrer mod kundens indkøbsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Formynder 2 mobiltelefonnr.
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoved
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoved
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sæt præfiks for nummerering serie om dine transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Medarbejdere HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Standard stykliste ({0}) skal være aktiv for denne vare eller dens skabelon
 DocType: Employee,Leave Encashed?,Skal fravær udbetales?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Salgsmulighed Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige Omkostninger
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Opret indkøbsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Opret indkøbsordre
 DocType: SMS Center,Send To,Send til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Tildelte beløb
 DocType: Sales Team,Contribution to Net Total,Bidrag til Net Total
 DocType: Sales Invoice Item,Customer's Item Code,Kundens varenr.
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Afstemning
-DocType: Territory,Territory Name,Territory Navn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
+DocType: Territory,Territory Name,Områdenavn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse er nødvendig, før Indsend"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Ansøger.
 DocType: Purchase Order Item,Warehouse and Reference,Lager og reference
 DocType: Supplier,Statutory info and other general information about your Supplier,Lovpligtig information og andre generelle oplysninger om din leverandør
 DocType: Item,Serial Nos and Batches,Serienummer og partier
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppens styrke
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Mod Kassekladde {0} har ikke nogen uovertruffen {1} indgang
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Medarbejdervurderinger
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Løbenummer indtastet for Item {0}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Doppelte serienumre er indtastet for vare {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Betingelse for en forsendelsesregel
-DocType: Grading Structure,Grading Intervals,grading Intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom ind
-apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan ikke overbill til konto {0} i rækken {1} mere end {2}. For at tillade over-fakturering, skal du indstille i Køb Indstillinger"
+apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan ikke overfakturere for vare {0} i række {1} for mere end {2}. For at tillade over-fakturering, skal du ændre i Indkøbsindstillinger"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Indstil filter baseret på Item eller Warehouse
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),Nettovægten af denne pakke. (Beregnes automatisk som summen af nettovægt på poster)
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,Venligst oprette en konto for denne Warehouse og link det. Dette kan ikke gøres automatisk som en konto med navnet {0} findes allerede
 DocType: Sales Order,To Deliver and Bill,At levere og Bill
 DocType: Student Group,Instructors,Instruktører
 DocType: GL Entry,Credit Amount in Account Currency,Credit Beløb i Konto Valuta
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stykliste {0} skal indsendes
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stykliste {0} skal godkendes
 DocType: Authorization Control,Authorization Control,Authorization Kontrol
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Række # {0}: Afvist Warehouse er obligatorisk mod afvist element {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Administrer dine ordrer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Betaling
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Administrér dine ordrer
 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}
+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},Materialeanmodning af maksimum {0} kan oprettes for vare {1} mod salgsordre {2}
 DocType: Employee,Salutation,Titel
-DocType: Course,Course Abbreviation,Kursus Forkortelse
+DocType: Course,Course Abbreviation,Kursusforkortelse
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Vil også gælde for varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke annulleres, da det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Medarbejder {0} på halv tid den {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samlet arbejdstid bør ikke være større end maksimal arbejdstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Faktiske Antal
 DocType: Sales Invoice Item,References,Referencer
@@ -1775,19 +1776,19 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Du har indtastet dubletter. Venligst rette, og prøv igen."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Ny kurv
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en føljeton Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Ny kurv
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Vare {0} er ikke en serienummervare
 DocType: SMS Center,Create Receiver List,Opret Modtager liste
 DocType: Vehicle,Wheels,Hjul
 DocType: Packing Slip,To Package No.,Til pakkenr.
-DocType: Production Planning Tool,Material Requests,Materiale Anmodning
+DocType: Production Planning Tool,Material Requests,Materialeanmodninger
 DocType: Warranty Claim,Issue Date,Udstedelsesdagen
 DocType: Activity Cost,Activity Cost,Aktivitetsomkostninger
 DocType: Sales Invoice Timesheet,Timesheet Detail,Timeseddel Detaljer
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Forbrugt Antal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telekommunikation
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),"Angiver, at pakken er en del af denne leverance (Kun udkast)"
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Foretag indbetaling indtastning
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Indtast indbetaling
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Mængde for vare {0} skal være mindre end {1}
 ,Sales Invoice Trends,Salgsfaktura Trends
 DocType: Leave Application,Apply / Approve Leaves,Anvend / Godkend fravær
@@ -1798,18 +1799,18 @@
 apps/erpnext/erpnext/config/accounts.py +210,Tree of financial Cost Centers.,Tree of finansielle omkostningssteder.
 DocType: Serial No,Delivery Document No,Levering dokument nr
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +184,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},"Sæt venligst ""Gevinst/tabskonto vedr. salg af anlægsaktiv"" i firma {0}"
-DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Få elementer fra køb Kvitteringer
-DocType: Serial No,Creation Date,Oprettelsesdato
+DocType: Landed Cost Voucher,Get Items From Purchase Receipts,Hent varer fra købskvitteringer
+DocType: Serial No,Creation Date,Oprettet d.
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},Vare {0} forekommer flere gange i prisliste {1}
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}","Selling skal kontrolleres, om nødvendigt er valgt som {0}"
-DocType: Production Plan Material Request,Material Request Date,Materiale Request Dato
+DocType: Production Plan Material Request,Material Request Date,Materialeanmodningsdato
 DocType: Purchase Order Item,Supplier Quotation Item,Leverandør tibudt Varer
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiverer skabelse af tid logfiler mod produktionsordrer. Operationer må ikke spores mod produktionsordre
 DocType: Student,Student Mobile Number,Studerende mobiltelefonnr.
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navnet på den månedlige Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-id er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Parti-id er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Tilbagevendende Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Håndtering af sager
@@ -1817,63 +1818,63 @@
 DocType: Budget,Fiscal Year,Regnskabsår
 DocType: Vehicle Log,Fuel Price,Brændstofpris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Anlægsaktiv-varen skal være en ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan ikke tildeles mod {0}, da det ikke er en indtægt eller omkostning konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Opnået
 DocType: Student Admission,Application Form Route,Ansøgningsskema Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Område / kunde
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Område / kunde
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,fx 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Fraværstype {0} kan ikke fordeles, da den er af typen uden løn"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},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: 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,Varegruppetræ
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke setup for Serial nr. Check Item mester
-DocType: Maintenance Visit,Maintenance Time,Vedligeholdelse Time
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,Vare {0} er ikke sat op til serienumre. Tjek vare-masteren
+DocType: Maintenance Visit,Maintenance Time,Vedligeholdelsestid
 ,Amount to Deliver,"Beløb, Deliver"
 apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,En vare eller tjenesteydelse
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Startdato kan ikke være tidligere end året Start Dato for akademiske år, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Den Term Startdato kan ikke være tidligere end året Start Dato for skoleåret, som udtrykket er forbundet (Studieår {}). Ret de datoer og prøv igen."
 DocType: Guardian,Guardian Interests,Guardian Interesser
 DocType: Naming Series,Current Value,Aktuel værdi
 apps/erpnext/erpnext/controllers/accounts_controller.py +252,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,Flere regnskabsår findes for den dato {0}. Indstil selskab i regnskabsåret
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0} oprettet
 DocType: Delivery Note Item,Against Sales Order,Mod kundeordre
-,Serial No Status,Løbenummer status
+,Serial No Status,Serienummerstatus
 DocType: Payment Entry Reference,Outstanding,Udestående
 ,Daily Timesheet Summary,Daglig Tidsregisteringsoversigt
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Række {0}: For at indstille {1} periodicitet, skal forskellen mellem fra og til dato \ være større end eller lig med {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dette er baseret på lager bevægelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Salg
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Mængden {0} {1} trækkes mod {2}
 DocType: Employee,Salary Information,Løn Information
 DocType: Sales Person,Name and Employee ID,Navne og Medarbejder ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Forfaldsdato kan ikke være før bogføringsdatoen
 DocType: Website Item Group,Website Item Group,Webside-varegruppe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Skatter og afgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,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} betalingsposter ikke kan filtreres med {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
-DocType: Purchase Order Item,Material Request Item,Materiale Request Vare
+DocType: Purchase Order Item,Material Request Item,Materialeanmodningsvare
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Varegruppetræer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke henvise rækken tal større end eller lig med aktuelle række nummer til denne Charge typen
 DocType: Asset,Sold,solgt
 ,Item-wise Purchase History,Vare-wise Købshistorik
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik på &quot;Generer Schedule &#39;at hente Løbenummer tilføjet for Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klik på ""Generer plan"" for at hente serienummeret tilføjet til vare {0}"
 DocType: Account,Frozen,Frosne
 ,Open Production Orders,Åbne produktionsordrer
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Beløb (Company Currency)
 DocType: Payment Reconciliation Payment,Reference Row,henvisning Row
 DocType: Installation Note,Installation Time,Installation Time
 DocType: Sales Invoice,Accounting Details,Regnskab Detaljer
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Slette alle transaktioner for denne Company
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringer
 DocType: Issue,Resolution Details,Løsningsdetaljer
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,tildelinger
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Acceptkriterier
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast Materiale Anmodning i ovenstående tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,Indtast materialeanmodninger i ovenstående tabel
 DocType: Item Attribute,Attribute Name,Attribut Navn
 DocType: BOM,Show In Website,Vis I Website
 DocType: Shopping Cart Settings,Show Quantity in Website,Vis Mængde i Website
@@ -1881,17 +1882,17 @@
 DocType: Task,Expected Time (in hours),Forventet tid (i timer)
 DocType: Item Reorder,Check in (group),Check i (gruppe)
 ,Qty to Order,Antal til ordre
-DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen hoved under ansvar eller Equity, hvor gevinst / tab vil være reserveret"
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked","Kontoen under passiver eller egenkapital, i hviken gevinst/tab vil blive bogført"
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gantt-diagram af alle opgaver.
-DocType: Opportunity,Mins to First Response,Minutter til First Response
+DocType: Opportunity,Mins to First Response,Minutter til første reaktion
 DocType: Pricing Rule,Margin Type,Margin Type
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0} timer
 DocType: Course,Default Grading Scale,Standard karakterbekendtgørelsen
 DocType: Appraisal,For Employee Name,Til medarbejdernavn
-DocType: Holiday List,Clear Table,Klar Table
+DocType: Holiday List,Clear Table,Ryd tabellen
 DocType: C-Form Invoice Detail,Invoice No,Fakturanr.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +342,Make Payment,Foretag indbetaling
-DocType: Room,Room Name,Room Navn
+DocType: Room,Room Name,Værelsesnavn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","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,Kundeadresser og kontakter
@@ -1899,18 +1900,18 @@
 DocType: Discussion,Discussion,Diskussion
 DocType: Payment Entry,Transaction ID,Transaktions-ID
 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.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prisfastsættelsesregler er yderligere filtreret på mængden.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Angiv datoen for tilslutning til medarbejder {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Faktureret beløb i alt (via Tidsregistrering)
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gentag Kundeomsætning
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Godkendelse af udgifter'"
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Omsætning gamle kunder
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), skal have rollen 'Udlægsgodkender'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vælg stykliste og produceret antal
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Vælg stykliste og produceret antal
 DocType: Asset,Depreciation Schedule,Afskrivninger Schedule
 DocType: Bank Reconciliation Detail,Against Account,Mod konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Dato skal være mellem Fra dato og Til dato
 DocType: Maintenance Schedule Detail,Actual Date,Faktisk dato
-DocType: Item,Has Batch No,Har Batch Nej
+DocType: Item,Has Batch No,Har partinr.
 apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},Årlig fakturering: {0}
 DocType: Delivery Note,Excise Page Number,Excise Sidetal
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory","Company, Fra dato og Til dato er obligatorisk"
@@ -1919,49 +1920,51 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Venligst sæt &#39;Asset Afskrivninger Omkostninger Centers i Company {0}
 ,Maintenance Schedules,Vedligeholdelsesplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdato (via Tidsregistreringen)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Mængden {0} {1} mod {2} {3}
 ,Quotation Trends,Tilbud trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke er nævnt i vare-masteren for vare {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
-DocType: Shipping Rule Condition,Shipping Amount,Forsendelse Mængde
-apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Afventer Beløb
-DocType: Purchase Invoice Item,Conversion Factor,Konvertering Factor
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit-Til konto skal være et tilgodehavende konto
+DocType: Shipping Rule Condition,Shipping Amount,Forsendelsesmængde
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Afventende beløb
+DocType: Purchase Invoice Item,Conversion Factor,Konverteringsfaktor
 DocType: Purchase Order,Delivered,Leveret
 ,Vehicle Expenses,Køretøjsudgifter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
+DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Forventet værdi efter brugstid skal være større end eller lig med {0}
 DocType: Purchase Receipt,Vehicle Number,Køretøjsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Den dato, hvor tilbagevendende faktura vil blive stoppe"
 DocType: Employee Loan,Loan Amount,Lånebeløb
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Række {0}: Bill of Materials ikke fundet for Item {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Række {0}: stykliste ikke fundet for vare {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Samlede fordelte blade {0} kan ikke være mindre end allerede godkendte blade {1} for perioden
 DocType: Journal Entry,Accounts Receivable,Tilgodehavender
-,Supplier-Wise Sales Analytics,Forhandler-Wise Sales Analytics
+,Supplier-Wise Sales Analytics,Salgsanalyser pr. leverandør
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Indtast betalt beløb
-DocType: Salary Structure,Select employees for current Salary Structure,Vælg medarbejdere til nuværende Løn Structure
+DocType: Salary Structure,Select employees for current Salary Structure,Vælg medarbejdere til denne lønstruktur
 DocType: Production Order,Use Multi-Level BOM,Brug Multi-Level BOM
 DocType: Bank Reconciliation,Include Reconciled Entries,Medtag Afstemt Angivelser
-DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Moderskurs (Forlad blank, hvis dette ikke er en del af Moders kursus)"
-DocType: Leave Control Panel,Leave blank if considered for all employee types,Lad stå tomt hvis det anses for alle typer medarbejderaktier
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Overordnet kursus (markér ikke, hvis dette ikke er en del af et overordnet kursus)"
+DocType: Leave Control Panel,Leave blank if considered for all employee types,"Lad feltet stå tomt, hvis det skal gælde for alle medarbejdertyper"
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuere afgifter baseret på
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Tidsregistreringskladder
 DocType: HR Settings,HR Settings,HR-indstillinger
 DocType: Salary Slip,net pay info,nettoløn info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Udlæg afventer godkendelse. Kun Udlægs-godkenderen kan opdatere status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Udlæg afventer godkendelse. Kun Udlægs-godkenderen kan opdatere status.
 DocType: Email Digest,New Expenses,Nye udgifter
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatbeløb
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Række # {0}: Antal skal være én, eftersom varen er et anlægsaktiv. Brug venligst separat række til flere antal."
-DocType: Leave Block List Allow,Leave Block List Allow,Lad Block List Tillad
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
+DocType: Leave Block List Allow,Leave Block List Allow,Tillad blokerede fraværsansøgninger
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Forkortelsen kan ikke være tom eller bestå af mellemrum
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe til ikke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
-DocType: Loan Type,Loan Name,lån Navn
+DocType: Loan Type,Loan Name,Lånenavn
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Samlede faktiske
 DocType: Student Siblings,Student Siblings,Student Søskende
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,Enhed
 apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,Angiv venligst firma
-,Customer Acquisition and Loyalty,Customer Acquisition og Loyalitet
+,Customer Acquisition and Loyalty,Kundetilgang og -loyalitet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Lager, hvor du vedligeholder lager af afviste varer"
 DocType: Production Order,Skip Material Transfer,Spring over overførsel af materiale
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finde valutakurs for {0} til {1} for nøgle dato {2}. Opret venligst en valutaudvekslingsoptegnelse manuelt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din regnskabsår slutter den
 DocType: POS Profile,Price List,Prisliste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nu standard regnskabsår. Opdater venligst din browser for at ændringen træder i kraft.
@@ -1972,58 +1975,58 @@
 DocType: Vehicle,Fuel Type,Brændstofstype
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,Angiv venligst valuta i firmaet
 DocType: Workstation,Wages per hour,Timeløn
-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 balance i Batch {0} vil blive negativ {1} for Item {2} på Warehouse {3}
+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},Lagersaldo i parti {0} vil blive negativ {1} for vare {2} på lager {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Følgende materialeanmodninger er blevet dannet automatisk baseret på varens genbestillelsesniveau
-DocType: Email Digest,Pending Sales Orders,Afventer salgsordrer
+DocType: Email Digest,Pending Sales Orders,Afventende salgsordrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Konto Valuta skal være {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Omregningsfaktor kræves i række {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af salgsordre, salgsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Række # {0}: referencedokumenttype skal være en af følgende: salgsordre, salgsfaktura eller kassekladde"
 DocType: Salary Component,Deduction,Fradrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Række {0}: Fra tid og til tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløb Forskel
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Varepris tilføjet for {0} i prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Indtast venligst Medarbejder Id dette salg person
 DocType: Territory,Classification of Customers by region,Klassifikation af kunder efter region
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Forskel Beløb skal være nul
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Forskel Beløb skal være nul
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Indtast venligst Produktion Vare først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnede kontoudskrift balance
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Deaktiveret bruger
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Tilbud
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Tilbud
 DocType: Quotation,QTN-,T-
 DocType: Salary Slip,Total Deduction,Samlet Fradrag
-,Production Analytics,Produktion Analytics
+,Production Analytics,Produktionsanalyser
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Omkostninger opdateret
 DocType: Employee,Date of Birth,Fødselsdato
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Element {0} er allerede blevet returneret
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Regnskabsår ** repræsenterer et regnskabsår. Alle regnskabsposteringer og andre større transaktioner spores mod ** regnskabsår **.
 DocType: Opportunity,Customer / Lead Address,Kunde / Emne Adresse
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL certifikat på vedhæftet fil {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldigt SSL-certifikat på vedhæftet fil {0}
 DocType: Student Admission,Eligibility,Berettigelse
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjælpe dig virksomhed, tilføje alle dine kontakter, og flere som din fører"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjælpe dig virksomhed, tilføje alle dine kontakter, og flere som din fører"
 DocType: Production Order Operation,Actual Operation Time,Faktiske Operation Time
 DocType: Authorization Rule,Applicable To (User),Gælder for (Bruger)
 DocType: Purchase Taxes and Charges,Deduct,Fratræk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Stillingsbeskrivelse
 DocType: Student Applicant,Applied,Anvendt
-DocType: Sales Invoice Item,Qty as per Stock UOM,Antal pr Stock UOM
+DocType: Sales Invoice Item,Qty as per Stock UOM,Mængde pr. lagerenhed
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian2 Name,Guardian2 Navn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +131,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series","Specialtegn undtagen &quot;-&quot; &quot;.&quot;, &quot;#&quot;, og &quot;/&quot; ikke tilladt i navngivning serie"
 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å emner, tilbud, salgsordrer osv fra kampagne til Return on Investment."
 DocType: Expense Claim,Approver,Godkender
 ,SO Qty,SO Antal
-DocType: Guardian,Work Address,Arbejde Adresse
+DocType: Guardian,Work Address,Arbejdsadresse
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Request for Quotation,Manufacturing Manager,Produktionschef
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serienummer {0} er under garanti op til {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} er under garanti op til {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Opdel følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Forsendelser
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Kontosaldo ({0}) for {1} og lagerværdi ({2}) for lager {3} skal være ens
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Samlet tildelte beløb (Company Currency)
 DocType: Purchase Order Item,To be delivered to customer,Der skal leveres til kunden
 DocType: BOM,Scrap Material Cost,Skrot materialeomkostninger
-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
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +223,Serial No {0} does not belong to any Warehouse,Serienummer {0} tilhører ikke noget lager
 DocType: Purchase Invoice,In Words (Company Currency),I Words (Company Valuta)
 DocType: Asset,Supplier,Leverandør
 DocType: C-Form,Quarter,Kvarter
@@ -2037,26 +2040,26 @@
 DocType: Leave Application,Total Leave Days,Totalt antal fraværsdage
 DocType: Email Digest,Note: Email will not be sent to disabled users,Bemærk: E-mail vil ikke blive sendt til deaktiverede brugere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vælg firma ...
-DocType: Leave Control Panel,Leave blank if considered for all departments,Lad stå tomt hvis det anses for alle afdelinger
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vælg firma ...
+DocType: Leave Control Panel,Leave blank if considered for all departments,"Lad stå tomt, hvis det skal gælde for alle afdelinger"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer af beskæftigelse (permanent, kontrakt, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
-DocType: Process Payroll,Fortnightly,Fortnightly
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er obligatorisk for vare {1}
+DocType: Process Payroll,Fortnightly,Hver 14. dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Udgifter til nye køb
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Salgsordre påkrævet for vare {0}
-DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Valuta)
+DocType: Purchase Invoice Item,Rate (Company Currency),Sats (firmavaluta)
 DocType: Student Guardian,Others,Andre
-DocType: Payment Entry,Unallocated Amount,Ufordelt Beløb
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
+DocType: Payment Entry,Unallocated Amount,Ufordelt beløb
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finde en matchende Item. Vælg en anden værdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og Afgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En vare eller tjenesteydelse, der købes, sælges eller opbevares på lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ikke flere opdateringer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke vælge charge type som &#39;On Forrige Row Beløb&#39; eller &#39;On Forrige Row alt &quot;for første række
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item bør ikke være et produkt Bundle. Fjern element `{0}` og gemme
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Underordnet vare bør ikke være en produktpakke. Fjern vare `{0}` og gem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Tilføj Tidsregistreringskladder
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Tilføj Tidsregistreringskladder
 DocType: Vehicle Service,Service Item,tjenesten Item
 DocType: Bank Guarantee,Bank Guarantee,Bank garanti
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Klik på &quot;Generer Schedule &#39;for at få tidsplan
@@ -2070,54 +2073,55 @@
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Tree af finansielle konti.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} mod salgsordre {1}
 DocType: Account,Fixed Asset,Anlægsaktiv
-apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Føljeton Inventory
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,Serienummer-lager
 DocType: Employee Loan,Account Info,Kontooplysninger
-DocType: Activity Type,Default Billing Rate,Standard Billing Rate
+DocType: Activity Type,Default Billing Rate,Standard-faktureringssats
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0} Studentgrupper oprettet.
-DocType: Sales Invoice,Total Billing Amount,Samlet Billing Beløb
+DocType: Sales Invoice,Total Billing Amount,Samlet faktureringsbeløb
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,"Der skal være en standard indgående e-mail-konto aktiveret for at dette virker. Venligst setup en standard indgående e-mail-konto (POP / IMAP), og prøv igen."
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Tilgodehavende konto
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Salgsordre til betaling
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Indstil navngivningsserie for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Udlægsdetalje
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Vælg korrekt konto
 DocType: Item,Weight UOM,Vægtenhed
-DocType: Salary Structure Employee,Salary Structure Employee,Løn Struktur Medarbejder
+DocType: Salary Structure Employee,Salary Structure Employee,Lønstruktur medarbejder
 DocType: Employee,Blood Group,Blood Group
 DocType: Production Order Operation,Pending,Afventer
-DocType: Course,Course Name,Kursus navn
+DocType: Course,Course Name,Kursusnavn
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,"Brugere, der kan godkende en bestemt medarbejders orlov applikationer"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Kontorudstyr
 DocType: Purchase Invoice Item,Qty,Antal
 DocType: Fiscal Year,Companies,Firmaer
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Elektronik
-DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Hæv Materiale Request når bestanden når re-order-niveau
+DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Start materialeanmodningen når lagerbestanden når genbestilningsniveauet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,Fuld tid
 DocType: Salary Structure,Employees,Medarbejdere
 DocType: Employee,Contact Details,Kontaktoplysninger
-DocType: C-Form,Received Date,Modtaget Dato
+DocType: C-Form,Received Date,Modtaget d.
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Hvis du har oprettet en standard skabelon i Salg Skatter og Afgifter Skabelon, skal du vælge en, og klik på knappen nedenfor."
 DocType: BOM Scrap Item,Basic Amount (Company Currency),Grundbeløb (Company Currency)
 DocType: Student,Guardians,Guardians
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Priserne vil ikke blive vist, hvis prisliste ikke er indstillet"
-apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Angiv et land for denne forsendelsesregel eller check Worldwide Shipping
-DocType: Stock Entry,Total Incoming Value,Samlet Indgående Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet-til skal angives
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesedler hjælpe med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Angiv et land for denne forsendelsesregel eller check ""Levering til hele verden"""
+DocType: Stock Entry,Total Incoming Value,Samlet værdi indgående
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet-til skal angives
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidskladder hjælper med at holde styr på tid, omkostninger og fakturering for aktiviteter udført af dit team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Indkøbsprisliste
 DocType: Offer Letter Term,Offer Term,Offer Term
 DocType: Quality Inspection,Quality Manager,Kvalitetschef
 DocType: Job Applicant,Job Opening,Rekrutteringssag
 DocType: Payment Reconciliation,Payment Reconciliation,Afstemning af betalinger
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vælg Incharge Person navn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vælg Incharge Person navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Sum ubetalt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Ansættelsesbrev
-apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Dan materialeanmodninger og produktionsordrer.
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlede fakturerede Amt
+apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Opret materialeanmodninger og produktionsordrer
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Samlet faktureret beløb
 DocType: BOM,Conversion Rate,Omregningskurs
 apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,Søg efter vare
 DocType: Timesheet Detail,To Time,Til Time
@@ -2129,47 +2133,47 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,Prisliste {0} er deaktiveret
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Række {0}: Afsluttet Antal kan ikke være mere end {1} til drift {2}
 DocType: Manufacturing Settings,Allow Overtime,Tillad Overarbejde
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serialized Item {0} kan ikke opdateres ved hjælp af Stock Forsoning, brug venligst Stock Entry"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","Serienummervare {0} kan ikke opdateres ved hjælp af lagerafstemning, brug venligst lagerposter"
 DocType: Training Event Employee,Training Event Employee,Træning Begivenhed Medarbejder
-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 vare {1}. Du har givet {2}."
+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 vare {1}. Du har angivet {2}."
 DocType: Stock Reconciliation Item,Current Valuation Rate,Aktuel Værdiansættelse Rate
 DocType: Item,Customer Item Codes,Kunde varenumre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Exchange Gevinst / Tab
-DocType: Opportunity,Lost Reason,Tabt Årsag
+DocType: Opportunity,Lost Reason,Tabsårsag
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Indtast Kvittering Dokument
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle varer er allerede blevet faktureret
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Indtast Kvittering Dokument
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Alle varer er allerede blevet faktureret
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Angiv en gyldig &quot;Fra sag nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Yderligere omkostninger centre kan foretages under Grupper men indtastninger kan foretages mod ikke-grupper
 DocType: Project,External,Ekstern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brugere og tilladelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
-DocType: Branch,Branch,Branch
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Produktionsordrer Oprettet: {0}
+DocType: Branch,Branch,Filial
 DocType: Guardian,Mobile Number,Mobiltelefonnr.
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Udskriving
 DocType: Bin,Actual Quantity,Faktiske Mængde
 DocType: Shipping Rule,example: Next Day Shipping,eksempel: Næste dages levering
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Løbenummer {0} ikke fundet
-DocType: Scheduling Tool,Student Batch,Student Batch
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} ikke fundet
+DocType: Scheduling Tool,Student Batch,Elevgruppe
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Opret studerende
-apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om projektet: {0}
-DocType: Leave Block List Date,Block Date,Block Dato
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Opret studerende
+apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du er blevet inviteret til at samarbejde om sag: {0}
+DocType: Leave Block List Date,Block Date,Blokeringsdato
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansøg nu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Faktisk antal {0} / ventende antal {1}
 DocType: Sales Order,Not Delivered,Ikke leveret
 ,Bank Clearance Summary,Bank Clearance Summary
-apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Oprette og administrere de daglige, ugentlige og månedlige email fordøjer."
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Opret og administrér de daglige, ugentlige og månedlige e-mail-nyhedsbreve."
 DocType: Appraisal Goal,Appraisal Goal,Vurdering Goal
 DocType: Stock Reconciliation Item,Current Amount,Det nuværende beløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +56,Buildings,Bygninger
 DocType: Fee Structure,Fee Structure,Gebyr struktur
 DocType: Timesheet Detail,Costing Amount,Koster Beløb
 DocType: Student Admission,Application Fee,Tilmeldingsgebyr
-DocType: Process Payroll,Submit Salary Slip,Indsend lønseddel
-apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maxiumm rabat for Item {0} er {1}%
+DocType: Process Payroll,Submit Salary Slip,Godkend lønseddel
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,Maksimal rabat for vare {0} er {1}%
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,Import i bulk
 DocType: Sales Partner,Address & Contacts,Adresse & kontaktpersoner
 DocType: SMS Log,Sender Name,Afsendernavn
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,Sendt Til
 DocType: Payment Request,Make Sales Invoice,Opret salgsfaktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Næste Kontakt Dato kan ikke være i fortiden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næste kontakt d. kan ikke være i fortiden
 DocType: Company,For Reference Only.,Kun til reference.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Vælg partinr.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Retsinformation
 DocType: Sales Invoice Advance,Advance Amount,Advance Beløb
@@ -2188,28 +2193,28 @@
 DocType: Employee,Employment Details,Beskæftigelse Detaljer
 DocType: Employee,New Workplace,Ny Arbejdsplads
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +17,Set as Closed,Angiv som Lukket
-apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},Ingen Vare med stregkode {0}
+apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},Ingen vare med stregkode {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis et diasshow på toppen af siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,styklister
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butikker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butikker
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Baseret på
 DocType: Item,End of Life,End of Life
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,Rejser
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard Løn Struktur fundet for medarbejderen {0} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Ingen aktiv eller standard-lønstruktur fundet for medarbejder {0} for de givne datoer
 DocType: Leave Block List,Allow Users,Tillad brugere
 DocType: Purchase Order,Customer Mobile No,Kunde mobiltelefonnr.
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Spor separat indtægter og omkostninger for produkt- vertikaler eller afdelinger.
 DocType: Rename Tool,Rename Tool,Omdøb Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Opdatering Omkostninger
-DocType: Item Reorder,Item Reorder,Item Genbestil
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Vis lønseddel
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materiale
+DocType: Item Reorder,Item Reorder,Genbestil vare
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Vis lønseddel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokument er over grænsen ved {0} {1} for vare {4}. Er du gør en anden {3} mod samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vælg ændringsstørrelse konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Venligst sæt tilbagevendende efter besparelse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vælg ændringsstørrelse konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brugeren skal altid vælge
 DocType: Stock Settings,Allow Negative Stock,Tillad Negativ Stock
@@ -2218,9 +2223,9 @@
 DocType: Topic,Topic,Emne
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,Pengestrømme fra finansaktiviteter
 DocType: Budget Account,Budget Account,Budget-konto
-DocType: Quality Inspection,Verified By,Verified by
+DocType: Quality Inspection,Verified By,Bekræftet af
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke ændre virksomhedens standard valuta, fordi den anvendes i eksisterende transaktioner. Transaktioner skal annulleres for at ændre standard valuta."
-DocType: Grade Interval,Grade Description,Grade Beskrivelse
+DocType: Grading Scale Interval,Grade Description,Grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Købskvitteringsnr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Opret lønseddel
@@ -2230,7 +2235,7 @@
 DocType: Appraisal,Employee,Medarbejder
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} er fuldt faktureret
 DocType: Training Event,End Time,End Time
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Aktiv Løn Struktur {0} fundet for medarbejderen {1} for de givne datoer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Aktiv lønstruktur {0} fundet for medarbejder {1} for de givne datoer
 DocType: Payment Entry,Payment Deductions or Loss,Betalings Fradrag eller Tab
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Standard kontraktvilkår for Salg eller Indkøb.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Sortér efter Bilagstype
@@ -2256,9 +2261,9 @@
 DocType: Buying Settings,Buying Settings,Indkøbsindstillinger
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Styklistenr. for en færdigvare
 DocType: Upload Attendance,Attendance To Date,Fremmøde tildato
-DocType: Warranty Claim,Raised By,Rejst af
+DocType: Warranty Claim,Raised By,Oprettet af
 DocType: Payment Gateway Account,Payment Account,Betalingskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Angiv venligst firma for at fortsætte
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Angiv venligst firma for at fortsætte
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoændring i Debitor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenserende Off
 DocType: Offer Letter,Accepted,Accepteret
@@ -2267,17 +2272,17 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Værelsesnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ugyldig henvisning {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større end planlagt antal ({2}) på produktionsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Forsendelseregeltekst
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Brugerforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råmaterialer kan ikke være tom.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Kassekladde
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kunne ikke opdatere lager, faktura indeholder drop shipping element."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Hurtig kassekladde
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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 +209,Please enter Planned Qty for Item {0} at row {1},Indtast venligst Planned Antal for Item {0} på rækken {1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} er ikke godkendt
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Anmodning om.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,"Vil blive oprettet separat produktion, for hver færdigvare god element."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} skal være negativ til gengæld dokument
@@ -2285,20 +2290,20 @@
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Navnet på det institut, som du konfigurerer dette system."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frosset op til denne dato, kan ingen gøre / ændre post undtagen rolle angivet nedenfor."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt status
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Gem venligst dokumentet, før generere vedligeholdelsesplan"
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Sagsstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markér dette for at forbyde fraktioner. (For NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Følgende produktionsordrer blev dannet:
-DocType: Student Admission,Naming Series (for Student Applicant),Navngivnings Serienummer (for Student Ansøger)
+DocType: Student Admission,Naming Series (for Student Applicant),Navngivningsnummerserie (for elevansøger)
 DocType: Delivery Note,Transporter Name,Transporter Navn
 DocType: Authorization Rule,Authorized Value,Autoriseret Værdi
 DocType: BOM,Show Operations,Vis Operations
 ,Minutes to First Response for Opportunity,Minutter til første reaktion for salgsmulighed
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Absent,Ialt fraværende
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Vare eller lager for række {0} matcher ikke materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,Vare eller lager for række {0} matcher ikke materialeanmodningen
 apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,Måleenhed
 DocType: Fiscal Year,Year End Date,Sidste dag i året
-DocType: Task Depends On,Task Depends On,Task Afhænger On
+DocType: Task Depends On,Task Depends On,Opgave afhænger af
 DocType: Supplier Quotation,Opportunity,Salgsmulighed
 ,Completed Production Orders,Afsluttede produktionsordrer
 DocType: Operation,Default Workstation,Standard Workstation
@@ -2306,13 +2311,13 @@
 DocType: Payment Entry,Deductions or Loss,Fradrag eller Tab
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1} er lukket
 DocType: Email Digest,How frequently?,Hvor ofte?
-DocType: Purchase Receipt,Get Current Stock,Få Aktuel Stock
+DocType: Purchase Receipt,Get Current Stock,Hent aktuel lagerbeholdning
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Styklistetræ
 DocType: Student,Joining Date,Vær med Dato
 ,Employees working on a holiday,"Medarbejdere, der arbejder på en helligdag"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marker tilstede
 DocType: Project,% Complete Method,% Complete Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelse startdato kan ikke være før leveringsdato for Serial Nej {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Vedligeholdelsesstartdato kan ikke være før leveringsdato for serienummer {0}
 DocType: Production Order,Actual End Date,Faktisk slutdato
 DocType: BOM,Operating Cost (Company Currency),Driftsomkostninger (Company Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2321,21 +2326,21 @@
 DocType: Company,Fixed Asset Depreciation Settings,Anlægsaktiv nedskrivning Indstillinger
 DocType: Item,Will also apply for variants unless overrridden,"Vil også gælde for varianter, medmindre overrridden"
 DocType: Purchase Invoice,Advances,Forskud
-DocType: Production Order,Manufacture against Material Request,Fremstilling mod Materiale Request
+DocType: Production Order,Manufacture against Material Request,Produktion mod materialeanmodning
 DocType: Item Reorder,Request for,Anmodning om
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,Godkendelse Brugeren kan ikke være det samme som brugeren er reglen gælder for
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende Rate (som pr Stock UOM)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Grundlæggende sats (som pr. lagerenhed)
 DocType: SMS Log,No of Requested SMS,Antal  af forespurgte SMS'er
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Fravær uden løn stemmer ikke med de godkendte fraværsansøgninger
 DocType: Campaign,Campaign-.####,Kampagne -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næste skridt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Angiv venligst de angivne poster på de bedste mulige priser
 DocType: Selling Settings,Auto close Opportunity after 15 days,Luk automatisk salgsmulighed efter 15 dage
-apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End År
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
+apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Slutår
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tilbud/emne %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Kontrakt Slutdato skal være større end Dato for Sammenføjning
 DocType: Delivery Note,DN-,DN-
-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: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,"En distributør, forhandler, sælger eller butik, der sælger firmaets varer og tjenesteydelser mod en provision."
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} mod indkøbsordre {1}
 DocType: 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)"
 DocType: Task,Actual Start Date (via Time Sheet),Faktisk startdato (via Time Sheet)
@@ -2361,15 +2366,15 @@
 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.","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."
+10. Add or Deduct: Whether you want to add or deduct the tax.","Standard momsskabelon, der kan anvendes på alle købstransaktioner. Denne skabelon kan indeholde liste over skatte- hoveder og også andre bekostning hoveder som ""Shipping"", ""forsikring"", ""Håndtering"" osv #### Bemærk Skatteprocenten du definerer her, vil være standard skattesats for alle ** Varer * *. Hvis der er ** Varer **, der har forskellige satser, skal de tilsættes i ** Item Skat ** bord i ** Item ** mester. #### Beskrivelse af kolonner 1. Beregning Type: - Dette kan være på ** Net Total ** (dvs. summen af grundbeløb). - ** På Forrige Row Total / Beløb ** (for kumulative skatter eller afgifter). Hvis du vælger denne mulighed, vil skatten blive anvendt som en procentdel af den forrige række (på skatteområdet tabel) beløb eller total. - ** Faktisk ** (som nævnt). 2. Konto Hoved: Account Finans hvorunder denne afgift vil være reserveret 3. Cost Center: Hvis skatten / afgiften er en indtægt (som shipping) eller omkostninger det skal reserveres mod en Cost Center. 4. Beskrivelse: Beskrivelse af skat (som vil blive trykt i fakturaer / citater). 5. Pris: Skatteprocent. 6. Beløb: Skat beløb. 7. Samlet: Kumulativ total til dette punkt. 8. Indtast Række: Hvis baseret på ""Forrige Row alt"" kan du vælge den række nummer, som vil blive taget som en base for denne beregning (standard er den forrige række). 9. Overvej Skat eller Gebyr for: I dette afsnit kan du angive, om skatten / afgiften er kun for værdiansættelse (ikke en del af det samlede) eller kun for total (ikke tilføre værdi til emnet) eller til begge. 10. Tilføj eller fratrække: Uanset om du ønsker at tilføje eller fratrække afgiften."
 DocType: Homepage,Homepage,Hjemmeside
 DocType: Purchase Receipt Item,Recd Quantity,RECD Mængde
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Oprettet - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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 +539,Stock Entry {0} is not submitted,Stock indtastning {0} er ikke indsendt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Lagerindtastning {0} er ikke godkendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / kontantautomat konto
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Næste Kontakt By kan ikke være det samme som Lead e-mail adresse
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Næste kontakt af kan ikke være den samme som emnets e-mailadresse
 DocType: Tax Rule,Billing City,Fakturering By
 DocType: Asset,Manual,Manuel
 DocType: Salary Component Account,Salary Component Account,Lønrtskonto
@@ -2380,7 +2385,7 @@
 DocType: Warranty Claim,Service Address,Tjeneste Adresse
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Havemøbler og Kampprogram
 DocType: Item,Manufacture,Fremstilling
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Venligst følgeseddel først
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Vælg følgeseddel først
 DocType: Student Applicant,Application Date,Ansøgningsdato
 DocType: Salary Detail,Amount based on formula,Beløb baseret på formlen
 DocType: Purchase Invoice,Currency and Price List,Valuta- og prisliste
@@ -2388,34 +2393,35 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance Dato ikke nævnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Besættelse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Række {0}: Start dato skal være før slutdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),I alt (antal)
 DocType: Sales Invoice,This Document,Dette dokument
 DocType: Installation Note Item,Installed Qty,Antal installeret
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Træning Resultat
-DocType: Purchase Invoice,Is Paid,er Betalt
+DocType: Purchase Invoice,Is Paid,er betalt
 DocType: Salary Structure,Total Earning,Samlet Earning
 DocType: Purchase Receipt,Time at which materials were received,"Tidspunkt, hvor materialer blev modtaget"
 DocType: Stock Ledger Entry,Outgoing Rate,Udgående Rate
-apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation gren mester.
+apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,Organisation filial-master.
 apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,eller
-DocType: Sales Order,Billing Status,Fakturering status
+DocType: Sales Order,Billing Status,Faktureringsstatus
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapporter et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,"El, vand og varmeudgifter"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-over
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kassekladde {1} har ikke konto {2} eller allerede matchet mod en anden kupon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Kassekladde {1} har ikke konto {2} eller allerede matchet mod en anden kupon
 DocType: Buying Settings,Default Buying Price List,Standard indkøbsprisliste
 DocType: Process Payroll,Salary Slip Based on Timesheet,Lønseddel Baseret på Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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,Salgsordrebesked
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Indstil standardværdier som Firma, Valuta, indeværende regnskabsår, m.v."
-DocType: Payment Entry,Payment Type,Betaling Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst en batch for vare {0}. Kunne ikke finde en enkelt batch, der opfylder dette krav"
+DocType: Payment Entry,Payment Type,Betalingstype
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vælg venligst et parti for vare {0}. Kunne ikke finde et eneste parti, der opfylder dette krav"
 DocType: Process Payroll,Select Employees,Vælg Medarbejdere
 DocType: Opportunity,Potential Sales Deal,Potentielle Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Check / reference Dato
-DocType: Purchase Invoice,Total Taxes and Charges,Total Skatter og Afgifter
+DocType: Purchase Invoice,Total Taxes and Charges,Moms i alt
 DocType: Employee,Emergency Contact,Emergency Kontakt
 DocType: Bank Reconciliation Detail,Payment Entry,Betaling indtastning
 DocType: Item,Quality Parameters,Kvalitetsparametre
@@ -2428,72 +2434,74 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profil {0} allerede skabt til selskab {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Udskift Item / BOM i alle styklister
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittering dokument skal indsendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittering skal godkendes
 DocType: Purchase Invoice Item,Received Qty,Modtaget Antal
-DocType: Stock Entry Detail,Serial No / Batch,Løbenummer / Batch
+DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Parti
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ikke betalte og ikke leveret
-DocType: Product Bundle,Parent Item,Parent Item
+DocType: Product Bundle,Parent Item,Overordnet vare
 DocType: Account,Account Type,Kontotype
 DocType: Delivery Note,DN-RET-,DN-Retsinformation
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ingen tidsregistreringer
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Fraværstype {0} kan ikke bæres videre
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedligeholdelsesplan ikke genereret for alle poster. Klik på &quot;Generer Schedule &#39;
 ,To Produce,At producere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Løn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rækken {0} i {1}. For at inkludere {2} i Item sats, rækker {3} skal også medtages"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Opret Bruger
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Opret Bruger
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikation af emballagen for levering (til print)
-DocType: Bin,Reserved Quantity,Reserveret Mængde
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Indtast venligst gyldig email adresse
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},Der er ingen obligatorisk kursus for programmet {0}
+DocType: Bin,Reserved Quantity,Reserveret mængde
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Indtast venligst en gyldig e-mailadresse
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},Der er intet obligatorisk kursus for programmet {0}
 DocType: Landed Cost Voucher,Purchase Receipt Items,Købskvittering varer
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,Tilpasning Forms
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +36,Arrear,bagud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Afskrivningsbeløb i perioden
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Deaktiveret skabelon må ikke være standardskabelon
-DocType: Account,Income Account,Indkomst konto
+DocType: Account,Income Account,Indtægtskonto
 DocType: Payment Request,Amount in customer's currency,Beløb i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Aktuel Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of Materials Based On&quot; i Costing afsnit
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,forrige
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Partier hjælper dig med at spore fremmøde, vurderinger og gebyrer for studerende"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Elevgrupper hjælper dig med at administrere fremmøde, vurderinger og gebyrer for eleverne"
 DocType: Payment Entry,Total Allocated Amount,Samlet bevilgede beløb
-DocType: Item Reorder,Material Request Type,Materiale Request Type
+DocType: Item Reorder,Material Request Type,Materialeanmodningstype
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Kassekladde til løn fra {0} til {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage er fuld, ikke spare"
-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/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage er fuld, ikke spare"
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Række {0}: Enhedskode-konverteringsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Omkostningssted
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Bilagsnr.
 DocType: Notification Control,Purchase Order Message,Indkøbsordre meddelelse
-DocType: Tax Rule,Shipping Country,Forsendelse Land
+DocType: Tax Rule,Shipping Country,Forsendelsesland
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skjul kundens CVR-nummer fra salgstransaktioner
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Lindre Dato
-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.","Prisfastsættelse Regel er lavet til at overskrive Prisliste / definere rabatprocent, baseret på nogle kriterier."
-DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan kun ændres via lager indtastning / følgeseddel / kvittering
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prisfastsættelseregler laves for at overskrive prislisten og for at fastlægge rabatprocenter baseret på forskellige kriterier.
+DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,"Lager kan kun ændres via lagerindtastning, følgeseddel eller købskvittering"
 DocType: Employee Education,Class / Percentage,Klasse / Procent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Salg- og marketingschef
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Indkomstskat
-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.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
-apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor fører af Industry Type.
-DocType: Item Supplier,Item Supplier,Vare Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Indtast venligst varenr. for at få batchnr.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vælg en værdi for {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgte Prisfastsættelse Regel er lavet til &quot;pris&quot;, vil det overskrive prislisten. Prisfastsættelse Regel prisen er den endelige pris, så ingen yderligere rabat bør anvendes. Derfor i transaktioner som Sales Order, Indkøbsordre osv, det vil blive hentet i &quot;Rate &#39;felt, snarere end&#39; Prisliste Rate &#39;område."
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Analysér emner efter branchekode.
+DocType: Item Supplier,Item Supplier,Vareleverandør
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Indtast venligst varenr. for at få partinr.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Stock Indstillinger
-apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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 +240,"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 en kontogruppe, Rodtype og firma"
 DocType: Vehicle,Electric,Elektrisk
 DocType: Task,% Progress,% fremskridt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gevinst/tab vedr. salg af anlægsaktiv
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vil sende en e-mail om arrangementet til medarbejdere med status &#39;Åbn&#39;
-DocType: Task,Depends on Tasks,Afhænger Opgaver
+DocType: Task,Depends on Tasks,Afhænger af opgaver
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrér Kundegruppetræ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Vedhæftede filer kan vises uden at gøre det muligt for indkøbskurven
 DocType: Supplier Quotation,SQTN-,LT-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Ny Cost center navn
 DocType: Leave Control Panel,Leave Control Panel,Forlad Kontrolpanel
-DocType: Project,Task Completion,Task Afslutning
+DocType: Project,Task Completion,Opgaveafslutning
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,Ikke på lager
 DocType: Appraisal,HR User,HR-bruger
 DocType: Purchase Invoice,Taxes and Charges Deducted,Skatter og Afgifter Fratrukket
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,Debit Til
 DocType: Delivery Note,Required only for sample item.,Kræves kun for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Aktuel Antal Efter Transaktion
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønseddel fundet mellem {0} og {1}
-,Pending SO Items For Purchase Request,Afventer SO Varer til Indkøb Request
+,Pending SO Items For Purchase Request,Afventende salgsordre-varer til indkøbsanmodning
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studerende optagelser
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er deaktiveret
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er deaktiveret
 DocType: Supplier,Billing Currency,Fakturering Valuta
 DocType: Sales Invoice,SINV-RET-,SF-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2515,20 +2522,20 @@
 DocType: Bank Reconciliation Detail,Cheque Number,Check Number
 ,Sales Browser,Salg Browser
 DocType: Journal Entry,Total Credit,Samlet kredit
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lager post {2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Advarsel: En anden {0} # {1} eksisterer mod lagerpost {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +161,Large,Large
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,Stor
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment Grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nyt lagernavn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),I alt {0} ({1})
-DocType: C-Form Invoice Detail,Territory,Territory
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),I alt {0} ({1})
+DocType: C-Form Invoice Detail,Territory,Område
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Henvis ikke af besøg, der kræves"
 DocType: Stock Settings,Default Valuation Method,Standard værdiansættelsesmetode
-DocType: Vehicle Log,Fuel Qty,Antal Fuel
-DocType: Production Order Operation,Planned Start Time,Planlagt Start Time
+DocType: Vehicle Log,Fuel Qty,Brændstofmængde
+DocType: Production Order Operation,Planned Start Time,Planlagt starttime
 DocType: Course,Assessment,Vurdering
 DocType: Payment Entry Reference,Allocated,Allokeret
 apps/erpnext/erpnext/config/accounts.py +236,Close Balance Sheet and book Profit or Loss.,Luk Balance og book resultatopgørelsen.
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,Master-Prisliste
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alt salg Transaktioner kan mærkes mod flere ** Sales Personer **, så du kan indstille og overvåge mål."
 ,S.O. No.,SÅ No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Opret kunde fra emne {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Opret kunde fra emne {0}
 DocType: Price List,Applicable for Countries,Gældende for lande
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Kun Lad Applikationer med status &quot;Godkendt&quot; og &quot;Afvist&quot; kan indsendes
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Elevgruppenavn er obligatorisk i rækken {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,Kopieret fra
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Navn fejl: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ikke tilknyttet {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ikke tilknyttet {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Fremmøde til medarbejder {0} er allerede markeret
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mere end én pakke af samme type (til udskrivning)
 ,Salary Register,Løn Register
@@ -2587,66 +2594,66 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} tilhører ikke firmaet {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Omkostninger som på
 DocType: Account,Round Off,Afrundninger
-,Requested Qty,Anmodet Antal
+,Requested Qty,Anmodet mængde
 DocType: Tax Rule,Use for Shopping Cart,Bruges til Indkøbskurv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Værdi {0} for Attribut {1} findes ikke på listen over gyldige Item Attribut Værdier for Item {2}
 DocType: BOM Item,Scrap %,Skrot-%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Afgifter vil blive fordelt forholdsmæssigt baseret på post qty eller mængden, som pr dit valg"
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Betjening {0} længere end alle tilgængelige arbejdstimer i arbejdsstation {1}, nedbryde driften i flere operationer"
 ,Requested,Anmodet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,Ingen Bemærkninger
-DocType: Purchase Invoice,Overdue,Forfaldne
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,Ingen bemærkninger
+DocType: Purchase Invoice,Overdue,Forfalden
 DocType: Account,Stock Received But Not Billed,Stock Modtaget men ikke faktureret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,Root Der skal være en gruppe
 DocType: Fees,FEE.,BETALING.
 DocType: Employee Loan,Repaid/Closed,Tilbagebetales / Lukket
 DocType: Item,Total Projected Qty,Den forventede samlede Antal
 DocType: Monthly Distribution,Distribution Name,Distribution Name
-DocType: Course,Course Code,Kursus Code
-apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Inspektion kvalitet kræves for Item {0}
+DocType: Course,Course Code,Kursuskode
+apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Kvalitetskontrol kræves for vare {0}
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,"Hastighed, hvormed kundens valuta omregnes til virksomhedens basisvaluta"
-DocType: Purchase Invoice Item,Net Rate (Company Currency),Net Rate (Company Valuta)
+DocType: Purchase Invoice Item,Net Rate (Company Currency),Nettosats (firmavaluta)
 DocType: Salary Detail,Condition and Formula Help,Tilstand og formel Hjælp
-apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory Tree.
+apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Område-træ.
 DocType: Journal Entry Account,Sales Invoice,Salgsfaktura
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vælg Anvend Rabat på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Vælg Anvend Rabat på
 DocType: Company,Default Receivable Account,Standard Tilgodehavende konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Opret Bank Punktet om den samlede løn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Materiale Transfer til Fremstilling
-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.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
-DocType: Purchase Invoice,Half-yearly,Halvårligt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat Procent kan anvendes enten mod en prisliste eller for alle prisliste.
+DocType: Purchase Invoice,Half-yearly,Halvårlig
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Regnskab Punktet om Stock
 DocType: Vehicle Service,Engine Oil,Motorolie
 DocType: Sales Invoice,Sales Team1,Salgs TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} eksisterer ikke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} eksisterer ikke
 DocType: Sales Invoice,Customer Address,Kundeadresse
-DocType: Employee Loan,Loan Details,lån Detaljer
+DocType: Employee Loan,Loan Details,Lånedetaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Række {0}: suppleret Antal skal være større end nul.
 DocType: Purchase Invoice,Apply Additional Discount On,Påfør Yderligere Rabat på
-DocType: Account,Root Type,Root Type
+DocType: Account,Root Type,Rodtype
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mere end {1} for Item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plot
 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: BOM,Item UOM,Vareenhed
 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}
 DocType: Cheque Print Template,Primary Settings,Primære indstillinger
 DocType: Purchase Invoice,Select Supplier Address,Vælg leverandør Adresse
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tilføj medarbejdere
-DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Tilføj medarbejdere
+DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontrol
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Anmodet materialemængde er mindre end minimum ordremængden
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er spærret
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk enhed / Datterselskab med en separat Kontoplan tilhører organisationen.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mad, drikke og tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Kan kun gøre betaling mod faktureret {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Provisionssats kan ikke være større end 100
 DocType: Stock Entry,Subcontract,Underleverance
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Indtast venligst {0} først
@@ -2663,7 +2670,7 @@
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Vurdering Plan Kriterier
 DocType: Training Event,Scheduled,Planlagt
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Anmodning om tilbud.
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg Item hvor &quot;Er Stock Item&quot; er &quot;Nej&quot; og &quot;Er Sales Item&quot; er &quot;Ja&quot;, og der er ingen anden Product Bundle"
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Vælg venligst en vare, hvor ""Er lagervare"" er ""nej"" og ""Er salgsvare"" er ""Ja"", og der er ingen anden produktpakke"
 DocType: Student Log,Academic,Akademisk
 apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Samlet forhånd ({0}) mod Order {1} kan ikke være større end Grand alt ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Vælg Månedlig Distribution til ujævnt distribuere mål på tværs måneder.
@@ -2673,19 +2680,19 @@
 apps/erpnext/erpnext/stock/get_item_details.py +318,Price List Currency not selected,Prisliste Valuta ikke valgt
 ,Student Monthly Attendance Sheet,Student Månedlig Deltagelse Sheet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},Medarbejder {0} har allerede ansøgt om {1} mellem {2} og {3}
-apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Projekt startdato
+apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Sag startdato
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,Indtil
-DocType: Rename Tool,Rename Log,Omdøbe Log
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Studentgruppe eller kursusplan er obligatorisk
-DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligehold fakturering Timer og arbejdstid samme på Timesheet
+DocType: Rename Tool,Rename Log,Omdøb log
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Elevgruppe eller kursusplan er obligatorisk
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Vedligehold faktureringstimer og arbejdstimer i samme tidskladde
 DocType: Maintenance Visit Purpose,Against Document No,Mod dokument nr
 DocType: BOM,Scrap,Skrot
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Administrer Sales Partners.
-DocType: Quality Inspection,Inspection Type,Inspektion Type
+DocType: Quality Inspection,Inspection Type,Kontroltype
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lager med eksisterende transaktion kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Udløber på
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tilføj studerende
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tilføj studerende
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vælg {0}
 DocType: C-Form,C-Form No,C-Form Ingen
 DocType: BOM,Exploded_items,Exploded_items
@@ -2693,45 +2700,45 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,Forsker
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Program Tilmelding Tool Student
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Navn eller E-mail er obligatorisk
-apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Inspektion indkommende kvalitet.
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,Kommende kvalitetskontrol.
 DocType: Purchase Order Item,Returned Qty,Returneret Antal
 DocType: Employee,Exit,Udgang
-apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Root Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,Rodtypen er obligatorisk
 DocType: BOM,Total Cost(Company Currency),Totale omkostninger (firmavaluta)
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Løbenummer {0} oprettet
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Serienummer {0} oprettet
 DocType: Homepage,Company Description for website homepage,Firmabeskrivelse til hjemmesiden
-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: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes","Af hensyn til kunderne, kan disse koder bruges i udskriftsformater ligesom fakturaer og følgesedler"
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,suplier Navn
 DocType: Sales Invoice,Time Sheet List,Timeregistreringsoversigt
 DocType: Employee,You can enter any date manually,Du kan indtaste et hvilket som helst tidspunkt manuelt
 DocType: Asset Category Account,Depreciation Expense Account,Afskrivninger udgiftskonto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,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
+DocType: Expense Claim,Expense Approver,Udlægsgodkender
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,Række {0}: Advance mod Kunden skal være kredit
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Ikke-gruppe til gruppe
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},Batch er obligatorisk i række {0}
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},Parti er obligatorisk i række {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Købskvittering leveret vare
 DocType: Payment Entry,Pay,Betale
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Til datotid
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursus Tidsplaner udgår:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Kursusskema udgår:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Logs for opretholdelse sms leveringsstatus
 DocType: Accounts Settings,Make Payment via Journal Entry,Foretag betaling via kassekladden
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,Trykt On
-DocType: Item,Inspection Required before Delivery,Inspektion Kræves før Levering
-DocType: Item,Inspection Required before Purchase,Inspektion Kræves før køb
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Ventende Aktiviteter
+DocType: Item,Inspection Required before Delivery,Kontrol påkrævet før levering
+DocType: Item,Inspection Required before Purchase,Kontrol påkrævet før køb
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,Afventende aktiviteter
 DocType: Fee Component,Fees Category,Gebyrer Kategori
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,Indtast lindre dato.
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Indtast navnet på kampagne, hvis kilden undersøgelsesudvalg er kampagne"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Dagblade udgivere
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vælg regnskabsår
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Vælg regnskabsår
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Genbestil Level
 DocType: Company,Chart Of Accounts Template,Kontoplan Skabelon
 DocType: Attendance,Attendance Date,Fremmødedato
-apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},Vare Pris opdateret for {0} i prisliste {1}
+apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},Vareprisen opdateret for {0} i prisliste {1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,Lønnen opdelt på tillæg og fradrag.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Konto med barneknudepunkter kan ikke konverteres til finans
 DocType: Purchase Invoice Item,Accepted Warehouse,Accepteret lager
@@ -2742,17 +2749,17 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,Hent studerende
 DocType: Serial No,Under Warranty,Under garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Fejl]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Fejl]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"I Ord vil være synlig, når du gemmer Sales Order."
 ,Employee Birthday,Medarbejder Fødselsdag
-DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Deltagelse Tool
-apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,grænse Krydset
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Elevgruppe fremmødeværktøj
+apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Grænse overskredet
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"En akademisk sigt denne &quot;Academic Year &#39;{0} og&quot; Term Name&#39; {1} findes allerede. Venligst ændre disse poster, og prøv igen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"En akademisk sigt denne ""skoleår '{0} og"" Term Name' {1} findes allerede. Venligst ændre disse poster, og prøv igen."
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Da der er eksisterende transaktioner mod element {0}, kan du ikke ændre værdien af {1}"
 DocType: UOM,Must be Whole Number,Skal være hele tal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nyt fravær tildelt (i dage)
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Løbenummer {0} eksisterer ikke
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} eksisterer ikke
 DocType: Sales Invoice Item,Customer Warehouse (Optional),Kundelager (valgfrit)
 DocType: Pricing Rule,Discount Percentage,Discount Procent
 DocType: Payment Reconciliation Invoice,Invoice Number,Fakturanummer
@@ -2760,7 +2767,7 @@
 DocType: Employee Leave Approver,Leave Approver,Fraværsgodkender
 DocType: Assessment Group,Assessment Group Name,Assessment Group Name
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Materiale Overført til Fremstilling
-DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Godkend udlæg' rolle
+DocType: Expense Claim,"A user with ""Expense Approver"" role",En bruger med 'Udlægsgodkender'-rolle
 DocType: Landed Cost Item,Receipt Document Type,Kvittering Dokumenttype
 DocType: Daily Work Summary Settings,Select Companies,Vælg Virksomheder
 ,Issued Items Against Production Order,Udstedte Varer Against produktionsordre
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% af materialer faktureret mod denne salgsordre
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periode Lukning indtastning
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Omkostningssted med eksisterende transaktioner kan ikke konverteres til gruppe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Mængden {0} {1} {2} {3}
 DocType: Account,Depreciation,Afskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Medarbejder Deltagerliste Værktøj
@@ -2780,65 +2787,65 @@
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Betalings Entries {0} er un-linked
 DocType: GL Entry,Voucher No,Bilagsnr.
 ,Lead Owner Efficiency,Lederegenskaber Effektivitet
-DocType: Leave Allocation,Leave Allocation,Lad Tildeling
+DocType: Leave Allocation,Leave Allocation,Fraværstildeling
 DocType: Payment Request,Recipient Message And Payment Details,Modtager Besked Og Betalingsoplysninger
 DocType: Training Event,Trainer Email,Trainer Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materiale Anmodning {0} skabt
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Materialeanmodning {0} oprettet
 DocType: Production Planning Tool,Include sub-contracted raw materials,Medtag underleverandører råmaterialer
 apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,Skabelon af vilkår eller kontrakt.
 DocType: Purchase Invoice,Address and Contact,Adresse og kontaktperson
 DocType: Cheque Print Template,Is Account Payable,Er konto Betales
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},Stock kan ikke opdateres mod køb Kvittering {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},Lager kan ikke opdateres mod købskvittering {0}
 DocType: Supplier,Last Day of the Next Month,Sidste dag i den næste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto tæt Issue efter 7 dage
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Efterlad ikke kan fordeles inden {0}, da orlov balance allerede har været carry-fremsendt i fremtiden orlov tildeling rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Bemærk: forfalden / reference Dato overstiger tilladte kredit dage efter {0} dag (e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Ansøger
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumuleret Afskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Stock Entries
-DocType: Asset,Expected Value After Useful Life,Forventet værdi efter Nyttige Life
+DocType: Asset,Expected Value After Useful Life,Forventet værdi efter forventet brugstid
 DocType: Item,Reorder level based on Warehouse,Genbestil niveau baseret på Warehouse
-DocType: Activity Cost,Billing Rate,Fakturering Rate
-,Qty to Deliver,Antal til Deliver
-,Stock Analytics,Stock Analytics
+DocType: Activity Cost,Billing Rate,Faktureringssats
+,Qty to Deliver,Antal at levere
+,Stock Analytics,Lageranalyser
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operationer kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Imod Dokument Detail Nej
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Typen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party Typen er obligatorisk
 DocType: Quality Inspection,Outgoing,Udgående
 DocType: Material Request,Requested For,Anmodet om
 DocType: Quotation Item,Against Doctype,Mod DOCTYPE
 apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1} er aflyst eller lukket
-DocType: Delivery Note,Track this Delivery Note against any Project,Spor dette Delivery Note mod enhver Project
+DocType: Delivery Note,Track this Delivery Note against any Project,Spor denne følgeseddel mod en hvilken som helst sag
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Netto kontant fra Investering
 ,Is Primary Address,Er primære adresse
 DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Asset {0} skal indsendes
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Aktiv {0} skal godkendes
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},Tilstedeværelse {0} eksisterer for studerende {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Henvisning # {0} dateret {1}
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Afskrivninger Slået grund afhændelse af aktiver
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrer Adresser
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,Bortfaldne afskrivninger grundet afhændelse af aktiver
+apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,Administrér adresser
 DocType: Asset,Item Code,Varenr.
 DocType: Production Planning Tool,Create Production Orders,Opret produktionsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vælg studerende manuelt for aktivitetsbaseret gruppe
 DocType: Journal Entry,User Remark,Brugerbemærkning
-DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end den samlede negative udestående beløb {0}
+DocType: Lead,Market Segment,Markedssegment
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt beløb kan ikke være større end den samlede negative udestående beløb {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Medarbejder Intern Arbejde Historie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lukning (dr)
 DocType: Cheque Print Template,Cheque Size,Check Størrelse
-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/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,Serienummer {0} ikke er på lager
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Beskatningsskabelon for salgstransaktioner.
 DocType: Sales Invoice,Write Off Outstanding Amount,Skriv Off Udestående beløb
-DocType: School Settings,Current Academic Year,Nuværende akademiske år
-DocType: Stock Settings,Default Stock UOM,Standard Stock UOM
+DocType: School Settings,Current Academic Year,Nuværende skoleår
+DocType: Stock Settings,Default Stock UOM,Standard lagerenhed
 DocType: Asset,Number of Depreciations Booked,Antal Afskrivninger Reserveret
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Imod medarbejderlån: {0}
 DocType: Landed Cost Item,Receipt Document,Kvittering dokument
 DocType: Production Planning Tool,Create Material Requests,Opret materialeanmodning
 DocType: Employee Education,School/University,Skole / Universitet
 DocType: Payment Request,Reference Details,Henvisning Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter Nyttig Livet skal være mindre end Gross Købesum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet værdi efter brugstid skal være mindre end bruttokøbesummen
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgængeligt antal på lageret
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faktureret beløb
 DocType: Asset,Double Declining Balance,Dobbelt Faldende Balance
@@ -2847,9 +2854,9 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +572,'Update Stock' cannot be checked for fixed asset sale,'Opdater lager' kan ikke kontrolleres pga. salg af anlægsaktiver
 DocType: Bank Reconciliation,Bank Reconciliation,Bank Afstemning
 DocType: Attendance,On Leave,Fraværende
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Send nyhedsbrev
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Modtag nyhedsbrev
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: Konto {2} tilhører ikke firma {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,Materiale Request {0} er aflyst eller stoppet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,Materialeanmodning {0} er annulleret eller stoppet
 apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Tilføj et par prøve optegnelser
 apps/erpnext/erpnext/config/hr.py +301,Leave Management,Fraværsadministration
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,Sortér efter konto
@@ -2859,32 +2866,32 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differencebeløbet skal være en kontotype Aktiv / Fordring, da dette Stock Forsoning er en åbning indtastning"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Udbetalte beløb kan ikke være større end Lånebeløb {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Indkøbsordrenr. påkrævet for vare {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produktionsordre ikke oprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Produktionsordre ikke oprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Fra dato' skal være efter 'Til dato'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke ændre status som studerende {0} er forbundet med student ansøgning {1}
 DocType: Asset,Fully Depreciated,fuldt afskrevet
 ,Stock Projected Qty,Stock Forventet Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kunden {0} hører ikke til sag {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markant Deltagelse HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citater er forslag, bud, du har sendt til dine kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens Indkøbsordre
-apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Løbenummer og Batch
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer og parti
 DocType: Warranty Claim,From Company,Fra firma
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summen af Snesevis af Assessment Criteria skal være {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Værdi eller Antal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Venligst sæt Antal Afskrivninger Reserveret
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Værdi eller mængde
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Ordrer kan ikke hæves til:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Købe Skatter og Afgifter
 ,Qty to Receive,Antal til Modtag
-DocType: Leave Block List,Leave Block List Allowed,Lad Block List tilladt
+DocType: Leave Block List,Leave Block List Allowed,Tillad blokerede fraværsansøgninger
 DocType: Grading Scale Interval,Grading Scale Interval,Karakterskala Interval
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Udlæg for kørebog {0}
 DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Rabat (%) på prisliste med margen
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Alle lagre
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle leverandørtyper
 DocType: Global Defaults,Disable In Words,Deaktiver i ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Varenr. er obligatorisk, fordi varen ikke nummereres automatisk"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Tilbud {0} ikke af typen {1}
@@ -2893,11 +2900,12 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank kassekredit
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Opret lønseddel
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allokeret beløb kan ikke være større end udestående beløb.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Gennemse styklister
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Sikrede lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Redigér bogføringsdato og -tid
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},Venligst sæt Afskrivninger relaterede konti i Asset kategori {0} eller Company {1}
-DocType: Academic Term,Academic Year,Akademi år
+DocType: Academic Term,Academic Year,Skoleår
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Åbning Balance Egenkapital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Vurdering
@@ -2912,27 +2920,26 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,Vælg antal
 DocType: Customs Tariff Number,Customs Tariff Number,Toldtarif nummer
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Godkendelse Rolle kan ikke være det samme som rolle reglen gælder for
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmelde denne e-mail-Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Afmeld dette e-mail-nyhedsbrev
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Besked sendt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Konto med barn noder kan ikke indstilles som hovedbog
 DocType: C-Form,II,II
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,"Hastighed, hvormed Prisliste valuta omregnes til kundens basisvaluta"
 DocType: Purchase Invoice Item,Net Amount (Company Currency),Nettobeløb (Firma Valuta)
-DocType: Salary Slip,Hour Rate,Hour Rate
+DocType: Salary Slip,Hour Rate,Timesats
 DocType: Stock Settings,Item Naming By,Item Navngivning By
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +46,Another Period Closing Entry {0} has been made after {1},En anden Periode Lukning indtastning {0} er blevet foretaget efter {1}
 DocType: Production Order,Material Transferred for Manufacturing,Materiale Overført til Manufacturing
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +32,Account {0} does not exists,Konto {0} findes ikke
-DocType: Project,Project Type,Projekt type
+DocType: Project,Project Type,Sagstype
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,Enten target qty eller målbeløbet er obligatorisk.
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Omkostninger ved forskellige aktiviteter
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Indstilling Begivenheder til {0}, da Medarbejderen er knyttet til nedenstående sælgere ikke har et bruger-id {1}"
-DocType: Timesheet,Billing Details,faktureringsoplysninger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Sætter begivenheder til {0}, da den til medarbejderen tilknyttede salgsmedarbejder {1} ikke har et brugernavn"
+DocType: Timesheet,Billing Details,Faktureringsoplysninger
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Kilde og mål lager skal være forskellige
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke tilladt at opdatere lagertransaktioner ældre end {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Fuldt Billed
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Indstil standard betales konto i medarbejderen {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kassebeholdning
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Levering lager kræves for lagervare {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bruttovægt af pakken. Normalt nettovægt + emballagematerialevægt. (til udskrivning)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,Gruppe baseret på
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Tjenesten Vare, type, frekvens og omkostninger beløb kræves"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv hvis der er flere Priser Regler med højeste prioritet, derefter følgende interne prioriteringer anvendt:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vil du virkelig ønsker at sende alle lønseddel fra {0} til {1}
 DocType: Cheque Print Template,Cheque Height,Check Højde
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,Fakturareference
 DocType: Purchase Order,Recurring Order,Tilbagevendende Order
 DocType: Company,Default Income Account,Standard Indkomst konto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundegruppe / Kunde
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundegruppe / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Uafsluttede regnskabsår Profit / Loss (Credit)
 DocType: Sales Invoice,Time Sheets,Tidsregistreringer
 DocType: Payment Gateway Account,Default Payment Request Message,Standard Betaling Request Message
@@ -2965,26 +2972,26 @@
 DocType: Lead,From Customer,Fra kunde
 apps/erpnext/erpnext/demo/setup/setup_data.py +321,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 +225,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke sendt
+DocType: Purchase Order Item Supplied,Stock UOM,Lagerenhed
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,Indkøbsordre {0} er ikke godkendt
 DocType: Customs Tariff Number,Tariff Number,Tarif nummer
 apps/erpnext/erpnext/stock/doctype/item/item.js +39,Projected,Forventet
-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/stock/doctype/serial_no/serial_no.py +218,Serial No {0} does not belong to Warehouse {1},Serienummer {0} hører ikke til lager {1}
 apps/erpnext/erpnext/controllers/status_updater.py +163,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,Tilbuds besked
+DocType: Notification Control,Quotation Message,Tilbudsbesked
 DocType: Employee Loan,Employee Loan Application,Medarbejder låneansøgning
 DocType: Issue,Opening Date,Åbning Dato
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Deltagelse er mærket korrekt.
 DocType: Journal Entry,Remark,Bemærkning
 DocType: Purchase Receipt Item,Rate and Amount,Sats og Beløb
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Kontotype for {0} skal være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Kontotype for {0} skal være {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ferie og fravær
 DocType: School Settings,Current Academic Term,Nuværende Akademisk Term
 DocType: Sales Order,Not Billed,Ikke Billed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Begge lagre skal høre til samme firma
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Ingen kontakter tilføjet endnu.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Beløb
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger rejst af leverandører.
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Regninger oprettet af leverandører.
 DocType: POS Profile,Write Off Account,Skriv Off konto
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Rabatbeløb
 DocType: Purchase Invoice,Return Against Purchase Invoice,Retur Against købsfaktura
@@ -2992,58 +2999,58 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Relation with Guardian1,Forholdet til Guardian1
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,Netto kontant fra drift
 apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,fx moms
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Punkt 4
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,Vare 4
 DocType: Student Admission,Admission End Date,Optagelse Slutdato
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +29,Sub-contracting,Underleverandører
 DocType: Journal Entry Account,Journal Entry Account,Kassekladde konto
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Elevgruppe
 DocType: Shopping Cart Settings,Quotation Series,Tilbudsnummer
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","En vare eksisterer med samme navn ({0}), og du bedes derfor ændre navnet på varegruppen eller omdøbe varen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vælg venligst kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Vælg venligst kunde
 DocType: C-Form,I,jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Afskrivninger Omkostninger center
 DocType: Sales Order Item,Sales Order Date,Salgsordredato
 DocType: Sales Invoice Item,Delivered Qty,Leveres Antal
-DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis markeret, vil alle børn i hver produktion element indgå i Materiale anmodninger."
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Hvis markeret, vil alle underelementer i hvert produktionselement indgå i materialeanmodningerne."
 DocType: Assessment Plan,Assessment Plan,Plan Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Lager {0}: firma er obligatorisk
-DocType: Stock Settings,Limit Percent,Begræns Procent
+DocType: Stock Settings,Limit Percent,Begrænsningsprocent
 ,Payment Period Based On Invoice Date,Betaling Periode Baseret på Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},Manglende Valutakurser for {0}
 DocType: Assessment Plan,Examiner,Censor
 DocType: Student,Siblings,Søskende
-DocType: Journal Entry,Stock Entry,Stock indtastning
-DocType: Payment Entry,Payment References,Betalings Referencer
+DocType: Journal Entry,Stock Entry,Lagerindtastning
+DocType: Payment Entry,Payment References,Betalingsreferencer
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Forsikring Detaljer
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Indtast venligst Tilbagebetalingstid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorer ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorer ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Gross Profit%
 DocType: Appraisal Goal,Weightage (%),Vægtning (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Dato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokøbesummen er obligatorisk
 DocType: Lead,Address Desc,Adresse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Emnenavn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mindst en af salg eller køb skal vælges
-DocType: Grading Structure,Grade Intervals,Grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vælg arten af din virksomhed.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Duplicate entry i Referencer {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fremstillingsprocesser gennemføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installation Dato
 apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},Række # {0}: Aktiv {1} hører ikke til firma {2}
-DocType: Employee,Confirmation Date,Bekræftelse Dato
+DocType: Employee,Confirmation Date,Bekræftet den
 DocType: C-Form,Total Invoiced Amount,Totalt faktureret beløb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,Min Antal kan ikke være større end Max Antal
 DocType: Account,Accumulated Depreciation,Akkumulerede afskrivninger
 DocType: Stock Entry,Customer or Supplier Details,Kunde- eller leverandørdetaljer
 DocType: Employee Loan Application,Required by Date,Kræves af Dato
 DocType: Lead,Lead Owner,Emneejer
-DocType: Bin,Requested Quantity,Anmodet Mængde
+DocType: Bin,Requested Quantity,Anmodet mængde
 DocType: Employee,Marital Status,Civilstand
 DocType: Stock Settings,Auto Material Request,Automatisk materialeanmodning
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,Tilgængeligt batch-antal fra lageret
@@ -3052,12 +3059,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Nuværende stykliste og ny stykliste må ikke være ens
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Lønseddel id
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,Dato for pensionering skal være større end Dato for Sammenføjning
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Der var fejl under planlægning kursus om:
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Der var fejl under planlægning af kursus:
 DocType: Sales Invoice,Against Income Account,Mod Indkomst konto
 apps/erpnext/erpnext/controllers/website_list_for_contact.py +90,{0}% Delivered,{0}% Leveret
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,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: Territory,Territory Targets,Områdemål
 DocType: Delivery Note,Transporter Info,Transporter Info
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Indstil standard {0} i Company {1}
 DocType: Cheque Print Template,Starting position from top edge,Startposition fra overkanten
@@ -3068,12 +3075,12 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhoveder til udskriftsskabeloner.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tekster til udskriftsskabeloner fx Proforma-faktura.
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Værdiansættelse typen omkostninger ikke er markeret som Inclusive
 DocType: POS Profile,Update Stock,Opdatering Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Forskellige UOM for elementer vil føre til forkert (Total) Vægt værdi. Sørg for, at Nettovægt for hvert punkt er i den samme UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
 DocType: Asset,Journal Entry for Scrap,Kassekladde til skrot
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Venligst trække elementer fra følgeseddel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,Træk varene fra følgeseddel
 apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,Journaloptegnelser {0} er un-forbundet
 apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.","Registrering af al kommunikation af type e-mail, telefon, chat, besøg osv"
 DocType: Manufacturer,Manufacturers used in Items,"Producenter, der anvendes i artikler"
@@ -3083,19 +3090,19 @@
 DocType: Buying Settings,Purchase Order Required,Indkøbsordre påkrævet
 ,Item-wise Sales History,Vare-wise Sales History
 DocType: Expense Claim,Total Sanctioned Amount,Total Sanktioneret Beløb
-,Purchase Analytics,Indkøbsanalyse
-DocType: Sales Invoice Item,Delivery Note Item,Levering Note Vare
+,Purchase Analytics,Indkøbsanalyser
+DocType: Sales Invoice Item,Delivery Note Item,Følgeseddelvare
 DocType: Expense Claim,Task,Opgave
 DocType: Purchase Taxes and Charges,Reference Row #,Henvisning Row #
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Batchnummer er obligatorisk for varer {0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},Partinummer er obligatorisk for vare {0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Dette er en rod salg person og kan ikke redigeres.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Hvis valgt, vil den værdi, der er angivet eller beregnet i denne komponent, ikke bidrage til indtjeningen eller fradrag. Men det er værdien kan henvises af andre komponenter, som kan tilføjes eller fratrækkes."
-,Stock Ledger,Stock Ledger
+,Stock Ledger,Lagerkladde
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Pris: {0}
 DocType: Company,Exchange Gain / Loss Account,Exchange Gevinst / Tab konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbejder og fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Formålet skal være en af {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Udfyld formularen og gemme det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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åmaterialer med deres seneste opgørelsesstatus
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fællesskab Forum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Faktisk antal på lager
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Genbestil Antal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle ledige stillinger
 DocType: Company,Stock Adjustment Account,Stock Justering konto
-DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskriv
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System Bruger (login) ID. Hvis sat, vil det blive standard for alle HR-formularer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
@@ -3121,31 +3128,32 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandøren leverer til Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Vare / {0}) er udsolgt
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Næste dato skal være større end bogføringsdatoen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Vis skat break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
-apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Vis momsdetaljer
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / reference Dato kan ikke være efter {0}
+apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dataind- og udlæsning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock indgange findes mod Warehouse {0}, og derfor kan du ikke re-tildele eller ændre det"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ingen studerende Fundet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Ingen studerende Fundet
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Bogføringsdato
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Sælge
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Salg
 DocType: Sales Invoice,Rounded Total,Afrundet i alt
 DocType: Product Bundle,List items that form the package.,"Vis varer, der er indeholdt i pakken."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentdel fordeling bør være lig med 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Vælg Bogføringsdato før du vælger Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Ud af AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vælg venligst Citater
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Make Vedligeholdelse Besøg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vælg venligst Citater
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Afskrivninger Reserverede kan ikke være større end alt Antal Afskrivninger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Vedligeholdelse Besøg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Kontakt venligst til den bruger, der har Sales Master manager {0} rolle"
 DocType: Company,Default Cash Account,Standard Kontant konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) herre.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er baseret på deltagelse af denne Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Ingen studerende i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tilføj flere varer eller åben fulde form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Indtast &#39;Forventet leveringsdato&#39;
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"Følgesedler {0} skal annulleres, før den salgsordre annulleres"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,Betalt beløb + Skriv Off Beløb kan ikke være større end beløb i alt
-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/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} er ikke et gyldigt partinummer for vare {1}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},Bemærk: Der er ikke nok dage til rådighed til fraværstype {0}
 DocType: Training Event,Seminar,Seminar
 DocType: Program Enrollment Fee,Program Enrollment Fee,Program Tilmelding Gebyr
@@ -3156,7 +3164,7 @@
 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.,Forkert antal finansposter fundet. Du har muligvis valgt en forkert konto.
 DocType: Employee,Prefered Contact Email,Foretrukket kontakt e-mail
 DocType: Cheque Print Template,Cheque Width,Check Bredde
-DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validér salgspris for vare mod købspris eller værdiansættelsespris
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Godkend salgspris for vare mod købspris eller værdiansættelsespris
 DocType: Program,Fee Schedule,Fee Schedule
 DocType: Hub Settings,Publish Availability,Offentliggøre Tilgængelighed
 DocType: Company,Create Chart Of Accounts Based On,Opret kontoplan baseret på
@@ -3169,37 +3177,39 @@
 DocType: Cheque Print Template,Scanned Cheque,scannede Cheque
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Sende automatiske e-mails til Kontakter på Indsendelse transaktioner.
 DocType: Timesheet,Total Billable Amount,Samlet faktureres Beløb
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Vare 3
 DocType: Purchase Order,Customer Contact Email,Kundeservicekontakt e-mail
 DocType: Warranty Claim,Item and Warranty Details,Item og garanti Detaljer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Mærke
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Vælg Programmet for at hente obligatoriske kurser.
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Vælg programmet for at hente obligatoriske kurser.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Ansvar
 DocType: Expense Claim Account,Expense Claim Account,Udlægskonto
 DocType: Sales Person,Sales Person Name,Salgsmedarbejdernavn
-apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst 1 faktura i tabellen
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,Indtast venligst mindst en faktura i tabellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Tilføj brugere
 DocType: POS Item Group,Item Group,Varegruppe
 DocType: Item,Safety Stock,Sikkerhed Stock
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fremskridt% for en opgave kan ikke være mere end 100.
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fremskridt-% for en opgave kan ikke være mere end 100.
 DocType: Stock Reconciliation Item,Before reconciliation,Før forsoning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og Afgifter Tilføjet (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Varemoms række {0} skal have en konto med 
+typen moms, indtægt, omkostning eller kan debiteres"
 DocType: Sales Order,Partly Billed,Delvist faktureret
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Vare {0} skal være en anlægsaktiv-vare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Vare {0} skal være en anlægsaktiv-vare
 DocType: Item,Default BOM,Standard stykliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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: Journal Entry,Printing Settings,Udskrivning Indstillinger
-DocType: Sales Invoice,Include Payment (POS),Medtag Betaling (POS)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Samlet Debit skal være lig med Total Credit. Forskellen er {0}
+DocType: Journal Entry,Printing Settings,Udskrivningsindstillinger
+DocType: Sales Invoice,Include Payment (POS),Medtag betaling (Kassesystem)
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},Debet og kredit stemmer ikke. Differencen er {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskab
 DocType: Asset Category Account,Fixed Asset Account,Anlægsaktivkonto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabel
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variabel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Fra følgeseddel
 DocType: Student,Student Email Address,Studerende e-mailadresse
 DocType: Timesheet Detail,From Time,Fra Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,På lager:
@@ -3208,44 +3218,44 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,Kontant eller bankkonto skal indtastes for post
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Studentadresse
 DocType: Purchase Invoice,Price List Exchange Rate,Prisliste valutakurs
-DocType: Purchase Invoice Item,Rate,Rate
+DocType: Purchase Invoice Item,Rate,Sats
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresse Navn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adresse Navn
 DocType: Stock Entry,From BOM,Fra stykliste
 DocType: Assessment Code,Assessment Code,Assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundlæggende
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transaktioner før {0} er frosset
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktioner før {0} er frosset
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Klik på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referencenummer er obligatorisk, hvis du har indtastet reference Dato"
 DocType: Bank Reconciliation Detail,Payment Document,Betaling dokument
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Dato for Sammenføjning skal være større end Fødselsdato
-DocType: Salary Slip,Salary Structure,Løn Struktur
+DocType: Salary Slip,Salary Structure,Lønstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskab
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Issue Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Issue Materiale
 DocType: Material Request Item,For Warehouse,Til lager
 DocType: Employee,Offer Date,Offer Dato
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilbud
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Du er i offline-tilstand. Du vil ikke være i stand til at genindlæse, indtil du har netværk igen."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ingen elevgrupper oprettet.
-DocType: Purchase Invoice Item,Serial No,Løbenummer
+DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig tilbagebetaling beløb kan ikke være større end Lånebeløb
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Indtast venligst Maintaince Detaljer først
 DocType: Purchase Invoice,Print Language,print Sprog
 DocType: Salary Slip,Total Working Hours,Samlede arbejdstid
 DocType: Stock Entry,Including items for sub assemblies,Herunder elementer til sub forsamlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Indtast værdien skal være positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Indtast værdien skal være positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle områder
 DocType: Purchase Invoice,Items,Varer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede tilmeldt.
 DocType: Fiscal Year,Year Name,År navn
-DocType: Process Payroll,Process Payroll,Proces Payroll
+DocType: Process Payroll,Process Payroll,Lønafregning
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,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: Product Bundle Item,Product Bundle Item,Produktpakkevare
 DocType: Sales Partner,Sales Partner Name,Salgs Partner Navn
 apps/erpnext/erpnext/hooks.py +111,Request for Quotations,Anmodning om tilbud
-DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimal Faktura Beløb
+DocType: Payment Reconciliation,Maximum Invoice Amount,Maksimalt fakturabeløb
 DocType: Student Language,Student Language,Student Sprog
 apps/erpnext/erpnext/config/selling.py +23,Customers,Kunder
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Ordre / Quot%
@@ -3254,21 +3264,19 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard måleenhed for Variant &#39;{0}&#39; skal være samme som i skabelon &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Beregn baseret på
 DocType: Delivery Note Item,From Warehouse,Fra lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ingen Elementer med Bill of Materials at Fremstilling
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Ingen stykliste-varer at fremstille
 DocType: Assessment Plan,Supervisor Name,supervisor Navn
-DocType: Program Enrollment Course,Program Enrollment Course,Program tilmeldingskursus
-DocType: Grading Structure,Grading Structure,indplaceringsstruktur
+DocType: Program Enrollment Course,Program Enrollment Course,Tilmeldingskursusprogramm
 DocType: Purchase Taxes and Charges,Valuation and Total,Værdiansættelse og Total
 DocType: Tax Rule,Shipping City,Forsendelse By
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Tilpas Underretning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pengestrøm fra driften
 DocType: Sales Invoice,Shipping Rule,Forsendelseregel
 DocType: Manufacturer,Limited to 12 characters,Begrænset til 12 tegn
-DocType: Journal Entry,Print Heading,Print Overskrift
+DocType: Journal Entry,Print Heading,Overskrift
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Samlede kan ikke være nul
 DocType: Training Event Employee,Attended,deltog
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Dage siden sidste ordre' skal være større end eller lig med nul
@@ -3284,149 +3292,150 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Ingen standard-stykliste eksisterer for vare {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vælg bogføringsdato først
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Vælg bogføringsdato først
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Åbning Dato bør være, før Closing Dato"
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center med eksisterende transaktioner kan ikke konverteres til finans
 DocType: Department,Days for which Holidays are blocked for this department.,"Dage, for hvilke helligdage er blokeret for denne afdeling."
 ,Produced,Produceret
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,Oprettede lønsedler
 DocType: Item,Item Code for Suppliers,Varenr. for leverandører
-DocType: Issue,Raised By (Email),Rejst af (E-mail)
+DocType: Issue,Raised By (Email),Oprettet af (e-mail)
 DocType: Training Event,Trainer Name,Trainer Navn
 DocType: Mode of Payment,General,Generelt
-apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Vedhæft Brevpapir
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Sidste Kommunikation
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Vedhæft brevhoved
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Sidste kommunikation
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ikke kan fradrage, når kategorien er for &quot;Værdiansættelse&quot; eller &quot;Værdiansættelse og Total &#39;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Liste dine skattemæssige hoveder (f.eks moms, Told osv de skal have entydige navne) og deres faste satser. Dette vil skabe en standard skabelon, som du kan redigere og tilføje mere senere."
-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}
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serienummer påkrævet for serienummervare {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match betalinger med fakturaer
 DocType: Journal Entry,Bank Entry,Bank indtastning
 DocType: Authorization Rule,Applicable To (Designation),Gælder for (Betegnelse)
 ,Profitability Analysis,Lønsomhedsanalyse
-apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Tilføj til indkøbsvogn
+apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,Føj til indkøbsvogn
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,Sortér efter
 DocType: Guardian,Interests,Interesser
 apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,Aktivér / deaktivér valuta.
 DocType: Production Planning Tool,Get Material Request,Hent materialeanmodning
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Postale Udgifter
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,Portoudgifter
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),I alt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
-DocType: Quality Inspection,Item Serial No,Vare Løbenummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Opret Medarbejder Records
+DocType: Quality Inspection,Item Serial No,Serienummer til varer
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Opret Medarbejder Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Samlet tilstede
-apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,regnskaber
+apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Regnskabsoversigter
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
-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 Lager id. Lager id skal indstilles af Lager indtastning eller kvittering
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,Nyt serienummer kan ikke have lager angivet. Lageret skal sættes ved lagerindtastning eller købskvittering
 DocType: Lead,Lead Type,Emnetype
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende blade på Block Datoer
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,Du er ikke autoriseret til at godkende fravær på blokerede dage
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,All these items have already been invoiced,Alle disse varer 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: Item,Default Material Request Type,Standard materialeanmodningstype
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ukendt
 DocType: Shipping Rule,Shipping Rule Conditions,Forsendelsesregelbetingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM efter udskiftning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Kassesystem
 DocType: Payment Entry,Received Amount,modtaget Beløb
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Opsæt venligst medarbejdernavnesystem i menneskelige ressourcer&gt; HR-indstillinger
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Opret fuld mængde, ignorerer mængde allerede er i ordre"
 DocType: Account,Tax,Skat
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Ikke Markeret
 DocType: Production Planning Tool,Production Planning Tool,Produktionsplanlægningsværktøj
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Batched Item {0} kan ikke opdateres ved hjælp af Stock Afstemning, men brug Lagerindgang"
-DocType: Quality Inspection,Report Date,Report Date
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","Parti-vare {0} kan ikke opdateres ved hjælp af lagerafstemning, men brug lagerindtastning i stedet"
+DocType: Quality Inspection,Report Date,Rapporteringsdato
 DocType: Student,Middle Name,Mellemnavn
 DocType: C-Form,Invoices,Fakturaer
 DocType: Batch,Source Document Name,Kildedokumentnavn
 DocType: Job Opening,Job Title,Titel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Opret Brugere
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Opret Brugere
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Mængde til Fremstilling skal være større end 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøg rapport til vedligeholdelse opkald.
 DocType: Stock Entry,Update Rate and Availability,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: POS Customer Group,Customer Group,Kundegruppe
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Ny batch-id (valgfri)
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nyt partinr. (valgfri)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Udgiftskonto er obligatorisk for element {0}
 DocType: BOM,Website Description,Hjemmesidebeskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoændring i Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresse skal være unikt, findes allerede for {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Annullér købsfaktura {0} først
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadresse skal være unik, findes allerede for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Udløbsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Kvittering
 ,Sales Register,Salgs Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-mails på
-DocType: Quotation,Quotation Lost Reason,Tilbud afvist - Årsag
+DocType: Quotation,Quotation Lost Reason,Tilbud afvist - årsag
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vælg dit domæne
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transaktion henvisning ingen {0} dateret {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Der er intet at redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Resumé for denne måned og verserende aktiviteter
 DocType: Customer Group,Customer Group Name,Kundegruppenavn
-apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsopgørelse
-apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige maksimale lånebeløb af {0}
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder endnu!
+apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pengestrømsanalyse
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløb kan ikke overstige det maksimale lånebeløb på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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 Bilagstype
 DocType: Item,Attributes,Attributter
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Indtast venligst Skriv Off konto
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste Ordredato
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sidste ordredato
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke hører til virksomheden {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i række {0} stemmer ikke overens med Leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Deltagelse for flere medarbejdere
 DocType: Vehicle,Chassis No,Stelnummer
 DocType: Payment Request,Initiated,Indledt
 DocType: Production Order,Planned Start Date,Planlagt startdato
-DocType: Serial No,Creation Document Type,Creation Dokumenttype
+DocType: Serial No,Creation Document Type,Oprettet dokumenttype
 DocType: Leave Type,Is Encash,Er indløse
 DocType: Leave Allocation,New Leaves Allocated,Nye fravær Allokeret
-apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Projekt-wise data er ikke tilgængelig for Citat
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Sagsdata er ikke tilgængelige for tilbuddet
 DocType: Project,Expected End Date,Forventet slutdato
 DocType: Budget Account,Budget Amount,Budget Beløb
 DocType: Appraisal Template,Appraisal Template Title,Vurderingsskabelonnavn
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Fra Dato {0} for Employee {1} kan ikke være, før medarbejderens sammenføjning Dato {2}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Kommerciel
 DocType: Payment Entry,Account Paid To,Konto Betalt Til
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Parent Item {0} må ikke være en lagervare
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Overordnet bare {0} må ikke være en lagervare
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle produkter eller tjenesteydelser.
 DocType: Expense Claim,More Details,Flere detaljer
 DocType: Supplier Quotation,Supplier Address,Leverandør Adresse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget for konto {1} mod {2} {3} er {4}. Det vil overstige med {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Række {0} # konto skal være af typen 'Anlægsaktiv'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Antal
-apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelse beløb for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler til at beregne forsendelsesmængden for et salg
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Nummerserien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Studiekort
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typer af aktiviteter for Time Logs
 DocType: Tax Rule,Sales,Salg
 DocType: Stock Entry Detail,Basic Amount,Grundbeløb
 DocType: Training Event,Exam,Eksamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Lager kræves for lagervare {0}
 DocType: Leave Allocation,Unused leaves,Ubrugte blade
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
-DocType: Tax Rule,Billing State,Fakturering stat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
+DocType: Tax Rule,Billing State,Anvendes ikke
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Overførsel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party konto {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party konto {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Hent eksploderede BOM (herunder underenheder)
 DocType: Authorization Rule,Applicable To (Employee),Gælder for (Medarbejder)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Forfaldsdato er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Tilvækst til Attribut {0} kan ikke være 0
 DocType: Journal Entry,Pay To / Recd From,Betal Til / RECD Fra
-DocType: Naming Series,Setup Series,Opsætning Series
+DocType: Naming Series,Setup Series,Opsætning af nummerserier
 DocType: Payment Reconciliation,To Invoice Date,Til fakturadato
 DocType: Supplier,Contact HTML,Kontakt HTML
 ,Inactive Customers,Inaktive kunder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Købskvitteringer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan anvendes en prisfastsættelsesregel?
-DocType: Stock Entry,Delivery Note No,Levering Note Nej
-DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis markeret, kun købe materielle anmodninger om endelige råmaterialer vil indgå i de Materielle anmodninger. Ellers vil Materiale Anmodninger om forældre elementer skabes"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvordan anvendes en prisfastsættelsesregel?
+DocType: Stock Entry,Delivery Note No,Følgeseddelnr.
+DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis markeret, vil kun indkøbs-materialeanmodninger om endelige råmaterialer indgå i materialeanmodningerne. Ellers vil materialeanmodninger for overordnede varer blive dannet"
 DocType: Cheque Print Template,Message to show,Besked for at vise
 DocType: Company,Retail,Retail
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Produktpakke
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3436,12 +3445,12 @@
 DocType: Payment Entry,Account Paid From,Konto Betalt Fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råmateriale varenr.
 DocType: Journal Entry,Write Off Based On,Skriv Off baseret på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Opret emne
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Opret emne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print og papirvarer
 DocType: Stock Settings,Show Barcode Field,Vis stregkodefelter
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Leverandør Emails
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Send Leverandør Emails
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Løn allerede behandlet for perioden {0} til {1}, ferie ansøgningsperiode kan ikke være i dette datointerval."
-apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installation rekord for en Serial No.
+apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installationspost for et serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian Renter
 apps/erpnext/erpnext/config/hr.py +177,Training,Uddannelse
 DocType: Timesheet,Employee Detail,Medarbejder Detail
@@ -3451,26 +3460,26 @@
 DocType: Offer Letter,Awaiting Response,Afventer svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Frem
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ugyldig attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Angiv hvis ikke-standard betalingskonto
 DocType: Salary Slip,Earning & Deduction,Tillæg & fradrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valgfri. Denne indstilling vil blive brugt til at filtrere i forskellige transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Værdiansættelses Rate er ikke tilladt
 DocType: Holiday List,Weekly Off,Ugedag fri
 DocType: Fiscal Year,"For e.g. 2012, 2012-13","Til fx 2012, 2012-13"
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),Foreløbig Profit / Loss (Credit)
-DocType: Sales Invoice,Return Against Sales Invoice,Retur Against Sales Invoice
-apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Punkt 5
+DocType: Sales Invoice,Return Against Sales Invoice,Retur mod salgsfaktura
+apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,Vare 5
 DocType: Serial No,Creation Time,Creation Time
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Total Revenue
-DocType: Sales Invoice,Product Bundle Help,Produkt Bundle Hjælp
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Omsætning i alt
+DocType: Sales Invoice,Product Bundle Help,Produktpakkehjælp
 ,Monthly Attendance Sheet,Månedlig Deltagelse Sheet
 DocType: Production Order Item,Production Order Item,Produktionsordre Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post fundet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Udgifter kasseret anlægsaktiv
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Delvist bestilt
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Omkostningssted er obligatorisk for vare {2}
 DocType: Vehicle,Policy No,Politik Ingen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Få elementer fra Product Bundle
-DocType: Asset,Straight Line,Lige linje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Hent varer fra produktpakke
+DocType: Asset,Straight Line,Lineær afskrivning
 DocType: Project User,Project User,Sagsbruger
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
 DocType: GL Entry,Is Advance,Er Advance
@@ -3482,92 +3491,92 @@
 DocType: Production Order,Scrap Warehouse,Skrotlager
 DocType: Production Order,Check if material transfer entry is not required,"Kontroller, om materialetilførsel ikke er påkrævet"
 DocType: Program Enrollment Tool,Get Students From,Få studerende fra
-DocType: Hub Settings,Seller Country,Sælger Land
+DocType: Hub Settings,Seller Country,Sælgers land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicer Punkter på hjemmesiden
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppe dine elever i batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Opdel dine elever i grupper
 DocType: Authorization Rule,Authorization Rule,Autorisation Rule
 DocType: Sales Invoice,Terms and Conditions Details,Betingelser Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikationer
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Salg Skatter og Afgifter Skabelon
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),I alt (kredit)
 DocType: Repayment Schedule,Payment Date,Betalingsdato
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nyt partiantal
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Ny partimængde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Beklædning og tilbehør
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Antal Order
 DocType: Item Group,HTML / Banner that will show on the top of product list.,"HTML / Banner, der vil vise på toppen af produktliste."
-DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelse beløb
+DocType: Shipping Rule,Specify conditions to calculate shipping amount,Angiv betingelser for at beregne forsendelsesmængden
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rolle Tilladt til Indstil Frosne Konti og Rediger Frosne Entries
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"Kan ikke konvertere Cost Center til hovedbog, som det har barneknudepunkter"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,åbning Value
 DocType: Salary Detail,Formula,Formel
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serienummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Salgsprovisioner
 DocType: Offer Letter Term,Value / Description,/ Beskrivelse
 apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Row # {0}: Asset {1} kan ikke indsendes, er det allerede {2}"
-DocType: Tax Rule,Billing Country,Fakturering Land
+DocType: Tax Rule,Billing Country,Faktureringsland
 DocType: Purchase Order Item,Expected Delivery Date,Forventet leveringsdato
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,Debet og kredit ikke ens for {0} # {1}. Forskellen er {2}.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,Repræsentationsudgifter
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Make Materiale Request
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,Opret materialeanmodning
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},Åbent Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salgsfaktura {0} skal annulleres, før den annullerer denne Sales Order"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Sales Invoice {0} must be cancelled before cancelling this Sales Order,"Salgsfaktura {0} skal annulleres, før denne salgsordre annulleres"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +60,Age,Alder
-DocType: Sales Invoice Timesheet,Billing Amount,Fakturering Beløb
+DocType: Sales Invoice Timesheet,Billing Amount,Faktureret 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 +60,Applications for leave.,Søg om tilladelse til fravær.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Konto med eksisterende transaktion kan ikke slettes
 DocType: Vehicle,Last Carbon Check,Sidste synsdato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Advokatudgifter
-DocType: Purchase Invoice,Posting Time,Bogføringstid
+DocType: Purchase Invoice,Posting Time,Bogføringsdato og -tid
 DocType: Timesheet,% Amount Billed,% Faktureret beløb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Telefonudgifter
 DocType: Sales Partner,Logo,Logo
 DocType: Naming Series,Check this if you want to force the user to select a series before saving. There will be no default if you check this.,"Markér dette hvis du ønsker at tvinge brugeren til at vælge en serie før du gemmer. Der vil ikke være standard, hvis du markerer dette."
-apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},Ingen Vare med Serial Nej {0}
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},Ingen vare med serienummer {0}
 DocType: Email Digest,Open Notifications,Åbne Meddelelser
 DocType: Payment Entry,Difference Amount (Company Currency),Forskel Beløb (Company Currency)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Direkte udgifter
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} er en ugyldig e-mailadresse i &#39;Notification \ e-mail adresse&#39;
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Ny kunde Omsætning
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Omsætning nye kunder
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Rejseudgifter
 DocType: Maintenance Visit,Breakdown,Sammenbrud
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,Konto: {0} med valuta: kan ikke vælges {1}
 DocType: Bank Reconciliation Detail,Cheque Date,Checkdato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Forældre-konto {1} tilhører ikke virksomheden: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Ansøgere
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Succesfuld slettet alle transaktioner i forbindelse med dette selskab!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Tilmelding Dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Kriminalforsorgen
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Lønarter
-DocType: Program Enrollment Tool,New Academic Year,Nye akademiske år
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+DocType: Program Enrollment Tool,New Academic Year,Nyt skoleår
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retur / kreditnota
 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 +28,Total Paid Amount,Samlet indbetalt beløb
 DocType: Production Order Item,Transferred Qty,Overført antal
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigering
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planlægning
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Udstedt
-DocType: Project,Total Billing Amount (via Time Logs),Total Billing Beløb (via Time Logs)
-apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi sælger denne Vare
+DocType: Project,Total Billing Amount (via Time Logs),Faktureringsbeløb i alt (via Time Logs)
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vi sælger denne vare
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Leverandør id
 DocType: Payment Request,Payment Gateway Details,Betaling Gateway Detaljer
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Mængde bør være større end 0
 DocType: Journal Entry,Cash Entry,indtastning af kontanter
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child noder kan kun oprettes under &#39;koncernens typen noder
 DocType: Leave Application,Half Day Date,Halv dag dato
-DocType: Academic Year,Academic Year Name,Studer i Name
+DocType: Academic Year,Academic Year Name,Skoleårsnavn
 DocType: Sales Partner,Contact Desc,Kontaktbeskrivelse
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blade som afslappet, syge etc."
 DocType: Email Digest,Send regular summary reports via Email.,Send regelmæssige sammenfattende rapporter via e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Angiv standardkonto i udlægstype {0}
 DocType: Assessment Result,Student Name,Elevnavn
-DocType: Brand,Item Manager,Item manager
+DocType: Brand,Item Manager,Varechef
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Udbetalt løn
-DocType: Buying Settings,Default Supplier Type,Standard Leverandør Type
+DocType: Buying Settings,Default Supplier Type,Standard-leverandørtype
 DocType: Production Order,Total Operating Cost,Samlede driftsomkostninger
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +168,Note: Item {0} entered multiple times,Bemærk: Varer {0} indtastet flere gange
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,Alle kontakter.
@@ -3583,11 +3592,12 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Skatter og Afgifter Tilføjet
 ,Sales Funnel,Salgstragt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Forkortelsen er obligatorisk
-DocType: Project,Task Progress,Task Progress
+DocType: Project,Task Progress,Opgave-fremskridt
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kurv
 ,Qty to Transfer,Antal til Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Tilbud til emner eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle Tilladt at redigere frosne lager
-,Territory Target Variance Item Group-Wise,Territory Target Variance Item Group-Wise
+,Territory Target Variance Item Group-Wise,Områdemål Variance Item Group-Wise
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,Alle kundegrupper
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,Akkumuleret månedlig
 apps/erpnext/erpnext/controllers/accounts_controller.py +648,{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}.
@@ -3602,21 +3612,21 @@
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction","Hvis deaktivere, &#39;I Words&#39; område vil ikke være synlig i enhver transaktion"
 DocType: Serial No,Distinct unit of an Item,Særskilt enhed af et element
 DocType: Pricing Rule,Buying,Køb
-DocType: HR Settings,Employee Records to be created by,Medarbejder Records at være skabt af
+DocType: HR Settings,Employee Records to be created by,Medarbejdere skal oprettes af
 DocType: POS Profile,Apply Discount On,Påfør Rabat på
 ,Reqd By Date,Reqd Efter dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Kreditorer
 DocType: Assessment Plan,Assessment Name,Vurdering Navn
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Række # {0}: Løbenummer er obligatorisk
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Række # {0}: serienummer er obligatorisk
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Forkortelse
 ,Item-wise Price List Rate,Item-wise Prisliste Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Leverandørtilbud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Leverandørtilbud
 DocType: Quotation,In Words will be visible once you save the Quotation.,"I Ord vil være synlig, når du gemmer tilbuddet."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mængde ({0}) kan ikke være en brøkdel i række {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Saml Gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Stregkode {0} allerede brugt i vare {1}
 DocType: Lead,Add to calendar on this date,Føj til kalender på denne dato
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regler for at tilføje forsendelsesomkostninger.
 DocType: Item,Opening Stock,Åbning Stock
@@ -3633,8 +3643,8 @@
 Updated via 'Time Log'",i minutter Opdateret via &#39;Time Log&#39;
 DocType: Customer,From Lead,Fra Emne
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordrer frigives til produktion.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vælg regnskabsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vælg regnskabsår ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil kræves for at gøre POS indtastning
 DocType: Program Enrollment Tool,Enroll Students,Tilmeld Studerende
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard salg
@@ -3645,7 +3655,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mod salgsfaktura {1}
 DocType: Sales Invoice,SINV-,SF-
 DocType: Request for Quotation Item,Project Name,Sagsnavn
-DocType: Supplier,Mention if non-standard receivable account,"Nævne, hvis ikke-standard tilgodehavende konto"
+DocType: Customer,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: Production Order,Required Items,Nødvendige varer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Forskel
@@ -3659,24 +3669,24 @@
 DocType: BOM Replace Tool,The BOM which will be replaced,Den stykliste som vil blive erstattet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Elektronisk udstyr
 DocType: Account,Debit,Debet
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Blade skal afsættes i multipla af 0,5"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,"Fravær skal angives i multipla af 0,5"
 DocType: Production Order,Operation Cost,Operation Cost
-apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Upload fremmøde fra en .csv-fil
+apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,Indlæs fremmøde fra en .csv-fil
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Enestående Amt
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fastsatte mål Item Group-wise for denne Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frys Stocks Ældre end [dage]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Række {0}: Aktiv er obligatorisk for anlægsaktiv køb / salg
-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.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Priser Regler er fundet på grundlag af de ovennævnte betingelser, er Priority anvendt. Prioritet er et tal mellem 0 og 20, mens Standardværdien er nul (blank). Højere antal betyder, at det vil have forrang, hvis der er flere Priser Regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal År: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Til Valuta
-DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lad følgende brugere til at godkende Udfyld Ansøgninger om blok dage.
+DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillad følgende brugere til at godkende fraværsansøgninger på blokerede dage.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Udlægstyper.
 apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Salgsprisen for vare {0} er lavere end dens {1}. Salgsprisen skal være mindst {2}
 DocType: Item,Taxes,Moms
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Betalt og ikke leveret
 DocType: Project,Default Cost Center,Standard omkostningssted
 DocType: Bank Guarantee,End Date,Slutdato
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Stock Transaktioner
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Lagertransaktioner
 DocType: Budget,Budget Accounts,Budget Regnskab
 DocType: Employee,Internal Work History,Intern Arbejde Historie
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Akkumuleret Afskrivninger Beløb
@@ -3691,7 +3701,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Vare {0} ignoreres, da det ikke er en lagervare"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Indsend denne produktionsordre til videre forarbejdning.
-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.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil anvende Prisfastsættelse Regel i en bestemt transaktion, bør alle gældende Priser Regler deaktiveres."
 DocType: Assessment Group,Parent Assessment Group,Parent Group Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Stillinger
 ,Sales Order Trends,Salgsordre Trends
@@ -3702,45 +3712,46 @@
 DocType: Stock Entry Detail,Additional Cost,Yderligere omkostning
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Regnskabsår Slutdato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Kan ikke filtrere baseret på bilagsnr. hvis der sorteres efter Bilagstype
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Opret Leverandørtilbud
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Opret Leverandørtilbud
 DocType: Quality Inspection,Incoming,Indgående
 DocType: BOM,Materials Required (Exploded),Nødvendige materialer (Sprængskitse)
-apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Tilføj brugere til din organisation, andre end dig selv"
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Tilføj andre brugere til din organisation end dig selv
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,Bogføringsdato kan ikke være en fremtidig dato
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: Løbenummer {1} matcher ikke med {2} {3}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Række # {0}: serienummer {1} matcher ikke med {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Casual Leave
-DocType: Batch,Batch ID,Batch-id
+DocType: Batch,Batch ID,Parti-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Bemærk: {0}
 ,Delivery Note Trends,Følgeseddel Tendenser
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Denne uges oversigt
 ,In Stock Qty,På lager Antal
-apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Stock Transaktioner
-DocType: Program Enrollment,Get Courses,Få Kurser
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,Konto: {0} kan kun opdateres via Lagertransaktioner
+DocType: Program Enrollment,Get Courses,Hent kurser
 DocType: GL Entry,Party,Selskab
 DocType: Sales Order,Delivery Date,Leveringsdato
-DocType: Opportunity,Opportunity Date,Salgsmulighedsato
-DocType: Purchase Receipt,Return Against Purchase Receipt,Retur Against kvittering
+DocType: Opportunity,Opportunity Date,Salgsmulighedsdato
+DocType: Purchase Receipt,Return Against Purchase Receipt,Retur mod købskvittering
 DocType: Request for Quotation Item,Request for Quotation Item,Anmodning om tilbud Varer
 DocType: Purchase Order,To Bill,Til Bill
 DocType: Material Request,% Ordered,% Bestilt
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Indtast e-mail-adresse adskilt af kommaer, vil faktura blive sendt automatisk på bestemt dato"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Akkordarbejde
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Gns. Køb Rate
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Gns. købssats
 DocType: Task,Actual Time (in Hours),Faktisk tid (i timer)
 DocType: Employee,History In Company,Historie I Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhedsbreve
-DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger indtastning
+DocType: Stock Ledger Entry,Stock Ledger Entry,Lagerpost
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Samme vare er blevet indtastet flere gange
-DocType: Department,Leave Block List,Lad Block List
+DocType: Department,Leave Block List,Blokér fraværsansøgninger
 DocType: Sales Invoice,Tax ID,CVR-nr.
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke setup for Serial nr. Kolonne skal være tomt
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,Vare {0} er ikke opsat til serienumre. Kolonnen skal være tom
 DocType: Accounts Settings,Accounts Settings,Kontoindstillinger
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Godkende
 DocType: Customer,Sales Partner and Commission,Salgs Partner og Kommission
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / år
-,Project Quantity,Projekt Mængde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;"
-DocType: Opportunity,To Discuss,Til Diskuter
+,Project Quantity,Sagsmængde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","I alt {0} for alle punkter er nul, kan være du skal ændre &quot;Fordel afgifter baseret på &#39;"
+DocType: Opportunity,To Discuss,Samtaleemne
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheder af {1} behov i {2} at fuldføre denne transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
 DocType: SMS Settings,SMS Settings,SMS-indstillinger
@@ -3754,23 +3765,23 @@
 DocType: Purchase Invoice,Return,Retur
 DocType: Production Order Operation,Production Order Operation,Produktionsordre Operation
 DocType: Pricing Rule,Disable,Deaktiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Mode betaling er forpligtet til at foretage en betaling
-DocType: Project Task,Pending Review,Afventer anmeldelse
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Betalingsmåde er forpligtet til at foretage en betaling
+DocType: Project Task,Pending Review,Afventende anmeldelse
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Anlægsaktiv {0} kan ikke kasseres, da det allerede er {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Udlæg ialt (via Udlæg)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Kunde-id
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Række {0}: Valuta af BOM # {1} skal være lig med den valgte valuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vekselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Salgsordre {0} er ikke indsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Salgsordre {0} er ikke godkendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Gebyr Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flådestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Tilføj varer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Tilføj varer fra
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Forældre-konto {1} ikke Bolong til virksomheden {2}
 DocType: Cheque Print Template,Regular,Fast
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Samlet vægtning af alle vurderingskriterier skal være 100%
-DocType: BOM,Last Purchase Rate,Sidste Purchase Rate
+DocType: BOM,Last Purchase Rate,Sidste købsværdi
 DocType: Account,Asset,Anlægsaktiv
 DocType: Project Task,Task ID,Opgave-id
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,Stock cannot exist for Item {0} since has variants,Stock kan ikke eksistere for Item {0} da har varianter
@@ -3779,39 +3790,39 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} eksisterer ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Tilmeld dig ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlige Distribution Procenter
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Det valgte emne kan ikke have Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte vare kan ikke have parti
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Værdiansættelse fald ikke fundet for Item {0}, som er forpligtet til at gøre regnskabsmæssige poster for {1} {2}. Hvis varen er transaktionsomkostninger som en prøve post i nævne {1}, bedes der i {1} Item bord. Ellers skal du oprette en indgående bestand transaktion for elementet eller omtale værdiansættelse sats i Item rekord, og derefter prøve submiting / annullering denne post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% af materialer leveret mod denne følgeseddel
 DocType: Project,Customer Details,Kunde Detaljer
 DocType: Employee,Reports to,Rapporter til
-,Unpaid Expense Claim,Ubetalt omkostning
+,Unpaid Expense Claim,Ubetalt udlæg
 DocType: SMS Settings,Enter url parameter for receiver nos,Indtast url parameter for receiver nos
 DocType: Payment Entry,Paid Amount,Betalt beløb
 DocType: Assessment Plan,Supervisor,Tilsynsførende
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Tilgængelig Stock til Emballerings- Varer
-DocType: Item Variant,Item Variant,Item Variant
+DocType: Item Variant,Item Variant,Varevariant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Stykliste skrotvare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Indsendte ordrer kan ikke slettes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Godkendte ordrer kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Quality Management
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Vare {0} er blevet deaktiveret
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvalitetssikring
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Vare {0} er blevet deaktiveret
 DocType: Employee Loan,Repay Fixed Amount per Period,Tilbagebetale fast beløb pr Periode
-apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Indtast mængde for Item {0}
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Indtast mængde for vare {0}
 DocType: Employee External Work History,Employee External Work History,Medarbejder Ekstern Work History
 DocType: Tax Rule,Purchase,Indkøb
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Balance Qty,Balance Antal
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,Mål kan ikke være tom
-DocType: Item Group,Parent Item Group,Moder-varegruppe
+DocType: Item Group,Parent Item Group,Overordnet varegruppe
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} for {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Omkostningssteder
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,"Hastighed, hvormed leverandørens valuta omregnes til virksomhedens basisvaluta"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: tider konflikter med rækken {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Tillad nulværdi
 DocType: Training Event Employee,Invited,inviteret
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive Løn Strukturer fundet for medarbejderen {0} for de givne datoer
-DocType: Opportunity,Next Contact,Næste Kontakt
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Flere aktive lønstrukturer fundet for medarbejder {0} for de givne datoer
+DocType: Opportunity,Next Contact,Næste kontakt
 apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,Opsætning Gateway konti.
 DocType: Employee,Employment Type,Beskæftigelsestype
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,Anlægsaktiver
@@ -3822,12 +3833,12 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dage)
 DocType: Tax Rule,Sales Tax Template,Salg Afgift Skabelon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Vælg elementer for at gemme fakturaen
-DocType: Employee,Encashment Date,Indløsning Dato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Vælg elementer for at gemme fakturaen
+DocType: Employee,Encashment Date,Indløsningsdato
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Justering
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Standard Aktivitets Omkostninger findes for Aktivitets Type - {0}
-DocType: Production Order,Planned Operating Cost,Planlagt driftsomkostninger
+DocType: Production Order,Planned Operating Cost,Planlagte driftsomkostninger
 DocType: Academic Term,Term Start Date,Term startdato
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
 apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},Vedlagt {0} # {1}
@@ -3840,38 +3851,39 @@
 
 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","Samlede gruppe af ** Varer ** i anden ** varer **. Dette er nyttigt, hvis du bundling en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** varer **. Pakken ** Item ** vil have ""Er lagervarer"" som ""Nej"" og ""Er Sales Item"" som ""Ja"". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item. Bemærk: BOM = Bill of Materials"
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Løbenummer er obligatorisk for Item {0}
+Note: BOM = Bill of Materials","Samlede gruppe af ** Varer ** i anden ** varer **. Dette er nyttigt, hvis du sammenfører en bestemt ** Varer ** i en pakke, og du kan bevare status over de pakkede ** Varer ** og ikke den samlede ** varer **. Pakken ** Item ** vil have ""Er lagervarer"" som ""Nej"" og ""Er Sales Item"" som ""Ja"". For eksempel: Hvis du sælger Laptops og Rygsække separat og har en særlig pris, hvis kunden køber både, så Laptop + Rygsæk vil være en ny Product Bundle Item."
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Serienummer er obligatorisk for vare {0}
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Angiv fra / til spænder
 DocType: Serial No,Under AMC,Under AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Item værdiansættelse sats genberegnes overvejer landede omkostninger kupon beløb
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardindstillinger for salgstransaktioner.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Grænseværdi
 DocType: BOM Replace Tool,Current BOM,Aktuel stykliste
-apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj Løbenummer
+apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,Tilføj serienummer
 apps/erpnext/erpnext/config/support.py +22,Warranty,Garanti
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Udstedt
 DocType: Production Order,Warehouses,Lagre
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv kan ikke overføres
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denne vare er en variant af {0} (skabelon).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Indkøb
 DocType: Announcement,Announcement,Bekendtgørelse
 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 +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kan ikke slettes, da der eksisterer lager posteringer for dette lager."
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,"Lager kan ikke slettes, da der eksisterer lagerposter for dette lager."
 DocType: Company,Distribution,Distribution
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,Beløb betalt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,Projektleder
 ,Quoted Item Comparison,Sammenligning Citeret Vare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Dispatch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max rabat tilladt for vare: {0} er {1}%
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Maksimal rabat tilladt for vare: {0} er {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Indre værdi som på
 DocType: Account,Receivable,Tilgodehavende
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Række # {0}: Ikke tilladt at skifte leverandør, da indkøbsordre allerede findes"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, som får lov til at indsende transaktioner, der overstiger kredit grænser."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vælg varer til Produktion
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Vælg varer til Produktion
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master data synkronisering, kan det tage nogen tid"
 DocType: Item,Material Issue,Materiale Issue
 DocType: Hub Settings,Seller Description,Sælger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifikation
@@ -3883,7 +3895,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Lønart
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åbning Akkumuleret Afskrivning skal være mindre end lig med {0}
 DocType: Warehouse,Warehouse Name,Lagernavn
 DocType: Naming Series,Select Transaction,Vælg Transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Indtast Godkendelse Rolle eller godkender Bruger
@@ -3895,29 +3907,29 @@
 DocType: POS Profile,Terms and Conditions,Betingelser
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke annullere fordi indsendt Stock indtastning {0} eksisterer
+DocType: Leave Block List,Applies to Company,Gælder for hele firmaet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Kan ikke annullere, for en godkendt lagerindtastning {0} eksisterer"
 DocType: Employee Loan,Disbursement Date,Udbetaling Dato
 DocType: Vehicle,Vehicle,Køretøj
 DocType: Purchase Invoice,In Words,I Words
 DocType: POS Profile,Item Groups,Varegrupper
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,I dag er {0} &#39;s fødselsdag!
-DocType: Production Planning Tool,Material Request For Warehouse,Materiale Request For Warehouse
+DocType: Production Planning Tool,Material Request For Warehouse,Materialeanmodning for lager
 DocType: Sales Order Item,For Production,For Produktion
 DocType: Payment Request,payment_url,payment_url
-DocType: Project Task,View Task,View Opgave
+DocType: Project Task,View Task,Vis opgave
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Din regnskabsår begynder på
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Afskrivninger og Vægte
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Mængden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få forskud
 DocType: Email Digest,Add/Remove Recipients,Tilføj / fjern modtagere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaktion ikke tilladt mod stoppet produktionsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For at indstille dette regnskabsår som standard, skal du klikke på &#39;Vælg som standard&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Tilslutte
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Vare variant {0} eksisterer med samme attributter
 DocType: Employee Loan,Repay from Salary,Tilbagebetale fra Løn
 DocType: Leave Application,LAP/,SKØD/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Anmodning betaling mod {0} {1} for beløb {2}
@@ -3935,40 +3947,41 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vurdering Resultat Detail
 DocType: Employee Education,Employee Education,Medarbejder Uddannelse
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Samme varegruppe findes to gange i varegruppetabellen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Det er nødvendigt at hente Elementdetaljer.
 DocType: Salary Slip,Net Pay,Nettoløn
 DocType: Account,Account,Konto
-apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Løbenummer {0} er allerede blevet modtaget
+apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} er allerede blevet modtaget
 ,Requested Items To Be Transferred,"Anmodet Varer, der skal overføres"
 DocType: Expense Claim,Vehicle Log,Kørebog
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} er ikke knyttet til nogen konto, skal du oprette / linke den tilsvarende (Asset) konto for lageret."
 DocType: Purchase Invoice,Recurring Id,Tilbagevendende Id
 DocType: Customer,Sales Team Details,Salgs Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Slet permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Slet permanent?
 DocType: Expense Claim,Total Claimed Amount,Total krævede beløb
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentielle muligheder for at sælge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Sygefravær
-DocType: Email Digest,Email Digest,Email Digest
-DocType: Delivery Note,Billing Address Name,Fakturering Adresse Navn
+DocType: Email Digest,Email Digest,E-mail nyhedsbrev
+DocType: Delivery Note,Billing Address Name,Faktureringsadressenavn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Varehuse
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Opsætning din skole i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base ændring beløb (Company Currency)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ingen bogføring for følgende lagre
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Gem dokumentet først.
 DocType: Account,Chargeable,Gebyr
 DocType: Company,Change Abbreviation,Skift Forkortelse
-DocType: Expense Claim Detail,Expense Date,Expense Dato
-DocType: Item,Max Discount (%),Max Rabat (%)
+DocType: Expense Claim Detail,Expense Date,Udlægsdato
+DocType: Item,Max Discount (%),Maksimal rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Sidste ordrebeløb
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail til
 DocType: Budget,Warn,Advar
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alle andre bemærkninger, bemærkelsesværdigt indsats, skal gå i registrene."
 DocType: BOM,Manufacturing User,Produktionsbruger
 DocType: Purchase Invoice,Raw Materials Supplied,Raw Materials Leveres
 DocType: Purchase Invoice,Recurring Print Format,Tilbagevendende Print Format
-DocType: C-Form,Series,Series
+DocType: C-Form,Series,Nummerserie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,"Forventet leveringsdato kan ikke være, før indkøbsordre Dato"
 DocType: Appraisal,Appraisal Template,Vurdering skabelon
 DocType: Item Group,Item Classification,Item Klassifikation
@@ -3982,7 +3995,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribut Værdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalet genbestillings Level
 DocType: Salary Detail,Salary Detail,Løn Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Vælg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Vælg {0} først
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} af varer {1} er udløbet.
 DocType: Sales Invoice,Commission,Kommissionen
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tidsregistrering til Produktion.
@@ -3990,45 +4003,44 @@
 DocType: Salary Detail,Default Amount,Standard Mængde
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Lager ikke fundet i systemet
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Denne måneds Summary
-DocType: Quality Inspection Reading,Quality Inspection Reading,Quality Inspection Reading
+DocType: Quality Inspection Reading,Quality Inspection Reading,Kvalitetskontrol-aflæsning
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager ældre end` skal være mindre end %d dage.
 DocType: Tax Rule,Purchase Tax Template,Køb Skat Skabelon
-,Project wise Stock Tracking,Projekt klogt Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedligeholdelsesplan {0} eksisterer imod {0}
+,Project wise Stock Tracking,Opfølgning på lager sorteret efter sager
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske Antal (ved kilden / mål)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbejder Records.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Venligst sæt Næste Afskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Indtast Næste afskrivningsdato
 DocType: HR Settings,Payroll Settings,Lønindstillinger
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match ikke-forbundne fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Angiv bestilling
 DocType: Email Digest,New Purchase Orders,Nye indkøbsordrer
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kan ikke have en forælder cost center
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Vælg mærke ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Vælg varemærke ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerede afskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-anvendelig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Driftstid skal være større end 0 til drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Lager er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og kontaktpersoner
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertering Detail
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hold det web venlige 900px (w) ved 100px (h)
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hold det webvenligt med en bredde på 900 pixels og en højde på 100 pixels
 DocType: Program,Program Abbreviation,Program Forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i kvittering mod hvert punkt
-DocType: Warranty Claim,Resolved By,Løst Af
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produktionsordre kan ikke rejses mod en Vare skabelon
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Afgifter er opdateret i købskvitteringen for hver enkelt vare
+DocType: Warranty Claim,Resolved By,Løst af
 DocType: Bank Guarantee,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Afsætte blade i en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checks og Indskud forkert ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Opret tilbud til kunder
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Opret tilbud til kunder
 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 +38,Bill of Materials (BOM),Styklister
 DocType: Item,Average time taken by the supplier to deliver,Gennemsnitlig tid taget af leverandøren til at levere
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Vurdering Resultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timer
 DocType: Project,Expected Start Date,Forventet startdato
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Fjern element, hvis afgifter ikke finder anvendelse på denne post"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaktion valuta skal være samme som Payment Gateway valuta
 DocType: Payment Entry,Receive,Modtag
@@ -4038,21 +4050,21 @@
 DocType: Employee,Educational Qualification,Uddannelseskvalifikation
 DocType: Workstation,Operating Costs,Driftsomkostninger
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action hvis Akkumulerede Månedligt budget overskredet
-DocType: Purchase Invoice,Submit on creation,Indsend om skabelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta for {0} skal være {1}
+DocType: Purchase Invoice,Submit on creation,Godkend ved oprettelse
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta for {0} skal være {1}
 DocType: Asset,Disposal Date,Salgsdato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mails vil blive sendt til alle aktive medarbejdere i selskabet ved den givne time, hvis de ikke har ferie. Sammenfatning af svarene vil blive sendt ved midnat."
 DocType: Employee Leave Approver,Employee Leave Approver,Medarbejder Leave Godkender
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Række {0}: En Genbestil indgang findes allerede for dette lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklæres tabt, fordi tilbud er afgivet."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Træning Feedback
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsordre {0} skal indsendes
-apps/erpnext/erpnext/maintenance/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/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsordre {0} skal godkendes
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vælg Start og slutdato for Item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursus er obligatorisk i række {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tilføj / rediger priser
-DocType: Batch,Parent Batch,Moderselskab
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tilføj / rediger priser
+DocType: Batch,Parent Batch,Overordnet parti
 DocType: Cheque Print Template,Cheque Print Template,Check Print skabelon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Diagram af omkostningssteder
 ,Requested Items To Be Ordered,Anmodet Varer skal bestilles
@@ -4062,11 +4074,11 @@
 DocType: Employee Loan,Totals,Totaler
 DocType: BOM,Manufacturing,Produktion
 ,Ordered Items To Be Delivered,"Bestilte varer, der skal leveres"
-DocType: Account,Income,Indkomst
-DocType: Industry Type,Industry Type,Industri Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Noget gik galt!
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Salgsfaktura {0} er allerede blevet indsendt
+DocType: Account,Income,Indtægter
+DocType: Industry Type,Industry Type,Branchekode
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Noget gik galt!
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Advarsel: Fraværsansøgningen indeholder følgende blokerede dage
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Salgsfaktura {0} er allerede blevet godkendt
 DocType: Assessment Result Detail,Score,score
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Regnskabsår {0} findes ikke
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Completion Date,Afslutning Dato
@@ -4074,11 +4086,11 @@
 apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} enheder af {1} behov i {2} på {3} {4} til {5} for at gennemføre denne transaktion.
 DocType: Fee Structure,Student Category,Studerendekategori
 DocType: Announcement,Student,Studerende
-apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisation enhed (departement) herre.
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Organisationsenheds-master.
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,Indtast venligst gyldige mobiltelefonnumre
-apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst besked, før du sender"
-DocType: Email Digest,Pending Quotations,Afventer Citater
-apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Point-of-Sale profil
+apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,"Indtast venligst en meddelelse, før du sender"
+DocType: Email Digest,Pending Quotations,Afventende tilbud
+apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Kassesystemprofil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,Opdatér venligst SMS-indstillinger
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Usikrede lån
 DocType: Cost Center,Cost Center Name,Omkostningsstednavn
@@ -4088,24 +4100,24 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +69,Total Paid Amt,Total Betalt Amt
 DocType: SMS Center,Messages greater than 160 characters will be split into multiple messages,Beskeder større end 160 tegn vil blive opdelt i flere meddelelser
 DocType: Purchase Receipt Item,Received and Accepted,Modtaget og accepteret
-,Serial No Service Contract Expiry,Løbenummer Service Kontrakt udløb
+,Serial No Service Contract Expiry,Serienummer Servicekontrakt-udløb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,You cannot credit and debit same account at the same time,Du kan ikke kreditere og debitere samme konto på samme tid
 DocType: Naming Series,Help HTML,Hjælp HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Værktøj til dannelse af elevgrupper
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Samlet weightage tildelt skulle være 100%. Det er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan ikke indstilles som Lost som Sales Order er foretaget.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Modtaget fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke fratrække når kategori er for &quot;Værdiansættelse&quot; eller &quot;Vaulation og Total &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Modtaget fra
 DocType: Lead,Converted,Konverteret
-DocType: Item,Has Serial No,Har Løbenummer
+DocType: Item,Has Serial No,Har serienummer
 DocType: Employee,Date of Issue,Udstedt den
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Række # {0}: Indstil Leverandør for vare {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Række {0}: Timer værdi skal være større end nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4114,57 +4126,58 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta skal være lig med enten standard comapany valuta eller fest konto valuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Faktureringsvaluta skal være lig med enten firmaets standardvaluta eller partens kontovaluta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Udbetal fravær
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hvad gør det?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til lager
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Indlæggelser
 ,Average Commission Rate,Gennemsnitlig Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Har serienummer' kan ikke være 'Ja' for ikke-lagerførte vare
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Fremmøde kan ikke markeres for fremtidige datoer
-DocType: Pricing Rule,Pricing Rule Help,Prisfastsættelse Rule Hjælp
+DocType: Pricing Rule,Pricing Rule Help,Hjælp til prisfastsættelsesregel
 DocType: School House,House Name,Husnavn
 DocType: Purchase Taxes and Charges,Account Head,Konto hoved
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsæt resten af din organisation som dine brugere. Du kan også tilføje invitere kunder til din portal ved at tilføje dem fra Kontakter
-DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi Difference (Out - In)
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsæt resten af din organisation som dine brugere. Du kan også tilføje invitere kunder til din portal ved at tilføje dem fra Kontakter
+DocType: Stock Entry,Total Value Difference (Out - In),Samlet værdi (difference udgående - indgående)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
 DocType: Vehicle,Vehicle Value,Køretøjsværdi
-DocType: Stock Entry,Default Source Warehouse,Standardkilde Warehouse
+DocType: Stock Entry,Default Source Warehouse,Standardkildelager
 DocType: Item,Customer Code,Kundekode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dage siden sidste ordre
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
-DocType: Buying Settings,Naming Series,Navngivnings Serienummer
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit-Til konto skal være en balance konto
+DocType: Buying Settings,Naming Series,Navngivningsnummerserie
 DocType: Leave Block List,Leave Block List Name,Blokering af fraværsansøgninger
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdato skal være mindre end Forsikring Slutdato
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Stock Assets
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Lageraktiver
 DocType: Timesheet,Production Detail,Produktion Detail
 DocType: Target Detail,Target Qty,Target Antal
 DocType: Shopping Cart Settings,Checkout Settings,Kassen Indstillinger
 DocType: Attendance,Present,Tilstede
-apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Levering Note {0} må ikke indsendes
+apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,Følgeseddel {0} må ikke godkendes
 DocType: Notification Control,Sales Invoice Message,Salgfakturabesked
-apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukning konto {0} skal være af typen Ansvar / Equity
+apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Lukningskonto {0} skal være af typen Passiver / Egenkapital
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Medarbejder {0} lønseddel er allerede overført til tidsregistreringskladde {1}
 DocType: Vehicle Log,Odometer,kilometertæller
 DocType: Sales Order Item,Ordered Qty,Bestilt antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Konto {0} er deaktiveret
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Vare {0} er deaktiveret
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Op
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Stykliste indeholder ikke nogen lagervarer
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Sagsaktivitet / opgave.
 DocType: Vehicle Log,Refuelling Details,Brændstofpåfyldningsdetaljer
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generer lønsedler
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Indkøb skal kontrolleres, om nødvendigt er valgt som {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Rabat skal være mindre end 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Sidste købskurs ikke fundet
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Sidste købsværdi ikke fundet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløb (Company Valuta)
-DocType: Sales Invoice Timesheet,Billing Hours,Fakturering Timer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard stykliste for {0} blev ikke fundet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+DocType: Sales Invoice Timesheet,Billing Hours,Fakturerede timer
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard stykliste for {0} blev ikke fundet
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Række # {0}: Venligst sæt genbestille mængde
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryk på elementer for at tilføje dem her
 DocType: Fees,Program Enrollment,Program Tilmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Indstil {0}
@@ -4176,7 +4189,7 @@
 DocType: Payment Entry,Allocate Payment Amount,Tildel Betaling Beløb
 DocType: Employee External Work History,Salary,Løn
 DocType: Serial No,Delivery Document Type,Levering Dokumenttype
-DocType: Process Payroll,Submit all salary slips for the above selected criteria,Valider alle lønsedler for de ovenfor valgte kriterier
+DocType: Process Payroll,Submit all salary slips for the above selected criteria,Godkend alle lønsedler for de ovenfor valgte kriterier
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,synkroniseret {0} varer
 DocType: Sales Order,Partly Delivered,Delvist leveret
 DocType: Email Digest,Receivables,Tilgodehavender
@@ -4184,24 +4197,24 @@
 DocType: Customer,Additional information regarding the customer.,Yderligere oplysninger om kunden.
 DocType: Quality Inspection Reading,Reading 5,Reading 5
 DocType: Maintenance Visit,Maintenance Date,Vedligeholdelse Dato
-DocType: Purchase Invoice Item,Rejected Serial No,Afvist Løbenummer
+DocType: Purchase Invoice Item,Rejected Serial No,Afvist serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller slutdato overlapper med {0}. For at undgå du indstille selskab
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Start dato bør være mindre end slutdato for Item {0}
 DocType: Item,"Example: ABCD.#####
-If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Eksempel:. ABCD ##### Hvis serien er indstillet, og Løbenummer nævnes ikke i transaktioner, så automatisk serienummer vil blive oprettet på grundlag af denne serie. Hvis du altid ønsker at eksplicit nævne Serial Nos for dette element. lader dette være blankt."
-DocType: Upload Attendance,Upload Attendance,Upload Fremmøde
+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.","Eksempel:. ABCD ##### Hvis nummerserien er indstillet, og serienummeret ikke fremkommer i transaktionerne, så vil serienummeret automatisk blive oprettet på grundlag af denne nummerserie. Hvis du altid ønsker, eksplicit at angive serienumre for denne vare, skal du lade dette felt være blankt."
+DocType: Upload Attendance,Upload Attendance,Indlæs fremmøde
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +306,BOM and Manufacturing Quantity are required,Stykliste and produceret mængde skal angives
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,Ageing Range 2
 DocType: SG Creation Tool Course,Max Strength,Max Strength
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,Stykliste erstattet
-,Sales Analytics,Salg Analytics
+,Sales Analytics,Salgsanalyser
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Tilgængelige {0}
 ,Prospects Engaged But Not Converted,Udsigter Engageret men ikke konverteret
 DocType: Manufacturing Settings,Manufacturing Settings,Produktion Indstillinger
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Opsætning af E-mail
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Formynder 1 mobiltelefonnr.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,Indtast standardvaluta i Firma-masteren
-DocType: Stock Entry Detail,Stock Entry Detail,Stock indtastning Detail
+DocType: Stock Entry Detail,Stock Entry Detail,Lagerindtastningsdetaljer
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +110,Daily Reminders,Daglige påmindelser
 DocType: Products Settings,Home Page is Products,Home Page er Produkter
 ,Asset Depreciation Ledger,Asset Afskrivninger Ledger
@@ -4254,28 +4267,27 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +61,Part-time,Deltid
 DocType: Employee,Applicable Holiday List,Gældende helligdagskalender
 DocType: Employee,Cheque,Check
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,Series Opdateret
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,Nummerserien opdateret
 apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Kontotype er obligatorisk
-DocType: Item,Serial Number Series,Serial Number Series
+DocType: Item,Serial Number Series,Serienummer-nummerserie
 apps/erpnext/erpnext/buying/utils.py +68,Warehouse is mandatory for stock Item {0} in row {1},Lager er obligatorisk for lagervare {0} i række {1}
 apps/erpnext/erpnext/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
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskabsår Start Dato og Skatteårsafslutning Dato allerede sat i regnskabsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Dato opdateret
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Opdel parti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Succesfuld Afstemt
 DocType: Request for Quotation Supplier,Download PDF,Download PDF
-DocType: Production Order,Planned End Date,Planlagt Slutdato
-apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varer er gemt.
+DocType: Production Order,Planned End Date,Planlagt slutdato
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Hvor varer er på lager.
 DocType: Request for Quotation,Supplier Detail,Leverandør Detail
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Fejl i formel eller betingelse: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Faktureret beløb
 DocType: Attendance,Attendance,Fremmøde
 apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,Lagervarer
 DocType: BOM,Materials,Materialer
-DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, vil listen skal lægges til hver afdeling, hvor det skal anvendes."
+DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.","Hvis ikke afkrydset, skal hver afdeling vælges, hvor det skal anvendes."
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,Kilde og Target Warehouse kan ikke være samme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,Bogføringsdato og -tid er obligatorisk
 apps/erpnext/erpnext/config/buying.py +76,Tax template for buying transactions.,Skat skabelon til at købe transaktioner.
@@ -4299,39 +4311,39 @@
 DocType: Appraisal Goal,Score Earned,Score tjent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +191,Notice Period,Opsigelsesperiode
 DocType: Asset Category,Asset Category Name,Asset Kategori Navn
-apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er en rod territorium og kan ikke redigeres.
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Ny salgsmedarbejder navn
-DocType: Packing Slip,Gross Weight UOM,Gross Weight UOM
+apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Dette er et overordnet område og kan ikke redigeres.
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,Navn på ny salgsmedarbejder
+DocType: Packing Slip,Gross Weight UOM,Bruttovægtenhed
 DocType: Delivery Note Item,Against Sales Invoice,Mod salgsfaktura
 DocType: Bin,Reserved Qty for Production,Reserveret Antal for Produktion
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Forlad ukontrolleret, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Markér ikke, hvis du ikke vil overveje batch mens du laver kursusbaserede grupper."
 DocType: Asset,Frequency of Depreciation (Months),Hyppigheden af afskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kreditkonto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Vare
-apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nul værdier
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Vis nulvæ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
-apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Opsætning en simpel hjemmeside for min organisation
+apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Opsæt en simpel hjemmeside for mit firma
 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 +666,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Angiv Attribut Værdi for attribut {0}
 DocType: Item,Default Warehouse,Standard-lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan ikke tildeles mod Group konto {0}
-apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Indtast forælder omkostningssted
+apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Indtast overordnet omkostningssted
 DocType: Delivery Note,Print Without Amount,Print uden Beløb
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,Afskrivningsdato
 apps/erpnext/erpnext/controllers/buying_controller.py +79,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,"Skat Kategori kan ikke være ""Værdiansættelse"" eller ""Værdiansættelse og Total"" eftersom alle varene er ikke-lagervarer"
-DocType: Issue,Support Team,Support Team
+DocType: Issue,Support Team,Supportteam
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),Udløb (i dage)
 DocType: Appraisal,Total Score (Out of 5),Samlet score (ud af 5)
 DocType: Fee Structure,FS.,FS.
-DocType: Program Enrollment,Batch,Batch
+DocType: Program Enrollment,Batch,Parti
 apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,Balance
 DocType: Room,Seating Capacity,Seating Capacity
 DocType: Issue,ISS-,ISS-
 DocType: Project,Total Expense Claim (via Expense Claims),Udlæg ialt (via Udlæg)
 DocType: Assessment Result,Total Score,Samlet score
 DocType: Journal Entry,Debit Note,Debitnota
-DocType: Stock Entry,As per Stock UOM,Pr Stock UOM
+DocType: Stock Entry,As per Stock UOM,pr. lagerenhed
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Ikke udløbet
 DocType: Student Log,Achievement,Præstation
 DocType: Batch,Source Document Type,Kilde dokumenttype
@@ -4345,21 +4357,21 @@
 DocType: Guardian,Alternate Number,Alternativ Number
 DocType: Assessment Plan Criteria,Maximum Score,Maksimal score
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Oprette regler til at begrænse transaktioner baseret på værdier.
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Lad være tom hvis du laver elever grupper om året
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Lad feltet stå tomt, hvis du laver elevergrupper hvert år"
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Hvis markeret, Total nej. af Arbejdsdage vil omfatte helligdage, og dette vil reducere værdien af Løn Per Day"
 DocType: Purchase Invoice,Total Advance,Samlet Advance
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,Den Term Slutdato kan ikke være tidligere end den Term startdato. Ret de datoer og prøv igen.
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Citeringsantal
 ,BOM Stock Report,BOM Stock Rapport
 DocType: Stock Reconciliation Item,Quantity Difference,Mængdeforskel
-apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Behandling Payroll
+apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Lønadministration
 DocType: Opportunity Item,Basic Rate,Grundlæggende Rate
 DocType: GL Entry,Credit Amount,Kreditbeløb
 DocType: Cheque Print Template,Signatory Position,undertegnende holdning
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Sæt som Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Sæt som Lost
 DocType: Timesheet,Total Billable Hours,Total fakturerbare timer
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betalingskvittering
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er baseret på transaktioner mod denne kunde. Se tidslinje nedenfor for detaljer
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er baseret på transaktioner for denne kunde. Se tidslinje nedenfor for detaljer
 DocType: Supplier,Credit Days Based On,Kreditdage baseret på
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Række {0}: Allokeret beløb {1} skal være mindre end eller lig med Payment indtastning beløb {2}
 DocType: Tax Rule,Tax Rule,Momsregel
@@ -4367,14 +4379,14 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planlæg tid logs uden Workstation arbejdstid.
 apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,Kunder i kø
 DocType: Student,Nationality,Nationalitet
-,Items To Be Requested,Varer skal ansøges
+,Items To Be Requested,Varer til bestilling
 DocType: Purchase Order,Get Last Purchase Rate,Få Sidste Purchase Rate
 DocType: Company,Company Info,Firmainformation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vælg eller tilføj ny kunde
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Assets)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Vælg eller tilføj ny kunde
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Omkostningssted er forpligtet til at bestille et udlæg
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse af midler (Aktiver)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er baseret på deltagelse af denne Medarbejder
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Debetkonto
 DocType: Fiscal Year,Year Start Date,År Startdato
 DocType: Attendance,Employee Name,Medarbejdernavn
 DocType: Sales Invoice,Rounded Total (Company Currency),Afrundet i alt (firmavaluta)
@@ -4383,13 +4395,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop brugere fra at oprette fraværsansøgninger for de følgende dage.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Indkøbsbeløb
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverandørtilbud {0} oprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End År kan ikke være før Start År
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Slutår kan ikke være før startår
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Personalegoder
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakket mængde skal være lig mængde for vare {0} i række {1}
-DocType: Production Order,Manufactured Qty,Fremstillet Antal
-DocType: Purchase Receipt Item,Accepted Quantity,Accepteret Mængde
+DocType: Production Order,Manufactured Qty,Fremstillet mængde
+DocType: Purchase Receipt Item,Accepted Quantity,Mængde
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Angiv en standard helligdagskalender for medarbejder {0} eller firma {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} eksisterer ikke
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} eksisterer ikke
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Regninger sendt til kunder.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Sags-id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rækkenr. {0}: Beløb kan ikke være større end Udestående Beløb overfor Udlæg {1}. Udestående Beløb er {2}
@@ -4398,37 +4410,39 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bilagstype
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Prisliste ikke fundet eller deaktiveret
 DocType: Employee Loan Application,Approved,Godkendt
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Medarbejder lettet på {0} skal indstilles som &quot;Left&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vurdering {0} dannet for medarbejder {1} i det givne datointerval
 DocType: Employee,Education,Uddannelse
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Slet
 DocType: Selling Settings,Campaign Naming By,Kampagne Navngivning Af
 DocType: Employee,Current Address Is,Nuværende adresse er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificeret
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valgfri. Sætter virksomhedens standard valuta, hvis ikke angivet."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskab journaloptegnelser.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgængeligt antal fra vores lager
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,Vælg Medarbejder Record først.
-DocType: POS Profile,Account for Change Amount,Konto for ændring beløb
+DocType: POS Profile,Account for Change Amount,Konto for returbeløb
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Indtast venligst udgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: referencedokument Type skal være en af indkøbsordre, købsfaktura eller Kassekladde"
 DocType: Employee,Current Address,Nuværende adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis varen er en variant af et andet element derefter beskrivelse, billede, prissætning, skatter mv vil blive fastsat fra skabelonen medmindre det udtrykkeligt er angivet"
 DocType: Serial No,Purchase / Manufacture Details,Indkøbs- og produktionsdetaljer
 DocType: Assessment Group,Assessment Group,Gruppe Assessment
-apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Batch Inventory
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Partilager
 DocType: Employee,Contract End Date,Kontrakt Slutdato
-DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver Project
+DocType: Sales Order,Track this Sales Order against any Project,Spor denne salgsordre mod enhver sag
 DocType: Sales Invoice Item,Discount and Margin,Rabat og Margin
 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
-DocType: Pricing Rule,Min Qty,Min Antal
+DocType: Pricing Rule,Min Qty,Minimum mængde
 DocType: Asset Movement,Transaction Date,Transaktionsdato
-DocType: Production Plan Item,Planned Qty,Planned Antal
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,I alt Skat
+DocType: Production Plan Item,Planned Qty,Planlagt mængde
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,Moms i alt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,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),Netto i alt (firmavaluta)
@@ -4443,17 +4457,17 @@
 DocType: Hub Settings,Hub Settings,Hub Indstillinger
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskabsposteringer er allerede foretaget i valuta {0} for virksomheden {1}. Vælg tilgodehavendets eller gældens konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er eksisterende aktiv
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 ,Monthly Salary Register,Månedlig Løn Tilmeld
 DocType: Warranty Claim,If different than customer address,Hvis anderledes end kundeadresse
 DocType: BOM Operation,BOM Operation,BOM Operation
-DocType: School Settings,Validate the Student Group from Program Enrollment,Valider Studentgruppen fra Programindskrivning
+DocType: School Settings,Validate the Student Group from Program Enrollment,Godkend elevgruppen fra programindskrivning
 DocType: Purchase Taxes and Charges,On Previous Row Amount,På Forrige Row Beløb
 DocType: Student,Home Address,Hjemmeadresse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfer Asset
-DocType: POS Profile,POS Profile,POS profil
+DocType: POS Profile,POS Profile,Kassesystemprofil
 DocType: Training Event,Event Name,begivenhed Navn
 apps/erpnext/erpnext/config/schools.py +39,Admission,Adgang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Indlæggelser for {0}
@@ -4464,9 +4478,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Nettoløn kan ikke være negativ
 DocType: SMS Settings,Static Parameters,Statiske parametre
 DocType: Assessment Plan,Room,Værelse
-DocType: Purchase Order,Advance Paid,Advance Betalt
-DocType: Item,Item Tax,Item Skat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale til leverandøren
+DocType: Purchase Order,Advance Paid,Forudbetalt
+DocType: Item,Item Tax,Varemoms
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale til leverandøren
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Skattestyrelsen Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Grænsen {0}% forekommer mere end én gang
 DocType: Expense Claim,Employees Email Id,Medarbejdere Email Id
@@ -4476,11 +4490,11 @@
 DocType: Program,Program Name,Programnavn
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,Overvej Skat eller Gebyr for
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,Faktiske Antal er obligatorisk
-DocType: Employee Loan,Loan Type,låntype
+DocType: Employee Loan,Loan Type,Lånetype
 DocType: Scheduling Tool,Scheduling Tool,Planlægning Tool
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Kreditkort
 DocType: BOM,Item to be manufactured or repacked,"Element, der skal fremstilles eller forarbejdes"
-apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardindstillinger for lager transaktioner.
+apps/erpnext/erpnext/config/stock.py +179,Default settings for stock transactions.,Standardindstillinger for lagertransaktioner.
 DocType: Purchase Invoice,Next Date,Næste dato
 DocType: Employee Education,Major/Optional Subjects,Større / Valgfag
 DocType: Sales Invoice Item,Drop Ship,Drop Ship
@@ -4497,10 +4511,10 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Vedhæft Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagrene
 DocType: Customer,Commission Rate,Kommissionens Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Opret Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Opret Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokér fraværsansøgninger pr. afdeling.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type skal være en af Modtag, Pay og Intern Transfer"
-apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type skal være en af Modtag, Pay og Intern Transfer"
+apps/erpnext/erpnext/config/selling.py +179,Analytics,Analyser
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Indkøbskurv er tom
 DocType: Vehicle,Model,Model
 DocType: Production Order,Actual Operating Cost,Faktiske driftsomkostninger
@@ -4510,6 +4524,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillad produktion på helligdage
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Indkøbsordre Dato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedhæftede filer
 DocType: Packing Slip,Package Weight Details,Pakkevægtdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betaling afslutning omdirigere brugeren til valgte side.
@@ -4517,7 +4532,7 @@
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,Vælg en CSV-fil
 DocType: Student Leave Application,Mark as Present,Markér som tilstede
 DocType: Purchase Order,To Receive and Bill,Til at modtage og Bill
-apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Fremhævede Produkter
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,Fremhævede varer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,Designer
 apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,Vilkår og betingelser Skabelon
 DocType: Serial No,Delivery Details,Levering Detaljer
@@ -4528,32 +4543,31 @@
 DocType: Batch,Expiry Date,Udløbsdato
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontaktpersoner
 ,accounts-browser,konti-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vælg kategori først
-apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt mester.
-apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","For at tillade over-fakturering eller over-bestilling, opdatere &quot;Allowance&quot; i Stock-indstillinger eller Item."
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vælg kategori først
+apps/erpnext/erpnext/config/projects.py +13,Project master.,Sags-master.
+apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","For at tillade overfakturering eller overbestilling, skal du opdatere ""Allowance"" i lager- eller vareindstillingerne."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Vis ikke valutasymbol (fx. $) ved siden af valutaen.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv dag)
 DocType: Supplier,Credit Days,Kreditdage
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Masseopret studerende
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Masseopret elever
 DocType: Leave Type,Is Carry Forward,Er Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Hent varer fra stykliste
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Hent varer fra stykliste
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time dage
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Række # {0}: Bogføringsdato skal være den samme som købsdatoen {1} af aktivet {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Indtast salgsordrer i ovenstående tabel
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,Ikke Indsendt lønsedler
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,Ikke-godkendte lønsedler
 ,Stock Summary,Stock Summary
 apps/erpnext/erpnext/config/accounts.py +241,Transfer an asset from one warehouse to another,Overfør et aktiv fra et lager til et andet
 DocType: Vehicle,Petrol,Benzin
-apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Bill of Materials
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,Styklister
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,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}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,Ref Dato
 DocType: Employee,Reason for Leaving,Årsag til Leaving
 DocType: BOM Operation,Operating Cost(Company Currency),Driftsomkostninger (Company Valuta)
-DocType: Employee Loan Application,Rate of Interest,Rente
+DocType: Employee Loan Application,Rate of Interest,Rentesats
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Venligst opsæt nummereringsserier for Tilstedeværelse via Opsætning&gt; Nummereringsserie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 d8b965e..76b2d75 100644
--- a/erpnext/translations/de.csv
+++ b/erpnext/translations/de.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Gemietet
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Anwenden für Benutzer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",Angehaltener Fertigungsauftrag kann nicht storniert werden. Bitte zuerst den Fertigungsauftrag fortsetzen um ihn dann zu stornieren
 DocType: Vehicle Service,Mileage,Kilometerstand
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Wollen Sie wirklich diese Anlageklasse zu Schrott?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Standard -Lieferant auswählen
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Standard -Lieferant auswählen
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Währung für Preisliste {0} erforderlich
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Wird in der Transaktion berechnet.
 DocType: Purchase Order,Customer Contact,Kundenkontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Ausstände für {0} können nicht kleiner als Null sein ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 Minuten
 DocType: Leave Type,Leave Type Name,Bezeichnung der Abwesenheit
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,zeigen open
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,zeigen open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Nummernkreise erfolgreich geändert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Auschecken
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Eingereicht
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Stapelobjekt Ablauf-Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankwechsel
 DocType: Mode of Payment Account,Mode of Payment Account,Art des Zahlungskontos
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Varianten anzeigen
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Varianten anzeigen
 DocType: Academic Term,Academic Term,Semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Stoff
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Menge
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Menge
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Kontenliste darf nicht leer sein.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Darlehen/Kredite (Verbindlichkeiten)
 DocType: Employee Education,Year of Passing,Abschlussjahr
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referenz:% s, Artikelnummer:% s und Kunde:% s"
 DocType: Item,Country of Origin,Herkunftsland
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Auf Lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Offene Punkte
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gesundheitswesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zahlungsverzug (Tage)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Dienstzeitaufwand
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Rechnung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Seriennummer: {0} wird bereits in der Verkaufsrechnung referenziert: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Rechnung
 DocType: Maintenance Schedule Item,Periodicity,Häufigkeit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} ist erforderlich
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,"Voraussichtlicher Liefertermin ist, bevor Kundenauftragsdatum"
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",".csv-Datei mit zwei Zeilen, eine für den alten und eine für den neuen Namen, anhängen"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nicht in einem aktiven Geschäftsjahr.
 DocType: Packed Item,Parent Detail docname,Übergeordnetes Detail Dokumentenname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenz: {0}, Item Code: {1} und Kunde: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Stellenausschreibung
 DocType: Item Attribute,Increment,Schrittweite
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Lager auswählen ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Lager auswählen ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Werbung
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Holen Sie Elemente aus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nicht zulässig für {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Holen Sie Elemente aus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Lager kann nicht mit Lieferschein {0} aktualisiert werden
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Keine Artikel aufgeführt
 DocType: Payment Reconciliation,Reconcile,Abgleichen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Lebensmittelgeschäft
 DocType: Quality Inspection Reading,Reading 1,Ablesewert 1
 DocType: Process Payroll,Make Bank Entry,Bankbuchung erstellen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionsfonds
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Weiter Abschreibungen Datum kann nicht vor dem Kauf Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Weiter Abschreibungen Datum kann nicht vor dem Kauf Datum
 DocType: SMS Center,All Sales Person,Alle Vertriebsmitarbeiter
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Monatliche Ausschüttung ** hilft Ihnen, das Budget / Ziel über Monate zu verteilen, wenn Sie Saisonalität in Ihrem Unternehmen haben."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nicht Artikel gefunden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nicht Artikel gefunden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Gehaltsstruktur Fehlende
 DocType: Lead,Person Name,Name der Person
 DocType: Sales Invoice Item,Sales Invoice Item,Ausgangsrechnungs-Artikel
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","z.B. ""Grundschule"" oder ""Universität"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Auf Berichte
 DocType: Warehouse,Warehouse Detail,Lagerdetail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditlimit für Kunde {0} {1}/{2} wurde überschritten
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Der Begriff Enddatum kann nicht später sein als das Jahr Enddatum des Akademischen Jahres an dem der Begriff verknüpft ist (Akademisches Jahr {}). Bitte korrigieren Sie die Daten und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ist Anlagevermögen"" kann nicht deaktiviert werden, da Anlagebuchung gegen den Artikel vorhanden"
 DocType: Vehicle Service,Brake Oil,Bremsöl
 DocType: Tax Rule,Tax Type,Steuerart
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren
 DocType: BOM,Item Image (if not slideshow),Artikelbild (wenn keine Diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Es existiert bereits ein Kunde mit dem gleichen Namen
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundensatz / 60) * tatsächliche Betriebszeit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Wählen Sie BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Wählen Sie BOM
 DocType: SMS Log,SMS Log,SMS-Protokoll
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Aufwendungen für gelieferte Artikel
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Der Urlaub am {0} ist nicht zwischen dem Von-Datum und dem Bis-Datum
@@ -159,14 +161,14 @@
 DocType: Journal Entry,Opening Entry,Eröffnungsbuchung
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,Konto Pay Nur
 DocType: Employee Loan,Repay Over Number of Periods,Repay über Anzahl der Perioden
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} ist nicht in der angegebenen {2}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0} - {1} ist nicht für den angegebenen {2} eingeschrieben
 DocType: Stock Entry,Additional Costs,Zusätzliche Kosten
 apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
 DocType: Lead,Product Enquiry,Produktanfrage
 DocType: Academic Term,Schools,Schulen
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Kein Urlaubssatz für Mitarbeiter gefunden {0} von {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Bitte zuerst die Firma angeben
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Bitte zuerst Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Bitte zuerst Firma auswählen
 DocType: Employee Education,Under Graduate,Schulabgänger
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Ziel auf
 DocType: BOM,Total Cost,Gesamtkosten
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Betrag einfordern
 DocType: Employee,Mr,Hr.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Doppelte Kundengruppe in der cutomer Gruppentabelle gefunden
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Lieferantentyp / Lieferant
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Lieferantentyp / Lieferant
 DocType: Naming Series,Prefix,Präfix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Verbrauchsgut
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Klasse
 DocType: Sales Invoice Item,Delivered By Supplier,Geliefert von Lieferant
 DocType: SMS Center,All Contact,Alle Kontakte
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Fertigungsauftrag bereits für alle Positionen mit BOM erstellt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Jahresgehalt
 DocType: Daily Work Summary,Daily Work Summary,tägliche Arbeitszusammenfassung
 DocType: Period Closing Voucher,Closing Fiscal Year,Abschluss des Geschäftsjahres
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ist gesperrt
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ist gesperrt
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Lagerkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wählen Sie Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Gegenbuchung
 DocType: Journal Entry Account,Credit in Company Currency,(Gut)Haben in Unternehmenswährung
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Wollen Sie die Teilnahme zu aktualisieren? <br> Present: {0} \ <br> Abwesend: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akzeptierte + abgelehnte Menge muss für diese Position {0} gleich der erhaltenen Menge sein
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Rohmaterial für Einkauf bereitstellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich.
 DocType: Products Settings,Show Products as a List,Produkte anzeigen als Liste
 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"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Machen Abschreibungen Eintrag
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Anfragetyp
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Mitarbeiter anlegen
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Mitarbeiter anlegen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rundfunk
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ausführung
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details der durchgeführten Arbeitsgänge
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan für Wartungsbesuche
 DocType: SMS Settings,Enter url parameter for message,URL-Parameter für Nachricht eingeben
 DocType: POS Profile,Customer Groups,Kundengruppen
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Jahresabschluss
 DocType: Guardian,Students,Studenten
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regeln für die Anwendung von Preisen und Rabatten
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Preisliste muss für Einkauf oder Vertrieb gültig sein
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Anzahlung kann nicht größer sein als {0} {1}
 DocType: Naming Series,Series List for this Transaction,Nummernkreise zu diesem Vorgang
 DocType: Company,Default Payroll Payable Account,Standardabrechnungskreditorenkonto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update-E-Mail-Gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update-E-Mail-Gruppe
 DocType: Sales Invoice,Is Opening Entry,Ist Eröffnungsbuchung
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
 DocType: Course Schedule,Instructor Name,Ausbilder-Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,"""Für Lager"" wird vor dem Übertragen benötigt"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Eingegangen am
 DocType: Sales Partner,Reseller,Wiederverkäufer
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Wenn diese Option aktiviert, wird nicht auf Lager gehalten im Materialanforderungen enthalten."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Zu Ausgangsrechnungs-Position
 ,Production Orders in Progress,Fertigungsaufträge in Arbeit
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettocashflow aus Finanzierung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage ist voll, nicht gespeichert"
 DocType: Lead,Address & Contact,Adresse & Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ungenutzten Urlaub von vorherigen Zuteilungen hinzufügen
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nächste Wiederholung {0} wird erstellt am {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Gesamtkostenbetrag (über Arbeitszeitblatt)
 DocType: Item Website Specification,Item Website Specification,Artikel-Webseitenspezifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlaub gesperrt
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank-Einträge
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank-Einträge
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Jährlich
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bestandsabgleich-Artikel
 DocType: Stock Entry,Sales Invoice No,Ausgangsrechnungs-Nr.
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Im Hub veröffentlichen
 DocType: Student Admission,Student Admission,Studenten Eintritt
 ,Terretory,Region
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikel {0} wird storniert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialanfrage
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikel {0} wird storniert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Artikel {0} in Tabelle ""Rohmaterialien geliefert"" des Lieferantenauftrags {1} nicht gefunden"
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Ausstehende Schecks und Anzahlungen zum verbuchen
 DocType: Item,Synced With Hub,Synchronisiert mit Hub
 DocType: Vehicle,Fleet Manager,Flottenmanager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Falsches Passwort
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kann für Artikel nicht negativ sein {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Falsches Passwort
 DocType: Item,Variant Of,Variante von
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Gefertigte Menge kann nicht größer sein als ""Menge für Herstellung"""
 DocType: Period Closing Voucher,Closing Account Head,Bezeichnung des Abschlusskontos
 DocType: Employee,External Work History,Externe Arbeits-Historie
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Zirkelschluss-Fehler
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Bei Erstellung einer automatischen Materialanfrage per E-Mail benachrichtigen
 DocType: Journal Entry,Multi Currency,Unterschiedliche Währungen
 DocType: Payment Reconciliation Invoice,Invoice Type,Rechnungstyp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Lieferschein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Lieferschein
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Steuern einrichten
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Herstellungskosten der verkauften Vermögens
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} in Artikelsteuer doppelt eingegeben
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zusammenfassung für diese Woche und anstehende Aktivitäten
 DocType: Student Applicant,Admitted,Zugelassen
 DocType: Workstation,Rent Cost,Mietkosten
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestellwert
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Geldgeschäfte gegen Partei oder für die interne Übertragung
 DocType: Shipping Rule,Valid for Countries,Gültig für folgende Länder
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde ""nicht kopieren"" ausgewählt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Geschätzte Summe der Bestellungen
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Mitarbeiterbezeichnung (z. B. Geschäftsführer, Direktor etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Bitte Feldwert ""Wiederholung an Tag von Monat"" eingeben"
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kauf Rechnung kann nicht gegen einen bereits bestehenden Asset vorgenommen werden {1}
 DocType: Item Tax,Tax Rate,Steuersatz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} bereits an Mitarbeiter {1} zugeteilt für den Zeitraum {2} bis {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Artikel auswählen
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Artikel auswählen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Eingangsrechnung {0} wurde bereits übertragen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Zeile # {0}: Chargennummer muss dieselbe sein wie {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,In nicht-Gruppe umwandeln
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Charge (Los) eines Artikels
 DocType: C-Form Invoice Detail,Invoice Date,Rechnungsdatum
 DocType: GL Entry,Debit Amount,Soll-Betrag
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Es kann nur EIN Konto pro Unternehmen in {0} {1} geben
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Bitte Anhang beachten
 DocType: Purchase Order,% Received,% erhalten
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Erstellen Studentengruppen
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Angebotsanfrage
 DocType: Salary Slip Timesheet,Working Hours,Arbeitszeit
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Anfangs- / Ist-Wert eines Nummernkreises ändern.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Erstellen Sie einen neuen Kunden
-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.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Erstellen von Bestellungen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Erstellen Sie einen neuen Kunden
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Wenn mehrere Preisregeln weiterhin gleichrangig gelten, werden die Benutzer aufgefordert, Vorrangregelungen manuell zu erstellen, um den Konflikt zu lösen."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Erstellen von Bestellungen
 ,Purchase Register,Übersicht über Einkäufe
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Anfallende Gebühren
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) muss die Rolle ""Urlaubsgenehmiger"" haben"
 DocType: Purchase Receipt,Vehicle Date,Fahrzeug-Datum
 DocType: Student Log,Medical,Medizinisch
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Grund für das Verlieren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Grund für das Verlieren
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead-Besitzer können als Lead nicht gleich sein
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Geschätzter Betrag kann nicht größer sein als nicht angepasster Betrag
 DocType: Announcement,Receiver,Empfänger
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Menge und Preis
 DocType: Delivery Note,% Installed,% installiert
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Die Klassenräume / Laboratorien usw., wo Vorträge können geplant werden."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Lieferant&gt; Lieferanten Typ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Bitte zuerst den Firmennamen angeben
 DocType: Purchase Invoice,Supplier Name,Lieferantenname
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lesen Sie das ERPNext-Handbuch
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Alte übergeordnetes Element
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Pflichtfeld - Akademisches Jahr
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Einleitenden Text anpassen, der zu dieser E-Mail gehört. Jede Transaktion hat einen eigenen Einleitungstext."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Bitte setzen Sie das Zahlungsverzugskonto für die Firma {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Allgemeine Einstellungen für alle Fertigungsprozesse
 DocType: Accounts Settings,Accounts Frozen Upto,Konten gesperrt bis
 DocType: SMS Log,Sent On,Gesendet am
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} mehrfach in Attributetabelle ausgewäht
 DocType: HR Settings,Employee record is created using selected field. ,Mitarbeiter-Datensatz wird erstellt anhand des ausgewählten Feldes.
 DocType: Sales Order,Not Applicable,Nicht anwenden
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Stammdaten zum Urlaub
 DocType: Request for Quotation Item,Required Date,Angefragtes Datum
 DocType: Delivery Note,Billing Address,Rechnungsadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Bitte die Artikelnummer eingeben
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Bitte die Artikelnummer eingeben
 DocType: BOM,Costing,Kalkulation
 DocType: Tax Rule,Billing County,Rechnungs-Landesbezirk/-Gemeinde/-Kreis
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Wenn aktiviert, wird der Steuerbetrag als bereits in den Druckkosten enthalten erachtet."
@@ -500,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Von Paket Nr.
 DocType: Item Attribute,To Range,Bis-Bereich
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Wertpapiere und Einlagen
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kann die Bewertungsmethode nicht ändern, da es Transaktionen gegen einige Posten gibt, für die es keine eigene Bewertungsmethode gibt"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Die Gesamtmenge des zugeteilten Urlaubs ist zwingend erforderlich
 DocType: Job Opening,Description of a Job Opening,Stellenbeschreibung
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ausstehende Aktivitäten für heute
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativer Benutzer
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Bitte wählen Sie Kurs
 DocType: Timesheet Detail,Hrs,Std
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Bitte Firma auswählen
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Bitte Firma auswählen
 DocType: Stock Entry Detail,Difference Account,Differenzkonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Aufgabe kann nicht geschlossen werden, da die von ihr abhängige Aufgabe {0} nicht geschlossen ist."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Bitte das Lager eingeben, für das eine Materialanfrage erhoben wird"
 DocType: Production Order,Additional Operating Cost,Zusätzliche Betriebskosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 DocType: Shipping Rule,Net Weight,Nettogewicht
 DocType: Employee,Emergency Phone,Notruf
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kaufen
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Bitte definieren Sie Grade for Threshold 0%
 DocType: Sales Order,To Deliver,Auszuliefern
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serien-Nr Element kann nicht ein Bruchteil sein
 DocType: Journal Entry,Difference (Dr - Cr),Differenz (Soll - Haben)
 DocType: Account,Profit and Loss,Gewinn und Verlust
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Unteraufträge vergeben
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Schrittweite kann nicht 0 sein
 DocType: Production Planning Tool,Material Requirement,Materialbedarf
 DocType: Company,Delete Company Transactions,Löschen der Transaktionen dieser Firma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referenznummer und Referenzdatum ist obligatorisch für Bankengeschäft
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Hinzufügen/Bearbeiten von Steuern und Abgaben
 DocType: Purchase Invoice,Supplier Invoice No,Lieferantenrechnungsnr.
 DocType: Territory,For reference,Zu Referenzzwecken
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Bestandteil des Installationshinweises
 DocType: Production Plan Item,Pending Qty,Ausstehende Menge
 DocType: Budget,Ignore,Ignorieren
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ist nicht aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ist nicht aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS an folgende Nummern verschickt: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup-Kontrollmaße für den Druck
 DocType: Salary Slip,Salary Slip Timesheet,Gehaltszettel Timesheet
@@ -570,14 +575,14 @@
 DocType: Sales Invoice,Total Commission,Gesamtprovision
 DocType: Pricing Rule,Sales Partner,Vertriebspartner
 DocType: Buying Settings,Purchase Receipt Required,Kaufbeleg notwendig
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Keine Datensätze in der Rechnungstabelle gefunden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Bitte zuerst Firma und Gruppentyp auswählen
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanz-/Rechnungsjahr
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Kumulierte Werte
 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 +740,Make Sales Order,Kundenauftrag erstellen
-DocType: Project Task,Project Task,Projekt-Teilaufgabe
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Kundenauftrag erstellen
+DocType: Project Task,Project Task,Projektvorgang
 ,Lead Id,Lead-ID
 DocType: C-Form Invoice Detail,Grand Total,Gesamtbetrag
 DocType: Training Event,Course,Kurs
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Resume-Anlage
 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/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Rücklieferung
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Rücklieferung
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Hinweis: Die aufteilbaren Gesamt Blätter {0} sollte nicht kleiner sein als bereits genehmigt Blätter {1} für den Zeitraum
 DocType: Announcement,Posted By,Geschrieben von
 DocType: Item,Delivered by Supplier (Drop Ship),durch Lieferanten geliefert (Streckengeschäft)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Angebot für
 DocType: Lead,Middle Income,Mittleres Einkommen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anfangssstand (Haben)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Zugewiesene Menge kann nicht negativ sein
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Bitte setzen Sie das Unternehmen
 DocType: Purchase Order Item,Billed Amt,Rechnungsbetrag
@@ -614,10 +619,10 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Ausgangsrechnung-Zeiterfassung
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenznr. & Referenz-Tag sind erforderlich für {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wählen Sie Zahlungskonto zu machen Bank Eintrag
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Erstellen Sie Mitarbeiterdaten Blätter, Spesenabrechnung und Gehaltsabrechnung zu verwalten"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Zur Knowledge Base hinzufügen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Verfassen von Angeboten
-DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlung Eintrag Abzug
+DocType: Payment Entry Deduction,Payment Entry Deduction,Zahlungsabzug
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Ein weiterer Vertriebsmitarbeiter {0} existiert bereits mit der gleichen Mitarbeiter ID
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Wenn diese Option aktiviert, Rohstoffe für Gegenstände, die Unteraufträge sind in den Materialwünsche aufgenommen werden"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Stämme
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nicht im Geschäftsjahr {2}
 DocType: Buying Settings,Settings for Buying Module,Einstellungen Einkauf
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset-{0} gehört nicht zur Gesellschaft {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Bitte zuerst Kaufbeleg eingeben
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Bitte zuerst Kaufbeleg eingeben
 DocType: Buying Settings,Supplier Naming By,Bezeichnung des Lieferanten nach
 DocType: Activity Type,Default Costing Rate,Standardkosten
 DocType: Maintenance Schedule,Maintenance Schedule,Wartungsplan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Dann werden Preisregeln bezogen auf Kunde, Kundengruppe, Region, Lieferant, Lieferantentyp, Kampagne, Vertriebspartner usw. ausgefiltert"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Nettoveränderung des Bestands
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Mitarbeiter Darlehensverwaltung
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Beziehung mit Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Leiter
-DocType: Payment Entry,Payment From / To,Die Zahlung von / bis
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumsbereich
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
+DocType: Payment Entry,Payment From / To,Zahlung von / an
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Neue Kreditlimit ist weniger als die aktuellen ausstehenden Betrag für den Kunden. Kreditlimit hat atleast sein {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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"
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,In Minuten
 DocType: Issue,Resolution Date,Datum der Entscheidung
 DocType: Student Batch Name,Batch Name,Stapelname
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet erstellt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet erstellt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Bitte Standardeinstellungen für Kassen- oder Bankkonto in ""Zahlungsart"" {0} setzen"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Einschreiben
 DocType: Selling Settings,Customer Naming By,Benennung der Kunden nach
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,"Zeigen die Schüler, wie sie in Studenten monatlichen Anwesenheitsbericht"
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Tatsächliche Startzeit
 DocType: BOM Operation,Operation Time,Zeit für einen Arbeitsgang
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Fertig
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
 DocType: Timesheet,Total Billed Hours,Insgesamt Angekündigt Stunden
 DocType: Journal Entry,Write Off Amount,Abschreibungs-Betrag
 DocType: Journal Entry,Bill No,Rechnungsnr.
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Schülerzahl
 DocType: Sales Invoice Timesheet,Time Sheet,Zeitblatt
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Rückmeldung Rohmaterialien auf Basis von
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Bitte Artikel-Details angeben
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Bitte Artikel-Details angeben
 DocType: Interest,Interest,Interessieren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vorverkauf
 DocType: Purchase Receipt,Other Details,Sonstige Einzelheiten
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Payment Eintrag bereits erstellt
 DocType: Purchase Receipt Item Supplied,Current Stock,Aktueller Lagerbestand
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Vermögens {1} nicht auf Artikel verknüpft {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Vorschau Gehaltsabrechnung
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Vorschau Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} wurde mehrmals eingegeben
 DocType: Account,Expenses Included In Valuation,In der Bewertung enthaltene Aufwendungen
 DocType: Hub Settings,Seller City,Stadt des Verkäufers
 ,Absent Student Report,Abwesend Student Report
 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 +636,Item has variants.,Artikel hat Varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Gesellschaft {0} existiert nicht
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Struktur-Typ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Struktur-Typ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Verbrauchte Menge pro Einheit
 DocType: Serial No,Warranty Expiry Date,Ablaufsdatum der Garantie
 DocType: Material Request Item,Quantity and Warehouse,Menge und Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionssatz (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte nennen Sie die Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Bitte wählen Sie Programm
 DocType: Project,Estimated Cost,Geschätzte Kosten
 DocType: Purchase Order,Link to material requests,Link zu Materialanforderungen
@@ -753,7 +756,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Erhaltene Menge (Gesellschaft Währung)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Lead muss eingestellt werden, wenn eine Opportunity aus dem Lead entsteht"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Bitte die wöchentlichen Auszeittage auswählen
 DocType: Production Order Operation,Planned End Time,Geplante Endzeit
 ,Sales Person Target Variance Item Group-Wise,Artikelgruppenbezogene Zielabweichung des Vertriebsmitarbeiters
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,Chance von
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Monatliche Gehaltsabrechnung
 DocType: BOM,Website Specifications,Webseiten-Spezifikationen
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über die Einrichtung&gt; Nummerierung ein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Von {0} vom Typ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Umrechnungsfaktor ist zwingend erfoderlich
@@ -822,6 +826,7 @@
 DocType: Employee,Bank A/C No.,Bankkonto-Nr.
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Ablesewert 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,teilweise geordnete
 DocType: Expense Claim Detail,Expense Claim Type,Art der Aufwandsabrechnung
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardeinstellungen für den Warenkorb
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset-verschrottet über Journaleintrag {0}
@@ -829,14 +834,14 @@
 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 +107,Office Maintenance Expenses,Büro-Wartungskosten
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Einrichten E-Mail-Konto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Bitte zuerst den Artikel angeben
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Bitte zuerst den Artikel angeben
 DocType: Account,Liability,Verbindlichkeit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Genehmigter Betrag kann nicht größer als geforderter Betrag in Zeile {0} sein.
 DocType: Company,Default Cost of Goods Sold Account,Standard-Herstellkosten
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Preisliste nicht ausgewählt
 DocType: Employee,Family Background,Familiärer Hintergrund
 DocType: Request for Quotation Supplier,Send Email,E-Mail absenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warnung: Ungültige Anlage {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Keine Berechtigung
 DocType: Company,Default Bank Account,Standardbankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Um auf der Grundlage von Gruppen zu filtern, bitte zuerst den Gruppentyp wählen"
@@ -849,7 +854,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Kein Mitarbeiter gefunden
 DocType: Supplier Quotation,Stopped,Angehalten
 DocType: Item,If subcontracted to a vendor,Wenn an einen Zulieferer untervergeben
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentengruppe ist bereits aktualisiert.
 DocType: SMS Center,All Customer Contact,Alle Kundenkontakte
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Lagerbestand über CSV hochladen
 DocType: Warehouse,Tree Details,Baum-Details
@@ -860,9 +865,9 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Mindestabrechnung
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostenstelle {2} gehört nicht zur Firma {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} darf keine Gruppe sein
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben &#39;{Doctype}&#39; Tisch
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
-apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Keine Aufgaben
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Artikel Row {idx}: {} {Doctype docname} existiert nicht in der oben &#39;{Doctype}&#39; Tisch
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ist bereits abgeschlossen oder abgebrochen
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,keine Vorgänge
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Der Tag des Monats, an welchem eine automatische Rechnung erstellt wird, z. B. 05, 28 usw."
 DocType: Asset,Opening Accumulated Depreciation,Öffnungs Kumulierte Abschreibungen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Punktzahl muß kleiner oder gleich 5 sein
@@ -877,7 +882,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} zu Rechnung {1} vom {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kurstermine
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kurstermine
 DocType: Maintenance Visit,Completion Status,Fertigstellungsstatus
 DocType: HR Settings,Enter retirement age in years,Geben Sie das Rentenalter in Jahren
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Eingangslager
@@ -885,7 +890,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Überlieferung bis zu diesem Prozentsatz zulassen
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import von Anwesenheiten
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle Artikelgruppen
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikelgruppen
 DocType: Process Payroll,Activity Log,Aktivitätsprotokoll
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Nettogewinn/-verlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatisch beim Übertragen von Transaktionen Mitteilungen verfassen
@@ -896,13 +901,13 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Vom Lieferantenauftrag zur Zahlung
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Geplante Menge
 DocType: Sales Invoice,Payment Due Date,Zahlungsstichtag
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert bereits
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Eröffnung"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öffnen Sie tun
 DocType: Notification Control,Delivery Note Message,Lieferschein-Nachricht
 DocType: Expense Claim,Expenses,Ausgaben
 DocType: Item Variant Attribute,Item Variant Attribute,Artikelvariantenattribut
-,Purchase Receipt Trends,Trandanalyse Kaufbelege
+,Purchase Receipt Trends,Trendanalyse Kaufbelege
 DocType: Process Payroll,Bimonthly,Zweimonatlich
 DocType: Vehicle Service,Brake Pad,Bremsklotz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Forschung & Entwicklung
@@ -912,13 +917,13 @@
 DocType: Item Reorder,Re-Order Qty,Nachbestellmenge
 DocType: Leave Block List Date,Leave Block List Date,Urlaubssperrenliste Datum
 DocType: Pricing Rule,Price or Discount,Preis oder Rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein
 DocType: Sales Team,Incentives,Anreize
 DocType: SMS Log,Requested Numbers,Angeforderte Nummern
 DocType: Production Planning Tool,Only Obtain Raw Materials,Erhalten Sie nur Rohstoffe
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Mitarbeiterbeurteilung
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Aktivieren &quot;Verwendung für Einkaufswagen&quot;, wie Einkaufswagen aktiviert ist und es sollte mindestens eine Steuerregel für Einkaufswagen sein"
-apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung Eintrag {0} ist gegen die Ordnung verknüpft {1}, überprüfen, ob es als Fortschritt in dieser Rechnung gezogen werden sollte."
+apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Zahlung {0} ist mit der Bestellung {1} verknüpft, überprüfen Sie bitte, ob es als Anteil in dieser Rechnung gezogen werden sollte."
 DocType: Sales Invoice Item,Stock Details,Lagerdetails
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Projektwert
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Verkaufsstelle
@@ -941,13 +946,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Ist Untervergabe
 DocType: Item Attribute,Item Attribute Values,Artikel-Attributwerte
 DocType: Examination Result,Examination Result,Prüfungsergebnis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Kaufbeleg
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Kaufbeleg
 ,Received Items To Be Billed,"Von Lieferanten gelieferte Artikel, die noch abgerechnet werden müssen"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Eingereicht Gehaltsabrechnungen
 DocType: Employee,Ms,Fr.
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Stammdaten zur Währungsumrechnung
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referenz Doctype muss man von {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referenz Doctype muss man von {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},In den nächsten {0} Tagen kann für den Arbeitsgang {1} kein Zeitfenster gefunden werden
 DocType: Production Order,Plan material for sub-assemblies,Materialplanung für Unterbaugruppen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Vertriebspartner und Territorium
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Kann nicht automatisch Konto erstellen, wie es auf dem Konto bereits Aktien Gleichgewicht ist. Sie müssen ein entsprechendes Konto erstellen, bevor Sie einen Eintrag in diesem Lager zu machen"
@@ -970,10 +975,9 @@
 DocType: Supplier,Default Payable Accounts,Standard-Verbindlichkeitenkonten
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Mitarbeiter {0} ist nicht aktiv oder existiert nicht
 DocType: Fee Structure,Components,Komponenten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Artikelvarianten {0} aktualisiert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Bitte geben Sie Anlagekategorie in Artikel {0}
 DocType: Quality Inspection Reading,Reading 6,Ablesewert 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Vorkasse zur Eingangsrechnung
 DocType: Hub Settings,Sync Now,Jetzt synchronisieren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden
@@ -987,11 +991,11 @@
 DocType: Item,Is Purchase Item,Ist Einkaufsartikel
 DocType: Asset,Purchase Invoice,Eingangsrechnung
 DocType: Stock Ledger Entry,Voucher Detail No,Belegdetail-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Neue Ausgangsrechnung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Neue Ausgangsrechnung
 DocType: Stock Entry,Total Outgoing Value,Gesamtwert Auslieferungen
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollten im gleichen Geschäftsjahr sein
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Eröffnungsdatum und Abschlussdatum sollten im gleichen Geschäftsjahr sein
 DocType: Lead,Request for Information,Informationsanfrage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline-Rechnungen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline-Rechnungen
 DocType: Payment Request,Paid,Bezahlt
 DocType: Program Fee,Program Fee,Programmgebühr
 DocType: Salary Slip,Total in words,Summe in Worten
@@ -1001,7 +1005,7 @@
 DocType: Employee Loan,Sanctioned,sanktionierte
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Veröffentlichen Sie auf der Website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Lieferungen an Kunden
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung
@@ -1012,7 +1016,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Abweichung
 ,Company Name,Firmenname
 DocType: SMS Center,Total Message(s),Summe Nachricht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Artikel für Übertrag auswählen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1023,8 +1027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Standard Bank / Geldkonto wird automatisch in Gehalts Journal Entry aktualisiert werden, wenn dieser Modus ausgewählt ist."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Die Intervalle für Grade-Code {0} überlappt mit der Note Intervalle für andere Typen. Bitte überprüfen Sie Intervalle {0} und {1} und versuchen Sie es erneut
 DocType: BOM,Raw Material Cost(Company Currency),Rohstoffkosten (Gesellschaft Währung)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle Artikel wurden schon für diesen Fertigungsauftrag übernommen.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Die Rate kann nicht größer sein als die Rate, die in {1} {2}"
@@ -1036,13 +1038,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Webseite Artikel
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Briefkopf und Logo hochladen. (Beides kann später noch bearbeitet werden.)
 DocType: Timesheet Detail,Bill,Rechnung
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Weiter Abschreibungen Datum wird als vergangenes Datum eingegeben
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Weiß
 DocType: SMS Center,All Lead (Open),Alle Leads (offen)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Menge nicht für {4} in Lager {1} zum Zeitpunkt des Eintrags Entsendung ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Gezahlte Anzahlungen aufrufen
 DocType: Item,Automatically Create New Batch,Automatisch neue Charge erstellen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Erstellen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Erstellen
 DocType: Student Admission,Admission Start Date,Der Eintritt Startdatum
 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."
@@ -1050,7 +1052,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Bitte geben Sie Konto für Änderungsbetrag
 DocType: Student Batch Name,Student Batch Name,Studentenstapelname
 DocType: Holiday List,Holiday List Name,Urlaubslistenname
 DocType: Repayment Schedule,Balance Loan Amount,Bilanz Darlehensbetrag
@@ -1070,10 +1072,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Bitte geben Sie eine {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt.
 DocType: Delivery Note,Delivery To,Lieferung an
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabelle ist zwingend erforderlich
 DocType: Production Planning Tool,Get Sales Orders,Kundenaufträge aufrufen
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kann nicht negativ sein
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Gesamtzahl der abschreibungen
 DocType: Sales Invoice Item,Rate With Margin,Bewerten Sie mit Margin
 DocType: Workstation,Wages,Lohn
@@ -1088,7 +1090,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Lager im Kundenauftrag reserviert / Fertigwarenlager
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Verkaufsbetrag
 DocType: Repayment Schedule,Interest Amount,Zinsbetrag
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sie sind der Ausgabenbewilliger für diesen Datensatz. Bitte aktualisieren Sie den ""Status"" und speichern Sie ihn ab"
 DocType: Serial No,Creation Document No,Belegerstellungs-Nr.
 DocType: Issue,Issue,Anfrage
 DocType: Asset,Scrapped,Verschrottet
@@ -1096,12 +1098,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attribute für Artikelvarianten, z. B. Größe, Farbe usw."
 DocType: Purchase Invoice,Returns,Kehrt zurück
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Fertigungslager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Seriennummer {0} ist mit Wartungsvertrag versehen bis {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrutierung
 DocType: Lead,Organization Name,Firmenname
 DocType: Tax Rule,Shipping State,Versandstatus
 ,Projected Quantity as Source,Projizierte Menge als Quelle
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Fügen Sie nicht auf Lager gehalten
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Vertriebskosten
@@ -1109,12 +1111,12 @@
 DocType: GL Entry,Against,Zu
 DocType: Item,Default Selling Cost Center,Standard-Vertriebskostenstelle
 DocType: Sales Partner,Implementation Partner,Umsetzungspartner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postleitzahl
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postleitzahl
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Kundenauftrag {0} ist {1}
 DocType: Opportunity,Contact Info,Kontakt-Information
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Lagerbuchungen erstellen
 DocType: Packing Slip,Net Weight UOM,Nettogewichtmaßeinheit
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Ergebnisse
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Ergebnisse
 DocType: Item,Default Supplier,Standardlieferant
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Prozensatz erlaubter Überproduktion
 DocType: Employee Loan,Repayment Schedule,Rückzahlungsplan
@@ -1122,7 +1124,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Wöchentliche Abwesenheitstermine abrufen
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Enddatum kann nicht vor Startdatum liegen
 DocType: Sales Person,Select company name first.,Zuerst den Firmennamen auswählen.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Soll
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Soll
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Angebote von Lieferanten
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},An {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Durchschnittsalter
@@ -1140,7 +1142,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Entscheidender Leistungsbereich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Invalid Attribute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} muss vorgelegt werden
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Menge muss gleich oder kleiner als {0} sein
 DocType: SMS Center,Total Characters,Gesamtanzahl Zeichen
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Bitte aus dem Stücklistenfeld eine Stückliste für Artikel {0} auswählen
@@ -1151,7 +1153,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 +224,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 +52,Please set 'Apply Additional Discount On',"Bitte ""Zusätzlichen Rabatt anwenden auf"" aktivieren"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Von-Bereich muss kleiner sein als Bis-Bereich
 DocType: Global Defaults,Global Defaults,Allgemeine Voreinstellungen
@@ -1161,7 +1163,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Startjahr
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum der laufenden Rechnungsperiode
 DocType: Salary Slip,Leave Without Pay,Unbezahlter Urlaub
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Fehler in der Kapazitätsplanung
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1176,7 +1178,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dies wird an den Artikelcode der Variante angehängt. Beispiel: Wenn Ihre Abkürzung ""SM"" und der Artikelcode ""T-SHIRT"" sind, so ist der Artikelcode der Variante ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettolohn (in Worten) wird angezeigt, sobald Sie die Gehaltsabrechnung speichern."
 DocType: Purchase Invoice,Is Return,Ist Rückgabe
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / Lastschrift
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / Lastschrift
 DocType: Price List Country,Price List Country,Preisliste Land
 DocType: Item,UOMs,Maßeinheiten
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gültige Seriennummern für Artikel {1}
@@ -1186,11 +1188,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Bitte geben Sie Item Code zu Chargennummer erhalten
 DocType: Stock Settings,Default Item Group,Standard-Artikelgruppe
 DocType: Employee Loan,Partially Disbursed,teil~~POS=TRUNC Zahlter
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Lieferantendatenbank
 DocType: Account,Balance Sheet,Bilanz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Kostenstelle für den Artikel mit der Artikel-Nr.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Zahlungsmittel ist nicht konfiguriert. Bitte überprüfen Sie, ob ein Konto in den Zahlungsmodi oder in einem Verkaufsstellen-Profil eingestellt wurde."
 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/buying/utils.py +74,Same item cannot be entered multiple times.,Das gleiche Einzelteil kann nicht mehrfach eingegeben werden.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
@@ -1202,7 +1203,7 @@
 ,Purchase Order Items To Be Billed,"Bei Lieferanten bestellte Artikel, die noch abgerechnet werden müssen"
 DocType: Purchase Invoice Item,Net Rate,Nettopreis
 DocType: Purchase Invoice Item,Purchase Invoice Item,Eingangsrechnungs-Artikel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Kaufbelege umgebucht
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Buchungen auf das Lagerbuch und Hauptbuch-Buchungen werden für die gewählten Kaufbelege umgebucht
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Position 1
 DocType: Holiday,Holiday,Urlaub
 DocType: Support Settings,Close Issue After Days,Schließen Ausgabe nach Tagen
@@ -1227,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbeit erledigt
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein
 DocType: Announcement,All Students,Alle Schüler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Artikel {0} muss eine Nichtlagerposition sein
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Hauptbuch anzeigen
 DocType: Grading Scale,Intervals,Intervalle
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Frühestens
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",Eine Artikelgruppe mit dem gleichen Namen existiert bereits. Bitte den Artikelnamen ändern oder die Artikelgruppe umbenennen
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobil-Nr
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1270,9 +1271,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Die Zahlung des Gehalts von {0} {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Kundenauftrag {0} ist nicht gültig
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Bestellungen helfen Ihnen bei der Planung und Follow-up auf Ihre Einkäufe
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Verzeihung! Firmen können nicht zusammengeführt werden
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Die gesamte Ausgabe / Transfer Menge {0} in Material anfordern {1} \ kann nicht größer sein als die angeforderte Menge {2} für Artikel {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
@@ -1293,10 +1294,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekte Aufwendungen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Zeile {0}: Menge ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landwirtschaft
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ihre Produkte oder Dienstleistungen
 DocType: Mode of Payment,Mode of Payment,Zahlungsweise
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Das Webseiten-Bild sollte eine öffentliche Datei oder eine Webseiten-URL sein
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Stückliste
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden.
@@ -1313,18 +1314,18 @@
 DocType: Student Group Student,Group Roll Number,Gruppenrolle Nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Für {0} können nur Habenkonten mit einer weiteren Sollbuchung verknüpft werden
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summe aller Aufgabe Gewichte sollten 1. Bitte stellen Sie Gewichte aller Projektaufgaben werden entsprechend
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Lieferschein {0} ist nicht gebucht
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Die Preisregel wird zunächst basierend auf dem Feld ""Anwenden auf"" ausgewählt. Dieses kann ein Artikel, eine Artikelgruppe oder eine Marke sein."
 DocType: Hub Settings,Seller Website,Webseite des Verkäufers
 DocType: Item,ITEM-,ARTIKEL-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status des Fertigungsauftrags lautet {0}
 DocType: Appraisal Goal,Goal,Ziel
 DocType: Sales Invoice Item,Edit Description,Beschreibung bearbeiten
 ,Team Updates,Team-Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Für Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Für Lieferant
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Das Festlegen des Kontotyps hilft bei der Auswahl dieses Kontos bei Transaktionen.
 DocType: Purchase Invoice,Grand Total (Company Currency),Gesamtbetrag (Firmenwährung)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Erstellen Sie das Druckformat
@@ -1340,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,Buchungssatz
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} Elemente in Bearbeitung
 DocType: Workstation,Workstation Name,Name des Arbeitsplatzes
-DocType: Grade Interval,Grade Code,Grade-Code
+DocType: Grading Scale Interval,Grade Code,Grade-Code
 DocType: POS Item Group,POS Item Group,POS Artikelgruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Täglicher E-Mail-Bericht:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stückliste {0} gehört nicht zum Artikel {1}
@@ -1356,7 +1357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Wiederholt sich bis
 DocType: Attendance,HR Manager,Leiter der Personalabteilung
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Bitte ein Unternehmen auswählen
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Bitte ein Unternehmen auswählen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Bevorzugter Urlaub
 DocType: Purchase Invoice,Supplier Invoice Date,Lieferantenrechnungsdatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sie müssen Ihren Einkaufswagen aktivieren.
@@ -1372,7 +1373,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Lebensmittel
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Alter Bereich 3
 DocType: Maintenance Schedule Item,No of Visits,Anzahl der Besuche
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Wartungsplan {0} existiert gegen {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,einschreibende Student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Die Währung des Abschlusskontos muss {0} sein
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summe der Punkte für alle Ziele sollte 100 sein. Aktueller Stand {0}
@@ -1397,7 +1399,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Durchschnittlicher täglicher Abgang
 DocType: POS Profile,Campaign,Kampagne
 DocType: Supplier,Name and Type,Name und Typ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Genehmigungsstatus muss ""Genehmigt"" oder ""Abgelehnt"" sein"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,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 +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Voraussichtliches Startdatum"" kann nicht nach dem ""Voraussichtlichen Enddatum"" liegen"
 DocType: Course Scheduling Tool,Course End Date,Kurs Enddatum
@@ -1420,19 +1422,20 @@
 DocType: Sales Invoice,Shipping Address Name,Lieferadresse Bezeichnung
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,Kann nicht größer als 100 sein
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,Kann nicht größer als 100 sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Artikel {0} ist kein Lagerartikel
 DocType: Maintenance Visit,Unscheduled,Außerplanmäßig
 DocType: Employee,Owned,Im Besitz von
 DocType: Salary Detail,Depends on Leave Without Pay,Hängt von unbezahltem Urlaub ab
 DocType: Pricing Rule,"Higher the number, higher the priority","Je höher die Zahl, desto höher die Priorität"
 ,Purchase Invoice Trends,Trendanalyse Eingangsrechnungen
 DocType: Employee,Better Prospects,Bessere Vorhersage
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Zeile # {0}: Der Batch {1} hat nur {2} Menge. Bitte wähle eine andere Charge aus, die {3} Menge zur Verfügung hat oder die Zeile in mehrere Zeilen aufteilt, um aus mehreren Chargen zu liefern / auszutauschen"
 DocType: Vehicle,License Plate,Nummernschild
 DocType: Appraisal,Goals,Ziele
 DocType: Warranty Claim,Warranty / AMC Status,Status der Garantie / des jährlichen Wartungsvertrags
 ,Accounts Browser,Kontenbrowser
-DocType: Payment Entry Reference,Payment Entry Reference,Zahlung Eintrag Referenz
+DocType: Payment Entry Reference,Payment Entry Reference,Zahlungsreferenz
 DocType: GL Entry,GL Entry,Buchung zum Hauptbuch
 DocType: HR Settings,Employee Settings,Mitarbeitereinstellungen
 ,Batch-Wise Balance History,Chargenbezogener Bestandsverlauf
@@ -1445,7 +1448,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Mitarbeiter können nicht an sich selbst Bericht erstatten
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 DocType: Email Digest,Bank Balance,Kontostand
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden
 DocType: Job Opening,"Job profile, qualifications required etc.","Stellenbeschreibung, erforderliche Qualifikationen usw."
 DocType: Journal Entry Account,Account Balance,Kontostand
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Steuerregel für Transaktionen
@@ -1456,18 +1459,18 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Zeigen Sie nicht geschlossene Geschäftsjahr des P &amp; L-Waagen
 DocType: Shipping Rule,Shipping Account,Versandkonto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ist inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Machen Sie Kundenaufträge Sie Ihre Arbeit planen und liefern on-time
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Machen Sie Kundenaufträge Sie Ihre Arbeit planen und liefern on-time
 DocType: Quality Inspection,Readings,Ablesungen
 DocType: Stock Entry,Total Additional Costs,Gesamte Zusatzkosten
 DocType: Course Schedule,SH,Sch
 DocType: BOM,Scrap Material Cost(Company Currency),Schrottmaterialkosten (Gesellschaft Währung)
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,Unterbaugruppen
 DocType: Asset,Asset Name,Asset-Name
-DocType: Project,Task Weight,Aufgabengewichtung
+DocType: Project,Task Weight,Vorgangsgewichtung
 DocType: Shipping Rule Condition,To Value,Bis-Wert
 DocType: Asset Movement,Stock Manager,Lagerleiter
 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/delivery_note/delivery_note.js +814,Packing Slip,Packzettel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Packzettel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Büromiete
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Einstellungen für SMS-Gateway verwalten
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import fehlgeschlagen!
@@ -1489,11 +1492,11 @@
 DocType: Company,Services,Dienstleistungen
 DocType: HR Settings,Email Salary Slip to Employee,E-Mail-Gehaltsabrechnung an Mitarbeiter
 DocType: Cost Center,Parent Cost Center,Übergeordnete Kostenstelle
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Wählen Mögliche Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Wählen Mögliche Lieferant
 DocType: Sales Invoice,Source,Quelle
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Zeige geschlossen
 DocType: Leave Type,Is Leave Without Pay,Ist unbezahlter Urlaub
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Anlagekategorie ist obligatorisch für Posten des Anlagevermögens
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,"Keine Datensätze in der Tabelle ""Zahlungen"" gefunden"
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Diese {0} Konflikte mit {1} von {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studenten HTML
@@ -1511,7 +1514,7 @@
 DocType: Student,Date of Leaving,Datum Weggehen
 DocType: Pricing Rule,For Price List,Für Preisliste
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Direktsuche
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,erstellen Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,erstellen Leads
 DocType: Maintenance Schedule,Schedules,Zeitablaufpläne
 DocType: Purchase Invoice Item,Net Amount,Nettobetrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stückliste Detailnr.
@@ -1539,9 +1542,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Programm Einschreibungen
 DocType: Sales Invoice Item,Brand Name,Bezeichnung der Marke
 DocType: Purchase Receipt,Transporter Details,Informationen zum Transporteur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standard Lager wird für das ausgewählte Element erforderlich
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kiste
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Mögliche Lieferant
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Mögliche Lieferant
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Die Firma
 DocType: Budget,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
@@ -1549,7 +1552,7 @@
 DocType: Sales Partner,Sales Partner Target,Vertriebspartner-Ziel
 DocType: Loan Type,Maximum Loan Amount,Maximale Darlehensbetrag
 DocType: Pricing Rule,Pricing Rule,Preisregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplikatrolle für Schüler {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplikatrolle für Schüler {0}
 DocType: Budget,Action if Annual Budget Exceeded,Erwünschte Aktion bei überschrittenem jährlichem Budget
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Von der Materialanfrage zum Lieferantenauftrag
 DocType: Shopping Cart Settings,Payment Success URL,Payment Success URL
@@ -1570,9 +1573,9 @@
 DocType: Employee Loan,Repayment Method,Rückzahlweg
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Wenn diese Option aktiviert, wird die Startseite der Standardartikelgruppe für die Website sein"
 DocType: Quality Inspection Reading,Reading 4,Ablesewert 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standardstückliste für {0} nicht für das Projekt gefunden {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Standardstückliste für {0} nicht für das Projekt gefunden {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Ansprüche auf Kostenübernahme durch das Unternehmen
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Die Schüler im Herzen des Systems sind, fügen Sie alle Ihre Schüler"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Die Schüler im Herzen des Systems sind, fügen Sie alle Ihre Schüler"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2}
 DocType: Company,Default Holiday List,Standard-Urlaubsliste
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},"Row {0}: Von Zeit und Zeit, um von {1} überlappt mit {2}"
@@ -1583,22 +1586,22 @@
 DocType: Student Group,Set 0 for no limit,Stellen Sie 0 für keine Grenze
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Der Tag/die Tage, für den/die Sie Urlaub beantragen, sind Ferien. Deshalb müssen Sie keinen Urlaub beantragen."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Erneut senden Zahlung per E-Mail
-apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neue Aufgabe
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Angebot erstellen
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Neuer Vorgang
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Angebot erstellen
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Weitere Berichte
-DocType: Dependent Task,Dependent Task,Abhängige Aufgabe
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
+DocType: Dependent Task,Dependent Task,Abhängiger Vorgang
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Abwesenheit vom Typ {0} kann nicht länger sein als {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Arbeitsgänge für X Tage im Voraus planen.
 DocType: HR Settings,Stop Birthday Reminders,Geburtstagserinnerungen ausschalten
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Bitte setzen Sie Standard-Abrechnungskreditorenkonto in Gesellschaft {0}
 DocType: SMS Center,Receiver List,Empfängerliste
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Suche Artikel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Suche Artikel
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbrauchte Menge
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoveränderung der Barmittel
 DocType: Assessment Plan,Grading Scale,Bewertungsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Schon erledigt
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Maßeinheit {0} wurde mehr als einmal in die Umrechnungsfaktor-Tabelle eingetragen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Schon erledigt
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Zahlungsanordnung bereits vorhanden ist {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Aufwendungen für in Umlauf gebrachte Artikel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Menge darf nicht mehr als {0} sein
@@ -1630,12 +1633,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Machen Disbursement Eintrag
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Voraus gegen Lieferant muss belasten werden
 DocType: Company,Default Values,Standardwerte
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequenz} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Gesamterstattungsbetrag
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dies basiert auf Protokollen gegen dieses Fahrzeug. Siehe Zeitleiste unten für Details
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sammeln
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Zu Eingangsrechnung {0} vom {1}
 DocType: Customer,Default Price List,Standardpreisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset-Bewegung Datensatz {0} erstellt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sie können das Geschäftsjahr {0} nicht löschen. Das Geschäftsjahr {0} ist als Standard in den globalen Einstellungen festgelegt
 DocType: Journal Entry,Entry Type,Buchungstyp
 ,Customer Credit Balance,Kunden-Kreditlinien
@@ -1652,7 +1656,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beschaffung
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Pflichtfeld - Programm
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantieanspruch
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantieanspruch
 ,Lead Details,Einzelheiten zum Lead
 DocType: Salary Slip,Loan repayment,Kreditrückzahlung
 DocType: Purchase Invoice,End date of current invoice's period,Schlußdatum der laufenden Eingangsrechnungsperiode
@@ -1671,11 +1675,10 @@
 DocType: Employee,Permanent Address,Feste Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Bitte Artikelnummer auswählen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Bitte Artikelnummer auswählen
 DocType: Student Sibling,Studying in Same Institute,Studieren in Same-Institut
 DocType: Territory,Territory Manager,Gebietsleiter
 DocType: Packed Item,To Warehouse (Optional),Eingangslager (Optional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Marke
 DocType: Payment Entry,Paid Amount (Company Currency),Gezahlter Betrag (Firmenwährung)
 DocType: Purchase Invoice,Additional Discount,Zusätzlicher Rabatt
 DocType: Selling Settings,Selling Settings,Vertriebseinstellungen
@@ -1685,9 +1688,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ansicht Warenkorb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikelengpass-Bericht
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Gewicht ist angegeben, bitte auch ""Gewichts-Maßeinheit"" angeben"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Weiter Abschreibungen Datum ist obligatorisch für neue Anlage
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Weiter Abschreibungen Datum ist obligatorisch für neue Anlage
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separate Kursbasierte Gruppe für jede Charge
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Einzelnes Element eines Artikels
 DocType: Fee Category,Fee Category,Preis Kategorie
@@ -1703,8 +1706,7 @@
 DocType: Course Assessment Criteria,Weightage,Gewichtung
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostenstelle ist erforderlich für die &quot;Gewinn- und Verlust &#39;Konto {2}. Bitte stellen Sie eine Standard-Kostenstelle für das Unternehmen.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Neuer Kontakt
 DocType: Territory,Parent Territory,Übergeordnete Region
 DocType: Quality Inspection Reading,Reading 2,Ablesewert 2
@@ -1721,7 +1723,7 @@
 ,Item-wise Sales Register,Artikelbezogene Übersicht der Verkäufe
 DocType: Asset,Gross Purchase Amount,Bruttokaufbetrag
 DocType: Asset,Depreciation Method,Abschreibungsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ist diese Steuer im Basispreis enthalten?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Summe Vorgabe
 DocType: Program Course,Required,Erforderlich
@@ -1731,20 +1733,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Abgleich JSON (JavaScript Object Notation)
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zu viele Spalten. Exportieren Sie den Bericht und drucken Sie ihn mit einem Tabellenkalkulationsprogramm aus.
 DocType: Purchase Invoice Item,Batch No,Chargennummer
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Es kann nicht nach Wechselkurs zu finden {0} {1} für Stichtag {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zusammenfassen mehrerer Kundenaufträge zu einer Kundenbestellung erlauben
 DocType: Student Group Instructor,Student Group Instructor,Student Group Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobil Nein
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Haupt
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Haupt
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Präfix für die Seriennummerierung Ihrer Transaktionen festlegen
 DocType: Employee Attendance Tool,Employees HTML,Mitarbeiter HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein
 DocType: Employee,Leave Encashed?,Urlaub eingelöst?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Feld ""Chance von"" ist zwingend erforderlich"
 DocType: Email Digest,Annual Expenses,Jährliche Kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Lieferantenauftrag erstellen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Lieferantenauftrag erstellen
 DocType: SMS Center,Send To,Senden an
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Es gibt nicht genügend verfügbaren Urlaub für Urlaubstyp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Zugewiesene Menge
@@ -1752,17 +1753,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kunden-Artikel-Nr.
 DocType: Stock Reconciliation,Stock Reconciliation,Bestandsabgleich
 DocType: Territory,Territory Name,Name der Region
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Fertigungslager wird vor dem Übertragen benötigt
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Bewerber für einen Job
 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
 DocType: Item,Serial Nos and Batches,Seriennummern und Chargen
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Schülergruppenstärke
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,"""Zu Buchungssatz"" {0} hat nur abgeglichene {1} Buchungen"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Beurteilungen
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Grading Intervalle
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Bitte eingeben
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kann nicht für Artikel overbill {0} in Zeile {1} mehr als {2}. Damit über Abrechnung, setzen Sie sich bitte Einstellungen in Kauf"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Bitte setzen Sie Filter basierend auf Artikel oder Lager
@@ -1774,17 +1774,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stückliste {0} muss übertragen werden
 DocType: Authorization Control,Authorization Control,Berechtigungskontrolle
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Abgelehnt Warehouse ist obligatorisch gegen zurückgewiesen Artikel {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Bezahlung
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Verwalten Sie Ihre Aufträge
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Bezahlung
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Verwalten Sie Ihre Aufträge
 DocType: Production Order Operation,Actual Time and Cost,Tatsächliche Laufzeit und Kosten
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Materialanfrage von maximal {0} kann für Artikel {1} zum Kundenauftrag {2} gemacht werden
 DocType: Employee,Salutation,Anrede
 DocType: Course,Course Abbreviation,Kurs Abkürzung
 DocType: Student Leave Application,Student Leave Application,Student Urlaubsantrag
 DocType: Item,Will also apply for variants,Gilt auch für Varianten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vermögens kann nicht rückgängig gemacht werden, da es ohnehin schon ist {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Mitarbeiter {0} auf halber Tag auf {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Insgesamt Arbeitszeit sollte nicht größer sein als die maximale Arbeitszeit {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Am
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikel zum Zeitpunkt des Verkaufs bündeln
 DocType: Quotation Item,Actual Qty,Tatsächliche Anzahl
 DocType: Sales Invoice Item,References,Referenzen
@@ -1794,7 +1795,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Sie haben ein Duplikat eines Artikels eingetragen. Bitte korrigieren und erneut versuchen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Mitarbeiter/-in
 DocType: Asset Movement,Asset Movement,Asset-Bewegung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,neue Produkte Warenkorb
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,neue Produkte Warenkorb
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} ist kein Fortsetzungsartikel
 DocType: SMS Center,Create Receiver List,Empfängerliste erstellen
 DocType: Vehicle,Wheels,Räder
@@ -1826,9 +1827,9 @@
 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
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Hat Varianten
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Sie haben bereits Elemente aus {0} {1} gewählt
 DocType: Monthly Distribution,Name of the Monthly Distribution,Bezeichnung der monatsweisen Verteilung
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID ist obligatorisch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID ist obligatorisch
 DocType: Sales Person,Parent Sales Person,Übergeordneter Vertriebsmitarbeiter
 DocType: Purchase Invoice,Recurring Invoice,Wiederkehrende Rechnung
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projekte verwalten
@@ -1836,11 +1837,11 @@
 DocType: Budget,Fiscal Year,Geschäftsjahr
 DocType: Vehicle Log,Fuel Price,Kraftstoff-Preis
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Posten des Anlagevermögens muss ein Nichtlagerposition sein.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kann {0} nicht zugewiesen werden, da es kein Ertrags- oder Aufwandskonto ist"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Erreicht
 DocType: Student Admission,Application Form Route,Antragsformular Strecke
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Region / Kunde
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Region / Kunde
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,z. B. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Lassen Typ {0} kann nicht zugeordnet werden, da sie ohne Bezahlung verlassen wird"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Zeile {0}: Zugeteilte Menge {1} muss kleiner als oder gleich dem ausstehenden Betrag in Rechnung {2} sein
@@ -1860,14 +1861,14 @@
 ,Serial No Status,Seriennummern-Status
 DocType: Payment Entry Reference,Outstanding,Hervorragend
 ,Daily Timesheet Summary,tägliche Zeiterfassungsübersicht
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Zeile {0}: Um Periodizität {1} zu setzen, muss die Differenz aus Von-Datum und Bis-Datum größer oder gleich {2} sein"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dies ist auf Lager Bewegung basiert. Siehe {0} für Details
 DocType: Pricing Rule,Selling,Vertrieb
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Menge {0} {1} abgezogen gegen {2}
 DocType: Employee,Salary Information,Gehaltsinformationen
 DocType: Sales Person,Name and Employee ID,Name und Mitarbeiter-ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Fälligkeitsdatum kann nicht vor dem Buchungsdatum liegen
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Zölle und Steuern
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Bitte den Stichtag eingeben
@@ -1879,14 +1880,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
 DocType: Asset,Sold,Verkauft
 ,Item-wise Purchase History,Artikelbezogene Einkaufshistorie
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Bitte auf ""Zeitplan generieren"" klicken, um die Seriennummer für Artikel {0} abzurufen"
 DocType: Account,Frozen,Gesperrt
 ,Open Production Orders,Offene Fertigungsaufträge
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbetrag (Gesellschaft Währung)
 DocType: Payment Reconciliation Payment,Reference Row,Referenzreihe
 DocType: Installation Note,Installation Time,Installationszeit
 DocType: Sales Invoice,Accounting Details,Buchhaltungs-Details
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Löschen aller Transaktionen dieser Firma
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investitionen
 DocType: Issue,Resolution Details,Details zur Entscheidung
@@ -1918,13 +1919,13 @@
 DocType: Discussion,Discussion,Diskussion
 DocType: Payment Entry,Transaction ID,Transaktions-ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Preisregeln werden zudem nach Menge angewandt.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Bitte setzen Sie das Datum des Beitritts für Mitarbeiter {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Gesamtrechnungsbetrag (über Arbeitszeitblatt)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Umsatz Bestandskunden
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) muss die Rolle ""Ausgabengenehmiger"" haben"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Wählen Sie Stückliste und Menge für Produktion
 DocType: Asset,Depreciation Schedule,Abschreibungsplan
 DocType: Bank Reconciliation Detail,Against Account,Gegenkonto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halbtages Datum sollte zwischen Von-Datum und eine aktuelle
@@ -1938,16 +1939,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Bitte setzen &#39;Asset-Abschreibungen Kostenstelle&#39; in Gesellschaft {0}
 ,Maintenance Schedules,Wartungspläne
 DocType: Task,Actual End Date (via Time Sheet),Das tatsächliche Enddatum (durch Zeiterfassung)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Menge {0} {1} gegen {2} {3}
 ,Quotation Trends,Trendanalyse Angebote
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgruppe ist im Artikelstamm für Artikel {0} nicht erwähnt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Sollkonto muss ein Forderungskonto sein
 DocType: Shipping Rule Condition,Shipping Amount,Versandbetrag
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ausstehender Betrag
 DocType: Purchase Invoice Item,Conversion Factor,Umrechnungsfaktor
 DocType: Purchase Order,Delivered,Geliefert
 ,Vehicle Expenses,Fahrzeugkosten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
+DocType: Serial No,Invoice Details,Rechnungs-Details
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Erwartungswert nach Nutzungsdauer muss größer sein als oder gleich {0}
 DocType: Purchase Receipt,Vehicle Number,Fahrzeugnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Das Datum, an dem wiederkehrende Rechnungen angehalten werden"
 DocType: Employee Loan,Loan Amount,Darlehensbetrag
@@ -1965,12 +1967,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Zeiterfassungen
 DocType: HR Settings,HR Settings,Einstellungen zum Modul Personalwesen
 DocType: Salary Slip,net pay info,Netto-Zahlung Info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Aufwandsabrechnung wartet auf Bewilligung. Nur der Ausgabenbewilliger kann den Status aktualisieren.
 DocType: Email Digest,New Expenses,Neue Ausgaben
 DocType: Purchase Invoice,Additional Discount Amount,Zusätzlicher Rabatt
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Menge muss 1 sein, als Element eine Anlage ist. Bitte verwenden Sie separate Zeile für mehrere Menge."
 DocType: Leave Block List Allow,Leave Block List Allow,Urlaubssperrenliste zulassen
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,"""Abbr"" kann nicht leer oder Space sein"
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe an konzernfremde
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Loan-Name
@@ -1981,6 +1983,7 @@
 ,Customer Acquisition and Loyalty,Kundengewinnung und -bindung
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Lager, in dem zurückerhaltene Artikel aufbewahrt werden (Sperrlager)"
 DocType: Production Order,Skip Material Transfer,Materialübertragung überspringen
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Der Wechselkurs für {0} bis {1} für das Stichtag {2} kann nicht gefunden werden. Bitte erstellen Sie einen Exchange Exchange-Eintrag manuell
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,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 +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ist jetzt das Standardgeschäftsjahr. Bitte aktualisieren Sie Ihren Browser, damit die Änderungen wirksam werden."
@@ -1997,19 +2000,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} ist ungültig. Kontenwährung muss {1} sein
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Maßeinheit-Umrechnungsfaktor ist erforderlich in der Zeile {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Kundenauftrag, Verkaufsrechnung oder einen Journaleintrag sein"
 DocType: Salary Component,Deduction,Abzug
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Von Zeit und zu Zeit ist obligatorisch.
 DocType: Stock Reconciliation Item,Amount Difference,Mengendifferenz
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Artikel Preis hinzugefügt für {0} in Preisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben
 DocType: Territory,Classification of Customers by region,Einteilung der Kunden nach Region
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Differenzbetrag muss Null sein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Differenzbetrag muss Null sein
 DocType: Project,Gross Margin,Handelsspanne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Bitte zuerst Herstellungsartikel eingeben
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berechneten Kontoauszug Bilanz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivierter Benutzer
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Angebot
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Angebot
 DocType: Quotation,QTN-,ANG-
 DocType: Salary Slip,Total Deduction,Gesamtabzug
 ,Production Analytics,Die Produktion Analytics
@@ -2018,9 +2021,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Warnung: Ungültiges SSL-Zertifikat für Anlage {0}
 DocType: Student Admission,Eligibility,Wählbarkeit
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads helfen Ihnen ins Geschäft zu erhalten, fügen Sie alle Ihre Kontakte und mehr als Ihre Leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads helfen Ihnen ins Geschäft zu erhalten, fügen Sie alle Ihre Kontakte und mehr als Ihre Leads"
 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
@@ -2035,7 +2038,7 @@
 DocType: Guardian,Work Address,Arbeitsadresse
 DocType: Appraisal,Calculate Total Score,Gesamtwertung berechnen
 DocType: Request for Quotation,Manufacturing Manager,Fertigungsleiter
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seriennummer {0} ist innerhalb der Garantie bis {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Lieferschein in Pakete aufteilen
 apps/erpnext/erpnext/hooks.py +87,Shipments,Lieferungen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Kontostand ({0}) für {1} und Lagerwert ({2}) für Lager {3} muss gleich sein
@@ -2056,10 +2059,10 @@
 DocType: Leave Application,Total Leave Days,Urlaubstage insgesamt
 DocType: Email Digest,Note: Email will not be sent to disabled users,Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Anzahl der Interaktion
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Firma auswählen...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma auswählen...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Freilassen, wenn für alle Abteilungen gültig"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Art der Beschäftigung (Unbefristeter Vertrag, befristeter Vertrag, Praktikum etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Artikel ist zwingend erfoderlich für {1}
 DocType: Process Payroll,Fortnightly,vierzehntägig
 DocType: Currency Exchange,From Currency,Von Währung
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Bitte zugewiesenen Betrag, Rechnungsart und Rechnungsnummer in mindestens einer Zeile auswählen"
@@ -2068,14 +2071,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Preis (Firmenwährung)
 DocType: Student Guardian,Others,Andere
 DocType: Payment Entry,Unallocated Amount,Nicht zugewiesene Betrag
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Ein passender Artikel kann nicht gefunden werden. Bitte einen anderen Wert für {0} auswählen.
 DocType: POS Profile,Taxes and Charges,Steuern und Gebühren
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt oder Dienstleistung, die gekauft, verkauft oder auf Lager gehalten wird."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Keine Updates mehr
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Die Berechnungsart kann für die erste Zeile nicht auf ""bezogen auf Menge der vorhergenden Zeile"" oder auf ""bezogen auf Gesamtmenge der vorhergenden Zeile"" gesetzt werden"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Unterartikel sollte nicht ein Produkt-Bundle sein. Bitte Artikel `{0}` entfernen und speichern.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankwesen
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Zeiterfassung hinzufügen
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Zeiterfassung hinzufügen
 DocType: Vehicle Service,Service Item,Serviceposition
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Bitte auf ""Zeitplan generieren"" klicken, um den Zeitplan zu erhalten"
@@ -2099,6 +2102,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Vermögens {1} ist bereits {2}
 DocType: Quotation Item,Stock Balance,Lagerbestand
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Vom Kundenauftrag zum Zahlungseinang
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Bitte nennen Sie die Naming Series für {0} über Setup&gt; Einstellungen&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Aufwandsabrechnungsdetail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Bitte richtiges Konto auswählen
@@ -2123,16 +2127,16 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Die Preise werden nicht angezeigt, wenn Preisliste nicht gesetzt"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Bitte ein Land für diese Versandregel angeben oder ""Weltweiter Versand"" aktivieren"
 DocType: Stock Entry,Total Incoming Value,Summe der Einnahmen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Um erforderlich
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Um erforderlich
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Zeiterfassungen helfen den Überblick über Zeit, Kosten und Abrechnung für Aktivitäten von Ihrem Team getan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Einkaufspreisliste
 DocType: Offer Letter Term,Offer Term,Angebotsfrist
 DocType: Quality Inspection,Quality Manager,Qualitätsmanager
 DocType: Job Applicant,Job Opening,Offene Stellen
 DocType: Payment Reconciliation,Payment Reconciliation,Zahlungsabgleich
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Bitte den Namen der verantwortlichen Person auswählen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
-apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Noch nicht ausgezahlten: {0}
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Noch nicht bezahlt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webseite Tätigkeits
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Angebotsschreiben
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Materialanfragen (MAF) und Fertigungsaufträge generieren
@@ -2157,23 +2161,23 @@
 DocType: Opportunity,Lost Reason,Verlustgrund
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle Artikel sind bereits abgerechnet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Bitte geben Sie Eingangsbeleg
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Benutzer und Berechtigungen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Fertigungsaufträge Erstellt: {0}
 DocType: Branch,Branch,Filiale
 DocType: Guardian,Mobile Number,Handynummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Druck und Branding
 DocType: Bin,Actual Quantity,Tatsächlicher Bestand
 DocType: Shipping Rule,example: Next Day Shipping,Beispiel: Versand am nächsten Tag
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Seriennummer {0} wurde nicht gefunden
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ihre Kunden
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Machen Schüler
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Machen Schüler
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sie wurden zur Zusammenarbeit für das Projekt {0} eingeladen.
 DocType: Leave Block List Date,Block Date,Datum sperren
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jetzt bewerben
@@ -2196,8 +2200,9 @@
 DocType: SMS Log,Sent To,Gesendet An
 DocType: Payment Request,Make Sales Invoice,Verkaufsrechnung erstellen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nächste Kontakt Datum kann nicht in der Vergangenheit liegen
 DocType: Company,For Reference Only.,Nur zu Referenzzwecken.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Wählen Sie Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ungültige(r/s) {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-Ret
 DocType: Sales Invoice Advance,Advance Amount,Anzahlungsbetrag
@@ -2211,7 +2216,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Fall-Nr. kann nicht 0 sein
 DocType: Item,Show a slideshow at the top of the page,Diaschau oben auf der Seite anzeigen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Lagerräume
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Lagerräume
 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,Ende der Lebensdauer
@@ -2223,12 +2228,12 @@
 DocType: Rename Tool,Rename Tool,Werkzeug zum Umbenennen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Kosten aktualisieren
 DocType: Item Reorder,Item Reorder,Artikelnachbestellung
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Anzeigen Gehaltsabrechnung
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material übergeben
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Anzeigen Gehaltsabrechnung
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Wählen Sie Änderungsbetrag Konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Bitte setzen Sie wiederkehrende nach dem Speichern
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Wählen Sie Änderungsbetrag Konto
 DocType: Purchase Invoice,Price List Currency,Preislistenwährung
 DocType: Naming Series,User must always select,Benutzer muss immer auswählen
 DocType: Stock Settings,Allow Negative Stock,Negativen Lagerbestand zulassen
@@ -2239,7 +2244,7 @@
 DocType: Budget Account,Budget Account,Budget Konto
 DocType: Quality Inspection,Verified By,Geprüft durch
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Die Standardwährung der Firma kann nicht geändern werden, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
-DocType: Grade Interval,Grade Description,Grade Beschreibung
+DocType: Grading Scale Interval,Grade Description,Grade Beschreibung
 DocType: Stock Entry,Purchase Receipt No,Kaufbeleg Nr.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Anzahlung
 DocType: Process Payroll,Create Salary Slip,Gehaltsabrechnung erstellen
@@ -2277,7 +2282,7 @@
 DocType: Upload Attendance,Attendance To Date,Anwesenheit bis Datum
 DocType: Warranty Claim,Raised By,Gemeldet von
 DocType: Payment Gateway Account,Payment Account,Zahlungskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Bitte Firma angeben um fortzufahren
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoveränderung der Forderungen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Ausgleich für
 DocType: Offer Letter,Accepted,Genehmigt
@@ -2286,12 +2291,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Zimmernummer
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ungültige Referenz {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kann nicht größer sein als die geplante Menge ({2}) im Fertigungsauftrag {3}
 DocType: Shipping Rule,Shipping Rule Label,Bezeichnung der Versandregel
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Rohmaterial kann nicht leer sein
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Schnellbuchung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Schnellbuchung
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2304,7 +2309,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Allgemeine Geschäftsbedingungen1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Der Name des Instituts, für die Sie setzen dieses System."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",Buchung wurde bis zu folgendem Zeitpunkt gesperrt. Bearbeiten oder ändern kann nur die Person in unten stehender Rolle.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bitte das Dokument vor dem Erstellen eines Wartungsplans abspeichern
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),"Hier aktivieren, um keine Bruchteile zuzulassen (für Nr.)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Die folgenden Fertigungsaufträge wurden erstellt:
@@ -2317,7 +2322,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,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 +189,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 ab von
+DocType: Task Depends On,Task Depends On,Vorgang hängt ab von
 DocType: Supplier Quotation,Opportunity,Chance
 ,Completed Production Orders,Abgeschlossene Fertigungsaufträge
 DocType: Operation,Default Workstation,Standard-Arbeitsplatz
@@ -2330,8 +2335,8 @@
 DocType: Student,Joining Date,Beitrittsdatum
 ,Employees working on a holiday,Die Mitarbeiter an einem Feiertag arbeiten
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Anwesend setzen
-DocType: Project,% Complete Method,% Abgeschlossen Methode
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
+DocType: Project,% Complete Method,% abgeschlossene Methode
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Startdatum der Wartung kann nicht vor dem Liefertermin für Seriennummer {0} liegen
 DocType: Production Order,Actual End Date,Tatsächliches Enddatum
 DocType: BOM,Operating Cost (Company Currency),Betriebskosten (Gesellschaft Währung)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2348,7 +2353,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Lassen Sie ohne Bezahlung nicht mit genehmigten Urlaubsantrag Aufzeichnungen überein
 DocType: Campaign,Campaign-.####,Kampagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nächste Schritte
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto schließen Gelegenheit nach 15 Tagen
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ende Jahr
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2405,7 +2410,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Erhaltene Menge
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Aufzeichnungen Erstellt - {0}
 DocType: Asset Category Account,Asset Category Account,Anlagekategorie Konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Es können nicht mehr Artikel {0} produziert werden, als die über Kundenaufträge bestellte Stückzahl {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lagerbuchung {0} wurde nicht übertragen
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Geldkonto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Weiter Kontakt Durch nicht als Lead E-Mail-Adresse identisch sein
@@ -2427,7 +2432,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Abwicklungsdatum nicht benannt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Beruf
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie Mitarbeiter-Naming-System in Human Resource&gt; HR-Einstellungen ein
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Zeile {0}: Startdatum muss vor dem Enddatum liegen
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Summe (Anzahl)
 DocType: Sales Invoice,This Document,Dieses Dokument
 DocType: Installation Note Item,Installed Qty,Installierte Anzahl
@@ -2443,20 +2449,20 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Einen Fall melden
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Versorgungsaufwendungen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Über 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nicht Konto {2} oder bereits abgestimmt gegen einen anderen Gutschein
 DocType: Buying Settings,Default Buying Price List,Standard-Einkaufspreisliste
 DocType: Process Payroll,Salary Slip Based on Timesheet,Gehaltsabrechnung Basierend auf Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Zahlungsart
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Bitte wählen Sie einen Batch für Item {0}. Es ist nicht möglich, eine einzelne Charge zu finden, die diese Anforderung erfüllt"
 DocType: Process Payroll,Select Employees,Mitarbeiter auswählen
 DocType: Opportunity,Potential Sales Deal,Möglicher Verkaufsabschluss
-DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenztag
+DocType: Payment Entry,Cheque/Reference Date,Scheck-/ Referenzdatum
 DocType: Purchase Invoice,Total Taxes and Charges,Gesamte Steuern und Gebühren
 DocType: Employee,Emergency Contact,Notfallkontakt
-DocType: Bank Reconciliation Detail,Payment Entry,Zahlung Eintrag
+DocType: Bank Reconciliation Detail,Payment Entry,Zahlung
 DocType: Item,Quality Parameters,Qualitätsparameter
 ,sales-browser,Umsatz-Browser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Hauptbuch
@@ -2467,7 +2473,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Allgemeines POS-Profil {0} bereits für Firma {1} angelegt
 DocType: Purchase Order,Ref SQ,Ref-SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Artikel/Stückliste in allen Stücklisten ersetzen
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Eingangsbeleg muss vorgelegt werden
 DocType: Purchase Invoice Item,Received Qty,Erhaltene Menge
 DocType: Stock Entry Detail,Serial No / Batch,Seriennummer / Charge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nicht bezahlt und nicht geliefert
@@ -2476,11 +2482,11 @@
 DocType: Delivery Note,DN-RET-,DN-Ret
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Keine Zeitblätter
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Urlaubstyp {0} kann nicht in die Zukunft übertragen werden
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Wartungsplan wird nicht für alle Elemente erzeugt. Bitte klicken Sie auf ""Zeitplan generieren"""
 ,To Produce,Zu produzieren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lohn-und Gehaltsabrechnung
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Machen Sie Benutzer
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Machen Sie Benutzer
 DocType: Packing Slip,Identification of the package for the delivery (for print),Kennzeichnung des Paketes für die Lieferung (für den Druck)
 DocType: Bin,Reserved Quantity,Reservierte Menge
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Bitte geben Sie eine gültige Email Adresse an
@@ -2492,15 +2498,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Deaktiviert Vorlage muss nicht Standard-Vorlage sein
 DocType: Account,Income Account,Ertragskonto
 DocType: Payment Request,Amount in customer's currency,Betrag in Kundenwährung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Auslieferung
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Auslieferung
 DocType: Stock Reconciliation Item,Current Qty,Aktuelle Anzahl
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Siehe „Anteil der zu Grunde liegenden Materialien“ im Abschnitt Kalkulation
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorherige
 DocType: Appraisal Goal,Key Responsibility Area,Entscheidender Verantwortungsbereich
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
-DocType: Payment Entry,Total Allocated Amount,Insgesamt Geschätzter Betrag
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studenten Batches helfen Ihnen die Teilnahme, Einschätzungen und Gebühren für Studenten verfolgen"
+DocType: Payment Entry,Total Allocated Amount,Insgesamt geschätzter Betrag
 DocType: Item Reorder,Material Request Type,Materialanfragetyp
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journaleintrag für die Gehälter von {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Localstorage voll ist, nicht speichern"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref.
 DocType: Budget,Cost Center,Kostenstelle
@@ -2510,16 +2517,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ausblenden Kundensteuernummer aus Verkaufstransaktionen
 DocType: Upload Attendance,Upload HTML,HTML hochladen
 DocType: Employee,Relieving Date,Freistellungsdatum
-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.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Die Preisregel überschreibt die Preisliste. Bitte einen Rabattsatz aufgrund bestimmter Kriterien definieren.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kann nur über Lagerbuchung / Lieferschein / Kaufbeleg geändert werden
 DocType: Employee Education,Class / Percentage,Klasse / Anteil
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Leiter Marketing und Vertrieb
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Einkommensteuer
-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.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Lieferantenauftrag etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Wenn für ""Preis"" eine Preisregel ausgewählt wurde, wird die Preisliste überschrieben. Der Preis aus der Preisregel ist der endgültige Preis, es sollte also kein weiterer Rabatt gewährt werden. Daher wird er in Transaktionen wie Kundenauftrag, Lieferantenauftrag etc., vorrangig aus dem Feld ""Preis"" gezogen, und dann erst aus dem Feld ""Preisliste""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Leads nach Branchentyp nachverfolgen
 DocType: Item Supplier,Item Supplier,Artikellieferant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Bitte einen Wert für {0} Angebot an {1} auswählen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Alle Adressen
 DocType: Company,Stock Settings,Lager-Einstellungen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2527,8 +2534,9 @@
 DocType: Task,% Progress,% Fortschritt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Gewinn / Verlust aus der Veräußerung von Vermögenswerten
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Wird eine E-Mail über das Ereignis senden an Mitarbeiter mit dem Status 'Offen'
-DocType: Task,Depends on Tasks,Hängt von Aufgaben
+DocType: Task,Depends on Tasks,Abhängig von Vorgang
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Baumstruktur der Kundengruppen verwalten
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Anhänge können ohne Erlaubnis des Einkaufswagens angezeigt werden
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Neuer Kostenstellenname
 DocType: Leave Control Panel,Leave Control Panel,Urlaubsverwaltung
@@ -2541,11 +2549,10 @@
 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
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Lieferant&gt; Lieferanten Typ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Kein Gehaltszettel gefunden zwischen {0} und {1}
 ,Pending SO Items For Purchase Request,Ausstehende Artikel aus Kundenaufträgen für Lieferantenanfrage
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Admissions
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ist deaktiviert
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ist deaktiviert
 DocType: Supplier,Billing Currency,Abrechnungswährung
 DocType: Sales Invoice,SINV-RET-,SINV-Ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Besonders groß
@@ -2562,9 +2569,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,auf Webseite vorgestelltes Produkt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Bewertungsgruppen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Neuer Lagername
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Insgesamt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Insgesamt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Bitte bei ""Besuche erforderlich"" NEIN angeben"
 DocType: Stock Settings,Default Valuation Method,Standard-Bewertungsmethode
 DocType: Vehicle Log,Fuel Qty,Kraftstoff-Menge
 DocType: Production Order Operation,Planned Start Time,Geplante Startzeit
@@ -2580,7 +2587,7 @@
 DocType: Price List,Price List Master,Preislisten-Vorlagen
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkaufstransaktionen können für mehrere verschiedene ""Vertriebsmitarbeiter"" markiert werden, so dass Ziele festgelegt und überwacht werden können."
 ,S.O. No.,Nummer der Lieferantenbestellung
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Bitte Kunden aus Lead {0} erstellen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lassen Sie nur Anwendungen mit dem Status &quot;Approved&quot; und &quot;Abgelehnt&quot; eingereicht werden können
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Studentengruppenname ist obligatorisch in Zeile {0}
@@ -2623,7 +2630,7 @@
 DocType: Project,Copied From,Kopiert von
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Name Fehler: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} kann nicht mit {2} {3} in Zusammenhang gebracht werden
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} kann nicht mit {2} {3} in Zusammenhang gebracht werden
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,"""Anwesenheit von Mitarbeiter"" {0} ist bereits markiert"
 DocType: Packing Slip,If more than one package of the same type (for print),Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt
 ,Salary Register,Gehalt Register
@@ -2642,7 +2649,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Für den Einkaufswagen verwenden
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Wert {0} für Attribut {1} existiert nicht in der Liste der gültigen Artikelattributwerte für den Posten {2}
 DocType: BOM Item,Scrap %,Ausschuss %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",Die Kosten werden gemäß Ihrer Wahl anteilig verteilt basierend auf Artikelmenge oder -preis
 DocType: Maintenance Visit,Purposes,Zwecke
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen.
@@ -2663,16 +2670,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Baumstruktur der Regionen verwalten
 DocType: Journal Entry Account,Sales Invoice,Ausgangsrechnung
 DocType: Journal Entry Account,Party Balance,Gruppen-Saldo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Bitte ""Rabatt anwenden auf"" auswählen"
 DocType: Company,Default Receivable Account,Standard-Forderungskonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Bankbuchung für die Gesamtvergütung, die gemäß der oben ausgewählten Kriterien bezahlt wurde, erstellen"
 DocType: Stock Entry,Material Transfer for Manufacture,Materialübertrag für Herstellung
-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.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Der Rabatt-Prozentsatz kann entweder auf eine Preisliste oder auf alle Preislisten angewandt werden.
 DocType: Purchase Invoice,Half-yearly,Halbjährlich
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Lagerbuchung
 DocType: Vehicle Service,Engine Oil,Motoröl
 DocType: Sales Invoice,Sales Team1,Verkaufsteam1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} existiert nicht
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikel {0} existiert nicht
 DocType: Sales Invoice,Customer Address,Kundenadresse
 DocType: Employee Loan,Loan Details,Loan-Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Abgeschlossen Menge muss größer als Null sein.
@@ -2680,24 +2687,24 @@
 DocType: Account,Root Type,Root-Typ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Zeile # {0}: Es kann nicht mehr als {1} für Artikel {2} zurückgegeben werden
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Linie
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Linie
 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
 DocType: Cheque Print Template,Primary Settings,Primäre Einstellungen
 DocType: Purchase Invoice,Select Supplier Address,Lieferantenadresse auswählen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Mitarbeiter hinzufügen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Mitarbeiter hinzufügen
 DocType: Purchase Invoice Item,Quality Inspection,Qualitätsprüfung
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Besonders klein
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} ist gesperrt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juristische Person/Niederlassung mit einem separaten Kontenplan, die zum Unternehmen gehört."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Lebensmittel, Getränke und Tabak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Zahlung kann nur zu einer noch nicht abgerechneten {0} erstellt werden
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,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 +127,Commission rate cannot be greater than 100,Provisionssatz kann nicht größer als 100 sein
 DocType: Stock Entry,Subcontract,Zulieferer
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Bitte geben Sie zuerst {0} ein
@@ -2736,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lagerhäuser mit bestehenden Transaktion nicht zu einer Gruppe umgewandelt werden.
 DocType: Assessment Result Tool,Result HTML,Ergebnis HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Läuft aus am
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,In Students
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,In Students
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Bitte {0} auswählen
 DocType: C-Form,C-Form No,Kontakt-Formular-Nr.
 DocType: BOM,Exploded_items,Aufgelöste Artikel
@@ -2778,7 +2785,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Menge
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Namen der Kampagne eingeben, wenn der Ursprung der Anfrage eine Kampagne ist"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Zeitungsverleger
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Geschäftsjahr auswählen
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Geschäftsjahr auswählen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Meldebestand
 DocType: Company,Chart Of Accounts Template,Kontenvorlage
 DocType: Attendance,Attendance Date,Anwesenheitsdatum
@@ -2793,14 +2800,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Doppelter Eintrag/doppelte Buchung
 DocType: Program Enrollment Tool,Get Students,Holen Studenten
 DocType: Serial No,Under Warranty,Innerhalb der Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Fehler]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Fehler]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"""In Worten"" wird sichtbar, sobald Sie den Kundenauftrag speichern."
 ,Employee Birthday,Mitarbeiter-Geburtstag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studenten Batch Teilnahme Werkzeug
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Grenze überschritten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Risikokapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Ein akademischer Begriff mit diesem &quot;Academic Year &#39;{0} und&quot; Bezeichnen Namen&#39; {1} ist bereits vorhanden. Bitte ändern Sie diese Einträge und versuchen Sie es erneut.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Da bestehende Transaktionen gegen Artikel sind {0}, können Sie nicht den Wert ändern {1}"
 DocType: UOM,Must be Whole Number,Muss eine ganze Zahl sein
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Neue Urlaubszuordnung (in Tagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Seriennummer {0} existiert nicht
@@ -2820,7 +2827,7 @@
 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 +49,Period Closing Entry,Periodenabschlussbuchung
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostenstelle mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Menge {0} {1} {2} {3}
 DocType: Account,Depreciation,Abschreibung
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Lieferant(en)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Angestellt-Anwesenheits-Tool
@@ -2843,7 +2850,7 @@
 DocType: Supplier,Last Day of the Next Month,Letzter Tag des nächsten Monats
 DocType: Support Settings,Auto close Issue after 7 days,Auto schließen Ausgabe nach 7 Tagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Da der Resturlaub bereits in den zukünftigen Datensatz für Urlaube {1} übertragen wurde, kann der Urlaub nicht vor {0} zugeteilt werden."
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Hinweis: Stichtag übersteigt das vereinbarte Zahlungsziel um {0} Tag(e)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studienbewerber
 DocType: Asset Category Account,Accumulated Depreciation Account,Abschreibungskonto
 DocType: Stock Settings,Freeze Stock Entries,Lagerbuchungen sperren
@@ -2854,7 +2861,7 @@
 ,Stock Analytics,Bestandsanalyse
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Der Betrieb kann nicht leer sein
 DocType: Maintenance Visit Purpose,Against Document Detail No,Zu Dokumentendetail Nr.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party-Typ ist Pflicht
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party-Typ ist Pflicht
 DocType: Quality Inspection,Outgoing,Ausgang
 DocType: Material Request,Requested For,Angefordert für
 DocType: Quotation Item,Against Doctype,Zu DocType
@@ -2871,10 +2878,10 @@
 DocType: Asset,Item Code,Artikelabkürzung
 DocType: Production Planning Tool,Create Production Orders,Fertigungsaufträge erstellen
 DocType: Serial No,Warranty / AMC Details,Details der Garantie / des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wählen Sie die Schüler manuell für die aktivitätsbasierte Gruppe aus
 DocType: Journal Entry,User Remark,Benutzerbemerkung
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Gezahlten Betrag kann nicht größer sein als die Gesamt negativ ausstehenden Betrag {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Interne Berufserfahrung des Mitarbeiters
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Schlußstand (Soll)
 DocType: Cheque Print Template,Cheque Size,Scheck Größe
@@ -2889,7 +2896,7 @@
 DocType: Production Planning Tool,Create Material Requests,Materialanfragen erstellen
 DocType: Employee Education,School/University,Schule/Universität
 DocType: Payment Request,Reference Details,Referenzdetails
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Erwartungswert nach der Ausmusterung muss kleiner sein als Bruttokaufbetrag
 DocType: Sales Invoice Item,Available Qty at Warehouse,Verfügbarer Lagerbestand
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Rechnungsbetrag
 DocType: Asset,Double Declining Balance,Doppelte degressive
@@ -2910,20 +2917,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zahlter Betrag kann nicht größer sein als Darlehensbetrag {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Lieferantenauftragsnummer ist für den Artikel {0} erforderlich
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Fertigungsauftrag nicht erstellt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Fertigungsauftrag nicht erstellt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Von-Datum"" muss nach ""Bis-Datum"" liegen"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kann nicht den Status als Student ändern {0} ist mit Studenten Anwendung verknüpft {1}
 DocType: Asset,Fully Depreciated,vollständig abgeschriebene
 ,Stock Projected Qty,Projizierter Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Customer {0} gehört nicht zum Projekt {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Teilnahme HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Angebote sind Offerten an einen Kunden zur Lieferung von Materialien bzw. zur Erbringung von Leistungen.
 DocType: Sales Order,Customer's Purchase Order,Kundenauftrag
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seriennummer und Chargen
 DocType: Warranty Claim,From Company,Von Firma
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Die Summe der Ergebnisse von Bewertungskriterien muss {0} sein.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Wert oder Menge
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Bitte setzen Sie Anzahl der Abschreibungen gebucht
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Wert oder Menge
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestellungen können nicht angehoben werden:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Einkaufsteuern und -abgaben
@@ -2935,7 +2942,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Alle Lagerhäuser
 DocType: Sales Partner,Retailer,Einzelhändler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Habenkonto muss ein Bilanzkonto sein
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Alle Lieferantentypen
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Lieferantentypen
 DocType: Global Defaults,Disable In Words,"""Betrag in Worten"" abschalten"
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Angebot {0} nicht vom Typ {1}
@@ -2944,6 +2951,7 @@
 DocType: Production Order,PRO-,PROFI-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Kontokorrentkredit-Konto
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gehaltsabrechnung erstellen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Zeile # {0}: Zugeordneter Betrag darf nicht größer als ausstehender Betrag sein.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Stückliste durchsuchen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Gedeckte Kredite
 DocType: Purchase Invoice,Edit Posting Date and Time,Bearbeiten Posting Datum und Uhrzeit
@@ -2983,7 +2991,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Aktualisierung von Transaktionen älter als {0} nicht erlaubt
 DocType: Purchase Invoice Item,PR Detail,PR-Detail
 DocType: Sales Order,Fully Billed,Voll berechnet
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Bitte setzen Sie Standard-Höhe unter Berücksichtigung der Mitarbeiter {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Barmittel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Auslieferungslager für Lagerartikel {0} erforderlich
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Das Bruttogewicht des Pakets. Normalerweise Nettogewicht + Verpackungsgweicht. (Für den Ausdruck)
@@ -2993,7 +3000,7 @@
 DocType: Student Group,Group Based On,Gruppe basiert auf
 DocType: Journal Entry,Bill Date,Rechnungsdatum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service-Item, Art, Häufigkeit und Kosten Betrag erforderlich"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Wenn es mehrere Preisregeln mit der höchsten Priorität gibt, werden folgende interne Prioritäten angewandt:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Haben Sie von allen Gehaltsabrechnung wollen Senden wirklich {0} {1}
 DocType: Cheque Print Template,Cheque Height,Scheck Höhe
 DocType: Supplier,Supplier Details,Lieferantendetails
@@ -3005,7 +3012,7 @@
 DocType: Vehicle Log,Invoice Ref,Rechnung Ref
 DocType: Purchase Order,Recurring Order,Wiederkehrende Bestellung
 DocType: Company,Default Income Account,Standard-Ertragskonto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundengruppe / Kunde
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundengruppe / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Geschäftsjahre Gewinn / Verlust (Credit)
 DocType: Sales Invoice,Time Sheets,Zeitblätter
 DocType: Payment Gateway Account,Default Payment Request Message,Standard Payment Request Message
@@ -3025,10 +3032,10 @@
 DocType: Notification Control,Quotation Message,Angebotsmitteilung
 DocType: Employee Loan,Employee Loan Application,Mitarbeiter Darlehensanträge
 DocType: Issue,Opening Date,Eröffnungsdatum
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Die Teilnahme wurde erfolgreich markiert.
 DocType: Journal Entry,Remark,Bemerkung
 DocType: Purchase Receipt Item,Rate and Amount,Preis und Menge
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Account für {0} muss {1} sein
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Account für {0} muss {1} sein
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blätter und Ferien
 DocType: School Settings,Current Academic Term,Aktueller akademischer Begriff
 DocType: Sales Order,Not Billed,Nicht abgerechnet
@@ -3050,7 +3057,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Nummernkreis für Angebote
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Ein Artikel mit dem gleichen Namen existiert bereits ({0}). Bitte den Namen der Artikelgruppe ändern oder den Artikel umbenennen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Bitte wählen Sie Kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Bitte wählen Sie Kunde
 DocType: C-Form,I,ich
 DocType: Company,Asset Depreciation Cost Center,Asset-Abschreibungen Kostenstellen
 DocType: Sales Order Item,Sales Order Date,Kundenauftrags-Datum
@@ -3069,20 +3076,20 @@
 DocType: Vehicle,Insurance Details,Versicherungsdaten
 DocType: Account,Payable,Zahlbar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Bitte geben Sie Laufzeiten
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Schuldnern ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Schuldnern ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Neue Kunden
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Rohgewinn %
 DocType: Appraisal Goal,Weightage (%),Gewichtung (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Abwicklungsdatum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttokaufbetrag ist erforderlich
 DocType: Lead,Address Desc,Adresszusatz
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partei ist obligatorisch
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partei ist obligatorisch
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Thema Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mindestens ein Eintrag aus Vertrieb oder Einkauf muss ausgewählt werden
-DocType: Grading Structure,Grade Intervals,Grade Intervalle
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wählen Sie die Art Ihres Unternehmens.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Zeile # {0}: Eintrag in Referenzen verdoppeln {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Ort, an dem Arbeitsgänge der Fertigung ablaufen."
 DocType: Asset Movement,Source Warehouse,Ausgangslager
 DocType: Installation Note,Installation Date,Datum der Installation
@@ -3119,7 +3126,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefköpfe für Druckvorlagen
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Bezeichnungen für Druckvorlagen, z. B. Proforma-Rechnung"
 DocType: Student Guardian,Student Guardian,Studenten Wächter
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,"Bewertungsart Gebühren kann nicht als ""inklusive"" markiert werden"
 DocType: POS Profile,Update Stock,Lagerbestand aktualisieren
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Unterschiedliche Maßeinheiten für Artikel führen zu falschen Werten für das (Gesamt-)Nettogewicht. Es muss sicher gestellt sein, dass das Nettogewicht jedes einzelnen Artikels in der gleichen Maßeinheit angegeben ist."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stückpreis
@@ -3146,7 +3153,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange-Gewinn / Verlustrechnung
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Mitarbeiter und Teilnahme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Zweck muss einer von diesen sein: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Formular ausfüllen und speichern
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Tatsächliche Menge auf Lager
@@ -3161,7 +3168,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Nachbestellmenge
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuelle Stellenangebote
 DocType: Company,Stock Adjustment Account,Bestandskorrektur-Konto
-DocType: Journal Entry,Write Off,Abschreiben
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abschreiben
 DocType: Timesheet Detail,Operation ID,Arbeitsgang-ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systembenutzer-ID (Anmeldung). Wenn gesetzt, wird sie standardmäßig für alle HR-Formulare verwendet."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Von {1}
@@ -3172,26 +3179,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Lieferant liefert an Kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ist ausverkauft
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nächster Termin muss größer sein als Datum der Veröffentlichung
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Steuerverteilung anzeigen
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Steuerverteilung anzeigen
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Fälligkeits-/Stichdatum kann nicht nach {0} liegen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Daten-Import und -Export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Auf Einträge vorhanden sind gegen Lager {0}, daher kann man nicht neu zuweisen oder ändern"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Keine Studenten gefunden
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Keine Studenten gefunden
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Rechnungsbuchungsdatum
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Verkaufen
 DocType: Sales Invoice,Rounded Total,Gerundete Gesamtsumme
 DocType: Product Bundle,List items that form the package.,"Die Artikel auflisten, die das Paket bilden."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prozentuale Aufteilung sollte gleich 100% sein
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Bitte wählen Sie Buchungsdatum vor dem Party-Auswahl
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Außerhalb des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Bitte wählen Sie Zitate
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Wartungsbesuch erstellen
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Bitte wählen Sie Zitate
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Anzahl der Abschreibungen gebucht kann nicht größer sein als Gesamtzahl der abschreibungen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Wartungsbesuch erstellen
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Bitte den Benutzer kontaktieren, der die Vertriebsleiter {0}-Rolle inne hat"
 DocType: Company,Default Cash Account,Standardbarkonto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Unternehmensstammdaten (nicht Kunde oder Lieferant)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dies basiert auf der Anwesenheit dieses Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Keine Studenten in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Weitere Elemente hinzufügen oder vollständiges Formular öffnen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Bitte ""voraussichtlichen Liefertermin"" eingeben"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Lieferscheine {0} müssen vor Löschung dieser Kundenaufträge storniert werden
@@ -3223,6 +3231,7 @@
 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: Warranty Claim,Item and Warranty Details,Einzelheiten Artikel und Garantie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Artikelgruppe&gt; Marke
 DocType: Sales Team,Contribution (%),Beitrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,"Wählen Sie das Programm aus, um Pflichtkurse zu erhalten."
@@ -3233,13 +3242,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,Benutzer hinzufügen
 DocType: POS Item Group,Item Group,Artikelgruppe
 DocType: Item,Safety Stock,Sicherheitsbestand
-apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fortschritt% für eine Aufgabe kann nicht mehr als 100 sein.
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,Fortschritt-% eines Vorgangs darf nicht größer 100 sein.
 DocType: Stock Reconciliation Item,Before reconciliation,Vor Ausgleich
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},An {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Steuern und Gebühren hinzugerechnet (Firmenwährung)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Artikelsteuer Zeile {0} muss ein Konto vom Typ ""Steuer"" oder ""Erträge"" oder ""Aufwendungen"" oder ""Besteuerbar"" haben"
 DocType: Sales Order,Partly Billed,Teilweise abgerechnet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Artikel {0} muss ein Posten des Anlagevermögens sein
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Artikel {0} muss ein Posten des Anlagevermögens sein
 DocType: Item,Default BOM,Standardstückliste
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3249,8 +3258,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fahrzeugbau
 DocType: Vehicle,Insurance Company,Versicherungsunternehmen
 DocType: Asset Category Account,Fixed Asset Account,Feste Asset-Konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Von Lieferschein
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Von Lieferschein
 DocType: Student,Student Email Address,Studenten E-Mail-Adresse
 DocType: Timesheet Detail,From Time,Von-Zeit
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Auf Lager:
@@ -3261,12 +3270,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Preislisten-Wechselkurs
 DocType: Purchase Invoice Item,Rate,Preis
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adresse Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adresse Name
 DocType: Stock Entry,From BOM,Von Stückliste
 DocType: Assessment Code,Assessment Code,Bewertungs-Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundeinkommen
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaktionen vor {0} werden gesperrt
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Bitte auf ""Zeitplan generieren"" klicken"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","z. B. Kg, Einheit, Nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenznr. ist zwingend erforderlich, wenn Referenz-Tag eingegeben wurde"
 DocType: Bank Reconciliation Detail,Payment Document,Zahlungsbeleg
@@ -3274,19 +3283,19 @@
 DocType: Salary Slip,Salary Structure,Gehaltsstruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Fluggesellschaft
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Material ausgeben
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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,Angebote
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Sie befinden sich im Offline-Modus. Aktualisieren ist nicht möglich, bis Sie wieder online sind."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Keine Studentengruppen erstellt.
 DocType: Purchase Invoice Item,Serial No,Seriennummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Monatliche Rückzahlungsbetrag kann nicht größer sein als Darlehensbetrag
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Bitte zuerst die Einzelheiten zur Wartung eingeben
 DocType: Purchase Invoice,Print Language,drucken Sprache
 DocType: Salary Slip,Total Working Hours,Gesamtarbeitszeit
 DocType: Stock Entry,Including items for sub assemblies,Einschließlich der Artikel für Unterbaugruppen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Geben Sie Wert muss positiv sein
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Geben Sie Wert muss positiv sein
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle Regionen
 DocType: Purchase Invoice,Items,Artikel
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student ist bereits eingetragen sind.
@@ -3305,16 +3314,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard-Maßeinheit für Variante '{0}' muss dieselbe wie in der Vorlage '{1}' sein
 DocType: Shipping Rule,Calculate Based On,Berechnen auf Grundlage von
 DocType: Delivery Note Item,From Warehouse,Ab Lager
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Keine Elemente mit Bill of Materials zu Herstellung
 DocType: Assessment Plan,Supervisor Name,Name des Vorgesetzten
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Einschreibung Kurs
-DocType: Grading Structure,Grading Structure,Grading Struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Bewertung und Summe
 DocType: Tax Rule,Shipping City,Zielstadt der Lieferung
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Mitteilungstext anpassen
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cashflow aus Geschäftstätigkeit
 DocType: Sales Invoice,Shipping Rule,Versandregel
@@ -3335,8 +3342,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,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
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Bitte zuerst ein Buchungsdatum auswählen
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Eröffnungsdatum sollte vor dem Abschlussdatum liegen
 DocType: Leave Control Panel,Carry Forward,Übertragen
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenstelle mit bestehenden Transaktionen kann nicht in Sachkonto umgewandelt werden
 DocType: Department,Days for which Holidays are blocked for this department.,"Tage, an denen eine Urlaubssperre für diese Abteilung gilt."
@@ -3348,7 +3355,7 @@
 DocType: Mode of Payment,General,Allgemein
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Briefkopf anhängen
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Letzte Kommunikation
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,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/accounts/doctype/purchase_invoice/purchase_invoice.js +347,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 +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zahlungen und Rechnungen abgleichen
@@ -3364,7 +3371,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gesamtsumme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Unterhaltung & Freizeit
 DocType: Quality Inspection,Item Serial No,Artikel-Seriennummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Erstellen Sie Mitarbeiterdaten
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Erstellen Sie Mitarbeiterdaten
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Summe Anwesend
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Buchhaltungsauszüge
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunde
@@ -3377,9 +3384,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Unbekannt
 DocType: Shipping Rule,Shipping Rule Conditions,Versandbedingungen
 DocType: BOM Replace Tool,The new BOM after replacement,Die neue Stückliste nach dem Austausch
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Verkaufsstelle
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Verkaufsstelle
 DocType: Payment Entry,Received Amount,erhaltenen Betrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Bitte richten Sie Mitarbeiter-Naming-System in Human Resource&gt; HR-Einstellungen ein
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Erstellen Sie für die volle Menge, ignorierend Menge bereits auf Bestellung"
 DocType: Account,Tax,Steuer
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nicht markiert
@@ -3390,9 +3396,9 @@
 DocType: C-Form,Invoices,Rechnungen
 DocType: Batch,Source Document Name,Quelldokumentname
 DocType: Job Opening,Job Title,Stellenbezeichnung
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Benutzer erstellen
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Benutzer erstellen
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Menge Herstellung muss größer als 0 sein.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besuchsbericht für Wartungsauftrag
 DocType: Stock Entry,Update Rate and Availability,Preis und Verfügbarkeit aktualisieren
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Zur bestellten Menge zusätzlich zulässiger Prozentsatz, der angenommen oder geliefert werden kann. Beispiel: Wenn 100 Einheiten bestellt wurden, und die erlaubte Spanne 10 % beträgt, dann können 110 Einheiten angenommen werden."
@@ -3401,28 +3407,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Aufwandskonto ist zwingend für Artikel {0}
 DocType: BOM,Website Description,Webseiten-Beschreibung
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoveränderung des Eigenkapitals
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, bereits vorhanden ist für {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Bitte stornieren Einkaufsrechnung {0} zuerst
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-Mail-Adresse muss eindeutig sein, bereits vorhanden ist für {0}"
 DocType: Serial No,AMC Expiry Date,Verfalldatum des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Eingang
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Eingang
 ,Sales Register,Übersicht über den Umsatz
 DocType: Daily Work Summary Settings Company,Send Emails At,Senden Sie E-Mails
 DocType: Quotation,Quotation Lost Reason,Grund für verlorenes Angebotes
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Wählen Sie Ihre Domain
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transaktion Referenznummer {0} vom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Es gibt nichts zu bearbeiten.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Noch keine Kunden!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Geldflussrechnung
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Darlehensbetrag darf nicht länger als maximale Kreditsumme {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lizenz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Bitte Abschreibungskonto eingeben
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Letztes Bestelldatum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} gehört nicht zu Firma {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Seriennummern in Zeile {0} stimmt nicht mit der Lieferschein überein
 DocType: Student,Guardian Details,Wächter-Details
 DocType: C-Form,C-Form,Kontakt-Formular
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Teilnahme für mehrere Mitarbeiter
@@ -3438,7 +3446,7 @@
 DocType: Appraisal Template,Appraisal Template Title,Bezeichnung der Bewertungsvorlage
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},"Mitarbeiter Von Datum {0} für {1} kann nicht sein, bevor Mitarbeiter-Beitritt Datum {2}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,Werbung
-DocType: Payment Entry,Account Paid To,Konto zu über
+DocType: Payment Entry,Account Paid To,Eingangskonto
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Übergeordneter Artikel {0} darf kein Lagerartikel sein
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Alle Produkte oder Dienstleistungen
 DocType: Expense Claim,More Details,Weitere Details
@@ -3447,20 +3455,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Konto in Zeile {0} muss vom Typ ""Anlagevermögen"" sein"
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ausgabe-Menge
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regeln zum Berechnen des Versandbetrags für einen Verkauf
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie ist zwingend erforderlich
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie ist zwingend erforderlich
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanzdienstleistungen
 DocType: Student Sibling,Student ID,Studenten ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Arten von Aktivitäten für Time Logs
 DocType: Tax Rule,Sales,Vertrieb
 DocType: Stock Entry Detail,Basic Amount,Grundbetrag
 DocType: Training Event,Exam,Prüfung
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Angabe des Lagers ist für den Lagerartikel {0} erforderlich
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Haben
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Haben
 DocType: Tax Rule,Billing State,Verwaltungsbezirk laut Rechnungsadresse
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Übertragung
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nicht mit Geschäftspartner-Konto verknüpft {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nicht mit Geschäftspartner-Konto verknüpft {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)
 DocType: Authorization Rule,Applicable To (Employee),Anwenden auf (Mitarbeiter)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Fälligkeitsdatum wird zwingend vorausgesetzt
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Schrittweite für Attribut {0} kann nicht 0 sein
@@ -3471,26 +3479,26 @@
 ,Inactive Customers,Inaktive Kunden
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kaufbelege
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Wie wird die Preisregel angewandt?
 DocType: Stock Entry,Delivery Note No,Lieferschein-Nummer
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Wenn diese Option aktiviert, Kauf nur Anfragen Material für die endgültige Rohstoffe werden in den Materialwünsche einbezogen werden. Andernfalls werden Anfragen Das Material für übergeordneten Elemente erstellt werden"
 DocType: Cheque Print Template,Message to show,Nachricht anzeigen
 DocType: Company,Retail,Einzelhandel
 DocType: Attendance,Absent,Abwesend
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produkt-Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Produkt-Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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: Timesheet,TS-,TS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Entweder Debit- oder Kreditbetrag ist erforderlich für {2}
 DocType: GL Entry,Remarks,Bemerkungen
-DocType: Payment Entry,Account Paid From,Konto einzuzahlen Aus
+DocType: Payment Entry,Account Paid From,Ausgangskonto
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Rohmaterial-Artikelnummer
 DocType: Journal Entry,Write Off Based On,Abschreibung basierend auf
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,neue Verkaufsanfrage
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,neue Verkaufsanfrage
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Drucken und Papierwaren
 DocType: Stock Settings,Show Barcode Field,Anzeigen Barcode-Feld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Senden Lieferant von E-Mails
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Senden Lieferant von E-Mails
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gehalt bereits verarbeitet für den Zeitraum zwischen {0} und {1}, freiBewerbungsFrist kann nicht zwischen diesem Datum liegen."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installationsdatensatz für eine Seriennummer
 DocType: Guardian Interest,Guardian Interest,Wächter Interesse
@@ -3502,6 +3510,7 @@
 DocType: Offer Letter,Awaiting Response,Warte auf Antwort
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Über
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ungültige Attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Erwähnen Sie, wenn nicht standardmäßig zahlbares Konto"
 DocType: Salary Slip,Earning & Deduction,Einkünfte & Abzüge
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Bewertung ist nicht erlaubt
@@ -3517,10 +3526,9 @@
 DocType: Production Order Item,Production Order Item,Produktion Artikel bestellen
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kein Datensatz gefunden
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kosten der Verschrottet Vermögens
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Partiell ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}
 DocType: Vehicle,Policy No,Politik keine
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Artikel aus dem Produkt-Bundle übernehmen
 DocType: Asset,Straight Line,Gerade Linie
 DocType: Project User,Project User,Projektarbeit Benutzer
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Teilt
@@ -3535,7 +3543,7 @@
 DocType: Program Enrollment Tool,Get Students From,Holen Studenten aus
 DocType: Hub Settings,Seller Country,Land des Verkäufers
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Veröffentlichen Sie Artikel auf der Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppieren Sie Ihre Schüler in den Reihen
 DocType: Authorization Rule,Authorization Rule,Autorisierungsregel
 DocType: Sales Invoice,Terms and Conditions Details,Allgemeine Geschäftsbedingungen Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Technische Daten
@@ -3587,14 +3595,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Scheckdatum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Über-Konto {1} gehört nicht zur Firma: {2}
 DocType: Program Enrollment Tool,Student Applicants,Studienbewerber
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Alle Transaktionen dieser Firma wurden erfolgreich gelöscht!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Enrollment Datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probezeit
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Gehaltskomponenten
 DocType: Program Enrollment Tool,New Academic Year,Neues Studienjahr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Gutschrift
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Gutschrift
 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 +28,Total Paid Amount,Summe gezahlte Beträge
 DocType: Production Order Item,Transferred Qty,Übergebene Menge
@@ -3614,7 +3622,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Grund für Beurlaubung, wie Erholung, krank usw."
 DocType: Email Digest,Send regular summary reports via Email.,Regelmäßig zusammenfassende Berichte per E-Mail senden.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Bitte setzen Sie Standardkonto in Kostenabrechnung Typ {0}
 DocType: Assessment Result,Student Name,Name des Studenten
 DocType: Brand,Item Manager,Artikel-Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll Kreditoren
@@ -3626,7 +3634,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,Benutzer {0} existiert nicht
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,Rohmaterial kann nicht dasselbe sein wie der Hauptartikel
 DocType: Item Attribute Value,Abbreviation,Abkürzung
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,Zahlung Eintrag existiert bereits
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,Zahlung existiert bereits
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,Keine Berechtigung da {0} die Höchstgrenzen überschreitet
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Stammdaten zur Gehaltsvorlage
 DocType: Leave Type,Max Days Leave Allowed,Maximal zulässige Urlaubstage
@@ -3634,7 +3642,8 @@
 DocType: Purchase Invoice,Taxes and Charges Added,Steuern und Gebühren hinzugefügt
 ,Sales Funnel,Verkaufstrichter
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abkürzung ist zwingend erforderlich
-DocType: Project,Task Progress,Aufgabenfortschritt
+DocType: Project,Task Progress,Vorgangsentwicklung
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Einkaufswagen
 ,Qty to Transfer,Zu versendende Menge
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Angebote an Leads oder Kunden
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle darf gesperrten Bestand bearbeiten
@@ -3662,12 +3671,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelbezogene Steuer-Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Abkürzung
 ,Item-wise Price List Rate,Artikelbezogene Preisliste
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Lieferantenangebot
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Lieferantenangebot
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""In Worten"" wird sichtbar, sobald Sie das Angebot speichern."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Menge ({0}) kann kein Bruch in Zeile {1} sein
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Sammeln Gebühren
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} wird bereits für Artikel {1} verwendet
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Regeln für das Hinzufügen von Versandkosten
 DocType: Item,Opening Stock,Anfangsbestand
@@ -3684,8 +3693,8 @@
 Updated via 'Time Log'","""In Minuten"" über 'Zeitprotokoll' aktualisiert"
 DocType: Customer,From Lead,Von Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Für die Produktion freigegebene Bestellungen
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Geschäftsjahr auswählen ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Geschäftsjahr auswählen ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 DocType: Program Enrollment Tool,Enroll Students,einschreiben Studenten
 DocType: Hub Settings,Name Token,Kürzel benennen
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard-Vertrieb
@@ -3696,7 +3705,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} zu Verkaufsrechnung {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektname
-DocType: Supplier,Mention if non-standard receivable account,"Vermerken, wenn es sich um kein Standard-Forderungskonto handelt"
+DocType: Customer,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: Production Order,Required Items,Erforderliche Elemente
 DocType: Stock Ledger Entry,Stock Value Difference,Lagerwert-Differenz
@@ -3717,7 +3726,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bestände älter als [Tage] sperren
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Vermögens ist obligatorisch für Anlage Kauf / Verkauf
-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.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Wenn zwei oder mehrere Preisregeln basierend auf den oben genannten Bedingungen gefunden werden, wird eine Vorrangregelung angewandt. Priorität ist eine Zahl zwischen 0 und 20, wobei der Standardwert Null (leer) ist. Die höhere Zahl hat  Vorrang, wenn es mehrere Preisregeln zu den gleichen Bedingungen gibt."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Geschäftsjahr: {0} existiert nicht
 DocType: Currency Exchange,To Currency,In Währung
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Zulassen, dass die folgenden Benutzer Urlaubsanträge für Blöcke von Tagen genehmigen können."
@@ -3742,7 +3751,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Diesen Fertigungsauftrag zur Weiterverarbeitung buchen.
-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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Um Preisregeln in einer bestimmten Transaktion nicht zu verwenden, sollten alle geltenden Preisregeln deaktiviert sein."
 DocType: Assessment Group,Parent Assessment Group,Eltern Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Arbeitsplätze
 ,Sales Order Trends,Trendanalyse Kundenaufträge
@@ -3753,7 +3762,7 @@
 DocType: Stock Entry Detail,Additional Cost,Zusätzliche Kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Enddatum des Geschäftsjahres
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Wenn nach Beleg gruppiert wurde, kann nicht auf Grundlage von Belegen gefiltert werden."
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Lieferantenangebot erstellen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Lieferantenangebot erstellen
 DocType: Quality Inspection,Incoming,Eingehend
 DocType: BOM,Materials Required (Exploded),Benötigte Materialien (erweitert)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Benutzer, außer Ihnen, zu Ihrer Firma hinzufügen"
@@ -3781,6 +3790,7 @@
 DocType: Employee,History In Company,Historie im Unternehmen
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter
 DocType: Stock Ledger Entry,Stock Ledger Entry,Buchung im Lagerbuch
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundengruppe&gt; Territorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Das gleiche Einzelteil wurde mehrfach eingegeben
 DocType: Department,Leave Block List,Urlaubssperrenliste
 DocType: Sales Invoice,Tax ID,Steuer ID
@@ -3790,7 +3800,7 @@
 DocType: Customer,Sales Partner and Commission,Vertriebspartner und Verprovisionierung
 DocType: Employee Loan,Rate of Interest (%) / Year,Zinssatz (%) / Jahr
 ,Project Quantity,Projekt Menge
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
 DocType: Opportunity,To Discuss,Infos zur Diskussion
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} Einheiten von {1} benötigt in {2} zum Abschluss dieser Transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Zinssatz (%) Jahres
@@ -3805,7 +3815,7 @@
 DocType: Purchase Invoice,Return,Zurück
 DocType: Production Order Operation,Production Order Operation,Arbeitsgang im Fertigungsauftrag
 DocType: Pricing Rule,Disable,Deaktivieren
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,"Modus der Zahlung ist erforderlich, um eine Zahlung zu leisten"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,"Modus der Zahlung ist erforderlich, um eine Zahlung zu leisten"
 DocType: Project Task,Pending Review,Wartet auf Überprüfung
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset-{0} kann nicht verschrottet werden, als es ohnehin schon ist {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Gesamtbetrag der Aufwandsabrechnung (über Aufwandsabrechnung)
@@ -3813,11 +3823,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Abwesend setzen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Währung der BOM # {1} sollte auf die gewählte Währung gleich {2}
 DocType: Journal Entry Account,Exchange Rate,Wechselkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Kundenauftrag {0} wurde nicht übertragen
 DocType: Homepage,Tag Line,Tag-Linie
 DocType: Fee Component,Fee Component,Fee-Komponente
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flottenmanagement
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Elemente hinzufügen aus
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Elemente hinzufügen aus
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Übergeordnetes Konto {1} gehört nicht zu Firma {2}
 DocType: Cheque Print Template,Regular,Regulär
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Insgesamt weightage aller Bewertungskriterien muss 100% betragen
@@ -3830,7 +3840,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} existiert nicht
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Für ERPNext Hub anmelden
 DocType: Monthly Distribution,Monthly Distribution Percentages,Prozentuale Aufteilungen der monatsweisen Verteilung
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Der ausgewählte Artikel kann keine Charge haben
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Bewertungsrate nicht für den Artikel {0} gefunden, die die Buchungen zu tun erforderlich ist {1} {2}. Wenn das Element als ein Beispielartikel in der Abwicklung von {1}, bitte erwähnen, dass in der {1} Artikel Tisch. Andernfalls erstellen Sie bitte einen eingehenden Aktien-Transaktion für das Element oder Erwähnung Bewertungsrate in der Elementdatensatz, und dann versuchen, submiting / Cancelling diesen Eintrag"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dieser Lieferscheinmenge geliefert
 DocType: Project,Customer Details,Kundendaten
@@ -3839,15 +3849,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,URL-Parameter für Empfängernummern eingeben
 DocType: Payment Entry,Paid Amount,Gezahlter Betrag
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Verfügbarer Bestand für Verpackungsartikel
 DocType: Item Variant,Item Variant,Artikelvariante
 DocType: Assessment Result Tool,Assessment Result Tool,Bewertungsergebnis-Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Übermittelt Aufträge können nicht gelöscht werden
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Qualitätsmanagement
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Artikel {0} wurde deaktiviert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Artikel {0} wurde deaktiviert
 DocType: Employee Loan,Repay Fixed Amount per Period,Repay fixen Betrag pro Periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Bitte die Menge für Artikel {0} eingeben
 DocType: Employee External Work History,Employee External Work History,Externe Berufserfahrung des Mitarbeiters
@@ -3873,7 +3883,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Studenten E-Mail-ID
 DocType: Employee,Notice (days),Meldung(s)(-Tage)
 DocType: Tax Rule,Sales Tax Template,Umsatzsteuer-Vorlage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Wählen Sie Elemente, um die Rechnung zu speichern"
 DocType: Employee,Encashment Date,Inkassodatum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Bestandskorrektur
@@ -3896,7 +3906,7 @@
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Bitte Von-/Bis-Bereich genau angeben
 DocType: Serial No,Under AMC,Innerhalb des jährlichen Wartungsvertrags
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Artikelpreis wird unter Einbezug von Belegen über den Einstandspreis neu berechnet
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardeinstellungen für Vertriebstransaktionen
 DocType: Guardian,Guardian Of ,Wächter von
 DocType: Grading Scale Interval,Threshold,Schwelle
@@ -3906,6 +3916,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Lastschrift ausgestellt am
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} Anlagevermögen kann nicht übertragen werden
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Dieser Artikel ist eine Variante von {0} (Vorlage).
 DocType: Workstation,per hour,pro stunde
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Einkauf
 DocType: Announcement,Announcement,Ankündigung
@@ -3921,8 +3932,8 @@
 DocType: Account,Receivable,Forderung
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Zeile #{0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits ein Lieferantenauftrag vorhanden ist"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rolle, welche Transaktionen, die das gesetzte Kreditlimit überschreiten, übertragen darf."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Wählen Sie die Elemente Herstellung
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Stammdaten-Synchronisierung, kann es einige Zeit dauern,"
 DocType: Item,Material Issue,Materialentnahme
 DocType: Hub Settings,Seller Description,Beschreibung des Verkäufers
 DocType: Employee Education,Qualification,Qualifikation
@@ -3934,7 +3945,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestellt
 DocType: Salary Detail,Component,Komponente
 DocType: Assessment Criteria,Assessment Criteria Group,Beurteilungskriterien Gruppe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Kumulierte Abschreibungen Öffnungs muss kleiner sein als gleich {0}
 DocType: Warehouse,Warehouse Name,Lagername
 DocType: Naming Series,Select Transaction,Bitte Transaktionen auswählen
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben
@@ -3947,7 +3958,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Stornierung nicht möglich, weil übertragene Lagerbuchung {0} existiert"
 DocType: Employee Loan,Disbursement Date,Valuta-
 DocType: Vehicle,Vehicle,Fahrzeug
 DocType: Purchase Invoice,In Words,In Worten
@@ -3961,14 +3972,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Blei%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset-Abschreibungen und Balances
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Menge {0} {1} übertragen von {2} auf {3}
 DocType: Sales Invoice,Get Advances Received,Erhaltene Anzahlungen aufrufen
 DocType: Email Digest,Add/Remove Recipients,Empfänger hinzufügen/entfernen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaktion für angehaltenen Fertigungsauftrag {0} nicht erlaubt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Um dieses Geschäftsjahr als Standard festzulegen, auf ""Als Standard festlegen"" anklicken"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Beitreten
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Engpassmenge
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikelvariante {0} mit denselben Attributen existiert
 DocType: Employee Loan,Repay from Salary,Repay von Gehalts
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Anfordern Zahlung gegen {0} {1} für Menge {2}
@@ -3986,7 +3997,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Bewertungsergebnis Details
 DocType: Employee Education,Employee Education,Mitarbeiterschulung
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Wird gebraucht, um Artikeldetails abzurufen"
 DocType: Salary Slip,Net Pay,Nettolohn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Seriennummer {0} bereits erhalten
@@ -3995,7 +4006,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Lager {0} ist nicht auf ein Konto verknüpft, bitte erstellen / verknüpfen die entsprechenden (Aktiva) Konto für das Lager."
 DocType: Purchase Invoice,Recurring Id,Wiederkehrende ID
 DocType: Customer,Sales Team Details,Verkaufsteamdetails
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Dauerhaft löschen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Dauerhaft löschen?
 DocType: Expense Claim,Total Claimed Amount,Gesamtforderung
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mögliche Opportunität für den Vertrieb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ungültige(r) {0}
@@ -4006,13 +4017,14 @@
 DocType: Warehouse,PIN,STIFT
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Richten Sie Ihre Schule in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base-Änderungsbetrag (Gesellschaft Währung)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Keine Buchungen für die folgenden Lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Speichern Sie das Dokument zuerst.
 DocType: Account,Chargeable,Gebührenpflichtig
 DocType: Company,Change Abbreviation,Abkürzung ändern
 DocType: Expense Claim Detail,Expense Date,Datum der Aufwendung
 DocType: Item,Max Discount (%),Maximaler Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Letzter Bestellbetrag
+DocType: Task,Is Milestone,Ist Milestone
 DocType: Daily Work Summary,Email Sent To,Email an gesendet
 DocType: Budget,Warn,Warnen
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sonstige wichtige Anmerkungen, die in die Datensätze aufgenommen werden sollten."
@@ -4033,7 +4045,7 @@
 DocType: Item Attribute Value,Attribute Value,Attributwert
 ,Itemwise Recommended Reorder Level,Empfohlener artikelbezogener Meldebestand
 DocType: Salary Detail,Salary Detail,Gehalt Details
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Bitte zuerst {0} auswählen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Bitte zuerst {0} auswählen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Charge {0} von Artikel {1} ist abgelaufen.
 DocType: Sales Invoice,Commission,Provision
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Zeitblatt für die Fertigung.
@@ -4045,41 +4057,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Lagerbestände sperren, wenn älter als"" sollte kleiner sein als %d Tage."
 DocType: Tax Rule,Purchase Tax Template,Umsatzsteuer-Vorlage
 ,Project wise Stock Tracking,Projektbezogene Lagerbestandsverfolgung
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Wartungsplan {0} gegen {0} zu
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tatsächliche Anzahl (am Ursprung/Ziel)
 DocType: Item Customer Detail,Ref Code,Ref-Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Mitarbeiterdatensätze
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Bitte setzen Sie Next Abschreibungen Datum
 DocType: HR Settings,Payroll Settings,Einstellungen zur Gehaltsabrechnung
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Nicht verknüpfte Rechnungen und Zahlungen verknüpfen
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Bestellung aufgeben
 DocType: Email Digest,New Purchase Orders,Neue Bestellungen an Lieferanten
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kann keine übergeordnete Kostenstelle haben
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Marke auswählen ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Marke auswählen ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kumulierte Abschreibungen auf
 DocType: Sales Invoice,C-Form Applicable,Anwenden auf Kontakt-Formular
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Betriebszeit muss für die Operation {0} größer als 0 sein
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Lager ist erforderlich
 DocType: Supplier,Address and Contacts,Adresse und Kontaktinformationen
 DocType: UOM Conversion Detail,UOM Conversion Detail,Maßeinheit-Umrechnungs-Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Webfreundlich halten: 900px (breit) zu 100px (hoch)
 DocType: Program,Program Abbreviation,Programm Abkürzung
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ein Fertigungsauftrag kann nicht zu einer Artikel-Vorlage gemacht werden
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten werden im Kaufbeleg für jede Position aktualisiert
 DocType: Warranty Claim,Resolved By,Entschieden von
 DocType: Bank Guarantee,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Urlaube für einen Zeitraum zuordnen
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Schecks und Kautionen fälschlicherweise gelöscht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Erstellen Sie Angebote
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Erstellen Sie Angebote
 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 +38,Bill of Materials (BOM),Stückliste
 DocType: Item,Average time taken by the supplier to deliver,Durchschnittliche Lieferzeit des Lieferanten
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Bewertungsergebnis
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Stunden
 DocType: Project,Expected Start Date,Voraussichtliches Startdatum
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechnet werden können"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Artikel entfernen, wenn keine Gebühren angerechnet werden können"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaktionswährung muß gleiche wie Payment Gateway Währung
 DocType: Payment Entry,Receive,Empfangen
@@ -4090,19 +4101,19 @@
 DocType: Workstation,Operating Costs,Betriebskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Erwünschte Aktion bei überschrittenem kumuliertem Monatsbudget
 DocType: Purchase Invoice,Submit on creation,Buchen beim Erstellen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Währung für {0} muss {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Währung für {0} muss {1}
 DocType: Asset,Disposal Date,Verkauf Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-Mails werden an alle aktiven Mitarbeiter des Unternehmens an der angegebenen Stunde gesendet werden, wenn sie nicht Urlaub. Zusammenfassung der Antworten wird um Mitternacht gesendet werden."
 DocType: Employee Leave Approver,Employee Leave Approver,Urlaubsgenehmiger des Mitarbeiters
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Zeile {0}: Es gibt bereits eine Nachbestellungsbuchung für dieses Lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kann nicht als verloren deklariert werden, da bereits ein Angebot erstellt wurde."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Fertigungsauftrag {0} muss übertragen werden
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Bitte Start -und Enddatum für den Artikel {0} auswählen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs ist obligatorisch in Zeile {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Bis-Datum kann nicht vor Von-Datum liegen
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Preise hinzufügen / bearbeiten
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Preise hinzufügen / bearbeiten
 DocType: Batch,Parent Batch,Übergeordnete Charge
 DocType: Cheque Print Template,Cheque Print Template,Scheck Druckvorlage
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kostenstellenplan
@@ -4115,7 +4126,7 @@
 ,Ordered Items To Be Delivered,"Bestellte Artikel, die geliefert werden müssen"
 DocType: Account,Income,Einkommen
 DocType: Industry Type,Industry Type,Wirtschaftsbranche
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Etwas ist schiefgelaufen!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Etwas ist schiefgelaufen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Ausgangsrechnung {0} wurde bereits übertragen
 DocType: Assessment Result Detail,Score,Ergebnis
@@ -4146,17 +4157,17 @@
 DocType: Item,Variant Based On,Variante basierend auf
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Summe der zugeordneten Gewichtungen sollte 100% sein. Sie ist {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ihre Lieferanten
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Kann nicht als verloren gekennzeichnet werden, da ein Kundenauftrag dazu existiert."
+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."
 DocType: Request for Quotation Item,Supplier Part No,Lieferant Teile-Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abziehen, wenn der Kategorie für &quot;Bewertung&quot; oder &quot;Vaulation und Total &#39;ist"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Erhalten von
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Kann nicht abziehen, wenn der Kategorie für &quot;Bewertung&quot; oder &quot;Vaulation und Total &#39;ist"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Erhalten von
 DocType: Lead,Converted,umgewandelt
 DocType: Item,Has Serial No,Hat Seriennummer
 DocType: Employee,Date of Issue,Ausstellungsdatum
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Von {0} für {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Von {0} für {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Zeile #{0}: Lieferanten für Artikel {1} einstellen
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Stunden-Wert muss größer als Null sein.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Das Webseiten-Bild {0}, das an Artikel {1} angehängt wurde, kann nicht gefunden werden"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.
@@ -4165,20 +4176,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei Kontowährung gleich
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Abrechnungswährung muss entweder auf Standard comapany Währung oder Partei Kontowährung gleich
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lassen Sie Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Unternehmenszweck
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,An Lager
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Studenten Admissions
 ,Average Commission Rate,Durchschnittlicher Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Die Anwesenheit kann nicht für zukünftige Termine markiert werden
 DocType: Pricing Rule,Pricing Rule Help,Hilfe zur Preisregel
 DocType: School House,House Name,Hausname
 DocType: Purchase Taxes and Charges,Account Head,Kontobezeichnung
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektro
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten hinzufügen
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Fügen Sie den Rest Ihrer Organisation als Nutzer hinzu. Sie können auch Kunden zu Ihrem Portal einladen indem Sie sie aus den Kontakten hinzufügen
 DocType: Stock Entry,Total Value Difference (Out - In),Gesamt-Wertdifferenz (Aus - Ein)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Zeile {0}: Wechselkurs ist erforderlich
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben
@@ -4187,7 +4198,7 @@
 DocType: Item,Customer Code,Kunden-Nr.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Geburtstagserinnerung für {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Tage seit dem letzten Auftrag
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Sollkonto muss ein Bilanzkonto sein
 DocType: Buying Settings,Naming Series,Nummernkreis
 DocType: Leave Block List,Leave Block List Name,Name der Urlaubssperrenliste
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Versicherung Startdatum sollte weniger als Versicherung Enddatum
@@ -4202,11 +4213,11 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Gehaltsabrechnung der Mitarbeiter {0} bereits für Zeitblatt erstellt {1}
 DocType: Vehicle Log,Odometer,Kilometerzähler
 DocType: Sales Order Item,Ordered Qty,Bestellte Menge
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Artikel {0} ist deaktiviert
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Artikel {0} ist deaktiviert
 DocType: Stock Settings,Stock Frozen Upto,Bestand gesperrt bis
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Stückliste enthält keine Lagerware
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Stückliste enthält keine Lagerware
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projektaktivität/Aufgabe
+apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projektaktivität/-vorgang.
 DocType: Vehicle Log,Refuelling Details,Betankungs Einzelheiten
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gehaltsabrechnungen generieren
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","Einkauf muss ausgewählt sein, wenn ""Anwenden auf"" auf {0} gesetzt wurde"
@@ -4214,13 +4225,14 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Zuletzt Kaufrate nicht gefunden
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Abschreibungs-Betrag (Firmenwährung)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Stunden
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standardstückliste für {0} nicht gefunden
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Zeile #{0}: Bitte Nachbestellmenge angeben
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Tippen Sie auf Elemente, um sie hier hinzuzufügen"
 DocType: Fees,Program Enrollment,Programm Einschreibung
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beleg über Einstandskosten
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Bitte {0} setzen
 DocType: Purchase Invoice,Repeat on Day of Month,Wiederholen an Tag des Monats
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} ist inaktiver Schüler
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} ist ein inaktiver Schüler
 DocType: Employee,Health Details,Gesundheitsdaten
 DocType: Offer Letter,Offer Letter Terms,Gültigkeit des Angebotsschreibens
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Zur Erstellung eines Zahlungsauftrags ist ein Referenzdokument erforderlich
@@ -4237,7 +4249,7 @@
 DocType: Maintenance Visit,Maintenance Date,Wartungsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Abgelehnte Seriennummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Jahresbeginn oder Enddatum überlappt mit {0}. Um dies zu verhindern setzen Sie eine Firma.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Startdatum sollte für den Artikel {0} vor dem Enddatum liegen
 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.","Beispiel: ABCD.##### 
  Wenn ""Serie"" eingestellt ist und ""Seriennummer"" in den Transaktionen nicht aufgeführt ist, dann wird eine Seriennummer automatisch auf der Grundlage dieser Serie erstellt. Wenn immer explizit Seriennummern für diesen Artikel aufgeführt werden sollen, muss das Feld leer gelassen werden."
@@ -4279,7 +4291,7 @@
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Fehler: Keine gültige ID?
 DocType: Naming Series,Update Series Number,Nummernkreis-Wert aktualisieren
 DocType: Account,Equity,Eigenkapital
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}: &quot;Gewinn und Verlust&quot; Typ Konto {2} nicht in Öffnungs Eintrag erlaubt
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,"{0} {1}: ""Gewinn und Verlust"" Art Konto {2} nicht in Eröffnungs-Buchung erlaubt"
 DocType: Sales Order,Printing Details,Druckdetails
 DocType: Task,Closing Date,Abschlussdatum
 DocType: Sales Order Item,Produced Quantity,Produzierte Menge
@@ -4290,7 +4302,7 @@
 DocType: Sales Partner,Partner Type,Partnertyp
 DocType: Purchase Taxes and Charges,Actual,Tatsächlich
 DocType: Authorization Rule,Customerwise Discount,Kundenspezifischer Rabatt
-apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Zeiterfassung für Aufgaben.
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Zeitraport für Vorgänge.
 DocType: Purchase Invoice,Against Expense Account,Zu Aufwandskonto
 DocType: Production Order,Production Order,Fertigungsauftrag
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +270,Installation Note {0} has already been submitted,Installationshinweis {0} wurde bereits übertragen
@@ -4313,7 +4325,6 @@
 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
-DocType: Grade Interval,Grade Interval,Gehalt Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Start- und Enddatum des Geschäftsjahres sind für das Geschäftsjahr {0} bereits gesetzt
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Räumungs Datum aktualisiert
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4358,14 +4369,14 @@
 DocType: Bin,Reserved Qty for Production,Reserviert Menge für Produktion
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Lassen Sie unkontrolliert, wenn Sie nicht wollen, Batch während der Kurs-basierte Gruppen zu betrachten."
 DocType: Asset,Frequency of Depreciation (Months),Die Häufigkeit der Abschreibungen (Monate)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Guthabenkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Guthabenkonto
 DocType: Landed Cost Item,Landed Cost Item,Einstandspreis-Artikel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Richten Sie eine einfache Website für meine Organisation
 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 +666,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Bitte Attributwert für Attribut {0} angeben
 DocType: Item,Default Warehouse,Standardlager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kann nicht einem Gruppenkonto {0} zugeordnet werden
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Bitte übergeordnete Kostenstelle eingeben
@@ -4408,12 +4419,12 @@
 DocType: Opportunity Item,Basic Rate,Grundpreis
 DocType: GL Entry,Credit Amount,Guthaben-Summe
 DocType: Cheque Print Template,Signatory Position,Unterzeichner Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,"Als ""verloren"" markieren"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,"Als ""verloren"" markieren"
 DocType: Timesheet,Total Billable Hours,Insgesamt abrechenbare Stunden
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Zahlungsnachweis
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dies basiert auf Transaktionen gegen diesen Kunden. Siehe Zeitleiste unten für Details
 DocType: Supplier,Credit Days Based On,Zahlungsziel basierend auf
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Row {0}: Geschätzter Betrag {1} muss kleiner als oder gleich zu Zahlung Eintrag Menge {2}
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Zeile {0}: Zugewiesener Betrag {1} muss kleiner oder gleich der Zahlungsmenge {2} sein
 DocType: Tax Rule,Tax Rule,Steuer-Regel
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,Gleiche Preise während des gesamten Verkaufszyklus beibehalten
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Zeiten außerhalb der normalen Arbeitszeiten am Arbeitsplatz zulassen.
@@ -4422,11 +4433,11 @@
 ,Items To Be Requested,Anzufragende Artikel
 DocType: Purchase Order,Get Last Purchase Rate,Letzten Einkaufspreis aufrufen
 DocType: Company,Company Info,Informationen über das Unternehmen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Wählen oder neue Kunden hinzufügen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,"Kostenstelle ist erforderlich, einen Aufwand Anspruch buchen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Wählen oder neue Kunden hinzufügen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,"Kostenstelle ist erforderlich, einen Aufwand Anspruch buchen"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Mittelverwendung (Aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dies basiert auf der Anwesenheit dieser Arbeitnehmer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Sollkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4435,13 +4446,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Gesamtbetrag des Einkaufs
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Lieferant Quotation {0} erstellt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,"Ende Jahr sein kann, nicht vor dem Startjahr"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Vergünstigungen an Mitarbeiter
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Verpackte Menge muss gleich der Menge des Artikel {0} in Zeile {1} sein
 DocType: Production Order,Manufactured Qty,Produzierte Menge
 DocType: Purchase Receipt Item,Accepted Quantity,Angenommene Menge
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existiert nicht
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} existiert nicht
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Zeile Nr. {0}: Betrag kann nicht größer als der ausstehende Betrag zur Aufwandsabrechnung {1} sein. Ausstehender Betrag ist {2}
@@ -4450,15 +4461,17 @@
 DocType: Quality Inspection Reading,Reading 3,Ablesewert 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Belegtyp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Preisliste nicht gefunden oder deaktiviert
 DocType: Employee Loan Application,Approved,Genehmigt
 DocType: Pricing Rule,Price,Preis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Freigestellter Angestellter {0} muss als ""entlassen"" gekennzeichnet werden"
 DocType: Guardian,Guardian,Wächter
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bewertung {0} für Mitarbeiter {1} im angegebenen Datumsbereich erstellt
 DocType: Employee,Education,Bildung
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Benennung der Kampagnen nach
 DocType: Employee,Current Address Is,Aktuelle Adresse ist
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,geändert
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optional. Stellt die Standardwährung des Unternehmens ein, falls nichts angegeben ist."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Buchungssätze
 DocType: Delivery Note Item,Available Qty at From Warehouse,Verfügbare Stückzahl im Ausgangslager
@@ -4467,7 +4480,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Zeile {0}: Gruppe / Konto stimmt nicht mit {1} / {2} in {3} {4} überein
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Bitte das Aufwandskonto angeben
 DocType: Account,Stock,Lagerbestand
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Referenzdokumenttyp muss eine der Bestellung, Rechnung oder Kaufjournaleintrag sein"
 DocType: Employee,Current Address,Aktuelle Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Wenn der Artikel eine Variante eines anderen Artikels ist, dann werden Beschreibung, Bild, Preise, Steuern usw. aus der Vorlage übernommen, sofern nicht ausdrücklich etwas angegeben ist."
 DocType: Serial No,Purchase / Manufacture Details,Einzelheiten zu Kauf / Herstellung
@@ -4495,7 +4508,7 @@
 DocType: Hub Settings,Hub Settings,Hub-Einstellungen
 DocType: Project,Gross Margin %,Handelsspanne %
 DocType: BOM,With Operations,Mit Arbeitsgängen
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Es wurden bereits Buchungen in der Währung {0} für Firma {1} vorgenommen. Bitte ein Forderungs- oder Verbindlichkeiten-Konto mit Währung {0} wählen.
 DocType: Asset,Is Existing Asset,Ist bereits bestehenden Asset
 DocType: Salary Detail,Statistical Component,Statistische Komponente
 ,Monthly Salary Register,Übersicht monatliche Gehälter
@@ -4518,7 +4531,7 @@
 DocType: Assessment Plan,Room,Zimmer
 DocType: Purchase Order,Advance Paid,Angezahlt
 DocType: Item,Item Tax,Artikelsteuer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material an den Lieferanten
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material an den Lieferanten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Verbrauch Rechnung
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} erscheint% mehr als einmal
 DocType: Expense Claim,Employees Email Id,E-Mail-ID des Mitarbeiters
@@ -4549,9 +4562,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo anhängen
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Lagerbestände
 DocType: Customer,Commission Rate,Provisionssatz
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variante erstellen
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variante erstellen
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Urlaubsanträge pro Abteilung sperren
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Zahlungsart muss eine der Receive sein, Pay und interne Übertragung"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analysetools
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Der Warenkorb ist leer
 DocType: Vehicle,Model,Modell
@@ -4562,6 +4575,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Fertigung im Urlaub zulassen
 DocType: Sales Order,Customer's Purchase Order Date,Kundenauftragsdatum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Grundkapital
+DocType: Shopping Cart Settings,Show Public Attachments,Öffentliche Anhänge anzeigen
 DocType: Packing Slip,Package Weight Details,Details zum Verpackungsgewicht
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Nach Abschluss der Zahlung, Benutzer auf ausgewählte Seite weiterleiten."
@@ -4580,15 +4594,15 @@
 DocType: Batch,Expiry Date,Verfallsdatum
 ,Supplier Addresses and Contacts,Lieferanten-Adressen und Kontaktdaten
 ,accounts-browser,Konten-Browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Bitte zuerst Kategorie auswählen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Bitte zuerst Kategorie auswählen
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt-Stammdaten
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Damit über Abrechnung oder Über Bestellung, aktualisieren &quot;Allowance&quot; auf Lager Einstellungen oder dem Artikel."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Kein Symbol wie $ usw. neben Währungen anzeigen.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halbtags)
 DocType: Supplier,Credit Days,Zahlungsziel
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Machen Schüler Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Machen Schüler Batch
 DocType: Leave Type,Is Carry Forward,Ist Übertrag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Artikel aus der Stückliste holen
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Artikel aus der Stückliste holen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lieferzeittage
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Datum der Veröffentlichung muss als Kaufdatum gleich sein {1} des Asset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Bitte geben Sie Kundenaufträge in der obigen Tabelle
@@ -4605,7 +4619,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Bitte richten Sie die Nummerierungsserie für die Teilnahme über die Einrichtung&gt; Nummerierung ein
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 e996a5f..ca38432 100644
--- a/erpnext/translations/el.csv
+++ b/erpnext/translations/el.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Νοικιασμένο
 DocType: Purchase Order,PO-,ΤΑΧΥΔΡΟΜΕΊΟ-
 DocType: POS Profile,Applicable for User,Ισχύει για χρήστη
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Σταμάτησε Παραγγελία παραγωγή δεν μπορεί να ακυρωθεί, θα ξεβουλώνω πρώτα να ακυρώσετε"
 DocType: Vehicle Service,Mileage,Απόσταση σε μίλια
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Θέλετε πραγματικά να καταργήσει αυτό το περιουσιακό στοιχείο;
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Επιλέξτε Προεπιλογή Προμηθευτής
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Επιλέξτε Προεπιλογή Προμηθευτής
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Το νόμισμα είναι απαραίτητο για τον τιμοκατάλογο {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Θα υπολογίζεται στη συναλλαγή.
 DocType: Purchase Order,Customer Contact,Επικοινωνία Πελατών
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Η εκκρεμότητα για {0} δεν μπορεί να είναι μικρότερη από το μηδέν ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Προεπιλογή 10 λεπτά
 DocType: Leave Type,Leave Type Name,Όνομα τύπου άδειας
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Εμφάνιση ανοιχτή
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Εμφάνιση ανοιχτή
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Η σειρά ενημερώθηκε με επιτυχία
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Αποχώρηση
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Εφημερίδα Έναρξη Υποβλήθηκε
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Παρτίδα Θέση λήξης Κατάσταση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Τραπεζική επιταγή
 DocType: Mode of Payment Account,Mode of Payment Account,Λογαριασμός τρόπου πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Προβολή παραλλαγών
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Προβολή παραλλαγών
 DocType: Academic Term,Academic Term,Ακαδημαϊκός Όρος
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Υλικό
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Ποσότητα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Ποσότητα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Λογαριασμοί πίνακας δεν μπορεί να είναι κενό.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Δάνεια (παθητικό )
 DocType: Employee Education,Year of Passing,Έτος περάσματος
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Παραπομπή:% s, Κωδικός Είδους:% s και ο Πελάτης:% s"
 DocType: Item,Country of Origin,Χώρα προέλευσης
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Σε Απόθεμα
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Ανοιχτά ζητήματα
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Υγειονομική περίθαλψη
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Καθυστέρηση στην πληρωμή (Ημέρες)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Δαπάνη παροχής υπηρεσιών
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Τιμολόγιο
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Σειριακός αριθμός: {0} αναφέρεται ήδη στο Τιμολόγιο Πωλήσεων: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Τιμολόγιο
 DocType: Maintenance Schedule Item,Periodicity,Περιοδικότητα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Χρήσεως {0} απαιτείται
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Αναμενόμενη ημερομηνία παράδοσης είναι να είναι πριν Παραγγελία Πωλήσεις Ημερομηνία
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Επισυνάψτε αρχείο .csv με δύο στήλες, μία για το παλιό όνομα και μία για το νέο όνομα"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} δεν είναι σε καμία ενεργή χρήση.
 DocType: Packed Item,Parent Detail docname,Όνομα αρχείου γονικής λεπτομέρεια
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Αναφορά: {0}, Κωδικός είδους: {1} και Πελάτης: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Κούτσουρο
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Άνοιγμα θέσης εργασίας.
 DocType: Item Attribute,Increment,Προσαύξηση
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Επιλέξτε Αποθήκη ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Επιλέξτε Αποθήκη ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Διαφήμιση
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ίδια Εταιρεία καταχωρήθηκε περισσότερο από μία φορά
 DocType: Employee,Married,Παντρεμένος
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Δεν επιτρέπεται η {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Πάρτε τα στοιχεία από
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Δεν επιτρέπεται η {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Πάρτε τα στοιχεία από
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Το απόθεμα δεν μπορεί να ανανεωθεί σύμφωνα με το δελτίο αποστολής {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Προϊόν {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Δεν αναγράφονται στοιχεία
 DocType: Payment Reconciliation,Reconcile,Συμφωνήστε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Παντοπωλείο
 DocType: Quality Inspection Reading,Reading 1,Μέτρηση 1
 DocType: Process Payroll,Make Bank Entry,Δημιούργησε εγγυητική τραπέζης
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Ιδιωτικά ταμεία συντάξεων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Επόμενο Αποσβέσεις ημερομηνία αυτή δεν μπορεί να είναι πριν από την Ημερομηνία Αγοράς
 DocType: SMS Center,All Sales Person,Όλοι οι πωλητές
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Μηνιαία Κατανομή ** σας βοηθά να διανείμετε το Οικονομικό / Target σε όλη μήνες, αν έχετε την εποχικότητα στην επιχείρησή σας."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Δεν βρέθηκαν στοιχεία
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Δεν βρέθηκαν στοιχεία
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Δομή του μισθού που λείπουν
 DocType: Lead,Person Name,Όνομα Πρόσωπο
 DocType: Sales Invoice Item,Sales Invoice Item,Είδος τιμολογίου πώλησης
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",π.χ. «Δημοτικό Σχολείο» ή «Πανεπιστήμιο»
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Αναφορές απόθεμα
 DocType: Warehouse,Warehouse Detail,Λεπτομέρειες αποθήκης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Το πιστωτικό όριο έχει ξεπεραστεί για τον πελάτη {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Το τέλος Όρος ημερομηνία δεν μπορεί να είναι μεταγενέστερη της χρονιάς Ημερομηνία Λήξης του Ακαδημαϊκού Έτους στην οποία ο όρος συνδέεται (Ακαδημαϊκό Έτος {}). Διορθώστε τις ημερομηνίες και προσπαθήστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Είναι Παγίων&quot; δεν μπορεί να είναι ανεξέλεγκτη, καθώς υπάρχει Asset ρεκόρ έναντι του στοιχείου"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Φορολογική Τύπος
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Δεν επιτρέπεται να προσθέσετε ή να ενημερώσετε τις καταχωρήσεις πριν από {0}
 DocType: BOM,Item Image (if not slideshow),Φωτογραφία είδους (αν όχι slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Υπάρχει πελάτης με το ίδιο όνομα
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ώρα Βαθμολογήστε / 60) * Πραγματικός χρόνος λειτουργίας
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Επιλέξτε BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Επιλέξτε BOM
 DocType: SMS Log,SMS Log,Αρχείο καταγραφής SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Κόστος των προϊόντων που έχουν παραδοθεί
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Οι διακοπές σε {0} δεν είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,σχολεία
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Δεν ρεκόρ άδεια βρέθηκαν για εργαζόμενο {0} για {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Παρακαλώ εισάγετε πρώτα εταιρεία
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Επιλέξτε την εταιρεία πρώτα
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Συνολικό κόστος
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Ποσό απαίτησης
 DocType: Employee,Mr,Κ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Διπλότυπο ομάδα πελατών που βρίσκονται στο τραπέζι ομάδα cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Τύπος προμηθευτή / προμηθευτής
 DocType: Naming Series,Prefix,Πρόθεμα
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Αναλώσιμα
 DocType: Employee,B-,ΣΙ-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Βαθμός
 DocType: Sales Invoice Item,Delivered By Supplier,Παραδίδονται από τον προμηθευτή
 DocType: SMS Center,All Contact,Όλες οι επαφές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Παραγγελία Παραγωγή ήδη δημιουργήσει για όλα τα στοιχεία με BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Ετήσιος Μισθός
 DocType: Daily Work Summary,Daily Work Summary,Καθημερινή Σύνοψη εργασίας
 DocType: Period Closing Voucher,Closing Fiscal Year,Κλείσιμο χρήσης
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,"{0} {1} είναι ""Παγωμένο"""
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Επιλέξτε υφιστάμενης εταιρείας για τη δημιουργία Λογιστικού
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Έξοδα αποθέματος
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Επιλέξτε Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Λογιστική εγγραφή ακύρωσης
 DocType: Journal Entry Account,Credit in Company Currency,Πιστωτικές στην Εταιρεία Νόμισμα
 DocType: Delivery Note,Installation Status,Κατάσταση εγκατάστασης
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Θέλετε να ενημερώσετε τη συμμετοχή; <br> Παρόν: {0} \ <br> Απών: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Η αποδεκτή + η απορριπτέα ποσότητα πρέπει να είναι ίση με την ληφθείσα ποσότητα για το είδος {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Παροχή Πρώτων Υλών για Αγορά
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Τουλάχιστον ένα τρόπο πληρωμής απαιτείται για POS τιμολόγιο.
 DocType: Products Settings,Show Products as a List,Εμφάνιση προϊόντων ως Λίστα
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Κατεβάστε το πρότυπο, συμπληρώστε τα κατάλληλα δεδομένα και επισυνάψτε το τροποποιημένο αρχείο. Όλες οι ημερομηνίες και ο συνδυασμός των υπαλλήλων στην επιλεγμένη περίοδο θα εμφανιστεί στο πρότυπο, με τους υπάρχοντες καταλόγους παρουσίας"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Κάντε Αποσβέσεις Έναρξη
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Τύπος αίτησης
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Κάντε Υπάλληλος
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Κάντε Υπάλληλος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Εκπομπή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Εκτέλεση
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Λεπτομέρειες σχετικά με τις λειτουργίες που πραγματοποιούνται.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Σχέδιο για επισκέψεις συντήρησης.
 DocType: SMS Settings,Enter url parameter for message,Εισάγετε παράμετρο url για το μήνυμα
 DocType: POS Profile,Customer Groups,Ομάδες πελατών
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Οικονομικές δηλώσεις
 DocType: Guardian,Students,Φοιτητόκοσμος
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Κανόνες για την εφαρμογή τιμολόγησης και εκπτώσεων.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ο τιμοκατάλογος πρέπει να ισχύει για την αγορά ή πώληση
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ποσό της προκαταβολής δεν μπορεί να είναι μεγαλύτερη από {0} {1}
 DocType: Naming Series,Series List for this Transaction,Λίστα σειράς για αυτή τη συναλλαγή
 DocType: Company,Default Payroll Payable Account,Προεπιλογή Μισθοδοσίας με πληρωμή Λογαριασμού
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Ενημέρωση Email Ομάδα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Ενημέρωση Email Ομάδα
 DocType: Sales Invoice,Is Opening Entry,Είναι αρχική καταχώρηση
 DocType: Customer Group,Mention if non-standard receivable account applicable,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμό εφαρμόζεται
 DocType: Course Schedule,Instructor Name,Διδάσκων Ονοματεπώνυμο
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Tο πεδίο για αποθήκη απαιτείται πριν την υποβολή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Tο πεδίο για αποθήκη απαιτείται πριν την υποβολή
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Που ελήφθη στις
 DocType: Sales Partner,Reseller,Μεταπωλητής
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Αν επιλεγεί, θα περιλαμβάνουν μη-απόθεμα τεμάχια στο υλικό αιτήματα."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Κατά το είδος στο τιμολόγιο πώλησης
 ,Production Orders in Progress,Εντολές παραγωγής σε εξέλιξη
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Καθαρές ροές από επενδυτικές
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage είναι πλήρης, δεν έσωσε"
 DocType: Lead,Address & Contact,Διεύθυνση & Επαφή
 DocType: Leave Allocation,Add unused leaves from previous allocations,Προσθήκη αχρησιμοποίητα φύλλα από προηγούμενες κατανομές
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Το επόμενο επαναλαμβανόμενο {0} θα δημιουργηθεί στις {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Σύνολο Κοστολόγηση Ποσό (μέσω Ώρα Φύλλο)
 DocType: Item Website Specification,Item Website Specification,Προδιαγραφή ιστότοπου για το είδος
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Η άδεια εμποδίστηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Τράπεζα Καταχωρήσεις
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Το είδος {0} έχει φτάσει στο τέλος της διάρκειας ζωής του στο {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Τράπεζα Καταχωρήσεις
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Ετήσιος
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Είδος συμφωνίας αποθέματος
 DocType: Stock Entry,Sales Invoice No,Αρ. Τιμολογίου πώλησης
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Δημοσίευση στο hub
 DocType: Student Admission,Student Admission,Η είσοδος φοιτητής
 ,Terretory,Περιοχή
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Αίτηση υλικού
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Το είδος {0} είναι ακυρωμένο
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Αίτηση υλικού
 DocType: Bank Reconciliation,Update Clearance Date,Ενημέρωση ημερομηνίας εκκαθάρισης
 DocType: Item,Purchase Details,Λεπτομέρειες αγοράς
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Θέση {0} δεν βρέθηκε στο «πρώτες ύλες που προμηθεύεται« πίνακα Εντολή Αγοράς {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Εξαιρετική επιταγές και καταθέσεις για να καθαρίσετε
 DocType: Item,Synced With Hub,Συγχρονίστηκαν με το Hub
 DocType: Vehicle,Fleet Manager,στόλου Διευθυντής
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} δεν μπορεί να είναι αρνητικό για το στοιχείο {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Λάθος Κωδικός
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} δεν μπορεί να είναι αρνητικό για το στοιχείο {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Λάθος Κωδικός
 DocType: Item,Variant Of,Παραλλαγή του
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Η ολοκληρωμένη ποσότητα δεν μπορεί να είναι μεγαλύτερη από την «ποσότητα για κατασκευή»
 DocType: Period Closing Voucher,Closing Account Head,Κλείσιμο κύριας εγγραφής λογαριασμού
 DocType: Employee,External Work History,Ιστορικό εξωτερικής εργασίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Κυκλικού λάθους Αναφορά
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Ειδοποίηση μέσω email σχετικά με την αυτόματη δημιουργία αιτήσης υλικού
 DocType: Journal Entry,Multi Currency,Πολλαπλό Νόμισμα
 DocType: Payment Reconciliation Invoice,Invoice Type,Τύπος τιμολογίου
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Δελτίο αποστολής
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Δελτίο αποστολής
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ρύθμιση Φόροι
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Κόστος πωληθέντων περιουσιακών στοιχείων
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Η καταχώηρση πληρωμής έχει τροποποιηθεί μετά την λήψη της. Παρακαλώ επαναλάβετε τη λήψη.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
-DocType: Grade Interval,Min Score,Ελάχιστη Αποτέλεσμα
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,Το {0} εισήχθηκε δύο φορές στο φόρο είδους
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Περίληψη για αυτή την εβδομάδα και εν αναμονή δραστηριότητες
 DocType: Student Applicant,Admitted,Παράδεκτος
 DocType: Workstation,Rent Cost,Κόστος ενοικίασης
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Τιμή παραγγελίας
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Τράπεζα / Ταμειακές συναλλαγές κατά μέρος ή για εσωτερική μεταφορά
 DocType: Shipping Rule,Valid for Countries,Ισχύει για χώρες
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Αυτό το στοιχείο είναι ένα πρότυπο και δεν μπορεί να χρησιμοποιηθεί στις συναλλαγές. Τα χαρακτηριστικά του θα αντιγραφούν πάνω σε αυτά των παραλλαγών εκτός αν έχει οριστεί το «όχι αντιγραφή '
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Σύνολο παραγγελιών που μελετήθηκε
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Τίτλος υπαλλήλου ( π.Χ. Διευθύνων σύμβουλος, διευθυντής κ.λ.π. )."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Παρακαλώ εισάγετε τιμή στο πεδίο 'επανάληψη για την ημέρα του μήνα'
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Σειρά # {0}: Αγορά Τιμολόγιο δεν μπορεί να γίνει κατά ένα υπάρχον στοιχείο {1}
 DocType: Item Tax,Tax Rate,Φορολογικός συντελεστής
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} έχει ήδη διατεθεί υπάλληλου {1} για χρονικό διάστημα {2} σε {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Επιλέξτε Προϊόν
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Επιλέξτε Προϊόν
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Το τιμολογίου αγοράς {0} έχει ήδη υποβληθεί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Σειρά # {0}: Παρτίδα Δεν πρέπει να είναι ίδιο με το {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Μετατροπή σε μη-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Παρτίδας (lot) ενός είδους.
 DocType: C-Form Invoice Detail,Invoice Date,Ημερομηνία τιμολογίου
 DocType: GL Entry,Debit Amount,Χρεωστικό ποσό
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Μπορεί να υπάρχει μόνο 1 λογαριασμός ανά εταιρεία σε {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Παρακαλώ δείτε συνημμένο
 DocType: Purchase Order,% Received,% Παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Δημιουργία Ομάδων Φοιτητών
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Αίτηση για προσφορά
 DocType: Salary Slip Timesheet,Working Hours,Ώρες εργασίας
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Αλλάξτε τον αρχικό/τρέχων αύξοντα αριθμός μιας υπάρχουσας σειράς.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
-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.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Δημιουργήστε ένα νέο πελάτη
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Αν υπάρχουν πολλοί κανόνες τιμολόγησης που συνεχίζουν να επικρατούν, οι χρήστες καλούνται να ορίσουν προτεραιότητα χειρονακτικά για την επίλυση των διενέξεων."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Δημιουργία Εντολών Αγοράς
 ,Purchase Register,Ταμείο αγορών
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Ισχύουσες χρεώσεις
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης αδειών»
 DocType: Purchase Receipt,Vehicle Date,Όχημα Ημερομηνία
 DocType: Student Log,Medical,Ιατρικός
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Αιτιολογία απώλειας
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Αιτιολογία απώλειας
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Ο μόλυβδος Ιδιοκτήτης δεν μπορεί να είναι ίδιο με το μόλυβδο
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Χορηγούμενο ποσό δεν μπορεί να είναι μεγαλύτερη από το μη διορθωμένο ποσό
 DocType: Announcement,Receiver,Δέκτης
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Ποσότητα και τιμή
 DocType: Delivery Note,% Installed,% Εγκατεστημένο
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Αίθουσες διδασκαλίας / εργαστήρια κ.λπ. όπου μπορεί να προγραμματιστεί διαλέξεις.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Παρακαλώ εισάγετε πρώτα το όνομα της εταιρείας
 DocType: Purchase Invoice,Supplier Name,Όνομα προμηθευτή
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Διαβάστε το Εγχειρίδιο ERPNext
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Παλαιός γονέας
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Υποχρεωτικό πεδίο - ακαδημαϊκό έτος
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Προσαρμόστε το εισαγωγικό κείμενο που αποστέλλεται ως μέρος του εν λόγω email. Κάθε συναλλαγή έχει ένα ξεχωριστό εισαγωγικό κείμενο.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Ορίστε προεπιλεγμένο πληρωτέο λογαριασμό για την εταιρεία {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Παγκόσμια ρυθμίσεις για όλες τις διαδικασίες κατασκευής.
 DocType: Accounts Settings,Accounts Frozen Upto,Παγωμένοι λογαριασμοί μέχρι
 DocType: SMS Log,Sent On,Εστάλη στις
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Χαρακτηριστικό {0} πολλές φορές σε πίνακα Χαρακτηριστικά
 DocType: HR Settings,Employee record is created using selected field. ,Η Εγγραφή υπαλλήλου δημιουργείται χρησιμοποιώντας το επιλεγμένο πεδίο.
 DocType: Sales Order,Not Applicable,Μη εφαρμόσιμο
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Κύρια εγγραφή αργιών.
 DocType: Request for Quotation Item,Required Date,Απαιτούμενη ημερομηνία
 DocType: Delivery Note,Billing Address,Διεύθυνση χρέωσης
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Παρακαλώ εισάγετε κωδικό είδους.
 DocType: BOM,Costing,Κοστολόγηση
 DocType: Tax Rule,Billing County,County χρέωσης
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Εάν είναι επιλεγμένο, το ποσό του φόρου θα πρέπει να θεωρείται ότι έχει ήδη συμπεριληφθεί στην τιμή / ποσό εκτύπωσης"
@@ -500,6 +504,7 @@
 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,Κινητές αξίες και καταθέσεις
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Δεν είναι δυνατή η αλλαγή της μεθόδου αποτίμησης, καθώς υπάρχουν συναλλαγές έναντι ορισμένων στοιχείων που δεν έχουν τη δική της μέθοδο αποτίμησης"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Σύνολο φύλλα που διατίθενται είναι υποχρεωτική
 DocType: Job Opening,Description of a Job Opening,Περιγραφή μιας ανοιχτής θέσης εργασίας
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Εν αναμονή δραστηριότητες για σήμερα
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Διοικητικός λειτουργός
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Επιλέξτε Course
 DocType: Timesheet Detail,Hrs,ώρες
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Επιλέξτε Εταιρεία
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Επιλέξτε Εταιρεία
 DocType: Stock Entry Detail,Difference Account,Λογαριασμός διαφορών
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Δεν μπορεί να κλείσει το έργο ως εξαρτώμενη εργασία του {0} δεν έχει κλείσει.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Παρακαλώ εισάγετε αποθήκη για την οποία θα δημιουργηθεί η αίτηση υλικού
 DocType: Production Order,Additional Operating Cost,Πρόσθετο λειτουργικό κόστος
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Καλλυντικά
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Για τη συγχώνευση, οι ακόλουθες ιδιότητες πρέπει να είναι ίδιες για τα δύο είδη"
 DocType: Shipping Rule,Net Weight,Καθαρό βάρος
 DocType: Employee,Emergency Phone,Τηλέφωνο έκτακτης ανάγκης
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Αγορά
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ορίστε βαθμό για το όριο 0%
 DocType: Sales Order,To Deliver,Να Παραδώσει
 DocType: Purchase Invoice Item,Item,Είδος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial κανένα στοιχείο δεν μπορεί να είναι ένα κλάσμα
 DocType: Journal Entry,Difference (Dr - Cr),Διαφορά ( dr - cr )
 DocType: Account,Profit and Loss,Κέρδη και ζημιές
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Διαχείριση της υπεργολαβίας
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Προσαύξηση δεν μπορεί να είναι 0
 DocType: Production Planning Tool,Material Requirement,Απαίτηση υλικού
 DocType: Company,Delete Company Transactions,Διαγραφή Συναλλαγές Εταιρείας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Αριθμός αναφοράς και ημερομηνία αναφοράς είναι υποχρεωτική για την Τράπεζα συναλλαγών
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Προσθήκη / επεξεργασία φόρων και επιβαρύνσεων
 DocType: Purchase Invoice,Supplier Invoice No,Αρ. τιμολογίου του προμηθευτή
 DocType: Territory,For reference,Για αναφορά
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Είδος σημείωσης εγκατάστασης
 DocType: Production Plan Item,Pending Qty,Εν αναμονή Ποσότητα
 DocType: Budget,Ignore,Αγνοήστε
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} δεν είναι ενεργή
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} δεν είναι ενεργή
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS αποστέλλονται στην παρακάτω αριθμούς: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,διαστάσεις Ελέγξτε τις ρυθμίσεις για εκτύπωση
 DocType: Salary Slip,Salary Slip Timesheet,Μισθός Slip Timesheet
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Συνολική προμήθεια
 DocType: Pricing Rule,Sales Partner,Συνεργάτης πωλήσεων
 DocType: Buying Settings,Purchase Receipt Required,Απαιτείται αποδεικτικό παραλαβής αγοράς
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Αποτίμηση Rate είναι υποχρεωτική εάν εισέλθει Άνοιγμα Χρηματιστήριο
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Δεν βρέθηκαν εγγραφές στον πίνακα τιμολογίων
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Παρακαλώ επιλέξτε πρώτα εταιρεία και τύπο συμβαλλόμενου
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Οικονομικό / λογιστικό έτος.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,συσσωρευμένες Αξίες
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Λυπούμαστε, οι σειριακοί αρ. δεν μπορούν να συγχωνευθούν"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Δημιούργησε παραγγελία πώλησης
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Δημιούργησε παραγγελία πώλησης
 DocType: Project Task,Project Task,Πρόγραμμα εργασιών
 ,Lead Id,ID Σύστασης
 DocType: C-Form Invoice Detail,Grand Total,Γενικό σύνολο
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Συνέχιση Συνημμένο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Επαναλαμβανόμενοι πελάτες
 DocType: Leave Control Panel,Allocate,Κατανομή
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Επιστροφή πωλήσεων
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Επιστροφή πωλήσεων
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Σημείωση: Σύνολο των κατανεμημένων φύλλα {0} δεν πρέπει να είναι μικρότερη από τα φύλλα που έχουν ήδη εγκριθεί {1} για την περίοδο
 DocType: Announcement,Posted By,Αναρτήθηκε από
 DocType: Item,Delivered by Supplier (Drop Ship),Δημοσιεύθηκε από τον Προμηθευτή (Drop Ship)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Προσφορά προς
 DocType: Lead,Middle Income,Μέσα έσοδα
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Άνοιγμα ( cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Το χορηγούμενο ποσό δεν μπορεί να είναι αρνητικό
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ρυθμίστε την εταιρεία
 DocType: Purchase Order Item,Billed Amt,Χρεωμένο ποσό
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Πωλήσεις Τιμολόγιο Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ο αρ. αναφοράς & η ημερομηνία αναφοράς για {0} είναι απαραίτητες.
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Επιλέξτε Λογαριασμός Πληρωμή να κάνουν Τράπεζα Έναρξη
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Δημιουργήστε τα αρχεία των εργαζομένων για τη διαχείριση των φύλλων, οι δηλώσεις εξόδων και μισθοδοσίας"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Προσθήκη στη Γνωσιακή Βάση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Συγγραφή πρότασης
 DocType: Payment Entry Deduction,Payment Entry Deduction,Έκπτωση Έναρξη Πληρωμής
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' Δεν είναι ση χρήση {2}
 DocType: Buying Settings,Settings for Buying Module,Ρυθμίσεις για τη λειτουργική μονάδα αγορών
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Περιουσιακό στοιχείο {0} δεν ανήκει στην εταιρεία {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Παρακαλώ εισάγετε πρώτα αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Στη συνέχεια, οι κανόνες τιμολόγησης φιλτράρονται με βάση τους πελάτες, την ομάδα πελατών, την περιοχή, τον προμηθευτής, τον τύπο του προμηθευτή, την εκστρατεία, τον συνεργάτη πωλήσεων κ.λ.π."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Καθαρή Αλλαγή στο Απογραφή
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Διαχείριση Δανείων των εργαζομένων
 DocType: Employee,Passport Number,Αριθμός διαβατηρίου
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Σχέση με Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Προϊστάμενος
 DocType: Payment Entry,Payment From / To,Πληρωμή Από / Προς
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Εύρος ημερομηνιών
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Νέο πιστωτικό όριο είναι μικρότερο από το τρέχον οφειλόμενο ποσό για τον πελάτη. Πιστωτικό όριο πρέπει να είναι atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,Τα πεδία με βάση και ομαδοποίηση κατά δεν μπορεί να είναι ίδια
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,Σε λεπτά
 DocType: Issue,Resolution Date,Ημερομηνία επίλυσης
 DocType: Student Batch Name,Batch Name,παρτίδα Όνομα
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Φύλλο κατανομής χρόνου δημιουργήθηκε:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Παρακαλώ ορίστε τον προεπιλεγμένο λογιαριασμό μετρητών ή τραπέζης στον τρόπο πληρωμής {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Εγγράφω
 DocType: Selling Settings,Customer Naming By,Ονομασία πελάτη από
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Θα δείξει το μαθητή ως Παρόντες στη Φοιτητική Μηνιαία Έκθεση Συμμετοχή
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Πραγματική ώρα έναρξης
 DocType: BOM Operation,Operation Time,Χρόνος λειτουργίας
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Φινίρισμα
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Βάση
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Βάση
 DocType: Timesheet,Total Billed Hours,Σύνολο Τιμολογημένος Ώρες
 DocType: Journal Entry,Write Off Amount,Διαγραφή ποσού
 DocType: Journal Entry,Bill No,Αρ. Χρέωσης
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Η φοίτηση μαθητή
 DocType: Sales Invoice Timesheet,Time Sheet,Πρόγραμμα
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush πρώτων υλών Βάσει των
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Παρακαλώ εισάγετε τα στοιχεία του είδους
 DocType: Interest,Interest,Ενδιαφέρον
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Προπωλήσεις
 DocType: Purchase Receipt,Other Details,Άλλες λεπτομέρειες
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Έναρξη Πληρωμής έχει ήδη δημιουργηθεί
 DocType: Purchase Receipt Item Supplied,Current Stock,Τρέχον απόθεμα
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Σειρά # {0}: Asset {1} δεν συνδέεται στη θέση {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Μισθός Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Μισθός Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Ο λογαριασμός {0} έχει τεθεί πολλές φορές
 DocType: Account,Expenses Included In Valuation,Δαπάνες που περιλαμβάνονται στην αποτίμηση
 DocType: Hub Settings,Seller City,Πόλη πωλητή
 ,Absent Student Report,Απών Έκθεση Φοιτητών
 DocType: Email Digest,Next email will be sent on:,Το επόμενο μήνυμα email θα αποσταλεί στις:
 DocType: Offer Letter Term,Offer Letter Term,Προσφορά Επιστολή Όρος
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Στοιχείο έχει παραλλαγές.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Στοιχείο έχει παραλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Το είδος {0} δεν βρέθηκε
 DocType: Bin,Stock Value,Αξία των αποθεμάτων
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Η εταιρεία {0} δεν υπάρχει
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Τύπος δέντρου
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Τύπος δέντρου
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Ποσότητα που καταναλώνεται ανά μονάδα
 DocType: Serial No,Warranty Expiry Date,Ημερομηνία λήξης εγγύησης
 DocType: Material Request Item,Quantity and Warehouse,Ποσότητα και αποθήκη
 DocType: Sales Invoice,Commission Rate (%),Ποσοστό (%) προμήθειας
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία Σειράς για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Επιλέξτε Προγράμματα
 DocType: Project,Estimated Cost,Εκτιμώμενο κόστος
 DocType: Purchase Order,Link to material requests,Σύνδεσμος για το υλικό των αιτήσεων
@@ -753,7 +756,7 @@
 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,Προεπιλεγμένος λογαριασμός
 DocType: Payment Entry,Received Amount (Company Currency),Ελήφθη Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Η Σύσταση πρέπει να οριστεί αν η Ευκαιρία προέρχεται από Σύσταση
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Παρακαλώ επιλέξτε εβδομαδιαίο ρεπό
 DocType: Production Order Operation,Planned End Time,Προγραμματισμένη ώρα λήξης
 ,Sales Person Target Variance Item Group-Wise,Εύρος στόχου πωλητή ανά ομάδα είδους
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,Ευκαιρία από
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Μηνιαία κατάσταση μισθοδοσίας.
 DocType: BOM,Website Specifications,Προδιαγραφές δικτυακού τόπου
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε την σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Από {0} του τύπου {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Γραμμή {0}: ο συντελεστής μετατροπής είναι υποχρεωτικός
@@ -822,6 +826,7 @@
 DocType: Employee,Bank A/C No.,Αριθμός τραπεζικού λογαριασμού
 DocType: Bank Guarantee,Project,Έργο
 DocType: Quality Inspection Reading,Reading 7,Μέτρηση 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,μερικώς διατεταγμένο
 DocType: Expense Claim Detail,Expense Claim Type,Τύπος αξίωσης δαπανών
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Προεπιλεγμένες ρυθμίσεις για το καλάθι αγορών
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset διαλυθεί μέσω Εφημερίδα Έναρξη {0}
@@ -829,14 +834,14 @@
 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 +107,Office Maintenance Expenses,Δαπάνες συντήρησης γραφείου
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ρύθμιση λογαριασμού ηλεκτρονικού ταχυδρομείου
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Παρακαλώ εισάγετε πρώτα το είδος
 DocType: Account,Liability,Υποχρέωση
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Κυρώσεις Το ποσό δεν μπορεί να είναι μεγαλύτερη από την αξίωση Ποσό στη σειρά {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,Ο τιμοκατάλογος δεν έχει επιλεγεί
 DocType: Employee,Family Background,Ιστορικό οικογένειας
 DocType: Request for Quotation Supplier,Send Email,Αποστολή email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Προειδοποίηση: Μη έγκυρη Συνημμένο {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Δεν έχετε άδεια
 DocType: Company,Default Bank Account,Προεπιλεγμένος τραπεζικός λογαριασμός
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Για να φιλτράρετε με βάση Κόμμα, επιλέξτε Τύπος Πάρτυ πρώτα"
@@ -849,7 +854,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Δεν βρέθηκε υπάλληλος
 DocType: Supplier Quotation,Stopped,Σταματημένη
 DocType: Item,If subcontracted to a vendor,Αν υπεργολαβία σε έναν πωλητή
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Η ομάδα σπουδαστών έχει ήδη ενημερωθεί.
 DocType: SMS Center,All Customer Contact,Όλες οι επαφές πελάτη
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ανεβάστε υπόλοιπο αποθεμάτων μέσω csv.
 DocType: Warehouse,Tree Details,δέντρο Λεπτομέρειες
@@ -860,8 +865,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Ελάχιστο ποσό του τιμολογίου
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Κέντρο Κόστους {2} δεν ανήκει στην εταιρεία {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Ο λογαριασμός {2} δεν μπορεί να είναι μια ομάδα
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Στοιχείο Σειρά {idx}: {doctype} {docname} δεν υπάρχει στην παραπάνω »{doctype} &#39;τραπέζι
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Φύλλο κατανομής χρόνου {0} έχει ήδη ολοκληρωθεί ή ακυρωθεί
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Δεν καθήκοντα
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Η ημέρα του μήνα κατά την οποίο θα δημιουργηθεί το αυτοματοποιημένο τιμολόγιο, π.Χ. 05, 28 Κλπ"
 DocType: Asset,Opening Accumulated Depreciation,Άνοιγμα Συσσωρευμένες Αποσβέσεις
@@ -877,7 +882,7 @@
 DocType: Bin,Moving Average Rate,Κινητή μέση τιμή
 DocType: Production Planning Tool,Select Items,Επιλέξτε είδη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} κατά τη χρέωση {1} της {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Πρόγραμμα Μαθημάτων
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Πρόγραμμα Μαθημάτων
 DocType: Maintenance Visit,Completion Status,Κατάσταση ολοκλήρωσης
 DocType: HR Settings,Enter retirement age in years,Εισάγετε την ηλικία συνταξιοδότησης στα χρόνια
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Αποθήκη προορισμού
@@ -885,7 +890,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Επιτρέψτε πάνω από την παράδοση ή την παραλαβή μέχρι αυτή τη τοις εκατό
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Εισαγωγή συμμετοχών
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Όλες οι ομάδες ειδών
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Όλες οι ομάδες ειδών
 DocType: Process Payroll,Activity Log,Αρχείο καταγραφής δραστηριότητας
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Καθαρά κέρδη / ζημίες
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Αυτόματη σύνθεση μηνύματος για την υποβολή συναλλαγών .
@@ -896,7 +901,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Εντολή Αγοράς για Πληρωμή
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Προβλεπόμενη ποσότητα
 DocType: Sales Invoice,Payment Due Date,Ημερομηνία λήξης προθεσμίας πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Θέση Παραλλαγή {0} υπάρχει ήδη με ίδια χαρακτηριστικά
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',«Άνοιγμα»
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ανοικτή To Do
 DocType: Notification Control,Delivery Note Message,Μήνυμα δελτίου αποστολής
@@ -912,7 +917,7 @@
 DocType: Item Reorder,Re-Order Qty,Ποσότητα επαναπαραγγελίας
 DocType: Leave Block List Date,Leave Block List Date,Ημερομηνία λίστας αποκλεισμού ημερών άδειας
 DocType: Pricing Rule,Price or Discount,Τιμή ή έκπτωση
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Σύνολο χρεώσεων που επιβάλλονται στην Αγορά Παραλαβή Είδη πίνακα πρέπει να είναι ίδιο με το συνολικό φόροι και επιβαρύνσεις
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Σύνολο χρεώσεων που επιβάλλονται στην Αγορά Παραλαβή Είδη πίνακα πρέπει να είναι ίδιο με το συνολικό φόροι και επιβαρύνσεις
 DocType: Sales Team,Incentives,Κίνητρα
 DocType: SMS Log,Requested Numbers,Αιτήματα Αριθμοί
 DocType: Production Planning Tool,Only Obtain Raw Materials,Μόνο Αποκτήστε Πρώτες Ύλες
@@ -941,13 +946,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Έχει ανατεθεί ως υπεργολαβία
 DocType: Item Attribute,Item Attribute Values,Τιμές χαρακτηριστικού είδους
 DocType: Examination Result,Examination Result,Αποτέλεσμα εξέτασης
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Αποδεικτικό παραλαβής αγοράς
 ,Received Items To Be Billed,Είδη που παραλήφθηκαν και πρέπει να τιμολογηθούν
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,"Υποβλήθηκε εκκαθαριστικά σημειώματα αποδοχών,"
 DocType: Employee,Ms,Κα
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Κύρια εγγραφή συναλλαγματικής ισοτιμίας.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},DocType αναφοράς πρέπει να είναι ένα από {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},DocType αναφοράς πρέπει να είναι ένα από {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Ανίκανος να βρει χρονοθυρίδα στα επόμενα {0} ημέρες για τη λειτουργία {1}
 DocType: Production Order,Plan material for sub-assemblies,Υλικό σχεδίου για τα υποσυστήματα
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Συνεργάτες πωλήσεων και Επικράτεια
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"δεν μπορεί να δημιουργήσει αυτόματα το λογαριασμό, καθώς υπάρχει ήδη ισορροπία απόθεμα στο Λογαριασμό. Θα πρέπει να δημιουργήσετε έναν λογαριασμό που ταιριάζουν για να μπορέσετε να κάνετε μια καταχώρηση σε αυτό αποθήκη"
@@ -970,10 +975,9 @@
 DocType: Supplier,Default Payable Accounts,Προεπιλεγμένοι λογαριασμοί πληρωτέων
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ο υπάλληλος {0} δεν είναι ενεργός ή δεν υπάρχει
 DocType: Fee Structure,Components,εξαρτήματα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Οι παραλλαγές είδους {0} ενημερώθηκαν
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Παρακαλούμε, εισάγετε Asset Κατηγορία στη θέση {0}"
 DocType: Quality Inspection Reading,Reading 6,Μέτρηση 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,"Δεν είναι δυνατή η {0} {1} {2}, χωρίς οποιαδήποτε αρνητική εκκρεμών τιμολογίων"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Προκαταβολή τιμολογίου αγοράς
 DocType: Hub Settings,Sync Now,Συγχρονισμός τώρα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Γραμμή {0} : μια πιστωτική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
@@ -987,11 +991,11 @@
 DocType: Item,Is Purchase Item,Είναι είδος αγοράς
 DocType: Asset,Purchase Invoice,Τιμολόγιο αγοράς
 DocType: Stock Ledger Entry,Voucher Detail No,Αρ. λεπτομερειών αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Νέο Τιμολόγιο πωλήσεων
 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,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Ημερομηνία ανοίγματος και καταληκτική ημερομηνία θα πρέπει να είναι εντός της ίδιας Χρήσεως
 DocType: Lead,Request for Information,Αίτηση για πληροφορίες
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Συγχρονισμός Τιμολόγια Αποσυνδεδεμένος
 DocType: Payment Request,Paid,Πληρωμένο
 DocType: Program Fee,Program Fee,Χρέωση πρόγραμμα
 DocType: Salary Slip,Total in words,Σύνολο ολογράφως
@@ -1001,7 +1005,7 @@
 DocType: Employee Loan,Sanctioned,Καθιερωμένος
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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» πίνακα."
 DocType: Job Opening,Publish on website,Δημοσιεύει στην ιστοσελίδα
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Αποστολές προς τους πελάτες.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Τιμολόγιο προμηθευτή ημερομηνία αυτή δεν μπορεί να είναι μεγαλύτερη από την απόσπαση Ημερομηνία
@@ -1012,7 +1016,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Διακύμανση
 ,Company Name,Όνομα εταιρείας
 DocType: SMS Center,Total Message(s),Σύνολο μηνυμάτων
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Επιλογή στοιχείου για μεταφορά
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,Επιλέξτε την κύρια εγγραφή λογαριασμού της τράπεζας όπου κατατέθηκε η επιταγή.
@@ -1023,8 +1027,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Γραμμή {0}:η πληρωμή έναντι πωλήσεων / παραγγελιών αγοράς θα πρέπει πάντα να επισημαίνεται ως προκαταβολή
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Χημικό
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Προεπιλογή του τραπεζικού λογαριασμού / Cash θα ενημερώνεται αυτόματα στο Μισθός Εφημερίδα Έναρξη όταν έχει επιλεγεί αυτή η λειτουργία.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Τα διαστήματα για το βαθμό κώδικα {0} συμπίπτει με τα διαστήματα βαθμό για άλλους βαθμούς. Παρακαλώ ελέγξτε διαστήματα {0} και {1} και προσπαθήστε ξανά
 DocType: BOM,Raw Material Cost(Company Currency),Κόστος των πρώτων υλών (Εταιρεία νομίσματος)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Όλα τα είδη έχουν ήδη μεταφερθεί για αυτήν την εντολή παραγωγής.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Σειρά # {0}: Η τιμή δεν μπορεί να είναι μεγαλύτερη από την τιμή {1} {2}
@@ -1036,13 +1038,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Ιστοσελίδα του Είδους
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ανεβάστε την κεφαλίδα επιστολόχαρτου και το λογότυπό σας. (Μπορείτε να τα επεξεργαστείτε αργότερα).
 DocType: Timesheet Detail,Bill,Νομοσχέδιο
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Επόμενο αποσβέσεις Ημερομηνία εισάγεται ως τελευταία ημερομηνία
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Λευκό
 DocType: SMS Center,All Lead (Open),Όλες οι Συστάσεις (ανοιχτές)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Σειρά {0}: Ποσότητα δεν είναι διαθέσιμη για {4} στην αποθήκη {1} στην απόσπαση χρόνο έναρξης ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Βρες προκαταβολές που καταβλήθηκαν
 DocType: Item,Automatically Create New Batch,Δημιουργία αυτόματης νέας παρτίδας
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Δημιούργησε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Δημιούργησε
 DocType: Student Admission,Admission Start Date,Η είσοδος Ημερομηνία Έναρξης
 DocType: Journal Entry,Total Amount in Words,Συνολικό ποσό ολογράφως
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Υπήρξε ένα σφάλμα. Ένας πιθανός λόγος θα μπορούσε να είναι ότι δεν έχετε αποθηκεύσει τη φόρμα. Παρακαλώ επικοινωνήστε με το support@erpnext.Com εάν το πρόβλημα παραμένει.
@@ -1050,7 +1052,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,Αρχική ποσότητα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Παρακαλούμε, εισάγετε Λογαριασμού για την Αλλαγή Ποσό"
 DocType: Student Batch Name,Student Batch Name,Φοιτητής παρτίδας Όνομα
 DocType: Holiday List,Holiday List Name,Όνομα λίστας αργιών
 DocType: Repayment Schedule,Balance Loan Amount,Υπόλοιπο Ποσό Δανείου
@@ -1070,10 +1072,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Παρακαλείστε να προσδιορίσετε ένα {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Που αφαιρούνται χωρίς καμία αλλαγή στην ποσότητα ή την αξία.
 DocType: Delivery Note,Delivery To,Παράδοση προς
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Τραπέζι χαρακτηριστικό γνώρισμα είναι υποχρεωτικό
 DocType: Production Planning Tool,Get Sales Orders,Βρες παραγγελίες πώλησης
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,Η {0} δεν μπορεί να είναι αρνητική
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Έκπτωση
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Έκπτωση
 DocType: Asset,Total Number of Depreciations,Συνολικός αριθμός των Αποσβέσεων
 DocType: Sales Invoice Item,Rate With Margin,Τιμή με περιθώριο
 DocType: Workstation,Wages,Μισθοί
@@ -1088,7 +1090,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Αποθήκη δεσμευμένων στις παραγγελίες πωλησης/ αποθήκη έτοιμων προϊόντων
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Ποσό πώλησης
 DocType: Repayment Schedule,Interest Amount,Ποσό Τόκου
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Είστε ο υπεύθυνος έγκρισης δαπανών για αυτή την εγγραφή. Ενημερώστε την κατάσταση και αποθηκεύστε
 DocType: Serial No,Creation Document No,Αρ. εγγράφου δημιουργίας
 DocType: Issue,Issue,Έκδοση
 DocType: Asset,Scrapped,αχρηστία
@@ -1096,12 +1098,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Χαρακτηριστικά για τις διαμορφώσεις του είδους. Π.Χ. Μέγεθος, χρώμα κ.λ.π."
 DocType: Purchase Invoice,Returns,Επιστροφές
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Αποθήκη εργασιών σε εξέλιξη
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Ο σειριακός αριθμός {0} έχει σύμβαση συντήρησης σε ισχύ μέχρι {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Στρατολόγηση
 DocType: Lead,Organization Name,Όνομα οργανισμού
 DocType: Tax Rule,Shipping State,Μέλος αποστολής
 ,Projected Quantity as Source,Προβλεπόμενη ποσότητα ως πηγής
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Το στοιχείο πρέπει να προστεθεί με τη χρήση του κουμπιού 'Λήψη ειδών από αποδεικτικά παραλαβής'
 DocType: Employee,A-,Α-
 DocType: Production Planning Tool,Include non-stock items,Περιλαμβάνουν στοιχεία μη-απόθεμα
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Έξοδα πωλήσεων
@@ -1109,12 +1111,12 @@
 DocType: GL Entry,Against,Κατά
 DocType: Item,Default Selling Cost Center,Προεπιλεγμένο κέντρο κόστους πωλήσεων
 DocType: Sales Partner,Implementation Partner,Συνεργάτης υλοποίησης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Ταχυδρομικός κώδικας
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Ταχυδρομικός κώδικας
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Πωλήσεις Τάξης {0} είναι {1}
 DocType: Opportunity,Contact Info,Πληροφορίες επαφής
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Κάνοντας Χρηματιστήριο Καταχωρήσεις
 DocType: Packing Slip,Net Weight UOM,Μ.Μ. Καθαρού βάρους
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Αποτελέσματα
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Αποτελέσματα
 DocType: Item,Default Supplier,Προεπιλεγμένος προμηθευτής
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Πάνω Παραγωγής Επίδομα Ποσοστό
 DocType: Employee Loan,Repayment Schedule,Χρονοδιάγραμμα αποπληρωμής
@@ -1122,7 +1124,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Βρες ημερομηνίες εβδομαδιαίων αργιών
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Η ημερομηνία λήξης δεν μπορεί να είναι προγενέστερη της ημερομηνίας έναρξης
 DocType: Sales Person,Select company name first.,Επιλέξτε το όνομα της εταιρείας πρώτα.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Προσφορές που λήφθηκαν από προμηθευτές.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Έως {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Μέσος όρος ηλικίας
@@ -1140,7 +1142,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Βασικός τομέας επιδόσεων
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Μεταφορά
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Μη έγκυρη Χαρακτηριστικό
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} Πρέπει να υποβληθεί
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Ποσότητα πρέπει να είναι μικρότερη ή ίση με {0}
 DocType: SMS Center,Total Characters,Σύνολο χαρακτήρων
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Παρακαλώ επιλέξτε Λ.Υ. στο πεδίο της Λ.Υ. για το είδος {0}
@@ -1151,7 +1153,7 @@
 DocType: Sales Partner,Distributor,Διανομέας
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Κανόνες αποστολής καλαθιού αγορών
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Η εντολή παραγωγής {0} πρέπει να ακυρωθεί πριν από την ακύρωση αυτής της παραγγελίας πώλησης
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Παρακαλούμε να ορίσετε «Εφαρμόστε επιπλέον έκπτωση On»
 ,Ordered Items To Be Billed,Παραγγελθέντα είδη για τιμολόγηση
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"Από το φάσμα πρέπει να είναι μικρότερη από ό, τι στην γκάμα"
 DocType: Global Defaults,Global Defaults,Καθολικές προεπιλογές
@@ -1161,7 +1163,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Έτος έναρξης
 DocType: Purchase Invoice,Start date of current invoice's period,Ημερομηνία έναρξης της περιόδου του τρέχοντος τιμολογίου
 DocType: Salary Slip,Leave Without Pay,Άδεια άνευ αποδοχών
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Χωρητικότητα Σφάλμα Προγραμματισμού
 ,Trial Balance for Party,Ισοζύγιο για το Κόμμα
 DocType: Lead,Consultant,Σύμβουλος
 DocType: Salary Slip,Earnings,Κέρδη
@@ -1176,7 +1178,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Αυτό θα πρέπει να επισυνάπτεται στο κφδικό είδους της παραλλαγής. Για παράδειγμα, εάν η συντομογραφία σας είναι «sm» και ο κωδικός του είδους είναι ""t-shirt"", ο κωδικός του της παραλλαγής του είδους θα είναι ""t-shirt-sm"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Οι καθαρές αποδοχές (ολογράφως) θα είναι ορατές τη στιγμή που θα αποθηκεύσετε τη βεβαίωση αποδοχών
 DocType: Purchase Invoice,Is Return,Είναι η επιστροφή
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Επιστροφή / χρεωστικό σημείωμα
 DocType: Price List Country,Price List Country,Τιμοκατάλογος Χώρα
 DocType: Item,UOMs,Μ.Μ.
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} Έγκυροι σειριακοί αριθμοί για το είδος {1}
@@ -1186,11 +1188,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Παρακαλώ εισάγετε τον κωδικό του Είδους να πάρει Αριθμός Παρτίδας
 DocType: Stock Settings,Default Item Group,Προεπιλεγμένη ομάδα ειδών
 DocType: Employee Loan,Partially Disbursed,"Εν μέρει, προέβη στη χορήγηση"
-DocType: Grading Structure,Grading System Name,Όνομα Σύστημα Βαθμολόγησης
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Βάση δεδομένων προμηθευτών.
 DocType: Account,Balance Sheet,Ισολογισμός
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Κέντρο κόστους για το είδος με το κωδικό είδους '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Τρόπος πληρωμής δεν έχει ρυθμιστεί. Παρακαλώ ελέγξτε, εάν ο λογαριασμός έχει τεθεί σε λειτουργία πληρωμών ή σε POS προφίλ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ο πωλητής σας θα λάβει μια υπενθύμιση την ημερομηνία αυτή για να επικοινωνήσει με τον πελάτη
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ίδιο αντικείμενο δεν μπορεί να εισαχθεί πολλές φορές.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Περαιτέρω λογαριασμών μπορούν να γίνουν στις ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
@@ -1202,7 +1203,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Οι καταχωρήσεις του καθολικού αποθέματος και οι καταχωρήσεις GL θα επαναδημοσιευτούν για τα επιλεγμένα αποδεικτικά παραλαβής αγορών
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Οι καταχωρήσεις του καθολικού αποθέματος και οι καταχωρήσεις GL θα επαναδημοσιευτούν για τα επιλεγμένα αποδεικτικά παραλαβής αγορών
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Στοιχείο 1
 DocType: Holiday,Holiday,Αργία
 DocType: Support Settings,Close Issue After Days,Κλείστε θέμα μετά Ημέρες
@@ -1227,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Η εργασία ολοκληρώθηκε
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Παρακαλείστε να προσδιορίσετε τουλάχιστον ένα χαρακτηριστικό στον πίνακα Χαρακτηριστικά
 DocType: Announcement,All Students,Όλοι οι φοιτητές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Στοιχείο {0} πρέπει να είναι ένα στοιχείο που δεν απόθεμα
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Προβολή καθολικού
 DocType: Grading Scale,Intervals,διαστήματα
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Η πιο παλιά
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Μια ομάδα ειδών υπάρχει με το ίδιο όνομα, μπορείτε να αλλάξετε το όνομα του είδους ή να μετονομάσετε την ομάδα ειδών"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Φοιτητής Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Τρίτες χώρες
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Το είδος {0} δεν μπορεί να έχει παρτίδα
@@ -1270,9 +1271,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Καταβολή του μισθού από {0} έως {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Δεν επιτρέπεται να επεξεργαστείτε τον παγωμένο λογαριασμό {0}
 DocType: Journal Entry,Get Outstanding Invoices,Βρες εκκρεμή τιμολόγια
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Η παραγγελία πώλησης {0} δεν είναι έγκυρη
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,εντολές αγοράς σας βοηθήσει να σχεδιάσετε και να παρακολουθούν τις αγορές σας
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Δυστυχώς, οι εταιρείες δεν μπορούν να συγχωνευθούν"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Η συνολική ποσότητα Issue / Μεταφορά {0} στο Αίτημα Υλικό {1} \ δεν μπορεί να είναι μεγαλύτερη από ό, τι ζητήσατε ποσότητα {2} για τη θέση {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Μικρό
@@ -1293,10 +1294,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Έμμεσες δαπάνες
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Γραμμή {0}: η ποσότητα είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Γεωργία
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Συγχρονισμός Δεδομένα Βασικού Αρχείου
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Τα προϊόντα ή οι υπηρεσίες σας
 DocType: Mode of Payment,Mode of Payment,Τρόπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Ιστοσελίδα εικόνας θα πρέπει να είναι ένα δημόσιο αρχείο ή URL της ιστοσελίδας
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Αυτή είναι μια κύρια ομάδα ειδών και δεν μπορεί να επεξεργαστεί.
@@ -1313,18 +1314,18 @@
 DocType: Student Group Student,Group Roll Number,Αριθμός Αριθμός Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Για {0}, μόνο πιστωτικοί λογαριασμοί μπορούν να συνδέονται με άλλες καταχωρήσεις χρέωσης"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Σύνολο όλων των βαρών στόχος θα πρέπει να είναι: 1. Παρακαλώ ρυθμίστε τα βάρη όλων των εργασιών του έργου ανάλογα
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Το δελτίο αποστολής {0} δεν έχει υποβληθεί
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ο κανόνας τιμολόγησης πρώτα επιλέγεται με βάση το πεδίο 'εφαρμογή στο', το οποίο μπορεί να είναι είδος, ομάδα ειδών ή εμπορικό σήμα"
 DocType: Hub Settings,Seller Website,Ιστοσελίδα πωλητή
 DocType: Item,ITEM-,ΕΊΔΟΣ-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Το σύνολο των κατανεμημέωνων ποσοστών για την ομάδα πωλήσεων πρέπει να είναι 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Η κατάσταση της εντολής παραγωγής είναι {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Η κατάσταση της εντολής παραγωγής είναι {0}
 DocType: Appraisal Goal,Goal,Στόχος
 DocType: Sales Invoice Item,Edit Description,Επεξεργασία Περιγραφή
 ,Team Updates,Ενημερώσεις ομάδα
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Για προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Για προμηθευτή
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Η ρύθμιση του τύπου λογαριασμού βοηθά στην επιλογή αυτού του λογαριασμού στις συναλλαγές.
 DocType: Purchase Invoice,Grand Total (Company Currency),Γενικό σύνολο (νόμισμα της εταιρείας)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Δημιουργία Εκτύπωση Format
@@ -1340,7 +1341,7 @@
 DocType: Depreciation Schedule,Journal Entry,Λογιστική εγγραφή
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} αντικείμενα σε εξέλιξη
 DocType: Workstation,Workstation Name,Όνομα σταθμού εργασίας
-DocType: Grade Interval,Grade Code,Βαθμολογία Κωδικός
+DocType: Grading Scale Interval,Grade Code,Βαθμολογία Κωδικός
 DocType: POS Item Group,POS Item Group,POS Θέση του Ομίλου
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Στείλτε ενημερωτικό άρθρο email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Η Λ.Υ. {0} δεν ανήκει στο είδος {1}
@@ -1356,7 +1357,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,επαναλαμβανόμενες Μέχρι
 DocType: Attendance,HR Manager,Υπεύθυνος ανθρωπίνου δυναμικού
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Παρακαλώ επιλέξτε ένα Εταιρείας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Άδεια μετ' αποδοχών
 DocType: Purchase Invoice,Supplier Invoice Date,Ημερομηνία τιμολογίου του προμηθευτή
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Χρειάζεται να ενεργοποιήσετε το καλάθι αγορών
@@ -1372,7 +1373,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Τροφή
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Eύρος γήρανσης 3
 DocType: Maintenance Schedule Item,No of Visits,Αρ. επισκέψεων
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Το πρόγραμμα συντήρησης {0} υπάρχει έναντι του {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Η εγγραφή των φοιτητών
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Νόμισμα του Λογαριασμού κλεισίματος πρέπει να είναι {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Άθροισμα των βαθμών για όλους τους στόχους πρέπει να είναι 100. Πρόκειται για {0}
@@ -1397,7 +1399,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Μέσος όρος ημερησίως εξερχομένων
 DocType: POS Profile,Campaign,Εκστρατεία
 DocType: Supplier,Name and Type,Όνομα και Τύπος
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Η κατάσταση έγκρισης πρέπει να είναι εγκρίθηκε ή απορρίφθηκε
 DocType: Purchase Invoice,Contact Person,Κύρια εγγραφή επικοινωνίας
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',Η αναμενόμενη ημερομηνία έναρξης δεν μπορεί να είναι μεταγενέστερη από την αναμενόμενη ημερομηνία λήξης
 DocType: Course Scheduling Tool,Course End Date,Φυσικά Ημερομηνία Λήξης
@@ -1420,14 +1422,15 @@
 DocType: Sales Invoice,Shipping Address Name,Όνομα διεύθυνσης αποστολής
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Λογιστικό σχέδιο
 DocType: Material Request,Terms and Conditions Content,Περιεχόμενο όρων και προϋποθέσεων
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,Δεν μπορεί να είναι μεγαλύτερη από 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Το είδος {0} δεν είναι ένα αποθηκεύσιμο είδος
 DocType: Maintenance Visit,Unscheduled,Έκτακτες
 DocType: Employee,Owned,Ανήκουν
 DocType: Salary Detail,Depends on Leave Without Pay,Εξαρτάται από άδειας άνευ αποδοχών
 DocType: Pricing Rule,"Higher the number, higher the priority","Όσο μεγαλύτερος είναι ο αριθμός, τόσο μεγαλύτερη είναι η προτεραιότητα"
 ,Purchase Invoice Trends,Τάσεις τιμολογίου αγοράς
 DocType: Employee,Better Prospects,Καλύτερες προοπτικές
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Σειρά # {0}: Η παρτίδα {1} έχει μόνο {2} qty. Επιλέξτε άλλη παρτίδα που έχει {3} qty διαθέσιμη ή διαχωρίστε τη σειρά σε πολλαπλές σειρές, για παράδοση / έκδοση από πολλαπλές παρτίδες"
 DocType: Vehicle,License Plate,Πινακίδα κυκλοφορίας
 DocType: Appraisal,Goals,Στόχοι
 DocType: Warranty Claim,Warranty / AMC Status,Κατάσταση εγγύησης / Ε.Σ.Υ.
@@ -1445,7 +1448,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Ο υπάλληλος δεν μπορεί να αναφέρει στον ευατό του.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Εάν ο λογαριασμός έχει παγώσει, οι καταχωρήσεις επιτρέπονται σε ορισμένους χρήστες."
 DocType: Email Digest,Bank Balance,Τράπεζα Υπόλοιπο
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Λογιστική καταχώριση για {0}: {1} μπορεί να γίνει μόνο στο νόμισμα: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Επαγγελματικό προφίλ, τα προσόντα που απαιτούνται κ.λ.π."
 DocType: Journal Entry Account,Account Balance,Υπόλοιπο λογαριασμού
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Φορολογικές Κανόνας για τις συναλλαγές.
@@ -1456,7 +1459,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Εμφάνιση P &amp; L υπόλοιπα unclosed χρήσεως
 DocType: Shipping Rule,Shipping Account,Λογαριασμός αποστολών
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Ο λογαριασμός {2} είναι ανενεργό
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Κάντε Παραγγελίες για να σας βοηθήσει να σχεδιάσετε την εργασία σας και να παραδώσει στο χρόνο
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Κάντε Παραγγελίες για να σας βοηθήσει να σχεδιάσετε την εργασία σας και να παραδώσει στο χρόνο
 DocType: Quality Inspection,Readings,Μετρήσεις
 DocType: Stock Entry,Total Additional Costs,Συνολικό πρόσθετο κόστος
 DocType: Course Schedule,SH,SH
@@ -1467,7 +1470,7 @@
 DocType: Shipping Rule Condition,To Value,Έως αξία
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Δελτίο συσκευασίας
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Δελτίο συσκευασίας
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ενοίκιο γραφείου
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Ρύθμιση στοιχείων SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Η εισαγωγή απέτυχε!
@@ -1489,11 +1492,11 @@
 DocType: Company,Services,Υπηρεσίες
 DocType: HR Settings,Email Salary Slip to Employee,Email Μισθός Slip σε Εργαζομένους
 DocType: Cost Center,Parent Cost Center,Γονικό κέντρο κόστους
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Επιλέξτε Πιθανή Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Επιλέξτε Πιθανή Προμηθευτής
 DocType: Sales Invoice,Source,Πηγή
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Εμφάνιση κλειστά
 DocType: Leave Type,Is Leave Without Pay,Είναι άδειας άνευ αποδοχών
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Περιουσιακών στοιχείων της κατηγορίας είναι υποχρεωτική για παγίου στοιχείου
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Δεν βρέθηκαν εγγραφές στον πίνακα πληρωμών
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Αυτό {0} συγκρούσεις με {1} για {2} {3}
 DocType: Student Attendance Tool,Students HTML,φοιτητές HTML
@@ -1511,7 +1514,7 @@
 DocType: Student,Date of Leaving,Ημερομηνία Φεύγοντας
 DocType: Pricing Rule,For Price List,Για τιμοκατάλογο
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Αναζήτησης εκτελεστικού στελέχους
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Δημιουργήστε Συστάσεις
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Δημιουργήστε Συστάσεις
 DocType: Maintenance Schedule,Schedules,Χρονοδιαγράμματα
 DocType: Purchase Invoice Item,Net Amount,Καθαρό Ποσό
 DocType: Purchase Order Item Supplied,BOM Detail No,Αρ. Λεπτομερειών Λ.Υ.
@@ -1539,9 +1542,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,πρόγραμμα Εγγραφές
 DocType: Sales Invoice Item,Brand Name,Εμπορική επωνυμία
 DocType: Purchase Receipt,Transporter Details,Λεπτομέρειες Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Προεπιλογή αποθήκη απαιτείται για επιλεγμένες στοιχείο
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Κουτί
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,πιθανές Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,πιθανές Προμηθευτής
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Ο οργανισμός
 DocType: Budget,Monthly Distribution,Μηνιαία διανομή
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Η λίστα παραλήπτη είναι άδεια. Παρακαλώ δημιουργήστε λίστα παραλήπτη
@@ -1549,7 +1552,7 @@
 DocType: Sales Partner,Sales Partner Target,Στόχος συνεργάτη πωλήσεων
 DocType: Loan Type,Maximum Loan Amount,Ανώτατο ποσό του δανείου
 DocType: Pricing Rule,Pricing Rule,Κανόνας τιμολόγησης
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Διπλότυπος αριθμός κυλίνδρου για φοιτητή {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Διπλότυπος αριθμός κυλίνδρου για φοιτητή {0}
 DocType: Budget,Action if Annual Budget Exceeded,Δράση αν ετήσιος προϋπολογισμός του ξεπερνούσε
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Υλικό αίτηση για αγορά Παραγγελία
 DocType: Shopping Cart Settings,Payment Success URL,Πληρωμή επιτυχία URL
@@ -1570,9 +1573,9 @@
 DocType: Employee Loan,Repayment Method,Τρόπος αποπληρωμής
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Αν επιλεγεί, η σελίδα θα είναι η προεπιλεγμένη Θέση του Ομίλου για την ιστοσελίδα"
 DocType: Quality Inspection Reading,Reading 4,Μέτρηση 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Προεπιλεγμένη ΒΟΜ για {0} δεν βρέθηκε για το Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Προεπιλεγμένη ΒΟΜ για {0} δεν βρέθηκε για το Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Απαιτήσεις εις βάρος της εταιρείας.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Οι μαθητές βρίσκονται στην καρδιά του συστήματος, προσθέστε όλους τους μαθητές σας"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Οι μαθητές βρίσκονται στην καρδιά του συστήματος, προσθέστε όλους τους μαθητές σας"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Σειρά # {0}: Ημερομηνία Εκκαθάρισης {1} δεν μπορεί να είναι πριν Επιταγή Ημερομηνία {2}
 DocType: Company,Default Holiday List,Προεπιλεγμένη λίστα διακοπών
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Σειρά {0}: από το χρόνο και την ώρα της {1} είναι η επικάλυψη με {2}
@@ -1584,21 +1587,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Η ημέρα (ες) για την οποία υποβάλλετε αίτηση για άδεια είναι αργίες. Δεν χρειάζεται να ζητήσει άδεια.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Επανάληψη αποστολής Πληρωμής Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Νέα εργασία
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Κάντε Προσφορά
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Κάντε Προσφορά
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,άλλες εκθέσεις
 DocType: Dependent Task,Dependent Task,Εξαρτημένη Εργασία
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Ο συντελεστής μετατροπής για την προεπιλεγμένη μονάδα μέτρησης πρέπει να είναι 1 στη γραμμή {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Η άδεια του τύπου {0} δεν μπορεί να είναι μεγαλύτερη από {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Δοκιμάστε τον προγραμματισμό εργασιών για το X ημέρες νωρίτερα.
 DocType: HR Settings,Stop Birthday Reminders,Διακοπή υπενθυμίσεων γενεθλίων
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Παρακαλούμε να ορίσετε Προεπιλογή Μισθοδοσίας Πληρωτέο Λογαριασμού Εταιρείας {0}
 DocType: SMS Center,Receiver List,Λίστα παραλήπτη
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Αναζήτηση Είδους
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Αναζήτηση Είδους
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Ποσό που καταναλώθηκε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Καθαρή Αλλαγή σε μετρητά
 DocType: Assessment Plan,Grading Scale,Κλίμακα βαθμολόγησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,έχουν ήδη ολοκληρωθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Η μονάδα μέτρησης {0} έχει εισαχθεί περισσότερες από μία φορές στον πίνακας παραγόντων μετατροπής
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,έχουν ήδη ολοκληρωθεί
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Αίτηση Πληρωμής υπάρχει ήδη {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Κόστος ειδών που εκδόθηκαν
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Η ποσότητα δεν πρέπει να είναι μεγαλύτερη από {0}
@@ -1630,12 +1633,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Κάντε εκταμίευση Έναρξη
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Σειρά {0}: Προκαταβολή έναντι Προμηθευτής οφείλει να χρεώσει
 DocType: Company,Default Values,Προεπιλεγμένες Τιμές
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Συχνότητα} Ψηφίστε
 DocType: Expense Claim,Total Amount Reimbursed,Συνολικού ποσού που αποδόθηκε
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Αυτό βασίζεται στα ημερολόγια του κατά αυτό το όχημα. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Συλλέγω
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Κατά το τιμολόγιο προμηθευτή {0} της {1}
 DocType: Customer,Default Price List,Προεπιλεγμένος τιμοκατάλογος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ρεκόρ Κίνηση περιουσιακό στοιχείο {0} δημιουργήθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Δεν μπορείτε να διαγράψετε Χρήσεως {0}. Φορολογικό Έτος {0} έχει οριστεί ως προεπιλογή στο Καθολικές ρυθμίσεις
 DocType: Journal Entry,Entry Type,Τύπος εισόδου
 ,Customer Credit Balance,Υπόλοιπο πίστωσης πελάτη
@@ -1652,7 +1656,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Προμήθεια
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Κανένα από τα στοιχεία που έχουν οποιαδήποτε μεταβολή στην ποσότητα ή την αξία.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Υποχρεωτικό πεδίο - Πρόγραμμα
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Αξίωση εγγύησης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Αξίωση εγγύησης
 ,Lead Details,Λεπτομέρειες Σύστασης
 DocType: Salary Slip,Loan repayment,Αποπληρωμή δανείου
 DocType: Purchase Invoice,End date of current invoice's period,Ημερομηνία λήξης της περιόδου του τρέχοντος τιμολογίου
@@ -1671,11 +1675,10 @@
 DocType: Employee,Permanent Address,Μόνιμη διεύθυνση
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Καταβληθείσα προκαταβολή κατά {0} {1} δεν μπορεί να είναι μεγαλύτερο \ από Γενικό Σύνολο {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Παρακαλώ επιλέξτε κωδικό είδους
 DocType: Student Sibling,Studying in Same Institute,Σπουδάζουν στο ίδιο Ινστιτούτο
 DocType: Territory,Territory Manager,Διευθυντής περιοχής
 DocType: Packed Item,To Warehouse (Optional),Για Αποθήκη (Προαιρετικό)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Payment Entry,Paid Amount (Company Currency),Ποσού που καταβλήθηκε (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,Additional Discount,Επιπλέον έκπτωση
 DocType: Selling Settings,Selling Settings,Ρυθμίσεις πώλησης
@@ -1685,9 +1688,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Προβολή Καλάθι
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Δαπάνες marketing
 ,Item Shortage Report,Αναφορά έλλειψης είδους
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Το βάρος αναφέρεται, \nπαρακαλώ, αναφέρετε επίσης και τη μονάδα μέτρησης βάρους'"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Αίτηση υλικού που χρησιμοποιείται για να γίνει αυτήν η καταχώρnση αποθέματος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Επόμενο Αποσβέσεις ημερομηνία είναι υποχρεωτική για νέο περιουσιακό στοιχείο
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Επόμενο Αποσβέσεις ημερομηνία είναι υποχρεωτική για νέο περιουσιακό στοιχείο
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ξεχωριστή ομάδα μαθημάτων που βασίζεται σε μαθήματα για κάθε παρτίδα
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Μία μονάδα ενός είδους
 DocType: Fee Category,Fee Category,χρέωση Κατηγορία
@@ -1703,8 +1706,7 @@
 DocType: Course Assessment Criteria,Weightage,Ζύγισμα
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Κέντρο κόστος που απαιτείται για την «Αποτελεσμάτων Χρήσεως» του λογαριασμού {2}. Παρακαλείστε να δημιουργήσει ένα προεπιλεγμένο Κέντρο Κόστους για την Εταιρεία.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Μια ομάδα πελατών υπάρχει με το ίδιο όνομα παρακαλώ να αλλάξετε το όνομα του πελάτη ή να μετονομάσετε την ομάδα πελατών
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1721,7 +1723,7 @@
 ,Item-wise Sales Register,Ταμείο πωλήσεων ανά είδος
 DocType: Asset,Gross Purchase Amount,Ακαθάριστο Ποσό Αγορά
 DocType: Asset,Depreciation Method,Μέθοδος απόσβεσης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ο φόρος αυτός περιλαμβάνεται στη βασική τιμή;
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Σύνολο στόχου
 DocType: Program Course,Required,Απαιτείται
@@ -1731,20 +1733,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Συμφωνία json
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Πάρα πολλές στήλες. Εξάγετε την έκθεση για να την εκτυπώσετε χρησιμοποιώντας μια εφαρμογή λογιστικών φύλλων.
 DocType: Purchase Invoice Item,Batch No,Αρ. Παρτίδας
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ανίκανος να βρει συναλλαγματική ισοτιμία για {0} έως {1} για τα βασικά ημερομηνία {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Επιτρέψτε πολλαπλές Παραγγελίες εναντίον παραγγελίας του Πελάτη
 DocType: Student Group Instructor,Student Group Instructor,Φοιτητής ομάδας εκπαιδευτών
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Όχι
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Κύριο
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Παραλλαγή
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Κύριο
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Παραλλαγή
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ορίστε πρόθεμα για τη σειρά αρίθμησης για τις συναλλαγές σας
 DocType: Employee Attendance Tool,Employees HTML,Οι εργαζόμενοι HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Προεπιλογή BOM ({0}) πρέπει να είναι ενεργή για αυτό το στοιχείο ή το πρότυπο της
 DocType: Employee,Leave Encashed?,Η άδεια εισπράχθηκε;
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Το πεδίο 'ευκαιρία από' είναι υποχρεωτικό
 DocType: Email Digest,Annual Expenses,ετήσια Έξοδα
 DocType: Item,Variants,Παραλλαγές
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Δημιούργησε παραγγελία αγοράς
 DocType: SMS Center,Send To,Αποστολή προς
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Δεν υπάρχει αρκετό υπόλοιπο άδειας για άδειες τύπου {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Ποσό που διατέθηκε
@@ -1752,17 +1753,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Η αποθήκη εργασιών σε εξέλιξηαπαιτείται πριν την υποβολή
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Αιτών εργασία
 DocType: Purchase Order Item,Warehouse and Reference,Αποθήκη και αναφορά
 DocType: Supplier,Statutory info and other general information about your Supplier,Πληροφορίες καταστατικού και άλλες γενικές πληροφορίες σχετικά με τον προμηθευτή σας
 DocType: Item,Serial Nos and Batches,Σειριακοί αριθμοί και παρτίδες
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Δύναμη ομάδας σπουδαστών
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Κατά την ημερολογιακή εγγραφή {0} δεν έχει καμία αταίριαστη {1} καταχώρηση
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,εκτιμήσεις
 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: Grading Structure,Grading Intervals,διαστήματα ταξινόμησης
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Παρακαλώ περάστε
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Δεν είναι δυνατή η overbill για Θέση {0} στη γραμμή {1} περισσότερο από {2}. Για να καταστεί δυνατή η υπερβολική τιμολόγηση, ορίστε στην Αγορά Ρυθμίσεις"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Παρακαλούμε να ορίσετε το φίλτρο σύμφωνα με το σημείο ή την αποθήκη
@@ -1774,17 +1774,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Η Λ.Υ. {0} πρέπει να υποβληθεί
 DocType: Authorization Control,Authorization Control,Έλεγχος εξουσιοδότησης
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Σειρά # {0}: Απορρίφθηκε Αποθήκη είναι υποχρεωτική κατά στοιχείο που έχει απορριφθεί {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Πληρωμή
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Διαχειριστείτε τις παραγγελίες σας
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Πληρωμή
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Διαχειριστείτε τις παραγγελίες σας
 DocType: Production Order Operation,Actual Time and Cost,Πραγματικός χρόνος και κόστος
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Αίτηση υλικού με μέγιστο {0} μπορεί να γίνει για το είδος {1} κατά την παραγγελία πώλησης {2}
 DocType: Employee,Salutation,Χαιρετισμός
 DocType: Course,Course Abbreviation,Σύντμηση γκολφ
 DocType: Student Leave Application,Student Leave Application,Φοιτητής Αφήστε Εφαρμογή
 DocType: Item,Will also apply for variants,Θα ισχύουν επίσης για τις παραλλαγές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Περιουσιακό στοιχείο δεν μπορεί να ακυρωθεί, δεδομένου ότι είναι ήδη {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Υπάλληλος {0} για Μισή μέρα στο {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Οι συνολικές ώρες εργασίας δεν πρέπει να είναι μεγαλύτερη από το ωράριο εργασίας max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Στις
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Ομαδοποίηση ειδών κατά τη στιγμή της πώλησης.
 DocType: Quotation Item,Actual Qty,Πραγματική ποσότητα
 DocType: Sales Invoice Item,References,Παραπομπές
@@ -1794,7 +1795,7 @@
 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 +91,Associate,Συνεργάτης
 DocType: Asset Movement,Asset Movement,Asset Κίνημα
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,νέα καλαθιού
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,νέα καλαθιού
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Το είδος {0} δεν είναι είδος μίας σειράς
 DocType: SMS Center,Create Receiver List,Δημιουργία λίστας παραλήπτη
 DocType: Vehicle,Wheels,τροχοί
@@ -1826,9 +1827,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Απενεργοποιεί τη δημιουργία του χρόνου κορμών κατά Εντολές Παραγωγής. Οι πράξεις δεν θα πρέπει να παρακολουθούνται κατά την παραγωγή διαταγής
 DocType: Student,Student Mobile Number,Φοιτητής Αριθμός Κινητού
 DocType: Item,Has Variants,Έχει παραλλαγές
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Έχετε ήδη επιλεγμένα αντικείμενα από {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Όνομα της μηνιαίας διανομής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Το αναγνωριστικό παρτίδας είναι υποχρεωτικό
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Το αναγνωριστικό παρτίδας είναι υποχρεωτικό
 DocType: Sales Person,Parent Sales Person,Γονικός πωλητής
 DocType: Purchase Invoice,Recurring Invoice,Επαναλαμβανόμενο τιμολόγιο
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Διαχείριση έργων
@@ -1836,11 +1837,11 @@
 DocType: Budget,Fiscal Year,Χρήση
 DocType: Vehicle Log,Fuel Price,των τιμών των καυσίμων
 DocType: Budget,Budget,Προϋπολογισμός
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Πάγιο περιουσιακό στοιχείο πρέπει να είναι ένα στοιχείο μη διαθέσιμο.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά {0}, δεδομένου ότι δεν είναι ένας λογαριασμός έσοδα ή έξοδα"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Επιτεύχθηκε
 DocType: Student Admission,Application Form Route,Αίτηση Διαδρομή
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Περιοχή / πελάτης
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Περιοχή / πελάτης
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,Π.Χ. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Αφήστε Τύπος {0} δεν μπορεί να διατεθεί αφού φύγετε χωρίς αμοιβή
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Γραμμή {0}: Το ποσό που διατίθεται {1} πρέπει να είναι μικρότερο ή ίσο με το οφειλόμενο ποσό του τιμολογίου {2}
@@ -1860,14 +1861,14 @@
 ,Serial No Status,Κατάσταση σειριακού αριθμού
 DocType: Payment Entry Reference,Outstanding,Εκκρεμής
 ,Daily Timesheet Summary,Καθημερινή Σύνοψη Timesheet
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Γραμμή {0}: για να ρυθμίσετε {1} περιοδικότητα, η διαφορά μεταξύ της ημερομηνίας από και έως \ πρέπει να είναι μεγαλύτερη ή ίση με {2}"""
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Αυτό βασίζεται στην κίνηση των αποθεμάτων. Δείτε {0} για λεπτομέρειες
 DocType: Pricing Rule,Selling,Πώληση
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Ποσό {0} {1} αφαιρούνται από {2}
 DocType: Employee,Salary Information,Πληροφορίες μισθού
 DocType: Sales Person,Name and Employee ID,Όνομα και ID υπαλλήλου
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Η ημερομηνία λήξης προθεσμίας δεν μπορεί να είναι πριν από την ημερομηνία αποστολής
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Δασμοί και φόροι
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Παρακαλώ εισάγετε την ημερομηνία αναφοράς
@@ -1879,14 +1880,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Δεν μπορεί να παραπέμψει τον αριθμό σειράς μεγαλύτερο ή ίσο με τον τρέχοντα αριθμό γραμμής για αυτόν τον τύπο επιβάρυνσης
 DocType: Asset,Sold,Πωληθεί
 ,Item-wise Purchase History,Ιστορικό αγορών ανά είδος
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε τον σειριακό αριθμό που προστέθηκε για το είδος {0}
 DocType: Account,Frozen,Παγωμένα
 ,Open Production Orders,Ανοιχτές εντολές παραγωγής
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Βάση Ποσό (Εταιρεία νομίσματος)
 DocType: Payment Reconciliation Payment,Reference Row,Σειρά αναφοράς
 DocType: Installation Note,Installation Time,Ώρα εγκατάστασης
 DocType: Sales Invoice,Accounting Details,Λογιστική Λεπτομέρειες
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Διαγράψτε όλες τις συναλλαγές για αυτή την Εταιρεία
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Επενδύσεις
 DocType: Issue,Resolution Details,Λεπτομέρειες επίλυσης
@@ -1918,13 +1919,13 @@
 DocType: Discussion,Discussion,Συζήτηση
 DocType: Payment Entry,Transaction ID,Ταυτότητα συναλλαγής
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Οι κανόνες τιμολόγησης φιλτράρονται περαιτέρω με βάση την ποσότητα.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Ρυθμίστε την Ημερομηνία Σύνδεσης για το {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Συνολικό Ποσό χρέωσης (μέσω Ώρα Φύλλο)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Έσοδα επαναλαμβανόμενων πελατών
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) Πρέπει να έχει ρόλο «υπεύθυνος έγκρισης δαπανών»
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Ζεύγος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Επιλέξτε BOM και Ποσότητα Παραγωγής
 DocType: Asset,Depreciation Schedule,Πρόγραμμα αποσβέσεις
 DocType: Bank Reconciliation Detail,Against Account,Κατά τον λογαριασμό
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Μισό Ημερομηνία Ημέρα θα πρέπει να είναι μεταξύ Από Ημερομηνία και μέχρι σήμερα
@@ -1938,16 +1939,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Παρακαλούμε να ορίσετε «Asset Κέντρο Αποσβέσεις Κόστους» στην εταιρεία {0}
 ,Maintenance Schedules,Χρονοδιαγράμματα συντήρησης
 DocType: Task,Actual End Date (via Time Sheet),Πραγματική Ημερομηνία λήξης (μέσω Ώρα Φύλλο)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Ποσό {0} {1} από {2} {3}
 ,Quotation Trends,Τάσεις προσφορών
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Η ομάδα είδους δεν αναφέρεται στην κύρια εγγραφή είδους για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Ο 'λογαριασμός χρέωσης προς' Χρέωση του λογαριασμού πρέπει να είναι λογαριασμός απαιτήσεων
 DocType: Shipping Rule Condition,Shipping Amount,Κόστος αποστολής
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Ποσό που εκκρεμεί
 DocType: Purchase Invoice Item,Conversion Factor,Συντελεστής μετατροπής
 DocType: Purchase Order,Delivered,Παραδόθηκε
 ,Vehicle Expenses,Έξοδα όχημα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
+DocType: Serial No,Invoice Details,Λεπτομέρειες τιμολογίου
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Αναμενόμενη τιμή μετά την ωφέλιμη ζωή πρέπει να είναι μεγαλύτερη ή ίση με {0}
 DocType: Purchase Receipt,Vehicle Number,Αριθμός Οχημάτων
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Η ημερομηνία κατά την οποία το επαναλαμβανόμενο τιμολόγιο θα σταματήσει
 DocType: Employee Loan,Loan Amount,Ποσο δανειου
@@ -1965,12 +1967,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,φύλλων
 DocType: HR Settings,HR Settings,Ρυθμίσεις ανθρωπίνου δυναμικού
 DocType: Salary Slip,net pay info,καθαρών αποδοχών πληροφορίες
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Η αξίωση δαπανών είναι εν αναμονή έγκρισης. Μόνο ο υπεύθυνος έγκρισης δαπανών να ενημερώσει την κατάστασή της.
 DocType: Email Digest,New Expenses,νέα Έξοδα
 DocType: Purchase Invoice,Additional Discount Amount,Πρόσθετες ποσό έκπτωσης
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Σειρά # {0}: Ποσότητα πρέπει να είναι 1, ως στοιχείο αποτελεί πάγιο περιουσιακό στοιχείο. Παρακαλούμε χρησιμοποιήστε ξεχωριστή σειρά για πολλαπλές ποσότητα."
 DocType: Leave Block List Allow,Leave Block List Allow,Επίτρεψε λίστα αποκλεισμού ημερών άδειας
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Συντ δεν μπορεί να είναι κενό ή χώρος
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Ομάδα για να μη Ομάδα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Αθλητισμός
 DocType: Loan Type,Loan Name,δάνειο Όνομα
@@ -1981,6 +1983,7 @@
 ,Customer Acquisition and Loyalty,Απόκτηση πελατών και πίστη
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Αποθήκη όπου θα γίνεται διατήρηση αποθέματος για απορριφθέντα στοιχεία
 DocType: Production Order,Skip Material Transfer,Παράλειψη μεταφοράς υλικού
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Δεν βρέθηκε συναλλαγματική ισοτιμία {0} έως {1} για ημερομηνία κλειδιού {2}. Δημιουργήστε μια εγγραφή συναλλάγματος με μη αυτόματο τρόπο
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Το οικονομικό έτος σας τελειώνει στις
 DocType: POS Profile,Price List,Τιμοκατάλογος
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} Είναι τώρα η προεπιλεγμένη χρήση. Παρακαλώ ανανεώστε το πρόγραμμα περιήγησής σας για να τεθεί σε ισχύ η αλλαγή.
@@ -1997,19 +2000,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Ο Λογαριασμός {0} δεν είναι έγκυρη. Ο Λογαριασμός νομίσματος πρέπει να είναι {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ο συντελεστής μετατροπής Μ.Μ. είναι απαραίτητος στη γραμμή {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα Πωλήσεις Τάξης, Τιμολόγιο Πωλήσεων ή Εφημερίδα Έναρξη"
 DocType: Salary Component,Deduction,Κρατήση
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Σειρά {0}: από το χρόνο και τον χρόνο είναι υποχρεωτική.
 DocType: Stock Reconciliation Item,Amount Difference,ποσό Διαφορά
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Είδους Τιμή προστεθεί {0} στην Τιμοκατάλογος {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Παρακαλώ εισάγετε το αναγνωριστικό Υπάλληλος αυτό το άτομο πωλήσεων
 DocType: Territory,Classification of Customers by region,Ταξινόμηση των πελατών ανά περιοχή
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Διαφορά Ποσό πρέπει να είναι μηδέν
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Διαφορά Ποσό πρέπει να είναι μηδέν
 DocType: Project,Gross Margin,Μικτό Περιθώριο Κέρδους
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Παρακαλώ εισάγετε πρώτα το είδος παραγωγής
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Υπολογιζόμενο Τράπεζα ισορροπία Δήλωση
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Απενεργοποιημένος χρήστης
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Προσφορά
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Προσφορά
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Συνολική έκπτωση
 ,Production Analytics,παραγωγή Analytics
@@ -2018,9 +2021,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Προειδοποίηση: Μη έγκυρο πιστοποιητικό SSL στο συνημμένο {0}
 DocType: Student Admission,Eligibility,Αιρετότητα
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Οδηγεί σας βοηθήσει να πάρετε την επιχείρησή, προσθέστε όλες τις επαφές σας και περισσότερο, όπως σας οδηγεί"
 DocType: Production Order Operation,Actual Operation Time,Πραγματικός χρόνος λειτουργίας
 DocType: Authorization Rule,Applicable To (User),Εφαρμοστέα σε (user)
 DocType: Purchase Taxes and Charges,Deduct,Αφαίρεσε
@@ -2035,7 +2038,7 @@
 DocType: Guardian,Work Address,Διεύθυνση εργασίας
 DocType: Appraisal,Calculate Total Score,Υπολογισμός συνολικής βαθμολογίας
 DocType: Request for Quotation,Manufacturing Manager,Υπεύθυνος παραγωγής
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Ο σειριακός αριθμός {0} έχει εγγύηση μέχρι {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Χώρισε το δελτίο αποστολής σημείωση σε πακέτα.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Αποστολές
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Το υπόλοιπο του λογαριασμού ({0}) για {1} και η αξία αποθεμάτων ({2}) για την αποθήκη {3} πρέπει να είναι ίδια
@@ -2056,10 +2059,10 @@
 DocType: Leave Application,Total Leave Days,Σύνολο ημερών άδειας
 DocType: Email Digest,Note: Email will not be sent to disabled users,Σημείωση: το email δε θα σταλεί σε απενεργοποιημένους χρήστες
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Αριθμός Αλληλεπίδρασης
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Επιλέξτε εταιρία...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Επιλέξτε εταιρία...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Άφησε το κενό αν ισχύει για όλα τα τμήματα
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Μορφές απασχόλησης ( μόνιμη, σύμβαση, πρακτική άσκηση κ.λ.π. )."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},Η {0} είναι απαραίτητη για το είδος {1}
 DocType: Process Payroll,Fortnightly,Κατά δεκατετραήμερο
 DocType: Currency Exchange,From Currency,Από το νόμισμα
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Παρακαλώ επιλέξτε χορηγούμενο ποσό, τύπο τιμολογίου και αριθμό τιμολογίου σε τουλάχιστον μία σειρά"
@@ -2068,14 +2071,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Τιμή (νόμισμα της εταιρείας)
 DocType: Student Guardian,Others,Άλλα
 DocType: Payment Entry,Unallocated Amount,μη διατεθέντων Ποσό
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Δεν μπορείτε να βρείτε μια αντίστοιχη Θέση. Παρακαλούμε επιλέξτε κάποια άλλη τιμή για το {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Δεν περισσότερες ενημερώσεις
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Δεν μπορείτε να επιλέξετε τον τύπο επιβάρυνσης ως ποσό προηγούμενης γραμμής ή σύνολο προηγούμενης γραμμής για την πρώτη γραμμή
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Παιδί στοιχείο δεν πρέπει να είναι ένα Bundle προϊόντων. Παρακαλώ αφαιρέστε το αντικείμενο `{0}` και να αποθηκεύσετε
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Κατάθεση
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Προσθήκη Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Προσθήκη Timesheets
 DocType: Vehicle Service,Service Item,υπηρεσία Στοιχείο
 DocType: Bank Guarantee,Bank Guarantee,Τραπεζική εγγύηση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος' για να δείτε το πρόγραμμα
@@ -2099,6 +2102,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Σειρά # {0}: Asset {1} είναι ήδη {2}
 DocType: Quotation Item,Stock Balance,Ισοζύγιο αποθέματος
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Πωλήσεις Τάξης να Πληρωμής
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ορίστε την Ονοματοδοσία Σειράς για {0} μέσω του Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Λεπτομέρειες αξίωσης δαπανών
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Παρακαλώ επιλέξτε σωστό λογαριασμό
@@ -2123,14 +2127,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Οι τιμές δεν θα εμφανίζεται αν Τιμοκατάλογος δεν έχει οριστεί
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Προσδιορίστε μια χώρα για αυτή την αποστολή κανόνα ή ελέγξτε Παγκόσμια ναυτιλία
 DocType: Stock Entry,Total Incoming Value,Συνολική εισερχόμενη αξία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Χρεωστικό να απαιτείται
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Χρεωστικό να απαιτείται
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Φύλλων βοηθήσει να παρακολουθείτε την ώρα, το κόστος και τη χρέωση για δραστηριότητες γίνεται από την ομάδα σας"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Τιμοκατάλογος αγορών
 DocType: Offer Letter Term,Offer Term,Προσφορά Όρος
 DocType: Quality Inspection,Quality Manager,Υπεύθυνος διασφάλισης ποιότητας
 DocType: Job Applicant,Job Opening,Άνοιγμα θέσης εργασίας
 DocType: Payment Reconciliation,Payment Reconciliation,Συμφωνία πληρωμής
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Παρακαλώ επιλέξτε το όνομα υπευθύνου
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Τεχνολογία
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Το σύνολο των απλήρωτων: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM λειτουργίας της ιστοσελίδας
@@ -2157,23 +2161,23 @@
 DocType: Opportunity,Lost Reason,Αιτιολογία απώλειας
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Νέα Διεύθυνση
 DocType: Quality Inspection,Sample Size,Μέγεθος δείγματος
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Όλα τα είδη έχουν ήδη τιμολογηθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Παρακαλούμε, εισάγετε παραστατικό παραλαβής"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Περαιτέρω κέντρα κόστους μπορεί να γίνει κάτω από ομάδες, αλλά εγγραφές μπορούν να γίνουν με την μη Ομάδες"
 DocType: Project,External,Εξωτερικός
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Χρήστες και δικαιώματα
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Εντολές Παραγωγής Δημιουργήθηκε: {0}
 DocType: Branch,Branch,Υποκατάστημα
 DocType: Guardian,Mobile Number,Αριθμός κινητού
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Εκτύπωσης και Branding
 DocType: Bin,Actual Quantity,Πραγματική ποσότητα
 DocType: Shipping Rule,example: Next Day Shipping,Παράδειγμα: αποστολή την επόμενη μέρα
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Ο σειριακός αριθμός {0} δεν βρέθηκε
 DocType: Scheduling Tool,Student Batch,Batch φοιτητής
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Οι πελάτες σας
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Κάντε Φοιτητής
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Κάντε Φοιτητής
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Έχετε προσκληθεί να συνεργαστούν για το έργο: {0}
 DocType: Leave Block List Date,Block Date,Αποκλεισμός ημερομηνίας
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Κάνε αίτηση τώρα
@@ -2196,8 +2200,9 @@
 DocType: SMS Log,Sent To,Αποστέλλονται
 DocType: Payment Request,Make Sales Invoice,Δημιούργησε τιμολόγιο πώλησης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,λογισμικά
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Επόμενο Ημερομηνία Επικοινωνήστε δεν μπορεί να είναι στο παρελθόν
 DocType: Company,For Reference Only.,Για αναφορά μόνο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Επιλέξτε Αριθμός παρτίδας
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Άκυρη {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-αναδρομική έναρξη
 DocType: Sales Invoice Advance,Advance Amount,Ποσό προκαταβολής
@@ -2211,7 +2216,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ο αρ. Υπόθεσης δεν μπορεί να είναι 0
 DocType: Item,Show a slideshow at the top of the page,Δείτε μια παρουσίαση στην κορυφή της σελίδας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Καταστήματα
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Καταστήματα
 DocType: Serial No,Delivery Time,Χρόνος παράδοσης
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Γήρανση με βάση την
 DocType: Item,End of Life,Τέλος της ζωής
@@ -2223,12 +2228,12 @@
 DocType: Rename Tool,Rename Tool,Εργαλείο μετονομασίας
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Ενημέρωση κόστους
 DocType: Item Reorder,Item Reorder,Αναδιάταξη είδους
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Εμφάνιση Μισθός Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Μεταφορά υλικού
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Εμφάνιση Μισθός Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Μεταφορά υλικού
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Καθορίστε τις λειτουργίες, το κόστος λειτουργίας και να δώστε ένα μοναδικό αριθμό λειτουργίας στις λειτουργίες σας."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Το έγγραφο αυτό είναι πάνω από το όριο του {0} {1} για το στοιχείο {4}. Κάνετε μια άλλη {3} κατά την ίδια {2};
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Παρακαλούμε να ορίσετε επαναλαμβανόμενες μετά την αποθήκευση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,υπόψη το ποσό Επιλέξτε αλλαγή
 DocType: Purchase Invoice,Price List Currency,Νόμισμα τιμοκαταλόγου
 DocType: Naming Series,User must always select,Ο χρήστης πρέπει πάντα να επιλέγει
 DocType: Stock Settings,Allow Negative Stock,Επίτρεψε αρνητικό απόθεμα
@@ -2239,7 +2244,7 @@
 DocType: Budget Account,Budget Account,Ο λογαριασμός του προϋπολογισμού
 DocType: Quality Inspection,Verified By,Πιστοποιημένο από
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Δεν μπορεί να αλλάξει προεπιλεγμένο νόμισμα της εταιρείας, επειδή υπάρχουν υφιστάμενες συναλλαγές. Οι συναλλαγές πρέπει να ακυρωθούν για να αλλάξετε το εξ 'ορισμού νόμισμα."
-DocType: Grade Interval,Grade Description,βαθμός Περιγραφή
+DocType: Grading Scale Interval,Grade Description,βαθμός Περιγραφή
 DocType: Stock Entry,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,Δημιουργία βεβαίωσης αποδοχών
@@ -2277,7 +2282,7 @@
 DocType: Upload Attendance,Attendance To Date,Προσέλευση μέχρι ημερομηνία
 DocType: Warranty Claim,Raised By,Δημιουργήθηκε από
 DocType: Payment Gateway Account,Payment Account,Λογαριασμός πληρωμών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Παρακαλώ ορίστε εταιρεία για να προχωρήσετε
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Καθαρή Αλλαγή σε εισπρακτέους λογαριασμούς
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Αντισταθμιστικά απενεργοποιημένα
 DocType: Offer Letter,Accepted,Αποδεκτό
@@ -2286,12 +2291,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Παρακαλώ βεβαιωθείτε ότι έχετε πραγματικά θέλετε να διαγράψετε όλες τις συναλλαγές για την εν λόγω εταιρεία. Τα δεδομένα της κύριας σας θα παραμείνει ως έχει. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.
 DocType: Room,Room Number,Αριθμός δωματίου
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Άκυρη αναφορά {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) Δεν μπορεί να είναι μεγαλύτερη από τη προβλεπόμενη ποσότητα ({2}) της Εντολής Παραγωγής  {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) Δεν μπορεί να είναι μεγαλύτερη από τη προβλεπόμενη ποσότητα ({2}) της Εντολής Παραγωγής  {3}
 DocType: Shipping Rule,Shipping Rule Label,Ετικέτα κανόνα αποστολής
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Φόρουμ Χρηστών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Το πεδίο πρώτων ύλών δεν μπορεί να είναι κενό.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Δεν ήταν δυνατή η ενημέρωση των αποθεμάτων, τιμολόγιο περιέχει πτώση στέλνοντας στοιχείο."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Γρήγορη Εφημερίδα Είσοδος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Δεν μπορείτε να αλλάξετε τιμοκατάλογο, αν η λίστα υλικών αναφέρεται σε οποιουδήποτε είδος"
 DocType: Employee,Previous Work Experience,Προηγούμενη εργασιακή εμπειρία
 DocType: Stock Entry,For Quantity,Για Ποσότητα
@@ -2304,7 +2309,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Όροι και προϋποθέσεις 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Το όνομα του ιδρύματος για το οποίο είστε δημιουργία αυτού του συστήματος.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Η λογιστική εγγραφή έχει παγώσει μέχρι την ημερομηνία αυτή, κανείς δεν μπορεί να κάνει / τροποποιήσει καταχωρήσεις, εκτός από τον ρόλο που καθορίζεται παρακάτω."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Παρακαλώ αποθηκεύστε το έγγραφο πριν από τη δημιουργία του χρονοδιαγράμματος συντήρησης
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Κατάσταση έργου
 DocType: UOM,Check this to disallow fractions. (for Nos),Επιλέξτε αυτό για να απαγορεύσετε κλάσματα. (Όσον αφορά τους αριθμούς)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Οι ακόλουθες Εντολές Παραγωγής δημιουργήθηκαν:
@@ -2331,7 +2336,7 @@
 ,Employees working on a holiday,Οι εργαζόμενοι που εργάζονται σε διακοπές
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Παρόν
 DocType: Project,% Complete Method,% Πλήρης μέθοδος
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Η ημερομηνία έναρξης συντήρησης δεν μπορεί να είναι πριν από την ημερομηνία παράδοσης για τον σειριακό αριθμό {0}
 DocType: Production Order,Actual End Date,Πραγματική ημερομηνία λήξης
 DocType: BOM,Operating Cost (Company Currency),Λειτουργικό κόστος (Εταιρεία νομίσματος)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2348,7 +2353,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Άδειας άνευ αποδοχών δεν ταιριάζει με τα εγκεκριμένα αρχεία Αφήστε Εφαρμογή
 DocType: Campaign,Campaign-.####,Εκστρατεία-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Επόμενα βήματα
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Παρακαλείστε να παρέχουν τις συγκεκριμένες θέσεις στις καλύτερες δυνατές τιμές
 DocType: Selling Settings,Auto close Opportunity after 15 days,Αυτόματη κοντά Ευκαιρία μετά από 15 ημέρες
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,στο τέλος του έτους
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Ποσοστό / Μόλυβδος%
@@ -2405,7 +2410,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Ποσότητα που παραλήφθηκε
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Εγγραφές τέλους Δημιουργήθηκε - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Κατηγορία Λογαριασμού
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Δεν γίνεται να παραχθούν είδη {0} περισσότερα από την ποσότητα παραγγελίας πώλησης {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Χρηματιστήριο Έναρξη {0} δεν έχει υποβληθεί
 DocType: Payment Reconciliation,Bank / Cash Account,Λογαριασμός καταθέσεων σε τράπεζα / μετρητών
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Επόμενο Επικοινωνία Με το να μην μπορεί να είναι ίδιο με το Lead Διεύθυνση E-mail
@@ -2427,7 +2432,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Δεν αναφέρεται ημερομηνία εκκαθάρισης
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Παραγωγή
 DocType: Guardian,Occupation,Κατοχή
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Γραμμή {0} : η ημερομηνία έναρξης πρέπει να είναι προγενέστερη της ημερομηνίας λήξης
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Σύνολο (ποσότητα)
 DocType: Sales Invoice,This Document,Αυτό το έγγραφο
 DocType: Installation Note Item,Installed Qty,Εγκατεστημένη ποσότητα
@@ -2443,14 +2449,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Αναφορά προβλήματος
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Έξοδα κοινής ωφέλειας
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Παραπάνω
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Σειρά # {0}: Εφημερίδα Έναρξη {1} δεν έχει λογαριασμό {2} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Σειρά # {0}: Εφημερίδα Έναρξη {1} δεν έχει λογαριασμό {2} ή ήδη συγκρίνεται με ένα άλλο κουπόνι
 DocType: Buying Settings,Default Buying Price List,Προεπιλεγμένος τιμοκατάλογος αγορών
 DocType: Process Payroll,Salary Slip Based on Timesheet,Μισθός Slip Βάσει Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Κανένας εργαζόμενος για τις παραπάνω επιλεγμένα κριτήρια ή εκκαθαριστικό μισθοδοσίας που έχουν ήδη δημιουργηθεί
 DocType: Notification Control,Sales Order Message,Μήνυμα παραγγελίας πώλησης
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Ορίστε προεπιλεγμένες τιμές όπως εταιρεία, νόμισμα, τρέχων οικονομικό έτος, κλπ."
 DocType: Payment Entry,Payment Type,Τύπος πληρωμής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Επιλέξτε μια παρτίδα για το στοιχείο {0}. Δεν είναι δυνατή η εύρεση μιας ενιαίας παρτίδας που να πληροί αυτή την απαίτηση
 DocType: Process Payroll,Select Employees,Επιλέξτε εργαζόμενοι
 DocType: Opportunity,Potential Sales Deal,Πιθανή συμφωνία πώλησης
 DocType: Payment Entry,Cheque/Reference Date,Επιταγή / Ημερομηνία Αναφοράς
@@ -2467,7 +2473,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Παγκόσμια Προφίλ POS {0} έχει ήδη δημιουργηθεί για την εταιρεία {1}
 DocType: Purchase Order,Ref SQ,Ref sq
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Αντικαταστήστε Είδος / Λ.Υ. σε όλες τις Λ.Υ.
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,παραστατικό παραλαβής πρέπει να υποβληθεί
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,παραστατικό παραλαβής πρέπει να υποβληθεί
 DocType: Purchase Invoice Item,Received Qty,Ποσ. Που παραλήφθηκε
 DocType: Stock Entry Detail,Serial No / Batch,Σειριακός αριθμός / παρτίδα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Που δεν έχει καταβληθεί δεν παραδόθηκαν
@@ -2476,11 +2482,11 @@
 DocType: Delivery Note,DN-RET-,DN-αναδρομική έναρξη
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Δεν υπάρχει χρόνος φύλλα
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"Αφήστε Τύπος {0} δεν μπορεί να μεταφέρει, διαβιβάζεται"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Το χρονοδιάγραμμα συντήρησης δεν έχει δημιουργηθεί για όλα τα είδη. Παρακαλώ κάντε κλικ στο δημιουργία χρονοδιαγράμματος
 ,To Produce,Για παραγωγή
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Μισθολόγιο
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Για γραμμή {0} {1}. Για να συμπεριλάβετε {2} στην τιμή Θέση, σειρές {3} πρέπει επίσης να συμπεριληφθούν"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Κάντε χρήστη
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Κάντε χρήστη
 DocType: Packing Slip,Identification of the package for the delivery (for print),Αναγνωριστικό του συσκευασίας για την παράδοση (για εκτύπωση)
 DocType: Bin,Reserved Quantity,Δεσμευμένη ποσότητα
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Εισαγάγετε έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου
@@ -2492,15 +2498,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Άτομα με ειδικές ανάγκες προτύπου δεν πρέπει να είναι προεπιλεγμένο πρότυπο
 DocType: Account,Income Account,Λογαριασμός εσόδων
 DocType: Payment Request,Amount in customer's currency,Ποσό σε νόμισμα του πελάτη
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Παράδοση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Παράδοση
 DocType: Stock Reconciliation Item,Current Qty,Τρέχουσα Ποσότητα
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Ανατρέξτε στην ενότητα κοστολόγησης την 'τιμή υλικών με βάση'
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Προηγ
 DocType: Appraisal Goal,Key Responsibility Area,Βασικός τομέας ευθύνης
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Παρτίδες φοιτητής να σας βοηθήσει να παρακολουθείτε φοίτηση, οι εκτιμήσεις και τα τέλη για τους φοιτητές"
 DocType: Payment Entry,Total Allocated Amount,Συνολικό ποσό που χορηγήθηκε
 DocType: Item Reorder,Material Request Type,Τύπος αίτησης υλικού
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Εφημερίδα εισόδου για τους μισθούς από {0} έως {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage είναι πλήρης, δεν έσωσε"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage είναι πλήρης, δεν έσωσε"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Σειρά {0}: UOM Συντελεστής μετατροπής είναι υποχρεωτική
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Αναφορά
 DocType: Budget,Cost Center,Κέντρο κόστους
@@ -2510,16 +2517,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Απόκρυψη ΑΦΜ του πελάτη από συναλλαγές Πωλήσεις
 DocType: Upload Attendance,Upload HTML,Ανεβάστε ΗΤΜΛ
 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.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Ο κανόνας τιμολόγησης γίνεται για να αντικατασταθεί ο τιμοκατάλογος / να καθοριστεί ποσοστό έκπτωσης με βάση ορισμένα κριτήρια.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Η αποθήκη μπορεί να αλλάξει μόνο μέσω καταχώρησης αποθέματος / σημειώματος παράδοσης / αποδεικτικού παραλαβής αγοράς
 DocType: Employee Education,Class / Percentage,Κλάση / ποσοστό
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Κύρια εγγραφή του marketing και των πωλήσεων
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Εάν ο κανόνας τιμολόγησης δημιουργήθηκε για την τιμή τότε θα αντικαταστήσει τον τιμοκατάλογο. Η τιμή του κανόνα τιμολόγησης είναι η τελική τιμή, οπότε δε θα πρέπει να εφαρμόζεται καμία επιπλέον έκπτωση. Ως εκ τούτου, στις συναλλαγές, όπως παραγγελίες πώλησης, παραγγελία αγοράς κλπ, θα εμφανίζεται στο πεδίο τιμή, παρά στο πεδίο τιμή τιμοκαταλόγου."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Εάν ο κανόνας τιμολόγησης δημιουργήθηκε για την τιμή τότε θα αντικαταστήσει τον τιμοκατάλογο. Η τιμή του κανόνα τιμολόγησης είναι η τελική τιμή, οπότε δε θα πρέπει να εφαρμόζεται καμία επιπλέον έκπτωση. Ως εκ τούτου, στις συναλλαγές, όπως παραγγελίες πώλησης, παραγγελία αγοράς κλπ, θα εμφανίζεται στο πεδίο τιμή, παρά στο πεδίο τιμή τιμοκαταλόγου."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Παρακολούθηση επαφών με βάση τον τύπο βιομηχανίας.
 DocType: Item Supplier,Item Supplier,Προμηθευτής είδους
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Παρακαλώ εισάγετε κωδικό είδους για να δείτε τον αρ. παρτίδας
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Παρακαλώ επιλέξτε μια τιμή για {0} προσφορά προς {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Όλες τις διευθύνσεις.
 DocType: Company,Stock Settings,Ρυθμίσεις αποθέματος
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Η συγχώνευση είναι δυνατή μόνο εάν οι ακόλουθες ιδιότητες ίδια στα δύο αρχεία. Είναι η Ομάδα, Τύπος Root, Company"
@@ -2529,6 +2536,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Θα στείλει ένα e-mail για την εκδήλωση για τους εργαζόμενους με καθεστώς «Άνοιγμα»
 DocType: Task,Depends on Tasks,Εξαρτάται από Εργασίες
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Διαχειριστείτε το δέντρο ομάδας πελατών.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Τα συνημμένα μπορούν να εμφανίζονται χωρίς να επιτρέπουν το καλάθι αγορών
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Νέο όνομα κέντρου κόστους
 DocType: Leave Control Panel,Leave Control Panel,Πίνακας ελέγχου άδειας
@@ -2541,11 +2549,10 @@
 DocType: Sales Invoice,Debit To,Χρέωση προς
 DocType: Delivery Note,Required only for sample item.,Απαιτείται μόνο για δείγμα
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Πραγματική ποσότητα μετά την συναλλαγή
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Προμηθευτής&gt; Τύπος προμηθευτή
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Δεν εκκαθαριστικό σημείωμα αποδοχών που διαπιστώθηκαν μεταξύ {0} και {1}
 ,Pending SO Items For Purchase Request,Εκκρεμή είδη παραγγελίας πωλήσεων για αίτημα αγοράς
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Εισαγωγή φοιτητής
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} είναι απενεργοποιημένη
 DocType: Supplier,Billing Currency,Νόμισμα Τιμολόγησης
 DocType: Sales Invoice,SINV-RET-,SINV-αναδρομική έναρξη
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Πολύ Μεγάλο
@@ -2562,9 +2569,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Αρχική σελίδα Προτεινόμενο Προϊόν
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Όλες οι Ομάδες Αξιολόγησης
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Νέα Αποθήκη Όνομα
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Σύνολο {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Σύνολο {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Περιοχή
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Παρακαλώ να αναφέρετε τον αριθμό των επισκέψεων που απαιτούνται
 DocType: Stock Settings,Default Valuation Method,Προεπιλεγμένη μέθοδος αποτίμησης
 DocType: Vehicle Log,Fuel Qty,Ποσότητα καυσίμου
 DocType: Production Order Operation,Planned Start Time,Προγραμματισμένη ώρα έναρξης
@@ -2580,7 +2587,7 @@
 DocType: Price List,Price List Master,Κύρια εγγραφή τιμοκαταλόγου.
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Όλες οι συναλλαγές πωλήσεων μπορούν να σημανθούν κατά πολλαπλούς ** πωλητές ** έτσι ώστε να μπορείτε να ρυθμίσετε και να παρακολουθήσετε στόχους.
 ,S.O. No.,Αρ. Παρ. Πώλησης
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Παρακαλώ δημιουργήστε πελάτη από επαφή {0}
 DocType: Price List,Applicable for Countries,Ισχύει για χώρες
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Αφήστε Εφαρμογές με την ιδιότητα μόνο «Εγκρίθηκε» και «Απορρίπτεται» μπορούν να υποβληθούν
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Ομάδα Φοιτητών Όνομα είναι υποχρεωτικό στη σειρά {0}
@@ -2623,7 +2630,7 @@
 DocType: Project,Copied From,Αντιγραφή από
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},error Όνομα: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Έλλειψη
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} δεν σχετίζεται με {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} δεν σχετίζεται με {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Η συμμετοχή για εργαζομένο {0} έχει ήδη σημειώθει
 DocType: Packing Slip,If more than one package of the same type (for print),Εάν περισσότερες από μία συσκευασίες του ίδιου τύπου (για εκτύπωση)
 ,Salary Register,μισθός Εγγραφή
@@ -2642,7 +2649,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Χρησιμοποιήστε για το Καλάθι Αγορών
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Αξία {0} για Χαρακτηριστικό {1} δεν υπάρχει στη λίστα των έγκυρων Στοιχείο Χαρακτηριστικό τιμές για τη θέση {2}
 DocType: BOM Item,Scrap %,Υπολλείματα %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Οι επιβαρύνσεις θα κατανεμηθούν αναλογικά, σύμφωνα με την ποσότητα ή το ποσό του είδους, σύμφωνα με την επιλογή σας"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Οι επιβαρύνσεις θα κατανεμηθούν αναλογικά, σύμφωνα με την ποσότητα ή το ποσό του είδους, σύμφωνα με την επιλογή σας"
 DocType: Maintenance Visit,Purposes,Σκοποί
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Atleast ένα στοιχείο πρέπει να αναγράφεται με αρνητική ποσότητα στο έγγραφο επιστροφής
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Λειτουργία {0} περισσότερο από οποιαδήποτε διαθέσιμη ώρα εργασίας σε θέση εργασίας {1}, αναλύονται η λειτουργία σε πολλαπλές λειτουργίες"
@@ -2663,16 +2670,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Διαχειριστείτε το δέντρο περιοχών.
 DocType: Journal Entry Account,Sales Invoice,Τιμολόγιο πώλησης
 DocType: Journal Entry Account,Party Balance,Υπόλοιπο συμβαλλόμενου
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Παρακαλώ επιλέξτε Εφαρμογή έκπτωση σε
 DocType: Company,Default Receivable Account,Προεπιλεγμένος λογαριασμός εισπρακτέων
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Δημιουργία τραπεζικής καταχώηρσης για το σύνολο του μισθού που καταβάλλεται για τα παραπάνω επιλεγμένα κριτήρια
 DocType: Stock Entry,Material Transfer for Manufacture,Μεταφορά υλικού για την κατασκευή
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Το ποσοστό έκπτωσης μπορεί να εφαρμοστεί είτε ανά τιμοκατάλογο ή για όλους τους τιμοκαταλόγους
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Το ποσοστό έκπτωσης μπορεί να εφαρμοστεί είτε ανά τιμοκατάλογο ή για όλους τους τιμοκαταλόγους
 DocType: Purchase Invoice,Half-yearly,Εξαμηνιαία
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Λογιστική εγγραφή για απόθεμα
 DocType: Vehicle Service,Engine Oil,Λάδι μηχανής
 DocType: Sales Invoice,Sales Team1,Ομάδα πωλήσεων 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Το είδος {0} δεν υπάρχει
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Το είδος {0} δεν υπάρχει
 DocType: Sales Invoice,Customer Address,Διεύθυνση πελάτη
 DocType: Employee Loan,Loan Details,Λεπτομέρειες δανείου
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Σειρά {0}: Ολοκληρώθηκε Ποσότητα πρέπει να είναι μεγαλύτερη από το μηδέν.
@@ -2680,24 +2687,24 @@
 DocType: Account,Root Type,Τύπος ρίζας
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Σειρά # {0}: Δεν μπορεί να επιστρέψει πάνω από {1} για τη θέση {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Γραφική παράσταση
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Γραφική παράσταση
 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}
 DocType: Cheque Print Template,Primary Settings,πρωτοβάθμια Ρυθμίσεις
 DocType: Purchase Invoice,Select Supplier Address,Επιλέξτε Διεύθυνση Προμηθευτή
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Προσθέστε Υπαλλήλων
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Προσθέστε Υπαλλήλων
 DocType: Purchase Invoice Item,Quality Inspection,Επιθεώρηση ποιότητας
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,πρότυπο πρότυπο
 DocType: Training Event,Theory,Θεωρία
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Προειδοποίηση : ζητήθηκε ποσότητα υλικού που είναι μικρότερη από την ελάχιστη ποσότητα παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Ο λογαριασμός {0} έχει παγώσει
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Νομικό πρόσωπο / θυγατρικές εταιρείες με ξεχωριστό λογιστικό σχέδιο που ανήκουν στον οργανισμό.
 DocType: Payment Request,Mute Email,Σίγαση Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Τρόφιμα, ποτά και καπνός"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Μπορούν να πληρώνουν κατά unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Το ποσοστό προμήθειας δεν μπορεί να υπερβαίνει το 100
 DocType: Stock Entry,Subcontract,Υπεργολαβία
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Παρακαλούμε, εισάγετε {0} πρώτη"
@@ -2736,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Αποθήκες με τα υπάρχοντα συναλλαγή δεν μπορεί να μετατραπεί σε ομάδα.
 DocType: Assessment Result Tool,Result HTML,αποτέλεσμα HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Λήγει στις
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Προσθέστε Φοιτητές
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Προσθέστε Φοιτητές
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Παρακαλώ επιλέξτε {0}
 DocType: C-Form,C-Form No,Αρ. C-Form
 DocType: BOM,Exploded_items,Είδη αναλυτικά
@@ -2778,7 +2785,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ποσό
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Επιλέξτε οικονομικό έτος
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Αναδιάταξη επιπέδου
 DocType: Company,Chart Of Accounts Template,Διάγραμμα του προτύπου Λογαριασμών
 DocType: Attendance,Attendance Date,Ημερομηνία συμμετοχής
@@ -2793,14 +2800,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Διπλότυπη καταχώρηση.
 DocType: Program Enrollment Tool,Get Students,Πάρτε Φοιτητές
 DocType: Serial No,Under Warranty,Στα πλαίσια της εγγύησης
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Σφάλμα]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Σφάλμα]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε την παραγγελία πώλησης.
 ,Employee Birthday,Γενέθλια υπαλλήλων
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Φοιτητής Εργαλείο Μαζική Συμμετοχή
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,όριο Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Αρχικό κεφάλαιο
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Μια ακαδημαϊκή περίοδο με αυτό το «Ακαδημαϊκό Έτος &#39;{0} και« Term Όνομα »{1} υπάρχει ήδη. Παρακαλείστε να τροποποιήσετε αυτές τις καταχωρήσεις και δοκιμάστε ξανά.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Δεδομένου ότι υπάρχουν συναλλαγές κατά το στοιχείο {0}, δεν μπορείτε να αλλάξετε την τιμή του {1}"
 DocType: UOM,Must be Whole Number,Πρέπει να είναι ακέραιος αριθμός
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Νέες άδειες που κατανεμήθηκαν (σε ημέρες)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Ο σειριακός αριθμός {0} δεν υπάρχει
@@ -2820,7 +2827,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Των υλικών που χρεώθηκαν σε αυτήν την παραγγελία πώλησης
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Καταχώρηση κλεισίματος περιόδου
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε ομάδα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Ποσό {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Ποσό {0} {1} {2} {3}
 DocType: Account,Depreciation,Απόσβεση
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Προμηθευτής(-ές)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Εργαλείο συμμετοχή των εργαζομένων
@@ -2843,7 +2850,7 @@
 DocType: Supplier,Last Day of the Next Month,Τελευταία μέρα του επόμενου μήνα
 DocType: Support Settings,Auto close Issue after 7 days,Αυτόματη κοντά Τεύχος μετά από 7 ημέρες
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Η άδεια δεν μπορεί να χορηγείται πριν {0}, η ισορροπία άδεια έχει ήδη μεταφοράς διαβιβάζεται στο μέλλον ρεκόρ χορήγηση άδειας {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Σημείωση : η ημερομηνία λήξης προθεσμίας υπερβαίνει τις επιτρεπόμενες ημέρες πίστωσης κατά {0} ημέρα ( ες )
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,φοιτητής Αιτών
 DocType: Asset Category Account,Accumulated Depreciation Account,Συσσωρευμένες Αποσβέσεις Λογαριασμού
 DocType: Stock Settings,Freeze Stock Entries,Πάγωμα καταχωρήσεων αποθέματος
@@ -2854,7 +2861,7 @@
 ,Stock Analytics,Ανάλυση αποθέματος
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Εργασίες δεν μπορεί να μείνει κενό
 DocType: Maintenance Visit Purpose,Against Document Detail No,Κατά λεπτομέρειες εγγράφου αρ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Κόμμα Τύπος είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Κόμμα Τύπος είναι υποχρεωτική
 DocType: Quality Inspection,Outgoing,Εξερχόμενος
 DocType: Material Request,Requested For,Ζητήθηκαν για
 DocType: Quotation Item,Against Doctype,Κατά τύπο εγγράφου
@@ -2871,10 +2878,10 @@
 DocType: Asset,Item Code,Κωδικός είδους
 DocType: Production Planning Tool,Create Production Orders,Δημιουργία εντολών παραγωγής
 DocType: Serial No,Warranty / AMC Details,Λεπτομέρειες εγγύησης / Ε.Σ.Υ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Επιλέξτε τους σπουδαστές με μη αυτόματο τρόπο για την ομάδα που βασίζεται στην δραστηριότητα
 DocType: Journal Entry,User Remark,Παρατήρηση χρήστη
 DocType: Lead,Market Segment,Τομέας της αγοράς
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Καταβληθέν ποσό δεν μπορεί να είναι μεγαλύτερη από το συνολικό αρνητικό οφειλόμενο ποσό {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Ιστορικό εσωτερικών εργασιών υπαλλήλου
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Κλείσιμο (dr)
 DocType: Cheque Print Template,Cheque Size,Επιταγή Μέγεθος
@@ -2889,7 +2896,7 @@
 DocType: Production Planning Tool,Create Material Requests,Δημιουργία αιτήσεων υλικού
 DocType: Employee Education,School/University,Σχολείο / πανεπιστήμιο
 DocType: Payment Request,Reference Details,Λεπτομέρειες αναφοράς
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Αναμενόμενη τιμή μετά Ωφέλιμη Ζωή πρέπει να είναι μικρότερο από το ακαθάριστο ποσό αγοράς
 DocType: Sales Invoice Item,Available Qty at Warehouse,Διαθέσιμη ποσότητα στην αποθήκη
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Χρεωμένο ποσό
 DocType: Asset,Double Declining Balance,Διπλά φθίνοντος υπολοίπου
@@ -2910,20 +2917,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Ο λογαριασμός διαφορά πρέπει να είναι λογαριασμός τύπου Περιουσιακών Στοιχείων / Υποχρεώσεων, δεδομένου ότι το εν λόγω απόθεμα συμφιλίωση είναι μια Έναρξη Έναρξη"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Εκταμιευόμενο ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ο αριθμός παραγγελίας για το είδος {0} είναι απαραίτητος
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Παραγγελία παραγωγή δεν δημιουργήθηκε
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Το πεδίο ""Από Ημερομηνία"" πρέπει να είναι μεταγενέστερο από το πεδίο ""Έως Ημερομηνία"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},δεν μπορεί να αλλάξει την κατάσταση ως φοιτητής {0} συνδέεται με την εφαρμογή των φοιτητών {1}
 DocType: Asset,Fully Depreciated,αποσβεσθεί πλήρως
 ,Stock Projected Qty,Προβλεπόμενη ποσότητα αποθέματος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Ο πελάτης {0} δεν ανήκει στο έργο {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Αξιοσημείωτη Συμμετοχή HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Οι αναφορές είναι οι προτάσεις, οι προσφορές που έχουν στείλει στους πελάτες σας"
 DocType: Sales Order,Customer's Purchase Order,Εντολή Αγοράς του Πελάτη
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Αύξων αριθμός παρτίδας και
 DocType: Warranty Claim,From Company,Από την εταιρεία
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Άθροισμα Δεκάδες Κριτήρια αξιολόγησης πρέπει να είναι {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Αξία ή ποσ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Παρακαλούμε να ορίσετε Αριθμός Αποσβέσεις κράτηση
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Αξία ή ποσ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Παραγωγές Παραγγελίες δεν μπορούν να αυξηθούν για:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Λεπτό
 DocType: Purchase Invoice,Purchase Taxes and Charges,Φόροι και επιβαρύνσεις αγοράς
@@ -2935,7 +2942,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Όλες οι Αποθήκες
 DocType: Sales Partner,Retailer,Έμπορος λιανικής
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Πίστωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Όλοι οι τύποι προμηθευτή
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Όλοι οι τύποι προμηθευτή
 DocType: Global Defaults,Disable In Words,Απενεργοποίηση στα λόγια
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Ο κωδικός είδους είναι απαραίτητος γιατί το είδος δεν αριθμείται αυτόματα
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Η προσφορά {0} δεν είναι του τύπου {1}
@@ -2944,6 +2951,7 @@
 DocType: Production Order,PRO-,ΠΡΟΓΡΑΜΜΑ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Τραπεζικός λογαριασμός υπερανάληψης
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Δημιούργησε βεβαίωση αποδοχών
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Σειρά # {0}: Το κατανεμημένο ποσό δεν μπορεί να είναι μεγαλύτερο από το οφειλόμενο ποσό.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Αναζήτηση BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Εξασφαλισμένα δάνεια
 DocType: Purchase Invoice,Edit Posting Date and Time,Επεξεργασία δημοσίευσης Ημερομηνία και ώρα
@@ -2983,7 +2991,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Δεν επιτρέπεται να ενημερώσετε συναλλαγές αποθέματος παλαιότερες από {0}
 DocType: Purchase Invoice Item,PR Detail,Λεπτομέρειες PR
 DocType: Sales Order,Fully Billed,Πλήρως χρεωμένο
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Παρακαλούμε να ορίσετε υπερημερίας υπόψη κατά τον εργαζόμενο {0}
 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 +127,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),Το μεικτό βάρος της συσκευασίας. Συνήθως καθαρό βάρος + βάρος υλικού συσκευασίας. (Για εκτύπωση)
@@ -2993,7 +3000,7 @@
 DocType: Student Group,Group Based On,Ομάδα με βάση
 DocType: Journal Entry,Bill Date,Ημερομηνία χρέωσης
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Υπηρεσία Στοιχείο, Τύπος, τη συχνότητα και το ποσό εξόδων που απαιτούνται"
-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:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Ακόμα κι αν υπάρχουν πολλαπλοί κανόνες τιμολόγησης με την υψηλότερη προτεραιότητα, στη συνέχεια οι εσωτερικές προτεραιότητες θα εφαρμοστούν:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Θέλετε πραγματικά να υποβάλουν όλα Slip Μισθός από {0} έως {1}
 DocType: Cheque Print Template,Cheque Height,Επιταγή Ύψος
 DocType: Supplier,Supplier Details,Στοιχεία προμηθευτή
@@ -3005,7 +3012,7 @@
 DocType: Vehicle Log,Invoice Ref,τιμολόγιο Ref
 DocType: Purchase Order,Recurring Order,Επαναλαμβανόμενη παραγγελία
 DocType: Company,Default Income Account,Προεπιλεγμένος λογαριασμός εσόδων
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Ομάδα πελατών / πελάτης
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Ομάδα πελατών / πελάτης
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Ανοικτή Χρήσεων Κέρδη / Ζημίες (Credit)
 DocType: Sales Invoice,Time Sheets,Φύλλα χρόνο
 DocType: Payment Gateway Account,Default Payment Request Message,Προεπιλογή Μήνυμα Αίτηση Πληρωμής
@@ -3025,10 +3032,10 @@
 DocType: Notification Control,Quotation Message,Μήνυμα προσφοράς
 DocType: Employee Loan,Employee Loan Application,Αίτηση Δανείου εργαζόμενο
 DocType: Issue,Opening Date,Ημερομηνία έναρξης
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Η φοίτηση έχει επισημανθεί με επιτυχία.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Η φοίτηση έχει επισημανθεί με επιτυχία.
 DocType: Journal Entry,Remark,Παρατήρηση
 DocType: Purchase Receipt Item,Rate and Amount,Τιμή και ποσό
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Τύπος λογαριασμού για {0} πρέπει να είναι {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Τύπος λογαριασμού για {0} πρέπει να είναι {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Φύλλα και διακοπές
 DocType: School Settings,Current Academic Term,Ο τρέχων ακαδημαϊκός όρος
 DocType: Sales Order,Not Billed,Μη τιμολογημένο
@@ -3050,7 +3057,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Ομάδα Φοιτητών
 DocType: Shopping Cart Settings,Quotation Series,Σειρά προσφορών
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ένα είδος υπάρχει με το ίδιο όνομα ( {0} ), παρακαλώ να αλλάξετε το όνομα της ομάδας ειδών ή να μετονομάσετε το είδος"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Επιλέξτε πελατών
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Επιλέξτε πελατών
 DocType: C-Form,I,εγώ
 DocType: Company,Asset Depreciation Cost Center,Asset Κέντρο Αποσβέσεις Κόστους
 DocType: Sales Order Item,Sales Order Date,Ημερομηνία παραγγελίας πώλησης
@@ -3069,20 +3076,20 @@
 DocType: Vehicle,Insurance Details,ασφάλιση Λεπτομέρειες
 DocType: Account,Payable,Πληρωτέος
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Παρακαλούμε, εισάγετε περιόδους αποπληρωμής"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Οφειλέτες ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Οφειλέτες ({0})
 DocType: Pricing Rule,Margin,Περιθώριο
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Νέοι πελάτες
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Μικτό κέρδος (%)
 DocType: Appraisal Goal,Weightage (%),Ζύγισμα (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Ημερομηνία εκκαθάρισης
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Ακαθάριστο ποσό αγοράς είναι υποχρεωτική
 DocType: Lead,Address Desc,Περιγραφή διεύθυνσης
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Κόμμα είναι υποχρεωτική
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Κόμμα είναι υποχρεωτική
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,θέμα Όνομα
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Πρέπει να επιλεγεί τουλάχιστον μία από τις επιλογές πωλήση - αγορά
-DocType: Grading Structure,Grade Intervals,διαστήματα βαθμός
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Επιλέξτε τη φύση της επιχείρησής σας.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Σειρά # {0}: Διπλότυπη καταχώρηση στις Αναφορές {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Που γίνονται οι μεταποιητικές εργασίες
 DocType: Asset Movement,Source Warehouse,Αποθήκη προέλευσης
 DocType: Installation Note,Installation Date,Ημερομηνία εγκατάστασης
@@ -3119,7 +3126,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Επικεφαλίδες επιστολόχαρτου για πρότυπα εκτύπωσης.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Τίτλοι για πρότυπα εκτύπωσης, π.Χ. Προτιμολόγιο."
 DocType: Student Guardian,Student Guardian,Guardian φοιτητής
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Χρεώσεις τύπου αποτίμηση δεν μπορεί να χαρακτηρίζεται ως 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.,Διαφορετικές Μ.Μ.για τα είδη θα οδηγήσουν σε λανθασμένη τιμή ( σύνολο ) καθαρού βάρους. Βεβαιωθείτε ότι το καθαρό βάρος κάθε είδοςυ είναι στην ίδια Μ.Μ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Τιμή Λ.Υ.
@@ -3146,7 +3153,7 @@
 DocType: Company,Exchange Gain / Loss Account,Ανταλλαγή Κέρδος / Λογαριασμός Αποτελεσμάτων
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Των εργαζομένων και φοίτηση
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Ο σκοπός πρέπει να είναι ένα από τα {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Συμπληρώστε τη φόρμα και αποθηκεύστε
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Κοινότητα Φόρουμ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Πραγματική ποσότητα στο απόθεμα
@@ -3161,7 +3168,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Αναδιάταξη ποσότητας
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Θέσεις Εργασίας
 DocType: Company,Stock Adjustment Account,Λογαριασμός διευθέτησης αποθέματος
-DocType: Journal Entry,Write Off,Διαγράφω
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Διαγράφω
 DocType: Timesheet Detail,Operation ID,Λειτουργία ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","(Login) ID για το χρήστη συστήματος. Αν οριστεί, θα γίνει προεπιλογή για όλες τις φόρμες Α.Δ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Από {1}
@@ -3172,26 +3179,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Προμηθευτής παραδίδει στον πελάτη
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# έντυπο / Θέση / {0}) έχει εξαντληθεί
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Επόμενη ημερομηνία πρέπει να είναι μεγαλύτερη από ό, τι Απόσπαση Ημερομηνία"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Εμφάνιση φόρου διάλυση
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Εμφάνιση φόρου διάλυση
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Η ημερομηνία λήξης προθεσμίας / αναφοράς δεν μπορεί να είναι μετά από {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Δεδομένα εισαγωγής και εξαγωγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","υπάρχουν καταχωρήσεις των αποθεμάτων κατά Αποθήκη {0}, ως εκ τούτου, δεν μπορείτε να εκχωρήσετε ξανά ή να το τροποποιήσει"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Δεν μαθητές Βρέθηκαν
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Δεν μαθητές Βρέθηκαν
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Τιμολόγιο Ημερομηνία Δημοσίευσης
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Πουλώ
 DocType: Sales Invoice,Rounded Total,Στρογγυλοποιημένο σύνολο
 DocType: Product Bundle,List items that form the package.,Απαριθμήστε τα είδη που αποτελούν το συσκευασία.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Το ποσοστό κατανομής θα πρέπει να είναι ίσο με το 100 %
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Επιλέξτε Απόσπαση Ημερομηνία πριν από την επιλογή Κόμματος
 DocType: Program Enrollment,School House,Σχολείο
 DocType: Serial No,Out of AMC,Εκτός Ε.Σ.Υ.
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Παρακαλώ επιλέξτε Τιμές
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Αριθμός Αποσβέσεις κράτηση δεν μπορεί να είναι μεγαλύτερη από Συνολικός αριθμός Αποσβέσεις
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Δημιούργησε επίσκεψη συντήρησης
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Παρακαλώ επικοινωνήστε με τον χρήστη που έχει ρόλο διαχειριστής κύριων εγγραφών πωλήσεων {0}
 DocType: Company,Default Cash Account,Προεπιλεγμένος λογαριασμός μετρητών
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Κύρια εγγραφή εταιρείας (δεν είναι πελάτης ή προμηθευτής).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Αυτό βασίζεται στην συμμετοχή του φοιτητή
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Δεν υπάρχουν φοιτητές στο
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Προσθέστε περισσότερα στοιχεία ή ανοιχτή πλήρη μορφή
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Παρακαλώ εισάγετε 'αναμενόμενη ημερομηνία παράδοσης΄
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Τα δελτία παράδοσης {0} πρέπει να ακυρώνονται πριν από την ακύρωση της παραγγελίας πώλησης
@@ -3223,6 +3231,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Στοιχείο 3
 DocType: Purchase Order,Customer Contact Email,Πελατών Επικοινωνία Email
 DocType: Warranty Claim,Item and Warranty Details,Στοιχείο και εγγύηση Λεπτομέρειες
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Κωδικός στοιχείου&gt; Ομάδα στοιχείων&gt; Μάρκα
 DocType: Sales Team,Contribution (%),Συμβολή (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Σημείωση : η καταχώρηση πληρωμής δεν θα δημιουργηθεί γιατί δεν ορίστηκε λογαριασμός μετρητών ή τραπέζης
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Επιλέξτε το Πρόγραμμα για την εξαγωγή υποχρεωτικών μαθημάτων.
@@ -3237,9 +3246,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Πριν συμφιλίωση
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Έως {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Φόροι και επιβαρύνσεις που προστέθηκαν (νόμισμα της εταιρείας)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Η γραμμή φόρου είδους {0} πρέπει να έχει λογαριασμό τύπου φόρος ή έσοδα ή δαπάνη ή χρέωση
 DocType: Sales Order,Partly Billed,Μερικώς τιμολογημένος
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Θέση {0} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Θέση {0} πρέπει να είναι ένα πάγιο περιουσιακό στοιχείο του Είδους
 DocType: Item,Default BOM,Προεπιλεγμένη Λ.Υ.
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Παρακαλώ πληκτρολογήστε ξανά το όνομα της εταιρείας για να επιβεβαιώσετε
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Συνολικού ανεξόφλητου υπολοίπου
@@ -3249,8 +3258,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Αυτοκίνητο
 DocType: Vehicle,Insurance Company,Ασφαλιστική εταιρεία
 DocType: Asset Category Account,Fixed Asset Account,Σταθερή Λογαριασμού Ενεργητικού
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Μεταβλητή
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Από το δελτίο αποστολής
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Μεταβλητή
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Από το δελτίο αποστολής
 DocType: Student,Student Email Address,Φοιτητής διεύθυνση ηλεκτρονικού ταχυδρομείου
 DocType: Timesheet Detail,From Time,Από ώρα
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Σε απόθεμα:
@@ -3261,12 +3270,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ισοτιμία τιμοκαταλόγου
 DocType: Purchase Invoice Item,Rate,Τιμή
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Εκπαιδευόμενος
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Διεύθυνση
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Διεύθυνση
 DocType: Stock Entry,From BOM,Από BOM
 DocType: Assessment Code,Assessment Code,Κωδικός αξιολόγηση
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Βασικός
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Οι μεταφορές αποθέματος πριν από τη {0} είναι παγωμένες
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Παρακαλώ κάντε κλικ στο 'δημιουργία χρονοδιαγράμματος'
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","Π.Χ. Kg, μονάδα, αριθμοί, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Ο αρ. αναφοράς είναι απαραίτητος εάν έχετε εισάγει ημερομηνία αναφοράς
 DocType: Bank Reconciliation Detail,Payment Document,έγγραφο πληρωμής
@@ -3274,19 +3283,19 @@
 DocType: Salary Slip,Salary Structure,Μισθολόγιο
 DocType: Account,Bank,Τράπεζα
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Αερογραμμή
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Υλικό έκδοσης
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Υλικό έκδοσης
 DocType: Material Request Item,For Warehouse,Για αποθήκη
 DocType: Employee,Offer Date,Ημερομηνία προσφοράς
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Προσφορές
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Βρίσκεστε σε λειτουργία χωρίς σύνδεση. Δεν θα είστε σε θέση να φορτώσετε εκ νέου έως ότου έχετε δίκτυο.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Δεν Ομάδες Φοιτητών δημιουργήθηκε.
 DocType: Purchase Invoice Item,Serial No,Σειριακός αριθμός
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Μηνιαία επιστροφή ποσό δεν μπορεί να είναι μεγαλύτερη από Ποσό δανείου
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Παρακαλώ εισάγετε πρώτα λεπτομέρειες συντήρησης
 DocType: Purchase Invoice,Print Language,Εκτύπωση Γλώσσα
 DocType: Salary Slip,Total Working Hours,Σύνολο ωρών εργασίας
 DocType: Stock Entry,Including items for sub assemblies,Συμπεριλαμβανομένων των στοιχείων για τις επιμέρους συνελεύσεις
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Εισάγετε τιμή πρέπει να είναι θετικός
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Όλα τα εδάφη
 DocType: Purchase Invoice,Items,Είδη
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Φοιτητής ήδη εγγραφεί.
@@ -3305,16 +3314,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Προεπιλεγμένη μονάδα μέτρησης για την παραλλαγή &#39;{0}&#39; πρέπει να είναι ίδιο με το πρότυπο &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Υπολογισμός με βάση:
 DocType: Delivery Note Item,From Warehouse,Από Αποθήκης
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Δεν Αντικείμενα με τον Bill Υλικών για Κατασκευή
 DocType: Assessment Plan,Supervisor Name,Όνομα Επόπτη
 DocType: Program Enrollment Course,Program Enrollment Course,Πρόγραμμα εγγραφής στο πρόγραμμα
-DocType: Grading Structure,Grading Structure,ταξινόμησης Δομή
 DocType: Purchase Taxes and Charges,Valuation and Total,Αποτίμηση και σύνολο
 DocType: Tax Rule,Shipping City,Αποστολές Σίτι
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Αυτό το στοιχείο είναι μια παραλλαγή του {0} (προτύπου). Τα χαρακτηριστικά θα αντιγραφούν  από το πρότυπο, εκτός αν έχει οριστεί «όχι αντιγραφή '"
 DocType: Notification Control,Customize the Notification,Προσαρμόστε την ενημέρωση
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Ταμειακές ροές από εργασίες
 DocType: Sales Invoice,Shipping Rule,Κανόνας αποστολής
@@ -3335,8 +3342,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Δεν υπάρχει προεπιλεγμένη Λ.Υ. Για το είδος {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Παρακαλώ επιλέξτε Ημερομηνία Δημοσίευσης πρώτη
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Ημερομηνία ανοίγματος πρέπει να είναι πριν από την Ημερομηνία Κλεισίματος
 DocType: Leave Control Panel,Carry Forward,Μεταφορά προς τα εμπρός
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Ένα κέντρο κόστους με υπάρχουσες συναλλαγές δεν μπορεί να μετατραπεί σε καθολικό
 DocType: Department,Days for which Holidays are blocked for this department.,Οι ημέρες για τις οποίες οι άδειες έχουν αποκλειστεί για αυτό το τμήμα
@@ -3348,7 +3355,7 @@
 DocType: Mode of Payment,General,Γενικός
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Επισύναψη επιστολόχαρτου
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Τελευταία ανακοίνωση
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Δεν μπορούν να αφαιρεθούν όταν η κατηγορία είναι για αποτίμηση ή αποτίμηση και σύνολο
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Λίστα φορολογική σας κεφάλια (π.χ. ΦΠΑ, Τελωνεία κλπ? Θα πρέπει να έχουν μοναδικά ονόματα) και κατ &#39;αποκοπή συντελεστές τους. Αυτό θα δημιουργήσει ένα πρότυπο πρότυπο, το οποίο μπορείτε να επεξεργαστείτε και να προσθέσετε περισσότερο αργότερα."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Οι σειριακοί αριθμοί είναι απαραίτητοι για το είδος με σειρά {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Πληρωμές αγώνα με τιμολόγια
@@ -3364,7 +3371,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Σύνολο (ποσό)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Διασκέδαση & ψυχαγωγία
 DocType: Quality Inspection,Item Serial No,Σειριακός αριθμός είδους
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Δημιουργήστε τα αρχεία των εργαζομένων
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Δημιουργήστε τα αρχεία των εργαζομένων
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Σύνολο παρόντων
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,λογιστικές Καταστάσεις
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ώρα
@@ -3377,9 +3384,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Άγνωστος
 DocType: Shipping Rule,Shipping Rule Conditions,Όροι κανόνα αποστολής
 DocType: BOM Replace Tool,The new BOM after replacement,Η νέα Λ.Υ. μετά την αντικατάστασή
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of sale
 DocType: Payment Entry,Received Amount,Ελήφθη Ποσό
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ρυθμίστε το Σύστημα Ονοματοδοσίας Εργαζομένων σε Ανθρώπινο Δυναμικό&gt; Ρυθμίσεις HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Δημιουργήστε για την πλήρη ποσότητα, αγνοώντας ποσότητα ήδη στην παραγγελία"
 DocType: Account,Tax,Φόρος
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,χωρίς σήμανση
@@ -3390,9 +3396,9 @@
 DocType: C-Form,Invoices,Τιμολόγια
 DocType: Batch,Source Document Name,Όνομα εγγράφου προέλευσης
 DocType: Job Opening,Job Title,Τίτλος εργασίας
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Δημιουργία χρηστών
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Δημιουργία χρηστών
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Γραμμάριο
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Ποσότητα Παρασκευή πρέπει να είναι μεγαλύτερη από 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Επισκεφθείτε την έκθεση για την έκτακτη συντήρηση.
 DocType: Stock Entry,Update Rate and Availability,Ενημέρωση τιμή και τη διαθεσιμότητα
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Ποσοστό που επιτρέπεται να παραληφθεί ή να παραδοθεί περισσότερο από την ποσότητα παραγγελίας. Για παράδειγμα: εάν έχετε παραγγείλει 100 μονάδες. Και το επίδομα σας είναι 10%, τότε θα μπορούν να παραληφθούν 110 μονάδες."
@@ -3401,28 +3407,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Ο λογαριασμός δαπανών είναι υποχρεωτικός για το είδος {0}
 DocType: BOM,Website Description,Περιγραφή δικτυακού τόπου
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Καθαρή Μεταβολή Ιδίων Κεφαλαίων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδικό, υπάρχει ήδη για {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Παρακαλείστε να ακυρώσετε την αγορά Τιμολόγιο {0} πρώτο
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Διεύθυνση e-mail πρέπει να είναι μοναδικό, υπάρχει ήδη για {0}"
 DocType: Serial No,AMC Expiry Date,Ε.Σ.Υ. Ημερομηνία λήξης
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ΑΠΟΔΕΙΞΗ ΠΛΗΡΩΜΗΣ
 ,Sales Register,Ταμείο πωλήσεων
 DocType: Daily Work Summary Settings Company,Send Emails At,Αποστολή email τους στο
 DocType: Quotation,Quotation Lost Reason,Λόγος απώλειας προσφοράς
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Επιλέξτε το Domain σας
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},αναφοράς συναλλαγής δεν {0} με ημερομηνία {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Δεν υπάρχει τίποτα να επεξεργαστείτε.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Περίληψη για το μήνα αυτό και εν αναμονή δραστηριότητες
 DocType: Customer Group,Customer Group Name,Όνομα ομάδας πελατών
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Κανένας πελάτης ακόμα!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Κατάσταση ταμειακών ροών
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Ποσό δανείου δεν μπορεί να υπερβαίνει το μέγιστο ύψος των δανείων Ποσό {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Άδεια
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Παρακαλώ αφαιρέστε αυτό το τιμολόγιο {0} από τη c-form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,Παρακαλώ εισάγετε λογαριασμό διαγραφών
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Τελευταία ημερομηνία παραγγελίας
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Ο Λογαριασμός {0} δεν ανήκει στην εταιρεία {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Οι σειριακοί αριθμοί στη σειρά {0} δεν ταιριάζουν με τη Σημείωση Παραλαβής
 DocType: Student,Guardian Details,Guardian Λεπτομέρειες
 DocType: C-Form,C-Form,C-form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark φοίτηση για πολλούς εργαζόμενους
@@ -3447,20 +3455,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Σειρά {0} # Ο λογαριασμός πρέπει να είναι τύπου «Παγίων»
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ποσότητα εκτός
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Κανόνες για τον υπολογισμό του ποσού αποστολής για την πώληση
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Η σειρά είναι απαραίτητη
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Η σειρά είναι απαραίτητη
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Χρηματοοικονομικές υπηρεσίες
 DocType: Student Sibling,Student ID,φοιτητής ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Τύποι δραστηριοτήτων για την Ώρα των αρχείων καταγραφής
 DocType: Tax Rule,Sales,Πωλήσεις
 DocType: Stock Entry Detail,Basic Amount,Βασικό Ποσό
 DocType: Training Event,Exam,Εξέταση
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Απαιτείται αποθήκη για το είδος αποθέματος {0}
 DocType: Leave Allocation,Unused leaves,Αχρησιμοποίητα φύλλα
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Μέλος χρέωσης
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Μεταφορά
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} δεν σχετίζεται με το Λογαριασμό {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} δεν σχετίζεται με το Λογαριασμό {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Φέρε αναλυτική Λ.Υ. ( Συμπεριλαμβανομένων των υποσυνόλων )
 DocType: Authorization Rule,Applicable To (Employee),Εφαρμοστέα σε (υπάλληλος)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date είναι υποχρεωτική
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Προσαύξηση για Χαρακτηριστικό {0} δεν μπορεί να είναι 0
@@ -3471,13 +3479,13 @@
 ,Inactive Customers,ανενεργοί Πελάτες
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Αποδεικτικά παραλαβής αγορών
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Πώς εφαρμόζεται ο κανόνας τιμολόγησης;
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Πώς εφαρμόζεται ο κανόνας τιμολόγησης;
 DocType: Stock Entry,Delivery Note No,Αρ. δελτίου αποστολής
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Αν επιλεγεί, μόνο Αγοράστε αιτήσεις υλικό για την τελική πρώτες ύλες θα πρέπει να περιλαμβάνονται στο υλικό αιτήματα. Σε αντίθετη περίπτωση, θα δημιουργηθεί αιτήσεις Υλικό για το γονέα στοιχεία"
 DocType: Cheque Print Template,Message to show,Μήνυμα για να δείξει
 DocType: Company,Retail,Λιανική πώληση
 DocType: Attendance,Absent,Απών
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Πακέτο προϊόντων
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Πακέτο προϊόντων
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Σειρά {0}: Άκυρη αναφορά {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Αγοράστε φόροι και επιβαρύνσεις Πρότυπο
 DocType: Upload Attendance,Download Template,Κατεβάστε πρότυπο
@@ -3487,10 +3495,10 @@
 DocType: Payment Entry,Account Paid From,Ο λογαριασμός που αμείβονται από
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Κωδικός είδους πρώτης ύλης
 DocType: Journal Entry,Write Off Based On,Διαγραφή βάσει του
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Δημιουργία Σύστασης
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Δημιουργία Σύστασης
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Εκτύπωση και Χαρτικά
 DocType: Stock Settings,Show Barcode Field,Εμφάνιση Barcode πεδίο
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Αποστολή Emails Προμηθευτής
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Αποστολή Emails Προμηθευτής
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Μισθός ήδη υποβάλλονται σε επεξεργασία για χρονικό διάστημα από {0} και {1}, Αφήστε περίοδος εφαρμογής δεν μπορεί να είναι μεταξύ αυτού του εύρους ημερομηνιών."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Αρχείο εγκατάστασης για ένα σειριακό αριθμό
 DocType: Guardian Interest,Guardian Interest,Guardian Ενδιαφέροντος
@@ -3502,6 +3510,7 @@
 DocType: Offer Letter,Awaiting Response,Αναμονή Απάντησης
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Παραπάνω
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Μη έγκυρο χαρακτηριστικό {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Αναφέρετε εάν ο μη τυποποιημένος πληρωτέος λογαριασμός
 DocType: Salary Slip,Earning & Deduction,Κέρδος και έκπτωση
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Προαιρετικό. Αυτή η ρύθμιση θα χρησιμοποιηθεί για το φιλτράρισμα σε διάφορες συναλλαγές.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Δεν επιτρέπεται αρνητική τιμή αποτίμησης
@@ -3517,10 +3526,9 @@
 DocType: Production Order Item,Production Order Item,Παραγωγή Παραγγελία Στοιχείο
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Δεν βρέθηκαν εγγραφές
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Το κόστος των αποσυρόμενων Ενεργητικού
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,μερικώς ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Tο κέντρο κόστους είναι υποχρεωτικό για το είδος {2}
 DocType: Vehicle,Policy No,Πολιτική Όχι
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Πάρετε τα στοιχεία από Bundle Προϊόν
 DocType: Asset,Straight Line,Ευθεία
 DocType: Project User,Project User,Ο χρήστης του έργου
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Σπλιτ
@@ -3535,7 +3543,7 @@
 DocType: Program Enrollment Tool,Get Students From,Πάρτε φοιτητές από
 DocType: Hub Settings,Seller Country,Χώρα πωλητή
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Δημοσιεύστε Αντικείμενα στην ιστοσελίδα
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Ομάδα μαθητές σας σε παρτίδες
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Ομάδα μαθητές σας σε παρτίδες
 DocType: Authorization Rule,Authorization Rule,Κανόνας εξουσιοδότησης
 DocType: Sales Invoice,Terms and Conditions Details,Λεπτομέρειες όρων και προϋποθέσεων
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Προδιαγραφές
@@ -3587,14 +3595,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Ημερομηνία επιταγής
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Ο λογαριασμός {0}: γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία: {2}
 DocType: Program Enrollment Tool,Student Applicants,Οι υποψήφιοι φοιτητής
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Διαγράφηκε επιτυχώς όλες τις συναλλαγές που σχετίζονται με αυτή την εταιρεία!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Ως ημερομηνία για
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,εγγραφή Ημερομηνία
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Επιτήρηση
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Εξαρτήματα μισθό
 DocType: Program Enrollment Tool,New Academic Year,Νέο Ακαδημαϊκό Έτος
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Επιστροφή / Πιστωτική Σημείωση
 DocType: Stock Settings,Auto insert Price List rate if missing,Αυτόματη ένθετο ποσοστό Τιμοκατάλογος αν λείπει
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Συνολικό καταβεβλημένο ποσό
 DocType: Production Order Item,Transferred Qty,Μεταφερόμενη ποσότητα
@@ -3614,7 +3622,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Τύπος των φύλλων, όπως τυπική, για λόγους υγείας κλπ."
 DocType: Email Digest,Send regular summary reports via Email.,"Αποστολή τακτικών συνοπτικών εκθέσεων, μέσω email."
 DocType: Payment Entry,PE-,ΡΕ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Παρακαλούμε να ορίσετε προεπιλεγμένο λογαριασμό στο Εξόδων αξίωση Τύπος {0}
 DocType: Assessment Result,Student Name,ΟΝΟΜΑ ΜΑΘΗΤΗ
 DocType: Brand,Item Manager,Θέση Διευθυντή
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Μισθοδοσία Πληρωτέο
@@ -3635,6 +3643,7 @@
 ,Sales Funnel,Χοάνη πωλήσεων
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Σύντμηση είναι υποχρεωτική
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Το Καλάθι
 ,Qty to Transfer,Ποσότητα για μεταφορά
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Προσφορές σε Συστάσεις ή Πελάτες.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ο ρόλος έχει τη δυνατότητα επεξεργασίας παγωμένου απόθεματος
@@ -3662,12 +3671,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Φορολογικές λεπτομέρειες για είδη
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Ινστιτούτο Σύντμηση
 ,Item-wise Price List Rate,Τιμή τιμοκαταλόγου ανά είδος
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Προσφορά προμηθευτή
 DocType: Quotation,In Words will be visible once you save the Quotation.,Με λόγια θα είναι ορατά αφού αποθηκεύσετε το πρόσημο.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Η ποσότητα ({0}) δεν μπορεί να είναι κλάσμα στη σειρά {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,εισπράττει τέλη
 DocType: Attendance,ATT-,ΑΤΤ
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Το barcode {0} έχει ήδη χρησιμοποιηθεί στο είδος {1}
 DocType: Lead,Add to calendar on this date,Προσθήκη στο ημερολόγιο την ημερομηνία αυτή
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Κανόνες για την προσθήκη εξόδων αποστολής.
 DocType: Item,Opening Stock,άνοιγμα Χρηματιστήριο
@@ -3685,8 +3694,8 @@
  ενημέρωση μέσω «αρχείου καταγραφής ώρας»"
 DocType: Customer,From Lead,Από Σύσταση
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Παραγγελίες ανοιχτές για παραγωγή.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Επιλέξτε οικονομικό έτος...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Προφίλ απαιτούνται για να κάνουν POS Έναρξη
 DocType: Program Enrollment Tool,Enroll Students,εγγραφούν μαθητές
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Πρότυπες πωλήσεις
@@ -3697,7 +3706,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} κατά το τιμολόγιο πώλησης {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Όνομα έργου
-DocType: Supplier,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
+DocType: Customer,Mention if non-standard receivable account,Αναφέρετε αν μη τυποποιημένα εισπρακτέα λογαριασμού
 DocType: Journal Entry Account,If Income or Expense,Εάν είναι έσοδα ή δαπάνη
 DocType: Production Order,Required Items,Απαιτούμενα Στοιχεία
 DocType: Stock Ledger Entry,Stock Value Difference,Διαφορά αξίας αποθέματος
@@ -3718,7 +3727,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Ορίστε στόχους ανά ομάδα είδους για αυτόν τον πωλητή
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Πάγωμα αποθεμάτων παλαιότερα από [ημέρες]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Σειρά # {0}: Asset είναι υποχρεωτική για πάγιο περιουσιακό αγορά / πώληση
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Αν δύο ή περισσότεροι κανόνες τιμολόγησης που βρέθηκαν με βάση τις παραπάνω προϋποθέσεις, εφαρμόζεται σειρά προτεραιότητας. Η προτεραιότητα είναι ένας αριθμός μεταξύ 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.,Επίτρεψε στους παρακάτω χρήστες να εγκρίνουν αιτήσεις αδειών για αποκλεισμένες ημέρες.
@@ -3743,7 +3752,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Το είδος {0} αγνοήθηκε, δεδομένου ότι δεν είναι ένα αποθηκεύσιμο είδος"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","Για να μην εφαρμοστεί ο κανόνας τιμολόγησης σε μια συγκεκριμένη συναλλαγή, θα πρέπει να απενεργοποιηθούν όλοι οι εφαρμόσιμοι κανόνες τιμολόγησης."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Για να μην εφαρμοστεί ο κανόνας τιμολόγησης σε μια συγκεκριμένη συναλλαγή, θα πρέπει να απενεργοποιηθούν όλοι οι εφαρμόσιμοι κανόνες τιμολόγησης."
 DocType: Assessment Group,Parent Assessment Group,Ομάδα Αξιολόγησης γονέα
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Θέσεις εργασίας
 ,Sales Order Trends,Τάσεις παραγγελίας πώλησης
@@ -3754,7 +3763,7 @@
 DocType: Stock Entry Detail,Additional Cost,Πρόσθετο κόστος
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Ημερομηνία λήξης για η χρήση
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Δεν μπορείτε να φιλτράρετε με βάση αρ. αποδεικτικού, αν είναι ομαδοποιημένες ανά αποδεικτικό"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Δημιούργησε προσφορά προμηθευτή
 DocType: Quality Inspection,Incoming,Εισερχόμενος
 DocType: BOM,Materials Required (Exploded),Υλικά που απαιτούνται (αναλυτικά)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Προσθέστε χρήστες για τον οργανισμό σας, εκτός από τον εαυτό σας"
@@ -3782,6 +3791,7 @@
 DocType: Employee,History In Company,Ιστορικό στην εταιρεία
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Ενημερωτικά Δελτία
 DocType: Stock Ledger Entry,Stock Ledger Entry,Καθολική καταχώρηση αποθέματος
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Πελάτης&gt; Ομάδα πελατών&gt; Επικράτεια
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Το ίδιο στοιχείο έχει εισαχθεί πολλές φορές
 DocType: Department,Leave Block List,Λίστα ημερών Άδειας
 DocType: Sales Invoice,Tax ID,Τον αριθμό φορολογικού μητρώου
@@ -3791,7 +3801,7 @@
 DocType: Customer,Sales Partner and Commission,Συνεργάτης Πωλήσεων και της Επιτροπής
 DocType: Employee Loan,Rate of Interest (%) / Year,Επιτόκιο (%) / Έτος
 ,Project Quantity,έργο Ποσότητα
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Σύνολο {0} για όλα τα στοιχεία είναι μηδέν, μπορεί να πρέπει να αλλάξει »Μοιράστε τελών με βάση το &#39;"
 DocType: Opportunity,To Discuss,Για συζήτηση
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} μονάδες {1} απαιτούνται {2} για να ολοκληρώσετε τη συναλλαγή αυτή.
 DocType: Loan Type,Rate of Interest (%) Yearly,Επιτόκιο (%) Ετήσιο
@@ -3806,7 +3816,7 @@
 DocType: Purchase Invoice,Return,Απόδοση
 DocType: Production Order Operation,Production Order Operation,Λειτουργία παραγγελίας παραγωγής
 DocType: Pricing Rule,Disable,Απενεργοποίηση
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Τρόπος πληρωμής υποχρεούται να προβεί σε πληρωμή
 DocType: Project Task,Pending Review,Εκκρεμής αναθεώρηση
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Περιουσιακό στοιχείο {0} δεν μπορεί να καταργηθεί, δεδομένου ότι είναι ήδη {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Σύνολο αξίωση Εξόδων (μέσω αιτημάτων εξόδων)
@@ -3814,11 +3824,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Απών
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Σειρά {0}: Νόμισμα της BOM # {1} θα πρέπει να είναι ίσο με το επιλεγμένο νόμισμα {2}
 DocType: Journal Entry Account,Exchange Rate,Ισοτιμία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Η παραγγελία πώλησης {0} δεν έχει υποβληθεί
 DocType: Homepage,Tag Line,Γραμμή ετικέτας
 DocType: Fee Component,Fee Component,χρέωση Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Διαχείριση στόλου
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Προσθήκη στοιχείων από
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Προσθήκη στοιχείων από
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Αποθήκη {0}:ο γονικός λογαριασμός {1} δεν ανήκει στην εταιρεία {2}
 DocType: Cheque Print Template,Regular,Τακτικός
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Σύνολο weightage όλων των κριτηρίων αξιολόγησης πρέπει να είναι 100%
@@ -3831,7 +3841,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Η αποθήκη {0} δεν υπάρχει
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Εγγραφή για erpnext hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ποσοστά μηνιαίας διανομής
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Το επιλεγμένο είδος δεν μπορεί να έχει παρτίδα
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ποσοστό αποτίμηση δεν βρέθηκε για το στοιχείο {0}, η οποία απαιτείται για να κάνει λογιστικές εγγραφές για {1} {2}. Εάν το στοιχείο συναλλάσσεται ως ένα στοιχείο του δείγματος στο {1}, παρακαλούμε να αναφέρω ότι στο {1} πίνακα Στοιχείο. Διαφορετικά, παρακαλούμε να δημιουργήσετε μια εισερχόμενη συναλλαγή μετοχών για το ρυθμό αποτίμηση στοιχείο ή αναφορά στο αρχείο του Είδους, και στη συνέχεια προσπαθήστε να αποστείλουν βιογραφικά / ακύρωση αυτήν την καταχώρηση"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Των υλικών που παραδίδονται σε αυτό το δελτίο αποστολής
 DocType: Project,Customer Details,Στοιχεία πελάτη
@@ -3840,15 +3850,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Εισάγετε παράμετρο url για αριθμούς παραλήπτη
 DocType: Payment Entry,Paid Amount,Καταβληθέν ποσό
 DocType: Assessment Plan,Supervisor,Επόπτης
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,σε απευθείας σύνδεση
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,σε απευθείας σύνδεση
 ,Available Stock for Packing Items,Διαθέσιμο απόθεμα για είδη συσκευασίας
 DocType: Item Variant,Item Variant,Παραλλαγή είδους
 DocType: Assessment Result Tool,Assessment Result Tool,Εργαλείο Αποτέλεσμα Αξιολόγησης
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Άχρηστα Στοιχείο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Υποβλήθηκε εντολές δεν μπορούν να διαγραφούν
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Διαχείριση ποιότητας
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Στοιχείο {0} έχει απενεργοποιηθεί
 DocType: Employee Loan,Repay Fixed Amount per Period,Εξοφλήσει σταθερό ποσό ανά Περίοδο
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Παρακαλώ εισάγετε ποσότητα για το είδος {0}
 DocType: Employee External Work History,Employee External Work History,Ιστορικό εξωτερικών εργασιών υπαλλήλου
@@ -3874,7 +3884,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Φοιτητής Email ID
 DocType: Employee,Notice (days),Ειδοποίηση (ημέρες)
 DocType: Tax Rule,Sales Tax Template,Φόρος επί των πωλήσεων Πρότυπο
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Επιλέξτε αντικείμενα για να σώσει το τιμολόγιο
 DocType: Employee,Encashment Date,Ημερομηνία εξαργύρωσης
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Διευθέτηση αποθέματος
@@ -3897,7 +3907,7 @@
 DocType: Item Variant Attribute,Attribute,Χαρακτηριστικό
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Παρακαλείστε να αναφέρετε από / προς το εύρος
 DocType: Serial No,Under AMC,Σύμφωνα με Ε.Σ.Υ.
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Το πσό αποτίμησης είδους υπολογίζεται εκ νέου εξετάζοντας τα αποδεικτικά κόστους μεταφοράς
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Το πσό αποτίμησης είδους υπολογίζεται εκ νέου εξετάζοντας τα αποδεικτικά κόστους μεταφοράς
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Προεπιλεγμένες ρυθμίσεις για συναλλαγές πωλήσεων.
 DocType: Guardian,Guardian Of ,Guardian Από
 DocType: Grading Scale Interval,Threshold,Κατώφλι
@@ -3907,6 +3917,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Χρεωστικό σημείωμα που εκδόθηκε
 DocType: Production Order,Warehouses,Αποθήκες
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} περιουσιακού στοιχείου δεν μπορεί να μεταφερθεί
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Αυτό το στοιχείο είναι μια παραλλαγή του {0} (πρότυπο).
 DocType: Workstation,per hour,Ανά ώρα
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Αγοραστικός
 DocType: Announcement,Announcement,Ανακοίνωση
@@ -3922,8 +3933,8 @@
 DocType: Account,Receivable,Εισπρακτέος
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Σειρά # {0}: Δεν επιτρέπεται να αλλάξουν προμηθευτή, όπως υπάρχει ήδη παραγγελίας"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ρόλος που έχει τη δυνατότητα να υποβάλει τις συναλλαγές που υπερβαίνουν τα όρια πίστωσης.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Επιλέξτε Στοιχεία για Κατασκευή
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Δάσκαλος συγχρονισμό δεδομένων, μπορεί να πάρει κάποιο χρόνο"
 DocType: Item,Material Issue,Έκδοση υλικού
 DocType: Hub Settings,Seller Description,Περιγραφή πωλητή
 DocType: Employee Education,Qualification,Προσόν
@@ -3935,7 +3946,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Έχουν παραγγελθεί
 DocType: Salary Detail,Component,Συστατικό
 DocType: Assessment Criteria,Assessment Criteria Group,Κριτήρια Αξιολόγησης Ομάδα
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Άνοιγμα Συσσωρευμένες Αποσβέσεις πρέπει να είναι μικρότερη από ίση με {0}
 DocType: Warehouse,Warehouse Name,Όνομα αποθήκης
 DocType: Naming Series,Select Transaction,Επιλέξτε συναλλαγή
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Παρακαλώ εισάγετε ρόλο έγκρισης ή χρήστη έγκρισης
@@ -3948,7 +3959,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Δεν μπορεί να γίνει ακύρωση, διότι υπάρχει καταχώρηση αποθέματος {0}"
 DocType: Employee Loan,Disbursement Date,Ημερομηνία εκταμίευσης
 DocType: Vehicle,Vehicle,Όχημα
 DocType: Purchase Invoice,In Words,Με λόγια
@@ -3962,14 +3973,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Ενεργητικού Αποσβέσεις και Υπόλοιπα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Ποσό {0} {1} μεταφέρεται από {2} σε {3}
 DocType: Sales Invoice,Get Advances Received,Βρες προκαταβολές που εισπράχθηκαν
 DocType: Email Digest,Add/Remove Recipients,Προσθήκη / αφαίρεση παραληπτών
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Η συναλλαγή δεν επιτρέπεται σε σταματημένες εντολές παραγωγής {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Για να ορίσετε την τρέχουσα χρήση ως προεπιλογή, κάντε κλικ στο 'ορισμός ως προεπιλογή'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Συμμετοχή
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Έλλειψη ποσότητας
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Παραλλαγή Θέση {0} υπάρχει με ίδια χαρακτηριστικά
 DocType: Employee Loan,Repay from Salary,Επιστρέψει από το μισθό
 DocType: Leave Application,LAP/,ΑΓΚΑΛΙΆ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ζητώντας την καταβολή εναντίον {0} {1} για ποσό {2}
@@ -3987,7 +3998,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Λεπτομέρεια Αποτέλεσμα Αξιολόγησης
 DocType: Employee Education,Employee Education,Εκπαίδευση των υπαλλήλων
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Διπλότυπη ομάδα στοιχείο που βρέθηκαν στο τραπέζι ομάδα στοιχείου
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Είναι απαραίτητη για να φέρω Λεπτομέρειες αντικειμένου.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} έχει ήδη ληφθεί
@@ -3996,7 +4007,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Αποθήκη {0} δεν συνδέεται με οποιονδήποτε λογαριασμό, δημιουργήστε / συνδέουν την αντίστοιχη (Asset) λογαριασμό για την αποθήκη."
 DocType: Purchase Invoice,Recurring Id,Id επαναλαμβανόμενου
 DocType: Customer,Sales Team Details,Λεπτομέρειες ομάδας πωλήσεων
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Διαγραφή μόνιμα;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Διαγραφή μόνιμα;
 DocType: Expense Claim,Total Claimed Amount,Συνολικό αιτούμενο ποσό αποζημίωσης
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Πιθανές ευκαιρίες για πώληση.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Άκυρη {0}
@@ -4007,13 +4018,14 @@
 DocType: Warehouse,PIN,ΚΑΡΦΊΤΣΑ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Ρύθμιση σχολείο σας ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Βάση Αλλαγή Ποσό (Εταιρεία νομίσματος)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Δεν βρέθηκαν λογιστικές καταχωρήσεις για τις ακόλουθες αποθήκες
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,Ποσό τελευταίας παραγγελίας
+DocType: Task,Is Milestone,Είναι ορόσημο
 DocType: Daily Work Summary,Email Sent To,Email Sent να
 DocType: Budget,Warn,Προειδοποιώ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Οποιεσδήποτε άλλες παρατηρήσεις, αξιοσημείωτη προσπάθεια που πρέπει να πάει στα αρχεία."
@@ -4034,7 +4046,7 @@
 DocType: Item Attribute Value,Attribute Value,Χαρακτηριστικό αξία
 ,Itemwise Recommended Reorder Level,Προτεινόμενο επίπεδο επαναπαραγγελίας ανά είδος
 DocType: Salary Detail,Salary Detail,μισθός Λεπτομέρειες
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Παρακαλώ επιλέξτε {0} πρώτα
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Παρτίδα {0} του σημείου {1} έχει λήξει.
 DocType: Sales Invoice,Commission,Προμήθεια
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Ώρα Φύλλο για την κατασκευή.
@@ -4046,41 +4058,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Το `πάγωμα αποθεμάτων παλαιότερα από ` θα πρέπει να είναι μικρότερο από % d ημέρες.
 DocType: Tax Rule,Purchase Tax Template,Αγοράστε Φορολογικά Πρότυπο
 ,Project wise Stock Tracking,Παρακολούθηση αποθέματος με βάση το έργο
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Το χρονοδιάγραμμα συντήρησης {0} υπάρχει για {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Πραγματική ποσότητα (στην πηγή / στόχο)
 DocType: Item Customer Detail,Ref Code,Κωδ. Αναφοράς
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Εγγραφές υπαλλήλων
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Παρακαλούμε να ορίσετε Επόμενο Αποσβέσεις Ημερομηνία
 DocType: HR Settings,Payroll Settings,Ρυθμίσεις μισθοδοσίας
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Ταίριαξε μη συνδεδεμένα τιμολόγια και πληρωμές.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Παραγγέλνω
 DocType: Email Digest,New Purchase Orders,Νέες παραγγελίες αγοράς
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Η ρίζα δεν μπορεί να έχει γονικό κέντρο κόστους
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Επιλέξτε Μάρκα ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Επιλέξτε Μάρκα ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Συσσωρευμένες Αποσβέσεις και για
 DocType: Sales Invoice,C-Form Applicable,Εφαρμόσιμο σε C-Form
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Χρόνος λειτουργίας πρέπει να είναι μεγαλύτερη από 0 για τη λειτουργία {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Αποθήκη είναι υποχρεωτική
 DocType: Supplier,Address and Contacts,Διεύθυνση και Επικοινωνία
 DocType: UOM Conversion Detail,UOM Conversion Detail,Λεπτομέρειες μετατροπής Μ.Μ.
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Φροντίστε να είναι φιλικό προς το web 900px ( w ) με 100px ( h )
 DocType: Program,Program Abbreviation,Σύντμηση πρόγραμμα
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Παραγγελία παραγωγής δεν μπορούν να προβληθούν κατά προτύπου στοιχείου
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Οι επιβαρύνσεις ενημερώνονται στην απόδειξη αγοράς για κάθε είδος
 DocType: Warranty Claim,Resolved By,Επιλύθηκε από
 DocType: Bank Guarantee,Start Date,Ημερομηνία έναρξης
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Κατανομή αδειών για μία περίοδο.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Οι επιταγές και καταθέσεις εκκαθαριστεί ορθά
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Ο λογαριασμός {0}: δεν μπορεί να οριστεί ως γονικός λογαριασμός του εαυτού του.
 DocType: Purchase Invoice Item,Price List Rate,Τιμή τιμοκαταλόγου
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Δημιουργία εισαγωγικά πελατών
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Δημιουργία εισαγωγικά πελατών
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Εμφάνισε 'διαθέσιμο' ή 'μη διαθέσιμο' με βάση το απόθεμα που είναιι διαθέσιμο στην αποθήκη αυτή.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Λίστα υλικών (Λ.Υ.)
 DocType: Item,Average time taken by the supplier to deliver,Μέσος χρόνος που απαιτείται από τον προμηθευτή να παραδώσει
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Αποτέλεσμα αξιολόγησης
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ώρες
 DocType: Project,Expected Start Date,Αναμενόμενη ημερομηνία έναρξης
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Αφαιρέστε το είδος εάν οι επιβαρύνσεις δεν ισχύουν για αυτό το είδος
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Νόμισμα συναλλαγής πρέπει να είναι ίδια με πύλη πληρωμής νόμισμα
 DocType: Payment Entry,Receive,Λήψη
@@ -4091,19 +4102,19 @@
 DocType: Workstation,Operating Costs,Λειτουργικά έξοδα
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Δράση αν συσσωρευμένη μηνιαία Προϋπολογισμός Υπέρβαση
 DocType: Purchase Invoice,Submit on creation,Υποβολή στη δημιουργία
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Νόμισμα για {0} πρέπει να είναι {1}
 DocType: Asset,Disposal Date,Ημερομηνία διάθεσης
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Μηνύματα ηλεκτρονικού ταχυδρομείου θα αποσταλεί σε όλους τους ενεργούς υπαλλήλους της εταιρείας στη δεδομένη ώρα, αν δεν έχουν διακοπές. Σύνοψη των απαντήσεων θα αποσταλούν τα μεσάνυχτα."
 DocType: Employee Leave Approver,Employee Leave Approver,Υπεύθυνος έγκρισης αδειών υπαλλήλου
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Γραμμή {0}: μια καταχώρηση αναδιάταξης υπάρχει ήδη για αυτή την αποθήκη {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Δεν μπορεί να δηλώθει ως απολεσθέν, επειδή έχει γίνει προσφορά."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,εκπαίδευση Σχόλια
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Η εντολή παραγωγής {0} πρέπει να υποβληθεί
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Παρακαλώ επιλέξτε ημερομηνία έναρξης και ημερομηνία λήξης για το είδος {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Φυσικά είναι υποχρεωτική στη σειρά {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Το πεδίο έως ημερομηνία δεν μπορεί να είναι προγενέστερο από το πεδίο από ημερομηνία
 DocType: Supplier Quotation Item,Prevdoc DocType,Τύπος εγγράφου του προηγούμενου εγγράφου
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Προσθήκη / επεξεργασία τιμών
 DocType: Batch,Parent Batch,Γονική Παρτίδα
 DocType: Cheque Print Template,Cheque Print Template,Επιταγή Πρότυπο Εκτύπωση
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Διάγραμμα των κέντρων κόστους
@@ -4116,7 +4127,7 @@
 ,Ordered Items To Be Delivered,Παραγγελθέντα είδη για παράδοση
 DocType: Account,Income,Έσοδα
 DocType: Industry Type,Industry Type,Τύπος βιομηχανίας
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Κάτι πήγε στραβά!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Κάτι πήγε στραβά!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Προσοχή: η αίτηση αδείας περιλαμβάνει τις εξής μπλοκαρισμένες ημερομηνίες
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Το τιμολόγιο πώλησης {0} έχει ήδη υποβληθεί
 DocType: Assessment Result Detail,Score,Σκορ
@@ -4147,17 +4158,17 @@
 DocType: Item,Variant Based On,Παραλλαγή Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Το σύνολο βάρους πού έχει ανατεθεί έπρεπε να είναι 100 %. Είναι {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Οι προμηθευτές σας
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Δεν μπορεί να οριστεί ως απολεσθέν, καθώς έχει γίνει παραγγελία πώλησης."
 DocType: Request for Quotation Item,Supplier Part No,Προμηθευτής Μέρος Όχι
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Ελήφθη Από
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',δεν μπορεί να εκπέσει όταν η κατηγορία είναι για την «Αποτίμηση» ή «Vaulation και Total»
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Ελήφθη Από
 DocType: Lead,Converted,Έχει μετατραπεί
 DocType: Item,Has Serial No,Έχει σειριακό αριθμό
 DocType: Employee,Date of Issue,Ημερομηνία έκδοσης
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Από {0} για {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Από {0} για {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Σειρά # {0}: Ορισμός Προμηθευτή για το στοιχείο {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Σειρά {0}: Ώρες τιμή πρέπει να είναι μεγαλύτερη από το μηδέν.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Ιστοσελίδα Εικόνα {0} επισυνάπτεται στη θέση {1} δεν μπορεί να βρεθεί
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Εμφάνισε το είδος σε πολλαπλές ομάδες στην ιστοσελίδα.
@@ -4166,20 +4177,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Δεν επιτρέπεται να ορίσετε παγωμένη αξία
 DocType: Payment Reconciliation,Get Unreconciled Entries,Βρες καταχωρήσεις χωρίς συμφωνία
 DocType: Payment Reconciliation,From Invoice Date,Από Ημερομηνία Τιμολογίου
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,νόμισμα χρέωσης πρέπει να είναι ίσο με το νόμισμα ή το λογαριασμό κόμμα νόμισμα είτε προεπιλογή comapany του
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Αφήστε Εξαργύρωση
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Τι κάνει;
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Προς αποθήκη
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Όλα Εισαγωγή Φοιτητών
 ,Average Commission Rate,Μέσος συντελεστής προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"Το πεδίο ""Έχει Σειριακό Αριθμό"" δεν μπορεί να είναι ""Ναι"" για μη αποθηκεύσιμα είδη."
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Η συμμετοχή δεν μπορεί να σημειωθεί για μελλοντικές ημερομηνίες
 DocType: Pricing Rule,Pricing Rule Help,Βοήθεια για τον κανόνα τιμολόγησης
 DocType: School House,House Name,Όνομα Σπίτι
 DocType: Purchase Taxes and Charges,Account Head,Κύρια εγγραφή λογαριασμού
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Ενημέρωση πρόσθετων δαπανών για τον υπολογισμό του κόστος μεταφοράς των ειδών
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Ηλεκτρικός
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Προσθέστε το υπόλοιπο του οργανισμού σας καθώς οι χρήστες σας. Μπορείτε επίσης να προσθέσετε προσκαλέσει πελάτες στην πύλη σας με την προσθήκη τους από τις Επαφές
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Προσθέστε το υπόλοιπο του οργανισμού σας καθώς οι χρήστες σας. Μπορείτε επίσης να προσθέσετε προσκαλέσει πελάτες στην πύλη σας με την προσθήκη τους από τις Επαφές
 DocType: Stock Entry,Total Value Difference (Out - In),Συνολική διαφορά αξίας (εξερχόμενη - εισερχόμενη)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4188,7 +4199,7 @@
 DocType: Item,Customer Code,Κωδικός πελάτη
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Υπενθύμιση γενεθλίων για {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ημέρες από την τελευταία παραγγελία
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Χρέωση του λογαριασμού πρέπει να είναι ένα κονδύλι του Ισολογισμού
 DocType: Buying Settings,Naming Series,Σειρά ονομασίας
 DocType: Leave Block List,Leave Block List Name,Όνομα λίστας αποκλεισμού ημερών άδειας
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ημερομηνία Ασφαλιστική Αρχή θα πρέπει να είναι μικρότερη από την ημερομηνία λήξης Ασφαλιστική
@@ -4203,9 +4214,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Μισθός Slip των εργαζομένων {0} ήδη δημιουργήσει για φύλλο χρόνο {1}
 DocType: Vehicle Log,Odometer,Οδόμετρο
 DocType: Sales Order Item,Ordered Qty,Παραγγελθείσα ποσότητα
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Θέση {0} είναι απενεργοποιημένη
 DocType: Stock Settings,Stock Frozen Upto,Παγωμένο απόθεμα μέχρι
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM δεν περιέχει κανένα στοιχείο απόθεμα
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Περίοδος Από και χρονική περίοδος ημερομηνίες υποχρεωτική για τις επαναλαμβανόμενες {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Δραστηριότητες / εργασίες έργου
 DocType: Vehicle Log,Refuelling Details,Λεπτομέρειες ανεφοδιασμού
@@ -4215,8 +4226,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Τελευταία ποσοστό αγορά δεν βρέθηκε
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Γράψτε εφάπαξ ποσό (Εταιρεία νομίσματος)
 DocType: Sales Invoice Timesheet,Billing Hours,Ώρες χρέωσης
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Προεπιλογή BOM για {0} δεν βρέθηκε
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Σειρά # {0}: Παρακαλούμε ρυθμίστε την ποσότητα αναπαραγγελίας
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Πατήστε στοιχεία για να τα προσθέσετε εδώ
 DocType: Fees,Program Enrollment,πρόγραμμα Εγγραφή
 DocType: Landed Cost Voucher,Landed Cost Voucher,Αποδεικτικό κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Παρακαλώ να ορίσετε {0}
@@ -4238,7 +4250,7 @@
 DocType: Maintenance Visit,Maintenance Date,Ημερομηνία συντήρησης
 DocType: Purchase Invoice Item,Rejected Serial No,Σειριακός αριθμός που απορρίφθηκε
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Έτος ημερομηνία έναρξης ή την ημερομηνία λήξης είναι η επικάλυψη με {0}. Για την αποφυγή ορίστε εταιρείας
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Η ημερομηνία έναρξης θα πρέπει να είναι προγενέστερη της ημερομηνίας λήξης για το είδος {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,Ανεβάστε παρουσίες
@@ -4313,7 +4325,6 @@
 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,Εμφάνιση του είδους σε πολλαπλές ομάδες
-DocType: Grade Interval,Grade Interval,Βαθμολογία Διάστημα
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Η ημερομηνία έναρξης και η ημερομηνία λήξης της χρήσης έχουν ήδη τεθεί για τη χρήση {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Εκκαθάριση Ημερομηνία ενημερώθηκε
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Διαχωρίστε παρτίδα
@@ -4358,14 +4369,14 @@
 DocType: Bin,Reserved Qty for Production,Διατηρούνται Ποσότητα Παραγωγής
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Αφήστε ανεξέλεγκτη αν δεν θέλετε να εξετάσετε παρτίδα ενώ κάνετε ομάδες μαθημάτων.
 DocType: Asset,Frequency of Depreciation (Months),Συχνότητα αποσβέσεων (μήνες)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Λογαριασμός Πίστωσης
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Λογαριασμός Πίστωσης
 DocType: Landed Cost Item,Landed Cost Item,Είδος κόστους αποστολής εμπορευμάτων
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Προβολή μηδενικών τιμών
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Ποσότητα του είδους που αποκτήθηκε μετά την παραγωγή / ανασυσκευασία από συγκεκριμένες ποσότητες πρώτων υλών
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Ρύθμιση μια απλή ιστοσελίδα για τον οργανισμό μου
 DocType: Payment Reconciliation,Receivable / Payable Account,Εισπρακτέοι / πληρωτέοι λογαριασμού
 DocType: Delivery Note Item,Against Sales Order Item,Κατά το είδος στην παραγγελία πώλησης
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Παρακαλείστε να αναφέρετε Χαρακτηριστικό γνώρισμα Σχέση {0}
 DocType: Item,Default Warehouse,Προεπιλεγμένη αποθήκη
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ο προϋπολογισμός δεν μπορεί να αποδοθεί κατά του λογαριασμού του Ομίλου {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Παρακαλώ εισάγετε γονικό κέντρο κόστους
@@ -4408,7 +4419,7 @@
 DocType: Opportunity Item,Basic Rate,Βασική τιμή
 DocType: GL Entry,Credit Amount,Πιστωτικές Ποσό
 DocType: Cheque Print Template,Signatory Position,υπογράφοντα Θέση
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Ορισμός ως απολεσθέν
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Ορισμός ως απολεσθέν
 DocType: Timesheet,Total Billable Hours,Σύνολο χρεώσιμες ώρες
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Απόδειξη πληρωμής Σημείωση
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Αυτό βασίζεται σε συναλλαγές κατά αυτόν τον πελάτη. Δείτε χρονοδιάγραμμα παρακάτω για λεπτομέρειες
@@ -4422,11 +4433,11 @@
 ,Items To Be Requested,Είδη που θα ζητηθούν
 DocType: Purchase Order,Get Last Purchase Rate,Βρες τελευταία τιμή αγοράς
 DocType: Company,Company Info,Πληροφορίες εταιρείας
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Επιλέξτε ή προσθέστε νέο πελάτη
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,κέντρο κόστους που απαιτείται για να κλείσετε ένα αίτημα δαπάνη
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Εφαρμογή πόρων (ενεργητικό)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Αυτό βασίζεται στην προσέλευση του υπαλλήλου αυτού
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Ο λογαριασμός Χρεωστικές
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Ο λογαριασμός Χρεωστικές
 DocType: Fiscal Year,Year Start Date,Ημερομηνία έναρξης έτους
 DocType: Attendance,Employee Name,Όνομα υπαλλήλου
 DocType: Sales Invoice,Rounded Total (Company Currency),Στρογγυλοποιημένο σύνολο (νόμισμα της εταιρείας)
@@ -4435,13 +4446,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Σταματήστε τους χρήστες από το να κάνουν αιτήσεις αδειών για τις επόμενες ημέρες.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ποσό αγορά
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Προσφορά Προμηθευτής {0} δημιουργήθηκε
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Στο τέλος του έτους δεν μπορεί να είναι πριν από την έναρξη Έτος
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Παροχές σε εργαζομένους
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Παρακαλούμε να ορίσετε μια προεπιλεγμένη διακοπές Λίστα υπάλληλου {0} ή της Εταιρείας {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} δεν υπάρχει
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Λογαριασμοί για πελάτες.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id έργου
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Σειρά Όχι {0}: Ποσό δεν μπορεί να είναι μεγαλύτερη από ό, τι εκκρεμές ποσό έναντι αιτημάτων εξόδων {1}. Εν αναμονή ποσό {2}"
@@ -4450,15 +4461,17 @@
 DocType: Quality Inspection Reading,Reading 3,Μέτρηση 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Τύπος αποδεικτικού
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Τιμοκατάλογος δεν βρέθηκε ή άτομα με ειδικές ανάγκες
 DocType: Employee Loan Application,Approved,Εγκρίθηκε
 DocType: Pricing Rule,Price,Τιμή
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Υπάλληλος ελεύθερος για {0} πρέπει να οριστεί ως έχει φύγει
 DocType: Guardian,Guardian,Κηδεμόνας
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Αξιολόγηση {0} δημιουργήθηκε για τον υπάλληλο {1} στο συγκεκριμένο εύρος ημερομηνιών
 DocType: Employee,Education,Εκπαίδευση
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Ονοματοδοσία εκστρατείας με βάση
 DocType: Employee,Current Address Is,Η τρέχουσα διεύθυνση είναι
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Τροποποιήθηκε
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Προαιρετικό. Ορίζει προεπιλεγμένο νόμισμα της εταιρείας, εφόσον δεν ορίζεται."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Λογιστικές ημερολογιακές εγγραφές.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Διαθέσιμο Ποσότητα σε από την αποθήκη
@@ -4467,7 +4480,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Σειρά {0}: Πάρτι / λογαριασμός δεν ταιριάζει με {1} / {2} στο {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Παρακαλώ εισάγετε λογαριασμό δαπανών
 DocType: Account,Stock,Απόθεμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Σειρά # {0}: Έγγραφο Αναφοράς Τύπος πρέπει να είναι ένα από τα παραγγελίας, τιμολογίου αγοράς ή Εφημερίδα Έναρξη"
 DocType: Employee,Current Address,Τρέχουσα διεύθυνση
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Εάν το είδος είναι μια παραλλαγή ενός άλλου είδους, τότε η περιγραφή, η εικόνα, η τιμολόγηση, οι φόροι κλπ θα οριστούν από το πρότυπο εκτός αν οριστούν ειδικά"
 DocType: Serial No,Purchase / Manufacture Details,Αγορά / λεπτομέρειες παραγωγής
@@ -4495,7 +4508,7 @@
 DocType: Hub Settings,Hub Settings,Ρυθμίσεις hub
 DocType: Project,Gross Margin %,Μικτό κέρδος (περιθώριο) %
 DocType: BOM,With Operations,Με λειτουργίες
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Οι λογιστικές εγγραφές έχουν ήδη γίνει στο νόμισμα {0} για την εταιρεία {1}. Παρακαλώ επιλέξτε ένα εισπρακτέο ή πληρωτέο λογαριασμό με το νόμισμα {0}.
 DocType: Asset,Is Existing Asset,Είναι Υφιστάμενες Ενεργητικού
 DocType: Salary Detail,Statistical Component,Στατιστικό στοιχείο
 ,Monthly Salary Register,Μηνιαίο ταμείο μισθοδοσίας
@@ -4518,7 +4531,7 @@
 DocType: Assessment Plan,Room,Δωμάτιο
 DocType: Purchase Order,Advance Paid,Προκαταβολή που καταβλήθηκε
 DocType: Item,Item Tax,Φόρος είδους
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Υλικό Προμηθευτή
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Υλικό Προμηθευτή
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Των ειδικών φόρων κατανάλωσης Τιμολόγιο
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Κατώφλι {0}% εμφανίζεται περισσότερες από μία φορά
 DocType: Expense Claim,Employees Email Id,Email ID υπαλλήλων
@@ -4549,9 +4562,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Επισύναψη logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Τα επίπεδα των αποθεμάτων
 DocType: Customer,Commission Rate,Ποσό προμήθειας
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Κάντε Παραλλαγή
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Κάντε Παραλλαγή
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Αποκλεισμός αιτήσεων άδειας από το τμήμα
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Τύπος πληρωμής πρέπει να είναι ένα από Λάβετε, Pay και εσωτερική μεταφορά"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Το καλάθι είναι άδειο
 DocType: Vehicle,Model,Μοντέλο
@@ -4562,6 +4575,7 @@
 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 +161,Capital Stock,Μετοχικού Κεφαλαίου
+DocType: Shopping Cart Settings,Show Public Attachments,Εμφάνιση δημόσιων συνημμένων
 DocType: Packing Slip,Package Weight Details,Λεπτομέρειες βάρος συσκευασίας
 DocType: Payment Gateway Account,Payment Gateway Account,Πληρωμή Λογαριασμού Πύλη
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Μετά την ολοκλήρωση πληρωμής ανακατεύθυνση του χρήστη σε επιλεγμένη σελίδα.
@@ -4580,15 +4594,15 @@
 DocType: Batch,Expiry Date,Ημερομηνία λήξης
 ,Supplier Addresses and Contacts,Διευθύνσεις προμηθευτή και επαφές
 ,accounts-browser,λογαριασμούς-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Παρακαλώ επιλέξτε πρώτα την κατηγορία
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Κύρια εγγραφή έργου.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Για να καταστεί δυνατή η υπερβολική τιμολόγηση ή πάνω-παραγγελίας, ενημέρωση &quot;Επίδομα&quot; στις Ρυθμίσεις Χρηματιστήριο ή το στοιχείο."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Να μην εμφανίζεται κανένα σύμβολο όπως $ κλπ δίπλα σε νομίσματα.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Μισή ημέρα)
 DocType: Supplier,Credit Days,Ημέρες πίστωσης
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Κάντε παρτίδας Φοιτητής
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Κάντε παρτίδας Φοιτητής
 DocType: Leave Type,Is Carry Forward,Είναι μεταφορά σε άλλη χρήση
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Λήψη ειδών από Λ.Υ.
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Λήψη ειδών από Λ.Υ.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ημέρες ανοχής
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Σειρά # {0}: Απόσπαση Ημερομηνία πρέπει να είναι ίδια με την ημερομηνία αγοράς {1} του περιουσιακού στοιχείου {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Παρακαλούμε, εισάγετε Παραγγελίες στον παραπάνω πίνακα"
@@ -4605,7 +4619,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Ποσό κύρωσης
 DocType: GL Entry,Is Opening,Είναι άνοιγμα
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Γραμμή {0} : μια χρεωστική καταχώρηση δεν μπορεί να συνδεθεί με ένα {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ρυθμίστε την σειρά αρίθμησης για τη συμμετοχή μέσω του προγράμματος Εγκατάστασης&gt; Σειρά αρίθμησης
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Ο λογαριασμός {0} δεν υπάρχει
 DocType: Account,Cash,Μετρητά
 DocType: Employee,Short biography for website and other publications.,Σύντομη βιογραφία για την ιστοσελίδα και άλλες δημοσιεύσεις.
diff --git a/erpnext/translations/es-AR.csv b/erpnext/translations/es-AR.csv
index 74b4eb1..4928064 100644
--- a/erpnext/translations/es-AR.csv
+++ b/erpnext/translations/es-AR.csv
@@ -3,4 +3,4 @@
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,La fecha está repetida
 DocType: Payment Entry,Deductions or Loss,Deducciones o Pérdidas
 DocType: Cheque Print Template,Cheque Size,Tamaño de Cheque
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hacer lotes de Estudiante
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hacer lotes de Estudiante
diff --git a/erpnext/translations/es-CL.csv b/erpnext/translations/es-CL.csv
index 2d5e982..8d9613c 100644
--- a/erpnext/translations/es-CL.csv
+++ b/erpnext/translations/es-CL.csv
@@ -1,26 +1,21 @@
 DocType: Assessment Plan,Grading Scale,Escala de Calificación
-DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de Evaluación del Curso
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,No se puede crear la Cuenta automáticamente pues ya hay balance de stock en la Cuenta. Debe crear una cuenta apropiada antes de poder hacer entradas en esta bodega.
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendario de cursos eliminados:
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Número de Móvil de Guardián 1
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Ganancia / Pérdida Bruta
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Los cheques y depósitos resueltos de forma incorrecta
 DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación Padre
 DocType: Student,Guardians,Guardianes
 DocType: Program,Fee Schedule,Programa de Tarifas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obtener Ítems de Paquete de Productos
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar Tarifas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM no contiene ningún ítem de stock
 DocType: Homepage,Company Tagline for website homepage,Lema de la empresa para la página de inicio del sitio web
-DocType: Grading Structure,Grading Structure,Estructura de Calificación
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Student,Guardian Details,Detalles del Guardián
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Nombre de Guardián 1
-DocType: Grade Interval,Grade Code,Grado de Código
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
-DocType: Grading Structure,Grade Intervals,intervalos de Grado
+DocType: Grading Scale Interval,Grade Code,Grado de Código
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,La moneda de facturación debe ser igual a la moneda por defecto de la compañía o la moneda de la cuenta de la parte
 DocType: Fee Structure,Fee Structure,Estructura de Tarifas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Última tasa de compra no encontrada
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Calendario de Cursos creado:
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de Escala de Calificación
 DocType: Purchase Order,Get Items from Open Material Requests,Obtener Ítems de Solicitudes Abiertas de Materiales
@@ -35,14 +30,10 @@
 DocType: Grading Scale Interval,Grading Scale Interval,Intervalo de Escala de Calificación
 DocType: Stock Entry,Customer or Supplier Details,Detalle de cliente o proveedor
 DocType: Course Scheduling Tool,Course Scheduling Tool,Herramienta de Programación de cursos
-DocType: Grade Interval,Grade Description,Descripción de Grado
 DocType: Shopping Cart Settings,Checkout Settings,Ajustes de Finalización de Pedido
 DocType: Guardian Interest,Guardian Interest,Interés del Guardián
-DocType: Grading Structure,Grading Intervals,Intervalos de Calificación
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las lecturas se pueden programar."
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Finalizando pedido
 DocType: Sales Invoice,Change Amount,Importe de Cambio
 DocType: Guardian Student,Guardian Student,Guardián del Estudiante
-DocType: Grading Structure,Grading System Name,Nombre de Sistema de Calificación
-DocType: Grade Interval,Grade Interval,Intervalo de Grado
 DocType: BOM Operation,Base Hour Rate(Company Currency),Tarifa Base por Hora (Divisa de Compañía)
diff --git a/erpnext/translations/es-GT.csv b/erpnext/translations/es-GT.csv
index 0205e56..f7e5992 100644
--- a/erpnext/translations/es-GT.csv
+++ b/erpnext/translations/es-GT.csv
@@ -4,4 +4,4 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Saldo Pendiente
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Saldo Pendiente
 DocType: Payment Entry Reference,Outstanding,Pendiente
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la Oportunidad está hecha desde una Iniciativa
diff --git a/erpnext/translations/es-MX.csv b/erpnext/translations/es-MX.csv
index 89dd50b..f15b57c 100644
--- a/erpnext/translations/es-MX.csv
+++ b/erpnext/translations/es-MX.csv
@@ -1,6 +1,6 @@
 DocType: Delivery Note,% Installed,% Instalado
 DocType: Sales Order,SO-,OV-
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Mostrar recibo de nómina
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Mostrar recibo de nómina
 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
diff --git a/erpnext/translations/es-NI.csv b/erpnext/translations/es-NI.csv
index 6724dee..3290bd5 100644
--- a/erpnext/translations/es-NI.csv
+++ b/erpnext/translations/es-NI.csv
@@ -11,7 +11,7 @@
 DocType: Tax Rule,Billing County,Municipio de Facturación
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Facturación
 DocType: Timesheet,Billing Details,Detalles de Facturación
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la moneda de la empresa o moneda de cuenta de contraparte
 DocType: Tax Rule,Billing State,Región de Facturación
 DocType: Purchase Order Item,Billed Amt,Monto Facturado
 DocType: Item Tax,Tax Rate,Tasa de Impuesto
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 6eb87dd..353afd9 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -31,7 +31,7 @@
 DocType: Company,Default Holiday List,Listado de vacaciones / feriados predeterminados
 apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,Unidad de Organización ( departamento) maestro.
 DocType: Depreciation Schedule,Journal Entry,Asientos Contables
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a producir
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Deje que los usuarios realicen Solicitudes de Vacaciones en los siguientes días .
 DocType: Sales Invoice Item,Qty as per Stock UOM,Cantidad de acuerdo a la Unidad de Medida del Inventario
 DocType: Quality Inspection,Get Specification Details,Obtenga Especificación Detalles
@@ -42,7 +42,7 @@
 DocType: Purchase Receipt,Time at which materials were received,Momento en que se recibieron los materiales
 DocType: Project,Expected End Date,Fecha de finalización prevista
 DocType: HR Settings,HR Settings,Configuración de Recursos Humanos
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta empresa
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Nuevo {0}: # {1}
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,La Abreviación es mandatoria
 DocType: Item,End of Life,Final de la Vida
@@ -59,7 +59,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Préstamos Garantizados
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Sólo el Supervisor de Vacaciones seleccionado puede presentar esta solicitud de permiso
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,Este es un territorio raíz y no se puede editar .
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Crear cotización de proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Crear cotización de proveedor
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repita los ingresos de los clientes
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre de Nuevo Centro de Coste
 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"
@@ -69,14 +69,14 @@
 DocType: Production Order,Actual Start Date,Fecha de inicio actual
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Fecha de Finalización de Contrato debe ser mayor que la Fecha de la Firma
 DocType: Sales Invoice Item,Delivery Note Item,Articulo de la Nota de Entrega
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Lo sentimos , las empresas no se pueden combinar"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Cliente requiere para ' Customerwise descuento '
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta
 DocType: Delivery Note Item,Against Sales Order Item,Contra la Orden de Venta de Artículos
 DocType: Quality Inspection,Sample Size,Tamaño de la muestra
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones 1
 DocType: Authorization Rule,Customerwise Discount,Customerwise Descuento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Fila {0}: Fecha de inicio debe ser anterior Fecha de finalización
 DocType: Employee,Salary Information,Información salarial
 DocType: Purchase Invoice Item,"Tax detail table fetched from item master as a string and stored in this field.
 Used for Taxes and Charges","Tabla de detalle de Impuesto descargada de maestro de artículos como una cadena y almacenada en este campo.
@@ -87,11 +87,11 @@
 DocType: Naming Series,Help HTML,Ayuda HTML
 DocType: Production Order Operation,Actual Operation Time,Tiempo de operación actual
 DocType: Sales Order,To Deliver and Bill,Para Entregar y Bill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Almacén requerido para la acción del artículo {0}
 DocType: Territory,Territory Targets,Territorios Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / AMC Estado
 DocType: Attendance,Employee Name,Nombre del Empleado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programa de mantenimiento no se genera para todos los artículos. Por favor, haga clic en ¨ Generar Programación¨"
 DocType: Email Digest,New Sales Orders,Nueva Órden de Venta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,Software
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Dinero Ganado
@@ -111,9 +111,9 @@
 DocType: Email Digest,Next email will be sent on:,Siguiente correo electrónico será enviado el:
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +65,Case No(s) already in use. Try from Case No {0},Nº de caso ya en uso. Intente Nº de caso {0}
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo On
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no aplicar la Regla de Precios en una transacción en particular, todas las Reglas de Precios aplicables deben ser desactivadas."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Lo sentimos , Nos de serie no se puede fusionar"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Hacer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Hacer
 DocType: Manufacturing Settings,Manufacturing Settings,Ajustes de Manufactura
 DocType: Appraisal Template,Appraisal Template Title,Titulo de la Plantilla deEvaluación
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,"Fila {0}: Por favor, consulte ""¿Es Avance 'contra la Cuenta {1} si se trata de una entrada con antelación."
@@ -140,7 +140,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Pasivo Corriente
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para plantillas de impresión, por ejemplo, Factura Proforma."
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,Cargos por transporte de mercancías y transito
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Eliminado correctamente todas las transacciones relacionadas con esta empresa!
 apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Cuenta de Gastos o Diferencia es obligatorio para el elemento {0} , ya que impacta el valor del stock"
 DocType: Account,Credit,Crédito
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mayor
@@ -148,12 +148,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Asiento contable de inventario
 DocType: Project,Total Purchase Cost (via Purchase Invoice),Coste total de compra (mediante compra de la factura)
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Fila {0}: Factor de conversión es obligatoria
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Recibos de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Recibos de Compra
 DocType: Pricing Rule,Disable,Inhabilitar
 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: Attendance,Leave Type,Tipo de Vacaciones
 DocType: Pricing Rule,Applicable For,Aplicable para
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el punto {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Moneda Local)
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir al Grupo
 DocType: Hub Settings,Seller Name,Nombre del Vendedor
@@ -163,12 +163,12 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Balanza de Estado de Cuenta Bancario según Libro Mayor
 DocType: Naming Series,Setup Series,Serie de configuración
 DocType: Production Order Operation,Actual Start Time,Hora de inicio actual
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el elemento {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Cuidado de la Salud
 DocType: Item,Manufacturer Part Number,Número de Pieza del Fabricante
 DocType: Item Reorder,Re-Order Level,Reordenar Nivel
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Órden de Venta {0} no esta presentada
 apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,Fila # {0}: Tasa debe ser el mismo que {1}: {2} ({3} / {4})
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,Pedidos en firme de los clientes.
 DocType: Warranty Claim,Service Address,Dirección del Servicio
@@ -206,21 +206,21 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Shopping Cart Settings,Shopping Cart Settings,Compras Ajustes
 DocType: BOM,Raw Material Cost,Costo de la Materia Prima
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/selling/doctype/customer/customer.py +108,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/config/hr.py +147,Template for performance appraisals.,Plantilla para las evaluaciones de desempeño .
 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/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,Cotización {0} se cancela
 apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},Inspección de la calidad requerida para el articulo {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿Qué hace?
 DocType: Task,Actual Time (in Hours),Tiempo actual (En horas)
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Hacer Orden de Venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Hacer Orden de Venta
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Enumere algunos de sus clientes. Pueden ser organizaciones o individuos.
 DocType: Item Customer Detail,Ref Code,Código Referencia
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Almacén {0}: Empresa es obligatoria
 DocType: Item,Default Selling Cost Center,Centros de coste por defecto
 DocType: Leave Block List,Leave Block List Allowed,Lista de Bloqueo de Vacaciones Permitida
 DocType: Quality Inspection,Report Date,Fecha del Informe
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Factura de Compra {0} ya existe
 DocType: Purchase Invoice,Currency and Price List,Divisa y Lista de precios
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,Activo Corriente
 DocType: Item Reorder,Re-Order Qty,Reordenar Cantidad
@@ -245,7 +245,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Desarrollador de Software
 DocType: Item,Website Item Groups,Grupos de Artículos del Sitio Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Gastos de Comercialización
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdido , porque la cotización ha sido hecha."
 DocType: Leave Allocation,New Leaves Allocated,Nuevas Vacaciones Asignadas
 apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
 DocType: Asset Movement,Source Warehouse,fuente de depósito
@@ -263,8 +263,8 @@
 DocType: Offer Letter Term,Offer Letter Term,Término de carta de oferta
 DocType: Item,Synced With Hub,Sincronizado con Hub
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de Costos de las transacciones existentes no se puede convertir en el libro mayor
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie es obligatorio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el No. de lote"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie es obligatorio
 ,Item Shortage Report,Reportar carencia de producto
 DocType: Sales Invoice,Rate at which Price list currency is converted to customer's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base del cliente
 DocType: Stock Entry,Sales Invoice No,Factura de Venta No
@@ -276,12 +276,12 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},Almacén requerido en la fila n {0}
 DocType: Purchase Invoice Item,Serial No,Números de Serie
 ,Bank Reconciliation Statement,Extractos Bancarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} es obligatorio para el producto {1}
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Cargo del empleado ( por ejemplo, director general, director , etc.)"
 DocType: Item,Copy From Item Group,Copiar de Grupo de Elementos
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No existe una Solicitud de Materiales por defecto para el elemento {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Seleccionar elemento de Transferencia
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que cantidad planificada ({2}) en la Orden de Producción {3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Seleccionar elemento de Transferencia
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Fecha de acceso debe ser mayor que Fecha de Nacimiento
 DocType: Buying Settings,Settings for Buying Module,Ajustes para la compra de módulo
 DocType: Sales Person,Sales Person Targets,Metas de Vendedor
@@ -320,12 +320,12 @@
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Crear reglas para restringir las transacciones basadas en valores .
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crea nómina para los criterios antes mencionados.
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Materia Prima Código del Artículo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Cotizaciónes a Proveedores
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Cotizaciónes a Proveedores
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Existe un costo de actividad para el empleado {0} contra el tipo de actividad - {1}
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos artículo grupo que tienen para este vendedor.
 DocType: Stock Entry,Total Value Difference (Out - In),Diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +306,BOM and Manufacturing Quantity are required,Se requiere la lista de materiales (LdM) y cantidad a fabricar.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Conjunto/Paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Conjunto/Paquete de productos
 DocType: Material Request,Requested For,Solicitados para
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra Factura de Ventas {1}
 DocType: Production Planning Tool,Select Items,Seleccione Artículos
@@ -342,7 +342,7 @@
 DocType: Employee External Work History,Salary,Salario
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Inventario de Pasivos
 DocType: Shipping Rule,Shipping Rule Label,Regla Etiqueta de envío
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artículo es una plantilla y no se puede utilizar en las transacciones. Atributos artículo se copiarán en las variantes menos que se establece 'No Copy'
 DocType: Target Detail,Target  Amount,Monto Objtetivo
 ,S.O. No.,S.O. No.
 DocType: Expense Claim Detail,Sanctioned Amount,importe sancionado
@@ -355,7 +355,7 @@
 DocType: Item Group,Parent Item Group,Grupo Principal de Artículos
 DocType: Serial No,Warranty Period (Days),Período de garantía ( Días)
 DocType: Selling Settings,Campaign Naming By,Nombramiento de la Campaña Por
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Usted es el Supervisor de Gastos para este registro. Actualice el 'Estado' y Guarde
 DocType: Material Request,Terms and Conditions Content,Términos y Condiciones Contenido
 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}
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Compras Regla de envío
@@ -378,13 +378,12 @@
 ,Invoiced Amount (Exculsive Tax),Cantidad facturada ( Impuesto exclusive )
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,Solicitud de Material {0} creada
 DocType: Item,Has Variants,Tiene Variantes
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} existe en contra de {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y Cargos Añadidos (Moneda Local)
 DocType: Customer,Buyer of Goods and Services.,Compradores de Productos y Servicios.
 DocType: Quotation Item,Stock Balance,Balance de Inventarios
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centro de Costos para artículo con Código del artículo '
 DocType: POS Profile,Write Off Cost Center,Centro de costos de desajuste
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario con función de Gerente de Ventas {0}"
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar Solicitudes de ausencia en bloques de días.
 DocType: Purchase Invoice Item,Net Rate,Tasa neta
 DocType: Purchase Taxes and Charges,Reference Row #,Referencia Fila #
@@ -422,7 +421,7 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Por favor, indique la cuenta que utilizará para el redondeo--"
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},Número de orden {0} no pertenece a la nota de entrega {1}
 DocType: Target Detail,Target Qty,Cantidad Objetivo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Se menciona Peso, \n ¡Por favor indique ""Peso Unidad de Medida"" también"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,No se puede cambiar la tasa si hay una Solicitud de Materiales contra cualquier artículo
 DocType: Account,Accounts,Contabilidad
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,Expected Delivery Date cannot be before Purchase Order Date,Fecha prevista de entrega no puede ser anterior Fecha de Orden de Compra
@@ -451,7 +450,7 @@
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,Propósito de la Visita de Mantenimiento
 DocType: SMS Log,No of Sent SMS,No. de SMS enviados
 DocType: Account,Stock Received But Not Billed,Inventario Recibido pero no facturados
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Tiendas
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Tiendas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Fila {0}: Cantidad es obligatorio
 apps/erpnext/erpnext/accounts/doctype/account/account.py +163,Report Type is mandatory,Tipo de informe es obligatorio
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Usuario del Sistema (login )ID. Si se establece , será por defecto para todas las formas de Recursos Humanos."
@@ -461,20 +460,20 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónica
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,Cuentas (o grupos) contra el que las entradas contables se hacen y los saldos se mantienen.
 DocType: Journal Entry Account,If Income or Expense,Si es un ingreso o egreso
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +499,Row {0}: An Reorder entry already exists for this warehouse {1},Fila {0}: Una entrada para reordenar ya existe para este almacén {1}
 DocType: Lead,Lead,Iniciativas
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente saldo para Tipo de Vacaciones {0}
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquee solicitud de ausencias por departamento.
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Repita los Clientes
 DocType: Account,Depreciation,Depreciación
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,El mismo artículo se ha introducido varias veces.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, cree Cliente de la Oportunidad {0}"
 DocType: Payment Request,Make Sales Invoice,Hacer Factura de Venta
 DocType: Purchase Invoice,Supplier Invoice No,Factura del Proveedor No
 DocType: Payment Gateway Account,Payment Account,Pago a cuenta
 DocType: Journal Entry,Cash Entry,Entrada de Efectivo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,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
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccione el año fiscal ...
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccione el año fiscal ...
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la fila {0} en {1}. e incluir {2} en la tasa del producto, las filas {3} también deben ser incluidas"
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,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 vacaciones: {0}
 DocType: Sales Person,Select company name first.,Seleccionar nombre de la empresa en primer lugar.
@@ -493,13 +492,13 @@
 DocType: Production Order,Material Transferred for Manufacturing,Material transferido para fabricación
 DocType: Item Reorder,Item Reorder,Reordenar productos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,Crédito a la cuenta debe ser una cuenta por pagar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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.
 ,Lead Id,Iniciativa ID
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar etiquetas salariales
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotizaciones recibidas de los proveedores.
 DocType: Sales Partner,Sales Partner Target,Socio de Ventas Objetivo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Hacer Visita de Mantenimiento
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Hacer Visita de Mantenimiento
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra Nota de Envio {0}
 DocType: Workstation,Rent Cost,Renta Costo
 apps/erpnext/erpnext/hooks.py +116,Issues,Problemas
 DocType: BOM Replace Tool,Current BOM,Lista de materiales actual
@@ -522,7 +521,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0} no es un número de lote válido para el producto {1}
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,Plantilla Maestra para Salario .
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas para cambiar la moneda por defecto."
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,La lista de materiales por defecto ({0}) debe estar activa para este producto o plantilla
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: Este centro de costos es un grupo. No se pueden crear asientos contables en los grupos.
 DocType: Email Digest,How frequently?,¿Con qué frecuencia ?
 DocType: C-Form Invoice Detail,Invoice No,Factura No
@@ -574,7 +573,7 @@
 DocType: Stock Entry,Purchase Receipt No,Recibo de Compra No
 DocType: Buying Settings,Default Buying Price List,Lista de precios predeterminada
 DocType: Material Request Item,Lead Time Date,Fecha y Hora de la Iniciativa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Mantenimiento fecha de inicio no puede ser antes de la fecha de entrega para la Serie No {0}
 DocType: Lead,Suggestions,Sugerencias
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Almacén en el que está manteniendo un balance de los artículos rechazados
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos de venta por defecto
@@ -611,7 +610,7 @@
 DocType: Sales Person,Parent Sales Person,Contacto Principal de Ventas
 DocType: Warehouse,Warehouse Contact Info,Información de Contacto del Almacén
 DocType: Supplier,Statutory info and other general information about your Supplier,Información legal y otra información general acerca de su proveedor
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,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 +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida {0} se ha introducido más de una vez en la Tabla de Factores de Conversión
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde Moneda' y 'A Moneda' no puede ser la misma
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para Compras
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de Costos de las transacciones existentes no se puede convertir al grupo
@@ -644,16 +643,15 @@
 DocType: Serial No,Out of AMC,Fuera de AMC
 DocType: Leave Application,Apply / Approve Leaves,Aplicar / Aprobar Vacaciones
 DocType: Offer Letter,Select Terms and Conditions,Selecciona Términos y Condiciones
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota de Entrega {0} no está presentada
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer {1} periodicidad, diferencia entre desde y hasta la fecha \
  debe ser mayor que o igual a {2}"
-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"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduzca el nombre de la campaña si el origen de la encuesta es una campaña
 DocType: BOM Item,Scrap %,Chatarra %
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Carge su membrete y su logotipo. (Puede editarlos más tarde).
 DocType: Item,Is Purchase Item,Es una compra de productos
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipos de Oficina
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Utilidad/Pérdida Neta
 DocType: Serial No,Delivery Document No,Entrega del documento No
 DocType: Notification Control,Notification Control,Control de Notificación
@@ -662,7 +660,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Cuenta de sobregiros
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Existe otro {0} # {1} contra la entrada de población {2}: Advertencia
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},'Actualizar Stock' no se puede marcar porque los productos no se entregan a través de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Estado de aprobación debe ser "" Aprobado "" o "" Rechazado """
 DocType: Employee,Holiday List,Lista de Feriados
 DocType: Selling Settings,Settings for Selling Module,Ajustes para vender Módulo
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","por ejemplo "" Herramientas para los Constructores """
@@ -679,7 +677,6 @@
 DocType: Journal Entry,Opening Entry,Entrada de Apertura
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo del Material que se adjunta
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Alquiler de Oficina
 DocType: Item,Default Unit of Measure,Unidad de Medida Predeterminada
 DocType: Purchase Invoice,Credit To,Crédito Para
 DocType: Currency Exchange,To Currency,Para la moneda
@@ -704,20 +701,20 @@
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Plantilla de Impuestos para las transacciones de venta.
 DocType: Appraisal Goal,Score Earned,Puntuación Obtenida
 DocType: Item Reorder,Material Request Type,Tipo de Solicitud de Material
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} no encontrado
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} no encontrado
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,Grado en el que la lista de precios en moneda se convierte en la moneda base de la compañía
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a cantidad pendiente a facturar {2}
 ,Open Production Orders,Abrir Ordenes de Producción
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Monto de impuestos Después Cantidad de Descuento (Compañía moneda)
 DocType: Holiday List,Holiday List Name,Lista de nombres de vacaciones
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Volver Ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Volver Ventas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotor
 DocType: Purchase Order Item Supplied,Supplied Qty,Suministrado Cantidad
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Empleado no puede informar a sí mismo.
 DocType: Stock Entry,Delivery Note No,No. de Nota de Entrega
 DocType: Journal Entry Account,Purchase Order,Órdenes de Compra
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Empleado {0} no está activo o no existe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,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 +537,POS Profile required to make POS Entry,Se requiere un perfil POS para crear entradas en el Punto-de-Venta
 ,Requested Items To Be Ordered,Solicitud de Productos Aprobados
 DocType: Salary Slip,Leave Without Pay,Licencia sin Sueldo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root no se puede editar .
@@ -728,8 +725,8 @@
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el número de secuencia nuevo para esta transacción
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depósito sólo se puede cambiar a través de la Entrada de Almacén / Nota de Entrega / Recibo de Compra
 DocType: Quotation,Quotation To,Cotización Para
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccione el año fiscal
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"'Tiene Número de Serie' no puede ser ""Sí"" para elementos que son de inventario"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo Disponible
 DocType: Salary Component,Earning,Ganancia
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la moneda en la compañía"
@@ -745,7 +742,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Fila # {0}: No se puede devolver más de {1} para el artículo {2}
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de Productos o Servicios.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,Secretario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde Iniciativas
 DocType: Production Order Operation,Operation completed for how many finished goods?,La operación se realizó para la cantidad de productos terminados?
 DocType: Rename Tool,Type of document to rename.,Tipo de documento para cambiar el nombre.
 DocType: Leave Type,Include holidays within leaves as leaves,"Incluir las vacaciones con ausencias, únicamente como ausencias"
@@ -791,7 +788,7 @@
 ,Stock Analytics,Análisis de existencias
 DocType: Leave Control Panel,Leave blank if considered for all departments,Dejar en blanco si se considera para todos los departamentos
 ,Purchase Order Items To Be Billed,Ordenes de Compra por Facturar
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,El elemento seleccionado no puede tener lotes
 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.
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},El usuario {0} ya está asignado a Empleado {1}
 DocType: Account,Expenses Included In Valuation,Gastos dentro de la valoración
@@ -828,7 +825,6 @@
 DocType: Purchase Invoice,Terms,Términos
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor (s)
 DocType: Serial No,Serial No Details,Serial No Detalles
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Este Artículo es una Variante de {0} (Plantilla). Los atributos se copiarán de la plantilla a menos que 'No Copiar' esté seleccionado
 DocType: Selling Settings,Allow user to edit Price List Rate in transactions,Permitir al usuario editar Precio de Lista  en las transacciones
 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: 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."
@@ -842,7 +838,7 @@
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,Consultas de soporte de clientes .
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones a Oportunidades o Clientes
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Cantidad Consumida
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Purchase Order Item,Supplier Part Number,Número de pieza del proveedor
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,Cuenta con nodos hijos no se puede convertir a cuentas del libro mayor
@@ -851,7 +847,7 @@
 DocType: Employee Education,School/University,Escuela / Universidad
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,El elemento {0} debe ser un producto sub-contratado
 DocType: Supplier,Is Frozen,Está Inactivo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Número de orden {0} está en garantía hasta {1}
+apps/erpnext/erpnext/maintenance/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/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de fabricación.
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},"El tipo de impuesto actual, no puede ser incluido en el precio del producto de la linea {0}"
 DocType: Stock Settings,Role Allowed to edit frozen stock,Función Permitida para editar Inventario Congelado
@@ -891,7 +887,7 @@
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de Material utilizado para hacer esta Entrada de Inventario
 DocType: Fiscal Year,Year End Date,Año de Finalización
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de la Factura de Proveedor
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito se ha cruzado para el cliente {0} {1} / {2}
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Se trata de un grupo de elementos raíz y no se puede editar .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,Cuenta matriz {0} creada
 apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},Solicitud de Materiales especificado {0} no existe la partida {1}
@@ -901,7 +897,7 @@
 ,Territory Target Variance Item Group-Wise,Variación de Grupo por Territorio Objetivo
 DocType: BOM,Item to be manufactured or repacked,Artículo a fabricar o embalados de nuevo
 DocType: Purchase Order,Supply Raw Materials,Suministro de Materias Primas
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tipo de Proveedor / Proveedor
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha estimada de llegada'"
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,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.
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,Solicitud de Materiales actual y Nueva Solicitud de Materiales no pueden ser iguales
@@ -944,7 +940,7 @@
 DocType: Process Payroll,Process Payroll,Nómina de Procesos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: Cuenta Padre {1} no pertenece a la compañía: {2}
 DocType: Serial No,Purchase / Manufacture Details,Detalles de Compra / Fábricas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,La cuenta para Débito debe ser una cuenta por cobrar
 DocType: Warehouse,Warehouse Detail,Detalle de almacenes
 DocType: Employee,Salutation,Saludo
 DocType: Stock Settings,Raise Material Request when stock reaches re-order level,Enviar solicitud de materiales cuando se alcance un nivel bajo el stock
@@ -961,7 +957,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,"Por favor, establece campo ID de usuario en un registro de empleado para establecer Función del Empleado"
 DocType: Products Settings,Home Page is Products,Pagína de Inicio es Productos
 DocType: Account,Round Off,Redondear
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Establecer como Perdidos
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Establecer como Perdidos
 ,Sales Partners Commission,Comisiones de Ventas
 ,Sales Person Target Variance Item Group-Wise,Variación por Vendedor de Meta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser enviada
@@ -985,7 +981,7 @@
 DocType: Quotation Item,Quotation Item,Cotización del artículo
 DocType: Employee,Date of Issue,Fecha de emisión
 DocType: Sales Invoice Item,Sales Invoice Item,Articulo de la Factura de Venta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} no pertenece a proyectar {1}
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la Factura de Venta de Artículos
 DocType: Sales Invoice,Accounting Details,detalles de la contabilidad
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Entradas en el diario de contabilidad.
@@ -1000,22 +996,22 @@
 DocType: Authorization Rule,Applicable To (Role),Aplicable a (Rol )
 DocType: Purchase Invoice Item,Amount (Company Currency),Importe (Moneda Local)
 apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,Diagrama de Gantt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,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/public/js/setup_wizard.js +61,Your financial year begins on,Su año Financiero inicia en
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planear bitácora de trabajo para las horas fuera de la estación.
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aquí usted puede mantener la altura , el peso, alergias , problemas médicos , etc"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Contra la Entrada de Diario {0} no tiene ninguna {1} entrada que vincular
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,Fila # {0}: Rechazado Cantidad no se puede introducir en la Compra de Retorno
 apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,Habilitar / Deshabilitar el tipo de monedas
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de Material para Manufactura
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para combinar, la siguientes propiedades deben ser las mismas para ambos artículos"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de orden {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, extraiga los productos desde la nota de entrega--"
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las vacaciones para un período .
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Mezclar Solicitud de Materiales (incluyendo subconjuntos )
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte "" Cambio de materiales a base On"" en la sección Cálculo del coste"
 DocType: Stock Settings,Auto Material Request,Solicitud de Materiales Automatica
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obtener elementos de la Solicitud de Materiales
 ,Customer Addresses And Contacts,Las direcciones de clientes y contactos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignar la misma cuenta como su cuenta Padre.
 DocType: Item Price,Item Price,Precios de Productos
@@ -1061,10 +1057,10 @@
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar Solicitudes de Material ( MRP ) y Órdenes de Producción .
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Listado de solicitudes de productos
 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/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,No puede ser mayor que 100
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,No puede ser mayor que 100
 DocType: Maintenance Visit,Customer Feedback,Comentarios del cliente
 DocType: Purchase Receipt Item Supplied,Required Qty,Cant. Necesaria
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Notas de Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Notas de Entrega
 DocType: Bin,Stock Value,Valor de Inventario
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Moneda Local)
 DocType: Website Item Group,Website Item Group,Grupo de Artículos del Sitio Web
@@ -1085,10 +1081,10 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Monto Sobrepasado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Fila {0}: Crédito no puede vincularse con {1}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +142,Credit Card,Tarjeta de Crédito
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Partidas contables ya han sido realizadas en {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o pagar con moneda {0}
 apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},Duplicar fila {0} con el mismo {1}
 DocType: Leave Application,Leave Application,Solicitud de Vacaciones
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Por proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Por proveedor
 DocType: Hub Settings,Seller Description,Descripción del Vendedor
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Informe de visita por llamada de mantenimiento .
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Vista en árbol para la administración de las categoría de vendedores
@@ -1107,7 +1103,7 @@
 DocType: Item,Default BOM,Solicitud de Materiales por Defecto
 ,Delivery Note Trends,Tendencia de Notas de Entrega
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Número de orden {0} ya se ha recibido
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ingresado dos veces en el Impuesto del producto
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proyecto maestro
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""","Sólo puede haber una Condición de Regla de Envió  con valor 0 o valor en blanco para ""To Value"""
 DocType: Item Group,Item Group Name,Nombre del grupo de artículos
@@ -1127,7 +1123,7 @@
 DocType: Journal Entry Account,Sales Order,Ordenes de Venta
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,para
 DocType: Item,Weight UOM,Peso Unidad de Medida
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Se requiere un Almacen de Trabajo en Proceso antes de Enviar
 DocType: Production Planning Tool,Get Sales Orders,Recibe Órdenes de Venta
 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
 DocType: Employee,Applicable Holiday List,Lista de Días Feriados Aplicable
diff --git a/erpnext/translations/es.csv b/erpnext/translations/es.csv
index 4c43cf2..39aec67 100644
--- a/erpnext/translations/es.csv
+++ b/erpnext/translations/es.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Arrendado
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Aplicable para el usuario
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","La orden de producción detenida no puede ser cancelada, inicie de nuevo para cancelarla"
 DocType: Vehicle Service,Mileage,Kilometraje
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,¿Realmente desea desechar este activo?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Elija un proveedor predeterminado
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Elija un proveedor predeterminado
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},La divisa/moneda es requerida para lista de precios {0}
 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
@@ -41,9 +41,9 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),El pago pendiente para {0} no puede ser menor que cero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Por defecto 10 minutos
 DocType: Leave Type,Leave Type Name,Nombre del tipo de ausencia
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostrar abiertos
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar abiertos
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Secuencia actualizada correctamente
-apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Revisa
+apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Pedido
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Entrada de Diario por Devengo Enviada
 DocType: Pricing Rule,Apply On,Aplicar en
 DocType: Item Price,Multiple Item prices.,Configuración de múltiples precios para los productos
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Lotes artículo Estado de caducidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Giro bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pago a cuenta
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostrar variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar variantes
 DocType: Academic Term,Academic Term,Término académico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Cantidad
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Cantidad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La tabla de cuentas no puede estar en blanco
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Préstamos (pasivos)
-DocType: Employee Education,Year of Passing,Año de fallecimiento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referencia:% s, Código del artículo:% s y el Cliente:% s"
+DocType: Employee Education,Year of Passing,Año de finalización
 DocType: Item,Country of Origin,País de origen
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En inventario
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Problemas abiertos
@@ -73,10 +72,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Asistencia médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retraso en el pago (días)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Gasto servicio
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de serie: {0} ya se hace referencia en Factura de venta: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Factura
 DocType: Maintenance Schedule Item,Periodicity,Periodo
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año fiscal {0} es necesario
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Fecha de entrega esperada es siempre delante de órdenes de venta Fecha
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Año Fiscal {0} es necesario
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Fecha de entrega esperada es siempre antes de la fecha de órdenes de venta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,Defensa
 DocType: Salary Component,Abbr,Abreviatura
 DocType: Appraisal Goal,Score (0-5),Puntuación (0-5)
@@ -85,7 +85,7 @@
 DocType: Timesheet,Total Costing Amount,Monto cálculo del coste total
 DocType: Delivery Note,Vehicle No,Vehículo No.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Por favor, seleccione la lista de precios"
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: No se requiere documento de pago para completar la trasaction
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Fila # {0}: Documento de Pago es requerido para completar la transacción
 DocType: Production Order Operation,Work In Progress,Trabajo en proceso
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor seleccione la fecha
 DocType: Employee,Holiday List,Lista de festividades
@@ -108,28 +108,30 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} no en cualquier año fiscal activa.
 DocType: Packed Item,Parent Detail docname,Detalle principal docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, Código del Artículo: {1} y Cliente: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogramo
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura de un puesto
 DocType: Item Attribute,Increment,Incremento
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Seleccione Almacén ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleccione Almacén ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidad
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La misma Compañia es ingresada mas 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/purchase_invoice/purchase_invoice.js +556,Get items from,Obtener artículos de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},No está permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Obtener artículos de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Inventario no puede actualizarse contra la nota de envío {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Producto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No hay elementos en la lista
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Abarrotes
 DocType: Quality Inspection Reading,Reading 1,Lectura 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Siguiente Depreciación La fecha no puede ser anterior a la fecha de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Siguiente Depreciación La fecha no puede ser anterior a la fecha de compra
 DocType: SMS Center,All Sales Person,Todos los vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** Distribución mensual ayuda a distribuir el presupuesto / Target a través de meses si tiene la estacionalidad de su negocio.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,No se encontraron artículos
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura salarial
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,No se encontraron artículos
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta Estructura Salarial
 DocType: Lead,Person Name,Nombre de persona
 DocType: Sales Invoice Item,Sales Invoice Item,Producto de factura de venta
 DocType: Account,Credit,Haber
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","por ejemplo, &quot;escuela primaria&quot; o &quot;Universidad&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reportes de Stock
 DocType: Warehouse,Warehouse Detail,Detalles del Almacén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Límite de crédito ha sido sobrepasado para el cliente {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"La fecha final de duración no puede ser posterior a la fecha de fin de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Es el activo fijo&quot; no puede estar sin marcar, ya que existe registro de activos contra el elemento"
 DocType: Vehicle Service,Brake Oil,Aceite de Frenos
 DocType: Tax Rule,Tax Type,Tipo de impuestos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},No tiene permisos para agregar o actualizar las entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagen del producto (si no son diapositivas)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe un cliente con el mismo nombre
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarifa por hora / 60) * Tiempo real de la operación
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleccione la lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Seleccione la lista de materiales
 DocType: SMS Log,SMS Log,Registros SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo de productos entregados
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,El día de fiesta en {0} no es entre De la fecha y Hasta la fecha
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Escuelas
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No hay registro de vacaciones encontrados para los empleados {0} de {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Por favor, ingrese primero la compañía"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Por favor, seleccione primero la compañía"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Objetivo en
 DocType: BOM,Total Cost,Coste total
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Importe del reembolso
 DocType: Employee,Mr,Sr.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Grupo de clientes duplicado encontrado en la tabla de grupo de clientes
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Proveedor / Tipo de proveedor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Proveedor / Tipo de proveedor
 DocType: Naming Series,Prefix,Prefijo
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumible
 DocType: Employee,B-,B-
@@ -190,24 +192,24 @@
 DocType: Training Result Employee,Grade,Grado
 DocType: Sales Invoice Item,Delivered By Supplier,Entregado por proveedor
 DocType: SMS Center,All Contact,Todos los Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Orden de producción ya se ha creado para todos los elementos con la lista de materiales
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salario Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumen diario de Trabajo
 DocType: Period Closing Voucher,Closing Fiscal Year,Cerrando el año fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} está congelado
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Gastos sobre existencias
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleccionar Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleccionar Almacén Objetivo
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,"Por favor, introduzca preferido del contacto de correo electrónico"
 DocType: Journal Entry,Contra Entry,Entrada contra
 DocType: Journal Entry Account,Credit in Company Currency,Divisa por defecto de la cuenta de credito
 DocType: Delivery Note,Installation Status,Estado de la instalación
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",¿Quieres actualizar la asistencia? <br> Presente: {0} \ <br> Ausentes: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cantidad Aceptada + Rechazada debe ser igual a la cantidad Recibida por el Artículo {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Suministro de materia prima para la compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Se requiere al menos un modo de pago de la factura POS.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Se requiere al menos un modo de pago de la factura POS.
 DocType: Products Settings,Show Products as a List,Mostrar los productos en forma de lista
 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.
@@ -218,11 +220,11 @@
 apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,Configuracion para módulo de recursos humanos (RRHH)
 DocType: SMS Center,SMS Center,Centro SMS
 DocType: Sales Invoice,Change Amount,Importe de cambio
-DocType: BOM Replace Tool,New BOM,Nueva solicitud de materiales
-DocType: Depreciation Schedule,Make Depreciation Entry,Hacer la entrada de Depreciación
+DocType: BOM Replace Tool,New BOM,Nueva Solicitud de Materiales
+DocType: Depreciation Schedule,Make Depreciation Entry,Hacer la Entrada de Depreciación
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo de solicitud
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Crear empleado
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crear empleado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Difusión
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ejecución
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalles de las operaciones realizadas.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan para las visitas
 DocType: SMS Settings,Enter url parameter for message,Introduzca el parámetro url para el mensaje
 DocType: POS Profile,Customer Groups,Grupos de clientes
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Estados Financieros
 DocType: Guardian,Students,Estudiantes
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Reglas para la aplicación de distintos precios y descuentos sobre los productos.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La lista de precios debe ser aplicable para las compras o ventas
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Cantidad de avance no puede ser mayor que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de secuencias para esta transacción
 DocType: Company,Default Payroll Payable Account,La nómina predeterminada de la cuenta por pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Editar Grupo de Correo Electrónico
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Editar Grupo de Correo Electrónico
 DocType: Sales Invoice,Is Opening Entry,Es una entrada de apertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Indique si una cuenta por cobrar no estándar es  aplicable
 DocType: Course Schedule,Instructor Name,Nombre instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Para el almacén es requerido antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recibida el
 DocType: Sales Partner,Reseller,Re-vendedor
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si se selecciona, se incluirán productos no están en stock en las solicitudes de materiales."
@@ -275,22 +278,22 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra la factura de venta del producto
 ,Production Orders in Progress,Órdenes de producción en progreso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Efectivo neto de financiación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Almacenamiento Local esta lleno, no se guardó"
 DocType: Lead,Address & Contact,Dirección y Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Añadir permisos no usados de asignaciones anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},La próxima recurrencia {0} se creará el {1}
 DocType: Sales Partner,Partner website,Sitio web de colaboradores
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,Añadir artículo
 ,Contact Name,Nombre de contacto
-DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de evaluación del curso
+DocType: Course Assessment Criteria,Course Assessment Criteria,Criterios de Evaluación del Curso
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,Crear la nómina salarial con los criterios antes seleccionados.
 DocType: POS Customer Group,POS Customer Group,POS Grupo de Clientes
 DocType: Cheque Print Template,Line spacing for amount in words,interlineado de la suma en palabras
 DocType: Vehicle,Additional Details,Detalles adicionales
 apps/erpnext/erpnext/templates/generators/bom.html +85,No description given,Ninguna descripción definida
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,Solicitudes de compra.
-apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creados en contra de este proyecto
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Pay Net no puede ser menor que 0
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,Esto se basa en la tabla de tiempos creada en contra de este proyecto
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,Pago Neto no puede ser menor que 0
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,Sólo el supervisor de ausencias responsable puede validar esta solicitud de permiso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,La fecha de relevo debe ser mayor que la fecha de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,Ausencias por año
@@ -301,15 +304,15 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Cálculo del coste total Monto (a través de hoja de horas)
 DocType: Item Website Specification,Item Website Specification,Especificación del producto en la WEB
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Vacaciones Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Asientos Bancarios
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},El producto {0} ha llegado al fin de la vida útil el {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Asientos Bancarios
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Elemento de reconciliación de inventarios
 DocType: Stock Entry,Sales Invoice No,Factura de venta No.
 DocType: Material Request Item,Min Order Qty,Cantidad mínima de Pedido
 DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,Curso herramienta de creación de grupo de alumnos
 DocType: Lead,Do Not Contact,No contactar
-apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Las personas que enseñan en su organización
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,Personas que enseñan en su organización
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,El ID único para el seguimiento de todas las facturas recurrentes. Este es generado al validar.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,Desarrollador de Software.
 DocType: Item,Minimum Order Qty,Cantidad mínima de la orden
@@ -320,10 +323,10 @@
 DocType: Item,Publish in Hub,Publicar en el Hub
 DocType: Student Admission,Student Admission,Admisión de Estudiantes
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,El producto {0} esta cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Solicitud de materiales
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,El producto {0} esta cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Solicitud de materiales
 DocType: Bank Reconciliation,Update Clearance Date,Actualizar fecha de liquidación
-DocType: Item,Purchase Details,Detalles de compra
+DocType: Item,Purchase Details,Detalles de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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
@@ -343,24 +346,24 @@
 DocType: Student Group Student,Student Group Student,Estudiante grupo de alumnos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,Más reciente
 DocType: Vehicle Service,Inspection,Inspección
-DocType: Email Digest,New Quotations,Nuevas Citas
+DocType: Email Digest,New Quotations,Nuevas Cotizaciones
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Los correos electrónicos de deslizamiento salarial a los empleados basadas en el correo electrónico preferido seleccionado en Empleado
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,El primer supervisor de ausencias en la lista sera definido como el administrador de ausencias/vacaciones predeterminado.
-DocType: Tax Rule,Shipping County,Condado de envío
+DocType: Tax Rule,Shipping County,País de envío
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Aprender
-DocType: Asset,Next Depreciation Date,Siguiente Depreciación Fecha
+DocType: Asset,Next Depreciation Date,Siguiente Fecha de Depreciación
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Coste de actividad por empleado
 DocType: Accounts Settings,Settings for Accounts,Ajustes de contabilidad
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Proveedor de factura no existe en la factura de la compra {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Factura de Proveedor no existe en la Factura de Compra {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Administrar las categoría de los socios de ventas
 DocType: Job Applicant,Cover Letter,Carta de presentación
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques pendientes y Depósitos para despejar
 DocType: Item,Synced With Hub,Sincronizado con Hub.
-DocType: Vehicle,Fleet Manager,Gerente de la flota
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no puede ser negativo para el elemento {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Contraseña incorrecta
+DocType: Vehicle,Fleet Manager,Gerente de Fota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Fila # {0}: {1} no puede ser negativo para el elemento {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Contraseña incorrecta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',La cantidad completada no puede ser mayor que la cantidad a manufacturar.
 DocType: Period Closing Voucher,Closing Account Head,Cuenta principal de cierre
 DocType: Employee,External Work History,Historial de trabajos externos
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error de referencia circular
@@ -373,16 +376,15 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificarme por Email cuando se genere una nueva requisición de materiales
 DocType: Journal Entry,Multi Currency,Multi moneda
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de factura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Nota de entrega
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuración de Impuestos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del activo vendido
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
-DocType: Grade Interval,Min Score,Puntuación min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} se ingresó dos veces en impuesto del artículo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumen para esta semana y actividades pendientes
 DocType: Student Applicant,Admitted,Aceptado
 DocType: Workstation,Rent Cost,Costo de arrendamiento
-apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Después cantidad Depreciación
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,Cantidad Después de Depreciación
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Calendario de Eventos Próximos
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Por favor seleccione el mes y el año
 DocType: Employee,Company Email,Email de la compañía
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor del pedido
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transacciones de Banco/Efectivo contra Empresa o transferencia interna
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total del Pedido Considerado
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Puesto del empleado (por ejemplo, director general, director, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, introduzca el valor en el campo 'Repetir un día al mes'"
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Fila # {0}: Factura de compra no se puede hacer frente a un activo existente {1}
 DocType: Item Tax,Tax Rate,Procentaje del impuesto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ya ha sido asignado para el empleado {1} para el periodo {2} hasta {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleccione producto
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Seleccione producto
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La factura de compra {0} ya existe o se encuentra validada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Línea # {0}: El lote no puede ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir a 'Sin-Grupo'
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Listados de los lotes de los productos
 DocType: C-Form Invoice Detail,Invoice Date,Fecha de factura
 DocType: GL Entry,Debit Amount,Importe débitado
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Sólo puede existir una (1) cuenta por compañía en {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Por favor, revise el documento adjunto"
 DocType: Purchase Order,% Received,% Recibido
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Crear grupos de estudiantes
@@ -414,7 +416,7 @@
 ,Finished Goods,Productos terminados
 DocType: Delivery Note,Instructions,Instrucciones
 DocType: Quality Inspection,Inspected By,Inspección realizada por
-DocType: Maintenance Visit,Maintenance Type,Tipo de mantenimiento
+DocType: Maintenance Visit,Maintenance Type,Tipo de Mantenimiento
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},El número de serie {0} no pertenece a la nota de entrega {1}
 apps/erpnext/erpnext/templates/pages/demo.html +47,ERPNext Demo,Demostración ERPNext
 apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,Añadir los artículos
@@ -432,21 +434,21 @@
 DocType: Authorization Rule,Approving User  (above authorized value),Aprobar usuario (por encima del valor autorizado)
 DocType: Email Digest,Credit Balance,Saldo Acreedor
 DocType: Employee,Widowed,Viudo
-DocType: Request for Quotation,Request for Quotation,Solicitud de presupuesto
-DocType: Salary Slip Timesheet,Working Hours,Horas de trabajo
+DocType: Request for Quotation,Request for Quotation,Solicitud de Cotización
+DocType: Salary Slip Timesheet,Working Hours,Horas de Trabajo
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Defina el nuevo número de secuencia para esta transacción.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Crear un nuevo cliente
-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 existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Crear órdenes de compra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Crear un nuevo cliente
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si existen varias reglas de precios, se les pide a los usuarios que establezcan la prioridad manualmente para resolver el conflicto."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Crear órdenes de compra
 ,Purchase Register,Registro de compras
-DocType: Course Scheduling Tool,Rechedule,Rechedule
+DocType: Course Scheduling Tool,Rechedule,Reprogramar
 DocType: Landed Cost Item,Applicable Charges,Cargos Aplicables
 DocType: Workstation,Consumable Cost,Coste de consumibles
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) debe tener el rol de 'Supervisor de ausencias'
 DocType: Purchase Receipt,Vehicle Date,Fecha de Vehículos
 DocType: Student Log,Medical,Médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razón de pérdida
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Propietario plomo no puede ser la misma que la de plomo
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Razón de pérdida
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Propietario de Iniciativa no puede ser igual que el de la Iniciativa
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,importe asignado no puede superar el importe no ajustado
 DocType: Announcement,Receiver,Receptor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,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}
@@ -461,7 +463,8 @@
 DocType: Assessment Plan,Examiner Name,Nombre del examinador
 DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y precios
 DocType: Delivery Note,% Installed,% Instalado
-apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las conferencias se pueden programar."
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Aulas / laboratorios, etc., donde las clases se pueden programar."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Proveedor &gt; Tipo de proveedor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, ingrese el nombre de la compañia"
 DocType: Purchase Invoice,Supplier Name,Nombre de proveedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lea el Manual ERPNext
@@ -477,30 +480,32 @@
 DocType: Account,Old Parent,Antiguo Padre
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Campo obligatorio - Año Académico
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizar el texto de introducción que va como una parte de este correo electrónico. Cada transacción tiene un texto introductorio separado.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Establezca la cuenta de pago predeterminada para la empresa {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Configuración global para todos los procesos de producción
 DocType: Accounts Settings,Accounts Frozen Upto,Cuentas congeladas hasta
 DocType: SMS Log,Sent On,Enviado por
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} seleccionado varias veces en la tabla Atributos
 DocType: HR Settings,Employee record is created using selected field. ,El registro del empleado se crea utilizando el campo seleccionado.
 DocType: Sales Order,Not Applicable,No aplicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master de vacaciones .
 DocType: Request for Quotation 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 +877,Please enter Item Code.,"Por favor, introduzca el código del producto."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Por favor, introduzca el código del producto."
 DocType: BOM,Costing,Presupuesto
 DocType: Tax Rule,Billing County,Condado de facturación
 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"
 DocType: Request for Quotation,Message for Supplier,Mensaje para los Proveedores
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Cantidad Total
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID de correo electrónico de Guardian2
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID de correo electrónico del Tutor2
 DocType: Item,Show in Website (Variant),Mostrar en el sitio web (variante)
 DocType: Employee,Health Concerns,Problemas de salud
 DocType: Process Payroll,Select Payroll Period,Seleccione el período de nómina
 DocType: Purchase Invoice,Unpaid,Impagado
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +49,Reserved for sale,Reservado para venta
-DocType: Packing Slip,From Package No.,Desde paquete No.
+DocType: Packing Slip,From Package No.,Desde Paquete Nro.
 DocType: Item Attribute,To Range,A rango
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Valores y depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","No se puede cambiar el método de valoración, ya que hay transacciones contra algunos elementos que no tiene su propio método de valoración"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hojas totales asignados es obligatorio
 DocType: Job Opening,Description of a Job Opening,Descripción de la oferta de trabajo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Actividades pendientes para hoy
@@ -521,22 +526,22 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Funcionario administrativo
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor seleccione Curso
 DocType: Timesheet Detail,Hrs,Horas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Por favor, seleccione la empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Por favor, seleccione la empresa"
 DocType: Stock Entry Detail,Difference Account,Cuenta para la Diferencia
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,No se puede cerrar la tarea que depende de {0} ya que no está cerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, ingrese el almacén en el cual la requisición de materiales sera despachada"
 DocType: Production Order,Additional Operating Cost,Costos adicionales de operación
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"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
+DocType: Employee,Emergency Phone,Teléfono de Emergencia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
 ,Serial No Warranty Expiry,Garantía de caducidad del numero de serie
 DocType: Sales Invoice,Offline POS Name,Transacción POS Offline
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina el grado para el Umbral 0%
 DocType: Sales Order,To Deliver,Para entregar
 DocType: Purchase Invoice Item,Item,Productos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Nº de serie artículo no puede ser una fracción
 DocType: Journal Entry,Difference (Dr - Cr),Diferencia (Deb - Cred)
 DocType: Account,Profit and Loss,Pérdidas y ganancias
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestión de sub-contrataciones
@@ -546,12 +551,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation already used for another company,Abreviatura ya utilizada para otra empresa
 DocType: Selling Settings,Default Customer Group,Categoría de cliente predeterminada
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction","si es desactivado,  el campo 'Total redondeado' no será visible en ninguna transacción"
-DocType: BOM,Operating Cost,Costo de operacion
+DocType: BOM,Operating Cost,Costo de Operación
 DocType: Sales Order Item,Gross Profit,Beneficio Bruto
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento no puede ser 0
 DocType: Production Planning Tool,Material Requirement,Solicitud de material
 DocType: Company,Delete Company Transactions,Eliminar las transacciones de la compañía
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,No de referencia y fecha de referencia es obligatoria para las transacciones bancarias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Añadir / Editar Impuestos y Cargos
 DocType: Purchase Invoice,Supplier Invoice No,Factura de proveedor No.
 DocType: Territory,For reference,Para referencia
@@ -562,22 +567,22 @@
 DocType: Installation Note Item,Installation Note Item,Nota de instalación de elementos
 DocType: Production Plan Item,Pending Qty,Cantidad pendiente
 DocType: Budget,Ignore,Pasar por alto
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} no está activo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} no está activo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviados a los teléfonos: {0}
-apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensiones de verificación de configuración para la impresión
-DocType: Salary Slip,Salary Slip Timesheet,Parte de horas de salario de deslizamiento
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurar dimensiones de cheque para la impresión
+DocType: Salary Slip,Salary Slip Timesheet,Registro de Horas de Nómina
 apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,El almacén del proveedor es necesario para compras sub-contratadas
 DocType: Pricing Rule,Valid From,Válido desde
 DocType: Sales Invoice,Total Commission,Comisión total
 DocType: Pricing Rule,Sales Partner,Socio de ventas
 DocType: Buying Settings,Purchase Receipt Required,Recibo de compra requerido
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No se encontraron registros en la tabla de facturas
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, seleccione la compañía y el tipo de entidad"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanzas / Ejercicio contable.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores acumulados
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Crear orden de venta
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Crear orden de venta
 DocType: Project Task,Project Task,Tareas del proyecto
 ,Lead Id,ID de iniciativa
 DocType: C-Form Invoice Detail,Grand Total,Total
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Adjunto curriculum vitae
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes recurrentes
 DocType: Leave Control Panel,Allocate,Asignar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devoluciones de ventas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Devoluciones de ventas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Las hojas totales asignados {0} no debe ser inferior a las hojas ya aprobados {1} para el período
 DocType: Announcement,Posted By,Publicado por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregado por el Proveedor (nave)
@@ -604,34 +609,34 @@
 DocType: Quotation,Quotation To,Presupuesto para
 DocType: Lead,Middle Income,Ingreso medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Apertura (Cred)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Monto asignado no puede ser negativo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Establecer la empresa
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Por favor establezca la empresa
 DocType: Purchase Order Item,Billed Amt,Monto facturado
-DocType: Training Result Employee,Training Result Employee,Empleado Formación Resultado
+DocType: Training Result Employee,Training Result Employee,Resultado del Entrenamiento del Empleado
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Almacén lógico contra el que se crean las entradas de inventario
 DocType: Repayment Schedule,Principal Amount,Cantidad Principal
 DocType: Employee Loan Application,Total Payable Interest,Interés Total a Pagar
-DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Factura de venta de partes de horas
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Registro de Horas de Factura de Venta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Se requiere de No. de referencia y fecha para {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seleccionar la cuenta de pago para hacer la entrada del Banco
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crear registros de los empleados para gestionar los permisos, las reclamaciones de gastos y nómina"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Añadir a la Base de Conocimiento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Redacción de propuestas
-DocType: Payment Entry Deduction,Payment Entry Deduction,El pago Deducción de Entrada
+DocType: Payment Entry Deduction,Payment Entry Deduction,Deducción de Entrada de Pago
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,Existe otro vendedor {0} con el mismo ID de empleado
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Si está marcada, las materias primas para los artículos que son sub-contratados serán incluidos en las solicitudes de materiales"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Maestros
 DocType: Assessment Plan,Maximum Assessment Score,Puntuación máxima de Evaluación
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Actualizar Fechas de Transacciones Bancarias
-apps/erpnext/erpnext/config/projects.py +30,Time Tracking,tiempo de seguimiento
+apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Seguimiento de Tiempo
 DocType: Fiscal Year Company,Fiscal Year Company,Año fiscal de la compañía
 DocType: Packing Slip Item,DN Detail,Detalle DN
 DocType: Training Event,Conference,Conferencia
 DocType: Timesheet,Billed,Facturado
 DocType: Batch,Batch Description,Descripción de lotes
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,Crear grupos de estudiantes
-apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Pago de cuentas de puerta de enlace no se crea, por favor crear una manualmente."
+apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.","Cuenta de Pasarela de Pago no creada, por favor crear una manualmente."
 DocType: Sales Invoice,Sales Taxes and Charges,Impuestos y cargos sobre ventas
 DocType: Employee,Organization Profile,Perfil de la organización
 DocType: Student,Sibling Details,Detalles de hermanos
@@ -644,20 +649,19 @@
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Factura / Detalles de diarios
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' no esta en el año fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Ajustes para módulo de compras
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Activos {0} no pertenece a la empresa {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra"
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Activo {0} no pertenece a la empresa {1}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Por favor, ingrese primero el recibo de compra"
 DocType: Buying Settings,Supplier Naming By,Ordenar proveedores por
 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."
+DocType: Maintenance Schedule,Maintenance Schedule,Calendario de Mantenimiento
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Cambio neto en el inventario
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Administración de Préstamos de Empleado
 DocType: Employee,Passport Number,Número de pasaporte
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relación con Tutor2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerente
 DocType: Payment Entry,Payment From / To,Pago de / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rango de fechas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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 iguales
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,En minutos
 DocType: Issue,Resolution Date,Fecha de resolución
 DocType: Student Batch Name,Batch Name,Nombre del lote
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Parte de horas de creación:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Tabla de Tiempo creada:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inscribirse
 DocType: Selling Settings,Customer Naming By,Ordenar cliente por
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrará al estudiante como Estudiante Presente en informes mensuales de asistencia
@@ -675,10 +679,10 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Convertir a grupo
 DocType: Activity Cost,Activity Type,Tipo de Actividad
 DocType: Request for Quotation,For individual supplier,Por proveedor individual
-DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa básica de Hora (Compañía de divisas)
+DocType: BOM Operation,Base Hour Rate(Company Currency),La tarifa básica de Hora (divisa de la Compañía)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Importe entregado
 DocType: Supplier,Fixed Days,Días fijos
-DocType: Quotation Item,Item Balance,Concepto Saldo
+DocType: Quotation Item,Item Balance,Saldo de Elemento
 DocType: Sales Invoice,Packing List,Lista de embalaje
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Órdenes de compra enviadas a los proveedores.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,Publicación
@@ -693,10 +697,10 @@
 DocType: Employee Loan,Total Interest Payable,Interés total a pagar
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,"Impuestos, cargos y costos de destino estimados"
 DocType: Production Order Operation,Actual Start Time,Hora de inicio real
-DocType: BOM Operation,Operation Time,Tiempo de operación
+DocType: BOM Operation,Operation Time,Tiempo de Operación
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Terminar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
-DocType: Timesheet,Total Billed Hours,Total de horas facturadas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
+DocType: Timesheet,Total Billed Hours,Total de Horas Facturadas
 DocType: Journal Entry,Write Off Amount,Importe de desajuste
 DocType: Journal Entry,Bill No,Factura No.
 DocType: Company,Gain/Loss Account on Asset Disposal,Cuenta ganancia / pérdida en la disposición de activos
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Asistencia del estudiante
 DocType: Sales Invoice Timesheet,Time Sheet,Hoja de horario
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Adquisición retroactiva de materia prima basada en
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Por favor, ingrese los detalles del producto"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, ingrese los detalles del producto"
 DocType: Interest,Interest,Interesar
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre ventas
 DocType: Purchase Receipt,Other Details,Otros detalles
@@ -719,32 +723,31 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,Marketing
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Entrada de Pago ya creada
 DocType: Purchase Receipt Item Supplied,Current Stock,Inventario actual
-apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}: {1} Activos no vinculado al elemento {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Salario previsualización de deslizamiento
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Fila # {0}:  Activo {1} no vinculado al elemento {2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Previsualización de Nómina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Cuenta {0} se ha introducido varias veces
 DocType: Account,Expenses Included In Valuation,GASTOS DE VALORACIÓN
 DocType: Hub Settings,Seller City,Ciudad de vendedor
 ,Absent Student Report,Informe del alumno ausente
 DocType: Email Digest,Next email will be sent on:,El siguiente correo electrónico será enviado el:
 DocType: Offer Letter Term,Offer Letter Term,Términos de carta de oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,El producto tiene variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,El producto tiene variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Producto {0} no encontrado
 DocType: Bin,Stock Value,Valor de Inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Compañía {0} no existe
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tipo de árbol
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tipo de árbol
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantidad consumida por unidad
 DocType: Serial No,Warranty Expiry Date,Fecha de caducidad de la garantía
 DocType: Material Request Item,Quantity and Warehouse,Cantidad y almacén
 DocType: Sales Invoice,Commission Rate (%),Porcentaje de comisión (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración&gt; Configuración&gt; Nombrar Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleccione el programa
-DocType: Project,Estimated Cost,Costo estimado
+DocType: Project,Estimated Cost,Costo Estimado
 DocType: Purchase Order,Link to material requests,Enlace a las solicitudes de materiales
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aeroespacial
 DocType: Journal Entry,Credit Card Entry,Ingreso de tarjeta de crédito
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,Empresa y Contabilidad
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,Productos recibidos de proveedores.
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En valor
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,En Valor
 DocType: Lead,Campaign Name,Nombre de la campaña
 DocType: Selling Settings,Close Opportunity After Days,Cerrar Oportunidad Después Días
 ,Reserved,Reservado
@@ -754,7 +757,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} no es un artículo en existencia
 DocType: Mode of Payment Account,Default Account,Cuenta predeterminada
 DocType: Payment Entry,Received Amount (Company Currency),Cantidad recibida (Divisa de Compañia)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,La Iniciativa se debe establecer si la oportunidad está hecha desde las Iniciativas
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor seleccione el día libre de la semana
 DocType: 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"
@@ -762,7 +765,7 @@
 DocType: Delivery Note,Customer's Purchase Order No,Pedido de compra No.
 DocType: Budget,Budget Against,Contra Presupuesto
 DocType: Employee,Cell Number,Número de movil
-apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Las solicitudes de material auto generada
+apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,Solicitudes de material automáticamente generadas
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,Perdido
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,Reservado para la fabricación
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Oportunidad desde
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Nómina mensual.
 DocType: BOM,Website Specifications,Especificaciones del sitio web
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración &gt; Serie de numeración
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Desde {0} del tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Línea {0}: El factor de conversión es obligatorio
@@ -823,21 +827,22 @@
 DocType: Employee,Bank A/C No.,Núm. de cta. bancaria
 DocType: Bank Guarantee,Project,Proyecto
 DocType: Quality Inspection Reading,Reading 7,Lectura 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Parcialmente Ordenado
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de gasto
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Ajustes por defecto para carrito de compras
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Activos desechado a través de entrada de diario {0}
 DocType: Employee Loan,Interest Income Account,Cuenta de Utilidad interés
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnología
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,GASTOS DE MANTENIMIENTO (OFICINA)
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Gastos de Mantenimiento de Oficina
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuración de cuentas de correo electrónico
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Por favor, introduzca primero un producto"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, introduzca primero un producto"
 DocType: Account,Liability,Obligaciones
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importe sancionado no puede ser mayor que el importe del reclamo en la línea {0}.
 DocType: Company,Default Cost of Goods Sold Account,Cuenta de costos (venta) por defecto
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,No ha seleccionado una lista de precios
 DocType: Employee,Family Background,Antecedentes familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar correo electronico
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advertencia! archivo adjunto no valido: {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Sin permiso
 DocType: Company,Default Bank Account,Cuenta bancaria por defecto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar en base a terceros, seleccione el tipo de entidad"
@@ -846,23 +851,23 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,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/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Fila # {0}: {1} de activos debe ser presentado
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,Fila # {0}: Activo {1} debe ser presentado
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Empleado no encontrado
 DocType: Supplier Quotation,Stopped,Detenido.
 DocType: Item,If subcontracted to a vendor,Si es sub-contratado a un proveedor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,El grupo de estudiantes ya está actualizado.
 DocType: SMS Center,All Customer Contact,Todos Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Subir el balance de existencias a través de un archivo .csv
 DocType: Warehouse,Tree Details,Detalles del árbol
-DocType: Training Event,Event Status,Estado de eventos
+DocType: Training Event,Event Status,Estado de Eventos
 ,Support Analytics,Soporte analítico
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.","Si usted tiene alguna pregunta, por favor consultenos."
 DocType: Item,Website Warehouse,Almacén para el sitio web
 DocType: Payment Reconciliation,Minimum Invoice Amount,Monto Mínimo de Factura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: El centro de costos {2} no pertenece a la empresa {3}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un grupo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Parte de horas {0} ya se haya completado o cancelado
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cuenta {2} no puede ser un Grupo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Elemento Fila {idx}: {doctype} {docname} no existe en la anterior tabla '{doctype}'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Table de Tiempo {0} ya se haya completado o cancelado
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No hay tareas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Día del mes en el que se generará la factura automática por ejemplo 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Apertura de la depreciación acumulada
@@ -878,7 +883,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} contra la factura {1} de fecha {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Calendario de cursos
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Calendario de cursos
 DocType: Maintenance Visit,Completion Status,Estado de finalización
 DocType: HR Settings,Enter retirement age in years,Introduzca la edad de jubilación en años
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Inventario estimado
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir hasta este porcentaje en la entrega y/o recepción
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Asistente de importación
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos los Grupos de Artículos
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos los Grupos de Artículos
 DocType: Process Payroll,Activity Log,Registro de Actividad
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Utilidad / Pérdida neta
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Componer automáticamente el mensaje en la presentación de las transacciones.
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Orden de compra a pago
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Cantidad proyectada
 DocType: Sales Invoice,Payment Due Date,Fecha de pago
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artículo Variant {0} ya existe con los mismos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Apertura&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Lista de tareas abiertas
 DocType: Notification Control,Delivery Note Message,Mensaje en nota de entrega
@@ -909,17 +914,17 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,Investigación y desarrollo
 apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,Monto a Facturar
 DocType: Company,Registration Details,Detalles de registro
-DocType: Timesheet,Total Billed Amount,Monto total Anunciada
+DocType: Timesheet,Total Billed Amount,Monto total Facturado
 DocType: Item Reorder,Re-Order Qty,Cantidad mínima para ordenar
 DocType: Leave Block List Date,Leave Block List Date,Fecha de Lista de Bloqueo de Vacaciones
 DocType: Pricing Rule,Price or Discount,Precio o descuento
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Sólo obtención de materias primas
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,Evaluación de desempeño.
 apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart","Habilitación de «uso de Compras &#39;, como cesta de la compra está activado y debe haber al menos una regla fiscal para Compras"
-apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazado con la Orden {1}, comprobar si se debe tirar como avance en esta factura."
+apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.","Entrada de pago {0} está enlazada con la Orden {1}, comprobar si se debe ser retirado como avance en esta factura."
 DocType: Sales Invoice Item,Stock Details,Detalles de almacén
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,Valor del proyecto
 apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,Punto de venta (POS)
@@ -931,7 +936,7 @@
 ,Available Qty,Cantidad Disponible
 DocType: Purchase Taxes and Charges,On Previous Row Total,Sobre la línea anterior al total
 DocType: Purchase Invoice Item,Rejected Qty,Cant. Rechazada
-DocType: Salary Slip,Working Days,Días de trabajo
+DocType: Salary Slip,Working Days,Días de Trabajo
 DocType: Serial No,Incoming Rate,Tasa entrante
 DocType: Packing Slip,Gross Weight,Peso bruto
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,Ingrese el nombre de la compañía para configurar el sistema.
@@ -942,15 +947,15 @@
 DocType: Supplier Quotation,Is Subcontracted,Es sub-contratado
 DocType: Item Attribute,Item Attribute Values,Valor de los atributos del producto
 DocType: Examination Result,Examination Result,Resultado del examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Recibo de compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Recibo de compra
 ,Received Items To Be Billed,Recepciones por facturar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Nóminas presentadas
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Configuración principal para el cambio de divisas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referencia Doctype debe ser uno de {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Doctype de referencia debe ser uno de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar la ranura de tiempo en los próximos {0} días para la operación {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de materiales para los subconjuntos
-apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Puntos de venta y Territorio
+apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Socios Comerciales y Territorio
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,No se puede crear automáticamente de la cuenta como ya existe saldo de existencias en la cuenta. Debe crear una cuenta de juego antes de poder realizar una entrada en este almacén
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,La lista de materiales (LdM) {0} debe estar activa
 DocType: Journal Entry,Depreciation Entry,Entrada de Depreciación
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Cuentas por pagar por defecto
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,El empleado {0} no está activo o no existe
 DocType: Fee Structure,Components,componentes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el punto {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,{0} variantes actualizadas del producto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Por favor, introduzca categoría de activos en el  artículo {0}"
 DocType: Quality Inspection Reading,Reading 6,Lectura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,No se puede {0} {1} {2} sin ninguna factura pendiente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de compra anticipada
 DocType: Hub Settings,Sync Now,Sincronizar ahora.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Línea {0}: La entrada de crédito no puede vincularse con {1}
@@ -986,13 +990,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,La marca
 DocType: Employee,Exit Interview Details,Detalles de Entrevista de Salida
 DocType: Item,Is Purchase Item,Es un producto para compra
-DocType: Asset,Purchase Invoice,Factura de compra
+DocType: Asset,Purchase Invoice,Factura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Detalle de Comprobante No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nueva factura de venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nueva factura de venta
 DocType: Stock Entry,Total Outgoing Value,Valor total de salidas
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Fecha de Apertura y Fecha de Cierre deben ser dentro del mismo año fiscal
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Fecha de Apertura y Fecha de Cierre deben ser dentro del mismo año fiscal
 DocType: Lead,Request for Information,Solicitud de información
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sincronizar Facturas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sincronizar Facturas
 DocType: Payment Request,Paid,Pagado
 DocType: Program Fee,Program Fee,Cuota del Programa
 DocType: Salary Slip,Total in words,Total en palabras
@@ -1002,10 +1006,10 @@
 DocType: Employee Loan,Sanctioned,Sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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'"
 DocType: Job Opening,Publish on website,Publicar en el sitio web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Envíos realizados a los clientes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Factura Proveedor La fecha no puede ser mayor que la fecha de publicación
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Fecha de Factura de Proveedor no puede ser mayor que la fecha de publicación
 DocType: Purchase Invoice Item,Purchase Order Item,Producto de la orden de compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Ingresos indirectos
 DocType: Student Attendance Tool,Student Attendance Tool,Herramienta de asistencia de los estudiantes
@@ -1013,45 +1017,43 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variación
 ,Company Name,Nombre de compañía
 DocType: SMS Center,Total Message(s),Total Mensage(s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Seleccione el producto a transferir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
-						Please enter a valid Invoice","Fila {0}: {1} factura no es válida, podría ser cancelado / no existe. \ Por favor, introduzca una factura válida"
+						Please enter a valid Invoice","Fila {0}: factura {1} no es válida, puede que esté cancelada / no existe. \ Por favor, introduzca una factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Predeterminado de la cuenta bancaria / efectivo se actualizará automáticamente en el Salario entrada de diario cuando se selecciona este modo.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Los intervalos de Código Grado {0} se superpone con los intervalos de grado para los demás grados. Gracias por confirmar intervalos {0} y {1} e inténtelo de nuevo
-DocType: BOM,Raw Material Cost(Company Currency),Prima Costo de Materiales (Compañía de divisas)
+DocType: BOM,Raw Material Cost(Company Currency),Costo de Materiales Sin Procesar (Divisa de la Compañía)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Fila # {0}: La tasa no puede ser mayor que la tasa utilizada en {1} {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Metro
-DocType: Workstation,Electricity Cost,Costos de energía electrica
+DocType: Workstation,Electricity Cost,Costos de Energía Eléctrica
 DocType: HR Settings,Don't send Employee Birthday Reminders,No enviar recordatorio de cumpleaños del empleado
 DocType: Item,Inspection Criteria,Criterios de inspección
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,Transferido
 DocType: BOM Website Item,BOM Website Item,BOM sitio web de artículos
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Cargue su membrete y el logotipo. (Estos pueden editarse más tarde).
 DocType: Timesheet Detail,Bill,Cuenta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La depreciación próxima fecha se introduce como fecha pasada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La próxima fecha de depreciación  se introduce como fecha pasada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanco
 DocType: SMS Center,All Lead (Open),Todas las Oportunidades (Abiertas)
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} a publicar momento de la entrada ({2} {3})
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Fila {0}: Cantidad no está disponible para {4} en el almacén {1} en el momento de publicación de la entrada ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtener anticipos pagados
 DocType: Item,Automatically Create New Batch,Crear automáticamente nuevo lote
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Crear
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Crear
 DocType: Student Admission,Admission Start Date,Fecha de inicio de la admisión
 DocType: Journal Entry,Total Amount in Words,Importe total en letras
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Ha ocurrido un error. Una razón probable es que usted no ha guardado el formulario. Por favor, póngase en contacto con support@erpnext.com si el problema persiste."
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Mi carrito
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
+apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Cant. de Apertura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Por favor, introduzca la cuenta para el Cambio Monto"
 DocType: Student Batch Name,Student Batch Name,Nombre de Lote del Estudiante
 DocType: Holiday List,Holiday List Name,Nombre de festividad
 DocType: Repayment Schedule,Balance Loan Amount,Saldo del balance del préstamo
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Por favor especificar un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Elementos eliminados que no han sido afectados en cantidad y valor
 DocType: Delivery Note,Delivery To,Entregar a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabla de atributos es obligatoria
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabla de atributos es obligatoria
 DocType: Production Planning Tool,Get Sales Orders,Obtener ordenes de venta
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} no puede ser negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Descuento
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Descuento
 DocType: Asset,Total Number of Depreciations,Número total de amortizaciones
 DocType: Sales Invoice Item,Rate With Margin,Tarifa con margen
 DocType: Workstation,Wages,Salarios
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,El almacén reservado en el Pedido de Ventas/Almacén de Productos terminados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Cantidad de venta
 DocType: Repayment Schedule,Interest Amount,Cantidad de interés
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Usted es el supervisor de gastos para este registro. Por favor, actualice el estado y guarde"
 DocType: Serial No,Creation Document No,Creación del documento No
 DocType: Issue,Issue,Asunto
 DocType: Asset,Scrapped,Desechado
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para  Elementos variables. por ejemplo, tamaño, color, etc."
 DocType: Purchase Invoice,Returns,Devoluciones
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Almacén de trabajos en proceso
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Número de serie {0} tiene un contrato de mantenimiento hasta {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Reclutamiento
 DocType: Lead,Organization Name,Nombre de la organización
 DocType: Tax Rule,Shipping State,Estado de envío
 ,Projected Quantity as Source,Cantidad proyectada como Fuente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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'
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incluir elementos no están en stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Gastos de venta
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de costos por defecto
 DocType: Sales Partner,Implementation Partner,Socio de implementación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Código postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Código postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Orden de Venta {0} es {1}
 DocType: Opportunity,Contact Info,Información de contacto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Crear asientos de stock
 DocType: Packing Slip,Net Weight UOM,Unidad de medida para el peso neto
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Resultados
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Resultados
 DocType: Item,Default Supplier,Proveedor predeterminado
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Porcentaje permitido de sobre-producción
 DocType: Employee Loan,Repayment Schedule,Calendario de reembolso
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtener cierre de semana
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,la fecha final no puede ser inferior a fecha de Inicio
 DocType: Sales Person,Select company name first.,Seleccione primero el nombre de la empresa.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Presupuestos recibidos de proveedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Para {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Edad Promedio
@@ -1131,8 +1133,8 @@
 DocType: Opportunity,Your sales person who will contact the customer in future,Indique la persona de ventas que se pondrá en contacto posteriormente con el cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Enumere algunos de sus proveedores. Pueden ser organizaciones o individuos.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Ver todos los Productos
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Edad mínima del plomo (días)
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,todas las listas de materiales
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Edad mínima de Iniciativa (días)
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Todas las listas de materiales
 DocType: Company,Default Currency,Divisa / modena predeterminada
 DocType: Expense Claim,From Employee,Desde Empleado
 apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,Advertencia: El sistema no comprobará la sobrefacturación si la cantidad del producto {0} en {1} es cero
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Área Clave de Rendimiento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributo no válido
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} debe ser presentado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} debe ser presentado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La cantidad debe ser menor que o igual a {0}
 DocType: SMS Center,Total Characters,Total Caracteres
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
@@ -1152,17 +1154,17 @@
 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 +224,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 +52,Please set 'Apply Additional Discount On',"Por favor, establece &quot;Aplicar descuento adicional en &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, establece ""Aplicar descuento adicional en"""
 ,Ordered Items To Be Billed,Ordenes por facturar
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gama tiene que ser menor que en nuestra gama
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Rango Desde tiene que ser menor que Rango Hasta
 DocType: Global Defaults,Global Defaults,Predeterminados globales
-apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Invitación del Proyecto de Colaboración
+apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Invitación a Colaboración  de Proyecto
 DocType: Salary Slip,Deductions,Deducciones
 DocType: Leave Allocation,LAL/,LAL /
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Año de inicio
 DocType: Purchase Invoice,Start date of current invoice's period,Fecha inicial del período de facturación
 DocType: Salary Slip,Leave Without Pay,Permiso / licencia sin goce de salario (LSS)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Error en la planificación de capacidad
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Esto se añade al código del producto y la variante. Por ejemplo, si su abreviatura es ""SM"", y el código del artículo es ""CAMISETA"", entonces el código de artículo de la variante será ""CAMISETA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pago neto (en palabras) será visible una vez que guarde la nómina salarial.
 DocType: Purchase Invoice,Is Return,Es un retorno
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retorno / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,Lista de precios del país
 DocType: Item,UOMs,UdM
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} núms. de serie válidos para el artículo {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Por favor, introduzca el código de artículo para obtener el número de lote"
 DocType: Stock Settings,Default Item Group,Grupo de artículos predeterminado
 DocType: Employee Loan,Partially Disbursed,Parcialmente Desembolsado
-DocType: Grading Structure,Grading System Name,Nombre del sistema de clasificación
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de datos de proveedores.
 DocType: Account,Balance Sheet,Hoja de balance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en puntos de venta perfil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centro de costos para el producto con código '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modo de pago no está configurado. Por favor, compruebe, si la cuenta se ha establecido en el modo de pago o en el perfil del punto de venta."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,El vendedor recibirá un aviso en esta fecha para ponerse en contacto con el cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,El mismo artículo no se puede introducir varias veces.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Ordenes de compra por pagar
 DocType: Purchase Invoice Item,Net Rate,Precio neto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de compra del producto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Entradas del Libro Mayor de Inventarios y GL están insertados en los recibos de compra seleccionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Elemento 1
 DocType: Holiday,Holiday,Vacaciones
 DocType: Support Settings,Close Issue After Days,Cerrar Problema Después Días
@@ -1213,7 +1214,7 @@
 DocType: Payment Reconciliation,Unreconciled Payment Details,Detalles de pagos no conciliados
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Cantidad de Pedidos
 DocType: Global Defaults,Current Fiscal Year,Año fiscal actual
-DocType: Purchase Order,Group same items,Grupo mismos artículos
+DocType: Purchase Order,Group same items,Agrupar mismos artículos
 DocType: Global Defaults,Disable Rounded Total,Desactivar redondeo
 DocType: Employee Loan Application,Repayment Info,Información de la devolución
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,'Entradas' no pueden estar vacías
@@ -1228,16 +1229,16 @@
 DocType: Maintenance Visit Purpose,Work Done,Trabajo realizado
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Por favor, especifique al menos un atributo en la tabla"
 DocType: Announcement,All Students,Todos los estudiantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Elemento {0} debe ser una posición no de almacén
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Elemento {0} debe ser un elemento de no-stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Mostrar libro mayor
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Primeras
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Existe un grupo de elementos con el mismo nombre , por favor, cambie el nombre del artículo , o cambiar el nombre del grupo de artículos"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Número de Móvil del Estudiante.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto del mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,El producto {0} no puede contener lotes
 ,Budget Variance Report,Variación de Presupuesto
-DocType: Salary Slip,Gross Pay,Pago bruto
+DocType: Salary Slip,Gross Pay,Pago Bruto
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Fila {0}: Tipo de actividad es obligatoria.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,DIVIDENDOS PAGADOS
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Libro de contabilidad
@@ -1250,12 +1251,12 @@
 DocType: Purchase Invoice,Supplied Items,Productos suministrados
 DocType: Student,STUD.,ESTUDIANTE.
 DocType: Production Order,Qty To Manufacture,Cantidad para producción
-DocType: Email Digest,New Income,nuevo Ingreso
+DocType: Email Digest,New Income,Nuevo Ingreso
 DocType: School Settings,School Settings,Configuración de la escuela
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantener los mismos precios durante el ciclo de compras
 DocType: Opportunity Item,Opportunity Item,Oportunidad Artículo
-,Student and Guardian Contact Details,Alumno y tutor detalles de contacto
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Por proveedor se requiere {0} Dirección de correo electrónico para enviar correo electrónico
+,Student and Guardian Contact Details,Detalles de Contacto de Alumno y Tutor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Fila {0}: Para el proveedor {0} se requiere la Dirección de correo electrónico para enviar correo electrónico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Apertura temporal
 ,Employee Leave Balance,Balance de ausencias de empleado
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},El balance para la cuenta {0} siempre debe ser {1}
@@ -1264,16 +1265,16 @@
 DocType: Purchase Invoice,Rejected Warehouse,Almacén rechazado
 DocType: GL Entry,Against Voucher,Contra comprobante
 DocType: Item,Default Buying Cost Center,Centro de costos (compra) por defecto
-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.","Para obtener lo mejor de ERPNext, le recomendamos que se tome un tiempo y ver estos vídeos de ayuda."
+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.","Para obtener lo mejor de ERPNext, le recomendamos que se tome un tiempo y vea estos vídeos de ayuda."
 apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,a
 DocType: Item,Lead Time in days,Plazo de ejecución en días
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Balance de cuentas por pagar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Pago de salario de {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Orden de venta {0} no es válida
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Orden de venta {0} no es válida
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Las órdenes de compra le ayudará a planificar y dar seguimiento a sus compras
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Lamentablemente, las compañías no se pueden combinar"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La cantidad total de emisión / Transferencia {0} en la Solicitud de material {1} \ no puede ser mayor que la cantidad solicitada {2} para el artículo {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pequeño
@@ -1294,38 +1295,38 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Egresos indirectos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Línea {0}: La cantidad es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronización de datos maestros
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sincronización de datos maestros
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Sus Productos o Servicios
 DocType: Mode of Payment,Mode of Payment,Método de pago
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,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 +180,Website Image should be a public file or website URL,Sitio web imagen debe ser un archivo público o URL del sitio web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este es un grupo principal y no se puede editar.
 DocType: Journal Entry Account,Purchase Order,Orden de compra (OC)
-DocType: Vehicle,Fuel UOM,UOM de combustible
+DocType: Vehicle,Fuel UOM,UOM de Combustible
 DocType: Warehouse,Warehouse Contact Info,Información del Contacto en el Almacén
 DocType: Payment Entry,Write Off Difference Amount,Amortizar importe de la diferencia
 DocType: Purchase Invoice,Recurring Type,Tipo de recurrencia
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +394,"{0}: Employee email not found, hence email not sent","{0}: No se encontró el correo electrónico de los empleados, por lo tanto, no correo electrónico enviado"
-DocType: Item,Foreign Trade Details,Detalles extranjera Comercio
+DocType: Item,Foreign Trade Details,Detalles de Comercio Extranjero
 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
 DocType: Student Group Student,Group Roll Number,Número del rollo de grupo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, sólo las cuentas de crédito se pueden vincular con un asiento de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total de todos los pesos de tareas debe ser 1. Por favor ajusta los pesos de todas las tareas del proyecto en consecuencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,La nota de entrega {0} no está validada
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La 'regla precios' es seleccionada primero basada en el campo 'Aplicar En' que puede ser un artículo, grupo de artículos o marca."
 DocType: Hub Settings,Seller Website,Sitio web del vendedor
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Porcentaje del total asignado para el equipo de ventas debe ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},El estado de la orden de producción es {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},El estado de la orden de producción es {0}
 DocType: Appraisal Goal,Goal,Meta/Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar descripción
 ,Team Updates,Actualizaciones equipo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,De proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Crear Formato de impresión
@@ -1334,14 +1335,14 @@
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",Sólo puede existir una 'regla de envió' con valor 0 o valor en blanco en 'para el valor'
 DocType: Authorization Rule,Transaction,Transacción
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota: este centro de costes es una categoría. No se pueden crear asientos contables en las categorías.
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,existe almacén niño para este almacén. No se puede eliminar este almacén.
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,No se puede eliminar este almacén. Existe almacén hijo para este almacén.
 DocType: Item,Website Item Groups,Grupos de productos en el sitio web
 DocType: Purchase Invoice,Total (Company Currency),Total (Divisa por defecto)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Número de serie {0} ha sido ingresado mas de una vez
 DocType: Depreciation Schedule,Journal Entry,Asiento contable
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} artículos en curso
 DocType: Workstation,Workstation Name,Nombre de la estación de trabajo
-DocType: Grade Interval,Grade Code,Código grado
+DocType: Grading Scale Interval,Grade Code,Código de Grado
 DocType: POS Item Group,POS Item Group,POS Grupo de artículos
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Enviar boletín:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},La lista de materiales (LdM) {0} no pertenece al producto {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Recurrir hasta
 DocType: Attendance,HR Manager,Gerente de recursos humanos (RRHH)
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, seleccione la compañía"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, seleccione la compañía"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Vacaciones
 DocType: Purchase Invoice,Supplier Invoice Date,Fecha de factura de proveedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Necesita habilitar el carrito de compras
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rango de antigüedad 3
 DocType: Maintenance Schedule Item,No of Visits,Número de visitas
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marcar Asistencia
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Marcar Asistencia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},El programa de mantenimiento {0} existe en contra de {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inscribiendo estudiante
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La divisa / moneda de la cuenta de cierre debe ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},La suma de puntos para los objetivos debe ser 100. y es {0}
@@ -1385,7 +1387,7 @@
 DocType: Purchase Invoice Item,UOM,UOM
 DocType: Rename Tool,Utilities,Utilidades
 DocType: Purchase Invoice Item,Accounting,Contabilidad
-DocType: Employee,EMP/,EMP /
+DocType: Employee,EMP/,EMP/
 DocType: Asset,Depreciation Schedules,programas de depreciación
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,Período de aplicación no puede ser período de asignación licencia fuera
 DocType: Activity Cost,Projects,Proyectos
@@ -1398,16 +1400,16 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Promedio diario saliente
 DocType: POS Profile,Campaign,Campaña
 DocType: Supplier,Name and Type,Nombre y Tipo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"El estado de esta solicitud debe ser ""Aprobado"" o ""Rechazado"""
 DocType: Purchase Invoice,Contact Person,Persona de contacto
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Fecha esperada de inicio' no puede ser mayor que 'Fecha esperada de finalización'
 DocType: Course Scheduling Tool,Course End Date,Fecha de finalización del curso
 DocType: Holiday List,Holidays,Vacaciones
 DocType: Sales Order Item,Planned Quantity,Cantidad planificada
 DocType: Purchase Invoice Item,Item Tax Amount,Total impuestos de producto
-DocType: Item,Maintain Stock,Mantener stock
+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
-DocType: Employee,Prefered Email,preferido por correo electrónico
+DocType: Employee,Prefered Email,Correo electrónico  preferido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Cambio neto en activos fijos
 DocType: Leave Control Panel,Leave blank if considered for all designations,Dejar en blanco si es considerado para todos los puestos
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Almacén es obligatorio para las cuentas no grupales de tipo Stock
@@ -1421,21 +1423,22 @@
 DocType: Sales Invoice,Shipping Address Name,Nombre de dirección de envío
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,No puede ser mayor de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,El producto {0} no es un producto de stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,No puede ser mayor de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,El producto {0} no es un producto de stock
 DocType: Maintenance Visit,Unscheduled,Sin programación
 DocType: Employee,Owned,Propiedad
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licencia sin goce de salario
 DocType: Pricing Rule,"Higher the number, higher the priority","Cuanto mayor sea el número, mayor es la prioridad"
 ,Purchase Invoice Trends,Tendencias de compras
 DocType: Employee,Better Prospects,Mejores Prospectos
-DocType: Vehicle,License Plate,Placa
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Fila # {0}: El lote {1} tiene sólo {2} de cantidad. Por favor, seleccione otro lote que tenga {3} de cantidad disponible o dividido la fila en varias filas, para entregar / emitir desde varios lotes"
+DocType: Vehicle,License Plate,Matrículas
 DocType: Appraisal,Goals,Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantía / Estado de CMA
 ,Accounts Browser,Navegador de Cuentas
 DocType: Payment Entry Reference,Payment Entry Reference,Referencia de Entrada de Pago
 DocType: GL Entry,GL Entry,Entrada GL
-DocType: HR Settings,Employee Settings,Configuración de empleado
+DocType: HR Settings,Employee Settings,Configuración de Empleado
 ,Batch-Wise Balance History,Historial de saldo por lotes
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,Los ajustes de impresión actualizados en formato de impresión respectivo
 DocType: Package Code,Package Code,Código de paquete
@@ -1446,7 +1449,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,El empleado no puede informar a sí mismo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil laboral, las cualificaciones necesarias, etc"
 DocType: Journal Entry Account,Account Balance,Balance de la cuenta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regla de impuestos para las transacciones.
@@ -1457,7 +1460,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar P &amp; L saldos sin cerrar el año fiscal
 DocType: Shipping Rule,Shipping Account,Cuenta de envíos
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: La cuenta {2} está inactiva
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Hacer Ordenes de Ventas para ayudar a planificar tu trabajo y entregar en tiempo
 DocType: Quality Inspection,Readings,Lecturas
 DocType: Stock Entry,Total Additional Costs,Total de costos adicionales
 DocType: Course Schedule,SH,SH
@@ -1468,8 +1471,8 @@
 DocType: Shipping Rule Condition,To Value,Para el valor
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Lista de embalaje
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ALQUILERES DE LOCAL
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Lista de embalaje
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Alquiler de Oficina
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuración de pasarela SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,¡Importación fallida!
 apps/erpnext/erpnext/public/js/templates/address_list.html +21,No address added yet.,No se ha añadido ninguna dirección
@@ -1478,8 +1481,8 @@
 DocType: Item,Inventory,inventario
 DocType: Item,Sales Details,Detalles de ventas
 DocType: Quality Inspection,QI-,QI-
-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
+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
 DocType: Notification Control,Expense Claim Rejected,Reembolso de gastos rechazado
 DocType: Item,Item Attribute,Atributos del producto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Government,Gubernamental
@@ -1488,13 +1491,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,"Por favor, ingrese el monto de amortización"
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variantes del producto
 DocType: Company,Services,Servicios
-DocType: HR Settings,Email Salary Slip to Employee,Salario de correo electrónico de deslizamiento con el empleado
+DocType: HR Settings,Email Salary Slip to Employee,Enviar Nómina al Empleado por Correo Electrónico
 DocType: Cost Center,Parent Cost Center,Centro de costos principal
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Seleccionar Posible Proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Seleccionar Posible Proveedor
 DocType: Sales Invoice,Source,Referencia
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar cerrada
 DocType: Leave Type,Is Leave Without Pay,Es una ausencia sin goce de salario
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoría activo es obligatorio para la partida del activo fijo
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No se encontraron registros en la tabla de pagos
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este {0} conflictos con {1} de {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML de Estudiantes
@@ -1512,14 +1515,14 @@
 DocType: Student,Date of Leaving,Fecha de partida
 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/utilities/activation.py +64,Create Leads,Crear Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Crear Leads
 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: Landed Cost Voucher,Additional Charges,Cargos adicionales
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),Monto adicional de descuento (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,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
+DocType: Maintenance Visit,Maintenance Visit,Visita de Mantenimiento
 DocType: Student,Leaving Certificate Number,Dejando Número de Certificado
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Cantidad de lotes disponibles en almacén
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Formato de impresión de actualización
@@ -1536,13 +1539,13 @@
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,En palabras serán visibles una vez que se guarda la nota de entrega.
 DocType: Expense Claim,EXP,EXP
 apps/erpnext/erpnext/config/stock.py +200,Brand master.,Marca principal
-apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiante {0} - {1} aparece en múltiples ocasiones consecutivas {2} y {3}
-DocType: Program Enrollment Tool,Program Enrollments,Las inscripciones del programa
+apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},Estudiante {0} - {1} aparece múltiples veces en fila {2} y {3}
+DocType: Program Enrollment Tool,Program Enrollments,Inscripciones del Programa
 DocType: Sales Invoice Item,Brand Name,Marca
 DocType: Purchase Receipt,Transporter Details,Detalles de transporte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Se requiere depósito por omisión para el elemento seleccionado
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caja
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Posible Proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Posible Proveedor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organización
 DocType: Budget,Monthly Distribution,Distribución mensual
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"La lista de receptores se encuentra vacía. Por favor, cree una lista de receptores"
@@ -1550,7 +1553,7 @@
 DocType: Sales Partner,Sales Partner Target,Metas de socio de ventas
 DocType: Loan Type,Maximum Loan Amount,Cantidad máxima del préstamo
 DocType: Pricing Rule,Pricing Rule,Regla de precios
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Número de rol duplicado para el estudiante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Número de rol duplicado para el estudiante {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acción Si el presupuesto anual superó
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Requisición de materiales hacia órden de compra
 DocType: Shopping Cart Settings,Payment Success URL,URL de Pago Exitoso
@@ -1571,12 +1574,12 @@
 DocType: Employee Loan,Repayment Method,Método de amortización
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si se selecciona, la página de inicio será el grupo por defecto del artículo para el sitio web"
 DocType: Quality Inspection Reading,Reading 4,Lectura 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM por defecto para {0} no encontrado para Proyecto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM por defecto para {0} no encontrado para Proyecto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Peticiones para gastos de compañía
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Los estudiantes son el corazón del sistema, agrega todos tus estudiantes"
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: Fecha de Liquidación {1} no puede ser anterior Cheque Fecha {2}
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Los estudiantes son el corazón del sistema, agrega todos tus estudiantes"
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Fila # {0}: Fecha de Liquidación {1} no puede ser anterior a la Fecha de Cheque {2}
 DocType: Company,Default Holiday List,Lista de vacaciones / festividades predeterminadas
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Del tiempo y Tiempo de {1} se solapan con {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Fila {0}: Tiempo Desde y Tiempo Hasta de {1} se solapan con {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Inventarios por pagar
 DocType: Purchase Invoice,Supplier Warehouse,Almacén del proveedor
 DocType: Opportunity,Contact Mobile No,No. móvil de contacto
@@ -1585,21 +1588,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,El día (s) en el que está solicitando la licencia son los días festivos. Usted no necesita solicitar la excedencia.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Vuelva a enviar el pago por correo electrónico
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nueva tarea
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Crear una cotización
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Crear una cotización
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Otros Reportes
 DocType: Dependent Task,Dependent Task,Tarea dependiente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ausencia del tipo {0} no puede tener más de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Procure planear las operaciones con XX días de antelación.
 DocType: HR Settings,Stop Birthday Reminders,Detener recordatorios de cumpleaños.
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Por favor, establece nómina cuenta por pagar por defecto en la empresa {0}"
 DocType: SMS Center,Receiver List,Lista de receptores
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Busca artículo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Busca artículo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Monto consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Cambio Neto en efectivo
 DocType: Assessment Plan,Grading Scale,Escala de calificación
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Ya completado
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidad de Medida (UdM) {0} se ha introducido más de una vez en la tabla de factores de conversión
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Ya completado
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Solicitud de pago ya existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo de productos entregados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},La cantidad no debe ser más de {0}
@@ -1629,14 +1632,15 @@
 DocType: BOM Item,BOM Item,Lista de materiales (LdM) del producto
 DocType: Appraisal,For Employee,Por empleados
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Hacer la entrada de desembolso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe debitar
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Fila {0}: Avance contra el Proveedor debe ser debito
 DocType: Company,Default Values,Valores predeterminados
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Monto total reembolsado
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Esta basado en registros contra este Vehículo. Ver el cronograma debajo para más detalles
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Recoger
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contra factura de proveedor {0} con fecha{1}
 DocType: Customer,Default Price List,Lista de precios por defecto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,registrar el movimiento de activos {0} creado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Movimiento de activo {0} creado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,No se puede eliminar el año fiscal {0}. Año fiscal {0} se establece por defecto en la configuración global
 DocType: Journal Entry,Entry Type,Tipo de entrada
 ,Customer Credit Balance,Saldo de clientes
@@ -1647,19 +1651,19 @@
 DocType: Quotation,Term Details,Detalles de términos y condiciones
 DocType: Project,Total Sales Cost (via Sales Order),Costo total de ventas (a través de la orden de venta)
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,No se puede inscribir más de {0} estudiantes para este grupo de estudiantes.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Cuenta de plomo
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Cuenta de Iniciativa
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} debe ser mayor que 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planificación de capacidad para (Días)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Obtención
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ninguno de los productos tiene cambios en el valor o en la existencias.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Campo obligatorio - Programa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Reclamación de garantía
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamación de garantía
 ,Lead Details,Detalle de Iniciativas
 DocType: Salary Slip,Loan repayment,Pago de prestamo
 DocType: Purchase Invoice,End date of current invoice's period,Fecha final del periodo de facturación actual
 DocType: Pricing Rule,Applicable For,Aplicable para.
 DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Desvinculación de Pago en la cancelación de la factura
-apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro entrado debe ser mayor que el cuentakilómetros inicial {0}
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},Lectura actual del odómetro ingresada debe ser mayor que el cuentakilómetros inicial {0}
 DocType: Shipping Rule Country,Shipping Rule Country,Regla de envio del país
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Ausencia y Asistencia
 DocType: Maintenance Visit,Partially Completed,Parcialmente completado
@@ -1672,11 +1676,10 @@
 DocType: Employee,Permanent Address,Dirección permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione el código del producto"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Por favor, seleccione el código del producto"
 DocType: Student Sibling,Studying in Same Institute,Estudian en el mismo Instituto
 DocType: Territory,Territory Manager,Gerente de Territorio
 DocType: Packed Item,To Warehouse (Optional),Para almacenes (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Monto pagado (Divisa por defecto)
 DocType: Purchase Invoice,Additional Discount,Descuento adicional
 DocType: Selling Settings,Selling Settings,Configuración de ventas
@@ -1686,9 +1689,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver en Carrito
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,GASTOS DE PUBLICIDAD
 ,Item Shortage Report,Reporte de productos con stock bajo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","El peso está definido,\nPor favor indique ""UDM Peso"" también"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Solicitud de materiales usados para crear esta entrada del inventario
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,La depreciación próxima fecha es obligatorio para los nuevos activos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo independiente basado en el curso para cada lote
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Elemento de producto
 DocType: Fee Category,Fee Category,Categoría de cuota
@@ -1696,16 +1699,15 @@
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,Crear un asiento contable para cada movimiento de stock
 DocType: Leave Allocation,Total Leaves Allocated,Total de ausencias asigandas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},El almacén es requerido en la línea # {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca Año válida Financiera fechas inicial y final"
+apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,"Por favor, introduzca fecha de Inicio y Fin válidas para el Año Fiscal"
 DocType: Employee,Date Of Retirement,Fecha de jubilación
-DocType: Upload Attendance,Get Template,Obtener plantilla
+DocType: Upload Attendance,Get Template,Obtener Plantilla
 DocType: Vehicle,Doors,puertas
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,Configuración ERPNext completa!
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,Configuración de ERPNext Completa!
 DocType: Course Assessment Criteria,Weightage,Asignación
 DocType: Packing Slip,PS-,PD-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: El centros de costos es requerido para la cuenta de 'pérdidas y ganancias' {2}. Por favor, configure un centro de costos por defecto para la compañía."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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 de cliente o renombre la categoría de cliente
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de clientes&gt; Territorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 de cliente o renombre la categoría de cliente
 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
@@ -1722,7 +1724,7 @@
 ,Item-wise Sales Register,Detalle de ventas
 DocType: Asset,Gross Purchase Amount,Compra importe bruto
 DocType: Asset,Depreciation Method,Método de depreciación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Desconectado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Desconectado
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,¿Está incluido este impuesto en el precio base?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total meta / objetivo
 DocType: Program Course,Required,Necesario
@@ -1732,20 +1734,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliación JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Hay demasiadas columnas. Exportar el informe e imprimirlo mediante una aplicación de hoja de cálculo.
 DocType: Purchase Invoice Item,Batch No,Lote No.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},No se puede encontrar el tipo de cambio para {0} a {1} para la fecha clave {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,"Permitir varias órdenes de venta, para las ordenes de compra de los clientes"
 DocType: Student Group Instructor,Student Group Instructor,Instructor de Grupo Estudiantil
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Móvil del Tutor2
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Establezca los prefijos de las numeraciones en sus transacciones
 DocType: Employee Attendance Tool,Employees HTML,Empleados HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla
 DocType: Employee,Leave Encashed?,Vacaciones pagadas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,El campo 'oportunidad desde' es obligatorio
 DocType: Email Digest,Annual Expenses,Gastos Anuales
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Crear orden de compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Crear orden de compra
 DocType: SMS Center,Send To,Enviar a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},No hay suficiente días para las ausencias del tipo: {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Monto asignado
@@ -1753,39 +1754,39 @@
 DocType: Sales Invoice Item,Customer's Item Code,Código del producto para clientes
 DocType: Stock Reconciliation,Stock Reconciliation,Reconciliación de inventarios
 DocType: Territory,Territory Name,Nombre Territorio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Se requiere un almacén de trabajos en proceso antes de validar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitante de empleo .
 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 u otra información general acerca de su proveedor
 DocType: Item,Serial Nos and Batches,Números de serie y lotes
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupo Estudiante Fuerza
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,El asiento contable {0} no tiene ninguna entrada {1} que vincular
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Evaluaciones
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,intervalos de calificación
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Por favor ingrese
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","No se puede cobrar demasiado a Punto de {0} en la fila {1} más {2}. Para permitir que el exceso de facturación, por favor, defina en la compra de Ajustes"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basada en el apartado o Almacén"
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, configurar el filtro basado en Elemento o Almacén"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),El peso neto de este paquete. (calculado automáticamente por la suma del peso neto de los materiales)
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,Por favor crea una cuenta para este almacén y vincularlo. Esto no se puede hacer automáticamente como una cuenta con el nombre {0} ya existe
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,Por favor crea una cuenta para este almacén y vincularlo. Esto no se puede hacer automáticamente ya que una cuenta con el nombre {0} ya existe
 DocType: Sales Order,To Deliver and Bill,Para entregar y facturar
 DocType: Student Group,Instructors,Instructores
 DocType: GL Entry,Credit Amount in Account Currency,Importe acreditado con la divisa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,La lista de materiales (LdM) {0} debe ser validada
 DocType: Authorization Control,Authorization Control,Control de Autorización
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Almacén Rechazado es obligatorio en la partida rechazada {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pago
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionar sus pedidos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pago
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionar sus pedidos
 DocType: Production Order Operation,Actual Time and Cost,Tiempo y costo reales
 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.
 DocType: Course,Course Abbreviation,Abreviatura del Curso
 DocType: Student Leave Application,Student Leave Application,Solicitud de Licencia para Estudiante
 DocType: Item,Will also apply for variants,También se aplicará para las variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya lo es {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activo no se puede cancelar, como ya es {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Empleado {0} del medio día del {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total de horas de trabajo no deben ser mayores que las horas de trabajo max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Encendido
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Agrupe elementos al momento de la venta.
 DocType: Quotation Item,Actual Qty,Cantidad Real
 DocType: Sales Invoice Item,References,Referencias
@@ -1795,7 +1796,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ha introducido elementos duplicados . Por favor rectifique y vuelva a intentarlo .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociado
 DocType: Asset Movement,Asset Movement,Movimiento de Activo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nuevo Carrito
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Nuevo Carrito
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,El producto {0} no es un producto serializado
 DocType: SMS Center,Create Receiver List,Crear lista de receptores
 DocType: Vehicle,Wheels,ruedas
@@ -1803,7 +1804,7 @@
 DocType: Production Planning Tool,Material Requests,Solicitudes de Material
 DocType: Warranty Claim,Issue Date,Fecha de emisión
 DocType: Activity Cost,Activity Cost,Costo de Actividad
-DocType: Sales Invoice Timesheet,Timesheet Detail,Detalle de parte de horas
+DocType: Sales Invoice Timesheet,Timesheet Detail,Detalle de Tabla de Tiempo
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Cantidad consumida
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicaciones
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica que el paquete es una parte de esta entrega (Sólo borradores)
@@ -1827,21 +1828,21 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desactiva la creación de registros de tiempo en contra de las órdenes de fabricación. Las operaciones no serán objeto de seguimiento contra la Orden de Producción
 DocType: Student,Student Mobile Number,Número móvil del Estudiante
 DocType: Item,Has Variants,Posee variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ya ha seleccionado artículos de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Defina el nombre de la distribución mensual
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,El ID de lote es obligatorio
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,El ID de lote es obligatorio
 DocType: Sales Person,Parent Sales Person,Persona encargada de ventas
 DocType: Purchase Invoice,Recurring Invoice,Factura recurrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestión de proyectos
 DocType: Supplier,Supplier of Goods or Services.,Proveedor de servicios y/o productos.
-DocType: Budget,Fiscal Year,Año fiscal
-DocType: Vehicle Log,Fuel Price,Precio del combustible
+DocType: Budget,Fiscal Year,Año Fiscal
+DocType: Vehicle Log,Fuel Price,Precio del Combustible
 DocType: Budget,Budget,Presupuesto
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Activos Fijos El artículo debe ser una posición no de almacén.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","El presupuesto no se puede asignar contra {0}, ya que no es una cuenta de ingresos o gastos"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcanzado
-DocType: Student Admission,Application Form Route,Ruta Formulario de Solicitud
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Localidad / Cliente
+DocType: Student Admission,Application Form Route,Ruta de Formulario de Solicitud
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Localidad / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,por ejemplo 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Deja Tipo {0} no puede ser asignado ya que se deja sin paga
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Línea {0}: la cantidad asignada {1} debe ser menor o igual al importe pendiente de factura {2}
@@ -1849,7 +1850,7 @@
 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
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +69,Item {0} is not setup for Serial Nos. Check Item master,"El producto {0} no está configurado para utilizar Números de Serie, por favor revise el artículo maestro"
-DocType: Maintenance Visit,Maintenance Time,Tiempo del mantenimiento
+DocType: Maintenance Visit,Maintenance Time,Tiempo del Mantenimiento
 ,Amount to Deliver,Cantidad para envío
 apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,Un Producto o Servicio
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"El Plazo Fecha de inicio no puede ser anterior a la fecha de inicio de año del año académico al que está vinculado el término (año académico {}). Por favor, corrija las fechas y vuelve a intentarlo."
@@ -1861,14 +1862,14 @@
 ,Serial No Status,Estado del número serie
 DocType: Payment Entry Reference,Outstanding,Excepcional
 ,Daily Timesheet Summary,Resumen diario de horas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para establecer periodo {1}, la diferencia de tiempo debe ser mayor o igual a {2}"
-apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Esto se basa en el movimiento de valores. Ver {0} para obtener más detalles
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Esto se basa en el movimiento de stock. Ver {0} para obtener más detalles
 DocType: Pricing Rule,Selling,Ventas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Monto {0} {1} deducido contra {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Monto {0} {1} deducido contra {2}
 DocType: Employee,Salary Information,Información salarial.
 DocType: Sales Person,Name and Employee ID,Nombre y ID de empleado
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La fecha de vencimiento no puede ser anterior a la fecha de contabilización
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,IMPUESTOS Y ARANCELES
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, introduzca la fecha de referencia"
@@ -1880,18 +1881,18 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,No se puede referenciar a una línea mayor o igual al numero de línea actual.
 DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Historial de Compras
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, haga clic en 'Generar planificación' para obtener el no. de serie del producto {0}"
 DocType: Account,Frozen,Congelado(a)
 ,Open Production Orders,Ordenes de producción abiertas
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Importe Base (Divisa de la Empresa)
 DocType: Payment Reconciliation Payment,Reference Row,Fila de Referencia
-DocType: Installation Note,Installation Time,Tiempo de instalación
+DocType: Installation Note,Installation Time,Tiempo de Instalación
 DocType: Sales Invoice,Accounting Details,Detalles de contabilidad
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Eliminar todas las transacciones para esta compañía
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,INVERSIONES
 DocType: Issue,Resolution Details,Detalles de la resolución
-apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Las asignaciones
+apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,Asignaciones
 DocType: Item Quality Inspection Parameter,Acceptance Criteria,Criterios de Aceptación
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,"Por favor, introduzca Las solicitudes de material en la tabla anterior"
 DocType: Item Attribute,Attribute Name,Nombre del Atributo
@@ -1919,13 +1920,13 @@
 DocType: Discussion,Discussion,Discusión
 DocType: Payment Entry,Transaction ID,ID de transacción
 DocType: Employee,Resignation Letter Date,Fecha de carta de renuncia
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Por favor, establezca la fecha de unirse para el empleado {0}"
-DocType: Task,Total Billing Amount (via Time Sheet),Facturación cantidad total (a través de hoja de horas)
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Las 'reglas de precios' se pueden filtrar en base a la cantidad.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Por favor, establezca la fecha de ingreso para el empleado {0}"
+DocType: Task,Total Billing Amount (via Time Sheet),Monto Total Facturable (a través de tabla de tiempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ingresos de clientes recurrentes
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) debe tener el rol de 'Supervisor de gastos'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Seleccione la lista de materiales y de Unidades de Producción
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Seleccione la lista de materiales y Cantidad para Producción
 DocType: Asset,Depreciation Schedule,Programación de la depreciación
 DocType: Bank Reconciliation Detail,Against Account,Contra la cuenta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Fecha de medio día debe estar entre la fecha desde y fecha hasta
@@ -1937,22 +1938,23 @@
 DocType: Asset,Purchase Date,Fecha de compra
 DocType: Employee,Personal Details,Datos personales
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}
-,Maintenance Schedules,Programas de mantenimiento
+,Maintenance Schedules,Programas de Mantenimiento
 DocType: Task,Actual End Date (via Time Sheet),Fecha de finalización real (a través de hoja de horas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Monto {0} {1} {2} contra {3}
 ,Quotation Trends,Tendencias de Presupuestos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},El grupo del artículo no se menciona en producto maestro para el elemento {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Monto pendiente
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversión
 DocType: Purchase Order,Delivered,Enviado
 ,Vehicle Expenses,Los gastos del vehículo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
+DocType: Serial No,Invoice Details,Detalles de la factura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valor esperado después de la vida útil debe ser mayor o igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Número de Vehículo
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Fecha en que la factura recurrente es detenida
 DocType: Employee Loan,Loan Amount,Monto del préstamo
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Lista de materiales que no se encuentra para el elemento {1}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Fila {0}: Lista de materiales no se encuentra para el elemento {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Total de hojas asignadas {0} no puede ser inferior a las hojas ya aprobados {1} para el período
 DocType: Journal Entry,Accounts Receivable,Cuentas por cobrar
 ,Supplier-Wise Sales Analytics,Análisis de ventas (Proveedores)
@@ -1963,16 +1965,16 @@
 DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Curso para padres (Deje en blanco, si esto no es parte del curso para padres)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Dejar en blanco si es considerada para todos los tipos de empleados
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir los cargos basados en
-apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,tabla de tiempos
+apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Tabla de Tiempos
 DocType: HR Settings,HR Settings,Configuración de recursos humanos (RRHH)
-DocType: Salary Slip,net pay info,Datos de la red de pago
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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: Salary Slip,net pay info,información de pago neto
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Los nuevos gastos
 DocType: Purchase Invoice,Additional Discount Amount,Monto adicional de descuento
-apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para el qty múltiple."
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Fila # {0}: Cantidad debe ser 1, como elemento es un activo fijo. Por favor, use fila separada para cantidad múltiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permitir Lista de Bloqueo de Vacaciones
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
-apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo de No-Grupo
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,La abreviatura no puede estar en blanco o usar espacios
+apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo a No-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Deportes
 DocType: Loan Type,Loan Name,Nombre del préstamo
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,Total Actual
@@ -1982,46 +1984,47 @@
 ,Customer Acquisition and Loyalty,Compras y Lealtad de Clientes
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Almacén en el cual se envian los productos rechazados
 DocType: Production Order,Skip Material Transfer,Omitir transferencia de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,No se puede encontrar el tipo de cambio para {0} a {1} para la fecha clave {2}. Crea un registro de cambio de divisas manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,El año financiero finaliza el
-DocType: POS Profile,Price List,Lista de precios
+DocType: POS Profile,Price List,Lista de Precios
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} es ahora el año fiscal predeterminado. Por favor, actualice su navegador para que el cambio surta efecto."
 apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,Reembolsos de gastos
 DocType: Issue,Support,Soporte
 ,BOM Search,Buscar listas de materiales (LdM)
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),Cierre (Apertura + Totales)
-DocType: Vehicle,Fuel Type,Tipo de combustible
+DocType: Vehicle,Fuel Type,Tipo de Combustible
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,"Por favor, especifique la divisa en la compañía"
 DocType: Workstation,Wages per hour,Salarios por hora
 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},El balance de Inventario en el lote {0} se convertirá en negativo {1} para el producto {2} en el almacén {3}
-apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Después de solicitudes de materiales se han planteado de forma automática según el nivel de re-orden del articulo
-DocType: Email Digest,Pending Sales Orders,A la espera de órdenes de venta
+apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,Las Solicitudes de Materiales siguientes se han planteado de forma automática según el nivel de re-pedido del articulo
+DocType: Email Digest,Pending Sales Orders,Ordenes de venta pendientes
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},El factor de conversión de la (UdM) es requerido en la línea {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser una de órdenes de venta, factura de venta o entrada de diario"
 DocType: Salary Component,Deduction,Deducción
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Fila {0}: Del tiempo y el tiempo es obligatorio.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Fila {0}: Tiempo Desde y Tiempo Hasta es obligatorio.
 DocType: Stock Reconciliation Item,Amount Difference,Diferencia de monto
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Precio del producto añadido para {0} en Lista de Precios {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, Introduzca ID de empleado para este vendedor"
 DocType: Territory,Classification of Customers by region,Clasificación de clientes por región
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,La diferencia de montos debe ser cero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,La diferencia de montos debe ser cero
 DocType: Project,Gross Margin,Margen bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Por favor, ingrese primero el producto a fabricar"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Balance calculado del estado de cuenta bancario
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuario deshabilitado
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Cotización
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Cotización
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deducción Total
-,Production Analytics,Análisis de producción
+,Production Analytics,Análisis de Producción
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,Costo actualizado
 DocType: Employee,Date of Birth,Fecha de nacimiento
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,El producto {0} ya ha sido devuelto
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Año fiscal** representa un ejercicio financiero. Todos los asientos contables y demás transacciones importantes son registradas contra el **año fiscal**.
 DocType: Opportunity,Customer / Lead Address,Dirección de cliente / oportunidad
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,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 +210,Warning: Invalid SSL certificate on attachment {0},Advertencia: certificado SSL no válido en el apego {0}
 DocType: Student Admission,Eligibility,Elegibilidad
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocio, agrega todos tus contactos y más como clientes potenciales"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Las Iniciativas ayudan a obtener negocios, agrega todos tus contactos y más como clientes potenciales"
 DocType: Production Order Operation,Actual Operation Time,Hora de operación real
 DocType: Authorization Rule,Applicable To (User),Aplicable a (Usuario)
 DocType: Purchase Taxes and Charges,Deduct,Deducir
@@ -2036,10 +2039,10 @@
 DocType: Guardian,Work Address,Dirección del trabajo
 DocType: Appraisal,Calculate Total Score,Calcular puntaje total
 DocType: Request for Quotation,Manufacturing Manager,Gerente de producción
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Número de serie {0} está en garantía hasta {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir nota de entrega entre paquetes.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Envíos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,El saldo de la cuenta ({0}) para {1} y el valor de la acción ({2}) para el almacén {3} deben ser iguales
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,El saldo de la cuenta ({0}) para {1} y el valor de inventario ({2}) para el almacén {3} deben ser iguales
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Monto Total asignado (Divisa de la Compañia)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregado al cliente
 DocType: BOM,Scrap Material Cost,Costo de Material de Desecho
@@ -2047,37 +2050,37 @@
 DocType: Purchase Invoice,In Words (Company Currency),En palabras (Divisa por defecto)
 DocType: Asset,Supplier,Proveedor
 DocType: C-Form,Quarter,Trimestre
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,GASTOS VARIOS
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Gastos Varios
 DocType: Global Defaults,Default Company,Compañía predeterminada
 apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,"Una cuenta de gastos o de diiferencia es obligatoria para el producto: {0} , ya que impacta el valor del stock"
 DocType: Payment Request,PR,PR
 DocType: Cheque Print Template,Bank Name,Nombre del banco
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-Arriba
-DocType: Employee Loan,Employee Loan Account,Cuenta de Préstamo empleado
+DocType: Employee Loan,Employee Loan Account,Cuenta de Préstamo del Empleado
 DocType: Leave Application,Total Leave Days,Días totales de ausencia
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: El correo electrónico no se enviará a los usuarios deshabilitados
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de interacciones
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleccione la compañía...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleccione la compañía...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deje en blanco si se utilizará para todos los departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de empleo (permanente , contratos, pasante,  etc) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} es obligatorio para el artículo {1}
 DocType: Process Payroll,Fortnightly,Quincenal
-DocType: Currency Exchange,From Currency,Desde moneda
+DocType: Currency Exchange,From Currency,Desde Moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor seleccione el monto asignado, tipo de factura y número en una fila"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Costo de Compra de Nueva
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Orden de venta requerida para el producto {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Precio (Divisa por defecto)
 DocType: Student Guardian,Others,Otros
 DocType: Payment Entry,Unallocated Amount,Monto sin asignar
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,No se peude encontrar un artículo que concuerde.  Por favor seleccione otro valor para {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,No se peude encontrar un artículo que concuerde.  Por favor seleccione otro valor para {0}.
 DocType: POS Profile,Taxes and Charges,Impuestos y cargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un producto o un servicio que se compra, se vende o se mantiene en stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No hay más actualizaciones
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Niño Artículo no debe ser un paquete de productos. Por favor remover el artículo `` {0} y guardar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banca
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Añadir partes de horas
-DocType: Vehicle Service,Service Item,servicio de artículos
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Añadir partes de horas
+DocType: Vehicle Service,Service Item,Artículo de servicio
 DocType: Bank Guarantee,Bank Guarantee,Garantía bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, haga clic en 'Generar planificación' para obtener las tareas"
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,Se han producido errores mientras borra siguientes horarios:
@@ -2085,7 +2088,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",por ejemplo 'Herramientas para los constructores'
 DocType: Grading Scale,Grading Scale Intervals,Intervalos de clasificación en la escala
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}
-DocType: Production Order,In Process,En proceso
+DocType: Production Order,In Process,En Proceso
 DocType: Authorization Rule,Itemwise Discount,Descuento de producto
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Árbol de las cuentas financieras.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0} contra la orden de ventas {1}
@@ -2097,19 +2100,20 @@
 DocType: Sales Invoice,Total Billing Amount,Importe total de facturación
 apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,Tiene que haber una cuenta de correo electrónico habilitada por defecto para que esto funcione. Por favor configure una cuenta entrante de correo electrónico por defecto (POP / IMAP) y vuelve a intentarlo.
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,Cuenta por cobrar
-apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Fila # {0}: {1} de activos ya es {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Fila # {0}: Activo {1} ya es {2}
 DocType: Quotation Item,Stock Balance,Balance de Inventarios.
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Órdenes de venta a pagar
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Establezca Naming Series para {0} mediante Configuración &gt; Configuración &gt; Nombrar Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detalle de reembolso de gastos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Por favor, seleccione la cuenta correcta"
 DocType: Item,Weight UOM,Unidad de medida (UdM)
-DocType: Salary Structure Employee,Salary Structure Employee,Empleado Estructura salarial
+DocType: Salary Structure Employee,Salary Structure Employee,Estructura Salarial de Empleado
 DocType: Employee,Blood Group,Grupo sanguíneo
 DocType: Production Order Operation,Pending,Pendiente
 DocType: Course,Course Name,Nombre del curso
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Usuarios que pueden aprobar las solicitudes de ausencia
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,EQUIPO DE OFICINA
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Equipos de Oficina
 DocType: Purchase Invoice Item,Qty,Cantidad
 DocType: Fiscal Year,Companies,Compañías
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +24,Electronics,Electrónicos
@@ -2119,22 +2123,22 @@
 DocType: Employee,Contact Details,Detalles de contacto
 DocType: C-Form,Received Date,Fecha de recepción
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","Si ha creado una plantilla estándar de los impuestos y cargos de venta, seleccione uno y haga clic en el botón de abajo."
-DocType: BOM Scrap Item,Basic Amount (Company Currency),Importe de base (Compañía de divisas)
+DocType: BOM Scrap Item,Basic Amount (Company Currency),Importe Básico (divisa de la Compañía)
 DocType: Student,Guardians,Tutores
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Los precios no se muestran si la lista de precios no se ha establecido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique un país para esta regla de envió o verifique los precios para envíos mundiales"
 DocType: Stock Entry,Total Incoming Value,Valor total de entradas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Débito Para es requerido
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Tabla de tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Débito Para es requerido
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Las Tablas de Tiempos ayudan a mantener la noción del tiempo, el coste y la facturación de actividades realizadas por su equipo"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de precios para las compras
 DocType: Offer Letter Term,Offer Term,Términos de la oferta
 DocType: Quality Inspection,Quality Manager,Gerente de calidad
 DocType: Job Applicant,Job Opening,Oportunidad de empleo
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliación de pagos
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, seleccione el nombre de la persona a cargo"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnología
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total no pagado: {0}
-DocType: BOM Website Operation,BOM Website Operation,Operación Página Web de lista de materiales
+DocType: BOM Website Operation,BOM Website Operation,Operación de Página Web de lista de materiales
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de oferta
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,Generar requisición de materiales (MRP) y órdenes de producción.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,Monto total facturado
@@ -2147,38 +2151,38 @@
 DocType: Production Order Operation,Completed Qty,Cantidad completada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry","Para {0}, sólo las cuentas de débito pueden vincular con un asiento de crédito"
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La lista de precios {0} está deshabilitada
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Completo Cantidad no puede contener más de {1} para la operación {2}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Fila {0}: Cantidad completada no puede contener más de {1} para la operación {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir horas extraordinarias
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","El elemento serializado {0} no se puede actualizar mediante Reconciliación de Stock, utilice la Entrada de Stock"
-DocType: Training Event Employee,Training Event Employee,Formación de los trabajadores Evento
+DocType: Training Event Employee,Training Event Employee,Evento de Formación de los trabajadores
 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 son requeridos para el artículo {1}. Usted ha proporcionado {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Tasa de valoración actual
 DocType: Item,Customer Item Codes,Código del producto asignado por el cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganancia/Pérdida en Cambio
 DocType: Opportunity,Lost Reason,Razón de la pérdida
-apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva direccion
+apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nueva Dirección
 DocType: Quality Inspection,Sample Size,Tamaño de muestra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Todos los artículos que ya se han facturado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Por favor, introduzca recepción de documentos"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuarios y permisos
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Órdenes de fabricación creadas: {0}
 DocType: Branch,Branch,Sucursal
 DocType: Guardian,Mobile Number,Número de teléfono móvil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impresión y marcas
 DocType: Bin,Actual Quantity,Cantidad real
 DocType: Shipping Rule,example: Next Day Shipping,ejemplo : Envío express
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Numero de serie {0} no encontrado
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Numero de serie {0} no encontrado
 DocType: Scheduling Tool,Student Batch,Lote de Estudiante
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sus clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Crear Estudiante
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Crear Estudiante
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Se le ha invitado a colaborar en el proyecto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear fecha
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplicar Ahora
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantidad real {0} / Cantidad de espera {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Cantidad real {0} / Cantidad esperada {1}
 DocType: Sales Order,Not Delivered,No entregado
 ,Bank Clearance Summary,Resumen de Cambios Bancarios
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Crear y gestionar resúmenes de correos; diarios, semanales y mensuales."
@@ -2197,8 +2201,9 @@
 DocType: SMS Log,Sent To,Enviado a
 DocType: Payment Request,Make Sales Invoice,Crear factura de venta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Siguiente Contactar La fecha no puede ser en el pasado
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Siguiente Fecha de Contacto no puede ser en el pasado
 DocType: Company,For Reference Only.,Sólo para referencia.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Seleccione Lote No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},No válido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Importe Anticipado
@@ -2212,24 +2217,24 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Nº de caso no puede ser 0
 DocType: Item,Show a slideshow at the top of the page,Mostrar una presentación de diapositivas en la parte superior de la página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Sucursales
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Sucursales
 DocType: Serial No,Delivery Time,Tiempo de entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Antigüedad basada en
 DocType: Item,End of Life,Final de vida útil
 apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,Viajes
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura activa o salario por defecto encontrado de empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,Sin estructura de salario activa o por defecto encontrada de empleado {0} para las fechas indicadas
 DocType: Leave Block List,Allow Users,Permitir que los usuarios
 DocType: Purchase Order,Customer Mobile No,Numero de móvil de cliente
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Seguimiento de Ingresos y Gastos por separado para las verticales de productos o divisiones.
 DocType: Rename Tool,Rename Tool,Herramienta para renombrar
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Actualizar costos
 DocType: Item Reorder,Item Reorder,Reabastecer producto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip Mostrar Salario
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferencia de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip Mostrar Salario
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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"
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Por favor conjunto recurrente después de guardar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seleccione el cambio importe de la cuenta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Por favor configura recurrente después de guardar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seleccione el cambio importe de la cuenta
 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
@@ -2240,7 +2245,7 @@
 DocType: Budget Account,Budget Account,Cuenta de Presupuesto
 DocType: Quality Inspection,Verified By,Verificado por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
-DocType: Grade Interval,Grade Description,grado Descripción
+DocType: Grading Scale Interval,Grade Description,Descripción de Grado
 DocType: Stock Entry,Purchase Receipt No,Recibo de compra No.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,GANANCIAS PERCIBIDAS
 DocType: Process Payroll,Create Salary Slip,Crear nómina salarial
@@ -2250,19 +2255,19 @@
 DocType: Appraisal,Employee,Empleado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1} está totalmente facturado
 DocType: Training Event,End Time,Hora de finalización
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Estructura salarial activa {0} encontrados para los empleados {1} fechas elegidas
-DocType: Payment Entry,Payment Deductions or Loss,Las deducciones de pago o pérdida
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,Estructura salarial activa {0} encontrada para los empleados {1} en las fechas elegidas
+DocType: Payment Entry,Payment Deductions or Loss,Deducciones de Pago o Pérdida
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,Contrato estándar de términos y condiciones para ventas y compras.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,Agrupar por recibo
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,Flujo de ventas
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},Por favor ajuste predeterminado en cuenta Salario El componente {0}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},Por favor ajuste la cuenta por defecto en Componente Salarial {0}
 apps/erpnext/erpnext/templates/form_grid/material_request_grid.html +7,Required On,Solicitado el
 DocType: Rename Tool,File to Rename,Archivo a renombrar
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},"Por favor, seleccione la lista de materiales para el artículo en la fila {0}"
 apps/erpnext/erpnext/controllers/buying_controller.py +263,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 +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,El programa de mantenimiento {0} debe ser cancelado antes de cancelar esta orden de venta
 DocType: Notification Control,Expense Claim Approved,Reembolso de gastos aprobado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,Nómina de los empleados {0} ya creado para este periodo
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,Nómina del empleado {0} ya creado para este periodo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmacéutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo de productos comprados
 DocType: Selling Settings,Sales Order Required,Orden de venta requerida
@@ -2278,7 +2283,7 @@
 DocType: Upload Attendance,Attendance To Date,Asistencia a la fecha
 DocType: Warranty Claim,Raised By,Propuesto por
 DocType: Payment Gateway Account,Payment Account,Cuenta de pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Por favor, especifique la compañía para continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Cambio neto en las cuentas por cobrar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Compensatorio
 DocType: Offer Letter,Accepted,Aceptado
@@ -2287,12 +2292,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 DocType: Room,Room Number,Número de habitación
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referencia Inválida {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la orden de producción {3}
 DocType: Shipping Rule,Shipping Rule Label,Etiqueta de regla de envío
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Foro de Usuarios
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,'Materias primas' no puede estar en blanco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Asiento Contable Rápido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Asiento Contable Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2305,7 +2310,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Términos y Condiciones
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,El nombre del instituto para el que está configurando este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Asiento contable actualmente congelado. Nadie puede generar / modificar el asiento, excepto el rol especificado a continuación."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde el documento antes de generar el programa de mantenimiento"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado del proyecto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opción para deshabilitar las fracciones.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Se crearon las siguientes órdenes de fabricación:
@@ -2332,7 +2337,7 @@
 ,Employees working on a holiday,Empleados que trabajan en un día festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presente
 DocType: Project,% Complete Method,% Método completado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La fecha de inicio del mantenimiento no puede ser anterior de la fecha de entrega para {0}
 DocType: Production Order,Actual End Date,Fecha Real de Finalización
 DocType: BOM,Operating Cost (Company Currency),Costo de funcionamiento (Divisa de la Compañia)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2349,10 +2354,10 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Licencia sin sueldo no coincide con los registros de licencias de aplicaciones aprobadas
 DocType: Campaign,Campaign-.####,Campaña-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos pasos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Por favor suministrar los elementos especificados en las mejores tasas posibles
 DocType: Selling Settings,Auto close Opportunity after 15 days,Cerrar Oportunidad automáticamente luego de 15 días
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Año final
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cotización / Iniciativa %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La fecha de finalización de contrato debe ser mayor que la fecha de ingreso
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,Un distribuidor / proveedor / comisionista / afiliado / revendedor que vende productos de empresas a cambio de una comisión.
@@ -2402,14 +2407,14 @@
  8. Introduzca Row: Si se basa en ""Anterior Fila Total"" se puede seleccionar el número de la fila que será tomado como base para este cálculo (por defecto es la fila anterior).
  9. Considere impuesto o cargo para: En esta sección se puede especificar si el impuesto / carga es sólo para la valoración (no una parte del total) o sólo para el total (no agrega valor al elemento) o para ambos.
  10. Añadir o deducir: Si usted quiere añadir o deducir el impuesto."
-DocType: Homepage,Homepage,Página principal
+DocType: Homepage,Homepage,Página Principal
 DocType: Purchase Receipt Item,Recd Quantity,Cantidad recibida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Registros de cuotas creados - {0}
-DocType: Asset Category Account,Asset Category Account,Cuenta categoría de activos
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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}
+DocType: Asset Category Account,Asset Category Account,Cuenta de categoría de activos
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,La entrada de stock {0} no esta validada
 DocType: Payment Reconciliation,Bank / Cash Account,Cuenta de banco / efectivo
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Por siguiente Contacto no puede ser la misma que la de plomo Dirección de correo electrónico
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Siguiente contacto por, no puede ser el mismo que la  dirección de correo electrónico de la Iniciativa"
 DocType: Tax Rule,Billing City,Ciudad de facturación
 DocType: Asset,Manual,Manual
 DocType: Salary Component Account,Salary Component Account,Cuenta Nómina Componente
@@ -2422,18 +2427,19 @@
 DocType: Item,Manufacture,Manufacturar
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,Entregar primero la nota
 DocType: Student Applicant,Application Date,Fecha de aplicacion
-DocType: Salary Detail,Amount based on formula,Cantidad basada en la fórmula
+DocType: Salary Detail,Amount based on formula,Cantidad basada en fórmula
 DocType: Purchase Invoice,Currency and Price List,Divisa y listas de precios
 DocType: Opportunity,Customer / Lead Name,Cliente / Oportunidad
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Fecha de liquidación no definida
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producción
 DocType: Guardian,Occupation,Ocupación
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos &gt; Configuración de recursos humanos"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Línea {0}: La fecha de inicio debe ser anterior fecha de finalización
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantidad)
 DocType: Sales Invoice,This Document,Este documento
 DocType: Installation Note Item,Installed Qty,Cantidad instalada
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
-apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Formación Resultado
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,Resultado del Entrenamiento
 DocType: Purchase Invoice,Is Paid,Está pagado
 DocType: Salary Structure,Total Earning,Ganancia Total
 DocType: Purchase Receipt,Time at which materials were received,Hora en que se recibieron los materiales
@@ -2444,14 +2450,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Informar un problema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Servicios públicos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 o más
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Asiento {1} no tiene en cuenta {2} o ya compara con otro bono
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Fila # {0}: Asiento {1} no tiene cuenta {2} o ya compara con otro bono
 DocType: Buying Settings,Default Buying Price List,Lista de precios por defecto
 DocType: Process Payroll,Salary Slip Based on Timesheet,Sobre la base de nómina de parte de horas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Tipo de pago
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleccione un lote para el artículo {0}. No se puede encontrar un solo lote que cumpla este requisito
 DocType: Process Payroll,Select Employees,Seleccione los empleados
 DocType: Opportunity,Potential Sales Deal,Potenciales acuerdos de venta
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Fecha de referencia
@@ -2459,7 +2465,7 @@
 DocType: Employee,Emergency Contact,Contacto de emergencia
 DocType: Bank Reconciliation Detail,Payment Entry,Entrada de pago
 DocType: Item,Quality Parameters,Parámetros de calidad
-,sales-browser,las ventas en el navegador
+,sales-browser,sales-browser
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,Ledger,Libro Mayor
 DocType: Target Detail,Target  Amount,Importe previsto
 DocType: Shopping Cart Settings,Shopping Cart Settings,Ajustes de carrito de compras
@@ -2468,20 +2474,20 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},El perfil de TPV global {0} ya se ha creado para la compañía {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Reemplazar elemento / Solicitud de Materiales en todas las Solicitudes de Materiales
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,documento de recepción debe ser presentado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,documento de recepción debe ser presentado
 DocType: Purchase Invoice Item,Received Qty,Cantidad recibida
 DocType: Stock Entry Detail,Serial No / Batch,No. de serie / lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,No pago y no entregado
 DocType: Product Bundle,Parent Item,Producto padre / principal
-DocType: Account,Account Type,Tipo de cuenta
+DocType: Account,Account Type,Tipo de Cuenta
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,No hay hojas de tiempo
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deja tipo {0} no se pueden reenviar-llevar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"El programa de mantenimiento no se genera para todos los productos. Por favor, haga clic en 'Generar programación'"
 ,To Produce,Producir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Nómina de sueldos
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Crear Usuario
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Crear Usuario
 DocType: Packing Slip,Identification of the package for the delivery (for print),La identificación del paquete para la entrega (para impresión)
 DocType: Bin,Reserved Quantity,Cantidad Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor ingrese una dirección de correo electrónico válida
@@ -2493,15 +2499,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Plantilla deshabilitada no debe ser la plantilla predeterminada
 DocType: Account,Income Account,Cuenta de ingresos
 DocType: Payment Request,Amount in customer's currency,Monto en divisa del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Entregar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Entregar
 DocType: Stock Reconciliation Item,Current Qty,Cant. Actual
 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
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidad Clave
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Los lotes de los estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Los lotes de los estudiantes ayudan a realizar un seguimiento de asistencia, evaluaciones y cuotas para los estudiantes"
 DocType: Payment Entry,Total Allocated Amount,Monto Total Asignado
 DocType: Item Reorder,Material Request Type,Tipo de requisición
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Entrada de diario Accural para salarios de {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Almacenamiento Local esta lleno, no se guardó"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Línea {0}: El factor de conversión de (UdM) es obligatorio
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Referencia
 DocType: Budget,Cost Center,Centro de costos
@@ -2511,16 +2518,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ocultar ID de Impuestos del cliente según Transacciones de venta
 DocType: Upload Attendance,Upload HTML,Subir HTML
 DocType: Employee,Relieving Date,Fecha de relevo
-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.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La regla de precios está hecha para sobrescribir la lista de precios y define un porcentaje de descuento, basado en algunos criterios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,El almacen sólo puede ser alterado a través de: Entradas de inventario / Nota de entrega / Recibo de compra
 DocType: Employee Education,Class / Percentage,Clase / Porcentaje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Director de marketing y ventas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Impuesto sobre la renta
-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.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la regla de precios está hecha para 'Precio', sobrescribirá la lista de precios actual. La regla de precios sera el valor final definido, así que no podrá aplicarse algún descuento. Por lo tanto, en las transacciones como Pedidos de venta, órdenes de compra, etc. el campo sera traído en lugar de utilizar 'Lista de precios'"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Listar Oportunidades por Tipo de Industria
 DocType: Item Supplier,Item Supplier,Proveedor del producto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} {1} quotation_to"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Por favor, ingrese el código del producto para obtener el numero de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Por favor, seleccione un valor para {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todas las direcciones.
 DocType: Company,Stock Settings,Configuración de inventarios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2530,6 +2537,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enviará un correo electrónico sobre el evento a los empleados con el estado &#39;abierto&#39;
 DocType: Task,Depends on Tasks,Depende de Tareas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrar el listado de las categorías de clientes.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Los archivos adjuntos se pueden mostrar sin habilitar el carrito de la compra
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nombre del nuevo centro de costes
 DocType: Leave Control Panel,Leave Control Panel,Panel de control de ausencias
@@ -2542,13 +2550,12 @@
 DocType: Sales Invoice,Debit To,Debitar a
 DocType: Delivery Note,Required only for sample item.,Solicitado únicamente para muestra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cantidad real después de transacción
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Proveedor&gt; Tipo de proveedor
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sin nómina encontrado entre {0} y {1}
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No se encontró nómina entre {0} y {1}
 ,Pending SO Items For Purchase Request,A la espera de la orden de compra (OC) para crear solicitud de compra (SC)
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admisión de Estudiantes
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} está desactivado
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} está desactivado
 DocType: Supplier,Billing Currency,Moneda de facturación
-DocType: Sales Invoice,SINV-RET-,SINV-RET-
+DocType: Sales Invoice,SINV-RET-,FACT-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra grande
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,Hojas totales
 ,Profit and Loss Statement,Cuenta de pérdidas y ganancias
@@ -2563,11 +2570,11 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Producto destacado en página de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Todos los grupos de evaluación
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Almacén nuevo nombre
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Por favor, indique el numero de visitas requeridas"
 DocType: Stock Settings,Default Valuation Method,Método predeterminado de valoración
-DocType: Vehicle Log,Fuel Qty,Cantidad de combustible
+DocType: Vehicle Log,Fuel Qty,Cantidad de Combustible
 DocType: Production Order Operation,Planned Start Time,Hora prevista de inicio
 DocType: Course,Assessment,Evaluación
 DocType: Payment Entry Reference,Allocated,Numerado
@@ -2581,11 +2588,11 @@
 DocType: Price List,Price List Master,Lista de precios principal
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas las transacciones de venta se pueden etiquetar para múltiples **vendedores** de esta manera usted podrá definir y monitorear objetivos.
 ,S.O. No.,OV No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crear el cliente desde iniciativa {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Sólo Deja aplicaciones con estado &quot;Aprobado&quot; y &quot;Rechazado&quot; puede ser presentado
-apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Estudiante Nombre del grupo es obligatorio en la fila {0}
-DocType: Homepage,Products to be shown on website homepage,Los productos que se muestran en la página de inicio página web
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Nombre de Grupo de Estudiantes es obligatorio en la fila {0}
+DocType: Homepage,Products to be shown on website homepage,Productos que se muestran en la página de inicio de la página web
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,Este es una categoría de cliente raíz (principal) y no se puede editar.
 DocType: Employee,AB-,AB-
 DocType: POS Profile,Ignore Pricing Rule,Ignorar la regla precios
@@ -2605,18 +2612,18 @@
 1. Returns Policy.
 1. Terms of shipping, if applicable.
 1. Ways of addressing disputes, indemnity, liability, etc.
-1. Address and Contact of your Company.","Términos y Condiciones que se pueden agregar a compras y ventas estándar.
+1. Address and Contact of your Company.","Términos y Condiciones Estándar que se pueden agregar a compras y ventas.
 
  Ejemplos: 
 
  1. Validez de la oferta.
  1. Condiciones de pago (por adelantado, el crédito, parte antelación etc).
  1. ¿Qué es extra (o por pagar por el cliente).
- 1. / Advertencia uso Seguridad.
- 1. Garantía si los hay.
- 1. Política de las vueltas.
+ 1. Advertencia de Uso /  Seguridad.
+ 1. Garantía si la hay.
+ 1. Política de devolución.
  1. Términos de envío, si aplica.
- 1. Formas de disputas que abordan, indemnización, responsabilidad, etc. 
+ 1. Formas de abordar disputas, indemnización, responsabilidad, etc. 
  1. Dirección y contacto de su empresa."
 DocType: Attendance,Leave Type,Tipo de Licencia
 DocType: Purchase Invoice,Supplier Invoice Details,Detalles de la factura del proveedor
@@ -2624,7 +2631,7 @@
 DocType: Project,Copied From,Copiado de
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nombre de error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Escasez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} no asociada a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Asistencia para el empleado {0} ya está marcado
 DocType: Packing Slip,If more than one package of the same type (for print),Si es más de un paquete del mismo tipo (para impresión)
 ,Salary Register,Registro de Salario
@@ -2643,7 +2650,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Utilizar para carrito de compras
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},El valor {0} para el atributo {1} no existe en la lista de valores de atributos de artículo válido para el punto {2}
 DocType: BOM Item,Scrap %,Desecho %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Los cargos se distribuirán proporcionalmente basados en la cantidad o importe, según selección"
 DocType: Maintenance Visit,Purposes,Propósitos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
@@ -2664,41 +2671,41 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administración de territorios
 DocType: Journal Entry Account,Sales Invoice,Factura de venta
 DocType: Journal Entry Account,Party Balance,Saldo de tercero/s
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Por favor seleccione 'Aplicar descuento en'
 DocType: Company,Default Receivable Account,Cuenta por cobrar por defecto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crear asiento de banco para el salario total pagado según los siguientes criterios
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferencia de material para producción
-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.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,El porcentaje de descuento puede ser aplicado ya sea en una lista de precios o para todas las listas de precios.
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Asiento contable para inventario
-DocType: Vehicle Service,Engine Oil,Aceite de motor
+DocType: Vehicle Service,Engine Oil,Aceite de Motor
 DocType: Sales Invoice,Sales Team1,Equipo de ventas 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,El elemento {0} no existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,El elemento {0} no existe
 DocType: Sales Invoice,Customer Address,Dirección del cliente
 DocType: Employee Loan,Loan Details,Detalles de préstamo
-apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Completo Cantidad debe ser mayor que cero.
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Fila {0}: Cantidad completada debe ser mayor que cero.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar descuento adicional en
 DocType: Account,Root Type,Tipo de root
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Línea # {0}: No se puede devolver más de {1} para el producto {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Cuadro
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Cuadro
 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}
-DocType: Cheque Print Template,Primary Settings,Ajustes primarios
+DocType: Cheque Print Template,Primary Settings,Ajustes Primarios
 DocType: Purchase Invoice,Select Supplier Address,Seleccionar dirección del proveedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Añadir Empleados
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Añadir Empleados
 DocType: Purchase Invoice Item,Quality Inspection,Inspección de calidad
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Pequeño
 DocType: Company,Standard Template,Plantilla estándar
 DocType: Training Event,Theory,Teoría
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Advertencia: La requisición de materiales es menor que la orden mínima establecida
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,La cuenta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidad Legal / Subsidiario con un Catalogo de Cuentas separado que pertenece a la Organización.
 DocType: Payment Request,Mute Email,Email Silenciado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, bebidas y tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Sólo se puede crear el pago contra {0} impagado
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,El porcentaje de comisión no puede ser superior a 100
 DocType: Stock Entry,Subcontract,Sub-contrato
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Por favor, introduzca {0} primero"
@@ -2714,16 +2721,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,Color
 DocType: Assessment Plan Criteria,Assessment Plan Criteria,Criterios de evaluación del plan
 DocType: Training Event,Scheduled,Programado.
-apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitud de presupuesto.
-apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde &quot;Es de la Elemento&quot; es &quot;No&quot; y &quot;¿Es de artículos de venta&quot; es &quot;Sí&quot;, y no hay otro paquete de producto"
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Solicitud de cotización.
+apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Por favor, seleccione el ítem donde ""Es Elemento de Stock"" es ""No"" y ""¿Es de artículos de venta"" es ""Sí"", y no hay otro paquete de producto"
 DocType: Student Log,Academic,Académico
-apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Gran Total ({2})
+apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,"Seleccione la distribución mensual, para asignarla desigualmente en varios meses"
 DocType: Purchase Invoice Item,Valuation Rate,Tasa de Valoración
 DocType: Stock Reconciliation,SR/,SR /
 DocType: Vehicle,Diesel,Diesel
 apps/erpnext/erpnext/stock/get_item_details.py +318,Price List Currency not selected,El tipo de divisa para la lista de precios no ha sido seleccionado
-,Student Monthly Attendance Sheet,Estudiante Hoja de Asistencia Mensual
+,Student Monthly Attendance Sheet,Hoja de Asistencia Mensual de Estudiante
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},El empleado {0} ya se ha aplicado para {1} entre {2} y {3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Fecha de inicio del proyecto
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,Hasta
@@ -2737,7 +2744,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Complejos de transacción existentes no pueden ser convertidos en grupo.
 DocType: Assessment Result Tool,Result HTML,Resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira el
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Añadir estudiantes
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Añadir estudiantes
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Por favor, seleccione {0}"
 DocType: C-Form,C-Form No,C -Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2749,7 +2756,7 @@
 DocType: Purchase Order Item,Returned Qty,Cantidad devuelta
 DocType: Employee,Exit,Salir
 apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,tipo de root es obligatorio
-DocType: BOM,Total Cost(Company Currency),Coste total (Compañía de divisas)
+DocType: BOM,Total Cost(Company Currency),Costo Total (Divisa de la Compañía)
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,Número de serie {0} creado
 DocType: Homepage,Company Description for website homepage,Descripción de la empresa para la página de inicio página web
 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"
@@ -2767,7 +2774,7 @@
 DocType: Payment Entry,Pay,Pagar
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Para fecha y hora
 DocType: SMS Settings,SMS Gateway URL,URL de pasarela SMS
-apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendario de cursos eliminados
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Calendario de cursos eliminados:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,Estatus de mensajes SMS entregados
 DocType: Accounts Settings,Make Payment via Journal Entry,Hace el pago vía entrada de diario
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,Impreso en
@@ -2779,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Monto
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Introduzca el nombre de la campaña, si la solicitud viene desde esta."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de periódicos
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Seleccione el año fiscal.
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Seleccione el año fiscal.
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Nivel de reabastecimiento
 DocType: Company,Chart Of Accounts Template,Plantilla del catálogo de cuentas
 DocType: Attendance,Attendance Date,Fecha de Asistencia
@@ -2792,16 +2799,16 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,Marcar Medio Día
 DocType: Sales Invoice,Sales Team,Equipo de ventas
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entrada duplicada
-DocType: Program Enrollment Tool,Get Students,Obtener estudiantes
+DocType: Program Enrollment Tool,Get Students,Obtener Estudiantes
 DocType: Serial No,Under Warranty,Bajo garantía
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En palabras serán visibles una vez que guarde el pedido de ventas.
 ,Employee Birthday,Cumpleaños del empleado
-DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Herramienta de lotes de Asistencia del Estudiante
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Herramienta de Asistencia de Estudiantes por Lote
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Límite Cruzado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de riesgo
-apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un término académico con esto &#39;Año Académico&#39; {0} y &#39;Nombre término&#39; {1} ya existe. Por favor, modificar estas entradas y vuelva a intentarlo."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Un término académico con este 'Año Académico' {0} y 'Nombre de término' {1} ya existe. Por favor, modificar estas entradas y vuelva a intentarlo."
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Como hay transacciones existentes contra el elemento {0}, no se puede cambiar el valor de {1}"
 DocType: UOM,Must be Whole Number,Debe ser un número entero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuevas ausencias asignadas (en días)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,El número de serie {0} no existe
@@ -2813,7 +2820,7 @@
 DocType: Assessment Group,Assessment Group Name,Nombre del grupo de evaluación
 DocType: Manufacturing Settings,Material Transferred for Manufacture,Material transferido para manufacturar
 DocType: Expense Claim,"A user with ""Expense Approver"" role","Un usuario con rol de ""Supervisor de gastos"""
-DocType: Landed Cost Item,Receipt Document Type,Recibo de Tipo de Documento
+DocType: Landed Cost Item,Receipt Document Type,Tipo de Recibo de Documento
 DocType: Daily Work Summary Settings,Select Companies,Seleccione empresas
 ,Issued Items Against Production Order,Productos entregados desde ordenes de producción
 DocType: Target Detail,Target Detail,Detalle de objetivo
@@ -2821,17 +2828,17 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiales facturados contra esta orden de venta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Asiento de cierre de período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,El centro de costos con transacciones existentes no se puede convertir a 'grupo'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Monto {0} {1} {2} {3}
 DocType: Account,Depreciation,DEPRECIACIONES
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Proveedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Herramienta de asistencia de los empleados
 DocType: Guardian Student,Guardian Student,Tutor del Estudiante
 DocType: Supplier,Credit Limit,Límite de crédito
-DocType: Production Plan Sales Order,Salse Order Date,Salse Fecha del pedido
-DocType: Salary Component,Salary Component,Componente salario
+DocType: Production Plan Sales Order,Salse Order Date,Fecha de Orden de Venta
+DocType: Salary Component,Salary Component,Componente Salarial
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Las entradas de pago {0} estan no-relacionadas
 DocType: GL Entry,Voucher No,Comprobante No.
-,Lead Owner Efficiency,Eficiencia del propietario principal
+,Lead Owner Efficiency,Eficiencia del Propietario de la Iniciativa
 DocType: Leave Allocation,Leave Allocation,Asignación de vacaciones
 DocType: Payment Request,Recipient Message And Payment Details,Mensaje receptor y formas de pago
 DocType: Training Event,Trainer Email,Correo electrónico del entrenador
@@ -2844,8 +2851,8 @@
 DocType: Supplier,Last Day of the Next Month,Último día del siguiente mes
 DocType: Support Settings,Auto close Issue after 7 days,Cierre automático de incidencia después de 7 días
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deje no pueden ser distribuidas antes {0}, como balance de la licencia ya ha sido remitido equipaje en el futuro registro de asignación de permiso {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
-apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,estudiante solicitante
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),"Nota: El Debido/Fecha de referencia, excede los días de créditos concedidos para el cliente por {0} día(s)"
+apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Estudiante Solicitante
 DocType: Asset Category Account,Accumulated Depreciation Account,Cuenta de depreciación acumulada
 DocType: Stock Settings,Freeze Stock Entries,Congelar entradas de stock
 DocType: Asset,Expected Value After Useful Life,Valor esperado después de la Vida Útil
@@ -2855,7 +2862,7 @@
 ,Stock Analytics,Análisis de existencias.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Las operaciones no pueden dejarse en blanco
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra documento No.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipo del partido es obligatorio
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Tipo de parte es obligatorio
 DocType: Quality Inspection,Outgoing,Saliente
 DocType: Material Request,Requested For,Solicitado por
 DocType: Quotation Item,Against Doctype,Contra 'DocType'
@@ -2872,10 +2879,10 @@
 DocType: Asset,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 / Detalles de CMA
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Seleccionar a los estudiantes manualmente para el grupo basado en actividad
 DocType: Journal Entry,User Remark,Observaciones
 DocType: Lead,Market Segment,Sector de mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de trabajo del empleado
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Cierre (Deb)
 DocType: Cheque Print Template,Cheque Size,Cheque Tamaño
@@ -2886,21 +2893,21 @@
 DocType: Stock Settings,Default Stock UOM,Unidad de Medida (UdM) predeterminada para Inventario
 DocType: Asset,Number of Depreciations Booked,Cantidad de Depreciaciones Reservadas
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Préstamo contra empleado: {0}
-DocType: Landed Cost Item,Receipt Document,la recepción de documentos
+DocType: Landed Cost Item,Receipt Document,Recepción de Documento
 DocType: Production Planning Tool,Create Material Requests,Crear requisición de materiales
 DocType: Employee Education,School/University,Escuela / Universidad.
 DocType: Payment Request,Reference Details,Detalles Referencia
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor esperado después de la vida útil debe ser inferior al importe bruto de compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantidad Disponible en Almacén
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Importe facturado
 DocType: Asset,Double Declining Balance,Doble saldo decreciente
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,orden cerrado no se puede cancelar. Unclose para cancelar.
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,Orden cerrada no se puede cancelar. Abrir para cancelar.
 DocType: Student Guardian,Father,Padre
 apps/erpnext/erpnext/controllers/accounts_controller.py +572,'Update Stock' cannot be checked for fixed asset sale,'Actualización de Inventario' no se puede comprobar en venta de activos fijos
 DocType: Bank Reconciliation,Bank Reconciliation,Conciliación bancaria
 DocType: Attendance,On Leave,De licencia
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener actualizaciones
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: La cuenta {2} no pertenece a la empresa {3}
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,Obtener Actualizaciones
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}: La cuenta {2} no pertenece a la Compañía {3}
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,Requisición de materiales {0} cancelada o detenida
 apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,Agregar algunos registros de muestra
 apps/erpnext/erpnext/config/hr.py +301,Leave Management,Gestión de ausencias
@@ -2911,21 +2918,21 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Monto desembolsado no puede ser mayor que Monto del préstamo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Se requiere el numero de orden de compra para el producto {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Orden de producción no se ha creado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Orden de producción no se ha creado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Desde la fecha' debe ser después de 'Hasta Fecha'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},No se puede cambiar el estado de estudiante {0} está vinculada con la aplicación del estudiante {1}
-DocType: Asset,Fully Depreciated,Estando totalmente amortizados
+DocType: Asset,Fully Depreciated,Totalmente depreciado
 ,Stock Projected Qty,Cantidad de inventario proyectado
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} no pertenece al proyecto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Asistencia Marcada HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Las citas son propuestas, las ofertas que ha enviado a sus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordenes de compra de clientes
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de serie y de lote
 DocType: Warranty Claim,From Company,Desde Compañía
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma de las puntuaciones de criterios de evaluación tiene que ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor o Cantidad
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Pedidos producciones no pueden ser criados para:
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, ajuste el número de amortizaciones Reservados"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor o Cantidad
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Pedidos de producción no pueden ser elevados para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impuestos y cargos sobre compras
 ,Qty to Receive,Cantidad a recibir
@@ -2936,7 +2943,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Todos los Almacenes
 DocType: Sales Partner,Retailer,Detallista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Todos los proveedores
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Todos los proveedores
 DocType: Global Defaults,Disable In Words,Desactivar en palabras
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},El presupuesto {0} no es del tipo {1}
@@ -2945,12 +2952,13 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Cuenta de Sobre-Giros
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Crear nómina salarial
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Fila # {0}: Importe asignado no puede ser mayor que la cantidad pendiente.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Explorar la lista de materiales
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Prestamos en garantía
 DocType: Purchase Invoice,Edit Posting Date and Time,Editar fecha y hora de envío
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},"Por favor, establece las cuentas relacionadas de depreciación de activos en Categoría {0} o de su empresa {1}"
 DocType: Academic Term,Academic Year,Año académico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,APERTURA DE CAPITAL
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,Apertura de Capital
 DocType: Lead,CRM,CRM
 DocType: Appraisal,Appraisal,Evaluación
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +134,Email sent to supplier {0},Correo electrónico enviado al proveedor {0}
@@ -2980,36 +2988,35 @@
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,Costo de diversas actividades
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}","Configurar los eventos a {0}, ya que el empleado que esté conectado a la continuación vendedores no tiene un ID de usuario {1}"
 DocType: Timesheet,Billing Details,Detalles de facturación
-apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Origen y destino de depósito deben ser diferentes
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,Almacén de Origen y Destino deben ser diferentes
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},No tiene permisos para actualizar las transacciones de stock mayores al  {0}
 DocType: Purchase Invoice Item,PR Detail,Detalle PR
-DocType: Sales Order,Fully Billed,Totalmente facturado
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Por favor, establece cuenta por pagar por defecto en el empleado {0}"
+DocType: Sales Order,Fully Billed,Totalmente Facturado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Efectivo en caja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Almacén de entrega requerido para el inventrio del producto {0}
 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)
 apps/erpnext/erpnext/schools/doctype/course/course.js +3,Program,Programa
 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
-DocType: Student Group,Group Based On,Grupo basado en
+DocType: Student Group,Group Based On,Grupo Basado En
 DocType: Journal Entry,Bill Date,Fecha de factura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","se requiere la reparación de artículos, tipo, frecuencia y cantidad de gastos"
-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:"
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},¿De verdad quieres que presenten todos nómina de {0} a {1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Incluso si hay varias reglas de precios con mayor prioridad, se aplican entonces siguientes prioridades internas:"
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},¿De verdad quieres que presenten todas las nóminas de {0} a {1}
 DocType: Cheque Print Template,Cheque Height,Altura de Cheque
 DocType: Supplier,Supplier Details,Detalles del proveedor
 DocType: Expense Claim,Approval Status,Estado de Aprobación
 DocType: Hub Settings,Publish Items to Hub,Publicar artículos al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},El valor debe ser menor que el valor de la línea {0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transferencia bancaria
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,Transferencia Bancaria
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Marcar todas
 DocType: Vehicle Log,Invoice Ref,Referencia de Factura
 DocType: Purchase Order,Recurring Order,Orden recurrente
 DocType: Company,Default Income Account,Cuenta de ingresos por defecto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Categoría de cliente / Cliente
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Categoría de cliente / Cliente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sin cerrar los años fiscales ganancias / pérdidas (de crédito)
-DocType: Sales Invoice,Time Sheets,Las hojas de asistencia
-DocType: Payment Gateway Account,Default Payment Request Message,Defecto de solicitud de pago del mensaje
+DocType: Sales Invoice,Time Sheets,Tablas de Tiempo
+DocType: Payment Gateway Account,Default Payment Request Message,Mensaje de solicitud de pago por defecto
 DocType: Item Group,Check this if you want to show in website,Seleccione esta opción si desea mostrarlo en el sitio web
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,Banco y Pagos
 ,Welcome to ERPNext,Bienvenido a ERPNext
@@ -3024,12 +3031,12 @@
 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 +163,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 Presupuesto
-DocType: Employee Loan,Employee Loan Application,Solicitud de Préstamo empleado
+DocType: Employee Loan,Employee Loan Application,Solicitud de Préstamo del empleado
 DocType: Issue,Opening Date,Fecha de apertura
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,La asistencia ha sido marcada con éxito.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,La asistencia ha sido marcada con éxito.
 DocType: Journal Entry,Remark,Observación
 DocType: Purchase Receipt Item,Rate and Amount,Tasa y cantidad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tipo de cuenta para {0} debe ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tipo de cuenta para {0} debe ser {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ausencias y Feriados
 DocType: School Settings,Current Academic Term,Término académico actual
 DocType: Sales Order,Not Billed,No facturado
@@ -3051,13 +3058,13 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Estudiantes
 DocType: Shopping Cart Settings,Quotation Series,Series de Presupuestos
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Existe un elemento con el mismo nombre ({0} ) , cambie el nombre del grupo de artículos o cambiar el nombre del elemento"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Por favor, seleccione al cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Por favor, seleccione al cliente"
 DocType: C-Form,I,yo
 DocType: Company,Asset Depreciation Cost Center,Centro de la amortización del coste de los activos
 DocType: Sales Order Item,Sales Order Date,Fecha de las órdenes de venta
 DocType: Sales Invoice Item,Delivered Qty,Cantidad entregada
 DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.","Si se selecciona, todos los hijos de cada elemento de la producción se incluirán en las solicitudes de materiales."
-DocType: Assessment Plan,Assessment Plan,plan de evaluación
+DocType: Assessment Plan,Assessment Plan,Plan de Evaluación
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,Almacén {0}: Compañía es obligatoria
 DocType: Stock Settings,Limit Percent,límite de porcentaje
 ,Payment Period Based On Invoice Date,Periodos de pago según facturas
@@ -3070,24 +3077,24 @@
 DocType: Vehicle,Insurance Details,Detalles de Seguros
 DocType: Account,Payable,Pagadero
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, introduzca plazos de amortización"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deudores ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deudores ({0})
 DocType: Pricing Rule,Margin,Margen
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuevos clientes
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Beneficio Bruto%
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Beneficio Bruto %
 DocType: Appraisal Goal,Weightage (%),Porcentaje (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Fecha de liquidación
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Compra importe bruto es obligatorio
 DocType: Lead,Address Desc,Dirección
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parte es obligatoria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Parte es obligatoria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nombre del tema
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Al menos uno de la venta o compra debe seleccionar
-DocType: Grading Structure,Grade Intervals,intervalos de grado
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione la naturaleza de su negocio.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Entrada duplicada en Referencias {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dónde se realizan las operaciones de producción
 DocType: Asset Movement,Source Warehouse,Almacén de origen
 DocType: Installation Note,Installation Date,Fecha de instalación
-apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: {1} Activos no pertenece a la empresa {2}
+apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},Fila # {0}: Activo {1} no pertenece a la empresa {2}
 DocType: Employee,Confirmation Date,Fecha de confirmación
 DocType: C-Form,Total Invoiced Amount,Total Facturado
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,La cantidad mínima no puede ser mayor que la cantidad maxima
@@ -3102,7 +3109,7 @@
 DocType: Customer,CUST-,CUST-
 DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,Pago Bruto - Deducción total - Pago de Préstamos
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +25,Current BOM and New BOM can not be same,La lista de materiales (LdM) actual y la nueva no pueden ser las mismas
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,Salario Slip ID
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,ID de Nómina
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,La fecha de jubilación debe ser mayor que la fecha de ingreso
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,Hubo errores al programar el curso:
 DocType: Sales Invoice,Against Income Account,Contra cuenta de ingresos
@@ -3112,7 +3119,7 @@
 DocType: Territory,Territory Targets,Metas de territorios
 DocType: Delivery Note,Transporter Info,Información de Transportista
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Por favor seleccione el valor por defecto {0} en la empresa {1}
-DocType: Cheque Print Template,Starting position from top edge,posición desde el borde superior de partida
+DocType: Cheque Print Template,Starting position from top edge,Posición inicial desde el borde superior de partida
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Mismo proveedor se ha introducido varias veces
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utilidad Bruta / Pérdida
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Producto suministrado desde orden de compra
@@ -3120,7 +3127,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Membretes para las plantillas de impresión.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para las plantillas de impresión, por ejemplo, Factura proforma."
 DocType: Student Guardian,Student Guardian,Tutor del estudiante
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Cargos de tipo de valoración no pueden marcado como Incluido
 DocType: POS Profile,Update Stock,Actualizar el Inventario
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Unidad de Medida diferente para elementos dará lugar a Peso Neto (Total) incorrecto. Asegúrese de que el peso neto de cada artículo esté en la misma Unidad de Medida.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Coeficiente de la lista de materiales (LdM)
@@ -3143,11 +3150,11 @@
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,Este es el vendedor principal y no se puede editar.
 DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ","Si se selecciona, el valor especificado o calculado en este componente no contribuirá a las ganancias o deducciones. Sin embargo, su valor puede ser referenciado por otros componentes que se pueden agregar o deducir."
 ,Stock Ledger,Mayor de Inventarios
-apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Calificación: {0}
+apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},Tasa: {0}
 DocType: Company,Exchange Gain / Loss Account,Cuenta de Ganancias / Pérdidas en Cambio
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Empleados y Asistencias
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Propósito debe ser uno de {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Llene el formulario y guárdelo
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Cantidad real en stock
@@ -3162,7 +3169,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Cantidad a reabastecer
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Ofertas de empleo actuales
 DocType: Company,Stock Adjustment Account,Cuenta de ajuste de existencias
-DocType: Journal Entry,Write Off,Desajuste
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Desajuste
 DocType: Timesheet Detail,Operation ID,ID de Operación
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Si se define el ID de usuario 'Login', este sera el predeterminado para todos los documentos de recursos humanos (RRHH)"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Desde {1}
@@ -3173,26 +3180,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Proveedor entrega al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) está agotado
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,La fecha siguiente debe ser mayor que la fecha de publicación
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar impuesto fragmentado
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Debido / Fecha de referencia no puede ser posterior a {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mostrar impuesto fragmentado
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vencimiento / Fecha de referencia no puede ser posterior a {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importación y exportación de datos
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existen entradas en existencias de almacén en contra {0}, por lo tanto, no se puede volver a asignar o modificarlo"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No se han encontrado estudiantes
+apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existen entradas de Stock contra {0}, por lo tanto, no se puede volver a asignar o modificarlo"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,No se han encontrado estudiantes
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fecha de la factura de envío
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vender
 DocType: Sales Invoice,Rounded Total,Total redondeado
 DocType: Product Bundle,List items that form the package.,Lista de tareas que forman el paquete .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,El porcentaje de asignación debe ser igual al 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, seleccione Fecha de entrada antes de seleccionar la fiesta"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
 DocType: Program Enrollment,School House,Casa de la escuela
 DocType: Serial No,Out of AMC,Fuera de CMA (Contrato de mantenimiento anual)
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleccione Citas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Crear visita de mantenimiento
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Por Favor seleccione Cotizaciones
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Número de Depreciaciones Reservadas no puede ser mayor que el número total de Depreciaciones
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Crear visita de mantenimiento
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, póngase en contacto con el usuario gerente de ventas {0}"
 DocType: Company,Default Cash Account,Cuenta de efectivo por defecto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Configuración general del sistema.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basado en la asistencia de este estudiante
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No hay estudiantes en
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Añadir más elementos o abrir formulario completo
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, introduzca 'la fecha prevista de entrega'"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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
@@ -3211,7 +3219,7 @@
 DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,Validar precio de venta para el artículo contra la Tarifa de compra o tasa de valorización
 DocType: Program,Fee Schedule,Programa de Cuotas
 DocType: Hub Settings,Publish Availability,Publicar disponibilidad
-DocType: Company,Create Chart Of Accounts Based On,Crear catálogo de cuentas basado en
+DocType: Company,Create Chart Of Accounts Based On,Crear plan de cuentas basado en
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,La fecha de nacimiento no puede ser mayor a la fecha de hoy.
 ,Stock Ageing,Antigüedad de existencias
 apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},Estudiante {0} existe contra la solicitud de estudiante {1}
@@ -3220,10 +3228,11 @@
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Establecer como abierto/a
 DocType: Cheque Print Template,Scanned Cheque,Cheque Scaneado
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Enviar correos electrónicos automáticos a contactos al momento de registrase una transacción
-DocType: Timesheet,Total Billable Amount,Monto total facturable
+DocType: Timesheet,Total Billable Amount,Monto Total Facturable
 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: Warranty Claim,Item and Warranty Details,Producto y detalles de garantía
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código del artículo&gt; Grupo de artículos&gt; Marca
 DocType: Sales Team,Contribution (%),Margen (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Seleccione el programa para obtener cursos obligatorios.
@@ -3238,9 +3247,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes de reconciliación
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impuestos y cargos adicionales (Divisa por defecto)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"El campo de impuesto del producto {0} debe tener un tipo de cuenta de impuestos, ingresos, cargos o gastos"
 DocType: Sales Order,Partly Billed,Parcialmente facturado
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Elemento {0} debe ser un elemento de activo fijo
 DocType: Item,Default BOM,Lista de Materiales (LdM) por defecto
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3250,11 +3259,11 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotores
 DocType: Vehicle,Insurance Company,Compañía de seguros
 DocType: Asset Category Account,Fixed Asset Account,Cuenta de activo fijo
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Desde nota de entrega
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Desde nota de entrega
 DocType: Student,Student Email Address,Dirección de correo electrónico del Estudiante
 DocType: Timesheet Detail,From Time,Desde hora
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En stock:
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock:
 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/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago
@@ -3262,12 +3271,12 @@
 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 +66,Intern,Interno
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nombre de la dirección
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Nombre de la dirección
 DocType: Stock Entry,From BOM,Desde lista de materiales (LdM)
 DocType: Assessment Code,Assessment Code,Código evaluación
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Las operaciones de inventario antes de {0} se encuentran congeladas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Por favor, haga clic en 'Generar planificación'"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","por ejemplo Kg, Unidades, Metros"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,El No. de referencia es obligatoria si usted introdujo la fecha
 DocType: Bank Reconciliation Detail,Payment Document,Documento de pago
@@ -3275,19 +3284,19 @@
 DocType: Salary Slip,Salary Structure,Estructura salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Línea aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Distribuir materiales
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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,Presupuestos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Usted está en modo fuera de línea. Usted no será capaz de recargar hasta que tenga conexión a red.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,No se crearon grupos de estudiantes.
 DocType: Purchase Invoice Item,Serial No,Número de serie
-apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad Mensual La devolución no puede ser mayor que Monto del préstamo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Cantidad mensual La devolución no puede ser mayor que monto del préstamo
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Por favor ingrese primero los detalles del mantenimiento
 DocType: Purchase Invoice,Print Language,Lenguaje de impresión
 DocType: Salary Slip,Total Working Hours,Horas de trabajo total
 DocType: Stock Entry,Including items for sub assemblies,Incluir productos para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,El valor introducido debe ser positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,El valor introducido debe ser positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Todos los Territorios
 DocType: Purchase Invoice,Items,Productos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Estudiante ya está inscrito.
@@ -3300,22 +3309,20 @@
 DocType: Payment Reconciliation,Maximum Invoice Amount,Importe Máximo de Factura
 DocType: Student Language,Student Language,Idioma del Estudiante
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clientes
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Orden / Quot%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Orden / Cotización %
 DocType: Student Sibling,Institution,Institución
 DocType: Asset,Partially Depreciated,Despreciables Parcialmente
-DocType: Issue,Opening Time,Hora de apertura
+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 +647,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;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unidad de medida predeterminada para variante '{0}' debe ser la mismo que en la plantilla '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculo basado en
 DocType: Delivery Note Item,From Warehouse,De Almacén
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,No hay artículos con la lista de materiales para la fabricación de
 DocType: Assessment Plan,Supervisor Name,Nombre del supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscripción en el programa
-DocType: Grading Structure,Grading Structure,Estructura de clasificación
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuación y total
 DocType: Tax Rule,Shipping City,Ciudad de envió
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Personalizar notificación
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flujo de caja operativo
 DocType: Sales Invoice,Shipping Rule,Regla de envío
@@ -3324,20 +3331,20 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Total no puede ser cero
 DocType: Training Event Employee,Attended,Asistido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Días desde la última orden' debe ser mayor que o igual a cero
-DocType: Process Payroll,Payroll Frequency,La nómina de frecuencia
+DocType: Process Payroll,Payroll Frequency,Frecuencia de la Nómina
 DocType: Asset,Amended From,Modificado Desde
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguir a través de correo electronico
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Las plantas y maquinarias
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Plantas y Maquinarias
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Total impuestos después del descuento
-DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustes diarias Resumen Trabajo
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,Ajustes de Resumen Diario de Trabajo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Moneda de la lista de precios {0} no es similar con la moneda seleccionada {1}
 DocType: Payment Entry,Internal Transfer,Transferencia interna
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,"Por favor, seleccione Fecha de contabilización primero"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Por favor, seleccione fecha de publicación primero"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Fecha de apertura debe ser antes de la Fecha de Cierre
 DocType: Leave Control Panel,Carry Forward,Trasladar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,El centro de costos con transacciones existentes no se puede convertir a libro mayor
 DocType: Department,Days for which Holidays are blocked for this department.,Días en que las vacaciones / permisos se bloquearan para este departamento.
@@ -3347,9 +3354,9 @@
 DocType: Issue,Raised By (Email),Propuesto por (Email)
 DocType: Training Event,Trainer Name,Nombre del entrenador
 DocType: Mode of Payment,General,General
-apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar membrete
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicación
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Adjuntar Membrete
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última Comunicación
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',No se puede deducir cuando categoría es para ' Valoración ' o ' de Valoración y Total '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Enumere sus obligaciones fiscales (Ejemplo; Impuestos, aduanas, etc.) deben tener nombres únicos y sus tarifas por defecto. Esto creará una plantilla estándar, que podrá editar más tarde."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Conciliacion de pagos con facturas
@@ -3365,7 +3372,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Monto total
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimiento y ocio
 DocType: Quality Inspection,Item Serial No,Nº de Serie del producto
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crear registros de empleados
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crear registros de empleados
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Declaraciones de contabilidad
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3378,22 +3385,21 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Desconocido
 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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punto de Venta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Punto de Venta
 DocType: Payment Entry,Received Amount,Cantidad recibida
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Por favor, configure el sistema de nombres de empleado en recursos humanos&gt; Configuración de recursos humanos"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Crear para la cantidad completa, haciendo caso omiso de la cantidad que ya están en orden"
 DocType: Account,Tax,Impuesto
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,No Marcado
-DocType: Production Planning Tool,Production Planning Tool,Planificar producción
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","El elemento compartido {0} no se puede actualizar mediante la Reconciliación de Stock, en lugar de ello, use Stock Entry"
+DocType: Production Planning Tool,Production Planning Tool,Planificar Producción
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","El elemento de lote {0} no se puede actualizar mediante la Reconciliación de Stock, en lugar de ello, usar Entrada de Stock"
 DocType: Quality Inspection,Report Date,Fecha del reporte
 DocType: Student,Middle Name,Segundo nombre
 DocType: C-Form,Invoices,Facturas
 DocType: Batch,Source Document Name,Nombre del documento de origen
 DocType: Job Opening,Job Title,Título del trabajo
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Crear usuarios
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Crear usuarios
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,La cantidad a producir debe ser mayor que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Reporte de visitas para mantenimiento
 DocType: Stock Entry,Update Rate and Availability,Actualización de tarifas y disponibilidad
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"El porcentaje que ud. tiene permitido para recibir o enviar mas de la cantidad ordenada. Por ejemplo: Si ha pedido 100 unidades, y su asignación es del 10%, entonces tiene permitido recibir hasta 110 unidades."
@@ -3402,37 +3408,39 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},La cuenta de gastos es obligatoria para el elemento {0}
 DocType: BOM,Website Description,Descripción del sitio web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Cambio en el Patrimonio Neto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Por favor primero cancele la Factura de Compra {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Dirección de correo electrónico debe ser única, ya existe para {0}"
 DocType: Serial No,AMC Expiry Date,Fecha de caducidad de CMA (Contrato de Mantenimiento Anual)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Recibo
 ,Sales Register,Registro de ventas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Correos Electrónicos a
 DocType: Quotation,Quotation Lost Reason,Razón de la pérdida
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Seleccione su dominio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referencia de la transacción nro {0} fechada {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referencia de la transacción nro {0} fechada {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,No hay nada que modificar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,¡Aún no hay clientes!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Estado de Flujos de Efectivo
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Monto del préstamo no puede exceder cantidad máxima del préstamo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,"Por favor, ingrese la cuenta de desajuste"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Fecha del último pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},La cuenta {0} no pertenece a la compañía {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Los números de serie en la fila {0} no coinciden con Nota de entrega
 DocType: Student,Guardian Details,Detalles del Tutor
 DocType: C-Form,C-Form,C - Forma
-apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcos de Asistencia para varios empleados
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Asistencia para múltiples empleados
 DocType: Vehicle,Chassis No,N° de Chasis
 DocType: Payment Request,Initiated,Iniciado
 DocType: Production Order,Planned Start Date,Fecha prevista de inicio
 DocType: Serial No,Creation Document Type,Creación de documento
 DocType: Leave Type,Is Encash,Se convertirá en efectivo
-DocType: Leave Allocation,New Leaves Allocated,Nuevas ausencias asignadas
+DocType: Leave Allocation,New Leaves Allocated,Nuevas Ausencias Asignadas
 apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,Los datos del proyecto no están disponibles para el presupuesto
 DocType: Project,Expected End Date,Fecha prevista de finalización
 DocType: Budget Account,Budget Amount,Monto de Presupuesto
@@ -3448,20 +3456,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Fila {0} # La cuenta debe ser de tipo &quot;Activo Fijo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Cant. enviada
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reglas para calcular el importe de envío en una venta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,La secuencia es obligatoria
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,La secuencia es obligatoria
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicios financieros
 DocType: Student Sibling,Student ID,Identificación del Estudiante
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de actividades para los registros de tiempo
 DocType: Tax Rule,Sales,Ventas
 DocType: Stock Entry Detail,Basic Amount,Importe base
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},El almacén es requerido para el stock del producto {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cred
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cred
 DocType: Tax Rule,Billing State,Región de facturación
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferencia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} no asociada a la cuenta del partido {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} no asociada a la cuenta del partido {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Buscar lista de materiales (LdM) incluyendo subconjuntos
 DocType: Authorization Rule,Applicable To (Employee),Aplicable a ( Empleado )
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,La fecha de vencimiento es obligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incremento de Atributo {0} no puede ser 0
@@ -3472,13 +3480,13 @@
 ,Inactive Customers,Clientes Inactivos
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,¿Cómo se aplica la regla precios?
 DocType: Stock Entry,Delivery Note No,Nota de entrega No.
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Si está marcada, solamente las solicitudes de compra de material para las materias primas finales se incluyen en las solicitudes de materiales. De lo contrario, se crearán solicitudes de material para artículos padre"
 DocType: Cheque Print Template,Message to show,Mensaje a mostrar
 DocType: Company,Retail,Ventas al por menor
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Conjunto / paquete de productos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Conjunto / paquete de productos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3488,21 +3496,22 @@
 DocType: Payment Entry,Account Paid From,De cuenta de pago
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de materia prima
 DocType: Journal Entry,Write Off Based On,Desajuste basado en
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Hacer una Iniciativa
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Hacer una Iniciativa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impresión y Papelería
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo de código de barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Enviar mensajes de correo electrónico del proveedor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salario ya procesado para el período entre {0} y {1}, Deja período de aplicación no puede estar entre este intervalo de fechas."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,El registro de la instalación para un número de serie
 DocType: Guardian Interest,Guardian Interest,Interés del Tutor
 apps/erpnext/erpnext/config/hr.py +177,Training,Formación
-DocType: Timesheet,Employee Detail,Detalle de los empleados
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 ID de correo electrónico
+DocType: Timesheet,Employee Detail,Detalle de los Empleados
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,ID de correo electrónico del Tutor1
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,"El día ""siguiente fecha"" y ""repetir un día del mes"" deben ser iguales"
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Ajustes para la página de inicio página web
 DocType: Offer Letter,Awaiting Response,Esperando Respuesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Arriba
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atributo no válido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mencionar si la cuenta no  es cuenta estándar a pagar
 DocType: Salary Slip,Earning & Deduction,Ingresos y Deducciones
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,La valoración negativa no está permitida
@@ -3515,28 +3524,27 @@
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +62,Total Revenue,Ingresos Totales
 DocType: Sales Invoice,Product Bundle Help,Ayuda de 'conjunto / paquete de productos'
 ,Monthly Attendance Sheet,Hoja de ssistencia mensual
-DocType: Production Order Item,Production Order Item,Artículo de la orden de producción
+DocType: Production Order Item,Production Order Item,Artículo de la Orden de Producción
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No se han encontraron registros
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Costo del activo desechado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parcialmente ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Costes es obligatorio para el artículo {2}
 DocType: Vehicle,Policy No,N° de Política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obtener elementos del paquete del producto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obtener elementos del paquete del producto
 DocType: Asset,Straight Line,Línea recta
 DocType: Project User,Project User,usuario proyecto
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,División
 DocType: GL Entry,Is Advance,Es un anticipo
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,Asistencia 'Desde fecha' y 'Hasta fecha' son obligatorias
 apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,"Por favor, introduzca si 'Es sub-contratado' o no"
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Fecha de la última comunicación
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Fecha de la Última Comunicación
 DocType: Sales Team,Contact No.,Contacto No.
 DocType: Bank Reconciliation,Payment Entries,Entradas de Pago
 DocType: Production Order,Scrap Warehouse,Almacén de chatarra
 DocType: Production Order,Check if material transfer entry is not required,Compruebe si la entrada de transferencia de material no es necesaria
-DocType: Program Enrollment Tool,Get Students From,Recibe estudiantes de
+DocType: Program Enrollment Tool,Get Students From,Obtener Estudiantes Desde
 DocType: Hub Settings,Seller Country,País de vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar artículos en la página web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Agrupar sus estudiantes en lotes
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Agrupar sus estudiantes en lotes
 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 +85,Specifications,Especificaciones
@@ -3550,12 +3558,12 @@
 DocType: Shipping Rule,Specify conditions to calculate shipping amount,Especificar condiciones para calcular el monto del envío
 DocType: Accounts Settings,Role Allowed to Set Frozen Accounts & Edit Frozen Entries,Rol que permite definir cuentas congeladas y editar asientos congelados
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +28,Cannot convert Cost Center to ledger as it has child nodes,"No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
-apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de apertura
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +47,Opening Value,Valor de Apertura
 DocType: Salary Detail,Formula,Fórmula
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +37,Serial #,Serial #.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +92,Commission on Sales,Comisiones sobre ventas
 DocType: Offer Letter Term,Value / Description,Valor / Descripción
-apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: el elemento {1} no puede ser presentado, lo que ya es {2}"
+apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}","Fila # {0}: el elemento {1} no puede ser presentado, ya es {2}"
 DocType: Tax Rule,Billing Country,País de facturación
 DocType: Purchase Order Item,Expected Delivery Date,Fecha prevista de entrega
 apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}.
@@ -3587,16 +3595,16 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,Cuenta: {0} con divisa: {1} no puede ser seleccionada
 DocType: Bank Reconciliation Detail,Cheque Date,Fecha del cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}
-DocType: Program Enrollment Tool,Student Applicants,Los solicitantes de los estudiantes
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Todas las transacciones relacionadas con esta compañía han sido eliminadas correctamente.
+DocType: Program Enrollment Tool,Student Applicants,Estudiante Solicitantes
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Fecha de inscripción
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Período de prueba
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,componentes de sueldos
 DocType: Program Enrollment Tool,New Academic Year,Nuevo Año Académico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Devolución / Nota de Crédito
-DocType: Stock Settings,Auto insert Price List rate if missing,Auto inserto tasa Lista de Precios si falta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Devolución / Nota de Crédito
+DocType: Stock Settings,Auto insert Price List rate if missing,Insertar automáticamente Tasa de Lista de Precio si falta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Importe total pagado
 DocType: Production Order Item,Transferred Qty,Cantidad Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegación
@@ -3615,7 +3623,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de vacaciones como, enfermo, casual, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar informes resumidos periódicamente por correo electrónico.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Por favor, establece de forma predeterminada en cuenta Tipo de Gastos {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Por favor, establece de forma predeterminada en cuenta Tipo de Gastos {0}"
 DocType: Assessment Result,Student Name,Nombre del estudiante
 DocType: Brand,Item Manager,Administración de artículos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,nómina por pagar
@@ -3636,6 +3644,7 @@
 ,Sales Funnel,"""Embudo"" de ventas"
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,La abreviatura es obligatoria
 DocType: Project,Task Progress,Progreso de Tarea
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrito
 ,Qty to Transfer,Cantidad a transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotizaciones enviadas a los clientes u oportunidades de venta.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol que permite editar inventario congelado
@@ -3658,20 +3667,20 @@
 DocType: POS Profile,Apply Discount On,Aplicar de descuento en
 ,Reqd By Date,Fecha de solicitud
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,Acreedores
-DocType: Assessment Plan,Assessment Name,Nombre evaluación
+DocType: Assessment Plan,Assessment Name,Nombre de la evaluación
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Línea # {0}: El número de serie es obligatorio
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalle de Impuestos
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abreviatura del Instituto
 ,Item-wise Price List Rate,Detalle del listado de precios
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Presupuesto de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Presupuesto de Proveedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,'En palabras' será visible una vez guarde el Presupuesto
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantidad ({0}) no puede ser una fracción en la fila {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar cuotas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},El código de barras {0} ya se utiliza en el artículo {1}
 DocType: Lead,Add to calendar on this date,Añadir al calendario en esta fecha
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglas para añadir los gastos de envío.
-DocType: Item,Opening Stock,Stock de apertura
+DocType: Item,Opening Stock,Stock de Apertura
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,Se requiere cliente
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} es obligatorio para la devolución
 DocType: Purchase Order,To Receive,Recibir
@@ -3683,10 +3692,10 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,La asistencia para el empleado {0} ya está marcada para el día de hoy
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'",en minutos actualizado a través de bitácora (gestión de tiempo)
-DocType: Customer,From Lead,Desde iniciativa
+DocType: Customer,From Lead,Desde Iniciativa
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Las órdenes publicadas para la producción.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Seleccione el año fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Seleccione el año fiscal...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Se requiere un perfil de TPV para crear entradas en el punto de venta
 DocType: Program Enrollment Tool,Enroll Students,Inscribir Estudiantes
 DocType: Hub Settings,Name Token,Nombre de Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venta estándar
@@ -3695,9 +3704,9 @@
 DocType: BOM Replace Tool,Replace,Reemplazar
 DocType: Production Order,Unstopped,destapados
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra la factura de ventas {1}
-DocType: Sales Invoice,SINV-,SINV-
-DocType: Request for Quotation 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: Sales Invoice,SINV-,FACT-
+DocType: Request for Quotation Item,Project Name,Nombre de Proyecto
+DocType: Customer,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: Production Order,Required Items,Artículos Requeridos
 DocType: Stock Ledger Entry,Stock Value Difference,Diferencia del valor de inventario
@@ -3709,7 +3718,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante
 DocType: Item,Moving Average,Precio medio variable
 DocType: BOM Replace Tool,The BOM which will be replaced,La lista de materiales que será sustituida
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipos electrónicos
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,Equipos Electrónicos
 DocType: Account,Debit,Debe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,Vacaciones deben distribuirse en múltiplos de 0.5
 DocType: Production Order,Operation Cost,Costo de operación
@@ -3718,7 +3727,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Establecer objetivos en los grupos de productos para este vendedor
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar stock mayores a [Days]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Fila # {0}: el elemento es obligatorio para los activos fijos de compra / venta
-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.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si dos o más reglas de precios se encuentran basados en las condiciones anteriores, se aplicará prioridad. La prioridad es un número entre 0 a 20 mientras que el valor por defecto es cero (en blanco). Un número más alto significa que va a prevalecer si hay varias reglas de precios con mismas condiciones."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,El año fiscal: {0} no existe
 DocType: Currency Exchange,To Currency,A moneda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir a los usuarios siguientes aprobar solicitudes de ausencia en días bloqueados.
@@ -3728,12 +3737,12 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pagados y no entregados
 DocType: Project,Default Cost Center,Centro de costos por defecto
 DocType: Bank Guarantee,End Date,Fecha final
-apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transacciones de Valores
+apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,Transacciones de Stock
 DocType: Budget,Budget Accounts,Cuentas de Presupuesto
 DocType: Employee,Internal Work History,Historial de trabajo interno
 DocType: Depreciation Schedule,Accumulated Depreciation Amount,Depreciación acumulada Importe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,Capital de riesgo
-DocType: Employee Loan,Fully Disbursed,desembolsado en su totalidad
+DocType: Employee Loan,Fully Disbursed,Completamente Desembolsado
 DocType: Maintenance Visit,Customer Feedback,Comentarios de cliente
 DocType: Account,Expense,Gastos
 apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,Los resultados no puede ser mayor que puntaje máximo
@@ -3743,8 +3752,8 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,El producto {0} ha sido ignorado ya que no es un elemento de stock
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Enviar esta orden de producción para su posterior procesamiento.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
-DocType: Assessment Group,Parent Assessment Group,Padres Grupo de Evaluación
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para no utilizar la regla de precios en una única transacción, todas las reglas de precios aplicables deben ser desactivadas."
+DocType: Assessment Group,Parent Assessment Group,Grupo de Evaluación de Padres
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Trabajos
 ,Sales Order Trends,Tendencias de ordenes de ventas
 DocType: Employee,Held On,Retenida en
@@ -3754,7 +3763,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Fin del ejercicio contable
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Crear oferta de venta de un proveedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Crear oferta de venta de un proveedor
 DocType: Quality Inspection,Incoming,Entrante
 DocType: BOM,Materials Required (Exploded),Materiales necesarios (despiece)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Añadir otros usuarios a su organización
@@ -3782,6 +3791,7 @@
 DocType: Employee,History In Company,Historia en la Compañia
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Boletines
 DocType: Stock Ledger Entry,Stock Ledger Entry,Entradas en el mayor de inventarios
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente &gt; Grupo de clientes &gt; Territorio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,El mismo artículo se ha introducido varias veces
 DocType: Department,Leave Block List,Dejar lista de bloqueo
 DocType: Sales Invoice,Tax ID,ID de impuesto
@@ -3791,7 +3801,7 @@
 DocType: Customer,Sales Partner and Commission,Comisiones y socios de ventas
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasa de interés (%) / Año
 ,Project Quantity,Cantidad de Proyecto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
 DocType: Opportunity,To Discuss,Para discusión
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unidades de {1} necesaria en {2} para completar esta transacción.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasa de interés (%) Anual
@@ -3806,19 +3816,19 @@
 DocType: Purchase Invoice,Return,Retornar
 DocType: Production Order Operation,Production Order Operation,Operación en la orden de producción
 DocType: Pricing Rule,Disable,Desactivar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Forma de pago se requiere para hacer un pago
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Forma de pago se requiere para hacer un pago
 DocType: Project Task,Pending Review,Pendiente de revisar
-apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Activos {0} no puede ser desechada, como ya lo es {1}"
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Activo {0} no puede ser desechado, debido a que ya es {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total reembolso (Vía reembolso de gastos)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID del cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}
 DocType: Journal Entry Account,Exchange Rate,Tipo de cambio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,La órden de venta {0} no esta validada
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Componente de Couta
-apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestión de flotas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Agregar elementos de
+apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestión de Flota
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Agregar elementos de
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Almacén {0}: La cuenta padre {1} no pertenece a la compañía {2}
 DocType: Cheque Print Template,Regular,Regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Coeficiente de ponderación total de todos los criterios de evaluación debe ser del 100%
@@ -3831,24 +3841,24 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,El almacén {0} no existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrarse en el Hub de ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Porcentajes de distribución mensuales
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,El producto seleccionado no puede contener lotes
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasa de valorización no encontrado para el elemento {0}, que se requiere para hacer asientos contables para {1} {2}. Si el artículo está tramitando como un elemento de la muestra en el {1}, por favor mencionar que en la tabla {1} artículo. De lo contrario, por favor crea una transacción de acciones de entrada para la tasa de valorización artículo o mención en el registro de artículos y, a continuación, tratar de enviar / cancelación de esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiales entregados contra esta nota de entrega
 DocType: Project,Customer Details,Datos de cliente
 DocType: Employee,Reports to,Enviar Informes a
 ,Unpaid Expense Claim,Reclamación de gastos no pagados
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduzca el parámetro url para los números de los receptores
-DocType: Payment Entry,Paid Amount,Cantidad pagada
+DocType: Payment Entry,Paid Amount,Cantidad Pagada
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,En línea
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,En línea
 ,Available Stock for Packing Items,Inventario Disponible de Artículos de Embalaje
 DocType: Item Variant,Item Variant,Variante del producto
-DocType: Assessment Result Tool,Assessment Result Tool,Herramienta resultado de la evaluación
+DocType: Assessment Result Tool,Assessment Result Tool,Herramienta Resultado de la Evaluación
 DocType: BOM Scrap Item,BOM Scrap Item,La lista de materiales de chatarra de artículos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,pedidos presentados no se pueden eliminar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Ordenes presentada no se pueden eliminar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Gestión de calidad
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Elemento {0} ha sido desactivado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Elemento {0} ha sido desactivado
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar una cantidad fija por Período
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, ingrese la cantidad para el producto {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de de trabajos anteriores
@@ -3862,7 +3872,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Línea #{0}: tiene conflictos de tiempo con la linea {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permitir tasa de valoración cero
 DocType: Training Event Employee,Invited,Invitado
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activos encontrados para el empleado {0} para las fechas indicadas
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Múltiples estructuras salariales activas encontradas para el empleado {0} para las fechas indicadas
 DocType: Opportunity,Next Contact,Siguiente contacto
 apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,Configuración de cuentas de puerta de enlace.
 DocType: Employee,Employment Type,Tipo de empleo
@@ -3871,17 +3881,17 @@
 ,Cash Flow,Flujo de fondos
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,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
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Estudiante ID de correo electrónico
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID de Correo Electrónico de Estudiante
 DocType: Employee,Notice (days),Aviso (días)
 DocType: Tax Rule,Sales Tax Template,Plantilla de impuesto sobre ventas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Seleccione artículos para guardar la factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Seleccione artículos para guardar la factura
 DocType: Employee,Encashment Date,Fecha de cobro
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajuste de existencias
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe una actividad de costo por defecto para la actividad del tipo - {0}
 DocType: Production Order,Planned Operating Cost,Costos operativos planeados
 DocType: Academic Term,Term Start Date,Plazo Fecha de Inicio
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Cant Oportunidad
 apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},"Por favor, buscar el adjunto {0} #{1}"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Equilibrio extracto bancario según Contabilidad General
 DocType: Job Applicant,Applicant Name,Nombre del Solicitante
@@ -3897,7 +3907,7 @@
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Por favor, especifique el rango (desde / hasta)"
 DocType: Serial No,Under AMC,Bajo CMA (Contrato de mantenimiento anual)
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,La tasa de valorización del producto se vuelve a calcular considerando los costos adicionales del voucher
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Ajustes por defecto para las transacciones de venta.
 DocType: Guardian,Guardian Of ,Tutor de
 DocType: Grading Scale Interval,Threshold,Límite
@@ -3907,6 +3917,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
 DocType: Production Order,Warehouses,Almacenes
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activo no se puede transferir
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Este elemento es una variante de {0} (plantilla).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Adquisitivo
 DocType: Announcement,Announcement,Anuncio
@@ -3918,12 +3929,12 @@
 ,Quoted Item Comparison,Comparación de artículos de Cotización
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,Despacho
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Descuento máximo permitido para el producto: {0} es {1}%
-apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,El valor neto de activos como en
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,Valor neto de activos como en
 DocType: Account,Receivable,A cobrar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores como la Orden de Compra ya existe
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: No se permite cambiar de proveedores debido a que la Orden de Compra ya existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol autorizado para validar las transacciones que excedan los límites de crédito establecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Seleccionar artículos para Fabricación
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Maestro sincronización de datos, que podría tomar algún tiempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Seleccionar artículos para Fabricación
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Sincronización de datos Maestros,  puede tomar algún tiempo"
 DocType: Item,Material Issue,Expedición de material
 DocType: Hub Settings,Seller Description,Descripción del vendedor
 DocType: Employee Education,Qualification,Calificación
@@ -3935,7 +3946,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordenado/a
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criterios de evaluación del Grupo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},La apertura de la depreciación acumulada debe ser inferior o igual a {0}
 DocType: Warehouse,Warehouse Name,Nombre del almacén
 DocType: Naming Series,Select Transaction,Seleccione el tipo de transacción
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
@@ -3948,7 +3959,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,No se puede cancelar debido a que existe una entrada en el almacén {0}
 DocType: Employee Loan,Disbursement Date,Fecha de desembolso
 DocType: Vehicle,Vehicle,Vehículo
 DocType: Purchase Invoice,In Words,En palabras
@@ -3959,17 +3970,17 @@
 DocType: Payment Request,payment_url,url_de_pago
 DocType: Project Task,View Task,Ver Tareas
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,El año financiero inicia el
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plomo%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Inviciativa %
 DocType: Material Request,MREQ-,MREQ-
-,Asset Depreciations and Balances,Las depreciaciones de activos y saldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
+,Asset Depreciations and Balances,Depreciaciones de Activos y Saldos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Monto {0} {1} transferido desde {2} a {3}
 DocType: Sales Invoice,Get Advances Received,Obtener anticipos recibidos
 DocType: Email Digest,Add/Remove Recipients,Agregar / Eliminar destinatarios
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transacción no permitida contra Orden Producción Detenida {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para establecer este año fiscal por defecto, haga clic en 'Establecer como predeterminado'"
-apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Unirse
+apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,unirse
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Cantidad faltante
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,Item variant {0} exists with same attributes,Existe la variante de artículo {0} con mismos atributos
 DocType: Employee Loan,Repay from Salary,Pagar de su sueldo
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitando el pago contra {0} {1} para la cantidad {2}
@@ -3984,10 +3995,10 @@
 DocType: BOM,Manage cost of operations,Administrar costo de las operaciones
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Cuando alguna de las operaciones comprobadas está en "" Enviado "" , una ventana emergente automáticamente se abre para enviar un correo electrónico al ""Contacto"" asociado en esa transacción , con la transacción como un archivo adjunto. El usuario puede o no puede enviar el correo electrónico."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configuración global
-DocType: Assessment Result Detail,Assessment Result Detail,Evaluación de Resultados Detalle
+DocType: Assessment Result Detail,Assessment Result Detail,Detalle del Resultado de la Evaluación
 DocType: Employee Education,Employee Education,Educación del empleado
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Se encontró grupo de artículos duplicado  en la table de grupo de artículos
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Se necesita a buscar Detalles del artículo.
 DocType: Salary Slip,Net Pay,Pago Neto
 DocType: Account,Account,Cuenta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,El número de serie {0} ya ha sido recibido
@@ -3996,7 +4007,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Almacén {0} no está vinculada a ninguna cuenta, por favor crear / enlazar la cuenta correspondiente (Activo) para el almacén."
 DocType: Purchase Invoice,Recurring Id,ID recurrente
 DocType: Customer,Sales Team Details,Detalles del equipo de ventas.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Eliminar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Total reembolso
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades de venta.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},No válida {0}
@@ -4007,13 +4018,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configura tu Escuela en ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Importe de Cambio Base (Divisa de la Empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No hay asientos contables para los siguientes almacenes
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Guarde el documento primero.
 DocType: Account,Chargeable,Devengable
 DocType: Company,Change Abbreviation,Cambiar abreviación
 DocType: Expense Claim Detail,Expense Date,Fecha de gasto
 DocType: Item,Max Discount (%),Descuento máximo (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Monto de la última orden
+DocType: Task,Is Milestone,Es un Hito
 DocType: Daily Work Summary,Email Sent To,Correo electrónico enviado a
 DocType: Budget,Warn,Advertir
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Otras observaciones, que deben ir en los registros."
@@ -4030,11 +4042,11 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,Balance general
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},Empleado {0} en excedencia {1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,Ver iniciativas
-DocType: Program Enrollment Tool,New Program,nuevo Programa
+DocType: Program Enrollment Tool,New Program,Nuevo Programa
 DocType: Item Attribute Value,Attribute Value,Valor del Atributo
 ,Itemwise Recommended Reorder Level,Nivel recomendado de reabastecimiento de producto
 DocType: Salary Detail,Salary Detail,Detalle de sueldos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Por favor, seleccione primero {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Por favor, seleccione primero {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,El lote {0} del producto {1} ha expirado.
 DocType: Sales Invoice,Commission,Comisión
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Hoja de tiempo para la fabricación.
@@ -4046,43 +4058,42 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar stock mayor a' debe ser menor a %d días.
 DocType: Tax Rule,Purchase Tax Template,Plantilla de Impuestos sobre compras
 ,Project wise Stock Tracking,Seguimiento preciso del stock--
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programa de mantenimiento {0} ya existe para {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cantidad real (en origen/destino)
 DocType: Item Customer Detail,Ref Code,Código de referencia
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de los empleados.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Por favor, establece Siguiente Depreciación Fecha"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, establece la Siguiente Fecha de Depreciación"
 DocType: HR Settings,Payroll Settings,Configuración de nómina
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Coincidir las facturas y pagos no vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Realizar pedido
 DocType: Email Digest,New Purchase Orders,Nueva órdén de compra
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Seleccione una marca ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Seleccione una marca ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,La depreciación acumulada como en
 DocType: Sales Invoice,C-Form Applicable,C -Forma Aplicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},El tiempo de operación debe ser mayor que 0 para {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Almacén es obligatorio
 DocType: Supplier,Address and Contacts,Dirección y contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalles de conversión de unidad de medida (UdM)
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Debe Mantenerse adecuado para la web 900px (H) por 100px (V)
 DocType: Program,Program Abbreviation,Abreviatura del Programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,La orden de producción no se puede asignar a una plantilla de producto
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Los cargos se actualizan en el recibo de compra  por cada producto
 DocType: Warranty Claim,Resolved By,Resuelto por
 DocType: Bank Guarantee,Start Date,Fecha de inicio
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Asignar las ausencias para un período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Los cheques y depósitos borran de forma incorrecta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Cuenta {0}: no puede asignarse a sí misma como cuenta padre
 DocType: Purchase Invoice Item,Price List Rate,Tarifa de la lista de precios
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Crear cotizaciones de clientes
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Crear cotizaciones de clientes
 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 +38,Bill of Materials (BOM),Lista de Materiales (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tiempo estimado por el proveedor para el envío
-apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,evaluación de Resultado
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Resultado de Evaluación
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Horas
 DocType: Project,Expected Start Date,Fecha prevista de inicio
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Eliminar el elemento si los cargos no son aplicables al mismo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Moneda de la transacción debe ser la misma que la moneda de pago de puerta de enlace
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Moneda de la transacción debe ser la misma que la moneda de la pasarela de pago
 DocType: Payment Entry,Receive,Recibir/Recibido
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Presupuestos:
 DocType: Maintenance Visit,Fully Completed,Terminado completamente
@@ -4091,19 +4102,19 @@
 DocType: Workstation,Operating Costs,Costos operativos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acción si se acumula presupuesto mensual excedido
 DocType: Purchase Invoice,Submit on creation,Validar al Crear
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Moneda para {0} debe ser {1}
-DocType: Asset,Disposal Date,disposición Fecha
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Moneda para {0} debe ser {1}
+DocType: Asset,Disposal Date,Fecha de eliminación
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Los correos electrónicos serán enviados a todos los empleados activos de la empresa a la hora determinada, si no tienen vacaciones. Resumen de las respuestas será enviado a la medianoche."
 DocType: Employee Leave Approver,Employee Leave Approver,Supervisor de ausencias de empleados
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Línea {0}: Una entrada de abastecimiento ya existe para el almacén {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","No se puede declarar como perdida, porque se ha hecho el Presupuesto"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Comentarios del entrenamiento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,La orden de producción {0} debe ser validada
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Curso es obligatorio en la fila {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La fecha no puede ser anterior a la fecha actual
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Previo
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Añadir / Editar Precios
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Añadir / Editar Precios
 DocType: Batch,Parent Batch,Lote padre
 DocType: Cheque Print Template,Cheque Print Template,Plantilla de impresión de cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Centros de costos
@@ -4116,11 +4127,11 @@
 ,Ordered Items To Be Delivered,Ordenes pendientes de entrega
 DocType: Account,Income,Ingresos
 DocType: Industry Type,Industry Type,Tipo de industria
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Algo salió mal!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Algo salió mal!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,La factura {0} ya ha sido validada
 DocType: Assessment Result Detail,Score,Puntuación
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Año fiscal {0} no existe
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Año Fiscal {0} no existe
 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/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} unidades de {1} necesaria en {2} sobre {3} {4} {5} para completar esta transacción.
@@ -4147,17 +4158,17 @@
 DocType: Item,Variant Based On,Variante basada en
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total asignado debe ser de 100 %. Es {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Sus proveedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"No se puede definir como pérdida, cuando la orden de venta esta hecha."
-DocType: Request for Quotation Item,Supplier Part No,Proveedor de parte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recibido de
+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."
+DocType: Request for Quotation Item,Supplier Part No,Parte de Proveedor Nro
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"No se puede deducir cuando la categoría es 'de Valoración ""o"" Vaulation y Total'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Recibido de
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Posee numero de serie
 DocType: Employee,Date of Issue,Fecha de emisión.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Desde {0} hasta {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Asignar Proveedor para el elemento {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Fila {0}: valor Horas debe ser mayor que cero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4166,20 +4177,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"moneda de facturación debe ser igual a la moneda o divisa de cuenta del partido, ya sea por defecto de comapany"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Moneda de facturación debe ser igual a la divisa por defecto de la compañía o la divisa de la cuenta de la parte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Deja Cobro
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,¿A qué se dedica?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para Almacén
-apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todos Admisión de Estudiantes
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas las admisiones de estudiantes
 ,Average Commission Rate,Tasa de comisión promedio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,La asistencia no se puede marcar para fechas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ayuda de regla de precios
 DocType: School House,House Name,Nombre de la casa
 DocType: Purchase Taxes and Charges,Account Head,Encabezado de cuenta
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Eléctrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Añadir el resto de su organización como a sus usuarios. También puede agregar invitar a los clientes a su portal con la adición de ellos desde Contactos
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Añadir el resto de su organización como a sus usuarios. También puede agregar o invitar a los clientes a su portal con la adición de ellos desde Contactos
 DocType: Stock Entry,Total Value Difference (Out - In),Total diferencia  (Salidas - Entradas)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4188,35 +4199,36 @@
 DocType: Item,Customer Code,Código de cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Recordatorio de cumpleaños para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Días desde la última orden
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,La cuenta de débito debe pertenecer a las cuentas de balance
 DocType: Buying Settings,Naming Series,Secuencias e identificadores
 DocType: Leave Block List,Leave Block List Name,Nombre de la Lista de Bloqueo de Vacaciones
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,La fecha de comienzo del seguro debe ser menos que la fecha de fin del seguro
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Inventarios
-DocType: Timesheet,Production Detail,Detalle de producción
+DocType: Timesheet,Production Detail,Detalle de Producción
 DocType: Target Detail,Target Qty,Cantidad estimada
-DocType: Shopping Cart Settings,Checkout Settings,Pedido Ajustes
+DocType: Shopping Cart Settings,Checkout Settings,Ajustes del Pedido
 DocType: Attendance,Present,Presente
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,La nota de entrega {0} no debe estar validada
 DocType: Notification Control,Sales Invoice Message,Mensaje de factura
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,Cuenta {0} Clausura tiene que ser de Responsabilidad / Patrimonio
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},El resbalón de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Nómina de sueldo del empleado {0} ya creado para la hoja de tiempo {1}
 DocType: Vehicle Log,Odometer,Cuentakilómetros
 DocType: Sales Order Item,Ordered Qty,Cantidad ordenada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Artículo {0} está deshabilitado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Artículo {0} está deshabilitado
 DocType: Stock Settings,Stock Frozen Upto,Inventario congelado hasta
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM no contiene ningún artículo común
-apps/erpnext/erpnext/controllers/recurring_document.py +172,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/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM no contiene ningún artículo común
+apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Fechas de Periodo Desde y Período Hasta  obligatorias para los recurrentes {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Actividad del proyecto / tarea.
 DocType: Vehicle Log,Refuelling Details,Detalles de repostaje
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Generar nóminas salariales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}","'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,El descuento debe ser inferior a 100
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,tasa de compra de última no encontrado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Última tasa de compra no encontrada
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Saldo de perdidas y ganancias (Divisa por defecto)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de facturación
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM por defecto para {0} no encontrado
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Configure la cantidad de pedido
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toca los elementos para agregarlos aquí
 DocType: Fees,Program Enrollment,programa de Inscripción
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprobante de costos de destino estimados
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, configure {0}"
@@ -4224,8 +4236,8 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} es estudiante inactivo
 DocType: Employee,Health Details,Detalles de salud
 DocType: Offer Letter,Offer Letter Terms,Términos y condiciones de carta de oferta
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Para crear un documento de referencia de Solicitud de pago se requiere
-DocType: Payment Entry,Allocate Payment Amount,Distribuir el importe de pago
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Para crear una Solicitud de Pago se requiere el documento de referencia
+DocType: Payment Entry,Allocate Payment Amount,Distribuir el Importe de Pago
 DocType: Employee External Work History,Salary,Salario.
 DocType: Serial No,Delivery Document Type,Tipo de documento de entrega
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,Presentar todas las nóminas salariales según los criterios seleccionados anteriormente
@@ -4235,10 +4247,10 @@
 DocType: Lead Source,Lead Source,Fuente de de la Iniciativa
 DocType: Customer,Additional information regarding the customer.,Información adicional referente al cliente.
 DocType: Quality Inspection Reading,Reading 5,Lectura 5
-DocType: Maintenance Visit,Maintenance Date,Fecha de mantenimiento
+DocType: Maintenance Visit,Maintenance Date,Fecha de Mantenimiento
 DocType: Purchase Invoice Item,Rejected Serial No,No. de serie rechazado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Fecha de inicio de año o fecha de finalización  de año está traslapando con {0}. Para evitar porfavor establezca empresa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La fecha de inicio debe ser menor que la fecha de finalización para el producto {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.","Ejemplo:. ABCD ##### 
  Si la serie se establece y el número de serie no se menciona en las transacciones, entonces se creara un número de serie automático sobre la base de esta serie. Si siempre quiere mencionar explícitamente los números de serie para este artículo, déjelo en blanco."
@@ -4291,9 +4303,9 @@
 DocType: Sales Partner,Partner Type,Tipo de socio
 DocType: Purchase Taxes and Charges,Actual,Actual
 DocType: Authorization Rule,Customerwise Discount,Descuento de cliente
-apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Parte de horas para las tareas.
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,Tabla de Tiempo para las tareas.
 DocType: Purchase Invoice,Against Expense Account,Contra la Cuenta de Gastos
-DocType: Production Order,Production Order,Orden de producción
+DocType: Production Order,Production Order,Orden de Producción
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +270,Installation Note {0} has already been submitted,La nota de instalación {0} ya se ha validado
 DocType: Bank Reconciliation,Get Payment Entries,Obtener registros de pago
 DocType: Quotation Item,Against Docname,Contra Docname
@@ -4314,7 +4326,6 @@
 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
-DocType: Grade Interval,Grade Interval,grado de intervalo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La fecha de inicio y la fecha final ya están establecidos en el año fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidación Fecha actualiza
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
@@ -4359,14 +4370,14 @@
 DocType: Bin,Reserved Qty for Production,Cantidad reservada para la Producción
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deje sin marcar si no desea considerar lote mientras hace grupos basados en cursos.
 DocType: Asset,Frequency of Depreciation (Months),Frecuencia de Depreciación (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Cuenta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Cuenta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Costos de destino estimados
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configuración de un sitio web sencillo para mi organización
 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 +666,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique el valor del atributo {0}"
 DocType: Item,Default Warehouse,Almacén por defecto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},El presupuesto no se puede asignar contra el grupo de cuentas {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, ingrese el centro de costos principal"
@@ -4402,16 +4413,16 @@
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si se marca, el número total de días trabajados incluirá las vacaciones, y este reducirá el salario por día."
 DocType: Purchase Invoice,Total Advance,Total anticipo
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"La fecha final de duración no puede ser anterior a la fecha de inicio Plazo. Por favor, corrija las fechas y vuelve a intentarlo."
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Cuenta Cotización
 ,BOM Stock Report,La lista de materiales de Informe
 DocType: Stock Reconciliation Item,Quantity Difference,Diferencia de Cantidad
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Procesando nómina
 DocType: Opportunity Item,Basic Rate,Precio base
 DocType: GL Entry,Credit Amount,Importe acreditado
 DocType: Cheque Print Template,Signatory Position,Posición signatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Establecer como perdido
-DocType: Timesheet,Total Billable Hours,Total de horas facturables
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pago de recibos Nota
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Establecer como perdido
+DocType: Timesheet,Total Billable Hours,Total de Horas Facturables
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota de Recibo de Pago
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Esto se basa en transacciones con este cliente. Ver cronología más abajo para los detalles
 DocType: Supplier,Credit Days Based On,Días de crédito basados en
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Fila {0}: cantidad asignada {1} debe ser menor o igual a la cantidad de entrada de pago {2}
@@ -4423,26 +4434,26 @@
 ,Items To Be Requested,Solicitud de Productos
 DocType: Purchase Order,Get Last Purchase Rate,Obtener último precio de compra
 DocType: Company,Company Info,Información de la compañía
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seleccionar o añadir nuevo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Seleccionar o añadir nuevo cliente
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Centro de coste es requerido para reservar una reclamación de gastos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),UTILIZACIÓN DE FONDOS (ACTIVOS)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esto se basa en la presencia de este empleado
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Cuenta de debito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Cuenta de debito
 DocType: Fiscal Year,Year Start Date,Fecha de Inicio de Año
 DocType: Attendance,Employee Name,Nombre de empleado
 DocType: Sales Invoice,Rounded Total (Company Currency),Total redondeado (Divisa por defecto)
 apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1} ha sido modificado. Por favor actualice.
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Monto de la compra
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Monto de la Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Presupuesto de Proveedor {0} creado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Año de finalización no puede ser anterior al ano de inicio
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficios de empleados
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de fiesta por Empleado {0} o de su empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} no existe
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, establece una lista predeterminada de feriados para Empleado {0} o de su empresa {1}"
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} no existe
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Línea #{0}: El importe no puede ser mayor que el reembolso pendiente {1}. El importe pendiente es {2}
@@ -4451,15 +4462,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lectura 3
 ,Hub,Centro de actividades
 DocType: GL Entry,Voucher Type,Tipo de comprobante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,La lista de precios no existe o está deshabilitada.
 DocType: Employee Loan Application,Approved,Aprobado
 DocType: Pricing Rule,Price,Precio
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Empleado relevado en {0} debe definirse como ""izquierda"""
 DocType: Guardian,Guardian,Tutor
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,La evaluación {0} creado para el empleado {1} en el rango de fechas determinado
 DocType: Employee,Education,Educación
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Elim
 DocType: Selling Settings,Campaign Naming By,Nombrar campañas por
-DocType: Employee,Current Address Is,La dirección actual es
+DocType: Employee,Current Address Is,La Dirección Actual es
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificado
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Asientos en el diario de contabilidad.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Camtidad Disponible Desde el Almacén
@@ -4468,8 +4481,8 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Por favor, ingrese la Cuenta de Gastos"
 DocType: Account,Stock,Almacén
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
-DocType: Employee,Current Address,Dirección actual
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Fila # {0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
+DocType: Employee,Current Address,Dirección Actual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si el artículo es una variante de otro artículo entonces la descripción, imágenes, precios, impuestos, etc. se establecerán a partir de la plantilla a menos que se especifique explícitamente"
 DocType: Serial No,Purchase / Manufacture Details,Detalles de compra / producción
 DocType: Assessment Group,Assessment Group,Grupo de evaluación
@@ -4495,8 +4508,8 @@
 DocType: Training Event Employee,Withdrawn,Retirado
 DocType: Hub Settings,Hub Settings,Ajustes del Centro de actividades
 DocType: Project,Gross Margin %,Margen bruto %
-DocType: BOM,With Operations,Con operaciones
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
+DocType: BOM,With Operations,Con Operaciones
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ya se han registrado asientos contables en la divisa {0} para la empresa {1}. Por favor seleccione una cuenta por cobrar o por pagar con divisa {0}.
 DocType: Asset,Is Existing Asset,Es Activo Existente
 DocType: Salary Detail,Statistical Component,Componente estadístico
 ,Monthly Salary Register,Registar salario mensual
@@ -4507,7 +4520,7 @@
 DocType: Student,Home Address,Direccion de casa
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transferir Activo
 DocType: POS Profile,POS Profile,Perfil de POS
-DocType: Training Event,Event Name,Nombre del evento
+DocType: Training Event,Event Name,Nombre del Evento
 apps/erpnext/erpnext/config/schools.py +39,Admission,Admisión
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +26,Admissions for {0},Admisiones para {0}
 apps/erpnext/erpnext/config/accounts.py +226,"Seasonality for setting budgets, targets etc.","Configuración general para establecer presupuestos, objetivos, etc."
@@ -4519,7 +4532,7 @@
 DocType: Assessment Plan,Room,Habitación
 DocType: Purchase Order,Advance Paid,Pago Anticipado
 DocType: Item,Item Tax,Impuestos del producto
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiales de Proveedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiales de Proveedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Impuestos Especiales Factura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Umbral {0}% aparece más de una vez
 DocType: Expense Claim,Employees Email Id,ID de Email de empleados
@@ -4542,17 +4555,17 @@
 DocType: Academic Term,Term End Date,Plazo Fecha de finalización
 DocType: Hub Settings,Seller Name,Nombre de vendedor
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),Impuestos y gastos deducibles (Divisa por defecto)
-DocType: Item Group,General Settings,Configuración general
+DocType: Item Group,General Settings,Configuración General
 apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,From Currency and To Currency cannot be same,'Desde moneda - a moneda' no pueden ser las mismas
 DocType: Stock Entry,Repack,Re-empacar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Debe guardar el formulario antes de proceder
 DocType: Item Attribute,Numeric Values,Valores numéricos
-apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar logo
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Adjuntar Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveles de Stock
 DocType: Customer,Commission Rate,Comisión de ventas
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Crear variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Crear variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear solicitudes de ausencias por departamento.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia interna"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo de pago debe ser uno de Recibir, Pagar y Transferencia Interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analítica
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,El carrito esta vacío.
 DocType: Vehicle,Model,Modelo
@@ -4563,6 +4576,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital de inventario
+DocType: Shopping Cart Settings,Show Public Attachments,Mostrar adjuntos públicos
 DocType: Packing Slip,Package Weight Details,Detalles del peso del paquete
 DocType: Payment Gateway Account,Payment Gateway Account,Cuenta de Pasarela de Pago
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Después de la realización del pago redirigir el usuario a la página seleccionada.
@@ -4581,18 +4595,18 @@
 DocType: Batch,Expiry Date,Fecha de caducidad
 ,Supplier Addresses and Contacts,Libreta de direcciones de proveedores
 ,accounts-browser,cuentas en navegador
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Por favor, seleccione primero la categoría"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Por favor, seleccione primero la categoría"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Listado de todos los proyectos.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir que el exceso de facturación o exceso de pedidos, actualizar &quot;Asignación&quot; en el archivo Configuración o el artículo."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,No volver a mostrar cualquier símbolo como $ u otro junto a las monedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Medio día)
 DocType: Supplier,Credit Days,Días de crédito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hacer Lote de Estudiantes
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hacer Lote de Estudiantes
 DocType: Leave Type,Is Carry Forward,Es un traslado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obtener productos desde lista de materiales (LdM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Días de iniciativa
-apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Fecha de contabilización debe ser la misma que la fecha de compra {1} de activos {2}
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca los pedidos de cliente en la tabla anterior"
+apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Fila # {0}: Fecha de ingreso debe ser la misma que la fecha de compra {1} de activos {2}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, introduzca las Ordenes de Venta en la tabla anterior"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,No Envió Salarios
 ,Stock Summary,Resumen de Existencia
 apps/erpnext/erpnext/config/accounts.py +241,Transfer an asset from one warehouse to another,Transferir un activo de un almacén a otro
@@ -4606,7 +4620,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Línea {0}: La entrada de débito no puede vincularse con {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure las series de numeración para Asistencia mediante Configuración&gt; Serie de numeración
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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/et.csv b/erpnext/translations/et.csv
index c6961d1..f2adc6d 100644
--- a/erpnext/translations/et.csv
+++ b/erpnext/translations/et.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Üürikorter
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Rakendatav Kasutaja
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Tootmise lõpetanud tellimust ei ole võimalik tühistada, ummistust kõigepealt tühistama"
 DocType: Vehicle Service,Mileage,kilometraaž
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Kas tõesti jäägid see vara?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vali Vaikimisi Tarnija
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vali Vaikimisi Tarnija
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuuta on vajalik Hinnakiri {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kas arvestatakse tehingu.
 DocType: Purchase Order,Customer Contact,Klienditeenindus Kontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Maksmata {0} ei saa olla väiksem kui null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Vaikimisi 10 minutit
 DocType: Leave Type,Leave Type Name,Jäta Tüüp Nimi
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Näita avatud
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näita avatud
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Seeria edukalt uuendatud
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Minu tellimused
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal fotole
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Partii Punkt lõppemine staatus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Pangaveksel
 DocType: Mode of Payment Account,Mode of Payment Account,Makseviis konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Näita variandid
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näita variandid
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materjal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kvantiteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Kvantiteet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Kontode tabeli saa olla tühi.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Laenudega (kohustused)
 DocType: Employee Education,Year of Passing,Aasta Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Viide:% s, Kood:% s ja Klient:% s"
 DocType: Item,Country of Origin,Päritoluriik
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Laos
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Avatud küsimused
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Tervishoid
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Makseviivitus (päevad)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Teenuse kulu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Arve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Seerianumber: {0} on juba viidatud müügiarve: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Arve
 DocType: Maintenance Schedule Item,Periodicity,Perioodilisus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} on vajalik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Oodatud tarne kuupäev on olla enne Sales Order Date
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Kinnita csv faili kahte veergu, üks vana nime ja üks uus nimi"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} mitte mingil aktiivne eelarveaastal.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viide: {0}, Kood: {1} ja kliendi: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Logi
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avamine tööd.
 DocType: Item Attribute,Increment,Juurdekasv
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Vali Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vali Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklaam
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama firma on kantud rohkem kui üks kord
 DocType: Employee,Married,Abielus
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ei ole lubatud {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Võta esemed
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei ole lubatud {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Võta esemed
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ei saa uuendada vastu saateleht {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Toote {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nr loetletud
 DocType: Payment Reconciliation,Reconcile,Sobita
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toiduained
 DocType: Quality Inspection Reading,Reading 1,Lugemine 1
 DocType: Process Payroll,Make Bank Entry,Tee Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Pensionifondid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Järgmine kulum kuupäev ei saa olla enne Ostukuupäevale
 DocType: SMS Center,All Sales Person,Kõik Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Kuu Distribution ** aitab levitada Eelarve / Target üle kuu, kui teil on sesoonsus firma."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ei leitud esemed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ei leitud esemed
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Palgastruktuur Kadunud
 DocType: Lead,Person Name,Person Nimi
 DocType: Sales Invoice Item,Sales Invoice Item,Müügiarve toode
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",nt &quot;algkool&quot; või &quot;Ülikool&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock aruanded
 DocType: Warehouse,Warehouse Detail,Ladu Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Krediidilimiit on ületanud kliendi {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term lõppkuupäev ei saa olla hilisem kui aasta lõpu kuupäev õppeaasta, mille mõiste on seotud (Academic Year {}). Palun paranda kuupäev ja proovi uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Kas Põhivarade&quot; ei saa märkimata, kui Asset Olemas vastu kirje"
 DocType: Vehicle Service,Brake Oil,Piduri õli
 DocType: Tax Rule,Tax Type,Maksu- Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Sa ei ole volitatud lisada või uuendada oma andmeid enne {0}
 DocType: BOM,Item Image (if not slideshow),Punkt Image (kui mitte slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kliendi olemas sama nimega
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Hinda / 60) * Tegelik tööaeg
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Vali Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Vali Bom
 DocType: SMS Log,SMS Log,SMS Logi
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kulud Tarnitakse Esemed
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Puhkus on {0} ei ole vahel From kuupäev ja To Date
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Koolid
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ei puhkuse rekord leitud töötaja {0} ja {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Palun sisestage firma esimene
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Palun valige Company esimene
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Palun valige Company esimene
 DocType: Employee Education,Under Graduate,Under koolilõpetaja
 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
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Nõude suurus
 DocType: Employee,Mr,härra
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate klientide rühm leidub cutomer grupi tabelis
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tarnija tüüp / tarnija
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tarnija tüüp / tarnija
 DocType: Naming Series,Prefix,Eesliide
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tarbitav
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,hinne
 DocType: Sales Invoice Item,Delivered By Supplier,Toimetab tarnija
 DocType: SMS Center,All Contact,Kõik Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Tootmise Telli juba loodud kõik esemed Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Aastapalka
 DocType: Daily Work Summary,Daily Work Summary,Igapäevase töö kokkuvõte
 DocType: Period Closing Voucher,Closing Fiscal Year,Sulgemine Fiscal Year
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} on külmutatud
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} on külmutatud
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Palun valige olemasoleva äriühingu loomise kontoplaani
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock kulud
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vali Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company Valuuta
 DocType: Delivery Note,Installation Status,Paigaldamine staatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Kas soovite värskendada käimist? <br> Present: {0} \ <br> Puudub: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Aktsepteeritud + Tõrjutud Kogus peab olema võrdne saadud koguse Punkt {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply tooraine ostmiseks
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Vähemalt üks makseviis on vajalik POS arve.
 DocType: Products Settings,Show Products as a List,Näita tooteid listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Lae mall, täitke asjakohaste andmete ja kinnitage muudetud faili. Kõik kuupäevad ning töötaja kombinatsioon valitud perioodil tulevad malli, olemasolevate töölkäimise"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee kulum Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Hankelepingu liik
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tee Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Rahvusringhääling
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Hukkamine
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Andmed teostatud.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan hooldus külastused.
 DocType: SMS Settings,Enter url parameter for message,Sisesta url parameeter sõnum
 DocType: POS Profile,Customer Groups,kliendigruppide
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finantsaruanded
 DocType: Guardian,Students,õpilased
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Eeskirjad hinnakujunduse ja soodushinnaga.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnakiri peab olema rakendatav ostmine või müümine
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance summa ei saa olla suurem kui {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seeria nimekiri selle Tehing
 DocType: Company,Default Payroll Payable Account,Vaikimisi palgaarvestuse tasulised konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uuenda e Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uuenda e Group
 DocType: Sales Invoice,Is Opening Entry,Avab Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nimetatakse mittestandardsete saadaoleva arvesse kohaldatavat
 DocType: Course Schedule,Instructor Name,Juhendaja nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Sest Warehouse on vaja enne Esita
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saadud
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Kui see on lubatud, sisaldab mitte-laos toodet materjali taotlused."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Vastu müügiarve toode
 ,Production Orders in Progress,Tootmine Tellimused in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahavood finantseerimistegevusest
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage on täis, ei päästa"
 DocType: Lead,Address & Contact,Aadress ja Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisa kasutamata lehed eelmisest eraldised
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Järgmine Korduvad {0} loodud {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kokku kuluarvestus summa (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Punkt Koduleht spetsifikatsioon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Jäta blokeeritud
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Sissekanded
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Punkt {0} on jõudnud oma elu lõppu kohta {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Sissekanded
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Aastane
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock leppimise toode
 DocType: Stock Entry,Sales Invoice No,Müügiarve pole
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Avaldab Hub
 DocType: Student Admission,Student Admission,üliõpilane
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Punkt {0} on tühistatud
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materjal taotlus
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Punkt {0} on tühistatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Materjal taotlus
 DocType: Bank Reconciliation,Update Clearance Date,Värskenda Kliirens kuupäev
 DocType: Item,Purchase Details,Ostu üksikasjad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Punkt {0} ei leitud &quot;tarnitud tooraine&quot; tabelis Ostutellimuse {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Tasumata tšekke ja hoiused selge
 DocType: Item,Synced With Hub,Sünkroniseerida Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ei saa olla negatiivne artiklijärgse {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Vale parool
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} ei saa olla negatiivne artiklijärgse {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Vale parool
 DocType: Item,Variant Of,Variant Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Valminud Kogus ei saa olla suurem kui &quot;Kogus et Tootmine&quot;
 DocType: Period Closing Voucher,Closing Account Head,Konto sulgemise Head
 DocType: Employee,External Work History,Väline tööandjad
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ringviide viga
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,"Soovin e-postiga loomiseks, automaatne Material taotlus"
 DocType: Journal Entry,Multi Currency,Multi Valuuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Arve Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Toimetaja märkus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Toimetaja märkus
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Seadistamine maksud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Müüdava vara
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Makse Entry on muudetud pärast seda, kui tõmbasin. Palun tõmmake uuesti."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} sisestatud kaks korda Punkt Maksu-
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kokkuvõte sel nädalal ja kuni tegevusi
 DocType: Student Applicant,Admitted,Tunnistas
 DocType: Workstation,Rent Cost,Üürile Cost
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Tellimus väärtus
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Raha vastu tehing poole või sisene ülekanne
 DocType: Shipping Rule,Valid for Countries,Kehtib Riigid
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"See toode on Mall ja seda ei saa kasutada tehingutes. Punkt atribuute kopeerida üle võetud variante, kui &quot;No Copy&quot; on seatud"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kokku Tellimus Peetakse
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",Töötaja nimetus (nt tegevjuht direktor jne).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Palun sisestage &quot;Korda päev kuus väljale väärtus
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rida # {0}: ostuarve ei saa vastu olemasoleva vara {1}
 DocType: Item Tax,Tax Rate,Maksumäär
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on juba eraldatud Töötaja {1} ajaks {2} et {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Vali toode
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Vali toode
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Ostuarve {0} on juba esitatud
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partii nr peaks olema sama mis {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Teisenda mitte-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partii (palju) objekti.
 DocType: C-Form Invoice Detail,Invoice Date,Arve kuupäev
 DocType: GL Entry,Debit Amount,Deebetsummat
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Seal saab olla ainult 1 konto kohta Company {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Palun vt lisa
 DocType: Purchase Order,% Received,% Vastatud
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Loo Üliõpilasgrupid
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Hinnapäring
 DocType: Salary Slip Timesheet,Working Hours,Töötunnid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Muuda algus / praegune järjenumber olemasoleva seeria.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Loo uus klient
-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.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Loo Ostutellimuste
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Loo uus klient
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Kui mitu Hinnakujundusreeglid jätkuvalt ülekaalus, kasutajate palutakse määrata prioriteedi käsitsi lahendada konflikte."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Loo Ostutellimuste
 ,Purchase Register,Ostu Registreeri
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Kohaldatavate tasudega
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) peab olema roll &quot;Leave Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Sõidukite kuupäev
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Põhjus kaotada
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Põhjus kaotada
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Kaabli omanik ei saa olla sama Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Eraldatud summa ei ole suurem kui korrigeerimata summa
 DocType: Announcement,Receiver,vastuvõtja
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kogus ja hind
 DocType: Delivery Note,% Installed,% Paigaldatud
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klassiruumid / Laboratories jne, kus loenguid saab planeeritud."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pakkuja&gt; Pakkuja tüüp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Palun sisesta ettevõtte nimi esimene
 DocType: Purchase Invoice,Supplier Name,Tarnija nimi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Loe ERPNext Käsitsi
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Vana Parent
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Kohustuslik väli - Academic Year
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Kohanda sissejuhatavat teksti, mis läheb osana, et e-posti. Iga tehing on eraldi sissejuhatavat teksti."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Määrake vaikimisi makstakse kontole ettevõtte {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global seaded kõik tootmisprotsessid.
 DocType: Accounts Settings,Accounts Frozen Upto,Kontod Külmutatud Upto
 DocType: SMS Log,Sent On,Saadetud
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Oskus {0} valitakse mitu korda atribuudid Table
 DocType: HR Settings,Employee record is created using selected field. ,"Töötaja rekord on loodud, kasutades valitud valdkonnas."
 DocType: Sales Order,Not Applicable,Ei kasuta
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday kapten.
 DocType: Request for Quotation Item,Required Date,Vajalik kuupäev
 DocType: Delivery Note,Billing Address,Arve Aadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Palun sisestage Kood.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Palun sisestage Kood.
 DocType: BOM,Costing,Kuluarvestus
 DocType: Tax Rule,Billing County,Arved County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",Märkimise korral on maksusumma loetakse juba lisatud Prindi Hinda / Print summa
@@ -500,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Siit Package No.
 DocType: Item Attribute,To Range,Vahemik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Väärtpaberitesse ja hoiustesse
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ei saa muuta hindamismeetod, kuna seal on tehingute vastu mõned kirjed, mis ei ole ta enda hindamismeetodi"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kokku lehed eraldatud on kohustuslik
 DocType: Job Opening,Description of a Job Opening,Kirjeldus töökoht
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kuni tegevusi täna
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Haldusspetsialist
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Palun valige Course
 DocType: Timesheet Detail,Hrs,tundi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Palun valige Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Palun valige Company
 DocType: Stock Entry Detail,Difference Account,Erinevus konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ei saa sulgeda ülesanne oma sõltuvad ülesande {0} ei ole suletud.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Palun sisestage Warehouse, mille materjal taotlus tõstetakse"
 DocType: Production Order,Additional Operating Cost,Täiendav töökulud
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmeetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Ühendamine, järgmised omadused peavad olema ühesugused teemad"
 DocType: Shipping Rule,Net Weight,Netokaal
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ostma
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Palun määratleda hinne Threshold 0%
 DocType: Sales Order,To Deliver,Andma
 DocType: Purchase Invoice Item,Item,Kirje
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Seerianumber objekt ei saa olla osa
 DocType: Journal Entry,Difference (Dr - Cr),Erinevus (Dr - Cr)
 DocType: Account,Profit and Loss,Kasum ja kahjum
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Tegevjuht Alltöövõtt
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kasvamine ei saa olla 0
 DocType: Production Planning Tool,Material Requirement,Materjal nõue
 DocType: Company,Delete Company Transactions,Kustuta tehingutes
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Viitenumber ja viited kuupäev on kohustuslik Bank tehingu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Klienditeenindus Lisa / uuenda maksud ja tasud
 DocType: Purchase Invoice,Supplier Invoice No,Tarnija Arve nr
 DocType: Territory,For reference,Sest viide
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Paigaldamine Märkus Punkt
 DocType: Production Plan Item,Pending Qty,Kuni Kogus
 DocType: Budget,Ignore,Ignoreerima
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ei ole aktiivne
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ei ole aktiivne
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS saadetakse järgmised numbrid: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup check mõõtmed trükkimiseks
 DocType: Salary Slip,Salary Slip Timesheet,Palgatõend Töögraafik
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Kokku Komisjoni
 DocType: Pricing Rule,Sales Partner,Müük Partner
 DocType: Buying Settings,Purchase Receipt Required,Ostutšekk Vajalikud
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Hindamine Rate on kohustuslik, kui algvaru sisestatud"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Salvestusi ei leitud Arvel tabelis
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Palun valige Company Pidu ja Type esimene
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / eelarveaastal.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kogunenud väärtused
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Vabandame, Serial nr saa liita"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Tee Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Tee Sales Order
 DocType: Project Task,Project Task,Projekti töörühma
 ,Lead Id,Plii Id
 DocType: C-Form Invoice Detail,Grand Total,Üldtulemus
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Jätka Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Korrake klientidele
 DocType: Leave Control Panel,Allocate,Eraldama
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Müügitulu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Müügitulu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Märkus: Kokku eraldatakse lehed {0} ei tohiks olla väiksem kui juba heaks lehed {1} perioodiks
 DocType: Announcement,Posted By,postitas
 DocType: Item,Delivered by Supplier (Drop Ship),Andis Tarnija (Drop Laev)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Tsitaat
 DocType: Lead,Middle Income,Keskmise sissetulekuga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Avamine (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Vaikimisi mõõtühik Punkt {0} ei saa muuta otse, sest teil on juba mõned tehingu (te) teise UOM. Te peate looma uue Punkt kasutada erinevaid vaikimisi UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Eraldatud summa ei saa olla negatiivne
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Määrake Company
 DocType: Purchase Order Item,Billed Amt,Arve Amt
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Müügiarve Töögraafik
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Viitenumber &amp; Reference kuupäev on vajalik {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Vali Maksekonto teha Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Loo töötaja kirjete haldamiseks lehed, kulu nõuete ja palgaarvestuse"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lisa teabebaasi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Ettepanek kirjutamine
 DocType: Payment Entry Deduction,Payment Entry Deduction,Makse Entry mahaarvamine
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ei eelarveaastal {2}
 DocType: Buying Settings,Settings for Buying Module,Seaded ostmine Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} ei kuulu firma {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Palun sisestage ostutšeki esimene
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Palun sisestage ostutšeki esimene
 DocType: Buying Settings,Supplier Naming By,Tarnija nimetamine By
 DocType: Activity Type,Default Costing Rate,Vaikimisi ületaksid
 DocType: Maintenance Schedule,Maintenance Schedule,Hoolduskava
-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.","Siis Hinnakujundusreeglid on välja filtreeritud põhineb kliendi, kliendi nimel, Territory, Tarnija, Tarnija tüüp, kampaania, Sales Partner jms"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Siis Hinnakujundusreeglid on välja filtreeritud põhineb kliendi, kliendi nimel, Territory, Tarnija, Tarnija tüüp, kampaania, Sales Partner jms"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Net muutus Varude
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Töötaja Laenu juhtimine
 DocType: Employee,Passport Number,Passi number
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Seos Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Juhataja
 DocType: Payment Entry,Payment From / To,Makse edasi / tagasi
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Kuupäevavahemik
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uus krediidilimiit on alla praeguse tasumata summa kliendi jaoks. Krediidilimiit peab olema atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Sama objekt on kantud mitu korda.
 DocType: SMS Settings,Receiver Parameter,Vastuvõtja Parameeter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Tuleneb"" ja ""Grupeeri alusel"" ei saa olla sama"
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,Minutiga
 DocType: Issue,Resolution Date,Resolutsioon kuupäev
 DocType: Student Batch Name,Batch Name,partii Nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Töögraafik on loodud:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Töögraafik on loodud:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Palun määra vaikimisi Raha või pangakonto makseviis {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,registreerima
 DocType: Selling Settings,Customer Naming By,Kliendi nimetamine By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Näitab õpilase kui Praegused Student Kuu osavõtt aruanne
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Tegelik Start Time
 DocType: BOM Operation,Operation Time,Operation aeg
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,lõpp
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,alus
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,alus
 DocType: Timesheet,Total Billed Hours,Kokku Maksustatakse Tundi
 DocType: Journal Entry,Write Off Amount,Kirjutage Off summa
 DocType: Journal Entry,Bill No,Bill pole
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Student osavõtt
 DocType: Sales Invoice Timesheet,Time Sheet,ajaandmik
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush tooraine põhineb
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Palun sisestage kirje üksikasjad
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Palun sisestage kirje üksikasjad
 DocType: Interest,Interest,huvi
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Müügieelne
 DocType: Purchase Receipt,Other Details,Muud andmed
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Makse Entry juba loodud
 DocType: Purchase Receipt Item Supplied,Current Stock,Laoseis
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Rida # {0}: Asset {1} ei ole seotud Punkt {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Eelvaade palgatõend
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Eelvaade palgatõend
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} on sisestatud mitu korda
 DocType: Account,Expenses Included In Valuation,Kulud sisalduvad Hindamine
 DocType: Hub Settings,Seller City,Müüja City
 ,Absent Student Report,Puudub Student Report
 DocType: Email Digest,Next email will be sent on:,Järgmine email saadetakse edasi:
 DocType: Offer Letter Term,Offer Letter Term,Paku kiri Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Punkt on variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Punkt on variante.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Punkt {0} ei leitud
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Ettevõte {0} ei ole olemas
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kogus Tarbitud Per Unit
 DocType: Serial No,Warranty Expiry Date,Garantii Aegumisaja
 DocType: Material Request Item,Quantity and Warehouse,Kogus ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),Komisjoni Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Määrake nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Palun valige Program
 DocType: Project,Estimated Cost,Hinnanguline maksumus
 DocType: Purchase Order,Link to material requests,Link materjali taotlusi
@@ -753,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ei ole laos toode
 DocType: Mode of Payment Account,Default Account,Vaikimisi konto
 DocType: Payment Entry,Received Amount (Company Currency),Saadud summa (firma Valuuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Plii tuleb määrata, kui võimalus on valmistatud Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Palun valige iganädalane off päev
 DocType: Production Order Operation,Planned End Time,Planeeritud End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Dispersioon Punkt Group-Wise
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,Opportunity From
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kuupalga avalduse.
 DocType: BOM,Website Specifications,Koduleht erisused
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numbrite seeria osavõtt Setup&gt; numbrite seeria
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: From {0} tüüpi {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor on kohustuslik
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Project
 DocType: Quality Inspection Reading,Reading 7,Lugemine 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,osaliselt järjestatud
 DocType: Expense Claim Detail,Expense Claim Type,Kuluhüvitussüsteeme Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Vaikimisi seaded Ostukorv
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset lammutatakse kaudu päevikusissekanne {0}
@@ -810,14 +815,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnoloogia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Büroo ülalpidamiskulud
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Seadistamine e-posti konto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Palun sisestage Punkt esimene
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Palun sisestage Punkt esimene
 DocType: Account,Liability,Vastutus
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktsioneeritud summa ei või olla suurem kui nõude summast reas {0}.
 DocType: Company,Default Cost of Goods Sold Account,Vaikimisi müüdud toodangu kulu konto
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Hinnakiri ole valitud
 DocType: Employee,Family Background,Perekondlik taust
 DocType: Request for Quotation Supplier,Send Email,Saada E-
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Hoiatus: Vigane Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ei Luba
 DocType: Company,Default Bank Account,Vaikimisi Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtreerida põhineb Party, Party Tüüp esimene"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ükski töötaja leitud
 DocType: Supplier Quotation,Stopped,Peatatud
 DocType: Item,If subcontracted to a vendor,Kui alltöövõtjaks müüja
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Group on juba uuendatud.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Group on juba uuendatud.
 DocType: SMS Center,All Customer Contact,Kõik Kliendi Kontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Laadi laoseisu kaudu csv.
 DocType: Warehouse,Tree Details,Tree detailid
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimaalne Arve summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} ei kuulu Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Konto {2} ei saa olla Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} &quot;tabelis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {DOCNAME} ei eksisteeri eespool {doctype} &quot;tabelis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Töögraafik {0} on juba lõpetatud või tühistatud
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei ülesanded
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Päeval kuule auto arve genereeritakse nt 05, 28 jne"
 DocType: Asset,Opening Accumulated Depreciation,Avamine akumuleeritud kulum
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,Libisev keskmine hind
 DocType: Production Planning Tool,Select Items,Vali kaubad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} vastu Bill {1} dateeritud {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursuse ajakava
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursuse ajakava
 DocType: Maintenance Visit,Completion Status,Lõpetamine staatus
 DocType: HR Settings,Enter retirement age in years,Sisesta pensioniiga aastat
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Laske üle väljasaatmisel või vastuvõtmisel upto see protsenti
 DocType: Stock Entry,STE-,STE
 DocType: Upload Attendance,Import Attendance,Import Osavõtt
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Kõik Punkt Groups
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kõik Punkt Groups
 DocType: Process Payroll,Activity Log,Activity Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto kasum / kahjum
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaatselt kirjutada sõnumi esitamise tehingud.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ostutellimuse maksmine
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Kavandatav Kogus
 DocType: Sales Invoice,Payment Due Date,Maksetähtpäevast
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Punkt Variant {0} on juba olemas sama atribuute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Avamine&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avatud teha
 DocType: Notification Control,Delivery Note Message,Toimetaja märkus Message
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Kogus
 DocType: Leave Block List Date,Leave Block List Date,Jäta Block loetelu kuupäev
 DocType: Pricing Rule,Price or Discount,Hind või Soodus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Kokku kohaldatavate tasude kohta ostutšekk Esemed tabel peab olema sama Kokku maksud ja tasud
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Kokku kohaldatavate tasude kohta ostutšekk Esemed tabel peab olema sama Kokku maksud ja tasud
 DocType: Sales Team,Incentives,Soodustused
 DocType: SMS Log,Requested Numbers,Taotletud numbrid
 DocType: Production Planning Tool,Only Obtain Raw Materials,Saada ainult tooraine
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Alltöödena
 DocType: Item Attribute,Item Attribute Values,Punkt atribuudi väärtusi
 DocType: Examination Result,Examination Result,uurimistulemus
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Ostutšekk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Ostutšekk
 ,Received Items To Be Billed,Saadud objekte arve
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Esitatud palgalehed
 DocType: Employee,Ms,Prl
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valuuta vahetuskursi kapten.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Viide DOCTYPE peab olema üks {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Viide DOCTYPE peab olema üks {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Ei leia Time Slot järgmisel {0} päeva Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materjali sõlmed
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Müük Partnerid ja territoorium
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Ei saa automaatselt luua konto, kui on juba laos tasakaalu konto. Peate looma sobitamine kontole enne saate teha kanne selle lattu"
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,Vaikimisi on tasulised kontod
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Töötaja {0} ei ole aktiivne või ei ole olemas
 DocType: Fee Structure,Components,komponendid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Punkt variandid {0} uuendatud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Palun sisesta Põhivarakategoori punktis {0}
 DocType: Quality Inspection Reading,Reading 6,Lugemine 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Ei saa {0} {1} {2} ilma negatiivse tasumata arve
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ostuarve Advance
 DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit kirjet ei saa siduda koos {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,Kas Ostu toode
 DocType: Asset,Purchase Invoice,Ostuarve
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Ei
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Uus müügiarve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Uus müügiarve
 DocType: Stock Entry,Total Outgoing Value,Kokku Väljuv Value
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Avamine ja lõpu kuupäev peaks jääma sama Fiscal Year
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Avamine ja lõpu kuupäev peaks jääma sama Fiscal Year
 DocType: Lead,Request for Information,Teabenõue
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline arved
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline arved
 DocType: Payment Request,Paid,Makstud
 DocType: Program Fee,Program Fee,program Fee
 DocType: Salary Slip,Total in words,Kokku sõnades
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,sanktsioneeritud
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,on kohustuslik. Ehk Valuutavahetus rekord ei ole loodud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Palun täpsustage Serial No Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Sest &quot;Toote Bundle esemed, Warehouse, Serial No ja partii ei loetakse alates&quot; Pakkeleht &quot;tabelis. Kui Lao- ja partii ei on sama kõigi asjade pakkimist tahes &quot;Toote Bundle&quot; kirje, need väärtused võivad olla kantud põhi tabeli väärtused kopeeritakse &quot;Pakkeleht&quot; tabelis."
 DocType: Job Opening,Publish on website,Avaldab kodulehel
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Saadetised klientidele.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Tarnija Arve kuupäev ei saa olla suurem kui Postitamise kuupäev
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Dispersioon
 ,Company Name,firma nimi
 DocType: SMS Center,Total Message(s),Kokku Sõnum (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Vali toode for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Vali toode for Transfer
 DocType: Purchase Invoice,Additional Discount Percentage,Täiendav allahindlusprotsendi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Vaata nimekirja kõigi abiga videod
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Select konto juht pank, kus check anti hoiule."
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: tasumises Müük / Ostutellimuse peaks alati olema märgistatud varem
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Keemilised
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Vaikimisi Bank / arvelduskontole uuendatakse automaatselt sisse palk päevikusissekanne kui see režiim on valitud.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallid Hinne Kood {0} kattub hinne intervallidega teised klassid. Palun kontrollige intervallidega {0} ja {1} ja proovi uuesti
 DocType: BOM,Raw Material Cost(Company Currency),Tooraine hind (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Kõik esemed on juba üle selle tootmine Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Row # {0}: Rate ei saa olla suurem kui määr, mida kasutatakse {1} {2}"
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,Bom Koduleht toode
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Laadi üles oma kirjas pea ja logo. (seda saab muuta hiljem).
 DocType: Timesheet Detail,Bill,arve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Järgmine kulum kuupäev on sisestatud viimase kuupäeva
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Valge
 DocType: SMS Center,All Lead (Open),Kõik Plii (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rida {0}: Kogus ole saadaval {4} laos {1} postitama aeg kanne ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Saa makstud ettemaksed
 DocType: Item,Automatically Create New Batch,Automaatselt Loo uus partii
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Tee
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Tee
 DocType: Student Admission,Admission Start Date,Sissepääs Start Date
 DocType: Journal Entry,Total Amount in Words,Kokku summa sõnadega
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Seal oli viga. Üks tõenäoline põhjus võib olla, et sa ei ole salvestatud kujul. Palun võtke ühendust support@erpnext.com kui probleem ei lahene."
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tellimus tüüp peab olema üks {0}
 DocType: Lead,Next Contact Date,Järgmine Kontakt kuupäev
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Avamine Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Palun sisesta konto muutuste summa
 DocType: Student Batch Name,Student Batch Name,Student Partii Nimi
 DocType: Holiday List,Holiday List Name,Holiday nimekiri nimi
 DocType: Repayment Schedule,Balance Loan Amount,Tasakaal Laenusumma
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Palun täpsusta {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eemaldatud esemed ei muutu kogus või väärtus.
 DocType: Delivery Note,Delivery To,Toimetaja
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Oskus tabelis on kohustuslik
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Oskus tabelis on kohustuslik
 DocType: Production Planning Tool,Get Sales Orders,Võta müügitellimuste
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei tohi olla negatiivne
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Soodus
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Soodus
 DocType: Asset,Total Number of Depreciations,Kokku arv Amortisatsiooniaruanne
 DocType: Sales Invoice Item,Rate With Margin,Määra Margin
 DocType: Workstation,Wages,Palgad
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserveeritud Warehouse Sales Order / valmistoodang Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Müügi summa
 DocType: Repayment Schedule,Interest Amount,Intressisummat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Olete kulul Approver selle kirje. Palun uuendage &quot;Status&quot; ja Save
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Olete kulul Approver selle kirje. Palun uuendage &quot;Status&quot; ja Save
 DocType: Serial No,Creation Document No,Loomise dokument nr
 DocType: Issue,Issue,Probleem
 DocType: Asset,Scrapped,lammutatakse
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atribuudid Punkt variandid. näiteks suuruse, värvi jne"
 DocType: Purchase Invoice,Returns,tulu
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} on alla hooldusleping upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,värbamine
 DocType: Lead,Organization Name,Organisatsiooni nimi
 DocType: Tax Rule,Shipping State,Kohaletoimetamine riik
 ,Projected Quantity as Source,Planeeritav kogus nagu Allikas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Punkt tuleb lisada, kasutades &quot;Võta Kirjed Ostutšekid&quot; nuppu"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Kaasa mitte laos toodet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Müügikulud
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,Vastu
 DocType: Item,Default Selling Cost Center,Vaikimisi müügikulude Center
 DocType: Sales Partner,Implementation Partner,Rakendamine Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postiindeks
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postiindeks
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} on {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock kanded
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} tulemused
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} tulemused
 DocType: Item,Default Supplier,Vaikimisi Tarnija
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üle Tootmise toetus protsent
 DocType: Employee Loan,Repayment Schedule,maksegraafikut
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Võta Weekly Off kuupäevad
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date saa olla väiksem kui alguskuupäev
 DocType: Sales Person,Select company name first.,Vali firma nimi esimesena.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tsitaadid Hankijatelt.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskmine vanus
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vedu
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Vale Oskus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} tuleb esitada
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} tuleb esitada
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kogus peab olema väiksem või võrdne {0}
 DocType: SMS Center,Total Characters,Kokku Lõbu
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Palun valige Bom Bom valdkonnas Punkt {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,Edasimüüja
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Ostukorv kohaletoimetamine reegel
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Tootmine Tellimus {0} tuleb tühistada enne tühistades selle Sales Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Palun määra &quot;Rakenda Täiendav soodustust&quot;
 ,Ordered Items To Be Billed,Tellitud esemed arve
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Siit Range peab olema väiksem kui levikuala
 DocType: Global Defaults,Global Defaults,Global Vaikeväärtused
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Aasta
 DocType: Purchase Invoice,Start date of current invoice's period,Arve makseperioodi alguskuupäev
 DocType: Salary Slip,Leave Without Pay,Palgata puhkust
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Capacity Planning viga
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Capacity Planning viga
 ,Trial Balance for Party,Trial Balance Party
 DocType: Lead,Consultant,Konsultant
 DocType: Salary Slip,Earnings,Tulu
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","See on lisatud Kood variandi. Näiteks, kui teie lühend on &quot;SM&quot;, ning objekti kood on &quot;T-särk&quot;, kirje kood variant on &quot;T-särk SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Netopalk (sõnadega) ilmuvad nähtavale kui salvestate palgatõend.
 DocType: Purchase Invoice,Is Return,Kas Tagasi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Tagasi / võlateate
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Tagasi / võlateate
 DocType: Price List Country,Price List Country,Hinnakiri Riik
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} kehtiv serial-numbrid Punkt {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Palun sisesta Kood saada Partii number
 DocType: Stock Settings,Default Item Group,Vaikimisi Punkt Group
 DocType: Employee Loan,Partially Disbursed,osaliselt Väljastatud
-DocType: Grading Structure,Grading System Name,Hindamissüsteem Nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tarnija andmebaasis.
 DocType: Account,Balance Sheet,Eelarve
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Kulude Keskus eseme Kood &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Makserežiimi ei ole seadistatud. Palun kontrollige, kas konto on seadistatud režiim maksed või POS profiili."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Teie müügi isik saab meeldetuletus sellest kuupäevast ühendust kliendi
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama objekt ei saa sisestada mitu korda.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Lisaks kontod saab rühma all, kuid kanded saab teha peale mitte-Groups"
@@ -1183,7 +1184,7 @@
 ,Purchase Order Items To Be Billed,Ostutellimuse punkte arve
 DocType: Purchase Invoice Item,Net Rate,Efektiivne intressimäär
 DocType: Purchase Invoice Item,Purchase Invoice Item,Ostuarve toode
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger kanded ja GL kanded on edasi saata valitud Ostutšekid
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger kanded ja GL kanded on edasi saata valitud Ostutšekid
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punkt 1
 DocType: Holiday,Holiday,Puhkus
 DocType: Support Settings,Close Issue After Days,Sule Issue Pärast päevi
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Töö
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Palun täpsustage vähemalt üks atribuut atribuudid tabelis
 DocType: Announcement,All Students,Kõik õpilased
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Punkt {0} peab olema mitte-laoartikkel
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vaata Ledger
 DocType: Grading Scale,Intervals,intervallid
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Esimesed
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Elemendi Group olemas sama nimega, siis muuda objekti nimi või ümber nimetada elemendi grupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobiilne No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Ülejäänud maailm
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Artiklite {0} ei ole partii
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Palga alates {0} kuni {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ei ole lubatud muuta külmutatud Konto {0}
 DocType: Journal Entry,Get Outstanding Invoices,Võta Tasumata arved
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} ei ole kehtiv
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Ostutellimuste aidata teil planeerida ja jälgida oma ostud
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Vabandame, ettevõtted ei saa liita"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kogu Issue / Transfer koguse {0} Material taotlus {1} \ saa olla suurem kui nõutud koguse {2} jaoks Punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Väike
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Kaudsed kulud
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Kogus on kohustuslikuks
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Põllumajandus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master andmed
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master andmed
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Oma tooteid või teenuseid
 DocType: Mode of Payment,Mode of Payment,Makseviis
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Koduleht Pilt peaks olema avalik faili või veebilehe URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,See on ülemelemendile rühma ja seda ei saa muuta.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,Group Roll arv
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Sest {0}, ainult krediitkaardi kontod võivad olla seotud teise vastu deebetkanne"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kokku kõigi ülesanne kaalu peaks 1. Palun reguleerida kaalu kõikide Project ülesandeid vastavalt
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Toimetaja märkus {0} ei ole esitatud
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Punkt {0} peab olema allhanked toode
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital seadmed
-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.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnakujundus Reegel on esimene valitud põhineb &quot;Rakenda On väljale, mis võib olla Punkt punkt Group või kaubamärgile."
 DocType: Hub Settings,Seller Website,Müüja Koduleht
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Kokku eraldatakse protsent müügimeeskond peaks olema 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Tootmine Tellimuse staatus on {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Tootmine Tellimuse staatus on {0}
 DocType: Appraisal Goal,Goal,Eesmärk
 DocType: Sales Invoice Item,Edit Description,Edit kirjeldus
 ,Team Updates,Team uuendused
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Tarnija
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Setting Konto tüüp aitab valides selle konto tehingud.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (firma Valuuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Loo Print Format
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,Päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} objekte pooleli
 DocType: Workstation,Workstation Name,Workstation nimi
-DocType: Grade Interval,Grade Code,Hinne kood
+DocType: Grading Scale Interval,Grade Code,Hinne kood
 DocType: POS Item Group,POS Item Group,POS Artikliklasside
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Saatke Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Bom {0} ei kuulu Punkt {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Riistvara
 DocType: Sales Order,Recurring Upto,korduvad Upto
 DocType: Attendance,HR Manager,personalijuht
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Palun valige Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Palun valige Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Tarnija Arve kuupäev
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sa pead lubama Ostukorv
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Toit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vananemine Range 3
 DocType: Maintenance Schedule Item,No of Visits,No visiit
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark kohalolijate
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark kohalolijate
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Hoolduskava {0} on olemas vastu {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,registreerimisega üliõpilane
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuuta sulgemise tuleb arvesse {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa võrra kõik eesmärgid peaksid olema 100. On {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Keskm Daily Väljuv
 DocType: POS Profile,Campaign,Kampaania
 DocType: Supplier,Name and Type,Nimi ja tüüp
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Nõustumisstaatus tuleb &quot;Kinnitatud&quot; või &quot;Tõrjutud&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Nõustumisstaatus tuleb &quot;Kinnitatud&quot; või &quot;Tõrjutud&quot;
 DocType: Purchase Invoice,Contact Person,Kontaktisik
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Oodatud Start Date&quot; ei saa olla suurem kui &quot;Oodatud End Date&quot;
 DocType: Course Scheduling Tool,Course End Date,Muidugi End Date
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,Kohaletoimetamine Aadress Nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontoplaan
 DocType: Material Request,Terms and Conditions Content,Tingimused sisu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ei saa olla üle 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ei saa olla üle 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Punkt {0} ei ole laos toode
 DocType: Maintenance Visit,Unscheduled,Plaaniväline
 DocType: Employee,Owned,Omanik
 DocType: Salary Detail,Depends on Leave Without Pay,Oleneb palgata puhkust
 DocType: Pricing Rule,"Higher the number, higher the priority","Suurem arv, seda suurem on prioriteet"
 ,Purchase Invoice Trends,Ostuarve Trends
 DocType: Employee,Better Prospects,Paremad väljavaated
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: Portsjoni {1} omab ainult {2} tk. Palun valige mõni teine partii, mis on {3} Kogus kättesaadav või jagada järjest mitmeks rida, et pakkuda / küsimust mitmed partiid"
 DocType: Vehicle,License Plate,Numbrimärk
 DocType: Appraisal,Goals,Eesmärgid
 DocType: Warranty Claim,Warranty / AMC Status,Garantii / AMC staatus
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Töötaja ei saa aru ise.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Kui konto on külmutatud, kanded on lubatud piiratud kasutajatele."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Raamatupidamine kirjet {0} {1} saab teha ainult valuuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Ametijuhendite, nõutav kvalifikatsioon jms"
 DocType: Journal Entry Account,Account Balance,Kontojääk
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Maksu- reegli tehingud.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näita sulgemata eelarve aasta P &amp; L saldod
 DocType: Shipping Rule,Shipping Account,Laevandus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Konto {2} ei ole aktiivne
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Tee müügitellimuste aitavad teil planeerida oma tööd ja täitma-time
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Tee müügitellimuste aitavad teil planeerida oma tööd ja täitma-time
 DocType: Quality Inspection,Readings,Näidud
 DocType: Stock Entry,Total Additional Costs,Kokku Lisakulud
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,Hindama
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Allikas lattu on kohustuslik rida {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakkesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakkesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS gateway seaded
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ebaõnnestus!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,Teenused
 DocType: HR Settings,Email Salary Slip to Employee,E palgatõend töötajate
 DocType: Cost Center,Parent Cost Center,Parent Cost Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Vali Võimalik Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Vali Võimalik Tarnija
 DocType: Sales Invoice,Source,Allikas
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näita suletud
 DocType: Leave Type,Is Leave Without Pay,Kas palgata puhkust
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Põhivarakategoori on kohustuslik põhivara objektile
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Salvestusi ei leitud Makseinfo tabelis
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},See {0} konflikte {1} jaoks {2} {3}
 DocType: Student Attendance Tool,Students HTML,õpilased HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,Lahkumise kuupäev
 DocType: Pricing Rule,For Price List,Sest hinnakiri
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Loo Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Loo Leads
 DocType: Maintenance Schedule,Schedules,Sõiduplaanid
 DocType: Purchase Invoice Item,Net Amount,Netokogus
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Ei
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,programm sooviavaldused
 DocType: Sales Invoice Item,Brand Name,Brändi nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Üksikasjad
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Vaikimisi ladu valimiseks on vaja kirje
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,võimalik Tarnija
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,võimalik Tarnija
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisatsioon
 DocType: Budget,Monthly Distribution,Kuu Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Vastuvõtja nimekiri on tühi. Palun luua vastuvõtja loetelu
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,Müük Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimaalne laenusumma
 DocType: Pricing Rule,Pricing Rule,Hinnakujundus reegel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicate valtsi arvu üliõpilaste {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicate valtsi arvu üliõpilaste {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Action, kui aastane eelarve ületatud"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materjal Ostusoov Telli
 DocType: Shopping Cart Settings,Payment Success URL,Makse Edu URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,tagasimaksmine meetod
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Märkimise korral Kodulehekülg on vaikimisi Punkt Group kodulehel
 DocType: Quality Inspection Reading,Reading 4,Lugemine 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Vaikimisi Bom {0} ei leitud Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Vaikimisi Bom {0} ei leitud Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nõuded firma kulul.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Õpilased on keskmes süsteem, lisada kõik oma õpilasi"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Õpilased on keskmes süsteem, lisada kõik oma õpilasi"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rida # {0} kliirens kuupäeva {1} ei saa enne tšeki kuupäev {2}
 DocType: Company,Default Holiday List,Vaikimisi Holiday nimekiri
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rida {0}: From ajal ja aeg {1} kattub {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päev (ad), millal te taotlete puhkuse puhkepäevadel. Sa ei pea taotlema puhkust."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Saada uuesti Makse Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Uus ülesanne
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Tee Tsitaat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Tee Tsitaat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Teised aruanded
 DocType: Dependent Task,Dependent Task,Sõltub Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Muundustegurit Vaikemõõtühik peab olema 1 rida {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Jäta tüüpi {0} ei saa olla pikem kui {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Proovige plaanis operatsioonide X päeva ette.
 DocType: HR Settings,Stop Birthday Reminders,Stopp Sünnipäev meeldetuletused
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Palun määra Vaikimisi palgaarvestuse tasulised konto Company {0}
 DocType: SMS Center,Receiver List,Vastuvõtja loetelu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Otsi toode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Otsi toode
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tarbitud
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net muutus Cash
 DocType: Assessment Plan,Grading Scale,hindamisskaala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,juba lõpetatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mõõtühik {0} on kantud rohkem kui üks kord Conversion Factor tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,juba lõpetatud
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksenõudekäsule juba olemas {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kulud Väljastatud Esemed
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Kogus ei tohi olla rohkem kui {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Tee väljamakse Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance vastu Tarnija tuleb debiteerida
 DocType: Company,Default Values,Vaikeväärtused
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Sageduse} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Hüvitatud kogusummast
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,See põhineb palke vastu Vehicle. Vaata ajakava allpool lähemalt
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Koguma
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Vastu Tarnija Arve {0} dateeritud {1}
 DocType: Customer,Default Price List,Vaikimisi hinnakiri
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Liikumine rekord {0} loodud
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Sa ei saa kustutada eelarveaastal {0}. Eelarveaastal {0} on määratud vaikimisi Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kliendi kreeditjääk
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,hankimine
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ükski esemed on mingeid muutusi kogus või väärtus.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Kohustuslik väli - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantiinõudest
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantiinõudest
 ,Lead Details,Plii Üksikasjad
 DocType: Salary Slip,Loan repayment,laenu tagasimaksmine
 DocType: Purchase Invoice,End date of current invoice's period,Lõppkuupäev jooksva arve on periood
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,püsiaadress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Ettemaks, vastase {0} {1} ei saa olla suurem \ kui Grand Total {2}"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Palun valige objekti kood
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Palun valige objekti kood
 DocType: Student Sibling,Studying in Same Institute,Õppimine Sama Instituut
 DocType: Territory,Territory Manager,Territoorium Manager
 DocType: Packed Item,To Warehouse (Optional),Et Warehouse (valikuline)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Paide summa (firma Valuuta)
 DocType: Purchase Invoice,Additional Discount,Täiendav Soodus
 DocType: Selling Settings,Selling Settings,Müük Seaded
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vaata Ostukorv
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Turundus kulud
 ,Item Shortage Report,Punkt Puuduse aruanne
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Kaal on mainitud, \ nKui mainida &quot;Kaal UOM&quot; liiga"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materjal taotlus kasutatakse selle Stock Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Järgmine kulum kuupäev on kohustuslik uus vara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Järgmine kulum kuupäev on kohustuslik uus vara
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Eraldi muidugi põhineb Group iga partii
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single üksuse objekt.
 DocType: Fee Category,Fee Category,Fee Kategooria
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Cost Center on vajalik kasumi ja kahjumi &quot;kontole {2}. Palun luua vaikimisi Cost Center for Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kliendi&gt; Kliendi Group&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Kliendi Group olemas sama nimega siis muuta kliendi nimi või ümber Kliendi Group
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,New Contact
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Lugemine 2
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,Punkt tark Sales Registreeri
 DocType: Asset,Gross Purchase Amount,Gross ostusumma
 DocType: Asset,Depreciation Method,Amortisatsioonimeetod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,See sisaldab käibemaksu Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Kokku Target
 DocType: Program Course,Required,nõutav
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Leppimine JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Liiga palju veerge. Eksport aruande ja printida tabelarvutuse rakenduse.
 DocType: Purchase Invoice Item,Batch No,Partii ei
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ei leia vahetuskursi {0} kuni {1} võti kuupäeva {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Laske mitu müügitellimuste vastu Kliendi ostutellimuse
 DocType: Student Group Instructor,Student Group Instructor,Student Group juhendaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Määra eesliide numeratsiooni seeria oma tehingute
 DocType: Employee Attendance Tool,Employees HTML,Töötajad HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Vaikimisi Bom ({0}) peab olema aktiivne selle objekt või selle malli
 DocType: Employee,Leave Encashed?,Jäta realiseeritakse?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity From väli on kohustuslik
 DocType: Email Digest,Annual Expenses,Aastane kulu
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Tee Ostutellimuse
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Tee Ostutellimuse
 DocType: SMS Center,Send To,Saada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ei ole piisavalt puhkust tasakaalu Jäta tüüp {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Eraldatud summa
@@ -1733,17 +1734,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kliendi Kood
 DocType: Stock Reconciliation,Stock Reconciliation,Stock leppimise
 DocType: Territory,Territory Name,Territoorium nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Lõpetamata Progress Warehouse on vaja enne Esita
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Taotleja tööd.
 DocType: Purchase Order Item,Warehouse and Reference,Lao- ja seletused
 DocType: Supplier,Statutory info and other general information about your Supplier,Kohustuslik info ja muud üldist infot oma Tarnija
 DocType: Item,Serial Nos and Batches,Serial Nos ning partiid
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Student Group Tugevus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Vastu päevikusissekanne {0} ei ole mingit tasakaalustamata {1} kirje
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,hindamisest
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serial No sisestatud Punkt {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Tingimuseks laevandus reegel
-DocType: Grading Structure,Grading Intervals,Grading intervallid
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Palun sisesta
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",Ei saa liigtasu eest Oksjoni {0} järjest {1} rohkem kui {2}. Et võimaldada üle-arvete määrake ostmine Seaded
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Palun määra filter põhineb toode või Warehouse
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Bom {0} tuleb esitada
 DocType: Authorization Control,Authorization Control,Autoriseerimiskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: lükata Warehouse on kohustuslik vastu rahuldamata Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Makse
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Manage oma korraldusi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Makse
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Manage oma korraldusi
 DocType: Production Order Operation,Actual Time and Cost,Tegelik aeg ja maksumus
 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},Materjal Request maksimaalselt {0} ei tehta Punkt {1} vastu Sales Order {2}
 DocType: Employee,Salutation,Tervitus
 DocType: Course,Course Abbreviation,muidugi lühend
 DocType: Student Leave Application,Student Leave Application,Student Jäta ostusoov
 DocType: Item,Will also apply for variants,Kehtib ka variandid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vara ei saa tühistada, sest see on juba {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Töötaja {0} on Half päeval {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Kokku tööaeg ei tohi olla suurem kui max tööaeg {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,edasi
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle esemed müümise ajal.
 DocType: Quotation Item,Actual Qty,Tegelik Kogus
 DocType: Sales Invoice Item,References,Viited
@@ -1775,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Te olete sisenenud eksemplaris teemad. Palun paranda ja proovige uuesti.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset liikumine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,uus ostukorvi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,uus ostukorvi
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Punkt {0} ei ole seeriasertide toode
 DocType: SMS Center,Create Receiver List,Loo vastuvõtja loetelu
 DocType: Vehicle,Wheels,rattad
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Keelab loomise aeg palke vastu Tootmistellimused. Operations ei jälgita vastu Production Telli
 DocType: Student,Student Mobile Number,Student Mobile arv
 DocType: Item,Has Variants,Omab variandid
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Olete juba valitud objektide {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nimi Kuu Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partii nr on kohustuslik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partii nr on kohustuslik
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Korduvad Arve
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektide juhtimisel
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,Eelarveaasta
 DocType: Vehicle Log,Fuel Price,kütuse hind
 DocType: Budget,Budget,Eelarve
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Põhivara objektile peab olema mitte-laoartikkel.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Eelarve ei saa liigitada vastu {0}, sest see ei ole tulu või kuluna konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Saavutatud
 DocType: Student Admission,Application Form Route,Taotlusvormi Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territoorium / Klienditeenindus
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territoorium / Klienditeenindus
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,nt 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Jäta tüüp {0} ei saa jaotada, sest see on palgata puhkust"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Eraldatud summa {1} peab olema väiksem või võrdne arve tasumata summa {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,Serial No staatus
 DocType: Payment Entry Reference,Outstanding,silmapaistev
 ,Daily Timesheet Summary,Daily Töögraafik kokkuvõte
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",Row {0}: seadmiseks {1} perioodilisuse vahe alates ja siiani \ peab olema suurem või võrdne {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,See põhineb varude liikumist. Vaata {0} üksikasjad
 DocType: Pricing Rule,Selling,Müük
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Summa {0} {1} maha vastu {2}
 DocType: Employee,Salary Information,Palk Information
 DocType: Sales Person,Name and Employee ID,Nimi ja Töötaja ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Tähtaeg ei tohi olla enne postitamist kuupäev
 DocType: Website Item Group,Website Item Group,Koduleht Punkt Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Lõivud ja maksud
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Palun sisestage Viitekuupäev
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kas ei viita rea number on suurem või võrdne praeguse rea number selle Charge tüübist
 DocType: Asset,Sold,müüdud
 ,Item-wise Purchase History,Punkt tark ost ajalugu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Palun kliki &quot;Loo Ajakava&quot; tõmmata Serial No lisatud Punkt {0}
 DocType: Account,Frozen,Külmunud
 ,Open Production Orders,Avatud Tootmistellimused
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baasosa (firma Valuuta)
 DocType: Payment Reconciliation Payment,Reference Row,viide Row
 DocType: Installation Note,Installation Time,Paigaldamine aeg
 DocType: Sales Invoice,Accounting Details,Raamatupidamine Üksikasjad
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Kustuta kõik tehingud selle firma
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Kustuta kõik tehingud selle 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,Row # {0}: Operation {1} ei ole lõpule {2} tk valmistoodangu tootmine Tellimus {3}. Palun uuendage töö staatusest kaudu Time Palgid
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeeringud
 DocType: Issue,Resolution Details,Resolutsioon Üksikasjad
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,arutelu
 DocType: Payment Entry,Transaction ID,tehing ID
 DocType: Employee,Resignation Letter Date,Ametist kiri kuupäev
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Hinnakujundus on reeglid veelgi filtreeritud põhineb kogusest.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Määrake Liitumis töötajate {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Arve summa (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Korrake Kliendi tulu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) peab olema roll kulul Approver &quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vali Bom ja Kogus Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Vali Bom ja Kogus Production
 DocType: Asset,Depreciation Schedule,amortiseerumise kava
 DocType: Bank Reconciliation Detail,Against Account,Vastu konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pool päeva kuupäev peab olema vahemikus From kuupäev ja To Date
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Palun määra &quot;Vara amortisatsioonikulu Center&quot; Company {0}
 ,Maintenance Schedules,Hooldusgraafikud
 DocType: Task,Actual End Date (via Time Sheet),Tegelik End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Summa {0} {1} vastu {2} {3}
 ,Quotation Trends,Tsitaat Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Punkt Group mainimata punktis kapteni kirje {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Kanne konto peab olema võlgnevus konto
 DocType: Shipping Rule Condition,Shipping Amount,Kohaletoimetamine summa
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kuni Summa
 DocType: Purchase Invoice Item,Conversion Factor,Tulemus Factor
 DocType: Purchase Order,Delivered,Tarnitakse
 ,Vehicle Expenses,Sõidukite kulud
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
+DocType: Serial No,Invoice Details,arve andmed
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Oodatud väärtus pärast kasuliku eluea peab olema suurem või võrdne {0}
 DocType: Purchase Receipt,Vehicle Number,Sõidukite arv
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Kuupäev, mil korduv arve lõpetada"
 DocType: Employee Loan,Loan Amount,Laenusumma
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Seaded
 DocType: Salary Slip,net pay info,netopalk info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Kuluhüvitussüsteeme kinnituse ootel. Ainult Kulu Approver saab uuendada staatus.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Kuluhüvitussüsteeme kinnituse ootel. Ainult Kulu Approver saab uuendada staatus.
 DocType: Email Digest,New Expenses,uus kulud
 DocType: Purchase Invoice,Additional Discount Amount,Täiendav Allahindluse summa
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rida # {0}: Kogus peab olema 1, kui objekt on põhivarana. Palun kasutage eraldi rida mitu tk."
 DocType: Leave Block List Allow,Leave Block List Allow,Jäta Block loetelu Laske
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Lühend ei saa olla tühi või ruumi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupi Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spordi-
 DocType: Loan Type,Loan Name,laenu Nimi
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,Klientide võitmiseks ja lojaalsus
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Ladu, kus hoiad varu tagasi teemad"
 DocType: Production Order,Skip Material Transfer,Otse Materjal Transfer
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ei leia Vahetuskurss {0} kuni {1} peamiste kuupäeva {2}. Looge Valuutavahetus rekord käsitsi
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Teie majandusaasta lõpeb
 DocType: POS Profile,Price List,Hinnakiri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} on nüüd vaikimisi eelarveaastal. Palun värskendage brauserit muudatuse jõustumist.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} on kehtetu. Konto Valuuta peab olema {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Ümberarvutustegur on vaja järjest {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rida # {0}: Reference Document Type peab olema üks Sales Order, müügiarve või päevikusissekanne"
 DocType: Salary Component,Deduction,Kinnipeetav
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rida {0}: From ajal ja aeg on kohustuslik.
 DocType: Stock Reconciliation Item,Amount Difference,summa vahe
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Toode Hind lisatud {0} Hinnakirjas {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Palun sisestage Töötaja Id selle müügi isik
 DocType: Territory,Classification of Customers by region,Klientide liigitamine piirkonniti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Erinevus summa peab olema null
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Erinevus summa peab olema null
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Palun sisestage Production Punkt esimene
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Arvutatud Bank avaldus tasakaalu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,puudega kasutaja
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Tsitaat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Tsitaat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kokku mahaarvamine
 ,Production Analytics,tootmise Analytics
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Punkt {0} on juba tagasi
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** esindab majandusaastal. Kõik raamatupidamiskanded ja teiste suuremate tehingute jälgitakse vastu ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Klienditeenindus / Plii Aadress
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Hoiatus: Vigane SSL sertifikaat kinnitus {0}
 DocType: Student Admission,Eligibility,kõlblikkus
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Testrijuhtmed aitavad teil äri, lisada kõik oma kontaktid ja rohkem kui oma viib"
 DocType: Production Order Operation,Actual Operation Time,Tegelik tööaeg
 DocType: Authorization Rule,Applicable To (User),Suhtes kohaldatava (Kasutaja)
 DocType: Purchase Taxes and Charges,Deduct,Maha arvama
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,tööaadress
 DocType: Appraisal,Calculate Total Score,Arvuta üldskoor
 DocType: Request for Quotation,Manufacturing Manager,Tootmine Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} on garantii upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split saateleht pakendites.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Saadetised
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Kontojääkide ({0}) jaoks {1} ja stock väärtus ({2}) ladu {3} peab olema sama
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,Kokku puhkusepäevade
 DocType: Email Digest,Note: Email will not be sent to disabled users,Märkus: Email ei saadeta puuetega inimestele
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Arv koostoime
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Valige ettevõtte ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valige ettevõtte ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Jäta tühjaks, kui arvestada kõik osakonnad"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tüübid tööhõive (püsiv, leping, intern jne)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} on kohustuslik Punkt {1}
 DocType: Process Payroll,Fortnightly,iga kahe nädala tagant
 DocType: Currency Exchange,From Currency,Siit Valuuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Palun valige eraldatud summa, arve liik ja arve number atleast üks rida"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Hinda (firma Valuuta)
 DocType: Student Guardian,Others,Teised
 DocType: Payment Entry,Unallocated Amount,Jaotamata summa
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Kas te ei leia sobivat Punkt. Palun valige mõni muu väärtus {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Kas te ei leia sobivat Punkt. Palun valige mõni muu väärtus {0}.
 DocType: POS Profile,Taxes and Charges,Maksud ja tasud
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Toode või teenus, mida osta, müüa või hoida laos."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Enam uuendused
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ei saa valida tasuta tüübiks &quot;On eelmise rea summa&quot; või &quot;On eelmise rea kokku&quot; esimese rea
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapse toode ei tohiks olla Toote Bundle. Palun eemalda kirje `{0}` ja säästa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Pangandus
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lisa Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lisa Timesheets
 DocType: Vehicle Service,Service Item,Teenuse toode
 DocType: Bank Guarantee,Bank Guarantee,Panga garantii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Palun kliki &quot;Loo Ajakava&quot; saada ajakava
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Rida # {0}: Asset {1} on juba {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order maksmine
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Määrake nimetamine Series {0} Setup&gt; Seaded&gt; nimetamine Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,tegevdirektor
 DocType: Expense Claim Detail,Expense Claim Detail,Kuluhüvitussüsteeme Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Palun valige õige konto
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnad ei näidata, kui hinnakiri ei ole valitud"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Palun täpsustage riik seda kohaletoimetamine eeskirja või vaadake Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Kokku Saabuva Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Kanne on vajalik
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Kanne on vajalik
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets aitab jälgida aega, kulusid ja arveldamise aja veetmiseks teha oma meeskonda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostu hinnakiri
 DocType: Offer Letter Term,Offer Term,Tähtajaline
 DocType: Quality Inspection,Quality Manager,Kvaliteedi juht
 DocType: Job Applicant,Job Opening,Vaba töökoht
 DocType: Payment Reconciliation,Payment Reconciliation,Makse leppimise
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Palun valige incharge isiku nimi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Palun valige incharge isiku nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloogia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Kokku Palgata: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom Koduleht operatsiooni
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,Kaotatud Reason
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Address
 DocType: Quality Inspection,Sample Size,Valimi suurus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Kõik esemed on juba arve
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Palun sisesta laekumine Dokumendi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Kõik esemed on juba arve
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Palun täpsustage kehtiv &quot;From Juhtum nr&quot;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Lisaks kuluallikad on võimalik teha rühma all, kuid kanded saab teha peale mitte-Groups"
 DocType: Project,External,Väline
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kasutajad ja reeglid
 DocType: Vehicle Log,VLOG.,Videoblogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Tootmistellimused Loodud: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Tootmistellimused Loodud: {0}
 DocType: Branch,Branch,Oks
 DocType: Guardian,Mobile Number,Mobiili number
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trükkimine ja Branding
 DocType: Bin,Actual Quantity,Tegelik Kogus
 DocType: Shipping Rule,example: Next Day Shipping,Näiteks: Järgmine päev kohaletoimetamine
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ei leitud
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ei leitud
 DocType: Scheduling Tool,Student Batch,Student Partii
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Sinu kliendid
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tee Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tee Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sind on kutsutud koostööd projekti: {0}
 DocType: Leave Block List Date,Block Date,Block kuupäev
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Rakendatakse kohe
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,Saadetud
 DocType: Payment Request,Make Sales Invoice,Tee müügiarve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,tarkvara
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Järgmine Kontakt kuupäev ei saa olla minevikus
 DocType: Company,For Reference Only.,Üksnes võrdluseks.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Valige Partii nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Vale {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance summa
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Juhtum nr saa olla 0
 DocType: Item,Show a slideshow at the top of the page,Näita slaidiseansi ülaosas lehele
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Kauplused
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Kauplused
 DocType: Serial No,Delivery Time,Tarne aeg
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vananemine Põhineb
 DocType: Item,End of Life,End of Life
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,Nimeta Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Värskenda Cost
 DocType: Item Reorder,Item Reorder,Punkt Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Näita palgatõend
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materjal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Näita palgatõend
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Transfer Materjal
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",Määrake tegevuse töökulud ja annab ainulaadse operatsiooni ei oma tegevuse.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,See dokument on üle piiri {0} {1} artiklijärgse {4}. Kas tegemist teise {3} samade {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Palun määra korduvate pärast salvestamist
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vali muutus summa kontole
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Palun määra korduvate pärast salvestamist
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vali muutus summa kontole
 DocType: Purchase Invoice,Price List Currency,Hinnakiri Valuuta
 DocType: Naming Series,User must always select,Kasutaja peab alati valida
 DocType: Stock Settings,Allow Negative Stock,Laske Negatiivne Stock
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,Eelarve konto
 DocType: Quality Inspection,Verified By,Kontrollitud
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ei saa muuta ettevõtte default valuutat, sest seal on olemasolevate tehingud. Tehingud tuleb tühistada muuta default valuutat."
-DocType: Grade Interval,Grade Description,Hinne kirjeldus
+DocType: Grading Scale Interval,Grade Description,Hinne kirjeldus
 DocType: Stock Entry,Purchase Receipt No,Ostutšekk pole
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Käsiraha
 DocType: Process Payroll,Create Salary Slip,Loo palgatõend
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,Osalemine kuupäev
 DocType: Warranty Claim,Raised By,Tõstatatud
 DocType: Payment Gateway Account,Payment Account,Maksekonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Palun täpsustage Company edasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Palun täpsustage Company edasi
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Net muutus Arved
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Tasandusintress Off
 DocType: Offer Letter,Accepted,Lubatud
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Palun veendu, et sa tõesti tahad kustutada kõik tehingud selle firma. Teie kapten andmed jäävad, nagu see on. Seda toimingut ei saa tagasi võtta."
 DocType: Room,Room Number,Toa number
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Vale viite {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ei saa olla suurem kui planeeritud quanitity ({2}) in Production Tellimus {3}
 DocType: Shipping Rule,Shipping Rule Label,Kohaletoimetamine Reegel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Kasutaja Foorum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Tooraine ei saa olla tühi.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick päevikusissekanne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ei uuendada laos, arve sisaldab tilk laevandus objekt."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick päevikusissekanne
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Sa ei saa muuta kiirust kui Bom mainitud agianst tahes kirje
 DocType: Employee,Previous Work Experience,Eelnev töökogemus
 DocType: Stock Entry,For Quantity,Sest Kogus
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Tingimused ja tingimuste kohta1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nimi instituut, mida te Selle süsteemi rajamisel."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Raamatupidamise kirje külmutatud kuni see kuupäev, keegi ei saa / muuda kande arvatud rolli allpool."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Palun dokumendi salvestada enne teeniva hooldusgraafiku
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekti staatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Vaata seda keelata fraktsioonid. (NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Järgmised Tootmistellimused loodi:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,Töötajat puhkusele
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark olevik
 DocType: Project,% Complete Method,% Complete meetod
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Hooldus alguskuupäev ei saa olla enne tarnekuupäev Serial No {0}
 DocType: Production Order,Actual End Date,Tegelik End Date
 DocType: BOM,Operating Cost (Company Currency),Ekspluatatsioonikulud (firma Valuuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Palgata puhkust ei ühti heaks Jäta ostusoov arvestust
 DocType: Campaign,Campaign-.####,Kampaania -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Järgmised sammud
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Esitada määratud objekte parima võimaliku määr
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto sule võimalus pärast 15 päeva
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Aasta
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Plii%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,KONTOLE Kogus
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Loodud - {0}
 DocType: Asset Category Account,Asset Category Account,Põhivarakategoori konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Ei suuda toota rohkem Punkt {0} kui Sales Order koguse {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} ei ole esitatud
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Järgmine kontakteeruda ei saa olla sama Lead e-posti aadress
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Kliirens kuupäev ei ole nimetatud
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Toodang
 DocType: Guardian,Occupation,okupatsioon
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR Seaded
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Start Date tuleb enne End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kokku (tk)
 DocType: Sales Invoice,This Document,See dokument
 DocType: Installation Note Item,Installed Qty,Paigaldatud Kogus
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Teata probleemist
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility kulud
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rida # {0}: päevikusissekanne {1} ei ole arvesse {2} või juba võrreldakse teise kviitungi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rida # {0}: päevikusissekanne {1} ei ole arvesse {2} või juba võrreldakse teise kviitungi
 DocType: Buying Settings,Default Buying Price List,Vaikimisi ostmine hinnakiri
 DocType: Process Payroll,Salary Slip Based on Timesheet,Palgatõend põhjal Töögraafik
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Ükski töötaja eespool valitud kriteeriumid või palgatõend juba loodud
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Vaikeväärtuste nagu firma, valuuta, jooksval majandusaastal jms"
 DocType: Payment Entry,Payment Type,Makse tüüp
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Palun valige partii Oksjoni {0}. Ei leia ühe partii, mis vastab sellele nõudele"
 DocType: Process Payroll,Select Employees,Vali Töötajad
 DocType: Opportunity,Potential Sales Deal,Potentsiaalne Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Tšekk / Reference kuupäev
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} on juba loodud ettevõte {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Vahetage toode / Bom kõik BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Laekumine dokument tuleb esitada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Laekumine dokument tuleb esitada
 DocType: Purchase Invoice Item,Received Qty,Vastatud Kogus
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Partii
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Mitte Paide ja ei ole esitanud
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Pole aega lehed
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Jäta tüüp {0} ei saa läbi-edasi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Hoolduskava ei loodud kõik esemed. Palun kliki &quot;Loo Ajakava&quot;
 ,To Produce,Toota
 apps/erpnext/erpnext/config/hr.py +93,Payroll,palgafond
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Juba rida {0} on {1}. Lisada {2} Punkti kiirus, rida {3} peab olema ka"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tee User
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tee User
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifitseerimine pakett sünnitust (trüki)
 DocType: Bin,Reserved Quantity,Reserveeritud Kogus
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sisestage kehtiv e-posti aadress
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Puudega template ei tohi olla vaikemalliga
 DocType: Account,Income Account,Tulukonto
 DocType: Payment Request,Amount in customer's currency,Summa kliendi valuuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Tarne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Tarne
 DocType: Stock Reconciliation Item,Current Qty,Praegune Kogus
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vt &quot;määr materjalide põhjal&quot; on kuluarvestus jaos
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Eelmine
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastutus Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Partiidele aitab teil jälgida käimist, hinnanguid ja tasude õpilased"
 DocType: Payment Entry,Total Allocated Amount,Eraldati kokku
 DocType: Item Reorder,Material Request Type,Materjal Hankelepingu liik
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural päevikusissekanne palgad alates {0} kuni {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage on täis, ei päästa"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage on täis, ei päästa"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor on kohustuslik
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Cost Center
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Peida Kliendi Maksu Id müügitehingute
 DocType: Upload Attendance,Upload HTML,Laadi HTML
 DocType: Employee,Relieving Date,Leevendab kuupäev
-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.","Hinnakujundus Reegel on tehtud üle kirjutada Hinnakiri / defineerida allahindlus protsent, mis põhineb mõned kriteeriumid."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Hinnakujundus Reegel on tehtud üle kirjutada Hinnakiri / defineerida allahindlus protsent, mis põhineb mõned kriteeriumid."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Ladu saab muuta ainult läbi Stock Entry / saateleht / ostutšekk
 DocType: Employee Education,Class / Percentage,Klass / protsent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Head of Marketing ja müük
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Tulumaksuseaduse
-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.","Kui valitud Hinnakujundus Reegel on tehtud &quot;Hind&quot;, siis kirjutatakse hinnakiri. Hinnakujundus Reegel hind on lõpphind, et enam allahindlust tuleks kohaldada. Seega tehingutes nagu Sales Order, Ostutellimuse jne, siis on see tõmmatud &quot;Rate&quot; valdkonnas, mitte &quot;Hinnakirja Rate väljale."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Kui valitud Hinnakujundus Reegel on tehtud &quot;Hind&quot;, siis kirjutatakse hinnakiri. Hinnakujundus Reegel hind on lõpphind, et enam allahindlust tuleks kohaldada. Seega tehingutes nagu Sales Order, Ostutellimuse jne, siis on see tõmmatud &quot;Rate&quot; valdkonnas, mitte &quot;Hinnakirja Rate väljale."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Rada viib Tööstuse tüüp.
 DocType: Item Supplier,Item Supplier,Punkt Tarnija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Palun sisestage Kood saada partii ei
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Palun valige väärtust {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Kõik aadressid.
 DocType: Company,Stock Settings,Stock Seaded
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Ühendamine on võimalik ainult siis, kui järgmised omadused on samad nii arvestust. Kas nimel, Root tüüp, Firmade"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Saadab talle umbes sündmuse töötajatele staatuse &quot;avatud&quot;
 DocType: Task,Depends on Tasks,Oleneb Ülesanded
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Hallata klientide Group Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Manused saab näidata eelnevalt lubanud ostukorv
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Cost Center nimi
 DocType: Leave Control Panel,Leave Control Panel,Jäta Control Panel
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,Kanne
 DocType: Delivery Note,Required only for sample item.,Vajalik ainult proovi objekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tegelik Kogus Pärast Tehing
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pakkuja&gt; Pakkuja tüüp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palgatõend vahel leiti {0} ja {1}
 ,Pending SO Items For Purchase Request,Kuni SO Kirjed osta taotlusel
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Sisseastujale
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} on keelatud
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} on keelatud
 DocType: Supplier,Billing Currency,Arved Valuuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Väga suur
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kodulehekülg Valitud toode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Kõik hindamine Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uus Warehouse Nimi
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Kokku {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Kokku {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territoorium
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Palume mainida ei külastuste vaja
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Palume mainida ei külastuste vaja
 DocType: Stock Settings,Default Valuation Method,Vaikimisi hindamismeetod
 DocType: Vehicle Log,Fuel Qty,Kütus Kogus
 DocType: Production Order Operation,Planned Start Time,Planeeritud Start Time
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,Hinnakiri Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Kõik müügitehingud saab kodeeritud vastu mitu ** Sales Isikud ** nii et saate määrata ja jälgida eesmärgid.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Palun luua Klienti Lead {0}
 DocType: Price List,Applicable for Countries,Rakendatav Riigid
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ainult Jäta rakendusi staatuse &quot;Kinnitatud&quot; ja &quot;Tõrjutud&quot; saab esitada
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Nimi on kohustuslik järjest {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,kopeeritud
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nimi viga: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puudus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ei seostatud {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ei seostatud {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Osalemine töötajate {0} on juba märgitud
 DocType: Packing Slip,If more than one package of the same type (for print),Kui rohkem kui üks pakett on sama tüüpi (trüki)
 ,Salary Register,palk Registreeri
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Kasutage Ostukorv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Väärtus {0} jaoks Oskus {1} ei eksisteeri nimekirja kehtib atribuut väärtused Punkt {2}
 DocType: BOM Item,Scrap %,Vanametalli%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksud jagatakse proportsionaalselt aluseks on elemendi Kogus või summa, ühe oma valikut"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksud jagatakse proportsionaalselt aluseks on elemendi Kogus või summa, ühe oma valikut"
 DocType: Maintenance Visit,Purposes,Eesmärgid
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Atleast üks element peab olema kantud negatiivse koguse vastutasuks dokument
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} kauem kui ükski saadaval töötundide tööjaama {1}, murda operatsiooni mitmeks toimingud"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Müügiarve
 DocType: Journal Entry Account,Party Balance,Partei Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Palun valige Rakenda soodustust
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Palun valige Rakenda soodustust
 DocType: Company,Default Receivable Account,Vaikimisi võlgnevus konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Loo Bank kirjet kogu palka eespool valitud kriteeriumid
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer tootmine
-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.,Soodus protsent võib rakendada kas vastu Hinnakiri või kõigi hinnakiri.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Soodus protsent võib rakendada kas vastu Hinnakiri või kõigi hinnakiri.
 DocType: Purchase Invoice,Half-yearly,Poolaasta-
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Raamatupidamine kirjet Stock
 DocType: Vehicle Service,Engine Oil,mootoriõli
 DocType: Sales Invoice,Sales Team1,Müük Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} ei ole olemas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Punkt {0} ei ole olemas
 DocType: Sales Invoice,Customer Address,Kliendi aadress
 DocType: Employee Loan,Loan Details,laenu detailid
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rida {0}: Teostatud Kogus peab olema suurem kui null.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,Juur Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Ei saa tagastada rohkem kui {1} jaoks Punkt {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Maatükk
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Maatükk
 DocType: Item Group,Show this slideshow at the top of the page,Näita seda slideshow ülaosas lehele
 DocType: BOM,Item UOM,Punkt UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Maksusumma Pärast Allahindluse summa (firma Valuuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target lattu on kohustuslik rida {0}
 DocType: Cheque Print Template,Primary Settings,esmane seaded
 DocType: Purchase Invoice,Select Supplier Address,Vali Tarnija Aadress
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Lisa Töötajad
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Lisa Töötajad
 DocType: Purchase Invoice Item,Quality Inspection,Kvaliteedi kontroll
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Mikroskoopilises
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teooria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Hoiatus: Materjal Taotletud Kogus alla Tellimuse Miinimum Kogus
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} on külmutatud
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juriidilise isiku / tütarettevõtte eraldi kontoplaani kuuluv organisatsioon.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Toit, jook ja tubakas"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Kas ainult tasuda vastu unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisjoni määr ei või olla suurem kui 100
 DocType: Stock Entry,Subcontract,Alltöövõtuleping
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Palun sisestage {0} Esimene
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Laod olemasolevate tehing ei ole ümber rühmitada.
 DocType: Assessment Result Tool,Result HTML,tulemus HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Aegub
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lisa Õpilased
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lisa Õpilased
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Palun valige {0}
 DocType: C-Form,C-Form No,C-vorm pole
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sisesta nimi kampaania kui allikas uurimine on kampaania
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Ajaleht Publishers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vali Fiscal Year
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Vali Fiscal Year
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Level
 DocType: Company,Chart Of Accounts Template,Kontoplaani Mall
 DocType: Attendance,Attendance Date,Osavõtt kuupäev
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate kirje
 DocType: Program Enrollment Tool,Get Students,saada Õpilased
 DocType: Serial No,Under Warranty,Garantii alla
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Sõnades on nähtav, kui salvestate Sales Order."
 ,Employee Birthday,Töötaja Sünnipäev
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Partii osavõtt Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadeemilise perspektiivis selle &quot;Academic Year &#39;{0} ja&quot; Term nimi &quot;{1} on juba olemas. Palun muuda neid sissekandeid ja proovi uuesti.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Nagu on olemasolevate tehingute vastu objekti {0}, sa ei saa muuta väärtust {1}"
 DocType: UOM,Must be Whole Number,Peab olema täisarv
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Uus Lehed Eraldatud (päevades)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} ei ole olemas
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materjalidest arve vastu Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periood sulgemine Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Cost Center olemasolevate tehingut ei saa ümber rühm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisatsioon
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pakkuja (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Töötaja osalemise Tool
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,Viimane päev järgmise kuu
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähedale Issue 7 päeva pärast
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Jäta ei saa eraldada enne {0}, sest puhkuse tasakaal on juba carry-edastas tulevikus puhkuse jaotamise rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Märkus: Tänu / Viitekuupäev ületab lubatud klientide krediidiriski päeva {0} päeva (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student esitaja
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumuleeritud kulum konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock kanded
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Toiminguid ei saa tühjaks jätta
 DocType: Maintenance Visit Purpose,Against Document Detail No,Vastu Dokumendi Detail Ei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Partei Type on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Partei Type on kohustuslik
 DocType: Quality Inspection,Outgoing,Väljuv
 DocType: Material Request,Requested For,Taotletakse
 DocType: Quotation Item,Against Doctype,Vastu DOCTYPE
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,Asja kood
 DocType: Production Planning Tool,Create Production Orders,Loo Tootmistellimused
 DocType: Serial No,Warranty / AMC Details,Garantii / AMC Üksikasjad
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Valige õpilast käsitsi tegevuspõhise Group
 DocType: Journal Entry,User Remark,Kasutaja Märkus
 DocType: Lead,Market Segment,Turusegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Paide summa ei saa olla suurem kui kogu negatiivne tasumata summa {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Töötaja Internal tööandjad
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Sulgemine (Dr)
 DocType: Cheque Print Template,Cheque Size,Tšekk Suurus
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,Loo Material taotlused
 DocType: Employee Education,School/University,Kool / Ülikool
 DocType: Payment Request,Reference Details,Viide Üksikasjad
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oodatud väärtus pärast Kasulik Elu peab olema väiksem kui Gross ostusumma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Saadaval Kogus lattu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Arve summa
 DocType: Asset,Double Declining Balance,Double Degressiivne
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Erinevus konto peab olema vara / kohustuse tüübist võtta, sest see Stock leppimine on mõra Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Väljastatud summa ei saa olla suurem kui Laenusumma {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ostutellimuse numbri vaja Punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Tootmise et mitte loodud
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Tootmise et mitte loodud
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;From Date&quot; tuleb pärast &quot;To Date&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Selleks ei saa muuta üliõpilaste {0} on seotud õpilase taotluse {1}
 DocType: Asset,Fully Depreciated,täielikult amortiseerunud
 ,Stock Projected Qty,Stock Kavandatav Kogus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kliendi {0} ei kuulu projekti {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Märkimisväärne osavõtt HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Hinnapakkumised on ettepanekuid, pakkumiste saadetud oma klientidele"
 DocType: Sales Order,Customer's Purchase Order,Kliendi ostutellimuse
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Järjekorra number ja partii
 DocType: Warranty Claim,From Company,Allikas: Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa hulgaliselt Hindamiskriteeriumid peab olema {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Väärtus või Kogus
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Palun määra arv Amortisatsiooniaruanne Broneeritud
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Väärtus või Kogus
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Lavastused Tellimused ei saa tõsta jaoks:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Ostu maksud ja tasud
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Kõik Laod
 DocType: Sales Partner,Retailer,Jaemüüja
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Krediidi konto peab olema bilansis
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Kõik Tarnija liigid
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Kõik Tarnija liigid
 DocType: Global Defaults,Disable In Words,Keela sõnades
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Kood on kohustuslik, sest toode ei ole automaatselt nummerdatud"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Tsitaat {0} ei tüübiga {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,pa-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank arvelduskrediidi kontot
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Tee palgatõend
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Eraldatud summa ei saa olla suurem kui tasumata summa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Sirvi Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Tagatud laenud
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Postitamise kuupäev ja kellaaeg
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ei ole lubatud uuendada laos tehingute vanem kui {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Täielikult Maksustatakse
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Palun määra vaikimisi maksmisele konto töötaja {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Raha kassas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Toimetaja lattu vajalik varude objekti {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Brutokaal pakendis. Tavaliselt netokaal + pakkematerjali kaal. (trüki)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,Grupp põhineb
 DocType: Journal Entry,Bill Date,Bill kuupäev
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Teenuse toode, tüüp, sagedus ja kulude summa on vajalik"
-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:","Isegi kui on mitu Hinnakujundusreeglid esmajärjekorras, siis järgmised sisemised prioriteedid on rakendatud:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Isegi kui on mitu Hinnakujundusreeglid esmajärjekorras, siis järgmised sisemised prioriteedid on rakendatud:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Kas tõesti esitama kõik palgatõend alates {0} kuni {1}
 DocType: Cheque Print Template,Cheque Height,Tšekk Kõrgus
 DocType: Supplier,Supplier Details,Tarnija Üksikasjad
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,arve Ref
 DocType: Purchase Order,Recurring Order,Korduvad Telli
 DocType: Company,Default Income Account,Vaikimisi tulukonto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kliendi Group / Klienditeenindus
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kliendi Group / Klienditeenindus
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Sulgemata majandusaastale kasum / kahjum (Credit)
 DocType: Sales Invoice,Time Sheets,ajatabelid
 DocType: Payment Gateway Account,Default Payment Request Message,Vaikimisi maksenõudekäsule Message
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,Tsitaat Message
 DocType: Employee Loan,Employee Loan Application,Töötaja Laenutaotlus
 DocType: Issue,Opening Date,Avamise kuupäev
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Osavõtt on märgitud edukalt.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Osavõtt on märgitud edukalt.
 DocType: Journal Entry,Remark,Märkus
 DocType: Purchase Receipt Item,Rate and Amount,Määr ja summa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Konto tüüp {0} peab olema {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Konto tüüp {0} peab olema {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lehed ja vaba
 DocType: School Settings,Current Academic Term,Praegune õppeaasta jooksul
 DocType: Sales Order,Not Billed,Ei maksustata
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tsitaat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Elementi on olemas sama nimega ({0}), siis muutke kirje grupi nimi või ümbernimetamiseks kirje"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Palun valige kliendile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Palun valige kliendile
 DocType: C-Form,I,mina
 DocType: Company,Asset Depreciation Cost Center,Vara amortisatsioonikulu Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,Kindlustus detailid
 DocType: Account,Payable,Maksmisele kuuluv
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Palun sisesta tagasimakseperioodid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Nõuded ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Nõuded ({0})
 DocType: Pricing Rule,Margin,varu
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uutele klientidele
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brutokasum%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Kliirens kuupäev
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross ostusumma on kohustuslik
 DocType: Lead,Address Desc,Aadress otsimiseks
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partei on kohustuslik
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partei on kohustuslik
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Teema nimi
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast üks müümine või ostmine tuleb valida
-DocType: Grading Structure,Grade Intervals,Hinne intervallid
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vali laadi oma äri.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: duplikaat kande Viiteid {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kus tootmistegevus viiakse.
 DocType: Asset Movement,Source Warehouse,Allikas Warehouse
 DocType: Installation Note,Installation Date,Paigaldamise kuupäev
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kiri Heads print malle.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tiitel mallide nt Esialgse arve.
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Hindamine tüübist tasu ei märgitud Inclusive
 DocType: POS Profile,Update Stock,Värskenda Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erinevad UOM objekte viib vale (kokku) Net Weight väärtus. Veenduge, et Net Weight iga objekt on sama UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange kasum / kahjum konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Töötaja ja osavõtt
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Eesmärk peab olema üks {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Täitke vorm ja salvestage see
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Täitke vorm ja salvestage see
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Lae aruande, mis sisaldab kõiki tooraineid oma viimase loendamise staatuse"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Suhtlus Foorum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Tegelik Kogus laos
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Kogus
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Praegune noorele
 DocType: Company,Stock Adjustment Account,Stock korrigeerimine konto
-DocType: Journal Entry,Write Off,Maha kirjutama
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Maha kirjutama
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Süsteemi kasutaja (login) ID. Kui määratud, siis saab vaikimisi kõigi HR vormid."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: From {1}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tarnija tarnib Tellija
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# vorm / Punkt / {0}) on otsas
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Järgmine kuupäev peab olema suurem kui Postitamise kuupäev
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Näita maksu break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Näita maksu break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Tänu / Viitekuupäev ei saa pärast {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Andmete impordi ja ekspordi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock kirjed on ikka vastu Warehouse {0}, seega sa ei saa uuesti määrata või muuta"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No õpilased Leitud
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,No õpilased Leitud
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Arve Postitamise kuupäev
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,müüma
 DocType: Sales Invoice,Rounded Total,Ümardatud kokku
 DocType: Product Bundle,List items that form the package.,"Nimekiri objekte, mis moodustavad paketi."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Protsentuaalne jaotus peaks olema suurem kui 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Palun valige Postitamise kuupäev enne valides Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Palun valige tsitaadid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Tee hooldus Külasta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Palun valige tsitaadid
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Arv Amortisatsiooniaruanne Broneeritud ei saa olla suurem kui koguarv Amortisatsiooniaruanne
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Tee hooldus Külasta
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Palun pöörduge kasutaja, kes on Sales Master Manager {0} rolli"
 DocType: Company,Default Cash Account,Vaikimisi arvelduskontole
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (mitte kliendi või hankija) kapten.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,See põhineb käimist Selle Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nr Õpilased
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisa rohkem punkte või avatud täiskujul
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Palun sisestage &quot;Oodatud Toimetaja Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Saatekirjad {0} tuleb tühistada enne tühistades selle Sales Order
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punkt 3
 DocType: Purchase Order,Customer Contact Email,Klienditeenindus Kontakt E-
 DocType: Warranty Claim,Item and Warranty Details,Punkt ja garantii detailid
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kood&gt; Punkt Group&gt; Brand
 DocType: Sales Team,Contribution (%),Panus (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Märkus: Tasumine Entry ei loonud kuna &quot;Raha või pangakonto pole määratud
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Valige programm tõmmata kohustuslikud kursused.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Enne leppimist
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Maksude ja tasude lisatud (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Punkt Maksu- Row {0} peab olema konto tüüpi Tax või tulu või kuluna või tasuline
 DocType: Sales Order,Partly Billed,Osaliselt Maksustatakse
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Punkt {0} peab olema põhivara objektile
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} peab olema põhivara objektile
 DocType: Item,Default BOM,Vaikimisi Bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Palun ümber kirjutada firma nime kinnitamiseks
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Kokku Tasumata Amt
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autod
 DocType: Vehicle,Insurance Company,Kindlustusselts
 DocType: Asset Category Account,Fixed Asset Account,Põhivarade konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,muutuja
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Siit Saateleht
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,muutuja
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Siit Saateleht
 DocType: Student,Student Email Address,Student e-posti aadress
 DocType: Timesheet Detail,From Time,Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Laos:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Hinnakiri Vahetuskurss
 DocType: Purchase Invoice Item,Rate,Määr
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,aadress Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,aadress Nimi
 DocType: Stock Entry,From BOM,Siit Bom
 DocType: Assessment Code,Assessment Code,Hinnang kood
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Põhiline
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock tehingud enne {0} on külmutatud
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Palun kliki &quot;Loo Ajakava&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Palun kliki &quot;Loo Ajakava&quot;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","nt kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Viitenumber on kohustuslik, kui sisestatud Viitekuupäev"
 DocType: Bank Reconciliation Detail,Payment Document,maksedokumendi
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,Palgastruktuur
 DocType: Account,Bank,Pank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Lennukompanii
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Väljaanne Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Väljaanne Material
 DocType: Material Request Item,For Warehouse,Sest Warehouse
 DocType: Employee,Offer Date,Pakkuda kuupäev
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tsitaadid
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Olete võrguta režiimis. Sa ei saa uuesti enne, kui olete võrgus."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ei Üliõpilasgrupid loodud.
 DocType: Purchase Invoice Item,Serial No,Seerianumber
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Igakuine tagasimakse ei saa olla suurem kui Laenusumma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Palun sisestage Maintaince Detailid esimene
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Palun sisestage Maintaince Detailid esimene
 DocType: Purchase Invoice,Print Language,Prindi keel
 DocType: Salary Slip,Total Working Hours,Töötundide
 DocType: Stock Entry,Including items for sub assemblies,Sealhulgas esemed sub komplektid
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Sisesta väärtus peab olema positiivne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Sisesta väärtus peab olema positiivne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Kõik aladel
 DocType: Purchase Invoice,Items,Esemed
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student juba registreerunud.
@@ -3254,16 +3263,14 @@
 DocType: Issue,Opening Time,Avamine aeg
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ja sealt soovitud vaja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Väärtpaberite ja kaubabörsil
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Vaikimisi mõõtühik Variant &quot;{0}&quot; peab olema sama, Mall &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Arvuta põhineb
 DocType: Delivery Note Item,From Warehouse,Siit Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Ei objektid Materjaliandmik et Tootmine
 DocType: Assessment Plan,Supervisor Name,Juhendaja nimi
 DocType: Program Enrollment Course,Program Enrollment Course,Programm Registreerimine Course
-DocType: Grading Structure,Grading Structure,astmete
 DocType: Purchase Taxes and Charges,Valuation and Total,Hindamine ja kokku
 DocType: Tax Rule,Shipping City,Kohaletoimetamine City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"See toode on variant {0} (Mall). Näitajad kopeeritaksegi malli, kui &quot;No Copy&quot; on seatud"
 DocType: Notification Control,Customize the Notification,Kohanda teatamine
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Rahavoog äritegevusest
 DocType: Sales Invoice,Shipping Rule,Kohaletoimetamine reegel
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Lapse konto olemas selle konto. Sa ei saa selle konto kustutada.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Kas eesmärk Kogus või Sihtsummaks on kohustuslik
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No default Bom olemas Punkt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Palun valige Postitamise kuupäev esimest
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Avamise kuupäev peaks olema enne sulgemist kuupäev
 DocType: Leave Control Panel,Carry Forward,Kanda
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Cost Center olemasolevate tehingut ei saa ümber arvestusraamatust
 DocType: Department,Days for which Holidays are blocked for this department.,"Päeva, mis pühadel blokeeritakse selle osakonda."
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,Üldine
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Kinnita Letterhead
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,viimase Side
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Hindamine ja kokku&quot;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Nimekiri oma maksu juhid (nt käibemaksu, tolli jne, nad peaksid olema unikaalsed nimed) ja nende ühtsed määrad. See loob standard malli, mida saab muuta ja lisada hiljem."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial nr Nõutav SERIALIZED Punkt {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksed arvetega
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kokku (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Meelelahutus ja vaba aeg
 DocType: Quality Inspection,Item Serial No,Punkt Järjekorranumber
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Loo töötaja kirjete
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Loo töötaja kirjete
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Kokku olevik
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,raamatupidamise aastaaruanne
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Tund
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,tundmatu
 DocType: Shipping Rule,Shipping Rule Conditions,Kohaletoimetamine Reegli
 DocType: BOM Replace Tool,The new BOM after replacement,Uus Bom pärast asendamine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Müügikoht
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Müügikoht
 DocType: Payment Entry,Received Amount,Saadud summa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Palun setup Töötaja nimesüsteemile Human Resource&gt; HR Seaded
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Loo täieliku koguse, ignoreerides kogus juba tellitud"
 DocType: Account,Tax,Maks
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ei Märgistatud
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,Arved
 DocType: Batch,Source Document Name,Allikas Dokumendi nimi
 DocType: Job Opening,Job Title,Töö nimetus
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Kasutajate loomine
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Kasutajate loomine
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kogus et Tootmine peab olema suurem kui 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Külasta aruande hooldus kõne.
 DocType: Stock Entry,Update Rate and Availability,Värskenduskiirus ja saadavust
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Osakaal teil on lubatud vastu võtta või pakkuda rohkem vastu tellitav kogus. Näiteks: Kui olete tellinud 100 ühikut. ja teie toetus on 10%, siis on lubatud saada 110 ühikut."
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kulu konto on kohustuslik element {0}
 DocType: BOM,Website Description,Koduleht kirjeldus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net omakapitali
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Palun tühistada ostuarve {0} esimene
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posti aadress peab olema unikaalne, juba olemas {0}"
 DocType: Serial No,AMC Expiry Date,AMC Aegumisaja
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kviitung
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,kviitung
 ,Sales Register,Müügiregister
 DocType: Daily Work Summary Settings Company,Send Emails At,Saada e-kirju
 DocType: Quotation,Quotation Lost Reason,Tsitaat Lost Reason
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vali oma Domeeni
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Tehingu viitenumber {0} kuupäevast {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei ole midagi muuta.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kokkuvõte Selle kuu ja kuni tegevusi
 DocType: Customer Group,Customer Group Name,Kliendi Group Nimi
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nr Kliendid veel!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavoogude aruanne
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Laenusumma ei tohi ületada Maksimaalne laenusumma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,litsents
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Palun eemalda see Arve {0} on C-vorm {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Palun valige kanda, kui soovite ka lisada eelnenud eelarveaasta saldo jätab see eelarveaastal"
 DocType: GL Entry,Against Voucher Type,Vastu Voucher Type
 DocType: Item,Attributes,Näitajad
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Palun sisestage maha konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimati Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ei kuuluv ettevõte {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Seerianumbrid järjest {0} ei ühti saateleht
 DocType: Student,Guardian Details,Guardian detailid
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark õpib mitu töötajat
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rida {0} # Konto tüüp peab olema &quot;Põhivarade&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kogus
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reeglid arvutada laevandus summa müük
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seeria on kohustuslik
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seeria on kohustuslik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finantsteenused
 DocType: Student Sibling,Student ID,Õpilase ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tüübid tegevused aeg kajakad
 DocType: Tax Rule,Sales,Läbimüük
 DocType: Stock Entry Detail,Basic Amount,Põhisummat
 DocType: Training Event,Exam,eksam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Ladu vajalik varude Punkt {0}
 DocType: Leave Allocation,Unused leaves,Kasutamata lehed
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Kr
 DocType: Tax Rule,Billing State,Arved riik
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ei seostatud Party konto {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ei seostatud Party konto {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Tõmba plahvatas Bom (sh sõlmed)
 DocType: Authorization Rule,Applicable To (Employee),Suhtes kohaldatava (töötaja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Tähtaeg on kohustuslik
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Juurdekasv Oskus {0} ei saa olla 0
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,Passiivne Kliendid
 DocType: Landed Cost Voucher,LCV,VTS
 DocType: Landed Cost Voucher,Purchase Receipts,Ostutšekid
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kuidas Hinnakujundus kehtib reegel?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kuidas Hinnakujundus kehtib reegel?
 DocType: Stock Entry,Delivery Note No,Toimetaja märkus pole
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",Kui kontrollitakse ainult Ostu materjali taotluste lõplik tooraine lisatakse materjali taotlused. Muidu Materjal taotlused ülemelementide luuakse
 DocType: Cheque Print Template,Message to show,Sõnum näidata
 DocType: Company,Retail,Jaekaubandus
 DocType: Attendance,Absent,Puuduv
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Toote Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Vale viite {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Ostu maksud ja tasud Mall
 DocType: Upload Attendance,Download Template,Lae mall
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,Konto makstud
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Kood
 DocType: Journal Entry,Write Off Based On,Kirjutage Off põhineb
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Tee Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Tee Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Prindi ja Stationery
 DocType: Stock Settings,Show Barcode Field,Näita vöötkoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Saada Tarnija kirjad
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Saada Tarnija kirjad
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Palk juba töödeldud ajavahemikus {0} ja {1} Jäta taotlemise tähtaeg ei või olla vahel selles ajavahemikus.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Paigaldamine rekord Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Intress
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,Vastuse ootamine
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ülal
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Vale atribuut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Mainida, kui mittestandardsete makstakse konto"
 DocType: Salary Slip,Earning & Deduction,Teenimine ja mahaarvamine
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valikuline. See seadistus filtreerida erinevate tehingute.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatiivne Hindamine Rate ei ole lubatud
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,Tootmise Telli toode
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kirjet ei leitud
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kulud Käibelt kõrvaldatud Asset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,osaliselt ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Cost Center on kohustuslik Punkt {2}
 DocType: Vehicle,Policy No,poliitika pole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Võta Kirjed Toote Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Võta Kirjed Toote Bundle
 DocType: Asset,Straight Line,Sirgjoon
 DocType: Project User,Project User,projekti Kasutaja
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,lõhe
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,Saada üliõpilast
 DocType: Hub Settings,Seller Country,Müüja Riik
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Avalda Kirjed Koduleht
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Group õpilased partiidena
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Group õpilased partiidena
 DocType: Authorization Rule,Authorization Rule,Luba reegel
 DocType: Sales Invoice,Terms and Conditions Details,Tingimused Detailid
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tehnilisi
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Tšekk kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ei kuulu firma: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Taotlejad
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Edukalt kustutatud kõik tehingud, mis on seotud selle firma!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kuupäeva järgi
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Registreerimine kuupäev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Karistusest
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,palk komponendid
 DocType: Program Enrollment Tool,New Academic Year,Uus õppeaasta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Tagasi / kreeditarve
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Tagasi / kreeditarve
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto sisestada Hinnakiri määra, kui puuduvad"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Kokku Paide summa
 DocType: Production Order Item,Transferred Qty,Kantud Kogus
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tüüp lehed nagu juhuslik, haige vms"
 DocType: Email Digest,Send regular summary reports via Email.,Saada regulaarselt koondaruanded e-posti teel.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Palun määra vaikimisi konto kulu Nõude tüüp {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Palun määra vaikimisi konto kulu Nõude tüüp {0}
 DocType: Assessment Result,Student Name,Õpilase nimi
 DocType: Brand,Item Manager,Punkt Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,palgafond on tasulised
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,Müügi lehtri
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Lühend on kohustuslik
 DocType: Project,Task Progress,ülesanne Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Ostukorvi
 ,Qty to Transfer,Kogus Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Hinnapakkumisi Leads või klientidele.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Lubatud muuta külmutatud laos
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Punkt Wise Maksu- Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Instituut lühend
 ,Item-wise Price List Rate,Punkt tark Hinnakiri Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Tarnija Tsitaat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Sõnades on nähtav, kui salvestate pakkumise."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kogus ({0}) ei saa olla vaid murdosa reas {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,koguda lõive
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Lugu {0} on juba kasutatud Punkt {1}
 DocType: Lead,Add to calendar on this date,Lisa kalendrisse selle kuupäeva
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reeglid lisamiseks postikulud.
 DocType: Item,Opening Stock,algvaru
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",protokoll Uuendatud kaudu &quot;Aeg Logi &#39;
 DocType: Customer,From Lead,Plii
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Tellimused lastud tootmist.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vali Fiscal Year ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vali Fiscal Year ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile vaja teha POS Entry
 DocType: Program Enrollment Tool,Enroll Students,õppima üliõpilasi
 DocType: Hub Settings,Name Token,Nimi Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} vastu müügiarve {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekti nimi
-DocType: Supplier,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
+DocType: Customer,Mention if non-standard receivable account,Nimetatakse mittestandardsete saadaoleva konto
 DocType: Journal Entry Account,If Income or Expense,Kui tulu või kuluna
 DocType: Production Order,Required Items,VAJAMINEVA
 DocType: Stock Ledger Entry,Stock Value Difference,Stock väärtuse erinevused
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Määra eesmärgid Punkt Group tark selle müügi isik.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Varud vanem kui [Päeva]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rida # {0}: vara on kohustuslik põhivara ost / müük
-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.","Kui kaks või enam Hinnakujundus reeglid on vastavalt eespool nimetatud tingimustele, Priority rakendatakse. Prioriteet on number vahemikus 0 kuni 20, kui default väärtus on null (tühi). Suurem arv tähendab, et see on ülimuslik kui on mitu Hinnakujundus reeglite samadel tingimustel."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Kui kaks või enam Hinnakujundus reeglid on vastavalt eespool nimetatud tingimustele, Priority rakendatakse. Prioriteet on number vahemikus 0 kuni 20, kui default väärtus on null (tühi). Suurem arv tähendab, et see on ülimuslik kui on mitu Hinnakujundus reeglite samadel tingimustel."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ei ole olemas
 DocType: Currency Exchange,To Currency,Et Valuuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laske järgmised kasutajad kinnitada Jäta taotlused blokeerida päeva.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Punkt {0} ignoreerida, sest see ei ole laoartikkel"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Saada see Production Tellimus edasiseks töötlemiseks.
-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.","Et ei kohaldata Hinnakujundus reegel konkreetne tehing, kõik kohaldatavad Hinnakujundusreeglid tuleks keelata."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Et ei kohaldata Hinnakujundus reegel konkreetne tehing, kõik kohaldatavad Hinnakujundusreeglid tuleks keelata."
 DocType: Assessment Group,Parent Assessment Group,Parent hindamine Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Tööturg
 ,Sales Order Trends,Sales Order Trends
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,Lisakulu
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Majandusaasta lõpus kuupäev
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Ei filtreerimiseks Voucher Ei, kui rühmitatud Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Tee Tarnija Tsitaat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Tee Tarnija Tsitaat
 DocType: Quality Inspection,Incoming,Saabuva
 DocType: BOM,Materials Required (Exploded),Vajalikud materjalid (Koostejoonis)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Lisa kasutajatel oma organisatsioonid peale ise
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,Ajalugu Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Infolehed
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kliendi&gt; Kliendi Group&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Sama toode on kantud mitu korda
 DocType: Department,Leave Block List,Jäta Block loetelu
 DocType: Sales Invoice,Tax ID,Maksu- ID
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,Müük Partner ja komisjoni
 DocType: Employee Loan,Rate of Interest (%) / Year,Intressimäär (%) / Aasta
 ,Project Quantity,projekti Kogus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kokku {0} kõik elemendid on null, võib olla sa peaksid muutma &quot;Hajuta põhinevad maksud&quot;"
 DocType: Opportunity,To Discuss,Arutama
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ühikut {1} vaja {2} tehingu lõpuleviimiseks.
 DocType: Loan Type,Rate of Interest (%) Yearly,Intressimäär (%) Aastane
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,Tagasipöördumine
 DocType: Production Order Operation,Production Order Operation,Tootmine Tellimus operatsiooni
 DocType: Pricing Rule,Disable,Keela
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Maksmise viis on kohustatud makse
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Maksmise viis on kohustatud makse
 DocType: Project Task,Pending Review,Kuni Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei saa lammutada, sest see on juba {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kogukulude nõue (via kuluhüvitussüsteeme)
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark leidu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rida {0}: valuuta Bom # {1} peaks olema võrdne valitud valuuta {2}
 DocType: Journal Entry Account,Exchange Rate,Vahetuskurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} ei ole esitatud
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Lisa esemed
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Lisa esemed
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Ladu {0}: Parent konto {1} ei BoLong ettevõtte {2}
 DocType: Cheque Print Template,Regular,regulaarne
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Kokku weightage kõik Hindamiskriteeriumid peavad olema 100%
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Ladu {0} ei ole olemas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registreeru For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Kuu jaotusprotsentide
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valitud parameetrit ei ole partii
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valitud parameetrit ei ole partii
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Hindamine määr ei leitud Punkt {0}, mis on vaja teha, raamatupidamise kandeid {1} {2}. Kui objekt on tehinguid prooviks elemendi {1}, palume mainida, et {1} Punkt tabelis. Vastasel juhul palun luua sissetuleva börsitehingu objekt või mainimist hindamise määr Punkt rekord, ja proovige seejärel saata ühe / tühistades sõnadest"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materjalidest tarnitud vastu Saateleht
 DocType: Project,Customer Details,Kliendi andmed
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Sisesta url parameeter vastuvõtja nos
 DocType: Payment Entry,Paid Amount,Paide summa
 DocType: Assessment Plan,Supervisor,juhendaja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Hetkel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Hetkel
 ,Available Stock for Packing Items,Saadaval Stock jaoks asjade pakkimist
 DocType: Item Variant,Item Variant,Punkt Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Hinnang Tulemus Tool
 DocType: BOM Scrap Item,BOM Scrap Item,Bom Vanametalli toode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Esitatud tellimusi ei saa kustutada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jääk juba Deebetkaart, sa ei tohi seada &quot;Balance tuleb&quot; nagu &quot;Credit&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kvaliteedijuhtimine
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} on keelatud
 DocType: Employee Loan,Repay Fixed Amount per Period,Maksta kindlaksmääratud summa Periood
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Palun sisestage koguse Punkt {0}
 DocType: Employee External Work History,Employee External Work History,Töötaja Väline tööandjad
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E-ID
 DocType: Employee,Notice (days),Teade (päeva)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Valige objekt, et salvestada arve"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Valige objekt, et salvestada arve"
 DocType: Employee,Encashment Date,Inkassatsioon kuupäev
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock reguleerimine
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,Atribuut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Palun täpsustage, kust / ulatuda"
 DocType: Serial No,Under AMC,Vastavalt AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Punkt hindamise ümberarvutamise arvestades maandus kulude voucher summa
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Punkt hindamise ümberarvutamise arvestades maandus kulude voucher summa
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Vaikimisi seadete müügitehinguid.
 DocType: Guardian,Guardian Of ,eestkostja
 DocType: Grading Scale Interval,Threshold,künnis
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Deebetarvega
 DocType: Production Order,Warehouses,Laod
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} vara ei saa üle
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,See toode on variant {0} (Template).
 DocType: Workstation,per hour,tunnis
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ostmine
 DocType: Announcement,Announcement,teade
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,Nõuete
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ei ole lubatud muuta tarnija Ostutellimuse juba olemas
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Roll, mis on lubatud esitada tehinguid, mis ületavad laenu piirmäärade."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vali Pane Tootmine
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Vali Pane Tootmine
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master andmete sünkroonimine, see võib võtta aega"
 DocType: Item,Material Issue,Materjal Issue
 DocType: Hub Settings,Seller Description,Müüja kirjeldus
 DocType: Employee Education,Qualification,Kvalifikatsioonikeskus
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Tellitud
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Hindamiskriteeriumid Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avamine akumuleeritud kulum peab olema väiksem kui võrdne {0}
 DocType: Warehouse,Warehouse Name,Ladu nimi
 DocType: Naming Series,Select Transaction,Vali Tehing
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Palun sisestage kinnitamine Role või heaks Kasutaja
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Kuupäev peaks jääma eelarveaastal. Eeldades, et Date = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Siin saate säilitada pikkus, kaal, allergia, meditsiini muresid etc"
 DocType: Leave Block List,Applies to Company,Kehtib Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Ei saa tühistada, sest esitatud Stock Entry {0} on olemas"
 DocType: Employee Loan,Disbursement Date,Väljamakse kuupäev
 DocType: Vehicle,Vehicle,sõiduk
 DocType: Purchase Invoice,In Words,Sõnades
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plii%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Amortisatsiooniaruanne ja Kaalud
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} ülekantud {2} kuni {3}
 DocType: Sales Invoice,Get Advances Received,Saa ettemaksed
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saajad
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Tehing ei ole lubatud vastu lõpetas tootmise Tellimus {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Et määrata selle Fiscal Year as Default, kliki &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,liituma
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Puuduse Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} on olemas sama atribuute
 DocType: Employee Loan,Repay from Salary,Tagastama alates Palk
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},TELLIN tasumises {0} {1} jaoks kogus {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Hindamise tulemused teave
 DocType: Employee Education,Employee Education,Töötajate haridus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate kirje rühm leidis elemendi rühma tabelis
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"See on vajalik, et tõmbad Punkt Details."
 DocType: Salary Slip,Net Pay,Netopalk
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} on juba saanud
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Ladu {0} ei ole seotud ühegi kontot, siis loo / link vastava (Asset) konto lattu."
 DocType: Purchase Invoice,Recurring Id,Korduvad Id
 DocType: Customer,Sales Team Details,Sales Team Üksikasjad
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Kustuta jäädavalt?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Kustuta jäädavalt?
 DocType: Expense Claim,Total Claimed Amount,Kokku nõutav summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentsiaalne võimalusi müüa.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Vale {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup oma kooli ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Põhimuutus summa (firma Valuuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No raamatupidamise kanded järgmiste laod
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Säästa dokumendi esimene.
 DocType: Account,Chargeable,Maksustatav
 DocType: Company,Change Abbreviation,Muuda lühend
 DocType: Expense Claim Detail,Expense Date,Kulu kuupäev
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Viimati tellimuse summa
+DocType: Task,Is Milestone,Kas Milestone
 DocType: Daily Work Summary,Email Sent To,Saadetud e-
 DocType: Budget,Warn,Hoiatama
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Muid märkusi, tähelepanuväärne jõupingutusi, et peaks minema arvestust."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,Omadus Value
 ,Itemwise Recommended Reorder Level,Itemwise Soovitatav Reorder Level
 DocType: Salary Detail,Salary Detail,palk Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Palun valige {0} Esimene
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Palun valige {0} Esimene
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Partii {0} Punkt {1} on aegunud.
 DocType: Sales Invoice,Commission,Vahendustasu
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Aeg Sheet valmistamiseks.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Varud Vanemad Than` peab olema väiksem kui% d päeva.
 DocType: Tax Rule,Purchase Tax Template,Ostumaks Mall
 ,Project wise Stock Tracking,Projekti tark Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Hoolduskava {0} on olemas vastu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tegelik Kogus (tekkekohas / target)
 DocType: Item Customer Detail,Ref Code,Ref kood
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Töötaja arvestust.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Palun määra Järgmine kulum kuupäev
 DocType: HR Settings,Payroll Settings,Palga Seaded
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match mitte seotud arved ja maksed.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Esita tellimus
 DocType: Email Digest,New Purchase Orders,Uus Ostutellimuste
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Juur ei saa olla vanem kulukeskus
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Vali brändi ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Vali brändi ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumuleeritud kulum kohta
 DocType: Sales Invoice,C-Form Applicable,C-kehtival kujul
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tööaeg peab olema suurem kui 0 operatsiooni {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Ladu on kohustuslik
 DocType: Supplier,Address and Contacts,Aadress ja Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hoidke see web sõbralik 900px (w) poolt 100px (h)
 DocType: Program,Program Abbreviation,programm lühend
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Tootmine tellimust ei ole võimalik vastu tekitatud Punkt Mall
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Maksud uuendatakse ostutšekk iga punkti
 DocType: Warranty Claim,Resolved By,Lahendatud
 DocType: Bank Guarantee,Start Date,Alguskuupäev
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Eraldada lehed perioodiks.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tšekid ja hoiused valesti puhastatud
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Konto {0} Te ei saa määrata ise vanemakonto
 DocType: Purchase Invoice Item,Price List Rate,Hinnakiri Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Loo klientide hinnapakkumisi
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Loo klientide hinnapakkumisi
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Show &quot;In Stock&quot; või &quot;Ei ole laos&quot; põhineb laos olemas see lattu.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Materjaliandmik (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Keskmine aeg, mis kulub tarnija andma"
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Hinnang Tulemus
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Tööaeg
 DocType: Project,Expected Start Date,Oodatud Start Date
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Eemalda kirje, kui makse ei kohaldata selle objekti"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Eemalda kirje, kui makse ei kohaldata selle objekti"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Nt. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Tehingu vääring peab olema sama Payment Gateway valuuta
 DocType: Payment Entry,Receive,Saama
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,Tegevuskulud
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Action, kui kogunenud Kuu eelarve ületatud"
 DocType: Purchase Invoice,Submit on creation,Esitada kohta loomine
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuuta eest {0} peab olema {1}
 DocType: Asset,Disposal Date,müügikuupäevaga
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Kirjad saadetakse kõigile aktiivsetele Ettevõtte töötajad on teatud tunnil, kui neil ei ole puhkus. Vastuste kokkuvõte saadetakse keskööl."
 DocType: Employee Leave Approver,Employee Leave Approver,Töötaja Jäta Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: an Reorder kirje on juba olemas selle lao {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ei saa kuulutada kadunud, sest Tsitaat on tehtud."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,koolitus tagasiside
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Tootmine Tellimus {0} tuleb esitada
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Palun valige Start ja lõppkuupäeva eest Punkt {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Muidugi on kohustuslik järjest {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Praeguseks ei saa enne kuupäevast alates
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Klienditeenindus Lisa / uuenda Hinnad
 DocType: Batch,Parent Batch,Vanem Partii
 DocType: Cheque Print Template,Cheque Print Template,Tšekk Prindi Mall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Graafik kulukeskuste
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,Tellitud Esemed tuleb tarnida
 DocType: Account,Income,Sissetulek
 DocType: Industry Type,Industry Type,Tööstuse Tüüp
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Midagi läks valesti!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Midagi läks valesti!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Hoiatus: Jäta taotlus sisaldab järgmist plokki kuupäev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Müügiarve {0} on juba esitatud
 DocType: Assessment Result Detail,Score,tulemus
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,Põhinev variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kokku weightage määratud peaks olema 100%. On {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Sinu Tarnijad
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Ei saa määrata, kui on kaotatud Sales Order on tehtud."
 DocType: Request for Quotation Item,Supplier Part No,Tarnija osa pole
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saadud
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei saa maha arvata, kui kategooria on &quot;Hindamine&quot; või &quot;Vaulation ja kokku&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Saadud
 DocType: Lead,Converted,Converted
 DocType: Item,Has Serial No,Kas Serial No
 DocType: Employee,Date of Issue,Väljastamise kuupäev
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: From {0} ja {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: From {0} ja {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Vali Tarnija kirje {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rida {0}: Tundi väärtus peab olema suurem kui null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Koduleht Pilt {0} juurde Punkt {1} ei leitud
 DocType: Issue,Content Type,Sisu tüüp
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Arvuti
 DocType: Item,List this Item in multiple groups on the website.,Nimekiri see toode mitmes rühmade kodulehel.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Teil ei ole seada Külmutatud väärtus
 DocType: Payment Reconciliation,Get Unreconciled Entries,Võta unreconciled kanded
 DocType: Payment Reconciliation,From Invoice Date,Siit Arve kuupäev
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Arveldusvaluuta peab olema võrdne kas vaikimisi comapany valuuta või partei konto valuuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Jäta Inkassatsioon
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mida ta teeb?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Et Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kõik Student Sisseastujale
 ,Average Commission Rate,Keskmine Komisjoni Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Kas Serial No&quot; ei saa olla &quot;Jah&quot; mitte-laoartikkel
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Osavõtt märkida ei saa tulevikus kuupäev
 DocType: Pricing Rule,Pricing Rule Help,Hinnakujundus Reegel Abi
 DocType: School House,House Name,House Nimi
 DocType: Purchase Taxes and Charges,Account Head,Konto Head
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Uuenda lisakulude arvutamise maandus objektide soetusmaksumus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektriline
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisa oma ülejäänud organisatsiooni kasutajatele. Võite lisada ka kutsuda kliente oma portaalis lisades neid Kontaktid
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisa oma ülejäänud organisatsiooni kasutajatele. Võite lisada ka kutsuda kliente oma portaalis lisades neid Kontaktid
 DocType: Stock Entry,Total Value Difference (Out - In),Kokku Väärtus Difference (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Vahetuskurss on kohustuslik
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Kasutaja ID ei seatud Töötaja {0}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,Kliendi kood
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Sünnipäev Meeldetuletus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Päeva eelmisest Telli
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Kanne konto peab olema bilansis
 DocType: Buying Settings,Naming Series,Nimetades Series
 DocType: Leave Block List,Leave Block List Name,Jäta Block nimekiri nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Kindlustus Alguse kuupäev peaks olema väiksem kui Kindlustus Lõppkuupäev
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Palgatõend töötaja {0} on juba loodud ajaandmik {1}
 DocType: Vehicle Log,Odometer,odomeetri
 DocType: Sales Order Item,Ordered Qty,Tellitud Kogus
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punkt {0} on keelatud
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punkt {0} on keelatud
 DocType: Stock Settings,Stock Frozen Upto,Stock Külmutatud Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Bom ei sisalda laoartikkel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Bom ei sisalda laoartikkel
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ajavahemikul ja periood soovitud kohustuslik korduvad {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekti tegevus / ülesanne.
 DocType: Vehicle Log,Refuelling Details,tankimine detailid
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Viimati ostu määr ei leitud
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjutage Off summa (firma Valuuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Arved Tundi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Vaikimisi Bom {0} ei leitud
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: määrake reorganiseerima kogusest
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Puuduta Toodete lisamiseks neid siin
 DocType: Fees,Program Enrollment,programm Registreerimine
 DocType: Landed Cost Voucher,Landed Cost Voucher,Maandus Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Palun määra {0}
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,Hooldus kuupäev
 DocType: Purchase Invoice Item,Rejected Serial No,Tagasilükatud Järjekorranumber
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Aasta algus- või lõppkuupäev kattub {0}. Et vältida, määrake ettevõte"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Alguskuupäev peab olema väiksem kui lõppkuupäev Punkt {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Alguskuupäev peab olema väiksem kui lõppkuupäev Punkt {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.","Näide: ABCD. ##### Kui seeria on seatud ja Serial No ei ole nimetatud tehingute, siis automaatne seerianumber luuakse põhineb selles sarjas. Kui tahad alati mainitaks Serial nr selle objekt. jäta tühjaks."
 DocType: Upload Attendance,Upload Attendance,Laadi Osavõtt
@@ -4261,7 +4273,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Jae- ja hulgimüük
 DocType: Issue,First Responded On,Esiteks vastas
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Risti noteerimine Punkt mitu rühmad
-DocType: Grade Interval,Grade Interval,Hinne intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiscal Year Alguse kuupäev ja Fiscal Year End Date on juba eelarveaastal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Kliirens Date updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partii
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,Reserveeritud Kogus Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Jäta märkimata, kui sa ei taha kaaluda partii tehes muidugi rühmi."
 DocType: Asset,Frequency of Depreciation (Months),Sagedus kulum (kuud)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Konto kreeditsaldoga
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Konto kreeditsaldoga
 DocType: Landed Cost Item,Landed Cost Item,Maandus kuluartikkel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Näita null väärtused
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kogus punkti saadi pärast tootmise / pakkimise etteantud tooraine kogused
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup lihtne veebilehel oma organisatsiooni
 DocType: Payment Reconciliation,Receivable / Payable Account,Laekumata / maksmata konto
 DocType: Delivery Note Item,Against Sales Order Item,Vastu Sales Order toode
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Palun täpsustage omadus Väärtus atribuut {0}
 DocType: Item,Default Warehouse,Vaikimisi Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Eelarve ei saa liigitada vastu Group Konto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Palun sisestage vanem kulukeskus
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,Põhimäär
 DocType: GL Entry,Credit Amount,Krediidi summa
 DocType: Cheque Print Template,Signatory Position,allakirjutanu seisukoht
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Määra Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Määra Lost
 DocType: Timesheet,Total Billable Hours,Kokku tasustatavat tundi
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksekviitung Märkus
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,See põhineb tehingute vastu Klient. Vaata ajakava allpool lähemalt
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,"Esemed, mida tuleb taotleda"
 DocType: Purchase Order,Get Last Purchase Rate,Võta Viimati ostmise korral
 DocType: Company,Company Info,Firma Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Valige või lisage uus klient
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Valige või lisage uus klient
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kuluüksus on vaja broneerida kulu nõude
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Application of Funds (vara)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,See põhineb käimist selle töötaja
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Deebetsaldoga konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Deebetsaldoga konto
 DocType: Fiscal Year,Year Start Date,Aasta alguskuupäev
 DocType: Attendance,Employee Name,Töötaja nimi
 DocType: Sales Invoice,Rounded Total (Company Currency),Ümardatud kokku (firma Valuuta)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Peatus kasutajad tegemast Jäta Rakendused järgmistel päevadel.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ostusummast
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tarnija Tsitaat {0} loodud
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End Aasta ei saa enne Start Aasta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Töövõtjate hüvitised
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakitud kogus peab olema võrdne koguse Punkt {0} järjest {1}
 DocType: Production Order,Manufactured Qty,Toodetud Kogus
 DocType: Purchase Receipt Item,Accepted Quantity,Aktsepteeritud Kogus
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Palun Algsete Holiday nimekiri Töötajaportaali {0} või ettevõtte {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} pole olemas
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} pole olemas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Arveid tõstetakse klientidele.
 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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rea nr {0}: summa ei saa olla suurem kui Kuni summa eest kuluhüvitussüsteeme {1}. Kuni Summa on {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lugemine 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Hinnakiri ei leitud või puudega
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Hinnakiri ei leitud või puudega
 DocType: Employee Loan Application,Approved,Kinnitatud
 DocType: Pricing Rule,Price,Hind
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Töötaja vabastati kohta {0} tuleb valida &#39;Vasak&#39;
 DocType: Guardian,Guardian,hooldaja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Hinnang {0} loodud Töötaja {1} antud ajavahemikus
 DocType: Employee,Education,Haridus
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaania nimetamine By
 DocType: Employee,Current Address Is,Praegune aadress
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifitseeritud
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valikuline. Lavakujundus ettevõtte default valuutat, kui ei ole täpsustatud."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Raamatupidamine päevikukirjete.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Saadaval Kogus kell laost
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Pidu / konto ei ühti {1} / {2} on {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Palun sisestage ärikohtumisteks
 DocType: Account,Stock,Varu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",Rida # {0}: Reference Document Type peab olema üks ostutellimustest ostuarve või päevikusissekanne
 DocType: Employee,Current Address,Praegune aadress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Kui objekt on variant teise elemendi siis kirjeldus, pilt, hind, maksud jne seatakse malli, kui ei ole märgitud"
 DocType: Serial No,Purchase / Manufacture Details,Ostu / Tootmine Detailid
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,Hub Seaded
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Mis Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Raamatupidamise kanded on tehtud juba valuuta {0} ja ettevõtete {1}. Palun valige saadaoleva või maksmisele konto valuuta {0}.
 DocType: Asset,Is Existing Asset,Kas Olemasolevad Asset
 DocType: Salary Detail,Statistical Component,Statistilised Component
 ,Monthly Salary Register,Kuupalga Registreeri
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,ruum
 DocType: Purchase Order,Advance Paid,Advance Paide
 DocType: Item,Item Tax,Punkt Maksu-
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materjal Tarnija
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materjal Tarnija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Aktsiisi Arve
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Lävepakk {0}% esineb enam kui ühel
 DocType: Expense Claim,Employees Email Id,Töötajad Post Id
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kinnita Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,varude
 DocType: Customer,Commission Rate,Komisjonitasu määr
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block puhkuse taotluste osakonda.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Makse tüüp peab olema üks vastuvõtmine, palk ja Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Makse tüüp peab olema üks vastuvõtmine, palk ja Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Ostukorv on tühi
 DocType: Vehicle,Model,mudel
@@ -4510,6 +4523,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Laske Production Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Kliendi ostutellimuse kuupäev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Aktsiakapitali
+DocType: Shopping Cart Settings,Show Public Attachments,Näita avalikud failid
 DocType: Packing Slip,Package Weight Details,Pakendi kaal Üksikasjad
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pärast makse lõpetamist suunata kasutaja valitud leheküljele.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,Aegumisaja
 ,Supplier Addresses and Contacts,Tarnija aadressid ja kontaktid
 ,accounts-browser,kontode brauser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Palun valige kategooria esimene
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Palun valige kategooria esimene
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekti kapten.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Et võimaldada üle-arvete või üle-tellimine, uuendada &quot;toetus&quot; Stock seaded või toode."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ära näita tahes sümbol nagu $ jne kõrval valuutades.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pool päeva)
 DocType: Supplier,Credit Days,Krediidi päeva
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tee Student Partii
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tee Student Partii
 DocType: Leave Type,Is Carry Forward,Kas kanda
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Võta Kirjed Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Võta Kirjed Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ooteaeg päeva
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rida # {0}: Postitamise kuupäev peab olema sama ostu kuupäevast {1} vara {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Palun sisesta müügitellimuste ülaltoodud tabelis
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Sanktsioneeritud summa
 DocType: GL Entry,Is Opening,Kas avamine
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: deebetkanne ei saa siduda koos {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Palun setup numbrite seeria osavõtt Setup&gt; numbrite seeria
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} ei ole olemas
 DocType: Account,Cash,Raha
 DocType: Employee,Short biography for website and other publications.,Lühike elulugu kodulehel ja teistes väljaannetes.
diff --git a/erpnext/translations/fa.csv b/erpnext/translations/fa.csv
index 429c21a..d2d9310 100644
--- a/erpnext/translations/fa.csv
+++ b/erpnext/translations/fa.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,اجاره
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,قابل استفاده برای کاربر
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",متوقف سفارش تولید نمی تواند لغو شود، آن را اولین Unstop برای لغو
 DocType: Vehicle Service,Mileage,مسافت پیموده شده
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,آیا شما واقعا می خواهید به قراضه این دارایی؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,کننده پیش فرض انتخاب کنید
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,کننده پیش فرض انتخاب کنید
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},برای اطلاع از قیمت ارز مورد نیاز است {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* * * * آیا می شود در معامله محاسبه می شود.
 DocType: Purchase Order,Customer Contact,مشتریان تماس با
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),برجسته برای {0} نمی تواند کمتر از صفر ({1})
 DocType: Manufacturing Settings,Default 10 mins,پیش فرض 10 دقیقه
 DocType: Leave Type,Leave Type Name,ترک نام نوع
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,نشان می دهد باز
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,نشان می دهد باز
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,سری به روز رسانی با موفقیت
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,وارسی
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ورود مجله ارسال شده
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,دسته ای مورد وضعیت انقضاء
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,حواله بانکی
 DocType: Mode of Payment Account,Mode of Payment Account,نحوه حساب پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,نمایش انواع
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,نمایش انواع
 DocType: Academic Term,Academic Term,ترم تحصیلی
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ماده
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جدول حسابها نمی تواند خالی باشد.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),وام (بدهی)
 DocType: Employee Education,Year of Passing,سال عبور
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",مرجع:٪ S، کد:٪ s و ضوابط:٪ s را
 DocType: Item,Country of Origin,کشور مبدا
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,در انبار
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,مسائل باز
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,بهداشت و درمان
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),تاخیر در پرداخت (روز)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,هزینه خدمات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,فاکتور
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},شماره سریال: {0} در حال حاضر در فاکتور فروش اشاره: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,فاکتور
 DocType: Maintenance Schedule Item,Periodicity,تناوب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,سال مالی {0} مورد نیاز است
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,انتظار می رود تاریخ تحویل قبل از سفارش فروش تاریخ شود
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ضمیمه. CSV فایل با دو ستون، یکی برای نام قدیمی و یکی برای نام جدید
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} در هر سال مالی فعال.
 DocType: Packed Item,Parent Detail docname,جزئیات docname پدر و مادر
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",مرجع: {0}، کد مورد: {1} و ضوابط: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,کیلوگرم
 DocType: Student Log,Log,ورود
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,باز کردن برای یک کار.
 DocType: Item Attribute,Increment,افزایش
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,انتخاب کنید ... انبار
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,انتخاب کنید ... انبار
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,تبلیغات
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همان شرکت است وارد بیش از یک بار
 DocType: Employee,Married,متاهل
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},برای مجاز نیست {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,گرفتن اقلام از
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},برای مجاز نیست {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,گرفتن اقلام از
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},سهام می تواند در برابر تحویل توجه نمی شود به روز شده {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},محصولات {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,بدون موارد ذکر شده
 DocType: Payment Reconciliation,Reconcile,وفق دادن
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,خواربار
 DocType: Quality Inspection Reading,Reading 1,خواندن 1
 DocType: Process Payroll,Make Bank Entry,را بانک ورودی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,صندوق های بازنشستگی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بعدی تاریخ استهلاک نمی تواند قبل از تاریخ خرید می باشد
 DocType: SMS Center,All Sales Person,تمام ماموران فروش
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماهانه ** شما کمک می کند توزیع بودجه / هدف در سراسر ماه اگر شما فصلی در کسب و کار خود را.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,نمی وسایل یافت شده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,نمی وسایل یافت شده
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,گمشده ساختار حقوق و دستمزد
 DocType: Lead,Person Name,نام شخص
 DocType: Sales Invoice Item,Sales Invoice Item,مورد فاکتور فروش
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",به عنوان مثال &quot;مدرسه ابتدایی&quot; یا &quot;دانشگاه&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,گزارش سهام
 DocType: Warehouse,Warehouse Detail,جزئیات انبار
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},حد اعتبار شده است برای مشتری عبور {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,تاریخ پایان ترم نمی تواند بعد از تاریخ سال پایان سال تحصیلی که مدت مرتبط است باشد (سال تحصیلی {}). لطفا تاریخ های صحیح و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا دارایی ثابت&quot; نمی تواند بدون کنترل، به عنوان رکورد دارایی در برابر مورد موجود است
 DocType: Vehicle Service,Brake Oil,روغن ترمز
 DocType: Tax Rule,Tax Type,نوع مالیات
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},شما مجاز به اضافه و یا به روز رسانی مطالب قبل از {0} نیستید
 DocType: BOM,Item Image (if not slideshow),مورد تصویر (در صورت اسلاید نمی شود)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,مشتری با همین نام وجود دارد
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(یک ساعت یک نرخ / 60) * * * * واقعی زمان عمل
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,انتخاب BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,انتخاب BOM
 DocType: SMS Log,SMS Log,SMS ورود
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,هزینه اقلام تحویل شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,تعطیلات در {0} است بین از تاریخ و تا به امروز نیست
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,مدارس
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},هیچ سابقه مرخصی پیدا شده برای کارکنان {0} برای {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,لطفا ابتدا وارد شرکت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,لطفا ابتدا شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,هزینه کل
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,مقدار ادعا
 DocType: Employee,Mr,آقای
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,گروه مشتری تکراری در جدول گروه cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,نوع منبع / تامین کننده
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,نوع منبع / تامین کننده
 DocType: Naming Series,Prefix,پیشوند
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,مصرفی
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,مقطع تحصیلی
 DocType: Sales Invoice Item,Delivered By Supplier,تحویل داده شده توسط کننده
 DocType: SMS Center,All Contact,همه تماس
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,تولید سفارش در حال حاضر برای همه موارد با BOM ایجاد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,حقوق سالانه
 DocType: Daily Work Summary,Daily Work Summary,خلاصه کار روزانه
 DocType: Period Closing Voucher,Closing Fiscal Year,بستن سال مالی
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} فریز شده است
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} فریز شده است
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,لطفا موجود شرکت برای ایجاد نمودار از حساب را انتخاب کنید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,هزینه سهام
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,انتخاب هدف انبار
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,کنترا ورود
 DocType: Journal Entry Account,Credit in Company Currency,اعتبار در شرکت ارز
 DocType: Delivery Note,Installation Status,وضعیت نصب و راه اندازی
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",آیا شما می خواهید برای به روز رسانی حضور؟ <br> در حال حاضر: {0} \ <br> وجود ندارد: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},پذیرفته شده + رد تعداد باید به دریافت مقدار برابر برای مورد است {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,عرضه مواد اولیه برای خرید
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,باید حداقل یک حالت پرداخت برای فاکتور POS مورد نیاز است.
 DocType: Products Settings,Show Products as a List,نمایش محصولات به عنوان یک فهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود الگو، داده مناسب پر کنید و ضمیمه فایل تغییر یافتهاست. همه تاریخ و کارمند ترکیبی در دوره زمانی انتخاب شده در قالب آمده، با سوابق حضور و غیاب موجود
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ورود استهلاک
 DocType: Appraisal Template Goal,KRA,ناحیه جنوبی
 DocType: Lead,Request Type,درخواست نوع
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,کارمند
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,کارمند
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,رادیو و تلویزیون
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,اعدام
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,جزئیات عملیات انجام شده است.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,برنامه ریزی برای بازدیدکننده داشته است نگهداری.
 DocType: SMS Settings,Enter url parameter for message,پارامتر URL برای پیام را وارد کنید
 DocType: POS Profile,Customer Groups,گروه های مشتری
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,صورت های مالی
 DocType: Guardian,Students,دانش آموزان
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,مشاهده قوانین برای استفاده از قیمت گذاری و تخفیف.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,لیست قیمت ها باید قابل استفاده برای خرید و یا فروش است
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},مقدار پیش نمی تواند بیشتر از {0} {1}
 DocType: Naming Series,Series List for this Transaction,فهرست سری ها برای این تراکنش
 DocType: Company,Default Payroll Payable Account,به طور پیش فرض حقوق و دستمزد پرداختنی حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,به روز رسانی ایمیل گروه
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,به روز رسانی ایمیل گروه
 DocType: Sales Invoice,Is Opening Entry,باز ورودی
 DocType: Customer Group,Mention if non-standard receivable account applicable,اگر حساب دریافتنی ذکر غیر استاندارد قابل اجرا
 DocType: Course Schedule,Instructor Name,نام مربی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ذخیره سازی قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,نمایندگی فروش
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",اگر علامت زده شود، شامل اقلام غیر سهام در درخواست مواد.
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,در برابر آیتم فاکتور فروش
 ,Production Orders in Progress,سفارشات تولید در پیشرفت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,نقدی خالص از تامین مالی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",LocalStorage را کامل است، نجات نداد
 DocType: Lead,Address & Contact,آدرس و تلفن تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,اضافه کردن برگ های استفاده نشده از تخصیص قبلی
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},بعدی دوره ای {0} خواهد شد در ایجاد {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),مجموع هزینه یابی مقدار (از طریق زمان ورق)
 DocType: Item Website Specification,Item Website Specification,مشخصات مورد وب سایت
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ترک مسدود
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,مطالب بانک
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},مورد {0} به پایان زندگی بر روی رسید {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,مطالب بانک
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالیانه
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,مورد سهام آشتی
 DocType: Stock Entry,Sales Invoice No,فاکتور فروش بدون
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,انتشار در توپی
 DocType: Student Admission,Student Admission,پذیرش دانشجو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,مورد {0} لغو شود
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,درخواست مواد
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,مورد {0} لغو شود
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,درخواست مواد
 DocType: Bank Reconciliation,Update Clearance Date,به روز رسانی ترخیص کالا از تاریخ
 DocType: Item,Purchase Details,جزئیات خرید
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},مورد {0} در &#39;مواد اولیه عرضه شده جدول در سفارش خرید یافت نشد {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,چک برجسته و سپرده برای روشن
 DocType: Item,Synced With Hub,همگام سازی شده با توپی
 DocType: Vehicle,Fleet Manager,ناوگان مدیر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},ردیف # {0}: {1} نمی تواند برای قلم منفی {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,رمز اشتباه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},ردیف # {0}: {1} نمی تواند برای قلم منفی {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,رمز اشتباه
 DocType: Item,Variant Of,نوع از
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',تکمیل تعداد نمی تواند بیشتر از &#39;تعداد برای تولید&#39;
 DocType: Period Closing Voucher,Closing Account Head,بستن سر حساب
 DocType: Employee,External Work History,سابقه کار خارجی
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,خطا مرجع مدور
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,با رایانامه آگاه کن در ایجاد درخواست مواد اتوماتیک
 DocType: Journal Entry,Multi Currency,چند ارز
 DocType: Payment Reconciliation Invoice,Invoice Type,فاکتور نوع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,رسید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,رسید
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,راه اندازی مالیات
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,هزینه دارایی فروخته شده
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ورود پرداخت اصلاح شده است پس از آن کشیده شده است. لطفا آن را دوباره بکشید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
-DocType: Grade Interval,Min Score,حداقل امتیاز
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} دو بار در مالیات وارد شده است
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,خلاصه برای این هفته و فعالیت های انتظار
 DocType: Student Applicant,Admitted,پذیرفته
 DocType: Workstation,Rent Cost,اجاره هزینه
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,سفارش ارزش
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,معاملات بانک / پول نقد در برابر حزب و یا برای انتقال داخلی
 DocType: Shipping Rule,Valid for Countries,معتبر برای کشورهای
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,این مورد از یک الگو است و می تواند در معاملات مورد استفاده قرار گیرد. ویژگی های مورد خواهد بود بیش از به انواع کپی مگر اینکه &#39;هیچ نسخه&#39; تنظیم شده است
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ترتیب مجموع در نظر گرفته شده
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",طراحی کارمند (به عنوان مثال مدیر عامل و غیره).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,لطفا وارد کنید &#39;تکرار در روز از ماه مقدار فیلد
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ردیف # {0}: خرید فاکتور می تواند در برابر یک دارایی موجود ساخته نمی شود {1}
 DocType: Item Tax,Tax Rate,نرخ مالیات
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} در حال حاضر برای کارکنان اختصاص داده {1} برای مدت {2} به {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,انتخاب مورد
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,انتخاب مورد
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,فاکتور خرید {0} در حال حاضر ارائه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ردیف # {0}: دسته ای بدون باید همان باشد {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,تبدیل به غیر گروه
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,دسته ای (زیادی) از آیتم استفاده کنید.
 DocType: C-Form Invoice Detail,Invoice Date,تاریخ فاکتور
 DocType: GL Entry,Debit Amount,مقدار بدهی
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},فقط می تواند وجود 1 حساب در هر شرکت می شود {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,لطفا پیوست را ببینید
 DocType: Purchase Order,% Received,٪ دریافتی
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ایجاد گروه دانشجویی
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,درخواست برای نقل قول
 DocType: Salary Slip Timesheet,Working Hours,ساعات کاری
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,تغییر شروع / شماره توالی فعلی از یک سری موجود است.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ایجاد یک مشتری جدید
-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.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ایجاد سفارشات خرید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ایجاد یک مشتری جدید
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",اگر چند در قوانین قیمت گذاری ادامه غالب است، از کاربران خواسته به تنظیم اولویت دستی برای حل و فصل درگیری.
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ایجاد سفارشات خرید
 ,Purchase Register,خرید ثبت نام
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,اتهامات قابل اجرا
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید اجازه 'تایید و امضا مرخصی' را داشته باشید
 DocType: Purchase Receipt,Vehicle Date,خودرو تاریخ
 DocType: Student Log,Medical,پزشکی
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,دلیل برای از دست دادن
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,دلیل برای از دست دادن
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,مالک سرب نمی تواند همان سرب
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,مقدار اختصاص داده شده می توانید بیشتر از مقدار تعدیل نشده
 DocType: Announcement,Receiver,گیرنده
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار و نرخ
 DocType: Delivery Note,% Installed,٪ نصب شد
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس های درس / آزمایشگاه و غیره که در آن سخنرانی می توان برنامه ریزی.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,لطفا ابتدا نام شرکت وارد
 DocType: Purchase Invoice,Supplier Name,نام منبع
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,خواندن کتابچه راهنمای کاربر ERPNext
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,قدیمی مرجع
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,فیلد اجباری - سال تحصیلی
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,سفارشی کردن متن مقدماتی است که می رود به عنوان یک بخشی از آن ایمیل. هر معامله دارای یک متن مقدماتی جداگانه.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},لطفا پیش فرض حساب های قابل پرداخت تعیین شده برای شرکت {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تنظیمات جهانی برای تمام فرآیندهای تولید.
 DocType: Accounts Settings,Accounts Frozen Upto,حساب منجمد تا حد
 DocType: SMS Log,Sent On,فرستاده شده در
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ویژگی {0} چند بار در صفات جدول انتخاب
 DocType: HR Settings,Employee record is created using selected field. ,رکورد کارمند با استفاده از درست انتخاب شده ایجاد می شود.
 DocType: Sales Order,Not Applicable,قابل اجرا نیست
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,کارشناسی ارشد تعطیلات.
 DocType: Request for Quotation Item,Required Date,تاریخ مورد نیاز
 DocType: Delivery Note,Billing Address,نشانی صورتحساب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,لطفا کد مورد را وارد کنید.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,لطفا کد مورد را وارد کنید.
 DocType: BOM,Costing,هزینه یابی
 DocType: Tax Rule,Billing County,شهرستان صدور صورت حساب
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",در صورت انتخاب، میزان مالیات در نظر گرفته خواهد به عنوان در حال حاضر در چاپ نرخ / چاپ مقدار شامل
@@ -500,6 +504,7 @@
 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,اوراق بهادار و سپرده ها
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",می توانید از روش ارزشگذاری را تغییر دهید، به عنوان معاملات در برابر برخی از موارد که آن را ندارد وجود دارد روش ارزشگذاری خود است
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مجموع برگ اختصاص داده الزامی است
 DocType: Job Opening,Description of a Job Opening,شرح یک شغل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,فعالیت های در انتظار برای امروز
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,افسر اداری
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا دوره را انتخاب کنید
 DocType: Timesheet Detail,Hrs,ساعت
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,لطفا انتخاب کنید شرکت
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,لطفا انتخاب کنید شرکت
 DocType: Stock Entry Detail,Difference Account,حساب تفاوت
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,می توانید کار نزدیک به عنوان وظیفه وابسته به آن {0} بسته نشده است نیست.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا انبار که درخواست مواد مطرح خواهد شد را وارد کنید
 DocType: Production Order,Additional Operating Cost,هزینه های عملیاتی اضافی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,آرایشی و بهداشتی
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",به ادغام، خواص زیر باید همین کار را برای هر دو مورد می شود
 DocType: Shipping Rule,Net Weight,وزن خالص
 DocType: Employee,Emergency Phone,تلفن اضطراری
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خرید
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا درجه برای آستانه 0٪ تعریف
 DocType: Sales Order,To Deliver,رساندن
 DocType: Purchase Invoice Item,Item,بخش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,سریال هیچ مورد نمی تواند کسری
 DocType: Journal Entry,Difference (Dr - Cr),تفاوت (دکتر - کروم)
 DocType: Account,Profit and Loss,حساب سود و زیان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,مدیریت مقاطعه کاری فرعی
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,افزایش نمی تواند 0
 DocType: Production Planning Tool,Material Requirement,مورد نیاز مواد
 DocType: Company,Delete Company Transactions,حذف معاملات شرکت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,مرجع و تاریخ در مرجع برای معامله بانک الزامی است
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,افزودن / ویرایش مالیات ها و هزینه ها
 DocType: Purchase Invoice,Supplier Invoice No,تامین کننده فاکتور بدون
 DocType: Territory,For reference,برای مرجع
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,نصب و راه اندازی توجه داشته باشید مورد
 DocType: Production Plan Item,Pending Qty,انتظار تعداد
 DocType: Budget,Ignore,نادیده گرفتن
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} غیر فعال است
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS با شماره های زیر ارسال گردید: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ابعاد چک راه اندازی برای چاپ
 DocType: Salary Slip,Salary Slip Timesheet,برنامه زمانی حقوق و دستمزد لغزش
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,کمیسیون ها
 DocType: Pricing Rule,Sales Partner,شریک فروش
 DocType: Buying Settings,Purchase Receipt Required,رسید خرید مورد نیاز
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,نرخ ارزش گذاری الزامی است باز کردن سهام وارد
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیچ ثبتی یافت نشد در جدول فاکتور
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا ابتدا شرکت و حزب نوع را انتخاب کنید
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,مالی سال / حسابداری.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ارزش انباشته
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",با عرض پوزش، سریال شماره نمی تواند با هم ادغام شدند
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,را سفارش فروش
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,را سفارش فروش
 DocType: Project Task,Project Task,وظیفه پروژه
 ,Lead Id,کد شناسایی راهبر
 DocType: C-Form Invoice Detail,Grand Total,بزرگ ها
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,پیوست رزومه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,مشتریان تکرار
 DocType: Leave Control Panel,Allocate,اختصاص دادن
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,برگشت فروش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,برگشت فروش
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,توجه: مجموع برگ اختصاص داده {0} نباید کمتر از برگ حال حاضر مورد تایید {1} برای دوره
 DocType: Announcement,Posted By,ارسال شده توسط
 DocType: Item,Delivered by Supplier (Drop Ship),تحویل داده شده توسط کننده (قطره کشتی)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,نقل قول برای
 DocType: Lead,Middle Income,با درآمد متوسط
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاح (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,مقدار اختصاص داده شده نمی تونه منفی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,لطفا مجموعه ای از شرکت
 DocType: Purchase Order Item,Billed Amt,صورتحساب AMT
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فاکتور فروش برنامه زمانی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},مرجع بدون مرجع و تاریخ مورد نیاز است برای {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب حساب پرداخت به ورود بانک
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",درست سوابق کارمند به مدیریت برگ، ادعاهای هزینه و حقوق و دستمزد
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,اضافه کردن به پایگاه دانش
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,نوشتن طرح های پیشنهادی
 DocType: Payment Entry Deduction,Payment Entry Deduction,پرداخت کسر ورود
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' در سال مالی شماره {2}  وجود ندارد
 DocType: Buying Settings,Settings for Buying Module,تنظیمات برای خرید ماژول
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},دارایی {0} به شرکت تعلق ندارد {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,لطفا ابتدا وارد رسید خرید
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",مشاهده قوانین سپس قیمت گذاری بر اساس مشتری، مشتری گروه، منطقه، تامین کننده، تامین کننده نوع، کمپین، فروش شریک و غیره فیلتر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,تغییر خالص در پرسشنامه
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,کارمند مدیریت وام
 DocType: Employee,Passport Number,شماره پاسپورت
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ارتباط با Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدیر
 DocType: Payment Entry,Payment From / To,پرداخت از / به
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,محدوده زمانی
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},حد اعتبار جدید کمتر از مقدار برجسته فعلی برای مشتری است. حد اعتبار به حداقل می شود {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""بر اساس"" و ""گروه شده توسط"" نمی توانند همسان باشند"
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,در دقیقهی
 DocType: Issue,Resolution Date,قطعنامه عضویت
 DocType: Student Batch Name,Batch Name,نام دسته ای
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,برنامه زمانی ایجاد شده:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,برنامه زمانی ایجاد شده:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},لطفا نقدی پیش فرض و یا حساب بانکی در نحوه پرداخت را تعیین {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ثبت نام کردن
 DocType: Selling Settings,Customer Naming By,نامگذاری مشتری توسط
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,آیا دانش آموز به عنوان دانش آموزان حضور و غیاب گزارش ماهانه در حال حاضر را نشان می دهد
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,واقعی زمان شروع
 DocType: BOM Operation,Operation Time,زمان عمل
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,پایان
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,پایه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,پایه
 DocType: Timesheet,Total Billed Hours,جمع ساعت در صورتحساب یا لیست
 DocType: Journal Entry,Write Off Amount,ارسال فعال مقدار
 DocType: Journal Entry,Bill No,شماره صورتحساب
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,حضور دانش آموز
 DocType: Sales Invoice Timesheet,Time Sheet,ورقه ثبت ساعات کار
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush مواد اولیه بر اساس
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,لطفا جزئیات آیتم را وارد کنید
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا جزئیات آیتم را وارد کنید
 DocType: Interest,Interest,علاقه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پیش فروش
 DocType: Purchase Receipt,Other Details,سایر مشخصات
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ورود پرداخت در حال حاضر ایجاد
 DocType: Purchase Receipt Item Supplied,Current Stock,سهام کنونی
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},ردیف # {0}: دارایی {1} به مورد در ارتباط نیست {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,پیش نمایش لغزش حقوق
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,پیش نمایش لغزش حقوق
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,حساب {0} وارد شده است چندین بار
 DocType: Account,Expenses Included In Valuation,هزینه های موجود در ارزش گذاری
 DocType: Hub Settings,Seller City,فروشنده شهر
 ,Absent Student Report,وجود ندارد گزارش دانشجو
 DocType: Email Digest,Next email will be sent on:,ایمیل بعدی خواهد شد در ارسال:
 DocType: Offer Letter Term,Offer Letter Term,ارائه نامه مدت
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,فقره انواع.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,فقره انواع.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,مورد {0} یافت نشد
 DocType: Bin,Stock Value,سهام ارزش
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} وجود ندارد
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,نوع درخت
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,نوع درخت
 DocType: BOM Explosion Item,Qty Consumed Per Unit,تعداد مصرف شده در هر واحد
 DocType: Serial No,Warranty Expiry Date,گارانتی تاریخ انقضاء
 DocType: Material Request Item,Quantity and Warehouse,مقدار و انبار
 DocType: Sales Invoice,Commission Rate (%),نرخ کمیسیون (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,لطفا انتخاب برنامه
 DocType: Project,Estimated Cost,هزینه تخمین زده شده
 DocType: Purchase Order,Link to material requests,لینک به درخواست مواد
@@ -753,7 +756,7 @@
 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,به طور پیش فرض حساب
 DocType: Payment Entry,Received Amount (Company Currency),دریافت مبلغ (شرکت ارز)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,سرب باید مجموعه اگر فرصت است از سرب ساخته شده
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا روز مرخصی در هفته را انتخاب کنید
 DocType: Production Order Operation,Planned End Time,برنامه ریزی زمان پایان
 ,Sales Person Target Variance Item Group-Wise,فرد از فروش مورد هدف واریانس گروه حکیم
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,فرصت از
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,بیانیه حقوق ماهانه.
 DocType: BOM,Website Specifications,مشخصات وب سایت
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: از {0} از نوع {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ردیف {0}: عامل تبدیل الزامی است
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,شماره حساب بانک
 DocType: Bank Guarantee,Project,پروژه
 DocType: Quality Inspection Reading,Reading 7,خواندن 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,پاره مرتب
 DocType: Expense Claim Detail,Expense Claim Type,هزینه نوع ادعا
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,تنظیمات پیش فرض برای سبد خرید
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},دارایی اوراق از طریق ورود مجله {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,هزینه نگهداری و تعمیرات دفتر
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,راه اندازی حساب ایمیل
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,لطفا ابتدا آیتم را وارد کنید
 DocType: Account,Liability,مسئوليت
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,مقدار تحریم نیست می تواند بیشتر از مقدار ادعای در ردیف {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,لیست قیمت انتخاب نشده
 DocType: Employee,Family Background,سابقه خانواده
 DocType: Request for Quotation Supplier,Send Email,ارسال ایمیل
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},هشدار: پیوست معتبر {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,بدون اجازه
 DocType: Company,Default Bank Account,به طور پیش فرض حساب بانکی
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",برای فیلتر کردن بر اساس حزب، حزب انتخاب نوع اول
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,بدون کارمند یافت
 DocType: Supplier Quotation,Stopped,متوقف
 DocType: Item,If subcontracted to a vendor,اگر به یک فروشنده واگذار شده
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,دانشجویی گروه در حال حاضر به روز شده است.
 DocType: SMS Center,All Customer Contact,همه مشتری تماس
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,تعادل سهام از طریق CSV را بارگذاری کنید.
 DocType: Warehouse,Tree Details,جزییات درخت
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,حداقل مبلغ فاکتور
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: مرکز هزینه {2} به شرکت تعلق ندارد {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: حساب {2} نمی تواند یک گروه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,مورد ردیف {IDX}: {} {DOCTYPE DOCNAME} در بالا وجود ندارد &#39;{} DOCTYPE جدول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,برنامه زمانی {0} است در حال حاضر تکمیل و یا لغو
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,وظایف
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",روز از ماه که در آن خودکار صورتحساب خواهد شد به عنوان مثال 05، 28 و غیره تولید
 DocType: Asset,Opening Accumulated Depreciation,باز کردن استهلاک انباشته
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,میانگین متحرک نرخ
 DocType: Production Planning Tool,Select Items,انتخاب آیتم ها
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} در صورت حساب {1} تاریخ گذاری شده است به {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,برنامه های آموزشی
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,برنامه های آموزشی
 DocType: Maintenance Visit,Completion Status,وضعیت تکمیل
 DocType: HR Settings,Enter retirement age in years,سن بازنشستگی را وارد کنید در سال های
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف انبار
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,اجازه می دهد بیش از تحویل یا دریافت تا این درصد
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,واردات حضور و غیاب
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,همه گروه مورد
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,همه گروه مورد
 DocType: Process Payroll,Activity Log,گزارش فعالیت
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,سود خالص / از دست دادن
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,به طور خودکار نگارش پیام در ارائه معاملات.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,سفارش خرید به پرداخت
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,پیش بینی تعداد
 DocType: Sales Invoice,Payment Due Date,پرداخت با توجه تاریخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,مورد متغیر {0} در حال حاضر با ویژگی های همان وجود دارد
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;افتتاح&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,گسترش برای این کار
 DocType: Notification Control,Delivery Note Message,تحویل توجه داشته باشید پیام
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,تعداد نقطه سفارش
 DocType: Leave Block List Date,Leave Block List Date,ترک فهرست بلوک عضویت
 DocType: Pricing Rule,Price or Discount,قیمت و یا تخفیف
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع اتهامات قابل اجرا در خرید اقلام دریافت جدول باید همان مجموع مالیات و هزینه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,مجموع اتهامات قابل اجرا در خرید اقلام دریافت جدول باید همان مجموع مالیات و هزینه شود
 DocType: Sales Team,Incentives,انگیزه
 DocType: SMS Log,Requested Numbers,شماره درخواست شده
 DocType: Production Planning Tool,Only Obtain Raw Materials,فقط دست آوردن مواد خام
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,آیا واگذار شده
 DocType: Item Attribute,Item Attribute Values,مقادیر ویژگی مورد
 DocType: Examination Result,Examination Result,نتیجه آزمون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,رسید خرید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,رسید خرید
 ,Received Items To Be Billed,دریافت گزینه هایی که صورتحساب
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ارسال شده ورقه حقوق
 DocType: Employee,Ms,خانم
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,نرخ ارز نرخ ارز استاد.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},مرجع DOCTYPE باید یکی از شود {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},مرجع DOCTYPE باید یکی از شود {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},قادر به پیدا کردن شکاف زمان در آینده {0} روز برای عملیات {1}
 DocType: Production Order,Plan material for sub-assemblies,مواد را برای طرح زیر مجموعه
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,شرکای فروش و منطقه
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,می توانید حساب به طور خودکار ایجاد عنوان در حال حاضر تعادل سهام در حساب وجود دارد. شما باید یک حساب تطبیق ایجاد قبل از شما می توانید یک ورودی در این انبار را
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,به طور پیش فرض حسابهای پرداختنی
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,کارمند {0} غیر فعال است و یا وجود ندارد
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,مورد انواع {0} به روز شده
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},لطفا دارایی رده در آیتم را وارد کنید {0}
 DocType: Quality Inspection Reading,Reading 6,خواندن 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,آیا می توانم {0} {1} {2} بدون هیچ فاکتور برجسته منفی
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,فاکتور خرید پیشرفته
 DocType: Hub Settings,Sync Now,همگام سازی در حال حاضر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ردیف {0}: ورود اعتباری را نمی توان با مرتبط {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,آیا مورد خرید
 DocType: Asset,Purchase Invoice,فاکتورخرید
 DocType: Stock Ledger Entry,Voucher Detail No,جزئیات کوپن بدون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,جدید فاکتور فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,جدید فاکتور فروش
 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,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,باز کردن تاریخ و بسته شدن تاریخ باید در همان سال مالی می شود
 DocType: Lead,Request for Information,درخواست اطلاعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,همگام سازی آفلاین فاکتورها
 DocType: Payment Request,Paid,پرداخت
 DocType: Program Fee,Program Fee,هزینه برنامه
 DocType: Salary Slip,Total in words,مجموع در کلمات
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,تحریم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; بسته بندی فهرست جدول.
 DocType: Job Opening,Publish on website,انتشار در وب سایت
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,محموله به مشتریان.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,تاریخ عرضه فاکتور نمی تواند بیشتر از ارسال تاریخ
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,واریانس
 ,Company Name,نام شرکت
 DocType: SMS Center,Total Message(s),پیام ها (بازدید کنندگان)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,انتخاب مورد انتقال
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,انتخاب سر حساب بانکی است که چک نهشته شده است.
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ردیف {0}: پرداخت در مقابل فروش / سفارش خرید همیشه باید به عنوان پیش مشخص شده باشد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,شیمیایی
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,به طور پیش فرض حساب بانک / نقدی به طور خودکار در حقوق ورودی مجله به روز هنگامی که این حالت انتخاب شده است.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",فواصل کد کلاس {0} همپوشانی با فواصل درجه برای دیگر نمرات. لطفا بررسی کنید فواصل {0} و {1} و دوباره سعی کنید
 DocType: BOM,Raw Material Cost(Company Currency),خام هزینه مواد (شرکت ارز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,همه موارد قبلا برای این سفارش تولید منتقل می شود.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ردیف # {0}: نرخ نمی تواند بیشتر از نرخ مورد استفاده در {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM مورد وب سایت
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,آپلود سر نامه و آرم خود را. (شما می توانید آنها را بعد از ویرایش).
 DocType: Timesheet Detail,Bill,لایحه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بعدی تاریخ استهلاک به عنوان تاریخ گذشته وارد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,سفید
 DocType: SMS Center,All Lead (Open),همه سرب (باز)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ردیف {0}: تعداد برای در دسترس نیست {4} در انبار {1} در زمان ارسال از ورود ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,دریافت پیشرفت پرداخت
 DocType: Item,Automatically Create New Batch,به طور خودکار ایجاد دسته جدید
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,ساخت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,ساخت
 DocType: Student Admission,Admission Start Date,پذیرش تاریخ شروع
 DocType: Journal Entry,Total Amount in Words,مقدار کل به عبارت
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یک خطای وجود دارد. یکی از دلایل احتمالی میتواند این باشد که شما به صورت ذخیره نیست. لطفا support@erpnext.com تماس بگیرید اگر مشکل همچنان ادامه دارد.
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,باز کردن تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,لطفا حساب برای تغییر مقدار را وارد کنید
 DocType: Student Batch Name,Student Batch Name,دانشجو نام دسته ای
 DocType: Holiday List,Holiday List Name,نام فهرست تعطیلات
 DocType: Repayment Schedule,Balance Loan Amount,تعادل وام مبلغ
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},لطفا مشخص {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,موارد حذف شده بدون تغییر در مقدار یا ارزش.
 DocType: Delivery Note,Delivery To,تحویل به
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,جدول ویژگی الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,جدول ویژگی الزامی است
 DocType: Production Planning Tool,Get Sales Orders,دریافت سفارشات فروش
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} نمی تواند منفی باشد
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,تعداد کل Depreciations
 DocType: Sales Invoice Item,Rate With Margin,نرخ با حاشیه
 DocType: Workstation,Wages,مزد
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,انبار محفوظ در سفارش فروش / به پایان رسید کالا انبار
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,فروش مقدار
 DocType: Repayment Schedule,Interest Amount,مقدار بهره
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,شما تصویب‌کننده هزینه برای این پرونده هستید. لطفاٌ 'وضعیت' را بروزرسانی و سپس ذخیره نمایید
 DocType: Serial No,Creation Document No,ایجاد سند بدون
 DocType: Issue,Issue,موضوع
 DocType: Asset,Scrapped,اوراق
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",صفات برای مورد انواع. به عنوان مثال اندازه، رنگ و غیره
 DocType: Purchase Invoice,Returns,بازگشت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,انبار WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},سریال بدون {0} است تحت قرارداد تعمیر و نگهداری تا {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,استخدام
 DocType: Lead,Organization Name,نام سازمان
 DocType: Tax Rule,Shipping State,حمل و نقل دولت
 ,Projected Quantity as Source,تعداد بینی به عنوان منبع
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,مورد باید با استفاده از &#39;گرفتن اقلام از خرید رسید&#39; را فشار دهید اضافه شود
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,شامل اقلام غیر سهام
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,هزینه فروش
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,در برابر
 DocType: Item,Default Selling Cost Center,مرکز هزینه پیش فرض فروش
 DocType: Sales Partner,Implementation Partner,شریک اجرای
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,کد پستی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,کد پستی
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},سفارش فروش {0} است {1}
 DocType: Opportunity,Contact Info,اطلاعات تماس
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ساخت نوشته های سهام
 DocType: Packing Slip,Net Weight UOM,وزن خالص UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} نتایج
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} نتایج
 DocType: Item,Default Supplier,به طور پیش فرض تامین کننده
 DocType: Manufacturing Settings,Over Production Allowance Percentage,بر تولید درصد کمک هزینه
 DocType: Employee Loan,Repayment Schedule,برنامه بازپرداخت
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,دریافت هفتگی فعال تاریخ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,تاریخ پایان نمی تواند کمتر از تاریخ شروع
 DocType: Sales Person,Select company name first.,انتخاب نام شرکت برای اولین بار.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,دکتر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,دکتر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,نقل قول از تولید کنندگان دریافت کرد.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},به {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,میانگین سن
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,منطقه کلیدی کارایی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,حمل و نقل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ویژگی معتبر نیست
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} باید قطعی شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} باید قطعی شود
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},تعداد باید کمتر یا مساوی به {0}
 DocType: SMS Center,Total Characters,مجموع شخصیت
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},لطفا BOM BOM در زمینه برای مورد را انتخاب کنید {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,توزیع کننده
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,سبد خرید قانون حمل و نقل
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,سفارش تولید {0} باید قبل از لغو این سفارش فروش لغو
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',لطفا &#39;درخواست تخفیف اضافی بر روی&#39;
 ,Ordered Items To Be Billed,آیتم ها دستور داد تا صورتحساب
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,از محدوده است که به کمتر از به محدوده
 DocType: Global Defaults,Global Defaults,به طور پیش فرض جهانی
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,سال شروع
 DocType: Purchase Invoice,Start date of current invoice's period,تاریخ دوره صورتحساب فعلی شروع
 DocType: Salary Slip,Leave Without Pay,ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ظرفیت خطا برنامه ریزی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ظرفیت خطا برنامه ریزی
 ,Trial Balance for Party,تعادل دادگاه برای حزب
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,درامد
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",این خواهد شد به کد مورد از نوع اضافه خواهد شد. برای مثال، اگر شما مخفف &quot;SM&quot; است، و کد مورد است &quot;تی شرت&quot;، کد مورد از نوع خواهد بود &quot;تی شرت-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,پرداخت خالص (به عبارت) قابل مشاهده خواهد بود یک بار شما را لغزش حقوق و دستمزد را نجات دهد.
 DocType: Purchase Invoice,Is Return,آیا بازگشت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,بازگشت / دبیت توجه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,بازگشت / دبیت توجه
 DocType: Price List Country,Price List Country,لیست قیمت کشور
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} NOS سریال معتبر برای مورد {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,لطفا کد کالا وارد کنید برای دریافت شماره بچ
 DocType: Stock Settings,Default Item Group,به طور پیش فرض مورد گروه
 DocType: Employee Loan,Partially Disbursed,نیمه پرداخت شده
-DocType: Grading Structure,Grading System Name,نام سیستم درجه بندی
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پایگاه داده تامین کننده.
 DocType: Account,Balance Sheet,ترازنامه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',مرکز مورد با کد آیتم های هزینه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",حالت پرداخت پیکربندی نشده است. لطفا بررسی کنید، آیا حساب شده است در حالت پرداخت و یا در POS مشخصات تعیین شده است.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,فروشنده شما در این تاریخ برای تماس با مشتری یاداوری خواهد داشت
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,آیتم همان نمی تواند وارد شود چند بار.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",حساب های بیشتر می تواند در زیر گروه ساخته شده، اما مطالب را می توان در برابر غیر گروه ساخته شده
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,سهام لجر مطالب و GL مطالب برای دریافت خرید انتخاب reposted
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,سهام لجر مطالب و GL مطالب برای دریافت خرید انتخاب reposted
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,مورد 1
 DocType: Holiday,Holiday,روز تعطیل
 DocType: Support Settings,Close Issue After Days,بستن موضوع پس از روزها
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کار تمام شد
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,لطفا حداقل یک ویژگی در جدول صفات مشخص
 DocType: Announcement,All Students,همه ی دانش آموزان
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,مورد {0} باید یک آیتم غیر سهام شود
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,مشخصات لجر
 DocType: Grading Scale,Intervals,فواصل
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیمیترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",گروه مورد با همین نام وجود دارد، لطفا نام مورد تغییر یا تغییر نام گروه مورد
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,شماره دانشجویی موبایل
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,بقیه دنیا
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,مورد {0} می تواند دسته ای ندارد
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},پرداخت حقوق و دستمزد از {0} به {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},مجاز به ویرایش منجمد حساب {0}
 DocType: Journal Entry,Get Outstanding Invoices,دریافت فاکتورها برجسته
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,سفارش فروش {0} معتبر نیست
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,سفارشات خرید به شما کمک کند برنامه ریزی و پیگیری خرید خود را
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",با عرض پوزش، شرکت ها نمی توانند با هم ادغام شدند
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مقدار شماره / انتقال {0} در درخواست پاسخ به مواد {1} \ نمی تواند بیشتر از مقدار درخواست {2} برای مورد {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,کوچک
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,هزینه های غیر مستقیم
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ردیف {0}: تعداد الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,کشاورزی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,همگام سازی داده های کارشناسی ارشد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,همگام سازی داده های کارشناسی ارشد
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,محصولات  یا خدمات شما
 DocType: Mode of Payment,Mode of Payment,نحوه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وب سایت تصویر باید یک فایل عمومی و یا آدرس وب سایت می باشد
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,این یک گروه مورد ریشه است و نمی تواند ویرایش شود.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,گروه شماره رول
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",برای {0}، تنها حساب های اعتباری می تواند در مقابل ورود بدهی دیگر مرتبط
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,در کل از همه وزن وظیفه باید باشد 1. لطفا وزن همه وظایف پروژه تنظیم بر این اساس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,تحویل توجه داشته باشید {0} است ارسال نشده
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; درست است که می تواند مورد، مورد گروه و یا تجاری.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قانون قیمت گذاری شده است برای اولین بار بر اساس انتخاب &#39;درخواست در&#39; درست است که می تواند مورد، مورد گروه و یا تجاری.
 DocType: Hub Settings,Seller Website,فروشنده وب سایت
 DocType: Item,ITEM-,آیتم
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,درصد اختصاص داده ها را برای تیم فروش باید 100 باشد
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},وضعیت سفارش تولید {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},وضعیت سفارش تولید {0}
 DocType: Appraisal Goal,Goal,هدف
 DocType: Sales Invoice Item,Edit Description,ویرایش توضیحات
 ,Team Updates,به روز رسانی تیم
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,منبع
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,منبع
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,تنظیم نوع حساب کمک می کند تا در انتخاب این حساب در معاملات.
 DocType: Purchase Invoice,Grand Total (Company Currency),جمع کل (شرکت ارز)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,درست چاپ فرمت
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,ورودی دفتر
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} اقلام در پیشرفت
 DocType: Workstation,Workstation Name,نام ایستگاه های کاری
-DocType: Grade Interval,Grade Code,کد کلاس
+DocType: Grading Scale Interval,Grade Code,کد کلاس
 DocType: POS Item Group,POS Item Group,POS مورد گروه
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ایمیل خلاصه:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} به مورد تعلق ندارد {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,سخت افزار
 DocType: Sales Order,Recurring Upto,در محدوده زمانی معین تا حد
 DocType: Attendance,HR Manager,مدیریت منابع انسانی
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,لطفا یک شرکت را انتخاب کنید
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,لطفا یک شرکت را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتیاز مرخصی
 DocType: Purchase Invoice,Supplier Invoice Date,تامین کننده فاکتور عضویت
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,شما نیاز به فعال کردن سبد خرید هستید
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,غذا
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,محدوده سالمندی 3
 DocType: Maintenance Schedule Item,No of Visits,تعداد بازدید ها
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,علامت گذاری به عنوان حضور و غیاب
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,علامت گذاری به عنوان حضور و غیاب
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},برنامه تعمیر و نگهداری {0} در برابر وجود دارد {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,دانش آموز ثبت نام
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},نرخ ارز از بستن حساب باید {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},مجموع امتیاز ها برای تمام اهداف باید 100. شود این است که {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,اوسط روزانه خروجی
 DocType: POS Profile,Campaign,کمپین
 DocType: Supplier,Name and Type,نام و نوع
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',وضعیت تایید باید &quot;تایید&quot; یا &quot;رد&quot;
 DocType: Purchase Invoice,Contact Person,شخص تماس
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'تاریخ شروع پیش بینی شده' نمی تواند بیشتر از 'تاریخ پایان پیش بینی شده"" باشد"
 DocType: Course Scheduling Tool,Course End Date,البته پایان تاریخ
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,حمل و نقل آدرس
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ساختار حسابها
 DocType: Material Request,Terms and Conditions Content,شرایط و ضوابط محتوا
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,نمی تواند بیشتر از ۱۰۰ باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,مورد {0} است مورد سهام نمی
 DocType: Maintenance Visit,Unscheduled,برنامه ریزی
 DocType: Employee,Owned,متعلق به
 DocType: Salary Detail,Depends on Leave Without Pay,بستگی به مرخصی بدون حقوق
 DocType: Pricing Rule,"Higher the number, higher the priority",شماره بالاتر، بالاتر اولویت
 ,Purchase Invoice Trends,خرید روند فاکتور
 DocType: Employee,Better Prospects,چشم انداز بهتر
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",ردیف # {0}: دسته {1} تنها {2} تعداد. لطفا دسته ای دیگر است که {3} تعداد موجود را انتخاب کنید و یا تقسیم ردیف به ردیف های متعدد، برای ارائه / موضوع از دسته های متعدد
 DocType: Vehicle,License Plate,پلاک وسیله نقلیه
 DocType: Appraisal,Goals,اهداف
 DocType: Warranty Claim,Warranty / AMC Status,گارانتی / AMC وضعیت
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارمند نمی تواند به خود گزارش دهید.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اگر حساب منجمد است، ورودی ها را به کاربران محدود شده مجاز می باشد.
 DocType: Email Digest,Bank Balance,بانک تعادل
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},ثبت حسابداری برای {0}: {1} تنها می تواند در ارز ساخته شده است: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",مشخصات شغلی، شرایط مورد نیاز و غیره
 DocType: Journal Entry Account,Account Balance,موجودی حساب
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,قانون مالیاتی برای معاملات.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نمایش P &amp; L مانده سال مالی بستهنشده است
 DocType: Shipping Rule,Shipping Account,حساب های حمل و نقل
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: حساب {2} غیر فعال است
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,سفارشات فروش به شما کمک کند برنامه کار خود را و تحویل در زمان
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,سفارشات فروش به شما کمک کند برنامه کار خود را و تحویل در زمان
 DocType: Quality Inspection,Readings,خوانش
 DocType: Stock Entry,Total Additional Costs,مجموع هزینه های اضافی
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,به ارزش
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,بسته بندی لغزش
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,بسته بندی لغزش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر اجاره
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,تنظیمات دروازه راه اندازی SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,واردات نشد!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,خدمات
 DocType: HR Settings,Email Salary Slip to Employee,ایمیل لغزش حقوق و دستمزد به کارکنان
 DocType: Cost Center,Parent Cost Center,مرکز هزینه پدر و مادر
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,انتخاب کننده ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,انتخاب کننده ممکن
 DocType: Sales Invoice,Source,منبع
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,نمایش بسته
 DocType: Leave Type,Is Leave Without Pay,آیا ترک کنی بدون اینکه پرداخت
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,دارایی رده برای آیتم دارائی های ثابت الزامی است
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیچ ثبتی یافت نشد در جدول پرداخت
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},این {0} درگیری با {1} برای {2} {3}
 DocType: Student Attendance Tool,Students HTML,دانش آموزان HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,تاریخ ترک
 DocType: Pricing Rule,For Price List,برای اطلاع از قیمت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرایی جستجو
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ایجاد منجر می شود
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ایجاد منجر می شود
 DocType: Maintenance Schedule,Schedules,برنامه
 DocType: Purchase Invoice Item,Net Amount,مقدار خالص
 DocType: Purchase Order Item Supplied,BOM Detail No,جزئیات BOM بدون
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ثبت برنامه
 DocType: Sales Invoice Item,Brand Name,نام تجاری
 DocType: Purchase Receipt,Transporter Details,اطلاعات حمل و نقل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,به طور پیش فرض ذخیره سازی برای آیتم انتخاب شده مورد نیاز است
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,جعبه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,کننده ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,کننده ممکن
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,سازمان
 DocType: Budget,Monthly Distribution,توزیع ماهانه
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,فهرست گیرنده خالی است. لطفا ایجاد فهرست گیرنده
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,فروش شریک هدف
 DocType: Loan Type,Maximum Loan Amount,حداکثر مبلغ وام
 DocType: Pricing Rule,Pricing Rule,قانون قیمت گذاری
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},تعداد رول تکراری برای دانشجویان {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},تعداد رول تکراری برای دانشجویان {0}
 DocType: Budget,Action if Annual Budget Exceeded,اکشن اگر بودجه سالانه بیش از حد
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,درخواست مواد به خرید سفارش
 DocType: Shopping Cart Settings,Payment Success URL,پرداخت موفقیت URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,روش بازپرداخت
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",اگر علامت زده شود، صفحه اصلی خواهد بود که گروه پیش فرض گزینه برای وب سایت
 DocType: Quality Inspection Reading,Reading 4,خواندن 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM پیش فرض برای {0} برای پروژه یافت نشد {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM پیش فرض برای {0} برای پروژه یافت نشد {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ادعای هزینه شرکت.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",دانش آموزان در قلب سیستم، اضافه کردن تمام دانش آموزان خود را
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",دانش آموزان در قلب سیستم، اضافه کردن تمام دانش آموزان خود را
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ردیف # {0}: تاریخ ترخیص کالا از {1} می توانید قبل از تاریخ چک شود {2}
 DocType: Company,Default Holiday List,پیش فرض لیست تعطیلات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ردیف {0}: از زمان و به زمان از {1} با هم تداخل دارند {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,روز (بازدید کنندگان) که در آن شما برای مرخصی استفاده از تعطیلات. شما نیاز به درخواست برای ترک نمی کند.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ارسال مجدد ایمیل پرداخت
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,وظیفه جدید
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,را نقل قول
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,را نقل قول
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,سایر گزارش
 DocType: Dependent Task,Dependent Task,وظیفه وابسته
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},عامل تبدیل واحد اندازه گیری پیش فرض از 1 باید در ردیف شود {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},مرخصی از نوع {0} نمی تواند بیش از {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,سعی کنید برنامه ریزی عملیات به مدت چند روز X در پیش است.
 DocType: HR Settings,Stop Birthday Reminders,توقف تولد یادآوری
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},لطفا پیش فرض حقوق و دستمزد پرداختنی حساب تعیین شده در شرکت {0}
 DocType: SMS Center,Receiver List,فهرست گیرنده
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,جستجو مورد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,جستجو مورد
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,مقدار مصرف
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,تغییر خالص در نقدی
 DocType: Assessment Plan,Grading Scale,مقیاس درجه بندی
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,قبلا کامل شده
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,واحد اندازه گیری {0} است بیش از یک بار در تبدیل فاکتور جدول وارد شده است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,قبلا کامل شده
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},درخواست پرداخت از قبل وجود دارد {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,هزینه اقلام صادر شده
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},تعداد نباید بیشتر از {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,را پرداخت ورودی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ردیف {0}: پیشرفت در برابر کننده باید بدهی شود
 DocType: Company,Default Values,مقادیر پیش فرض
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{فرکانس} خلاصه
 DocType: Expense Claim,Total Amount Reimbursed,مقدار کل بازپرداخت
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,این است که در سیاهههای مربوط در برابر این خودرو است. مشاهده جدول زمانی زیر برای جزئیات
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع آوری
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},در برابر تامین کننده فاکتور {0} تاریخ {1}
 DocType: Customer,Default Price List,به طور پیش فرض لیست قیمت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ضبط حرکت دارایی {0} ایجاد
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,شما نمی توانید حذف سال مالی {0}. سال مالی {0} به عنوان پیش فرض در تنظیمات جهانی تنظیم
 DocType: Journal Entry,Entry Type,نوع ورودی
 ,Customer Credit Balance,تعادل اعتباری مشتری
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,تهیه
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,هیچ یک از موارد هر گونه تغییر در مقدار یا ارزش.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,فیلد اجباری - برنامه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,ادعای گارانتی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ادعای گارانتی
 ,Lead Details,مشخصات راهبر
 DocType: Salary Slip,Loan repayment,بازپرداخت وام
 DocType: Purchase Invoice,End date of current invoice's period,تاریخ پایان دوره صورتحساب فعلی
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,آدرس دائمی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",پیشرفت در برابر {0} {1} نمی تواند بیشتر پرداخت می شود \ از جمع کل {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,لطفا کد مورد را انتخاب کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,لطفا کد مورد را انتخاب کنید
 DocType: Student Sibling,Studying in Same Institute,تحصیل در همان موسسه
 DocType: Territory,Territory Manager,مدیر منطقه
 DocType: Packed Item,To Warehouse (Optional),به انبار (اختیاری)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Payment Entry,Paid Amount (Company Currency),مبلغ پرداخت شده (شرکت ارز)
 DocType: Purchase Invoice,Additional Discount,تخفیف اضافی
 DocType: Selling Settings,Selling Settings,فروش تنظیمات
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,نمایش سبد خرید
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,هزینه های بازاریابی
 ,Item Shortage Report,مورد گزارش کمبود
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن ذکر شده است، \ n لطفا ذکر &quot;وزن UOM&quot; بیش از حد
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,درخواست مواد مورد استفاده در ساخت این سهام ورود
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,بعدی تاریخ استهلاک برای دارایی جدید الزامی است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بعدی تاریخ استهلاک برای دارایی جدید الزامی است
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جدا البته گروه بر اساس برای هر دسته ای
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,تنها واحد آیتم استفاده کنید.
 DocType: Fee Category,Fee Category,هزینه رده
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,بین وزنها
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: مرکز هزینه برای سود و زیان، حساب مورد نیاز است {2}. لطفا راه اندازی یک مرکز هزینه به طور پیش فرض برای شرکت.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,یک گروه مشتری با نام مشابهی وجود دارد. لطا نام مشتری را تغییر دهید یا نام گروه مشتری را اصلاح نمایید.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,مورد عاقلانه فروش ثبت نام
 DocType: Asset,Gross Purchase Amount,مبلغ خرید خالص
 DocType: Asset,Depreciation Method,روش استهلاک
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,آفلاین
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,آفلاین
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا این مالیات شامل در نرخ پایه؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,مجموع هدف
 DocType: Program Course,Required,ضروری
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,آشتی JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ستون های بسیاری. صادرات این گزارش و با استفاده از یک برنامه صفحه گسترده آن را چاپ.
 DocType: Purchase Invoice Item,Batch No,دسته بدون
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,اجازه چندین سفارشات فروش در برابر خرید سفارش مشتری
 DocType: Student Group Instructor,Student Group Instructor,مربی دانشجویی گروه
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 موبایل بدون
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,اصلی
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,نوع دیگر
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,اصلی
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,نوع دیگر
 DocType: Naming Series,Set prefix for numbering series on your transactions,تنظیم پیشوند برای شماره سری در معاملات خود را
 DocType: Employee Attendance Tool,Employees HTML,کارمندان HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,به طور پیش فرض BOM ({0}) باید برای این آیتم به و یا قالب آن فعال باشد
 DocType: Employee,Leave Encashed?,ترک نقد شدنی؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت از فیلد اجباری است
 DocType: Email Digest,Annual Expenses,هزینه سالانه
 DocType: Item,Variants,انواع
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,را سفارش خرید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,را سفارش خرید
 DocType: SMS Center,Send To,فرستادن به
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},است تعادل مرخصی به اندازه کافی برای مرخصی نوع وجود ندارد {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مقدار اختصاص داده شده
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,کار در حال پیشرفت انبار قبل از ارسال مورد نیاز است
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,متقاضی برای یک کار.
 DocType: Purchase Order Item,Warehouse and Reference,انبار و مرجع
 DocType: Supplier,Statutory info and other general information about your Supplier,اطلاعات قانونی و دیگر اطلاعات کلی در مورد تامین کننده خود را
 DocType: Item,Serial Nos and Batches,سریال شماره و دسته
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,قدرت دانشجویی گروه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,علیه مجله ورودی {0} هیچ بی بدیل {1} ورود ندارد
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزیابی
 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: Grading Structure,Grading Intervals,بازه درجه بندی
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,لطفا وارد
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",آیا می توانم برای مورد {0} در ردیف overbill {1} بیش از {2}. برای اجازه بیش از حد صدور صورت حساب، لطفا در خرید تنظیمات
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,لطفا فیلتر بر اساس مورد یا انبار مجموعه
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} باید ارائه شود
 DocType: Authorization Control,Authorization Control,کنترل مجوز
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ردیف # {0}: رد انبار در برابر رد مورد الزامی است {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,پرداخت
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,مدیریت سفارشات خود را
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,پرداخت
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,مدیریت سفارشات خود را
 DocType: Production Order Operation,Actual Time and Cost,زمان و هزینه های واقعی
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},درخواست مواد از حداکثر {0} را می توان برای مورد {1} در برابر سفارش فروش ساخته شده {2}
 DocType: Employee,Salutation,سلام
 DocType: Course,Course Abbreviation,مخفف دوره
 DocType: Student Leave Application,Student Leave Application,دانشجو مرخصی کاربرد
 DocType: Item,Will also apply for variants,همچنین برای انواع اعمال می شود
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",دارایی نمی تواند لغو شود، آن است که در حال حاضر {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارمند {0} در روز نیمه در {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},کل ساعات کار نباید از ساعات کار حداکثر است بیشتر {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,بر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,آیتم های همراه  در زمان فروش.
 DocType: Quotation Item,Actual Qty,تعداد واقعی
 DocType: Sales Invoice Item,References,مراجع
@@ -1775,7 +1776,7 @@
 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 +91,Associate,وابسته
 DocType: Asset Movement,Asset Movement,جنبش دارایی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,سبد خرید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,سبد خرید
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,مورد {0} است مورد سریال نه
 DocType: SMS Center,Create Receiver List,ایجاد فهرست گیرنده
 DocType: Vehicle,Wheels,چرخ ها
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,غیر فعال ایجاد سیاهههای مربوط به زمان در برابر سفارشات تولید. عملیات باید در برابر سفارش تولید ردیابی نیست
 DocType: Student,Student Mobile Number,دانشجو شماره موبایل
 DocType: Item,Has Variants,دارای انواع
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},شما در حال حاضر اقلام از انتخاب {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,نام توزیع ماهانه
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته ID الزامی است
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته ID الزامی است
 DocType: Sales Person,Parent Sales Person,شخص پدر و مادر فروش
 DocType: Purchase Invoice,Recurring Invoice,فاکتور در محدوده زمانی معین
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,مدیریت پروژه
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,سال مالی
 DocType: Vehicle Log,Fuel Price,قیمت سوخت
 DocType: Budget,Budget,بودجه
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,مورد دارائی های ثابت باید یک آیتم غیر سهام باشد.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",بودجه می توانید در برابر {0} اختصاص داده نمی شود، آن را به عنوان یک حساب کاربری درآمد یا هزینه نیست
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,به دست آورد
 DocType: Student Admission,Application Form Route,فرم درخواست مسیر
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,منطقه / مشتریان
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,منطقه / مشتریان
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,به عنوان مثال 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ترک نوع {0} نمی تواند اختصاص داده شود از آن است که بدون حقوق ترک
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ردیف {0}: اختصاص مقدار {1} باید کمتر از برابر می شود و یا به فاکتور مقدار برجسته {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,سریال نیست
 DocType: Payment Entry Reference,Outstanding,برجسته
 ,Daily Timesheet Summary,خلاصه برنامه زمانی روزانه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",ردیف {0}: برای تنظیم دوره تناوب {1}، تفاوت بین از و تا به امروز \ باید بزرگتر یا مساوی به صورت {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,این است که در جنبش سهام است. مشاهده {0} برای جزئیات
 DocType: Pricing Rule,Selling,فروش
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},مقدار {0} {1} کسر شود {2}
 DocType: Employee,Salary Information,اطلاعات حقوق و دستمزد
 DocType: Sales Person,Name and Employee ID,نام و کارمند ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,تاریخ را نمی توان قبل از ارسال تاریخ
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,وظایف و مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا تاریخ مرجع وارد
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,می توانید تعداد ردیف بزرگتر یا مساوی به تعداد سطر فعلی برای این نوع شارژ مراجعه نمی
 DocType: Asset,Sold,فروخته شده
 ,Item-wise Purchase History,تاریخچه خرید مورد عاقلانه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا بر روی &#39;ایجاد برنامه &quot;کلیک کنید و به واکشی سریال بدون برای مورد اضافه شده است {0}
 DocType: Account,Frozen,یخ زده
 ,Open Production Orders,سفارشات تولید گسترش
 DocType: Sales Invoice Payment,Base Amount (Company Currency),مقدار پایه (شرکت ارز)
 DocType: Payment Reconciliation Payment,Reference Row,مرجع ردیف
 DocType: Installation Note,Installation Time,زمان نصب و راه اندازی
 DocType: Sales Invoice,Accounting Details,جزئیات حسابداری
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,حذف تمام معاملات این شرکت
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,سرمایه گذاری
 DocType: Issue,Resolution Details,جزییات قطعنامه
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,بحث
 DocType: Payment Entry,Transaction ID,شناسه تراکنش
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,مشاهده قوانین قیمت گذاری بیشتر بر اساس مقدار فیلتر شده است.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},لطفا مجموعه ای از تاریخ پیوستن برای کارمند {0}
 DocType: Task,Total Billing Amount (via Time Sheet),مبلغ کل حسابداری (از طریق زمان ورق)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار درآمد و ضوابط
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید اجازه 'تاییدو امضا کننده هزینه' را داشته باشید
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جفت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,انتخاب کنید BOM و تعداد برای تولید
 DocType: Asset,Depreciation Schedule,برنامه استهلاک
 DocType: Bank Reconciliation Detail,Against Account,به حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نیم تاریخ روز باید بین از تاریخ و به روز می شود
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},لطفا دارایی مرکز استهلاک هزینه در شرکت راه {0}
 ,Maintenance Schedules,برنامه های  نگهداری و تعمیرات
 DocType: Task,Actual End Date (via Time Sheet),واقعی پایان تاریخ (از طریق زمان ورق)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},مقدار {0} {1} در برابر {2} {3}
 ,Quotation Trends,روند نقل قول
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},مورد گروه در مورد استاد برای آیتم ذکر نشده {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,بدهی به حساب باید یک حساب کاربری دریافتنی است
 DocType: Shipping Rule Condition,Shipping Amount,مقدار حمل و نقل
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,در انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,عامل تبدیل
 DocType: Purchase Order,Delivered,تحویل
 ,Vehicle Expenses,هزینه های خودرو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
+DocType: Serial No,Invoice Details,جزئیات فاکتور
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی به {0}
 DocType: Purchase Receipt,Vehicle Number,تعداد خودرو
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,از تاریخ تکرار می شود فاکتور را متوقف خواهد کرد
 DocType: Employee Loan,Loan Amount,مبلغ وام
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,برنامه های زمانی
 DocType: HR Settings,HR Settings,تنظیمات HR
 DocType: Salary Slip,net pay info,اطلاعات خالص دستمزد
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ادعای هزینه منتظر تأیید است. تنها تصویب هزینه می توانید وضعیت به روز رسانی.
 DocType: Email Digest,New Expenses,هزینه های جدید
 DocType: Purchase Invoice,Additional Discount Amount,تخفیف اضافی مبلغ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",ردیف # {0}: تعداد باید 1 باشد، به عنوان مورد دارایی ثابت است. لطفا ردیف جداگانه برای تعداد متعدد استفاده کنید.
 DocType: Leave Block List Allow,Leave Block List Allow,ترک فهرست بلوک اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,مخفف نمیتواند خالی یا space باشد
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,گروه به غیر گروه
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ورزشی
 DocType: Loan Type,Loan Name,نام وام
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,مشتری خرید و وفاداری
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,انبار که در آن شما می حفظ سهام از اقلام را رد کرد
 DocType: Production Order,Skip Material Transfer,پرش انتقال مواد
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,قادر به پیدا کردن نرخ ارز برای {0} به {1} برای تاریخ های کلیدی {2}. لطفا یک رکورد ارز دستی ایجاد کنید
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,سال مالی خود را به پایان می رسد در
 DocType: POS Profile,Price List,لیست قیمت
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} در حال حاضر به طور پیش فرض سال مالی. لطفا مرورگر خود را برای تغییر تاثیر گذار تازه کردن.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},حساب {0} نامعتبر است. حساب ارزی باید {1} باشد
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},عامل UOM تبدیل در ردیف مورد نیاز است {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش فروش، فاکتور فروش و یا ورود به مجله می شود
 DocType: Salary Component,Deduction,کسر
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ردیف {0}: از زمان و به زمان الزامی است.
 DocType: Stock Reconciliation Item,Amount Difference,تفاوت در مقدار
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},مورد قیمت های اضافه شده برای {0} در لیست قیمت {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,لطفا کارمند شناسه را وارد این فرد از فروش
 DocType: Territory,Classification of Customers by region,طبقه بندی مشتریان بر اساس منطقه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,مقدار تفاوت باید صفر باشد
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,مقدار تفاوت باید صفر باشد
 DocType: Project,Gross Margin,حاشیه ناخالص
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,لطفا ابتدا وارد مورد تولید
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه تعادل بیانیه بانک
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,کاربر غیر فعال
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,نقل قول
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,نقل قول
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کسر مجموع
 ,Production Analytics,تجزیه و تحلیل ترافیک تولید
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},هشدار: گواهینامه SSL نامعتبر در پیوست {0}
 DocType: Student Admission,Eligibility,شایستگی
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",آگهی های کمک به شما کسب و کار، اضافه کردن اطلاعات تماس خود را و بیشتر به عنوان منجر خود را
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",آگهی های کمک به شما کسب و کار، اضافه کردن اطلاعات تماس خود را و بیشتر به عنوان منجر خود را
 DocType: Production Order Operation,Actual Operation Time,عملیات واقعی زمان
 DocType: Authorization Rule,Applicable To (User),به قابل اجرا (کاربر)
 DocType: Purchase Taxes and Charges,Deduct,کسر کردن
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,آدرس محل کار
 DocType: Appraisal,Calculate Total Score,محاسبه مجموع امتیاز
 DocType: Request for Quotation,Manufacturing Manager,ساخت مدیر
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سریال بدون {0} است تحت گارانتی تا {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,تقسیم توجه داشته باشید تحویل بسته بندی شده.
 apps/erpnext/erpnext/hooks.py +87,Shipments,محموله
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,مانده حساب ({0}) برای {1} و ارزش سهام ({2}) ذخیره سازی {3} باید همان
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,مجموع مرخصی روز
 DocType: Email Digest,Note: Email will not be sent to disabled users,توجه: ایمیل را به کاربران غیر فعال شده ارسال نمی شود
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,تعداد تعامل
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,انتخاب شرکت ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,انتخاب شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالی بگذارید اگر برای همه گروه ها در نظر گرفته
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",انواع اشتغال (دائمی، قرارداد، و غیره کارآموز).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} برای آیتم الزامی است {1}
 DocType: Process Payroll,Fortnightly,دوهفتگی
 DocType: Currency Exchange,From Currency,از ارز
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا مقدار اختصاص داده شده، نوع فاکتور و شماره فاکتور در حداقل یک سطر را انتخاب کنید
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),نرخ (شرکت ارز)
 DocType: Student Guardian,Others,دیگران
 DocType: Payment Entry,Unallocated Amount,مقدار تخصیص نیافته
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,می توانید یک آیتم تطبیق پیدا کند. لطفا برخی از ارزش های دیگر برای {0} را انتخاب کنید.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,هیچ به روز رسانی بیشتر
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,می توانید نوع اتهام به عنوان &#39;در مقدار قبلی Row را انتخاب کنید و یا&#39; در ردیف قبلی مجموع برای سطر اول
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,مورد کودک باید یک بسته نرم افزاری محصولات. لطفا آیتم های حذف `{0}` و صرفه جویی در
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداری
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,اضافه کردن برنامه های زمانی
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,اضافه کردن برنامه های زمانی
 DocType: Vehicle Service,Service Item,مورد خدمات
 DocType: Bank Guarantee,Bank Guarantee,تضمین بانکی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,لطفا بر روی &#39;ایجاد برنامه&#39; کلیک کنید برای دریافت برنامه
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},ردیف # {0}: دارایی {1} در حال حاضر {2}
 DocType: Quotation Item,Stock Balance,تعادل سهام
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,سفارش فروش به پرداخت
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا مجموعه نامگذاری سری برای {0} از طریق راه اندازی&gt; تنظیمات&gt; نامگذاری سری
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,مدیر عامل
 DocType: Expense Claim Detail,Expense Claim Detail,هزینه جزئیات درخواست
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,لطفا به حساب صحیح را انتخاب کنید
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت نشان داده نخواهد شد اگر لیست قیمت تنظیم نشده است
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا یک کشور برای این قانون حمل و نقل مشخص و یا بررسی حمل و نقل در سراسر جهان
 DocType: Stock Entry,Total Incoming Value,مجموع ارزش ورودی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,بدهکاری به مورد نیاز است
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,بدهکاری به مورد نیاز است
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",برنامه های زمانی کمک به پیگیری از زمان، هزینه و صدور صورت حساب برای فعالیت های انجام شده توسط تیم خود را
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,خرید لیست قیمت
 DocType: Offer Letter Term,Offer Term,مدت پیشنهاد
 DocType: Quality Inspection,Quality Manager,مدیر کیفیت
 DocType: Job Applicant,Job Opening,افتتاح شغلی
 DocType: Payment Reconciliation,Payment Reconciliation,آشتی پرداخت
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,لطفا نام Incharge فرد را انتخاب کنید
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنولوژی
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},مجموع پرداخت نشده: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM وب سایت عملیات
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,از دست داده دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,آدرس جدید
 DocType: Quality Inspection,Sample Size,اندازهی نمونه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,لطفا سند دریافت وارد کنید
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,همه موارد در حال حاضر صورتحساب شده است
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,لطفا سند دریافت وارد کنید
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مراکز هزینه به علاوه می تواند در زیر گروه ساخته شده اما مطالب را می توان در برابر غیر گروه ساخته شده
 DocType: Project,External,خارجی
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کاربران و ویرایش
 DocType: Vehicle Log,VLOG.,را ثبت کنید.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},سفارشات تولید ایجاد شده: {0}
 DocType: Branch,Branch,شاخه
 DocType: Guardian,Mobile Number,شماره موبایل
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,چاپ و علامت گذاری
 DocType: Bin,Actual Quantity,تعداد واقعی
 DocType: Shipping Rule,example: Next Day Shipping,به عنوان مثال: حمل و نقل روز بعد
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,سریال بدون {0} یافت نشد
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,سریال بدون {0} یافت نشد
 DocType: Scheduling Tool,Student Batch,دسته ای دانشجویی
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,مشتریان شما
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,دانشجویی
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,دانشجویی
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},از شما دعوت شده برای همکاری در این پروژه: {0}
 DocType: Leave Block List Date,Block Date,بلوک عضویت
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,درخواست کن
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,فرستادن به
 DocType: Payment Request,Make Sales Invoice,ایجاد فاکتور فروش
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,نرم افزارها
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بعد تماس با آمار نمی تواند در گذشته باشد
 DocType: Company,For Reference Only.,برای مرجع تنها.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,انتخاب دسته ای بدون
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},نامعتبر {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,جستجوی پیشرفته مقدار
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,شماره مورد نمی تواند 0
 DocType: Item,Show a slideshow at the top of the page,نمایش تصاویر به صورت خودکار در بالای صفحه
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM ها
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,فروشگاه
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,فروشگاه
 DocType: Serial No,Delivery Time,زمان تحویل
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,سالمندی بر اساس
 DocType: Item,End of Life,پایان زندگی
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,ابزار تغییر نام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,به روز رسانی هزینه
 DocType: Item Reorder,Item Reorder,مورد ترتیب مجدد
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,لغزش نمایش حقوق
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,مواد انتقال
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,لغزش نمایش حقوق
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,مواد انتقال
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",مشخص عملیات، هزینه های عملیاتی و به یک عملیات منحصر به فرد بدون به عملیات خود را.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,این سند بیش از حد مجاز است {0} {1} برای آیتم {4}. آیا شما ساخت یکی دیگر از {3} در برابر همان {2}.
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,انتخاب تغییر حساب مقدار
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,لطفا پس از ذخیره در محدوده زمانی معین
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,انتخاب تغییر حساب مقدار
 DocType: Purchase Invoice,Price List Currency,لیست قیمت ارز
 DocType: Naming Series,User must always select,کاربر همیشه باید انتخاب کنید
 DocType: Stock Settings,Allow Negative Stock,اجازه می دهد بورس منفی
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,حساب بودجه
 DocType: Quality Inspection,Verified By,تایید شده توسط
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",می تواند به طور پیش فرض ارز شرکت را تغییر نمی، چرا که معاملات موجود وجود دارد. معاملات باید لغو شود برای تغییر ارز به طور پیش فرض.
-DocType: Grade Interval,Grade Description,درجه باشرکت
+DocType: Grading Scale Interval,Grade Description,درجه باشرکت
 DocType: Stock Entry,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,ایجاد لغزش حقوق
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,حضور و غیاب به روز
 DocType: Warranty Claim,Raised By,مطرح شده توسط
 DocType: Payment Gateway Account,Payment Account,حساب پرداخت
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,لطفا شرکت مشخص برای ادامه
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,تغییر خالص در حساب های دریافتنی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,جبرانی فعال
 DocType: Offer Letter,Accepted,پذیرفته
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا مطمئن شوید که شما واقعا می خواهید به حذف تمام معاملات این شرکت. اطلاعات کارشناسی ارشد خود را باقی خواهد ماند آن را به عنوان است. این عمل قابل بازگشت نیست.
 DocType: Room,Room Number,شماره اتاق
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},مرجع نامعتبر {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) نمی تواند بیشتر از quanitity برنامه ریزی شده ({2}) در سفارش تولید {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) نمی تواند بیشتر از quanitity برنامه ریزی شده ({2}) در سفارش تولید {3}
 DocType: Shipping Rule,Shipping Rule Label,قانون حمل و نقل برچسب
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,انجمن کاربران
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,مواد اولیه نمی تواند خالی باشد.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",می تواند سهام به روز رسانی نیست، فاکتور شامل آیتم افت حمل و نقل.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,سریع دانشگاه علوم پزشکی ورودی
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,اگر ذکر بی ا م در مقابل هر ایتمی باشد شما نمیتوانید نرخ را تغییر دهید
 DocType: Employee,Previous Work Experience,قبلی سابقه کار
 DocType: Stock Entry,For Quantity,برای کمیت
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,شرایط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,نام این موسسه که شما در حال راه اندازی این سیستم.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ثبت حسابداری تا این تاریخ منجمد، هیچ کس نمی تواند انجام / اصلاح ورود به جز نقش های مشخص شده زیر.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا قبل از ایجاد برنامه های تعمیر و نگهداری سند را ذخیره کنید
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,وضعیت پروژه
 DocType: UOM,Check this to disallow fractions. (for Nos),بررسی این به ندهید فراکسیون. (برای NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,سفارشات تولید زیر ایجاد شد:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,کارمندان کار در یک روز تعطیل
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,علامت گذاری به عنوان در حال حاضر
 DocType: Project,% Complete Method,٪ روش کامل
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},تاریخ شروع نگهداری نمی تواند قبل از تاریخ تحویل برای سریال بدون شود {0}
 DocType: Production Order,Actual End Date,تاریخ واقعی پایان
 DocType: BOM,Operating Cost (Company Currency),هزینه های عملیاتی (شرکت ارز)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,مرخصی بدون حقوق با تایید سوابق مرخصی کاربرد مطابقت ندارد
 DocType: Campaign,Campaign-.####,کمپین - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,گام های بعدی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,لطفا تأمین اقلام مشخص شده در بهترین نرخ ممکن
 DocType: Selling Settings,Auto close Opportunity after 15 days,خودرو فرصت نزدیک پس از 15 روز
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,پایان سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot و / سرب٪
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd تعداد
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},سوابق هزینه ایجاد شده - {0}
 DocType: Asset Category Account,Asset Category Account,حساب دارایی رده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},می تواند مورد دیگر {0} از مقدار سفارش فروش تولید نمی {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,سهام ورود {0} است ارسال نشده
 DocType: Payment Reconciliation,Bank / Cash Account,حساب بانک / نقدی
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,بعد تماس با نمی تواند همان آدرس ایمیل سرب
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ترخیص کالا از تاریخ ذکر نشده است
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
 DocType: Guardian,Occupation,اشتغال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ردیف {0}: تاریخ شروع باید قبل از پایان تاریخ است
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),مجموع (تعداد)
 DocType: Sales Invoice,This Document,این سند
 DocType: Installation Note Item,Installed Qty,نصب تعداد
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,گزارش یک مشکل
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,هزینه آب و برق
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-بالاتر از
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ردیف # {0}: مجله ورودی {1} می کند حساب کاربری ندارید {2} یا در حال حاضر همسان در برابر کوپن دیگر
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ردیف # {0}: مجله ورودی {1} می کند حساب کاربری ندارید {2} یا در حال حاضر همسان در برابر کوپن دیگر
 DocType: Buying Settings,Default Buying Price List,به طور پیش فرض لیست قیمت خرید
 DocType: Process Payroll,Salary Slip Based on Timesheet,لغزش حقوق و دستمزد بر اساس برنامه زمانی
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,هیچ یک از کارکنان برای معیارهای فوق انتخاب شده و یا لغزش حقوق و دستمزد در حال حاضر ایجاد
 DocType: Notification Control,Sales Order Message,سفارش فروش پیام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",تنظیم مقادیر پیش فرض مثل شرکت، ارز، سال مالی جاری، و غیره
 DocType: Payment Entry,Payment Type,نوع پرداخت
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا یک دسته ای برای آیتم را انتخاب کنید {0}. قادر به پیدا کردن یک دسته واحد است که این شرط را برآورده
 DocType: Process Payroll,Select Employees,انتخاب کارمندان
 DocType: Opportunity,Potential Sales Deal,معامله فروش بالقوه
 DocType: Payment Entry,Cheque/Reference Date,چک / تاریخ مرجع
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},نمایش POS جهانی {0} در حال حاضر برای شرکت ایجاد {1}
 DocType: Purchase Order,Ref SQ,SQ کد عکس
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,جایگزین مورد / BOM در تمام BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,سند دریافت باید ارائه شود
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,سند دریافت باید ارائه شود
 DocType: Purchase Invoice Item,Received Qty,دریافت تعداد
 DocType: Stock Entry Detail,Serial No / Batch,سریال بدون / دسته
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,پرداخت نمی شود و تحویل داده نشده است
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,بدون ورق زمان
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,نوع ترک {0} نمی تواند حمل فرستاده
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',نگهداری و تعمیرات برنامه برای تمام اقلام تولید شده نیست. لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 ,To Produce,به تولید
 apps/erpnext/erpnext/config/hr.py +93,Payroll,لیست حقوق
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",برای ردیف {0} در {1}. شامل {2} در مورد نرخ، ردیف {3} نیز باید گنجانده شود
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,را کاربر
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,را کاربر
 DocType: Packing Slip,Identification of the package for the delivery (for print),شناسایی بسته برای تحویل (برای چاپ)
 DocType: Bin,Reserved Quantity,تعداد محفوظ است
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا آدرس ایمیل معتبر وارد کنید
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,قالب غیر فعال نباید قالب پیش فرض
 DocType: Account,Income Account,حساب درآمد
 DocType: Payment Request,Amount in customer's currency,مبلغ پول مشتری
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,تحویل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,تحویل
 DocType: Stock Reconciliation Item,Current Qty,تعداد کنونی
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",نگاه کنید به &quot;نرخ مواد بر اساس&quot; در هزینه یابی بخش
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,منطقه مسئولیت های کلیدی
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",دسته های دانشجویی شما کمک کند پیگیری حضور و غیاب، ارزیابی ها و هزینه های برای دانش آموزان
 DocType: Payment Entry,Total Allocated Amount,مجموع مقدار اختصاص داده شده
 DocType: Item Reorder,Material Request Type,مواد نوع درخواست
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ورود مجله Accural برای حقوق از {0} به {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",LocalStorage را کامل است، نجات نداد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",LocalStorage را کامل است، نجات نداد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ردیف {0}: UOM عامل تبدیل الزامی است
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,کد عکس
 DocType: Budget,Cost Center,مرکز هزینه زا
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,مخفی کردن شناسه مالیاتی مشتری از معاملات فروش
 DocType: Upload Attendance,Upload HTML,بارگذاری HTML
 DocType: Employee,Relieving Date,تسکین عضویت
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قانون قیمت گذاری ساخته شده است به بازنویسی لیست قیمت / تعریف درصد تخفیف، بر اساس برخی معیارهای.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,انبار تنها می تواند از طریق بورس ورودی تغییر / تحویل توجه / رسید خرید
 DocType: Employee Education,Class / Percentage,کلاس / درصد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,رئیس بازاریابی و فروش
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.",اگر قانون قیمت گذاری انتخاب شده برای قیمت &quot;ساخته شده، آن را به لیست قیمت بازنویسی. قیمت قانون قیمت گذاری قیمت نهایی است، بنابراین هیچ تخفیف بیشتر قرار داشته باشد. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، از آن خواهد شد در زمینه &#39;نرخ&#39; برداشته، به جای درست &quot;لیست قیمت نرخ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",اگر قانون قیمت گذاری انتخاب شده برای قیمت &quot;ساخته شده، آن را به لیست قیمت بازنویسی. قیمت قانون قیمت گذاری قیمت نهایی است، بنابراین هیچ تخفیف بیشتر قرار داشته باشد. از این رو، در معاملات مانند سفارش فروش، سفارش خرید و غیره، از آن خواهد شد در زمینه &#39;نرخ&#39; برداشته، به جای درست &quot;لیست قیمت نرخ.
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,آهنگ فرصت های نوع صنعت.
 DocType: Item Supplier,Item Supplier,تامین کننده مورد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,لطفا کد مورد وارد کنید دسته ای هیچ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},لطفا یک ارزش برای {0} quotation_to انتخاب کنید {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام آدرس.
 DocType: Company,Stock Settings,تنظیمات سهام
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",ادغام زمانی ممکن است که خواص زیر در هر دو پرونده می باشد. آیا گروه، نوع ریشه، شرکت
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',یک ایمیل در مورد این رویداد به کارکنان با وضعیت ارسال را &#39;Open&#39;
 DocType: Task,Depends on Tasks,بستگی به وظایف
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,مدیریت درختواره گروه مشتری
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,فایل های پیوست را می توان بدون فعال کردن سبد خرید نشان داده شده است
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نام مرکز هزینه
 DocType: Leave Control Panel,Leave Control Panel,ترک کنترل پنل
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,بدهی به
 DocType: Delivery Note,Required only for sample item.,فقط برای نمونه مورد نیاز است.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,تعداد واقعی بعد از تراکنش
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,کننده&gt; نوع کننده
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},بدون لغزش حقوق و دستمزد پیدا شده بین {0} و {1}
 ,Pending SO Items For Purchase Request,در انتظار SO آیتم ها برای درخواست خرید
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,پذیرش دانشجو
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} غیر فعال است
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} غیر فعال است
 DocType: Supplier,Billing Currency,صدور صورت حساب نرخ ارز
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,خیلی بزرگ
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,صفحه خانگی محصول ویژه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,همه گروه ارزیابی
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,جدید نام انبار
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),مجموع {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),مجموع {0} ({1})
 DocType: C-Form Invoice Detail,Territory,منطقه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,لطفا از هیچ بازدیدکننده داشته است مورد نیاز ذکر
 DocType: Stock Settings,Default Valuation Method,روش های ارزش گذاری پیش فرض
 DocType: Vehicle Log,Fuel Qty,تعداد سوخت
 DocType: Production Order Operation,Planned Start Time,برنامه ریزی زمان شروع
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,لیست قیمت مستر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,تمام معاملات فروش را می توان در برابر چند ** ** افراد فروش برچسب به طوری که شما می توانید تعیین و نظارت بر اهداف.
 ,S.O. No.,SO شماره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لطفا مشتری از سرب ایجاد {0}
 DocType: Price List,Applicable for Countries,قابل استفاده برای کشورهای
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,تنها برنامه های کاربردی با وضعیت ترک &#39;تایید&#39; و &#39;رد&#39; را می توان ارسال
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},دانشجو نام گروه را در ردیف الزامی است {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,کپی شده از
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},error نام: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,کمبود
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} با همراه نیست {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} با همراه نیست {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,حضور و غیاب کارکنان برای {0} در حال حاضر مشخص شده
 DocType: Packing Slip,If more than one package of the same type (for print),اگر بیش از یک بسته از همان نوع (برای چاپ)
 ,Salary Register,حقوق و دستمزد ثبت نام
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,استفاده برای سبد خرید
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزش {0} برای صفت {1} در لیست مورد معتبر وجود ندارد مقادیر مشخصه برای مورد {2}
 DocType: BOM Item,Scrap %,ضایعات٪
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",اتهامات خواهد شد توزیع متناسب در تعداد آیتم یا مقدار بر اساس، به عنوان در هر انتخاب شما
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",اتهامات خواهد شد توزیع متناسب در تعداد آیتم یا مقدار بر اساس، به عنوان در هر انتخاب شما
 DocType: Maintenance Visit,Purposes,اهداف
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,حداقل یک مورد باید با مقدار منفی در سند وارد بازگشت
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",عملیات {0} طولانی تر از هر ساعت کار موجود در ایستگاه های کاری {1}، شکستن عملیات به عملیات های متعدد
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,مدیریت درختواره منطقه
 DocType: Journal Entry Account,Sales Invoice,فاکتور فروش
 DocType: Journal Entry Account,Party Balance,تعادل حزب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,لطفا درخواست تخفیف را انتخاب کنید
 DocType: Company,Default Receivable Account,به طور پیش فرض دریافتنی حساب
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ایجاد بانک برای ورود به حقوق و دستمزد کل پرداخت شده برای معیارهای فوق انتخاب شده
 DocType: Stock Entry,Material Transfer for Manufacture,انتقال مواد برای تولید
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,درصد تخفیف می تواند یا علیه یک لیست قیمت و یا برای همه لیست قیمت اعمال می شود.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,درصد تخفیف می تواند یا علیه یک لیست قیمت و یا برای همه لیست قیمت اعمال می شود.
 DocType: Purchase Invoice,Half-yearly,نیمه سال
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ثبت حسابداری برای انبار
 DocType: Vehicle Service,Engine Oil,روغن موتور
 DocType: Sales Invoice,Sales Team1,Team1 فروش
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,مورد {0} وجود ندارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,مورد {0} وجود ندارد
 DocType: Sales Invoice,Customer Address,آدرس مشتری
 DocType: Employee Loan,Loan Details,وام جزییات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ردیف {0}: پایان تعداد باید بزرگتر از صفر باشد.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,نوع ریشه
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ردیف # {0}: نمی تواند بیشتر از بازگشت {1} برای مورد {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,طرح
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},انبار هدف برای ردیف الزامی است {0}
 DocType: Cheque Print Template,Primary Settings,تنظیمات اولیه
 DocType: Purchase Invoice,Select Supplier Address,کنید] را انتخاب کنید
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,اضافه کردن کارمندان
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,اضافه کردن کارمندان
 DocType: Purchase Invoice Item,Quality Inspection,بازرسی کیفیت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,بسیار کوچک
 DocType: Company,Standard Template,قالب استاندارد
 DocType: Training Event,Theory,تئوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,هشدار: مواد درخواست شده تعداد کمتر از حداقل تعداد سفارش تعداد است
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,حساب {0} فریز شده است
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,حقوقی نهاد / جانبی با نمودار جداگانه حساب متعلق به سازمان.
 DocType: Payment Request,Mute Email,بیصدا کردن ایمیل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",مواد غذایی، آشامیدنی و دخانیات
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},می توانید تنها پرداخت به را unbilled را {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,نرخ کمیسیون نمی تواند بیشتر از 100
 DocType: Stock Entry,Subcontract,مقاطعه کاری فرعی
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,لطفا ابتدا وارد {0}
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,انبارها با معامله موجود می توانید به گروه تبدیل نمی کند.
 DocType: Assessment Result Tool,Result HTML,نتیجه HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,منقضی در
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,اضافه کردن دانش آموزان
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,اضافه کردن دانش آموزان
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},لطفا انتخاب کنید {0}
 DocType: C-Form,C-Form No,C-فرم بدون
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,انتخاب سال مالی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب مجدد سطح
 DocType: Company,Chart Of Accounts Template,نمودار حساب الگو
 DocType: Attendance,Attendance Date,حضور و غیاب عضویت
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ورود تکراری
 DocType: Program Enrollment Tool,Get Students,دریافت دانش آموزان
 DocType: Serial No,Under Warranty,تحت گارانتی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[خطا]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[خطا]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,به عبارت قابل مشاهده خواهد بود هنگامی که شما سفارش فروش را نجات دهد.
 ,Employee Birthday,کارمند تولد
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,دانشجو ابزار گروهی حضور و غیاب
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,محدودیت عبور
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,سرمایه گذاری سرمایه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,مدت علمی با این سال تحصیلی &#39;{0} و نام مدت:&#39; {1} قبل وجود دارد. لطفا این نوشته را تغییر دهید و دوباره امتحان کنید.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",به عنوان تراکنش های موجود در برابر آیتم {0} وجود دارد، شما می توانید مقدار را تغییر دهید {1}
 DocType: UOM,Must be Whole Number,باید عدد
 DocType: Leave Control Panel,New Leaves Allocated (In Days),برگ جدید اختصاص داده شده (در روز)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,سریال بدون {0} وجود ندارد
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,درصد از مواد در برابر این سفارش فروش ثبت شده در صورتحساب
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ورود اختتامیه دوره
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,مرکز هزینه با معاملات موجود می تواند به گروه تبدیل می شود
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},مقدار {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},مقدار {0} {1} {2} {3}
 DocType: Account,Depreciation,استهلاک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),تامین کننده (بازدید کنندگان)
 DocType: Employee Attendance Tool,Employee Attendance Tool,کارمند ابزار حضور و غیاب
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,آخرین روز از ماه آینده
 DocType: Support Settings,Auto close Issue after 7 days,خودرو موضوع نزدیک پس از 7 روز
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",می توانید قبل از ترک نمی اختصاص داده شود {0}، به عنوان تعادل مرخصی در حال حاضر شده حمل فرستاده در آینده رکورد تخصیص مرخصی {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نکته: با توجه / بیش از مرجع تاریخ اجازه روز اعتباری مشتری توسط {0} روز (بازدید کنندگان)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,دانشجو متقاضی
 DocType: Asset Category Account,Accumulated Depreciation Account,حساب استهلاک انباشته
 DocType: Stock Settings,Freeze Stock Entries,یخ مطالب سهام
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,تجزیه و تحلیل ترافیک سهام
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,عملیات نمی تواند خالی باشد
 DocType: Maintenance Visit Purpose,Against Document Detail No,جزئیات سند علیه هیچ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,نوع حزب الزامی است
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,نوع حزب الزامی است
 DocType: Quality Inspection,Outgoing,خروجی
 DocType: Material Request,Requested For,درخواست برای
 DocType: Quotation Item,Against Doctype,علیه DOCTYPE
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,کد مورد
 DocType: Production Planning Tool,Create Production Orders,ایجاد سفارشات تولید
 DocType: Serial No,Warranty / AMC Details,گارانتی / AMC اطلاعات بیشتر
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,دانش آموزان به صورت دستی برای فعالیت بر اساس گروه انتخاب
 DocType: Journal Entry,User Remark,نکته کاربری
 DocType: Lead,Market Segment,بخش بازار
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},مبلغ پرداخت نمی تواند بیشتر از کل مقدار برجسته منفی {0}
 DocType: Employee Internal Work History,Employee Internal Work History,کارمند داخلی سابقه کار
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),بسته شدن (دکتر)
 DocType: Cheque Print Template,Cheque Size,حجم چک
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,ایجاد درخواست مواد
 DocType: Employee Education,School/University,مدرسه / دانشگاه
 DocType: Payment Request,Reference Details,اطلاعات مرجع
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مقدار مورد انتظار پس از زندگی مفید باید کمتر از خالص خرید مقدار باشد
 DocType: Sales Invoice Item,Available Qty at Warehouse,تعداد موجود در انبار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,مقدار فاکتور شده
 DocType: Asset,Double Declining Balance,دو موجودی نزولی
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",حساب تفاوت باید یک حساب کاربری نوع دارایی / مسئولیت باشد، زیرا این سهام آشتی ورود افتتاح است
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},میزان مبالغ هزینه نمی تواند بیشتر از وام مبلغ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},خرید شماره سفارش مورد نیاز برای مورد {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,تولید سفارش ایجاد نمی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,تولید سفارش ایجاد نمی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""از تاریخ"" باید پس از ""تا تاریخ"" باشد"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},می توانید تغییر وضعیت به عنوان دانش آموز نمی {0} است با استفاده از دانش آموزان مرتبط {1}
 DocType: Asset,Fully Depreciated,به طور کامل مستهلک
 ,Stock Projected Qty,سهام بینی تعداد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},مشتری {0} تعلق ندارد به پروژه {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,حضور و غیاب مشخص HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",نقل قول پیشنهادات، مناقصه شما را به مشتریان خود ارسال
 DocType: Sales Order,Customer's Purchase Order,سفارش خرید مشتری
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سریال نه و دسته ای
 DocType: Warranty Claim,From Company,از شرکت
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,مجموع نمرات از معیارهای ارزیابی نیاز به {0} باشد.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ارزش و یا تعداد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,لطفا تعداد مجموعه ای از Depreciations رزرو
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ارزش و یا تعداد
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,سفارشات محصولات می توانید برای نه مطرح شود:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,خرید مالیات و هزینه
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,همه انبارها
 DocType: Sales Partner,Retailer,خرده فروش
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,اعتباری به حساب باید یک حساب ترازنامه شود
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,انواع تامین کننده
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,انواع تامین کننده
 DocType: Global Defaults,Disable In Words,غیر فعال کردن در کلمات
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,کد مورد الزامی است زیرا مورد به طور خودکار شماره نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},نقل قول {0} نمی از نوع {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,نرم افزار-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,بانک حساب چک بی محل
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,را لغزش حقوق
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ردیف # {0}: مقدار اختصاص داده شده نمی تواند بیشتر از مقدار برجسته.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,مرور BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,وام
 DocType: Purchase Invoice,Edit Posting Date and Time,ویرایش های ارسال و ویرایش تاریخ و زمان
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه به روز رسانی معاملات سهام مسن تر از {0}
 DocType: Purchase Invoice Item,PR Detail,PR جزئیات
 DocType: Sales Order,Fully Billed,به طور کامل صورتحساب
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},لطفا پیش فرض حساب های قابل پرداخت در مجموعه ای از کارکنان {0}
 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 +127,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),وزن ناخالص از بسته. معمولا وزن خالص + وزن مواد بسته بندی. (برای چاپ)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,بر اساس گروه
 DocType: Journal Entry,Bill Date,تاریخ صورتحساب
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",مورد خدمات، نوع، تعداد و میزان هزینه مورد نیاز
-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:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی اگر قوانین قیمت گذاری های متعدد را با بالاترین اولویت وجود دارد، سپس زیر اولویت های داخلی می شود:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},آیا شما واقعا می خواهید به ارائه تمام لغزش حقوق از {0} به {1}
 DocType: Cheque Print Template,Cheque Height,قد چک
 DocType: Supplier,Supplier Details,اطلاعات بیشتر تامین کننده
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,فاکتور کد عکس
 DocType: Purchase Order,Recurring Order,ترتیب در محدوده زمانی معین
 DocType: Company,Default Income Account,حساب پیش فرض درآمد
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,گروه مشتری / مشتری
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,گروه مشتری / مشتری
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),بسته نشده سال مالی سود / زیان (اعتباری)
 DocType: Sales Invoice,Time Sheets,ورق های زمان
 DocType: Payment Gateway Account,Default Payment Request Message,به طور پیش فرض درخواست پرداخت پیام
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,نقل قول پیام
 DocType: Employee Loan,Employee Loan Application,کارمند وام نرم افزار
 DocType: Issue,Opening Date,افتتاح عضویت
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,حضور و غیاب با موفقیت برگزار شده است.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,حضور و غیاب با موفقیت برگزار شده است.
 DocType: Journal Entry,Remark,اظهار
 DocType: Purchase Receipt Item,Rate and Amount,سرعت و مقدار
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},نوع کاربری برای {0} باید {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},نوع کاربری برای {0} باید {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,برگ و تعطیلات
 DocType: School Settings,Current Academic Term,ترم جاری
 DocType: Sales Order,Not Billed,صورتحساب نه
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,گروه دانشجویی
 DocType: Shopping Cart Settings,Quotation Series,نقل قول سری
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",یک مورد را با همین نام وجود دارد ({0})، لطفا نام گروه مورد تغییر یا تغییر نام آیتم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,لطفا به مشتریان را انتخاب کنید
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,لطفا به مشتریان را انتخاب کنید
 DocType: C-Form,I,من
 DocType: Company,Asset Depreciation Cost Center,دارایی مرکز استهلاک هزینه
 DocType: Sales Order Item,Sales Order Date,تاریخ سفارش فروش
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,جزئیات بیمه
 DocType: Account,Payable,قابل پرداخت
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا دوره بازپرداخت وارد کنید
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),بدهکاران ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),بدهکاران ({0})
 DocType: Pricing Rule,Margin,حاشیه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,مشتریان جدید
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,سود ناخالص٪
 DocType: Appraisal Goal,Weightage (%),بین وزنها (٪)
 DocType: Bank Reconciliation Detail,Clearance Date,ترخیص کالا از تاریخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مبلغ خرید خالص الزامی است
 DocType: Lead,Address Desc,نشانی محصول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,حزب الزامی است
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,حزب الزامی است
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,نام موضوع
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,حداقل یکی از خرید و یا فروش باید انتخاب شود
-DocType: Grading Structure,Grade Intervals,بازه درجه
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ماهیت کسب و کار خود را انتخاب کنید.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},ردیف # {0}: کپی مطلب در منابع {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,که در آن عملیات ساخت در حال انجام شده است.
 DocType: Asset Movement,Source Warehouse,انبار منبع
 DocType: Installation Note,Installation Date,نصب و راه اندازی تاریخ
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,سران نامه برای قالب چاپ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,عناوین برای قالب چاپ به عنوان مثال پروفرم فاکتور.
 DocType: Student Guardian,Student Guardian,دانشجو نگهبان
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,نوع گذاری اتهامات نمی تواند به عنوان فراگیر مشخص شده
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 نرخ
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,تبادل به دست آوردن / از دست دادن حساب
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,کارمند و حضور و غیاب
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},هدف باید یکی از است {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,فرم را پر کنید و آن را ذخیره کنید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,انجمن
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,تعداد واقعی در سهام
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترتیب مجدد تعداد
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,فرصت های شغلی فعلی
 DocType: Company,Stock Adjustment Account,حساب تنظیم سهام
-DocType: Journal Entry,Write Off,کسر کردن
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,کسر کردن
 DocType: Timesheet Detail,Operation ID,عملیات ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سیستم کاربر (ورود به سایت) ID. اگر تعیین شود، آن را تبدیل به طور پیش فرض برای همه اشکال HR.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: از {1}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ارائه کننده به مشتری
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (فرم # / کالا / {0}) خارج از بورس
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,تاریخ بعدی باید بزرگتر از ارسال تاریخ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,نمایش مالیاتی تجزیه
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,نمایش مالیاتی تجزیه
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},با توجه / مرجع تاریخ نمی تواند بعد {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,اطلاعات واردات و صادرات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",نوشته سهام برابر انبار {0} وجود داشته باشد، از این رو شما می توانید دوباره اختصاص و یا آن را تغییر دهید
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,هیچ دانش آموزان یافت
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,هیچ دانش آموزان یافت
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,فاکتور های ارسال و ویرایش تاریخ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,فروختن
 DocType: Sales Invoice,Rounded Total,گرد مجموع
 DocType: Product Bundle,List items that form the package.,اقلام لیست که به صورت بسته بندی شده.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,درصد تخصیص باید به 100٪ برابر باشد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,لطفا ارسال تاریخ قبل از انتخاب حزب را انتخاب کنید
 DocType: Program Enrollment,School House,مدرسه خانه
 DocType: Serial No,Out of AMC,از AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا نقل قول انتخاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,را نگهداری سایت
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا نقل قول انتخاب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,تعداد Depreciations رزرو نمی تواند بیشتر از تعداد کل Depreciations
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,را نگهداری سایت
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,لطفا برای کاربری که فروش کارشناسی ارشد مدیریت {0} نقش دارند تماس
 DocType: Company,Default Cash Account,به طور پیش فرض حساب های نقدی
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شرکت (و نه مشتری و یا تامین کننده) استاد.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,این است که در حضور این دانش آموز بر اساس
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,هیچ دانشآموزی در
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,اضافه کردن آیتم های بیشتر و یا به صورت کامل باز
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',لطفا &quot;انتظار تاریخ تحویل را وارد
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,یادداشت تحویل {0} باید قبل از لغو این سفارش فروش لغو
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 مورد
 DocType: Purchase Order,Customer Contact Email,مشتریان تماس با ایمیل
 DocType: Warranty Claim,Item and Warranty Details,آیتم و گارانتی اطلاعات
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,کد کالا&gt; مورد گروه&gt; نام تجاری
 DocType: Sales Team,Contribution (%),سهم (٪)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,توجه: ورودی پرداخت خواهد از ایجاد شوند &quot;نقدی یا حساب بانکی &#39;مشخص نشده بود
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,برنامه به بهانه دوره اجباری را انتخاب کنید.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,قبل از آشتی
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},به {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیات و هزینه اضافه شده (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ردیف مالیاتی مورد {0} باید حساب از نوع مالیات یا درآمد یا هزینه یا شارژ داشته
 DocType: Sales Order,Partly Billed,تا حدودی صورتحساب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,مورد {0} باید مورد دارائی های ثابت شود
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,مورد {0} باید مورد دارائی های ثابت شود
 DocType: Item,Default BOM,به طور پیش فرض BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,لطفا دوباره نوع نام شرکت برای تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,مجموع برجسته AMT
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,خودرو
 DocType: Vehicle,Insurance Company,شرکت بیمه
 DocType: Asset Category Account,Fixed Asset Account,حساب دارایی ثابت
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,متغیر
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,از تحویل توجه داشته باشید
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,متغیر
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,از تحویل توجه داشته باشید
 DocType: Student,Student Email Address,دانشجو آدرس ایمیل
 DocType: Timesheet Detail,From Time,از زمان
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,در انبار:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,لیست قیمت نرخ ارز
 DocType: Purchase Invoice Item,Rate,نرخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انترن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,نام آدرس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,نام آدرس
 DocType: Stock Entry,From BOM,از BOM
 DocType: Assessment Code,Assessment Code,کد ارزیابی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,پایه
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,معاملات سهام قبل از {0} منجمد
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',لطفا بر روی &#39;ایجاد برنامه کلیک کنید
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",به عنوان مثال کیلوگرم، واحد، شماره، متر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,مرجع بدون اجباری است اگر شما وارد مرجع تاریخ
 DocType: Bank Reconciliation Detail,Payment Document,سند پرداخت
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,ساختار حقوق و دستمزد
 DocType: Account,Bank,بانک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,شرکت هواپیمایی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,مواد شماره
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,مواد شماره
 DocType: Material Request Item,For Warehouse,ذخیره سازی
 DocType: Employee,Offer Date,پیشنهاد عضویت
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,نقل قول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,شما در حالت آفلاین می باشد. شما نمی قادر خواهد بود به بارگذاری مجدد تا زمانی که شما به شبکه وصل شوید.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,بدون تشکل های دانشجویی ایجاد شده است.
 DocType: Purchase Invoice Item,Serial No,شماره سریال
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میزان بازپرداخت ماهانه نمی تواند بیشتر از وام مبلغ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,لطفا ابتدا Maintaince جزئیات را وارد کنید
 DocType: Purchase Invoice,Print Language,چاپ زبان
 DocType: Salary Slip,Total Working Hours,کل ساعات کار
 DocType: Stock Entry,Including items for sub assemblies,از جمله موارد زیر را برای مجامع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,را وارد کنید مقدار باید مثبت باشد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,همه مناطق
 DocType: Purchase Invoice,Items,اقلام
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,دانشجو در حال حاضر ثبت نام.
@@ -3254,16 +3263,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',واحد اندازه گیری پیش فرض برای متغیر &#39;{0}&#39; باید همان است که در الگو: &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه بر اساس
 DocType: Delivery Note Item,From Warehouse,از انبار
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,هیچ موردی با بیل از مواد برای تولید
 DocType: Assessment Plan,Supervisor Name,نام استاد راهنما
 DocType: Program Enrollment Course,Program Enrollment Course,برنامه ثبت نام دوره
-DocType: Grading Structure,Grading Structure,ساختار درجه بندی
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزش گذاری و مجموع
 DocType: Tax Rule,Shipping City,حمل و نقل شهر
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,سفارشی اطلاع رسانی
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,جریان وجوه نقد از عملیات
 DocType: Sales Invoice,Shipping Rule,قانون حمل و نقل
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},بدون پیش فرض BOM برای مورد وجود دارد {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,لطفا در ارسال تاریخ را انتخاب کنید اول
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,باز کردن تاریخ باید قبل از بسته شدن تاریخ
 DocType: Leave Control Panel,Carry Forward,حمل به جلو
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,مرکز هزینه با معاملات موجود را نمی توان تبدیل به لجر
 DocType: Department,Days for which Holidays are blocked for this department.,روز که تعطیلات برای این بخش مسدود شده است.
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,عمومی
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ضمیمه سربرگ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ارتباطات آخرین
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',نمی تواند کسر زمانی که دسته بندی است برای ارزش گذاری &quot;یا&quot; ارزش گذاری و مجموع &quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,پرداخت بازی با فاکتورها
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),مجموع (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,سرگرمی و اوقات فراغت
 DocType: Quality Inspection,Item Serial No,مورد سریال بدون
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,درست کارمند سوابق
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,درست کارمند سوابق
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,در حال حاضر مجموع
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,بیانیه های حسابداری
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,ناشناخته
 DocType: Shipping Rule,Shipping Rule Conditions,حمل و نقل قانون شرایط
 DocType: BOM Replace Tool,The new BOM after replacement,BOM جدید پس از تعویض
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,نقطه ای از فروش
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,نقطه ای از فروش
 DocType: Payment Entry,Received Amount,دریافت مبلغ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا کارمند راه اندازی نامگذاری سیستم در منابع انسانی&gt; تنظیمات HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",درست برای مقدار کامل، نادیده گرفتن مقدار در حال حاضر در سفارش
 DocType: Account,Tax,مالیات
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,مشخص شده نیست
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,فاکتورها
 DocType: Batch,Source Document Name,منبع نام سند
 DocType: Job Opening,Job Title,عنوان شغلی
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ایجاد کاربران
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ایجاد کاربران
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,تعداد برای تولید باید بیشتر از 0 باشد.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,گزارش تماس نگهداری مراجعه کنید.
 DocType: Stock Entry,Update Rate and Availability,نرخ به روز رسانی و در دسترس بودن
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,درصد شما مجاز به دریافت و یا ارائه بیش برابر مقدار سفارش داد. به عنوان مثال: اگر شما 100 واحد دستور داده اند. و کمک هزینه خود را 10٪ و سپس شما مجاز به دریافت 110 واحد است.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},حساب هزینه برای آیتم الزامی است {0}
 DocType: BOM,Website Description,وب سایت توضیحات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,تغییر خالص در حقوق صاحبان سهام
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,لطفا لغو خرید فاکتور {0} برای اولین بار
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",آدرس ایمیل باید منحصر به فرد باشد، در حال حاضر برای {0} وجود دارد
 DocType: Serial No,AMC Expiry Date,AMC تاریخ انقضاء
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,اعلام وصول
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,اعلام وصول
 ,Sales Register,ثبت فروش
 DocType: Daily Work Summary Settings Company,Send Emails At,ارسال ایمیل در
 DocType: Quotation,Quotation Lost Reason,نقل قول را فراموش کرده اید دلیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,انتخاب دامنه خود
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},معامله مرجع {0} تاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,چیزی برای ویرایش وجود دارد.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,خلاصه برای این ماه و فعالیت های انتظار
 DocType: Customer Group,Customer Group Name,نام گروه مشتری
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,بدون مشتریان هنوز!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,صورت جریان وجوه نقد
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},وام مبلغ می توانید حداکثر مبلغ وام از تجاوز نمی {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,مجوز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},لطفا این فاکتور {0} از C-فرم حذف {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,لطفا وارد حساب فعال
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تاریخ و زمان آخرین چینش تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},حساب {0} به شرکت {1} تعلق ندارد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,شماره سریال در ردیف {0} با تحویل توجه مطابقت ندارد
 DocType: Student,Guardian Details,نگهبان جزییات
 DocType: C-Form,C-Form,C-فرم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,حضور و غیاب علامت برای کارکنان متعدد
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ردیف {0} # حساب باید از این نوع باشد، دارایی ثابت &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,از تعداد
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,مشاهده قوانین برای محاسبه مقدار حمل و نقل برای فروش
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,سری الزامی است
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,سری الزامی است
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,خدمات مالی
 DocType: Student Sibling,Student ID,ID دانش آموز
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,نوع فعالیت برای سیاهههای مربوط زمان
 DocType: Tax Rule,Sales,فروش
 DocType: Stock Entry Detail,Basic Amount,مقدار اولیه
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},انبار مورد نیاز برای سهام مورد {0}
 DocType: Leave Allocation,Unused leaves,برگ استفاده نشده
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,کروم
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,کروم
 DocType: Tax Rule,Billing State,دولت صدور صورت حساب
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,انتقال
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} با حساب حزب همراه نیست {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} با حساب حزب همراه نیست {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),واکشی BOM منفجر شد (از جمله زیر مجموعه)
 DocType: Authorization Rule,Applicable To (Employee),به قابل اجرا (کارمند)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,تاریخ الزامی است
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,افزایش برای صفت {0} نمی تواند 0
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,مشتریان غیر فعال
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,رسید خرید
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,چگونه قیمت گذاری قانون اعمال می شود؟
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,چگونه قیمت گذاری قانون اعمال می شود؟
 DocType: Stock Entry,Delivery Note No,تحویل توجه داشته باشید هیچ
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",اگر علامت زده شود، تنها خرید درخواست مواد برای مواد خام نهایی خواهد شد در درخواست مواد گنجانده شده است. در غیر این صورت، درخواست مواد برای اقلام پدر و مادر ایجاد خواهد شد
 DocType: Cheque Print Template,Message to show,پیام را نشان می دهد
 DocType: Company,Retail,خرده فروشی
 DocType: Attendance,Absent,غایب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,بسته نرم افزاری محصولات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ردیف {0}: مرجع نامعتبر {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,خرید مالیات و هزینه الگو
 DocType: Upload Attendance,Download Template,دانلود الگو
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,حساب پرداخت از
 DocType: Purchase Order Item Supplied,Raw Material Item Code,مواد اولیه کد مورد
 DocType: Journal Entry,Write Off Based On,ارسال فعال بر اساس
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,را سرب
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,را سرب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,چاپ و لوازم التحریر
 DocType: Stock Settings,Show Barcode Field,نمایش بارکد درست
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ارسال ایمیل کننده
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ارسال ایمیل کننده
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",حقوق و دستمزد در حال حاضر برای دوره بین {0} و {1}، ترک دوره نرم افزار نمی تواند بین این محدوده تاریخ پردازش شده است.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,رکورد نصب و راه اندازی برای یک شماره سریال
 DocType: Guardian Interest,Guardian Interest,نگهبان علاقه
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,در انتظار پاسخ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,در بالا
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ویژگی نامعتبر {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ذکر است اگر غیر استاندارد حساب های قابل پرداخت
 DocType: Salary Slip,Earning & Deduction,سود و کسر
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاری است. این تنظیم استفاده می شود برای فیلتر کردن در معاملات مختلف است.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,نرخ گذاری منفی مجاز نیست
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,تولید سفارش مورد
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,موردی یافت
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,هزینه دارایی اوراق
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,نیمه ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: مرکز هزینه برای مورد الزامی است {2}
 DocType: Vehicle,Policy No,سیاست هیچ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,گرفتن اقلام از بسته نرم افزاری محصولات
 DocType: Asset,Straight Line,خط مستقیم
 DocType: Project User,Project User,پروژه کاربر
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,شکاف
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,مطلع دانش آموزان از
 DocType: Hub Settings,Seller Country,فروشنده کشور
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,انتشار موارد در وب سایت
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,گروه دانش آموزان خود را در دسته
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,گروه دانش آموزان خود را در دسته
 DocType: Authorization Rule,Authorization Rule,قانون مجوز
 DocType: Sales Invoice,Terms and Conditions Details,قوانین و مقررات جزئیات
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مشخصات
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,چک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},حساب {0}: حساب مرجع {1} به شرکت تعلق ندارد: {2}
 DocType: Program Enrollment Tool,Student Applicants,متقاضیان دانشجو
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,با موفقیت حذف تمام معاملات مربوط به این شرکت!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,همانطور که در تاریخ
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,تاریخ ثبت نام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,عفو مشروط
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,قطعات حقوق و دستمزد
 DocType: Program Enrollment Tool,New Academic Year,سال تحصیلی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,بازگشت / اعتباری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,بازگشت / اعتباری
 DocType: Stock Settings,Auto insert Price List rate if missing,درج خودرو نرخ لیست قیمت اگر از دست رفته
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,کل مقدار پرداخت
 DocType: Production Order Item,Transferred Qty,انتقال تعداد
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",نوع برگ مانند گاه به گاه، بیمار و غیره
 DocType: Email Digest,Send regular summary reports via Email.,ارسال گزارش خلاصه به طور منظم از طریق ایمیل.
 DocType: Payment Entry,PE-,پلی اتیلن-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},لطفا به حساب پیش فرض تنظیم شده در نوع ادعا هزینه {0}
 DocType: Assessment Result,Student Name,نام دانش آموز
 DocType: Brand,Item Manager,مدیریت آیتم ها
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,حقوق و دستمزد پرداختنی
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,قیف فروش
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,مخفف الزامی است
 DocType: Project,Task Progress,وظیفه پیشرفت
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,گاری
 ,Qty to Transfer,تعداد می توان به انتقال
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,پیشنهاد قیمت برای مشتریان یا مشتریان بالقوه
 DocType: Stock Settings,Role Allowed to edit frozen stock,نقش مجاز به ویرایش سهام منجمد
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,مورد جزئیات حکیم مالیات
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,مخفف موسسه
 ,Item-wise Price List Rate,مورد عاقلانه لیست قیمت نرخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,نقل قول تامین کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,نقل قول تامین کننده
 DocType: Quotation,In Words will be visible once you save the Quotation.,به عبارت قابل مشاهده خواهد بود هنگامی که شما نقل قول را نجات دهد.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},تعداد ({0}) نمی تواند یک کسر در ردیف {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,جمع آوری هزینه
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},بارکد {0} در حال حاضر در مورد استفاده {1}
 DocType: Lead,Add to calendar on this date,افزودن به تقویم در این تاریخ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,مشاهده قوانین برای اضافه کردن هزینه های حمل و نقل.
 DocType: Item,Opening Stock,سهام باز کردن
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",در دقیقه به روز رسانی از طریق &#39;زمان ورود &quot;
 DocType: Customer,From Lead,از سرب
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,سفارشات برای تولید منتشر شد.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,انتخاب سال مالی ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,انتخاب سال مالی ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,نمایش POS مورد نیاز برای ایجاد POS ورود
 DocType: Program Enrollment Tool,Enroll Students,ثبت نام دانش آموزان
 DocType: Hub Settings,Name Token,نام رمز
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,فروش استاندارد
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} در برابر فاکتور فروش {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,نام پروژه
-DocType: Supplier,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
+DocType: Customer,Mention if non-standard receivable account,ذکر است اگر حسابهای دریافتنی غیر استاندارد
 DocType: Journal Entry Account,If Income or Expense,اگر درآمد یا هزینه
 DocType: Production Order,Required Items,اقلام مورد نیاز
 DocType: Stock Ledger Entry,Stock Value Difference,تفاوت ارزش سهام
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مجموعه اهداف مورد گروه عاقلانه برای این فرد از فروش.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],سهام یخ قدیمی تر از [روز]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ردیف # {0}: دارایی برای دارائی های ثابت خرید / فروش اجباری است
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",اگر دو یا چند قوانین قیمت گذاری هستند در بر داشت بر اساس شرایط فوق، اولویت اعمال می شود. اولویت یک عدد بین 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.,اجازه می دهد کاربران زیر به تصویب برنامه های کاربردی را برای روز مسدود کند.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,مورد {0} از آن نادیده گرفته است یک آیتم سهام نمی
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",برای رد درخواست قیمت گذاری در یک معامله خاص نیست، همه قوانین قیمت گذاری قابل اجرا باید غیر فعال باشد.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",برای رد درخواست قیمت گذاری در یک معامله خاص نیست، همه قوانین قیمت گذاری قابل اجرا باید غیر فعال باشد.
 DocType: Assessment Group,Parent Assessment Group,پدر و مادر گروه ارزیابی
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,شغل ها
 ,Sales Order Trends,سفارش فروش روند
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,هزینه های اضافی
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,مالی سال پایان تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",می توانید بر روی کوپن نه فیلتر بر اساس، در صورتی که توسط کوپن گروه بندی
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,را عین تامین کننده
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,را عین تامین کننده
 DocType: Quality Inspection,Incoming,وارد شونده
 DocType: BOM,Materials Required (Exploded),مواد مورد نیاز (منفجر شد)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",اضافه کردن کاربران به سازمان شما، به غیر از خودتان
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,تاریخچه در شرکت
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامه
 DocType: Stock Ledger Entry,Stock Ledger Entry,سهام لجر ورود
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ضوابط&gt; ضوابط گروه&gt; قلمرو
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,آیتم همان وارد شده است چندین بار
 DocType: Department,Leave Block List,ترک فهرست بلوک
 DocType: Sales Invoice,Tax ID,ID مالیات
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,شریک فروش و کمیسیون
 DocType: Employee Loan,Rate of Interest (%) / Year,نرخ بهره (٪) / سال
 ,Project Quantity,تعداد پروژه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",مجموع {0} برای همه موارد صفر است، ممکن است شما باید &#39;اتهامات بر اساس توزیع را تغییر
 DocType: Opportunity,To Discuss,به بحث در مورد
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} واحد از {1} مورد نیاز در {2} برای تکمیل این معامله.
 DocType: Loan Type,Rate of Interest (%) Yearly,نرخ بهره (٪) سالانه
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,برگشت
 DocType: Production Order Operation,Production Order Operation,ترتیب عملیات تولید
 DocType: Pricing Rule,Disable,از کار انداختن
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,نحوه پرداخت مورد نیاز است را به پرداخت
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,نحوه پرداخت مورد نیاز است را به پرداخت
 DocType: Project Task,Pending Review,در انتظار نقد و بررسی
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",دارایی {0} نمی تواند اوراق شود، آن است که در حال حاضر {1}
 DocType: Task,Total Expense Claim (via Expense Claim),ادعای هزینه کل (از طریق ادعای هزینه)
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,علامت گذاری به عنوان غایب
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ردیف {0}: ارز BOM # در {1} باید به ارز انتخاب شده برابر باشد {2}
 DocType: Journal Entry Account,Exchange Rate,مظنهء ارز
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,سفارش فروش {0} است ارسال نشده
 DocType: Homepage,Tag Line,نقطه حساس
 DocType: Fee Component,Fee Component,هزینه یدکی
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,مدیریت ناوگان
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,اضافه کردن آیتم از
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,اضافه کردن آیتم از
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},انبار {0}: حساب مرجع {1} به شرکت bolong نمی {2}
 DocType: Cheque Print Template,Regular,منظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,وزنها در کل از همه معیارهای ارزیابی باید 100٪
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,آیتم انتخاب شده می تواند دسته ای ندارد
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",نرخ ارزش گذاری برای آیتم {0}، که لازم است برای انجام ورودی حسابداری برای یافت نشد {1} {2}. در صورتی که آیتم به عنوان یک آیتم نمونه در طرف قرارداد {1}، لطفا ذکر است که در {1} جدول مورد. در غیر این صورت، لطفا ایجاد یک معامله سهام های دریافتی را برای آیتم و یا ذکر میزان ارزش در پرونده مورد، و سپس سعی کنید از ارسال / لغو این مطلب
 DocType: Delivery Note,% of materials delivered against this Delivery Note,درصد از مواد در برابر این تحویل توجه تحویل
 DocType: Project,Customer Details,اطلاعات مشتری
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,پارامتر آدرس را وارد کنید برای گیرنده NOS
 DocType: Payment Entry,Paid Amount,مبلغ پرداخت
 DocType: Assessment Plan,Supervisor,سرپرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,آنلاین
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,آنلاین
 ,Available Stock for Packing Items,انبار موجود آیتم ها بسته بندی
 DocType: Item Variant,Item Variant,مورد نوع
 DocType: Assessment Result Tool,Assessment Result Tool,ابزار ارزیابی نتیجه
 DocType: BOM Scrap Item,BOM Scrap Item,BOM مورد ضایعات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,سفارشات ارسال شده را نمی توان حذف
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,مدیریت کیفیت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,مورد {0} غیرفعال شده است
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,مورد {0} غیرفعال شده است
 DocType: Employee Loan,Repay Fixed Amount per Period,بازپرداخت مقدار ثابت در هر دوره
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لطفا مقدار برای آیتم را وارد کنید {0}
 DocType: Employee External Work History,Employee External Work History,کارمند خارجی سابقه کار
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,دانشجو ID ایمیل
 DocType: Employee,Notice (days),مقررات (روز)
 DocType: Tax Rule,Sales Tax Template,قالب مالیات بر فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,انتخاب آیتم ها برای صرفه جویی در فاکتور
 DocType: Employee,Encashment Date,Encashment عضویت
 DocType: Training Event,Internet,اینترنت
 DocType: Account,Stock Adjustment,تنظیم سهام
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,ویژگی
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,لطفا از مشخص / به محدوده
 DocType: Serial No,Under AMC,تحت AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,نرخ گذاری مورد محاسبه در نظر دارد فرود هزینه مقدار کوپن
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,نرخ گذاری مورد محاسبه در نظر دارد فرود هزینه مقدار کوپن
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,تنظیمات پیش فرض برای فروش معاملات.
 DocType: Guardian,Guardian Of ,نگهبان
 DocType: Grading Scale Interval,Threshold,آستانه
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,بدهی توجه صادر
 DocType: Production Order,Warehouses,ساختمان و ذخیره سازی
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} دارایی نمی تواند منتقل شود
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,این مورد یک نوع از {0} (الگو) است.
 DocType: Workstation,per hour,در ساعت
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,خرید
 DocType: Announcement,Announcement,اعلان
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,دریافتنی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ردیف # {0}: مجاز به تغییر به عنوان کننده سفارش خرید در حال حاضر وجود
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,نقش است که مجاز به ارائه معاملات است که بیش از محدودیت های اعتباری تعیین شده است.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,انتخاب موارد برای ساخت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,انتخاب موارد برای ساخت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",استاد همگام سازی داده های، ممکن است برخی از زمان
 DocType: Item,Material Issue,شماره مواد
 DocType: Hub Settings,Seller Description,فروشنده توضیحات
 DocType: Employee Education,Qualification,صلاحیت
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,مرتب
 DocType: Salary Detail,Component,مولفه
 DocType: Assessment Criteria,Assessment Criteria Group,معیارهای ارزیابی گروه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},باز کردن استهلاک انباشته باید کمتر از برابر شود {0}
 DocType: Warehouse,Warehouse Name,نام انبار
 DocType: Naming Series,Select Transaction,انتخاب معامله
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا تصویب نقش و یا تصویب کاربر وارد
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,نمی تواند به دلیل لغو ارائه سهام ورود {0} وجود دارد
 DocType: Employee Loan,Disbursement Date,تاریخ پرداخت
 DocType: Vehicle,Vehicle,وسیله نقلیه
 DocType: Purchase Invoice,In Words,به عبارت
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP /٪ سرب
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations دارایی و تعادل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},مقدار {0} {1} منتقل شده از {2} به {3}
 DocType: Sales Invoice,Get Advances Received,دریافت پیشرفت های دریافتی
 DocType: Email Digest,Add/Remove Recipients,اضافه کردن / حذف دریافت کنندگان
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},معامله در برابر تولید متوقف مجاز ترتیب {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",برای تنظیم این سال مالی به عنوان پیش فرض، بر روی &quot;تنظیم به عنوان پیش فرض &#39;
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,پیوستن
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمبود تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,نوع مورد {0} با ویژگی های مشابه وجود دارد
 DocType: Employee Loan,Repay from Salary,بازپرداخت از حقوق و دستمزد
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},درخواست پرداخت در مقابل {0} {1} برای مقدار {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ارزیابی جزئیات نتیجه
 DocType: Employee Education,Employee Education,آموزش و پرورش کارمند
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,گروه مورد تکراری در جدول گروه مورد
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,آن را به واکشی اطلاعات مورد نیاز است.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} در حال حاضر دریافت شده است
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",انبار {0} است به هر حساب در ارتباط نیست، لطفا ایجاد / لینک مربوطه (دارایی) حساب کاربری برای انبار.
 DocType: Purchase Invoice,Recurring Id,تکرار کد
 DocType: Customer,Sales Team Details,جزییات تیم فروش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,به طور دائم حذف کنید؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,به طور دائم حذف کنید؟
 DocType: Expense Claim,Total Claimed Amount,مجموع مقدار ادعا
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فرصت های بالقوه برای فروش.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},نامعتبر {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,راه اندازی مدرسه خود را در ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),پایه تغییر مقدار (شرکت ارز)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,هیچ نوشته حسابداری برای انبار زیر
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,مبلغ آخرین سفارش
+DocType: Task,Is Milestone,است نقطه عطف
 DocType: Daily Work Summary,Email Sent To,ایمیل ارسال شده به
 DocType: Budget,Warn,هشدار دادن
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",هر گونه اظهارات دیگر، تلاش قابل توجه است که باید در پرونده بروید.
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,موجودیت مقدار
 ,Itemwise Recommended Reorder Level,Itemwise توصیه ترتیب مجدد سطح
 DocType: Salary Detail,Salary Detail,جزئیات حقوق و دستمزد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,لطفا انتخاب کنید {0} برای اولین بار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,دسته {0} از {1} مورد تمام شده است.
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ورق زمان برای تولید.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`سهام منجمد قدیمی تر از` باید کوچکتر از %d روز باشد.
 DocType: Tax Rule,Purchase Tax Template,خرید قالب مالیات
 ,Project wise Stock Tracking,پروژه پیگیری سهام عاقلانه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},نگهداری و تعمیرات برنامه {0} در برابر وجود دارد {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),تعداد واقعی (در منبع / هدف)
 DocType: Item Customer Detail,Ref Code,کد
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,سوابق کارکنان.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,لطفا بعد تاریخ استهلاک
 DocType: HR Settings,Payroll Settings,تنظیمات حقوق و دستمزد
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,مطابقت فاکتورها غیر مرتبط و پرداخت.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,محل سفارش
 DocType: Email Digest,New Purchase Orders,سفارشات خرید جدید
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ریشه می تواند یک مرکز هزینه پدر و مادر ندارد
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,انتخاب نام تجاری ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,انتخاب نام تجاری ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,انباشته استهلاک به عنوان در
 DocType: Sales Invoice,C-Form Applicable,C-فرم قابل استفاده
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},عملیات زمان باید بیشتر از 0 برای عملیات می شود {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,انبار الزامی است
 DocType: Supplier,Address and Contacts,آدرس و اطلاعات تماس
 DocType: UOM Conversion Detail,UOM Conversion Detail,جزئیات UOM تبدیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),وب 900px دوستانه (W) توسط نگه داشتن آن را 100px (H)
 DocType: Program,Program Abbreviation,مخفف برنامه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,سفارش تولید می تواند در برابر یک الگو مورد نمی توان مطرح
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,اتهامات در رسید خرید بر علیه هر یک از آیتم به روز شده
 DocType: Warranty Claim,Resolved By,حل
 DocType: Bank Guarantee,Start Date,تاریخ شروع
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,اختصاص برگ برای یک دوره.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چک و واریز وجه به اشتباه پاک
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,حساب {0}: شما نمی توانید خود را به عنوان پدر و مادر اختصاص حساب
 DocType: Purchase Invoice Item,Price List Rate,لیست قیمت نرخ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,درست به نقل از مشتری
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,درست به نقل از مشتری
 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 +38,Bill of Materials (BOM),صورت مواد (BOM)
 DocType: Item,Average time taken by the supplier to deliver,میانگین زمان گرفته شده توسط منبع برای ارائه
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,نتیجه ارزیابی
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعت
 DocType: Project,Expected Start Date,انتظار می رود تاریخ شروع
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,حذف آیتم اگر از اتهامات عنوان شده و قابل انطباق با آن قلم نمی
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,واحد ارز تراکنش باید با واحد ارز درگاه پرداخت یکسان باشد
 DocType: Payment Entry,Receive,دريافت كردن
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,هزینه های عملیاتی
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,اکشن اگر انباشته بودجه ماهانه بیش از حد
 DocType: Purchase Invoice,Submit on creation,ارسال در ایجاد
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},ارز برای {0} باید {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},ارز برای {0} باید {1}
 DocType: Asset,Disposal Date,تاریخ دفع
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ایمیل خواهد شد به تمام کارمندان فعال این شرکت در ساعت داده ارسال می شود، اگر آنها تعطیلات ندارد. خلاصه ای از پاسخ های خواهد شد در نیمه شب فرستاده شده است.
 DocType: Employee Leave Approver,Employee Leave Approver,کارمند مرخصی تصویب
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ردیف {0}: ورود ترتیب مجدد در حال حاضر برای این انبار وجود دارد {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",نمی تواند به عنوان از دست رفته اعلام، به دلیل عبارت ساخته شده است.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,آموزش فیدبک
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,سفارش تولید {0} باید ارائه شود
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},لطفا تاریخ شروع و پایان تاریخ برای مورد را انتخاب کنید {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},البته در ردیف الزامی است {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تا به امروز نمی تواند قبل از از تاریخ
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,افزودن / ویرایش قیمت ها
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,افزودن / ویرایش قیمت ها
 DocType: Batch,Parent Batch,دسته ای پدر و مادر
 DocType: Cheque Print Template,Cheque Print Template,چک الگو چاپ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,نمودار مراکز هزینه
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,آیتم ها دستور داد تا تحویل
 DocType: Account,Income,درامد
 DocType: Industry Type,Industry Type,نوع صنعت
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,مشکلی!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,مشکلی!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,هشدار: بگذارید برنامه شامل تاریخ های بلوک زیر
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,فاکتور فروش {0} در حال حاضر ارائه شده است
 DocType: Assessment Result Detail,Score,نمره
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,بر اساس نوع
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},بین وزنها مجموع اختصاص داده باید 100٪ باشد. این {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,تامین کنندگان شما
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,می توانید مجموعه ای نه به عنوان از دست داده تا سفارش فروش ساخته شده است.
 DocType: Request for Quotation Item,Supplier Part No,کننده قسمت بدون
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,دریافت شده از
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',نمی توانید کسر وقتی دسته است برای ارزش گذاری &quot;یا&quot; Vaulation و مجموع:
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,دریافت شده از
 DocType: Lead,Converted,مبدل
 DocType: Item,Has Serial No,دارای سریال بدون
 DocType: Employee,Date of Issue,تاریخ صدور
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: از {0} برای {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: از {0} برای {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ردیف # {0}: تنظیم کننده برای آیتم {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ردیف {0}: ارزش ساعت باید بزرگتر از صفر باشد.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,وب سایت تصویر {0} متصل به مورد {1} را نمی توان یافت
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,فهرست این مورد در گروه های متعدد بر روی وب سایت.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,شما مجاز به تنظیم مقدار ثابت شده نیستید
 DocType: Payment Reconciliation,Get Unreconciled Entries,دریافت Unreconciled مطالب
 DocType: Payment Reconciliation,From Invoice Date,از تاریخ فاکتور
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ارز صورتحساب باید به ارز یا به حساب حزب ارز هم به طور پیش فرض comapany برابر شود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ترک مجموعه
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,چه کاری انجام میدهد؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,به انبار
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,همه پذیرش دانشجو
 ,Average Commission Rate,اوسط نرخ کمیشن
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""دارای شماره سریال""  برای موارد غیر انباری نمی تواند ""بله"" باشد"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حضور و غیاب می تواند برای تاریخ های آینده باشد مشخص شده
 DocType: Pricing Rule,Pricing Rule Help,قانون قیمت گذاری راهنما
 DocType: School House,House Name,نام خانه
 DocType: Purchase Taxes and Charges,Account Head,سر حساب
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,به روز رسانی هزینه های اضافی برای محاسبه هزینه فرود آمد از اقلام
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,برق
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,اضافه کردن بقیه سازمان خود را به عنوان کاربران خود را. شما همچنین می توانید دعوت مشتریان به پورتال خود را اضافه کنید با اضافه کردن آنها از اطلاعات تماس
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,اضافه کردن بقیه سازمان خود را به عنوان کاربران خود را. شما همچنین می توانید دعوت مشتریان به پورتال خود را اضافه کنید با اضافه کردن آنها از اطلاعات تماس
 DocType: Stock Entry,Total Value Difference (Out - In),تفاوت ارزش ها (خارج - در)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,کد مشتری
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},یادآوری تاریخ تولد برای {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,روز پس از آخرین سفارش
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,بدهکاری به حساب کاربری باید یک حساب ترازنامه شود
 DocType: Buying Settings,Naming Series,نامگذاری سری
 DocType: Leave Block List,Leave Block List Name,ترک نام فهرست بلوک
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,تاریخ بیمه شروع باید کمتر از تاریخ پایان باشد بیمه
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},لغزش حقوق و دستمزد کارکنان {0} در حال حاضر برای ورق زمان ایجاد {1}
 DocType: Vehicle Log,Odometer,کیلومتر شمار
 DocType: Sales Order Item,Ordered Qty,دستور داد تعداد
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,مورد {0} غیر فعال است
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,مورد {0} غیر فعال است
 DocType: Stock Settings,Stock Frozen Upto,سهام منجمد تا حد
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM هیچ گونه سهام مورد را نمی
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},دوره و دوره به تاریخ برای تکرار اجباری {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,فعالیت پروژه / وظیفه.
 DocType: Vehicle Log,Refuelling Details,اطلاعات سوختگیری
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,آخرین نرخ خرید یافت نشد
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ارسال کردن مقدار (شرکت ارز)
 DocType: Sales Invoice Timesheet,Billing Hours,ساعت صدور صورت حساب
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM به طور پیش فرض برای {0} یافت نشد
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ردیف # {0}: لطفا مقدار سفارش مجدد مجموعه
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ضربه بزنید اقلام به آنها اضافه کردن اینجا
 DocType: Fees,Program Enrollment,برنامه ثبت نام
 DocType: Landed Cost Voucher,Landed Cost Voucher,فرود کوپن هزینه
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا {0}
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,تاریخ نگهداری و تعمیرات
 DocType: Purchase Invoice Item,Rejected Serial No,رد سریال
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,تاریخ شروع سال یا تاریخ پایان است با هم تداخل دارند با {0}. برای جلوگیری از به مدیر مجموعه شرکت
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},تاریخ شروع باید کمتر از تاریخ پایان برای مورد است {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,بارگذاری حضور و غیاب
@@ -4261,7 +4273,6 @@
 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,صلیب فهرست مورد در گروه های متعدد
-DocType: Grade Interval,Grade Interval,درجه فاصله
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},سال مالی تاریخ شروع و تاریخ پایان سال مالی در حال حاضر در سال مالی مجموعه {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تاریخ ترخیص کالا از به روز رسانی
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,دسته تقسیم
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,تعداد مادی و معنوی برای تولید
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,باقی بماند اگر شما نمی خواهید به در نظر گرفتن دسته ای در حالی که ساخت گروه های دوره بر اساس.
 DocType: Asset,Frequency of Depreciation (Months),فرکانس استهلاک (ماه)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,حساب اعتباری
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,حساب اعتباری
 DocType: Landed Cost Item,Landed Cost Item,فرود از اقلام هزینه
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,نمایش صفر ارزش
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,تعداد آیتم به دست آمده پس از تولید / repacking از مقادیر داده شده از مواد خام
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,راه اندازی یک وب سایت ساده برای سازمان من
 DocType: Payment Reconciliation,Receivable / Payable Account,حساب دریافتنی / پرداختنی
 DocType: Delivery Note Item,Against Sales Order Item,علیه سفارش فروش مورد
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},لطفا موجودیت مقدار برای صفت مشخص {0}
 DocType: Item,Default Warehouse,به طور پیش فرض انبار
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بودجه می تواند در برابر حساب گروه اختصاص {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,لطفا پدر و مادر مرکز هزینه وارد
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,نرخ پایه
 DocType: GL Entry,Credit Amount,مقدار وام
 DocType: Cheque Print Template,Signatory Position,مکان امضاء
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,تنظیم به عنوان از دست رفته
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,تنظیم به عنوان از دست رفته
 DocType: Timesheet,Total Billable Hours,مجموع ساعت قابل پرداخت
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,دریافت پرداخت توجه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,این است که در معاملات در برابر این مشتری است. مشاهده جدول زمانی زیر برای جزئیات
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,گزینه هایی که درخواست شده
 DocType: Purchase Order,Get Last Purchase Rate,دریافت آخرین خرید نرخ
 DocType: Company,Company Info,اطلاعات شرکت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,انتخاب کنید و یا اضافه کردن مشتری جدید
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,مرکز هزینه مورد نیاز است به کتاب ادعای هزینه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),استفاده از وجوه (دارایی)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,این است که در حضور این کارمند بر اساس
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,حساب بانکی
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,حساب بانکی
 DocType: Fiscal Year,Year Start Date,سال تاریخ شروع
 DocType: Attendance,Employee Name,نام کارمند
 DocType: Sales Invoice,Rounded Total (Company Currency),گرد مجموع (شرکت ارز)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,توقف کاربران از ساخت نرم افزار مرخصی در روز بعد.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,مبلغ خرید
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,کننده دیگر {0} ایجاد
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,پایان سال نمی تواند قبل از شروع سال می شود
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,مزایای کارکنان
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا تنظیم پیش فرض لیست تعطیلات برای کارمند {0} یا شرکت {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} وجود ندارد
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} وجود ندارد
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,لوایح مطرح شده به مشتریان.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروژه کد
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ردیف بدون {0}: مبلغ نمی تواند بیشتر از انتظار مقدار برابر هزینه ادعای {1}. در انتظار مقدار است {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,خواندن 3
 ,Hub,قطب
 DocType: GL Entry,Voucher Type,کوپن نوع
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,لیست قیمت یافت نشد یا از کار افتاده
 DocType: Employee Loan Application,Approved,تایید
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',کارمند رها در {0} باید تنظیم شود به عنوان چپ
 DocType: Guardian,Guardian,نگهبان
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزیابی {0} برای کارمند {1} در محدوده تاریخ ایجاد شود
 DocType: Employee,Education,آموزش و پرورش
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
 DocType: Selling Settings,Campaign Naming By,نامگذاری کمپین توسط
 DocType: Employee,Current Address Is,آدرس فعلی است
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,اصلاح شده
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری است. مجموعه پیش فرض ارز شرکت، اگر مشخص نشده است.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,مطالب مجله حسابداری.
 DocType: Delivery Note Item,Available Qty at From Warehouse,تعداد موجود در انبار از
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ردیف {0}: حزب / حساب با مطابقت ندارد {1} / {2} در {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,لطفا هزینه حساب وارد کنید
 DocType: Account,Stock,موجودی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",ردیف # {0}: مرجع نوع سند باید یکی از سفارش خرید، خرید فاکتور و یا ورود به مجله می شود
 DocType: Employee,Current Address,آدرس فعلی
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",اگر مورد یک نوع از آیتم دیگری پس از آن توضیحات، تصویر، قیمت گذاری، مالیات و غیره را از قالب مجموعه ای است مگر اینکه صریحا مشخص
 DocType: Serial No,Purchase / Manufacture Details,خرید / جزئیات ساخت
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,تنظیمات توپی
 DocType: Project,Gross Margin %,حاشیه ناخالص٪
 DocType: BOM,With Operations,با عملیات
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,نوشته حسابداری در حال حاضر در ارز ساخته شده {0} برای شرکت {1}. لطفا یک حساب دریافتنی و یا قابل پرداخت با ارز را انتخاب کنید {0}.
 DocType: Asset,Is Existing Asset,موجود است دارایی
 DocType: Salary Detail,Statistical Component,کامپوننت آماری
 ,Monthly Salary Register,ماهانه حقوق ثبت نام
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,اتاق
 DocType: Purchase Order,Advance Paid,پیش پرداخت
 DocType: Item,Item Tax,مالیات مورد
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,مواد به کننده
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,مواد به کننده
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,فاکتور مالیات کالاهای داخلی
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ بیش از یک بار به نظر می رسد
 DocType: Expense Claim,Employees Email Id,کارکنان پست الکترونیکی شناسه
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ضمیمه لوگو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سطح سهام
 DocType: Customer,Commission Rate,کمیسیون نرخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,متغیر را
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,متغیر را
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,برنامه بلوک مرخصی توسط بخش.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",نوع پرداخت باید یکی از دریافت شود، پرداخت و انتقال داخلی
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیه و تحلیل ترافیک
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,سبد خرید خالی است
 DocType: Vehicle,Model,مدل
@@ -4510,6 +4523,7 @@
 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 +161,Capital Stock,سرمایه سهام
+DocType: Shopping Cart Settings,Show Public Attachments,نمایش فایل های پیوست عمومی
 DocType: Packing Slip,Package Weight Details,بسته بندی جزییات وزن
 DocType: Payment Gateway Account,Payment Gateway Account,پرداخت حساب دروازه
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,پس از اتمام پرداخت هدایت کاربر به صفحه انتخاب شده است.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,تاریخ انقضا
 ,Supplier Addresses and Contacts,آدرس منبع و اطلاعات تماس
 ,accounts-browser,حساب مرورگر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,لطفا ابتدا دسته را انتخاب کنید
 apps/erpnext/erpnext/config/projects.py +13,Project master.,کارشناسی ارشد پروژه.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",اجازه می دهد تا بیش از صدور صورت حساب و یا بیش از سفارش، به روز رسانی &quot;کمک هزینه&quot; در بورس تنظیمات و یا آیتم.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,را نشان نمی مانند هر نماد $ و غیره در کنار ارزهای.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیم روز)
 DocType: Supplier,Credit Days,روز اعتباری
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,را دسته ای دانشجویی
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,را دسته ای دانشجویی
 DocType: Leave Type,Is Carry Forward,آیا حمل به جلو
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,گرفتن اقلام از BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,گرفتن اقلام از BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,سرب زمان روز
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ردیف # {0}: ارسال تاریخ باید همان تاریخ خرید می باشد {1} دارایی {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,لطفا سفارشات فروش در جدول فوق را وارد کنید
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,مقدار تحریم
 DocType: GL Entry,Is Opening,باز
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ردیف {0}: بدهی ورود می تواند با پیوند داده نمی شود {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا راه اندازی شماره سری برای حضور و غیاب از طریق راه اندازی&gt; شماره سری
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 3e32b9a..11f5f11 100644
--- a/erpnext/translations/fi.csv
+++ b/erpnext/translations/fi.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Vuokrattu
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Sovelletaan Käyttäjä
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pysäytetty Tuotantotilaus ei voi peruuttaa, Unstop se ensin peruuttaa"
 DocType: Vehicle Service,Mileage,mittarilukema
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Haluatko todella romuttaa tämän omaisuuden?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Valitse Oletus toimittaja
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Valitse Oletus toimittaja
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},valuuttahinnasto vaaditaan {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* lasketaan tapahtumassa
 DocType: Purchase Order,Customer Contact,Asiakaspalvelu Yhteystiedot
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),odottavat {0} ei voi olla alle nolla ({1})
 DocType: Manufacturing Settings,Default 10 mins,oletus 10 min
 DocType: Leave Type,Leave Type Name,Vapaatyypin nimi
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Näytä auki
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Näytä auki
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Sarja päivitetty onnistuneesti
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Tarkista
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Päiväkirjakirjaus Lähettäjä
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Erä Item Käyt tila
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,pankki sekki
 DocType: Mode of Payment Account,Mode of Payment Account,maksutilin tila
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Näytä mallivaihtoehdot
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Näytä mallivaihtoehdot
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiaali
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Määrä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Määrä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,-Taulukon voi olla tyhjä.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),lainat (vastattavat)
 DocType: Employee Education,Year of Passing,valmistumisvuosi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Viite:% s, Item Code:% s ja Asiakas:% s"
 DocType: Item,Country of Origin,Alkuperämaa
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Varastossa
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Avoimet kysymykset
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,terveydenhuolto
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Viivästyminen (päivää)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,palvelu Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,lasku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sarjanumero: {0} on jo viitattu myyntilasku: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,lasku
 DocType: Maintenance Schedule Item,Periodicity,Jaksotus
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Verovuoden {0} vaaditaan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Odotettu toimituspäivä on tapahduttava ennen Myyntitilaus Päivämäärä
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Liitä .csv-tiedoston, jossa on kaksi saraketta, toinen vanha nimi ja yksi uusi nimi"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ei missään aktiivista verovuonna.
 DocType: Packed Item,Parent Detail docname,Pääselostuksen docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Viite: {0}, kohta Koodi: {1} ja Asiakas: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Loki
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Avaaminen ja työn.
 DocType: Item Attribute,Increment,Lisäys
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Valitse Varasto ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Valitse Varasto ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,mainonta
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Hae nimikkeet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ei saa {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Hae nimikkeet
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},varastoa ei voi päivittää lähetettä vastaan {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Tuotteen {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ei luetellut
 DocType: Payment Reconciliation,Reconcile,Yhteensovitus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,päivittäistavara
 DocType: Quality Inspection Reading,Reading 1,Lukema 1
 DocType: Process Payroll,Make Bank Entry,tee pankkikirjaus
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Eläkerahastot
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Seuraava Poistot Date ei voi olla ennen Ostopäivä
 DocType: SMS Center,All Sales Person,kaikki myyjät
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Kuukausijako ** auttaa kausiluonteisen liiketoiminnan budjetoinnissa ja tavoiteasetannassa.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ei kohdetta löydetty
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ei kohdetta löydetty
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Palkka rakenne Puuttuvat
 DocType: Lead,Person Name,Henkilö
 DocType: Sales Invoice Item,Sales Invoice Item,"Myyntilasku, tuote"
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",esimerkiksi &quot;Primary School&quot; tai &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Perusraportit
 DocType: Warehouse,Warehouse Detail,Varaston lisätiedot
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan  {0} luottoraja on ylittynyt: {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},asiakkaan  {0} luottoraja on ylittynyt: {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Term Päättymispäivä ei voi olla myöhemmin kuin vuosi Päättymispäivä Lukuvuoden johon termiä liittyy (Lukuvuosi {}). Korjaa päivämäärät ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Is Fixed Asset&quot; ei voi olla valitsematta, koska Asset kirjaa olemassa vasten kohde"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Verotyyppi
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},sinulla ei ole lupaa lisätä tai päivittää kirjauksia ennen {0}
 DocType: BOM,Item Image (if not slideshow),tuotekuva (jos diaesitys ei käytössä)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Asiakkaan olemassa samalla nimellä
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tuntihinta / 60) * todellinen käytetty aika
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Valitse BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Valitse BOM
 DocType: SMS Log,SMS Log,Tekstiviesti loki
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,toimitettujen tuotteiden kustannukset
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Loma {0} ei ajoitu aloitus- ja lopetuspäivän välille
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Koulut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ei jätä kirjaa löytynyt työntekijä {0} ja {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Anna yritys ensin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Ole hyvä ja valitse Company ensin
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Ole hyvä ja valitse Company ensin
 DocType: Employee Education,Under Graduate,Ylioppilas
 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
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,vaatimuksen määrä
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Monista asiakasryhmä löytyy cutomer ryhmätaulukkoon
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,toimittaja tyyppi / toimittaja
 DocType: Naming Series,Prefix,Etuliite
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,käytettävä
 DocType: Employee,B-,B -
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Arvosana
 DocType: Sales Invoice Item,Delivered By Supplier,Toimitetaan Toimittaja
 DocType: SMS Center,All Contact,kaikki yhteystiedot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Tuotantotilaus jo luotu kaikille kohteita BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,vuosipalkka
 DocType: Daily Work Summary,Daily Work Summary,Päivittäinen työ Yhteenveto
 DocType: Period Closing Voucher,Closing Fiscal Year,tilikauden sulkeminen
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} on jäädytetty
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} on jäädytetty
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Valitse Olemassa Company luoda tilikartan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,varaston kulut
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Valitse Target Varasto
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,vastakirjaus
 DocType: Journal Entry Account,Credit in Company Currency,Luotto Yritys Valuutta
 DocType: Delivery Note,Installation Status,Asennuksen tila
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Haluatko päivittää läsnäolo? <br> Present: {0} \ <br> Ei lainkaan: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},hyväksyttyjen + hylättyjen yksikkömäärä on sama kuin tuotteiden vastaanotettu määrä {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,toimita raaka-aineita ostoon
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ainakin yksi maksutavan vaaditaan POS laskun.
 DocType: Products Settings,Show Products as a List,Näytä tuotteet listana
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","lataa mallipohja, täytä tarvittavat tiedot ja liitä muokattu tiedosto, kaikki päivämäärä- ja työntekijäyhdistelmät tulee malliin valitun kauden ja olemassaolevien osallistumistietueiden mukaan"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Tee Poistot Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,pyydä tyyppi
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tee työntekijä
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tee työntekijä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,julkaisu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,suoritus
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,toteutetuneiden toimien lisätiedot
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Suunnittele huoltokäyntejä
 DocType: SMS Settings,Enter url parameter for message,syötä url parametrin viesti
 DocType: POS Profile,Customer Groups,asiakas Ryhmät
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Tilinpäätös
 DocType: Guardian,Students,opiskelijat
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,sääntö hinnoitteluun ja alennuksiin
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Hinnastoa tulee sovelletaa ostamiseen tai myymiseen
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance määrä ei voi olla suurempi kuin {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sarjalistaus tähän tapahtumaan
 DocType: Company,Default Payroll Payable Account,Oletus Payroll Maksettava Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Päivitys Sähköpostiryhmä
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Päivitys Sähköpostiryhmä
 DocType: Sales Invoice,Is Opening Entry,on avauskirjaus
 DocType: Customer Group,Mention if non-standard receivable account applicable,maininta ellei sovelletaan saataien perustiliä käytetä
 DocType: Course Schedule,Instructor Name,ohjaaja Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,varastoon vaaditaan ennen lähetystä
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saatu
 DocType: Sales Partner,Reseller,Jälleenmyyjä
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jos tämä on valittu, Will sisältävät ei-varastossa tuotetta Material pyynnöt."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Myyntilaskun kohdistus / nimike
 ,Production Orders in Progress,Tuotannon tilaukset on käsittelyssä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Rahoituksen nettokassavirta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStoragen on täynnä, ei tallentanut"
 DocType: Lead,Address & Contact,osoitteet ja yhteystiedot
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lisää käyttämättömät lähtee edellisestä määrärahoista
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},seuraava toistuva {0} tehdään {1}:n
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Yhteensä Costing Määrä (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Kohteen verkkosivustoasetukset
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,vapaa kielletty
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank merkinnät
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Nimikeen {0} elinkaari on päättynyt {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank merkinnät
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vuotuinen
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,"varaston täsmäytys, tuote"
 DocType: Stock Entry,Sales Invoice No,"Myyntilasku, nro"
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Julkaista Hub
 DocType: Student Admission,Student Admission,Opiskelijavalinta
 ,Terretory,Alue
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Nimike {0} on peruutettu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,materiaalipyyntö
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Nimike {0} on peruutettu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Nimikettä {0} ei löydy ostotilauksen {1} toimitettujen raaka-aineiden taulusta
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Erinomainen Sekkejä ja Talletukset tyhjentää
 DocType: Item,Synced With Hub,synkronoi Hub:lla
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rivi # {0}: {1} ei voi olla negatiivinen erä {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Väärä salasana
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Rivi # {0}: {1} ei voi olla negatiivinen erä {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Väärä salasana
 DocType: Item,Variant Of,Muunnelma kohteesta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"valmiit yksikkömäärä ei voi olla suurempi kuin ""tuotannon määrä"""
 DocType: Period Closing Voucher,Closing Account Head,tilin otsikon sulkeminen
 DocType: Employee,External Work History,ulkoinen työhistoria
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,kiertoviite vihke
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ilmoita automaattisen materiaalipyynnön luomisesta sähköpostitse
 DocType: Journal Entry,Multi Currency,Multi Valuutta
 DocType: Payment Reconciliation Invoice,Invoice Type,lasku tyyppi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,lähete
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,lähete
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Verojen perusmääritykset
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kustannukset Myyty Asset
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vero on kirjattu kahdesti
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Yhteenveto tällä viikolla ja keskeneräisten toimien
 DocType: Student Applicant,Admitted,Hyväksytty
 DocType: Workstation,Rent Cost,vuokrakustannukset
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,tilauksen arvo
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Pankki / Cash liiketoimien vastaan osapuolelle tai sisäinen siirto
 DocType: Shipping Rule,Valid for Countries,Voimassa maissa
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tämä tuote on mallipohja, eikä sitä voi käyttää tapahtumissa, tuotteen tuntomerkit kopioidaan ellei 'älä kopioi' ole aktivoitu"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,pidetään kokonaistilauksena
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","työntekijän nimitys (myyjä, varastomies jne)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Syötä &quot;Toista päivänä Kuukausi &#39;kentän arvo
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rivi # {0}: Ostolaskujen ei voi tehdä vastaan olemassaolevan hyödykkeen {1}
 DocType: Item Tax,Tax Rate,Veroaste
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} on jo myönnetty Työsuhde {1} kauden {2} ja {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Valitse tuote
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Ostolasku {0} on lähetetty
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Valitse tuote
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Ostolasku {0} on lähetetty
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rivi # {0}: Erä on oltava sama kuin {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,muunna pois ryhmästä
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Nimikkeen eräkoodi
 DocType: C-Form Invoice Detail,Invoice Date,laskun päiväys
 DocType: GL Entry,Debit Amount,Debit Määrä
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Kohdassa {0} {1} voi olla vain yksi tili per yritys
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Katso liitetiedosto
 DocType: Purchase Order,% Received,% vastaanotettu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Luo Student Groups
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Tarjouspyyntö
 DocType: Salary Slip Timesheet,Working Hours,Työaika
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,muuta aloitusta / nykyselle järjestysnumerolle tai olemassa oleville sarjoille
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Luo uusi asiakas
-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.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Luo ostotilaukset
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Luo uusi asiakas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",mikäli useampi hinnoittelu sääntö jatkaa vaikuttamista käyttäjäjiä pyydetään asettamaan prioriteetti manuaalisesti ristiriidan ratkaisemiseksi
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Luo ostotilaukset
 ,Purchase Register,Osto Rekisteröidy
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,sovellettavat maksut
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) tulee olla rooli 'vapaan hyväksyjä'
 DocType: Purchase Receipt,Vehicle Date,Ajoneuvo Päivämäärä
 DocType: Student Log,Medical,Lääketieteellinen
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Häviön syy
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Häviön syy
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Liidin vastuullinen ei voi olla sama kuin itse liidi
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Jaettava määrä ei voi ylittää oikaisematon määrä
 DocType: Announcement,Receiver,Vastaanotin
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Määrä ja hinta
 DocType: Delivery Note,% Installed,% asennettu
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Luokkahuoneet / Laboratories, johon käytetään luentoja voidaan ajoittaa."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Toimittaja&gt; toimittaja tyyppi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Anna yrityksen nimi ensin
 DocType: Purchase Invoice,Supplier Name,toimittajan nimi
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lue ERPNext Manual
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Vanha Parent
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Pakollinen kenttä - Lukuvuosi
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"muokkaa johdantotekstiä joka lähetetään sähköpostin osana, joka tapahtumalla on oma johdantoteksi"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Aseta oletus maksettava osuus yhtiön {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,yleiset asetukset valmistusprosesseille
 DocType: Accounts Settings,Accounts Frozen Upto,tilit jäädytetty toistaiseksi / asti
 DocType: SMS Log,Sent On,lähetetty
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Taito {0} valittu useita kertoja määritteet taulukossa
 DocType: HR Settings,Employee record is created using selected field. ,työntekijä tietue luodaan käyttämällä valittua kenttää
 DocType: Sales Order,Not Applicable,ei sovellettu
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,lomien valvonta
 DocType: Request for Quotation Item,Required Date,pyydetty päivä
 DocType: Delivery Note,Billing Address,Laskutusosoite
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Syötä tuotekoodi
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Syötä tuotekoodi
 DocType: BOM,Costing,kustannuslaskenta
 DocType: Tax Rule,Billing County,Laskutus lääni
 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
@@ -500,6 +504,7 @@
 DocType: Packing Slip,From Package No.,pakkauksesta
 DocType: Item Attribute,To Range,Vaihtuakseen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Arvopaperit ja talletukset
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Voi muuttaa arvonmäärittämismenetelmää koska on olemassa tapahtumia vastaan joitakin kohtia, joita ei ole se oma arviointimenetelmää"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hyväksyttävien vapaiden kokonaismäärä on pakollinen
 DocType: Job Opening,Description of a Job Opening,Työpaikan kuvaus
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Vireillä toimintaa tänään
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,hallintovirkailija
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Valitse kurssi
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Ole hyvä ja valitse Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Ole hyvä ja valitse Company
 DocType: Stock Entry Detail,Difference Account,erotili
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"ei voi sulkea sillä se on toisesta riippuvainen tehtävä {0}, tehtävää ei ole suljettu"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +538,"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 +536,"To merge, following properties must be same for both items",Seuraavat ominaisuudet tulee olla samat molemmilla tuotteilla jotta ne voi sulauttaa
 DocType: Shipping Rule,Net Weight,Nettopaino
 DocType: Employee,Emergency Phone,hätänumero
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Ostaa
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tarkentakaa arvosana Threshold 0%
 DocType: Sales Order,To Deliver,Toimitukseen
 DocType: Purchase Invoice Item,Item,Nimike
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Sarjanumero tuote ei voi olla jae
 DocType: Journal Entry,Difference (Dr - Cr),erotus (€ - TV)
 DocType: Account,Profit and Loss,Tuloslaskelma
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alihankintojen hallinta
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Lisäys voi olla 0
 DocType: Production Planning Tool,Material Requirement,materiaalitarve
 DocType: Company,Delete Company Transactions,poista yrityksen tapahtumia
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Viitenumero ja viitepäivämäärä on pakollinen Pankin myynnin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lisää / muokkaa veroja ja maksuja
 DocType: Purchase Invoice,Supplier Invoice No,toimittajan laskun nro
 DocType: Territory,For reference,viitteeseen
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,asennus huomautus tuote
 DocType: Production Plan Item,Pending Qty,Odottaa Kpl
 DocType: Budget,Ignore,ohita
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ei ole aktiivinen
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ei ole aktiivinen
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},Tekstiviesti lähetetään seuraaviin numeroihin: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup tarkistaa mitat tulostettavaksi
 DocType: Salary Slip,Salary Slip Timesheet,Tuntilomake
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Provisio yhteensä
 DocType: Pricing Rule,Sales Partner,Myyntikumppani
 DocType: Buying Settings,Purchase Receipt Required,Ostokuitti vaaditaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Arvostustaso on pakollinen, jos avausvarasto on merkitty"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,tietuetta ei löydy laskutaulukosta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Valitse ensin yritys ja osapuoli tyyppi
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Tili- / Kirjanpitokausi
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,kertyneet Arvot
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",Sarjanumeroita ei voi yhdistää
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,tee myyntitilaus
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,tee myyntitilaus
 DocType: Project Task,Project Task,Projekti Tehtävä
 ,Lead Id,Liidin tunnus
 DocType: C-Form Invoice Detail,Grand Total,kokonaissumma
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Resume'n liite
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Toistuvat asiakkaat
 DocType: Leave Control Panel,Allocate,Jakaa
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Myynti Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Myynti Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Huomautus: Total varattu lehdet {0} ei saa olla pienempi kuin jo hyväksytty lehdet {1} kaudeksi
 DocType: Announcement,Posted By,Lähettänyt
 DocType: Item,Delivered by Supplier (Drop Ship),Toimittaja lähettää asiakkaalle (ns. suoratoimitus)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Tarjouksen kohde
 DocType: Lead,Middle Income,keskitason tulo
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,kohdennettu määrä ei voi olla negatiivinen
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Aseta Yhtiö
 DocType: Purchase Order Item,Billed Amt,"Laskutettu, pankkipääte"
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Tuntilomake
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},viitenumero ja viitepäivä vaaditaan{0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Valitse Maksutili tehdä Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Luo Työntekijä kirjaa hallita lehtiä, korvaushakemukset ja palkkahallinnon"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lisää Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Ehdotus Kirjoittaminen
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment Entry Vähennys
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' ei ole tilikaudella {2}
 DocType: Buying Settings,Settings for Buying Module,Ostomoduulin asetukset
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} ei kuulu yhtiön {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Anna ostokuitti ensin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Anna ostokuitti ensin
 DocType: Buying Settings,Supplier Naming By,toimittajan nimennyt
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Nettomuutos Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Työntekijän Loan Management
 DocType: Employee,Passport Number,Passin numero
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Suhde Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Hallinta
 DocType: Payment Entry,Payment From / To,Maksaminen / To
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Ajanjakso
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Uusi luottoraja on pienempi kuin nykyinen jäljellä asiakkaalle. Luottoraja on oltava atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,minuutteina
 DocType: Issue,Resolution Date,johtopäätös päivä
 DocType: Student Batch Name,Batch Name,erä Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tuntilomake luotu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Tuntilomake luotu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Valitse oletusmaksutapa kassa- tai pankkitili maksulle {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,kirjoittautua
 DocType: Selling Settings,Customer Naming By,asiakkaan nimennyt
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Näyttää opiskelijan Läsnä Student Kuukauden Läsnäolo Report
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,todellinen aloitusaika
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Suorittaa loppuun
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,pohja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,pohja
 DocType: Timesheet,Total Billed Hours,Yhteensä laskutusasteesta
 DocType: Journal Entry,Write Off Amount,Poiston arvo
 DocType: Journal Entry,Bill No,Bill No
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Student Läsnäolo
 DocType: Sales Invoice Timesheet,Time Sheet,Tuntilista
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raaka-aineet Perustuvat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Syötä tuotten lisätiedot
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Syötä tuotten lisätiedot
 DocType: Interest,Interest,Kiinnostaa
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,muut lisätiedot
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Maksu käyttö on jo luotu
 DocType: Purchase Receipt Item Supplied,Current Stock,nykyinen varasto
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Rivi # {0}: Asset {1} ei liity Tuote {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Palkka Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Palkka Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tili {0} on syötetty useita kertoja
 DocType: Account,Expenses Included In Valuation,"kulut, jotka sisältyy arvoon"
 DocType: Hub Settings,Seller City,Myyjä kaupunki
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Seuraava sähköpostiviesti lähetetään:
 DocType: Offer Letter Term,Offer Letter Term,Työtarjouksen ehto
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,tuotteella on useampia malleja
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,tuotteella on useampia malleja
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Nimikettä {0} ei löydy
 DocType: Bin,Stock Value,varastoarvo
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Yritys {0} ei ole olemassa
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,tyyppipuu
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,tyyppipuu
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Käytetty yksikkömäärä / yksikkö
 DocType: Serial No,Warranty Expiry Date,Takuu umpeutumispäivä
 DocType: Material Request Item,Quantity and Warehouse,Määrä ja Warehouse
 DocType: Sales Invoice,Commission Rate (%),provisio (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} Setup&gt; Asetukset&gt; nimeäminen Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Valitse ohjelma
 DocType: Project,Estimated Cost,Kustannusarvio
 DocType: Purchase Order,Link to material requests,Linkki materiaaliin pyyntöihin
@@ -753,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ei ole varastonimike
 DocType: Mode of Payment Account,Default Account,oletustili
 DocType: Payment Entry,Received Amount (Company Currency),Vastaanotetut Summa (Company valuutta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Liidi on pakollinen tieto, jos myyntimahdollisuus on muodostettu liidistä"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ole hyvä ja valitse viikoittain off päivä
 DocType: Production Order Operation,Planned End Time,Suunniteltu päättymisaika
 ,Sales Person Target Variance Item Group-Wise,"Tuoteryhmä työkalu, myyjä ja vaihtelu tavoite"
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,tilaisuuteen
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,kuukausipalkka tosite
 DocType: BOM,Website Specifications,Verkkosivuston tiedot
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi Setup&gt; numerointi Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: valitse {0} tyypistä {1}
 DocType: Warranty Claim,CI-,Cl
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rivi {0}: Conversion Factor on pakollista
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Tilinumero
 DocType: Bank Guarantee,Project,Projekti
 DocType: Quality Inspection Reading,Reading 7,Lukema 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,osittain Tilattu
 DocType: Expense Claim Detail,Expense Claim Type,Kulukorvaustyypit
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ostoskorin oletusasetukset
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset romutetaan kautta Päiväkirjakirjaus {0}
@@ -810,14 +815,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotekniikka
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Toimitilan huoltokulut
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Määrittäminen Sähköpostitilin
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Anna Kohta ensin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Anna Kohta ensin
 DocType: Account,Liability,vastattavat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktioitujen arvomäärä ei voi olla suurempi kuin vaatimuksien arvomäärä rivillä {0}.
 DocType: Company,Default Cost of Goods Sold Account,oletus myytyjen tuotteiden arvo tili
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Hinnasto ei valittu
 DocType: Employee,Family Background,Perhetausta
 DocType: Request for Quotation Supplier,Send Email,Lähetä sähköposti
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varoitus: Virheellinen liite {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ei oikeuksia
 DocType: Company,Default Bank Account,oletus pankkitili
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",Valitse osapuoli tyyppi saadaksesi osapuolen mukaisen suodatuksen
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Yhtään työntekijää ei löytynyt
 DocType: Supplier Quotation,Stopped,pysäytetty
 DocType: Item,If subcontracted to a vendor,alihankinta toimittajalle
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Opiskelijaryhmän on jo päivitetty.
 DocType: SMS Center,All Customer Contact,kaikki asiakkaan yhteystiedot
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Tuo varastotase .csv-tiedoston kautta
 DocType: Warehouse,Tree Details,Tree Tietoja
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Pienin Laskun summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kustannuspaikka {2} ei kuulu yhtiön {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tili {2} ei voi olla ryhmä
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Kohta Rivi {idx}: {DOCTYPE} {DOCNAME} ei ole olemassa edellä {DOCTYPE} table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tuntilomake {0} on jo täytetty tai peruttu
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ei tehtäviä
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Kuukauden päivä jolloin automaattinen lasku muodostetaan, esim 05, 28 jne"
 DocType: Asset,Opening Accumulated Depreciation,Avaaminen Kertyneet poistot
@@ -858,7 +863,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} kuittia vastaan {1} päivätty {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,kurssin aikataulu
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,kurssin aikataulu
 DocType: Maintenance Visit,Completion Status,katselmus tila
 DocType: HR Settings,Enter retirement age in years,Anna eläkeikä vuosina
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Tavoite varasto
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Salli yli toimitus- tai kuitti lähetettävään tähän prosenttia
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,tuo osallistuminen
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Kaikki nimikeryhmät
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Kaikki nimikeryhmät
 DocType: Process Payroll,Activity Log,aktiivisuus loki
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,netto voitto/tappio
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,muodosta automaattinen viesti toiminnon lähetyksessä
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ostotilaus to Payment
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Ennustettu yksikkömäärä
 DocType: Sales Invoice,Payment Due Date,Maksun eräpäivä
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Tuote Variant {0} on jo olemassa samoja ominaisuuksia
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Avattu'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Avaa tehtävä
 DocType: Notification Control,Delivery Note Message,lähetteen vieti
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,Täydennystilauksen yksikkömäärä
 DocType: Leave Block List Date,Leave Block List Date,päivä
 DocType: Pricing Rule,Price or Discount,Hinta tai Alennus
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Yhteensä Sovellettava Lataus Ostokuitti erät taulukossa on oltava sama kuin koko verot ja maksut
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Yhteensä Sovellettava Lataus Ostokuitti erät taulukossa on oltava sama kuin koko verot ja maksut
 DocType: Sales Team,Incentives,kannustimet/bonukset
 DocType: SMS Log,Requested Numbers,vaaditut numerot
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanki vain raaka-aineet
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,on alihankittu
 DocType: Item Attribute,Item Attribute Values,"tuotetuntomerkki, arvot"
 DocType: Examination Result,Examination Result,tutkimustuloksen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Ostokuitti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Ostokuitti
 ,Received Items To Be Billed,Saivat kohteet laskuttamat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Lähettäjä palkkakuitit
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,valuuttataso valvonta
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Viitetyypin tulee olla yksi seuraavista: {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Viitetyypin tulee olla yksi seuraavista: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Aika-aukkoa ei löydy seuraavaan {0} päivän toiminnolle {1}
 DocType: Production Order,Plan material for sub-assemblies,Suunnittele materiaalit alituotantoon
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Myynnin Partners ja Territory
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Ei voi automaattisesti luoda tiliä kuin on jo varastossa tilin saldo. On luotava vastaavia huomioon ennen voit tehdä merkintä tämän varaston
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,oletus maksettava tilit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,työntekijä {0} ei ole aktiivinen tai ei ole olemassa
 DocType: Fee Structure,Components,komponentit
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Tuotemallit {0} päivitetty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Syötä Asset Luokka momentille {0}
 DocType: Quality Inspection Reading,Reading 6,Lukema 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Ei voi {0} {1} {2} ilman negatiivista maksamatta laskun
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,"Ostolasku, edistynyt"
 DocType: Hub Settings,Sync Now,synkronoi nyt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},rivi {0}: kredit kirjausta ei voi kohdistaa {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,on ostotuote
 DocType: Asset,Purchase Invoice,Ostolasku
 DocType: Stock Ledger Entry,Voucher Detail No,Tosite lisätiedot nro
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Uusi myyntilasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Uusi myyntilasku
 DocType: Stock Entry,Total Outgoing Value,"kokonaisarvo, lähtevä"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Aukiolopäivä ja Päättymisaika olisi oltava sama Tilikausi
 DocType: Lead,Request for Information,tietopyyntö
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synkronointi Offline Laskut
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synkronointi Offline Laskut
 DocType: Payment Request,Paid,Maksettu
 DocType: Program Fee,Program Fee,Program Fee
 DocType: Salary Slip,Total in words,Sanat yhteensä
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,seuraamuksia
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,on pakollinen. Valuutanvaihtotietue on mahdollisesti luomatta
 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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"
 DocType: Job Opening,Publish on website,Julkaise verkkosivusto
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Toimitukset asiakkaille
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Toimittaja Laskun päiväys ei voi olla suurempi kuin julkaisupäivämäärä
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Vaihtelu
 ,Company Name,Yrityksen nimi
 DocType: SMS Center,Total Message(s),viestit yhteensä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Valitse siirrettävä tuote
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Valitse 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"
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Oletus Bank / rahatililleen automaattisesti päivitetään Palkka Päiväkirjakirjaus kun tämä tila on valittuna.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Kuinka usein Grade Koodi {0} päällekkäinen luokka välein muita papereita. Tarkista välein {0} ja {1} ja yritä uudelleen
 DocType: BOM,Raw Material Cost(Company Currency),Raaka-ainekustannukset (Company valuutta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,kaikki tavarat on jo siirretty tuotantotilaukseen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rivi # {0}: Luokitus ei voi olla suurempi kuin määrä käyttää {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM-sivuston Kohta
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Tuo kirjeen ylätunniste ja logo. (voit muokata niitä myöhemmin)
 DocType: Timesheet Detail,Bill,Laskuttaa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Seuraavaksi Poistot Date kirjataan ohi päivämäärä
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Valkoinen
 DocType: SMS Center,All Lead (Open),Kaikki Liidit (Avoimet)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rivi {0}: Määrä ei saatavilla {4} varasto {1} klo lähettämistä tullessa ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,hae maksetut ennakot
 DocType: Item,Automatically Create New Batch,Automaattisesti Luo uusi erä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Tehdä
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Tehdä
 DocType: Student Admission,Admission Start Date,Pääsymaksu aloituspäivä
 DocType: Journal Entry,Total Amount in Words,Yhteensä sanoina
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Tapahtui virhe: todennäköinen syy on ettet ole tallentanut lomaketta. Mikäli ongelma toistuu, ota yhteyttä järjestelmän ylläpitäjiin."
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tilaustyypin pitää olla jokin seuraavista '{0}'
 DocType: Lead,Next Contact Date,seuraava yhteydenottopvä
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Avaus yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Anna Account for Change Summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Anna Account for Change Summa
 DocType: Student Batch Name,Student Batch Name,Opiskelijan Erä Name
 DocType: Holiday List,Holiday List Name,lomaluettelo nimi
 DocType: Repayment Schedule,Balance Loan Amount,Balance Lainamäärä
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Määritä {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Poistettu kohteita ei muutu määrän tai arvon.
 DocType: Delivery Note,Delivery To,Toimitus vastaanottajalle
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Taito pöytä on pakollinen
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Taito pöytä on pakollinen
 DocType: Production Planning Tool,Get Sales Orders,hae myyntitilaukset
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ei voi olla negatiivinen
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,alennus
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,alennus
 DocType: Asset,Total Number of Depreciations,Poistojen kokonaismäärä
 DocType: Sales Invoice Item,Rate With Margin,Hinta kanssa marginaali
 DocType: Workstation,Wages,Palkat
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,varattu varastosta myyntitilaukseen / valmiit tuotteet varastoon
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Myynnin arvomäärä
 DocType: Repayment Schedule,Interest Amount,Korko Arvo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"olet hyväksyjä tälle tietueelle, päivitä 'tila' ja tallenna"
 DocType: Serial No,Creation Document No,asiakirjan luonti nro
 DocType: Issue,Issue,aihe
 DocType: Asset,Scrapped,Romutettu
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","määritä tuotemallien tuntomerkit, kuten koko, väri jne."
 DocType: Purchase Invoice,Returns,Palautukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,KET-varasto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Sarjanumero {0} on huoltokannassa {1} asti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Sarjanumero {0} on huoltokannassa {1} asti
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrytointi
 DocType: Lead,Organization Name,Organisaatio
 DocType: Tax Rule,Shipping State,Lähettävällä valtiolla
 ,Projected Quantity as Source,Ennustettu Määrä lähdemuodossa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"tuote tulee lisätä ""hae kohteita ostokuitit"" painikella"
 DocType: Employee,A-,A -
 DocType: Production Planning Tool,Include non-stock items,Ovat ei-varastosta löytyvät
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Myynnin kulut
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,kohdistus
 DocType: Item,Default Selling Cost Center,myyntien oletuskustannuspaikka
 DocType: Sales Partner,Implementation Partner,sovelluskumppani
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postinumero
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postinumero
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Myyntitilaus {0} on {1}
 DocType: Opportunity,Contact Info,"yhteystiedot, info"
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Varastotapahtumien tekeminen
 DocType: Packing Slip,Net Weight UOM,Nettopainon mittayksikkö
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Tulokset
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Tulokset
 DocType: Item,Default Supplier,oletus toimittaja
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ylituotannon rajoitusprosentti
 DocType: Employee Loan,Repayment Schedule,maksuaikataulusta
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,hae viikottaiset poissa päivät
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,päättymispäivä ei voi olla ennen aloituspäivää
 DocType: Sales Person,Select company name first.,Valitse yrityksen nimi ensin.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Tri
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Tri
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Toimittajilta saadut tarjoukset.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Vastaanottajalle {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Keskimääräinen ikä
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,kuljetus
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Virheellinen Taito
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} on esitettävä
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} on esitettävä
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Määrä on oltava pienempi tai yhtä suuri kuin {0}
 DocType: SMS Center,Total Characters,Henkilöt yhteensä
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Valitse BOM tuotteelle BOM kentästä {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,jakelija
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ostoskorin toimitussääntö
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,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 +52,Please set 'Apply Additional Discount On',Aseta &#39;Käytä lisäalennusta &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Vuodesta Range on oltava vähemmän kuin laitumelle
 DocType: Global Defaults,Global Defaults,yleiset oletusasetukset
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Year
 DocType: Purchase Invoice,Start date of current invoice's period,aloituspäivä nykyiselle laskutuskaudelle
 DocType: Salary Slip,Leave Without Pay,Palkaton vapaa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,kapasiteetin suunnittelu virhe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,kapasiteetin suunnittelu virhe
 ,Trial Balance for Party,Alustava tase osapuolelle
 DocType: Lead,Consultant,konsultti
 DocType: Salary Slip,Earnings,ansiot
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tämä liitetään mallin tuotenumeroon esim, jos lyhenne on ""SM"" ja tuotekoodi on ""T-PAITA"", mallin tuotekoodi on ""T-PAITA-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettomaksu (sanoina) näkyy kun tallennat palkkalaskelman.
 DocType: Purchase Invoice,Is Return,on palautus
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Tuotto / veloitusilmoituksen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Tuotto / veloitusilmoituksen
 DocType: Price List Country,Price List Country,Hinnasto Maa
 DocType: Item,UOMs,Mittayksiköt
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} oikea sarjanumero (nos) tuotteelle {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Syötä tuotenumero saada eränumero
 DocType: Stock Settings,Default Item Group,oletus tuoteryhmä
 DocType: Employee Loan,Partially Disbursed,osittain maksettu
-DocType: Grading Structure,Grading System Name,Arvostelu Järjestelmän nimi
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,toimittaja tietokanta
 DocType: Account,Balance Sheet,tasekirja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',tuotteen kustannuspaikka tuotekoodilla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksutila ei ole määritetty. Tarkista, onko tili on asetettu tila maksut tai POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Päivämäärä jona myyjää muistutetaan ottamaan yhteyttä asiakkaaseen
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samaa kohdetta ei voi syöttää useita kertoja.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","lisätilejä voidaan tehdä kohdassa ryhmät, mutta kirjaukset toi suoraan tilille"
@@ -1183,7 +1184,7 @@
 ,Purchase Order Items To Be Billed,Ostotilaus Items laskuttamat
 DocType: Purchase Invoice Item,Net Rate,nettohinta
 DocType: Purchase Invoice Item,Purchase Invoice Item,"Ostolasku, tuote"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,varastotilikirjan- ja päätilikirjan kirjaukset siirretty ostotositteisiin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,varastotilikirjan- ja päätilikirjan kirjaukset siirretty ostotositteisiin
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Nimike 1
 DocType: Holiday,Holiday,loma
 DocType: Support Settings,Close Issue After Days,Close Issue jälkeen Days
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Työ tehty
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ilmoitathan ainakin yksi määrite Määritteet taulukossa
 DocType: Announcement,All Students,kaikki opiskelijat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Nimike {0} ei saa olla varastonimike
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Nimike {0} ei saa olla varastonimike
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Näytä tilikirja
 DocType: Grading Scale,Intervals,väliajoin
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,aikaisintaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Samanniminen nimikeryhmä on jo olemassa, vaihda nimikkeen nimeä tai nimeä nimikeryhmä uudelleen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Muu maailma
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Tuote {0} ei voi olla erä
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Palkanmaksu välillä {0} ja {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Myyntitilaus {0} ei ole kelvollinen
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Ostotilaukset auttaa suunnittelemaan ja seurata ostoksistasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Yhtiöitä ei voi yhdistää
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Yhteensä Issue / Transfer määrä {0} in Material pyyntö {1} \ ei voi olla suurempi kuin pyydetty määrä {2} alamomentin {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pieni
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,välilliset kulut
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,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/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Tarjotut tuotteet ja/tai palvelut
 DocType: Mode of Payment,Mode of Payment,maksutapa
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Sivuston kuvan tulee olla kuvatiedosto tai kuvan URL-osoite
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tämä on kantatuoteryhmä eikä sitä voi muokata
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,Ryhmä rullanumero
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, vain kredit tili voidaan kohdistaa debet kirjaukseen"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Yhteensä Kaikkien tehtävän painojen tulisi olla 1. Säädä painoja Project tehtävien mukaisesti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,lähetettä {0} ei ole lähetetty
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Nimikkeen {0} pitää olla alihankittava nimike
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +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"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Hinnoittelusääntö tulee ensin valita  'käytä tässä' kentästä, joka voi olla tuote, tuoteryhmä tai brändi"
 DocType: Hub Settings,Seller Website,Myyjä verkkosivut
 DocType: Item,ITEM-,kuvallisissa osaluetteloissa
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Myyntitiimin kohdennettu prosenttiosuus tulee olla 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Tuotannon tilauksen tila on {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Tuotannon tilauksen tila on {0}
 DocType: Appraisal Goal,Goal,tavoite
 DocType: Sales Invoice Item,Edit Description,Muokkaa Kuvaus
 ,Team Updates,Team päivitykset
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,toimittajalle
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Luo Print Format
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} kohdetta käynnissä
 DocType: Workstation,Workstation Name,Työaseman nimi
-DocType: Grade Interval,Grade Code,Grade koodi
+DocType: Grading Scale Interval,Grade Code,Grade koodi
 DocType: POS Item Group,POS Item Group,POS Kohta Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,tiedote:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ei kuulu tuotteelle {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,kova tavara
 DocType: Sales Order,Recurring Upto,Toistuvat Jopa
 DocType: Attendance,HR Manager,Henkilöstön hallinta
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Valitse Yritys
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Valitse Yritys
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Poistumisoikeus
 DocType: Purchase Invoice,Supplier Invoice Date,toimittajan laskun päiväys
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Sinun tulee aktivoida ostoskori
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Ruoka
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,vanhentumisen skaala 3
 DocType: Maintenance Schedule Item,No of Visits,Vierailujen lukumäärä
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Tapahtumaan
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Tapahtumaan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Huolto aikataulu {0} on olemassa vastaan {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ilmoittautumalla opiskelija
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuutta sulkeminen on otettava {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},"kaikista tavoitteiden pisteiden summa  tulee olla 100, nyt se on {0}"
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Lähtevä
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Nimi ja tyyppi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',hyväksynnän tila on 'hyväksytty' tai 'hylätty'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',hyväksynnän tila on 'hyväksytty' tai 'hylätty'
 DocType: Purchase Invoice,Contact Person,Yhteyshenkilö
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Toivottu aloituspäivä' ei voi olla suurempi kuin 'toivottu päättymispäivä'
 DocType: Course Scheduling Tool,Course End Date,Tietenkin Päättymispäivä
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,Toimitusosoitteen nimi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,ei voi olla suurempi kuin 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ei voi olla suurempi kuin 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Nimike {0} ei ole varastonimike
 DocType: Maintenance Visit,Unscheduled,Aikatauluttamaton
 DocType: Employee,Owned,Omistuksessa
 DocType: Salary Detail,Depends on Leave Without Pay,riippuu poistumisesta ilman palkkaa
 DocType: Pricing Rule,"Higher the number, higher the priority","mitä korkeampi numero, sitä korkeampi prioriteetti"
 ,Purchase Invoice Trends,"Ostolasku, trendit"
 DocType: Employee,Better Prospects,Parempi Näkymät
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rivi # {0}: Erä {1} on vain {2} kpl. Valitse toinen erä, joka on {3} kpl saatavilla tai jakaa rivin tulee useita rivejä, antaa / kysymys useista eristä"
 DocType: Vehicle,License Plate,Rekisterikilpi
 DocType: Appraisal,Goals,tavoitteet
 DocType: Warranty Claim,Warranty / AMC Status,Takuun / huollon tila
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,työntekijä ei voi raportoida itselleen
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","mikäli tili on jäädytetty, kirjaukset on rajattu tietyille käyttäjille"
 DocType: Email Digest,Bank Balance,Pankkitilin tase
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kirjaus {0}: {1} voidaan tehdä vain valuutassa: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","työprofiili, vaaditut pätevydet jne"
 DocType: Journal Entry Account,Account Balance,Tilin tase
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Verosääntöön liiketoimia.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Näytä unclosed tilikaudesta P &amp; L saldot
 DocType: Shipping Rule,Shipping Account,Toimituskulutili
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tili {2} on aktiivinen
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Tee Myyntitilaukset auttaa suunnittelemaan työtä ja toimittaa oikea-aikaisesti
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Tee Myyntitilaukset auttaa suunnittelemaan työtä ja toimittaa oikea-aikaisesti
 DocType: Quality Inspection,Readings,Lukemat
 DocType: Stock Entry,Total Additional Costs,Lisäkustannusten kokonaismäärää
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,Arvoon
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Pakkauslappu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakkauslappu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Toimisto Vuokra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tekstiviestin reititinmääritykset
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,tuonti epäonnistui!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,Palvelut
 DocType: HR Settings,Email Salary Slip to Employee,Sähköposti palkkakuitin työntekijöiden
 DocType: Cost Center,Parent Cost Center,Pääkustannuspaikka
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Valitse Mahdollinen toimittaja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Valitse Mahdollinen toimittaja
 DocType: Sales Invoice,Source,Lähde
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Näytäsuljetut
 DocType: Leave Type,Is Leave Without Pay,on poistunut ilman palkkaa
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Luokka on pakollinen Käyttöomaisuuden erä
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,tietuetta ei löydy maksutaulukosta
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Tämä {0} on ristiriidassa {1} ja {2} {3}
 DocType: Student Attendance Tool,Students HTML,opiskelijat HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,Lähdön päivämäärä
 DocType: Pricing Rule,For Price List,hinnastoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,edistynyt haku
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Luo liidejä
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Luo liidejä
 DocType: Maintenance Schedule,Schedules,Aikataulut
 DocType: Purchase Invoice Item,Net Amount,netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM yksittäisnumero
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Ohjelma Ilmoittautumiset
 DocType: Sales Invoice Item,Brand Name,brändin nimi
 DocType: Purchase Receipt,Transporter Details,Transporter Lisätiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Oletus varasto tarvitaan valittu kohde
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,pl
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mahdollinen toimittaja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mahdollinen toimittaja
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisaatio
 DocType: Budget,Monthly Distribution,toimitus kuukaudessa
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"vastaanottajalista on tyhjä, tee vastaanottajalista"
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,Myyntikumppani tavoite
 DocType: Loan Type,Maximum Loan Amount,Suurin lainamäärä
 DocType: Pricing Rule,Pricing Rule,Hinnoittelusääntö
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Päällekkäisiä rullan numero opiskelijan {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Päällekkäisiä rullan numero opiskelijan {0}
 DocType: Budget,Action if Annual Budget Exceeded,Toiminta jos vuosibudjetin ylitetty
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ostotilaus materiaalipyynnöstä
 DocType: Shopping Cart Settings,Payment Success URL,Maksu onnistui URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,lyhennystapa
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jos valittu, kotisivun tulee oletuksena Item ryhmän verkkosivuilla"
 DocType: Quality Inspection Reading,Reading 4,Lukema 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Oletus BOM on {0} ei löytynyt Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Oletus BOM on {0} ei löytynyt Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Yrityksen maksettaviksi vaaditut kulut
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Opiskelijat ytimessä järjestelmän, lisää kaikki opiskelijat"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Opiskelijat ytimessä järjestelmän, lisää kaikki opiskelijat"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rivi # {0}: Tilityspäivä {1} ei voi olla ennen shekin päivää {2}
 DocType: Company,Default Holiday List,oletus lomaluettelo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rivi {0}: From Time ja To aika {1} on päällekkäinen {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Päivä (t), johon haet lupaa ovat vapaapäiviä. Sinun ei tarvitse hakea lupaa."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Lähettää maksu Sähköposti
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,uusi tehtävä
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,tee tarjous
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,tee tarjous
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Muut raportit
 DocType: Dependent Task,Dependent Task,riippuvainen tehtävä
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,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 +208,Leave of type {0} cannot be longer than {1},{0} -tyyppinen vapaa ei voi olla pidempi kuin {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,kokeile suunnitella toimia X päivää etukäteen
 DocType: HR Settings,Stop Birthday Reminders,lopeta syntymäpäivämuistutukset
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Aseta Default Payroll maksullisia tilin Yrityksen {0}
 DocType: SMS Center,Receiver List,Vastaanotin List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,haku Tuote
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,haku Tuote
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,käytetty arvomäärä
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Rahavarojen muutos
 DocType: Assessment Plan,Grading Scale,Arvosteluasteikko
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jo valmiiksi
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,yksikköä {0} on kirjattu useammin kuin kerran muuntokerroin taulukossa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,jo valmiiksi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksupyyntö on jo olemassa {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,aiheen tuotteiden kustannukset
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Määrä saa olla enintään {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Tee maksaminen Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rivi {0}: Advance vastaan Toimittaja on veloittaa
 DocType: Company,Default Values,oletus arvot
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Taajuus} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Hyvitys yhteensä
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tämä perustuu tukkien vastaan Vehicle. Katso aikajana lisätietoja alla
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Kerätä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},toimittajan ostolaskun kohdistus {0} päiväys {1}
 DocType: Customer,Default Price List,oletus hinnasto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement record {0} luotu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement record {0} luotu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Et voi poistaa tilikautta {0}. Tilikausi {0} on asetettu oletustilikaudeksi järjestelmäasetuksissa.
 DocType: Journal Entry,Entry Type,Entry Tyyppi
 ,Customer Credit Balance,Asiakkaan kredit tase
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Hankinnat
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Mikään kohteita ovat muutoksia määrän tai arvon.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Pakollinen kenttä - Ohjelma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Takuuvaatimus
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Takuuvaatimus
 ,Lead Details,Liidin lisätiedot
 DocType: Salary Slip,Loan repayment,Lainan takaisinmaksu
 DocType: Purchase Invoice,End date of current invoice's period,nykyisen laskukauden päättymispäivä
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,Pysyvä osoite
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Valitse tuotekoodi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Valitse tuotekoodi
 DocType: Student Sibling,Studying in Same Institute,Opiskelu Sama Institute
 DocType: Territory,Territory Manager,Aluepäällikkö
 DocType: Packed Item,To Warehouse (Optional),Varastoon (valinnainen)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Tuote Group&gt; Merkki
 DocType: Payment Entry,Paid Amount (Company Currency),Maksettu määrä (Yrityksen valuutta)
 DocType: Purchase Invoice,Additional Discount,Lisäalennus
 DocType: Selling Settings,Selling Settings,Myynnin asetukset
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View Cart
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markkinointikulut
 ,Item Shortage Report,Tuotevajausraportti
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Paino on mainittu, \ ssa mainitse myös ""Painoyksikkö"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,varaston kirjaus materiaalipyynnöstä
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Seuraava Poistot Date on pakollinen uutta sisältöä
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Erillinen perustuu luonnollisesti ryhmän kutakin Erä
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Tuotteen yksittäisyksikkö
 DocType: Fee Category,Fee Category,Fee Luokka
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,Painoarvo
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kustannuspaikka vaaditaan &quot;Tuloslaskelma&quot; tilin {2}. Määritä oletuksena kustannukset Center for the Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Uusi yhteystieto
 DocType: Territory,Parent Territory,Pääalue
 DocType: Quality Inspection Reading,Reading 2,Lukema 2
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,"tuote työkalu, myyntirekisteri"
 DocType: Asset,Gross Purchase Amount,Gross Osto Määrä
 DocType: Asset,Depreciation Method,Poistot Menetelmä
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Poissa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Poissa
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,kuuluuko tämä vero perustasoon?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,tavoite yhteensä
 DocType: Program Course,Required,Edellytetään
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON täsmäytys
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Liian monta saraketta, vie raportti taulukkolaskentaohjelman ja tulosta se siellä"
 DocType: Purchase Invoice Item,Batch No,Erän nro
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ei löydy valuuttakurssin {0} ja {1} keskeisille date {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Salli useat Myyntitilaukset vastaan Asiakkaan Ostotilauksen
 DocType: Student Group Instructor,Student Group Instructor,Opiskelijaryhmän Ohjaaja
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Ei
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Tärkein
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Malli
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Tärkein
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Malli
 DocType: Naming Series,Set prefix for numbering series on your transactions,Aseta sarjojen numeroinnin etuliite tapahtumiin
 DocType: Employee Attendance Tool,Employees HTML,Työntekijät HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,oletus BOM ({0}) tulee olla aktiivinen tälle tuotteelle tai sen mallipohjalle
 DocType: Employee,Leave Encashed?,vapaa kuitattu rahana?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,tilaisuuteen kenttä vaaditaan
 DocType: Email Digest,Annual Expenses,Vuosittaiset kulut
 DocType: Item,Variants,Mallit
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Tee Ostotilaus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Tee Ostotilaus
 DocType: SMS Center,Send To,Lähetä kenelle
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Vapaatyypille {0} ei ole tarpeeksi vapaata jäljellä
 DocType: Payment Reconciliation Payment,Allocated amount,kohdennettu arvomäärä
@@ -1733,17 +1734,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,asiakkaan tuotekoodi
 DocType: Stock Reconciliation,Stock Reconciliation,varaston täsmäytys
 DocType: Territory,Territory Name,Alueen nimi
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Keskeneräisten varasto vaaditaan ennen lähetystä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Keskeneräisten varasto vaaditaan ennen lähetystä
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,työn hakija.
 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
 DocType: Item,Serial Nos and Batches,Sarjanumerot ja Erät
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Opiskelijaryhmän Vahvuus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,päiväkirjaan kohdistus {0} ei täsmäämättömiä {1} kirjauksia
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Kehityskeskustelut
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Arvostelu intervallit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Käy sisään
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",Nimikettä {0} ei pysty ylilaskuttamaan rivillä {1} enempää kuin {2}. Muuta oston asetuksia salliaksesi ylilaskutus.
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Aseta suodatin perustuu Tuote tai Varasto
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} tulee lähettää
 DocType: Authorization Control,Authorization Control,Valtuutus Ohjaus
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rivi # {0}: Hylätyt Warehouse on pakollinen vastaan hylätään Tuote {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Maksu
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Hallitse tilauksia
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Maksu
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Hallitse tilauksia
 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,Tervehdys
 DocType: Course,Course Abbreviation,Course lyhenne
 DocType: Student Leave Application,Student Leave Application,Student Jätä Application
 DocType: Item,Will also apply for variants,Sovelletaan myös tuotemalleissa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset ei voi peruuttaa, koska se on jo {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Työntekijän {0} Half päivä {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Yhteensä työaika ei saisi olla suurempi kuin max työaika {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Päällä
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Kokoomatuotteet myyntihetkellä
 DocType: Quotation Item,Actual Qty,kiinteä yksikkömäärä
 DocType: Sales Invoice Item,References,Viitteet
@@ -1775,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Olet syöttänyt kohteen joka on jo olemassa. Korjaa ja yritä uudelleen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,kolleega
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,uusi koriin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,uusi koriin
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Nimike {0} ei ole sarjoitettu tuote
 DocType: SMS Center,Create Receiver List,tee vastaanottajalista
 DocType: Vehicle,Wheels,Pyörät
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Poistaa luominen Aika Lokit vastaan toimeksiantoja. Toimia ei seurata vastaan Tuotantotilaus
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,useita tuotemalleja
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Olet jo valitut kohteet {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,"toimitus kuukaudessa, nimi"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Erätunnuksesi on pakollinen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Erätunnuksesi on pakollinen
 DocType: Sales Person,Parent Sales Person,Päämyyjä
 DocType: Purchase Invoice,Recurring Invoice,Toistuva Lasku
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Toimitusjohtaja Projektit
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,Tilikausi
 DocType: Vehicle Log,Fuel Price,polttoaineen hinta
 DocType: Budget,Budget,budjetti
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Käyttö- omaisuuserän oltava ei-varastotuote.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Talousarvio ei voi luovuttaa vastaan {0}, koska se ei ole tuottoa tai kulua tili"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,saavutettu
 DocType: Student Admission,Application Form Route,Hakulomake Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Alue / Asiakas
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Alue / Asiakas
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,"esim, 5"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Jätä tyyppi {0} ei voi varata, koska se jättää ilman palkkaa"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},rivi {0}: kohdennettavan arvomäärän {1} on oltava pienempi tai yhtä suuri kuin odottava arvomäärä {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,Sarjanumero tila
 DocType: Payment Entry Reference,Outstanding,maksamatta
 ,Daily Timesheet Summary,Päivittäinen tuntilomakeyhteenveto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",rivi {0}: asettaaksesi {1} kausituksen aloitus ja päättymispäivän ero \ tulee olla suurempi tai yhtä suuri kuin {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Varastotapahtumat. {0} sisältää tiedot tapahtumista.
 DocType: Pricing Rule,Selling,Myynti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Määrä {0} {1} vähennetään vastaan {2}
 DocType: Employee,Salary Information,Palkkatietoja
 DocType: Sales Person,Name and Employee ID,Nimi ja Työntekijän ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,eräpäivä voi olla ennen lähetyspäivää
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,tullit ja verot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Anna Viiteajankohta
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"rivi ei voi viitata nykyistä suurempaan tai nykyisen rivin numeroon, vaihda maksun tyyppiä"
 DocType: Asset,Sold,Myyty
 ,Item-wise Purchase History,"tuote työkalu, ostohistoria"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"klikkaa ""muodosta aikataulu"" ja syötä tuotteen sarjanumero {0}"
 DocType: Account,Frozen,jäädytetty
 ,Open Production Orders,Avoimet tuotannon tilausket
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Määrä (Company valuutta)
 DocType: Payment Reconciliation Payment,Reference Row,Viite Row
 DocType: Installation Note,Installation Time,asennus aika
 DocType: Sales Invoice,Accounting Details,Kirjanpito Lisätiedot
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,poista kaikki tapahtumat tältä yritykseltä
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,sijoitukset
 DocType: Issue,Resolution Details,johtopäätös lisätiedot
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,keskustelu
 DocType: Payment Entry,Transaction ID,Transaction ID
 DocType: Employee,Resignation Letter Date,Eropyynnön päivämäärä
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Hinnoittelusäännöt on suodatettu määrän mukaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Hinnoittelusäännöt on suodatettu määrän mukaan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Aseta jolloin se liittyy työntekijöiden {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Määrä (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Toistuvien asiakkuuksien liikevaihto
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) tulee olla rooli 'kulujen hyväksyjä'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pari
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Valitse BOM ja Määrä Tuotannon
 DocType: Asset,Depreciation Schedule,Poistot aikataulu
 DocType: Bank Reconciliation Detail,Against Account,tili kohdistus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date pitäisi olla välillä Päivästä ja Päivään
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ole hyvä ja aseta yrityksen {0} poistojen kustannuspaikka.
 ,Maintenance Schedules,huoltoaikataulut
 DocType: Task,Actual End Date (via Time Sheet),Todellinen Lopetuspäivä (via kellokortti)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Määrä {0} {1} vastaan {2} {3}
 ,Quotation Trends,"Tarjous, trendit"
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},tuotteen {0} tuoteryhmää ei ole mainittu kohdassa tuote työkalu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,tilin debet tulee olla saatava tili
 DocType: Shipping Rule Condition,Shipping Amount,Toimituskustannus arvomäärä
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Odottaa arvomäärä
 DocType: Purchase Invoice Item,Conversion Factor,muuntokerroin
 DocType: Purchase Order,Delivered,toimitettu
 ,Vehicle Expenses,ajoneuvojen kulut
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
+DocType: Serial No,Invoice Details,laskun tiedot
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Odotettu arvo sen jälkeen, kun käyttöiän on oltava suurempi tai yhtä suuri kuin {0}"
 DocType: Purchase Receipt,Vehicle Number,Ajoneuvon rekisterinumero
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Päivä jolloin toistuva lasku lakkaa
 DocType: Employee Loan,Loan Amount,Lainan määrä
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Tuntilomakkeet
 DocType: HR Settings,HR Settings,Henkilöstöhallinnan määritykset
 DocType: Salary Slip,net pay info,nettopalkka info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,"kuluvaatimus odottaa hyväksyntää, vain kulujen hyväksyjä voi päivittää tilan"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,uusi kulut
 DocType: Purchase Invoice,Additional Discount Amount,lisäalennus
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rivi # {0}: Määrä on 1, kun kohde on kiinteän omaisuuden. Käytä erillistä rivi useita kpl."
 DocType: Leave Block List Allow,Leave Block List Allow,Salli
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,lyhenne ei voi olla tyhjä tai välilyönti
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Ryhmä Non-ryhmän
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,urheilu
 DocType: Loan Type,Loan Name,laina Name
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,asiakashankinta ja suhteet
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Hylkyvarasto
 DocType: Production Order,Skip Material Transfer,Ohita materiaalin siirto
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Pysty löytämään vaihtokurssi {0} ja {1} avaimen päivämäärä {2}. Luo Valuutanvaihto ennätys manuaalisesti
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tilikautesi päättyy
 DocType: POS Profile,Price List,Hinnasto
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} nyt on oletustilikausi. päivitä selain, jotta muutos tulee voimaan."
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Tili {0} ei kelpaa. Tilin valuutan on oltava {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Mittayksikön muuntokerroin vaaditaan rivillä {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi myyntitilaus, myyntilasku tai Päiväkirjakirjaus"
 DocType: Salary Component,Deduction,vähennys
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rivi {0}: From Time ja Kellonaikatilaan on pakollista.
 DocType: Stock Reconciliation Item,Amount Difference,määrä ero
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Nimikkeen '{0}' hinta lisätty hinnastolle '{1}'
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Syötä työntekijätunnu tälle myyjälle
 DocType: Territory,Classification of Customers by region,asiakkaiden luokittelu alueittain
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Ero määrä on nolla
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Ero määrä on nolla
 DocType: Project,Gross Margin,bruttokate
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Syötä ensin tuotantotuote
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Laskennallinen Tiliote tasapaino
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,käyttäjä poistettu käytöstä
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Tarjous
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Tarjous
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Vähennys yhteensä
 ,Production Analytics,tuotanto Analytics
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Nimike {0} on palautettu
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**tilikausi** sisältää kaikki sen kuluessa kirjatut kirjanpito- ym. taloudenhallinnan tapahtumat
 DocType: Opportunity,Customer / Lead Address,Asiakkaan / Liidin osoite
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varoitus: Liitteen {0} SSL-varmenne ei kelpaa
 DocType: Student Admission,Eligibility,kelpoisuus
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",Liidien avulla liiketoimintaasi ja kontaktiesi määrä kasvaa ja niistä syntyy uusia mahdollisuuksia
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",Liidien avulla liiketoimintaasi ja kontaktiesi määrä kasvaa ja niistä syntyy uusia mahdollisuuksia
 DocType: Production Order Operation,Actual Operation Time,todellinen toiminta-aika
 DocType: Authorization Rule,Applicable To (User),sovellettavissa (käyttäjä)
 DocType: Purchase Taxes and Charges,Deduct,vähentää
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,Työosoite
 DocType: Appraisal,Calculate Total Score,laske yhteispisteet
 DocType: Request for Quotation,Manufacturing Manager,Valmistuksen hallinta
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Sarjanumerolla {0} on takuu {1} asti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sarjanumerolla {0} on takuu {1} asti
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,jaa lähete pakkauksien kesken
 apps/erpnext/erpnext/hooks.py +87,Shipments,Toimitukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Tilin saldo ({0}) ja {1} ja varastossa arvo ({2}) varastointi {3} on sama
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,"Poistumisten yhteismäärä, päivät"
 DocType: Email Digest,Note: Email will not be sent to disabled users,huom: sähköpostia ei lähetetä käytöstä poistetuille käyttäjille
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Lukumäärä Vuorovaikutus
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Valitse yritys...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Valitse yritys...
 DocType: Leave Control Panel,Leave blank if considered for all departments,tyhjä mikäli se pidetään vaihtoehtona kaikilla osastoilla
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","työsopimuksen tyypit (jatkuva, sopimus, sisäinen jne)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} on pakollinen tuotteelle {1}
 DocType: Process Payroll,Fortnightly,joka toinen viikko
 DocType: Currency Exchange,From Currency,valuutasta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),hinta (yrityksen valuutassa)
 DocType: Student Guardian,Others,Muut
 DocType: Payment Entry,Unallocated Amount,Kohdistamattomat Määrä
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nimikettä ei löydy. Valitse jokin muu arvo {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nimikettä ei löydy. Valitse jokin muu arvo {0}.
 DocType: POS Profile,Taxes and Charges,Verot ja maksut
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","tavara tai palvelu joka ostetaan, myydään tai varastoidaan"
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ei enää päivityksiä
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"ei voi valita maksun tyyppiä, kuten 'edellisen rivin arvomäärä' tai 'edellinen rivi yhteensä' ensimmäiseksi riviksi"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Lapsi Tuote ei pitäisi olla tuote Bundle. Poista toiminto `{0}` ja säästä
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Pankkitoiminta
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lisää kellokortit
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lisää kellokortit
 DocType: Vehicle Service,Service Item,palvelu Tuote
 DocType: Bank Guarantee,Bank Guarantee,Pankkitakaus
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"klikkaa ""muodosta aikataulu"" saadaksesi aikataulun"
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Rivi # {0}: Asset {1} on jo {2}
 DocType: Quotation Item,Stock Balance,Varastotase
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Myyntitilauksesta maksuun
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Aseta Nimeäminen Series {0} Setup&gt; Asetukset&gt; nimeäminen Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,toimitusjohtaja
 DocType: Expense Claim Detail,Expense Claim Detail,kulukorvauksen lisätiedot
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Valitse oikea tili
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Hinnat ei näytetä, jos hinnasto ei ole asetettu"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ilmoitathan maa tälle toimitus säännön tai tarkistaa Postikuluja
 DocType: Stock Entry,Total Incoming Value,"Kokonaisarvo, saapuva"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Veloituksen tarvitaan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Kellokortit auttaa seurata aikaa, kustannuksia ja laskutusta aktiviteetti tehdä tiimisi"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Veloituksen tarvitaan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Kellokortit auttaa seurata aikaa, kustannuksia ja laskutusta aktiviteetti tehdä tiimisi"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Ostohinta List
 DocType: Offer Letter Term,Offer Term,Tarjouksen voimassaolo
 DocType: Quality Inspection,Quality Manager,Laatuhallinta
 DocType: Job Applicant,Job Opening,Työpaikka
 DocType: Payment Reconciliation,Payment Reconciliation,Maksun täsmäytys
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Valitse vastuuhenkilön nimi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Valitse vastuuhenkilön nimi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Maksamattomat yhteensä: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM-sivuston Käyttö
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,Häviämissyy
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Anna kuitti asiakirja
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,kaikki tuotteet on jo laskutettu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Anna kuitti asiakirja
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"lisää kustannuspaikkoja voidaan tehdä kohdassa ryhmät, mutta pelkät merkinnät voi kohdistaa ilman ryhmiä"
 DocType: Project,External,ulkoinen
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Käyttäjät ja käyttöoikeudet
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Tuotanto Tilaukset Luotu: {0}
 DocType: Branch,Branch,Sivutoimiala
 DocType: Guardian,Mobile Number,Puhelinnumero
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tulostus ja brändäys
 DocType: Bin,Actual Quantity,kiinteä yksikkömäärä
 DocType: Shipping Rule,example: Next Day Shipping,esimerkiksi: seuraavan päivän toimitus
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sarjanumeroa {0} ei löydy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sarjanumeroa {0} ei löydy
 DocType: Scheduling Tool,Student Batch,Student Erä
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Omat asiakkaat
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tee Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tee Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sinut on kutsuttu yhteistyöhön projektissa {0}
 DocType: Leave Block List Date,Block Date,estopäivä
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Hae nyt
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,Lähetetty kenelle
 DocType: Payment Request,Make Sales Invoice,tee myyntilasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Ohjelmistot
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Seuraava Ota Date ei voi olla menneisyydessä
 DocType: Company,For Reference Only.,vain viitteeksi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Valitse Erä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},virheellinen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-jälkikä-
 DocType: Sales Invoice Advance,Advance Amount,ennakko
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,asianumero ei voi olla 0
 DocType: Item,Show a slideshow at the top of the page,Näytä diaesitys sivun yläreunassa
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,varastoi
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,varastoi
 DocType: Serial No,Delivery Time,toimitusaika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,vanhentuminen perustuu
 DocType: Item,End of Life,elinkaaren loppu
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,Nimeä työkalu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Päivitä kustannukset
 DocType: Item Reorder,Item Reorder,Tuotteen täydennystilaus
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Näytä Palkka Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,materiaalisiirto
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Näytä Palkka Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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"
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tämä asiakirja on yli rajan {0} {1} alkion {4}. Teetkö toisen {3} vasten samalla {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Valitse muutoksen suuruuden tili
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Ole hyvä ja aseta toistuvuustieto vasta lomakkeen tallentamisen jälkeen.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Valitse muutoksen suuruuden tili
 DocType: Purchase Invoice,Price List Currency,"Hinnasto, valuutta"
 DocType: Naming Series,User must always select,Käyttäjän tulee aina valita
 DocType: Stock Settings,Allow Negative Stock,salli negatiivinen varastoarvo
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,Talousarviotili
 DocType: Quality Inspection,Verified By,Vahvistanut
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Yrityksen oletusvaluuttaa ei voi muuttaa sillä tapahtumia on olemassa, tapahtumat tulee peruuttaa jotta oletusvaluuttaa voi muuttaa"
-DocType: Grade Interval,Grade Description,Grade Kuvaus
+DocType: Grading Scale Interval,Grade Description,Grade Kuvaus
 DocType: Stock Entry,Purchase Receipt No,Ostokuitti No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,aikaisintaan raha
 DocType: Process Payroll,Create Salary Slip,Tee palkkalaskelma
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,osallistuminen päivään
 DocType: Warranty Claim,Raised By,Pyynnön tekijä
 DocType: Payment Gateway Account,Payment Account,Maksutili
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Ilmoitathan Yritys jatkaa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettomuutos Myyntireskontra
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,korvaava on pois
 DocType: Offer Letter,Accepted,hyväksytyt
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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"
 DocType: Room,Room Number,Huoneen numero
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Virheellinen viittaus {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{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,Toimitussäännön nimike
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Käyttäjäfoorumi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Raaka-aineet ei voi olla tyhjiä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Nopea Päiväkirjakirjaus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ei voinut päivittää hyllyssä, lasku sisältää pudota merenkulku erä."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Nopea Päiväkirjakirjaus
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"hintaa 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
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Ehdot ja säännöt 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nimi Instituutin jolle olet luomassa tätä järjestelmää.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","kirjanpidon kirjaus on toistaiseksi jäädytetty, vain alla mainitussa roolissa voi tällä hetkellä kirjata / muokata tiliä"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Tallenna asiakirja ennen huoltoaikataulun muodostusta
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektin tila
 DocType: UOM,Check this to disallow fractions. (for Nos),täppää ellet halua murtolukuja (Nos:iin)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Seuraavat tuotantotilaukset luotiin:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,Virallisena lomapäivänä työskentelevät työntekijät
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Nykyinen
 DocType: Project,% Complete Method,% Täydellinen Menetelmä
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},huollon aloituspäivä ei voi olla ennen sarjanumeron {0} toimitusaikaa
 DocType: Production Order,Actual End Date,todellinen päättymispäivä
 DocType: BOM,Operating Cost (Company Currency),Käyttökustannukset (Company valuutta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Jätä Ilman Pay ei vastaa hyväksyttyä Leave Application kirjaa
 DocType: Campaign,Campaign-.####,kampanja -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Seuraavat vaiheet
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Ole hyvä ja toimittaa erityisiin kohtiin on paras mahdollinen hinnat
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto lähellä Mahdollisuus 15 päivän jälkeen
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,end Year
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lyijy%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Määrä
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Luotu - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Luokka Account
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,varaston kirjaus {0} ei ole lähetetty
 DocType: Payment Reconciliation,Bank / Cash Account,Pankki-tai Kassatili
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Seuraava Ota By voi olla sama kuin Lead Sähköpostiosoite
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,tilityspäivää ei ole mainittu
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Tuotanto
 DocType: Guardian,Occupation,Ammatti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rivi {0}: Aloitus on ennen Päättymispäivä
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),yhteensä (yksikkömäärä)
 DocType: Sales Invoice,This Document,Tämä asiakirja
 DocType: Installation Note Item,Installed Qty,asennettu yksikkömäärä
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoi asia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Hyödykekulut
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ja yli
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rivi # {0}: Päiväkirjakirjaus {1} ei ole huomioon {2} tai jo sovitettu toista voucher
 DocType: Buying Settings,Default Buying Price List,"oletus hinnasto, osto"
 DocType: Process Payroll,Salary Slip Based on Timesheet,Palkka tuntilomakkeen mukaan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Maksun tyyppi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Valitse Erä momentille {0}. Pysty löytämään yhden erän, joka täyttää tämän vaatimuksen"
 DocType: Process Payroll,Select Employees,Valitse työntekijät
 DocType: Opportunity,Potential Sales Deal,Potentiaaliset Myynti Deal
 DocType: Payment Entry,Cheque/Reference Date,Sekki / Viitepäivä
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},yritykselle {1} on jo tehty yleinen POS profiili {0}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,korvaa tuote / BOM kaikissa BOM:ssa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kuitti asiakirja on esitettävä
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kuitti asiakirja on esitettävä
 DocType: Purchase Invoice Item,Received Qty,Saapunut yksikkömäärä
 DocType: Stock Entry Detail,Serial No / Batch,Sarjanumero / erä
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ei makseta ja ei toimiteta
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-jälkikä-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ei aikaa arkkia
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} -tyyppistä vapaata ei voi siirtää eteenpäin
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"huoltuaikataulua ei ole luotu kaikille tuotteille, klikkaa ""muodosta aikataulu"""
 ,To Produce,Tuotantoon
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Palkanmaksu
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","riviin {0}:ssa {1} sisällytä {2} tuotetasolle, rivit {3} tulee myös sisällyttää"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tee Käyttäjän
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tee Käyttäjän
 DocType: Packing Slip,Identification of the package for the delivery (for print),pakkauksen tunnistus toimitukseen (tulostus)
 DocType: Bin,Reserved Quantity,Varattu Määrä
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Anna voimassa oleva sähköpostiosoite
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Vammaiset mallia saa olla oletuspohja
 DocType: Account,Income Account,tulotili
 DocType: Payment Request,Amount in customer's currency,Summa asiakkaan valuutassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Toimitus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Toimitus
 DocType: Stock Reconciliation Item,Current Qty,nykyinen yksikkömäärä
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Katso ""materiaaleihin perustuva arvo"" kustannuslaskenta osiossa"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Taaksepäin
 DocType: Appraisal Goal,Key Responsibility Area,Key Vastuu Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Erät avulla voit seurata läsnäoloa, arvioinnit ja palkkiot opiskelijoille"
 DocType: Payment Entry,Total Allocated Amount,Yhteensä osuutensa
 DocType: Item Reorder,Material Request Type,materiaalipyynnön tyyppi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Päiväkirjakirjaus palkkojen välillä {0} ja {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStoragen on täynnä, ei tallentanut"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStoragen on täynnä, ei tallentanut"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rivi {0}: UOM Muuntokerroin on pakollinen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Viite
 DocType: Budget,Cost Center,kustannuspaikka
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Piilota Asiakkaan Tax Id myyntitapahtumia
 DocType: Upload Attendance,Upload HTML,Tuo HTML-koodia
 DocType: Employee,Relieving Date,Päättymispäivä
-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.","Hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Hinnoittelu sääntö on tehty tämä korvaa hinnaston / määritä alennus, joka perustuu kriteereihin"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Varastoa voi muuttaa ainoastaan varaston Kirjauksella / Lähetteellä / Ostokuitilla
 DocType: Employee Education,Class / Percentage,luokka / prosenttia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,markkinoinnin ja myynnin pää
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,tulovero
-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.","mikäli 'hinnalle' on tehty hinnoittelusääntö se korvaa hinnaston, hinnoittelusääntö on lopullinen hinta joten lisäalennusta ei voi antaa, näin myyntitilaus, ostotilaus ym tapahtumaissa tuote sijoittuu paremmin 'arvo' kenttään 'hinnaston arvo' kenttään"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","mikäli 'hinnalle' on tehty hinnoittelusääntö se korvaa hinnaston, hinnoittelusääntö on lopullinen hinta joten lisäalennusta ei voi antaa, näin myyntitilaus, ostotilaus ym tapahtumaissa tuote sijoittuu paremmin 'arvo' kenttään 'hinnaston arvo' kenttään"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Seuraa vihjeitä toimialan mukaan
 DocType: Item Supplier,Item Supplier,tuote toimittaja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Syötä tuotekoodi saadaksesi eränumeron
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Syötä arvot tarjouksesta {0} tarjoukseen {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,kaikki osoitteet
 DocType: Company,Stock Settings,varastoasetukset
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Lähettää sähköpostia tapahtumasta työntekijöiden tilassa &#39;Open&#39;
 DocType: Task,Depends on Tasks,Riippuu Tehtävät
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,hallitse asiakasryhmäpuuta
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Liitteet voidaan osoittaa toiminnon ottamatta ostoskorin
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,uuden kustannuspaikan nimi
 DocType: Leave Control Panel,Leave Control Panel,poistu ohjauspaneelista
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,debet kirjaus kohteeseen
 DocType: Delivery Note,Required only for sample item.,vain demoerä on pyydetty
 DocType: Stock Ledger Entry,Actual Qty After Transaction,todellinen yksikkömäärä tapahtuman jälkeen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Toimittaja&gt; toimittaja tyyppi
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ei palkkakuitin välillä havaittu {0} ja {1}
 ,Pending SO Items For Purchase Request,"Ostettavat pyyntö, odottavat myyntitilaukset"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Opiskelijavalinta
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} on poistettu käytöstä
 DocType: Supplier,Billing Currency,Laskutus Valuutta
 DocType: Sales Invoice,SINV-RET-,SINV-jälkikä-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,erittäin suuri
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kotisivu Erityistuotteet
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Kaikki Assessment Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Uusi varasto Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Yhteensä {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Yhteensä {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Alue
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vierailujen määrä vaaditaan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vierailujen määrä vaaditaan
 DocType: Stock Settings,Default Valuation Method,oletus arvomenetelmä
 DocType: Vehicle Log,Fuel Qty,polttoaineen määrä
 DocType: Production Order Operation,Planned Start Time,Suunniteltu aloitusaika
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,Hinnasto valvonta
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,kaikki myyntitapahtumat voidaan kohdistaa useammalle ** myyjälle ** tavoitteiden asettamiseen ja seurantaan
 ,S.O. No.,Myyntitilaus nro
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Luo asiakkuus vihjeestä {0}
 DocType: Price List,Applicable for Countries,Sovelletaan Maat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vain Jätä Sovellukset tilassa &#39;Hyväksytty&#39; ja &#39;Hylätty &quot;voi jättää
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Opiskelija Ryhmän nimi on pakollinen rivin {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,kopioitu
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nimivirhe: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Puute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ei liittynyt {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ei liittynyt {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,työntekijän {0} osallistuminen on jo merkitty
 DocType: Packing Slip,If more than one package of the same type (for print),mikäli useampi saman tyypin pakkaus (tulostus)
 ,Salary Register,Palkka Register
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Käytä ostoskoriin
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Arvo {0} attribuutille {1} ei ole voimassa olevien kohdeattribuuttien luettelossa tuotteelle {2}
 DocType: BOM Item,Scrap %,Romu %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","maksut jaetaan suhteellisesti tuotteiden yksikkömäärän tai arvomäärän mukaan, määrityksen perusteella"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","maksut jaetaan suhteellisesti tuotteiden yksikkömäärän tai arvomäärän mukaan, määrityksen perusteella"
 DocType: Maintenance Visit,Purposes,Tarkoituksiin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","tuote {0} kauemmin kuin mikään saatavillaoleva työaika työasemalla {1}, hajoavat toiminta useiksi toiminnoiksi"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,hallitse aluepuuta
 DocType: Journal Entry Account,Sales Invoice,Myyntilasku
 DocType: Journal Entry Account,Party Balance,Osatase
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Valitse käytä alennusta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Valitse käytä alennusta
 DocType: Company,Default Receivable Account,oletus saatava tili
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,tee pankkikirjaus maksetusta kokonaispalkasta edellä valituin kriteerein
 DocType: Stock Entry,Material Transfer for Manufacture,materiaalisiirto tuotantoon
-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.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,"alennusprosenttia voi soveltaa yhteen, tai useampaan hinnastoon"
 DocType: Purchase Invoice,Half-yearly,puolivuosittain
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,kirjanpidon varaston kirjaus
 DocType: Vehicle Service,Engine Oil,Moottoriöljy
 DocType: Sales Invoice,Sales Team1,Myyntitiimi 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,tuotetta {0} ei ole olemassa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,tuotetta {0} ei ole olemassa
 DocType: Sales Invoice,Customer Address,Asiakkaan osoite
 DocType: Employee Loan,Loan Details,Loan tiedot
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rivi {0}: Valmis Määrä on oltava suurempi kuin nolla.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,kantatyyppi
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},rivi # {0}: ei voi palauttaa enemmän kuin {1} tuotteelle {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Tontti
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Tontti
 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}
 DocType: Cheque Print Template,Primary Settings,Perusasetukset
 DocType: Purchase Invoice,Select Supplier Address,Valitse toimittajan osoite
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Lisää Työntekijät
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Lisää Työntekijät
 DocType: Purchase Invoice Item,Quality Inspection,Laatutarkistus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,erittäin pieni
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa vähimmäistilausmäärän
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Varoitus: Pyydetty materiaalin määrä alittaa vähimmäistilausmäärän
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,tili {0} on jäädytetty
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"juridinen hlö / tytäryhtiö, jolla on erillinen tilikartta kuuluu organisaatioon"
 DocType: Payment Request,Mute Email,Mute Sähköposti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ruoka, Juoma ja Tupakka"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Voi vain maksun vastaan laskuttamattomia {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,provisio taso ei voi olla suurempi kuin 100
 DocType: Stock Entry,Subcontract,alihankinta
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Kirjoita {0} ensimmäisen
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Varastoissa nykyisten tapahtumaa ei voida muuntaa ryhmään.
 DocType: Assessment Result Tool,Result HTML,tulos HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vanhemee
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lisää Opiskelijat
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lisää Opiskelijat
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Ole hyvä ja valitse {0}
 DocType: C-Form,C-Form No,C-muoto nro
 DocType: BOM,Exploded_items,räjäytetyt_tuotteet
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,pankkipääte
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,syötä kampanjan nimi jos kirjauksen lähde on kampanja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Valitse tilikausi
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Valitse tilikausi
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Täydennystilaustaso
 DocType: Company,Chart Of Accounts Template,Tilikartta Template
 DocType: Attendance,Attendance Date,"osallistuminen, päivä"
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,monista kirjaus
 DocType: Program Enrollment Tool,Get Students,Hanki Opiskelijat
 DocType: Serial No,Under Warranty,Takuu voimassa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[virhe]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[virhe]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"sanat näkyvät, kun tallennat myyntitilauksen"
 ,Employee Birthday,Työntekijän syntymäpäivä
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Erä Läsnäolo Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Raja ylitetty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Pääomasijoitus
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Lukukaudessa tällä &quot;Lukuvuosi {0} ja&quot; Term Name &#39;{1} on jo olemassa. Ole hyvä ja muokata näitä merkintöjä ja yritä uudelleen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Koska on olemassa nykyisiä tapahtumia vastaan kohde {0}, et voi muuttaa arvoa {1}"
 DocType: UOM,Must be Whole Number,täytyy olla kokonaisluku
 DocType: Leave Control Panel,New Leaves Allocated (In Days),uusi poistumisten kohdennus (päiviä)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Sarjanumeroa {0} ei ole olemassa
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% myyntitilauksen materiaaleista laskutettu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Kauden sulkukirjaus
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa ryhmäksi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Määrä {0} {1} {2} {3}
 DocType: Account,Depreciation,arvonalennus
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),toimittaja/toimittajat
 DocType: Employee Attendance Tool,Employee Attendance Tool,Työntekijän läsnäolo Tool
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,seuraavan kuukauden viimeinen päivä
 DocType: Support Settings,Auto close Issue after 7 days,Auto lähellä Issue 7 päivän jälkeen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Vapaita ei voida käyttää ennen {0}, koska käytettävissä olevat vapaat on jo siirretty eteenpäin jaksolle {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),huom: viitepäivä huomioiden asiakkaan luottoraja ylittyy {0} päivää
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Hakija
 DocType: Asset Category Account,Accumulated Depreciation Account,Kertyneiden poistojen tili
 DocType: Stock Settings,Freeze Stock Entries,jäädytä varaston kirjaukset
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,Varastoanalytiikka
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Toimintaa ei voi jättää tyhjäksi
 DocType: Maintenance Visit Purpose,Against Document Detail No,asiakirjan yksityiskohta nro kohdistus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Osapuoli tyyppi on pakollinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Osapuoli tyyppi on pakollinen
 DocType: Quality Inspection,Outgoing,Lähtevä
 DocType: Material Request,Requested For,Pyydetty kohteelle
 DocType: Quotation Item,Against Doctype,koskien tietuetyyppiä
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,tuotekoodi
 DocType: Production Planning Tool,Create Production Orders,tee tuotannon tilaus
 DocType: Serial No,Warranty / AMC Details,Takuun / huollon lisätiedot
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Valitse opiskelijat manuaalisesti Toiminto perustuu ryhmän
 DocType: Journal Entry,User Remark,Käyttäjä huomautus
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Maksettu summa ei voi olla suurempi kuin koko negatiivinen jäljellä {0}
 DocType: Employee Internal Work History,Employee Internal Work History,työntekijän sisäinen työhistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),sulku (dr)
 DocType: Cheque Print Template,Cheque Size,Shekki Koko
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,tee materiaalipyyntö
 DocType: Employee Education,School/University,Koulu/Yliopisto
 DocType: Payment Request,Reference Details,Viite Tietoja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Odotusarvo jälkeen käyttöiän on oltava alle Gross Purchase Määrä
 DocType: Sales Invoice Item,Available Qty at Warehouse,saatava varaston yksikkömäärä
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,laskutettu
 DocType: Asset,Double Declining Balance,Double jäännösarvopoisto
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","erotilin tulee olla vastaavat/vastattavat tili huomioiden, että varaston täsmäytys vaatii aloituskirjauksen"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Maksettu summa ei voi olla suurempi kuin lainan määrä {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ostotilauksen numero vaaditaan tuotteelle {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Tuotantotilaus ei luonut
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Tuotantotilaus ei luonut
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Aloituspäivän tulee olla ennen päättymispäivää
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ei voida muuttaa asemaa opiskelija {0} liittyy opiskelijavalinta {1}
 DocType: Asset,Fully Depreciated,täydet poistot
 ,Stock Projected Qty,ennustettu varaston yksikkömäärä
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},asiakas {0} ei kuulu projektiin {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merkitty Läsnäolo HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Lainaukset ovat ehdotuksia, tarjouksia olet lähettänyt asiakkaille"
 DocType: Sales Order,Customer's Purchase Order,Asiakkaan Ostotilaus
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sarjanumero ja erä
 DocType: Warranty Claim,From Company,yrityksestä
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa Kymmeniä Arviointikriteerit on oltava {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Aseta määrä Poistot varatut
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Arvo tai yksikkömäärä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Aseta määrä Poistot varatut
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Arvo tai yksikkömäärä
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Tilaukset ei voida nostaa varten:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuutti
 DocType: Purchase Invoice,Purchase Taxes and Charges,Oston verot ja maksut
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,kaikki kaupalliset
 DocType: Sales Partner,Retailer,Jälleenmyyjä
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Kredit tilin on oltava tase tili
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,kaikki toimittajatyypit
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,kaikki toimittajatyypit
 DocType: Global Defaults,Disable In Words,Poista In Sanat
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Tarjous {0} ei ole tyyppiä {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,pankin tilinylitystili
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Tee palkkalaskelma
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rivi # {0}: osuutensa ei voi olla suurempi kuin lainamäärä.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,selaa BOM:a
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Taatut lainat
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit julkaisupäivä ja aika
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ei ole sallittua päivittää yli {0} vanhoja varastotapahtumia
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,täysin laskutettu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Aseta oletus maksettava huomioon työntekijän {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,käsirahat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Toimitus varasto tarvitaan varastonimike {0}
 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)"
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,Ryhmät pohjautuvat
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Palvelu Tuote, tyyppi, taajuus ja kustannuksella määrä tarvitaan"
-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
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",vaikka useita hinnoittelusääntöjä on olemassa korkeimmalla prioriteetilla seuraavia sisäisiä prioriteettejä noudatetaan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Haluatko varmasti lähettää kaikki palkkakuitin välillä {0} ja {1}
 DocType: Cheque Print Template,Cheque Height,Shekki Korkeus
 DocType: Supplier,Supplier Details,toimittajan lisätiedot
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,lasku Ref
 DocType: Purchase Order,Recurring Order,Toistuvat Order
 DocType: Company,Default Income Account,oletus tulotili
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,asiakasryhmä / asiakas
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,asiakasryhmä / asiakas
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed tilikausiin voitto / tappio (luotto)
 DocType: Sales Invoice,Time Sheets,Tuntilistat
 DocType: Payment Gateway Account,Default Payment Request Message,Oletus maksupyyntö Viesti
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,Tarjouksen viesti
 DocType: Employee Loan,Employee Loan Application,Työntekijän lainahakemuksen
 DocType: Issue,Opening Date,Opening Date
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Läsnäolo on merkitty onnistuneesti.
 DocType: Journal Entry,Remark,Huomautus
 DocType: Purchase Receipt Item,Rate and Amount,hinta ja arvomäärä
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tilityyppi on {0} on {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tilityyppi on {0} on {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Vapaat ja lomat
 DocType: School Settings,Current Academic Term,Nykyinen lukukaudessa
 DocType: Sales Order,Not Billed,Ei laskuteta
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,"Tarjous, sarjat"
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Samanniminen nimike on jo olemassa ({0}), vaihda nimikeryhmän nimeä tai nimeä nimike uudelleen"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Valitse asiakas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Valitse asiakas
 DocType: C-Form,I,minä
 DocType: Company,Asset Depreciation Cost Center,Poistojen kustannuspaikka
 DocType: Sales Order Item,Sales Order Date,"Myyntitilaus, päivä"
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,vakuutus Lisätiedot
 DocType: Account,Payable,Maksettava
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Anna takaisinmaksuajat
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Velalliset ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Velalliset ({0})
 DocType: Pricing Rule,Margin,Marginaali
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Uudet asiakkaat
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,bruttovoitto %
 DocType: Appraisal Goal,Weightage (%),Painoarvo (%)
 DocType: Bank Reconciliation Detail,Clearance Date,tilityspäivä
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Ostoksen kokonaissumma on pakollinen
 DocType: Lead,Address Desc,osoitetiedot
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Osapuoli on pakollinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Osapuoli on pakollinen
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Aihe Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Ainakin yksi tai myyminen ostaminen on valittava
-DocType: Grading Structure,Grade Intervals,Grade intervallit
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Valitse liiketoiminnan luonteesta.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rivi # {0}: Monista merkintä Viitteet {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Missä valmistus tapahtuu
 DocType: Asset Movement,Source Warehouse,Lähde varasto
 DocType: Installation Note,Installation Date,asennuspäivä
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tulosteotsakkeet mallineille
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tulostus, mallipohjan otsikot esim, proformalaskuun"
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Arvotyypin maksuja ei voi merkata sisältyviksi
 DocType: POS Profile,Update Stock,Päivitä varasto
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Erilaiset mittayksiköt voivat johtaa virheellisiin (kokonais) painoarvoihin. Varmista, että joka kohdassa käytetään samaa mittayksikköä."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM taso
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,valuutanvaihtojen voitto/tappiotili
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Työntekijät ja läsnäolo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Tarkoitus on oltava yksi {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Täytä muoto ja tallenna se
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Varsinainen kpl varastossa
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Täydennystilauksen yksikkömäärä
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Avoimet työpaikat
 DocType: Company,Stock Adjustment Account,Varastonsäätötili
-DocType: Journal Entry,Write Off,Poisto
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Poisto
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","järjestelmäkäyttäjä (kirjautuminen) tunnus, mikäli annetaan siitä tulee oletus kaikkiin HR muotoihin"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1}:stä
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Toimittaja toimittaa Asiakkaalle
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) on loppunut
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Seuraava Päivämäärä on oltava suurempi kuin julkaisupäivämäärä
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Näytä vero hajottua
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Näytä vero hajottua
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},erä- / viitepäivä ei voi olla {0} jälkeen
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,tietojen tuonti ja vienti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Kanta on merkinnät vastaan Varasto {0}, joten et voi uudelleen määrittää tai muuttaa sitä"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ei opiskelijat Todettu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Ei opiskelijat Todettu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Laskun julkaisupäivä
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Myydä
 DocType: Sales Invoice,Rounded Total,yhteensä pyöristettynä
 DocType: Product Bundle,List items that form the package.,luetteloi tuotteet jotka muodostavat pakkauksen
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosenttiosuuden jako tulisi olla yhtä suuri 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Valitse julkaisupäivä ennen valintaa Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Valitse julkaisupäivä ennen valintaa Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Valitse Lainaukset
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,tee huoltokäynti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Valitse Lainaukset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Määrä Poistot varatut ei voi olla suurempi kuin kokonaismäärä Poistot
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,tee huoltokäynti
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Ota yhteyttä käyttäjään, jolla on myynninhallinnan valvojan rooli {0}"
 DocType: Company,Default Cash Account,oletus kassatili
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,yrityksen valvonta (ei asiakas tai toimittaja)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tämä perustuu läsnäolo tämän Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Ei opiskelijat
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lisätä kohteita tai avata koko lomakkeen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Anna &quot;Expected Delivery Date&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,lähete {0} tulee perua ennen myyntilauksen perumista
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Nimike 3
 DocType: Purchase Order,Customer Contact Email,Asiakas Sähköpostiosoite
 DocType: Warranty Claim,Item and Warranty Details,Kohta ja takuu Tietoja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kohta Koodi&gt; Tuote Group&gt; Merkki
 DocType: Sales Team,Contribution (%),panostus (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Valitse ohjelma hakemaan pakollisia kursseja.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Ennen täsmäytystä
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}:lle
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Lisätyt verot ja maksut (yrityksen valuutassa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"tuotteen vero, rivi {0} veron tyyppi tulee määritellä (tulo, kulu, veloitettava)"
 DocType: Sales Order,Partly Billed,Osittain Laskutetaan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Kohta {0} on oltava käyttö- omaisuuserän
 DocType: Item,Default BOM,oletus BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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ä"
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Vakuutusyhtiö
 DocType: Asset Category Account,Fixed Asset Account,Kiinteä tasetilille
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Muuttuja
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,lähetteestä
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Muuttuja
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,lähetteestä
 DocType: Student,Student Email Address,Student Sähköpostiosoite
 DocType: Timesheet Detail,From Time,ajasta
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Varastossa:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,valuuttakurssi
 DocType: Purchase Invoice Item,Rate,Hinta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,harjoitella
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Osoite Nimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Osoite Nimi
 DocType: Stock Entry,From BOM,BOM:sta
 DocType: Assessment Code,Assessment Code,arviointi koodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,perustiedot
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ennen {0} rekisteröidyt varastotapahtumat on jäädytetty
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"klikkaa ""muodosta aikataulu"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","esim, kg, m, ym"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,viitenumero vaaditaan mykäli viitepäivä on annettu
 DocType: Bank Reconciliation Detail,Payment Document,Maksu asiakirja
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,Palkkarakenne
 DocType: Account,Bank,pankki
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,lentoyhtiö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,materiaali aihe
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,materiaali aihe
 DocType: Material Request Item,For Warehouse,Varastoon
 DocType: Employee,Offer Date,Työsopimusehdotuksen päivämäärä
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Lainaukset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Olet offline-tilassa. Et voi ladata kunnes olet verkon.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ei opiskelijaryhmille luotu.
 DocType: Purchase Invoice Item,Serial No,Sarjanumero
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Kuukauden lyhennyksen määrä ei voi olla suurempi kuin Lainamäärä
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Syötä ylläpidon lisätiedot ensin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Syötä ylläpidon lisätiedot ensin
 DocType: Purchase Invoice,Print Language,käytettävä tulosteiden kieli
 DocType: Salary Slip,Total Working Hours,Kokonaistyöaika
 DocType: Stock Entry,Including items for sub assemblies,mukaanlukien alikokoonpanon tuotteet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Anna-arvon on oltava positiivinen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Anna-arvon on oltava positiivinen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Kaikki alueet
 DocType: Purchase Invoice,Items,tuotteet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Opiskelijan on jo ilmoittautunut.
@@ -3254,16 +3263,14 @@
 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 +647,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;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,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
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Kohteita ei Bill materiaalien valmistus
 DocType: Assessment Plan,Supervisor Name,ohjaaja Name
 DocType: Program Enrollment Course,Program Enrollment Course,Ohjelma Ilmoittautuminen kurssi
-DocType: Grading Structure,Grading Structure,Arvostelu rakenne
 DocType: Purchase Taxes and Charges,Valuation and Total,Arvo ja Summa
 DocType: Tax Rule,Shipping City,Toimitus Kaupunki
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,muokkaa ilmoitusta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,LIIKETOIMINNAN RAHAVIRTA
 DocType: Sales Invoice,Shipping Rule,Toimitussääntö
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Valitse julkaisupäivä ensimmäinen
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Aukiolopäivä pitäisi olla ennen Tarjouksentekijä
 DocType: Leave Control Panel,Carry Forward,siirrä
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,olemassaolevien tapahtumien kustannuspaikkaa ei voi muuttaa tilikirjaksi
 DocType: Department,Days for which Holidays are blocked for this department.,päivät jolloin lomat on estetty tälle osastolle
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,pää
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Kiinnitä Kirjelomake
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,viime Viestintä
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',vähennystä ei voi tehdä jos kategoria on  'arvo'  tai 'arvo ja summa'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","luettelo verotapahtumista, kuten (alv, tulli, ym, ne tulee olla uniikkeja nimiä) ja vakioarvoin, tämä luo perusmallipohjan, jota muokata tai lisätä tarpeen mukaan myöhemmin"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Sarjanumero edelyttää sarjoitettua tuotetta {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksut Laskut
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),yhteensä (summa)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,edustus & vapaa-aika
 DocType: Quality Inspection,Item Serial No,tuote sarjanumero
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Luo Työntekijä Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Luo Työntekijä Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Nykyarvo yhteensä
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,tilinpäätöksen
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,tunti
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Tuntematon
 DocType: Shipping Rule,Shipping Rule Conditions,Toimitussääntöehdot
 DocType: BOM Replace Tool,The new BOM after replacement,Uusi materiaaliluettelo korvauksen jälkeen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Myyntipiste
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Myyntipiste
 DocType: Payment Entry,Received Amount,Vastaanotetut Määrä
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ole hyvä setup Työntekijän nimijärjestelmään Human Resource&gt; HR Asetukset
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Luo täyden määrän, välittämättä määrä jo tilattuihin"
 DocType: Account,Tax,Vero
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ei Merkitty
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,laskut
 DocType: Batch,Source Document Name,Lähde Asiakirjan nimi
 DocType: Job Opening,Job Title,Työtehtävä
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Luo Käyttäjät
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Luo Käyttäjät
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Määrä Valmistus on oltava suurempi kuin 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Käyntiraportti huoltopyynnöille
 DocType: Stock Entry,Update Rate and Availability,Pä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öä"
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},kulutili on vaaditaan tuotteelle {0}
 DocType: BOM,Website Description,Verkkosivuston kuvaus
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettomuutos Equity
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Peruuta Ostolasku {0} ensimmäinen
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Sähköpostiosoite täytyy olla yksilöllinen, on jo olemassa {0}"
 DocType: Serial No,AMC Expiry Date,AMC Viimeinen käyttöpäivä
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kuitti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,kuitti
 ,Sales Register,Myyntirekisteri
 DocType: Daily Work Summary Settings Company,Send Emails At,Lähetä sähköposteja
 DocType: Quotation,Quotation Lost Reason,"Tarjous hävitty, syy"
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Valitse toimiala
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transaction viitenumero {0} päivätyn {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ei muokattavaa.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Ei Asiakkaat vielä!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rahavirtalaskelma
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lainamäärä voi ylittää suurin lainamäärä on {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lisenssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Syötä poistotili
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Viimeinen tilaus päivämäärä
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tili {0} ei kuulu yritykselle {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sarjanumeroita peräkkäin {0} ei vastaa lähetysluettelon
 DocType: Student,Guardian Details,Guardian Tietoja
 DocType: C-Form,C-Form,C-muoto
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Läsnäolo useita työntekijöitä
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rivi {0} # Account täytyy olla tyyppiä &quot;Käyttöomaisuuden&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ulkona yksikkömäärä
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,sääntö laskee toimituskustannuksen arvomäärän myyntiin
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sarjat ovat pakollisia
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sarjat ovat pakollisia
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Talouspalvelu
 DocType: Student Sibling,Student ID,opiskelijanumero
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Toimintamuodot Aika Lokit
 DocType: Tax Rule,Sales,Myynti
 DocType: Stock Entry Detail,Basic Amount,Perusmäärät
 DocType: Training Event,Exam,Koe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Varasto vaaditaan varastotuotteelle {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Varasto 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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Laskutus valtion
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,siirto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ei liittynyt PartyAccount {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ei liittynyt PartyAccount {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Nouda BOM räjäytys (mukaan lukien alikokoonpanot)
 DocType: Authorization Rule,Applicable To (Employee),sovellettavissa (työntekijä)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,eräpäivä vaaditaan
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Puuston Taito {0} ei voi olla 0
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,Ei-aktiiviset asiakkaat
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Osto Kuitit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,miten hinnoittelu sääntöä käytetään
 DocType: Stock Entry,Delivery Note No,lähetteen numero
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Jos tämä on valittu, vain ostaa materiaalia pyyntöjen lopullinen aineiden sisällytetään Materiaaliin pyynnöt. Muuten materiaali pyynnöt vanhemman kohteita luodaan"
 DocType: Cheque Print Template,Message to show,Viesti näyttää
 DocType: Company,Retail,Vähittäiskauppa
 DocType: Attendance,Absent,puuttua
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Koostetuotteet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Koostetuotteet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,Tilin maksettu
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raaka-aineen tuotekoodi
 DocType: Journal Entry,Write Off Based On,Poisto perustuu
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Luo liidi
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Luo liidi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tulosta ja Paperi
 DocType: Stock Settings,Show Barcode Field,Näytä Viivakoodi Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Lähetä toimittaja Sähköpostit
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Lähetä toimittaja Sähköpostit
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Palkka jo käsitellä välisenä aikana {0} ja {1}, Jätä hakuaika voi olla välillä tällä aikavälillä."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,sarjanumeron asennustietue
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,Odottaa vastausta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Yläpuolella
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Virheellinen määrite {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mainitse jos standardista maksetaan tilille
 DocType: Salary Slip,Earning & Deduction,ansio & vähennys
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"valinnainen, asetusta käytetään suodatettaessa eri tapahtumia"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negatiivinen arvotaso ei ole sallittu
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,Tuotantotilaus Tuote
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Tietuetta ei löydy
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kustannukset Scrapped Asset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,osittain ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kustannuspaikka on pakollinen tuotteelle {2}
 DocType: Vehicle,Policy No,Policy Ei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Hae nimikkeet tuotenipusta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Hae nimikkeet tuotenipusta
 DocType: Asset,Straight Line,Suora viiva
 DocType: Project User,Project User,Projektikäyttäjä
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Jakaa
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get opiskelijaa
 DocType: Hub Settings,Seller Country,Myyjä maa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Julkaise kohteet Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Group opiskelijat erissä
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Group opiskelijat erissä
 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 +85,Specifications,Tekniset tiedot
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,takaus/shekki päivä
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},tili {0}: emotili {1} ei kuulu yritykselle: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Hakijat
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,kaikki tähän yritykseen liittyvät tapahtumat on poistettu
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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ä
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,ilmoittautuminen Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Koeaika
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Palkanosat
 DocType: Program Enrollment Tool,New Academic Year,Uusi Lukuvuosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Tuotto / hyvityslasku
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Tuotto / hyvityslasku
 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 +28,Total Paid Amount,maksettu arvomäärä yhteensä
 DocType: Production Order Item,Transferred Qty,siirretty yksikkömäärä
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Vapaatyypit, kuten vapaa-aika, sairastuminen, jne."
 DocType: Email Digest,Send regular summary reports via Email.,Lähetä yhteenvetoraportteja säännöllisesti sähköpostitse
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Aseta oletus tilin Matkakorvauslomakkeet tyyppi {0}
 DocType: Assessment Result,Student Name,Opiskelijan nimi
 DocType: Brand,Item Manager,Tuotehallinta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll Maksettava
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,Myyntihankekantaan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Lyhenne on pakollinen
 DocType: Project,Task Progress,tehtävä Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,kori
 ,Qty to Transfer,Siirrettävä yksikkömäärä
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Noteerauksesta vihjeeksi tai asiakkaaksi
 DocType: Stock Settings,Role Allowed to edit frozen stock,rooli saa muokata jäädytettyä varastoa
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,"tuote työkalu, verotiedot"
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute lyhenne
 ,Item-wise Price List Rate,Tuotekohtainen hinta hinnastossa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Toimituskykytiedustelu
 DocType: Quotation,In Words will be visible once you save the Quotation.,"sanat näkyvät, kun tallennat tarjouksen"
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Määrä ({0}) ei voi olla osa rivillä {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Kerää maksut
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},viivakoodi {0} on jo käytössä tuotteella {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,toimituskustannusten lisäys säännöt
 DocType: Item,Opening Stock,Aloitusvarasto
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'","""aikaloki"" päivitys minuuteissa"
 DocType: Customer,From Lead,Liidistä
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,tuotantoon luovutetut tilaukset
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Valitse tilikausi ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Valitse tilikausi ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profiili vaatii POS kirjauksen
 DocType: Program Enrollment Tool,Enroll Students,Ilmoittaudu Opiskelijat
 DocType: Hub Settings,Name Token,Name Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,perusmyynti
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} myyntilaskua vastaan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektin nimi
-DocType: Supplier,Mention if non-standard receivable account,Mainitse jos ei-standardi velalliset
+DocType: Customer,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: Production Order,Required Items,Tarvittavat kohteet
 DocType: Stock Ledger Entry,Stock Value Difference,"varastoarvo, ero"
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,"Tuoteryhmä työkalu, aseta tavoitteet tälle myyjälle"
 DocType: Stock Settings,Freeze Stocks Older Than [Days],jäädytä yli [päivää] vanhat varastot
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rivi # {0}: Asset on pakollinen käyttöomaisuushankintoihin osto / myynti
-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.","yllämainituilla ehdoilla löytyy kaksi tai useampia hinnoittelusääntöjä ja prioriteettia tarvitaan, prioriteettinumero luku 0-20:n välillä, oletusarvona se on nolla (tyhjä), mitä korkeampi luku sitä suurempi prioriteetti"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","yllämainituilla ehdoilla löytyy kaksi tai useampia hinnoittelusääntöjä ja prioriteettia tarvitaan, prioriteettinumero luku 0-20:n välillä, oletusarvona se on nolla (tyhjä), mitä korkeampi luku sitä suurempi prioriteetti"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tilikautta: {0} ei ole olemassa
 DocType: Currency Exchange,To Currency,Valuuttakursseihin
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,salli seuraavien käyttäjien hyväksyä poistumissovelluksen estopäivät
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Nimike {0} ohitetaan sillä se ei ole varastotuote
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,lähetä tuotannon tilaus eteenpäin
-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.",Kaikki sovellettavat hinnoittelusäännöt tulee poistaa käytöstä ettei hinnoittelusääntöjä käytetä tähän tapahtumaan
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Kaikki sovellettavat hinnoittelusäännöt tulee poistaa käytöstä ettei hinnoittelusääntöjä käytetä tähän tapahtumaan
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Työpaikat
 ,Sales Order Trends,Myyntitilauksen trendit
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,Muita Kustannukset
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Tilikauden lopetuspäivä
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Tee toimituskykytiedustelu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Tee toimituskykytiedustelu
 DocType: Quality Inspection,Incoming,saapuva
 DocType: BOM,Materials Required (Exploded),materiaalitarve (räjäytys)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",lisää toisia käyttäjiä organisaatiosi
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,yrityksen historia
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Uutiskirjeet
 DocType: Stock Ledger Entry,Stock Ledger Entry,Varastokirjanpidon tilikirjaus
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Asiakas&gt; Asiakaspalvelu Group&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Sama viesti on tullut useita kertoja
 DocType: Department,Leave Block List,Estoluettelo
 DocType: Sales Invoice,Tax ID,Tax ID
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,Myynti Partner ja komission
 DocType: Employee Loan,Rate of Interest (%) / Year,Korkokanta (%) / vuosi
 ,Project Quantity,Project Määrä
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Yhteensä {0} kaikki kohteet on nolla, voi olla sinun pitäisi muuttaa &quot;välit perustuvat maksujen &#39;"
 DocType: Opportunity,To Discuss,Keskusteluun
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} yksikköä {1} tarvitaan {2} tapahtuman suorittamiseen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Korkokanta (%) Vuotuinen
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,paluu
 DocType: Production Order Operation,Production Order Operation,Tuotannon tilauksen toimenpiteet
 DocType: Pricing Rule,Disable,poista käytöstä
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Tila maksu on suoritettava maksu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Tila maksu on suoritettava maksu
 DocType: Project Task,Pending Review,Odottaa näkymä
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} ei voida romuttaa, koska se on jo {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kuluvaatimus yhteensä (kuluvaatimuksesta)
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rivi {0}: valuutta BOM # {1} pitäisi olla yhtä suuri kuin valittu valuutta {2}
 DocType: Journal Entry Account,Exchange Rate,Valuuttakurssi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Myyntitilausta {0} ei ole lähetetty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Myyntitilausta {0} ei ole lähetetty
 DocType: Homepage,Tag Line,Iskulause
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Kaluston hallinta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Lisää kohteita
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Lisää kohteita
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Varasto {0}: Emotili {1} ei kuulu yritykselle {2}
 DocType: Cheque Print Template,Regular,säännöllinen
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Yhteensä weightage Kaikkien Arviointikriteerit on oltava 100%
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Varastoa {0} ei ole olemassa
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Ilmoittaudu ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,"toimitus kuukaudessa, prosenttiosuudet"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valittu tuote ei voi olla erä
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valittu tuote ei voi olla erä
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Arvostus korko ei löytynyt Item {0}, jota vaaditaan tekemään kirjauksia varten {1} {2}. Jos kohde on kaupankäyntiosapuolten näytteenä eränä {1}, mainitse, että {1} Item taulukossa. Muussa tapauksessa luo saapuvan osakekauppaohjelman alkion tai maininta arvostus korko on Item kirjaa, ja yritä submiting / peruuttamalla tämän merkinnän"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% lähetteen materiaaleista toimitettu
 DocType: Project,Customer Details,"asiakas, lisätiedot"
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,syötä url parametrin vastaanottonro
 DocType: Payment Entry,Paid Amount,Maksettu arvomäärä
 DocType: Assessment Plan,Supervisor,Valvoja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,pakattavat tuotteet saatavissa varastosta
 DocType: Item Variant,Item Variant,tuotemalli
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tulos Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM romu Kohta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Toimitettu tilauksia ei voi poistaa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Toimitettu tilauksia ei voi poistaa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Määrähallinta
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Kohta {0} on poistettu käytöstä
 DocType: Employee Loan,Repay Fixed Amount per Period,Repay kiinteä määrä Period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Kirjoita kpl määrä tuotteelle {0}
 DocType: Employee External Work History,Employee External Work History,työntekijän muu työkokemus
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Opiskelijan Sähköposti ID
 DocType: Employee,Notice (days),Ilmoitus (päivää)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Malline
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Valitse kohteita tallentaa laskun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Valitse kohteita tallentaa laskun
 DocType: Employee,Encashment Date,perintä päivä
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Varastonsäätö
@@ -3847,7 +3857,7 @@
 DocType: Item Variant Attribute,Attribute,tuntomerkki
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Ilmoitathan mistä / vaihtelevan
 DocType: Serial No,Under AMC,Ylläpito voimassa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,tuotteen arvon taso on päivitetty kohdistettujen tositteiden arvomäärä kustannuksen mukaan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,tuotteen arvon taso on päivitetty kohdistettujen tositteiden arvomäärä kustannuksen mukaan
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,myynnin oletusasetukset
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,kynnys
@@ -3857,6 +3867,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Annettu
 DocType: Production Order,Warehouses,Varastot
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} hyödykkeen ei voida siirtää
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Tämä kohta on muunnelma {0} (malli).
 DocType: Workstation,per hour,Tunnissa
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Ostot
 DocType: Announcement,Announcement,Ilmoitus
@@ -3872,8 +3883,8 @@
 DocType: Account,Receivable,Saatava
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rivi # {0}: Ei saa muuttaa Toimittaja kuten ostotilaus on jo olemassa
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,roolilla jolla voi lähettää tapamtumia pääsee luottoraja asetuksiin
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Valitse tuotteet Valmistus
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Valitse tuotteet Valmistus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master data synkronointia, se saattaa kestää jonkin aikaa"
 DocType: Item,Material Issue,materiaali aihe
 DocType: Hub Settings,Seller Description,Myyjän kuvaus
 DocType: Employee Education,Qualification,Pätevyys
@@ -3885,7 +3896,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,tilattu
 DocType: Salary Detail,Component,komponentti
 DocType: Assessment Criteria,Assessment Criteria Group,Arviointikriteerit Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Avaaminen Kertyneet poistot on oltava pienempi tai yhtä suuri kuin {0}
 DocType: Warehouse,Warehouse Name,Varaston nimi
 DocType: Naming Series,Select Transaction,Valitse tapahtuma
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Anna hyväksyminen rooli tai hyväksyminen Käyttäjä
@@ -3898,7 +3909,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"ei voi peruuttaa, sillä lähetetty varaston tosite {0} on jo olemassa"
 DocType: Employee Loan,Disbursement Date,maksupäivä
 DocType: Vehicle,Vehicle,ajoneuvo
 DocType: Purchase Invoice,In Words,sanat
@@ -3912,14 +3923,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lyijy%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Poistot ja taseet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Määrä {0} {1} siirretty {2} ja {3}
 DocType: Sales Invoice,Get Advances Received,hae saadut ennakot
 DocType: Email Digest,Add/Remove Recipients,lisää / poista vastaanottajia
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},tapahtumat tuotannon tilaukseen {0} on estetty
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Asettaaksesi tämän tilikaudenoletukseksi, klikkaa ""aseta oletukseksi"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Liittyä seuraan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Yksikkömäärä vähissä
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Tuote variantti {0} ovat olemassa samoja ominaisuuksia
 DocType: Employee Loan,Repay from Salary,Maksaa maasta Palkka
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Maksupyynnön vastaan {0} {1} määräksi {2}
@@ -3937,7 +3948,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Arviointi Tulos Detail
 DocType: Employee Education,Employee Education,työntekijä koulutus
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Monista kohde ryhmä löysi erään ryhmätaulukkoon
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Sitä tarvitaan hakemaan Osa Tiedot.
 DocType: Salary Slip,Net Pay,Nettomaksu
 DocType: Account,Account,tili
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sarjanumero {0} on jo saapunut
@@ -3946,7 +3957,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Varasto {0} ei ole sidoksissa mihinkään tilin, luo / yhdistää vastaava (Asset) osuus varastoon."
 DocType: Purchase Invoice,Recurring Id,Toistuva Id
 DocType: Customer,Sales Team Details,Myyntitiimin lisätiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,poista pysyvästi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,poista pysyvästi?
 DocType: Expense Claim,Total Claimed Amount,Vaatimukset arvomäärä yhteensä
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Myynnin potentiaalisia tilaisuuksia
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Virheellinen {0}
@@ -3957,13 +3968,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup School ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Muuta Summa (Company valuutta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ei kirjanpidon kirjauksia seuraaviin varastoihin
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Tallenna asiakirja ensin
 DocType: Account,Chargeable,veloitettava
 DocType: Company,Change Abbreviation,muuta lyhennettä
 DocType: Expense Claim Detail,Expense Date,"kulu, päivä"
 DocType: Item,Max Discount (%),Max Alennus (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Viimeisen tilauksen arvo
+DocType: Task,Is Milestone,on Milestone
 DocType: Daily Work Summary,Email Sent To,Sähköposti lähetetään
 DocType: Budget,Warn,Varoita
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","muut huomiot, huomioitavat asiat tulee laittaa tähän tietueeseen"
@@ -3984,7 +3996,7 @@
 DocType: Item Attribute Value,Attribute Value,"tuntomerkki, arvo"
 ,Itemwise Recommended Reorder Level,Tuotekohtainen suositeltu täydennystilaustaso
 DocType: Salary Detail,Salary Detail,Palkka Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Ole hyvä ja valitse {0} Ensimmäinen
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Erä {0} tuotteesta {1} on vanhentunut.
 DocType: Sales Invoice,Commission,provisio
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Valmistuksen tuntilista
@@ -3996,41 +4008,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Kylmävarasto pitäisi olla vähemmän kuin % päivää
 DocType: Tax Rule,Purchase Tax Template,Myyntiverovelkojen malli
 ,Project wise Stock Tracking,"projekt työkalu, varastoseuranta"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},huoltoaikataulu {0} on olemassa kohdistettuna{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),todellinen yksikkömäärä (lähde/tavoite)
 DocType: Item Customer Detail,Ref Code,Viite Koodi
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,työntekijä tietue
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Määritä Seuraava Poistot Date
 DocType: HR Settings,Payroll Settings,Palkanlaskennan asetukset
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,täsmää linkittämättömät maksut ja laskut
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Tee tilaus
 DocType: Email Digest,New Purchase Orders,Uusi Ostotilaukset
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,kannalla ei voi olla pääkustannuspaikkaa
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Valitse Merkki ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Valitse Merkki ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Kertyneet poistot kuin
 DocType: Sales Invoice,C-Form Applicable,C-muotoa sovelletaan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Toiminta-aika on oltava suurempi kuin 0 Toiminta {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Varasto on pakollinen
 DocType: Supplier,Address and Contacts,Osoite ja yhteystiedot
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mittayksikön muunnon lisätiedot
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Pidä se web ystävällinen 900px (w) by 100px (h)
 DocType: Program,Program Abbreviation,Ohjelma lyhenne
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Tuotannon tilausta ei voi kohdistaa tuotteen mallipohjaan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,maksut on päivitetty ostokuitilla kondistettuna jokaiseen tuotteeseen
 DocType: Warranty Claim,Resolved By,ratkaissut
 DocType: Bank Guarantee,Start Date,aloituspäivä
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,kohdistaa poistumisen kaudelle
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sekkejä ja Talletukset virheellisesti selvitetty
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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,hinta
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Luoda asiakkaalle lainausmerkit
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Luoda asiakkaalle lainausmerkit
 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 +38,Bill of Materials (BOM),Osaluettelo (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Keskimääräinen aika toimittajan toimittamaan
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,arviointi tulos
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,tuntia
 DocType: Project,Expected Start Date,odotettu aloituspäivä
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,poista tuote mikäli maksuja ei voi soveltaa siihen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Maksuvälineenä on oltava sama kuin Payment Gateway valuutta
 DocType: Payment Entry,Receive,Vastaanottaa
@@ -4041,19 +4052,19 @@
 DocType: Workstation,Operating Costs,Käyttökustannukset
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Toiminta jos kuukausikulutus budjetti ylitetty
 DocType: Purchase Invoice,Submit on creation,Jättää ehdotus luomiseen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuutta {0} on {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuutta {0} on {1}
 DocType: Asset,Disposal Date,hävittäminen Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Sähköpostit lähetetään kaikille aktiivinen Yrityksen työntekijät on tietyn tunnin, jos heillä ei ole loma. Yhteenveto vastauksista lähetetään keskiyöllä."
 DocType: Employee Leave Approver,Employee Leave Approver,työntekijän poistumis hyväksyjä
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rivi {0}: täydennystilaus on jo kirjattu tälle varastolle {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ei voida vahvistaa hävityksi, sillä tarjous on tehty"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Palaute
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Tuotannon tilaus {0} on lähetettävä
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ole hyvä ja valitse alkamispäivä ja päättymispäivä Kohta {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurssi on pakollinen rivi {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Päivään ei voi olla ennen aloituspäivää
 DocType: Supplier Quotation Item,Prevdoc DocType,Edellinen tietuetyyppi
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lisää / muokkaa hintoja
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lisää / muokkaa hintoja
 DocType: Batch,Parent Batch,Parent Erä
 DocType: Cheque Print Template,Cheque Print Template,Shekki Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,kustannuspaikkakaavio
@@ -4066,7 +4077,7 @@
 ,Ordered Items To Be Delivered,Asiakkaille toimittamattomat tilaukset
 DocType: Account,Income,tulo
 DocType: Industry Type,Industry Type,teollisuus tyyppi
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Jokin meni pieleen!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Jokin meni pieleen!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Varoitus: Hakemus vapaasta sisältää päiviä joita ei ole sallittu
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Myyntilasku {0} on lähetetty
 DocType: Assessment Result Detail,Score,Pisteet
@@ -4097,17 +4108,17 @@
 DocType: Item,Variant Based On,Variant perustuvat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},nimetty painoarvo yhteensä tulee olla 100% nyt se on {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,omat toimittajat
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ei voi asettaa hävityksi sillä myyntitilaus on tehty
+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
 DocType: Request for Quotation Item,Supplier Part No,Toimittaja osanumero
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saadut
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Ei voi vähentää, kun kategoria on &quot;arvostus&quot; tai &quot;Vaulation ja Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Saadut
 DocType: Lead,Converted,muunnettu
 DocType: Item,Has Serial No,on sarjanumero
 DocType: Employee,Date of Issue,aiheen päivä
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: valitse {0} on {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: valitse {0} on {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rivi # {0}: Aseta toimittaja kohteen {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rivi {0}: Tuntia arvon on oltava suurempi kuin nolla.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Sivsuton kuvaa {0} kohteelle {1} ei löydy
 DocType: Issue,Content Type,sisällön tyyppi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tietokone
 DocType: Item,List this Item in multiple groups on the website.,Listaa tästä Kohta useisiin ryhmiin verkkosivuilla.
@@ -4116,20 +4127,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Laskutusvaluutta on oltava yhtä suuri kuin joko oletus comapany valuuttaa tai osapuoli tilivaluutta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,jätä perintä
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mitä tämä tekee?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Varastoon
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Kaikki Opiskelijavalinta
 ,Average Commission Rate,keskimääräinen provisio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,Varastoimattoman nimikkeen 'Sarjanumeroitu' -arvo ei voi olla 'kyllä'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,osallistumisia ei voi merkitä tuleville päiville
 DocType: Pricing Rule,Pricing Rule Help,"Hinnoittelusääntö, ohjeet"
 DocType: School House,House Name,Talon nimi
 DocType: Purchase Taxes and Charges,Account Head,tilin otsikko
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,sähköinen
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisää loput organisaatiosi käyttäjille. Voit myös lisätä kutsua Asiakkaat portaaliin lisäämällä ne Yhteydet
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lisää loput organisaatiosi käyttäjille. Voit myös lisätä kutsua Asiakkaat portaaliin lisäämällä ne Yhteydet
 DocType: Stock Entry,Total Value Difference (Out - In),arvoero (ulos-sisään) yhteensä
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4138,7 +4149,7 @@
 DocType: Item,Customer Code,asiakkaan koodi
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Syntymäpäivämuistutus {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,päivää edellisestä tilauksesta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit tilin on oltava tase tili
 DocType: Buying Settings,Naming Series,Nimeä sarjat
 DocType: Leave Block List,Leave Block List Name,nimi
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Vakuutus Aloituspäivä pitäisi olla alle Insurance Päättymispäivä
@@ -4153,9 +4164,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Palkka Slip työntekijöiden {0} on jo luotu kellokortti {1}
 DocType: Vehicle Log,Odometer,Matkamittari
 DocType: Sales Order Item,Ordered Qty,tilattu yksikkömäärä
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Nimike {0} on poistettu käytöstä
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Nimike {0} on poistettu käytöstä
 DocType: Stock Settings,Stock Frozen Upto,varasto jäädytetty asti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Osaluettelo ei sisällä yhtäkään varastonimikettä
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Ajanjakso mistä ja mihin päivämäärään ovat pakollisia toistuville {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Tehtävä
 DocType: Vehicle Log,Refuelling Details,Tankkaaminen tiedot
@@ -4165,8 +4176,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Viimeisin osto korko ei löytynyt
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kirjoita Off Määrä (Yrityksen valuutta)
 DocType: Sales Invoice Timesheet,Billing Hours,Laskutus tuntia
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Oletus BOM varten {0} ei löytynyt
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rivi # {0}: Aseta täydennystilauksen yksikkömäärä
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Kosketa kohteita lisätä ne tästä
 DocType: Fees,Program Enrollment,Ohjelma Ilmoittautuminen
 DocType: Landed Cost Voucher,Landed Cost Voucher,"Kohdistetut kustannukset, tosite"
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Aseta {0}
@@ -4188,7 +4200,7 @@
 DocType: Maintenance Visit,Maintenance Date,"huolto, päivä"
 DocType: Purchase Invoice Item,Rejected Serial No,Hylätty sarjanumero
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Vuoden aloituspäivä tai lopetuspäivä on päällekkäinen {0}. Välttämiseksi aseta yritys
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},aloituspäivä tulee olla pienempi kuin päättymispäivä tuotteelle {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.","esim ABCD. ##### mikäli sarjat on määritetty ja sarjanumeroa ei ole mainittu toiminnossa, tällöin automaattinen sarjanumeron teko pohjautuu tähän sarjaan, mikäli haluat tälle tuotteelle aina nimenomaisen sarjanumeron jätä tämä kohta tyhjäksi."
 DocType: Upload Attendance,Upload Attendance,Tuo osallistumistietoja
@@ -4263,7 +4275,6 @@
 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ä
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tilikauden alkamispäivä ja tilikauden päättymispäivä on asetettu tilikaudelle {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Tilityspäivä päivitetty
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Erä
@@ -4308,14 +4319,14 @@
 DocType: Bin,Reserved Qty for Production,Varattu Määrä for Production
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Jätä valitsematta jos et halua pohtia erän samalla tietenkin toimiviin ryhmiin.
 DocType: Asset,Frequency of Depreciation (Months),Taajuus Poistot (kuukautta)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Luottotili
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Luottotili
 DocType: Landed Cost Item,Landed Cost Item,"Kohdistetut kustannukset, tuote"
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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ä
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Asennus yksinkertainen sivusto organisaatiolleni
 DocType: Payment Reconciliation,Receivable / Payable Account,Saatava / maksettava tili
 DocType: Delivery Note Item,Against Sales Order Item,Myyntitilauksen kohdistus / nimike
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ilmoitathan Taito Vastinetta määrite {0}
 DocType: Item,Default Warehouse,oletus varasto
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},budjettia ei voi nimetä ryhmätiliin {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Syötä pääkustannuspaikka
@@ -4358,7 +4369,7 @@
 DocType: Opportunity Item,Basic Rate,perushinta
 DocType: GL Entry,Credit Amount,Luoton määrä
 DocType: Cheque Print Template,Signatory Position,Allekirjoittaja Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Aseta kadonneeksi
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Aseta kadonneeksi
 DocType: Timesheet,Total Billable Hours,Yhteensä laskutettavat tunnit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksukuitin Huomautus
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tämä perustuu asiakasta koskeviin tapahtumiin. Katso lisätietoja ao. aikajanalta
@@ -4372,11 +4383,11 @@
 ,Items To Be Requested,tuotteet joita on pyydettävä
 DocType: Purchase Order,Get Last Purchase Rate,käytä viimeisimmän edellisen oston hintoja
 DocType: Company,Company Info,yrityksen tiedot
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Valitse tai lisätä uuden asiakkaan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Valitse tai lisätä uuden asiakkaan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kustannuspaikkaa vaaditaan varata kulukorvauslasku
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),sovellus varat (vastaavat)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tämä perustuu työntekijän läsnäoloihin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Luottotililtä
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4385,13 +4396,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Osto Määrä
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Toimittaja noteeraus {0} luotu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Loppu vuosi voi olla ennen Aloitusvuosi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,työntekijä etuudet
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Aseta oletus Holiday List Työntekijä {0} tai Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ei löydy
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ei löydy
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,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}"
@@ -4400,15 +4411,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lukema 3
 ,Hub,hubi
 DocType: GL Entry,Voucher Type,Tositetyyppi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Hinnastoa ei löydy tai se on poistettu käytöstä
 DocType: Employee Loan Application,Approved,hyväksytty
 DocType: Pricing Rule,Price,Hinta
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"työntekijä vapautettu {0} tulee asettaa ""vasemmalla"""
 DocType: Guardian,Guardian,holhooja
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,työntekijälle {1} on tehty arviointi {0} ilmoitettuna päivänä
 DocType: Employee,Education,koulutus
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,kampanja nimennyt
 DocType: Employee,Current Address Is,nykyinen osoite on
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,muokattu
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Vapaaehtoinen. Asettaa yhtiön oletusvaluuttaa, jos ei ole määritelty."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,"kirjanpito, päiväkirjakirjaukset"
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Kpl at varastosta
@@ -4417,7 +4430,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rivi {0}: Party / Tili ei vastaa {1} / {2} ja {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Syötä kulutili
 DocType: Account,Stock,Varasto
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rivi # {0}: Reference Document Type on yksi Ostotilaus, Ostolasku tai Päiväkirjakirjaus"
 DocType: Employee,Current Address,nykyinen osoite
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","mikäli tuote on toisen tuotteen malli tulee tuotteen kuvaus, kuva, hinnoittelu, verot ja muut tiedot oletuksena mallipohjasta ellei oletusta ole erikseen poistettu"
 DocType: Serial No,Purchase / Manufacture Details,Oston/valmistuksen lisätiedot
@@ -4445,7 +4458,7 @@
 DocType: Hub Settings,Hub Settings,hubi asetukset
 DocType: Project,Gross Margin %,bruttokate %
 DocType: BOM,With Operations,Toiminnoilla
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Kirjaukset on jo tehty valuutassa {0} yhtiön {1}. Valitse saamisen tai maksettava tilille valuutta {0}.
 DocType: Asset,Is Existing Asset,Onko Olemassa Asset
 DocType: Salary Detail,Statistical Component,tilastollinen Komponentti
 ,Monthly Salary Register,Kuukaisittainen palkkakirjanpito
@@ -4468,7 +4481,7 @@
 DocType: Assessment Plan,Room,Huone
 DocType: Purchase Order,Advance Paid,ennakkoon maksettu
 DocType: Item,Item Tax,Tuotteen vero
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiaalin Toimittaja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiaalin Toimittaja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Valmistevero Lasku
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Kynnys {0}% esiintyy useammin kuin kerran
 DocType: Expense Claim,Employees Email Id,työntekijän sähköpostiosoite
@@ -4499,9 +4512,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Kiinnitä Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,provisio
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Tee Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Tee Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,estä poistumissovellukset osastoittain
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksu tyyppi on yksi vastaanottaminen, Pay ja sisäinen siirto"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytiikka
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Ostoskori on tyhjä
 DocType: Vehicle,Model,Malli
@@ -4512,6 +4525,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,salli tuotanto lomapäivinä
 DocType: Sales Order,Customer's Purchase Order Date,asiakkaan ostotilaus päivä
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,osakepääoma
+DocType: Shopping Cart Settings,Show Public Attachments,Näytä Julkinen Liitteet
 DocType: Packing Slip,Package Weight Details,"Pakkauspaino, lisätiedot"
 DocType: Payment Gateway Account,Payment Gateway Account,Maksu Gateway tili
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Maksun jälkeen valmistumisen ohjata käyttäjän valitulle sivulle.
@@ -4530,15 +4544,15 @@
 DocType: Batch,Expiry Date,vanhenemis päivä
 ,Supplier Addresses and Contacts,toimittajien osoitteet ja yhteystiedot
 ,accounts-browser,tilit-selain
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Ole hyvä ja valitse Luokka ensin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Ole hyvä ja valitse Luokka ensin
 apps/erpnext/erpnext/config/projects.py +13,Project master.,projekti valvonta
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Sallia yli-laskutus tai over-tilaus, päivitä &quot;avustus&quot; varastossa Settings tai Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"älä käytä symbooleita,  $ jne valuuttojen vieressä"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(1/2 päivä)
 DocType: Supplier,Credit Days,kredit päivää
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tee Student Erä
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tee Student Erä
 DocType: Leave Type,Is Carry Forward,siirretääkö
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,hae tuotteita BOM:sta
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,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/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rivi # {0}: julkaisupäivä on oltava sama kuin ostopäivästä {1} asset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Syötä Myyntitilaukset edellä olevasta taulukosta
@@ -4555,7 +4569,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},rivi {0}: debet kirjausta ei voi kohdistaa {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ole hyvä setup numerointi sarjan läsnäolevaksi Setup&gt; numerointi Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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-CA.csv b/erpnext/translations/fr-CA.csv
index d23ee64..b1bada3 100644
--- a/erpnext/translations/fr-CA.csv
+++ b/erpnext/translations/fr-CA.csv
@@ -1,7 +1,7 @@
 DocType: Sales Order Item,Ordered Qty,Quantité commandée
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Le Centre de Coûts {2} ne fait pas partie de la Société {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Soit un montant au débit ou crédit est nécessaire pour {2}
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} n'est pas associé à un Compte de Partie {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} n'est pas associé à un Compte de Partie {2}
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),Taux de la Liste de Prix (Devise de la Compagnie)
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Client est requis envers un compte à recevoir {2}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: L'entrée comptable pour {2} ne peut être faite qu'en devise: {3}
diff --git a/erpnext/translations/fr.csv b/erpnext/translations/fr.csv
index 3bb30cf..bfbba6d 100644
--- a/erpnext/translations/fr.csv
+++ b/erpnext/translations/fr.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Loué
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Applicable pour l'Utilisateur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Un Ordre de Fabrication Arrêté ne peut pas être annulé, remettez le d'abord en marche pour l'annuler"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Un Ordre de Fabrication Arrêté ne peut pas être annulé, remettez le d'abord en marche pour l'annuler"
 DocType: Vehicle Service,Mileage,Kilométrage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Voulez-vous vraiment mettre cet actif au rebut ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Sélectionner le Fournisseur par Défaut
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Sélectionner le Fournisseur par Défaut
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Devise est nécessaire pour la liste de prix {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sera calculé lors de la transaction.
 DocType: Purchase Order,Customer Contact,Contact Client
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Solde pour {0} ne peut pas être inférieur à zéro ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 minutes Par Défaut
 DocType: Leave Type,Leave Type Name,Nom du Type de Congé
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Afficher ouverte
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afficher ouverte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Mise à jour des Séries Réussie
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Règlement
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accumulation des Journaux d'Écritures Soumis
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Statut d'Expiration d'Article du Lot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Traite Bancaire
 DocType: Mode of Payment Account,Mode of Payment Account,Compte du Mode de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Afficher les Variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Afficher les Variantes
 DocType: Academic Term,Academic Term,Terme Académique
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Matériel
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantité
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Quantité
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Le tableau de comptes ne peut être vide.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Prêts (Passif)
 DocType: Employee Education,Year of Passing,Année de Passage
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Référence : %s, Code de l’Article: % s et Client: %s"
 DocType: Item,Country of Origin,Pays d'Origine
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,En Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Ouvrir les Questions
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Soins de Santé
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Retard de paiement (jours)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Frais de Service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Facture
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numéro de Série: {0} est déjà référencé dans la Facture de Vente: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Facture
 DocType: Maintenance Schedule Item,Periodicity,Périodicité
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Exercice Fiscal {0} est nécessaire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Date de Livraison Prévue est antérieure à la Date de la Commande Client
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attacher un fichier .csv avec deux colonnes, une pour l'ancien nom et une pour le nouveau nom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} dans aucun Exercice actif.
 DocType: Packed Item,Parent Detail docname,Nom de Document du Détail Parent
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Référence: {0}, Code de l&#39;article: {1} et Client: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Journal
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ouverture d'un Emploi.
 DocType: Item Attribute,Increment,Incrément
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Sélectionner l'Entrepôt ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Sélectionner l'Entrepôt ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicité
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,La même Société a été entrée plus d'une fois
 DocType: Employee,Married,Marié
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Non autorisé pour {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obtenir les articles de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non autorisé pour {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Obtenir les articles de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ne peut pas être mis à jour pour le Bon de Livraison {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produit {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Aucun article référencé
 DocType: Payment Reconciliation,Reconcile,Réconcilier
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Épicerie
 DocType: Quality Inspection Reading,Reading 1,Lecture 1
 DocType: Process Payroll,Make Bank Entry,Créer une Écriture Bancaire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fonds de Pension
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La Date de l’Amortissement Suivant ne peut pas être avant la Date d’Achat
 DocType: SMS Center,All Sales Person,Tous les Commerciaux
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Répartition Mensuelle** vous aide à diviser le Budget / la Cible sur plusieurs mois si vous avez de la saisonnalité dans votre entreprise.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Pas d'objets trouvés
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Pas d'objets trouvés
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Grille des Salaires Manquante
 DocType: Lead,Person Name,Nom de la Personne
 DocType: Sales Invoice Item,Sales Invoice Item,Article de la Facture de Vente
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","e.g. ""École Primaire"" ou ""Université"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapports de Stock
 DocType: Warehouse,Warehouse Detail,Détail de l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},La limite de crédit a été franchie pour le client {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être postérieure à la Date de Fin de l'Année Académique à laquelle le terme est lié (Année Académique {}). Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article
 DocType: Vehicle Service,Brake Oil,Liquide de Frein
 DocType: Tax Rule,Tax Type,Type de Taxe
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}
 DocType: BOM,Item Image (if not slideshow),Image de l'Article (si ce n'est diaporama)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Un Client existe avec le même nom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif Horaire / 60) * Temps Réel d’Opération
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Sélectionner LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Sélectionner LDM
 DocType: SMS Log,SMS Log,Journal des SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Coût des Articles Livrés
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Le jour de vacances {0} n’est pas compris entre la Date Initiale et la Date Finale
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Écoles
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Aucun congé trouvé pour l’employé {0} pour {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Veuillez d’abord entrer une Société
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Veuillez d’abord sélectionner une Société
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Veuillez d’abord sélectionner une Société
 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
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Montant Réclamé
 DocType: Employee,Mr,M.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Groupe de clients en double trouvé dans le tableau des groupes de clients
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fournisseur / Type de Fournisseur
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Fournisseur / Type de Fournisseur
 DocType: Naming Series,Prefix,Préfixe
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consommable
 DocType: Employee,B-,B-
@@ -190,24 +192,24 @@
 DocType: Training Result Employee,Grade,Note
 DocType: Sales Invoice Item,Delivered By Supplier,Livré par le Fournisseur
 DocType: SMS Center,All Contact,Tout Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Ordre de Production déjà créé pour tous les articles avec LDM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salaire Annuel
 DocType: Daily Work Summary,Daily Work Summary,Récapitulatif Quotidien de Travail
 DocType: Period Closing Voucher,Closing Fiscal Year,Clôture de l'Exercice
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} est gelée
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} est gelée
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Veuillez sélectionner une Société Existante pour créer un Plan de Compte
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Charges de Stock
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Sélectionnez Target Warehouse
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Sélectionner l'Entrepôt Cible
 apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,Veuillez entrer l’Email de Contact Préférré
 DocType: Journal Entry,Contra Entry,Contre-passation
 DocType: Journal Entry Account,Credit in Company Currency,Crédit dans la Devise de la Société
 DocType: Delivery Note,Installation Status,Etat de l'Installation
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Voulez-vous mettre à jour la fréquentation? <br> Présents: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},La Qté Acceptée + Rejetée doit être égale à la quantité Reçue pour l'Article {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Fournir les Matières Premières pour l'Achat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Au moins un mode de paiement est nécessaire pour une facture de PDV
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Au moins un mode de paiement est nécessaire pour une facture de PDV
 DocType: Products Settings,Show Products as a List,Afficher les Produits en Liste
 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échargez le modèle, remplissez les données appropriées et joignez le fichier modifié.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Créer une Écriture d'Amortissement
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Type de Demande
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Créer un Employé
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Créer un Employé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio/Télévision
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Exécution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Détails des opérations effectuées.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan pour les visites de maintenance.
 DocType: SMS Settings,Enter url parameter for message,Entrez le paramètre url pour le message
 DocType: POS Profile,Customer Groups,Groupes de Clients
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,États Financiers
 DocType: Guardian,Students,Étudiants
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Règles pour l’application des tarifs et des remises.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,La Liste de Prix doit être applicable pour les Achats et les Ventes
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Montant de l'avance ne peut être supérieur à {0} {1}
 DocType: Naming Series,Series List for this Transaction,Liste des Séries pour cette Transaction
 DocType: Company,Default Payroll Payable Account,Compte de Paie par Défaut
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Metter à jour le Groupe d'Email
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Metter à jour le Groupe d'Email
 DocType: Sales Invoice,Is Opening Entry,Est Écriture Ouverte
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mentionner si le compte débiteur applicable n'est pas standard
 DocType: Course Schedule,Instructor Name,Nom de l'Instructeur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Pour l’Entrepôt est requis avant de Soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Pour l’Entrepôt est requis avant de Soumettre
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Reçu Le
 DocType: Sales Partner,Reseller,Revendeur
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Si cochée, comprendra des articles hors stock dans les Demandes de Matériel."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Pour l'Article de la Facture de Vente
 ,Production Orders in Progress,Ordres de Production en Cours
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Trésorerie Nette des Financements
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Le Stockage Local est plein, l’enregistrement n’a pas fonctionné"
 DocType: Lead,Address & Contact,Adresse &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Ajouter les congés inutilisés des précédentes allocations
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Récurrent Suivant {0} sera créé le {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Montant Total des Coûts (via Feuille de Temps)
 DocType: Item Website Specification,Item Website Specification,Spécification de l'Article sur le Site Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Laisser Verrouillé
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Écritures Bancaires
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},L'article {0} a atteint sa fin de vie le {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Écritures Bancaires
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Annuel
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Article de Réconciliation du Stock
 DocType: Stock Entry,Sales Invoice No,N° de la Facture de Vente
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Publier dans le Hub
 DocType: Student Admission,Student Admission,Admission des Étudiants
 ,Terretory,Territoire
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Article {0} est annulé
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Demande de Matériel
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Article {0} est annulé
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Demande de Matériel
 DocType: Bank Reconciliation,Update Clearance Date,Mettre à Jour la Date de Compensation
 DocType: Item,Purchase Details,Détails de l'Achat
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Article {0} introuvable dans la table 'Matières Premières Fournies' dans la Commande d'Achat {1}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Chèques et Dépôts en suspens à compenser
 DocType: Item,Synced With Hub,Synchronisé avec le Hub
 DocType: Vehicle,Fleet Manager,Gestionnaire de Flotte
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Mauvais Mot De Passe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Mauvais Mot De Passe
 DocType: Item,Variant Of,Variante De
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Qté Terminée ne peut pas être supérieure à ""Quantité de Fabrication"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Qté Terminée ne peut pas être supérieure à ""Quantité de Fabrication"""
 DocType: Period Closing Voucher,Closing Account Head,Responsable du Compte Clôturé
 DocType: Employee,External Work History,Historique de Travail Externe
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Erreur de Référence Circulaire
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifier par Email lors de la création automatique de la Demande de Matériel
 DocType: Journal Entry,Multi Currency,Multi-Devise
 DocType: Payment Reconciliation Invoice,Invoice Type,Type de Facture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Bon de Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Bon de Livraison
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configuration des Impôts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Coût des Immobilisations Vendus
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,L’Écriture de Paiement a été modifié après que vous l’ayez récupérée. Veuillez la récupérer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
-DocType: Grade Interval,Min Score,Score Minimal
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} est entré deux fois dans la Taxe de l'Article
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Résumé de la semaine et des activités en suspens
 DocType: Student Applicant,Admitted,Admis
 DocType: Workstation,Rent Cost,Coût de la Location
@@ -387,10 +389,10 @@
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Veuillez sélectionner le mois et l'année
 DocType: Employee,Company Email,E-mail de la Société
 DocType: GL Entry,Debit Amount in Account Currency,Montant Débiteur en Devise du Compte
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valeur de la commande
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valeur de la Commande
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transactions Bancaires/de Trésorerie avec une partie ou pour transfert interne
 DocType: Shipping Rule,Valid for Countries,Valable pour les Pays
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total de la Commande Considéré
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Intitulé de poste (e.g.  Directeur Général, Directeur...)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Veuillez entrer une valeur pour 'Répéter le jour du mois'
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ligne #{0} : La Facture d'Achat ne peut être faite pour un actif existant {1}
 DocType: Item Tax,Tax Rate,Taux d'Imposition
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} déjà alloué pour l’Employé {1} pour la période {2} à {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Sélectionner l'Article
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Sélectionner l'Article
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Facture d’Achat {0} est déjà soumise
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ligne # {0} : Le N° de Lot doit être le même que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convertir en non-groupe
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lot d'un Article.
 DocType: C-Form Invoice Detail,Invoice Date,Date de la Facture
 DocType: GL Entry,Debit Amount,Montant du Débit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Il ne peut y avoir qu’un Compte par Société dans {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Veuillez voir la pièce jointe
 DocType: Purchase Order,% Received,% Reçu
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Créer des Groupes d'Étudiants
@@ -425,8 +427,8 @@
 DocType: Packed Item,Packed Item,Article Emballé
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Paramètres par défaut pour les transactions d'achat.
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Des Coûts d'Activité existent pour l'Employé {0} pour le Type d'Activité - {1}
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Champ obligatoire - Obtenir des étudiants de
-DocType: Program Enrollment,Enrolled courses,Cours inscrits
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Champ Obligatoire - Obtenir des étudiants de
+DocType: Program Enrollment,Enrolled courses,Cours Inscrits
 DocType: Currency Exchange,Currency Exchange,Change de Devise
 DocType: Asset,Item Name,Nom d'Article
 DocType: Authorization Rule,Approving User  (above authorized value),Utilisateur Approbateur (valeurs autorisées ci-dessus)
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Appel d'Offre
 DocType: Salary Slip Timesheet,Working Hours,Heures de Travail
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Changer le numéro initial/actuel d'une série existante.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Créer un nouveau Client
-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 Prix continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité pour résoudre les conflits."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Créer des Commandes d'Achat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Créer un nouveau Client
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Si plusieurs Règles de Prix continuent de prévaloir, les utilisateurs sont invités à définir manuellement la priorité pour résoudre les conflits."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Créer des Commandes d'Achat
 ,Purchase Register,Registre des Achats
 DocType: Course Scheduling Tool,Rechedule,Replanifier
 DocType: Landed Cost Item,Applicable Charges,Frais Applicables
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) doit avoir le rôle ‘Approbateur de Congés'
 DocType: Purchase Receipt,Vehicle Date,Date du Véhicule
 DocType: Student Log,Medical,Médical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Raison de perdre
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Raison de perdre
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Le Responsable du Prospect ne peut pas être identique au Prospect
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Le montant alloué ne peut pas être plus grand que le montant non ajusté
 DocType: Announcement,Receiver,Récepteur
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantité et Taux
 DocType: Delivery Note,% Installed,% Installé
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Les Salles de Classe / Laboratoires etc. où des conférences peuvent être programmées.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fournisseur&gt; Type de Fournisseur
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Veuillez d’abord entrer le nom de l'entreprise
 DocType: Purchase Invoice,Supplier Name,Nom du Fournisseur
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lire le manuel d’ERPNext
@@ -475,24 +478,25 @@
 DocType: Production Order,Not Started,Non Commencé
 DocType: Lead,Channel Partner,Partenaire de Canal
 DocType: Account,Old Parent,Grand Parent
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Champ obligatoire - Année académique
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Champ Obligatoire - Année Académique
 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 fera partie de cet Email. Chaque transaction a une introduction séparée.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Veuillez définir le compte créditeur par défaut pour la société {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Paramètres globaux pour tous les processus de fabrication.
 DocType: Accounts Settings,Accounts Frozen Upto,Comptes Gelés Jusqu'au
 DocType: SMS Log,Sent On,Envoyé le
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} sélectionné à plusieurs reprises dans le Tableau des Attributs
 DocType: HR Settings,Employee record is created using selected field. ,Le dossier de l'employé est créé en utilisant le champ sélectionné.
 DocType: Sales Order,Not Applicable,Non Applicable
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Données de Base des Vacances
 DocType: Request for Quotation Item,Required Date,Date Requise
 DocType: Delivery Note,Billing Address,Adresse de Facturation
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Veuillez entrer le Code d'Article.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Veuillez entrer le Code d'Article.
 DocType: BOM,Costing,Coût
 DocType: Tax Rule,Billing County,Département de Facturation
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Si cochée, le montant de la taxe sera considéré comme déjà inclus dans le Taux d'Impression / Prix d'Impression"
 DocType: Request for Quotation,Message for Supplier,Message pour le Fournisseur
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,Qté Totale
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2 Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,ID Email du Tuteur2
 DocType: Item,Show in Website (Variant),Afficher dans le Website (Variant)
 DocType: Employee,Health Concerns,Problèmes de Santé
 DocType: Process Payroll,Select Payroll Period,Sélectionner la Période de Paie
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Du N° de Colis
 DocType: Item Attribute,To Range,Au Rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titres et Dépôts
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossible de modifier la méthode de valorisation, car il existe des transactions sur certains articles ne possèdant pas leur propre méthode de valorisation"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total des Congés attribués est obligatoire
 DocType: Job Opening,Description of a Job Opening,Description d'une Nouvelle Offre d’Emploi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activités en Attente pour aujourd'hui
@@ -519,24 +524,24 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Revenu Direct
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Impossible de filtrer sur le Compte , si les lignes sont regroupées par Compte"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Agent Administratif
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sélectionnez le cours
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Veuillez sélectionner un Cours
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Veuillez sélectionner une Société
 DocType: Stock Entry Detail,Difference Account,Compte d’Écart
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Impossible de fermer une tâche si tâche dépendante {0} n'est pas fermée.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Veuillez entrer l’Entrepôt pour lequel une Demande de Matériel sera faite
 DocType: Production Order,Additional Operating Cost,Coût d'Exploitation Supplémentaires
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Produits de Beauté
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
 DocType: Shipping Rule,Net Weight,Poids Net
 DocType: Employee,Emergency Phone,Téléphone d'Urgence
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acheter
 ,Serial No Warranty Expiry,Expiration de Garantie du N° de Série
 DocType: Sales Invoice,Offline POS Name,Nom du PDV Hors-ligne`
-apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Veuillez définir la note pour le Seuil 0%
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Veuillez définir une note pour le Seuil 0%
 DocType: Sales Order,To Deliver,À Livrer
 DocType: Purchase Invoice Item,Item,Article
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,N° de série de l'article ne peut pas être une fraction
 DocType: Journal Entry,Difference (Dr - Cr),Écart (Dr - Cr )
 DocType: Account,Profit and Loss,Pertes et Profits
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestion de la Sous-traitance
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incrément ne peut pas être 0
 DocType: Production Planning Tool,Material Requirement,Exigence Matériel
 DocType: Company,Delete Company Transactions,Supprimer les Transactions de la Société
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ajouter / Modifier Taxes et Charges
 DocType: Purchase Invoice,Supplier Invoice No,N° de Facture du Fournisseur
 DocType: Territory,For reference,Pour référence
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Article Remarque d'Installation
 DocType: Production Plan Item,Pending Qty,Qté en Attente
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} n'est pas actif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} n'est pas actif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS envoyé aux numéros suivants : {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurez les dimensions du chèque pour l'impression
 DocType: Salary Slip,Salary Slip Timesheet,Feuille de Temps de la Fiche de Paie
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Total de la Commission
 DocType: Pricing Rule,Sales Partner,Partenaire Commercial
 DocType: Buying Settings,Purchase Receipt Required,Reçu d’Achat Requis
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Le Taux de Valorisation est obligatoire si un Stock Initial est entré
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Aucun enregistrement trouvé dans la table Facture
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Veuillez d’abord sélectionner une Société et le Type de la Partie
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Exercice comptable / financier
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valeurs Accumulées
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Désolé, les N° de Série ne peut pas être fusionnés"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Créer une Commande Client
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Créer une Commande Client
 DocType: Project Task,Project Task,Tâche du Projet
 ,Lead Id,Id du Prospect
 DocType: C-Form Invoice Detail,Grand Total,Total TTC
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Reprendre la Pièce Jointe
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Répéter Clients
 DocType: Leave Control Panel,Allocate,Allouer
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retour de Ventes
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Retour de Ventes
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Remarque : Le total des congés alloués {0} ne doit pas être inférieur aux congés déjà approuvés {1} pour la période
 DocType: Announcement,Posted By,Posté par
 DocType: Item,Delivered by Supplier (Drop Ship),Livré par le Fournisseur (Expédition Directe)
@@ -604,9 +609,9 @@
 DocType: Quotation,Quotation To,Devis Pour
 DocType: Lead,Middle Income,Revenu Intermédiaire
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Ouverture (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UDM par défaut différente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Le montant alloué ne peut être négatif
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Configurez la société
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Veuillez définir la Société
 DocType: Purchase Order Item,Billed Amt,Mnt Facturé
 DocType: Training Result Employee,Training Result Employee,Résultat de la Formation – Employé
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,Un Entrepôt logique dans lequel les entrées en stock sont faites.
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Feuille de Temps de la Facture de Vente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N° et Date de Référence sont nécessaires pour {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Sélectionner Compte de Crédit pour faire l'Écriture Bancaire
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Créer des dossiers Employés pour gérer les congés, les notes de frais et la paie"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Ajouter à la Base de Connaissances
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Rédaction de Propositions
 DocType: Payment Entry Deduction,Payment Entry Deduction,Déduction d’Écriture de Paiement
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' n'est pas dans l’Exercice {2}
 DocType: Buying Settings,Settings for Buying Module,Réglages pour le Module d'Achats
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},L'actif {0} ne fait pas partie à la société {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Veuillez d’abord entrer un Reçu d'Achat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Veuillez d’abord entrer un Reçu d'Achat
 DocType: Buying Settings,Supplier Naming By,Nomenclature de Fournisseur Par
 DocType: Activity Type,Default Costing Rate,Coût de Revient par Défaut
 DocType: Maintenance Schedule,Maintenance Schedule,Échéancier d'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.","Les Règles de Tarification sont ensuite filtrées en fonction des Clients, des Groupes de Clients, des Régions, des Fournisseurs, des Groupes de Fournisseurs, des Campagnes, des Partenaires Commerciaux, etc."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Les Règles de Tarification sont ensuite filtrées en fonction des Clients, des Groupes de Clients, des Régions, des Fournisseurs, des Groupes de Fournisseurs, des Campagnes, des Partenaires Commerciaux, etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variation Nette des Stocks
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Gestion des Prêts des Employés
 DocType: Employee,Passport Number,Numéro de Passeport
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relation avec Tuteur2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Directeur
 DocType: Payment Entry,Payment From / To,Paiement De / À
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalle de Date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Le même article 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
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,En Minutes
 DocType: Issue,Resolution Date,Date de Résolution
 DocType: Student Batch Name,Batch Name,Nom du Lot
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Feuille de Temps créée :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Feuille de Temps créée :
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inscrire
 DocType: Selling Settings,Customer Naming By,Client Nommé par
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Affichera l'étudiant comme Présent dans le Rapport Mensuel de Présence des Étudiants
@@ -695,12 +699,12 @@
 DocType: Production Order Operation,Actual Start Time,Heure de Début Réelle
 DocType: BOM Operation,Operation Time,Heure de l'Opération
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Terminer
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
 DocType: Timesheet,Total Billed Hours,Total des Heures Facturées
 DocType: Journal Entry,Write Off Amount,Montant de la Reprise
 DocType: Journal Entry,Bill No,Numéro de Facture
 DocType: Company,Gain/Loss Account on Asset Disposal,Compte de Cessions des Immobilisations
-DocType: Vehicle Log,Service Details,Détails du service
+DocType: Vehicle Log,Service Details,Détails du Service
 DocType: Purchase Invoice,Quarterly,Trimestriel
 DocType: Selling Settings,Delivery Note Required,Bon de Livraison Requis
 DocType: Bank Guarantee,Bank Guarantee Number,Numéro de Garantie Bancaire
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Présence des Étudiants
 DocType: Sales Invoice Timesheet,Time Sheet,Feuille de Temps
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Enregistrer les Matières Premières sur la Base de
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Veuillez entrer les détails de l’article
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Veuillez entrer les détails de l’article
 DocType: Interest,Interest,Intérêt
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Prévente
 DocType: Purchase Receipt,Other Details,Autres Détails
@@ -720,24 +724,23 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,L’Écriture de Paiement est déjà créée
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Actuel
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Ligne #{0} : L’Actif {1} n’est pas lié à l'Article {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Aperçu Fiche de Salaire
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Aperçu Fiche de Salaire
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Le compte {0} a été entré plusieurs fois
 DocType: Account,Expenses Included In Valuation,Frais Inclus dans la Valorisation
 DocType: Hub Settings,Seller City,Ville du Vendeur
 ,Absent Student Report,Rapport des Absences
 DocType: Email Digest,Next email will be sent on:,Le prochain Email sera envoyé le :
 DocType: Offer Letter Term,Offer Letter Term,Terme de la Lettre de Proposition
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,L'article a des variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,L'article a des 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 du Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Société {0} n'existe pas
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Type d'Arbre
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Type d'Arbre
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qté Consommée Par Unité
 DocType: Serial No,Warranty Expiry Date,Date d'Expiration de la Garantie
 DocType: Material Request Item,Quantity and Warehouse,Quantité et Entrepôt
 DocType: Sales Invoice,Commission Rate (%),Taux de Commission (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez configurer Naming Series pour {0} via Setup&gt; Paramètres&gt; Naming Series
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sélectionnez le programme
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Veuillez sélectionner un Programme
 DocType: Project,Estimated Cost,Coût Estimé
 DocType: Purchase Order,Link to material requests,Lien vers les demandes de matériaux
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,Aérospatial
@@ -754,7 +757,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Montant Reçu (Devise Société)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Un prospect doit être sélectionné si l'Opportunité est créée à partir d’un Prospect
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Veuillez sélectionnez les jours de congé hebdomadaires
 DocType: Production Order Operation,Planned End Time,Heure de Fin Prévue
 ,Sales Person Target Variance Item Group-Wise,Variance d'Objectifs des Commerciaux par Groupe d'Articles
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Opportunité De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Fiche de paie mensuelle.
 DocType: BOM,Website Specifications,Spécifications du Site Web
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la numérotation de série pour la Présence via Configuration&gt; Numérotation de Série
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} : Du {0} de type {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ligne {0} : Le Facteur de Conversion est obligatoire
@@ -824,6 +828,7 @@
 DocType: Employee,Bank A/C No.,N° de Compte Bancaire
 DocType: Bank Guarantee,Project,Projet
 DocType: Quality Inspection Reading,Reading 7,Lecture 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Partiellement Ordonné
 DocType: Expense Claim Detail,Expense Claim Type,Type de Frais
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Paramètres par défaut pour le Panier d'Achat
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Actif mis au rebut via Écriture de Journal {0}
@@ -831,14 +836,14 @@
 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 +107,Office Maintenance Expenses,Dépenses d'Entretien du Bureau
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configuration du Compte Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Veuillez d’abord entrer l'Article
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Veuillez d’abord entrer l'Article
 DocType: Account,Liability,Responsabilité
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Le Montant Approuvé ne peut pas être supérieur au Montant Réclamé à la ligne {0}.
 DocType: Company,Default Cost of Goods Sold Account,Compte de Coûts des Marchandises Vendues par Défaut
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Liste des Prix non sélectionnée
 DocType: Employee,Family Background,Antécédents Familiaux
 DocType: Request for Quotation Supplier,Send Email,Envoyer un Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Attention : Pièce jointe non valide {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Aucune Autorisation
 DocType: Company,Default Bank Account,Compte Bancaire par Défaut
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pour filtrer en fonction du Parti, sélectionnez d’abord le Type de Parti"
@@ -851,7 +856,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Aucun employé trouvé
 DocType: Supplier Quotation,Stopped,Arrêté
 DocType: Item,If subcontracted to a vendor,Si sous-traité à un fournisseur
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Le groupe d&#39;étudiants est déjà mis à jour.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Le Groupe d'Étudiants est déjà mis à jour.
 DocType: SMS Center,All Customer Contact,Tout Contact Client
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Charger solde de stock via csv.
 DocType: Warehouse,Tree Details,Détails de l’Arbre
@@ -862,8 +867,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montant Minimum de Facturation
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1} : Le Centre de Coûts {2} ne fait pas partie de la Société {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} : Compte {2} ne peut pas être un Groupe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ligne d'Article {idx}: {doctype} {docname} n'existe pas dans la table '{doctype}' ci-dessus
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,La Feuille de Temps {0} est déjà terminée ou annulée
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Aucune tâche
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Le jour du mois où la facture automatique sera générée. e.g. 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Amortissement Cumulé d'Ouverture
@@ -879,7 +884,7 @@
 DocType: Bin,Moving Average Rate,Taux Mobile Moyen
 DocType: Production Planning Tool,Select Items,Sélectionner les Articles
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} pour la Facture {1} du {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Horaire du Cours
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Horaire du Cours
 DocType: Maintenance Visit,Completion Status,État d'Achèvement
 DocType: HR Settings,Enter retirement age in years,Entrez l'âge de la retraite en années
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Entrepôt Cible
@@ -887,7 +892,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Autoriser le dépassement des capacités livraison ou de réception jusqu'à ce pourcentage
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importer Participation
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tous les Groupes d'Articles
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tous les Groupes d'Articles
 DocType: Process Payroll,Activity Log,Journal d'Activité
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Bénéfice Net / Perte Nette
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Composer automatiquement un message sur la soumission de transactions .
@@ -898,7 +903,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Du Bon de Commande au Paiement
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qté Projetée
 DocType: Sales Invoice,Payment Due Date,Date d'Échéance de Paiement
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Ouverture'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Ouvrir To Do
 DocType: Notification Control,Delivery Note Message,Message du Bon de Livraison
@@ -914,7 +919,7 @@
 DocType: Item Reorder,Re-Order Qty,Qté de Réapprovisionnement
 DocType: Leave Block List Date,Leave Block List Date,Date de la Liste de Blocage des Congés
 DocType: Pricing Rule,Price or Discount,Prix ou Réduction
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais
 DocType: Sales Team,Incentives,Incitations
 DocType: SMS Log,Requested Numbers,Numéros Demandés
 DocType: Production Planning Tool,Only Obtain Raw Materials,Obtenir seulement des Matières Premières
@@ -943,13 +948,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Est sous-traité
 DocType: Item Attribute,Item Attribute Values,Valeurs de l'Attribut de l'Article
 DocType: Examination Result,Examination Result,Résultat d'Examen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Reçu d’Achat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Reçu d’Achat
 ,Received Items To Be Billed,Articles Reçus à Facturer
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Fiche de Paie Soumises
 DocType: Employee,Ms,Mme
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Données de base des Taux de Change
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Doctype de la Référence doit être parmi {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau Horaires dans les {0} prochains jours pour l'Opération {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Doctype de la Référence doit être parmi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Impossible de trouver le Créneau Horaires dans les {0} prochains jours pour l'Opération {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan de matériaux pour les sous-ensembles
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partenaires Commerciaux et Régions
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Vous ne pouvez pas créer automatiquement un compte car il y a déjà un solde dans le compte. Vous devez créer un compte correspondant avant de pouvoir faire une entrée sur cet entrepôt
@@ -972,10 +977,9 @@
 DocType: Supplier,Default Payable Accounts,Comptes Créditeur par Défaut
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"L'employé {0} n'est pas actif, ou n'existe pas"
 DocType: Fee Structure,Components,Composants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variantes de l'Article {0} mises à jour
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Veuillez entrer une Catégorie d'Actif dans la rubrique {0}
 DocType: Quality Inspection Reading,Reading 6,Lecture 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} sans aucune facture impayée négative
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avance sur Facture d’Achat
 DocType: Hub Settings,Sync Now,Synchroniser Maintenant
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}
@@ -989,11 +993,11 @@
 DocType: Item,Is Purchase Item,Est Article d'Achat
 DocType: Asset,Purchase Invoice,Facture d’Achat
 DocType: Stock Ledger Entry,Voucher Detail No,Détail de la Référence N°
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nouvelle Facture de Vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nouvelle Facture de Vente
 DocType: Stock Entry,Total Outgoing Value,Valeur Sortante Totale
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Date d'Ouverture et Date de Clôture devraient être dans le même Exercice
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Date d'Ouverture et Date de Clôture devraient être dans le même Exercice
 DocType: Lead,Request for Information,Demande de Renseignements
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synchroniser les Factures hors-ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synchroniser les Factures hors-ligne
 DocType: Payment Request,Paid,Payé
 DocType: Program Fee,Program Fee,Frais du Programme
 DocType: Salary Slip,Total in words,Total En Toutes Lettres
@@ -1003,7 +1007,7 @@
 DocType: Employee Loan,Sanctioned,Sanctionné
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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} : Veuillez Indiquer le N° de série pour l'article {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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 ""Ensembles de Produits"", l’Entrepôt, le N° de Série et le N° de Lot proviendront de la table ""Liste de Colisage"". Si l’Entrepôt et le N° de Lot sont les mêmes pour tous les produits colisés d’un même article 'Produit Groupé', ces valeurs peuvent être entrées dans la table principale de l’article et elles seront copiées dans la table ""Liste de Colisage""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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 ""Ensembles de Produits"", l’Entrepôt, le N° de Série et le N° de Lot proviendront de la table ""Liste de Colisage"". Si l’Entrepôt et le N° de Lot sont les mêmes pour tous les produits colisés d’un même article 'Produit Groupé', ces valeurs peuvent être entrées dans la table principale de l’article et elles seront copiées dans la table ""Liste de Colisage""."
 DocType: Job Opening,Publish on website,Publier sur le site web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Les livraisons aux clients.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Fournisseur Date de la Facture du Fournisseur ne peut pas être postérieure à Date de Publication
@@ -1014,7 +1018,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nom de la Société
 DocType: SMS Center,Total Message(s),Total des Messages
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Sélectionner l'Article à Transferer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Sélectionner l'Article à Transferer
 DocType: Purchase Invoice,Additional Discount Percentage,Pourcentage de réduction supplémentaire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Afficher la liste de toutes les vidéos d'aide
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Sélectionner le compte principal de la banque où le chèque a été déposé.
@@ -1025,11 +1029,9 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ligne {0} : Paiements contre Commandes Client / Fournisseur doivent toujours être marqués comme des avances
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chimique
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Le compte par défaut de Banque / Caisse sera automatiquement mis à jour dans l’écriture de Journal de Salaire lorsque ce mode est sélectionné.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Les intervalles pour les Codes de Notation {0} chevauchent les intervalles de notation pour les autres notations. Veuillez vérifier les intervalles {0} et {1} et essayer à nouveau
 DocType: BOM,Raw Material Cost(Company Currency),Coût des Matières Premières (Devise Société)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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 Fabrication.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ligne # {0}: Le taux ne peut pas être supérieur au taux utilisé dans {1} {2}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ligne # {0}: Le Taux ne peut pas être supérieur au taux utilisé dans {1} {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,Mètre
 DocType: Workstation,Electricity Cost,Coût de l'Électricité
 DocType: HR Settings,Don't send Employee Birthday Reminders,Ne pas envoyer de rappel pour le Jour d'Anniversaire des Employés
@@ -1038,13 +1040,13 @@
 DocType: BOM Website Item,BOM Website Item,Article de LDM du Site Internet
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Charger votre en-tête et logo. (vous pouvez les modifier ultérieurement).
 DocType: Timesheet Detail,Bill,Facture
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,La Date de l’Amortissement Suivant est obligatoire pour un nouvel Actif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Blanc
 DocType: SMS Center,All Lead (Open),Toutes les pistes (Ouvertes)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ligne {0} : Qté non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l’écriture ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtenir Acomptes Payés
-DocType: Item,Automatically Create New Batch,Créer automatiquement un nouveau lot
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Faire
+DocType: Item,Automatically Create New Batch,Créer un Nouveau Lot Automatiquement
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Faire
 DocType: Student Admission,Admission Start Date,Date de Début de l'Admission
 DocType: Journal Entry,Total Amount in Words,Montant Total En Toutes Lettres
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Il y a eu une erreur. Une raison probable pourrait être que vous n'avez pas enregistré le formulaire. Veuillez contacter support@erpnext.com si le problème persiste.
@@ -1052,7 +1054,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Type de Commande doit être l'un des {0}
 DocType: Lead,Next Contact Date,Date du Prochain Contact
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantité d'Ouverture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Veuillez entrez un Compte pour le Montant de Change
 DocType: Student Batch Name,Student Batch Name,Nom du Lot d'Étudiants
 DocType: Holiday List,Holiday List Name,Nom de la Liste de Vacances
 DocType: Repayment Schedule,Balance Loan Amount,Solde du Montant du Prêt
@@ -1072,12 +1074,12 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Veuillez spécifier un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Les articles avec aucune modification de quantité ou de valeur ont étés retirés.
 DocType: Delivery Note,Delivery To,Livraison à
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Table d'Attribut est obligatoire
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Table d'Attribut est obligatoire
 DocType: Production Planning Tool,Get Sales Orders,Obtenir les Commandes Client
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne peut pas être négatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Remise
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Remise
 DocType: Asset,Total Number of Depreciations,Nombre Total d’Amortissements
-DocType: Sales Invoice Item,Rate With Margin,Tarif avec marge
+DocType: Sales Invoice Item,Rate With Margin,Tarif Avec Marge
 DocType: Workstation,Wages,Salaires
 DocType: Project,Internal,Interne
 DocType: Task,Urgent,Urgent
@@ -1090,7 +1092,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Entrepôt Réservé aux Commandes Clients / Entrepôt de Produits Finis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Montant de Vente
 DocType: Repayment Schedule,Interest Amount,Montant d'Intérêts
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'Approbateur de Dépenses pour cet enregistrement. Veuillez Mettre à Jour le 'Status' et Enregistrer
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vous êtes l'Approbateur de Dépenses pour cet enregistrement. Veuillez Mettre à Jour le 'Status' et Enregistrer
 DocType: Serial No,Creation Document No,N° du Document de Création
 DocType: Issue,Issue,Question
 DocType: Asset,Scrapped,Mis au Rebut
@@ -1098,12 +1100,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributs pour les Variantes de l'Article. e.g. Taille, Couleur, etc."
 DocType: Purchase Invoice,Returns,Retours
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Entrepôt (Travaux en Cours)
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},N° de Série {0} est sous contrat de maintenance jusqu'à {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},N° de Série {0} est sous contrat de maintenance jusqu'à {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutement
 DocType: Lead,Organization Name,Nom de l'Organisation
 DocType: Tax Rule,Shipping State,État de livraison
 ,Projected Quantity as Source,Quantité Projetée comme Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Inclure des articles hors stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Charges de Vente
@@ -1111,12 +1113,12 @@
 DocType: GL Entry,Against,Contre
 DocType: Item,Default Selling Cost Center,Centre de Coût Vendeur par Défaut
 DocType: Sales Partner,Implementation Partner,Partenaire d'Implémentation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Code Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Code Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Commande Client {0} est {1}
 DocType: Opportunity,Contact Info,Information du Contact
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Faire des Écritures de Stock
 DocType: Packing Slip,Net Weight UOM,UDM Poids Net
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,Résultats {0}
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,Résultats {0}
 DocType: Item,Default Supplier,Fournisseur par Défaut
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Pourcentage d'Allocation en cas de Surproduction
 DocType: Employee Loan,Repayment Schedule,Échéancier de Remboursement
@@ -1124,15 +1126,15 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtenir les Dates de Congés
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,La date de Fin ne peut pas être antérieure à la Date de Début
 DocType: Sales Person,Select company name first.,Sélectionner d'abord le nom de la société.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,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 +22,To {0} | {1} {2},À {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Âge Moyen
-DocType: School Settings,Attendance Freeze Date,Date de congélation
+DocType: School Settings,Attendance Freeze Date,Date du Gel des Présences
 DocType: Opportunity,Your sales person who will contact the customer in future,Votre commercial qui prendra contact avec le client ultérieurement
 apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Listez quelques-uns de vos fournisseurs. Ils peuvent être des entreprises ou des individus.
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Voir Tous Les Produits
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Âge minimum du plomb (jours)
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Âge Minimum du Prospect (Jours)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,Toutes les LDM
 DocType: Company,Default Currency,Devise par Défaut
 DocType: Expense Claim,From Employee,De l'Employé
@@ -1142,7 +1144,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Domaine Essentiel de Performance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Attribut Invalide
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} doit être soumis
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} doit être soumis
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantité doit être inférieure ou égale à {0}
 DocType: SMS Center,Total Characters,Nombre de Caractères
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Veuillez sélectionner une LDM dans le champ LDM pour l’Article {0}
@@ -1153,7 +1155,7 @@
 DocType: Sales Partner,Distributor,Distributeur
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Règles de Livraison du Panier
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,L'Ordre de Production {0} doit être annulé avant d’annuler cette Commande Client
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘
 ,Ordered Items To Be Billed,Articles Commandés À Facturer
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,La Plage Initiale doit être inférieure à la Plage Finale
 DocType: Global Defaults,Global Defaults,Valeurs par Défaut Globales
@@ -1163,7 +1165,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Année de Début
 DocType: Purchase Invoice,Start date of current invoice's period,Date de début de la période de facturation en cours
 DocType: Salary Slip,Leave Without Pay,Congé Sans Solde
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Erreur de Planification de Capacité
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Erreur de Planification de Capacité
 ,Trial Balance for Party,Balance Auxiliaire
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Bénéfices
@@ -1178,7 +1180,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ce sera ajoutée au Code de la Variante de l'Article. Par exemple, si votre abréviation est «SM», et le code de l'article est ""T-SHIRT"", le code de l'article de la variante sera ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Salaire Net (en lettres) sera visible une fois que vous aurez enregistré la Fiche de Paie.
 DocType: Purchase Invoice,Is Return,Est un Retour
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retour / Note de Débit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retour / Note de Débit
 DocType: Price List Country,Price List Country,Pays de la Liste des Prix
 DocType: Item,UOMs,UDMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} numéro de série valide pour l'objet {1}
@@ -1188,11 +1190,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Veuillez entrer le Code d'Article pour obtenir le Numéro de Lot
 DocType: Stock Settings,Default Item Group,Groupe d'Éléments par Défaut
 DocType: Employee Loan,Partially Disbursed,Partiellement Décaissé
-DocType: Grading Structure,Grading System Name,Nom du Système de Notation
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Base de données fournisseurs.
 DocType: Account,Balance Sheet,Bilan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centre de Coûts Pour Article ayant un Code Article '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Le Mode de Paiement n’est pas configuré. Veuillez vérifier si le compte a été réglé sur Mode de Paiement ou sur Profil de Point de Vente.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Votre commercial recevra un rappel à cette date pour contacter le client
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Le même article ne peut pas être entré plusieurs fois.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","D'autres comptes individuels peuvent être créés dans les groupes, mais les écritures ne peuvent être faites que sur les comptes individuels"
@@ -1204,15 +1205,15 @@
 ,Purchase Order Items To Be Billed,Articles à Facturer du Bon de Commande
 DocType: Purchase Invoice Item,Net Rate,Taux Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Article de la Facture d'Achat
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Écritures du Journal du Stock et Écritures du Grand Livre sont republiées pour les Reçus d'Achat sélectionnés
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Écritures du Journal du Stock et Écritures du Grand Livre sont republiées pour les Reçus d'Achat sélectionnés
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Article 1
 DocType: Holiday,Holiday,Vacances
 DocType: Support Settings,Close Issue After Days,Fermer Problème Après Jours
 DocType: Leave Control Panel,Leave blank if considered for all branches,Laisser vide pour toutes les branches
-DocType: Bank Guarantee,Validity in Days,Validité en jours
+DocType: Bank Guarantee,Validity in Days,Validité en Jours
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},Formulaire-C n'est pas applicable pour la Facture: {0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,Détails des Paiements Non Réconciliés
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Décompte
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Compte de Commandes
 DocType: Global Defaults,Current Fiscal Year,Exercice en Cours
 DocType: Purchase Order,Group same items,Groupe les éléments identiques
 DocType: Global Defaults,Disable Rounded Total,Désactiver le Total Arrondi
@@ -1229,11 +1230,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Travaux Effectués
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Veuillez spécifier au moins un attribut dans la table Attributs
 DocType: Announcement,All Students,Tous les Etudiants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,L'article {0} doit être un article hors stock
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,L'article {0} doit être un article hors stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Voir Grand Livre
 DocType: Grading Scale,Intervals,Intervalles
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Au plus tôt
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Un Groupe d'Article existe avec le même nom, veuillez changer le nom de l'article ou renommer le groupe d'article"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,N° de Mobile de l'Étudiant
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Reste du Monde
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'Article {0} ne peut être en Lot
@@ -1251,8 +1252,8 @@
 DocType: Purchase Invoice,Supplied Items,Articles Fournis
 DocType: Student,STUD.,STUD.
 DocType: Production Order,Qty To Manufacture,Quantité À Fabriquer
-DocType: Email Digest,New Income,Nouveau Revenu
-DocType: School Settings,School Settings,Paramètres scolaires
+DocType: Email Digest,New Income,Nouveaux Revenus
+DocType: School Settings,School Settings,Paramètres Scolaires
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Maintenir le même taux durant le cycle d'achat
 DocType: Opportunity Item,Opportunity Item,Article de l'Opportunité
 ,Student and Guardian Contact Details,Détails des Contacts Étudiant et Tuteur
@@ -1272,9 +1273,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Paiement du salaire de {0} à {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Vous n'êtes pas autorisé à modifier le compte gelé {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtenir les Factures Impayées
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Commande Client {0} invalide
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Commande Client {0} invalide
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Les Bons de Commande vous aider à planifier et à assurer le suivi de vos achats
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Désolé, les sociétés ne peuvent pas être fusionnées"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantité totale d’Émission / Transfert {0} dans la Demande de Matériel {1} \ ne peut pas être supérieure à la quantité demandée {2} pour l’Article {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Petit
@@ -1295,10 +1296,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Dépenses Indirectes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ligne {0} : Qté obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agriculture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Données de Base
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Données de Base
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,L'Image du Site Web doit être un fichier public ou l'URL d'un site web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM (Liste de Matériaux)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Il s’agit d’un groupe d'élément racine qui ne peut être modifié.
@@ -1312,21 +1313,21 @@
 DocType: Email Digest,Annual Income,Revenu Annuel
 DocType: Serial No,Serial No Details,Détails du N° de Série
 DocType: Purchase Invoice Item,Item Tax Rate,Taux de la Taxe sur l'Article
-DocType: Student Group Student,Group Roll Number,Numéro de groupe
+DocType: Student Group Student,Group Roll Number,Numéro de Groupe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pour {0}, seuls les comptes de crédit peuvent être liés avec une autre écriture de débit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Le total des poids des tâches doit être égal à 1. Veuillez ajuster les poids de toutes les tâches du Projet en conséquence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Bon de Livraison {0} n'est pas soumis
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,L'article {0} doit être un Article Sous-traité
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capitaux Immobilisés
-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 Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","La Règle de Tarification est d'abord sélectionnée sur la base du champ ‘Appliquer Sur’, qui peut être un Article, un Groupe d'Articles ou une Marque."
 DocType: Hub Settings,Seller Website,Site du Vendeur
 DocType: Item,ITEM-,ARTICLE-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Pourcentage total attribué à l'équipe commerciale devrait être de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Le Statut de l'Ordre de Production est {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Le Statut de l'Ordre de Production est {0}
 DocType: Appraisal Goal,Goal,Objectif
 DocType: Sales Invoice Item,Edit Description,Modifier la description
 ,Team Updates,Mises à Jour de l’Équipe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Pour Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Pour Fournisseur
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Définir le Type de Compte aide à sélectionner ce Compte dans les transactions.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total TTC (Devise de la Société)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Créer Format d'Impression
@@ -1342,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Écriture de Journal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articles en cours
 DocType: Workstation,Workstation Name,Nom du Bureau
-DocType: Grade Interval,Grade Code,Code de la Note
+DocType: Grading Scale Interval,Grade Code,Code de la Note
 DocType: POS Item Group,POS Item Group,Groupe d'Articles PDV
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Compte Rendu par Email :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},LDM {0} n’appartient pas à l'article {1}
@@ -1358,7 +1359,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Matériel
 DocType: Sales Order,Recurring Upto,Récurrent Jusqu'au
 DocType: Attendance,HR Manager,Responsable RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Veuillez sélectionner une Société
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Veuillez sélectionner une Société
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Congé de Privilège
 DocType: Purchase Invoice,Supplier Invoice Date,Date de la Facture du Fournisseur
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Vous devez activer le Panier
@@ -1374,7 +1375,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Alimentation
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamme de Vieillissement 3
 DocType: Maintenance Schedule Item,No of Visits,Nb de Visites
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Valider la Présence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Valider la Présence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Un Calendrier de Maintenance {0} existe pour {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inscrire un étudiant
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},La devise du Compte Cloturé doit être {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somme des points pour tous les objectifs devraient être 100. Il est {0}
@@ -1399,7 +1401,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Moy Quotidienne Sortante
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Nom et Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Le Statut d'Approbation doit être 'Approuvé' ou 'Rejeté'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Le Statut d'Approbation doit être 'Approuvé' ou 'Rejeté'
 DocType: Purchase Invoice,Contact Person,Personne à Contacter
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Date de Début Prévue' ne peut pas être postérieure à 'Date de Fin Prévue'
 DocType: Course Scheduling Tool,Course End Date,Date de Fin du Cours
@@ -1422,14 +1424,15 @@
 DocType: Sales Invoice,Shipping Address Name,Nom de l'Adresse de Livraison
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan Comptable
 DocType: Material Request,Terms and Conditions Content,Contenu des Termes et Conditions
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne peut pas être supérieure à 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ne peut pas être supérieure à 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Article {0} n'est pas un article stocké
 DocType: Maintenance Visit,Unscheduled,Non programmé
 DocType: Employee,Owned,Détenu
 DocType: Salary Detail,Depends on Leave Without Pay,Dépend de Congé Non Payé
 DocType: Pricing Rule,"Higher the number, higher the priority","Plus le nombre est grand, plus la priorité est haute"
 ,Purchase Invoice Trends,Tendances des Factures d'Achat
 DocType: Employee,Better Prospects,Meilleures Perspectives
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ligne # {0}: Le lot {1} n'a que {2} qté(s). Veuillez sélectionner un autre lot contenant {3} qtés disponible ou diviser la rangée en plusieurs lignes, pour livrer / émettre à partir de plusieurs lots"
 DocType: Vehicle,License Plate,Plaque d'Immatriculation
 DocType: Appraisal,Goals,Objectifs
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / Statut AMC
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,L'employé ne peut pas rendre de compte à lui-même.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Si le compte est gelé, les écritures ne sont autorisés que pour un nombre restreint d'utilisateurs."
 DocType: Email Digest,Bank Balance,Solde Bancaire
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",Profil de l’Emploi. qualifications requises ect...
 DocType: Journal Entry Account,Account Balance,Solde du Compte
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Règle de Taxation pour les transactions.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afficher le solde du compte de résulat des exercices non cloturés
 DocType: Shipping Rule,Shipping Account,Compte de Livraison
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} : Compte {2} inactif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Créer des Commandes Clients pour vous aider à planifier votre travail et livrer à temps
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Créer des Commandes Clients pour vous aider à planifier votre travail et livrer à temps
 DocType: Quality Inspection,Readings,Lectures
 DocType: Stock Entry,Total Additional Costs,Total des Coûts Additionnels
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Valeur Finale
 DocType: Asset Movement,Stock Manager,Responsable des Stocks
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Entrepôt source est obligatoire à la ligne {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Bordereau de Colis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Bordereau de Colis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Loyer du Bureau
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configuration de la passerelle SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Échec de l'Importation !
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,Envoyer la Fiche de Paie à l'Employé par Mail
 DocType: Cost Center,Parent Cost Center,Centre de Coûts Parent
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Sélectionner le Fournisseur Possible
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Sélectionner le Fournisseur Possible
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afficher fermé
 DocType: Leave Type,Is Leave Without Pay,Est un Congé Sans Solde
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Catégorie d'Actif est obligatoire pour l'article Immobilisé
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Aucun enregistrement trouvé dans la table Paiement
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ce {0} est en conflit avec {1} pour {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML Étudiants
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Date de Départ
 DocType: Pricing Rule,For Price List,Pour la Liste de Prix
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutement de Cadres
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Créer des Prospects
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Créer des Prospects
 DocType: Maintenance Schedule,Schedules,Horaires
 DocType: Purchase Invoice Item,Net Amount,Montant Net
 DocType: Purchase Order Item Supplied,BOM Detail No,N° de Détail LDM
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscriptions au Programme
 DocType: Sales Invoice Item,Brand Name,Nom de la Marque
 DocType: Purchase Receipt,Transporter Details,Détails du Transporteur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Un Entrepôt par défaut est nécessaire pour l’Article sélectionné
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Boîte
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fournisseur Potentiel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Fournisseur Potentiel
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L’Organisation
 DocType: Budget,Monthly Distribution,Répartition Mensuelle
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,La Liste de Destinataires est vide. Veuillez créer une Liste de Destinataires
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Objectif du Partenaire Commercial
 DocType: Loan Type,Maximum Loan Amount,Montant Max du Prêt
 DocType: Pricing Rule,Pricing Rule,Règle de Tarification
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numéro de rôle en double pour l&#39;élève {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Numéro de liste en double pour l'élève {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action si le Budget Annuel est Dépassé
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Demande de Matériel au Bon de Commande
 DocType: Shopping Cart Settings,Payment Success URL,URL pour Paiement Effectué avec Succès
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,Méthode de Remboursement
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Si cochée, la page d'Accueil pour le site sera le Groupe d'Article par défaut"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},LDM par défaut pour {0} introuvable pour le Projet {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},LDM par défaut pour {0} introuvable pour le Projet {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Notes de frais de la société
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Les étudiants sont au cœur du système, ajouter tous vos étudiants"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Les étudiants sont au cœur du système, ajouter tous vos étudiants"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ligne #{0} : Date de compensation {1} ne peut pas être antérieure à la Date du Chèque {2}
 DocType: Company,Default Holiday List,Liste de Vacances par Défaut
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le(s) jour(s) pour le(s)quel(s) vous demandez un congé sont des jour(s) férié(s). Vous n’avez pas besoin d’effectuer de demande.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Renvoyer Email de Paiement
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nouvelle tâche
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Faire un Devis
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Faire un Devis
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Autres Rapports
 DocType: Dependent Task,Dependent Task,Tâche Dépendante
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Les Congés de type {0} ne peuvent pas être plus long que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Essayez de planifer des opérations X jours à l'avance.
 DocType: HR Settings,Stop Birthday Reminders,Arrêter les Rappels d'Anniversaire
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Veuillez définir le Compte Créditeur de Paie par Défaut pour la Société {0}
 DocType: SMS Center,Receiver List,Liste de Destinataires
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Rechercher Article
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Rechercher Article
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montant Consommé
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variation Nette de Trésorerie
 DocType: Assessment Plan,Grading Scale,Échelle de Notation
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Déjà terminé
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unité de Mesure {0} a été saisie plus d'une fois dans la Table de Facteur de Conversion
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Déjà terminé
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Demande de Paiement existe déjà {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Coût des Marchandises Vendues
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Quantité ne doit pas être plus de {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Faire une Écriture de Décaissement
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ligne {0} : L’Avance du Fournisseur doit être un débit
 DocType: Company,Default Values,Valeurs Par Défaut
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,Rapport {Frequency}
 DocType: Expense Claim,Total Amount Reimbursed,Montant Total Remboursé
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Basé sur les journaux de ce Véhicule. Voir la chronologie ci-dessous pour plus de détails
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collecte
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Pour la Facture Fournisseur {0} datée {1}
 DocType: Customer,Default Price List,Liste des Prix par Défaut
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Registre de Mouvement de l'Actif {0} créé
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Vous ne pouvez pas supprimer l'Exercice {0}. L'exercice {0} est défini par défaut dans les Réglages Globaux
 DocType: Journal Entry,Entry Type,Type d'Écriture
 ,Customer Credit Balance,Solde de Crédit des Clients
@@ -1646,15 +1650,15 @@
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Mettre à jour les dates de paiement bancaires avec les journaux.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Tarification
 DocType: Quotation,Term Details,Détails du Terme
-DocType: Project,Total Sales Cost (via Sales Order),Coût total des ventes (par commande client)
+DocType: Project,Total Sales Cost (via Sales Order),Coût Total des Ventes (par Commande Client)
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,Inscription de plus de {0} étudiants impossible pour ce groupe d'étudiants.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de chefs d&#39;accusation
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,Nombre de Prospects
 apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0} doit être supérieur à 0
 DocType: Manufacturing Settings,Capacity Planning For (Days),Planification de Capacité Pendant (Jours)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvisionnement
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Aucun des Articles n’a de changement en quantité ou en valeur.
-apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Champ obligatoire - Programme
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Réclamation de Garantie
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Champ Obligatoire - Programme
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Réclamation de Garantie
 ,Lead Details,Détails du Prospect
 DocType: Salary Slip,Loan repayment,Remboursement de Prêt
 DocType: Purchase Invoice,End date of current invoice's period,Date de fin de la période de facturation en cours
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Adresse Permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",L'avance versée pour {0} {1} ne peut être supérieure \ au Total Général {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Veuillez sélectionner un code d'article
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Veuillez sélectionner un code d'article
 DocType: Student Sibling,Studying in Same Institute,Étudier au même Institut
 DocType: Territory,Territory Manager,Responsable Régional
 DocType: Packed Item,To Warehouse (Optional),À l'Entrepôt (Facultatif)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code d&#39;article&gt; Groupe d&#39;articles&gt; Marque
 DocType: Payment Entry,Paid Amount (Company Currency),Montant Payé (Devise Société)
 DocType: Purchase Invoice,Additional Discount,Remise Supplémentaire
 DocType: Selling Settings,Selling Settings,Réglages de Vente
@@ -1687,10 +1690,10 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Voir Panier
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Dépenses de Marketing
 ,Item Shortage Report,Rapport de Rupture de Stock d'Article
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Poids est mentionné,\nVeuillez aussi mentionner ""UDM de Poids"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Demande de Matériel utilisée pour réaliser cette Écriture de Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Date de l’Amortissement Suivant est obligatoire pour un nouvel actif
-DocType: Student Group Creation Tool,Separate course based Group for every Batch,Groupe séparé basé sur les cours pour chaque lot
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Date de l’Amortissement Suivant est obligatoire pour un nouvel actif
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,Groupes basés sur les cours différents pour chaque Lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Seule unité d'un Article.
 DocType: Fee Category,Fee Category,Catégorie d'Honoraires
 ,Student Fee Collection,Frais de Scolarité
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Poids
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1} : Un Centre de Coûts est requis pour le compte ""Pertes et Profits"" {2}.Veuillez mettre en place un centre de coûts par défaut pour la Société."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un Groupe de Clients existe avec le même nom, veuillez changer le nom du Client ou renommer le Groupe de Clients"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe Client&gt; Territoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Un Groupe de Clients existe avec le même nom, veuillez changer le nom du Client ou renommer le Groupe de Clients"
 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
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Registre des Ventes par Article
 DocType: Asset,Gross Purchase Amount,Montant d'Achat Brut
 DocType: Asset,Depreciation Method,Méthode d'Amortissement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Hors Ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Hors Ligne
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cette Taxe est-elle incluse dans le Taux de Base ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Cible Totale
 DocType: Program Course,Required,Obligatoire
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Réconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Trop de colonnes. Exportez le rapport et imprimez-le à l'aide d'un tableur.
 DocType: Purchase Invoice Item,Batch No,N° du Lot
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Impossible de trouver le taux de change pour {0} - {1} pour la date clé {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Autoriser plusieurs Commandes Clients pour un Bon de Commande d'un Client
-DocType: Student Group Instructor,Student Group Instructor,Instructeur de groupe étudiant
+DocType: Student Group Instructor,Student Group Instructor,Instructeur de Groupe d'Étudiant
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,N° du Mobile du Tuteur 1
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Définir le préfixe des séries numérotées pour vos transactions
 DocType: Employee Attendance Tool,Employees HTML,Employés HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,LDM par défaut ({0}) doit être actif pour ce produit ou son modèle
 DocType: Employee,Leave Encashed?,Laisser Encaissé ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Le champ Opportunité De est obligatoire
 DocType: Email Digest,Annual Expenses,Dépenses Annuelles
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Faire un Bon de Commande
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Faire un Bon de Commande
 DocType: SMS Center,Send To,Envoyer À
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Il n'y a pas assez de solde de congés pour les Congés de Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montant alloué
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Code de l'Article du Client
 DocType: Stock Reconciliation,Stock Reconciliation,Réconciliation du Stock
 DocType: Territory,Territory Name,Nom de la Région
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,L'entrepôt des Travaux en Cours est nécessaire avant de Soumettre
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,L'entrepôt des Travaux en Cours est nécessaire avant de Soumettre
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidat à un Emploi.
 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
-DocType: Item,Serial Nos and Batches,N ° de série et lots
-apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Force du groupe étudiant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,L'Écriture de Journal {0} n'a pas d'entrée non associée {1}
+DocType: Item,Serial Nos and Batches,N° de Série et Lots
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Force du Groupe d'Étudiant
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,L'Écriture de Journal {0} n'a pas d'entrée non associée {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Évaluation
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Dupliquer N° de Série pour l'Article {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Une condition pour une Règle de Livraison
-DocType: Grading Structure,Grading Intervals,Intervalles de Notation
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Veuillez entrer
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Surfacturation supérieure à {2} impossible pour l'Article {0} à la ligne {1}. Pour permettre la surfacturation, veuillez le définir dans les Réglages d'Achat"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Veuillez définir un filtre basé sur l'Article ou l'Entrepôt
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,LDM {0} doit être soumise
 DocType: Authorization Control,Authorization Control,Contrôle d'Autorisation
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ligne #{0} : Entrepôt de Rejet est obligatoire pour l’Article rejeté {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Paiement
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gérer vos commandes
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Paiement
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gérer vos commandes
 DocType: Production Order Operation,Actual Time and Cost,Temps et Coût Réels
 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 l'article {1} pour la Commande Client {2}
 DocType: Employee,Salutation,Salutations
 DocType: Course,Course Abbreviation,Abréviation du Cours
 DocType: Student Leave Application,Student Leave Application,Demande de Congé d'Étudiant
 DocType: Item,Will also apply for variants,S'appliquera également pour les variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","L'actif ne peut être annulé, car il est déjà {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employé {0} sur une demi-journée sur {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Le nombre total d'heures travaillées ne doit pas être supérieur à la durée maximale du travail {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Sur
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Grouper les articles au moment de la vente.
 DocType: Quotation Item,Actual Qty,Quantité Réelle
 DocType: Sales Invoice Item,References,Références
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Vous avez entré un doublon. Veuillez rectifier et essayer à nouveau.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associé
 DocType: Asset Movement,Asset Movement,Mouvement d'Actif
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nouveau Panier
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Nouveau Panier
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'article {0} n'est pas un Article avec un numéro de serie
 DocType: SMS Center,Create Receiver List,Créer une Liste de Réception
 DocType: Vehicle,Wheels,Roues
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Désactive la création de registres de temps pour les Ordres de Fabrication. Le suivi des Opérations ne nécessite pas d’Ordres de Fabrication
 DocType: Student,Student Mobile Number,Numéro de Mobile de l'Étudiant
 DocType: Item,Has Variants,A Variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Vous avez déjà choisi des articles de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nom de la Répartition Mensuelle
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Le N° du lot est obligatoire
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Le N° du lot est obligatoire
 DocType: Sales Person,Parent Sales Person,Commercial Parent
 DocType: Purchase Invoice,Recurring Invoice,Facture Récurrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestion de Projets
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Exercice Fiscal
 DocType: Vehicle Log,Fuel Price,Prix du Carburant
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Un Article Immobilisé doit être un élément non stocké.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget ne peut pas être affecté pour {0}, car ce n’est pas un compte de produits ou de charges"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Atteint
 DocType: Student Admission,Application Form Route,Chemin du Formulaire de Candidature
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Région / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Région / Client
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,e.g. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Le Type de Congé {0} ne peut pas être alloué, car c’est un congé sans solde"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ligne {0} : Le montant alloué {1} doit être inférieur ou égal au montant restant sur la Facture {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Statut du N° de Série
 DocType: Payment Entry Reference,Outstanding,Solde
 ,Daily Timesheet Summary,Récapitulatif Quotidien des Feuilles de Présence
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","""Ligne {0} : Pour régler la périodicité de {1}, la différence entre la date de début et la date de fin \
 doit être supérieure ou égale à {2}"""
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Basé sur les mouvements de stock. Voir {0} pour plus de détails
 DocType: Pricing Rule,Selling,Vente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Montant {0} {1} déduit de {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Montant {0} {1} déduit de {2}
 DocType: Employee,Salary Information,Information sur le Salaire
 DocType: Sales Person,Name and Employee ID,Nom et ID de l’Employé
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,La Date d'Échéance ne peut être antérieure à la Date de Comptabilisation
 DocType: Website Item Group,Website Item Group,Groupe d'Articles du Site Web
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Droits de Douane et Taxes
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Veuillez entrer la date de Référence
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Impossible de se référer au numéro de la ligne supérieure ou égale au numéro de la ligne courante pour ce type de Charge
 DocType: Asset,Sold,Vendu
 ,Item-wise Purchase History,Historique d'Achats par Article
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Veuillez cliquer sur ‘Générer Calendrier’ pour récupérer le N° Série ajouté à l'article {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Veuillez cliquer sur ‘Générer Calendrier’ pour récupérer le N° Série ajouté à l'article {0}
 DocType: Account,Frozen,Gelé
 ,Open Production Orders,Ouvrir les Ordres de Fabrication
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Montant de Base (Devise de la Société)
 DocType: Payment Reconciliation Payment,Reference Row,Ligne de Référence
 DocType: Installation Note,Installation Time,Temps d'Installation
 DocType: Sales Invoice,Accounting Details,Détails Comptabilité
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Supprimer toutes les Transactions pour cette Société
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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} : L’Opération {1} n’est pas terminée pour {2} qtés de produits finis de l’Ordre de Production # {3}. Veuillez mettre à jour le statut des opérations via les Journaux de Temps
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investissements
 DocType: Issue,Resolution Details,Détails de la Résolution
@@ -1917,17 +1918,17 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être demandé / annulé avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
 DocType: Activity Cost,Costing Rate,Taux des Coûts
 ,Customer Addresses And Contacts,Adresses et Contacts des Clients
-,Campaign Efficiency,Efficacité des campagnes
+,Campaign Efficiency,Efficacité des Campagnes
 DocType: Discussion,Discussion,Discussion
 DocType: Payment Entry,Transaction ID,Identifiant de Transaction
 DocType: Employee,Resignation Letter Date,Date de la Lettre de Démission
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Configurez la Date d&#39;inscription pour l&#39;employé {0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Les Règles de Tarification sont d'avantage filtrés en fonction de la quantité.
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Veuillez définir la Date d'Embauche pour l'employé {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montant Total de Facturation (via Feuille de Temps)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Répéter Revenu Clientèle
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de Frais"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) doit avoir le rôle ""Approbateur de Frais"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Paire
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Sélectionner la LDM et la Qté pour la Production
 DocType: Asset,Depreciation Schedule,Calendrier d'Amortissement
 DocType: Bank Reconciliation Detail,Against Account,Pour le Compte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La Date de Demi-Journée doit être entre la Date de Début et la Date de Fin
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Veuillez définir 'Centre de Coûts des Amortissements d’Actifs’ de la Société {0}
 ,Maintenance Schedules,Échéanciers d'Entretien
 DocType: Task,Actual End Date (via Time Sheet),Date de Fin Réelle (via la Feuille de Temps)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Montant {0} {1} pour {2} {3}
 ,Quotation Trends,Tendances des Devis
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Le Groupe d'Articles n'est pas mentionné dans la fiche de l'article pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Le compte de débit doit être un compte Débiteur
 DocType: Shipping Rule Condition,Shipping Amount,Montant de la Livraison
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montant en Attente
 DocType: Purchase Invoice Item,Conversion Factor,Facteur de Conversion
 DocType: Purchase Order,Delivered,Livré
 ,Vehicle Expenses,Frais de Véhicule
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
+DocType: Serial No,Invoice Details,Détails de la Facture
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valeur attendue après utilisation complète doit être supérieure ou égale à {0}
 DocType: Purchase Receipt,Vehicle Number,Numéro de Véhicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La date à laquelle la facture récurrente sera arrêtée
 DocType: Employee Loan,Loan Amount,Montant du Prêt
@@ -1962,18 +1964,18 @@
 DocType: Salary Structure,Select employees for current Salary Structure,Sélectionner les Employés pour la Grille de Salaire actuelle
 DocType: Production Order,Use Multi-Level BOM,Utiliser LDM à Plusieurs Niveaux
 DocType: Bank Reconciliation,Include Reconciled Entries,Inclure les Écritures Réconciliées
-DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Parent Course (Laissez vide, si cela ne fait pas partie du cours Parent)"
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)","Cours Parent (Laisser vide, si cela ne fait pas partie du Cours Parent)"
 DocType: Leave Control Panel,Leave blank if considered for all employee types,Laisser vide pour tous les types d'employés
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuer les Charges sur la Base de
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Feuilles de Temps
 DocType: HR Settings,HR Settings,Paramètres RH
 DocType: Salary Slip,net pay info,Info de salaire net
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Nouveaux Frais
 DocType: Purchase Invoice,Additional Discount Amount,Montant de la Remise Supplémentaire
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ligne #{0} : Qté doit égale à 1, car l’Article est un actif immobilisé. Veuillez utiliser une ligne distincte pour une qté multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Autoriser la Liste de Blocage des Congés
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abré. ne peut être vide ou contenir un espace
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Groupe vers Non-Groupe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportif
 DocType: Loan Type,Loan Name,Nom du Prêt
@@ -1983,7 +1985,8 @@
 apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,Veuillez spécifier la Société
 ,Customer Acquisition and Loyalty,Acquisition et Fidélisation des Clients
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,L'entrepôt où vous conservez le stock d'objets refusés
-DocType: Production Order,Skip Material Transfer,Skip Material Transfer
+DocType: Production Order,Skip Material Transfer,Sauter le Transfert de Materiel
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossible de trouver le taux de change pour {0} à {1} pour la date clé {2}. Veuillez créer une entrée de taux de change manuellement
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Date de fin de la période comptable
 DocType: POS Profile,Price List,Liste de Prix
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} est désormais l’Exercice par défaut. Veuillez actualiser la page pour que les modifications soient prises en compte.
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,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/utils.py +34,UOM Conversion factor is required in row {0},Facteur de conversion de l'UDM est obligatoire dans la ligne {0}
 DocType: Production Plan Item,material_request_item,article_demande_de_materiel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ligne #{0} : Le Type de Document de Référence doit être une Commande Client, une Facture de Vente ou une Écriture de Journal"
 DocType: Salary Component,Deduction,Déduction
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Ligne {0} : Heure de Début et Heure de Fin obligatoires.
 DocType: Stock Reconciliation Item,Amount Difference,Différence de Montant
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Veuillez entrer l’ID Employé de ce commercial
 DocType: Territory,Classification of Customers by region,Classification des Clients par région
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,L’Écart de Montant doit être égal à zéro
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,L’Écart de Montant doit être égal à zéro
 DocType: Project,Gross Margin,Marge Brute
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Veuillez d’abord entrer l'Article en Production
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Solde Calculé du Relevé Bancaire
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Utilisateur Désactivé
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Devis
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Devis
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Déduction Totale
 ,Production Analytics,Analyse de la Production
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,L'article {0} a déjà été retourné
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Exercice** représente un Exercice Financier. Toutes les écritures comptables et autres transactions majeures sont suivis en **Exercice**.
 DocType: Opportunity,Customer / Lead Address,Adresse du Client / Prospect
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Attention : certificat SSL non valide sur la pièce jointe {0}
 DocType: Student Admission,Eligibility,Admissibilité
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Les prospects vous aident à obtenir des contrats, ajoutez tous vos contacts et plus dans votre liste de prospects"
 DocType: Production Order Operation,Actual Operation Time,Temps d'Exploitation Réel
 DocType: Authorization Rule,Applicable To (User),Applicable À (Utilisateur)
 DocType: Purchase Taxes and Charges,Deduct,Déduire
@@ -2038,10 +2041,10 @@
 DocType: Guardian,Work Address,Adresse du Bureau
 DocType: Appraisal,Calculate Total Score,Calculer le Résultat Total
 DocType: Request for Quotation,Manufacturing Manager,Responsable Fabrication
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},N° de Série {0} est sous garantie jusqu'au {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},N° de Série {0} est sous garantie jusqu'au {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Séparer le Bon de Livraison dans des paquets.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Livraisons
-apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Le solde du compte ({0}) pour {1} et la valeur de stock ({2}) pour l&#39;entrepôt {3} doit être identique
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Le solde du compte ({0}) pour {1} et la valeur du stock ({2}) pour l'entrepôt {3} doivent être identiques
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Montant Total Alloué (Devise Société)
 DocType: Purchase Order Item,To be delivered to customer,À livrer à la clientèle
 DocType: BOM,Scrap Material Cost,Coût de Mise au Rebut des Matériaux
@@ -2058,11 +2061,11 @@
 DocType: Employee Loan,Employee Loan Account,Compte de Prêt d'un Employé
 DocType: Leave Application,Total Leave Days,Total des Jours de Congé
 DocType: Email Digest,Note: Email will not be sent to disabled users,Remarque : Email ne sera pas envoyé aux utilisateurs désactivés
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d&#39;interactions
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Sélectionner la Société ...
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Nombre d'Interactions
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Sélectionner la Société ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laisser vide pour tous les départements
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Type d’emploi (CDI, CDD, Stagiaire, etc.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} est obligatoire pour l’Article {1}
 DocType: Process Payroll,Fortnightly,Bimensuel
 DocType: Currency Exchange,From Currency,De la Devise
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Veuillez sélectionner le Montant Alloué, le Type de Facture et le Numéro de Facture dans au moins une ligne"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Prix (Devise Société)
 DocType: Student Guardian,Others,Autres
 DocType: Payment Entry,Unallocated Amount,Montant Non Alloué
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. Veuillez sélectionner une autre valeur pour {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Impossible de trouver un article similaire. Veuillez sélectionner une autre valeur pour {0}.
 DocType: POS Profile,Taxes and Charges,Taxes et Frais
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un Produit ou un Service qui est acheté, vendu ou conservé en stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Pas de mise à jour supplémentaire
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Impossible de sélectionner le type de charge comme étant «Le Montant de la Ligne Précédente» ou «Montant Total de la Ligne Précédente» pour la première ligne
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Le sous-article ne doit pas être un ensemble de produit. S'il vous plaît retirer l'article `{0}` et sauver
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banque
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Ajouter des Feuilles de Temps
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Ajouter des Feuilles de Temps
 DocType: Vehicle Service,Service Item,Poste de Service
 DocType: Bank Guarantee,Bank Guarantee,Garantie Bancaire
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Veuillez cliquer sur ‘Générer Calendrier’ pour obtenir le calendrier
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Ligne #{0} : L’Actif {1} est déjà {2}
 DocType: Quotation Item,Stock Balance,Solde du Stock
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,De la Commande Client au Paiement
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Veuillez définir le Nom de Série pour {0} via Setup&gt; Paramètres&gt; Nom de Série
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,PDG
 DocType: Expense Claim Detail,Expense Claim Detail,Détail Note de Frais
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Veuillez sélectionner un compte correct
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Les Prix ne seront pas affichés si la Liste de Prix n'est pas définie
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Veuillez spécifier un pays pour cette Règle de Livraison ou cocher Livraison Internationale
 DocType: Stock Entry,Total Incoming Value,Valeur Entrante Totale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Compte de Débit Requis
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Compte de Débit Requis
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Les Feuilles de Temps aident au suivi du temps, coût et facturation des activités effectuées par votre équipe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Liste des Prix d'Achat
 DocType: Offer Letter Term,Offer Term,Terme de la Proposition
 DocType: Quality Inspection,Quality Manager,Responsable Qualité
 DocType: Job Applicant,Job Opening,Offre d’Emploi
 DocType: Payment Reconciliation,Payment Reconciliation,Réconciliation des Paiements
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Veuillez sélectionner le nom du/de la Responsable
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Veuillez sélectionner le nom du/de la Responsable
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total des Impayés : {0}
 DocType: BOM Website Operation,BOM Website Operation,Opération de LDM du Site Internet
@@ -2151,7 +2155,7 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,La Liste de Prix {0} est désactivée
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Ligne {0} : Qté Complétée ne peut pas être supérieure à {1} pour l’opération {2}
 DocType: Manufacturing Settings,Allow Overtime,Autoriser les Heures Supplémentaires
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L&#39;élément sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, utilisez l&#39;entrée de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","L'Article Sérialisé {0} ne peut pas être mis à jour en utilisant la réconciliation des stocks, veuillez utiliser l'entrée de stock"
 DocType: Training Event Employee,Training Event Employee,Évènement de Formation – Employé
 apps/erpnext/erpnext/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 en avez fourni {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Taux de Valorisation Actuel
@@ -2160,27 +2164,27 @@
 DocType: Opportunity,Lost Reason,Raison de la Perte
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Nouvelle Adresse
 DocType: Quality Inspection,Sample Size,Taille de l'Échantillon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Veuillez entrer le Document de Réception
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tous les articles ont déjà été facturés
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Veuillez entrer le Document de Réception
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Tous les articles ont déjà été facturés
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Veuillez spécifier un ‘Depuis le Cas N°.’ valide
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"D'autres centres de coûts peuvent être créés dans des Groupes, mais des écritures ne peuvent être faites que sur des centres de coûts individuels."
 DocType: Project,External,Externe
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilisateurs et Autorisations
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordres de Production Créés: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ordres de Production Créés: {0}
 DocType: Branch,Branch,Branche
 DocType: Guardian,Mobile Number,Numéro de Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impression et Marque
 DocType: Bin,Actual Quantity,Quantité Réelle
 DocType: Shipping Rule,example: Next Day Shipping,Exemple : Livraison le Jour Suivant
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,N° de Série {0} introuvable
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,N° de Série {0} introuvable
 DocType: Scheduling Tool,Student Batch,Lot d'Étudiants
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vos clients
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Créer un Étudiant
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Créer un Étudiant
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Vous avez été invité à collaborer sur le projet : {0}
 DocType: Leave Block List Date,Block Date,Bloquer la Date
-apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Appliquer Maintenant
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté réelle {0} / Quantité en attente {1}
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Postuler
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qté Réelle {0} / Quantité en Attente {1}
 DocType: Sales Order,Not Delivered,Non Livré
 ,Bank Clearance Summary,Bilan des Compensations Bancaires
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Créer et gérer des résumés  d'E-mail quotidiens, hebdomadaires et mensuels ."
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,Envoyé À
 DocType: Payment Request,Make Sales Invoice,Faire des Factures de Vente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,La Date de Prochain Contact ne peut pas être dans le passé
 DocType: Company,For Reference Only.,Pour Référence Seulement.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Sélectionnez le N° de Lot
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalide {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Montant de l'Avance
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cas N° ne peut pas être 0
 DocType: Item,Show a slideshow at the top of the page,Afficher un diaporama en haut de la page
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Listes de Matériaux
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Magasins
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Magasins
 DocType: Serial No,Delivery Time,Heure de la Livraison
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Basé Sur le Vieillissement
 DocType: Item,End of Life,Fin de Vie
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,Outil de Renommage
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Mettre à jour le Coût
 DocType: Item Reorder,Item Reorder,Réorganiser les Articles
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Afficher la Fiche de Salaire
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfert de Matériel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Afficher la Fiche de Salaire
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Transfert de Matériel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Spécifier les opérations, le coût d'exploitation et donner un N° d'Opération unique à vos opérations."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Sélectionner le compte de change
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Veuillez définir la récurrence après avoir sauvegardé
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Sélectionner le compte de change
 DocType: Purchase Invoice,Price List Currency,Devise de la Liste de Prix
 DocType: Naming Series,User must always select,L'utilisateur doit toujours sélectionner
 DocType: Stock Settings,Allow Negative Stock,Autoriser un Stock Négatif
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,Compte de Budget
 DocType: Quality Inspection,Verified By,Vérifié Par
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Impossible de changer la devise par défaut de la société, parce qu'il y a des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
-DocType: Grade Interval,Grade Description,Description de la Note
+DocType: Grading Scale Interval,Grade Description,Description de la Note
 DocType: Stock Entry,Purchase Receipt No,N° du Reçu d'Achat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Arrhes
 DocType: Process Payroll,Create Salary Slip,Créer une Fiche de Paie
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,Présence Jusqu'à
 DocType: Warranty Claim,Raised By,Créé par
 DocType: Payment Gateway Account,Payment Account,Compte de Paiement
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Veuillez spécifier la Société pour continuer
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variation Nette des Comptes Débiteurs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Congé Compensatoire
 DocType: Offer Letter,Accepted,Accepté
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Veuillez vous assurer que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base resteront intactes. Cette action ne peut être annulée.
 DocType: Room,Room Number,Numéro de la Chambre
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Référence invalide {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieur à la quantité prévue ({2}) dans l’Ordre de Production {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne peut pas être supérieur à la quantité prévue ({2}) dans l’Ordre de Production {3}
 DocType: Shipping Rule,Shipping Rule Label,Étiquette de la Règle de Livraison
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum de l'Utilisateur
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matières Premières ne peuvent pas être vides.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Écriture Rapide dans le Journal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Écriture Rapide dans le Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Vous ne pouvez pas modifier le taux si la LDM est mentionnée pour un article
 DocType: Employee,Previous Work Experience,Expérience de Travail Antérieure
 DocType: Stock Entry,For Quantity,Pour la Quantité
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termes et Conditions
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Le nom de l'institut pour lequel vous configurez ce système.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Les écritures comptables sont gelées jusqu'à cette date, personne ne peut ajouter / modifier les entrées sauf les rôles spécifiés ci-dessous."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Veuillez enregistrer le document avant de générer le calendrier d'entretien
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Veuillez enregistrer le document avant de générer le calendrier d'entretien
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statut du Projet
 DocType: UOM,Check this to disallow fractions. (for Nos),Cochez cette case pour interdire les fractions. (Pour les numéros)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Les Ordres de Production suivants ont été créés:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,Employés qui travaillent un jour férié
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marquer Présent
 DocType: Project,% Complete Method,% Méthode Complète
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},La date de début d'entretien ne peut pas être antérieure à la date de livraison pour le N° de Série {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La date de début d'entretien ne peut pas être antérieure à la date de livraison pour le N° de Série {0}
 DocType: Production Order,Actual End Date,Date de Fin Réelle
 DocType: BOM,Operating Cost (Company Currency),Coût d'Exploitation (Devise Société)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,10 +2356,10 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Congé sans solde ne correspond pas aux Feuilles de Demandes de Congé Approuvées
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prochaines Étapes
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles
 DocType: Selling Settings,Auto close Opportunity after 15 days,Fermer automatiquement les Opportunités après 15 jours
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fin de l'Année
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Devis / Prospects %
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,La Date de Fin de Contrat doit être supérieure à la Date d'Embauche
 DocType: Delivery Note,DN-,DN-
 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.
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantité Reçue
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Archive d'Honoraires Créée - {0}
 DocType: Asset Category Account,Asset Category Account,Compte de Catégorie d'Actif
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Impossible de produire plus d'Article {0} que la quantité {1} du Bon de Commande
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Impossible de produire plus d'Article {0} que la quantité {1} du Bon de Commande
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Écriture de Stock {0} n'est pas soumise
 DocType: Payment Reconciliation,Bank / Cash Account,Compte Bancaire / de Caisse
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Prochain Contact Par ne peut être identique à l’Adresse Email du Prospect
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Date de Compensation non indiquée
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Production
 DocType: Guardian,Occupation,Occupation
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le Système de Nommage des Employés depuis Ressources Humaines&gt; Paramètres RH
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ligne {0} : La Date de Début doit être avant la Date de Fin
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qté)
 DocType: Sales Invoice,This Document,Ce Document
 DocType: Installation Note Item,Installed Qty,Qté Installée
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Signaler un Problème
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Frais de Services Publics
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Dessus
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ligne #{0} : L’Écriture de Journal {1} n'a pas le compte {2} ou est déjà réconciliée avec une autre référence
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ligne #{0} : L’Écriture de Journal {1} n'a pas le compte {2} ou est déjà réconciliée avec une autre référence
 DocType: Buying Settings,Default Buying Price List,Liste des Prix d'Achat par Défaut
 DocType: Process Payroll,Salary Slip Based on Timesheet,Fiche de Paie basée sur la Feuille de Temps
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Aucun employé pour les critères sélectionnés ci-dessus ou pour les fiches de paie déjà créées
 DocType: Notification Control,Sales Order Message,Message de la Commande Client
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Définir les Valeurs par Défaut comme : Societé, Devise, Exercice Actuel, etc..."
 DocType: Payment Entry,Payment Type,Type de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sélectionnez un lot pour l&#39;élément {0}. Impossible de trouver un seul lot qui satisfait cette exigence
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Veuillez sélectionner un Lot pour l'Article {0}. Impossible de trouver un seul lot satisfaisant à cette exigence
 DocType: Process Payroll,Select Employees,Sélectionner les Employés
 DocType: Opportunity,Potential Sales Deal,Ventes Potentielles
 DocType: Payment Entry,Cheque/Reference Date,Chèque/Date de Référence
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profil PDV Global {0} déjà créé pour la société {1}
 DocType: Purchase Order,Ref SQ,Réf SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Remplacer l’Article / LDM dans toutes les LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Le reçu doit être soumis
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Le reçu doit être soumis
 DocType: Purchase Invoice Item,Received Qty,Qté Reçue
 DocType: Stock Entry Detail,Serial No / Batch,N° de Série / Lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Non Payé et Non Livré
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Aucunes feuilles de temps
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Le Type de Congé {0} ne peut pas être reporté
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',L'Échéancier d'Entretien n'est pas créé pour tous les articles. Veuillez clicker sur 'Créer un Échéancier'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',L'Échéancier d'Entretien n'est pas créé pour tous les articles. Veuillez clicker sur 'Créer un Échéancier'
 ,To Produce,À Produire
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Paie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'Article, les lignes {3} doivent également être incluses"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Créer un Utilisateur
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Créer un Utilisateur
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identification de l'emballage pour la livraison (pour l'impression)
 DocType: Bin,Reserved Quantity,Quantité Réservée
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Entrez une adresse email valide
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Un Modèle Désactivé ne doit pas être un Modèle par Défaut
 DocType: Account,Income Account,Compte de Produits
 DocType: Payment Request,Amount in customer's currency,Montant dans la devise du client
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Livraison
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Livraison
 DocType: Stock Reconciliation Item,Current Qty,Qté Actuelle
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Voir ""Taux des Matériaux Basé Sur"" dans la Section des Coûts"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Précédent
 DocType: Appraisal Goal,Key Responsibility Area,Domaine de Responsabilités Principal
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Les Lots d'Étudiants vous aide à suivre la présence, les évaluations et les frais pour les étudiants"
 DocType: Payment Entry,Total Allocated Amount,Montant Total Alloué
 DocType: Item Reorder,Material Request Type,Type de Demande de Matériel
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accumulation des Journaux d'Écritures pour les salaires de {0} à {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Le Stockage Local est plein, sauvegarde impossible"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Le Stockage Local est plein, sauvegarde impossible"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ligne {0} : Facteur de Conversion LDM est obligatoire
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Réf
 DocType: Budget,Cost Center,Centre de Coûts
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Cacher le N° de TVA du Client des Transactions de Vente
 DocType: Upload Attendance,Upload HTML,Charger HTML
 DocType: Employee,Relieving Date,Date de Relève
-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.","La Règle de Tarification est faite pour remplacer la Liste de Prix / définir le pourcentage de remise, sur la base de certains critères."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","La Règle de Tarification est faite pour remplacer la Liste de 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,L'entrepôt ne peut être modifié que via Écriture de Stock / Bon de Livraison / Reçu d'Achat
 DocType: Employee Education,Class / Percentage,Classe / Pourcentage
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Responsable du Marketing et des Ventes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Impôt sur le Revenu
-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.","Si la Règle de Prix sélectionnée est faite pour 'Prix', elle écrasera la Liste de Prix. La prix de la Règle de Prix est le prix définitif, donc aucune réduction supplémentaire ne devrait être appliquée. Ainsi, dans les transactions comme des Commandes Clients, Bon de Commande, etc., elle sera récupérée dans le champ 'Taux', plutôt que champ 'Taux de la Liste de Prix'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Si la Règle de Prix sélectionnée est faite pour 'Prix', elle écrasera la Liste de Prix. La prix de la Règle de Prix est le prix définitif, donc aucune réduction supplémentaire ne devrait être appliquée. Ainsi, dans les transactions comme des Commandes Clients, Bon de Commande, etc., elle sera récupérée dans le champ 'Taux', plutôt que champ 'Taux de la Liste de Prix'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Suivre les Prospects par Type d'Industrie
 DocType: Item Supplier,Item Supplier,Fournisseur de l'Article
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Veuillez entrer le Code d'Article pour obtenir n° de lot
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Veuillez sélectionner une valeur pour {0} devis à {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Toutes les Adresses.
 DocType: Company,Stock Settings,Réglages de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","La combinaison est possible seulement si les propriétés suivantes sont les mêmes dans les deux dossiers. Est Groupe, Type de Racine, Société"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Enverra un email au sujet de l'événement pour les employés ayant le statut 'Ouvert'
 DocType: Task,Depends on Tasks,Dépend des Tâches
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gérer l'Arborescence des Groupes de Clients.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Les pièces jointes peuvent être affichées sans autoriser le panier
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nom du Nouveau Centre de Coûts
 DocType: Leave Control Panel,Leave Control Panel,Quitter le Panneau de Configuration
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,Débit Pour
 DocType: Delivery Note,Required only for sample item.,Requis uniquement pour les échantillons.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qté Réelle Après Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fournisseur&gt; Type de fournisseur
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Aucune fiche de paie trouvée entre {0} et {1}
 ,Pending SO Items For Purchase Request,Articles de Commande Client en Attente Pour la Demande d'Achat
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions des Étudiants
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} est désactivé
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} est désactivé
 DocType: Supplier,Billing Currency,Devise de Facturation
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Produit Présenté sur la Page d'Accueil
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tous les Groupes d'Évaluation
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nouveau Nom d'Entrepôt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Région
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Veuillez indiquer le nb de visites requises
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Veuillez indiquer le nb de visites requises
 DocType: Stock Settings,Default Valuation Method,Méthode de Valorisation par Défaut
 DocType: Vehicle Log,Fuel Qty,Qté Carburant
 DocType: Production Order Operation,Planned Start Time,Heure de Début Prévue
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,Données de Base des Listes de Prix
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toutes les Transactions de Vente peuvent être assignées à plusieurs **Commerciaux** pour configurer et surveiller les objectifs.
 ,S.O. No.,S.O. N°.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Veuillez créer un Client à partir du Prospect {0}
 DocType: Price List,Applicable for Countries,Applicable pour les Pays
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Seules les Demandes de Congés avec le statut 'Appouvée' ou 'Rejetée' peuvent être soumises
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Nom du Groupe d'Étudiant est obligatoire dans la ligne {0}
@@ -2623,10 +2630,10 @@
 DocType: Attendance,Leave Type,Type de Congé
 DocType: Purchase Invoice,Supplier Invoice Details,Détails de la Facture du Fournisseur
 apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»
-DocType: Project,Copied From,Copié à partir de
+DocType: Project,Copied From,Copié Depuis
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Erreur de Nom: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Pénurie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} n'est pas associé(e) à {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} n'est pas associé(e) à {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,La présence de l'employé {0} est déjà marquée
 DocType: Packing Slip,If more than one package of the same type (for print),Si plus d'un paquet du même type (pour l'impression)
 ,Salary Register,Registre du Salaire
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Utiliser pour le Panier
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},La Valeur {0} pour l'Attribut {1} n'existe pas dans la liste des Valeurs d'Attribut d’Article valides pour l’Article {2}
 DocType: BOM Item,Scrap %,% de Rebut
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement à la qté ou au montant de l'article, selon votre sélection"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Les frais seront distribués proportionnellement à la qté ou au montant de l'article, selon votre sélection"
 DocType: Maintenance Visit,Purposes,Objets
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Au moins un article doit être saisi avec quantité négative dans le document de retour
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Opération {0} plus longue que toute heure de travail disponible dans le poste {1}, séparer l'opération en plusieurs opérations"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gérer l’Arborescence des Régions.
 DocType: Journal Entry Account,Sales Invoice,Facture de Vente
 DocType: Journal Entry Account,Party Balance,Solde de la Partie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Veuillez sélectionnez Appliquer Remise Sur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Veuillez sélectionnez Appliquer Remise Sur
 DocType: Company,Default Receivable Account,Compte Client par Défaut
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Créer une Écriture Bancaire pour le salaire total payé avec les critères sélectionnés ci-dessus
 DocType: Stock Entry,Material Transfer for Manufacture,Transfert de Matériel pour la 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é pour une liste de prix en particulier ou pour toutes les listes de prix.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Pourcentage de Réduction peut être appliqué pour une liste de prix en particulier ou pour toutes les listes de prix.
 DocType: Purchase Invoice,Half-yearly,Semestriel
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Écriture Comptable pour Stock
 DocType: Vehicle Service,Engine Oil,Huile Moteur
 DocType: Sales Invoice,Sales Team1,Équipe des Ventes 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Article {0} n'existe pas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Article {0} n'existe pas
 DocType: Sales Invoice,Customer Address,Adresse du Client
 DocType: Employee Loan,Loan Details,Détails du Prêt
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ligne {0} : Qté Complétée doit être supérieure à zéro.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,Type de Racine
 DocType: Item,FIFO,"FIFO (Premier entré, Premier sorti)"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Ligne # {0} : Vous ne pouvez pas retourner plus de {1} pour l’Article {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Terrain
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Terrain
 DocType: Item Group,Show this slideshow at the top of the page,Afficher ce diaporama en haut de la page
 DocType: BOM,Item UOM,UDM de l'Article
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Montant de la Taxe Après Remise (Devise Société)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},L’Entrepôt cible est obligatoire pour la ligne {0}
 DocType: Cheque Print Template,Primary Settings,Réglages Principaux
 DocType: Purchase Invoice,Select Supplier Address,Sélectionner l'Adresse du Fournisseur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Ajouter des Employés
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Ajouter des Employés
 DocType: Purchase Invoice Item,Quality Inspection,Inspection de la Qualité
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Très Petit
 DocType: Company,Standard Template,Modèle Standard
 DocType: Training Event,Theory,Théorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Le compte {0} est gelé
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entité Juridique / Filiale avec un Plan de Comptes différent appartenant à l'Organisation.
 DocType: Payment Request,Mute Email,Email Silencieux
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentation, Boissons et Tabac"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Le paiement n'est possible qu'avec les {0} non facturés
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Le paiement n'est possible qu'avec les {0} non facturés
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Taux de commission ne peut pas être supérieure à 100
 DocType: Stock Entry,Subcontract,Sous-traiter
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Veuillez d’abord entrer {0}
@@ -2730,7 +2737,7 @@
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,Date de Début du Projet
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +11,Until,Jusqu'à
 DocType: Rename Tool,Rename Log,Journal des Renommages
-apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Le groupe d&#39;étudiants ou le calendrier des cours est obligatoire
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,Le Ggroupe d'Étudiants ou le Calendrier des Cours est obligatoire
 DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,Maintenir les Heures Facturables et les Heures de Travail sur la même Feuille de Temps
 DocType: Maintenance Visit Purpose,Against Document No,Pour le Document N°
 DocType: BOM,Scrap,Mettre au Rebut
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Les entrepôts avec des transactions existantes ne peuvent pas être convertis en groupe.
 DocType: Assessment Result Tool,Result HTML,Résultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expire Le
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Ajouter des Étudiants
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Ajouter des Étudiants
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Veuillez sélectionner {0}
 DocType: C-Form,C-Form No,Formulaire-C Nº
 DocType: BOM,Exploded_items,Articles-éclatés
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Nb
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrez le nom de la campagne si la source de l'enquête est une campagne
 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 l'Exercice
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Sélectionner l'Exercice
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Niveau de Réapprovisionnement
 DocType: Company,Chart Of Accounts Template,Modèle de Plan Comptable
 DocType: Attendance,Attendance Date,Date de Présence
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Écriture en double
 DocType: Program Enrollment Tool,Get Students,Obtenir les Étudiants
 DocType: Serial No,Under Warranty,Sous Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Erreur]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Erreur]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,En Toutes Lettres. Sera visible une fois que vous enregistrerez la Commande Client
 ,Employee Birthday,Anniversaire de l'Employé
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Outil de Présence de Lot d'Étudiants
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limite Dépassée
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital Risque
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Une période universitaire avec cette 'Année Universitaire' {0} et 'Nom de la Période' {1} existe déjà. Veuillez modifier ces entrées et essayer à nouveau.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Comme il existe des transactions avec l'article {0}, vous ne pouvez pas changer la valeur de {1}"
 DocType: UOM,Must be Whole Number,Doit être un Nombre Entier
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nouvelle Allocation de Congés (en jours)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,N° de Série {0} n’existe pas
@@ -2823,7 +2830,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de matériaux facturés pour cette Commande Client
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Écriture de Clôture de la Période
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en groupe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Montant {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortissement
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fournisseur(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Outil de Gestion des Présences des Employés
@@ -2833,7 +2840,7 @@
 DocType: Salary Component,Salary Component,Composante Salariale
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Écritures de Paiement {0} ne sont pas liées
 DocType: GL Entry,Voucher No,N° de Référence
-,Lead Owner Efficiency,Efficacité des propriétaires principaux
+,Lead Owner Efficiency,Efficacité des Responsables des Prospects
 DocType: Leave Allocation,Leave Allocation,Allocation de Congés
 DocType: Payment Request,Recipient Message And Payment Details,Message du Destinataire et Détails de Paiement
 DocType: Training Event,Trainer Email,Email du Formateur
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,Dernier Jour du Mois Suivant
 DocType: Support Settings,Auto close Issue after 7 days,Fermer automatique les Questions après 7 jours
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Congé ne peut être alloué avant le {0}, car le solde de congés a déjà été reporté dans la feuille d'allocation de congés futurs {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Remarque : Date de Référence / d’Échéance dépasse le nombre de jours de crédit client autorisé de {0} jour(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidature Étudiante
 DocType: Asset Category Account,Accumulated Depreciation Account,Compte d'Amortissement Cumulé
 DocType: Stock Settings,Freeze Stock Entries,Geler les Entrées de Stocks
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,Analyse du Stock
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Les opérations ne peuvent pas être laissées vides
 DocType: Maintenance Visit Purpose,Against Document Detail No,Pour le Détail du Document N°
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Type de Partie est Obligatoire
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Type de Partie est Obligatoire
 DocType: Quality Inspection,Outgoing,Sortant
 DocType: Material Request,Requested For,Demandé Pour
 DocType: Quotation Item,Against Doctype,Contre Doctype
@@ -2874,17 +2881,17 @@
 DocType: Asset,Item Code,Code de l'Article
 DocType: Production Planning Tool,Create Production Orders,Créer des Commandes de Production
 DocType: Serial No,Warranty / AMC Details,Garantie / Détails AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Sélectionnez les élèves manuellement pour le groupe basé sur l&#39;activité
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Sélectionner les élèves manuellement pour un Groupe basé sur l'Activité
 DocType: Journal Entry,User Remark,Remarque de l'Utilisateur
 DocType: Lead,Market Segment,Part de Marché
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Antécédents Professionnels Interne de l'Employé
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Fermeture (Dr)
 DocType: Cheque Print Template,Cheque Size,Taille du Chèque
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,N° de Série {0} n'est pas en stock
 apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,Modèle de taxe pour les opérations de vente.
 DocType: Sales Invoice,Write Off Outstanding Amount,Encours de Reprise
-DocType: School Settings,Current Academic Year,Année académique actuelle
+DocType: School Settings,Current Academic Year,Année Académique Actuelle
 DocType: Stock Settings,Default Stock UOM,UDM par Défaut des Articles
 DocType: Asset,Number of Depreciations Booked,Nombre d’Amortissements Comptabilisés
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},Pour le Prêt Employé : {0}
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,Créer des Demandes de Matériel
 DocType: Employee Education,School/University,École/Université
 DocType: Payment Request,Reference Details,Détails de la Référence
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valeur Attendue Après Utilisation Complète doit être inférieure au Montant d'Achat Brut
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qté Disponible à l'Entrepôt
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montant Facturé
 DocType: Asset,Double Declining Balance,Double Solde Dégressif
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Le Montant Remboursé ne peut pas être supérieur au Montant du Prêt {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numéro de Bon de Commande requis pour l'Article {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordre de Production non créé
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Ordre de Production non créé
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',La ‘Date de Début’ doit être antérieure à la ‘Date de Fin’
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossible de changer le statut car l'étudiant {0} est lié à la candidature de l'étudiant {1}
 DocType: Asset,Fully Depreciated,Complètement Déprécié
 ,Stock Projected Qty,Qté de Stock Projeté
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Le Client {0} ne fait pas parti du projet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML des Présences Validées
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Les devis sont des propositions, offres que vous avez envoyées à vos clients"
 DocType: Sales Order,Customer's Purchase Order,N° de Bon de Commande du Client
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N° de Série et lot
 DocType: Warranty Claim,From Company,De la Société
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Somme des Scores de Critères d'Évaluation doit être {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valeur ou Qté
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Veuillez définir le Nombre d’Amortissements Comptabilisés
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valeur ou Qté
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Les Ordres de Production ne peuvent pas être créés pour:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxes et Frais d’Achats
@@ -2934,11 +2941,11 @@
 DocType: Leave Block List,Leave Block List Allowed,Liste de Blocage des Congés Autorisée
 DocType: Grading Scale Interval,Grading Scale Interval,Intervalle de l'Échelle de Notation
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Note de Frais pour Indémnité Kilométrique {0}
-DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Réduction (%) du tarif de la liste de prix avec la marge
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,Remise (%) sur le Tarif de la Liste de Prix avec la Marge
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Tous les Entrepôts
 DocType: Sales Partner,Retailer,Détaillant
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Le compte À Créditer doit être un compte de Bilan
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Tous les Types de Fournisseurs
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tous les Types de Fournisseurs
 DocType: Global Defaults,Disable In Words,"Désactiver ""En Lettres"""
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Le code de l'Article est obligatoire car l'Article n'est pas numéroté automatiquement
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Le devis {0} n'est pas du type {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Compte de Découvert Bancaire
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Créer une Fiche de Paie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ligne # {0}: montant attribué ne peut pas être supérieur au montant en souffrance.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Parcourir la LDM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Prêts Garantis
 DocType: Purchase Invoice,Edit Posting Date and Time,Modifier la Date et l'Heure de la Publication
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Non autorisé à mettre à jour les transactions du stock antérieures à {0}
 DocType: Purchase Invoice Item,PR Detail,Détail PR
 DocType: Sales Order,Fully Billed,Entièrement Facturé
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Veuillez définir le compte créditeur par défaut pour l'employé {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Liquidités
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Entrepôt de Livraison requis pour article du stock {0}
 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'emballage. (Pour l'impression)
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,Groupe basé sur
 DocType: Journal Entry,Bill Date,Date de la Facture
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Poste de Service, le Type, la fréquence et le montant des frais sont exigés"
-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 une plus haute priorité, les priorités internes suivantes sont appliquées :"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Même s'il existe plusieurs Règles de Tarification avec une plus haute priorité, les priorités internes suivantes sont appliquées :"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Voulez-vous vraiment Soumettre toutes les Fiches de Paie de {0} à {1}
 DocType: Cheque Print Template,Cheque Height,Hauteur du Chèque
 DocType: Supplier,Supplier Details,Détails du Fournisseur
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Facture Ref
 DocType: Purchase Order,Recurring Order,Commande Récurrente
 DocType: Company,Default Income Account,Compte de Produits par Défaut
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Groupe de Client / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Groupe de Clients / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Bénéfice / Perte (Crédit) des Exercices Non Clos
 DocType: Sales Invoice,Time Sheets,Feuilles de Temps
 DocType: Payment Gateway Account,Default Payment Request Message,Message de Demande de Paiement par Défaut
@@ -3028,12 +3035,12 @@
 DocType: Notification Control,Quotation Message,Message du Devis
 DocType: Employee Loan,Employee Loan Application,Demande de Prêt d'un Employé
 DocType: Issue,Opening Date,Date d'Ouverture
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,La présence a été marquée avec succès.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,La présence a été marquée avec succès.
 DocType: Journal Entry,Remark,Remarque
 DocType: Purchase Receipt Item,Rate and Amount,Prix et Montant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Le Type de Compte pour {0} doit être {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Le Type de Compte pour {0} doit être {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Congés et Vacances
-DocType: School Settings,Current Academic Term,Terme académique actuel
+DocType: School Settings,Current Academic Term,Terme Académique Actuel
 DocType: Sales Order,Not Billed,Non Facturé
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Les deux Entrepôt doivent appartenir à la même Société
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Aucun contact ajouté.
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Groupe Étudiant
 DocType: Shopping Cart Settings,Quotation Series,Séries de Devis
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Un article existe avec le même nom ({0}), veuillez changer le nom du groupe d'article ou renommer l'article"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Veuillez sélectionner un client
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Veuillez sélectionner un client
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centre de Coûts de l'Amortissement d'Actifs
 DocType: Sales Order Item,Sales Order Date,Date de la Commande Client
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,Détails Assurance
 DocType: Account,Payable,Créditeur
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Veuillez entrer les Périodes de Remboursement
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Débiteurs ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Débiteurs ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nouveaux Clients
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bénéfice Brut %
 DocType: Appraisal Goal,Weightage (%),Poids (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date de Compensation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Montant d'Achat Brut est obligatoire
 DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,La Partie est obligatoire
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,La Partie est obligatoire
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nom du Sujet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Au moins Vente ou Achat doit être sélectionné
-DocType: Grading Structure,Grade Intervals,Intervalles de Notes
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Sélectionner la nature de votre entreprise.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Ligne # {0}: entrée en double dans les références {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Là où les opérations de fabrication sont réalisées.
 DocType: Asset Movement,Source Warehouse,Entrepôt Source
 DocType: Installation Note,Installation Date,Date d'Installation
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,En-Têtes pour les modèles d'impression.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titres pour les modèles d'impression e.g. Facture Proforma.
 DocType: Student Guardian,Student Guardian,Tuteur d'Étudiant
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Frais de type valorisation ne peuvent pas être marqués comme inclus
 DocType: POS Profile,Update Stock,Mettre à Jour le Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Différentes UDM pour les articles conduira à un Poids Net (Total) incorrect . Assurez-vous que le Poids Net de chaque article a la même unité de mesure .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taux LDM
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Compte de Profits / Pertes sur Change
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Employé et Participation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},L'Objet doit être parmi {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Remplissez et enregistrez le formulaire
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Remplissez et enregistrez le formulaire
 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 de stocks
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum de la Communauté
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Qté réelle en stock
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qté de Réapprovisionnement
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offres d'Emploi Actuelles
 DocType: Company,Stock Adjustment Account,Compte d'Ajustement du Stock
-DocType: Journal Entry,Write Off,Reprise
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Reprise
 DocType: Timesheet Detail,Operation ID,ID de l'Opération
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","L'ID (de connexion) de l'Utilisateur Système. S'il est défini, il deviendra la valeur par défaut pour tous les formulaires des RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Fournisseur livre au Client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (#Formulaire/Article/{0}) est en rupture de stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,La Date Suivante doit être supérieure à Date de Comptabilisation
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Afficher le détail des impôts
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Afficher le détail des impôts
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Date d’échéance / de référence ne peut pas être après le {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importer et Exporter des Données
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Des écritures de stock existent pour l'Entrepôt {0}, vous ne pouvez donc pas le réaffecter ou le modifier"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Aucun étudiant Trouvé
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Aucun étudiant Trouvé
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Date d’Envois de la Facture
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vendre
 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 d'Allocation doit être égale à 100 %
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner la Partie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Veuillez sélectionner la Date de Comptabilisation avant de sélectionner la Partie
 DocType: Program Enrollment,School House,Maison de l'École
 DocType: Serial No,Out of AMC,Sur AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sélectionnez Citations
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Effectuer une Visite d'Entretien
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Veuillez sélectionner des Devis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Nombre d’Amortissements Comptabilisés ne peut pas être supérieur à Nombre Total d'Amortissements
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Effectuer une Visite d'Entretien
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Veuillez contactez l'utilisateur qui a le rôle de Directeur des Ventes {0}
 DocType: Company,Default Cash Account,Compte de Caisse par Défaut
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Données de base de la Société (ni les Clients ni les Fournisseurs)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Basé sur la présence de cet Étudiant
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Aucun étudiant dans
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Ajouter plus d'articles ou ouvrir le formulaire complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Veuillez entrer ‘Date de Livraison Prévue’
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Bons de Livraison {0} doivent être annulés avant d’annuler cette Commande Client
@@ -3226,9 +3234,10 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Article 3
 DocType: Purchase Order,Customer Contact Email,Email Contact Client
 DocType: Warranty Claim,Item and Warranty Details,Détails de l'Article et de la Garantie
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code d'Article&gt; Groupe d'Articles&gt; Marque
 DocType: Sales Team,Contribution (%),Contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié
-apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Sélectionnez le programme pour obtenir des cours obligatoires.
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Sélectionner le Programme pour obtenir les cours obligatoires.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,Responsabilités
 DocType: Expense Claim Account,Expense Claim Account,Compte de Note de Frais
 DocType: Sales Person,Sales Person Name,Nom du Vendeur
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Avant la réconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},À {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taxes et Frais Additionnels (Devise Société)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,La Ligne de Taxe d'Article {0} doit indiquer un compte de type Taxes ou Produit ou Charge ou Facturable
 DocType: Sales Order,Partly Billed,Partiellement Facturé
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,L'article {0} doit être une Immobilisation
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,L'article {0} doit être une Immobilisation
 DocType: Item,Default BOM,LDM par Défaut
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Veuillez saisir à nouveau le nom de la société pour confirmer
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Encours Total
@@ -3252,24 +3261,24 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobile
 DocType: Vehicle,Insurance Company,Compagnie d'Assurance
 DocType: Asset Category Account,Fixed Asset Account,Compte d'Actif Immobilisé
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Du Bon de Livraison
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Du Bon de Livraison
 DocType: Student,Student Email Address,Adresse Email de l'Étudiant
 DocType: Timesheet Detail,From Time,Horaire de Début
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,En Stock :
 DocType: Notification Control,Custom Message,Message Personnalisé
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banque d'Investissement
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,Espèces ou Compte Bancaire est obligatoire pour réaliser une écriture de paiement
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Adresse de l&#39;élève
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Adresse de l'Élève
 DocType: Purchase Invoice,Price List Exchange Rate,Taux de Change de la Liste de Prix
 DocType: Purchase Invoice Item,Rate,Taux
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Interne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nom de l'Adresse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Nom de l'Adresse
 DocType: Stock Entry,From BOM,De LDM
 DocType: Assessment Code,Assessment Code,Code de l'Évaluation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,de Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Les transactions du stock avant {0} sont gelées
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Veuillez cliquer sur ""Générer calendrier''"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Veuillez cliquer sur ""Générer calendrier''"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","e.g. Kg, Unités, Nbr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,N° de Référence obligatoire si vous avez entré une date
 DocType: Bank Reconciliation Detail,Payment Document,Document de Paiement
@@ -3277,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Grille des Salaires
 DocType: Account,Bank,Banque
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Compagnie Aérienne
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Problème Matériel
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Problème Matériel
 DocType: Material Request Item,For Warehouse,Pour l’Entrepôt
 DocType: Employee,Offer Date,Date de la Proposition
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Devis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Vous êtes en mode hors connexion. Vous ne serez pas en mesure de recharger jusqu'à ce que vous ayez du réseau.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Aucun Groupe d'Étudiants créé.
 DocType: Purchase Invoice Item,Serial No,N° de Série
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Montant du Remboursement Mensuel ne peut pas être supérieur au Montant du Prêt
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Veuillez d’abord entrer les Détails de Maintenance
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Veuillez d’abord entrer les Détails de Maintenance
 DocType: Purchase Invoice,Print Language,Langue d’Impression
 DocType: Salary Slip,Total Working Hours,Total des Heures Travaillées
 DocType: Stock Entry,Including items for sub assemblies,Incluant les articles pour des sous-ensembles
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,La valeur entrée doit être positive
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,La valeur entrée doit être positive
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tous les Territoires
 DocType: Purchase Invoice,Items,Articles
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,L'étudiant est déjà inscrit.
@@ -3302,22 +3311,20 @@
 DocType: Payment Reconciliation,Maximum Invoice Amount,Montant Maximal de la Facture
 DocType: Student Language,Student Language,Langue des Étudiants
 apps/erpnext/erpnext/config/selling.py +23,Customers,Clients
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Commande / Quot%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,Commande / Devis %
 DocType: Student Sibling,Institution,Institution
 DocType: Asset,Partially Depreciated,Partiellement Déprécié
 DocType: Issue,Opening Time,Horaire d'Ouverture
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Les date Du et Au sont requises
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Bourses de Valeurs Mobilières et de Marchandises
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',L’Unité de mesure par défaut pour la variante '{0}' doit être la même que dans le Modèle '{1}'
 DocType: Shipping Rule,Calculate Based On,Calculer en fonction de
 DocType: Delivery Note Item,From Warehouse,De l'Entrepôt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Aucun Article avec une Liste de Matériel à Fabriquer
 DocType: Assessment Plan,Supervisor Name,Nom du Superviseur
-DocType: Program Enrollment Course,Program Enrollment Course,Cours d&#39;inscription au programme
-DocType: Grading Structure,Grading Structure,Structure de la Notation
+DocType: Program Enrollment Course,Program Enrollment Course,Cours d'Inscription au Programme
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorisation et Total
 DocType: Tax Rule,Shipping City,Ville de Livraison
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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} (Modèle). Les Attributs seront copiés à partir du modèle sauf si ‘Pas de Copie’ est coché
 DocType: Notification Control,Customize the Notification,Personnaliser la Notification
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flux de Trésorerie provenant des Opérations
 DocType: Sales Invoice,Shipping Rule,Règle de Livraison
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Un compte enfant existe pour ce compte. Vous ne pouvez pas supprimer ce compte.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Soit la qté cible soit le montant cible est obligatoire
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Aucune LDM par défaut n’existe pour l'article {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Veuillez d’abord sélectionner la Date de Comptabilisation
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Date d'Ouverture devrait être antérieure à la Date de Clôture
 DocType: Leave Control Panel,Carry Forward,Reporter
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Un Centre de Coûts avec des transactions existantes ne peut pas être converti en grand livre
 DocType: Department,Days for which Holidays are blocked for this department.,Jours pour lesquels les Vacances sont bloquées pour ce département.
@@ -3350,8 +3357,8 @@
 DocType: Training Event,Trainer Name,Nom du Formateur
 DocType: Mode of Payment,General,Général
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Joindre l'En-tête
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Dernière communication
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Dernière Communication
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Déduction impossible lorsque la catégorie est pour 'Évaluation' ou 'Vaulation et Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Inscrivez vos titres d'impôts (par exemple, TVA, douanes, etc., ils doivent avoir des noms uniques) et leurs taux standards. Cela va créer un modèle standard, que vous pouvez modifier et compléter plus tard."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},N° de Séries Requis pour Article Sérialisé {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Rapprocher les Paiements avec les Factures
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Mnt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertissement et Loisir
 DocType: Quality Inspection,Item Serial No,No de Série de l'Article
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Créer les Dossiers des Employés
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Créer les Dossiers des Employés
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total des Présents
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Déclarations Comptables
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Heure
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Inconnu
 DocType: Shipping Rule,Shipping Rule Conditions,Conditions de la Règle de Livraison
 DocType: BOM Replace Tool,The new BOM after replacement,La nouvelle LDM après remplacement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point de Vente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point de Vente
 DocType: Payment Entry,Received Amount,Montant Reçu
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Veuillez configurer le système de nommage des employés dans Ressources humaines&gt; Paramètres RH
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Créer pour la quantité totale, en ignorant la quantité déjà commandée"
 DocType: Account,Tax,Taxe
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Non Marqué
@@ -3391,41 +3397,43 @@
 DocType: Quality Inspection,Report Date,Date du Rapport
 DocType: Student,Middle Name,Deuxième Nom
 DocType: C-Form,Invoices,Factures
-DocType: Batch,Source Document Name,Nom du document source
+DocType: Batch,Source Document Name,Nom du Document Source
 DocType: Job Opening,Job Title,Titre de l'Emploi
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Créer des Utilisateurs
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Créer des Utilisateurs
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantité à Fabriquer doit être supérieur à 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Rapport de visite pour appel de maintenance
 DocType: Stock Entry,Update Rate and Availability,Mettre à Jour le Prix et la Disponibilité
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Pourcentage que vous êtes autorisé à recevoir ou à livrer en plus de la quantité commandée. Par exemple : Si vous avez commandé 100 unités et que votre allocation est de 10% alors que vous êtes autorisé à recevoir 110 unités.
-DocType: POS Customer Group,Customer Group,Groupe de clients
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau numéro de lot (optionnel)
+DocType: POS Customer Group,Customer Group,Groupe de Clients
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),Nouveau Numéro de Lot (Optionnel)
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Compte de charge est obligatoire pour l'article {0}
 DocType: BOM,Website Description,Description du Site Web
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variation Nette de Capitaux Propres
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Veuillez d’abord annuler la Facture d'Achat {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresse Email doit être unique, existe déjà pour {0}"
 DocType: Serial No,AMC Expiry Date,Date d'Expiration CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Reçu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Reçu
 ,Sales Register,Registre des Ventes
 DocType: Daily Work Summary Settings Company,Send Emails At,Envoyer Emails À
 DocType: Quotation,Quotation Lost Reason,Raison de la Perte du Devis
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Sélectionner votre Nom de Domaine
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Référence de la transaction n° {0} datée du {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Référence de la transaction n° {0} datée du {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Il n'y a rien à modifier.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Résumé du mois et des activités en suspens
 DocType: Customer Group,Customer Group Name,Nom du Groupe Client
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Pas encore de Clients!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,États des Flux de Trésorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Le Montant du prêt ne peut pas dépasser le Montant Maximal du Prêt de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Veuillez retirez cette Facture {0} du C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Veuillez sélectionnez Report si vous souhaitez également inclure le solde des congés de l'exercice précédent à cet exercice
 DocType: GL Entry,Against Voucher Type,Pour le Type de Bon
 DocType: Item,Attributes,Attributs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Veuillez entrer un Compte de Reprise
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Date de la Dernière Commande
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Le compte {0} n'appartient pas à la société {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Les Numéros de Série dans la ligne {0} ne correspondent pas au Bon de Livraison
 DocType: Student,Guardian Details,Détails du Tuteur
 DocType: C-Form,C-Form,Formulaire-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Valider la Présence de plusieurs employés
@@ -3450,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ligne {0} # Le compte doit être de type ‘Actif Immobilisé'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qté Sortante
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Règles de calcul du montant des frais de port pour une vente
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série est obligatoire
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série est obligatoire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Services Financiers
 DocType: Student Sibling,Student ID,Carte d'Étudiant
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Types d'activités pour Journaux de Temps
 DocType: Tax Rule,Sales,Ventes
 DocType: Stock Entry Detail,Basic Amount,Montant de Base
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},L’entrepôt est obligatoire pour l'article du stock {0}
 DocType: Leave Allocation,Unused leaves,Congés non utilisés
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,État de la Facturation
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transférer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} n'est pas associé(e) à un compte auxiliaire {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} n'est pas associé(e) à un compte auxiliaire {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Récupérer la LDM éclatée (y compris les sous-ensembles)
 DocType: Authorization Rule,Applicable To (Employee),Applicable À (Employé)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,La Date d’Échéance est obligatoire
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incrément pour l'Attribut {0} ne peut pas être 0
@@ -3474,13 +3482,13 @@
 ,Inactive Customers,Clients Inactifs
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Reçus d'Achats
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Comment la Règle de Prix doit-elle être appliquée ?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Comment la Règle de Prix doit-elle être appliquée ?
 DocType: Stock Entry,Delivery Note No,Bon de Livraison N°
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Si cochée, seulement des Demandes d'Achat de Matériel pour les matières premières finales seront incluses dans les Demandes de Matériel. Dans le cas contraire, les Demandes de Matériel pour les articles parents seront créées"
 DocType: Cheque Print Template,Message to show,Message à afficher
 DocType: Company,Retail,Vente de Détail
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Ensemble de Produits
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Ensemble de Produits
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ligne {0} : Référence {1} non valide
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modèle de Taxe et Frais d'Achat
 DocType: Upload Attendance,Download Template,Télécharger le Modèle
@@ -3490,21 +3498,22 @@
 DocType: Payment Entry,Account Paid From,Compte Payé Du
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Code d’Article de Matière Première
 DocType: Journal Entry,Write Off Based On,Reprise Basée Sur
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Faire un Prospect
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Faire un Prospect
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impression et Papeterie
 DocType: Stock Settings,Show Barcode Field,Afficher Champ Code Barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Envoyer des Emails au Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Envoyer des Emails au Fournisseur
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaire déjà traité pour la période entre {0} et {1}, La période de demande de congé ne peut pas être entre cette plage de dates."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,N° de Série pour un dossier d'installation
 DocType: Guardian Interest,Guardian Interest,Part du Tuteur
 apps/erpnext/erpnext/config/hr.py +177,Training,Formation
 DocType: Timesheet,Employee Detail,Détail Employé
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1 Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,ID Email du Tuteur1
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,Le jour de la Date Suivante et le Jour de Répétition du Mois doivent être égal
 apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,Réglages pour la page d'accueil du site
 DocType: Offer Letter,Awaiting Response,Attente de Réponse
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Au-dessus
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Attribut invalide {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Veuillez mentionner s'il s'agit d'un compte créditeur non standard
 DocType: Salary Slip,Earning & Deduction,Revenus et Déduction
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facultatif. Ce paramètre sera utilisé pour filtrer différentes transactions.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Taux de Valorisation Négatif n'est pas autorisé
@@ -3520,32 +3529,31 @@
 DocType: Production Order Item,Production Order Item,Article de l'Ordre de Production
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Aucun enregistrement trouvé
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Coût des Immobilisations Mises au Rebut
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Partiellement Commandé
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}
 DocType: Vehicle,Policy No,Politique N°
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obtenir les Articles du Produit Groupé
 DocType: Asset,Straight Line,Ligne Droite
 DocType: Project User,Project User,Utilisateur du Projet
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Divisé
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Fractionner
 DocType: GL Entry,Is Advance,Est Accompte
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,La Date de Présence Depuis et la Date de Présence Jusqu'à sont obligatoires
 apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,Veuillez entrer Oui ou Non pour 'Est sous-traitée'
-apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Dernière date de communication
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,Date de la Dernière Communication
 DocType: Sales Team,Contact No.,N° du Contact
 DocType: Bank Reconciliation,Payment Entries,Écritures de Paiement
 DocType: Production Order,Scrap Warehouse,Entrepôt de Rebut
-DocType: Production Order,Check if material transfer entry is not required,Vérifiez si l&#39;entrée du transfert de matériel n&#39;est pas requise
+DocType: Production Order,Check if material transfer entry is not required,Vérifiez si une un transfert de matériel n'est pas requis
 DocType: Program Enrollment Tool,Get Students From,Obtenir les Étudiants De
 DocType: Hub Settings,Seller Country,Pays du Vendeur
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publier les Articles sur le Site Web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Regrouper vos étudiants en lots
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Regrouper vos étudiants en lots
 DocType: Authorization Rule,Authorization Rule,Règle d'Autorisation
 DocType: Sales Invoice,Terms and Conditions Details,Détails des Termes et Conditions
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Caractéristiques
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modèle de Taxes et Frais de Vente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Total (Crédit)
 DocType: Repayment Schedule,Payment Date,Date de Paiement
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nouvelle quantité de lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nouvelle Qté de Lot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Vêtements & Accessoires
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Nombre de Commandes
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML / bannière qui apparaîtra sur le haut de la liste des produits.
@@ -3583,21 +3591,21 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,Dépenses Directes
 apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",{0} est une adresse email invalide dans 'Notification \ Adresse Email'
-apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveau Revenu de Clientèle
+apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +60,New Customer Revenue,Nouveaux Revenus de Clientèle
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +117,Travel Expenses,Frais de Déplacement
 DocType: Maintenance Visit,Breakdown,Panne
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,Compte : {0} avec la devise : {1} ne peut pas être sélectionné
 DocType: Bank Reconciliation Detail,Cheque Date,Date du Chèque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Compte {0}: Le Compte parent {1} n'appartient pas à l'entreprise: {2}
 DocType: Program Enrollment Tool,Student Applicants,Candidatures Étudiantes
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Suppression de toutes les transactions liées à cette société avec succès !
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Suppression de toutes les transactions liées à cette société avec succès !
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Comme à la date
 DocType: Appraisal,HR,RH
 DocType: Program Enrollment,Enrollment Date,Date de l'Inscription
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Essai
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Composantes Salariales
 DocType: Program Enrollment Tool,New Academic Year,Nouvelle Année Académique
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retour / Note de Crédit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retour / Note de Crédit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insertion automatique du taux de la Liste de Prix si manquante
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Montant Total Payé
 DocType: Production Order Item,Transferred Qty,Quantité Transférée
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type de congé comme courant, maladie, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Envoyer régulièrement des rapports de synthèse par Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Veuillez définir le compte par défaut dans le Type de Note de Frais {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Veuillez définir le compte par défaut dans le Type de Note de Frais {0}
 DocType: Assessment Result,Student Name,Nom de l'Étudiant
 DocType: Brand,Item Manager,Gestionnaire d'Article
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Paie à Payer
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,Entonnoir de Vente
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abréviation est obligatoire
 DocType: Project,Task Progress,Progression de la Tâche
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Panier
 ,Qty to Transfer,Qté à Transférer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Devis de Prospects ou Clients.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rôle Autorisé à modifier un stock gelé
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Détail des Taxes par Article
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abréviation de l'Institut
 ,Item-wise Price List Rate,Taux de la Liste des Prix par Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Devis Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Devis Fournisseur
 DocType: Quotation,In Words will be visible once you save the Quotation.,En Toutes Lettres. Sera visible une fois que vous enregistrerez le Devis.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantité ({0}) ne peut pas être une fraction dans la ligne {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Collecter les Frais
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Le Code Barre {0} est déjà utilisé dans l'article {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Règles pour l'ajout de frais de port.
 DocType: Item,Opening Stock,Stock d'Ouverture
@@ -3687,8 +3696,8 @@
 Updated via 'Time Log'",en Minutes Mises à Jour via le 'Journal des Temps'
 DocType: Customer,From Lead,Du Prospect
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Commandes validées pour la production.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Sélectionner Exercice ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Sélectionner Exercice ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Profil PDV nécessaire pour faire une écriture de PDV
 DocType: Program Enrollment Tool,Enroll Students,Inscrire des Étudiants
 DocType: Hub Settings,Name Token,Nom du Jeton
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vente Standard
@@ -3699,7 +3708,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} pour la Facture de Vente {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nom du Projet
-DocType: Supplier,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
+DocType: Customer,Mention if non-standard receivable account,Mentionner si le compte débiteur n'est pas standard
 DocType: Journal Entry Account,If Income or Expense,Si Produits ou Charges
 DocType: Production Order,Required Items,Articles Requis
 DocType: Stock Ledger Entry,Stock Value Difference,Différence de Valeur du Sock
@@ -3720,12 +3729,12 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Définir des objectifs par Groupe d'Articles pour ce Commercial
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Geler les Articles plus Anciens que [Jours]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ligne #{0} : L’Actif est obligatoire pour les achats / ventes d’actifs immobilisés
-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.","Si deux Règles de Prix ou plus sont trouvées sur la base des conditions ci-dessus, une Priorité est appliquée. La Priorité est un nombre compris entre 0 et 20 avec une valeur par défaut de zéro (vide). Les nombres les plus élévés sont prioritaires s'il y a plusieurs Règles de Prix avec mêmes conditions."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Si deux Règles de Prix ou plus sont trouvées sur la base des conditions ci-dessus, une Priorité est appliquée. La Priorité est un nombre compris entre 0 et 20 avec une valeur par défaut de zéro (vide). Les nombres les plus élévés sont prioritaires s'il y a plusieurs Règles de Prix avec mêmes conditions."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Exercice Fiscal: {0} n'existe pas
 DocType: Currency Exchange,To Currency,Devise Finale
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Autoriser les utilisateurs suivant à approuver les demandes de congés durant les jours bloqués.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Types de Notes de Frais.
-apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le taux de vente pour l&#39;élément {0} est inférieur à son {1}. Le taux de vente devrait être au moins {2}
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Le prix de vente pour l'élément {0} est inférieur à son {1}. Le prix de vente devrait être au moins {2}
 DocType: Item,Taxes,Taxes
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Payé et Non Livré
 DocType: Project,Default Cost Center,Centre de Coûts par Défaut
@@ -3745,7 +3754,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,L'article {0} est ignoré puisqu'il n'est pas en stock
 DocType: Appraisal,APRSL,EVAL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Soumettre cet Ordre de Fabrication pour un traitement ultérieur.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Pour ne pas appliquer la Règle de Tarification dans une transaction particulière, toutes les Règles de Tarification applicables doivent être désactivées."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Pour ne pas appliquer la Règle de Tarification dans une transaction particulière, toutes les Règles de Tarification applicables doivent être désactivées."
 DocType: Assessment Group,Parent Assessment Group,Groupe d’Évaluation Parent
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Emplois
 ,Sales Order Trends,Tendances des Commandes Client
@@ -3756,7 +3765,7 @@
 DocType: Stock Entry Detail,Additional Cost,Frais Supplémentaire
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Date de Fin de l'Exercice Financier
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Créer un Devis Fournisseur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Créer un Devis Fournisseur
 DocType: Quality Inspection,Incoming,Entrant
 DocType: BOM,Materials Required (Exploded),Matériel Requis (Éclaté)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Ajouter des utilisateurs à votre organisation, autre que vous-même"
@@ -3764,7 +3773,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},Ligne # {0} : N° de série {1} ne correspond pas à {2} {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Casual Leave,Congé Occasionnel
 DocType: Batch,Batch ID,ID du Lot
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Remarque : {0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Note : {0}
 ,Delivery Note Trends,Tendance des Bordereaux de Livraisons
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Résumé Hebdomadaire
 ,In Stock Qty,Qté En Stock
@@ -3784,6 +3793,7 @@
 DocType: Employee,History In Company,Ancienneté dans la Société
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Stock Ledger Entry,Stock Ledger Entry,Écriture du Livre d'Inventaire
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Groupe de Clients&gt; Territoire
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Le même article a été saisi plusieurs fois
 DocType: Department,Leave Block List,Liste de Blocage des Congés
 DocType: Sales Invoice,Tax ID,Numéro d'Identification Fiscale
@@ -3793,7 +3803,7 @@
 DocType: Customer,Sales Partner and Commission,Partenaire Commercial et Commission
 DocType: Employee Loan,Rate of Interest (%) / Year,Taux d'Intérêt (%) / Année
 ,Project Quantity,Quantité de Projet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
 DocType: Opportunity,To Discuss,À Discuter
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unités de {1} nécessaires dans {2} pour compléter cette transaction.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taux d'Intérêt (%) Annuel
@@ -3808,7 +3818,7 @@
 DocType: Purchase Invoice,Return,Retour
 DocType: Production Order Operation,Production Order Operation,Opération d’Ordre de Production
 DocType: Pricing Rule,Disable,Désactiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Mode de paiement est requis pour effectuer un paiement
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Mode de paiement est requis pour effectuer un paiement
 DocType: Project Task,Pending Review,Revue en Attente
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","L'actif {0} ne peut pas être mis au rebut, car il est déjà {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total des Notes de Frais (via Note de Frais)
@@ -3816,11 +3826,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marquer Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ligne {0} : La devise de la LDM #{1} doit être égale à la devise sélectionnée {2}
 DocType: Journal Entry Account,Exchange Rate,Taux de Change
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Commande Client {0} n'a pas été transmise
 DocType: Homepage,Tag Line,Ligne de Tag
 DocType: Fee Component,Fee Component,Composant d'Honoraires
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestion de Flotte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Ajouter des articles de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Ajouter des articles de
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,Ordinaire
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Le total des pondérations de tous les Critères d'Évaluation doit être égal à 100%
@@ -3833,7 +3843,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,L'entrepôt {0} n'existe pas
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,S'inscrire au Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Pourcentages de Répartition Mensuelle
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,L’article sélectionné ne peut pas avoir de Lot
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Taux de valorisation non trouvé pour l’Article {0}, qui est nécessaire pour faire les écritures comptables pour {1} {2}. Si l’article est un l'échantillon dans {1}, veuillez le mentionner dans la table d’article de {1}. Dans le cas contraire, veuillez créer une écriture de stock pour l’article ou définir un taux de valorisation dans les données de base de l’article et essayez de soumettre / annuler cette écriture"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de matériaux livrés pour ce Bon de Livraison
 DocType: Project,Customer Details,Détails du client
@@ -3842,15 +3852,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrez le paramètre url pour le nombre de destinataires
 DocType: Payment Entry,Paid Amount,Montant Payé
 DocType: Assessment Plan,Supervisor,Superviseur
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,En Ligne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,En Ligne
 ,Available Stock for Packing Items,Stock Disponible pour les Articles d'Emballage
 DocType: Item Variant,Item Variant,Variante de l'Article
 DocType: Assessment Result Tool,Assessment Result Tool,Outil de Résultat d'Évaluation
 DocType: BOM Scrap Item,BOM Scrap Item,Article Mis au Rebut LDM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Commandes Soumises ne peuvent pas être supprimés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestion de la Qualité
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,L'article {0} a été désactivé
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,L'article {0} a été désactivé
 DocType: Employee Loan,Repay Fixed Amount per Period,Rembourser un Montant Fixe par Période
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Veuillez entrer une quantité pour l'article {0}
 DocType: Employee External Work History,Employee External Work History,Antécédents Professionnels de l'Employé
@@ -3862,7 +3872,7 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Centres de Coûts
 DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Taux auquel la devise du fournisseur est convertie en devise société de base
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Ligne #{0}: Minutage en conflit avec la ligne {1}
-DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Permettre le taux d&#39;évaluation zéro
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Autoriser un Taux de Valorisation Égal à Zéro
 DocType: Training Event Employee,Invited,Invité
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,Plusieurs Grilles de Salaires Actives trouvées pour l'employé {0} pour les dates données
 DocType: Opportunity,Next Contact,Contact Suivant
@@ -3873,17 +3883,17 @@
 ,Cash Flow,Flux de Trésorerie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,La période de la demande ne peut pas être sur deux dossiers d'allocation
 DocType: Item Group,Default Expense Account,Compte de Charges par Défaut
-apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Étudiant Email ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID Email de l'Étudiant
 DocType: Employee,Notice (days),Préavis (jours)
 DocType: Tax Rule,Sales Tax Template,Modèle de la Taxe de Vente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Sélectionner les articles pour sauvegarder la facture
 DocType: Employee,Encashment Date,Date de l'Encaissement
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajustement du Stock
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Un Coût d’Activité par défault existe pour le Type d’Activité {0}
 DocType: Production Order,Planned Operating Cost,Coûts de Fonctionnement Prévus
 DocType: Academic Term,Term Start Date,Date de Début du Terme
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Opp Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +18,Opp Count,Compte d'Opportunités
 apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},Veuillez trouver ci-joint {0} # {1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,Solde du Relevé Bancaire d’après le Grand Livre
 DocType: Job Applicant,Applicant Name,Nom du Candidat
@@ -3900,7 +3910,7 @@
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Veuillez préciser la plage de / à
 DocType: Serial No,Under AMC,Sous AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Le taux d'évaluation de l'article est recalculé compte tenu du montant du bon de prix au débarquement
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Le taux d'évaluation de l'article est recalculé compte tenu du montant du bon de prix au débarquement
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Paramètres par défaut pour les transactions de vente.
 DocType: Guardian,Guardian Of ,Tuteur De
 DocType: Grading Scale Interval,Threshold,Seuil
@@ -3910,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Notes de Débit Émises
 DocType: Production Order,Warehouses,Entrepôts
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actif ne peut pas être transféré
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Cet article est une Variante de {0} (Modèle).
 DocType: Workstation,per hour,par heure
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Achat
 DocType: Announcement,Announcement,Annonce
@@ -3925,9 +3936,9 @@
 DocType: Account,Receivable,Créance
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ligne #{0} : Changement de Fournisseur non autorisé car un Bon de Commande existe déjà
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rôle qui est autorisé à soumettre des transactions qui dépassent les limites de crédit fixées.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
-DocType: Item,Material Issue,Problème Matériel
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Sélectionner les Articles à Fabriquer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Données de base en cours de synchronisation, cela peut prendre un certain temps"
+DocType: Item,Material Issue,Sortie de Matériel
 DocType: Hub Settings,Seller Description,Description du Vendeur
 DocType: Employee Education,Qualification,Qualification
 DocType: Item Price,Item Price,Prix de l'Article
@@ -3938,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Commandé
 DocType: Salary Detail,Component,Composant
 DocType: Assessment Criteria,Assessment Criteria Group,Groupe de Critère d'Évaluation
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortissement Cumulé d'Ouverture doit être inférieur ou égal à {0}
 DocType: Warehouse,Warehouse Name,Nom de l'Entrepôt
 DocType: Naming Series,Select Transaction,Sélectionner la Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur
@@ -3951,7 +3962,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},La Date Finale doit être dans l'exercice. En supposant Date Finale = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Ici vous pouvez conserver la hauteur, le poids, les allergies, les préoccupations médicales etc."
 DocType: Leave Block List,Applies to Company,S'applique à la Société
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'Écriture de Stock soumise {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Impossible d'annuler car l'Écriture de Stock soumise {0} existe
 DocType: Employee Loan,Disbursement Date,Date de Décaissement
 DocType: Vehicle,Vehicle,Véhicule
 DocType: Purchase Invoice,In Words,En Toutes Lettres
@@ -3962,17 +3973,17 @@
 DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,Voir Tâche
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,Date de début de la période comptable
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Prospect %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Amortissements et Soldes d'Actif
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Montant {0} {1} transféré de {2} à {3}
 DocType: Sales Invoice,Get Advances Received,Obtenir Acomptes Reçus
 DocType: Email Digest,Add/Remove Recipients,Ajouter/Supprimer des Destinataires
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaction non autorisée pour l'Ordre de Production arrêté {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pour définir cet Exercice Fiscal par défaut, cliquez sur ""Définir par défaut"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Joindre
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qté de Pénurie
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,La variante de l'article {0} existe avec les mêmes caractéristiques
 DocType: Employee Loan,Repay from Salary,Rembourser avec le Salaire
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Demande de Paiement pour {0} {1} pour le montant {2}
@@ -3990,7 +4001,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Détails des Résultats d'Évaluation
 DocType: Employee Education,Employee Education,Formation de l'Employé
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Groupe d’articles en double trouvé dans la table des groupes d'articles
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Nécessaire pour aller chercher les Détails de l'Article.
 DocType: Salary Slip,Net Pay,Salaire Net
 DocType: Account,Account,Compte
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,N° de Série {0} a déjà été reçu
@@ -3999,7 +4010,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","L'entrepôt {0} n'est liée à auncun compte, veuillez créer/lier le compte (Actif) correspondant pour l'entrepôt."
 DocType: Purchase Invoice,Recurring Id,Id Récurrent
 DocType: Customer,Sales Team Details,Détails de l'Équipe des Ventes
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Supprimer définitivement ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Supprimer définitivement ?
 DocType: Expense Claim,Total Claimed Amount,Montant Total Réclamé
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Opportunités potentielles de vente.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalide {0}
@@ -4010,13 +4021,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Configurez votre École dans ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montant de Base à Rendre (Devise de la Société)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Pas d’écritures comptables pour les entrepôts suivants
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Pas d’écritures comptables pour les entrepôts suivants
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Enregistrez le document d'abord.
 DocType: Account,Chargeable,Facturable
 DocType: Company,Change Abbreviation,Changer l'Abréviation
 DocType: Expense Claim Detail,Expense Date,Date de Frais
 DocType: Item,Max Discount (%),Réduction Max (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Montant de la Dernière Commande
+DocType: Task,Is Milestone,Est un Jalon
 DocType: Daily Work Summary,Email Sent To,Email Envoyé À
 DocType: Budget,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."
@@ -4037,7 +4049,7 @@
 DocType: Item Attribute Value,Attribute Value,Valeur de l'Attribut
 ,Itemwise Recommended Reorder Level,Renouvellement Recommandé par Article
 DocType: Salary Detail,Salary Detail,Détails du Salaire
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Veuillez d’abord sélectionner {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Veuillez d’abord sélectionner {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Lot {0} de l'Article {1} a expiré.
 DocType: Sales Invoice,Commission,Commission
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Feuille de Temps pour la Fabrication.
@@ -4049,41 +4061,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Geler les stocks datant de plus` doit être inférieur à %d jours.
 DocType: Tax Rule,Purchase Tax Template,Modèle de Taxes pour les Achats
 ,Project wise Stock Tracking,Suivi des Stocks par Projet
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},L'Échéancier d'Entretien {0} existe pour {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qté Réelle (à la source/cible)
 DocType: Item Customer Detail,Ref Code,Code de Réf.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Dossiers de l'Employé.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Veuillez définir la Prochaine Date d’Amortissement
 DocType: HR Settings,Payroll Settings,Réglages de la Paie
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Rapprocher les Factures non liées avec les Paiements.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Passer la Commande
 DocType: Email Digest,New Purchase Orders,Nouveaux Bons de Commande
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Sélectionner une Marque ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Sélectionner une Marque ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortissement Cumulé depuis
 DocType: Sales Invoice,C-Form Applicable,Formulaire-C Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,L'entrepôt est obligatoire
 DocType: Supplier,Address and Contacts,Adresse et Contacts
 DocType: UOM Conversion Detail,UOM Conversion Detail,Détails de Conversion de l'UDM
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Garder le compatible avec le web 900px par 100px
 DocType: Program,Program Abbreviation,Abréviation du Programme
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordre de Production ne peut être créé avec un Modèle d’Article
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordre de Production ne peut être créé avec un Modèle d’Article
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Les frais sont mis à jour dans le Reçu d'Achat pour chaque article
 DocType: Warranty Claim,Resolved By,Résolu Par
 DocType: Bank Guarantee,Start Date,Date de Début
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Allouer des congés pour une période.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chèques et Dépôts incorrectement compensés
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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,Taux de la Liste des Prix
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Créer les devis client
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Créer les devis client
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Afficher ""En stock"" ou ""Pas en stock"" basé sur le stock disponible dans cet entrepôt."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Liste de Matériaux (LDM)
 DocType: Item,Average time taken by the supplier to deliver,Délai moyen de livraison par le fournisseur
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Résultat de l'Évaluation
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Heures
 DocType: Project,Expected Start Date,Date de Début Prévue
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Retirer l'article si les charges ne lui sont pas applicables
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Retirer l'article si les charges ne lui sont pas applicables
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,La devise de la Transaction doit être la même que la devise de la Passerelle de Paiement
 DocType: Payment Entry,Receive,Recevoir
@@ -4094,20 +4105,20 @@
 DocType: Workstation,Operating Costs,Coûts d'Exploitation
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action si le Budget Mensuel Cumulé est Dépassé
 DocType: Purchase Invoice,Submit on creation,Soumettre à la Création
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Devise pour {0} doit être {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Devise pour {0} doit être {1}
 DocType: Asset,Disposal Date,Date d’Élimination
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Les Emails seront envoyés à tous les Employés Actifs de la société à l'heure donnée, s'ils ne sont pas en vacances. Le résumé des réponses sera envoyé à minuit."
 DocType: Employee Leave Approver,Employee Leave Approver,Approbateur des Congés de l'Employé
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Impossible de déclarer comme perdu, parce que le Devis a été fait."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ligne {0} : Une écriture de Réapprovisionnement existe déjà pour cet entrepôt {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Impossible de déclarer comme perdu, parce que le Devis a été fait."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Retour d'Expérience sur la Formation
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'Ordre de Production {0} doit être soumis
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Veuillez sélectionner la Date de Début et Date de Fin pour l'Article {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Veuillez sélectionner la Date de Début et Date de Fin pour l'Article {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Cours est obligatoire à la ligne {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,La date de fin ne peut être antérieure à la date de début
 DocType: Supplier Quotation Item,Prevdoc DocType,DocPréc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Ajouter / Modifier Prix
-DocType: Batch,Parent Batch,Lot parental
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Ajouter / Modifier Prix
+DocType: Batch,Parent Batch,Lot Parent
 DocType: Cheque Print Template,Cheque Print Template,Modèles d'Impression de Chèques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Tableau des Centres de Coûts
 ,Requested Items To Be Ordered,Articles Demandés à Commander
@@ -4119,7 +4130,7 @@
 ,Ordered Items To Be Delivered,Articles Commandés à Livrer
 DocType: Account,Income,Revenu
 DocType: Industry Type,Industry Type,Secteur d'Activité
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Quelque chose a mal tourné !
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Quelque chose a mal tourné !
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Attention : la demande de congé contient les dates bloquées suivantes
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,La Facture Vente {0} a déjà été transmise
 DocType: Assessment Result Detail,Score,Score
@@ -4150,17 +4161,17 @@
 DocType: Item,Variant Based On,Variante Basée Sur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Le total des pondérations attribuées devrait être de 100 %. Il est {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vos Fournisseurs
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Impossible de définir comme perdu alors qu'un Bon de Commande a été créé.
 DocType: Request for Quotation Item,Supplier Part No,N° de Pièce du Fournisseur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Reçu De
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Vous ne pouvez pas déduire lorsqu'une catégorie est pour 'Évaluation' ou 'Évaluation et Total'
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Reçu De
 DocType: Lead,Converted,Converti
 DocType: Item,Has Serial No,A un N° de Série
 DocType: Employee,Date of Issue,Date d'Émission
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0} : Du {0} pour {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0} : Du {0} pour {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ligne #{0} : Définir Fournisseur pour l’article {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ligne {0} : La valeur des heures doit être supérieure à zéro.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Image pour le Site Web {0} attachée à l'Article {1} ne peut pas être trouvée
 DocType: Issue,Content Type,Type de Contenu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Ordinateur
 DocType: Item,List this Item in multiple groups on the website.,Liste cet article dans plusieurs groupes sur le site.
@@ -4169,20 +4180,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Vous n'êtes pas autorisé à définir des valeurs gelées
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obtenir les Écritures non Réconcilliées
 DocType: Payment Reconciliation,From Invoice Date,De la Date de la Facture
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,La devise de facturation doit être égale à la devise par défaut de la société ou du compte de la partie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Congés Accumulés à Encaisser
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Qu'est-ce que ça fait ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,À l'Entrepôt
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toutes les Admissions des Étudiants
 ,Average Commission Rate,Taux Moyen de la Commission
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'A un Numéro de Série' ne peut pas être 'Oui' pour un article hors-stock
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,La présence ne peut pas être marquée pour les dates à venir
 DocType: Pricing Rule,Pricing Rule Help,Aide pour les Règles de Tarification
 DocType: School House,House Name,Nom de la Maison
 DocType: Purchase Taxes and Charges,Account Head,Compte Principal
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Mettre à jour les frais additionnels pour calculer le coût au débarquement des articles
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Électrique
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ajouter le reste de votre organisation en tant qu'utilisateurs. Vous pouvez aussi inviter des Clients sur votre portail en les ajoutant depuis les Contacts
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Ajouter le reste de votre organisation en tant qu'utilisateurs. Vous pouvez aussi inviter des Clients sur votre portail en les ajoutant depuis les Contacts
 DocType: Stock Entry,Total Value Difference (Out - In),Différence Valeur Totale (Sor - En)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Ligne {0} : Le Taux de Change est obligatoire
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID de l'Utilisateur non défini pour l'Employé {0}
@@ -4191,7 +4202,7 @@
 DocType: Item,Customer Code,Code Client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rappel d'Anniversaire pour {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jours Depuis la Dernière Commande
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Le compte de débit doit être un compte de Bilan
 DocType: Buying Settings,Naming Series,Nom de la Série
 DocType: Leave Block List,Leave Block List Name,Nom de la Liste de Blocage des Congés
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Date de Début d'Assurance devrait être antérieure à la Date de Fin d'Assurance
@@ -4206,9 +4217,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Fiche de Paie de l'employé {0} déjà créée pour la feuille de temps {1}
 DocType: Vehicle Log,Odometer,Odomètre
 DocType: Sales Order Item,Ordered Qty,Qté Commandée
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Article {0} est désactivé
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Article {0} est désactivé
 DocType: Stock Settings,Stock Frozen Upto,Stock Gelé Jusqu'au
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,LDM ne contient aucun article en stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,LDM ne contient aucun article en stock
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Les Dates de Période Initiale et de Période Finale sont obligatoires pour {0} récurrent(e)
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Activité du projet / tâche.
 DocType: Vehicle Log,Refuelling Details,Détails de Ravitaillement
@@ -4218,8 +4229,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Dernier montant d'achat introuvable
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montant de la Reprise (Devise Société)
 DocType: Sales Invoice Timesheet,Billing Hours,Heures Facturées
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,LDM par défaut {0} introuvable
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,LDM par défaut {0} introuvable
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ligne #{0} : Veuillez définir la quantité de réapprovisionnement
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Choisissez des articles pour les ajouter ici
 DocType: Fees,Program Enrollment,Inscription au Programme
 DocType: Landed Cost Voucher,Landed Cost Voucher,Référence de Coût au Débarquement
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Veuillez définir {0}
@@ -4227,7 +4239,7 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0} - {1} est un étudiant inactif
 DocType: Employee,Health Details,Détails de Santé
 DocType: Offer Letter,Offer Letter Terms,Termes de la Lettre de Proposition
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,Pour créer un document de référence de demande de paiement est requis
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,"Pour créer une Demande de Paiement, un document de référence est requis"
 DocType: Payment Entry,Allocate Payment Amount,Allouer le Montant du Paiement
 DocType: Employee External Work History,Salary,Salaire
 DocType: Serial No,Delivery Document Type,Type de Document de Livraison
@@ -4241,7 +4253,7 @@
 DocType: Maintenance Visit,Maintenance Date,Date de l'Entretien
 DocType: Purchase Invoice Item,Rejected Serial No,N° de Série Rejeté
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Année de début ou de fin chevauche avec {0}. Pour l'éviter veuillez définir la société
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},La date de début doit être antérieure à la date de fin pour l'Article {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},La date de début doit être antérieure à la date de fin pour l'Article {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.","Exemple:. ABCD ##### Si la série est définie et que le N° de série n'est pas mentionné dans les transactions, alors un numéro de série automatique sera créé basé sur cette série. Si vous voulez toujours mentionner explicitement les numéros de série pour ce produit. laissez ce champ vide."
 DocType: Upload Attendance,Upload Attendance,Charger Fréquentation
@@ -4251,7 +4263,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +21,BOM replaced,LDM Remplacée
 ,Sales Analytics,Analyse des Ventes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +114,Available {0},Disponible {0}
-,Prospects Engaged But Not Converted,Perspectives engagées mais non converties
+,Prospects Engaged But Not Converted,Prospects Contactés mais non Convertis
 DocType: Manufacturing Settings,Manufacturing Settings,Paramètres de Fabrication
 apps/erpnext/erpnext/config/setup.py +56,Setting up Email,Configurer l'Email
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,N° du Mobile du Tuteur 1
@@ -4276,7 +4288,7 @@
 apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,Paramètres par défaut pour les opérations comptables .
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,Date Prévue ne peut pas être avant la Date de Demande de Matériel
-DocType: Purchase Invoice Item,Stock Qty,Stock Qté
+DocType: Purchase Invoice Item,Stock Qty,Qté en Stock
 DocType: Production Order,Source Warehouse (for reserving Items),Entrepôt Source (pour la réservation des Articles)
 DocType: Employee Loan,Repayment Period in Months,Période de Remboursement en Mois
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erreur : Pas un identifiant valide ?
@@ -4316,10 +4328,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Vente de Détail & en Gros
 DocType: Issue,First Responded On,Première Réponse Le
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Liste Croisée d'Articles dans plusieurs groupes
-DocType: Grade Interval,Grade Interval,Intervalle de Notes
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},La Date de Début et la Date de Fin de l'Exercice Fiscal sont déjà définies dans l'Année Fiscale {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date de Compensation mise à jour
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lot fractionné
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lot Fractionné
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,Réconcilié avec Succès
 DocType: Request for Quotation Supplier,Download PDF,Télécharger au Format PDF
 DocType: Production Order,Planned End Date,Date de Fin Prévue
@@ -4359,16 +4370,16 @@
 DocType: Packing Slip,Gross Weight UOM,UDM du Poids Brut
 DocType: Delivery Note Item,Against Sales Invoice,Pour la Facture de Vente
 DocType: Bin,Reserved Qty for Production,Qté Réservée pour la Production
-DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laissez-vous désactiver si vous ne souhaitez pas considérer le lot tout en faisant des groupes basés sur les cours.
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Laisser désactivé si vous ne souhaitez pas considérer les lots en faisant des groupes basés sur les cours.
 DocType: Asset,Frequency of Depreciation (Months),Fréquence des Amortissements (Mois)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Compte Créditeur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Compte Créditeur
 DocType: Landed Cost Item,Landed Cost Item,Coût de l'Article au Débarquement
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Afficher les valeurs nulles
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Quantité de produit obtenue après fabrication / reconditionnement des quantités données de matières premières
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Installation d&#39;un site web simple pour mon organisation
 DocType: Payment Reconciliation,Receivable / Payable Account,Compte Débiteur / Créditeur
 DocType: Delivery Note Item,Against Sales Order Item,Pour l'Article de la Commande Client
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Veuillez spécifier une Valeur d’Attribut pour l'attribut {0}
 DocType: Item,Default Warehouse,Entrepôt par Défaut
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget ne peut pas être attribué pour le Compte de Groupe {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Veuillez entrer le centre de coût parent
@@ -4389,7 +4400,7 @@
 DocType: Stock Entry,As per Stock UOM,Selon UDM du Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,Non Expiré
 DocType: Student Log,Achievement,Réalisation
-DocType: Batch,Source Document Type,Source Type de document
+DocType: Batch,Source Document Type,Type de Document Source
 DocType: Journal Entry,Total Debit,Total Débit
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,Entrepôt de Produits Finis par Défaut
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +78,Sales Person,Vendeur
@@ -4400,18 +4411,18 @@
 DocType: Guardian,Alternate Number,Autre Numéro
 DocType: Assessment Plan Criteria,Maximum Score,Score Maximum
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Créer des règles pour restreindre les transactions basées sur les valeurs .
-DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laissez vide si vous faites des groupes d&#39;étudiants par année
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,Laisser vide si vous faites des groupes d'étudiants par année
 DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Si cochée, Le nombre total de Jours Ouvrés comprendra les vacances, ce qui réduira la valeur du Salaire Par Jour"
 DocType: Purchase Invoice,Total Advance,Total Avance
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,La Date de Fin de Terme ne peut pas être antérieure à la Date de Début de Terme. Veuillez corriger les dates et essayer à nouveau.
-apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Quot Count
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Compte de Devis
 ,BOM Stock Report,Rapport de Stock de LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Différence de Quantité
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Traitement de la Paie
 DocType: Opportunity Item,Basic Rate,Taux de Base
 DocType: GL Entry,Credit Amount,Montant du Crédit
 DocType: Cheque Print Template,Signatory Position,Position Signataire
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Définir comme Perdu
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Définir comme Perdu
 DocType: Timesheet,Total Billable Hours,Total des Heures Facturables
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Bon de Réception du Paiement
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Basé sur les transactions avec ce client. Voir la chronologie ci-dessous pour plus de détails
@@ -4425,11 +4436,11 @@
 ,Items To Be Requested,Articles À Demander
 DocType: Purchase Order,Get Last Purchase Rate,Obtenir le Dernier Tarif d'Achat
 DocType: Company,Company Info,Informations sur la Société
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Sélectionner ou ajoutez nouveau client
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Sélectionner ou ajoutez nouveau client
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Un centre de coût est requis pour comptabiliser une note de frais
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Emplois des Ressources (Actifs)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Basé sur la présence de cet Employé
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Compte de Débit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Compte de Débit
 DocType: Fiscal Year,Year Start Date,Date de Début de l'Exercice
 DocType: Attendance,Employee Name,Nom de l'Employé
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Arrondi (Devise Société)
@@ -4438,13 +4449,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Empêcher les utilisateurs de faire des Demandes de Congé les jours suivants.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montant de l'Achat
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Devis Fournisseur {0} créé
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fin de l'Année ne peut pas être avant Début de l'Année
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fin de l'Année ne peut pas être avant Début de l'Année
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Avantages de l'Employé
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},La quantité emballée doit être égale à la quantité pour l'Article {0} à la ligne {1}
 DocType: Production Order,Manufactured Qty,Qté Fabriquée
 DocType: Purchase Receipt Item,Accepted Quantity,Quantité Acceptée
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} n’existe pas
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} : {1} n’existe pas
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Factures émises pour des Clients.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID du Projet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ligne N° {0}: Le montant ne peut être supérieur au Montant en Attente pour le Remboursement de Frais {1}. Le Montant en Attente est de {2}
@@ -4453,15 +4464,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Type de Référence
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Liste de Prix introuvable ou desactivée
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Liste de Prix introuvable ou desactivée
 DocType: Employee Loan Application,Approved,Approuvé
 DocType: Pricing Rule,Price,Prix
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Employé dégagé de {0} doit être défini comme 'Gauche'
 DocType: Guardian,Guardian,Tuteur
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Évaluation {0} créée pour l'Employé {1} dans l'intervalle de dates donné
 DocType: Employee,Education,Education
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Supp
 DocType: Selling Settings,Campaign Naming By,Campagne Nommée Par
 DocType: Employee,Current Address Is,L'Adresse Actuelle est
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifié
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optionnel. Défini la devise par défaut de l'entreprise, si non spécifié."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Les écritures comptables.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qté Disponible Depuis l'Entrepôt
@@ -4470,7 +4483,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ligne {0} : Partie / Compte ne correspond pas à {1} / {2} en {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Veuillez entrer un Compte de Charges
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ligne #{0} : Type de Document de Référence doit être un Bon de Commande, une Facture d'Achat ou une Écriture de Journal"
 DocType: Employee,Current Address,Adresse Actuelle
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Si l'article est une variante d'un autre article, alors la description, l'image, le prix, les taxes etc seront fixés à partir du modèle sauf si spécifiés explicitement"
 DocType: Serial No,Purchase / Manufacture Details,Achat / Fabrication Détails
@@ -4498,13 +4511,13 @@
 DocType: Hub Settings,Hub Settings,Paramètres du Hub
 DocType: Project,Gross Margin %,Marge Brute %
 DocType: BOM,With Operations,Avec des Opérations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Des écritures comptables ont déjà été réalisées en devise {0} pour la société {1}. Veuillez sélectionner un compte de crédit ou de débit  en devise {0}.
 DocType: Asset,Is Existing Asset,Est Actif Existant
-DocType: Salary Detail,Statistical Component,Composante statistique
+DocType: Salary Detail,Statistical Component,Composante Statistique
 ,Monthly Salary Register,Registre Mensuel des Salaires
 DocType: Warranty Claim,If different than customer address,Si différente de l'adresse du client
 DocType: BOM Operation,BOM Operation,Opération LDM
-DocType: School Settings,Validate the Student Group from Program Enrollment,Valider le groupe étudiant de l&#39;inscription au programme
+DocType: School Settings,Validate the Student Group from Program Enrollment,Valider le Groupe d'Étudiant depuis l'Inscription au Programme
 DocType: Purchase Taxes and Charges,On Previous Row Amount,Le Montant de la Rangée Précédente
 DocType: Student,Home Address,Adresse du Domicile
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Transfert d'Actifs
@@ -4521,7 +4534,7 @@
 DocType: Assessment Plan,Room,Chambre
 DocType: Purchase Order,Advance Paid,Avance Payée
 DocType: Item,Item Tax,Taxe sur l'Article
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Du Matériel au Fournisseur
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Du Matériel au Fournisseur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Facture d'Accise
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Le seuil {0}% apparaît plus d'une fois
 DocType: Expense Claim,Employees Email Id,Identifiants Email des employés
@@ -4552,9 +4565,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Joindre le Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveaux du Stocks
 DocType: Customer,Commission Rate,Taux de Commission
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Faire une Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Faire une Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquer les demandes de congé par département
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Type de Paiement doit être Recevoir, Payer ou Transfert Interne"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Type de Paiement doit être Recevoir, Payer ou Transfert Interne"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytique
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Le panier est Vide
 DocType: Vehicle,Model,Modèle
@@ -4565,6 +4578,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Autoriser la Fabrication pendant les Vacances
 DocType: Sales Order,Customer's Purchase Order Date,Date du Bon de Commande du Client
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Afficher les Pièces Jointes Publiques
 DocType: Packing Slip,Package Weight Details,Détails du Poids du Paquet
 DocType: Payment Gateway Account,Payment Gateway Account,Compte Passerelle de Paiement
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Le paiement terminé, rediriger l'utilisateur vers la page sélectionnée."
@@ -4583,15 +4597,15 @@
 DocType: Batch,Expiry Date,Date d'expiration
 ,Supplier Addresses and Contacts,Adresses et Contacts des Fournisseurs
 ,accounts-browser,navigateur-de-comptes
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Veuillez d’abord sélectionner une Catégorie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Veuillez d’abord sélectionner une Catégorie
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Données de Base du Projet.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pour permettre la sur-facturation ou la sur-commande, mettez à jour ""Indulgence"" dans les Paramètres de Stock ou dans l’Article."
 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 +459, (Half Day),(Demi-Journée)
 DocType: Supplier,Credit Days,Jours de Crédit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Créer un Lot d'Étudiant
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Créer un Lot d'Étudiant
 DocType: Leave Type,Is Carry Forward,Est un Report
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obtenir les Articles depuis LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obtenir les Articles depuis LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Jours de Délai
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ligne #{0} : La Date de Comptabilisation doit être la même que la date d'achat {1} de l’actif {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Veuillez entrer des Commandes Clients dans le tableau ci-dessus
@@ -4608,7 +4622,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Montant Approuvé
 DocType: GL Entry,Is Opening,Écriture d'Ouverture
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Veuillez configurer la série de numérotation pour la présence via Configuration&gt; Série de numérotation
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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'autres publications.
diff --git a/erpnext/translations/gu.csv b/erpnext/translations/gu.csv
index f9ea0e8..79c316f 100644
--- a/erpnext/translations/gu.csv
+++ b/erpnext/translations/gu.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ભાડાનાં
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,વપરાશકર્તા માટે લાગુ પડે છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","અટકાવાયેલ ઉત્પાદન ઓર્ડર રદ કરી શકાતી નથી, રદ કરવા તે પ્રથમ Unstop"
 DocType: Vehicle Service,Mileage,માઇલેજ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,શું તમે ખરેખર આ એસેટ સ્ક્રેપ કરવા માંગો છો?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,પસંદ કરો મૂળભૂત પુરવઠોકર્તા
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,પસંદ કરો મૂળભૂત પુરવઠોકર્તા
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},કરન્સી ભાવ યાદી માટે જરૂરી છે {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* પરિવહનમાં ગણતરી કરવામાં આવશે.
 DocType: Purchase Order,Customer Contact,ગ્રાહક સંપર્ક
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ઉત્કૃષ્ટ {0} કરી શકાય નહીં શૂન્ય કરતાં ઓછી ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 મિનિટ મૂળભૂત
 DocType: Leave Type,Leave Type Name,પ્રકાર છોડો નામ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ઓપન બતાવો
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ઓપન બતાવો
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,સિરીઝ સફળતાપૂર્વક અપડેટ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ચેકઆઉટ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural જર્નલ પ્રવેશ સબમિટ
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,બેચ વસ્તુ સમાપ્તિ સ્થિતિ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,બેંક ડ્રાફ્ટ
 DocType: Mode of Payment Account,Mode of Payment Account,ચુકવણી એકાઉન્ટ પ્રકાર
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,બતાવો ચલો
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,બતાવો ચલો
 DocType: Academic Term,Academic Term,શૈક્ષણિક ટર્મ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,સામગ્રી
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,જથ્થો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,જથ્થો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,એકાઉન્ટ્સ ટેબલ ખાલી ન હોઈ શકે.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),લોન્સ (જવાબદારીઓ)
 DocType: Employee Education,Year of Passing,પસાર વર્ષ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","સંદર્ભ:% s, વસ્તુ કોડ:% s અને ગ્રાહક:% s"
 DocType: Item,Country of Origin,તે મૂળનો દેશ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ઉપલબ્ધ છે
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ઓપન મુદ્દાઓ
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,સ્વાસ્થ્ય કાળજી
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ચુકવણી વિલંબ (દિવસ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,સેવા ખર્ચ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ભરતિયું
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},શૃંખલા ક્રમાંક: {0} પહેલાથી સેલ્સ ઇન્વોઇસ સંદર્ભ થયેલ છે: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ભરતિયું
 DocType: Maintenance Schedule Item,Periodicity,સમયગાળાના
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ફિસ્કલ વર્ષ {0} જરૂરી છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,અપેક્ષિત વિતરણ તારીખ પહેલાં સેલ્સ ઓર્ડર તારીખ હોઈ છે
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","બે કૉલમ, જૂના નામ માટે એક અને નવા નામ માટે એક સાથે CSV ફાઈલ જોડો"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} કોઈપણ સક્રિય નાણાકીય વર્ષમાં નથી.
 DocType: Packed Item,Parent Detail docname,પિતૃ વિગતવાર docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","સંદર્ભ: {0}, આઇટમ કોડ: {1} અને ગ્રાહક: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,કિલો ગ્રામ
 DocType: Student Log,Log,પ્રવેશ કરો
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,નોકરી માટે ખોલીને.
 DocType: Item Attribute,Increment,વૃદ્ધિ
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,વેરહાઉસ પસંદ કરો ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,વેરહાઉસ પસંદ કરો ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,જાહેરાત
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,સેમ કંપની એક કરતા વધુ વખત દાખલ થયેલ
 DocType: Employee,Married,પરણિત
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},માટે પરવાનગી નથી {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,વસ્તુઓ મેળવો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},માટે પરવાનગી નથી {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,વસ્તુઓ મેળવો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},સ્ટોક બોલ પર કોઈ નોંધ સામે અપડેટ કરી શકાતું નથી {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ઉત્પાદન {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,કોઈ આઇટમ સૂચિબદ્ધ નથી
 DocType: Payment Reconciliation,Reconcile,સમાધાન
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,કરિયાણા
 DocType: Quality Inspection Reading,Reading 1,1 વાંચન
 DocType: Process Payroll,Make Bank Entry,બેન્ક પ્રવેશ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,પેન્શન ફંડ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,આગળ અવમૂલ્યન તારીખ પહેલાં ખરીદી તારીખ ન હોઈ શકે
 DocType: SMS Center,All Sales Person,બધા વેચાણ વ્યક્તિ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** માસિક વિતરણ ** જો તમે તમારા બિઝનેસ મોસમ હોય તો તમે મહિના સમગ્ર બજેટ / લક્ષ્યાંક વિતરિત કરે છે.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,વસ્તુઓ મળી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,વસ્તુઓ મળી
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,પગાર માળખું ખૂટે
 DocType: Lead,Person Name,વ્યક્તિ નામ
 DocType: Sales Invoice Item,Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",દા.ત. &quot;પ્રાથમિક શાળા&quot; અથવા &quot;યુનિવર્સિટી&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,સ્ટોક અહેવાલ
 DocType: Warehouse,Warehouse Detail,વેરહાઉસ વિગતવાર
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ક્રેડિટ મર્યાદા ગ્રાહક માટે ઓળંગી કરવામાં આવી છે {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ટર્મ સમાપ્તિ તારીખ કરતાં પાછળથી શૈક્ષણિક વર્ષ સમાપ્તિ તારીખ જે શબ્દ સાથે કડી થયેલ છે હોઈ શકે નહિં (શૈક્ષણિક વર્ષ {}). તારીખો સુધારવા અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",", અનચેક કરી શકાતી નથી કારણ કે એસેટ રેકોર્ડ વસ્તુ સામે અસ્તિત્વમાં &quot;સ્થિર એસેટ છે&quot;"
 DocType: Vehicle Service,Brake Oil,બ્રેક ઓઈલ
 DocType: Tax Rule,Tax Type,ટેક્સ પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},જો તમે પહેલાં પ્રવેશો ઉમેરવા અથવા અપડેટ કરવા માટે અધિકૃત નથી {0}
 DocType: BOM,Item Image (if not slideshow),આઇટમ છબી (જોક્સ ન હોય તો)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ગ્રાહક જ નામ સાથે હાજર
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(કલાક દર / 60) * વાસ્તવિક કામગીરી સમય
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM પસંદ કરો
 DocType: SMS Log,SMS Log,એસએમએસ લોગ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,વિતરિત વસ્તુઓ કિંમત
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,પર {0} રજા વચ્ચે તારીખ થી અને તારીખ નથી
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,શાળાઓ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},કોઈ રજા રેકોર્ડ કર્મચારી મળી {0} માટે {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,પ્રથમ કંપની દાખલ કરો
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,પ્રથમ કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,કુલ ખર્ચ
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,દાવો રકમ
 DocType: Employee,Mr,શ્રીમાન
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,નકલી ગ્રાહક જૂથ cutomer જૂથ ટેબલ મળી
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,પુરવઠોકર્તા પ્રકાર / પુરવઠોકર્તા
 DocType: Naming Series,Prefix,પૂર્વગ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ઉપભોજ્ય
 DocType: Employee,B-,બી
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,ગ્રેડ
 DocType: Sales Invoice Item,Delivered By Supplier,સપ્લાયર દ્વારા વિતરિત
 DocType: SMS Center,All Contact,તમામ સંપર્ક
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ઉત્પાદન ઓર્ડર પહેલેથી BOM સાથે તમામ વસ્તુઓ બનાવવામાં
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,વાર્ષિક પગાર
 DocType: Daily Work Summary,Daily Work Summary,દૈનિક કામ સારાંશ
 DocType: Period Closing Voucher,Closing Fiscal Year,ફિસ્કલ વર્ષ બંધ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} સ્થિર છે
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} સ્થિર છે
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,કૃપા કરીને એકાઉન્ટ્સ ઓફ ચાર્ટ બનાવવા માટે હાલના કંપની પસંદ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,સ્ટોક ખર્ચ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,પસંદ લક્ષ્યાંક વેરહાઉસ
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,ઊલટું એન્ટ્રી
 DocType: Journal Entry Account,Credit in Company Currency,કંપની કરન્સી ક્રેડિટ
 DocType: Delivery Note,Installation Status,સ્થાપન સ્થિતિ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",તમે હાજરી અપડેટ કરવા માંગો છો? <br> હાજર: {0} \ <br> ગેરહાજર: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty નકારેલું સ્વીકારાયું + વસ્તુ માટે પ્રાપ્ત જથ્થો માટે સમાન હોવો જોઈએ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,પુરવઠા કાચો માલ ખરીદી માટે
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ચુકવણી ઓછામાં ઓછો એક મોડ POS ભરતિયું માટે જરૂરી છે.
 DocType: Products Settings,Show Products as a List,શો ઉત્પાદનો યાદી તરીકે
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", નમૂનો ડાઉનલોડ યોગ્ય માહિતી ભરો અને ફેરફાર ફાઇલ સાથે જોડે છે. પસંદ કરેલ સમયગાળામાં તમામ તારીખો અને કર્મચારી સંયોજન હાલની એટેન્ડન્સ રેકર્ડઝ સાથે, નમૂનો આવશે"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,અવમૂલ્યન પ્રવેશ કરો
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,વિનંતી પ્રકાર
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,કર્મચારીનું બનાવો
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,કર્મચારીનું બનાવો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,પ્રસારણ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,એક્ઝેક્યુશન
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,કામગીરી વિગતો બહાર કરવામાં આવે છે.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,જાળવણી મુલાકાત માટે યોજના.
 DocType: SMS Settings,Enter url parameter for message,સંદેશ માટે URL પેરામીટર દાખલ
 DocType: POS Profile,Customer Groups,ગ્રાહક જૂથો
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,નાણાકીય નિવેદનો
 DocType: Guardian,Students,વિદ્યાર્થી
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ભાવો અને ડિસ્કાઉન્ટ લાગુ પાડવા માટે નિયમો.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ભાવ યાદી ખરીદી અથવા વેચાણ માટે લાગુ હોવા જ જોઈએ
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},એડવાન્સ રકમ કરતાં વધારે ન હોઈ શકે {0} {1}
 DocType: Naming Series,Series List for this Transaction,આ સોદા માટે સિરીઝ યાદી
 DocType: Company,Default Payroll Payable Account,ડિફૉલ્ટ પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,સુધારા ઇમેઇલ ગ્રુપ
 DocType: Sales Invoice,Is Opening Entry,એન્ટ્રી ખુલી છે
 DocType: Customer Group,Mention if non-standard receivable account applicable,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ લાગુ પડતું હોય તો
 DocType: Course Schedule,Instructor Name,પ્રશિક્ષક નામ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,વેરહાઉસ માટે જમા પહેલાં જરૂરી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,પુનર્વિક્રેતા
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","જો ચકાસાયેલ હોય, સામગ્રી વિનંતીઓ નોન-સ્ટોક વસ્તુઓ સમાવેશ થાય છે."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,સેલ્સ ભરતિયું વસ્તુ સામે
 ,Production Orders in Progress,પ્રગતિ ઉત્પાદન ઓર્ડર્સ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,નાણાકીય થી ચોખ્ખી રોકડ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage સંપૂર્ણ છે, સાચવી ન હતી"
 DocType: Lead,Address & Contact,સરનામું અને સંપર્ક
 DocType: Leave Allocation,Add unused leaves from previous allocations,અગાઉના ફાળવણી માંથી નહિં વપરાયેલ પાંદડા ઉમેરો
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},આગળ રીકરીંગ {0} પર બનાવવામાં આવશે {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),કુલ પડતર રકમ (સમયનો શીટ મારફતે)
 DocType: Item Website Specification,Item Website Specification,વસ્તુ વેબસાઇટ સ્પષ્ટીકરણ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,છોડો અવરોધિત
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,બેન્ક પ્રવેશો
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},વસ્તુ {0} પર તેના જીવનના અંતે પહોંચી ગયું છે {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,બેન્ક પ્રવેશો
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,વાર્ષિક
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,સ્ટોક રિકંસીલેશન વસ્તુ
 DocType: Stock Entry,Sales Invoice No,સેલ્સ ભરતિયું કોઈ
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,હબ પ્રકાશિત
 DocType: Student Admission,Student Admission,વિદ્યાર્થી પ્રવેશ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,સામગ્રી વિનંતી
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} વસ્તુ રદ કરવામાં આવે છે
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,સામગ્રી વિનંતી
 DocType: Bank Reconciliation,Update Clearance Date,સુધારા ક્લિયરન્સ તારીખ
 DocType: Item,Purchase Details,ખરીદી વિગતો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ખરીદી માટે &#39;કાચો માલ પાડેલ&#39; ટેબલ મળી નથી વસ્તુ {0} {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ઉત્કૃષ્ટ Cheques અને સાફ ડિપોઝિટ
 DocType: Item,Synced With Hub,હબ સાથે સમન્વયિત
 DocType: Vehicle,Fleet Manager,ફ્લીટ વ્યવસ્થાપક
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},રો # {0}: {1} આઇટમ માટે નકારાત્મક ન હોઈ શકે {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,ખોટો પાસવર્ડ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},રો # {0}: {1} આઇટમ માટે નકારાત્મક ન હોઈ શકે {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,ખોટો પાસવર્ડ
 DocType: Item,Variant Of,ચલ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',કરતાં &#39;Qty ઉત્પાદન&#39; પૂર્ણ Qty વધારે ન હોઈ શકે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,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 +99,Circular Reference Error,ગોળ સંદર્ભ ભૂલ
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,આપોઆપ સામગ્રી વિનંતી બનાવટ પર ઇમેઇલ દ્વારા સૂચિત
 DocType: Journal Entry,Multi Currency,મલ્ટી કરન્સી
 DocType: Payment Reconciliation Invoice,Invoice Type,ભરતિયું પ્રકાર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ડિલીવરી નોંધ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ડિલીવરી નોંધ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,કર સુયોજિત કરી રહ્યા છે
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,વેચાઈ એસેટ કિંમત
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,તમે તેને ખેંચી ચુકવણી પછી એન્ટ્રી સુધારાઈ ગયેલ છે. તેને ફરીથી ખેંચી કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
-DocType: Grade Interval,Min Score,મીન સ્કોર
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} વસ્તુ ટેક્સ બે વખત દાખલ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,આ અઠવાડિયે અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Student Applicant,Admitted,પ્રવેશ
 DocType: Workstation,Rent Cost,ભાડું ખર્ચ
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ઓર્ડર કિંમત
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,બેન્ક / રોકડ પક્ષ સામે અથવા આંતરિક ટ્રાન્સફર માટે વ્યવહારો
 DocType: Shipping Rule,Valid for Countries,દેશો માટે માન્ય
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"આ આઇટમ એક નમૂનો છે અને વ્યવહારો ઉપયોગ કરી શકતા નથી. &#39;ના નકલ&#39; સુયોજિત થયેલ છે, જ્યાં સુધી વસ્તુ લક્ષણો ચલો માં ઉપર નકલ થશે"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ગણવામાં કુલ ઓર્ડર
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",કર્મચારીનું હોદ્દો (દા.ત. સીઇઓ ડિરેક્ટર વગેરે).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,દાખલ ક્ષેત્ર કિંમત &#39;ડે મહિનો પર પુનરાવર્તન&#39; કરો
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},રો # {0} ખરીદી ભરતિયું હાલની એસેટ સામે નથી કરી શકાય છે {1}
 DocType: Item Tax,Tax Rate,ટેક્સ રેટ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} પહેલાથી જ કર્મચારી માટે ફાળવવામાં {1} માટે સમય {2} માટે {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,પસંદ કરો વસ્તુ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,પસંદ કરો વસ્તુ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ભરતિયું {0} પહેલાથી જ રજૂ કરવામાં આવે છે ખરીદી
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ROW # {0}: બેચ કોઈ તરીકે જ હોવી જોઈએ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,બિન-ગ્રુપ માટે કન્વર્ટ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,આઇટમ બેચ (ઘણો).
 DocType: C-Form Invoice Detail,Invoice Date,ભરતિયું તારીખ
 DocType: GL Entry,Debit Amount,ડેબિટ રકમ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},માત્ર કંપની દીઠ 1 એકાઉન્ટ હોઈ શકે છે {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,જોડાણ જુઓ
 DocType: Purchase Order,% Received,% પ્રાપ્ત
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,વિદ્યાર્થી જૂથો બનાવો
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,અવતરણ માટે વિનંતી
 DocType: Salary Slip Timesheet,Working Hours,કામ નાં કલાકો
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,હાલની શ્રેણી શરૂ / વર્તમાન ક્રમ નંબર બદલો.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,નવી ગ્રાહક બનાવવા
-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.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,નવી ગ્રાહક બનાવવા
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","બહુવિધ કિંમતના નિયમોમાં જીતવું ચાલુ હોય, વપરાશકર્તાઓ તકરાર ઉકેલવા માટે જાતે અગ્રતા સુયોજિત કરવા માટે કહેવામાં આવે છે."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ખરીદી ઓર્ડર બનાવો
 ,Purchase Register,ખરીદી રજીસ્ટર
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,લાગુ ખર્ચ
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ભૂમિકા હોવી જ જોઈએ &#39;છોડી તાજનો&#39;
 DocType: Purchase Receipt,Vehicle Date,વાહન તારીખ
 DocType: Student Log,Medical,મેડિકલ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ગુમાવી માટે કારણ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ગુમાવી માટે કારણ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,અગ્ર માલિક લીડ તરીકે જ ન હોઈ શકે
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,સોંપાયેલ રકમ અસમાયોજિત રકમ કરતાં વધારે ન કરી શકો છો
 DocType: Announcement,Receiver,રીસીવર
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,જથ્થો અને દર
 DocType: Delivery Note,% Installed,% ઇન્સ્ટોલ
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,વર્ગખંડો / લેબોરેટરીઝ વગેરે જ્યાં પ્રવચનો સુનિશ્ચિત કરી શકાય છે.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,પ્રથમ કંપની નામ દાખલ કરો
 DocType: Purchase Invoice,Supplier Name,પુરવઠોકર્તા નામ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,આ ERPNext માર્ગદર્શિકા વાંચવા
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,ઓલ્ડ પિતૃ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ફરજિયાત ફીલ્ડ - શૈક્ષણિક વર્ષ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,કે ઇમેઇલ એક ભાગ તરીકે જાય છે કે પ્રારંભિક લખાણ કસ્ટમાઇઝ કરો. દરેક વ્યવહાર અલગ પ્રારંભિક લખાણ છે.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},કંપની માટે મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,બધા ઉત્પાદન પ્રક્રિયા માટે વૈશ્વિક સુયોજનો.
 DocType: Accounts Settings,Accounts Frozen Upto,ફ્રોઝન સુધી એકાઉન્ટ્સ
 DocType: SMS Log,Sent On,પર મોકલવામાં
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,એટ્રીબ્યુટ {0} લક્ષણો ટેબલ ઘણી વખત પસંદ
 DocType: HR Settings,Employee record is created using selected field. ,કર્મચારીનું રેકોર્ડ પસંદ ક્ષેત્ર ઉપયોગ કરીને બનાવવામાં આવે છે.
 DocType: Sales Order,Not Applicable,લાગુ નથી
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,હોલિડે માસ્ટર.
 DocType: Request for Quotation Item,Required Date,જરૂરી તારીખ
 DocType: Delivery Note,Billing Address,બિલિંગ સરનામું
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,વસ્તુ કોડ દાખલ કરો.
 DocType: BOM,Costing,પડતર
 DocType: Tax Rule,Billing County,બિલિંગ કાઉન્ટી
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ચકાસાયેલ જો પહેલેથી પ્રિન્ટ દર છાપો / રકમ સમાવેશ થાય છે, કારણ કે કર રકમ ગણવામાં આવશે"
@@ -500,6 +504,7 @@
 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,સિક્યોરિટીઝ અને થાપણો
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","મૂલ્યાંકન પદ્ધતિ બદલી શકતા નથી, કારણ કે ત્યાં અમુક વસ્તુઓ સામે વ્યવહારો કે જે તે નથી પોતાના મૂલ્યાંકન પદ્ધતિ છે"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ફાળવવામાં કુલ પાંદડા ફરજિયાત છે
 DocType: Job Opening,Description of a Job Opening,એક જોબ ખુલી વર્ણન
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,આજે બાકી પ્રવૃત્તિઓ
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,વહીવટી અધિકારીશ્રી
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,કૃપા કરીને અભ્યાસક્રમનો પસંદ
 DocType: Timesheet Detail,Hrs,કલાકે
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,કંપની પસંદ કરો
 DocType: Stock Entry Detail,Difference Account,તફાવત એકાઉન્ટ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,તેના આશ્રિત કાર્ય {0} બંધ નથી નજીક કાર્ય નથી કરી શકો છો.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"સામગ્રી વિનંતી ઊભા કરવામાં આવશે, જેના માટે વેરહાઉસ દાખલ કરો"
 DocType: Production Order,Additional Operating Cost,વધારાની ઓપરેટીંગ ખર્ચ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,કોસ્મેટિક્સ
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","મર્જ, નીચેના ગુણધર્મો બંને આઇટમ્સ માટે જ હોવી જોઈએ"
 DocType: Shipping Rule,Net Weight,કુલ વજન
 DocType: Employee,Emergency Phone,સંકટકાલીન ફોન
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ખરીદો
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,કૃપા કરીને માટે થ્રેશોલ્ડ 0% ગ્રેડ વ્યાખ્યાયિત
 DocType: Sales Order,To Deliver,વિતરિત કરવા માટે
 DocType: Purchase Invoice Item,Item,વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,સીરીયલ કોઈ આઇટમ એક અપૂર્ણાંક ન હોઈ શકે
 DocType: Journal Entry,Difference (Dr - Cr),તફાવત (ડૉ - સીઆર)
 DocType: Account,Profit and Loss,નફો અને નુકસાનનું
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,મેનેજિંગ Subcontracting
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,વૃદ્ધિ 0 ન હોઈ શકે
 DocType: Production Planning Tool,Material Requirement,સામગ્રી જરૂરિયાત
 DocType: Company,Delete Company Transactions,કંપની વ્યવહારો કાઢી નાખો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,સંદર્ભ કોઈ અને સંદર્ભ તારીખ બેન્ક ટ્રાન્ઝેક્શન માટે ફરજિયાત છે
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ સંપાદિત કરો કર અને ખર્ચ ઉમેરો
 DocType: Purchase Invoice,Supplier Invoice No,પુરવઠોકર્તા ભરતિયું કોઈ
 DocType: Territory,For reference,સંદર્ભ માટે
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,સ્થાપન નોંધ વસ્તુ
 DocType: Production Plan Item,Pending Qty,બાકી Qty
 DocType: Budget,Ignore,અવગણો
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} સક્રિય નથી
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} સક્રિય નથી
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},એસએમએસ નીચેના નંબરો પર મોકલવામાં: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,સેટઅપ ચેક પ્રિન્ટીંગ માટે પરિમાણો
 DocType: Salary Slip,Salary Slip Timesheet,પગાર કાપલી Timesheet
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,કુલ કમિશન
 DocType: Pricing Rule,Sales Partner,વેચાણ ભાગીદાર
 DocType: Buying Settings,Purchase Receipt Required,ખરીદી રસીદ જરૂરી
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,જો ખુલે સ્ટોક દાખલ મૂલ્યાંકન દર ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ભરતિયું ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,પ્રથમ કંપની અને પાર્ટી પ્રકાર પસંદ કરો
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,નાણાકીય / હિસાબી વર્ષ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,સંચિત મૂલ્યો
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","માફ કરશો, સીરીયલ અમે મર્જ કરી શકાતા નથી"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,વેચાણ ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,વેચાણ ઓર્ડર બનાવો
 DocType: Project Task,Project Task,પ્રોજેક્ટ ટાસ્ક
 ,Lead Id,લીડ આઈડી
 DocType: C-Form Invoice Detail,Grand Total,કુલ સરવાળો
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,ફરી શરૂ કરો જોડાણ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,પુનરાવર્તન ગ્રાહકો
 DocType: Leave Control Panel,Allocate,ફાળવો
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,વેચાણ પરત
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,વેચાણ પરત
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,નોંધ: કુલ ફાળવેલ પાંદડા {0} પહેલાથી મંજૂર પાંદડા કરતાં ઓછી ન હોવી જોઈએ {1} સમયગાળા માટે
 DocType: Announcement,Posted By,દ્વારા પોસ્ટ કરવામાં આવ્યું
 DocType: Item,Delivered by Supplier (Drop Ship),સપ્લાયર દ્વારા વિતરિત (ડ્રૉપ જહાજ)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,માટે અવતરણ
 DocType: Lead,Middle Income,મધ્યમ આવક
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ખુલી (સીઆર)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,ફાળવેલ રકમ નકારાત્મક ન હોઈ શકે
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,કંપની સેટ કરો
 DocType: Purchase Order Item,Billed Amt,ચાંચ એએમટી
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,વેચાણ ભરતિયું Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},સંદર્ભ કોઈ અને સંદર્ભ તારીખ માટે જરૂરી છે {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,પસંદ ચુકવણી એકાઉન્ટ બેન્ક એન્ટ્રી બનાવવા માટે
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","પાંદડા, ખર્ચ દાવાઓ અને પેરોલ વ્યવસ્થા કર્મચારી રેકોર્ડ બનાવવા"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,નોલેજ બેઝ ઉમેરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,દરખાસ્ત લેખન
 DocType: Payment Entry Deduction,Payment Entry Deduction,ચુકવણી એન્ટ્રી કપાત
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; નથી નાણાકીય વર્ષમાં {2}
 DocType: Buying Settings,Settings for Buying Module,મોડ્યુલ ખરીદવી માટે સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},એસેટ {0} કંપની ને અનુલક્ષતું નથી {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,પ્રથમ ખરીદી રસીદ દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","પછી કિંમતના નિયમોમાં વગેરે ગ્રાહક, ગ્રાહક જૂથ, પ્રદેશ, સપ્લાયર, પુરવઠોકર્તા પ્રકાર, ઝુંબેશ, વેચાણ ભાગીદાર પર આધારિત બહાર ફિલ્ટર કરવામાં આવે છે"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ઇન્વેન્ટરીમાં કુલ ફેરફાર
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,કર્મચારીનું લોન મેનેજમેન્ટ
 DocType: Employee,Passport Number,પાસપોર્ટ નંબર
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 સાથે સંબંધ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,વ્યવસ્થાપક
 DocType: Payment Entry,Payment From / To,ચુકવણી / to
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,તારીખ રેંજ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},નવું ક્રેડિટ મર્યાદા ગ્રાહક માટે વર્તમાન બાકી રકમ કરતાં ઓછી છે. ક્રેડિટ મર્યાદા ઓછામાં ઓછા હોઈ શકે છે {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; જ ન હોઈ શકે
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,મિનિટ
 DocType: Issue,Resolution Date,ઠરાવ તારીખ
 DocType: Student Batch Name,Batch Name,બેચ નામ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet બનાવવામાં:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet બનાવવામાં:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ચૂકવણીની પદ્ધતિ મૂળભૂત કેશ અથવા બેન્ક એકાઉન્ટ સેટ કરો {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,નોંધણી
 DocType: Selling Settings,Customer Naming By,કરીને ગ્રાહક નામકરણ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,તવદ્યાથી માસિક હાજરી રિપોર્ટ તરીકે પ્રસ્તુત બતાવશે
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,વાસ્તવિક પ્રારંભ સમય
 DocType: BOM Operation,Operation Time,ઓપરેશન સમય
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,સમાપ્ત
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,પાયો
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,પાયો
 DocType: Timesheet,Total Billed Hours,કુલ ગણાવી કલાક
 DocType: Journal Entry,Write Off Amount,રકમ માંડવાળ
 DocType: Journal Entry,Bill No,બિલ કોઈ
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,વિદ્યાર્થી એટેન્ડન્સ
 DocType: Sales Invoice Timesheet,Time Sheet,સમય પત્રક
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush કાચો માલ પર આધારિત
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,આઇટમ વિગતો દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,આઇટમ વિગતો દાખલ કરો
 DocType: Interest,Interest,વ્યાજ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,પૂર્વ વેચાણ
 DocType: Purchase Receipt,Other Details,અન્ય વિગતો
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ચુકવણી એન્ટ્રી પહેલાથી જ બનાવવામાં આવે છે
 DocType: Purchase Receipt Item Supplied,Current Stock,વર્તમાન સ્ટોક
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},રો # {0}: એસેટ {1} વસ્તુ કડી નથી {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,પૂર્વદર્શન પગાર કાપલી
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,એકાઉન્ટ {0} ઘણી વખત દાખલ કરવામાં આવી છે
 DocType: Account,Expenses Included In Valuation,ખર્ચ વેલ્યુએશનમાં સમાવાયેલ
 DocType: Hub Settings,Seller City,વિક્રેતા સિટી
 ,Absent Student Report,ગેરહાજર વિદ્યાર્થી રિપોર્ટ
 DocType: Email Digest,Next email will be sent on:,આગામી ઇમેઇલ પર મોકલવામાં આવશે:
 DocType: Offer Letter Term,Offer Letter Term,પત્ર ગાળાના ઓફર
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,વસ્તુ ચલો છે.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,વસ્તુ ચલો છે.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,વસ્તુ {0} મળી નથી
 DocType: Bin,Stock Value,સ્ટોક ભાવ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,કંપની {0} અસ્તિત્વમાં નથી
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,વૃક્ષ પ્રકાર
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ દ્વારા&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સેટ કરો
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,પસંદ કરો કાર્યક્રમ
 DocType: Project,Estimated Cost,અંદાજીત કિંમત
 DocType: Purchase Order,Link to material requests,સામગ્રી વિનંતીઓ લિંક
@@ -753,7 +756,7 @@
 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,મૂળભૂત એકાઉન્ટ
 DocType: Payment Entry,Received Amount (Company Currency),મળેલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"તક લીડ બનાવવામાં આવે છે, તો લીડ સુયોજિત થવુ જ જોઇએ"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,સાપ્તાહિક બોલ દિવસ પસંદ કરો
 DocType: Production Order Operation,Planned End Time,આયોજિત સમાપ્તિ સમય
 ,Sales Person Target Variance Item Group-Wise,વેચાણ વ્યક્તિ લક્ષ્યાંક ફેરફાર વસ્તુ ગ્રુપ મુજબની
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,પ્રતિ તક
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,માસિક પગાર નિવેદન.
 DocType: BOM,Website Specifications,વેબસાઇટ તરફથી
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી શ્રેણી સંખ્યા&gt; નંબરિંગ સિરીઝ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: પ્રતિ {0} પ્રકારની {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,રો {0}: રૂપાંતર ફેક્ટર ફરજિયાત છે
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,બેન્ક એ / સી નંબર
 DocType: Bank Guarantee,Project,પ્રોજેક્ટ
 DocType: Quality Inspection Reading,Reading 7,7 વાંચન
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,આંશિક આદેશ આપ્યો
 DocType: Expense Claim Detail,Expense Claim Type,ખર્ચ દાવાનો પ્રકાર
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,શોપિંગ કાર્ટ માટે મૂળભૂત સુયોજનો
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},એસેટ જર્નલ પ્રવેશ મારફતે ભાંગી પડયો {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,ઓફિસ જાળવણી ખર્ચ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ઇમેઇલ એકાઉન્ટ સુયોજિત કરી રહ્યા છે
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,પ્રથમ વસ્તુ દાખલ કરો
 DocType: Account,Liability,જવાબદારી
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,મંજુર રકમ રો દાવો રકમ કરતાં વધારે ન હોઈ શકે {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,ભાવ યાદી પસંદ નહી
 DocType: Employee,Family Background,કૌટુંબિક પૃષ્ઠભૂમિ
 DocType: Request for Quotation Supplier,Send Email,ઇમેઇલ મોકલો
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ચેતવણી: અમાન્ય જોડાણ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,પરવાનગી નથી
 DocType: Company,Default Bank Account,મૂળભૂત બેન્ક એકાઉન્ટ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","પાર્ટી પર આધારિત ફિલ્ટર કરવા માટે, પસંદ પાર્ટી પ્રથમ પ્રકાર"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,કોઈ કર્મચારી મળી
 DocType: Supplier Quotation,Stopped,બંધ
 DocType: Item,If subcontracted to a vendor,એક વિક્રેતા subcontracted તો
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,વિદ્યાર્થી જૂથ પહેલેથી અપડેટ થયેલ છે.
 DocType: SMS Center,All Customer Contact,બધા ગ્રાહક સંપર્ક
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV મારફતે સ્ટોક બેલેન્સ અપલોડ કરો.
 DocType: Warehouse,Tree Details,વૃક્ષ વિગતો
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ન્યુનત્તમ ભરતિયું રકમ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: આ કિંમત કેન્દ્ર {2} કંપની ને અનુલક્ષતું નથી {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: એકાઉન્ટ {2} એક જૂથ હોઈ શકે છે
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,વસ્તુ રો {IDX}: {Doctype} {DOCNAME} ઉપર અસ્તિત્વમાં નથી &#39;{Doctype}&#39; ટેબલ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} પહેલેથી જ પૂર્ણ અથવા રદ થયેલ છે
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,કોઈ કાર્યો
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ઓટો ભરતિયું 05, 28 વગેરે દા.ત. પેદા થશે કે જેના પર મહિનાનો દિવસ"
 DocType: Asset,Opening Accumulated Depreciation,ખુલવાનો સંચિત અવમૂલ્યન
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,સરેરાશ દર ખસેડવું
 DocType: Production Planning Tool,Select Items,આઇટમ્સ પસંદ કરો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} બિલ સામે {1} ના રોજ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,કોર્સ શેડ્યૂલ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,કોર્સ શેડ્યૂલ
 DocType: Maintenance Visit,Completion Status,પૂર્ણ સ્થિતિ
 DocType: HR Settings,Enter retirement age in years,વર્ષમાં નિવૃત્તિ વય દાખલ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,લક્ષ્યાંક વેરહાઉસ
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,આ ટકા સુધી ડિલિવરી અથવા રસીદ પર પરવાનગી આપે છે
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,આયાત એટેન્ડન્સ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,બધા આઇટમ જૂથો
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,બધા આઇટમ જૂથો
 DocType: Process Payroll,Activity Log,પ્રવૃત્તિ લોગ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ચોખ્ખો નફો / નુકશાન
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,આપમેળે વ્યવહારો સબમિશન પર સંદેશ કંપોઝ.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ચુકવણી માટે ઓર્ડર ખરીદી
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,અંદાજિત Qty
 DocType: Sales Invoice,Payment Due Date,ચુકવણી કારણે તારીખ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,વસ્તુ વેરિએન્ટ {0} પહેલાથી જ લક્ષણો સાથે હાજર
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;ખુલી&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,આવું કરવા માટે ઓપન
 DocType: Notification Control,Delivery Note Message,ડ લવર નોંધ સંદેશ
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,ફરીથી ઓર્ડર Qty
 DocType: Leave Block List Date,Leave Block List Date,બ્લોક યાદી તારીખ છોડી દો
 DocType: Pricing Rule,Price or Discount,ભાવ અથવા ડિસ્કાઉન્ટ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ખરીદી રસીદ વસ્તુઓ ટેબલ કુલ લાગુ ખર્ચ કુલ કર અને ખર્ચ તરીકે જ હોવી જોઈએ
 DocType: Sales Team,Incentives,ઇનસેન્ટીવ્સ
 DocType: SMS Log,Requested Numbers,વિનંતી નંબર્સ
 DocType: Production Planning Tool,Only Obtain Raw Materials,માત્ર મેળવો કાચો માલ
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted છે
 DocType: Item Attribute,Item Attribute Values,વસ્તુ એટ્રીબ્યુટ મૂલ્યો
 DocType: Examination Result,Examination Result,પરીક્ષા પરિણામ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ખરીદી રસીદ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ખરીદી રસીદ
 ,Received Items To Be Billed,પ્રાપ્ત વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,સબમિટ પગાર સ્લિપ
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,ચલણ વિનિમય દર માસ્ટર.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},સંદર્ભ Doctype એક હોવો જ જોઈએ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},સંદર્ભ Doctype એક હોવો જ જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ઓપરેશન માટે આગામી {0} દિવસોમાં સમય સ્લોટ શોધવામાં અસમર્થ {1}
 DocType: Production Order,Plan material for sub-assemblies,પેટા-સ્થળોના માટે યોજના સામગ્રી
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,સેલ્સ પાર્ટનર્સ અને પ્રદેશ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,આપોઆપ એકાઉન્ટ બનાવી શકાતું નથી કારણ કે ત્યાં પહેલેથી એકાઉન્ટ સ્ટોક સંતુલન છે. પહેલાં તમે આ વેરહાઉસ પર પ્રવેશ કરી શકો છો તમે એક બંધબેસતા એકાઉન્ટ બનાવવા જ પડશે
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,મૂળભૂત ચૂકવવાપાત્ર હિસાબ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} કર્મચારીનું સક્રિય નથી અથવા અસ્તિત્વમાં નથી
 DocType: Fee Structure,Components,ઘટકો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,વસ્તુ ચલો {0} સુધારાશે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},વસ્તુ દાખલ કરો એસેટ વર્ગ {0}
 DocType: Quality Inspection Reading,Reading 6,6 વાંચન
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,નથી {0} {1} {2} વગર કોઈપણ નકારાત્મક બાકી ભરતિયું કરી શકો છો
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ભરતિયું એડવાન્સ ખરીદી
 DocType: Hub Settings,Sync Now,હવે સમન્વય
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},રો {0}: ક્રેડિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,ખરીદી વસ્તુ છે
 DocType: Asset,Purchase Invoice,ખરીદી ભરતિયું
 DocType: Stock Ledger Entry,Voucher Detail No,વાઉચર વિગતવાર કોઈ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,ન્યૂ વેચાણ ભરતિયું
 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,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,તારીખ અને છેલ્લી તારીખ ખોલીને એકસરખું જ રાજવૃત્તીય વર્ષ અંદર હોવો જોઈએ
 DocType: Lead,Request for Information,માહિતી માટે વિનંતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,સમન્વય ઑફલાઇન ઇનવૉઇસેસ
 DocType: Payment Request,Paid,ચૂકવેલ
 DocType: Program Fee,Program Fee,કાર્યક્રમ ફી
 DocType: Salary Slip,Total in words,શબ્દોમાં કુલ
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,મંજૂર
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;નકલ થશે."
 DocType: Job Opening,Publish on website,વેબસાઇટ પર પ્રકાશિત
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ગ્રાહકો માટે આવેલા શિપમેન્ટની.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,પુરવઠોકર્તા ભરતિયું તારીખ પોસ્ટ તારીખ કરતાં વધારે ન હોઈ શકે
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ફેરફાર
 ,Company Name,કંપની નું નામ
 DocType: SMS Center,Total Message(s),કુલ સંદેશ (ઓ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ટ્રાન્સફર માટે પસંદ વસ્તુ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ચેક જમા કરવામાં આવી હતી જ્યાં બેન્ક ઓફ પસંદ એકાઉન્ટ વડા.
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,રો {0}: / સેલ્સ ખરીદી ઓર્ડર સામે ચુકવણી હંમેશા અગાઉથી તરીકે ચિહ્નિત થયેલ હોવી જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,કેમિકલ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,મૂળભૂત બેન્ક / રોકડ એકાઉન્ટ આપમેળે જ્યારે આ સ્થિતિ પસંદ થયેલ પગાર જર્નલ પ્રવેશ અપડેટ કરવામાં આવશે.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ગ્રેડ કોડ માટે સમયાંતરે {0} અન્ય ગ્રેડ માટે એક ગ્રેડ અંતરાલો સાથે ઓવરલેપ થાય છે. કૃપા કરીને તપાસો સમયાંતરે {0} અને {1} અને ફરીથી પ્રયાસ કરો
 DocType: BOM,Raw Material Cost(Company Currency),કાચો સામગ્રી ખર્ચ (કંપની ચલણ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,બધી વસ્તુઓ પહેલેથી જ આ ઉત્પાદન ઓર્ડર માટે તબદીલ કરવામાં આવી છે.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},રો # {0}: દર ઉપયોગમાં દર કરતાં વધારે ન હોઈ શકે {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM વેબસાઇટ વસ્તુ
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,તમારો પત્ર વડા અને લોગો અપલોડ કરો. (જો તમે પછીથી તેમને ફેરફાર કરી શકો છો).
 DocType: Timesheet Detail,Bill,બિલ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,આગળ અવમૂલ્યન તારીખ છેલ્લા તારીખ તરીકે દાખલ થયેલ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,વ્હાઇટ
 DocType: SMS Center,All Lead (Open),બધા સીસું (ઓપન)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),રો {0}: Qty માટે ઉપલબ્ધ નથી {4} વેરહાઉસ {1} પ્રવેશ સમયે પોસ્ટ પર ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,એડવાન્સિસ ચૂકવેલ મેળવો
 DocType: Item,Automatically Create New Batch,ન્યૂ બેચ આપમેળે બનાવો
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,બનાવો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,બનાવો
 DocType: Student Admission,Admission Start Date,પ્રવેશ પ્રારંભ તારીખ
 DocType: Journal Entry,Total Amount in Words,શબ્દો કુલ રકમ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,એક ભૂલ આવી હતી. એક સંભવિત કારણ શું તમે ફોર્મ સાચવવામાં ન હોય કે હોઈ શકે છે. જો સમસ્યા યથાવત રહે તો support@erpnext.com સંપર્ક કરો.
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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 ખુલવાનો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,જથ્થો બદલી માટે એકાઉન્ટ દાખલ કરો
 DocType: Student Batch Name,Student Batch Name,વિદ્યાર્થી બેચ નામ
 DocType: Holiday List,Holiday List Name,રજા યાદી નામ
 DocType: Repayment Schedule,Balance Loan Amount,બેલેન્સ લોન રકમ
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ઉલ્લેખ કરો એક {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,જથ્થો અથવા કિંમત કોઈ ફેરફાર સાથે દૂર વસ્તુઓ.
 DocType: Delivery Note,Delivery To,ડ લવર
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,એટ્રીબ્યુટ ટેબલ ફરજિયાત છે
 DocType: Production Planning Tool,Get Sales Orders,વેચાણ ઓર્ડર મેળવો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} નકારાત્મક ન હોઈ શકે
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ડિસ્કાઉન્ટ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ડિસ્કાઉન્ટ
 DocType: Asset,Total Number of Depreciations,કુલ Depreciations સંખ્યા
 DocType: Sales Invoice Item,Rate With Margin,માર્જિનથી દર
 DocType: Workstation,Wages,વેતન
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,સેલ્સ ઓર્ડર / ફિનિશ્ડ ગૂડ્સ વેરહાઉસ માં અનામત વેરહાઉસ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,વેચાણ રકમ
 DocType: Repayment Schedule,Interest Amount,વ્યાજ રકમ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,તમે આ રેકોર્ડ માટે ખર્ચ તાજનો છે. જો &#39;પરિસ્થિતિ&#39; અને સાચવો અપડેટ કરો
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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,મુદ્દો
 DocType: Asset,Scrapped,રદ
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","વસ્તુ ચલો માટે શ્રેય. દા.ત. કદ, રંગ વગેરે"
 DocType: Purchase Invoice,Returns,રિટર્ન્સ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP વેરહાઉસ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},સીરીયલ કોઈ {0} સુધી જાળવણી કરાર હેઠળ છે {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ભરતી
 DocType: Lead,Organization Name,સંસ્થા નામ
 DocType: Tax Rule,Shipping State,શીપીંગ રાજ્ય
 ,Projected Quantity as Source,સોર્સ તરીકે પ્રોજેક્ટ જથ્થો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,વસ્તુ બટન &#39;ખરીદી રસીદો થી વસ્તુઓ વિચાર&#39; નો ઉપયોગ ઉમેરાવી જ જોઈએ
 DocType: Employee,A-,એ
 DocType: Production Planning Tool,Include non-stock items,નોન-સ્ટોક વસ્તુઓ સમાવેશ થાય છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,સેલ્સ ખર્ચ
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,સામે
 DocType: Item,Default Selling Cost Center,મૂળભૂત વેચાણ ખર્ચ કેન્દ્ર
 DocType: Sales Partner,Implementation Partner,અમલીકરણ જીવનસાથી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,પિન કોડ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,પિન કોડ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},વેચાણ ઓર્ડર {0} છે {1}
 DocType: Opportunity,Contact Info,સંપર્ક માહિતી
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,સ્ટોક પ્રવેશો બનાવે
 DocType: Packing Slip,Net Weight UOM,નેટ વજન UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} પરિણામો
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} પરિણામો
 DocType: Item,Default Supplier,મૂળભૂત પુરવઠોકર્તા
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ઉત્પાદન ભથ્થું ટકાવારી પર
 DocType: Employee Loan,Repayment Schedule,ચુકવણી શેડ્યૂલ
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,અઠવાડિક બંધ તારીખો મેળવો
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,સમાપ્તિ તારીખ પ્રારંભ તારીખ કરતાં ઓછા ન હોઈ શકે
 DocType: Sales Person,Select company name first.,પ્રથમ પસંદ કંપની નામ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ડૉ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ડૉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,સુવાકયો સપ્લાયરો પાસેથી પ્રાપ્ત થઈ છે.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},માટે {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,સરેરાશ ઉંમર
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,કી બોનસ વિસ્તાર
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ટ્રાન્સપોર્ટેશન
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,અમાન્ય એટ્રીબ્યુટ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} સબમિટ હોવું જ જોઈએ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},જથ્થો કરતાં ઓછી અથવા સમાન હોવા જ જોઈએ {0}
 DocType: SMS Center,Total Characters,કુલ અક્ષરો
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},વસ્તુ માટે BOM ક્ષેત્રમાં BOM પસંદ કરો {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,ડિસ્ટ્રીબ્યુટર
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,શોપિંગ કાર્ટ શીપીંગ નિયમ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ઉત્પાદન ઓર્ડર {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',સુયોજિત &#39;પર વધારાની ડિસ્કાઉન્ટ લાગુ&#39; કરો
 ,Ordered Items To Be Billed,આદેશ આપ્યો વસ્તુઓ બિલ કરવા
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,રેન્જ ઓછી હોઈ શકે છે કરતાં શ્રેણી
 DocType: Global Defaults,Global Defaults,વૈશ્વિક ડિફૉલ્ટ્સ
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,પ્રારંભ વર્ષ
 DocType: Purchase Invoice,Start date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા તારીખ શરૂ
 DocType: Salary Slip,Leave Without Pay,પગાર વિના છોડો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ક્ષમતા આયોજન ભૂલ
 ,Trial Balance for Party,પાર્ટી માટે ટ્રાયલ બેલેન્સ
 DocType: Lead,Consultant,સલાહકાર
 DocType: Salary Slip,Earnings,કમાણી
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","આ ચલ વસ્તુ કોડ ઉમેરાવું કરવામાં આવશે. તમારા સંક્ષેપ &quot;શૌન&quot; છે, અને ઉદાહરણ તરીકે, જો આઇટમ કોડ &quot;ટી શર્ટ&quot;, &quot;ટી-શર્ટ શૌન&quot; હશે ચલ આઇટમ કોડ છે"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,તમે પગાર કાપલી સેવ વાર (શબ્દોમાં) નેટ પે દૃશ્યમાન થશે.
 DocType: Purchase Invoice,Is Return,વળતર છે
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,રીટર્ન / ડેબિટ નોટ
 DocType: Price List Country,Price List Country,ભાવ યાદી દેશ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} વસ્તુ માટે માન્ય સીરીયલ અમે {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,બેચ નંબર મેળવવા માટે વસ્તુ કોડ દાખલ કરો
 DocType: Stock Settings,Default Item Group,મૂળભૂત વસ્તુ ગ્રુપ
 DocType: Employee Loan,Partially Disbursed,આંશિક વિતરિત
-DocType: Grading Structure,Grading System Name,ગ્રેડિંગ સિસ્ટમ નામ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,પુરવઠોકર્તા ડેટાબેઝ.
 DocType: Account,Balance Sheet,સરવૈયા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',&#39;આઇટમ કોડ સાથે આઇટમ માટે કેન્દ્ર ખર્ચ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ચુકવણી સ્થિતિ રૂપરેખાંકિત થયેલ નથી. કૃપા કરીને તપાસો, કે શું એકાઉન્ટ ચૂકવણી સ્થિતિ પર અથવા POS પ્રોફાઇલ પર સેટ કરવામાં આવ્યો છે."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,તમારા વેચાણ વ્યક્તિ ગ્રાહક સંપર્ક કરવા માટે આ તારીખ પર એક રીમાઇન્ડર મળશે
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,એ જ વસ્તુ ઘણી વખત દાખલ કરી શકાતી નથી.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","વધુ એકાઉન્ટ્સ જૂથો હેઠળ કરી શકાય છે, પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે"
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,સ્ટોક ખાતાવહી પ્રવેશો અને ઓપનજીએલ પ્રવેશો પસંદ કરેલ ખરીદી રસીદો માટે પોસ્ટ કર્યું છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,સ્ટોક ખાતાવહી પ્રવેશો અને ઓપનજીએલ પ્રવેશો પસંદ કરેલ ખરીદી રસીદો માટે પોસ્ટ કર્યું છે
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,વસ્તુ 1
 DocType: Holiday,Holiday,હોલિડે
 DocType: Support Settings,Close Issue After Days,બંધ અંક દિવસો પછી
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,કામ કર્યું
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,લક્ષણો ટેબલ ઓછામાં ઓછા એક લક્ષણ સ્પષ્ટ કરો
 DocType: Announcement,All Students,બધા વિદ્યાર્થીઓ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,વસ્તુ {0} નોન-સ્ટોક વસ્તુ હોઇ જ જોઈએ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,જુઓ ખાતાવહી
 DocType: Grading Scale,Intervals,અંતરાલો
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,જુનું
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","એક વસ્તુ ગ્રુપ જ નામ સાથે હાજર, આઇટમ નામ બદલવા અથવા વસ્તુ જૂથ નામ બદલી કૃપા કરીને"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,વિદ્યાર્થી મોબાઇલ નંબર
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,બાકીનું વિશ્વ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,આ આઇટમ {0} બેચ હોઈ શકે નહિં
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},માટે {0} થી પગાર ચુકવણી {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},સ્થિર એકાઉન્ટ સંપાદિત કરો કરવા માટે અધિકૃત ન {0}
 DocType: Journal Entry,Get Outstanding Invoices,બાકી ઇન્વૉઇસેસ મેળવો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,વેચાણ ઓર્ડર {0} માન્ય નથી
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ખરીદી ઓર્ડર કરવાની યોજના ઘડી મદદ અને તમારી ખરીદી પર અનુસરો
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","માફ કરશો, કંપનીઓ મર્જ કરી શકાતા નથી"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",કુલ અંક / ટ્રાન્સફર જથ્થો {0} સામગ્રી વિનંતી {1} \ વસ્તુ માટે વિનંતી જથ્થો {2} કરતાં વધારે ન હોઈ શકે {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,નાના
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,પરોક્ષ ખર્ચ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,રો {0}: Qty ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,કૃષિ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,સમન્વય માસ્ટર ડેટા
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,સમન્વય માસ્ટર ડેટા
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,તમારી ઉત્પાદનો અથવા સેવાઓ
 DocType: Mode of Payment,Mode of Payment,ચૂકવણીની પદ્ધતિ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,વેબસાઇટ છબી જાહેર ફાઈલ અથવા વેબસાઇટ URL હોવો જોઈએ
 DocType: Student Applicant,AP,એપી
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,આ રુટ વસ્તુ જૂથ છે અને સંપાદિત કરી શકાતી નથી.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,ગ્રુપ રોલ નંબર
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, માત્ર ક્રેડિટ ખાતાઓ અન્ય ડેબિટ પ્રવેશ સામે લિંક કરી શકો છો"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,બધા કાર્ય વજન કુલ પ્રયત્ન કરીશું 1. મુજબ બધા પ્રોજેક્ટ કાર્યો વજન સંતુલિત કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ડ લવર નોંધ {0} અપર્ણ ન કરાય
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;પર લાગુ પડે છે."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","પ્રાઇસીંગ નિયમ પ્રથમ પર આધારિત પસંદ થયેલ વસ્તુ, આઇટમ ગ્રુપ અથવા બ્રાન્ડ બની શકે છે, જે ક્ષેત્ર &#39;પર લાગુ પડે છે."
 DocType: Hub Settings,Seller Website,વિક્રેતા વેબસાઇટ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,વેચાણ ટીમ માટે કુલ ફાળવેલ ટકાવારી 100 પ્રયત્ન કરીશું
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ઉત્પાદન ઓર્ડર સ્થિતિ છે {0}
 DocType: Appraisal Goal,Goal,ગોલ
 DocType: Sales Invoice Item,Edit Description,સંપાદિત કરો વર્ણન
 ,Team Updates,ટીમ સુધારાઓ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,સપ્લાયર માટે
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,સપ્લાયર માટે
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,એકાઉન્ટ પ્રકાર સેટિંગ વ્યવહારો આ એકાઉન્ટ પસંદ કરે છે.
 DocType: Purchase Invoice,Grand Total (Company Currency),કુલ સરવાળો (કંપની ચલણ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,પ્રિન્ટ ફોર્મેટ બનાવો
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} પ્રગતિ વસ્તુઓ
 DocType: Workstation,Workstation Name,વર્કસ્ટેશન નામ
-DocType: Grade Interval,Grade Code,ગ્રેડ કોડ
+DocType: Grading Scale Interval,Grade Code,ગ્રેડ કોડ
 DocType: POS Item Group,POS Item Group,POS વસ્તુ ગ્રુપ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ડાયજેસ્ટ ઇમેઇલ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} વસ્તુ ને અનુલક્ષતું નથી {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,હાર્ડવેર
 DocType: Sales Order,Recurring Upto,રીકરીંગ સુધી
 DocType: Attendance,HR Manager,એચઆર મેનેજર
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,કંપની પસંદ કરો
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,કંપની પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,પ્રિવિલેજ છોડો
 DocType: Purchase Invoice,Supplier Invoice Date,પુરવઠોકર્તા ભરતિયું તારીખ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,તમે શોપિંગ કાર્ટ સક્રિય કરવાની જરૂર છે
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ફૂડ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,એઇજીંગનો રેન્જ 3
 DocType: Maintenance Schedule Item,No of Visits,મુલાકાત કોઈ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,માર્ક Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,માર્ક Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},જાળવણી સુનિશ્ચિત {0} સામે અસ્તિત્વમાં {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,નોંધણી વિદ્યાર્થી
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},બંધ એકાઉન્ટ કરન્સી હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},બધા ગોલ માટે પોઈન્ટ રકમ તે 100 હોવું જોઈએ {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,સરેરાશ દૈનિક આઉટગોઇંગ
 DocType: POS Profile,Campaign,ઝુંબેશ
 DocType: Supplier,Name and Type,નામ અને પ્રકાર
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',મંજૂરી પરિસ્થિતિ &#39;માન્ય&#39; અથવા &#39;નકારેલું&#39; હોવું જ જોઈએ
 DocType: Purchase Invoice,Contact Person,સંપર્ક વ્યક્તિ
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;અપેક્ષા પ્રારંભ તારીખ&#39; કરતાં વધારે &#39;અપેક્ષિત ઓવરને તારીખ&#39; ન હોઈ શકે
 DocType: Course Scheduling Tool,Course End Date,કોર્સ સમાપ્તિ તારીખ
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,શિપિંગ સરનામું નામ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,એકાઉન્ટ્સ ઓફ ચાર્ટ
 DocType: Material Request,Terms and Conditions Content,નિયમો અને શરતો સામગ્રી
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 કરતા વધારે ન હોઈ શકે
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} વસ્તુ સ્ટોક વસ્તુ નથી
 DocType: Maintenance Visit,Unscheduled,અનિશ્ચિત
 DocType: Employee,Owned,માલિકીની
 DocType: Salary Detail,Depends on Leave Without Pay,પગાર વિના રજા પર આધાર રાખે છે
 DocType: Pricing Rule,"Higher the number, higher the priority","ઉચ્ચ સંખ્યા, ઉચ્ચ અગ્રતા"
 ,Purchase Invoice Trends,ભરતિયું પ્રવાહો ખરીદી
 DocType: Employee,Better Prospects,સારી સંભાવના
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","રો # {0}: બેચ {1} માત્ર {2} Qty છે. કૃપા કરીને બીજી બેચ જે {3} Qty ઉપલબ્ધ છે પસંદ કરો અથવા બહુવિધ પંક્તિઓ માં પંક્તિ પડ્યા, બહુવિધ બૅચેસ થી પહોંચાડવા / મુદ્દાને"
 DocType: Vehicle,License Plate,લાઇસન્સ પ્લેટ
 DocType: Appraisal,Goals,લક્ષ્યાંક
 DocType: Warranty Claim,Warranty / AMC Status,વોરંટી / એએમસી સ્થિતિ
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,કર્મચારીનું પોતાની જાતને જાણ કરી શકો છો.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","એકાઉન્ટ સ્થિર છે, તો પ્રવેશો પ્રતિબંધિત વપરાશકર્તાઓ માટે માન્ય છે."
 DocType: Email Digest,Bank Balance,બેંક બેલેન્સ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} માત્ર ચલણ કરી શકાય છે: {0} માટે એકાઉન્ટિંગ એન્ટ્રી {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","જોબ પ્રોફાઇલ, યોગ્યતાઓ જરૂરી વગેરે"
 DocType: Journal Entry Account,Account Balance,એકાઉન્ટ બેલેન્સ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,વ્યવહારો માટે કરવેરા નિયમ.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed નાણાકીય વર્ષના પી એન્ડ એલ બેલેન્સ બતાવો
 DocType: Shipping Rule,Shipping Account,શીપીંગ એકાઉન્ટ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: એકાઉન્ટ {2} નિષ્ક્રિય છે
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,વેચાણ ઓર્ડર તમે તમારા કામ કરવાની યોજના કરવામાં મદદ અને સમય પહોંચાડવા બનાવે
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,વેચાણ ઓર્ડર તમે તમારા કામ કરવાની યોજના કરવામાં મદદ અને સમય પહોંચાડવા બનાવે
 DocType: Quality Inspection,Readings,વાંચનો
 DocType: Stock Entry,Total Additional Costs,કુલ વધારાના ખર્ચ
 DocType: Course Schedule,SH,એસ.એચ
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,કિંમત
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,પેકિંગ કાપલી
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,પેકિંગ કાપલી
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ઓફિસ ભાડે
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,સેટઅપ એસએમએસ ગેટવે સેટિંગ્સ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,આયાત નિષ્ફળ!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,સેવાઓ
 DocType: HR Settings,Email Salary Slip to Employee,કર્મચારીનું ઇમેઇલ પગાર કાપલી
 DocType: Cost Center,Parent Cost Center,પિતૃ ખર્ચ કેન્દ્રને
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,શક્ય પુરવઠોકર્તા પસંદ કરો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,શક્ય પુરવઠોકર્તા પસંદ કરો
 DocType: Sales Invoice,Source,સોર્સ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,બતાવો બંધ
 DocType: Leave Type,Is Leave Without Pay,પગાર વિના છોડી દો
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,એસેટ વર્ગ સ્થિર એસેટ આઇટમ માટે ફરજિયાત છે
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,આ ચુકવણી ટેબલ માં શોધી કોઈ રેકોર્ડ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},આ {0} સાથે તકરાર {1} માટે {2} {3}
 DocType: Student Attendance Tool,Students HTML,વિદ્યાર્થીઓ HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,છોડીને તારીખ
 DocType: Pricing Rule,For Price List,ભાવ યાદી માટે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,એક્ઝિક્યુટિવ સર્ચ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,લીડ્સ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,લીડ્સ બનાવો
 DocType: Maintenance Schedule,Schedules,ફ્લાઈટ શેડ્યુલ
 DocType: Purchase Invoice Item,Net Amount,ચોખ્ખી રકમ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM વિગતવાર કોઈ
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,કાર્યક્રમ પ્રવેશ
 DocType: Sales Invoice Item,Brand Name,બ્રાન્ડ નામ
 DocType: Purchase Receipt,Transporter Details,ટ્રાન્સપોર્ટર વિગતો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,મૂળભૂત વેરહાઉસ પસંદ આઇટમ માટે જરૂરી છે
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,બોક્સ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,શક્ય પુરવઠોકર્તા
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,શક્ય પુરવઠોકર્તા
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,સંસ્થા
 DocType: Budget,Monthly Distribution,માસિક વિતરણ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,રીસીવર સૂચિ ખાલી છે. રીસીવર યાદી બનાવવા કરો
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,વેચાણ ભાગીદાર લક્ષ્યાંક
 DocType: Loan Type,Maximum Loan Amount,મહત્તમ લોન રકમ
 DocType: Pricing Rule,Pricing Rule,પ્રાઇસીંગ નિયમ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},વિદ્યાર્થી માટે ડુપ્લિકેટ રોલ નંબર {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},વિદ્યાર્થી માટે ડુપ્લિકેટ રોલ નંબર {0}
 DocType: Budget,Action if Annual Budget Exceeded,જો વાર્ષિક બજેટ વટાવી ક્રિયા
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ઓર્ડર ખરીદી સામગ્રી વિનંતી
 DocType: Shopping Cart Settings,Payment Success URL,ચુકવણી સફળતા URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,ચુકવણી પદ્ધતિ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","જો ચકાસાયેલ છે, મુખ્ય પૃષ્ઠ પાનું વેબસાઇટ માટે મૂળભૂત વસ્તુ ગ્રુપ હશે"
 DocType: Quality Inspection Reading,Reading 4,4 વાંચન
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},માટે {0} પ્રોજેક્ટ મળી નથી ડિફૉલ્ટ BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},માટે {0} પ્રોજેક્ટ મળી નથી ડિફૉલ્ટ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,કંપની ખર્ચ માટે દાવા.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","વિદ્યાર્થી સિસ્ટમ હૃદય હોય છે, તમારા બધા વિદ્યાર્થીઓ ઉમેરી"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","વિદ્યાર્થી સિસ્ટમ હૃદય હોય છે, તમારા બધા વિદ્યાર્થીઓ ઉમેરી"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},રો # {0}: ક્લિયરન્સ તારીખ {1} પહેલાં ચેક તારીખ ન હોઈ શકે {2}
 DocType: Company,Default Holiday List,રજા યાદી મૂળભૂત
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},રો {0}: પ્રતિ સમય અને સમય {1} સાથે ઓવરલેપિંગ છે {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,તમે રજા માટે અરજી છે કે જેના પર દિવસ (ઓ) રજાઓ છે. તમે રજા માટે અરજી જરૂર નથી.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ચુકવણી ઇમેઇલ ફરી મોકલો
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,નવી કાર્ય
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,અવતરણ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,અવતરણ બનાવો
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,અન્ય અહેવાલો
 DocType: Dependent Task,Dependent Task,આશ્રિત ટાસ્ક
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},માપવા એકમ મૂળભૂત માટે રૂપાંતર પરિબળ પંક્તિ માં 1 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},પ્રકાર રજા {0} કરતાં લાંબા સમય સુધી ન હોઈ શકે {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,અગાઉથી X દિવસ માટે કામગીરી આયોજન કરવાનો પ્રયાસ કરો.
 DocType: HR Settings,Stop Birthday Reminders,સ્ટોપ જન્મદિવસ રિમાઇન્ડર્સ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},કંપની મૂળભૂત પગારપત્રક ચૂકવવાપાત્ર એકાઉન્ટ સેટ કૃપા કરીને {0}
 DocType: SMS Center,Receiver List,રીસીવર યાદી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,શોધ વસ્તુ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,શોધ વસ્તુ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,કમ્પોનન્ટ રકમ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,કેશ કુલ ફેરફાર
 DocType: Assessment Plan,Grading Scale,ગ્રેડીંગ સ્કેલ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,પહેલેથી જ પૂર્ણ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,મેઝર {0} એકમ રૂપાંતર ફેક્ટર ટેબલ એક કરતા વધુ વખત દાખલ કરવામાં આવી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,પહેલેથી જ પૂર્ણ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ચુકવણી વિનંતી પહેલેથી હાજર જ છે {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,બહાર પાડેલી વસ્તુઓ કિંમત
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},જથ્થો કરતાં વધુ ન હોવું જોઈએ {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,વહેંચણી એન્ટ્રી બનાવો
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,રો {0}: પુરવઠોકર્તા સામે એડવાન્સ ડેબિટ હોવું જ જોઈએ
 DocType: Company,Default Values,મૂળભૂત મૂલ્યો
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{આવર્તન} ડાયજેસ્ટ
 DocType: Expense Claim,Total Amount Reimbursed,કુલ રકમ reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,આ વાહન સામે લોગ પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,એકત્રિત
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},પુરવઠોકર્તા સામે ભરતિયું {0} ના રોજ {1}
 DocType: Customer,Default Price List,ડિફૉલ્ટ ભાવ યાદી
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,એસેટ ચળવળ રેકોર્ડ {0} બનાવવામાં
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,તમે કાઢી શકતા નથી ફિસ્કલ વર્ષ {0}. ફિસ્કલ વર્ષ {0} વૈશ્વિક સેટિંગ્સ મૂળભૂત તરીકે સુયોજિત છે
 DocType: Journal Entry,Entry Type,એન્ટ્રી પ્રકાર
 ,Customer Credit Balance,ગ્રાહક ક્રેડિટ બેલેન્સ
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,પ્રાપ્તિ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,વસ્તુઓ કંઈ જથ્થો અથવા કિંમત કોઈ ફેરફાર હોય છે.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ફરજિયાત ફીલ્ડ - પ્રોગ્રામ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,વોરંટી દાવાની
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,વોરંટી દાવાની
 ,Lead Details,લીડ વિગતો
 DocType: Salary Slip,Loan repayment,લોન ચુકવણી
 DocType: Purchase Invoice,End date of current invoice's period,વર્તમાન ભરતિયું માતાનો સમયગાળા ઓવરને અંતે તારીખ
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,કાયમી સરનામું
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",કુલ સરવાળો કરતાં \ {0} {1} વધારે ન હોઈ શકે સામે ચૂકવણી એડવાન્સ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,આઇટમ કોડ પસંદ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,આઇટમ કોડ પસંદ કરો
 DocType: Student Sibling,Studying in Same Institute,આ જ સંસ્થાના અભ્યાસ
 DocType: Territory,Territory Manager,પ્રદેશ વ્યવસ્થાપક
 DocType: Packed Item,To Warehouse (Optional),વેરહાઉસ (વૈકલ્પિક)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,આઇટમ code&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Payment Entry,Paid Amount (Company Currency),ચૂકવેલ રકમ (કંપની ચલણ)
 DocType: Purchase Invoice,Additional Discount,વધારાના ડિસ્કાઉન્ટ
 DocType: Selling Settings,Selling Settings,સેટિંગ્સ વેચાણ
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,કાર્ટ માં જુઓ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,માર્કેટિંગ ખર્ચ
 ,Item Shortage Report,વસ્તુ અછત રિપોર્ટ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","વજન \ n કૃપા કરીને પણ &quot;વજન UOM&quot; ઉલ્લેખ, ઉલ્લેખ કર્યો છે"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,સામગ્રી વિનંતી આ સ્ટોક એન્ટ્રી બનાવવા માટે વપરાય
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,આગળ અવમૂલ્યન તારીખ નવા એસેટ માટે ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,આગળ અવમૂલ્યન તારીખ નવા એસેટ માટે ફરજિયાત છે
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,દરેક બેચ માટે અલગ અભ્યાસક્રમ આધારિત ગ્રુપ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,આઇટમ એક એકમ.
 DocType: Fee Category,Fee Category,ફી વર્ગ
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,ભારાંકન
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: આ કિંમત કેન્દ્ર &#39;નફો અને નુકસાનનું&#39; એકાઉન્ટ માટે જરૂરી છે {2}. કૃપા કરીને કંપની માટે મૂળભૂત કિંમત કેન્દ્ર સુયોજિત કરો.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,એક ગ્રાહક જૂથ જ નામ સાથે હાજર ગ્રાહક નામ બદલી અથવા ગ્રાહક જૂથ નામ બદલી કૃપા કરીને
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ટેરિટરી
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 વાંચન
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,વસ્તુ મુજબના સેલ્સ રજિસ્ટર
 DocType: Asset,Gross Purchase Amount,કુલ ખરીદી જથ્થો
 DocType: Asset,Depreciation Method,અવમૂલ્યન પદ્ધતિ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ઑફલાઇન
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ઑફલાઇન
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,મૂળભૂત દર માં સમાવેલ આ કર છે?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,કુલ લક્ષ્યાંકના
 DocType: Program Course,Required,જરૂરી
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,રિકંસીલેશન JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ઘણા બધા કૉલમ. અહેવાલમાં નિકાસ અને એક સ્પ્રેડશીટ એપ્લિકેશન ઉપયોગ છાપો.
 DocType: Purchase Invoice Item,Batch No,બેચ કોઈ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},માટે વિનિમય દર શોધવામાં અસમર્થ {0} માટે {1} કી તારીખ માટે {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,એક ગ્રાહક ખરીદી ઓર્ડર સામે બહુવિધ વેચાણ ઓર્ડર માટે પરવાનગી આપે છે
 DocType: Student Group Instructor,Student Group Instructor,વિદ્યાર્થીઓની જૂથ પ્રશિક્ષક
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 મોબાઇલ કોઈ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,મુખ્ય
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,વેરિએન્ટ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,મુખ્ય
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,વેરિએન્ટ
 DocType: Naming Series,Set prefix for numbering series on your transactions,તમારા વ્યવહારો પર શ્રેણી નંબર માટે સેટ ઉપસર્ગ
 DocType: Employee Attendance Tool,Employees HTML,કર્મચારીઓ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,મૂળભૂત BOM ({0}) આ આઇટમ અથવા તેના નમૂના માટે સક્રિય હોવા જ જોઈએ
 DocType: Employee,Leave Encashed?,વટાવી છોડી?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ક્ષેત્રમાં પ્રતિ તક ફરજિયાત છે
 DocType: Email Digest,Annual Expenses,વાર્ષિક ખર્ચ
 DocType: Item,Variants,ચલો
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ખરીદી ઓર્ડર બનાવો
 DocType: SMS Center,Send To,ને મોકલવું
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},છોડો પ્રકાર માટે પૂરતી રજા બેલેન્સ નથી {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ફાળવેલ રકમ
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,વર્ક ઈન પ્રોગ્રેસ વેરહાઉસ સબમિટ પહેલાં જરૂરી છે
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,નોકરી માટે અરજી.
 DocType: Purchase Order Item,Warehouse and Reference,વેરહાઉસ અને સંદર્ભ
 DocType: Supplier,Statutory info and other general information about your Supplier,તમારા સપ્લાયર વિશે વૈધાિનક માહિતી અને અન્ય સામાન્ય માહિતી
 DocType: Item,Serial Nos and Batches,સીરીયલ સંખ્યા અને બૅચેસ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,વિદ્યાર્થીઓની જૂથ સ્ટ્રેન્થ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,જર્નલ સામે એન્ટ્રી {0} કોઈપણ મેળ ન ખાતી {1} પ્રવેશ નથી
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,appraisals
 apps/erpnext/erpnext/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: Grading Structure,Grading Intervals,ગ્રેડીંગ અંતરાલો
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,દાખલ કરો
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","સળંગ આઇટમ {0} માટે overbill શકાતું નથી {1} કરતાં વધુ {2}. ઓવર બિલિંગ પરવાનગી આપવા માટે, સેટિંગ્સ ખરીદવી સેટ કૃપા કરીને"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,આઇટમ અથવા વેરહાઉસ પર આધારિત ફિલ્ટર સેટ
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} સબમિટ હોવું જ જોઈએ
 DocType: Authorization Control,Authorization Control,અધિકૃતિ નિયંત્રણ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ROW # {0}: વેરહાઉસ નકારેલું ફગાવી વસ્તુ સામે ફરજિયાત છે {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ચુકવણી
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,તમારા ઓર્ડર મેનેજ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ચુકવણી
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,તમારા ઓર્ડર મેનેજ
 DocType: Production Order Operation,Actual Time and Cost,વાસ્તવિક સમય અને ખર્ચ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},મહત્તમ {0} ના સામગ્રી વિનંતી {1} વેચાણ ઓર્ડર સામે વસ્તુ માટે કરી શકાય છે {2}
 DocType: Employee,Salutation,નમસ્કાર
 DocType: Course,Course Abbreviation,કોર્સ સંક્ષેપનો
 DocType: Student Leave Application,Student Leave Application,વિદ્યાર્થી છોડો અરજી
 DocType: Item,Will also apply for variants,પણ ચલો માટે લાગુ પડશે
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",એસેટ રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},કર્મચારીનું {0} પર અડધા દિવસ પર {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},કુલ કામના કલાકો મેક્સ કામના કલાકો કરતાં વધારે ન હોવી જોઈએ {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,પર
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,વેચાણ સમયે બંડલ વસ્તુઓ.
 DocType: Quotation Item,Actual Qty,વાસ્તવિક Qty
 DocType: Sales Invoice Item,References,સંદર્ભો
@@ -1775,7 +1776,7 @@
 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 +91,Associate,એસોસિયેટ
 DocType: Asset Movement,Asset Movement,એસેટ ચળવળ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ન્યૂ કાર્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,ન્યૂ કાર્ટ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} વસ્તુ એક શ્રેણીબદ્ધ વસ્તુ નથી
 DocType: SMS Center,Create Receiver List,રીસીવર યાદી બનાવો
 DocType: Vehicle,Wheels,વ્હિલ્સ
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ઉત્પાદન ઓર્ડર સામે સમય લોગ બનાવટને નિષ્ક્રિય કરે. ઓપરેશન્સ ઉત્પાદન ઓર્ડર સામે ટ્રેક કરી નહિ
 DocType: Student,Student Mobile Number,વિદ્યાર્થી મોબાઇલ નંબર
 DocType: Item,Has Variants,ચલો છે
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},જો તમે પહેલાથી જ વસ્તુઓ પસંદ કરેલ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,માસિક વિતરણ નામ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,બૅચ ID ફરજિયાત છે
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,બૅચ ID ફરજિયાત છે
 DocType: Sales Person,Parent Sales Person,પિતૃ વેચાણ વ્યક્તિ
 DocType: Purchase Invoice,Recurring Invoice,રીકરીંગ ભરતિયું
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,પ્રોજેક્ટ વ્યવસ્થા
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,નાણાકીય વર્ષ
 DocType: Vehicle Log,Fuel Price,ફ્યુઅલ પ્રાઈસ
 DocType: Budget,Budget,બજેટ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,સ્થિર એસેટ વસ્તુ નોન-સ્ટોક વસ્તુ હોવી જ જોઈએ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",તે આવક અથવા ખર્ચ એકાઉન્ટ નથી તરીકે બજેટ સામે {0} અસાઇન કરી શકાતી નથી
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,પ્રાપ્ત
 DocType: Student Admission,Application Form Route,અરજી ફોર્મ રૂટ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,પ્રદેશ / ગ્રાહક
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,પ્રદેશ / ગ્રાહક
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,દા.ત. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,છોડો પ્રકાર {0} ફાળવવામાં કરી શકાતી નથી કારણ કે તે પગાર વિના છોડી
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},રો {0}: સોંપાયેલ રકમ {1} કરતાં ઓછી હોઈ શકે છે અથવા બાકી રકમ ભરતિયું બરાબર જ જોઈએ {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,સીરીયલ કોઈ સ્થિતિ
 DocType: Payment Entry Reference,Outstanding,ઉત્કૃષ્ટ
 ,Daily Timesheet Summary,દૈનિક Timesheet સારાંશ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","રો {0}: સુયોજિત કરવા માટે {1} સમયગાળાના, અને તારીખ \ વચ્ચે તફાવત કરતાં વધારે અથવા સમાન હોવો જોઈએ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,આ સ્ટોક ચળવળ પર આધારિત છે. જુઓ {0} વિગતો માટે
 DocType: Pricing Rule,Selling,વેચાણ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},રકમ {0} {1} સામે બાદ {2}
 DocType: Employee,Salary Information,પગાર માહિતી
 DocType: Sales Person,Name and Employee ID,નામ અને કર્મચારી ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,કારણે તારીખ તારીખ પોસ્ટ કરતા પહેલા ન હોઈ શકે
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,કર અને વેરામાંથી
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,સંદર્ભ તારીખ દાખલ કરો
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,આ ચાર્જ પ્રકાર માટે વર્તમાન પંક્તિ નંબર એક કરતાં વધારે અથવા સમાન પંક્તિ નંબર નો સંદર્ભ લો નથી કરી શકો છો
 DocType: Asset,Sold,વેચાઈ
 ,Item-wise Purchase History,વસ્તુ મુજબના ખરીદ ઈતિહાસ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},સીરીયલ કોઈ વસ્તુ માટે ઉમેરવામાં મેળવે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો {0}
 DocType: Account,Frozen,ફ્રોઝન
 ,Open Production Orders,ઓપન ઉત્પાદન ઓર્ડર્સ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),મૂળ રકમ (કંપની ચલણ)
 DocType: Payment Reconciliation Payment,Reference Row,સંદર્ભ રો
 DocType: Installation Note,Installation Time,સ્થાપન સમયે
 DocType: Sales Invoice,Accounting Details,હિસાબી વિગતો
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,આ કંપની માટે તમામ વ્યવહારો કાઢી નાખો
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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} Qty માટે પૂર્ણ નથી ઓર્ડર # {3}. સમય લોગ મારફતે કામગીરી સ્થિતિ અપડેટ કરો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,રોકાણો
 DocType: Issue,Resolution Details,ઠરાવ વિગતો
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,ચર્ચા
 DocType: Payment Entry,Transaction ID,ટ્રાન્ઝેક્શન આઈડી
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,પ્રાઇસીંગ નિયમો વધુ જથ્થો પર આધારિત ફિલ્ટર કરવામાં આવે છે.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},કર્મચારી માટે જોડાયા તારીખ સેટ કરો {0}
 DocType: Task,Total Billing Amount (via Time Sheet),કુલ બિલિંગ રકમ (સમયનો શીટ મારફતે)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,પુનરાવર્તન ગ્રાહક આવક
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ભૂમિકા &#39;ખર્ચ તાજનો&#39; હોવી જ જોઈએ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,જોડી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ઉત્પાદન માટે BOM અને ક્વાલિટી પસંદ કરો
 DocType: Asset,Depreciation Schedule,અવમૂલ્યન સૂચિ
 DocType: Bank Reconciliation Detail,Against Account,એકાઉન્ટ સામે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,અડધા દિવસ તારીખ તારીખ થી અને તારીખ વચ્ચે પ્રયત્ન કરીશું
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},કંપની એસેટ અવમૂલ્યન કિંમત કેન્દ્ર &#39;સુયોજિત કરો {0}
 ,Maintenance Schedules,જાળવણી શેડ્યુલ
 DocType: Task,Actual End Date (via Time Sheet),વાસ્તવિક ઓવરને તારીખ (સમયનો શીટ મારફતે)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},રકમ {0} {1} સામે {2} {3}
 ,Quotation Trends,અવતરણ પ્રવાહો
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},વસ્તુ ગ્રુપ આઇટમ માટે વસ્તુ માસ્ટર ઉલ્લેખ નથી {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,એકાઉન્ટ ડેબિટ એક પ્રાપ્ત એકાઉન્ટ હોવું જ જોઈએ
 DocType: Shipping Rule Condition,Shipping Amount,શીપીંગ રકમ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,બાકી રકમ
 DocType: Purchase Invoice Item,Conversion Factor,રૂપાંતર ફેક્ટર
 DocType: Purchase Order,Delivered,વિતરિત
 ,Vehicle Expenses,વાહન ખર્ચ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
+DocType: Serial No,Invoice Details,ઇન્વૉઇસ વિગતો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ઉપયોગી જીવન પછી અપેક્ષિત કિંમત કરતાં વધારે અથવા બરાબર હોવું જોઈએ {0}
 DocType: Purchase Receipt,Vehicle Number,વાહન સંખ્યા
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,રિકરિંગ ભરતિયું સ્ટોપ હશે કે જેના પર તારીખ
 DocType: Employee Loan,Loan Amount,લોન રકમ
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,એચઆર સેટિંગ્સ
 DocType: Salary Slip,net pay info,નેટ પગાર માહિતી
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ખર્ચ દાવો મંજૂરી બાકી છે. માત્ર ખર્ચ તાજનો સ્થિતિ અપડેટ કરી શકો છો.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ખર્ચ દાવો મંજૂરી બાકી છે. માત્ર ખર્ચ તાજનો સ્થિતિ અપડેટ કરી શકો છો.
 DocType: Email Digest,New Expenses,ન્યૂ ખર્ચ
 DocType: Purchase Invoice,Additional Discount Amount,વધારાના ડિસ્કાઉન્ટ રકમ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","રો # {0}: Qty, 1 હોવું જ જોઈએ, કારણ કે આઇટમ એક સ્થિર એસેટ છે. બહુવિધ Qty માટે અલગ પંક્તિ ઉપયોગ કરો."
 DocType: Leave Block List Allow,Leave Block List Allow,બ્લોક પરવાનગી સૂચિ છોડો
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,સંક્ષિપ્ત ખાલી અથવા જગ્યા ન હોઈ શકે
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,બિન-ગ્રુપ ગ્રુપ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,રમતો
 DocType: Loan Type,Loan Name,લોન નામ
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,ગ્રાહક સંપાદન અને વફાદારી
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,તમે નકારી વસ્તુઓ સ્ટોક જાળવણી કરવામાં આવે છે જ્યાં વેરહાઉસ
 DocType: Production Order,Skip Material Transfer,જાઓ સામગ્રી ટ્રાન્સફર
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,માટે વિનિમય દર શોધવામાં અસમર્થ {0} પર {1} કી તારીખ માટે {2}. ચલણ વિનિમય રેકોર્ડ મેન્યુઅલી બનાવવા કૃપા કરીને
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,તમારી નાણાકીય વર્ષ પર સમાપ્ત થાય છે
 DocType: POS Profile,Price List,ભાવ યાદી
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} મૂળભૂત ફિસ્કલ વર્ષ હવે છે. ફેરફાર અસર લેવા માટે કે તમારા બ્રાઉઝરને તાજું કરો.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},એકાઉન્ટ {0} અમાન્ય છે. એકાઉન્ટ કરન્સી હોવા જ જોઈએ {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM રૂપાંતર પરિબળ પંક્તિ જરૂરી છે {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકાર વેચાણ ઓર્ડર એક, સેલ્સ ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Salary Component,Deduction,કપાત
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,રો {0}: સમય અને સમય ફરજિયાત છે.
 DocType: Stock Reconciliation Item,Amount Difference,રકમ તફાવત
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},વસ્તુ ભાવ માટે ઉમેરવામાં {0} ભાવ યાદીમાં {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,આ વેચાણ વ્યક્તિ કર્મચારી ID દાખલ કરો
 DocType: Territory,Classification of Customers by region,પ્રદેશ દ્વારા ગ્રાહકો વર્ગીકરણ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,તફાવત રકમ શૂન્ય હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,તફાવત રકમ શૂન્ય હોવી જોઈએ
 DocType: Project,Gross Margin,એકંદર માર્જીન
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,પ્રથમ પ્રોડક્શન વસ્તુ દાખલ કરો
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ગણતરી બેન્ક નિવેદન બેલેન્સ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,અપંગ વપરાશકર્તા
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,અવતરણ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,અવતરણ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,કુલ કપાત
 ,Production Analytics,ઉત્પાદન ઍનલિટિક્સ
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ચેતવણી: જોડાણ પર અમાન્ય SSL પ્રમાણપત્ર {0}
 DocType: Student Admission,Eligibility,લાયકાત
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","તરફ દોરી જાય છે, તમે વ્યવસાય, તમારા પગલે તરીકે તમારા બધા સંપર્કો અને વધુ ઉમેરો વિચાર મદદ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","તરફ દોરી જાય છે, તમે વ્યવસાય, તમારા પગલે તરીકે તમારા બધા સંપર્કો અને વધુ ઉમેરો વિચાર મદદ"
 DocType: Production Order Operation,Actual Operation Time,વાસ્તવિક કામગીરી સમય
 DocType: Authorization Rule,Applicable To (User),લાગુ કરો (વપરાશકર્તા)
 DocType: Purchase Taxes and Charges,Deduct,કપાત
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,કાર્યાલયનું સરનામું
 DocType: Appraisal,Calculate Total Score,કુલ સ્કોર ગણતરી
 DocType: Request for Quotation,Manufacturing Manager,ઉત્પાદન વ્યવસ્થાપક
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},સીરીયલ કોઈ {0} સુધી વોરંટી હેઠળ છે {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,પેકેજોમાં વિભાજિત બોલ પર કોઈ નોંધ.
 apps/erpnext/erpnext/hooks.py +87,Shipments,આવેલા શિપમેન્ટની
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,એકાઉન્ટ બેલેન્સ ({0}) {1} અને શેરના મૂલ્ય પર આધારિત છે ({2}) વેરહાઉસ માટે {3} જ હોવો જોઈએ
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,કુલ છોડો દિવસો
 DocType: Email Digest,Note: Email will not be sent to disabled users,નોંધ: આ ઇમેઇલ નિષ્ક્રિય વપરાશકર્તાઓ માટે મોકલવામાં આવશે નહીં
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ઇન્ટરેક્શન સંખ્યા
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,કંપની પસંદ કરો ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,કંપની પસંદ કરો ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,તમામ વિભાગો માટે ગણવામાં તો ખાલી છોડી દો
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","રોજગાર પ્રકાર (કાયમી, કરાર, ઇન્ટર્ન વગેરે)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} વસ્તુ માટે ફરજિયાત છે {1}
 DocType: Process Payroll,Fortnightly,પાક્ષિક
 DocType: Currency Exchange,From Currency,ચલણ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ઓછામાં ઓછા એક પંક્તિ ફાળવવામાં રકમ, ભરતિયું પ્રકાર અને ભરતિયું નંબર પસંદ કરો"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),દર (કંપની ચલણ)
 DocType: Student Guardian,Others,અન્ય
 DocType: Payment Entry,Unallocated Amount,ફાળવેલ રકમ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,બંધબેસતા વસ્તુ શોધી શકાતો નથી. માટે {0} કેટલીક અન્ય કિંમત પસંદ કરો.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,કોઈ વધુ અપડેટ્સ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,પ્રથમ પંક્તિ માટે &#39;અગાઉના પંક્તિ કુલ પર&#39; &#39;અગાઉના પંક્તિ રકમ પર&#39; તરીકે ચાર્જ પ્રકાર પસંદ કરો અથવા નથી કરી શકો છો
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,બાળ વસ્તુ એક ઉત્પાદન બંડલ ન હોવી જોઈએ. આઇટમ દૂર `{0} &#39;અને સેવ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,બેન્કિંગ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ઉમેરો
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ઉમેરો
 DocType: Vehicle Service,Service Item,સેવા વસ્તુ
 DocType: Bank Guarantee,Bank Guarantee,બેંક ગેરંટી
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,શેડ્યૂલ મેળવવા માટે &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},રો # {0}: એસેટ {1} પહેલેથી જ છે {2}
 DocType: Quotation Item,Stock Balance,સ્ટોક બેલેન્સ
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ચુકવણી માટે વેચાણ ઓર્ડર
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} સેટઅપ&gt; સેટિંગ્સ દ્વારા&gt; નામકરણ સિરીઝ માટે સિરીઝ નામકરણ સેટ કરો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,સીઇઓ
 DocType: Expense Claim Detail,Expense Claim Detail,ખર્ચ દાવાની વિગત
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,યોગ્ય એકાઉન્ટ પસંદ કરો
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,કિંમતો બતાવવામાં આવશે નહીં તો ભાવ સૂચિ સેટ નથી
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,આ શીપીંગ નિયમ માટે એક દેશ ઉલ્લેખ કરો અથવા વિશ્વભરમાં શીપીંગ તપાસો
 DocType: Stock Entry,Total Incoming Value,કુલ ઇનકમિંગ ભાવ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ડેબિટ કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets મદદ તમારી ટીમ દ્વારા કરવામાં activites માટે સમય, ખર્ચ અને બિલિંગ ટ્રેક રાખવા"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ખરીદી ભાવ યાદી
 DocType: Offer Letter Term,Offer Term,ઓફર ગાળાના
 DocType: Quality Inspection,Quality Manager,ગુણવત્તા મેનેજર
 DocType: Job Applicant,Job Opening,જૉબ ઑપનિંગ
 DocType: Payment Reconciliation,Payment Reconciliation,ચુકવણી રિકંસીલેશન
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ઇનચાર્જ વ્યક્તિ નામ પસંદ કરો
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ટેકનોલોજી
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},કુલ અવેતન: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM વેબસાઇટ કામગીરીમાં
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,લોસ્ટ કારણ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,નવું સરનામું
 DocType: Quality Inspection,Sample Size,સેમ્પલ કદ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,બધી વસ્તુઓ પહેલેથી જ તેનું ભરતિયું કરાય છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,રસીદ દસ્તાવેજ દાખલ કરો
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,વધુ ખર્ચ કેન્દ્રો જૂથો હેઠળ કરી શકાય છે પરંતુ પ્રવેશો બિન-જૂથો સામે કરી શકાય છે
 DocType: Project,External,બાહ્ય
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,વપરાશકર્તાઓ અને પરવાનગીઓ
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ઉત્પાદન ઓર્ડર્સ બનાવ્યું: {0}
 DocType: Branch,Branch,શાખા
 DocType: Guardian,Mobile Number,મોબાઇલ નંબર
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,પ્રિન્ટર અને બ્રાંડિંગ
 DocType: Bin,Actual Quantity,ખરેખર જ થો
 DocType: Shipping Rule,example: Next Day Shipping,ઉદાહરણ: આગામી દિવસે શિપિંગ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,મળી નથી સીરીયલ કોઈ {0}
 DocType: Scheduling Tool,Student Batch,વિદ્યાર્થી બેચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,તમારા ગ્રાહકો
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,વિદ્યાર્થી બનાવો
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,વિદ્યાર્થી બનાવો
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},તમે આ પ્રોજેક્ટ પર સહયોગ કરવા માટે આમંત્રિત કરવામાં આવ્યા છે: {0}
 DocType: Leave Block List Date,Block Date,બ્લોક તારીખ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,હવે લાગુ
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,મોકલવામાં
 DocType: Payment Request,Make Sales Invoice,સેલ્સ ભરતિયું બનાવો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,સોફ્ટવેર્સ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,આગામી સંપર્ક તારીખ ભૂતકાળમાં ન હોઈ શકે
 DocType: Company,For Reference Only.,સંદર્ભ માટે માત્ર.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,બેચ પસંદ કોઈ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},અમાન્ય {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,એડવાન્સ રકમ
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,કેસ નંબર 0 ન હોઈ શકે
 DocType: Item,Show a slideshow at the top of the page,પાનાંની ટોચ પર એક સ્લાઇડ શો બતાવવા
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,સ્ટોર્સ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,સ્ટોર્સ
 DocType: Serial No,Delivery Time,ડ લવર સમય
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,પર આધારિત એઇજીંગનો
 DocType: Item,End of Life,જીવનનો અંત
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,સાધન નામ બદલો
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,સુધારો કિંમત
 DocType: Item Reorder,Item Reorder,વસ્તુ પુનઃક્રમાંકિત કરો
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,પગાર બતાવો કાપલી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ટ્રાન્સફર સામગ્રી
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,પગાર બતાવો કાપલી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ટ્રાન્સફર સામગ્રી
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","કામગીરી, સંચાલન ખર્ચ સ્પષ્ટ અને તમારી કામગીરી કરવા માટે કોઈ એક અનન્ય ઓપરેશન આપે છે."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,આ દસ્તાવેજ દ્વારા મર્યાદા વધારે છે {0} {1} આઇટમ માટે {4}. તમે બનાવે છે અન્ય {3} જ સામે {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,બચત પછી રિકરિંગ સુયોજિત કરો
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,પસંદ કરો ફેરફાર રકમ એકાઉન્ટ
 DocType: Purchase Invoice,Price List Currency,ભાવ યાદી કરન્સી
 DocType: Naming Series,User must always select,વપરાશકર્તા હંમેશા પસંદ કરવી જ પડશે
 DocType: Stock Settings,Allow Negative Stock,નકારાત્મક સ્ટોક પરવાનગી આપે છે
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,બજેટ એકાઉન્ટ
 DocType: Quality Inspection,Verified By,દ્વારા ચકાસવામાં
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","હાલની વ્યવહારો છે, કારણ કે કંપની મૂળભૂત ચલણ બદલી શકાતું નથી. વ્યવહારો મૂળભૂત ચલણ બદલવાની રદ હોવું જ જોઈએ."
-DocType: Grade Interval,Grade Description,ગ્રેડ વર્ણન
+DocType: Grading Scale Interval,Grade Description,ગ્રેડ વર્ણન
 DocType: Stock Entry,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,પગાર કાપલી બનાવો
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,તારીખ હાજરી
 DocType: Warranty Claim,Raised By,દ્વારા ઊભા
 DocType: Payment Gateway Account,Payment Account,ચુકવણી એકાઉન્ટ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,આગળ વધવા માટે કંપની સ્પષ્ટ કરો
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,એકાઉન્ટ્સ પ્રાપ્ત નેટ બદલો
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,વળતર બંધ
 DocType: Offer Letter,Accepted,સ્વીકારાયું
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,શું તમે ખરેખર આ કંપની માટે તમામ વ્યવહારો કાઢી નાખવા માંગો છો તેની ખાતરી કરો. તે છે તમારા માસ્ટર ડેટા રહેશે. આ ક્રિયા પૂર્વવત્ કરી શકાતી નથી.
 DocType: Room,Room Number,રૂમ સંખ્યા
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},અમાન્ય સંદર્ભ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) આયોજિત quanitity કરતાં વધારે ન હોઈ શકે છે ({2}) ઉત્પાદન ઓર્ડર {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) આયોજિત quanitity કરતાં વધારે ન હોઈ શકે છે ({2}) ઉત્પાદન ઓર્ડર {3}
 DocType: Shipping Rule,Shipping Rule Label,શીપીંગ નિયમ લેબલ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,વપરાશકર્તા ફોરમ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,કાચો માલ ખાલી ન હોઈ શકે.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","સ્ટોક અપડેટ કરી શકાયું નથી, ભરતિયું ડ્રોપ શીપીંગ વસ્તુ છે."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ઝડપી જર્નલ પ્રવેશ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM કોઈપણ વસ્તુ agianst ઉલ્લેખ તો તમે દર બદલી શકતા નથી
 DocType: Employee,Previous Work Experience,પહેલાંના કામ અનુભવ
 DocType: Stock Entry,For Quantity,જથ્થો માટે
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,નિયમો અને Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,સંસ્થા નામ કે જેના માટે તમે આ સિસ્ટમ સુયોજિત કરી રહ્યા હોય.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","આ તારીખ સુધી સ્થિર હિસાબી પ્રવેશ, કોઈએ / કરવા નીચે સ્પષ્ટ ભૂમિકા સિવાય પ્રવેશ સુધારી શકો છો."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,જાળવણી સૂચિ પેદા પહેલાં દસ્તાવેજ સેવ કરો
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,પ્રોજેક્ટ સ્થિતિ
 DocType: UOM,Check this to disallow fractions. (for Nos),અપૂર્ણાંક નામંજૂર કરવા માટે આ તપાસો. (સંખ્યા માટે)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,નીચેના ઉત્પાદન ઓર્ડર્સ બનાવવામાં આવી હતી:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,રજા પર કામ કરતા કર્મચારીઓ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,માર્ક હાજર
 DocType: Project,% Complete Method,% પૂર્ણ પદ્ધતિ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},જાળવણી શરૂઆત તારીખ સીરીયલ કોઈ ડ લવર તારીખ પહેલાં ન હોઈ શકે {0}
 DocType: Production Order,Actual End Date,વાસ્તવિક ઓવરને તારીખ
 DocType: BOM,Operating Cost (Company Currency),સંચાલન ખર્ચ (કંપની ચલણ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,પગાર વિના છોડો મંજૂર છોડો અરજી રેકોર્ડ સાથે મેળ ખાતું નથી
 DocType: Campaign,Campaign-.####,અભિયાન -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,આગળ કરવાનાં પગલાંઓ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,શ્રેષ્ઠ શક્ય દરે સ્પષ્ટ વસ્તુઓ સપ્લાય કૃપા કરીને
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 દિવસ પછી ઓટો બંધ તકો
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,સમાપ્તિ વર્ષ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / લીડ%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd જથ્થો
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ફી રેકોર્ડ્સ બનાવનાર - {0}
 DocType: Asset Category Account,Asset Category Account,એસેટ વર્ગ એકાઉન્ટ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},સેલ્સ ક્રમ સાથે જથ્થો કરતાં વધુ આઇટમ {0} પેદા કરી શકતા નથી {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,સ્ટોક એન્ટ્રી {0} અપર્ણ ન કરાય
 DocType: Payment Reconciliation,Bank / Cash Account,બેન્ક / રોકડ એકાઉન્ટ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,આગામી સંપર્ક આગેવાની ઇમેઇલ સરનામું તરીકે જ ન હોઈ શકે
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ક્લિયરન્સ તારીખ ઉલ્લેખ નથી
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ઉત્પાદન
 DocType: Guardian,Occupation,વ્યવસાય
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સેટઅપ કર્મચારી માનવ સંસાધન માં નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,રો {0}: પ્રારંભ તારીખ સમાપ્તિ તારીખ પહેલાં જ હોવી જોઈએ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),કુલ (Qty)
 DocType: Sales Invoice,This Document,આ દસ્તાવેજ
 DocType: Installation Note Item,Installed Qty,ઇન્સ્ટોલ Qty
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,સમસ્યાની જાણ કરો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ઉપયોગિતા ખર્ચ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ઉપર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,રો # {0}: જર્નલ પ્રવેશ {1} એકાઉન્ટ નથી {2} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,રો # {0}: જર્નલ પ્રવેશ {1} એકાઉન્ટ નથી {2} અથવા પહેલાથી જ બીજા વાઉચર સામે મેળ ખાતી
 DocType: Buying Settings,Default Buying Price List,ડિફૉલ્ટ ખરીદી ભાવ યાદી
 DocType: Process Payroll,Salary Slip Based on Timesheet,પગાર કાપલી Timesheet પર આધારિત
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ઉપર પસંદ માપદંડ અથવા પગાર સ્લીપ માટે કોઈ કર્મચારી પહેલેથી જ બનાવનાર
 DocType: Notification Control,Sales Order Message,વેચાણ ઓર્ડર સંદેશ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","વગેરે કંપની, કરન્સી, ચાલુ નાણાકીય વર્ષના, જેવા સેટ મૂળભૂત મૂલ્યો"
 DocType: Payment Entry,Payment Type,ચુકવણી પ્રકાર
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,કૃપા કરીને આઇટમ માટે બેચ પસંદ {0}. એક બેચ કે આ જરૂરિયાત પૂર્ણ શોધવામાં અસમર્થ
 DocType: Process Payroll,Select Employees,પસંદગીના કર્મચારીઓને
 DocType: Opportunity,Potential Sales Deal,સંભવિત વેચાણની ડીલ
 DocType: Payment Entry,Cheque/Reference Date,ચેક / સંદર્ભ તારીખ
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},પહેલેથી જ કંપની માટે બનાવવામાં વૈશ્વિક POS પ્રોફાઇલ {0} {1}
 DocType: Purchase Order,Ref SQ,સંદર્ભ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,બધા BOMs વસ્તુ / BOM બદલો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,રસીદ દસ્તાવેજ સબમિટ હોવું જ જોઈએ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,રસીદ દસ્તાવેજ સબમિટ હોવું જ જોઈએ
 DocType: Purchase Invoice Item,Received Qty,પ્રાપ્ત Qty
 DocType: Stock Entry Detail,Serial No / Batch,સીરીયલ કોઈ / બેચ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,નથી ચૂકવણી અને બચાવી શક્યા
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,Dn-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,કોઈ સમય શીટ્સ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} હાથ ધરવા આગળ કરી શકાતી નથી પ્રકાર છોડો
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',જાળવણી સુનિશ્ચિત બધી વસ્તુઓ માટે પેદા નથી. &#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 ,To Produce,પેદા કરવા માટે
 apps/erpnext/erpnext/config/hr.py +93,Payroll,પગારપત્રક
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","પંક્તિ માટે {0} માં {1}. આઇટમ રેટ માં {2} સમાવેશ કરવા માટે, પંક્તિઓ {3} પણ સમાવેશ કરવો જ જોઈએ"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,બનાવો વપરાશકર્તા
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,બનાવો વપરાશકર્તા
 DocType: Packing Slip,Identification of the package for the delivery (for print),વિતરણ માટે પેકેજ ઓળખ (પ્રિન્ટ માટે)
 DocType: Bin,Reserved Quantity,અનામત જથ્થો
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,કૃપા કરીને માન્ય ઇમેઇલ સરનામું દાખલ
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,અપંગ નમૂનો ડિફૉલ્ટ નમૂનો ન હોવું જોઈએ
 DocType: Account,Income Account,આવક એકાઉન્ટ
 DocType: Payment Request,Amount in customer's currency,ગ્રાહકોના ચલણ માં જથ્થો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ડ લવર
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ડ લવર
 DocType: Stock Reconciliation Item,Current Qty,વર્તમાન Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",જુઓ પડતર વિભાગ &quot;સામગ્રી પર આધારિત દર&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,પાછલું
 DocType: Appraisal Goal,Key Responsibility Area,કી જવાબદારી વિસ્તાર
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","વિદ્યાર્થી બૅચેસ તમે હાજરી, આકારણીઓ અને વિદ્યાર્થીઓ માટે ફી ટ્રૅક મદદ"
 DocType: Payment Entry,Total Allocated Amount,કુલ ફાળવેલ રકમ
 DocType: Item Reorder,Material Request Type,સામગ્રી વિનંતી પ્રકાર
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},થી {0} પગાર માટે Accural જર્નલ પ્રવેશ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage સંપૂર્ણ છે, સાચવી નહોતી"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage સંપૂર્ણ છે, સાચવી નહોતી"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,રો {0}: UOM રૂપાંતર ફેક્ટર ફરજિયાત છે
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,સંદર્ભ
 DocType: Budget,Cost Center,ખર્ચ કેન્દ્રને
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,સેલ્સ વહેવારો ગ્રાહકનો ટેક્સ ID છુપાવો
 DocType: Upload Attendance,Upload HTML,અપલોડ કરો HTML
 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.","પ્રાઇસીંગ નિયમ કેટલાક માપદંડ પર આધારિત, / ભાવ યાદી પર ફરીથી લખી ડિસ્કાઉન્ટ ટકાવારી વ્યાખ્યાયિત કરવા માટે કરવામાં આવે છે."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","પ્રાઇસીંગ નિયમ કેટલાક માપદંડ પર આધારિત, / ભાવ યાદી પર ફરીથી લખી ડિસ્કાઉન્ટ ટકાવારી વ્યાખ્યાયિત કરવા માટે કરવામાં આવે છે."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,વેરહાઉસ માત્ર સ્ટોક એન્ટ્રી મારફતે બદલી શકાય છે / ડિલિવરી નોંધ / ખરીદી રસીદ
 DocType: Employee Education,Class / Percentage,વર્ગ / ટકાવારી
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,માર્કેટિંગ અને સેલ્સ હેડ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","પસંદ પ્રાઇસીંગ નિયમ &#39;કિંમત&#39; માટે કરવામાં આવે છે, તો તે ભાવ યાદી પર ફરીથી લખી નાંખશે. પ્રાઇસીંગ નિયમ ભાવ અંતિમ ભાવ છે, તેથી કોઇ વધુ ડિસ્કાઉન્ટ લાગુ પાડવામાં આવવી જોઈએ. તેથી, વગેરે સેલ્સ ઓર્ડર, ખરીદી ઓર્ડર જેવા વ્યવહારો, તે બદલે &#39;ભાવ યાદી દર&#39; ક્ષેત્ર કરતાં &#39;રેટ ભૂલી નથી&#39; ફીલ્ડમાં મેળવ્યાં કરવામાં આવશે."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ટ્રેક ઉદ્યોગ પ્રકાર દ્વારા દોરી જાય છે.
 DocType: Item Supplier,Item Supplier,વસ્તુ પુરવઠોકર્તા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,બેચ કોઈ વિચાર વસ્તુ કોડ દાખલ કરો
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to માટે નીચેની પસંદ કરો {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,બધા સંબોધે છે.
 DocType: Company,Stock Settings,સ્ટોક સેટિંગ્સ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","નીચેના ગુણધર્મો બંને રેકોર્ડ જ છે, તો મર્જ જ શક્ય છે. ગ્રુપ root લખવું, કંપની છે"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',સ્થિતિ સાથે કર્મચારીઓને ઘટના વિશે એક ઇમેઇલ મોકલશે &#39;ઓપન&#39;
 DocType: Task,Depends on Tasks,કાર્યો પર આધાર રાખે છે
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ગ્રાહક જૂથ વૃક્ષ મેનેજ કરો.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,જોડાણો શોપિંગ કાર્ટ સક્ષમ કર્યા વિના જ દર્શાવી શકાય
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ન્યૂ ખર્ચ કેન્દ્રને નામ
 DocType: Leave Control Panel,Leave Control Panel,નિયંત્રણ પેનલ છોડો
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,ડેબિટ
 DocType: Delivery Note,Required only for sample item.,માત્ર નમૂના આઇટમ માટે જરૂરી છે.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,સોદા બાદ વાસ્તવિક Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,પુરવઠોકર્તા&gt; પુરવઠોકર્તા પ્રકાર
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},કોઈ પગાર સ્લિપ વચ્ચે મળી {0} અને {1}
 ,Pending SO Items For Purchase Request,ખરીદી વિનંતી તેથી વસ્તુઓ બાકી
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,વિદ્યાર્થી પ્રવેશ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} અક્ષમ છે
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} અક્ષમ છે
 DocType: Supplier,Billing Currency,બિલિંગ કરન્સી
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,બહુ્ મોટુ
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,મુખપૃષ્ઠ ફીચર્ડ ઉત્પાદન
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,બધા આકારણી જૂથો
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,નવી વેરહાઉસ નામ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),કુલ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),કુલ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,પ્રદેશ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,જરૂરી મુલાકાત કોઈ ઉલ્લેખ કરો
 DocType: Stock Settings,Default Valuation Method,મૂળભૂત મૂલ્યાંકન પદ્ધતિ
 DocType: Vehicle Log,Fuel Qty,ફ્યુઅલ Qty
 DocType: Production Order Operation,Planned Start Time,આયોજિત પ્રારંભ સમય
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,ભાવ યાદી માસ્ટર
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,તમે સુયોજિત અને લક્ષ્યો મોનીટર કરી શકે છે કે જેથી બધા સેલ્સ વ્યવહારો બહુવિધ ** વેચાણ વ્યક્તિઓ ** સામે ટૅગ કરી શકો છો.
 ,S.O. No.,તેથી નંબર
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},લીડ પ્રતિ ગ્રાહક બનાવવા કૃપા કરીને {0}
 DocType: Price List,Applicable for Countries,દેશો માટે લાગુ પડે છે
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,માત્ર છોડો સ્થિતિ સાથે કાર્યક્રમો &#39;માન્ય&#39; અને &#39;નકારી કાઢ્યો સબમિટ કરી શકો છો
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},વિદ્યાર્થી જૂથ નામ પંક્તિ માં ફરજિયાત છે {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,નકલ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},નામ ભૂલ: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,શોર્ટેજ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} સાથે સંકળાયેલ નથી {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} સાથે સંકળાયેલ નથી {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,કર્મચારી {0} માટે હાજરી પહેલેથી ચિહ્નિત થયેલ છે
 DocType: Packing Slip,If more than one package of the same type (for print),જો એક જ પ્રકારના એક કરતાં વધુ પેકેજ (પ્રિન્ટ માટે)
 ,Salary Register,પગાર રજિસ્ટર
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,શોપિંગ કાર્ટ માટે વાપરો
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ભાવ {0} લક્ષણ માટે {1} માન્ય વસ્તુ યાદી અસ્તિત્વમાં નથી વસ્તુ માટે કિંમતો એટ્રીબ્યુટ {2}
 DocType: BOM Item,Scrap %,સ્ક્રેપ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","સમાયોજિત પ્રમાણમાં તમારી પસંદગી મુજબ, વસ્તુ Qty અથવા રકમ પર આધારિત વિતરણ કરવામાં આવશે"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","સમાયોજિત પ્રમાણમાં તમારી પસંદગી મુજબ, વસ્તુ Qty અથવા રકમ પર આધારિત વિતરણ કરવામાં આવશે"
 DocType: Maintenance Visit,Purposes,હેતુઓ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ઓછામાં ઓછા એક વસ્તુ પાછી દસ્તાવેજ નકારાત્મક જથ્થો દાખલ કરવું જોઈએ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ઓપરેશન {0} વર્કસ્ટેશન કોઇપણ ઉપલ્બધ કામના કલાકો કરતાં લાંબા સમય સુધી {1}, બહુવિધ કામગીરી માં ઓપરેશન તોડી"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,પ્રદેશ વૃક્ષ મેનેજ કરો.
 DocType: Journal Entry Account,Sales Invoice,સેલ્સ ભરતિયું
 DocType: Journal Entry Account,Party Balance,પાર્ટી બેલેન્સ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ડિસ્કાઉન્ટ પર લાગુ પડે છે પસંદ કરો
 DocType: Company,Default Receivable Account,મૂળભૂત પ્રાપ્ત એકાઉન્ટ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ઉપર પસંદ માપદંડ માટે ચૂકવણી કુલ પગાર માટે બેન્ક એન્ટ્રી બનાવો
 DocType: Stock Entry,Material Transfer for Manufacture,ઉત્પાદન માટે માલ પરિવહન
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ડિસ્કાઉન્ટ ટકાવારી ભાવ યાદી સામે અથવા બધું ભાવ યાદી માટે ક્યાં લાગુ પાડી શકાય છે.
 DocType: Purchase Invoice,Half-yearly,અર્ધ-વાર્ષિક
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,સ્ટોક માટે એકાઉન્ટિંગ એન્ટ્રી
 DocType: Vehicle Service,Engine Oil,એન્જિન તેલ
 DocType: Sales Invoice,Sales Team1,સેલ્સ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,વસ્તુ {0} અસ્તિત્વમાં નથી
 DocType: Sales Invoice,Customer Address,ગ્રાહક સરનામું
 DocType: Employee Loan,Loan Details,લોન વિગતો
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,રો {0}: પૂર્ણ Qty શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,Root લખવું
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ROW # {0}: કરતાં વધુ પાછા ન કરી શકે {1} વસ્તુ માટે {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,પ્લોટ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},લક્ષ્યાંક વેરહાઉસ પંક્તિ માટે ફરજિયાત છે {0}
 DocType: Cheque Print Template,Primary Settings,પ્રાથમિક સેટિંગ્સ
 DocType: Purchase Invoice,Select Supplier Address,પુરવઠોકર્તા સરનામું પસંદ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,કર્મચારીઓની ઉમેરો
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,કર્મચારીઓની ઉમેરો
 DocType: Purchase Invoice Item,Quality Inspection,ગુણવત્તા નિરીક્ષણ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,વિશેષ નાના
 DocType: Company,Standard Template,સ્ટાન્ડર્ડ ટેમ્પલેટ
 DocType: Training Event,Theory,થિયરી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,ચેતવણી: Qty વિનંતી સામગ્રી ન્યુનત્તમ ઓર્ડર Qty કરતાં ઓછી છે
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,એકાઉન્ટ {0} સ્થિર છે
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,સંસ્થા સાથે જોડાયેલા એકાઉન્ટ્સ એક અલગ ચાર્ટ સાથે કાનૂની એન્ટિટી / સબસિડીયરી.
 DocType: Payment Request,Mute Email,મ્યૂટ કરો ઇમેઇલ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ફૂડ, પીણું અને તમાકુ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},માત્ર સામે ચુકવણી કરી શકો છો unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,કમિશન દર કરતા વધારે 100 ન હોઈ શકે
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,પ્રથમ {0} દાખલ કરો
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,હાલની વ્યવહાર સાથે વખારો જૂથ રૂપાંતરિત કરી શકાય છે.
 DocType: Assessment Result Tool,Result HTML,પરિણામ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ના રોજ સમાપ્ત થાય
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,વિદ્યાર્થીઓ ઉમેરી
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,વિદ્યાર્થીઓ ઉમેરી
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},પસંદ કરો {0}
 DocType: C-Form,C-Form No,સી-ફોર્મ નં
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,એએમટી
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ફિસ્કલ વર્ષ પસંદ કરો
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,પુનઃક્રમાંકિત કરો સ્તર
 DocType: Company,Chart Of Accounts Template,એકાઉન્ટ્સ ઢાંચો ચાર્ટ
 DocType: Attendance,Attendance Date,એટેન્ડન્સ તારીખ
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,નકલી નોંધણી
 DocType: Program Enrollment Tool,Get Students,વિદ્યાર્થીઓ મેળવો
 DocType: Serial No,Under Warranty,વોરંટી હેઠળ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ભૂલ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ભૂલ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,તમે વેચાણ ઓર્ડર સેવ વાર શબ્દો દૃશ્યમાન થશે.
 ,Employee Birthday,કર્મચારીનું જન્મદિવસ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,વિદ્યાર્થી બેચ એટેન્ડન્સ સાધન
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,મર્યાદા ઓળંગી
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,વેન્ચર કેપિટલ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,આ શૈક્ષણિક વર્ષ &#39;સાથે એક શૈક્ષણિક શબ્દ {0} અને&#39; શબ્દ નામ &#39;{1} પહેલેથી હાજર છે. આ પ્રવેશો સુધારવા માટે અને ફરીથી પ્રયાસ કરો.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","વસ્તુ {0} વિરુદ્ધનાં પ્રવર્તમાન વ્યવહારો છે કે, તમે કિંમત બદલી શકતા નથી {1}"
 DocType: UOM,Must be Whole Number,સમગ્ર નંબર હોવો જોઈએ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(દિવસોમાં) સોંપાયેલ નવા પાંદડા
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,સીરીયલ કોઈ {0} અસ્તિત્વમાં નથી
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,સામગ્રી% આ વેચાણ ઓર્ડર સામે બિલ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,પીરિયડ બંધ એન્ટ્રી
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને જૂથ રૂપાંતરિત કરી શકતા નથી
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},રકમ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},રકમ {0} {1} {2} {3}
 DocType: Account,Depreciation,અવમૂલ્યન
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),પુરવઠોકર્તા (ઓ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,કર્મચારીનું એટેન્ડન્સ સાધન
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,આગામી મહિને છેલ્લો દિવસ
 DocType: Support Settings,Auto close Issue after 7 days,7 દિવસ પછી ઓટો બંધ અંક
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","પહેલાં ફાળવવામાં કરી શકાતી નથી મૂકો {0}, રજા બેલેન્સ પહેલેથી કેરી આગળ ભવિષ્યમાં રજા ફાળવણી રેકોર્ડ કરવામાં આવી છે {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),નોંધ: કારણે / સંદર્ભ તારીખ {0} દિવસ દ્વારા મંજૂરી ગ્રાહક ક્રેડિટ દિવસ કરતાં વધી જાય (ઓ)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,વિદ્યાર્થી અરજદાર
 DocType: Asset Category Account,Accumulated Depreciation Account,સંચિત અવમૂલ્યન એકાઉન્ટ
 DocType: Stock Settings,Freeze Stock Entries,ફ્રીઝ સ્ટોક પ્રવેશો
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,સ્ટોક ઍનલિટિક્સ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ઓપરેશન્સ ખાલી છોડી શકાશે નહીં
 DocType: Maintenance Visit Purpose,Against Document Detail No,દસ્તાવેજ વિગતવાર સામે કોઈ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,પાર્ટી પ્રકાર ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,પાર્ટી પ્રકાર ફરજિયાત છે
 DocType: Quality Inspection,Outgoing,આઉટગોઇંગ
 DocType: Material Request,Requested For,વિનંતી
 DocType: Quotation Item,Against Doctype,Doctype સામે
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,વસ્તુ કોડ
 DocType: Production Planning Tool,Create Production Orders,ઉત્પાદન ઓર્ડર્સ બનાવો
 DocType: Serial No,Warranty / AMC Details,વોરંટી / એએમસી વિગતો
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,પ્રવૃત્તિ આધારિત ગ્રુપ માટે જાતે વિદ્યાર્થીઓની પસંદગી
 DocType: Journal Entry,User Remark,વપરાશકર્તા ટીકા
 DocType: Lead,Market Segment,માર્કેટ સેગમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ચૂકવેલ રકમ કુલ નકારાત્મક બાકી રકમ કરતાં વધારે ન હોઈ શકે {0}
 DocType: Employee Internal Work History,Employee Internal Work History,કર્મચારીનું આંતરિક કામ ઇતિહાસ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),બંધ (DR)
 DocType: Cheque Print Template,Cheque Size,ચેક માપ
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,સામગ્રી અરજીઓ બનાવો
 DocType: Employee Education,School/University,શાળા / યુનિવર્સિટી
 DocType: Payment Request,Reference Details,સંદર્ભ વિગતો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ઈચ્છિત કિંમત ઉપયોગી જીવન પછી ગ્રોસ ખરીદી જથ્થો કરતાં ઓછી હોવી જોઈએ
 DocType: Sales Invoice Item,Available Qty at Warehouse,વેરહાઉસ ખાતે ઉપલબ્ધ Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ગણાવી રકમ
 DocType: Asset,Double Declining Balance,ડબલ કથળતું જતું બેલેન્સ
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","આ સ્ટોક રિકંસીલેશન એક ખુલી પ્રવેશ છે, કારણ કે તફાવત એકાઉન્ટ, એક એસેટ / જવાબદારી પ્રકાર એકાઉન્ટ હોવું જ જોઈએ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},વિતરિત રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},વસ્તુ માટે જરૂરી ઓર્ડર નંબર ખરીદી {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ઉત્પાદન ઓર્ડર બનાવવામાં આવી ન
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;તારીખ પ્રતિ&#39; પછી &#39;તારીખ&#39; હોવા જ જોઈએ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},વિદ્યાર્થી તરીકે સ્થિતિ બદલી શકાતું નથી {0} વિદ્યાર્થી અરજી સાથે કડી થયેલ છે {1}
 DocType: Asset,Fully Depreciated,સંપૂર્ણપણે અવમૂલ્યન
 ,Stock Projected Qty,સ્ટોક Qty અંદાજિત
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},સંબંધ નથી {0} ગ્રાહક પ્રોજેક્ટ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,નોંધપાત્ર હાજરી HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",સુવાકયો દરખાસ્તો બિડ તમે તમારા ગ્રાહકો માટે મોકલી છે
 DocType: Sales Order,Customer's Purchase Order,ગ્રાહક ખરીદી ઓર્ડર
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,સીરીયલ કોઈ અને બેચ
 DocType: Warranty Claim,From Company,કંપનીથી
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,આકારણી માપદંડ સ્કોર્સ ની રકમ {0} હોઈ જરૂર છે.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ભાવ અથવા Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations સંખ્યા નક્કી સુયોજિત કરો
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ભાવ અથવા Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,પ્રોડક્શન્સ ઓર્ડર્સ માટે ઊભા ન કરી શકો છો:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,મિનિટ
 DocType: Purchase Invoice,Purchase Taxes and Charges,કર અને ખર્ચ ખરીદી
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,બધા વખારો
 DocType: Sales Partner,Retailer,છૂટક વિક્રેતા
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,એકાઉન્ટ ક્રેડિટ બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,બધા પુરવઠોકર્તા પ્રકાર
 DocType: Global Defaults,Disable In Words,શબ્દો માં અક્ષમ
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,વસ્તુ આપોઆપ નંબર નથી કારણ કે વસ્તુ કોડ ફરજિયાત છે
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},અવતરણ {0} નથી પ્રકાર {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,પ્રો-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,બેન્ક ઓવરડ્રાફટ એકાઉન્ટ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,પગાર કાપલી બનાવો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,રો # {0}: ફાળવેલ રકમ બાકી રકમ કરતાં વધારે ન હોઈ શકે.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,બ્રાઉઝ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,સુરક્ષીત લોન્સ
 DocType: Purchase Invoice,Edit Posting Date and Time,પોસ્ટ તારીખ અને સમયને સંપાદિત
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ન કરતાં જૂની સ્ટોક વ્યવહારો સુધારવા માટે મંજૂરી {0}
 DocType: Purchase Invoice Item,PR Detail,PR વિગતવાર
 DocType: Sales Order,Fully Billed,સંપૂર્ણપણે ગણાવી
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},કર્મચારી મૂળભૂત ચૂકવવાપાત્ર એકાઉન્ટ સુયોજિત કરો {0}
 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 +127,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),પેકેજ ગ્રોસ વજન. સામાન્ય રીતે નેટ વજન + પેકેજિંગ સામગ્રી વજન. (પ્રિન્ટ માટે)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,જૂથ પર આધારિત
 DocType: Journal Entry,Bill Date,બિલ તારીખ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","સેવા વસ્તુ, પ્રકાર, આવર્તન અને ખર્ચ રકમ જરૂરી છે"
-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:","સૌથી વધુ પ્રાધાન્ય સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, પણ જો, તો પછી નીચેના આંતરિક પ્રાથમિકતાઓ લાગુ પડે છે:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","સૌથી વધુ પ્રાધાન્ય સાથે બહુવિધ પ્રાઇસીંગ નિયમો હોય છે, પણ જો, તો પછી નીચેના આંતરિક પ્રાથમિકતાઓ લાગુ પડે છે:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},તમે ખરેખર {0} તમામ પગાર સ્લિપ રજુ કરવા માંગો છો {1}
 DocType: Cheque Print Template,Cheque Height,ચેક ઊંચાઈ
 DocType: Supplier,Supplier Details,પુરવઠોકર્તા વિગતો
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,ભરતિયું સંદર્ભ
 DocType: Purchase Order,Recurring Order,રીકરીંગ ઓર્ડર
 DocType: Company,Default Income Account,ડિફૉલ્ટ આવક એકાઉન્ટ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ગ્રાહક જૂથ / ગ્રાહક
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ગ્રાહક જૂથ / ગ્રાહક
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),બંધ ન થયેલી ફિસ્કલ યર નફો / નુકશાન (ક્રેડિટ)
 DocType: Sales Invoice,Time Sheets,સમય શીટ્સ
 DocType: Payment Gateway Account,Default Payment Request Message,મૂળભૂત ચુકવણી વિનંતી સંદેશ
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,અવતરણ સંદેશ
 DocType: Employee Loan,Employee Loan Application,કર્મચારીનું લોન અરજી
 DocType: Issue,Opening Date,શરૂઆતના તારીખ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,એટેન્ડન્સ સફળતાપૂર્વક ચિહ્નિત કરવામાં આવી છે.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,એટેન્ડન્સ સફળતાપૂર્વક ચિહ્નિત કરવામાં આવી છે.
 DocType: Journal Entry,Remark,ટીકા
 DocType: Purchase Receipt Item,Rate and Amount,દર અને રકમ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},એકાઉન્ટ પ્રકાર {0} હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},એકાઉન્ટ પ્રકાર {0} હોવા જ જોઈએ {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,પાંદડા અને હોલિડે
 DocType: School Settings,Current Academic Term,વર્તમાન શૈક્ષણિક ટર્મ
 DocType: Sales Order,Not Billed,રજુ કરવામાં આવ્યું ન
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,વિદ્યાર્થી જૂથ
 DocType: Shopping Cart Settings,Quotation Series,અવતરણ સિરીઝ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","એક વસ્તુ જ નામ સાથે હાજર ({0}), આઇટમ જૂથ નામ બદલવા અથવા વસ્તુ નામ બદલી કૃપા કરીને"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,કૃપા કરીને ગ્રાહક પસંદ
 DocType: C-Form,I,હું
 DocType: Company,Asset Depreciation Cost Center,એસેટ અવમૂલ્યન કિંમત કેન્દ્ર
 DocType: Sales Order Item,Sales Order Date,સેલ્સ ઓર્ડર તારીખ
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,વીમા વિગતો
 DocType: Account,Payable,ચૂકવવાપાત્ર
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ચુકવણી કાળ દાખલ કરો
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ડેટર્સ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ડેટર્સ ({0})
 DocType: Pricing Rule,Margin,માર્જિન
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,નવા ગ્રાહકો
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,કુલ નફો %
 DocType: Appraisal Goal,Weightage (%),ભારાંકન (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ક્લિયરન્સ તારીખ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,કુલ ખરીદી જથ્થો ફરજિયાત છે
 DocType: Lead,Address Desc,DESC સરનામું
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,પાર્ટી ફરજિયાત છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,પાર્ટી ફરજિયાત છે
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,વિષય નામ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,વેચાણ અથવા ખરીદી ઓછામાં ઓછા એક પસંદ કરેલ હોવું જ જોઈએ
-DocType: Grading Structure,Grade Intervals,ગ્રેડ અંતરાલો
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,તમારા વેપાર સ્વભાવ પસંદ કરો.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},રો # {0}: ડુપ્લિકેટ સંદર્ભો એન્ટ્રી {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ઉત્પાદન કામગીરી જ્યાં ધરવામાં આવે છે.
 DocType: Asset Movement,Source Warehouse,સોર્સ વેરહાઉસ
 DocType: Installation Note,Installation Date,સ્થાપન તારીખ
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,પ્રિન્ટ નમૂનાઓ માટે પત્ર ચેતવણી.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,પ્રિન્ટ ટેમ્પલેટો માટે શિર્ષકો કાચું ભરતિયું દા.ત..
 DocType: Student Guardian,Student Guardian,વિદ્યાર્થી ગાર્ડિયન
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,મૂલ્યાંકન પ્રકાર ખર્ચ વ્યાપક તરીકે ચિહ્નિત નથી કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 દર
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,એક્સચેન્જ મેળવી / નુકશાન એકાઉન્ટ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,કર્મચારીનું અને હાજરી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},હેતુ એક જ હોવી જોઈએ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,આ ફોર્મ ભરો અને તેને સંગ્રહો
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,સમુદાય ફોરમ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,સ્ટોક વાસ્તવિક Qty
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,પુનઃક્રમાંકિત કરો Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,વર્તમાન જોબ શરૂઆતનો
 DocType: Company,Stock Adjustment Account,સ્ટોક એડજસ્ટમેન્ટ એકાઉન્ટ
-DocType: Journal Entry,Write Off,માંડવાળ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,માંડવાળ
 DocType: Timesheet Detail,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}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,પુરવઠોકર્તા ગ્રાહક માટે પહોંચાડે છે
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ફોર્મ / વસ્તુ / {0}) સ્ટોક બહાર છે
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,આગામી તારીખ પોસ્ટ તારીખ કરતાં મોટી હોવી જ જોઈએ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,બતાવો કર બ્રેક અપ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,બતાવો કર બ્રેક અપ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},કારણે / સંદર્ભ તારીખ પછી ન હોઈ શકે {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,માહિતી આયાત અને નિકાસ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","સ્ટોક પ્રવેશો, {0} વેરહાઉસ સામે અસ્તિત્વમાં તેથી તમે ફરીથી સોંપવા અથવા સંશોધિત કરી શકો છો"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,કોઈ વિદ્યાર્થીઓ મળ્યો
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ભરતિયું પોસ્ટ તારીખ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,વેચાણ
 DocType: Sales Invoice,Rounded Total,ગોળાકાર કુલ
 DocType: Product Bundle,List items that form the package.,પેકેજ રચે છે કે યાદી વસ્તુઓ.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ટકાવારી ફાળવણી 100% સમાન હોવું જોઈએ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,કૃપા કરીને પાર્ટી પસંદ કર્યા પહેલાં પોસ્ટ તારીખ સિલેક્ટ કરો
 DocType: Program Enrollment,School House,શાળા હાઉસ
 DocType: Serial No,Out of AMC,એએમસીના આઉટ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,સુવાકયો પસંદ કરો
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,જાળવણી મુલાકાત કરી
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,સુવાકયો પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,નક્કી Depreciations સંખ્યા કુલ Depreciations સંખ્યા કરતાં વધારે ન હોઈ શકે
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,જાળવણી મુલાકાત કરી
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,સેલ્સ માસ્ટર વ્યવસ્થાપક {0} ભૂમિકા છે જે વપરાશકર્તા માટે સંપર્ક કરો
 DocType: Company,Default Cash Account,ડિફૉલ્ટ કેશ એકાઉન્ટ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,કંપની (નથી ગ્રાહક અથવા સપ્લાયર) માસ્ટર.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,આ વિદ્યાર્થી હાજરી પર આધારિત છે
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,કોઈ વિદ્યાર્થી
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,વધુ વસ્તુઓ અથવા ઓપન સંપૂર્ણ ફોર્મ ઉમેરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;અપેક્ષા બોલ તારીખ&#39; દાખલ કરો
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ડ લવર નોંધો {0} આ વેચાણ ઓર્ડર રદ પહેલાં રદ થયેલ હોવું જ જોઈએ
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,આઇટમ 3
 DocType: Purchase Order,Customer Contact Email,ગ્રાહક સંપર્ક ઇમેઇલ
 DocType: Warranty Claim,Item and Warranty Details,વસ્તુ અને વોરંટી વિગતો
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,આઇટમ code&gt; આઇટમ ગ્રુપ&gt; બ્રાન્ડ
 DocType: Sales Team,Contribution (%),યોગદાન (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,નોંધ: ચુકવણી એન્ટ્રી થી બનાવી શકાય નહીં &#39;કેશ અથવા બેન્ક એકાઉન્ટ&#39; સ્પષ્ટ કરેલ ન હતી
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,કાર્યક્રમ ફરજિયાત કોર્સ આનયન પસંદ કરો.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,સમાધાન પહેલાં
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},માટે {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),કર અને ખર્ચ ઉમેરાયેલ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,વસ્તુ ટેક્સ રો {0} પ્રકાર વેરો કે આવક અથવા ખર્ચ અથવા લેવાપાત્ર કારણે હોવી જ જોઈએ
 DocType: Sales Order,Partly Billed,આંશિક ગણાવી
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,વસ્તુ {0} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,વસ્તુ {0} એક નિશ્ચિત એસેટ વસ્તુ જ હોવી જોઈએ
 DocType: Item,Default BOM,મૂળભૂત BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ફરીથી લખો કંપની નામ ખાતરી કરવા માટે કરો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,કુલ બાકી એએમટી
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ઓટોમોટિવ
 DocType: Vehicle,Insurance Company,વીમા કંપની
 DocType: Asset Category Account,Fixed Asset Account,સ્થિર એસેટ એકાઉન્ટ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,વેરિયેબલ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ડ લવર નોંધ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,વેરિયેબલ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ડ લવર નોંધ
 DocType: Student,Student Email Address,વિદ્યાર્થી ઇમેઇલ સરનામું
 DocType: Timesheet Detail,From Time,સમય
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ઉપલબ્ધ છે:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ભાવ યાદી એક્સચેન્જ રેટ
 DocType: Purchase Invoice Item,Rate,દર
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ઇન્ટર્ન
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,એડ્રેસ નામ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,એડ્રેસ નામ
 DocType: Stock Entry,From BOM,BOM થી
 DocType: Assessment Code,Assessment Code,આકારણી કોડ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,મૂળભૂત
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} સ્થિર થાય તે પહેલા સ્ટોક વ્યવહારો
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;બનાવો સૂચિ&#39; પર ક્લિક કરો
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","દા.ત. કિલો, એકમ, અમે, એમ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,તમે સંદર્ભ તારીખ દાખલ જો સંદર્ભ કોઈ ફરજિયાત છે
 DocType: Bank Reconciliation Detail,Payment Document,ચુકવણી દસ્તાવેજ
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,પગાર માળખું
 DocType: Account,Bank,બેન્ક
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,એરલાઇન
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ઇશ્યૂ સામગ્રી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ઇશ્યૂ સામગ્રી
 DocType: Material Request Item,For Warehouse,વેરહાઉસ માટે
 DocType: Employee,Offer Date,ઓફર તારીખ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,સુવાકયો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,તમે ઑફલાઇન મોડ છે. તમે જ્યાં સુધી તમે નેટવર્ક ફરીથી લોડ કરવા માટે સમર્થ હશે નહિં.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,કોઈ વિદ્યાર્થી જૂથો બનાવી છે.
 DocType: Purchase Invoice Item,Serial No,સીરીયલ કોઈ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,માસિક ચુકવણી રકમ લોન રકમ કરતાં વધારે ન હોઈ શકે
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,પ્રથમ Maintaince વિગતો દાખલ કરો
 DocType: Purchase Invoice,Print Language,પ્રિંટ ભાષા
 DocType: Salary Slip,Total Working Hours,કુલ કામ કલાક
 DocType: Stock Entry,Including items for sub assemblies,પેટા વિધાનસભાઓ માટે વસ્તુઓ સહિત
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,દાખલ કિંમત હકારાત્મક હોવો જ જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,બધા પ્રદેશો
 DocType: Purchase Invoice,Items,વસ્તુઓ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,વિદ્યાર્થી પહેલેથી પ્રવેશ છે.
@@ -3254,16 +3263,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',વેરિએન્ટ માટે માપવા એકમ મૂળભૂત &#39;{0}&#39; નમૂનો તરીકે જ હોવી જોઈએ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,પર આધારિત ગણતરી
 DocType: Delivery Note Item,From Warehouse,વેરહાઉસ માંથી
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,માલ બિલ સાથે કોઈ વસ્તુઓ ઉત્પાદન
 DocType: Assessment Plan,Supervisor Name,સુપરવાઇઝર નામ
 DocType: Program Enrollment Course,Program Enrollment Course,કાર્યક્રમ નોંધણી કોર્સ
-DocType: Grading Structure,Grading Structure,ગ્રેડીંગ માળખું
 DocType: Purchase Taxes and Charges,Valuation and Total,મૂલ્યાંકન અને કુલ
 DocType: Tax Rule,Shipping City,શીપીંગ સિટી
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,સૂચન કસ્ટમાઇઝ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,કામગીરી માંથી રોકડ પ્રવાહ
 DocType: Sales Invoice,Shipping Rule,શીપીંગ નિયમ
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},મૂળભૂત BOM વસ્તુ માટે અસ્તિત્વમાં {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,પ્રથમ પોસ્ટ તારીખ પસંદ કરો
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,તારીખ ઓપનિંગ તારીખ બંધ કરતા પહેલા પ્રયત્ન કરીશું
 DocType: Leave Control Panel,Carry Forward,આગળ લઈ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,હાલની વ્યવહારો સાથે ખર્ચ કેન્દ્રને ખાતાવહી રૂપાંતરિત કરી શકતા નથી
 DocType: Department,Days for which Holidays are blocked for this department.,દિવસો કે જેના માટે રજાઓ આ વિભાગ માટે બ્લોક કરી દેવામાં આવે છે.
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,જનરલ
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,લેટરહેડ જોડો
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,છેલ્લે કોમ્યુનિકેશન
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',શ્રેણી &#39;મૂલ્યાંકન&#39; અથવા &#39;મૂલ્યાંકન અને કુલ&#39; માટે છે જ્યારે કપાત કરી શકો છો
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ઇન્વૉઇસેસ સાથે મેળ ચુકવણીઓ
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),કુલ (એએમટી)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,મનોરંજન &amp; ફુરસદની પ્રવૃત્તિઓ
 DocType: Quality Inspection,Item Serial No,વસ્તુ સીરીયલ કોઈ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,કર્મચારીનું રેકોર્ડ બનાવવા
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,કર્મચારીનું રેકોર્ડ બનાવવા
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,કુલ પ્રેઝન્ટ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,હિસાબી નિવેદનો
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,કલાક
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,અજ્ઞાત
 DocType: Shipping Rule,Shipping Rule Conditions,શીપીંગ નિયમ શરતો
 DocType: BOM Replace Tool,The new BOM after replacement,રિપ્લેસમેન્ટ પછી નવા BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,વેચાણ પોઇન્ટ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,વેચાણ પોઇન્ટ
 DocType: Payment Entry,Received Amount,મળેલી રકમ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,કૃપા કરીને સેટઅપ કર્મચારી માનવ સંસાધન માં નામકરણ સિસ્ટમ&gt; એચઆર સેટિંગ્સ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","સંપૂર્ણ જથ્થો માટે બનાવવા માટે, ઓર્ડર પર પહેલેથી જ જથ્થો અવગણીને"
 DocType: Account,Tax,ટેક્સ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,માર્ક ન
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,ઇનવૉઇસેસ
 DocType: Batch,Source Document Name,સોર્સ દસ્તાવેજનું નામ
 DocType: Job Opening,Job Title,જોબ શીર્ષક
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,બનાવવા વપરાશકર્તાઓ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,બનાવવા વપરાશકર્તાઓ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ગ્રામ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ઉત્પાદન જથ્થો 0 કરતાં મોટી હોવી જ જોઈએ.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,જાળવણી કોલ માટે અહેવાલ મુલાકાત લો.
 DocType: Stock Entry,Update Rate and Availability,સુધારા દર અને ઉપલબ્ધતા
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ટકાવારી તમે પ્રાપ્ત અથવા આદેશ આપ્યો જથ્થો સામે વધુ પહોંચાડવા માટે માન્ય છે. ઉદાહરણ તરીકે: તમે 100 એકમો આદેશ આપ્યો હોય તો. અને તમારા ભથ્થું પછી તમે 110 એકમો મેળવવા માટે માન્ય છે 10% છે.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ખર્ચ હિસાબ આઇટમ માટે ફરજિયાત છે {0}
 DocType: BOM,Website Description,વેબસાઇટ વર્ણન
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ઈક્વિટી કુલ ફેરફાર
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ખરીદી ભરતિયું {0} રદ કૃપા કરીને પ્રથમ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ઇમેઇલ સરનામું અનન્ય હોવો જોઈએ, પહેલેથી જ અસ્તિત્વમાં છે {0}"
 DocType: Serial No,AMC Expiry Date,એએમસી સમાપ્તિ તારીખ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,રસીદ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,રસીદ
 ,Sales Register,સેલ્સ રજિસ્ટર
 DocType: Daily Work Summary Settings Company,Send Emails At,ઇમેઇલ્સ મોકલો ખાતે
 DocType: Quotation,Quotation Lost Reason,અવતરણ લોસ્ટ કારણ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,તમારા ડોમેન પસંદ કરો
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ટ્રાન્ઝેક્શન સંદર્ભ કોઈ {0} ના રોજ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ફેરફાર કરવા માટે કંઈ નથી.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,આ મહિને અને બાકી પ્રવૃત્તિઓ માટે સારાંશ
 DocType: Customer Group,Customer Group Name,ગ્રાહક જૂથ નામ
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,હજુ સુધી કોઈ ગ્રાહકો!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,કેશ ફ્લો સ્ટેટમેન્ટ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},લોન રકમ મહત્તમ લોન રકમ કરતાં વધી શકે છે {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,લાઈસન્સ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},સી-ફોર્મ આ બિલ {0} દૂર કરો {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,એકાઉન્ટ માંડવાળ દાખલ કરો
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,છેલ્લે ઓર્ડર તારીખ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},એકાઉન્ટ {0} કરે કંપની માટે અનુસરે છે નથી {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} પંક્તિમાં ક્રમાંકોમાં સાથે ડિલીવરી નોંધ મેચ થતો નથી
 DocType: Student,Guardian Details,ગાર્ડિયન વિગતો
 DocType: C-Form,C-Form,સી-ફોર્મ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,બહુવિધ કર્મચારીઓ માટે માર્ક એટેન્ડન્સ
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',રો {0} # એકાઉન્ટ પ્રકાર હોવા જ જોઈએ &#39;સ્થિર એસેટ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty આઉટ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,નિયમો વેચાણ માટે શીપીંગ જથ્થો ગણતરી માટે
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,સિરીઝ ફરજિયાત છે
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,સિરીઝ ફરજિયાત છે
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ફાઈનાન્સિયલ સર્વિસીસ
 DocType: Student Sibling,Student ID,વિદ્યાર્થી ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,સમય લોગ માટે પ્રવૃત્તિઓ પ્રકાર
 DocType: Tax Rule,Sales,સેલ્સ
 DocType: Stock Entry Detail,Basic Amount,મૂળભૂત રકમ
 DocType: Training Event,Exam,પરીક્ષા
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},વેરહાઉસ સ્ટોક વસ્તુ માટે જરૂરી {0}
 DocType: Leave Allocation,Unused leaves,નહિં વપરાયેલ પાંદડા
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,લાખોમાં
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,લાખોમાં
 DocType: Tax Rule,Billing State,બિલિંગ રાજ્ય
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ટ્રાન્સફર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} પક્ષ એકાઉન્ટ સાથે સંકળાયેલ નથી {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} પક્ષ એકાઉન્ટ સાથે સંકળાયેલ નથી {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(પેટા-સ્થળોના સહિત) ફેલાય છે BOM મેળવો
 DocType: Authorization Rule,Applicable To (Employee),લાગુ કરો (કર્મચારી)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,કારણે તારીખ ફરજિયાત છે
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,લક્ષણ માટે વૃદ્ધિ {0} 0 ન હોઈ શકે
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,નિષ્ક્રિય ગ્રાહકો
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ખરીદી રસીદો
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,કેવી રીતે પ્રાઇસીંગ નિયમ લાગુ પડે છે?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,કેવી રીતે પ્રાઇસીંગ નિયમ લાગુ પડે છે?
 DocType: Stock Entry,Delivery Note No,ડ લવર નોંધ કોઈ
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","જો ચકાસાયેલ છે, માત્ર ખરીદી અંતિમ કાચા માટે સામગ્રી અરજીઓ સામગ્રી અરજીઓ સમાવવામાં આવશે. નહિંતર, પિતૃ આઇટમ્સ માટે સામગ્રી અરજીઓ બનાવવામાં આવશે"
 DocType: Cheque Print Template,Message to show,સંદેશ બતાવવા માટે
 DocType: Company,Retail,છૂટક
 DocType: Attendance,Absent,ગેરહાજર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,ઉત્પાદન બંડલ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,ઉત્પાદન બંડલ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},રો {0}: અમાન્ય સંદર્ભ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,કર અને ખર્ચ ઢાંચો ખરીદી
 DocType: Upload Attendance,Download Template,ડાઉનલોડ નમૂનો
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,એકાઉન્ટ ચૂકવણી
 DocType: Purchase Order Item Supplied,Raw Material Item Code,કાચો સામગ્રી વસ્તુ કોડ
 DocType: Journal Entry,Write Off Based On,પર આધારિત માંડવાળ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,લીડ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,લીડ બનાવો
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,પ્રિન્ટ અને સ્ટેશનરી
 DocType: Stock Settings,Show Barcode Field,બતાવો બારકોડ ક્ષેત્ર
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,પુરવઠોકર્તા ઇમેઇલ્સ મોકલો
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","પગાર પહેલેથી જ વચ્ચે {0} અને {1}, એપ્લિકેશન સમયગાળા છોડો આ તારીખ શ્રેણી વચ્ચે ન હોઈ શકે સમયગાળા માટે પ્રક્રિયા."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,સીરીયલ નંબર માટે સ્થાપન રેકોર્ડ
 DocType: Guardian Interest,Guardian Interest,ગાર્ડિયન વ્યાજ
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,પ્રતિભાવ પ્રતીક્ષામાં
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ઉપર
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},અમાન્ય લક્ષણ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ઉલ્લેખ જો નોન-સ્ટાન્ડર્ડ ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Salary Slip,Earning & Deduction,અર્નિંગ અને કપાત
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,વૈકલ્પિક. આ ગોઠવણી વિવિધ વ્યવહારો ફિલ્ટર કરવા માટે ઉપયોગ કરવામાં આવશે.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,નકારાત્મક મૂલ્યાંકન દર મંજૂરી નથી
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,ઉત્પાદન ઓર્ડર વસ્તુ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,મળ્યું નથી રેકોર્ડ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,રદ એસેટ કિંમત
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,આંશિક ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ખર્ચ કેન્દ્રને વસ્તુ માટે ફરજિયાત છે {2}
 DocType: Vehicle,Policy No,નીતિ કોઈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ઉત્પાદન બંડલ થી વસ્તુઓ વિચાર
 DocType: Asset,Straight Line,સીધી રેખા
 DocType: Project User,Project User,પ્રોજેક્ટ વપરાશકર્તા
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,સ્પ્લિટ
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,વિદ્યાર્થીઓ મેળવો
 DocType: Hub Settings,Seller Country,વિક્રેતા દેશ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,વેબસાઇટ પર આઇટમ્સ પ્રકાશિત
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,બૅચેસ માં ગ્રુપ તમારા વિદ્યાર્થીઓ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,બૅચેસ માં ગ્રુપ તમારા વિદ્યાર્થીઓ
 DocType: Authorization Rule,Authorization Rule,અધિકૃતિ નિયમ
 DocType: Sales Invoice,Terms and Conditions Details,નિયમો અને શરતો વિગતો
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,તરફથી
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ચેક તારીખ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},એકાઉન્ટ {0}: પિતૃ એકાઉન્ટ {1} કંપની ને અનુલક્ષતું નથી: {2}
 DocType: Program Enrollment Tool,Student Applicants,વિદ્યાર્થી અરજદારો
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,સફળતાપૂર્વક આ કંપની સંબંધિત તમામ વ્યવહારો કાઢી!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,તારીખના રોજ
 DocType: Appraisal,HR,એચઆર
 DocType: Program Enrollment,Enrollment Date,નોંધણી તારીખ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,પ્રોબેશન
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,પગાર ઘટકો
 DocType: Program Enrollment Tool,New Academic Year,નવા શૈક્ષણિક વર્ષ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,રીટર્ન / ક્રેડિટ નોટ
 DocType: Stock Settings,Auto insert Price List rate if missing,ઓટો સામેલ ભાવ યાદી દર ગુમ તો
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,કુલ ભરપાઈ રકમ
 DocType: Production Order Item,Transferred Qty,પરિવહન Qty
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","કેઝ્યુઅલ જેવા પાંદડા પ્રકાર, માંદા વગેરે"
 DocType: Email Digest,Send regular summary reports via Email.,ઈમેઈલ મારફતે નિયમિત સારાંશ અહેવાલ મોકલો.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},ખર્ચ દાવો પ્રકાર મૂળભૂત એકાઉન્ટ સુયોજિત કરો {0}
 DocType: Assessment Result,Student Name,વિદ્યાર્થી નામ
 DocType: Brand,Item Manager,વસ્તુ વ્યવસ્થાપક
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,પગારપત્રક ચૂકવવાપાત્ર
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,વેચાણ નાળચું
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,સંક્ષેપનો ફરજિયાત છે
 DocType: Project,Task Progress,ટાસ્ક પ્રગતિ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,કાર્ટ
 ,Qty to Transfer,પરિવહન માટે Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,દોરી જાય છે અથવા ગ્રાહકો માટે ખર્ચ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ભૂમિકા સ્થિર સ્ટોક ફેરફાર કરવા માટે પરવાનગી
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,વસ્તુ વાઈસ ટેક્સ વિગતવાર
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,સંસ્થા સંક્ષેપનો
 ,Item-wise Price List Rate,વસ્તુ મુજબના ભાવ યાદી દર
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,પુરવઠોકર્તા અવતરણ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,પુરવઠોકર્તા અવતરણ
 DocType: Quotation,In Words will be visible once you save the Quotation.,તમે આ અવતરણ સેવ વાર શબ્દો દૃશ્યમાન થશે.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},જથ્થા ({0}) પંક્તિમાં અપૂર્ણાંક ન હોઈ શકે {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ફી એકઠી
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},બારકોડ {0} પહેલાથી જ વસ્તુ ઉપયોગ {1}
 DocType: Lead,Add to calendar on this date,આ તારીખ પર કૅલેન્ડર ઉમેરો
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,શિપિંગ ખર્ચ ઉમેરવા માટે નિયમો.
 DocType: Item,Opening Stock,ખુલવાનો સ્ટોક
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",મિનિટ &#39;સમય લોગ&#39; મારફતે સુધારાશે
 DocType: Customer,From Lead,લીડ પ્રતિ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ઓર્ડર્સ ઉત્પાદન માટે પ્રકાશિત થાય છે.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ફિસ્કલ વર્ષ પસંદ કરો ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS પ્રોફાઇલ POS એન્ટ્રી બનાવવા માટે જરૂરી
 DocType: Program Enrollment Tool,Enroll Students,વિદ્યાર્થી નોંધણી
 DocType: Hub Settings,Name Token,નામ ટોકન
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ધોરણ વેચાણ
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} સેલ્સ ભરતિયું સામે {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,પ્રોજેક્ટ નામ
-DocType: Supplier,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
+DocType: Customer,Mention if non-standard receivable account,ઉલ્લેખ બિન પ્રમાણભૂત મળવાપાત્ર એકાઉન્ટ તો
 DocType: Journal Entry Account,If Income or Expense,આવક અથવા ખર્ચ તો
 DocType: Production Order,Required Items,જરૂરી વસ્તુઓ
 DocType: Stock Ledger Entry,Stock Value Difference,સ્ટોક વેલ્યુ તફાવત
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,સેટ લક્ષ્યો વસ્તુ ગ્રુપ મુજબની આ વેચાણ વ્યક્તિ માટે.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ફ્રીઝ સ્ટોક્સ કરતાં જૂની [ટ્રેડીંગ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,રો # {0}: એસેટ સ્થિર એસેટ ખરીદી / વેચાણ માટે ફરજિયાત છે
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","બે અથવા વધુ કિંમતના નિયમોમાં ઉપર શરતો પર આધારિત જોવા મળે છે, પ્રાધાન્યતા લાગુ પડે છે. મૂળભૂત કિંમત શૂન્ય (ખાલી) છે, જ્યારે પ્રાધાન્યતા 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.,નીચેના ઉપયોગકર્તાઓને બ્લૉક દિવસો માટે છોડી દો કાર્યક્રમો મંજૂર કરવા માટે પરવાનગી આપે છે.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ત્યારથી તે અવગણવામાં વસ્તુ {0} સ્ટોક વસ્તુ નથી
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ચોક્કસ વ્યવહાર માં પ્રાઇસીંગ નિયમ લાગુ નથી, બધા લાગુ કિંમતના નિયમોમાં નિષ્ક્રિય થવી જોઈએ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ચોક્કસ વ્યવહાર માં પ્રાઇસીંગ નિયમ લાગુ નથી, બધા લાગુ કિંમતના નિયમોમાં નિષ્ક્રિય થવી જોઈએ."
 DocType: Assessment Group,Parent Assessment Group,પિતૃ આકારણી ગ્રુપ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,નોકરીઓ
 ,Sales Order Trends,વેચાણ ઓર્ડર પ્રવાહો
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,વધારાના ખર્ચ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,નાણાકીય વર્ષ સમાપ્તિ તારીખ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","વાઉચર કોઈ પર આધારિત ફિલ્ટર કરી શકો છો, વાઉચર દ્વારા જૂથ તો"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,પુરવઠોકર્તા અવતરણ બનાવો
 DocType: Quality Inspection,Incoming,ઇનકમિંગ
 DocType: BOM,Materials Required (Exploded),મટિરીયલ્સ (વિસ્ફોટ) જરૂરી
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","જાતે કરતાં અન્ય, તમારી સંસ્થા માટે વપરાશકર્તાઓ ઉમેરો"
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,કંપની ઇતિહાસ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ન્યૂઝલેટર્સ
 DocType: Stock Ledger Entry,Stock Ledger Entry,સ્ટોક ખાતાવહી એન્ટ્રી
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ગ્રાહક&gt; ગ્રાહક જૂથ&gt; ટેરિટરી
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,એક જ આઇટમ્સનો અનેકવાર દાખલ કરવામાં આવી
 DocType: Department,Leave Block List,બ્લોક યાદી છોડો
 DocType: Sales Invoice,Tax ID,કરવેરા ID ને
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,વેચાણ ભાગીદાર અને કમિશન
 DocType: Employee Loan,Rate of Interest (%) / Year,વ્યાજ (%) / વર્ષ દર
 ,Project Quantity,પ્રોજેક્ટ જથ્થો
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","કુલ {0} બધી વસ્તુઓ માટે શૂન્ય છે, તો તમે &#39;પર આધારિત ચાર્જિસ વિતરિત&#39; બદલવા જોઈએ કરી શકે"
 DocType: Opportunity,To Discuss,ચર્ચા કરવા માટે
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} એકમો {1} {2} આ વ્યવહાર પૂર્ણ કરવા માટે જરૂર છે.
 DocType: Loan Type,Rate of Interest (%) Yearly,વ્યાજ દર (%) વાર્ષિક
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,રીટર્ન
 DocType: Production Order Operation,Production Order Operation,ઉત્પાદન ઓર્ડર ઓપરેશન
 DocType: Pricing Rule,Disable,અક્ષમ કરો
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ચુકવણી સ્થિતિ ચૂકવણી કરવા માટે જરૂરી છે
 DocType: Project Task,Pending Review,બાકી સમીક્ષા
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","એસેટ {0}, રદ કરી શકાતી નથી કારણ કે તે પહેલેથી જ છે {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(ખર્ચ દાવો મારફતે) કુલ ખર્ચ દાવો
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,માર્ક ગેરહાજર
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},રો {0}: બોમ # ચલણ {1} પસંદ ચલણ સમાન હોવું જોઈએ {2}
 DocType: Journal Entry Account,Exchange Rate,વિનિમય દર
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,વેચાણ ઓર્ડર {0} અપર્ણ ન કરાય
 DocType: Homepage,Tag Line,ટેગ લાઇન
 DocType: Fee Component,Fee Component,ફી પુન
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ફ્લીટ મેનેજમેન્ટ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,વસ્તુઓ ઉમેરો
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,વસ્તુઓ ઉમેરો
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},વેરહાઉસ {0}: પિતૃ એકાઉન્ટ {1} કંપની bolong નથી {2}
 DocType: Cheque Print Template,Regular,નિયમિત
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,બધા આકારણી માપદંડ કુલ ભારાંકન 100% હોવા જ જોઈએ
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,પસંદ કરેલ વસ્તુ બેચ હોઈ શકે નહિં
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","મૂલ્યાંકન દર વસ્તુ {0}, જેના માટે એકાઉન્ટિંગ પ્રવેશો કરવા માટે જરૂરી છે માટે નથી મળી {1} {2}. આઇટમ એક નમૂના વસ્તુ તરીકે ટ્રાન્ઝેક્શન્સ છે, તો {1}, કે {1} વસ્તુ ટેબલ ઉલ્લેખ કરો. નહિંતર, આઇટમ રેકોર્ડ વસ્તુ અથવા ઉલ્લેખ મૂલ્યાંકન દર માટે ઇનકમિંગ સ્ટોક ટ્રાન્ઝેક્શન બનાવો, અને પછી / submiting પ્રયાસ આ પ્રવેશ રદ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,સામગ્રી% આ બોલ પર કોઈ નોંધ સામે વિતરિત
 DocType: Project,Customer Details,ગ્રાહક વિગતો
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,રીસીવર અમે માટે URL પરિમાણ દાખલ
 DocType: Payment Entry,Paid Amount,ચૂકવેલ રકમ
 DocType: Assessment Plan,Supervisor,સુપરવાઇઝર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ઓનલાઇન
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ઓનલાઇન
 ,Available Stock for Packing Items,પેકિંગ આઇટમ્સ માટે ઉપલબ્ધ સ્ટોક
 DocType: Item Variant,Item Variant,વસ્તુ વેરિએન્ટ
 DocType: Assessment Result Tool,Assessment Result Tool,આકારણી પરિણામ સાધન
 DocType: BOM Scrap Item,BOM Scrap Item,BOM સ્ક્રેપ વસ્તુ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,સબમિટ ઓર્ડર કાઢી શકાતી નથી
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,ક્વોલિટી મેનેજમેન્ટ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,વસ્તુ {0} અક્ષમ કરવામાં આવ્યું છે
 DocType: Employee Loan,Repay Fixed Amount per Period,ચુકવણી સમય દીઠ નિશ્ચિત રકમ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},વસ્તુ માટે જથ્થો દાખલ કરો {0}
 DocType: Employee External Work History,Employee External Work History,કર્મચારીનું બાહ્ય કામ ઇતિહાસ
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,વિદ્યાર્થી ઇમેઇલ ને
 DocType: Employee,Notice (days),સૂચના (દિવસ)
 DocType: Tax Rule,Sales Tax Template,સેલ્સ ટેક્સ ઢાંચો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ભરતિયું સેવ આઇટમ્સ પસંદ કરો
 DocType: Employee,Encashment Date,એન્કેશમેન્ટ તારીખ
 DocType: Training Event,Internet,ઈન્ટરનેટ
 DocType: Account,Stock Adjustment,સ્ટોક એડજસ્ટમેન્ટ
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,એટ્રીબ્યુટ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,શ્રેણી / માંથી સ્પષ્ટ કરો
 DocType: Serial No,Under AMC,એએમસી હેઠળ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,વસ્તુ મૂલ્યાંકન દર ઉતર્યા ખર્ચ વાઉચર જથ્થો વિચારણા recalculated છે
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,વસ્તુ મૂલ્યાંકન દર ઉતર્યા ખર્ચ વાઉચર જથ્થો વિચારણા recalculated છે
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,વ્યવહારો વેચાણ માટે મૂળભૂત સુયોજનો.
 DocType: Guardian,Guardian Of ,ધ ગાર્ડિયન
 DocType: Grading Scale Interval,Threshold,થ્રેશોલ્ડ
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ડેબિટ નોટ જારી
 DocType: Production Order,Warehouses,વખારો
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} એસેટ ટ્રાન્સફર કરી શકતા નથી
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,આ આઇટમની {0} (ટેમ્પલેટ) ના એક પ્રકાર છે.
 DocType: Workstation,per hour,કલાક દીઠ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ખરીદી
 DocType: Announcement,Announcement,જાહેરાત
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,પ્રાપ્ત
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ROW # {0}: ખરીદી ઓર્ડર પહેલેથી જ અસ્તિત્વમાં છે સપ્લાયર બદલવાની મંજૂરી નથી
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,સેટ ક્રેડિટ મર્યાદા કરતાં વધી કે વ્યવહારો સબમિટ કરવા માટે માન્ય છે તે ભૂમિકા.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ઉત્પાદન વસ્તુઓ પસંદ કરો
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","મુખ્ય માહિતી સમન્વય, તે થોડો સમય લાગી શકે છે"
 DocType: Item,Material Issue,મહત્વનો મુદ્દો
 DocType: Hub Settings,Seller Description,વિક્રેતા વર્ણન
 DocType: Employee Education,Qualification,લાયકાત
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,આદેશ આપ્યો
 DocType: Salary Detail,Component,પુન
 DocType: Assessment Criteria,Assessment Criteria Group,આકારણી માપદંડ ગ્રુપ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ખુલવાનો સંચિત અવમૂલ્યન બરાબર કરતાં ઓછી હોવી જોઈએ {0}
 DocType: Warehouse,Warehouse Name,વેરહાઉસ નામ
 DocType: Naming Series,Select Transaction,પસંદ ટ્રાન્ઝેક્શન
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ભૂમિકા એપ્રૂવિંગ અથવા વપરાશકર્તા એપ્રૂવિંગ દાખલ કરો
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,સબમિટ સ્ટોક એન્ટ્રી {0} અસ્તિત્વમાં છે કારણ કે રદ કરી શકાતી નથી
 DocType: Employee Loan,Disbursement Date,વહેંચણી તારીખ
 DocType: Vehicle,Vehicle,વાહન
 DocType: Purchase Invoice,In Words,શબ્દો માં
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,એસ.ટી. / લીડ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,એસેટ Depreciations અને બેલેન્સ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},રકમ {0} {1} માંથી તબદીલ {2} માટે {3}
 DocType: Sales Invoice,Get Advances Received,એડવાન્સિસ પ્રાપ્ત કરો
 DocType: Email Digest,Add/Remove Recipients,મેળવનારા ઉમેરો / દૂર કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ટ્રાન્ઝેક્શન બંધ કરી દીધું ઉત્પાદન સામે મંજૂરી નથી ક્રમમાં {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",મૂળભૂત તરીકે ચાલુ નાણાકીય વર્ષના સુયોજિત કરવા માટે &#39;મૂળભૂત તરીકે સેટ કરો&#39; પર ક્લિક કરો
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,જોડાઓ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,અછત Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,વસ્તુ ચલ {0} જ લક્ષણો સાથે હાજર
 DocType: Employee Loan,Repay from Salary,પગારની ચુકવણી
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},સામે ચુકવણી વિનંતી {0} {1} રકમ માટે {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,આકારણી પરિણામ વિગતવાર
 DocType: Employee Education,Employee Education,કર્મચારીનું શિક્ષણ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,નકલી વસ્તુ જૂથ આઇટમ જૂથ ટેબલ મળી
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,તે વસ્તુ વિગતો મેળવવા માટે જરૂરી છે.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} પહેલાથી જ પ્રાપ્ત કરવામાં આવ્યો છે
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","વેરહાઉસ {0} કોઈપણ એકાઉન્ટ સાથે સંકળાયેલ નથી, કૃપા કરીને / વેરહાઉસ માટે અનુરૂપ (અસ્ક્યામત) એકાઉન્ટ લિંક બનાવો."
 DocType: Purchase Invoice,Recurring Id,રીકરીંગ આઈડી
 DocType: Customer,Sales Team Details,સેલ્સ ટીમ વિગતો
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,કાયમી કાઢી નાખો?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,કાયમી કાઢી નાખો?
 DocType: Expense Claim,Total Claimed Amount,કુલ દાવો રકમ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,વેચાણ માટે સંભવિત તકો.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},અમાન્ય {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,સેટઅપ ERPNext તમારા શાળા
 DocType: Sales Invoice,Base Change Amount (Company Currency),આધાર બદલી રકમ (કંપની ચલણ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,નીચેના વખારો માટે કોઈ હિસાબ પ્રવેશો
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,છેલ્લે ઓર્ડર રકમ
+DocType: Task,Is Milestone,સિમાચિહ્ન છે
 DocType: Daily Work Summary,Email Sent To,ઇમેઇલ મોકલવામાં
 DocType: Budget,Warn,ચેતવો
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","કોઈપણ અન્ય ટીકા, રેકોર્ડ જવા જોઈએ કે નોંધપાત્ર પ્રયાસ."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,લક્ષણની કિંમત
 ,Itemwise Recommended Reorder Level,મુદ્દાવાર પુનઃક્રમાંકિત કરો સ્તર ભલામણ
 DocType: Salary Detail,Salary Detail,પગાર વિગતવાર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,પ્રથમ {0} પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,પ્રથમ {0} પસંદ કરો
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,વસ્તુ બેચ {0} {1} સમયસીમા સમાપ્ત થઈ ગઈ છે.
 DocType: Sales Invoice,Commission,કમિશન
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ઉત્પાદન માટે સમય શીટ.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ફ્રીઝ સ્ટોક્સ જૂની Than`% d દિવસ કરતાં ઓછું હોવું જોઈએ.
 DocType: Tax Rule,Purchase Tax Template,ટેક્સ ઢાંચો ખરીદી
 ,Project wise Stock Tracking,પ્રોજેક્ટ મુજબની સ્ટોક ટ્રેકિંગ
-apps/erpnext/erpnext/maintenance/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 +12,Employee records.,કર્મચારીનું રેકોર્ડ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,સુયોજિત કરો આગળ અવમૂલ્યન તારીખ
 DocType: HR Settings,Payroll Settings,પગારપત્રક સેટિંગ્સ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,બિન-કડી ઇનવૉઇસેસ અને ચૂકવણી મેળ ખાય છે.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ઓર્ડર કરો
 DocType: Email Digest,New Purchase Orders,નવી ખરીદી ઓર્ડર
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,રુટ પિતૃ ખર્ચ કેન્દ્રને હોઈ શકે નહિં
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,બ્રાન્ડ પસંદ કરો ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,બ્રાન્ડ પસંદ કરો ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,તરીકે અવમૂલ્યન સંચિત
 DocType: Sales Invoice,C-Form Applicable,સી-ફોર્મ લાગુ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ઓપરેશન સમય ઓપરેશન કરતાં વધારે 0 હોવા જ જોઈએ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,વેરહાઉસ ફરજિયાત છે
 DocType: Supplier,Address and Contacts,એડ્રેસ અને સંપર્કો
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM રૂપાંતર વિગતવાર
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100 પીએક્સ દ્વારા તે (ડબલ્યુ) વેબ મૈત્રી 900px રાખો (h)
 DocType: Program,Program Abbreviation,કાર્યક્રમ સંક્ષેપનો
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ઉત્પાદન ઓર્ડર એક વસ્તુ ઢાંચો સામે ઊભા કરી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,સમાયોજિત દરેક વસ્તુ સામે ખરીદી રસીદ અપડેટ કરવામાં આવે છે
 DocType: Warranty Claim,Resolved By,દ્વારા ઉકેલાઈ
 DocType: Bank Guarantee,Start Date,પ્રારંભ તારીખ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,સમયગાળા માટે પાંદડા ફાળવો.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques અને થાપણો ખોટી રીતે સાફ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,એકાઉન્ટ {0}: તમે પિતૃ એકાઉન્ટ તરીકે પોતાને સોંપી શકો છો
 DocType: Purchase Invoice Item,Price List Rate,ભાવ યાદી દર
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ગ્રાહક અવતરણ બનાવો
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ગ્રાહક અવતરણ બનાવો
 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 +38,Bill of Materials (BOM),સામગ્રી બિલ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,સપ્લાયર દ્વારા લેવામાં સરેરાશ સમય પહોંચાડવા માટે
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,આકારણી પરિણામ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,કલાક
 DocType: Project,Expected Start Date,અપેક્ષિત પ્રારંભ તારીખ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ખર્ચ કે આઇટમ પર લાગુ નથી તો આઇટમ દૂર
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ટ્રાન્ઝેક્શન ચલણ પેમેન્ટ ગેટવે ચલણ તરીકે જ હોવી જોઈએ
 DocType: Payment Entry,Receive,પ્રાપ્ત
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,ઓપરેટિંગ ખર્ચ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ક્રિયા જો સંચિત માસિક બજેટ વટાવી
 DocType: Purchase Invoice,Submit on creation,સબમિટ બનાવટ પર
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},કરન્સી {0} હોવા જ જોઈએ {1}
 DocType: Asset,Disposal Date,નિકાલ તારીખ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ઇમેઇલ્સ આપવામાં કલાક કંપની બધી સક્રિય કર્મચારીઓની મોકલવામાં આવશે, જો તેઓ રજા નથી. પ્રતિસાદ સારાંશ મધ્યરાત્રિએ મોકલવામાં આવશે."
 DocType: Employee Leave Approver,Employee Leave Approver,કર્મચારી રજા તાજનો
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},રો {0}: એક પુનઃક્રમાંકિત કરો પ્રવેશ પહેલેથી જ આ વેરહાઉસ માટે અસ્તિત્વમાં {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","અવતરણ કરવામાં આવી છે, કારણ કે લોસ્ટ જાહેર કરી શકતા નથી."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,તાલીમ પ્રતિસાદ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ઓર્ડર {0} સબમિટ હોવું જ જોઈએ ઉત્પાદન
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},વસ્તુ માટે શરૂઆત તારીખ અને સમાપ્તિ તારીખ પસંદ કરો {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},કોર્સ પંક્તિ માં ફરજિયાત છે {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,તારીખ કરવા માટે તારીખથી પહેલાં ન હોઈ શકે
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ સંપાદિત કરો ભાવમાં ઉમેરો
 DocType: Batch,Parent Batch,પિતૃ બેચ
 DocType: Cheque Print Template,Cheque Print Template,ચેક પ્રિન્ટ ઢાંચો
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,કિંમત કેન્દ્રો ચાર્ટ
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,આદેશ આપ્યો વસ્તુઓ પહોંચાડી શકાય
 DocType: Account,Income,આવક
 DocType: Industry Type,Industry Type,ઉદ્યોગ પ્રકાર
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,કંઈક ખોટું થયું!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,કંઈક ખોટું થયું!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,ચેતવણી: છોડો અરજીને પગલે બ્લોક તારીખો સમાવે
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,ભરતિયું {0} પહેલાથી જ સબમિટ કરવામાં આવી છે સેલ્સ
 DocType: Assessment Result Detail,Score,કુલ સ્કોર
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,વેરિએન્ટ પર આધારિત
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% પ્રયત્ન કરીશું સોંપાયેલ કુલ વેઇટેજ. તે {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,તમારા સપ્લાયર્સ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,વેચાણ ઓર્ડર કરવામાં આવે છે ગુમાવી સેટ કરી શકાતો નથી.
 DocType: Request for Quotation Item,Supplier Part No,પુરવઠોકર્તા ભાગ કોઈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,પ્રતિ પ્રાપ્ત
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',કપાત કરી શકો છો જ્યારે શ્રેણી &#39;વેલ્યુએશન&#39; અથવા &#39;Vaulation અને કુલ&#39; માટે છે
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,પ્રતિ પ્રાપ્ત
 DocType: Lead,Converted,રૂપાંતરિત
 DocType: Item,Has Serial No,સીરીયલ કોઈ છે
 DocType: Employee,Date of Issue,ઇશ્યૂ તારીખ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: પ્રતિ {0} માટે {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ROW # {0}: આઇટમ માટે સેટ પુરવઠોકર્તા {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,રો {0}: કલાક કિંમત શૂન્ય કરતાં મોટી હોવી જ જોઈએ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,વસ્તુ {1} સાથે જોડાયેલ વેબસાઇટ છબી {0} શોધી શકાતી નથી
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,આ વેબસાઇટ પર બહુવિધ જૂથો આ આઇટમ યાદી.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,તમે ફ્રોઝન કિંમત સુયોજિત કરવા માટે અધિકૃત નથી
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled પ્રવેશો મળી
 DocType: Payment Reconciliation,From Invoice Date,ભરતિયું તારીખથી
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,બિલિંગ ચલણ ક્યાંતો મૂળભૂત comapany ચલણ અથવા પક્ષ એકાઉન્ટ ચલણ માટે સમાન હોવો જોઈએ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,એન્કેશમેન્ટ છોડો
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,તે શું કરે છે?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,વેરહાઉસ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,બધા વિદ્યાર્થી પ્રવેશ
 ,Average Commission Rate,સરેરાશ કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,નોન-સ્ટોક વસ્તુ માટે સીરીયલ નંબર 'હા' કરી શકશો નહિ.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,એટેન્ડન્સ ભવિષ્યમાં તારીખો માટે ચિહ્નિત કરી શકાતી નથી
 DocType: Pricing Rule,Pricing Rule Help,પ્રાઇસીંગ નિયમ મદદ
 DocType: School House,House Name,હાઉસ નામ
 DocType: Purchase Taxes and Charges,Account Head,એકાઉન્ટ હેડ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,વસ્તુઓ ઉતરાણ ખર્ચ ગણતરી માટે વધારાના ખર્ચ અપડેટ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ઇલેક્ટ્રિકલ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,તમારી સંસ્થા બાકીના તમારા વપરાશકર્તાઓ તરીકે ઉમેરો. તમે પણ તેમને સંપર્કો માંથી ઉમેરીને તમારી પોર્ટલ ગ્રાહકો આમંત્રિત ઉમેરી શકો છો
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,તમારી સંસ્થા બાકીના તમારા વપરાશકર્તાઓ તરીકે ઉમેરો. તમે પણ તેમને સંપર્કો માંથી ઉમેરીને તમારી પોર્ટલ ગ્રાહકો આમંત્રિત ઉમેરી શકો છો
 DocType: Stock Entry,Total Value Difference (Out - In),કુલ મૂલ્ય તફાવત (બહાર - માં)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,ગ્રાહક કોડ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},માટે જન્મદિવસ રીમાઇન્ડર {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,છેલ્લે ઓર્ડર સુધીનાં દિવસો
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,એકાઉન્ટ ડેબિટ એક બેલેન્સ શીટ એકાઉન્ટ હોવું જ જોઈએ
 DocType: Buying Settings,Naming Series,નામકરણ સિરીઝ
 DocType: Leave Block List,Leave Block List Name,બ્લોક યાદી મૂકો નામ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,વીમા પ્રારંભ તારીખ કરતાં વીમા અંતિમ તારીખ ઓછી હોવી જોઈએ
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},કર્મચારી પગાર કાપલી {0} પહેલાથી જ સમય શીટ માટે બનાવવામાં {1}
 DocType: Vehicle Log,Odometer,ઑડોમીટર
 DocType: Sales Order Item,Ordered Qty,આદેશ આપ્યો Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,વસ્તુ {0} અક્ષમ છે
 DocType: Stock Settings,Stock Frozen Upto,સ્ટોક ફ્રોઝન સુધી
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM કોઈપણ સ્ટોક વસ્તુ સમાવી નથી
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},પ્રતિ અને સમય રિકરિંગ માટે ફરજિયાત તારીખો પીરિયડ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,પ્રોજેક્ટ પ્રવૃત્તિ / કાર્ય.
 DocType: Vehicle Log,Refuelling Details,Refuelling વિગતો
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,છેલ્લા ખરીદી દર મળી નથી
 DocType: Purchase Invoice,Write Off Amount (Company Currency),રકમ માંડવાળ (કંપની ચલણ)
 DocType: Sales Invoice Timesheet,Billing Hours,બિલિંગ કલાક
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,માટે {0} મળી નથી ડિફૉલ્ટ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ROW # {0}: પુનઃક્રમાંકિત કરો જથ્થો સુયોજિત કરો
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,તેમને અહીં ઉમેરવા માટે વસ્તુઓ ટેપ
 DocType: Fees,Program Enrollment,કાર્યક્રમ પ્રવેશ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ઉતારેલ માલની કિંમત વાઉચર
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},સેટ કરો {0}
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,જાળવણી તારીખ
 DocType: Purchase Invoice Item,Rejected Serial No,નકારેલું સીરીયલ કોઈ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,વર્ષ શરૂ તારીખ અથવા અંતિમ તારીખ {0} સાથે ઓવરલેપિંગ છે. ટાળવા માટે કંપની સુયોજિત કરો
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},વસ્તુ માટે અંતિમ તારીખ કરતાં ઓછી હોવી જોઈએ તારીખ શરૂ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,અપલોડ કરો એટેન્ડન્સ
@@ -4261,7 +4273,6 @@
 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,બહુવિધ જૂથો માં આઇટમ ક્રોસ લિસ્ટિંગ
-DocType: Grade Interval,Grade Interval,ગ્રેડ અંતરાલ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ફિસ્કલ વર્ષ શરૂઆત તારીખ અને ફિસ્કલ વર્ષ અંતે તારીખ પહેલેથી નાણાકીય વર્ષમાં સુયોજિત છે {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ક્લિયરન્સ તારીખ સુધારાશે
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,સ્પ્લિટ બેચ
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,ઉત્પાદન માટે Qty અનામત
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"અનચેક છોડી દો, તો તમે બેચ ધ્યાનમાં જ્યારે અભ્યાસક્રમ આધારિત જૂથો બનાવવા નથી માંગતા."
 DocType: Asset,Frequency of Depreciation (Months),અવમૂલ્યન આવર્તન (મહિના)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ક્રેડિટ એકાઉન્ટ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ક્રેડિટ એકાઉન્ટ
 DocType: Landed Cost Item,Landed Cost Item,ઉતારેલ માલની કિંમત વસ્તુ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,શૂન્ય કિંમતો બતાવો
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,આઇટમ જથ્થો કાચા માલના આપવામાં જથ્થામાં થી repacking / ઉત્પાદન પછી પ્રાપ્ત
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,સેટઅપ મારા સંસ્થા માટે એક સરળ વેબસાઇટ
 DocType: Payment Reconciliation,Receivable / Payable Account,પ્રાપ્ત / ચૂકવવાપાત્ર એકાઉન્ટ
 DocType: Delivery Note Item,Against Sales Order Item,વેચાણ ઓર્ડર વસ્તુ સામે
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},લક્ષણ માટે લક્ષણની કિંમત સ્પષ્ટ કરો {0}
 DocType: Item,Default Warehouse,મૂળભૂત વેરહાઉસ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},બજેટ ગ્રુપ એકાઉન્ટ સામે અસાઇન કરી શકાતી નથી {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,પિતૃ ખર્ચ કેન્દ્રને દાખલ કરો
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,મૂળ દર
 DocType: GL Entry,Credit Amount,ક્રેડિટ રકમ
 DocType: Cheque Print Template,Signatory Position,સહી પોઝિશન
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,લોસ્ટ તરીકે સેટ કરો
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,લોસ્ટ તરીકે સેટ કરો
 DocType: Timesheet,Total Billable Hours,કુલ બિલયોગ્ય કલાકો
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ચુકવણી રસીદ નોંધ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,આ ગ્રાહક સામે વ્યવહારો પર આધારિત છે. વિગતો માટે નીચે જુઓ ટાઇમલાઇન
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,વસ્તુઓ વિનંતી કરવામાં
 DocType: Purchase Order,Get Last Purchase Rate,છેલ્લા ખરીદી દર વિચાર
 DocType: Company,Company Info,કંપની માહિતી
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,પસંદ કરો અથવા નવા ગ્રાહક ઉમેરો
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,ખર્ચ કેન્દ્રને ખર્ચ દાવો બુક કરવા માટે જરૂરી છે
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ફંડ (અસ્ક્યામત) અરજી
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,આ કર્મચારીનું હાજરી પર આધારિત છે
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ઉધાર ખાતું
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ઉધાર ખાતું
 DocType: Fiscal Year,Year Start Date,વર્ષે શરૂ તારીખ
 DocType: Attendance,Employee Name,કર્મચારીનું નામ
 DocType: Sales Invoice,Rounded Total (Company Currency),ગોળાકાર કુલ (કંપની ચલણ)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,પછીના દિવસોમાં રજા કાર્યક્રમો બનાવવા વપરાશકર્તાઓ રોકો.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ખરીદી જથ્થો
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,પુરવઠોકર્તા અવતરણ {0} બનાવવામાં
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,અંતે વર્ષ શરૂ વર્ષ પહેલાં ન હોઈ શકે
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,એમ્પ્લોયી બેનિફિટ્સ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},મૂળભૂત કર્મચારી માટે રજા યાદી સુયોજિત કરો {0} અથવા કંપની {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} નથી અસ્તિત્વમાં
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ગ્રાહકો માટે ઊભા બીલો.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,પ્રોજેક્ટ ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},રો કોઈ {0}: રકમ ખર્ચ દાવો {1} સામે રકમ બાકી કરતાં વધારે ન હોઈ શકે. બાકી રકમ છે {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 વાંચન
 ,Hub,હબ
 DocType: GL Entry,Voucher Type,વાઉચર પ્રકાર
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,ભાવ યાદી મળી અથવા અક્ષમ નથી
 DocType: Employee Loan Application,Approved,મંજૂર
 DocType: Pricing Rule,Price,ભાવ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} સુયોજિત થયેલ હોવું જ જોઈએ પર રાહત કર્મચારી &#39;ડાબી&#39; તરીકે
 DocType: Guardian,Guardian,ગાર્ડિયન
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,મૂલ્યાંકન {0} {1} આપેલ તારીખ શ્રેણી માં કર્મચારી માટે બનાવવામાં
 DocType: Employee,Education,શિક્ષણ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ડેલ
 DocType: Selling Settings,Campaign Naming By,દ્વારા ઝુંબેશ નામકરણ
 DocType: Employee,Current Address Is,વર્તમાન સરનામું
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,સંશોધિત
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","વૈકલ્પિક. સ્પષ્ટ થયેલ નહિં હોય, તો કંપની મૂળભૂત ચલણ સુયોજિત કરે છે."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,હિસાબી જર્નલ પ્રવેશો.
 DocType: Delivery Note Item,Available Qty at From Warehouse,વેરહાઉસ માંથી ઉપલબ્ધ Qty
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},રો {0}: પાર્ટી / એકાઉન્ટ સાથે મેળ ખાતું નથી {1} / {2} માં {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ખર્ચ એકાઉન્ટ દાખલ કરો
 DocType: Account,Stock,સ્ટોક
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","રો # {0}: સંદર્ભ દસ્તાવેજ પ્રકારની ખરીદી ઓર્ડર એક, ખરીદી ભરતિયું અથવા જર્નલ પ્રવેશ હોવું જ જોઈએ"
 DocType: Employee,Current Address,અત્યારનું સરનામુ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","સ્પષ્ટ સિવાય વસ્તુ પછી વર્ણન, છબી, ભાવો, કર નમૂનો સુયોજિત કરવામાં આવશે, વગેરે અન્ય વસ્તુ જ એક પ્રકાર છે, તો"
 DocType: Serial No,Purchase / Manufacture Details,ખરીદી / ઉત્પાદન વિગતો
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,હબ સેટિંગ્સ
 DocType: Project,Gross Margin %,એકંદર માર્જીન%
 DocType: BOM,With Operations,કામગીરી સાથે
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,હિસાબી પ્રવેશો પહેલાથી જ ચલણ માં કરવામાં આવેલ છે {0} કંપની માટે {1}. ચલણ સાથે મળવાપાત્ર અથવા ચૂકવવાપાત્ર એકાઉન્ટ પસંદ કરો {0}.
 DocType: Asset,Is Existing Asset,હાલની એસેટ છે
 DocType: Salary Detail,Statistical Component,સ્ટેટિસ્ટિકલ કમ્પોનન્ટ
 ,Monthly Salary Register,માસિક પગાર રજિસ્ટર
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,રૂમ
 DocType: Purchase Order,Advance Paid,આગોતરી ચુકવણી
 DocType: Item,Item Tax,વસ્તુ ટેક્સ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,સપ્લાયર સામગ્રી
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,સપ્લાયર સામગ્રી
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,એક્સાઇઝ ભરતિયું
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,થ્રેશોલ્ડ {0}% કરતાં વધુ એક વખત દેખાય છે
 DocType: Expense Claim,Employees Email Id,કર્મચારીઓ ઇમેઇલ આઈડી
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,લોગો જોડો
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,સ્ટોક સ્તર
 DocType: Customer,Commission Rate,કમિશન દર
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,વેરિએન્ટ બનાવો
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,વેરિએન્ટ બનાવો
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,વિભાગ દ્વારા બ્લોક છોડી કાર્યક્રમો.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","ચુકવણી પ્રકાર, પ્રાપ્ત એક હોવું જોઈએ પે અને આંતરિક ટ્રાન્સફર"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ઍનલિટિક્સ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,કાર્ટ ખાલી છે
 DocType: Vehicle,Model,મોડલ
@@ -4510,6 +4523,7 @@
 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 +161,Capital Stock,કેપિટલ સ્ટોક
+DocType: Shopping Cart Settings,Show Public Attachments,જાહેર જોડાણો બતાવો
 DocType: Packing Slip,Package Weight Details,પેકેજ વજન વિગતો
 DocType: Payment Gateway Account,Payment Gateway Account,પેમેન્ટ ગેટવે એકાઉન્ટ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"ચુકવણી પૂર્ણ કર્યા પછી, પસંદ કરેલ પાનું વપરાશકર્તા પુનઃદિશામાન."
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,અંતિમ તારીખ
 ,Supplier Addresses and Contacts,પુરવઠોકર્તા સરનામાંઓ અને સંપર્કો
 ,accounts-browser,એકાઉન્ટ્સ બ્રાઉઝર
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,પ્રથમ શ્રેણી પસંદ કરો
 apps/erpnext/erpnext/config/projects.py +13,Project master.,પ્રોજેક્ટ માસ્ટર.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ઓવર બિલિંગ અથવા વધારે ક્રમ પરવાનગી આપવા માટે, &quot;ભથ્થું&quot; અપડેટ સ્ટોક સેટિંગ્સ અથવા વસ્તુ છે."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,કરન્સી વગેરે $ જેવી કોઇ પ્રતીક આગામી બતાવશો નહીં.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(અડધા દિવસ)
 DocType: Supplier,Credit Days,ક્રેડિટ દિવસો
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,વિદ્યાર્થી બેચ બનાવવા
 DocType: Leave Type,Is Carry Forward,આગળ લઈ છે
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM થી વસ્તુઓ વિચાર
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,સમય દિવસમાં લીડ
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},રો # {0}: પોસ્ટ તારીખ ખરીદી તારીખ તરીકે જ હોવી જોઈએ {1} એસેટ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ઉપરના કોષ્ટકમાં વેચાણ ઓર્ડર દાખલ કરો
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,મંજુર રકમ
 DocType: GL Entry,Is Opening,ખોલ્યા છે
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},રો {0}: ડેબિટ પ્રવેશ સાથે લિંક કરી શકતા નથી {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,કૃપા કરીને સેટઅપ સેટઅપ મારફતે હાજરી શ્રેણી સંખ્યા&gt; નંબરિંગ સિરીઝ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 11f815d..905c283 100644
--- a/erpnext/translations/he.csv
+++ b/erpnext/translations/he.csv
@@ -17,7 +17,7 @@
 DocType: Employee,Rented,הושכר
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ישים עבור משתמש
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","הזמנת ייצור הפסיק אינה ניתנת לביטול, מגופתו הראשונה לביטול"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,האם אתה באמת רוצה לבטל הנכס הזה?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},מטבע נדרש למחיר המחירון {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* יחושב בעסקה.
@@ -38,7 +38,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),יוצא מן הכלל עבור {0} אינם יכולים להיות פחות מאפס ({1})
 DocType: Manufacturing Settings,Default 10 mins,ברירת מחדל 10 דקות
 DocType: Leave Type,Leave Type Name,השאר סוג שם
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,הצג פתוח
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,הצג פתוח
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,סדרת עדכון בהצלחה
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,לבדוק
 DocType: Pricing Rule,Apply On,החל ב
@@ -51,20 +51,19 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,החדש Leave Application
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,המחאה בנקאית
 DocType: Mode of Payment Account,Mode of Payment Account,מצב של חשבון תשלומים
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,גרסאות הצג
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,גרסאות הצג
 DocType: Academic Term,Academic Term,מונח אקדמי
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,חוֹמֶר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,כמות
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,כמות
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,טבלת החשבונות לא יכולה להיות ריקה.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),הלוואות (התחייבויות)
 DocType: Employee Education,Year of Passing,שנה של פטירה
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","סימוכין:% s, קוד פריט:% s ולקוח:% s"
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,במלאי
 DocType: Production Plan Item,Production Plan Item,פריט תכנית ייצור
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},משתמש {0} כבר הוקצה לעובדי {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,בריאות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),עיכוב בתשלום (ימים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,חשבונית
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,חשבונית
 DocType: Maintenance Schedule Item,Periodicity,תְקוּפָתִיוּת
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,שנת כספים {0} נדרש
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,ביטחון
@@ -95,13 +94,13 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,קילוגרם
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,פתיחה לעבודה.
 DocType: Item Attribute,Increment,תוספת
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,בחר מחסן ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,בחר מחסן ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,פרסום
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,אותו החברה נכנסה יותר מפעם אחת
 DocType: Employee,Married,נשוי
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},חל איסור על {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,קבל פריטים מ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},חל איסור על {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,קבל פריטים מ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},המניה לא ניתן לעדכן נגד תעודת משלוח {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},מוצרים {0}
 DocType: Payment Reconciliation,Reconcile,ליישב
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,מכולת
@@ -118,8 +117,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",למשל &quot;בית הספר היסודי&quot; או &quot;האוניברסיטה&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,דוחות במלאי
 DocType: Warehouse,Warehouse Detail,פרט מחסן
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},מסגרת אשראי נחצתה ללקוחות {0} {1} / {2}
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;האם רכוש קבוע&quot; לא יכול להיות מסומן, כמו שיא נכסים קיים כנגד הפריט"
 DocType: Tax Rule,Tax Type,סוג המס
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},אין לך ההרשאה להוסיף או עדכון ערכים לפני {0}
 DocType: BOM,Item Image (if not slideshow),תמונת פריט (אם לא מצגת)
@@ -140,7 +139,7 @@
 DocType: Lead,Product Enquiry,חקירה מוצר
 DocType: Academic Term,Schools,בתי ספר
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,אנא ראשון להיכנס החברה
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,אנא בחר החברה ראשונה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,עלות כוללת
@@ -153,7 +152,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}","כמות זמינה הוא {0}, אתה צריך {1}"
 DocType: Expense Claim Detail,Claim Amount,סכום תביעה
 DocType: Employee,Mr,מר
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,סוג ספק / ספק
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,סוג ספק / ספק
 DocType: Naming Series,Prefix,קידומת
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,מתכלה
 DocType: Employee,B-,B-
@@ -163,7 +162,7 @@
 DocType: SMS Center,All Contact,כל הקשר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,משכורת שנתית
 DocType: Period Closing Voucher,Closing Fiscal Year,סגירת שנת כספים
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} הוא קפוא
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} הוא קפוא
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,הוצאות המניה
 DocType: Journal Entry,Contra Entry,קונטרה כניסה
 DocType: Journal Entry Account,Credit in Company Currency,אשראי במטבע החברה
@@ -184,7 +183,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,הפוך כניסת פחת
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,סוג הבקשה
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,הפוך שכיר
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,הפוך שכיר
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,שידור
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ביצוע
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,פרטים של הפעולות שביצעו.
@@ -222,14 +221,14 @@
 DocType: Sales Invoice,Is Opening Entry,האם פתיחת כניסה
 DocType: Customer Group,Mention if non-standard receivable account applicable,להזכיר אם ישים חשבון חייבים שאינם סטנדרטי
 DocType: Course Schedule,Instructor Name,שם המורה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,למחסן נדרש לפני הגשה
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,התקבל ב
 DocType: Sales Partner,Reseller,משווק
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,נא להזין חברה
 DocType: Delivery Note Item,Against Sales Invoice Item,נגד פריט מכירות חשבונית
 ,Production Orders in Progress,הזמנות ייצור בהתקדמות
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,מזומנים נטו ממימון
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage מלא, לא הציל"
 DocType: Lead,Address & Contact,כתובת ולתקשר
 DocType: Leave Allocation,Add unused leaves from previous allocations,להוסיף עלים שאינם בשימוש מהקצאות קודמות
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},הבא חוזר {0} ייווצר על {1}
@@ -250,8 +249,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),סה&quot;כ תמחיר הסכום (באמצעות גיליון זמן)
 DocType: Item Website Specification,Item Website Specification,מפרט אתר פריט
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,השאר חסימה
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,פוסט בנק
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},פריט {0} הגיע לסיומו של חיים על {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,פוסט בנק
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,שנתי
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,פריט במלאי פיוס
 DocType: Stock Entry,Sales Invoice No,מכירות חשבונית לא
@@ -265,8 +264,8 @@
 DocType: Course Scheduling Tool,Course Start Date,תאריך פתיחת הקורס
 DocType: Item,Publish in Hub,פרסם בHub
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,פריט {0} יבוטל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,בקשת חומר
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,פריט {0} יבוטל
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,בקשת חומר
 DocType: Bank Reconciliation,Update Clearance Date,תאריך שחרור עדכון
 DocType: Item,Purchase Details,פרטי רכישה
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},פריט {0} לא נמצא בטבלה &quot;חומרי גלם מסופקת &#39;בהזמנת רכש {1}
@@ -298,9 +297,9 @@
 DocType: Job Applicant,Cover Letter,מכתב כיסוי
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,המחאות ופיקדונות כדי לנקות מצטיינים
 DocType: Item,Synced With Hub,סונכרן עם רכזת
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,סיסמא שגויה
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,סיסמא שגויה
 DocType: Item,Variant Of,גרסה של
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"כמות שהושלמה לא יכולה להיות גדולה מ 'כמות לייצור """
 DocType: Period Closing Voucher,Closing Account Head,סגירת חשבון ראש
 DocType: Employee,External Work History,חיצוני היסטוריה עבודה
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,שגיאת הפניה מעגלית
@@ -312,11 +311,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,להודיע באמצעות דואר אלקטרוני על יצירת בקשת חומר אוטומטית
 DocType: Journal Entry,Multi Currency,מטבע רב
 DocType: Payment Reconciliation Invoice,Invoice Type,סוג חשבונית
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,תעודת משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,תעודת משלוח
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,הגדרת מסים
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,עלות נמכר נכס
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,כניסת תשלום השתנתה לאחר שמשכת אותו. אנא למשוך אותו שוב.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} נכנס פעמיים במס פריט
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,סיכום השבוע הזה ופעילויות תלויות ועומדות
 DocType: Student Applicant,Admitted,רישיון
 DocType: Workstation,Rent Cost,עלות השכרה
@@ -326,7 +325,7 @@
 DocType: GL Entry,Debit Amount in Account Currency,סכום חיוב במטבע חשבון
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,עסקות בנק / מזומנים נגד מפלגה או עבור העברה פנימית
 DocType: Shipping Rule,Valid for Countries,תקף למדינות
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"פריט זה הוא תבנית ולא ניתן להשתמש בם בעסקות. תכונות פריט תועתק על לגרסות אלא אם כן ""לא העתק 'מוגדרת"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,"להזמין סה""כ נחשב"
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ייעוד עובד (למשל מנכ""ל, מנהל וכו ')."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,נא להזין את 'חזור על פעולה ביום בחודש' ערך שדה
@@ -334,14 +333,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},שורה # {0}: חשבונית הרכש אינו יכול להתבצע נגד נכס קיים {1}
 DocType: Item Tax,Tax Rate,שיעור מס
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} כבר הוקצה לעובדי {1} לתקופה {2} {3} ל
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,פריט בחר
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,פריט בחר
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,לרכוש חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},# השורה {0}: אצווה לא חייב להיות זהה {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,המרת שאינה קבוצה
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,אצווה (הרבה) של פריט.
 DocType: C-Form Invoice Detail,Invoice Date,תאריך חשבונית
 DocType: GL Entry,Debit Amount,סכום חיוב
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},לא יכול להיות רק 1 חשבון לכל חברת {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,אנא ראה קובץ מצורף
 DocType: Purchase Order,% Received,% התקבל
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,יצירת קבוצות סטודנטים
@@ -367,7 +366,7 @@
 DocType: Request for Quotation,Request for Quotation,בקשה לציטוט
 DocType: Salary Slip Timesheet,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.","אם כללי תמחור מרובים להמשיך לנצח, משתמשים מתבקשים להגדיר עדיפות ידנית לפתור את הסכסוך."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","אם כללי תמחור מרובים להמשיך לנצח, משתמשים מתבקשים להגדיר עדיפות ידנית לפתור את הסכסוך."
 ,Purchase Register,רכישת הרשמה
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,חיובים החלים
@@ -375,7 +374,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) חייב להיות תפקיד ""Leave מאשר '"
 DocType: Purchase Receipt,Vehicle Date,תאריך רכב
 DocType: Student Log,Medical,רפואי
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,סיבה לאיבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,סיבה לאיבוד
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,הסכום שהוקצה לא יכול מעל לסכום ללא התאמות
 DocType: Announcement,Receiver,מַקְלֵט
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},תחנת עבודה סגורה בתאריכים הבאים בהתאם לרשימת Holiday: {0}
@@ -405,13 +404,13 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,הגדרות גלובליות עבור כל תהליכי הייצור.
 DocType: Accounts Settings,Accounts Frozen Upto,חשבונות קפואים Upto
 DocType: SMS Log,Sent On,נשלח ב
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,תכונה {0} נבחר מספר פעמים בטבלה תכונות
 DocType: HR Settings,Employee record is created using selected field. ,שיא עובד שנוצר באמצעות שדה שנבחר.
 DocType: Sales Order,Not Applicable,לא ישים
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,אב חג.
 DocType: Request for Quotation Item,Required Date,תאריך הנדרש
 DocType: Delivery Note,Billing Address,כתובת לחיוב
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,נא להזין את קוד פריט.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,נא להזין את קוד פריט.
 DocType: BOM,Costing,תמחיר
 DocType: Tax Rule,Billing County,מחוז חיוב
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","אם מסומן, את סכום המס ייחשב כפי שכבר כלול במחיר ההדפסה / סכום ההדפסה"
@@ -438,13 +437,13 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,הכנסה ישירה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","לא יכול לסנן על פי חשבון, אם מקובצים לפי חשבון"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,קצין מנהלי
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,אנא בחר חברה
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,אנא בחר חברה
 DocType: Stock Entry Detail,Difference Account,חשבון הבדל
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,לא יכולה לסגור משימה כמשימה התלויה {0} אינה סגורה.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,נא להזין את המחסן שלבקשת חומר יועלה
 DocType: Production Order,Additional Operating Cost,עלות הפעלה נוספות
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,קוסמטיקה
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","למזג, המאפיינים הבאים חייבים להיות זהים בשני הפריטים"
 DocType: Shipping Rule,Net Weight,משקל נטו
 DocType: Employee,Emergency Phone,טל 'חירום
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,לִקְנוֹת
@@ -452,7 +451,7 @@
 DocType: Sales Invoice,Offline POS Name,שם קופה מנותקת
 DocType: Sales Order,To Deliver,כדי לספק
 DocType: Purchase Invoice Item,Item,פריט
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,אין פריט סידורי לא יכול להיות חלק
 DocType: Journal Entry,Difference (Dr - Cr),"הבדל (ד""ר - Cr)"
 DocType: Account,Profit and Loss,רווח והפסד
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,קבלנות משנה ניהול
@@ -467,7 +466,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,תוספת לא יכולה להיות 0
 DocType: Production Planning Tool,Material Requirement,דרישת חומר
 DocType: Company,Delete Company Transactions,מחק עסקות חברה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,אסמכתא ותאריך ההפניה הוא חובה עבור עסקת הבנק
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,להוסיף מסים / עריכה וחיובים
 DocType: Purchase Invoice,Supplier Invoice No,ספק חשבונית לא
 DocType: Territory,For reference,לעיון
@@ -486,13 +485,13 @@
 DocType: Sales Invoice,Total Commission,"הוועדה סה""כ"
 DocType: Pricing Rule,Sales Partner,פרטנר מכירות
 DocType: Buying Settings,Purchase Receipt Required,קבלת רכישת חובה
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,דרג ההערכה היא חובה אם Stock פתיחה נכנס
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,לא נמצא רשומות בטבלת החשבונית
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,אנא בחר סוג החברה והמפלגה ראשון
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,כספי לשנה / חשבונאות.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ערכים מצטברים
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","מצטער, לא ניתן למזג מס סידורי"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,הפוך להזמין מכירות
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,הפוך להזמין מכירות
 DocType: Project Task,Project Task,פרויקט משימה
 ,Lead Id,זיהוי ליד
 DocType: C-Form Invoice Detail,Grand Total,סך כולל
@@ -508,7 +507,7 @@
 DocType: Job Applicant,Resume Attachment,מצורף קורות חיים
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,חזרו על לקוחות
 DocType: Leave Control Panel,Allocate,להקצות
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,חזור מכירות
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,חזור מכירות
 DocType: Announcement,Posted By,פורסם על ידי
 DocType: Item,Delivered by Supplier (Drop Ship),נמסר על ידי ספק (זרוק משלוח)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,מסד הנתונים של לקוחות פוטנציאליים.
@@ -517,7 +516,7 @@
 DocType: Quotation,Quotation To,הצעת מחיר ל
 DocType: Lead,Middle Income,הכנסה התיכונה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),פתיחה (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,סכום שהוקצה אינו יכול להיות שלילי
 DocType: Purchase Order Item,Billed Amt,Amt שחויב
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,מחסן לוגי שנגדו מרשמו רשומות מלאי
@@ -541,11 +540,11 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' לא בשנת הכספים {2}
 DocType: Buying Settings,Settings for Buying Module,הגדרות עבור רכישת מודול
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},נכסים {0} אינו שייך לחברה {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,אנא ראשון להיכנס קבלת רכישה
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,אנא ראשון להיכנס קבלת רכישה
 DocType: Buying Settings,Supplier Naming By,Naming ספק ב
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","חוקים ואז תמחור מסוננים החוצה על בסיס לקוחות, קבוצת לקוחות, טריטוריה, ספק, סוג של ספק, המבצע, שותף מכירות וכו '"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,שינוי נטו במלאי
 DocType: Employee,Passport Number,דרכון מספר
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,מנהל
@@ -556,8 +555,8 @@
 DocType: Installation Note,IN-,In-
 DocType: Production Order Operation,In minutes,בדקות
 DocType: Issue,Resolution Date,תאריך החלטה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,גיליון נוצר:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,גיליון נוצר:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},אנא הגדר מזומנים ברירת מחדל או חשבון בנק במצב של תשלום {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,לְהִרָשֵׁם
 DocType: Selling Settings,Customer Naming By,Naming הלקוח על ידי
 DocType: Depreciation Schedule,Depreciation Amount,סכום הפחת
@@ -591,7 +590,7 @@
 DocType: Student Attendance,Student Attendance,נוכחות תלמידים
 DocType: Sales Invoice Timesheet,Time Sheet,לוח זמנים
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush חומרי גלם המבוסס על
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,נא להזין את פרטי פריט
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,נא להזין את פרטי פריט
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,קדם מכירות
 DocType: Purchase Receipt,Other Details,פרטים נוספים
 DocType: Account,Accounts,חשבונות
@@ -604,11 +603,11 @@
 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 +636,Item has variants.,יש פריט גרסאות.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,יש פריט גרסאות.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,פריט {0} לא נמצא
 DocType: Bin,Stock Value,מניית ערך
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,החברה {0} לא קיים
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,סוג העץ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,סוג העץ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,כמות נצרכת ליחידה
 DocType: Serial No,Warranty Expiry Date,תאריך תפוגה אחריות
 DocType: Material Request Item,Quantity and Warehouse,כמות ומחסן
@@ -627,7 +626,7 @@
 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,חשבון ברירת מחדל
 DocType: Payment Entry,Received Amount (Company Currency),הסכום שהתקבל (חברת מטבע)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,עופרת יש להגדיר אם הזדמנות עשויה מעופרת
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,אנא בחר יום מנוחה שבועי
 DocType: Production Order Operation,Planned End Time,שעת סיום מתוכננת
 ,Sales Person Target Variance Item Group-Wise,פריט יעד שונות איש מכירות קבוצה-Wise
@@ -681,14 +680,14 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},נכסים לגרוטאות באמצעות תנועת יומן {0}
 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 +107,Office Maintenance Expenses,הוצאות משרד תחזוקה
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,אנא ראשון להיכנס פריט
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,אנא ראשון להיכנס פריט
 DocType: Account,Liability,אחריות
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,סכום גושפנקא לא יכול להיות גדול מסכום תביעה בשורה {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,מחיר המחירון לא נבחר
 DocType: Employee,Family Background,רקע משפחתי
 DocType: Request for Quotation Supplier,Send Email,שלח אי-מייל
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},אזהרה: קובץ מצורף לא חוקי {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,אין אישור
 DocType: Company,Default Bank Account,חשבון בנק ברירת מחדל
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","כדי לסנן מבוסס על המפלגה, מפלגה בחר את הסוג ראשון"
@@ -706,8 +705,8 @@
 ,Support Analytics,Analytics תמיכה
 DocType: Item,Website Warehouse,מחסן אתר
 DocType: Payment Reconciliation,Minimum Invoice Amount,סכום חשבונית מינימום
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,פריט שורה {idx}: {DOCTYPE} {DOCNAME} אינה קיימת מעל &#39;{DOCTYPE} שולחן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,גיליון {0} כבר הושלם או בוטל
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","היום בחודש שבו חשבונית אוטומטית תיווצר למשל 05, 28 וכו '"
 DocType: Asset,Opening Accumulated Depreciation,פתיחת פחת שנצבר
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,ציון חייב להיות קטן או שווה ל 5
@@ -720,7 +719,7 @@
 DocType: Bin,Moving Average Rate,נע תעריף ממוצע
 DocType: Production Planning Tool,Select Items,פריטים בחרו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} נגד ביל {1} יום {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,לוח זמנים מסלול
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,לוח זמנים מסלול
 DocType: Maintenance Visit,Completion Status,סטטוס השלמה
 DocType: HR Settings,Enter retirement age in years,זן גיל פרישה בשנים
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,יעד מחסן
@@ -728,7 +727,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,לאפשר על משלוח או קבלת upto אחוזים זה
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,נוכחות יבוא
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,בכל קבוצות הפריט
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,בכל קבוצות הפריט
 DocType: Process Payroll,Activity Log,יומן פעילות
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,רווח נקי / הפסד
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,באופן אוטומטי לחבר את ההודעה על הגשת עסקות.
@@ -738,7 +737,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,הזמנת רכש לתשלום
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,כמות חזויה
 DocType: Sales Invoice,Payment Due Date,מועד תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,פריט Variant {0} כבר קיים עימן תכונות
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;פתיחה&quot;
 DocType: Notification Control,Delivery Note Message,מסר תעודת משלוח
 DocType: Expense Claim,Expenses,הוצאות
@@ -776,12 +775,12 @@
 DocType: Supplier Quotation,Is Subcontracted,האם קבלן
 DocType: Item Attribute,Item Attribute Values,ערכי תכונה פריט
 DocType: Examination Result,Examination Result,תוצאת בחינה
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,קבלת רכישה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,קבלת רכישה
 ,Received Items To Be Billed,פריטים שהתקבלו לחיוב
 DocType: Employee,Ms,גב '
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,שער חליפין של מטבע שני.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},הפניה Doctype חייב להיות אחד {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},הפניה Doctype חייב להיות אחד {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},לא ניתן למצוא משבצת הזמן בעולם הבא {0} ימים למבצע {1}
 DocType: Production Order,Plan material for sub-assemblies,חומר תכנית לתת מכלולים
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,שותפי מכירות טריטוריה
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,BOM {0} חייב להיות פעיל
@@ -802,10 +801,9 @@
 DocType: Purchase Receipt,Range,טווח
 DocType: Supplier,Default Payable Accounts,חשבונות לתשלום ברירת מחדל
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,עובד {0} אינו פעיל או שאינו קיים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,פריט גרסאות {0} מעודכן
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},נא להזין קטגורית Asset בסעיף {0}
 DocType: Quality Inspection Reading,Reading 6,קריאת 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,אין אפשרות {0} {1} {2} ללא כל חשבונית מצטיינים שלילית
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,לרכוש חשבונית מראש
 DocType: Hub Settings,Sync Now,Sync עכשיו
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},שורת {0}: כניסת אשראי לא יכולה להיות מקושרת עם {1}
@@ -819,9 +817,9 @@
 DocType: Item,Is Purchase Item,האם פריט הרכישה
 DocType: Asset,Purchase Invoice,רכישת חשבוניות
 DocType: Stock Ledger Entry,Voucher Detail No,פרט שובר לא
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,חשבונית מכירת בתים חדשה
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,חשבונית מכירת בתים חדשה
 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,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,פתיחת תאריך ותאריך סגירה צריכה להיות באותה שנת כספים
 DocType: Lead,Request for Information,בקשה לקבלת מידע
 DocType: Payment Request,Paid,בתשלום
 DocType: Program Fee,Program Fee,דמי תכנית
@@ -830,7 +828,7 @@
 DocType: Cheque Print Template,Has Print Format,יש פורמט להדפסה
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; שולחן."
 DocType: Job Opening,Publish on website,פרסם באתר
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,משלוחים ללקוחות.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,תאריך חשבונית ספק לא יכול להיות גדול מ תאריך פרסום
@@ -840,7 +838,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,שונות
 ,Company Name,שם חברה
 DocType: SMS Center,Total Message(s),מסר כולל (ים)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,פריט בחר להעברה
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ראש בחר חשבון של הבנק שבו הופקד שיק.
@@ -861,7 +859,7 @@
 DocType: SMS Center,All Lead (Open),כל הלידים (פתוח)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),שורה {0}: כמות אינה זמינה עבור {4} במחסן {1} בכל שעת הפרסום של כניסה ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,קבלו תשלום מקדמות
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,הפוך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,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,סל הקניות שלי
@@ -885,10 +883,10 @@
 DocType: Purchase Invoice,Cash/Bank Account,מזומנים / חשבון בנק
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,פריטים הוסרו ללא שינוי בכמות או ערך.
 DocType: Delivery Note,Delivery To,משלוח ל
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,שולחן תכונה הוא חובה
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,שולחן תכונה הוא חובה
 DocType: Production Planning Tool,Get Sales Orders,קבל הזמנות ומכירות
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} אינו יכול להיות שלילי
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,דיסקונט
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,דיסקונט
 DocType: Asset,Total Number of Depreciations,מספר כולל של פחת
 DocType: Workstation,Wages,שכר
 DocType: Project,Internal,פנימי
@@ -901,7 +899,7 @@
 DocType: POS Profile,Sales Invoice Payment,תשלום חשבוניות מכירות
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,מחסן שמורות במכירות להזמין / סיום מוצרי מחסן
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,סכום מכירה
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,אתה המאשר ההוצאה לתקליט הזה. אנא עדכן את 'הסטטוס' ושמור
 DocType: Serial No,Creation Document No,יצירת מסמך לא
 DocType: Issue,Issue,נושא
 DocType: Asset,Scrapped,לגרוטאות
@@ -909,11 +907,11 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","תכונות לפריט גרסאות. למשל גודל, צבע וכו '"
 DocType: Purchase Invoice,Returns,החזרות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,מחסן WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},מספר סידורי {0} הוא תחת חוזה תחזוקת upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,גיוס
 DocType: Lead,Organization Name,שם ארגון
 DocType: Tax Rule,Shipping State,מדינת משלוח
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"פריט יש להוסיף באמצעות 'לקבל פריטים מרכישת קבלות ""כפתור"
 DocType: Employee,A-,א-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,הוצאות מכירה
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,קנייה סטנדרטית
@@ -930,7 +928,7 @@
 DocType: Holiday List,Get Weekly Off Dates,קבל תאריכי מנוחה שבועיים
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,תאריך סיום לא יכול להיות פחות מתאריך ההתחלה
 DocType: Sales Person,Select company name first.,שם חברה בחר ראשון.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,"ד""ר"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,"ד""ר"
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ציטוטים המתקבלים מספקים.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},כדי {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,גיל ממוצע
@@ -945,7 +943,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,פינת של ביצועים מרכזיים
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,תחבורה
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,תכונה לא חוקית
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} יש להגיש
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} יש להגיש
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},כמות חייבת להיות קטנה או שווה ל {0}
 DocType: SMS Center,Total Characters,"סה""כ תווים"
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},אנא בחר BOM בתחום BOM לפריט {0}
@@ -956,7 +954,7 @@
 DocType: Sales Partner,Distributor,מפיץ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,כלל משלוח סל קניות
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ייצור להזמין {0} יש לבטל לפני ביטול הזמנת מכירות זה
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',אנא הגדר &#39;החל הנחה נוספות ב&#39;
 ,Ordered Items To Be Billed,פריטים שהוזמנו להיות מחויב
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,מהטווח צריך להיות פחות מטווח
 DocType: Global Defaults,Global Defaults,ברירות מחדל גלובליות
@@ -964,7 +962,7 @@
 DocType: Salary Slip,Deductions,ניכויים
 DocType: Purchase Invoice,Start date of current invoice's period,תאריך התחלה של תקופה של החשבונית הנוכחית
 DocType: Salary Slip,Leave Without Pay,חופשה ללא תשלום
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,שגיאת תכנון קיבולת
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,שגיאת תכנון קיבולת
 ,Trial Balance for Party,מאזן בוחן למפלגה
 DocType: Lead,Consultant,יועץ
 DocType: Salary Slip,Earnings,רווחים
@@ -987,8 +985,8 @@
 DocType: Stock Settings,Default Item Group,קבוצת ברירת מחדל של הפריט
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,מסד נתוני ספק.
 DocType: Account,Balance Sheet,מאזן
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',עלות מרכז לפריט עם קוד פריט '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","מצב תשלום אינו מוגדר. אנא קרא, אם חשבון הוגדר על מצב תשלומים או על פרופיל קופה."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,איש המכירות שלך יקבל תזכורת על מועד זה ליצור קשר עם הלקוח
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","חשבונות נוספים יכולים להתבצע תחת קבוצות, אבל ערכים יכולים להתבצע נגד לא-קבוצות"
 DocType: Lead,Lead,לידים
@@ -999,7 +997,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,פקודות יומן מניות וGL ערכים הם יפורסמו לקבלות הרכישה נבחרו
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,פקודות יומן מניות וGL ערכים הם יפורסמו לקבלות הרכישה נבחרו
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,פריט 1
 DocType: Holiday,Holiday,החג
 DocType: Leave Control Panel,Leave blank if considered for all branches,שאר ריק אם תיחשב לכל הסניפים
@@ -1019,10 +1017,10 @@
 DocType: Maintenance Visit Purpose,Work Done,מה נעשה
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ציין מאפיין אחד לפחות בטבלת התכונות
 DocType: Announcement,All Students,כל הסטודנטים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,פריט {0} חייב להיות לפריט שאינו מוחזק במלאי
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,צפה לדג'ר
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,המוקדם
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","קבוצת פריט קיימת עם אותו שם, בבקשה לשנות את שם הפריט או לשנות את שם קבוצת הפריט"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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,תקציב שונות דווח
@@ -1053,8 +1051,8 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,חשבונות לתשלום סיכום
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},אינך רשאי לערוך חשבון קפוא {0}
 DocType: Journal Entry,Get Outstanding Invoices,קבל חשבוניות מצטיינים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,להזמין מכירות {0} אינו חוקי
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","מצטער, לא ניתן למזג חברות"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",כמות הנפקה / ההעברה הכולל {0} ב בקשת חומר {1} \ לא יכולה להיות גדולה מ כמות מבוקשת {2} עבור פריט {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,קטן
@@ -1074,10 +1072,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,הוצאות עקיפות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,שורת {0}: הכמות היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,חקלאות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,המוצרים או השירותים שלך
 DocType: Mode of Payment,Mode of Payment,מצב של תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,תמונה: אתר אינטרנט צריכה להיות קובץ ציבורי או כתובת אתר אינטרנט
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,מדובר בקבוצת פריט שורש ולא ניתן לערוך.
 DocType: Journal Entry Account,Purchase Order,הזמנת רכש
@@ -1089,17 +1087,17 @@
 DocType: Serial No,Serial No Details,Serial No פרטים
 DocType: Purchase Invoice Item,Item Tax Rate,שיעור מס פריט
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","עבור {0}, רק חשבונות האשראי יכולים להיות מקושרים נגד כניסת חיוב נוספת"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,משלוח הערה {0} לא תוגש
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","כלל תמחור נבחר ראשון המבוססת על 'החל ב'שדה, אשר יכול להיות פריט, קבוצת פריט או מותג."
 DocType: Hub Settings,Seller Website,אתר מוכר
 DocType: Item,ITEM-,פריט-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,"אחוז הוקצה סה""כ לצוות מכירות צריך להיות 100"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},מעמד הזמנת ייצור הוא {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},מעמד הזמנת ייצור הוא {0}
 DocType: Appraisal Goal,Goal,מטרה
 DocType: Sales Invoice Item,Edit Description,עריכת תיאור
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,לספקים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,לספקים
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,הגדרת סוג החשבון מסייעת בבחירת חשבון זה בעסקות.
 DocType: Purchase Invoice,Grand Total (Company Currency),סך כולל (חברת מטבע)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,יצירת תבנית הדפסה
@@ -1128,7 +1126,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,חומרה
 DocType: Sales Order,Recurring Upto,Upto חוזר
 DocType: Attendance,HR Manager,מנהל משאבי אנוש
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,אנא בחר חברה
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,אנא בחר חברה
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,זכות Leave
 DocType: Purchase Invoice,Supplier Invoice Date,תאריך חשבונית ספק
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,אתה צריך לאפשר סל קניות
@@ -1144,7 +1142,7 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,מזון
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,טווח הזדקנות 3
 DocType: Maintenance Schedule Item,No of Visits,אין ביקורים
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,מארק Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,מארק Attendence
 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}
 DocType: Project,Start and End Dates,תאריכי התחלה וסיום
@@ -1167,7 +1165,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ממוצע יומי יוצא
 DocType: POS Profile,Campaign,קמפיין
 DocType: Supplier,Name and Type,שם וסוג
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"סטטוס אישור חייב להיות ""מאושר"" או ""נדחה"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"סטטוס אישור חייב להיות ""מאושר"" או ""נדחה"""
 DocType: Purchase Invoice,Contact Person,איש קשר
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'תאריך ההתחלה צפויה ""לא יכול להיות יותר מאשר' תאריך סיום צפוי  'גדול יותר"
 DocType: Course Scheduling Tool,Course End Date,תאריך סיום קורס
@@ -1188,8 +1186,8 @@
 DocType: Sales Invoice,Shipping Address Name,שם כתובת למשלוח
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,תרשים של חשבונות
 DocType: Material Request,Terms and Conditions Content,תוכן תנאים והגבלות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,לא יכול להיות גדול מ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,לא יכול להיות גדול מ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,פריט {0} הוא לא פריט מניות
 DocType: Maintenance Visit,Unscheduled,לא מתוכנן
 DocType: Employee,Owned,בבעלות
 DocType: Salary Detail,Depends on Leave Without Pay,תלוי בחופשה ללא תשלום
@@ -1211,7 +1209,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,עובד לא יכול לדווח לעצמו.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","אם החשבון הוא קפוא, ערכים מותרים למשתמשים מוגבלים."
 DocType: Email Digest,Bank Balance,עובר ושב
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},חשבונאות כניסה עבור {0}: {1} יכול להתבצע רק במטבע: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","פרופיל תפקיד, כישורים נדרשים וכו '"
 DocType: Journal Entry Account,Account Balance,יתרת חשבון
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,כלל מס לעסקות.
@@ -1226,7 +1224,7 @@
 DocType: Shipping Rule Condition,To Value,לערך
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Slip אריזה
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Slip אריזה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,השכרת משרד
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,הגדרות שער SMS ההתקנה
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,יבוא נכשל!
@@ -1249,7 +1247,7 @@
 DocType: Sales Invoice,Source,מקור
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,הצג סגור
 DocType: Leave Type,Is Leave Without Pay,האם חופשה ללא תשלום
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,קטגורית נכסים היא חובה עבור פריט רכוש קבוע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,לא נמצא רשומות בטבלת התשלום
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},{0} זו מתנגשת עם {1} עבור {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML סטודנטים
@@ -1325,18 +1323,18 @@
 DocType: Student Group,Set 0 for no limit,גדר 0 עבור שום מגבלה
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,היום (ים) שבו אתה מתראיין לחופשת חגים. אתה לא צריך להגיש בקשה לחופשה.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,שלח שוב דוא&quot;ל תשלום
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,הפוך הצעת מחיר
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,הפוך הצעת מחיר
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,דוחות נוספים
 DocType: Dependent Task,Dependent Task,משימה תלויה
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},גורם המרה ליחידת ברירת מחדל של מדד חייב להיות 1 בשורה {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave מסוג {0} אינו יכול להיות ארוך מ- {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,נסה לתכנן פעולות לימי X מראש.
 DocType: HR Settings,Stop Birthday Reminders,Stop יום הולדת תזכורות
 DocType: SMS Center,Receiver List,מקלט רשימה
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,כמות הנצרכת
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,שינוי נטו במזומנים
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,הושלם כבר
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,יחידת מידת {0} כבר נכנסה יותר מפעם אחת בהמרת פקטור טבלה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,הושלם כבר
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},בקשת תשלום כבר קיימת {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,עלות פריטים הונפק
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},כמות לא חייבת להיות יותר מ {0}
@@ -1371,7 +1369,7 @@
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,לאסוף
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},נגד ספק חשבונית {0} יום {1}
 DocType: Customer,Default Price List,מחיר מחירון ברירת מחדל
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,שיא תנועת נכסים {0} נוצרו
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,אתה לא יכול למחוק את שנת הכספים {0}. שנת הכספים {0} מוגדרת כברירת מחדל ב הגדרות גלובליות
 DocType: Journal Entry,Entry Type,סוג הכניסה
 ,Customer Credit Balance,יתרת אשראי ללקוחות
@@ -1385,7 +1383,7 @@
 DocType: Manufacturing Settings,Capacity Planning For (Days),תכנון קיבולת ל( ימים)
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,רֶכֶשׁ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,אף אחד מהפריטים יש שינוי בכמות או ערך.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,הפעיל אחריות
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,הפעיל אחריות
 ,Lead Details,פרטי לידים
 DocType: Purchase Invoice,End date of current invoice's period,תאריך סיום של התקופה של החשבונית הנוכחית
 DocType: Pricing Rule,Applicable For,ישים ל
@@ -1401,7 +1399,7 @@
 DocType: Employee,Permanent Address,כתובת קבועה
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",מקדמה ששולם כנגד {0} {1} לא יכול להיות גדול \ מ גרנד סה&quot;כ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,אנא בחר קוד פריט
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,אנא בחר קוד פריט
 DocType: Territory,Territory Manager,מנהל שטח
 DocType: Packed Item,To Warehouse (Optional),למחסן (אופציונאלי)
 DocType: Payment Entry,Paid Amount (Company Currency),הסכום ששולם (חברת מטבע)
@@ -1412,9 +1410,9 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +17,Fulfillment,הַגשָׁמָה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,הוצאות שיווק
 ,Item Shortage Report,דווח מחסור פריט
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","המשקל מוזכר, \ n להזכיר ""משקל של אוני 'מישגן"" מדי"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,בקשת חומר המשמשת לייצור Stock רשומת זו
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,תאריך הפחת הבא הוא חובה של נכסים חדשים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,תאריך הפחת הבא הוא חובה של נכסים חדשים
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,יחידה אחת של פריט.
 DocType: Fee Category,Fee Category,קטגורית דמים
 ,Student Fee Collection,אוסף דמי סטודנטים
@@ -1427,7 +1425,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext ההתקנה הושלמה!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"קבוצת לקוחות קיימת עם אותו שם, בבקשה לשנות את שם הלקוח או לשנות את שם קבוצת הלקוחות"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1454,15 +1452,15 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,יותר מדי עמודות. לייצא את הדוח ולהדפיס אותו באמצעות יישום גיליון אלקטרוני.
 DocType: Purchase Invoice Item,Batch No,אצווה לא
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,לאפשר הזמנות ומכירות מרובות נגד הלקוח הזמנת הרכש
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ראשי
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ראשי
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,קידומת להגדיר למספור סדרה על העסקות שלך
 DocType: Employee Attendance Tool,Employees HTML,עובד HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM ברירת המחדל ({0}) חייב להיות פעיל לפריט זה או התבנית שלה
 DocType: Employee,Leave Encashed?,השאר Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,הזדמנות מ השדה היא חובה
 DocType: Item,Variants,גרסאות
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,הפוך הזמנת רכש
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,הפוך הזמנת רכש
 DocType: SMS Center,Send To,שלח אל
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},אין איזון חופשה מספיק לחופשת סוג {0}
 DocType: Payment Reconciliation Payment,Allocated amount,סכום שהוקצה
@@ -1470,11 +1468,11 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,עבודה ב-התקדמות המחסן נדרש לפני הגשה
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,עבודה ב-התקדמות המחסן נדרש לפני הגשה
 apps/erpnext/erpnext/config/hr.py +40,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/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,נגד תנועת היומן {0} אין {1} כניסה ללא תחרות
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ערכות
 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,תנאי עבור כלל משלוח
@@ -1485,13 +1483,14 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} יש להגיש
 DocType: Authorization Control,Authorization Control,אישור בקרה
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},# השורה {0}: נדחה מחסן הוא חובה נגד פריט דחה {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,תשלום
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,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: Course,Course Abbreviation,קיצור קורס
 DocType: Item,Will also apply for variants,תחול גם לגרסות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","נכסים לא ניתן לבטל, כפי שהוא כבר {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ב
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,פריטי Bundle בעת מכירה.
 DocType: Quotation Item,Actual Qty,כמות בפועל
 DocType: Sales Invoice Item,References,אזכור
@@ -1537,10 +1536,10 @@
 DocType: Supplier,Supplier of Goods or Services.,ספק של מוצרים או שירותים.
 DocType: Budget,Fiscal Year,שנת כספים
 DocType: Budget,Budget,תקציב
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,פריט רכוש קבוע חייב להיות לפריט שאינו מוחזק במלאי.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","תקציב לא ניתן להקצות כנגד {0}, כמו שזה לא חשבון הכנסה או הוצאה"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,הושג
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,שטח / לקוחות
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,שטח / לקוחות
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,לדוגמא 5
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},{0} שורה: סכום שהוקצה {1} חייב להיות פחות מ או שווה לסכום חשבונית מצטיין {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,במילים יהיו גלוי ברגע שאתה לשמור את חשבונית המכירות.
@@ -1557,14 +1556,14 @@
 ,Serial No Status,סטטוס מספר סידורי
 DocType: Payment Entry Reference,Outstanding,יוצא מן הכלל
 ,Daily Timesheet Summary,סיכום גליון יומי
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","שורת {0}: כדי להגדיר {1} מחזורי, הבדל בין מ ו תאריך \ חייב להיות גדול או שווה ל {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,זה מבוסס על תנועת המניה. ראה {0} לפרטים
 DocType: Pricing Rule,Selling,מכירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},סכום {0} {1} לנכות כנגד {2}
 DocType: Employee,Salary Information,מידע משכורת
 DocType: Sales Person,Name and Employee ID,שם והעובדים ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,תאריך יעד לא יכול להיות לפני פרסום תאריך
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,חובות ומסים
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,נא להזין את תאריך הפניה
@@ -1576,14 +1575,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,לא יכול להתייחס מספר השורה גדול או שווה למספר השורה הנוכחי לסוג השעבוד זה
 DocType: Asset,Sold,נמכר
 ,Item-wise Purchase History,היסטוריה רכישת פריט-חכם
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},אנא לחץ על 'צור לוח זמנים' כדי להביא מספר סידורי הוסיפה לפריט {0}
 DocType: Account,Frozen,קפוא
 ,Open Production Orders,הזמנות ייצור פתוחות
 DocType: Sales Invoice Payment,Base Amount (Company Currency),הסכום הבסיסי (החברה מטבע)
 DocType: Payment Reconciliation Payment,Reference Row,הפניה Row
 DocType: Installation Note,Installation Time,זמן התקנה
 DocType: Sales Invoice,Accounting Details,חשבונאות פרטים
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,מחק את כל העסקאות לחברה זו
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,השקעות
 DocType: Issue,Resolution Details,רזולוציה פרטים
@@ -1609,10 +1608,10 @@
 DocType: Discussion,Discussion,דִיוּן
 DocType: Payment Entry,Transaction ID,מזהה עסקה
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,כללי תמחור מסוננים נוסף המבוססים על כמות.
 DocType: Task,Total Billing Amount (via Time Sheet),סכום לחיוב סה&quot;כ (דרך הזמן גיליון)
 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 +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) חייב להיות 'מאשר מהוצאות' תפקיד
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) חייב להיות 'מאשר מהוצאות' תפקיד
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,זוג
 DocType: Asset,Depreciation Schedule,בתוספת פחת
 DocType: Bank Reconciliation Detail,Against Account,נגד חשבון
@@ -1624,15 +1623,15 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},אנא הגדר &#39;מרכז עלות נכסי פחת&#39; ב חברת {0}
 ,Maintenance Schedules,לוחות זמנים תחזוקה
 DocType: Task,Actual End Date (via Time Sheet),תאריך סיום בפועל (באמצעות גיליון זמן)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},סכום {0} {1} נגד {2} {3}
 ,Quotation Trends,מגמות ציטוט
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},קבוצת פריט שלא צוינה באב פריט לפריט {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,חיוב החשבון חייב להיות חשבון חייבים
 DocType: Shipping Rule Condition,Shipping Amount,סכום משלוח
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,סכום תלוי ועומד
 DocType: Purchase Invoice Item,Conversion Factor,המרת פקטור
 DocType: Purchase Order,Delivered,נמסר
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},הערך צפוי לאחר חיים שימושיים חייב להיות גדול או שווה ל {0}
 DocType: Purchase Receipt,Vehicle Number,מספר רכב
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,התאריך שבו חשבונית חוזרת תהיה לעצור
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,עלים כולל שהוקצו {0} לא יכולים להיות פחות מעלים שכבר אושרו {1} לתקופה
@@ -1645,11 +1644,11 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,חיובים להפיץ מבוסס על
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,גליונות
 DocType: HR Settings,HR Settings,הגדרות HR
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,תביעת חשבון ממתינה לאישור. רק המאשר ההוצאות יכול לעדכן את הסטטוס.
 DocType: Purchase Invoice,Additional Discount Amount,סכום הנחה נוסף
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","# השורה {0}: כמות חייבת להיות 1, כפריט הוא נכס קבוע. השתמש בשורה נפרדת עבור כמות מרובה."
 DocType: Leave Block List Allow,Leave Block List Allow,השאר בלוק רשימה אפשר
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr לא יכול להיות ריק או חלל
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,קבוצה לקבוצה ללא
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ספורט
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,"סה""כ בפועל"
@@ -1671,18 +1670,18 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},חשבון {0} אינו חוקי. מטבע חשבון חייב להיות {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},גורם של אוני 'מישגן ההמרה נדרש בשורת {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד להזמין מכירות, חשבוניות מכירות או תנועת יומן"
 DocType: Salary Component,Deduction,ניכוי
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,שורת {0}: מעת לעת ו היא חובה.
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},מחיר הפריט נוסף עבור {0} ב מחירון {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,נא להזין את עובדי זיהוי של איש מכירות זה
 DocType: Territory,Classification of Customers by region,סיווג של לקוחות מאזור לאזור
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,סכום ההבדל חייב להיות אפס
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,סכום ההבדל חייב להיות אפס
 DocType: Project,Gross Margin,שיעור רווח גולמי
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,אנא ראשון להיכנס פריט הפקה
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,מאזן חשבון בנק מחושב
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,משתמשים נכים
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,הצעת מחיר
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,הצעת מחיר
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,סך ניכוי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +172,Cost Updated,עלות עדכון
@@ -1690,7 +1689,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},אזהרה: תעודת SSL לא חוקית בקובץ מצורף {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,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,לנכות
@@ -1703,7 +1702,7 @@
 ,SO Qty,SO כמות
 DocType: Appraisal,Calculate Total Score,חישוב ציון הכולל
 DocType: Request for Quotation,Manufacturing Manager,ייצור מנהל
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},מספר סידורי {0} הוא תחת אחריות upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,תעודת משלוח פצל לחבילות.
 apps/erpnext/erpnext/hooks.py +87,Shipments,משלוחים
 DocType: Payment Entry,Total Allocated Amount (Company Currency),הסכום כולל שהוקצה (חברת מטבע)
@@ -1719,10 +1718,10 @@
 apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-מעל
 DocType: Leave Application,Total Leave Days,"ימי חופשה סה""כ"
 DocType: Email Digest,Note: Email will not be sent to disabled users,הערה: דואר אלקטרוני לא יישלח למשתמשים בעלי מוגבלויות
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,בחר חברה ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,בחר חברה ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,שאר ריק אם תיחשב לכל המחלקות
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","סוגי התעסוקה (קבוע, חוזה, וכו 'מתמחה)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} הוא חובה עבור פריט {1}
 DocType: Currency Exchange,From Currency,ממטבע
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","אנא בחר סכום שהוקצה, סוג החשבונית וחשבונית מספר בatleast שורה אחת"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,עלות רכישה חדשה
@@ -1730,7 +1729,7 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),שיעור (חברת מטבע)
 DocType: Student Guardian,Others,אחרים
 DocType: Payment Entry,Unallocated Amount,סכום שלא הוקצה
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,לא ניתן למצוא את הפריט מתאים. אנא בחר ערך אחר עבור {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"לא ניתן לבחור סוג תשלום כ'בסכום שורה הקודם ""או"" בסך הכל שורה הקודם 'לשורה הראשונה"
@@ -1771,13 +1770,13 @@
 DocType: Delivery Note,"If you have created a standard template in Sales Taxes and Charges Template, select one and click on the button below.","אם יצרת תבנית סטנדרטית בתבנית מסים מכירות וחיובים, בחר אחד ולחץ על הכפתור למטה."
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,נא לציין מדינה לכלל משלוח זה או לבדוק משלוח ברחבי העולם
 DocType: Stock Entry,Total Incoming Value,"ערך הנכנס סה""כ"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,חיוב נדרש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,חיוב נדרש
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,מחיר מחירון רכישה
 DocType: Offer Letter Term,Offer Term,טווח הצעה
 DocType: Quality Inspection,Quality Manager,מנהל איכות
 DocType: Job Applicant,Job Opening,פתיחת עבודה
 DocType: Payment Reconciliation,Payment Reconciliation,פיוס תשלום
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,אנא בחר את שמו של אדם Incharge
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,טכנולוגיה
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,להציע מכתב
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,צור בקשות חומר (MRP) והזמנות ייצור.
@@ -1797,8 +1796,8 @@
 DocType: Opportunity,Lost Reason,סיבה לאיבוד
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,כתובת חדשה
 DocType: Quality Inspection,Sample Size,גודל מדגם
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,נא להזין את מסמך הקבלה
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,כל הפריטים כבר בחשבונית
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,נא להזין את מסמך הקבלה
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,מרכזי עלות נוספים יכולים להתבצע תחת קבוצות אבל ערכים יכולים להתבצע נגד לא-קבוצות
 DocType: Project,External,חיצוני
@@ -1807,7 +1806,7 @@
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,הדפסה ומיתוג
 DocType: Bin,Actual Quantity,כמות בפועל
 DocType: Shipping Rule,example: Next Day Shipping,דוגמא: משלוח היום הבא
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,מספר סידורי {0} לא נמצאו
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,מספר סידורי {0} לא נמצאו
 DocType: Scheduling Tool,Student Batch,יצווה סטודנטים
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,הלקוחות שלך
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},הוזמנת לשתף פעולה על הפרויקט: {0}
@@ -1842,7 +1841,7 @@
 apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},אין פריט ברקוד {0}
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,מקרה מס 'לא יכול להיות 0
 DocType: Item,Show a slideshow at the top of the page,הצג מצגת בחלק העליון של הדף
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,חנויות
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,חנויות
 DocType: Serial No,Delivery Time,זמן אספקה
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,הזדקנות המבוסס על
 DocType: Item,End of Life,סוף החיים
@@ -1854,10 +1853,10 @@
 DocType: Rename Tool,Rename Tool,שינוי שם כלי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,עלות עדכון
 DocType: Item Reorder,Item Reorder,פריט סידור מחדש
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,העברת חומר
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,העברת חומר
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ציין את הפעולות, עלויות הפעלה ולתת מבצע ייחודי לא לפעולות שלך."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,מסמך זה חורג מהמגבלה על ידי {0} {1} עבור פריט {4}. האם אתה גורם אחר {3} נגד אותו {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,אנא קבע חוזר לאחר השמירה
 DocType: Purchase Invoice,Price List Currency,מטבע מחירון
 DocType: Naming Series,User must always select,משתמש חייב תמיד לבחור
 DocType: Stock Settings,Allow Negative Stock,אפשר מלאי שלילי
@@ -1903,7 +1902,7 @@
 DocType: Upload Attendance,Attendance To Date,נוכחות לתאריך
 DocType: Warranty Claim,Raised By,הועלה על ידי
 DocType: Payment Gateway Account,Payment Account,חשבון תשלומים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,נא לציין את חברה כדי להמשיך
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,שינוי נטו בחשבונות חייבים
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Off המפצה
 DocType: Offer Letter,Accepted,קיבלתי
@@ -1911,11 +1910,11 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,אנא ודא שאתה באמת רוצה למחוק את כל העסקות לחברה זו. נתוני אביך יישארו כפי שהוא. לא ניתן לבטל פעולה זו.
 DocType: Room,Room Number,מספר חדר
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},התייחסות לא חוקית {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) לא יכול להיות גדול יותר מquanitity המתוכנן ({2}) בהפקה להזמין {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{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 +248,Raw Materials cannot be blank.,חומרי גלם לא יכולים להיות ריקים.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,מהיר יומן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","לא ניתן לעדכן מניות, חשבונית מכילה פריט ירידת משלוח."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,מהיר יומן
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,אתה לא יכול לשנות את השיעור אם BOM ציינו agianst כל פריט
 DocType: Employee,Previous Work Experience,ניסיון בעבודה קודם
 DocType: Stock Entry,For Quantity,לכמות
@@ -1927,7 +1926,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,תנאים וConditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,שמו של המכון אשר אתה מגדיר מערכת זו.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","כניסת חשבונאות קפואה עד למועד זה, אף אחד לא יכול לעשות / לשנות כניסה מלבד התפקיד שיפורט להלן."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,אנא שמור את המסמך לפני יצירת לוח זמנים תחזוקה
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,סטטוס פרויקט
 DocType: UOM,Check this to disallow fractions. (for Nos),לבדוק את זה כדי לאסור שברים. (למס)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,הזמנות הייצור הבאות נוצרו:
@@ -1951,7 +1950,7 @@
 DocType: Student,Joining Date,תאריך הצטרפות
 ,Employees working on a holiday,עובד לעבוד בחופשה
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,מארק הווה
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},תאריך התחלת תחזוקה לא יכול להיות לפני מועד אספקה למספר סידורי {0}
 DocType: Production Order,Actual End Date,תאריך סיום בפועל
 DocType: Purchase Invoice,PINV-,PINV-
 DocType: Authorization Rule,Applicable To (Role),כדי ישים (תפקיד)
@@ -1966,7 +1965,7 @@
 DocType: SMS Log,No of Requested SMS,לא של SMS המבוקש
 DocType: Campaign,Campaign-.####,קמפיין -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,הצעדים הבאים
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,נא למלא את הסעיפים המפורטים בשיעורים הטובים ביותר האפשריים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,תאריך סיום חוזה חייב להיות גדול מ תאריך ההצטרפות
 DocType: Delivery Note,DN-,DN-
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,/ סוחר / סוכן / שותפים / משווק עמלת מפיץ הצד שלישי שמוכר את המוצרים עבור חברות בועדה.
@@ -2000,7 +1999,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,כמות Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},רשומות דמי נוצר - {0}
 DocType: Asset Category Account,Asset Category Account,חשבון קטגורית נכסים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},לא יכול לייצר יותר פריט {0} מאשר כמות להזמין מכירות {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,מניית כניסת {0} לא הוגשה
 DocType: Payment Reconciliation,Bank / Cash Account,חשבון בנק / מזומנים
 DocType: Tax Rule,Billing City,עיר חיוב
@@ -2016,7 +2015,7 @@
 DocType: Opportunity,Customer / Lead Name,לקוחות / שם ליד
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,תאריך חיסול לא הוזכר
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,הפקה
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,{0} שורה: תאריך ההתחלה חייב להיות לפני תאריך הסיום
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),"סה""כ (כמות)"
 DocType: Sales Invoice,This Document,מסמך זה
 DocType: Installation Note Item,Installed Qty,כמות מותקנת
@@ -2031,7 +2030,7 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,דווח על בעיה
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,הוצאות שירות
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-מעל
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,# השורה {0}: תנועת היומן {1} אין חשבון {2} או כבר מתאים נגד בשובר אחר
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,# השורה {0}: תנועת היומן {1} אין חשבון {2} או כבר מתאים נגד בשובר אחר
 DocType: Buying Settings,Default Buying Price List,מחיר מחירון קניית ברירת מחדל
 DocType: Process Payroll,Salary Slip Based on Timesheet,תלוש משכורת בהתבסס על גיליון
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,אף עובדים לקריטריונים לעיל נבחרים או תלוש משכורת כבר נוצר
@@ -2054,7 +2053,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},פרופיל גלובלי קופה {0} כבר יצר לחברת {1}
 DocType: Purchase Order,Ref SQ,"נ""צ SQ"
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,להחליף פריט / BOM בכל עצי המוצר
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,מסמך הקבלה יוגש
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,מסמך הקבלה יוגש
 DocType: Purchase Invoice Item,Received Qty,כמות התקבלה
 DocType: Stock Entry Detail,Serial No / Batch,לא / אצווה סידוריים
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,לא שילם ולא נמסר
@@ -2062,7 +2061,7 @@
 DocType: Account,Account Type,סוג החשבון
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,השאר סוג {0} אינו יכולים להיות מועבר-לבצע
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"תחזוקת לוח זמנים לא נוצרו עבור כל הפריטים. אנא לחץ על 'צור לוח זמנים """
 ,To Produce,כדי לייצר
 apps/erpnext/erpnext/config/hr.py +93,Payroll,גִלְיוֹן שָׂכָר
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","לשורה {0} ב {1}. כדי לכלול {2} בשיעור פריט, שורות {3} חייבים להיות כלולות גם"
@@ -2074,7 +2073,7 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,תבנית לנכים אסור להיות תבנית ברירת המחדל
 DocType: Account,Income Account,חשבון הכנסות
 DocType: Payment Request,Amount in customer's currency,הסכום במטבע של הלקוח
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,משלוח
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,משלוח
 DocType: Stock Reconciliation Item,Current Qty,כמות נוכחית
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ראה ""שיעור חומרים הבוסס על"" בסעיף תמחיר"
 DocType: Appraisal Goal,Key Responsibility Area,פינת אחריות מפתח
@@ -2088,16 +2087,16 @@
 DocType: Tax Rule,Shipping Country,מדינה משלוח
 DocType: Upload Attendance,Upload HTML,ההעלאה HTML
 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.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","כלל תמחור נעשה כדי לדרוס מחיר מחירון / להגדיר אחוז הנחה, המבוסס על כמה קריטריונים."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,מחסן ניתן לשנות רק באמצעות צילומים כניסה / תעודת משלוח / קבלת רכישה
 DocType: Employee Education,Class / Percentage,כיתה / אחוז
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ראש אגף השיווק ומכירות
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","אם שלטון תמחור שנבחר הוא עשה עבור 'מחיר', זה יחליף את מחיר מחירון. מחיר כלל תמחור הוא המחיר הסופי, ולכן אין עוד הנחה צריכה להיות מיושמת. מכאן, בעסקות כמו מכירה להזמין, הזמנת רכש וכו ', זה יהיה הביא בשדה' דרג ', ולא בשדה' מחיר מחירון שערי '."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","אם שלטון תמחור שנבחר הוא עשה עבור 'מחיר', זה יחליף את מחיר מחירון. מחיר כלל תמחור הוא המחיר הסופי, ולכן אין עוד הנחה צריכה להיות מיושמת. מכאן, בעסקות כמו מכירה להזמין, הזמנת רכש וכו ', זה יהיה הביא בשדה' דרג ', ולא בשדה' מחיר מחירון שערי '."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,צפייה בלידים לפי סוג התעשייה.
 DocType: Item Supplier,Item Supplier,ספק פריט
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,נא להזין את קוד פריט כדי לקבל אצווה לא
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},אנא בחר ערך עבור {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,כל הכתובות.
 DocType: Company,Stock Settings,הגדרות מניות
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","המיזוג אפשרי רק אם המאפיינים הבאים הם זהים בשני רשומות. האם קבוצה, סוג רוט, חברה"
@@ -2115,7 +2114,7 @@
 DocType: Delivery Note,Required only for sample item.,נדרש רק עבור פריט מדגם.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,כמות בפועל לאחר עסקה
 ,Pending SO Items For Purchase Request,ממתין לSO פריטים לבקשת רכישה
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} מושבתת
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} מושבתת
 DocType: Supplier,Billing Currency,מטבע חיוב
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,גדול במיוחד
@@ -2130,9 +2129,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Large,גדול
 DocType: Homepage Featured Product,Homepage Featured Product,מוצרי דף בית מומלצים
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,שם מחסן חדש
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),סה&quot;כ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),סה&quot;כ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,שטח
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,נא לציין אין ביקורים הנדרשים
 DocType: Stock Settings,Default Valuation Method,שיטת הערכת ברירת מחדל
 DocType: Production Order Operation,Planned Start Time,מתוכנן זמן התחלה
 DocType: Payment Entry Reference,Allocated,הוקצה
@@ -2146,7 +2145,7 @@
 DocType: Price List,Price List Master,מחיר מחירון Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"יכולות להיות מתויגות כל עסקות המכירה מול אנשי מכירות ** ** מרובים, כך שאתה יכול להגדיר ולעקוב אחר מטרות."
 ,S.O. No.,SO מס '
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},אנא ליצור לקוחות מהעופרת {0}
 DocType: Price List,Applicable for Countries,ישים עבור מדינות
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},סטודנט הקבוצה שם הוא חובה בשורת {0}
 DocType: Homepage,Products to be shown on website homepage,מוצרים שיוצגו על בית של אתר
@@ -2173,7 +2172,7 @@
 DocType: Attendance,Leave Type,סוג החופשה
 apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,"חשבון הוצאות / הבדל ({0}) חייב להיות חשבון ""רווח והפסד"""
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,מחסור
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} אינו קשור {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} אינו קשור {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,נוכחות לעובדי {0} כבר מסומנת
 DocType: Packing Slip,If more than one package of the same type (for print),אם חבילה אחד או יותר מאותו הסוג (להדפסה)
 DocType: Warehouse,Parent Warehouse,מחסן הורה
@@ -2189,7 +2188,7 @@
 DocType: Tax Rule,Use for Shopping Cart,השתמש לסל קניות
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},הערך {0} עבור תכונה {1} לא קיים ברשימת פריט תקף תכונה ערכים עבור פריט {2}
 DocType: BOM Item,Scrap %,% גרוטאות
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","תשלום נוסף שיחולק לפי אופן יחסי על כמות פריט או סכום, בהתאם לבחירתך"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","תשלום נוסף שיחולק לפי אופן יחסי על כמות פריט או סכום, בהתאם לבחירתך"
 DocType: Maintenance Visit,Purposes,מטרות
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,פריט אחד atleast יש להזין עם כמות שלילית במסמך התמורה
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","מבצע {0} יותר מכל שעות עבודה זמינות בתחנת העבודה {1}, לשבור את הפעולה לפעולות מרובות"
@@ -2208,22 +2207,22 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ניהול עץ טריטוריה.
 DocType: Journal Entry Account,Sales Invoice,חשבונית מכירות
 DocType: Journal Entry Account,Party Balance,מאזן המפלגה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,אנא בחר החל דיסקונט ב
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,אנא בחר החל דיסקונט ב
 DocType: Company,Default Receivable Account,חשבון חייבים ברירת מחדל
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,צור בנק כניסה לשכר הכולל ששולם לקריטריונים לעיל נבחרים
 DocType: Stock Entry,Material Transfer for Manufacture,העברת חומר לייצור
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,אחוז הנחה יכול להיות מיושם גם נגד מחיר מחירון או לכל רשימת המחיר.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,אחוז הנחה יכול להיות מיושם גם נגד מחיר מחירון או לכל רשימת המחיר.
 DocType: Purchase Invoice,Half-yearly,חצי שנתי
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,כניסה לחשבונאות במלאי
 DocType: Sales Invoice,Sales Team1,Team1 מכירות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,פריט {0} אינו קיים
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,פריט {0} אינו קיים
 DocType: Sales Invoice,Customer Address,כתובת הלקוח
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,שורת {0}: הושלמה הכמות חייבת להיות גדולה מאפס.
 DocType: Purchase Invoice,Apply Additional Discount On,החל נוסף דיסקונט ב
 DocType: Account,Root Type,סוג השורש
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},# השורה {0}: לא יכול לחזור יותר מ {1} לפריט {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,עלילה
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,עלילה
 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),סכום מס לאחר סכום דיסקונט (חברת מטבע)
@@ -2232,12 +2231,12 @@
 DocType: Purchase Invoice,Select Supplier Address,כתובת ספק בחר
 DocType: Purchase Invoice Item,Quality Inspection,איכות פיקוח
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,קטן במיוחד
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,אזהרה: חומר המבוקש כמות הוא פחות מלהזמין כמות מינימאלית
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,חשבון {0} הוא קפוא
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ישות / בת משפטית עם תרשים נפרד של חשבונות השייכים לארגון.
 DocType: Payment Request,Mute Email,דוא&quot;ל השתקה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","מזון, משקאות וטבק"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},יכול רק לבצע את התשלום כנגד סרק {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,שיעור עמלה לא יכול להיות גדול מ -100
 DocType: Stock Entry,Subcontract,בקבלנות משנה
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,נא להזין את {0} הראשון
@@ -2299,7 +2298,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,בחר שנת כספים
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,הזמנה חוזרת רמה
 DocType: Attendance,Attendance Date,תאריך נוכחות
 apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},מחיר הפריט עודכן עבור {0} ב מחירון {1}
@@ -2313,7 +2312,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,כניסה כפולה
 DocType: Program Enrollment Tool,Get Students,קבל סטודנטים
 DocType: Serial No,Under Warranty,במסגרת אחריות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[שגיאה]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[שגיאה]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,במילים יהיו גלוי לאחר שתשמרו את הזמנת המכירות.
 ,Employee Birthday,עובד יום הולדת
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,הגבל Crossed
@@ -2335,7 +2334,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% מחומרים מחויבים נגד הזמנת מכירה זה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,כניסת סגירת תקופה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,מרכז עלות בעסקות קיימות לא ניתן להמיר לקבוצה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},סכום {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},סכום {0} {1} {2} {3}
 DocType: Account,Depreciation,פחת
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ספק (ים)
 DocType: Employee Attendance Tool,Employee Attendance Tool,כלי נוכחות עובדים
@@ -2353,7 +2352,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},מניות יכולות להיות לא מעודכנות נגד קבלת רכישת {0}
 DocType: Supplier,Last Day of the Next Month,היום האחרון של החודש הבא
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","לעזוב לא יכול להיות מוקצה לפני {0}, כאיזון חופשה כבר היה בשיא הקצאת חופשת העתיד יועבר לשאת {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),הערה: תאריך יעד / הפניה עולה ימי אשראי ללקוחות מותר על ידי {0} יום (ים)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,סטודנט המבקש
 DocType: Asset Category Account,Accumulated Depreciation Account,חשבון פחת נצבר
 DocType: Stock Settings,Freeze Stock Entries,ערכי מלאי הקפאה
@@ -2364,7 +2363,7 @@
 ,Stock Analytics,ניתוח מלאי
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,תפעול לא ניתן להשאיר ריק
 DocType: Maintenance Visit Purpose,Against Document Detail No,נגד פרט מסמך לא
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,סוג המפלגה הוא חובה
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,סוג המפלגה הוא חובה
 DocType: Quality Inspection,Outgoing,יוצא
 DocType: Material Request,Requested For,ביקש ל
 DocType: Quotation Item,Against Doctype,נגד Doctype
@@ -2382,7 +2381,7 @@
 DocType: Serial No,Warranty / AMC Details,אחריות / AMC פרטים
 DocType: Journal Entry,User Remark,הערה משתמש
 DocType: Lead,Market Segment,פלח שוק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},הסכום ששולם לא יכול להיות גדול מ מלוא יתרת חוב שלילי {0}
 DocType: Employee Internal Work History,Employee Internal Work History,העובד פנימי היסטוריה עבודה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),"סגירה (ד""ר)"
 DocType: Cheque Print Template,Cheque Size,גודל מחאה
@@ -2395,7 +2394,7 @@
 DocType: Production Planning Tool,Create Material Requests,צור בקשות חומר
 DocType: Employee Education,School/University,בית ספר / אוניברסיטה
 DocType: Payment Request,Reference Details,התייחסות פרטים
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ערך צפוי אחרי החיים השימושיים חייב להיות פחות מ סכום רכישה גרוס
 DocType: Sales Invoice Item,Available Qty at Warehouse,כמות זמינה במחסן
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,סכום חיוב
 DocType: Asset,Double Declining Balance,יתרה זוגית ירידה
@@ -2416,13 +2415,13 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},לא ניתן לשנות את מצב כמו סטודנט {0} הוא מקושר עם יישום סטודנט {1}
 DocType: Asset,Fully Depreciated,לגמרי מופחת
 ,Stock Projected Qty,המניה צפויה כמות
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},לקוח {0} אינו שייכים לפרויקט {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML נוכחות ניכרת
 DocType: Sales Order,Customer's Purchase Order,הלקוח הזמנת הרכש
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,אין ו אצווה סידורי
 DocType: Warranty Claim,From Company,מחברה
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ערך או כמות
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,אנא להגדיר מספר הפחת הוזמן
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ערך או כמות
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,הזמנות הפקות לא ניתן להעלות על:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,דקות
 DocType: Purchase Invoice,Purchase Taxes and Charges,לרכוש מסים והיטלים
@@ -2431,7 +2430,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,מחסן כל
 DocType: Sales Partner,Retailer,הקמעונאית
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,אשראי לחשבון חייב להיות חשבון מאזן
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,כל סוגי הספק
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,כל סוגי הספק
 DocType: Global Defaults,Disable In Words,שבת במילות
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"קוד פריט חובה, כי הפריט לא ממוספר באופן אוטומטי"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},ציטוט {0} לא מסוג {1}
@@ -2483,7 +2482,7 @@
 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,האם בוטל
 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:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","גם אם יש כללי תמחור מרובים עם העדיפות הגבוהה ביותר, סדרי עדיפויות פנימיים אז להלן מיושמות:"
 DocType: Cheque Print Template,Cheque Height,גובה המחאה
 DocType: Supplier,Supplier Details,פרטי ספק
 DocType: Expense Claim,Approval Status,סטטוס אישור
@@ -2493,7 +2492,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,סמן הכל
 DocType: Purchase Order,Recurring Order,להזמין חוזר
 DocType: Company,Default Income Account,חשבון הכנסות ברירת מחדל
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,קבוצת לקוחות / לקוחות
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,קבוצת לקוחות / לקוחות
 DocType: Sales Invoice,Time Sheets,פחי זמנים
 DocType: Payment Gateway Account,Default Payment Request Message,הודעת בקשת תשלום ברירת מחדל
 DocType: Item Group,Check this if you want to show in website,לבדוק את זה אם אתה רוצה להראות באתר
@@ -2510,10 +2509,10 @@
 apps/erpnext/erpnext/controllers/status_updater.py +163,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,תאריך פתיחה
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,נוכחות סומנה בהצלחה.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,נוכחות סומנה בהצלחה.
 DocType: Journal Entry,Remark,הערה
 DocType: Purchase Receipt Item,Rate and Amount,שיעור והסכום
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},סוג חשבון עבור {0} חייב להיות {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},סוג חשבון עבור {0} חייב להיות {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,עלים וחג
 DocType: Sales Order,Not Billed,לא חויב
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,שניהם המחסן חייב להיות שייך לאותה חברה
@@ -2532,7 +2531,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,סטודנט קבוצה
 DocType: Shopping Cart Settings,Quotation Series,סדרת ציטוט
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","פריט קיים באותו שם ({0}), בבקשה לשנות את שם קבוצת פריט או לשנות את שם הפריט"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,אנא בחר לקוח
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,אנא בחר לקוח
 DocType: C-Form,I,אני
 DocType: Company,Asset Depreciation Cost Center,מרכז עלות פחת נכסים
 DocType: Sales Order Item,Sales Order Date,תאריך הזמנת מכירות
@@ -2545,15 +2544,15 @@
 DocType: Payment Entry,Payment References,הפניות תשלום
 DocType: C-Form,C-FORM-,C-טפסים רשמיים
 DocType: Account,Payable,משתלם
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),חייבים ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),חייבים ({0})
 DocType: Pricing Rule,Margin,Margin
 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 +76,Gross Profit %,% רווח גולמי
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,תאריך אישור
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,סכום רכישה גרוס הוא חובה
 DocType: Lead,Address Desc,כתובת יורד
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,המפלגה היא חובה
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,המפלגה היא חובה
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,שם נושא
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast אחד למכור או לקנות יש לבחור
@@ -2589,7 +2588,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,שם חברה לא יכול להיות חברה
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ראשי מכתב לתבניות הדפסה.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,כותרות לתבניות הדפסה למשל פרופורמה חשבונית.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,חיובי סוג הערכת שווי לא יכולים סומן ככלול
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,"אוני 'מישגן שונה עבור פריטים יובילו לערך השגוי (סה""כ) נקי במשקל. ודא שמשקל נטו של כל פריט הוא באותו אוני 'מישגן."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM שערי
@@ -2615,7 +2614,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange רווח / והפסד
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,עובד ונוכחות
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},למטרה צריך להיות אחד {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,מלא את הטופס ולשמור אותו
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,השאר מאזן לפני היישום
@@ -2628,7 +2627,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,סדר מחדש כמות
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,משרות נוכחיות
 DocType: Company,Stock Adjustment Account,חשבון התאמת מלאי
-DocType: Journal Entry,Write Off,לכתוב את
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,לכתוב את
 DocType: Timesheet Detail,Operation ID,מבצע זיהוי
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","משתמש מערכת מזהה (התחברות). אם נקבע, הוא יהפוך לברירת מחדל עבור כל צורות HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: החל מ- {1}
@@ -2639,20 +2638,20 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ספק מספק ללקוח
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (טופס # / כתבה / {0}) אזל מהמלאי
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,התאריך הבא חייב להיות גדול מ תאריך פרסום
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,התפרקות מס הצג
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,התפרקות מס הצג
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},תאריך יעד / הפניה לא יכול להיות אחרי {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,נתוני יבוא ויצוא
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ערכי מניות קיימים נגד מחסן {0}, ולכן אתה לא יכול להקצות מחדש או לשנות אותה"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,אין תלמידים נמצאו
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,אין תלמידים נמצאו
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,תאריך פרסום חשבונית
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,מכירה
 DocType: Sales Invoice,Rounded Total,"סה""כ מעוגל"
 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,מתוך AMC
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,הפוך תחזוקה בקר
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,מספר הפחת הוזמן לא יכול להיות גדול ממספרם הכולל של פחת
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,הפוך תחזוקה בקר
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,אנא צור קשר עם למשתמש שיש לי מכירות Master מנהל {0} תפקיד
 DocType: Company,Default Cash Account,חשבון מזומנים ברירת מחדל
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,אדון חברה (לא לקוח או ספק).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,זה מבוסס על הנוכחות של תלמיד זה
@@ -2693,9 +2692,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,לפני הפיוס
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},כדי {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),מסים והיטלים נוסף (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,שורת מס פריט {0} חייבת להיות חשבון של מס סוג או הכנסה או הוצאה או לחיוב
 DocType: Sales Order,Partly Billed,בחלק שחויב
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,פריט {0} חייב להיות פריט רכוש קבוע
 DocType: Item,Default BOM,BOM ברירת המחדל
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,אנא שם חברה הקלד לאשר
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,"סה""כ מצטיין Amt"
@@ -2703,7 +2702,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},חיוב כולל חייב להיות שווה לסך אשראי. ההבדל הוא {0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,רכב
 DocType: Asset Category Account,Fixed Asset Account,חשבון רכוש קבוע
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,מתעודת משלוח
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,מתעודת משלוח
 DocType: Timesheet Detail,From Time,מזמן
 DocType: Notification Control,Custom Message,הודעה מותאמת אישית
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,בנקאות השקעות
@@ -2714,7 +2713,7 @@
 DocType: Stock Entry,From BOM,מBOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,בסיסי
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,עסקות המניה לפני {0} קפואים
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"אנא לחץ על 'צור לוח זמנים """
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","למשל ק""ג, יחידה, מס, מ '"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,התייחסות לא חובה אם אתה נכנס תאריך ההפניה
 DocType: Bank Reconciliation Detail,Payment Document,מסמך תשלום
@@ -2722,18 +2721,18 @@
 DocType: Salary Slip,Salary Structure,שכר מבנה
 DocType: Account,Bank,בנק
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,חברת תעופה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,חומר נושא
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,חומר נושא
 DocType: Material Request Item,For Warehouse,למחסן
 DocType: Employee,Offer Date,תאריך הצעה
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ציטוטים
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,אתה נמצא במצב לא מקוון. אתה לא תוכל לטעון עד שיש לך רשת.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,אין קבוצות סטודנטים נוצרו.
 DocType: Purchase Invoice Item,Serial No,מספר סידורי
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,נא להזין maintaince פרטים ראשון
 DocType: Purchase Invoice,Print Language,שפת דפס
 DocType: Salary Slip,Total Working Hours,שעות עבודה הכוללות
 DocType: Stock Entry,Including items for sub assemblies,כולל פריטים למכלולים תת
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,זן הערך חייב להיות חיובי
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,זן הערך חייב להיות חיובי
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,כל השטחים
 DocType: Purchase Invoice,Items,פריטים
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,סטודנטים כבר נרשמו.
@@ -2749,13 +2748,12 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ברירת מחדל של יחידת מדידה ולריאנט &#39;{0}&#39; חייבת להיות זהה בתבנית &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,חישוב המבוסס על
 DocType: Delivery Note Item,From Warehouse,ממחסן
 DocType: Assessment Plan,Supervisor Name,המפקח שם
 DocType: Purchase Taxes and Charges,Valuation and Total,"הערכת שווי וסה""כ"
 DocType: Tax Rule,Shipping City,משלוח עיר
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"פריט זה הנו נגזר של {0} (תבנית). תכונות תועתק על מהתבנית אלא אם כן ""לא העתק 'מוגדרת"
 DocType: Notification Control,Customize the Notification,התאמה אישית של ההודעה
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,תזרים מזומנים מפעילות שוטף
 DocType: Sales Invoice,Shipping Rule,כלל משלוח
@@ -2772,8 +2770,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},אין ברירת מחדל BOM קיימת עבור פריט {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,אנא בחר תחילה תאריך פרסום
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,פתיחת תאריך צריכה להיות לפני סגירת תאריך
 DocType: Leave Control Panel,Carry Forward,לְהַעֲבִיר הָלְאָה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,מרכז עלות בעסקות קיימות לא ניתן להמיר לדג'ר
 DocType: Department,Days for which Holidays are blocked for this department.,ימים בי החגים חסומים למחלקה זו.
@@ -2782,7 +2780,7 @@
 DocType: Issue,Raised By (Email),"הועלה על ידי (דוא""ל)"
 DocType: Mode of Payment,General,כללי
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,צרף מכתבים
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"לא ניתן לנכות כאשר לקטגוריה 'הערכה' או 'הערכה וסה""כ'"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"לא ניתן לנכות כאשר לקטגוריה 'הערכה' או 'הערכה וסה""כ'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","רשימת ראשי המס שלך (למשל מע&quot;מ, מכס וכו &#39;, הם צריכים להיות שמות ייחודיים) ושיעורי הסטנדרטים שלהם. זה יהיה ליצור תבנית סטנדרטית, שבו אתה יכול לערוך ולהוסיף עוד מאוחר יותר."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},מס 'סידורי הנדרש לפריט מספר סידורי {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,תשלומי התאמה עם חשבוניות
@@ -2807,7 +2805,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,לא ידוע
 DocType: Shipping Rule,Shipping Rule Conditions,משלוח תנאי Rule
 DocType: BOM Replace Tool,The new BOM after replacement,BOM החדש לאחר החלפה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,הסכום שהתקבל
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","צור עבור מלוא הכמות, התעלמות כמות כבר על סדר"
 DocType: Account,Tax,מס
@@ -2817,7 +2815,7 @@
 DocType: C-Form,Invoices,חשבוניות
 DocType: Job Opening,Job Title,כותרת עבודה
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,גְרַם
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,כמות לייצור חייבת להיות גדולה מ 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,"בקר בדו""ח לשיחת תחזוקה."
 DocType: Stock Entry,Update Rate and Availability,עדכון תעריף וזמינות
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,אחוז מותר לך לקבל או למסור יותר נגד כל הכמות המוזמנת. לדוגמא: אם יש לך הורה 100 יחידות. והפרשה שלך הוא 10% אז אתה רשאי לקבל 110 יחידות.
@@ -2825,17 +2823,17 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},חשבון הוצאות הוא חובה עבור פריט {0}
 DocType: BOM,Website Description,תיאור אתר
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,שינוי נטו בהון עצמי
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,אנא בטל חשבונית רכישת {0} ראשון
 DocType: Serial No,AMC Expiry Date,תאריך תפוגה AMC
 ,Sales Register,מכירות הרשמה
 DocType: Quotation,Quotation Lost Reason,סיבה אבודה ציטוט
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,נבחר את הדומיין שלך
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},התייחסות עסקה לא {0} מתאריך {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,אין שום דבר כדי לערוך.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,סיכום לחודש זה ופעילויות תלויות ועומדות
 DocType: Customer Group,Customer Group Name,שם קבוצת הלקוחות
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,דוח על תזרימי המזומנים
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},אנא הסר חשבונית זו {0} מC-טופס {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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,תכונות
@@ -2862,18 +2860,18 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',שורה {0} החשבון # צריך להיות מסוג &#39;קבוע נכסים&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,מתוך כמות
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,כללים לחישוב סכום משלוח למכירה
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,סדרה היא חובה
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,סדרה היא חובה
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,שירותים פיננסיים
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,סוגי פעילויות יומני זמן
 DocType: Tax Rule,Sales,מכירות
 DocType: Stock Entry Detail,Basic Amount,סכום בסיסי
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},מחסן נדרש לפריט המניה {0}
 DocType: Leave Allocation,Unused leaves,עלים שאינם בשימוש
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,מדינת חיוב
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,העברה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} אינו משויך לחשבון המפלגה {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} אינו משויך לחשבון המפלגה {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),תביא BOM התפוצץ (כולל תת מכלולים)
 DocType: Authorization Rule,Applicable To (Employee),כדי ישים (עובד)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,תאריך היעד הוא חובה
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,תוספת לתכונה {0} לא יכולה להיות 0
@@ -2883,12 +2881,12 @@
 DocType: Supplier,Contact HTML,צור קשר עם HTML
 ,Inactive Customers,לקוחות לא פעילים
 DocType: Landed Cost Voucher,Purchase Receipts,תקבולי רכישה
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,איך תמחור כלל מיושם?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,איך תמחור כלל מיושם?
 DocType: Stock Entry,Delivery Note No,תעודת משלוח לא
 DocType: Cheque Print Template,Message to show,הודעה להראות
 DocType: Company,Retail,Retail
 DocType: Attendance,Absent,נעדר
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle מוצר
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle מוצר
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},שורת {0}: התייחסות לא חוקית {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,לרכוש תבנית מסים והיטלים
 DocType: Upload Attendance,Download Template,תבנית להורדה
@@ -2898,7 +2896,7 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,קוד פריט חומר הגלם
 DocType: Journal Entry,Write Off Based On,לכתוב את מבוסס על
 DocType: Stock Settings,Show Barcode Field,הצג ברקוד שדה
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,שלח הודעות דוא&quot;ל ספק
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,שיא התקנה למס 'סידורי
 DocType: Timesheet,Employee Detail,פרט לעובדים
 apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,היום של התאריך הבא חזרו על יום בחודש חייב להיות שווה
@@ -2922,7 +2920,7 @@
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,לא נמצא רשומה
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,עלות לגרוטאות נכסים
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: מרכז העלות הוא חובה עבור פריט {2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,קבל פריטים מחבילת מוצרים
 DocType: Asset,Straight Line,קו ישר
 DocType: Project User,Project User,משתמש פרויקט
 DocType: GL Entry,Is Advance,האם Advance
@@ -2977,7 +2975,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,תאריך המחאה
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},חשבון {0}: הורה חשבון {1} אינו שייך לחברה: {2}
 DocType: Program Enrollment Tool,Student Applicants,מועמדים סטודנטים
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,בהצלחה נמחק כל העסקות הקשורות לחברה זו!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,כבתאריך
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,תאריך הרשמה
@@ -3002,7 +3000,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","סוג של עלים כמו מזדמן, חולה וכו '"
 DocType: Email Digest,Send regular summary reports via Email.,"שלח דוחות סיכום קבועים באמצעות דוא""ל."
 DocType: Payment Entry,PE-,פ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},אנא להגדיר חשבון ברירת מחדל סוג תביעת הוצאות {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},אנא להגדיר חשבון ברירת מחדל סוג תביעת הוצאות {0}
 DocType: Assessment Result,Student Name,שם תלמיד
 DocType: Brand,Item Manager,מנהל פריט
 DocType: Buying Settings,Default Supplier Type,סוג ספק ברירת מחדל
@@ -3020,6 +3018,7 @@
 DocType: Purchase Invoice,Taxes and Charges Added,מסים והיטלים נוסף
 ,Sales Funnel,משפך מכירות
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,הקיצור הוא חובה
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,סל
 ,Qty to Transfer,כמות להעביר
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ציטוטים להובלות או לקוחות.
 DocType: Stock Settings,Role Allowed to edit frozen stock,תפקיד מחמד לערוך המניה קפוא
@@ -3046,11 +3045,11 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,פריט Detail המס וייז
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,קיצור המכון
 ,Item-wise Price List Rate,שערי רשימת פריט המחיר חכם
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,הצעת מחיר של ספק
 DocType: Quotation,In Words will be visible once you save the Quotation.,במילים יהיו גלוי לאחר שתשמרו את הצעת המחיר.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,לגבות דמי
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ברקוד {0} כבר השתמש בפריט {1}
 DocType: Lead,Add to calendar on this date,הוסף ללוח שנה בתאריך זה
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,כללים להוספת עלויות משלוח.
 DocType: Item,Opening Stock,מאגר פתיחה
@@ -3066,8 +3065,8 @@
 Updated via 'Time Log'","בדקות עדכון באמצעות 'יומן זמן """
 DocType: Customer,From Lead,מליד
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,הזמנות שוחררו לייצור.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,בחר שנת כספים ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,בחר שנת כספים ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,פרופיל קופה הנדרש כדי להפוך את קופה הכניסה
 DocType: Program Enrollment Tool,Enroll Students,רשם תלמידים
 DocType: Hub Settings,Name Token,שם אסימון
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,מכירה סטנדרטית
@@ -3077,7 +3076,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} נגד מכירות חשבונית {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,שם פרויקט
-DocType: Supplier,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
+DocType: Customer,Mention if non-standard receivable account,להזכיר אם חשבון חייבים שאינם סטנדרטי
 DocType: Journal Entry Account,If Income or Expense,אם הכנסה או הוצאה
 DocType: Production Order,Required Items,פריטים דרושים
 DocType: Stock Ledger Entry,Stock Value Difference,הבדל ערך המניה
@@ -3098,7 +3097,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,קבוצה חכמה פריט יעדים שנקבעו לאיש מכירות זה.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],מניות הקפאת Older Than [ימים]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,# השורה {0}: לנכסי לקוחות חובה לרכוש נכס קבוע / מכירה
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","אם שניים או יותר כללי תמחור נמצאים בהתבסס על התנאים לעיל, עדיפות מיושם. עדיפות היא מספר בין 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.,לאפשר למשתמשים הבאים לאשר בקשות לצאת לימי גוש.
@@ -3117,7 +3116,7 @@
 DocType: Item Attribute,From Range,מטווח
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,פריט {0} התעלם כן הוא לא פריט מניות
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","שלא להחיל כלל תמחור בעסקה מסוימת, צריכים להיות נכה כל כללי התמחור הישימים."
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,מקומות תעסוקה
 ,Sales Order Trends,מגמות להזמין מכירות
 DocType: Employee,Held On,במוחזק
@@ -3127,7 +3126,7 @@
 DocType: Stock Entry Detail,Additional Cost,עלות נוספת
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,תאריך הפיננסי סוף השנה
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","לא לסנן מבוססים על השובר לא, אם מקובצים לפי שובר"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,הפוך הצעת מחיר של ספק
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,הפוך הצעת מחיר של ספק
 DocType: Quality Inspection,Incoming,נכנסים
 DocType: BOM,Materials Required (Exploded),חומרים דרושים (התפוצצו)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","הוסף משתמשים לארגון שלך, מלבד את עצמך"
@@ -3176,9 +3175,9 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,זהות לקוח
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,מארק בהעדר
 DocType: Journal Entry Account,Exchange Rate,שער חליפין
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,להזמין מכירות {0} לא יוגש
 DocType: Homepage,Tag Line,קו תג
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,הוספת פריטים מ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,הוספת פריטים מ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},מחסן {0}: הורה חשבון {1} לא Bolong לחברת {2}
 DocType: Cheque Print Template,Regular,רגיל
 DocType: BOM,Last Purchase Rate,שער רכישה אחרונה
@@ -3189,7 +3188,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,מחסן {0} אינו קיים
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,הירשם לHub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,אחוזים בחתך חודשיים
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,הפריט שנבחר לא יכול להיות אצווה
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% מחומרים מועברים נגד תעודת משלוח זו
 DocType: Project,Customer Details,פרטי לקוחות
 DocType: Employee,Reports to,דיווחים ל
@@ -3200,7 +3199,7 @@
 DocType: Item Variant,Item Variant,פריט Variant
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,ניהול איכות
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,פריט {0} הושבה
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,פריט {0} הושבה
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},נא להזין את הכמות לפריט {0}
 DocType: Employee External Work History,Employee External Work History,העובד חיצוני היסטוריה עבודה
 DocType: Tax Rule,Purchase,רכישה
@@ -3221,7 +3220,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,מזהה אימייל סטודנטים
 DocType: Employee,Notice (days),הודעה (ימים)
 DocType: Tax Rule,Sales Tax Template,תבנית מס מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,בחר פריטים כדי לשמור את החשבונית
 DocType: Employee,Encashment Date,תאריך encashment
 DocType: Account,Stock Adjustment,התאמת מלאי
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},עלות פעילות ברירת המחדל קיימת לסוג פעילות - {0}
@@ -3241,7 +3240,7 @@
 DocType: Item Variant Attribute,Attribute,תכונה
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,נא לציין מ / אל נעים
 DocType: Serial No,Under AMC,תחת AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,שיעור הערכת שווי פריט מחושב מחדש שוקל סכום שובר עלות נחת
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,שיעור הערכת שווי פריט מחושב מחדש שוקל סכום שובר עלות נחת
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,הגדרות ברירת מחדל עבור עסקות מכירה.
 DocType: BOM Replace Tool,Current BOM,BOM הנוכחי
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,להוסיף מספר סידורי
@@ -3263,7 +3262,7 @@
 DocType: Account,Receivable,חייבים
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,# השורה {0}: לא הורשו לשנות ספק כהזמנת רכש כבר קיימת
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,תפקיד שמותר להגיש עסקות חריגות ממסגרות אשראי שנקבע.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","סינכרון נתוני אב, זה עלול לקחת קצת זמן"
 DocType: Item,Material Issue,נושא מהותי
 DocType: Hub Settings,Seller Description,תיאור מוכר
 DocType: Employee Education,Qualification,הסמכה
@@ -3271,7 +3270,7 @@
 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,Motion Picture ווידאו
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,הורה
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},פתיחת פחת שנצבר חייבת להיות פחות מ שווה ל {0}
 DocType: Warehouse,Warehouse Name,שם מחסן
 DocType: Naming Series,Select Transaction,עסקה בחר
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,נא להזין את אישור תפקיד או אישור משתמש
@@ -3284,7 +3283,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,לא ניתן לבטל עקב נתון מלאי {0}
 DocType: Purchase Invoice,In Words,במילים
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,היום הוא {0} 's יום הולדת!
 DocType: Production Planning Tool,Material Request For Warehouse,בקשת חומר למחסן
@@ -3294,14 +3293,14 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,השנה שלך הפיננסית מתחילה ב
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,פחת נכסים יתרה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},סכום {0} {1} הועברה מבית {2} {3}
 DocType: Sales Invoice,Get Advances Received,קבלו התקבלו מקדמות
 DocType: Email Digest,Add/Remove Recipients,הוספה / הסרה של מקבלי
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},עסקה לא אפשרה נגד הפקה הפסיקה להזמין {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","כדי להגדיר שנת כספים זו כברירת מחדל, לחץ על 'קבע כברירת מחדל'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,לְהִצְטַרֵף
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,מחסור כמות
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,גרסת פריט {0} קיימת עימן תכונות
 DocType: Salary Slip,Salary Slip,שכר Slip
 DocType: Pricing Rule,Margin Rate or Amount,שיעור או סכום שולי
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,'עד תאריך' נדרש
@@ -3313,14 +3312,14 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","כאשר כל אחת מהעסקאות בדקו ""הוגש"", מוקפץ הדוא""ל נפתח באופן אוטומטי לשלוח דואר אלקטרוני לקשורים ""צור קשר"" בעסקה ש, עם העסקה כקובץ מצורף. המשתמשים יכולים או לא יכולים לשלוח הדואר האלקטרוני."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,הגדרות גלובליות
 DocType: Employee Education,Employee Education,חינוך לעובדים
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,הוא צריך את זה כדי להביא פרטי פריט.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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,פרטי צוות מכירות
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,למחוק לצמיתות?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,למחוק לצמיתות?
 DocType: Expense Claim,Total Claimed Amount,"סכום הנתבע סה""כ"
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,הזדמנויות פוטנציאליות למכירה.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},לא חוקי {0}
@@ -3330,7 +3329,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,חנויות כלבו
 DocType: Warehouse,PIN,פִּין
 DocType: Sales Invoice,Base Change Amount (Company Currency),שנת סכום בסיס (מטבע חברה)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,אין רישומים חשבונאיים למחסנים הבאים
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,שמור את המסמך ראשון.
 DocType: Account,Chargeable,נִטעָן
 DocType: Company,Change Abbreviation,קיצור שינוי
@@ -3355,7 +3354,7 @@
 DocType: Item Attribute Value,Attribute Value,תכונה ערך
 ,Itemwise Recommended Reorder Level,Itemwise מומלץ להזמנה חוזרת רמה
 DocType: Salary Detail,Salary Detail,פרטי שכר
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,אנא בחר {0} ראשון
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,אנא בחר {0} ראשון
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,אצווה {0} של פריט {1} פג.
 DocType: Sales Invoice,Commission,הוועדה
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,זמן גיליון לייצור.
@@ -3367,27 +3366,26 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`מניות הקפאה ישן יותר Than` צריך להיות קטן יותר מאשר% d ימים.
 DocType: Tax Rule,Purchase Tax Template,מס רכישת תבנית
 ,Project wise Stock Tracking,מעקב מלאי חכם פרויקט
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},לוח זמנים תחזוקה {0} קיים נגד {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),כמות בפועל (במקור / יעד)
 DocType: Item Customer Detail,Ref Code,"נ""צ קוד"
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,רשומות עובדים.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,אנא קבע את תאריך פחת הבא
 DocType: HR Settings,Payroll Settings,הגדרות שכר
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,התאם חשבוניות ותשלומים הלא צמוד.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,להזמין מקום
 DocType: Email Digest,New Purchase Orders,הזמנות רכש חדשות
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,שורש לא יכול להיות מרכז עלות הורה
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,מותג בחר ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,מותג בחר ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,פחת שנצבר כמו על
 DocType: Sales Invoice,C-Form Applicable,C-טופס ישים
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},מבצע זמן חייב להיות גדול מ 0 למבצע {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,המחסן הוא חובה
 DocType: Supplier,Address and Contacts,כתובת ומגעים
 DocType: UOM Conversion Detail,UOM Conversion Detail,פרט של אוני 'מישגן ההמרה
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),שמור את זה באינטרנט 900px הידידותי (w) על ידי 100px (ח)
 DocType: Program,Program Abbreviation,קיצור התוכנית
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,להזמין ייצור לא יכול להיות שהועלה נגד תבנית פריט
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,חיובים מתעדכנות בקבלת רכישה כנגד כל פריט
 DocType: Warranty Claim,Resolved By,נפתר על ידי
 DocType: Bank Guarantee,Start Date,תאריך ההתחלה
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,להקצות עלים לתקופה.
@@ -3399,7 +3397,7 @@
 DocType: Item,Average time taken by the supplier to deliver,הזמן הממוצע שנלקח על ידי הספק לספק
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,שעות
 DocType: Project,Expected Start Date,תאריך התחלה צפוי
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,הסר פריט אם חיובים אינם ישימים לפריט ש
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,עסקת מטבע חייב להיות זהה לתשלום במטבע Gateway
 DocType: Payment Entry,Receive,קבל
@@ -3409,17 +3407,17 @@
 DocType: Workstation,Operating Costs,עלויות תפעול
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,פעולה אם שנצבר חודשי תקציב חריג
 DocType: Purchase Invoice,Submit on creation,שלח על יצירה
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},מטבע עבור {0} חייב להיות {1}
 DocType: Asset,Disposal Date,תאריך סילוק
 DocType: Employee Leave Approver,Employee Leave Approver,עובד חופשה מאשר
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},שורת {0}: כניסת סידור מחדש כבר קיימת למחסן זה {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","לא יכול להכריז על שאבד כ, כי הצעת מחיר כבר עשתה."
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ייצור להזמין {0} יש להגיש
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},אנא בחר תאריך התחלה ותאריך סיום לפריט {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},הקורס הוא חובה בשורת {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,עד כה לא יכול להיות לפני מהמועד
 DocType: Supplier Quotation Item,Prevdoc DocType,DOCTYPE Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,להוסיף מחירים / עריכה
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,להוסיף מחירים / עריכה
 DocType: Cheque Print Template,Cheque Print Template,תבנית הדפסת המחאה
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,תרשים של מרכזי עלות
 ,Requested Items To Be Ordered,פריטים מבוקשים כדי להיות הורה
@@ -3429,7 +3427,7 @@
 ,Ordered Items To Be Delivered,פריטים הורה שיימסרו
 DocType: Account,Income,הכנסה
 DocType: Industry Type,Industry Type,סוג התעשייה
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,משהו השתבש!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,משהו השתבש!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,אזהרה: יישום השאר מכיל תאריכי הבלוק הבאים
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,מכירות חשבונית {0} כבר הוגשה
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,שנת הכספים {0} לא קיים
@@ -3455,16 +3453,16 @@
 DocType: Student Group Creation Tool,Student Group Creation Tool,כלי יצירת סטודנט קבוצה
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},"weightage סה""כ הוקצה צריך להיות 100%. זה {0}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,הספקים שלך
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,לא ניתן להגדיר כאבודים כלהזמין מכירות נעשה.
 DocType: Request for Quotation Item,Supplier Part No,אין ספק חלק
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,התקבל מ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,התקבל מ
 DocType: Lead,Converted,המרה
 DocType: Item,Has Serial No,יש מספר סידורי
 DocType: Employee,Date of Issue,מועד ההנפקה
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: החל מ- {0} עבור {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},# השורה {0}: ספק הוגדר לפריט {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,שורה {0}: שעות הערך חייב להיות גדול מאפס.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,לא ניתן למצוא תמונה באתר האינטרנט {0} המצורף לפריט {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,רשימת פריט זה במספר קבוצות באתר.
@@ -3473,11 +3471,11 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,אתה לא רשאי לקבוע ערך קפוא
 DocType: Payment Reconciliation,Get Unreconciled Entries,קבל ערכים לא מותאמים
 DocType: Payment Reconciliation,From Invoice Date,מתאריך החשבונית
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,מטבע חיוב חייב להיות שווה מטבע של או מטבע או צד חשבון comapany מחדל
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,מה זה עושה?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,למחסן
 ,Average Commission Rate,שערי העמלה הממוצעת
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""יש מספר סידורי 'לא יכול להיות' כן 'ללא מוחזק במלאי פריט"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,נוכחות לא יכולה להיות מסומנת עבור תאריכים עתידיים
 DocType: Pricing Rule,Pricing Rule Help,עזרה כלל תמחור
 DocType: Purchase Taxes and Charges,Account Head,חשבון ראש
@@ -3490,7 +3488,7 @@
 DocType: Item,Customer Code,קוד לקוח
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},תזכורת יום הולדת עבור {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ימים מאז הזמנה אחרונה
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,חיוב החשבון חייב להיות חשבון מאזן
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,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,נכסים במלאי
@@ -3503,9 +3501,9 @@
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,סגירת חשבון {0} חייבת להיות אחריות / הון עצמי סוג
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},תלוש משכורת של עובד {0} כבר נוצר עבור גיליון זמן {1}
 DocType: Sales Order Item,Ordered Qty,כמות הורה
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,פריט {0} הוא נכים
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,פריט {0} הוא נכים
 DocType: Stock Settings,Stock Frozen Upto,המניה קפואה Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM אינו מכיל כל פריט במלאי
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},תקופה ומתקופה לתאריכי חובה עבור חוזר {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,פעילות פרויקט / משימה.
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,צור תלושי שכר
@@ -3513,7 +3511,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,דיסקונט חייב להיות פחות מ -100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,שער הרכישה האחרונה לא נמצא
 DocType: Purchase Invoice,Write Off Amount (Company Currency),לכתוב את הסכום (חברת מטבע)
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,# השורה {0}: אנא הגדר כמות הזמנה חוזרת
 DocType: Fees,Program Enrollment,הרשמה לתכנית
 DocType: Landed Cost Voucher,Landed Cost Voucher,שובר עלות נחת
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},אנא הגדר {0}
@@ -3532,7 +3530,7 @@
 DocType: Maintenance Visit,Maintenance Date,תאריך תחזוקה
 DocType: Purchase Invoice Item,Rejected Serial No,מספר סידורי שנדחו
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,תאריך התחלת שנה או תאריך סיום חופף עם {0}. כדי למנוע נא לקבוע חברה
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},תאריך ההתחלה צריכה להיות פחות מ תאריך סיום לפריט {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,נוכחות העלאה
@@ -3638,13 +3636,13 @@
 DocType: Delivery Note Item,Against Sales Invoice,נגד חשבונית מכירות
 DocType: Bin,Reserved Qty for Production,שמורות כמות עבור הפקה
 DocType: Asset,Frequency of Depreciation (Months),תדירות הפחת (חודשים)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,חשבון אשראי
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,חשבון אשראי
 DocType: Landed Cost Item,Landed Cost Item,פריט עלות נחת
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,הצג אפס ערכים
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,כמות של פריט המתקבלת לאחר ייצור / אריזה מחדש מכמויות מסוימות של חומרי גלם
 DocType: Payment Reconciliation,Receivable / Payable Account,חשבון לקבל / לשלם
 DocType: Delivery Note Item,Against Sales Order Item,נגד פריט להזמין מכירות
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ציין מאפיין ערך עבור תכונת {0}
 DocType: Item,Default Warehouse,מחסן ברירת מחדל
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},תקציב לא ניתן להקצות נגד קבוצת חשבון {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,נא להזין מרכז עלות הורה
@@ -3676,7 +3674,7 @@
 DocType: Opportunity Item,Basic Rate,שיעור בסיסי
 DocType: GL Entry,Credit Amount,סכום אשראי
 DocType: Cheque Print Template,Signatory Position,תפקיד החותם
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,קבע כאבוד
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,קבע כאבוד
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,הערה קבלת תשלום
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,זה מבוסס על עסקאות מול לקוח זה. ראה את ציר הזמן מתחת לפרטים
 DocType: Supplier,Credit Days Based On,ימי אשראי לפי
@@ -3688,10 +3686,10 @@
 ,Items To Be Requested,פריטים להידרש
 DocType: Purchase Order,Get Last Purchase Rate,קבל אחרון תעריף רכישה
 DocType: Company,Company Info,מידע על חברה
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,בחר או הוסף לקוח חדש
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,בחר או הוסף לקוח חדש
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),יישום של קרנות (נכסים)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,זה מבוסס על הנוכחות של העובד
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,חשבון חיוב
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,חשבון חיוב
 DocType: Fiscal Year,Year Start Date,תאריך התחלת שנה
 DocType: Attendance,Employee Name,שם עובד
 DocType: Sales Invoice,Rounded Total (Company Currency),"סה""כ מעוגל (חברת מטבע)"
@@ -3705,7 +3703,7 @@
 DocType: Production Order,Manufactured Qty,כמות שיוצרה
 DocType: Purchase Receipt Item,Accepted Quantity,כמות מקובלת
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},אנא להגדיר ברירת מחדל Holiday רשימה עבור שכיר {0} או החברה {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} לא קיים
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} לא קיים
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,הצעות חוק שהועלו ללקוחות.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,פרויקט זיהוי
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},שורה לא {0}: הסכום אינו יכול להיות גדול מהסכום ממתין נגד תביעת {1} הוצאות. הסכום בהמתנת {2}
@@ -3714,7 +3712,7 @@
 DocType: Quality Inspection Reading,Reading 3,רידינג 3
 ,Hub,רכזת
 DocType: GL Entry,Voucher Type,סוג שובר
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,מחיר המחירון לא נמצא או נכים
 DocType: Employee Loan Application,Approved,אושר
 DocType: Pricing Rule,Price,מחיר
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',עובד הקלה על {0} חייב להיות מוגדרים כ'שמאל '
@@ -3729,7 +3727,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},שורה {0}: מסיבה / חשבון אינו תואם עם {1} / {2} {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,נא להזין את חשבון הוצאות
 DocType: Account,Stock,מלאי
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","# השורה {0}: Reference סוג המסמך חייב להיות אחד הזמנת רכש, חשבונית רכישה או תנועת יומן"
 DocType: Employee,Current Address,כתובת נוכחית
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","אם פריט הנו נגזר של פריט נוסף לאחר מכן תיאור, תמונה, תמחור, וכו 'ייקבעו מסים מהתבנית אלא אם צוין במפורש"
 DocType: Serial No,Purchase / Manufacture Details,רכישה / פרטי ייצור
@@ -3753,7 +3751,7 @@
 DocType: Hub Settings,Hub Settings,הגדרות Hub
 DocType: Project,Gross Margin %,% שיעור רווח גולמי
 DocType: BOM,With Operations,עם מבצעים
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,רישומים חשבונאיים כבר נעשו במטבע {0} לחברת {1}. אנא בחר חשבון לקבל או לשלם במטבע {0}.
 DocType: Asset,Is Existing Asset,האם קיימים נכסים
 ,Monthly Salary Register,חודשי שכר הרשמה
 DocType: Warranty Claim,If different than customer address,אם שונה מכתובת הלקוח
@@ -3771,7 +3769,7 @@
 DocType: Assessment Plan,Room,חֶדֶר
 DocType: Purchase Order,Advance Paid,מראש בתשלום
 DocType: Item,Item Tax,מס פריט
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,חומר לספקים
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,חומר לספקים
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,בלו חשבונית
 DocType: Expense Claim,Employees Email Id,"דוא""ל עובדי זיהוי"
 DocType: Employee Attendance Tool,Marked Attendance,נוכחות בולטת
@@ -3797,9 +3795,9 @@
 DocType: Item Attribute,Numeric Values,ערכים מספריים
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,צרף לוגו
 DocType: Customer,Commission Rate,הוועדה שערי
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,הפוך Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,הפוך Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,יישומי חופשת בלוק על ידי מחלקה.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",סוג התשלום חייב להיות אחד וקבל שכר וטובות העברה פנימית
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,עגלה ריקה
 DocType: Production Order,Actual Operating Cost,עלות הפעלה בפועל
@@ -3823,14 +3821,14 @@
 DocType: Batch,Expiry Date,תַאֲרִיך תְפוּגָה
 ,Supplier Addresses and Contacts,כתובות ספק ומגעים
 ,accounts-browser,חשבונות-דפדפן
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,אנא בחר תחילה קטגוריה
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,אנא בחר תחילה קטגוריה
 apps/erpnext/erpnext/config/projects.py +13,Project master.,אדון פרויקט.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","כדי לאפשר יתר החיוב או יתר ההזמנה, לעדכן &quot;קצבה&quot; במלאי הגדרות או הפריט."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,לא מראה שום סימן כמו $$ וכו 'הבא למטבעות.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(חצי יום)
 DocType: Supplier,Credit Days,ימי אשראי
 DocType: Leave Type,Is Carry Forward,האם להמשיך קדימה
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,קבל פריטים מBOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,קבל פריטים מBOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,להוביל ימי זמן
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},# שורה {0}: פרסום תאריך חייב להיות זהה לתאריך הרכישה {1} של נכס {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,נא להזין הזמנות ומכירות בטבלה לעיל
diff --git a/erpnext/translations/hi.csv b/erpnext/translations/hi.csv
index 1070da4..a774eb2 100644
--- a/erpnext/translations/hi.csv
+++ b/erpnext/translations/hi.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,किराये पर
 DocType: Purchase Order,PO-,पुलिस
 DocType: POS Profile,Applicable for User,उपयोगकर्ता के लिए लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","रूका उत्पादन आदेश रद्द नहीं किया जा सकता, रद्द करने के लिए पहली बार इसे आगे बढ़ाना"
 DocType: Vehicle Service,Mileage,लाभ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,आप वास्तव में इस संपत्ति स्क्रैप करना चाहते हैं?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,चयन डिफ़ॉल्ट प्रदायक
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,चयन डिफ़ॉल्ट प्रदायक
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},मुद्रा मूल्य सूची के लिए आवश्यक है {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* लेनदेन में गणना की जाएगी.
 DocType: Purchase Order,Customer Contact,ग्राहक से संपर्क
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),बकाया {0} शून्य से भी कम नहीं किया जा सकता है के लिए ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 मिनट चूक
 DocType: Leave Type,Leave Type Name,प्रकार का नाम छोड़ दो
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,खुले शो
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुले शो
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,सीरीज सफलतापूर्वक अपडेट
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेक आउट
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural जर्नल प्रविष्टि के लिए प्रस्तुत
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,बैच मद समाप्ति की स्थिति
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,बैंक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भुगतान खाता का तरीका
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,दिखाएँ वेरिएंट
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,दिखाएँ वेरिएंट
 DocType: Academic Term,Academic Term,शैक्षणिक अवधि
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,सामग्री
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,मात्रा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,मात्रा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,खातों की तालिका खाली नहीं हो सकता।
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ऋण (देनदारियों)
 DocType: Employee Education,Year of Passing,पासिंग का वर्ष
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","संदर्भ:% s, मद कोड:% s और ग्राहक:% s"
 DocType: Item,Country of Origin,उद्गम देश
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,स्टॉक में
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,खुले मामले
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,स्वास्थ्य देखभाल
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भुगतान में देरी (दिन)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा व्यय
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,बीजक
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},सीरियल नंबर: {0} पहले से ही बिक्री चालान में संदर्भित है: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,बीजक
 DocType: Maintenance Schedule Item,Periodicity,आवधिकता
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,वित्त वर्ष {0} की आवश्यकता है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,उम्मीद वितरण तिथि से पहले बिक्री आदेश दिनांक होना है
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दो कॉलम, पुराने नाम के लिए एक और नए नाम के लिए एक साथ .csv फ़ाइल संलग्न करें"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} किसी भी सक्रिय वित्त वर्ष में नहीं है।
 DocType: Packed Item,Parent Detail docname,माता - पिता विस्तार docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, मद कोड: {1} और ग्राहक: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,किलो
 DocType: Student Log,Log,लॉग
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,एक नौकरी के लिए खोलना.
 DocType: Item Attribute,Increment,वेतन वृद्धि
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,गोदाम का चयन करें ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,गोदाम का चयन करें ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,विज्ञापन
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,एक ही कंपनी के एक से अधिक बार दर्ज किया जाता है
 DocType: Employee,Married,विवाहित
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},अनुमति नहीं {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,से आइटम प्राप्त
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},अनुमति नहीं {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},शेयर वितरण नोट के खिलाफ अद्यतन नहीं किया जा सकता {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पाद {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोई आइटम सूचीबद्ध नहीं
 DocType: Payment Reconciliation,Reconcile,समाधान करना
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराना
 DocType: Quality Inspection Reading,Reading 1,1 पढ़ना
 DocType: Process Payroll,Make Bank Entry,बैंक एंट्री बनाओ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेंशन फंड
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,अगली मूल्यह्रास की तारीख से पहले खरीद की तिथि नहीं किया जा सकता
 DocType: SMS Center,All Sales Person,सभी बिक्री व्यक्ति
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** अगर आप अपने व्यवसाय में मौसमी है आप महीने भर का बजट / लक्ष्य वितरित मदद करता है।
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,नहीं आइटम नहीं मिला
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,नहीं आइटम नहीं मिला
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,वेतन ढांचे गुम
 DocType: Lead,Person Name,व्यक्ति का नाम
 DocType: Sales Invoice Item,Sales Invoice Item,बिक्री चालान आइटम
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",उदाहरण के लिए &quot;प्राइमरी स्कूल&quot; या &quot;विश्वविद्यालय&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,स्टॉक रिपोर्ट
 DocType: Warehouse,Warehouse Detail,वेअरहाउस विस्तार
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},क्रेडिट सीमा ग्राहक के लिए पार किया गया है {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,सत्रांत तिथि से बाद में शैक्षणिक वर्ष की वर्ष समाप्ति तिथि है जो करने के लिए शब्द जुड़ा हुआ है नहीं हो सकता है (शैक्षिक वर्ष {})। तारीखों को ठीक करें और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",अनियंत्रित नहीं हो सकता है के रूप में एसेट रिकॉर्ड मद के सामने मौजूद है &quot;निश्चित परिसंपत्ति है&quot;
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,टैक्स प्रकार
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},इससे पहले कि आप प्रविष्टियों को जोड़ने या अद्यतन करने के लिए अधिकृत नहीं हैं {0}
 DocType: BOM,Item Image (if not slideshow),छवि (यदि नहीं स्लाइड शो)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक एक ही नाम के साथ मौजूद है
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(घंटा दर / 60) * वास्तविक ऑपरेशन टाइम
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,बीओएम का चयन
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,बीओएम का चयन
 DocType: SMS Log,SMS Log,एसएमएस प्रवेश
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित मदों की लागत
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,पर {0} छुट्टी के बीच की तिथि से और आज तक नहीं है
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,स्कूलों
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},कोई छुट्टी रिकॉर्ड कर्मचारी के लिए पाया {0} के लिए {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,पहली कंपनी दाखिल करें
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,पहले कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,कुल लागत
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,दावे की राशि
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,डुप्लीकेट ग्राहक समूह cutomer समूह तालिका में पाया
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,प्रदायक प्रकार / प्रदायक
 DocType: Naming Series,Prefix,उपसर्ग
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,उपभोज्य
 DocType: Employee,B-,बी
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,प्रदायक द्वारा वितरित
 DocType: SMS Center,All Contact,सभी संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,उत्पादन आदेश पहले से ही बीओएम के साथ सभी मदों के लिए बनाया
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,वार्षिक वेतन
 DocType: Daily Work Summary,Daily Work Summary,दैनिक काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,वित्तीय वर्ष और समापन
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} स्थायी है
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} स्थायी है
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,कृपया खातों का चार्ट बनाने के लिए मौजूदा कंपनी का चयन
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेयर व्यय
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वेअरहाउस चुनें
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,कॉन्ट्रा एंट्री
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी मुद्रा में ऋण
 DocType: Delivery Note,Installation Status,स्थापना स्थिति
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",आप उपस्थिति को अद्यतन करना चाहते हैं? <br> वर्तमान: {0} \ <br> अनुपस्थित: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},स्वीकृत + अस्वीकृत मात्रा मद के लिए प्राप्त मात्रा के बराबर होना चाहिए {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,आपूर्ति कच्चे माल की खरीद के लिए
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,भुगतान के कम से कम एक मोड पीओएस चालान के लिए आवश्यक है।
 DocType: Products Settings,Show Products as a List,दिखाने के उत्पादों एक सूची के रूप में
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", टेम्पलेट डाउनलोड उपयुक्त डेटा को भरने और संशोधित फ़ाइल देते हैं।
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,मूल्यह्रास प्रवेश कर
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,अनुरोध प्रकार
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,निष्पादन
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,आपरेशन के विवरण से बाहर किया।
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,रखरखाव के दौरे के लिए योजना.
 DocType: SMS Settings,Enter url parameter for message,संदेश के लिए url पैरामीटर दर्ज करें
 DocType: POS Profile,Customer Groups,ग्राहक समूहों
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,वित्तीय विवरण
 DocType: Guardian,Students,छात्र
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,मूल्य निर्धारण और छूट लागू करने के लिए नियम.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,मूल्य सूची खरीदने या बेचने के लिए लागू किया जाना चाहिए
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},अग्रिम राशि से अधिक नहीं हो सकता है {0} {1}
 DocType: Naming Series,Series List for this Transaction,इस लेन - देन के लिए सीरीज सूची
 DocType: Company,Default Payroll Payable Account,डिफ़ॉल्ट पेरोल देय खाता
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,अपडेट ईमेल समूह
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,अपडेट ईमेल समूह
 DocType: Sales Invoice,Is Opening Entry,एंट्री खोल रहा है
 DocType: Customer Group,Mention if non-standard receivable account applicable,मेंशन गैर मानक प्राप्य खाते यदि लागू हो
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,गोदाम की आवश्यकता है के लिए पहले जमा करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,पुनर्विक्रेता
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","अगर जाँच की, सामग्री अनुरोध में गैर-शेयर आइटम शामिल होंगे।"
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,बिक्री चालान आइटम के खिलाफ
 ,Production Orders in Progress,प्रगति में उत्पादन के आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,फाइनेंसिंग से नेट नकद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage भरा हुआ है, नहीं सहेज सकते हैं।"
 DocType: Lead,Address & Contact,पता और संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,पिछले आवंटन से अप्रयुक्त पत्ते जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},अगला आवर्ती {0} पर बनाया जाएगा {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),कुल लागत राशि (समय पत्रक के माध्यम से)
 DocType: Item Website Specification,Item Website Specification,आइटम वेबसाइट विशिष्टता
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,अवरुद्ध छोड़ दो
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,बैंक प्रविष्टियां
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},आइटम {0} पर जीवन के अपने अंत तक पहुँच गया है {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,बैंक प्रविष्टियां
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेयर सुलह आइटम
 DocType: Stock Entry,Sales Invoice No,बिक्री चालान नहीं
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,हब में प्रकाशित
 DocType: Student Admission,Student Admission,छात्र प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,सामग्री अनुरोध
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,आइटम {0} को रद्द कर दिया गया है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,सामग्री अनुरोध
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन क्लीयरेंस तिथि
 DocType: Item,Purchase Details,खरीद विवरण
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},खरीद आदेश में &#39;कच्चे माल की आपूर्ति&#39; तालिका में नहीं मिला मद {0} {1}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,बकाया चेक्स और स्पष्ट करने जमाओं
 DocType: Item,Synced With Hub,हब के साथ सिंक किया गया
 DocType: Vehicle,Fleet Manager,नौसेना प्रबंधक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},पंक्ति # {0}: {1} आइटम के लिए नकारात्मक नहीं हो सकता {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,गलत पासवर्ड
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},पंक्ति # {0}: {1} आइटम के लिए नकारात्मक नहीं हो सकता {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,गलत पासवर्ड
 DocType: Item,Variant Of,के variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',की तुलना में 'मात्रा निर्माण करने के लिए' पूरी की गई मात्रा अधिक नहीं हो सकता
 DocType: Period Closing Voucher,Closing Account Head,बंद लेखाशीर्ष
 DocType: Employee,External Work History,बाहरी काम इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्र संदर्भ त्रुटि
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वचालित सामग्री अनुरोध के निर्माण पर ईमेल द्वारा सूचित करें
 DocType: Journal Entry,Multi Currency,बहु मुद्रा
 DocType: Payment Reconciliation Invoice,Invoice Type,चालान का प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,बिलटी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,बिलटी
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,करों की स्थापना
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,बिक संपत्ति की लागत
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,आप इसे खींचा बाद भुगतान एंट्री संशोधित किया गया है। इसे फिर से खींच कर दीजिये।
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
-DocType: Grade Interval,Min Score,न्यूनतम स्कोर
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} मद टैक्स में दो बार दर्ज
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,इस सप्ताह और लंबित गतिविधियों के लिए सारांश
 DocType: Student Applicant,Admitted,भर्ती किया
 DocType: Workstation,Rent Cost,बाइक किराए मूल्य
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ऑर्डर का मूल्य
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,बैंक / नकद पार्टी के खिलाफ या आंतरिक स्थानांतरण के लिए लेनदेन
 DocType: Shipping Rule,Valid for Countries,देशों के लिए मान्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"इस मद के लिए एक खाका है और लेनदेन में इस्तेमाल नहीं किया जा सकता है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक आइटम विशेषताओं वेरिएंट में खत्म नकल की जाएगी"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,माना कुल ऑर्डर
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी पदनाम (जैसे सीईओ , निदेशक आदि ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,क्षेत्र मूल्य 'माह के दिवस पर दोहराएँ ' दर्ज करें
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},पंक्ति # {0}: चालान की खरीद करने के लिए एक मौजूदा परिसंपत्ति के खिलाफ नहीं बनाया जा सकता है {1}
 DocType: Item Tax,Tax Rate,कर की दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} पहले से ही कर्मचारी के लिए आवंटित {1} तक की अवधि के {2} के लिए {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,वस्तु चुनें
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,वस्तु चुनें
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,खरीद चालान {0} पहले से ही प्रस्तुत किया जाता है
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},पंक्ति # {0}: बैच नहीं के रूप में ही किया जाना चाहिए {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,गैर-समूह कन्वर्ट करने के लिए
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,एक आइटम के बैच (बहुत).
 DocType: C-Form Invoice Detail,Invoice Date,चालान तिथि
 DocType: GL Entry,Debit Amount,निकाली गई राशि
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},केवल में कंपनी के प्रति एक खाते से हो सकता है {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,लगाव को देखने के लिए धन्यवाद
 DocType: Purchase Order,% Received,% प्राप्त
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,छात्र गुटों बनाएं
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,उद्धरण के लिए अनुरोध
 DocType: Salary Slip Timesheet,Working Hours,कार्य के घंटे
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,एक मौजूदा श्रृंखला के शुरू / वर्तमान अनुक्रम संख्या बदलें.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,एक नए ग्राहक बनाने
-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.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,खरीद आदेश बनाएं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,एक नए ग्राहक बनाने
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","कई डालती प्रबल करने के लिए जारी रखते हैं, उपयोगकर्ताओं संघर्ष को हल करने के लिए मैन्युअल रूप से प्राथमिकता सेट करने के लिए कहा जाता है."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,खरीद आदेश बनाएं
 ,Purchase Register,इन पंजीकृत खरीद
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू शुल्कों
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) भूमिका होनी चाहिए 'लीव अनुमोदनकर्ता'
 DocType: Purchase Receipt,Vehicle Date,वाहन की तारीख
 DocType: Student Log,Medical,चिकित्सा
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,खोने के लिए कारण
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,खोने के लिए कारण
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,लीड मालिक लीड के रूप में ही नहीं किया जा सकता
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,आवंटित राशि असमायोजित राशि से अधिक नहीं कर सकते हैं
 DocType: Announcement,Receiver,रिसीवर
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,मात्रा और दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,कक्षाओं / प्रयोगशालाओं आदि जहां व्याख्यान के लिए निर्धारित किया जा सकता है।
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,पहले कंपनी का नाम दर्ज करें
 DocType: Purchase Invoice,Supplier Name,प्रदायक नाम
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मैनुअल पढ़ें
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,पुरानी माता - पिता
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,अनिवार्य क्षेत्र - शैक्षणिक वर्ष
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ईमेल के साथ जाने वाले परिचयात्मक विषयवस्तु को अनुकूलित करें। प्रत्येक आदानप्रदान एक अलग परिचयात्मक विषयवस्तु है.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},कृपया कंपनी के लिए डिफ़ॉल्ट भुगतान योग्य खाता सेट करें {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सभी विनिर्माण प्रक्रियाओं के लिए वैश्विक सेटिंग्स।
 DocType: Accounts Settings,Accounts Frozen Upto,लेखा तक जमे हुए
 DocType: SMS Log,Sent On,पर भेजा
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,गुण {0} गुण तालिका में कई बार चुना
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रिकॉर्ड चयनित क्षेत्र का उपयोग कर बनाया जाता है.
 DocType: Sales Order,Not Applicable,लागू नहीं
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,अवकाश मास्टर .
 DocType: Request for Quotation Item,Required Date,आवश्यक तिथि
 DocType: Delivery Note,Billing Address,बिलिंग पता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,मद कोड दर्ज करें.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,मद कोड दर्ज करें.
 DocType: BOM,Costing,लागत
 DocType: Tax Rule,Billing County,बिलिंग काउंटी
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","अगर जाँच की है, कर की राशि के रूप में पहले से ही प्रिंट दर / प्रिंट राशि में शामिल माना जाएगा"
@@ -501,6 +505,7 @@
 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,प्रतिभूति और जमाओं
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","वैल्यूएशन पद्धति को बदल नहीं सकते हैं, क्योंकि कुछ वस्तुओं के लेनदेन के साथ ही इसमें अपनी वैल्यूएशन विधि नहीं होती है"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,आवंटित कुल पत्तियों अनिवार्य है
 DocType: Job Opening,Description of a Job Opening,एक नौकरी खोलने का विवरण
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज के लिए लंबित गतिविधियों
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,प्रशासनिक अधिकारी
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स चुनें
 DocType: Timesheet Detail,Hrs,बजे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,कंपनी का चयन करें
 DocType: Stock Entry Detail,Difference Account,अंतर खाता
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,उसकी निर्भर कार्य {0} बंद नहीं है के रूप में बंद काम नहीं कर सकते हैं।
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"सामग्री अनुरोध उठाया जाएगा , जिसके लिए वेयरहाउस दर्ज करें"
 DocType: Production Order,Additional Operating Cost,अतिरिक्त ऑपरेटिंग कॉस्ट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,प्रसाधन सामग्री
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","मर्ज करने के लिए , निम्नलिखित गुण दोनों मदों के लिए ही होना चाहिए"
 DocType: Shipping Rule,Net Weight,निवल भार
 DocType: Employee,Emergency Phone,आपातकालीन फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरीदें
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,थ्रेशोल्ड 0% के लिए ग्रेड को परिभाषित करें
 DocType: Sales Order,To Deliver,पहुँचाना
 DocType: Purchase Invoice Item,Item,मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,सीरियल नहीं आइटम एक अंश नहीं किया जा सकता
 DocType: Journal Entry,Difference (Dr - Cr),अंतर ( डॉ. - सीआर )
 DocType: Account,Profit and Loss,लाभ और हानि
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,प्रबंध उप
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,वेतन वृद्धि 0 नहीं किया जा सकता
 DocType: Production Planning Tool,Material Requirement,सामग्री की आवश्यकताएँ
 DocType: Company,Delete Company Transactions,कंपनी लेन-देन को हटाएं
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ कोई और संदर्भ तिथि बैंक लेन-देन के लिए अनिवार्य है
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर और प्रभार जोड़ें / संपादित करें
 DocType: Purchase Invoice,Supplier Invoice No,प्रदायक चालान नहीं
 DocType: Territory,For reference,संदर्भ के लिए
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,अधिष्ठापन नोट आइटम
 DocType: Production Plan Item,Pending Qty,विचाराधीन मात्रा
 DocType: Budget,Ignore,उपेक्षा
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} सक्रिय नहीं है
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} सक्रिय नहीं है
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},एसएमएस निम्नलिखित संख्या के लिए भेजा: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,सेटअप जांच मुद्रण के लिए आयाम
 DocType: Salary Slip,Salary Slip Timesheet,वेतन पर्ची Timesheet
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,कुल आयोग
 DocType: Pricing Rule,Sales Partner,बिक्री साथी
 DocType: Buying Settings,Purchase Receipt Required,खरीद रसीद आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,अगर खोलने स्टॉक में प्रवेश किया मूल्यांकन दर अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चालान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,पहले कंपनी और पार्टी के प्रकार का चयन करें
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,वित्तीय / लेखा वर्ष .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,संचित मान
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमा करें, सीरियल नं विलय हो नहीं सकता"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,बनाओ बिक्री आदेश
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,बनाओ बिक्री आदेश
 DocType: Project Task,Project Task,परियोजना के कार्य
 ,Lead Id,लीड ईद
 DocType: C-Form Invoice Detail,Grand Total,महायोग
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,जीवनवृत्त संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहकों को दोहराने
 DocType: Leave Control Panel,Allocate,आवंटित
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,बिक्री लौटें
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,बिक्री लौटें
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,नोट: कुल आवंटित पत्ते {0} पहले ही मंजूरी दे दी पत्तियों से कम नहीं होना चाहिए {1} अवधि के लिए
 DocType: Announcement,Posted By,द्वारा प्रकाशित किया गया था
 DocType: Item,Delivered by Supplier (Drop Ship),प्रदायक द्वारा वितरित (ड्रॉप जहाज)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,करने के लिए कोटेशन
 DocType: Lead,Middle Income,मध्य आय
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उद्घाटन (सीआर )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,आवंटित राशि ऋणात्मक नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कृपया कंपनी सेट करें
 DocType: Purchase Order Item,Billed Amt,बिल भेजा राशि
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,बिक्री चालान Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},संदर्भ कोई और संदर्भ तिथि के लिए आवश्यक है {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,चयन भुगतान खाता बैंक एंट्री बनाने के लिए
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","पत्ते, व्यय का दावा है और पेरोल प्रबंधन करने के लिए कर्मचारी रिकॉर्ड बनाएं"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ज्ञानकोष में जोड़े
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भुगतान एंट्री कटौती
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} ' {1}' नहीं वित्त वर्ष में {2}
 DocType: Buying Settings,Settings for Buying Module,मॉड्यूल खरीद के लिए सेटिंग
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},एसेट {0} कंपनी का नहीं है {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,पहली खरीद रसीद दर्ज करें
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","तो मूल्य निर्धारण नियमों ग्राहकों के आधार पर बाहर छान रहे हैं, ग्राहक समूह, क्षेत्र, प्रदायक, प्रदायक प्रकार, अभियान, बिक्री साथी आदि"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,सूची में शुद्ध परिवर्तन
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,कर्मचारी ऋण प्रबंधन
 DocType: Employee,Passport Number,पासपोर्ट नंबर
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 के साथ संबंध
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,मैनेजर
 DocType: Payment Entry,Payment From / To,भुगतान से / करने के लिए
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,तिथि सीमा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नई क्रेडिट सीमा ग्राहक के लिए वर्तमान बकाया राशि की तुलना में कम है। क्रेडिट सीमा कम से कम हो गया है {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'पर आधारित' और 'समूह  द्वारा' दोनों समान नहीं हो सकते हैं
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,मिनटों में
 DocType: Issue,Resolution Date,संकल्प तिथि
 DocType: Student Batch Name,Batch Name,बैच का नाम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet बनाया:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet बनाया:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},भुगतान की विधि में डिफ़ॉल्ट नकद या बैंक खाता सेट करें {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,भर्ती
 DocType: Selling Settings,Customer Naming By,द्वारा नामकरण ग्राहक
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,छात्र छात्र मासिक उपस्थिति रिपोर्ट में के रूप में उपस्थित दिखाई देंगे
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ समय
 DocType: BOM Operation,Operation Time,संचालन समय
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,समाप्त
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,आधार
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,आधार
 DocType: Timesheet,Total Billed Hours,कुल बिल घंटे
 DocType: Journal Entry,Write Off Amount,बंद राशि लिखें
 DocType: Journal Entry,Bill No,विधेयक नहीं
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,छात्र उपस्थिति
 DocType: Sales Invoice Timesheet,Time Sheet,समय पत्र
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush आधारित कच्चे माल पर
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,आइटम विवरण दर्ज करें
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आइटम विवरण दर्ज करें
 DocType: Interest,Interest,ब्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,बेचने से पहले
 DocType: Purchase Receipt,Other Details,अन्य विवरण
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,भुगतान प्रवेश पहले से ही बनाई गई है
 DocType: Purchase Receipt Item Supplied,Current Stock,मौजूदा स्टॉक
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},पंक्ति # {0}: संपत्ति {1} वस्तु {2} से जुड़ा हुआ नहीं है
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,पूर्वावलोकन वेतन पर्ची
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाता {0} कई बार दर्ज किया गया है
 DocType: Account,Expenses Included In Valuation,व्यय मूल्यांकन में शामिल
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 ,Absent Student Report,अनुपस्थित छात्र की रिपोर्ट
 DocType: Email Digest,Next email will be sent on:,अगले ईमेल पर भेजा जाएगा:
 DocType: Offer Letter Term,Offer Letter Term,पत्र टर्म प्रस्ताव
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,आइटम वेरिएंट है।
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आइटम वेरिएंट है।
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आइटम {0} नहीं मिला
 DocType: Bin,Stock Value,शेयर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} मौजूद नहीं है
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,पेड़ के प्रकार
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,पेड़ के प्रकार
 DocType: BOM Explosion Item,Qty Consumed Per Unit,मात्रा रूपये प्रति यूनिट की खपत
 DocType: Serial No,Warranty Expiry Date,वारंटी समाप्ति तिथि
 DocType: Material Request Item,Quantity and Warehouse,मात्रा और वेयरहाउस
 DocType: Sales Invoice,Commission Rate (%),आयोग दर (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया कार्यक्रम चुनें
 DocType: Project,Estimated Cost,अनुमानित लागत
 DocType: Purchase Order,Link to material requests,सामग्री अनुरोध करने के लिए लिंक
@@ -754,7 +757,7 @@
 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,डिफ़ॉल्ट खाता
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"अवसर नेतृत्व से किया जाता है , तो लीड सेट किया जाना चाहिए"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,साप्ताहिक छुट्टी के दिन का चयन करें
 DocType: Production Order Operation,Planned End Time,नियोजित समाप्ति समय
 ,Sales Person Target Variance Item Group-Wise,बिक्री व्यक्ति लक्ष्य विचरण मद समूहवार
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,अवसर से
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक वेतन बयान.
 DocType: BOM,Website Specifications,वेबसाइट निर्दिष्टीकरण
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} प्रकार की {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,पंक्ति {0}: रूपांतरण कारक अनिवार्य है
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,बैंक ए / सी सं.
 DocType: Bank Guarantee,Project,परियोजना
 DocType: Quality Inspection Reading,Reading 7,7 पढ़ना
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,आंशिक रूप से आदेश दिया
 DocType: Expense Claim Detail,Expense Claim Type,व्यय दावा प्रकार
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,शॉपिंग कार्ट के लिए डिफ़ॉल्ट सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},एसेट जर्नल प्रविष्टि के माध्यम से खत्म कर दिया {0}
@@ -830,14 +835,14 @@
 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 +107,Office Maintenance Expenses,कार्यालय रखरखाव का खर्च
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ईमेल खाते को स्थापित
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,पहले आइटम दर्ज करें
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,पहले आइटम दर्ज करें
 DocType: Account,Liability,दायित्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,स्वीकृत राशि पंक्ति में दावा राशि से अधिक नहीं हो सकता है {0}।
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,मूल्य सूची चयनित नहीं
 DocType: Employee,Family Background,पारिवारिक पृष्ठभूमि
 DocType: Request for Quotation Supplier,Send Email,ईमेल भेजें
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},चेतावनी: अमान्य अनुलग्नक {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,अनुमति नहीं है
 DocType: Company,Default Bank Account,डिफ़ॉल्ट बैंक खाता
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी के आधार पर फिल्टर करने के लिए, का चयन पार्टी पहले प्रकार"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,नहीं मिला कर्मचारी
 DocType: Supplier Quotation,Stopped,रोक
 DocType: Item,If subcontracted to a vendor,एक विक्रेता के लिए subcontracted हैं
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,छात्र समूह पहले से ही अपडेट किया गया है।
 DocType: SMS Center,All Customer Contact,सभी ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv के माध्यम से शेयर संतुलन अपलोड करें.
 DocType: Warehouse,Tree Details,ट्री विवरण
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,न्यूनतम चालान राशि
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: लागत केंद्र {2} कंपनी से संबंधित नहीं है {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाता {2} एक समूह नहीं हो सकता है
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आइटम पंक्ति {IDX}: {doctype} {} DOCNAME ऊपर में मौजूद नहीं है &#39;{} doctype&#39; तालिका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} पहले ही पूरा या रद्द कर दिया है
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोई कार्य
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो चालान 05, 28 आदि जैसे उत्पन्न हो जाएगा, जिस पर इस महीने के दिन"
 DocType: Asset,Opening Accumulated Depreciation,खुलने संचित मूल्यह्रास
@@ -878,7 +883,7 @@
 DocType: Bin,Moving Average Rate,मूविंग औसत दर
 DocType: Production Planning Tool,Select Items,आइटम का चयन करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} विधेयक के खिलाफ {1} दिनांक {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,पाठ्यक्रम अनुसूची
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,पाठ्यक्रम अनुसूची
 DocType: Maintenance Visit,Completion Status,समापन स्थिति
 DocType: HR Settings,Enter retirement age in years,साल में सेवानिवृत्ति की आयु दर्ज
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य वेअरहाउस
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,इस प्रतिशत तक प्रसव या रसीद से अधिक की अनुमति दें
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात उपस्थिति
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,सभी आइटम समूहों
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सभी आइटम समूहों
 DocType: Process Payroll,Activity Log,गतिविधि लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,शुद्ध लाभ / हानि
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वचालित रूप से लेनदेन के प्रस्तुत करने पर संदेश लिखें .
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,भुगतान करने के लिए क्रय आदेश
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अनुमानित मात्रा
 DocType: Sales Invoice,Payment Due Date,भुगतान की नियत तिथि
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,मद संस्करण {0} पहले से ही एक ही गुण के साथ मौजूद है
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;उद्घाटन&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,क्या करने के लिए ओपन
 DocType: Notification Control,Delivery Note Message,डिलिवरी नोट संदेश
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,पुन: आदेश मात्रा
 DocType: Leave Block List Date,Leave Block List Date,ब्लॉक सूची तिथि छोड़ दो
 DocType: Pricing Rule,Price or Discount,मूल्य या डिस्काउंट
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरीद रसीद आइटम तालिका में कुल लागू शुल्कों के कुल करों और शुल्कों के रूप में ही होना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरीद रसीद आइटम तालिका में कुल लागू शुल्कों के कुल करों और शुल्कों के रूप में ही होना चाहिए
 DocType: Sales Team,Incentives,प्रोत्साहन
 DocType: SMS Log,Requested Numbers,अनुरोधित नंबर
 DocType: Production Planning Tool,Only Obtain Raw Materials,केवल प्राप्त कच्चे माल
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,क्या subcontracted
 DocType: Item Attribute,Item Attribute Values,आइटम विशेषता मान
 DocType: Examination Result,Examination Result,परीक्षा परिणाम
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,रसीद खरीद
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,रसीद खरीद
 ,Received Items To Be Billed,बिल करने के लिए प्राप्त आइटम
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,प्रस्तुत वेतन निकल जाता है
 DocType: Employee,Ms,सुश्री
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,मुद्रा विनिमय दर मास्टर .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},संदर्भ Doctype से एक होना चाहिए {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},संदर्भ Doctype से एक होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन के लिए अगले {0} दिनों में टाइम स्लॉट पाने में असमर्थ {1}
 DocType: Production Order,Plan material for sub-assemblies,उप असेंबलियों के लिए योजना सामग्री
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,बिक्री भागीदारों और टेरिटरी
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,स्वचालित रूप से खाते नहीं बना सकते हैं वहाँ पहले से ही खाते में शेयर संतुलन है। इससे पहले कि आप इस गोदाम पर एक प्रविष्टि कर सकते हैं आप एक मेल खाता बनाना होगा
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,डिफ़ॉल्ट लेखा देय
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नहीं है या मौजूद नहीं है
 DocType: Fee Structure,Components,अवयव
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,आइटम वेरिएंट {0} अद्यतन
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},मद में दर्ज करें परिसंपत्ति वर्ग {0}
 DocType: Quality Inspection Reading,Reading 6,6 पढ़ना
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,नहीं {0} {1} {2} के बिना किसी भी नकारात्मक बकाया चालान कर सकते हैं
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चालान अग्रिम खरीद
 DocType: Hub Settings,Sync Now,अभी सिंक करें
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},पंक्ति {0}: {1} क्रेडिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,खरीद आइटम है
 DocType: Asset,Purchase Invoice,चालान खरीद
 DocType: Stock Ledger Entry,Voucher Detail No,वाउचर विस्तार नहीं
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,नई बिक्री चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,नई बिक्री चालान
 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,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,दिनांक और अंतिम तिथि खुलने एक ही वित्तीय वर्ष के भीतर होना चाहिए
 DocType: Lead,Request for Information,सूचना के लिए अनुरोध
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,सिंक ऑफलाइन चालान
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,सिंक ऑफलाइन चालान
 DocType: Payment Request,Paid,भुगतान किया
 DocType: Program Fee,Program Fee,कार्यक्रम का शुल्क
 DocType: Salary Slip,Total in words,शब्दों में कुल
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,स्वीकृत
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; में कॉपी किया जाएगा।"
 DocType: Job Opening,Publish on website,वेबसाइट पर प्रकाशित करें
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ग्राहकों के लिए लदान.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,आपूर्तिकर्ता चालान दिनांक पोस्ट दिनांक से बड़ा नहीं हो सकता है
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,झगड़ा
 ,Company Name,कंपनी का नाम
 DocType: SMS Center,Total Message(s),कुल संदेश (ओं )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,स्थानांतरण के लिए आइटम का चयन करें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,बैंक के खाते में जहां चेक जमा किया गया था सिर का चयन करें.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,पंक्ति {0}: बिक्री / खरीद आदेश के खिलाफ भुगतान हमेशा अग्रिम के रूप में चिह्नित किया जाना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,डिफ़ॉल्ट बैंक / नकद खाते स्वचालित रूप से जब इस मोड का चयन वेतन जर्नल प्रविष्टि में अद्यतन किया जाएगा।
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ग्रेड कोड के लिए अंतराल {0} अन्य ग्रेड के लिए ग्रेड के अंतराल के साथ overlaps। कृपया चेक अंतराल {0} और {1} और फिर कोशिश करें
 DocType: BOM,Raw Material Cost(Company Currency),कच्चे माल की लागत (कंपनी मुद्रा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,सभी आइटम को पहले से ही इस उत्पादन के आदेश के लिए स्थानांतरित कर दिया गया है।
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},पंक्ति # {0}: दर {1} {2} में प्रयुक्त दर से अधिक नहीं हो सकती
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,बीओएम वेबसाइट मद
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,अपने पत्र सिर और लोगो अपलोड करें। (आप उन्हें बाद में संपादित कर सकते हैं)।
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,अगली मूल्यह्रास दिनांक अतीत की तारीख के रूप में दर्ज किया जाता है
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,सफेद
 DocType: SMS Center,All Lead (Open),सभी लीड (ओपन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),पंक्ति {0}: मात्रा के लिए उपलब्ध नहीं {4} गोदाम में {1} प्रवेश के समय पोस्टिंग पर ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,भुगतान किए गए अग्रिम जाओ
 DocType: Item,Automatically Create New Batch,स्वचालित रूप से नया बैच बनाएं
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,मेक
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,मेक
 DocType: Student Admission,Admission Start Date,प्रवेश प्रारंभ तिथि
 DocType: Journal Entry,Total Amount in Words,शब्दों में कुल राशि
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,कोई त्रुटि हुई थी . एक संभावित कारण यह है कि आप प्रपत्र को बचाया नहीं किया है कि हो सकता है. यदि समस्या बनी रहती support@erpnext.com से संपर्क करें.
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,खुलने मात्रा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,राशि परिवर्तन के लिए खाता दर्ज करें
 DocType: Student Batch Name,Student Batch Name,छात्र बैच नाम
 DocType: Holiday List,Holiday List Name,अवकाश सूची नाम
 DocType: Repayment Schedule,Balance Loan Amount,शेष ऋण की राशि
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},कृपया बताएं कि एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,मात्रा या मूल्य में कोई परिवर्तन से हटाया आइटम नहीं है।
 DocType: Delivery Note,Delivery To,करने के लिए डिलिवरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,गुण तालिका अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,गुण तालिका अनिवार्य है
 DocType: Production Planning Tool,Get Sales Orders,विक्रय आदेश
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ऋणात्मक नहीं हो सकता
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,छूट
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,छूट
 DocType: Asset,Total Number of Depreciations,कुल depreciations की संख्या
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन के साथ दर
 DocType: Workstation,Wages,वेतन
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,बिक्री आदेश / तैयार माल गोदाम में सुरक्षित गोदाम
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,बेच राशि
 DocType: Repayment Schedule,Interest Amount,ब्याज राशि
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,आप इस रिकॉर्ड के लिए खर्च अनुमोदक हैं . 'स्थिति' अद्यतन और बचा लो
 DocType: Serial No,Creation Document No,निर्माण का दस्तावेज़
 DocType: Issue,Issue,मुद्दा
 DocType: Asset,Scrapped,खत्म कर दिया
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","आइटम वेरिएंट के लिए जिम्मेदार बताते हैं। जैसे आकार, रंग आदि"
 DocType: Purchase Invoice,Returns,रिटर्न
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP वेयरहाउस
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},धारावाहिक नहीं {0} तक रखरखाव अनुबंध के तहत है {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,भरती
 DocType: Lead,Organization Name,संगठन का नाम
 DocType: Tax Rule,Shipping State,जहाजरानी राज्य
 ,Projected Quantity as Source,स्रोत के रूप में पेश मात्रा
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,आइटम बटन 'खरीद प्राप्तियों से आइटम प्राप्त' का उपयोग कर जोड़ा जाना चाहिए
 DocType: Employee,A-,ए-
 DocType: Production Planning Tool,Include non-stock items,गैर-शेयर मदों को शामिल करें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,बिक्री व्यय
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,के खिलाफ
 DocType: Item,Default Selling Cost Center,डिफ़ॉल्ट बिक्री लागत केंद्र
 DocType: Sales Partner,Implementation Partner,कार्यान्वयन साथी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,पिन कोड
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,पिन कोड
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},बिक्री आदेश {0} है {1}
 DocType: Opportunity,Contact Info,संपर्क जानकारी
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,स्टॉक प्रविष्टियां बनाना
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} परिणाम
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} परिणाम
 DocType: Item,Default Supplier,डिफ़ॉल्ट प्रदायक
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता प्रतिशत से अधिक
 DocType: Employee Loan,Repayment Schedule,पुनः भुगतान कार्यक्रम
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक ऑफ तिथियां
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ति तिथि आरंभ तिथि से कम नहीं हो सकता
 DocType: Sales Person,Select company name first.,कंपनी 1 नाम का चयन करें.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,डा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,डा
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,कोटेशन आपूर्तिकर्ता से प्राप्त किया.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,औसत आयु
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,परफ़ॉर्मेंस क्षेत्र
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,परिवहन
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,अमान्य विशेषता
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} प्रस्तुत किया जाना चाहिए
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},मात्रा से कम या बराबर होना चाहिए {0}
 DocType: SMS Center,Total Characters,कुल वर्ण
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},आइटम के लिए बीओएम क्षेत्र में बीओएम चयन करें {0}
@@ -1152,7 +1154,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,शॉपिंग कार्ट नौवहन नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन का आदेश {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',सेट &#39;पर अतिरिक्त छूट लागू करें&#39; कृपया
 ,Ordered Items To Be Billed,हिसाब से बिलिंग किए आइटम
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,सीमा कम हो गया है से की तुलना में श्रृंखला के लिए
 DocType: Global Defaults,Global Defaults,वैश्विक मूलभूत
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,साल की शुरुआत
 DocType: Purchase Invoice,Start date of current invoice's period,वर्तमान चालान की अवधि के आरंभ तिथि
 DocType: Salary Slip,Leave Without Pay,बिना वेतन छुट्टी
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,क्षमता योजना में त्रुटि
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,क्षमता योजना में त्रुटि
 ,Trial Balance for Party,पार्टी के लिए परीक्षण शेष
 DocType: Lead,Consultant,सलाहकार
 DocType: Salary Slip,Earnings,कमाई
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","इस प्रकार के आइटम कोड के साथ संलग्न किया जाएगा। अपने संक्षिप्त नाम ""एसएम"", और अगर उदाहरण के लिए, मद कोड ""टी शर्ट"", ""टी-शर्ट एस.एम."" हो जाएगा संस्करण के मद कोड है"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,एक बार जब आप को वेतन पर्ची सहेजे शुद्ध वेतन (शब्दों) में दिखाई जाएगी।
 DocType: Purchase Invoice,Is Return,वापसी है
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,वापसी / डेबिट नोट
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,वापसी / डेबिट नोट
 DocType: Price List Country,Price List Country,मूल्य सूची देश
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},आइटम के लिए {0} वैध धारावाहिक नग {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,बैच नंबर पाने के लिए मद कोड दर्ज करें
 DocType: Stock Settings,Default Item Group,डिफ़ॉल्ट आइटम समूह
 DocType: Employee Loan,Partially Disbursed,आंशिक रूप से वितरित
-DocType: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली का नाम
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,प्रदायक डेटाबेस.
 DocType: Account,Balance Sheet,बैलेंस शीट
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ','आइटम कोड के साथ आइटम के लिए केंद्र का खर्च
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","भुगतान मोड कॉन्फ़िगर नहीं है। कृपया चेक, चाहे खाता भुगतान के मोड पर या पीओएस प्रोफाइल पर स्थापित किया गया है।"
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,अपनी बिक्री व्यक्ति इस तिथि पर एक चेतावनी प्राप्त करने के लिए ग्राहकों से संपर्क करेंगे
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,एक ही मद कई बार दर्ज नहीं किया जा सकता है।
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","इसके अलावा खातों समूह के तहत बनाया जा सकता है, लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है"
@@ -1203,7 +1204,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,स्टॉक लेजर प्रविष्टियां और जीएल प्रविष्टियां चयनित खरीद प्राप्ति के लिए पोस्ट कर रहे हैं
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,स्टॉक लेजर प्रविष्टियां और जीएल प्रविष्टियां चयनित खरीद प्राप्ति के लिए पोस्ट कर रहे हैं
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,वस्तु 1
 DocType: Holiday,Holiday,छुट्टी
 DocType: Support Settings,Close Issue After Days,बंद अंक दिनों के बाद
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,करेंकिया गया काम
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,गुण तालिका में कम से कम एक विशेषता निर्दिष्ट करें
 DocType: Announcement,All Students,सभी छात्र
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,मद {0} एक गैर शेयर मद में होना चाहिए
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,देखें खाता बही
 DocType: Grading Scale,Intervals,अंतराल
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,शीघ्रातिशीघ्र
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","एक आइटम समूह में एक ही नाम के साथ मौजूद है , वस्तु का नाम बदलने के लिए या आइटम समूह का नाम बदलने के लिए कृपया"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,छात्र मोबाइल नंबर
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,शेष विश्व
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आइटम {0} बैच नहीं हो सकता
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} से वेतन के भुगतान {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},जमे खाता संपादित करने के लिए अधिकृत नहीं {0}
 DocType: Journal Entry,Get Outstanding Invoices,बकाया चालान
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,बिक्री आदेश {0} मान्य नहीं है
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,खरीद आदेश आप की योजना में मदद मिलेगी और अपनी खरीद पर का पालन करें
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","क्षमा करें, कंपनियों का विलय कर दिया नहीं किया जा सकता"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",कुल अंक / स्थानांतरण मात्रा {0} सामग्री अनुरोध में {1} \ मद के लिए अनुरोध मात्रा {2} से बड़ा नहीं हो सकता है {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,छोटा
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,अप्रत्यक्ष व्यय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,पंक्ति {0}: मात्रा अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषि
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,सिंक मास्टर डाटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,सिंक मास्टर डाटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,अपने उत्पादों या सेवाओं
 DocType: Mode of Payment,Mode of Payment,भुगतान की रीति
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,वेबसाइट छवि एक सार्वजनिक फ़ाइल या वेबसाइट URL होना चाहिए
 DocType: Student Applicant,AP,एपी
 DocType: Purchase Invoice Item,BOM,बीओएम
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,यह एक रूट आइटम समूह है और संपादित नहीं किया जा सकता है .
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,समूह रोल संख्या
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, केवल ऋण खातों अन्य डेबिट प्रविष्टि के खिलाफ जोड़ा जा सकता है के लिए"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सभी कार्य भार की कुल होना चाहिए 1. तदनुसार सभी परियोजना कार्यों के भार को समायोजित करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,डिलिवरी नोट {0} प्रस्तुत नहीं किया गया है
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","मूल्य निर्धारण नियम पहला आइटम, आइटम समूह या ब्रांड हो सकता है, जो क्षेत्र 'पर लागू होते हैं' के आधार पर चुना जाता है."
 DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
 DocType: Item,ITEM-,"आइटम,"
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,बिक्री टीम के लिए कुल आवंटित 100 प्रतिशत होना चाहिए
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},उत्पादन का आदेश स्थिति है {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},उत्पादन का आदेश स्थिति है {0}
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,संपादित करें] वर्णन
 ,Team Updates,टीम अपडेट
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,सप्लायर के लिए
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,सप्लायर के लिए
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,की स्थापना खाता प्रकार के लेनदेन में इस खाते का चयन करने में मदद करता है.
 DocType: Purchase Invoice,Grand Total (Company Currency),महायोग (कंपनी मुद्रा)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,प्रिंट प्रारूप बनाएं
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} प्रगति में आइटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाम
-DocType: Grade Interval,Grade Code,ग्रेड कोड
+DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,पीओएस मद समूह
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,डाइजेस्ट ईमेल:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},बीओएम {0} मद से संबंधित नहीं है {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेयर
 DocType: Sales Order,Recurring Upto,आवर्ती तक
 DocType: Attendance,HR Manager,मानव संसाधन प्रबंधक
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,एक कंपनी का चयन करें
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,एक कंपनी का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,विशेषाधिकार छुट्टी
 DocType: Purchase Invoice,Supplier Invoice Date,प्रदायक चालान तिथि
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,आप खरीदारी की टोकरी में सक्रिय करने की जरूरत
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,भोजन
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,बूढ़े रेंज 3
 DocType: Maintenance Schedule Item,No of Visits,यात्राओं की संख्या
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,मार्क उपस्थिति
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,मार्क उपस्थिति
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},रखरखाव अनुसूची {0} के खिलाफ मौजूद है {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,नामांकन छात्र
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},समापन खाते की मुद्रा होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सभी लक्ष्यों के लिए अंक का योग यह है 100. होना चाहिए {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,औसत दैनिक निवर्तमान
 DocType: POS Profile,Campaign,अभियान
 DocType: Supplier,Name and Type,नाम और प्रकार
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',स्वीकृति स्थिति 'स्वीकृत' या ' अस्वीकृत ' होना चाहिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',स्वीकृति स्थिति 'स्वीकृत' या ' अस्वीकृत ' होना चाहिए
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ति
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' उम्मीद प्रारंभ दिनांक ' 'की आशा की समाप्ति तिथि' से बड़ा नहीं हो सकता
 DocType: Course Scheduling Tool,Course End Date,कोर्स समाप्ति तिथि
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पता नाम
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,खातों का चार्ट
 DocType: Material Request,Terms and Conditions Content,नियम और शर्तें सामग्री
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 से अधिक नहीं हो सकता
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 से अधिक नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,आइटम {0} भंडार वस्तु नहीं है
 DocType: Maintenance Visit,Unscheduled,अनिर्धारित
 DocType: Employee,Owned,स्वामित्व
 DocType: Salary Detail,Depends on Leave Without Pay,बिना वेतन छुट्टी पर निर्भर करता है
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, उच्च प्राथमिकता"
 ,Purchase Invoice Trends,चालान रुझान खरीद
 DocType: Employee,Better Prospects,बेहतर संभावनाओं
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ति # {0}: बैच {1} में केवल {2} मात्रा है कृपया एक और बैच का चयन करें जिसमें {3} मात्रा उपलब्ध है या कई पंक्तियों में पंक्ति को विभाजित करने के लिए, कई बैचों से वितरित / जारी करने के लिए"
 DocType: Vehicle,License Plate,लाइसेंस प्लेट
 DocType: Appraisal,Goals,लक्ष्य
 DocType: Warranty Claim,Warranty / AMC Status,वारंटी / एएमसी स्थिति
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी खुद को रिपोर्ट नहीं कर सकते हैं।
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाता जमे हुए है , तो प्रविष्टियों प्रतिबंधित उपयोगकर्ताओं की अनुमति है."
 DocType: Email Digest,Bank Balance,बैंक में जमा राशि
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} केवल मुद्रा में बनाया जा सकता है: {0} के लिए लेखा प्रविष्टि {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","आवश्यक काम प्रोफ़ाइल , योग्यता आदि"
 DocType: Journal Entry Account,Account Balance,खाते की शेष राशि
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,लेन-देन के लिए टैक्स नियम।
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,खुला हुआ वित्त वर्ष के पी एंड एल शेष राशि दिखाएँ
 DocType: Shipping Rule,Shipping Account,नौवहन खाता
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाता {2} निष्क्रिय है
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,विक्रय आदेश आप अपने काम की योजना में मदद और समय पर वितरित करने के लिए सुनिश्चित करें
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,विक्रय आदेश आप अपने काम की योजना में मदद और समय पर वितरित करने के लिए सुनिश्चित करें
 DocType: Quality Inspection,Readings,रीडिंग
 DocType: Stock Entry,Total Additional Costs,कुल अतिरिक्त लागत
 DocType: Course Schedule,SH,एसएच
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,मूल्य के लिए
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,पर्ची पैकिंग
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,पर्ची पैकिंग
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,कार्यालय का किराया
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस के प्रवेश द्वार सेटिंग्स
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात विफल!
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,सेवाएं
 DocType: HR Settings,Email Salary Slip to Employee,कर्मचारी को ईमेल वेतन पर्ची
 DocType: Cost Center,Parent Cost Center,माता - पिता लागत केंद्र
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,संभावित आपूर्तिकर्ता का चयन
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,संभावित आपूर्तिकर्ता का चयन
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,दिखाएँ बंद
 DocType: Leave Type,Is Leave Without Pay,बिना वेतन छुट्टी है
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,परिसंपत्ति वर्ग फिक्स्ड एसेट आइटम के लिए अनिवार्य है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भुगतान तालिका में कोई अभिलेख
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},यह {0} {1} के साथ संघर्ष के लिए {2} {3}
 DocType: Student Attendance Tool,Students HTML,छात्र HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,छोड़ने का दिनांक
 DocType: Pricing Rule,For Price List,मूल्य सूची के लिए
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी खोज
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,सुराग बनाने
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,सुराग बनाने
 DocType: Maintenance Schedule,Schedules,अनुसूचियों
 DocType: Purchase Invoice Item,Net Amount,शुद्ध राशि
 DocType: Purchase Order Item Supplied,BOM Detail No,बीओएम विस्तार नहीं
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,कार्यक्रम नामांकन
 DocType: Sales Invoice Item,Brand Name,ब्रांड नाम
 DocType: Purchase Receipt,Transporter Details,ट्रांसपोर्टर विवरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,डिफ़ॉल्ट गोदाम चयनित आइटम के लिए आवश्यक है
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,डिब्बा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,संभव प्रदायक
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,संभव प्रदायक
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संगठन
 DocType: Budget,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,पानेवाला सूची खाली है . पानेवाला सूची बनाएं
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,बिक्री साथी लक्ष्य
 DocType: Loan Type,Maximum Loan Amount,अधिकतम ऋण राशि
 DocType: Pricing Rule,Pricing Rule,मूल्य निर्धारण नियम
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},छात्र के लिए डुप्लिकेट रोल नंबर {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},छात्र के लिए डुप्लिकेट रोल नंबर {0}
 DocType: Budget,Action if Annual Budget Exceeded,यदि वार्षिक बजट से अधिक हो कार्रवाई
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,क्रय आदेश के लिए सामग्री का अनुरोध
 DocType: Shopping Cart Settings,Payment Success URL,भुगतान सफलता यूआरएल
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,चुकौती विधि
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","अगर जाँच की, होम पेज वेबसाइट के लिए डिफ़ॉल्ट मद समूह हो जाएगा"
 DocType: Quality Inspection Reading,Reading 4,4 पढ़ना
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} के प्रोजेक्ट के लिए नहीं मिला डिफ़ॉल्ट बीओएम {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} के प्रोजेक्ट के लिए नहीं मिला डिफ़ॉल्ट बीओएम {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,कंपनी के खर्च के लिए दावा.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","छात्र प्रणाली के दिल में हैं, अपने सभी छात्रों को जोड़ने"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","छात्र प्रणाली के दिल में हैं, अपने सभी छात्रों को जोड़ने"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},पंक्ति # {0}: क्लीयरेंस तारीख {1} से पहले चैक दिनांक नहीं किया जा सकता {2}
 DocType: Company,Default Holiday List,छुट्टियों की सूची चूक
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},पंक्ति {0}: से समय और के समय {1} के साथ अतिव्यापी है {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"आप छुट्टी के लिए आवेदन कर रहे हैं, जिस पर दिन (एस) छुट्टियां हैं। आप छुट्टी के लिए लागू नहीं की जरूरत है।"
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भुगतान ईमेल पुन: भेजें
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नया कार्य
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,कोटेशन बनाओ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,कोटेशन बनाओ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,अन्य रिपोर्टें
 DocType: Dependent Task,Dependent Task,आश्रित टास्क
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},उपाय की मूलभूत इकाई के लिए रूपांतरण कारक पंक्ति में 1 होना चाहिए {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},प्रकार की छुट्टी {0} से बड़ा नहीं हो सकता है {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,अग्रिम में एक्स दिनों के लिए आपरेशन की योजना बना प्रयास करें।
 DocType: HR Settings,Stop Birthday Reminders,बंद करो जन्मदिन अनुस्मारक
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},कंपनी में डिफ़ॉल्ट पेरोल देय खाता सेट करें {0}
 DocType: SMS Center,Receiver List,रिसीवर सूची
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,खोजें मद
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,खोजें मद
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,खपत राशि
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,नकद में शुद्ध परिवर्तन
 DocType: Assessment Plan,Grading Scale,ग्रेडिंग पैमाने
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,पहले से पूरा है
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,मापने की इकाई {0} अधिक रूपांतरण कारक तालिका में एक बार से अधिक दर्ज किया गया है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,पहले से पूरा है
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},भुगतान का अनुरोध पहले से मौजूद है {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी मदों की लागत
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},मात्रा से अधिक नहीं होना चाहिए {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,संवितरण एंट्री बनाओ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,पंक्ति {0}: प्रदायक के खिलाफ अग्रिम डेबिट किया जाना चाहिए
 DocType: Company,Default Values,डिफ़ॉल्ट मान
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{आवृत्ति} डाइजेस्ट
 DocType: Expense Claim,Total Amount Reimbursed,कुल राशि की प्रतिपूर्ति
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,यह इस वाहन के खिलाफ लॉग पर आधारित है। जानकारी के लिए नीचे समय देखें
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,लीजिए
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},प्रदायक के खिलाफ चालान {0} दिनांक {1}
 DocType: Customer,Default Price List,डिफ़ॉल्ट मूल्य सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,एसेट आंदोलन रिकॉर्ड {0} बनाया
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आप नहीं हटा सकते वित्त वर्ष {0}। वित्त वर्ष {0} वैश्विक सेटिंग्स में डिफ़ॉल्ट के रूप में सेट किया गया है
 DocType: Journal Entry,Entry Type,प्रविष्टि प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट बैलेंस
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,खरीद
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,आइटम में से कोई भी मात्रा या मूल्य में कोई बदलाव किया है।
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,अनिवार्य क्षेत्र - कार्यक्रम
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,वारंटी का दावा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,वारंटी का दावा
 ,Lead Details,विवरण लीड
 DocType: Salary Slip,Loan repayment,ऋण भुगतान
 DocType: Purchase Invoice,End date of current invoice's period,वर्तमान चालान की अवधि की समाप्ति की तारीख
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,स्थायी पता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",महायोग से \ {0} {1} अधिक से अधिक नहीं हो सकता है के खिलाफ अग्रिम भुगतान कर दिया {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,आइटम कोड का चयन करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,आइटम कोड का चयन करें
 DocType: Student Sibling,Studying in Same Institute,एक ही संस्थान में अध्ययन
 DocType: Territory,Territory Manager,क्षेत्र प्रबंधक
 DocType: Packed Item,To Warehouse (Optional),गोदाम के लिए (वैकल्पिक)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Payment Entry,Paid Amount (Company Currency),भुगतान की गई राशि (कंपनी मुद्रा)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त छूट
 DocType: Selling Settings,Selling Settings,सेटिंग्स बेचना
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,कार्ट में देखें
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन व्यय
 ,Item Shortage Report,आइटम कमी की रिपोर्ट
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजन भी ""वजन UOM"" का उल्लेख कृपया \n, उल्लेख किया गया है"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,इस स्टॉक एंट्री बनाने के लिए इस्तेमाल सामग्री अनुरोध
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,अगली मूल्यह्रास दिनांक नई संपत्ति के लिए अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,अगली मूल्यह्रास दिनांक नई संपत्ति के लिए अनिवार्य है
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बैच के लिए अलग पाठ्यक्रम आधारित समूह
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,एक आइटम के एकल इकाई.
 DocType: Fee Category,Fee Category,शुल्क श्रेणी
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,महत्व
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: लागत केंद्र &#39;लाभ और हानि के खाते के लिए आवश्यक है {2}। कृपया कंपनी के लिए एक डिफ़ॉल्ट लागत केंद्र की स्थापना की।
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"ग्राहक समूह समान नाम के साथ पहले से मौजूद है, कृपया ग्राहक का नाम बदले या ग्राहक समूह का नाम बदले"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 पढ़ना
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,आइटम के लिहाज से बिक्री रजिस्टर
 DocType: Asset,Gross Purchase Amount,सकल खरीद राशि
 DocType: Asset,Depreciation Method,मूल्यह्रास विधि
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ऑफलाइन
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,इस टैक्स मूल दर में शामिल है?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,कुल लक्ष्य
 DocType: Program Course,Required,अपेक्षित
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,सुलह JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बहुत अधिक कॉलम. रिपोर्ट निर्यात और एक स्प्रेडशीट अनुप्रयोग का उपयोग कर इसे मुद्रित.
 DocType: Purchase Invoice Item,Batch No,कोई बैच
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},एक्सचेंज के लिए दर मिल करने में असमर्थ {0} को {1} कुंजी की तारीख के लिए {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक की खरीद के आदेश के खिलाफ कई विक्रय आदेश की अनुमति दें
 DocType: Student Group Instructor,Student Group Instructor,छात्र समूह के प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,प्रकार
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,प्रकार
 DocType: Naming Series,Set prefix for numbering series on your transactions,अपने लेनदेन पर श्रृंखला नंबरिंग के लिए उपसर्ग सेट
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारियों एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,डिफ़ॉल्ट बीओएम ({0}) इस मद या अपने टेम्पलेट के लिए सक्रिय होना चाहिए
 DocType: Employee,Leave Encashed?,भुनाया छोड़ दो?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,क्षेत्र से मौके अनिवार्य है
 DocType: Email Digest,Annual Expenses,सालाना खर्च
 DocType: Item,Variants,वेरिएंट
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,बनाओ खरीद आदेश
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,बनाओ खरीद आदेश
 DocType: SMS Center,Send To,इन्हें भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},छोड़ दो प्रकार के लिए पर्याप्त छुट्टी संतुलन नहीं है {0}
 DocType: Payment Reconciliation Payment,Allocated amount,आवंटित राशि
@@ -1754,17 +1755,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,वर्क प्रगति वेयरहाउस प्रस्तुत करने से पहले आवश्यक है
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,एक नौकरी के लिए आवेदक.
 DocType: Purchase Order Item,Warehouse and Reference,गोदाम और संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,वैधानिक अपने सप्लायर के बारे में जानकारी और अन्य सामान्य जानकारी
 DocType: Item,Serial Nos and Batches,सीरियल नंबर और बैचों
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,छात्र समूह की ताकत
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल के खिलाफ एंट्री {0} किसी भी बेजोड़ {1} प्रविष्टि नहीं है
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,मूल्यांकन
 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: Grading Structure,Grading Intervals,ग्रेडिंग अंतराल
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,कृपया दर्ज करें
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","पंक्ति में आइटम {0} के लिए overbill नहीं कर सकते {1} की तुलना में अधिक {2}। ओवर-बिलिंग की अनुमति के लिए, सेटिंग ख़रीदना में सेट करें"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,कृपया मद या गोदाम के आधार पर फ़िल्टर सेट
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,बीओएम {0} प्रस्तुत किया जाना चाहिए
 DocType: Authorization Control,Authorization Control,प्राधिकरण नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},पंक्ति # {0}: मालगोदाम अस्वीकृत खारिज कर दिया मद के खिलाफ अनिवार्य है {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,भुगतान
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,अपने आदेश की व्यवस्था करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,भुगतान
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,अपने आदेश की व्यवस्था करें
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक समय और लागत
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},अधिकतम की सामग्री अनुरोध {0} मद के लिए {1} के खिलाफ किया जा सकता है बिक्री आदेश {2}
 DocType: Employee,Salutation,अभिवादन
 DocType: Course,Course Abbreviation,कोर्स संक्षिप्त
 DocType: Student Leave Application,Student Leave Application,छात्र लीव आवेदन
 DocType: Item,Will also apply for variants,यह भी वेरिएंट के लिए लागू होगी
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","एसेट, रद्द नहीं किया जा सकता क्योंकि यह पहले से ही है {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},कर्मचारी {0} को आधा दिन पर {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},कुल काम के घंटे अधिकतम काम के घंटे से अधिक नहीं होना चाहिए {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,पर
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,बिक्री के समय में आइटम बंडल.
 DocType: Quotation Item,Actual Qty,वास्तविक मात्रा
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1796,7 +1797,7 @@
 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 +91,Associate,सहयोगी
 DocType: Asset Movement,Asset Movement,एसेट आंदोलन
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,नई गाड़ी
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,नई गाड़ी
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,आइटम {0} एक धारावाहिक आइटम नहीं है
 DocType: SMS Center,Create Receiver List,रिसीवर सूची बनाएँ
 DocType: Vehicle,Wheels,पहियों
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन के आदेश के खिलाफ समय लॉग का सृजन अक्षम करता है। संचालन उत्पादन आदेश के खिलाफ लगाया जा नहीं करेगा
 DocType: Student,Student Mobile Number,छात्र मोबाइल नंबर
 DocType: Item,Has Variants,वेरिएंट है
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},आप पहले से ही से आइटम का चयन किया है {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण का नाम
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बैच आईडी अनिवार्य है
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बैच आईडी अनिवार्य है
 DocType: Sales Person,Parent Sales Person,माता - पिता बिक्री व्यक्ति
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चालान
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,परियोजनाओं के प्रबंधन
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,वित्तीय वर्ष
 DocType: Vehicle Log,Fuel Price,ईंधन मूल्य
 DocType: Budget,Budget,बजट
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,निश्चित परिसंपत्ति मद एक गैर शेयर मद में होना चाहिए।
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",यह एक आय या खर्च खाता नहीं है के रूप में बजट के खिलाफ {0} नहीं सौंपा जा सकता
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,हासिल
 DocType: Student Admission,Application Form Route,आवेदन पत्र रूट
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,टेरिटरी / ग्राहक
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,टेरिटरी / ग्राहक
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,उदाहरणार्थ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,छोड़ दो प्रकार {0} आवंटित नहीं किया जा सकता क्योंकि यह बिना वेतन छोड़ रहा है
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},पंक्ति {0}: आवंटित राशि {1} से भी कम हो या बकाया राशि चालान के बराबर होना चाहिए {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,धारावाहिक नहीं स्थिति
 DocType: Payment Entry Reference,Outstanding,बकाया
 ,Daily Timesheet Summary,डेली Timesheet सारांश
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","पंक्ति {0}: सेट करने के लिए {1} अवधि, से और तारीख \
  करने के बीच अंतर करने के लिए अधिक से अधिक या बराबर होना चाहिए {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,यह शेयर आंदोलन पर आधारित है। देखें {0} जानकारी के लिए
 DocType: Pricing Rule,Selling,विक्रय
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},राशि {0} {1} {2} के खिलाफ की कटौती
 DocType: Employee,Salary Information,वेतन की जानकारी
 DocType: Sales Person,Name and Employee ID,नाम और कर्मचारी ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,नियत तिथि तिथि पोस्टिंग से पहले नहीं किया जा सकता
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,शुल्कों और करों
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तिथि दर्ज करें
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,इस आरोप प्रकार के लिए अधिक से अधिक या वर्तमान पंक्ति संख्या के बराबर पंक्ति संख्या का उल्लेख नहीं कर सकते
 DocType: Asset,Sold,बिक गया
 ,Item-wise Purchase History,आइटम के लिहाज से खरीदारी इतिहास
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},सीरियल मद के लिए जोड़ा लाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें {0}
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,ओपन उत्पादन के आदेश
 DocType: Sales Invoice Payment,Base Amount (Company Currency),आधार राशि (कंपनी मुद्रा)
 DocType: Payment Reconciliation Payment,Reference Row,संदर्भ पंक्ति
 DocType: Installation Note,Installation Time,अधिष्ठापन काल
 DocType: Sales Invoice,Accounting Details,लेखा विवरण
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,इस कंपनी के लिए सभी लेन-देन को हटाएं
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,निवेश
 DocType: Issue,Resolution Details,संकल्प विवरण
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,विचार-विमर्श
 DocType: Payment Entry,Transaction ID,लेन-देन आईडी
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,मूल्य निर्धारण नियमों आगे मात्रा के आधार पर छान रहे हैं.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},कृपया कर्मचारी {0} के लिए शामिल होने की तिथि निर्धारित करें
 DocType: Task,Total Billing Amount (via Time Sheet),कुल बिलिंग राशि (समय पत्रक के माध्यम से)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,दोहराने ग्राहक राजस्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) भूमिका की कीमत अनुमोदनकर्ता 'होना चाहिए
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,जोड़ा
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,उत्पादन के लिए बीओएम और मात्रा का चयन करें
 DocType: Asset,Depreciation Schedule,मूल्यह्रास अनुसूची
 DocType: Bank Reconciliation Detail,Against Account,खाते के खिलाफ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,आधा दिन की तारीख की तिथि से और आज तक के बीच होना चाहिए
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी में &#39;संपत्ति मूल्यह्रास लागत केंद्र&#39; सेट करें {0}
 ,Maintenance Schedules,रखरखाव अनुसूचियों
 DocType: Task,Actual End Date (via Time Sheet),वास्तविक अंत तिथि (समय पत्रक के माध्यम से)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},राशि {0} {1} के खिलाफ {2} {3}
 ,Quotation Trends,कोटेशन रुझान
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आइटम के लिए आइटम मास्टर में उल्लेख नहीं मद समूह {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,खाते में डेबिट एक प्राप्य खाता होना चाहिए
 DocType: Shipping Rule Condition,Shipping Amount,नौवहन राशि
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,लंबित राशि
 DocType: Purchase Invoice Item,Conversion Factor,परिवर्तनकारक तत्व
 DocType: Purchase Order,Delivered,दिया गया
 ,Vehicle Expenses,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
+DocType: Serial No,Invoice Details,चालान विवरण
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},उपयोगी जीवन के बाद उम्मीद मूल्य से अधिक या बराबर होना चाहिए {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन संख्या
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"तारीख, जिस पर आवर्ती चालान रोकने के लिए किया जाएगा"
 DocType: Employee Loan,Loan Amount,उधार की राशि
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,मानव संसाधन सेटिंग्स
 DocType: Salary Slip,net pay info,शुद्ध भुगतान की जानकारी
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च का दावा अनुमोदन के लिए लंबित है . केवल खर्च अनुमोदक स्थिति अपडेट कर सकते हैं .
 DocType: Email Digest,New Expenses,नए खर्च
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त छूट राशि
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","पंक्ति # {0}: मात्रा, 1 होना चाहिए के रूप में आइटम एक निश्चित परिसंपत्ति है। कई मात्रा के लिए अलग पंक्ति का उपयोग करें।"
 DocType: Leave Block List Allow,Leave Block List Allow,छोड़ दो ब्लॉक सूची की अनुमति दें
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr खाली या स्थान नहीं हो सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,गैर-समूह के लिए समूह
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,खेल
 DocType: Loan Type,Loan Name,ऋण नाम
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,ग्राहक अधिग्रहण और वफादारी
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,वेअरहाउस जहाँ आप को अस्वीकार कर दिया आइटम के शेयर को बनाए रखने रहे हैं
 DocType: Production Order,Skip Material Transfer,सामग्री स्थानांतरण छोड़ें
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,कुंजी दिनांक {2} के लिए {0} से {0} के लिए विनिमय दर खोजने में असमर्थ कृपया मैन्युअल रूप से एक मुद्रा विनिमय रिकॉर्ड बनाएं
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,आपकी वित्तीय वर्ष को समाप्त होता है
 DocType: POS Profile,Price List,कीमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} अब मूलभूत वित्त वर्ष है . परिवर्तन को प्रभावी बनाने के लिए अपने ब्राउज़र को ताज़ा करें.
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},खाते {0} अमान्य है। खाता मुद्रा होना चाहिए {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रूपांतरण कारक पंक्ति में आवश्यक है {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार बिक्री आदेश में से एक, बिक्री चालान या जर्नल प्रविष्टि होना चाहिए"
 DocType: Salary Component,Deduction,कटौती
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,पंक्ति {0}: समय और समय के लिए अनिवार्य है।
 DocType: Stock Reconciliation Item,Amount Difference,राशि अंतर
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},मद कीमत के लिए जोड़ा {0} मूल्य सूची में {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,इस व्यक्ति की बिक्री के कर्मचारी आईडी दर्ज करें
 DocType: Territory,Classification of Customers by region,क्षेत्र द्वारा ग्राहकों का वर्गीकरण
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,अंतर राशि शून्य होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,अंतर राशि शून्य होना चाहिए
 DocType: Project,Gross Margin,सकल मुनाफा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,पहली उत्पादन मद दर्ज करें
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,परिकलित बैंक बैलेंस
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,विकलांग उपयोगकर्ता
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,उद्धरण
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,उद्धरण
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,कुल कटौती
 ,Production Analytics,उत्पादन एनालिटिक्स
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},चेतावनी: कुर्की पर अवैध एसएसएल प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","सुराग आप व्यापार, अपने नेतृत्व के रूप में अपने सभी संपर्कों को और अधिक जोड़ने पाने में मदद"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","सुराग आप व्यापार, अपने नेतृत्व के रूप में अपने सभी संपर्कों को और अधिक जोड़ने पाने में मदद"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन टाइम
 DocType: Authorization Rule,Applicable To (User),के लिए लागू (उपयोगकर्ता)
 DocType: Purchase Taxes and Charges,Deduct,घटाना
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,कार्यालय का पता
 DocType: Appraisal,Calculate Total Score,कुल स्कोर की गणना
 DocType: Request for Quotation,Manufacturing Manager,विनिर्माण प्रबंधक
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},धारावाहिक नहीं {0} तक वारंटी के अंतर्गत है {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,संकुल में डिलिवरी नोट भाजित.
 apps/erpnext/erpnext/hooks.py +87,Shipments,लदान
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,{1} के लिए खाता शेष ({0}) और गोदाम {3} के लिए स्टॉक मूल्य ({2}) समान होना चाहिए
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,कुल छोड़ दो दिन
 DocType: Email Digest,Note: Email will not be sent to disabled users,नोट: ईमेल अक्षम उपयोगकर्ताओं के लिए नहीं भेजा जाएगा
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,इंटरैक्शन की संख्या
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी का चयन करें ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी का चयन करें ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,रिक्त छोड़ अगर सभी विभागों के लिए विचार
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार ( स्थायी , अनुबंध , प्रशिक्षु आदि ) के प्रकार."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} मद के लिए अनिवार्य है {1}
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,मुद्रा से
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","कम से कम एक पंक्ति में आवंटित राशि, प्रकार का चालान और चालान नंबर का चयन करें"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी मुद्रा)
 DocType: Student Guardian,Others,दूसरों
 DocType: Payment Entry,Unallocated Amount,unallocated राशि
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,एक मेल आइटम नहीं मिल सकता। के लिए {0} कुछ अन्य मूल्य का चयन करें।
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,कोई और अधिक अद्यतन
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"पहली पंक्ति के लिए ' पिछली पंक्ति कुल पर ', ' पिछली पंक्ति पर राशि ' या के रूप में कार्यभार प्रकार का चयन नहीं कर सकते"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,बाल मद एक उत्पाद बंडल नहीं होना चाहिए। आइटम को हटा दें `` {0} और बचाने के लिए कृपया
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बैंकिंग
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets जोड़े
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets जोड़े
 DocType: Vehicle Service,Service Item,सेवा आइटम
 DocType: Bank Guarantee,Bank Guarantee,बैंक गारंटी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,अनुसूची पाने के लिए 'उत्पन्न अनुसूची' पर क्लिक करें
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},पंक्ति # {0}: संपत्ति {1} पहले से ही है {2}
 DocType: Quotation Item,Stock Balance,बाकी स्टाक
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,भुगतान करने के लिए बिक्री आदेश
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,कृपया सेटअप के माध्यम से {0} के लिए नामकरण श्रृंखला सेट करें&gt; सेटिंग&gt; नामकरण श्रृंखला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,सी ई ओ
 DocType: Expense Claim Detail,Expense Claim Detail,व्यय दावा विवरण
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,सही खाते का चयन करें
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दाम नहीं दिखाया जाएगा अगर कीमत सूची सेट नहीं है
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,इस नौवहन नियम के लिए एक देश निर्दिष्ट या दुनिया भर में शिपिंग कृपया जांच करें
 DocType: Stock Entry,Total Incoming Value,कुल आवक मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,डेबिट करने के लिए आवश्यक है
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,डेबिट करने के लिए आवश्यक है
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets मदद से अपनी टीम के द्वारा किया गतिविधियों के लिए समय, लागत और बिलिंग का ट्रैक रखने"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरीद मूल्य सूची
 DocType: Offer Letter Term,Offer Term,ऑफर टर्म
 DocType: Quality Inspection,Quality Manager,गुणवत्ता प्रबंधक
 DocType: Job Applicant,Job Opening,नौकरी खोलने
 DocType: Payment Reconciliation,Payment Reconciliation,भुगतान सुलह
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,प्रभारी व्यक्ति के नाम का चयन करें
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,प्रौद्योगिकी
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},कुल अवैतनिक: {0}
 DocType: BOM Website Operation,BOM Website Operation,बीओएम वेबसाइट ऑपरेशन
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,खोया कारण
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नया पता
 DocType: Quality Inspection,Sample Size,नमूने का आकार
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,सभी आइटम पहले से चालान कर दिया गया है
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,रसीद दस्तावेज़ दर्ज करें
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,इसके अलावा लागत केन्द्रों समूह के तहत बनाया जा सकता है लेकिन प्रविष्टियों गैर समूहों के खिलाफ बनाया जा सकता है
 DocType: Project,External,बाहरी
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,उपयोगकर्ता और अनुमतियाँ
 DocType: Vehicle Log,VLOG.,Vlog।
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},उत्पादन के आदेश निर्मित: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल नंबर
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण और ब्रांडिंग
 DocType: Bin,Actual Quantity,वास्तविक मात्रा
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: अगले दिन शिपिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,नहीं मिला सीरियल नहीं {0}
 DocType: Scheduling Tool,Student Batch,छात्र बैच
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,अपने ग्राहकों
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,छात्र
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,छात्र
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},आप इस परियोजना पर सहयोग करने के लिए आमंत्रित किया गया है: {0}
 DocType: Leave Block List Date,Block Date,तिथि ब्लॉक
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,अभी अप्लाई करें
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,भेजा
 DocType: Payment Request,Make Sales Invoice,बिक्री चालान बनाएं
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,सॉफ्टवेयर
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,अगले संपर्क दिनांक अतीत में नहीं किया जा सकता
 DocType: Company,For Reference Only.,केवल संदर्भ के लिए।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,बैच नंबर का चयन करें
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,अग्रिम राशि
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,मुकदमा संख्या 0 नहीं हो सकता
 DocType: Item,Show a slideshow at the top of the page,पृष्ठ के शीर्ष पर एक स्लाइड शो दिखाएँ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,भंडार
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,भंडार
 DocType: Serial No,Delivery Time,सुपुर्दगी समय
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,के आधार पर बूढ़े
 DocType: Item,End of Life,जीवन का अंत
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,उपकरण का नाम बदलें
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,अद्यतन लागत
 DocType: Item Reorder,Item Reorder,आइटम पुनः क्रमित करें
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,वेतन पर्ची दिखाएँ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,हस्तांतरण सामग्री
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,वेतन पर्ची दिखाएँ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,हस्तांतरण सामग्री
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","संचालन, परिचालन लागत निर्दिष्ट और अपने संचालन के लिए एक अनूठा आपरेशन नहीं दे ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,इस दस्तावेज़ से सीमा से अधिक है {0} {1} आइटम के लिए {4}। आप कर रहे हैं एक और {3} उसी के खिलाफ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,बदलें चुनें राशि खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,सहेजने के बाद आवर्ती सेट करें
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,बदलें चुनें राशि खाते
 DocType: Purchase Invoice,Price List Currency,मूल्य सूची मुद्रा
 DocType: Naming Series,User must always select,उपयोगकर्ता हमेशा का चयन करना होगा
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक स्टॉक की अनुमति दें
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,बजट खाता
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","मौजूदा लेनदेन कर रहे हैं , क्योंकि कंपनी के डिफ़ॉल्ट मुद्रा में परिवर्तन नहीं कर सकते हैं . लेनदेन डिफ़ॉल्ट मुद्रा बदलने के लिए रद्द कर दिया जाना चाहिए ."
-DocType: Grade Interval,Grade Description,ग्रेड विवरण
+DocType: Grading Scale Interval,Grade Description,ग्रेड विवरण
 DocType: Stock Entry,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,वेतनपर्ची बनाएँ
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,तिथि उपस्थिति
 DocType: Warranty Claim,Raised By,द्वारा उठाए गए
 DocType: Payment Gateway Account,Payment Account,भुगतान खाता
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,कंपनी आगे बढ़ने के लिए निर्दिष्ट करें
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,लेखा प्राप्य में शुद्ध परिवर्तन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,प्रतिपूरक बंद
 DocType: Offer Letter,Accepted,स्वीकार किया
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आप वास्तव में इस कंपनी के लिए सभी लेन-देन को हटाना चाहते हैं सुनिश्चित करें। यह है के रूप में आपका मास्टर डाटा रहेगा। इस क्रिया को पूर्ववत नहीं किया जा सकता।
 DocType: Room,Room Number,कमरा संख्या
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},अमान्य संदर्भ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) की योजना बनाई quanitity से अधिक नहीं हो सकता है ({2}) उत्पादन में आदेश {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) की योजना बनाई quanitity से अधिक नहीं हो सकता है ({2}) उत्पादन में आदेश {3}
 DocType: Shipping Rule,Shipping Rule Label,नौवहन नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,उपयोगकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चे माल खाली नहीं किया जा सकता।
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","शेयर अद्यतन नहीं कर सका, चालान ड्रॉप शिपिंग आइटम शामिल हैं।"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,त्वरित जर्नल प्रविष्टि
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,बीओएम किसी भी आइटम agianst उल्लेख अगर आप दर में परिवर्तन नहीं कर सकते
 DocType: Employee,Previous Work Experience,पिछले कार्य अनुभव
 DocType: Stock Entry,For Quantity,मात्रा के लिए
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,नियम और Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्थान का नाम है जिसके लिए आप इस प्रणाली स्थापित कर रहे हैं।
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","इस तारीख तक कर जम लेखा प्रविष्टि, कोई नहीं / नीचे निर्दिष्ट भूमिका छोड़कर प्रविष्टि को संशोधित कर सकते हैं."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,कृपया रखरखाव शेड्यूल जनरेट करने से पहले दस्तावेज़ सहेजना
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,परियोजना की स्थिति
 DocType: UOM,Check this to disallow fractions. (for Nos),नामंज़ूर भिन्न करने के लिए इसे चेक करें. (ओपन स्कूल के लिए)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,निम्न उत्पादन के आदेश बनाया गया:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,एक छुट्टी पर काम कर रहे कर्मचारियों को
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क का तोहफा
 DocType: Project,% Complete Method,% पूर्ण विधि
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},रखरखाव शुरू करने की तारीख धारावाहिक नहीं के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},रखरखाव शुरू करने की तारीख धारावाहिक नहीं के लिए डिलीवरी की तारीख से पहले नहीं किया जा सकता {0}
 DocType: Production Order,Actual End Date,वास्तविक समाप्ति तिथि
 DocType: BOM,Operating Cost (Company Currency),परिचालन लागत (कंपनी मुद्रा)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,बिना वेतन छुट्टी को मंजूरी दे दी लीव आवेदन रिकॉर्ड के साथ मेल नहीं खाता
 DocType: Campaign,Campaign-.####,अभियान . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,अगला कदम
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,सबसे अच्छा संभव दरों पर निर्दिष्ट वस्तुओं की आपूर्ति करें
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 दिनों के बाद ऑटो बंद के मौके
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,अंत वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,कोट / लीड%
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,रिसी डी मात्रा
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},शुल्क रिकॉर्ड बनाया - {0}
 DocType: Asset Category Account,Asset Category Account,परिसंपत्ति वर्ग अकाउंट
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},अधिक आइटम उत्पादन नहीं कर सकते {0} से बिक्री आदेश मात्रा {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,स्टॉक एंट्री {0} प्रस्तुत नहीं किया गया है
 DocType: Payment Reconciliation,Bank / Cash Account,बैंक / रोकड़ लेखा
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,अगले संपर्क के द्वारा सीसा ईमेल एड्रेस के रूप में ही नहीं किया जा सकता
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,क्लीयरेंस तिथि का उल्लेख नहीं
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
 DocType: Guardian,Occupation,बायो
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,पंक्ति {0} : आरंभ तिथि समाप्ति तिथि से पहले होना चाहिए
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),कुल मात्रा)
 DocType: Sales Invoice,This Document,इस दस्तावेज़
 DocType: Installation Note Item,Installed Qty,स्थापित मात्रा
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,किसी समस्या की रिपोर्ट
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,उपयोगिता व्यय
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 से ऊपर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,पंक्ति # {0}: जर्नल प्रविष्टि {1} खाता नहीं है {2} या पहले से ही एक और वाउचर के खिलाफ मिलान
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,पंक्ति # {0}: जर्नल प्रविष्टि {1} खाता नहीं है {2} या पहले से ही एक और वाउचर के खिलाफ मिलान
 DocType: Buying Settings,Default Buying Price List,डिफ़ॉल्ट खरीद मूल्य सूची
 DocType: Process Payroll,Salary Slip Based on Timesheet,वेतन पर्ची के आधार पर Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ऊपर चयनित मानदंड या वेतन पर्ची के लिए कोई कर्मचारी पहले से ही बनाया
 DocType: Notification Control,Sales Order Message,बिक्री आदेश संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","आदि कंपनी , मुद्रा , चालू वित्त वर्ष , की तरह सेट डिफ़ॉल्ट मान"
 DocType: Payment Entry,Payment Type,भुगतान के प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,आइटम {0} के लिए बैच का चयन करें। इस आवश्यकता को पूरा करने वाले एकल बैच को खोजने में असमर्थ
 DocType: Process Payroll,Select Employees,चयन करें कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभावित बिक्री डील
 DocType: Payment Entry,Cheque/Reference Date,चैक / संदर्भ तिथि
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},पहले से ही कंपनी के लिए बनाया वैश्विक स्थिति प्रोफ़ाइल {0} {1}
 DocType: Purchase Order,Ref SQ,रेफरी वर्ग
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सभी BOMs आइटम / BOM बदलें
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,रसीद दस्तावेज प्रस्तुत किया जाना चाहिए
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,रसीद दस्तावेज प्रस्तुत किया जाना चाहिए
 DocType: Purchase Invoice Item,Received Qty,प्राप्त मात्रा
 DocType: Stock Entry Detail,Serial No / Batch,धारावाहिक नहीं / बैच
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,भुगतान नहीं किया और वितरित नहीं
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,डी.एन.-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,कोई समय पत्रक
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} ले अग्रेषित नहीं किया जा सकता प्रकार छोड़ दो
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',रखरखाव अनुसूची सभी मदों के लिए उत्पन्न नहीं है . 'उत्पन्न अनुसूची' पर क्लिक करें
 ,To Produce,निर्माण करने के लिए
 apps/erpnext/erpnext/config/hr.py +93,Payroll,पेरोल
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","पंक्ति के लिए {0} में {1}। आइटम दर में {2} में शामिल करने के लिए, पंक्तियों {3} भी शामिल किया जाना चाहिए"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,बनाओ उपयोगकर्ता
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,बनाओ उपयोगकर्ता
 DocType: Packing Slip,Identification of the package for the delivery (for print),प्रसव के लिए पैकेज की पहचान (प्रिंट के लिए)
 DocType: Bin,Reserved Quantity,आरक्षित मात्रा
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,कृपया मान्य ईमेल पता दर्ज करें
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,विकलांगों के लिए टेम्पलेट डिफ़ॉल्ट टेम्पलेट नहीं होना चाहिए
 DocType: Account,Income Account,आय खाता
 DocType: Payment Request,Amount in customer's currency,ग्राहक की मुद्रा में राशि
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,वितरण
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,वितरण
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान मात्रा
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",धारा लागत में &quot;सामग्री के आधार पर दर&quot; देखें
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,पिछला
 DocType: Appraisal Goal,Key Responsibility Area,कुंजी जिम्मेदारी क्षेत्र
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","छात्र बैचों आप उपस्थिति, आकलन और छात्रों के लिए फीस ट्रैक करने में मदद"
 DocType: Payment Entry,Total Allocated Amount,कुल आवंटित राशि
 DocType: Item Reorder,Material Request Type,सामग्री अनुरोध प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},से {0} को वेतन के लिए Accural जर्नल प्रविष्टि {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage भरा हुआ है, नहीं सहेजा गया"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage भरा हुआ है, नहीं सहेजा गया"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,पंक्ति {0}: UoM रूपांतरण कारक है अनिवार्य है
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,संदर्भ .......................
 DocType: Budget,Cost Center,लागत केंद्र
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,बिक्री लेन-देन से ग्राहक के कर आईडी छुपाएं
 DocType: Upload Attendance,Upload HTML,HTML अपलोड
 DocType: Employee,Relieving Date,तिथि राहत
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","मूल्य निर्धारण नियम कुछ मानदंडों के आधार पर, मूल्य सूची / छूट प्रतिशत परिभाषित अधिलेखित करने के लिए किया जाता है."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,वेयरहाउस केवल स्टॉक एंट्री / डिलिवरी नोट / खरीद रसीद के माध्यम से बदला जा सकता है
 DocType: Employee Education,Class / Percentage,/ कक्षा प्रतिशत
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,मार्केटिंग और सेल्स के प्रमुख
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","चयनित मूल्य निर्धारण नियम 'मूल्य' के लिए किया जाता है, यह मूल्य सूची लिख देगा। मूल्य निर्धारण नियम कीमत अंतिम कीमत है, ताकि आगे कोई छूट लागू किया जाना चाहिए। इसलिए, आदि बिक्री आदेश, खरीद आदेश तरह के लेनदेन में, बल्कि यह 'मूल्य सूची दर' क्षेत्र की तुलना में, 'दर' क्षेत्र में दिलवाया किया जाएगा।"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","चयनित मूल्य निर्धारण नियम 'मूल्य' के लिए किया जाता है, यह मूल्य सूची लिख देगा। मूल्य निर्धारण नियम कीमत अंतिम कीमत है, ताकि आगे कोई छूट लागू किया जाना चाहिए। इसलिए, आदि बिक्री आदेश, खरीद आदेश तरह के लेनदेन में, बल्कि यह 'मूल्य सूची दर' क्षेत्र की तुलना में, 'दर' क्षेत्र में दिलवाया किया जाएगा।"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रैक उद्योग प्रकार के द्वारा होता है .
 DocType: Item Supplier,Item Supplier,आइटम प्रदायक
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,कोई बैच पाने के मद कोड दर्ज करें
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},के लिए एक मूल्य का चयन करें {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सभी पते.
 DocType: Company,Stock Settings,स्टॉक सेटिंग्स
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","निम्नलिखित गुण दोनों रिकॉर्ड में वही कर रहे हैं अगर विलय ही संभव है। समूह, रूट प्रकार, कंपनी है"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',स्थिति के साथ कर्मचारियों को घटना के बारे में एक ईमेल भेज देंगे &#39;ओपन&#39;
 DocType: Task,Depends on Tasks,कार्य पर निर्भर करता है
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ग्राहक समूह ट्री प्रबंधन .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,शॉपिंग कार्ट को सक्षम किए बिना संलग्नक दिखाए जा सकते हैं
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,नए लागत केन्द्र का नाम
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण कक्ष छोड़ दो
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,करने के लिए डेबिट
 DocType: Delivery Note,Required only for sample item.,केवल नमूना आइटम के लिए आवश्यक है.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,लेन - देन के बाद वास्तविक मात्रा
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,आपूर्तिकर्ता&gt; प्रदायक प्रकार
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},कोई वेतन पर्ची के बीच पाया {0} और {1}
 ,Pending SO Items For Purchase Request,खरीद के अनुरोध के लिए लंबित है तो आइटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} अक्षम है
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} अक्षम है
 DocType: Supplier,Billing Currency,बिलिंग मुद्रा
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,एक्स्ट्रा लार्ज
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,मुखपृष्ठ रुप से प्रदर्शित उत्पाद
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,सभी मूल्यांकन समूह
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नए गोदाम नाम
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),कुल {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),कुल {0} ({1})
 DocType: C-Form Invoice Detail,Territory,क्षेत्र
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,कृपया उल्लेख आवश्यक यात्राओं की कोई
 DocType: Stock Settings,Default Valuation Method,डिफ़ॉल्ट मूल्यन विधि
 DocType: Vehicle Log,Fuel Qty,ईंधन मात्रा
 DocType: Production Order Operation,Planned Start Time,नियोजित प्रारंभ समय
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,मूल्य सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,आप सेट और लक्ष्यों की निगरानी कर सकते हैं ताकि सभी बिक्री लेनदेन कई ** बिक्री व्यक्तियों ** खिलाफ टैग किया जा सकता है।
 ,S.O. No.,बिक्री आदेश संख्या
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},लीड से ग्राहक बनाने कृपया {0}
 DocType: Price List,Applicable for Countries,देशों के लिए लागू
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,केवल छोड़ दो की स्थिति के साथ अनुप्रयोग &#39;स्वीकृत&#39; और &#39;अस्वीकृत&#39; प्रस्तुत किया जा सकता
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},छात्र समूह का नाम पंक्ति में अनिवार्य है {0}
@@ -2626,7 +2633,7 @@
 DocType: Project,Copied From,से प्रतिलिपि बनाई गई
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},नाम में त्रुटि: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,कमी
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} के साथ जुड़े नहीं है {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} के साथ जुड़े नहीं है {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी के लिए उपस्थिति {0} पहले से ही चिह्नित है
 DocType: Packing Slip,If more than one package of the same type (for print),यदि एक ही प्रकार के एक से अधिक पैकेज (प्रिंट के लिए)
 ,Salary Register,वेतन रजिस्टर
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,खरीदारी की टोकरी के लिए प्रयोग करें
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता के लिए {1} वैध आइटम की सूची में मौजूद नहीं है मद के लिए मान गुण {2}
 DocType: BOM Item,Scrap %,% स्क्रैप
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","प्रभार अनुपात में अपने चयन के अनुसार, मद मात्रा या राशि के आधार पर वितरित किया जाएगा"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","प्रभार अनुपात में अपने चयन के अनुसार, मद मात्रा या राशि के आधार पर वितरित किया जाएगा"
 DocType: Maintenance Visit,Purposes,उद्देश्यों
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,कम से कम एक आइटम वापसी दस्तावेज़ में नकारात्मक मात्रा के साथ दर्ज किया जाना चाहिए
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} कार्य केंद्र में किसी भी उपलब्ध काम के घंटे से अधिक समय तक {1}, कई आपरेशनों में आपरेशन तोड़ने के नीचे"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,टेरिटरी ट्री प्रबंधन .
 DocType: Journal Entry Account,Sales Invoice,बिक्री चालान
 DocType: Journal Entry Account,Party Balance,पार्टी बैलेंस
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,डिस्काउंट पर लागू होते हैं का चयन करें
 DocType: Company,Default Receivable Account,डिफ़ॉल्ट प्राप्य खाता
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ऊपर चयनित मानदंड के लिए भुगतान की गई कुल वेतन के लिए बैंक प्रविष्टि बनाएँ
 DocType: Stock Entry,Material Transfer for Manufacture,निर्माण के लिए सामग्री हस्तांतरण
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,डिस्काउंट प्रतिशत एक मूल्य सूची के खिलाफ या सभी मूल्य सूची के लिए या तो लागू किया जा सकता है.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,डिस्काउंट प्रतिशत एक मूल्य सूची के खिलाफ या सभी मूल्य सूची के लिए या तो लागू किया जा सकता है.
 DocType: Purchase Invoice,Half-yearly,आधे साल में एक बार
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,शेयर के लिए लेखा प्रविष्टि
 DocType: Vehicle Service,Engine Oil,इंजन तेल
 DocType: Sales Invoice,Sales Team1,Team1 बिक्री
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आइटम {0} मौजूद नहीं है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,आइटम {0} मौजूद नहीं है
 DocType: Sales Invoice,Customer Address,ग्राहक पता
 DocType: Employee Loan,Loan Details,ऋण विवरण
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,पंक्ति {0}: पूर्ण मात्रा शून्य से अधिक होना चाहिए।
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,जड़ के प्रकार
 DocType: Item,FIFO,फीफो
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},पंक्ति # {0}: अधिक से अधिक नहीं लौट सकते हैं {1} आइटम के लिए {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,भूखंड
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},लक्ष्य गोदाम पंक्ति के लिए अनिवार्य है {0}
 DocType: Cheque Print Template,Primary Settings,प्राथमिक सेटिंग
 DocType: Purchase Invoice,Select Supplier Address,प्रदायक पते का चयन
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,कर्मचारियों को जोड़ने
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,कर्मचारियों को जोड़ने
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता निरीक्षण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,अतिरिक्त छोटा
 DocType: Company,Standard Template,स्टैंडर्ड खाका
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी: मात्रा अनुरोध सामग्री न्यूनतम आदेश मात्रा से कम है
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} जमे हुए है
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,संगठन से संबंधित खातों की एक अलग चार्ट के साथ कानूनी इकाई / सहायक।
 DocType: Payment Request,Mute Email,म्यूट ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","खाद्य , पेय और तंबाकू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},केवल विरुद्ध भुगतान कर सकते हैं unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,आयोग दर 100 से अधिक नहीं हो सकता
 DocType: Stock Entry,Subcontract,उपपट्टा
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,1 {0} दर्ज करें
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,मौजूदा लेनदेन के साथ गोदामों समूह में परिवर्तित नहीं किया जा सकता है।
 DocType: Assessment Result Tool,Result HTML,परिणाम HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,पर समय सीमा समाप्त
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,छात्रों को जोड़ें
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,छात्रों को जोड़ें
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},कृपया चुनें {0}
 DocType: C-Form,C-Form No,कोई सी - फार्म
 DocType: BOM,Exploded_items,Exploded_items
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,राशि
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,वित्तीय वर्ष का चयन करें
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनः क्रमित करें
 DocType: Company,Chart Of Accounts Template,लेखा खाका का चार्ट
 DocType: Attendance,Attendance Date,उपस्थिति तिथि
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,प्रवेश डुप्लिकेट
 DocType: Program Enrollment Tool,Get Students,छात्रों
 DocType: Serial No,Under Warranty,वारंटी के अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[त्रुटि]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[त्रुटि]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,एक बार जब आप विक्रय क्रम सहेजें शब्दों में दिखाई जाएगी।
 ,Employee Birthday,कर्मचारी जन्मदिन
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,छात्र बैच उपस्थिति उपकरण
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,सीमा पार
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,वेंचर कैपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,इस &#39;शैक्षिक वर्ष&#39; के साथ एक शैक्षणिक अवधि {0} और &#39;शब्द का नाम&#39; {1} पहले से ही मौजूद है। इन प्रविष्टियों को संशोधित करने और फिर कोशिश करें।
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","आइटम {0} के खिलाफ मौजूदा लेनदेन देखते हैं के रूप में, आप के मूल्य में परिवर्तन नहीं कर सकते {1}"
 DocType: UOM,Must be Whole Number,पूर्ण संख्या होनी चाहिए
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नई पत्तियों आवंटित (दिनों में)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,धारावाहिक नहीं {0} मौजूद नहीं है
@@ -2823,7 +2830,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% सामग्री को इस बिक्री आदेश के सहारे बिल किया गया है
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,अवधि समापन एंट्री
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,मौजूदा लेनदेन के साथ लागत केंद्र समूह परिवर्तित नहीं किया जा सकता है
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},राशि {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},राशि {0} {1} {2} {3}
 DocType: Account,Depreciation,ह्रास
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),प्रदायक (ओं)
 DocType: Employee Attendance Tool,Employee Attendance Tool,कर्मचारी उपस्थिति उपकरण
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,अगले महीने के आखिरी दिन
 DocType: Support Settings,Auto close Issue after 7 days,7 दिनों के बाद ऑटो बंद जारी
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","पहले आवंटित नहीं किया जा सकता छोड़ दो {0}, छुट्टी संतुलन पहले से ही ले अग्रेषित भविष्य छुट्टी आवंटन रिकॉर्ड में किया गया है के रूप में {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),नोट: कारण / संदर्भ तिथि {0} दिन द्वारा अनुमति ग्राहक क्रेडिट दिनों से अधिक (ओं)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,छात्र आवेदक
 DocType: Asset Category Account,Accumulated Depreciation Account,संचित मूल्यह्रास अकाउंट
 DocType: Stock Settings,Freeze Stock Entries,स्टॉक प्रविष्टियां रुक
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,स्टॉक विश्लेषिकी
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,संचालन खाली नहीं छोड़ा जा सकता है
 DocType: Maintenance Visit Purpose,Against Document Detail No,दस्तावेज़ विस्तार नहीं के खिलाफ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,पार्टी प्रकार अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,पार्टी प्रकार अनिवार्य है
 DocType: Quality Inspection,Outgoing,बाहर जाने वाला
 DocType: Material Request,Requested For,के लिए अनुरोध
 DocType: Quotation Item,Against Doctype,Doctype के खिलाफ
@@ -2874,10 +2881,10 @@
 DocType: Asset,Item Code,आइटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन के आदेश बनाएँ
 DocType: Serial No,Warranty / AMC Details,वारंटी / एएमसी विवरण
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,गतिविधि आधारित समूह के लिए मैन्युअल रूप से छात्रों का चयन करें
 DocType: Journal Entry,User Remark,उपयोगकर्ता के टिप्पणी
 DocType: Lead,Market Segment,बाजार खंड
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},भुगतान की गई राशि कुल नकारात्मक बकाया राशि से अधिक नहीं हो सकता है {0}
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी आंतरिक कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),समापन (डॉ.)
 DocType: Cheque Print Template,Cheque Size,चैक आकार
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,सामग्री अनुरोध बनाएँ
 DocType: Employee Education,School/University,स्कूल / विश्वविद्यालय
 DocType: Payment Request,Reference Details,संदर्भ विवरण
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,उम्मीद मूल्य उपयोगी जीवन के बाद सकल खरीद की गई राशि से कम होना चाहिए
 DocType: Sales Invoice Item,Available Qty at Warehouse,गोदाम में उपलब्ध मात्रा
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल की राशि
 DocType: Asset,Double Declining Balance,डबल गिरावट का संतुलन
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","यह स्टॉक सुलह एक खोलने एंट्री के बाद से अंतर खाते, एक एसेट / दायित्व प्रकार खाता होना चाहिए"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित राशि ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},क्रय आदेश संख्या मद के लिए आवश्यक {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,उत्पादन आदेश नहीं बनाया
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,उत्पादन आदेश नहीं बनाया
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तिथि तक' 'तिथि से'  के बाद होनी चाहिए
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},छात्र के रूप में स्थिति को बदल नहीं सकते {0} छात्र आवेदन के साथ जुड़ा हुआ है {1}
 DocType: Asset,Fully Depreciated,पूरी तरह से घिस
 ,Stock Projected Qty,शेयर मात्रा अनुमानित
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ग्राहक {0} परियोजना से संबंधित नहीं है {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,उल्लेखनीय उपस्थिति एचटीएमएल
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","कोटेशन प्रस्तावों, बोलियों आप अपने ग्राहकों के लिए भेजा है रहे हैं"
 DocType: Sales Order,Customer's Purchase Order,ग्राहक के क्रय आदेश
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सीरियल नहीं और बैच
 DocType: Warranty Claim,From Company,कंपनी से
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन मापदंड के अंकों के योग {0} की जरूरत है।
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,मूल्य या मात्रा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations की संख्या बुक सेट करें
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,मूल्य या मात्रा
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,प्रोडक्शंस आदेश के लिए नहीं उठाया जा सकता है:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,मिनट
 DocType: Purchase Invoice,Purchase Taxes and Charges,खरीद कर और शुल्क
@@ -2938,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,सभी गोदामों
 DocType: Sales Partner,Retailer,खुदरा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,खाते में जमा एक बैलेंस शीट खाता होना चाहिए
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,सभी आपूर्तिकर्ता के प्रकार
 DocType: Global Defaults,Disable In Words,शब्दों में अक्षम
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,आइटम स्वचालित रूप से गिने नहीं है क्योंकि मद कोड अनिवार्य है
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},कोटेशन {0} नहीं प्रकार की {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,समर्थक-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,बैंक ओवरड्राफ्ट खाता
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,वेतन पर्ची बनाओ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ति # {0}: आवंटित राशि बकाया राशि से अधिक नहीं हो सकती।
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ब्राउज़ बीओएम
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,सुरक्षित कर्जे
 DocType: Purchase Invoice,Edit Posting Date and Time,पोस्टिंग दिनांक और समय संपादित करें
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},से शेयर लेनदेन पुराने अद्यतन करने की अनुमति नहीं है {0}
 DocType: Purchase Invoice Item,PR Detail,पीआर विस्तार
 DocType: Sales Order,Fully Billed,पूरी तरह से किसी तरह का बिल
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},कर्मचारी में डिफ़ॉल्ट देय खाते को सेट करें {0}
 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 +127,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),पैकेज के कुल वजन. आमतौर पर शुद्ध + वजन पैकेजिंग सामग्री के वजन. (प्रिंट के लिए)
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,समूह आधार पर
 DocType: Journal Entry,Bill Date,बिल की तारीख
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","सेवा आइटम, प्रकार, आवृत्ति और व्यय राशि की आवश्यकता होती है"
-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:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राथमिकता के साथ कई मूल्य निर्धारण नियम हैं, भले ही उसके बाद निम्न आंतरिक प्राथमिकताओं लागू कर रहे हैं:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},आप वास्तव में से {0} के लिए सभी वेतन पर्ची जमा करना चाहते हैं {1}
 DocType: Cheque Print Template,Cheque Height,चैक ऊंचाई
 DocType: Supplier,Supplier Details,आपूर्तिकर्ता विवरण
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,चालान रेफरी
 DocType: Purchase Order,Recurring Order,आवर्ती आदेश
 DocType: Company,Default Income Account,डिफ़ॉल्ट आय खाता
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक समूह / ग्राहक
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ग्राहक समूह / ग्राहक
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),खुला हुआ वित्त वर्षों के लाभ / हानि (क्रेडिट)
 DocType: Sales Invoice,Time Sheets,समय पत्रक
 DocType: Payment Gateway Account,Default Payment Request Message,डिफ़ॉल्ट भुगतान अनुरोध संदेश
@@ -3028,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Employee Loan,Employee Loan Application,कर्मचारी ऋण आवेदन
 DocType: Issue,Opening Date,तिथि खुलने की
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,उपस्थिति सफलतापूर्वक अंकित की गई है।
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,उपस्थिति सफलतापूर्वक अंकित की गई है।
 DocType: Journal Entry,Remark,टिप्पणी
 DocType: Purchase Receipt Item,Rate and Amount,दर और राशि
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},खाते का प्रकार {0} के लिए होना चाहिए {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},खाते का प्रकार {0} के लिए होना चाहिए {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,पत्तियां और छुट्टी
 DocType: School Settings,Current Academic Term,वर्तमान शैक्षणिक अवधि
 DocType: Sales Order,Not Billed,नहीं बिल
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,छात्र समूह
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन सीरीज
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","एक आइटम ( {0}) , मद समूह का नाम बदलने के लिए या आइटम का नाम बदलने के लिए कृपया एक ही नाम के साथ मौजूद है"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,कृपया ग्राहक का चयन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,कृपया ग्राहक का चयन
 DocType: C-Form,I,मैं
 DocType: Company,Asset Depreciation Cost Center,संपत्ति मूल्यह्रास लागत केंद्र
 DocType: Sales Order Item,Sales Order Date,बिक्री आदेश दिनांक
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,बीमा विवरण
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,चुकौती अवधि दर्ज करें
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),देनदार ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),देनदार ({0})
 DocType: Pricing Rule,Margin,हाशिया
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नए ग्राहकों
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,सकल लाभ%
 DocType: Appraisal Goal,Weightage (%),वेटेज (%)
 DocType: Bank Reconciliation Detail,Clearance Date,क्लीयरेंस तिथि
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,सकल खरीद राशि अनिवार्य है
 DocType: Lead,Address Desc,जानकारी पता करने के लिए
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,पार्टी अनिवार्य है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,पार्टी अनिवार्य है
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाम
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,बेचने या खरीदने का कम से कम एक का चयन किया जाना चाहिए
-DocType: Grading Structure,Grade Intervals,ग्रेड अंतराल
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपके व्यवसाय की प्रकृति का चयन करें।
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},पंक्ति # {0}: संदर्भ में डुप्लिकेट एंट्री {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,निर्माण कार्यों कहां किया जाता है।
 DocType: Asset Movement,Source Warehouse,स्रोत वेअरहाउस
 DocType: Installation Note,Installation Date,स्थापना की तारीख
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट्स के लिए पत्र सिर .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट्स के लिए खिताब उदा प्रोफार्मा चालान .
 DocType: Student Guardian,Student Guardian,छात्र गार्जियन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार के आरोप समावेशी के रूप में चिह्नित नहीं कर सकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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,बीओएम दर
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,मुद्रा लाभ / हानि खाता
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी और उपस्थिति
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},उद्देश्य से एक होना चाहिए {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,फार्म भरें और इसे बचाने के लिए
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,सामुदायिक फोरम
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,स्टॉक में वास्तविक मात्रा
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder मात्रा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नौकरी के उद्घाटन
 DocType: Company,Stock Adjustment Account,स्टॉक समायोजन खाता
-DocType: Journal Entry,Write Off,ख़ारिज करना
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ख़ारिज करना
 DocType: Timesheet Detail,Operation 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}
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,आपूर्तिकर्ता ग्राहक को बचाता है
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# प्रपत्र / मद / {0}) स्टॉक से बाहर है
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,अगली तारीख पोस्ट दिनांक से अधिक होना चाहिए
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,शो कर तोड़-अप
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,शो कर तोड़-अप
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},कारण / संदर्भ तिथि के बाद नहीं किया जा सकता {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डाटा आयात और निर्यात
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","स्टॉक प्रविष्टियों, {0} गोदाम के खिलाफ मौजूद इसलिए आप नहीं फिर से आवंटित या इसे संशोधित कर सकते हैं"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,कोई छात्र नहीं मिले
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,कोई छात्र नहीं मिले
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,चालान पोस्ट दिनांक
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,बेचना
 DocType: Sales Invoice,Rounded Total,गोल कुल
 DocType: Product Bundle,List items that form the package.,सूची आइटम है कि पैकेज का फार्म.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,प्रतिशत आवंटन 100 % के बराबर होना चाहिए
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,कृपया पार्टी के चयन से पहले पोस्ट दिनांक का चयन
 DocType: Program Enrollment,School House,स्कूल हाउस
 DocType: Serial No,Out of AMC,एएमसी के बाहर
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया उद्धरण का चयन करें
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,रखरखाव भेंट बनाओ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया उद्धरण का चयन करें
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,बुक depreciations की संख्या कुल depreciations की संख्या से अधिक नहीं हो सकता
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,रखरखाव भेंट बनाओ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,बिक्री मास्टर प्रबंधक {0} भूमिका है जो उपयोगकर्ता के लिए संपर्क करें
 DocType: Company,Default Cash Account,डिफ़ॉल्ट नकद खाता
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,कंपनी ( नहीं ग्राहक या प्रदायक) मास्टर .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,यह इस छात्र की उपस्थिति पर आधारित है
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,में कोई छात्र नहीं
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आइटम या खुले पूर्ण रूप में जोड़ें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' उम्मीद की डिलीवरी तिथि ' दर्ज करें
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिवरी नोट्स {0} इस बिक्री आदेश रद्द करने से पहले रद्द कर दिया जाना चाहिए
@@ -3226,6 +3234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आइटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,मद और वारंटी के विवरण
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आइटम कोड&gt; आइटम समूह&gt; ब्रांड
 DocType: Sales Team,Contribution (%),अंशदान (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,नोट : भुगतान एंट्री ' नकद या बैंक खाता' निर्दिष्ट नहीं किया गया था के बाद से नहीं बनाया जाएगा
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,अनिवार्य पाठ्यक्रम प्राप्त करने के लिए कार्यक्रम का चयन करें।
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,सुलह से पहले
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),करों और शुल्कों जोड़ा (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आइटम कर पंक्ति {0} प्रकार टैक्स या आय या खर्च या प्रभार्य का खाता होना चाहिए
 DocType: Sales Order,Partly Billed,आंशिक रूप से बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,मद {0} एक निश्चित परिसंपत्ति मद में होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,मद {0} एक निश्चित परिसंपत्ति मद में होना चाहिए
 DocType: Item,Default BOM,Default बीओएम
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,फिर से लिखें कंपनी के नाम की पुष्टि के लिए कृपया
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,कुल बकाया राशि
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,मोटर वाहन
 DocType: Vehicle,Insurance Company,बीमा कंपनी
 DocType: Asset Category Account,Fixed Asset Account,फिक्स्ड परिसंपत्ति खाते
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,परिवर्तनशील
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिवरी नोट से
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,परिवर्तनशील
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,डिलिवरी नोट से
 DocType: Student,Student Email Address,छात्र ईमेल एड्रेस
 DocType: Timesheet Detail,From Time,समय से
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,स्टॉक में:
@@ -3264,12 +3273,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,मूल्य सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,प्रशिक्षु
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,पता नाम
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,पता नाम
 DocType: Stock Entry,From BOM,बीओएम से
 DocType: Assessment Code,Assessment Code,आकलन संहिता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,बुनियादी
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} से पहले शेयर लेनदेन जमे हुए हैं
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule','उत्पन्न अनुसूची' पर क्लिक करें
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","जैसे किलोग्राम, यूनिट, ओपन स्कूल, मीटर"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"आप संदर्भ तिथि में प्रवेश किया , तो संदर्भ कोई अनिवार्य है"
 DocType: Bank Reconciliation Detail,Payment Document,भुगतान दस्तावेज़
@@ -3277,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,वेतन संरचना
 DocType: Account,Bank,बैंक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाइन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,मुद्दा सामग्री
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,मुद्दा सामग्री
 DocType: Material Request Item,For Warehouse,गोदाम के लिए
 DocType: Employee,Offer Date,प्रस्ताव की तिथि
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,कोटेशन
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,आप ऑफ़लाइन मोड में हैं। आप जब तक आप नेटवर्क है फिर से लोड करने में सक्षम नहीं होगा।
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,कोई छात्र गुटों बनाया।
 DocType: Purchase Invoice Item,Serial No,नहीं सीरियल
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक भुगतान राशि ऋण राशि से अधिक नहीं हो सकता
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince विवरण दर्ज करें
 DocType: Purchase Invoice,Print Language,प्रिंट भाषा
 DocType: Salary Slip,Total Working Hours,कुल काम के घंटे
 DocType: Stock Entry,Including items for sub assemblies,उप असेंबलियों के लिए आइटम सहित
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,दर्ज मूल्य सकारात्मक होना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,सभी प्रदेशों
 DocType: Purchase Invoice,Items,आइटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,छात्र पहले से ही दाखिला लिया है।
@@ -3308,16 +3317,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',संस्करण के लिए उपाय की मूलभूत इकाई &#39;{0}&#39; खाका के रूप में ही होना चाहिए &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,के आधार पर गणना करें
 DocType: Delivery Note Item,From Warehouse,गोदाम से
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,सामग्री के बिल के साथ कोई वस्तुओं का निर्माण करने के लिए
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक का नाम
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नामांकन पाठ्यक्रम
-DocType: Grading Structure,Grading Structure,ग्रेडिंग संरचना
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन और कुल
 DocType: Tax Rule,Shipping City,शिपिंग शहर
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"इस मद {0} (खाका) का एक संस्करण है। 'कोई प्रतिलिपि' सेट कर दिया जाता है, जब तक गुण टेम्पलेट से अधिक नकल की जाएगी"
 DocType: Notification Control,Customize the Notification,अधिसूचना को मनपसंद
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,आपरेशन से नकद प्रवाह
 DocType: Sales Invoice,Shipping Rule,नौवहन नियम
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},कोई डिफ़ॉल्ट बीओएम मौजूद मद के लिए {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,पहली पोस्टिंग तिथि का चयन करें
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,दिनांक खोलने की तिथि बंद करने से पहले किया जाना चाहिए
 DocType: Leave Control Panel,Carry Forward,आगे ले जाना
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,मौजूदा लेनदेन के साथ लागत केंद्र लेज़र परिवर्तित नहीं किया जा सकता है
 DocType: Department,Days for which Holidays are blocked for this department.,दिन छुट्टियाँ जिसके लिए इस विभाग के लिए अवरुद्ध कर रहे हैं.
@@ -3351,7 +3358,7 @@
 DocType: Mode of Payment,General,सामान्य
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,लेटरहेड अटैच
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,अंतिम संचार
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',श्रेणी ' मूल्यांकन ' या ' मूल्यांकन और कुल ' के लिए है जब घटा नहीं कर सकते
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,चालान के साथ मैच भुगतान
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),कुल (राशि)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन और आराम
 DocType: Quality Inspection,Item Serial No,आइटम कोई धारावाहिक
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,कर्मचारी रिकॉर्ड बनाएं
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,कर्मचारी रिकॉर्ड बनाएं
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,कुल वर्तमान
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,लेखांकन बयान
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,घंटा
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,अनजान
 DocType: Shipping Rule,Shipping Rule Conditions,नौवहन नियम शर्तें
 DocType: BOM Replace Tool,The new BOM after replacement,बदलने के बाद नए बीओएम
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,बिक्री के प्वाइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,बिक्री के प्वाइंट
 DocType: Payment Entry,Received Amount,प्राप्त राशि
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया मानव संसाधन में कर्मचारी नामकरण प्रणाली&gt; एचआर सेटिंग्स सेट करें
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","पूर्ण मात्रा के लिए बनाएँ, आदेश पर पहले से ही मात्रा की अनदेखी"
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,चिह्नित नहीं
@@ -3393,9 +3399,9 @@
 DocType: C-Form,Invoices,चालान
 DocType: Batch,Source Document Name,स्रोत दस्तावेज़ का नाम
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,बनाएं उपयोगकर्ता
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,बनाएं उपयोगकर्ता
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,निर्माण करने के लिए मात्रा 0 से अधिक होना चाहिए।
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,रखरखाव कॉल के लिए रिपोर्ट पर जाएँ.
 DocType: Stock Entry,Update Rate and Availability,अद्यतन दर और उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,आप मात्रा के खिलाफ और अधिक प्राप्त या वितरित करने के लिए अनुमति दी जाती प्रतिशत का आदेश दिया. उदाहरण के लिए: यदि आप 100 यूनिट का आदेश दिया है. और अपने भत्ता 10% तो आप 110 इकाइयों को प्राप्त करने के लिए अनुमति दी जाती है.
@@ -3404,28 +3410,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},व्यय खाते आइटम के लिए अनिवार्य है {0}
 DocType: BOM,Website Description,वेबसाइट विवरण
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी में शुद्ध परिवर्तन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,चालान की खरीद {0} को रद्द कृपया पहले
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ईमेल एड्रेस अद्वितीय होना चाहिए, पहले से ही के लिए मौजूद है {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी समाप्ति तिथि
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,रसीद
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,रसीद
 ,Sales Register,बिक्री रजिस्टर
 DocType: Daily Work Summary Settings Company,Send Emails At,ईमेल भेजें पर
 DocType: Quotation,Quotation Lost Reason,कोटेशन कारण खोया
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,अपने डोमेन का चयन करें
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},लेन-देन संदर्भ कोई {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करने के लिए कुछ भी नहीं है .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,इस महीने और लंबित गतिविधियों के लिए सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक समूह का नाम
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अभी तक कोई ग्राहक नहीं!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,नकदी प्रवाह विवरण
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ऋण राशि का अधिकतम ऋण राशि से अधिक नहीं हो सकता है {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,लाइसेंस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},सी-फार्म से इस चालान {0} निकाल दें {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,खाता बंद लिखने दर्ज करें
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,पिछले आदेश की तिथि
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाता {0} करता है कंपनी के अंतर्गत आता नहीं {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} पंक्ति में सीरियल नंबर डिलिवरी नोट से मेल नहीं खाती
 DocType: Student,Guardian Details,गार्जियन विवरण
 DocType: C-Form,C-Form,सी - फार्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,कई कर्मचारियों के लिए मार्क उपस्थिति
@@ -3450,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',पंक्ति {0} # खाता प्रकार का होना चाहिए &#39;फिक्स्ड एसेट&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,मात्रा बाहर
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,एक बिक्री के लिए शिपिंग राशि की गणना करने के नियम
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,सीरीज अनिवार्य है
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,सीरीज अनिवार्य है
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवाएँ
 DocType: Student Sibling,Student ID,छात्र आईडी
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,समय लॉग के लिए गतिविधियों के प्रकार
 DocType: Tax Rule,Sales,विक्रय
 DocType: Stock Entry Detail,Basic Amount,मूल राशि
 DocType: Training Event,Exam,परीक्षा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},शेयर मद के लिए आवश्यक वेयरहाउस {0}
 DocType: Leave Allocation,Unused leaves,अप्रयुक्त पत्ते
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,सीआर
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,सीआर
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,हस्तांतरण
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खाते से संबद्ध नहीं है {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खाते से संबद्ध नहीं है {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),( उप असेंबलियों सहित) विस्फोट बीओएम लायें
 DocType: Authorization Rule,Applicable To (Employee),के लिए लागू (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,नियत तिथि अनिवार्य है
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,गुण के लिए वेतन वृद्धि {0} 0 नहीं किया जा सकता
@@ -3474,13 +3482,13 @@
 ,Inactive Customers,निष्क्रिय ग्राहकों
 DocType: Landed Cost Voucher,LCV,एलसीवी
 DocType: Landed Cost Voucher,Purchase Receipts,खरीद प्राप्तियां
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कैसे मूल्य निर्धारण नियम लागू किया जाता है?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,कैसे मूल्य निर्धारण नियम लागू किया जाता है?
 DocType: Stock Entry,Delivery Note No,डिलिवरी नोट
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","अगर जाँच की, केवल खरीदारी अंतिम कच्चे माल के लिए सामग्री अनुरोधों सामग्री अनुरोधों में शामिल कर दिया जाएगा। अन्यथा, माता-पिता मदों के लिए सामग्री अनुरोध बनाया जाएगा"
 DocType: Cheque Print Template,Message to show,संदेश दिखाने के लिए
 DocType: Company,Retail,खुदरा
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,उत्पाद बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,उत्पाद बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},पंक्ति {0}: अमान्य संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,करों और शुल्कों टेम्पलेट खरीद
 DocType: Upload Attendance,Download Template,टेम्पलेट डाउनलोड करें
@@ -3490,10 +3498,10 @@
 DocType: Payment Entry,Account Paid From,खाते से भुगतान
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चे माल के मद कोड
 DocType: Journal Entry,Write Off Based On,के आधार पर बंद लिखने के लिए
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,लीड बनाओ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,लीड बनाओ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,प्रिंट और स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,शो बारकोड फील्ड
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,प्रदायक ईमेल भेजें
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,प्रदायक ईमेल भेजें
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","वेतन पहले ही बीच {0} और {1}, आवेदन की अवधि छोड़ दो इस तिथि सीमा के बीच नहीं हो सकता है अवधि के लिए कार्रवाई की।"
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,एक सीरियल नंबर के लिए स्थापना रिकॉर्ड
 DocType: Guardian Interest,Guardian Interest,गार्जियन ब्याज
@@ -3505,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,प्रतिक्रिया की प्रतीक्षा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ऊपर
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},अमान्य विशेषता {0} {1}
+DocType: Supplier,Mention if non-standard payable account,यदि मानक मानक देय खाता है तो उल्लेख करें
 DocType: Salary Slip,Earning & Deduction,अर्जन कटौती
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,वैकल्पिक . यह सेटिंग विभिन्न लेनदेन में फिल्टर करने के लिए इस्तेमाल किया जाएगा .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर की अनुमति नहीं है
@@ -3520,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,उत्पादन आदेश आइटम
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,कोई रिकॉर्ड पाया
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,खत्म कर दिया संपत्ति की लागत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,आंशिक रूप से सीधे ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आइटम के लिए लागत केंद्र अनिवार्य है {2}
 DocType: Vehicle,Policy No,पॉलिसी संख्या
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,उत्पाद बंडल से आइटम प्राप्त
 DocType: Asset,Straight Line,सीधी रेखा
 DocType: Project User,Project User,परियोजना उपयोगकर्ता
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,विभाजित करें
@@ -3538,7 +3546,7 @@
 DocType: Program Enrollment Tool,Get Students From,से छात्रों जाओ
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट पर आइटम प्रकाशित करें
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,बैचों में समूह अपने छात्रों
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,बैचों में समूह अपने छात्रों
 DocType: Authorization Rule,Authorization Rule,प्राधिकरण नियम
 DocType: Sales Invoice,Terms and Conditions Details,नियमों और शर्तों के विवरण
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,निर्दिष्टीकरण
@@ -3590,14 +3598,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,चेक तिथि
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: माता पिता के खाते {1} कंपनी से संबंधित नहीं है: {2}
 DocType: Program Enrollment Tool,Student Applicants,छात्र आवेदकों
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,सफलतापूर्वक इस कंपनी से संबंधित सभी लेन-देन को नष्ट कर दिया!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,आज की तारीख में
 DocType: Appraisal,HR,मानव संसाधन
 DocType: Program Enrollment,Enrollment Date,नामांकन तिथि
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,परिवीक्षा
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,वेतन अवयव
 DocType: Program Enrollment Tool,New Academic Year,नए शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,वापसी / क्रेडिट नोट
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,वापसी / क्रेडिट नोट
 DocType: Stock Settings,Auto insert Price List rate if missing,ऑटो डालने मूल्य सूची दर लापता यदि
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,कुल भुगतान की गई राशि
 DocType: Production Order Item,Transferred Qty,मात्रा तबादला
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","आकस्मिक, बीमार आदि की तरह पत्तियों के प्रकार"
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल के माध्यम से नियमित रूप से सारांश रिपोर्ट भेजें।
 DocType: Payment Entry,PE-,पीई-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},में व्यय दावा प्रकार डिफ़ॉल्ट खाता सेट करें {0}
 DocType: Assessment Result,Student Name,छात्र का नाम
 DocType: Brand,Item Manager,आइटम प्रबंधक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,पेरोल देय
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,बिक्री कीप
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,संक्षिप्त अनिवार्य है
 DocType: Project,Task Progress,कार्य प्रगति
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,गाड़ी
 ,Qty to Transfer,स्थानांतरण करने के लिए मात्रा
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,सुराग या ग्राहक के लिए उद्धरण.
 DocType: Stock Settings,Role Allowed to edit frozen stock,जमे हुए शेयर संपादित करने के लिए रख सकते है भूमिका
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,मद वार कर विस्तार से
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,संस्थान संक्षिप्त
 ,Item-wise Price List Rate,मद वार मूल्य सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,प्रदायक कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,प्रदायक कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,शब्दों में दिखाई हो सकता है एक बार आप उद्धरण बचाने के लिए होगा.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},मात्रा ({0}) पंक्ति {1} में अंश नहीं हो सकता
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,फीस जमा
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},बारकोड {0} पहले से ही मद में इस्तेमाल {1}
 DocType: Lead,Add to calendar on this date,इस तिथि पर कैलेंडर में जोड़ें
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग लागत को जोड़ने के लिए नियम.
 DocType: Item,Opening Stock,आरंभिक स्टॉक
@@ -3688,8 +3697,8 @@
  'टाइम प्रवेश' के माध्यम से अद्यतन"
 DocType: Customer,From Lead,लीड से
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,उत्पादन के लिए आदेश जारी किया.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,वित्तीय वर्ष का चयन करें ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,पीओएस प्रोफ़ाइल पीओएस एंट्री बनाने के लिए आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,छात्रों को भर्ती
 DocType: Hub Settings,Name Token,नाम टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक बेच
@@ -3700,7 +3709,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} बिक्री चालान के खिलाफ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,इस परियोजना का नाम
-DocType: Supplier,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
+DocType: Customer,Mention if non-standard receivable account,"मेंशन अमानक प्राप्य खाते है, तो"
 DocType: Journal Entry Account,If Income or Expense,यदि आय या व्यय
 DocType: Production Order,Required Items,आवश्यक आइटम
 DocType: Stock Ledger Entry,Stock Value Difference,स्टॉक मूल्य अंतर
@@ -3721,7 +3730,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,सेट आइटम इस बिक्री व्यक्ति के लिए समूह - वार लक्ष्य.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],रुक स्टॉक से अधिक उम्र [ दिन]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,पंक्ति # {0}: संपत्ति निश्चित संपत्ति खरीद / बिक्री के लिए अनिवार्य है
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दो या दो से अधिक मूल्य निर्धारण नियमों उपरोक्त शर्तों के आधार पर पाए जाते हैं, प्राथमिकता लागू किया जाता है। डिफ़ॉल्ट मान शून्य (रिक्त) है, जबकि प्राथमिकता 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.,निम्नलिखित उपयोगकर्ता ब्लॉक दिनों के लिए छोड़ एप्लीकेशन को स्वीकृत करने की अनुमति दें.
@@ -3745,7 +3754,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,यह एक शेयर आइटम नहीं है क्योंकि मद {0} को नजरअंदाज कर दिया
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","एक विशेष लेन - देन में मूल्य निर्धारण नियम लागू नहीं करने के लिए, सभी लागू नहीं डालती निष्क्रिय किया जाना चाहिए."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एक विशेष लेन - देन में मूल्य निर्धारण नियम लागू नहीं करने के लिए, सभी लागू नहीं डालती निष्क्रिय किया जाना चाहिए."
 DocType: Assessment Group,Parent Assessment Group,जनक आकलन समूह
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नौकरियां
 ,Sales Order Trends,बिक्री आदेश रुझान
@@ -3756,7 +3765,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त लागत
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,वित्तीय वर्ष की समाप्ति तिथि
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","वाउचर के आधार पर फ़िल्टर नहीं कर सकते नहीं, वाउचर के आधार पर समूहीकृत अगर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,प्रदायक कोटेशन बनाओ
 DocType: Quality Inspection,Incoming,आवक
 DocType: BOM,Materials Required (Exploded),माल आवश्यक (विस्फोट)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","खुद के अलावा अन्य, अपने संगठन के लिए उपयोगकर्ताओं को जोड़ें"
@@ -3784,6 +3793,7 @@
 DocType: Employee,History In Company,कंपनी में इतिहास
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,समाचारपत्रिकाएँ
 DocType: Stock Ledger Entry,Stock Ledger Entry,स्टॉक खाता प्रविष्टि
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक समूह&gt; क्षेत्र
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,एक ही आइटम कई बार दर्ज किया गया है
 DocType: Department,Leave Block List,ब्लॉक सूची छोड़ दो
 DocType: Sales Invoice,Tax ID,टैक्स आईडी
@@ -3793,7 +3803,7 @@
 DocType: Customer,Sales Partner and Commission,बिक्री साथी और आयोग
 DocType: Employee Loan,Rate of Interest (%) / Year,ब्याज (%) / वर्ष की दर
 ,Project Quantity,परियोजना मात्रा
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","कुल {0} सभी मदों के लिए शून्य है, तो आप &#39;के आधार पर शुल्क वितरित&#39; परिवर्तन होना चाहिए हो सकता है"
 DocType: Opportunity,To Discuss,चर्चा करने के लिए
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} की इकाइयों {1} {2} इस सौदे को पूरा करने के लिए की जरूरत है।
 DocType: Loan Type,Rate of Interest (%) Yearly,ब्याज दर (%) वार्षिक
@@ -3808,7 +3818,7 @@
 DocType: Purchase Invoice,Return,वापसी
 DocType: Production Order Operation,Production Order Operation,उत्पादन का आदेश ऑपरेशन
 DocType: Pricing Rule,Disable,असमर्थ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,भुगतान की विधि भुगतान करने के लिए आवश्यक है
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,भुगतान की विधि भुगतान करने के लिए आवश्यक है
 DocType: Project Task,Pending Review,समीक्षा के लिए लंबित
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","एसेट {0}, खत्म कर दिया नहीं जा सकता क्योंकि यह पहले से ही है {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(व्यय दावा) के माध्यम से कुल खर्च का दावा
@@ -3816,11 +3826,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपस्थित
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},पंक्ति {0}: बीओएम # की मुद्रा {1} चयनित मुद्रा के बराबर होना चाहिए {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,बिक्री आदेश {0} प्रस्तुत नहीं किया गया है
 DocType: Homepage,Tag Line,टैग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,बेड़े प्रबंधन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,से आइटम जोड़ें
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,से आइटम जोड़ें
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},वेयरहाउस {0}: माता पिता के खाते {1} कंपनी को Bolong नहीं है {2}
 DocType: Cheque Print Template,Regular,नियमित
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,सभी मूल्यांकन मापदंड के कुल वेटेज 100% होना चाहिए
@@ -3833,7 +3843,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,चयनित आइटम बैच नहीं हो सकता
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर मद {0}, जिसके लिए लेखांकन प्रविष्टियों करने के लिए आवश्यक है के लिए नहीं मिला {1} {2}। मद में एक नमूना आइटम के रूप में लेनदेन किया जाता है तो {1}, कि {1} मद तालिका में उल्लेख करें। अन्यथा, कृपया मद रिकॉर्ड में आइटम या उल्लेख मूल्यांकन दर के लिए एक इनकमिंग शेयर लेनदेन बनाने के लिए, और फिर / submiting कोशिश इस प्रविष्टि को रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% सामग्री को इस डिलिवरी नोट के सहारे सुपुर्द किया गया है
 DocType: Project,Customer Details,ग्राहक विवरण
@@ -3842,15 +3852,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,रिसीवर ओपन स्कूल के लिए url पैरामीटर दर्ज करें
 DocType: Payment Entry,Paid Amount,राशि भुगतान
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ऑनलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ऑनलाइन
 ,Available Stock for Packing Items,आइटम पैकिंग के लिए उपलब्ध स्टॉक
 DocType: Item Variant,Item Variant,आइटम संस्करण
 DocType: Assessment Result Tool,Assessment Result Tool,आकलन के परिणाम उपकरण
 DocType: BOM Scrap Item,BOM Scrap Item,बीओएम स्क्रैप मद
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,प्रस्तुत किए गए आदेशों हटाया नहीं जा सकता
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,गुणवत्ता प्रबंधन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,मद {0} अक्षम किया गया है
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,मद {0} अक्षम किया गया है
 DocType: Employee Loan,Repay Fixed Amount per Period,चुकाने अवधि के प्रति निश्चित राशि
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आइटम के लिए मात्रा दर्ज करें {0}
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाहरी काम इतिहास
@@ -3876,7 +3886,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,छात्र ईमेल आईडी
 DocType: Employee,Notice (days),सूचना (दिन)
 DocType: Tax Rule,Sales Tax Template,सेल्स टैक्स खाका
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,चालान बचाने के लिए आइटम का चयन करें
 DocType: Employee,Encashment Date,नकदीकरण तिथि
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेयर समायोजन
@@ -3899,7 +3909,7 @@
 DocType: Item Variant Attribute,Attribute,गुण
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,सीमा होती है / से निर्दिष्ट करें
 DocType: Serial No,Under AMC,एएमसी के तहत
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,आइटम वैल्यूएशन दर उतरा लागत वाउचर राशि पर विचार पुनर्गणना है
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,आइटम वैल्यूएशन दर उतरा लागत वाउचर राशि पर विचार पुनर्गणना है
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,लेनदेन को बेचने के लिए डिफ़ॉल्ट सेटिंग्स .
 DocType: Guardian,Guardian Of ,के गार्जियन
 DocType: Grading Scale Interval,Threshold,डेवढ़ी
@@ -3909,6 +3919,7 @@
 DocType: Purchase Invoice,Debit Note Issued,डेबिट नोट जारी
 DocType: Production Order,Warehouses,गोदामों
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} संपत्ति हस्तांतरित नहीं किया जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,यह आइटम {0} (टेम्पलेट) का एक प्रकार है।
 DocType: Workstation,per hour,प्रति घंटा
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,क्रय
 DocType: Announcement,Announcement,घोषणा
@@ -3924,8 +3935,8 @@
 DocType: Account,Receivable,प्राप्य
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,पंक्ति # {0}: खरीद आदेश पहले से मौजूद है के रूप में आपूर्तिकर्ता बदलने की अनुमति नहीं
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,निर्धारित ऋण सीमा से अधिक लेनदेन है कि प्रस्तुत करने की अनुमति दी है कि भूमिका.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,निर्माण करने के लिए आइटम का चयन करें
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","मास्टर डेटा सिंक्रनाइज़, यह कुछ समय लग सकता है"
 DocType: Item,Material Issue,महत्त्वपूर्ण विषय
 DocType: Hub Settings,Seller Description,विक्रेता विवरण
 DocType: Employee Education,Qualification,योग्यता
@@ -3937,7 +3948,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेशित
 DocType: Salary Detail,Component,अंग
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन मापदंड समूह
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},खुलने संचित मूल्यह्रास के बराबर की तुलना में कम होना चाहिए {0}
 DocType: Warehouse,Warehouse Name,वेअरहाउस नाम
 DocType: Naming Series,Select Transaction,लेन - देन का चयन करें
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,रोल अनुमोदन या उपयोगकर्ता स्वीकृति दर्ज करें
@@ -3950,7 +3961,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"प्रस्तुत स्टॉक एंट्री {0} मौजूद है , क्योंकि रद्द नहीं कर सकते"
 DocType: Employee Loan,Disbursement Date,संवितरण की तारीख
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्दों में
@@ -3964,14 +3975,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / लीड%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,एसेट depreciations और शेष
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},राशि {0} {1} से स्थानांतरित {2} को {3}
 DocType: Sales Invoice,Get Advances Received,अग्रिम प्राप्त
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ता जोड़ें / निकालें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},लेन - देन बंद कर दिया प्रोडक्शन आदेश के खिलाफ अनुमति नहीं {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डिफ़ॉल्ट रूप में इस वित्तीय वर्ष में सेट करने के लिए , 'मूलभूत रूप में सेट करें ' पर क्लिक करें"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,जुडें
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमी मात्रा
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,मद संस्करण {0} एक ही गुण के साथ मौजूद है
 DocType: Employee Loan,Repay from Salary,वेतन से बदला
 DocType: Leave Application,LAP/,गोद /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},के खिलाफ भुगतान का अनुरोध {0} {1} राशि के लिए {2}
@@ -3989,7 +4000,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,आकलन के परिणाम विस्तार
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षा
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,डुप्लिकेट आइटम समूह मद समूह तालिका में पाया
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,यह आइटम विवरण लाने की जरूरत है।
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} पहले से ही प्राप्त हो गया है
@@ -3998,7 +4009,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","गोदाम {0} किसी भी खाते से जुड़ा हुआ नहीं है, कृपया / गोदाम के लिए इसी (एसेट) खाते लिंक बनाएँ।"
 DocType: Purchase Invoice,Recurring Id,आवर्ती आईडी
 DocType: Customer,Sales Team Details,बिक्री टीम विवरण
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,स्थायी रूप से हटाना चाहते हैं?
 DocType: Expense Claim,Total Claimed Amount,कुल दावा किया राशि
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,बेचने के लिए संभावित अवसरों.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अमान्य {0}
@@ -4009,13 +4020,14 @@
 DocType: Warehouse,PIN,पिन
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,सेटअप ERPNext में अपने स्कूल
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस परिवर्तन राशि (कंपनी मुद्रा)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,निम्नलिखित गोदामों के लिए कोई लेखा प्रविष्टियों
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,अंतिम आदेश राशि
+DocType: Task,Is Milestone,क्या मील का पत्थर है
 DocType: Daily Work Summary,Email Sent To,इलेक्ट्रॉनिक पत्राचार भेजा गया
 DocType: Budget,Warn,चेतावनी देना
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","किसी भी अन्य टिप्पणी, अभिलेखों में जाना चाहिए कि उल्लेखनीय प्रयास।"
@@ -4036,7 +4048,7 @@
 DocType: Item Attribute Value,Attribute Value,मान बताइए
 ,Itemwise Recommended Reorder Level,Itemwise पुनःक्रमित स्तर की सिफारिश की
 DocType: Salary Detail,Salary Detail,वेतन विस्तार
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,पहला {0} का चयन करें
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,पहला {0} का चयन करें
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,आइटम के बैच {0} {1} समाप्त हो गया है।
 DocType: Sales Invoice,Commission,आयोग
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,विनिर्माण के लिए समय पत्रक।
@@ -4048,41 +4060,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` से अधिक उम्र रुक स्टॉक `% d दिनों से कम होना चाहिए .
 DocType: Tax Rule,Purchase Tax Template,टैक्स टेम्पलेट खरीद
 ,Project wise Stock Tracking,परियोजना वार शेयर ट्रैकिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},रखरखाव अनुसूची {0} के खिलाफ मौजूद {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),वास्तविक मात्रा (स्रोत / लक्ष्य पर)
 DocType: Item Customer Detail,Ref Code,रेफरी कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रिकॉर्ड.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,सेट कृपया अगले मूल्यह्रास दिनांक
 DocType: HR Settings,Payroll Settings,पेरोल सेटिंग्स
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,न-जुड़े चालान और भुगतान का मिलान.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,आदेश देना
 DocType: Email Digest,New Purchase Orders,नई खरीद आदेश
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,रूट एक माता पिता लागत केंद्र नहीं कर सकते
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,चुनें ब्रांड ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,चुनें ब्रांड ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,के रूप में संचित पर मूल्यह्रास
 DocType: Sales Invoice,C-Form Applicable,लागू सी फार्म
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},आपरेशन के समय ऑपरेशन के लिए 0 से अधिक होना चाहिए {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,गोदाम अनिवार्य है
 DocType: Supplier,Address and Contacts,पता और संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रूपांतरण विस्तार
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px द्वारा वेब अनुकूल 900px (डब्ल्यू) रखो यह ( ज)
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षिप्त
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,उत्पादन का आदेश एक आइटम टेम्पलेट के खिलाफ उठाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,प्रभार प्रत्येक आइटम के खिलाफ खरीद रसीद में नवीनीकृत कर रहे हैं
 DocType: Warranty Claim,Resolved By,द्वारा हल किया
 DocType: Bank Guarantee,Start Date,प्रारंभ दिनांक
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,एक अवधि के लिए पत्तियों का आवंटन .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक्स और जमाओं को गलत तरीके से मंजूरी दे दी है
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,खाते {0}: तुम माता पिता के खाते के रूप में खुद को आवंटन नहीं कर सकते
 DocType: Purchase Invoice Item,Price List Rate,मूल्य सूची दर
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ग्राहक उद्धरण बनाएं
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ग्राहक उद्धरण बनाएं
 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 +38,Bill of Materials (BOM),सामग्री के बिल (बीओएम)
 DocType: Item,Average time taken by the supplier to deliver,सप्लायर द्वारा लिया गया औसत समय देने के लिए
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,आकलन के परिणाम
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,घंटे
 DocType: Project,Expected Start Date,उम्मीद प्रारंभ दिनांक
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,आरोप है कि आइटम के लिए लागू नहीं है अगर आइटम निकालें
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,लेन-देन मुद्रा पेमेंट गेटवे मुद्रा के रूप में ही किया जाना चाहिए
 DocType: Payment Entry,Receive,प्राप्त
@@ -4093,19 +4104,19 @@
 DocType: Workstation,Operating Costs,परिचालन लागत
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"कार्रवाई करता है, तो संचित मासिक बजट पार"
 DocType: Purchase Invoice,Submit on creation,जमा करें निर्माण पर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},मुद्रा {0} के लिए होना चाहिए {1}
 DocType: Asset,Disposal Date,निपटान की तिथि
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ईमेल दी घंटे में कंपनी के सभी सक्रिय कर्मचारियों के लिए भेजा जाएगा, अगर वे छुट्टी की जरूरत नहीं है। प्रतिक्रियाओं का सारांश आधी रात को भेजा जाएगा।"
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी छुट्टी अनुमोदक
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},पंक्ति {0}: एक पुनःक्रमित प्रविष्टि पहले से ही इस गोदाम के लिए मौजूद है {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","खो के रूप में उद्धरण बना दिया गया है , क्योंकि घोषणा नहीं कर सकते हैं ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण प्रतिक्रिया
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,उत्पादन का आदेश {0} प्रस्तुत किया जाना चाहिए
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},प्रारंभ तिथि और आइटम के लिए अंतिम तिथि का चयन करें {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},कोर्स पंक्ति में अनिवार्य है {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तिथि करने के लिए तिथि से पहले नहीं हो सकता
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ संपादित कीमतों में जोड़ें
 DocType: Batch,Parent Batch,अभिभावक बैच
 DocType: Cheque Print Template,Cheque Print Template,चैक प्रिंट खाका
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,लागत केंद्र के चार्ट
@@ -4118,7 +4129,7 @@
 ,Ordered Items To Be Delivered,हिसाब से दिया जा आइटम
 DocType: Account,Income,आय
 DocType: Industry Type,Industry Type,उद्योग के प्रकार
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,कुछ गलत हो गया!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,कुछ गलत हो गया!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,चेतावनी: अवकाश आवेदन निम्न ब्लॉक दिनांक शामिल
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,बिक्री चालान {0} पहले से ही प्रस्तुत किया गया है
 DocType: Assessment Result Detail,Score,स्कोर
@@ -4149,17 +4160,17 @@
 DocType: Item,Variant Based On,प्रकार पर आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},कुल आवंटित वेटेज 100 % होना चाहिए . यह है {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,अपने आपूर्तिकर्ताओं
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,बिक्री आदेश किया जाता है के रूप में खो के रूप में सेट नहीं कर सकता .
 DocType: Request for Quotation Item,Supplier Part No,प्रदायक भाग नहीं
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,से प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',घटा नहीं सकते जब श्रेणी &#39;मूल्यांकन&#39; या &#39;Vaulation और कुल&#39; के लिए है
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,से प्राप्त
 DocType: Lead,Converted,परिवर्तित
 DocType: Item,Has Serial No,नहीं सीरियल गया है
 DocType: Employee,Date of Issue,जारी करने की तारीख
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} के लिए {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} के लिए {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},पंक्ति # {0}: आइटम के लिए सेट प्रदायक {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,पंक्ति {0}: घंटे मूल्य शून्य से अधिक होना चाहिए।
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,मद {1} से जुड़ी वेबसाइट छवि {0} पाया नहीं जा सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,कई समूहों में वेबसाइट पर इस मद की सूची.
@@ -4168,20 +4179,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,आप स्थिर मूल्य निर्धारित करने के लिए अधिकृत नहीं हैं
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled प्रविष्टियां प्राप्त करें
 DocType: Payment Reconciliation,From Invoice Date,चालान तिथि से
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग मुद्रा या तो डिफ़ॉल्ट comapany की मुद्रा या पार्टी के खाते की मुद्रा के बराबर होना चाहिए
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,नकदीकरण छोड़े
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,यह क्या करता है?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गोदाम के लिए
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सभी छात्र प्रवेश
 ,Average Commission Rate,औसत कमीशन दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,गैर स्टॉक आइटम के लिए क्रमांक 'हाँ' नहीं हो सकता
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिति भविष्य तारीखों के लिए चिह्नित नहीं किया जा सकता
 DocType: Pricing Rule,Pricing Rule Help,मूल्य निर्धारण नियम मदद
 DocType: School House,House Name,घरेलु नाम
 DocType: Purchase Taxes and Charges,Account Head,लेखाशीर्ष
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,मदों की उतरा लागत की गणना करने के लिए अतिरिक्त लागत अद्यतन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,विद्युत
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,अपने संगठन के बाकी अपने उपयोगकर्ताओं के रूप में जोड़े। तुम भी उन्हें संपर्क से जोड़कर अपने पोर्टल के लिए ग्राहकों को आमंत्रित जोड़ सकते हैं
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,अपने संगठन के बाकी अपने उपयोगकर्ताओं के रूप में जोड़े। तुम भी उन्हें संपर्क से जोड़कर अपने पोर्टल के लिए ग्राहकों को आमंत्रित जोड़ सकते हैं
 DocType: Stock Entry,Total Value Difference (Out - In),कुल मूल्य का अंतर (आउट - में)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4190,7 +4201,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},के लिए जन्मदिन अनुस्मारक {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,दिनों से पिछले आदेश
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,खाते में डेबिट एक बैलेंस शीट खाता होना चाहिए
 DocType: Buying Settings,Naming Series,श्रृंखला का नामकरण
 DocType: Leave Block List,Leave Block List Name,ब्लॉक सूची नाम छोड़ दो
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,बीमा प्रारंभ दिनांक से बीमा समाप्ति की तारीख कम होना चाहिए
@@ -4205,9 +4216,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},कर्मचारी के वेतन पर्ची {0} पहले से ही समय पत्रक के लिए बनाई गई {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,मात्रा का आदेश दिया
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,मद {0} अक्षम हो जाता है
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,मद {0} अक्षम हो जाता है
 DocType: Stock Settings,Stock Frozen Upto,स्टॉक तक जमे हुए
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,बीओएम किसी भी शेयर आइटम शामिल नहीं है
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},से और अवधि आवर्ती के लिए अनिवार्य तिथियाँ तक की अवधि के {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,परियोजना / कार्य कार्य.
 DocType: Vehicle Log,Refuelling Details,ईंधन भराई विवरण
@@ -4217,8 +4228,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,अंतिम खरीद दर नहीं मिला
 DocType: Purchase Invoice,Write Off Amount (Company Currency),राशि से लिखें (कंपनी मुद्रा)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग घंटे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} नहीं मिला डिफ़ॉल्ट बीओएम
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,पंक्ति # {0}: पुनःक्रमित मात्रा सेट करें
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,उन्हें यहां जोड़ने के लिए आइटम टैप करें
 DocType: Fees,Program Enrollment,कार्यक्रम नामांकन
 DocType: Landed Cost Voucher,Landed Cost Voucher,उतरा लागत वाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},सेट करें {0}
@@ -4240,7 +4252,7 @@
 DocType: Maintenance Visit,Maintenance Date,रखरखाव तिथि
 DocType: Purchase Invoice Item,Rejected Serial No,अस्वीकृत धारावाहिक नहीं
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,साल शुरू की तारीख या अंत की तारीख {0} के साथ अतिव्यापी है। से बचने के लिए कंपनी सेट करें
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},प्रारंभ तिथि मद के लिए समाप्ति तिथि से कम होना चाहिए {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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.","उदाहरण:। श्रृंखला के लिए निर्धारित है और सीरियल कोई लेन-देन में उल्लेख नहीं किया गया है, तो एबीसीडी ##### 
 , तो स्वत: सीरियल नंबर इस श्रृंखला के आधार पर बनाया जाएगा। आप हमेशा स्पष्ट रूप से इस मद के लिए सीरियल नंबर का उल्लेख करना चाहते हैं। इस खाली छोड़ दें।"
@@ -4316,7 +4328,6 @@
 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,कई समूहों में आइटम के क्रॉस लिस्टिंग
-DocType: Grade Interval,Grade Interval,ग्रेड अंतराल
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},वित्तीय वर्ष प्रारंभ तिथि और वित्तीय वर्ष के अंत तिथि पहले से ही वित्त वर्ष में स्थापित कर रहे हैं {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,क्लीयरेंस दिनांक अद्यतन
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बैच
@@ -4361,14 +4372,14 @@
 DocType: Bin,Reserved Qty for Production,उत्पादन के लिए मात्रा सुरक्षित
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,अनियंत्रित छोड़ें यदि आप पाठ्यक्रम आधारित समूहों को बनाने के दौरान बैच पर विचार नहीं करना चाहते हैं
 DocType: Asset,Frequency of Depreciation (Months),मूल्यह्रास की आवृत्ति (माह)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,क्रेडिट खाता
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,क्रेडिट खाता
 DocType: Landed Cost Item,Landed Cost Item,आयातित माल की लागत मद
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्यों को दिखाने
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,वस्तु की मात्रा विनिर्माण / कच्चे माल की दी गई मात्रा से repacking के बाद प्राप्त
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,सेटअप अपने संगठन के लिए एक साधारण वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्य / देय खाता
 DocType: Delivery Note Item,Against Sales Order Item,बिक्री आदेश आइटम के खिलाफ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},विशेषता के लिए विशेषता मान निर्दिष्ट करें {0}
 DocType: Item,Default Warehouse,डिफ़ॉल्ट गोदाम
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},बजट समूह खाते के खिलाफ नहीं सौंपा जा सकता {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,माता - पिता लागत केंद्र दर्ज करें
@@ -4411,7 +4422,7 @@
 DocType: Opportunity Item,Basic Rate,मूल दर
 DocType: GL Entry,Credit Amount,राशि क्रेडिट करें
 DocType: Cheque Print Template,Signatory Position,हस्ताक्षरकर्ता स्थान
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,खोया के रूप में सेट करें
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,खोया के रूप में सेट करें
 DocType: Timesheet,Total Billable Hours,कुल बिल घंटे
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भुगतान रसीद नोट
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,यह इस ग्राहक के खिलाफ लेन-देन पर आधारित है। जानकारी के लिए नीचे समय देखें
@@ -4425,11 +4436,11 @@
 ,Items To Be Requested,अनुरोध किया जा करने के लिए आइटम
 DocType: Purchase Order,Get Last Purchase Rate,पिछले खरीद दर
 DocType: Company,Company Info,कंपनी की जानकारी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,का चयन करें या नए ग्राहक जोड़ने
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,लागत केंद्र एक व्यय का दावा बुक करने के लिए आवश्यक है
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),फंड के अनुप्रयोग ( संपत्ति)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,यह इस कर्मचारी की उपस्थिति पर आधारित है
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,डेबिट अकाउंट
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,डेबिट अकाउंट
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ दिनांक
 DocType: Attendance,Employee Name,कर्मचारी का नाम
 DocType: Sales Invoice,Rounded Total (Company Currency),गोल कुल (कंपनी मुद्रा)
@@ -4438,13 +4449,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,निम्नलिखित दिन पर छुट्टी अनुप्रयोग बनाने से उपयोगकर्ताओं को बंद करो.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरीद ने का मूलय
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,प्रदायक कोटेशन {0} बनाया
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,समाप्ति वर्ष प्रारंभ साल से पहले नहीं हो सकता
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी लाभ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक डिफ़ॉल्ट कर्मचारी के लिए छुट्टी सूची सेट करें {0} {1} या कंपनी
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} करता नहीं मौजूद है
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,बिलों ग्राहकों के लिए उठाया.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,परियोजना ईद
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},पंक्ति कोई {0}: राशि व्यय दावा {1} के खिलाफ राशि लंबित से अधिक नहीं हो सकता है। लंबित राशि है {2}
@@ -4453,15 +4464,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 पढ़ना
 ,Hub,हब
 DocType: GL Entry,Voucher Type,वाउचर प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,मूल्य सूची पाया या निष्क्रिय नहीं
 DocType: Employee Loan Application,Approved,अनुमोदित
 DocType: Pricing Rule,Price,कीमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} को राहत मिली कर्मचारी 'वाम ' के रूप में स्थापित किया जाना चाहिए
 DocType: Guardian,Guardian,अभिभावक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यांकन {0} {1} निश्चित तिथि सीमा में कर्मचारी के लिए बनाया
 DocType: Employee,Education,शिक्षा
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,डेल
 DocType: Selling Settings,Campaign Naming By,अभियान नामकरण से
 DocType: Employee,Current Address Is,वर्तमान पता है
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,संशोधित
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","वैकल्पिक। निर्दिष्ट नहीं किया है, तो कंपनी के डिफ़ॉल्ट मुद्रा सेट करता है।"
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,लेखा पत्रिका प्रविष्टियों.
 DocType: Delivery Note Item,Available Qty at From Warehouse,गोदाम से पर उपलब्ध मात्रा
@@ -4470,7 +4483,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},पंक्ति {0}: पार्टी / खाते के साथ मैच नहीं करता है {1} / {2} में {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,व्यय खाते में प्रवेश करें
 DocType: Account,Stock,स्टॉक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","पंक्ति # {0}: संदर्भ दस्तावेज़ प्रकार खरीद आदेश में से एक, चालान की खरीद या जर्नल प्रविष्टि होना चाहिए"
 DocType: Employee,Current Address,वर्तमान पता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","स्पष्ट रूप से जब तक निर्दिष्ट मद तो विवरण, छवि, मूल्य निर्धारण, करों टेम्पलेट से निर्धारित किया जाएगा आदि एक और आइटम का एक प्रकार है, तो"
 DocType: Serial No,Purchase / Manufacture Details,खरीद / निर्माण विवरण
@@ -4498,7 +4511,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्स
 DocType: Project,Gross Margin %,सकल मार्जिन%
 DocType: BOM,With Operations,आपरेशनों के साथ
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखांकन प्रविष्टियों पहले से ही मुद्रा में किया गया है {0} कंपनी के लिए {1}। मुद्रा के साथ एक प्राप्य या देय खाते का चयन करें {0}।
 DocType: Asset,Is Existing Asset,मौजूदा परिसंपत्ति है
 DocType: Salary Detail,Statistical Component,सांख्यिकीय घटक
 ,Monthly Salary Register,मासिक वेतन रेजिस्टर
@@ -4521,7 +4534,7 @@
 DocType: Assessment Plan,Room,कक्ष
 DocType: Purchase Order,Advance Paid,अग्रिम भुगतान
 DocType: Item,Item Tax,आइटम टैक्स
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,प्रदायक के लिए सामग्री
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,प्रदायक के लिए सामग्री
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,आबकारी चालान
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% से अधिक बार दिखाई देता है
 DocType: Expense Claim,Employees Email Id,ईमेल आईडी कर्मचारी
@@ -4552,9 +4565,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो अटैच
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,भंडारण स्तर
 DocType: Customer,Commission Rate,आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,संस्करण बनाओ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,संस्करण बनाओ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभाग द्वारा आवेदन छोड़ मै.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","भुगतान प्रकार, प्राप्त की एक होना चाहिए वेतन और आंतरिक स्थानांतरण"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,एनालिटिक्स
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट खाली है
 DocType: Vehicle,Model,आदर्श
@@ -4565,6 +4578,7 @@
 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 +161,Capital Stock,शेयर पूंजी
+DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक अनुलग्नक दिखाएं
 DocType: Packing Slip,Package Weight Details,पैकेज वजन विवरण
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,भुगतान पूरा होने के बाद चयनित पृष्ठ के लिए उपयोगकर्ता अनुप्रेषित।
@@ -4583,15 +4597,15 @@
 DocType: Batch,Expiry Date,समाप्ति दिनांक
 ,Supplier Addresses and Contacts,प्रदायक पते और संपर्क
 ,accounts-browser,खातों ब्राउज़र
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,प्रथम श्रेणी का चयन करें
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,प्रथम श्रेणी का चयन करें
 apps/erpnext/erpnext/config/projects.py +13,Project master.,मास्टर परियोजना.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ओवर-बिलिंग या अधिक आदेश देने की अनुमति देने के लिए, &quot;भत्ता&quot; को अद्यतन स्टॉक सेटिंग या आइटम में।"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,$ मुद्राओं की बगल आदि की तरह किसी भी प्रतीक नहीं दिखा.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(आधा दिन)
 DocType: Supplier,Credit Days,क्रेडिट दिन
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,छात्र बैच बनाने
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,छात्र बैच बनाने
 DocType: Leave Type,Is Carry Forward,क्या आगे ले जाना
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,बीओएम से आइटम प्राप्त
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,बीओएम से आइटम प्राप्त
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,लीड समय दिन
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},पंक्ति # {0}: पोस्ट दिनांक खरीद की तारीख के रूप में ही होना चाहिए {1} संपत्ति का {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,उपरोक्त तालिका में विक्रय आदेश दर्ज करें
@@ -4608,7 +4622,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,स्वीकृत राशि
 DocType: GL Entry,Is Opening,है खोलने
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},पंक्ति {0}: {1} डेबिट प्रविष्टि के साथ नहीं जोड़ा जा सकता है
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,कृपया सेटअप&gt; नंबरिंग सीरिज के माध्यम से उपस्थिति के लिए श्रृंखलाबद्ध संख्या सेट करना
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 b424a52..6e90e10 100644
--- a/erpnext/translations/hr.csv
+++ b/erpnext/translations/hr.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Iznajmljeno
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Primjenjivo za članove
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zaustavljen Proizvodnja Red ne može biti otkazana, odčepiti najprije otkazati"
 DocType: Vehicle Service,Mileage,Kilometraža
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Da li zaista želite odbaciti ovu imovinu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Odabir Primarna Dobavljač
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Odabir Primarna Dobavljač
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potrebna za cjenik {0}
 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
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izvanredna za {0} ne može biti manji od nule ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Default 10 min
 DocType: Leave Type,Leave Type Name,Naziv vrste odsustva
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Prikaži otvorena
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži otvorena
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serija je uspješno ažurirana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Provjeri
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Prijavljen
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Hrpa Stavka isteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Nacrt
 DocType: Mode of Payment Account,Mode of Payment Account,Način plaćanja računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Pokaži varijante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaži varijante
 DocType: Academic Term,Academic Term,Akademski pojam
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materijal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Računi stol ne može biti prazno.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Zajmovi (pasiva)
 DocType: Employee Education,Year of Passing,Godina Prolazeći
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referenca:% s, Šifra proizvoda:% s, a za korisnike:% s"
 DocType: Item,Country of Origin,Zemlja podrijetla
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Na zalihi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Otvorena pitanja
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Health Care
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kašnjenje u plaćanju (dani)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,usluga Rashodi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijski broj: {0} već se odnosi na prodajnu fakturu: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskalna godina {0} je potrebno
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Očekivani datum isporuke je bilo prije prodajnog naloga Datum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pričvrstite .csv datoteku s dva stupca, jedan za stari naziv i jedan za novim nazivom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ni na koji aktivno fiskalne godine.
 DocType: Packed Item,Parent Detail docname,Nadređeni detalj docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referenca: {0}, šifra stavke: {1} i klijent: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Prijava
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otvaranje za posao.
 DocType: Item Attribute,Increment,Pomak
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Odaberite Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Odaberite Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglašavanje
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Nabavite stavke iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nije dopušteno {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Nabavite stavke iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Dionica ne može biti obnovljeno protiv isporuke Napomena {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Proizvod {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nema navedenih stavki
 DocType: Payment Reconciliation,Reconcile,pomiriti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina prehrambenom robom
 DocType: Quality Inspection Reading,Reading 1,Čitanje 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sljedeća Amortizacija Datum ne može biti prije Datum kupnje
 DocType: SMS Center,All Sales Person,Svi prodavači
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mjesečna distribucija ** pomaže vam rasporediti proračun / Target preko mjeseca, ako imate sezonalnost u Vašem poslovanju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nije pronađen stavke
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nije pronađen stavke
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura plaća Nedostaje
 DocType: Lead,Person Name,Osoba ime
 DocType: Sales Invoice Item,Sales Invoice Item,Prodajni proizvodi
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna škola&quot; ili &quot;Sveučilište&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,dionica izvješća
 DocType: Warehouse,Warehouse Detail,Detalji o skladištu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prešao na kupca {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Datum Pojam završetka ne može biti kasnije od godine datum završetka školske godine u kojoj je pojam vezan (Akademska godina {}). Ispravite datume i pokušajte ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je nepokretne imovine&quot; ne može biti potvrđen, što postoji imovinom rekord protiv stavku"
 DocType: Vehicle Service,Brake Oil,ulje za kočnice
 DocType: Tax Rule,Tax Type,Porezna Tip
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Niste ovlašteni dodavati ili ažurirati unose prije {0}
 DocType: BOM,Item Image (if not slideshow),Slika proizvoda (ako nije slide prikaz)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Kupac postoji s istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Broj sati / 60) * Stvarno trajanje operacije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Odaberi BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Odaberi BOM
 DocType: SMS Log,SMS Log,SMS Prijava
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Troškovi isporučenih stavki
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Odmor na {0} nije između Od Datum i do sada
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,škole
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ne dopusta rekord pronađeno za zaposlenika {0} od {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Unesite tvrtka prva
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Odaberite tvrtka prvi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Odaberite tvrtka prvi
 DocType: Employee Education,Under Graduate,Preddiplomski
 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
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Iznos štete
 DocType: Employee,Mr,G.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Dvostruka grupa kupaca nalaze u tablici cutomer grupe
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavljač Tip / Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Dobavljač Tip / Supplier
 DocType: Naming Series,Prefix,Prefiks
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,potrošni
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Razred
 DocType: Sales Invoice Item,Delivered By Supplier,Isporučio dobavljač
 DocType: SMS Center,All Contact,Svi kontakti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Proizvodnja Red je već stvorio za sve stavke s sastavnice
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Godišnja plaća
 DocType: Daily Work Summary,Daily Work Summary,Dnevni rad Sažetak
 DocType: Period Closing Voucher,Closing Fiscal Year,Zatvaranje Fiskalna godina
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zamrznuta
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zamrznuta
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Odaberite postojeće tvrtke za izradu grafikona o računima
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Troškovi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Odaberite Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Stupanje
 DocType: Journal Entry Account,Credit in Company Currency,Kredit u trgovačkim društvima valuti
 DocType: Delivery Note,Installation Status,Status instalacije
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Želite li ažurirati dolazak? <br> Prisutni: {0} \ <br> Odsutni: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Količina prihvaćeno + odbijeno mora biti jednaka zaprimljenoj količini proizvoda {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Nabava sirovine za kupnju
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,potreban je najmanje jedan način plaćanja za POS računa.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,potreban je najmanje jedan način plaćanja za POS računa.
 DocType: Products Settings,Show Products as a List,Prikaži proizvode kao popis
 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.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Provjerite Amortizacija unos
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahtjev Tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Provjerite zaposlenik
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Provjerite zaposlenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radiodifuzija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,izvršenje
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Pojedinosti o operacijama koje se provode.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan održavanja posjeta.
 DocType: SMS Settings,Enter url parameter for message,Unesite URL parametar za poruke
 DocType: POS Profile,Customer Groups,kupaca Grupe
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Financijska izvješća
 DocType: Guardian,Students,Studenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za primjenu cijena i popusta.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cjenik mora biti primjenjiv za kupnju ili prodaju
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance iznos ne može biti veći od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija Popis za ovu transakciju
 DocType: Company,Default Payroll Payable Account,Zadana plaće Plaća račun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Grupa
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Grupa
 DocType: Sales Invoice,Is Opening Entry,Je Otvaranje unos
 DocType: Customer Group,Mention if non-standard receivable account applicable,Spomenuti ako nestandardni potraživanja računa primjenjivo
 DocType: Course Schedule,Instructor Name,Instruktor Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Jer je potrebno Warehouse prije Podnijeti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primila je u
 DocType: Sales Partner,Reseller,Prodavač
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ako je označeno, će uključivati stavke bez zaliha u materijalu zahtjeva."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Protiv prodaje dostavnice točke
 ,Production Orders in Progress,Radni nalozi u tijeku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto novčani tijek iz financijskih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage puna, nije štedjelo"
 DocType: Lead,Address & Contact,Adresa i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neiskorištenih lišće iz prethodnih dodjela
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sljedeći ponavljajući {0} bit će izrađen na {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Ukupno troška Iznos (preko vremenska tablica)
 DocType: Item Website Specification,Item Website Specification,Specifikacija web stranice proizvoda
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Neodobreno odsustvo
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bankovni tekstova
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Proizvod {0} je dosegao svoj rok trajanja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bankovni tekstova
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,godišnji
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock pomirenje točka
 DocType: Stock Entry,Sales Invoice No,Prodajni račun br
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Objavi na Hub
 DocType: Student Admission,Student Admission,Studentski Ulaz
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Proizvod {0} je otkazan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zahtjev za robom
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Proizvod {0} je otkazan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Zahtjev za robom
 DocType: Bank Reconciliation,Update Clearance Date,Ažurirajte provjeri datum
 DocType: Item,Purchase Details,Detalji nabave
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Izvanredna Čekovi i depoziti za brisanje
 DocType: Item,Synced With Hub,Sinkronizirati s Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Red # {0}: {1} ne može biti negativna za predmet {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Pogrešna Lozinka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Red # {0}: {1} ne može biti negativna za predmet {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Pogrešna Lozinka
 DocType: Item,Variant Of,Varijanta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Završen Qty ne može biti veći od 'Kol proizvoditi'
 DocType: Period Closing Voucher,Closing Account Head,Zatvaranje računa šefa
 DocType: Employee,External Work History,Vanjski Povijest Posao
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kružni Referentna Greška
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obavijest putem maila prilikom stvaranja automatskog Zahtjeva za robom
 DocType: Journal Entry,Multi Currency,Više valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tip fakture
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Otpremnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Otpremnica
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavljanje Porezi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Troškovi prodane imovinom
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
-DocType: Grade Interval,Min Score,min rezultat
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dva puta ušao u točki poreza
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sažetak za ovaj tjedan i tijeku aktivnosti
 DocType: Student Applicant,Admitted,priznao
 DocType: Workstation,Rent Cost,Rent cost
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vrijednost narudžbe
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Novac transakcije protiv stranke ili za internog transfera
 DocType: Shipping Rule,Valid for Countries,Vrijedi za zemlje
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ova točka je predložak i ne može se koristiti u prometu. Atributi artikl će biti kopirana u varijanti osim 'Ne Copy ""je postavljena"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Ukupno Naručite Smatra
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposlenika ( npr. CEO , direktor i sl. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Unesite ' ponovite na dan u mjesecu ' na terenu vrijednosti
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"Red # {0}: Kupnja Račun, ne može se protiv postojećeg sredstva {1}"
 DocType: Item Tax,Tax Rate,Porezna stopa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} već dodijeljeno za zaposlenika {1} za vrijeme {2} {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Odaberite stavku
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Odaberite stavku
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Nabavni račun {0} je već podnesen
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Red # {0}: Batch Ne mora biti ista kao {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pretvori u ne-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (puno) proizvoda.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Duguje iznos
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tu može biti samo 1 račun po društvo u {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Pogledajte prilog
 DocType: Purchase Order,% Received,% Zaprimljeno
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Stvaranje grupe učenika
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahtjev za ponudu
 DocType: Salary Slip Timesheet,Working Hours,Radnih sati
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Promjena polaznu / tekući redni broj postojeće serije.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Stvaranje novog kupca
-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.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Izrada narudžbenice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Stvaranje novog kupca
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ako više Cijene pravila i dalje prevladavaju, korisnici su zamoljeni da postavite prioritet ručno riješiti sukob."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Izrada narudžbenice
 ,Purchase Register,Popis nabave
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Troškove u
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) mora imati ulogu ""Odobritelj odsustva '"
 DocType: Purchase Receipt,Vehicle Date,Datum vozila
 DocType: Student Log,Medical,Liječnički
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog gubitka
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Razlog gubitka
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Olovo Vlasnik ne može biti ista kao i olova
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Dodijeljeni iznos ne može veći od nekorigirani iznosa
 DocType: Announcement,Receiver,Prijamnik
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina i stopa
 DocType: Delivery Note,% Installed,% Instalirano
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učionice / laboratoriji i sl, gdje predavanja može biti na rasporedu."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Unesite ime tvrtke prvi
 DocType: Purchase Invoice,Supplier Name,Dobavljač Ime
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Pročitajte ERPNext priručnik
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Stari Roditelj
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obavezno polje - akademska godina
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Prilagodite uvodni tekst koji ide kao dio tog e-maila. Svaka transakcija ima zaseban uvodni tekst.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Postavite zadani dugovni račun za tvrtku {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne postavke za sve proizvodne procese.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Frozen Upto
 DocType: SMS Log,Sent On,Poslan Na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Osobina {0} izabrani više puta u Svojstva tablice
 DocType: HR Settings,Employee record is created using selected field. ,Zaposlenika rekord je stvorio pomoću odabranog polja.
 DocType: Sales Order,Not Applicable,Nije primjenjivo
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Majstor za odmor .
 DocType: Request for Quotation Item,Required Date,Potrebna Datum
 DocType: Delivery Note,Billing Address,Adresa za naplatu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Unesite kod artikal .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Unesite kod artikal .
 DocType: BOM,Costing,Koštanje
 DocType: Tax Rule,Billing County,županija naplate
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Iz paketa broj
 DocType: Item Attribute,To Range,U rasponu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrijednosni papiri i depoziti
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Nije moguće promijeniti način vrednovanja jer postoje transakcije protiv nekih stavki koje nemaju vlastitu metodu vrednovanja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Ukupno lišće izdvojena obvezna
 DocType: Job Opening,Description of a Job Opening,Opis je otvaranju novih radnih mjesta
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Čekanju aktivnosti za danas
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrativni službenik
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Odaberite Tečaj
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Odaberite tvrtke
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Odaberite tvrtke
 DocType: Stock Entry Detail,Difference Account,Račun razlike
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Ne može zatvoriti zadatak kao njegova ovisna zadatak {0} nije zatvoren.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Unesite skladište za koje Materijal Zahtjev će biti podignuta
 DocType: Production Order,Additional Operating Cost,Dodatni trošak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Spojiti , ova svojstva moraju biti isti za obje stavke"
 DocType: Shipping Rule,Net Weight,Neto težina
 DocType: Employee,Emergency Phone,Telefon hitne službe
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupiti
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definirajte ocjenu za Prag 0%
 DocType: Sales Order,To Deliver,Za isporuku
 DocType: Purchase Invoice Item,Item,Proizvod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serijski nema stavke ne može biti dio
 DocType: Journal Entry,Difference (Dr - Cr),Razlika ( dr. - Cr )
 DocType: Account,Profit and Loss,Račun dobiti i gubitka
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje podugovaranje
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirast ne može biti 0
 DocType: Production Planning Tool,Material Requirement,Preduvjet za robu
 DocType: Company,Delete Company Transactions,Brisanje transakcije tvrtke
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referentni broj i reference Datum obvezna je za banke transakcije
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / uredi porez i pristojbe
 DocType: Purchase Invoice,Supplier Invoice No,Dobavljač Račun br
 DocType: Territory,For reference,Za referencu
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Napomena instalacije proizvoda
 DocType: Production Plan Item,Pending Qty,U tijeku Kom
 DocType: Budget,Ignore,Ignorirati
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nije aktivan
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nije aktivan
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslan na sljedećim brojevima: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Provjera postavljanje dimenzije za ispis
 DocType: Salary Slip,Salary Slip Timesheet,Plaća proklizavanja timesheet
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Ukupno komisija
 DocType: Pricing Rule,Sales Partner,Prodajni partner
 DocType: Buying Settings,Purchase Receipt Required,Primka je obvezna
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vrednovanje stopa je obavezno ako Otvaranje Stock ušao
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nisu pronađeni zapisi u tablici računa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Odaberite Društvo i Zabava Tip prvi
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financijska / obračunska godina.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Akumulirani Vrijednosti
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Napravi prodajnu narudžbu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Napravi prodajnu narudžbu
 DocType: Project Task,Project Task,Zadatak projekta
 ,Lead Id,Id potencijalnog kupca
 DocType: C-Form Invoice Detail,Grand Total,Ukupno za platiti
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Nastavi Prilog
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponoviti kupaca
 DocType: Leave Control Panel,Allocate,Dodijeliti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Povrat robe
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Povrat robe
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Napomena: Ukupno dodijeljeni lišće {0} ne bi trebala biti manja od već odobrenih lišća {1} za razdoblje
 DocType: Announcement,Posted By,Objavio
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavlja Dobavljač (Drop Ship)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,Ponuda za
 DocType: Lead,Middle Income,Srednji Prihodi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvaranje ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Dodijeljeni iznos ne može biti negativan
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Postavite tvrtku
 DocType: Purchase Order Item,Billed Amt,Naplaćeno Amt
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Reference Nema & Reference Datum je potrebno za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Odaberite Račun za plaćanje kako bi Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Stvaranje zaposlenika evidencije za upravljanje lišće, trošak tvrdnje i obračun plaća"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj u bazi znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanje prijedlog
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plaćanje Ulaz Odbitak
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nije u fiskalnoj godini {2}
 DocType: Buying Settings,Settings for Buying Module,Postavke za kupnju modula
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Imovina {0} ne pripada društvu {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Unesite prvo primku
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Unesite prvo primku
 DocType: Buying Settings,Supplier Naming By,Dobavljač nazivanje
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Neto promjena u inventar
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Upravljanje zaposlenicima kredita
 DocType: Employee,Passport Number,Broj putovnice
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Odnos s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Upravitelj
 DocType: Payment Entry,Payment From / To,Plaćanje Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Raspon datuma
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novi kreditni limit je manja od trenutne preostali iznos za kupca. Kreditni limit mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,U minuta
 DocType: Issue,Resolution Date,Rezolucija Datum
 DocType: Student Batch Name,Batch Name,Batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet stvorio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet stvorio:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Molimo postavite zadanu gotovinom ili banka računa u načinu plaćanja {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Upisati
 DocType: Selling Settings,Customer Naming By,Imenovanje kupca prema
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Pokazat će student prisutan u Studentskom Mjesečni Attendance Report
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Stvarni Vrijeme početka
 DocType: BOM Operation,Operation Time,Operacija vrijeme
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Završi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Baza
 DocType: Timesheet,Total Billed Hours,Ukupno Naplaćene sati
 DocType: Journal Entry,Write Off Amount,Napišite paušalni iznos
 DocType: Journal Entry,Bill No,Bill Ne
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Studentski Gledatelja
 DocType: Sales Invoice Timesheet,Time Sheet,Vrijeme list
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Jedinice za pranje sirovine na temelju
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Unesite Detalji
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Unesite Detalji
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pretprodaja
 DocType: Purchase Receipt,Other Details,Ostali detalji
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Ulazak Plaćanje je već stvorio
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutačno stanje skladišta
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Red # {0}: Imovina {1} ne povezan s točkom {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Pregled Plaća proklizavanja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Pregled Plaća proklizavanja
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} unesen više puta
 DocType: Account,Expenses Included In Valuation,Troškovi uključeni u vrednovanje
 DocType: Hub Settings,Seller City,Prodavač Grad
 ,Absent Student Report,Odsutni Student Report
 DocType: Email Digest,Next email will be sent on:,Sljedeći email će biti poslan na:
 DocType: Offer Letter Term,Offer Letter Term,Ponuda pismo Pojam
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Stavka ima varijante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Tvrtka {0} ne postoji
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Količina potrošena po jedinici mjere
 DocType: Serial No,Warranty Expiry Date,Datum isteka jamstva
 DocType: Material Request Item,Quantity and Warehouse,Količina i skladišta
 DocType: Sales Invoice,Commission Rate (%),Komisija stopa (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem Postava&gt; Postavke&gt; Serija za imenovanje
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Odaberite Program
 DocType: Project,Estimated Cost,Procjena cijene
 DocType: Purchase Order,Link to material requests,Link na materijalnim zahtjevima
@@ -754,7 +757,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Primljeni Iznos (Društvo valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Potencijalni kupac mora biti postavljen ako je prilika iz njega izrađena
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Odaberite tjednik off dan
 DocType: Production Order Operation,Planned End Time,Planirani End Time
 ,Sales Person Target Variance Item Group-Wise,Pregled prometa po prodavaču i grupi proizvoda
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Prilika od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mjesečna plaća izjava.
 DocType: BOM,Website Specifications,Web Specifikacije
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molim postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} od tipa {1}
 DocType: Warranty Claim,CI-,Civilno
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Red {0}: pretvorbe Factor je obvezno
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,Bankovni  A/C br.
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Čitanje 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,djelomično Ž
 DocType: Expense Claim Detail,Expense Claim Type,Rashodi Vrsta polaganja
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Zadane postavke za Košarica
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Imovine otpisan putem Temeljnica {0}
@@ -830,14 +835,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Troškovi održavanja ureda
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Postavljanje račun e-pošte
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Unesite predmeta prvi
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Unesite predmeta prvi
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Kažnjeni Iznos ne može biti veći od Zahtjeva Iznos u nizu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Zadana vrijednost prodane robe računa
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Popis Cijena ne bira
 DocType: Employee,Family Background,Obitelj Pozadina
 DocType: Request for Quotation Supplier,Send Email,Pošaljite e-poštu
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Upozorenje: Invalid Prilog {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nemate dopuštenje
 DocType: Company,Default Bank Account,Zadani bankovni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje se temelji na stranke, odaberite stranka Upišite prvi"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nisu pronađeni zaposlenici
 DocType: Supplier Quotation,Stopped,Zaustavljen
 DocType: Item,If subcontracted to a vendor,Ako podugovoren dobavljaču
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentska grupa je već ažurirana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentska grupa je već ažurirana.
 DocType: SMS Center,All Customer Contact,Svi kontakti kupaca
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Prenesi dionica ravnotežu putem CSV.
 DocType: Warehouse,Tree Details,stablo Detalji
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalni iznos fakture
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Centar Cijena {2} ne pripada Društvu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Račun {2} ne može biti grupa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore &#39;{DOCTYPE}&#39; stol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Stavka retka {idx}: {DOCTYPE} {DOCNAME} ne postoji u gore &#39;{DOCTYPE}&#39; stol
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} već je završen ili otkazan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nema zadataka
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan u mjesecu na koji auto faktura će biti generiran npr 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otvaranje Akumulirana amortizacija
@@ -878,7 +883,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} u odnosu na račun {1} s datumom {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Raspored predmeta
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Raspored predmeta
 DocType: Maintenance Visit,Completion Status,Završetak Status
 DocType: HR Settings,Enter retirement age in years,Unesite dob za umirovljenje u godinama
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljana galerija
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dopustite preko isporuka ili primitak upto ovim posto
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz posjećenost
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Sve skupine proizvoda
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Sve skupine proizvoda
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto dobit / gubitak
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatski napravi poruku pri podnošenju transakcije.
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Narudžbenice za plaćanje
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predviđena količina
 DocType: Sales Invoice,Payment Due Date,Plaćanje Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Stavka Varijanta {0} već postoji s istim atributima
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otvaranje &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otvoreni učiniti
 DocType: Notification Control,Delivery Note Message,Otpremnica - poruka
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Kom
 DocType: Leave Block List Date,Leave Block List Date,Datum popisa neodobrenih odsustava
 DocType: Pricing Rule,Price or Discount,Cijena i popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno odgovarajuće naknade u potvrdi o kupnji stavke stolu mora biti ista kao i Total poreza i naknada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Ukupno odgovarajuće naknade u potvrdi o kupnji stavke stolu mora biti ista kao i Total poreza i naknada
 DocType: Sales Team,Incentives,Poticaji
 DocType: SMS Log,Requested Numbers,Traženi brojevi
 DocType: Production Planning Tool,Only Obtain Raw Materials,Dobiti Samo sirovine
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Je podugovarati
 DocType: Item Attribute,Item Attribute Values,Stavka vrijednosti atributa
 DocType: Examination Result,Examination Result,Rezultat ispita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Primka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Primka
 ,Received Items To Be Billed,Primljeni Proizvodi se naplaćuje
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Poslao plaća gaćice
 DocType: Employee,Ms,Gospođa
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Majstor valute .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referentni DOCTYPE mora biti jedan od {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referentni DOCTYPE mora biti jedan od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nije moguće pronaći termin u narednih {0} dana za rad {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materijal za pod-sklopova
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodaja Partneri i Županija
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Ne može se automatski stvoriti račun kao što je već ravnoteža dionica na računu. Morate stvoriti odgovarajući račun prije nego što možete napraviti unos na tom skladištu
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Zadane naplativo račune
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaposlenik {0} nije aktivan ili ne postoji
 DocType: Fee Structure,Components,Komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Stavka Varijante {0} ažurirani
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Unesite imovinom Kategorija tačke {0}
 DocType: Quality Inspection Reading,Reading 6,Čitanje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Ne mogu {0} {1} {2} bez ikakvih negativnih izvanredan fakture
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Ulazni račun - predujam
 DocType: Hub Settings,Sync Now,Sync Sada
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Red {0}: Kredit unos ne može biti povezan s {1}
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,Je dobavljivi proizvod
 DocType: Asset,Purchase Invoice,Ulazni račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detalj Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Novi prodajni Račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Novi prodajni Račun
 DocType: Stock Entry,Total Outgoing Value,Ukupna odlazna vrijednost
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Otvaranje i zatvaranje Datum datum mora biti unutar iste fiskalne godine
 DocType: Lead,Request for Information,Zahtjev za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sinkronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sinkronizacija Offline Računi
 DocType: Payment Request,Paid,Plaćen
 DocType: Program Fee,Program Fee,Naknada program
 DocType: Salary Slip,Total in words,Ukupno je u riječima
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,kažnjeni
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,Obavezno polje. Moguće je da za njega nije upisan tečaj.
 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Objavi na web stranici
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Isporuke kupcima.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Datum Dobavljač Račun ne može biti veća od datum knjiženja
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varijacija
 ,Company Name,Ime tvrtke
 DocType: SMS Center,Total Message(s),Ukupno poruka ( i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Odaberite stavke za prijenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Zadana Banka / Novčani račun će biti automatski ažurira plaće Temeljnica kad je odabran ovaj način rada.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervali za Grade Kodeksa {0} preklapa s intervalima razreda za druge razrede. Provjerite intervali {0} i {1} i pokušajte ponovno
 DocType: BOM,Raw Material Cost(Company Currency),Troškova sirovine (Društvo valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Svi predmeti su već prebačeni za ovu radnog naloga.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Red # {0}: Stopa ne može biti veća od stope korištene u {1} {2}
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM web stranica predmeta
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload Vaše pismo glavu i logotip. (Možete ih uređivati kasnije).
 DocType: Timesheet Detail,Bill,Račun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sljedeća Amortizacija Datum upisuje kao prošlih dana
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bijela
 DocType: SMS Center,All Lead (Open),Svi potencijalni kupci (aktualni)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Red {0}: Kol nisu dostupni za {4} u skladištu {1} na objavljivanje vrijeme upisa ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Kreiraj avansno plaćanje
 DocType: Item,Automatically Create New Batch,Automatski kreira novu seriju
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Napravi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Napravi
 DocType: Student Admission,Admission Start Date,Prijem Datum početka
 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 .
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Unesite račun za promjene visine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Unesite račun za promjene visine
 DocType: Student Batch Name,Student Batch Name,Studentski Batch Name
 DocType: Holiday List,Holiday List Name,Turistička Popis Ime
 DocType: Repayment Schedule,Balance Loan Amount,Stanje Iznos kredita
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Uklonjene stvari bez promjena u količini ili vrijednosti.
 DocType: Delivery Note,Delivery To,Dostava za
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Osobina stol je obavezno
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Osobina stol je obavezno
 DocType: Production Planning Tool,Get Sales Orders,Kreiraj narudžbe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne može biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Ukupan broj deprecijaciju
 DocType: Sales Invoice Item,Rate With Margin,Ocijenite s marginom
 DocType: Workstation,Wages,Plaće
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse u prodajni nalog / skladišta gotovih proizvoda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Prodaja Iznos
 DocType: Repayment Schedule,Interest Amount,Iznos kamata
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Vi ste osoba za odobrenje rashoda za ovaj zapis. Molimo ažurirajte status i spremite
 DocType: Serial No,Creation Document No,Stvaranje dokumenata nema
 DocType: Issue,Issue,Izdanje
 DocType: Asset,Scrapped,otpisan
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za stavku varijanti. npr Veličina, boja i sl"
 DocType: Purchase Invoice,Returns,vraća
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Skladište
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijski Ne {0} je pod ugovorom za održavanje upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,regrutacija
 DocType: Lead,Organization Name,Naziv organizacije
 DocType: Tax Rule,Shipping State,Državna dostava
 ,Projected Quantity as Source,Planirana količina kao izvor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Stavka mora biti dodana pomoću 'se predmeti od kupnje primitaka' gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Uključuje ne-stock predmeta
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajni troškovi
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Protiv
 DocType: Item,Default Selling Cost Center,Zadani trošak prodaje
 DocType: Sales Partner,Implementation Partner,Provedba partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštanski broj
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Poštanski broj
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Prodaja Naručite {0} {1}
 DocType: Opportunity,Contact Info,Kontakt Informacije
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izrada Stock unose
 DocType: Packing Slip,Net Weight UOM,Težina mjerna jedinica
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Rezultati
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Rezultati
 DocType: Item,Default Supplier,Glavni dobavljač
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Tijekom Postotak proizvodnje doplatku
 DocType: Employee Loan,Repayment Schedule,Otplata Raspored
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nabavite Tjedno Off datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum završetka ne može biti manja od početnog datuma
 DocType: Sales Person,Select company name first.,Prvo odaberite naziv tvrtke.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Doktor
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Doktor
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponude dobivene od dobavljača.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Prosječna starost
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Zona ključnih performansi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,promet
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Pogrešna Osobina
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} mora biti podnesen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} mora biti podnesen
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manji ili jednak {0}
 DocType: SMS Center,Total Characters,Ukupno Likovi
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Odaberite BOM u BOM polje za točku {0}
@@ -1152,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Molimo postavite &quot;Primijeni dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Od Raspon mora biti manji od u rasponu
 DocType: Global Defaults,Global Defaults,Globalne zadane postavke
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Početak godine
 DocType: Purchase Invoice,Start date of current invoice's period,Početak datum tekućeg razdoblja dostavnice
 DocType: Salary Slip,Leave Without Pay,Neplaćeno odsustvo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapacitet Greška planiranje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To će biti dodan u šifra varijante. Na primjer, ako je vaš naziv je ""SM"", a točka kod ""T-shirt"", stavka kod varijante će biti ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto plaća (riječima) će biti vidljiva nakon što spremite klizne plaće.
 DocType: Purchase Invoice,Is Return,Je li povratak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Povratak / debitna Napomena
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Povratak / debitna Napomena
 DocType: Price List Country,Price List Country,Država cjenika
 DocType: Item,UOMs,J. MJ.
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} valjani serijski nos za Stavka {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Unesite Šifra dobiti broj serije
 DocType: Stock Settings,Default Item Group,Zadana grupa proizvoda
 DocType: Employee Loan,Partially Disbursed,djelomično Isplaćeno
-DocType: Grading Structure,Grading System Name,Naziv sustav ocjenjivanja
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavljač baza podataka.
 DocType: Account,Balance Sheet,Završni račun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Troška za stavku s šifra '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Troška za stavku s šifra '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plaćanja nije konfiguriran. Provjerite, da li je račun postavljen na način rada platnu ili na POS profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Prodavač će dobiti podsjetnik na taj datum kako bi pravovremeno kontaktirao kupca
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti predmet ne može se upisati više puta.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daljnje računi mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Stavke narudžbenice za naplatu
 DocType: Purchase Invoice Item,Net Rate,Neto stopa
 DocType: Purchase Invoice Item,Purchase Invoice Item,Proizvod ulaznog računa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Upisi u glavnu knjigu i GL upisi su ponovno postavljeni za odabrane primke.
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Upisi u glavnu knjigu i GL upisi su ponovno postavljeni za odabrane primke.
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Stavka 1
 DocType: Holiday,Holiday,Odmor
 DocType: Support Settings,Close Issue After Days,Zatvori Issue Nakon dana
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Rad Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Navedite barem jedan atribut u tablici Svojstva
 DocType: Announcement,All Students,Svi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Stavka {0} mora biti ne-stock točka a
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Pogledaj Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najstarije
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Stavka Grupa postoji s istim imenom , molimo promijenite ime stavku ili preimenovati stavku grupe"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studentski Mobile Ne
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Isplata plaće iz {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodajnog naloga {0} nije ispravan
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Narudžbenice vam pomoći planirati i pratiti na Vašoj kupnji
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Žao nam je , tvrtke ne mogu spojiti"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Ukupna količina Pitanje / Prijenos {0} u materijalnim Zahtjevu {1} \ ne može biti veća od tražene količine {2} za točki {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mali
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Neizravni troškovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Red {0}: Količina je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poljoprivreda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Web slika bi trebala biti javna datoteke ili URL web stranice
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jekorijen stavka grupa i ne može se mijenjati .
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Broj grupe grupa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, samo kreditne računi se mogu povezati protiv drugog ulaska debitnom"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Ukupan svih radnih težina bi trebala biti 1. Podesite vage svih zadataka projekta u skladu s tim
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Otpremnica {0} nije potvrđena
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cijene Pravilo prvo se bira na temelju 'Nanesite na' terenu, koji može biti točka, točka Grupa ili Brand."
 DocType: Hub Settings,Seller Website,Web Prodavač
 DocType: Item,ITEM-,ARTIKAL-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Ukupno dodijeljeno postotak za prodajni tim bi trebao biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status proizvodnog naloga je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status proizvodnog naloga je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 ,Team Updates,tim ažuriranja
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,za Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Stvaranje format ispisa
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} stavke u tijeku
 DocType: Workstation,Workstation Name,Ime Workstation
-DocType: Grade Interval,Grade Code,Grade Šifra
+DocType: Grading Scale Interval,Grade Code,Grade Šifra
 DocType: POS Item Group,POS Item Group,POS Točka Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pošta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada Točki {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ponavljajući Upto
 DocType: Attendance,HR Manager,HR menadžer
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Odaberite tvrtku
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Odaberite tvrtku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege dopust
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavljač Datum fakture
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Morate omogućiti košaricu
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starenje Raspon 3
 DocType: Maintenance Schedule Item,No of Visits,Broj pregleda
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark dolazaka
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark dolazaka
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Raspored održavanja {0} postoji protiv {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,upisa studenata
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zatvaranja računa mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Zbroj bodova svih ciljeva trebao biti 100. To je {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Prosječni dnevni izlaz
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Naziv i tip
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Status Odobrenje mora biti ""Odobreno"" ili "" Odbijeno """
 DocType: Purchase Invoice,Contact Person,Kontakt osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',Očekivani datum početka ne može biti veći od očekivanog datuma završetka
 DocType: Course Scheduling Tool,Course End Date,Naravno Datum završetka
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Dostava Adresa Ime
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontni plan
 DocType: Material Request,Terms and Conditions Content,Uvjeti sadržaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne može biti veće od 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ne može biti veće od 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Proizvod {0} nije skladišni proizvod
 DocType: Maintenance Visit,Unscheduled,Neplanski
 DocType: Employee,Owned,U vlasništvu
 DocType: Salary Detail,Depends on Leave Without Pay,Ovisi o ostaviti bez platiti
 DocType: Pricing Rule,"Higher the number, higher the priority","Veći broj, veći prioritet"
 ,Purchase Invoice Trends,Trendovi nabavnih računa
 DocType: Employee,Better Prospects,Bolji izgledi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Red # {0}: Šarža {1} ima samo {2} qty. Odaberite drugu seriju koja ima {3} količinu dostupnu ili razdijelite red u više redaka, kako biste ih isporučili / izdali iz više šarži"
 DocType: Vehicle,License Plate,registarska tablica
 DocType: Appraisal,Goals,Golovi
 DocType: Warranty Claim,Warranty / AMC Status,Jamstveni / AMC Status
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaposlenik se ne može prijaviti na sebe.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ako je račun zamrznut , unosi dopušteno ograničene korisnike ."
 DocType: Email Digest,Bank Balance,Bankovni saldo
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Računovodstvo Ulaz za {0}: {1} može biti samo u valuti: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil posla, tražene kvalifikacije i sl."
 DocType: Journal Entry Account,Account Balance,Bilanca računa
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Porezni Pravilo za transakcije.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezatvorena fiskalne godine u P &amp; L stanja
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} nije aktivan
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Provjerite Prodaja Narudžbe će vam pomoći planirati svoj rad i isporučiti na vrijeme
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Provjerite Prodaja Narudžbe će vam pomoći planirati svoj rad i isporučiti na vrijeme
 DocType: Quality Inspection,Readings,Očitanja
 DocType: Stock Entry,Total Additional Costs,Ukupno Dodatni troškovi
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Za vrijednost
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Odreskom
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Odreskom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Najam ureda
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Postavke SMS pristupnika
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz nije uspio !
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Usluge
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Plaća proklizavanja zaposlenog
 DocType: Cost Center,Parent Cost Center,Nadređeni troškovni centar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Odaberite Mogući Dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Odaberite Mogući Dobavljač
 DocType: Sales Invoice,Source,Izvor
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zatvorene
 DocType: Leave Type,Is Leave Without Pay,Je Ostavite bez plaće
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategorija je obvezna za nepokretnu stavke imovine
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nisu pronađeni zapisi u tablici plaćanja
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},To {0} sukobi s {1} od {2} {3}
 DocType: Student Attendance Tool,Students HTML,Studenti HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Datum Napuštanje
 DocType: Pricing Rule,For Price List,Za cjenik
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Stvaranje vodi
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Stvaranje vodi
 DocType: Maintenance Schedule,Schedules,Raspored
 DocType: Purchase Invoice Item,Net Amount,Neto Iznos
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM detalji - broj
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Programska upisanih
 DocType: Sales Invoice Item,Brand Name,Naziv brenda
 DocType: Purchase Receipt,Transporter Details,Transporter Detalji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Default skladište je potreban za odabranu stavku
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,kutija
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Mogući Dobavljač
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Mogući Dobavljač
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
 DocType: Budget,Monthly Distribution,Mjesečna distribucija
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver Lista je prazna . Molimo stvoriti Receiver Popis
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Prodajni plan prodajnog partnera
 DocType: Loan Type,Maximum Loan Amount,Maksimalni iznos kredita
 DocType: Pricing Rule,Pricing Rule,Pravila cijena
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplikat broja valjaka za učenika {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplikat broja valjaka za učenika {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Akcija, ako Godišnji proračun Prebačen"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materijal Zahtjev za Narudžbenica
 DocType: Shopping Cart Settings,Payment Success URL,Plaćanje Uspjeh URL
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,Način otplate
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ako je označeno, početna stranica će biti zadana točka Grupa za web stranicu"
 DocType: Quality Inspection Reading,Reading 4,Čitanje 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Zadana BOM {0} nije pronađen Projekta {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Zadana BOM {0} nije pronađen Projekta {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Potraživanja za tvrtke trošak.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti se u središtu sustava, dodati sve svoje studente"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti se u središtu sustava, dodati sve svoje studente"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Red # {0}: Datum Razmak {1} ne može biti prije Ček Datum {2}
 DocType: Company,Default Holiday List,Default odmor List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Red {0}: S vremena i na vrijeme od {1} je preklapanje s {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dan (e) na koje se prijavljuje za odmor su praznici. Ne morate se prijaviti za dopust.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno slanje plaćanja Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Novi zadatak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Napravite citat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Napravite citat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostala izvješća
 DocType: Dependent Task,Dependent Task,Ovisno zadatak
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor pretvorbe za zadani jedinica mjere mora biti jedan u nizu {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Odsustvo tipa {0} ne može biti duže od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pokušajte planirati poslovanje za X dana unaprijed.
 DocType: HR Settings,Stop Birthday Reminders,Zaustavi Rođendan Podsjetnici
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Molimo postavite zadanog Platne naplativo račun u Društvu {0}
 DocType: SMS Center,Receiver List,Prijemnik Popis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Traži Stavka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Traži Stavka
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Konzumira Iznos
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto promjena u gotovini
 DocType: Assessment Plan,Grading Scale,ljestvici
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,već završena
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jedinica mjere {0} je ušao više od jednom u konverzije Factor tablici
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,već završena
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Zahtjev za plaćanje već postoji {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Trošak izdanih stavki
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Količina ne smije biti veća od {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Provjerite unos isplati
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Red {0}: Advance protiv Dobavljač mora teretiti
 DocType: Company,Default Values,Zadane vrijednosti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Ukupno Iznos nadoknađeni
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To se temelji na zapisima protiv tog vozila. Pogledajte vremensku crtu ispod za detalje
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Prikupiti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Protiv dobavljača Račun {0} datira {1}
 DocType: Customer,Default Price List,Zadani cjenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Unos imovine Pokret {0} stvorio
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ne možete izbrisati Fiskalna godina {0}. Fiskalna godina {0} je postavljen kao zadani u Globalne postavke
 DocType: Journal Entry,Entry Type,Ulaz Tip
 ,Customer Credit Balance,Kupac saldo
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,nabavka
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nitko od stavki ima bilo kakve promjene u količini ili vrijednosti.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obvezno polje - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Jamstvo Zatraži
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Jamstvo Zatraži
 ,Lead Details,Detalji potenciajalnog kupca
 DocType: Salary Slip,Loan repayment,otplata kredita
 DocType: Purchase Invoice,End date of current invoice's period,Kraj datum tekućeg razdoblja dostavnice
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Stalna adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Odaberite Šifra
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Odaberite Šifra
 DocType: Student Sibling,Studying in Same Institute,Studiranje u istom institutu
 DocType: Territory,Territory Manager,Upravitelj teritorija
 DocType: Packed Item,To Warehouse (Optional),Za Warehouse (po izboru)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Plaćeni iznos (Društvo valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Postavke prodaje
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Pogledaj u košaricu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Troškovi marketinga
 ,Item Shortage Report,Nedostatak izvješća za proizvod
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Težina se spomenuto, \n Molimo spomenuti ""težinu UOM"" previše"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Zahtjev za robom korišten za izradu ovog ulaza robe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum obvezna je za novu imovinu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sljedeća Amortizacija Datum obvezna je za novu imovinu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Odvojena grupa za tečajeve za svaku seriju
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jedna jedinica stavku.
 DocType: Fee Category,Fee Category,Naknada Kategorija
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,P.S-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centar Cijena je potreban za &quot;dobiti i gubitka računa {2}. Molimo postaviti zadani troška Društva.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Skupina kupaca&gt; Teritorij
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Novi Kontakt
 DocType: Territory,Parent Territory,Nadređena teritorija
 DocType: Quality Inspection Reading,Reading 2,Čitanje 2
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Stavka-mudri prodaja registar
 DocType: Asset,Gross Purchase Amount,Bruto Iznos narudžbe
 DocType: Asset,Depreciation Method,Metoda amortizacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je li ovo pristojba uključena u osnovne stope?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Ukupno Target
 DocType: Program Course,Required,Potreban
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pomirenje JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Previše stupovi. Izvesti izvješće i ispisati pomoću aplikacije za proračunske tablice.
 DocType: Purchase Invoice Item,Batch No,Broj serije
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nije moguće pronaći tečaj za {0} do {1} za ključni datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dopusti višestruke prodajne naloge protiv kupca narudžbenice
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupe studenata
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Ne
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Glavni
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varijanta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Glavni
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varijanta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Postavite prefiks za numeriranje niza na svoje transakcije
 DocType: Employee Attendance Tool,Employees HTML,Zaposlenici HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Zadana BOM ({0}) mora biti aktivan za tu stavku ili njegov predložak
 DocType: Employee,Leave Encashed?,Odsustvo naplaćeno?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Prilika Od polje je obavezno
 DocType: Email Digest,Annual Expenses,Godišnji troškovi
 DocType: Item,Variants,Varijante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Napravi narudžbu kupnje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Napravi narudžbu kupnje
 DocType: SMS Center,Send To,Pošalji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nema dovoljno ravnotežu dopust za dozvolu tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodijeljeni iznos
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kupca Stavka Šifra
 DocType: Stock Reconciliation,Stock Reconciliation,Kataloški pomirenje
 DocType: Territory,Territory Name,Naziv teritorija
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Rad u tijeku Warehouse je potrebno prije Podnijeti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Podnositelj prijave za posao.
 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
 DocType: Item,Serial Nos and Batches,Serijski brojevi i serije
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Snaga grupe učenika
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Protiv Temeljnica {0} nema premca {1} unos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,procjene
 apps/erpnext/erpnext/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 Pravilo isporuke
-DocType: Grading Structure,Grading Intervals,Ocjenjivanje Intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Molim uđite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Ne mogu overbill za točku {0} u nizu {1} više {2}. Da bi se omogućilo pretjerano naplatu, postavite na kupnju Postavke"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Molimo postavite filter na temelju stavka ili skladište
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} mora biti podnesen
 DocType: Authorization Control,Authorization Control,Kontrola autorizacije
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Red # {0}: Odbijen Skladište je obvezna protiv odbijena točka {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Uplata
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljanje narudžbe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Uplata
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljanje narudžbe
 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
 DocType: Course,Course Abbreviation,naziv predmeta
 DocType: Student Leave Application,Student Leave Application,Studentski Ostavite aplikacija
 DocType: Item,Will also apply for variants,Također će podnijeti zahtjev za varijante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Imovina se ne može otkazati, jer je već {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenik {0} na pola dana na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Ukupno radno vrijeme ne smije biti veći od max radnog vremena {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Hrpa proizvoda u vrijeme prodaje.
 DocType: Quotation Item,Actual Qty,Stvarna kol
 DocType: Sales Invoice Item,References,Reference
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Unijeli ste dupli proizvod. Ispravite i pokušajte ponovno.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,pomoćnik
 DocType: Asset Movement,Asset Movement,imovina pokret
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Novi Košarica
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Novi Košarica
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Proizvod {0} nije serijalizirani proizvod
 DocType: SMS Center,Create Receiver List,Stvaranje Receiver popis
 DocType: Vehicle,Wheels,kotači
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogućuje stvaranje vremenskih trupaca protiv radne naloge. Operacije neće biti praćeni protiv proizvodnje Reda
 DocType: Student,Student Mobile Number,Studentski broj mobitela
 DocType: Item,Has Variants,Je Varijante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Već ste odabrali stavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naziv mjesečne distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID serije obvezan je
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID serije obvezan je
 DocType: Sales Person,Parent Sales Person,Nadređeni prodavač
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajući Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektima
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Fiskalna godina
 DocType: Vehicle Log,Fuel Price,Cijena goriva
 DocType: Budget,Budget,Budžet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fiksni Asset Stavka mora biti ne-stock točka a.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun se ne može dodijeliti protiv {0}, kao što je nije prihod ili rashod račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Ostvareno
 DocType: Student Admission,Application Form Route,Obrazac za prijavu Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Teritorij / Kupac
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Teritorij / Kupac
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,na primjer 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Ostavi Tip {0} nije moguće rasporediti jer se ostaviti bez plaće
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Red {0}: Dodijeljeni iznos {1} mora biti manji od ili jednak fakturirati preostali iznos {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Status serijskog broja
 DocType: Payment Entry Reference,Outstanding,izvanredan
 ,Daily Timesheet Summary,Dnevni timesheet Sažetak
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Red {0}: Za postavljanje {1} periodičnost, razlika između od a do danas \
  mora biti veći ili jednak {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To se temelji na dionicama kretanja. Vidi {0} za detalje
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Iznos {0} {1} oduzimaju od {2}
 DocType: Employee,Salary Information,Informacije o plaći
 DocType: Sales Person,Name and Employee ID,Ime i ID zaposlenika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum dospijeća ne može biti prije datuma objavljivanja
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Carine i porezi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Unesite Referentni datum
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Ne mogu se odnositi broj retka veći ili jednak trenutnom broju red za ovu vrstu Charge
 DocType: Asset,Sold,prodan
 ,Item-wise Purchase History,Povjest nabave po stavkama
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Molimo kliknite na ""Generiraj raspored ' dohvatiti Serial No dodao je za točku {0}"
 DocType: Account,Frozen,Zaleđeni
 ,Open Production Orders,Otvoreni radni nalozi
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Baza Iznos (Društvo valuta)
 DocType: Payment Reconciliation Payment,Reference Row,Referentni Row
 DocType: Installation Note,Installation Time,Vrijeme instalacije
 DocType: Sales Invoice,Accounting Details,Računovodstvo Detalji
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Izbrišite sve transakcije za ovu Društvo
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investicije
 DocType: Issue,Resolution Details,Rezolucija o Brodu
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,Rasprava
 DocType: Payment Entry,Transaction ID,ID transakcije
 DocType: Employee,Resignation Letter Date,Ostavka Pismo Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravilnik o određivanju cijena dodatno se filtrira na temelju količine.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Postavite datum pridruživanja za zaposlenika {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Ukupan iznos za naplatu (preko vremenska tablica)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite kupaca prihoda
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) mora imati ulogu ""Odobritelj rashoda '"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Odaberite BOM i Kol za proizvodnju
 DocType: Asset,Depreciation Schedule,Amortizacija Raspored
 DocType: Bank Reconciliation Detail,Against Account,Protiv računa
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Poludnevni Datum treba biti između od datuma i datuma
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Molimo postavite &quot;imovinom Centar Amortizacija troškova &#39;u Društvu {0}
 ,Maintenance Schedules,Održavanja rasporeda
 DocType: Task,Actual End Date (via Time Sheet),Stvarni Datum završetka (putem vremenska tablica)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Iznos {0} {1} od {2} {3}
 ,Quotation Trends,Trend ponuda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Stavka proizvoda se ne spominje u master artiklu za artikal {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Iznos na čekanju
 DocType: Purchase Invoice Item,Conversion Factor,Konverzijski faktor
 DocType: Purchase Order,Delivered,Isporučeno
 ,Vehicle Expenses,Troškovi vozila
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
+DocType: Serial No,Invoice Details,Pojedinosti fakture
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Očekivana vrijednost nakon životnog vijeka mora biti veća od ili jednaka do {0}
 DocType: Purchase Receipt,Vehicle Number,Broj vozila
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datum na koji se ponavlja faktura će se zaustaviti
 DocType: Employee Loan,Loan Amount,Iznos pozajmice
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR postavke
 DocType: Salary Slip,net pay info,Neto info plaća
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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 .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Novi troškovi
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Iznos
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Red # {0}: Količina mora biti jedan, jer predmet je fiksni kapital. Molimo koristite poseban red za više kom."
 DocType: Leave Block List Allow,Leave Block List Allow,Odobrenje popisa neodobrenih odsustava
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ne može biti prazno ili razmak
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa ne-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportovi
 DocType: Loan Type,Loan Name,Naziv kredita
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Stjecanje kupaca i lojalnost
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Skladište na kojem držite zalihe odbijenih proizvoda
 DocType: Production Order,Skip Material Transfer,Preskoči prijenos materijala
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nije moguće pronaći kurs za {0} do {1} za ključni datum {2}. Ručno stvorite zapis za mjenjačnicu
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaša financijska godina završava
 DocType: POS Profile,Price List,Cjenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} je sada zadana fiskalna godina. Osvježi preglednik kako bi se promjene aktualizirale.
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Račun {0} je nevažeći. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM pretvorbe je potrebno u redu {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od prodajnog naloga, prodaja fakture ili Journal Entry"
 DocType: Salary Component,Deduction,Odbitak
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Red {0}: Od vremena i vremena je obavezno.
 DocType: Stock Reconciliation Item,Amount Difference,iznos razlika
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Cijena dodana za {0} u cjeniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Unesite ID zaposlenika ove prodaje osobi
 DocType: Territory,Classification of Customers by region,Klasifikacija korisnika po regiji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika Iznos mora biti jednak nuli
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika Iznos mora biti jednak nuli
 DocType: Project,Gross Margin,Bruto marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Unesite Proizvodnja predmeta prvi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunato banka Izjava stanje
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogućen korisnika
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Ponuda
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Ponuda
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Ukupno Odbitak
 ,Production Analytics,Proizvodnja Analytics
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Upozorenje: Invalid SSL potvrda o vezanosti {0}
 DocType: Student Admission,Eligibility,kvalificiranost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Potencijalni kupci će vam pomoći u posao, dodati sve svoje kontakte, a više kao svoje potencijalne klijente"
 DocType: Production Order Operation,Actual Operation Time,Stvarni Operacija vrijeme
 DocType: Authorization Rule,Applicable To (User),Odnosi se na (Upute)
 DocType: Purchase Taxes and Charges,Deduct,Odbiti
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,Adresa na poslu
 DocType: Appraisal,Calculate Total Score,Izračunajte ukupni rezultat
 DocType: Request for Quotation,Manufacturing Manager,Upravitelj proizvodnje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijski Ne {0} je pod jamstvom upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split otpremnici u paketima.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Pošiljke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Saldo računa ({0}) za {1} i vrijednost zaliha ({2}) za skladište {3} moraju biti isti
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Ukupno Ostavite Dani
 DocType: Email Digest,Note: Email will not be sent to disabled users,Napomena: E-mail neće biti poslan nepostojećim korisnicima
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Broj interakcija
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Odaberite tvrtku ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Odaberite tvrtku ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Ostavite prazno ako se odnosi na sve odjele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zapošljavanja ( trajni ugovor , pripravnik i sl. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obavezno za točku {1}
 DocType: Process Payroll,Fortnightly,četrnaestodnevni
 DocType: Currency Exchange,From Currency,Od novca
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Ocijeni (Društvo valuta)
 DocType: Student Guardian,Others,Ostali
 DocType: Payment Entry,Unallocated Amount,Nealocirano Količina
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Ne možete pronaći odgovarajući stavku. Odaberite neku drugu vrijednost za {0}.
 DocType: POS Profile,Taxes and Charges,Porezi i naknade
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Proizvod ili usluga koja je kupljena, prodana ili zadržana na lageru."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nema više ažuriranja
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Ne možete odabrati vrstu naboja kao ' na prethodnim Row Iznos ""ili"" u odnosu na prethodnu Row Ukupno ""za prvi red"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dijete Stavka ne bi trebao biti proizvod Bundle. Uklonite stavku &#39;{0}&#39; i spremanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankarstvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj timesheets
 DocType: Vehicle Service,Service Item,usluga predmeta
 DocType: Bank Guarantee,Bank Guarantee,Jamstvo banke
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Molimo kliknite na ""Generiraj raspored ' kako bi dobili raspored"
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Red # {0}: Imovina {1} Već {2}
 DocType: Quotation Item,Stock Balance,Skladišna bilanca
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Prodajnog naloga za plaćanje
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Postavite Serija za imenovanje {0} putem Postava&gt; Postavke&gt; Serija za imenovanje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Rashodi Zahtjev Detalj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Molimo odaberite ispravnu račun
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Cijene neće biti prikazana ako Cjenik nije postavljena
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Navedite zemlju za ovaj Dostava pravilom ili provjeriti Dostava u svijetu
 DocType: Stock Entry,Total Incoming Value,Ukupno Dolazni vrijednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Zaduženja je potrebno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Zaduženja je potrebno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomoći pratiti vrijeme, troškove i naplatu za aktivnostima obavljaju unutar vašeg tima"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kupovni cjenik
 DocType: Offer Letter Term,Offer Term,Ponuda Pojam
 DocType: Quality Inspection,Quality Manager,Upravitelj kvalitete
 DocType: Job Applicant,Job Opening,Posao Otvaranje
 DocType: Payment Reconciliation,Payment Reconciliation,Pomirenje plaćanja
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Odaberite incharge ime osobe
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Odaberite incharge ime osobe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tehnologija
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Ukupno Neplaćeni: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Web Rad
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,Razlog gubitka
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Unesite primitka dokumenta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Svi proizvodi su već fakturirani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Unesite primitka dokumenta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daljnje troška mogu biti u skupinama, ali unose se može podnijeti protiv nesrpskog Groups"
 DocType: Project,External,Vanjski
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Korisnici i dozvole
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Radni nalozi Created: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Radni nalozi Created: {0}
 DocType: Branch,Branch,Grana
 DocType: Guardian,Mobile Number,Broj mobitela
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje i brendiranje
 DocType: Bin,Actual Quantity,Stvarna količina
 DocType: Shipping Rule,example: Next Day Shipping,Primjer: Sljedeći dan Dostava
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijski broj {0} nije pronađen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijski broj {0} nije pronađen
 DocType: Scheduling Tool,Student Batch,Student serije
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši klijenti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Provjerite Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Provjerite Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Pozvani ste da surađuju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Datum bloka
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Primijeni sada
@@ -2198,8 +2202,9 @@
 DocType: SMS Log,Sent To,Poslano Da
 DocType: Payment Request,Make Sales Invoice,Napravi prodajni račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sljedeća Kontakt Datum ne može biti u prošlosti
 DocType: Company,For Reference Only.,Za samo kao referenca.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Odaberite šifra serije
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Pogrešna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Iznos predujma
@@ -2213,7 +2218,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Slučaj broj ne može biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži slideshow na vrhu stranice
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Sastavnice
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,prodavaonice
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,prodavaonice
 DocType: Serial No,Delivery Time,Vrijeme isporuke
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Starenje temelju On
 DocType: Item,End of Life,Kraj života
@@ -2225,12 +2230,12 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Update cost
 DocType: Item Reorder,Item Reorder,Ponovna narudžba proizvoda
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Prikaži Plaća proklizavanja
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prijenos materijala
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Prikaži Plaća proklizavanja
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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 ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ovaj dokument je preko granice po {0} {1} za stavku {4}. Jeste li što drugo {3} protiv iste {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Iznos računa Odaberi promjene
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Molimo postavite ponavljajući nakon spremanja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Iznos računa Odaberi promjene
 DocType: Purchase Invoice,Price List Currency,Valuta cjenika
 DocType: Naming Series,User must always select,Korisničko uvijek mora odabrati
 DocType: Stock Settings,Allow Negative Stock,Dopustite negativnu zalihu
@@ -2241,7 +2246,7 @@
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Ovjeren od strane
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne mogu promijeniti tvrtke zadanu valutu , jer postoje neki poslovi . Transakcije mora biti otkazana promijeniti zadanu valutu ."
-DocType: Grade Interval,Grade Description,Razred Opis
+DocType: Grading Scale Interval,Grade Description,Razred Opis
 DocType: Stock Entry,Purchase Receipt No,Primka br.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,kapara
 DocType: Process Payroll,Create Salary Slip,Stvaranje plaće Slip
@@ -2279,7 +2284,7 @@
 DocType: Upload Attendance,Attendance To Date,Gledanost do danas
 DocType: Warranty Claim,Raised By,Povišena Do
 DocType: Payment Gateway Account,Payment Account,Račun za plaćanje
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Navedite Tvrtka postupiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Navedite Tvrtka postupiti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto promjena u potraživanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompenzacijski Off
 DocType: Offer Letter,Accepted,Prihvaćeno
@@ -2288,12 +2293,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Broj sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Pogrešna referentni {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne može biti veći od planirane količine ({2}) u proizvodnom nalogu {3}
 DocType: Shipping Rule,Shipping Rule Label,Dostava Pravilo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum za korisnike
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Sirovine ne može biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Brzo Temeljnica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Brzo Temeljnica
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2306,7 +2311,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Odredbe i Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Ime instituta za koju postavljate ovaj sustav.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Knjiženje zamrznuta do tog datuma, nitko ne može učiniti / mijenjati ulazak, osim uloge naveden u nastavku."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Molimo spremite dokument prije stvaranja raspored za održavanje
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),Provjerite to da ne dopušta frakcija. (Za br)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Sljedeći Radni nalozi stvorili su:
@@ -2333,7 +2338,7 @@
 ,Employees working on a holiday,Radnici koji rade na odmor
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Sadašnje
 DocType: Project,% Complete Method,% Kompletan postupak
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Početni datum održavanja ne može biti stariji od datuma isporuke s rednim brojem {0}
 DocType: Production Order,Actual End Date,Stvarni datum završetka
 DocType: BOM,Operating Cost (Company Currency),Operativni trošak (Društvo valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2350,7 +2355,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Ostavite bez plaće ne odgovara odobrenog odsustva primjene zapisa
 DocType: Campaign,Campaign-.####,Kampanja-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sljedeći koraci
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Molimo dostaviti navedene stavke po najboljim mogućim cijenama
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Prilika nakon 15 dana
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Godina završetka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kvota / olovo%
@@ -2407,7 +2412,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RecD Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Naknada zapisa nastalih - {0}
 DocType: Asset Category Account,Asset Category Account,Imovina Kategorija račun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Međuskladišnica {0} nije potvrđena
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Cash račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Sljedeća Kontakt Po ne može biti ista kao što je vodeći e-mail adresa
@@ -2429,7 +2434,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Razmak Datum nije spomenuo
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Proizvodnja
 DocType: Guardian,Occupation,Okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Red {0} : Datum početka mora biti prije datuma završetka
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Ukupno (Kol)
 DocType: Sales Invoice,This Document,Ovaj dokument
 DocType: Installation Note Item,Installed Qty,Instalirana kol
@@ -2445,14 +2451,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,komunalna Troškovi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Iznad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: časopis za ulazak {1} nema računa {2} ili već usklađeni protiv drugog bona
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Red # {0}: časopis za ulazak {1} nema računa {2} ili već usklađeni protiv drugog bona
 DocType: Buying Settings,Default Buying Price List,Zadani kupovni cjenik
 DocType: Process Payroll,Salary Slip Based on Timesheet,Plaća proklizavanja temelju timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Vrsta plaćanja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Odaberite Batch for Item {0}. Nije moguće pronaći jednu seriju koja ispunjava taj uvjet
 DocType: Process Payroll,Select Employees,Odaberite Zaposlenici
 DocType: Opportunity,Potential Sales Deal,Potencijalni Prodaja Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referentni datum
@@ -2469,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalna POS Profil {0} je već stvoren za tvrtku {1}
 DocType: Purchase Order,Ref SQ,Ref. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamijenite predmet / BOM u svim sastavnicama
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Prijem dokumenata moraju biti dostavljeni
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Prijem dokumenata moraju biti dostavljeni
 DocType: Purchase Invoice Item,Received Qty,Pozicija Kol
 DocType: Stock Entry Detail,Serial No / Batch,Serijski Ne / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plaća i ne Isporučeno
@@ -2478,11 +2484,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nema vremenske tablice
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Ostavite Tip {0} ne može nositi-proslijeđen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Raspored održavanja nije generiran za sve proizvode. Molimo kliknite na 'Generiraj raspored'
 ,To Produce,proizvoditi
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Platni spisak
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za red {0} {1}. Da su {2} u stopu točke, redovi {3} također moraju biti uključeni"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Provjerite korisnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Provjerite korisnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketa za dostavu (za tisak)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Unesite valjanu e-adresu
@@ -2494,15 +2500,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Onemogućeno predložak ne smije biti zadani predložak
 DocType: Account,Income Account,Račun prihoda
 DocType: Payment Request,Amount in customer's currency,Iznos u valuti kupca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Isporuka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Isporuka
 DocType: Stock Reconciliation Item,Current Qty,Trenutno Kom
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Pogledajte &quot;stopa materijali na temelju troškova&quot; u odjeljak
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Prethodna
 DocType: Appraisal Goal,Key Responsibility Area,Zona ključnih odgovornosti
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentski Serije vam pomoći pratiti posjećenost, procjene i naknade za učenike"
 DocType: Payment Entry,Total Allocated Amount,Ukupni raspoređeni iznos
 DocType: Item Reorder,Material Request Type,Tip zahtjeva za robom
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Temeljnica za plaće iz {0} do {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage puna, nije štedjelo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage puna, nije štedjelo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Red {0}: UOM pretvorbe faktor je obavezno
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref.
 DocType: Budget,Cost Center,Troška
@@ -2512,16 +2519,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Sakrij Porezni Kupca od prodajnih transakcija
 DocType: Upload Attendance,Upload HTML,Prenesi HTML
 DocType: Employee,Relieving Date,Rasterećenje Datum
-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.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cijene Pravilo je napravljen prebrisati Cjenik / definirati postotak popusta, na temelju nekih kriterija."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladište se može mijenjati samo preko Međuskladišnica / Otpremnica / Primka
 DocType: Employee Education,Class / Percentage,Klasa / Postotak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Voditelj marketinga i prodaje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Porez na dohodak
-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.","Ako odabrani Cijene Pravilo je napravljen za 'Cijena', to će prebrisati Cjenik. Cijene Pravilo cijena je konačna cijena, pa dalje popust treba primijeniti. Dakle, u prometu kao što su prodajni nalog, narudžbenica itd, to će biti preuzeta u 'Rate' polju, a ne 'Cjenik stopom' polju."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ako odabrani Cijene Pravilo je napravljen za 'Cijena', to će prebrisati Cjenik. Cijene Pravilo cijena je konačna cijena, pa dalje popust treba primijeniti. Dakle, u prometu kao što su prodajni nalog, narudžbenica itd, to će biti preuzeta u 'Rate' polju, a ne 'Cjenik stopom' polju."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Praćenje potencijalnih kupaca prema vrsti industrije.
 DocType: Item Supplier,Item Supplier,Dobavljač proizvoda
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Unesite kod Predmeta da se hrpa nema
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Molimo odabir vrijednosti za {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Sve adrese.
 DocType: Company,Stock Settings,Postavke skladišta
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2531,6 +2538,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Hoće li poslati e-mail o događaju na zaposlenike sa statusom &quot;Otvoreni&quot;
 DocType: Task,Depends on Tasks,Ovisi o poslovima
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Uredi hijerarhiju grupe kupaca.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Prilozi se mogu prikazati bez omogućavanja košarice za kupnju
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novi naziv troškovnog centra
 DocType: Leave Control Panel,Leave Control Panel,Upravljačka ploča odsustava
@@ -2543,11 +2551,10 @@
 DocType: Sales Invoice,Debit To,Rashodi za
 DocType: Delivery Note,Required only for sample item.,Potrebna je samo za primjer stavke.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Stvarna količina nakon transakcije
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavljač&gt; Vrsta dobavljača
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nema klizanja plaća je između {0} i {1}
 ,Pending SO Items For Purchase Request,Otvorene stavke narudžbe za zahtjev za kupnju
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Studentski Upisi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogućen
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogućen
 DocType: Supplier,Billing Currency,Naplata valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
@@ -2564,9 +2571,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Početna Istaknuti Proizvodi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Sve grupe za procjenu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo ime skladišta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Ukupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Ukupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorij
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Molimo spomenuti nema posjeta potrebnih
 DocType: Stock Settings,Default Valuation Method,Zadana metoda vrednovanja
 DocType: Vehicle Log,Fuel Qty,Gorivo Kol
 DocType: Production Order Operation,Planned Start Time,Planirani početak vremena
@@ -2582,7 +2589,7 @@
 DocType: Price List,Price List Master,Cjenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Sve prodajnih transakcija može biti označene protiv više osoba ** prodaje **, tako da možete postaviti i pratiti ciljeve."
 ,S.O. No.,N.K.br.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Molimo stvoriti kupac iz Olovo {0}
 DocType: Price List,Applicable for Countries,Primjenjivo za zemlje
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Ostavite samo one prijave sa statusom &quot;Odobreno&quot; i &quot;Odbijeno&quot; može se podnijeti
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Grupa Ime obvezna je u redu {0}
@@ -2625,7 +2632,7 @@
 DocType: Project,Copied From,Kopiran iz
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},greška Ime: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Nedostatak
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ne povezan s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ne povezan s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Gledatelja za zaposlenika {0} već označen
 DocType: Packing Slip,If more than one package of the same type (for print),Ako je više od jedan paket od iste vrste (za tisak)
 ,Salary Register,Plaća Registracija
@@ -2644,7 +2651,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Koristite za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrijednost {0} za atribut {1} ne postoji na popisu važeće točke Vrijednosti atributa za točku {2}
 DocType: BOM Item,Scrap %,Otpad%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Troškovi će se distribuirati proporcionalno na temelju točke kom ili iznos, kao i po svom izboru"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Troškovi će se distribuirati proporcionalno na temelju točke kom ili iznos, kao i po svom izboru"
 DocType: Maintenance Visit,Purposes,Svrhe
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} više nego bilo raspoloživih radnih sati u radnom {1}, razbiti rad u više operacija"
@@ -2665,16 +2672,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Uredi teritorijalnu raspodjelu.
 DocType: Journal Entry Account,Sales Invoice,Prodajni račun
 DocType: Journal Entry Account,Party Balance,Bilanca stranke
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Odaberite Primijeni popusta na
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Odaberite Primijeni popusta na
 DocType: Company,Default Receivable Account,Zadana Potraživanja račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Stvaranje banke ulaz za ukupne plaće isplaćene za prethodno izabrane kriterije
 DocType: Stock Entry,Material Transfer for Manufacture,Prijenos materijala za izradu
-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.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Postotak popusta se može neovisno primijeniti prema jednom ili za više cjenika.
 DocType: Purchase Invoice,Half-yearly,Polugodišnje
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Knjiženje na skladištu
 DocType: Vehicle Service,Engine Oil,Motorno ulje
 DocType: Sales Invoice,Sales Team1,Prodaja Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Proizvod {0} ne postoji
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Proizvod {0} ne postoji
 DocType: Sales Invoice,Customer Address,Kupac Adresa
 DocType: Employee Loan,Loan Details,zajam Detalji
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Red {0}: Završen količina mora biti veća od nule.
@@ -2682,24 +2689,24 @@
 DocType: Account,Root Type,korijen Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Red # {0}: Ne može se vratiti više od {1} za točku {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,zemljište
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,zemljište
 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}
 DocType: Cheque Print Template,Primary Settings,Primarne postavke
 DocType: Purchase Invoice,Select Supplier Address,Odaberite Dobavljač adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodavanje zaposlenika
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Dodavanje zaposlenika
 DocType: Purchase Invoice Item,Quality Inspection,Provjera kvalitete
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Dodatni Mali
 DocType: Company,Standard Template,standardni predložak
 DocType: Training Event,Theory,Teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Upozorenje : Materijal Tražena količina manja nego minimalna narudžba kol
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznut
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna cjelina / Podružnica s odvojenim kontnim planom pripada Organizaciji.
 DocType: Payment Request,Mute Email,Mute e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana , piće i duhan"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Može napraviti samo plaćanje protiv Nenaplaćena {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Proviziju ne može biti veća od 100
 DocType: Stock Entry,Subcontract,Podugovor
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Unesite {0} prvi
@@ -2738,7 +2745,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišta s postojećim transakcije se ne može pretvoriti u skupinu.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,istječe
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj studente
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj studente
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Odaberite {0}
 DocType: C-Form,C-Form No,C-obrazac br
 DocType: BOM,Exploded_items,Exploded_items
@@ -2780,7 +2787,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Unesite naziv kampanje, ako je izvor upit je kampanja"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Novinski izdavači
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Odaberite Fiskalna godina
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Odaberite Fiskalna godina
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poredaj Razina
 DocType: Company,Chart Of Accounts Template,Kontni predložak
 DocType: Attendance,Attendance Date,Gledatelja Datum
@@ -2795,14 +2802,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Dupli unos
 DocType: Program Enrollment Tool,Get Students,dobiti studente
 DocType: Serial No,Under Warranty,Pod jamstvom
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Greška]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Greška]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,U riječi će biti vidljiv nakon što spremite prodajnog naloga.
 ,Employee Birthday,Rođendan zaposlenika
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studentski Batch Gledatelja alat
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Ograničenje Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademska termina s ovim &#39;akademske godine&#39; {0} i &quot;Pojam Ime &#39;{1} već postoji. Molimo izmijeniti ove stavke i pokušati ponovno.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kao što postoje neki poslovi protiv točki {0}, ne možete promijeniti vrijednost {1}"
 DocType: UOM,Must be Whole Number,Mora biti cijeli broj
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novi Lišće alociran (u danima)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijski Ne {0} ne postoji
@@ -2822,7 +2829,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 +49,Period Closing Entry,Zatvaranje razdoblja Stupanje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Troška s postojećim transakcija ne može se prevesti u skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Iznos {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavljač (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Sudjelovanje zaposlenika alat
@@ -2845,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Posljednji dan sljedećeg mjeseca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdavanje nakon 7 dana
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ostavite se ne može dodijeliti prije {0}, kao dopust ravnoteža je već ručne proslijeđena u buduće dodjele dopusta rekord {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Napomena: S obzirom / Referentni datum prelazi dopuštene kupca kreditne dana od {0} dana (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentski Podnositelj zahtjeva
 DocType: Asset Category Account,Accumulated Depreciation Account,Akumulirana amortizacija računa
 DocType: Stock Settings,Freeze Stock Entries,Zamrzavanje Stock Unosi
@@ -2856,7 +2863,7 @@
 ,Stock Analytics,Analitika skladišta
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Rad se ne može ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Protiv dokumenta Detalj No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tip stranka je obvezna
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Tip stranka je obvezna
 DocType: Quality Inspection,Outgoing,Odlazni
 DocType: Material Request,Requested For,Traženi Za
 DocType: Quotation Item,Against Doctype,Protiv DOCTYPE
@@ -2873,10 +2880,10 @@
 DocType: Asset,Item Code,Šifra proizvoda
 DocType: Production Planning Tool,Create Production Orders,Napravi proizvodni nalog
 DocType: Serial No,Warranty / AMC Details,Jamstveni / AMC Brodu
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Ručno odaberite studente za Grupu temeljenu na aktivnostima
 DocType: Journal Entry,User Remark,Upute Zabilješka
 DocType: Lead,Market Segment,Tržišni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Uplaćeni iznos ne može biti veći od ukupnog negativnog preostali iznos {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposlenikova interna radna povijest
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zatvaranje (DR)
 DocType: Cheque Print Template,Cheque Size,Ček Veličina
@@ -2891,7 +2898,7 @@
 DocType: Production Planning Tool,Create Material Requests,Zahtjevnica za nabavu
 DocType: Employee Education,School/University,Škola / Sveučilište
 DocType: Payment Request,Reference Details,Referentni Detalji
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očekivana vrijednost nakon korisnog vijeka trajanja mora biti manja od bruto iznosa kupnje
 DocType: Sales Invoice Item,Available Qty at Warehouse,Dostupna količina na skladištu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Naplaćeni iznos
 DocType: Asset,Double Declining Balance,Dvaput padu Stanje
@@ -2912,20 +2919,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tipa imovine / obveza račun, jer to kataloški Pomirenje je otvaranje Stupanje"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Isplaćeni Iznos ne može biti veća od iznos kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Broj narudžbenice kupnje je potreban za artikal {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnja Narudžba nije stvorio
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Proizvodnja Narudžba nije stvorio
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti poslije 'Do datuma'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Ne može se promijeniti status studenta {0} je povezan sa studentskom primjene {1}
 DocType: Asset,Fully Depreciated,potpuno amortizirana
 ,Stock Projected Qty,Stanje skladišta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Korisnik {0} ne pripada projicirati {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Označena Gledatelja HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati su prijedlozi, ponude koje ste poslali na svoje klijente"
 DocType: Sales Order,Customer's Purchase Order,Kupca narudžbenice
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijski broj i serije
 DocType: Warranty Claim,From Company,Iz Društva
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Zbroj ocjene kriterija za ocjenjivanje treba biti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,"Vrijednost, ili Kol"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Molimo postavite Broj deprecijaciju Rezervirano
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,"Vrijednost, ili Kol"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions narudžbe se ne može podići za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nabavni porezi i terećenja
@@ -2937,7 +2944,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Svi Skladišta
 DocType: Sales Partner,Retailer,Prodavač na malo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Sve vrste dobavljača
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Sve vrste dobavljača
 DocType: Global Defaults,Disable In Words,Onemogućavanje riječima
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Ponuda {0} nije tip {1}
@@ -2946,6 +2953,7 @@
 DocType: Production Order,PRO-,pro-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Prekoračenje računa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Provjerite plaće slip
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Red # {0}: dodijeljeni iznos ne može biti veći od nepodmirenog iznosa.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Pretraživanje BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,osigurani krediti
 DocType: Purchase Invoice,Edit Posting Date and Time,Uredi datum knjiženja i vrijeme
@@ -2985,7 +2993,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nije dopušteno ažuriranje skladišnih transakcija starijih od {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Potpuno Naplaćeno
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Molimo postavite zadanu se plaća račun zaposleniku {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Novac u blagajni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Isporuka skladište potrebno za dionicama stavku {0}
 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)
@@ -2995,7 +3002,7 @@
 DocType: Student Group,Group Based On,Skupina temeljena na
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Usluga predmeta, vrsta, učestalost i rashodi količina potrebne su"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Čak i ako postoji više Cijene pravila s najvišim prioritetom, onda sljedeći interni prioriteti primjenjuje se:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Da li zaista želite da pošaljete sve Plaća Slip iz {0} do {1}
 DocType: Cheque Print Template,Cheque Height,Ček Visina
 DocType: Supplier,Supplier Details,Dobavljač Detalji
@@ -3007,7 +3014,7 @@
 DocType: Vehicle Log,Invoice Ref,fakture Ref
 DocType: Purchase Order,Recurring Order,Ponavljajući narudžbe
 DocType: Company,Default Income Account,Zadani račun prihoda
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa kupaca / Kupac
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupa kupaca / Kupac
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Nezatvorena Fiskalna godina Dobit / gubitak (Credit)
 DocType: Sales Invoice,Time Sheets,vremenske tablice
 DocType: Payment Gateway Account,Default Payment Request Message,Zadana Zahtjev Plaćanje poruku
@@ -3027,10 +3034,10 @@
 DocType: Notification Control,Quotation Message,Ponuda - poruka
 DocType: Employee Loan,Employee Loan Application,Radnik za obradu zahtjeva
 DocType: Issue,Opening Date,Datum otvaranja
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Sudjelovanje je uspješno označen.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Sudjelovanje je uspješno označen.
 DocType: Journal Entry,Remark,Primjedba
 DocType: Purchase Receipt Item,Rate and Amount,Kamatna stopa i iznos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lišće i odmor
 DocType: School Settings,Current Academic Term,Trenutni akademski naziv
 DocType: Sales Order,Not Billed,Nije naplaćeno
@@ -3052,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentski Grupa
 DocType: Shopping Cart Settings,Quotation Series,Ponuda serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Stavka postoji s istim imenom ( {0} ) , molimo promijenite ime stavku grupe ili preimenovati stavku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Molimo izaberite kupca
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Molimo izaberite kupca
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Imovina Centar Amortizacija troškova
 DocType: Sales Order Item,Sales Order Date,Datum narudžbe (kupca)
@@ -3071,20 +3078,20 @@
 DocType: Vehicle,Insurance Details,Detalji osiguranje
 DocType: Account,Payable,Plativ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Unesite razdoblja otplate
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dužnici ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dužnici ({0})
 DocType: Pricing Rule,Margin,Marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novi kupci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobit%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Razmak Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Iznos narudžbe je obavezno
 DocType: Lead,Address Desc,Adresa silazno
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Stranka je obvezna
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Stranka je obvezna
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,tema Naziv
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Barem jedan od prodajete ili kupujete mora biti odabran
-DocType: Grading Structure,Grade Intervals,grade Intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Odaberite prirodu Vašeg poslovanja.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Red # {0}: ponovljeni unos u referencama {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Gdje se odvija proizvodni postupci.
 DocType: Asset Movement,Source Warehouse,Izvor galerija
 DocType: Installation Note,Installation Date,Instalacija Datum
@@ -3121,7 +3128,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Zaglavlja za ispis predložaka.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za ispis predložaka, na primjer predračuna."
 DocType: Student Guardian,Student Guardian,Studentski Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Troškovi tipa Vrednovanje se ne može označiti kao Inclusive
 DocType: POS Profile,Update Stock,Ažuriraj zalihe
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Različite mjerne jedinice proizvoda će dovesti do ukupne pogrešne neto težine. Budite sigurni da je neto težina svakog proizvoda u istoj mjernoj jedinici.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM stopa
@@ -3148,7 +3155,7 @@
 DocType: Company,Exchange Gain / Loss Account,Razmjena Dobit / gubitka
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenika i posjećenost
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Svrha mora biti jedna od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Ispunite obrazac i spremite ga
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stvarni kvota na zalihi
@@ -3163,7 +3170,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Poredaj Kom
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Trenutni radnih mjesta
 DocType: Company,Stock Adjustment Account,Stock Adjustment račun
-DocType: Journal Entry,Write Off,Otpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Otpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ID korisnika sustava. Ako je postavljen, postat će zadani za sve HR oblike."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: od {1}
@@ -3174,26 +3181,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavljač dostavlja Kupcu
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Obrazac / Artikl / {0}) je out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sljedeći datum mora biti veći od datum knjiženja
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaži porez raspada
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Pokaži porez raspada
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zbog / Referentni datum ne može biti nakon {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz i izvoz podataka
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock unosi postoje protiv Skladište {0}, stoga se ne može ponovno dodijeliti ili mijenjati"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nema učenika Pronađeno
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nema učenika Pronađeno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun knjiženja Datum
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Prodavati
 DocType: Sales Invoice,Rounded Total,Zaokruženi iznos
 DocType: Product Bundle,List items that form the package.,Popis stavki koje čine paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Postotak izdvajanja mora biti 100 %
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Odaberite datum knjiženja prije odabira stranku
 DocType: Program Enrollment,School House,Škola Kuća
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Odaberite Ponude
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Provjerite održavanja Posjetite
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Odaberite Ponude
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Broj deprecijaciju rezervirano ne može biti veća od Ukupan broj deprecijaciju
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Provjerite održavanja Posjetite
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Molimo kontaktirajte korisniku koji imaju Sales Manager Master {0} ulogu
 DocType: Company,Default Cash Account,Zadani novčani račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Društvo ( ne kupaca i dobavljača ) majstor .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To se temelji na prisustvo ovog Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nema studenata u Zagrebu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodaj još stavki ili otvoriti puni oblik
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Unesite ' Očekivani datum isporuke '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Otpremnica {0} mora biti otkazana prije poništenja ove narudžbenice
@@ -3225,6 +3233,7 @@
 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: Warranty Claim,Item and Warranty Details,Stavka i jamstvo Detalji
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Šifra stavke&gt; Skupina stavke&gt; Brand
 DocType: Sales Team,Contribution (%),Doprinos (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Odaberite program za učitavanje obveznih tečajeva.
@@ -3239,9 +3248,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prije pomirenja
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Porezi i naknade uvrštenja (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Stavka Porezna Row {0} mora imati račun tipa poreza ili prihoda i rashoda ili naplativ
 DocType: Sales Order,Partly Billed,Djelomično naplaćeno
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti Fixed Asset predmeta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Stavka {0} mora biti Fixed Asset predmeta
 DocType: Item,Default BOM,Zadani BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3251,8 +3260,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilska industrija
 DocType: Vehicle,Insurance Company,Osiguravajuće društvo
 DocType: Asset Category Account,Fixed Asset Account,Fiksni račun imovinom
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,varijabla
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od otpremnici
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,varijabla
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Od otpremnici
 DocType: Student,Student Email Address,Studentski e-mail adresa
 DocType: Timesheet Detail,From Time,S vremena
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na lageru:
@@ -3263,12 +3272,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Tečaj cjenika
 DocType: Purchase Invoice Item,Rate,VPC
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,stažista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,adresa Ime
 DocType: Stock Entry,From BOM,Od sastavnice
 DocType: Assessment Code,Assessment Code,kod procjena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Stock transakcije prije {0} se zamrznut
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Molimo kliknite na ""Generiraj raspored '"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","npr. kg, kom, br, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Reference Ne obvezno ako ušao referentnog datuma
 DocType: Bank Reconciliation Detail,Payment Document,Dokument plaćanja
@@ -3276,19 +3285,19 @@
 DocType: Salary Slip,Salary Structure,Plaća Struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Izdavanje materijala
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Vi ste u izvanmrežnom načinu rada. Nećete biti u mogućnosti da ponovno učitati dok imate mrežu.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Nema studentskih grupa stvorena.
 DocType: Purchase Invoice Item,Serial No,Serijski br
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mjesečni iznos otplate ne može biti veća od iznosa kredita
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Unesite prva Maintaince Detalji
 DocType: Purchase Invoice,Print Language,Ispis Language
 DocType: Salary Slip,Total Working Hours,Ukupno Radno vrijeme
 DocType: Stock Entry,Including items for sub assemblies,Uključujući predmeta za sub sklopova
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Unesite vrijednost moraju biti pozitivne
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Sve teritorije
 DocType: Purchase Invoice,Items,Proizvodi
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student je već upisan.
@@ -3307,16 +3316,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Zadana mjerna jedinica za Variant &#39;{0}&#39; mora biti isti kao u predložak &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temeljen na
 DocType: Delivery Note Item,From Warehouse,Iz skladišta
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nema Stavke sa Bill materijala za proizvodnju
 DocType: Assessment Plan,Supervisor Name,Naziv Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Tečaj za upis na program
-DocType: Grading Structure,Grading Structure,Ocjenjivanje struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednovanje i Total
 DocType: Tax Rule,Shipping City,Dostava Grad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Prilagodi obavijest
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Novčani tijek iz redovnog poslovanja
 DocType: Sales Invoice,Shipping Rule,Dostava Pravilo
@@ -3337,8 +3344,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Zadani BOM ne postoji za proizvod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Molimo odaberite datum knjiženja prvo
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Otvaranje Datum bi trebao biti prije datuma zatvaranja
 DocType: Leave Control Panel,Carry Forward,Prenijeti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Troška s postojećim transakcija ne može pretvoriti u knjizi
 DocType: Department,Days for which Holidays are blocked for this department.,Dani za koje su praznici blokirani za ovaj odjel.
@@ -3350,7 +3357,7 @@
 DocType: Mode of Payment,General,Opći
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pričvrstite zaglavljem
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posljednja komunikacija
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne mogu odbiti kada kategorija je "" vrednovanje "" ili "" Vrednovanje i Total '"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Popis svoje porezne glave (npr PDV, carina itd, oni bi trebali imati jedinstvene nazive) i njihove standardne stope. To će stvoriti standardni predložak koji možete uređivati i dodavati više kasnije."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Plaćanja s faktura
@@ -3366,7 +3373,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Ukupno (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava i slobodno vrijeme
 DocType: Quality Inspection,Item Serial No,Serijski broj proizvoda
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Stvaranje zaposlenika Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Stvaranje zaposlenika Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Ukupno Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Računovodstveni izvještaji
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Sat
@@ -3379,9 +3386,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,nepoznat
 DocType: Shipping Rule,Shipping Rule Conditions,Dostava Koje uvjete
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM nakon zamjene
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,primljeni iznos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Postavite sustav imenovanja zaposlenika u ljudskim resursima&gt; HR postavke
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Stvaranje za punu količinu, ignorirajući količine već naručene"
 DocType: Account,Tax,Porez
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neobilježen
@@ -3392,9 +3398,9 @@
 DocType: C-Form,Invoices,Računi
 DocType: Batch,Source Document Name,Izvorni naziv dokumenta
 DocType: Job Opening,Job Title,Titula
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Stvaranje korisnika
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Stvaranje korisnika
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina za proizvodnju mora biti veći od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Pogledajte izvješće razgovora vezanih uz održavanje.
 DocType: Stock Entry,Update Rate and Availability,Brzina ažuriranja i dostupnost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Postotak koju smiju primiti ili isporučiti više od naručene količine. Na primjer: Ako ste naručili 100 jedinica. i tvoj ispravak je 10% onda se smiju primati 110 jedinica.
@@ -3403,28 +3409,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rashodi račun je obvezna za predmet {0}
 DocType: BOM,Website Description,Opis web stranice
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto promjena u kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Otkažite fakturi {0} prvi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail adresa mora biti jedinstvena, već postoji za {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum isteka
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Priznanica
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Priznanica
 ,Sales Register,Prodaja Registracija
 DocType: Daily Work Summary Settings Company,Send Emails At,Slanje e-pošte na
 DocType: Quotation,Quotation Lost Reason,Razlog nerealizirane ponude
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Odaberite svoju domenu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transakcija referenca ne {0} datumom {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ne postoji ništa za uređivanje .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Još nema kupaca!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izvještaj o novčanom tijeku
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Iznos kredita ne može biti veći od maksimalnog iznosa zajma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Unesite otpis račun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnje narudžbe Datum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada društvu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijski brojevi u retku {0} ne podudaraju se s dostavom
 DocType: Student,Guardian Details,Guardian Detalji
 DocType: C-Form,C-Form,C-obrazac
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Gledatelja za više radnika
@@ -3449,20 +3457,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Red {0} # računa mora biti tipa &#39;Dugotrajne imovine&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Od kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun shipping iznos za prodaju
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezno
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezno
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financijske usluge
 DocType: Student Sibling,Student ID,studentska iskaznica
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste aktivnosti za vrijeme Evidencije
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni iznos
 DocType: Training Event,Exam,Ispit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladište je potrebno za skladišne proizvode {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Državna naplate
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prijenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ne povezan s računom stranke {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ne povezan s računom stranke {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch eksplodirala BOM (uključujući i podsklopova )
 DocType: Authorization Rule,Applicable To (Employee),Odnosi se na (Radnik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Datum dospijeća je obavezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Pomak za Osobina {0} ne može biti 0
@@ -3473,13 +3481,13 @@
 ,Inactive Customers,Neaktivni korisnici
 DocType: Landed Cost Voucher,LCV,lakih gospodarskih
 DocType: Landed Cost Voucher,Purchase Receipts,Primke
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako se primjenjuje pravilo cijena?
 DocType: Stock Entry,Delivery Note No,Otpremnica br
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ako je označeno, samo Kupnja materijalne zahtjeve za konačnih sirovina će biti uključeni u materijalu zahtjeve. Inače, materijala Zahtjevi za roditelja stavke će biti stvoren"
 DocType: Cheque Print Template,Message to show,Poruka za prikaz
 DocType: Company,Retail,Maloprodaja
 DocType: Attendance,Absent,Odsutan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Snop proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Snop proizvoda
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Red {0}: Pogrešna referentni {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Predložak nabavnih poreza i terećenja
 DocType: Upload Attendance,Download Template,Preuzmite predložak
@@ -3489,10 +3497,10 @@
 DocType: Payment Entry,Account Paid From,Račun se plaća iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Sirovine Stavka Šifra
 DocType: Journal Entry,Write Off Based On,Otpis na temelju
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Napravite Olovo
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Napravite Olovo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Ispis i konfekcija
 DocType: Stock Settings,Show Barcode Field,Prikaži Barkod Polje
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošalji Supplier e-pošte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Pošalji Supplier e-pošte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plaća se već obrađuju za razdoblje od {0} i {1}, dopusta zahtjev ne može biti između ovom razdoblju."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Instalacijski zapis za serijski broj
 DocType: Guardian Interest,Guardian Interest,Guardian kamata
@@ -3504,6 +3512,7 @@
 DocType: Offer Letter,Awaiting Response,Očekujem odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iznad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neispravan atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Navedite ako je nestandardni račun koji se plaća
 DocType: Salary Slip,Earning & Deduction,Zarada &amp; Odbitak
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Izborni . Ova postavka će se koristiti za filtriranje u raznim transakcijama .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativna stopa vrijednovanja nije dopuštena
@@ -3519,10 +3528,9 @@
 DocType: Production Order Item,Production Order Item,Proizvodnja Red predmeta
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nije pronađen zapis
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Troškovi otpisan imovinom
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,djelomično ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Mjesto troška je ovezno za stavku {2}
 DocType: Vehicle,Policy No,politika Nema
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Se predmeti s Bundle proizvoda
 DocType: Asset,Straight Line,Ravna crta
 DocType: Project User,Project User,Korisnik projekta
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
@@ -3537,7 +3545,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dobiti studenti iz
 DocType: Hub Settings,Seller Country,Prodavač Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavi stavke na web stranici
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa vaši učenici u serijama
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa vaši učenici u serijama
 DocType: Authorization Rule,Authorization Rule,Pravilo autorizacije
 DocType: Sales Invoice,Terms and Conditions Details,Uvjeti Detalji
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,tehnički podaci
@@ -3589,14 +3597,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: nadređeni račun {1} ne pripada tvrtki: {2}
 DocType: Program Enrollment Tool,Student Applicants,Studentski Kandidati
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Uspješno izbrisati sve transakcije vezane uz ovu tvrtku!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Datum registracije
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probni rad
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Plaća Komponente
 DocType: Program Enrollment Tool,New Academic Year,Nova akademska godina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Povrat / odobrenje kupcu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Povrat / odobrenje kupcu
 DocType: Stock Settings,Auto insert Price List rate if missing,"Ako ne postoji, automatski ubaciti cjenik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Ukupno uplaćeni iznos
 DocType: Production Order Item,Transferred Qty,prebačen Kol
@@ -3616,7 +3624,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip lišća poput casual, bolovanja i sl."
 DocType: Email Digest,Send regular summary reports via Email.,Pošalji redovite sažetak izvješća putem e-maila.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Molimo postavite zadanog računa o troškovima za tužbu tipa {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Molimo postavite zadanog računa o troškovima za tužbu tipa {0}
 DocType: Assessment Result,Student Name,Ime studenta
 DocType: Brand,Item Manager,Stavka Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Plaće Plaća
@@ -3637,6 +3645,7 @@
 ,Sales Funnel,prodaja dimnjak
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Naziv je obavezan
 DocType: Project,Task Progress,Zadatak Napredak
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kolica
 ,Qty to Transfer,Količina za prijenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponude za kupce ili potencijalne kupce.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Uloga dopuštenih urediti smrznute zalihe
@@ -3664,12 +3673,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stavka Wise Porezna Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut naziv
 ,Item-wise Price List Rate,Item-wise cjenik
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Dobavljač Ponuda
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Dobavljač Ponuda
 DocType: Quotation,In Words will be visible once you save the Quotation.,U riječi će biti vidljiv nakon što spremite ponudu.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne može biti frakcija u retku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,prikupiti naknade
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} se već koristi u proizvodu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Pravila za dodavanje troškova prijevoza.
 DocType: Item,Opening Stock,Otvaranje Stock
@@ -3687,8 +3696,8 @@
  Ažurirano putem 'Time Log'"
 DocType: Customer,From Lead,Od Olovo
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Narudžbe objavljen za proizvodnju.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Odaberite fiskalnu godinu ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Odaberite fiskalnu godinu ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil potrebna da bi POS unos
 DocType: Program Enrollment Tool,Enroll Students,upisati studenti
 DocType: Hub Settings,Name Token,Naziv tokena
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna prodaja
@@ -3699,7 +3708,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} u odnosu na prodajnom računu {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naziv projekta
-DocType: Supplier,Mention if non-standard receivable account,Spomenuti ako nestandardni potraživanja račun
+DocType: Customer,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: Production Order,Required Items,potrebne stavke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Vrijednost razlika
@@ -3720,7 +3729,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set cilja predmet Grupa-mudar za ovaj prodavač.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Dionice stariji od [ dana ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Red # {0}: Imovina je obvezna za nepokretne imovine kupnju / prodaju
-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.","Ako dva ili više Cijene Pravila nalaze se na temelju gore navedenih uvjeta, Prioritet se primjenjuje. Prioritet je broj između 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost ako ima više Cijene pravila s istim uvjetima."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ako dva ili više Cijene Pravila nalaze se na temelju gore navedenih uvjeta, Prioritet se primjenjuje. Prioritet je broj između 0 do 20, a zadana vrijednost je nula (prazno). Veći broj znači da će imati prednost ako ima više Cijene pravila s istim uvjetima."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalna godina: {0} ne postoji
 DocType: Currency Exchange,To Currency,Valutno
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Dopusti sljedeći korisnici odobriti ostavite aplikacije za blok dana.
@@ -3745,7 +3754,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Proizvod {0} se ignorira budući da nije skladišni artikal
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Pošaljite ovaj radnog naloga za daljnju obradu .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da se ne primjenjuje pravilo Cijene u određenoj transakciji, svim primjenjivim pravilima cijena bi trebala biti onemogućen."
 DocType: Assessment Group,Parent Assessment Group,Roditelj Grupa procjena
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posao
 ,Sales Order Trends,Trend narudžbi kupca
@@ -3756,7 +3765,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatni trošak
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Financijska godina - zadnji datum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Napravi ponudu dobavljaču
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Napravi ponudu dobavljaču
 DocType: Quality Inspection,Incoming,Dolazni
 DocType: BOM,Materials Required (Exploded),Potrebna roba
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Dodaj korisnika u vašoj organizaciji, osim sebe"
@@ -3784,6 +3793,7 @@
 DocType: Employee,History In Company,Povijest tvrtke
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletteri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Upis u glavnu knjigu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kupac&gt; Skupina kupaca&gt; Teritorij
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Isti predmet je ušao više puta
 DocType: Department,Leave Block List,Popis neodobrenih odsustva
 DocType: Sales Invoice,Tax ID,OIB
@@ -3793,7 +3803,7 @@
 DocType: Customer,Sales Partner and Commission,Prodaja partner i komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatna stopa (%) / godina
 ,Project Quantity,Projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Ukupno {0} za sve stavke nula, možda biste trebali promijeniti &#39;Podijeliti optužbi na temelju&#39;"
 DocType: Opportunity,To Discuss,Za Raspravljajte
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jedinica {1} potrebna u {2} za dovršetak ovu transakciju.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatna stopa (%) godišnje
@@ -3808,7 +3818,7 @@
 DocType: Purchase Invoice,Return,Povratak
 DocType: Production Order Operation,Production Order Operation,Proizvodni nalog Rad
 DocType: Pricing Rule,Disable,Ugasiti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Način plaćanja potrebno je izvršiti uplatu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Način plaćanja potrebno je izvršiti uplatu
 DocType: Project Task,Pending Review,U tijeku pregled
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Imovina {0} ne može biti otpisan, kao što je već {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Ukupni rashodi Zatraži (preko Rashodi Zahtjeva)
@@ -3816,11 +3826,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsutni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Red {0}: Valuta sastavnice # {1} bi trebao biti jednak odabranoj valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodajnog naloga {0} nije podnesen
 DocType: Homepage,Tag Line,Tag linija
 DocType: Fee Component,Fee Component,Naknada Komponenta
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Mornarički menađer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Dodavanje stavki iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Dodavanje stavki iz
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,redovan
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Ukupno weightage svih kriterija za ocjenjivanje mora biti 100%
@@ -3833,7 +3843,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladište {0} ne postoji
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrirajte se za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mjesečni postotci distribucije
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izabrani predmet ne može imati Hrpa
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa Vrednovanje nije pronađen u točki {0}, koji je potreban za napraviti računovodstvene stavke za {1} {2}. Ako je stavka prijenosom kao stavka uzorka u {1}, molimo napomenuti da u {1} tačka stola. Inače, stvoriti dolazni transakciju dionica za brzinu vrednovanja stavki ili spomenuti u stavku zapis, a zatim pokušajte priloženog / otkazivanja ovaj unos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% robe od ove otpremnice je isporučeno
 DocType: Project,Customer Details,Korisnički podaci
@@ -3842,15 +3852,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Unesite URL parametar za prijemnike br
 DocType: Payment Entry,Paid Amount,Plaćeni iznos
 DocType: Assessment Plan,Supervisor,Nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Na liniji
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Na liniji
 ,Available Stock for Packing Items,Raspoloživo stanje za pakirane proizvode
 DocType: Item Variant,Item Variant,Stavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Procjena Alat Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM otpaci predmeta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Dostavljeni nalozi se ne može izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Upravljanje kvalitetom
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Stavka {0} je onemogućen
 DocType: Employee Loan,Repay Fixed Amount per Period,Vratiti fiksni iznos po razdoblju
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Molimo unesite količinu za točku {0}
 DocType: Employee External Work History,Employee External Work History,Zaposlenik Vanjski Rad Povijest
@@ -3876,7 +3886,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID e-pošte
 DocType: Employee,Notice (days),Obavijest (dani)
 DocType: Tax Rule,Sales Tax Template,Porez Predložak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Odaberite stavke za spremanje račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Odaberite stavke za spremanje račun
 DocType: Employee,Encashment Date,Encashment Datum
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stock Podešavanje
@@ -3899,7 +3909,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Navedite od / do rasponu
 DocType: Serial No,Under AMC,Pod AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Stopa predmeta vrednovanja preračunava obzirom sletio troškova iznos vaučera
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Stopa predmeta vrednovanja preračunava obzirom sletio troškova iznos vaučera
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Zadane postavke za prodajne transakcije.
 DocType: Guardian,Guardian Of ,staratelj
 DocType: Grading Scale Interval,Threshold,Prag
@@ -3909,6 +3919,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Terećenju Izdano
 DocType: Production Order,Warehouses,Skladišta
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} imovine ne može se prenijeti
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ova stavka je varijanta od {0} (Predložak).
 DocType: Workstation,per hour,na sat
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabava
 DocType: Announcement,Announcement,Obavijest
@@ -3924,8 +3935,8 @@
 DocType: Account,Receivable,potraživanja
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Red # {0}: Nije dopušteno mijenjati dobavljača kao narudžbenice već postoji
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Uloga koja je dopušteno podnijeti transakcije koje premašuju kreditnih ograničenja postavljena.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Odaberite stavke za proizvodnju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Odaberite stavke za proizvodnju
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master Data sinkronizacije, to bi moglo potrajati neko vrijeme"
 DocType: Item,Material Issue,Materijal Issue
 DocType: Hub Settings,Seller Description,Prodavač Opis
 DocType: Employee Education,Qualification,Kvalifikacija
@@ -3937,7 +3948,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naručeno
 DocType: Salary Detail,Component,sastavni dio
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteriji za ocjenu Grupa
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvaranje za akumuliranu amortizaciju mora biti manja od jednaka {0}
 DocType: Warehouse,Warehouse Name,Naziv skladišta
 DocType: Naming Series,Select Transaction,Odaberite transakciju
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Unesite Odobravanje ulogu ili Odobravanje korisnike
@@ -3950,7 +3961,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Ne može se otkazati, jer skladišni ulaz {0} postoji"
 DocType: Employee Loan,Disbursement Date,datum isplate
 DocType: Vehicle,Vehicle,Vozilo
 DocType: Purchase Invoice,In Words,Riječima
@@ -3964,14 +3975,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Imovine deprecijacije i sredstva
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Iznos {0} {1} prenesen iz {2} u {3}
 DocType: Sales Invoice,Get Advances Received,Kreiraj avansno primanje
 DocType: Email Digest,Add/Remove Recipients,Dodaj / ukloni primatelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transakcija nije dopuštena protiv zaustavljena proizvodnja Reda {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Za postavljanje ove fiskalne godine kao zadano , kliknite na "" Set as Default '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Pridružiti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatak Kom
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Inačica Stavka {0} postoji s istim atributima
 DocType: Employee Loan,Repay from Salary,Vrati iz plaće
 DocType: Leave Application,LAP/,KRUG/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Zahtjev za isplatu od {0} {1} za iznos {2}
@@ -3989,7 +4000,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Procjena Detalj Rezultat
 DocType: Employee Education,Employee Education,Obrazovanje zaposlenika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dvostruki stavke skupina nalaze se u tablici stavke grupe
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,To je potrebno kako bi dohvatili Stavka Pojedinosti.
 DocType: Salary Slip,Net Pay,Neto plaća
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijski Ne {0} već je primila
@@ -3998,7 +4009,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladište {0} nije povezan s bilo kojim računom, stvoriti / povezati odgovarajući (imovina) račun za skladište."
 DocType: Purchase Invoice,Recurring Id,Ponavljajući Id
 DocType: Customer,Sales Team Details,Detalji prodnog tima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Brisanje trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Brisanje trajno?
 DocType: Expense Claim,Total Claimed Amount,Ukupno Zatražio Iznos
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencijalne prilike za prodaju.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Pogrešna {0}
@@ -4009,13 +4020,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Postavite svoj škola u ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baza Promjena Iznos (Društvo valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nema računovodstvenih unosa za ova skladišta
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spremite dokument prvi.
 DocType: Account,Chargeable,Naplativ
 DocType: Company,Change Abbreviation,Promijeni naziv
 DocType: Expense Claim Detail,Expense Date,Rashodi Datum
 DocType: Item,Max Discount (%),Maksimalni popust (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Iznos zadnje narudžbe
+DocType: Task,Is Milestone,Je li Milestone
 DocType: Daily Work Summary,Email Sent To,Mail poslan
 DocType: Budget,Warn,Upozoriti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sve ostale primjedbe, značajan napor da bi trebao ići u evidenciji."
@@ -4036,7 +4048,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrijednost atributa
 ,Itemwise Recommended Reorder Level,Itemwise - preporučena razina ponovne narudžbe
 DocType: Salary Detail,Salary Detail,Plaća Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Odaberite {0} Prvi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Odaberite {0} Prvi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Hrpa {0} od {1} Stavka je istekla.
 DocType: Sales Invoice,Commission,provizija
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Vrijeme list za proizvodnju.
@@ -4048,41 +4060,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` Freeze Dionice starije od ` bi trebao biti manji od % d dana .
 DocType: Tax Rule,Purchase Tax Template,Predložak poreza pri nabavi
 ,Project wise Stock Tracking,Projekt mudar Stock Praćenje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Raspored održavanja {0} postoji od {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Stvarni Kol (na izvoru / ciljne)
 DocType: Item Customer Detail,Ref Code,Ref. Šifra
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidencija zaposlenih.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Molimo postavite Next Amortizacija Date
 DocType: HR Settings,Payroll Settings,Postavke plaće
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Klađenje na ne-povezane faktura i plaćanja.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Naručiti
 DocType: Email Digest,New Purchase Orders,Nova narudžba kupnje
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Korijen ne mogu imati središte troškova roditelj
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Odaberite brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Odaberite brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumulirana amortizacija na
 DocType: Sales Invoice,C-Form Applicable,Primjenjivi C-obrazac
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacija vrijeme mora biti veći od 0 za rad {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Skladište je obavezno
 DocType: Supplier,Address and Contacts,Adresa i kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM pretvorbe Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Postavite dimenzije prilagođene web-u 900px X 100px
 DocType: Program,Program Abbreviation,naziv programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja Red ne može biti podignuta protiv predložak točka
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Optužbe su ažurirani u KUPNJE protiv svake stavke
 DocType: Warranty Claim,Resolved By,Riješen Do
 DocType: Bank Guarantee,Start Date,Datum početka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodijeliti lišće za razdoblje .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekovi i depozita pogrešno izbrisani
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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,Stopa cjenika
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Stvaranje kupaca citati
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Stvaranje kupaca citati
 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 +38,Bill of Materials (BOM),Sastavnice (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Prosječno vrijeme potrebno od strane dobavljača za isporuku
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Rezultat Procjena
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Sati
 DocType: Project,Expected Start Date,Očekivani datum početka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Uklanjanje stavke ako troškovi se ne odnosi na tu stavku
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transakcija valute mora biti isti kao i Payment Gateway valute
 DocType: Payment Entry,Receive,Primite
@@ -4093,19 +4104,19 @@
 DocType: Workstation,Operating Costs,Operativni troškovi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Akcija, ako ukupna mjesečna Proračun Prebačen"
 DocType: Purchase Invoice,Submit on creation,Pošalji na stvaranje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,Datum Odlaganje
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mail će biti poslan svim aktivnim zaposlenicima Društva u određeni sat, ako oni nemaju odmora. Sažetak odgovora će biti poslan u ponoć."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposlenik dopust Odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Red {0}: Ulazak redoslijeda već postoji za to skladište {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne može se proglasiti izgubljenim, jer je ponuda napravljena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Povratne informacije trening
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja Red {0} mora biti podnesen
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Molimo odaberite datum početka i datum završetka za točke {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tečaj je obavezan u redu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danas ne može biti prije od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi cijene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi cijene
 DocType: Batch,Parent Batch,Roditeljska šarža
 DocType: Cheque Print Template,Cheque Print Template,Ček Predložak Ispis
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafikon troškovnih centara
@@ -4118,7 +4129,7 @@
 ,Ordered Items To Be Delivered,Naručeni proizvodi za dostavu
 DocType: Account,Income,Prihod
 DocType: Industry Type,Industry Type,Industrija Tip
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Nešto je pošlo po krivu!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nešto je pošlo po krivu!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Prodajni računi {0} su već potvrđeni
 DocType: Assessment Result Detail,Score,Postići
@@ -4149,17 +4160,17 @@
 DocType: Item,Variant Based On,Varijanta na temelju
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Ukupno bi trebalo biti dodijeljena weightage 100 % . To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši dobavljači
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Ne mogu se postaviti kao izgubljen kao prodajnog naloga je napravio .
+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 .
 DocType: Request for Quotation Item,Supplier Part No,Dobavljač Dio Ne
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primljeno od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Ne mogu odbiti kada je kategorija za &quot;vrednovanje&quot; ili &quot;Vaulation i ukupni &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Primljeno od
 DocType: Lead,Converted,Pretvoreno
 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 +19,{0}: From {0} for {1},{0}: Od {0} od {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Od {0} od {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Red # {0}: Postavite dobavljač za stavke {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Red {0}: Sati vrijednost mora biti veća od nule.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4168,20 +4179,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Valuta naplate mora biti jednaka Zadano comapany je valuta ili stranke valutu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Ostavi naplate
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Što učiniti ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladište
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Svi Studentski Upisi
 ,Average Commission Rate,Prosječna provizija
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Gledatelji ne može biti označena za budući datum
 DocType: Pricing Rule,Pricing Rule Help,Pravila cijena - pomoć
 DocType: School House,House Name,Ime kuća
 DocType: Purchase Taxes and Charges,Account Head,Zaglavlje računa
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Električna
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak svoje organizacije kao svoje korisnike. Također možete dodati pozvati kupce da svoj portal dodajući ih iz Kontakata
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte ostatak svoje organizacije kao svoje korisnike. Također možete dodati pozvati kupce da svoj portal dodajući ih iz Kontakata
 DocType: Stock Entry,Total Value Difference (Out - In),Ukupna vrijednost razlika (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4190,7 +4201,7 @@
 DocType: Item,Customer Code,Kupac Šifra
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Rođendan Podsjetnik za {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dana od posljednje narudžbe
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Zaduženja računa mora biti bilanca račun
 DocType: Buying Settings,Naming Series,Imenovanje serije
 DocType: Leave Block List,Leave Block List Name,Naziv popisa neodobrenih odsustava
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Osiguranje Datum početka mora biti manja od osiguranja datum završetka
@@ -4205,9 +4216,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plaća proklizavanja zaposlenika {0} već stvoren za vremensko listu {1}
 DocType: Vehicle Log,Odometer,mjerač za pređeni put
 DocType: Sales Order Item,Ordered Qty,Naručena kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Stavka {0} je onemogućen
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Stavka {0} je onemogućen
 DocType: Stock Settings,Stock Frozen Upto,Kataloški Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ne sadrži bilo koji zaliha stavku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projekt aktivnost / zadatak.
 DocType: Vehicle Log,Refuelling Details,Punjenje Detalji
@@ -4217,8 +4228,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Posljednja stopa kupnju nije pronađen
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Otpis iznos (Društvo valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Radno vrijeme naplate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Zadana BOM za {0} nije pronađena
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Red # {0}: Molimo postavite naručivanja količinu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Dodirnite stavke da biste ih dodali ovdje
 DocType: Fees,Program Enrollment,Program za upis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nalog zavisnog troška
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Molimo postavite {0}
@@ -4240,7 +4252,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum održavanje
 DocType: Purchase Invoice Item,Rejected Serial No,Odbijen Serijski br
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Godina datum početka ili završetka je preklapanje s {0}. Da bi se izbjegla postavite tvrtku
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Početak bi trebao biti manji od krajnjeg datuma za točke {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.","Primjer:. ABCD ##### 
  Ako Serija je postavljena i serijski broj ne spominje u prometu, a zatim automatsko serijski broj će biti izrađen na temelju ove serije. Ako ste uvijek žele eksplicitno spomenuti serijski brojevi za tu stavku. ostavite praznim."
@@ -4316,7 +4328,6 @@
 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
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna godina Datum početka i datum završetka fiskalne godine već su postavljeni u fiskalnoj godini {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Razmak Datum ažurirana
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4361,14 +4372,14 @@
 DocType: Bin,Reserved Qty for Production,Rezervirano Kol za proizvodnju
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Ostavite neoznačeno ako ne želite razmotriti grupu dok stvarate grupe temeljene na tečajima.
 DocType: Asset,Frequency of Depreciation (Months),Učestalost Amortizacija (mjeseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kreditni račun
 DocType: Landed Cost Item,Landed Cost Item,Stavka zavisnih troškova
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Postavljanje jednostavan website za moju organizaciju
 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 +666,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Navedite značajke vrijednost za atribut {0}
 DocType: Item,Default Warehouse,Glavno skladište
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun se ne može dodijeliti protiv grupe nalog {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Unesite roditelj troška
@@ -4411,7 +4422,7 @@
 DocType: Opportunity Item,Basic Rate,Osnovna stopa
 DocType: GL Entry,Credit Amount,Kreditni iznos
 DocType: Cheque Print Template,Signatory Position,potpisnik pozicija
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Postavi kao Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Postavi kao Lost
 DocType: Timesheet,Total Billable Hours,Ukupno naplatnih sati
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plaćanje Potvrda Napomena
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To se temelji na transakcijama protiv tog kupca. Pogledajte vremensku crtu ispod za detalje
@@ -4425,11 +4436,11 @@
 ,Items To Be Requested,Potraživani proizvodi
 DocType: Purchase Order,Get Last Purchase Rate,Kreiraj zadnju nabavnu cijenu
 DocType: Company,Company Info,Podaci o tvrtki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Odaberite ili dodajte novi kupac
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Odaberite ili dodajte novi kupac
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Troška potrebno je rezervirati trošak zahtjev
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Primjena sredstava ( aktiva )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To se temelji na prisustvo tog zaposlenog
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Duguje račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4438,13 +4449,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Iznos narudžbe
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavljač Navod {0} stvorio
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Godina završetka ne može biti prije Početak godine
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Primanja zaposlenih
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Postavite zadani popis za odmor za zaposlenika {0} ili poduzeću {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} Ne radi postoji
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} Ne radi postoji
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Redak Ne {0}: Iznos ne može biti veća od visine u tijeku protiv Rashodi Zahtjeva {1}. U tijeku Iznos je {2}
@@ -4453,15 +4464,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čitanje 3
 ,Hub,Središte
 DocType: GL Entry,Voucher Type,Bon Tip
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cjenik nije pronađen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Cjenik nije pronađen
 DocType: Employee Loan Application,Approved,Odobren
 DocType: Pricing Rule,Price,Cijena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposlenik razriješen na {0} mora biti postavljen kao 'lijevo '
 DocType: Guardian,Guardian,Čuvar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Procjena {0} stvorena za zaposlenika {1} u određenom razdoblju
 DocType: Employee,Education,Obrazovanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje kampanja po
 DocType: Employee,Current Address Is,Trenutni Adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,promijenjen
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Izborni. Postavlja tvrtke zadanu valutu, ako nije navedeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Knjigovodstvene temeljnice
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostupno Količina u iz skladišta
@@ -4470,7 +4483,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Red {0}: stranka / računa ne odgovara {1} / {2} u {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Unesite trošak računa
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Red # {0}: Referenca Tip dokumenta mora biti jedan od narudžbenice, fakture kupovine ili Journal Entry"
 DocType: Employee,Current Address,Trenutna adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ako predmet je varijanta drugom stavku zatim opis, slika, cijena, porezi itd će biti postavljena od predloška, osim ako je izričito navedeno"
 DocType: Serial No,Purchase / Manufacture Details,Detalji nabave/proizvodnje
@@ -4498,7 +4511,7 @@
 DocType: Hub Settings,Hub Settings,Hub Postavke
 DocType: Project,Gross Margin %,Bruto marža %
 DocType: BOM,With Operations,Uz operacije
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Računovodstvenih unosa već su napravljene u valuti {0} za poduzeće {1}. Odaberite potraživanja ili dugovanja račun s valutom {0}.
 DocType: Asset,Is Existing Asset,Je Postojeći Imovina
 DocType: Salary Detail,Statistical Component,Statistička komponenta
 ,Monthly Salary Register,Mjesečna plaća Registracija
@@ -4521,7 +4534,7 @@
 DocType: Assessment Plan,Room,Soba
 DocType: Purchase Order,Advance Paid,Unaprijed plaćeni
 DocType: Item,Item Tax,Porez proizvoda
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materijal za dobavljača
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materijal za dobavljača
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Trošarine Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prag {0}% se pojavljuje više od jednom
 DocType: Expense Claim,Employees Email Id,Zaposlenici Email ID
@@ -4552,9 +4565,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pričvrstite Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Razine
 DocType: Customer,Commission Rate,Komisija Stopa
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Napravite varijanta
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Napravite varijanta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blok ostaviti aplikacija odjelu.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Vrsta plaćanja mora biti jedan od primati, platiti i unutarnje prijenos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Vrsta plaćanja mora biti jedan od primati, platiti i unutarnje prijenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analitika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je prazna
 DocType: Vehicle,Model,Model
@@ -4565,6 +4578,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dopustite proizvodnje na odmor
 DocType: Sales Order,Customer's Purchase Order Date,Kupca narudžbenice Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital
+DocType: Shopping Cart Settings,Show Public Attachments,Prikaži javne privitke
 DocType: Packing Slip,Package Weight Details,Težina paketa - detalji
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Nakon završetka plaćanja preusmjeriti korisnika na odabranu stranicu.
@@ -4583,15 +4597,15 @@
 DocType: Batch,Expiry Date,Datum isteka
 ,Supplier Addresses and Contacts,Supplier Adrese i kontakti
 ,accounts-browser,računi-preglednik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Molimo odaberite kategoriju prvi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Molimo odaberite kategoriju prvi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekt majstor.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Da bi se omogućilo pretjerano naplatu ili nad-naručivanje, ažurirati &quot;dodatak&quot; u stock postavkama ili točke."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ne pokazati nikakav simbol kao $ iza valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pola dana)
 DocType: Supplier,Credit Days,Kreditne Dani
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Provjerite Student Hrpa
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Provjerite Student Hrpa
 DocType: Leave Type,Is Carry Forward,Je Carry Naprijed
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Kreiraj proizvode od sastavnica (BOM)
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Potencijalni kupac - ukupno dana
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Red # {0}: datum knjiženja moraju biti isti kao i datum kupnje {1} od {2} imovine
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Unesite prodajni nalozi u gornjoj tablici
@@ -4608,7 +4622,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Molim postavite serijske brojeve za prisustvovanje putem Setup&gt; Serija numeriranja
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 995239f..8a6d949 100644
--- a/erpnext/translations/hu.csv
+++ b/erpnext/translations/hu.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Bérelt
 DocType: Purchase Order,PO-,BESZMEGR-
 DocType: POS Profile,Applicable for User,Alkalmazandó ehhez a Felhasználóhoz
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállított gyártás rendelés nem törölhető, először tegye folyamatba a törléshez"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Leállított gyártás rendelés nem törölhető, először tegye folyamatba a törléshez"
 DocType: Vehicle Service,Mileage,Távolság
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Tényleg szeretné kiselejtezni ezt az eszközt?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Alapértelmezett beszállító kiválasztása
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Alapértelmezett beszállító kiválasztása
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Árfolyam szükséges ehhez az  árlistához: {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* A tranzakcióban lesz kiszámolva.
 DocType: Purchase Order,Customer Contact,Vevő ügyfélkapcsolat
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),"Fennálló, kintlévő összeg erre: {0} nem lehet kevesebb, mint nulla ({1})"
 DocType: Manufacturing Settings,Default 10 mins,Alapértelmezett 10 perc
 DocType: Leave Type,Leave Type Name,Távollét típus neve
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mutassa nyitva
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mutassa nyitva
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Sorozat sikeresen frissítve
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Kijelentkezés
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Naplókönyvelés Beküldte
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Kötegelt tétel Lejárat állapota
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank tervezet
 DocType: Mode of Payment Account,Mode of Payment Account,Fizetési számla módja
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mutassa a változatokat
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mutassa a változatokat
 DocType: Academic Term,Academic Term,Akadémia szemeszter
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Anyag
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Mennyiség
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Mennyiség
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Számlák tábla nem lehet üres.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Hitelek (kötelezettségek)
 DocType: Employee Education,Year of Passing,Elmúlt Év
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Hivatkozás:%s, Tétel kód:%s és Vevő:%s"
 DocType: Item,Country of Origin,Származási ország
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Készletben
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,"Nyitott Problémák, Ügyek"
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Egészségügyi ellátás
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Fizetési késedelem (napok)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Szolgáltatás költsége
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Számla
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sorozat szám: {0} már hivatkozott ezen az Értékesítési számlán: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Számla
 DocType: Maintenance Schedule Item,Periodicity,Időszakosság
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Pénzügyi év {0} szükséges
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Várható szállítási határidő előtt kell lenni a Vevői rendelés dátumának
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Mellékeljen .csv fájlt két oszloppal, egyik a régi névvel, a másik az új névvel"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} egyik aktív pénzügyi évben sem.
 DocType: Packed Item,Parent Detail docname,Szülő Részlet docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referencia: {0}, pont kód: {1} és az ügyfél: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Napló
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Nyitott állások.
 DocType: Item Attribute,Increment,Növekmény
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Válasszon Raktárat...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Válasszon Raktárat...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Hírdet
 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 erre {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Tételeket kér le innen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nem engedélyezett erre {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Tételeket kér le innen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Készlet nem frissíthető ezzel a szállítólevéllel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Gyártmány {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nincsenek listázott elemek
 DocType: Payment Reconciliation,Reconcile,Összeegyeztetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Élelmiszerbolt
 DocType: Quality Inspection Reading,Reading 1,Olvasás 1
 DocType: Process Payroll,Make Bank Entry,Banki bejegyzés generálás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Nyugdíjpénztárak
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Következő értékcsökkenés dátuma nem lehet korábbi a vásárlás dátumánál
 DocType: SMS Center,All Sales Person,Összes értékesítő
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"* Havi Felbontás** segít felbontani a Költségvetést / Célt a hónapok között, ha vállalkozásod szezonális."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nem talált tételeket
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nem talált tételeket
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Bérrendszer Hiányzó
 DocType: Lead,Person Name,Személy neve
 DocType: Sales Invoice Item,Sales Invoice Item,Kimenő értékesítési számla tételei
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","pl. ""általános iskola"" vagy ""egyetem"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Készlet jelentések
 DocType: Warehouse,Warehouse Detail,Raktár részletek
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hitelkeretet már átlépte az ügyfél {0} {1}/{2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"A feltétel végső dátuma nem lehet későbbi, mint a tanév év végi időpontja, amelyhez a kifejezés kapcsolódik (Tanév {}). Kérjük javítsa ki a dátumot, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Ez tárgyi eszköz"" nem lehet kijelöletlen, mert Tárgyi eszköz rekord bejegyzés létezik ellen tételként"
 DocType: Vehicle Service,Brake Oil,Fékolaj
 DocType: Tax Rule,Tax Type,Adónem
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nincs engedélye bejegyzés hozzáadására és frissítésére előbb mint: {0}
 DocType: BOM,Item Image (if not slideshow),Tétel Kép (ha nem slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Az Ügyfél már létezik ezen a néven
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Óra érték / 60) * aktuális üzemidő
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Válasszon Anyagj
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Válasszon Anyagj
 DocType: SMS Log,SMS Log,SMS napló
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Költségét a szállított tételeken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ez az ünnep: {0} nincs az induló és a végső dátum közt
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,Iskolák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nem talál távollét bejegyzést erre a munkavállalóra {0} erre {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Kérjük, adja meg először céget"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Kérjük, válasszon Vállalkozást először"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,"Kérjük, válasszon Vállalkozást először"
 DocType: Employee Education,Under Graduate,Diplomázás alatt
 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 ezen
 DocType: BOM,Total Cost,Összköltség
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Garanciális igény összege
 DocType: Employee,Mr,Úr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Ismétlődő vevői csoport található a Vevő csoport táblázatában
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Beszállító típus / Beszállító
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Beszállító típus / Beszállító
 DocType: Naming Series,Prefix,Előtag
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Fogyóeszközök
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Osztály
 DocType: Sales Invoice Item,Delivered By Supplier,Beszállító által szállított
 DocType: SMS Center,All Contact,Összes Kapcsolattartó
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Gyártási rendelés már létrehozott valamennyi tételre egy Anyagjegyzékkel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Éves Munkabér
 DocType: Daily Work Summary,Daily Work Summary,Napi munka összefoglalása
 DocType: Period Closing Voucher,Closing Fiscal Year,Pénzügyi év záró
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} fagyasztott
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} fagyasztott
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Kérjük, válassza ki, meglévő vállakozást a számlatükör létrehozásához"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Készlet költségek
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Cél Raktár kiválasztása
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Ellen jegyzés
 DocType: Journal Entry Account,Credit in Company Currency,Követelés a vállalkozás pénznemében
 DocType: Delivery Note,Installation Status,Telepítés állapota
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Szeretné frissíteni részvétel? <br> Jelen: {0} \ <br> Hiányzik: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Elfogadott + Elutasított Mennyiségnek meg kell egyeznie a {0} tétel beérkezett mennyiségével
 DocType: Request for Quotation,RFQ-,AJK-
 DocType: Item,Supply Raw Materials for Purchase,Nyersanyagok beszállítása beszerzéshez
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Legalább egy fizetési mód szükséges POS számlára.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Legalább egy fizetési mód szükséges POS számlára.
 DocType: Products Settings,Show Products as a List,Megmutatása a tételeket listában
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Töltse le a sablont, töltse ki a megfelelő adatokat és csatolja a módosított fájlt. Minden időpont és alkalmazott kombináció a kiválasztott időszakban bekerül a sablonba, a meglévő jelenléti ívekkel együtt"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ÉCS bejegyzés generálás
 DocType: Appraisal Template Goal,KRA,TÉSABL
 DocType: Lead,Request Type,Kérés típusa
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Alkalmazot létrehozás
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Alkalmazot létrehozás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Hírállomás
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Végrehajtás
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Részletek az elvégzett műveletekethez.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Tervet karbantartási ellenőrzés.
 DocType: SMS Settings,Enter url parameter for message,Adjon url paramétert üzenethez
 DocType: POS Profile,Customer Groups,Vevőcsoportok
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Pénzügyi  kimutatások
 DocType: Guardian,Students,Tanulók
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Alkalmazási szabályainak árképzés és kedvezmény.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Árlistát alkalmazni kell vagy beszerzésre vagy eladásra
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Előleg összege nem lehet nagyobb, mint {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Sorozat List ehhez a tranzakcióhoz
 DocType: Company,Default Payroll Payable Account,Alapértelmezett Bér fizetendő számla
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Email csoport frissítés
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Email csoport frissítés
 DocType: Sales Invoice,Is Opening Entry,Ez kezdő könyvelési tétel
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Megemlít, ha nem szabványos bevételi számla  alkalmazandó"
 DocType: Course Schedule,Instructor Name,Oktató neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,"Raktár szükséges, mielőtt beküldané"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,"Raktár szükséges, mielőtt beküldané"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ekkor beérkezett
 DocType: Sales Partner,Reseller,Viszonteladó
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ha be van jelölve, tartalmazni fogja a készleten nem lévő tételeket az anyag kérésekben."
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Ellen Értékesítési tétel számlák
 ,Production Orders in Progress,Folyamatban lévő gyártási rendelések
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettó pénzeszközök a pénzügyről
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Helyi-tároló megtelt, nem menti"
 DocType: Lead,Address & Contact,Cím & Kapcsolattartó
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adja hozzá a fel nem használt távoléteket a korábbi elhelyezkedésből
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Következő ismétlődő: {0} ekkor jön létre {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Összes költség összeg ((Idő nyilvántartó szerint)
 DocType: Item Website Specification,Item Website Specification,Tétel weboldal adatai
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Távollét blokkolt
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank bejegyzések
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},"Tétel: {0}, elérte az élettartama végét {1}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank bejegyzések
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Éves
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Készlet egyeztetés tétele
 DocType: Stock Entry,Sales Invoice No,Kimenő értékesítési számla száma
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Közzéteszi a Hubon
 DocType: Student Admission,Student Admission,Tanuló Felvételi
 ,Terretory,Terület
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} tétel törölve
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Anyagigénylés
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} tétel törölve
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Anyagigénylés
 DocType: Bank Reconciliation,Update Clearance Date,Végső dátum frissítése
 DocType: Item,Purchase Details,Beszerzés adatai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Tétel {0} nem található a 'Szállított alapanyagok' táblázatban ebben a Beszerzési  Megrendelésben {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Fennálló, kinntlévő negatív csekkek és a Betétek kiegyenlítésre"
 DocType: Item,Synced With Hub,Szinkronizálta Hub-al
 DocType: Vehicle,Fleet Manager,Flotta kezelő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Sor # {0}: {1} nem lehet negatív a tételre: {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Hibás Jelszó
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Sor # {0}: {1} nem lehet negatív a tételre: {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Hibás Jelszó
 DocType: Item,Variant Of,Változata
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint 'Gyártandó Menny'"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Befejezett Menny nem lehet nagyobb, mint 'Gyártandó Menny'"
 DocType: Period Closing Voucher,Closing Account Head,Záró fiók vezetője
 DocType: Employee,External Work History,Külső munka története
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Körkörös hivatkozás hiba
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Email értesítő létrehozása automatikus Anyag igény létrehozásához
 DocType: Journal Entry,Multi Currency,Több pénznem
 DocType: Payment Reconciliation Invoice,Invoice Type,Számla típusa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Szállítólevél
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Szállítólevél
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Adók beállítása
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Eladott eszközök költsége
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Fizetés megadása módosításra került, miután lehívta. Kérjük, hívja le újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
-DocType: Grade Interval,Min Score,min. pontszám
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} kétszer bevitt a tétel adójába
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Összefoglaló erre a hétre és a folyamatban lévő tevékenységek
 DocType: Student Applicant,Admitted,Belépést nyer
 DocType: Workstation,Rent Cost,Bérleti díj
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Megrendelési érték
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank/készpénz tranzakciókat ügyfélfél vagy belső átutalás szerint
 DocType: Shipping Rule,Valid for Countries,Érvényes ezekre az országokra
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel egy sablon, és nem lehet használni a tranzakciókhoz. Elem Jellemzők át lesznek másolva a különböző variációkra, kivéve, ha be van állítva a 'Ne másolja'"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ez a tétel egy sablon, és nem lehet használni a tranzakciókhoz. Elem Jellemzők át lesznek másolva a különböző variációkra, kivéve, ha be van állítva a 'Ne másolja'"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Összes Megrendelés ami annak Tekinthető
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Alkalmazott Titulus (pl vezérigazgató, igazgató stb)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Kérjük, írja be a 'Ismételje a hónap ezen napján' mező értékét"
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Sor # {0}: Beszerzési számlát nem lehet létrehozni egy már meglévő eszközre: {1}
 DocType: Item Tax,Tax Rate,Adókulcs
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} már elkülönített a  {1} Alkalmazotthoz a {2} -től {3} -ig időszakra
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Tétel kiválasztása
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Tétel kiválasztása
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Beszállítói számla: {0} már benyújtott
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Sor # {0}: Köteg számnak egyeznie kell ezzel {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Átalakítás nem-csoporttá
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,A Köteg több Tétel összessége.
 DocType: C-Form Invoice Detail,Invoice Date,Számla dátuma
 DocType: GL Entry,Debit Amount,Tartozás összeg
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nem lehet csak 1 fiók vállalatonként ebben {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Kérjük, nézze meg a mellékletet"
 DocType: Purchase Order,% Received,% fogadva
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Készítsen Diákcsoportokat
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Ajánlatkérés
 DocType: Salary Slip Timesheet,Working Hours,Munkaidő
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Megváltoztatni a kezdő / aktuális sorszámot egy meglévő sorozatban.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Hozzon létre egy új Vevőt
-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.","Ha több árképzési szabály továbbra is fennáll, a felhasználók fel lesznek kérve, hogy a kézi prioritás beállítással orvosolják a konfliktusokat."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Beszerzési megrendelés létrehozása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Hozzon létre egy új Vevőt
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ha több árképzési szabály továbbra is fennáll, a felhasználók fel lesznek kérve, hogy a kézi prioritás beállítással orvosolják a konfliktusokat."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Beszerzési megrendelés létrehozása
 ,Purchase Register,Beszerzési Regisztráció
 DocType: Course Scheduling Tool,Rechedule,Újraidőzítés
 DocType: Landed Cost Item,Applicable Charges,Alkalmazandó díjak
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'Távollét Jóváhagyó' beosztással kell rendelkeznie
 DocType: Purchase Receipt,Vehicle Date,Jármű dátuma
 DocType: Student Log,Medical,Orvosi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Veszteség indoka
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Veszteség indoka
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,"Érdeklődés tulajdonosa nem lehet ugyanaz, mint az érdeklődés"
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,"Elkülönített összeg nem lehet nagyobb, mint a kiigazítás nélküli összege"
 DocType: Announcement,Receiver,Fogadó
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Mennyiség és ár
 DocType: Delivery Note,% Installed,% telepítve
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Tantermek / Laboratoriumok stb, ahol előadások vehetők igénybe."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Szállító&gt; Szállító Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Kérjük adja meg a cégnevet elsőként
 DocType: Purchase Invoice,Supplier Name,Beszállító neve
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Olvassa el a ERPNext kézikönyv
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Régi szülő
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Kötelező mező - Tanév
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Az email részét képező bevezető bemutatkozó szöveg testreszabása. Minden egyes tranzakció külön bevezető szöveggel rendelkezik.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},"Kérjük, állítsa be az alapértelmezett fizetendő számla a cég {0}"
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globális beállítások minden egyes gyártási folyamatra.
 DocType: Accounts Settings,Accounts Frozen Upto,A számlák be vannak fagyasztva eddig
 DocType: SMS Log,Sent On,Elküldve
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,{0} jellemzők többször kiválasztásra kerültek a jellemzők táblázatban
 DocType: HR Settings,Employee record is created using selected field. ,Alkalmazott rekord jön létre a kiválasztott mezővel.
 DocType: Sales Order,Not Applicable,Nem értelmezhető
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Távollét törzsadat.
 DocType: Request for Quotation 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 +877,Please enter Item Code.,"Kérjük, adja meg a tételkódot."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Kérjük, adja meg a tételkódot."
 DocType: BOM,Costing,Költségelés
 DocType: Tax Rule,Billing County,Számlázási megye
 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 úgy  tekinteni, mint amelyek már bennszerepelnek a Nyomtatott Ár / Nyomtatott Összeg -ben"
@@ -500,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Csomag számból
 DocType: Item Attribute,To Range,Tartományhoz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Értékpapírok és betétek
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nem lehet megváltoztatni az értékelési módszert, mivel vannak tranzakciók olyan tételekhez, amelyeknek nincs saját értékelési módszere"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Összes kötelezően kiosztott távollétek
 DocType: Job Opening,Description of a Job Opening,Leírás egy Állásajánlathoz
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Függő tevékenységek mára
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Igazgatási tisztviselő
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Kérjük, válasszon pályát"
 DocType: Timesheet Detail,Hrs,Óra
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Kérjük, válasszon Vállalkozást először"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Kérjük, válasszon Vállalkozást először"
 DocType: Stock Entry Detail,Difference Account,Különbség főkönyvi számla
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nem zárható feladat, mivel a hozzá fűződő feladat: {0} nincs lezárva."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Kérjük, adja meg a Raktárat, amelyekre anyag igénylés keletkezett"
 DocType: Production Order,Additional Operating Cost,További üzemeltetési költség
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikum
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Egyesítéshez, a következő tulajdonságoknak meg kell egyeznie mindkét tételnél"
 DocType: Shipping Rule,Net Weight,Nettó súly
 DocType: Employee,Emergency Phone,Sürgősségi telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Vásárol
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Kérjük adja meg a küszöb fokozatát 0%
 DocType: Sales Order,To Deliver,Szállít
 DocType: Purchase Invoice Item,Item,Tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Széria sz. tétel nem lehet egy törtrész
 DocType: Journal Entry,Difference (Dr - Cr),Különbség (Dr - Cr)
 DocType: Account,Profit and Loss,Eredménykimutatás
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Alvállalkozói munkák kezelése
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Lépésköz nem lehet 0
 DocType: Production Planning Tool,Material Requirement,Anyagszükséglet
 DocType: Company,Delete Company Transactions,Vállalati tranzakciók törlése
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező a Banki tranzakcióhoz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Hivatkozási szám és Referencia dátum kötelező a Banki tranzakcióhoz
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adók és költségek hozzáadása / szerkesztése
 DocType: Purchase Invoice,Supplier Invoice No,Beszállítói számla száma
 DocType: Territory,For reference,Referenciaként
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Telepítési feljegyzés Elem
 DocType: Production Plan Item,Pending Qty,Folyamatban db
 DocType: Budget,Ignore,Mellőz
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nem aktív
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nem aktív
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},Küldött SMS alábbi telefonszámokon: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Csekk méretek telepítése a nyomtatáshoz
 DocType: Salary Slip,Salary Slip Timesheet,Bérpapirok munkaidő jelenléti ívei
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,Teljes Jutalék
 DocType: Pricing Rule,Sales Partner,Értékesítő partner
 DocType: Buying Settings,Purchase Receipt Required,Beszerzési megrendelés nyugta kötelező
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Készletérték ár kötelező, ha nyitási készletet felvitt"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nem talált bejegyzést a számlatáblázat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Kérjük, válasszon Vállalkozást és Ügyfél típust először"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Pénzügyi / számviteli év.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Halmozott értékek
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sajnáljuk, Széria sz. nem lehet összevonni,"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Vevői rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Vevői rendelés létrehozás
 DocType: Project Task,Project Task,Projekt téma feladat
 ,Lead Id,Érdeklődés ID
 DocType: C-Form Invoice Detail,Grand Total,Mindösszesen
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Folytatás Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Törzsvásárlók
 DocType: Leave Control Panel,Allocate,Feloszott
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Eladás visszaküldése
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Eladás visszaküldése
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Megjegyzés: Az összes kijelölt távollét: {0} nem lehet kevesebb, mint a már jóváhagyott távollétek: {1} erre az időszakra"
 DocType: Announcement,Posted By,Általa rögzítve
 DocType: Item,Delivered by Supplier (Drop Ship),Beszállító által közvetlenül vevőnek szállított (Drop Ship)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Árajánlat az ő részére
 DocType: Lead,Middle Income,Közepes jövedelmű
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Nyitó (Követ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Alapértelmezett mértékegységét a {0} tételnek nem lehet megváltoztatni közvetlenül, mert már végzett néhány tranzakció(t) másik mértékegységgel. Szükséges lesz egy új tétel létrehozására, hogy egy másik alapértelmezett mértékegységet használhasson."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Elkülönített összeg nem lehet negatív
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Kérjük, állítsa be a Vállalkozást"
 DocType: Purchase Order Item,Billed Amt,Számlázott össz.
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Kimenő értékesítési számlák Munkaidő jelenléti ív nyilvántartója
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Hivatkozási szám és Referencia dátuma szükséges {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Válasszon Fizetési számlát, banki tétel bejegyzéshez"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Készítsen Munkavállaló nyilvántartásokat a távollétek, költségtérítési igények és a bér kezeléséhez"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Hozzáadás a tudásbázishoz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pályázatírás
 DocType: Payment Entry Deduction,Payment Entry Deduction,Fizetés megadásának levonása
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nem a pénzügyi évben {2}
 DocType: Buying Settings,Settings for Buying Module,Beállítások a modul vásárláshoz
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Vagyoneszköz {0} nem tartozik a(z) {1} céghez
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Kérjük, adjon meg Vásárlási nyugtát először"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Kérjük, adjon meg Vásárlási nyugtát először"
 DocType: Buying Settings,Supplier Naming By,Beszállító elnevezve által
 DocType: Activity Type,Default Costing Rate,Alapértelmezett költség ár
 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.","Árképzési szabályok szűrésre kerülnek a Vevő, Vevő csoport, Terület, Beszállító,Beszállító típus, kampány, értékesítési partner stb. alapján."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Árképzési szabályok szűrésre kerülnek a Vevő, Vevő csoport, Terület, Beszállító,Beszállító típus, kampány, értékesítési partner stb. alapján."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Nettó készletváltozás
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Alkalmazotti hitel kezelés
 DocType: Employee,Passport Number,Útlevél száma
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Összefüggés Helyettesítő2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menedzser
 DocType: Payment Entry,Payment From / To,Fizetési Honnan / Hova
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Időintervallum
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},"Új hitelkeret kevesebb, mint a jelenlegi fennálló összeget a vevő számára. Hitelkeretnek minimum ennyinek kell lennie {0}"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Ugyanaz a tételt már többször megjelenik.
 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 'Ez alapján' 'és a 'Csoport szerint' nem lehet azonos
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,Percekben
 DocType: Issue,Resolution Date,Megoldás dátuma
 DocType: Student Batch Name,Batch Name,Köteg neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Munkaidő jelenléti ív nyilvántartás létrehozva:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Kérjük, állítsda be az alapértelmezett Készpénz vagy bankszámlát a  Fizetési módban {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Beiratkozás
 DocType: Selling Settings,Customer Naming By,Vevő elnevezés típusa
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Megmutatja a hallgatót mint jelenlévőt a  Hallgató havi résztvételi jelentésben
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Tényleges kezdési idő
 DocType: BOM Operation,Operation Time,Működési idő
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Befejez
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bázis
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Bázis
 DocType: Timesheet,Total Billed Hours,Összes számlázott Órák
 DocType: Journal Entry,Write Off Amount,Leírt összeg
 DocType: Journal Entry,Bill No,Számlaszám
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Tanuló Nézőszám
 DocType: Sales Invoice Timesheet,Time Sheet,Jelenléti ív
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Visszatartandó nyersanyagok ez alapján
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Kérjük, adja meg a tétel részleteit"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Kérjük, adja meg a tétel részleteit"
 DocType: Interest,Interest,Érdek
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Értékesítés előtt
 DocType: Purchase Receipt,Other Details,Egyéb részletek
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Fizetés megadása már létrehozott
 DocType: Purchase Receipt Item Supplied,Current Stock,Jelenlegi raktárkészlet
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Sor # {0}: {1} Vagyontárgy nem kapcsolódik ehhez a tételhez {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Bérpapír előnézet
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Bérpapír előnézet
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A {0} számlát már többször bevitték
 DocType: Account,Expenses Included In Valuation,Készletértékelésbe belevitt költségek
 DocType: Hub Settings,Seller City,Eladó városa
 ,Absent Student Report,Jelentés a hiányzó tanulókról
 DocType: Email Digest,Next email will be sent on:,A következő emailt ekkor küldjük:
 DocType: Offer Letter Term,Offer Letter Term,Ajánlati levél feltétele
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Tételnek változatok.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Tételnek változatok.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Tétel {0} nem található
 DocType: Bin,Stock Value,Készlet értéke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Vállalkozás {0} nem létezik
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Fa Típus
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Fa Típus
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Darabonként felhasznált mennyiség
 DocType: Serial No,Warranty Expiry Date,Garancia lejárati dátuma
 DocType: Material Request Item,Quantity and Warehouse,Mennyiség és raktár
 DocType: Sales Invoice,Commission Rate (%),Jutalék mértéke (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa be az elnevezés sorozatot ehhez {0} a Telepítés &gt; Beállítások&gt; elnevezés sorozatok alatt"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Kérjük, válassza ki a Program"
 DocType: Project,Estimated Cost,Becsült költség
 DocType: Purchase Order,Link to material requests,Hivatkozás az anyagra kérésekre
@@ -753,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nem Készletezhető tétel
 DocType: Mode of Payment Account,Default Account,Alapértelmezett számla
 DocType: Payment Entry,Received Amount (Company Currency),Beérkezett összeg (Vállalkozás pénzneme)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Érdeklődést kell beállítani, ha a Lehetőséget az Érdeklődésből hozta létre"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Kérjük, válassza ki a heti munkaszüneti napot"
 DocType: Production Order Operation,Planned End Time,Tervezett befejezési idő
 ,Sales Person Target Variance Item Group-Wise,Értékesítői Cél Variance tétel Group-Wise
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,Lehetőség tőle
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Havi kimutatást.
 DocType: BOM,Website Specifications,Weboldal részletek
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük beállítási számozási sorozat nyilvántartó a Setup&gt; számozás sorozat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Feladó {0} a {1} típusból
 DocType: Warranty Claim,CI-,GI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Conversion Factor kötelező
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Bank A/C No.
 DocType: Bank Guarantee,Project,Projekt téma
 DocType: Quality Inspection Reading,Reading 7,Olvasás 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,részben rendezett
 DocType: Expense Claim Detail,Expense Claim Type,Költség igény típusa
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alapértelmezett beállítások a Kosárhoz
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Vagyonieszköz kiselejtezett a {0} Naplókönyvelés keresztül
@@ -810,14 +815,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnológia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Irodai karbantartási költségek
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-mail fiók beállítása
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Kérjük, adja meg először a tételt"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Kérjük, adja meg először a tételt"
 DocType: Account,Liability,Kötelezettség
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Szentesített összeg nem lehet nagyobb, mint az igény összege ebben a sorban {0}."
 DocType: Company,Default Cost of Goods Sold Account,Alapértelmezett önköltség fiók
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Árlista nincs kiválasztva
 DocType: Employee,Family Background,Családi háttér
 DocType: Request for Quotation Supplier,Send Email,E-mail küldése
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Figyelmeztetés: Érvénytelen csatolmány {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,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 +50,"To filter based on Party, select Party Type first","Az Ügyfél alapján kiszűrni, válasszuk ki az Ügyfél típpust először"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Egyetlen Alkalmazottat sem talált
 DocType: Supplier Quotation,Stopped,Megállítva
 DocType: Item,If subcontracted to a vendor,Ha alvállalkozásba kiadva egy beszállítóhoz
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Diák csoport már frissítve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Diák csoport már frissítve.
 DocType: SMS Center,All Customer Contact,Összes vevői Kapcsolattartó
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Készlet egyenlege feltöltése csv fájlon keresztül.
 DocType: Warehouse,Tree Details,fa Részletek
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimális Számla összege
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Költséghely {2} nem tartozik ehhez a vállalkozáshoz {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: fiók {2} nem lehet csoport
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Tétel sor {idx}: {doctype} {docname} nem létezik a fenti '{doctype}' táblában
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Jelenléti ív {0} már befejezett vagy törölt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nincsenek feladatok
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","A hónap napja, amelyen a számla automatikusan jön létre pl 05, 28 stb"
 DocType: Asset,Opening Accumulated Depreciation,Nyitva halmozott ÉCS
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,Mozgóátlag ár
 DocType: Production Planning Tool,Select Items,Válassza ki a tételeket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} a  {2} dátumú  {1} Ellenszámla
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Tanfolyam menetrend
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Tanfolyam menetrend
 DocType: Maintenance Visit,Completion Status,Készültségi állapot
 DocType: HR Settings,Enter retirement age in years,Adja meg a nyugdíjkorhatárt (év)
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Cél raktár
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Szállítás címzettnek vagy átvétel nyugtázás engedélyezése eddig a százalékig
 DocType: Stock Entry,STE-,KÉSZLBEJ-
 DocType: Upload Attendance,Import Attendance,Jelenlét Import
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Összes tétel csoport
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Összes tétel csoport
 DocType: Process Payroll,Activity Log,Tevékenység napló
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Nettó nyereség / veszteség
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikusan ír üzenetet a benyújtott  tranzakciókra.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Beszerzési Megrendelést Kifizetésre
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Tervezett mennyiség
 DocType: Sales Invoice,Payment Due Date,Fizetési határidő
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Tétel variáció {0} már létezik azonos Jellemzővel
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Nyitás"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Nyitott teendő
 DocType: Notification Control,Delivery Note Message,Szállítólevél szövege
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,Újra-rendelési szint  mennyiség
 DocType: Leave Block List Date,Leave Block List Date,Távollét blokk lista dátuma
 DocType: Pricing Rule,Price or Discount,Árazás vagy engedmény
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Összesen alkalmazandó díjak a vásárlási nyugta tételek táblázatban egyeznie kell az Összes adókkal és illetékekkel
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Összesen alkalmazandó díjak a vásárlási nyugta tételek táblázatban egyeznie kell az Összes adókkal és illetékekkel
 DocType: Sales Team,Incentives,Ösztönzők
 DocType: SMS Log,Requested Numbers,Kért számok
 DocType: Production Planning Tool,Only Obtain Raw Materials,Csak nyersanyagokat szerezhet be
@@ -915,20 +920,20 @@
 DocType: Serial No,Incoming Rate,Bejövő ár
 DocType: Packing Slip,Gross Weight,Bruttó súly
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,"A vállalkozásának a neve, amelyre ezt a rendszert beállítja."
-DocType: HR Settings,Include holidays in Total no. of Working Days,Tartalmazza az ünnepnapokat a munkanapok számának összege
+DocType: HR Settings,Include holidays in Total no. of Working Days,A munkanapok számának összege tartalmazza az ünnepnapokat
 DocType: Job Applicant,Hold,Tart
 DocType: Employee,Date of Joining,Csatlakozás dátuma
 DocType: Naming Series,Update Series,Sorszámozás frissítése
 DocType: Supplier Quotation,Is Subcontracted,Alvállalkozó által feldolgozandó?
 DocType: Item Attribute,Item Attribute Values,Tétel Jellemző értékekben
 DocType: Examination Result,Examination Result,Vizsgálati eredmény
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Beszerzési megrendelés nyugta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Beszerzési megrendelés nyugta
 ,Received Items To Be Billed,Számlázandó Beérkezett tételek
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Benyújtott  bérpapírok
 DocType: Employee,Ms,Hölgy
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Pénznem árfolyam törzsadat arányszám.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referencia Doctype közül kell {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Időkeret a következő {0} napokra erre a műveletre: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referencia Doctype közül kell {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nem található a Időkeret a következő {0} napokra erre a műveletre: {1}
 DocType: Production Order,Plan material for sub-assemblies,Terv anyag a részegységekre
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Értékesítési partnerek és Területek
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Nem tud létrehozni automatikusan fiókot, hiszen már hozott létre készlet egyenleget a fiókban. Létre kell hoznia egy megfelelő főkönyvi számlát, mielőtt ebben a raktárban egy bejegyzést írhatna"
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,Alapértelmezett kifizetendő számlák
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,"Alkalmazott {0} nem aktív, vagy nem létezik"
 DocType: Fee Structure,Components,Alkatrészek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Tétel változatok {0} frissített
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Kérjük, adja meg a Vagyontárgy Kategóriát ebben a tételben: {0}"
 DocType: Quality Inspection Reading,Reading 6,Olvasás 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Nem lehet a {0} {1} {2} bármely negatív fennmaradó számla nélkül
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Beszállítói előleg számla
 DocType: Hub Settings,Sync Now,Szinkronizálás most
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit bejegyzés nem kapcsolódik a {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,Ez beszerzendő tétel
 DocType: Asset,Purchase Invoice,Beszállítói számla
 DocType: Stock Ledger Entry,Voucher Detail No,Utalvány Részletei Sz.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Új értékesítési számla
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Új értékesítési számla
 DocType: Stock Entry,Total Outgoing Value,Összes kimenő Érték
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Nyitás dátumának és zárás dátumának  ugyanazon üzleti évben kell legyenek
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Nyitás dátumának és zárás dátumának  ugyanazon üzleti évben kell legyenek
 DocType: Lead,Request for Information,Információkérés
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Offline számlák szinkronizálása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Offline számlák szinkronizálása
 DocType: Payment Request,Paid,Fizetett
 DocType: Program Fee,Program Fee,Program díja
 DocType: Salary Slip,Total in words,Összesen szavakkal
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,Szankcionált
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,kötelező. Talán nincs létrehozva Pénzváltó rekord ehhez
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Sor # {0}: Kérjük adjon meg Szériaszámot erre a Tételre: {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","'Termék köteg' tételeknek, raktárnak, Széria számnak és Köteg számnak fogják tekinteni a 'Csomagolási lista' táblázatból. Ha a Raktár és a Köteg szám egyezik az összes 'Tétel csomag' tételre, ezek az értékek bekerülnek a fő tétel táblába, értékek átmásolásra kerülnek a 'Csomagolási lista' táblázatba."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","'Termék köteg' tételeknek, raktárnak, Széria számnak és Köteg számnak fogják tekinteni a 'Csomagolási lista' táblázatból. Ha a Raktár és a Köteg szám egyezik az összes 'Tétel csomag' tételre, ezek az értékek bekerülnek a fő tétel táblába, értékek átmásolásra kerülnek a 'Csomagolási lista' táblázatba."
 DocType: Job Opening,Publish on website,Közzéteszi honlapján
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Kiszállítás a vevő felé.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,"Beszállítói Számla dátuma nem lehet nagyobb, mint Beküldés dátuma"
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variancia
 ,Company Name,Válallkozás neve
 DocType: SMS Center,Total Message(s),Összes üzenet(ek)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Válassza ki a tételt az átmozgatáshoz
 DocType: Purchase Invoice,Additional Discount Percentage,További kedvezmény százalék
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Minden súgó video megtekintése
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Válassza ki a a bank fiók vezetőjéet, ahol a csekket letétbe rakta."
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Sor {0}: Fizetés az Vavői/Beszerzési megrendelés ellenében mindig előrefizetéssel kell feltüntetni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Vegyi
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Alapértelmezett Bank / készpénz fiók automatikusan frissül a fizetés naplóbejegyzésben, ha ez a mód a kiválasztott."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Az intervallumok évfolyam kódja: {0} átfedi az évfolyam időközöket más évfolyamon. Kérjük, ellenőrizze időközöket: {0} és {1}, és próbálja újra"
 DocType: BOM,Raw Material Cost(Company Currency),Nyersanyagköltség (Vállakozás pénzneme)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,"Összes tétel már átadott, erre a gyártási rendelésre."
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sor # {0}: Érték nem lehet nagyobb, mint az érték amit ebben használt {1} {2}"
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,Anyagjegyzék honlap tétel
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Kérjük töltse fel levele fejlécét és logo-ját. (Ezeket később szerkesztheti).
 DocType: Timesheet Detail,Bill,Számla
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Következő értékcsökkenés dátumaként múltbeli dátumot tüntettek fel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Fehér
 DocType: SMS Center,All Lead (Open),Összes Érdeklődés (Nyitott)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Sor {0}: Mennyiség nem áll rendelkezésre {4} raktárban {1} a kiküldetés idején a bejegyzést ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Kifizetett előlegek átmásolása
 DocType: Item,Automatically Create New Batch,Automatikus Új köteg létrehozás
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Tesz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Tesz
 DocType: Student Admission,Admission Start Date,Felvételi kezdési dátum
 DocType: Journal Entry,Total Amount in Words,Teljes összeg kiírva
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Hiba történt. Az egyik valószínű oka az lehet, hogy nem mentette az űrlapot. Kérjük, forduljon support@erpnext.com ha a probléma továbbra is fennáll."
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Megrendelni típusa ezek közül kell legyen: {0}
 DocType: Lead,Next Contact Date,Következő megbeszélés dátuma
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Nyitó Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz mennyiséghez"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Kérjük, adja meg a Számlát a váltópénz mennyiséghez"
 DocType: Student Batch Name,Student Batch Name,Tanuló kötegnév
 DocType: Holiday List,Holiday List Name,Szabadnapok listájának neve
 DocType: Repayment Schedule,Balance Loan Amount,Hitel összeg mérlege
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Kérjük adjon meg egy {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Az eltávolított elemek változása nélkül mennyiséget vagy értéket.
 DocType: Delivery Note,Delivery To,Szállítás címzett
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Jellemzők tábla kötelező
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Jellemzők tábla kötelező
 DocType: Production Planning Tool,Get Sales Orders,Vevő rendelések lekérése
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nem lehet negatív
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Kedvezmény
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Kedvezmény
 DocType: Asset,Total Number of Depreciations,Összes amortizációk száma
 DocType: Sales Invoice Item,Rate With Margin,Érték árkülöbözettel
 DocType: Workstation,Wages,Munkabér
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Fenntartott Raktár a Vevői rendelésben / készáru raktárban
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Értékesítési összeg
 DocType: Repayment Schedule,Interest Amount,Kamatösszeg
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a bejegyzésre. Kérjük ""Állapot"" frissítsen és ""Mentés"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Te vagy a költség Jóváhagyó erre a bejegyzésre. Kérjük ""Állapot"" frissítsen és ""Mentés"""
 DocType: Serial No,Creation Document No,Létrehozott Dokumentum sz.
 DocType: Issue,Issue,Probléma
 DocType: Asset,Scrapped,Selejtezve
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Tétel változatok Jellemzői. pl méret, szín stb"
 DocType: Purchase Invoice,Returns,Visszatér
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Raktár
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Széria sz. {0} jelenleg karbantartási szerződés  alatt áll eddig {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Széria sz. {0} jelenleg karbantartási szerződés  alatt áll eddig {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Toborzás
 DocType: Lead,Organization Name,Vállalkozás neve
 DocType: Tax Rule,Shipping State,Szállítási állam
 ,Projected Quantity as Source,"Tervezett mennyiségét , mint forrás"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Tételt kell hozzá adni a 'Tételek beszerzése a Beszerzési bevételezések' gomb használatával
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Tételt kell hozzá adni a 'Tételek beszerzése a Beszerzési bevételezések' gomb használatával
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Tartalmazza a nem-készletezett tételeket
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Értékesítési költségek
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,Ellen
 DocType: Item,Default Selling Cost Center,Alapértelmezett Értékesítési költséghely
 DocType: Sales Partner,Implementation Partner,Kivitelező partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Irányítószám
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Irányítószám
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Vevői rendelés {0} az ez {1}
 DocType: Opportunity,Contact Info,Kapcsolattartó infó
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Készlet bejegyzés létrehozás
 DocType: Packing Slip,Net Weight UOM,Nettó súly mértékegysége
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} eredményei
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} eredményei
 DocType: Item,Default Supplier,Alapértelmezett beszállító
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Túltermelés engedélyezés százaléka
 DocType: Employee Loan,Repayment Schedule,Törlesztés ütemezése
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Heti távollétek lekérdezése
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"A befejezés dátuma nem lehet kevesebb, mint az elkezdés dátuma"
 DocType: Sales Person,Select company name first.,Válassza ki a vállakozás nevét először.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Beszállítóktól kapott árajánlatok.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Címzett {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Átlagéletkor
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Teljesítménymutató terület
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Szállítás
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Érvénytelen Jellemző
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} be kell nyújtani
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} be kell nyújtani
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Mennyiségnek kisebb vagy egyenlő legyen mint {0}
 DocType: SMS Center,Total Characters,Összes karakterek
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Kérjük, válasszon ANYGJZ az ANYGJZ mezőben erre a tételre {0}"
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,Forgalmazó
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Bevásárló kosár Szállítási szabály
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Gyártási rendelést: {0} törölni kell ennek a  Vevői rendelésnek a törléséhez
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az 'Alkalmazzon további kedvezmény ezen'"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Kérjük, állítsa be az 'Alkalmazzon további kedvezmény ezen'"
 ,Ordered Items To Be Billed,Számlázandó Rendelt mennyiség
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Tartományból távolságnak kisebbnek kell lennie mint a Tartományba
 DocType: Global Defaults,Global Defaults,Általános beállítások
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Kezdő év
 DocType: Purchase Invoice,Start date of current invoice's period,Kezdési időpont az aktuális számla időszakra
 DocType: Salary Slip,Leave Without Pay,Fizetés nélküli távollét
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapacitás tervezés hiba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapacitás tervezés hiba
 ,Trial Balance for Party,Ügyfél Főkönyvi kivonat egyenleg
 DocType: Lead,Consultant,Szaktanácsadó
 DocType: Salary Slip,Earnings,Jövedelmek
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ez lesz hozzáfűzve a termék egy varióciájához. Például, ha a rövidítés ""SM"", és a tételkód ""T-shirt"", a tétel kód variánsa ez lesz ""SM feliratú póló"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Nettó fizetés (szavakkal) lesz látható, ha mentette a Bérpapírt."
 DocType: Purchase Invoice,Is Return,Ez visszáru
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Vissza / terhelési értesítés
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Vissza / terhelési értesítés
 DocType: Price List Country,Price List Country,Árlista Országa
 DocType: Item,UOMs,Mértékegységek
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},"{0} érvényes sorozatszámok, a(z) {1} tételhez"
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Kérjük, adja meg a tételkódot, hogy megkapja a köteg számot"
 DocType: Stock Settings,Default Item Group,Alapértelmezett tételcsoport
 DocType: Employee Loan,Partially Disbursed,Részben folyosított
-DocType: Grading Structure,Grading System Name,Osztályozási rendszer neve
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Beszállítói adatbázis.
 DocType: Account,Balance Sheet,Mérleg
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Költséghely tételhez ezzel a tétel kóddal '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Fizetési mód nincs beállítva. Kérjük, ellenőrizze, hogy a fiók be lett állítva a fizetési módon, vagy POS profilon."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Az értékesítési személy kap egy emlékeztetőt ezen a napon, az ügyféllel történő kapcsolatfelvételhez,"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Ugyanazt a tételt nem lehet beírni többször.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","További számlákat a Csoportok alatt hozhat létre, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
@@ -1183,7 +1184,7 @@
 ,Purchase Order Items To Be Billed,Számlázandó Beszerzési rendelés tételei
 DocType: Purchase Invoice Item,Net Rate,Nettó ár
 DocType: Purchase Invoice Item,Purchase Invoice Item,Beszerzés számla tétel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Készlet könyvelés bejegyzések és GL bejegyzések újra könyvelésével a kiválasztott Beszerzési bevételezési nyuktákkal
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Készlet könyvelés bejegyzések és GL bejegyzések újra könyvelésével a kiválasztott Beszerzési bevételezési nyuktákkal
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1. tétel
 DocType: Holiday,Holiday,Szabadnap
 DocType: Support Settings,Close Issue After Days,Ügyek bezárása ennyi eltelt nap után
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Kész a munka
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Kérjük adjon meg legalább egy Jellemzőt a Jellemzők táblázatban
 DocType: Announcement,All Students,Összes diák
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Tétel: {0} -  Nem készletezhető tételnek kell lennie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Tétel: {0} -  Nem készletezhető tételnek kell lennie
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Főkönyvi kivonat megtekintése
 DocType: Grading Scale,Intervals,Periódusai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Legkorábbi
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Egy tétel csoport létezik azonos névvel, kérjük, változtassa meg az tétel nevét, vagy nevezze át a tétel-csoportot"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Tanuló Mobil sz.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,A világ többi része
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,A tétel {0} nem lehet Köteg
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Bér kifizetése ettől {0} eddig {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nem engedélyezett szerkeszteni befagyasztott számlát {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fennálló negatív kintlévő számlák lekérdezése
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Vevői rendelés {0} nem érvényes
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Beszerzési megrendelések segítenek megtervezni és követni a beszerzéseket
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sajnáljuk, a vállalkozásokat nem lehet összevonni,"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","A teljes Probléma / Átvitt mennyiség {0} ebben az Anyaga igénylésben: {1} \ nem lehet nagyobb, mint az igényelt mennyiség: {2} erre a tételre: {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kis
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Közvetett költségek
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Sor {0}: Menny. kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Mezőgazdaság
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Törzsadatok szinkronizálása
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Törzsadatok szinkronizálása
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,A termékei vagy szolgáltatásai
 DocType: Mode of Payment,Mode of Payment,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,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 +180,Website Image should be a public file or website URL,Weboldal kép legyen nyilvános fájl vagy weboldal URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,ANYGJZ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"Ez egy gyökér tétel-csoport, és nem lehet szerkeszteni."
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,Csoport regisztrációs száma
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0} -hoz, csak jóváírási számlákat lehet kapcsolni a másik ellen terheléshez"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Összesen feladat súlyozása legyen 1. Kérjük, állítsa a súlyozást minden projekt feladataira ennek megfelelően"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,A {0} Szállítólevelet nem nyújtották be
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Tétel {0} kell egy Alvállalkozásban Elem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Alap 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ályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Árképzési szabályt először 'Alkalmazza ezen' mező alapján kiválasztott, ami lehet tétel, pont-csoport vagy a márka."
 DocType: Hub Settings,Seller Website,Eladó Website
 DocType: Item,ITEM-,TÉTEL-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Az értékesítési csapat teljes lefoglalt százaléka  100 kell legyen
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Gyártási rendelés állapota: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Gyártási rendelés állapota: {0}
 DocType: Appraisal Goal,Goal,Cél
 DocType: Sales Invoice Item,Edit Description,Leírás szerkesztése
 ,Team Updates,Csapat frissítések
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Beszállítónak
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Beszállítónak
 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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Nyomtatási formátum létrehozása
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,Könyvelési tétel
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} tétel(ek) folyamatban
 DocType: Workstation,Workstation Name,Munkaállomás neve
-DocType: Grade Interval,Grade Code,Osztály kód
+DocType: Grading Scale Interval,Grade Code,Osztály kód
 DocType: POS Item Group,POS Item Group,POS tétel csoport
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Összefoglaló email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ANYGJZ {0} nem tartozik ehhez az elemhez: {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardver
 DocType: Sales Order,Recurring Upto,ismétlődő Upto
 DocType: Attendance,HR Manager,HR menedzser
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Kérjük, válasszon egy vállalkozást"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Kérjük, válasszon egy vállalkozást"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Kiváltságos távollét
 DocType: Purchase Invoice,Supplier Invoice Date,Beszállítói számla dátuma
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Engedélyeznie kell a bevásárló kosárat
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Élelmiszer
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Öregedés tartomány 3
 DocType: Maintenance Schedule Item,No of Visits,Látogatások száma
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Jelenlét jelölése
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Jelenlét jelölése
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Karbantartási ütemterv {0} létezik erre {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Tanuló regisztráló
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A záró számla Pénznemének ennek kell lennie: {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Az összes cél pontjainak összege 100 kell legyen. Ez most: {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Átlag napi kimenő
 DocType: POS Profile,Campaign,Kampány
 DocType: Supplier,Name and Type,Neve és típusa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Elfogadás állapotának ""Jóváhagyott"" vagy ""Elutasított"" kell lennie"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Elfogadás állapotának ""Jóváhagyott"" vagy ""Elutasított"" kell lennie"
 DocType: Purchase Invoice,Contact Person,Kapcsolattartó személy
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Várható kezdés időpontja"" nem lehet nagyobb, mint a ""Várható befejezés időpontja"""
 DocType: Course Scheduling Tool,Course End Date,Tanfolyam befejező dátum
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,Szállítási cím neve
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,"nem lehet nagyobb, mint 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,"nem lehet nagyobb, mint 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Tétel: {0} -  Nem készletezhető tétel
 DocType: Maintenance Visit,Unscheduled,Nem tervezett
 DocType: Employee,Owned,Tulajdon
 DocType: Salary Detail,Depends on Leave Without Pay,Fizetés nélküli távolléttől függ
 DocType: Pricing Rule,"Higher the number, higher the priority","Minél nagyobb a szám, annál nagyobb a prioritás"
 ,Purchase Invoice Trends,Beszerzési számlák alakulása
 DocType: Employee,Better Prospects,Jobb kilátások
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Sor # {0}: A köteg: {1} csak {2} Menny. Kérjük, válasszon egy másik tétel köteget, amelyben {3} Mennyiség elérhető vagy válassza szée a sort több sorrá, szállít / ügy kötegekből"
 DocType: Vehicle,License Plate,Rendszámtábla
 DocType: Appraisal,Goals,Célok
 DocType: Warranty Claim,Warranty / AMC Status,Garancia és éves karbantartási szerződés állapota
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Alkalmazott nem jelent magának.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ha a számla zárolásra került, a bejegyzések engedélyezettek korlátozott felhasználóknak."
 DocType: Email Digest,Bank Balance,Bank mérleg
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},"Könyvelési tétel ehhez {0}: {1}, csak ebben a pénznem végezhető: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Munkakör, szükséges képesítések stb"
 DocType: Journal Entry Account,Account Balance,Számla egyenleg
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Adó szabály a tranzakciókra.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mutassa a lezáratlan pénzügyi évben a P&L mérlegeket
 DocType: Shipping Rule,Shipping Account,Szállítási számla
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: fiók {2} inaktív
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Hozzon létre vevői rendeléseket a munkái megtervezéséhez és a pontos, időbeni kiszállításokhoz"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Hozzon létre vevői rendeléseket a munkái megtervezéséhez és a pontos, időbeni kiszállításokhoz"
 DocType: Quality Inspection,Readings,Olvasások
 DocType: Stock Entry,Total Additional Costs,Összes További költségek
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,Értékeléshez
 DocType: Asset Movement,Stock Manager,Készlet menedzser
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Forrás raktára kötelező ebben a sorban {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Csomagjegy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Csomagjegy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Iroda bérlés
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMS átjáró telepítése
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importálás nem sikerült!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,Szervíz szolgáltatások
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Bérpapír nyomtatvány az alkalmazottnak
 DocType: Cost Center,Parent Cost Center,Szülő Költséghely
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Válasszon Lehetséges beszállítót
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Válasszon Lehetséges beszállítót
 DocType: Sales Invoice,Source,Forrás
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mutassa zárva
 DocType: Leave Type,Is Leave Without Pay,Ez fizetés nélküli szabadság
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Vagyoneszköz Kategória kötelező befektetett eszközök tételeire
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nem talált bejegyzést a fizetési táblázatban
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ez {0} ütközik ezzel {1} ehhez {2} {3}
 DocType: Student Attendance Tool,Students HTML,Tanulók HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,Eltávozás dátuma
 DocType: Pricing Rule,For Price List,Árlistához
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Adminisztratív keresés
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Készítsen érdeklődéseket
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Készítsen érdeklődéseket
 DocType: Maintenance Schedule,Schedules,Ütemezések
 DocType: Purchase Invoice Item,Net Amount,Nettó Összege
 DocType: Purchase Order Item Supplied,BOM Detail No,Anyagjegyzék részlet száma
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program beiratkozások
 DocType: Sales Invoice Item,Brand Name,Márkanév
 DocType: Purchase Receipt,Transporter Details,Fuvarozó Részletek
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Alapértelmezett raktár szükséges a kiválasztott elemhez
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Doboz
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Lehetséges Beszállító
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Lehetséges Beszállító
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,A Szervezet
 DocType: Budget,Monthly Distribution,Havi Felbontás
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Vevő lista üres. Kérjük, hozzon létre Receiver listája"
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,Értékesítő partner célja
 DocType: Loan Type,Maximum Loan Amount,Maximális hitel összeg
 DocType: Pricing Rule,Pricing Rule,Árképzési szabály
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Ismétlődő lajstromszám ehhez a hallgatóhoz: {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Ismétlődő lajstromszám ehhez a hallgatóhoz: {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Művelet, ha az éves költségvetési keret túllépett"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Anyagigénylés -&gt; Megrendelésre
 DocType: Shopping Cart Settings,Payment Success URL,Fizetési sikeres URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,Törlesztési mód
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ha be van jelölve, a Kezdőlap lesz az alapértelmezett tétel csoport a honlapján"
 DocType: Quality Inspection Reading,Reading 4,Olvasás 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Alapértelmezett ANYAGJ {0} nem található ehhez a projekt témához {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Alapértelmezett ANYAGJ {0} nem található ehhez a projekt témához {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Garanciális igény a vállalkozás költségén.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","A diákok a rendszer lelkei, összes tanuló hozzáadása"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","A diákok a rendszer lelkei, összes tanuló hozzáadása"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"Sor # {0}: Végső dátuma: {1} nem lehet, a csekk dátuma: {2} előtti"
 DocType: Company,Default Holiday List,Alapértelmezett távolléti lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Sor {0}: Időtől és időre {1} átfedésben van {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"A nap (ok), amelyre benyújtotta a távollétét azok ünnepnapok. Nem kell igényelni a távollétet."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Küldje el újra a Fizetési E-mailt
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Új feladat
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Árajánlat létrehozás
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Árajánlat létrehozás
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Más jelentések
 DocType: Dependent Task,Dependent Task,Függő feladat
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konverziós tényező alapértelmezett mértékegység legyen 1 ebben a sorban: {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Távollét típusa {0}, nem lehet hosszabb, mint {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Próbáljon tervezni tevékenységet  X nappal előre.
 DocType: HR Settings,Stop Birthday Reminders,Születésnapi emlékeztetők kikapcsolása
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Kérjük, állítsa be alapértelmezett Bérszámfejtés fizetendő számlát a cégben: {0}"
 DocType: SMS Center,Receiver List,Vevő lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Tétel keresése
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Tétel keresése
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Elfogyasztott mennyiség
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettó készpénz változás
 DocType: Assessment Plan,Grading Scale,Osztályozás időszak
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Már elkészült
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mértékegység {0} amit egynél többször adott meg a konverziós tényező táblázatban
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Már elkészült
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Kifizetési kérelem már létezik: {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Problémás tételek költsége
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},"Mennyiség nem lehet több, mint {0}"
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Folyósítási bejegyzés létrehozása
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Sor {0}: Beszálító előlegénak terhelésnek kell lennie
 DocType: Company,Default Values,Alapértelmezett értékek
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencia} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Visszatérített teljes összeg
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ennek alapja a naplók ehhez a járműhöz. Lásd az alábbi idővonalat a részletehez
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Gyűjt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Beszállító Ellenszámla {0} dátuma {1}
 DocType: Customer,Default Price List,Alapértelmezett árlista
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Vagyoneszköz mozgás bejegyzés {0} létrehozva
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Nem törölheti ezt a Pénzügyi évet: {0}. Pénzügyi év: {0} az alapértelmezett beállítás, a Globális beállításokban"
 DocType: Journal Entry,Entry Type,Bejegyzés típusa
 ,Customer Credit Balance,Vevőkövetelés egyenleg
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Beszerzés
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,"Egyik tételnek sem változott mennyisége, illetve értéke."
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Kötelező mező - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Jótállási igény
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Jótállási igény
 ,Lead Details,Érdeklődés adatai
 DocType: Salary Slip,Loan repayment,Hitel visszafizetés
 DocType: Purchase Invoice,End date of current invoice's period,A befejezés dátuma az aktuális számla időszakra
@@ -1643,7 +1647,7 @@
 DocType: Shipping Rule Country,Shipping Rule Country,Szállítási szabály Ország
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Távollét és jelenlét
 DocType: Maintenance Visit,Partially Completed,Részben befejezett
-DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távollétek
+DocType: Leave Type,Include holidays within leaves as leaves,Tartalmazzák a távolléteken belül az ünnepnapokat mint távolléteket
 DocType: Sales Invoice,Packed Items,Csomag tételei
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Garancia igény ehhez a Széria számhoz
 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","Cserélje egy adott darabjegyzékre minden más Darabjegyzékeket, ahol alkalmazzák. Ez váltja fel a régi Anyagjegyzék linket, frissíti a költséget és regenerálja  ""Anyagjegyzék robbantott tételek"" tábláját, egy új Anyagjegyzékké"
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,Állandó lakcím
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","A kifizetett előleg erre {0} {1} nem lehet nagyobb, \ mint a Mindösszesen {2}"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Kérjük, jelölje ki a tétel kódot"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Kérjük, jelölje ki a tétel kódot"
 DocType: Student Sibling,Studying in Same Institute,Ugyanabban az intézetben tanul
 DocType: Territory,Territory Manager,Területi igazgató
 DocType: Packed Item,To Warehouse (Optional),Raktárba (választható)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Tétel kód&gt; Tétel Csoport&gt; Márka
 DocType: Payment Entry,Paid Amount (Company Currency),Fizetett összeg (Vállalkozás pénzneme)
 DocType: Purchase Invoice,Additional Discount,További kedvezmény
 DocType: Selling Settings,Selling Settings,Értékesítés beállításai
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Megtekintés a kosárban
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing költségek
 ,Item Shortage Report,Tétel Hiány jelentés
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Súlyt említik, \ nKérlek említsd meg a ""Súly mértékegység"" is"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Anyag igénylést használják ennek a Készlet bejegyzésnek a létrehozásához
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Következő értékcsökkenés dátuma kötelező az új tárgyi eszközhöz
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Külön tanfolyam mindegyik köteg csoportja alapján
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Egy darab a tételből.
 DocType: Fee Category,Fee Category,Díj kategória
@@ -1684,9 +1687,8 @@
 DocType: Course Assessment Criteria,Weightage,Súlyozás
 DocType: Packing Slip,PS-,CSOMJ-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Költséghely szükséges az 'Eredménykimutatás' számlához {2}. Kérjük, állítsa be az alapértelmezett Költséghelyet a Vállalkozáshoz."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Egy vevő csoport létezik azonos névvel, kérjük változtassa meg a Vevő nevét vagy nevezze át a 
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Egy vevő csoport létezik azonos névvel, kérjük változtassa meg a Vevő nevét vagy nevezze át a 
 Vevői csoportot"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Vevő &gt; Vevő csoport&gt; Terület
 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,Olvasás 2
@@ -1703,7 +1705,7 @@
 ,Item-wise Sales Register,Tételenkénti Értékesítés Regisztráció
 DocType: Asset,Gross Purchase Amount,Bruttó Vásárlás összege
 DocType: Asset,Depreciation Method,Értékcsökkentési módszer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ez az adó az Alap árban benne van?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Összes célpont
 DocType: Program Course,Required,Kívánt
@@ -1713,20 +1715,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Összeegyeztetni JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Túl sok oszlop. Exportálja a jelentést, és nyomtassa ki táblázatkezelő program segítségével."
 DocType: Purchase Invoice Item,Batch No,Kötegszám
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nem található árfolyam: {0} - {1} a legfontosabb dátum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Többszöri Vevő rendelések engedélyezése egy Beszerzési megrendelés ellen
 DocType: Student Group Instructor,Student Group Instructor,Diák csoport oktató
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Helyettesítő2 Mobil szám
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Legfontosabb
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Változat
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Legfontosabb
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Változat
 DocType: Naming Series,Set prefix for numbering series on your transactions,Sorozat számozás előtag beállítása a  tranzakciókhoz
 DocType: Employee Attendance Tool,Employees HTML,Alkalmazottak HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"Alapértelmezett anyagjegyzék BOM ({0}) aktívnak kell lennie ehhez a termékhez, vagy a sablonjához"
 DocType: Employee,Leave Encashed?,Távollét beváltása?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Lehetőség tőle mező kitöltése kötelező
 DocType: Email Digest,Annual Expenses,Éves költségek
 DocType: Item,Variants,Változatok
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Beszerzési rendelés létrehozás
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Beszerzési rendelés létrehozás
 DocType: SMS Center,Send To,Küldés Címzettnek
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nincs elég távollét egyenlege ehhez a távollét típushoz {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Lekötött összeg
@@ -1734,17 +1735,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Vevői tétel cikkszáma
 DocType: Stock Reconciliation,Stock Reconciliation,Készlet egyeztetés
 DocType: Territory,Territory Name,Terület neve
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,"Munkavégzés raktárra van szükség, beküldés előtt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,"Munkavégzés raktárra van szükség, beküldés előtt"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kérelmező erre a munkahelyre.
 DocType: Purchase Order Item,Warehouse and Reference,Raktár és Referencia
 DocType: Supplier,Statutory info and other general information about your Supplier,Törvényes info és más általános információk a Beszállítóról
 DocType: Item,Serial Nos and Batches,Sorszámok és kötegek
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Diák csoport erősség
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik egyeztetett {1} bejegyzéssel
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Ellen Naplókönyvelés {0} nem rendelkezik egyeztetett {1} bejegyzéssel
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Értékeléséből
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Ismétlődő sorozatszám lett beírva ehhez a tételhez: {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Egy Szállítási szabály feltételei
-DocType: Grading Structure,Grading Intervals,Osztályozás periódusai
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kérlek lépj be
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nem lehet túlszámlázni a tételt: {0} ebben a sorban: {1} több mint {2}. Ahhoz, hogy a túlszámlázhassa, állítsa be a vásárlás beállításoknál"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Kérjük, adja meg a szűrési feltételt a tétel vagy  Raktár alapján"
@@ -1756,17 +1756,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,ANYGJZ {0} be kell nyújtani
 DocType: Authorization Control,Authorization Control,Jóváhagyás vezérlés
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Sor # {0}: Elutasított Raktár kötelező az elutasított elemhez: {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Fizetés
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Megrendelései kezelése
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Fizetés
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Megrendelései kezelése
 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ő erre a tételre {1} erre a Vevői rendelésre {2}
 DocType: Employee,Salutation,Megszólítás
 DocType: Course,Course Abbreviation,Tanfolyam rövidítés
 DocType: Student Leave Application,Student Leave Application,Diák távollét alkalmazás
 DocType: Item,Will also apply for variants,Változatokra is alkalmazni fogja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Vagyoneszköz nem törölhető, mivel ez már {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Alkalmazott {0} félműszakos ekkor {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Teljes munkaidő nem lehet nagyobb, mint a max munkaidő {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Tovább
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Csomag tételek az eladás idején.
 DocType: Quotation Item,Actual Qty,Aktuális menny.
 DocType: Sales Invoice Item,References,Referenciák
@@ -1776,7 +1777,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Ismétlődő tételeket adott meg. Kérjük orvosolja, és próbálja újra."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Társult
 DocType: Asset Movement,Asset Movement,Vagyoneszköz mozgás
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,új Kosár
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,új Kosár
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Tétel: {0} nem sorbarendezett tétel
 DocType: SMS Center,Create Receiver List,Címzettlista létrehozása
 DocType: Vehicle,Wheels,Kerekek
@@ -1808,9 +1809,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Kikapcsolja az idő napló létrehozását a gyártási utasításokon. Műveleteket nem lehet nyomon követni a Gyártási rendeléseken
 DocType: Student,Student Mobile Number,Tanuló mobil szám
 DocType: Item,Has Variants,Vannak változatai
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Már választott ki elemeket innen {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Havi Felbontás neve
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Kötegazonosító kötelező
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Kötegazonosító kötelező
 DocType: Sales Person,Parent Sales Person,Szülő Értékesítő
 DocType: Purchase Invoice,Recurring Invoice,Ismétlődő számla
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projektek irányítása
@@ -1818,11 +1819,11 @@
 DocType: Budget,Fiscal Year,Pénzügyi év
 DocType: Vehicle Log,Fuel Price,Üzemanyag ár
 DocType: Budget,Budget,Költségkeret
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,"Befektetett fix eszközöknek, nem készletezhető elemeknek kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,"Befektetett fix eszközöknek, nem készletezhető elemeknek kell lennie."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Költségvetést nem lehet ehhez rendelni: {0}, mivel ez nem egy bevétel vagy kiadás főkönyvi számla"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Elért
 DocType: Student Admission,Application Form Route,Jelentkezési mód
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Terület / Vevő
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Terület / Vevő
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,pl. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Távollét típus {0} nem lehet kiosztani, mivel az egy fizetés nélküli távollét"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Sor {0}: Elkülönített összeg: {1} kisebbnek vagy egyenlőnek kell lennie a számlázandó kintlévő negatív összegnél: {2}
@@ -1842,14 +1843,14 @@
 ,Serial No Status,Széria sz. állapota
 DocType: Payment Entry Reference,Outstanding,Fennálló kinntlévőség
 ,Daily Timesheet Summary,Napi munkaidő jelenléti ív összefoglalója
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: beállítása {1} periodicitás, különbség a, és a mai napig \ nagyobbnak kell lennie, vagy egyenlő, mint {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ennek alapja az állomány mozgása. Lásd {0} részletekért
 DocType: Pricing Rule,Selling,Értékesítés
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellenéből {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Összeg: {0} {1} levonásra ellenéből {2}
 DocType: Employee,Salary Information,Bérinformáció
 DocType: Sales Person,Name and Employee ID,Név és Alkalmazotti azonosító ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A határidő nem lehet a rögzítés dátuma előtti
 DocType: Website Item Group,Website Item Group,Weboldal tétel Csoport
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Vámok és adók
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Kérjük, adjon meg Hivatkozási dátumot"
@@ -1861,14 +1862,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Nem lehet hivatkozni nagyobb vagy egyenlő sor számra, mint az aktuális sor szám erre a terehelés típusra"
 DocType: Asset,Sold,Eladott
 ,Item-wise Purchase History,Tételenkénti Beszerzési előzmények
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a 'Ütemterv létrehozás', hogy hozzáfűzze a Széria számot ehhez a tételhez: {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Kérjük, kattintson a 'Ütemterv létrehozás', hogy hozzáfűzze a Széria számot ehhez a tételhez: {0}"
 DocType: Account,Frozen,Zárolt
 ,Open Production Orders,Nyitott gyártási rendelések
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Bázis összeg (Vállalat pénzneme)
 DocType: Payment Reconciliation Payment,Reference Row,Referencia sor
 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 +70,Delete all the Transactions for this Company,Törölje az ehhez a vállalathoz tartozó összes tranzakciót
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Törölje az ehhez a vállalathoz tartozó összes tranzakció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,"Sor # {0}: Művelet: {1} nem fejeződik be ennyi: {2} Mennyiség késztermékhez ebben a  gyártási rendelésben # {3}. Kérjük, frissítse a művelet állapotot az Idő Naplókon keresztül"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Befektetések
 DocType: Issue,Resolution Details,Megoldás részletei
@@ -1900,13 +1901,13 @@
 DocType: Discussion,Discussion,Megbeszélés
 DocType: Payment Entry,Transaction ID,Tranzakció azonosítója
 DocType: Employee,Resignation Letter Date,Lemondását levélben dátuma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább szűrhetők a mennyiség alapján.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Árazási szabályok tovább szűrhetők a mennyiség alapján.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Állítsd be a Csatlakozás dátumát ehhez a munkavállalóhoz {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Összesen számlázási összeg ((Idő nyilvántartó szerint)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Törzsvásárlói árbevétele
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'Kiadás jóváhagyó' beosztással kell rendelkeznie
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'Kiadás jóváhagyó' beosztással kell rendelkeznie
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Válasszon Anyagj és Mennyiséget a Termeléshez
 DocType: Asset,Depreciation Schedule,Értékcsökkentési leírás ütemezése
 DocType: Bank Reconciliation Detail,Against Account,Ellen számla
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Félnapos időpontja között kell lennie Dátum és a mai napig
@@ -1920,16 +1921,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},"Kérjük, állítsa be a 'Eszköz értékcsökkenés Költséghely' ehhez a Vállalkozáshoz: {0}"
 ,Maintenance Schedules,Karbantartási ütemezések
 DocType: Task,Actual End Date (via Time Sheet),Tényleges befejezés dátuma (Idő nyilvántartó szerint)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Összeg: {0} {1} ellenéből {2} {3}
 ,Quotation Trends,Árajánlatok alakulása
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Tétel Csoport nem említett a tétel törzsadatban erre a tételre: {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Tartozás megterhelés számlának bevételi számlának kell lennie
 DocType: Shipping Rule Condition,Shipping Amount,Szállítandó mennyiség
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Függőben lévő összeg
 DocType: Purchase Invoice Item,Conversion Factor,Konverziós tényező
 DocType: Purchase Order,Delivered,Kiszállítva
 ,Vehicle Expenses,Jármű költségek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
+DocType: Serial No,Invoice Details,Számla részletei
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Várható érték a hasznos élettartam után nagyobbnak kell lennie, vagy egyenlő, mint {0}"
 DocType: Purchase Receipt,Vehicle Number,Jármű száma
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Az időpont, amikor az ismétlődő számlát meg fogják állítani"
 DocType: Employee Loan,Loan Amount,Hitelösszeg
@@ -1947,12 +1949,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,"Munkaidő jelenléti ív, nyilvántartók"
 DocType: HR Settings,HR Settings,Munkaügyi beállítások
 DocType: Salary Slip,net pay info,nettó fizetés információ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Új költségek
 DocType: Purchase Invoice,Additional Discount Amount,További kedvezmény összege
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Sor # {0}: Mennyiség legyen 1, a tétel egy tárgyi eszköz. Használjon külön sort több menny."
 DocType: Leave Block List Allow,Leave Block List Allow,Távollét blokk lista engedélyezése
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Rövidített nem lehet üres vagy szóköz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Csoport Csoporton kívülire
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportok
 DocType: Loan Type,Loan Name,Hitel neve
@@ -1963,6 +1965,7 @@
 ,Customer Acquisition and Loyalty,Vevőszerzés és hűség
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Raktár, ahol a visszautasított tételek készletezését kezeli"
 DocType: Production Order,Skip Material Transfer,Anyagátadás átugrása
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nem található árfolyam erre {0}eddig {1} a kulcs dátum: {2}. Kérjük, hozzon létre egy pénzváltó rekordot manuálisan"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,A pénzügyi év vége
 DocType: POS Profile,Price List,Árlista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} ez most az alapértelmezett Költségvetési Év. Kérjük, frissítse böngészőjét a változtatások életbeléptetéséhez."
@@ -1979,19 +1982,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},A {0} számla érvénytelen. A számla pénzneme legyen {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ME átváltási arányra is szükség van ebben a sorban {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Sor # {0}: Dokumentum típus hivatkozásnak Vevői rendelésnek, Értékesítési számlának, vagy Naplókönyvelésnek kell lennie"
 DocType: Salary Component,Deduction,Levonás
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Sor {0}: Időtől és időre kötelező.
 DocType: Stock Reconciliation Item,Amount Difference,Összeg különbség
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Tétel Ár hozzáadott {0} árjegyzékben {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Kérjük, adja meg Alkalmazotti azonosító ID, ehhez az értékesítőhöz"
 DocType: Territory,Classification of Customers by region,Vevői csoportosítás régiónként
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Eltérés összegének nullának kell lennie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Eltérés összegének nullának kell lennie
 DocType: Project,Gross Margin,Bruttó árkülönbözet
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Kérjük, adjon meg Gyártandő tételt először"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Számított Bankkivonat egyenleg
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,letiltott felhasználó
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Árajánlat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Árajánlat
 DocType: Quotation,QTN-,AJ-
 DocType: Salary Slip,Total Deduction,Összesen levonva
 ,Production Analytics,Termelési  elemzések
@@ -2000,9 +2003,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,"Tétel: {0}, már visszahozták"
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,"** Pénzügyi év ** jelképezi a Költségvetési évet. Minden könyvelési tétel, és más jelentős tranzakciók rögzítése ebben ** Pénzügyi Év **."
 DocType: Opportunity,Customer / Lead Address,Vevő / Érdeklődő címe
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Figyelmeztetés: Érvénytelen SSL tanúsítvány a  {0} mellékleteten
 DocType: Student Admission,Eligibility,Jogosultság
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vezetékek segít abban, hogy az üzleti, add a kapcsolatokat, és több mint a vezet"
 DocType: Production Order Operation,Actual Operation Time,Aktuális üzemidő
 DocType: Authorization Rule,Applicable To (User),Alkalmazandó (Felhasználó)
 DocType: Purchase Taxes and Charges,Deduct,Levonási
@@ -2017,7 +2020,7 @@
 DocType: Guardian,Work Address,Munkahelyi cím
 DocType: Appraisal,Calculate Total Score,Összes pontszám kiszámolása
 DocType: Request for Quotation,Manufacturing Manager,Gyártási menedzser
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Széria sz. {0} még garanciális eddig {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Széria sz. {0} még garanciális eddig {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Osza szét a szállítólevelét csomagokra.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Szállítások
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Számlaegyenleg ({0}) ehhez {1} és a készlet érték ({2}) ehhez a raktárhoz {3} meg kell egyeznie
@@ -2038,10 +2041,10 @@
 DocType: Leave Application,Total Leave Days,Összes távollét napok
 DocType: Email Digest,Note: Email will not be sent to disabled users,Megjegyzés: E-mail nem lesz elküldve a letiltott felhasználóknak
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Költsönhatás mennyisége
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Válasszon Vállalkozást...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Válasszon Vállalkozást...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Hagyja üresen, ha figyelembe veszi az összes szervezeti egységen"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Alkalmazott foglalkoztatás típusa (munkaidős, szerződéses, gyakornok stb)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} kötelező a(z) {1} tételnek
 DocType: Process Payroll,Fortnightly,Kéthetenkénti
 DocType: Currency Exchange,From Currency,Pénznemből
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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ípust és számlaszámot legalább egy sorban"
@@ -2050,14 +2053,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Érték (a cég pénznemében)
 DocType: Student Guardian,Others,Egyéb
 DocType: Payment Entry,Unallocated Amount,A le nem foglalt összeg
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik értéket erre {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Nem találja a megfelelő tétel. Kérjük, válasszon egy másik értéket erre {0}."
 DocType: POS Profile,Taxes and Charges,Adók és költségek
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A termék vagy szolgáltatás, amelyet vásárolt, eladott vagy tartanak raktáron."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nincs több frissítés
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nem lehet kiválasztani az első sorra az 'Előző sor összegére' vagy 'Előző sor Összesen' terhelés típust
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Al tétel nem lehet egy termék csomag. Kérjük, távolítsa el tételt: `{0}' és mentse"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banki ügyletek
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Munkaidő nyilvántartó jelenléti ív hozzáadása
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Munkaidő nyilvántartó jelenléti ív hozzáadása
 DocType: Vehicle Service,Service Item,Szolgáltatás tétel
 DocType: Bank Guarantee,Bank Guarantee,Bankgarancia
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Kérjük, kattintson a 'Ütemterv létrehozás', hogy ütemezzen"
@@ -2081,6 +2084,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Sor # {0}:  {1}  Vagyontárgy már {2}
 DocType: Quotation Item,Stock Balance,Készlet egyenleg
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Vevői rendelés a Fizetéshez
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Kérjük, állítsa elnevezése sorozat {0} a Setup&gt; Beállítások&gt; elnevezése sorozat"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Vezérigazgató(CEO)
 DocType: Expense Claim Detail,Expense Claim Detail,Költség igény részlete
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Kérjük, válassza ki a megfelelő fiókot"
@@ -2105,14 +2109,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Az árak nem jelennek meg, ha Árlista nincs megadva"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Kérjük adjon meg egy országot a házhozszállítás szabályhoz vagy ellenőrizze az Egész világra kiterjedő szállítást
 DocType: Stock Entry,Total Incoming Value,Beérkező össz Érték
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Tartozás megterhelése szükséges
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csapatának."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Tartozás megterhelése szükséges
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Munkaidő jelenléti ív segít nyomon követni az idő, költség és számlázási tevékenységeit a csapatának."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Beszerzési árlista
 DocType: Offer Letter Term,Offer Term,Ajánlat feltételei
 DocType: Quality Inspection,Quality Manager,Minőségbiztosítási vezető
 DocType: Job Applicant,Job Opening,Állásajánlatok
 DocType: Payment Reconciliation,Payment Reconciliation,Fizetés főkönyvi egyeztetése
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Kérjük, válasszon felelős személy nevét"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Kérjük, válasszon felelős személy nevét"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technológia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Összesen Kifizetetlen: {0}
 DocType: BOM Website Operation,BOM Website Operation,Anyagjegyzék honlap művelet
@@ -2139,23 +2143,23 @@
 DocType: Opportunity,Lost Reason,Elvesztés oka
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Új cím
 DocType: Quality Inspection,Sample Size,Minta mérete
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Összes tétel már kiszámlázott
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Kérjük, adjon meg dokumentum átvételt"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Összes tétel már kiszámlázott
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Kérem adjon meg egy érvényes 'Eset számig'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"További költséghelyek hozhatók létre a csoportok alatt, de bejegyzéseket lehet tenni a csoporttal nem rendelkezőkre is"
 DocType: Project,External,Külső
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Felhasználók és engedélyek
 DocType: Vehicle Log,VLOG.,VIDEÓBLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Gyártási rendelések létrehozva: {0}
 DocType: Branch,Branch,Ágazat
 DocType: Guardian,Mobile Number,Mobil szám
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Nyomtatás és Márkaépítés
 DocType: Bin,Actual Quantity,Tényleges Mennyiség
 DocType: Shipping Rule,example: Next Day Shipping,például: Következő napi szállítás
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Széria sz. {0} nem található
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Széria sz. {0} nem található
 DocType: Scheduling Tool,Student Batch,Tanuló köteg
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vevői
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Tanuló létrehozás
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Tanuló létrehozás
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ön meghívást kapott ennek a projeknek a közreműködéséhez: {0}
 DocType: Leave Block List Date,Block Date,Zárolás dátuma
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Jelentkezzen most
@@ -2178,8 +2182,9 @@
 DocType: SMS Log,Sent To,Elküldve
 DocType: Payment Request,Make Sales Invoice,Vevői megrendelésre számla létrehozás
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Szoftverek
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Következő megbeszélés dátuma nem lehet a múltban
 DocType: Company,For Reference Only.,Csak tájékoztató jellegűek.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Válasszon köteg sz.
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Érvénytelen {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,BESZSZ-ELLEN-
 DocType: Sales Invoice Advance,Advance Amount,Előleg
@@ -2193,7 +2198,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Eset sz. nem lehet 0
 DocType: Item,Show a slideshow at the top of the page,Mutass egy diavetítést  a lap tetején
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Anyagjegyzékek
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Üzletek
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Üzletek
 DocType: Serial No,Delivery Time,Szállítási idő
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öregedés ezen alapszik
 DocType: Item,End of Life,Felhasználhatósági idő
@@ -2205,12 +2210,12 @@
 DocType: Rename Tool,Rename Tool,Átnevezési eszköz
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Költségek újraszámolása
 DocType: Item Reorder,Item Reorder,Tétel újrarendelés
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Bérkarton megjelenítése
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Anyag Átvitel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Bérkarton megjelenítése
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Anyag Átvitel
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Adja meg a műveletet, a működési költségeket, és adjon meg egy egyedi műveletet a műveletekhez."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ez a dokumentum túlcsordult ennyivel {0} {1} erre a tételre {4}. Létrehoz egy másik {3}  ugyanazon {2} helyett?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Válasszon váltópénz összeg számlát
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Kérjük, állítsa be az ismétlődést a mentés után"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Válasszon váltópénz összeg számlát
 DocType: Purchase Invoice,Price List Currency,Árlista pénzneme
 DocType: Naming Series,User must always select,Felhasználónak mindig választani kell
 DocType: Stock Settings,Allow Negative Stock,Negatív készlet engedélyezése
@@ -2221,7 +2226,7 @@
 DocType: Budget Account,Budget Account,Költségvetési elszámolási számla
 DocType: Quality Inspection,Verified By,Ellenőrizte
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nem lehet megváltoztatni a vállalkozás alapértelmezett pénznemét, mert már léteznek tranzakciók. Tranzakciókat törölni kell az alapértelmezett pénznem megváltoztatásához."
-DocType: Grade Interval,Grade Description,Osztály Leírás
+DocType: Grading Scale Interval,Grade Description,Osztály Leírás
 DocType: Stock Entry,Purchase Receipt No,Beszerzési megrendelés nyugta sz.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Foglaló pénz
 DocType: Process Payroll,Create Salary Slip,Bérpapír létrehozása
@@ -2259,7 +2264,7 @@
 DocType: Upload Attendance,Attendance To Date,Részvétel befejezés dátuma
 DocType: Warranty Claim,Raised By,Felvetette
 DocType: Payment Gateway Account,Payment Account,Fizetési számla
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Kérjük, adja meg a vállalkozást a folytatáshoz"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettó Vevői számla tartozások változása
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenzációs Ki
 DocType: Offer Letter,Accepted,Elfogadva
@@ -2268,12 +2273,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Kérjük, győződjön meg róla, hogy valóban törölni szeretné az összes tranzakció ennél a vállalatnál. Az Ön törzsadati megmaradnak. Ez a művelet nem vonható vissza."
 DocType: Room,Room Number,Szoba szám
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Érvénytelen hivatkozás {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a ({2}) tervezett mennyiség a {3} gyártási rendelésben"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nem lehet nagyobb, mint a ({2}) tervezett mennyiség a {3} gyártási rendelésben"
 DocType: Shipping Rule,Shipping Rule Label,Szállítási szabály címkéi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Felhasználói fórum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Nyersanyagok nem lehet üres.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Gyors Naplókönyvelés
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nem sikerült frissíteni a készletet, számla tartalmaz közvetlen szállítási elemet."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Gyors Naplókönyvelés
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Nem tudod megváltoztatni az árat, ha az említett ANYGJZ összefügg már egy tétellel"
 DocType: Employee,Previous Work Experience,Korábbi szakmai tapasztalat
 DocType: Stock Entry,For Quantity,Mennyiséghez
@@ -2286,7 +2291,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Általános szerződési feltételek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Az intézmény neve amelyre ezt a rendszert beállítja.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Könyvelési tételt zárolt eddig a dátumig, senkinek nincs joga végrehajtani / módosítani a bejegyzést kivéve az alább meghatározott beosztásokkal rendelkezőket."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, a  karbantartási ütemterv létrehozása előtt"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Kérjük, mentse a dokumentumot, a  karbantartási ütemterv létrehozása előtt"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekt téma állapota
 DocType: UOM,Check this to disallow fractions. (for Nos),"Jelölje be ezt, hogy ne engedélyezze a törtrészt. (a darab számokhoz)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,A következő gyártási megrendelések jöttek létre:
@@ -2313,7 +2318,7 @@
 ,Employees working on a holiday,Alkalmazott ünnepen is dolgozik
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Jelenlévőnek jelöl
 DocType: Project,% Complete Method,% befejező módszer
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi a szállítási határidőnél erre a széria sz: {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Karbantartás kezdési időpontja nem lehet korábbi a szállítási határidőnél erre a széria sz: {0}
 DocType: Production Order,Actual End Date,Tényleges befejezési dátum
 DocType: BOM,Operating Cost (Company Currency),Üzemeltetési költség (Vállaklozás pénzneme)
 DocType: Purchase Invoice,PINV-,BESZSZ-
@@ -2330,7 +2335,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Fizetés nélküli távollét nem egyezik meg a jóváhagyott távolléti igény bejegyzésekkel
 DocType: Campaign,Campaign-.####,Kampány -.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Következő lépések
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Kérjük szállítsa be a tételeket a lehető legjobb árakon
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Kérjük szállítsa be a tételeket a lehető legjobb árakon
 DocType: Selling Settings,Auto close Opportunity after 15 days,Automatikus lezárása az ügyeknek 15 nap után
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Befejező év
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Áraj / Lehet %
@@ -2367,7 +2372,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Szüks Mennyiség
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Díj rekordok létrehozva - {0}
 DocType: Asset Category Account,Asset Category Account,Vagyoneszköz kategória főkönyvi számla
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet több mint ennyit {0} gyártani a tételből, mint amennyi a Vevői rendelési mennyiség {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Nem lehet több mint ennyit {0} gyártani a tételből, mint amennyi a Vevői rendelési mennyiség {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,"Készlet bejegyzés: {0} nem nyújtják be,"
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Készpénz számla
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Következő kapcsolat evvel nem lehet ugyanaz, mint az érdeklődő e-mail címe"
@@ -2389,7 +2394,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Végső dátum nem szerepel
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Gyártás
 DocType: Guardian,Occupation,Foglalkozása
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük beállítási Alkalmazott névadási rendszerben Emberi Erőforrás&gt; HR beállítások
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: kezdő dátumot kell lennie a befejezés dátuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Összesen(db)
 DocType: Sales Invoice,This Document,Ez a dokumentum
 DocType: Installation Note Item,Installed Qty,Telepített Mennyiség
@@ -2405,14 +2411,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Probléma jelentése
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Közműben
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 felett
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"Sor # {0}: Naplókönyvelés {1} nem rendelkezik  {2} számlával, vagy már összeegyeztetett egy másik utalvánnyal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"Sor # {0}: Naplókönyvelés {1} nem rendelkezik  {2} számlával, vagy már összeegyeztetett egy másik utalvánnyal"
 DocType: Buying Settings,Default Buying Price List,Alapértelmezett Vásárlási árjegyzék
 DocType: Process Payroll,Salary Slip Based on Timesheet,Bérpapirok a munkaidő jelenléti ív alapján
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Nincs a fenti kritériumnak megfelelő alkalmazottja VAGY Bérpapírt már létrehozta
 DocType: Notification Control,Sales Order Message,Vevői rendelés üzenet
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Alapértelmezett értékek, mint a vállalkozás, pénznem, folyó pénzügyi év, stb. beállítása."
 DocType: Payment Entry,Payment Type,Fizetési mód
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Kérjük, válasszon egy Köteget ehhez a tételhez {0}. Nem található egyedülállü köteg, amely megfelel ennek a követelménynek"
 DocType: Process Payroll,Select Employees,Válassza ki az Alkalmazottakat
 DocType: Opportunity,Potential Sales Deal,Potenciális értékesítési üzlet
 DocType: Payment Entry,Cheque/Reference Date,Csekk/Hivatkozási dátum
@@ -2429,7 +2435,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS profil {0} már létrehozott ennek a vállalkozásnak {1}
 DocType: Purchase Order,Ref SQ,Hiv. BR
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Cserélje Elem / BOM minden Darabjegyzékeket
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Nyugta dokumentumot be kell nyújtani
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Nyugta dokumentumot be kell nyújtani
 DocType: Purchase Invoice Item,Received Qty,Beérkezett Mennyiség
 DocType: Stock Entry Detail,Serial No / Batch,Széria sz. / Köteg
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nem fizetett és le nem szállított
@@ -2438,11 +2444,11 @@
 DocType: Delivery Note,DN-RET-,SZL-ELLEN-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nincsenek idő nyilvántartások
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Távollét típusa {0} nem továbbítható jövőbe
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem lett létrehozva  összes tételre. Kérjük, kattintson erre: ""Ütemezést létrehozás"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Karbantartási ütemterv nem lett létrehozva  összes tételre. Kérjük, kattintson erre: ""Ütemezést létrehozás"""
 ,To Produce,Termelni
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bérszámfejtés
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",A {1} -nek a {0} sorbában. A Tétel értékébe a {2} beillesztéséhez a {3} sorokat is hozzá kell adni
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Felhasználó létrehozás
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Felhasználó létrehozás
 DocType: Packing Slip,Identification of the package for the delivery (for print),Csomag azonosítása a szállításhoz (nyomtatáshoz)
 DocType: Bin,Reserved Quantity,Mennyiség fenntartva
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Kérem adjon meg egy érvényes e-mail címet
@@ -2454,15 +2460,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Letiltott sablon nem lehet alapértelmezett sablon
 DocType: Account,Income Account,Jövedelem számla
 DocType: Payment Request,Amount in customer's currency,Összeg ügyfél valutájában
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Szállítás
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Szállítás
 DocType: Stock Reconciliation Item,Current Qty,Jelenlegi Mennyiség
 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
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Előző
 DocType: Appraisal Goal,Key Responsibility Area,Felelősségi terület
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Tanulók kötegei, segítenek nyomon követni a részvételt, értékeléseket és díjakat a hallgatókhoz"
 DocType: Payment Entry,Total Allocated Amount,Lefoglalt teljes összeg
 DocType: Item Reorder,Material Request Type,Anyagigénylés típusa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Naplókönyvelés fizetések származó {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","HelyiRaktár tele van, nem mentettem"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","HelyiRaktár tele van, nem mentettem"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Sor {0}: UOM átváltási arányra is kötelező
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Hiv.
 DocType: Budget,Cost Center,Költséghely
@@ -2472,16 +2479,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ügyfél adóazonosító elrejtése az Értékesítési tranzakciókból
 DocType: Upload Attendance,Upload HTML,HTML feltöltése
 DocType: Employee,Relieving Date,Tehermentesítő dátuma
-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.","Árképzési szabály azért készül, hogy az felülírja az árjegyzéket / kedvezmény százalékos meghatározását, néhány feltétel alapján."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Árképzési szabály azért készül, hogy az felülírja az árjegyzéket / kedvezmény százalékos meghatározását, néhány feltétel alapján."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Raktárat csak a Készlet bejegyzéssel / Szállítólevéllel / Beszerzési nyugtán keresztül lehet megváltoztatni
 DocType: Employee Education,Class / Percentage,Osztály / Százalékos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Marketing és Értékesítés vezetője
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Jövedelemadó
-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.","Ha a kiválasztott árképzési szabály az 'Ár' -hoz készül, az felülírja az árlistát. Árképzési szabály ára a végleges ár, így további kedvezményt nem képes alkalmazni. Ezért a vevői rendelés, beszerzési megrendelés, stb. tranzakcióknál, betöltésre kerül az ""Érték"" mezőbe az ""Árlista érték"" mező helyett."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ha a kiválasztott árképzési szabály az 'Ár' -hoz készül, az felülírja az árlistát. Árképzési szabály ára a végleges ár, így további kedvezményt nem képes alkalmazni. Ezért a vevői rendelés, beszerzési megrendelés, stb. tranzakcióknál, betöltésre kerül az ""Érték"" mezőbe az ""Árlista érték"" mező helyett."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Ipari típusonkénti Érdeklődés nyomonkövetése.
 DocType: Item Supplier,Item Supplier,Tétel Beszállító
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Kérjük, adja meg a tételkódot a köteg szám megadásához"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Kérjük, válasszon értéket {0} ehhez az árajánlathoz {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Összes cím.
 DocType: Company,Stock Settings,Készlet beállítások
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2491,6 +2498,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',E-mailt küld az eseményről a 'Nyitott' státuszú alkalmazottaknak
 DocType: Task,Depends on Tasks,Függ a Feladatoktól
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Vevői csoport fa. kezelése.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Mellékletek megjelenítésénak lehetővé tétele kosár bekapcsolása nélkül
 DocType: Supplier Quotation,SQTN-,BESZÁRAJ-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Új költséghely neve
 DocType: Leave Control Panel,Leave Control Panel,Távollét vezérlőpult
@@ -2503,11 +2511,10 @@
 DocType: Sales Invoice,Debit To,Tartozás megterhelése
 DocType: Delivery Note,Required only for sample item.,Szükséges csak a minta elemet.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tényleges Mennyiség a tranzakció után
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Beszállító &gt; Beszállító típus
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nem található bérpapít {0} és {1} közt
 ,Pending SO Items For Purchase Request,Függőben lévő VR tételek erre a vásárolható rendelésre
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tanuló Felvételi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} le van tiltva
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} le van tiltva
 DocType: Supplier,Billing Currency,Számlázási Árfolyam
 DocType: Sales Invoice,SINV-RET-,ÉSZLA-ELLEN-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Nagy
@@ -2524,9 +2531,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Kezdőlap Ajánlott termék
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Az Értékelési Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Új raktár neve
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Összesen {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Összesen {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Terület
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Kérjük említse meg a szükséges résztvevők számát
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Kérjük említse meg a szükséges résztvevők számát
 DocType: Stock Settings,Default Valuation Method,Alapértelmezett készletérték számítási mód
 DocType: Vehicle Log,Fuel Qty,Üzemanyag menny.
 DocType: Production Order Operation,Planned Start Time,Tervezett kezdési idő
@@ -2542,7 +2549,7 @@
 DocType: Price List,Price List Master,Árlista törzsadat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Minden értékesítési tranzakció címkézhető több ** Értékesítő személy** felé, így beállíthat és követhet célokat."
 ,S.O. No.,VR sz.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Kérjük, hozzon létre Vevőt ebből az Érdeklődésből: {0}"
 DocType: Price List,Applicable for Countries,Alkalmazandó ezekhez az Országokhoz
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Csak ""Jóváhagyott"" és ""Elutasított"" állapottal rendelkező távollét igényeket lehet benyújtani"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Diák csoport neve kötelező sorban {0}
@@ -2573,7 +2580,7 @@
 DocType: Project,Copied From,Innen másolt
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Név hiba: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Hiány
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nincs összekapcsolva ezekkel {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nincs összekapcsolva ezekkel {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,A {0} alkalmazott már megjelölt a részvételin
 DocType: Packing Slip,If more than one package of the same type (for print),Ha egynél több csomag azonos típusból (nyomtatáshoz)
 ,Salary Register,Bér regisztráció
@@ -2592,7 +2599,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Kosár használja
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Érték : {0} erre a tulajdonságra: {1} nem létezik a listán az érvényes Jellemző érték jogcímre erre a tételre: {2}
 DocType: BOM Item,Scrap %,Hulladék %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Díjak arányosan kerülnek kiosztásra a tétel mennyiség vagy összegei alapján, a kiválasztása szerint"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Díjak arányosan kerülnek kiosztásra a tétel mennyiség vagy összegei alapján, a kiválasztása szerint"
 DocType: Maintenance Visit,Purposes,Célok
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Legalább egy tételt kell beírni a negatív mennyiséggel a visszatérő dokumentumba
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Működés {0} hosszabb, mint bármely rendelkezésre álló munkaidő a munkaállomáson {1}, bontsa le a műveletet  több műveletre"
@@ -2613,16 +2620,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Terület fa kezelése.
 DocType: Journal Entry Account,Sales Invoice,Értékesítési számla
 DocType: Journal Entry Account,Party Balance,Ügyfél egyenlege
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Kérjük, válassza az Alkalmazzon kedvezményt ezen"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Kérjük, válassza az Alkalmazzon kedvezményt ezen"
 DocType: Company,Default Receivable Account,Alapértelmezett Bevételi számla
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Készítsen Bank bejegyzést a teljes bért fizetésre a fent kiválasztott kritériumoknak megfelelően
 DocType: Stock Entry,Material Transfer for Manufacture,Anyag átvitel gyártásához
-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.,Kedvezmény százalékot lehet alkalmazni vagy árlistában vagy az összes árlistában.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kedvezmény százalékot lehet alkalmazni vagy árlistában vagy az összes árlistában.
 DocType: Purchase Invoice,Half-yearly,Fél-évente
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Könyvelési tétel a Készlethez
 DocType: Vehicle Service,Engine Oil,Motorolaj
 DocType: Sales Invoice,Sales Team1,Értékesítő csapat1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,"Tétel: {0}, nem létezik"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,"Tétel: {0}, nem létezik"
 DocType: Sales Invoice,Customer Address,Vevő címe
 DocType: Employee Loan,Loan Details,Hitel részletei
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,"Sor {0}: Befejezve Mennyiség nagyobbnak kell lennie, mint nulla."
@@ -2630,24 +2637,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO (EBEK)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Sor # {0}: Nem lehet vissza több mint {1} jogcím {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Ábrázol
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Ábrázol
 DocType: Item Group,Show this slideshow at the top of the page,Mutassa ezt a diavetatést a lap tetején
 DocType: BOM,Item UOM,Tétel mennyiségi egysége
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Adó összege a kedvezmény összege után (Vállalkozás pénzneme)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Cél raktár kötelező ebben a sorban {0}
 DocType: Cheque Print Template,Primary Settings,Elsődleges beállítások
 DocType: Purchase Invoice,Select Supplier Address,Válasszon Beszállító címet
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Alkalmazottak hozzáadása
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Alkalmazottak hozzáadása
 DocType: Purchase Invoice Item,Quality Inspection,Minőségvizsgálat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra kicsi
 DocType: Company,Standard Template,Alapértelmezett sablon
 DocType: Training Event,Theory,Elmélet
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,"Figyelmeztetés: Anyag Igénylés mennyisége kevesebb, mint Minimális rendelhető menny"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A {0} számla zárolt
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Jogi alany / leányvállalat a Szervezethez tartozó külön számlatükörrel
 DocType: Payment Request,Mute Email,E-mail elnémítás
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Élelmiszerek, italok és dohány"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Fizetni a csak még ki nem szálázott ellenében tud: {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Fizetni a csak még ki nem szálázott ellenében tud: {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Jutalék mértéke nem lehet nagyobb, mint a 100"
 DocType: Stock Entry,Subcontract,Alvállalkozói
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Kérjük, adja be: {0} először"
@@ -2686,7 +2693,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Raktárak meglévő ügylettekkel nem konvertálhatóak csoporttá.
 DocType: Assessment Result Tool,Result HTML,Eredmény HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Lejárat dátuma
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Add diákok
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Add diákok
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Kérjük, válassza ki a {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2728,7 +2735,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Összeg
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Adja meg a kampányt nevét, ha az árajánlat kérés forrása kampány"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Hírlevél publikálók
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Válasszon pénzügyi évet
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Válasszon pénzügyi évet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Újra rendelési szint
 DocType: Company,Chart Of Accounts Template,Számlatükör sablonok
 DocType: Attendance,Attendance Date,Részvétel dátuma
@@ -2743,14 +2750,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Ismétlődő bejegyzés
 DocType: Program Enrollment Tool,Get Students,Diákok lekérdezése
 DocType: Serial No,Under Warranty,Garanciaidőn belül
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Hiba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Hiba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"A szavakkal mező lesz látható, miután mentette a Vevői rendelést."
 ,Employee Birthday,Alkalmazott születésnapja
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Tanuló köteg nyilvántartó eszköz
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Keresztbe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Egy tudományos kifejezés ezzel a 'Tanév ' {0} és a 'Félév neve' {1} már létezik. Kérjük, módosítsa ezeket a bejegyzéseket, és próbálja újra."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Mivel már vannak tranzakciók ehhez az  elemhez: {0}, ezért nem tudja megváltoztatni ennek az értékét {1}"
 DocType: UOM,Must be Whole Number,Egész számnak kell lennie
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Új távollét lefoglalása (napokban)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,A {0} Széria sz. nem létezik
@@ -2770,7 +2777,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% anyag tételek számlázva ehhez a Vevői Rendeléhez
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Nevezési határidő Időszaka
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Költséghelyet meglévő tranzakciókkal nem lehet átalakítani csoporttá
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Összeg: {0} {1} {2} {3}
 DocType: Account,Depreciation,Értékcsökkentés
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Beszállító (k)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alkalmazott nyilvántartó Eszköz
@@ -2793,7 +2800,7 @@
 DocType: Supplier,Last Day of the Next Month,Utolsó nap a következő hónapban
 DocType: Support Settings,Auto close Issue after 7 days,Automatikus lezárása az ügyeknek 7 nap után
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Távollétet nem lehet kiosztani előbb mint {0}, mivel a távollét egyenleg már továbbított ehhez a jövőbeni távollét kiosztás rekordhoz {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Megjegyzés: Esedékesség / Referencia dátum túllépése engedélyezett az ügyfél hitelezésre {0} nap(ok)al
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Tanuló kérelmező
 DocType: Asset Category Account,Accumulated Depreciation Account,Halmozott értékcsökkenés számla
 DocType: Stock Settings,Freeze Stock Entries,Készlet zárolás
@@ -2804,7 +2811,7 @@
 ,Stock Analytics,Készlet analítika
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Műveletek nem maradhatnak üresen
 DocType: Maintenance Visit Purpose,Against Document Detail No,Ellen Dokument Részlet sz.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Ügyfél típus kötelező
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Ügyfél típus kötelező
 DocType: Quality Inspection,Outgoing,Kimenő
 DocType: Material Request,Requested For,Igényelt
 DocType: Quotation Item,Against Doctype,Ellen Doctype
@@ -2821,10 +2828,10 @@
 DocType: Asset,Item Code,Tételkód
 DocType: Production Planning Tool,Create Production Orders,Gyártásrendelés létrehozása
 DocType: Serial No,Warranty / AMC Details,Garancia és éves karbantartási szerződés részletei
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Válassza a diákokat kézzel az Aktivitás alapú csoporthoz
 DocType: Journal Entry,User Remark,Felhasználói megjegyzés
 DocType: Lead,Market Segment,Piaci rész
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},"Fizetett összeg nem lehet nagyobb, mint a teljes negatív kinntlévő összeg {0}"
 DocType: Employee Internal Work History,Employee Internal Work History,Alkalmazott cégen belüli mozgása
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zárás (Dr)
 DocType: Cheque Print Template,Cheque Size,Csekk Méret
@@ -2839,7 +2846,7 @@
 DocType: Production Planning Tool,Create Material Requests,Anyagigénylés létrehozása
 DocType: Employee Education,School/University,Iskola / Egyetem
 DocType: Payment Request,Reference Details,Hivatkozó Részletek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Várható érték a hasznos élettartam után kevesebbnek kell lennie, mint a bruttó beszerzés összege"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Elérhető mennyiség a raktárban
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Számlázott összeg
 DocType: Asset,Double Declining Balance,Progresszív leírási modell egyenleg
@@ -2860,20 +2867,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Különbség számlának Eszköz / Kötelezettség típusú számlának kell lennie, mivel ez a Készlet egyeztetés egy kezdő könyvelési tétel"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Folyósított összeg nem lehet nagyobb, a kölcsön összegénél {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Beszerzési megrendelés száma szükséges ehhez az elemhez {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Gyártási rendelés nincs létrehozva
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Gyártási rendelés nincs létrehozva
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"a ""Dátumtól"" dátumnál későbbinek kell lennie a ""Dátumig"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"Nem lehet megváltoztatni az állapotát, mivel a hallgató: {0} hozzá van fűzve ehhez az alkalmazáshoz: {1}"
 DocType: Asset,Fully Depreciated,Teljesen amortizálódott
 ,Stock Projected Qty,Készlet kivetített Mennyiség
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Vevő {0} nem tartozik ehhez a projekthez {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Jelzett Nézőszám HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Árajánlatok mind javaslatok, a vásárlói részére kiküldött ajánlatok"
 DocType: Sales Order,Customer's Purchase Order,Vevői  Beszerzési megrendelés
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Széria sz. és Köteg
 DocType: Warranty Claim,From Company,Cégtől
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Értékelési kritériumok pontszám összegének ennyinek kell lennie: {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Érték vagy menny
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Kérjük, állítsa be a könyvelt amortizációk számát"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Érték vagy menny
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Gyártási rendeléseket nem lehet megemelni erre:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Perc
 DocType: Purchase Invoice,Purchase Taxes and Charges,Beszerzési megrendelés Adók és díjak
@@ -2885,7 +2892,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Összes Raktár
 DocType: Sales Partner,Retailer,Kiskereskedő
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Követelés főkönyvi számlának Mérlegszámlának kell lennie
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Összes beszállító típus
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Összes beszállító típus
 DocType: Global Defaults,Disable In Words,Szavakkal mező elrejtése
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Tétel kód megadása kötelező, mert Tétel nincs automatikusan számozva"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Árajánlat {0} nem ilyen típusú {1}
@@ -2894,6 +2901,7 @@
 DocType: Production Order,PRO-,GYR-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Folyószámlahitel főkönyvi számla
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Bérpapír létrehozás
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Row # {0}: elkülönített összeg nem lehet nagyobb, mint fennálló összeg."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Keressen anyagjegyzéket
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Záloghitel
 DocType: Purchase Invoice,Edit Posting Date and Time,Rögzítési dátum és idő szerkesztése
@@ -2933,7 +2941,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nem engedélyezett a készlet tranzakciók frissítése, mely régebbi, mint {0}"
 DocType: Purchase Invoice Item,PR Detail,FIZKER részlete
 DocType: Sales Order,Fully Billed,Teljesen számlázott
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Kérjük, állítsa be az alapértelmezett fizetendő számlát erre az alkalmazottra: {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kézben lévő Készpénz
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Szállítási raktár szükséges erre az tételre: {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),A csomag bruttó tömege. Általában a nettó tömeg + csomagolóanyag súlya. (nyomtatáshoz)
@@ -2943,7 +2950,7 @@
 DocType: Student Group,Group Based On,Ezen alapuló csoport
 DocType: Journal Entry,Bill Date,Számla kelte
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Szolgáltatás tétel, Típus, gyakorisága és ráfordítások összege kötelező"
-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ály is van kiemelve, akkor a következő belső prioritások kerülnek alkalmazásra:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Még ha több árképzési szabály is van kiemelve, akkor a következő belső prioritások kerülnek alkalmazásra:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Tényleg e szeretné nyújtani az összes Bérpapírt ettől {0} eddig {1}
 DocType: Cheque Print Template,Cheque Height,Csekk magasság
 DocType: Supplier,Supplier Details,Beszállítói adatok
@@ -2955,7 +2962,7 @@
 DocType: Vehicle Log,Invoice Ref,Számla hiv.
 DocType: Purchase Order,Recurring Order,Ismétlődő rendelés
 DocType: Company,Default Income Account,Alapértelmezett bejövő számla
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Vevő csoport / Vevő
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Vevő csoport / Vevő
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Lezáratlan pénzügyi évek nyereség / veszteség (Követelés)
 DocType: Sales Invoice,Time Sheets,Idő nyilvántartások
 DocType: Payment Gateway Account,Default Payment Request Message,Alapértelmezett fizetendő kérelem Üzenet
@@ -2975,10 +2982,10 @@
 DocType: Notification Control,Quotation Message,Árajánlat üzenet
 DocType: Employee Loan,Employee Loan Application,Alkalmazotti hitelkérelem
 DocType: Issue,Opening Date,Nyitás dátuma
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Részvétel jelölése sikeres.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Részvétel jelölése sikeres.
 DocType: Journal Entry,Remark,Megjegyzés
 DocType: Purchase Receipt Item,Rate and Amount,Érték és mennyiség
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Számla típusa ehhez: {0} ennek kell lennie: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Számla típusa ehhez: {0} ennek kell lennie: {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Távollétek és ünnepek
 DocType: School Settings,Current Academic Term,Aktuális Akadémiai szemeszter
 DocType: Sales Order,Not Billed,Nem számlázott
@@ -3000,7 +3007,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Diákcsoport
 DocType: Shopping Cart Settings,Quotation Series,Árajánlat szériák
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Egy tétel létezik azonos névvel ({0}), kérjük, változtassa meg a tétel csoport nevét, vagy nevezze át a tételt"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Kérjük, válasszon vevőt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Kérjük, válasszon vevőt"
 DocType: C-Form,I,én
 DocType: Company,Asset Depreciation Cost Center,Vagyoneszköz Értékcsökkenés Költséghely
 DocType: Sales Order Item,Sales Order Date,Vevői rendelés dátuma
@@ -3019,20 +3026,20 @@
 DocType: Vehicle,Insurance Details,Biztosítási részletek
 DocType: Account,Payable,Kifizetendő
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Kérjük, írja be a törlesztési időszakokat"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Követelések ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Követelések ({0})
 DocType: Pricing Rule,Margin,Árkülönbözet
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Új Vevők
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttó nyereség %
 DocType: Appraisal Goal,Weightage (%),Súlyozás (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Végső dátum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttó vásárlási összeg kötelező
 DocType: Lead,Address Desc,Cím leírása
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Ügyfél kötelező
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Ügyfél kötelező
 DocType: Journal Entry,JV-,KT-
 DocType: Topic,Topic Name,Téma neve
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Legalább az Értékesítést vagy Beszerzést választani kell
-DocType: Grading Structure,Grade Intervals,Évfolyam periódusai
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Válassza ki a vállalkozása fajtáját.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: ismétlődő bevitelt Referenciák {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ahol a gyártási műveleteket végzik.
 DocType: Asset Movement,Source Warehouse,Forrás raktár
 DocType: Installation Note,Installation Date,Telepítés dátuma
@@ -3069,7 +3076,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Levél fejlécek a nyomtatási sablonokhoz.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Címek nyomtatási sablonokhoz pl. Pro forma számla.
 DocType: Student Guardian,Student Guardian,Diák felügyelő
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Készletérték típusú költségeket nem lehet megjelölni értékbe beszámíthatónak
 DocType: POS Profile,Update Stock,Készlet frissítése
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Különböző mértékegység a tételekhez, helytelen (Összes) Nettó súly értékhez vezet. Győződjön meg arról, hogy az egyes tételek nettó tömege ugyanabban a mértékegységben van."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Anyagjegyzék Díjszabási ár
@@ -3096,7 +3103,7 @@
 DocType: Company,Exchange Gain / Loss Account,Árfolyamnyereség / veszteség számla
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Alkalmazott és nyilvántartás
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,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 +117,Fill the form and save it,"Töltse ki az űrlapot, és mentse el"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,"Jelentés letöltése, amely tartalmazza az összes nyersanyagot, a legfrissebb Készlet állapottal"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Közösségi Fórum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Tényleges Mennyiség a raktáron
@@ -3111,7 +3118,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Újra rendelendő mennyiség
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Jelenlegi munkalehetőségek
 DocType: Company,Stock Adjustment Account,Készlet igazítás számla
-DocType: Journal Entry,Write Off,Leíró
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Leíró
 DocType: Timesheet Detail,Operation ID,Művelet ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Rendszer felhasználói (belépés) ID. Ha be van állítva, ez lesz az alapértelmezés minden HR űrlaphoz."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Feladó {1}
@@ -3122,26 +3129,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Beszállító szállít a Vevőnek
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) elfogyott
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Következő Dátumnak nagyobbnak kell lennie, mint a Beküldés dátuma"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mutassa az adókedvezmény-felbontást
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mutassa az adókedvezmény-felbontást
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Határidő / referencia dátum nem lehet {0} utáni
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Adatok importálása és exportálása
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Készlet bejegyzés létezik erre a készletre: {0}, így akkor nem lehet újra kiírni, illetve módosítani"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nem talált diákokat
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nem talált diákokat
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Számla Könyvelési dátuma
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Elad
 DocType: Sales Invoice,Rounded Total,Kerekített összeg
 DocType: Product Bundle,List items that form the package.,A csomagot alkotó elemek listája.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Százalékos megoszlás egyenlőnek kell lennie a 100%-al
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Kérjük, válasszon könyvelési dátumot az Ügyfél kiválasztása előtt"
 DocType: Program Enrollment,School House,Iskola épület
 DocType: Serial No,Out of AMC,ÉKSz időn túl
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Kérjük, válasszon Árajánlatot"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Karbantartási látogatás készítés
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Kérjük, válasszon Árajánlatot"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Lekönyvelt amortizációk száma nem lehet nagyobb, mint az összes amortizációk száma"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Karbantartási látogatás készítés
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Kérjük, lépjen kapcsolatba a felhasználóval, akinek van Értékesítési törzsadat kezelő {0} beosztása"
 DocType: Company,Default Cash Account,Alapértelmezett készpénzforgalmi számla
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Vállalkozás (nem vevő vagy beszállító) törzsadat.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ez a Tanuló jelenlétén alapszik
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nincs diák ebben
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,További tételek hozzáadása vagy nyisson új űrlapot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Kérjük, írja be: 'Várható szállítási időpont"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,"A {0} Szállítóleveleket törölni kell, mielőtt lemondásra kerül a Vevői rendelés"
@@ -3173,6 +3181,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3. tétel
 DocType: Purchase Order,Customer Contact Email,Vevői Email
 DocType: Warranty Claim,Item and Warranty Details,Tétel és garancia Részletek
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Termék kód&gt; Elem Csoport&gt; Márka
 DocType: Sales Team,Contribution (%),Hozzájárulás (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Megjegyzés: Fizetés bejegyzés nem hozható létre, mivel 'Készpénz vagy bankszámla' nem volt megadva"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,"Válassza ki a programot, kötelező tanfolyamok átvételéhez."
@@ -3187,9 +3196,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Főkönyvi egyeztetés előtt
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Címzett {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Adók és költségek hozzáadva (a vállalkozás pénznemében)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Tétel adó sor: {0} , melynek vagy adó vagy bevétel vagy kiadás vagy megterhelhető főkönyvi típusú számlának kell lennie."
 DocType: Sales Order,Partly Billed,Részben számlázott
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Tétel: {0}, befektetett eszköz tételnek kell lennie"
 DocType: Item,Default BOM,Alapértelmezett anyagjegyzék BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Kérjük ismítelje meg a cég nevét, a jóváhagyáshoz."
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Teljes fennálló kintlévő össz
@@ -3199,8 +3208,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Biztosítótársaság
 DocType: Asset Category Account,Fixed Asset Account,Állóeszköz-számlafiók
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Változó
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Szállítólevélből
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Változó
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Szállítólevélből
 DocType: Student,Student Email Address,Tanuló email cím
 DocType: Timesheet Detail,From Time,Időtől
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Raktáron:
@@ -3211,12 +3220,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Árlista váltási árfolyama
 DocType: Purchase Invoice Item,Rate,Arány
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Belső
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Cím Neve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Cím Neve
 DocType: Stock Entry,From BOM,Anyagjegyzékből
 DocType: Assessment Code,Assessment Code,Értékelés kód
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Alapvető
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Készlet tranzakciók  {0}  előtt befagyasztották
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Kérjük, kattintson a 'Ütemterv létrehozás' -ra"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Kérjük, kattintson a 'Ütemterv létrehozás' -ra"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","pl. kg, egység, darab sz., m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Hivatkozási szám kötelező, amennyiben megadta Referencia dátumot"
 DocType: Bank Reconciliation Detail,Payment Document,Fizetési dokumentum
@@ -3224,19 +3233,19 @@
 DocType: Salary Slip,Salary Structure,Bérrendszer
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Légitársaság
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Problémás Anyag
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Problémás Anyag
 DocType: Material Request Item,For Warehouse,Ebbe a raktárba
 DocType: Employee,Offer Date,Ajánlat dátuma
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Árajánlatok
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Ön offline módban van. Ön nem lesz képes, frissíteni amíg nincs hálózata."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Diákcsoportokat nem hozott létre.
 DocType: Purchase Invoice Item,Serial No,Széria sz.
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Havi törlesztés összege nem lehet nagyobb, mint a hitel összege"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Kérjük, adja meg a fenntartás Részleteket először"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Kérjük, adja meg a fenntartás Részleteket először"
 DocType: Purchase Invoice,Print Language,Nyomtatási nyelv
 DocType: Salary Slip,Total Working Hours,Teljes munkaidő
 DocType: Stock Entry,Including items for sub assemblies,Tartalmazza a részegységek tételeit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Beírt értéknek pozitívnak kell lennie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Összes Terület
 DocType: Purchase Invoice,Items,Tételek
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Tanuló már részt.
@@ -3255,16 +3264,14 @@
 DocType: Issue,Opening Time,Kezdési idő
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Ettől és eddig időpontok megadása
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Securities & árutőzsdék
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Alapértelmezett mértékegysége a '{0}' variánsnak meg kell egyeznie a '{1}' sablonban lévővel.
 DocType: Shipping Rule,Calculate Based On,Számítás ezen alapul
 DocType: Delivery Note Item,From Warehouse,Raktárról
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nincs elem az Anyagjegyzéken a Gyártáshoz
 DocType: Assessment Plan,Supervisor Name,Felügyelő neve
 DocType: Program Enrollment Course,Program Enrollment Course,Program Jelentkezés kurzus
-DocType: Grading Structure,Grading Structure,Osztályozási szerkezet
 DocType: Purchase Taxes and Charges,Valuation and Total,Készletérték és Teljes érték
 DocType: Tax Rule,Shipping City,Szállítási Város
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Ez a tétel pont egy változata ennen: {0} (Sablon).  Jellemzők átmásolásra kerülnek a sablonokra, kivéve, ha a be van álítva a 'Ne másolja'"
 DocType: Notification Control,Customize the Notification,Értesítés testreszabása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pénzforgalom a működtetésből
 DocType: Sales Invoice,Shipping Rule,Szállítási szabály
@@ -3285,8 +3292,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Al fiók létezik erre a számlára. Nem törölheti ezt a fiókot.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Vagy előirányzott Menny. vagy előirányzott összeg kötelező
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nincs alapértelmezett Anyagjegyzék erre a tételre {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Nyitás dátumának előbb kel llennie mint a  zárás dátuma
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Kérjük, válasszon Könyvelési dátumot  először"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Nyitás dátumának előbb kel llennie mint a  zárás dátuma
 DocType: Leave Control Panel,Carry Forward,Átvihető a szabadság
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Költséghely meglévő tranzakciókkal nem lehet átalakítani főkönyvi számlává
 DocType: Department,Days for which Holidays are blocked for this department.,Napok melyeket az Ünnepnapok blokkolják ezen az osztályon.
@@ -3298,7 +3305,7 @@
 DocType: Mode of Payment,General,Általános
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Levélfejléc csatolása
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Utolsó kommunikáció
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Sorolja fel az adó fejléceket (például ÁFA, vám stb.; rendelkezniük kell egyedi nevekkel) és a normál áraikat. Ez létre fog hozni egy szokásos sablont, amely szerkeszthet, és később hozzá adhat még többet."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Széria számok szükségesek a sorbarendezett  tételhez: {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Kifizetések és számlák főkönyvi egyeztetése
@@ -3314,7 +3321,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Összesen (Menny)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Szórakozás és szabadidő
 DocType: Quality Inspection,Item Serial No,Tétel-sorozatszám
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Készítsen Alkalmazott nyilvántartást
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Készítsen Alkalmazott nyilvántartást
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Összesen meglévő
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Könyvelési kimutatások
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Óra
@@ -3327,9 +3334,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ismeretlen
 DocType: Shipping Rule,Shipping Rule Conditions,Szállítás szabály feltételei
 DocType: BOM Replace Tool,The new BOM after replacement,"Az új anyagjegyzék, amire lecseréli mindenhol"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Értékesítési hely kassza
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Értékesítési hely kassza
 DocType: Payment Entry,Received Amount,Beérkezett összeg
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Kérjük állítsa be az Alkalmazott megnevezés rendszert az Emberi Erőforrás&gt; HR beállítások alatt
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Készítsen teljes mennyiségre, figyelmen kívül hagyva a már megrendelt mennyiséget"
 DocType: Account,Tax,Adó
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Jelöletlen
@@ -3340,9 +3346,9 @@
 DocType: C-Form,Invoices,Számlák
 DocType: Batch,Source Document Name,Forrás dokumentum neve
 DocType: Job Opening,Job Title,Állás megnevezése
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Felhasználók létrehozása
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Felhasználók létrehozása
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Gyártáshoz a mennyiségnek nagyobbnak kell lennie, mint 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Látogassa jelentést karbantartási hívást.
 DocType: Stock Entry,Update Rate and Availability,Frissítse az árat és az elérhetőséget
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Százalék amennyivel többet kaphat és adhat a megrendelt mennyiségnél. Például: Ha Ön által megrendelt 100 egység, és az engedmény 10%, akkor kaphat 110 egységet."
@@ -3351,28 +3357,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Költség számla kötelező elem ehhez {0}
 DocType: BOM,Website Description,Weboldal leírása
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettó változás a saját tőkében
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail cím egyedinek kell lennie, ez már létezik: {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Kérjük, vonja vissza a(z) {0} Beszállítói számlát először"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail címnek egyedinek kell lennie, ez már létezik: {0}"
 DocType: Serial No,AMC Expiry Date,Éves karbantartási szerződés lejárati dátuma
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Nyugta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Nyugta
 ,Sales Register,Értékesítési Regisztráció
 DocType: Daily Work Summary Settings Company,Send Emails At,Küldj e-maileket ide
 DocType: Quotation,Quotation Lost Reason,Árajánlat elutasításának oka
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Válassza ki a Domain-ét
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Tranzakciós hivatkozási szám {0} dátum: {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nincs semmi szerkesztenivaló.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,"Összefoglaló erre a hónapra, és folyamatban lévő tevékenységek"
 DocType: Customer Group,Customer Group Name,Vevő csoport neve
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Még nem Vevők!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pénzforgalmi kimutatás
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Hitel összege nem haladhatja meg a maximális kölcsön összegét {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licensz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Töröld a számlát: {0} a C-űrlapból: {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Kérjük, válassza ki az átvitelt, ha Ön is szeretné az előző pénzügyi év mérlege ágait erre a költségvetési évre áthozni"
 DocType: GL Entry,Against Voucher Type,Ellen-bizonylat típusa
 DocType: Item,Attributes,Jellemzők
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Kérjük, adja meg a Leíráshoz használt számlát"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Utolsó rendelési dátum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A {0}számlához nem tartozik a {1} vállalat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sorozatszámok ebben a sorban {0} nem egyezik a szállítólevéllel
 DocType: Student,Guardian Details,Helyettesítő részletei
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Jelölje a Jelenlétet több alkalmazotthoz
@@ -3397,20 +3405,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Sor {0} # fióknak 'Állóeszköz' típusúnak kell lennie
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Mennyiségen kívül
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Szabályok számítani a szállítási költség egy eladó
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Sorozat kötelező
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Sorozat kötelező
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Pénzügyi szolgáltatások
 DocType: Student Sibling,Student ID,Diákigazolvány ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tevékenységek típusa Idő Naplókhoz
 DocType: Tax Rule,Sales,Értékesítés
 DocType: Stock Entry Detail,Basic Amount,Alapösszege
 DocType: Training Event,Exam,Vizsga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Raktár szükséges a {0} tételhez
 DocType: Leave Allocation,Unused leaves,A fel nem használt távollétek
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Kr
 DocType: Tax Rule,Billing State,Számlázási Állam
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Átutalás
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nincs összekapcsolva ezzel az Ügyfél fiókkal {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nincs összekapcsolva ezzel az Ügyfél fiókkal {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Hozzon létre robbant anyagjegyzéket BOM (beleértve a részegységeket)
 DocType: Authorization Rule,Applicable To (Employee),Alkalmazandó (Alkalmazott)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Határidő dátum kötelező
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Növekmény erre a Jellemzőre {0} nem lehet 0
@@ -3421,13 +3429,13 @@
 ,Inactive Customers,Inaktív vevők
 DocType: Landed Cost Voucher,LCV,kishaszonjármű
 DocType: Landed Cost Voucher,Purchase Receipts,Beszerzési bevételezések
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hogyan alkalmazza az árképzési szabályt?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hogyan alkalmazza az árképzési szabályt?
 DocType: Stock Entry,Delivery Note No,Szállítólevél száma
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ha be van jelölve, csak a Beszerzési anyag iránti igénylések a végső nyersanyagokra fognak szerepelni az anyag igénylés kérésekben. Egyébként szülő elemek anyag iránti kérelmei jönnek létre"
 DocType: Cheque Print Template,Message to show,Üzenet mutatni
 DocType: Company,Retail,Kiskereskedelem
 DocType: Attendance,Absent,Távollévő
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Gyártmány csomag
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Gyártmány csomag
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Sor {0}: Érvénytelen hivatkozás {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Beszerzési megrendelés adók és illetékek sablon
 DocType: Upload Attendance,Download Template,Sablon letöltése
@@ -3437,10 +3445,10 @@
 DocType: Payment Entry,Account Paid From,Kiegyenlített számla ettől:
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nyersanyag tételkód
 DocType: Journal Entry,Write Off Based On,Leírja ez alapján
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Érdeklődés készítés
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Érdeklődés készítés
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Nyomtatás és papíráruk
 DocType: Stock Settings,Show Barcode Field,Mutatása a Vonalkód mezőt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Beszállítói e-mailek küldése
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Beszállítói e-mailek küldése
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Fizetés már feldolgozott a {0} és {1} közti időszakra, Távollét alkalmazásának időszaka nem eshet ezek közözti időszakok közé."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Telepítés rekordot egy Széria számra
 DocType: Guardian Interest,Guardian Interest,Helyettesítő kamat
@@ -3452,6 +3460,7 @@
 DocType: Offer Letter,Awaiting Response,Várakozás válaszra
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fent
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Érvénytelen Jellemző {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Megemlít, ha nem szabványos fizetendő számla"
 DocType: Salary Slip,Earning & Deduction,Jövedelem és levonás
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Választható. Ezt a beállítást kell használni, a különböző tranzakciók szűréséhez."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatív értékelési ár nem megengedett
@@ -3467,10 +3476,9 @@
 DocType: Production Order Item,Production Order Item,Gyártási rendelés tétel
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nem található bejegyzés
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Selejtezett eszközök költsége
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Részben rendelt
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Költséghely kötelező ehhez a tételhez {2}
 DocType: Vehicle,Policy No,Irányelv sz.:
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Hogy elemeket Termék Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Hogy elemeket Termék Bundle
 DocType: Asset,Straight Line,Egyenes
 DocType: Project User,Project User,Projekt téma felhasználó
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Osztott
@@ -3485,7 +3493,7 @@
 DocType: Program Enrollment Tool,Get Students From,Diák űrlapok lekérése
 DocType: Hub Settings,Seller Country,Eladó Országa
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Közzéteszi a tételt a weboldalon
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Csoportosítsa a tanulókat kötegekbe
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Csoportosítsa a tanulókat kötegekbe
 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 +85,Specifications,Műszaki adatok
@@ -3537,14 +3545,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Csekk dátuma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},A {0} számla: Szülő számla {1} nem tartozik ehhez a céghez: {2}
 DocType: Program Enrollment Tool,Student Applicants,Tanuló pályázóknak
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi a vállalattal kapcsolatos ügylet !
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Sikeresen törölve valamennyi a vállalattal kapcsolatos ügylet !
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Mivel a dátum
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Felvétel dátuma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Próbaidő
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Bér összetevők
 DocType: Program Enrollment Tool,New Academic Year,Új Tanév
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Vissza / Követelés értesítő
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Vissza / Követelés értesítő
 DocType: Stock Settings,Auto insert Price List rate if missing,"Auto Árlista érték beillesztés, ha hiányzik"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Teljes fizetett összeg
 DocType: Production Order Item,Transferred Qty,Átvitt Mennyiség
@@ -3564,7 +3572,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Távollétek típusa, mint alkalmi, beteg stb."
 DocType: Email Digest,Send regular summary reports via Email.,Küldje el a rendszeres összefoglaló jelentéseket e-mailben.
 DocType: Payment Entry,PE-,FIZBEV-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Kérjük, állítsa be az alapértelmezett főkönyvi számlát a Költség Követelés típusban: {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Kérjük, állítsa be az alapértelmezett főkönyvi számlát a Költség Követelés típusban: {0}"
 DocType: Assessment Result,Student Name,Tanuló név
 DocType: Brand,Item Manager,Tétel kezelő
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Bérszámfejtés fizetendő
@@ -3585,6 +3593,7 @@
 ,Sales Funnel,Értékesítési csatorna
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Rövidítés kötelező
 DocType: Project,Task Progress,Feladat előrehaladása
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Szekér
 ,Qty to Transfer,Mennyiség az átvitelhez
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Árajánlatok az Érdeklődőknek vagy Vevőknek.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Beosztás engedélyezi a zárolt készlet szerkesztését
@@ -3612,12 +3621,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Tételenkénti adó részletek
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Intézet rövidítése
 ,Item-wise Price List Rate,Tételenkénti Árlista árjegyzéke
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Beszállítói ajánlat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Beszállítói ajánlat
 DocType: Quotation,In Words will be visible once you save the Quotation.,"A szavakkal mező lesz látható, miután mentette az Árajánlatot."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Mennyiség ({0}) nem lehet egy töredék ebben a sorban {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Díjak gyűjtése
 DocType: Attendance,ATT-,CSAT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},A vonalkód {0} már használt a {1} Tételnél
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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,Adja hozzá a naptárhoz ezen a napon
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Szabályok hozzátéve szállítási költségeket.
 DocType: Item,Opening Stock,Nyitó állomány
@@ -3634,8 +3643,8 @@
 Updated via 'Time Log'",percben Frissítve az 'Idő napló'-n keresztül
 DocType: Customer,From Lead,Érdeklődésből
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Megrendelések gyártásra bocsátva.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Válasszon pénzügyi évet ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Válasszon pénzügyi évet ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil szükséges a POS bevitelhez
 DocType: Program Enrollment Tool,Enroll Students,Diákok felvétele
 DocType: Hub Settings,Name Token,Név Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Alapértelmezett értékesítési
@@ -3646,7 +3655,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} a {1} Értékesítési számlához
 DocType: Sales Invoice,SINV-,ÉSZLA-
 DocType: Request for Quotation Item,Project Name,Projekt téma neve
-DocType: Supplier,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
+DocType: Customer,Mention if non-standard receivable account,"Megemlít, ha nem szabványos bevételi számla"
 DocType: Journal Entry Account,If Income or Expense,Ha bevétel vagy kiadás
 DocType: Production Order,Required Items,Kötelező elemek
 DocType: Stock Ledger Entry,Stock Value Difference,Készlet értékkülönbözet
@@ -3667,7 +3676,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Csoportonkénti Cél tétel beállítás ehhez az Értékesítő személyhez.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] régebbi készlet zárolása
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Sor # {0}: Vagyontárgy kötelező állóeszköz vétel / eladás
-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.","Ha két vagy több árképzési szabály található a fenti feltételek alapján, Prioritást alkalmazzák. Prioritás egy 0-20 közötti szám, míg az alapértelmezett értéke nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget élvez, ha több árképzési szabály azonos feltételekkel rendelkezik."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ha két vagy több árképzési szabály található a fenti feltételek alapján, Prioritást alkalmazzák. Prioritás egy 0-20 közötti szám, míg az alapértelmezett értéke nulla (üres). A magasabb szám azt jelenti, hogy elsőbbséget élvez, ha több árképzési szabály azonos feltételekkel rendelkezik."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Pénzügyi év: {0} nem létezik
 DocType: Currency Exchange,To Currency,Pénznemhez
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Engedélyezze a következő felhasználók Távollét alkalmazás jóváhagyását a blokkolt napokra.
@@ -3692,7 +3701,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Tétel: {0} - figyelmen kívül hagyva, mivel ez nem egy készletezhető tétel"
 DocType: Appraisal,APRSL,TELJESITM
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Nyújsa be ezt a Gyártási megrendelést további feldolgozásra.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hogy nem használhassa az árképzési szabályt egy adott ügyletben, az összes árképzési szabályt le kell tiltani."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hogy nem használhassa az árképzési szabályt egy adott ügyletben, az összes árképzési szabályt le kell tiltani."
 DocType: Assessment Group,Parent Assessment Group,Szülő értékelési csoport
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Állás
 ,Sales Order Trends,Vevői rendelések alakulása
@@ -3703,7 +3712,7 @@
 DocType: Stock Entry Detail,Additional Cost,Járulékos költség
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Üzleti év végi dátuma
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Nem tudja szűrni utalvány szám alapján, ha utalványonként csoportosított"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Beszállítói ajánlat létrehozás
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Beszállítói ajánlat létrehozás
 DocType: Quality Inspection,Incoming,Bejövő
 DocType: BOM,Materials Required (Exploded),Szükséges anyagok (Robbantott)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Adjon hozzá felhasználókat a szervezetéhez, saját magán kívül"
@@ -3731,6 +3740,7 @@
 DocType: Employee,History In Company,Előzmények a cégnél
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Hírlevelek
 DocType: Stock Ledger Entry,Stock Ledger Entry,Készlet könyvelés tétele
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Ügyfél&gt; Vásárlói csoport&gt; Terület
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Ugyanazt a tételt már többször rögzítették
 DocType: Department,Leave Block List,Távollét blokk lista
 DocType: Sales Invoice,Tax ID,Adóazonosító
@@ -3740,7 +3750,7 @@
 DocType: Customer,Sales Partner and Commission,Értékesítési Partner és a Bizottság
 DocType: Employee Loan,Rate of Interest (%) / Year,Kamatláb (%) / év
 ,Project Quantity,Project Mennyiség
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Összesen {0} az összes tételre nulla, lehet, hogy meg kell változtatnia  'Forgalmazói díjak ez alapján'"
 DocType: Opportunity,To Discuss,Megvitatni
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} darab ebből: {1} szükséges ebben: {2} a tranzakció befejezéséhez.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kamatláb (%) Éves
@@ -3755,7 +3765,7 @@
 DocType: Purchase Invoice,Return,Visszatérés
 DocType: Production Order Operation,Production Order Operation,Gyártási rendelés végrehajtás
 DocType: Pricing Rule,Disable,Tiltva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Fizetési módra van szükség a fizetéshez
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Fizetési módra van szükség a fizetéshez
 DocType: Project Task,Pending Review,Ellenőrzésre vár
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Vagyoneszköz {0} nem selejtezhető, mivel már {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Teljes Költség Követelés (költségtérítési igényekkel)
@@ -3763,11 +3773,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Hiányzónak jelöl
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Sor {0}: Anyagjegyzés BOM pénzneme #{1}  egyeznie kell a kiválasztott pénznemhez {2}
 DocType: Journal Entry Account,Exchange Rate,Átváltási arány
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Vevői rendelés {0} nem nyújtják be
 DocType: Homepage,Tag Line,Jelmondat sor
 DocType: Fee Component,Fee Component,Díj komponens
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flotta kezelés
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Tételek hozzáadása innen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Tételek hozzáadása innen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},{0} raktár: a szülő számla: {1} nem kapcsolódik a {2} céghez
 DocType: Cheque Print Template,Regular,Szabályos
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Összesen súlyozás minden Értékelési kritériumra legalább 100%
@@ -3780,7 +3790,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,{0} raktár nem létezik
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regisztráció az ERPNext Hub–hoz
 DocType: Monthly Distribution,Monthly Distribution Percentages,Havi Felbontás százalékai
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,A kiválasztott elemnek nem lehet Kötege
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Értékelés mértéke nem található erre a tételre {0}, mely kötelező a számviteli bejegyzések megtételére ehhez {1} {2}. Ha a tétel mintaként bonyolítódik ebben {1}, kérem említse meg ezt az {1} Tétel  táblázatban. Ellenkező esetben, kérjük hozzon létre egy bejövő készlet tranzakciót a tételre vagy említése meg az értékelési árat a Tétel rekordjában, majd próbálja benyújtani / törölni ezt a bejegyzést"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% anyag tételek szállítva Beszállítói szállítólevélhez
 DocType: Project,Customer Details,Vevő részletek
@@ -3789,15 +3799,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Adjon url paramétert a fogadó számaihoz
 DocType: Payment Entry,Paid Amount,Fizetett összeg
 DocType: Assessment Plan,Supervisor,Felügyelő
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Elérhető készlet a tételek csomagolásához
 DocType: Item Variant,Item Variant,Tétel variáns
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Eredmény eszköz
 DocType: BOM Scrap Item,BOM Scrap Item,Anyagjegyzék Fémhulladék tétel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Benyújtott megbízásokat nem törölheti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Számlaegyenleg már Nekünk tartozik, akkor nem szabad beállítani ""Ennek egyenlege"", mint ""Tőlünk követel"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Minőségbiztosítás
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,"Tétel {0} ,le lett tiltva"
 DocType: Employee Loan,Repay Fixed Amount per Period,Fix összeg visszafizetése időszakonként
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Kérjük, adjon meg mennyiséget erre a tételre: {0}"
 DocType: Employee External Work History,Employee External Work History,Alkalmazott korábbi munkahelyei
@@ -3823,7 +3833,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Tanuló e-mail azonosító
 DocType: Employee,Notice (days),Felmondás (nap(ok))
 DocType: Tax Rule,Sales Tax Template,Forgalmi adó Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Válassza ki a tételeket a számla mentéséhez
 DocType: Employee,Encashment Date,Beváltás dátuma
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Készlet igazítás
@@ -3846,7 +3856,7 @@
 DocType: Item Variant Attribute,Attribute,Jelemzők
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Kérjük adjon meg tól/ig tartományt
 DocType: Serial No,Under AMC,ÉKSz időn belül
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Tétel értékének mértékét újraszámolják a beszerzési költség utalvány összegével
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Tétel értékének mértékét újraszámolják a beszerzési költség utalvány összegével
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Alapértelmezett beállítások a vevői tranzakciókhoz.
 DocType: Guardian,Guardian Of ,Helyettesítője
 DocType: Grading Scale Interval,Threshold,Küszöb
@@ -3856,6 +3866,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Terhelési értesítés kiadva
 DocType: Production Order,Warehouses,Raktárak
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tárgyi eszköz nem vihető át
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ez a Tétel egy változata ennek: {0} (sablon).
 DocType: Workstation,per hour,óránként
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Beszerzés
 DocType: Announcement,Announcement,Közlemény
@@ -3871,8 +3882,8 @@
 DocType: Account,Receivable,Bevételek
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Sor # {0}: nem szabad megváltoztatni a beszállítót, mivel már van rá Beszerzési  Megrendelés"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Beosztást, amely lehetővé tette, hogy nyújtson be tranzakciókat, amelyek meghaladják a követelés határértékeket."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Tételek kiválasztása gyártáshoz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Törzsadatok szinkronizálása, ez eltart egy ideig"
 DocType: Item,Material Issue,Anyag probléma
 DocType: Hub Settings,Seller Description,Eladó Leírása
 DocType: Employee Education,Qualification,Képesítés
@@ -3884,7 +3895,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Megrendelt
 DocType: Salary Detail,Component,Összetevő
 DocType: Assessment Criteria,Assessment Criteria Group,Értékelési kritériumok Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},"Nyitva halmozott ÉCS kisebbnek kell lennie, mint egyenlő {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},"Nyitva halmozott ÉCS kisebbnek kell lennie, mint egyenlő {0}"
 DocType: Warehouse,Warehouse Name,Raktár neve
 DocType: Naming Series,Select Transaction,Válasszon Tranzakciót
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Kérjük, adja be Beosztás jóváhagyásra vagy Felhasználó jóváhagyásra"
@@ -3897,7 +3908,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},A végső napnak a pénzügyi éven bellülinek kell lennie. Feltételezve a végső nap = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Itt tarthatja karban a magasságot, súlyt, allergiát, egészségügyi problémákat stb"
 DocType: Leave Block List,Applies to Company,Vállaltra vonatkozik
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet lemondani, mert Készlet bejegyzés: {0} létezik"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nem lehet lemondani, mert Készlet bejegyzés: {0} létezik"
 DocType: Employee Loan,Disbursement Date,Folyósítás napja
 DocType: Vehicle,Vehicle,Jármű
 DocType: Purchase Invoice,In Words,Szavakkal
@@ -3911,14 +3922,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,LEHET / Érdeklődés %
 DocType: Material Request,MREQ-,ANYIG-
 ,Asset Depreciations and Balances,Vagyoneszköz Értékcsökkenés és egyenlegek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment ebből: {2} ebbe: {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Összeg: {0} {1} átment ebből: {2} ebbe: {3}
 DocType: Sales Invoice,Get Advances Received,Befogadott előlegek átmásolása
 DocType: Email Digest,Add/Remove Recipients,Címzettek Hozzáadása/Eltávolítása
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},A tranzakció nem megengedett a leállított gyártási rendeléssel szemben: {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Beállítani ezt a költségvetési évet alapértelmezettként, kattintson erre: 'Beállítás alapértelmezettként'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Csatlakozik
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Hiány Mennyisége
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Tétel változat {0} létezik azonos Jellemzőkkel
 DocType: Employee Loan,Repay from Salary,Bérből törleszteni
 DocType: Leave Application,LAP/,TAVOLL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Fizetési igény ehhez {0} {1} ezzel az összeggel {2}
@@ -3936,7 +3947,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Értékelés eredménye részlet
 DocType: Employee Education,Employee Education,Alkalmazott képzése
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Ismétlődő elem csoport található a csoport táblázatában
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Erre azért van szükség, hogy behozza a Termék részleteket."
 DocType: Salary Slip,Net Pay,Nettó fizetés
 DocType: Account,Account,Számla
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Széria sz. {0} már beérkezett
@@ -3945,7 +3956,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Raktár {0} nem kapcsolódik semmilyen számlához, hozzon létre / összekapcsoljon a megfelelő (Vagyoneszköz) számlát a raktárhoz."
 DocType: Purchase Invoice,Recurring Id,Ismétlődő Id
 DocType: Customer,Sales Team Details,Értékesítő csapat részletei
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Véglegesen törli?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Véglegesen törli?
 DocType: Expense Claim,Total Claimed Amount,Összes Garanciális összeg
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciális értékesítési lehetőségek.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Érvénytelen {0}
@@ -3956,13 +3967,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Állítsa be az Iskolát az ERPNext-ben
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bázis váltó összeg (Vállalat pénzneme)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárakra
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nincs számviteli bejegyzést az alábbi raktárakra
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Először mentse el a dokumentumot.
 DocType: Account,Chargeable,Felszámítható
 DocType: Company,Change Abbreviation,Váltópénz rövidítése
 DocType: Expense Claim Detail,Expense Date,Költség igénylés dátuma
 DocType: Item,Max Discount (%),Max. engedmény (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Utolsó megrendelés összege
+DocType: Task,Is Milestone,Ez mérföldkő
 DocType: Daily Work Summary,Email Sent To,E-mail címzetje
 DocType: Budget,Warn,Figyelmeztet
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bármely egyéb megjegyzések, említésre méltó erőfeszítés, aminek a nyilvántartásba kell kerülnie."
@@ -3983,7 +3995,7 @@
 DocType: Item Attribute Value,Attribute Value,Jellemzők értéke
 ,Itemwise Recommended Reorder Level,Tételenkénti Ajánlott újrarendelési szint
 DocType: Salary Detail,Salary Detail,Bér részletei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Kérjük, válassza ki a {0} először"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Kérjük, válassza ki a {0} először"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Köteg {0} ebből a tételből: {1} lejárt.
 DocType: Sales Invoice,Commission,Jutalék
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Idő nyilvántartó a gyártáshoz.
@@ -3995,41 +4007,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"`Zárolja azon készleteket, amelyek régebbiek, mint` kisebbnek kell lennie,  %d napnál."
 DocType: Tax Rule,Purchase Tax Template,Beszerzési megrendelés Forgalmi adót sablon
 ,Project wise Stock Tracking,Projekt téma szerinti raktárkészlet követése
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Karbantartási ütemterv {0} létezik erre {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tényleges Mennyiség (forrásnál / célnál)
 DocType: Item Customer Detail,Ref Code,Hiv. kód
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Alkalmazott adatai.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Kérjük, állítsa be a Következő Értékcsökkenés dátumát"
 DocType: HR Settings,Payroll Settings,Bérszámfejtés Beállítások
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Egyeztesse az összeköttetésben nem álló számlákat és a kifizetéseket.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Rendelés helye
 DocType: Email Digest,New Purchase Orders,Új beszerzési rendelés
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Forrás nem lehet egy szülő költséghely
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Válasszon márkát ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Válasszon márkát ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Halmozott értékcsökkenés ekkor
 DocType: Sales Invoice,C-Form Applicable,C-formában idéztük
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},"Működési időnek nagyobbnak kell lennie, mint 0 erre a műveletre: {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Működési időnek nagyobbnak kell lennie, mint 0 erre a műveletre: {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Raktár kötelező
 DocType: Supplier,Address and Contacts,Cím és Kapcsolatok
 DocType: UOM Conversion Detail,UOM Conversion Detail,Mértékegység konvertálásának részlete
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Tartsa webbarátként 900px (w) X 100px (h)
 DocType: Program,Program Abbreviation,Program rövidítése
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Gyártási rendelést nem lehet emelni a tétel terméksablonnal szemben
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtán a tételek szerint
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Gyártási rendelést nem lehet emelni a tétel terméksablonnal szemben
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Díjak frissülnek a vásárláskor kapott nyugtán a tételek szerint
 DocType: Warranty Claim,Resolved By,Megoldotta
 DocType: Bank Guarantee,Start Date,Kezdés dátuma
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Felosztja a távolléteket időszakra.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Csekkek és betétek helytelenül elszámoltak
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,A {0} számla: Nem rendelheti saját szülő számlájának
 DocType: Purchase Invoice Item,Price List Rate,Árlista árak
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Árajánlatok létrehozása vevők részére
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Árajánlatok létrehozása vevők részére
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mutasd a ""Készleten"", vagy ""Nincs készleten"" , az ebben a raktárban álló állomány alapján."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Anyagjegyzék (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Átlagos idő foglalás a beszállító általi szállításhoz
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Értékelés eredménye
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Órák
 DocType: Project,Expected Start Date,Várható indulás dátuma
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Vegye ki az elemet, ha terheket nem adott elemre alkalmazandó"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,A művelet pénznemének meg kell egyeznie a Fizetési átjáró pénznemével
 DocType: Payment Entry,Receive,Beérkeztetés
@@ -4040,19 +4051,19 @@
 DocType: Workstation,Operating Costs,Üzemeltetési költségek
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Művelet, ha a felhalmozott havi költségkeret túlépett"
 DocType: Purchase Invoice,Submit on creation,Küldje el a teremtésnél
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Árfolyam ehhez: {0} ennek kell lennie: {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Árfolyam ehhez: {0} ennek kell lennie: {1}
 DocType: Asset,Disposal Date,Eltávolítás időpontja
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailt fog küldeni a vállalkozás összes aktív alkalmazottja részére az adott órában, ha nincsenek szabadságon. A válaszok összefoglalását éjfélkor küldi."
 DocType: Employee Leave Approver,Employee Leave Approver,Alkalmazott Távollét Jóváhagyó
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Nem jelentheti elveszettnek, mert kiment az Árajánlat."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Sor {0}: Egy Újrarendelés bejegyzés már létezik erre a raktárban {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nem jelentheti elveszettnek, mert kiment az Árajánlat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Képzési Visszajelzés
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Gyártási rendelést: {0} be kell benyújtani
-apps/erpnext/erpnext/maintenance/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é dátumát erre a tételre {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Kérjük, válassza ki a Start és végé dátumát erre a tételre {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tanfolyam kötelező ebben a sorban {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"A végső nap nem lehet, a kezdő dátum előtti"
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Árak Hozzáadása / Szerkesztése
 DocType: Batch,Parent Batch,Szülő Köteg
 DocType: Cheque Print Template,Cheque Print Template,Csekk nyomtatás Sablon
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Költséghelyek listája
@@ -4065,7 +4076,7 @@
 ,Ordered Items To Be Delivered,Rendelt mennyiség szállításra
 DocType: Account,Income,Jövedelem
 DocType: Industry Type,Industry Type,Iparág
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Valami hiba történt!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Valami hiba történt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Figyelmeztetés: Távolét ealkalmazás a következő blokkoló dátumokat tartalmazza
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,A {0} kimenő értékesítési számla már elküldve
 DocType: Assessment Result Detail,Score,Pontszám
@@ -4096,17 +4107,17 @@
 DocType: Item,Variant Based On,Változat ez alapján
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Összesen kijelölés súlyozásának 100% -nak kell lennie. Ez:  {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ön Beszállítói
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Nem lehet beállítani elveszettnek ezt a Vevői rendelést, mivel végre van hajtva."
 DocType: Request for Quotation Item,Supplier Part No,Beszállítói alkatrész sz
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Feladó
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nem vonható le, ha a kategória a 'Készletérték' vagy 'Készletérték és Teljes érték'"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Feladó
 DocType: Lead,Converted,Átalakított
 DocType: Item,Has Serial No,Van sorozatszáma
 DocType: Employee,Date of Issue,Probléma dátuma
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Feladó: {0} a {1} -hez
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Feladó: {0} a {1} -hez
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Sor # {0}: Nem beszállító erre a tételre {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,"Sor {0}: Óra értéknek nagyobbnak kell lennie, mint nulla."
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,"Weboldal kép: {0} ami csatolva lett a {1}  tételhez, nem található"
 DocType: Issue,Content Type,Tartalom típusa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Számítógép
 DocType: Item,List this Item in multiple groups on the website.,Sorolja ezeket a tételeket több csoportba a weboldalon.
@@ -4115,20 +4126,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Nincs engedélye a zárolt értékek beállítására
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nem egyeztetett bejegyzések lekérdezése
 DocType: Payment Reconciliation,From Invoice Date,Számla dátumától
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Számlázási pénznemnek ugyanannak vagy a vállalat vagy a Ügyfél vállalatának alapértelmezett pénznemének kell lennie.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Hagyja beváltása
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Mit csinál?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Raktárba
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Minden Student Felvételi
 ,Average Commission Rate,Átlagos jutalék mértéke
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Részvételt nem lehet megjelölni jövőbeni dátumhoz
 DocType: Pricing Rule,Pricing Rule Help,Árképzési szabály Súgó
 DocType: School House,House Name,Ház név
 DocType: Purchase Taxes and Charges,Account Head,Számla fejléc
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Frissítse a többletköltségeket a tétel beszerzési költségének kiszámítására
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektromos
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adjuk hozzá a többi a szervezet, mint a felhasználók számára. Azt is hozzá meghívni ügyfelek a portál hozzáadásával őket Kapcsolatok"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adjuk hozzá a többi a szervezet, mint a felhasználók számára. Azt is hozzá meghívni ügyfelek a portál hozzáadásával őket Kapcsolatok"
 DocType: Stock Entry,Total Value Difference (Out - In),Összesen értékkülönbözet (Ki - Be)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Sor {0}: átváltási á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ót nem állított be az Alkalmazotthoz: {0}
@@ -4137,7 +4148,7 @@
 DocType: Item,Customer Code,Vevő kódja
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Születésnapi emlékeztető {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Utolsó rendeléstől eltel napok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Tartozás főkönyvi számlának Mérlegszámlának kell lennie
 DocType: Buying Settings,Naming Series,Sorszámozási csoportok
 DocType: Leave Block List,Leave Block List Name,Távollét blokk lista neve
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Biztosítás kezdeti dátumának kisebbnek kell lennie, mint a biztosítás befejezés dátuma"
@@ -4152,9 +4163,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},A bérpapír az Alkalmazotthoz: {0} már létrehozott erre a jelenléti ívre: {1}
 DocType: Vehicle Log,Odometer,Kilométer-számláló
 DocType: Sales Order Item,Ordered Qty,Rendelt menny.
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Tétel {0} letiltva
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Tétel {0} letiltva
 DocType: Stock Settings,Stock Frozen Upto,Készlet zárolása eddig
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,ANYGJZ nem tartalmaz semmilyen készlet tételt
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Az időszak eleje és vége kötelező ehhez a visszatérőhöz: {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekt téma feladatok / tevékenységek.
 DocType: Vehicle Log,Refuelling Details,Tankolás Részletek
@@ -4164,8 +4175,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Utolsó vételi ár nem található
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Írj egy egyszeri összeget (Társaság Currency)
 DocType: Sales Invoice Timesheet,Billing Hours,Számlázási Óra(k)
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Alapértelmezett anyagjegyzék BOM {0} nem található
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Sor # {0}: Kérjük, állítsa újrarendezésből mennyiség"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Érintse a tételeket, ahhoz,  hogy ide tegye"
 DocType: Fees,Program Enrollment,Program Beiratkozási
 DocType: Landed Cost Voucher,Landed Cost Voucher,Beszerzési költség utalvány
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Kérjük, állítsa be {0}"
@@ -4187,7 +4199,7 @@
 DocType: Maintenance Visit,Maintenance Date,Karbantartás dátuma
 DocType: Purchase Invoice Item,Rejected Serial No,Elutasított sorozatszám
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Év kezdő vagy befejezési időpont átfedésben van evvel: {0}. Ennak elkerülése érdekében, kérjük, állítsa be a céget"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Kezdési időpontnak kisebbnek kell lennie, mint végső dátumnak erre a tétel {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},"Kezdési időpontnak kisebbnek kell lennie, mint végső dátumnak erre a tétel {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.","Példa: ABCD. ##### Ha sorozat be van állítva, és Széria sz. nem szerepel az ügylethez, akkor az automatikus sorozatszámozás készül a sorozat alapján. Ha azt szeretné, hogy kifejezetten említsék meg ennek a tételnek a Széria sorozat sz., hagyja ezt üresen."
 DocType: Upload Attendance,Upload Attendance,Résztvevők feltöltése
@@ -4262,7 +4274,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Kis- és nagykereskedelem
 DocType: Issue,First Responded On,Első válasz időpontja
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Kereszt felsorolása a tételeknek több csoportban
-DocType: Grade Interval,Grade Interval,Évfolyam intervalluma
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Pénzügyi év kezdő dátumát és a pénzügyi év befelyező dátumát már meghatározták a Pénzügyi évben: {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Végső Dátum frissítve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Osztott Batch
@@ -4307,14 +4318,14 @@
 DocType: Bin,Reserved Qty for Production,Fenntartott db Termelés
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Hagyja bejelöletlenül, ha nem szeretné, kötegelni miközben kurzus alapú csoportokat hoz létre."
 DocType: Asset,Frequency of Depreciation (Months),Az értékcsökkenés elszámolásának gyakorisága (hónapok)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Követelésszámla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Követelésszámla
 DocType: Landed Cost Item,Landed Cost Item,Beszerzési költség tétel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mutassa a nulla értékeket
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,"Mennyiség amit ebből a tételből kapott a  gyártás / visszacsomagolás után, a megadott alapanyagok mennyiségének felhasználásával."
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Telepítsen egy egyszerű weboldalt a vállalkozásunkhoz
 DocType: Payment Reconciliation,Receivable / Payable Account,Bevételek / Fizetendő számla
 DocType: Delivery Note Item,Against Sales Order Item,Ellen Vevői rendelési tétel
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Kérjük, adja meg a Jellemző értékét erre a Jellemzőre: {0}"
 DocType: Item,Default Warehouse,Alapértelmezett raktár
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Költségvetést nem lehet hozzárendelni ehhez a Csoport számlához {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Kérjük, adjon meg szülő költséghelyet"
@@ -4347,7 +4358,7 @@
 DocType: Assessment Plan Criteria,Maximum Score,Maximális pontszám
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,Készítsen szabályokat az ügyletek korlátozására az értékek alapján.
 DocType: Student Group Creation Tool,Leave blank if you make students groups per year,"Hagyja üresen, ha diák csoportokat évente hozza létre"
-DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja a ünnepeket, és ez csökkenti a napi bér összegét"
+DocType: HR Settings,"If checked, Total no. of Working Days will include holidays, and this will reduce the value of Salary Per Day","Ha be van jelölve, a munkanapok száma tartalmazni fogja az ünnepeket, és ez csökkenti a napi bér összegét"
 DocType: Purchase Invoice,Total Advance,Összes előleg
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"A kifejezés végső dátuma nem lehet korábbi, mint a kifejezés kezdete. Kérjük javítsa ki a dátumot, és próbálja újra."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Áraj számláló
@@ -4357,7 +4368,7 @@
 DocType: Opportunity Item,Basic Rate,Alapár
 DocType: GL Entry,Credit Amount,Követelés összege
 DocType: Cheque Print Template,Signatory Position,Az aláíró pozíció
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Elveszetté állít
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Elveszetté állít
 DocType: Timesheet,Total Billable Hours,Összesen számlázható óra
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Fizetési átvételi Megjegyzés
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ennek alapja az ezzel a Vevővel történt tranzakciók. Lásd alábbi idővonalat a részletekért
@@ -4371,11 +4382,11 @@
 ,Items To Be Requested,Tételek kell kérni
 DocType: Purchase Order,Get Last Purchase Rate,Utolsó Beszerzési ár lekérése
 DocType: Company,Company Info,Vállakozás adatai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Válasszon ki vagy adjon hozzá új vevőt
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Költséghely szükséges költségtérítési igény könyveléséhez
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Vagyon tárgyak alkalmazás (vagyoni eszközök)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ez az Alkalmazott jelenlétén alapszik
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Tartozás Számla
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Tartozás Számla
 DocType: Fiscal Year,Year Start Date,Év kezdő dátuma
 DocType: Attendance,Employee Name,Alkalmazott neve
 DocType: Sales Invoice,Rounded Total (Company Currency),Kerekített összeg (a cég pénznemében)
@@ -4384,13 +4395,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,"Tiltsa a felhasználóknak, hogy eltávozást igényelhessenek a következő napokra."
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Beszerzés összege
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Beszállító árajánlata :{0} létrehozva
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Befejező év nem lehet a kezdés évnél korábbi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Alkalmazotti juttatások
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Csomagolt mennyiségeknek egyezniük kell a  {1} sorban lévő {0} tétel mennyiségével
 DocType: Production Order,Manufactured Qty,Gyártott menny.
 DocType: Purchase Receipt Item,Accepted Quantity,Elfogadott mennyiség
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Kérjük, állítsa be az alapértelmezett Ünnepet erre az Alkalmazottra: {0} vagy Vállalkozásra: {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nem létezik
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nem létezik
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vevők számlái
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Projekt téma azonosító
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Row {0}: Az összeg nem lehet nagyobb, mint lévő összeget ad költségelszámolás benyújtás {1}. Függő Összeg: {2}"
@@ -4399,15 +4410,17 @@
 DocType: Quality Inspection Reading,Reading 3,Olvasás 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bizonylat típusa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,"Árlista nem található, vagy letiltva"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,"Árlista nem található, vagy letiltva"
 DocType: Employee Loan Application,Approved,Jóváhagyott
 DocType: Pricing Rule,Price,Árazás
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Elengedett alkalmazott: {0} , be kell állítani mint 'Távol'"
 DocType: Guardian,Guardian,"Gyám, helyettesítő"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Értékelés: {0} létrehozva a(z)  {1} alkalmazottra a megadott dátum tartományban
 DocType: Employee,Education,Oktatás
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Töröl
 DocType: Selling Settings,Campaign Naming By,Kampányt elnevezte
 DocType: Employee,Current Address Is,Jelenlegi cím
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,módosított
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Választható. Megadja cég alapértelmezett pénznemét, ha nincs meghatározva."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Könyvelési naplóbejegyzések.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Elérhető Mennyiség a befozatali raktárról
@@ -4416,7 +4429,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Sor {0}: Ügyfél / fiók nem egyezik {1} / {2} a {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Kérjük, adja meg a Költség számlát"
 DocType: Account,Stock,Készlet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Sor # {0}: Referencia Dokumentum típus legyen Beszerzési megrendelés, Beszerzési számla vagy Naplókönyvelés"
 DocType: Employee,Current Address,Jelenlegi cím
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ha a tétel egy másik tétel egy változata akkor a leírás, kép, árképzés, adók stb. a sablonból lesz kiállítva, hacsak nincs külön meghatározva"
 DocType: Serial No,Purchase / Manufacture Details,Beszerzés / gyártás Részletek
@@ -4444,7 +4457,7 @@
 DocType: Hub Settings,Hub Settings,Hub Beállítások
 DocType: Project,Gross Margin %,Bruttó árkülönbözet %
 DocType: BOM,With Operations,Műveletek is
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Könyvelési tétel már megtörtént {0} pénznemben a {1} céghez. Kérjük, válasszon bevételi vagy kifizetendő számlát ebben a pénznemben {0}."
 DocType: Asset,Is Existing Asset,Meglévő eszköz
 DocType: Salary Detail,Statistical Component,Statisztikai összetevő
 ,Monthly Salary Register,Havi fizetés Regisztráció
@@ -4467,7 +4480,7 @@
 DocType: Assessment Plan,Room,Szoba
 DocType: Purchase Order,Advance Paid,A kifizetett előleg
 DocType: Item,Item Tax,Tétel adójának típusa
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Anyag beszállítóhoz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Anyag beszállítóhoz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Jövedéki számla
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Küszöb {0}% egynél többször jelenik meg
 DocType: Expense Claim,Employees Email Id,Alkalmazottak email id azonosító
@@ -4498,9 +4511,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo csatolása
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Készletszintek
 DocType: Customer,Commission Rate,Jutalék értéke
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Változat létrehozás
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Változat létrehozás
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zárja osztályonként a távollét igényeket.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés mód legyen Kapott, Fizetett és Belső Transzfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Fizetés mód legyen Kapott, Fizetett és Belső Transzfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Elemzés
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,A kosár üres
 DocType: Vehicle,Model,Modell
@@ -4511,6 +4524,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Termelés engedélyezése az ünnepnapokon
 DocType: Sales Order,Customer's Purchase Order Date,Vevő beszerzési megrendelésének dátuma
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Alap készlet
+DocType: Shopping Cart Settings,Show Public Attachments,Itt találhatóak a nyilvános mellékletek
 DocType: Packing Slip,Package Weight Details,Csomag súlyának adatai
 DocType: Payment Gateway Account,Payment Gateway Account,Fizetési átjáró számla fiókja
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,A fizetés befejezése után a felhasználót átirányítja a kiválasztott oldalra.
@@ -4529,15 +4543,15 @@
 DocType: Batch,Expiry Date,Lejárat dátuma
 ,Supplier Addresses and Contacts,Beszállítók címei és Kapcsolatai
 ,accounts-browser,beszámoló-böngésző
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Kérjük, válasszon Kategóriát először"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Kérjük, válasszon Kategóriát először"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projek témák törzsadat.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Túl számlázás vagy túlrendelés engedélyezéséhez, frissítse az ""Engedélyezés"" a Készlet beállításoknál vagy a tételnél"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nem jelezzen szimbólumokat, mint $$ stb. a pénznemek mellett."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Fél Nap)
 DocType: Supplier,Credit Days,Követelés Napok
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Tanuló köteg létrehozás
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Tanuló köteg létrehozás
 DocType: Leave Type,Is Carry Forward,Ez átvitt
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Elemek lekérése Anyagjegyzékből
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Elemek lekérése Anyagjegyzékből
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Érdeklődés idő napokban
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Sor # {0}: Beküldés dátuma meg kell egyeznie a vásárlás dátumát {1} eszköz {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Kérjük, adja meg a vevői rendeléseket, a fenti táblázatban"
@@ -4554,7 +4568,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Szentesített Összeg
 DocType: GL Entry,Is Opening,Ez nyitás
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: terheléssel nem kapcsolódik a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Kérjük állatsa be a számozási sorozatokat a rendezvényekre a Telepítés &gt; Számozás sorozat alatt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A {0} számla nem létezik
 DocType: Account,Cash,Készpénz
 DocType: Employee,Short biography for website and other publications.,Rövid életrajz a honlaphoz és egyéb kiadványokhoz.
diff --git a/erpnext/translations/id.csv b/erpnext/translations/id.csv
index b8a0ed4..f536fd4 100644
--- a/erpnext/translations/id.csv
+++ b/erpnext/translations/id.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Sewaan
 DocType: Purchase Order,PO-,po
 DocType: POS Profile,Applicable for User,Berlaku untuk Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Berhenti Order Produksi tidak dapat dibatalkan, unstop terlebih dahulu untuk membatalkan"
 DocType: Vehicle Service,Mileage,Jarak tempuh
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Apakah Anda benar-benar ingin membatalkan aset ini?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pilih Default Pemasok
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pilih Default Pemasok
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Mata Uang diperlukan untuk Daftar Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dihitung dalam transaksi.
 DocType: Purchase Order,Customer Contact,Kontak Konsumen
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Posisi untuk {0} tidak bisa kurang dari nol ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standar 10 menit
 DocType: Leave Type,Leave Type Name,Nama Tipe Cuti
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Tampilkan terbuka
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tampilkan terbuka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series Berhasil Diupdate
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Periksa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entri Dikirim
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Barang kadaluarsa Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode Akun Pembayaran Rekening
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Tampilkan Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Tampilkan Varian
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Bahan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kuantitas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Kuantitas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabel account tidak boleh kosong.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Kredit (Kewajiban)
 DocType: Employee Education,Year of Passing,Tahun Berjalan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referensi:% s, Item Code:% s dan Pelanggan:% s"
 DocType: Item,Country of Origin,Negara Asal
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Dalam Persediaan
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,terbuka Isu
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kesehatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Keterlambatan pembayaran (Hari)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Beban layanan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Nomor Seri: {0} sudah dirujuk dalam Faktur Penjualan: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktur
 DocType: Maintenance Schedule Item,Periodicity,Periode
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Diharapkan Pengiriman Tanggal adalah menjadi sebelum Sales Order Tanggal
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Melampirkan file .csv dengan dua kolom, satu untuk nama lama dan satu untuk nama baru"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} tidak dalam Tahun Anggaran aktif.
 DocType: Packed Item,Parent Detail docname,Induk Detil docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referensi: {0}, Kode Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Lowongan untuk Pekerjaan.
 DocType: Item Attribute,Increment,Kenaikan
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Pilih Gudang ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pilih Gudang ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Periklanan (Promosi)
 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,Menikah
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Tidak diizinkan untuk {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Mendapatkan Stok Barang-Stok Barang dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak diizinkan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Mendapatkan Stok Barang-Stok Barang dari
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock tidak dapat diperbarui terhadap Delivery Note {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tidak ada item yang terdaftar
 DocType: Payment Reconciliation,Reconcile,Rekonsiliasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Toko Kelontongan
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 DocType: Process Payroll,Make Bank Entry,Buat Entri Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Dana pensiun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Berikutnya Penyusutan Tanggal tidak boleh sebelum Tanggal Pembelian
 DocType: SMS Center,All Sales Person,Semua Salesmen
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Distribusi Bulanan ** membantu Anda mendistribusikan Anggaran / Target di antara bulan-bulan jika bisnis Anda memiliki musim.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Tidak item yang ditemukan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Tidak item yang ditemukan
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama orang
 DocType: Sales Invoice Item,Sales Invoice Item,Faktur Penjualan Stok Barang
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",misalnya &quot;Sekolah Dasar&quot; atau &quot;Universitas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan saham
 DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk Konsumen {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Batas kredit telah menyeberang untuk Konsumen {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Jangka Tanggal Akhir tidak bisa lebih lambat dari Akhir Tahun Tanggal Tahun Akademik yang istilah terkait (Tahun Akademik {}). Perbaiki tanggal dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat dicentang, karena ada catatan Asset terhadap item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Aset Tetap"" tidak dapat dicentang, karena ada catatan Asset terhadap item"
 DocType: Vehicle Service,Brake Oil,rem Minyak
 DocType: Tax Rule,Tax Type,Jenis pajak
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak diizinkan untuk menambah atau memperbarui entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Gambar Stok Barang (jika tidak slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Sebuah Konsumen ada dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif per Jam / 60) * Masa Beroperasi Sebenarnya
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pilih BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Biaya Produk Terkirim
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Liburan di {0} bukan antara Dari Tanggal dan To Date
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,sekolah
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Tidak ada cuti record yang ditemukan untuk karyawan {0} untuk {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Silahkan masukkan perusahaan terlebih dahulu
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Silakan pilih Perusahaan terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Silakan pilih Perusahaan terlebih dahulu
 DocType: Employee Education,Under Graduate,Sarjana
 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
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,Nilai Klaim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,kelompok pelanggan duplikat ditemukan di tabel kelompok cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Supplier Type / Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Supplier Type / Supplier
 DocType: Naming Series,Prefix,Awalan
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,Kelas
 DocType: Sales Invoice Item,Delivered By Supplier,Terkirim Oleh Supplier
 DocType: SMS Center,All Contact,Semua Kontak
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Pesanan produksi sudah dibuat untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Pekerjaan sehari-hari
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} dibekukan
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Silakan pilih Perusahaan yang ada untuk menciptakan Chart of Account
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Beban Stok
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entri
 DocType: Journal Entry Account,Credit in Company Currency,Kredit di Perusahaan Mata
 DocType: Delivery Note,Installation Status,Status Instalasi
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Apakah Anda ingin memperbarui kehadiran? <br> Hadir: {0} \ <br> Absen: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Jumlah Diterima + Ditolak harus sama dengan jumlah yang diterima untuk Item {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Bahan pasokan baku untuk Pembelian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Setidaknya satu cara pembayaran diperlukan untuk POS faktur.
 DocType: Products Settings,Show Products as a List,Tampilkan Produk sebagai sebuah Daftar
 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.
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Membuat Penyusutan Masuk
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Permintaan Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,membuat Karyawan
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat Karyawan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Eksekusi
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Rincian operasi yang dilakukan.
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rencana kunjungan pemeliharaan.
 DocType: SMS Settings,Enter url parameter for message,Entrikan parameter url untuk pesan
 DocType: POS Profile,Customer Groups,Grup Pelanggan
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Laporan keuangan
 DocType: Guardian,Students,siswa
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Aturan untuk menerapkan harga dan diskon.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Harga List harus berlaku untuk Membeli atau Jual
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Jumlah muka tidak dapat lebih besar dari {0} {1}
 DocType: Naming Series,Series List for this Transaction,Daftar Series Transaksi ini
 DocType: Company,Default Payroll Payable Account,Default Payroll Hutang Akun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Grup
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Grup
 DocType: Sales Invoice,Is Opening Entry,Entri Pembuka?
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebutkan jika akun non-standar piutang yang berlaku
 DocType: Course Schedule,Instructor Name,instruktur Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Diterima pada
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jika dicentang, akan mencakup item non-saham di Permintaan Material."
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Stok Barang di Faktur Penjualan
 ,Production Orders in Progress,Order produksi dalam Proses
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Kas Bersih dari Pendanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyimpan"
 DocType: Lead,Address & Contact,Alamat & Kontak
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan 'cuti tak terpakai' dari alokasi sebelumnya
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Berikutnya Berulang {0} akan dibuat pada {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Jumlah (via Waktu Lembar)
 DocType: Item Website Specification,Item Website Specification,Item Situs Spesifikasi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Cuti Diblokir
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} telah mencapai akhir hidupnya pada {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Bursa Rekonsiliasi Stok Barang
 DocType: Stock Entry,Sales Invoice No,Nomor Faktur Penjualan
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Publikasikan di Hub
 DocType: Student Admission,Student Admission,Mahasiswa Pendaftaran
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Permintaan Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Penghapusan Cek dan Deposito yang Jatuh Tempo
 DocType: Item,Synced With Hub,Disinkronkan Dengan Hub
 DocType: Vehicle,Fleet Manager,armada Manajer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak bisa menjadi negatif untuk item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Kata Sandi Salah
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak bisa menjadi negatif untuk item {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Kata Sandi Salah
 DocType: Item,Variant Of,Varian Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Selesai Qty tidak dapat lebih besar dari 'Jumlah untuk Produksi'
 DocType: Period Closing Voucher,Closing Account Head,Penutupan Akun Kepala
 DocType: Employee,External Work History,Pengalaman Kerja Diluar
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Referensi Kesalahan melingkar
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui Email pada penciptaan Permintaan Bahan otomatis
 DocType: Journal Entry,Multi Currency,Multi Mata Uang
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipe Faktur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Nota Pengiriman
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Persiapan Pajak
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Biaya Asset Terjual
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Entri pembayaran telah dimodifikasi setelah Anda menariknya. Silakan menariknya lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
-DocType: Grade Interval,Min Score,Min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dimasukan dua kali dalam Pajak Stok Barang
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan kegiatan yang tertunda
 DocType: Student Applicant,Admitted,mengakui
 DocType: Workstation,Rent Cost,Biaya Sewa
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Nilai pesanan
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transaksi Bank / Cash terhadap partai atau untuk internal transfer
 DocType: Shipping Rule,Valid for Countries,Berlaku untuk Negara
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Stok Barang ini adalah Template dan tidak dapat digunakan dalam transaksi. Item atribut akan disalin ke dalam varian kecuali 'Tidak ada Copy' diatur
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order Diperhitungkan
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Penunjukan Karyawan (misalnya CEO, Direktur dll)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Entrikan 'Ulangi pada Hari Bulan' nilai bidang
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pembelian Faktur tidak dapat dilakukan terhadap aset yang ada {1}
 DocType: Item Tax,Tax Rate,Tarif Pajak
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} sudah dialokasikan untuk Karyawan {1} untuk periode {2} ke {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pilih Stok Barang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Pilih Stok Barang
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Faktur Pembelian {0} sudah Terkirim
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch ada harus sama {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Dikonversi ke non-Grup
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (banyak) dari Item.
 DocType: C-Form Invoice Detail,Invoice Date,Faktur Tanggal
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Hanya ada 1 Akun per Perusahaan di {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Silakan lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Buat Grup Mahasiswa
@@ -435,9 +437,9 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan Quotation
 DocType: Salary Slip Timesheet,Working Hours,Jam Kerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mengubah mulai / nomor urut saat ini dari seri yang ada.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Buat Pelanggan baru
-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.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Buat Purchase Order
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Aturan Harga terus menang, pengguna akan diminta untuk mengatur Prioritas manual untuk menyelesaikan konflik."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Buat Purchase Order
 ,Purchase Register,Register Pembelian
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Biaya yang Berlaku
@@ -445,7 +447,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Cuti'
 DocType: Purchase Receipt,Vehicle Date,Tanggal Kendaraan
 DocType: Student Log,Medical,Medis
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Alasan Kehilangan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Alasan Kehilangan
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Memimpin Pemilik tidak bisa sama Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,jumlah yang dialokasikan tidak bisa lebih besar dari jumlah yang disesuaikan
 DocType: Announcement,Receiver,Penerima
@@ -462,6 +464,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Jumlah dan Tingkat Harga
 DocType: Delivery Note,% Installed,% Terpasang
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Ruang kelas / Laboratorium dll di mana kuliah dapat dijadwalkan.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Silahkan masukkan nama perusahaan terlebih dahulu
 DocType: Purchase Invoice,Supplier Name,Nama Supplier
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Pedoman ERPNEXT
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Old Parent
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Bidang Wajib - Tahun Akademik
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sesuaikan teks pengantar yang berlangsung sebagai bagian dari email itu. Setiap transaksi memiliki teks pengantar yang terpisah.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Harap atur akun hutang default untuk perusahaan {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Pengaturan global untuk semua proses manufaktur.
 DocType: Accounts Settings,Accounts Frozen Upto,Akun dibekukan sampai dengan
 DocType: SMS Log,Sent On,Dikirim Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} karena beberapa kali dalam Atribut Tabel
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Tidak Berlaku
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Hari Libur.
 DocType: Request for Quotation Item,Required Date,Diperlukan Tanggal
 DocType: Delivery Note,Billing Address,Alamat Penagihan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Entrikan Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Entrikan Item Code.
 DocType: BOM,Costing,Biaya
 DocType: Tax Rule,Billing County,penagihan County
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Dari Package No
 DocType: Item Attribute,To Range,Berkisar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Efek Saham dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak dapat mengubah metode valuasi, karena ada transaksi terhadap beberapa item yang tidak memiliki metode penilaian sendiri"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah cuti wajib dialokasikan
 DocType: Job Opening,Description of a Job Opening,Deskripsi dari Lowongan Pekerjaan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kegiatan tertunda untuk hari ini
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Petugas Administrasi
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Silakan pilih Kursus
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Silakan pilih Perusahaan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Silakan pilih Perusahaan
 DocType: Stock Entry Detail,Difference Account,Perbedaan Akun
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Tidak bisa tugas sedekat tugas yang tergantung {0} tidak tertutup.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Entrikan Gudang yang Material Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Biaya Operasi Tambahan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut harus sama untuk kedua item"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telepon Darurat
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Membeli
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Harap tentukan nilai untuk Threshold 0%
 DocType: Sales Order,To Deliver,Mengirim
 DocType: Purchase Invoice Item,Item,Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial Item tidak dapat pecahan
 DocType: Journal Entry,Difference (Dr - Cr),Perbedaan (Dr - Cr)
 DocType: Account,Profit and Loss,Laba Rugi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Pengaturan Subkontrak
@@ -551,7 +556,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kenaikan tidak bisa 0
 DocType: Production Planning Tool,Material Requirement,Permintaan Material / Bahan
 DocType: Company,Delete Company Transactions,Hapus Transaksi Perusahaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referensi ada dan Tanggal referensi wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Pajak dan Biaya
 DocType: Purchase Invoice,Supplier Invoice No,Nomor Faktur Supplier
 DocType: Territory,For reference,Untuk referensi
@@ -562,7 +567,7 @@
 DocType: Installation Note Item,Installation Note Item,Laporan Instalasi Stok Barang
 DocType: Production Plan Item,Pending Qty,Qty Tertunda
 DocType: Budget,Ignore,Diabaikan
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS dikirim ke nomor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensi penyiapan cek untuk pencetakan
 DocType: Salary Slip,Salary Slip Timesheet,Daftar Absen Slip Gaji
@@ -571,13 +576,13 @@
 DocType: Sales Invoice,Total Commission,Jumlah Nilai Komisi
 DocType: Pricing Rule,Sales Partner,Mitra Penjualan
 DocType: Buying Settings,Purchase Receipt Required,Diperlukan Nota Penerimaan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tingkat penilaian adalah wajib jika Stock Membuka masuk
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Tingkat penilaian adalah wajib jika Stock Membuka masuk
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tidak ada catatan yang ditemukan dalam tabel Faktur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Silakan pilih Perusahaan dan Partai Jenis terlebih dahulu
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Keuangan / akuntansi Tahun Berjalan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai akumulasi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial Nos tidak dapat digabungkan"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Membuat Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Membuat Sales Order
 DocType: Project Task,Project Task,Tugas Proyek
 ,Lead Id,Id Kesempatan
 DocType: C-Form Invoice Detail,Grand Total,Nilai Jumlah Total
@@ -594,7 +599,7 @@
 DocType: Job Applicant,Resume Attachment,Lanjutkan Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumen Langganan
 DocType: Leave Control Panel,Allocate,Alokasi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retur Penjualan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Retur Penjualan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Catatan: Jumlah daun dialokasikan {0} tidak boleh kurang dari daun yang telah disetujui {1} untuk periode
 DocType: Announcement,Posted By,Dikirim oleh
 DocType: Item,Delivered by Supplier (Drop Ship),Dikirim oleh Supplier (Drop Shipment)
@@ -604,7 +609,7 @@
 DocType: Quotation,Quotation To,Quotation Untuk
 DocType: Lead,Middle Income,Penghasilan Menengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Jumlah yang dialokasikan tidak dijinkan negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Harap atur Perusahaan
 DocType: Purchase Order Item,Billed Amt,Nilai Tagihan
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Penjualan Faktur Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensi ada & Referensi Tanggal diperlukan untuk {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Account Pembayaran untuk membuat Bank Masuk
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Buat catatan Karyawan untuk mengelola daun, klaim biaya dan gaji"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tambahkan ke Basis Pengetahuan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Proposal
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Masuk Pengurangan
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Anggaran {2}
 DocType: Buying Settings,Settings for Buying Module,Pengaturan untuk Modul Pembelian
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Aset {0} bukan milik perusahaan {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Cukup masukkan Nota Penerimaan terlebih dahulu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Cukup masukkan Nota Penerimaan terlebih dahulu
 DocType: Buying Settings,Supplier Naming By,Penamaan Supplier Berdasarkan
 DocType: Activity Type,Default Costing Rate,Standar Tingkat Biaya
 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 Konsumen, Kelompok Konsumen, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Kemudian Pricing Aturan disaring berdasarkan Konsumen, Kelompok Konsumen, Wilayah, Supplier, Supplier Type, Kampanye, Penjualan Mitra dll"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Perubahan Nilai bersih dalam Persediaan
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Manajemen Kredit Karyawan
 DocType: Employee,Passport Number,Nomor Paspor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Hubungan dengan Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manajer
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Untuk
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Rentang Tanggal
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},batas kredit baru kurang dari jumlah yang luar biasa saat ini bagi pelanggan. batas kredit harus minimal {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Item yang sama telah dimasukkan beberapa kali.
 DocType: SMS Settings,Receiver Parameter,Parameter Penerima
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Berdasarkan' dan 'Kelompokkan Dengan' tidak bisa sama
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,Dalam menit
 DocType: Issue,Resolution Date,Tanggal Resolusi
 DocType: Student Batch Name,Batch Name,Batch Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Absen dibuat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Absen dibuat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Silakan set Cash standar atau rekening Bank Mode Pembayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Mendaftar
 DocType: Selling Settings,Customer Naming By,Penamaan Konsumen Dengan
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Akan menampilkan siswa sebagai Hadir di Student Bulanan Kehadiran Laporan
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Waktu Mulai Aktual
 DocType: BOM Operation,Operation Time,Waktu Operasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Selesai
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Mendasarkan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Mendasarkan
 DocType: Timesheet,Total Billed Hours,Total Jam Ditagih
 DocType: Journal Entry,Write Off Amount,Jumlah Nilai Write Off
 DocType: Journal Entry,Bill No,Nomor Tagihan
@@ -709,7 +713,7 @@
 DocType: Student Attendance,Student Attendance,Kehadiran mahasiswa
 DocType: Sales Invoice Timesheet,Time Sheet,Lembar waktu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Baku Berbasis Pada
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Harap Masukan Item Detail
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Harap Masukan Item Detail
 DocType: Interest,Interest,Bunga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pra penjualan
 DocType: Purchase Receipt,Other Details,Detail lainnya
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Entri pembayaran sudah dibuat
 DocType: Purchase Receipt Item Supplied,Current Stock,Stok saat ini
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Aset {1} tidak terkait dengan Butir {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Slip Gaji Preview
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Slip Gaji Preview
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akun {0} telah dimasukkan beberapa kali
 DocType: Account,Expenses Included In Valuation,Biaya Termasuk di Dalam Penilaian Barang
 DocType: Hub Settings,Seller City,Kota Penjual
 ,Absent Student Report,Laporan Absen Siswa
 DocType: Email Digest,Next email will be sent on:,Email berikutnya akan dikirim pada:
 DocType: Offer Letter Term,Offer Letter Term,Term Surat Penawaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item memiliki varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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 Stok
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Perusahaan {0} tidak ada
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Jenis Tingkat Tree
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Jenis Tingkat Tree
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty Dikonsumsi Per Unit
 DocType: Serial No,Warranty Expiry Date,Tanggal Berakhir Garansi
 DocType: Material Request Item,Quantity and Warehouse,Kuantitas dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Komisi Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Silahkan pilih Program
 DocType: Project,Estimated Cost,Estimasi biaya
 DocType: Purchase Order,Link to material requests,Link ke permintaan bahan
@@ -754,7 +757,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} bukan merupakan Stok Barang persediaan
 DocType: Mode of Payment Account,Default Account,Akun Standar
 DocType: Payment Entry,Received Amount (Company Currency),Menerima Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Kesempatan harus diatur apabila Peluang berasal dari Kesempatan
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Silakan pilih dari hari mingguan
 DocType: Production Order Operation,Planned End Time,Rencana Waktu Berakhir
 ,Sales Person Target Variance Item Group-Wise,Sales Person Sasaran Variance Stok Barang Group-Wise
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Peluang Dari
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Laporan gaji bulanan.
 DocType: BOM,Website Specifications,Website Spesifikasi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} tipe {1}
 DocType: Warranty Claim,CI-,cipher
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor Konversi adalah wajib
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,Rekening Bank No.
 DocType: Bank Guarantee,Project,Proyek
 DocType: Quality Inspection Reading,Reading 7,Membaca 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,sebagian Memerintahkan
 DocType: Expense Claim Detail,Expense Claim Type,Tipe Beban Klaim
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Pengaturan default untuk Belanja
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Aset membatalkan via Journal Entri {0}
@@ -830,14 +835,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Beban Pemeliharaan Kantor
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Menyiapkan Akun Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Entrikan Stok Barang terlebih dahulu
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Entrikan Stok Barang terlebih dahulu
 DocType: Account,Liability,Kewajiban
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksi Jumlah tidak dapat lebih besar dari Klaim Jumlah dalam Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standar Harga Pokok Penjualan
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Daftar Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Kirim Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Peringatan: Lampiran tidak valid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Tidak ada Izin
 DocType: Company,Default Bank Account,Standar Rekening Bank
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menyaring berdasarkan Party, pilih Partai Ketik terlebih dahulu"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tidak ada karyawan yang ditemukan
 DocType: Supplier Quotation,Stopped,Terhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak ke vendor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Student Group sudah diupdate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Student Group sudah diupdate
 DocType: SMS Center,All Customer Contact,Semua Kontak Konsumen
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload keseimbangan Stok melalui csv.
 DocType: Warehouse,Tree Details,Detail pohon
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Nilai Minimum Faktur
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Biaya Pusat {2} bukan milik Perusahaan {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akun {2} tidak dapat di Kelompokkan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas &#39;{doctype}&#39; table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {idx}: {doctype} {DOCNAME} tidak ada di atas &#39;{doctype}&#39; table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Absen {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tidak ada tugas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari bulan yang otomatis faktur akan dihasilkan misalnya 05, 28 dll"
 DocType: Asset,Opening Accumulated Depreciation,Membuka Penyusutan Akumulasi
@@ -878,7 +883,7 @@
 DocType: Bin,Moving Average Rate,Tingkat Moving Average
 DocType: Production Planning Tool,Select Items,Pilih Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} terhadap Bill {1} tanggal {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Jadwal Kuliah
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadwal Kuliah
 DocType: Maintenance Visit,Completion Status,Status Penyelesaian
 DocType: HR Settings,Enter retirement age in years,Memasuki usia pensiun di tahun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Gudang
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Biarkan selama pengiriman atau penerimaan upto persen ini
 DocType: Stock Entry,STE-,Ste-
 DocType: Upload Attendance,Import Attendance,Impor Absensi
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Semua Grup Stok Barang/Item
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Grup Stok Barang/Item
 DocType: Process Payroll,Activity Log,Log Aktivitas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Laba / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Secara otomatis menulis pesan pada pengajuan transaksi.
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Order Pembelian untuk Dibayar
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proyeksi Qty
 DocType: Sales Invoice,Payment Due Date,Tanggal Jatuh Tempo Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Varian {0} sudah ada dengan atribut yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Awal'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka yang Harus Dilakukan
 DocType: Notification Control,Delivery Note Message,Pesan Nota Pengiriman
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tanggal Block List Cuti
 DocType: Pricing Rule,Price or Discount,Harga atau Diskon
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total Biaya Berlaku di Purchase meja Jenis Penerimaan harus sama dengan jumlah Pajak dan Biaya
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total Biaya Berlaku di Purchase meja Jenis Penerimaan harus sama dengan jumlah Pajak dan Biaya
 DocType: Sales Team,Incentives,Insentif
 DocType: SMS Log,Requested Numbers,Nomor yang Diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Mendapatkan Bahan Baku
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak?
 DocType: Item Attribute,Item Attribute Values,Item Nilai Atribut
 DocType: Examination Result,Examination Result,Hasil pemeriksaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Nota Penerimaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Nota Penerimaan
 ,Received Items To Be Billed,Produk Diterima Akan Ditagih
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Dikirim Slips Gaji
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Master Nilai Mata Uang
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referensi DOCTYPE harus menjadi salah satu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referensi DOCTYPE harus menjadi salah satu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat menemukan waktu Slot di {0} hari berikutnya untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Planning Material untuk Barang Rakitan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Mitra Penjualan dan Wilayah
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,tidak dapat secara otomatis membuat Account sebagai sudah ada keseimbangan saham di Rekening. Anda harus membuat account yang cocok sebelum Anda dapat membuat sebuah entri di gudang ini
@@ -971,10 +976,9 @@
 DocType: Supplier,Default Payable Accounts,Standar Akun Hutang
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Karyawan {0} tidak aktif atau tidak ada
 DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varian {0} diperbarui
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Cukup masukkan Aset Kategori dalam angka {0}
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak bisa {0} {1} {2} tanpa faktur yang beredar negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Uang Muka Faktur Pembelian
 DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Baris {0}: entry Kredit tidak dapat dihubungkan dengan {1}
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,Stok Dibeli dari Supplier
 DocType: Asset,Purchase Invoice,Faktur Pembelian
 DocType: Stock Ledger Entry,Voucher Detail No,Nomor Detail Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Baru Faktur Penjualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Baru Faktur Penjualan
 DocType: Stock Entry,Total Outgoing Value,Nilai Total Keluaran
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tanggal dan Closing Date membuka harus berada dalam Tahun Anggaran yang sama
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tanggal dan Closing Date membuka harus berada dalam Tahun Anggaran yang sama
 DocType: Lead,Request for Information,Request for Information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sinkronisasi Offline Faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sinkronisasi Offline Faktur
 DocType: Payment Request,Paid,Dibayar
 DocType: Program Fee,Program Fee,Biaya Program
 DocType: Salary Slip,Total in words,Jumlah kata
@@ -1002,7 +1006,7 @@
 DocType: Employee Loan,Sanctioned,sanksi
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,Wajib diisi. Mungkin Kurs Mata Uang belum 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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 barang-barang 'Bundel Produk', Gudang, Nomor Serial dan Nomor Batch akan diperhitungkan dari tabel 'Packing List'. Bila Gudang dan Nomor Batch sama untuk semua barang-barang kemasan dari segala barang 'Bundel Produk', maka nilai tersebut dapat dimasukkan dalam tabel Barang utama, nilai tersebut akan disalin ke tabel 'Packing List'."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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 barang-barang 'Bundel Produk', Gudang, Nomor Serial dan Nomor Batch akan diperhitungkan dari tabel 'Packing List'. Bila Gudang dan Nomor Batch sama untuk semua barang-barang kemasan dari segala barang 'Bundel Produk', maka nilai tersebut dapat dimasukkan dalam tabel Barang utama, nilai tersebut akan disalin ke tabel 'Packing List'."
 DocType: Job Opening,Publish on website,Mempublikasikan di website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Pengiriman ke Konsumen.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Pemasok Faktur Tanggal tidak dapat lebih besar dari Posting Tanggal
@@ -1013,7 +1017,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Nama Perusahaan
 DocType: SMS Center,Total Message(s),Total Pesan (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Pilih item untuk transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default akun Bank / Cash akan secara otomatis diperbarui di Gaji Journal Entri saat mode ini dipilih.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Interval untuk Kode kelas {0} tumpang tindih dengan interval kelas untuk kelas lainnya. Silakan periksa interval {0} dan {1} dan coba lagi
 DocType: BOM,Raw Material Cost(Company Currency),Biaya Bahan Baku (Perusahaan Mata Uang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Semua item telah dialihkan untuk Order Produksi ini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Baris # {0}: Tarif tidak boleh lebih besar dari tarif yang digunakan di {1} {2}
@@ -1037,13 +1039,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Situs Barang
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload kop surat dan logo. (Anda dapat mengeditnya nanti).
 DocType: Timesheet Detail,Bill,Tagihan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Berikutnya Penyusutan Tanggal dimasukkan sebagai tanggal terakhir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Putih
 DocType: SMS Center,All Lead (Open),Semua Kesempatan (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} di gudang {1} pada postingan kali entri ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Dapatkan Uang Muka Dibayar
 DocType: Item,Automatically Create New Batch,Buat Batch Baru secara otomatis
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Membuat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Membuat
 DocType: Student Admission,Admission Start Date,Pendaftaran Mulai Tanggal
 DocType: Journal Entry,Total Amount in Words,Jumlah Total dalam Kata
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Ada kesalahan. Salah satu alasan yang mungkin bisa jadi Anda belum menyimpan formulir. Silahkan hubungi support@erpnext.com jika masalah terus berlanjut.
@@ -1051,7 +1053,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type harus menjadi salah satu {0}
 DocType: Lead,Next Contact Date,Tanggal Komunikasi Selanjutnya
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qty Pembukaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Silahkan masukkan account untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Mahasiswa Nama Batch
 DocType: Holiday List,Holiday List Name,Daftar Nama Hari Libur
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Jumlah Pinjaman
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Tentukan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Item dihapus dengan tidak ada perubahan dalam jumlah atau nilai.
 DocType: Delivery Note,Delivery To,Pengiriman Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabel atribut wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabel atribut wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Order Penjualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak dapat negatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Diskon
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Diskon
 DocType: Asset,Total Number of Depreciations,Total Jumlah Penyusutan
 DocType: Sales Invoice Item,Rate With Margin,Tingkat Dengan Margin
 DocType: Workstation,Wages,Upah
@@ -1089,7 +1091,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Gudang di Sales Order / Stok Barang Jadi Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Nilai Penjualan
 DocType: Repayment Schedule,Interest Amount,Jumlah bunga
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver untuk record ini. Silakan Update 'Status' dan Simpan
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda adalah Approver untuk record ini. Silakan Update 'Status' dan Simpan
 DocType: Serial No,Creation Document No,Nomor Dokumen
 DocType: Issue,Issue,Masalah / Isu
 DocType: Asset,Scrapped,membatalkan
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atribut untuk Item Varian. misalnya Ukuran, Warna dll"
 DocType: Purchase Invoice,Returns,Pengembalian
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Gudang
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial ada {0} berada di bawah kontrak pemeliharaan upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Pengerahan
 DocType: Lead,Organization Name,Nama Organisasi
 DocType: Tax Rule,Shipping State,Negara Pengirim
 ,Projected Quantity as Source,Proyeksi Jumlah sebagai Sumber
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item harus ditambahkan dengan menggunakan 'Dapatkan Produk dari Pembelian Penerimaan' tombol
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Termasuk item non-saham
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Beban Penjualan
@@ -1110,12 +1112,12 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Standar Pusat Biaya Jual
 DocType: Sales Partner,Implementation Partner,Mitra Implementasi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kode Pos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Kode Pos
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} adalah {1}
 DocType: Opportunity,Contact Info,Informasi Kontak
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Membuat Stok Entri
 DocType: Packing Slip,Net Weight UOM,Uom Berat Bersih
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Hasil
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Hasil
 DocType: Item,Default Supplier,Supplier Standar
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Selama Penyisihan Produksi Persentase
 DocType: Employee Loan,Repayment Schedule,Jadwal pembayaran
@@ -1123,7 +1125,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Tanggal Libur Mingguan
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tanggal Berakhir tidak boleh lebih awal dari Tanggal Mulai
 DocType: Sales Person,Select company name first.,Pilih nama perusahaan terlebih dahulu.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Penawaran Diterima dari Supplier
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Rata-rata Usia
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Area Kinerja Kunci
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportasi
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut yang tidak valid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} harus di-posting
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} harus di-posting
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kuantitas harus kurang dari atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Karakter
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Silakan pilih BOM BOM di lapangan untuk Item {0}
@@ -1152,7 +1154,7 @@
 DocType: Sales Partner,Distributor,Distributor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Aturan Pengiriman Belanja Shoping Cart
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Order produksi {0} harus dibatalkan sebelum membatalkan Sales Order ini
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Silahkan mengatur &#39;Terapkan Diskon tambahan On&#39;
 ,Ordered Items To Be Billed,Item Pesanan Tertagih
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Dari Rentang harus kurang dari Untuk Rentang
 DocType: Global Defaults,Global Defaults,Standar Global
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Mulai Tahun
 DocType: Purchase Invoice,Start date of current invoice's period,Tanggal faktur periode saat ini mulai
 DocType: Salary Slip,Leave Without Pay,Cuti Tanpa Bayar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kesalahan Perencanaan Kapasitas
 ,Trial Balance for Party,Trial Balance untuk Partai
 DocType: Lead,Consultant,Konsultan
 DocType: Salary Slip,Earnings,Pendapatan
@@ -1177,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan ditambahkan ke Item Code dari varian. Sebagai contoh, jika Anda adalah singkatan ""SM"", dan kode Stok Barang adalah ""T-SHIRT"", kode item varian akan ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Bersih (dalam kata-kata) akan terlihat setelah Anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Retur Barang
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Kembali / Debit Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Kembali / Debit Note
 DocType: Price List Country,Price List Country,Negara Daftar Harga
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nomor seri berlaku untuk Item {1}
@@ -1187,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Masukkan Item Code untuk mendapatkan Nomor Batch
 DocType: Stock Settings,Default Item Group,Standar Item Grup
 DocType: Employee Loan,Partially Disbursed,sebagian Dicairkan
-DocType: Grading Structure,Grading System Name,Nama Grading Sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database Supplier.
 DocType: Account,Balance Sheet,Neraca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Biaya Center For Stok Barang dengan Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modus pembayaran tidak dikonfigurasi. Silakan periksa, apakah akun telah ditetapkan pada Cara Pembayaran atau POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Sales Anda akan mendapatkan pengingat pada tanggal ini untuk menghubungi Konsumen
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak dapat dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Account lebih lanjut dapat dibuat di bawah Grup, tapi entri dapat dilakukan terhadap non-Grup"
@@ -1203,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Purchase Order Items Akan Ditagih
 DocType: Purchase Invoice Item,Net Rate,Nilai Bersih / Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Stok Barang Faktur Pembelian
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Bursa Ledger Entries dan GL Entri ulang untuk Pembelian Penerimaan yang dipilih
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Bursa Ledger Entries dan GL Entri ulang untuk Pembelian Penerimaan yang dipilih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Item 1
 DocType: Holiday,Holiday,Hari Libur
 DocType: Support Settings,Close Issue After Days,Tutup Isu Setelah Days
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Pekerjaan Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Silakan tentukan setidaknya satu atribut dalam tabel Atribut
 DocType: Announcement,All Students,Semua murid
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} harus item non-saham
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} harus item non-saham
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Buku Besar
 DocType: Grading Scale,Intervals,interval
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Paling Awal
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Item Grup ada dengan nama yang sama, ubah nama item atau mengubah nama kelompok Stok Barang"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Mahasiswa Nomor Ponsel
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Item {0} tidak dapat memiliki Batch
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Pembayaran gaji dari {0} ke {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Tidak berwenang untuk mengedit Akun frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,Dapatkan Faktur Berjalan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Order Penjualan {0} tidak valid
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu Anda merencanakan dan menindaklanjuti pembelian Anda
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Maaf, perusahaan tidak dapat digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Total Issue / transfer kuantitas {0} Material Permintaan {1} \ tidak dapat lebih besar dari yang diminta kuantitas {2} untuk Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
@@ -1294,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Biaya tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Produk atau Jasa
 DocType: Mode of Payment,Mode of Payment,Mode Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,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 +180,Website Image should be a public file or website URL,Website Image harus file umum atau URL situs
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kelompok Stok Barang akar dan tidak dapat diedit.
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Nomor roll grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya rekening kredit dapat dihubungkan dengan entri debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total semua bobot tugas harus 1. Sesuaikan bobot dari semua tugas Proyek sesuai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota pengiriman {0} tidak Terkirim
 apps/erpnext/erpnext/stock/get_item_details.py +141,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,Perlengkapan 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 terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule harga terlebih dahulu dipilih berdasarkan 'Terapkan On' lapangan, yang dapat Stok Barang, Stok Barang Grup atau Merek."
 DocType: Hub Settings,Seller Website,Situs Penjual
 DocType: Item,ITEM-,BARANG-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Persentase total yang dialokasikan untuk tim penjualan harus 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status Order produksi adalah {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status Order produksi adalah {0}
 DocType: Appraisal Goal,Goal,Sasaran
 DocType: Sales Invoice Item,Edit Description,Edit Keterangan
 ,Team Updates,tim Pembaruan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Untuk Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Untuk Supplier
 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),Jumlah Nilai Total (Mata Uang Perusahaan)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Buat Print Format
@@ -1341,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entri
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} item berlangsung
 DocType: Workstation,Workstation Name,Nama Workstation
-DocType: Grade Interval,Grade Code,Kode kelas
+DocType: Grading Scale Interval,Grade Code,Kode kelas
 DocType: POS Item Group,POS Item Group,POS Barang Grup
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} bukan milik Stok Barang {1}
@@ -1357,7 +1358,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Perangkat keras
 DocType: Sales Order,Recurring Upto,berulang Upto
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Silakan pilih sebuah Perusahaan
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Silakan pilih sebuah Perusahaan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Tanggal Faktur Supplier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Anda harus mengaktifkan Keranjang Belanja
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Rentang Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Tidak ada Kunjungan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark absensi
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark absensi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Jadwal Pemeliharaan {0} ada terhadap {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,mahasiswa Mendaftarkan
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata uang dari Rekening Penutupan harus {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah poin untuk semua tujuan harus 100. Ini adalah {0}
@@ -1398,7 +1400,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Rata-rata Harian Outgoing
 DocType: POS Profile,Campaign,Promosi
 DocType: Supplier,Name and Type,Nama dan Jenis
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Status Persetujuan harus 'Disetujui' atau 'Ditolak'
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Jadwal Tanggal Mulai' tidak dapat lebih besar dari 'Jadwal Tanggal Selesai'"
 DocType: Course Scheduling Tool,Course End Date,Tentu saja Tanggal Akhir
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Alamat Pengiriman
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,tidak dapat lebih besar dari 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,tidak dapat lebih besar dari 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} bukan merupakan Stok Stok Barang
 DocType: Maintenance Visit,Unscheduled,Tidak Terjadwal
 DocType: Employee,Owned,Dimiliki
 DocType: Salary Detail,Depends on Leave Without Pay,Tergantung pada Cuti Tanpa Bayar
 DocType: Pricing Rule,"Higher the number, higher the priority","Semakin tinggi angkanya, semakin tinggi prioritas"
 ,Purchase Invoice Trends,Pembelian Faktur Trends
 DocType: Employee,Better Prospects,Prospek yang Lebih Baik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Baris # {0}: Kumpulan {1} hanya memiliki {2} qty. Silakan pilih batch lain yang memiliki {3} qty available atau membagi baris menjadi beberapa baris, untuk mengirimkan / mengeluarkan dari beberapa batch"
 DocType: Vehicle,License Plate,Pelat
 DocType: Appraisal,Goals,tujuan
 DocType: Warranty Claim,Warranty / AMC Status,Garansi / Status AMC
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Karyawan tidak bisa melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika account beku, entri yang diizinkan untuk pengguna terbatas."
 DocType: Email Digest,Bank Balance,Saldo bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entri Akuntansi untuk {0}: {1} hanya dapat dilakukan dalam mata uang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil pekerjaan, kualifikasi yang dibutuhkan dll"
 DocType: Journal Entry Account,Account Balance,Saldo Akun Rekening
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Aturan pajak untuk transaksi.
@@ -1458,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tampilkan P &amp; saldo L tahun fiskal tertutup ini
 DocType: Shipping Rule,Shipping Account,Account Pengiriman
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akun {2} tidak aktif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Membuat Penjualan Pesanan untuk membantu Anda merencanakan pekerjaan Anda dan memberikan tepat waktu
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Membuat Penjualan Pesanan untuk membantu Anda merencanakan pekerjaan Anda dan memberikan tepat waktu
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Total Biaya Tambahan
 DocType: Course Schedule,SH,SH
@@ -1469,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Untuk Dinilai
 DocType: Asset Movement,Stock Manager,Manajer Stok Barang
 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/delivery_note/delivery_note.js +814,Packing Slip,Slip Packing
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Slip Packing
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Sewa Kantor
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Pengaturan gerbang Pengaturan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Impor Gagal!
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Jasa
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Gaji ke Karyawan
 DocType: Cost Center,Parent Cost Center,Parent Biaya Pusat
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Pilih Kemungkinan Pemasok
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Pilih Kemungkinan Pemasok
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Tampilkan ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Cuti Tanpa Bayar
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Aset Kategori adalah wajib untuk item aset tetap
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tidak ada catatan yang ditemukan dalam tabel Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
 DocType: Student Attendance Tool,Students HTML,siswa HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Tanggal Meninggalkan
 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/utilities/activation.py +64,Create Leads,Buat Memimpin
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Buat Memimpin
 DocType: Maintenance Schedule,Schedules,Jadwal
 DocType: Purchase Invoice Item,Net Amount,Nilai Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,No. Rincian BOM
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Terdaftar
 DocType: Sales Invoice Item,Brand Name,Merek Nama
 DocType: Purchase Receipt,Transporter Details,Detail transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,gudang standar diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kotak
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mungkin Pemasok
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mungkin Pemasok
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisasi
 DocType: Budget,Monthly Distribution,Distribusi bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List kosong. Silakan membuat Receiver List
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Sasaran Mitra Penjualan
 DocType: Loan Type,Maximum Loan Amount,Maksimum Jumlah Pinjaman
 DocType: Pricing Rule,Pricing Rule,Aturan Harga
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Nomor pengguliran duplikat untuk siswa {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Nomor pengguliran duplikat untuk siswa {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Anggaran Tahunan Melebihi
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Permintaan Material untuk Order Pembelian
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran Sukses URL
@@ -1572,9 +1575,9 @@
 DocType: Employee Loan,Repayment Method,Metode pembayaran
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jika diperiksa, Home page akan menjadi default Barang Group untuk website"
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM default untuk {0} tidak ditemukan untuk Proyek {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM default untuk {0} tidak ditemukan untuk Proyek {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Klaim untuk biaya perusahaan.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Siswa di jantung dari sistem, menambahkan semua siswa Anda"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Siswa di jantung dari sistem, menambahkan semua siswa Anda"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: tanggal Jarak {1} tidak bisa sebelum Cek Tanggal {2}
 DocType: Company,Default Holiday List,Standar Daftar Hari Libur
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Waktu dan Untuk Waktu {1} adalah tumpang tindih dengan {2}
@@ -1586,21 +1589,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) yang Anda lamar cuti adalah hari libur. Anda tidak perlu mengajukan cuti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Kirim ulang Pembayaran Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,tugas baru
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Membuat Quotation
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Membuat Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lainnya
 DocType: Dependent Task,Dependent Task,Tugas Dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor konversi untuk Unit default Ukur harus 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih dari {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Coba operasi untuk hari X perencanaan di muka.
 DocType: HR Settings,Stop Birthday Reminders,Stop Pengingat Ulang Tahun
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Silahkan mengatur default Payroll Hutang Akun di Perusahaan {0}
 DocType: SMS Center,Receiver List,Daftar Penerima
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cari Barang
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Cari Barang
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Dikonsumsi Jumlah
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan bersih dalam kas
 DocType: Assessment Plan,Grading Scale,Skala penilaian
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Sudah lengkap
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Satuan Ukur {0} telah dimasukkan lebih dari sekali dalam Faktor Konversi Tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Sudah lengkap
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Permintaan pembayaran sudah ada {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Biaya Produk Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Kuantitas tidak boleh lebih dari {0}
@@ -1632,12 +1635,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Membuat Pencairan Masuk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Muka melawan Supplier harus mendebet
 DocType: Company,Default Values,Nilai Default
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekuensi} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah Total diganti
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Hal ini didasarkan pada log terhadap kendaraan ini. Lihat timeline di bawah untuk rincian
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Mengumpulkan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Terhadap Faktur Supplier {0} di tanggal {1}
 DocType: Customer,Default Price List,Standar List Harga
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Gerakan aset catatan {0} dibuat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak dapat menghapus Tahun Anggaran {0}. Tahun fiskal {0} diatur sebagai default di Global Settings
 DocType: Journal Entry,Entry Type,Entri Type
 ,Customer Credit Balance,Saldo Kredit Konsumen
@@ -1654,7 +1658,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Pembelian
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Tak satu pun dari item memiliki perubahan kuantitas atau nilai.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Bidang wajib - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garansi Klaim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garansi Klaim
 ,Lead Details,Detail Kesempatan
 DocType: Salary Slip,Loan repayment,Pembayaran pinjaman
 DocType: Purchase Invoice,End date of current invoice's period,Tanggal akhir periode faktur saat ini
@@ -1673,11 +1677,10 @@
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Uang muka yang dibayar terhadap {0} {1} tidak dapat lebih besar \ dari Grand Total {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Silahkan pilih kode Stok Barang
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Silahkan pilih kode Stok Barang
 DocType: Student Sibling,Studying in Same Institute,Belajar di Same Institute
 DocType: Territory,Territory Manager,Manager Wilayah
 DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Dibayar Jumlah (Perusahaan Mata Uang)
 DocType: Purchase Invoice,Additional Discount,Diskon Tambahan
 DocType: Selling Settings,Selling Settings,Pengaturan Penjualan
@@ -1687,9 +1690,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Beban Pemasaran
 ,Item Shortage Report,Laporan Kekurangan Barang / Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \n Sebutkan ""Berat UOM"" terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"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 Entri Bursa ini
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Berikutnya Penyusutan Tanggal wajib untuk aset baru
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Berikutnya Penyusutan Tanggal wajib untuk aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Kelompok terpisah berdasarkan Kelompok untuk setiap Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unit tunggal Item.
 DocType: Fee Category,Fee Category,biaya Kategori
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Biaya diperlukan untuk akun 'Rugi Laba' {2}. Silakan membuat Pusat Biaya default untuk Perusahaan.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Konsumen sudah ada dengan nama yang sama, silakan mengubah nama Konsumen atau mengubah nama Grup Konsumen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Kelompok Konsumen sudah ada dengan nama yang sama, silakan mengubah nama Konsumen atau mengubah nama Grup Konsumen"
 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
@@ -1723,7 +1725,7 @@
 ,Item-wise Sales Register,Item-wise Daftar Penjualan
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Gross
 DocType: Asset,Depreciation Method,Metode penyusutan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Apakah Pajak ini termasuk dalam Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Jumlah Target
 DocType: Program Course,Required,Wajib
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Rekonsiliasi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak kolom. Mengekspor laporan dan mencetaknya menggunakan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,No. Batch
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Tidak dapat menemukan tukar untuk {0} ke {1} untuk tanggal kunci {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Memungkinkan Penjualan beberapa Order terhadap Purchase Order Konsumen
 DocType: Student Group Instructor,Student Group Instructor,Instruktur Kelompok Mahasiswa
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Ponsel Tidak
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Mengatur awalan untuk penomoran seri pada transaksi Anda
 DocType: Employee Attendance Tool,Employees HTML,Karyawan HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Standar BOM ({0}) harus aktif untuk item ini atau template-nya
 DocType: Employee,Leave Encashed?,Cuti dicairkan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Dari Bidang Usaha Wajib Diisi
 DocType: Email Digest,Annual Expenses,Beban tahunan
 DocType: Item,Variants,Varian
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Buat Order Pembelian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Buat Order Pembelian
 DocType: SMS Center,Send To,Kirim Ke
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada saldo cuti cukup bagi Leave Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang dialokasikan
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kode Barang/Item Konsumen
 DocType: Stock Reconciliation,Stock Reconciliation,Rekonsiliasi Stok
 DocType: Territory,Territory Name,Nama Wilayah
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Kerja-in-Progress Gudang diperlukan sebelum Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon untuk Lowongan Pekerjaan
 DocType: Purchase Order Item,Warehouse and Reference,Gudang dan Referensi
 DocType: Supplier,Statutory info and other general information about your Supplier,Info Statutory dan informasi umum lainnya tentang Supplier Anda
 DocType: Item,Serial Nos and Batches,Serial Nos dan Batches
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Kekuatan Kelompok Mahasiswa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Entri Jurnal {0} sama sekali tidak memiliki ketidakcocokan {1} entri
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Entri Jurnal {0} sama sekali tidak memiliki ketidakcocokan {1} entri
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Penilaian
 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
-DocType: Grading Structure,Grading Intervals,Interval Grading
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,masukkan
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Tidak bisa overbill untuk Item {0} berturut-turut {1} lebih dari {2}. Untuk memungkinkan over-billing, silakan diatur dalam Membeli Pengaturan"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Silahkan mengatur filter berdasarkan Barang atau Gudang
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} harus diserahkan
 DocType: Authorization Control,Authorization Control,Pengendali Otorisasi
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Ditolak Gudang adalah wajib terhadap ditolak Stok Barang {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pembayaran
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Mengelola pesanan Anda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pembayaran
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Mengelola pesanan Anda
 DocType: Production Order Operation,Actual Time and Cost,Waktu dan Biaya Aktual
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Permintaan Bahan maksimal {0} dapat dibuat untuk Item {1} terhadap Sales Order {2}
 DocType: Employee,Salutation,Panggilan
 DocType: Course,Course Abbreviation,Singkatan saja
 DocType: Student Leave Application,Student Leave Application,Mahasiswa Cuti Aplikasi
 DocType: Item,Will also apply for variants,Juga akan berlaku untuk varian
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aset tidak dapat dibatalkan, karena sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Karyawan {0} tentang Half hari {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak boleh lebih besar dari max jam kerja {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Nyala
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel item pada saat penjualan.
 DocType: Quotation Item,Actual Qty,Jumlah Aktual
 DocType: Sales Invoice Item,References,Referensi
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan item yang sama. Harap diperbaiki dan coba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Rekan
 DocType: Asset Movement,Asset Movement,Gerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Cart baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Cart baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} bukan merupakan Stok Barang serial
 DocType: SMS Center,Create Receiver List,Buat Daftar Penerima
 DocType: Vehicle,Wheels,roda
@@ -1828,9 +1829,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Menonaktifkan penciptaan log waktu terhadap Order Produksi. Operasi tidak akan dilacak terhadap Orde Produksi
 DocType: Student,Student Mobile Number,Mahasiswa Nomor Ponsel
 DocType: Item,Has Variants,Memiliki Varian
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Anda sudah memilih item dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Distribusi Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Induk Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Faktur Berulang/Langganan
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Pengelolaan Proyek
@@ -1838,11 +1839,11 @@
 DocType: Budget,Fiscal Year,Tahun Fiskal
 DocType: Vehicle Log,Fuel Price,Harga BBM
 DocType: Budget,Budget,Anggaran belanja
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus item non-saham.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset Item harus item non-saham.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Anggaran tidak dapat ditugaskan terhadap {0}, karena itu bukan Penghasilan atau Beban akun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Form aplikasi Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Wilayah / Konsumen
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Wilayah / Konsumen
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,misalnya 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Tinggalkan Jenis {0} tidak dapat dialokasikan karena itu pergi tanpa membayar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Baris {0}: Alokasi jumlah {1} harus kurang dari atau sama dengan faktur jumlah yang luar biasa {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Status Nomor Serial
 DocType: Payment Entry Reference,Outstanding,terkemuka
 ,Daily Timesheet Summary,Timesheet Ringkasan Harian
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Baris {0}: Untuk mengatur {1} periodisitas, perbedaan antara dari dan sampai saat ini \
  harus lebih besar dari atau sama dengan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Hal ini didasarkan pada pergerakan saham. Lihat {0} untuk rincian
 DocType: Pricing Rule,Selling,Penjualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Jumlah {0} {1} dipotong terhadap {2}
 DocType: Employee,Salary Information,Informasi Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Karyawan
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Tanggal jatuh tempo tidak bisa sebelum Tanggal Posting
 DocType: Website Item Group,Website Item Group,Situs Stok Barang Grup
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Tarif dan Pajak
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Harap masukkan tanggal Referensi
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak dapat merujuk nomor baris yang lebih besar dari atau sama dengan nomor baris saat ini untuk jenis Biaya ini
 DocType: Asset,Sold,Terjual
 ,Item-wise Purchase History,Laporan Riwayat Pembelian berdasarkan Stok Barang/Item
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Silahkan klik 'Menghasilkan Jadwal' untuk mengambil Serial yang ditambahkan untuk Item {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Order Produksi Aktif
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basis Jumlah (Perusahaan Mata Uang)
 DocType: Payment Reconciliation Payment,Reference Row,referensi Row
 DocType: Installation Note,Installation Time,Waktu Installasi
 DocType: Sales Invoice,Accounting Details,Rincian Akuntansi
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Hapus semua Transaksi untuk Perusahaan ini
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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 Stok 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 +66,Investments,Investasi
 DocType: Issue,Resolution Details,Detail Resolusi
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,Diskusi
 DocType: Payment Entry,Transaction ID,ID transaksi
 DocType: Employee,Resignation Letter Date,Tanggal Surat Pengunduran Diri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Aturan harga selanjutnya disaring berdasarkan kuantitas.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Harap atur tanggal bergabung untuk karyawan {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Jumlah Total Penagihan (via Waktu Lembar)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pendapatan konsumen langganan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) harus memiliki akses sebagai 'Pemberi Izin Pengeluaran'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Pilih BOM dan Qty untuk Produksi
 DocType: Asset,Depreciation Schedule,Jadwal penyusutan
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Tanggal Setengah Hari harus di antara Tanggal Mulai dan Tanggal Akhir
@@ -1941,16 +1942,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Silahkan mengatur &#39;Biaya Penyusutan Asset Center di Perusahaan {0}
 ,Maintenance Schedules,Jadwal pemeliharaan
 DocType: Task,Actual End Date (via Time Sheet),Sebenarnya Tanggal Akhir (via Waktu Lembar)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Jumlah {0} {1} terhadap {2} {3}
 ,Quotation Trends,Trend Quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Grup tidak disebutkan dalam master Stok Barang untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit Untuk akun harus rekening Piutang
 DocType: Shipping Rule Condition,Shipping Amount,Jumlah Pengiriman
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Jumlah Pending
 DocType: Purchase Invoice Item,Conversion Factor,Faktor konversi
 DocType: Purchase Order,Delivered,Dikirim
 ,Vehicle Expenses,Beban kendaraan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
+DocType: Serial No,Invoice Details,Detail faktur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},nilai yang diharapkan setelah masa manfaat harus lebih besar dari atau sama dengan {0}
 DocType: Purchase Receipt,Vehicle Number,Nomor Kendaraan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tanggal dimana berulang faktur akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Pengaturan Sumber Daya Manusia
 DocType: Salary Slip,net pay info,net Info pay
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Beban Klaim sedang menunggu persetujuan. Hanya Approver Beban dapat memperbarui status.
 DocType: Email Digest,New Expenses,Beban baru
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskon Tambahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty harus 1, sebagai item aset tetap. Silakan gunakan baris terpisah untuk beberapa qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Cuti Block List Izinkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Singkatan tidak boleh kosong atau spasi
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Kelompok Non-kelompok
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Olahraga
 DocType: Loan Type,Loan Name,pinjaman Nama
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Akuisisi Konsumen dan Loyalitas
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana Anda mempertahankan stok item ditolak
 DocType: Production Order,Skip Material Transfer,Lewati Transfer Material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat menemukan nilai tukar untuk {0} sampai {1} untuk tanggal kunci {2}. Buat catatan Currency Exchange secara manual
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tahun keuangan Anda berakhir pada
 DocType: POS Profile,Price List,Daftar Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} adalah Tahun Anggaran default. Silahkan me-refresh browser Anda agar perubahan dapat terwujud
@@ -2000,19 +2003,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Akun {0} tidak berlaku. Mata Uang Akun harus {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Konversi diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Sales Order, Faktur Penjualan atau Journal Entri"
 DocType: Salary Component,Deduction,Deduksi
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Waktu dan To Waktu adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbedaan
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Item Harga ditambahkan untuk {0} di Daftar Harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Cukup masukkan Id Karyawan Sales Person ini
 DocType: Territory,Classification of Customers by region,Klasifikasi Konsumen menurut wilayah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Perbedaan Jumlah harus nol
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Perbedaan Jumlah harus nol
 DocType: Project,Gross Margin,Margin kotor
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Entrikan Produksi Stok Barang terlebih dahulu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dihitung keseimbangan Laporan Bank
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Pengguna Non-aktif
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Quotation
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Quotation
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Deduksi
 ,Production Analytics,Analytics produksi
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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,Konsumen / Alamat Kesempatan
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Peringatan: Sertifikat SSL tidak valid pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Lead membantu Anda mendapatkan bisnis, menambahkan semua kontak Anda dan lebih sebagai lead Anda"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Lead membantu Anda mendapatkan bisnis, menambahkan semua kontak Anda dan lebih sebagai lead Anda"
 DocType: Production Order Operation,Actual Operation Time,Waktu Operasi Aktual
 DocType: Authorization Rule,Applicable To (User),Berlaku Untuk (User)
 DocType: Purchase Taxes and Charges,Deduct,Pengurangan
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,kerja Alamat
 DocType: Appraisal,Calculate Total Score,Hitung Total Skor
 DocType: Request for Quotation,Manufacturing Manager,Manajer Manufaktur
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial ada {0} masih dalam garansi upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Membagi Pengiriman Catatan ke dalam paket.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Pengiriman
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Saldo akun ({0}) untuk {1} dan nilai saham ({2}) untuk gudang {3} harus sama
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Jumlah Cuti Hari
 DocType: Email Digest,Note: Email will not be sent to disabled users,Catatan: Email tidak akan dikirim ke pengguna cacat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Jumlah Interaksi
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pilih Perusahaan ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Perusahaan ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Biarkan kosong jika dianggap untuk semua departemen
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (permanen, kontrak, magang dll)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} adalah wajib untuk Item {1}
 DocType: Process Payroll,Fortnightly,sekali dua minggu
 DocType: Currency Exchange,From Currency,Dari mata uang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2071,14 +2074,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Perusahaan Mata Uang)
 DocType: Student Guardian,Others,Lainnya
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak terisi
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat menemukan yang cocok Item. Silakan pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Pajak dan Biaya
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Sebuah Produk atau Jasa yang dibeli, dijual atau disimpan di gudang."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Tidak ada update lebih
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak dapat memilih jenis biaya sebagai 'Pada Row Sebelumnya Jumlah' atau 'On Sebelumnya Row Jumlah' untuk baris terlebih dahulu
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barang Turunan tidak boleh berupa sebuah Bundel Produk. Silahkan hapus barang `{0}` dan simpan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,menambahkan Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,menambahkan Timesheets
 DocType: Vehicle Service,Service Item,layanan Barang
 DocType: Bank Guarantee,Bank Guarantee,Garansi Bank
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Silahkan klik 'Menghasilkan Jadwal' untuk mendapatkan jadwal
@@ -2102,6 +2105,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Aset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Balance Nilai Stok
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Nota Penjualan untuk Pembayaran
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Harap tentukan Seri Penamaan untuk {0} melalui Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detail Klaim Biaya
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Silakan pilih akun yang benar
@@ -2126,14 +2130,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan ditampilkan jika Harga Daftar tidak diatur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Silakan tentukan negara untuk Aturan Pengiriman ini atau periksa Seluruh Dunia Pengiriman
 DocType: Stock Entry,Total Incoming Value,Total nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Untuk diperlukan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu melacak waktu, biaya dan penagihan untuk kegiatan yang dilakukan oleh tim Anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Daftar Harga
 DocType: Offer Letter Term,Offer Term,Penawaran Term
 DocType: Quality Inspection,Quality Manager,Manajer Mutu
 DocType: Job Applicant,Job Opening,Lowongan Pekerjaan
 DocType: Payment Reconciliation,Payment Reconciliation,Rekonsiliasi Pembayaran
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Silahkan Pilih Pihak penanggung jawab
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Silahkan Pilih Pihak penanggung jawab
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Tunggakan: {0}
 DocType: BOM Website Operation,BOM Website Operation,Operasi Situs BOM
@@ -2160,23 +2164,23 @@
 DocType: Opportunity,Lost Reason,Alasan Kehilangan
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Masukkan Dokumen Penerimaan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Semua Stok Barang telah tertagih
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Masukkan Dokumen Penerimaan
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Semua Stok Barang telah tertagih
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Silakan tentukan valid 'Dari Kasus No'
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat biaya lebih lanjut dapat dibuat di bawah Grup tetapi entri dapat dilakukan terhadap non-Grup
 DocType: Project,External,Eksternal
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Perizinan
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Produksi Pesanan Dibuat: {0}
 DocType: Branch,Branch,Cabang
 DocType: Guardian,Mobile Number,Nomor handphone
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Branding
 DocType: Bin,Actual Quantity,Kuantitas Aktual
 DocType: Shipping Rule,example: Next Day Shipping,Contoh: Hari Berikutnya Pengiriman
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} tidak ditemukan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} tidak ditemukan
 DocType: Scheduling Tool,Student Batch,Mahasiswa Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumen Anda
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,membuat Siswa
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,membuat Siswa
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Anda telah diundang untuk berkolaborasi pada proyek: {0}
 DocType: Leave Block List Date,Block Date,Blokir Tanggal
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Terapkan Sekarang
@@ -2199,8 +2203,9 @@
 DocType: SMS Log,Sent To,Dikirim Ke
 DocType: Payment Request,Make Sales Invoice,Buat Faktur Penjualan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Berikutnya Hubungi Tanggal tidak dapat di masa lalu
 DocType: Company,For Reference Only.,Untuk referensi saja.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Valid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Jumlah Uang Muka
@@ -2214,7 +2219,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Kasus No tidak bisa 0
 DocType: Item,Show a slideshow at the top of the page,Tampilkan slideshow di bagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMS
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Toko
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Toko
 DocType: Serial No,Delivery Time,Waktu Pengiriman
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Umur Berdasarkan
 DocType: Item,End of Life,Akhir Riwayat
@@ -2226,12 +2231,12 @@
 DocType: Rename Tool,Rename Tool,Alat Perubahan Nama
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Perbarui Biaya
 DocType: Item Reorder,Item Reorder,Item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip acara Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Material/Stok Barang
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip acara Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Transfer Material/Stok Barang
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tentukan operasi, biaya operasi dan memberikan Operation unik ada pada operasi Anda."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini adalah lebih dari batas oleh {0} {1} untuk item {4}. Apakah Anda membuat yang lain {3} terhadap yang sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pilih akun berubah jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Silahkan mengatur berulang setelah menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pilih akun berubah jumlah
 DocType: Purchase Invoice,Price List Currency,Daftar Harga Mata uang
 DocType: Naming Series,User must always select,Pengguna harus selalu pilih
 DocType: Stock Settings,Allow Negative Stock,Izinkkan Stok Negatif
@@ -2242,7 +2247,7 @@
 DocType: Budget Account,Budget Account,Akun anggaran
 DocType: Quality Inspection,Verified By,Diverifikasi oleh
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak dapat mengubah mata uang default perusahaan, karena ada transaksi yang ada. Transaksi harus dibatalkan untuk mengubah mata uang default."
-DocType: Grade Interval,Grade Description,kelas Keterangan
+DocType: Grading Scale Interval,Grade Description,kelas Keterangan
 DocType: Stock Entry,Purchase Receipt No,No Nota Penerimaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Uang Earnest
 DocType: Process Payroll,Create Salary Slip,Buat Slip Gaji
@@ -2280,7 +2285,7 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Sampai Tanggal
 DocType: Warranty Claim,Raised By,Diangkat Oleh
 DocType: Payment Gateway Account,Payment Account,Akun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Silahkan tentukan Perusahaan untuk melanjutkan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Perubahan bersih Piutang
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensasi Off
 DocType: Offer Letter,Accepted,Diterima
@@ -2289,12 +2294,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Nomor kamar
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referensi yang tidak valid {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Order Produksi {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak dapat lebih besar dari jumlah yang direncanakan ({2}) di Order Produksi {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Pengiriman Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Bahan baku tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Jurnal Entry Cepat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Tidak bisa update Stok, faktur berisi penurunan Stok Barang pengiriman."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Jurnal Entry Cepat
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Anda tidak dapat mengubah kurs jika BOM disebutkan atas tiap Stok Barang
 DocType: Employee,Previous Work Experience,Pengalaman Kerja Sebelumnya
 DocType: Stock Entry,For Quantity,Untuk Kuantitas
@@ -2307,7 +2312,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Syarat dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama lembaga yang Anda menyiapkan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Pencatatan Akuntansi telah dibekukan sampai tanggal ini, tidak seorang pun yang bisa melakukan / memodifikasi pencatatan kecuali peran yang telah ditentukan di bawah ini."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Harap menyimpan dokumen sebelum menghasilkan jadwal pemeliharaan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status proyek
 DocType: UOM,Check this to disallow fractions. (for Nos),Centang untuk melarang fraksi. (Untuk Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Berikut Pesanan Produksi diciptakan:
@@ -2334,7 +2339,7 @@
 ,Employees working on a holiday,Karyawan yang bekerja pada hari libur
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
 DocType: Project,% Complete Method,% Metode Lengkap
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Tanggal mulai pemeliharaan tidak bisa sebelum tanggal pengiriman untuk Serial No {0}
 DocType: Production Order,Actual End Date,Tanggal Akhir Aktual
 DocType: BOM,Operating Cost (Company Currency),Biaya operasi (Perusahaan Mata Uang)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2351,7 +2356,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Tinggalkan Tanpa Bayar tidak sesuai dengan catatan Cuti Aplikasi disetujui
 DocType: Campaign,Campaign-.####,Promosi-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah selanjutnya
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Silakan memasok barang-barang tertentu dengan tarif terbaik
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat setelah 15 hari
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2408,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Qty Diterima
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Biaya Rekaman Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Aset Kategori Akun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Tidak dapat menghasilkan lebih Stok Barang {0} daripada kuantitas Sales Order {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Entri Bursa {0} tidak Terkirim
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Rekening Kas
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Berikutnya Hubungi Dengan tidak bisa sama dengan Timbal Alamat Email
@@ -2430,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Izin Tanggal tidak disebutkan
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produksi
 DocType: Guardian,Occupation,Pendudukan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tanggal awal harus sebelum Tanggal Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Terpasang Qty
@@ -2446,14 +2452,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Masalah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Beban utilitas
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ke atas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entri {1} tidak memiliki akun {2} atau sudah cocok dengan voucher lain
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entri {1} tidak memiliki akun {2} atau sudah cocok dengan voucher lain
 DocType: Buying Settings,Default Buying Price List,Standar Membeli Daftar Harga
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Daftar Absen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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,Pesan Nota Penjualan
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nilai Default seperti Perusahaan, Mata Uang, Tahun Anggaran Current, dll"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Silakan pilih Batch for Item {0}. Tidak dapat menemukan satu bets yang memenuhi persyaratan ini
 DocType: Process Payroll,Select Employees,Pilih Karyawan
 DocType: Opportunity,Potential Sales Deal,Kesepakatan potensial Penjualan
 DocType: Payment Entry,Cheque/Reference Date,Cek / Tanggal Referensi
@@ -2470,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global Profil POS {0} sudah dibuat untuk perusahaan {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Ganti Stok Barang / BOM di semua BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,dokumen tanda terima harus diserahkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,dokumen tanda terima harus diserahkan
 DocType: Purchase Invoice Item,Received Qty,Qty Diterima
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Tidak Dibayar dan tidak Terkirim
@@ -2479,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Tidak ada lembar waktu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Cuti Jenis {0} tidak dapat membawa-diteruskan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadwal pemeliharaan tidak dihasilkan untuk semua item. Silahkan klik 'Menghasilkan Jadwal'
 ,To Produce,Untuk Menghasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Daftar gaji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Untuk baris {0} di {1}. Untuk menyertakan {2} di tingkat Item, baris {3} juga harus disertakan"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,membuat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,membuat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasi paket untuk pengiriman (untuk mencetak)
 DocType: Bin,Reserved Quantity,Reserved Kuantitas
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Harap masukkan alamat email yang benar
@@ -2495,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Template cacat tidak harus template default
 DocType: Account,Income Account,Akun Penghasilan
 DocType: Payment Request,Amount in customer's currency,Jumlah dalam mata uang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Pengiriman
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Pengiriman
 DocType: Stock Reconciliation Item,Current Qty,Jumlah saat ini
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Lihat ""Rate Of Material Berbasis"" dalam Biaya Bagian"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Sebelumnya
 DocType: Appraisal Goal,Key Responsibility Area,Key Responsibility area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Batch Student membantu Anda melacak kehadiran, penilaian dan biaya untuk siswa"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Total Dialokasikan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal masuk untuk gaji dari {0} ke {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyimpan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Faktor Konversi adalah wajib
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Biaya Pusat
@@ -2513,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Menyembunyikan Id Pajak Nasabah Transaksi Penjualan
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Menghilangkan Tanggal
-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.","Rule harga dibuat untuk menimpa Daftar Harga / mendefinisikan persentase diskon, berdasarkan beberapa kriteria."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule harga dibuat untuk menimpa Daftar Harga / mendefinisikan persentase diskon, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya dapat diubah melalui Bursa Entri / Delivery Note / Nota Penerimaan
 DocType: Employee Education,Class / Percentage,Kelas / Persentase
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Kepala Pemasaran dan Penjualan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Pajak Penghasilan
-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.","Jika Aturan Harga yang dipilih dibuat untuk 'Harga', itu akan menimpa Daftar Harga. Harga Rule harga adalah harga akhir, sehingga tidak ada diskon lebih lanjut harus diterapkan. Oleh karena itu, dalam transaksi seperti Sales Order, Purchase Order dll, maka akan diambil di lapangan 'Tingkat', daripada lapangan 'Daftar Harga Tingkat'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika Aturan Harga yang dipilih dibuat untuk 'Harga', itu akan menimpa Daftar Harga. Harga Rule harga adalah harga akhir, sehingga tidak ada diskon lebih lanjut harus diterapkan. Oleh karena itu, dalam transaksi seperti Sales Order, Purchase Order dll, maka akan diambil di lapangan 'Tingkat', daripada lapangan 'Daftar Harga Tingkat'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Melacak Memimpin menurut Produksi Type.
 DocType: Item Supplier,Item Supplier,Item Supplier
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Entrikan Item Code untuk mendapatkan bets tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Silakan pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat
 DocType: Company,Stock Settings,Pengaturan Stok
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2532,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Akan mengirim email tentang acara untuk pegawai dengan status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Tergantung pada Tugas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage Group Konsumen Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Lampiran dapat ditunjukkan tanpa mengaktifkan keranjang belanja
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Baru Nama Biaya Pusat
 DocType: Leave Control Panel,Leave Control Panel,Cuti Control Panel
@@ -2544,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Jumlah Aktual Setelah Transaksi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Supplier Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tidak ada slip gaji ditemukan antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Pending SO Items Untuk Pembelian Permintaan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Penerimaan Mahasiswa
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} dinonaktifkan
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} dinonaktifkan
 DocType: Supplier,Billing Currency,Mata Uang Penagihan
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Besar
@@ -2565,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Produk Pilihan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Semua Grup Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Gudang baru Nama
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Harap menyebutkan tidak ada kunjungan yang diperlukan
 DocType: Stock Settings,Default Valuation Method,Metode Perhitungan Standar
 DocType: Vehicle Log,Fuel Qty,BBM Qty
 DocType: Production Order Operation,Planned Start Time,Rencana Start Time
@@ -2583,7 +2590,7 @@
 DocType: Price List,Price List Master,Daftar Harga Guru
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Penjualan dapat ditandai terhadap beberapa ** Orang Penjualan ** sehingga Anda dapat mengatur dan memonitor target.
 ,S.O. No.,SO No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Silakan membuat Konsumen dari Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Silakan membuat Konsumen dari Lead {0}
 DocType: Price List,Applicable for Countries,Berlaku untuk Negara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Aplikasi status &#39;Disetujui&#39; dan &#39;Ditolak&#39; dapat disampaikan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Mahasiswa Nama Group adalah wajib berturut-turut {0}
@@ -2626,7 +2633,7 @@
 DocType: Project,Copied From,Disalin dari
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nama error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kekurangan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} tidak terkait dengan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi karyawan {0} sudah ditandai
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih dari satu paket dari jenis yang sama (untuk mencetak)
 ,Salary Register,Register Gaji
@@ -2645,7 +2652,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Keranjang Belanja
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nilai {0} untuk Atribut {1} tidak ada dalam daftar Barang valid Atribut Nilai untuk Item {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Biaya akan didistribusikan secara proporsional berdasarkan pada item qty atau jumlah, sesuai pilihan Anda"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Biaya akan didistribusikan secara proporsional berdasarkan pada item qty atau jumlah, sesuai pilihan Anda"
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada jam kerja yang tersedia di workstation {1}, memecah operasi menjadi beberapa operasi"
@@ -2666,16 +2673,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Kelola Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Faktur Penjualan
 DocType: Journal Entry Account,Party Balance,Saldo Partai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Silakan pilih Terapkan Diskon Pada
 DocType: Company,Default Receivable Account,Standar Piutang Rekening
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entri untuk total gaji yang dibayarkan untuk kriteria di atas yang dipilih
 DocType: Stock Entry,Material Transfer for Manufacture,Alih Material untuk Produksi
-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.,Persentase Diskon dapat diterapkan baik terhadap Daftar Harga atau untuk semua List Price.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Persentase Diskon dapat diterapkan baik terhadap Daftar Harga atau untuk semua List Price.
 DocType: Purchase Invoice,Half-yearly,Setengah tahun sekali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entri Akunting untuk Stok
 DocType: Vehicle Service,Engine Oil,Oli mesin
 DocType: Sales Invoice,Sales Team1,Penjualan team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} tidak ada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} tidak ada
 DocType: Sales Invoice,Customer Address,Alamat Konsumen
 DocType: Employee Loan,Loan Details,Detail pinjaman
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Selesai Qty harus lebih besar dari nol.
@@ -2683,24 +2690,24 @@
 DocType: Account,Root Type,Akar Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak dapat kembali lebih dari {1} untuk Item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plot
 DocType: Item Group,Show this slideshow at the top of the page,Tampilkan slide ini di bagian atas halaman
 DocType: BOM,Item UOM,Stok Barang UOM
 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}
 DocType: Cheque Print Template,Primary Settings,Pengaturan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Pemasok Alamat
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tambahkan Karyawan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Tambahkan Karyawan
 DocType: Purchase Invoice Item,Quality Inspection,Inspeksi Kualitas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Ekstra Kecil
 DocType: Company,Standard Template,Template standar
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Peringatan: Material Diminta Qty kurang dari Minimum Order Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Badan Hukum / Anak dengan Bagan terpisah Account milik Organisasi.
 DocType: Payment Request,Mute Email,Bisu Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman dan Tembakau"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Hanya dapat melakukan pembayaran terhadap yang belum ditagihkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tingkat komisi tidak dapat lebih besar dari 100
 DocType: Stock Entry,Subcontract,Kontrak tambahan
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Entrikan {0} terlebih dahulu
@@ -2739,7 +2746,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Gudang dengan transaksi yang ada tidak dapat dikonversi ke grup.
 DocType: Assessment Result Tool,Result HTML,hasil HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Kadaluarsa pada
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tambahkan Siswa
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tambahkan Siswa
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Silahkan pilih {0}
 DocType: C-Form,C-Form No,C-Form ada
 DocType: BOM,Exploded_items,Pembesaran Item
@@ -2781,7 +2788,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Entrikan nama kampanye jika sumber penyelidikan adalah kampanye
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Penerbit Koran
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Fiskal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Pilih Tahun Fiskal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Tingkat Re-Order
 DocType: Company,Chart Of Accounts Template,Grafik Of Account Template
 DocType: Attendance,Attendance Date,Tanggal Kehadiran
@@ -2796,14 +2803,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entri Ganda/Duplikat
 DocType: Program Enrollment Tool,Get Students,Dapatkan Siswa
 DocType: Serial No,Under Warranty,Masih Garansi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Kesalahan]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Kesalahan]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Kata-kata akan terlihat setelah Anda menyimpan Sales Order.
 ,Employee Birthday,Ulang Tahun Karyawan
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Alat Batch Kehadiran mahasiswa
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,batas Dilalui
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Ventura
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Tahun Akademik&#39; {0} dan &#39;Nama Term&#39; {1} sudah ada. Harap memodifikasi entri ini dan coba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Karena ada transaksi yang ada terhadap barang {0}, Anda tidak dapat mengubah nilai {1}"
 DocType: UOM,Must be Whole Number,Harus Nomor Utuh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),cuti baru Dialokasikan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial ada {0} tidak ada
@@ -2823,7 +2830,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 +49,Period Closing Entry,Periode Penutupan Entri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Penyusutan
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Alat Absensi Karyawan
@@ -2846,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir dari Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat setelah 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti tidak dapat dialokasikan sebelum {0}, saldo cuti sudah pernah membawa-diteruskan dalam catatan alokasi cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Catatan: Karena / Referensi Tanggal melebihi diperbolehkan hari kredit Konsumen dengan {0} hari (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Mahasiswa Pemohon
 DocType: Asset Category Account,Accumulated Depreciation Account,Akun Penyusutan Akumulasi
 DocType: Stock Settings,Freeze Stock Entries,Bekukan Stok Entri
@@ -2857,7 +2864,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operasi tidak dapat dibiarkan kosong
 DocType: Maintenance Visit Purpose,Against Document Detail No,Terhadap Detail Dokumen No.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Partai Type adalah wajib
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Partai Type adalah wajib
 DocType: Quality Inspection,Outgoing,Keluaran
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap Doctype
@@ -2874,10 +2881,10 @@
 DocType: Asset,Item Code,Kode Item
 DocType: Production Planning Tool,Create Production Orders,Buat Order Produksi
 DocType: Serial No,Warranty / AMC Details,Garansi / Detail AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih siswa secara manual untuk Activity based Group
 DocType: Journal Entry,User Remark,Keterangan Pengguna
 DocType: Lead,Market Segment,Segmen Pasar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Dibayar Jumlah tidak dapat lebih besar dari jumlah total outstanding negatif {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Riwayat Kerja Karyawan Internal
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Cek Ukuran
@@ -2892,7 +2899,7 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Order Permintaan Material
 DocType: Employee Education,School/University,Sekolah / Universitas
 DocType: Payment Request,Reference Details,Detail referensi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai diharapkan Setelah Hidup Berguna harus kurang dari Gross Jumlah Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Jumlah Tersedia di Gudang
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah Tagihan
 DocType: Asset,Double Declining Balance,Ganda Saldo Menurun
@@ -2913,20 +2920,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Perbedaan Akun harus rekening Jenis Aset / Kewajiban, karena ini Bursa Rekonsiliasi adalah Entri Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Dicairkan Jumlah tidak dapat lebih besar dari Jumlah Pinjaman {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Nomor Purchase Order yang diperlukan untuk Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Pesanan produksi tidak diciptakan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Pesanan produksi tidak diciptakan
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tanggal Mulai' harus sebelum 'Tanggal Akhir'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak dapat mengubah status sebagai mahasiswa {0} terkait dengan aplikasi mahasiswa {1}
 DocType: Asset,Fully Depreciated,sepenuhnya disusutkan
 ,Stock Projected Qty,Stock Proyeksi Jumlah
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Konsumen {0} bukan milik proyek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ditandai HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Kutipan proposal, tawaran Anda telah dikirim ke pelanggan Anda"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Kutipan proposal, tawaran Anda telah dikirim ke pelanggan Anda"
 DocType: Sales Order,Customer's Purchase Order,Purchase Order Konsumen
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial dan Batch
 DocType: Warranty Claim,From Company,Dari Perusahaan
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Skor Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nilai atau Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Silakan mengatur Jumlah Penyusutan Dipesan
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produksi Pesanan tidak dapat diangkat untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Menit
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pajak Pembelian dan Biaya
@@ -2938,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,semua Gudang
 DocType: Sales Partner,Retailer,Pengecer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Semua Jenis Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Semua Jenis Supplier
 DocType: Global Defaults,Disable In Words,Nonaktifkan Dalam Kata-kata
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Quotation {0} bukan dari jenis {1}
@@ -2947,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Akun Overdraft
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Baris # {0}: Alokasi Jumlah tidak boleh lebih besar dari jumlah yang terutang.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Telusuri BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Pinjaman Aman
 DocType: Purchase Invoice,Edit Posting Date and Time,Mengedit Posting Tanggal dan Waktu
@@ -2986,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak diizinkan untuk memperbarui transaksi Stok lebih tua dari {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detil
 DocType: Sales Order,Fully Billed,Sepenuhnya Ditagih
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Silahkan mengatur default akun hutang di karyawan {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Pengiriman gudang diperlukan untuk item Stok {0}
 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)
@@ -2996,7 +3003,7 @@
 DocType: Student Group,Group Based On,Grup Berdasarkan
 DocType: Journal Entry,Bill Date,Tanggal Penagihan
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Layanan Item, Jenis, frekuensi dan jumlah beban yang diperlukan"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Bahkan jika ada beberapa Aturan Harga dengan prioritas tertinggi, kemudian mengikuti prioritas internal diterapkan:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Apakah Anda benar-benar ingin Menyerahkan semua Slip Gaji dari {0} ke {1}
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Rincian Supplier
@@ -3008,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,faktur Ref
 DocType: Purchase Order,Recurring Order,Order Berulang
 DocType: Company,Default Income Account,Akun Pendapatan standar
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Konsumen / Konsumen
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup Konsumen / Konsumen
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Tertutup Fiskal Tahun Laba / Rugi (Kredit)
 DocType: Sales Invoice,Time Sheets,waktu Lembar
 DocType: Payment Gateway Account,Default Payment Request Message,Standar Pesan Permintaan Pembayaran
@@ -3028,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,Quotation Pesan
 DocType: Employee Loan,Employee Loan Application,Karyawan Aplikasi Kredit
 DocType: Issue,Opening Date,Tanggal pembukaan
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Kehadiran telah ditandai berhasil.
 DocType: Journal Entry,Remark,Komentar
 DocType: Purchase Receipt Item,Rate and Amount,Rate dan Jumlah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Jenis Account untuk {0} harus {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Jenis Account untuk {0} harus {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Daun dan Liburan
 DocType: School Settings,Current Academic Term,Istilah Akademik Saat Ini
 DocType: Sales Order,Not Billed,Tidak Ditagih
@@ -3053,7 +3060,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kelompok mahasiswa
 DocType: Shopping Cart Settings,Quotation Series,Quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Sebuah item yang ada dengan nama yang sama ({0}), silakan mengubah nama kelompok Stok Barang atau mengubah nama item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Silakan pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Silakan pilih pelanggan
 DocType: C-Form,I,saya
 DocType: Company,Asset Depreciation Cost Center,Asset Pusat Penyusutan Biaya
 DocType: Sales Order Item,Sales Order Date,Tanggal Nota Penjualan
@@ -3072,20 +3079,20 @@
 DocType: Vehicle,Insurance Details,Detail asuransi
 DocType: Account,Payable,Hutang
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Masukkan Periode Pembayaran
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitur ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitur ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Konsumen baru
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Laba Kotor%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Izin Tanggal
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian kotor adalah wajib
 DocType: Lead,Address Desc,Deskripsi Alamat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partai adalah wajib
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partai adalah wajib
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topik Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,"Setidaknya salah satu, Jual atau Beli harus dipilih"
-DocType: Grading Structure,Grade Intervals,Interval kelas
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis bisnis anda.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Baris # {0}: Entri duplikat di Referensi {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dimana operasi manufaktur dilakukan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Instalasi Tanggal
@@ -3122,7 +3129,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Surat Kepala untuk mencetak template.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Judul untuk mencetak template misalnya Proforma Invoice.
 DocType: Student Guardian,Student Guardian,Wali murid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Jenis penilaian biaya tidak dapat ditandai sebagai Inklusif
 DocType: POS Profile,Update Stock,Perbarui 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 berbeda untuk item akan menyebabkan salah (Total) Nilai Berat Bersih. Pastikan Berat Bersih dari setiap item di UOM sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Tingkat
@@ -3149,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Efek Gain / Loss Akun
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Karyawan dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Tujuan harus menjadi salah satu {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Isi formulir dan menyimpannya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Jumlah persediaan aktual
@@ -3164,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Susun ulang Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Job Openings saat
 DocType: Company,Stock Adjustment Account,Penyesuaian Stock Akun
-DocType: Journal Entry,Write Off,Mencoret
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Mencoret
 DocType: Timesheet Detail,Operation ID,ID Operasi
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Pengguna Sistem (login) ID. Jika diset, itu akan menjadi default untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
@@ -3175,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier memberikan kepada Konsumen
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form/Item/{0}) habis persediaannya
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Tanggal berikutnya harus lebih besar dari Tanggal Posting
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Tampilkan pajak break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Tampilkan pajak break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Karena / Referensi Tanggal tidak boleh setelah {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Impor dan Ekspor
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entri saham ada terhadap Warehouse {0}, maka Anda tidak dapat kembali menetapkan atau memodifikasinya"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Tidak ada siswa Ditemukan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Tidak ada siswa Ditemukan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktur Posting Tanggal
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Menjual
 DocType: Sales Invoice,Rounded Total,Rounded Jumlah
 DocType: Product Bundle,List items that form the package.,Daftar item yang membentuk paket.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Persentase Alokasi harus sama dengan 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Silakan pilih Posting Tanggal sebelum memilih Partai
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Dari AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Silakan pilih Kutipan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Membuat Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Silakan pilih Kutipan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah Penyusutan Memesan tidak dapat lebih besar dari total jumlah Penyusutan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Membuat Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Silahkan hubungi untuk pengguna yang memiliki penjualan Guru Manajer {0} peran
 DocType: Company,Default Cash Account,Standar Rekening Kas
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Perusahaan (tidak Konsumen atau Supplier) Master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Hal ini didasarkan pada kehadiran mahasiswa ini
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Tidak ada siswa
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Menambahkan item lebih atau bentuk penuh terbuka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Entrikan 'Diharapkan Pengiriman Tanggal'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Catatan pengiriman {0} harus dibatalkan sebelum membatalkan Sales Order ini
@@ -3226,6 +3234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Butir 3
 DocType: Purchase Order,Customer Contact Email,Email Kontak Konsumen
 DocType: Warranty Claim,Item and Warranty Details,Item dan Garansi Detail
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Brand
 DocType: Sales Team,Contribution (%),Kontribusi (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Pilih Program untuk mengambil kursus wajib.
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum rekonsiliasi
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Pajak dan Biaya Ditambahkan (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Pajak Row {0} harus memiliki akun Pajak jenis atau Penghasilan atau Beban atau Dibebankan
 DocType: Sales Order,Partly Billed,Sebagian Ditagih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} harus menjadi Asset barang Tetap
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} harus menjadi Asset barang Tetap
 DocType: Item,Default BOM,BOM Standar
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotif
 DocType: Vehicle,Insurance Company,Perusahaan asuransi
 DocType: Asset Category Account,Fixed Asset Account,Akun Aset Tetap
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabel
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Delivery Note
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variabel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Dari Delivery Note
 DocType: Student,Student Email Address,Mahasiswa Alamat Email
 DocType: Timesheet Detail,From Time,Dari Waktu
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Persediaan:
@@ -3264,12 +3273,12 @@
 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 +66,Intern,Menginternir
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nama alamat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Nama alamat
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kode penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Dasar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi Stok sebelum {0} dibekukan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Silahkan klik 'Menghasilkan Jadwal'
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","misalnya Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referensi ada adalah wajib jika Anda memasukkan Referensi Tanggal
 DocType: Bank Reconciliation Detail,Payment Document,Dokumen pembayaran
@@ -3277,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Struktur Gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Maskapai Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Isu Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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,Quotation
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Anda berada dalam mode offline. Anda tidak akan dapat memuat sampai Anda memiliki jaringan.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Tidak Grup Pelajar dibuat.
 DocType: Purchase Invoice Item,Serial No,Serial ada
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Bulanan Pembayaran Jumlah tidak dapat lebih besar dari Jumlah Pinjaman
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail terlebih dahulu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Cukup masukkan Maintaince Detail terlebih dahulu
 DocType: Purchase Invoice,Print Language,cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Stock Entry,Including items for sub assemblies,Termasuk item untuk sub rakitan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Masukkan nilai harus positif
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Masukkan nilai harus positif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Mahasiswa sudah terdaftar.
@@ -3308,16 +3317,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standar Satuan Ukur untuk Variant &#39;{0}&#39; harus sama seperti di Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Hitung Berbasis On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Tidak ada Item dengan Bill of Material untuk Industri
 DocType: Assessment Plan,Supervisor Name,Nama pengawas
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Pendaftaran Program
-DocType: Grading Structure,Grading Structure,Struktur Grading
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Total
 DocType: Tax Rule,Shipping City,Pengiriman Kota
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Stok Barang ini adalah Varian dari {0} (Template). Atribut akan disalin dari template kecuali 'No Copy' diatur
 DocType: Notification Control,Customize the Notification,Sesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Arus Kas dari Operasi
 DocType: Sales Invoice,Shipping Rule,Aturan Pengiriman
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Silakan pilih Posting Tanggal terlebih dahulu
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tanggal pembukaan harus sebelum Tanggal Penutupan
 DocType: Leave Control Panel,Carry Forward,Carry Teruskan
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Biaya Center dengan transaksi yang ada tidak dapat dikonversi ke buku
 DocType: Department,Days for which Holidays are blocked for this department.,Hari yang Holidays diblokir untuk departemen ini.
@@ -3351,7 +3358,7 @@
 DocType: Mode of Payment,General,Umum
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Lampirkan Kop Surat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi terakhir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak bisa mengurangi ketika kategori adalah untuk 'Penilaian' atau 'Penilaian dan Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Daftar kepala pajak Anda (misalnya PPN, Bea Cukai dll, mereka harus memiliki nama yang unik) dan tarif standar mereka. Ini akan membuat template standar, yang dapat Anda edit dan menambahkan lagi nanti."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Diperlukan untuk Serial Stok Barang {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pembayaran pertandingan dengan Faktur
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan & Kenyamanan
 DocType: Quality Inspection,Item Serial No,Item Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Buat Rekaman Karyawan
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Buat Rekaman Karyawan
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Hadir
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Laporan akuntansi
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,tidak diketahui
 DocType: Shipping Rule,Shipping Rule Conditions,Aturan Pengiriman Kondisi
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru setelah penggantian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,menerima Jumlah
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Silakan setup Employee Naming System di Human Resource&gt; HR Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Buat kuantitas penuh, mengabaikan kuantitas sudah pada pesanan"
 DocType: Account,Tax,PPN
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,tidak Ditandai
@@ -3393,9 +3399,9 @@
 DocType: C-Form,Invoices,Faktur
 DocType: Batch,Source Document Name,Nama dokumen sumber
 DocType: Job Opening,Job Title,Jabatan
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Buat Pengguna
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kuantitas untuk Produksi harus lebih besar dari 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Kunjungi laporan untuk panggilan pemeliharaan.
 DocType: Stock Entry,Update Rate and Availability,Update Rate dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Persentase Anda diijinkan untuk menerima atau memberikan lebih terhadap kuantitas memerintahkan. Misalnya: Jika Anda telah memesan 100 unit. dan Tunjangan Anda adalah 10% maka Anda diperbolehkan untuk menerima 110 unit.
@@ -3404,28 +3410,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Rekening pengeluaran adalah wajib untuk item {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih Ekuitas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Batalkan Purchase Invoice {0} pertama
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat Email harus unik, sudah ada untuk {0}"
 DocType: Serial No,AMC Expiry Date,Tanggal Kadaluarsa AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Penerimaan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Penerimaan
 ,Sales Register,Daftar Penjualan
 DocType: Daily Work Summary Settings Company,Send Emails At,Kirim Email Di
 DocType: Quotation,Quotation Lost Reason,Quotation Kehilangan Alasan
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Pilih Domain Anda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},referensi transaksi tidak ada {0} tertanggal {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Tidak ada yang mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan kegiatan yang tertunda
 DocType: Customer Group,Customer Group Name,Nama Kelompok Konsumen
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Belum ada pelanggan
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Laporan arus kas
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak dapat melebihi Jumlah pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisensi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,Please remove this Invoice {0} from C-Form {1},Hapus Invoice ini {0} dari C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Silakan pilih Carry Teruskan jika Anda juga ingin menyertakan keseimbangan fiskal tahun sebelumnya cuti tahun fiskal ini
 DocType: GL Entry,Against Voucher Type,Terhadap Tipe Voucher
 DocType: Item,Attributes,Atribut
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Cukup masukkan Write Off Akun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Order terakhir Tanggal
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akun {0} bukan milik perusahaan {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Nomor Seri di baris {0} tidak cocok dengan Catatan Pengiriman
 DocType: Student,Guardian Details,Detail wali
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran untuk beberapa karyawan
@@ -3450,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akun harus bertipe &#39;Fixed Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Aturan untuk menghitung jumlah pengiriman untuk penjualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Jasa Keuangan
 DocType: Student Sibling,Student ID,Identitas Siswa
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Jenis kegiatan untuk Waktu Log
 DocType: Tax Rule,Sales,Penjualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Dasar
 DocType: Training Event,Exam,Ujian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Gudang diperlukan untuk stok Stok Barang {0}
 DocType: Leave Allocation,Unused leaves,cuti terpakai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Negara penagihan
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} tidak terkait dengan Akun Partai {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} tidak terkait dengan Akun Partai {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch meledak BOM (termasuk sub-rakitan)
 DocType: Authorization Rule,Applicable To (Employee),Berlaku Untuk (Karyawan)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak dapat 0
@@ -3474,13 +3482,13 @@
 ,Inactive Customers,Pelanggan tidak aktif
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Nota Penerimaan
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Aturan Harga diterapkan?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Bagaimana Aturan Harga diterapkan?
 DocType: Stock Entry,Delivery Note No,Pengiriman Note No
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Jika dicentang, hanya Pembelian permintaan bahan untuk bahan baku akhir akan dimasukkan dalam Permintaan Material. Jika tidak, Permintaan Bahan untuk item orangtua akan dibuat"
 DocType: Cheque Print Template,Message to show,Pesan untuk menunjukkan
 DocType: Company,Retail,Eceran
 DocType: Attendance,Absent,Absen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundel Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3490,10 +3498,10 @@
 DocType: Payment Entry,Account Paid From,Akun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan Baku Item Code
 DocType: Journal Entry,Write Off Based On,Menulis Off Berbasis On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,membuat Memimpin
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,membuat Memimpin
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Tampilkan Barcode Lapangan
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Kirim Pemasok Email
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Kirim Pemasok Email
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk periode antara {0} dan {1}, Tinggalkan periode aplikasi tidak dapat antara rentang tanggal ini."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Catatan instalasi untuk No Serial
 DocType: Guardian Interest,Guardian Interest,wali Tujuan
@@ -3505,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,Menunggu Respon
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Di atas
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut tidak valid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Sebutkan jika akun hutang non-standar
 DocType: Salary Slip,Earning & Deduction,Earning & Pengurangan
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opsional. Pengaturan ini akan digunakan untuk menyaring dalam berbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Tingkat Penilaian negatif tidak diperbolehkan
@@ -3520,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,Produksi Pesanan Barang
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Tidak ada catatan ditemukan
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Biaya Asset dibatalkan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,sebagian ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},"{0} {1}: ""Cost Center"" adalah wajib untuk Item {2}"
 DocType: Vehicle,Policy No,Kebijakan Tidak ada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Dapatkan Barang-barang dari Bundel Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,proyek Pengguna
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Membagi
@@ -3538,7 +3546,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Siswa Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikasikan Produk di Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Kelompok siswa Anda dalam batch
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Kelompok siswa Anda dalam batch
 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 +85,Specifications,Spesifikasi
@@ -3590,14 +3598,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Akun {0}: akun Induk {1} bukan milik perusahaan: {2}
 DocType: Program Enrollment Tool,Student Applicants,Pelamar mahasiswa
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Berhasil dihapus semua transaksi yang terkait dengan perusahaan ini!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,tanggal pendaftaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Percobaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,Baru Tahun Akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Kembali / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Kembali / Nota Kredit
 DocType: Stock Settings,Auto insert Price List rate if missing,Insert auto tingkat Daftar Harga jika hilang
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Jumlah Total Dibayar
 DocType: Production Order Item,Transferred Qty,Ditransfer Qty
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis cuti seperti kasual, dll sakit"
 DocType: Email Digest,Send regular summary reports via Email.,Mengirim laporan ringkasan rutin melalui Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Silakan set account default di Beban Klaim Jenis {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Silakan set account default di Beban Klaim Jenis {0}
 DocType: Assessment Result,Student Name,Nama siswa
 DocType: Brand,Item Manager,Item Manajer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll Hutang
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,Penjualan Saluran
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Singkatan wajib diisi
 DocType: Project,Task Progress,tugas Kemajuan
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Troli
 ,Qty to Transfer,Jumlah Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Harga untuk Memimpin atau Konsumen.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peran Diizinkan untuk mengedit Stok beku
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Stok Barang Wise Detil Pajak
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Singkatan Institute
 ,Item-wise Price List Rate,Stok Barang-bijaksana Daftar Harga Tingkat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Kata-kata akan terlihat sekali Anda menyimpan Quotation tersebut.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantitas ({0}) tidak boleh menjadi pecahan dalam baris {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,kumpulkan Biaya
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} sudah digunakan dalam Butir {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Aturan untuk menambahkan biaya pengiriman.
 DocType: Item,Opening Stock,Stok pembuka
@@ -3688,8 +3697,8 @@
  Diperbarui melalui 'Waktu Log'"
 DocType: Customer,From Lead,Dari Timbal
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order dirilis untuk produksi.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil diperlukan untuk membuat POS Entri
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Siswa
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Jual
@@ -3700,7 +3709,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} terhadap Faktur Penjualan {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Proyek
-DocType: Supplier,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
+DocType: Customer,Mention if non-standard receivable account,Menyebutkan jika non-standar piutang
 DocType: Journal Entry Account,If Income or Expense,Jika Penghasilan atau Beban
 DocType: Production Order,Required Items,Produk yang dibutuhkan
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai Stok Perbedaan
@@ -3721,7 +3730,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Target Set Stok Barang Group-bijaksana untuk Sales Person ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bekukan Stok Lebih Lama Dari [Hari]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib untuk aktiva tetap pembelian / penjualan
-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.","Jika dua atau lebih Aturan Harga yang ditemukan berdasarkan kondisi di atas, Prioritas diterapkan. Prioritas adalah angka antara 0 sampai 20, sementara nilai default adalah nol (kosong). Jumlah yang lebih tinggi berarti akan diutamakan jika ada beberapa Aturan Harga dengan kondisi yang sama."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Aturan Harga yang ditemukan berdasarkan kondisi di atas, Prioritas diterapkan. Prioritas adalah angka antara 0 sampai 20, sementara nilai default adalah nol (kosong). Jumlah yang lebih tinggi berarti akan diutamakan jika ada beberapa Aturan Harga dengan kondisi yang sama."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun Anggaran: {0} tidak ada
 DocType: Currency Exchange,To Currency,Untuk Mata
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Izinkan pengguna ini untuk menyetujui aplikasi izin cuti untuk hari yang terpilih(blocked).
@@ -3746,7 +3755,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Item {0} diabaikan karena bukan Stok Barang stok
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Kirim Produksi ini Order untuk diproses lebih lanjut.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Untuk tidak berlaku Rule Harga dalam transaksi tertentu, semua Aturan Harga yang berlaku harus dinonaktifkan."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Untuk tidak berlaku Rule Harga dalam transaksi tertentu, semua Aturan Harga yang berlaku harus dinonaktifkan."
 DocType: Assessment Group,Parent Assessment Group,Induk Penilaian Grup
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Order Trends
@@ -3757,7 +3766,7 @@
 DocType: Stock Entry Detail,Additional Cost,Biaya tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Tahun Keuangan Akhir Tanggal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Tidak dapat memfilter berdasarkan No. Voucher, jika dikelompokkan berdasarkan Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Membuat Pemasok Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Membuat Pemasok Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Bahan yang dibutuhkan (Meledak)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Tambahkan user ke organisasi Anda, selain diri Anda sendiri"
@@ -3785,6 +3794,7 @@
 DocType: Employee,History In Company,Sejarah Dalam Perusahaan
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletter
 DocType: Stock Ledger Entry,Stock Ledger Entry,Bursa Ledger entri
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Grup Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,item yang sama telah dimasukkan beberapa kali
 DocType: Department,Leave Block List,Cuti Block List
 DocType: Sales Invoice,Tax ID,Id pajak
@@ -3794,7 +3804,7 @@
 DocType: Customer,Sales Partner and Commission,Penjualan Mitra dan Komisi
 DocType: Employee Loan,Rate of Interest (%) / Year,Tingkat bunga (%) / Tahun
 ,Project Quantity,proyek Kuantitas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} untuk semua item adalah nol, mungkin Anda harus mengubah &#39;Distribusikan Biaya Berdasarkan&#39;"
 DocType: Opportunity,To Discuss,Untuk Diskusikan
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} dibutuhkan dalam {2} untuk menyelesaikan transaksi ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tingkat bunga (%) Tahunan
@@ -3809,7 +3819,7 @@
 DocType: Purchase Invoice,Return,Kembali
 DocType: Production Order Operation,Production Order Operation,Order Operasi Produksi
 DocType: Pricing Rule,Disable,Nonaktifkan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Cara pembayaran yang diperlukan untuk melakukan pembayaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Cara pembayaran yang diperlukan untuk melakukan pembayaran
 DocType: Project Task,Pending Review,Pending Ulasan
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Aset {0} tidak dapat dihapus, karena sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Klaim Beban (via Beban Klaim)
@@ -3817,11 +3827,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absen
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Mata dari BOM # {1} harus sama dengan mata uang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Nilai Tukar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Order Penjualan {0} tidak Terkirim
 DocType: Homepage,Tag Line,klimaks
 DocType: Fee Component,Fee Component,biaya Komponen
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Manajemen armada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Menambahkan item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Menambahkan item dari
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akun induk {1} tidak terkait kepada perusahaan {2}
 DocType: Cheque Print Template,Regular,Reguler
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Total weightage semua Kriteria Penilaian harus 100%
@@ -3834,7 +3844,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Gudang {0} tidak ada
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Untuk mendaftar ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Persentase Distribusi bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak dapat memiliki Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tingkat valuasi tidak ditemukan Item {0}, yang diperlukan untuk melakukan entri akuntansi {1} {2}. Jika item bertransaksi sebagai item sampel dalam {1}, harap menyebutkan bahwa dalam {1} meja Item. Jika tidak, silakan membuat transaksi saham yang masuk untuk tingkat valuasi item atau menyebutkan dalam catatan Item, dan kemudian mencoba submiting / membatalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Dari materi yang Terkirim terhadap Pengiriman ini Note
 DocType: Project,Customer Details,Rincian Konsumen
@@ -3843,15 +3853,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Entrikan parameter url untuk penerima nos
 DocType: Payment Entry,Paid Amount,Dibayar Jumlah
 DocType: Assessment Plan,Supervisor,Pengawas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,On line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,On line
 ,Available Stock for Packing Items,Tersedia Stock untuk Packing Produk
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Alat Hasil penilaian
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Barang
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,perintah yang disampaikan tidak dapat dihapus
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Manajemen Kualitas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} telah dinonaktifkan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} telah dinonaktifkan
 DocType: Employee Loan,Repay Fixed Amount per Period,Membayar Jumlah Tetap per Periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Mohon masukkan untuk Item {0}
 DocType: Employee External Work History,Employee External Work History,Karyawan Eksternal Riwayat Pekerjaan
@@ -3877,7 +3887,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Mahasiswa ID Email
 DocType: Employee,Notice (days),Notice (hari)
 DocType: Tax Rule,Sales Tax Template,Template Pajak Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pilih item untuk menyimpan faktur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Pilih item untuk menyimpan faktur
 DocType: Employee,Encashment Date,Pencairan Tanggal
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Penyesuaian Stock
@@ -3900,7 +3910,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Silakan tentukan dari / ke berkisar
 DocType: Serial No,Under AMC,Di bawah AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Tingkat penilaian Item dihitung ulang mengingat mendarat biaya jumlah voucher
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Tingkat penilaian Item dihitung ulang mengingat mendarat biaya jumlah voucher
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Pengaturan default untuk menjual transaksi.
 DocType: Guardian,Guardian Of ,wali Of
 DocType: Grading Scale Interval,Threshold,Ambang
@@ -3910,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ditempatkan
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak dapat ditransfer
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Item ini adalah Variant dari {0} (Template).
 DocType: Workstation,per hour,per jam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,pembelian
 DocType: Announcement,Announcement,Pengumuman
@@ -3925,8 +3936,8 @@
 DocType: Account,Receivable,Piutang
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak diperbolehkan untuk mengubah Supplier sebagai Purchase Order sudah ada
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peran yang diperbolehkan untuk mengirimkan transaksi yang melebihi batas kredit yang ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pilih Produk untuk Industri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Pilih Produk untuk Industri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Data master sinkronisasi, itu mungkin memakan waktu"
 DocType: Item,Material Issue,Keluar Barang
 DocType: Hub Settings,Seller Description,Penjual Deskripsi
 DocType: Employee Education,Qualification,Kualifikasi
@@ -3938,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordered
 DocType: Salary Detail,Component,Komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria penilaian Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Penyusutan Akumulasi harus kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Entrikan Menyetujui Peran atau Menyetujui Pengguna
@@ -3951,7 +3962,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Tidak bisa membatalkan karena ada Stock entri {0} Terkirim
 DocType: Employee Loan,Disbursement Date,pencairan Tanggal
 DocType: Vehicle,Vehicle,Kendaraan
 DocType: Purchase Invoice,In Words,Dalam Kata
@@ -3965,14 +3976,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penyusutan aset dan Saldo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} ditransfer dari {2} untuk {3}
 DocType: Sales Invoice,Get Advances Received,Dapatkan Uang Muka Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Hapus Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaksi tidak diperbolehkan berhenti melawan Orde Produksi {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk mengatur Tahun Anggaran ini sebagai Default, klik 'Set as Default'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Ikut
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Jumlah
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item varian {0} ada dengan atribut yang sama
 DocType: Employee Loan,Repay from Salary,Membayar dari Gaji
 DocType: Leave Application,LAP/,PUTARAN/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Meminta pembayaran terhadap {0} {1} untuk jumlah {2}
@@ -3990,7 +4001,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Penilaian Detil Hasil
 DocType: Employee Education,Employee Education,Pendidikan Karyawan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Kelompok barang duplikat yang ditemukan dalam tabel grup item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Hal ini diperlukan untuk mengambil Item detail.
 DocType: Salary Slip,Net Pay,Nilai Bersih Terbayar
 DocType: Account,Account,Akun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial ada {0} telah diterima
@@ -3999,7 +4010,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Gudang {0} tidak terkait dengan akun, silakan membuat / menautkan (Asset) akun yang sesuai untuk gudang."
 DocType: Purchase Invoice,Recurring Id,Berulang Id
 DocType: Customer,Sales Team Details,Rincian Tim Penjualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Hapus secara permanen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Hapus secara permanen?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Total Diklaim
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensi peluang untuk menjadi penjualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Valid {0}
@@ -4010,13 +4021,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Pengaturan Sekolah Anda di ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Dasar Perubahan Jumlah (Perusahaan Mata Uang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Tidak ada entri akuntansi untuk gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen terlebih dahulu.
 DocType: Account,Chargeable,Dapat Dibebankan
 DocType: Company,Change Abbreviation,Ubah Singkatan
 DocType: Expense Claim Detail,Expense Date,Beban Tanggal
 DocType: Item,Max Discount (%),Max Diskon (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Jumlah Order terakhir
+DocType: Task,Is Milestone,Adalah tonggak
 DocType: Daily Work Summary,Email Sent To,Email dikirim ke
 DocType: Budget,Warn,Peringatan: Cuti aplikasi berisi tanggal blok berikut
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Setiap komentar lain, upaya penting yang harus pergi dalam catatan."
@@ -4037,7 +4049,7 @@
 DocType: Item Attribute Value,Attribute Value,Nilai Atribut
 ,Itemwise Recommended Reorder Level,Itemwise Rekomendasi Reorder Tingkat
 DocType: Salary Detail,Salary Detail,Detil gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Silahkan pilih {0} terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Silahkan pilih {0} terlebih dahulu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah berakhir.
 DocType: Sales Invoice,Commission,Komisi
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Waktu Lembar untuk manufaktur.
@@ -4049,41 +4061,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stock yang sudah lebih lama dari` harus lebih kecil dari %d hari.
 DocType: Tax Rule,Purchase Tax Template,Pembelian Template Pajak
 ,Project wise Stock Tracking,Project Tracking Stock bijaksana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadwal Pemeliharaan {0} ada terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Jumlah Aktual (di sumber/target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Catatan karyawan.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Silahkan mengatur Berikutnya Penyusutan Tanggal
 DocType: HR Settings,Payroll Settings,Pengaturan Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Cocokkan Faktur non-linked dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Order
 DocType: Email Digest,New Purchase Orders,Pesanan Pembelian Baru
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root tidak dapat memiliki pusat biaya orang tua
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Pilih Merek ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Pilih Merek ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akumulasi Penyusutan seperti pada
 DocType: Sales Invoice,C-Form Applicable,C-Form Berlaku
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operasi Waktu harus lebih besar dari 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Gudang adalah wajib
 DocType: Supplier,Address and Contacts,Alamat dan Kontak
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detil UOM Konversi
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Simpan sebagai web-friendly 900px  (w) X 100px (h)
 DocType: Program,Program Abbreviation,Singkatan Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Biaya diperbarui dalam Pembelian Penerimaan terhadap setiap item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Order produksi tidak dapat diajukan terhadap Template Stok Barang
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Biaya diperbarui dalam Pembelian Penerimaan terhadap setiap item
 DocType: Warranty Claim,Resolved By,Terselesaikan Dengan
 DocType: Bank Guarantee,Start Date,Tanggal Mulai
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alokasi cuti untuk periode tertentu
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak benar dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Buat kutipan pelanggan
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Buat kutipan pelanggan
 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 +38,Bill of Materials (BOM),Bill of Material (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Rata-rata waktu yang dibutuhkan oleh Supplier untuk memberikan
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,penilaian Hasil
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Jam
 DocType: Project,Expected Start Date,Diharapkan Tanggal Mulai
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Hapus item jika biaya ini tidak berlaku untuk item
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Misalnya. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaksi mata uang harus sama dengan Payment Gateway mata uang
 DocType: Payment Entry,Receive,Menerima
@@ -4094,19 +4105,19 @@
 DocType: Workstation,Operating Costs,Biaya Operasional
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Akumulasi Anggaran Bulanan Melebihi
 DocType: Purchase Invoice,Submit on creation,Kirim pada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Mata uang untuk {0} harus {1}
 DocType: Asset,Disposal Date,pembuangan Tanggal
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email akan dikirim ke semua Karyawan Aktif perusahaan pada jam tertentu, jika mereka tidak memiliki liburan. Ringkasan tanggapan akan dikirim pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Approver Cuti Karyawan
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Baris {0}: Entri perekam sudah ada untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Tidak dapat mendeklarasikan sebagai hilang, karena Quotation telah dibuat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,pelatihan Masukan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Order produksi {0} harus diserahkan
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Silakan pilih Tanggal Mulai dan Tanggal Akhir untuk Item {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tentu saja adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Sampai saat ini tidak dapat sebelumnya dari tanggal
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Induk induk
 DocType: Cheque Print Template,Cheque Print Template,Template Print Cek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Bagan Pusat Biaya
@@ -4119,7 +4130,7 @@
 ,Ordered Items To Be Delivered,Ordered Items Akan Terkirim
 DocType: Account,Income,Penghasilan
 DocType: Industry Type,Industry Type,Jenis Produksi
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Ada yang salah!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ada yang salah!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Peringatan: Cuti aplikasi berisi tanggal blok berikut
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Faktur Penjualan {0} telah terkirim
 DocType: Assessment Result Detail,Score,Skor
@@ -4150,17 +4161,17 @@
 DocType: Item,Variant Based On,Varian Berbasis Pada
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah weightage ditugaskan harus 100%. Ini adalah {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Supplier Anda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Tidak dapat ditetapkan sebagai Hilang sebagai Sales Order dibuat.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Pemasok Bagian Tidak
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Diterima dari
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',tidak bisa memotong ketika kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Diterima dari
 DocType: Lead,Converted,Dikonversi
 DocType: Item,Has Serial No,Bernomor Seri
 DocType: Employee,Date of Issue,Tanggal Issue
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: nilai Jam harus lebih besar dari nol.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,Website Image {0} attached to Item {1} cannot be found,Website Image {0} melekat Butir {1} tidak dapat ditemukan
 DocType: Issue,Content Type,Tipe Konten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Daftar Stok Barang ini dalam beberapa kelompok di website.
@@ -4169,20 +4180,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,mata uang penagihan harus sama dengan mata uang mata uang atau rekening pihak baik bawaan comapany ini
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,mata uang penagihan harus sama dengan mata uang mata uang atau rekening pihak baik bawaan comapany ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Tinggalkan Pencairan
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Apa pekerjaannya?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Penerimaan Mahasiswa
 ,Average Commission Rate,Rata-rata Komisi Tingkat
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Bernomor Urut' tidak bisa 'dipilih' untuk item non-stok"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Bernomor Urut' tidak bisa 'dipilih' untuk item non-stok"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Kehadiran tidak dapat ditandai untuk tanggal masa depan
 DocType: Pricing Rule,Pricing Rule Help,Aturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Purchase Taxes and Charges,Account Head,Akun Kepala
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Listrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tambahkan sisa organisasi Anda sebagai pengguna Anda. Anda juga dapat menambahkan mengundang Pelanggan portal Anda dengan menambahkan mereka dari Kontak
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tambahkan sisa organisasi Anda sebagai pengguna Anda. Anda juga dapat menambahkan mengundang Pelanggan portal Anda dengan menambahkan mereka dari Kontak
 DocType: Stock Entry,Total Value Difference (Out - In),Total Nilai Selisih (Out - Dalam)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4191,7 +4202,7 @@
 DocType: Item,Customer Code,Kode Konsumen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Birthday Reminder untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Jumlah Hari Semenjak Order Terakhir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debit Untuk akun harus rekening Neraca
 DocType: Buying Settings,Naming Series,Series Penamaan
 DocType: Leave Block List,Leave Block List Name,Cuti Nama Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tanggal asuransi mulai harus kurang dari tanggal asuransi End
@@ -4206,9 +4217,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji karyawan {0} sudah dibuat untuk daftar absen {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,Qty Terorder
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} dinonaktifkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} dinonaktifkan
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM tidak mengandung stok barang
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM tidak mengandung stok barang
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Kegiatan proyek / tugas.
 DocType: Vehicle Log,Refuelling Details,Detail Pengisian
@@ -4218,8 +4229,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Tingkat pembelian terakhir tidak ditemukan
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Jumlah Nilai Write Off (mata uang perusahaan)
 DocType: Sales Invoice Timesheet,Billing Hours,Jam penagihan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM default untuk {0} tidak ditemukan
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Silakan mengatur kuantitas menyusun ulang
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketuk item untuk menambahkannya di sini
 DocType: Fees,Program Enrollment,Program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Landing Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Silakan set {0}
@@ -4241,7 +4253,7 @@
 DocType: Maintenance Visit,Maintenance Date,Tanggal Pemeliharaan
 DocType: Purchase Invoice Item,Rejected Serial No,Serial No Barang Ditolak
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tanggal mulai atau tanggal akhir ini tumpang tindih dengan {0}. Untuk menghindari silakan mengatur perusahaan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Tanggal mulai harus kurang dari tanggal akhir untuk Item {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### 
  Jika seri diatur dan Serial ada tidak disebutkan dalam transaksi, nomor seri maka otomatis akan dibuat berdasarkan seri ini. Jika Anda selalu ingin secara eksplisit menyebutkan Serial Nos untuk item ini. biarkan kosong."
@@ -4317,7 +4329,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail & Grosir
 DocType: Issue,First Responded On,Ditangani Pertama kali pada
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Daftar Lintas Item dalam beberapa kelompok
-DocType: Grade Interval,Grade Interval,kelas Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tanggal Mulai dan Akhir Tahun Fiskal Tanggal sudah ditetapkan pada Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Cukai Tanggal diperbarui
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split batch
@@ -4362,14 +4373,14 @@
 DocType: Bin,Reserved Qty for Production,Dicadangkan Jumlah Produksi
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tidak dicentang jika Anda tidak ingin mempertimbangkan batch sambil membuat kelompok berbasis kursus.
 DocType: Asset,Frequency of Depreciation (Months),Frekuensi Penyusutan (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Akun kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Akun kredit
 DocType: Landed Cost Item,Landed Cost Item,Jenis Barang Biaya Landing
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Tampilkan nilai nol
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Jumlah Stok Barang yang diperoleh setelah manufaktur / repacking dari mengingat jumlah bahan baku
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup website sederhana untuk organisasi saya
 DocType: Payment Reconciliation,Receivable / Payable Account,Piutang / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Terhadap Stok Barang di Order Penjualan
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Silakan tentukan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Standar Gudang
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Anggaran tidak dapat diberikan terhadap Account Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Entrikan pusat biaya orang tua
@@ -4412,7 +4423,7 @@
 DocType: Opportunity Item,Basic Rate,Harga Dasar
 DocType: GL Entry,Credit Amount,Jumlah kredit
 DocType: Cheque Print Template,Signatory Position,Posisi penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Set as Hilang/Kalah
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Set as Hilang/Kalah
 DocType: Timesheet,Total Billable Hours,Total Jam Ditagih
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Catatan
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Hal ini didasarkan pada transaksi terhadap pelanggan ini. Lihat timeline di bawah untuk rincian
@@ -4426,11 +4437,11 @@
 ,Items To Be Requested,Items Akan Diminta
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan Terakhir Purchase Rate
 DocType: Company,Company Info,Info Perusahaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pilih atau menambahkan pelanggan baru
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Pilih atau menambahkan pelanggan baru
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,pusat biaya diperlukan untuk memesan klaim biaya
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Penerapan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Hal ini didasarkan pada kehadiran Karyawan ini
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Akun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4439,13 +4450,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Menghentikan pengguna dari membuat Aplikasi Leave pada hari-hari berikutnya.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Pemasok Quotation {0} dibuat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Mulai Tahun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Manfaat Karyawan
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Dikemas kuantitas harus sama kuantitas untuk Item {0} berturut-turut {1}
 DocType: Production Order,Manufactured Qty,Qty Diproduksi
 DocType: Purchase Receipt Item,Accepted Quantity,Qty Diterima
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Silahkan mengatur default Liburan Daftar Karyawan {0} atau Perusahaan {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak ada
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} tidak ada
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Tagihan 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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row ada {0}: Jumlah dapat tidak lebih besar dari Pending Jumlah terhadap Beban Klaim {1}. Pending Jumlah adalah {2}
@@ -4454,15 +4465,17 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Pusat
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Daftar Harga tidak ditemukan atau dinonaktifkan
 DocType: Employee Loan Application,Approved,Disetujui
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Karyawan lega pada {0} harus ditetapkan sebagai 'Kiri'
 DocType: Guardian,Guardian,Wali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} telah dibuat untuk karyawan {1} dalam rentang tanggal tertentu
 DocType: Employee,Education,Pendidikan
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Penamaan Kampanye Promosi dengan
 DocType: Employee,Current Address Is,Alamat saat ini adalah
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,diubah
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opsional. Set mata uang default perusahaan, jika tidak ditentukan."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Pencatatan Jurnal akuntansi.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Jumlah yang tersedia di Gudang Dari
@@ -4471,7 +4484,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partai / Rekening tidak sesuai dengan {1} / {2} di {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Masukan Entrikan Beban Akun
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Dokumen Referensi Type harus menjadi salah satu Purchase Order, Faktur Pembelian atau Journal Entri"
 DocType: Employee,Current Address,Alamat saat ini
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah varian dari item lain maka deskripsi, gambar, harga, pajak dll akan ditetapkan dari template kecuali secara eksplisit ditentukan"
 DocType: Serial No,Purchase / Manufacture Details,Detail Pembelian / Produksi
@@ -4499,7 +4512,7 @@
 DocType: Hub Settings,Hub Settings,Pengaturan Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri Akuntansi telah dibuat dalam mata uang {0} untuk perusahaan {1}. Silakan pilih akun piutang atau hutang dengan mata uang {0}.
 DocType: Asset,Is Existing Asset,Apakah ada Asset
 DocType: Salary Detail,Statistical Component,Komponen statistik
 ,Monthly Salary Register,Daftar Gaji Bulanan
@@ -4522,7 +4535,7 @@
 DocType: Assessment Plan,Room,Kamar
 DocType: Purchase Order,Advance Paid,Pembayaran Dimuka (Advance)
 DocType: Item,Item Tax,Pajak Stok Barang
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Bahan untuk Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Bahan untuk Supplier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Cukai Faktur
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% muncul lebih dari sekali
 DocType: Expense Claim,Employees Email Id,Karyawan Email Id
@@ -4553,9 +4566,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pasang Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tingkat saham
 DocType: Customer,Commission Rate,Tingkat Komisi
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Buat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Buat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Memblokir aplikasi cuti berdasarkan departemen.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis Pembayaran harus menjadi salah satu Menerima, Pay dan Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis Pembayaran harus menjadi salah satu Menerima, Pay dan Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Cart adalah Kosong
 DocType: Vehicle,Model,Model
@@ -4566,6 +4579,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Izinkan Produksi di hari libur
 DocType: Sales Order,Customer's Purchase Order Date,Konsumen Purchase Order Tanggal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal / Saham
+DocType: Shopping Cart Settings,Show Public Attachments,Tampilkan Lampiran Umum
 DocType: Packing Slip,Package Weight Details,Paket Berat Detail
 DocType: Payment Gateway Account,Payment Gateway Account,Pembayaran Rekening Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -4584,15 +4598,15 @@
 DocType: Batch,Expiry Date,Tanggal Berakhir
 ,Supplier Addresses and Contacts,Supplier Alamat dan Kontak
 ,accounts-browser,account-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Silahkan pilih Kategori terlebih dahulu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Silahkan pilih Kategori terlebih dahulu
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Proyek
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Untuk memungkinkan lebih-penagihan atau over-pemesanan, informasi &quot;Penyisihan&quot; di Pengaturan Stock atau Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Jangan menunjukkan simbol seperti $ etc sebelah mata uang.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Setengah Hari)
 DocType: Supplier,Credit Days,Hari Kredit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Membuat Batch Mahasiswa
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Membuat Batch Mahasiswa
 DocType: Leave Type,Is Carry Forward,Apakah Carry Teruskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dapatkan item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,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/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Tanggal harus sama dengan tanggal pembelian {1} aset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Cukup masukkan Penjualan Pesanan dalam tabel di atas
@@ -4609,7 +4623,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Baris {0}: Debit masuk tidak dapat dihubungkan dengan {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Silakan setup seri penomoran untuk Kehadiran melalui Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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/is.csv b/erpnext/translations/is.csv
index 7bd05a0..dec7bd3 100644
--- a/erpnext/translations/is.csv
+++ b/erpnext/translations/is.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,leigt
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Gildir fyrir notanda
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Hætt framleiðslu Order er ekki hægt að hætt, Unstop það fyrst til að fá ensku"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Hætt framleiðslu Order er ekki hægt að hætt, Unstop það fyrst til að fá ensku"
 DocType: Vehicle Service,Mileage,mílufjöldi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Viltu virkilega að skrappa þessa eign?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Veldu Default Birgir
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Veldu Default Birgir
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Gjaldmiðill er nauðsynlegt til verðlisti {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Verður að reikna í viðskiptunum.
 DocType: Purchase Order,Customer Contact,viðskiptavinur samband við
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Framúrskarandi fyrir {0} má ekki vera minna en núll ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mínútur
 DocType: Leave Type,Leave Type Name,Skildu Tegund Nafn
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,sýna opinn
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,sýna opinn
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series Uppfært Tókst
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Athuga
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Lögð
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Hópur Item Fyrning Staða
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Mode greiðslureikning
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Sýna Afbrigði
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Sýna Afbrigði
 DocType: Academic Term,Academic Term,fræðihugtak
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,efni
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,magn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,magn
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Reikninga borð getur ekki verið autt.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Lán (skulda)
 DocType: Employee Education,Year of Passing,Ár Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Tilvísun:% s, Item Code:% s og viðskiptavinar:% s"
 DocType: Item,Country of Origin,Upprunaland
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Á lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Opið Issues
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Heilbrigðisþjónusta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Töf á greiðslu (dagar)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,þjónusta Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,reikningur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Raðnúmer: {0} er nú þegar vísað í sölureikning: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,reikningur
 DocType: Maintenance Schedule Item,Periodicity,tíðni
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Reikningsár {0} er krafist
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Áætlaðan fæðingardag er að vera áður Sales Order Dagsetning
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Hengja .csv skrá með tveimur dálka, einn fyrir gamla nafn og einn fyrir nýju nafni"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ekki í hvaða virka Fiscal Year.
 DocType: Packed Item,Parent Detail docname,Parent Detail DOCNAME
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tilvísun: {0}, Liður: {1} og Viðskiptavinur: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Opnun fyrir Job.
 DocType: Item Attribute,Increment,vöxtur
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Veldu Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Veldu Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Auglýsingar
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Sama fyrirtæki er slegið oftar en einu sinni
 DocType: Employee,Married,giftur
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Ekki leyft {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Fá atriði úr
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ekki leyft {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Fá atriði úr
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock Ekki er hægt að uppfæra móti afhendingarseðlinum {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Vara {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Engin atriði skráð
 DocType: Payment Reconciliation,Reconcile,sætta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,matvöruverslun
 DocType: Quality Inspection Reading,Reading 1,lestur 1
 DocType: Process Payroll,Make Bank Entry,Gera Bank færslu
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,lífeyrissjóðir
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Næsta Afskriftir Dagsetning má ekki vera áður kaupdegi
 DocType: SMS Center,All Sales Person,Allt Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Mánaðarleg dreifing ** hjálpar þér að dreifa fjárhagsáætlunar / Target yfir mánuði ef þú ert árstíðasveiflu í fyrirtæki þínu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ekki atriði fundust
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ekki atriði fundust
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Laun Uppbygging vantar
 DocType: Lead,Person Name,Sá Name
 DocType: Sales Invoice Item,Sales Invoice Item,Velta Invoice Item
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",td &quot;Primary School&quot; eða &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager Skýrslur
 DocType: Warehouse,Warehouse Detail,Warehouse Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hámarksupphæð hefur verið yfir fyrir viðskiptavin {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Hugtakið Lokadagur getur ekki verið síðar en árslok Dagsetning skólaárið sem hugtakið er tengt (skólaárið {}). Vinsamlega leiðréttu dagsetningar og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fast Asset&quot; getur ekki verið valið, eins Asset met hendi á móti hlut"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Tax Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Þú hefur ekki heimild til að bæta við eða endurnýja færslum áður {0}
 DocType: BOM,Item Image (if not slideshow),Liður Image (ef ekki myndasýning)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Viðskiptavinur til staðar með sama nafni
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Raunveruleg Rekstur Time
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Veldu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Veldu BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnaður við afhent Items
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,The frídagur á {0} er ekki á milli Frá Dagsetning og hingað
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,skólar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ekkert leyfi fannst fyrir starfsmann {0} fyrir {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vinsamlegast sláðu fyrirtæki fyrst
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vinsamlegast veldu Company fyrst
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Vinsamlegast veldu Company fyrst
 DocType: Employee Education,Under Graduate,undir Graduate
 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,Heildar kostnaður
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,bótafjárhæðir
 DocType: Employee,Mr,herra
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Afrit viðskiptavinar hópur í cutomer töflunni
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Birgir Type / Birgir
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Birgir Type / Birgir
 DocType: Naming Series,Prefix,forskeyti
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,einnota
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,bekk
 DocType: Sales Invoice Item,Delivered By Supplier,Samþykkt með Birgir
 DocType: SMS Center,All Contact,Allt samband við
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Framleiðslu Order þegar búið fyrir öll atriði með BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,árslaunum
 DocType: Daily Work Summary,Daily Work Summary,Daily Work Yfirlit
 DocType: Period Closing Voucher,Closing Fiscal Year,Lokun fjárhagsársins
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosinn
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosinn
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vinsamlegast veldu núverandi fyrirtæki til að búa til töflu yfir reikninga
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,lager Útgjöld
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Veldu Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit í félaginu Gjaldmiðill
 DocType: Delivery Note,Installation Status,uppsetning Staða
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Viltu uppfæra mætingu? <br> Present: {0} \ <br> Fjarverandi: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Samþykkt + Hafnað Magn verður að vera jöfn Móttekin magn fyrir lið {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Framboð Raw Materials til kaups
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Að minnsta kosti einn háttur af greiðslu er krafist fyrir POS reikningi.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Að minnsta kosti einn háttur af greiðslu er krafist fyrir POS reikningi.
 DocType: Products Settings,Show Products as a List,Sýna vörur sem lista
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Sæktu sniðmát, fylla viðeigandi gögn og hengja við um hana. Allt dagsetningar og starfsmaður samspil völdu tímabili mun koma í sniðmát, með núverandi aðsóknarmet"
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Gera Afskriftir færslu
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Beiðni Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,gera starfsmanni
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,gera starfsmanni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,framkvæmd
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Upplýsingar um starfsemi fram.
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Áætlun um heimsóknir viðhald.
 DocType: SMS Settings,Enter url parameter for message,Sláðu url breytu fyrir skilaboð
 DocType: POS Profile,Customer Groups,Hópar viðskiptavina
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Ársreikningur
 DocType: Guardian,Students,nemendur
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Reglur um beitingu verðlagningu og afslátt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Verðlisti verður að gilda fyrir að kaupa eða selja
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Fyrirfram upphæð getur ekki verið meiri en {0} {1}
 DocType: Naming Series,Series List for this Transaction,Series List fyrir þessa færslu
 DocType: Company,Default Payroll Payable Account,Default Launaskrá Greiðist Reikningur
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uppfæra Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uppfæra Email Group
 DocType: Sales Invoice,Is Opening Entry,Er Opnun færslu
 DocType: Customer Group,Mention if non-standard receivable account applicable,Umtal ef non-staðall nái reikning við
 DocType: Course Schedule,Instructor Name,kennari Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Fyrir Lager er krafist áður Senda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Fyrir Lager er krafist áður Senda
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,fékk á
 DocType: Sales Partner,Reseller,sölumaður
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",Ef hakað Mun fela ekki lager vörur í efni beiðnir.
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Gegn sölureikningi Item
 ,Production Orders in Progress,Framleiðslu Pantanir í vinnslu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Handbært fé frá fjármögnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage er fullt, ekki spara"
 DocType: Lead,Address & Contact,Heimilisfang &amp; Hafa samband
 DocType: Leave Allocation,Add unused leaves from previous allocations,Bæta ónotuðum blöð frá fyrri úthlutanir
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Næsta Fastir {0} verður búin til á {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total kostnaðarútreikninga Magn (með Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Liður Website Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Skildu Bannaður
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Liður {0} hefur náð enda sitt líf á {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Árleg
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sættir Item
 DocType: Stock Entry,Sales Invoice No,Reiknings No.
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,Birta á Hub
 DocType: Student Admission,Student Admission,Student Aðgangseyrir
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Liður {0} er hætt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,efni Beiðni
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Liður {0} er hætt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,efni Beiðni
 DocType: Bank Reconciliation,Update Clearance Date,Uppfæra Úthreinsun Dagsetning
 DocType: Item,Purchase Details,kaup Upplýsingar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Liður {0} fannst ekki í &#39;hráefnum Meðfylgjandi&#39; borð í Purchase Order {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Framúrskarandi Tékkar og Innlán til að hreinsa
 DocType: Item,Synced With Hub,Samstillt Með Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} getur ekki verið neikvæð fyrir atriðið {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Rangt lykilorð
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} getur ekki verið neikvæð fyrir atriðið {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Rangt lykilorð
 DocType: Item,Variant Of,afbrigði af
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Lokið Magn má ekki vera meiri en &#39;Magn í Manufacture&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Lokið Magn má ekki vera meiri en &#39;Magn í Manufacture&#39;
 DocType: Period Closing Voucher,Closing Account Head,Loka reikningi Head
 DocType: Employee,External Work History,Ytri Vinna Saga
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Hringlaga Tilvísun Villa
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Tilkynna með tölvupósti á sköpun sjálfvirka Material Beiðni
 DocType: Journal Entry,Multi Currency,multi Gjaldmiðill
 DocType: Payment Reconciliation Invoice,Invoice Type,Reikningar Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Afhendingarseðilinn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Afhendingarseðilinn
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Setja upp Skattar
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnaðarverð seldrar Eignastýring
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Greiðsla Entry hefur verið breytt eftir að þú draga það. Vinsamlegast rífa það aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
-DocType: Grade Interval,Min Score,Min Einkunn
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} slá inn tvisvar í lið Tax
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samantekt fyrir þessa viku og bið starfsemi
 DocType: Student Applicant,Admitted,viðurkenndi
 DocType: Workstation,Rent Cost,Rent Kostnaður
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Panta gildi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / reiðufé gagnvart aðila eða fyrir innra flytja
 DocType: Shipping Rule,Valid for Countries,Gildir fyrir löndum
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Þetta atriði er sniðmát og ekki er hægt að nota í viðskiptum. Item eiginleika verður að afrita yfir í afbrigði nema &quot;Enginn Afrita&quot; er sett
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Þetta atriði er sniðmát og ekki er hægt að nota í viðskiptum. Item eiginleika verður að afrita yfir í afbrigði nema &quot;Enginn Afrita&quot; er sett
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Pöntunin Talin
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Starfsmaður tilnefningu (td forstjóri, framkvæmdastjóri osfrv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Vinsamlegast sláðu inn &quot;Endurtakið á Dagur mánaðar &#39;gildissvæðið
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kaup Invoice ekki hægt að gera við núverandi eign {1}
 DocType: Item Tax,Tax Rate,skatthlutfall
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} þegar úthlutað fyrir starfsmann {1} fyrir tímabilið {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Veldu Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Veldu Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Purchase Invoice {0} er þegar lögð
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Hópur Nei verður að vera það sama og {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Umbreyta til non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Hópur (fullt) af hlut.
 DocType: C-Form Invoice Detail,Invoice Date,Dagsetning reiknings
 DocType: GL Entry,Debit Amount,debet Upphæð
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Það getur aðeins verið 1 Account á félaginu í {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vinsamlega sjá viðhengi
 DocType: Purchase Order,% Received,% móttekin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Búa Student Hópar
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,Beiðni um tilvitnun
 DocType: Salary Slip Timesheet,Working Hours,Vinnutími
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Breyta upphafsdegi / núverandi raðnúmer núverandi röð.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Búa til nýja viðskiptavini
-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.","Ef margir Verðlagning Reglur halda áfram að sigra, eru notendur beðnir um að setja Forgangur höndunum til að leysa deiluna."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Búa innkaupapantana
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Búa til nýja viðskiptavini
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ef margir Verðlagning Reglur halda áfram að sigra, eru notendur beðnir um að setja Forgangur höndunum til að leysa deiluna."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Búa innkaupapantana
 ,Purchase Register,kaup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,gildandi Gjöld
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) verða að hafa hlutverk &#39;Yfirgefa samþykkjari&#39;
 DocType: Purchase Receipt,Vehicle Date,ökutæki Dagsetning
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Ástæðan fyrir að tapa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Ástæðan fyrir að tapa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead Eigandi getur ekki verið sama og Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Úthlutað magn getur ekki hærri en óleiðréttum upphæð
 DocType: Announcement,Receiver,Receiver
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Magn og Rate
 DocType: Delivery Note,% Installed,% Uppsett
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Kennslustofur / Laboratories etc þar fyrirlestra geta vera tímaáætlun.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vinsamlegast sláðu inn nafn fyrirtækis fyrst
 DocType: Purchase Invoice,Supplier Name,Nafn birgja
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lestu ERPNext Manual
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,Old Parent
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Skyldanlegt námskeið - námsár
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sérsníða inngangs texta sem fer eins og a hluti af þeim tölvupósti. Hver viðskipti er sérstakt inngangs texta.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Vinsamlegast settu sjálfgefinn greiðslureikning fyrir fyrirtækið {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global stillingar fyrir alla framleiðsluaðferðum.
 DocType: Accounts Settings,Accounts Frozen Upto,Reikninga Frozen uppí
 DocType: SMS Log,Sent On,sendi á
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Eiginleiki {0} valin mörgum sinnum í eigindum töflu
 DocType: HR Settings,Employee record is created using selected field. ,Starfsmaður færsla er búin til með völdu sviði.
 DocType: Sales Order,Not Applicable,Á ekki við
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday skipstjóri.
 DocType: Request for Quotation Item,Required Date,Áskilið Dagsetning
 DocType: Delivery Note,Billing Address,Greiðslufang
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Vinsamlegast sláðu Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Vinsamlegast sláðu Item Code.
 DocType: BOM,Costing,kosta
 DocType: Tax Rule,Billing County,Innheimta County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",Ef hakað skattur upphæð verður að teljast þegar innifalið í Print Rate / Prenta Upphæð
@@ -500,6 +504,7 @@
 DocType: Packing Slip,From Package No.,Frá pakkinn nr
 DocType: Item Attribute,To Range,til Hóflegt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verðbréfa
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Ekki er hægt að breyta matunaraðferð, þar sem viðskipti eiga sér stað gegn sumum hlutum sem ekki hafa eigin matunaraðferð"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Samtals lauf úthlutað er nauðsynlegur
 DocType: Job Opening,Description of a Job Opening,Lýsing á starf opnun
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bið starfsemi fyrir dag
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Administrative Officer
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vinsamlegast veldu Námskeið
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vinsamlegast veldu Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Vinsamlegast veldu Company
 DocType: Stock Entry Detail,Difference Account,munurinn Reikningur
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Get ekki loka verkefni eins háð verkefni hennar {0} er ekki lokað.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vinsamlegast sláðu Warehouse sem efni Beiðni verði hækkað
 DocType: Production Order,Additional Operating Cost,Viðbótarupplýsingar rekstrarkostnaður
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,snyrtivörur
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Að sameinast, eftirfarandi eiginleika verða að vera það sama fyrir bæði atriði"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Neyðarnúmer Sími
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kaupa
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vinsamlegast tilgreindu einkunn fyrir Þröskuld 0%
 DocType: Sales Order,To Deliver,til Bera
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial engin lið getur ekki verið brot
 DocType: Journal Entry,Difference (Dr - Cr),Munur (Dr - Cr)
 DocType: Account,Profit and Loss,Hagnaður og tap
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Annast undirverktöku
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Vöxtur getur ekki verið 0
 DocType: Production Planning Tool,Material Requirement,efni Krafa
 DocType: Company,Delete Company Transactions,Eyða Transactions Fyrirtækið
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Tilvísun Nei og Frestdagur er nauðsynlegur fyrir banka viðskiptin
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Bæta við / breyta sköttum og gjöldum
 DocType: Purchase Invoice,Supplier Invoice No,Birgir Reikningur nr
 DocType: Territory,For reference,til viðmiðunar
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,Uppsetning Note Item
 DocType: Production Plan Item,Pending Qty,Bíður Magn
 DocType: Budget,Ignore,Hunsa
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ekki virkur
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ekki virkur
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS send til eftirfarandi númer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Skipulag athuga mál fyrir prentun
 DocType: Salary Slip,Salary Slip Timesheet,Laun Slip Timesheet
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,alls Commission
 DocType: Pricing Rule,Sales Partner,velta Partner
 DocType: Buying Settings,Purchase Receipt Required,Kvittun Áskilið
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Verðmat Rate er nauðsynlegur ef Opnun Stock inn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Engar færslur finnast í Invoice töflunni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vinsamlegast veldu Company og Party Gerð fyrst
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / bókhald ári.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uppsafnaður Gildi
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Því miður, Serial Nos ekki hægt sameinuð"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Gera Velta Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Gera Velta Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,Halda áfram Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,endurtaka Viðskiptavinir
 DocType: Leave Control Panel,Allocate,úthluta
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,velta Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,velta Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Ath: Samtals úthlutað leyfi {0} ætti ekki að vera minna en þegar hafa verið samþykktar leyfi {1} fyrir tímabilið
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Samþykkt með Birgir (Drop Ship)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,Tilvitnun Til
 DocType: Lead,Middle Income,Middle Tekjur
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Mælieiningin fyrir lið {0} Ekki er hægt að breyta beint vegna þess að þú hefur nú þegar gert nokkrar viðskiptin (s) með öðru UOM. Þú þarft að búa til nýjan hlut til að nota aðra Sjálfgefin UOM.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Úthlutað magn getur ekki verið neikvæð
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vinsamlegast settu fyrirtækið
 DocType: Purchase Order Item,Billed Amt,billed Amt
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Velta Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Tilvísunarnúmer &amp; Frestdagur er nauðsynlegt fyrir {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Veldu Greiðslureikningur að gera Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Búa Employee skrár til að stjórna lauf, kostnað kröfur og launaskrá"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Bæta við Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Tillaga Ritun
 DocType: Payment Entry Deduction,Payment Entry Deduction,Greiðsla Entry Frádráttur
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ekki í Fiscal Year {2}
 DocType: Buying Settings,Settings for Buying Module,Stillingar fyrir Buying Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Eignastýring {0} ekki tilheyra félaginu {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Vinsamlegast sláðu inn kvittun fyrst
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Vinsamlegast sláðu inn kvittun fyrst
 DocType: Buying Settings,Supplier Naming By,Birgir Nafngift By
 DocType: Activity Type,Default Costing Rate,Sjálfgefið Kosta Rate
 DocType: Maintenance Schedule,Maintenance Schedule,viðhald Dagskrá
-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.","Þá Verðlagning Reglur eru síuð út byggðar á viðskiptavininn, viðskiptavini Group, Territory, Birgir, Birgir Tegund, Campaign, Sales Partner o.fl."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Þá Verðlagning Reglur eru síuð út byggðar á viðskiptavininn, viðskiptavini Group, Territory, Birgir, Birgir Tegund, Campaign, Sales Partner o.fl."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Net Breyting á Skrá
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Starfsmaður Lán Stjórnun
 DocType: Employee,Passport Number,Vegabréfs númer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Tengsl Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,framkvæmdastjóri
 DocType: Payment Entry,Payment From / To,Greiðsla Frá / Til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Tímabil
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ný hámarksupphæð er minna en núverandi útistandandi upphæð fyrir viðskiptavininn. Hámarksupphæð þarf að vera atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Sama atriði hefur verið slegið mörgum sinnum.
 DocType: SMS Settings,Receiver Parameter,Receiver Parameter
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,"""Byggt á' og 'hópað eftir' getur ekki verið það sama"
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,í mínútum
 DocType: Issue,Resolution Date,upplausn Dagsetning
 DocType: Student Batch Name,Batch Name,hópur Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet búið:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet búið:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vinsamlegast settu sjálfgefinn Cash eða bankareikning í háttur á greiðslu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,innritast
 DocType: Selling Settings,Customer Naming By,Viðskiptavinur Nafngift By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mun sýna nemandann eins staðar í námsmanna Monthly Aðsókn Report
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,Raunveruleg Start Time
 DocType: BOM Operation,Operation Time,Operation Time
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Ljúka
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
 DocType: Timesheet,Total Billed Hours,Samtals Greidd Hours
 DocType: Journal Entry,Write Off Amount,Skrifaðu Off Upphæð
 DocType: Journal Entry,Bill No,Bill Nei
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,Student Aðsókn
 DocType: Sales Invoice Timesheet,Time Sheet,Tímatafla
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials miðað við
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Vinsamlegast sláðu inn Item upplýsingar
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vinsamlegast sláðu inn Item upplýsingar
 DocType: Interest,Interest,vextir
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Forsala
 DocType: Purchase Receipt,Other Details,aðrar upplýsingar
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Greiðsla Entry er þegar búið
 DocType: Purchase Receipt Item Supplied,Current Stock,Núverandi Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} er ekki tengd við lið {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Laun Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Laun Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Reikningur {0} hefur verið slegið mörgum sinnum
 DocType: Account,Expenses Included In Valuation,Kostnaður í Verðmat
 DocType: Hub Settings,Seller City,Seljandi City
 ,Absent Student Report,Absent Student Report
 DocType: Email Digest,Next email will be sent on:,Næst verður send í tölvupósti á:
 DocType: Offer Letter Term,Offer Letter Term,Tilboð Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Liður hefur afbrigði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Liður hefur afbrigði.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Liður {0} fannst ekki
 DocType: Bin,Stock Value,Stock Value
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Fyrirtæki {0} er ekki til
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Tegund
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Tegund
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Magn neytt á Unit
 DocType: Serial No,Warranty Expiry Date,Ábyrgð í Fyrningardagsetning
 DocType: Material Request Item,Quantity and Warehouse,Magn og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Þóknun Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vinsamlegast veldu Forrit
 DocType: Project,Estimated Cost,áætlaður kostnaður
 DocType: Purchase Order,Link to material requests,Tengill á efni beiðna
@@ -753,7 +756,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} er ekki birgðir Item
 DocType: Mode of Payment Account,Default Account,Sjálfgefið Reikningur
 DocType: Payment Entry,Received Amount (Company Currency),Fékk Magn (Company Gjaldmiðill)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead verður að setja ef Tækifæri er gert úr Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vinsamlegast veldu viku burt daginn
 DocType: Production Order Operation,Planned End Time,Planned Lokatími
 ,Sales Person Target Variance Item Group-Wise,Velta Person Target Dreifni Item Group-Wise
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,tækifæri Frá
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mánaðarlaun yfirlýsingu.
 DocType: BOM,Website Specifications,Vefsíða Upplýsingar
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Númerakerfi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Frá {0} tegund {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: viðskipta Factor er nauðsynlegur
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr
 DocType: Bank Guarantee,Project,Project
 DocType: Quality Inspection Reading,Reading 7,lestur 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,hluta Raðaður
 DocType: Expense Claim Detail,Expense Claim Type,Expense Gerð kröfu
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Sjálfgefnar stillingar fyrir Shopping Cart
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Eignastýring rifið um dagbókarfærslu {0}
@@ -810,14 +815,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,líftækni
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Skrifstofa viðhald kostnaður
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Setja upp Email Account
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Vinsamlegast sláðu inn Item fyrst
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vinsamlegast sláðu inn Item fyrst
 DocType: Account,Liability,Ábyrgð
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Bundnar Upphæð má ekki vera meiri en bótafjárhæðir í Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default Kostnaðarverð seldra vara reikning
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Verðskrá ekki valið
 DocType: Employee,Family Background,Family Background
 DocType: Request for Quotation Supplier,Send Email,Senda tölvupóst
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Viðvörun: Ógild Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,engin heimild
 DocType: Company,Default Bank Account,Sjálfgefið Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Að sía byggt á samningsaðila, velja Party Sláðu fyrst"
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Enginn starfsmaður fannst
 DocType: Supplier Quotation,Stopped,Tappi
 DocType: Item,If subcontracted to a vendor,Ef undirverktaka til seljanda
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nemendahópur er þegar uppfærð.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nemendahópur er þegar uppfærð.
 DocType: SMS Center,All Customer Contact,Allt Viðskiptavinur samband við
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Hlaða lager jafnvægi í gegnum CSV.
 DocType: Warehouse,Tree Details,Tree Upplýsingar
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Lágmark Reikningsupphæð
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnaður Center {2} ekki tilheyra félaginu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} getur ekki verið Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan &#39;{DOCTYPE}&#39; borð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Liður Row {idx}: {DOCTYPE} {DOCNAME} er ekki til í að ofan &#39;{DOCTYPE}&#39; borð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} er þegar lokið eða hætt
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Engin verkefni
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagur mánaðarins sem farartæki reikningur vilja vera mynda td 05, 28 osfrv"
 DocType: Asset,Opening Accumulated Depreciation,Opnun uppsöfnuðum afskriftum
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Meta
 DocType: Production Planning Tool,Select Items,Valið Atriði
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} gegn frumvarpinu {1} dags {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,námskeið Stundaskrá
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,námskeið Stundaskrá
 DocType: Maintenance Visit,Completion Status,Gengið Staða
 DocType: HR Settings,Enter retirement age in years,Sláðu eftirlaunaaldur í ár
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Leyfa yfir afhendingu eða viðtöku allt uppí þennan prósent
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,innflutningur Aðsókn
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Allir Item Hópar
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Allir Item Hópar
 DocType: Process Payroll,Activity Log,virkni Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Hagnaður / Tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Sjálfkrafa semja skilaboð á framlagningu viðskiptum.
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Purchase Order til greiðslu
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Áætlaðar Magn
 DocType: Sales Invoice,Payment Due Date,Greiðsla Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Liður Variant {0} er þegar til staðar með sömu eiginleika
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open Til Gera
 DocType: Notification Control,Delivery Note Message,Afhending Note Message
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Magn
 DocType: Leave Block List Date,Leave Block List Date,Skildu Block List Dagsetning
 DocType: Pricing Rule,Price or Discount,Verð eða Afsláttur
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Samtals greiðsla í kvittun atriðum borðið verður að vera það sama og Samtals skatta og gjöld
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Samtals greiðsla í kvittun atriðum borðið verður að vera það sama og Samtals skatta og gjöld
 DocType: Sales Team,Incentives,Incentives
 DocType: SMS Log,Requested Numbers,umbeðin Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Aðeins fá hráefni
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,er undirverktöku
 DocType: Item Attribute,Item Attribute Values,Liður eigindi gildi
 DocType: Examination Result,Examination Result,skoðun Niðurstaða
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Kvittun
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Kvittun
 ,Received Items To Be Billed,Móttekin Items verður innheimt
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Innsendar Laun laumar
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Gengi meistara.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Tilvísun DOCTYPE verður að vera einn af {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Tilvísun DOCTYPE verður að vera einn af {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Ekki er hægt að finna tíma rifa á næstu {0} dögum fyrir aðgerð {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan efni fyrir undireiningum
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Velta Partners og Territory
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Ekki er hægt að sjálfkrafa búa reikning sem það er nú þegar Stock jafnvægi í reikninginn. Þú verður að búa til passa reikning áður en hægt er að gera færslu um þetta vöruhús
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,Sjálfgefin greiðast reikningar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Starfsmaður {0} er ekki virkur eða er ekki til
 DocType: Fee Structure,Components,Hluti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Liður Afbrigði {0} uppfærð
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vinsamlegast sláðu eignaflokki í lið {0}
 DocType: Quality Inspection Reading,Reading 6,lestur 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Get ekki {0} {1} {2} án neikvætt framúrskarandi Reikningar
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Kaupa Reikningar Advance
 DocType: Hub Settings,Sync Now,Sync Nú
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit færslu er ekki hægt að tengja með {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,Er Purchase Item
 DocType: Asset,Purchase Invoice,kaup Invoice
 DocType: Stock Ledger Entry,Voucher Detail No,Skírteini Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nýr reikningur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nýr reikningur
 DocType: Stock Entry,Total Outgoing Value,Alls Outgoing Value
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Opnun Dagsetning og lokadagur ætti að vera innan sama reikningsár
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Opnun Dagsetning og lokadagur ætti að vera innan sama reikningsár
 DocType: Lead,Request for Information,Beiðni um upplýsingar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Reikningar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Reikningar
 DocType: Payment Request,Paid,greiddur
 DocType: Program Fee,Program Fee,program Fee
 DocType: Salary Slip,Total in words,Samtals í orðum
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,bundnar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,er nauðsynlegur. Kannski gjaldeyri færsla er ekki búin að
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: Vinsamlegast tilgreinið Serial Nei fyrir lið {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","Fyrir &quot;vara búnt &#39;atriði, Lager, Serial Nei og Batch No verður að teljast úr&#39; Pökkun lista &#39;töflunni. Ef Warehouse og Batch No eru sömu fyrir alla pökkun atriði fyrir hvaða &quot;vara búnt &#39;lið, sem gildin má færa í helstu atriði borðið, gildi verða afrituð á&#39; Pökkun lista &#39;borð."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Fyrir &quot;vara búnt &#39;atriði, Lager, Serial Nei og Batch No verður að teljast úr&#39; Pökkun lista &#39;töflunni. Ef Warehouse og Batch No eru sömu fyrir alla pökkun atriði fyrir hvaða &quot;vara búnt &#39;lið, sem gildin má færa í helstu atriði borðið, gildi verða afrituð á&#39; Pökkun lista &#39;borð."
 DocType: Job Opening,Publish on website,Birta á vefsíðu
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Sendingar til viðskiptavina.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Birgir Invoice Dagsetning má ekki vera meiri en Staða Dagsetning
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,dreifni
 ,Company Name,nafn fyrirtækis
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Veldu Atriði til flutnings
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Veldu Atriði til flutnings
 DocType: Purchase Invoice,Additional Discount Percentage,Viðbótarupplýsingar Afsláttur Hlutfall
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Skoða lista yfir öll hjálparefni myndbönd
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Veldu yfirmaður reikning bankans þar stöðva var afhent.
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Row {0}: Greiðsla gegn sölu / Purchase Order ætti alltaf að vera merkt sem fyrirfram
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Chemical
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash reikningur verður sjálfkrafa uppfærð í laun dagbókarfærslu þegar þessi háttur er valinn.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",The millibili fyrir Grade Code {0} skarast við bekk fresti öðrum bekk. Vinsamlegast athugaðu millibili {0} og {1} og reyndu aftur
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Kostnaður (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Allir hlutir hafa þegar verið flutt í þessari framleiðslu Order.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Gengi má ekki vera hærra en hlutfallið sem notað er í {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Hlaða bréf höfuðið og merki. (Þú getur breytt þeim síðar).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Næsta Afskriftir Date er færður sem síðasta dags
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,White
 DocType: SMS Center,All Lead (Open),Allt Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Magn er ekki í boði fyrir {4} í vöruhús {1} á að senda sinn færslunnar ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Fá Framfarir Greiddur
 DocType: Item,Automatically Create New Batch,Búðu til nýjan hóp sjálfkrafa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,gera
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,gera
 DocType: Student Admission,Admission Start Date,Aðgangseyrir Start Date
 DocType: Journal Entry,Total Amount in Words,Heildarfjárhæð orðum
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Það var villa. Ein líkleg ástæða gæti verið að þú hefur ekki vistað mynd. Vinsamlegast hafðu samband support@erpnext.com ef vandamálið er viðvarandi.
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Order Type verður að vera einn af {0}
 DocType: Lead,Next Contact Date,Næsta samband við þann
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,opnun Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vinsamlegast sláðu inn reikning fyrir Change Upphæð
 DocType: Student Batch Name,Student Batch Name,Student Hópur Name
 DocType: Holiday List,Holiday List Name,Holiday List Nafn
 DocType: Repayment Schedule,Balance Loan Amount,Balance lánsfjárhæð
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Tilgreindu {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjarlægðar atriði með engin breyting á magni eða verðmæti.
 DocType: Delivery Note,Delivery To,Afhending Til
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Eiginleiki borð er nauðsynlegur
 DocType: Production Planning Tool,Get Sales Orders,Fá sölu skipunum
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} er ekki hægt að neikvæð
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,afsláttur
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,afsláttur
 DocType: Asset,Total Number of Depreciations,Heildarfjöldi Afskriftir
 DocType: Sales Invoice Item,Rate With Margin,Meta með skák
 DocType: Workstation,Wages,laun
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Frátekin Warehouse í Velta Order / Finished Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,selja Upphæð
 DocType: Repayment Schedule,Interest Amount,vextir Upphæð
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Þú ert kostnað samþykkjari fyrir þessa færslu. Uppfærðu &#39;Staða&#39; og Vista
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Þú ert kostnað samþykkjari fyrir þessa færslu. Uppfærðu &#39;Staða&#39; og Vista
 DocType: Serial No,Creation Document No,Creation Skjal nr
 DocType: Issue,Issue,Mál
 DocType: Asset,Scrapped,rifið
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Eiginleiki fyrir Liður Útgáfur. td stærð, liti o.fl."
 DocType: Purchase Invoice,Returns,Skil
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial Nei {0} er undir viðhald samning uppí {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Nei {0} er undir viðhald samning uppí {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Ráðningar
 DocType: Lead,Organization Name,nafn samtaka
 DocType: Tax Rule,Shipping State,Sendingar State
 ,Projected Quantity as Source,Áætlaðar Magn eins Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Atriði verður að bæta með því að nota &quot;fá atriði úr greiðslukvittanir &#39;hnappinn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Atriði verður að bæta með því að nota &quot;fá atriði úr greiðslukvittanir &#39;hnappinn
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Fela ekki lager atriði
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,sölukostnaður
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,gegn
 DocType: Item,Default Selling Cost Center,Sjálfgefið Selja Kostnaður Center
 DocType: Sales Partner,Implementation Partner,framkvæmd Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Póstnúmer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Póstnúmer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Velta Order {0} er {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Gerð lager færslur
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Úrslit
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Úrslit
 DocType: Item,Default Supplier,Sjálfgefið Birgir
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Yfir Production losunarheimilda Hlutfall
 DocType: Employee Loan,Repayment Schedule,endurgreiðsla Dagskrá
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Fáðu vikulega Off Dagsetningar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Lokadagur má ekki vera minna en Start Date
 DocType: Sales Person,Select company name first.,Select nafn fyrirtækis fyrst.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tilvitnanir berast frá birgja.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Meðalaldur
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,samgöngur
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ógilt Attribute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} Leggja skal fram
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} Leggja skal fram
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Magn verður að vera minna en eða jafnt og {0}
 DocType: SMS Center,Total Characters,Samtals Stafir
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vinsamlegast veldu BOM á BOM sviði í lið {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,dreifingaraðili
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Shopping Cart Shipping Rule
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Framleiðslu Order {0} verður lokað áður en hætta þessu Velta Order
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Vinsamlegast settu &#39;Virkja Viðbótarupplýsingar afslátt&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Vinsamlegast settu &#39;Virkja Viðbótarupplýsingar afslátt&#39;
 ,Ordered Items To Be Billed,Pantaði Items verður innheimt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Frá Range þarf að vera minna en við úrval
 DocType: Global Defaults,Global Defaults,Global Vanskil
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Ár
 DocType: Purchase Invoice,Start date of current invoice's period,Upphafsdagur tímabils núverandi reikningi er
 DocType: Salary Slip,Leave Without Pay,Leyfi án launa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Getu Planning Villa
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Getu Planning Villa
 ,Trial Balance for Party,Trial Balance fyrir aðila
 DocType: Lead,Consultant,Ráðgjafi
 DocType: Salary Slip,Earnings,Hagnaður
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Þetta verður bætt við Item Code afbrigði. Til dæmis, ef skammstöfun er &quot;SM&quot;, og hluturinn kóða er &quot;T-bolur&quot;, hluturinn kóðann um afbrigði verður &quot;T-bolur-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Borga (í orðum) verður sýnileg þegar þú hefur vistað Laun Slip.
 DocType: Purchase Invoice,Is Return,er aftur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / skuldfærslu Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / skuldfærslu Note
 DocType: Price List Country,Price List Country,Verðskrá Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gild raðnúmer nos fyrir lið {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vinsamlegast sláðu Item Code til að fá lotunúmer
 DocType: Stock Settings,Default Item Group,Sjálfgefið Item Group
 DocType: Employee Loan,Partially Disbursed,hluta ráðstafað
-DocType: Grading Structure,Grading System Name,Einkunnakerfi Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Birgir gagnagrunni.
 DocType: Account,Balance Sheet,Efnahagsreikningur
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Kostnaður Center For lið með Item Code &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Greiðsla Mode er ekki stillt. Vinsamlegast athugaðu hvort reikningur hefur verið sett á Mode Greiðslur eða POS Profile.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,velta manneskja mun fá áminningu á þessari dagsetningu til að hafa samband við viðskiptavini
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama atriði er ekki hægt inn mörgum sinnum.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Frekari reikninga er hægt að gera undir Hópar, en færslur er hægt að gera á móti non-hópa"
@@ -1183,7 +1184,7 @@
 ,Purchase Order Items To Be Billed,Purchase Order Items verður innheimt
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Kaupa Reikningar Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lager Ledger Entries og GL Færslur eru endurbirt fyrir valin Purchase Kvittanir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Lager Ledger Entries og GL Færslur eru endurbirt fyrir valin Purchase Kvittanir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Atriði 1
 DocType: Holiday,Holiday,Holiday
 DocType: Support Settings,Close Issue After Days,Loka Issue Eftir daga
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,vinnu
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vinsamlegast tilgreindu að minnsta kosti einn eiginleiki í þeim einkennum töflunni
 DocType: Announcement,All Students,Allir nemendur
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Liður {0} verður að a non-birgðir atriði
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Liður {0} verður að a non-birgðir atriði
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Skoða Ledger
 DocType: Grading Scale,Intervals,millibili
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,elstu
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","An Item Group til staðar með sama nafni, vinsamlegast breyta hlutinn nafni eða endurnefna atriði hópinn"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Rest Of The World
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The Item {0} getur ekki Hópur
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Greiðsla launum frá {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Ekki heimild til að breyta frosinn reikning {0}
 DocType: Journal Entry,Get Outstanding Invoices,Fá útistandandi reikninga
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Velta Order {0} er ekki gilt
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Kaup pantanir hjálpa þér að skipuleggja og fylgja eftir kaupum þínum
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Því miður, fyrirtæki geta ekki vera sameinuð"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Heildarkostnaður Issue / Transfer magn {0} í efni Beiðni {1} \ má ekki vera meiri en óskað magn {2} fyrir lið {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Lítil
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,óbeinum kostnaði
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Magn er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbúnaður
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vörur eða þjónustu
 DocType: Mode of Payment,Mode of Payment,Háttur á greiðslu
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Vefsíða Image ætti að vera opinber skrá eða vefslóð
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Þetta er rót atriði hóp og ekki hægt að breyta.
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,Group Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Fyrir {0}, aðeins kredit reikninga er hægt að tengja við aðra gjaldfærslu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Alls öllum verkefni lóðum skal vera 1. Stilltu vigta allar verkefni verkefni í samræmi við
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Afhending Note {0} er ekki lögð
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Liður {0} verður að vera Sub-dregist Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Capital útbúnaður
-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.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Verðlagning Regla er fyrst valið byggist á &#39;Virkja Á&#39; sviði, sem getur verið Item, Item Group eða Brand."
 DocType: Hub Settings,Seller Website,Seljandi Website
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Samtals úthlutað hlutfall fyrir Söluteymi ætti að vera 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Framleiðsla Order staðan er {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Framleiðsla Order staðan er {0}
 DocType: Appraisal Goal,Goal,Markmið
 DocType: Sales Invoice Item,Edit Description,Breyta Lýsing
 ,Team Updates,Team uppfærslur
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,fyrir Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,fyrir Birgir
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Uppsetning reiknings Tegund hjálpar í því að velja þennan reikning í viðskiptum.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Gjaldmiðill)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Búa prenta sniði
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,Dagbókarfærsla
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} atriði í gangi
 DocType: Workstation,Workstation Name,Workstation Name
-DocType: Grade Interval,Grade Code,bekk Code
+DocType: Grading Scale Interval,Grade Code,bekk Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Sendu Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ekki tilheyra lið {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Vélbúnaður
 DocType: Sales Order,Recurring Upto,Fastir uppí
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vinsamlegast veldu Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vinsamlegast veldu Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Birgir Dagsetning reiknings
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Þú þarft að virkja Shopping Cart
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Matur
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Engin heimsókna
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Viðhaldsáætlun {0} er til staðar gegn {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,innritast nemandi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Gjaldmiðill lokun reiknings skal vera {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summa stig fyrir allar markmiðum ætti að vera 100. Það er {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: POS Profile,Campaign,herferð
 DocType: Supplier,Name and Type,Nafn og tegund
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Samþykki Staða verður &quot;Samþykkt&quot; eða &quot;Hafnað &#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Samþykki Staða verður &quot;Samþykkt&quot; eða &quot;Hafnað &#39;
 DocType: Purchase Invoice,Contact Person,Tengiliður
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Bjóst Start Date &#39;má ekki vera meiri en&#39; Bjóst Lokadagur &#39;
 DocType: Course Scheduling Tool,Course End Date,Auðvitað Lokadagur
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,Sendingar Address Nafn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Mynd reikninga
 DocType: Material Request,Terms and Conditions Content,Skilmálar og skilyrði Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,getur ekki verið meiri en 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,getur ekki verið meiri en 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Liður {0} er ekki birgðir Item
 DocType: Maintenance Visit,Unscheduled,unscheduled
 DocType: Employee,Owned,eigu
 DocType: Salary Detail,Depends on Leave Without Pay,Fer um leyfi án launa
 DocType: Pricing Rule,"Higher the number, higher the priority","Hærri sem talan, hærri forgang"
 ,Purchase Invoice Trends,Kaupa Reikningar Trends
 DocType: Employee,Better Prospects,betri horfur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} hefur aðeins {2} magn. Vinsamlegast veldu annað lotu sem hefur {3} magn í boði eða skipt röðina í margar línur til að afhenda / gefa út úr mörgum lotum
 DocType: Vehicle,License Plate,Númeraplata
 DocType: Appraisal,Goals,mörk
 DocType: Warranty Claim,Warranty / AMC Status,Ábyrgð í / AMC Staða
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Starfsmaður getur ekki skýrslu við sjálfan sig.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ef reikningur er frosinn, eru færslur leyft að afmörkuðum notendum."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Bókhald Entry fyrir {0}: {1} Aðeins er hægt að gera í gjaldmiðli: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Job uppsetningu, hæfi sem krafist o.fl."
 DocType: Journal Entry Account,Account Balance,Staða reiknings
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Tax Regla fyrir viðskiptum.
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Sýna P &amp; unclosed fjárhagsári er L jafnvægi
 DocType: Shipping Rule,Shipping Account,Sendingar Account
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er óvirkur
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gera Velta Pantanir til að hjálpa þér að skipuleggja vinnu þína og skila á tíma
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gera Velta Pantanir til að hjálpa þér að skipuleggja vinnu þína og skila á tíma
 DocType: Quality Inspection,Readings,Upplestur
 DocType: Stock Entry,Total Additional Costs,Samtals viðbótarkostnað
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,til Value
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Source vöruhús er nauðsynlegur fyrir röð {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,pökkun Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,pökkun Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,skrifstofa leigu
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Skipulag SMS Gateway stillingar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Innflutningur mistókst!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,Þjónusta
 DocType: HR Settings,Email Salary Slip to Employee,Sendu Laun Slip til starfsmanns
 DocType: Cost Center,Parent Cost Center,Parent Kostnaður Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Veldu Möguleg Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Veldu Möguleg Birgir
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Sýna lokaðar
 DocType: Leave Type,Is Leave Without Pay,Er Leyfi án launa
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Flokkur er nauðsynlegur fyrir Fast eignalið
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Engar færslur finnast í Greiðsla töflunni
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Þessi {0} átök með {1} fyrir {2} {3}
 DocType: Student Attendance Tool,Students HTML,nemendur HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,Dagsetning Keyrsla
 DocType: Pricing Rule,For Price List,Fyrir verðskrá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Búa Leiða
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Búa Leiða
 DocType: Maintenance Schedule,Schedules,Skrár
 DocType: Purchase Invoice Item,Net Amount,Virði
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail No
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program innritun nemenda
 DocType: Sales Invoice Item,Brand Name,Vörumerki
 DocType: Purchase Receipt,Transporter Details,Transporter Upplýsingar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Sjálfgefið vöruhús er nauðsynlegt til valið atriði
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Möguleg Birgir
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Möguleg Birgir
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,The Organization
 DocType: Budget,Monthly Distribution,Mánaðarleg dreifing
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receiver List er tóm. Vinsamlegast búa Receiver Listi
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,Velta Partner Target
 DocType: Loan Type,Maximum Loan Amount,Hámarkslán
 DocType: Pricing Rule,Pricing Rule,verðlagning Regla
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Afrita rúlla númer fyrir nemanda {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Afrita rúlla númer fyrir nemanda {0}
 DocType: Budget,Action if Annual Budget Exceeded,Aðgerð ef Árleg Budget meiri en
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Efni Beiðni um Innkaupapöntun
 DocType: Shopping Cart Settings,Payment Success URL,Greiðsla Velgengni URL
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,endurgreiðsla Aðferð
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Ef valið þá Heimasíða verður sjálfgefið Item Group fyrir vefsvæðið
 DocType: Quality Inspection Reading,Reading 4,lestur 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Sjálfgefin BOM fyrir {0} ekki að finna fyrir Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Sjálfgefin BOM fyrir {0} ekki að finna fyrir Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Kröfur fyrir VÍS.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Nemendur eru í hjarta kerfisins, bæta við öllum nemendum"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Nemendur eru í hjarta kerfisins, bæta við öllum nemendum"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Úthreinsun dagsetning {1} er ekki hægt áður Ávísun Dagsetning {2}
 DocType: Company,Default Holiday List,Sjálfgefin Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Frá tíma og tíma af {1} er skörun við {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Daginn (s) sem þú ert að sækja um leyfi eru frí. Þú þarft ekki að sækja um leyfi.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Endursenda Greiðsla tölvupóst
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,nýtt verkefni
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,gera Tilvitnun
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,gera Tilvitnun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,aðrar skýrslur
 DocType: Dependent Task,Dependent Task,Dependent Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Breytistuðull fyrir sjálfgefið Mælieiningin skal vera 1 í röðinni {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leyfi af gerð {0} má ekki vera lengri en {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prófaðu að skipuleggja starfsemi fyrir X daga fyrirvara.
 DocType: HR Settings,Stop Birthday Reminders,Stop afmælisáminningar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vinsamlegast settu Default Launaskrá Greiðist reikning í félaginu {0}
 DocType: SMS Center,Receiver List,Receiver List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,leit Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,leit Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,neytt Upphæð
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Net Breyting á Cash
 DocType: Assessment Plan,Grading Scale,flokkun Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,þegar lokið
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mælieiningin {0} hefur verið slegið oftar en einu sinni í viðskipta Factor töflu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,þegar lokið
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Greiðsla Beiðni þegar til staðar {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnaður af úthlutuðum Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Magn má ekki vera meira en {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Gera útborgun færslu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance gegn Birgir skal gjaldfæra
 DocType: Company,Default Values,sjálfgefnar
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Tíðni} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Heildarfjárhæð Endurgreiða
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Þetta er byggt á logs gegn þessu ökutæki. Sjá tímalínu hér fyrir nánari upplýsingar
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,safna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Gegn Birgir Invoice {0} dagsett {1}
 DocType: Customer,Default Price List,Sjálfgefið Verðskrá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Eignastýring Hreyfing met {0} búin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Þú getur ekki eytt Fiscal Year {0}. Reikningsár {0} er sett sem sjálfgefið í Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Viðskiptavinur Credit Balance
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Öflun
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ekkert af þeim atriðum hafa allar breytingar á magni eða verðmæti.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Lögboðið reit - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,ábyrgð kröfu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ábyrgð kröfu
 ,Lead Details,Lead Upplýsingar
 DocType: Salary Slip,Loan repayment,lán endurgreiðslu
 DocType: Purchase Invoice,End date of current invoice's period,Lokadagur tímabils núverandi reikningi er
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,Heimilisfang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Fyrirframgreiðslu á móti {0} {1} getur ekki verið meiri \ en GRAND Samtals {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vinsamlegast veldu atriði kóða
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Vinsamlegast veldu atriði kóða
 DocType: Student Sibling,Studying in Same Institute,Nám í sömu Institute
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Til Lager (Valfrjálst)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Payment Entry,Paid Amount (Company Currency),Greiddur Magn (Company Gjaldmiðill)
 DocType: Purchase Invoice,Additional Discount,Viðbótarupplýsingar Afsláttur
 DocType: Selling Settings,Selling Settings,selja Stillingar
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Skoða í körfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,markaðskostnaður
 ,Item Shortage Report,Liður Skortur Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Þyngd er getið, \ nVinsamlega nefna &quot;Þyngd UOM&quot; of"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Efni Beiðni notað til að gera þetta lager Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Næsta Afskriftir Date er nauðsynlegur fyrir nýrri eign
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Næsta Afskriftir Date er nauðsynlegur fyrir nýrri eign
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Aðskilja námskeið byggt fyrir hverja lotu
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single eining hlut.
 DocType: Fee Category,Fee Category,Fee Flokkur
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostnaður Center er nauðsynlegt fyrir &#39;RekstrarliÃ&#39; reikning {2}. Vinsamlegast setja upp sjálfgefið kostnaðarstað til félagsins.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Viðskiptavinur Group til staðar með sama nafni vinsamlegast breyta Customer Name eða endurnefna Viðskiptavinur Group
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Viðskiptavinur Group til staðar með sama nafni vinsamlegast breyta Customer Name eða endurnefna Viðskiptavinur Group
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,nýtt samband við
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,lestur 2
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,Item-vitur Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Kaup Upphæð
 DocType: Asset,Depreciation Method,Afskriftir Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er þetta Tax innifalinn í grunntaxta?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,alls Target
 DocType: Program Course,Required,Áskilið
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,sættir JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Of margir dálkar. Flytja skýrslu og prenta það með töflureikni.
 DocType: Purchase Invoice Item,Batch No,hópur Nei
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Ekki er hægt að finna gengi fyrir {0} til {1} fyrir helstu dagsetningu {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leyfa mörgum sölu skipunum gegn Purchase Order viðskiptavinar
 DocType: Student Group Instructor,Student Group Instructor,Nemandi hópur kennari
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Setja forskeyti fyrir númerakerfi röð á viðskiptum þínum
 DocType: Employee Attendance Tool,Employees HTML,starfsmenn HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Sjálfgefið BOM ({0}) verður að vera virkt fyrir þetta atriði eða sniðmátið sitt
 DocType: Employee,Leave Encashed?,Leyfi Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Tækifæri Frá sviði er nauðsynlegur
 DocType: Email Digest,Annual Expenses,Árleg útgjöld
 DocType: Item,Variants,afbrigði
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Gera Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Gera Purchase Order
 DocType: SMS Center,Send To,Senda til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Það er ekki nóg leyfi jafnvægi um leyfi Tegund {0}
 DocType: Payment Reconciliation Payment,Allocated amount,úthlutað magn
@@ -1733,17 +1734,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Liður viðskiptavinar Code
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Sættir
 DocType: Territory,Territory Name,Territory Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-í-gangi Warehouse er krafist áður Senda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Work-í-gangi Warehouse er krafist áður Senda
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Umsækjandi um starf.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse og Tilvísun
 DocType: Supplier,Statutory info and other general information about your Supplier,Lögbundin upplýsingar og aðrar almennar upplýsingar um birgir
 DocType: Item,Serial Nos and Batches,Raðnúmer og lotur
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Styrkur nemendahóps
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Gegn Journal Entry {0} hjartarskinn ekki hafa allir ósamþykkt {1} færslu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Gegn Journal Entry {0} hjartarskinn ekki hafa allir ósamþykkt {1} færslu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,úttektir
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Afrit Serial Nei slegið í lið {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Skilyrði fyrir Shipping reglu
-DocType: Grading Structure,Grading Intervals,flokkun Hlé
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vinsamlegast sláðu
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Ekki er hægt að overbill fyrir atriðið {0} in row {1} meira en {2}. Til að leyfa yfir-innheimtu, skaltu stilla á að kaupa Stillingar"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vinsamlegast settu síuna miðað Item eða Warehouse
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} Leggja skal fram
 DocType: Authorization Control,Authorization Control,Heimildin Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Hafnað Warehouse er nauðsynlegur móti hafnað Item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,greiðsla
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Stjórna pantanir
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,greiðsla
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Stjórna pantanir
 DocType: Production Order Operation,Actual Time and Cost,Raunveruleg tíma og kostnað
 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},Efni Beiðni um hámark {0} má gera ráð fyrir lið {1} gegn Velta Order {2}
 DocType: Employee,Salutation,Kveðjan
 DocType: Course,Course Abbreviation,Auðvitað Skammstöfun
 DocType: Student Leave Application,Student Leave Application,Student Leave Umsókn
 DocType: Item,Will also apply for variants,Mun einnig gilda fyrir afbrigði
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Eign er ekki hætt, eins og það er nú þegar {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Starfsmaður {0} á hálfan dag á {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samtals vinnutími ætti ekki að vera meiri en max vinnutíma {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Á
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Knippi atriði á sölu.
 DocType: Quotation Item,Actual Qty,Raunveruleg Magn
 DocType: Sales Invoice Item,References,Tilvísanir
@@ -1775,7 +1776,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Þú hefur slegið afrit atriði. Vinsamlegast lagfæra og reyndu aftur.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Félagi
 DocType: Asset Movement,Asset Movement,Asset Hreyfing
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nýtt körfu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,nýtt körfu
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Liður {0} er ekki serialized Item
 DocType: SMS Center,Create Receiver List,Búa Receiver lista
 DocType: Vehicle,Wheels,hjól
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Slekkur sköpun tíma logs gegn Production Orders. Reksturinn skal ekki raktar gegn Production Order
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,hefur Afbrigði
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Þú hefur nú þegar valið hluti úr {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Heiti Monthly Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Hópur auðkenni er nauðsynlegur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Hópur auðkenni er nauðsynlegur
 DocType: Sales Person,Parent Sales Person,Móðurfélag Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Fastir Invoice
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Annast verkefni
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,Fiscal Year
 DocType: Vehicle Log,Fuel Price,eldsneyti verð
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset Item verður a non-birgðir atriði.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Fjárhagsáætlun er ekki hægt að úthlutað gegn {0}, eins og það er ekki tekjur eða gjöld reikning"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,náð
 DocType: Student Admission,Application Form Route,Umsóknareyðublað Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territory / Viðskiptavinur
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territory / Viðskiptavinur
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,td 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Skildu Type {0} er ekki hægt að úthluta þar sem það er leyfi án launa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Reiknaðar upphæð {1} verður að vera minna en eða jafnt og til reikning útistandandi upphæð {2}
@@ -1841,14 +1842,14 @@
 ,Serial No Status,Serial Nei Staða
 DocType: Payment Entry Reference,Outstanding,Framúrskarandi
 ,Daily Timesheet Summary,Daily Timesheet Yfirlit
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Til að stilla {1} tíðni, munurinn frá og til dagsetning \ verður að vera meiri en eða jafnt og {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Þetta er byggt á lager hreyfingu. Sjá {0} for details
 DocType: Pricing Rule,Selling,selja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Upphæð {0} {1} frádráttar {2}
 DocType: Employee,Salary Information,laun Upplýsingar
 DocType: Sales Person,Name and Employee ID,Nafn og Starfsmannafélag ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Skiladagur er ekki hægt áður Staða Dagsetning
 DocType: Website Item Group,Website Item Group,Vefsíða Item Group
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Skyldur og skattar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vinsamlegast sláðu viðmiðunardagur
@@ -1860,14 +1861,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Getur ekki átt línunúmeri meiri en eða jafnt og núverandi röð númer fyrir þessa Charge tegund
 DocType: Asset,Sold,selt
 ,Item-wise Purchase History,Item-vitur Purchase History
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; að ná Serial Nei bætt við fyrir lið {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; að ná Serial Nei bætt við fyrir lið {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Opið Framleiðslu Pantanir
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Magn (Company Gjaldmiðill)
 DocType: Payment Reconciliation Payment,Reference Row,Tilvísun Row
 DocType: Installation Note,Installation Time,uppsetning Time
 DocType: Sales Invoice,Accounting Details,Bókhalds Upplýsingar
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Eyða öllum viðskiptum fyrir þetta fyrirtæki
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Eyða öllum viðskiptum fyrir þetta fyrirtæki
 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 ekki lokið fyrir {2} Fjöldi fullunnum vörum í framleiðslu Order # {3}. Uppfærðu rekstur stöðu með Time Logs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Fjárfestingar
 DocType: Issue,Resolution Details,upplausn Upplýsingar
@@ -1899,13 +1900,13 @@
 DocType: Discussion,Discussion,umræða
 DocType: Payment Entry,Transaction ID,Færsla ID
 DocType: Employee,Resignation Letter Date,Störfum Letter Dagsetning
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Verðlagning Reglurnar eru frekar síuð miðað við magn.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Verðlagning Reglurnar eru frekar síuð miðað við magn.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vinsamlegast settu Dagsetning Tengingar fyrir starfsmann {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Magn (með Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Endurtaka Tekjur viðskiptavinar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) verða að hafa hlutverk &#39;kostnað samþykkjari&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) verða að hafa hlutverk &#39;kostnað samþykkjari&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Veldu BOM og Magn fyrir framleiðslu
 DocType: Asset,Depreciation Schedule,Afskriftir Stundaskrá
 DocType: Bank Reconciliation Detail,Against Account,Against reikninginn
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date ætti að vera á milli Frá Dagsetning og hingað
@@ -1919,16 +1920,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Vinsamlegast settu &quot;Asset Afskriftir Kostnaður Center&quot; í félaginu {0}
 ,Maintenance Schedules,viðhald Skrár
 DocType: Task,Actual End Date (via Time Sheet),Raunveruleg End Date (með Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Upphæð {0} {1} gegn {2} {3}
 ,Quotation Trends,Tilvitnun Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Item Group ekki getið í master lið fyrir lið {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debit Til reikning verður að vera Krafa reikning
 DocType: Shipping Rule Condition,Shipping Amount,Sendingar Upphæð
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bíður Upphæð
 DocType: Purchase Invoice Item,Conversion Factor,ummyndun Factor
 DocType: Purchase Order,Delivered,afhent
 ,Vehicle Expenses,ökutæki Útgjöld
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
+DocType: Serial No,Invoice Details,Reikningsupplýsingar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Væntanlegur gildi eftir nýtingartíma skal vera meiri en eða jafnt og {0}
 DocType: Purchase Receipt,Vehicle Number,ökutæki Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Dagsetningin sem endurteknar reikningur verður að hætta
 DocType: Employee Loan,Loan Amount,lánsfjárhæð
@@ -1946,12 +1948,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Stillingar
 DocType: Salary Slip,net pay info,nettó borga upplýsingar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostnað Krafa bíður samþykkis. Aðeins kostnað samþykki getur uppfært stöðuna.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Kostnað Krafa bíður samþykkis. Aðeins kostnað samþykki getur uppfært stöðuna.
 DocType: Email Digest,New Expenses,ný Útgjöld
 DocType: Purchase Invoice,Additional Discount Amount,Viðbótarupplýsingar Afsláttur Upphæð
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Magn verður að vera 1, eins atriði er fastur eign. Notaðu sérstaka röð fyrir margar Magn."
 DocType: Leave Block List Allow,Leave Block List Allow,Skildu Block List Leyfa
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skammstöfun má ekki vera autt eða bil
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Íþróttir
 DocType: Loan Type,Loan Name,lán Name
@@ -1962,6 +1964,7 @@
 ,Customer Acquisition and Loyalty,Viðskiptavinur Kaup og Hollusta
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse þar sem þú ert að halda úttekt hafnað atriðum
 DocType: Production Order,Skip Material Transfer,Hoppa yfir efni
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Ekki er hægt að finna gengi fyrir {0} til {1} fyrir lykilatriði {2}. Vinsamlegast búðu til gjaldeyrisviðskipti handvirkt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Fjárhagsár lýkur á
 DocType: POS Profile,Price List,Verðskrá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nú sjálfgefið Fiscal Year. Vinsamlegast hressa vafrann til að breytingin taki gildi.
@@ -1978,19 +1981,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Reikningur {0} er ógild. Reikningur Gjaldmiðill verður að vera {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM viðskipta þáttur er krafist í röð {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Sales Order, Sales Invoice eða Journal Entry"
 DocType: Salary Component,Deduction,frádráttur
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Frá Time og til tími er nauðsynlegur.
 DocType: Stock Reconciliation Item,Amount Difference,upphæð Mismunur
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Atriði Verð bætt fyrir {0} í verðskrá {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vinsamlegast sláðu Starfsmaður Id þessarar velta manneskja
 DocType: Territory,Classification of Customers by region,Flokkun viðskiptavina eftir svæðum
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Munurinn Upphæð verður að vera núll
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Munurinn Upphæð verður að vera núll
 DocType: Project,Gross Margin,Heildarframlegð
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Vinsamlegast sláðu Production Item fyrst
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Útreiknuð Bank Yfirlýsing jafnvægi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,fatlaður notandi
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Tilvitnun
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Tilvitnun
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Samtals Frádráttur
 ,Production Analytics,framleiðslu Analytics
@@ -1999,9 +2002,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Liður {0} hefur þegar verið skilað
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Year ** táknar fjárhagsári. Öll bókhald færslur og aðrar helstu viðskipti eru raktar gegn ** Fiscal Year **.
 DocType: Opportunity,Customer / Lead Address,Viðskiptavinur / Lead Address
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Viðvörun: Ógild SSL vottorð á viðhengi {0}
 DocType: Student Admission,Eligibility,hæfi
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leiðir hjálpa þér að fá fyrirtæki, bæta alla tengiliði þína og fleiri sem leiðir þínar"
 DocType: Production Order Operation,Actual Operation Time,Raunveruleg Operation Time
 DocType: Authorization Rule,Applicable To (User),Gildir til (User)
 DocType: Purchase Taxes and Charges,Deduct,draga
@@ -2016,7 +2019,7 @@
 DocType: Guardian,Work Address,vinna Address
 DocType: Appraisal,Calculate Total Score,Reikna aðaleinkunn
 DocType: Request for Quotation,Manufacturing Manager,framleiðsla Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial Nei {0} er undir ábyrgð uppí {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nei {0} er undir ábyrgð uppí {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Afhending Note í pakka.
 apps/erpnext/erpnext/hooks.py +87,Shipments,sendingar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Reikningsjafnvægi ({0}) fyrir {1} og verðmæti lager ({2}) fyrir vöruhús {3} verður að vera sama
@@ -2037,10 +2040,10 @@
 DocType: Leave Application,Total Leave Days,Samtals leyfisdaga
 DocType: Email Digest,Note: Email will not be sent to disabled users,Ath: Email verður ekki send til fatlaðra notenda
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Fjöldi samskipta
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Veldu Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Veldu Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Skildu eftir autt ef það er talið að öllum deildum
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tegundir ráðninga (varanleg, samningur, nemi o.fl.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er nauðsynlegur fyrir lið {1}
 DocType: Process Payroll,Fortnightly,hálfsmánaðarlega
 DocType: Currency Exchange,From Currency,frá Gjaldmiðill
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Vinsamlegast veldu úthlutað magn, tegundir innheimtuseðla og reikningsnúmerið í atleast einni röð"
@@ -2049,14 +2052,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Hlutfall (Company Gjaldmiðill)
 DocType: Student Guardian,Others,aðrir
 DocType: Payment Entry,Unallocated Amount,óráðstafað Upphæð
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Get ekki fundið samsvörun hlut. Vinsamlegast veldu einhverja aðra verðmæti fyrir {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Get ekki fundið samsvörun hlut. Vinsamlegast veldu einhverja aðra verðmæti fyrir {0}.
 DocType: POS Profile,Taxes and Charges,Skattar og gjöld
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A vöru eða þjónustu sem er keypt, selt eða haldið á lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ekki fleiri uppfærslur
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Get ekki valið gjald tegund sem &quot;On Fyrri Row Upphæð &#39;eða&#39; Á fyrri röðinni Samtals &#39;fyrir fyrstu röðinni
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barnið Item ætti ekki að vera Product Knippi. Fjarlægðu hlut `{0}` og vista
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,bæta við timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,bæta við timesheets
 DocType: Vehicle Service,Service Item,þjónusta Item
 DocType: Bank Guarantee,Bank Guarantee,Bankábyrgð
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39; til að fá áætlun
@@ -2080,6 +2083,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er þegar {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Velta Order til greiðslu
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vinsamlegast settu Nafngerðaröð fyrir {0} í gegnum Skipulag&gt; Stillingar&gt; Nöfnunarröð
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,forstjóri
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Krafa Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Vinsamlegast veldu réttan reikning
@@ -2104,14 +2108,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Verð verður ekki sýnd ef verðskrá er ekki sett
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vinsamlegast tilgreindu land fyrir þessa Shipping reglu eða stöðva Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Alls Komandi Value
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Skuldfærslu Til er krafist
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Skuldfærslu Til er krafist
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets að halda utan um tíma, kostnað og innheimtu fyrir athafnir gert með lið"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kaupverðið List
 DocType: Offer Letter Term,Offer Term,Tilboð Term
 DocType: Quality Inspection,Quality Manager,gæðastjóri
 DocType: Job Applicant,Job Opening,Atvinna Opnun
 DocType: Payment Reconciliation,Payment Reconciliation,greiðsla Sættir
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vinsamlegast veldu nafn incharge einstaklingsins
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vinsamlegast veldu nafn incharge einstaklingsins
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,tækni
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Samtals Ógreitt: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
@@ -2138,23 +2142,23 @@
 DocType: Opportunity,Lost Reason,Lost Ástæða
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ný Address
 DocType: Quality Inspection,Sample Size,Prufustærð
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vinsamlegast sláðu inn Kvittun Skjal
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Allir hlutir hafa nú þegar verið færðar á vörureikning
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Vinsamlegast tilgreinið gilt &quot;Frá máli nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Frekari stoðsviða er hægt að gera undir Hópar en færslur er hægt að gera á móti non-hópa
 DocType: Project,External,ytri
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Notendur og heimildir
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Framleiðslu Pantanir Búið til: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Farsímanúmer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Prentun og merkingu
 DocType: Bin,Actual Quantity,Raunveruleg Magn
 DocType: Shipping Rule,example: Next Day Shipping,dæmi: Næsti dagur Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Nei {0} fannst ekki
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Nei {0} fannst ekki
 DocType: Scheduling Tool,Student Batch,Student Hópur
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Viðskiptavinir þínir
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,gera Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,gera Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Þér hefur verið boðið að vinna að verkefninu: {0}
 DocType: Leave Block List Date,Block Date,Block Dagsetning
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Sæktu um núna
@@ -2177,8 +2181,9 @@
 DocType: SMS Log,Sent To,send til
 DocType: Payment Request,Make Sales Invoice,Gera sölureikning
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,hugbúnaður
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Næsta Hafa Date getur ekki verið í fortíðinni
 DocType: Company,For Reference Only.,Til viðmiðunar aðeins.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Veldu lotu nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ógild {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Magn
@@ -2192,7 +2197,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case Nei getur ekki verið 0
 DocType: Item,Show a slideshow at the top of the page,Sýnið skyggnusýningu efst á síðunni
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,verslanir
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,verslanir
 DocType: Serial No,Delivery Time,Afhendingartími
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Öldrun Byggt á
 DocType: Item,End of Life,End of Life
@@ -2204,12 +2209,12 @@
 DocType: Rename Tool,Rename Tool,endurnefna Tól
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Uppfæra Kostnaður
 DocType: Item Reorder,Item Reorder,Liður Uppröðun
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Sýna Laun Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Efni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Sýna Laun Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Transfer Efni
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Tilgreina rekstur, rekstrarkostnaði og gefa einstakt notkun eigi að rekstri þínum."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Þetta skjal er yfir mörkum með {0} {1} fyrir lið {4}. Ert þú að gera annað {3} gegn sama {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Veldu breyting upphæð reiknings
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Vinsamlegast settu endurtekin eftir vistun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Veldu breyting upphæð reiknings
 DocType: Purchase Invoice,Price List Currency,Verðskrá Gjaldmiðill
 DocType: Naming Series,User must always select,Notandi verður alltaf að velja
 DocType: Stock Settings,Allow Negative Stock,Leyfa Neikvæð lager
@@ -2220,7 +2225,7 @@
 DocType: Budget Account,Budget Account,Budget Account
 DocType: Quality Inspection,Verified By,staðfest af
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Get ekki breytt sjálfgefið mynt félagsins, vegna þess að það eru núverandi viðskiptum. Viðskipti verða að vera lokað til að breyta sjálfgefið mynt."
-DocType: Grade Interval,Grade Description,gráðu Lýsing
+DocType: Grading Scale Interval,Grade Description,gráðu Lýsing
 DocType: Stock Entry,Purchase Receipt No,Kvittun Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Búa Laun Slip
@@ -2258,7 +2263,7 @@
 DocType: Upload Attendance,Attendance To Date,Aðsókn að Dagsetning
 DocType: Warranty Claim,Raised By,hækkaðir um
 DocType: Payment Gateway Account,Payment Account,greiðsla Reikningur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Vinsamlegast tilgreinið Company til að halda áfram
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Net Breyta viðskiptakrafna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,jöfnunaraðgerðir Off
 DocType: Offer Letter,Accepted,Samþykkt
@@ -2267,12 +2272,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Vinsamlegast vertu viss um að þú viljir virkilega að eyða öllum viðskiptum fyrir þetta fyrirtæki. stofngÃ¶gn haldast eins og það er. Þessi aðgerð er ekki hægt að afturkalla.
 DocType: Room,Room Number,Room Number
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ógild vísun {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) getur ekki verið meiri en áætlað quanitity ({2}) í framleiðslu Order {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) getur ekki verið meiri en áætlað quanitity ({2}) í framleiðslu Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Sendingar Regla Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Hráefni má ekki vera auður.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Gat ekki uppfært lager, reikningsnúmer inniheldur falla skipum hlut."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Þú getur ekki breytt hlutfall ef BOM getið agianst hvaða atriði
 DocType: Employee,Previous Work Experience,Fyrri Starfsreynsla
 DocType: Stock Entry,For Quantity,fyrir Magn
@@ -2285,7 +2290,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Skilmálar og Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,The nafn af the Institute sem þú ert að setja upp þetta kerfi.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bókhald færsla fryst upp til þessa dagsetningu, enginn getur gert / breyta færslu, nema hlutverki sem tilgreindur er hér."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vistaðu skjalið áður kynslóð viðhald áætlun
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vistaðu skjalið áður kynslóð viðhald áætlun
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Hakaðu við þetta til að banna broti. (NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Eftirfarandi Framleiðslu Pantanir voru búnar:
@@ -2312,7 +2317,7 @@
 ,Employees working on a holiday,Starfsmenn sem vinna í frí
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Aðferð
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Viðhald Upphafsdagur getur ekki verið áður fæðingardag fyrir Raðnúmer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Viðhald Upphafsdagur getur ekki verið áður fæðingardag fyrir Raðnúmer {0}
 DocType: Production Order,Actual End Date,Raunveruleg Lokadagur
 DocType: BOM,Operating Cost (Company Currency),Rekstrarkostnaður (Company Gjaldmiðill)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2329,7 +2334,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Leyfi án launa passar ekki við viðurkenndar Leave Umsókn færslur
 DocType: Campaign,Campaign-.####,Herferð -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Næstu skref
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Gefðu tilgreind atriði í besta mögulega verð
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nálægt Tækifæri eftir 15 daga
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,árslok
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2366,7 +2371,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Magn
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Búið - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Flokkur Reikningur
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Geta ekki framleitt meira ítarefni {0} en Sales Order Magn {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Geta ekki framleitt meira ítarefni {0} en Sales Order Magn {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} er ekki lögð
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Cash Account
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Næsta Samband með getur ekki verið sama og Lead netfanginu
@@ -2388,7 +2393,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Úthreinsun Date ekki getið
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,framleiðsla
 DocType: Guardian,Occupation,Atvinna
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Byrja Bætt verður fyrir lokadagsetningu
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Alls (Magn)
 DocType: Sales Invoice,This Document,Þetta skjal
 DocType: Installation Note Item,Installed Qty,uppsett Magn
@@ -2404,14 +2410,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Tilkynna um vandamál
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,gagnsemi Útgjöld
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} hefur ekki reikning {2} eða þegar samsvarandi gegn öðrum skírteini
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} hefur ekki reikning {2} eða þegar samsvarandi gegn öðrum skírteini
 DocType: Buying Settings,Default Buying Price List,Sjálfgefið Buying Verðskrá
 DocType: Process Payroll,Salary Slip Based on Timesheet,Laun Slip Byggt á tímaskráningar
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Enginn starfsmaður fyrir ofan valin viðmiðunum eða laun miði nú þegar búið
 DocType: Notification Control,Sales Order Message,Velta Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Default gildi eins Company, Gjaldmiðill, yfirstandandi reikningsári, o.fl."
 DocType: Payment Entry,Payment Type,greiðsla Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vinsamlegast veldu lotu fyrir hlut {0}. Ekki er hægt að finna eina lotu sem uppfyllir þessa kröfu
 DocType: Process Payroll,Select Employees,Select Starfsmenn
 DocType: Opportunity,Potential Sales Deal,Hugsanleg sala Deal
 DocType: Payment Entry,Cheque/Reference Date,Ávísun / Frestdagur
@@ -2428,7 +2434,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} þegar búin að fyrirtæki {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Skipta Item / BOM í öllum BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittun skjal skal skilað
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittun skjal skal skilað
 DocType: Purchase Invoice Item,Received Qty,fékk Magn
 DocType: Stock Entry Detail,Serial No / Batch,Serial Nei / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ekki greidd og ekki skilað
@@ -2437,11 +2443,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Enginn tími blöð
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Skildu Tegund {0} Ekki er hægt að bera-send
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Viðhald Dagskrá er ekki mynda að öllum þeim atriðum. Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Viðhald Dagskrá er ekki mynda að öllum þeim atriðum. Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
 ,To Produce,Að framleiða
 apps/erpnext/erpnext/config/hr.py +93,Payroll,launaskrá
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Fyrir röð {0} í {1}. Til eru {2} í lið gengi, raðir {3} skal einnig"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,gera notanda
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,gera notanda
 DocType: Packing Slip,Identification of the package for the delivery (for print),Auðkenning pakka fyrir afhendingu (fyrir prentun)
 DocType: Bin,Reserved Quantity,frátekin Magn
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vinsamlegast sláðu inn gilt netfang
@@ -2453,15 +2459,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Óvirkt sniðmát má ekki vera sjálfgefið sniðmát
 DocType: Account,Income Account,tekjur Reikningur
 DocType: Payment Request,Amount in customer's currency,Upphæð í mynt viðskiptavinarins
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Afhending
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Afhending
 DocType: Stock Reconciliation Item,Current Qty,Núverandi Magn
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Sjá &quot;Rate Af efni byggt á&quot; í kosta lið
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Fyrri
 DocType: Appraisal Goal,Key Responsibility Area,Key Ábyrgð Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Námsmaður Lotur hjálpa þér að fylgjast með mætingu, mat og gjalda fyrir nemendur"
 DocType: Payment Entry,Total Allocated Amount,Samtals úthlutað magn
 DocType: Item Reorder,Material Request Type,Efni Beiðni Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry fyrir laun frá {0} til {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage er fullt, ekki spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage er fullt, ekki spara"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM viðskipta Factor er nauðsynlegur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,kostnaður Center
@@ -2471,16 +2478,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Fela Tax Auðkenni viðskiptavinar frá sölu viðskiptum
 DocType: Upload Attendance,Upload HTML,Hlaða HTML
 DocType: Employee,Relieving Date,létta Dagsetning
-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.","Verðlagning Regla er gert til að skrifa verðskrá / define afsláttur hlutfall, byggt á einhverjum forsendum."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Verðlagning Regla er gert til að skrifa verðskrá / define afsláttur hlutfall, byggt á einhverjum forsendum."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse er einungis hægt að breyta í gegnum Kauphöll Entry / Afhending Note / Kvittun
 DocType: Employee Education,Class / Percentage,Flokkur / Hlutfall
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Forstöðumaður markaðssetning og sala
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Tekjuskattur
-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.","Ef valið Verðlagning Regla er gert fyrir &#39;verð&#39;, mun það skrifa verðlista. Verðlagning Regla verð er endanlegt verð, þannig að engin frekari afsláttur ætti að vera beitt. Þess vegna, í viðskiptum eins Velta Order, Purchase Order etc, það verður sótt í &#39;gefa&#39; sviði, frekar en &#39;verðlista gefa&#39; sviði."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ef valið Verðlagning Regla er gert fyrir &#39;verð&#39;, mun það skrifa verðlista. Verðlagning Regla verð er endanlegt verð, þannig að engin frekari afsláttur ætti að vera beitt. Þess vegna, í viðskiptum eins Velta Order, Purchase Order etc, það verður sótt í &#39;gefa&#39; sviði, frekar en &#39;verðlista gefa&#39; sviði."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Vísbendingar um Industry tegund.
 DocType: Item Supplier,Item Supplier,Liður Birgir
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Vinsamlegast sláðu Item Code til að fá lotu nr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Vinsamlegast veldu gildi fyrir {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Öllum vistföngum.
 DocType: Company,Stock Settings,lager Stillingar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Samruni er aðeins mögulegt ef eftirfarandi eiginleikar eru sömu í báðum skrám. Er Group, Root Tegund, Company"
@@ -2490,6 +2497,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Mun senda tölvupóst um atburðinn til starfsmanna með stöðu &#39;Open&#39;
 DocType: Task,Depends on Tasks,Fer á Verkefni
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Stjórna Viðskiptavinur Group Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Viðhengi má sjá án þess að gera körfu kleift
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nýtt Kostnaður Center Name
 DocType: Leave Control Panel,Leave Control Panel,Skildu Control Panel
@@ -2502,11 +2510,10 @@
 DocType: Sales Invoice,Debit To,debet Til
 DocType: Delivery Note,Required only for sample item.,Aðeins nauðsynlegt fyrir sýnishorn hlut.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Raunveruleg Magn eftir viðskipti
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Birgir&gt; Birgir Tegund
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Engin laun miði fannst á milli {0} og {1}
 ,Pending SO Items For Purchase Request,Bíður SO Hlutir til kaupa Beiðni
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Innlagnir
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er óvirk
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er óvirk
 DocType: Supplier,Billing Currency,Innheimta Gjaldmiðill
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Auka stór
@@ -2523,9 +2530,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Heimasíðan Valin Vara
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Allir Námsmat Hópar
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nýtt Warehouse Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Alls {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Alls {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territory
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vinsamlegast nefna engin heimsókna krafist
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vinsamlegast nefna engin heimsókna krafist
 DocType: Stock Settings,Default Valuation Method,Sjálfgefið Verðmatsaðferð
 DocType: Vehicle Log,Fuel Qty,eldsneyti Magn
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
@@ -2541,7 +2548,7 @@
 DocType: Price List,Price List Master,Verðskrá Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Öll sala Viðskipti má tagged móti mörgum ** sölufólk ** þannig að þú getur sett og fylgjast markmið.
 ,S.O. No.,SO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Vinsamlegast búa til viðskiptavina frá Lead {0}
 DocType: Price List,Applicable for Countries,Gildir fyrir löndum
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Aðeins Skildu Umsóknir með stöðu &quot;Samþykkt&quot; og &quot;Hafnað &#39;er hægt að skila
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Name er skylda í röð {0}
@@ -2572,7 +2579,7 @@
 DocType: Project,Copied From,Afritað frá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nafn villa: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,skortur
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} er ekki tengd við {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} er ekki tengd við {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Mæting fyrir starfsmann {0} er þegar merkt
 DocType: Packing Slip,If more than one package of the same type (for print),Ef fleiri en einn pakka af sömu gerð (fyrir prentun)
 ,Salary Register,laun Register
@@ -2591,7 +2598,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Nota fyrir Shopping Cart
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Gildi {0} fyrir eigind {1} er ekki til á lista yfir gild lið eigindar í lið {2}
 DocType: BOM Item,Scrap %,rusl%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Gjöld verður dreift hlutfallslega miðað hlut Fjöldi eða magn, eins og á val þitt"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Gjöld verður dreift hlutfallslega miðað hlut Fjöldi eða magn, eins og á val þitt"
 DocType: Maintenance Visit,Purposes,tilgangi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Atleast eitt atriði skal færa með neikvæðum magni í staðinn skjal
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lengur en öllum tiltækum vinnutíma í vinnustöð {1}, brjóta niður rekstur í mörgum aðgerðum"
@@ -2612,16 +2619,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Stjórna Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,Reikningar
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Vinsamlegast veldu Virkja afsláttur á
 DocType: Company,Default Receivable Account,Sjálfgefið Krafa Reikningur
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Búa Bank færslu fyrir heildarlaunum greitt fyrir ofan valin forsendum
 DocType: Stock Entry,Material Transfer for Manufacture,Efni Transfer fyrir Framleiðsla
-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.,Afsláttur Hlutfall hægt að beita annaðhvort á móti verðskrá eða fyrir alla verðlista.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Afsláttur Hlutfall hægt að beita annaðhvort á móti verðskrá eða fyrir alla verðlista.
 DocType: Purchase Invoice,Half-yearly,Hálfsárs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Bókhalds Færsla fyrir Lager
 DocType: Vehicle Service,Engine Oil,Vélarolía
 DocType: Sales Invoice,Sales Team1,velta TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Liður {0} er ekki til
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Liður {0} er ekki til
 DocType: Sales Invoice,Customer Address,viðskiptavinur Address
 DocType: Employee Loan,Loan Details,lán Nánar
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Lokið Magn verður að vera hærri en núll.
@@ -2629,24 +2636,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Get ekki skila meira en {1} fyrir lið {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Söguþráður
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Söguþráður
 DocType: Item Group,Show this slideshow at the top of the page,Sýna þessa myndasýningu efst á síðunni
 DocType: BOM,Item UOM,Liður UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Skatthlutfall Eftir Afsláttur Upphæð (Company Gjaldmiðill)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Target vöruhús er nauðsynlegur fyrir röð {0}
 DocType: Cheque Print Template,Primary Settings,Primary Stillingar
 DocType: Purchase Invoice,Select Supplier Address,Veldu Birgir Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Bæta Starfsmenn
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Bæta Starfsmenn
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theory
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Viðvörun: Efni Umbeðin Magn er minna en Minimum Order Magn
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Reikningur {0} er frosinn
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Lögaðili / Dótturfélag með sérstakri Mynd af reikninga tilheyra stofnuninni.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Matur, drykkir og Tobacco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Getur aðeins gera greiðslu gegn ógreitt {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,hlutfall Framkvæmdastjórnin getur ekki verið meiri en 100
 DocType: Stock Entry,Subcontract,undirverktaka
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vinsamlegast sláðu inn {0} fyrst
@@ -2685,7 +2692,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Vöruhús með núverandi viðskipti er ekki hægt að breyta í hópinn.
 DocType: Assessment Result Tool,Result HTML,niðurstaða HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,rennur út
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Bæta Nemendur
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Bæta Nemendur
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vinsamlegast veldu {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2734,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sláðu inn heiti herferðarinnar ef uppspretta rannsókn er herferð
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,dagblað Publishers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Veldu Fiscal Year
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Veldu Fiscal Year
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Uppröðun Level
 DocType: Company,Chart Of Accounts Template,Mynd af reikningum sniðmáti
 DocType: Attendance,Attendance Date,Aðsókn Dagsetning
@@ -2742,14 +2749,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,afrit færslu
 DocType: Program Enrollment Tool,Get Students,fá Nemendur
 DocType: Serial No,Under Warranty,undir ábyrgð
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Villa]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Villa]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Í orðum verður sýnileg þegar þú hefur vistað Velta Order.
 ,Employee Birthday,starfsmaður Afmæli
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Hópur Aðsókn Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An fræðihugtak með þessu &quot;skólaárinu &#39;{0} og&#39; Term Name &#39;{1} er þegar til. Vinsamlegast breyttu þessum færslum og reyndu aftur.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Eins og það eru núverandi reiðufé gegn færslu {0} er ekki hægt að breyta gildi {1}
 DocType: UOM,Must be Whole Number,Verður að vera heil tala
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Ný Leaves Úthlutað (í dögum)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Nei {0} er ekki til
@@ -2769,7 +2776,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Af efnum rukkaður gegn þessu Sales Order
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Tímabil Lokar Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnaður Center við núverandi viðskipti er ekki hægt að breyta í hópinn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Upphæð {0} {1} {2} {3}
 DocType: Account,Depreciation,gengislækkun
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Birgir (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Starfsmaður Aðsókn Tool
@@ -2792,7 +2799,7 @@
 DocType: Supplier,Last Day of the Next Month,Last Day næsta mánaðar
 DocType: Support Settings,Auto close Issue after 7 days,Auto nálægt Issue eftir 7 daga
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leyfi ekki hægt að skipta áður en {0}, sem orlof jafnvægi hefur þegar verið fært sendar í framtíðinni leyfi úthlutun met {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Ath: Vegna / Frestdagur umfram leyfð viðskiptavina kredit dagar eftir {0} dag (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Umsækjandi
 DocType: Asset Category Account,Accumulated Depreciation Account,Uppsöfnuðum afskriftum Reikningur
 DocType: Stock Settings,Freeze Stock Entries,Frysta lager Entries
@@ -2803,7 +2810,7 @@
 ,Stock Analytics,lager Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Aðgerðir geta ekki vera autt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Gegn Document Detail No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Type er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party Type er nauðsynlegur
 DocType: Quality Inspection,Outgoing,Outgoing
 DocType: Material Request,Requested For,Umbeðin Fyrir
 DocType: Quotation Item,Against Doctype,Against DOCTYPE
@@ -2820,10 +2827,10 @@
 DocType: Asset,Item Code,Item Code
 DocType: Production Planning Tool,Create Production Orders,Búa Framleiðandi Pantanir
 DocType: Serial No,Warranty / AMC Details,Ábyrgð í / AMC Nánar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Veldu nemendur handvirkt fyrir hópinn sem byggir á starfsemi
 DocType: Journal Entry,User Remark,Notandi Athugasemd
 DocType: Lead,Market Segment,Market Segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Greiddur Upphæð má ekki vera meiri en heildar neikvæð útistandandi {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Starfsmaður Innri Vinna Saga
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lokun (Dr)
 DocType: Cheque Print Template,Cheque Size,ávísun Size
@@ -2838,7 +2845,7 @@
 DocType: Production Planning Tool,Create Material Requests,Búa Efni beiðnum
 DocType: Employee Education,School/University,Skóli / University
 DocType: Payment Request,Reference Details,Tilvísun Upplýsingar
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Væntanlegur Value Eftir nýtingartíma verður að vera minna en Gross kaupverði
 DocType: Sales Invoice Item,Available Qty at Warehouse,Laus Magn á Lager
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,billed Upphæð
 DocType: Asset,Double Declining Balance,Tvöfaldur Minnkandi Balance
@@ -2859,20 +2866,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Munurinn Reikningur verður að vera Eigna- / Ábyrgðartegund reikningur, þar sem þetta Stock Sáttargjörð er Opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Andvirði lánsins getur ekki verið hærri en Lánsupphæðir {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Innkaupapöntunarnúmeri þarf fyrir lið {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Framleiðsla Order ekki búin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Framleiðsla Order ekki búin
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Frá Dagsetning &#39;verður að vera eftir&#39; Til Dagsetning &#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Get ekki breytt stöðu sem nemandi {0} er tengd við beitingu nemandi {1}
 DocType: Asset,Fully Depreciated,Alveg afskrifaðar
 ,Stock Projected Qty,Stock Áætlaðar Magn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Viðskiptavinur {0} ekki tilheyra verkefninu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Aðsókn HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Tilvitnanir eru tillögur tilboðum þú sendir til viðskiptavina þinna
 DocType: Sales Order,Customer's Purchase Order,Viðskiptavinar Purchase Order
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial Nei og Batch
 DocType: Warranty Claim,From Company,frá Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa skora á mat Criteria þarf að vera {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Gildi eða Magn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vinsamlegast settu Fjöldi Afskriftir Bókað
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Gildi eða Magn
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Pantanir geta ekki hækkað um:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Purchase skatta og gjöld
@@ -2884,7 +2891,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Allir Vöruhús
 DocType: Sales Partner,Retailer,Smásali
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Inneign á reikninginn verður að vera Efnahagur reikning
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Allar Birgir ferðalaga
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Allar Birgir ferðalaga
 DocType: Global Defaults,Disable In Words,Slökkva á í orðum
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Item Code er nauðsynlegur vegna þess að hluturinn er ekki sjálfkrafa taldir
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Tilvitnun {0} ekki af tegund {1}
@@ -2893,6 +2900,7 @@
 DocType: Production Order,PRO-,PRO
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Heimildarlás Account
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gera Laun Slip
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Úthlutað Magn má ekki vera hærra en útistandandi upphæð.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Fletta BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Veðlán
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Staða Dagsetning og tími
@@ -2932,7 +2940,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ekki leyft að uppfæra lager viðskipti eldri en {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Alveg Billed
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Vinsamlegast stillt sjálfgefna ber að greiða reikning á starfsmann {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Handbært fé
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Afhending vöruhús krafist fyrir hlutabréfum lið {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Framlegð þyngd pakkans. Venjulega nettóþyngd + umbúðir þyngd. (Til prentunar)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,Hópur byggt á
 DocType: Journal Entry,Bill Date,Bill Dagsetning
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Þjónusta Item, Tegund, tíðni og kostnað upphæð er krafist"
-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:","Jafnvel ef það eru margar Verðlagning Reglur með hæsta forgang, eru þá eftirfarandi innri forgangsmál beitt:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Jafnvel ef það eru margar Verðlagning Reglur með hæsta forgang, eru þá eftirfarandi innri forgangsmál beitt:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Viltu virkilega að leggja fram öll Laun miði frá {0} til {1}
 DocType: Cheque Print Template,Cheque Height,ávísun Hæð
 DocType: Supplier,Supplier Details,birgir Upplýsingar
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,Invoice Ref
 DocType: Purchase Order,Recurring Order,Fastir Order
 DocType: Company,Default Income Account,Sjálfgefið Tekjur Reikningur
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Viðskiptavinur Group / viðskiptavina
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Viðskiptavinur Group / viðskiptavina
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscal Years Hagnaður / Tap (Credit)
 DocType: Sales Invoice,Time Sheets,Tími Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Default Greiðsla Beiðni skilaboð
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,Tilvitnun Message
 DocType: Employee Loan,Employee Loan Application,Starfsmaður lánsumsókn
 DocType: Issue,Opening Date,opnun Date
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Aðsókn hefur verið merkt með góðum árangri.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Aðsókn hefur verið merkt með góðum árangri.
 DocType: Journal Entry,Remark,athugasemd
 DocType: Purchase Receipt Item,Rate and Amount,Hlutfall og Magn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Reikningur Type fyrir {0} verður að vera {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Reikningur Type fyrir {0} verður að vera {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blöð og Holiday
 DocType: School Settings,Current Academic Term,Núverandi námsbraut
 DocType: Sales Order,Not Billed,ekki borgað
@@ -2999,7 +3006,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student Group
 DocType: Shopping Cart Settings,Quotation Series,Tilvitnun Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Atriði til staðar með sama nafni ({0}) skaltu breyta liður heiti hópsins eða endurnefna hlutinn
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vinsamlegast veldu viðskiptavin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Vinsamlegast veldu viðskiptavin
 DocType: C-Form,I,ég
 DocType: Company,Asset Depreciation Cost Center,Eignastýring Afskriftir Kostnaður Center
 DocType: Sales Order Item,Sales Order Date,Velta Order Dagsetning
@@ -3018,20 +3025,20 @@
 DocType: Vehicle,Insurance Details,Tryggingar Upplýsingar
 DocType: Account,Payable,greiðist
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vinsamlegast sláðu inn lánstíma
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skuldarar ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skuldarar ({0})
 DocType: Pricing Rule,Margin,spássía
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ný Viðskiptavinir
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Framlegð%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,úthreinsun Dagsetning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Purchase Upphæð er nauðsynlegur
 DocType: Lead,Address Desc,Heimilisfang karbósýklískan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er nauðsynlegur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party er nauðsynlegur
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast einn af selja eða kaupa verður að vera valinn
-DocType: Grading Structure,Grade Intervals,gráðu Hlé
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Veldu eðli rekstrar þíns.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Afrita færslu í tilvísunum {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvar framleiðslu aðgerðir eru gerðar.
 DocType: Asset Movement,Source Warehouse,Source Warehouse
 DocType: Installation Note,Installation Date,uppsetning Dagsetning
@@ -3068,7 +3075,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Bréf Heads fyrir prenta sniðmát.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar til prenta sniðmát td Próformareikningur.
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Verðmat gerð gjöld geta ekki merkt sem Inclusive
 DocType: POS Profile,Update Stock,Uppfæra Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Mismunandi UOM að atriðum mun leiða til rangrar (alls) nettóþyngd gildi. Gakktu úr skugga um að nettóþyngd hvern hlut er í sama UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3095,7 +3102,7 @@
 DocType: Company,Exchange Gain / Loss Account,Gengishagnaður / Rekstrarreikningur
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Starfsmaður og Mæting
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Tilgangurinn verður að vera einn af {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Fylltu út formið og vista hana
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Fylltu út formið og vista hana
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,Sæktu skýrslu sem inniheldur allar hráefni með nýjustu birgða stöðu þeirra
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forum Community
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Raunverulegur fjöldi á lager
@@ -3110,7 +3117,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Uppröðun Magn
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Núverandi Op Atvinna
 DocType: Company,Stock Adjustment Account,Stock jöfnunarreikning
-DocType: Journal Entry,Write Off,Afskrifa
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afskrifa
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (ur) ID. Ef sett, mun það verða sjálfgefið fyrir allar HR eyðublöð."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Frá {1}
@@ -3121,26 +3128,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Birgir skilar til viðskiptavinar
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) er út af lager
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Næsta Dagsetning verður að vera hærri en að senda Dagsetning
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Sýna skattur brjóta upp
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Sýna skattur brjóta upp
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vegna / Reference Dagsetning má ekki vera á eftir {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gögn Innflutningur og útflutningur
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Lager færslur eru á móti Warehouse {0}, þess vegna getur þú ekki farið aftur framselja eða breyta henni"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Engar nemendur Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Engar nemendur Found
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Reikningar Staða Date
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,selja
 DocType: Sales Invoice,Rounded Total,Ávalur Total
 DocType: Product Bundle,List items that form the package.,Listaatriði sem mynda pakka.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Hlutfall Úthlutun skal vera jafnt og 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Vinsamlegast veldu dagsetningu birtingar áður en þú velur Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Út af AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vinsamlegast veldu Tilvitnanir
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Gera Viðhald Heimsókn
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vinsamlegast veldu Tilvitnanir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Fjöldi Afskriftir bókað getur ekki verið meiri en heildarfjöldi Afskriftir
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gera Viðhald Heimsókn
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vinsamlegast hafðu samband við til notanda sem hefur sala Master Manager {0} hlutverki
 DocType: Company,Default Cash Account,Sjálfgefið Cash Reikningur
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ekki viðskiptamenn eða birgja) skipstjóri.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Þetta er byggt á mætingu þessa Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Engar nemendur í
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Bæta við fleiri atriði eða opnu fulla mynd
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vinsamlegast sláðu inn &#39;áætlaðan fæðingardag&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Afhending Skýringar {0} verður lokað áður en hætta þessu Velta Order
@@ -3172,6 +3180,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Liður 3
 DocType: Purchase Order,Customer Contact Email,Viðskiptavinur samband við Tölvupóstur
 DocType: Warranty Claim,Item and Warranty Details,Item og Ábyrgð Details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Vörunúmer&gt; Liðurhópur&gt; Vörumerki
 DocType: Sales Team,Contribution (%),Framlag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Ath: Greiðsla Entry verður ekki búið síðan &#39;Cash eða Bank Account &quot;var ekki tilgreint
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Veldu forritið til að sækja nauðsynleg námskeið.
@@ -3186,9 +3195,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,áður sátta
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skattar og gjöld bætt (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Liður Tax Row {0} verður að hafa hliðsjón af tegund skatta eða tekjur eða gjöld eða Skuldfæranlegar
 DocType: Sales Order,Partly Billed,hluta Billed
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Liður {0} verður að vera fast eign Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Liður {0} verður að vera fast eign Item
 DocType: Item,Default BOM,Sjálfgefið BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Vinsamlega munið gerð nafn fyrirtækis til að staðfesta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Alls Framúrskarandi Amt
@@ -3198,8 +3207,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Tryggingafélag
 DocType: Asset Category Account,Fixed Asset Account,Fast Asset Reikningur
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Frá Delivery Note
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Frá Delivery Note
 DocType: Student,Student Email Address,Student Netfang
 DocType: Timesheet Detail,From Time,frá Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Á lager:
@@ -3210,12 +3219,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Verðskrá Exchange Rate
 DocType: Purchase Invoice Item,Rate,Gefa
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,netfang Nafn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,netfang Nafn
 DocType: Stock Entry,From BOM,frá BOM
 DocType: Assessment Code,Assessment Code,mat Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Basic
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lager viðskipti fyrir {0} eru frystar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Vinsamlegast smelltu á &#39;Búa Stundaskrá&#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","td Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Tilvísunarnúmer er nauðsynlegt ef þú færð viðmiðunardagur
 DocType: Bank Reconciliation Detail,Payment Document,greiðsla Document
@@ -3223,19 +3232,19 @@
 DocType: Salary Slip,Salary Structure,laun Uppbygging
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Issue Efni
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Issue Efni
 DocType: Material Request Item,For Warehouse,fyrir Warehouse
 DocType: Employee,Offer Date,Tilboð Dagsetning
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Tilvitnun
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Þú ert í offline háttur. Þú munt ekki vera fær um að endurhlaða fyrr en þú hefur net.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Engar Student Groups búin.
 DocType: Purchase Invoice Item,Serial No,Raðnúmer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mánaðarlega endurgreiðslu Upphæð má ekki vera meiri en lánsfjárhæð
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Vinsamlegast sláðu Maintaince Nánar fyrst
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Vinsamlegast sláðu Maintaince Nánar fyrst
 DocType: Purchase Invoice,Print Language,Print Tungumál
 DocType: Salary Slip,Total Working Hours,Samtals Vinnutíminn
 DocType: Stock Entry,Including items for sub assemblies,Þ.mt atriði fyrir undir þingum
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Sláðu gildi verður að vera jákvæð
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Sláðu gildi verður að vera jákvæð
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Allir Territories
 DocType: Purchase Invoice,Items,atriði
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Nemandi er nú skráður.
@@ -3254,16 +3263,14 @@
 DocType: Issue,Opening Time,opnun Time
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Frá og Til dagsetningar krafist
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Verðbréf &amp; hrávöru ungmennaskipti
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default Mælieiningin fyrir Variant &#39;{0}&#39; verða að vera sama og í sniðmáti &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Reikna miðað við
 DocType: Delivery Note Item,From Warehouse,frá Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Engar Verk með Bill of Materials að Manufacture
 DocType: Assessment Plan,Supervisor Name,Umsjón Name
 DocType: Program Enrollment Course,Program Enrollment Course,Forritunarnámskeið
-DocType: Grading Structure,Grading Structure,flokkun Uppbygging
 DocType: Purchase Taxes and Charges,Valuation and Total,Verðmat og Total
 DocType: Tax Rule,Shipping City,Sendingar City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Þetta atriði er afbrigði af {0} (Snið). Eiginleika að afrita yfir frá sniðmáti nema &quot;Enginn Afrita&quot; er sett
 DocType: Notification Control,Customize the Notification,Sérsníða tilkynningu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Handbært fé frá rekstri
 DocType: Sales Invoice,Shipping Rule,Sendingar Regla
@@ -3284,8 +3291,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Barnið er til fyrir þennan reikning. Þú getur ekki eytt þessum reikningi.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Annaðhvort miða Magn eða miða upphæð er nauðsynlegur
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Ekkert sjálfgefið BOM er til fyrir lið {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Opnun Date ætti að vera áður lokadegi
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Vinsamlegast veldu dagsetningu birtingar fyrst
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Opnun Date ætti að vera áður lokadegi
 DocType: Leave Control Panel,Carry Forward,Haltu áfram
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnaður Center við núverandi viðskipti er ekki hægt að breyta í höfuðbók
 DocType: Department,Days for which Holidays are blocked for this department.,Dagar sem Frídagar eru læst í þessari deild.
@@ -3297,7 +3304,7 @@
 DocType: Mode of Payment,General,almennt
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,hengja bréfshaus
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Síðasta samskipti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Verðmat og heildar&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Verðmat og heildar&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Listi skatt höfuð (td VSK, toll etc, þeir ættu að hafa einstaka nöfn) og staðlaðar verð þeirra. Þetta mun búa til staðlaða sniðmát sem þú getur breytt og bætt meira seinna."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos Áskilið fyrir serialized lið {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Passa Greiðslur með Reikningar
@@ -3313,7 +3320,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Alls (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Skemmtun &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Liður Serial Nei
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Búa Employee Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Búa Employee Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,alls Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,bókhald Yfirlýsingar
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,klukkustund
@@ -3326,9 +3333,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,óþekkt
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping regla Skilyrði
 DocType: BOM Replace Tool,The new BOM after replacement,Hin nýja BOM eftir skipti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Sölustaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Sölustaður
 DocType: Payment Entry,Received Amount,fékk Upphæð
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vinsamlega settu upp starfsmannamiðlunarkerfi í mannauði&gt; HR-stillingar
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Búa til fullt magn, hunsa magn þegar á röð"
 DocType: Account,Tax,Tax
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ekki Marked
@@ -3339,9 +3345,9 @@
 DocType: C-Form,Invoices,reikningar
 DocType: Batch,Source Document Name,Heimild skjal Nafn
 DocType: Job Opening,Job Title,Starfsheiti
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Búa notendur
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Búa notendur
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Magn á Framleiðsla verður að vera hærri en 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Heimsókn skýrslu fyrir símtal viðhald.
 DocType: Stock Entry,Update Rate and Availability,Update Rate og Framboð
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Hlutfall sem þú ert leyft að taka á móti eða afhenda fleiri gegn pantað magn. Til dæmis: Ef þú hefur pantað 100 einingar. og barnabætur er 10% þá er leyft að taka á móti 110 einingar.
@@ -3350,28 +3356,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kostnað reikningur er nauðsynlegur fyrir lið {0}
 DocType: BOM,Website Description,Vefsíða Lýsing
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Net breyting á eigin fé
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vinsamlegast hætta kaupa Reikningar {0} fyrst
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Netfang verður að vera einstakt, þegar til fyrir {0}"
 DocType: Serial No,AMC Expiry Date,AMC Fyrningardagsetning
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kvittun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,kvittun
 ,Sales Register,velta Nýskráning
 DocType: Daily Work Summary Settings Company,Send Emails At,Senda póst At
 DocType: Quotation,Quotation Lost Reason,Tilvitnun Lost Ástæða
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Veldu lénið þitt
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Tilvísunarnúmer viðskipta engin {0} dagsett {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Það er ekkert að breyta.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Samantekt fyrir þennan mánuð og bið starfsemi
 DocType: Customer Group,Customer Group Name,Viðskiptavinar Group Name
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Engar viðskiptavinir ennþá!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Sjóðstreymi
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lánið upphæð mega vera Hámarkslán af {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,License
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Vinsamlegast fjarlægðu þennan reikning {0} úr C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Vinsamlegast veldu Yfirfæranlegt ef þú vilt líka að fela jafnvægi fyrra reikningsári er fer að þessu fjárhagsári
 DocType: GL Entry,Against Voucher Type,Against Voucher Tegund
 DocType: Item,Attributes,Eigindir
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Vinsamlegast sláðu afskrifa reikning
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Síðasta Röð Dagsetning
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Reikningur {0} er ekki tilheyrir fyrirtækinu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Raðnúmer í röð {0} samsvarar ekki við Afhendingartilkynningu
 DocType: Student,Guardian Details,Guardian Upplýsingar
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Mæting fyrir margar starfsmenn
@@ -3396,20 +3404,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Reikningur verður að vera af gerðinni &#39;Fast Asset&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,út Magn
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reglur til að reikna sendingarkostnað upphæð fyrir sölu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series er nauðsynlegur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series er nauðsynlegur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tegundir starfsemi fyrir Time Logs
 DocType: Tax Rule,Sales,velta
 DocType: Stock Entry Detail,Basic Amount,grunnfjárhæð
 DocType: Training Event,Exam,Exam
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse krafist fyrir hlutabréfum lið {0}
 DocType: Leave Allocation,Unused leaves,ónotuð leyfi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,cr
 DocType: Tax Rule,Billing State,Innheimta State
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} er ekki tengt við Party reikninginn {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} er ekki tengt við Party reikninginn {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Ná sprakk BOM (þ.mt undireiningar)
 DocType: Authorization Rule,Applicable To (Employee),Gildir til (starfsmaður)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Skiladagur er nauðsynlegur
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Vöxtur fyrir eigind {0} er ekki verið 0
@@ -3420,13 +3428,13 @@
 ,Inactive Customers,óvirka viðskiptamenn
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Purchase Kvittanir
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvernig Verðlagning Regla er beitt?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvernig Verðlagning Regla er beitt?
 DocType: Stock Entry,Delivery Note No,Afhending Note Nei
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",Ef hakað aðeins kaupa efni beiðnir um endanlegar hráefni verður með í efninu beiðnir. Annars Efni Beiðni um atriði foreldri verður búin
 DocType: Cheque Print Template,Message to show,Skilaboð til að sýna
 DocType: Company,Retail,Smásala
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,vara Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,vara Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Ógild vísun {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Purchase skatta og gjöld sniðmáti
 DocType: Upload Attendance,Download Template,Sækja Snið
@@ -3436,10 +3444,10 @@
 DocType: Payment Entry,Account Paid From,Reikningur greitt frá
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Skrifaðu Off byggt á
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,gera Blý
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,gera Blý
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Prenta og Ritföng
 DocType: Stock Settings,Show Barcode Field,Sýna Strikamerki Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Senda Birgir póst
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Senda Birgir póst
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Laun þegar unnin fyrir tímabilið milli {0} og {1}, Skildu umsókn tímabil getur ekki verið á milli þessu tímabili."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Uppsetning met fyrir Raðnúmer
 DocType: Guardian Interest,Guardian Interest,Guardian Vextir
@@ -3451,6 +3459,7 @@
 DocType: Offer Letter,Awaiting Response,bíður svars
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,hér að framan
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ógild eiginleiki {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Tilgreindu ef ekki staðlað greiðslureikningur
 DocType: Salary Slip,Earning & Deduction,Launin &amp; Frádráttur
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valfrjálst. Þessi stilling verður notuð til að sía í ýmsum viðskiptum.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Neikvætt Verðmat Rate er ekki leyfð
@@ -3466,10 +3475,9 @@
 DocType: Production Order Item,Production Order Item,Framleiðsla Order Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ekkert fannst
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kostnaður við rifið Eignastýring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,hluta ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnaður Center er nauðsynlegur fyrir lið {2}
 DocType: Vehicle,Policy No,stefna Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Fá atriði úr Vara Knippi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Fá atriði úr Vara Knippi
 DocType: Asset,Straight Line,Bein lína
 DocType: Project User,Project User,Project User
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Skipta
@@ -3484,7 +3492,7 @@
 DocType: Program Enrollment Tool,Get Students From,Fá nemendur frá
 DocType: Hub Settings,Seller Country,Seljandi Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Birta Atriði á vefsvæðinu
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Hópur nemenda þín í lotur
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Hópur nemenda þín í lotur
 DocType: Authorization Rule,Authorization Rule,Heimildin Regla
 DocType: Sales Invoice,Terms and Conditions Details,Skilmálar og skilyrði Nánar
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,upplýsingar
@@ -3536,14 +3544,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ávísun Dagsetning
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Reikningur {0}: Foreldri reikningur {1} ekki tilheyra fyrirtæki: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Umsækjendur
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Eytt öll viðskipti sem tengjast þessu fyrirtæki!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Eytt öll viðskipti sem tengjast þessu fyrirtæki!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Eins á degi
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,innritun Dagsetning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,reynslulausn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,laun Hluti
 DocType: Program Enrollment Tool,New Academic Year,Nýtt skólaár
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Auto innskotið Verðlisti hlutfall ef vantar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Samtals greitt upphæð
 DocType: Production Order Item,Transferred Qty,flutt Magn
@@ -3563,7 +3571,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Gerð af laufum eins frjálslegur, veikur osfrv"
 DocType: Email Digest,Send regular summary reports via Email.,Senda reglulegar skýrslur yfirlit með tölvupósti.
 DocType: Payment Entry,PE-,hagvexti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Vinsamlegast settu sjálfgefin reikningur í kostnað kröfutegund {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Vinsamlegast settu sjálfgefin reikningur í kostnað kröfutegund {0}
 DocType: Assessment Result,Student Name,Student Name
 DocType: Brand,Item Manager,Item Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,launaskrá Greiðist
@@ -3584,6 +3592,7 @@
 ,Sales Funnel,velta trekt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skammstöfun er nauðsynlegur
 DocType: Project,Task Progress,verkefni Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Körfu
 ,Qty to Transfer,Magn á að flytja
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes að leiðir eða viðskiptavini.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Hlutverk Leyft að breyta fryst lager
@@ -3611,12 +3620,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Liður Wise Tax Nánar
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute Skammstöfun
 ,Item-wise Price List Rate,Item-vitur Verðskrá Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,birgir Tilvitnun
 DocType: Quotation,In Words will be visible once you save the Quotation.,Í orðum verður sýnileg þegar þú hefur vistað tilvitnun.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Magn ({0}) getur ekki verið brot í röð {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,innheimta gjald
 DocType: Attendance,ATT-,viðhorfin
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Strikamerki {0} nú þegar notuð í lið {1}
 DocType: Lead,Add to calendar on this date,Bæta við dagatal á þessum degi
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Reglur til að bæta sendingarkostnað.
 DocType: Item,Opening Stock,opnun Stock
@@ -3633,8 +3642,8 @@
 Updated via 'Time Log'",Fundargerðir Uppfært gegnum &#39;Time Innskráning &quot;
 DocType: Customer,From Lead,frá Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pantanir út fyrir framleiðslu.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Veldu fjárhagsársins ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Veldu fjárhagsársins ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile þarf að gera POS Entry
 DocType: Program Enrollment Tool,Enroll Students,innritast Nemendur
 DocType: Hub Settings,Name Token,heiti Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selja
@@ -3645,7 +3654,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} gegn sölureikningi {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,nafn verkefnis
-DocType: Supplier,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
+DocType: Customer,Mention if non-standard receivable account,Umtal ef non-staðall nái reikning
 DocType: Journal Entry Account,If Income or Expense,Ef tekjur eða gjöld
 DocType: Production Order,Required Items,Nauðsynleg Items
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Mismunur
@@ -3666,7 +3675,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Setja markmið Item Group-vitur fyrir þetta velta manneskja.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Frysta Stocks eldri en [Days]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er nauðsynlegur fyrir fast eign kaup / sölu
-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.","Ef tveir eða fleiri Verðlagning Reglur finnast miðað við ofangreindar aðstæður, Forgangur er beitt. Forgangur er fjöldi milli 0 til 20 en Sjálfgefið gildi er núll (auður). Hærri tala þýðir að það mun hafa forgang ef það eru margar Verðlagning Reglur með sömu skilyrðum."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ef tveir eða fleiri Verðlagning Reglur finnast miðað við ofangreindar aðstæður, Forgangur er beitt. Forgangur er fjöldi milli 0 til 20 en Sjálfgefið gildi er núll (auður). Hærri tala þýðir að það mun hafa forgang ef það eru margar Verðlagning Reglur með sömu skilyrðum."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} er ekki til
 DocType: Currency Exchange,To Currency,til Gjaldmiðill
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Leyfa eftirfarandi notendum að samþykkja yfirgefa Umsóknir um blokk daga.
@@ -3691,7 +3700,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Liður {0} hunsuð þar sem það er ekki birgðir atriði
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Senda þessari framleiðslu Raða til frekari vinnslu.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Að ekki um Verðlagning reglunni í tilteknu viðskiptum, öll viðeigandi Verðlagning Reglur ætti að vera óvirk."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Að ekki um Verðlagning reglunni í tilteknu viðskiptum, öll viðeigandi Verðlagning Reglur ætti að vera óvirk."
 DocType: Assessment Group,Parent Assessment Group,Parent Mat Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Störf
 ,Sales Order Trends,Velta Order Trends
@@ -3702,7 +3711,7 @@
 DocType: Stock Entry Detail,Additional Cost,aukakostnaðar
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Fjárhagsár Lokadagur
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Getur ekki síað byggð á skírteini nr ef flokkaðar eftir skírteini
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Gera Birgir Tilvitnun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Gera Birgir Tilvitnun
 DocType: Quality Inspection,Incoming,Komandi
 DocType: BOM,Materials Required (Exploded),Efni sem þarf (Sprakk)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Bæta við notendum til fyrirtækisins, annarra en sjálfur"
@@ -3730,6 +3739,7 @@
 DocType: Employee,History In Company,Saga In Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Fréttabréf
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Viðskiptavinur&gt; Viðskiptavinahópur&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Sama atriði hefur verið gert mörgum sinnum
 DocType: Department,Leave Block List,Skildu Block List
 DocType: Sales Invoice,Tax ID,Tax ID
@@ -3739,7 +3749,7 @@
 DocType: Customer,Sales Partner and Commission,Velta Partner og framkvæmdastjórnarinnar
 DocType: Employee Loan,Rate of Interest (%) / Year,Vextir (%) / Ár
 ,Project Quantity,Project Magn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Alls {0} á öllum hlutum er núll, getur verið að þú ættir að breyta &#39;Úthluta Gjöld Byggt á&#39;"
 DocType: Opportunity,To Discuss,Að ræða
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} einingar {1} þörf {2} að ljúka þessari færslu.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Árleg
@@ -3754,7 +3764,7 @@
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Framleiðsla Order Operation
 DocType: Pricing Rule,Disable,Slökkva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Háttur af greiðslu er krafist til að greiða
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Háttur af greiðslu er krafist til að greiða
 DocType: Project Task,Pending Review,Bíður Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Eignastýring {0} er ekki hægt að rífa, eins og það er nú þegar {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Krafa (með kostnað kröfu)
@@ -3762,11 +3772,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Gjaldmiðill af BOM # {1} ætti að vera jafn völdu gjaldmiðil {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Velta Order {0} er ekki lögð
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Lo Stjórn
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Bæta atriði úr
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Bæta atriði úr
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Foreldri reikningur {1} er ekki BOLONG fyrirtækinu {2}
 DocType: Cheque Print Template,Regular,Venjulegur
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Alls weightage allra Námsmat Criteria verður að vera 100%
@@ -3779,7 +3789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} er ekki til
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Fyrir ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mánaðarleg Dreifing Prósentur
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Valið atriði getur ekki Hópur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Valið atriði getur ekki Hópur
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verðmat hlutfall fannst ekki í lið {0}, sem er nauðsynlegt til að gera bókhald færslur fyrir {1} {2}. Ef hluturinn er transacting sem sýnishorn hlut í {1}, skaltu nefna að í {1} Liður borð. Annars skaltu búa mótteknu lager viðskipti fyrir hlutinn eða nefna verðmats hraða í Item met, og þá reyna submiting / hætta við þessa færslu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Af efnum afhent gegn þessum Delivery Note
 DocType: Project,Customer Details,Nánar viðskiptavina
@@ -3788,15 +3798,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Sláðu url breytu til móttakara Nos
 DocType: Payment Entry,Paid Amount,greiddur Upphæð
 DocType: Assessment Plan,Supervisor,Umsjón
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Laus Stock fyrir pökkun atriði
 DocType: Item Variant,Item Variant,Liður Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Mat Niðurstaða Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Lagðar pantanir ekki hægt að eyða
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Viðskiptajöfnuður þegar í Debit, þú ert ekki leyft að setja &#39;Balance Verður Be&#39; eins og &#39;Credit &quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gæðastjórnun
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Liður {0} hefur verið gerð óvirk
 DocType: Employee Loan,Repay Fixed Amount per Period,Endurgreiða Föst upphæð á hvern Tímabil
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vinsamlegast sláðu inn magn fyrir lið {0}
 DocType: Employee External Work History,Employee External Work History,Starfsmaður Ytri Vinna Saga
@@ -3822,7 +3832,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Tilkynning (dagar)
 DocType: Tax Rule,Sales Tax Template,Söluskattur Snið
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Veldu atriði til að bjarga reikning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Veldu atriði til að bjarga reikning
 DocType: Employee,Encashment Date,Encashment Dagsetning
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Stock Leiðrétting
@@ -3845,7 +3855,7 @@
 DocType: Item Variant Attribute,Attribute,eiginleiki
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Vinsamlegast tilgreinið frá / til svið
 DocType: Serial No,Under AMC,undir AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Liður verðmat hlutfall er endurreiknuð miðað lenti kostnaður úttektarmiðans upphæð
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Liður verðmat hlutfall er endurreiknuð miðað lenti kostnaður úttektarmiðans upphæð
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Sjálfgefnar stillingar fyrir að selja viðskiptum.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,þröskuldur
@@ -3855,6 +3865,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debet Note Útgefið
 DocType: Production Order,Warehouses,Vöruhús
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eign er ekki hægt að flytja
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Þetta atriði er afbrigði af {0} (sniðmát).
 DocType: Workstation,per hour,á klukkustund
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Innkaupastjóri
 DocType: Announcement,Announcement,Tilkynning
@@ -3870,8 +3881,8 @@
 DocType: Account,Receivable,viðskiptakröfur
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ekki leyfilegt að breyta birgi Purchase Order er þegar til
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Hlutverk sem er leyft að leggja viðskiptum sem fara lánamörk sett.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Veldu Hlutir til Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Veldu Hlutir til Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master gögn syncing, gæti það tekið smá tíma"
 DocType: Item,Material Issue,efni Issue
 DocType: Hub Settings,Seller Description,Seljandi Lýsing
 DocType: Employee Education,Qualification,HM
@@ -3883,7 +3894,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pantaði
 DocType: Salary Detail,Component,Component
 DocType: Assessment Criteria,Assessment Criteria Group,Námsmat Viðmið Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Opnun uppsöfnuðum afskriftum verður að vera minna en eða jafnt og {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Veldu Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vinsamlegast sláðu inn Samþykkir hlutverki eða samþykkir notandi
@@ -3896,7 +3907,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},Til Dagsetning ætti að vera innan fjárhagsársins. Að því gefnu að Dagsetning = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Hér er hægt að halda hæð, þyngd, ofnæmi, læknis áhyggjum etc"
 DocType: Leave Block List,Applies to Company,Gildir til félagsins
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Ekki er hægt að hætta við vegna þess að lögð Stock Entry {0} hendi
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Ekki er hægt að hætta við vegna þess að lögð Stock Entry {0} hendi
 DocType: Employee Loan,Disbursement Date,útgreiðsludagur
 DocType: Vehicle,Vehicle,ökutæki
 DocType: Purchase Invoice,In Words,í orðum
@@ -3910,14 +3921,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Upp / Leið%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Eignastýring Afskriftir og jafnvægi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Upphæð {0} {1} flutt frá {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Fá Framfarir móttekin
 DocType: Email Digest,Add/Remove Recipients,Bæta við / fjarlægja viðtakendur
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaction ekki leyft móti hætt framleiðslu Order {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Til að stilla þessa rekstrarárs sem sjálfgefið, smelltu á &#39;Setja sem sjálfgefið&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Join
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,skortur Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Liður afbrigði {0} hendi með sömu eiginleika
 DocType: Employee Loan,Repay from Salary,Endurgreiða frá Laun
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Biðum greiðslu gegn {0} {1} fyrir upphæð {2}
@@ -3935,7 +3946,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Mat Niðurstaða Detail
 DocType: Employee Education,Employee Education,starfsmaður Menntun
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Afrit atriði hópur í lið töflunni
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Það er nauðsynlegt að ná Item upplýsingar.
 DocType: Salary Slip,Net Pay,Net Borga
 DocType: Account,Account,Reikningur
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nei {0} hefur þegar borist
@@ -3944,7 +3955,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",Warehouse {0} er ekki tengd við hvaða reikning skaltu búa / tengja samsvarandi (eign) reikningur fyrir lager.
 DocType: Purchase Invoice,Recurring Id,Fastir Id
 DocType: Customer,Sales Team Details,Upplýsingar Söluteymi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eyða varanlega?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Eyða varanlega?
 DocType: Expense Claim,Total Claimed Amount,Alls tilkalli Upphæð
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Hugsanleg tækifæri til að selja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ógild {0}
@@ -3955,13 +3966,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Skipulag School þín í ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Breyta Upphæð (Company Gjaldmiðill)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Engar bókhald færslur fyrir eftirfarandi vöruhús
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Vistaðu skjalið fyrst.
 DocType: Account,Chargeable,ákæru
 DocType: Company,Change Abbreviation,Breyta Skammstöfun
 DocType: Expense Claim Detail,Expense Date,Expense Dagsetning
 DocType: Item,Max Discount (%),Max Afsláttur (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Síðasta Order Magn
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,Tölvupóstur sendur til
 DocType: Budget,Warn,Warn
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Allar aðrar athugasemdir, athyglisvert áreynsla sem ætti að fara í skrám."
@@ -3982,7 +3994,7 @@
 DocType: Item Attribute Value,Attribute Value,eigindi gildi
 ,Itemwise Recommended Reorder Level,Itemwise Mælt Uppröðun Level
 DocType: Salary Detail,Salary Detail,laun Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Vinsamlegast veldu {0} fyrst
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Vinsamlegast veldu {0} fyrst
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Hópur {0} af Liður {1} hefur runnið út.
 DocType: Sales Invoice,Commission,þóknun
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tími Sheet fyrir framleiðslu.
@@ -3994,41 +4006,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Eldri Than` ætti að vera minni en% d daga.
 DocType: Tax Rule,Purchase Tax Template,Kaup Tax sniðmáti
 ,Project wise Stock Tracking,Project vitur Stock mælingar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Viðhald Dagskrá {0} hendi á móti {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Raunveruleg Magn (á uppspretta / miða)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee færslur.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vinsamlegast settu Next Afskriftir Dagsetning
 DocType: HR Settings,Payroll Settings,launaskrá Stillingar
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Passa non-tengd og greiðslur.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Panta
 DocType: Email Digest,New Purchase Orders,Ný Purchase Pantanir
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Rót getur ekki hafa foreldri kostnaður miðstöð
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Veldu Brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Veldu Brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Uppsöfnuðum afskriftum og á
 DocType: Sales Invoice,C-Form Applicable,C-Form Gildir
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operation Time verður að vera hærri en 0 fyrir notkun {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Time verður að vera hærri en 0 fyrir notkun {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse er nauðsynlegur
 DocType: Supplier,Address and Contacts,Heimilisfang og Tengiliðir
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM viðskipta Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Keep It vefur vingjarnlegur 900px (w) af 100px (H)
 DocType: Program,Program Abbreviation,program Skammstöfun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Framleiðsla Order er ekki hægt að hækka gegn Item sniðmáti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Gjöld eru uppfærðar á kvittun við hvert atriði
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Framleiðsla Order er ekki hægt að hækka gegn Item sniðmáti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Gjöld eru uppfærðar á kvittun við hvert atriði
 DocType: Warranty Claim,Resolved By,leyst með
 DocType: Bank Guarantee,Start Date,Upphafsdagur
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Úthluta lauf um tíma.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Tékkar og Innlán rangt hreinsaðar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Reikningur {0}: Þú getur ekki framselt sig sem foreldri reikning
 DocType: Purchase Invoice Item,Price List Rate,Verðskrá Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Búa viðskiptavina tilvitnanir
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Búa viðskiptavina tilvitnanir
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Sýna &quot;Á lager&quot; eða &quot;ekki til á lager&quot; byggist á lager í boði í þessum vöruhúsi.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Meðaltal tíma tekin af birgi að skila
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,mat Niðurstaða
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,klukkustundir
 DocType: Project,Expected Start Date,Væntanlegur Start Date
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Fjarlægja hlut ef gjöld eru ekki við þann lið
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Fjarlægja hlut ef gjöld eru ekki við þann lið
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Td. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaction gjaldmiðli skal vera það sama og Greiðsla Gateway gjaldmiðil
 DocType: Payment Entry,Receive,fá
@@ -4039,19 +4050,19 @@
 DocType: Workstation,Operating Costs,því að rekstrarkostnaðurinn
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Aðgerð ef Uppsafnaður mánuðinn Budget meiri en
 DocType: Purchase Invoice,Submit on creation,Senda á sköpun
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Gjaldeyri fyrir {0} verður að vera {1}
 DocType: Asset,Disposal Date,förgun Dagsetning
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Póstur verður sendur á öllum virkum Starfsmenn félagsins á tilteknu klukkustund, ef þeir hafa ekki frí. Samantekt á svörum verður sent á miðnætti."
 DocType: Employee Leave Approver,Employee Leave Approver,Starfsmaður Leave samþykkjari
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An Uppröðun færslu þegar til fyrir þessa vöruhús {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Get ekki lýst því sem glatast, af því Tilvitnun hefur verið gert."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Þjálfun Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Framleiðslu Order {0} Leggja skal fram
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Vinsamlegast veldu Ræsa og lokadag fyrir lið {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vinsamlegast veldu Ræsa og lokadag fyrir lið {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Auðvitað er skylda í röð {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hingað til er ekki hægt að áður frá dagsetningu
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Bæta við / Breyta Verð
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Bæta við / Breyta Verð
 DocType: Batch,Parent Batch,Foreldri hópur
 DocType: Cheque Print Template,Cheque Print Template,Ávísun Prenta Snið
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Mynd af stoðsviða
@@ -4064,7 +4075,7 @@
 ,Ordered Items To Be Delivered,Pantaði Items til afhendingar
 DocType: Account,Income,tekjur
 DocType: Industry Type,Industry Type,Iðnaður Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Eitthvað fór úrskeiðis!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Eitthvað fór úrskeiðis!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Viðvörun: Leyfi umsókn inniheldur eftirfarandi block dagsetningar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Velta Invoice {0} hefur þegar verið lögð
 DocType: Assessment Result Detail,Score,Mark
@@ -4095,17 +4106,17 @@
 DocType: Item,Variant Based On,Variant miðað við
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Alls weightage úthlutað ætti að vera 100%. Það er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Birgjar þín
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Get ekki stillt eins Lost og Sales Order er gert.
 DocType: Request for Quotation Item,Supplier Part No,Birgir Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,fékk frá
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Get ekki draga þegar flokkur er fyrir &#39;Verðmat&#39; eða &#39;Vaulation og heildar&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,fékk frá
 DocType: Lead,Converted,converted
 DocType: Item,Has Serial No,Hefur Serial Nei
 DocType: Employee,Date of Issue,Útgáfudagur
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Frá {0} fyrir {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Frá {0} fyrir {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Setja Birgir fyrir lið {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Hours verður að vera stærri en núll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Vefsíða Image {0} fylgir tl {1} er ekki hægt að finna
 DocType: Issue,Content Type,content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,tölva
 DocType: Item,List this Item in multiple groups on the website.,Listi þetta atriði í mörgum hópum á vefnum.
@@ -4114,20 +4125,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Þú hefur ekki heimild til að setja Frozen gildi
 DocType: Payment Reconciliation,Get Unreconciled Entries,Fá Unreconciled færslur
 DocType: Payment Reconciliation,From Invoice Date,Frá dagsetningu reiknings
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Innheimta gjaldmiðli skal vera jöfn gjaldmiðil eða aðili reikning gjaldmiðli hvoru vanræksla Comapany er
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Skildu Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hvað gerir það?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,til Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Allir Student Innlagnir
 ,Average Commission Rate,Meðal framkvæmdastjórnarinnar Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Hefur Serial Nei &#39;getur ekki verið&#39; Já &#39;fyrir non-lager lið
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Aðsókn er ekki hægt að merkja fyrir framtíð dagsetningar
 DocType: Pricing Rule,Pricing Rule Help,Verðlagning Regla Hjálp
 DocType: School House,House Name,House Name
 DocType: Purchase Taxes and Charges,Account Head,Head Reikningur
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Uppfærðu aukakostnað að reikna lenti kostnað af hlutum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Bætið restinni af fyrirtækinu þínu sem notendur. Þú getur einnig bætt við boðið viðskiptavinum sínum að vefsíðunni þinni með því að bæta þeim við úr Tengiliðum
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Bætið restinni af fyrirtækinu þínu sem notendur. Þú getur einnig bætt við boðið viðskiptavinum sínum að vefsíðunni þinni með því að bæta þeim við úr Tengiliðum
 DocType: Stock Entry,Total Value Difference (Out - In),Heildarverðmæti Mismunur (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate er nauðsynlegur
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},User ID ekki sett fyrir Starfsmaður {0}
@@ -4136,7 +4147,7 @@
 DocType: Item,Customer Code,viðskiptavinur Code
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Afmæli Áminning fyrir {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar frá síðustu Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debit Til reikning verður að vera Efnahagur reikning
 DocType: Buying Settings,Naming Series,nafngiftir Series
 DocType: Leave Block List,Leave Block List Name,Skildu Block List Nafn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Tryggingar Start dagsetning ætti að vera minna en tryggingar lokadagsetning
@@ -4151,9 +4162,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Laun Slip starfsmanns {0} þegar búið fyrir tíma blaði {1}
 DocType: Vehicle Log,Odometer,kílómetramæli
 DocType: Sales Order Item,Ordered Qty,Raðaður Magn
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Liður {0} er óvirk
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Liður {0} er óvirk
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen uppí
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM inniheldur ekki lager atriði
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Tímabil Frá og tímabil Til dagsetningar lögboðnum fyrir endurteknar {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Project virkni / verkefni.
 DocType: Vehicle Log,Refuelling Details,Eldsneytisstöðvar Upplýsingar
@@ -4163,8 +4174,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Síðustu kaup hlutfall fannst ekki
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skrifaðu Off Upphæð (Company Gjaldmiðill)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Sjálfgefið BOM fyrir {0} fannst ekki
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Vinsamlegast settu pöntunarmark magn
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Pikkaðu á atriði til að bæta þeim við hér
 DocType: Fees,Program Enrollment,program Innritun
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landað Kostnaður Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vinsamlegast settu {0}
@@ -4186,7 +4198,7 @@
 DocType: Maintenance Visit,Maintenance Date,viðhald Dagsetning
 DocType: Purchase Invoice Item,Rejected Serial No,Hafnað Serial Nei
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Ár Upphafsdagur eða lokadagsetning er skörun við {0}. Til að forðast skaltu stilla fyrirtæki
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Upphafsdagur ætti að vera minna en lokadagsetningu fyrir lið {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Upphafsdagur ætti að vera minna en lokadagsetningu fyrir lið {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.","Dæmi:. ABCD ##### Ef röð er sett og Serial Nei er ekki getið í viðskiptum, þá sjálfvirkur raðnúmer verður búin byggt á þessari röð. Ef þú vilt alltaf að beinlínis sé minnst Serial Nos fyrir þetta atriði. autt."
 DocType: Upload Attendance,Upload Attendance,Hlaða Aðsókn
@@ -4261,7 +4273,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Heildverslun
 DocType: Issue,First Responded On,Fyrst svöruðu
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross Skráning Liður í mörgum hópum
-DocType: Grade Interval,Grade Interval,gráðu Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Reikningsár Start Date og Fiscal Year End Date eru nú þegar sett í Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Úthreinsun Date uppfært
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Skipta lotu
@@ -4306,14 +4317,14 @@
 DocType: Bin,Reserved Qty for Production,Frátekið Magn fyrir framleiðslu
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Leyfi óskráð ef þú vilt ekki íhuga hópur meðan þú setur námskeið.
 DocType: Asset,Frequency of Depreciation (Months),Tíðni Afskriftir (mánuðir)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit Reikningur
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Credit Reikningur
 DocType: Landed Cost Item,Landed Cost Item,Landað kostnaðarliðurinn
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Sýna núll gildi
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Magn lið sem fæst eftir framleiðslu / endurpökkunarinnar úr gefin magni af hráefni
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Skipulag einföld vefsíða fyrir fyrirtæki mitt
 DocType: Payment Reconciliation,Receivable / Payable Account,/ Viðskiptakröfur Account
 DocType: Delivery Note Item,Against Sales Order Item,Gegn Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vinsamlegast tilgreindu Attribute virði fyrir eigind {0}
 DocType: Item,Default Warehouse,Sjálfgefið Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Fjárhagsáætlun er ekki hægt að úthlutað gegn Group reikninginn {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vinsamlegast sláðu foreldri kostnaðarstað
@@ -4356,7 +4367,7 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Upphæð
 DocType: Cheque Print Template,Signatory Position,Undirritaður Staða
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Setja sem Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Setja sem Lost
 DocType: Timesheet,Total Billable Hours,Samtals vinnustunda
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Greiðslukvittun Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Þetta er byggt á viðskiptum móti þessum viðskiptavinar. Sjá tímalínu hér fyrir nánari upplýsingar
@@ -4370,11 +4381,11 @@
 ,Items To Be Requested,Hlutir til að biðja
 DocType: Purchase Order,Get Last Purchase Rate,Fá Síðasta kaupgengi
 DocType: Company,Company Info,Upplýsingar um fyrirtæki
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Veldu eða bæta við nýjum viðskiptavin
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kostnaður sent er nauðsynlegt að bóka kostnað kröfu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Umsókn um Funds (eignum)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Þetta er byggt á mætingu þessa starfsmanns
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,skuldfærslureikning
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,skuldfærslureikning
 DocType: Fiscal Year,Year Start Date,Ár Start Date
 DocType: Attendance,Employee Name,starfsmaður Name
 DocType: Sales Invoice,Rounded Total (Company Currency),Ávalur Total (Company Gjaldmiðill)
@@ -4383,13 +4394,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Hættu notendur frá gerð yfirgefa Umsóknir um næstu dögum.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kaup Upphæð
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Birgir Tilvitnun {0} búin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Árslok getur ekki verið áður Start Ár
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,starfskjör
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Pakkað magn verður að vera jafnt magn fyrir lið {0} í röð {1}
 DocType: Production Order,Manufactured Qty,Framleiðandi Magn
 DocType: Purchase Receipt Item,Accepted Quantity,Samþykkt Magn
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vinsamlegast setja sjálfgefið Holiday lista fyrir Starfsmaður {0} eða fyrirtækis {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} er ekki til
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} er ekki til
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Víxlar vakti til viðskiptavina.
 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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Engin {0}: Upphæð má ekki vera meiri en Bíður Upphæð á móti kostnað {1} kröfu. Bið Upphæð er {2}
@@ -4398,15 +4409,17 @@
 DocType: Quality Inspection Reading,Reading 3,lestur 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,skírteini Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Verðlisti fannst ekki eða fatlaður
 DocType: Employee Loan Application,Approved,samþykkt
 DocType: Pricing Rule,Price,verð
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Starfsmaður létta á {0} skal stilla eins &#39;Vinstri&#39;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Úttekt {0} búin til starfsmanns {1} á tilteknu tímabili
 DocType: Employee,Education,menntun
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Herferð Nafngift By
 DocType: Employee,Current Address Is,Núverandi Heimilisfang er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Breytt
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valfrjálst. Leikmynd sjálfgefið mynt félagsins, ef ekki tilgreint."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Bókhald dagbók færslur.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Laus Magn á frá vöruhúsi
@@ -4415,7 +4428,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account passar ekki við {1} / {2} í {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vinsamlegast sláðu inn kostnað reikning
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tilvísun Document Type verður að vera einn af Purchase Order, Purchase Invoice eða Journal Entry"
 DocType: Employee,Current Address,Núverandi heimilisfang
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ef hluturinn er afbrigði af annað lið þá lýsingu, mynd, verðlagningu, skatta osfrv sett verður úr sniðmátinu nema skýrt tilgreint"
 DocType: Serial No,Purchase / Manufacture Details,Kaup / Framleiðsla Upplýsingar
@@ -4443,7 +4456,7 @@
 DocType: Hub Settings,Hub Settings,Hub Stillingar
 DocType: Project,Gross Margin %,Heildarframlegð %
 DocType: BOM,With Operations,með starfsemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bókhald færslur hafa verið gerðar í gjaldmiðli {0} fyrir fyrirtæki {1}. Vinsamlegast veldu nái eða greiða ber reikning með gjaldeyri {0}.
 DocType: Asset,Is Existing Asset,Er núverandi eign
 DocType: Salary Detail,Statistical Component,Tölfræðilegur hluti
 ,Monthly Salary Register,Mánaðarlaunum Register
@@ -4466,7 +4479,7 @@
 DocType: Assessment Plan,Room,Room
 DocType: Purchase Order,Advance Paid,Advance Greiddur
 DocType: Item,Item Tax,Liður Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Efni til Birgir
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Efni til Birgir
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,vörugjöld Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% virðist oftar en einu sinni
 DocType: Expense Claim,Employees Email Id,Starfsmenn Netfang Id
@@ -4497,9 +4510,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,hengja Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager Levels
 DocType: Customer,Commission Rate,Framkvæmdastjórnin Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,gera Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,gera Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block orlofsrétt umsóknir deild.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Greiðsla Type verður að vera einn af fáum, Borga og Innri Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Greiðsla Type verður að vera einn af fáum, Borga og Innri Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Karfan er tóm
 DocType: Vehicle,Model,Model
@@ -4510,6 +4523,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Leyfa Framleiðsla á helgidögum
 DocType: Sales Order,Customer's Purchase Order Date,Viðskiptavinar Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Sýna opinberar viðhengi
 DocType: Packing Slip,Package Weight Details,Pakki Þyngd Upplýsingar
 DocType: Payment Gateway Account,Payment Gateway Account,Greiðsla Gateway Reikningur
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Að lokinni greiðslu áframsenda notandann til valda síðu.
@@ -4528,15 +4542,15 @@
 DocType: Batch,Expiry Date,Fyrningardagsetning
 ,Supplier Addresses and Contacts,Birgir Heimilisföng og Tengiliðir
 ,accounts-browser,reikningar-vafra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vinsamlegast veldu Flokkur fyrst
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vinsamlegast veldu Flokkur fyrst
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project húsbóndi.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Til að leyfa yfir innheimtu eða yfir-röðun, uppfæra &quot;vasapeninga&quot; í lager Stillingar eða hlutinn."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ekki sýna tákn eins og $ etc hliðina gjaldmiðlum.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Hálfur dagur)
 DocType: Supplier,Credit Days,Credit Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Gera Student Hópur
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Gera Student Hópur
 DocType: Leave Type,Is Carry Forward,Er bera fram
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Fá atriði úr BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Fá atriði úr BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Staða Dagsetning skal vera það sama og kaupdegi {1} eignar {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vinsamlegast sláðu sölu skipunum í töflunni hér að ofan
@@ -4553,7 +4567,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,bundnar Upphæð
 DocType: GL Entry,Is Opening,er Opnun
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: gjaldfærslu ekki hægt að tengja með {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vinsamlegast settu upp flokkunarnúmer fyrir þátttöku í gegnum skipulag&gt; Númerakerfi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Reikningur {0} er ekki til
 DocType: Account,Cash,Cash
 DocType: Employee,Short biography for website and other publications.,Stutt ævisaga um vefsíðu og öðrum ritum.
diff --git a/erpnext/translations/it.csv b/erpnext/translations/it.csv
index 88b2713..315a4a1 100644
--- a/erpnext/translations/it.csv
+++ b/erpnext/translations/it.csv
@@ -17,15 +17,15 @@
 DocType: Employee,Rented,Affittato
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Applicabile per utente
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Produzione Arrestato Ordine non può essere annullato, Unstop è prima di cancellare"
 DocType: Vehicle Service,Mileage,Chilometraggio
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vuoi davvero di accantonare questo bene?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selezionare Predefinito Fornitore
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selezionare il Fornitore predefinito
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},E' necessario specificare la  valuta per il listino prezzi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sarà calcolato nella transazione
 DocType: Purchase Order,Customer Contact,Customer Contact
 DocType: Job Applicant,Job Applicant,Candidati
-apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni contro questo fornitore. Vedere cronologia sotto per i dettagli
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,Questo si basa su operazioni relative a questo fornitore. Vedere cronologia sotto per i dettagli
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,Nessun altro risultato.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,legale
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},Il tipo di imposta / tassa non può essere inclusa nella tariffa della riga {0}
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Eccezionale per {0} non può essere inferiore a zero ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Predefinito 10 minuti
 DocType: Leave Type,Leave Type Name,Lascia Tipo Nome
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostra aperta
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostra aperta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serie Aggiornato con successo
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural diario Inserito
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Item scadenza di stato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Assegno Bancario
 DocType: Mode of Payment Account,Mode of Payment Account,Modalità di pagamento Conto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostra Varianti
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostra Varianti
 DocType: Academic Term,Academic Term,Termine Accademico
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantità
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Quantità
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,La tabella dei conti non può essere vuota.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Prestiti (passività )
 DocType: Employee Education,Year of Passing,Anni dal superamento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Riferimento:% s, Codice Articolo:% s e clienti:% s"
 DocType: Item,Country of Origin,Paese d&#39;origine
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,In Magazzino
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Controversia Aperta
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistenza Sanitaria
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ritardo nel pagamento (Giorni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,spese per servizi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fattura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numero di serie: {0} è già indicato nella fattura di vendita: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Fattura
 DocType: Maintenance Schedule Item,Periodicity,Periodicità
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiscal Year {0} è richiesto
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Data prevista di consegna è essere prima di ordini di vendita Data
@@ -86,7 +86,7 @@
 DocType: Delivery Note,Vehicle No,Veicolo No
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,Seleziona Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,Row # {0}: documento pagamento è richiesto per completare la trasaction
-DocType: Production Order Operation,Work In Progress,Work In Progress
+DocType: Production Order Operation,Work In Progress,Lavori in corso
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Seleziona la data
 DocType: Employee,Holiday List,Elenco vacanza
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Ragioniere
@@ -108,45 +108,47 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Allega file .csv con due colonne, una per il vecchio nome e uno per il nuovo nome"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} non presente in alcun Anno Fiscale attivo.
 DocType: Packed Item,Parent Detail docname,Parent Dettaglio docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Riferimento: {0}, codice dell&#39;articolo: {1} e cliente: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Apertura di un lavoro.
 DocType: Item Attribute,Increment,Incremento
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Seleziona Magazzino ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Seleziona Magazzino ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,pubblicità
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Ottenere elementi dal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Non consentito per {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Ottenere elementi dal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock non può essere aggiornata contro Consegna Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prodotto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nessun elemento elencato
 DocType: Payment Reconciliation,Reconcile,conciliare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Drogheria
 DocType: Quality Inspection Reading,Reading 1,Lettura 1
 DocType: Process Payroll,Make Bank Entry,Aggiungi Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondi Pensione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,La data di ammortamento successivo non puó essere prima della Data di acquisto
 DocType: SMS Center,All Sales Person,Tutti i Venditori
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Distribuzione mensile ** aiuta a distribuire il Budget / Target nei mesi, nel caso di di business stagionali."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Non articoli trovati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Non articoli trovati
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Stipendio Struttura mancante
-DocType: Lead,Person Name,Nome Person
+DocType: Lead,Person Name,Nome della Persona
 DocType: Sales Invoice Item,Sales Invoice Item,Fattura Voce
 DocType: Account,Credit,Credit
 DocType: POS Profile,Write Off Cost Center,Scrivi Off Centro di costo
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","ad esempio, &quot;scuola elementare&quot; o &quot;Università&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Magazzino
 DocType: Warehouse,Warehouse Detail,Dettagli Magazzino
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limite di credito è stato attraversato per il cliente {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Il Data Terminologia fine non può essere successiva alla data di fine anno dell&#39;anno accademico a cui il termine è legata (Anno Accademico {}). Si prega di correggere le date e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""E' un Asset"" non può essere deselezionato, in quanto esiste già un movimento collegato"
 DocType: Vehicle Service,Brake Oil,olio freno
 DocType: Tax Rule,Tax Type,Tipo fiscale
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Non sei autorizzato ad aggiungere o aggiornare le voci prima di {0}
 DocType: BOM,Item Image (if not slideshow),Immagine Articolo (se non slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Esiste un cliente con lo stesso nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tasso Orario / 60) * tempo operazione effettivo
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Seleziona la Distinta Materiali
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Seleziona la Distinta Materiali
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costo di oggetti consegnati
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,La vacanza su {0} non è tra da Data e A Data
@@ -166,8 +168,8 @@
 DocType: Academic Term,Schools,Istruzione
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nessun record congedo trovato per dipendente {0} per {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Inserisci prima azienda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Seleziona prima azienda
-DocType: Employee Education,Under Graduate,Sotto Laurea
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Seleziona prima azienda
+DocType: Employee Education,Under Graduate,Laureando
 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
 DocType: Journal Entry Account,Employee Loan,prestito dipendenti
@@ -175,26 +177,26 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Item {0} does not exist in the system or has expired,L'articolo {0} non esiste nel sistema o è scaduto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +44,Real Estate,Immobiliare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.html +7,Statement of Account,Estratto conto
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Pharmaceuticals
+apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,Farmaceutici
 DocType: Purchase Invoice Item,Is Fixed Asset,E' un Bene Strumentale
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}","Disponibile Quantità è {0}, è necessario {1}"
 DocType: Expense Claim Detail,Claim Amount,Importo Reclamo
 DocType: Employee,Mr,Sig.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Gruppo di clienti duplicato trovato nella tabella gruppo cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornitore Tipo / fornitore
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Fornitore Tipo / Fornitore
 DocType: Naming Series,Prefix,Prefisso
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumabile
 DocType: Employee,B-,B-
 DocType: Upload Attendance,Import Log,Log Importazione
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Tirare Materiale Richiesta di tipo Produzione sulla base dei criteri di cui sopra
 DocType: Training Result Employee,Grade,Grado
-DocType: Sales Invoice Item,Delivered By Supplier,Consegnato da parte del fornitore
+DocType: Sales Invoice Item,Delivered By Supplier,Consegnato dal Fornitore
 DocType: SMS Center,All Contact,Tutti i contatti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Ordine di produzione già creato per tutti gli elementi con BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Stipendio Annuo
 DocType: Daily Work Summary,Daily Work Summary,Riepilogo lavori giornaliero
 DocType: Period Closing Voucher,Closing Fiscal Year,Chiusura Anno Fiscale
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} è bloccato
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} è bloccato
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Seleziona esistente Società per la creazione di piano dei conti
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Spese di stoccaggio
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Seleziona Target Warehouse
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credito in Società Valuta
 DocType: Delivery Note,Installation Status,Stato di installazione
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vuoi aggiornare presenze? <br> Presente: {0} \ <br> Assente: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Quantità accettata + rifiutata deve essere uguale alla quantità ricevuta per {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Fornire Materie Prime per l'Acquisto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,è richiesto almeno una modalità di pagamento per POS fattura.
 DocType: Products Settings,Show Products as a List,Mostra prodotti sotto forma di elenco
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Scarica il modello, compilare i dati appropriati e allegare il file modificato.
@@ -222,12 +224,12 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Crea una scrittura per l'ammortamento
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Tipo di richiesta
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Crea Dipendente
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Crea Dipendente
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,emittente
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,esecuzione
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,I dettagli delle operazioni effettuate.
 DocType: Serial No,Maintenance Status,Stato di manutenzione
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: richiesto conto Fornitore per il conto di debito  {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Il campo Fornitore è richiesto per il conto di debito  {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Oggetti e prezzi
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Ore totali: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},Dalla data deve essere entro l'anno fiscale. Assumendo Dalla Data = {0}
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Piano per le visite di manutenzione.
 DocType: SMS Settings,Enter url parameter for message,Inserisci parametri url per il messaggio
 DocType: POS Profile,Customer Groups,Gruppi clienti
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Bilancio d&#39;esercizio
 DocType: Guardian,Students,Alunni
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Le modalità di applicazione di prezzi e sconti .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prezzo di listino deve essere applicabile per l'acquisto o la vendita di
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},importo anticipato non può essere maggiore di {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Serie per questa transazione
 DocType: Company,Default Payroll Payable Account,Payroll di mora dovuti account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aggiorna e-mail Gruppo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aggiorna Gruppo Email
 DocType: Sales Invoice,Is Opening Entry,Sta aprendo Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menzione se conto credito non standard applicabile
 DocType: Course Schedule,Instructor Name,Istruttore Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Prima della conferma inserire per Magazzino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Prima della conferma inserire per Magazzino
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ricevuto On
 DocType: Sales Partner,Reseller,Rivenditore
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Se selezionato, comprenderà gli elementi non-azione nelle richieste dei materiali."
@@ -275,7 +278,7 @@
 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 +39,Net Cash from Financing,Di cassa netto da finanziamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage è piena, non ha salvato"
 DocType: Lead,Address & Contact,Indirizzo e Contatto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Aggiungere le foglie non utilizzate precedentemente assegnata
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Successivo ricorrente {0} verrà creato su {1}
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totale Costing Importo (tramite Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specifica da Sito Web dell'articolo
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lascia Bloccato
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Registrazioni bancarie
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},L'articolo {0} ha raggiunto la fine della sua vita su {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Registrazioni bancarie
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,annuale
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voce Riconciliazione Giacenza
 DocType: Stock Entry,Sales Invoice No,Fattura di Vendita n.
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,Pubblicare in Hub
 DocType: Student Admission,Student Admission,L&#39;ammissione degli studenti
 ,Terretory,Territorio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,L'articolo {0} è annullato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Richiesta materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,L'articolo {0} è annullato
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -346,21 +349,21 @@
 DocType: Email Digest,New Quotations,Nuovo Preventivo
 DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,Messaggi di posta elettronica stipendio slittamento al dipendente sulla base di posta preferito selezionato a dipendenti
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,Il primo responsabile ferie della lista sarà impostato come il responsabile ferie di default
-DocType: Tax Rule,Shipping County,County spedizione
+DocType: Tax Rule,Shipping County,Distretto di  Spedizione
 apps/erpnext/erpnext/config/desktop.py +158,Learn,Imparare
 DocType: Asset,Next Depreciation Date,Data ammortamento successivo
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,Costo attività per dipendente
 DocType: Accounts Settings,Settings for Accounts,Impostazioni per gli account
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},Fornitore fattura n esiste in Acquisto Fattura {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},La Fattura Fornitore non esiste nella Fattura di Acquisto {0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,Gestire venditori ad albero
 DocType: Job Applicant,Cover Letter,Lettera di presentazione
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Gli assegni in circolazione e depositi per cancellare
 DocType: Item,Synced With Hub,Sincronizzati con Hub
 DocType: Vehicle,Fleet Manager,Responsabile flotta aziendale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} non può essere negativo per la voce {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Password Errata
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} non può essere negativo per la voce {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Password Errata
 DocType: Item,Variant Of,Variante di
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Completato Quantità non può essere maggiore di 'Quantità di Fabbricazione'
 DocType: Period Closing Voucher,Closing Account Head,Chiudere Conto Primario
 DocType: Employee,External Work History,Storia del lavoro esterno
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Reference
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica tramite e-mail sulla creazione di Richiesta automatica Materiale
 DocType: Journal Entry,Multi Currency,Multi valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo Fattura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota di Consegna
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Documento Di Trasporto
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Impostazione Tasse
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costo del bene venduto
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
-DocType: Grade Interval,Min Score,Punteggio Min
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} inserito due volte in tassazione articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Riepilogo per questa settimana e le attività in corso
 DocType: Student Applicant,Admitted,Ammesso
 DocType: Workstation,Rent Cost,Affitto Costo
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valore dell&#39;ordine
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transazioni Banca / Cassa solo contro partner o per giroconto
 DocType: Shipping Rule,Valid for Countries,Valido per paesi
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Questo articolo è un modello e non può essere utilizzato nelle transazioni. Attributi Voce verranno copiate nelle varianti meno che sia impostato 'No Copy'
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totale ordine Considerato
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Titolo dipendente (p. es. amministratore delegato, direttore, CEO, ecc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Inserisci ' Ripetere il giorno del mese ' valore di campo
@@ -399,14 +401,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Acquisto fattura non può essere fatta contro un bene esistente {1}
 DocType: Item Tax,Tax Rate,Aliquota Fiscale
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} già allocato il dipendente {1} per il periodo {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Seleziona elemento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Seleziona elemento
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,La Fattura di Acquisto {0} è già stata presentata
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Fila # {0}: Lotto n deve essere uguale a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lotto di un articolo
 DocType: C-Form Invoice Detail,Invoice Date,Data fattura
 DocType: GL Entry,Debit Amount,Importo Debito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Ci può essere solo 1 account per ogni impresa in {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Si prega di vedere allegato
 DocType: Purchase Order,% Received,% Ricevuto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creazione di gruppi di studenti
@@ -422,7 +424,7 @@
 DocType: Leave Application,Leave Approver Name,Nome responsabile ferie
 DocType: Depreciation Schedule,Schedule Date,Programma Data
 apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components","Guadagni, deduzioni e altri componenti di stipendio"
-DocType: Packed Item,Packed Item,Nota Consegna Imballaggio articolo
+DocType: Packed Item,Packed Item,Articoli imballato
 apps/erpnext/erpnext/config/buying.py +65,Default settings for buying transactions.,Impostazioni predefinite per operazioni di acquisto .
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +29,Activity Cost exists for Employee {0} against Activity Type - {1},Costo attività trovato per dipendente {0} con tipo attività - {1}
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,Campo obbligatorio - Prendi gli studenti da
@@ -433,23 +435,23 @@
 DocType: Email Digest,Credit Balance,Balance Credit
 DocType: Employee,Widowed,Vedovo
 DocType: Request for Quotation,Request for Quotation,Richiesta di offerta
-DocType: Salary Slip Timesheet,Working Hours,Orario di lavoro
+DocType: Salary Slip Timesheet,Working Hours,Orari di lavoro
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Cambia l'inizio/numero sequenza corrente per una serie esistente
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Creare un nuovo cliente
-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.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Creare ordini d&#39;acquisto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Creare un nuovo cliente
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se più regole dei prezzi continuano a prevalere, gli utenti sono invitati a impostare manualmente la priorità per risolvere il conflitto."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Creare ordini d&#39;acquisto
 ,Purchase Register,Registro Acquisti
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Spese applicabili
 DocType: Workstation,Consumable Cost,Costo consumabili
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve avere il ruolo 'Approvatore Ferie'
-DocType: Purchase Receipt,Vehicle Date,Veicolo
+DocType: Purchase Receipt,Vehicle Date,Data Veicolo
 DocType: Student Log,Medical,Medico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motivo per Perdere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motivo per Perdere
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Il proprietario del Lead non può essere il Lead stesso
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,importo concesso non può maggiore del valore non aggiustato
 DocType: Announcement,Receiver,Ricevitore
-apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,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/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},Stazione di lavoro chiusa nei seguenti giorni secondo la lista delle vacanze: {0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,Opportunità
 DocType: Employee,Single,Singolo
 DocType: Salary Slip,Total Loan Repayment,Totale Rimborso prestito
@@ -462,13 +464,14 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantità e Prezzo
 DocType: Delivery Note,% Installed,% Installato
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Aule / Laboratori etc dove le lezioni possono essere programmati.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Inserisci il nome della società prima
-DocType: Purchase Invoice,Supplier Name,Nome fornitore
+DocType: Purchase Invoice,Supplier Name,Nome Fornitore
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leggere il manuale ERPNext
 DocType: Account,Is Group,Is Group
 DocType: Email Digest,Pending Purchase Orders,In attesa di ordini di acquisto
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,Imposta automaticamente seriale Nos sulla base FIFO
-DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare fornitore Numero fattura Uniqueness
+DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,Controllare l'unicità del numero fattura fornitore
 DocType: Vehicle Service,Oil Change,Cambio olio
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','A Caso N.' non può essere minore di 'Da Caso N.'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,Non Profit
@@ -477,16 +480,17 @@
 DocType: Account,Old Parent,Vecchio genitore
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Campo obbligatorio - Anno Accademico
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personalizza testo di introduzione che andrà nell'email. Ogni transazione ha un introduzione distinta.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Imposta il conto pagabile in default per la società {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Impostazioni globali per tutti i processi produttivi.
 DocType: Accounts Settings,Accounts Frozen Upto,Conti congelati fino al
 DocType: SMS Log,Sent On,Inviata il
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributo {0} selezionato più volte in Attributi Tabella
 DocType: HR Settings,Employee record is created using selected field. ,Record dipendente viene creato utilizzando campo selezionato.
 DocType: Sales Order,Not Applicable,Non Applicabile
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vacanza principale.
 DocType: Request for Quotation Item,Required Date,Data richiesta
 DocType: Delivery Note,Billing Address,Indirizzo Fatturazione
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Inserisci il codice dell'articolo.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Inserisci il codice dell'articolo.
 DocType: BOM,Costing,Valutazione Costi
 DocType: Tax Rule,Billing County,Contea di fatturazione
 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"
@@ -501,6 +505,7 @@
 DocType: Packing Slip,From Package No.,Da Pacchetto N.
 DocType: Item Attribute,To Range,Per Intervallo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,I titoli e depositi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Impossibile modificare il metodo di valutazione, in quanto vi sono transazioni contro alcuni elementi che non hanno il proprio metodo di valutazione"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Foglie totali assegnate è obbligatoria
 DocType: Job Opening,Description of a Job Opening,Descrizione dell'Offerta di Lavoro
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Attività di attesa per oggi
@@ -513,7 +518,7 @@
 DocType: Journal Entry,Accounts Payable,Conti pagabili
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,Le distinte materiali selezionati non sono per la stessa voce
 DocType: Pricing Rule,Valid Upto,Valido Fino
-DocType: Training Event,Workshop,laboratorio
+DocType: Training Event,Workshop,Laboratorio
 apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,Elencare alcuni dei vostri clienti . Potrebbero essere organizzazioni o individui .
 ,Enough Parts to Build,Parti abbastanza per costruire
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,reddito diretta
@@ -521,13 +526,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,responsabile amministrativo
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Seleziona Corso
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Selezionare prego
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Selezionare prego
 DocType: Stock Entry Detail,Difference Account,account differenza
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Impossibile chiudere compito il compito dipendente {0} non è chiuso.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Inserisci il Magazzino per cui Materiale richiesta sarà sollevata
 DocType: Production Order,Additional Operating Cost,Ulteriori costi di esercizio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,cosmetici
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Per unire , seguenti proprietà devono essere uguali per entrambe le voci"
 DocType: Shipping Rule,Net Weight,Peso netto
 DocType: Employee,Emergency Phone,Telefono di emergenza
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Acquistare
@@ -536,7 +541,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definisci il grado per Soglia 0%
 DocType: Sales Order,To Deliver,Consegnare
 DocType: Purchase Invoice Item,Item,Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial nessun elemento non può essere una frazione
 DocType: Journal Entry,Difference (Dr - Cr),Differenza ( Dr - Cr )
 DocType: Account,Profit and Loss,Profitti e Perdite
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestione conto lavoro / terzista
@@ -551,9 +556,9 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Incremento non può essere 0
 DocType: Production Planning Tool,Material Requirement,Richiesta Materiale
 DocType: Company,Delete Company Transactions,Elimina transazioni Azienda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Di riferimento e di riferimento Data è obbligatoria per la transazione Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Aggiungere / Modificare tasse e ricarichi
-DocType: Purchase Invoice,Supplier Invoice No,Fornitore fattura n
+DocType: Purchase Invoice,Supplier Invoice No,Fattura Fornitore 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 +246,Closing (Cr),Chiusura (Cr)
@@ -562,22 +567,22 @@
 DocType: Installation Note Item,Installation Note Item,Installazione Nota articolo
 DocType: Production Plan Item,Pending Qty,In attesa Quantità
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} non è attivo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} non è attivo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS inviato al seguenti numeri: {0}
-apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensioni di controllo di configurazione per la stampa
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurazione Dimensioni Assegno per la stampa
 DocType: Salary Slip,Salary Slip Timesheet,Stipendio slittamento Timesheet
-apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per subappaltato ricevuta d'acquisto
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Magazzino Fornitore obbligatorio per ricevuta d'acquisto del conto lavoro
 DocType: Pricing Rule,Valid From,valido dal
 DocType: Sales Invoice,Total Commission,Commissione Totale
 DocType: Pricing Rule,Sales Partner,Partner vendite
 DocType: Buying Settings,Purchase Receipt Required,Acquisto necessaria la ricevuta
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Il valore stimato e' obbligatorio se si tratta di una Disponibilità inziale di Magazzino
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Il valore stimato e' obbligatorio se si tratta di una Disponibilità inziale di Magazzino
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nessun record trovato nella tabella Fattura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Selezionare prego e Partito Tipo primo
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Esercizio finanziario / contabile .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valori accumulati
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Crea Ordine di vendita
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Crea Ordine di vendita
 DocType: Project Task,Project Task,Progetto Task
 ,Lead Id,Id del Lead
 DocType: C-Form Invoice Detail,Grand Total,Somma totale
@@ -588,23 +593,23 @@
 DocType: Issue,Resolution,Risoluzione
 DocType: C-Form,IV,IV
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},Consegna: {0}
-DocType: Expense Claim,Payable Account,Conto da pagare
+DocType: Expense Claim,Payable Account,Conto pagabile
 DocType: Payment Entry,Type of Payment,Tipo di pagamento
 DocType: Sales Order,Billing and Delivery Status,Stato della Fatturazione e Consegna
 DocType: Job Applicant,Resume Attachment,Riprendi Allegato
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ripetere i clienti
 DocType: Leave Control Panel,Allocate,Assegna
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Ritorno di vendite
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Ritorno di vendite
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Totale foglie assegnati {0} non deve essere inferiore a foglie già approvati {1} per il periodo
 DocType: Announcement,Posted By,Pubblicato da
-DocType: Item,Delivered by Supplier (Drop Ship),Consegnato da Supplier (Drop Ship)
+DocType: Item,Delivered by Supplier (Drop Ship),Consegnato dal Fornitore (Drop Ship)
 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/selling.py +28,Customer database.,Database Clienti.
 DocType: Quotation,Quotation To,Preventivo Per
 DocType: Lead,Middle Income,Reddito Medio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Importo concesso non può essere negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Imposti la Società
 DocType: Purchase Order Item,Billed Amt,Importo Fatturato
@@ -615,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fattura Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},N. di riferimento & Reference Data è necessario per {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selezionare Account pagamento per rendere Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Creare record dei dipendenti per la gestione foglie, rimborsi spese e del libro paga"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Aggiungere al Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Scrivere proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagamento Entry Deduzione
@@ -623,7 +628,7 @@
 DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests","Se selezionata, materie prime per gli oggetti che sono sub-contratto saranno inclusi nella sezione Richieste Materiale"
 apps/erpnext/erpnext/config/accounts.py +80,Masters,Principali
 DocType: Assessment Plan,Maximum Assessment Score,Massimo punteggio
-apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Aggiornamento banca data delle relative operazioni
+apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,Aggiorna le date delle transazioni bancarie
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,Monitoraggio tempo
 DocType: Fiscal Year Company,Fiscal Year Company,Anno Fiscale Società
 DocType: Packing Slip Item,DN Detail,Dettaglio DN
@@ -645,19 +650,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' non in anno fiscale {2}
 DocType: Buying Settings,Settings for Buying Module,Impostazioni per il Modulo Acquisti
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} non appartiene alla società {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Inserisci RICEVUTA primo
-DocType: Buying Settings,Supplier Naming By,Fornitore di denominazione
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Inserisci RICEVUTA primo
+DocType: Buying Settings,Supplier Naming By,Fornitore da Nome
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Quindi le Regole dei prezzi vengono filtrate in base a cliente, Gruppo Cliente, Territorio, Fornitore, Tipo Fornitore, Campagna, Partner di vendita ecc"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variazione netta Inventario
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Prestito gestione del personale
 DocType: Employee,Passport Number,Numero di passaporto
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Rapporto con Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
-DocType: Payment Entry,Payment From / To,Il pagamento da / a
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervallo di date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuovo limite di credito è inferiore a corrente importo dovuto per il cliente. Limite di credito deve essere atleast {0}
+DocType: Payment Entry,Payment From / To,Pagamento da / a
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nuovo limite di credito è inferiore a corrente importo dovuto per il cliente. Limite di credito deve essere atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -666,8 +670,8 @@
 DocType: Production Order Operation,In minutes,In pochi minuti
 DocType: Issue,Resolution Date,Risoluzione Data
 DocType: Student Batch Name,Batch Name,Batch Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet creato:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet creato:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Si prega di impostare di default Contanti o conto bancario in Modalità di pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Iscriversi
 DocType: Selling Settings,Customer Naming By,Cliente nominato di
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Mostrerà lo studente come presente nel Presenze Monthly Report
@@ -680,7 +684,7 @@
 DocType: Supplier,Fixed Days,Giorni fissi
 DocType: Quotation Item,Item Balance,Saldo
 DocType: Sales Invoice,Packing List,Lista di imballaggio
-apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto prestate a fornitori.
+apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,Ordini di acquisto emessi ai Fornitori.
 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
@@ -695,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,Ora di inizio effettiva
 DocType: BOM Operation,Operation Time,Tempo di funzionamento
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,finire
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
 DocType: Timesheet,Total Billed Hours,Totale ore fatturate
 DocType: Journal Entry,Write Off Amount,Scrivi Off Importo
 DocType: Journal Entry,Bill No,Fattura N.
@@ -709,9 +713,9 @@
 DocType: Student Attendance,Student Attendance,La partecipazione degli studenti
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materie prime calcolate in base a
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Inserisci il dettaglio articolo
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Inserisci il dettaglio articolo
 DocType: Interest,Interest,Interesse
-apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Le vendite Pre
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre vendita
 DocType: Purchase Receipt,Other Details,Altri dettagli
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,suplier
 DocType: Account,Accounts,Contabilità
@@ -720,23 +724,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Pagamento L&#39;ingresso è già stato creato
 DocType: Purchase Receipt Item Supplied,Current Stock,Giacenza Corrente
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} non legata alla voce {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Anteprima foglio paga
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Anteprima foglio paga
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} è stato inserito più volte
 DocType: Account,Expenses Included In Valuation,Spese incluse nella valutazione
 DocType: Hub Settings,Seller City,Città Venditore
 ,Absent Student Report,Report Assenze Studente
 DocType: Email Digest,Next email will be sent on:,La prossima Email verrà inviata il:
 DocType: Offer Letter Term,Offer Letter Term,Termine di Offerta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Articolo ha varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Società di {0} non esiste
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,albero Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,albero Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Quantità consumata per unità
 DocType: Serial No,Warranty Expiry Date,Data di scadenza Garanzia
 DocType: Material Request Item,Quantity and Warehouse,Quantità e Magazzino
 DocType: Sales Invoice,Commission Rate (%),Tasso Commissione (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazioni&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Seleziona Programma
 DocType: Project,Estimated Cost,Costo stimato
 DocType: Purchase Order,Link to material requests,Collegamento alle richieste di materiale
@@ -754,7 +757,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Importo ricevuto (Società di valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Il Lead deve essere impostato se l'opportunità è generata da un Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Seleziona il giorno di riposo settimanale
 DocType: Production Order Operation,Planned End Time,Planned End Time
 ,Sales Person Target Variance Item Group-Wise,Sales Person target Varianza articolo Group- Wise
@@ -770,6 +773,7 @@
 DocType: Opportunity,Opportunity From,Opportunità da
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Busta Paga Mensile.
 DocType: BOM,Website Specifications,Website Specifiche
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numeri per la partecipazione tramite Setup&gt; Serie di numerazione
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Da {0} di tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Riga {0}: fattore di conversione è obbligatoria
@@ -823,6 +827,7 @@
 DocType: Employee,Bank A/C No.,Conto Bancario N.
 DocType: Bank Guarantee,Project,Progetto
 DocType: Quality Inspection Reading,Reading 7,Lettura 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,parzialmente ordinato
 DocType: Expense Claim Detail,Expense Claim Type,Tipo Rimborso Spese
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Impostazioni predefinite per Carrello
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset demolito tramite diario {0}
@@ -830,14 +835,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Spese di manutenzione dell'ufficio
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Impostazione di account e-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Inserisci articolo prima
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Inserisci articolo prima
 DocType: Account,Liability,responsabilità
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Importo sanzionato non può essere maggiore di rivendicazione Importo in riga {0}.
 DocType: Company,Default Cost of Goods Sold Account,Costo predefinito di Account merci vendute
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Listino Prezzi non selezionati
 DocType: Employee,Family Background,Sfondo Famiglia
 DocType: Request for Quotation Supplier,Send Email,Invia Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Attenzione: L&#39;allegato non valido {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nessuna autorizzazione
 DocType: Company,Default Bank Account,Conto Banca Predefinito
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Per filtrare sulla base del partito, selezionare Partito Digitare prima"
@@ -850,7 +855,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nessun dipendente trovato
 DocType: Supplier Quotation,Stopped,Arrestato
 DocType: Item,If subcontracted to a vendor,Se subappaltato a un fornitore
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Il gruppo studente è già aggiornato.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Il gruppo studente è già aggiornato.
 DocType: SMS Center,All Customer Contact,Tutti Contatti Clienti
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carica Saldo delle Scorte tramite csv.
 DocType: Warehouse,Tree Details,Dettagli Albero
@@ -861,8 +866,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Importo Minimo Fattura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Il Centro di Costo {2} non appartiene all'azienda {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Il conto {2} non può essere un gruppo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente &#39;{} doctype&#39; tavolo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Articolo Row {} IDX: {DOCTYPE} {} docname non esiste nel precedente &#39;{} doctype&#39; tavolo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} è già completato o annullato
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nessuna attività
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Il giorno del mese per cui la fattura automatica sarà generata, ad esempio 05, 28 ecc"
 DocType: Asset,Opening Accumulated Depreciation,Apertura del deprezzamento accumulato
@@ -878,7 +883,7 @@
 DocType: Bin,Moving Average Rate,Tasso Media Mobile
 DocType: Production Planning Tool,Select Items,Selezionare Elementi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} per fattura {1} in data {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Orario del corso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orario del corso
 DocType: Maintenance Visit,Completion Status,Stato Completamento
 DocType: HR Settings,Enter retirement age in years,Inserire l&#39;età pensionabile in anni
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Obiettivo Magazzino
@@ -886,7 +891,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Consenti superamento ricezione o invio fino a questa percentuale
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Importa presenze
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tutti i Gruppi
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tutti i Gruppi
 DocType: Process Payroll,Activity Log,Registro attività
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Utile / Perdita
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Comporre automaticamente il messaggio di presentazione delle transazioni .
@@ -897,7 +902,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordine d&#39;acquisto a pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtà Proiettata
 DocType: Sales Invoice,Payment Due Date,Pagamento Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Prodotto Modello {0} esiste già con gli stessi attributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Apertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Aperto per fare
 DocType: Notification Control,Delivery Note Message,Messaggio del Documento di Trasporto
@@ -913,7 +918,7 @@
 DocType: Item Reorder,Re-Order Qty,Quantità Ri-ordino
 DocType: Leave Block List Date,Leave Block List Date,Lascia Block List Data
 DocType: Pricing Rule,Price or Discount,Prezzo o Sconto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totale oneri addebitati in Acquisto tabella di carico Gli articoli devono essere uguale Totale imposte e oneri
 DocType: Sales Team,Incentives,Incentivi
 DocType: SMS Log,Requested Numbers,Numeri richiesti
 DocType: Production Planning Tool,Only Obtain Raw Materials,Ottenere solo materie prime
@@ -929,7 +934,7 @@
 DocType: Hub Settings,Publish Pricing,Pubblicare Prezzi
 DocType: Notification Control,Expense Claim Rejected Message,Messaggio Rimborso Spese Rifiutato
 ,Available Qty,Disponibile Quantità
-DocType: Purchase Taxes and Charges,On Previous Row Total,Sul Fila Indietro totale
+DocType: Purchase Taxes and Charges,On Previous Row Total,Sulla riga totale precedente
 DocType: Purchase Invoice Item,Rejected Qty,Quantità Rifiutato
 DocType: Salary Slip,Working Days,Giorni lavorativi
 DocType: Serial No,Incoming Rate,Tasso in ingresso
@@ -942,13 +947,13 @@
 DocType: Supplier Quotation,Is Subcontracted,È in Conto Lavorazione
 DocType: Item Attribute,Item Attribute Values,Valori Attributi Articolo
 DocType: Examination Result,Examination Result,L&#39;esame dei risultati
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,RICEVUTA
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,RICEVUTA
 ,Received Items To Be Billed,Oggetti ricevuti da fatturare
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Buste paga presentate
 DocType: Employee,Ms,Sig.ra
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Maestro del tasso di cambio di valuta .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Riferimento Doctype deve essere uno dei {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Riferimento Doctype deve essere uno dei {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Impossibile trovare tempo di slot nei prossimi {0} giorni per l&#39;operazione {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiale Piano per sub-assemblaggi
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,I partner di vendita e Territorio
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Non è possibile creare automaticamente account in quanto vi è già magazzino saldo del conto. È necessario creare un account corrispondente prima di poter effettuare una voce su questo magazzino
@@ -971,15 +976,14 @@
 DocType: Supplier,Default Payable Accounts,Contabilità Fornitori Predefinita
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} non è attiva o non esiste
 DocType: Fee Structure,Components,componenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Voce Varianti {0} aggiornato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Si prega di inserire Asset categoria al punto {0}
 DocType: Quality Inspection Reading,Reading 6,Lettura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Impossibile {0} {1} {2} senza alcuna fattura in sospeso negativo
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Acquisto Advance Fattura
 DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Riga {0}: ingresso di credito non può essere collegato con un {1}
 apps/erpnext/erpnext/config/accounts.py +215,Define budget for a financial year.,Definire bilancio per l&#39;anno finanziario.
-DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,Conto predefinito Banca / Contante  aggiornato automaticamente in Fatture POS quando selezioni questo metodo
+DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,"""Conto Banca / Cassa predefinito"" sarà verrà automaticamente aggiornato nella fattura del punto vendita quando sarà selezionata questa modalità."
 DocType: Lead,LEAD-,LEAD-
 DocType: Employee,Permanent Address Is,Indirizzo permanente è
 DocType: Production Order Operation,Operation completed for how many finished goods?,Operazione completata per quanti prodotti finiti?
@@ -988,11 +992,11 @@
 DocType: Item,Is Purchase Item,È Acquisto Voce
 DocType: Asset,Purchase Invoice,Fattura di Acquisto
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nuova fattura di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nuova fattura di vendita
 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
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Data e Data di chiusura di apertura dovrebbe essere entro lo stesso anno fiscale
 DocType: Lead,Request for Information,Richiesta di Informazioni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sincronizzazione offline fatture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sincronizzazione offline fatture
 DocType: Payment Request,Paid,Pagato
 DocType: Program Fee,Program Fee,Costo del programma
 DocType: Salary Slip,Total in words,Totale in parole
@@ -1002,18 +1006,18 @@
 DocType: Employee Loan,Sanctioned,sanzionato
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,Obbligatorio. Forse non è stato definito il vambio di valuta
 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Pubblicare sul sito web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Le spedizioni verso i clienti.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Fornitore Data fattura non può essere maggiore di Data Pubblicazione
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,La data Fattura Fornitore non può essere superiore della Data Registrazione
 DocType: Purchase Invoice Item,Purchase Order Item,Ordine di acquisto dell&#39;oggetto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,Proventi indiretti
 DocType: Student Attendance Tool,Student Attendance Tool,Strumento Presenze
 DocType: Cheque Print Template,Date Settings,Impostazioni della data
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varianza
 ,Company Name,Nome Azienda
-DocType: SMS Center,Total Message(s),Messaggio Total ( s )
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Selezionare la voce per il trasferimento
+DocType: SMS Center,Total Message(s),Totale Messaggi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1024,8 +1028,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Predefinito conto bancario / Cash sarà aggiornato automaticamente in Stipendio diario quando viene selezionata questa modalità.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Gli intervalli di codice Grade {0} si sovrappone alla intervalli di grado per gli altri gradi. Si prega di controllare gli intervalli di {0} e {1} e riprovare
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Società di valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Riga # {0}: la velocità non può essere superiore alla velocità utilizzata in {1} {2}
@@ -1037,31 +1039,31 @@
 DocType: BOM Website Item,BOM Website Item,Distinta Base dell'Articolo sul Sito Web
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Carica la tua testa lettera e logo. (È possibile modificare in un secondo momento).
 DocType: Timesheet Detail,Bill,Conto
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Successivo ammortamento Data viene inserita come data passata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bianco
 DocType: SMS Center,All Lead (Open),Tutti i Lead (Aperti)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riga {0}: Qtà non disponibile per {4} in magazzino {1} al momento della pubblicazione della voce ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Ottenere anticipo pagamento
 DocType: Item,Automatically Create New Batch,Crea automaticamente un nuovo batch
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Fare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Fare
 DocType: Student Admission,Admission Start Date,L&#39;ammissione Data di inizio
-DocType: Journal Entry,Total Amount in Words,Importo totale in parole
+DocType: Journal Entry,Total Amount in Words,Importo Totale in lettere
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Si è verificato un errore . Una ragione probabile potrebbe essere che non si è salvato il modulo. Si prega di contattare support@erpnext.com se il problema persiste .
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,Il mio carrello
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Tipo ordine deve essere uno dei {0}
 DocType: Lead,Next Contact Date,Data del contatto successivo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Quantità di apertura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Si prega di inserire account per quantità di modifica
 DocType: Student Batch Name,Student Batch Name,Studente Batch Nome
 DocType: Holiday List,Holiday List Name,Nome elenco vacanza
-DocType: Repayment Schedule,Balance Loan Amount,Saldo del prestito Importo
+DocType: Repayment Schedule,Balance Loan Amount,Importo del prestito di bilancio
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,Programma del corso
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,Stock Options
 DocType: Journal Entry Account,Expense Claim,Rimborso Spese
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,Vuoi davvero ripristinare questo bene rottamato?
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},Quantità per {0}
-DocType: Leave Application,Leave Application,Lascia Applicazione
-apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Lascia strumento Allocazione
+DocType: Leave Application,Leave Application,Applicazione Permessi
+apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,Strumento Allocazione Permessi
 DocType: Leave Block List,Leave Block List Dates,Lascia Blocco Elenco date
 DocType: Workstation,Net Hour Rate,Tasso Netto Orario
 DocType: Landed Cost Purchase Receipt,Landed Cost Purchase Receipt,Landed Cost ricevuta di acquisto
@@ -1071,10 +1073,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Si prega di specificare un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Eliminati elementi senza variazione di quantità o valore.
 DocType: Delivery Note,Delivery To,Consegna a
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tavolo attributo è obbligatorio
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tavolo attributo è obbligatorio
 DocType: Production Planning Tool,Get Sales Orders,Ottieni Ordini di Vendita
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} non può essere negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sconto
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sconto
 DocType: Asset,Total Number of Depreciations,Numero totale degli ammortamenti
 DocType: Sales Invoice Item,Rate With Margin,Vota con margine
 DocType: Workstation,Wages,Salari
@@ -1085,11 +1087,11 @@
 DocType: Item,Manufacturer,Produttore
 DocType: Landed Cost Item,Purchase Receipt Item,RICEVUTA articolo
 DocType: Purchase Receipt,PREC-RET-,PREC-RET-
-DocType: POS Profile,Sales Invoice Payment,Fattura di vendita pagamento
+DocType: POS Profile,Sales Invoice Payment,Pagamento Fattura di vendita
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Riservato a ordini di vendita / Magazzino prodotti finiti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Importo di vendita
 DocType: Repayment Schedule,Interest Amount,Ammontare Interessi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione spese per questo record. Aggiorna lo Stato e salva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu sei il Responsabile approvazione spese per questo record. Aggiorna lo Stato e salva
 DocType: Serial No,Creation Document No,Creazione di documenti No
 DocType: Issue,Issue,Contestazione
 DocType: Asset,Scrapped,Demolita
@@ -1097,12 +1099,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributi per voce Varianti. P. es. Taglia, colore etc."
 DocType: Purchase Invoice,Returns,Restituisce
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} è sotto contratto di manutenzione fino a {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Reclutamento
 DocType: Lead,Organization Name,Nome organizzazione
 DocType: Tax Rule,Shipping State,Stato Spedizione
 ,Projected Quantity as Source,Proiezione Quantità come sorgente
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,L'oggetto deve essere aggiunto utilizzando 'ottenere elementi dal Receipts Purchase pulsante
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Includi elementi non-azione
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Spese di vendita
@@ -1110,26 +1112,26 @@
 DocType: GL Entry,Against,Previsione
 DocType: Item,Default Selling Cost Center,Centro di costo di vendita di default
 DocType: Sales Partner,Implementation Partner,Partner di implementazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,CAP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,CAP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} è {1}
 DocType: Opportunity,Contact Info,Info Contatto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Creazione scorte
 DocType: Packing Slip,Net Weight UOM,Peso Netto (UdM)
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Risultati
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Risultati
 DocType: Item,Default Supplier,Fornitore Predefinito
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nel corso di produzione Allowance Percentuale
 DocType: Employee Loan,Repayment Schedule,Piano di rimborso
-DocType: Shipping Rule Condition,Shipping Rule Condition,Spedizione Regola Condizioni
+DocType: Shipping Rule Condition,Shipping Rule Condition,Condizioni Regola di Spedizione
 DocType: Holiday List,Get Weekly Off Dates,Ottieni cadenze settimanali
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data di Fine non può essere inferiore a Data di inizio
 DocType: Sales Person,Select company name first.,Selezionare il nome della società prima.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Preventivi ricevuti dai Fornitori.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Per {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Età media
 DocType: School Settings,Attendance Freeze Date,Data di congelamento della frequenza
 DocType: Opportunity,Your sales person who will contact the customer in future,Il vostro venditore che contatterà il cliente in futuro
-apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere organizzazioni o individui .
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,Elencare alcuni dei vostri fornitori . Potrebbero essere società o persone fisiche
 apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,Visualizza tutti i prodotti
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),Età di piombo minima (giorni)
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,tutte le Distinte Materiali
@@ -1141,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Area Chiave Prestazioni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Trasporto
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,attributo non valido
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} deve essere confermato
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} deve essere confermato
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},La quantità deve essere minore o uguale a {0}
 DocType: SMS Center,Total Characters,Totale Personaggi
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Seleziona BOM BOM in campo per la voce {0}
@@ -1150,9 +1152,9 @@
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,Contributo%
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Numeri di registrazione dell'azienda per il vostro riferimento. numero Tassa, ecc"
 DocType: Sales Partner,Distributor,Distributore
-DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Carrello Regola Spedizione
+DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regola Spedizione del Carrello
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,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 +52,Please set 'Apply Additional Discount On',Impostare &#39;Applica ulteriore sconto On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Da Campo deve essere inferiore al campo
 DocType: Global Defaults,Global Defaults,Predefiniti Globali
@@ -1162,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Inizio Anno
 DocType: Purchase Invoice,Start date of current invoice's period,Data finale del periodo di fatturazione corrente Avviare
 DocType: Salary Slip,Leave Without Pay,Lascia senza stipendio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Capacity Planning Errore
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Capacity Planning Errore
 ,Trial Balance for Party,Bilancio di verifica per partita
 DocType: Lead,Consultant,Consulente
 DocType: Salary Slip,Earnings,Rendimenti
@@ -1173,25 +1175,24 @@
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},Un altro record di bilancio &#39;{0}&#39; esiste già contro {1} &#39;{2}&#39; per l&#39;anno fiscale {3}
 apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date','Data Inizio effettivo' non può essere maggiore di 'Data di fine effettiva'
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,Amministrazione
-DocType: Cheque Print Template,Payer Settings,Impostazioni Payer
+DocType: Cheque Print Template,Payer Settings,Impostazioni Pagatore
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Questo sarà aggiunto al codice articolo della variante. Ad esempio, se la sigla è ""SM"", e il codice articolo è ""T-SHIRT"", il codice articolo della variante sarà ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Paga Netta (in lettere) sarà visibile una volta che si salva la busta paga.
 DocType: Purchase Invoice,Is Return,È Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Ritorno / Nota di Debito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Ritorno / Nota di Debito
 DocType: Price List Country,Price List Country,Listino Prezzi Nazione
-DocType: Item,UOMs,UOMs
+DocType: Item,UOMs,Unità di Misure
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} numeri di serie validi per l'articolo {1}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +57,Item Code cannot be changed for Serial No.,Codice Articolo non può essere modificato per N. di Serie
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS Profilo {0} già creato per l&#39;utente: {1} e società {2}
-DocType: Sales Invoice Item,UOM Conversion Factor,Fattore di Conversione UOM
+DocType: Sales Invoice Item,UOM Conversion Factor,Fattore di conversione Unità di Misura
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Inserisci Codice Articolo per ottenere il numero di lotto
 DocType: Stock Settings,Default Item Group,Gruppo Articoli Predefinito
 DocType: Employee Loan,Partially Disbursed,parzialmente erogato
-DocType: Grading Structure,Grading System Name,Nome Grading System
-apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banca dati dei fornitori.
+apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Database dei fornitori.
 DocType: Account,Balance Sheet,Bilancio Patrimoniale
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centro di costo per articoli con Codice Prodotto '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modalità di pagamento non è configurato. Si prega di verificare, se account è stato impostato sulla modalità di pagamento o su POS profilo."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Il rivenditore riceverà un promemoria in questa data per contattare il cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Lo stesso articolo non può essere inserito più volte.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ulteriori conti possono essere fatti in Gruppi, ma le voci possono essere fatte contro i non-Gruppi"
@@ -1203,14 +1204,14 @@
 ,Purchase Order Items To Be Billed,Ordine di Acquisto Articoli da fatturare
 DocType: Purchase Invoice Item,Net Rate,Tasso Netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Acquisto Articolo Fattura
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Inserimenti Inventario e Libro Mastro sono aggiornati per le Ricevute di Acquisto selezionate
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Inserimenti Inventario e Libro Mastro sono aggiornati per le Ricevute di Acquisto selezionate
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Articolo 1
 DocType: Holiday,Holiday,Vacanza
 DocType: Support Settings,Close Issue After Days,Chiudi problema dopo giorni
 DocType: Leave Control Panel,Leave blank if considered for all branches,Lasciare vuoto se considerato per tutti i rami
 DocType: Bank Guarantee,Validity in Days,Validità in giorni
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-forma non è applicabile per la fattura: {0}
-DocType: Payment Reconciliation,Unreconciled Payment Details,Non riconciliate Particolari di pagamento
+DocType: Payment Reconciliation,Unreconciled Payment Details,Dettagli di pagamento non riconciliati
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,Conteggio ordini
 DocType: Global Defaults,Current Fiscal Year,Anno Fiscale Corrente
 DocType: Purchase Order,Group same items,stessi articoli di gruppo
@@ -1228,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Attività svolta
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Specifica almeno un attributo nella tabella Attributi
 DocType: Announcement,All Students,Tutti gli studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Voce {0} deve essere un elemento non-azione
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,vista Ledger
 DocType: Grading Scale,Intervals,intervalli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,La prima
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"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/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,No. studente in mobilità
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto del Mondo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,L'articolo {0} non può avere Lotto
@@ -1255,7 +1256,7 @@
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,Mantenere la stessa tariffa per l'intero ciclo di acquisto
 DocType: Opportunity Item,Opportunity Item,Opportunità articolo
 ,Student and Guardian Contact Details,Student and Guardian Contatti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} Indirizzo e-mail è tenuto ad inviare e-mail
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,Riga {0}: Per il fornitore {0} l'Indirizzo e-mail è richiesto per inviare l'e-mail
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,Apertura temporanea
 ,Employee Leave Balance,Saldo del Congedo Dipendete
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},Il Saldo del Conto {0} deve essere sempre {1}
@@ -1271,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Il pagamento dello stipendio da {0} a {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Sales Order {0} non è valido
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} non è valido
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Gli ordini di acquisto ti aiutano a pianificare e monitorare i tuoi acquisti
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Siamo spiacenti , le aziende non possono essere unite"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",La quantità emissione / trasferimento totale {0} in Materiale Richiesta {1} \ non può essere maggiore di quantità richiesta {2} per la voce {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Piccolo
@@ -1290,14 +1291,14 @@
 DocType: Employee,Place of Issue,Luogo di emissione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +63,Contract,contratto
 DocType: Email Digest,Add Quote,Aggiungere Citazione
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,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 +860,UOM coversion factor required for UOM: {0} in Item: {1},Fattore di conversione Unità di Misura è obbligatorio per Unità di Misura: {0} alla voce: {1}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,spese indirette
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Riga {0}: Quantità è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,agricoltura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Website Immagine dovrebbe essere un file o URL del sito web pubblico
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Questo è un gruppo elemento principale e non può essere modificato .
@@ -1314,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Numero di rotolo di gruppo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Per {0}, solo i conti di credito possono essere collegati contro un'altra voce di addebito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totale di tutti i pesi compito dovrebbe essere 1. Regolare i pesi di tutte le attività del progetto di conseguenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Il Documento di Trasporto {0} non è confermato
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regola Prezzi viene prima selezionato in base al 'applicare sul campo', che può essere prodotto, Articolo di gruppo o di marca."
 DocType: Hub Settings,Seller Website,Venditore Sito
 DocType: Item,ITEM-,ARTICOLO-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totale percentuale assegnato per il team di vendita dovrebbe essere di 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Stato ordine di produzione è {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stato ordine di produzione è {0}
 DocType: Appraisal Goal,Goal,Obiettivo
 DocType: Sales Invoice Item,Edit Description,Modifica Descrizione
 ,Team Updates,squadra Aggiornamenti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,per Fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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),Somma totale (valuta Azienda)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Creare Formato di stampa
@@ -1336,12 +1337,12 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,Nota : Questo centro di costo è un gruppo . Non può fare scritture contabili contro i gruppi .
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,Esiste magazzino Bambino per questo magazzino. Non è possibile eliminare questo magazzino.
 DocType: Item,Website Item Groups,Sito gruppi di articoli
-DocType: Purchase Invoice,Total (Company Currency),Totale (Società Valuta)
+DocType: Purchase Invoice,Total (Company Currency),Totale (Valuta Società)
 apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,Numero di serie {0} è entrato più di una volta
-DocType: Depreciation Schedule,Journal Entry,Libro Giornale
+DocType: Depreciation Schedule,Journal Entry,Registrazione Contabile
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} articoli in lavorazione
-DocType: Workstation,Workstation Name,Nome workstation
-DocType: Grade Interval,Grade Code,Codice grado
+DocType: Workstation,Workstation Name,Nome Stazione di lavoro
+DocType: Grading Scale Interval,Grade Code,Codice grado
 DocType: POS Item Group,POS Item Group,POS Gruppo Articolo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email di Sintesi:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Distinta Base {0} non appartiene alla voce {1}
@@ -1357,9 +1358,9 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,ricorrente Fino
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Seleziona una società
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Seleziona una società
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Lascia Privilege
-DocType: Purchase Invoice,Supplier Invoice Date,Fornitore Data fattura
+DocType: Purchase Invoice,Supplier Invoice Date,Data fattura Fornitore
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,È necessario abilitare Carrello
 DocType: Payment Entry,Writeoff,Cancellare
 DocType: Appraisal Template Goal,Appraisal Template Goal,Valutazione Modello Obiettivo
@@ -1373,7 +1374,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,cibo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gamma invecchiamento 3
 DocType: Maintenance Schedule Item,No of Visits,Num. di Visite
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Segna come Presenza
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Segna come Presenza
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Il programma di manutenzione {0} esiste contro {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,studente iscrivendosi
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta del Conto di chiusura deve essere {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Somma dei punti per tutti gli obiettivi dovrebbero essere 100. E &#39;{0}
@@ -1382,7 +1384,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},Apri la Distinta Base {0}
 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
-DocType: Purchase Invoice Item,UOM,UOM
+DocType: Purchase Invoice Item,UOM,Unità di misura
 DocType: Rename Tool,Utilities,Utilità
 DocType: Purchase Invoice Item,Accounting,Contabilità
 DocType: Employee,EMP/,EMP /
@@ -1398,12 +1400,12 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Media giornaliera in uscita
 DocType: POS Profile,Campaign,Campagna
 DocType: Supplier,Name and Type,Nome e tipo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Stato approvazione deve essere ' Approvato ' o ' Rifiutato '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Stato approvazione deve essere ' Approvato ' o ' Rifiutato '
 DocType: Purchase Invoice,Contact Person,Persona Contatto
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data prevista di inizio' non può essere maggiore di 'Data di fine prevista'
 DocType: Course Scheduling Tool,Course End Date,Corso Data fine
 DocType: Holiday List,Holidays,Vacanze
-DocType: Sales Order Item,Planned Quantity,Prevista Quantità
+DocType: Sales Order Item,Planned Quantity,Quantità Prevista
 DocType: Purchase Invoice Item,Item Tax Amount,Articolo fiscale Ammontare
 DocType: Item,Maintain Stock,Scorta da mantenere
 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
@@ -1421,14 +1423,15 @@
 DocType: Sales Invoice,Shipping Address Name,Indirizzo Shipping Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,non può essere superiore a 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,non può essere superiore a 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,L'articolo {0} non è in Giagenza
 DocType: Maintenance Visit,Unscheduled,Non in programma
 DocType: Employee,Owned,Di proprietà
 DocType: Salary Detail,Depends on Leave Without Pay,Dipende in aspettativa senza assegni
 DocType: Pricing Rule,"Higher the number, higher the priority","Più alto è il numero, maggiore è la priorità"
 ,Purchase Invoice Trends,Acquisto Tendenze Fattura
 DocType: Employee,Better Prospects,Prospettive Migliori
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riga # {0}: Il batch {1} ha solo {2} qty. Si prega di selezionare un altro batch che dispone di {3} qty disponibile o si divide la riga in più righe, per consegnare / emettere da più batch"
 DocType: Vehicle,License Plate,Targa
 DocType: Appraisal,Goals,Obiettivi
 DocType: Warranty Claim,Warranty / AMC Status,Garanzia / AMC Stato
@@ -1447,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Il dipendente non può riportare a se stesso.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se l'account viene bloccato , le voci sono autorizzati a utenti con restrizioni ."
 DocType: Email Digest,Bank Balance,Saldo bancario
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Ingresso contabile per {0}: {1} può essere fatto solo in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilo Posizione , qualifiche richieste ecc"
 DocType: Journal Entry Account,Account Balance,Saldo a bilancio
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regola fiscale per le operazioni.
@@ -1456,9 +1459,9 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}:Per la Contabilità Clienti è necessario specificare un Cliente  {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Totale tasse e spese (Azienda valuta)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostra di P &amp; L saldi non chiusa anno fiscale di
-DocType: Shipping Rule,Shipping Account,Account Spedizione
+DocType: Shipping Rule,Shipping Account,Conto di Spedizione
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Il conto {2} è inattivo
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Creare gli Ordini di Vendita ti aiuta a pianificare la lavorazione e a consegnare entro i tempi stabiliti
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Creare gli Ordini di Vendita ti aiuta a pianificare la lavorazione e a consegnare entro i tempi stabiliti
 DocType: Quality Inspection,Readings,Letture
 DocType: Stock Entry,Total Additional Costs,Totale Costi aggiuntivi
 DocType: Course Schedule,SH,SH
@@ -1469,12 +1472,12 @@
 DocType: Shipping Rule Condition,To Value,Per Valore
 DocType: Asset Movement,Stock Manager,Responsabile di magazzino
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Deposito Origine è obbligatorio per riga {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Documento di trasporto
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Documento di trasporto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Affitto Ufficio
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Impostazioni del gateway configurazione di SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importazione non riuscita!
 apps/erpnext/erpnext/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
+DocType: Workstation Working Hour,Workstation Working Hour,Ore di lavoro Workstation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,analista
 DocType: Item,Inventory,Inventario
 DocType: Item,Sales Details,Dettagli di vendita
@@ -1491,11 +1494,11 @@
 DocType: Company,Services,Servizi
 DocType: HR Settings,Email Salary Slip to Employee,E-mail busta paga per i dipendenti
 DocType: Cost Center,Parent Cost Center,Parent Centro di costo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selezionare Fornitore Possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Selezionare il Fornitore Possibile
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostra chiusa
 DocType: Leave Type,Is Leave Without Pay,È lasciare senza stipendio
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset categoria è obbligatoria per voce delle immobilizzazioni
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nessun record trovato nella tabella di Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Questo {0} conflitti con {1} per {2} {3}
 DocType: Student Attendance Tool,Students HTML,Gli studenti HTML
@@ -1513,7 +1516,7 @@
 DocType: Student,Date of Leaving,Data di partenza
 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/utilities/activation.py +64,Create Leads,Creare un Lead
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Creare un Lead
 DocType: Maintenance Schedule,Schedules,Orari
 DocType: Purchase Invoice Item,Net Amount,Importo Netto
 DocType: Purchase Order Item Supplied,BOM Detail No,Dettaglio BOM N.
@@ -1523,14 +1526,14 @@
 DocType: Maintenance Visit,Maintenance Visit,Visita di manutenzione
 DocType: Student,Leaving Certificate Number,Lasciando Numero del certificato
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,Disponibile Quantità Batch in magazzino
-apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aggiornamento Formato di stampa
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Update Print Format,Aggiornamento Formato di Stampa
 DocType: Landed Cost Voucher,Landed Cost Help,Landed Cost Aiuto
-DocType: Purchase Invoice,Select Shipping Address,Selezionare indirizzo di spedizione
+DocType: Purchase Invoice,Select Shipping Address,Selezionare Indirizzo di spedizione
 DocType: Leave Block List,Block Holidays on important days.,Vacanze di blocco nei giorni importanti.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,Contabilità Sommario Crediti
 DocType: Employee Loan,Monthly Repayment Amount,Ammontare Rimborso Mensile
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,Impostare campo ID utente in un record Employee impostare Ruolo Employee
-DocType: UOM,UOM Name,UOM Nome
+DocType: UOM,UOM Name,Nome Unità di Misura
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,Contributo Importo
 DocType: Purchase Invoice,Shipping Address,Indirizzo di spedizione
 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.,Questo strumento consente di aggiornare o correggere la quantità e la valutazione delle azioni nel sistema. Viene tipicamente utilizzato per sincronizzare i valori di sistema e ciò che esiste realmente in vostri magazzini.
@@ -1541,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,iscrizioni Programma
 DocType: Sales Invoice Item,Brand Name,Nome Marchio
 DocType: Purchase Receipt,Transporter Details,Transporter Dettagli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Deposito di default è richiesto per gli elementi selezionati
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Scatola
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fornitore possibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Fornitore Possibile
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,L'Organizzazione
 DocType: Budget,Monthly Distribution,Distribuzione Mensile
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista Receiver è vuoto . Si prega di creare List Ricevitore
@@ -1551,7 +1554,7 @@
 DocType: Sales Partner,Sales Partner Target,Vendite Partner di destinazione
 DocType: Loan Type,Maximum Loan Amount,Importo massimo del prestito
 DocType: Pricing Rule,Pricing Rule,Regola Prezzi
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplica il numero di rotolo per lo studente {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplica il numero di rotolo per lo studente {0}
 DocType: Budget,Action if Annual Budget Exceeded,Azione da effettuarsi se si eccede il Budget Annuale
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Richiesta materiale per ordine d&#39;acquisto
 DocType: Shopping Cart Settings,Payment Success URL,Pagamento Successo URL
@@ -1572,35 +1575,35 @@
 DocType: Employee Loan,Repayment Method,Metodo di rimborso
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se selezionato, la pagina iniziale sarà il gruppo di default dell&#39;oggetto per il sito web"
 DocType: Quality Inspection Reading,Reading 4,Lettura 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM predefinito per {0} non trovato per il progetto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM predefinito per {0} non trovato per il progetto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Reclami per spese dell'azienda.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Gli studenti sono al cuore del sistema, aggiungere tutti gli studenti"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Gli studenti sono al cuore del sistema, aggiungere tutti gli studenti"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Data di Liquidazione {1} non può essere prima Assegno Data {2}
 DocType: Company,Default Holiday List,Lista vacanze predefinita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Riga {0}: From Time To Time e di {1} si sovrappone {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,Passività in Giacenza
 DocType: Purchase Invoice,Supplier Warehouse,Magazzino Fornitore
 DocType: Opportunity,Contact Mobile No,Cellulare Contatto
-,Material Requests for which Supplier Quotations are not created,Richieste di materiale con le quotazioni dei fornitori non sono creati
+,Material Requests for which Supplier Quotations are not created,Richieste di materiale per le quali non sono state create Quotazioni dal Fornitore
 DocType: Student Group,Set 0 for no limit,Impostare 0 per nessun limite
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Le giornate per cui si stanno segnando le ferie sono già di vacanze. Non è necessario chiedere un permesso.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Invia di nuovo pagamento Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nuovo compito
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Crea preventivo
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Crea preventivo
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Altri Reports
 DocType: Dependent Task,Dependent Task,Task dipendente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Fattore di conversione per unità di misura predefinita deve essere 1 in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Lascia di tipo {0} non può essere superiore a {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provare le operazioni per X giorni in programma in anticipo.
 DocType: HR Settings,Stop Birthday Reminders,Arresto Compleanno Promemoria
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Si prega di impostare di default Payroll conto da pagare in azienda {0}
 DocType: SMS Center,Receiver List,Lista Ricevitore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cerca articolo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Cerca articolo
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantità consumata
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variazione netta delle disponibilità
 DocType: Assessment Plan,Grading Scale,Scala di classificazione
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,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/manufacturing/doctype/production_order/production_order.py +600,Already completed,Già completato
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unità di misura {0} è stata inserita più volte nella tabella di conversione
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Già completato
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Richiesta di pagamento già esistente {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costo di elementi Emesso
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Quantità non deve essere superiore a {0}
@@ -1611,12 +1614,12 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +40,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 +43,Supplier Type master.,Fornitore Tipo master.
-DocType: Purchase Order Item,Supplier Part Number,Numero di parte del fornitore
+DocType: Purchase Order Item,Supplier Part Number,Numero di articolo del fornitore
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,Il tasso di conversione non può essere 0 o 1
 DocType: Sales Invoice,Reference Document,Documento di riferimento
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +180,{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
+DocType: Delivery Note,Vehicle Dispatch Date,Data Spedizione Veicolo
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,La Ricevuta di Acquisto {0} non è stata presentata
 DocType: Company,Default Payable Account,Conto da pagare Predefinito
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.","Impostazioni per in linea carrello della spesa, come le regole di trasporto, il listino prezzi ecc"
@@ -1630,20 +1633,21 @@
 DocType: BOM Item,BOM Item,BOM Articolo
 DocType: Appraisal,For Employee,Per Dipendente
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Crea una scrittura per l'esborso
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: Advance contro Fornitore deve essere addebito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riga {0}: L'anticipo verso Fornitore deve essere un debito
 DocType: Company,Default Values,Valori Predefiniti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Dell&#39;importo totale rimborsato
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Questo si basa su tronchi contro questo veicolo. Vedere cronologia sotto per i dettagli
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Collezionare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Contro Fornitore Invoice {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Al ricevimento della Fattura Fornitore {0} datata {1}
 DocType: Customer,Default Price List,Listino Prezzi Predefinito
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,record di Asset Movimento {0} creato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,record di Asset Movimento {0} creato
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Non è possibile cancellare l&#39;anno fiscale {0}. Anno fiscale {0} è impostato in modo predefinito in Impostazioni globali
 DocType: Journal Entry,Entry Type,Tipo voce
 ,Customer Credit Balance,Balance Credit clienti
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,Variazione Netta in Contabilità Fornitori
 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 +142,Update bank payment dates with journals.,Risale aggiornamento versamento bancario con riviste.
+apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,Aggiorna le date di pagamento bancario con il Giornale.
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,Prezzi
 DocType: Quotation,Term Details,Dettagli Termini
 DocType: Project,Total Sales Cost (via Sales Order),Costo totale di vendita (tramite ordine di vendita)
@@ -1654,18 +1658,18 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,Approvvigionamento
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nessuno articolo ha modifiche in termini di quantità o di valore.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Campo obbligatorio - Programma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Richiesta di Garanzia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Richiesta di Garanzia
 ,Lead Details,Dettagli Lead
 DocType: Salary Slip,Loan repayment,Rimborso del prestito
 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: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare pagamento sulla cancellazione di fattura
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,Scollegare il pagamento per la cancellazione della fattura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},lettura corrente dell&#39;odometro inserito deve essere maggiore di contachilometri iniziale veicolo {0}
-DocType: Shipping Rule Country,Shipping Rule Country,Regola Spedizione Nazione
-apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e presenze
+DocType: Shipping Rule Country,Shipping Rule Country,Regola Spedizione per Nazione
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,Permessi e Presenze
 DocType: Maintenance Visit,Partially Completed,Parzialmente completato
 DocType: Leave Type,Include holidays within leaves as leaves,Includere le vacanze entro i fogli come foglie
-DocType: Sales Invoice,Packed Items,Pranzo Articoli
+DocType: Sales Invoice,Packed Items,Articoli imballati
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,Richiesta Garanzia per N. Serie
 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","Sostituire un particolare distinta in tutte le altre distinte materiali in cui viene utilizzato. Essa sostituirà il vecchio link BOM, aggiornare i costi e rigenerare ""BOM Explosion Item"" tabella di cui al nuovo BOM"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total',&#39;Totale&#39;
@@ -1673,23 +1677,22 @@
 DocType: Employee,Permanent Address,Indirizzo permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Si prega di selezionare il codice articolo
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Si prega di selezionare il codice articolo
 DocType: Student Sibling,Studying in Same Institute,Studiare in stesso Istituto
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),Al Deposito (opzionale)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
-DocType: Payment Entry,Paid Amount (Company Currency),Importo versato (Società valuta)
+DocType: Payment Entry,Paid Amount (Company Currency),Importo pagato (valuta della società)
 DocType: Purchase Invoice,Additional Discount,Sconto aggiuntivo
-DocType: Selling Settings,Selling Settings,Vendere Impostazioni
+DocType: Selling Settings,Selling Settings,Impostazioni Vendite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +39,Online Auctions,Aste online
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,Si prega di specificare Quantitativo o Tasso di valutazione o di entrambi
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +17,Fulfillment,Compimento
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vedi Carrello
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Spese di Marketing
 ,Item Shortage Report,Report Carenza Articolo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Il peso è menzionato, \n prega di citare ""Peso UOM"" troppo"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Richiesta di materiale usata per l'entrata giacenza
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Successivo ammortamento Data è obbligatoria per i nuovi beni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Successivo ammortamento Data è obbligatoria per i nuovi beni
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separare il gruppo di corso per ogni batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unità singola di un articolo.
 DocType: Fee Category,Fee Category,Fee Categoria
@@ -1705,8 +1708,7 @@
 DocType: Course Assessment Criteria,Weightage,Pesa
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: E' richiesto il Centro di Costo per il Conto Economico {2}. Configura un Centro di Costo di default per l'azienda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nuovo contatto
 DocType: Territory,Parent Territory,Territorio genitore
 DocType: Quality Inspection Reading,Reading 2,Lettura 2
@@ -1722,8 +1724,8 @@
 DocType: Purchase Invoice,Notification Email Address,Indirizzo e-mail di notifica
 ,Item-wise Sales Register,Vendite articolo-saggio Registrati
 DocType: Asset,Gross Purchase Amount,Importo Acquisto Gross
-DocType: Asset,Depreciation Method,metodo di ammortamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Disconnesso
+DocType: Asset,Depreciation Method,Metodo di ammortamento
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Disconnesso
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,È questa tassa inclusi nel prezzo base?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Obiettivo totale
 DocType: Program Course,Required,richiesto
@@ -1733,20 +1735,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Riconciliazione JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Troppe colonne. Esportare il report e stamparlo utilizzando un foglio di calcolo.
 DocType: Purchase Invoice Item,Batch No,Lotto N.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Impossibile trovare tasso di cambio per {0} a {1} per la data {2}
 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
 DocType: Student Group Instructor,Student Group Instructor,Istruttore del gruppo di studenti
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,principale
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,principale
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Impostare prefisso per numerazione serie sulle transazioni
 DocType: Employee Attendance Tool,Employees HTML,Dipendenti HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,BOM default ({0}) deve essere attivo per questo articolo o il suo modello
 DocType: Employee,Leave Encashed?,Lascia non incassati?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Dal campo è obbligatorio
 DocType: Email Digest,Annual Expenses,Spese annuali
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Crea ordine d'acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Crea ordine d'acquisto
 DocType: SMS Center,Send To,Invia a
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Somma stanziata
@@ -1754,17 +1755,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Codice elemento Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Riconciliazione Giacenza
 DocType: Territory,Territory Name,Territorio Nome
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Specificare il magazzino Work- in- Progress prima della Conferma
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Specificare il magazzino Work- in- Progress prima della Conferma
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Richiedente per Lavoro.
 DocType: Purchase Order Item,Warehouse and Reference,Magazzino e Riferimenti
-DocType: Supplier,Statutory info and other general information about your Supplier,Informazioni obbligatorie e altre Informazioni Generali sul tuo Fornitore
+DocType: Supplier,Statutory info and other general information about your Supplier,Informazioni legali e altre Informazioni generali sul tuo Fornitore
 DocType: Item,Serial Nos and Batches,Numero e lotti seriali
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Forza del gruppo studente
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Contro diario {0} non ha alcun ineguagliata {1} entry
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Perizie
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Intervalli di classificazione
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prego entra
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Non può overbill per la voce {0} in riga {1} più di {2}. Per consentire over-billing, impostare in Impostazioni acquisto"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Si prega di impostare il filtro in base al punto o in un magazzino
@@ -1776,17 +1776,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} deve essere confermata
 DocType: Authorization Control,Authorization Control,Controllo Autorizzazioni
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Fila # {0}: Rifiutato Warehouse è obbligatoria per la voce respinto {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Versamento
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestisci i tuoi ordini
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pagamento
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestisci i tuoi ordini
 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 ordine di vendita {2}
 DocType: Employee,Salutation,Appellativo
 DocType: Course,Course Abbreviation,Abbreviazione corso
 DocType: Student Leave Application,Student Leave Application,Student Leave Application
 DocType: Item,Will also apply for variants,Si applica anche per le varianti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset non può essere annullato, in quanto è già {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} sulla mezza giornata su {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},l&#39;orario di lavoro totale non deve essere maggiore di ore di lavoro max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,On
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Articoli Combinati e tempi di vendita.
 DocType: Quotation Item,Actual Qty,Q.tà reale
 DocType: Sales Invoice Item,References,Riferimenti
@@ -1796,7 +1797,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hai inserito degli elementi duplicati . Si prega di correggere e riprovare .
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Movimento Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nuovo carrello
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Nuovo carrello
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,L'articolo {0} non è un elemento serializzato
 DocType: SMS Center,Create Receiver List,Crea Elenco Ricezione
 DocType: Vehicle,Wheels,Ruote
@@ -1808,7 +1809,7 @@
 DocType: Purchase Receipt Item Supplied,Consumed Qty,Q.tà Consumata
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,Telecomunicazioni
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),Indica che il pacchetto è una parte di questa consegna (solo Bozza)
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Aggiungi Metodo di Pagamento
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +36,Make Payment Entry,Effettua Ricevuta di Pagamento
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +126,Quantity for Item {0} must be less than {1},Quantità per la voce {0} deve essere inferiore a {1}
 ,Sales Invoice Trends,Fattura di vendita Tendenze
 DocType: Leave Application,Apply / Approve Leaves,Applicare / Approva Leaves
@@ -1828,21 +1829,21 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Disabilita la creazione di registri di tempo contro gli ordini di produzione. Le operazioni non devono essere monitorati contro ordine di produzione
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ha varianti
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Hai già selezionato elementi da {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome della distribuzione mensile
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,L&#39;ID batch è obbligatorio
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,L&#39;ID batch è obbligatorio
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Fattura ricorrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestione progetti
 DocType: Supplier,Supplier of Goods or Services.,Fornitore di beni o servizi.
 DocType: Budget,Fiscal Year,Anno Fiscale
-DocType: Vehicle Log,Fuel Price,Fuel Prezzo
+DocType: Vehicle Log,Fuel Price,Prezzo Carburante
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Un Bene Strumentale  deve essere un Bene Non di Magazzino
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bilancio non può essere assegnato contro {0}, in quanto non è un conto entrate o uscite"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Raggiunto
 DocType: Student Admission,Application Form Route,Modulo di domanda di percorso
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territorio / Cliente
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territorio / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,p. es. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Lascia tipo {0} non può essere assegnato in quanto si lascia senza paga
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a fatturare importo residuo {2}
@@ -1862,15 +1863,15 @@
 ,Serial No Status,Serial No Stato
 DocType: Payment Entry Reference,Outstanding,eccezionale
 ,Daily Timesheet Summary,Riepilogo timesheet giornaliero
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Riga {0}: Per impostare {1} periodicità, differenza tra da e per la data \
  deve essere maggiore o uguale a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Questo si basa sui movimenti di magazzino. Vedere {0} per i dettagli
 DocType: Pricing Rule,Selling,Vendite
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Importo {0} {1} dedotto contro {2}
 DocType: Employee,Salary Information,Informazioni stipendio
 DocType: Sales Person,Name and Employee ID,Nome e ID Dipendente
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,La Data di Scadenza non può essere antecedente alla Data di Registrazione
 DocType: Website Item Group,Website Item Group,Sito Gruppo Articolo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Dazi e tasse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Inserisci Data di riferimento
@@ -1882,14 +1883,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Non può consultare numero di riga maggiore o uguale al numero di riga corrente per questo tipo di carica
 DocType: Asset,Sold,Venduto
 ,Item-wise Purchase History,Articolo-saggio Cronologia acquisti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Si prega di cliccare su ' Generate Schedule ' a prendere Serial No aggiunto per la voce {0}
 DocType: Account,Frozen,Congelato
 ,Open Production Orders,Aprire ordini di produzione
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Importo base (in valuta principale)
 DocType: Payment Reconciliation Payment,Reference Row,Riferimento Row
 DocType: Installation Note,Installation Time,Tempo di installazione
 DocType: Sales Invoice,Accounting Details,Dettagli contabile
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Eliminare tutte le Operazioni per questa Azienda
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investimenti
 DocType: Issue,Resolution Details,Dettagli risoluzione
@@ -1921,13 +1922,13 @@
 DocType: Discussion,Discussion,Discussione
 DocType: Payment Entry,Transaction ID,ID transazione
 DocType: Employee,Resignation Letter Date,Lettera di dimissioni Data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regole dei prezzi sono ulteriormente filtrati in base alla quantità.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Impostare la data di unione per dipendente {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Importo totale di fatturazione (tramite Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ripetere Revenue clienti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
-apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,coppia
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve avere il ruolo 'Approvatore Spese'
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Coppia
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Selezionare Distinta Materiali e Quantità per la  Produzione
 DocType: Asset,Depreciation Schedule,piano di ammortamento
 DocType: Bank Reconciliation Detail,Against Account,Previsione Conto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,La data di mezza giornata deve essere compresa da Data a Data
@@ -1940,24 +1941,25 @@
 DocType: Employee,Personal Details,Dettagli personali
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Si prega di impostare &#39;Asset Centro ammortamento dei costi&#39; in compagnia {0}
 ,Maintenance Schedules,Programmi di manutenzione
-DocType: Task,Actual End Date (via Time Sheet),Actual Data fine (da Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
+DocType: Task,Actual End Date (via Time Sheet),Data di fine effettiva (da Time Sheet)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Importo {0} {1} contro {2} {3}
 ,Quotation Trends,Tendenze di preventivo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Gruppo Articoli non menzionato nell'Articolo principale per l'Articolo {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In attesa di Importo
 DocType: Purchase Invoice Item,Conversion Factor,Fattore di Conversione
 DocType: Purchase Order,Delivered,Consegnato
-,Vehicle Expenses,spese del veicolo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
+,Vehicle Expenses,Spese del veicolo
+DocType: Serial No,Invoice Details,Dettagli della fattura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valore atteso dopo la vita utile deve essere maggiore o uguale a {0}
 DocType: Purchase Receipt,Vehicle Number,Numero di veicoli
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data in cui la fattura ricorrente si concluderà
 DocType: Employee Loan,Loan Amount,Ammontare del prestito
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},Riga {0}: Distinta materiali non trovato per la voce {1}
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,Totale foglie assegnati {0} non può essere inferiore a foglie già approvati {1} per il periodo
 DocType: Journal Entry,Accounts Receivable,Conti esigibili
-,Supplier-Wise Sales Analytics,Fornitore - Wise vendita Analytics
+,Supplier-Wise Sales Analytics,Estensione statistiche di Vendita Fornitore
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,Inserisci Importo pagato
 DocType: Salary Structure,Select employees for current Salary Structure,Selezionare i dipendenti per i struttura di stipendio
 DocType: Production Order,Use Multi-Level BOM,Utilizzare BOM Multi-Level
@@ -1968,12 +1970,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,schede attività
 DocType: HR Settings,HR Settings,Impostazioni HR
 DocType: Salary Slip,net pay info,Informazioni retribuzione netta
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Rimborso spese in attesa di approvazione. Solo il Responsabile Spese può modificarne lo stato.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Rimborso spese in attesa di approvazione. Solo il Responsabile Spese può modificarne lo stato.
 DocType: Email Digest,New Expenses,nuove spese
 DocType: Purchase Invoice,Additional Discount Amount,Ulteriori Importo Sconto
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Quantità deve essere 1, poiche' si tratta di un Bene Strumentale. Si prega di utilizzare riga separata per quantita' multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Lascia permesso blocco lista
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,L'abbr. non può essere vuota o spazio
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppo di Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sportivo
 DocType: Loan Type,Loan Name,Nome prestito
@@ -1984,6 +1986,7 @@
 ,Customer Acquisition and Loyalty,Acquisizione e fidelizzazione dei clienti
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazzino dove si conservano Giacenze di Articoli Rifiutati
 DocType: Production Order,Skip Material Transfer,Salta il trasferimento dei materiali
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Impossibile trovare il tasso di cambio per {0} a {1} per la data chiave {2}. Si prega di creare un record Exchange Exchange manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Il tuo anno finanziario termina il
 DocType: POS Profile,Price List,Listino Prezzi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} è ora l'anno fiscale predefinito. Si prega di aggiornare il browser perché la modifica abbia effetto .
@@ -1998,21 +2001,21 @@
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,A seguito di richieste di materiale sono state sollevate automaticamente in base al livello di riordino della Voce
 DocType: Email Digest,Pending Sales Orders,In attesa di ordini di vendita
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Account {0} non valido. La valuta del conto deve essere {1}
-apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore UOM conversione è necessaria in riga {0}
+apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fattore di conversione Unità di Misurà è obbligatoria sulla riga {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno dei ordini di vendita, fattura di vendita o diario"
 DocType: Salary Component,Deduction,Deduzioni
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Riga {0}: From Time To Time ed è obbligatoria.
 DocType: Stock Reconciliation Item,Amount Difference,importo Differenza
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Prezzo Articolo aggiunto per {0} in Listino Prezzi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Inserisci ID dipendente di questa persona di vendite
 DocType: Territory,Classification of Customers by region,Classificazione dei Clienti per regione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Differenza L&#39;importo deve essere pari a zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Differenza L&#39;importo deve essere pari a zero
 DocType: Project,Gross Margin,Margine lordo
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Inserisci Produzione articolo prima
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calcolato equilibrio estratto conto
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utente disabilitato
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Preventivo
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Preventivo
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Deduzione totale
 ,Production Analytics,Analytics di produzione
@@ -2021,9 +2024,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,L'articolo {0} è già stato restituito
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,**Anno Fiscale** rappresenta un anno contabile. Tutte le voci contabili e le altre operazioni importanti sono tracciati per **Anno Fiscale**.
 DocType: Opportunity,Customer / Lead Address,Indirizzo Cliente / Lead
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Attenzione: certificato SSL non valido sull&#39;attaccamento {0}
 DocType: Student Admission,Eligibility,Eleggibilità
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","I Leads ti aiutano ad incrementare il tuo business, aggiungi tutti i tuoi contatti come tuoi leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","I Leads ti aiutano ad incrementare il tuo business, aggiungi tutti i tuoi contatti come tuoi leads"
 DocType: Production Order Operation,Actual Operation Time,Tempo lavoro effettiva
 DocType: Authorization Rule,Applicable To (User),Applicabile a (Utente)
 DocType: Purchase Taxes and Charges,Deduct,Detrarre
@@ -2038,7 +2041,7 @@
 DocType: Guardian,Work Address,Indirizzo di lavoro
 DocType: Appraisal,Calculate Total Score,Calcolare il punteggio totale
 DocType: Request for Quotation,Manufacturing Manager,Responsabile di produzione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} è in garanzia fino a {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split di consegna Nota in pacchetti.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Spedizioni
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Il saldo del conto ({0}) per {1} e il valore di riserva ({2}) per il magazzino {3} deve essere lo stesso
@@ -2047,7 +2050,7 @@
 DocType: BOM,Scrap Material Cost,Costo rottami Materiale
 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
 DocType: Purchase Invoice,In Words (Company Currency),In Parole (Azienda valuta)
-DocType: Asset,Supplier,Fornitori
+DocType: Asset,Supplier,Fornitore
 DocType: C-Form,Quarter,Trimestrale
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,Spese Varie
 DocType: Global Defaults,Default Company,Azienda Predefinita
@@ -2059,10 +2062,10 @@
 DocType: Leave Application,Total Leave Days,Totale Lascia Giorni
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: E-mail non sarà inviata agli utenti disabilitati
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numero di interazione
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Seleziona Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Seleziona Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lasciare vuoto se considerato per tutti i reparti
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipi di occupazione (permanente , contratti , ecc intern ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} è obbligatorio per la voce {1}
 DocType: Process Payroll,Fortnightly,Quindicinale
 DocType: Currency Exchange,From Currency,Da Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2070,15 +2073,15 @@
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Ordine di vendita necessaria per la voce {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Prezzo (Valuta Azienda)
 DocType: Student Guardian,Others,Altri
-DocType: Payment Entry,Unallocated Amount,Quantità non assegnata
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
+DocType: Payment Entry,Unallocated Amount,Importo non allocato
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Non riesco a trovare un prodotto trovato. Si prega di selezionare un altro valore per {0}.
 DocType: POS Profile,Taxes and Charges,Tasse e Costi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un prodotto o un servizio che viene acquistato, venduto o conservato in magazzino."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nessun altro aggiornamento
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Non è possibile selezionare il tipo di carica come 'On Fila Indietro Importo ' o 'On Precedente totale riga ' per la prima fila
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,L'elemento figlio non dovrebbe essere un pacchetto di prodotti. Si prega di rimuovere l'elemento `{0}` e salvare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bancario
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Aggiungere schede attività
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Aggiungere schede attività
 DocType: Vehicle Service,Service Item,servizio Voce
 DocType: Bank Guarantee,Bank Guarantee,Garanzia bancaria
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,Si prega di cliccare su ' Generate Schedule ' per ottenere pianificazione
@@ -2101,6 +2104,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} è già {2}
 DocType: Quotation Item,Stock Balance,Saldo Delle Scorte
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ordine di vendita a pagamento
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Impostare Serie Naming per {0} tramite Impostazioni&gt; Impostazioni&gt; Serie di denominazione
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Amministratore delegato
 DocType: Expense Claim Detail,Expense Claim Detail,Dettaglio Rimborso Spese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Seleziona account corretto
@@ -2109,7 +2113,7 @@
 DocType: Employee,Blood Group,Gruppo Discendenza
 DocType: Production Order Operation,Pending,In attesa
 DocType: Course,Course Name,Nome del corso
-DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Gli utenti che possono approvare le applicazioni lasciare un specifico del dipendente
+DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,Utenti che possono approvare le domande di permesso di un dipendente specifico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,Apparecchiature per ufficio
 DocType: Purchase Invoice Item,Qty,Qtà
 DocType: Fiscal Year,Companies,Aziende
@@ -2125,14 +2129,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,I prezzi non verranno visualizzati se listino non è impostata
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Si prega di specificare un Paese per questa regola di trasporto o controllare Spedizione in tutto il mondo
 DocType: Stock Entry,Total Incoming Value,Totale Valore Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debito A è richiesto
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debito A è richiesto
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Schede attività per tenere traccia del tempo, i costi e la fatturazione per attività fatta per tua squadra"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Acquisto Listino Prezzi
 DocType: Offer Letter Term,Offer Term,Termine Offerta
 DocType: Quality Inspection,Quality Manager,Responsabile Qualità
 DocType: Job Applicant,Job Opening,Offerte di Lavoro
 DocType: Payment Reconciliation,Payment Reconciliation,Pagamento Riconciliazione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Si prega di selezionare il nome del Incharge persona
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Totale non pagato: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Pagina web
@@ -2159,27 +2163,27 @@
 DocType: Opportunity,Lost Reason,Motivo della perdita
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Si prega di inserire Ricevuta Documento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tutti gli articoli sono già stati fatturati
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Si prega di inserire Ricevuta Documento
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ulteriori centri di costo possono essere fatte in Gruppi ma le voci possono essere fatte contro i non-Gruppi
 DocType: Project,External,Esterno
-apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e autorizzazioni
+apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utenti e Permessi
 DocType: Vehicle Log,VLOG.,VIDEO BLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordini produzione creata: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ordini produzione creata: {0}
 DocType: Branch,Branch,Ramo
 DocType: Guardian,Mobile Number,Numero di cellulare
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Stampa e Branding
 DocType: Bin,Actual Quantity,Quantità reale
-DocType: Shipping Rule,example: Next Day Shipping,esempio: Next Day spedizione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} non trovato
+DocType: Shipping Rule,example: Next Day Shipping,esempio: Spedizione il Giorno Successivo
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} non trovato
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,I vostri clienti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Crea Studente
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Crea Studente
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Sei stato invitato a collaborare al progetto: {0}
 DocType: Leave Block List Date,Block Date,Data Blocco
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Applica ora
-apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Qty effettivo {0} / Qty di attesa {1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},Quantità effettiva {0} / Quantità attesa {1}
 DocType: Sales Order,Not Delivered,Non Consegnati
 ,Bank Clearance Summary,Sintesi Liquidazione Banca
 apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.","Creare e gestire giornalieri , settimanali e mensili digerisce email ."
@@ -2198,8 +2202,9 @@
 DocType: SMS Log,Sent To,Inviato A
 DocType: Payment Request,Make Sales Invoice,Crea Fattura di vendita
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,software
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Successivo Contattaci data non puó essere in passato
 DocType: Company,For Reference Only.,Per riferimento soltanto.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Seleziona il numero di lotto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Non valido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Importo Anticipo
@@ -2213,7 +2218,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Caso No. Non può essere 0
 DocType: Item,Show a slideshow at the top of the page,Visualizzare una presentazione in cima alla pagina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Distinte Materiali
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,negozi
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,negozi
 DocType: Serial No,Delivery Time,Tempo Consegna
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Invecchiamento Basato Su
 DocType: Item,End of Life,Fine Vita
@@ -2223,14 +2228,14 @@
 DocType: Purchase Order,Customer Mobile No,Clienti mobile No
 DocType: Cost Center,Track separate Income and Expense for product verticals or divisions.,Traccia reddito separata e spesa per verticali di prodotto o divisioni.
 DocType: Rename Tool,Rename Tool,Rename Tool
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,aggiornamento dei costi
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Aggiorna il Costo
 DocType: Item Reorder,Item Reorder,Articolo riordino
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Visualizza foglio paga
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material Transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Visualizza foglio paga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Questo documento è oltre il limite da {0} {1} per item {4}. State facendo un altro {3} contro lo stesso {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,conto importo Selezionare cambiamento
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Si prega di impostare ricorrenti dopo il salvataggio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,conto importo Selezionare cambiamento
 DocType: Purchase Invoice,Price List Currency,Prezzo di listino Valuta
 DocType: Naming Series,User must always select,L&#39;utente deve sempre selezionare
 DocType: Stock Settings,Allow Negative Stock,Permetti Scorte Negative
@@ -2241,7 +2246,7 @@
 DocType: Budget Account,Budget Account,Il budget dell&#39;account
 DocType: Quality Inspection,Verified By,Verificato da
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Non è possibile cambiare la valuta di default dell'azienda , perché ci sono le transazioni esistenti . Le operazioni devono essere cancellate per cambiare la valuta di default ."
-DocType: Grade Interval,Grade Description,Grade Descrizione
+DocType: Grading Scale Interval,Grade Description,Grade Descrizione
 DocType: Stock Entry,Purchase Receipt No,RICEVUTA No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Caparra
 DocType: Process Payroll,Create Salary Slip,Creare busta paga
@@ -2264,7 +2269,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,Programma di manutenzione {0} deve essere cancellato prima di annullare questo ordine di vendita
 DocType: Notification Control,Expense Claim Approved,Rimborso Spese Approvato
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,Foglio paga del dipendente {0} già creato per questo periodo
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,farmaceutico
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,Farmaceutico
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,Costo dei beni acquistati
 DocType: Selling Settings,Sales Order Required,Ordine di vendita richiesto
 DocType: Purchase Invoice,Credit To,Credito a
@@ -2279,7 +2284,7 @@
 DocType: Upload Attendance,Attendance To Date,Data Fine Frequenza
 DocType: Warranty Claim,Raised By,Sollevata dal
 DocType: Payment Gateway Account,Payment Account,Conto di Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Si prega di specificare Società di procedere
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Si prega di specificare Società di procedere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variazione netta dei crediti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compensativa Off
 DocType: Offer Letter,Accepted,Accettato
@@ -2288,12 +2293,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Numero di Camera
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Riferimento non valido {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore alla quantità pianificata ({2}) nell'ordine di produzione {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) non può essere superiore alla quantità pianificata ({2}) nell'ordine di produzione {3}
 DocType: Shipping Rule,Shipping Rule Label,Etichetta Regola di Spedizione
-apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Materie prime non può essere vuoto.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Breve diario
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Impossibile aggiornare magazzino, fattura contiene articoli di trasporto di goccia."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Breve diario
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Non è possibile cambiare tariffa se la distinta (BOM) è già assegnata a un articolo
 DocType: Employee,Previous Work Experience,Lavoro precedente esperienza
 DocType: Stock Entry,For Quantity,Per Quantità
@@ -2306,11 +2311,11 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termini e Condizioni
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Il nome dell&#39;istituto per il quale si sta impostando questo sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registrazione contabile congelato fino a questa data, nessuno può / Modifica voce eccetto ruolo specificato di seguito."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Si prega di salvare il documento prima di generare il programma di manutenzione
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stato del progetto
 DocType: UOM,Check this to disallow fractions. (for Nos),Seleziona per disabilitare frazioni. (per NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,sono stati creati i seguenti ordini di produzione:
-DocType: Student Admission,Naming Series (for Student Applicant),Serie Nomine (per applicanti studenti)
+DocType: Student Admission,Naming Series (for Student Applicant),Denominazione Serie (per studenti candidati)
 DocType: Delivery Note,Transporter Name,Trasportatore Nome
 DocType: Authorization Rule,Authorized Value,Valore Autorizzato
 DocType: BOM,Show Operations,Mostra Operations
@@ -2333,7 +2338,7 @@
 ,Employees working on a holiday,I dipendenti che lavorano in un giorno festivo
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Segna come Presente
 DocType: Project,% Complete Method,% Completamento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},La data di inizio manutenzione non può essere precedente alla consegna del Serial No {0}
 DocType: Production Order,Actual End Date,Data di fine effettiva
 DocType: BOM,Operating Cost (Company Currency),Costi di funzionamento (Società di valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2350,7 +2355,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Lascia senza pagare non corrisponde con i record Leave Application approvati
 DocType: Campaign,Campaign-.####,Campagna . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Prossimi passi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Si prega di fornire gli elementi specificati ai migliori prezzi possibili
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto vicino Opportunità dopo 15 giorni
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,fine Anno
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2359,7 +2364,7 @@
 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 / distributore / commissionario / affiliato / rivenditore che vende i prodotti delle aziende per una commissione.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0} contro ordine di acquisto {1}
 DocType: 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.)"
-DocType: Task,Actual Start Date (via Time Sheet),Data Inizio Effettiva (da Time Sheet)
+DocType: Task,Actual Start Date (via Time Sheet),Data di inizio effettiva (da Time Sheet)
 apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,Questo è un sito di esempio generato automaticamente da ERPNext
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +37,Ageing Range 1,Gamma invecchiamento 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.
@@ -2407,7 +2412,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Quantità
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records Fee Creato - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categoria account
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Non può produrre più Voce {0} di Sales Order quantità {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Movimento di magazzino {0} non confermato
 DocType: Payment Reconciliation,Bank / Cash Account,Conto Banca / Cassa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Successivo Contatto Con non può coincidere con l'email del Lead
@@ -2417,7 +2422,7 @@
 DocType: Global Defaults,Hide Currency Symbol,Nascondi Simbolo Valuta
 apps/erpnext/erpnext/config/accounts.py +294,"e.g. Bank, Cash, Credit Card","p. es. Banca, Bonifico, Contanti, Carta di credito"
 DocType: Lead Source,Source Name,Source Name
-DocType: Journal Entry,Credit Note,Nota Credito
+DocType: Journal Entry,Credit Note,Nota di Credito
 DocType: Warranty Claim,Service Address,Service Indirizzo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,Mobili e Infissi
 DocType: Item,Manufacture,Produzione
@@ -2429,7 +2434,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Liquidazione data non menzionato
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,produzione
 DocType: Guardian,Occupation,Occupazione
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Riga {0} : Data di inizio deve essere precedente Data di fine
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totale (Quantità)
 DocType: Sales Invoice,This Document,Questo documento
 DocType: Installation Note Item,Installed Qty,Qtà installata
@@ -2443,19 +2449,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +290, or ,oppure
 DocType: Sales Order,Billing Status,Stato Fatturazione
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Segnala un problema
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Spese Utility
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Spese di utenza
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Sopra
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: diario {1} non ha conto {2} o già confrontato con un altro buono
 DocType: Buying Settings,Default Buying Price List,Predefinito acquisto Prezzo di listino
 DocType: Process Payroll,Salary Slip Based on Timesheet,Stipendio slip Sulla base di Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Tipo di pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Seleziona un batch per l&#39;articolo {0}. Impossibile trovare un unico batch che soddisfi questo requisito
 DocType: Process Payroll,Select Employees,Selezionare Dipendenti
 DocType: Opportunity,Potential Sales Deal,Deal potenziale di vendita
-DocType: Payment Entry,Cheque/Reference Date,Assegno / Reference Data
+DocType: Payment Entry,Cheque/Reference Date,Assegno / Data di riferimento
 DocType: Purchase Invoice,Total Taxes and Charges,Totale imposte e oneri
 DocType: Employee,Emergency Contact,Contatto di emergenza
 DocType: Bank Reconciliation Detail,Payment Entry,Contabilizza pagamento
@@ -2469,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS profilo globale {0} già creato per l&#39;azienda {1}
 DocType: Purchase Order,Ref SQ,Rif. SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Sostituire Voce / BOM in tutte le distinte base
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,La Ricevuta deve essere presentata
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,La Ricevuta deve essere presentata
 DocType: Purchase Invoice Item,Received Qty,Quantità ricevuta
 DocType: Stock Entry Detail,Serial No / Batch,Serial n / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Non pagato ma non ritirato
@@ -2478,11 +2484,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Non ci sono fogli di presenza
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Lascia tipo {0} non può essere trasmessa carry-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programma di manutenzione non generato per tutte le voci. Rieseguire 'Genera Programma'
 ,To Produce,per produrre
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Libro paga
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Per riga {0} a {1}. Per includere {2} a tasso Item, righe {3} deve essere inclusa anche"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Crea Utente
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Crea Utente
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificazione del pacchetto per la consegna (per la stampa)
 DocType: Bin,Reserved Quantity,Riservato Quantità
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Inserisci indirizzo email valido
@@ -2494,34 +2500,35 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,modello disabili non deve essere modello predefinito
 DocType: Account,Income Account,Conto Proventi
 DocType: Payment Request,Amount in customer's currency,Importo nella valuta del cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Recapito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Recapito
 DocType: Stock Reconciliation Item,Current Qty,Quantità corrente
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Vedere &quot;tasso di materiali a base di&quot; in Costing Sezione
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Area Responsabilità Chiave
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","I lotti degli studenti aiutano a tenere traccia di presenza, le valutazioni e le tasse per gli studenti"
 DocType: Payment Entry,Total Allocated Amount,Totale importo assegnato
 DocType: Item Reorder,Material Request Type,Tipo di richiesta materiale
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural diario per gli stipendi da {0} a {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage è pieno, non ha salvato"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage è pieno, non ha salvato"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Riga {0}: UOM fattore di conversione è obbligatoria
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Rif
 DocType: Budget,Cost Center,Centro di Costo
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,Voucher #
 DocType: Notification Control,Purchase Order Message,Ordine di acquisto Message
 DocType: Tax Rule,Shipping Country,Spedizione Nazione
-DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Nascondere l&#39;ID fiscale di clienti da operazioni di vendita
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Nascondere P. IVA / Cod. Fis. dei clienti dalle operazioni di vendita
 DocType: Upload Attendance,Upload HTML,Carica HTML
 DocType: Employee,Relieving Date,Alleviare Data
-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.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regola Pricing è fatto per sovrascrivere Listino Prezzi / definire la percentuale di sconto, sulla base di alcuni criteri."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazzino può essere modificato solo tramite Inserimento Giacenza / Bolla (DDT) / Ricevuta d'acquisto
 DocType: Employee Education,Class / Percentage,Classe / Percentuale
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Responsabile Marketing e Vendite
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Tassazione Proventi
-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 regola tariffaria selezionato è fatta per 'prezzo', che sovrascriverà Listino. Prezzo Regola Il prezzo è il prezzo finale, in modo che nessun ulteriore sconto deve essere applicato. Quindi, in operazioni come ordine di vendita, ordine di acquisto, ecc, che viene prelevato in campo 'Tasso', piuttosto che il campo 'Listino Rate'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regola tariffaria selezionato è fatta per 'prezzo', che sovrascriverà Listino. Prezzo Regola Il prezzo è il prezzo finale, in modo che nessun ulteriore sconto deve essere applicato. Quindi, in operazioni come ordine di vendita, ordine di acquisto, ecc, che viene prelevato in campo 'Tasso', piuttosto che il campo 'Listino Rate'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Monitora i Leads per settore.
 DocType: Item Supplier,Item Supplier,Articolo Fornitore
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Si prega di selezionare un valore per {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Inserisci il codice Item per ottenere lotto non
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Tutti gli indirizzi.
 DocType: Company,Stock Settings,Impostazioni Giacenza
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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. Gruppo,Tipo Radice, Azienda"
@@ -2531,6 +2538,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Invierà una e-mail circa l'evento per i dipendenti con status di 'Aperto'
 DocType: Task,Depends on Tasks,Dipende Compiti
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gestire cliente con raggruppamento ad albero
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Gli allegati possono essere visualizzati senza abilitare il carrello
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nuovo Nome Centro di costo
 DocType: Leave Control Panel,Leave Control Panel,Lascia il Pannello di controllo
@@ -2543,11 +2551,10 @@
 DocType: Sales Invoice,Debit To,Addebito a
 DocType: Delivery Note,Required only for sample item.,Richiesto solo per la voce di esempio.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Q.tà reale post-transazione
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornitore&gt; Tipo Fornitore
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nessun slittamento di stipendio trovato tra {0} e {1}
 ,Pending SO Items For Purchase Request,Elementi in sospeso così per Richiesta di Acquisto
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Ammissioni di studenti
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} è disabilitato
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} è disabilitato
 DocType: Supplier,Billing Currency,Fatturazione valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2564,12 +2571,12 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage prodotto in vetrina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tutti i gruppi di valutazione
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nuovo nome Magazzino
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totale {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totale {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorio
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
-DocType: Stock Settings,Default Valuation Method,Metodo Valutazione Predefinito
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Si prega di citare nessuna delle visite richieste
+DocType: Stock Settings,Default Valuation Method,Metodo di valutazione predefinito
 DocType: Vehicle Log,Fuel Qty,Quantità di carburante
-DocType: Production Order Operation,Planned Start Time,Planned Ora di inizio
+DocType: Production Order Operation,Planned Start Time,Ora di inizio prevista
 DocType: Course,Assessment,Valutazione
 DocType: Payment Entry Reference,Allocated,Assegnati
 apps/erpnext/erpnext/config/accounts.py +236,Close Balance Sheet and book Profit or Loss.,Chiudere Stato Patrimoniale e il libro utile o perdita .
@@ -2582,7 +2589,7 @@
 DocType: Price List,Price List Master,Listino Principale
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tutte le transazioni di vendita possono essere etichettati contro più persone ** ** di vendita in modo da poter impostare e monitorare gli obiettivi.
 ,S.O. No.,S.O. No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Si prega di creare il Cliente dal Lead {0}
 DocType: Price List,Applicable for Countries,Applicabile per i paesi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Solo Lasciare applicazioni con lo stato &#39;approvato&#39; e &#39;rifiutato&#39; possono essere presentate
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Nome gruppo è obbligatoria in riga {0}
@@ -2620,12 +2627,12 @@
  1. Modi di controversie indirizzamento, indennità, responsabilità, ecc 
  1. Indirizzo e contatti della vostra azienda."
 DocType: Attendance,Leave Type,Lascia Tipo
-DocType: Purchase Invoice,Supplier Invoice Details,Fornitore Dettagli fattura
+DocType: Purchase Invoice,Supplier Invoice Details,Dettagli Fattura Fornitore
 apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,Expense / account Differenza ({0}) deve essere un 'utile o perdita' conto
 DocType: Project,Copied From,Copiato da
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nome errore: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Carenza
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} non è associato con {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} non è associato con {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Assistenza per dipendente {0} è già contrassegnata
 DocType: Packing Slip,If more than one package of the same type (for print),Se più di un pacchetto dello stesso tipo (per la stampa)
 ,Salary Register,stipendio Register
@@ -2635,7 +2642,7 @@
 DocType: Bin,FCFS Rate,FCFS Rate
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Eccezionale Importo
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (in minuti)
-DocType: Project Task,Working,Lavoro
+DocType: Project Task,Working,Lavorando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Code Giacenze (FIFO)
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0} non appartiene alla società {1}
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +119,Cost as on,Costo come in
@@ -2644,7 +2651,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Uso per Carrello
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valore {0} per l&#39;attributo {1} non esiste nella lista della voce valida Attributo Valori per la voce {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Spese saranno distribuiti proporzionalmente basate su qty voce o importo, secondo la vostra selezione"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Spese saranno distribuiti proporzionalmente basate su qty voce o importo, secondo la vostra selezione"
 DocType: Maintenance Visit,Purposes,Scopi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operazione {0} più di tutte le ore di lavoro disponibili a workstation {1}, abbattere l&#39;operazione in più operazioni"
@@ -2665,16 +2672,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestire territorio ad albero
 DocType: Journal Entry Account,Sales Invoice,Fattura di Vendita
 DocType: Journal Entry Account,Party Balance,Balance Partito
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Si prega di selezionare Applica sconto su
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Si prega di selezionare Applica sconto su
 DocType: Company,Default Receivable Account,Account Crediti Predefinito
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Crea Banca Entry per il salario totale pagato per i criteri sopra selezionati
 DocType: Stock Entry,Material Transfer for Manufacture,Trasferimento materiali  per Produzione
-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.,Percentuale di sconto può essere applicato sia contro un listino prezzi o per tutti Listino.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Percentuale di sconto può essere applicato sia contro un listino prezzi o per tutti Listino.
 DocType: Purchase Invoice,Half-yearly,Semestrale
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Voce contabilità per giacenza
 DocType: Vehicle Service,Engine Oil,Olio motore
 DocType: Sales Invoice,Sales Team1,Vendite Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,L'articolo {0} non esiste
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,L'articolo {0} non esiste
 DocType: Sales Invoice,Customer Address,Indirizzo Cliente
 DocType: Employee Loan,Loan Details,prestito Dettagli
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Riga {0}: Quantità compilato deve essere maggiore di zero.
@@ -2682,24 +2689,24 @@
 DocType: Account,Root Type,Root Tipo
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Impossibile restituire più di {1} per la voce {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,trama
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,trama
 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},Obiettivo Magazzino è obbligatoria per la riga {0}
 DocType: Cheque Print Template,Primary Settings,Impostazioni primarie
-DocType: Purchase Invoice,Select Supplier Address,Selezione indirizzo del fornitore
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Aggiungere dipendenti
+DocType: Purchase Invoice,Select Supplier Address,Selezione l'indirizzo del Fornitore
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Aggiungere dipendenti
 DocType: Purchase Invoice Item,Quality Inspection,Controllo Qualità
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Template Standard
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Attenzione : Materiale Qty richiesto è inferiore minima quantità
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Il Conto {0} è congelato
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entità Legale / Controllata con un grafico separato di conti appartenenti all'organizzazione.
 DocType: Payment Request,Mute Email,Email muta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Prodotti alimentari , bevande e tabacco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Posso solo effettuare il pagamento non ancora fatturate contro {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tasso Commissione non può essere superiore a 100
 DocType: Stock Entry,Subcontract,Conto lavoro
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Si prega di inserire {0} prima
@@ -2738,11 +2745,11 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Magazzini con transazione esistenti non possono essere convertiti in gruppo.
 DocType: Assessment Result Tool,Result HTML,risultato HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Scade il
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Aggiungere studenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Aggiungere studenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Si prega di selezionare {0}
 DocType: C-Form,C-Form No,C-Form N.
 DocType: BOM,Exploded_items,Articoli_esplosi
-DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione Contrassegno
+DocType: Employee Attendance Tool,Unmarked Attendance,Partecipazione non contrassegnata
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,ricercatore
 DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,Programma Strumento di Iscrizione per studenti
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,Nome o e-mail è obbligatorio
@@ -2765,12 +2772,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,Non-gruppo a gruppo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},Il gruppo è obbligatorio nella riga {0}
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,Acquisto Ricevuta Articolo inserito
-DocType: Payment Entry,Pay,Pagare
+DocType: Payment Entry,Pay,Paga
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,Per Data Ora
 DocType: SMS Settings,SMS Gateway URL,SMS Gateway URL
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,Orari del corso cancellato:
 apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,I registri per il mantenimento dello stato di consegna sms
-DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Libro Giornale
+DocType: Accounts Settings,Make Payment via Journal Entry,Effettua il pagamento tramite Registrazione Contabile
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +77,Printed On,Stampato su
 DocType: Item,Inspection Required before Delivery,Ispezione richiesta prima della consegna
 DocType: Item,Inspection Required before Purchase,Ispezione Richiesto prima di Acquisto
@@ -2780,7 +2787,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Inserisci il nome della Campagna se la sorgente di indagine è la campagna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editori Giornali
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selezionare l'anno fiscale
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selezionare l'anno fiscale
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Riordina Level
 DocType: Company,Chart Of Accounts Template,Template Piano dei Conti
 DocType: Attendance,Attendance Date,Data Presenza
@@ -2794,15 +2801,15 @@
 DocType: Sales Invoice,Sales Team,Team di vendita
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,ottenere gli studenti
-DocType: Serial No,Under Warranty,Sotto Garanzia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Errore]
+DocType: Serial No,Under Warranty,In Garanzia
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Errore]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In parole saranno visibili una volta che si salva l&#39;ordine di vendita.
 ,Employee Birthday,Compleanno Dipendente
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studente Batch presenze Strumento
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limite Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,capitale a rischio
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termine accademico con questo &#39;Anno Accademico&#39; {0} e &#39;Term Nome&#39; {1} esiste già. Si prega di modificare queste voci e riprovare.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Poiché esistono transazioni esistenti rispetto all'oggetto {0}, non è possibile modificare il valore di {1}"
 DocType: UOM,Must be Whole Number,Deve essere un Numero Intero
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nuove ferie attribuiti (in giorni)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} non esiste
@@ -2822,9 +2829,9 @@
 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 +49,Period Closing Entry,Entrata Periodo di chiusura
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro di costo con le transazioni esistenti non può essere convertito in gruppo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Importo {0} {1} {2} {3}
 DocType: Account,Depreciation,ammortamento
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore (s)
+apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornitore(i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Impiegato presenze Strumento
 DocType: Guardian Student,Guardian Student,Guardiano Student
 DocType: Supplier,Credit Limit,Limite Credito
@@ -2845,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Ultimo giorno del mese prossimo
 DocType: Support Settings,Auto close Issue after 7 days,Chiudi la controversia automaticamente dopo 7 giorni
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Ferie non possono essere assegnati prima {0}, come equilibrio congedo è già stato inoltrato carry-in futuro record di assegnazione congedo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: La data scadenza / riferimento supera i giorni ammessi per il credito dei clienti da {0} giorno (i)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Richiedente
 DocType: Asset Category Account,Accumulated Depreciation Account,Conto per il fondo ammortamento
 DocType: Stock Settings,Freeze Stock Entries,Congela scorta voci
@@ -2856,7 +2863,7 @@
 ,Stock Analytics,Analytics Archivio
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Le operazioni non possono essere lasciati in bianco
 DocType: Maintenance Visit Purpose,Against Document Detail No,Per Dettagli Documento N
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipo partito è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Tipo partito è obbligatoria
 DocType: Quality Inspection,Outgoing,In partenza
 DocType: Material Request,Requested For,richiesto Per
 DocType: Quotation Item,Against Doctype,Per Doctype
@@ -2864,7 +2871,7 @@
 DocType: Delivery Note,Track this Delivery Note against any Project,Sottoscrivi questa bolla di consegna contro ogni progetto
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,Di cassa netto da investimenti
 ,Is Primary Address,È primario Indirizzo
-DocType: Production Order,Work-in-Progress Warehouse,Work-in-Progress Warehouse
+DocType: Production Order,Work-in-Progress Warehouse,Magazzino Lavori in corso
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,Asset {0} deve essere presentata
 apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},Record di presenze {0} esiste contro Student {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},Riferimento # {0} datato {1}
@@ -2873,13 +2880,13 @@
 DocType: Asset,Item Code,Codice Articolo
 DocType: Production Planning Tool,Create Production Orders,Crea Ordine Prodotto
 DocType: Serial No,Warranty / AMC Details,Garanzia / AMC Dettagli
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
-DocType: Journal Entry,User Remark,Osservazioni utenti
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selezionare manualmente gli studenti per il gruppo basato sulle attività
+DocType: Journal Entry,User Remark,Osservazioni dell'utente
 DocType: Lead,Market Segment,Segmento di Mercato
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Importo versato non può essere maggiore di totale importo residuo negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Importo versato non può essere maggiore di totale importo residuo negativo {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Storia lavorativa Interna del Dipendente
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Chiusura (Dr)
-DocType: Cheque Print Template,Cheque Size,Assegno Size
+DocType: Cheque Print Template,Cheque Size,Dimensione Assegno
 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 +169,Tax template for selling transactions.,Modelli fiscali per le transazioni di vendita.
 DocType: Sales Invoice,Write Off Outstanding Amount,Scrivi Off eccezionale Importo
@@ -2891,7 +2898,7 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Richieste Materiale
 DocType: Employee Education,School/University,Scuola / Università
 DocType: Payment Request,Reference Details,Riferimento Dettagli
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Il valore atteso dopo la durata utile deve essere inferiore all' importo di acquisto lordo
 DocType: Sales Invoice Item,Available Qty at Warehouse,Quantità Disponibile a magazzino
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,importo fatturato
 DocType: Asset,Double Declining Balance,Doppia valori residui
@@ -2912,20 +2919,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account La differenza deve essere un account di tipo attività / passività, dal momento che questo Stock riconciliazione è una voce di apertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Importo erogato non può essere superiore a prestito Importo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numero ordine di acquisto richiesto per la voce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordine di produzione non ha creato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Ordine di produzione non ha creato
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' Dalla Data' deve essere successivo a 'Alla Data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Impossibile cambiare status di studente {0} è collegata con l&#39;applicazione studente {1}
 DocType: Asset,Fully Depreciated,completamente ammortizzato
 ,Stock Projected Qty,Qtà Prevista Giacenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} non appartiene a proiettare {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marcata presenze HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Le citazioni sono proposte, le offerte che hai inviato ai clienti"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Le citazioni sono proposte, le offerte che hai inviato ai clienti"
 DocType: Sales Order,Customer's Purchase Order,Ordine di Acquisto del Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,N. di serie e batch
 DocType: Warranty Claim,From Company,Da Azienda
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Somma dei punteggi di criteri di valutazione deve essere {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valore o Quantità
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Si prega di impostare Numero di ammortamenti Prenotato
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valore o Quantità
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produzioni ordini non possono essere sollevati per:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Acquisto Tasse e Costi
@@ -2937,7 +2944,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Tutti i Depositi
 DocType: Sales Partner,Retailer,Dettagliante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Tutti i tipi di fornitori
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Tutti i tipi di fornitori
 DocType: Global Defaults,Disable In Words,Disattiva in parole
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Preventivo {0} non di tipo {1}
@@ -2946,6 +2953,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Conto di scoperto bancario
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Crea Busta paga
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Riga # {0}: Importo assegnato non può essere superiore all&#39;importo in sospeso.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Sfoglia BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Prestiti garantiti
 DocType: Purchase Invoice,Edit Posting Date and Time,Modifica distacco di data e ora
@@ -2965,7 +2973,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,Seleziona Quantità
 DocType: Customs Tariff Number,Customs Tariff Number,Numero della tariffa doganale
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,Approvazione ruolo non può essere lo stesso ruolo la regola è applicabile ad
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Cancellati da questo Email Digest
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,Disiscriviti da questo Email Digest
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,Messaggio Inviato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,Il conto con nodi figli non può essere impostato come libro mastro
 DocType: C-Form,II,II
@@ -2985,7 +2993,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Non è permesso di aggiornare le transazioni di magazzino di età superiore a {0}
 DocType: Purchase Invoice Item,PR Detail,PR Dettaglio
 DocType: Sales Order,Fully Billed,Completamente Fatturato
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Si prega di impostare di default conto da pagare nel dipendente {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Deposito di consegna richiesto per l'articolo {0}
 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)
@@ -2995,10 +3002,10 @@
 DocType: Student Group,Group Based On,Gruppo basato
 DocType: Journal Entry,Bill Date,Data Fattura
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Servizio Voce, tipo, la frequenza e la quantità spesa sono necessari"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Anche se ci sono più regole sui prezzi con la priorità più alta, si applicano quindi le seguenti priorità interne:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vuoi davvero confermare tutte le buste paga da {0} a {1}
-DocType: Cheque Print Template,Cheque Height,Assegno Altezza
-DocType: Supplier,Supplier Details,Dettagli Fornitore
+DocType: Cheque Print Template,Cheque Height,Altezza Assegno
+DocType: Supplier,Supplier Details,Dettagli del Fornitore
 DocType: Expense Claim,Approval Status,Stato Approvazione
 DocType: Hub Settings,Publish Items to Hub,Pubblicare Articoli al Hub
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},Dal valore deve essere inferiore al valore nella riga {0}
@@ -3007,8 +3014,8 @@
 DocType: Vehicle Log,Invoice Ref,fattura Rif
 DocType: Purchase Order,Recurring Order,Ordine Ricorrente
 DocType: Company,Default Income Account,Conto predefinito Entrate
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Gruppi clienti / clienti
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Fiscale anni Utile / Perdita (credito)
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Gruppi clienti / clienti
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Anni fiscali non chiusi - Utile/Perdita (credito)
 DocType: Sales Invoice,Time Sheets,fogli di presenza
 DocType: Payment Gateway Account,Default Payment Request Message,Predefinito Richiesta Pagamento Messaggio
 DocType: Item Group,Check this if you want to show in website,Seleziona se vuoi mostrare nel sito web
@@ -3027,17 +3034,17 @@
 DocType: Notification Control,Quotation Message,Messaggio Preventivo
 DocType: Employee Loan,Employee Loan Application,Impiegato Loan Application
 DocType: Issue,Opening Date,Data di apertura
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,La partecipazione è stata segnata con successo.
 DocType: Journal Entry,Remark,Osservazione
 DocType: Purchase Receipt Item,Rate and Amount,Prezzo e Importo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tipo di account per {0} deve essere {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tipo di account per {0} deve essere {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Ferie e vacanze
 DocType: School Settings,Current Academic Term,Termine accademico attuale
 DocType: Sales Order,Not Billed,Non Fatturata
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,Entrambi i magazzini devono appartenere alla stessa società
 apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,Nessun contatto ancora aggiunto.
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,Landed Cost Voucher Importo
-apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture sollevate dai fornitori.
+apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,Fatture emesse dai fornitori.
 DocType: POS Profile,Write Off Account,Scrivi Off account
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,Importo sconto
 DocType: Purchase Invoice,Return Against Purchase Invoice,Ritorno Contro Acquisto Fattura
@@ -3052,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Gruppo Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Preventivi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Un elemento esiste con lo stesso nome ( {0} ) , si prega di cambiare il nome del gruppo o di rinominare la voce"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Seleziona cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Seleziona cliente
 DocType: C-Form,I,io
 DocType: Company,Asset Depreciation Cost Center,Asset Centro di ammortamento dei costi
 DocType: Sales Order Item,Sales Order Date,Ordine di vendita Data
@@ -3069,22 +3076,22 @@
 DocType: Payment Entry,Payment References,Riferimenti di pagamento
 DocType: C-Form,C-FORM-,C-form-
 DocType: Vehicle,Insurance Details,Dettagli Assicurazione
-DocType: Account,Payable,pagabile
+DocType: Account,Payable,Pagabile
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Si prega di inserire periodi di rimborso
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Margine
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nuovi clienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Utile lordo %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Liquidazione
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Importo acquisto è obbligatoria
 DocType: Lead,Address Desc,Desc. indirizzo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party è obbligatoria
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party è obbligatoria
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome argomento
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,", Almeno una delle vendere o acquistare deve essere selezionata"
-DocType: Grading Structure,Grade Intervals,Intervalli grade
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selezionare la natura della vostra attività.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Riga # {0}: duplica la voce nei riferimenti {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Dove si svolgono le operazioni di fabbricazione.
 DocType: Asset Movement,Source Warehouse,Deposito Origine
 DocType: Installation Note,Installation Date,Data di installazione
@@ -3093,7 +3100,7 @@
 DocType: C-Form,Total Invoiced Amount,Totale Importo fatturato
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,La quantità Min non può essere maggiore della quantità Max
 DocType: Account,Accumulated Depreciation,Fondo di ammortamento
-DocType: Stock Entry,Customer or Supplier Details,Cliente o fornitore Dettagli
+DocType: Stock Entry,Customer or Supplier Details,Dettagli Cliente o Fornitore
 DocType: Employee Loan Application,Required by Date,Richiesto per data
 DocType: Lead,Lead Owner,Responsabile Lead
 DocType: Bin,Requested Quantity,la quantita &#39;richiesta
@@ -3114,14 +3121,14 @@
 DocType: Delivery Note,Transporter Info,Info Transporter
 apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},Si prega di impostare di default {0} nell&#39;azienda {1}
 DocType: Cheque Print Template,Starting position from top edge,posizione dal bordo superiore Avvio
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Stesso fornitore è stato inserito più volte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,Lo Stesso fornitore è stato inserito più volte
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,Utile lordo / Perdita
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,Ordine di acquisto Articolo inserito
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,Nome azienda non può essere azienda
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Lettera intestazioni per modelli di stampa .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titoli di modelli di stampa p. es. Fattura proforma
 DocType: Student Guardian,Student Guardian,Student Guardiano
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Spese tipo di valutazione non possono contrassegnata come Inclusive
 DocType: POS Profile,Update Stock,Aggiornare Giacenza
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Una diversa Unità di Misura degli articoli darà come risultato un Peso Netto (Totale) non corretto.
 Assicurarsi che il peso netto di ogni articolo sia nella stessa Unità di Misura."
@@ -3149,14 +3156,14 @@
 DocType: Company,Exchange Gain / Loss Account,Guadagno Exchange / Conto Economico
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Dipendenti e presenze
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Scopo deve essere uno dei {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Compila il modulo e salva
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Compila il modulo e salva
 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
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quotazione attuale in stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantità disponibile
 DocType: Homepage,"URL for ""All Products""",URL per &quot;tutti i prodotti&quot;
 DocType: Leave Application,Leave Balance Before Application,Lascia bilancio prima applicazione
 DocType: SMS Center,Send SMS,Invia SMS
-DocType: Cheque Print Template,Width of amount in word,Larghezza di importo in parola
+DocType: Cheque Print Template,Width of amount in word,Importo in parole
 DocType: Company,Default Letter Head,Predefinito Carta Intestata
 DocType: Purchase Order,Get Items from Open Material Requests,Ottenere elementi dal Richieste Aperto Materiale
 DocType: Item,Standard Selling Rate,Prezzo di Vendita Standard
@@ -3164,46 +3171,47 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Riordina Quantità
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Offerte di lavoro
 DocType: Company,Stock Adjustment Account,Conto di regolazione Archivio
-DocType: Journal Entry,Write Off,Cancellare
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Cancellare
 DocType: Timesheet Detail,Operation ID,Operazione ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utente di sistema (login) ID. Se impostato, esso diventerà di default per tutti i moduli HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Da {1}
 DocType: Task,depends_on,dipende da
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo account. Nota: Si prega di non creare account per Clienti e Fornitori
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,Nome del nuovo conto. Nota: Si prega di non creare account per Clienti e Fornitori
 DocType: BOM Replace Tool,BOM Replace Tool,BOM Strumento di sostituzione
 apps/erpnext/erpnext/config/setup.py +37,Country wise default Address Templates,Modelli Country saggio di default Indirizzo
-DocType: Sales Order Item,Supplier delivers to Customer,Fornitore garantisce al Cliente
+DocType: Sales Order Item,Supplier delivers to Customer,il Fornitore consegna al Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) è esaurito
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Successivo data deve essere maggiore di Data Pubblicazione
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostra fiscale break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mostra fiscale break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Data / Reference Data non può essere successiva {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importazione ed esportazione dati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","le entrate nelle scorte esistono contro Warehouse {0}, quindi non si può ri-assegnare o modificarlo"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nessun studenti hanno trovato
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nessun studenti hanno trovato
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fattura Data Pubblicazione
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vendere
 DocType: Sales Invoice,Rounded Total,Totale arrotondato
 DocType: Product Bundle,List items that form the package.,Voci di elenco che formano il pacchetto.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentuale di ripartizione dovrebbe essere pari al 100 %
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Si prega di selezionare Data Pubblicazione prima di selezionare partito
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Si prega di selezionare Data Pubblicazione prima di selezionare partito
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Fuori di AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Seleziona Citazioni
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Aggiungi visita manutenzione
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Seleziona Citazioni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numero degli ammortamenti prenotata non può essere maggiore di Numero totale degli ammortamenti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Aggiungi visita manutenzione
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Si prega di contattare l'utente che hanno Sales Master Responsabile {0} ruolo
 DocType: Company,Default Cash Account,Conto cassa predefinito
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Azienda ( non cliente o fornitore ) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Questo si basa sulla presenza di questo Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nessun studente dentro
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Aggiungere altri elementi o piena forma aperta
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Inserisci il ' Data prevista di consegna '
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,I Documenti di Trasporto {0} devono essere cancellati prima di annullare questo Ordine di Vendita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,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/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,Importo pagato + Scadenza Importo non può essere superiore a Totale generale
 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 +149,Note: There is not enough leave balance for Leave Type {0},Nota : Non c'è equilibrio congedo sufficiente per Leave tipo {0}
 DocType: Training Event,Seminar,Seminario
 DocType: Program Enrollment Fee,Program Enrollment Fee,Programma Tassa di iscrizione
-DocType: Item,Supplier Items,Fornitore Articoli
+DocType: Item,Supplier Items,Articoli Fornitore
 DocType: Opportunity,Opportunity Type,Tipo di Opportunità
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,Nuova Azienda
 apps/erpnext/erpnext/setup/doctype/company/delete_company_transactions.py +17,Transactions can only be deleted by the creator of the Company,Le transazioni possono essere eliminati solo dal creatore della Società
@@ -3220,12 +3228,13 @@
 apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,timesheet
 apps/erpnext/erpnext/controllers/accounts_controller.py +245,{0} '{1}' is disabled,{0} '{1}' è disabilitato
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,Imposta come Aperto
-DocType: Cheque Print Template,Scanned Cheque,Scanned Assegno
+DocType: Cheque Print Template,Scanned Cheque,Assegno scansionato
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,Invia e-mail automatica ai contatti alla conferma.
 DocType: Timesheet,Total Billable Amount,Importo totale fatturabile
 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: Warranty Claim,Item and Warranty Details,Voce e garanzia Dettagli
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codice articolo&gt; Gruppo articoli&gt; Marchio
 DocType: Sales Team,Contribution (%),Contributo (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Selezionare il programma per recuperare i corsi obbligatori.
@@ -3240,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Prima di riconciliazione
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Per {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Tasse e spese aggiuntive (Azienda valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Voce fiscale Row {0} deve avere un account di tipo fiscale o di reddito o spese o addebitabile
 DocType: Sales Order,Partly Billed,Parzialmente Fatturato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Voce {0} deve essere un asset Articolo fisso
 DocType: Item,Default BOM,Distinta Materiali Predefinita
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3252,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Compagnia assicurativa
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabile
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Documento di Trasporto
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variabile
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Da Documento di Trasporto
 DocType: Student,Student Email Address,Student Indirizzo e-mail
 DocType: Timesheet Detail,From Time,Da Periodo
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,In Stock:
@@ -3264,32 +3273,32 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Listino Prezzi Tasso di Cambio
 DocType: Purchase Invoice Item,Rate,Prezzo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stagista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,indirizzo Nome
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,indirizzo Nome
 DocType: Stock Entry,From BOM,Da Distinta Materiali
 DocType: Assessment Code,Assessment Code,Codice Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Base
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operazioni Giacenza prima {0} sono bloccate
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Si prega di cliccare su ' Generate Schedule '
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","p. es. Kg, Unità, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,N. di riferimento è obbligatoria se hai inserito Reference Data
-DocType: Bank Reconciliation Detail,Payment Document,documento di pagamento
+DocType: Bank Reconciliation Detail,Payment Document,Documento di Pagamento
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data di adesione deve essere maggiore di Data di nascita
 DocType: Salary Slip,Salary Structure,Struttura salariale
 DocType: Account,Bank,Banca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,linea aerea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Fornire Materiale
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Fornire Materiale
 DocType: Material Request Item,For Warehouse,Per Magazzino
 DocType: Employee,Offer Date,Data dell'offerta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citazioni
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Sei in modalità non in linea. Si potrà ricaricare quando tornerà disponibile la connessione alla rete.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Non sono stati creati Gruppi Studenti
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rimborso mensile non può essere maggiore di prestito Importo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
-DocType: Purchase Invoice,Print Language,Stampa Lingua
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Inserisci Maintaince dettagli prima
+DocType: Purchase Invoice,Print Language,Lingua di Stampa
 DocType: Salary Slip,Total Working Hours,Orario di lavoro totali
 DocType: Stock Entry,Including items for sub assemblies,Compresi articoli per sub assemblaggi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Inserire il valore deve essere positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Inserire il valore deve essere positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,tutti i Territori
 DocType: Purchase Invoice,Items,Articoli
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studente è già registrato.
@@ -3308,21 +3317,19 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unità di misura predefinita per la variante &#39;{0}&#39; deve essere lo stesso in Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Calcola in base a
 DocType: Delivery Note Item,From Warehouse,Dal Deposito
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Non ci sono elementi con Bill of Materials per la produzione
 DocType: Assessment Plan,Supervisor Name,Nome supervisore
 DocType: Program Enrollment Course,Program Enrollment Course,Corso di iscrizione al programma
-DocType: Grading Structure,Grading Structure,Struttura di classificazione
-DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Total
+DocType: Purchase Taxes and Charges,Valuation and Total,Valutazione e Totale
 DocType: Tax Rule,Shipping City,Spedizione Città
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Personalizzare Notifica
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow operativo
 DocType: Sales Invoice,Shipping Rule,Spedizione Rule
 DocType: Manufacturer,Limited to 12 characters,Limitato a 12 caratteri
-DocType: Journal Entry,Print Heading,Stampa Rubrica
+DocType: Journal Entry,Print Heading,Titolo di stampa
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,Totale non può essere zero
 DocType: Training Event Employee,Attended,Frequentato
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,'Giorni dall'ultimo Ordine' deve essere maggiore o uguale a zero
@@ -3330,7 +3337,7 @@
 DocType: Asset,Amended From,Corretto da
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Raw Material,Materia prima
 DocType: Leave Application,Follow via Email,Seguire via Email
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Piante e macchinari
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,Impianti e Macchinari
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,Fiscale Ammontare Dopo Sconto Importo
 DocType: Daily Work Summary Settings,Daily Work Summary Settings,Impostazioni riepilogo giornaliero lavori
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},Valuta del listino {0} non è simile con la valuta selezionata {1}
@@ -3338,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Seleziona Data Pubblicazione primo
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Seleziona Data Pubblicazione primo
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data di apertura dovrebbe essere prima Data di chiusura
 DocType: Leave Control Panel,Carry Forward,Portare Avanti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro di costo con le transazioni esistenti non può essere convertito in contabilità
 DocType: Department,Days for which Holidays are blocked for this department.,Giorni per i quali le festività sono bloccate per questo reparto.
@@ -3351,7 +3358,7 @@
 DocType: Mode of Payment,General,Generale
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Allega intestata
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicazione
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Non può dedurre quando categoria è di ' valutazione ' o ' Valutazione e Total '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Inserisci il tuo capo fiscali (ad esempio IVA, dogana ecc, che devono avere nomi univoci) e le loro tariffe standard. Questo creerà un modello standard, che è possibile modificare e aggiungere più tardi."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Partita pagamenti con fatture
@@ -3367,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totale (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Intrattenimento e tempo libero
 DocType: Quality Inspection,Item Serial No,Articolo N. d&#39;ordine
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Creare record dei dipendenti
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Creare record dei dipendenti
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Presente totale
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Prospetti contabili
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ora
@@ -3380,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Sconosciuto
 DocType: Shipping Rule,Shipping Rule Conditions,Spedizione condizioni regola
 DocType: BOM Replace Tool,The new BOM after replacement,Il nuovo BOM dopo la sostituzione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punto di vendita
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Punto di vendita
 DocType: Payment Entry,Received Amount,importo ricevuto
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Impostare il sistema di denominazione dei dipendenti in risorse umane&gt; Impostazioni HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Creare per la piena quantità, ignorando la quantità già in ordine"
 DocType: Account,Tax,Tassa
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,non segnato
@@ -3393,9 +3399,9 @@
 DocType: C-Form,Invoices,Fatture
 DocType: Batch,Source Document Name,Nome del documento di origine
 DocType: Job Opening,Job Title,Titolo Posizione
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,creare utenti
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,creare utenti
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Grammo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantità di Fabbricazione deve essere maggiore di 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Visita rapporto per chiamata di manutenzione.
 DocType: Stock Entry,Update Rate and Availability,Frequenza di aggiornamento e disponibilità
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentuale si è permesso di ricevere o consegnare di più contro la quantità ordinata. Per esempio: Se avete ordinato 100 unità. e il vostro assegno è 10% poi si è permesso di ricevere 110 unità.
@@ -3404,34 +3410,36 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Conto spese è obbligatoria per l'elemento {0}
 DocType: BOM,Website Description,Descrizione del sito
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variazione netta Patrimonio
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere univoco, esiste già per {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Si prega di annullare Acquisto Fattura {0} prima
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Indirizzo e-mail deve essere univoco, esiste già per {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Scadenza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Ricevuta
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Ricevuta
 ,Sales Register,Registro Vendite
 DocType: Daily Work Summary Settings Company,Send Emails At,Invia e-mail in
 DocType: Quotation,Quotation Lost Reason,Motivo Preventivo Perso
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Seleziona il tuo dominio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},di riferimento della transazione non {0} {1} datato
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},di riferimento della transazione non {0} {1} datato
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Non c'è nulla da modificare.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Nessun Cliente ancora!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Rendiconto finanziario
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Importo del prestito non può superare il massimo importo del prestito {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licenza
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Inserisci Scrivi Off conto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima data di ordine
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Il Conto {0} non appartiene alla società {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,I numeri seriali nella riga {0} non corrispondono alla nota di consegna
 DocType: Student,Guardian Details,Guardiano Dettagli
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Segna come  Presenze per più Dipendenti
 DocType: Vehicle,Chassis No,Telaio No
 DocType: Payment Request,Initiated,Iniziato
-DocType: Production Order,Planned Start Date,Data prevista di inizio
+DocType: Production Order,Planned Start Date,Data di inizio prevista
 DocType: Serial No,Creation Document Type,Creazione tipo di documento
 DocType: Leave Type,Is Encash,È incassare
 DocType: Leave Allocation,New Leaves Allocated,Nuove ferie allocate
@@ -3441,59 +3449,59 @@
 DocType: Appraisal Template,Appraisal Template Title,Valutazione Titolo Modello
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},Da Data {0} per Employee {1} non può essere prima di unirsi Data del dipendente {2}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,commerciale
-DocType: Payment Entry,Account Paid To,Per account a pagamento
+DocType: Payment Entry,Account Paid To,Account pagato a
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,Voce genitore {0} non deve essere un Articolo Articolo
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,Tutti i Prodotti o Servizi.
 DocType: Expense Claim,More Details,Maggiori dettagli
-DocType: Supplier Quotation,Supplier Address,Fornitore Indirizzo
+DocType: Supplier Quotation,Supplier Address,Indirizzo Fornitore
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0} budget per l&#39;account {1} contro {2} {3} è {4}. Si supererà da {5}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Riga {0} # account deve essere di tipo 'Bene Strumentale'
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Quantità
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regole per il calcolo dell&#39;importo di trasporto per una vendita
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series è obbligatorio
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series è obbligatorio
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servizi finanziari
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipi di attività per i registri di tempo
 DocType: Tax Rule,Sales,Vendite
 DocType: Stock Entry Detail,Basic Amount,Importo di base
 DocType: Training Event,Exam,Esame
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazzino richiesto per l'Articolo in Giacenza {0}
+DocType: Leave Allocation,Unused leaves,Foglie non utilizzate
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Stato di fatturazione
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Trasferimento
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} non è associato all'account di partito {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} non è associato all'account di partito {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch BOM esplosa ( inclusi sottoassiemi )
 DocType: Authorization Rule,Applicable To (Employee),Applicabile a (Dipendente)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Data di scadenza è obbligatoria
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Incremento per attributo {0} non può essere 0
-DocType: Journal Entry,Pay To / Recd From,Pay To / RECD Da
+DocType: Journal Entry,Pay To / Recd From,Paga a / Ricevuto Da
 DocType: Naming Series,Setup Series,Serie Setup
 DocType: Payment Reconciliation,To Invoice Date,Per Data fattura
 DocType: Supplier,Contact HTML,Contatto HTML
 ,Inactive Customers,I clienti inattivi
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Ricevute di acquisto
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
-DocType: Stock Entry,Delivery Note No,Documento di Trasporto N
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Come viene applicata la Regola Tariffaria?
+DocType: Stock Entry,Delivery Note No,Documento di Trasporto N.
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Se selezionato, acquisto solo le richieste di materiale per le materie prime finali saranno inclusi nella sezione Richieste materiali. In caso contrario, verranno create le richieste dei materiali per gli articoli del genitore"
 DocType: Cheque Print Template,Message to show,Messaggio da mostrare
 DocType: Company,Retail,Vendita al dettaglio
 DocType: Attendance,Absent,Assente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle prodotto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle prodotto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Riga {0}: Riferimento non valido {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelli Tasse di Acquisto e Oneri
 DocType: Upload Attendance,Download Template,Scarica Modello
 DocType: Timesheet,TS-,TS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: immetti  un importo a debito o a credito in {2}
 DocType: GL Entry,Remarks,Osservazioni
-DocType: Payment Entry,Account Paid From,Account a pagamento da
+DocType: Payment Entry,Account Paid From,Account pagato da
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Codice Articolo Materia Prima
 DocType: Journal Entry,Write Off Based On,Scrivi Off Basato Su
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Crea un Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Crea un Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Di stampa e di cancelleria
 DocType: Stock Settings,Show Barcode Field,Mostra campo del codice a barre
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Inviare e-mail del fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Inviare e-mail del fornitore
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Stipendio già elaborato per il periodo compreso tra {0} e {1}, Lascia periodo di applicazione non può essere tra questo intervallo di date."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Record di installazione per un numero di serie
 DocType: Guardian Interest,Guardian Interest,Guardiano interesse
@@ -3505,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,In attesa di risposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sopra
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},attributo non valido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Si ricorda se un conto non pagabile
 DocType: Salary Slip,Earning & Deduction,Rendimento & Detrazione
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Facoltativo. Questa impostazione verrà utilizzato per filtrare in diverse operazioni .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativo Tasso valutazione non è consentito
@@ -3520,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,Ordine di produzione del lotto
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nessun record trovato
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Costo di Asset Demolita
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parzialmente ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: centro di costo è obbligatorio per la voce {2}
 DocType: Vehicle,Policy No,Politica No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Ottenere elementi dal pacchetto di prodotti
 DocType: Asset,Straight Line,Retta
 DocType: Project User,Project User,progetto utente
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Diviso
@@ -3538,13 +3546,13 @@
 DocType: Program Enrollment Tool,Get Students From,Get studenti di
 DocType: Hub Settings,Seller Country,Vendita Paese
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Pubblicare Articoli sul sito web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppo tuoi studenti in batch
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppo tuoi studenti in batch
 DocType: Authorization Rule,Authorization Rule,Ruolo Autorizzazione
 DocType: Sales Invoice,Terms and Conditions Details,Termini e condizioni dettagli
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificazioni
-DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli Tasse di Vendita e Oneri
+DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,Modelli di Imposte e spese di vendita
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),Totale (Credito)
-DocType: Repayment Schedule,Payment Date,Data di pagamento
+DocType: Repayment Schedule,Payment Date,Data di Pagamento
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +102,New Batch Qty,Nuovo Batch Qty
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,Abbigliamento e accessori
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,Numero di ordinazione
@@ -3572,7 +3580,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,Account con transazione registrate non può essere cancellato
 DocType: Vehicle,Last Carbon Check,Ultima verifica carbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,Spese legali
-DocType: Purchase Invoice,Posting Time,Tempo Distacco
+DocType: Purchase Invoice,Posting Time,Ora di Spedizione
 DocType: Timesheet,% Amount Billed,% Importo Fatturato
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,Telephone Expenses,Spese telefoniche
 DocType: Sales Partner,Logo,Logo
@@ -3590,23 +3598,23 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data Assegno
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: conto derivato {1} non appartiene alla società: {2}
 DocType: Program Enrollment Tool,Student Applicants,I candidati per studenti
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Tutte le operazioni relative a questa società, sono state cancellate con successo!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Tutte le operazioni relative a questa società, sono state cancellate con successo!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Come in data
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Iscrizione Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,prova
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componenti stipendio
 DocType: Program Enrollment Tool,New Academic Year,Nuovo anno accademico
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Ritorno / nota di credito
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Ritorno / nota di credito
 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 +28,Total Paid Amount,Importo totale pagato
 DocType: Production Order Item,Transferred Qty,Quantità trasferito
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navigazione
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,pianificazione
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Pianificazione
 apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,Emesso
 DocType: Project,Total Billing Amount (via Time Logs),Importo totale fatturazione (via Time Diari)
 apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,Vendiamo questo articolo
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Fornitore Id
+apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,Id Fornitore
 DocType: Payment Request,Payment Gateway Details,Payment Gateway Dettagli
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,Quantità deve essere maggiore di 0
 DocType: Journal Entry,Cash Entry,Cash Entry
@@ -3617,7 +3625,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo di foglie come casuale, malati ecc"
 DocType: Email Digest,Send regular summary reports via Email.,Invia relazioni di sintesi periodiche via Email.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Si prega di impostare account predefinito nel tipo di spesa rivendicazione {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Si prega di impostare account predefinito nel tipo di spesa rivendicazione {0}
 DocType: Assessment Result,Student Name,Nome dello studente
 DocType: Brand,Item Manager,Responsabile Articoli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll da pagare
@@ -3638,6 +3646,7 @@
 ,Sales Funnel,imbuto di vendita
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,L'abbreviazione è obbligatoria
 DocType: Project,Task Progress,Progresso dell'attività
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrello
 ,Qty to Transfer,Qtà da Trasferire
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Preventivo a Leads o a Clienti.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Ruolo ammessi da modificare stock congelato
@@ -3665,12 +3674,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Voce Wise fiscale Dettaglio
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abbreviazione Institute
 ,Item-wise Price List Rate,Articolo -saggio Listino Tasso
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,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/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},La quantità ({0}) non può essere una frazione nella riga {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,riscuotere i canoni
 DocType: Attendance,ATT-,la tentata
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Codice a barre {0} già utilizzato nel Prodotto {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Regole per l'aggiunta di spese di spedizione .
 DocType: Item,Opening Stock,Disponibilità Iniziale
@@ -3678,7 +3687,7 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +20,{0} is mandatory for Return,{0} è obbligatorio per Return
 DocType: Purchase Order,To Receive,Ricevere
 apps/erpnext/erpnext/public/js/setup_wizard.js +200,user@example.com,user@example.com
-DocType: Employee,Personal Email,Personal Email
+DocType: Employee,Personal Email,Email personale
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +57,Total Variance,Varianza totale
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.","Se abilitato, il sistema pubblicherà le scritture contabili per l&#39;inventario automatico."
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,mediazione
@@ -3687,19 +3696,19 @@
 Updated via 'Time Log'",Aggiornato da pochi minuti tramite 'Time Log'
 DocType: Customer,From Lead,Da Contatto
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Gli ordini rilasciati per la produzione.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selezionare l'anno fiscale ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selezionare l'anno fiscale ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profilo tenuto a POS Entry
 DocType: Program Enrollment Tool,Enroll Students,iscrivere gli studenti
 DocType: Hub Settings,Name Token,Nome Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Listino di Vendita
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,È obbligatorio almeno un deposito
 DocType: Serial No,Out of Warranty,Fuori Garanzia
 DocType: BOM Replace Tool,Replace,Sostituire
-DocType: Production Order,Unstopped,unstopped
+DocType: Production Order,Unstopped,Non fermato
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} per fattura di vendita {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nome del progetto
-DocType: Supplier,Mention if non-standard receivable account,Menzione se conto credito non standard
+DocType: Customer,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: Production Order,Required Items,Elementi richiesti
 DocType: Stock Ledger Entry,Stock Value Difference,Differenza Valore Giacenza
@@ -3720,14 +3729,14 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Fissare obiettivi Item Group-saggio per questo venditore.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelare Stocks Older Than [ giorni]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: L'indicazione dell'Asset è obbligatorio per acquisto/vendita di Beni Strumentali
-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.","Se due o più regole sui prezzi sono trovate delle condizioni di cui sopra, viene applicata la priorità. La priorità è un numero compreso tra 0 a 20, mentre il valore di default è pari a zero (vuoto). Numero maggiore significa che avrà la precedenza se ci sono più regole sui prezzi con le stesse condizioni."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se due o più regole sui prezzi sono trovate delle condizioni di cui sopra, viene applicata la priorità. La priorità è un numero compreso tra 0 a 20, mentre il valore di default è pari a zero (vuoto). Numero maggiore significa che avrà la precedenza se ci sono più regole sui prezzi con le stesse condizioni."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anno fiscale: {0} non esiste
 DocType: Currency Exchange,To Currency,Per valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Consentire i seguenti utenti per approvare le richieste per i giorni di blocco.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipi di Nota Spese.
 apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},Il tasso di vendita per l&#39;elemento {0} è inferiore a quello {1}. Il tasso di vendita dovrebbe essere almeno {2}
 DocType: Item,Taxes,Tasse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pagato ma non ritirato
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,Pagato e Non Consegnato
 DocType: Project,Default Cost Center,Centro di costo predefinito
 DocType: Bank Guarantee,End Date,Data di Fine
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,transazioni di magazzino
@@ -3745,7 +3754,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Articolo {0} ignorato poiché non è in Giacenza
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Conferma questo ordine di produzione per l'ulteriore elaborazione .
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per non applicare l'articolo Pricing in una determinata operazione, tutte le norme sui prezzi applicabili devono essere disabilitati."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Per non applicare l'articolo Pricing in una determinata operazione, tutte le norme sui prezzi applicabili devono essere disabilitati."
 DocType: Assessment Group,Parent Assessment Group,Capogruppo di valutazione
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Posizioni
 ,Sales Order Trends,Tendenze Sales Order
@@ -3756,7 +3765,7 @@
 DocType: Stock Entry Detail,Additional Cost,Costo aggiuntivo
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data di Esercizio di fine
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Crea un Preventivo Fornitore
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Crea un Preventivo Fornitore
 DocType: Quality Inspection,Incoming,In arrivo
 DocType: BOM,Materials Required (Exploded),Materiali necessari (dettagli)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Aggiungere utenti alla vostra organizzazione, diversa da te"
@@ -3775,7 +3784,7 @@
 DocType: Opportunity,Opportunity Date,Data Opportunità
 DocType: Purchase Receipt,Return Against Purchase Receipt,Di ritorno contro RICEVUTA
 DocType: Request for Quotation Item,Request for Quotation Item,Richiesta di offerta Articolo
-DocType: Purchase Order,To Bill,Per Bill
+DocType: Purchase Order,To Bill,Da Fatturare
 DocType: Material Request,% Ordered,% Ordinato
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date","Inserire l&#39;indirizzo e-mail separati da virgole, fattura sarà inviata automaticamente particolare data"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,lavoro a cottimo
@@ -3784,16 +3793,17 @@
 DocType: Employee,History In Company,Storia aziendale
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voce Inventario
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Gruppo Clienti&gt; Territorio
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Lo stesso articolo è stato inserito più volte
 DocType: Department,Leave Block List,Lascia il blocco lista
-DocType: Sales Invoice,Tax ID,Codice Fiscale
+DocType: Sales Invoice,Tax ID,P. IVA / Cod. Fis.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +188,Item {0} is not setup for Serial Nos. Column must be blank,L'articolo {0} non ha Numeri di Serie. La colonna deve essere vuota
 DocType: Accounts Settings,Accounts Settings,Impostazioni Conti
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +7,Approve,Approvare
 DocType: Customer,Sales Partner and Commission,Partner vendite e Commissione
 DocType: Employee Loan,Rate of Interest (%) / Year,Tasso di interesse (%) / anno
 ,Project Quantity,Progetto Quantità
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totale {0} per tutti gli elementi è pari a zero, può essere che si dovrebbe cambiare &#39;distribuire oneri corrispondenti&#39;"
 DocType: Opportunity,To Discuss,Da Discutere
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unità di {1} necessarie in {2} per completare la transazione.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tasso di interesse (%) Performance
@@ -3808,7 +3818,7 @@
 DocType: Purchase Invoice,Return,Ritorno
 DocType: Production Order Operation,Production Order Operation,Ordine di produzione Operation
 DocType: Pricing Rule,Disable,Disattiva
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Modalità di pagamento è richiesto di effettuare un pagamento
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Modalità di pagamento è richiesto di effettuare un pagamento
 DocType: Project Task,Pending Review,In attesa recensione
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} non può essere gettata, come è già {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Rimborso spese totale (via Expense Claim)
@@ -3816,11 +3826,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Contrassegna come Assente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riga {0}: Valuta del BOM # {1} deve essere uguale alla valuta selezionata {2}
 DocType: Journal Entry Account,Exchange Rate,Tasso di cambio:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,L'ordine di vendita {0} non è stato presentato
 DocType: Homepage,Tag Line,Tag Linea
 DocType: Fee Component,Fee Component,Fee Componente
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestione della flotta
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Aggiungere elementi da
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Aggiungere elementi da
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazzino {0}: il conto principale {1} non appartiene alla società {2}
 DocType: Cheque Print Template,Regular,Regolare
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage totale di tutti i criteri di valutazione deve essere al 100%
@@ -3833,24 +3843,24 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazzino {0} non esiste
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrati ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentuali Distribuzione Mensile
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,La voce selezionata non può avere Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,La voce selezionata non può avere Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","tasso di Valutazione non trovato per la voce {0}, che è necessario per fare delle scritture contabili per {1} {2}. Se l&#39;articolo è transazioni come un elemento di campione nel {1}, si prega di ricordare che nel {1} tavolo Item. In caso contrario, si prega di creare una transazione magazzino in entrata per il tasso di valutazione elemento o menzione nel record elemento e quindi provare submiting / cancellazione di questa voce"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% dei materiali consegnati di questa Bolla di Consegna
 DocType: Project,Customer Details,Dettagli Cliente
 DocType: Employee,Reports to,Reports a
-,Unpaid Expense Claim,Non pagato spese rivendicazione
+,Unpaid Expense Claim,Richiesta di spesa non retribuita
 DocType: SMS Settings,Enter url parameter for receiver nos,Inserisci parametri url per NOS ricevuti
 DocType: Payment Entry,Paid Amount,Importo pagato
 DocType: Assessment Plan,Supervisor,Supervisore
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,online
 ,Available Stock for Packing Items,Stock Disponibile per Imballaggio Prodotti
 DocType: Item Variant,Item Variant,Elemento Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Strumento di valutazione dei risultati
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Articolo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,gli Ordini Confermati non possono essere eliminati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Saldo a bilancio già nel debito, non è permesso impostare il 'Saldo Futuro' come 'credito'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestione della qualità
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Voce {0} è stato disabilitato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Voce {0} è stato disabilitato
 DocType: Employee Loan,Repay Fixed Amount per Period,Rimborsare importo fisso per Periodo
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Inserite la quantità per articolo {0}
 DocType: Employee External Work History,Employee External Work History,Storia lavorativa esterna del Dipendente
@@ -3860,7 +3870,7 @@
 DocType: Item Group,Parent Item Group,Gruppo Padre
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0} per {1}
 apps/erpnext/erpnext/setup/doctype/company/company.js +23,Cost Centers,Centri di costo
-DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasso al quale la valuta del fornitore viene convertito in valuta di base dell&#39;azienda
+DocType: Purchase Receipt,Rate at which supplier's currency is converted to company's base currency,Tasso al quale la valuta del fornitore viene convertita in valuta di base dell'azienda
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +36,Row #{0}: Timings conflicts with row {1},Row # {0}: conflitti Timings con riga {1}
 DocType: Purchase Invoice Item,Allow Zero Valuation Rate,Consenti il tasso di valutazione Zero
 DocType: Training Event Employee,Invited,Invitato
@@ -3876,7 +3886,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Avviso ( giorni )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Selezionare gli elementi per salvare la fattura
 DocType: Employee,Encashment Date,Data Incasso
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Regolazione della
@@ -3899,7 +3909,7 @@
 DocType: Item Variant Attribute,Attribute,Attributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Si prega di specificare da / a gamma
 DocType: Serial No,Under AMC,Sotto AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Voce tasso di valutazione viene ricalcolato considerando atterrato importo buono costo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Voce tasso di valutazione viene ricalcolato considerando atterrato importo buono costo
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Impostazioni predefinite per la vendita di transazioni.
 DocType: Guardian,Guardian Of ,guardian of
 DocType: Grading Scale Interval,Threshold,Soglia
@@ -3909,6 +3919,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota di Debito Emessa
 DocType: Production Order,Warehouses,Magazzini
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} attività non può essere trasferito
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Questa voce è una variante di {0} (Template).
 DocType: Workstation,per hour,all'ora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Acquisto
 DocType: Announcement,Announcement,Annuncio
@@ -3922,10 +3933,10 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Sconto massimo consentito per la voce: {0} {1}%
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,valore patrimoniale netto su
 DocType: Account,Receivable,Ricevibile
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non ammessi a cambiare fornitore come già esiste ordine d&#39;acquisto
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Fila # {0}: Non è consentito cambiare il Fornitore quando l'Ordine di Acquisto esiste già
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Ruolo che è consentito di presentare le transazioni che superano i limiti di credito stabiliti.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Selezionare gli elementi da Fabbricazione
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","sincronizzazione dei dati principali, potrebbe richiedere un certo tempo"
 DocType: Item,Material Issue,Fornitura materiale
 DocType: Hub Settings,Seller Description,Venditore Descrizione
 DocType: Employee Education,Qualification,Qualifica
@@ -3937,7 +3948,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordinato
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Criteri di valutazione del Gruppo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},L&#39;apertura del deprezzamento accumulato deve essere inferiore uguale a {0}
 DocType: Warehouse,Warehouse Name,Nome Deposito
 DocType: Naming Series,Select Transaction,Selezionare Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Inserisci Approvazione ruolo o Approvazione utente
@@ -3950,7 +3961,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste un movimento di magazzino {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Impossibile annullare perché esiste un movimento di magazzino {0}
 DocType: Employee Loan,Disbursement Date,L&#39;erogazione Data
 DocType: Vehicle,Vehicle,Veicolo
 DocType: Purchase Invoice,In Words,In Parole
@@ -3964,14 +3975,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Ammortamenti e saldi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Importo {0} {1} trasferito da {2} a {3}
 DocType: Sales Invoice,Get Advances Received,ottenere anticipo Ricevuto
 DocType: Email Digest,Add/Remove Recipients,Aggiungere/Rimuovere Destinatario
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Operazione non ammessi contro Production smesso di ordine {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Per impostare questo anno fiscale come predefinito , clicca su ' Imposta come predefinito'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Aderire
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Carenza Quantità
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} esiste con le stesse caratteristiche
 DocType: Employee Loan,Repay from Salary,Rimborsare da Retribuzione
 DocType: Leave Application,LAP/,GIRO/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Richiesta di pagamento contro {0} {1} per quantità {2}
@@ -3989,7 +4000,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,La valutazione dettagliata dei risultati
 DocType: Employee Education,Employee Education,Istruzione Dipendente
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,gruppo di articoli duplicato trovato nella tabella gruppo articoli
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,E &#39;necessario per recuperare Dettagli elemento.
 DocType: Salary Slip,Net Pay,Retribuzione Netta
 DocType: Account,Account,Account
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} è già stato ricevuto
@@ -3998,7 +4009,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazzino {0} non è legato ad alcun account, creare / collegare l&#39;account corrispondente (Asset) per il magazzino."
 DocType: Purchase Invoice,Recurring Id,Id ricorrente
 DocType: Customer,Sales Team Details,Vendite team Dettagli
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminare in modo permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Eliminare in modo permanente?
 DocType: Expense Claim,Total Claimed Amount,Totale importo richiesto
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenziali opportunità di vendita.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Non valido {0}
@@ -4009,13 +4020,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Imposta la tua scuola a ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base quantità di modifica (Società di valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nessuna scritture contabili per le seguenti magazzini
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvare prima il documento.
 DocType: Account,Chargeable,Addebitabile
 DocType: Company,Change Abbreviation,Change Abbreviazione
 DocType: Expense Claim Detail,Expense Date,Data Spesa
 DocType: Item,Max Discount (%),Sconto Max (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Ultimo ammontare ordine
+DocType: Task,Is Milestone,È Milestone
 DocType: Daily Work Summary,Email Sent To,Email inviata a
 DocType: Budget,Warn,Avvisa
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuali altre osservazioni, sforzo degno di nota che dovrebbe andare nelle registrazioni."
@@ -4036,11 +4048,11 @@
 DocType: Item Attribute Value,Attribute Value,Valore Attributo
 ,Itemwise Recommended Reorder Level,Itemwise consigliata riordino Livello
 DocType: Salary Detail,Salary Detail,stipendio Dettaglio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Si prega di selezionare {0} prima
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Si prega di selezionare {0} prima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Il lotto {0} di {1} scaduto.
 DocType: Sales Invoice,Commission,Commissione
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet per la produzione.
-apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,totale parziale
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,Sub Totale
 DocType: Salary Detail,Default Amount,Importo Predefinito
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,Magazzino non trovato nel sistema
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +116,This Month's Summary,Sommario di questo mese
@@ -4048,41 +4060,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Blocca Scorte più vecchie di` dovrebbero essere inferiori %d giorni .
 DocType: Tax Rule,Purchase Tax Template,Acquisto fiscale Template
 ,Project wise Stock Tracking,Progetto saggio Archivio monitoraggio
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programma di manutenzione {0} esiste per {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Q.tà reale (in origine/obiettivo)
 DocType: Item Customer Detail,Ref Code,Codice Rif
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Informazioni Dipendente.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Si prega di impostare Successivo Ammortamenti Data
 DocType: HR Settings,Payroll Settings,Impostazioni Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Partita Fatture non collegati e pagamenti.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Invia ordine
 DocType: Email Digest,New Purchase Orders,Nuovi Ordini di acquisto
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root non può avere un centro di costo genitore
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Seleziona Marchio ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Seleziona Marchio ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Fondo ammortamento come su
 DocType: Sales Invoice,C-Form Applicable,C-Form Applicable
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazzino è obbligatoria
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tempo di funzionamento deve essere maggiore di 0 per Operation {0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazzino è obbligatorio
 DocType: Supplier,Address and Contacts,Indirizzo e contatti
-DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Dettaglio di conversione
+DocType: UOM Conversion Detail,UOM Conversion Detail,Dettaglio di conversione Unità di Misura
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Proporzioni adatte al Web: 900px (w) per 100px (h)
 DocType: Program,Program Abbreviation,Abbreviazione programma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordine di produzione non può essere sollevata nei confronti di un modello di elemento
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Le tariffe sono aggiornati in acquisto ricevuta contro ogni voce
 DocType: Warranty Claim,Resolved By,Deliberato dall&#39;Assemblea
 DocType: Bank Guarantee,Start Date,Data di inizio
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Allocare le foglie per un periodo .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Assegni e depositi cancellati in modo non corretto
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Account {0}: non è possibile assegnare se stesso come conto principale
 DocType: Purchase Invoice Item,Price List Rate,Prezzo di Listino
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Creare le citazioni dei clienti
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Creare le citazioni dei clienti
 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 +38,Bill of Materials (BOM),Distinte materiali (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tempo medio impiegato dal fornitore di consegnare
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,valutazione dei risultati
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ore
 DocType: Project,Expected Start Date,Data di inizio prevista
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Rimuovere articolo se le spese non è applicabile a tale elemento
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Valuta di transazione deve essere uguale a pagamento moneta Gateway
 DocType: Payment Entry,Receive,Ricevere
@@ -4093,21 +4104,21 @@
 DocType: Workstation,Operating Costs,Costi operativi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Azione da effettuarsi se si eccede il budget mensile
 DocType: Purchase Invoice,Submit on creation,Conferma su creazione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta per {0} deve essere {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta per {0} deve essere {1}
 DocType: Asset,Disposal Date,Smaltimento Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Messaggi di posta elettronica verranno inviati a tutti i dipendenti attivi della società nell&#39;ora dato, se non hanno le vacanze. Sintesi delle risposte verrà inviata a mezzanotte."
 DocType: Employee Leave Approver,Employee Leave Approver,Responsabile / Approvatore Ferie
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Riga {0}: Una voce di riordino esiste già per questo magazzino {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Non è possibile dichiarare come perduto, perché è stato fatto il Preventivo."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Formazione Commenti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,L'ordine di produzione {0} deve essere presentato
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Scegliere una data di inizio e di fine per la voce {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Corso è obbligatoria in riga {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,'A Data' deve essere successiva a 'Da Data'
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Aggiungi / Modifica prezzi
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Aggiungi / Modifica prezzi
 DocType: Batch,Parent Batch,Parte Batch
-DocType: Cheque Print Template,Cheque Print Template,Assegno modello di stampa
+DocType: Cheque Print Template,Cheque Print Template,Modello di stampa dell'Assegno
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafico Centro di Costo
 ,Requested Items To Be Ordered,Elementi richiesti da ordinare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,Magazzino aziendale deve essere uguale all account aziendale
@@ -4118,7 +4129,7 @@
 ,Ordered Items To Be Delivered,Articoli ordinati da consegnare
 DocType: Account,Income,Proventi
 DocType: Industry Type,Industry Type,Tipo Industria
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Qualcosa è andato storto!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Qualcosa è andato storto!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,La fattura di vendita {0} è già stata presentata
 DocType: Assessment Result Detail,Score,Punto
@@ -4134,7 +4145,7 @@
 DocType: Email Digest,Pending Quotations,In attesa di Citazioni
 apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,Point-of-Sale Profilo
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,Si prega di aggiornare le impostazioni SMS
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,I prestiti non garantiti
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,Prestiti non garantiti
 DocType: Cost Center,Cost Center Name,Nome Centro di Costo
 DocType: Employee,B+,B +
 DocType: HR Settings,Max working hours against Timesheet,Max ore di lavoro contro Timesheet
@@ -4148,18 +4159,18 @@
 DocType: Student Group Creation Tool,Student Group Creation Tool,Student Gruppo strumento di creazione
 DocType: Item,Variant Based On,Variante calcolate in base a
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage totale assegnato dovrebbe essere al 100% . E ' {0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,I vostri fornitori
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Impossibile impostare come persa come è fatto Sales Order .
-DocType: Request for Quotation Item,Supplier Part No,Di parte del fornitore No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Ricevuto da
+apps/erpnext/erpnext/public/js/setup_wizard.js +265,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 .
+DocType: Request for Quotation Item,Supplier Part No,Articolo Fornitore No
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Non può dedurre quando categoria è per &#39;valutazione&#39; o &#39;Vaulation e Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Ricevuto da
 DocType: Lead,Converted,Convertito
 DocType: Item,Has Serial No,Ha numero di serie
 DocType: Employee,Date of Issue,Data Pubblicazione
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Da {0} per {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare fornitore per voce {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Da {0} per {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Fila # {0}: Impostare Fornitore per Articolo {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Riga {0}: valore Ore deve essere maggiore di zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4168,30 +4179,30 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Non sei autorizzato a impostare il valore bloccato
 DocType: Payment Reconciliation,Get Unreconciled Entries,Ottieni entrate non riconciliate
 DocType: Payment Reconciliation,From Invoice Date,Da Data fattura
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Valuta di fatturazione deve essere uguale alla valuta di valuta o conto del partito o di comapany di default
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Valuta di fatturazione deve essere uguale alla valuta di valuta o conto del partito o di comapany di default
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,lasciare Incasso
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Che cosa fa ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Al Deposito
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tutte le ammissioni degli studenti
 ,Average Commission Rate,Tasso medio di commissione
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,La Presenza non può essere inserita nel futuro
 DocType: Pricing Rule,Pricing Rule Help,Regola Prezzi Aiuto
 DocType: School House,House Name,Nome della casa
 DocType: Purchase Taxes and Charges,Account Head,Riferimento del conto
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,elettrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Aggiungere il resto della vostra organizzazione come gli utenti. È inoltre possibile aggiungere invitare i clienti a proprio portale con l&#39;aggiunta di loro di contatti
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Aggiungere il resto della vostra organizzazione come gli utenti. È inoltre possibile aggiungere invitare i clienti a proprio portale con l&#39;aggiunta di loro di contatti
 DocType: Stock Entry,Total Value Difference (Out - In),Totale Valore Differenza (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID utente non impostato per Dipedente {0}
 DocType: Vehicle,Vehicle Value,Valore veicolo
 DocType: Stock Entry,Default Source Warehouse,Deposito Origine Predefinito
 DocType: Item,Customer Code,Codice Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Promemoria Compleanno per {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Giorni dall'ultimo ordine
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
-DocType: Buying Settings,Naming Series,Serie Nomine
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debito Per account deve essere un account di Stato Patrimoniale
+DocType: Buying Settings,Naming Series,Denominazione Serie
 DocType: Leave Block List,Leave Block List Name,Lascia Block List Nome
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Assicurazione Data di inizio deve essere inferiore a Assicurazione Data Fine
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +32,Stock Assets,Attivo Immagini
@@ -4205,9 +4216,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Salario Slip of dipendente {0} già creato per foglio di tempo {1}
 DocType: Vehicle Log,Odometer,Odometro
 DocType: Sales Order Item,Ordered Qty,Quantità ordinato
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Articolo {0} è disattivato
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Articolo {0} è disattivato
 DocType: Stock Settings,Stock Frozen Upto,Giacenza Bloccate Fino
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM non contiene alcun elemento magazzino
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Attività / attività del progetto.
 DocType: Vehicle Log,Refuelling Details,Dettagli di rifornimento
@@ -4217,8 +4228,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Ultimo tasso di acquisto non trovato
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrivi Off Importo (Società valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore di fatturazione
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Distinta Materiali predefinita per {0} non trovato
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Fila # {0}: Si prega di impostare la quantità di riordino
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tocca gli elementi da aggiungere qui
 DocType: Fees,Program Enrollment,programma Iscrizione
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Impostare {0}
@@ -4240,7 +4252,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data di manutenzione
 DocType: Purchase Invoice Item,Rejected Serial No,Rifiutato Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Anno data di inizio o di fine si sovrappone {0}. Per evitare di impostare azienda
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data di inizio dovrebbe essere inferiore a quella di fine per la voce {0}
 DocType: Item,"Example: ABCD.#####
 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.","Esempio:. ABCD. ##### Se è impostato 'serie' ma il Numero di Serie non è specificato nelle transazioni, verrà creato il numero di serie automatico in base a questa serie. Se si vuole sempre specificare il Numero di Serie per questo articolo. Lasciare vuoto."
 DocType: Upload Attendance,Upload Attendance,Carica presenze
@@ -4315,7 +4327,6 @@
 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
-DocType: Grade Interval,Grade Interval,Intervallo di grado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Anno fiscale Data di inizio e Data Fine dell'anno fiscale sono già impostati nel Fiscal Year {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Liquidazione Data di aggiornamento
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4323,7 +4334,7 @@
 DocType: Request for Quotation Supplier,Download PDF,Scarica il pdf
 DocType: Production Order,Planned End Date,Data di fine pianificata
 apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,Dove gli elementi vengono memorizzati.
-DocType: Request for Quotation,Supplier Detail,Particolare Fornitore
+DocType: Request for Quotation,Supplier Detail,Dettaglio del Fornitore
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},Errore nella formula o una condizione: {0}
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,Importo fatturato
 DocType: Attendance,Attendance,Presenze
@@ -4339,7 +4350,7 @@
 apps/erpnext/erpnext/config/selling.py +67,Price List master.,Maestro listino prezzi.
 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
+DocType: Purchase Taxes and Charges,On Net Total,Sul Totale Netto
 apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},Valore per l&#39;attributo {0} deve essere all&#39;interno della gamma di {1} a {2} nei incrementi di {3} per la voce {4}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,Obiettivo Magazzino sulla riga {0} deve essere uguale a quello dell'ordine di produzione
 apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,'Indirizzi email di notifica' non specificati per %s ricorrenti
@@ -4360,14 +4371,14 @@
 DocType: Bin,Reserved Qty for Production,Riservato Quantità per Produzione
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lasciate non selezionate se non si desidera considerare il gruppo durante la creazione di gruppi basati sul corso.
 DocType: Asset,Frequency of Depreciation (Months),Frequenza di ammortamento (Mesi)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conto di credito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Conto di credito
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost articolo
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Imposta un semplice sito web per la mia organizzazione
 DocType: Payment Reconciliation,Receivable / Payable Account,Contabilità Clienti /Fornitori
 DocType: Delivery Note Item,Against Sales Order Item,Contro Sales Order Item
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +649,Please specify Attribute Value for attribute {0},Si prega di specificare Attributo Valore per l&#39;attributo {0}
 DocType: Item,Default Warehouse,Magazzino Predefinito
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bilancio non può essere assegnato contro account gruppo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Inserisci il centro di costo genitore
@@ -4410,9 +4421,9 @@
 DocType: Opportunity Item,Basic Rate,Tasso Base
 DocType: GL Entry,Credit Amount,Ammontare del credito
 DocType: Cheque Print Template,Signatory Position,Posizione firmatario
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Imposta come persa
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Imposta come persa
 DocType: Timesheet,Total Billable Hours,Totale ore fatturabili
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ricevuta di pagamento Nota
+apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota Ricevuta di pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Questo si basa su operazioni contro questo cliente. Vedere cronologia sotto per i dettagli
 DocType: Supplier,Credit Days Based On,Giorni di credito in funzione
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},Riga {0}: importo assegnato {1} deve essere inferiore o uguale a Importo del pagamento Entry {2}
@@ -4424,11 +4435,11 @@
 ,Items To Be Requested,Articoli da richiedere
 DocType: Purchase Order,Get Last Purchase Rate,Ottieni ultima quotazione acquisto
 DocType: Company,Company Info,Info Azienda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selezionare o aggiungere nuovo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Selezionare o aggiungere nuovo cliente
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Centro di costo è necessario per prenotare un rimborso spese
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Applicazione dei fondi ( Assets )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Questo si basa sulla presenza di questo dipendente
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Conto di addebito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4437,30 +4448,32 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Ammontare dell&#39;acquisto
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Preventivo Fornitore {0} creato
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fine anno non può essere prima di inizio anno
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefici per i dipendenti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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 +252,Packed quantity must equal quantity for Item {0} in row {1},La quantità imballata deve essere uguale per l'articolo {0} sulla riga {1}
 DocType: Production Order,Manufactured Qty,Quantità Prodotto
 DocType: Purchase Receipt Item,Accepted Quantity,Quantità accettata
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Si prega di impostare un valore predefinito lista per le vacanze per i dipendenti {0} o {1} società
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} non esiste
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} non esiste
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Fila No {0}: Importo non può essere maggiore di attesa Importo contro Rimborso Spese {1}. In attesa importo è {2}
 DocType: Maintenance Schedule,Schedule,Pianificare
-DocType: Account,Parent Account,Account principale
+DocType: Account,Parent Account,Account genitore
 DocType: Quality Inspection Reading,Reading 3,Lettura 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Tipo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Listino Prezzi non trovato o disattivato
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Listino Prezzi non trovato o disattivato
 DocType: Employee Loan Application,Approved,Approvato
-DocType: Pricing Rule,Price,prezzo
+DocType: Pricing Rule,Price,Prezzo
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Dipendente esonerato da {0} deve essere impostato come 'Congedato'
 DocType: Guardian,Guardian,Custode
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Valutazione {0} creato per Employee {1} nel determinato intervallo di date
 DocType: Employee,Education,Educazione
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campagna di denominazione
 DocType: Employee,Current Address Is,Indirizzo attuale è
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificata
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opzionale. Imposta valuta predefinita dell&#39;azienda, se non specificato."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Diario scritture contabili.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Disponibile Quantità a partire Warehouse
@@ -4469,7 +4482,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riga {0}: partito / Account non corrisponde con {1} / {2} {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Inserisci il Conto uscite
 DocType: Account,Stock,Magazzino
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Riferimento Tipo di documento deve essere uno di Ordine di Acquisto, fatture di acquisto o diario"
 DocType: Employee,Current Address,Indirizzo Corrente
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se l'articolo è una variante di un altro elemento poi descrizione, immagini, prezzi, tasse ecc verrà impostata dal modello se non espressamente specificato"
 DocType: Serial No,Purchase / Manufacture Details,Acquisto / Produzione Dettagli
@@ -4481,7 +4494,7 @@
 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
 DocType: Pricing Rule,Min Qty,Qtà Min
 DocType: Asset Movement,Transaction Date,Transaction Data
-DocType: Production Plan Item,Planned Qty,Qtà Planned
+DocType: Production Plan Item,Planned Qty,Quantità prevista
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,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
 DocType: Stock Entry,Default Target Warehouse,Deposito Destinazione Predefinito
@@ -4497,14 +4510,14 @@
 DocType: Hub Settings,Hub Settings,Impostazioni Hub
 DocType: Project,Gross Margin %,Margine lordo %
 DocType: BOM,With Operations,Con operazioni
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Scritture contabili sono già stati fatti in valuta {0} per azienda {1}. Si prega di selezionare un account di credito o da pagare con moneta {0}.
 DocType: Asset,Is Existing Asset,È esistente Asset
 DocType: Salary Detail,Statistical Component,Componente statistico
 ,Monthly Salary Register,Registro Stipendio Mensile
 DocType: Warranty Claim,If different than customer address,Se diverso da indirizzo del cliente
 DocType: BOM Operation,BOM Operation,Operazione BOM
 DocType: School Settings,Validate the Student Group from Program Enrollment,Validare il gruppo studente dall&#39;iscrizione al programma
-DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul Fila Indietro Importo
+DocType: Purchase Taxes and Charges,On Previous Row Amount,Sul valore della riga precedente
 DocType: Student,Home Address,Indirizzo
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,Trasferimento Asset
 DocType: POS Profile,POS Profile,POS Profilo
@@ -4519,8 +4532,8 @@
 DocType: SMS Settings,Static Parameters,Parametri statici
 DocType: Assessment Plan,Room,Camera
 DocType: Purchase Order,Advance Paid,Anticipo versato
-DocType: Item,Item Tax,Tax articolo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale da Fornitore
+DocType: Item,Item Tax,Tasse dell'Articolo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale al Fornitore
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Accise Fattura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Soglia {0}% appare più di una volta
 DocType: Expense Claim,Employees Email Id,Email Dipendenti
@@ -4551,19 +4564,20 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Allega Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,I livelli delle scorte
 DocType: Customer,Commission Rate,Tasso Commissione
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Crea variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Crea variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocco domande uscita da ufficio.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo di pagamento deve essere uno dei Ricevere, Pay e di trasferimento interno"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipo di pagamento deve essere uno dei Ricevere, Pay e di trasferimento interno"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitica
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Carrello è Vuoto
 DocType: Vehicle,Model,Modello
 DocType: Production Order,Actual Operating Cost,Costo operativo effettivo
-DocType: Payment Entry,Cheque/Reference No,Assegno / di riferimento
+DocType: Payment Entry,Cheque/Reference No,Assegno / N. di riferimento
 apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,Root non può essere modificato .
 DocType: Item,Units of Measure,Unità di misura
 DocType: Manufacturing Settings,Allow Production on Holidays,Consentire una produzione su Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Data ordine acquisto Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capitale Sociale
+DocType: Shopping Cart Settings,Show Public Attachments,Mostra gli allegati pubblici
 DocType: Packing Slip,Package Weight Details,Pacchetto peso
 DocType: Payment Gateway Account,Payment Gateway Account,Pagamento Conto Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Dopo il completamento pagamento reindirizzare utente a pagina selezionata.
@@ -4581,16 +4595,16 @@
 ,Item-wise Purchase Register,Articolo-saggio Acquisto Registrati
 DocType: Batch,Expiry Date,Data Scadenza
 ,Supplier Addresses and Contacts,Indirizzi e contatti Fornitore
-,accounts-browser,sfoglia-conti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Si prega di selezionare Categoria prima
+,accounts-browser,schema contabile
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Si prega di selezionare Categoria prima
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Progetto Master.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Per consentire un eccesso di fatturazione o sopra-ordinazione, aggiornare &quot;Allowance&quot; in Impostazioni archivio o la voce."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Non visualizzare nessun simbolo tipo € dopo le Valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Mezza giornata)
 DocType: Supplier,Credit Days,Giorni Credito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Crea un Insieme di Studenti
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Crea un Insieme di Studenti
 DocType: Leave Type,Is Carry Forward,È Portare Avanti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Recupera elementi da Distinta Base
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Recupera elementi da Distinta Base
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Giorni per la Consegna
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Data di registrazione deve essere uguale alla data di acquisto {1} per l'asset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Si prega di inserire gli ordini di vendita nella tabella precedente
@@ -4607,7 +4621,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Si prega di impostare la serie di numeri per la partecipazione tramite Setup&gt; Serie di numerazione
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 50df73b..11c5f72 100644
--- a/erpnext/translations/ja.csv
+++ b/erpnext/translations/ja.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,賃貸
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ユーザーに適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止中の製造指示をキャンセルすることはできません。キャンセルする前に停止解除してください
 DocType: Vehicle Service,Mileage,マイレージ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,本当にこの資産を廃棄しますか？
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,デフォルトサプライヤーを選択
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,デフォルトサプライヤーを選択
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},価格表{0}には通貨が必要です
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,※取引内で計算されます。
 DocType: Purchase Order,Customer Contact,顧客連絡先
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0}の残高はゼロより小さくすることはできません（{1}）
 DocType: Manufacturing Settings,Default 10 mins,デフォルト 10分
 DocType: Leave Type,Leave Type Name,休暇タイプ名
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,オープンを表示
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,オープンを表示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,シリーズを正常に更新しました
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,チェックアウト
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,提出Accural仕訳
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,バッチ項目の有効期限ステータス
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,銀行為替手形
 DocType: Mode of Payment Account,Mode of Payment Account,支払口座のモード
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,バリエーションを表示
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,バリエーションを表示
 DocType: Academic Term,Academic Term,学術用語
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,アカウントの表は、空白にすることはできません。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ローン（負債）
 DocType: Employee Education,Year of Passing,経過年
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",参考：％sは、商品コード：％sと顧客：％sの
 DocType: Item,Country of Origin,原産国
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,在庫中
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,未解決の問題
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,健康管理
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),支払遅延（日数）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,サービス費用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,請求
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},シリアル番号：{0}は既に販売請求書：{1}で参照されています
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,請求
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会計年度{0}が必要です
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,予想納期は受注日前のことです
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",古い名前、新しい名前の計2列となっている.csvファイルを添付してください
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}ではない任意のアクティブ年度インチ
 DocType: Packed Item,Parent Detail docname,親詳細文書名
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参照：{0}、商品コード：{1}、顧客：{2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,ログ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,欠員
 DocType: Item Attribute,Increment,増分
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,倉庫を選択...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,倉庫を選択...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,広告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同じ会社が複数回入力されています
 DocType: Employee,Married,結婚してる
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} は許可されていません
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,からアイテムを取得します
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} は許可されていません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,からアイテムを取得します
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},納品書{0}に対して在庫を更新することはできません
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},製品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,リストされたアイテム
 DocType: Payment Reconciliation,Reconcile,照合
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,食料品
 DocType: Quality Inspection Reading,Reading 1,報告要素1
 DocType: Process Payroll,Make Bank Entry,銀行エントリを作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,年金基金
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,次の減価償却日付は購入日の前にすることはできません
 DocType: SMS Center,All Sales Person,全ての営業担当者
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**毎月分配**は、あなたのビジネスで季節を持っている場合は、数ヶ月を横断予算/ターゲットを配布するのに役立ちます。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,アイテムが見つかりません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,アイテムが見つかりません
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,給与構造の欠落
 DocType: Lead,Person Name,人名
 DocType: Sales Invoice Item,Sales Invoice Item,請求明細
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",例えば、「小学校」や「大学」
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,在庫レポート
 DocType: Warehouse,Warehouse Detail,倉庫の詳細
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},顧客{0}の与信限度額を超えました {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,期間終了日は、後の項が（アカデミック・イヤー{}）リンクされている年度の年度終了日を超えることはできません。日付を訂正して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",資産レコードが項目に対して存在するように、オフにすることはできません「固定資産です」
 DocType: Vehicle Service,Brake Oil,ブレーキオイル
 DocType: Tax Rule,Tax Type,税タイプ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0}以前のエントリーを追加または更新する権限がありません
 DocType: BOM,Item Image (if not slideshow),アイテム画像（スライドショーされていない場合）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名の顧客が存在します
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（時間単価 ÷ 60）× 実際の作業時間
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOMを選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOMを選択
 DocType: SMS Log,SMS Log,SMSログ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,納品済アイテムの費用
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}上の休日は、日付からと日付までの間ではありません
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,学校
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},従業員が見つかりませ休暇レコードはありません{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,最初の「会社」を入力してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,費用合計
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,請求額
 DocType: Employee,Mr,氏
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomerグループテーブルで見つかった重複する顧客グループ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,サプライヤータイプ/サプライヤー
 DocType: Naming Series,Prefix,接頭辞
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,消耗品
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,グレード
 DocType: Sales Invoice Item,Delivered By Supplier,サプライヤーにより配送済
 DocType: SMS Center,All Contact,全ての連絡先
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,すでにBOMを持つすべてのアイテム用に作成した製造指図
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,年俸
 DocType: Daily Work Summary,Daily Work Summary,毎日の仕事の概要
 DocType: Period Closing Voucher,Closing Fiscal Year,閉会年度
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} は凍結されています
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} は凍結されています
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,勘定科目表を作成するための既存の会社を選択してください
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,在庫経費
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ターゲット倉庫の選択
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,逆仕訳
 DocType: Journal Entry Account,Credit in Company Currency,会社通貨の貸方
 DocType: Delivery Note,Installation Status,設置ステータス
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",あなたが出席を更新しますか？ <br>現在：{0} \ <br>不在：{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},受入数と拒否数の合計はアイテム{0}の受領数と等しくなければなりません
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,購入のための原材料供給
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,支払いの少なくとも1モードはPOS請求書に必要とされます。
 DocType: Products Settings,Show Products as a List,製品を表示するリストとして
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","テンプレートをダウンロードし、適切なデータを記入した後、変更したファイルを添付してください。
@@ -222,7 +224,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,減価償却のエントリを作成します
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,要求タイプ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,従業員作成
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,従業員作成
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,放送
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,実行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,作業遂行の詳細
@@ -238,6 +240,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,メンテナンス訪問計画
 DocType: SMS Settings,Enter url parameter for message,メッセージのURLパラメータを入力してください
 DocType: POS Profile,Customer Groups,顧客グループ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,財務諸表
 DocType: Guardian,Students,学生の
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,価格設定と割引を適用するためのルール
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,価格表は売買に適用可能でなければなりません
@@ -263,11 +266,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},前払金は {0} {1} より大きくすることはできません
 DocType: Naming Series,Series List for this Transaction,この取引のシリーズ一覧
 DocType: Company,Default Payroll Payable Account,デフォルトの給与買掛金
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,更新メールグループ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新メールグループ
 DocType: Sales Invoice,Is Opening Entry,オープンエントリー
 DocType: Customer Group,Mention if non-standard receivable account applicable,非標準的な売掛金が適応可能な場合に記載
 DocType: Course Schedule,Instructor Name,インストラクターの名前
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,提出前に必要とされる倉庫用
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,リセラー
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",チェックした場合、素材の要求で非在庫品目が含まれます。
@@ -275,7 +278,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,対販売伝票アイテム
 ,Production Orders in Progress,進行中の製造指示
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,財務によるキャッシュ・フロー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",localStorageがいっぱいになった、保存されませんでした
 DocType: Lead,Address & Contact,住所・連絡先
 DocType: Leave Allocation,Add unused leaves from previous allocations,前回の割当から未使用の休暇を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},次の繰り返し {0} は {1} 上に作成されます
@@ -301,8 +304,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),（タイムシートを介して）総原価計算量
 DocType: Item Website Specification,Item Website Specification,アイテムのWebサイトの仕様
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,銀行エントリー
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},アイテム{0}は{1}に耐用年数の終わりに達します
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,銀行エントリー
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,年次
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,在庫棚卸アイテム
 DocType: Stock Entry,Sales Invoice No,請求番号
@@ -320,8 +323,8 @@
 DocType: Item,Publish in Hub,ハブに公開
 DocType: Student Admission,Student Admission,学生の入学
 ,Terretory,地域
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,アイテム{0}をキャンセルしました
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,資材要求
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,アイテム{0}をキャンセルしました
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,資材要求
 DocType: Bank Reconciliation,Update Clearance Date,清算日の更新
 DocType: Item,Purchase Details,仕入詳細
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},仕入注文 {1} の「原材料供給」テーブルにアイテム {0} が見つかりません
@@ -357,10 +360,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,明らかに優れた小切手および預金
 DocType: Item,Synced With Hub,ハブと同期
 DocType: Vehicle,Fleet Manager,フリートマネージャ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},行番号{0}：{1}項目{2}について陰性であることができません
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,間違ったパスワード
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},行番号{0}：{1}項目{2}について陰性であることができません
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,間違ったパスワード
 DocType: Item,Variant Of,バリエーション元
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',完成した数量は「製造数量」より大きくすることはできません
 DocType: Period Closing Voucher,Closing Account Head,決算科目
 DocType: Employee,External Work History,職歴（他社）
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環参照エラー
@@ -373,12 +376,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自動的な資材要求の作成時にメールで通知
 DocType: Journal Entry,Multi Currency,複数通貨
 DocType: Payment Reconciliation Invoice,Invoice Type,請求書タイプ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,納品書
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,納品書
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,税設定
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,販売資産の取得原価
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,支払エントリが変更されています。引用しなおしてください
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
-DocType: Grade Interval,Min Score,最小スコア
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,アイテムの税金に{0}が2回入力されています
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,今週と保留中の活動の概要
 DocType: Student Applicant,Admitted,認められました
 DocType: Workstation,Rent Cost,地代・賃料
@@ -390,7 +392,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,注文額
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,当事者に対してまたは内部転送のための銀行/現金取引
 DocType: Shipping Rule,Valid for Countries,有効な国
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"この商品はテンプレートで、取引内で使用することはできません。
 「コピーしない」が設定されていない限り、アイテムの属性は、バリエーションにコピーされます"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,検討された注文合計
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",従業員の肩書（例：最高経営責任者（CEO）、取締役など）。
@@ -400,14 +402,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：購入請求書は、既存の資産に対して行うことはできません。{1}
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} は従業員 {1} の期間 {2} から {3} へ既に割り当てられています
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,アイテムを選択
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,アイテムを選択
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,仕入請求{0}はすでに提出されています
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：バッチ番号は {1} {2}と同じである必要があります
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,非グループに変換
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,アイテムのバッチ（ロット）
 DocType: C-Form Invoice Detail,Invoice Date,請求日付
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},{0} {1} では会社ごとに1アカウントのみとなります
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,添付ファイルを参照してください
 DocType: Purchase Order,% Received,％受領
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,学生グループを作成します。
@@ -436,9 +438,9 @@
 DocType: Request for Quotation,Request for Quotation,見積依頼
 DocType: Salary Slip Timesheet,Working Hours,労働時間
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,既存のシリーズについて、開始／現在の連続番号を変更します。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,新しい顧客を作成します。
-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.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,発注書を作成します。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,新しい顧客を作成します。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",複数の価格設定ルールが優先しあった場合、ユーザーは、競合を解決するために、手動で優先度を設定するように求められます。
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,発注書を作成します。
 ,Purchase Register,仕入帳
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,適用料金
@@ -446,7 +448,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0}（{1}）は「休暇承認者」の役割を持っている必要があります
 DocType: Purchase Receipt,Vehicle Date,車両日付
 DocType: Student Log,Medical,検診
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,失敗の原因
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,失敗の原因
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,リード所有者は、鉛と同じにすることはできません
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,配分される金額未調整の量よりも多くすることはできません
 DocType: Announcement,Receiver,受信機
@@ -463,6 +465,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量とレート
 DocType: Delivery Note,% Installed,％インストール
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/講演会をスケジュールすることができ研究所など。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,最初の「会社」名を入力してください
 DocType: Purchase Invoice,Supplier Name,サプライヤー名
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNextマニュアルをご覧ください
@@ -478,16 +481,17 @@
 DocType: Account,Old Parent,古い親
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必須項目 - アカデミックイヤー
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,メールの一部となる入門テキストをカスタマイズします。各取引にははそれぞれ入門テキストがあります
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},{0}社のデフォルト支払い可能口座を設定してください
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,全製造プロセスの共通設定
 DocType: Accounts Settings,Accounts Frozen Upto,凍結口座上限
 DocType: SMS Log,Sent On,送信済
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性 {0} は属性表内で複数回選択されています
 DocType: HR Settings,Employee record is created using selected field. ,従業員レコードは選択されたフィールドを使用して作成されます。
 DocType: Sales Order,Not Applicable,特になし
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,休日マスター
 DocType: Request for Quotation Item,Required Date,要求日
 DocType: Delivery Note,Billing Address,請求先住所
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,アイテムコードを入力してください
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,アイテムコードを入力してください
 DocType: BOM,Costing,原価計算
 DocType: Tax Rule,Billing County,ビリングス郡
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",チェックすると、税額が既に表示上の単価／額に含まれているものと見なされます
@@ -502,6 +506,7 @@
 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,有価証券および預金
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",独自の評価方法を持たない一部の商品との取引があるため、評価方法を変更することはできません
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,割り当てられた総葉は必須です
 DocType: Job Opening,Description of a Job Opening,求人の説明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今日のために保留中の活動
@@ -522,13 +527,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,管理担当者
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,コースを選択してください
 DocType: Timesheet Detail,Hrs,時間
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,会社を選択してください
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,会社を選択してください
 DocType: Stock Entry Detail,Difference Account,差損益
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,依存するタスク{0}がクローズされていないため、タスクをクローズできません
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,資材要求が発生する倉庫を入力してください
 DocType: Production Order,Additional Operating Cost,追加の営業費用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化粧品
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",マージするには、両方のアイテムで次の属性が同じである必要があります。
 DocType: Shipping Rule,Net Weight,正味重量
 DocType: Employee,Emergency Phone,緊急電話
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購入
@@ -537,7 +542,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,しきい値0％のグレードを定義してください
 DocType: Sales Order,To Deliver,配送する
 DocType: Purchase Invoice Item,Item,アイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,シリアル番号の項目は、分数ではできません
 DocType: Journal Entry,Difference (Dr - Cr),差額（借方 - 貸方）
 DocType: Account,Profit and Loss,損益
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,業務委託管理
@@ -552,7 +557,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,増分は0にすることはできません
 DocType: Production Planning Tool,Material Requirement,資材所要量
 DocType: Company,Delete Company Transactions,会社の取引を削除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,リファレンスはありませんし、基準日は、銀行取引のために必須です
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,租税公課の追加/編集
 DocType: Purchase Invoice,Supplier Invoice No,サプライヤー請求番号
 DocType: Territory,For reference,参考のため
@@ -563,7 +568,7 @@
 DocType: Installation Note Item,Installation Note Item,設置票アイテム
 DocType: Production Plan Item,Pending Qty,保留中の数量
 DocType: Budget,Ignore,無視
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1}アクティブではありません
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1}アクティブではありません
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},次の番号に送信されたSMS：{0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,印刷用のセットアップチェック寸法
 DocType: Salary Slip,Salary Slip Timesheet,給与スリップタイムシート
@@ -572,13 +577,13 @@
 DocType: Sales Invoice,Total Commission,手数料合計
 DocType: Pricing Rule,Sales Partner,販売パートナー
 DocType: Buying Settings,Purchase Receipt Required,領収書が必要です
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,期首在庫が入力された場合は評価レートは必須です
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,請求書テーブルにレコードが見つかりません
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,最初の会社と当事者タイプを選択してください
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,会計年度
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積値
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",シリアル番号をマージすることはできません
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,受注を作成
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,受注を作成
 DocType: Project Task,Project Task,プロジェクトタスク
 ,Lead Id,リードID
 DocType: C-Form Invoice Detail,Grand Total,総額
@@ -595,7 +600,7 @@
 DocType: Job Applicant,Resume Attachment,再開アタッチメント
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,リピート顧客
 DocType: Leave Control Panel,Allocate,割当
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,販売返品
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,販売返品
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：総割り当てられた葉を{0}の期間のためにすでに承認された葉{1}を下回ってはいけません
 DocType: Announcement,Posted By,投稿者
 DocType: Item,Delivered by Supplier (Drop Ship),サプライヤーより配送済（ドロップシッピング）
@@ -605,7 +610,7 @@
 DocType: Quotation,Quotation To,見積先
 DocType: Lead,Middle Income,中収益
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開く（貸方）
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,割当額をマイナスにすることはできません
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,会社を設定してください
 DocType: Purchase Order Item,Billed Amt,支払額
@@ -616,7 +621,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,納品書タイムシート
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}には参照番号・参照日が必要です
 DocType: Process Payroll,Select Payment Account to make Bank Entry,銀行エントリを作るために決済口座を選択
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",葉、経費請求の範囲及び給与を管理するために、従業員レコードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",葉、経費請求の範囲及び給与を管理するために、従業員レコードを作成します。
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ナレッジベースに追加
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案の作成
 DocType: Payment Entry Deduction,Payment Entry Deduction,支払エントリ控除
@@ -646,19 +651,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}'は会計年度{2}中ではありません
 DocType: Buying Settings,Settings for Buying Module,モジュール購入設定
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},アセット{0}は会社に属していません{1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,領収書を入力してください
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",価格設定ルールは、顧客、顧客グループ、地域、サプライヤー、サプライヤータイプ、キャンペーン、販売パートナーなどに基づいて抽出されます
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在庫の純変更
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,従業員のローン管理
 DocType: Employee,Passport Number,パスポート番号
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2との関係
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,マネージャー
 DocType: Payment Entry,Payment From / To,/からへの支払い
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,日付範囲
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新たな与信限度は、顧客の現在の残高よりも少ないです。与信限度は、少なくとも{0}である必要があります
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,「参照元」と「グループ元」は同じにすることはできません
@@ -667,8 +671,8 @@
 DocType: Production Order Operation,In minutes,分単位
 DocType: Issue,Resolution Date,課題解決日
 DocType: Student Batch Name,Batch Name,バッチ名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,タイムシートを作成しました：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,タイムシートを作成しました：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},支払方法{0}にデフォルトの現金や銀行口座を設定してください
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,登録します
 DocType: Selling Settings,Customer Naming By,顧客名設定
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,学生月次出席報告書では、本のように学生が表示されます
@@ -696,7 +700,7 @@
 DocType: Production Order Operation,Actual Start Time,実際の開始時間
 DocType: BOM Operation,Operation Time,作業時間
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,仕上げ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ベース
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,ベース
 DocType: Timesheet,Total Billed Hours,請求された総時間
 DocType: Journal Entry,Write Off Amount,償却額
 DocType: Journal Entry,Bill No,請求番号
@@ -710,7 +714,7 @@
 DocType: Student Attendance,Student Attendance,学生の出席
 DocType: Sales Invoice Timesheet,Time Sheet,タイムシート
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,原材料に基づくバックフラッシュ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,アイテムの詳細を入力してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,アイテムの詳細を入力してください
 DocType: Interest,Interest,関心
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,事前販売
 DocType: Purchase Receipt,Other Details,その他の詳細
@@ -721,23 +725,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,支払エントリがすでに作成されています
 DocType: Purchase Receipt Item Supplied,Current Stock,現在の在庫
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：{1}資産はアイテムにリンクされていません{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,プレビュー給与スリップ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,プレビュー給与スリップ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,アカウント{0}を複数回入力されました
 DocType: Account,Expenses Included In Valuation,評価中経費
 DocType: Hub Settings,Seller City,販売者の市区町村
 ,Absent Student Report,不在学生レポート
 DocType: Email Digest,Next email will be sent on:,次のメール送信先：
 DocType: Offer Letter Term,Offer Letter Term,雇用契約書条件
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,アイテムはバリエーションがあります
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,アイテムはバリエーションがあります
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,アイテム{0}が見つかりません
 DocType: Bin,Stock Value,在庫価値
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,当社{0}は存在しません。
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ツリー型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,ツリー型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,単位当たり消費数量
 DocType: Serial No,Warranty Expiry Date,保証有効期限
 DocType: Material Request Item,Quantity and Warehouse,数量と倉庫
 DocType: Sales Invoice,Commission Rate (%),手数料率（％）
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,プログラムを選択してください
 DocType: Project,Estimated Cost,推定費用
 DocType: Purchase Order,Link to material requests,材料の要求へのリンク
@@ -755,7 +758,7 @@
 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,デフォルトアカウント
 DocType: Payment Entry,Received Amount (Company Currency),受け取った金額（会社通貨）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,リードから機会を作る場合は、リードが設定されている必要があります
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,週休日を選択してください
 DocType: Production Order Operation,Planned End Time,計画終了時間
 ,Sales Person Target Variance Item Group-Wise,（アイテムグループごとの）各営業ターゲット差違
@@ -771,6 +774,7 @@
 DocType: Opportunity,Opportunity From,機会元
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月次給与計算書。
 DocType: BOM,Website Specifications,ウェブサイトの仕様
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：タイプ{1}の{0}から
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,行{0}：換算係数が必須です
@@ -831,6 +835,7 @@
 DocType: Employee,Bank A/C No.,銀行口座番号
 DocType: Bank Guarantee,Project,プロジェクト
 DocType: Quality Inspection Reading,Reading 7,報告要素7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,部分的に順序
 DocType: Expense Claim Detail,Expense Claim Type,経費請求タイプ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ショッピングカートのデフォルト設定
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},仕訳を経由して廃車・アセット{0}
@@ -838,14 +843,14 @@
 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 +107,Office Maintenance Expenses,事務所維持費
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,電子メールアカウントの設定
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,最初のアイテムを入力してください
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,最初のアイテムを入力してください
 DocType: Account,Liability,負債
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,決済額は、行{0}での請求額を超えることはできません。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,価格表が選択されていません
 DocType: Employee,Family Background,家族構成
 DocType: Request for Quotation Supplier,Send Email,メールを送信
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},注意：不正な添付ファイル{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,権限がありませんん
 DocType: Company,Default Bank Account,デフォルト銀行口座
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",「当事者」に基づいてフィルタリングするには、最初の「当事者タイプ」を選択してください
@@ -858,7 +863,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,従業員が見つかりません
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,ベンダーに委託した場合
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生グループはすでに更新されています。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生グループはすでに更新されています。
 DocType: SMS Center,All Customer Contact,全ての顧客連絡先
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSVから在庫残高をアップロード
 DocType: Warehouse,Tree Details,ツリーの詳細
@@ -869,8 +874,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小請求額
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：原価センタ{2}会社に所属していない{3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}：アカウント{2}グループにすることはできません
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,アイテム行{idxの}：{DOCTYPE} {DOCNAME}上に存在しない &#39;{文書型}&#39;テーブル
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,タイムシート{0}はすでに完了またはキャンセルされます
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,いいえタスクはありません
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",自動請求を生成する日付（例：05、28など）
 DocType: Asset,Opening Accumulated Depreciation,減価償却累計額を開きます
@@ -886,7 +891,7 @@
 DocType: Bin,Moving Average Rate,移動平均レート
 DocType: Production Planning Tool,Select Items,アイテム選択
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{2}を指定日とする支払{1}に対する{0}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,コーススケジュール
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,コーススケジュール
 DocType: Maintenance Visit,Completion Status,完了状況
 DocType: HR Settings,Enter retirement age in years,年間で退職年齢を入力してください
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ターゲット倉庫
@@ -894,7 +899,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,このパーセント以上の配送または受領を許可
 DocType: Stock Entry,STE-,ステ
 DocType: Upload Attendance,Import Attendance,出勤インポート
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,全てのアイテムグループ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,全てのアイテムグループ
 DocType: Process Payroll,Activity Log,活動ログ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,純損益
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,取引の送信時、自動的にメッセージを作成します。
@@ -905,7 +910,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,発注からの支払
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,予想数量
 DocType: Sales Invoice,Payment Due Date,支払期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,アイテムバリエーション{0}は既に同じ属性で存在しています
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',「オープニング」
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,行うにオープン
 DocType: Notification Control,Delivery Note Message,納品書のメッセージ
@@ -921,7 +926,7 @@
 DocType: Item Reorder,Re-Order Qty,再オーダー数量
 DocType: Leave Block List Date,Leave Block List Date,休暇リスト日付
 DocType: Pricing Rule,Price or Discount,価格または割引
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,購入レシートItemsテーブル内の合計有料合計税金、料金と同じでなければなりません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,購入レシートItemsテーブル内の合計有料合計税金、料金と同じでなければなりません
 DocType: Sales Team,Incentives,インセンティブ
 DocType: SMS Log,Requested Numbers,要求された番号
 DocType: Production Planning Tool,Only Obtain Raw Materials,原料のみを取得
@@ -950,13 +955,13 @@
 DocType: Supplier Quotation,Is Subcontracted,下請け
 DocType: Item Attribute,Item Attribute Values,アイテムの属性値
 DocType: Examination Result,Examination Result,テスト結果
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,領収書
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,領収書
 ,Received Items To Be Billed,支払予定受領アイテム
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提出された給与スリップ
 DocType: Employee,Ms,女史
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,為替レートマスター
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},リファレンスDOCTYPEが{0}のいずれかでなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},リファレンスDOCTYPEが{0}のいずれかでなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},操作{1}のための時間スロットは次の{0}日間に存在しません
 DocType: Production Order,Plan material for sub-assemblies,部分組立品資材計画
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,販売パートナーと地域
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,すでにアカウントで在庫残高がある限り、自動的にアカウントを作成することはできません。あなたはこの倉庫にエントリを作成する前に、一致するアカウントを作成する必要があります
@@ -979,10 +984,9 @@
 DocType: Supplier,Default Payable Accounts,デフォルト買掛金勘定
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,従業員{0}はアクティブでないか、存在しません
 DocType: Fee Structure,Components,コンポーネント
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,アイテムバリエーション{0}を更新しました
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},アイテムのアセットカテゴリを入力してください{0}
 DocType: Quality Inspection Reading,Reading 6,報告要素6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,することができません{0} {1} {2}任意の負の優れたインボイスなし
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,仕入請求前払
 DocType: Hub Settings,Sync Now,今すぐ同期
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：貸方エントリは{1}とリンクすることができません
@@ -996,11 +1000,11 @@
 DocType: Item,Is Purchase Item,仕入アイテム
 DocType: Asset,Purchase Invoice,仕入請求
 DocType: Stock Ledger Entry,Voucher Detail No,伝票詳細番号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,新しい売上請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,新しい売上請求書
 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,開始日と終了日は同一会計年度内になければなりません
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,開始日と終了日は同一会計年度内になければなりません
 DocType: Lead,Request for Information,情報要求
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,同期オフライン請求書
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,同期オフライン請求書
 DocType: Payment Request,Paid,支払済
 DocType: Program Fee,Program Fee,プログラムの料金
 DocType: Salary Slip,Total in words,合計の文字表記
@@ -1010,7 +1014,7 @@
 DocType: Employee Loan,Sanctioned,認可
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.",「製品付属品」アイテム、倉庫、シリアル番号、バッチ番号は、「梱包リスト」テーブルから検討します。倉庫とバッチ番号が任意の「製品付属品」アイテムのすべての梱包アイテムと同じであれば、これらの値はメインのアイテムテーブルに入力することができ、「梱包リスト」テーブルにコピーされます。
 DocType: Job Opening,Publish on website,ウェブサイト上で公開
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,顧客への出荷
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,サプライヤの請求書の日付は、転記日を超えることはできません
@@ -1021,7 +1025,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,差違
 ,Company Name,（会社名）
 DocType: SMS Center,Total Message(s),全メッセージ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,配送のためのアイテムを選択
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,小切手が預けられた銀行の勘定科目を選択してください
@@ -1032,8 +1036,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：受発注書に対する支払いは、常に前払金としてマークする必要があります
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,このモードが選択されている場合、デフォルト銀行/現金アカウントは自動的に給与仕訳に更新されます。
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",グレードコード{0}のための間隔が他の学年のためのグレードの間隔と重なっています。間隔{0}と{1}を確認して、もう一度お試しください
 DocType: BOM,Raw Material Cost(Company Currency),原料コスト（会社通貨）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,アイテムは全てこの製造指示に移動されています。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行番号{0}：レートは{1} {2}で使用されているレートより大きくすることはできません
@@ -1045,13 +1047,13 @@
 DocType: BOM Website Item,BOM Website Item,BOMのウェブサイトのアイテム
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,レターヘッドとロゴをアップロードします（後で編集可能です）
 DocType: Timesheet Detail,Bill,ビル
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,次の減価償却日は過去の日付として入力され、
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ホワイト
 DocType: SMS Center,All Lead (Open),全リード（オープン）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：（{2} {3}）エントリの時間を掲示で{1}倉庫内の{4}の数量は利用できません
 DocType: Purchase Invoice,Get Advances Paid,立替金を取得
 DocType: Item,Automatically Create New Batch,新しいバッチを自動的に作成する
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,作成
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,作成
 DocType: Student Admission,Admission Start Date,入場開始日
 DocType: Journal Entry,Total Amount in Words,合計の文字表記
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"エラーが発生しました。
@@ -1061,7 +1063,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,数量を開く
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,変更金額のためにアカウントを入力してください
 DocType: Student Batch Name,Student Batch Name,学生バッチ名
 DocType: Holiday List,Holiday List Name,休日リストの名前
 DocType: Repayment Schedule,Balance Loan Amount,バランス融資額
@@ -1081,10 +1083,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},{0}を指定してください
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,数量または値の変化のないアイテムを削除しました。
 DocType: Delivery Note,Delivery To,納品先
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,属性表は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表は必須です
 DocType: Production Planning Tool,Get Sales Orders,注文を取得
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}はマイナスにできません
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,割引
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,割引
 DocType: Asset,Total Number of Depreciations,減価償却の合計数
 DocType: Sales Invoice Item,Rate With Margin,利益率
 DocType: Workstation,Wages,賃金
@@ -1099,7 +1101,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,受注の予約倉庫／完成品倉庫
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,販売額
 DocType: Repayment Schedule,Interest Amount,利息額
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,あなたはこのレコードの経費承認者です。「ステータス」を更新し保存してください。
 DocType: Serial No,Creation Document No,作成ドキュメントNo
 DocType: Issue,Issue,課題
 DocType: Asset,Scrapped,廃棄済
@@ -1107,12 +1109,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",アイテムバリエーションの属性。例）サイズ、色など
 DocType: Purchase Invoice,Returns,収益
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,作業中倉庫
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},シリアル番号{0}は {1}まで保守契約下にあります
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,求人
 DocType: Lead,Organization Name,組織名
 DocType: Tax Rule,Shipping State,出荷状態
 ,Projected Quantity as Source,ソースとして投影数量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,アイテムは、ボタン「領収書からアイテムの取得」を使用して追加する必要があります
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,非在庫品目を含めます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,販売費
@@ -1120,12 +1122,12 @@
 DocType: GL Entry,Against,に対して
 DocType: Item,Default Selling Cost Center,デフォルト販売コストセンター
 DocType: Sales Partner,Implementation Partner,導入パートナー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,郵便番号
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,郵便番号
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},受注{0}は{1}です
 DocType: Opportunity,Contact Info,連絡先情報
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,在庫エントリを作成
 DocType: Packing Slip,Net Weight UOM,正味重量単位
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0}結果
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0}結果
 DocType: Item,Default Supplier,デフォルトサプライヤー
 DocType: Manufacturing Settings,Over Production Allowance Percentage,製造割当率超過
 DocType: Employee Loan,Repayment Schedule,返済スケジュール
@@ -1133,7 +1135,7 @@
 DocType: Holiday List,Get Weekly Off Dates,週の休日を取得する
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,終了日は開始日より前にすることはできません
 DocType: Sales Person,Select company name first.,はじめに会社名を選択してください
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,サプライヤーから受け取った見積。
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齢
@@ -1151,7 +1153,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,重要実行分野
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,輸送
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,無効な属性
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1}は提出しなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1}は提出しなければなりません
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},数量は以下でなければなりません{0}
 DocType: SMS Center,Total Characters,文字数合計
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},アイテム{0}の部品表フィールドで部品表を選択してください
@@ -1162,7 +1164,7 @@
 DocType: Sales Partner,Distributor,販売代理店
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ショッピングカート出荷ルール
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,受注キャンセルには製造指示{0}のキャンセルをしなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',設定」で追加の割引を適用」してください
 ,Ordered Items To Be Billed,支払予定注文済アイテム
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,範囲開始は範囲終了よりも小さくなければなりません
 DocType: Global Defaults,Global Defaults,共通デフォルト設定
@@ -1172,7 +1174,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年
 DocType: Purchase Invoice,Start date of current invoice's period,請求期限の開始日
 DocType: Salary Slip,Leave Without Pay,無給休暇
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,キャパシティプランニングのエラー
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,キャパシティプランニングのエラー
 ,Trial Balance for Party,当事者用の試算表
 DocType: Lead,Consultant,コンサルタント
 DocType: Salary Slip,Earnings,収益
@@ -1187,7 +1189,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",これはバリエーションのアイテムコードに追加されます。あなたの略称が「SM」であり、アイテムコードが「T-SHIRT」である場合は、バリエーションのアイテムコードは、「T-SHIRT-SM」になります
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,給与伝票を保存すると給与が表示されます。
 DocType: Purchase Invoice,Is Return,返品
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,リターン/デビットノート
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,リターン/デビットノート
 DocType: Price List Country,Price List Country,価格表内の国
 DocType: Item,UOMs,数量単位
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},アイテム {1} の有効なシリアル番号 {0}
@@ -1197,11 +1199,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,バッチ番号を取得するために、商品コードを入力してください
 DocType: Stock Settings,Default Item Group,デフォルトアイテムグループ
 DocType: Employee Loan,Partially Disbursed,部分的に支払わ
-DocType: Grading Structure,Grading System Name,グレーディングシステム名
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,サプライヤーデータベース
 DocType: Account,Balance Sheet,貸借対照表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',アイテムコードのあるアイテムのためのコストセンター
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",お支払いモードが設定されていません。アカウントが支払いのモードやPOSプロファイルに設定されているかどうか、確認してください。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,営業担当者には、顧客訪問日にリマインドが表示されます。
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同じアイテムを複数回入力することはできません。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",アカウントはさらにグループの下に作成できますが、エントリは非グループに対して作成できます
@@ -1213,7 +1214,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,選択された領収書のために在庫元帳エントリと総勘定元帳エントリが再投稿されます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,選択された領収書のために在庫元帳エントリと総勘定元帳エントリが再投稿されます
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,アイテム1
 DocType: Holiday,Holiday,休日
 DocType: Support Settings,Close Issue After Days,日後に閉じる問題
@@ -1238,11 +1239,11 @@
 DocType: Maintenance Visit Purpose,Work Done,作業完了
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,属性テーブル内から少なくとも1つの属性を指定してください
 DocType: Announcement,All Students,全生徒
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,アイテム{0}は非在庫アイテムでなければなりません
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,元帳の表示
 DocType: Grading Scale,Intervals,インターバル
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最初
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",同名のアイテムグループが存在しますので、アイテム名を変えるか、アイテムグループ名を変更してください
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,学生モバイル号
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,その他の地域
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,アイテム{0}はバッチを持てません
@@ -1281,9 +1282,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{1}の{0}から給与の支払い
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},凍結されたアカウント{0}を編集する権限がありません
 DocType: Journal Entry,Get Outstanding Invoices,未払いの請求を取得
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,受注{0}は有効ではありません
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",企業はマージできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,受注{0}は有効ではありません
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,購買発注は、あなたの購入を計画し、フォローアップに役立ちます
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",企業はマージできません
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",素材要求の総発行/転送量{0}が{1} \項目のための要求数量{2}を超えることはできません{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,S
@@ -1304,10 +1305,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,間接経費
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量は必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同期マスタデータ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,同期マスタデータ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,あなたの製品またはサービス
 DocType: Mode of Payment,Mode of Payment,支払方法
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ウェブサイト画像は、公開ファイルまたはウェブサイトのURLを指定する必要があります
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,これは、ルートアイテムグループであり、編集することはできません。
@@ -1324,18 +1325,18 @@
 DocType: Student Group Student,Group Roll Number,グループロール番号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}には、別の借方エントリに対する貸方勘定のみリンクすることができます
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,すべてのタスクの重みの合計は1に応じて、すべてのプロジェクトのタスクの重みを調整してくださいする必要があります
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,納品書{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,納品書{0}は提出されていません
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",価格設定ルールは、「適用」フィールドに基づき、アイテム、アイテムグループ、ブランドとすることができます。
 DocType: Hub Settings,Seller Website,販売者のウェブサイト
 DocType: Item,ITEM-,項目-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,営業チームの割当率の合計は100でなければなりません
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},製造指示のステータスは{0}です
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},製造指示のステータスは{0}です
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,説明編集
 ,Team Updates,チームのアップデート
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,サプライヤー用
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,サプライヤー用
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,アカウントタイプを設定すると、取引内で選択できるようになります
 DocType: Purchase Invoice,Grand Total (Company Currency),総合計（会社通貨）
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,印刷形式を作成します。
@@ -1351,7 +1352,7 @@
 DocType: Depreciation Schedule,Journal Entry,仕訳
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,進行中の{0}アイテム
 DocType: Workstation,Workstation Name,作業所名
-DocType: Grade Interval,Grade Code,グレードコード
+DocType: Grading Scale Interval,Grade Code,グレードコード
 DocType: POS Item Group,POS Item Group,POSアイテムのグループ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,メールダイジェスト：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},部品表 {0}はアイテム{1}に属していません
@@ -1367,7 +1368,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ハードウェア
 DocType: Sales Order,Recurring Upto,定期的な点で最大
 DocType: Attendance,HR Manager,人事マネージャー
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,会社を選択してください
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,会社を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特別休暇
 DocType: Purchase Invoice,Supplier Invoice Date,サプライヤー請求日
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,「ショッピングカート」を有効にしてください
@@ -1383,7 +1384,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食べ物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,エイジングレンジ３
 DocType: Maintenance Schedule Item,No of Visits,訪問なし
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,マークAttendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,マークAttendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1}に対してメンテナンススケジュール{0}が存在します
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,入学学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},締めるアカウントの通貨は {0} でなければなりません
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},全目標のポイントの合計は100でなければなりませんが、{0}になっています
@@ -1408,7 +1410,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均支出
 DocType: POS Profile,Campaign,キャンペーン
 DocType: Supplier,Name and Type,名前とタイプ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',承認ステータスは「承認」または「拒否」でなければなりません
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',承認ステータスは「承認」または「拒否」でなければなりません
 DocType: Purchase Invoice,Contact Person,担当者
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',「開始予定日」は、「終了予定日」より後にすることはできません
 DocType: Course Scheduling Tool,Course End Date,コース終了日
@@ -1431,14 +1433,15 @@
 DocType: Sales Invoice,Shipping Address Name,配送先住所
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,勘定科目表
 DocType: Material Request,Terms and Conditions Content,規約の内容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100を超えることはできません
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100を超えることはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,アイテム{0}は在庫アイテムではありません
 DocType: Maintenance Visit,Unscheduled,スケジュール解除済
 DocType: Employee,Owned,所有済
 DocType: Salary Detail,Depends on Leave Without Pay,無給休暇に依存
 DocType: Pricing Rule,"Higher the number, higher the priority",大きい数は優先順位が高い
 ,Purchase Invoice Trends,仕入請求傾向
 DocType: Employee,Better Prospects,良い見通し
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行番号{0}：バッチ{1}には{2}個しかありません。 {3}個の利用可能なバッチを選択するか、行を複数の行に分割して、複数のバッチから配信/発行してください
 DocType: Vehicle,License Plate,ナンバープレート
 DocType: Appraisal,Goals,ゴール
 DocType: Warranty Claim,Warranty / AMC Status,保証/ 年間保守契約のステータス
@@ -1457,7 +1460,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,従業員は自分自身に報告することはできません。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",会計が凍結されている場合、エントリは限られたユーザーに許可されています。
 DocType: Email Digest,Bank Balance,銀行残高
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0}の勘定科目では{1}は通貨{2}でのみ作成可能です
 DocType: Job Opening,"Job profile, qualifications required etc.",必要な業務内容、資格など
 DocType: Journal Entry Account,Account Balance,口座残高
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,取引のための税ルール
@@ -1468,7 +1471,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,閉じられていない会計年度のP＆L残高を表示
 DocType: Shipping Rule,Shipping Account,出荷アカウント
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}：アカウントは、{2}に不活性であります
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,あなたの仕事を計画に役立つとオンタイム配信するために受注を作ります
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,あなたの仕事を計画に役立つとオンタイム配信するために受注を作ります
 DocType: Quality Inspection,Readings,報告要素
 DocType: Stock Entry,Total Additional Costs,追加費用合計
 DocType: Course Schedule,SH,SH
@@ -1479,7 +1482,7 @@
 DocType: Shipping Rule Condition,To Value,値
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,梱包伝票
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,梱包伝票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,事務所賃料
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,SMSゲートウェイの設定
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,インポートが失敗しました！
@@ -1501,11 +1504,11 @@
 DocType: Company,Services,サービス
 DocType: HR Settings,Email Salary Slip to Employee,従業員への電子メールの給与スリップ
 DocType: Cost Center,Parent Cost Center,親コストセンター
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,可能性のあるサプライヤーを選択
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,可能性のあるサプライヤーを選択
 DocType: Sales Invoice,Source,ソース
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,クローズ済を表示
 DocType: Leave Type,Is Leave Without Pay,無給休暇
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,資産カテゴリーは、固定資産の項目は必須です
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,支払テーブルにレコードが見つかりません
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},この{2} {3}の{1}と{0}競合
 DocType: Student Attendance Tool,Students HTML,学生HTML
@@ -1523,7 +1526,7 @@
 DocType: Student,Date of Leaving,立ち去るの日
 DocType: Pricing Rule,For Price List,価格表用
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ヘッドハンティング
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,リードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,リードを作成します。
 DocType: Maintenance Schedule,Schedules,スケジュール
 DocType: Purchase Invoice Item,Net Amount,正味金額
 DocType: Purchase Order Item Supplied,BOM Detail No,部品表詳細番号
@@ -1552,9 +1555,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,プログラム加入契約
 DocType: Sales Invoice Item,Brand Name,ブランド名
 DocType: Purchase Receipt,Transporter Details,輸送業者詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,デフォルトの倉庫は、選択した項目のために必要とされます
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能性のあるサプライヤー
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,可能性のあるサプライヤー
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,組織
 DocType: Budget,Monthly Distribution,月次配分
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,受領者リストが空です。受領者リストを作成してください
@@ -1562,7 +1565,7 @@
 DocType: Sales Partner,Sales Partner Target,販売パートナー目標
 DocType: Loan Type,Maximum Loan Amount,最大融資額
 DocType: Pricing Rule,Pricing Rule,価格設定ルール
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},生徒{0}のロール番号が重複しています
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},生徒{0}のロール番号が重複しています
 DocType: Budget,Action if Annual Budget Exceeded,アクションの年間予算は、超えた場合
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,仕入注文のための資材要求
 DocType: Shopping Cart Settings,Payment Success URL,支払成功URL
@@ -1583,9 +1586,9 @@
 DocType: Employee Loan,Repayment Method,返済方法
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",チェックした場合、[ホーム]ページは、Webサイトのデフォルトの項目のグループになります
 DocType: Quality Inspection Reading,Reading 4,報告要素4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0}プロジェクト{1}が見つかりませんの既定BOM
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0}プロジェクト{1}が見つかりませんの既定BOM
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,会社経費の請求
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",学生はシステムの心臓部である、すべての学生を追加します
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生はシステムの心臓部である、すべての学生を追加します
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：クリアランス日付は{1} {2}小切手日前にすることはできません
 DocType: Company,Default Holiday List,デフォルト休暇リスト
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：の時間との時間から{1}と重なっている{2}
@@ -1597,21 +1600,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,あなたは休暇を申請された日（複数可）は祝日です。あなたは休暇を申請する必要はありません。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,支払メールを再送信
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新しい仕事
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,見積を作成
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,見積を作成
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,その他のレポート
 DocType: Dependent Task,Dependent Task,依存タスク
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},デフォルト数量単位は、行{0}の1でなければなりません
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},休暇タイプ{0}は、{1}よりも長くすることはできません
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,事前にX日の業務を計画してみてください
 DocType: HR Settings,Stop Birthday Reminders,誕生日リマインダを停止
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},当社ではデフォルトの給与支払ってくださいアカウントを設定してください{0}
 DocType: SMS Center,Receiver List,受領者リスト
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,探索項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,探索項目
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消費額
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金の純変更
 DocType: Assessment Plan,Grading Scale,評価尺度
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,すでに完了
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,数量{0}が変換係数表に複数回記入されました。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,すでに完了
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},支払い要求がすでに存在している{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,課題アイテムの費用
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},数量は{0}以下でなければなりません
@@ -1643,12 +1646,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,支出項目を作成します
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：サプライヤーに対して事前に引き落としされなければなりません
 DocType: Company,Default Values,デフォルト値
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{頻度}ダイジェスト
 DocType: Expense Claim,Total Amount Reimbursed,総払戻額
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,これは、この車両に対するログに基づいています。詳細については、以下のタイムラインを参照してください。
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,収集します
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},対サプライヤー請求書{0} 日付{1}
 DocType: Customer,Default Price List,デフォルト価格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,資産運動レコード{0}を作成
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,資産運動レコード{0}を作成
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,あなたは年度{0}を削除することはできません。年度{0}はグローバル設定でデフォルトとして設定されています
 DocType: Journal Entry,Entry Type,エントリタイプ
 ,Customer Credit Balance,顧客貸方残高
@@ -1665,7 +1669,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,調達
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,数量または値に変化のあるアイテムはありません
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,必須項目 - プログラム
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,保証請求
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保証請求
 ,Lead Details,リード詳細
 DocType: Salary Slip,Loan repayment,ローン返済
 DocType: Purchase Invoice,End date of current invoice's period,現在の請求書の期間の終了日
@@ -1685,11 +1689,10 @@
 DocType: Employee,Permanent Address,本籍地
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0}への前払金として {1} は{2}の総計より大きくすることはできません
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,アイテムコードを選択してください。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,アイテムコードを選択してください。
 DocType: Student Sibling,Studying in Same Institute,同研究所で学びます
 DocType: Territory,Territory Manager,地域マネージャ
 DocType: Packed Item,To Warehouse (Optional),倉庫に（オプション）
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Payment Entry,Paid Amount (Company Currency),支払額（会社通貨）
 DocType: Purchase Invoice,Additional Discount,追加割引
 DocType: Selling Settings,Selling Settings,販売設定
@@ -1699,9 +1702,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,カート内を見ます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,マーケティング費用
 ,Item Shortage Report,アイテム不足レポート
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量が記載されていますので、あわせて「重量単位」を記載してください
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,この在庫エントリを作成するために使用される資材要求
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,次の減価償却日は、新しい資産のために必須です
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,次の減価償却日は、新しい資産のために必須です
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,バッチごとに個別のコースベースのグループ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,アイテムの１単位
 DocType: Fee Category,Fee Category,料金カテゴリー
@@ -1717,9 +1720,8 @@
 DocType: Course Assessment Criteria,Weightage,重み付け
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：コストセンターは「損益」アカウント{2}のために必要とされます。会社のデフォルトのコストセンターを設定してください。
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"同じ名前の顧客グループが存在します
 顧客名か顧客グループのどちらかの名前を変更してください"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,新しい連絡先
 DocType: Territory,Parent Territory,上位地域
 DocType: Quality Inspection Reading,Reading 2,報告要素2
@@ -1736,7 +1738,7 @@
 ,Item-wise Sales Register,アイテムごとの販売登録
 DocType: Asset,Gross Purchase Amount,購入総額
 DocType: Asset,Depreciation Method,減価償却法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,オフライン
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,オフライン
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,この税金が基本料金に含まれているか
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ターゲット合計
 DocType: Program Course,Required,必須
@@ -1746,20 +1748,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,照合 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,カラムが多すぎます。レポートをエクスポートして、スプレッドシートアプリケーションを使用して印刷します。
 DocType: Purchase Invoice Item,Batch No,バッチ番号
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},{1}キー日付の{2}に{0}の為替レートを見つけることができません。
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,顧客の発注に対する複数の受注を許可
 DocType: Student Group Instructor,Student Group Instructor,学生グループインストラクター
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2モバイルはありません
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,メイン
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,バリエーション
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,メイン
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,バリエーション
 DocType: Naming Series,Set prefix for numbering series on your transactions,取引に連番の接頭辞を設定
 DocType: Employee Attendance Tool,Employees HTML,従業員HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,このアイテムまたはテンプレートには、デフォルトの部品表（{0}）がアクティブでなければなりません
 DocType: Employee,Leave Encashed?,現金化された休暇？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機会元フィールドは必須です
 DocType: Email Digest,Annual Expenses,年間費用
 DocType: Item,Variants,バリエーション
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,発注を作成
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,発注を作成
 DocType: SMS Center,Send To,送信先
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},休暇タイプ{0}のための休暇残が足りません
 DocType: Payment Reconciliation Payment,Allocated amount,割当額
@@ -1767,17 +1768,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,提出する前に作業中の倉庫が必要です
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求職者
 DocType: Purchase Order Item,Warehouse and Reference,倉庫と問い合わせ先
 DocType: Supplier,Statutory info and other general information about your Supplier,サプライヤーに関する法定の情報とその他の一般情報
 DocType: Item,Serial Nos and Batches,シリアル番号とバッチ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生グループの強み
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,対仕訳{0}に該当しないエントリ{1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,査定
 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: Grading Structure,Grading Intervals,グレーディング間隔
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,入力してください
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行の項目{0}のoverbillできません{1}より{2}。過剰請求を許可するには、[設定]を購入するに設定してください
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,アイテムまたは倉庫に基づくフィルタを設定してください
@@ -1789,17 +1789,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,部品表{0}を登録しなければなりません
 DocType: Authorization Control,Authorization Control,認証コントロール
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：倉庫拒否は却下されたアイテムに対して必須である{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,支払
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ご注文を管理します
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,支払
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ご注文を管理します
 DocType: Production Order Operation,Actual Time and Cost,実際の時間とコスト
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},資材要求の最大値{0}は、注{2}に対するアイテム{1}から作られます
 DocType: Employee,Salutation,敬称（例：Mr. Ms.）
 DocType: Course,Course Abbreviation,コースの略
 DocType: Student Leave Application,Student Leave Application,学生休業申出
 DocType: Item,Will also apply for variants,バリエーションについても適用されます
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",{0}として既に存在する資産をキャンセルすることはできません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},上半分の日に従業員{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},総労働時間は最大労働時間よりも大きくてはいけません{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,オン
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,販売時に商品をまとめる
 DocType: Quotation Item,Actual Qty,実際の数量
 DocType: Sales Invoice Item,References,参照
@@ -1809,7 +1810,7 @@
 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 +91,Associate,同僚
 DocType: Asset Movement,Asset Movement,アセット・ムーブメント
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,新しいカート
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,新しいカート
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,アイテム{0}にはシリアル番号が付与されていません
 DocType: SMS Center,Create Receiver List,受領者リストを作成
 DocType: Vehicle,Wheels,車輪
@@ -1841,9 +1842,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,製造指示に対する時間ログの作成を無効にします。作業は製造指図を追跡しません
 DocType: Student,Student Mobile Number,学生携帯電話番号
 DocType: Item,Has Variants,バリエーションあり
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},あなたはすでにから項目を選択した{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月次配分の名前
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,バッチIDは必須です
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,バッチIDは必須です
 DocType: Sales Person,Parent Sales Person,親販売担当者
 DocType: Purchase Invoice,Recurring Invoice,定期的な請求
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,プロジェクト管理
@@ -1851,11 +1852,11 @@
 DocType: Budget,Fiscal Year,会計年度
 DocType: Vehicle Log,Fuel Price,燃料価格
 DocType: Budget,Budget,予算
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定資産の項目は非在庫項目でなければなりません。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",収入または支出でない予算は、{0} に対して割り当てることができません
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,達成
 DocType: Student Admission,Application Form Route,申込書ルート
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,地域／顧客
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,地域／顧客
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,例「5」
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,それは無給のままにされているので、タイプは{0}を割り当てることができないままに
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：割り当て額 {1} は未払請求額{2}以下である必要があります。
@@ -1875,14 +1876,14 @@
 ,Serial No Status,シリアル番号ステータス
 DocType: Payment Entry Reference,Outstanding,傑出した
 ,Daily Timesheet Summary,デイリータイムシートの概要
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",行{0}：{1}の周期を設定するには、開始日から終了日までの期間が {2} 以上必要です
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,これは、株式の動きに基づいています。詳細については、{0}を参照してください。
 DocType: Pricing Rule,Selling,販売
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},量は{0} {1} {2}に対する控除します
 DocType: Employee,Salary Information,給与情報
 DocType: Sales Person,Name and Employee ID,名前と従業員ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,期限日を転記日付より前にすることはできません
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,関税と税金
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,基準日を入力してください
@@ -1894,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,この請求タイプの行数以上の行番号を参照することはできません
 DocType: Asset,Sold,販売：
 ,Item-wise Purchase History,アイテムごとの仕入履歴
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},アイテム{0}に付加されたシリアル番号を取得するためには「生成スケジュール」をクリックしてください
 DocType: Account,Frozen,凍結
 ,Open Production Orders,製造指示を開く
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基準額（会社通貨）
 DocType: Payment Reconciliation Payment,Reference Row,リファレンス行
 DocType: Installation Note,Installation Time,設置時間
 DocType: Sales Invoice,Accounting Details,会計詳細
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,この会社の全ての取引を削除
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投資
@@ -1934,13 +1935,13 @@
 DocType: Discussion,Discussion,討論
 DocType: Payment Entry,Transaction ID,トランザクションID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,価格設定ルールは量に基づいてさらにフィルタリングされます
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},従業員{0}の参加日を設定してください
 DocType: Task,Total Billing Amount (via Time Sheet),合計請求金額（タイムシートを介して）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,リピート顧客の収益
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0}（{1}）は「経費承認者」の権限を持っている必要があります
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,組
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,生産のためのBOMと数量を選択
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,生産のためのBOMと数量を選択
 DocType: Asset,Depreciation Schedule,減価償却スケジュール
 DocType: Bank Reconciliation Detail,Against Account,アカウントに対して
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半日日付は日付からと日付までの間であるべきです
@@ -1954,16 +1955,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},会社の「資産減価償却原価センタ &#39;を設定してください{0}
 ,Maintenance Schedules,メンテナンス予定
 DocType: Task,Actual End Date (via Time Sheet),（タイムシートを介して）実際の終了日
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},量{0} {1} {2} {3}に対して、
 ,Quotation Trends,見積傾向
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},アイテム{0}のアイテムマスターにはアイテムグループが記載されていません
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,借方計上は売掛金勘定でなければなりません
 DocType: Shipping Rule Condition,Shipping Amount,出荷量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,保留中の金額
 DocType: Purchase Invoice Item,Conversion Factor,換算係数
 DocType: Purchase Order,Delivered,納品済
 ,Vehicle Expenses,車両費
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
+DocType: Serial No,Invoice Details,請求書の詳細
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},耐用年数後の期待値は以上である必要があります{0}
 DocType: Purchase Receipt,Vehicle Number,車両番号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,繰り返し請求停止予定日
 DocType: Employee Loan,Loan Amount,融資額
@@ -1981,12 +1983,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,タイムシート
 DocType: HR Settings,HR Settings,人事設定
 DocType: Salary Slip,net pay info,ネット有料情報
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,経費請求は承認待ちです。経費承認者のみ、ステータスを更新することができます。
 DocType: Email Digest,New Expenses,新しい経費
 DocType: Purchase Invoice,Additional Discount Amount,追加割引額
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：項目は固定資産であるとして数量は、1でなければなりません。複数の数量のための個別の行を使用してください。
 DocType: Leave Block List Allow,Leave Block List Allow,許可する休暇リスト
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,略称は、空白またはスペースにすることはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,グループから非グループ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,スポーツ
 DocType: Loan Type,Loan Name,ローン名前
@@ -1997,6 +1999,7 @@
 ,Customer Acquisition and Loyalty,顧客獲得とロイヤルティ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,返品を保管する倉庫
 DocType: Production Order,Skip Material Transfer,マテリアル転送をスキップする
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,キー日付{2}の{0}から{1}への為替レートを見つけることができません。通貨レコードを手動で作成してください
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,会計年度終了日
 DocType: POS Profile,Price List,価格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}はデフォルト会計年度です。変更を反映するためにブラウザを更新してください
@@ -2013,19 +2016,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},アカウント{0}は無効です。アカウントの通貨は{1}でなければなりません
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}には数量単位変換係数が必要です
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは受注、納品書や仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは受注、納品書や仕訳のいずれかでなければなりません
 DocType: Salary Component,Deduction,控除
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：時間との時間からは必須です。
 DocType: Stock Reconciliation Item,Amount Difference,量差
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},価格表{1}の{0}にアイテム価格を追加しました
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,営業担当者の従業員IDを入力してください
 DocType: Territory,Classification of Customers by region,地域別の顧客の分類
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,差額はゼロでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差額はゼロでなければなりません
 DocType: Project,Gross Margin,売上総利益
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,最初の生産アイテムを入力してください
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算された銀行報告書の残高
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,無効なユーザー
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,見積
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,見積
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,控除合計
 ,Production Analytics,生産分析
@@ -2034,9 +2037,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},注意：添付ファイル{0}のSSL証明書が無効です
 DocType: Student Admission,Eligibility,適格性
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",リードは、あなたのリードとしてすべての連絡先などを追加、あなたがビジネスを得るのを助けます
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",リードは、あなたのリードとしてすべての連絡先などを追加、あなたがビジネスを得るのを助けます
 DocType: Production Order Operation,Actual Operation Time,実作業時間
 DocType: Authorization Rule,Applicable To (User),（ユーザー）に適用
 DocType: Purchase Taxes and Charges,Deduct,差し引く
@@ -2051,7 +2054,7 @@
 DocType: Guardian,Work Address,仕事の住所
 DocType: Appraisal,Calculate Total Score,合計スコアを計算
 DocType: Request for Quotation,Manufacturing Manager,製造マネージャー
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},シリアル番号{0}は {1}まで保証期間内です
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,梱包ごとに納品書を分割
 apps/erpnext/erpnext/hooks.py +87,Shipments,出荷
 DocType: Payment Entry,Total Allocated Amount (Company Currency),総配分される金額（会社通貨）
@@ -2071,10 +2074,10 @@
 DocType: Leave Application,Total Leave Days,総休暇日数
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：ユーザーを無効にするとメールは送信されなくなります
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,インタラクション数
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,会社を選択...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,会社を選択...
 DocType: Leave Control Panel,Leave blank if considered for all departments,全部門が対象の場合は空白のままにします
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",雇用タイプ（正社員、契約社員、インターンなど）
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}はアイテム{1}に必須です
 DocType: Process Payroll,Fortnightly,2週間ごとの
 DocType: Currency Exchange,From Currency,通貨から
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",割当額、請求タイプ、請求書番号を少なくとも1つの行から選択してください
@@ -2083,14 +2086,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),レート（報告通貨）
 DocType: Student Guardian,Others,その他
 DocType: Payment Entry,Unallocated Amount,未割り当て額
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,一致する項目が見つかりません。 {0}のために他の値を選択してください。
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,これ以上のアップデートはありません
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,最初の行には、「前行の数量」「前行の合計」などの料金タイプを選択することはできません
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子アイテムは、製品バンドルであってはなりません。項目を削除 `{0} &#39;と保存してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業務
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,タイムシートを追加
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,タイムシートを追加
 DocType: Vehicle Service,Service Item,サービスアイテム
 DocType: Bank Guarantee,Bank Guarantee,銀行保証
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,「スケジュールを生成」をクリックしてスケジュールを取得してください
@@ -2114,6 +2117,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},行＃{0}：アセット{1} {2}既にあります
 DocType: Quotation Item,Stock Balance,在庫残高
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,受注からの支払
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,セットアップ&gt;設定&gt;ネーミングシリーズで{0}のネーミングシリーズを設定してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,最高経営責任者（CEO）
 DocType: Expense Claim Detail,Expense Claim Detail,経費請求の詳細
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,正しいアカウントを選択してください
@@ -2138,14 +2142,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,価格表が設定されていない場合の価格は表示されません
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,配送ルールに国を指定するか、全世界出荷をチェックしてください
 DocType: Stock Entry,Total Incoming Value,収入価値合計
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,デビットへが必要とされます
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,デビットへが必要とされます
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",タイムシートは、あなたのチームによって行わのactivitesのための時間、コストおよび課金を追跡するのに役立ち
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,仕入価格表
 DocType: Offer Letter Term,Offer Term,雇用契約条件
 DocType: Quality Inspection,Quality Manager,品質管理者
 DocType: Job Applicant,Job Opening,求人
 DocType: Payment Reconciliation,Payment Reconciliation,支払照合
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,担当者名を選択してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,担当者名を選択してください
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},総未払い：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOMウェブサイトの運用
@@ -2172,23 +2176,23 @@
 DocType: Opportunity,Lost Reason,失われた理由
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新しい住所
 DocType: Quality Inspection,Sample Size,サンプルサイズ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,領収書の文書を入力してください。
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,全てのアイテムはすでに請求済みです
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,領収書の文書を入力してください。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,コストセンターはさらにグループの下に作成できますが、エントリは非グループに対して対して作成できます
 DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ユーザーと権限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},作成された製造指図：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},作成された製造指図：{0}
 DocType: Branch,Branch,支社・支店
 DocType: Guardian,Mobile Number,携帯電話番号
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷とブランディング
 DocType: Bin,Actual Quantity,実際の数量
 DocType: Shipping Rule,example: Next Day Shipping,例：翌日発送
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,シリアル番号 {0} は見つかりません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,シリアル番号 {0} は見つかりません
 DocType: Scheduling Tool,Student Batch,学生バッチ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,あなたの顧客
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,学生を作ります
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,学生を作ります
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},プロジェクト：{0} の共同作業に招待されました
 DocType: Leave Block List Date,Block Date,ブロック日付
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,今すぐ適用
@@ -2211,8 +2215,9 @@
 DocType: SMS Log,Sent To,送信先
 DocType: Payment Request,Make Sales Invoice,納品書を作成
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ソフト
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,次の連絡先の日付は、過去にすることはできません
 DocType: Company,For Reference Only.,参考用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,バッチ番号を選択
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},無効な{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,前払額
@@ -2226,7 +2231,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ケース番号は0にすることはできません
 DocType: Item,Show a slideshow at the top of the page,ページの上部にスライドショーを表示
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,部品表
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,店舗
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,店舗
 DocType: Serial No,Delivery Time,納品時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,エイジング基準
 DocType: Item,End of Life,提供終了
@@ -2238,12 +2243,12 @@
 DocType: Rename Tool,Rename Tool,ツール名称変更
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,費用更新
 DocType: Item Reorder,Item Reorder,アイテム再注文
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,ショー給与スリップ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,資材配送
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,ショー給与スリップ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,資材配送
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",「運用」には「運用コスト」「固有の運用番号」を指定してください。
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,この文書では、アイテム{4}の{0} {1}によって限界を超えています。あなたが作っている同じに対して別の{3} {2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,保存した後、繰り返し設定をしてください
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,変化量のアカウントを選択
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,保存した後、繰り返し設定をしてください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,変化量のアカウントを選択
 DocType: Purchase Invoice,Price List Currency,価格表の通貨
 DocType: Naming Series,User must always select,ユーザーは常に選択する必要があります
 DocType: Stock Settings,Allow Negative Stock,マイナス在庫を許可
@@ -2255,7 +2260,7 @@
 DocType: Quality Inspection,Verified By,検証者
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","既存の取引が存在するため、会社のデフォルトの通貨を変更することができません。
 デフォルトの通貨を変更するには取引をキャンセルする必要があります。"
-DocType: Grade Interval,Grade Description,等級説明
+DocType: Grading Scale Interval,Grade Description,等級説明
 DocType: Stock Entry,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,給与伝票を作成する
@@ -2293,7 +2298,7 @@
 DocType: Upload Attendance,Attendance To Date,出勤日
 DocType: Warranty Claim,Raised By,要求者
 DocType: Payment Gateway Account,Payment Account,支払勘定
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,続行する会社を指定してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,続行する会社を指定してください
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,売掛金の純変更
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,代償オフ
 DocType: Offer Letter,Accepted,承認済
@@ -2302,12 +2307,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,本当にこの会社のすべての取引を削除するか確認してください。マスタデータは残ります。このアクションは、元に戻すことはできません。
 DocType: Room,Room Number,部屋番号
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},無効な参照 {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）は製造指示{3}において計画数量（{2}）より大きくすることはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0}（{1}）は製造指示{3}において計画数量（{2}）より大きくすることはできません
 DocType: Shipping Rule,Shipping Rule Label,出荷ルールラベル
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ユーザーフォーラム
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料は空白にできません。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,クイック仕訳エントリー
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",請求書は、ドロップシッピングの項目を含む、株式を更新できませんでした。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,クイック仕訳エントリー
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,アイテムに対して部品表が記載されている場合は、レートを変更することができません
 DocType: Employee,Previous Work Experience,前職歴
 DocType: Stock Entry,For Quantity,数量
@@ -2320,7 +2325,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,規約１
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,あなたはこのシステムを設定している研究所の名前。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会計エントリーはこの日から凍結され、以下の役割を除いて実行／変更できません。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,保守スケジュールを生成する前に、ドキュメントを保存してください
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,プロジェクトステータス
 DocType: UOM,Check this to disallow fractions. (for Nos),数に小数を許可しない場合チェック
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,以下の製造指示が作成されました：
@@ -2347,7 +2352,7 @@
 ,Employees working on a holiday,休日に従事している従業員
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,マークプレゼント
 DocType: Project,% Complete Method,％完全な方法
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},メンテナンスの開始日は、シリアル番号{0}の納品日より前にすることはできません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},メンテナンスの開始日は、シリアル番号{0}の納品日より前にすることはできません
 DocType: Production Order,Actual End Date,実際の終了日
 DocType: BOM,Operating Cost (Company Currency),営業費用（会社通貨）
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2364,7 +2369,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,承認された休暇申請の記録と一致しない無給休暇
 DocType: Campaign,Campaign-.####,キャンペーン。＃＃＃＃
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,次のステップ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,可能な限り最高のレートで指定した項目を入力してください
 DocType: Selling Settings,Auto close Opportunity after 15 days,15日後にオートクローズ機会
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,終了年
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,見積もり/リード％
@@ -2428,7 +2433,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,受領数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},作成したフィーレコード -  {0}
 DocType: Asset Category Account,Asset Category Account,資産カテゴリーアカウント
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},受注数{1}より多くのアイテム{0}を製造することはできません
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,在庫エントリ{0}は提出されていません
 DocType: Payment Reconciliation,Bank / Cash Account,銀行/現金勘定
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,次の接触によっては、リードメールアドレスと同じにすることはできません
@@ -2450,7 +2455,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,決済日が記入されていません
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,製造
 DocType: Guardian,Occupation,職業
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員ネーミングシステムの人事管理&gt;人事管理の設定
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0}：開始日は終了日より前でなければなりません
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),合計（量）
 DocType: Sales Invoice,This Document,この文書
 DocType: Installation Note Item,Installed Qty,設置済数量
@@ -2466,14 +2472,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,課題をレポート
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,水道光熱費
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：仕訳は、{1}アカウント{2}を持っているか、すでに別のバウチャーに対して一致しません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：仕訳は、{1}アカウント{2}を持っているか、すでに別のバウチャーに対して一致しません
 DocType: Buying Settings,Default Buying Price List,デフォルト購入価格表
 DocType: Process Payroll,Salary Slip Based on Timesheet,タイムシートに基づいて給与スリップ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,上記の選択基準又は給与のスリップには従業員がすでに作成されていません
 DocType: Notification Control,Sales Order Message,受注メッセージ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",会社、通貨、会計年度などのデフォルト値を設定
 DocType: Payment Entry,Payment Type,支払タイプ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,アイテム{0}のバッチを選択してください。この要件を満たす単一のバッチを見つけることができません
 DocType: Process Payroll,Select Employees,従業員を選択
 DocType: Opportunity,Potential Sales Deal,潜在的販売取引
 DocType: Payment Entry,Cheque/Reference Date,小切手/リファレンス日
@@ -2490,7 +2496,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},グローバルPOSプロファイル {0} が会社 {1} に作成されています
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,すべての部品表でアイテム／部品表を交換してください
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,領収書の文書を提出しなければなりません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,領収書の文書を提出しなければなりません
 DocType: Purchase Invoice Item,Received Qty,受領数
 DocType: Stock Entry Detail,Serial No / Batch,シリアル番号／バッチ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,有料とNot配信されません
@@ -2499,11 +2505,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,いいえタイムシートはありません
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0}キャリー転送できないタイプを残します
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',メンテナンススケジュールが全てのアイテムに生成されていません。「スケジュールを生成」をクリックしてください
 ,To Produce,製造
 apps/erpnext/erpnext/config/hr.py +93,Payroll,給与
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",{1}の行{0}では、アイテム単価に{2}を含める場合、行{3}も含まれている必要があります
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ユーザーを作成します
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ユーザーを作成します
 DocType: Packing Slip,Identification of the package for the delivery (for print),納品パッケージの識別票（印刷用）
 DocType: Bin,Reserved Quantity,予約数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,有効なメールアドレスを入力してください
@@ -2515,15 +2521,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,[無効]テンプレートは、デフォルトのテンプレートであってはなりません
 DocType: Account,Income Account,収益勘定
 DocType: Payment Request,Amount in customer's currency,顧客通貨での金額
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,配送
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,配送
 DocType: Stock Reconciliation Item,Current Qty,現在の数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",原価計算セクションの「資材単価基準」を参照してください。
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,前の
 DocType: Appraisal Goal,Key Responsibility Area,重要責任分野
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",学生のバッチは、あなたが学生のための出席、アセスメントとサービス料を追跡するのに役立ち
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",学生のバッチは、あなたが学生のための出席、アセスメントとサービス料を追跡するのに役立ち
 DocType: Payment Entry,Total Allocated Amount,総配分される金額
 DocType: Item Reorder,Material Request Type,資材要求タイプ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1}への給与Accural仕訳
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",localStorageがいっぱいになった、保存されませんでした
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",localStorageがいっぱいになった、保存されませんでした
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：数量単位（UOM）換算係数は必須です
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,参照
 DocType: Budget,Cost Center,コストセンター
@@ -2533,16 +2540,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,販売取引からお客様の税務イドを隠します
 DocType: Upload Attendance,Upload HTML,HTMLアップロード
 DocType: Employee,Relieving Date,退職日
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",価格設定ルールは、価格表を上書きし、いくつかの基準に基づいて値引きの割合を定義します
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫は在庫エントリー/納品書/領収書を介してのみ変更可能です
 DocType: Employee Education,Class / Percentage,クラス/パーセンテージ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,マーケティングおよび販売部長
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.",選択した価格設定ルールが「価格」のために作られている場合は、価格表が上書きされます。価格設定ルールの価格は最終的な価格なので、以降は割引が適用されるべきではありません。したがって、受注、発注書などのような取引内では「価格表レート」フィールドよりも「レート」フィールドで取得されます。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",選択した価格設定ルールが「価格」のために作られている場合は、価格表が上書きされます。価格設定ルールの価格は最終的な価格なので、以降は割引が適用されるべきではありません。したがって、受注、発注書などのような取引内では「価格表レート」フィールドよりも「レート」フィールドで取得されます。
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,業種によってリードを追跡
 DocType: Item Supplier,Item Supplier,アイテムサプライヤー
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,バッチ番号を取得するためにアイテムコードを入力をしてください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to {1} の値を選択してください
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,全ての住所。
 DocType: Company,Stock Settings,在庫設定
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",両方のレコードで次のプロパティが同じである場合、マージのみ可能です。グループ、ルートタイプ、会社です
@@ -2552,6 +2559,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',「開く」の状態で、従業員へのイベントに関する電子メールを送信します
 DocType: Task,Depends on Tasks,タスクに依存
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,顧客グループツリーを管理します。
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ショッピングカートを有効にせずに添付ファイルを表示することができます
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新しいコストセンター名
 DocType: Leave Control Panel,Leave Control Panel,[コントロールパネル]を閉じる
@@ -2564,11 +2572,10 @@
 DocType: Sales Invoice,Debit To,借方計上
 DocType: Delivery Note,Required only for sample item.,サンプルアイテムにのみ必要です
 DocType: Stock Ledger Entry,Actual Qty After Transaction,トランザクションの後、実際の数量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,サプライヤ&gt;サプライヤタイプ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0}と{1}の間で見つかりませ給与スリップません
 ,Pending SO Items For Purchase Request,仕入要求のため保留中の受注アイテム
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生の入学
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} は無効になっています
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} は無効になっています
 DocType: Supplier,Billing Currency,請求通貨
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,XL
@@ -2585,9 +2592,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ホームページ人気商品
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,すべての評価グループ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),合計{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),合計{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,地域
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,必要な訪問の数を記述してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,必要な訪問の数を記述してください
 DocType: Stock Settings,Default Valuation Method,デフォルト評価方法
 DocType: Vehicle Log,Fuel Qty,燃料数量
 DocType: Production Order Operation,Planned Start Time,計画開始時間
@@ -2603,7 +2610,7 @@
 DocType: Price List,Price List Master,価格表マスター
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,すべての販売取引について、複数の「営業担当者」に対するタグを付けることができるため、これによって目標を設定しチェックすることができます。
 ,S.O. No.,受注番号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},リード{0}から顧客を作成してください
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},リード{0}から顧客を作成してください
 DocType: Price List,Applicable for Countries,国に適用
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,「承認済み」と「拒否」に提出することができる状態でアプリケーションをのみを残します
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},学生グループ名は、行で必須です{0}
@@ -2645,7 +2652,7 @@
 DocType: Project,Copied From,コピー元
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},名前のエラー：{0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,不足
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} {2} {3}に関連付けられていません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} {2} {3}に関連付けられていません
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,従業員{0}の出勤はすでにマークされています
 DocType: Packing Slip,If more than one package of the same type (for print),同じタイプで複数パッケージの場合（印刷用）
 ,Salary Register,給与登録
@@ -2664,7 +2671,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ショッピングカートに使用
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},値は{0}属性{1}のアイテムの属性値を有効な項目のリストに存在しない{2}
 DocType: BOM Item,Scrap %,スクラップ％
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",料金は、選択によって、アイテムの数量または量に基づいて均等に分割されます
 DocType: Maintenance Visit,Purposes,目的
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,還付書内では、少なくとも1つの項目がマイナスで入力されていなければなりません
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}は、ワークステーション{1}で使用可能な作業時間よりも長いため、複数の操作に分解してください
@@ -2685,16 +2692,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,地域ツリーを管理
 DocType: Journal Entry Account,Sales Invoice,請求書
 DocType: Journal Entry Account,Party Balance,当事者残高
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,「割引を適用」を選択してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,「割引を適用」を選択してください
 DocType: Company,Default Receivable Account,デフォルト売掛金勘定
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,上記選択条件に支払われる総給与のための銀行エントリを作成
 DocType: Stock Entry,Material Transfer for Manufacture,製造用資材移送
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,割引率は、価格表に対して、またはすべての価格リストのいずれかを適用することができます。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,割引率は、価格表に対して、またはすべての価格リストのいずれかを適用することができます。
 DocType: Purchase Invoice,Half-yearly,半年ごと
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,在庫の会計エントリー
 DocType: Vehicle Service,Engine Oil,エンジンオイル
 DocType: Sales Invoice,Sales Team1,販売チーム1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,アイテム{0}は存在しません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,アイテム{0}は存在しません
 DocType: Sales Invoice,Customer Address,顧客の住所
 DocType: Employee Loan,Loan Details,ローン詳細
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：完了数量はゼロより大きくなければなりません。
@@ -2702,24 +2709,24 @@
 DocType: Account,Root Type,ルートタイプ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：アイテム {2} では {1} 以上を返すことはできません
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,プロット
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,プロット
 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}行にターゲット倉庫が必須です。
 DocType: Cheque Print Template,Primary Settings,プライマリ設定
 DocType: Purchase Invoice,Select Supplier Address,サプライヤー住所を選択
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,従業員を追加します。
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,従業員を追加します。
 DocType: Purchase Invoice Item,Quality Inspection,品質検査
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,XS
 DocType: Company,Standard Template,標準テンプレート
 DocType: Training Event,Theory,理論
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,警告：資材要求数が注文最小数を下回っています。
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,アカウント{0}は凍結されています
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,組織内で別々の勘定科目を持つ法人／子会社
 DocType: Payment Request,Mute Email,ミュートメール
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆タバコ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},唯一の未請求{0}に対して支払いを行うことができます
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,手数料率は、100を超えることはできません。
 DocType: Stock Entry,Subcontract,下請
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,先に{0}を入力してください
@@ -2758,7 +2765,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,既存の取引に倉庫を基に変換することはできません。
 DocType: Assessment Result Tool,Result HTML,結果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,有効期限
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,学生を追加
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,学生を追加
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0}を選択してください
 DocType: C-Form,C-Form No,C-フォームはありません
 DocType: BOM,Exploded_items,Exploded_items
@@ -2800,7 +2807,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,量／額
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,会計年度を選択
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,再注文レベル
 DocType: Company,Chart Of Accounts Template,アカウントテンプレートのチャート
 DocType: Attendance,Attendance Date,出勤日
@@ -2815,14 +2822,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,エントリーを複製
 DocType: Program Enrollment Tool,Get Students,学生を取得
 DocType: Serial No,Under Warranty,保証期間中
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[エラー]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[エラー]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,受注を保存すると表示される表記内。
 ,Employee Birthday,従業員の誕生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生バッチ出席ツール
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,リミットクロス
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ベンチャーキャピタル
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,この「アカデミックイヤー &#39;{0}と{1}はすでに存在している「中期名」との学術用語。これらのエントリを変更して、もう一度お試しください。
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",項目{0}に対する既存のトランザクションがあるとして、あなたは{1}の値を変更することはできません
 DocType: UOM,Must be Whole Number,整数でなければなりません
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新しい有給休暇（日数）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,シリアル番号 {0}は存在しません
@@ -2842,7 +2849,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,％の資材が請求済（この受注を対象）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,決算エントリー
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,既存の取引があるコストセンターは、グループに変換することはできません
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},量{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},量{0} {1} {2} {3}
 DocType: Account,Depreciation,減価償却
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),サプライヤー
 DocType: Employee Attendance Tool,Employee Attendance Tool,従業員出勤ツール
@@ -2865,7 +2872,7 @@
 DocType: Supplier,Last Day of the Next Month,次月末日
 DocType: Support Settings,Auto close Issue after 7 days,7日後にオートクローズ号
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",前に割り当てることができないままに、{0}、休暇バランスが既にキャリー転送将来の休暇の割り当てレコードであったように{1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注：支払期限／基準日の超過は顧客の信用日数{0}日間許容されます
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申請者
 DocType: Asset Category Account,Accumulated Depreciation Account,減価償却累計額勘定
 DocType: Stock Settings,Freeze Stock Entries,凍結在庫エントリー
@@ -2876,7 +2883,7 @@
 ,Stock Analytics,在庫分析
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,操作は空白のままにすることはできません
 DocType: Maintenance Visit Purpose,Against Document Detail No,文書詳細番号に対して
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,パーティーの種類は必須です
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,パーティーの種類は必須です
 DocType: Quality Inspection,Outgoing,支出
 DocType: Material Request,Requested For,要求対象
 DocType: Quotation Item,Against Doctype,対文書タイプ
@@ -2893,10 +2900,10 @@
 DocType: Asset,Item Code,アイテムコード
 DocType: Production Planning Tool,Create Production Orders,製造指示を作成
 DocType: Serial No,Warranty / AMC Details,保証/ 年間保守契約の詳細
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,アクティビティベースのグループの学生を手動で選択する
 DocType: Journal Entry,User Remark,ユーザー備考
 DocType: Lead,Market Segment,市場区分
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},有料額は合計マイナスの残高を超えることはできません{0}
 DocType: Employee Internal Work History,Employee Internal Work History,従業員の入社後の職歴
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),（借方）を閉じる
 DocType: Cheque Print Template,Cheque Size,小切手サイズ
@@ -2911,7 +2918,7 @@
 DocType: Production Planning Tool,Create Material Requests,資材要求を作成
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,リファレンス詳細
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,残存価額は購入総額未満でなければなりません
 DocType: Sales Invoice Item,Available Qty at Warehouse,倉庫の利用可能数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,請求金額
 DocType: Asset,Double Declining Balance,ダブル定率
@@ -2932,20 +2939,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",この在庫棚卸が繰越エントリであるため、差異勘定は資産／負債タイプのアカウントである必要があります
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支出額は、ローン額を超えることはできません{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},アイテム{0}には発注番号が必要です
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,製造指図が作成されていません
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,製造指図が作成されていません
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',「終了日」は「開始日」の後にしてください。
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},学生としてのステータスを変更することはできません{0}学生のアプリケーションとリンクされている{1}
 DocType: Asset,Fully Depreciated,完全に減価償却
 ,Stock Projected Qty,予測在庫数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},顧客{0}はプロジェクト{1}に属していません
 DocType: Employee Attendance Tool,Marked Attendance HTML,著しい出席HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",名言は、あなたの顧客に送られてきた入札提案されています
 DocType: Sales Order,Customer's Purchase Order,顧客の購入注文
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,シリアル番号とバッチ
 DocType: Warranty Claim,From Company,会社から
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,評価基準のスコアの合計は{0}にする必要があります。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,値または数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,予約された減価償却の数を設定してください
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,値または数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,プロダクションの注文がために提起することができません。
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分
 DocType: Purchase Invoice,Purchase Taxes and Charges,購入租税公課
@@ -2957,7 +2964,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,すべての倉庫
 DocType: Sales Partner,Retailer,小売業者
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,貸方アカウントは貸借対照表アカウントである必要があります
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,全てのサプライヤータイプ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,全てのサプライヤータイプ
 DocType: Global Defaults,Disable In Words,文字表記無効
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,アイテムは自動的に採番されていないため、アイテムコードが必須です
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},見積{0}はタイプ{1}ではありません
@@ -2966,6 +2973,7 @@
 DocType: Production Order,PRO-,プロ-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,銀行当座貸越口座
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,給与伝票を作成
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行番号{0}：割り当て金額は未払い金額より大きくすることはできません。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,部品表（BOM）を表示
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,担保ローン
 DocType: Purchase Invoice,Edit Posting Date and Time,編集転記日付と時刻
@@ -3005,7 +3013,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0}よりも古い在庫取引を更新することはできません
 DocType: Purchase Invoice Item,PR Detail,PR詳細
 DocType: Sales Order,Fully Billed,全て記帳済
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},従業員にデフォルト買掛金アカウントを設定してください{0}
 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 +127,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),梱包の総重量は通常、正味重量＋梱包材重量です （印刷用）
@@ -3015,7 +3022,7 @@
 DocType: Student Group,Group Based On,グループベース
 DocType: Journal Entry,Bill Date,ビル日
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",サービスアイテム、種類、頻度や出費の量が必要とされています
-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:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",最高優先度を持つ複数の価格設定ルールがあった場合でも、次の内部優先順位が適用されます
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},あなたは本当に{0}から{1}へのすべての給与のスリップを登録しますか
 DocType: Cheque Print Template,Cheque Height,小切手の高さ
 DocType: Supplier,Supplier Details,サプライヤー詳細
@@ -3027,7 +3034,7 @@
 DocType: Vehicle Log,Invoice Ref,請求書の参考文献
 DocType: Purchase Order,Recurring Order,定期的な注文
 DocType: Company,Default Income Account,デフォルト損益勘定
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,顧客グループ／顧客
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,顧客グループ／顧客
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),閉じていない会計年度の利益/損失（クレジット）
 DocType: Sales Invoice,Time Sheets,タイムシート
 DocType: Payment Gateway Account,Default Payment Request Message,デフォルト支払要求メッセージ
@@ -3047,10 +3054,10 @@
 DocType: Notification Control,Quotation Message,見積メッセージ
 DocType: Employee Loan,Employee Loan Application,従業員の融資申し込み
 DocType: Issue,Opening Date,日付を開く
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,出席が正常にマークされています。
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,出席が正常にマークされています。
 DocType: Journal Entry,Remark,備考
 DocType: Purchase Receipt Item,Rate and Amount,割合と量
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},{0}のアカウントの種類でなければなりません{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},{0}のアカウントの種類でなければなりません{1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休暇・休日
 DocType: School Settings,Current Academic Term,現在の学期
 DocType: Sales Order,Not Billed,未記帳
@@ -3072,7 +3079,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生グループ
 DocType: Shopping Cart Settings,Quotation Series,見積シリーズ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",同名のアイテム（{0}）が存在しますので、アイテムグループ名を変えるか、アイテム名を変更してください
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,顧客を選択してください
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,顧客を選択してください
 DocType: C-Form,I,私
 DocType: Company,Asset Depreciation Cost Center,資産減価償却コストセンター
 DocType: Sales Order Item,Sales Order Date,受注日
@@ -3091,20 +3098,20 @@
 DocType: Vehicle,Insurance Details,保険の詳細
 DocType: Account,Payable,買掛
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,返済期間を入力してください。
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),債務者（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),債務者（{0}）
 DocType: Pricing Rule,Margin,マージン
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新規顧客
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,粗利益％
 DocType: Appraisal Goal,Weightage (%),重み付け（％）
 DocType: Bank Reconciliation Detail,Clearance Date,決済日
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,購入総額は必須です
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,購入総額は必須です
 DocType: Lead,Address Desc,住所種別
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,党は必須です
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,党は必須です
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,トピック名
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,販売または購入のいずれかを選択する必要があります
-DocType: Grading Structure,Grade Intervals,グレード間隔
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,あなたのビジネスの性質を選択します。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},行番号{0}：参照{1}の重複エントリ{2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,製造作業が行なわれる場所
 DocType: Asset Movement,Source Warehouse,出庫元
 DocType: Installation Note,Installation Date,設置日
@@ -3141,7 +3148,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,印刷テンプレートのレターヘッド。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,印刷テンプレートのタイトル（例：「見積送り状」）
 DocType: Student Guardian,Student Guardian,学生ガーディアン
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,評価タイプの請求は「包括的」にマークすることはえきません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,アイテムごとに数量単位が異なると、（合計）正味重量値が正しくなりません。各アイテムの正味重量が同じ単位になっていることを確認してください。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,部品表通貨レート
@@ -3168,7 +3175,7 @@
 DocType: Company,Exchange Gain / Loss Account,取引利益/損失のアカウント
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,従業員および出勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},目的は、{0}のいずれかである必要があります
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,フォームに入力して保存します
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,コミュニティフォーラム
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,株式の実際の数量
@@ -3183,7 +3190,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再注文数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,現在の求人
 DocType: Company,Stock Adjustment Account,在庫調整勘定
-DocType: Journal Entry,Write Off,償却
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,償却
 DocType: Timesheet Detail,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",システムユーザー（ログイン）IDを指定します。設定すると、すべての人事フォームのデフォルトになります。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：{1}から
@@ -3194,26 +3201,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,サプライヤーから顧客に配送
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃フォーム/商品/ {0}）在庫切れです
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,次の日は、転記日付よりも大きくなければなりません
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,表示減税アップ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,表示減税アップ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},期限／基準日は{0}より後にすることはできません
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,データインポート・エクスポート
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",ストックエントリは、したがって、あなたが再割り当てたり、それを変更することはできません、倉庫{0}に対して存在します
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,いいえ学生は見つかりませんでした
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,いいえ学生は見つかりませんでした
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,請求書の転記日付
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,売る
 DocType: Sales Invoice,Rounded Total,合計（四捨五入）
 DocType: Product Bundle,List items that form the package.,梱包を形成するリストアイテム
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,割合の割り当ては100パーセントに等しくなければなりません
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,パーティーを選択する前に転記日付を選択してください
 DocType: Program Enrollment,School House,スクールハウス
 DocType: Serial No,Out of AMC,年間保守契約外
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,見積もりを選択してください
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,メンテナンス訪問を作成
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,見積もりを選択してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,予約された減価償却の数は、減価償却費の合計数を超えることはできません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,メンテナンス訪問を作成
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,販売マスターマネージャー{0}の役割を持っているユーザーに連絡してください
 DocType: Company,Default Cash Account,デフォルトの現金勘定
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,会社（顧客・サプライヤーではない）のマスター
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,これは、この生徒の出席に基づいています
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,学生はいない
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,複数のアイテムまたは全開フォームを追加
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',「納品予定日」を入力してください
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,この受注をキャンセルする前に、納品書{0}をキャンセルしなければなりません
@@ -3245,6 +3253,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,アイテム3
 DocType: Purchase Order,Customer Contact Email,顧客連絡先メールアドレス
 DocType: Warranty Claim,Item and Warranty Details,アイテムおよび保証詳細
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品コード&gt;商品グループ&gt;ブランド
 DocType: Sales Team,Contribution (%),寄与度（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：「現金または銀行口座」が指定されていないため、支払エントリが作成されません
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,必須コースをフェッチするには、「プログラム」を選択します。
@@ -3259,9 +3268,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,照合前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),租税公課が追加されました。（報告通貨）
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,アイテムごとの税の行{0}では、勘定タイプ「税」「収入」「経費」「支払」のいずれかが必要です
 DocType: Sales Order,Partly Billed,一部支払済
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,アイテムは、{0}固定資産項目でなければなりません
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,アイテムは、{0}固定資産項目でなければなりません
 DocType: Item,Default BOM,デフォルト部品表
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,確認のため会社名を再入力してください
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,残高合計
@@ -3271,8 +3280,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,自動車
 DocType: Vehicle,Insurance Company,保険会社
 DocType: Asset Category Account,Fixed Asset Account,固定資産勘定
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,変数
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,納品書から
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,変数
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,納品書から
 DocType: Student,Student Email Address,学生のメールアドレス
 DocType: Timesheet Detail,From Time,開始時間
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,在庫あり：
@@ -3283,12 +3292,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,価格表為替レート
 DocType: Purchase Invoice Item,Rate,単価／率
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,インターン
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,アドレス名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,アドレス名称
 DocType: Stock Entry,From BOM,参照元部品表
 DocType: Assessment Code,Assessment Code,評価コード
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}が凍結される以前の在庫取引
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',「スケジュール生成」をクリックしてください
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",例「kg」「単位」「個数」「m」
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,参照日を入力した場合は参照番号が必須です
 DocType: Bank Reconciliation Detail,Payment Document,支払ドキュメント
@@ -3296,19 +3305,19 @@
 DocType: Salary Slip,Salary Structure,給与体系
 DocType: Account,Bank,銀行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空会社
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,資材課題
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,資材課題
 DocType: Material Request Item,For Warehouse,倉庫用
 DocType: Employee,Offer Date,雇用契約日
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,見積
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,オフラインモードになっています。あなたがネットワークを持ってまで、リロードすることができません。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,いいえ学生グループが作成されません。
 DocType: Purchase Invoice Item,Serial No,シリアル番号
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,毎月返済額は融資額を超えることはできません
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,メンテナンス詳細を入力してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,メンテナンス詳細を入力してください
 DocType: Purchase Invoice,Print Language,プリント言語
 DocType: Salary Slip,Total Working Hours,総労働時間
 DocType: Stock Entry,Including items for sub assemblies,組立部品のためのアイテムを含む
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,入力値は正でなければなりません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,入力値は正でなければなりません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,全ての領域
 DocType: Purchase Invoice,Items,アイテム
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生はすでに登録されています。
@@ -3327,16 +3336,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',バリエーションのデフォルト単位 '{0}' はテンプレート '{1}' と同じである必要があります
 DocType: Shipping Rule,Calculate Based On,計算基準
 DocType: Delivery Note Item,From Warehouse,倉庫から
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,製造する部品表（BOM）を持つアイテムいいえ
 DocType: Assessment Plan,Supervisor Name,上司の名前
 DocType: Program Enrollment Course,Program Enrollment Course,プログラム入学コース
-DocType: Grading Structure,Grading Structure,グレーディング構造
 DocType: Purchase Taxes and Charges,Valuation and Total,評価と総合
 DocType: Tax Rule,Shipping City,出荷先の市
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,この商品は、{0}（テンプレート）のバリエーションです。「コピーしない」が設定されていない限り、属性は、テンプレートからコピーされます
 DocType: Notification Control,Customize the Notification,通知をカスタマイズ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,営業活動によるキャッシュフロー
 DocType: Sales Invoice,Shipping Rule,出荷ルール
@@ -3357,8 +3364,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},アイテム{0}にはデフォルトの部品表が存在しません
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,最初の転記日付を選択してください
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,最初の転記日付を選択してください
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,開始日は終了日より前でなければなりません
 DocType: Leave Control Panel,Carry Forward,繰り越す
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,既存の取引があるコストセンターは、元帳に変換することはできません
 DocType: Department,Days for which Holidays are blocked for this department.,この部門のために休暇期間指定されている日
@@ -3370,7 +3377,7 @@
 DocType: Mode of Payment,General,一般
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,レターヘッドを添付
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後のコミュニケーション
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',カテゴリーが「評価」や「評価と合計」である場合は控除することができません
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}には複数のシリアル番号が必要です
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,請求書と一致支払い
@@ -3386,7 +3393,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),合計（数）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,エンターテインメント＆レジャー
 DocType: Quality Inspection,Item Serial No,アイテムシリアル番号
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,従業員レコードを作成します。
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,従業員レコードを作成します。
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,総現在価値
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,計算書
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,時
@@ -3399,9 +3406,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,未知の
 DocType: Shipping Rule,Shipping Rule Conditions,出荷ルール条件
 DocType: BOM Replace Tool,The new BOM after replacement,交換後の新しい部品表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,POS
 DocType: Payment Entry,Received Amount,受け取った金額
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,従業員ネーミングシステムの人事管理&gt;人事管理の設定
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",順序にすでに数量を無視して、完全な量のために作成します。
 DocType: Account,Tax,税
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,マークされていません
@@ -3412,9 +3418,9 @@
 DocType: C-Form,Invoices,請求
 DocType: Batch,Source Document Name,ソースドキュメント名
 DocType: Job Opening,Job Title,職業名
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ユーザーの作成
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ユーザーの作成
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,グラム
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,製造数量は0より大きくなければなりません
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,メンテナンス要請の訪問レポート。
 DocType: Stock Entry,Update Rate and Availability,単価と残量をアップデート
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,注文数に対して受領または提供が許可されている割合。例：100単位の注文を持っている状態で、割当が10％だった場合、110単位の受領を許可されます。
@@ -3423,28 +3429,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},アイテム{0}には経費科目が必須です
 DocType: BOM,Website Description,ウェブサイトの説明
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,資本の純変動
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,最初の購入請求書{0}をキャンセルしてください
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子メールアドレスは一意である必要があり、すでに{0}のために存在します
 DocType: Serial No,AMC Expiry Date,年間保守契約の有効期限日
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,領収書
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,領収書
 ,Sales Register,販売登録
 DocType: Daily Work Summary Settings Company,Send Emails At,で電子メールを送ります
 DocType: Quotation,Quotation Lost Reason,失注理由
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,あなたのドメインを選択
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},トランザクションの参照には{0} {1}日付けません
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,編集するものがありません
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,今月と保留中の活動の概要
 DocType: Customer Group,Customer Group Name,顧客グループ名
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,まだカスタマーはいません！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,キャッシュフロー計算書
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},融資額は、{0}の最大融資額を超えることはできません。
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ライセンス
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-フォーム{1}から請求書{0}を削除してください
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,償却勘定を入力してください
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最終注文日
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},アカウント{0} は会社 {1} に所属していません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}のシリアル番号が配達メモと一致しません
 DocType: Student,Guardian Details,ガーディアン詳細
 DocType: C-Form,C-Form,C-フォーム
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,複数の従業員のためのマーク出席
@@ -3469,20 +3477,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃のアカウントタイプでなければなりません &quot;固定資産&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,出量
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,販売のために出荷量を計算するルール
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,シリーズは必須です
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,シリーズは必須です
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融サービス
 DocType: Student Sibling,Student ID,学生証
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,時間ログの活動の種類
 DocType: Tax Rule,Sales,販売
 DocType: Stock Entry Detail,Basic Amount,基本額
 DocType: Training Event,Exam,試験
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},在庫アイテム{0}には倉庫が必要です
 DocType: Leave Allocation,Unused leaves,未使用の休暇
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,貸方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,貸方
 DocType: Tax Rule,Billing State,請求状況
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,移転
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1}党のアカウントに関連付けられていません{2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1}党のアカウントに関連付けられていません{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),（部分組立品を含む）展開した部品表を取得する
 DocType: Authorization Rule,Applicable To (Employee),（従業員）に適用
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,期日は必須です
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,属性 {0} の増分は0にすることはできません
@@ -3493,13 +3501,13 @@
 ,Inactive Customers,非アクティブ顧客
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,仕入領収書
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,どのように価格設定ルールが適用されている？
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,どのように価格設定ルールが適用されている？
 DocType: Stock Entry,Delivery Note No,納品書はありません
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",チェックした場合のみ、最終的な原材料の材料要求を購入すると、素材の要求に含まれます。それ以外の場合は、親項目のための材料の要求が作成されます
 DocType: Cheque Print Template,Message to show,表示するメッセージ
 DocType: Company,Retail,小売
 DocType: Attendance,Absent,欠勤
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,製品付属品
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,製品付属品
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}：無効参照{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,購入租税公課テンプレート
 DocType: Upload Attendance,Download Template,テンプレートのダウンロード
@@ -3509,10 +3517,10 @@
 DocType: Payment Entry,Account Paid From,アカウントから支払わ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原材料アイテムコード
 DocType: Journal Entry,Write Off Based On,償却基準
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,リードを作ります
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,リードを作ります
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,印刷と文房具
 DocType: Stock Settings,Show Barcode Field,ショーバーコードフィールド
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,サプライヤーメールを送信
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,サプライヤーメールを送信
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",給与はすでに{0}と{1}、この日付範囲の間にすることはできません申請期間を残すとの間の期間のために処理しました。
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,シリアル番号の設置レコード
 DocType: Guardian Interest,Guardian Interest,ガーディアンインタレスト
@@ -3524,6 +3532,7 @@
 DocType: Offer Letter,Awaiting Response,応答を待っています
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,上記
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},無効な属性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,標準でない支払い可能な口座
 DocType: Salary Slip,Earning & Deduction,収益と控除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,（オプション）この設定は、様々な取引をフィルタリングするために使用されます。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,マイナスの評価額は許可されていません
@@ -3539,10 +3548,9 @@
 DocType: Production Order Item,Production Order Item,製造指図の品目
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,レコードが見つかりません
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,スクラップ資産の取得原価
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,部分的にordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：項目{2}には「コストセンター」が必須です
 DocType: Vehicle,Policy No,ポリシーはありません
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,付属品からアイテムを取得
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,付属品からアイテムを取得
 DocType: Asset,Straight Line,直線
 DocType: Project User,Project User,プロジェクトユーザー
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,スプリット
@@ -3557,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,からの留学生を取得
 DocType: Hub Settings,Seller Country,販売者所在国
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ウェブサイト上でアイテムを公開
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,バッチでグループの学生
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,バッチでグループの学生
 DocType: Authorization Rule,Authorization Rule,認証ルール
 DocType: Sales Invoice,Terms and Conditions Details,規約の詳細
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,仕様
@@ -3609,14 +3617,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,小切手日
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},アカウント{0}：親アカウント{1}は会社{2}に属していません
 DocType: Program Enrollment Tool,Student Applicants,学生の応募者
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,この会社に関連するすべての取引を正常に削除しました！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,基準日
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,登録日
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,試用
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,給与コンポーネント
 DocType: Program Enrollment Tool,New Academic Year,新学期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,リターン/クレジットノート
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,リターン/クレジットノート
 DocType: Stock Settings,Auto insert Price List rate if missing,空の場合価格表の単価を自動挿入
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,支出額合計
 DocType: Production Order Item,Transferred Qty,移転数量
@@ -3636,7 +3644,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",休暇の種類（欠勤・病欠など）
 DocType: Email Digest,Send regular summary reports via Email.,メール経由で定期的な要約レポートを送信
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},経費請求タイプ{0}に、デフォルトのアカウントを設定してください
 DocType: Assessment Result,Student Name,学生の名前
 DocType: Brand,Item Manager,アイテムマネージャ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,給与支払ってください
@@ -3657,6 +3665,7 @@
 ,Sales Funnel,セールスファネル
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,略称は必須です
 DocType: Project,Task Progress,タスクの進捗状況
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,カート
 ,Qty to Transfer,転送する数量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,リードや顧客への見積。
 DocType: Stock Settings,Role Allowed to edit frozen stock,凍結在庫の編集が許可された役割
@@ -3684,12 +3693,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,アイテムごとの税の詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,研究所の略
 ,Item-wise Price List Rate,アイテムごとの価格表単価
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,サプライヤー見積
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,サプライヤー見積
 DocType: Quotation,In Words will be visible once you save the Quotation.,見積を保存すると表示される表記内。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）は行{1}の小数部にはできません
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,料金を徴収
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},バーコード{0}はアイテム{1}で使用済です
 DocType: Lead,Add to calendar on this date,この日付でカレンダーに追加
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,送料を追加するためのルール
 DocType: Item,Opening Stock,期首在庫
@@ -3706,8 +3715,8 @@
 Updated via 'Time Log'",「時間ログ」からアップデートされた分数
 DocType: Customer,From Lead,リードから
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,製造の指示
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,年度選択...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,年度選択...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POSエントリを作成するためにはPOSプロフィールが必要です
 DocType: Program Enrollment Tool,Enroll Students,学生を登録
 DocType: Hub Settings,Name Token,名前トークン
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準販売
@@ -3718,7 +3727,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},納品書{1}に対する{0}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,プロジェクト名
-DocType: Supplier,Mention if non-standard receivable account,非標準の売掛金の場合に記載
+DocType: Customer,Mention if non-standard receivable account,非標準の売掛金の場合に記載
 DocType: Journal Entry Account,If Income or Expense,収益または費用の場合
 DocType: Production Order,Required Items,必要なもの
 DocType: Stock Ledger Entry,Stock Value Difference,在庫価値の差違
@@ -3739,7 +3748,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,この営業担当者にアイテムグループごとの目標を設定する
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[日]より古い在庫を凍結
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資産は、固定資産の購入/販売のために必須です
-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.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","上記の条件内に二つ以上の価格設定ルールがある場合、優先順位が適用されます。
 優先度は0〜20の間の数で、デフォルト値はゼロ（空白）です。同じ条件で複数の価格設定ルールがある場合、大きい数字が優先されることになります。"
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,会計年度：{0}は存在しません
 DocType: Currency Exchange,To Currency,通貨
@@ -3765,7 +3774,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,アイテム{0}は在庫アイテムではないので無視されます
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",特定の処理／取引で価格設定ルールを適用させないようにするために、全てに適用可能な価格設定ルールを無効にする必要があります。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",特定の処理／取引で価格設定ルールを適用させないようにするために、全てに適用可能な価格設定ルールを無効にする必要があります。
 DocType: Assessment Group,Parent Assessment Group,親の評価グループ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ジョブズ
 ,Sales Order Trends,受注の傾向
@@ -3776,7 +3785,7 @@
 DocType: Stock Entry Detail,Additional Cost,追加費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,会計年度終了日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",伝票でグループ化されている場合、伝票番号でフィルタリングすることはできません。
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,サプライヤ見積を作成
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,サプライヤ見積を作成
 DocType: Quality Inspection,Incoming,収入
 DocType: BOM,Materials Required (Exploded),資材が必要です（展開）
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",自分以外のユーザーを組織に追加
@@ -3804,6 +3813,7 @@
 DocType: Employee,History In Company,会社での履歴
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ニュースレター
 DocType: Stock Ledger Entry,Stock Ledger Entry,在庫元帳エントリー
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,顧客&gt;顧客グループ&gt;テリトリー
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同じ項目が複数回入力されています
 DocType: Department,Leave Block List,休暇リスト
 DocType: Sales Invoice,Tax ID,納税者番号
@@ -3813,7 +3823,7 @@
 DocType: Customer,Sales Partner and Commission,販売パートナーと手数料
 DocType: Employee Loan,Rate of Interest (%) / Year,利子率（％）/年
 ,Project Quantity,プロジェクト数量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目について、ゼロであるあなたは「配布に基づく料金」を変更する必要がありますすることができます
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",合計{0}のすべての項目について、ゼロであるあなたは「配布に基づく料金」を変更する必要がありますすることができます
 DocType: Opportunity,To Discuss,連絡事項
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}は、このトランザクションを完了するために、{2}に必要な{1}の単位。
 DocType: Loan Type,Rate of Interest (%) Yearly,利子率（％）年間
@@ -3828,7 +3838,7 @@
 DocType: Purchase Invoice,Return,返品
 DocType: Production Order Operation,Production Order Operation,製造指示作業
 DocType: Pricing Rule,Disable,無効にする
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,お支払い方法は、支払いを行う必要があります
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,お支払い方法は、支払いを行う必要があります
 DocType: Project Task,Pending Review,レビュー待ち
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",資産{0}は{1}であるため廃棄することはできません
 DocType: Task,Total Expense Claim (via Expense Claim),総経費請求（経費請求経由）
@@ -3836,11 +3846,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,マーク不在
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOMの＃の通貨は、{1}選択した通貨と同じでなければなりません{2}
 DocType: Journal Entry Account,Exchange Rate,為替レート
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,受注{0}は提出されていません
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,受注{0}は提出されていません
 DocType: Homepage,Tag Line,タグライン
 DocType: Fee Component,Fee Component,手数料コンポーネント
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,フリート管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,から項目を追加します。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,から項目を追加します。
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：親口座{1}は会社{2}に属していません
 DocType: Cheque Print Template,Regular,レギュラー
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,すべての評価基準の総Weightageは100％でなければなりません
@@ -3853,7 +3863,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,倉庫{0}は存在しません
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hubに登録する
 DocType: Monthly Distribution,Monthly Distribution Percentages,月次配分割合
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,選択した項目はバッチを持てません
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,選択した項目はバッチを持てません
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",評価レート{1} {2}のための会計エントリを行うために必要とされる項目{0}、見つかりません。項目は、サンプルアイテムとして取引されている場合は、{1}、{1}項目テーブルであることを言及してください。それ以外の場合は、アイテムの着信在庫トランザクションを作成したり、言及評価率を項目レコードにして、このエントリをキャンセル/ submitingしてみてください
 DocType: Delivery Note,% of materials delivered against this Delivery Note,％の資材が納品済（この納品書を対象）
 DocType: Project,Customer Details,顧客の詳細
@@ -3862,15 +3872,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,受信者番号にURLパラメータを入力してください
 DocType: Payment Entry,Paid Amount,支払金額
 DocType: Assessment Plan,Supervisor,スーパーバイザー
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,オンライン
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,オンライン
 ,Available Stock for Packing Items,梱包可能な在庫
 DocType: Item Variant,Item Variant,アイテムバリエーション
 DocType: Assessment Result Tool,Assessment Result Tool,評価結果ツール
 DocType: BOM Scrap Item,BOM Scrap Item,BOMスクラップアイテム
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提出された注文を削除することはできません
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,提出された注文を削除することはできません
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,品質管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,アイテム{0}は無効になっています
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,アイテム{0}は無効になっています
 DocType: Employee Loan,Repay Fixed Amount per Period,期間ごとの固定額を返済
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},アイテム{0}の数量を入力してください
 DocType: Employee External Work History,Employee External Work History,従業員の職歴
@@ -3896,7 +3906,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,学生メールID
 DocType: Employee,Notice (days),お知らせ（日）
 DocType: Tax Rule,Sales Tax Template,販売税テンプレート
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,請求書を保存する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,請求書を保存する項目を選択します
 DocType: Employee,Encashment Date,現金化日
 DocType: Training Event,Internet,インターネット
 DocType: Account,Stock Adjustment,在庫調整
@@ -3919,7 +3929,7 @@
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,範囲の開始／終了を指定してください
 DocType: Serial No,Under AMC,AMC（年間保守契約）下
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価額は陸揚費用の伝票額を考慮して再計算されています
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,アイテムの評価額は陸揚費用の伝票額を考慮して再計算されています
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,販売取引のデフォルト設定
 DocType: Guardian,Guardian Of ,の守護者
 DocType: Grading Scale Interval,Threshold,しきい値
@@ -3929,6 +3939,7 @@
 DocType: Purchase Invoice,Debit Note Issued,デビットノート発行
 DocType: Production Order,Warehouses,倉庫
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}資産を転送することはできません
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,このアイテムは{0}（テンプレート）の変形です。
 DocType: Workstation,per hour,毎時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購入
 DocType: Announcement,Announcement,発表
@@ -3944,8 +3955,8 @@
 DocType: Account,Receivable,売掛金
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：注文がすでに存在しているとして、サプライヤーを変更することはできません
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,設定された与信限度額を超えた取引を提出することが許可されている役割
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,製造する項目を選択します
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,製造する項目を選択します
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",マスタデータの同期、それはいくつかの時間がかかる場合があります
 DocType: Item,Material Issue,資材課題
 DocType: Hub Settings,Seller Description,販売者の説明
 DocType: Employee Education,Qualification,資格
@@ -3957,7 +3968,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,注文済
 DocType: Salary Detail,Component,成分
 DocType: Assessment Criteria,Assessment Criteria Group,評価基準のグループ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},減価償却累計額を開くことに等しい未満でなければなりません{0}
 DocType: Warehouse,Warehouse Name,倉庫名
 DocType: Naming Series,Select Transaction,取引を選択
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,「役割承認」または「ユーザー承認」を入力してください
@@ -3970,7 +3981,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,登録済みの在庫エントリ{0}が存在するため、キャンセルすることができません
 DocType: Employee Loan,Disbursement Date,支払い日
 DocType: Vehicle,Vehicle,車両
 DocType: Purchase Invoice,In Words,文字表記
@@ -3984,14 +3995,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,資産減価償却と残高
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},量は{0} {1} {3}に{2}から転送します
 DocType: Sales Invoice,Get Advances Received,前受金を取得
 DocType: Email Digest,Add/Remove Recipients,受信者の追加／削除
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},停止された製造指示{0}に対しては取引が許可されていません
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",この会計年度をデフォルト値に設定するには、「デフォルトに設定」をクリックしてください
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,参加
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,不足数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,アイテムバリエーション{0}は同じ属性で存在しています
 DocType: Employee Loan,Repay from Salary,給与から返済
 DocType: Leave Application,LAP/,ラップ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},量のために、{0} {1}に対する支払いを要求{2}
@@ -4009,7 +4020,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,評価結果の詳細
 DocType: Employee Education,Employee Education,従業員教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,項目グループテーブルで見つかった重複するアイテム群
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,これは、アイテムの詳細を取得するために必要とされます。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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}はすでに受領されています
@@ -4018,7 +4029,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}任意のアカウントにリンクされていない、作成/倉庫のための対応（資産）のアカウントをリンクしてください。
 DocType: Purchase Invoice,Recurring Id,繰り返しID
 DocType: Customer,Sales Team Details,営業チームの詳細
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,完全に削除しますか？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,完全に削除しますか？
 DocType: Expense Claim,Total Claimed Amount,請求額合計
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潜在的販売機会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無効な {0}
@@ -4029,13 +4040,14 @@
 DocType: Warehouse,PIN,ピン
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,セットアップERPNextであなたの学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基本変化量（会社通貨）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,次の倉庫には会計エントリーがありません
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,最新の注文額
+DocType: Task,Is Milestone,マイルストーンです
 DocType: Daily Work Summary,Email Sent To,に送信されたメール
 DocType: Budget,Warn,警告する
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",記録内で注目に値する特記事項
@@ -4056,7 +4068,7 @@
 DocType: Item Attribute Value,Attribute Value,属性値
 ,Itemwise Recommended Reorder Level,アイテムごとに推奨される再注文レベル
 DocType: Salary Detail,Salary Detail,給与詳細
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,{0}を選択してください
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,{0}を選択してください
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,アイテム {1}のバッチ {0} は期限切れです
 DocType: Sales Invoice,Commission,歩合
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,製造のためのタイムシート。
@@ -4068,41 +4080,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,「〜より古い在庫を凍結する」は %d 日よりも小さくしなくてはなりません
 DocType: Tax Rule,Purchase Tax Template,購入税テンプレート
 ,Project wise Stock Tracking,プロジェクトごとの在庫追跡
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},メンテナンス予定{0}が {0}に対して存在しています
 DocType: Stock Entry Detail,Actual Qty (at source/target),実際の数量（ソース/ターゲットで）
 DocType: Item Customer Detail,Ref Code,参照コード
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,従業員レコード
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,次の減価償却日を設定してください
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,次の減価償却日を設定してください
 DocType: HR Settings,Payroll Settings,給与計算の設定
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,リンクされていない請求書と支払を照合
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,注文する
 DocType: Email Digest,New Purchase Orders,新しい発注
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ルートには親コストセンターを指定できません
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ブランドを選択してください...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ブランドを選択してください...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,上と減価償却累計額
 DocType: Sales Invoice,C-Form Applicable,C-フォーム適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},作業 {0} の作業時間は0以上でなければなりません
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,倉庫が必須です
 DocType: Supplier,Address and Contacts,住所・連絡先
 DocType: UOM Conversion Detail,UOM Conversion Detail,単位変換の詳細
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),900px(横)100px(縦)が最適です
 DocType: Program,Program Abbreviation,プログラムの略
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,製造指示はアイテムテンプレートに対して出すことができません
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,料金は、各アイテムに対して、領収書上で更新されます
 DocType: Warranty Claim,Resolved By,課題解決者
 DocType: Bank Guarantee,Start Date,開始日
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,期間に休暇を割り当てる。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,小切手及び預金が不正にクリア
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,アカウント{0}：自身を親アカウントに割当することはできません
 DocType: Purchase Invoice Item,Price List Rate,価格表単価
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,顧客の引用符を作成します。
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,顧客の引用符を作成します。
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",この倉庫での利用可能な在庫に基づいて「在庫あり」または「在庫切れ」を表示します
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),部品表（BOM）
 DocType: Item,Average time taken by the supplier to deliver,サプライヤー配送平均時間
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,評価結果
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,時間
 DocType: Project,Expected Start Date,開始予定日
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,料金がそのアイテムに適用できない場合は、アイテムを削除する
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,取引通貨は、ペイメントゲートウェイ通貨と同じでなければなりません
 DocType: Payment Entry,Receive,受信
@@ -4113,19 +4124,19 @@
 DocType: Workstation,Operating Costs,営業費用
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,アクション毎月の予算が超過累積場合
 DocType: Purchase Invoice,Submit on creation,作成時に提出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},{0} {1}でなければならないための通貨
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},{0} {1}でなければならないための通貨
 DocType: Asset,Disposal Date,処分日
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",彼らは休日を持っていない場合は電子メールは、与えられた時間で、会社のすべてのActive従業員に送信されます。回答の概要は、深夜に送信されます。
 DocType: Employee Leave Approver,Employee Leave Approver,従業員休暇承認者
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：この倉庫{1}には既に再注文エントリが存在しています
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",見積が作成されているため、失注を宣言できません
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,トレーニングフィードバック
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,製造指示{0}を提出しなければなりません
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},アイテム{0}の開始日と終了日を選択してください
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},コースは、行{0}に必須です
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,終了日を開始日の前にすることはできません
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc文書型
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,価格の追加/編集
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,価格の追加/編集
 DocType: Batch,Parent Batch,親バッチ
 DocType: Cheque Print Template,Cheque Print Template,小切手印刷テンプレート
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,コストセンターの表
@@ -4138,7 +4149,7 @@
 ,Ordered Items To Be Delivered,納品予定の注文済アイテム
 DocType: Account,Income,収入
 DocType: Industry Type,Industry Type,業種タイプ
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,問題発生！
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,問題発生！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：休暇申請に次の期間が含まれています。
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,請求書{0}は提出済です
 DocType: Assessment Result Detail,Score,スコア
@@ -4169,17 +4180,17 @@
 DocType: Item,Variant Based On,バリアントベースで
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},割り当てられた重みづけの合計は100％でなければなりません。{0}になっています。
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,サプライヤー
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,受注が作成されているため、失注にできません
 DocType: Request for Quotation Item,Supplier Part No,サプライヤー型番
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,受領元
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',カテゴリが「評価」または「Vaulationと合計」のためのものであるときに控除することはできません。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,受領元
 DocType: Lead,Converted,変換済
 DocType: Item,Has Serial No,シリアル番号あり
 DocType: Employee,Date of Issue,発行日
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}： {1}のための{0}から
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}： {1}のための{0}から
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：アイテム {1} にサプライヤーを設定してください
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：時間値がゼロより大きくなければなりません。
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,アイテム{1}に添付されたウェブサイト画像{0}が見つかりません
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,ウェブサイト上の複数のグループでこのアイテムを一覧表示します。
@@ -4188,20 +4199,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,凍結された値を設定する権限がありません
 DocType: Payment Reconciliation,Get Unreconciled Entries,未照合のエントリーを取得
 DocType: Payment Reconciliation,From Invoice Date,請求書の日付から
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,課金通貨はいずれかのデフォルトcomapanyの通貨やパーティーの口座通貨に等しくなければなりません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,現金化を残します
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,これは何？
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,倉庫
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,すべての学生の入学
 ,Average Commission Rate,平均手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,在庫アイテム以外は「シリアル番号あり」を「はい」にすることができません。
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,出勤は将来の日付にマークを付けることができません
 DocType: Pricing Rule,Pricing Rule Help,価格設定ルールヘルプ
 DocType: School House,House Name,家名
 DocType: Purchase Taxes and Charges,Account Head,勘定科目
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,アイテムの陸揚費用を計算するために、追加の費用を更新してください
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,電気
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ユーザーとして、組織の残りの部分を追加します。また、連絡先からそれらを追加して、ポータルにお客様を招待追加することができます
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ユーザーとして、組織の残りの部分を追加します。また、連絡先からそれらを追加して、ポータルにお客様を招待追加することができます
 DocType: Stock Entry,Total Value Difference (Out - In),価値差違合計（出 - 入）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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が未設定です。
@@ -4210,7 +4221,7 @@
 DocType: Item,Customer Code,顧客コード
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}のための誕生日リマインダー
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,最新注文からの日数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借方アカウントは貸借対照表アカウントである必要があります
 DocType: Buying Settings,Naming Series,シリーズ名を付ける
 DocType: Leave Block List,Leave Block List Name,休暇リスト名
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保険開始日は、保険終了日未満でなければなりません
@@ -4225,9 +4236,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},従業員の給与スリップ{0}はすでにタイムシート用に作成した{1}
 DocType: Vehicle Log,Odometer,オドメーター
 DocType: Sales Order Item,Ordered Qty,注文数
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,アイテム{0}は無効です
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,アイテム{0}は無効です
 DocType: Stock Settings,Stock Frozen Upto,在庫凍結
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOMは、どの在庫品目が含まれていません
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},繰り返し {0} には期間開始日と終了日が必要です
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,プロジェクト活動／タスク
 DocType: Vehicle Log,Refuelling Details,給油の詳細
@@ -4237,8 +4248,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最後の購入率が見つかりません
 DocType: Purchase Invoice,Write Off Amount (Company Currency),償却額（会社通貨）
 DocType: Sales Invoice Timesheet,Billing Hours,課金時間
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0}が見つかりませんのデフォルトのBOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：再注文数量を設定してください
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ここに追加する項目をタップします
 DocType: Fees,Program Enrollment,プログラム登録
 DocType: Landed Cost Voucher,Landed Cost Voucher,陸揚費用伝票
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0}を設定してください
@@ -4260,7 +4272,7 @@
 DocType: Maintenance Visit,Maintenance Date,メンテナンス日
 DocType: Purchase Invoice Item,Rejected Serial No,拒否されたシリアル番号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,年の開始日や終了日が{0}と重なっています。回避のため会社を設定してください
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},アイテム{0}の開始日は終了日より前でなければなりません
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 #####
 取引にシリーズが設定されかつシリアル番号が記載されていない場合、自動シリアル番号は、このシリーズに基づいて作成されます。
@@ -4337,7 +4349,6 @@
 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,複数のグループのアイテムのクロスリスト
-DocType: Grade Interval,Grade Interval,グレードインターバル
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},会計年度開始・終了日は、すでに会計年度{0}に設定されています
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,クリアランス日更新
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,バッチ分割
@@ -4382,14 +4393,14 @@
 DocType: Bin,Reserved Qty for Production,生産のための予約済み数量
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,コースベースのグループを作る際にバッチを考慮したくない場合は、チェックを外したままにしておきます。
 DocType: Asset,Frequency of Depreciation (Months),減価償却費の周波数（ヶ月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,貸方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,貸方アカウント
 DocType: Landed Cost Item,Landed Cost Item,輸入費用項目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ゼロ値を表示
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,与えられた原材料の数量から製造／再梱包した後に得られたアイテムの数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,セットアップ自分の組織のためのシンプルなウェブサイト
 DocType: Payment Reconciliation,Receivable / Payable Account,売掛金／買掛金
 DocType: Delivery Note Item,Against Sales Order Item,対受注アイテム
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},属性 {0} の属性値を指定してください
 DocType: Item,Default Warehouse,デフォルト倉庫
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},グループアカウント{0}に対して予算を割り当てることができません
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,親コストセンターを入力してください
@@ -4432,7 +4443,7 @@
 DocType: Opportunity Item,Basic Rate,基本料金
 DocType: GL Entry,Credit Amount,貸方金額
 DocType: Cheque Print Template,Signatory Position,署名者の位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,失注として設定
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,失注として設定
 DocType: Timesheet,Total Billable Hours,合計請求可能な時間
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,支払領収書の注意
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,これは、この顧客に対するトランザクションに基づいています。詳細については、以下のタイムラインを参照してください。
@@ -4446,11 +4457,11 @@
 ,Items To Be Requested,要求されるアイテム
 DocType: Purchase Order,Get Last Purchase Rate,最新の購入料金を取得
 DocType: Company,Company Info,会社情報
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,選択するか、新規顧客を追加
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,選択するか、新規顧客を追加
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,原価センタは、経費請求を予約するために必要とされます
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),資金運用（資産）
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,これは、この従業員の出席に基づいています
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,借方アカウント
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,借方アカウント
 DocType: Fiscal Year,Year Start Date,年始日
 DocType: Attendance,Employee Name,従業員名
 DocType: Sales Invoice,Rounded Total (Company Currency),合計（四捨五入）（会社通貨）
@@ -4459,13 +4470,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,以下の日にはユーザーからの休暇申請を受け付けない
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購入金額
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,サプライヤー見積 {0} 作成済
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,終了年は開始年前にすることはできません
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,終了年は開始年前にすることはできません
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,従業員給付
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},従業員のデフォルト休日リストを設定してください{0}または当社{1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}は存在しません
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}：{1}は存在しません
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,顧客あて請求
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,プロジェクトID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行番号 {0}：経費請求{1}に対して保留額より大きい額は指定できません。保留額は {2} です
@@ -4474,15 +4485,17 @@
 DocType: Quality Inspection Reading,Reading 3,報告要素3
 ,Hub,ハブ
 DocType: GL Entry,Voucher Type,伝票タイプ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,価格表が見つからないか無効になっています
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,価格表が見つからないか無効になっています
 DocType: Employee Loan Application,Approved,承認済
 DocType: Pricing Rule,Price,価格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}から取り除かれた従業員は「退職」に設定されなければなりません
 DocType: Guardian,Guardian,保護者
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,指定期間内の従業員 {1} の査定 {0} が作成されました
 DocType: Employee,Education,教育
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,デル
 DocType: Selling Settings,Campaign Naming By,キャンペーンの命名により、
 DocType: Employee,Current Address Is,現住所は：
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,変更された
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",オプション。指定されていない場合は、会社のデフォルト通貨を設定します。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,会計仕訳
 DocType: Delivery Note Item,Available Qty at From Warehouse,倉庫内利用可能数量
@@ -4491,7 +4504,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：当事者／アカウントが {3} {4} の {1} / {2}と一致しません
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,経費勘定を入力してください
 DocType: Account,Stock,在庫
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは、購買発注、購買請求書または仕訳のいずれかでなければなりません
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：リファレンスドキュメントタイプは、購買発注、購買請求書または仕訳のいずれかでなければなりません
 DocType: Employee,Current Address,現住所
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",アイテムが別のアイテムのバリエーションである場合には、明示的に指定しない限り、その後の説明、画像、価格、税金などはテンプレートから設定されます
 DocType: Serial No,Purchase / Manufacture Details,仕入／製造の詳細
@@ -4519,7 +4532,7 @@
 DocType: Hub Settings,Hub Settings,ハブの設定
 DocType: Project,Gross Margin %,粗利益率％
 DocType: BOM,With Operations,操作で
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会計エントリがすでに会社{1}の通貨{0}に存在します。債権または債務アカウントを通貨{0}で選択してください。
 DocType: Asset,Is Existing Asset,既存の資産は、
 DocType: Salary Detail,Statistical Component,統計コンポーネント
 ,Monthly Salary Register,月給登録
@@ -4542,7 +4555,7 @@
 DocType: Assessment Plan,Room,ルーム
 DocType: Purchase Order,Advance Paid,立替金
 DocType: Item,Item Tax,アイテムごとの税
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,サプライヤー用資材
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,サプライヤー用資材
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,消費税の請求書
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}％が複数回表示されます
 DocType: Expense Claim,Employees Email Id,従業員メールアドレス
@@ -4573,9 +4586,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ロゴを添付
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,在庫レベル
 DocType: Customer,Commission Rate,手数料率
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,バリエーション作成
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,バリエーション作成
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,部門別休暇申請
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",お支払い方法の種類は、受信のいずれかで支払うと内部転送する必要があります
 apps/erpnext/erpnext/config/selling.py +179,Analytics,分析
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,カートは空です
 DocType: Vehicle,Model,モデル
@@ -4586,6 +4599,7 @@
 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 +161,Capital Stock,株式資本
+DocType: Shopping Cart Settings,Show Public Attachments,パブリックアタッチメントを表示する
 DocType: Packing Slip,Package Weight Details,パッケージ重量詳細
 DocType: Payment Gateway Account,Payment Gateway Account,ペイメントゲートウェイアカウント
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支払完了後、選択したページにリダイレクトします
@@ -4604,15 +4618,15 @@
 DocType: Batch,Expiry Date,有効期限
 ,Supplier Addresses and Contacts,サプライヤー住所・連絡先
 ,accounts-browser,アカウントブラウザ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,カテゴリを選択してください
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,カテゴリを選択してください
 apps/erpnext/erpnext/config/projects.py +13,Project master.,プロジェクトマスター
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",証券取引設定]または[アイテムの「手当」を更新し、課金オーバーまたは過剰発注できるようにするには。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,次の通貨に$などのような任意のシンボルを表示しません。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半日）
 DocType: Supplier,Credit Days,信用日数
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,学生のバッチを作ります
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,学生のバッチを作ります
 DocType: Leave Type,Is Carry Forward,繰越済
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,部品表からアイテムを取得
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,部品表からアイテムを取得
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,リードタイム日数
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},資産の転記日付購入日と同じでなければなりません{1} {2}：行＃{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,上記の表に受注を入力してください
@@ -4629,7 +4643,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,承認予算額
 DocType: GL Entry,Is Opening,オープン
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方エントリは{1}とリンクすることができません
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,セットアップ&gt;ナンバリングシリーズで出席者用のナンバリングシリーズをセットアップしてください
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 8059438..ac4b97e 100644
--- a/erpnext/translations/km.csv
+++ b/erpnext/translations/km.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ជួល
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,អាចប្រើប្រាស់បានសំរាប់អ្នកប្រើប្រាស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",បញ្ឈប់ការបញ្ជាទិញផលិតផលដែលមិនអាចត្រូវបានលុបចោលឮវាជាលើកដំបូងដើម្បីបោះបង់
 DocType: Vehicle Service,Mileage,mileage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,តើអ្នកពិតជាចង់លុបចោលទ្រព្យសម្បត្តិនេះ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ជ្រើសផ្គត់ផ្គង់លំនាំដើម
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ជ្រើសផ្គត់ផ្គង់លំនាំដើម
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},រូបិយប័ណ្ណត្រូវបានទាមទារសម្រាប់តារាងតម្លៃ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* នឹងត្រូវបានគណនាក្នុងប្រតិបត្តិការនេះ។
 DocType: Purchase Order,Customer Contact,ទំនាក់ទំនងអតិថិជន
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ឆ្នើមសម្រាប់ {0} មិនអាចតិចជាងសូន្យ ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 នាទីលំនាំដើម
 DocType: Leave Type,Leave Type Name,ទុកឱ្យប្រភេទឈ្មោះ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,បង្ហាញតែការបើកចំហ
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,បង្ហាញតែការបើកចំហ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,កម្រងឯកសារបន្ទាន់សម័យដោយជោគជ័យ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ពិនិត្យមុនពេលចេញ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,ភាពត្រឹមត្រូវ Journal Entry ផ្តល់ជូន
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ធាតុបាច់ស្ថានភាពផុតកំណត់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,សេចក្តីព្រាងធនាគារ
 DocType: Mode of Payment Account,Mode of Payment Account,របៀបនៃការទូទាត់គណនី
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,បង្ហាញវ៉ារ្យ៉ង់
 DocType: Academic Term,Academic Term,រយៈពេលនៃការសិក្សា
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,សម្ភារៈ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,បរិមាណដែលត្រូវទទួលទាន
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,បរិមាណដែលត្រូវទទួលទាន
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,តារាងគណនីមិនអាចទទេ។
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ការផ្តល់ប្រាក់កម្ចី (បំណុល)
 DocType: Employee Education,Year of Passing,ឆ្នាំ Pass
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","ឯកសារយោង:% s បាន, លេខកូដធាតុ:% s និងអតិថិជន:% s បាន"
 DocType: Item,Country of Origin,ប្រទេសនៃប្រភពដើម
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,នៅក្នុងផ្សារ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ការបើកចំហរបញ្ហា
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ការថែទាំសុខភាព
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ពន្យាពេលក្នុងការទូទាត់ (ថ្ងៃ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ការចំណាយសេវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,វិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},លេខស៊េរី: {0} ត្រូវបានយោងរួចហើយនៅក្នុងវិក័យប័ត្រលក់: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,វិក័យប័ត្រ
 DocType: Maintenance Schedule Item,Periodicity,រយៈពេល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ឆ្នាំសារពើពន្ធ {0} ត្រូវបានទាមទារ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,គេរំពឹងថាការដឹកជញ្ជូនកាលបរិច្ឆេទគឺជាការមុនពេលការលក់កាលបរិច្ឆេទលំដាប់
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",ភ្ជាប់ឯកសារ .csv ដែលមានជួរឈរពីរសម្រាប់ឈ្មោះចាស់និងមួយសម្រាប់ឈ្មោះថ្មី
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} មិននៅក្នុងឆ្នាំសារពើពន្ធសកម្មណាមួយឡើយ។
 DocType: Packed Item,Parent Detail docname,ពត៌មានលំអិតរបស់ឪពុកម្តាយ docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ឯកសារយោង: {0}, លេខកូដធាតុ: {1} និងអតិថិជន: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,គីឡូក្រាម
 DocType: Student Log,Log,កំណត់ហេតុ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,បើកសម្រាប់ការងារ។
 DocType: Item Attribute,Increment,ចំនួនបន្ថែម
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ជ្រើសឃ្លាំង ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ជ្រើសឃ្លាំង ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ការផ្សព្វផ្សាយពាណិជ្ជកម្ម
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ក្រុមហ៊ុនដូចគ្នាត្រូវបានបញ្ចូលច្រើនជាងម្ដង
 DocType: Employee,Married,រៀបការជាមួយ
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ទទួលបានធាតុពី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},មិនត្រូវបានអនុញ្ញាតសម្រាប់ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,ទទួលបានធាតុពី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ភាគហ៊ុនដែលមិនអាចធ្វើបច្ចុប្បន្នភាពការប្រឆាំងនឹងការដឹកជញ្ជូនចំណាំ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ផលិតផល {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,គ្មានធាតុដែលបានរាយ
 DocType: Payment Reconciliation,Reconcile,សម្របសម្រួល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,គ្រឿងទេស
 DocType: Quality Inspection Reading,Reading 1,ការអានទី 1
 DocType: Process Payroll,Make Bank Entry,ធ្វើឱ្យធាតុរបស់ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,មូលនិធិសោធននិវត្តន៍
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,រំលស់បន្ទាប់កាលបរិច្ឆេទមិនអាចមុនពេលទិញកាលបរិច្ឆេទ
 DocType: SMS Center,All Sales Person,ការលក់របស់បុគ្គលទាំងអស់
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ** ចែកចាយប្រចាំខែអាចជួយឱ្យអ្នកចែកថវិកា / គោលដៅនៅទូទាំងខែប្រសិនបើអ្នកមានរដូវកាលនៅក្នុងអាជីវកម្មរបស់អ្នក។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,មិនមានធាតុដែលបានរកឃើញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,មិនមានធាតុដែលបានរកឃើញ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,បាត់ប្រាក់ខែរចនាសម្ព័ន្ធ
 DocType: Lead,Person Name,ឈ្មោះបុគ្គល
 DocType: Sales Invoice Item,Sales Invoice Item,ការលក់វិក័យប័ត្រធាតុ
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ឧទាហរណ៍ &quot;សាលាបឋមសិក្សា&quot; ឬ &quot;សាកលវិទ្យាល័យ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,របាយការណ៍ភាគហ៊ុន
 DocType: Warehouse,Warehouse Detail,ពត៌មានលំអិតឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ដែនកំណត់ឥណទានត្រូវបានឆ្លងកាត់សម្រាប់អតិថិជន {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,កាលបរិច្ឆេទបញ្ចប់រយៈពេលមិនអាចមាននៅពេលក្រោយជាងឆ្នាំបញ្ចប់កាលបរិច្ឆេទនៃឆ្នាំសិក្សាដែលរយៈពេលនេះត្រូវបានតភ្ជាប់ (អប់រំឆ្នាំ {}) ។ សូមកែកាលបរិច្ឆេទនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",«តើអចលន &quot;មិនអាចត្រូវបានធីកមានទ្រព្យសម្បត្តិដែលជាកំណត់ត្រាប្រឆាំងនឹងធាតុ
 DocType: Vehicle Service,Brake Oil,ប្រេងហ្វ្រាំង
 DocType: Tax Rule,Tax Type,ប្រភេទពន្ធលើ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យបន្ថែមឬធ្វើឱ្យទាន់សម័យធាតុមុន {0}
 DocType: BOM,Item Image (if not slideshow),រូបភាពធាតុ (ប្រសិនបើមិនមានការបញ្ចាំងស្លាយ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,អតិថិជនមួយដែលមានឈ្មោះដូចគ្នា
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ហួរអត្រា / 60) * ជាក់ស្តែងប្រតិបត្តិការម៉ោង
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ជ្រើស Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,ជ្រើស Bom
 DocType: SMS Log,SMS Log,ផ្ញើសារជាអក្សរចូល
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,តម្លៃនៃធាតុដែលបានផ្តល់
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ថ្ងៃឈប់សម្រាកនៅលើ {0} គឺមិនមានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
@@ -166,7 +168,7 @@
 DocType: Academic Term,Schools,សាលារៀន
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},គ្មានការកត់ត្រាការឈប់សម្រាកបានរកឃើញសម្រាប់បុគ្គលិក {0} {1} សម្រាប់
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,សូមបញ្ចូលក្រុមហ៊ុនដំបូង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,សូមជ្រើសរើសក្រុមហ៊ុនដំបូង
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ការចំណាយសរុប
@@ -181,7 +183,7 @@
 DocType: Expense Claim Detail,Claim Amount,ចំនួនពាក្យបណ្តឹង
 DocType: Employee,Mr,លោក
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,ក្រុមអតិថិជនស្ទួនរកឃើញនៅក្នុងតារាងក្រុម cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់ / ផ្គត់ផ្គង់
 DocType: Naming Series,Prefix,បុព្វបទ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,អ្នកប្រើប្រាស់
 DocType: Employee,B-,B-
@@ -190,11 +192,11 @@
 DocType: Training Result Employee,Grade,ថ្នាក់ទី
 DocType: Sales Invoice Item,Delivered By Supplier,បានបញ្ជូនដោយអ្នកផ្គត់ផ្គង់
 DocType: SMS Center,All Contact,ទំនាក់ទំនងទាំងអស់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,លំដាប់ផលិតកម្មបានបង្កើតរួចសម្រាប់ធាតុទាំងអស់ដែលមាន Bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ប្រាក់បៀវត្សប្រចាំឆ្នាំប្រាក់
 DocType: Daily Work Summary,Daily Work Summary,សង្ខេបការងារប្រចាំថ្ងៃ
 DocType: Period Closing Voucher,Closing Fiscal Year,បិទឆ្នាំសារពើពន្ធ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ជាកក
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ជាកក
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,សូមជ្រើសក្រុមហ៊ុនដែលមានស្រាប់សម្រាប់ការបង្កើតគណនីគំនូសតាង
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ការចំណាយភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ជ្រើសគោលដៅឃ្លាំង
@@ -202,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,ចូល contra
 DocType: Journal Entry Account,Credit in Company Currency,ឥណទានក្នុងក្រុមហ៊ុនរូបិយប័ណ្ណ
 DocType: Delivery Note,Installation Status,ស្ថានភាពនៃការដំឡើង
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",តើអ្នកចង់ធ្វើឱ្យទាន់សម័យចូលរួម? <br> បច្ចុប្បន្ន: {0} \ <br> អវត្តមាន: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ ទទួលយកបានច្រានចោល Qty ត្រូវតែស្មើនឹងទទួលបានបរិមាណសម្រាប់ធាតុ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ការផ្គត់ផ្គង់សម្ភារៈសម្រាប់ការទិញសាច់ឆៅ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,របៀបយ៉ាងហោចណាស់មួយនៃការទូទាត់ត្រូវបានទាមទារសម្រាប់វិក័យប័ត្រម៉ាស៊ីនឆូតកាត។
 DocType: Products Settings,Show Products as a List,បង្ហាញផលិតផលជាបញ្ជី
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",ទាញយកទំព័រគំរូបំពេញទិន្នន័យត្រឹមត្រូវហើយភ្ជាប់ឯកសារដែលបានកែប្រែ។ កាលបរិច្ឆេទនិងបុគ្គលិកទាំងអស់រួមបញ្ចូលគ្នានៅក្នុងរយៈពេលដែលបានជ្រើសនឹងមកនៅក្នុងពុម្ពដែលមានស្រាប់ជាមួយនឹងកំណត់ត្រាវត្តមាន
@@ -221,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ធ្វើឱ្យធាតុរំលស់
 DocType: Appraisal Template Goal,KRA,ក្រៈ
 DocType: Lead,Request Type,ប្រភេទនៃសំណើសុំ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ធ្វើឱ្យបុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ធ្វើឱ្យបុគ្គលិក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ការផ្សព្វផ្សាយ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ការប្រតិបត្តិ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ពត៌មានលំអិតនៃការប្រតិបត្ដិការនេះបានអនុវត្ត។
@@ -237,6 +239,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ផែនការសម្រាប់ការមើលថែទាំ។
 DocType: SMS Settings,Enter url parameter for message,បញ្ចូលប៉ារ៉ាម៉ែត្រ URL សម្រាប់សារ
 DocType: POS Profile,Customer Groups,ក្រុមផ្ទាល់ខ្លួន
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,របាយការណ៍ហិរញ្ញវត្ថុ
 DocType: Guardian,Students,និស្សិត
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ក្បួនសម្រាប់ការដាក់ពាក្យសុំការកំណត់តម្លៃនិងការបញ្ចុះតម្លៃ។
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,បញ្ជីតម្លៃត្រូវតែមានការអនុវត្តសម្រាប់ទិញឬលក់
@@ -262,11 +265,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ចំនួនទឹកប្រាក់ជាមុនមិនអាចច្រើនជាង {0} {1}
 DocType: Naming Series,Series List for this Transaction,បញ្ជីស៊េរីសម្រាប់ប្រតិបត្តិការនេះ
 DocType: Company,Default Payroll Payable Account,បើកប្រាក់បៀវត្សត្រូវបង់លំនាំដើមគណនី
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ធ្វើឱ្យទាន់សម័យគ្រុបអ៊ីម៉ែល
 DocType: Sales Invoice,Is Opening Entry,ត្រូវការបើកចូល
 DocType: Customer Group,Mention if non-standard receivable account applicable,និយាយបានបើគណនីដែលមិនមែនជាស្តង់ដាទទួលអនុវត្តបាន
 DocType: Course Schedule,Instructor Name,ឈ្មោះគ្រូបង្ហាត់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,សម្រាប់ឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,លក់បន្ត
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",ប្រសិនបើបានធីកវានឹងរួមបញ្ចូលទាំងរបស់របរដែលមិនមែនជាភាគហ៊ុននៅក្នុងសំណើសម្ភារៈ។
@@ -274,7 +277,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ការប្រឆាំងនឹងការធាតុលក់វិក័យប័ត្រ
 ,Production Orders in Progress,ការបញ្ជាទិញផលិតកម្មក្នុងវឌ្ឍនភាព
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,សាច់ប្រាក់សុទ្ធពីការផ្តល់ហិរញ្ញប្បទាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","ផ្ទុកទិន្នន័យមូលដ្ឋានជាការពេញលេញ, មិនបានរក្សាទុក"
 DocType: Lead,Address & Contact,អាសយដ្ឋានទំនាក់ទំនង
 DocType: Leave Allocation,Add unused leaves from previous allocations,បន្ថែមស្លឹកដែលមិនបានប្រើពីការបែងចែកពីមុន
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},កើតឡើងបន្ទាប់ {0} នឹងត្រូវបានបង្កើតនៅលើ {1}
@@ -300,8 +303,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),សរុបការចំណាយចំនួនទឹកប្រាក់ (តាមរយៈសន្លឹកម៉ោង)
 DocType: Item Website Specification,Item Website Specification,បញ្ជាក់ធាតុគេហទំព័រ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ទុកឱ្យទប់ស្កាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ធាតុធនាគារ
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ធាតុ {0} បានឈានដល់ទីបញ្ចប់នៃជីវិតរបស់ខ្លួននៅលើ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ធាតុធនាគារ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ប្រចាំឆ្នាំ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ធាតុភាគហ៊ុនការផ្សះផ្សា
 DocType: Stock Entry,Sales Invoice No,ការលក់វិក័យប័ត្រគ្មាន
@@ -319,8 +322,8 @@
 DocType: Item,Publish in Hub,បោះពុម្ពផ្សាយនៅក្នុងមជ្ឈមណ្ឌល
 DocType: Student Admission,Student Admission,ការចូលរបស់សិស្ស
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,សម្ភារៈស្នើសុំ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ធាតុ {0} ត្រូវបានលុបចោល
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,សម្ភារៈស្នើសុំ
 DocType: Bank Reconciliation,Update Clearance Date,ធ្វើឱ្យទាន់សម័យបោសសំអាតកាលបរិច្ឆេទ
 DocType: Item,Purchase Details,ពត៌មានលំអិតទិញ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ធាតុ {0} មិនត្រូវបានរកឃើញនៅក្នុង &#39;វត្ថុធាតុដើមការី &quot;តារាងក្នុងការទិញលំដាប់ {1}
@@ -356,10 +359,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,មូលប្បទានប័ត្រឆ្នើមនិងប្រាក់បញ្ញើដើម្បីជម្រះ
 DocType: Item,Synced With Hub,ធ្វើសមកាលកម្មជាមួយនឹងការហាប់
 DocType: Vehicle,Fleet Manager,កម្មវិធីគ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},ជួរដេក # {0}: {1} មិនអាចមានផលអវិជ្ជមានសម្រាប់ធាតុ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},ជួរដេក # {0}: {1} មិនអាចមានផលអវិជ្ជមានសម្រាប់ធាតុ {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,ពាក្យសម្ងាត់មិនត្រឹមត្រូវ
 DocType: Item,Variant Of,វ៉ារ្យ៉ង់របស់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Qty បានបញ្ចប់មិនអាចជាធំជាង Qty ដើម្បីផលិត &quot;
 DocType: Period Closing Voucher,Closing Account Head,បិទនាយកគណនី
 DocType: Employee,External Work History,ការងារខាងក្រៅប្រវត្តិ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,កំហុសក្នុងការយោងសារាចរ
@@ -372,12 +375,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ជូនដំណឹងដោយអ៊ីមែលនៅលើការបង្កើតសម្ភារៈស្នើសុំដោយស្វ័យប្រវត្តិ
 DocType: Journal Entry,Multi Currency,រូបិយប័ណ្ណពហុ
 DocType: Payment Reconciliation Invoice,Invoice Type,ប្រភេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ដឹកជញ្ជូនចំណាំ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ការរៀបចំពន្ធ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,តម្លៃនៃការលក់អចលនទ្រព្យ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ចូលការទូទាត់ត្រូវបានកែប្រែបន្ទាប់ពីអ្នកបានទាញវា។ សូមទាញវាម្តងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
-DocType: Grade Interval,Min Score,ពិន្ទុនាទី
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} បានចូលពីរដងនៅក្នុងការប្រមូលពន្ធលើធាតុ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,សង្ខេបសម្រាប់សប្តាហ៍នេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Student Applicant,Admitted,បានទទួលស្គាល់ថា
 DocType: Workstation,Rent Cost,ការចំណាយជួល
@@ -389,7 +391,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,តម្លៃលំដាប់
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ប្រតិបតិ្តការធនាគារ / សាច់ប្រាក់ប្រឆាំងនឹងគណបក្សឬសម្រាប់ការផ្ទេរផ្ទៃក្នុង
 DocType: Shipping Rule,Valid for Countries,សុពលភាពសម្រាប់បណ្តាប្រទេស
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ធាតុនេះគឺជាគំរូមួយនិងមិនអាចត្រូវបានប្រើនៅក្នុងការតិបត្តិការ។ គុណលក្ខណៈធាតុនឹងត្រូវបានចម្លងចូលទៅក្នុងវ៉ារ្យ៉ង់នោះទេលុះត្រាតែ &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ចំនួនសរុបត្រូវបានចាត់ទុកថាសណ្តាប់ធ្នាប់
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",រចនាបុគ្គលិក (ឧនាយកប្រតិបត្តិនាយកជាដើម) ។
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,សូមបញ្ចូល &#39;ធ្វើម្តងទៀតនៅថ្ងៃនៃខែ&#39; តម្លៃវាល
@@ -398,14 +400,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ជួរដេក # {0}: ការទិញវិក័យប័ត្រដែលមិនអាចត្រូវបានធ្វើឡើងប្រឆាំងនឹងទ្រព្យសម្បត្តិដែលមានស្រាប់ {1}
 DocType: Item Tax,Tax Rate,អត្រាអាករ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} បម្រុងទុកសម្រាប់បុគ្គលិក {1} សម្រាប់រយៈពេល {2} ទៅ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ជ្រើសធាតុ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,ជ្រើសធាតុ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ទិញ {0} វិក័យប័ត្រត្រូវបានដាក់ស្នើរួចទៅហើយ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ជួរដេក # {0}: បាច់មិនមានត្រូវតែមានដូចគ្នា {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,បម្លែងទៅនឹងការមិនគ្រុប
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,បាច់ (ច្រើន) នៃវត្ថុមួយ។
 DocType: C-Form Invoice Detail,Invoice Date,វិក័យប័ត្រកាលបរិច្ឆេទ
 DocType: GL Entry,Debit Amount,ចំនួនឥណពន្ធ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},មានតែអាចមានគណនីមួយក្រុមហ៊ុន 1 ក្នុង {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,សូមមើលឯកសារភ្ជាប់
 DocType: Purchase Order,% Received,% បានទទួល
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,បង្កើតក្រុមនិស្សិត
@@ -434,9 +436,9 @@
 DocType: Request for Quotation,Request for Quotation,សំណើរសម្រាប់សម្រង់
 DocType: Salary Slip Timesheet,Working Hours,ម៉ោងធ្វើការ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ផ្លាស់ប្តូរការចាប់ផ្តើមលេខលំដាប់ / នាពេលបច្ចុប្បន្ននៃស៊េរីដែលមានស្រាប់។
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,បង្កើតអតិថិជនថ្មី
-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.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,បង្កើតបញ្ជាទិញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,បង្កើតអតិថិជនថ្មី
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","បើសិនជាវិធានការបន្តតម្លៃជាច្រើនដែលមានជ័យជំនះ, អ្នកប្រើត្រូវបានសួរដើម្បីកំណត់អាទិភាពដោយដៃដើម្បីដោះស្រាយជម្លោះ។"
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,បង្កើតបញ្ជាទិញ
 ,Purchase Register,ទិញចុះឈ្មោះ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ការចោទប្រកាន់ដែលអាចអនុវត្តបាន
@@ -444,7 +446,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ត្រូវតែមានតួនាទី &quot;ចាកចេញអនុម័ត&quot;
 DocType: Purchase Receipt,Vehicle Date,កាលបរិច្ឆេទយានយន្ត
 DocType: Student Log,Medical,ពេទ្យ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ហេតុផលសម្រាប់ការសម្រក
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ការនាំមុខម្ចាស់មិនអាចជាដូចគ្នានាំមុខ
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចធំជាងចំនួនសរុបមិនបានកែតម្រូវ
 DocType: Announcement,Receiver,អ្នកទទួល
@@ -461,6 +463,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,បរិមាណនិងអត្រាការប្រាក់
 DocType: Delivery Note,% Installed,% ដែលបានដំឡើង
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ថ្នាក់រៀន / មន្ទីរពិសោធន៍លដែលជាកន្លែងដែលបង្រៀនអាចត្រូវបានកំណត់។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ហាងទំនិញ&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,សូមបញ្ចូលឈ្មោះរបស់ក្រុមហ៊ុនដំបូង
 DocType: Purchase Invoice,Supplier Name,ឈ្មោះក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,សូមអានសៀវភៅដៃ ERPNext
@@ -476,16 +479,17 @@
 DocType: Account,Old Parent,ឪពុកម្តាយចាស់
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,វាលដែលចាំបាច់ - ឆ្នាំសិក្សា
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ប្ដូរតាមបំណងអត្ថបទណែនាំដែលទៅជាផ្នែកមួយនៃអ៊ីម៉ែលមួយ។ ប្រតិបត្តិការគ្នាមានអត្ថបទណែនាំមួយដាច់ដោយឡែក។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},សូមកំណត់លំនាំដើមសម្រាប់គណនីបង់ក្រុមហ៊ុននេះបាន {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ការកំណត់សកលសម្រាប់ដំណើរការផលិតទាំងអស់។
 DocType: Accounts Settings,Accounts Frozen Upto,រីករាយជាមួយនឹងទឹកកកគណនី
 DocType: SMS Log,Sent On,ដែលបានផ្ញើនៅថ្ងៃ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,គុណលក្ខណៈ {0} បានជ្រើសរើសច្រើនដងក្នុងតារាងគុណលក្ខណៈ
 DocType: HR Settings,Employee record is created using selected field. ,កំណត់ត្រាបុគ្គលិកត្រូវបានបង្កើតដោយប្រើវាលដែលបានជ្រើស។
 DocType: Sales Order,Not Applicable,ដែលមិនអាចអនុវត្តបាន
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ចៅហ្វាយថ្ងៃឈប់សម្រាក។
 DocType: Request for Quotation Item,Required Date,កាលបរិច្ឆេទដែលបានទាមទារ
 DocType: Delivery Note,Billing Address,វិក័យប័ត្រអាសយដ្ឋាន
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,សូមបញ្ចូលលេខកូដធាតុ។
 DocType: BOM,Costing,ចំណាយថវិកាអស់
 DocType: Tax Rule,Billing County,ខោនធីវិក័យប័ត្រ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",ប្រសិនបើបានធីកចំនួនប្រាក់ពន្ធដែលនឹងត្រូវបានចាត់ទុកជាបានរួមបញ្ចូលរួចហើយនៅក្នុងអត្រាការបោះពុម្ព / បោះពុម្ពចំនួនទឹកប្រាក់
@@ -500,6 +504,7 @@
 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,មូលបត្រនិងប្រាក់បញ្ញើ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",មិនអាចផ្លាស់ប្តូវិធីសាស្រ្តក្នុងការវាយតម្លៃដូចដែលមានប្រតិបត្តិការប្រឆាំងនឹងធាតុមួយចំនួនដែលមិនមានការវាយតម្លៃវាជាវិធីសាស្រ្តរបស់ខ្លួន
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ចំនួនសរុបដែលបានបម្រុងទុកគឺស្លឹកដែលចាំបាច់
 DocType: Job Opening,Description of a Job Opening,ការពិពណ៌នាសង្ខេបនៃការបើកការងារ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,សកម្មភាពដែលមិនទាន់សម្រេចសម្រាប់ថ្ងៃនេះ
@@ -520,13 +525,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,មន្រ្តីរដ្ឋបាល
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,សូមជ្រើសវគ្គសិក្សា
 DocType: Timesheet Detail,Hrs,ម៉ោង
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,សូមជ្រើសរើសក្រុមហ៊ុន
 DocType: Stock Entry Detail,Difference Account,គណនីមានភាពខុសគ្នា
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,មិនអាចភារកិច្ចជិតស្និទ្ធដូចជាការពឹងផ្អែករបស់ខ្លួនមានភារកិច្ច {0} គឺមិនត្រូវបានបិទ។
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,សូមបញ្ចូលឃ្លាំងដែលសម្ភារៈស្នើសុំនឹងត្រូវបានលើកឡើង
 DocType: Production Order,Additional Operating Cost,ចំណាយប្រតិបត្តិការបន្ថែម
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,គ្រឿងសំអាង
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",រួមបញ្ចូលគ្នានោះមានលក្ខណៈសម្បត្តិដូចខាងក្រោមនេះត្រូវដូចគ្នាសម្រាប់ធាតុទាំងពីរ
 DocType: Shipping Rule,Net Weight,ទំងន់សុទ្ធ
 DocType: Employee,Emergency Phone,ទូរស័ព្ទសង្រ្គោះបន្ទាន់
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ទិញ
@@ -535,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,សូមកំណត់ថ្នាក់ទីសម្រាប់កម្រិតពន្លឺ 0%
 DocType: Sales Order,To Deliver,ដើម្បីរំដោះ
 DocType: Purchase Invoice Item,Item,ធាតុ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,សៀរៀលធាតុគ្មានមិនអាចត្រូវប្រភាគ
 DocType: Journal Entry,Difference (Dr - Cr),ភាពខុសគ្នា (លោកវេជ្ជបណ្ឌិត - Cr)
 DocType: Account,Profit and Loss,ប្រាក់ចំណេញនិងការបាត់បង់
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ការគ្រប់គ្រងអ្នកម៉ៅការបន្ត
@@ -550,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ចំនួនបន្ថែមមិនអាចត្រូវបាន 0
 DocType: Production Planning Tool,Material Requirement,សម្ភារៈតម្រូវ
 DocType: Company,Delete Company Transactions,លុបប្រតិបត្តិការក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,សេចក្តីយោងកាលបរិច្ឆេទទេនិងយោងចាំបាច់សម្រាប់ប្រតិបត្តិការគឺធនាគារ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,បន្ថែម / កែសម្រួលពន្ធនិងការចោទប្រកាន់
 DocType: Purchase Invoice,Supplier Invoice No,វិក័យប័ត្រគ្មានការផ្គត់ផ្គង់
 DocType: Territory,For reference,សម្រាប់ជាឯកសារយោង
@@ -561,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,ធាតុចំណាំការដំឡើង
 DocType: Production Plan Item,Pending Qty,ដំណើ Qty
 DocType: Budget,Ignore,មិនអើពើ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} គឺមិនសកម្ម
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ផ្ញើសារទៅកាន់លេខដូចខាងក្រោម: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,វិមាត្ររៀបចំការពិនិត្យសម្រាប់ការបោះពុម្ព
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ប្រាក់បៀវត្សរ៍ប័ណ្ណ
@@ -570,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,គណៈកម្មាការសរុប
 DocType: Pricing Rule,Sales Partner,ដៃគូការលក់
 DocType: Buying Settings,Purchase Receipt Required,បង្កាន់ដៃត្រូវការទិញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,អត្រាការវាយតម្លៃជាការចាំបាច់ប្រសិនបើមានការបើកផ្សារហ៊ុនដែលបានបញ្ចូល
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,បានរកឃើញនៅក្នុងតារាងវិក័យប័ត្រកំណត់ត្រាគ្មាន
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,សូមជ្រើសប្រភេទក្រុមហ៊ុននិងបក្សទីមួយ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ហិរញ្ញវត្ថុ / ស្មើឆ្នាំ។
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,តម្លៃបង្គរ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","សូមអភ័យទោស, សៀរៀល, Nos មិនអាចត្រូវបានបញ្ចូលគ្នា"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,ធ្វើឱ្យការលក់សណ្តាប់ធ្នាប់
 DocType: Project Task,Project Task,គម្រោងការងារ
 ,Lead Id,ការនាំមុខលេខសម្គាល់
 DocType: C-Form Invoice Detail,Grand Total,សម្ពោធសរុប
@@ -593,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,ឯកសារភ្ជាប់ប្រវត្តិរូប
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,អតិថិជនម្តងទៀត
 DocType: Leave Control Panel,Allocate,ការបម្រុងទុក
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ត្រឡប់មកវិញការលក់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,ត្រឡប់មកវិញការលក់
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ចំណាំ: ស្លឹកដែលបានបម្រុងទុកសរុប {0} មិនគួរត្រូវបានតិចជាងស្លឹកត្រូវបានអនុម័តរួចទៅហើយ {1} សម្រាប់រយៈពេលនេះ
 DocType: Announcement,Posted By,Posted by
 DocType: Item,Delivered by Supplier (Drop Ship),ថ្លែងដោយហាងទំនិញ (ទម្លាក់នាវា)
@@ -603,7 +608,7 @@
 DocType: Quotation,Quotation To,សម្រង់ដើម្បី
 DocType: Lead,Middle Income,ប្រាក់ចំណូលពាក់កណ្តាល
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ពិធីបើក (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសម្រាប់មិនអាចជាអវិជ្ជមាន
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,សូមកំណត់ក្រុមហ៊ុន
 DocType: Purchase Order Item,Billed Amt,វិក័យប័ត្រ AMT
@@ -614,7 +619,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ការលក់វិក័យប័ត្រ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},សេចក្តីយោង &amp; ទេយោងកាលបរិច្ឆេទត្រូវបានទាមទារសម្រាប់ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ជ្រើសគណនីទូទាត់ដើម្បីធ្វើឱ្យធាតុរបស់ធនាគារ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",បង្កើតកំណត់ត្រាបុគ្គលិកដើម្បីគ្រប់គ្រងស្លឹកពាក្យបណ្តឹងការចំណាយនិងបញ្ជីបើកប្រាក់ខែ
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,បន្ថែមទៅមូលដ្ឋានចំណេះដឹង
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ការសរសេរសំណើរ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ការដកហូតចូលការទូទាត់
@@ -644,19 +649,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; មិនមែននៅក្នុងឆ្នាំសារពើពន្ធ {2}
 DocType: Buying Settings,Settings for Buying Module,ម៉ូឌុលការកំណត់សម្រាប់ការទិញ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},ទ្រព្យសកម្ម {0} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,សូមបញ្ចូលបង្កាន់ដៃទិញលើកដំបូង
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","បន្ទាប់មក Pricing ក្បួនត្រូវបានត្រងចេញដោយផ្អែកលើអតិថិជន, ក្រុមអតិថិជនដែនដី, ហាងទំនិញ, ប្រភេទហាងទំនិញ, យុទ្ធនាការ, ការលក់ដៃគូល"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ការផ្លាស់ប្តូរសុទ្ធនៅសារពើភ័ណ្ឌ
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,បុគ្គលិកគ្រប់គ្រងឥណទាន
 DocType: Employee,Passport Number,លេខលិខិតឆ្លងដែន
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ទំនាក់ទំនងជាមួយ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,កម្មវិធីគ្រប់គ្រង
 DocType: Payment Entry,Payment From / To,ការទូទាត់ពី / ទៅ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ជួរកាលបរិច្ឆេទ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},កំណត់ឥណទានថ្មីនេះគឺមានចំនួនតិចជាងប្រាក់ដែលលេចធ្លោនាពេលបច្ចុប្បន្នសម្រាប់អតិថិជន។ ចំនួនកំណត់ឥណទានមានដើម្បីឱ្យមានយ៉ាងហោចណាស់ {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; មិនអាចជាដូចគ្នា
@@ -665,8 +669,8 @@
 DocType: Production Order Operation,In minutes,នៅក្នុងនាទី
 DocType: Issue,Resolution Date,ការដោះស្រាយកាលបរិច្ឆេទ
 DocType: Student Batch Name,Batch Name,ឈ្មោះបាច់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet បង្កើត:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet បង្កើត:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},សូមកំណត់លំនាំដើមឬគណនីសាច់ប្រាក់របស់ធនាគារក្នុងរបៀបនៃការទូទាត់ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ចុះឈ្មោះ
 DocType: Selling Settings,Customer Naming By,ឈ្មោះអតិថិជនដោយ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,នឹងបង្ហាញនិស្សិតដូចមានបង្ហាញក្នុងរបាយការណ៍ប្រចាំខែរបស់សិស្សចូលរួម
@@ -694,7 +698,7 @@
 DocType: Production Order Operation,Actual Start Time,ជាក់ស្តែងពេលវេលាចាប់ផ្ដើម
 DocType: BOM Operation,Operation Time,ប្រតិបត្ដិការពេលវេលា
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,បញ្ចប់
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,មូលដ្ឋាន
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,មូលដ្ឋាន
 DocType: Timesheet,Total Billed Hours,ម៉ោងធ្វើការបង់ប្រាក់សរុប
 DocType: Journal Entry,Write Off Amount,បិទការសរសេរចំនួនទឹកប្រាក់
 DocType: Journal Entry,Bill No,គ្មានវិក័យប័ត្រ
@@ -708,7 +712,7 @@
 DocType: Student Attendance,Student Attendance,ការចូលរួមរបស់សិស្ស
 DocType: Sales Invoice Timesheet,Time Sheet,តារាងពេលវេលា
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush វត្ថុធាតុដើមដែលមានមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,សូមបញ្ចូលសេចក្ដីលម្អិតធាតុ
 DocType: Interest,Interest,ការប្រាក់
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ការលក់ជាមុន
 DocType: Purchase Receipt,Other Details,ពត៌មានលំអិតផ្សេងទៀត
@@ -719,23 +723,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ចូលក្នុងការទូទាត់ត្រូវបានបង្កើតឡើងរួចទៅហើយ
 DocType: Purchase Receipt Item Supplied,Current Stock,ហ៊ុននាពេលបច្ចុប្បន្ន
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មិនបានភ្ជាប់ទៅនឹងធាតុ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,គ្រូពេទ្យប្រហែលជាប្រាក់ខែការមើលជាមុន
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,គណនី {0} ត្រូវបានបញ្ចូលច្រើនដង
 DocType: Account,Expenses Included In Valuation,ការចំណាយដែលបានរួមបញ្ចូលនៅក្នុងការវាយតម្លៃ
 DocType: Hub Settings,Seller City,ទីក្រុងអ្នកលក់
 ,Absent Student Report,របាយការណ៍សិស្សអវត្តមាន
 DocType: Email Digest,Next email will be sent on:,អ៊ីម៉ែលបន្ទាប់នឹងត្រូវបានផ្ញើនៅលើ:
 DocType: Offer Letter Term,Offer Letter Term,ផ្តល់ជូននូវលិខិតអាណត្តិ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ធាតុមានវ៉ារ្យ៉ង់។
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ធាតុ {0} មិនបានរកឃើញ
 DocType: Bin,Stock Value,ភាគហ៊ុនតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ក្រុមហ៊ុន {0} មិនមានទេ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ប្រភេទដើមឈើ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារសម្រាប់ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,សូមជ្រើសកម្មវិធី
 DocType: Project,Estimated Cost,តំលៃ
 DocType: Purchase Order,Link to material requests,តំណភ្ជាប់ទៅនឹងសំណើសម្ភារៈ
@@ -753,7 +756,7 @@
 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,គណនីលំនាំដើម
 DocType: Payment Entry,Received Amount (Company Currency),ទទួលបានចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,ការនាំមុខត្រូវតែត្រូវបានកំណត់ប្រសិនបើមានឱកាសត្រូវបានធ្វើពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,សូមជ្រើសយកថ្ងៃឈប់សម្រាកប្រចាំសប្តាហ៍
 DocType: Production Order Operation,Planned End Time,ពេលវេលាដែលបានគ្រោងបញ្ចប់
 ,Sales Person Target Variance Item Group-Wise,ការលក់បុគ្គលធាតុគោលដៅអថេរ Group និងក្រុមហ៊ុនដែលមានប្រាជ្ញា
@@ -769,6 +772,7 @@
 DocType: Opportunity,Opportunity From,ឱកាសការងារពី
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,សេចក្តីថ្លែងការប្រាក់បៀវត្សរ៍ប្រចាំខែ។
 DocType: BOM,Website Specifications,ជាក់លាក់វេបសាយ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ពី {0} នៃប្រភេទ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ជួរដេក {0}: ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
@@ -803,6 +807,7 @@
 DocType: Employee,Bank A/C No.,"Bank A / C, លេខ"
 DocType: Bank Guarantee,Project,គម្រោង
 DocType: Quality Inspection Reading,Reading 7,ការអាន 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,លំដាប់ដោយផ្នែក
 DocType: Expense Claim Detail,Expense Claim Type,ការចំណាយប្រភេទពាក្យបណ្តឹង
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ការកំណត់លំនាំដើមសម្រាប់កន្រ្តកទំនិញ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ទ្រព្យសកម្មបានបោះបង់ចោលការចូលតាមរយៈទិនានុប្បវត្តិ {0}
@@ -810,14 +815,14 @@
 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 +107,Office Maintenance Expenses,ការិយាល័យថែទាំចំណាយ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ការបង្កើតគណនីអ៊ីម៉ែល
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,សូមបញ្ចូលធាតុដំបូង
 DocType: Account,Liability,ការទទួលខុសត្រូវ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ចំនួនទឹកប្រាក់បានអនុញ្ញាតមិនអាចជាចំនួនទឹកប្រាក់ធំជាងក្នុងជួរដេកណ្តឹងទាមទារសំណង {0} ។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,បញ្ជីតម្លៃដែលមិនបានជ្រើស
 DocType: Employee,Family Background,ប្រវត្តិក្រុមគ្រួសារ
 DocType: Request for Quotation Supplier,Send Email,ផ្ញើអ៊ីមែល
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ព្រមាន &amp; ‧;: ឯកសារភ្ជាប់មិនត្រឹមត្រូវ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,គ្មានសិទ្ធិ
 DocType: Company,Default Bank Account,គណនីធនាគារលំនាំដើម
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ដើម្បីត្រងដោយផ្អែកទៅលើគណបក្សជ្រើសគណបក្សវាយជាលើកដំបូង
@@ -830,7 +835,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,រកមិនឃើញបុគ្គលិក
 DocType: Supplier Quotation,Stopped,បញ្ឈប់
 DocType: Item,If subcontracted to a vendor,ប្រសិនបើមានអ្នកលក់មួយម៉ៅការបន្ត
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,និស្សិតក្រុមត្រូវបានធ្វើបច្ចុប្បន្នភាពរួចទៅហើយ។
 DocType: SMS Center,All Customer Contact,ទាំងអស់ទំនាក់ទំនងអតិថិជន
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,ផ្ទុកឡើងសមតុល្យភាគហ៊ុនតាមរយៈ CSV ។
 DocType: Warehouse,Tree Details,ដើមឈើលំអិត
@@ -841,8 +846,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ចំនួនវិក័យប័ត្រអប្បបរមា
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: មជ្ឈមណ្ឌលតម្លៃ {2} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: គណនី {2} មិនអាចជាក្រុមមួយ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ធាតុជួរដេក {idx}: {} {DOCNAME DOCTYPE} មិនមាននៅក្នុងខាងលើ &#39;{DOCTYPE}&#39; តុ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ត្រូវបានបញ្ចប់រួចទៅហើយឬលុបចោល
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,គ្មានភារកិច្ច
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ថ្ងៃនៃខែដែលវិក័យប័ត្រដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតឧ 05, 28 ល"
 DocType: Asset,Opening Accumulated Depreciation,រំលស់បង្គរបើក
@@ -858,7 +863,7 @@
 DocType: Bin,Moving Average Rate,ការផ្លាស់ប្តូរអត្រាការប្រាក់ជាមធ្យម
 DocType: Production Planning Tool,Select Items,ជ្រើសធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},ប្រឆាំងនឹង {0} {1} របស់លោក Bill ចុះថ្ងៃទី {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,កាលវិភាគការពិតណាស់
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,កាលវិភាគការពិតណាស់
 DocType: Maintenance Visit,Completion Status,ស្ថានភាពបញ្ចប់
 DocType: HR Settings,Enter retirement age in years,បញ្ចូលអាយុចូលនិវត្តន៍នៅក្នុងប៉ុន្មានឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,គោលដៅឃ្លាំង
@@ -866,7 +871,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,អនុញ្ញាតឱ្យមានការចែកចាយឬទទួលបានជាងរីករាយជាមួយនឹងភាគរយ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,នាំចូលវត្តមាន
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ក្រុមធាតុទាំងអស់
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ក្រុមធាតុទាំងអស់
 DocType: Process Payroll,Activity Log,សកម្មភាពកំណត់ហេតុ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ប្រាក់ចំណេញសុទ្ធ / បាត់បង់
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,តែងសារស្វ័យប្រវត្តិនៅលើការដាក់ប្រតិបត្តិការ។
@@ -877,7 +882,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ដីកាបង្គាប់ឱ្យទូទាត់ការទិញ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ការព្យាករ Qty
 DocType: Sales Invoice,Payment Due Date,ការទូទាត់កាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ធាតុវ៉ារ្យង់ {0} រួចហើយដែលមានគុណលក្ខណៈដូចគ្នា
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;ការបើក&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ការបើកចំហរដើម្បីធ្វើ
 DocType: Notification Control,Delivery Note Message,សារដឹកជញ្ជូនចំណាំ
@@ -893,7 +898,7 @@
 DocType: Item Reorder,Re-Order Qty,ដីកាសម្រេច Qty ឡើងវិញ
 DocType: Leave Block List Date,Leave Block List Date,ទុកឱ្យបញ្ជីប្លុកកាលបរិច្ឆេទ
 DocType: Pricing Rule,Price or Discount,ថ្លៃឬការបញ្ចុះតម្លៃ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ការចោទប្រកាន់អនុវត្តសរុបនៅក្នុងការទិញតារាងការទទួលធាតុត្រូវដូចគ្នាដែលជាពន្ធសរុបនិងការចោទប្រកាន់
 DocType: Sales Team,Incentives,ការលើកទឹកចិត្ត
 DocType: SMS Log,Requested Numbers,លេខដែលបានស្នើ
 DocType: Production Planning Tool,Only Obtain Raw Materials,មានតែវត្ថុធាតុដើមទទួល
@@ -922,13 +927,13 @@
 DocType: Supplier Quotation,Is Subcontracted,ត្រូវបានម៉ៅការបន្ត
 DocType: Item Attribute,Item Attribute Values,តម្លៃគុណលក្ខណៈធាតុ
 DocType: Examination Result,Examination Result,លទ្ធផលការពិនិត្យសុខភាព
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,បង្កាន់ដៃទិញ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,បង្កាន់ដៃទិញ
 ,Received Items To Be Billed,ទទួលបានធាតុដែលនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,បានដាក់ស្នើគ្រូពេទ្យប្រហែលជាប្រាក់ខែ
 DocType: Employee,Ms,លោកស្រី
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,អត្រាប្តូរប្រាក់រូបិយប័ណ្ណមេ។
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},សេចក្តីយោង DOCTYPE ត្រូវតែជាផ្នែកមួយនៃ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},មិនអាចរកឃើញរន្ធពេលវេលាក្នុងការ {0} ថ្ងៃទៀតសម្រាប់ប្រតិបត្ដិការ {1}
 DocType: Production Order,Plan material for sub-assemblies,សម្ភារៈផែនការសម្រាប់ការអនុសភា
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ដៃគូការលក់និងទឹកដី
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,មិនអាចបង្កើតគណនីដោយស្វ័យប្រវត្តិដូចជាមានភាគហ៊ុននៅក្នុងគណនីតុល្យភាពរួចទៅហើយ។ អ្នកត្រូវតែបង្កើតគណនីផ្គូផ្គងមុនពេលអ្នកអាចធ្វើឱ្យធាតុនៅលើឃ្លាំងនេះ
@@ -951,10 +956,9 @@
 DocType: Supplier,Default Payable Accounts,គណនីទូទាត់លំនាំដើម
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,បុគ្គលិក {0} គឺមិនសកម្មឬមិនមានទេ
 DocType: Fee Structure,Components,សមាសភាគ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ធាតុវ៉ារ្យ៉ង់ {0} ធ្វើឱ្យទាន់សម័យ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},សូមបញ្ចូលប្រភេទទ្រព្យសម្បត្តិនៅក្នុងធាតុ {0}
 DocType: Quality Inspection Reading,Reading 6,ការអាន 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,មិនអាច {0} {1} {2} ដោយគ្មានវិក័យប័ត្រឆ្នើមអវិជ្ជមាន
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ទិញវិក័យប័ត្រជាមុន
 DocType: Hub Settings,Sync Now,ធ្វើសមកាលកម្មឥឡូវ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណទានមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
@@ -968,11 +972,11 @@
 DocType: Item,Is Purchase Item,តើមានធាតុទិញ
 DocType: Asset,Purchase Invoice,ការទិញវិក័យប័ត្រ
 DocType: Stock Ledger Entry,Voucher Detail No,ពត៌មានលំអិតកាតមានទឹកប្រាក់គ្មាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,វិក័យប័ត្រលក់ថ្មី
 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,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,បើកកាលបរិច្ឆេទនិងថ្ងៃផុតកំណត់គួរតែត្រូវបាននៅក្នុងឆ្នាំសារពើពន្ធដូចគ្នា
 DocType: Lead,Request for Information,សំណើសុំព័ត៌មាន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,ធ្វើសមកាលកម្មវិកិយប័ត្រក្រៅបណ្តាញ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,ថ្លៃសេវាកម្មវិធី
 DocType: Salary Slip,Total in words,សរុបនៅក្នុងពាក្យ
@@ -982,7 +986,7 @@
 DocType: Employee Loan,Sanctioned,អនុញ្ញាត
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;ផលិតផលកញ្ចប់, ឃ្លាំង, សៀរៀល, គ្មានទេនិងបាច់ &amp; ‧នឹងត្រូវបានចាត់ទុកថាពី&quot; ការវេចខ្ចប់បញ្ជី &quot;តារាង។ បើសិនជាគ្មានឃ្លាំងនិងជំនាន់ដូចគ្នាសម្រាប់ធាតុដែលមានទាំងអស់សម្រាប់វេចខ្ចប់ធាតុណាមួយ &quot;ផលិតផលជាកញ្ចប់&quot; តម្លៃទាំងនោះអាចត្រូវបានបញ្ចូលនៅក្នុងតារាងធាតុដ៏សំខាន់, តម្លៃនឹងត្រូវបានចម្លងទៅ &#39;វេចខ្ចប់បញ្ជី &quot;តារាង។"
 DocType: Job Opening,Publish on website,បោះពុម្ពផ្សាយនៅលើគេហទំព័រ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ការនាំចេញទៅកាន់អតិថិជន។
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,វិក័យប័ត្រក្រុមហ៊ុនផ្គត់ផ្គង់កាលបរិច្ឆេទមិនអាចច្រើនជាងកាលបរិច្ឆេទប្រកាស
@@ -993,7 +997,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,អថេរ
 ,Company Name,ឈ្មោះក្រុមហ៊ុន
 DocType: SMS Center,Total Message(s),សារសរុប (s បាន)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ជ្រើសធាតុសម្រាប់ការផ្ទេរ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ជ្រើសប្រធានគណនីរបស់ធនាគារនេះដែលជាកន្លែងដែលការត្រួតពិនិត្យត្រូវបានតម្កល់ទុក។
@@ -1004,8 +1008,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ជួរដេក {0}: ការទូទាត់ប្រឆាំងនឹងការលក់ / ការបញ្ជាទិញគួរតែងតែត្រូវបានសម្គាល់ជាមុន
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,គីមី
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,គណនីធនាគារ / សាច់ប្រាក់លំនាំដើមនឹងត្រូវបានធ្វើឱ្យទាន់សម័យដោយស្វ័យប្រវត្តិនៅពេលដែលប្រាក់ Journal Entry របៀបនេះត្រូវបានជ្រើស។
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ចន្លោះពេលសម្រាប់ថ្នាក់ទីក្រម {0} ស៊ីគ្នាជាមួយចន្លោះពេលរៀនថ្នាក់ទីសម្រាប់ថ្នាក់ផ្សេងទៀត។ សូមពិនិត្យមើលចន្លោះពេល {0} និង {1} និងព្យាយាមម្ដងទៀត
 DocType: BOM,Raw Material Cost(Company Currency),តម្លៃវត្ថុធាតុដើម (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ធាតុទាំងអស់ត្រូវបានបញ្ជូនរួចហើយសម្រាប់ការបញ្ជាទិញផលិតផលនេះ។
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ជួរដេក # {0}: អត្រាការប្រាក់មិនអាចច្រើនជាងអត្រាដែលបានប្រើនៅ {1} {2}
@@ -1017,13 +1019,13 @@
 DocType: BOM Website Item,BOM Website Item,ធាតុគេហទំព័រ Bom
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ផ្ទុកឡើងក្បាលលិខិតនិងស្លាកសញ្ញារបស់អ្នក។ (អ្នកអាចកែសម្រួលពួកវានៅពេលក្រោយ) ។
 DocType: Timesheet Detail,Bill,វិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,រំលស់ត្រូវបានបញ្ចូលកាលបរិច្ឆេទបន្ទាប់កាលបរិច្ឆេទកន្លងមកដែលជា
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,សេត
 DocType: SMS Center,All Lead (Open),អ្នកដឹកនាំការទាំងអស់ (ការបើកចំហ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ជួរដេក {0}: Qty មិនមានសម្រាប់ {4} នៅក្នុងឃ្លាំង {1} នៅក្នុងប្រកាសពេលនៃធាតុ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ទទួលបានការវិវត្តបង់ប្រាក់
 DocType: Item,Automatically Create New Batch,បង្កើតដោយស្វ័យប្រវត្តិថ្មីបាច់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,ធ្វើឱ្យ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,ធ្វើឱ្យ
 DocType: Student Admission,Admission Start Date,ការទទួលយកដោយការចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Journal Entry,Total Amount in Words,ចំនួនសរុបនៅក្នុងពាក្យ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,មានកំហុស។ ហេតុផលមួយដែលអាចនឹងត្រូវបានប្រហែលជាដែលអ្នកមិនបានរក្សាទុកសំណុំបែបបទ។ សូមទាក់ទង support@erpnext.com ប្រសិនបើបញ្ហានៅតែបន្តកើតមាន។
@@ -1031,7 +1033,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,សូមបញ្ចូលគណនីសម្រាប់ការផ្លាស់ប្តូរចំនួនទឹកប្រាក់
 DocType: Student Batch Name,Student Batch Name,ឈ្មោះបាច់សិស្ស
 DocType: Holiday List,Holiday List Name,បញ្ជីថ្ងៃឈប់សម្រាកឈ្មោះ
 DocType: Repayment Schedule,Balance Loan Amount,តុល្យភាពប្រាក់កម្ចីចំនួនទឹកប្រាក់
@@ -1051,10 +1053,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},សូមបញ្ជាក់ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ធាតុបានយកចេញដោយការផ្លាស់ប្តូរក្នុងបរិមាណឬតម្លៃទេ។
 DocType: Delivery Note,Delivery To,ដឹកជញ្ជូនដើម្បី
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,តារាងគុណលក្ខណៈគឺជាការចាំបាច់
 DocType: Production Planning Tool,Get Sales Orders,ទទួលបានការបញ្ជាទិញលក់
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} មិនអាចជាអវិជ្ជមាន
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,បញ្ចុះតំលៃ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,បញ្ចុះតំលៃ
 DocType: Asset,Total Number of Depreciations,ចំនួនសរុបនៃការធ្លាក់ថ្លៃ
 DocType: Sales Invoice Item,Rate With Margin,អត្រាជាមួយនឹងរឹម
 DocType: Workstation,Wages,ប្រាក់ឈ្នួល
@@ -1069,7 +1071,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ឃ្លាំងត្រូវបានបម្រុងទុកនៅក្នុងការលក់លំដាប់ / ឃ្លាំងទំនិញបានបញ្ចប់
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ចំនួនលក់
 DocType: Repayment Schedule,Interest Amount,ចំនួនការប្រាក់
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,អ្នកគឺជាអ្នកដែលមានការយល់ព្រមចំណាយសម្រាប់កំណត់ត្រានេះ។ សូមធ្វើឱ្យទាន់សម័យនេះ &#39;ស្ថានភាព&#39; និងរក្សាទុក
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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,បញ្ហា
 DocType: Asset,Scrapped,បោះបង់ចោល
@@ -1077,12 +1079,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",គុណលក្ខណៈសម្រាប់ធាតុវ៉ារ្យ៉ង់។ ឧទាហរណ៍ដូចជាទំហំពណ៌ល
 DocType: Purchase Invoice,Returns,ត្រឡប់
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,ឃ្លាំង WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},សៀរៀលគ្មាន {0} គឺស្ថិតនៅក្រោមកិច្ចសន្យាថែរក្សារីករាយជាមួយនឹង {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ការជ្រើសរើសបុគ្គលិក
 DocType: Lead,Organization Name,ឈ្មោះអង្គភាព
 DocType: Tax Rule,Shipping State,រដ្ឋការដឹកជញ្ជូន
 ,Projected Quantity as Source,បរិមាណដែលត្រូវទទួលទានបានព្យាករថាជាប្រភព
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ធាតុត្រូវបានបន្ថែមដោយប្រើ &quot;ចូរក្រោកធាតុពីការទិញបង្កាន់ដៃ &#39;ប៊ូតុង
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,រួមបញ្ចូលធាតុដែលមិនមែនភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ចំណាយការលក់
@@ -1090,12 +1092,12 @@
 DocType: GL Entry,Against,ប្រឆាំងនឹងការ
 DocType: Item,Default Selling Cost Center,ចំណាយលើការលក់លំនាំដើមរបស់មជ្ឈមណ្ឌល
 DocType: Sales Partner,Implementation Partner,ដៃគូអនុវត្ដន៍
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,លេខកូដតំបន់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,លេខកូដតំបន់
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},លំដាប់ការលក់ {0} គឺ {1}
 DocType: Opportunity,Contact Info,ពត៌មានទំនាក់ទំនង
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ការធ្វើឱ្យធាតុហ៊ុន
 DocType: Packing Slip,Net Weight UOM,សុទ្ធទម្ងន់ UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,លទ្ធផលនៃ {0}
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,លទ្ធផលនៃ {0}
 DocType: Item,Default Supplier,ហាងទំនិញលំនាំដើម
 DocType: Manufacturing Settings,Over Production Allowance Percentage,លើសពីភាគរយសំវិធានធនផលិតកម្ម
 DocType: Employee Loan,Repayment Schedule,កាលវិភាគសងប្រាក់
@@ -1103,7 +1105,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ដើម្បីទទួលបានកាលបរិច្ឆេទការបិទប្រចាំសប្តាហ៍
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,កាលបរិច្ឆេទបញ្ចប់មិនអាចតិចជាងការចាប់ផ្តើមកាលបរិច្ឆេទ
 DocType: Sales Person,Select company name first.,ជ្រើសឈ្មោះក្រុមហ៊ុនជាលើកដំបូង។
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,លោកបណ្ឌិត
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,លោកបណ្ឌិត
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,សម្រង់ពាក្យដែលទទួលបានពីការផ្គត់ផ្គង់។
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ដើម្បី {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,អាយុជាមធ្យម
@@ -1121,7 +1123,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,គន្លឹះការសម្តែងតំបន់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ការដឹកជញ្ជូន
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Attribute មិនត្រឹមត្រូវ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} ត្រូវតែត្រូវបានដាក់ជូន
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},បរិមាណដែលត្រូវទទួលទានត្រូវតែតិចជាងឬស្មើទៅនឹង {0}
 DocType: SMS Center,Total Characters,តួអក្សរសរុប
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},សូមជ្រើស Bom នៅក្នុងវាល Bom សម្រាប់ធាតុ {0}
@@ -1132,7 +1134,7 @@
 DocType: Sales Partner,Distributor,ចែកចាយ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ការដើរទិញឥវ៉ាន់វិធានការដឹកជញ្ជូនក្នុងកន្រ្តក
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ផលិតកម្មលំដាប់ {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',សូមកំណត់ &#39;អនុវត្តការបញ្ចុះតម្លៃបន្ថែមទៀតនៅលើ &quot;
 ,Ordered Items To Be Billed,ធាតុបញ្ជាឱ្យនឹងត្រូវបានផ្សព្វផ្សាយ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ពីជួរមានដើម្បីឱ្យមានតិចជាងដើម្បីជួរ
 DocType: Global Defaults,Global Defaults,លំនាំដើមជាសកល
@@ -1142,7 +1144,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ការចាប់ផ្តើមឆ្នាំ
 DocType: Purchase Invoice,Start date of current invoice's period,ការចាប់ផ្តើមកាលបរិច្ឆេទនៃការរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
 DocType: Salary Slip,Leave Without Pay,ទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,កំហុសក្នុងការធ្វើផែនការការកសាងសមត្ថភាព
 ,Trial Balance for Party,អង្គជំនុំតុល្យភាពសម្រាប់ការគណបក្ស
 DocType: Lead,Consultant,អ្នកប្រឹក្សាយោបល់
 DocType: Salary Slip,Earnings,ការរកប្រាក់ចំណូល
@@ -1157,7 +1159,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","នេះនឹងត្រូវបានបន្ថែមទៅក្នុងក្រមធាតុនៃវ៉ារ្យ៉ង់នោះ។ ឧទាហរណ៍ប្រសិនបើអក្សរកាត់របស់អ្នកគឺ &quot;ផលិតកម្ម SM&quot; និងលេខកូដធាតុគឺ &quot;អាវយឺត&quot;, លេខកូដធាតុនៃវ៉ារ្យ៉ង់នេះនឹងត្រូវបាន &quot;អាវយឺត-ផលិតកម្ម SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ប្រាក់ចំណេញសុទ្ធ (និយាយម្យ៉ាង) នឹងមើលឃើញនៅពេលដែលអ្នករក្សាទុកប័ណ្ណប្រាក់បៀវត្ស។
 DocType: Purchase Invoice,Is Return,តើការវិលត្រឡប់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ការវិលត្រឡប់ / ឥណពន្ធចំណាំ
 DocType: Price List Country,Price List Country,បញ្ជីតម្លៃប្រទេស
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} បាន NOS សម្គាល់ត្រឹមត្រូវសម្រាប់ធាតុ {1}
@@ -1167,11 +1169,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបានលេខបាច់
 DocType: Stock Settings,Default Item Group,លំនាំដើមធាតុគ្រុប
 DocType: Employee Loan,Partially Disbursed,ផ្តល់ឱ្រយអតិថិជនដោយផ្នែក
-DocType: Grading Structure,Grading System Name,ប្រព័ន្ធដាក់ពិន្ទុឈ្មោះ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,មូលដ្ឋានទិន្នន័យដែលបានផ្គត់ផ្គង់។
 DocType: Account,Balance Sheet,តារាងតុល្យការ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',មជ្ឈមណ្ឌលចំណាយសម្រាប់ធាតុដែលមានលេខកូដធាតុ &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",របៀបក្នុងការទូទាត់ត្រូវបានមិនបានកំណត់រចនាសម្ព័ន្ធ។ សូមពិនិត្យមើលថាតើគណនីត្រូវបានកំណត់នៅលើរបៀបនៃការទូទាត់ឬនៅលើប្រវត្តិរូបម៉ាស៊ីនឆូតកាត។
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,មនុស្សម្នាក់ដែលលក់របស់អ្នកនឹងទទួលបាននូវការរំលឹកមួយនៅលើកាលបរិច្ឆេទនេះដើម្បីទាក់ទងអតិថិជន
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ធាតុដូចគ្នាមិនអាចត្រូវបានបញ្ចូលច្រើនដង។
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",គណនីដែលមានបន្ថែមទៀតអាចត្រូវបានធ្វើក្រោមការក្រុមនោះទេតែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
@@ -1183,7 +1184,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ភាគហ៊ុនរបស់ក្រុម GL ធាតុសៀវភៅធាតុត្រូវបាននិងសម្រាប់បង្កាន់ដៃ reposted ទិញបានជ្រើសរើស
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ភាគហ៊ុនរបស់ក្រុម GL ធាតុសៀវភៅធាតុត្រូវបាននិងសម្រាប់បង្កាន់ដៃ reposted ទិញបានជ្រើសរើស
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ធាតុ 1
 DocType: Holiday,Holiday,ថ្ងៃឈប់សម្រាក
 DocType: Support Settings,Close Issue After Days,បញ្ហាបន្ទាប់ពីថ្ងៃបិទ
@@ -1208,11 +1209,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ការងារធ្វើ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,សូមបញ្ជាក់គុណលក្ខណៈយ៉ាងហោចណាស់មួយនៅក្នុងតារាងលក្ខណៈ
 DocType: Announcement,All Students,និស្សិតទាំងអស់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ធាតុ {0} ត្រូវតែជាធាតុដែលមិនមានភាគហ៊ុន
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,មើលសៀវភៅ
 DocType: Grading Scale,Intervals,ចន្លោះពេល
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ដំបូងបំផុត
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",ធាតុមួយពូលមានឈ្មោះដូចគ្នាសូមប្ដូរឈ្មោះធាតុឬប្ដូរឈ្មោះធាតុដែលជាក្រុម
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,លេខទូរស័ព្ទចល័តរបស់សិស្ស
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,នៅសល់នៃពិភពលោក
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ធាតុនេះ {0} មិនអាចមានបាច់
@@ -1251,9 +1252,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},ការទូទាត់សំណងនៃប្រាក់ខែពី {0} ទៅ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},មិនអនុញ្ញាតឱ្យកែគណនីកក {0}
 DocType: Journal Entry,Get Outstanding Invoices,ទទួលបានវិកិយប័ត្រឆ្នើម
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,លំដាប់ការលក់ {0} មិនត្រឹមត្រូវ
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ការបញ្ជាទិញជួយអ្នកមានគម្រោងនិងតាមដាននៅលើការទិញរបស់អ្នក
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","សូមអភ័យទោស, ក្រុមហ៊ុនមិនអាចត្រូវបានបញ្ចូលគ្នា"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",បរិមាណបញ្ហា / សេវាផ្ទេរប្រាក់សរុប {0} នៅក្នុងសំណើសម្ភារៈ {1} \ មិនអាចច្រើនជាងបរិមាណដែលបានស្នើរសុំ {2} សម្រាប់ធាតុ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ខ្នាតតូច
@@ -1274,10 +1275,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ការចំណាយដោយប្រយោល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ជួរដេក {0}: Qty គឺជាការចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,កសិកម្ម
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ផលិតផលឬសេវាកម្មរបស់អ្នក
 DocType: Mode of Payment,Mode of Payment,របៀបនៃការទូទាត់
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,វេបសាយរូបភាពគួរតែជាឯកសារសាធារណៈឬគេហទំព័ររបស់ URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Bom
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,នេះគឺជាក្រុមមួយដែលធាតុ root និងមិនអាចត្រូវបានកែសម្រួល។
@@ -1294,18 +1295,18 @@
 DocType: Student Group Student,Group Roll Number,លេខវិលគ្រុប
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} មានតែគណនីឥណទានអាចត្រូវបានតភ្ជាប់ប្រឆាំងនឹងធាតុឥណពន្ធផ្សេងទៀត
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,សរុបនៃភារកិច្ចទាំងអស់គួរតែមានទម្ងន់ 1. សូមលៃតម្រូវត្រូវមានភារកិច្ចគម្រោងទម្ងន់ទាំងអស់ទៅតាម
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ការដឹកជញ្ជូនចំណាំ {0} គឺមិនត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",វិធានកំណត់តម្លៃដំបូងត្រូវបានជ្រើសដោយផ្អែកលើ &#39;អនុវត្តនៅលើ&#39; វាលដែលអាចជាធាតុធាតុក្រុមឬម៉ាក។
 DocType: Hub Settings,Seller Website,វេបសាយអ្នកលក់
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ចំនួនភាគរយត្រៀមបម្រុងទុកសរុបសម្រាប់លក់ក្រុមគួរមាន 100 នាក់
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ស្ថានភាពលំដាប់ផលិតកម្មគឺ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ស្ថានភាពលំដាប់ផលិតកម្មគឺ {0}
 DocType: Appraisal Goal,Goal,គ្រាប់បាល់បញ្ចូលទី
 DocType: Sales Invoice Item,Edit Description,កែសម្រួលការបរិយាយ
 ,Team Updates,ក្រុមការងារការធ្វើឱ្យទាន់សម័យ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,សម្រាប់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,សម្រាប់ផ្គត់ផ្គង់
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ការកំណត់ប្រភេទគណនីជួយក្នុងការជ្រើសគណនីនេះក្នុងប្រតិបតិ្តការ។
 DocType: Purchase Invoice,Grand Total (Company Currency),សម្ពោធសរុប (ក្រុមហ៊ុនរូបិយវត្ថុ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,បង្កើតការបោះពុម្ពទ្រង់ទ្រាយ
@@ -1321,7 +1322,7 @@
 DocType: Depreciation Schedule,Journal Entry,ធាតុទិនានុប្បវត្តិ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ធាតុនៅក្នុងការរីកចំរើន
 DocType: Workstation,Workstation Name,ឈ្មោះស្ថានីយការងារ Stencils
-DocType: Grade Interval,Grade Code,កូដថ្នាក់ទី
+DocType: Grading Scale Interval,Grade Code,កូដថ្នាក់ទី
 DocType: POS Item Group,POS Item Group,គ្រុបធាតុម៉ាស៊ីនឆូតកាត
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,សង្ខេបអ៊ីម៉ែល:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Bom {0} មិនមែនជារបស់ធាតុ {1}
@@ -1337,7 +1338,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ផ្នែករឹង
 DocType: Sales Order,Recurring Upto,រីករាយជាមួយនឹងកើតឡើង
 DocType: Attendance,HR Manager,កម្មវិធីគ្រប់គ្រងធនធានមនុស្ស
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,សូមជ្រើសរើសក្រុមហ៊ុន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ឯកសិទ្ធិចាកចេញ
 DocType: Purchase Invoice,Supplier Invoice Date,កាលបរិច្ឆេទផ្គត់ផ្គង់វិក័យប័ត្រ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,អ្នកត្រូវអនុញ្ញាតកន្រ្តកទំនិញ
@@ -1353,7 +1354,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,អាហារ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ជួរ Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,គ្មានការមើល
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,លោក Mark ការចូលរួម
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,លោក Mark ការចូលរួម
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},កាលវិភាគថែរក្សា {0} ដែលមានការប្រឆាំងនឹង {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,សិស្សចុះឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},រូបិយប័ណ្ណនៃគណនីបិទត្រូវតែជា {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ផលបូកនៃចំនួនពិន្ទុសម្រាប់ការគ្រាប់បាល់បញ្ចូលទីទាំងអស់គួរតែ 100. វាជា {0}
@@ -1378,7 +1380,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ជាមធ្យមប្រចាំថ្ងៃចេញ
 DocType: POS Profile,Campaign,យុទ្ធនាការឃោសនា
 DocType: Supplier,Name and Type,ឈ្មោះនិងប្រភេទ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',ស្ថានភាពការអនុម័តត្រូវតែបាន &quot;ត្រូវបានអនុម័ត&quot; ឬ &quot;បានច្រានចោល&quot;
 DocType: Purchase Invoice,Contact Person,ទំនាក់ទំនង
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;ការរំពឹងទុកការចាប់ផ្តើមកាលបរិច្ឆេទ&quot; មិនអាចជាធំជាងការរំពឹងទុកកាលបរិច្ឆេទបញ្ចប់ &quot;
 DocType: Course Scheduling Tool,Course End Date,ការពិតណាស់កាលបរិច្ឆេទបញ្ចប់
@@ -1401,14 +1403,15 @@
 DocType: Sales Invoice,Shipping Address Name,ការដឹកជញ្ជូនឈ្មោះអាសយដ្ឋាន
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,គំនូសតាងគណនី
 DocType: Material Request,Terms and Conditions Content,លក្ខខណ្ឌមាតិកា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,មិនអាចជាធំជាង 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,មិនអាចជាធំជាង 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ធាតុ {0} គឺមិនមានធាតុភាគហ៊ុន
 DocType: Maintenance Visit,Unscheduled,គ្មានការគ្រោងទុក
 DocType: Employee,Owned,កម្មសិទ្ធផ្ទាល់ខ្លួន
 DocType: Salary Detail,Depends on Leave Without Pay,អាស្រ័យនៅលើស្លឹកដោយគ្មានប្រាក់ខែ
 DocType: Pricing Rule,"Higher the number, higher the priority","ខ្ពស់ជាងចំនួន, ខ្ពស់ជាងអាទិភាព"
 ,Purchase Invoice Trends,ទិញវិក័យប័ត្រនិន្នាការ
 DocType: Employee,Better Prospects,ទស្សនវិស័យល្អប្រសើរជាងមុន
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ជួរដេក # {0}: បាច់នេះ {1} មានតែ {2} qty ។ សូមជ្រើសក្រុមមួយផ្សេងទៀតដែលមាន {3} qty អាចប្រើបានឬបំបែកជួរដេកដែលបានចូលទៅក្នុងជួរដេកច្រើន, ដើម្បីរំដោះ / បញ្ហាពីជំនាន់ច្រើន"
 DocType: Vehicle,License Plate,ស្លាកលេខ
 DocType: Appraisal,Goals,គ្រាប់បាល់បញ្ចូលទី
 DocType: Warranty Claim,Warranty / AMC Status,ការធានា / ស្ថានភាព AMC
@@ -1426,7 +1429,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,បុគ្គលិកមិនអាចរាយការណ៍ទៅខ្លួនឯង។
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ប្រសិនបើគណនីគឺជាការកកធាតុត្រូវបានអនុញ្ញាតឱ្យអ្នកប្រើប្រាស់ដាក់កម្រិត។
 DocType: Email Digest,Bank Balance,ធនាគារតុល្យភាព
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},គណនេយ្យធាតុសម្រាប់ {0} {1} អាចត្រូវបានធ្វើតែនៅក្នុងរូបិយប័ណ្ណ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ទម្រង់យ៉ូបបានទាមទារលក្ខណៈសម្បត្តិល
 DocType: Journal Entry Account,Account Balance,សមតុល្យគណនី
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,វិធានពន្ធសម្រាប់កិច្ចការជំនួញ។
@@ -1437,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,"បង្ហាញសមតុល្យ, P &amp; L កាលពីឆ្នាំសារពើពន្ធរបស់មិនបិទ"
 DocType: Shipping Rule,Shipping Account,គណនីលើការដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: គណនី {2} អសកម្ម
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ធ្វើឱ្យការបញ្ជាទិញលក់ដើម្បីជួយអ្នកមានគម្រោងការងាររបស់អ្នកនិងផ្តល់នូវនៅលើពេលវេលា
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ធ្វើឱ្យការបញ្ជាទិញលក់ដើម្បីជួយអ្នកមានគម្រោងការងាររបស់អ្នកនិងផ្តល់នូវនៅលើពេលវេលា
 DocType: Quality Inspection,Readings,អាន
 DocType: Stock Entry,Total Additional Costs,ការចំណាយបន្ថែមទៀតសរុប
 DocType: Course Schedule,SH,SH
@@ -1448,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,ទៅតម្លៃ
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,គ្រូពេទ្យប្រហែលជាវេចខ្ចប់
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ការិយាល័យសំរាប់ជួល
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ការកំណត់ច្រកចេញចូលការរៀបចំសារជាអក្សរ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,នាំចូលបានបរាជ័យ!
@@ -1470,11 +1473,11 @@
 DocType: Company,Services,ការផ្តល់សេវា
 DocType: HR Settings,Email Salary Slip to Employee,អ៊ីម៉ែលទៅឱ្យបុគ្គលិកគ្រូពេទ្យប្រហែលជាប្រាក់ខែ
 DocType: Cost Center,Parent Cost Center,មជ្ឈមណ្ឌលតម្លៃដែលមាតាឬបិតា
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ជ្រើសផ្គត់ផ្គង់អាចធ្វើបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ជ្រើសផ្គត់ផ្គង់អាចធ្វើបាន
 DocType: Sales Invoice,Source,ប្រភព
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,បង្ហាញបានបិទ
 DocType: Leave Type,Is Leave Without Pay,ត្រូវទុកឱ្យដោយគ្មានការបង់
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ទ្រព្យសម្បត្តិប្រភេទជាការចាំបាច់សម្រាប់ធាតុទ្រព្យសកម្មថេរ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,រកឃើញនៅក្នុងតារាងគ្មានប្រាក់បង់ការកត់ត្រា
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},នេះ {0} ជម្លោះជាមួយ {1} សម្រាប់ {2} {3}
 DocType: Student Attendance Tool,Students HTML,សិស្សរបស់ HTML
@@ -1492,7 +1495,7 @@
 DocType: Student,Date of Leaving,កាលបរិច្ឆេទនៃការចាកចេញ
 DocType: Pricing Rule,For Price List,សម្រាប់តារាងតម្លៃ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ស្វែងរកប្រតិបត្តិ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,បង្កើតនាំទៅរក
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,បង្កើតនាំទៅរក
 DocType: Maintenance Schedule,Schedules,កាលវិភាគ
 DocType: Purchase Invoice Item,Net Amount,ចំនួនទឹកប្រាក់សុទ្ធ
 DocType: Purchase Order Item Supplied,BOM Detail No,ពត៌មានលំអិត Bom គ្មាន
@@ -1520,9 +1523,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ការចុះឈ្មោះចូលរៀនកម្មវិធី
 DocType: Sales Invoice Item,Brand Name,ឈ្មោះម៉ាក
 DocType: Purchase Receipt,Transporter Details,សេចក្ដីលម្អិតដឹកជញ្ជូន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,ឃ្លាំងលំនាំដើមគឺត្រូវបានទាមទារសម្រាប់ធាតុដែលបានជ្រើស
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ប្រអប់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ហាងទំនិញដែលអាចធ្វើបាន
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,អង្គការ
 DocType: Budget,Monthly Distribution,ចែកចាយប្រចាំខែ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,បញ្ជីអ្នកទទួលគឺទទេ។ សូមបង្កើតបញ្ជីអ្នកទទួល
@@ -1530,7 +1533,7 @@
 DocType: Sales Partner,Sales Partner Target,ដៃគូគោលដៅការលក់
 DocType: Loan Type,Maximum Loan Amount,ចំនួនទឹកប្រាក់កម្ចីអតិបរមា
 DocType: Pricing Rule,Pricing Rule,វិធានការកំណត់តម្លៃ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ចំនួនសិស្សស្ទួនរមៀល {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ចំនួនសិស្សស្ទួនរមៀល {0}
 DocType: Budget,Action if Annual Budget Exceeded,ប្រសិនបើមានថវិកាប្រចាំឆ្នាំសកម្មភាពលើសពី
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,សម្ភារៈសំណើទិញសណ្តាប់ធ្នាប់
 DocType: Shopping Cart Settings,Payment Success URL,ការទូទាត់ URL ដែលទទួលបានភាពជោគជ័យ
@@ -1551,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,វិធីសាស្រ្តការទូទាត់សង
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",ប្រសិនបើបានធីកទំព័រដើមនេះនឹងត្រូវបានក្រុមធាតុលំនាំដើមសម្រាប់គេហទំព័រនេះ
 DocType: Quality Inspection Reading,Reading 4,ការអានទី 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Bom លំនាំដើមសម្រាប់ {0} មិនត្រូវបានរកឃើញសម្រាប់គម្រោង {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Bom លំនាំដើមសម្រាប់ {0} មិនត្រូវបានរកឃើញសម្រាប់គម្រោង {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ពាក្យបណ្តឹងសម្រាប់ការចំណាយរបស់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",និស្សិតត្រូវបាននៅក្នុងបេះដូងនៃប្រព័ន្ធនេះបន្ថែមសិស្សទាំងអស់របស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",និស្សិតត្រូវបាននៅក្នុងបេះដូងនៃប្រព័ន្ធនេះបន្ថែមសិស្សទាំងអស់របស់អ្នក
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ជួរដេក # {0}: កាលបរិច្ឆេទបោសសំអាត {1} មិនអាចមានមុនពេលកាលបរិច្ឆេទមូលប្បទានប័ត្រ {2}
 DocType: Company,Default Holiday List,បញ្ជីថ្ងៃឈប់សម្រាកលំនាំដើម
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ជួរដេក {0}: ពីពេលវេលានិងពេលវេលានៃ {1} ត្រូវបានត្រួតស៊ីគ្នាជាមួយ {2}
@@ -1565,21 +1568,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ថ្ងៃនេះ (s) បាននៅលើដែលអ្នកកំពុងដាក់ពាក្យសុំឈប់សម្រាកគឺជាថ្ងៃឈប់សម្រាក។ អ្នកត្រូវការត្រូវបានអនុវត្តសម្រាប់ការឈប់សម្រាក។
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ផ្ញើការទូទាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ភារកិច្ចថ្មី
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ចូរធ្វើសម្រង់
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ចូរធ្វើសម្រង់
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,របាយការណ៍ផ្សេងទៀត
 DocType: Dependent Task,Dependent Task,ការងារពឹងផ្អែក
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},កត្តាប្រែចិត្តជឿសម្រាប់អង្គភាពលំនាំដើមត្រូវតែមានវិធានការក្នុងមួយជួរដេក 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ការឈប់សម្រាកនៃប្រភេទ {0} មិនអាចមានយូរជាង {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ការធ្វើផែនការប្រតិបត្ដិការសម្រាប់ការព្យាយាមរបស់ X នៅមុនថ្ងៃ។
 DocType: HR Settings,Stop Birthday Reminders,បញ្ឈប់ការរំលឹកខួបកំណើត
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},សូមកំណត់បើកប្រាក់បៀវត្សគណនីទូទាត់លំនាំដើមក្នុងក្រុមហ៊ុន {0}
 DocType: SMS Center,Receiver List,បញ្ជីអ្នកទទួល
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ស្វែងរកធាតុ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,ស្វែងរកធាតុ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ចំនួនទឹកប្រាក់ដែលគេប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ការផ្លាស់ប្តូរសាច់ប្រាក់សុទ្ធ
 DocType: Assessment Plan,Grading Scale,ធ្វើមាត្រដ្ឋានពិន្ទុ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,បានបញ្ចប់រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ឯកតារង្វាស់ {0} ត្រូវបានបញ្ចូលលើសពីមួយដងនៅក្នុងការសន្ទនាកត្តាតារាង
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,បានបញ្ចប់រួចទៅហើយ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ស្នើសុំការទូទាត់រួចហើយ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,តម្លៃនៃធាតុដែលបានចេញផ្សាយ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},បរិមាណមិនត្រូវការច្រើនជាង {0}
@@ -1611,12 +1614,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ធ្វើឱ្យការចំណាយធាតុ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ជួរដេក {0}: ជាមុនប្រឆាំងនឹងការផ្គត់ផ្គង់ត្រូវតែឥណពន្ធ
 DocType: Company,Default Values,តម្លៃលំនាំដើម
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ប្រេកង់} សង្ខេប
 DocType: Expense Claim,Total Amount Reimbursed,ចំនួនទឹកប្រាក់សរុបដែលបានសងវិញ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,នេះផ្អែកលើកំណត់ហេតុប្រឆាំងនឹងរថយន្តនេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ប្រមូល
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ប្រឆាំងនឹងការផ្គត់ផ្គង់វិក័យប័ត្រ {0} {1} ចុះកាលបរិច្ឆេទ
 DocType: Customer,Default Price List,តារាងតម្លៃលំនាំដើម
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,កំណត់ត្រាចលនាទ្រព្យសកម្ម {0} បង្កើតឡើង
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,អ្នកមិនអាចលុបឆ្នាំសារពើពន្ធ {0} ។ ឆ្នាំសារពើពន្ធ {0} ត្រូវបានកំណត់ជាលំនាំដើមនៅក្នុងការកំណត់សកល
 DocType: Journal Entry,Entry Type,ប្រភេទធាតុ
 ,Customer Credit Balance,សមតុល្យឥណទានអតិថិជន
@@ -1633,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,លទ្ធកម្ម
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,គ្មានការធាតុមានការផ្លាស់ប្តូណាមួយក្នុងបរិមាណឬតម្លៃ។
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,វាលដែលចាំបាច់ - កម្មវិធី
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,បណ្តឹងធានា
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,បណ្តឹងធានា
 ,Lead Details,ពត៌មានលំអិតនាំមុខ
 DocType: Salary Slip,Loan repayment,ការទូទាត់សងប្រាក់កម្ចី
 DocType: Purchase Invoice,End date of current invoice's period,កាលបរិច្ឆេទបញ្ចប់នៃរយៈពេលបច្ចុប្បន្នរបស់វិក័យប័ត្រ
@@ -1652,11 +1656,10 @@
 DocType: Employee,Permanent Address,អាសយដ្ឋានអចិន្រ្តៃយ៍
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ជំរុញបង់ប្រឆាំងនឹង {0} {1} មិនអាចច្រើន \ ជាងសរុប {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,សូមជ្រើសរើសលេខកូដធាតុ
 DocType: Student Sibling,Studying in Same Institute,កំពុងសិក្សានៅក្នុងវិទ្យាស្ថានដូចគ្នា
 DocType: Territory,Territory Manager,កម្មវិធីគ្រប់គ្រងទឹកដី
 DocType: Packed Item,To Warehouse (Optional),ទៅឃ្លាំង (ជាជម្រើស)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Payment Entry,Paid Amount (Company Currency),ចំនួនទឹកប្រាក់ដែលបានបង់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Purchase Invoice,Additional Discount,បញ្ចុះតំលៃបន្ថែម
 DocType: Selling Settings,Selling Settings,ការលក់ការកំណត់
@@ -1666,9 +1669,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,មើលក្នុងកន្ត្រកទំនិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ចំណាយទីផ្សារ
 ,Item Shortage Report,របាយការណ៍កង្វះធាតុ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",ទំងន់ត្រូវបានបង្ហាញ \ n សូមនិយាយអំពី &quot;ទម្ងន់ UOM&quot; ពេក
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,សម្ភារៈស្នើសុំប្រើដើម្បីធ្វើឱ្យផ្សារហ៊ុននេះបានចូល
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,កាលបរិច្ឆេទគឺបន្ទាប់រំលស់ចាំបាច់សម្រាប់ទ្រព្យថ្មី
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,កាលបរិច្ឆេទគឺបន្ទាប់រំលស់ចាំបាច់សម្រាប់ទ្រព្យថ្មី
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ក្រុមដែលមានមូលដ្ឋាននៅជំនាន់ការពិតណាស់ការដាច់ដោយឡែកសម្រាប់គ្រប់
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,អង្គភាពតែមួយនៃធាតុមួយ។
 DocType: Fee Category,Fee Category,ចំណាត់ថ្នាក់ថ្លៃសេវា
@@ -1684,8 +1687,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: មជ្ឈមណ្ឌលតម្លៃត្រូវបានទាមទារសម្រាប់ &#39;ប្រាក់ចំណេញនិងការបាត់បង់&#39; គណនី {2} ។ សូមបង្កើតមជ្ឈមណ្ឌលតម្លៃលំនាំដើមសម្រាប់ក្រុមហ៊ុន។
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ការគ្រុបអតិថិជនមានឈ្មោះដូចគ្នាសូមផ្លាស់ប្តូរឈ្មោះរបស់អតិថិជនឬប្តូរឈ្មោះក្រុមរបស់អតិថិជន
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1702,7 +1704,7 @@
 ,Item-wise Sales Register,ធាតុប្រាជ្ញាលក់ចុះឈ្មោះ
 DocType: Asset,Gross Purchase Amount,ចំនួនទឹកប្រាក់សរុបការទិញ
 DocType: Asset,Depreciation Method,វិធីសាស្រ្តរំលស់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ក្រៅបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ក្រៅបណ្តាញ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,តើការប្រមូលពន្ធលើនេះបានរួមបញ្ចូលក្នុងអត្រាជាមូលដ្ឋាន?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,គោលដៅសរុប
 DocType: Program Course,Required,ត្រូវការ
@@ -1712,20 +1714,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ការផ្សះផ្សា JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ជួរឈរច្រើនពេក។ នាំចេញរបាយការណ៍និងបោះពុម្ពដោយប្រើកម្មវិធីសៀវភៅបញ្ជីមួយ។
 DocType: Purchase Invoice Item,Batch No,បាច់គ្មាន
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទសំខាន់ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,អនុញ្ញាតឱ្យមានការបញ្ជាទិញការលក់ការទិញសណ្តាប់ធ្នាប់ជាច្រើនប្រឆាំងនឹងអតិថិជនរបស់មួយ
 DocType: Student Group Instructor,Student Group Instructor,ក្រុមនិស្សិតគ្រូបង្រៀន
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ទូរស័ព្ទដៃគ្មាន
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ដើមចម្បង
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,វ៉ារ្យ៉ង់
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ដើមចម្បង
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,វ៉ារ្យ៉ង់
 DocType: Naming Series,Set prefix for numbering series on your transactions,កំណត់បុព្វបទសម្រាប់លេខស៊េរីលើប្រតិបតិ្តការរបស់អ្នក
 DocType: Employee Attendance Tool,Employees HTML,និយោជិករបស់ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Bom លំនាំដើម ({0}) ត្រូវតែសកម្មសម្រាប់ធាតុនេះឬពុម្ពរបស់ខ្លួន
 DocType: Employee,Leave Encashed?,ទុកឱ្យ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ឱកាសក្នុងវាលពីគឺចាំបាច់
 DocType: Email Digest,Annual Expenses,ការចំណាយប្រចាំឆ្នាំ
 DocType: Item,Variants,វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ធ្វើឱ្យការទិញសណ្តាប់ធ្នាប់
 DocType: SMS Center,Send To,បញ្ជូនទៅ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},មិនមានតុល្យភាពឈប់សម្រាកឱ្យបានគ្រប់គ្រាន់សម្រាប់ទុកឱ្យប្រភេទ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ទឹកប្រាក់ដែលត្រៀមបម្រុងទុក
@@ -1733,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,ការងារក្នុងវឌ្ឍនភាពឃ្លាំងត្រូវទាមទារមុនពេលដាក់ស្នើ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,កម្មវិធីសម្រាប់ការងារនេះ។
 DocType: Purchase Order Item,Warehouse and Reference,ឃ្លាំងនិងឯកសារយោង
 DocType: Supplier,Statutory info and other general information about your Supplier,ពត៌មានច្បាប់និងព័ត៌មានទូទៅអំពីផ្គត់ផ្គង់របស់អ្នក
 DocType: Item,Serial Nos and Batches,សៀរៀល nos និងជំនាន់
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ក្រុមនិស្សិតកម្លាំង
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ប្រឆាំងនឹង Journal Entry {0} មិនមានធាតុមិនផ្គូផ្គងណាមួយ {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,វាយតម្ល្រ
 apps/erpnext/erpnext/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: Grading Structure,Grading Intervals,ចន្លោះពេលការដាក់ពិន្ទុ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,សូមបញ្ចូល
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","មិនអាច overbill សម្រាប់ធាតុនៅ {0} {1} ជួរដេកច្រើនជាង {2} ។ ដើម្បីអនុញ្ញាតឱ្យការវិក័យប័ត្រ, សូមកំណត់នៅក្នុងការកំណត់ការទិញ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,សូមកំណត់តម្រងដែលមានមូលដ្ឋានលើធាតុឬឃ្លាំង
@@ -1755,17 +1755,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Bom {0} ត្រូវតែត្រូវបានដាក់ជូន
 DocType: Authorization Control,Authorization Control,ការត្រួតពិនិត្យសេចក្តីអនុញ្ញាត
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ជួរដេក # {0}: ឃ្លាំងគឺជាការចាំបាច់បានច្រានចោលការប្រឆាំងនឹងធាតុច្រានចោល {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ការទូទាត់
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,គ្រប់គ្រងការបញ្ជាទិញរបស់អ្នក
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ការទូទាត់
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,គ្រប់គ្រងការបញ្ជាទិញរបស់អ្នក
 DocType: Production Order Operation,Actual Time and Cost,ពេលវេលាពិតប្រាកដនិងការចំណាយ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ស្នើសុំសម្ភារៈនៃអតិបរមា {0} អាចត្រូវបានធ្វើឡើងសម្រាប់ធាតុ {1} នឹងដីកាសម្រេចលក់ {2}
 DocType: Employee,Salutation,ពាក្យសួរសុខទុក្ខ
 DocType: Course,Course Abbreviation,អក្សរកាត់ការពិតណាស់
 DocType: Student Leave Application,Student Leave Application,កម្មវិធីទុកឱ្យសិស្ស
 DocType: Item,Will also apply for variants,ក៏នឹងអនុវត្តសម្រាប់វ៉ារ្យ៉ង់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ទ្រព្យសម្បត្តិដែលមិនអាចត្រូវបានលុបចោល, ដូចដែលវាមានរួចទៅ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},បុគ្គលិក {0} នៅថ្ងៃពាក់កណ្តាលនៅលើ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ម៉ោងធ្វើការសរុបមិនគួរត្រូវបានធំជាងម៉ោងធ្វើការអតិបរមា {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,នៅថ្ងៃទី
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ធាតុបាច់នៅក្នុងពេលនៃការលក់។
 DocType: Quotation Item,Actual Qty,ជាក់ស្តែ Qty
 DocType: Sales Invoice Item,References,ឯកសារយោង
@@ -1775,7 +1776,7 @@
 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 +91,Associate,រង
 DocType: Asset Movement,Asset Movement,ចលនាទ្រព្យសម្បត្តិ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,រទេះថ្មី
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,រទេះថ្មី
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ធាតុ {0} គឺមិនមែនជាធាតុសៀរៀល
 DocType: SMS Center,Create Receiver List,បង្កើតបញ្ជីអ្នកទទួល
 DocType: Vehicle,Wheels,កង់
@@ -1807,9 +1808,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,មិនអនុញ្ញាតការបង្កើតនៃការពេលវេលាដែលនឹងដីកាកំណត់ហេតុផលិតកម្ម។ ប្រតិបត្ដិការនឹងមិនត្រូវបានតាមដានប្រឆាំងនឹងដីកាសម្រេចរបស់ផលិតកម្ម
 DocType: Student,Student Mobile Number,លេខទូរស័ព្ទរបស់សិស្ស
 DocType: Item,Has Variants,មានវ៉ារ្យ៉ង់
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},អ្នកបានជ្រើសរួចហើយចេញពីធាតុ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ឈ្មោះរបស់ចែកចាយប្រចាំខែ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,លេខសម្គាល់បាច់ជាការចាំបាច់
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,លេខសម្គាល់បាច់ជាការចាំបាច់
 DocType: Sales Person,Parent Sales Person,ឪពុកម្តាយរបស់បុគ្គលលក់
 DocType: Purchase Invoice,Recurring Invoice,វិក័យប័ត្រកើតឡើង
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ការគ្រប់គ្រងគម្រោង
@@ -1817,11 +1818,11 @@
 DocType: Budget,Fiscal Year,ឆ្នាំសារពើពន្ធ
 DocType: Vehicle Log,Fuel Price,តម្លៃប្រេងឥន្ធនៈ
 DocType: Budget,Budget,ថវិការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ធាតុទ្រព្យសកម្មថេរត្រូវតែជាធាតុដែលមិនមែនជាភាគហ៊ុន។
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹង {0}, ដែលជាវាមិនមែនជាគណនីដែលមានប្រាក់ចំណូលឬការចំណាយ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,សម្រេចបាន
 DocType: Student Admission,Application Form Route,ពាក្យស្នើសុំផ្លូវ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,ទឹកដី / អតិថិជន
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,ទឹកដី / អតិថិជន
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ឧ 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ទុកឱ្យប្រភេទ {0} មិនអាចត្រូវបានបម្រុងទុកសម្រាប់ចាប់តាំងពីវាត្រូវបានចាកចេញដោយគ្មានប្រាក់ខែ
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកវិក័យប័ត្រលក់។
@@ -1840,14 +1841,14 @@
 ,Serial No Status,ស្ថានភាពគ្មានសៀរៀល
 DocType: Payment Entry Reference,Outstanding,ឆ្នើម
 ,Daily Timesheet Summary,សង្ខេប Timesheet ប្រចាំថ្ងៃ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ជួរដេក {0}: ដើម្បីកំណត់ {1} រយៈពេល, ភាពខុសគ្នារវាងពីនិងដើម្បីកាលបរិច្ឆេទ \ ត្រូវតែធំជាងឬស្មើទៅនឹង {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,នេះត្រូវបានផ្អែកលើចលនាភាគហ៊ុន។ សូមមើល {0} សម្រាប់សេចក្តីលម្អិត
 DocType: Pricing Rule,Selling,លក់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},ចំនួនទឹកប្រាក់ {0} {1} បានកាត់ប្រឆាំងនឹង {2}
 DocType: Employee,Salary Information,ពត៌មានប្រាក់បៀវត្ស
 DocType: Sales Person,Name and Employee ID,ឈ្មោះនិងលេខសម្គាល់របស់និយោជិត
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,កាលបរិច្ឆេទដោយសារតែមិនអាចមានមុនពេលការប្រកាសកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,ភារកិច្ចនិងពន្ធ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,សូមបញ្ចូលកាលបរិច្ឆេទយោង
@@ -1859,14 +1860,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,មិនអាចយោងលេខជួរដេកធំជាងឬស្មើទៅនឹងចំនួនជួរដេកបច្ចុប្បន្នសម្រាប់ប្រភេទការចោទប្រកាន់នេះ
 DocType: Asset,Sold,លក់ចេញ
 ,Item-wise Purchase History,ប្រវត្តិទិញប្រាជ្ញាធាតុ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},សូមចុចលើ &#39;បង្កើតតារាង &quot;ដើម្បីទៅប្រមូលយកសៀរៀលគ្មានបានបន្ថែមសម្រាប់ធាតុ {0}
 DocType: Account,Frozen,ទឹកកក
 ,Open Production Orders,ការបើកចំហរការបញ្ជាទិញផលិតកម្ម
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ចំនួនមូលដ្ឋាន (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 DocType: Payment Reconciliation Payment,Reference Row,សេចក្តីយោងជួរដេក
 DocType: Installation Note,Installation Time,ពេលដំឡើង
 DocType: Sales Invoice,Accounting Details,សេចក្ដីលម្អិតគណនី
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,លុបប្រតិបត្តិការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ការវិនិយោគ
 DocType: Issue,Resolution Details,ពត៌មានលំអិតការដោះស្រាយ
@@ -1898,13 +1899,13 @@
 DocType: Discussion,Discussion,ការពិភាក្សា
 DocType: Payment Entry,Transaction ID,លេខសម្គាល់ប្រតិបត្តិការ
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ក្បួនកំណត់តម្លៃត្រូវបានត្រងបន្ថែមទៀតដោយផ្អែកលើបរិមាណ។
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},សូមកំណត់កាលបរិច្ឆេទនៃការចូលរួមសម្រាប់បុគ្គលិកដែលបាន {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ចំនួនវិក័យប័ត្រសរុប (តាមរយៈសន្លឹកម៉ោង)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ប្រាក់ចំណូលគយបានធ្វើម្តងទៀត
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ត្រូវតែមានតួនាទីជា &quot;អ្នកអនុម័តការចំណាយ&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,គូ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ជ្រើស Bom និង Qty សម្រាប់ផលិតកម្ម
 DocType: Asset,Depreciation Schedule,កាលវិភាគរំលស់
 DocType: Bank Reconciliation Detail,Against Account,ប្រឆាំងនឹងគណនី
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ថ្ងៃពាក់កណ្តាលកាលបរិច្ឆេទគួរត្រូវបានរវាងពីកាលបរិច្ឆេទនិងដើម្បីកាលបរិច្ឆេទ
@@ -1918,16 +1919,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},សូមកំណត់ &#39;ទ្រព្យសម្បត្តិមជ្ឈមណ្ឌលតម្លៃរំលស់ &quot;នៅក្នុងក្រុមហ៊ុន {0}
 ,Maintenance Schedules,កាលវិភាគថែរក្សា
 DocType: Task,Actual End Date (via Time Sheet),បញ្ចប់ពិតប្រាកដកាលបរិច្ឆេទ (តាមរយៈសន្លឹកម៉ោង)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},ចំនួនទឹកប្រាក់ {0} {1} ប្រឆាំងនឹង {2} {3}
 ,Quotation Trends,សម្រង់និន្នាការ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ធាតុគ្រុបមិនបានរៀបរាប់នៅក្នុងមេធាតុសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ឥណពន្ធវីសាទៅគណនីត្រូវតែជាគណនីដែលទទួល
 DocType: Shipping Rule Condition,Shipping Amount,ចំនួនទឹកប្រាក់ការដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេច
 DocType: Purchase Invoice Item,Conversion Factor,ការប្រែចិត្តជឿកត្តា
 DocType: Purchase Order,Delivered,បានបញ្ជូន
 ,Vehicle Expenses,ចំណាយយានយន្ត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
+DocType: Serial No,Invoice Details,សេចក្ដីលម្អិតវិក័យប័ត្រ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},តម្លៃដែលរំពឹងទុកបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែធំជាងឬស្មើទៅនឹង {0}
 DocType: Purchase Receipt,Vehicle Number,ចំនួនរថយន្ត
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ថ្ងៃដែលនឹងត្រូវកើតឡើងវិក្កយបត្របញ្ឈប់ការ
 DocType: Employee Loan,Loan Amount,ចំនួនប្រាក់កម្ចី
@@ -1945,12 +1947,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ការកំណត់ធនធានមនុស្ស
 DocType: Salary Slip,net pay info,info ប្រាក់ខែសុទ្ធ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ពាក្យបណ្តឹងលើការចំណាយគឺត្រូវរង់ចាំការអនុម័ត។ មានតែការអនុម័តលើការចំណាយនេះអាចធ្វើឱ្យស្ថានភាពទាន់សម័យ។
 DocType: Email Digest,New Expenses,ការចំណាយថ្មី
 DocType: Purchase Invoice,Additional Discount Amount,ចំនួនទឹកប្រាក់ដែលបញ្ចុះតម្លៃបន្ថែម
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ជួរដេក # {0}: Qty ត្រូវតែ 1, ជាធាតុជាទ្រព្យសកម្មថេរ។ សូមប្រើជួរដាច់ដោយឡែកសម្រាប់ qty ច្រើន។"
 DocType: Leave Block List Allow,Leave Block List Allow,បញ្ជីប្លុកអនុញ្ញាតឱ្យចាកចេញពី
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr មិនអាចមាននៅទទេឬទំហំ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ជាក្រុមការមិនគ្រុប
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,កីឡា
 DocType: Loan Type,Loan Name,ឈ្មោះសេវាឥណទាន
@@ -1961,6 +1963,7 @@
 ,Customer Acquisition and Loyalty,ការទិញរបស់អតិថិជននិងភាពស្មោះត្រង់
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ឃ្លាំងដែលជាកន្លែងដែលអ្នកត្រូវបានរក្សាឱ្យបាននូវភាគហ៊ុនរបស់ធាតុដែលបានច្រានចោល
 DocType: Production Order,Skip Material Transfer,រំលងសម្ភារៈផ្ទេរ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,មិនអាចរកឃើញអត្រាប្តូរប្រាក់សម្រាប់ {0} ទៅ {1} សម្រាប់កាលបរិច្ឆេទគន្លឹះ {2} ។ សូមបង្កើតកំណត់ត្រាប្តូររូបិយប័ណ្ណដោយដៃ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,កាលពីឆ្នាំហិរញ្ញវត្ថុរបស់អ្នកនឹងបញ្ចប់នៅថ្ងៃ
 DocType: POS Profile,Price List,តារាងតម្លៃ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ឥឡូវនេះជាលំនាំដើមឆ្នាំសារពើពន្ធនេះ។ សូមធ្វើឱ្យកម្មវិធីរុករករបស់អ្នកសម្រាប់ការផ្លាស់ប្តូរមានប្រសិទ្ធិភាព។
@@ -1977,19 +1980,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},គណនី {0} មិនត្រឹមត្រូវ។ រូបិយប័ណ្ណគណនីត្រូវតែ {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},កត្តាប្រែចិត្តជឿ UOM គឺត្រូវបានទាមទារនៅក្នុងជួរដេក {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃដីកាលក់, ការលក់វិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Salary Component,Deduction,ការដក
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ជួរដេក {0}: ពីពេលវេលានិងទៅពេលវេលាគឺជាការចាំបាច់។
 DocType: Stock Reconciliation Item,Amount Difference,ភាពខុសគ្នាចំនួនទឹកប្រាក់
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},ថ្លៃទំនិញបានបន្ថែមសម្រាប់ {0} នៅក្នុងបញ្ជីតម្លៃ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,សូមបញ្ចូលនិយោជិតលេខសម្គាល់នេះបុគ្គលការលក់
 DocType: Territory,Classification of Customers by region,ចំណាត់ថ្នាក់នៃអតិថិជនដោយតំបន់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ចំនួនទឹកប្រាក់ផ្សេងគ្នាត្រូវតែសូន្យ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ចំនួនទឹកប្រាក់ផ្សេងគ្នាត្រូវតែសូន្យ
 DocType: Project,Gross Margin,ប្រាក់ចំណេញដុល
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,សូមបញ្ចូលធាតុដំបូងផលិតកម្ម
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,សេចក្តីថ្លែងការណ៍របស់ធនាគារគណនាតុល្យភាព
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,អ្នកប្រើដែលបានបិទ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,សម្រង់
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,សម្រង់
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ការកាត់សរុប
 ,Production Analytics,វិភាគផលិតកម្ម
@@ -1998,9 +2001,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ព្រមាន: វិញ្ញាបនបត្រ SSL មិនត្រឹមត្រូវលើឯកសារភ្ជាប់ {0}
 DocType: Student Admission,Eligibility,សិទ្ធិទទួលបាន
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",ការនាំមុខជួយឱ្យអ្នកទទួលអាជីវកម្មការបន្ថែមទំនាក់ទំនងរបស់អ្នកទាំងអស់និងច្រើនទៀតតម្រុយរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",ការនាំមុខជួយឱ្យអ្នកទទួលអាជីវកម្មការបន្ថែមទំនាក់ទំនងរបស់អ្នកទាំងអស់និងច្រើនទៀតតម្រុយរបស់អ្នក
 DocType: Production Order Operation,Actual Operation Time,ប្រតិបត្ដិការពេលវេលាពិតប្រាកដ
 DocType: Authorization Rule,Applicable To (User),ដែលអាចអនុវត្តទៅ (អ្នកប្រើប្រាស់)
 DocType: Purchase Taxes and Charges,Deduct,កាត់
@@ -2015,7 +2018,7 @@
 DocType: Guardian,Work Address,អាសយដ្ឋានការងារ
 DocType: Appraisal,Calculate Total Score,គណនាពិន្ទុសរុប
 DocType: Request for Quotation,Manufacturing Manager,កម្មវិធីគ្រប់គ្រងកម្មន្តសាល
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},សៀរៀល {0} គ្មានរីករាយជាមួយនឹងស្ថិតនៅក្រោមការធានា {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ចំណាំដឹកជញ្ជូនពុះចូលទៅក្នុងកញ្ចប់។
 apps/erpnext/erpnext/hooks.py +87,Shipments,ការនាំចេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,សមតុល្យគណនី ({0}) សម្រាប់ {1} និងតម្លៃភាគហ៊ុន ({2}) សម្រាប់ឃ្លាំង {3} ត្រូវតែមានដូចគ្នា
@@ -2036,10 +2039,10 @@
 DocType: Leave Application,Total Leave Days,សរុបថ្ងៃស្លឹក
 DocType: Email Digest,Note: Email will not be sent to disabled users,ចំណាំ: អ៊ីម៉ែលនឹងមិនត្រូវបានផ្ញើទៅកាន់អ្នកប្រើជនពិការ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ចំនួននៃអន្តរកម្ម
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ជ្រើសក្រុមហ៊ុន ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ជ្រើសក្រុមហ៊ុន ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ប្រសិនបើអ្នកទុកវាឱ្យទទេទាំងអស់ពិចារណាសម្រាប់នាយកដ្ឋាន
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ប្រភេទការងារ (អចិន្ត្រយ៍កិច្ចសន្យាហាត់ជាដើម) ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} គឺជាការចាំបាច់សម្រាប់ធាតុ {1}
 DocType: Process Payroll,Fortnightly,ពីរសប្តាហ៍
 DocType: Currency Exchange,From Currency,ចាប់ពីរូបិយប័ណ្ណ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","សូមជ្រើសចំនួនទឹកប្រាក់ដែលបានបម្រុងទុក, ប្រភេទវិក័យប័ត្រនិងលេខវិក្កយបត្រក្នុងមួយជួរដេកយ៉ាងហោចណាស់"
@@ -2048,14 +2051,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),អត្រាការប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Student Guardian,Others,អ្នកផ្សេងទៀត
 DocType: Payment Entry,Unallocated Amount,ចំនួនទឹកប្រាក់ដែលមិនទាន់បែងចែក
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,មិនអាចរកឃើញធាតុផ្គូផ្គងជាមួយ។ សូមជ្រើសតម្លៃមួយចំនួនផ្សេងទៀតសម្រាប់ {0} ។
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,គ្មានការធ្វើឱ្យទាន់សម័យជាច្រើនទៀត
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,មិនអាចជ្រើសប្រភេទការចោទប្រកាន់ថាជា &quot;នៅលើចំនួនជួរដេកមុន &#39;ឬ&#39; នៅលើជួរដេកសរុបមុន&quot; សម្រាប់ជួរដេកដំបូង
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ធាតុកូនមិនគួរជាផលិតផលកញ្ចប់។ សូមយកធាតុ `{0}` និងរក្សាទុក
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,វិស័យធនាគារ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,បន្ថែម Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,បន្ថែម Timesheets
 DocType: Vehicle Service,Service Item,ធាតុសេវា
 DocType: Bank Guarantee,Bank Guarantee,ការធានាពីធនាគារ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,សូមចុចលើ &#39;បង្កើតកាលវិភាគ&#39; ដើម្បីទទួលបាននូវកាលវិភាគ
@@ -2079,6 +2082,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},ជួរដេក # {0}: ទ្រព្យសកម្ម {1} មានរួចហើយ {2}
 DocType: Quotation Item,Stock Balance,តុល្យភាពភាគហ៊ុន
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,សណ្តាប់ធ្នាប់ការលក់ទៅការទូទាត់
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,សូមកំណត់ការដាក់ឈ្មោះកម្រងឯកសារសម្រាប់ {0} តាមរយៈការដំឡើង&gt; ករកំណត់&gt; ដាក់ឈ្មោះកម្រងឯកសារ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,នាយកប្រតិបត្តិ
 DocType: Expense Claim Detail,Expense Claim Detail,ពត៌មានលំអិតពាក្យបណ្តឹងលើការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,សូមជ្រើសរើសគណនីដែលត្រឹមត្រូវ
@@ -2103,14 +2107,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,តម្លៃនេះនឹងមិនត្រូវបានបង្ហាញទេប្រសិនបើបញ្ជីតម្លៃគឺមិនត្រូវបានកំណត់
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,សូមបញ្ជាក់ជាប្រទេសមួយសម្រាប់វិធានការដឹកជញ្ជូននេះឬពិនិត្យមើលការដឹកជញ្ជូននៅទូទាំងពិភពលោក
 DocType: Stock Entry,Total Incoming Value,តម្លៃចូលសរុប
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ឥណពន្ធវីសាដើម្បីត្រូវបានទាមទារ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ជួយរក្សាដាននៃពេលវេលាការចំណាយនិងវិក័យប័ត្រសំរាប់ការសកម្មភាពដែលបានធ្វើដោយក្រុមរបស់អ្នក
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,បញ្ជីតម្លៃទិញ
 DocType: Offer Letter Term,Offer Term,ផ្តល់ជូននូវរយៈពេល
 DocType: Quality Inspection,Quality Manager,គ្រប់គ្រងគុណភាព
 DocType: Job Applicant,Job Opening,ពិធីបើកការងារ
 DocType: Payment Reconciliation,Payment Reconciliation,ការផ្សះផ្សាការទូទាត់
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,សូមជ្រើសឈ្មោះ Incharge បុគ្គលរបស់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,បច្ចេកវិទ្យា
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},សរុបគ្មានប្រាក់ខែ: {0}
 DocType: BOM Website Operation,BOM Website Operation,Bom គេហទំព័រប្រតិបត្តិការ
@@ -2137,23 +2141,23 @@
 DocType: Opportunity,Lost Reason,បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,អាសយដ្ឋានថ្មី
 DocType: Quality Inspection,Sample Size,ទំហំគំរូ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ធាតុទាំងអស់ត្រូវបាន invoiced រួចទៅហើយ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,សូមបញ្ចូលឯកសារបង្កាន់ដៃ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,មជ្ឈមណ្ឌលការចំណាយបន្ថែមទៀតអាចត្រូវបានធ្វើឡើងនៅក្រោមការក្រុមនោះទេប៉ុន្តែធាតុដែលអាចត្រូវបានធ្វើប្រឆាំងនឹងការដែលមិនមែនជាក្រុម
 DocType: Project,External,ខាងក្រៅ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,អ្នកប្រើនិងសិទ្ធិ
 DocType: Vehicle Log,VLOG.,Vlogging ។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ការបញ្ជាទិញផលិតកម្មបានបង្កើត: {0}
 DocType: Branch,Branch,សាខា
 DocType: Guardian,Mobile Number,លេខទូរសព្ទចល័ត
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ការបោះពុម្ពនិងម៉ាក
 DocType: Bin,Actual Quantity,បរិមាណដែលត្រូវទទួលទានពិតប្រាកដ
 DocType: Shipping Rule,example: Next Day Shipping,ឧទាហរណ៍: ថ្ងៃបន្ទាប់ការដឹកជញ្ជូន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,គ្មានសៀរៀល {0} មិនបានរកឃើញ
 DocType: Scheduling Tool,Student Batch,បាច់សិស្ស
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,អតិថិជនរបស់អ្នក
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ធ្វើឱ្យសិស្ស
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ធ្វើឱ្យសិស្ស
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},អ្នកបានត្រូវអញ្ជើញដើម្បីសហការគ្នាលើគម្រោងនេះ: {0}
 DocType: Leave Block List Date,Block Date,ប្លុកកាលបរិច្ឆេទ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ដាក់ពាក្យឥឡូវនេះ
@@ -2176,8 +2180,9 @@
 DocType: SMS Log,Sent To,ដែលបានផ្ញើទៅ
 DocType: Payment Request,Make Sales Invoice,ធ្វើឱ្យការលក់វិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,កម្មវិធី
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ទំនាក់ទំនងក្រោយកាលបរិច្ឆេទមិនអាចមានក្នុងពេលកន្លងមក
 DocType: Company,For Reference Only.,ឯកសារយោងប៉ុណ្ណោះ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ជ្រើសបាច់គ្មាន
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},មិនត្រឹមត្រូវ {0} {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,មុនចំនួនទឹកប្រាក់
@@ -2191,7 +2196,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,សំណុំរឿងលេខមិនអាចមាន 0
 DocType: Item,Show a slideshow at the top of the page,បង្ហាញតែការបញ្ចាំងស្លាយមួយនៅផ្នែកខាងលើនៃទំព័រនេះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ហាងលក់
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ហាងលក់
 DocType: Serial No,Delivery Time,ម៉ោងដឹកជញ្ជូន
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing ដោយផ្អែកលើការ
 DocType: Item,End of Life,ចុងបញ្ចប់នៃជីវិត
@@ -2203,11 +2208,11 @@
 DocType: Rename Tool,Rename Tool,ឧបករណ៍ប្តូរឈ្មោះ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,តម្លៃដែលធ្វើឱ្យទាន់សម័យ
 DocType: Item Reorder,Item Reorder,ធាតុរៀបចំ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,គ្រូពេទ្យប្រហែលជាបង្ហាញប្រាក់ខែ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,សម្ភារៈសេវាផ្ទេរប្រាក់
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","បញ្ជាក់ប្រតិបត្តិការ, ការចំណាយប្រតិបត្ដិការនិងផ្ដល់ឱ្យនូវប្រតិបត្ដិការតែមួយគត់នោះទេដើម្បីឱ្យប្រតិបត្តិការរបស់អ្នក។"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,សូមកំណត់កើតឡើងបន្ទាប់ពីរក្សាទុក
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,គណនីចំនួនទឹកប្រាក់ជ្រើសការផ្លាស់ប្តូរ
 DocType: Purchase Invoice,Price List Currency,បញ្ជីតម្លៃរូបិយប័ណ្ណ
 DocType: Naming Series,User must always select,អ្នកប្រើដែលត្រូវតែជ្រើសតែងតែ
 DocType: Stock Settings,Allow Negative Stock,អនុញ្ញាតឱ្យហ៊ុនអវិជ្ជមាន
@@ -2218,7 +2223,7 @@
 DocType: Budget Account,Budget Account,គណនីថវិកា
 DocType: Quality Inspection,Verified By,បានផ្ទៀងផ្ទាត់ដោយ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",មិនអាចផ្លាស់ប្តូរូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនដោយសារតែមានប្រតិបតិ្តការដែលមានស្រាប់។ ប្រតិបត្ដិការត្រូវតែត្រូវបានលុបចោលការផ្លាស់ប្តូររូបិយប័ណ្ណលំនាំដើម។
-DocType: Grade Interval,Grade Description,ថ្នាក់ទីបរិយាយ
+DocType: Grading Scale Interval,Grade Description,ថ្នាក់ទីបរិយាយ
 DocType: Stock Entry,Purchase Receipt No,គ្មានបង្កាន់ដៃទិញ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ប្រាក់ Earnest បាន
 DocType: Process Payroll,Create Salary Slip,បង្កើតប្រាក់ខែគ្រូពេទ្យប្រហែលជា
@@ -2256,7 +2261,7 @@
 DocType: Upload Attendance,Attendance To Date,ចូលរួមកាលបរិច្ឆេទ
 DocType: Warranty Claim,Raised By,បានលើកឡើងដោយ
 DocType: Payment Gateway Account,Payment Account,គណនីទូទាត់ប្រាក់
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,សូមបញ្ជាក់ក្រុមហ៊ុនដើម្បីបន្ត
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ការផ្លាស់ប្តូរសុទ្ធក្នុងគណនីអ្នកទទួល
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ទូទាត់បិទ
 DocType: Offer Letter,Accepted,បានទទួលយក
@@ -2265,12 +2270,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,សូមប្រាកដថាអ្នកពិតជាចង់លុបប្រតិបតិ្តការទាំងអស់សម្រាប់ក្រុមហ៊ុននេះ។ ទិន្នន័យមេរបស់អ្នកនឹងនៅតែជាវាគឺជា។ សកម្មភាពនេះមិនអាចមិនធ្វើវិញ។
 DocType: Room,Room Number,លេខបន្ទប់
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},សេចក្ដីយោងមិនត្រឹមត្រូវ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) មិនអាចច្រើនជាងការគ្រោងទុក quanitity ({2}) នៅក្នុងផលិតកម្មលំដាប់ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) មិនអាចច្រើនជាងការគ្រោងទុក quanitity ({2}) នៅក្នុងផលិតកម្មលំដាប់ {3}
 DocType: Shipping Rule,Shipping Rule Label,វិធានការដឹកជញ្ជូនស្លាក
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,វេទិកាអ្នកប្រើ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,វត្ថុធាតុដើមដែលមិនអាចត្រូវបានទទេ។
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","មិនអាចធ្វើឱ្យទាន់សម័យហ៊ុន, វិក័យប័ត្រមានធាតុដឹកជញ្ជូនទម្លាក់។"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ធាតុទិនានុប្បវត្តិរហ័ស
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,អ្នកមិនអាចផ្លាស់ប្តូរអត្រាការបានប្រសិនបើ Bom បានរៀបរាប់ agianst ធាតុណាមួយ
 DocType: Employee,Previous Work Experience,បទពិសោធន៍ការងារមុន
 DocType: Stock Entry,For Quantity,ចប់
@@ -2283,7 +2288,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,លក្ខខណ្ឌនិង Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ឈ្មោះរបស់វិទ្យាស្ថាននេះដែលអ្នកកំពុងកំណត់ប្រព័ន្ធនេះ។
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ធាតុគណនេយ្យកករហូតដល់កាលបរិច្ឆេទនេះគ្មាននរណាម្នាក់អាចធ្វើ / កែប្រែធាតុមួយលើកលែងតែជាតួនាទីដែលបានបញ្ជាក់ខាងក្រោម។
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,សូមរក្សាទុកឯកសារមុនពេលដែលបង្កើតកាលវិភាគថែរក្សា
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ស្ថានភាពគម្រោង
 DocType: UOM,Check this to disallow fractions. (for Nos),ធីកប្រអប់នេះដើម្បីមិនអនុញ្ញាតឱ្យប្រភាគ។ (សម្រាប់ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,លំដាប់ខាងក្រោមនេះត្រូវបានបង្កើតផលិតកម្ម:
@@ -2310,7 +2315,7 @@
 ,Employees working on a holiday,កម្មករនិយោជិតធ្វើការនៅលើថ្ងៃឈប់សម្រាកមួយ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,លោក Mark បច្ចុប្បន្ន
 DocType: Project,% Complete Method,វិធីសាស្រ្តពេញលេញ%
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទចាប់ផ្តើថែទាំមិនអាចត្រូវបានចែកចាយសម្រាប់ការមុនកាលបរិច្ឆេទសៀរៀលគ្មាន {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},កាលបរិច្ឆេទចាប់ផ្តើថែទាំមិនអាចត្រូវបានចែកចាយសម្រាប់ការមុនកាលបរិច្ឆេទសៀរៀលគ្មាន {0}
 DocType: Production Order,Actual End Date,ជាក់ស្តែកាលបរិច្ឆេទបញ្ចប់
 DocType: BOM,Operating Cost (Company Currency),ចំណាយប្រតិបត្តិការ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2327,7 +2332,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ទុកឱ្យដោយគ្មានប្រាក់ខែមិនផ្គូផ្គងនឹងកំណត់ត្រាកម្មវិធីចាកចេញអនុម័ត
 DocType: Campaign,Campaign-.####,យុទ្ធនាការ។ - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ជំហានបន្ទាប់
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,សូមផ្ដល់ធាតុដែលបានបញ្ជាក់នៅក្នុងអត្រាការប្រាក់ល្អបំផុតដែលអាចធ្វើទៅបាន
 DocType: Selling Settings,Auto close Opportunity after 15 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីឱកាសយ៉ាងជិតស្និទ្ធ 15 ថ្ងៃ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ឆ្នាំបញ្ចប់
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot / នាំមុខ%
@@ -2364,7 +2369,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,បរិមាណដែលត្រូវទទួលទាន Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},កំណត់ត្រាថ្លៃសេវាបានបង្កើត - {0}
 DocType: Asset Category Account,Asset Category Account,គណនីទ្រព្យសកម្មប្រភេទ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},មិនអាចបង្កើតធាតុជាច្រើនទៀត {0} ជាងបរិមាណលំដាប់លក់ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ភាគហ៊ុនចូល {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Payment Reconciliation,Bank / Cash Account,គណនីធនាគារ / សាច់ប្រាក់
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,បន្ទាប់ទំនាក់ទំនងដោយមិនអាចជាដូចគ្នានឹងអាសយដ្ឋានអ៊ីមែលនាំមុខ
@@ -2386,7 +2391,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ការបោសសំអាតកាលបរិច្ឆេទមិនបានលើកឡើង
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ផលិតកម្ម
 DocType: Guardian,Occupation,ការកាន់កាប់
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ជួរដេក {0}: ចាប់ផ្តើមកាលបរិច្ឆេទត្រូវតែមុនពេលដែលកាលបរិច្ឆេទបញ្ចប់
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),សរុប (Qty)
 DocType: Sales Invoice,This Document,ឯកសារនេះ
 DocType: Installation Note Item,Installed Qty,ដែលបានដំឡើង Qty
@@ -2402,14 +2408,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,រាយការណ៍បញ្ហា
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ចំណាយឧបករណ៍ប្រើប្រាស់
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ខាងលើ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ជួរដេក # {0}: Journal Entry {1} មិនមានគណនី {2} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ជួរដេក # {0}: Journal Entry {1} មិនមានគណនី {2} ឬកាតមានទឹកប្រាក់រួចហើយបានផ្គូផ្គងប្រឆាំងនឹងផ្សេងទៀត
 DocType: Buying Settings,Default Buying Price List,តារាងតម្លៃទិញលំនាំដើម &amp; ‧;
 DocType: Process Payroll,Salary Slip Based on Timesheet,ប័ណ្ណប្រាក់ខែដោយផ្អែកលើ Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,គ្មាននិយោជិតលក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើឬប័ណ្ណប្រាក់បៀវត្សដែលបានបង្កើតរួច
 DocType: Notification Control,Sales Order Message,ការលក់លំដាប់សារ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",កំណត់តម្លៃលំនាំដើមដូចជាការក្រុមហ៊ុនរូបិយប័ណ្ណបច្ចុប្បន្នឆ្នាំសារពើពន្ធល
 DocType: Payment Entry,Payment Type,ប្រភេទការទូទាត់
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,សូមជ្រើសបាច់សម្រាប់ធាតុ {0} ។ មិនអាចរកក្រុមតែមួយដែលបំពេញតម្រូវការនេះ
 DocType: Process Payroll,Select Employees,ជ្រើសបុគ្គលិក
 DocType: Opportunity,Potential Sales Deal,ឥឡូវនេះការលក់មានសក្តានុពល
 DocType: Payment Entry,Cheque/Reference Date,មូលប្បទានប័ត្រ / សេចក្តីយោងកាលបរិច្ឆេទ
@@ -2426,7 +2432,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ប្រវត្តិម៉ាស៊ីនឆូតកាតសកល {0} បានបង្កើតឡើងរួចទៅហើយសម្រាប់ក្រុមហ៊ុន {1}
 DocType: Purchase Order,Ref SQ,យោង SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ជំនួសធាតុ / Bom ក្នុង BOMs ទាំងអស់
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ឯកសារបង្កាន់ដៃត្រូវជូន
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ឯកសារបង្កាន់ដៃត្រូវជូន
 DocType: Purchase Invoice Item,Received Qty,ទទួលបានការ Qty
 DocType: Stock Entry Detail,Serial No / Batch,សៀរៀលគ្មាន / បាច់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,មិនបានបង់និងការមិនផ្តល់
@@ -2435,11 +2441,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,គ្មានសន្លឹកពេល
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,ទុកឱ្យប្រភេទ {0} មិនអាចត្រូវបានយកមកបញ្ជូនបន្ត
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ថែទាំគឺមិនត្រូវបានបង្កើតកាលវិភាគសម្រាប់ធាតុទាំងអស់នោះ។ សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 ,To Produce,ផលិត
 apps/erpnext/erpnext/config/hr.py +93,Payroll,បើកប្រាក់បៀវត្ស
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",ចំពោះជួរដេកនៅ {0} {1} ។ ដើម្បីរួមបញ្ចូល {2} នៅក្នុងអត្រាធាតុជួរដេក {3} ត្រូវតែត្រូវបានរួមបញ្ចូល
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ធ្វើឱ្យអ្នកប្រើប្រាស់
 DocType: Packing Slip,Identification of the package for the delivery (for print),ការកំណត់អត្តសញ្ញាណនៃកញ្ចប់សម្រាប់ការចែកចាយ (សម្រាប់បោះពុម្ព)
 DocType: Bin,Reserved Quantity,បរិមាណបំរុងទុក
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,សូមបញ្ចូលអាសយដ្ឋានអ៊ីម៉ែលត្រឹមត្រូវ
@@ -2451,15 +2457,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ពុម្ពជនពិការមិនត្រូវពុម្ពលំនាំដើម
 DocType: Account,Income Account,គណនីប្រាក់ចំណូល
 DocType: Payment Request,Amount in customer's currency,ចំនួនទឹកប្រាក់របស់អតិថិជនជារូបិយប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ការដឹកជញ្ជូន
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ការដឹកជញ្ជូន
 DocType: Stock Reconciliation Item,Current Qty,Qty នាពេលបច្ចុប្បន្ន
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",សូមមើល &quot;អត្រានៃមូលដ្ឋាននៅលើសម្ភារៈ&quot; នៅក្នុងផ្នែកទីផ្សារ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,មុន
 DocType: Appraisal Goal,Key Responsibility Area,តំបន់ភារកិច្ចសំខាន់
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ជំនាន់របស់សិស្សជួយអ្នកតាមដានការចូលរួម, ការវាយតម្លៃនិងថ្លៃសម្រាប់សិស្សនិស្សិត"
 DocType: Payment Entry,Total Allocated Amount,ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកសរុប
 DocType: Item Reorder,Material Request Type,ប្រភេទស្នើសុំសម្ភារៈ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ភាពត្រឹមត្រូវទិនានុប្បវត្តិធាតុសម្រាប់ប្រាក់ខែពី {0} ទៅ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","ផ្ទុកទិន្នន័យមូលដ្ឋាននេះគឺជាការពេញលេញ, មិនបានរក្សាទុក"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","ផ្ទុកទិន្នន័យមូលដ្ឋាននេះគឺជាការពេញលេញ, មិនបានរក្សាទុក"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ជួរដេក {0}: UOM ការប្រែចិត្តជឿកត្តាគឺជាការចាំបាច់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,យោង
 DocType: Budget,Cost Center,មជ្ឈមណ្ឌលការចំណាយ
@@ -2469,16 +2476,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,លាក់លេខសម្គាល់របស់អតិថិជនពន្ធពីការលក់
 DocType: Upload Attendance,Upload HTML,ផ្ទុកឡើងរបស់ HTML
 DocType: Employee,Relieving Date,កាលបរិច្ឆេទបន្ថយ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",វិធានការកំណត់តម្លៃត្រូវបានផលិតដើម្បីសរសេរជាន់ពីលើតារាងតម្លៃ / កំណត់ជាភាគរយបញ្ចុះតម្លៃដោយផ្អែកលើលក្ខណៈវិនិច្ឆ័យមួយចំនួន។
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ឃ្លាំងអាចផ្លាស់ប្តូរបានតែតាមរយៈហ៊ុនចូល / ដឹកជញ្ជូនចំណាំបង្កាន់ដៃ / ការទិញ
 DocType: Employee Education,Class / Percentage,ថ្នាក់ / ភាគរយ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ជាប្រធានទីផ្សារនិងលក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","បើសិនជាវិធានតម្លៃដែលបានជ្រើសត្រូវបានបង្កើតឡើងសម្រាប់ &quot;តំលៃ&quot; វានឹងសរសេរជាន់លើបញ្ជីតម្លៃ។ តម្លៃដែលកំណត់តម្លៃគឺជាតម្លៃវិធានចុងក្រោយនេះបានបញ្ចុះតម្លៃបន្ថែមទៀតដូច្នេះមិនមានគួរត្រូវបានអនុវត្ត។ ហេតុនេះហើយបានជានៅក្នុងប្រតិបត្តិការដូចជាការលក់សណ្តាប់ធ្នាប់, ការទិញលំដាប់លនោះវានឹងត្រូវបានទៅយកនៅក្នុងវិស័យ &#39;អត្រា&#39; ជាជាងវាល &quot;តំលៃអត្រាបញ្ជី។"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","បើសិនជាវិធានតម្លៃដែលបានជ្រើសត្រូវបានបង្កើតឡើងសម្រាប់ &quot;តំលៃ&quot; វានឹងសរសេរជាន់លើបញ្ជីតម្លៃ។ តម្លៃដែលកំណត់តម្លៃគឺជាតម្លៃវិធានចុងក្រោយនេះបានបញ្ចុះតម្លៃបន្ថែមទៀតដូច្នេះមិនមានគួរត្រូវបានអនុវត្ត។ ហេតុនេះហើយបានជានៅក្នុងប្រតិបត្តិការដូចជាការលក់សណ្តាប់ធ្នាប់, ការទិញលំដាប់លនោះវានឹងត្រូវបានទៅយកនៅក្នុងវិស័យ &#39;អត្រា&#39; ជាជាងវាល &quot;តំលៃអត្រាបញ្ជី។"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,បទនាំតាមប្រភេទឧស្សាហកម្ម។
 DocType: Item Supplier,Item Supplier,ផ្គត់ផ្គង់ធាតុ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,សូមបញ្ចូលលេខកូដធាតុដើម្បីទទួលបាច់នោះទេ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},សូមជ្រើសតម្លៃសម្រាប់ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,អាសយដ្ឋានទាំងអស់។
 DocType: Company,Stock Settings,ការកំណត់តម្លៃភាគហ៊ុន
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","រួមបញ្ចូលគ្នារវាងគឺអាចធ្វើបានតែប៉ុណ្ណោះប្រសិនបើមានលក្ខណៈសម្បត្តិដូចខាងក្រោមគឺដូចគ្នានៅក្នុងកំណត់ត្រាទាំងពីរ។ គឺជាក្រុម, ប្រភេទជា Root ក្រុមហ៊ុន"
@@ -2488,6 +2495,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',នឹងផ្ញើអ៊ីមែលអំពីព្រឹត្តិការណ៍នេះឱ្យទៅបុគ្គលិកដែលមានស្ថានភាព &quot;ការបើកចំហ&quot;
 DocType: Task,Depends on Tasks,អាស្រ័យលើភារកិច្ច
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,គ្រប់គ្រងក្រុមផ្ទាល់ខ្លួនដើមឈើ។
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ឯកសារភ្ជាប់ត្រូវបានបង្ហាញដោយមិនអាចធ្វើឱ្យរទេះដើរទិញឥវ៉ាន់
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,មជ្ឈមណ្ឌលការចំណាយថ្មីរបស់ឈ្មោះ
 DocType: Leave Control Panel,Leave Control Panel,ទុកឱ្យផ្ទាំងបញ្ជា
@@ -2500,11 +2508,10 @@
 DocType: Sales Invoice,Debit To,ឥណពន្ធដើម្បី
 DocType: Delivery Note,Required only for sample item.,បានទាមទារសម្រាប់តែធាតុគំរូ។
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty ពិតប្រាកដបន្ទាប់ពីការប្រតិបត្តិការ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ហាងទំនិញ&gt; ប្រភេទក្រុមហ៊ុនផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},គ្មានប័ណ្ណប្រាក់ខែបានរកឃើញរវាង {0} និង {1}
 ,Pending SO Items For Purchase Request,ការរង់ចាំការធាតុដូច្នេះសម្រាប់សំណើរសុំទិញ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,សិស្សចុះឈ្មោះចូលរៀន
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ត្រូវបានបិទ
 DocType: Supplier,Billing Currency,រូបិយប័ណ្ណវិក័យប័ត្រ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,បន្ថែមទៀតដែលមានទំហំធំ
@@ -2521,9 +2528,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ផលិតផលដែលមានលក្ខណៈពិសេសគេហទំព័រ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ក្រុមការវាយតំលៃទាំងអស់
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ឈ្មោះឃ្លាំងថ្មី
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),សរុប {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),សរុប {0} ({1})
 DocType: C-Form Invoice Detail,Territory,សណ្ធានដី
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,សូមនិយាយពីមិនមាននៃការមើលដែលបានទាមទារ
 DocType: Stock Settings,Default Valuation Method,វិធីសាស្រ្តវាយតម្លៃលំនាំដើម
 DocType: Vehicle Log,Fuel Qty,ប្រេងឥន្ធនៈ Qty
 DocType: Production Order Operation,Planned Start Time,ពេលវេលាចាប់ផ្ដើមគ្រោងទុក
@@ -2539,7 +2546,7 @@
 DocType: Price List,Price List Master,តារាងតម្លៃអនុបណ្ឌិត
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ទាំងអស់តិបត្តិការអាចនឹងត្រូវបានដាក់ស្លាកលក់បានច្រើនជនលក់ប្រឆាំងនឹង ** ** ដូច្នេះអ្នកអាចកំណត់និងត្រួតពិនិត្យគោលដៅ។
 ,S.O. No.,សូលេខ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},សូមបង្កើតអតិថិជនពីអ្នកដឹកនាំការ {0}
 DocType: Price List,Applicable for Countries,អនុវត្តសម្រាប់បណ្តាប្រទេស
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ទុកឱ្យកម្មវិធីដែលមានស្ថានភាពប៉ុណ្ណោះ &#39;ត្រូវបានអនុម័ត &quot;និង&quot; បដិសេធ &quot;អាចត្រូវបានដាក់ស្នើ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},និស្សិតឈ្មោះក្រុមគឺជាការចាំបាច់ក្នុងជួរ {0}
@@ -2570,7 +2577,7 @@
 DocType: Project,Copied From,ចម្លងពី
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},កំហុសឈ្មោះ: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ការខ្វះខាត
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} មិនបានផ្សារភ្ជាប់ជាមួយនឹង {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} មិនបានផ្សារភ្ជាប់ជាមួយនឹង {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ការចូលរួមសម្រាប់ការ {0} បុគ្គលិកត្រូវបានសម្គាល់រួចហើយ
 DocType: Packing Slip,If more than one package of the same type (for print),បើកញ្ចប់ច្រើនជាងមួយនៃប្រភេទដូចគ្នា (សម្រាប់បោះពុម្ព)
 ,Salary Register,ប្រាក់បៀវត្សចុះឈ្មោះ
@@ -2589,7 +2596,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ប្រើសម្រាប់កន្រ្តកទំនិញ
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},តម្លៃ {0} សម្រាប់គុណលក្ខណៈ {1} មិនមាននៅក្នុងបញ្ជីនៃធាតុត្រឹមត្រូវសម្រាប់ធាតុតម្លៃគុណលក្ខណៈ {2}
 DocType: BOM Item,Scrap %,សំណល់អេតចាយ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",បទចោទប្រកាន់នឹងត្រូវបានចែកដោយផ្អែកលើធាតុ qty សមាមាត្រឬបរិមាណជាមួយជម្រើសរបស់អ្នក
 DocType: Maintenance Visit,Purposes,គោលបំនង
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,យ៉ាងហោចណាស់ធាតុមួយដែលគួរតែត្រូវបញ្ចូលដោយបរិមាណអវិជ្ជមាននៅក្នុងឯកសារវិលត្រឡប់មកវិញ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ប្រតិបត្ដិការ {0} យូរជាងម៉ោងធ្វើការដែលអាចប្រើណាមួយនៅក្នុងស្ថានីយការងារ {1}, បំបែកប្រតិបត្ដិការទៅក្នុងប្រតិបត្ដិការច្រើន"
@@ -2610,16 +2617,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,គ្រប់គ្រងដើមឈើមួយដើមដែនដី។
 DocType: Journal Entry Account,Sales Invoice,វិក័យប័ត្រការលក់
 DocType: Journal Entry Account,Party Balance,តុល្យភាពគណបក្ស
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,សូមជ្រើសរើសអនុវត្តបញ្ចុះតម្លៃនៅលើ
 DocType: Company,Default Receivable Account,គណនីអ្នកទទួលលំនាំដើម
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,បង្កើតធាតុរបស់ធនាគារចំពោះប្រាក់បៀវត្សសរុបដែលបានបង់សម្រាប់លក្ខណៈវិនិច្ឆ័យដែលបានជ្រើសខាងលើ
 DocType: Stock Entry,Material Transfer for Manufacture,ផ្ទេរសម្រាប់ការផលិតសម្ភារៈ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ភាគរយបញ្ចុះតម្លៃអាចត្រូវបានអនុវត្តទាំងការប្រឆាំងនឹងតារាងតម្លៃមួយឬសម្រាប់តារាងតម្លៃទាំងអស់។
 DocType: Purchase Invoice,Half-yearly,ពាក់កណ្តាលប្រចាំឆ្នាំ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ចូលគណនេយ្យសម្រាប់ក្រុមហ៊ុនផ្សារ
 DocType: Vehicle Service,Engine Oil,ប្រេងម៉ាស៊ីន
 DocType: Sales Invoice,Sales Team1,Team1 ការលក់
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ធាតុ {0} មិនមាន
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ធាតុ {0} មិនមាន
 DocType: Sales Invoice,Customer Address,អាសយដ្ឋានអតិថិជន
 DocType: Employee Loan,Loan Details,សេចក្ដីលម្អិតប្រាក់កម្ចី
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ជួរដេក {0}: Qty បានបញ្ចប់ត្រូវតែធំជាងសូន្យ។
@@ -2627,24 +2634,24 @@
 DocType: Account,Root Type,ប្រភេទជា Root
 DocType: Item,FIFO,FIFO &amp; ‧;
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ជួរដេក # {0}: មិនអាចវិលត្រឡប់មកវិញច្រើនជាង {1} សម្រាប់ធាតុ {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ចំណែកដី
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},ឃ្លាំងគោលដៅគឺជាការចាំបាច់សម្រាប់ជួរ {0}
 DocType: Cheque Print Template,Primary Settings,ការកំណត់បឋមសិក្សា
 DocType: Purchase Invoice,Select Supplier Address,ជ្រើសអាសយដ្ឋានផ្គត់ផ្គង់
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,បន្ថែមបុគ្គលិក
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,បន្ថែមបុគ្គលិក
 DocType: Purchase Invoice Item,Quality Inspection,ពិនិត្យគុណភាព
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,បន្ថែមទៀតខ្នាតតូច
 DocType: Company,Standard Template,ទំព័រគំរូស្ដង់ដារ
 DocType: Training Event,Theory,ទ្រឹស្តី
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,ព្រមាន: សម្ភារៈដែលបានស្នើ Qty គឺតិចជាងអប្បបរមាលំដាប់ Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,គណនី {0} គឺការកក
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ផ្នែកច្បាប់អង្គភាព / តារាងរួមផ្សំជាមួយនឹងគណនីដាច់ដោយឡែកមួយដែលជាកម្មសិទ្ធិរបស់អង្គការនេះ។
 DocType: Payment Request,Mute Email,ស្ងាត់អ៊ីម៉ែល
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","អាហារ, ភេសជ្ជៈនិងថ្នាំជក់"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},ត្រឹមតែអាចធ្វើឱ្យការទូទាត់ប្រឆាំងនឹង unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,អត្រាការគណៈកម្មាការមិនអាចជាធំជាង 100
 DocType: Stock Entry,Subcontract,របបម៉ៅការ
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,សូមបញ្ចូល {0} ដំបូង
@@ -2683,7 +2690,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ប្រតិបត្តិការដែលមានស្រាប់ឃ្លាំងដោយមានមិនអាចត្រូវបានបម្លែងទៅជាក្រុម។
 DocType: Assessment Result Tool,Result HTML,លទ្ធផលរបស់ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ផុតកំណត់នៅថ្ងៃទី
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,បន្ថែមសិស្ស
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,បន្ថែមសិស្ស
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},សូមជ្រើស {0}
 DocType: C-Form,C-Form No,ទម្រង់បែបបទគ្មាន C-
 DocType: BOM,Exploded_items,Exploded_items
@@ -2725,7 +2732,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ជ្រើសឆ្នាំសារពើពន្ធ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,រៀបចំវគ្គ
 DocType: Company,Chart Of Accounts Template,តារាងនៃគណនីទំព័រគំរូ
 DocType: Attendance,Attendance Date,ការចូលរួមកាលបរិច្ឆេទ
@@ -2740,14 +2747,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ធាតុស្ទួន
 DocType: Program Enrollment Tool,Get Students,ទទួលយកនិស្សិត
 DocType: Serial No,Under Warranty,នៅក្រោមការធានា
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[កំហុសក្នុងការ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[កំហុសក្នុងការ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាសណ្តាប់ធ្នាប់ការលក់។
 ,Employee Birthday,បុគ្គលិកខួបកំណើត
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ឧបករណ៍វត្តមានបាច់សិស្ស
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ដែនកំណត់កាត់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,យ្រប
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,មួយរយៈសិក្សាជាមួយនេះ &quot;ឆ្នាំសិក្សា&quot; {0} និង &#39;ឈ្មោះរយៈពេល&#39; {1} រួចហើយ។ សូមកែប្រែធាតុទាំងនេះនិងព្យាយាមម្ដងទៀត។
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ដូចជាមានការប្រតិបតិ្តការដែលមានស្រាប់ប្រឆាំងនឹងធាតុ {0}, អ្នកមិនអាចផ្លាស់ប្តូរតម្លៃនៃ {1}"
 DocType: UOM,Must be Whole Number,ត្រូវតែជាលេខទាំងមូល
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ស្លឹកថ្មីដែលបានបម្រុងទុក (ក្នុងថ្ងៃ)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,សៀរៀលគ្មាន {0} មិនមាន
@@ -2767,7 +2774,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% នៃសមា្ភារៈ billed នឹងដីកាសម្រេចការលក់នេះ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ចូលរយៈពេលបិទ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ជាមួយនឹងការប្រតិបត្តិការនៃមជ្ឈមណ្ឌលការចំណាយដែលមានស្រាប់ដែលមិនអាចត្រូវបានបម្លែងទៅជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},ចំនួនទឹកប្រាក់ {0} {1} {2} {3}
 DocType: Account,Depreciation,រំលស់
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ក្រុមហ៊ុនផ្គត់ផ្គង់ (s បាន)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ឧបករណ៍វត្តមានបុគ្គលិក
@@ -2790,7 +2797,7 @@
 DocType: Supplier,Last Day of the Next Month,ចុងក្រោយកាលពីថ្ងៃនៃខែបន្ទាប់
 DocType: Support Settings,Auto close Issue after 7 days,ដោយស្វ័យប្រវត្តិបន្ទាប់ពីបញ្ហានៅជិត 7 ថ្ងៃ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ទុកឱ្យមិនអាចត្រូវបានបម្រុងទុកមុន {0}, ដែលជាតុល្យភាពការឈប់សម្រាកបានជាទំនិញ-បានបញ្ជូនបន្តនៅក្នុងកំណត់ត្រាការបែងចែកការឈប់សម្រាកនាពេលអនាគតរួចទៅហើយ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ចំណាំ: ដោយសារតែ / សេចក្តីយោងកាលបរិច្ឆេទលើសពីអនុញ្ញាតឱ្យថ្ងៃឥណទានរបស់អតិថិជនដោយ {0} ថ្ងៃ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ពាក្យសុំរបស់សិស្ស
 DocType: Asset Category Account,Accumulated Depreciation Account,គណនីរំលស់បង្គរ
 DocType: Stock Settings,Freeze Stock Entries,ធាតុបង្កហ៊ុន
@@ -2801,7 +2808,7 @@
 ,Stock Analytics,ភាគហ៊ុនវិភាគ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ប្រតិបត្តិការមិនអាចត្រូវបានទុកឱ្យនៅទទេ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ពត៌មានលំអិតរបស់ឯកសារគ្មានការប្រឆាំងនឹងការ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,គណបក្សជាការចាំបាច់ប្រភេទ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,គណបក្សជាការចាំបាច់ប្រភេទ
 DocType: Quality Inspection,Outgoing,ចេញ
 DocType: Material Request,Requested For,ស្នើសម្រាប់
 DocType: Quotation Item,Against Doctype,ប្រឆាំងនឹងការ DOCTYPE
@@ -2818,11 +2825,11 @@
 DocType: Asset,Item Code,ក្រមធាតុ
 DocType: Production Planning Tool,Create Production Orders,បង្កើតការបញ្ជាទិញផលិតកម្ម
 DocType: Serial No,Warranty / AMC Details,ការធានា / AMC ពត៌មានលំអិត
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ជ្រើសរើសសិស្សនិស្សិតដោយដៃសម្រាប់សកម្មភាពដែលមានមូលដ្ឋាននៅក្រុម
 DocType: Journal Entry,User Remark,សំគាល់របស់អ្នកប្រើ
 DocType: Lead,Market Segment,ចំណែកទីផ្សារ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ចំនួនទឹកប្រាក់ដែលត្រូវចំណាយប្រាក់មិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់សរុបអវិជ្ជមាន {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ប្រវត្តិការងាររបស់បុគ្គលិកផ្ទៃក្នុង
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),បិទ (លោកបណ្ឌិត)
 DocType: Cheque Print Template,Cheque Size,ទំហំមូលប្បទានប័ត្រ
@@ -2837,7 +2844,7 @@
 DocType: Production Planning Tool,Create Material Requests,បង្កើតសម្ភារៈសំណើ
 DocType: Employee Education,School/University,សាលា / សាកលវិទ្យាល័យ University
 DocType: Payment Request,Reference Details,សេចក្តីយោងលំអិត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,តម្លៃបានគេរំពឹងថាបន្ទាប់ពីជីវិតដែលមានប្រយោជន៍ត្រូវតែមានតិចជាងចំនួនទឹកប្រាក់ទិញសរុប
 DocType: Sales Invoice Item,Available Qty at Warehouse,ដែលអាចប្រើបាន Qty នៅឃ្លាំង
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ចំនួនទឹកប្រាក់ដែលបានផ្សព្វផ្សាយ
 DocType: Asset,Double Declining Balance,ការធ្លាក់ចុះទ្វេដងតុល្យភាព
@@ -2858,20 +2865,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",គណនីមានភាពខុសគ្នាត្រូវតែជាគណនីប្រភេទទ្រព្យសកម្ម / ការទទួលខុសត្រូវចាប់តាំងពីការផ្សះផ្សានេះគឺផ្សារភាគហ៊ុនការបើកជាមួយធាតុ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ចំនួនទឹកប្រាក់ដែលបានចំណាយមិនអាចមានប្រាក់កម្ចីចំនួនធំជាង {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ទិញចំនួនលំដាប់ដែលបានទាមទារសម្រាប់ធាតុ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,លំដាប់ផលិតកម្មមិនត្រូវបានបង្កើត
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;ពីកាលបរិច្ឆេទ&quot; ត្រូវតែមានបន្ទាប់ &#39;ដើម្បីកាលបរិច្ឆេទ &quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},មិនអាចផ្លាស់ប្តូរស្ថានភាពជានិស្សិត {0} ត្រូវបានផ្សារភ្ជាប់ជាមួយនឹងកម្មវិធីនិស្សិត {1}
 DocType: Asset,Fully Depreciated,ធ្លាក់ថ្លៃយ៉ាងពេញលេញ
 ,Stock Projected Qty,គម្រោង Qty ផ្សារភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},អតិថិជន {0} មិនមែនជារបស់គម្រោង {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,វត្តមានដែលបានសម្គាល់ជា HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",ដកស្រង់សំណើដេញថ្លៃដែលអ្នកបានផ្ញើទៅឱ្យអតិថិជនរបស់អ្នក
 DocType: Sales Order,Customer's Purchase Order,ទិញលំដាប់របស់អតិថិជន
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,សៀរៀលទេនិងបាច់ &amp; ‧;
 DocType: Warranty Claim,From Company,ពីក្រុមហ៊ុន
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ផលបូកនៃពិន្ទុវាយតំលៃត្រូវការដើម្បីឱ្យមាន {0} ។
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,តំលៃឬ Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,សូមកំណត់ចំនួននៃរំលស់បានកក់
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,តំលៃឬ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ការបញ្ជាទិញផលិតផលនេះមិនអាចត្រូវបានលើកឡើងសម្រាប់:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,នាទី
 DocType: Purchase Invoice,Purchase Taxes and Charges,ទិញពន្ធនិងការចោទប្រកាន់
@@ -2883,7 +2890,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,ឃ្លាំងទាំងអស់
 DocType: Sales Partner,Retailer,ការលក់រាយ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,ឥណទានទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រប់ប្រភេទ
 DocType: Global Defaults,Disable In Words,បិទនៅក្នុងពាក្យ
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,ក្រមធាតុគឺជាចាំបាច់ដោយសារតែធាតុបង់លេខដោយស្វ័យប្រវត្តិគឺមិន
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},សម្រង់ {0} មិនត្រូវបាននៃប្រភេទ {1}
@@ -2892,6 +2899,7 @@
 DocType: Production Order,PRO-,គាំទ្រ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ធនាគាររូបារូប
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ធ្វើឱ្យប្រាក់ខែគ្រូពេទ្យប្រហែលជា
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ជួរដេក # {0}: ចំនួនទឹកប្រាក់ដែលបានបម្រុងទុកមិនអាចច្រើនជាងចំនួនពូកែ។
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,រកមើល Bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,ការផ្តល់កម្ចីដែលមានសុវត្ថិភាព
 DocType: Purchase Invoice,Edit Posting Date and Time,កែសម្រួលប្រកាសកាលបរិច្ឆេទនិងពេលវេលា
@@ -2931,7 +2939,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},មិនត្រូវបានអនុញ្ញាតឱ្យធ្វើបច្ចុប្បន្នភាពប្រតិបតិ្តការភាគហ៊ុនចាស់ជាង {0}
 DocType: Purchase Invoice Item,PR Detail,ពត៌មាននៃការិយាល័យទទួលជំនួយផ្ទាល់
 DocType: Sales Order,Fully Billed,ផ្សព្វផ្សាយឱ្យបានពេញលេញ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},សូមកំណត់គណនីបង់លំនាំដើមនៅក្នុងនិយោជិត {0}
 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 +127,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),ទំងន់សរុបនៃកញ្ចប់។ ជាធម្មតាមានទម្ងន់សុទ្ធ + + ការវេចខ្ចប់មានទម្ងន់សម្ភារៈ។ (សម្រាប់ការបោះពុម្ព)
@@ -2942,7 +2949,7 @@
 DocType: Student Group,Group Based On,ដែលមានមូលដ្ឋាននៅលើគ្រុប
 DocType: Journal Entry,Bill Date,លោក Bill កាលបរិច្ឆេទ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ធាតុសេវា, ប្រភេទភាពញឹកញាប់និងចំនួនទឹកប្រាក់ក្នុងការចំណាយគឺត្រូវបានទាមទារ"
-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:",បើទោះបីជាមានច្បាប់តម្លៃច្រើនដែលមានអាទិភាពខ្ពស់បំផុតបន្ទាប់មកបន្ទាប់ពីមានអាទិភាពផ្ទៃក្នុងត្រូវបានអនុវត្ត:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",បើទោះបីជាមានច្បាប់តម្លៃច្រើនដែលមានអាទិភាពខ្ពស់បំផុតបន្ទាប់មកបន្ទាប់ពីមានអាទិភាពផ្ទៃក្នុងត្រូវបានអនុវត្ត:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},តើអ្នកពិតជាចង់ដាក់ស្នើប័ណ្ណប្រាក់ទាំងអស់ពី {0} ទៅ {1}
 DocType: Cheque Print Template,Cheque Height,កម្ពស់មូលប្បទានប័ត្រ
 DocType: Supplier,Supplier Details,ពត៌មានលំអិតក្រុមហ៊ុនផ្គត់ផ្គង់
@@ -2954,7 +2961,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref វិក័យប័ត្រ
 DocType: Purchase Order,Recurring Order,លំដាប់កើតឡើង
 DocType: Company,Default Income Account,គណនីចំណូលលំនាំដើម
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ក្រុមផ្ទាល់ខ្លួន / អតិថិជន
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),unclosed សារពើពន្ធឆ្នាំប្រាក់ចំណេញ / បាត់បង់ (ឥណទាន)
 DocType: Sales Invoice,Time Sheets,តារាងពេលវេលា
 DocType: Payment Gateway Account,Default Payment Request Message,លំនាំដើមរបស់សារស្នើសុំការទូទាត់
@@ -2974,10 +2981,10 @@
 DocType: Notification Control,Quotation Message,សារសម្រង់
 DocType: Employee Loan,Employee Loan Application,កម្មវិធីបុគ្គលិកឥណទាន
 DocType: Issue,Opening Date,ពិធីបើកកាលបរិច្ឆេទ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,ការចូលរួមត្រូវបានគេបានសម្គាល់ដោយជោគជ័យ។
 DocType: Journal Entry,Remark,សំគាល់
 DocType: Purchase Receipt Item,Rate and Amount,អត្រាការប្រាក់និងចំនួន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ប្រភេទគណនីសម្រាប់ {0} ត្រូវតែជា {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ប្រភេទគណនីសម្រាប់ {0} ត្រូវតែជា {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ស្លឹកនិងថ្ងៃឈប់សម្រាក
 DocType: School Settings,Current Academic Term,រយៈពេលសិក្សាបច្ចុប្បន្ន
 DocType: School Settings,Current Academic Term,រយៈពេលសិក្សាបច្ចុប្បន្ន
@@ -3000,7 +3007,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ក្រុមនិស្សិត
 DocType: Shopping Cart Settings,Quotation Series,សម្រង់កម្រងឯកសារ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ធាតុមួយមានឈ្មោះដូចគ្នា ({0}), សូមផ្លាស់ប្តូរឈ្មោះធាតុឬប្ដូរឈ្មោះក្រុមធាតុ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,សូមជ្រើសអតិថិជន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,សូមជ្រើសអតិថិជន
 DocType: C-Form,I,ខ្ញុំ
 DocType: Company,Asset Depreciation Cost Center,មជ្ឈមណ្ឌលតម្លៃរំលស់ទ្រព្យសម្បត្តិ
 DocType: Sales Order Item,Sales Order Date,លំដាប់ការលក់កាលបរិច្ឆេទ
@@ -3019,20 +3026,20 @@
 DocType: Vehicle,Insurance Details,សេចក្ដីលម្អិតការធានារ៉ាប់រង
 DocType: Account,Payable,បង់
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,សូមបញ្ចូលរយៈពេលសងប្រាក់
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),កូនបំណុល ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),កូនបំណុល ({0})
 DocType: Pricing Rule,Margin,រឹម
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,អតិថិជនថ្មី
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ប្រាក់ចំណេញ% សរុបបាន
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,កាលបរិច្ឆេទបោសសំអាត
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ចំនួនទឹកប្រាក់ការទិញសរុបគឺជាការចាំបាច់
 DocType: Lead,Address Desc,អាសយដ្ឋាន DESC
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,គណបក្សជាការចាំបាច់
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,គណបក្សជាការចាំបាច់
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ប្រធានបទឈ្មោះ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,យ៉ាងហោចណាស់មួយនៃការលក់ឬទិញត្រូវតែត្រូវបានជ្រើស &amp; ‧;
-DocType: Grading Structure,Grade Intervals,ចន្លោះពេលថ្នាក់ទី
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ជ្រើសធម្មជាតិនៃអាជីវកម្មរបស់អ្នក។
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},ជួរដេក # {0}: ស្ទួនធាតុនៅក្នុងឯកសារយោង {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ដែលជាកន្លែងដែលប្រតិបត្ដិការផលិតត្រូវបានអនុវត្ត។
 DocType: Asset Movement,Source Warehouse,ឃ្លាំងប្រភព
 DocType: Installation Note,Installation Date,កាលបរិច្ឆេទនៃការដំឡើង
@@ -3069,7 +3076,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ប្រមុខលិខិតសម្រាប់ពុម្ពអក្សរ។
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ការផ្តល់ប័ណ្ណសម្រាប់ពុម្ពដែលបោះពុម្ពឧ Proforma វិក័យប័ត្រ។
 DocType: Student Guardian,Student Guardian,អាណាព្យាបាលរបស់សិស្ស
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,ការចោទប្រកាន់មិនអាចវាយតម្លៃប្រភេទសម្គាល់ថាជាការរួមបញ្ចូល
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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
@@ -3097,7 +3104,7 @@
 DocType: Company,Exchange Gain / Loss Account,គណនីប្តូរប្រាក់ចំណេញ / បាត់បង់
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,បុគ្គលិកនិងការចូលរួម
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},គោលបំណងត្រូវតែជាផ្នែកមួយនៃ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,បំពេញសំណុំបែបបទនិងរក្សាទុកវា
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,វេទិកាសហគមន៍
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,ជាក់ស្តែងនៅក្នុងស្តុក qty
@@ -3113,7 +3120,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,រៀបចំ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ការងារបច្ចុប្បន្ន
 DocType: Company,Stock Adjustment Account,គណនីកែតម្រូវភាគហ៊ុន
-DocType: Journal Entry,Write Off,បិទការសរសេរ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,បិទការសរសេរ
 DocType: Timesheet Detail,Operation 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}
@@ -3124,27 +3131,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ក្រុមហ៊ុនផ្គត់ផ្គង់បានផ្ដល់នូវការទៅឱ្យអតិថិជន
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# សំណុំបែបបទ / ធាតុ / {0}) គឺចេញពីស្តុក
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,កាលបរិច្ឆេទបន្ទាប់ត្រូវតែធំជាងកាលបរិច្ឆេទប្រកាស
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,សម្រាកឡើងពន្ធលើការបង្ហាញ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ដោយសារ / សេចក្តីយោងកាលបរិច្ឆេទមិនអាចបន្ទាប់ពី {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,នាំចូលទិន្នន័យនិងការនាំចេញ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ផ្សារភាគហ៊ុនមានការប្រឆាំងនឹងធាតុឃ្លាំង {0}, ហេតុនេះអ្នកមិនអាចឡើងវិញបានផ្តល់តម្លៃឬកែប្រែវា"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,គ្មានសិស្សនិស្សិតបានរកឃើញ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,កាលបរិច្ឆេទវិក្ក័យប័ត្រ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,លក់
 DocType: Sales Invoice,Rounded Total,សរុបមានរាងមូល
 DocType: Product Bundle,List items that form the package.,ធាតុបញ្ជីដែលបង្កើតជាកញ្ចប់។
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ការបែងចែកគួរតែស្មើជាភាគរយទៅ 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,សូមជ្រើសរើសកាលបរិច្ឆេទមុនការជ្រើសគណបក្ស
 DocType: Program Enrollment,School House,សាលាផ្ទះ
 DocType: Serial No,Out of AMC,ចេញពីមជ្ឈមណ្ឌល AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,សូមជ្រើសសម្រង់សម្តី
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ចំនួននៃការធ្លាក់ចុះបានកក់មិនអាចច្រើនជាងចំនួនសរុបនៃការធ្លាក់ថ្លៃ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ធ្វើឱ្យការថែទាំទស្សនកិច្ច
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,សូមទាក់ទងទៅអ្នកប្រើដែលមានការលក់កម្មវិធីគ្រប់គ្រងអនុបណ្ឌិតតួនាទី {0}
 DocType: Company,Default Cash Account,គណនីសាច់ប្រាក់លំនាំដើម
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ក្រុមហ៊ុន (មិនមានអតិថិជនឬផ្គត់) មេ។
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់សិស្សនេះ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,គ្មានសិស្សនៅក្នុង
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,បន្ថែមធាតុបន្ថែមឬទម្រង់ពេញលេញបើកចំហ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',សូមបញ្ចូល &#39;កាលបរិច្ឆេទដឹកជញ្ជូនរំពឹងទុក &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ភក្ដិកំណត់ត្រាកំណត់ការដឹកជញ្ជូន {0} ត្រូវតែបានលុបចោលមុនពេលលុបចោលការបញ្ជាលក់នេះ
@@ -3176,6 +3184,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ធាតុ 3
 DocType: Purchase Order,Customer Contact Email,ទំនាក់ទំនងអតិថិជនអ៊ីម៉ែល
 DocType: Warranty Claim,Item and Warranty Details,លម្អិតអំពីធាតុនិងការធានា
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,កូដធាតុ&gt; ធាតុគ្រុប&gt; ម៉ាក
 DocType: Sales Team,Contribution (%),ចំែណក (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ចំណាំ: ការទូទាត់នឹងមិនចូលត្រូវបានបង្កើតតាំងពីសាច់ប្រាក់ឬគណនីធនាគារ &#39;មិនត្រូវបានបញ្ជាក់
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,ជ្រើសកម្មវិធីទៅយកវគ្គសិក្សាជាចាំបាច់នោះ។
@@ -3191,9 +3200,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,មុនពេលការផ្សះផ្សាជាតិ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ដើម្បី {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ពន្ធនិងការចោទប្រកាន់បន្ថែម (ក្រុមហ៊ុនរូបិយវត្ថុ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ជួរដេកពន្ធធាតុ {0} ត្រូវតែមានគណនីនៃប្រភេទពន្ធឬប្រាក់ចំណូលឬការចំណាយឬបន្ទុក
 DocType: Sales Order,Partly Billed,ផ្សព្វផ្សាយមួយផ្នែក
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ធាតុ {0} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ធាតុ {0} ត្រូវតែជាទ្រព្យសកម្មមួយដែលមានកាលកំណត់ធាតុ
 DocType: Item,Default BOM,Bom លំនាំដើម
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,សូមប្រភេទឈ្មោះរបស់ក្រុមហ៊ុនដើម្បីបញ្ជាក់
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,សរុបឆ្នើម AMT
@@ -3203,8 +3212,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,រថយន្ដ
 DocType: Vehicle,Insurance Company,ក្រុមហ៊ុនធានារ៉ាប់រង
 DocType: Asset Category Account,Fixed Asset Account,គណនីទ្រព្យសកម្មថេរ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,អថេរ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,អថេរ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ពីការដឹកជញ្ជូនចំណាំ
 DocType: Student,Student Email Address,អាសយដ្ឋានអ៊ីមែលរបស់សិស្ស
 DocType: Timesheet Detail,From Time,ចាប់ពីពេលវេលា
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,នៅក្នុងស្តុក:
@@ -3216,12 +3225,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,តារាងតម្លៃអត្រាប្តូរប្រាក់
 DocType: Purchase Invoice Item,Rate,អត្រាការប្រាក់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ហាត់ការ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ឈ្មោះអាសយដ្ឋាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ឈ្មោះអាសយដ្ឋាន
 DocType: Stock Entry,From BOM,ចាប់ពី Bom
 DocType: Assessment Code,Assessment Code,ក្រមការវាយតំលៃ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ជាមូលដ្ឋាន
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ប្រតិបតិ្តការភាគហ៊ុនមុនពេល {0} ត្រូវបានជាប់គាំង
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',សូមចុចលើ &#39;បង្កើតកាលវិភាគ &quot;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ឧគីឡូក្រាម, អង្គភាព, NOS លោកម៉ែត្រ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,សេចក្តីយោងមិនមានជាការចាំបាច់បំផុតប្រសិនបើអ្នកបានបញ្ចូលសេចក្តីយោងកាលបរិច្ឆេទ
 DocType: Bank Reconciliation Detail,Payment Document,ឯកសារការទូទាត់
@@ -3229,19 +3238,19 @@
 DocType: Salary Slip,Salary Structure,រចនាសម្ព័ន្ធប្រាក់បៀវត្ស
 DocType: Account,Bank,ធនាគារ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ក្រុមហ៊ុនអាកាសចរណ៍
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,សម្ភារៈបញ្ហា
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,សម្ភារៈបញ្ហា
 DocType: Material Request Item,For Warehouse,សម្រាប់ឃ្លាំង
 DocType: Employee,Offer Date,ការផ្តល់ជូនកាលបរិច្ឆេទ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,សម្រង់ពាក្យ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,អ្នកគឺជាអ្នកនៅក្នុងរបៀបក្រៅបណ្ដាញ។ អ្នកនឹងមិនអាចផ្ទុកឡើងវិញរហូតដល់អ្នកមានបណ្តាញ។
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,គ្មានក្រុមនិស្សិតបានបង្កើត។
 DocType: Purchase Invoice Item,Serial No,សៀរៀលគ្មាន
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ចំនួនទឹកប្រាក់ដែលត្រូវសងប្រចាំខែមិនអាចត្រូវបានធំជាងចំនួនទឹកប្រាក់ឥណទាន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,សូមបញ្ចូលព័ត៌មានលំអិត Maintaince លើកដំបូង
 DocType: Purchase Invoice,Print Language,បោះពុម្ពភាសា
 DocType: Salary Slip,Total Working Hours,ម៉ោងធ្វើការសរុប
 DocType: Stock Entry,Including items for sub assemblies,អនុដែលរួមមានធាតុសម្រាប់សភា
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,បញ្ចូលតម្លៃត្រូវតែវិជ្ជមាន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ទឹកដីទាំងអស់
 DocType: Purchase Invoice,Items,ធាតុ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,និស្សិតត្រូវបានចុះឈ្មោះរួចហើយ។
@@ -3261,17 +3270,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',អង្គភាពលំនាំដើមនៃវិធានការសម្រាប់វ៉ារ្យង់ &#39;{0} &quot;ត្រូវតែមានដូចគ្នានៅក្នុងទំព័រគំរូ&#39; {1} &#39;
 DocType: Shipping Rule,Calculate Based On,គណនាមូលដ្ឋាននៅលើ
 DocType: Delivery Note Item,From Warehouse,ចាប់ពីឃ្លាំង
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,គ្មានធាតុជាមួយលោក Bill នៃសម្ភារៈដើម្បីផលិត
 DocType: Assessment Plan,Supervisor Name,ឈ្មោះអ្នកគ្រប់គ្រង
 DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
 DocType: Program Enrollment Course,Program Enrollment Course,កម្មវិធីវគ្គបណ្តុះបណ្តាលចុះឈ្មោះ
-DocType: Grading Structure,Grading Structure,រចនាសម្ព័ន្ធការដាក់ពិន្ទុ
 DocType: Purchase Taxes and Charges,Valuation and Total,ការវាយតម្លៃនិងសរុប
 DocType: Tax Rule,Shipping City,ការដឹកជញ្ជូនក្នុងទីក្រុង
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ធាតុនេះគឺវ៉ារ្យ៉ង់មួយនៃ {0} (គំរូ) ។ គុណលក្ខណៈដែលនឹងត្រូវបានចម្លងពីទំព័រគំរូនេះទេលុះត្រា &#39;គ្មាន&#39; ចម្លង &#39;ត្រូវបានកំណត់
 DocType: Notification Control,Customize the Notification,ប្ដូរតាមសេចក្តីជូនដំណឹងនេះ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,លំហូរសាច់ប្រាក់ពីការប្រតិបត្ដិការ
 DocType: Sales Invoice,Shipping Rule,វិធានការដឹកជញ្ជូន
@@ -3292,8 +3299,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},គ្មាន Bom លំនាំដើមសម្រាប់ធាតុមាន {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,សូមជ្រើសរើសកាលបរិច្ឆេទដំបូងគេបង្អស់
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,បើកកាលបរិច្ឆេទគួរតែមានមុនកាលបរិចេ្ឆទផុតកំណត់
 DocType: Leave Control Panel,Carry Forward,អនុវត្តការទៅមុខ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,មជ្ឈមណ្ឌលប្រាក់ដែលមានស្រាប់ការចំណាយដែលមិនអាចត្រូវបានបម្លែងទៅជាសៀវភៅ
 DocType: Department,Days for which Holidays are blocked for this department.,ថ្ងៃដែលថ្ងៃឈប់សម្រាកត្រូវបានបិទសម្រាប់នាយកដ្ឋាននេះ។
@@ -3306,7 +3313,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ភ្ជាប់ក្បាលលិខិត
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ការទំនាក់ទំនងចុងក្រោយ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ការទំនាក់ទំនងចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',មិនអាចធ្វើការកាត់កងនៅពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;វាយតម្លៃនិងសរុប
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},Nos ដែលត្រូវការសម្រាប់ធាតុសៀរៀលសៀរៀល {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,វិកិយប័ត្រទូទាត់ប្រកួតជាមួយ
@@ -3322,7 +3329,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),សរុប (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,"ការកំសាន្ត, ការលំហែ"
 DocType: Quality Inspection,Item Serial No,គ្មានសៀរៀលធាតុ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,បង្កើតកំណត់ត្រាបុគ្គលិក
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,បង្កើតកំណត់ត្រាបុគ្គលិក
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,បច្ចុប្បន្នសរុប
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,របាយការណ៍គណនី
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ហួរ
@@ -3335,10 +3342,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,មិនស្គាល់
 DocType: Shipping Rule,Shipping Rule Conditions,ការដឹកជញ្ជូនវិធានលក្ខខណ្ឌ
 DocType: BOM Replace Tool,The new BOM after replacement,នេះបន្ទាប់ពីការជំនួស Bom
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ចំណុចនៃការលក់
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,ចំណុចនៃការលក់
 DocType: Payment Entry,Received Amount,ទទួលបានចំនួនទឹកប្រាក់
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,សូមរៀបចំបុគ្គលិកដាក់ឈ្មោះប្រព័ន្ធជាធនធានមនុ&gt; ការកំណត់ធនធានមនុស្ស
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","បង្កើតសម្រាប់បរិមាណពេញលេញ, មិនអើពើនឹងការបញ្ជាទិញរួចទៅហើយបរិមាណ"
 DocType: Account,Tax,ការបង់ពន្ធ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,មិនត្រូវបានសម្គាល់
@@ -3351,9 +3356,9 @@
 DocType: Batch,Source Document Name,ឈ្មោះឯកសារប្រភព
 DocType: Batch,Source Document Name,ឈ្មោះឯកសារប្រភព
 DocType: Job Opening,Job Title,ចំណងជើងការងារ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,បង្កើតអ្នកប្រើ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,បង្កើតអ្នកប្រើ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ក្រាម
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,បរិមាណដែលត្រូវទទួលទានក្នុងការផលិតត្រូវតែធំជាង 0 ។
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,សូមចូលទស្សនារបាយការណ៍សម្រាប់ការហៅថែទាំ។
 DocType: Stock Entry,Update Rate and Availability,អត្រាធ្វើឱ្យទាន់សម័យនិងអាចរកបាន
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ចំនួនភាគរយដែលអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបានច្រើនជាងការប្រឆាំងនឹងឬផ្តល់នូវបរិមាណបញ្ជាឱ្យ។ ឧទាហរណ៍: ប្រសិនបើអ្នកបានបញ្ជាឱ្យបាន 100 គ្រឿង។ និងអនុញ្ញាតឱ្យរបស់អ្នកគឺ 10% បន្ទាប់មកលោកអ្នកត្រូវបានអនុញ្ញាតឱ្យទទួលបាន 110 គ្រឿង។
@@ -3363,28 +3368,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},គណនីក្នុងការចំណាយជាការចាំបាច់សម្រាប់ធាតុ {0}
 DocType: BOM,Website Description,វេបសាយការពិពណ៌នាសង្ខេប
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ការផ្លាស់ប្តូរសុទ្ធនៅសមភាព
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,សូមបោះបង់ការទិញវិក័យប័ត្រ {0} ដំបូង
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","អាសយដ្ឋានអ៊ីមែលត្រូវតែមានតែមួយគត់, រួចហើយសម្រាប់ {0}"
 DocType: Serial No,AMC Expiry Date,កាលបរិច្ឆេទ AMC ផុតកំណត់
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,វិក័យប័ត្រ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,វិក័យប័ត្រ
 ,Sales Register,ការលក់ចុះឈ្មោះ
 DocType: Daily Work Summary Settings Company,Send Emails At,ផ្ញើអ៊ីម៉ែល
 DocType: Quotation,Quotation Lost Reason,សម្រង់បាត់បង់មូលហេតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,ជ្រើសដែនរបស់អ្នក
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},សេចក្ដីយោងប្រតិបត្តិការមិនមាន {0} {1} ចុះកាលបរិច្ឆេទ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,មិនមានអ្វីដើម្បីកែសម្រួលទេ។
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,សង្ខេបសម្រាប់ខែនេះនិងសកម្មភាពដែលមិនទាន់សម្រេច
 DocType: Customer Group,Customer Group Name,ឈ្មោះក្រុមអតិថិជន
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,គ្មានអតិថិជននៅឡើយទេ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,សេចក្តីថ្លែងការណ៍លំហូរសាច់ប្រាក់
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ចំនួនទឹកប្រាក់កម្ចីមិនអាចលើសពីចំនួនទឹកប្រាក់កម្ចីអតិបរមានៃ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,អាជ្ញាប័ណ្ណ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},សូមយកវិក័យប័ត្រនេះ {0} ពី C-សំណុំបែបបទ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,សូមបញ្ចូលបិទសរសេរគណនី
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,លំដាប់ចុងក្រោយកាលបរិច្ឆេទ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},គណនី {0} មិនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,លេខសៀរៀលនៅក្នុងជួរដេក {0} មិនផ្គូផ្គងនឹងការដឹកជញ្ជូនចំណាំ
 DocType: Student,Guardian Details,កាសែត Guardian លំអិត
 DocType: C-Form,C-Form,C-សំណុំបែបបទ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,លោក Mark វត្តមានសម្រាប់បុគ្គលិកច្រើន
@@ -3408,20 +3415,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ជួរដេក {0} # គណនីត្រូវតែមានប្រភេទ &quot;ទ្រព្យ&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ចេញ Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,វិធានដើម្បីគណនាចំនួនដឹកជញ្ជូនសម្រាប់លក់
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,កម្រងឯកសារចាំបាច់
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,កម្រងឯកសារចាំបាច់
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,សេវាហិរញ្ញវត្ថុ
 DocType: Student Sibling,Student ID,លេខសម្គាល់របស់សិស្ស
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ប្រភេទនៃសកម្មភាពសម្រាប់កំណត់ហេតុម៉ោង
 DocType: Tax Rule,Sales,ការលក់
 DocType: Stock Entry Detail,Basic Amount,ចំនួនទឹកប្រាក់ជាមូលដ្ឋាន
 DocType: Training Event,Exam,ការប្រឡង
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ឃ្លាំងដែលបានទាមទារសម្រាប់ធាតុភាគហ៊ុន {0}
 DocType: Leave Allocation,Unused leaves,ស្លឹកមិនប្រើ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,CR
 DocType: Tax Rule,Billing State,រដ្ឋវិក័យប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,សេវាផ្ទេរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} មិនបានភ្ជាប់ជាមួយគណនីរបស់គណបក្ស {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} មិនបានភ្ជាប់ជាមួយគណនីរបស់គណបក្ស {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),យក Bom ផ្ទុះ (រួមបញ្ចូលទាំងសភាអនុ)
 DocType: Authorization Rule,Applicable To (Employee),ដែលអាចអនុវត្តទៅ (បុគ្គលិក)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,កាលបរិច្ឆេទដល់កំណត់គឺជាចាំបាច់
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ចំនួនបន្ថែមសម្រាប់គុណលក្ខណៈ {0} មិនអាចជា 0
@@ -3432,13 +3439,13 @@
 ,Inactive Customers,អតិថិជនអសកម្ម
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,បង្កាន់ដៃទិញ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,តើធ្វើដូចម្តេចតម្លៃវិធានត្រូវបានអនុវត្ត?
 DocType: Stock Entry,Delivery Note No,ដឹកជញ្ជូនចំណាំគ្មាន
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",ប្រសិនបើបានធីកនោះមានតែសំណើសម្ភារៈសម្រាប់ទិញវត្ថុធាតុដើមចុងក្រោយនឹងត្រូវបានរួមបញ្ចូលនៅក្នុងសំណើសម្ភារៈ។ បើមិនដូច្នោះទេសំណើសម្ភារៈសម្រាប់ធាតុមេនឹងត្រូវបានបង្កើតឡើង
 DocType: Cheque Print Template,Message to show,សារសម្រាប់បង្ហាញ
 DocType: Company,Retail,ការលក់រាយ
 DocType: Attendance,Absent,អវត្តមាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,កញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,កញ្ចប់ផលិតផល
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ជួរដេក {0}: សេចក្ដីយោងមិនត្រឹមត្រូវ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ទិញពន្ធនិងការចោទប្រកាន់ពីទំព័រគំរូ
 DocType: Upload Attendance,Download Template,ទំព័រគំរូទាញយក
@@ -3448,10 +3455,10 @@
 DocType: Payment Entry,Account Paid From,គណនីបង់ពី
 DocType: Purchase Order Item Supplied,Raw Material Item Code,លេខកូដធាតុវត្ថុធាតុដើម
 DocType: Journal Entry,Write Off Based On,បិទការសរសេរមូលដ្ឋាននៅលើ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ធ្វើឱ្យការនាំមុខ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ធ្វើឱ្យការនាំមុខ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,បោះពុម្ពនិងការិយាល័យ
 DocType: Stock Settings,Show Barcode Field,បង្ហាញវាលលេខកូដ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ផ្ញើអ៊ីម៉ែលផ្គត់ផ្គង់
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ប្រាក់បៀវត្សដែលបានដំណើរការរួចទៅហើយសម្រាប់សម័យនេះរវាង {0} និង {1}, ទុកឱ្យរយៈពេលកម្មវិធីមិនអាចមានរវាងជួរកាលបរិច្ឆេទនេះ។"
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,កំណត់ត្រាអំពីការដំឡើងសម្រាប់លេខស៊េរី
 DocType: Guardian Interest,Guardian Interest,កាសែត The Guardian ការប្រាក់
@@ -3464,6 +3471,7 @@
 DocType: Offer Letter,Awaiting Response,រង់ចាំការឆ្លើយតប
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ខាងលើ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},គុណលក្ខណៈមិនត្រឹមត្រូវ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,និយាយពីប្រសិនបើគណនីត្រូវបង់មិនស្តង់ដារ
 DocType: Salary Slip,Earning & Deduction,ការរកប្រាក់ចំណូលនិងការកាត់បនថយ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ស្រេចចិត្ត។ ការកំណត់នេះនឹងត្រូវបានប្រើដើម្បីត្រងនៅក្នុងប្រតិបត្តិការនានា។
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,អត្រាវាយតម្លៃអវិជ្ជមានមិនត្រូវបានអនុញ្ញាត
@@ -3479,10 +3487,9 @@
 DocType: Production Order Item,Production Order Item,ផលិតកម្មធាតុលំដាប់
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,បានរកឃើញថាគ្មានកំណត់ត្រា
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,តម្លៃនៃទ្រព្យសម្បត្តិបានបោះបង់ចោល
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred ដោយផ្នែក
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: មជ្ឈមណ្ឌលចំណាយគឺជាការចាំបាច់សម្រាប់ធាតុ {2}
 DocType: Vehicle,Policy No,គោលនយោបាយគ្មាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ទទួលបានធាតុពីកញ្ចប់ផលិតផល
 DocType: Asset,Straight Line,បន្ទាត់ត្រង់
 DocType: Project User,Project User,អ្នកប្រើប្រាស់គម្រោង
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ពុះ
@@ -3500,7 +3507,7 @@
 DocType: Program Enrollment Tool,Get Students From,ទទួលយកសិស្សពី
 DocType: Hub Settings,Seller Country,អ្នកលក់ប្រទេស
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,បោះពុម្ពផ្សាយធាតុលើវេបសាយ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ក្រុមនិស្សិតរបស់អ្នកនៅក្នុងជំនាន់
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ក្រុមនិស្សិតរបស់អ្នកនៅក្នុងជំនាន់
 DocType: Authorization Rule,Authorization Rule,វិធានសេចក្តីអនុញ្ញាត
 DocType: Sales Invoice,Terms and Conditions Details,លក្ខខណ្ឌពត៌មានលំអិត
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ជាក់លាក់
@@ -3553,14 +3560,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,កាលបរិច្ឆេទមូលប្បទានប័ត្រ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},គណនី {0}: គណនីមាតាបិតា {1} មិនមែនជាកម្មសិទ្ធិរបស់ក្រុមហ៊ុន: {2}
 DocType: Program Enrollment Tool,Student Applicants,បេក្ខជនសិស្ស
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,ទទួលបានជោគជ័យក្នុងការតិបត្តិការទាំងអស់ដែលបានលុបដែលទាក់ទងទៅនឹងក្រុមហ៊ុននេះ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ដូចជានៅលើកាលបរិច្ឆេទ
 DocType: Appraisal,HR,ធនធានមនុស្ស
 DocType: Program Enrollment,Enrollment Date,កាលបរិច្ឆេទចុះឈ្មោះចូលរៀន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ការសាកល្បង
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,សមាសភាគប្រាក់ខែ
 DocType: Program Enrollment Tool,New Academic Year,ឆ្នាំសិក្សាថ្មី
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,ការវិលត្រឡប់ / ឥណទានចំណាំ
 DocType: Stock Settings,Auto insert Price List rate if missing,បញ្ចូលដោយស្វ័យប្រវត្តិប្រសិនបើអ្នកមានអត្រាតារាងតម្លៃបាត់ខ្លួន
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់សរុប
 DocType: Production Order Item,Transferred Qty,ផ្ទេរ Qty
@@ -3580,7 +3587,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ប្រភេទនៃស្លឹកដូចជាការធម្មតា, ឈឺល"
 DocType: Email Digest,Send regular summary reports via Email.,ផ្ញើរបាយការណ៍សេចក្ដីសង្ខេបជាទៀងទាត់តាមរយៈអ៊ីម៉ែល។
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},សូមកំណត់គណនីលំនាំដើមនៅក្នុងប្រភេទពាក្យបណ្តឹងការចំណាយ {0}
 DocType: Assessment Result,Student Name,ឈ្មោះរបស់និស្សិត
 DocType: Brand,Item Manager,កម្មវិធីគ្រប់គ្រងធាតុ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,បើកប្រាក់បៀវត្សដែលត្រូវបង់
@@ -3601,6 +3608,7 @@
 ,Sales Funnel,ការប្រមូលផ្តុំការលក់
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,អក្សរកាត់គឺជាការចាំបាច់
 DocType: Project,Task Progress,វឌ្ឍនភាពភារកិច្ច
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,រទេះ
 ,Qty to Transfer,qty ដើម្បីផ្ទេរ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ដកស្រង់ដើម្បីដឹកនាំឬអតិថិជន។
 DocType: Stock Settings,Role Allowed to edit frozen stock,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យកែសម្រួលភាគហ៊ុនទឹកកក
@@ -3628,13 +3636,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ពត៌មានលំអិតពន្ធលើដែលមានប្រាជ្ញាធាតុ
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,អក្សរកាត់វិទ្យាស្ថាន
 ,Item-wise Price List Rate,អត្រាតារាងតម្លៃធាតុប្រាជ្ញា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់
 DocType: Quotation,In Words will be visible once you save the Quotation.,នៅក្នុងពាក្យនោះនឹងត្រូវបានមើលឃើញនៅពេលដែលអ្នករក្សាទុកការសម្រង់នេះ។
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},បរិមាណ ({0}) មិនអាចជាប្រភាគក្នុងមួយជួរដេក {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ប្រមូលថ្លៃ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},លេខកូដ {0} ត្រូវបានប្រើរួចហើយនៅក្នុងធាតុ {1}
 DocType: Lead,Add to calendar on this date,បញ្ចូលទៅក្នុងប្រតិទិនស្តីពីកាលបរិច្ឆេទនេះ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ក្បួនសម្រាប់ការបន្ថែមការចំណាយលើការដឹកជញ្ជូន។
 DocType: Item,Opening Stock,ការបើកផ្សារហ៊ុន
@@ -3651,8 +3659,8 @@
 Updated via 'Time Log'",បានបន្ទាន់សម័យតាមរយៈការនៅនាទី &quot;ពេលវេលាកំណត់ហេតុ &#39;
 DocType: Customer,From Lead,បានមកពីអ្នកដឹកនាំ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ការបញ្ជាទិញដែលបានចេញផ្សាយសម្រាប់ការផលិត។
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ជ្រើសឆ្នាំសារពើពន្ធ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ម៉ាស៊ីនឆូតកាតពត៌មានផ្ទាល់ខ្លួនត្រូវបានទាមទារដើម្បីធ្វើឱ្យធាតុរបស់ម៉ាស៊ីនឆូតកាត
 DocType: Program Enrollment Tool,Enroll Students,ចុះឈ្មោះសិស្ស
 DocType: Hub Settings,Name Token,ឈ្មោះនិមិត្តសញ្ញា
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ស្តង់ដាលក់
@@ -3663,7 +3671,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ប្រឆាំងនឹងការលក់វិក័យប័ត្រ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ឈ្មោះគម្រោង
-DocType: Supplier,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
+DocType: Customer,Mention if non-standard receivable account,និយាយពីការប្រសិនបើគណនីដែលមិនមែនជាស្តង់ដាទទួល
 DocType: Journal Entry Account,If Income or Expense,ប្រសិនបើមានប្រាក់ចំណូលឬការចំណាយ
 DocType: Production Order,Required Items,ធាតុដែលបានទាមទារ
 DocType: Stock Ledger Entry,Stock Value Difference,ភាពខុសគ្នាតម្លៃភាគហ៊ុន
@@ -3684,7 +3692,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ធាតុសំណុំក្រុមគោលដៅប្រាជ្ញាសម្រាប់ការនេះការលក់បុគ្គល។
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ភាគហ៊ុនបង្កកចាស់ជាង [ថ្ងៃ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ជួរដេក # {0}: ទ្រព្យសកម្មគឺជាការចាំបាច់សម្រាប់ទ្រព្យសកម្មថេរទិញ / លក់
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",បើសិនជាវិធានតម្លៃពីរឬច្រើនត្រូវបានរកឃើញដោយផ្អែកលើលក្ខខណ្ឌខាងលើអាទិភាពត្រូវបានអនុវត្ត។ អាទិភាពគឺជាលេខរវាង 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.,អនុញ្ញាតឱ្យអ្នកប្រើដូចខាងក្រោមដើម្បីអនុម័តកម្មវិធីសុំច្បាប់សម្រាកសម្រាប់ថ្ងៃប្លុក។
@@ -3710,7 +3718,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ធាតុ {0} មិនអើពើចាប់តាំងពីវាគឺមិនមានធាតុភាគហ៊ុន
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ការមិនអនុវត្តវិធានតម្លៃក្នុងប្រតិបត្តិការពិសេសមួយដែលអនុវត្តបានទាំងអស់ក្បួនតម្លៃគួរតែត្រូវបានបិទ។
 DocType: Assessment Group,Parent Assessment Group,ការវាយតំលៃគ្រុបមាតាបិតា
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,លោក Steve Jobs
 ,Sales Order Trends,ការលក់លំដាប់និន្នាការ
@@ -3721,7 +3729,7 @@
 DocType: Stock Entry Detail,Additional Cost,ការចំណាយបន្ថែមទៀត
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,កាលបរិច្ឆេទឆ្នាំហិរញ្ញវត្ថុបញ្ចប់
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",មិនអាចត្រងដោយផ្អែកលើប័ណ្ណគ្មានប្រសិនបើដាក់ជាក្រុមតាមប័ណ្ណ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,ធ្វើឱ្យសម្រង់ផ្គត់ផ្គង់
 DocType: Quality Inspection,Incoming,មកដល់
 DocType: BOM,Materials Required (Exploded),សំភារៈទាមទារ (ផ្ទុះ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",បន្ថែមអ្នកប្រើប្រាស់ក្នុងអង្គការរបស់អ្នកក្រៅពីខ្លួនអ្នកផ្ទាល់
@@ -3749,6 +3757,7 @@
 DocType: Employee,History In Company,ប្រវត្តិសាស្រ្តនៅក្នុងក្រុមហ៊ុន
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ព្រឹត្តិបត្រ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ភាគហ៊ុនធាតុសៀវភៅ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,អតិថិជន&gt; ក្រុមអតិថិជន&gt; ដែនដី
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ធាតុដូចគ្នាត្រូវបានបញ្ចូលច្រើនដង
 DocType: Department,Leave Block List,ទុកឱ្យបញ្ជីប្លុក
 DocType: Sales Invoice,Tax ID,លេខសម្គាល់ការប្រមូលពន្ធលើ
@@ -3758,7 +3767,7 @@
 DocType: Customer,Sales Partner and Commission,ការលក់ដៃគូនិងគណៈកម្មការ
 DocType: Employee Loan,Rate of Interest (%) / Year,អត្រានៃការប្រាក់ (%) / ឆ្នាំ
 ,Project Quantity,បរិមាណគម្រោង
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","សរុប {0} សម្រាប់ធាតុទាំងអស់គឺសូន្យ, អាចជាអ្នកគួរផ្លាស់ប្តូរ &quot;ចែកបទចោទប្រកាន់ដោយផ្អែកលើ"
 DocType: Opportunity,To Discuss,ដើម្បីពិភាក្សា
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} គ្រឿង {1} ត្រូវការជាចាំបាច់ក្នុង {2} ដើម្បីបញ្ចប់ការប្រតិបត្តិការនេះ។
 DocType: Loan Type,Rate of Interest (%) Yearly,អត្រានៃការប្រាក់ (%) ប្រចាំឆ្នាំ
@@ -3773,7 +3782,7 @@
 DocType: Purchase Invoice,Return,ត្រឡប់មកវិញ
 DocType: Production Order Operation,Production Order Operation,ផលិតកម្មលំដាប់ប្រតិបត្តិការ
 DocType: Pricing Rule,Disable,មិនអនុញ្ញាត
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,របៀបនៃការទូទាត់គឺត្រូវបានទាមទារដើម្បីធ្វើឱ្យការទូទាត់
 DocType: Project Task,Pending Review,ការរង់ចាំការត្រួតពិនិត្យឡើងវិញ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","ទ្រព្យសកម្ម {0} មិនអាចត្រូវបានបោះបង់ចោល, ដូចដែលវាមានរួចទៅ {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),ពាក្យបណ្តឹងការចំណាយសរុប (តាមរយៈបណ្តឹងទាមទារការចំណាយ)
@@ -3781,11 +3790,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,លោក Mark អវត្តមាន
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ជួរដេក {0}: រូបិយប័ណ្ណរបស់ Bom បាន # {1} គួរតែស្មើនឹងរូបិយប័ណ្ណដែលបានជ្រើស {2}
 DocType: Journal Entry Account,Exchange Rate,អត្រាប្តូរប្រាក់
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ការលក់លំដាប់ {0} គឺមិនត្រូវបានដាក់ស្នើ
 DocType: Homepage,Tag Line,បន្ទាត់ស្លាក
 DocType: Fee Component,Fee Component,សមាសភាគថ្លៃសេវា
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,គ្រប់គ្រងកងនាវា
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,បន្ថែមធាតុពី
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,បន្ថែមធាតុពី
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},ឃ្លាំង {0}: គណនីមាតាបិតា {1} មិន bolong ទៅក្រុមហ៊ុន {2}
 DocType: Cheque Print Template,Regular,ទៀងទាត
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,weightage សរុបនៃលក្ខណៈវិនិច្ឆ័យការវាយតម្លៃទាំងអស់ត្រូវ 100%
@@ -3798,7 +3807,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ធាតុដែលបានជ្រើសមិនអាចមានជំនាន់ទី
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","រកមិនឃើញអត្រានៃការវាយតម្លៃសម្រាប់ធាតុដែលបាន {0}, ដែលត្រូវបានតម្រូវឱ្យធ្វើការបញ្ចូលគណនីសម្រាប់ {1} {2} ។ បើធាតុនេះត្រូវបានប្រតិបត្តិការជាធាតុគំរូមួយនៅក្នុង {1}, សូមនិយាយថានៅក្នុង {1} តារាងធាតុ។ បើមិនដូច្នោះទេសូមបង្កើតភាគហ៊ុនប្រតិបត្តិការចូលសម្រាប់អត្រាតម្លៃធាតុឬការនិយាយនៅក្នុងកំណត់ត្រាធាតុហើយបន្ទាប់មកព្យាយាម submiting / លុបចោលធាតុនេះ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,សមា្ភារៈបានបញ្ជូន% នៃការប្រឆាំងនឹងការផ្តល់ចំណាំនេះ
 DocType: Project,Customer Details,ពត៌មានលំអិតរបស់អតិថិជន
@@ -3807,15 +3816,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,បញ្ចូល URL សម្រាប់ការទទួលប៉ារ៉ាម៉ែត្រ NOS
 DocType: Payment Entry,Paid Amount,ចំនួនទឹកប្រាក់ដែលបង់
 DocType: Assessment Plan,Supervisor,អ្នកគ្រប់គ្រង
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,លើបណ្តាញ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,លើបណ្តាញ
 ,Available Stock for Packing Items,អាចរកបានសម្រាប់វេចខ្ចប់ហ៊ុនរបស់របរ
 DocType: Item Variant,Item Variant,ធាតុវ៉ារ្យង់
 DocType: Assessment Result Tool,Assessment Result Tool,ការវាយតំលៃលទ្ធផលឧបករណ៍
 DocType: BOM Scrap Item,BOM Scrap Item,ធាតុសំណល់អេតចាយ Bom
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ការបញ្ជាទិញដែលបានដាក់ស្នើមិនអាចត្រូវបានលុប
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,គ្រប់គ្រងគុណភាព
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Employee Loan,Repay Fixed Amount per Period,សងចំនួនថេរក្នុងមួយរយៈពេល
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},សូមបញ្ចូលបរិមាណសម្រាប់ធាតុ {0}
 DocType: Employee External Work History,Employee External Work History,បុគ្គលិកខាងក្រៅប្រវត្តិការងារ
@@ -3842,7 +3851,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,លេខសម្គាល់អ៊ីមែលរបស់សិស្ស
 DocType: Employee,Notice (days),សេចក្តីជូនដំណឹង (ថ្ងៃ)
 DocType: Tax Rule,Sales Tax Template,ទំព័រគំរូពន្ធលើការលក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ជ្រើសធាតុដើម្បីរក្សាទុកការវិក្ក័យប័ត្រ
 DocType: Employee,Encashment Date,Encashment កាលបរិច្ឆេទ
 DocType: Training Event,Internet,អ៊ីនធើណែ
 DocType: Account,Stock Adjustment,ការលៃតម្រូវភាគហ៊ុន
@@ -3866,7 +3875,7 @@
 DocType: Item Variant Attribute,Attribute,គុណលក្ខណៈ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,សូមបញ្ជាក់ពី / ទៅរាប់
 DocType: Serial No,Under AMC,នៅក្រោម AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,អត្រាការប្រាក់ត្រូវបានគណនាឡើងវិញបើធាតុតម្លៃបានពិចារណាពីចំនួនទឹកប្រាក់ដែលទឹកប្រាក់ចំណាយបានចុះចត
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,អត្រាការប្រាក់ត្រូវបានគណនាឡើងវិញបើធាតុតម្លៃបានពិចារណាពីចំនួនទឹកប្រាក់ដែលទឹកប្រាក់ចំណាយបានចុះចត
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ការកំណត់លំនាំដើមសម្រាប់លក់ប្រតិបត្តិការ។
 DocType: Guardian,Guardian Of ,អាណាព្យាបាល
 DocType: Grading Scale Interval,Threshold,កម្រិតពន្លឺ
@@ -3876,6 +3885,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ចេញផ្សាយឥណពន្ធចំណាំ
 DocType: Production Order,Warehouses,ឃ្លាំង
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ទ្រព្យសម្បត្តិមិនអាចត្រូវបានផ្ទេរ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ធាតុនេះគឺជាការបំរែបំរួលនៃ {0} (គំរូ) ។
 DocType: Workstation,per hour,ក្នុងមួយម៉ោង
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ការទិញ
 DocType: Announcement,Announcement,សេចក្តីប្រកាស
@@ -3891,8 +3901,8 @@
 DocType: Account,Receivable,អ្នកទទួល
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ជួរដេក # {0}: មិនត្រូវបានអនុញ្ញាតឱ្យផ្លាស់ប្តូរហាងទំនិញថាជាការទិញលំដាប់រួចហើយ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,តួនាទីដែលត្រូវបានអនុញ្ញាតឱ្យដាក់ស្នើតិបត្តិការដែលលើសពីដែនកំណត់ឥណទានបានកំណត់។
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ជ្រើសធាតុដើម្បីផលិត
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","ធ្វើសមកាលកម្មទិន្នន័យអនុបណ្ឌិត, វាអាចចំណាយពេលខ្លះ"
 DocType: Item,Material Issue,សម្ភារៈបញ្ហា
 DocType: Hub Settings,Seller Description,អ្នកលក់ការពិពណ៌នាសង្ខេប
 DocType: Employee Education,Qualification,គុណវុឌ្ឍិ
@@ -3904,7 +3914,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,បានបញ្ជាឱ្យ
 DocType: Salary Detail,Component,សមាសភាគ
 DocType: Assessment Criteria,Assessment Criteria Group,ការវាយតម្លៃលក្ខណៈវិនិច្ឆ័យជាក្រុម
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},បើករំលស់បង្គរត្រូវតែតិចជាងស្មើទៅនឹង {0}
 DocType: Warehouse,Warehouse Name,ឈ្មោះឃ្លាំង
 DocType: Naming Series,Select Transaction,ជ្រើសប្រតិបត្តិការ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,សូមបញ្ចូលអនុម័តតួនាទីឬការអនុម័តរបស់អ្នកប្រើប្រាស់
@@ -3917,7 +3927,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,មិនអាចលុបចោលដោយសារតែការដាក់ស្នើផ្សារការធាតុមាន {0}
 DocType: Employee Loan,Disbursement Date,កាលបរិច្ឆេទបញ្ចេញឥណទាន
 DocType: Vehicle,Vehicle,រថយន្ត
 DocType: Purchase Invoice,In Words,នៅក្នុងពាក្យ
@@ -3932,14 +3942,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ចម្បង / នាំមុខ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,សមតុលយទ្រព្យសកម្មរំលស់និងការ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},ចំនួនទឹកប្រាក់ {0} {1} បានផ្ទេរពី {2} ទៅ {3}
 DocType: Sales Invoice,Get Advances Received,ទទួលបុរេប្រទានបានទទួល
 DocType: Email Digest,Add/Remove Recipients,បន្ថែម / យកអ្នកទទួល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ប្រតិបត្តិការមិនត្រូវបានអនុញ្ញាតប្រឆាំងនឹងផលិតកម្មបានឈប់លំដាប់ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",ដើម្បីកំណត់ឆ្នាំសារពើពន្ធនេះជាលំនាំដើមសូមចុចលើ &quot;កំណត់ជាលំនាំដើម &#39;
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ចូលរួមជាមួយ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,កង្វះខាត Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,វ៉ារ្យ៉ង់ធាតុ {0} មានដែលមានគុណលក្ខណៈដូចគ្នា
 DocType: Employee Loan,Repay from Salary,សងពីប្រាក់ខែ
 DocType: Leave Application,LAP/,ភ្លៅ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ស្នើសុំការទូទាត់ប្រឆាំងនឹង {0} {1} ចំនួន {2}
@@ -3957,7 +3967,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ការវាយតំលៃលទ្ធផលលំអិត
 DocType: Employee Education,Employee Education,បុគ្គលិកអប់រំ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ធាតុស្ទួនក្រុមបានរកឃើញក្នុងតារាងក្រុមធាតុ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,វាត្រូវបានគេត្រូវការដើម្បីទៅយកលំអិតធាតុ។
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} គ្មានត្រូវបានទទួលរួចហើយ
@@ -3966,7 +3976,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ឃ្លាំង {0} គឺមិនត្រូវបានភ្ជាប់ទៅគណនីណាមួយ, សូមបង្កើត / ភ្ជាប់គណនីដែលត្រូវគ្នា (ទ្រព្យសម្បត្តិ) សម្រាប់ឃ្លាំង។"
 DocType: Purchase Invoice,Recurring Id,លេខសម្គាល់កើតឡើង
 DocType: Customer,Sales Team Details,ពត៌មានលំអិតការលក់ក្រុមការងារ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,លុបជារៀងរហូត?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,លុបជារៀងរហូត?
 DocType: Expense Claim,Total Claimed Amount,ចំនួនទឹកប្រាក់អះអាងសរុប
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ឱកាសក្នុងការមានសក្តានុពលសម្រាប់ការលក់។
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},មិនត្រឹមត្រូវ {0}
@@ -3977,13 +3987,14 @@
 DocType: Warehouse,PIN,ម្ជុល
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ការរៀបចំរបស់អ្នកនៅក្នុង ERPNext សាលា
 DocType: Sales Invoice,Base Change Amount (Company Currency),មូលដ្ឋានផ្លាស់ប្តូរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយប័ណ្ណ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,គ្មានការបញ្ចូលគណនីសម្រាប់ឃ្លាំងដូចខាងក្រោមនេះ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,ចំនួនទឹកប្រាក់លំដាប់ចុងក្រោយ
+DocType: Task,Is Milestone,តើការវិវឌ្ឍ
 DocType: Daily Work Summary,Email Sent To,អ៊ីម៉ែលដែលបានផ្ញើទៅ
 DocType: Budget,Warn,ព្រមាន
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ការកត់សម្គាល់ណាមួយផ្សេងទៀត, ការខិតខំប្រឹងប្រែងគួរឱ្យកត់សម្គាល់ដែលគួរតែចូលទៅក្នុងរបាយការណ៍។"
@@ -4004,7 +4015,7 @@
 DocType: Item Attribute Value,Attribute Value,តម្លៃគុណលក្ខណៈ
 ,Itemwise Recommended Reorder Level,Itemwise ផ្ដល់អនុសាសន៍រៀបចំវគ្គ
 DocType: Salary Detail,Salary Detail,លំអិតប្រាក់ខែ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,សូមជ្រើស {0} ដំបូង
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,សូមជ្រើស {0} ដំបូង
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,បាច់នៃ {0} {1} ធាតុបានផុតកំណត់។
 DocType: Sales Invoice,Commission,គណៈកម្មការ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ពេលវេលាសម្រាប់ការផលិតសន្លឹក។
@@ -4016,41 +4027,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`បង្កកដែលមានវ័យចំណាស់ Than` ភាគហ៊ុនគួរមានទំហំតូចជាងថ្ងៃ% d ។
 DocType: Tax Rule,Purchase Tax Template,ទិញពន្ធលើទំព័រគំរូ
 ,Project wise Stock Tracking,គម្រោងផ្សារហ៊ុនដែលមានប្រាជ្ញាតាមដាន
-apps/erpnext/erpnext/maintenance/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 +12,Employee records.,កំណត់ត្រាបុគ្គលិក។
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,សូមកំណត់កាលបរិច្ឆេទបន្ទាប់រំលស់
 DocType: HR Settings,Payroll Settings,ការកំណត់បើកប្រាក់បៀវត្ស
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ផ្គូផ្គងនឹងវិកិយប័ត្រដែលមិនមានភ្ជាប់និងការទូទាត់។
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,លំដាប់ទីកន្លែង
 DocType: Email Digest,New Purchase Orders,ការបញ្ជាទិញថ្មីមួយ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ជា root មិនអាចមានការកណ្តាលចំណាយឪពុកម្តាយ
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ជ្រើសម៉ាក ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ជ្រើសម៉ាក ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,បង្គររំលស់ដូចជានៅលើ
 DocType: Sales Invoice,C-Form Applicable,C-ទម្រង់ពាក្យស្នើសុំ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ប្រតិបត្ដិការពេលវេលាត្រូវតែធំជាង 0 សម្រាប់ប្រតិបត្ដិការ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ឃ្លាំងគឺជាការចាំបាច់
 DocType: Supplier,Address and Contacts,អាសយដ្ឋាននិងទំនាក់ទំនង
 DocType: UOM Conversion Detail,UOM Conversion Detail,ពត៌មាននៃការប្រែចិត្តជឿ UOM
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),រក្សាវាបណ្ដាញ 900px មិត្តភាព (សរសេរ) ដោយ 100px (ម៉ោង)
 DocType: Program,Program Abbreviation,អក្សរកាត់កម្មវិធី
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ផលិតកម្មលំដាប់មិនអាចត្រូវបានលើកឡើងប្រឆាំងនឹងការធាតុមួយទំព័រគំរូ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ការចោទប្រកាន់ត្រូវបានធ្វើបច្ចុប្បន្នភាពនៅបង្កាន់ដៃទិញប្រឆាំងនឹងធាតុគ្នា
 DocType: Warranty Claim,Resolved By,បានដោះស្រាយដោយ
 DocType: Bank Guarantee,Start Date,ថ្ងៃចាប់ផ្តើម
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,បម្រុងទុកស្លឹកសម្រាប់រយៈពេល។
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,មូលប្បទានប័ត្រនិងប្រាក់បញ្ញើបានជម្រះមិនត្រឹមត្រូវ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,គណនី {0}: អ្នកមិនអាចកំណត់ដោយខ្លួនវាជាគណនីឪពុកម្តាយ
 DocType: Purchase Invoice Item,Price List Rate,តម្លៃការវាយតម្លៃបញ្ជី
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,បង្កើតសម្រង់អតិថិជន
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,បង្កើតសម្រង់អតិថិជន
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",បង្ហាញតែការ &quot;នៅក្នុងផ្សារហ៊ុន»ឬ«មិនមែននៅក្នុងផ្សារ&quot; ដោយផ្អែកលើតម្លៃភាគហ៊ុនដែលអាចរកបាននៅក្នុងឃ្លាំងនេះ។
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),វិក័យប័ត្រនៃសម្ភារៈ (Bom)
 DocType: Item,Average time taken by the supplier to deliver,ពេលមធ្យមដែលថតដោយអ្នកផ្គត់ផ្គង់ដើម្បីរំដោះ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,លទ្ធផលការវាយតំលៃ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ម៉ោងធ្វើការ
 DocType: Project,Expected Start Date,គេរំពឹងថានឹងចាប់ផ្តើមកាលបរិច្ឆេទ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,យកធាតុប្រសិនបើការចោទប្រកាន់គឺអាចអនុវត្តទៅធាតុដែល
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,រូបិយប័ណ្ណប្រតិបត្តិការត្រូវតែមានដូចគ្នាជារូបិយប័ណ្ណទូទាត់
 DocType: Payment Entry,Receive,ទទួលបាន
@@ -4061,19 +4071,19 @@
 DocType: Workstation,Operating Costs,ចំណាយប្រតិបត្តិការ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ប្រសិនបើអ្នកបានប្រមូលថវិកាសកម្មភាពលើសពីប្រចាំខែ
 DocType: Purchase Invoice,Submit on creation,ដាក់ស្នើលើការបង្កើត
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},រូបិយប័ណ្ណសម្រាប់ {0} ត្រូវតែជា {1}
 DocType: Asset,Disposal Date,បោះចោលកាលបរិច្ឆេទ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",អ៊ីមែលនឹងត្រូវបានផ្ញើទៅបុគ្គលិកសកម្មអស់ពីក្រុមហ៊ុននេះនៅម៉ោងដែលបានផ្តល់ឱ្យប្រសិនបើពួកគេមិនមានថ្ងៃឈប់សម្រាក។ សេចក្ដីសង្ខេបនៃការឆ្លើយតបនឹងត្រូវបានផ្ញើនៅកណ្តាលអធ្រាត្រ។
 DocType: Employee Leave Approver,Employee Leave Approver,ទុកឱ្យការអនុម័តបុគ្គលិក
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ជួរដេក {0}: ធាតុរៀបចំមួយរួចហើយសម្រាប់ឃ្លាំងនេះ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",មិនអាចប្រកាសបាត់បង់នោះទេព្រោះសម្រង់ត្រូវបានធ្វើឡើង។
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,មតិការបណ្តុះបណ្តាល
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ផលិតកម្មលំដាប់ {0} ត្រូវតែត្រូវបានដាក់ជូន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},សូមជ្រើសរើសកាលបរិច្ឆេទចាប់ផ្ដើមនិងកាលបរិច្ឆេទបញ្ចប់សម្រាប់ធាតុ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ពិតណាស់គឺចាំបាច់នៅក្នុងជួរដេក {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ដើម្បីកាលបរិច្ឆេទមិនអាចមានមុនពេលចេញពីកាលបរិច្ឆេទ
 DocType: Supplier Quotation Item,Prevdoc DocType,ចង្អុលបង្ហាញ Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,បន្ថែម / កែសម្រួលតម្លៃទំនិញ
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Batch,Parent Batch,បាច់មាតាបិតា
 DocType: Cheque Print Template,Cheque Print Template,ទំព័រគំរូបោះពុម្ពមូលប្បទានប័ត្រ
@@ -4087,7 +4097,7 @@
 ,Ordered Items To Be Delivered,ធាតុបញ្ជាឱ្យនឹងត្រូវបានបញ្ជូន
 DocType: Account,Income,ប្រាក់ចំណូល
 DocType: Industry Type,Industry Type,ប្រភេទវិស័យឧស្សាហកម្ម
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,អ្វីមួយដែលខុស!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,អ្វីមួយដែលខុស!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,ព្រមាន &amp; ‧;: កម្មវិធីទុកឱ្យមានកាលបរិច្ឆេទនៃការហាមឃាត់ដូចខាងក្រោម
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,ការលក់វិក័យប័ត្រ {0} ត្រូវបានដាក់ស្នើរួចទៅហើយ
 DocType: Assessment Result Detail,Score,ពិន្ទុ
@@ -4117,17 +4127,17 @@
 DocType: Item,Variant Based On,វ៉ារ្យង់ដែលមានមូលដ្ឋាននៅលើ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage សរុបដែលបានផ្ដល់គួរតែទទួលបាន 100% ។ វាគឺជា {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,អ្នកផ្គត់ផ្គង់របស់អ្នក
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,មិនអាចបាត់បង់ដូចដែលបានកំណត់ជាលំដាប់ត្រូវបានធ្វើឱ្យការលក់រថយន្ត។
 DocType: Request for Quotation Item,Supplier Part No,ក្រុមហ៊ុនផ្គត់ផ្គង់គ្រឿងបន្លាស់គ្មាន
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ទទួលបានពី
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',មិនអាចកាត់ពេលដែលប្រភេទគឺសម្រាប់ &#39;វាយតម្លៃ&#39; ឬ &#39;Vaulation និងសរុប
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ទទួលបានពី
 DocType: Lead,Converted,ប្រែចិត្តជឿ
 DocType: Item,Has Serial No,គ្មានសៀរៀល
 DocType: Employee,Date of Issue,កាលបរិច្ឆេទនៃបញ្ហា
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ពី {0} {1} សម្រាប់
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: ពី {0} {1} សម្រាប់
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ជួរដេក # {0}: កំណត់ផ្គត់ផ្គង់សម្រាប់ធាតុ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ជួរដេក {0}: តម្លៃប៉ុន្មានម៉ោងត្រូវតែធំជាងសូន្យ។
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,គេហទំព័ររូបភាព {0} បានភ្ជាប់ទៅនឹងធាតុ {1} មិនអាចត្រូវបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,រាយធាតុនេះនៅក្នុងក្រុមជាច្រើននៅលើគេហទំព័រ។
@@ -4136,20 +4146,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,អ្នកមិនត្រូវបានអនុញ្ញាតឱ្យកំណត់តម្លៃទឹកកក
 DocType: Payment Reconciliation,Get Unreconciled Entries,ទទួលបានធាតុ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,ចាប់ពីកាលបរិច្ឆេទវិក័យប័ត្រ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,រូបិយប័ណ្ណវិក័យប័ត្រត្រូវតែស្មើឬគណនីគណបក្សរូបិយប័ណ្ណទាំង comapany លំនាំដើមរូបិយប័ណ្ណរបស់
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ទុកឱ្យ Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,តើធ្វើដូចម្ដេច?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ដើម្បីឃ្លាំង
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,សិស្សទាំងអស់ការចុះឈ្មោះចូលរៀន
 ,Average Commission Rate,គណៈកម្មការជាមធ្យមអត្រាការ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;មិនមានមិនសៀរៀល&#39; មិនអាចក្លាយជា &#39;បាទ&#39; សម្រាប់ធាតុដែលមិនមែនជាភាគហ៊ុន-
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ការចូលរួមមិនអាចត្រូវបានសម្គាល់សម្រាប់កាលបរិច្ឆេទនាពេលអនាគត
 DocType: Pricing Rule,Pricing Rule Help,វិធានកំណត់តម្លៃជំនួយ
 DocType: School House,House Name,ឈ្មោះផ្ទះ
 DocType: Purchase Taxes and Charges,Account Head,នាយកគណនី
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ធ្វើឱ្យទាន់សម័យការចំណាយបន្ថែមទៀតដើម្បីគណនាការចំណាយចុះចតនៃធាតុ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,អគ្គិសនី
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,បន្ថែមនៅសល់នៃអង្គការរបស់អ្នកដែលជាអ្នកប្រើរបស់អ្នក។ អ្នកអាចបន្ថែមទៅក្នុងវិបផតថលអតិថិជនដែលអញ្ជើញរបស់អ្នកដោយបន្ថែមពួកគេពីការទំនាក់ទំនង
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,បន្ថែមនៅសល់នៃអង្គការរបស់អ្នកដែលជាអ្នកប្រើរបស់អ្នក។ អ្នកអាចបន្ថែមទៅក្នុងវិបផតថលអតិថិជនដែលអញ្ជើញរបស់អ្នកដោយបន្ថែមពួកគេពីការទំនាក់ទំនង
 DocType: Stock Entry,Total Value Difference (Out - In),ភាពខុសគ្នាតម្លៃសរុប (ចេញ - ក្នុង)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4158,7 +4168,7 @@
 DocType: Item,Customer Code,លេខកូដអតិថិជន
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},កម្មវិធីរំលឹកខួបកំណើតសម្រាប់ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ថ្ងៃចាប់ពីលំដាប់ចុងក្រោយ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ឥណពន្ធវីសាទៅគណនីត្រូវតែមានតារាងតុល្យការគណនី
 DocType: Buying Settings,Naming Series,ដាក់ឈ្មោះកម្រងឯកសារ
 DocType: Leave Block List,Leave Block List Name,ទុកឱ្យឈ្មោះបញ្ជីប្លុក
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,កាលបរិច្ឆេទការធានារ៉ាប់រងការចាប់ផ្តើមគួរតែតិចជាងកាលបរិច្ឆេទធានារ៉ាប់រងបញ្ចប់
@@ -4173,9 +4183,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ប័ណ្ណប្រាក់ខែរបស់បុគ្គលិក {0} បានបង្កើតឡើងរួចហើយសម្រាប់តារាងពេលវេលា {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,បានបញ្ជាឱ្យ Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ធាតុ {0} ត្រូវបានបិទ
 DocType: Stock Settings,Stock Frozen Upto,រីករាយជាមួយនឹងផ្សារភាគហ៊ុនទឹកកក
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Bom មិនមានភាគហ៊ុនណាមួយឡើយធាតុ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},រយៈពេលចាប់ពីនិងរយៈពេលដើម្បីកាលបរិច្ឆេទចាំបាច់សម្រាប់កើតឡើង {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,សកម្មភាពរបស់គម្រោង / ភារកិច្ច។
 DocType: Vehicle Log,Refuelling Details,សេចក្ដីលម្អិតចាក់ប្រេង
@@ -4185,8 +4195,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,រកមិនឃើញអត្រាទិញមុនបាន
 DocType: Purchase Invoice,Write Off Amount (Company Currency),បិទការសរសេរចំនួនទឹកប្រាក់ (ក្រុមហ៊ុនរូបិយវត្ថុ)
 DocType: Sales Invoice Timesheet,Billing Hours,ម៉ោងវិក័យប័ត្រ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Bom លំនាំដើមសម្រាប់ {0} មិនបានរកឃើញ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ជួរដេក # {0}: សូមកំណត់បរិមាណតម្រៀបឡើងវិញ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ប៉ះធាតុដើម្បីបន្ថែមពួកវានៅទីនេះ
 DocType: Fees,Program Enrollment,កម្មវិធីការចុះឈ្មោះ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ប័ណ្ណតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},សូមកំណត់ {0}
@@ -4210,7 +4221,7 @@
 DocType: Maintenance Visit,Maintenance Date,ថែទាំកាលបរិច្ឆេទ
 DocType: Purchase Invoice Item,Rejected Serial No,គ្មានសៀរៀលច្រានចោល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,កាលបរិច្ឆេទចាប់ផ្ដើមកាលពីឆ្នាំឬកាលបរិច្ឆេទចុងត្រូវបានត្រួតស៊ីគ្នានឹង {0} ។ ដើម្បីជៀសវាងសូមកំណត់របស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},កាលបរិច្ឆេទចាប់ផ្ដើមគួរតែតិចជាងកាលបរិច្ឆេទចុងក្រោយសម្រាប់ធាតុ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### ប្រសិនបើមានស៊េរីត្រូវបានកំណត់និងគ្មានសៀរៀលមិនត្រូវបានរៀបរាប់នៅក្នុងប្រតិបត្តិការ, លេខសម្គាល់បន្ទាប់មកដោយស្វ័យប្រវត្តិនឹងត្រូវបានបង្កើតដោយផ្អែកលើស៊េរីនេះ។ ប្រសិនបើអ្នកតែងតែចង់និយាយឱ្យបានច្បាស់សៀរៀល Nos សម្រាប់ធាតុនេះ។ ទុកឱ្យវាទទេ។"
 DocType: Upload Attendance,Upload Attendance,វត្តមានផ្ទុកឡើង
@@ -4287,7 +4298,6 @@
 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,កាកបាទបញ្ជីដែលមានធាតុនៅក្នុងក្រុមជាច្រើនដែល
-DocType: Grade Interval,Grade Interval,ថ្នាក់ទីចន្លោះពេល
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ឆ្នាំចាប់ផ្តើមកាលបរិច្ឆេទសារពើពន្ធឆ្នាំសារពើពន្ធបញ្ចប់និងកាលបរិច្ឆេទត្រូវបានកំណត់រួចហើយនៅក្នុងឆ្នាំសារពើពន្ធ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,បោសសំអាតកាលបរិច្ឆេទធ្វើឱ្យទាន់សម័យ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,បាច់ពុះ
@@ -4333,14 +4343,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ទុកឱ្យធីកបើអ្នកមិនចង់ឱ្យពិចារណាបាច់ខណៈពេលដែលធ្វើការពិតណាស់ដែលមានមូលដ្ឋាននៅក្រុម។
 DocType: Asset,Frequency of Depreciation (Months),ភាពញឹកញាប់នៃការរំលស់ (ខែ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,គណនីឥណទាន
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,គណនីឥណទាន
 DocType: Landed Cost Item,Landed Cost Item,ធាតុតម្លៃដែលបានចុះចត
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,បង្ហាញតម្លៃសូន្យ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,បរិមាណនៃការផលិតធាតុដែលទទួលបានបន្ទាប់ / វែចខ្ចប់ឡើងវិញពីបរិមាណដែលបានផ្តល់វត្ថុធាតុដើម
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ការរៀបចំវែបសាយសាមញ្ញសម្រាប់អង្គការរបស់ខ្ញុំ
 DocType: Payment Reconciliation,Receivable / Payable Account,ទទួលគណនី / ចងការប្រាក់
 DocType: Delivery Note Item,Against Sales Order Item,ការប្រឆាំងនឹងការធាតុលក់សណ្តាប់ធ្នាប់
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},សូមបញ្ជាក់គុណតម្លៃសម្រាប់គុណលក្ខណៈ {0}
 DocType: Item,Default Warehouse,ឃ្លាំងលំនាំដើម
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ថវិកាដែលមិនអាចត្រូវបានផ្ដល់ប្រឆាំងនឹងគណនីគ្រុប {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,សូមបញ្ចូលមជ្ឈមណ្ឌលចំណាយឪពុកម្តាយ
@@ -4386,7 +4396,7 @@
 DocType: Opportunity Item,Basic Rate,អត្រាជាមូលដ្ឋាន
 DocType: GL Entry,Credit Amount,ចំនួនឥណទាន
 DocType: Cheque Print Template,Signatory Position,ទីតាំងហត្ថលេខី
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ដែលបានកំណត់ជាបាត់បង់
 DocType: Timesheet,Total Billable Hours,ម៉ោងចេញវិក្កយបត្រសរុប
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ការទូទាត់វិក័យប័ត្រចំណាំ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,នេះផ្អែកលើប្រតិបត្តិការប្រឆាំងនឹងអតិថិជននេះ។ សូមមើលខាងក្រោមសម្រាប់សេចក្ដីលម្អិតកំណត់ពេលវេលា
@@ -4400,11 +4410,11 @@
 ,Items To Be Requested,ធាតុដែលនឹងត្រូវបានស្នើ
 DocType: Purchase Order,Get Last Purchase Rate,ទទួលបានអត្រាការទិញចុងក្រោយ
 DocType: Company,Company Info,ពត៌មានរបស់ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,ជ្រើសឬបន្ថែមអតិថិជនថ្មី
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,កណ្តាលការចំណាយគឺត្រូវបានទាមទារដើម្បីកក់ពាក្យបណ្តឹងការចំណាយ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),កម្មវិធីរបស់មូលនិធិ (ទ្រព្យសកម្ម)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,នេះត្រូវបានផ្អែកលើការចូលរួមរបស់បុគ្គលិកនេះ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,គណនីឥណពន្ធវីសា
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,គណនីឥណពន្ធវីសា
 DocType: Fiscal Year,Year Start Date,នៅឆ្នាំកាលបរិច្ឆេទចាប់ផ្តើម
 DocType: Attendance,Employee Name,ឈ្មោះបុគ្គលិក
 DocType: Sales Invoice,Rounded Total (Company Currency),សរុបមូល (ក្រុមហ៊ុនរូបិយវត្ថុ)
@@ -4413,13 +4423,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,បញ្ឈប់ការរបស់អ្នកប្រើពីការធ្វើឱ្យកម្មវិធីដែលបានចាកចេញនៅថ្ងៃបន្ទាប់។
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ចំនួនទឹកប្រាក់ការទិញ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,សម្រង់ក្រុមហ៊ុនផ្គត់ផ្គង់ {0} បង្កើតឡើង
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ឆ្នាំបញ្ចប់មិនអាចជាការចាប់ផ្តើមឆ្នាំមុន
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,អត្ថប្រយោជន៍បុគ្គលិក
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},បរិមាណបរិមាណស្មើនឹងត្រូវ packed សម្រាប់ធាតុ {0} នៅក្នុងជួរដេក {1}
 DocType: Production Order,Manufactured Qty,បានផលិត Qty
 DocType: Purchase Receipt Item,Accepted Quantity,បរិមាណដែលត្រូវទទួលយក
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},សូមកំណត់លំនាំដើមបញ្ជីថ្ងៃឈប់សម្រាកសម្រាប់បុគ្គលិកឬ {0} {1} ក្រុមហ៊ុន
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} {1} មិនមាន
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} {1} មិនមាន
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,វិក័យប័ត្របានលើកឡើងដល់អតិថិជន។
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,លេខសម្គាល់របស់គម្រោង
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ជួរដេកគ្មាន {0}: ចំនួនទឹកប្រាក់មិនអាចមានចំនួនច្រើនជាងការរង់ចាំការប្រឆាំងនឹងពាក្យបណ្តឹងការចំណាយទឹកប្រាក់ {1} ។ ចំនួនទឹកប្រាក់ដែលមិនទាន់សម្រេចគឺ {2}
@@ -4428,15 +4438,17 @@
 DocType: Quality Inspection Reading,Reading 3,ការអានទី 3
 ,Hub,ហាប់
 DocType: GL Entry,Voucher Type,ប្រភេទកាតមានទឹកប្រាក់
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,រកមិនឃើញបញ្ជីថ្លៃឬជនពិការ
 DocType: Employee Loan Application,Approved,បានអនុម័ត
 DocType: Pricing Rule,Price,តំលៃលក់
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',បុគ្គលិកធូរស្រាលនៅលើ {0} ត្រូវតែត្រូវបានកំណត់ជា &quot;ឆ្វេង&quot;
 DocType: Guardian,Guardian,កាសែត The Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ការវាយតម្លៃ {0} បានបង្កើតឡើងសម្រាប់បុគ្គលិក {1} នៅក្នុងជួរកាលបរិច្ឆេទដែលបានផ្ដល់
 DocType: Employee,Education,ការអប់រំ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ដាក់ឈ្មោះការឃោសនាដោយ
 DocType: Employee,Current Address Is,អាសយដ្ឋានបច្ចុប្បន្នគឺ
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,បានកែប្រែ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ស្រេចចិត្ត។ កំណត់រូបិយប័ណ្ណលំនាំដើមរបស់ក្រុមហ៊ុនប្រសិនបើមិនបានបញ្ជាក់។
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ធាតុទិនានុប្បវត្តិគណនេយ្យ។
 DocType: Delivery Note Item,Available Qty at From Warehouse,ដែលអាចប្រើបាននៅពីឃ្លាំង Qty
@@ -4445,7 +4457,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ជួរដេក {0}: គណបក្ស / គណនីមិនផ្គូផ្គងនឹង {1} / {2} នៅក្នុង {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,សូមបញ្ចូលចំណាយតាមគណនី
 DocType: Account,Stock,ភាគហ៊ុន
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ជួរដេក # {0}: យោងប្រភេទឯកសារត្រូវតែជាផ្នែកមួយនៃការទិញលំដាប់, ការទិញវិក័យប័ត្រឬធាតុទិនានុប្បវត្តិ"
 DocType: Employee,Current Address,អាសយដ្ឋានបច្ចុប្បន្ន
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ប្រសិនបើមានធាតុគឺវ៉ារ្យ៉ង់នៃធាតុផ្សេងទៀតបន្ទាប់មកពិពណ៌នា, រូបភាព, ការកំណត់តម្លៃពន្ធលនឹងត្រូវបានកំណត់ពីពុម្ពមួយនេះទេលុះត្រាតែបានបញ្ជាក់យ៉ាងជាក់លាក់"
 DocType: Serial No,Purchase / Manufacture Details,ទិញ / ពត៌មានលំអិតការផលិត
@@ -4473,7 +4485,7 @@
 DocType: Hub Settings,Hub Settings,ការកំណត់ហាប់
 DocType: Project,Gross Margin %,រឹម% សរុបបាន
 DocType: BOM,With Operations,ជាមួយនឹងការប្រតិបត្ដិការ
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ធាតុគណនេយ្យត្រូវបានគេធ្វើរួចទៅហើយនៅក្នុងរូបិយប័ណ្ណ {0} សម្រាប់ក្រុមហ៊ុន {1} ។ សូមជ្រើសគណនីដែលត្រូវទទួលឬបង់រូបិយប័ណ្ណ {0} ។
 DocType: Asset,Is Existing Asset,ទ្រព្យដែលមានស្រាប់ត្រូវបាន
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
 DocType: Salary Detail,Statistical Component,សមាសភាគស្ថិតិ
@@ -4498,7 +4510,7 @@
 DocType: Assessment Plan,Room,បន្ទប់
 DocType: Purchase Order,Advance Paid,មុនបង់ប្រាក់
 DocType: Item,Item Tax,ការប្រមូលពន្ធលើធាតុ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,សម្ភារៈដើម្បីផ្គត់ផ្គង់
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,រដ្ឋាករវិក័យប័ត្រ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ហាក់ដូចជាច្រើនជាងម្ដង
 DocType: Expense Claim,Employees Email Id,និយោជិអ៊ីម៉ែលលេខសម្គាល់
@@ -4529,9 +4541,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ភ្ជាប់រូបសញ្ញា
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,កម្រិតភាគហ៊ុន
 DocType: Customer,Commission Rate,អត្រាប្រាក់កំរៃ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ធ្វើឱ្យវ៉ារ្យង់
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,កម្មវិធីដែលបានឈប់សម្រាកប្លុកដោយនាយកដ្ឋាន។
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",ប្រភេទការទូទាត់ត្រូវតែជាផ្នែកមួយនៃការទទួលបានការសងប្រាក់និងផ្ទេរប្រាក់បរទេស
 apps/erpnext/erpnext/config/selling.py +179,Analytics,វិធីវិភាគ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,រទេះទទេ
 DocType: Vehicle,Model,តារាម៉ូដែល
@@ -4542,6 +4554,7 @@
 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 +161,Capital Stock,រាជធានីហ៊ុន
+DocType: Shopping Cart Settings,Show Public Attachments,បង្ហាញឯកសារភ្ជាប់សាធារណៈ
 DocType: Packing Slip,Package Weight Details,កញ្ចប់ព័ត៌មានលម្អិតទម្ងន់
 DocType: Payment Gateway Account,Payment Gateway Account,គណនីទូទាត់
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,បន្ទាប់ពីការបញ្ចប់ការទូទាត់ប្តូរទិសអ្នកប្រើទំព័រដែលបានជ្រើស។
@@ -4560,15 +4573,15 @@
 DocType: Batch,Expiry Date,កាលបរិច្ឆេទផុតកំណត់
 ,Supplier Addresses and Contacts,អាសយដ្ឋានក្រុមហ៊ុនផ្គត់ផ្គង់និងទំនាក់ទំនង
 ,accounts-browser,គណនីកម្មវិធីរុករក
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,សូមជ្រើសប្រភេទជាលើកដំបូង
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ចៅហ្វាយគម្រោង។
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ដើម្បីអនុញ្ញាតឱ្យវិក័យប័ត្រឬលើសលំដាប់ជាង, ធ្វើឱ្យទាន់សម័យ &quot;អនុញ្ញាត&quot; នៅក្នុងការកំណត់ហ៊ុនឬធាតុ។"
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,កុំបង្ហាញនិមិត្តរូបដូចជា $ លណាមួយដែលជាប់នឹងរូបិយប័ណ្ណ។
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ពាក់កណ្តាលថ្ងៃ)
 DocType: Supplier,Credit Days,ថ្ងៃឥណទាន
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ធ្វើឱ្យបាច់សិស្ស
 DocType: Leave Type,Is Carry Forward,គឺត្រូវបានអនុវត្តទៅមុខ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ទទួលបានធាតុពី Bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,ទទួលបានធាតុពី Bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ពេលថ្ងៃ
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ជួរដេក # {0}: ប្រកាសកាលបរិច្ឆេទត្រូវតែមានដូចគ្នាកាលបរិច្ឆេទទិញ {1} នៃទ្រព្យសម្បត្តិ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,សូមបញ្ចូលការបញ្ជាទិញលក់នៅក្នុងតារាងខាងលើ
@@ -4585,8 +4598,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ចំនួនទឹកប្រាក់ដែលបានអនុញ្ញាត
 DocType: GL Entry,Is Opening,តើការបើក
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ជួរដេក {0}: ធាតុឥណពន្ធមិនអាចត្រូវបានផ្សារភ្ជាប់ទៅនឹងការ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,សូមរៀបចំចំនួនតាមរយៈការចូលរួមស៊េរីសម្រាប់ការដំឡើង&gt; លេខស៊េរី
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,គណនី {0} មិនមាន
 DocType: Account,Cash,ជាសាច់ប្រាក់
 DocType: Employee,Short biography for website and other publications.,ប្រវត្ដិរូបខ្លីសម្រាប់គេហទំព័រនិងសៀវភៅផ្សេងទៀត។
diff --git a/erpnext/translations/kn.csv b/erpnext/translations/kn.csv
index 043a5df..7fa871a 100644
--- a/erpnext/translations/kn.csv
+++ b/erpnext/translations/kn.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ಬಾಡಿಗೆ
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ಬಳಕೆದಾರ ಅನ್ವಯಿಸುವುದಿಲ್ಲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ನಿಲ್ಲಿಸಿತು ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರದ್ದುಗೊಳಿಸಲಾಗದು, ರದ್ದು ಮೊದಲು ಅಡ್ಡಿಯಾಗಿರುವುದನ್ನು ಬಿಡಿಸು"
 DocType: Vehicle Service,Mileage,ಮೈಲೇಜ್
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಆಸ್ತಿ ಸ್ಕ್ರ್ಯಾಪ್ ಬಯಸುತ್ತೀರಾ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ಕರೆನ್ಸಿ ಬೆಲೆ ಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ಲೆಕ್ಕಾಚಾರ ಮಾಡಲಾಗುತ್ತದೆ ವ್ಯವಹಾರದಲ್ಲಿ ಆಗಿದೆ .
 DocType: Purchase Order,Customer Contact,ಗ್ರಾಹಕ ಸಂಪರ್ಕ
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ಮಹೋನ್ನತ {0} ಕಡಿಮೆ ಶೂನ್ಯ ಸಾಧ್ಯವಿಲ್ಲ ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,10 ನಿಮಿಷಗಳು ಡೀಫಾಲ್ಟ್
 DocType: Leave Type,Leave Type Name,TypeName ಬಿಡಿ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ತೆರೆದ ತೋರಿಸಿ
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ತೆರೆದ ತೋರಿಸಿ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,ಸರಣಿ ಯಶಸ್ವಿಯಾಗಿ ನವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ಚೆಕ್ಔಟ್
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ ಸಲ್ಲಿಸಿದ
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ಬ್ಯಾಚ್ ಐಟಂ ಅಂತ್ಯ ಸ್ಥಿತಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ಬ್ಯಾಂಕ್ ಡ್ರಾಫ್ಟ್
 DocType: Mode of Payment Account,Mode of Payment Account,ಪಾವತಿ ಖಾತೆಯಿಂದ ಮೋಡ್
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ತೋರಿಸು ಮಾರ್ಪಾಟುಗಳು
 DocType: Academic Term,Academic Term,ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ವಸ್ತು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ಟೇಬಲ್ ಖಾತೆಗಳು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ಸಾಲ ( ಹೊಣೆಗಾರಿಕೆಗಳು )
 DocType: Employee Education,Year of Passing,ಸಾಗುವುದು ವರ್ಷ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","ರೆಫರೆನ್ಸ್:% ರು, ಐಟಂ ಕೋಡ್:% s ಮತ್ತು ಗ್ರಾಹಕ% s"
 DocType: Item,Country of Origin,ಮೂಲ ದೇಶ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ಸಂಗ್ರಹಣೆಯಲ್ಲಿ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ಓಪನ್ ತೊಂದರೆಗಳು
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ಆರೋಗ್ಯ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ಪಾವತಿ ವಿಳಂಬ (ದಿನಗಳು)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ಸೇವೆ ಖರ್ಚು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},ಕ್ರಮ ಸಂಖ್ಯೆ: {0} ಈಗಾಗಲೇ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖವಿದೆ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ಸರಕುಪಟ್ಟಿ
 DocType: Maintenance Schedule Item,Periodicity,ನಿಯತಕಾಲಿಕತೆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ಹಣಕಾಸಿನ ವರ್ಷ {0} ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ ಮೊದಲು ಆಗಿದೆ
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ಎರಡು ಕಾಲಮ್ಗಳು, ಹಳೆಯ ಹೆಸರು ಒಂದು ಮತ್ತು ಹೆಸರು ಒಂದು CSV ಕಡತ ಲಗತ್ತಿಸಿ"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ಯಾವುದೇ ಸಕ್ರಿಯ ವರ್ಷದಲ್ಲಿ.
 DocType: Packed Item,Parent Detail docname,Docname ಪೋಷಕ ವಿವರ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ರೆಫರೆನ್ಸ್: {0}, ಐಟಂ ಕೋಡ್: {1} ಮತ್ತು ಗ್ರಾಹಕ: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,ಕೆಜಿ
 DocType: Student Log,Log,ಲಾಗ್
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ಕೆಲಸ ತೆರೆಯುತ್ತಿದೆ .
 DocType: Item Attribute,Increment,ಹೆಚ್ಚಳವನ್ನು
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ಜಾಹೀರಾತು
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ಅದೇ ಕಂಪನಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಾರಿ ದಾಖಲಿಸಿದರೆ
 DocType: Employee,Married,ವಿವಾಹಿತರು
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ಜಾಹೀರಾತು ಅನುಮತಿಯಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,ಐಟಂಗಳನ್ನು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ಸ್ಟಾಕ್ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ನವೀಕರಿಸಲಾಗುವುದಿಲ್ಲ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ಉತ್ಪನ್ನ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ಯಾವುದೇ ಐಟಂಗಳನ್ನು ಪಟ್ಟಿ
 DocType: Payment Reconciliation,Reconcile,ರಾಜಿ ಮಾಡಿಸು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ದಿನಸಿ
 DocType: Quality Inspection Reading,Reading 1,1 ಓದುವಿಕೆ
 DocType: Process Payroll,Make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ಪಿಂಚಣಿ ನಿಧಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: SMS Center,All Sales Person,ಎಲ್ಲಾ ಮಾರಾಟಗಾರನ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ಮಾಸಿಕ ವಿತರಣೆ ** ನಿಮ್ಮ ವ್ಯವಹಾರದಲ್ಲಿ ಋತುಗಳು ಹೊಂದಿದ್ದರೆ ನೀವು ತಿಂಗಳ ಅಡ್ಡಲಾಗಿ ಬಜೆಟ್ / ಟಾರ್ಗೆಟ್ ವಿತರಿಸಲು ನೆರವಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,ಮಾಡಿರುವುದಿಲ್ಲ ಐಟಂಗಳನ್ನು ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ಸಂಬಳ ರಚನೆ ಮಿಸ್ಸಿಂಗ್
 DocType: Lead,Person Name,ವ್ಯಕ್ತಿ ಹೆಸರು
 DocType: Sales Invoice Item,Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ಉದಾಹರಣೆಗೆ &quot;ಪ್ರಾಥಮಿಕ ಶಾಲೆ&quot; ಅಥವಾ &quot;ವಿಶ್ವವಿದ್ಯಾಲಯ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ಸ್ಟಾಕ್ ವರದಿಗಳು
 DocType: Warehouse,Warehouse Detail,ವೇರ್ಹೌಸ್ ವಿವರ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ದಾಟಿದೆ ಮಾಡಲಾಗಿದೆ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ಟರ್ಮ್ ಎಂಡ್ ದಿನಾಂಕ ನಂತರ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ ಪದವನ್ನು ಸಂಪರ್ಕಿತ ಉದ್ದವಾಗಿರುವಂತಿಲ್ಲ (ಅಕಾಡೆಮಿಕ್ ಇಯರ್ {}). ದಯವಿಟ್ಟು ದಿನಾಂಕಗಳನ್ನು ಸರಿಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ಸ್ಥಿರ ಆಸ್ತಿ&quot; ಆಸ್ತಿ ದಾಖಲೆ ಐಟಂ ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವಂತೆ, ಪರಿಶೀಲಿಸದೆ ಸಾಧ್ಯವಿಲ್ಲ"
 DocType: Vehicle Service,Brake Oil,ಬ್ರೇಕ್ ಆಯಿಲ್
 DocType: Tax Rule,Tax Type,ಜನಪ್ರಿಯ ಕೌಟುಂಬಿಕತೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ನೀವು ಮೊದಲು ನಮೂದುಗಳನ್ನು ಸೇರಿಸಲು ಅಥವ ಅಪ್ಡೇಟ್ ಅಧಿಕಾರ {0}
 DocType: BOM,Item Image (if not slideshow),ಐಟಂ ಚಿತ್ರ (ಇಲ್ಲದಿದ್ದರೆ ಸ್ಲೈಡ್ಶೋ )
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ಗ್ರಾಹಕ ಅದೇ ಹೆಸರಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ಅವರ್ ದರ / 60) * ವಾಸ್ತವಿಕ ಆಪರೇಷನ್ ಟೈಮ್
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,ಬಿಒಎಮ್ ಆಯ್ಕೆ
 DocType: SMS Log,SMS Log,ಎಸ್ಎಂಎಸ್ ಲಾಗಿನ್
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ತಲುಪಿಸುವುದಾಗಿರುತ್ತದೆ ವೆಚ್ಚ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} ರಜೆ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಅಲ್ಲ
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,ಶಾಲೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ಯಾವುದೇ ರಜೆ ದಾಖಲೆ ನೌಕರ ಕಂಡು {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ಮೊದಲ ಕಂಪನಿ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,ಮೊದಲ ಕಂಪನಿ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ಒಟ್ಟು ವೆಚ್ಚ
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು
 DocType: Employee,Mr,ಶ್ರೀ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer ಗುಂಪು ಟೇಬಲ್ ಕಂಡುಬರುವ ನಕಲು ಗ್ರಾಹಕ ಗುಂಪಿನ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ಸರಬರಾಜುದಾರ ಟೈಪ್ / ಸರಬರಾಜುದಾರ
 DocType: Naming Series,Prefix,ಮೊದಲೇ ಜೋಡಿಸು
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ಉಪಭೋಗ್ಯ
 DocType: Employee,B-,ಬಿ
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,ಗ್ರೇಡ್
 DocType: Sales Invoice Item,Delivered By Supplier,ಸರಬರಾಜುದಾರ ವಿತರಣೆ
 DocType: SMS Center,All Contact,ಎಲ್ಲಾ ಸಂಪರ್ಕಿಸಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಈಗಾಗಲೇ ಬಿಒಎಮ್ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ವಾರ್ಷಿಕ ಸಂಬಳ
 DocType: Daily Work Summary,Daily Work Summary,ದೈನಂದಿನ ಕೆಲಸ ಸಾರಾಂಶ
 DocType: Period Closing Voucher,Closing Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಕ್ಲೋಸಿಂಗ್
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ದಯವಿಟ್ಟು ಖಾತೆಗಳ ಪಟ್ಟಿ ರಚಿಸಲು ಕಂಪನಿಯ ಆಯ್ಕೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ಸ್ಟಾಕ್ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್ ಆಯ್ಕೆ
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,ಕಾಂಟ್ರಾ ಎಂಟ್ರಿ
 DocType: Journal Entry Account,Credit in Company Currency,ಕಂಪನಿ ಕರೆನ್ಸಿ ಕ್ರೆಡಿಟ್
 DocType: Delivery Note,Installation Status,ಅನುಸ್ಥಾಪನ ಸ್ಥಿತಿಯನ್ನು
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ನೀವು ಹಾಜರಾತಿ ನವೀಕರಿಸಲು ಬಯಸುತ್ತೀರಾ? <br> ಪ್ರೆಸೆಂಟ್: {0} \ <br> ಆಬ್ಸೆಂಟ್: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ಅಕ್ಸೆಪ್ಟೆಡ್ + ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ ಐಟಂ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣಕ್ಕೆ ಸಮ ಇರಬೇಕು {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ಪೂರೈಕೆ ಕಚ್ಚಾ ವಸ್ತುಗಳ ಖರೀದಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ಪಾವತಿಯ ಕನಿಷ್ಟ ಒಂದು ಮಾದರಿ ಪಿಓಎಸ್ ಸರಕುಪಟ್ಟಿ ಅಗತ್ಯವಿದೆ.
 DocType: Products Settings,Show Products as a List,ಪ್ರದರ್ಶನ ಉತ್ಪನ್ನಗಳು ಪಟ್ಟಿಯೆಂದು
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", ಟೆಂಪ್ಲೇಟು ಸೂಕ್ತ ಮಾಹಿತಿ ತುಂಬಲು ಮತ್ತು ಬದಲಾಯಿಸಲಾಗಿತ್ತು ಕಡತ ಲಗತ್ತಿಸಬಹುದು.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ಸವಕಳಿ ಎಂಟ್ರಿ ಮಾಡಿ
 DocType: Appraisal Template Goal,KRA,ಕ್ರಾ
 DocType: Lead,Request Type,ವಿನಂತಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ನೌಕರರ ಮಾಡಿ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ನೌಕರರ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ಬ್ರಾಡ್ಕಾಸ್ಟಿಂಗ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ಎಕ್ಸಿಕ್ಯೂಶನ್
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ಕಾರ್ಯಾಚರಣೆಗಳ ವಿವರಗಳು ನಡೆಸಿತು.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ನಿರ್ವಹಣೆ ಭೇಟಿ ಯೋಜನೆ .
 DocType: SMS Settings,Enter url parameter for message,ಸಂದೇಶವು URL ಪ್ಯಾರಾಮೀಟರ್ ಯನ್ನು
 DocType: POS Profile,Customer Groups,ಗ್ರಾಹಕ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ಹಣಕಾಸಿನ ಹೇಳಿಕೆಗಳು
 DocType: Guardian,Students,ವಿದ್ಯಾರ್ಥಿಗಳು
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ಬೆಲೆ ಮತ್ತು ರಿಯಾಯಿತಿ ಅಳವಡಿಸುವ ನಿಯಮಗಳು .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ ಅಥವಾ ಮಾರಾಟದ ಜ ಇರಬೇಕು
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ಈ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಸರಣಿ ಪಟ್ಟಿ
 DocType: Company,Default Payroll Payable Account,ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ಅಪ್ಡೇಟ್ ಇಮೇಲ್ ಗುಂಪು
 DocType: Sales Invoice,Is Opening Entry,ಎಂಟ್ರಿ ಆರಂಭ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ಅನ್ವಯಿಸಿದರೆ
 DocType: Course Schedule,Instructor Name,ಬೋಧಕ ಹೆಸರು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ವೇರ್ಹೌಸ್ ಬೇಕಾಗುತ್ತದೆ ಮೊದಲು ಸಲ್ಲಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,ಮರುಮಾರಾಟ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ಪರಿಶೀಲಿಸಿದರೆ, ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಅಲ್ಲದ ಸ್ಟಾಕ್ ಐಟಂಗಳನ್ನು ಒಳಗೊಂಡಿದೆ."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಐಟಂ ವಿರುದ್ಧ
 ,Production Orders in Progress,ಪ್ರೋಗ್ರೆಸ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ಹಣಕಾಸು ನಿವ್ವಳ ನಗದು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಲು ಮಾಡಲಿಲ್ಲ"
 DocType: Lead,Address & Contact,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕ
 DocType: Leave Allocation,Add unused leaves from previous allocations,ಹಿಂದಿನ ಹಂಚಿಕೆಗಳು ರಿಂದ ಬಳಕೆಯಾಗದ ಎಲೆಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ಮುಂದಿನ ಮರುಕಳಿಸುವ {0} ಮೇಲೆ ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ಒಟ್ಟು ಕಾಸ್ಟಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 DocType: Item Website Specification,Item Website Specification,ವಸ್ತು ವಿಶೇಷತೆಗಳು ವೆಬ್ಸೈಟ್
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ಬಿಡಿ ನಿರ್ಬಂಧಿಸಿದ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ಐಟಂ {0} ಜೀವನದ ತನ್ನ ಕೊನೆಯಲ್ಲಿ ತಲುಪಿದೆ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ಬ್ಯಾಂಕ್ ನಮೂದುಗಳು
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ವಾರ್ಷಿಕ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಐಟಂ
 DocType: Stock Entry,Sales Invoice No,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ನಂ
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,ಹಬ್ ಪ್ರಕಟಿಸಿ
 DocType: Student Admission,Student Admission,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ಐಟಂ {0} ರದ್ದು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Bank Reconciliation,Update Clearance Date,ಅಪ್ಡೇಟ್ ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
 DocType: Item,Purchase Details,ಖರೀದಿ ವಿವರಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ಖರೀದಿ ಆದೇಶದ &#39;ಕಚ್ಚಾ ವಸ್ತುಗಳ ಸರಬರಾಜು ಕೋಷ್ಟಕದಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ ಐಟಂ {0} {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ಅತ್ಯುತ್ತಮ ಚೆಕ್ ಮತ್ತು ತೆರವುಗೊಳಿಸಲು ಠೇವಣಿಗಳ
 DocType: Item,Synced With Hub,ಹಬ್ ಸಿಂಕ್
 DocType: Vehicle,Fleet Manager,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},ರೋ # {0}: {1} ಐಟಂ ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},ರೋ # {0}: {1} ಐಟಂ ನಕಾರಾತ್ಮಕವಾಗಿರಬಾರದು {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,ತಪ್ಪು ಪಾಸ್ವರ್ಡ್
 DocType: Item,Variant Of,ಭಿನ್ನ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',ಹೆಚ್ಚು 'ಪ್ರಮಾಣ ತಯಾರಿಸಲು' ಮುಗಿದಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Period Closing Voucher,Closing Account Head,ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಹೆಡ್
 DocType: Employee,External Work History,ಬಾಹ್ಯ ಕೆಲಸ ಇತಿಹಾಸ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ಸುತ್ತೋಲೆ ಆಧಾರದೋಷ
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ಸ್ವಯಂಚಾಲಿತ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಸೃಷ್ಟಿ ಮೇಲೆ ಈಮೇಲ್ ಸೂಚಿಸಿ
 DocType: Journal Entry,Multi Currency,ಮಲ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Payment Reconciliation Invoice,Invoice Type,ಸರಕುಪಟ್ಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ತೆರಿಗೆಗಳು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ಮಾರಾಟ ಆಸ್ತಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ನೀವು ಹೊರಹಾಕಿದ ನಂತರ ಪಾವತಿ ಎಂಟ್ರಿ ಮಾರ್ಪಡಿಸಲಾಗಿದೆ. ಮತ್ತೆ ಎಳೆಯಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
-DocType: Grade Interval,Min Score,ನಿಮಿಷ ಸ್ಕೋರ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ಐಟಂ ತೆರಿಗೆ ಎರಡು ಬಾರಿ ಪ್ರವೇಶಿಸಿತು
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ಈ ವಾರ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Student Applicant,Admitted,ಒಪ್ಪಿಕೊಂಡರು
 DocType: Workstation,Rent Cost,ಬಾಡಿಗೆ ವೆಚ್ಚ
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ಆರ್ಡರ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ಪಕ್ಷದ ವಿರುದ್ಧ ಅಥವಾ ಆಂತರಿಕ ವರ್ಗಾವಣೆ ಬ್ಯಾಂಕ್ / ನಗದು ವ್ಯವಹಾರಗಳನ್ನು
 DocType: Shipping Rule,Valid for Countries,ದೇಶಗಳಿಗೆ ಅನ್ವಯಿಸುತ್ತದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ಈ ಐಟಂ ಒಂದು ಟೆಂಪ್ಲೇಟು ಮತ್ತು ವ್ಯವಹಾರಗಳಲ್ಲಿ ಬಳಸಲಾಗುವುದಿಲ್ಲ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಐಟಂ ಲಕ್ಷಣಗಳು ವೇರಿಯಂಟುಗಳನ್ನು ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ಪರಿಗಣಿಸಲಾದ ಒಟ್ಟು ಆರ್ಡರ್
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ನೌಕರರ ಹುದ್ದೆ ( ಇ ಜಿ ಸಿಇಒ , ನಿರ್ದೇಶಕ , ಇತ್ಯಾದಿ ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ನಮೂದಿಸಿ fieldValue ' ತಿಂಗಳಿನ ದಿನ ಪುನರಾವರ್ತಿಸಿ '
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ರೋ # {0} ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಸಾಧ್ಯವಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಆಸ್ತಿಯ ಕುರಿತು ಮಾಡಿದ {1}
 DocType: Item Tax,Tax Rate,ತೆರಿಗೆ ದರ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ಈಗಾಗಲೇ ನೌಕರರ ಹಂಚಿಕೆ {1} ಗೆ ಅವಧಿಯಲ್ಲಿ {2} ಫಾರ್ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ಆಯ್ಕೆ ಐಟಂ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಿದ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ರೋ # {0}: ಬ್ಯಾಚ್ ಯಾವುದೇ ಅದೇ ಇರಬೇಕು {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ಅ ಗ್ರೂಪ್ ಗೆ ಪರಿವರ್ತಿಸಿ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ಐಟಂ ಬ್ಯಾಚ್ ( ಬಹಳಷ್ಟು ) .
 DocType: C-Form Invoice Detail,Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 DocType: GL Entry,Debit Amount,ಡೆಬಿಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ಮಾತ್ರ ಕಂಪನಿ ಪ್ರತಿ 1 ಖಾತೆ ಇಲ್ಲದಂತಾಗುತ್ತದೆ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ಬಾಂಧವ್ಯ ನೋಡಿ
 DocType: Purchase Order,% Received,% ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ರಚಿಸಿ
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,ಉದ್ಧರಣ ವಿನಂತಿ
 DocType: Salary Slip Timesheet,Working Hours,ದುಡಿಮೆಯು
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಸರಣಿಯ ಆರಂಭಿಕ / ಪ್ರಸ್ತುತ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಬದಲಾಯಿಸಿ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
-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.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ಹೊಸ ಗ್ರಾಹಕ ರಚಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ಅನೇಕ ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲುಗೈ ಮುಂದುವರಿದರೆ, ಬಳಕೆದಾರರು ಸಂಘರ್ಷ ಪರಿಹರಿಸಲು ಕೈಯಾರೆ ಆದ್ಯತಾ ಸೆಟ್ ತಿಳಿಸಲಾಗುತ್ತದೆ."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ಖರೀದಿ ಆದೇಶಗಳನ್ನು ರಚಿಸಿ
 ,Purchase Register,ಖರೀದಿ ನೋಂದಣಿ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ಅನ್ವಯಿಸುವ ಆರೋಪಗಳನ್ನು
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ಪಾತ್ರ ಹೊಂದಿರಬೇಕು 'ಬಿಡಿ ಅನುಮೋದಕ'
 DocType: Purchase Receipt,Vehicle Date,ವಾಹನ ದಿನಾಂಕ
 DocType: Student Log,Medical,ವೈದ್ಯಕೀಯ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ಸೋತ ಕಾರಣ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ಸೋತ ಕಾರಣ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ಲೀಡ್ ಮಾಲೀಕ ಲೀಡ್ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಹೊರಹೊಮ್ಮಿತು ಪ್ರಮಾಣದ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Announcement,Receiver,ಸ್ವೀಕರಿಸುವವರ
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ಪ್ರಮಾಣ ಮತ್ತು ದರ
 DocType: Delivery Note,% Installed,% ಅನುಸ್ಥಾಪಿಸಲಾದ
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ಪಾಠದ / ಲ್ಯಾಬೋರೇಟರೀಸ್ ಇತ್ಯಾದಿ ಉಪನ್ಯಾಸಗಳು ಮಾಡಬಹುದು ನಿಗದಿತ ಅಲ್ಲಿ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,Supplier Name,ಸರಬರಾಜುದಾರ ಹೆಸರು
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext ಮ್ಯಾನುಯಲ್ ಓದಿ
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ಕಡ್ಡಾಯ - ಅಕಾಡೆಮಿಕ್ ಇಯರ್
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ಕಡ್ಡಾಯ - ಅಕಾಡೆಮಿಕ್ ಇಯರ್
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ಮಾಡಿದರು ಇಮೇಲ್ ಒಂದು ಭಾಗವಾಗಿ ಹೋಗುತ್ತದೆ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಕಸ್ಟಮೈಸ್ . ಪ್ರತಿ ವ್ಯವಹಾರ ಪ್ರತ್ಯೇಕ ಪರಿಚಯಾತ್ಮಕ ಪಠ್ಯ ಹೊಂದಿದೆ .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಗೆ ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ಹೊಂದಿಸಿ {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ಎಲ್ಲಾ ಉತ್ಪಾದನಾ ಪ್ರಕ್ರಿಯೆಗಳು ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು.
 DocType: Accounts Settings,Accounts Frozen Upto,ಘನೀಕೃತ ವರೆಗೆ ಖಾತೆಗಳು
 DocType: SMS Log,Sent On,ಕಳುಹಿಸಲಾಗಿದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ಗುಣಲಕ್ಷಣ {0} ಗುಣಲಕ್ಷಣಗಳು ಟೇಬಲ್ ಅನೇಕ ಬಾರಿ ಆಯ್ಕೆ
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ಹಾಲಿಡೇ ಮಾಸ್ಟರ್ .
 DocType: Request for Quotation Item,Required Date,ಅಗತ್ಯವಿರುವ ದಿನಾಂಕ
 DocType: Delivery Note,Billing Address,ಬಿಲ್ಲಿಂಗ್ ವಿಳಾಸ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ.
 DocType: BOM,Costing,ಕಾಸ್ಟಿಂಗ್
 DocType: Tax Rule,Billing County,ಬಿಲ್ಲಿಂಗ್ ಕೌಂಟಿ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ಪರಿಶೀಲಿಸಿದರೆ ಈಗಾಗಲೇ ಮುದ್ರಣ ದರ / ಪ್ರಿಂಟ್ ಪ್ರಮಾಣ ಸೇರಿಸಲಾಗಿದೆ ಎಂದು , ತೆರಿಗೆ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಲಾಗುವುದು"
@@ -508,6 +512,7 @@
 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,ಸೆಕ್ಯುರಿಟೀಸ್ ಮತ್ತು ನಿಕ್ಷೇಪಗಳು
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಇದು ಹೊಂದಿಲ್ಲ ಕೆಲವು ಐಟಂಗಳನ್ನು ವಿರುದ್ಧ ವ್ಯವಹಾರ ಇರುವುದರಿಂದ ಆದ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ ಇಲ್ಲಿದೆ"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ಹಂಚಿಕೆ ಒಟ್ಟು ಎಲೆಗಳು ಕಡ್ಡಾಯ
 DocType: Job Opening,Description of a Job Opening,ಒಂದು ಉದ್ಯೋಗಾವಕಾಶದ ವಿವರಣೆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ಇಂದು ಬಾಕಿ ಚಟುವಟಿಕೆಗಳನ್ನು
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ದಯವಿಟ್ಟು ಕೋರ್ಸ್ ಆಯ್ಕೆ
 DocType: Timesheet Detail,Hrs,ಗಂಟೆಗಳ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 DocType: Stock Entry Detail,Difference Account,ವ್ಯತ್ಯಾಸ ಖಾತೆ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ಇದನ್ನು ಅವಲಂಬಿಸಿರುವ ಕೆಲಸವನ್ನು {0} ಮುಚ್ಚಿಲ್ಲ ಹತ್ತಿರಕ್ಕೆ ಕೆಲಸವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ವೇರ್ಹೌಸ್ ವಸ್ತು ವಿನಂತಿಯನ್ನು ಏರಿಸಲಾಗುತ್ತದೆ ಇದಕ್ಕಾಗಿ ನಮೂದಿಸಿ
 DocType: Production Order,Additional Operating Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚವನ್ನು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ಕಾಸ್ಮೆಟಿಕ್ಸ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ವಿಲೀನಗೊಳ್ಳಲು , ನಂತರ ಲಕ್ಷಣಗಳು ಐಟಂಗಳನ್ನು ಸಾಮಾನ್ಯ ಇರಬೇಕು"
 DocType: Shipping Rule,Net Weight,ನೆಟ್ ತೂಕ
 DocType: Employee,Emergency Phone,ತುರ್ತು ದೂರವಾಣಿ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ಖರೀದಿ
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ದಯವಿಟ್ಟು ಥ್ರೆಶ್ಹೋಲ್ಡ್ 0% ಗ್ರೇಡ್ ವ್ಯಾಖ್ಯಾನಿಸಲು
 DocType: Sales Order,To Deliver,ತಲುಪಿಸಲು
 DocType: Purchase Invoice Item,Item,ವಸ್ತು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,ಸೀರಿಯಲ್ ಯಾವುದೇ ಐಟಂ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Journal Entry,Difference (Dr - Cr),ವ್ಯತ್ಯಾಸ ( ಡಾ - ಸಿಆರ್)
 DocType: Account,Profit and Loss,ಲಾಭ ಮತ್ತು ನಷ್ಟ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ವ್ಯವಸ್ಥಾಪಕ ಉಪಗುತ್ತಿಗೆ
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ಹೆಚ್ಚಳವನ್ನು 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Production Planning Tool,Material Requirement,ಮೆಟೀರಿಯಲ್ ಅವಶ್ಯಕತೆ
 DocType: Company,Delete Company Transactions,ಕಂಪನಿ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ರೆಫರೆನ್ಸ್ ಯಾವುದೇ ಮತ್ತು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಬ್ಯಾಂಕ್ ವ್ಯವಹಾರ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ಸೇರಿಸಿ / ಸಂಪಾದಿಸಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
 DocType: Purchase Invoice,Supplier Invoice No,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ನಂ
 DocType: Territory,For reference,ಪರಾಮರ್ಶೆಗಾಗಿ
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,ಅನುಸ್ಥಾಪನೆ ಸೂಚನೆ ಐಟಂ
 DocType: Production Plan Item,Pending Qty,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Budget,Ignore,ಕಡೆಗಣಿಸು
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ಸಕ್ರಿಯವಾಗಿಲ್ಲ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ಎಸ್ಎಂಎಸ್ ಸಂಖ್ಯೆಗಳನ್ನು ಕಳುಹಿಸಲಾಗುತ್ತದೆ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ಮುದ್ರಣ ಸೆಟಪ್ ಚೆಕ್ ಆಯಾಮಗಳು
 DocType: Salary Slip,Salary Slip Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,ಒಟ್ಟು ಆಯೋಗ
 DocType: Pricing Rule,Sales Partner,ಮಾರಾಟದ ಸಂಗಾತಿ
 DocType: Buying Settings,Purchase Receipt Required,ಅಗತ್ಯ ಖರೀದಿ ರಸೀತಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ತೆರೆಯುವ ಸ್ಟಾಕ್ ಪ್ರವೇಶಿಸಿತು ಮೌಲ್ಯಾಂಕನ ದರ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ಸರಕುಪಟ್ಟಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ಮೊದಲ ಕಂಪನಿ ಮತ್ತು ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ಹಣಕಾಸು / ಲೆಕ್ಕಪರಿಶೋಧಕ ವರ್ಷ .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ಕ್ರೋಢಿಕೃತ ಮೌಲ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ಕ್ಷಮಿಸಿ, ಸೀರಿಯಲ್ ಸೂಲ ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,ಮಾಡಿ ಮಾರಾಟದ ಆರ್ಡರ್
 DocType: Project Task,Project Task,ಪ್ರಾಜೆಕ್ಟ್ ಟಾಸ್ಕ್
 ,Lead Id,ಲೀಡ್ ಸಂ
 DocType: C-Form Invoice Detail,Grand Total,ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,ಪುನರಾರಂಭಿಸು ಲಗತ್ತು
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ಮತ್ತೆ ಗ್ರಾಹಕರ
 DocType: Leave Control Panel,Allocate,ಗೊತ್ತುಪಡಿಸು
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,ಮಾರಾಟದ ರಿಟರ್ನ್
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ಗಮನಿಸಿ: ಒಟ್ಟು ನಿಯೋಜಿತವಾದ ಎಲೆಗಳನ್ನು {0} ಈಗಾಗಲೇ ಅನುಮೋದನೆ ಎಲೆಗಳು ಕಡಿಮೆ ಮಾಡಬಾರದು {1} ಕಾಲ
 DocType: Announcement,Posted By,ಪೋಸ್ಟ್ ಮಾಡಿದವರು
 DocType: Item,Delivered by Supplier (Drop Ship),ಸರಬರಾಜುದಾರ ವಿತರಣೆ (ಡ್ರಾಪ್ ಹಡಗು)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,ಉದ್ಧರಣಾ
 DocType: Lead,Middle Income,ಮಧ್ಯಮ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ತೆರೆಯುತ್ತಿದೆ ( ಸಿಆರ್)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ದಯವಿಟ್ಟು ಕಂಪನಿ ಸೆಟ್
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ರೆಫರೆನ್ಸ್ ನಂ & ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ಅಗತ್ಯವಿದೆ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ಮಾಡಲು ಆಯ್ಕೆ ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ಎಲೆಗಳು, ಖರ್ಚು ಹಕ್ಕು ಮತ್ತು ವೇತನದಾರರ ನಿರ್ವಹಿಸಲು ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ಜ್ಞಾನ ನೆಲೆ ಸೇರಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ಪ್ರೊಪೋಸಲ್ ಬರವಣಿಗೆ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ಪಾವತಿ ಎಂಟ್ರಿ ಡಿಡಕ್ಷನ್
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} ' {1} ' ಅಲ್ಲ ವರ್ಷದಲ್ಲಿ {2}
 DocType: Buying Settings,Settings for Buying Module,ಮಾಡ್ಯೂಲ್ ಬೈಯಿಂಗ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},ಆಸ್ತಿ {0} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,ಮೊದಲ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ನಂತರ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಗ್ರಾಹಕ ಆಧಾರಿತ ಸೋಸುತ್ತವೆ, ಗ್ರಾಹಕ ಗುಂಪಿನ, ಪ್ರದೇಶ, ಸರಬರಾಜುದಾರ, ಸರಬರಾಜುದಾರ ಪ್ರಕಾರ, ಪ್ರಚಾರ, ಮಾರಾಟದ ಸಂಗಾತಿ ಇತ್ಯಾದಿ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ಇನ್ವೆಂಟರಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ನೌಕರರ ಸಾಲ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
 DocType: Employee,Passport Number,ಪಾಸ್ಪೋರ್ಟ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ಸಂಬಂಧ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ವ್ಯವಸ್ಥಾಪಕ
 DocType: Payment Entry,Payment From / To,ಪಾವತಿ / ಹೋಗು
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ದಿನಾಂಕ ಶ್ರೇಣಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ಹೊಸ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಗ್ರಾಹಕ ಪ್ರಸ್ತುತ ಬಾಕಿ ಮೊತ್ತದ ಕಡಿಮೆ. ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಕನಿಷ್ಠ ಎಂದು ಹೊಂದಿದೆ {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'ಆಧರಿಸಿ ' ಮತ್ತು ' ಗುಂಪಿನ ' ಇರಲಾಗುವುದಿಲ್ಲ
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,ನಿಮಿಷಗಳಲ್ಲಿ
 DocType: Issue,Resolution Date,ರೆಸಲ್ಯೂಶನ್ ದಿನಾಂಕ
 DocType: Student Batch Name,Batch Name,ಬ್ಯಾಚ್ ಹೆಸರು
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet ದಾಖಲಿಸಿದವರು:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ಪಾವತಿಯ ಮಾದರಿಯು ಡೀಫಾಲ್ಟ್ ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ಸೆಟ್ ದಯವಿಟ್ಟು {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ದಾಖಲಾಗಿ
 DocType: Selling Settings,Customer Naming By,ಗ್ರಾಹಕ ಹೆಸರಿಸುವ ಮೂಲಕ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ವಿದ್ಯಾರ್ಥಿಗಳ ಮಾಸಿಕ ಅಟೆಂಡೆನ್ಸ್ ವರದಿ ಎಂದೇ ಪ್ರೆಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ತೋರಿಸುತ್ತದೆ
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,ನಿಜವಾದ ಟೈಮ್
 DocType: BOM Operation,Operation Time,ಆಪರೇಷನ್ ಟೈಮ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,ಮುಕ್ತಾಯ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ಬೇಸ್
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,ಬೇಸ್
 DocType: Timesheet,Total Billed Hours,ಒಟ್ಟು ಖ್ಯಾತವಾದ ಅವರ್ಸ್
 DocType: Journal Entry,Write Off Amount,ಪ್ರಮಾಣ ಆಫ್ ಬರೆಯಿರಿ
 DocType: Journal Entry,Bill No,ಬಿಲ್ ನಂ
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,ವಿದ್ಯಾರ್ಥಿ ಅಟೆಂಡೆನ್ಸ್
 DocType: Sales Invoice Timesheet,Time Sheet,ವೇಳಾಚೀಟಿ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ಕಚ್ಚಾ ವಸ್ತುಗಳ ಆಧರಿಸಿದ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ಐಟಂ ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Interest,Interest,ಆಸಕ್ತಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ಪೂರ್ವ ಮಾರಾಟದ
 DocType: Purchase Receipt,Other Details,ಇತರೆ ವಿವರಗಳು
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ಪಾವತಿ ಎಂಟ್ರಿ ಈಗಾಗಲೇ ರಚಿಸಲಾಗಿದೆ
 DocType: Purchase Receipt Item Supplied,Current Stock,ಪ್ರಸ್ತುತ ಸ್ಟಾಕ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಐಟಂ ಲಿಂಕ್ ಇಲ್ಲ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ಮುನ್ನೋಟ ಸಂಬಳ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ಖಾತೆ {0} ಅನೇಕ ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Account,Expenses Included In Valuation,ವೆಚ್ಚಗಳು ಮೌಲ್ಯಾಂಕನ ಸೇರಿಸಲಾಗಿದೆ
 DocType: Hub Settings,Seller City,ಮಾರಾಟಗಾರ ಸಿಟಿ
 ,Absent Student Report,ಆಬ್ಸೆಂಟ್ ವಿದ್ಯಾರ್ಥಿ ವರದಿ
 DocType: Email Digest,Next email will be sent on:,ಮುಂದೆ ಇಮೇಲ್ ಮೇಲೆ ಕಳುಹಿಸಲಾಗುವುದು :
 DocType: Offer Letter Term,Offer Letter Term,ಪತ್ರ ಟರ್ಮ್ ಆಫರ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ಐಟಂ ವೇರಿಯಂಟ್.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ಐಟಂ {0} ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Bin,Stock Value,ಸ್ಟಾಕ್ ಮೌಲ್ಯ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ಕಂಪನಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,ಟ್ರೀ ಕೌಟುಂಬಿಕತೆ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ಪ್ರಮಾಣ ಘಟಕ ಬಳಸುತ್ತಿರುವ
 DocType: Serial No,Warranty Expiry Date,ಖಾತರಿ ಅಂತ್ಯ ದಿನಾಂಕ
 DocType: Material Request Item,Quantity and Warehouse,ಪ್ರಮಾಣ ಮತ್ತು ವೇರ್ಹೌಸ್
 DocType: Sales Invoice,Commission Rate (%),ಕಮಿಷನ್ ದರ ( % )
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ದಯವಿಟ್ಟು ಆಯ್ಕೆ ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ
 DocType: Project,Estimated Cost,ಅಂದಾಜು ವೆಚ್ಚ
@@ -769,7 +771,7 @@
 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,ಡೀಫಾಲ್ಟ್ ಖಾತೆ
 DocType: Payment Entry,Received Amount (Company Currency),ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,ಅವಕಾಶ ಪ್ರಮುಖ ತಯಾರಿಸಲಾಗುತ್ತದೆ ವೇಳೆ ಲೀಡ್ ಸೆಟ್ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ಸಾಪ್ತಾಹಿಕ ದಿನ ಆಫ್ ಆಯ್ಕೆಮಾಡಿ
 DocType: Production Order Operation,Planned End Time,ಯೋಜಿತ ಎಂಡ್ ಟೈಮ್
 ,Sales Person Target Variance Item Group-Wise,ಮಾರಾಟಗಾರನ ಟಾರ್ಗೆಟ್ ವೈಷಮ್ಯವನ್ನು ಐಟಂ ಗ್ರೂಪ್ ವೈಸ್
@@ -785,6 +787,7 @@
 DocType: Opportunity,Opportunity From,ಅವಕಾಶದಿಂದ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ಮಾಸಿಕ ವೇತನವನ್ನು ಹೇಳಿಕೆ .
 DocType: BOM,Website Specifications,ವೆಬ್ಸೈಟ್ ವಿಶೇಷಣಗಳು
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ಗೆ {0} ರೀತಿಯ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ರೋ {0}: ಪರಿವರ್ತಿಸುವುದರ ಕಡ್ಡಾಯ
@@ -838,6 +841,7 @@
 DocType: Employee,Bank A/C No.,ಬ್ಯಾಂಕ್ ಎ / ಸಿ ಸಂಖ್ಯೆ
 DocType: Bank Guarantee,Project,ಯೋಜನೆ
 DocType: Quality Inspection Reading,Reading 7,7 ಓದುವಿಕೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,ಭಾಗಶಃ ಆದೇಶ
 DocType: Expense Claim Detail,Expense Claim Type,ಖರ್ಚು ClaimType
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ಆಸ್ತಿ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಮೂಲಕ ಕೈಬಿಟ್ಟಿತು {0}
@@ -845,14 +849,14 @@
 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 +107,Office Maintenance Expenses,ಕಚೇರಿ ನಿರ್ವಹಣಾ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ಇಮೇಲ್ ಖಾತೆಯನ್ನು ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ಮೊದಲ ಐಟಂ ನಮೂದಿಸಿ
 DocType: Account,Liability,ಹೊಣೆಗಾರಿಕೆ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ಮಂಜೂರು ಪ್ರಮಾಣ ರೋನಲ್ಲಿ ಹಕ್ಕು ಪ್ರಮಾಣವನ್ನು ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,ಬೆಲೆ ಪಟ್ಟಿಯನ್ನು ಅಲ್ಲ
 DocType: Employee,Family Background,ಕೌಟುಂಬಿಕ ಹಿನ್ನೆಲೆ
 DocType: Request for Quotation Supplier,Send Email,ಇಮೇಲ್ ಕಳುಹಿಸಿ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ಎಚ್ಚರಿಕೆ: ಅಮಾನ್ಯ ಲಗತ್ತು {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ಯಾವುದೇ ಅನುಮತಿ
 DocType: Company,Default Bank Account,ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ಪಕ್ಷದ ಆಧಾರದ ಮೇಲೆ ಫಿಲ್ಟರ್ ಆರಿಸಿ ಪಕ್ಷದ ಮೊದಲ ನೀಡಿರಿ
@@ -865,8 +869,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ಯಾವುದೇ ನೌಕರ
 DocType: Supplier Quotation,Stopped,ನಿಲ್ಲಿಸಿತು
 DocType: Item,If subcontracted to a vendor,ಮಾರಾಟಗಾರರ ಗೆ subcontracted ವೇಳೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಈಗಾಗಲೇ ನವೀಕರಿಸಲಾಗಿದೆ.
 DocType: SMS Center,All Customer Contact,ಎಲ್ಲಾ ಗ್ರಾಹಕ ಸಂಪರ್ಕ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV ಮೂಲಕ ಸ್ಟಾಕ್ ಸಮತೋಲನ ಅಪ್ಲೋಡ್ .
 DocType: Warehouse,Tree Details,ಟ್ರೀ ವಿವರಗಳು
@@ -877,8 +881,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ಕನಿಷ್ಠ ಸರಕುಪಟ್ಟಿ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ವೆಚ್ಚದ ಕೇಂದ್ರ {2} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ಖಾತೆ {2} ಒಂದು ಗುಂಪು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ಐಟಂ ರೋ {IDX}: {DOCTYPE} {DOCNAME} ಮೇಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ &#39;{DOCTYPE}&#39; ಟೇಬಲ್
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ಈಗಾಗಲೇ ಪೂರ್ಣಗೊಂಡ ಅಥವಾ ರದ್ದು
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ಯಾವುದೇ ಕಾರ್ಯಗಳು
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ಸ್ವಯಂ ಸರಕುಪಟ್ಟಿ 05, 28 ಇತ್ಯಾದಿ ಉದಾ ರಚಿಸಲಾಗಿದೆ ಮೇಲೆ ತಿಂಗಳ ದಿನ"
 DocType: Asset,Opening Accumulated Depreciation,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ
@@ -894,7 +898,7 @@
 DocType: Bin,Moving Average Rate,ಮೂವಿಂಗ್ ಸರಾಸರಿ ದರ
 DocType: Production Planning Tool,Select Items,ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ಬಿಲ್ ವಿರುದ್ಧ {1} ರ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ಕೋರ್ಸ್ ಶೆಡ್ಯೂಲ್
 DocType: Maintenance Visit,Completion Status,ಪೂರ್ಣಗೊಂಡ ಸ್ಥಿತಿ
 DocType: HR Settings,Enter retirement age in years,ವರ್ಷಗಳಲ್ಲಿ ನಿವೃತ್ತಿ ವಯಸ್ಸು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ಟಾರ್ಗೆಟ್ ವೇರ್ಹೌಸ್
@@ -902,7 +906,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ಈ ಶೇಕಡಾ ವರೆಗೆ ವಿತರಣೆ ಅಥವಾ ರಶೀದಿ ಮೇಲೆ ಅವಕಾಶ
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ಆಮದು ಅಟೆಂಡೆನ್ಸ್
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ಎಲ್ಲಾ ಐಟಂ ಗುಂಪುಗಳು
 DocType: Process Payroll,Activity Log,ಚಟುವಟಿಕೆ ಲಾಗ್
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ನಿವ್ವಳ ಲಾಭ / ನಷ್ಟ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ವ್ಯವಹಾರಗಳ ಸಲ್ಲಿಕೆಯಲ್ಲಿ ಸಂದೇಶವನ್ನು ರಚಿಸಿದರು .
@@ -913,7 +917,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ಪಾವತಿ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ಪ್ರಮಾಣ ಯೋಜಿತ
 DocType: Sales Invoice,Payment Due Date,ಪಾವತಿ ಕಾರಣ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಈಗಾಗಲೇ ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',ಉದ್ಘಾಟಿಸುತ್ತಿರುವುದು
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ಮಾಡಬೇಕಾದುದು ಓಪನ್
 DocType: Notification Control,Delivery Note Message,ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸಂದೇಶ
@@ -929,7 +933,7 @@
 DocType: Item Reorder,Re-Order Qty,ಮರು ಪ್ರಮಾಣ ಆದೇಶ
 DocType: Leave Block List Date,Leave Block List Date,ಖಂಡ ದಿನಾಂಕ ಬಿಡಿ
 DocType: Pricing Rule,Price or Discount,ಬೆಲೆ ಅಥವಾ ಡಿಸ್ಕೌಂಟ್
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ಖರೀದಿ ರಸೀತಿ ವಸ್ತುಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಒಟ್ಟು ಅನ್ವಯಿಸುವ ತೆರಿಗೆ ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಅದೇ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ಖರೀದಿ ರಸೀತಿ ವಸ್ತುಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಒಟ್ಟು ಅನ್ವಯಿಸುವ ತೆರಿಗೆ ಒಟ್ಟು ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಅದೇ ಇರಬೇಕು
 DocType: Sales Team,Incentives,ಪ್ರೋತ್ಸಾಹ
 DocType: SMS Log,Requested Numbers,ಕೋರಿಕೆ ಸಂಖ್ಯೆಗಳು
 DocType: Production Planning Tool,Only Obtain Raw Materials,ಕಚ್ಚಾ ವಸ್ತುಗಳನ್ನು ಮಾತ್ರ ಪಡೆದುಕೊಳ್ಳಿ
@@ -958,13 +962,13 @@
 DocType: Supplier Quotation,Is Subcontracted,subcontracted ಇದೆ
 DocType: Item Attribute,Item Attribute Values,ಐಟಂ ಲಕ್ಷಣ ಮೌಲ್ಯಗಳು
 DocType: Examination Result,Examination Result,ಪರೀಕ್ಷೆ ಫಲಿತಾಂಶ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ಖರೀದಿ ರಸೀತಿ
 ,Received Items To Be Billed,ಪಾವತಿಸಬೇಕಾಗುತ್ತದೆ ಸ್ವೀಕರಿಸಿದ ಐಟಂಗಳು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ಸಲ್ಲಿಸಿದ ಸಂಬಳ ತುಂಡಿನಲ್ಲಿ
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,ಕರೆನ್ಸಿ ವಿನಿಮಯ ದರ ಮಾಸ್ಟರ್ .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},ರೆಫರೆನ್ಸ್ Doctype ಒಂದು ಇರಬೇಕು {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},ರೆಫರೆನ್ಸ್ Doctype ಒಂದು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ಆಪರೇಷನ್ ಮುಂದಿನ {0} ದಿನಗಳಲ್ಲಿ ಟೈಮ್ ಸ್ಲಾಟ್ ಕಾಣಬರಲಿಲ್ಲ {1}
 DocType: Production Order,Plan material for sub-assemblies,ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಯೋಜನೆ ವಸ್ತು
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,ಮಾರಾಟದ ಪಾರ್ಟ್ನರ್ಸ್ ಮತ್ತು ಸಂಸ್ಥಾನದ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,ಈಗಾಗಲೇ ಖಾತೆಯಲ್ಲಿ ಸ್ಟಾಕ್ ಸಮತೋಲನವು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಖಾತೆ ರಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ನೀವು ಈ ಗೋದಾಮಿನ ಒಂದು ನಮೂದನ್ನು ಮಾಡಬಹುದು ಮೊದಲು ಹೊಂದಾಣಿಕೆಗೆ ಮಾಡಬೇಕು ಖಾತೆಯನ್ನು ರಚಿಸಲು
@@ -987,10 +991,9 @@
 DocType: Supplier,Default Payable Accounts,ಡೀಫಾಲ್ಟ್ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆಗಳು
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ನೌಕರರ {0} ಸಕ್ರಿಯವಾಗಿಲ್ಲ ಅಥವಾ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Fee Structure,Components,ಘಟಕಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ಐಟಂ ಮಾರ್ಪಾಟುಗಳು {0} ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ಐಟಂ ರಲ್ಲಿ ಆಸ್ತಿ ವರ್ಗ ನಮೂದಿಸಿ {0}
 DocType: Quality Inspection Reading,Reading 6,6 ಓದುವಿಕೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,ಅಲ್ಲ {0} {1} {2} ಯಾವುದೇ ಋಣಾತ್ಮಕ ಮಹೋನ್ನತ ಸರಕುಪಟ್ಟಿ ಕ್ಯಾನ್
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ಸರಕುಪಟ್ಟಿ ಮುಂಗಡ ಖರೀದಿ
 DocType: Hub Settings,Sync Now,ಸಿಂಕ್ ಈಗ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ಸಾಲು {0}: ಕ್ರೆಡಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
@@ -1004,11 +1007,11 @@
 DocType: Item,Is Purchase Item,ಖರೀದಿ ಐಟಂ
 DocType: Asset,Purchase Invoice,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ
 DocType: Stock Ledger Entry,Voucher Detail No,ಚೀಟಿ ವಿವರ ನಂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,ಹೊಸ ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 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,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ದಿನಾಂಕ ಮತ್ತು ಮುಕ್ತಾಯದ ದಿನಾಂಕ ತೆರೆಯುವ ಒಂದೇ ಆಗಿರುವ ಹಣಕಾಸಿನ ವರ್ಷವನ್ನು ಒಳಗೆ ಇರಬೇಕು
 DocType: Lead,Request for Information,ಮಾಹಿತಿಗಾಗಿ ಕೋರಿಕೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,ಸಿಂಕ್ ಆಫ್ಲೈನ್ ಇನ್ವಾಯ್ಸ್ಗಳು
 DocType: Payment Request,Paid,ಹಣ
 DocType: Program Fee,Program Fee,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಶುಲ್ಕ
 DocType: Salary Slip,Total in words,ಪದಗಳನ್ನು ಒಟ್ಟು
@@ -1018,7 +1021,7 @@
 DocType: Employee Loan,Sanctioned,ಮಂಜೂರು
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; ನಕಲು ನಡೆಯಲಿದೆ."
 DocType: Job Opening,Publish on website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಪ್ರಕಟಿಸಿ
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ಗ್ರಾಹಕರಿಗೆ ರವಾನಿಸಲಾಯಿತು .
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ
@@ -1029,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ಭಿನ್ನಾಭಿಪ್ರಾಯ
 ,Company Name,ಕಂಪನಿ ಹೆಸರು
 DocType: SMS Center,Total Message(s),ಒಟ್ಟು ಸಂದೇಶ (ಗಳು)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ವರ್ಗಾವಣೆ ಆಯ್ಕೆ ಐಟಂ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ಅಲ್ಲಿ ಚೆಕ್ ಠೇವಣಿ ಏನು ಬ್ಯಾಂಕ್ ಖಾತೆ ಮುಖ್ಯಸ್ಥ ಆಯ್ಕೆ .
@@ -1040,8 +1043,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ಸಾಲು {0}: ಮಾರಾಟದ / ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಪಾವತಿ ಯಾವಾಗಲೂ ಮುಂಚಿತವಾಗಿ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ರಾಸಾಯನಿಕ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ಈ ಕ್ರಮದಲ್ಲಿ ಆಯ್ಕೆ ಮಾಡಿದಾಗ ಡೀಫಾಲ್ಟ್ ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಬಳ ಜರ್ನಲ್ ಎಂಟ್ರಿ ನವೀಕರಿಸಲಾಗುತ್ತದೆ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ಗ್ರೇಡ್ ಕೋಡ್ ಮಧ್ಯಂತರಗಳು {0} ಇತರ ಶ್ರೇಣಿಗಳನ್ನು ಗ್ರೇಡ್ ಮಧ್ಯಂತರಗಳು ಅತಿಕ್ರಮಿಸುತ್ತದೆ. ಪರಿಶೀಲಿಸಿ ಅಂತರಗಳಲ್ಲಿ {0} ಮತ್ತು {1} ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ
 DocType: BOM,Raw Material Cost(Company Currency),ರಾ ಮೆಟೀರಿಯಲ್ ವೆಚ್ಚ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಈ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವರ್ಗಾಯಿಸಲಾಗಿದೆ.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ರೋ # {0}: ದರ ಪ್ರಮಾಣ ಬಳಸಲ್ಪಡುತ್ತಿದ್ದವು ಹೆಚ್ಚಿರಬಾರದು {1} {2}
@@ -1054,14 +1055,14 @@
 DocType: BOM Website Item,BOM Website Item,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಐಟಂ
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ನಿಮ್ಮ ಪತ್ರ ತಲೆ ಮತ್ತು ಲೋಗೋ ಅಪ್ಲೋಡ್. (ನೀವು ಅವುಗಳನ್ನು ನಂತರ ಸಂಪಾದಿಸಬಹುದು).
 DocType: Timesheet Detail,Bill,ಬಿಲ್
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಕಳೆದ ದಿನಾಂಕ ದಾಖಲಿಸಿದರೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ಬಿಳಿ
 DocType: SMS Center,All Lead (Open),ಎಲ್ಲಾ ಪ್ರಮುಖ ( ಓಪನ್ )
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ರೋ {0}: ಫಾರ್ ಪ್ರಮಾಣ ಲಭ್ಯವಿಲ್ಲ {4} ಉಗ್ರಾಣದಲ್ಲಿ {1} ಪ್ರವೇಶ ಸಮಯದಲ್ಲಿ ಪೋಸ್ಟ್ ನಲ್ಲಿ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ಪಾವತಿಸಿದ ಅಡ್ವಾನ್ಸಸ್ ಪಡೆಯಿರಿ
 DocType: Item,Automatically Create New Batch,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಸ ಬ್ಯಾಚ್ ರಚಿಸಿ
 DocType: Item,Automatically Create New Batch,ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಸ ಬ್ಯಾಚ್ ರಚಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,ಮಾಡಿ
 DocType: Student Admission,Admission Start Date,ಪ್ರವೇಶ ಪ್ರಾರಂಭ ದಿನಾಂಕ
 DocType: Journal Entry,Total Amount in Words,ವರ್ಡ್ಸ್ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ಒಂದು ದೋಷ ಉಂಟಾಗಿದೆ . ನೀವು ಉಳಿಸಿಲ್ಲ ಮಾಡಲಿಲ್ಲ ಒಂದು ಸಂಭಾವ್ಯ ಕಾರಣ ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ support@erpnext.com ಸಂಪರ್ಕಿಸಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಾಧ್ಯವಾಗಿಲ್ಲ .
@@ -1069,7 +1070,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,ಆರಂಭಿಕ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ದಯವಿಟ್ಟು ಪ್ರಮಾಣ ಚೇಂಜ್ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Student Batch Name,Student Batch Name,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಹೆಸರು
 DocType: Holiday List,Holiday List Name,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಹೆಸರು
 DocType: Repayment Schedule,Balance Loan Amount,ಬ್ಯಾಲೆನ್ಸ್ ಸಾಲದ ಪ್ರಮಾಣ
@@ -1089,10 +1090,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ದಯವಿಟ್ಟು ಸೂಚಿಸಿ ಒಂದು {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ ತೆಗೆದುಹಾಕಲಾಗಿದೆ ಐಟಂಗಳನ್ನು.
 DocType: Delivery Note,Delivery To,ವಿತರಣಾ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ಗುಣಲಕ್ಷಣ ಟೇಬಲ್ ಕಡ್ಡಾಯ
 DocType: Production Planning Tool,Get Sales Orders,ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ಋಣಾತ್ಮಕ ಇರುವಂತಿಲ್ಲ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ರಿಯಾಯಿತಿ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ರಿಯಾಯಿತಿ
 DocType: Asset,Total Number of Depreciations,Depreciations ಒಟ್ಟು ಸಂಖ್ಯೆ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
 DocType: Sales Invoice Item,Rate With Margin,ಮಾರ್ಜಿನ್ ಜೊತೆಗೆ ದರ
@@ -1108,7 +1109,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,ಮಾರಾಟದ ಆರ್ಡರ್ / ಗೂಡ್ಸ್ ಮುಕ್ತಾಯಗೊಂಡ ವೇರ್ಹೌಸ್ ರಿಸರ್ವ್ಡ್ ಗೋದಾಮಿನ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ಮಾರಾಟ ಪ್ರಮಾಣ
 DocType: Repayment Schedule,Interest Amount,ಬಡ್ಡಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,ನೀವು ಈ ದಾಖಲೆ ಖರ್ಚು ಅನುಮೋದಕ ಇವೆ . ' ಸ್ಥಿತಿಯನ್ನು ' ಅಪ್ಡೇಟ್ ಮತ್ತು ಉಳಿಸಿ ದಯವಿಟ್ಟು
 DocType: Serial No,Creation Document No,ಸೃಷ್ಟಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಂಖ್ಯೆ
 DocType: Issue,Issue,ಸಂಚಿಕೆ
 DocType: Asset,Scrapped,ಕೈಬಿಟ್ಟಿತು
@@ -1116,12 +1117,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ಐಟಂ ಮಾರ್ಪಾಟುಗಳು ಗುಣಲಕ್ಷಣಗಳು. ಉದಾಹರಣೆಗೆ ಗಾತ್ರ, ಬಣ್ಣ ಇತ್ಯಾದಿ"
 DocType: Purchase Invoice,Returns,ರಿಟರ್ನ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,ವಿಪ್ ವೇರ್ಹೌಸ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ನಿರ್ವಹಣೆ ಒಪ್ಪಂದ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ನೇಮಕಾತಿ
 DocType: Lead,Organization Name,ಸಂಸ್ಥೆ ಹೆಸರು
 DocType: Tax Rule,Shipping State,ಶಿಪ್ಪಿಂಗ್ ರಾಜ್ಯ
 ,Projected Quantity as Source,ಮೂಲ ಯೋಜಿತ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ಐಟಂ ಬಟನ್ 'ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ರಿಂದ ಐಟಂಗಳು ಪಡೆಯಿರಿ' ಬಳಸಿಕೊಂಡು ಸೇರಿಸಬೇಕು
 DocType: Employee,A-,ಎ
 DocType: Production Planning Tool,Include non-stock items,ನಾನ್ ಸ್ಟಾಕ್ ವಸ್ತುಗಳಾದ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ಮಾರಾಟ ವೆಚ್ಚಗಳು
@@ -1129,12 +1130,12 @@
 DocType: GL Entry,Against,ವಿರುದ್ಧವಾಗಿ
 DocType: Item,Default Selling Cost Center,ಡೀಫಾಲ್ಟ್ ಮಾರಾಟ ವೆಚ್ಚ ಸೆಂಟರ್
 DocType: Sales Partner,Implementation Partner,ಅನುಷ್ಠಾನ ಸಂಗಾತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ZIP ಕೋಡ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,ZIP ಕೋಡ್
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಯನ್ನು {1}
 DocType: Opportunity,Contact Info,ಸಂಪರ್ಕ ಮಾಹಿತಿ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ಸ್ಟಾಕ್ ನಮೂದುಗಳು ಮೇಕಿಂಗ್
 DocType: Packing Slip,Net Weight UOM,ನೆಟ್ ತೂಕ UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ಫಲಿತಾಂಶಗಳು
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ಫಲಿತಾಂಶಗಳು
 DocType: Item,Default Supplier,ಡೀಫಾಲ್ಟ್ ಸರಬರಾಜುದಾರ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ಪ್ರೊಡಕ್ಷನ್ ಸೇವನೆ ಶೇಕಡಾವಾರು ಓವರ್
 DocType: Employee Loan,Repayment Schedule,ಮರುಪಾವತಿಯ ವೇಳಾಪಟ್ಟಿ
@@ -1142,7 +1143,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ದಿನಾಂಕ ವೀಕ್ಲಿ ಆಫ್ ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ಅಂತಿಮ ದಿನಾಂಕ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಕಡಿಮೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Sales Person,Select company name first.,ಮೊದಲ ಕಂಪನಿ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ಡಾ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ಡಾ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ಉಲ್ಲೇಖಗಳು ವಿತರಕರಿಂದ ಪಡೆದ .
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ಗೆ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ಸರಾಸರಿ ವಯಸ್ಸು
@@ -1162,7 +1163,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,ಪ್ರಮುಖ ಸಾಧನೆ ಪ್ರದೇಶ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ಸಾರಿಗೆ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ಅಮಾನ್ಯ ಲಕ್ಷಣ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} ಸಲ್ಲಿಸಬೇಕು
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ಪ್ರಮಾಣ ಕಡಿಮೆ ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 DocType: SMS Center,Total Characters,ಒಟ್ಟು ಪಾತ್ರಗಳು
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},ಐಟಂ ಬಿಒಎಮ್ ಕ್ಷೇತ್ರದಲ್ಲಿ ಬಿಒಎಮ್ ಆಯ್ಕೆಮಾಡಿ {0}
@@ -1173,7 +1174,7 @@
 DocType: Sales Partner,Distributor,ವಿತರಕ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ಸೆಟ್ &#39;ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸು&#39; ದಯವಿಟ್ಟು
 ,Ordered Items To Be Billed,ಖ್ಯಾತವಾದ ಐಟಂಗಳನ್ನು ಆದೇಶ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ರೇಂಜ್ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿದೆ ಹೆಚ್ಚಾಗಿ ಶ್ರೇಣಿಗೆ
 DocType: Global Defaults,Global Defaults,ಜಾಗತಿಕ ಪೂರ್ವನಿಯೋಜಿತಗಳು
@@ -1183,7 +1184,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ಪ್ರಾರಂಭ ವರ್ಷ
 DocType: Purchase Invoice,Start date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಪ್ರಾರಂಭಿಸಿ
 DocType: Salary Slip,Leave Without Pay,ಪೇ ಇಲ್ಲದೆ ಬಿಡಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ಸಾಮರ್ಥ್ಯವನ್ನು ಯೋಜನೆ ದೋಷ
 ,Trial Balance for Party,ಪಕ್ಷದ ಟ್ರಯಲ್ ಬ್ಯಾಲೆನ್ಸ್
 DocType: Lead,Consultant,ಕನ್ಸಲ್ಟೆಂಟ್
 DocType: Salary Slip,Earnings,ಅರ್ನಿಂಗ್ಸ್
@@ -1198,7 +1199,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ಈ ವ್ಯತ್ಯಯದ ಐಟಂ ಕೋಡ್ ಬಿತ್ತರಿಸಲಾಗುವುದು. ನಿಮ್ಮ ಸಂಕ್ಷೇಪಣ ""ಎಸ್ಎಮ್"", ಮತ್ತು ಉದಾಹರಣೆಗೆ, ಐಟಂ ಕೋಡ್ ""ಟಿ ಶರ್ಟ್"", ""ಟಿ-ಶರ್ಟ್ ಎಸ್.ಎಂ."" ಇರುತ್ತದೆ ವ್ಯತ್ಯಯದ ಐಟಂ ಸಂಕೇತ"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ನೀವು ಸಂಬಳ ಸ್ಲಿಪ್ ಉಳಿಸಲು ಒಮ್ಮೆ ( ಮಾತಿನಲ್ಲಿ) ನಿವ್ವಳ ವೇತನ ಗೋಚರಿಸುತ್ತದೆ.
 DocType: Purchase Invoice,Is Return,ಮರಳುವುದು
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ರಿಟರ್ನ್ / ಡೆಬಿಟ್ ಗಮನಿಸಿ
 DocType: Price List Country,Price List Country,ದರ ಪಟ್ಟಿ ಕಂಟ್ರಿ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},ಐಟಂ {0} ಮಾನ್ಯ ಸರಣಿ ಸೂಲ {1}
@@ -1208,11 +1209,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ದಯವಿಟ್ಟು ಬ್ಯಾಚ್ ಸಂಖ್ಯೆ ಪಡೆಯಲು ಐಟಂ ಕೋಡ್ ನಮೂದಿಸಿ
 DocType: Stock Settings,Default Item Group,ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗುಂಪು
 DocType: Employee Loan,Partially Disbursed,ಭಾಗಶಃ ಪಾವತಿಸಲಾಗುತ್ತದೆ
-DocType: Grading Structure,Grading System Name,ಶ್ರೇಯಾಂಕ ಪದ್ಧತಿಯ ಹೆಸರು
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ಸರಬರಾಜುದಾರ ಡೇಟಾಬೇಸ್ .
 DocType: Account,Balance Sheet,ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ','ಐಟಂ ಕೋಡ್ನೊಂದಿಗೆ ಐಟಂ ಸೆಂಟರ್ ವೆಚ್ಚ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ಪಾವತಿ ಮೋಡ್ ಸಂರಚಿತವಾಗಿರುವುದಿಲ್ಲ. ಖಾತೆ ಪಾವತಿ ವಿಧಾನ ಮೇಲೆ ಅಥವಾ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಹೊಂದಿಸಲಾಗಿದೆ ಎಂಬುದನ್ನು ದಯವಿಟ್ಟು ಪರಿಶೀಲಿಸಿ.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ನಿಮ್ಮ ಮಾರಾಟಗಾರ ಗ್ರಾಹಕ ಸಂಪರ್ಕಿಸಿ ಈ ದಿನಾಂಕದಂದು ನೆನಪಿಸುವ ಪಡೆಯುತ್ತಾನೆ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ಅದೇ ಐಟಂ ಅನೇಕ ಬಾರಿ ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ಮತ್ತಷ್ಟು ಖಾತೆಗಳನ್ನು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು, ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು"
@@ -1224,7 +1224,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಜಿಎಲ್ ನಮೂದುಗಳು ಆಯ್ಕೆ ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ಫಾರ್ ವರದಿ ಮಾಡಿದ್ದರೆ ಮಾಡಲಾಗುತ್ತದೆ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ನಮೂದುಗಳನ್ನು ಮತ್ತು ಜಿಎಲ್ ನಮೂದುಗಳು ಆಯ್ಕೆ ಖರೀದಿ ರಸೀದಿಗಳನ್ನು ಫಾರ್ ವರದಿ ಮಾಡಿದ್ದರೆ ಮಾಡಲಾಗುತ್ತದೆ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ಐಟಂ 1
 DocType: Holiday,Holiday,ಹಾಲಿಡೇ
 DocType: Support Settings,Close Issue After Days,ದಿನಗಳ ಸಂಚಿಕೆ ಮುಚ್ಚಿ
@@ -1251,11 +1251,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ಕೆಲಸ ನಡೆದಿದೆ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ಗುಣಲಕ್ಷಣಗಳು ಕೋಷ್ಟಕದಲ್ಲಿ ಕನಿಷ್ಠ ಒಂದು ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ
 DocType: Announcement,All Students,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ಐಟಂ {0} ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ವೀಕ್ಷಿಸು ಲೆಡ್ಜರ್
 DocType: Grading Scale,Intervals,ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ಮುಂಚಿನ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ಐಟಂ ಗುಂಪು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ , ಐಟಂ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ದಯವಿಟ್ಟು"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ನಂ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ವಿಶ್ವದ ಉಳಿದ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ಐಟಂ {0} ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
@@ -1295,9 +1295,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} ನಿಂದ ಸಂಬಳ ಪಾವತಿಗೆ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ಹೆಪ್ಪುಗಟ್ಟಿದ ಖಾತೆ ಸಂಪಾದಿಸಲು ಅಧಿಕಾರ {0}
 DocType: Journal Entry,Get Outstanding Invoices,ಮಹೋನ್ನತ ಇನ್ವಾಯ್ಸಸ್ ಪಡೆಯಿರಿ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಮಾನ್ಯವಾಗಿಲ್ಲ
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ಖರೀದಿ ಆದೇಶ ನೀವು ಯೋಜನೆ ಸಹಾಯ ಮತ್ತು ನಿಮ್ಮ ಖರೀದಿ ಮೇಲೆ ಅನುಸರಿಸಿ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ಕ್ಷಮಿಸಿ, ಕಂಪನಿಗಳು ವಿಲೀನಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ಒಟ್ಟು ಸಂಚಿಕೆ / ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ {0} ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ ರಲ್ಲಿ {1} \ ವಿನಂತಿಸಿದ ಪ್ರಮಾಣ {2} ಐಟಂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ಸಣ್ಣ
@@ -1318,10 +1318,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ಪರೋಕ್ಷ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ರೋ {0}: ಪ್ರಮಾಣ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ವ್ಯವಸಾಯ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,ಸಿಂಕ್ ಮಾಸ್ಟರ್ ಡಾಟಾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ನಿಮ್ಮ ಉತ್ಪನ್ನಗಳನ್ನು ಅಥವಾ ಸೇವೆಗಳನ್ನು
 DocType: Mode of Payment,Mode of Payment,ಪಾವತಿಯ ಮಾದರಿಯು
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ವೆಬ್ಸೈಟ್ ಚಿತ್ರ ಸಾರ್ವಜನಿಕ ಕಡತ ಅಥವಾ ವೆಬ್ಸೈಟ್ URL ಇರಬೇಕು
 DocType: Student Applicant,AP,ಎಪಿ
 DocType: Purchase Invoice Item,BOM,ಬಿಒಎಮ್
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ಈ ಒಂದು ಮೂಲ ಐಟಂ ಗುಂಪು ಮತ್ತು ಸಂಪಾದಿತವಾಗಿಲ್ಲ .
@@ -1339,18 +1339,18 @@
 DocType: Student Group Student,Group Roll Number,ಗುಂಪು ರೋಲ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ಮಾತ್ರ ಕ್ರೆಡಿಟ್ ಖಾತೆಗಳನ್ನು ಮತ್ತೊಂದು ಡೆಬಿಟ್ ಪ್ರವೇಶ ವಿರುದ್ಧ ಲಿಂಕ್ ಮಾಡಬಹುದು ಫಾರ್"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ಎಲ್ಲಾ ಕೆಲಸವನ್ನು ತೂಕ ಒಟ್ಟು ಇರಬೇಕು 1. ಪ್ರಕಾರವಾಗಿ ಎಲ್ಲ ಪ್ರಾಜೆಕ್ಟ್ ಕಾರ್ಯಗಳ ತೂಕ ಹೊಂದಿಸಿಕೊಳ್ಳಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ಡೆಲಿವರಿ ಗಮನಿಸಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ಬೆಲೆ ರೂಲ್ ಮೊದಲ ಐಟಂ, ಐಟಂ ಗುಂಪು ಅಥವಾ ಬ್ರಾಂಡ್ ಆಗಿರಬಹುದು, ಕ್ಷೇತ್ರದಲ್ಲಿ 'ರಂದು ಅನ್ವಯಿಸು' ಆಧಾರದ ಮೇಲೆ ಆಯ್ಕೆ."
 DocType: Hub Settings,Seller Website,ಮಾರಾಟಗಾರ ವೆಬ್ಸೈಟ್
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ಮಾರಾಟದ ತಂಡಕ್ಕೆ ಹಂಚಿಕೆ ಶೇಕಡಾವಾರು ಒಟ್ಟು 100 ಶುಡ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸ್ಥಿತಿ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಸ್ಥಿತಿ {0}
 DocType: Appraisal Goal,Goal,ಗುರಿ
 DocType: Sales Invoice Item,Edit Description,ಸಂಪಾದಿಸಿ ವಿವರಣೆ
 ,Team Updates,ತಂಡ ಅಪ್ಡೇಟ್ಗಳು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,ಸರಬರಾಜುದಾರನ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ಪ್ರಿಂಟ್ ಫಾರ್ಮ್ಯಾಟ್ ರಚಿಸಿ
@@ -1366,7 +1366,7 @@
 DocType: Depreciation Schedule,Journal Entry,ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ಪ್ರಗತಿಯಲ್ಲಿದೆ ಐಟಂಗಳನ್ನು
 DocType: Workstation,Workstation Name,ಕಾರ್ಯಕ್ಷೇತ್ರ ಹೆಸರು
-DocType: Grade Interval,Grade Code,ಗ್ರೇಡ್ ಕೋಡ್
+DocType: Grading Scale Interval,Grade Code,ಗ್ರೇಡ್ ಕೋಡ್
 DocType: POS Item Group,POS Item Group,ಪಿಓಎಸ್ ಐಟಂ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ಡೈಜೆಸ್ಟ್ ಇಮೇಲ್:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ಬಿಒಎಮ್ {0} ಐಟಂ ಸೇರುವುದಿಲ್ಲ {1}
@@ -1383,7 +1383,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ಹಾರ್ಡ್ವೇರ್
 DocType: Sales Order,Recurring Upto,ಮರುಕಳಿಸುವ ವರೆಗೆ
 DocType: Attendance,HR Manager,ಮಾನವ ಸಂಪನ್ಮೂಲ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ಒಂದು ಕಂಪನಿ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ಸವಲತ್ತು ಲೀವ್
 DocType: Purchase Invoice,Supplier Invoice Date,ಸರಬರಾಜುದಾರ ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ನೀವು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಶಕ್ತಗೊಳಿಸಬೇಕಾಗುತ್ತದೆ
@@ -1399,7 +1399,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ಆಹಾರ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ಏಜಿಂಗ್ ರೇಂಜ್ 3
 DocType: Maintenance Schedule Item,No of Visits,ಭೇಟಿ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ಮಾರ್ಕ್ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,ಮಾರ್ಕ್ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ನೋಂದಾಯಿತ ವಿದ್ಯಾರ್ಥಿ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ಖಾತೆ ಮುಚ್ಚುವಿಕೆಗೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ಎಲ್ಲಾ ಗುರಿಗಳನ್ನು ಅಂಕಗಳನ್ನು ಒಟ್ಟು ಮೊತ್ತ ಇದು 100 ಇರಬೇಕು {0}
@@ -1424,7 +1425,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,ಆವರೇಜ್ ಡೈಲಿ ಹೊರಹೋಗುವ
 DocType: POS Profile,Campaign,ದಂಡಯಾತ್ರೆ
 DocType: Supplier,Name and Type,ಹೆಸರು ಮತ್ತು ವಿಧ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',ಅನುಮೋದನೆ ಸ್ಥಿತಿ 'ಅಂಗೀಕಾರವಾದ' ಅಥವಾ ' ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',ಅನುಮೋದನೆ ಸ್ಥಿತಿ 'ಅಂಗೀಕಾರವಾದ' ಅಥವಾ ' ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ' ಮಾಡಬೇಕು
 DocType: Purchase Invoice,Contact Person,ಕಾಂಟ್ಯಾಕ್ಟ್ ಪರ್ಸನ್
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ ' ' ನಿರೀಕ್ಷಿತ ಅಂತಿಮ ದಿನಾಂಕ ' ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Course Scheduling Tool,Course End Date,ಕೋರ್ಸ್ ಅಂತಿಮ ದಿನಾಂಕ
@@ -1447,14 +1448,15 @@
 DocType: Sales Invoice,Shipping Address Name,ಶಿಪ್ಪಿಂಗ್ ವಿಳಾಸ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ಖಾತೆಗಳ ಚಾರ್ಟ್
 DocType: Material Request,Terms and Conditions Content,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿಷಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ಐಟಂ {0} ಸ್ಟಾಕ್ ಐಟಂ ಅಲ್ಲ
 DocType: Maintenance Visit,Unscheduled,ಅನಿಗದಿತ
 DocType: Employee,Owned,ಸ್ವಾಮ್ಯದ
 DocType: Salary Detail,Depends on Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಅವಲಂಬಿಸಿರುತ್ತದೆ
 DocType: Pricing Rule,"Higher the number, higher the priority","ಹೆಚ್ಚಿನ ಸಂಖ್ಯೆ, ಹೆಚ್ಚಿನ ಆದ್ಯತೆಯನ್ನು"
 ,Purchase Invoice Trends,ಸರಕುಪಟ್ಟಿ ಟ್ರೆಂಡ್ಸ್ ಖರೀದಿಸಿ
 DocType: Employee,Better Prospects,ಉತ್ತಮ ಜೀವನ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ರೋ # {0}: ಬ್ಯಾಚ್ {1} ಕೇವಲ {2} ಪ್ರಮಾಣ ಹೊಂದಿದೆ. ದಯವಿಟ್ಟು {3} ಪ್ರಮಾಣ ಲಭ್ಯವಿದೆ, ಇನ್ನೊಂದು ತಂಡ ಆಯ್ಕೆ ಅಥವಾ ಅನೇಕ ಬ್ಯಾಚ್ಗಳು ರಿಂದ ಸಮಸ್ಯೆಯನ್ನು ತಲುಪಿಸಲು /, ಅನೇಕ ಸಾಲುಗಳನ್ನು ಸಾಲು ಬೇರ್ಪಟ್ಟು"
 DocType: Vehicle,License Plate,ಪರವಾನಗಿ ಫಲಕ
 DocType: Appraisal,Goals,ಗುರಿಗಳು
 DocType: Warranty Claim,Warranty / AMC Status,ಖಾತರಿ / ಎಎಮ್ಸಿ ಸ್ಥಿತಿ
@@ -1473,7 +1475,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ನೌಕರರ ಸ್ವತಃ ವರದಿ ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ಖಾತೆ ಹೆಪ್ಪುಗಟ್ಟಿರುವ ವೇಳೆ , ನಮೂದುಗಳನ್ನು ನಿರ್ಬಂಧಿತ ಬಳಕೆದಾರರಿಗೆ ಅವಕಾಶವಿರುತ್ತದೆ ."
 DocType: Email Digest,Bank Balance,ಬ್ಯಾಂಕ್ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ಮಾತ್ರ ಕರೆನ್ಸಿ ಮಾಡಬಹುದು: {0} ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ಜಾಬ್ ಪ್ರೊಫೈಲ್ಗಳು , ಅಗತ್ಯ ವಿದ್ಯಾರ್ಹತೆಗಳು , ಇತ್ಯಾದಿ"
 DocType: Journal Entry Account,Account Balance,ಖಾತೆ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ವ್ಯವಹಾರಗಳಿಗೆ ತೆರಿಗೆ ನಿಯಮ.
@@ -1484,7 +1486,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ಮುಚ್ಚಿಲ್ಲದ ಆರ್ಥಿಕ ವರ್ಷದ ಪಿ &amp; ಎಲ್ ಬ್ಯಾಲೆನ್ಸ್ ತೋರಿಸಿ
 DocType: Shipping Rule,Shipping Account,ಶಿಪ್ಪಿಂಗ್ ಖಾತೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ಖಾತೆ {2} ನಿಷ್ಕ್ರಿಯವಾಗಿದೆ
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ಆನ್ ಬಾರಿ ತಲುಪಿಸಲು ನಿಮ್ಮ ಕೆಲಸ ಯೋಜನೆ ಸಹಾಯ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಮತ್ತು ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ಆನ್ ಬಾರಿ ತಲುಪಿಸಲು ನಿಮ್ಮ ಕೆಲಸ ಯೋಜನೆ ಸಹಾಯ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ಮತ್ತು ಮಾಡಿ
 DocType: Quality Inspection,Readings,ರೀಡಿಂಗ್ಸ್
 DocType: Stock Entry,Total Additional Costs,ಒಟ್ಟು ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 DocType: Course Schedule,SH,ಎಸ್
@@ -1495,7 +1497,7 @@
 DocType: Shipping Rule Condition,To Value,ಮೌಲ್ಯ
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ಪ್ಯಾಕಿಂಗ್ ಸ್ಲಿಪ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ಕಚೇರಿ ಬಾಡಿಗೆ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ಸೆಟಪ್ SMS ಗೇಟ್ವೇ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ಆಮದು ವಿಫಲವಾಗಿದೆ!
@@ -1517,11 +1519,11 @@
 DocType: Company,Services,ಸೇವೆಗಳು
 DocType: HR Settings,Email Salary Slip to Employee,ನೌಕರರ ಇಮೇಲ್ ಸಂಬಳ ಸ್ಲಿಪ್
 DocType: Cost Center,Parent Cost Center,ಪೋಷಕ ವೆಚ್ಚ ಸೆಂಟರ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ ಆಯ್ಕೆ
 DocType: Sales Invoice,Source,ಮೂಲ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ಮುಚ್ಚಲಾಗಿದೆ ಶೋ
 DocType: Leave Type,Is Leave Without Pay,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ಇದೆ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ಆಸ್ತಿ ವರ್ಗ ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಕಡ್ಡಾಯವಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ಪಾವತಿ ಕೋಷ್ಟಕದಲ್ಲಿ ಯಾವುದೇ ದಾಖಲೆಗಳು
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ಈ {0} ಸಂಘರ್ಷಗಳನ್ನು {1} ಫಾರ್ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ವಿದ್ಯಾರ್ಥಿಗಳು ಎಚ್ಟಿಎಮ್ಎಲ್
@@ -1539,7 +1541,7 @@
 DocType: Student,Date of Leaving,ಲೀವಿಂಗ್ ದಿನಾಂಕ
 DocType: Pricing Rule,For Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ಕಾರ್ಯನಿರ್ವಾಹಕ ಹುಡುಕು
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ಕಾರಣವಾಗುತ್ತದೆ ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ಕಾರಣವಾಗುತ್ತದೆ ರಚಿಸಿ
 DocType: Maintenance Schedule,Schedules,ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Purchase Invoice Item,Net Amount,ನೆಟ್ ಪ್ರಮಾಣ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ವಿವರ ಯಾವುದೇ
@@ -1567,9 +1569,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿಯ
 DocType: Sales Invoice Item,Brand Name,ಬ್ರಾಂಡ್ ಹೆಸರು
 DocType: Purchase Receipt,Transporter Details,ಟ್ರಾನ್ಸ್ಪೋರ್ಟರ್ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,ಡೀಫಾಲ್ಟ್ ಗೋದಾಮಿನ ಆಯ್ಕೆಮಾಡಿದ ಐಟಂ ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ಪೆಟ್ಟಿಗೆ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ಸಂಭಾವ್ಯ ಸರಬರಾಜುದಾರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ಸಂಸ್ಥೆ
 DocType: Budget,Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ಖಾಲಿಯಾಗಿದೆ . ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ದಯವಿಟ್ಟು ರಚಿಸಿ
@@ -1577,8 +1579,8 @@
 DocType: Sales Partner,Sales Partner Target,ಮಾರಾಟದ ಸಂಗಾತಿ ಟಾರ್ಗೆಟ್
 DocType: Loan Type,Maximum Loan Amount,ಗರಿಷ್ಠ ಸಾಲದ
 DocType: Pricing Rule,Pricing Rule,ಬೆಲೆ ರೂಲ್
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ವಿದ್ಯಾರ್ಥಿ ನಕಲು ರೋಲ್ ಸಂಖ್ಯೆ {0}
 DocType: Budget,Action if Annual Budget Exceeded,ಆಕ್ಷನ್ ವಾರ್ಷಿಕ ಬಜೆಟ್ ಮೀರಿದ್ದಲ್ಲಿ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ಆರ್ಡರ್ ಖರೀದಿಸಿ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ
 DocType: Shopping Cart Settings,Payment Success URL,ಪಾವತಿ ಯಶಸ್ಸು URL
@@ -1599,9 +1601,9 @@
 DocType: Employee Loan,Repayment Method,ಮರುಪಾವತಿಯ ವಿಧಾನ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ಪರಿಶೀಲಿಸಿದರೆ, ಮುಖಪುಟ ವೆಬ್ಸೈಟ್ ಡೀಫಾಲ್ಟ್ ಐಟಂ ಗ್ರೂಪ್ ಇರುತ್ತದೆ"
 DocType: Quality Inspection Reading,Reading 4,4 ಓದುವಿಕೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},ಫಾರ್ {0} ಪ್ರಾಜೆಕ್ಟ್ ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},ಫಾರ್ {0} ಪ್ರಾಜೆಕ್ಟ್ ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ಕಂಪನಿ ಖರ್ಚು ಹಕ್ಕು .
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ವಿದ್ಯಾರ್ಥಿಗಳು ವ್ಯವಸ್ಥೆಯ ಹೃದಯ, ಎಲ್ಲಾ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ವಿದ್ಯಾರ್ಥಿಗಳು ವ್ಯವಸ್ಥೆಯ ಹೃದಯ, ಎಲ್ಲಾ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ರೋ # {0}: ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ {1} ಚೆಕ್ ದಿನಾಂಕ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {2}
 DocType: Company,Default Holiday List,ಹಾಲಿಡೇ ಪಟ್ಟಿ ಡೀಫಾಲ್ಟ್
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ರೋ {0}: ಗೆ ಸಮಯ ಮತ್ತು ಸಮಯ {1} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ {2}
@@ -1613,21 +1615,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ನೀವು ರಜೆ ಹಾಕುತ್ತಿವೆ ಮೇಲೆ ದಿನ (ಗಳು) ರಜಾದಿನಗಳು. ನೀವು ರಜೆ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ಅಗತ್ಯವಿದೆ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ಪಾವತಿ ಇಮೇಲ್ ಅನ್ನು ಮತ್ತೆ ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ಹೊಸ ಕೆಲಸವನ್ನು
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ಉದ್ಧರಣ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ಇತರ ವರದಿಗಳು
 DocType: Dependent Task,Dependent Task,ಅವಲಂಬಿತ ಟಾಸ್ಕ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ಅಳತೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ 1 ಇರಬೇಕು {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ರೀತಿಯ ಲೀವ್ {0} ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ಮುಂಚಿತವಾಗಿ ಎಕ್ಸ್ ದಿನಗಳ ಕಾರ್ಯಾಚರಣೆ ಯೋಜನೆ ಪ್ರಯತ್ನಿಸಿ.
 DocType: HR Settings,Stop Birthday Reminders,ನಿಲ್ಲಿಸಿ ಜನ್ಮದಿನ ಜ್ಞಾಪನೆಗಳು
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ಕಂಪನಿ ರಲ್ಲಿ ಡೀಫಾಲ್ಟ್ ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ ಸೆಟ್ ಮಾಡಿ {0}
 DocType: SMS Center,Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ಹುಡುಕಾಟ ಐಟಂ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,ಹುಡುಕಾಟ ಐಟಂ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ಸೇವಿಸುವ ಪ್ರಮಾಣವನ್ನು
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ನಗದು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 DocType: Assessment Plan,Grading Scale,ಗ್ರೇಡಿಂಗ್ ಸ್ಕೇಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ಈಗಾಗಲೇ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ಅಳತೆಯ ಘಟಕ {0} ಹೆಚ್ಚು ಪರಿವರ್ತಿಸುವುದರ ಟೇಬಲ್ ಒಮ್ಮೆ ಹೆಚ್ಚು ನಮೂದಿಸಲಾದ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ಈಗಾಗಲೇ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ಪಾವತಿ ವಿನಂತಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ನೀಡಲಾಗಿದೆ ಐಟಂಗಳು ವೆಚ್ಚ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},ಪ್ರಮಾಣ ಹೆಚ್ಚು ಇರಬಾರದು {0}
@@ -1659,12 +1661,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ವಿತರಣೆ ಎಂಟ್ರಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ಸಾಲು {0}: ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಅಡ್ವಾನ್ಸ್ ಡೆಬಿಟ್ ಮಾಡಬೇಕು
 DocType: Company,Default Values,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ಆವರ್ತನ} ಡೈಜೆಸ್ಟ್
 DocType: Expense Claim,Total Amount Reimbursed,ಒಟ್ಟು ಪ್ರಮಾಣ ಮತ್ತೆ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ಈ ವಾಹನ ವಿರುದ್ಧ ದಾಖಲೆಗಳು ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ಸಂಗ್ರಹಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ಸರಬರಾಜುದಾರ ವಿರುದ್ಧ ಸರಕುಪಟ್ಟಿ {0} ರ {1}
 DocType: Customer,Default Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ಆಸ್ತಿ ಚಳವಳಿ ದಾಖಲೆ {0} ದಾಖಲಿಸಿದವರು
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ನೀವು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ ಹಣಕಾಸಿನ ವರ್ಷದ {0}. ಹಣಕಾಸಿನ ವರ್ಷ {0} ಜಾಗತಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು ಡೀಫಾಲ್ಟ್ ಆಗಿ ಹೊಂದಿಸಲಾಗಿದೆ
 DocType: Journal Entry,Entry Type,ಎಂಟ್ರಿ ಟೈಪ್
 ,Customer Credit Balance,ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್
@@ -1684,7 +1687,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ಐಟಂಗಳನ್ನು ಯಾವುದೇ ಪ್ರಮಾಣ ಅಥವಾ ಮೌಲ್ಯವನ್ನು ಯಾವುದೇ ಬದಲಾವಣೆ.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ಕಡ್ಡಾಯ - ತಂತ್ರಾಂಶದ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ಕಡ್ಡಾಯ - ತಂತ್ರಾಂಶದ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ಖಾತರಿ ಹಕ್ಕು
 ,Lead Details,ಲೀಡ್ ವಿವರಗಳು
 DocType: Salary Slip,Loan repayment,ಸಾಲ ಮರುಪಾವತಿ
 DocType: Purchase Invoice,End date of current invoice's period,ಪ್ರಸ್ತುತ ಅವಧಿಯ ಸರಕುಪಟ್ಟಿ ಅಂತಿಮ ದಿನಾಂಕ
@@ -1703,12 +1706,10 @@
 DocType: Employee,Permanent Address,ಖಾಯಂ ವಿಳಾಸ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ಗ್ರ್ಯಾಂಡ್ ಒಟ್ಟು ಹೆಚ್ಚು \ {0} {1} ಹೆಚ್ಚಾಗಿರುವುದು ಸಾಧ್ಯವಿಲ್ಲ ವಿರುದ್ಧ ಹಣ ಅಡ್ವಾನ್ಸ್ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,ಐಟಂ ಕೋಡ್ ಆಯ್ಕೆ ಮಾಡಿ
 DocType: Student Sibling,Studying in Same Institute,ಅದೇ ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ವ್ಯಾಸಂಗ
 DocType: Territory,Territory Manager,ಪ್ರದೇಶ ಮ್ಯಾನೇಜರ್
 DocType: Packed Item,To Warehouse (Optional),ಮಳಿಗೆಗೆ (ಐಚ್ಛಿಕ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Payment Entry,Paid Amount (Company Currency),ಪಾವತಿಸಿದ ಮೊತ್ತಕ್ಕೆ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,Additional Discount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ
 DocType: Selling Settings,Selling Settings,ಸೆಟ್ಟಿಂಗ್ಗಳು ಮಾರಾಟ
@@ -1718,9 +1719,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ಕಾರ್ಟ್ ವೀಕ್ಷಿಸಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ಮಾರ್ಕೆಟಿಂಗ್ ವೆಚ್ಚಗಳು
 ,Item Shortage Report,ಐಟಂ ಕೊರತೆ ವರದಿ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ತೂಕ ತುಂಬಾ ""ತೂಕ ಮೈ.ವಿ.ವಿ.ಯ"" ನೀಡಿರಿ \n, ಉಲ್ಲೇಖಿಸಲಾಗಿದೆ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ಈ ನೆಲದ ಎಂಟ್ರಿ ಮಾಡಲು ಬಳಸಲಾಗುತ್ತದೆ ವಿನಂತಿ ವಸ್ತು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಹೊಸ ಆಸ್ತಿ ಕಡ್ಡಾಯವಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಹೊಸ ಆಸ್ತಿ ಕಡ್ಡಾಯವಾಗಿದೆ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ಪ್ರತಿ ಬ್ಯಾಚ್ ಪ್ರತ್ಯೇಕ ಕೋರ್ಸನ್ನು ಗುಂಪು
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ಪ್ರತಿ ಬ್ಯಾಚ್ ಪ್ರತ್ಯೇಕ ಕೋರ್ಸನ್ನು ಗುಂಪು
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ಐಟಂ ಏಕ ಘಟಕ .
@@ -1737,9 +1738,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ವೆಚ್ಚದ ಕೇಂದ್ರ &#39;ಲಾಭ ಮತ್ತು ನಷ್ಟ&#39; ಖಾತೆಯನ್ನು ಅಗತ್ಯವಿದೆ {2}. ಕಂಪನಿ ಒಂದು ಡೀಫಾಲ್ಟ್ ವೆಚ್ಚದ ಕೇಂದ್ರ ಸ್ಥಾಪಿಸಲು ದಯವಿಟ್ಟು.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ಎ ಗ್ರಾಹಕ ಗುಂಪಿನ ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಗ್ರಾಹಕ ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 ಓದುವಿಕೆ
@@ -1756,7 +1755,7 @@
 ,Item-wise Sales Register,ಐಟಂ ಬಲ್ಲ ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Asset,Gross Purchase Amount,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ
 DocType: Asset,Depreciation Method,ಸವಕಳಿ ವಿಧಾನ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ಆಫ್ಲೈನ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ಆಫ್ಲೈನ್
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ಈ ಮೂಲ ದರದ ತೆರಿಗೆ ಒಳಗೊಂಡಿದೆ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ಒಟ್ಟು ಟಾರ್ಗೆಟ್
 DocType: Program Course,Required,ಅಗತ್ಯ
@@ -1766,21 +1765,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ಸಾಮರಸ್ಯ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ಹಲವು ಕಾಲಮ್ಗಳನ್ನು. ವರದಿಯನ್ನು ರಫ್ತು ಸ್ಪ್ರೆಡ್ಶೀಟ್ ಅಪ್ಲಿಕೇಶನ್ ಬಳಸಿಕೊಂಡು ಅದನ್ನು ಮುದ್ರಿಸಲು.
 DocType: Purchase Invoice Item,Batch No,ಬ್ಯಾಚ್ ನಂ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ವಿನಿಮಯ ದರದ ಕಾಣಬರಲಿಲ್ಲ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ಗ್ರಾಹಕರ ಖರೀದಿ ಆದೇಶದ ವಿರುದ್ಧ ಅನೇಕ ಮಾರಾಟ ಆದೇಶಗಳಿಗೆ ಅವಕಾಶ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 DocType: Student Group Instructor,Student Group Instructor,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಬೋಧಕ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ಮೊಬೈಲ್ ಇಲ್ಲ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ಮುಖ್ಯ
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ಭಿನ್ನ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ಮುಖ್ಯ
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ಭಿನ್ನ
 DocType: Naming Series,Set prefix for numbering series on your transactions,ನಿಮ್ಮ ವ್ಯವಹಾರಗಳ ಮೇಲೆ ಸರಣಿ ಸಂಖ್ಯೆಗಳನ್ನು ಹೊಂದಿಸಿ ಪೂರ್ವಪ್ರತ್ಯಯ
 DocType: Employee Attendance Tool,Employees HTML,ನೌಕರರು ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ಡೀಫಾಲ್ಟ್ BOM ({0}) ಈ ಐಟಂ ಅಥವಾ ಅದರ ಟೆಂಪ್ಲೇಟ್ ಸಕ್ರಿಯ ಇರಬೇಕು
 DocType: Employee,Leave Encashed?,Encashed ಬಿಡಿ ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ಕ್ಷೇತ್ರದ ಅವಕಾಶ ಕಡ್ಡಾಯ
 DocType: Email Digest,Annual Expenses,ವಾರ್ಷಿಕ ವೆಚ್ಚಗಳು
 DocType: Item,Variants,ರೂಪಾಂತರಗಳು
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ಮಾಡಿ ಪರ್ಚೇಸ್ ಆರ್ಡರ್
 DocType: SMS Center,Send To,ಕಳಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ಲೀವ್ ಪ್ರಕಾರ ಸಾಕಷ್ಟು ರಜೆ ಸಮತೋಲನ ಇಲ್ಲ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ಹಂಚಿಕೆ ಪ್ರಮಾಣವನ್ನು
@@ -1788,7 +1786,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,ಕೆಲಸ ಪ್ರಗತಿಯಲ್ಲಿರುವ ವೇರ್ಹೌಸ್ ಸಲ್ಲಿಸಿ ಮೊದಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ಕೆಲಸ ಸಂ .
 DocType: Purchase Order Item,Warehouse and Reference,ವೇರ್ಹೌಸ್ ಮತ್ತು ರೆಫರೆನ್ಸ್
 DocType: Supplier,Statutory info and other general information about your Supplier,ಕಾನೂನುಸಮ್ಮತ ಮಾಹಿತಿಯನ್ನು ನಿಮ್ಮ ಸರಬರಾಜುದಾರ ಬಗ್ಗೆ ಇತರ ಸಾಮಾನ್ಯ ಮಾಹಿತಿ
@@ -1796,11 +1794,10 @@
 DocType: Item,Serial Nos and Batches,ಸೀರಿಯಲ್ ಸೂಲ ಮತ್ತು ಬ್ಯಾಚ್
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸಾಮರ್ಥ್ಯ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಸಾಮರ್ಥ್ಯ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ಜರ್ನಲ್ ವಿರುದ್ಧ ಎಂಟ್ರಿ {0} ಯಾವುದೇ ಸಾಟಿಯಿಲ್ಲದ {1} ದಾಖಲೆಗಳನ್ನು ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ರೀತಿಗೆ
 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: Grading Structure,Grading Intervals,ಗ್ರೇಡಿಂಗ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ದಯವಿಟ್ಟು ನಮೂದಿಸಿ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ಸತತವಾಗಿ ಐಟಂ {0} ಗಾಗಿ overbill ಸಾಧ್ಯವಿಲ್ಲ {1} ಹೆಚ್ಚು {2}. ಅತಿ ಬಿಲ್ಲಿಂಗ್ ಅನುಮತಿಸಲು, ಸೆಟ್ಟಿಂಗ್ಗಳು ಬೈಯಿಂಗ್ ಸೆಟ್ ಮಾಡಿ"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ಐಟಂ ಅಥವಾ ವೇರ್ಹೌಸ್ ಮೇಲೆ ಫಿಲ್ಟರ್ ಸೆಟ್ ಮಾಡಿ
@@ -1812,17 +1809,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,ಬಿಒಎಮ್ {0} ಸಲ್ಲಿಸಬೇಕು
 DocType: Authorization Control,Authorization Control,ಅಧಿಕಾರ ಕಂಟ್ರೋಲ್
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ರೋ # {0}: ವೇರ್ಹೌಸ್ ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ತಿರಸ್ಕರಿಸಿದರು ಐಟಂ ವಿರುದ್ಧ ಕಡ್ಡಾಯ {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ಪಾವತಿ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ನಿಮ್ಮ ಆದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ಪಾವತಿ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ನಿಮ್ಮ ಆದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ
 DocType: Production Order Operation,Actual Time and Cost,ನಿಜವಾದ ಸಮಯ ಮತ್ತು ವೆಚ್ಚ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ಗರಿಷ್ಠ ಮೆಟೀರಿಯಲ್ ವಿನಂತಿ {0} ಐಟಂ {1} {2} ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Employee,Salutation,ವಂದನೆ
 DocType: Course,Course Abbreviation,ಕೋರ್ಸ್ ಸಂಕ್ಷೇಪಣ
 DocType: Student Leave Application,Student Leave Application,ವಿದ್ಯಾರ್ಥಿ ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್
 DocType: Item,Will also apply for variants,ಸಹ ರೂಪಾಂತರಗಳು ಅನ್ವಯವಾಗುವುದು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ ರದ್ದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ನೌಕರರ {0} ಮೇಲೆ ಅರ್ಧ ದಿನ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ಒಟ್ಟು ಕೆಲಸದ ಗರಿಷ್ಠ ಕೆಲಸದ ಹೆಚ್ಚು ಮಾಡಬಾರದು {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ಮೇಲೆ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ಮಾರಾಟದ ಸಮಯದಲ್ಲಿ ಐಟಂಗಳನ್ನು ಬಂಡಲ್.
 DocType: Quotation Item,Actual Qty,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Sales Invoice Item,References,ಉಲ್ಲೇಖಗಳು
@@ -1832,7 +1830,7 @@
 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 +91,Associate,ಜತೆಗೂಡಿದ
 DocType: Asset Movement,Asset Movement,ಆಸ್ತಿ ಮೂವ್ಮೆಂಟ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ಹೊಸ ಕಾರ್ಟ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,ಹೊಸ ಕಾರ್ಟ್
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ಐಟಂ {0} ಒಂದು ಧಾರಾವಾಹಿಯಾಗಿ ಐಟಂ ಅಲ್ಲ
 DocType: SMS Center,Create Receiver List,ಸ್ವೀಕರಿಸುವವರ ಪಟ್ಟಿ ರಚಿಸಿ
 DocType: Vehicle,Wheels,ವೀಲ್ಸ್
@@ -1864,10 +1862,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶದ ವಿರುದ್ಧ ಸಮಯ ದಾಖಲೆಗಳು ಸೃಷ್ಟಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ. ಕಾರ್ಯಾಚರಣೆ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ವಿರುದ್ಧ ಟ್ರ್ಯಾಕ್ ಸಾಧ್ಯವಿಲ್ಲ ಹಾಗಿಲ್ಲ
 DocType: Student,Student Mobile Number,ವಿದ್ಯಾರ್ಥಿ ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
 DocType: Item,Has Variants,ವೇರಿಯಂಟ್
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ನೀವು ಈಗಾಗಲೇ ಆಯ್ಕೆ ಐಟಂಗಳನ್ನು ಎಂದು {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ಮಾಸಿಕ ವಿತರಣೆ ಹೆಸರು
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ಬ್ಯಾಚ್ ID ಕಡ್ಡಾಯ
 DocType: Sales Person,Parent Sales Person,ಪೋಷಕ ಮಾರಾಟಗಾರ್ತಿ
 DocType: Purchase Invoice,Recurring Invoice,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ಯೋಜನೆಗಳ ವ್ಯವಸ್ಥಾಪಕ
@@ -1875,11 +1873,11 @@
 DocType: Budget,Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ
 DocType: Vehicle Log,Fuel Price,ಇಂಧನ ಬೆಲೆ
 DocType: Budget,Budget,ಮುಂಗಡಪತ್ರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ಇರಬೇಕು.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",ಇದು ಆದಾಯ ಅಥವಾ ಖರ್ಚುವೆಚ್ಚ ಅಲ್ಲ ಎಂದು ಬಜೆಟ್ ವಿರುದ್ಧ {0} ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ಸಾಧಿಸಿದ
 DocType: Student Admission,Application Form Route,ಅಪ್ಲಿಕೇಶನ್ ಫಾರ್ಮ್ ಮಾರ್ಗ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,ಪ್ರದೇಶ / ಗ್ರಾಹಕ
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ಇ ಜಿ 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ಕೌಟುಂಬಿಕತೆ {0} ಇದು ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಿಂದ ಮಾಡಬಹುದು ಹಂಚಿಕೆ ಆಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ಸಾಲು {0}: ನಿಗದಿ ಪ್ರಮಾಣದ {1} ಕಡಿಮೆ ಅಥವಾ ಬಾಕಿ ಮೊತ್ತದ ಸರಕುಪಟ್ಟಿ ಸಮನಾಗಿರುತ್ತದೆ ಮಾಡಬೇಕು {2}
@@ -1899,15 +1897,15 @@
 ,Serial No Status,ಯಾವುದೇ ಸೀರಿಯಲ್ ಸ್ಥಿತಿ
 DocType: Payment Entry Reference,Outstanding,ಅತ್ಯುತ್ತಮ
 ,Daily Timesheet Summary,ಡೈಲಿ Timesheet ಸಾರಾಂಶ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ಸಾಲು {0}: ಹೊಂದಿಸಲು {1} ಆವರ್ತನವು, ಮತ್ತು ದಿನಾಂಕ \
  ಗೆ ನಡುವಿನ ವ್ಯತ್ಯಾಸ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ಈ ಸ್ಟಾಕ್ ಚಲನೆಯನ್ನು ಆಧರಿಸಿದೆ. ನೋಡಿ {0} ವಿವರಗಳಿಗಾಗಿ
 DocType: Pricing Rule,Selling,ವಿಕ್ರಯ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತದೆ {2}
 DocType: Employee,Salary Information,ವೇತನ ಮಾಹಿತಿ
 DocType: Sales Person,Name and Employee ID,ಹೆಸರು ಮತ್ತು ಉದ್ಯೋಗಿಗಳ ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ಕಾರಣ ದಿನಾಂಕ ದಿನಾಂಕ ಪೋಸ್ಟ್ ಮುನ್ನ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,ಕರ್ತವ್ಯಗಳು ಮತ್ತು ತೆರಿಗೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿ
@@ -1919,14 +1917,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ಈ ಬ್ಯಾಚ್ ಮಾದರಿ ಸಾಲು ಸಂಖ್ಯೆ ಹೆಚ್ಚಿನ ಅಥವಾ ಪ್ರಸ್ತುತ ಸಾಲಿನ ಸಂಖ್ಯೆ ಸಮಾನವಾಗಿರುತ್ತದೆ ಸೂಚಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Asset,Sold,ಮಾರಾಟ
 ,Item-wise Purchase History,ಐಟಂ ಬುದ್ಧಿವಂತ ಖರೀದಿ ಇತಿಹಾಸ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ಯಾವುದೇ ಸೀರಿಯಲ್ ಐಟಂ ಸೇರಿಸಲಾಗಿದೆ ತರಲು ' ರಚಿಸಿ ' ವೇಳಾಪಟ್ಟಿ ' ಕ್ಲಿಕ್ ಮಾಡಿ {0}
 DocType: Account,Frozen,ಘನೀಕೃತ
 ,Open Production Orders,ಓಪನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ಸ್
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ಬೇಸ್ ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Payment Reconciliation Payment,Reference Row,ರೆಫರೆನ್ಸ್ ರೋ
 DocType: Installation Note,Installation Time,ಅನುಸ್ಥಾಪನ ಟೈಮ್
 DocType: Sales Invoice,Accounting Details,ಲೆಕ್ಕಪರಿಶೋಧಕ ವಿವರಗಳು
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ಈ ಕಂಪೆನಿಗೆ ಎಲ್ಲಾ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅಳಿಸಿ
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ಇನ್ವೆಸ್ಟ್ಮೆಂಟ್ಸ್
 DocType: Issue,Resolution Details,ರೆಸಲ್ಯೂಶನ್ ವಿವರಗಳು
@@ -1959,14 +1957,14 @@
 DocType: Discussion,Discussion,ಚರ್ಚೆ
 DocType: Payment Entry,Transaction ID,ವ್ಯವಹಾರ ಐಡಿ
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ಮತ್ತಷ್ಟು ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಫಿಲ್ಟರ್.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ನೌಕರ ಸೇರುವ ದಿನಾಂಕ ದಯವಿಟ್ಟು {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ಒಟ್ಟು ಬಿಲ್ಲಿಂಗ್ ಪ್ರಮಾಣ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ಪುನರಾವರ್ತಿತ ಗ್ರಾಹಕ ಕಂದಾಯ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ಪಾತ್ರ 'ಖರ್ಚು ಅನುಮೋದಕ' ಆಗಿರಬೇಕು
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ಜೋಡಿ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ಪ್ರೊಡಕ್ಷನ್ ಬಿಒಎಮ್ ಮತ್ತು ಪ್ರಮಾಣ ಆಯ್ಕೆ
 DocType: Asset,Depreciation Schedule,ಸವಕಳಿ ವೇಳಾಪಟ್ಟಿ
 DocType: Bank Reconciliation Detail,Against Account,ಖಾತೆ ವಿರುದ್ಧ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ಅರ್ಧ ದಿನ ದಿನಾಂಕ ದಿನಾಂಕದಿಂದ ಮತ್ತು ದಿನಾಂಕ ನಡುವೆ ಇರಬೇಕು
@@ -1980,16 +1978,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},ದಯವಿಟ್ಟು ಕಂಪನಿಯಲ್ಲಿ &#39;ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ&#39; ಸೆಟ್ {0}
 ,Maintenance Schedules,ನಿರ್ವಹಣಾ ವೇಳಾಪಟ್ಟಿಗಳು
 DocType: Task,Actual End Date (via Time Sheet),ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ (ಟೈಮ್ ಶೀಟ್ ಮೂಲಕ)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},ಪ್ರಮಾಣ {0} {1} ವಿರುದ್ಧ {2} {3}
 ,Quotation Trends,ನುಡಿಮುತ್ತುಗಳು ಟ್ರೆಂಡ್ಸ್
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ಐಟಂ ಐಟಂ ಮಾಸ್ಟರ್ ಉಲ್ಲೇಖಿಸಿಲ್ಲ ಐಟಂ ಗ್ರೂಪ್ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಒಂದು ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಯನ್ನು ಇರಬೇಕು
 DocType: Shipping Rule Condition,Shipping Amount,ಶಿಪ್ಪಿಂಗ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ಬಾಕಿ ಪ್ರಮಾಣ
 DocType: Purchase Invoice Item,Conversion Factor,ಪರಿವರ್ತಿಸುವುದರ
 DocType: Purchase Order,Delivered,ತಲುಪಿಸಲಾಗಿದೆ
 ,Vehicle Expenses,ವಾಹನ ವೆಚ್ಚಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
+DocType: Serial No,Invoice Details,ಇನ್ವಾಯ್ಸ್ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ಉಪಯುಕ್ತ ಜೀವನದ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯ ಹೆಚ್ಚು ಅಥವಾ ಸಮನಾಗಿರಬೇಕು {0}
 DocType: Purchase Receipt,Vehicle Number,ವಾಹನ ಸಂಖ್ಯೆ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ಮರುಕಳಿಸುವ ಸರಕುಪಟ್ಟಿ ಸ್ಟಾಪ್ ಯಾವ ದಿನಾಂಕ
 DocType: Employee Loan,Loan Amount,ಸಾಲದ ಪ್ರಮಾಣ
@@ -2008,12 +2007,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Salary Slip,net pay info,ನಿವ್ವಳ ವೇತನ ಮಾಹಿತಿಯನ್ನು
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ಖರ್ಚು ಹಕ್ಕು ಅನುಮೋದನೆ ಬಾಕಿ ಇದೆ . ಮಾತ್ರ ಖರ್ಚು ಅನುಮೋದಕ ಡೇಟ್ ಮಾಡಬಹುದು .
 DocType: Email Digest,New Expenses,ಹೊಸ ವೆಚ್ಚಗಳು
 DocType: Purchase Invoice,Additional Discount Amount,ಹೆಚ್ಚುವರಿ ರಿಯಾಯಿತಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ರೋ # {0}: ಪ್ರಮಾಣ 1, ಐಟಂ ಸ್ಥಿರ ಆಸ್ತಿ ಇರಬೇಕು. ದಯವಿಟ್ಟು ಬಹು ಪ್ರಮಾಣ ಪ್ರತ್ಯೇಕ ಸಾಲು ಬಳಸಿ."
 DocType: Leave Block List Allow,Leave Block List Allow,ಬ್ಲಾಕ್ ಲಿಸ್ಟ್ ಅನುಮತಿಸಿ ಬಿಡಿ
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ಖಾಲಿ ಅಥವಾ ಜಾಗವನ್ನು ಇರುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ಅಲ್ಲದ ಗ್ರೂಪ್ ಗ್ರೂಪ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ಕ್ರೀಡೆ
 DocType: Loan Type,Loan Name,ಸಾಲ ಹೆಸರು
@@ -2025,6 +2024,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ನೀವು ತಿರಸ್ಕರಿಸಿದರು ಐಟಂಗಳ ಸ್ಟಾಕ್ ನಿರ್ವಹಿಸುವುದು ಅಲ್ಲಿ ವೇರ್ಹೌಸ್
 DocType: Production Order,Skip Material Transfer,ವಸ್ತು ಟ್ರಾನ್ಸ್ಫರ್ ತೆರಳಿ
 DocType: Production Order,Skip Material Transfer,ವಸ್ತು ಟ್ರಾನ್ಸ್ಫರ್ ತೆರಳಿ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ವಿನಿಮಯ ದರದ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ {0} ನಿಂದ {1} ಪ್ರಮುಖ ದಿನಾಂಕದಂದು {2}. ದಯವಿಟ್ಟು ಕರೆನ್ಸಿ ವಿನಿಮಯ ದಾಖಲೆ ಕೈಯಾರೆ ರಚಿಸಲು
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ನಿಮ್ಮ ಹಣಕಾಸಿನ ವರ್ಷ ಕೊನೆಗೊಳ್ಳುತ್ತದೆ
 DocType: POS Profile,Price List,ಬೆಲೆ ಪಟ್ಟಿ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ಈಗ ಡೀಫಾಲ್ಟ್ ಹಣಕಾಸಿನ ವರ್ಷ ಆಗಿದೆ . ಕಾರ್ಯಗತವಾಗಲು ಬದಲಾವಣೆಗೆ ನಿಮ್ಮ ಬ್ರೌಸರ್ ರಿಫ್ರೆಶ್ ಮಾಡಿ .
@@ -2041,19 +2041,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},ಖಾತೆ {0} ಅಮಾನ್ಯವಾಗಿದೆ. ಖಾತೆ ಕರೆನ್ಸಿ ಇರಬೇಕು {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ಪರಿವರ್ತಿಸುವುದರ ಸತತವಾಗಿ ಅಗತ್ಯವಿದೆ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಮಾರಾಟದ ಆರ್ಡರ್ ಒಂದು, ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Salary Component,Deduction,ವ್ಯವಕಲನ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ರೋ {0}: ಸಮಯ ಮತ್ತು ಟೈಮ್ ಕಡ್ಡಾಯ.
 DocType: Stock Reconciliation Item,Amount Difference,ಪ್ರಮಾಣ ವ್ಯತ್ಯಾಸ
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},ಐಟಂ ಬೆಲೆ ಸೇರ್ಪಡೆ {0} ದರ ಪಟ್ಟಿ ರಲ್ಲಿ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ಈ ಮಾರಾಟಗಾರನ ಉದ್ಯೋಗಿ ಅನ್ನು ನಮೂದಿಸಿ
 DocType: Territory,Classification of Customers by region,ಪ್ರದೇಶವಾರು ಗ್ರಾಹಕರು ವರ್ಗೀಕರಣ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಶೂನ್ಯ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ವ್ಯತ್ಯಾಸ ಪ್ರಮಾಣ ಶೂನ್ಯ ಇರಬೇಕು
 DocType: Project,Gross Margin,ಒಟ್ಟು ಅಂಚು
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,ಮೊದಲ ಉತ್ಪಾದನೆ ಐಟಂ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ಲೆಕ್ಕಹಾಕಿದ ಬ್ಯಾಂಕ್ ಹೇಳಿಕೆ ಸಮತೋಲನ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ಅಂಗವಿಕಲ ಬಳಕೆದಾರರ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ಉದ್ಧರಣ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ಉದ್ಧರಣ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ಒಟ್ಟು ಕಳೆಯುವುದು
 ,Production Analytics,ಪ್ರೊಡಕ್ಷನ್ ಅನಾಲಿಟಿಕ್ಸ್
@@ -2062,9 +2062,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ಎಚ್ಚರಿಕೆ: ಬಾಂಧವ್ಯ ಅಮಾನ್ಯ SSL ಪ್ರಮಾಣಪತ್ರ {0}
 DocType: Student Admission,Eligibility,ಅರ್ಹತಾ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ಕಾರಣವಾಗುತ್ತದೆ ನೀವು ಪಡೆಯಲು ವ್ಯಾಪಾರ, ನಿಮ್ಮ ತೀರಗಳು ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಮತ್ತು ಹೆಚ್ಚು ಸೇರಿಸಲು ಸಹಾಯ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ಕಾರಣವಾಗುತ್ತದೆ ನೀವು ಪಡೆಯಲು ವ್ಯಾಪಾರ, ನಿಮ್ಮ ತೀರಗಳು ಎಲ್ಲ ಸಂಪರ್ಕಗಳನ್ನು ಮತ್ತು ಹೆಚ್ಚು ಸೇರಿಸಲು ಸಹಾಯ"
 DocType: Production Order Operation,Actual Operation Time,ನಿಜವಾದ ಕಾರ್ಯಾಚರಣೆ ಟೈಮ್
 DocType: Authorization Rule,Applicable To (User),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಬಳಕೆದಾರ )
 DocType: Purchase Taxes and Charges,Deduct,ಕಳೆ
@@ -2079,7 +2079,7 @@
 DocType: Guardian,Work Address,ಕೆಲಸದ ವಿಳಾಸ
 DocType: Appraisal,Calculate Total Score,ಒಟ್ಟು ಸ್ಕೋರ್ ಲೆಕ್ಕ
 DocType: Request for Quotation,Manufacturing Manager,ಉತ್ಪಾದನಾ ಮ್ಯಾನೇಜರ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ವರೆಗೆ ವಾರಂಟಿ {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ಪ್ರವಾಸ ಒಳಗೆ ಡೆಲಿವರಿ ಗಮನಿಸಿ ಸ್ಪ್ಲಿಟ್ .
 apps/erpnext/erpnext/hooks.py +87,Shipments,ಸಾಗಣೆಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ಖಾತೆ ಬಾಕಿ ({0}) {1} ಮತ್ತು ಸ್ಟಾಕ್ ಮೌಲ್ಯಕ್ಕೆ ({2}) ಗೋದಾಮಿನ {3} ಏಕರೂಪಿಯಾಗಿರಬೇಕು
@@ -2102,10 +2102,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,ಗಮನಿಸಿ : ಇಮೇಲ್ ಅಂಗವಿಕಲ ಬಳಕೆದಾರರಿಗೆ ಕಳುಹಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ಇಂಟರಾಕ್ಷನ್ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ಇಂಟರಾಕ್ಷನ್ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ಕಂಪನಿ ಆಯ್ಕೆ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ಎಲ್ಲಾ ವಿಭಾಗಗಳು ಪರಿಗಣಿಸಲ್ಪಡುವ ವೇಳೆ ಖಾಲಿ ಬಿಡಿ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ಉದ್ಯೋಗ ವಿಧಗಳು ( ಶಾಶ್ವತ , ಒಪ್ಪಂದ , ಇಂಟರ್ನ್ , ಇತ್ಯಾದಿ ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ಐಟಂ ಕಡ್ಡಾಯ {1}
 DocType: Process Payroll,Fortnightly,ಪಾಕ್ಷಿಕ
 DocType: Currency Exchange,From Currency,ಚಲಾವಣೆಯ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ಕನಿಷ್ಠ ಒಂದು ಸತತವಾಗಿ ನಿಗದಿ ಪ್ರಮಾಣ, ಸರಕುಪಟ್ಟಿ ಕೌಟುಂಬಿಕತೆ ಮತ್ತು ಸರಕುಪಟ್ಟಿ ಸಂಖ್ಯೆ ಆಯ್ಕೆಮಾಡಿ"
@@ -2114,14 +2114,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),ದರ ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
 DocType: Student Guardian,Others,ಇತರೆ
 DocType: Payment Entry,Unallocated Amount,ನಿಯೋಜಿಸದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ಮ್ಯಾಚಿಂಗ್ ಐಟಂ ಸಿಗುವುದಿಲ್ಲ. ಫಾರ್ {0} ಕೆಲವು ಇತರ ಮೌಲ್ಯ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,ಯಾವುದೇ ನವೀಕರಣಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ಮೊದಲ ಸಾಲಿನ ' ಹಿಂದಿನ ರೋ ಒಟ್ಟು ರಂದು ' ' ಹಿಂದಿನ ಸಾಲಿನಲ್ಲಿ ಪ್ರಮಾಣ ' ಅಥವಾ ಒಂದು ಬ್ಯಾಚ್ ರೀತಿಯ ಆಯ್ಕೆ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ಮಕ್ಕಳ ಐಟಂ ಒಂದು ಉತ್ಪನ್ನ ಬಂಡಲ್ ಮಾಡಬಾರದು. ದಯವಿಟ್ಟು ಐಟಂ ಅನ್ನು ತೆಗೆದುಹಾಕಿ `{0}` ಮತ್ತು ಉಳಿಸಲು
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ಲೇವಾದೇವಿ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets ಸೇರಿಸಿ
 DocType: Vehicle Service,Service Item,ಸೇವೆ ಐಟಂ
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
 DocType: Bank Guarantee,Bank Guarantee,ಬ್ಯಾಂಕ್ ಗ್ಯಾರಂಟಿ
@@ -2147,6 +2147,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},ರೋ # {0}: ಆಸ್ತಿ {1} ಈಗಾಗಲೇ {2}
 DocType: Quotation Item,Stock Balance,ಸ್ಟಾಕ್ ಬ್ಯಾಲೆನ್ಸ್
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ಪಾವತಿ ಮಾರಾಟ ಆರ್ಡರ್
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} ಹೊಂದಿಸುವಿಕೆ&gt; ಸೆಟ್ಟಿಂಗ್ಗಳು ಮೂಲಕ&gt; ಹೆಸರಿಸುವ ಸರಣಿಗಾಗಿ ಸರಣಿ ಹೆಸರಿಸುವ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,ಸಿಇಒ
 DocType: Expense Claim Detail,Expense Claim Detail,ಖರ್ಚು ಹಕ್ಕು ವಿವರ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,ಸರಿಯಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ
@@ -2171,14 +2172,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ದರ ಪಟ್ಟಿ ಹೊಂದಿಸದೆ ವೇಳೆ ಬೆಲೆಗಳು ತೋರಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ಈ ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ಒಂದು ದೇಶದ ಸೂಚಿಸಲು ಅಥವಾ ವಿಶ್ವಾದ್ಯಂತ ಹಡಗು ಪರಿಶೀಲಿಸಿ
 DocType: Stock Entry,Total Incoming Value,ಒಟ್ಟು ಒಳಬರುವ ಮೌಲ್ಯ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ಡೆಬಿಟ್ ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ನಿಮ್ಮ ತಂಡದ ಮಾಡಲಾಗುತ್ತದೆ ಚಟುವಟಿಕೆಗಳನ್ನು ಫಾರ್ ಸಮಯ, ವೆಚ್ಚ ಮತ್ತು ಬಿಲ್ಲಿಂಗ್ ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ಖರೀದಿ ಬೆಲೆ ಪಟ್ಟಿ
 DocType: Offer Letter Term,Offer Term,ಆಫರ್ ಟರ್ಮ್
 DocType: Quality Inspection,Quality Manager,ಗುಣಮಟ್ಟದ ಮ್ಯಾನೇಜರ್
 DocType: Job Applicant,Job Opening,ಉದ್ಯೋಗಾವಕಾಶದ
 DocType: Payment Reconciliation,Payment Reconciliation,ಪಾವತಿ ಸಾಮರಸ್ಯ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ಉಸ್ತುವಾರಿ ವ್ಯಕ್ತಿಯ ಹೆಸರು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ತಂತ್ರಜ್ಞಾನ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},ಒಟ್ಟು ಪೇಯ್ಡ್: {0}
 DocType: BOM Website Operation,BOM Website Operation,ಬಿಒಎಮ್ ವೆಬ್ಸೈಟ್ ಆಪರೇಷನ್
@@ -2206,23 +2207,23 @@
 DocType: Opportunity,Lost Reason,ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ಹೊಸ ವಿಳಾಸ
 DocType: Quality Inspection,Sample Size,ಸ್ಯಾಂಪಲ್ ಸೈಜ್
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಈಗಾಗಲೇ ಸರಕುಪಟ್ಟಿ ಮಾಡಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ದಯವಿಟ್ಟು ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ಮತ್ತಷ್ಟು ವೆಚ್ಚ ಕೇಂದ್ರಗಳು ಗುಂಪುಗಳು ಅಡಿಯಲ್ಲಿ ಮಾಡಬಹುದು ಆದರೆ ನಮೂದುಗಳನ್ನು ಅಲ್ಲದ ಗುಂಪುಗಳ ವಿರುದ್ಧ ಮಾಡಬಹುದು
 DocType: Project,External,ಬಾಹ್ಯ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ಬಳಕೆದಾರರು ಮತ್ತು ಅನುಮತಿಗಳು
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಗಿದೆ: {0}
 DocType: Branch,Branch,ಶಾಖೆ
 DocType: Guardian,Mobile Number,ಮೊಬೈಲ್ ನಂಬರ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ಮುದ್ರಣ ಮತ್ತು ಬ್ರ್ಯಾಂಡಿಂಗ್
 DocType: Bin,Actual Quantity,ನಿಜವಾದ ಪ್ರಮಾಣ
 DocType: Shipping Rule,example: Next Day Shipping,ಉದಾಹರಣೆಗೆ : ಮುಂದೆ ದಿನ ಶಿಪ್ಪಿಂಗ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ಕಂಡುಬಂದಿಲ್ಲ ಸರಣಿ ಯಾವುದೇ {0}
 DocType: Scheduling Tool,Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ನಿಮ್ಮ ಗ್ರಾಹಕರು
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ವಿದ್ಯಾರ್ಥಿ ಮಾಡಿ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ನೀವು ಯೋಜನೆಯ ಸಹಯೋಗಿಸಲು ಆಮಂತ್ರಿಸಲಾಗಿದೆ: {0}
 DocType: Leave Block List Date,Block Date,ಬ್ಲಾಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ಈಗ ಅನ್ವಯಿಸು
@@ -2246,8 +2247,9 @@
 DocType: SMS Log,Sent To,ಕಳುಹಿಸಲಾಗುತ್ತದೆ
 DocType: Payment Request,Make Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ಸಾಫ್ಟ್
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ಮುಂದಿನ ಸಂಪರ್ಕಿಸಿ ದಿನಾಂಕ ಹಿಂದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Company,For Reference Only.,ಪರಾಮರ್ಶೆಗಾಗಿ ಮಾತ್ರ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ಬ್ಯಾಚ್ ಆಯ್ಕೆ ಇಲ್ಲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ಅಮಾನ್ಯ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ಅಡ್ವಾನ್ಸ್ ಪ್ರಮಾಣ
@@ -2261,7 +2263,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ಪ್ರಕರಣ ಸಂಖ್ಯೆ 0 ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Item,Show a slideshow at the top of the page,ಪುಟದ ಮೇಲಿರುವ ಒಂದು ಸ್ಲೈಡ್ಶೋ ತೋರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ಸ್ಟೋರ್ಸ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ಸ್ಟೋರ್ಸ್
 DocType: Serial No,Delivery Time,ಡೆಲಿವರಿ ಟೈಮ್
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ರಂದು ಆಧರಿಸಿ ಏಜಿಂಗ್
 DocType: Item,End of Life,ಲೈಫ್ ಅಂತ್ಯ
@@ -2273,12 +2275,12 @@
 DocType: Rename Tool,Rename Tool,ಟೂಲ್ ಮರುಹೆಸರಿಸು
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,ನವೀಕರಣ ವೆಚ್ಚ
 DocType: Item Reorder,Item Reorder,ಐಟಂ ಮರುಕ್ರಮಗೊಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,ಸಂಬಳ ಶೋ ಸ್ಲಿಪ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ಟ್ರಾನ್ಸ್ಫರ್ ವಸ್ತು
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ಕಾರ್ಯಾಚರಣೆಗಳು , ನಿರ್ವಹಣಾ ವೆಚ್ಚ ನಿರ್ದಿಷ್ಟಪಡಿಸಲು ಮತ್ತು ಕಾರ್ಯಾಚರಣೆಗಳು ಒಂದು ಅನನ್ಯ ಕಾರ್ಯಾಚರಣೆ ಯಾವುದೇ ನೀಡಿ ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ಈ ಡಾಕ್ಯುಮೆಂಟ್ ಮೂಲಕ ಮಿತಿಗಿಂತ {0} {1} ಐಟಂ {4}. ನೀವು ಮಾಡುತ್ತಿದ್ದಾರೆ ಇನ್ನೊಂದು ಅದೇ ವಿರುದ್ಧ {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,ಉಳಿಸುವ ನಂತರ ಮರುಕಳಿಸುವ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ಬದಲಾವಣೆ ಆಯ್ಕೆ ಪ್ರಮಾಣದ ಖಾತೆಯನ್ನು
 DocType: Purchase Invoice,Price List Currency,ಬೆಲೆ ಪಟ್ಟಿ ಕರೆನ್ಸಿ
 DocType: Naming Series,User must always select,ಬಳಕೆದಾರ ಯಾವಾಗಲೂ ಆಯ್ಕೆ ಮಾಡಬೇಕು
 DocType: Stock Settings,Allow Negative Stock,ನಕಾರಾತ್ಮಕ ಸ್ಟಾಕ್ ಅನುಮತಿಸಿ
@@ -2289,7 +2291,7 @@
 DocType: Budget Account,Budget Account,ಬಜೆಟ್ ಖಾತೆ
 DocType: Quality Inspection,Verified By,ಪರಿಶೀಲಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ಇರುವುದರಿಂದ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ . ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಬದಲಾಯಿಸಲು ರದ್ದು ಮಾಡಬೇಕು ."
-DocType: Grade Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
+DocType: Grading Scale Interval,Grade Description,ಗ್ರೇಡ್ ವಿವರಣೆ
 DocType: Stock Entry,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,ಸಂಬಳ ಸ್ಲಿಪ್ ರಚಿಸಿ
@@ -2327,7 +2329,7 @@
 DocType: Upload Attendance,Attendance To Date,ದಿನಾಂಕ ಹಾಜರಿದ್ದ
 DocType: Warranty Claim,Raised By,ಬೆಳೆಸಿದರು
 DocType: Payment Gateway Account,Payment Account,ಪಾವತಿ ಖಾತೆ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,ಮುಂದುವರೆಯಲು ಕಂಪನಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆಗಳು ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ಪರಿಹಾರ ಆಫ್
 DocType: Offer Letter,Accepted,Accepted
@@ -2337,12 +2339,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ನೀವು ನಿಜವಾಗಿಯೂ ಈ ಕಂಪನಿಗೆ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳ ಅಳಿಸಲು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ಅದು ಎಂದು ನಿಮ್ಮ ಮಾಸ್ಟರ್ ಡೇಟಾ ಉಳಿಯುತ್ತದೆ. ಈ ಕಾರ್ಯವನ್ನು ರದ್ದುಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Room,Room Number,ಕೋಣೆ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},ಅಮಾನ್ಯವಾದ ಉಲ್ಲೇಖ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ಯೋಜನೆ quanitity ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2}) ಉತ್ಪಾದನೆಯಲ್ಲಿನ ಆರ್ಡರ್ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ಯೋಜನೆ quanitity ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ ({2}) ಉತ್ಪಾದನೆಯಲ್ಲಿನ ಆರ್ಡರ್ {3}
 DocType: Shipping Rule,Shipping Rule Label,ಶಿಪ್ಪಿಂಗ್ ಲೇಬಲ್ ರೂಲ್
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ಬಳಕೆದಾರ ವೇದಿಕೆ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ರಾ ಮೆಟೀರಿಯಲ್ಸ್ ಖಾಲಿ ಇರುವಂತಿಲ್ಲ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ಸ್ಟಾಕ್ ನವೀಕರಣಗೊಳ್ಳುವುದಿಲ್ಲ, ಸರಕುಪಟ್ಟಿ ಡ್ರಾಪ್ ಹಡಗು ಐಟಂ ಹೊಂದಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ತ್ವರಿತ ಜರ್ನಲ್ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ಯಾವುದೇ ಐಟಂ agianst ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ ವೇಳೆ ನೀವು ದರ ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee,Previous Work Experience,ಹಿಂದಿನ ಅನುಭವ
 DocType: Stock Entry,For Quantity,ಪ್ರಮಾಣ
@@ -2355,7 +2357,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ನಿಯಮಗಳು ಮತ್ತು Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ಸಂಸ್ಥೆಯ ಹೆಸರು ಇದಕ್ಕಾಗಿ ನೀವು ಈ ವ್ಯವಸ್ಥೆಯ ಹೊಂದಿಸುವಾಗ.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ಲೆಕ್ಕಪರಿಶೋಧಕ ಪ್ರವೇಶ ಈ ದಿನಾಂಕ ಫ್ರೀಜ್ , ಯಾರೂ / ಕೆಳಗೆ ಸೂಚಿಸಲಾದ ಪಾತ್ರವನ್ನು ಹೊರತುಪಡಿಸಿ ಪ್ರವೇಶ ಮಾರ್ಪಡಿಸಲು ಮಾಡಬಹುದು ."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಉತ್ಪಾದಿಸುವ ಮೊದಲು ಡಾಕ್ಯುಮೆಂಟ್ ಉಳಿಸಲು ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ಸ್ಥಿತಿ
 DocType: UOM,Check this to disallow fractions. (for Nos),ಭಿನ್ನರಾಶಿಗಳನ್ನು ಅವಕಾಶ ಈ ಪರಿಶೀಲಿಸಿ . ( ಸೂಲ ಫಾರ್ )
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,ಕೆಳಗಿನ ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ಸ್ ರಚಿಸಲಾಯಿತು:
@@ -2382,7 +2384,7 @@
 ,Employees working on a holiday,ಒಂದು ರಜಾ ಕೆಲಸ ನೌಕರರು
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ಮಾರ್ಕ್ ಪ್ರೆಸೆಂಟ್
 DocType: Project,% Complete Method,% ಕಂಪ್ಲೀಟ್ ವಿಧಾನ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ನಿರ್ವಹಣೆ ಆರಂಭ ದಿನಾಂಕ ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ನಿರ್ವಹಣೆ ಆರಂಭ ದಿನಾಂಕ ಯಾವುದೇ ಸೀರಿಯಲ್ ವಿತರಣಾ ದಿನಾಂಕದ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Production Order,Actual End Date,ನಿಜವಾದ ಅಂತಿಮ ದಿನಾಂಕ
 DocType: BOM,Operating Cost (Company Currency),ವೆಚ್ಚವನ್ನು (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2399,7 +2401,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ಸಂಬಳ ಇಲ್ಲದೆ ಬಿಟ್ಟು ರಜೆ ಅನುಮೋದನೆ ಅಪ್ಲಿಕೇಶನ್ ದಾಖಲೆಗಳು ಹೊಂದುವುದಿಲ್ಲ
 DocType: Campaign,Campaign-.####,ಕ್ಯಾಂಪೇನ್ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ಮುಂದಿನ ಕ್ರಮಗಳು
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,ದಯವಿಟ್ಟು ಸಾಧ್ಯವಾದಷ್ಟು ದರಗಳಲ್ಲಿ ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಐಟಂಗಳನ್ನು ಸರಬರಾಜು
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಅವಕಾಶ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ಅಂತ್ಯ ವರ್ಷ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / ಲೀಡ್%
@@ -2457,7 +2459,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ಪ್ರಮಾಣ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ಶುಲ್ಕ ರೆಕಾರ್ಡ್ಸ್ ರಚಿಸಲಾಗಿದೆ - {0}
 DocType: Asset Category Account,Asset Category Account,ಆಸ್ತಿ ವರ್ಗ ಖಾತೆ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},ಹೆಚ್ಚು ಐಟಂ ಉತ್ಪಾದಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {0} ಹೆಚ್ಚು ಮಾರಾಟದ ಆರ್ಡರ್ ಪ್ರಮಾಣ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Payment Reconciliation,Bank / Cash Account,ಬ್ಯಾಂಕ್ / ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,ಮುಂದಿನ ಮೂಲಕ ಸಂಪರ್ಕಿಸಿ ಲೀಡ್ ಇಮೇಲ್ ವಿಳಾಸ ಅದೇ ಸಾಧ್ಯವಿಲ್ಲ
@@ -2479,7 +2481,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಪ್ರಸ್ತಾಪಿಸಿದ್ದಾರೆ
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ಉತ್ಪಾದನೆ
 DocType: Guardian,Occupation,ಉದ್ಯೋಗ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ರೋ {0} : ಪ್ರಾರಂಭ ದಿನಾಂಕ ಎಂಡ್ ದಿನಾಂಕದ ಮೊದಲು
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ಒಟ್ಟು (ಪ್ರಮಾಣ)
 DocType: Sales Invoice,This Document,ಈ ಡಾಕ್ಯುಮೆಂಟ್
 DocType: Installation Note Item,Installed Qty,ಅನುಸ್ಥಾಪಿಸಲಾದ ಪ್ರಮಾಣ
@@ -2495,15 +2498,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ಯುಟಿಲಿಟಿ ವೆಚ್ಚಗಳು
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ಮೇಲೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ರೋ # {0}: ಜರ್ನಲ್ ಎಂಟ್ರಿ {1} ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ {2} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ರೋ # {0}: ಜರ್ನಲ್ ಎಂಟ್ರಿ {1} ಖಾತೆಯನ್ನು ಹೊಂದಿಲ್ಲ {2} ಅಥವಾ ಈಗಾಗಲೇ ಮತ್ತೊಂದು ಚೀಟಿ ವಿರುದ್ಧ ದಾಖಲೆಗಳುಸರಿಹೊಂದಿವೆ
 DocType: Buying Settings,Default Buying Price List,ಡೀಫಾಲ್ಟ್ ಬೆಲೆ ಪಟ್ಟಿ ಖರೀದಿ
 DocType: Process Payroll,Salary Slip Based on Timesheet,ಸಂಬಳ ಸ್ಲಿಪ್ Timesheet ಆಧರಿಸಿ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ಮೇಲೆ ಆಯ್ಕೆ ಮಾಡಿದ ಮಾನದಂಡ ಅಥವಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಯಾವುದೇ ಉದ್ಯೋಗಿ ಈಗಾಗಲೇ ರಚಿಸಿದ
 DocType: Notification Control,Sales Order Message,ಮಾರಾಟದ ಆರ್ಡರ್ ಸಂದೇಶ
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","ಇತ್ಯಾದಿ ಕಂಪನಿ, ಕರೆನ್ಸಿ , ಪ್ರಸಕ್ತ ಆರ್ಥಿಕ ವರ್ಷದ , ಹಾಗೆ ಹೊಂದಿಸಿ ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳು"
 DocType: Payment Entry,Payment Type,ಪಾವತಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ಐಟಂ ಒಂದು ಬ್ಯಾಚ್ ಆಯ್ಕೆಮಾಡಿ {0}. ಈ ಅವಶ್ಯಕತೆಯನ್ನು ಪೂರೈಸುವ ಒಂದು ಬ್ಯಾಚ್ ಸಿಗಲಿಲ್ಲವಾದ್ದರಿಂದ
 DocType: Process Payroll,Select Employees,ಆಯ್ಕೆ ನೌಕರರು
 DocType: Opportunity,Potential Sales Deal,ಸಂಭಾವ್ಯ ಮಾರಾಟ ಡೀಲ್
 DocType: Payment Entry,Cheque/Reference Date,ಚೆಕ್ / ಉಲ್ಲೇಖ ದಿನಾಂಕ
@@ -2520,7 +2523,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ಈಗಾಗಲೇ ಕಂಪನಿ ದಾಖಲಿಸಿದವರು ಜಾಗತಿಕ ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ {0} {1}
 DocType: Purchase Order,Ref SQ,ಉಲ್ಲೇಖ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ಎಲ್ಲಾ BOMs ಐಟಂ / BOM ಬದಲಾಯಿಸಿ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಬೇಕು
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ರಸೀತಿ ಡಾಕ್ಯುಮೆಂಟ್ ಸಲ್ಲಿಸಬೇಕು
 DocType: Purchase Invoice Item,Received Qty,ಪ್ರಮಾಣ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
 DocType: Stock Entry Detail,Serial No / Batch,ಯಾವುದೇ ಸೀರಿಯಲ್ / ಬ್ಯಾಚ್
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ಮಾಡಿರುವುದಿಲ್ಲ ಪಾವತಿಸಿದ ಮತ್ತು ವಿತರಣೆ
@@ -2529,11 +2532,11 @@
 DocType: Delivery Note,DN-RET-,ಡಿ-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ಯಾವುದೇ ಸಮಯ ಹಾಳೆಗಳನ್ನು
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} ಸಾಗಿಸುವ-ಫಾರ್ವರ್ಡ್ ಸಾಧ್ಯವಿಲ್ಲ ಕೌಟುಂಬಿಕತೆ ಬಿಡಿ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು ಉತ್ಪತ್ತಿಯಾಗುವುದಿಲ್ಲ. ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 ,To Produce,ಉತ್ಪಾದಿಸಲು
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ವೇತನದಾರರ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ಸಾಲು {0} ನಲ್ಲಿ {1}. ಐಟಂ ದರ {2} ಸೇರಿವೆ, ಸಾಲುಗಳನ್ನು {3} ಸಹ ಸೇರಿಸಲೇಬೇಕು"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ಬಳಕೆದಾರ ಮಾಡಿ
 DocType: Packing Slip,Identification of the package for the delivery (for print),( ಮುದ್ರಣ ) ವಿತರಣಾ ಪ್ಯಾಕೇಜ್ ಗುರುತಿನ
 DocType: Bin,Reserved Quantity,ರಿಸರ್ವ್ಡ್ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ದಯವಿಟ್ಟು ಮಾನ್ಯವಾದ ಇಮೇಲ್ ವಿಳಾಸವನ್ನು ನಮೂದಿಸಿ
@@ -2547,15 +2550,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಟೆಂಪ್ಲೇಟ್ ಡೀಫಾಲ್ಟ್ ಟೆಂಪ್ಲೇಟ್ ಇರಬಾರದು
 DocType: Account,Income Account,ಆದಾಯ ಖಾತೆ
 DocType: Payment Request,Amount in customer's currency,ಗ್ರಾಹಕರ ಕರೆನ್ಸಿ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ಡೆಲಿವರಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ಡೆಲಿವರಿ
 DocType: Stock Reconciliation Item,Current Qty,ಪ್ರಸ್ತುತ ಪ್ರಮಾಣ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","ವಿಭಾಗ ಕಾಸ್ಟಿಂಗ್ ರಲ್ಲಿ ""ಆಧರಿಸಿ ವಸ್ತುಗಳ ದರ "" ನೋಡಿ"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ಹಿಂದಿನದು
 DocType: Appraisal Goal,Key Responsibility Area,ಪ್ರಮುಖ ಜವಾಬ್ದಾರಿ ಪ್ರದೇಶ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ಗಳು ನೀವು ವಿದ್ಯಾರ್ಥಿಗಳು ಹಾಜರಾತಿ, ಮೌಲ್ಯಮಾಪನಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟ್ರ್ಯಾಕ್ ಸಹಾಯ"
 DocType: Payment Entry,Total Allocated Amount,ಒಟ್ಟು ನಿಗದಿ ಪ್ರಮಾಣ
 DocType: Item Reorder,Material Request Type,ಮೆಟೀರಿಯಲ್ RequestType
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ನಿಂದ {0} ಗೆ ಸಂಬಳ Accural ಜರ್ನಲ್ ಎಂಟ್ರಿ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಿಲ್ಲ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","ಸ್ಥಳಿಯಸಂಗ್ರಹಣೆ ಪೂರ್ಣ, ಉಳಿಸಿಲ್ಲ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ಸಾಲು {0}: ಮೈಸೂರು ವಿಶ್ವವಿದ್ಯಾನಿಲದ ಪರಿವರ್ತನಾ ಕಾರಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,ತೀರ್ಪುಗಾರ
 DocType: Budget,Cost Center,ವೆಚ್ಚ ಸೆಂಟರ್
@@ -2565,16 +2569,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ನಿಂದ ಗ್ರಾಹಕರ ತೆರಿಗೆ Id ಮರೆಮಾಡಿ
 DocType: Upload Attendance,Upload HTML,ಅಪ್ಲೋಡ್ ಎಚ್ಟಿಎಮ್ಎಲ್
 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.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ಬೆಲೆ ರೂಲ್ ಕೆಲವು ಮಾನದಂಡಗಳನ್ನು ಆಧರಿಸಿ, ಬೆಲೆ ಪಟ್ಟಿ / ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ವ್ಯಾಖ್ಯಾನಿಸಲು ಬದಲಿಸಿ ತಯಾರಿಸಲಾಗುತ್ತದೆ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ವೇರ್ಹೌಸ್ ಮಾತ್ರ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ / ಡೆಲಿವರಿ ಸೂಚನೆ / ರಸೀತಿ ಖರೀದಿ ಮೂಲಕ ಬದಲಾಯಿಸಬಹುದು
 DocType: Employee Education,Class / Percentage,ವರ್ಗ / ಶೇಕಡಾವಾರು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ಮಾರ್ಕೆಟಿಂಗ್ ಮತ್ತು ಮಾರಾಟದ ಮುಖ್ಯಸ್ಥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","ಆಯ್ಕೆ ಬೆಲೆ ರೂಲ್ 'ಬೆಲೆ' ತಯಾರಿಸಲಾಗುತ್ತದೆ, ಅದು ಬೆಲೆ ಪಟ್ಟಿ ಬದಲಿಸಿ. ಬೆಲೆ ರೂಲ್ ಬೆಲೆ ಅಂತಿಮ ಬೆಲೆ, ಆದ್ದರಿಂದ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸಬಹುದಾಗಿದೆ. ಆದ್ದರಿಂದ, ಇತ್ಯಾದಿ ಮಾರಾಟದ ಆರ್ಡರ್, ಆರ್ಡರ್ ಖರೀದಿಸಿ ರೀತಿಯ ವ್ಯವಹಾರಗಳಲ್ಲಿ, ಇದು ಬದಲಿಗೆ 'ಬೆಲೆ ಪಟ್ಟಿ ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಹೆಚ್ಚು, 'ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ತರಲಾಗಿದೆ ನಡೆಯಲಿದೆ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ಆಯ್ಕೆ ಬೆಲೆ ರೂಲ್ 'ಬೆಲೆ' ತಯಾರಿಸಲಾಗುತ್ತದೆ, ಅದು ಬೆಲೆ ಪಟ್ಟಿ ಬದಲಿಸಿ. ಬೆಲೆ ರೂಲ್ ಬೆಲೆ ಅಂತಿಮ ಬೆಲೆ, ಆದ್ದರಿಂದ ಯಾವುದೇ ರಿಯಾಯಿತಿ ಅನ್ವಯಿಸಬಹುದಾಗಿದೆ. ಆದ್ದರಿಂದ, ಇತ್ಯಾದಿ ಮಾರಾಟದ ಆರ್ಡರ್, ಆರ್ಡರ್ ಖರೀದಿಸಿ ರೀತಿಯ ವ್ಯವಹಾರಗಳಲ್ಲಿ, ಇದು ಬದಲಿಗೆ 'ಬೆಲೆ ಪಟ್ಟಿ ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ಹೆಚ್ಚು, 'ದರ' ಕ್ಷೇತ್ರದಲ್ಲಿ ತರಲಾಗಿದೆ ನಡೆಯಲಿದೆ."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ಟ್ರ್ಯಾಕ್ ಇಂಡಸ್ಟ್ರಿ ಪ್ರಕಾರ ಕಾರಣವಾಗುತ್ತದೆ.
 DocType: Item Supplier,Item Supplier,ಐಟಂ ಸರಬರಾಜುದಾರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,ಯಾವುದೇ ಐಟಂ ಬ್ಯಾಚ್ ಪಡೆಯಲು ಕೋಡ್ ನಮೂದಿಸಿ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} {1} quotation_to ಒಂದು ಮೌಲ್ಯವನ್ನು ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ಎಲ್ಲಾ ವಿಳಾಸಗಳನ್ನು .
 DocType: Company,Stock Settings,ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ಕೆಳಗಿನ ಲಕ್ಷಣಗಳು ದಾಖಲೆಗಳಲ್ಲಿ ಅದೇ ವೇಳೆ ಮರ್ಜಿಂಗ್ ಮಾತ್ರ ಸಾಧ್ಯ. ಗ್ರೂಪ್, ರೂಟ್ ಕೌಟುಂಬಿಕತೆ, ಕಂಪನಿ"
@@ -2584,6 +2588,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ಸ್ಥಿತಿ ಕ್ರಿಯೆಯನ್ನು ಬಗ್ಗೆ ಒಂದು ಇಮೇಲ್ ಕಳುಹಿಸುತ್ತೇವೆ ನೌಕರರಿಗೆ &#39;ಮುಕ್ತ&#39;
 DocType: Task,Depends on Tasks,ಕಾರ್ಯಗಳು ಅವಲಂಬಿಸಿದೆ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ಗ್ರಾಹಕ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಗ್ರೂಪ್ ಟ್ರೀ .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ಲಗತ್ತುಗಳು ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಸಕ್ರಿಯಗೊಳಿಸದೇ ತೋರಿಸಬಹುದು
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ಹೊಸ ವೆಚ್ಚ ಸೆಂಟರ್ ಹೆಸರು
 DocType: Leave Control Panel,Leave Control Panel,ಕಂಟ್ರೋಲ್ ಪ್ಯಾನಲ್ ಬಿಡಿ
@@ -2596,12 +2601,10 @@
 DocType: Sales Invoice,Debit To,ಡೆಬಿಟ್
 DocType: Delivery Note,Required only for sample item.,ಕೇವಲ ಮಾದರಿ ಐಟಂ ಅಗತ್ಯವಿದೆ .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ವ್ಯವಹಾರದ ನಂತರ ನಿಜವಾದ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ಸರಬರಾಜುದಾರ&gt; ಸರಬರಾಜುದಾರ ವಿಧ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ಸಂಬಳ ಸ್ಲಿಪ್ ನಡುವಿನ ಭಾಗದಲ್ಲಿ {0} ಮತ್ತು {1}
 ,Pending SO Items For Purchase Request,ಖರೀದಿ ವಿನಂತಿ ಆದ್ದರಿಂದ ಐಟಂಗಳು ಬಾಕಿ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Supplier,Billing Currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ಎಕ್ಸ್ಟ್ರಾ ದೊಡ್ಡದು
@@ -2618,9 +2621,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ಮುಖಪುಟ ಉತ್ಪನ್ನ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪುಗಳು
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ಹೊಸ ವೇರ್ಹೌಸ್ ಹೆಸರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ಒಟ್ಟು {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ಕ್ಷೇತ್ರ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ನಮೂದಿಸಿ ಅಗತ್ಯವಿದೆ ಭೇಟಿ ಯಾವುದೇ
 DocType: Stock Settings,Default Valuation Method,ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯಮಾಪನ ವಿಧಾನ
 DocType: Vehicle Log,Fuel Qty,ಇಂಧನ ಪ್ರಮಾಣ
 DocType: Production Order Operation,Planned Start Time,ಯೋಜಿತ ಆರಂಭಿಸಲು ಸಮಯ
@@ -2636,7 +2639,7 @@
 DocType: Price List,Price List Master,ದರ ಪಟ್ಟಿ ಮಾಸ್ಟರ್
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ನೀವು ಸೆಟ್ ಮತ್ತು ಗುರಿಗಳನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಆ ಎಲ್ಲಾ ಮಾರಾಟದ ಟ್ರಾನ್ಸಾಕ್ಷನ್ಸ್ ಅನೇಕ ** ಮಾರಾಟದ ವ್ಯಕ್ತಿಗಳು ** ವಿರುದ್ಧ ಟ್ಯಾಗ್ ಮಾಡಬಹುದು.
 ,S.O. No.,S.O. ನಂ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},{0} ನಿಂದ ಗ್ರಾಹಕ ಲೀಡ್ ರಚಿಸಲು ದಯವಿಟ್ಟು
 DocType: Price List,Applicable for Countries,ದೇಶಗಳು ಅನ್ವಯಿಸುವುದಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ಮಾತ್ರ ಸ್ಥಿತಿಯನ್ನು ಅನ್ವಯಗಳಲ್ಲಿ ಬಿಡಿ &#39;ಅಂಗೀಕಾರವಾದ&#39; ಮತ್ತು &#39;ತಿರಸ್ಕರಿಸಲಾಗಿದೆ&#39; ಸಲ್ಲಿಸಿದ ಮಾಡಬಹುದು
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು ಹೆಸರು ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
@@ -2680,7 +2683,7 @@
 DocType: Project,Copied From,ನಕಲು
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},ಹೆಸರು ದೋಷ: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ಕೊರತೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ನೌಕರ ಅಟೆಂಡೆನ್ಸ್ {0} ಈಗಾಗಲೇ ಗುರುತಿಸಲಾಗಿದೆ
 DocType: Packing Slip,If more than one package of the same type (for print),ವೇಳೆ ( ಮುದ್ರಣ ) ಅದೇ ರೀತಿಯ ಒಂದಕ್ಕಿಂತ ಹೆಚ್ಚು ಪ್ಯಾಕೇಜ್
 ,Salary Register,ಸಂಬಳ ನೋಂದಣಿ
@@ -2699,7 +2702,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ಶಾಪಿಂಗ್ ಕಾರ್ಟ್ ಬಳಸಲು
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ಮೌಲ್ಯ {0} ವೈಶಿಷ್ಟ್ಯದ {1} ಮಾನ್ಯ ಐಟಂ ಪಟ್ಟಿಯಲ್ಲಿ ಐಟಂ ಆಟ್ರಿಬ್ಯೂಟ್ ಮೌಲ್ಯಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ {2}
 DocType: BOM Item,Scrap %,ಸ್ಕ್ರ್ಯಾಪ್ %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ಆರೋಪಗಳನ್ನು ಸೂಕ್ತ ಪ್ರಮಾಣದಲ್ಲಿ ನಿಮ್ಮ ಆಯ್ಕೆಯ ಪ್ರಕಾರ, ಐಟಂ ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಹಂಚಲಾಗುತ್ತದೆ"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ಆರೋಪಗಳನ್ನು ಸೂಕ್ತ ಪ್ರಮಾಣದಲ್ಲಿ ನಿಮ್ಮ ಆಯ್ಕೆಯ ಪ್ರಕಾರ, ಐಟಂ ಪ್ರಮಾಣ ಅಥವಾ ಪ್ರಮಾಣವನ್ನು ಆಧರಿಸಿ ಹಂಚಲಾಗುತ್ತದೆ"
 DocType: Maintenance Visit,Purposes,ಉದ್ದೇಶಗಳಿಗಾಗಿ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ಕನಿಷ್ಠ ಒಂದು ಐಟಂ ರಿಟರ್ನ್ ದಸ್ತಾವೇಜು ನಕಾರಾತ್ಮಕ ಪ್ರಮಾಣ ದಾಖಲಿಸಬೇಕಾಗುತ್ತದೆ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ಆಪರೇಷನ್ {0} ಕಾರ್ಯಸ್ಥಳ ಯಾವುದೇ ಲಭ್ಯವಿರುವ ಕೆಲಸದ ಹೆಚ್ಚು {1}, ಅನೇಕ ಕಾರ್ಯಾಚರಣೆಗಳು ಆಪರೇಷನ್ ಮುರಿಯಲು"
@@ -2720,16 +2723,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ಪ್ರದೇಶ ಮ್ಯಾನೇಜ್ಮೆಂಟ್ ಟ್ರೀ .
 DocType: Journal Entry Account,Sales Invoice,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ
 DocType: Journal Entry Account,Party Balance,ಪಕ್ಷದ ಬ್ಯಾಲೆನ್ಸ್
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ರಿಯಾಯತಿ ಅನ್ವಯಿಸು ಆಯ್ಕೆಮಾಡಿ
 DocType: Company,Default Receivable Account,ಡೀಫಾಲ್ಟ್ ಸ್ವೀಕರಿಸುವಂತಹ ಖಾತೆ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ಮೇಲೆ ಆಯ್ಕೆ ಮಾನದಂಡದ ಒಟ್ಟು ವೇತನ ಬ್ಯಾಂಕ್ ಎಂಟ್ರಿ ರಚಿಸಿ
 DocType: Stock Entry,Material Transfer for Manufacture,ತಯಾರಿಕೆಗೆ ವಸ್ತು ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಅಥವಾ ಎಲ್ಲಾ ಬೆಲೆ ಪಟ್ಟಿ ಎರಡೂ ಅನ್ವಯಿಸಬಹುದು.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ರಿಯಾಯಿತಿ ಶೇಕಡಾವಾರು ಬೆಲೆ ಪಟ್ಟಿ ವಿರುದ್ಧ ಅಥವಾ ಎಲ್ಲಾ ಬೆಲೆ ಪಟ್ಟಿ ಎರಡೂ ಅನ್ವಯಿಸಬಹುದು.
 DocType: Purchase Invoice,Half-yearly,ಅರ್ಧವಾರ್ಷಿಕ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ಸ್ಟಾಕ್ ಲೆಕ್ಕಪರಿಶೋಧಕ ಎಂಟ್ರಿ
 DocType: Vehicle Service,Engine Oil,ಎಂಜಿನ್ ತೈಲ
 DocType: Sales Invoice,Sales Team1,ಮಾರಾಟದ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ಐಟಂ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
 DocType: Sales Invoice,Customer Address,ಗ್ರಾಹಕ ವಿಳಾಸ
 DocType: Employee Loan,Loan Details,ಸಾಲ ವಿವರಗಳು
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ರೋ {0}: ಪೂರ್ಣಗೊಂಡಿದೆ ಪ್ರಮಾಣ ಹೆಚ್ಚಾಗಿದೆ ಶೂನ್ಯ ಇರಬೇಕು.
@@ -2737,24 +2740,24 @@
 DocType: Account,Root Type,ರೂಟ್ ಪ್ರಕಾರ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ರೋ # {0}: ಹೆಚ್ಚು ಮರಳಲು ಸಾಧ್ಯವಿಲ್ಲ {1} ಐಟಂ {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ಪ್ಲಾಟ್
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},ಟಾರ್ಗೆಟ್ ಗೋದಾಮಿನ ಸಾಲು ಕಡ್ಡಾಯ {0}
 DocType: Cheque Print Template,Primary Settings,ಪ್ರಾಥಮಿಕ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Purchase Invoice,Select Supplier Address,ಸರಬರಾಜುದಾರ ವಿಳಾಸ ಆಯ್ಕೆ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ನೌಕರರು ಸೇರಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ನೌಕರರು ಸೇರಿಸಿ
 DocType: Purchase Invoice Item,Quality Inspection,ಗುಣಮಟ್ಟದ ತಪಾಸಣೆ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,ಹೆಚ್ಚುವರಿ ಸಣ್ಣ
 DocType: Company,Standard Template,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ಟೆಂಪ್ಲೇಟು
 DocType: Training Event,Theory,ಥಿಯರಿ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,ಎಚ್ಚರಿಕೆ : ಪ್ರಮಾಣ ವಿನಂತಿಸಿದ ವಸ್ತು ಕನಿಷ್ಠ ಪ್ರಮಾಣ ಆದೇಶ ಕಡಿಮೆ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ಖಾತೆ {0} ಹೆಪ್ಪುಗಟ್ಟಿರುವ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ಸಂಸ್ಥೆ ಸೇರಿದ ಖಾತೆಗಳ ಪ್ರತ್ಯೇಕ ಚಾರ್ಟ್ ಜೊತೆಗೆ ಕಾನೂನು ಘಟಕದ / ಅಂಗಸಂಸ್ಥೆ.
 DocType: Payment Request,Mute Email,ಮ್ಯೂಟ್ ಇಮೇಲ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ಆಹಾರ , ಪಾನೀಯ ಮತ್ತು ತಂಬಾಕು"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},ಮಾತ್ರ ವಿರುದ್ಧ ಪಾವತಿ ಮಾಡಬಹುದು unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ಕಮಿಷನ್ ದರ 100 ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Stock Entry,Subcontract,subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,ಮೊದಲ {0} ನಮೂದಿಸಿ
@@ -2794,7 +2797,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವಹಿವಾಟು ಗೋದಾಮುಗಳು ಗುಂಪು ಪರಿವರ್ತಿಸಬಹುದು ಸಾಧ್ಯವಿಲ್ಲ.
 DocType: Assessment Result Tool,Result HTML,ಪರಿಣಾಮವಾಗಿ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ರಂದು ಅವಧಿ ಮೀರುತ್ತದೆ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಸೇರಿಸಿ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},ಆಯ್ಕೆಮಾಡಿ {0}
 DocType: C-Form,C-Form No,ಸಿ ಫಾರ್ಮ್ ನಂ
 DocType: BOM,Exploded_items,Exploded_items
@@ -2837,7 +2840,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ಮೊತ್ತ
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆಮಾಡಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ
 DocType: Company,Chart Of Accounts Template,ಖಾತೆಗಳನ್ನು ಟೆಂಪ್ಲೇಟು ಚಾರ್ಟ್
 DocType: Attendance,Attendance Date,ಅಟೆಂಡೆನ್ಸ್ ದಿನಾಂಕ
@@ -2852,14 +2855,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ಪ್ರವೇಶ ನಕಲು
 DocType: Program Enrollment Tool,Get Students,ವಿದ್ಯಾರ್ಥಿಗಳು ಪಡೆಯಿರಿ
 DocType: Serial No,Under Warranty,ವಾರಂಟಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ದೋಷ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ದೋಷ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ನೀವು ಮಾರಾಟದ ಆರ್ಡರ್ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 ,Employee Birthday,ನೌಕರರ ಜನ್ಮದಿನ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ಮಿತಿ ಕ್ರಾಸ್ಡ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ಸಾಹಸೋದ್ಯಮ ಬಂಡವಾಳ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ಈ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ ಶೈಕ್ಷಣಿಕ ಪದವನ್ನು {0} ಮತ್ತು &#39;ಟರ್ಮ್ ಹೆಸರು&#39; {1} ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ದಯವಿಟ್ಟು ಈ ನಮೂದುಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ಐಟಂ {0} ವಿರುದ್ಧದ ವ್ಯವಹಾರ ಇವೆ, ನೀವು ಮೌಲ್ಯವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ {1}"
 DocType: UOM,Must be Whole Number,ಹೋಲ್ ಸಂಖ್ಯೆ ಇರಬೇಕು
 DocType: Leave Control Panel,New Leaves Allocated (In Days),( ದಿನಗಳಲ್ಲಿ) ನಿಗದಿ ಹೊಸ ಎಲೆಗಳು
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,ಯಾವುದೇ ಸೀರಿಯಲ್ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ
@@ -2879,7 +2882,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ಈ ಮಾರಾಟದ ಆರ್ಡರ್ ವಿರುದ್ಧ ಕೊಕ್ಕಿನ ವಸ್ತುಗಳ %
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ಅವಧಿಯ ಮುಕ್ತಾಯ ಎಂಟ್ರಿ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಗುಂಪು ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},ಪ್ರಮಾಣ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},ಪ್ರಮಾಣ {0} {1} {2} {3}
 DocType: Account,Depreciation,ಸವಕಳಿ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ಪೂರೈಕೆದಾರ (ರು)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ನೌಕರರ ಅಟೆಂಡೆನ್ಸ್ ಉಪಕರಣ
@@ -2903,7 +2906,7 @@
 DocType: Supplier,Last Day of the Next Month,ಮುಂದಿನ ತಿಂಗಳ ಕೊನೆಯ ದಿನ
 DocType: Support Settings,Auto close Issue after 7 days,7 ದಿನಗಳ ನಂತರ ಆಟೋ ನಿಕಟ ಸಂಚಿಕೆ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ಮೊದಲು ಹಂಚಿಕೆ ಸಾಧ್ಯವಿಲ್ಲ ಬಿಡಿ {0}, ರಜೆ ಸಮತೋಲನ ಈಗಾಗಲೇ ಕ್ಯಾರಿ ಫಾರ್ವರ್ಡ್ ಭವಿಷ್ಯದ ರಜೆ ಹಂಚಿಕೆ ದಾಖಲೆಯಲ್ಲಿ ಬಂದಿದೆ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ಗಮನಿಸಿ: ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ {0} ದಿನ ಅವಕಾಶ ಗ್ರಾಹಕ ಕ್ರೆಡಿಟ್ ದಿನಗಳ ಮೀರಿದೆ (ರು)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರ
 DocType: Asset Category Account,Accumulated Depreciation Account,ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ಖಾತೆ
 DocType: Stock Settings,Freeze Stock Entries,ಫ್ರೀಜ್ ಸ್ಟಾಕ್ ನಮೂದುಗಳು
@@ -2914,7 +2917,7 @@
 ,Stock Analytics,ಸ್ಟಾಕ್ ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ಕಾರ್ಯಾಚರಣೆ ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ಡಾಕ್ಯುಮೆಂಟ್ ವಿವರ ವಿರುದ್ಧ ನಂ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,ಪಕ್ಷದ ಕೌಟುಂಬಿಕತೆ ಕಡ್ಡಾಯ
 DocType: Quality Inspection,Outgoing,ನಿರ್ಗಮಿಸುವ
 DocType: Material Request,Requested For,ಮನವಿ
 DocType: Quotation Item,Against Doctype,DOCTYPE ವಿರುದ್ಧ
@@ -2931,11 +2934,11 @@
 DocType: Asset,Item Code,ಐಟಂ ಕೋಡ್
 DocType: Production Planning Tool,Create Production Orders,ಪ್ರೊಡಕ್ಷನ್ ಆದೇಶಗಳನ್ನು ರಚಿಸಲು
 DocType: Serial No,Warranty / AMC Details,ಖಾತರಿ / ಎಎಮ್ಸಿ ವಿವರಗಳು
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ಚಟುವಟಿಕೆ ಆಧಾರಿತ ಗ್ರೂಪ್ ಕೈಯಾರೆ ವಿದ್ಯಾರ್ಥಿಗಳು ಆಯ್ಕೆ
 DocType: Journal Entry,User Remark,ಬಳಕೆದಾರ ಟೀಕಿಸು
 DocType: Lead,Market Segment,ಮಾರುಕಟ್ಟೆ ವಿಭಾಗ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ಪಾವತಿಸಿದ ಮೊತ್ತ ಒಟ್ಟು ಋಣಾತ್ಮಕ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚಿನ ಸಾಧ್ಯವಿಲ್ಲ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ಆಂತರಿಕ ಕೆಲಸದ ಇತಿಹಾಸ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ಮುಚ್ಚುವ (ಡಾ)
 DocType: Cheque Print Template,Cheque Size,ಚೆಕ್ ಗಾತ್ರ
@@ -2951,7 +2954,7 @@
 DocType: Production Planning Tool,Create Material Requests,CreateMaterial ವಿನಂತಿಗಳು
 DocType: Employee Education,School/University,ಸ್ಕೂಲ್ / ವಿಶ್ವವಿದ್ಯಾಲಯ
 DocType: Payment Request,Reference Details,ರೆಫರೆನ್ಸ್ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ಉಪಯುಕ್ತ ಲೈಫ್ ನಂತರ ನಿರೀಕ್ಷಿತ ಮೌಲ್ಯದ ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡಿಮೆ ಇರಬೇಕು
 DocType: Sales Invoice Item,Available Qty at Warehouse,ವೇರ್ಹೌಸ್ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ಖ್ಯಾತವಾದ ಪ್ರಮಾಣ
 DocType: Asset,Double Declining Balance,ಡಬಲ್ ಕ್ಷೀಣಿಸಿದ ಬ್ಯಾಲೆನ್ಸ್
@@ -2972,20 +2975,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ಈ ಸ್ಟಾಕ್ ಸಾಮರಸ್ಯ ಒಂದು ಆರಂಭಿಕ ಎಂಟ್ರಿ ಏಕೆಂದರೆ ವ್ಯತ್ಯಾಸ ಖಾತೆ, ಒಂದು ಆಸ್ತಿ / ಹೊಣೆಗಾರಿಕೆ ರೀತಿಯ ಖಾತೆ ಇರಬೇಕು"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ಪಾವತಿಸಲಾಗುತ್ತದೆ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ಪರ್ಚೇಸ್ ಆರ್ಡರ್ ಸಂಖ್ಯೆ ಐಟಂ ಅಗತ್ಯವಿದೆ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ರಚಿಸಿಲ್ಲ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"ಇಂದ ದಿನಾಂಕ, ಗೆ ದಿನಾಂಕದ ಆಮೇಲೆ ಬರಬೇಕು"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ಅಲ್ಲ ವಿದ್ಯಾರ್ಥಿಯಾಗಿ ಸ್ಥಿತಿಯನ್ನು ಬದಲಾಯಿಸಬಹುದು {0} ವಿದ್ಯಾರ್ಥಿ ಅಪ್ಲಿಕೇಶನ್ ಸಂಬಂಧ ಇದೆ {1}
 DocType: Asset,Fully Depreciated,ಸಂಪೂರ್ಣವಾಗಿ Depreciated
 ,Stock Projected Qty,ಸ್ಟಾಕ್ ಪ್ರಮಾಣ ಯೋಜಿತ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ಗ್ರಾಹಕ {0} ಅಭಿವ್ಯಕ್ತಗೊಳಿಸಲು ಸೇರಿಲ್ಲ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ಗುರುತು ಅಟೆಂಡೆನ್ಸ್ ಎಚ್ಟಿಎಮ್ಎಲ್
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ಉಲ್ಲೇಖಗಳು ಪ್ರಸ್ತಾಪಗಳನ್ನು, ನಿಮ್ಮ ಗ್ರಾಹಕರಿಗೆ ಕಳುಹಿಸಿದ್ದಾರೆ ಬಿಡ್ ಇವೆ"
 DocType: Sales Order,Customer's Purchase Order,ಗ್ರಾಹಕರ ಆರ್ಡರ್ ಖರೀದಿಸಿ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ಸೀರಿಯಲ್ ಯಾವುದೇ ಮತ್ತು ಬ್ಯಾಚ್
 DocType: Warranty Claim,From Company,ಕಂಪನಿ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಅಂಕಗಳು ಮೊತ್ತ {0} ಎಂದು ಅಗತ್ಯವಿದೆ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ದಯವಿಟ್ಟು ಸೆಟ್ Depreciations ಸಂಖ್ಯೆ ಬುಕ್ಡ್
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ಮೌಲ್ಯ ಅಥವಾ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ಪ್ರೊಡಕ್ಷನ್ಸ್ ಆರ್ಡರ್ಸ್ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ಮಿನಿಟ್
 DocType: Purchase Invoice,Purchase Taxes and Charges,ಖರೀದಿ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು
@@ -2998,7 +3001,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,ಎಲ್ಲಾ ಗೋದಾಮುಗಳು
 DocType: Sales Partner,Retailer,ಚಿಲ್ಲರೆ ವ್ಯಾಪಾರಿ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಕ್ರೆಡಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ಎಲ್ಲಾ ವಿಧಗಳು ಸರಬರಾಜುದಾರ
 DocType: Global Defaults,Disable In Words,ವರ್ಡ್ಸ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,ಐಟಂ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸಂಖ್ಯೆಯ ಕಾರಣ ಐಟಂ ಕೋಡ್ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},ನುಡಿಮುತ್ತುಗಳು {0} ಅಲ್ಲ ರೀತಿಯ {1}
@@ -3007,6 +3010,7 @@
 DocType: Production Order,PRO-,ಪರ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ಬ್ಯಾಂಕಿನ ಓವರ್ಡ್ರಾಫ್ಟ್ ಖಾತೆ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ಸಂಬಳ ಸ್ಲಿಪ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ರೋ # {0}: ನಿಗದಿ ಪ್ರಮಾಣ ಬಾಕಿ ಮೊತ್ತದ ಹೆಚ್ಚು ಹೆಚ್ಚಿರಬಾರದು.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ಬ್ರೌಸ್ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,ಸುರಕ್ಷಿತ ಸಾಲ
 DocType: Purchase Invoice,Edit Posting Date and Time,ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಮತ್ತು ಸಮಯವನ್ನು ಸಂಪಾದಿಸಿ
@@ -3046,7 +3050,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ಹೆಚ್ಚು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಹಳೆಯ ನವೀಕರಿಸಲು ಅವಕಾಶ {0}
 DocType: Purchase Invoice Item,PR Detail,ತರಬೇತಿ ವಿವರ
 DocType: Sales Order,Fully Billed,ಸಂಪೂರ್ಣವಾಗಿ ಖ್ಯಾತವಾದ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ದಯವಿಟ್ಟು ಉದ್ಯೋಗಿ ಡೀಫಾಲ್ಟ್ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 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 +127,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),ಪ್ಯಾಕೇಜ್ ಒಟ್ಟಾರೆ ತೂಕದ . ಸಾಮಾನ್ಯವಾಗಿ ನಿವ್ವಳ ತೂಕ + ಪ್ಯಾಕೇಜಿಂಗ್ ವಸ್ತುಗಳ ತೂಕ . ( ಮುದ್ರಣ )
@@ -3057,7 +3060,7 @@
 DocType: Student Group,Group Based On,ಗುಂಪು ಆಧಾರಿತ ರಂದು
 DocType: Journal Entry,Bill Date,ಬಿಲ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ಸೇವೆ ಐಟಂ, ಕೌಟುಂಬಿಕತೆ, ಆವರ್ತನ ಮತ್ತು ಖರ್ಚಿನ ಪ್ರಮಾಣವನ್ನು ಅಗತ್ಯವಿದೆ"
-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:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ಹೆಚ್ಚಿನ ಆದ್ಯತೆ ಬಹು ಬೆಲೆ ನಿಯಮಗಳು ಇವೆ ಸಹ, ನಂತರ ಕೆಳಗಿನ ಆಂತರಿಕ ಆದ್ಯತೆಗಳು ಅನ್ವಯಿಸಲಾಗಿದೆ:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},ನೀವು ನಿಜವಾಗಿಯೂ {0} ಎಲ್ಲಾ ಸಂಬಳ ಸ್ಲಿಪ್ ಸಲ್ಲಿಸಿ ಬಯಸುತ್ತೀರಾ {1}
 DocType: Cheque Print Template,Cheque Height,ಚೆಕ್ ಎತ್ತರ
 DocType: Supplier,Supplier Details,ಪೂರೈಕೆದಾರರ ವಿವರಗಳು
@@ -3069,7 +3072,7 @@
 DocType: Vehicle Log,Invoice Ref,ಸರಕುಪಟ್ಟಿ ಉಲ್ಲೇಖ
 DocType: Purchase Order,Recurring Order,ಮರುಕಳಿಸುವ ಆರ್ಡರ್
 DocType: Company,Default Income Account,ಡೀಫಾಲ್ಟ್ ಆದಾಯ ಖಾತೆ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ಗ್ರಾಹಕ ಗುಂಪಿನ / ಗ್ರಾಹಕ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ಮುಚ್ಚದ ಆರ್ಥಿಕ ವರ್ಷ ಲಾಭ / ನಷ್ಟ (ಕ್ರೆಡಿಟ್)
 DocType: Sales Invoice,Time Sheets,ಟೈಮ್ ಶೀಟ್ಸ್
 DocType: Payment Gateway Account,Default Payment Request Message,ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ವಿನಂತಿ ಸಂದೇಶ
@@ -3089,10 +3092,10 @@
 DocType: Notification Control,Quotation Message,ನುಡಿಮುತ್ತುಗಳು ಸಂದೇಶ
 DocType: Employee Loan,Employee Loan Application,ನೌಕರರ ಸಾಲ ಅಪ್ಲಿಕೇಶನ್
 DocType: Issue,Opening Date,ದಿನಾಂಕ ತೆರೆಯುವ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,ಅಟೆಂಡೆನ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಗುರುತಿಸಲಾಗಿದೆ.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,ಅಟೆಂಡೆನ್ಸ್ ಯಶಸ್ವಿಯಾಗಿ ಗುರುತಿಸಲಾಗಿದೆ.
 DocType: Journal Entry,Remark,ಟೀಕಿಸು
 DocType: Purchase Receipt Item,Rate and Amount,ದರ ಮತ್ತು ಪ್ರಮಾಣ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ಖಾತೆ ಕೌಟುಂಬಿಕತೆ {0} ಇರಬೇಕು {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ಖಾತೆ ಕೌಟುಂಬಿಕತೆ {0} ಇರಬೇಕು {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ಎಲೆಗಳು ಮತ್ತು ಹಾಲಿಡೇ
 DocType: School Settings,Current Academic Term,ಪ್ರಸ್ತುತ ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
 DocType: School Settings,Current Academic Term,ಪ್ರಸ್ತುತ ಶೈಕ್ಷಣಿಕ ಟರ್ಮ್
@@ -3115,7 +3118,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ವಿದ್ಯಾರ್ಥಿ ಗುಂಪು
 DocType: Shopping Cart Settings,Quotation Series,ಉದ್ಧರಣ ಸರಣಿ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ಐಟಂ ( {0} ) , ಐಟಂ ಗುಂಪು ಹೆಸರನ್ನು ಬದಲಾಯಿಸಲು ಅಥವಾ ಐಟಂ ಹೆಸರನ್ನು ದಯವಿಟ್ಟು ಅದೇ ಹೆಸರಿನಲ್ಲಿ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,ದಯವಿಟ್ಟು ಗ್ರಾಹಕರ ಆಯ್ಕೆ
 DocType: C-Form,I,ನಾನು
 DocType: Company,Asset Depreciation Cost Center,ಆಸ್ತಿ ಸವಕಳಿ ವೆಚ್ಚದ ಕೇಂದ್ರ
 DocType: Sales Order Item,Sales Order Date,ಮಾರಾಟದ ಆದೇಶ ದಿನಾಂಕ
@@ -3134,20 +3137,20 @@
 DocType: Vehicle,Insurance Details,ವಿಮೆ ವಿವರಗಳು
 DocType: Account,Payable,ಕೊಡಬೇಕಾದ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ದಯವಿಟ್ಟು ಮರುಪಾವತಿಯ ಅವಧಿಗಳು ನಮೂದಿಸಿ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ಸಾಲಗಾರರು ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ಸಾಲಗಾರರು ({0})
 DocType: Pricing Rule,Margin,ಕರೆ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ಹೊಸ ಗ್ರಾಹಕರು
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ನಿವ್ವಳ ಲಾಭ%
 DocType: Appraisal Goal,Weightage (%),Weightage ( % )
 DocType: Bank Reconciliation Detail,Clearance Date,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ಒಟ್ಟು ಖರೀದಿಯ ಮೊತ್ತ ಕಡ್ಡಾಯ
 DocType: Lead,Address Desc,DESC ವಿಳಾಸ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ಪಕ್ಷದ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,ಪಕ್ಷದ ಕಡ್ಡಾಯ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ವಿಷಯ ಹೆಸರು
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,ಮಾರಾಟ ಅಥವಾ ಖರೀದಿ ಆಫ್ ಕನಿಷ್ಠ ಒಂದು ಆಯ್ಕೆ ಮಾಡಬೇಕು
-DocType: Grading Structure,Grade Intervals,ಗ್ರೇಡ್ ಮಧ್ಯಂತರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ನಿಮ್ಮ ವ್ಯಾಪಾರ ಸ್ವರೂಪ ಆಯ್ಕೆಮಾಡಿ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},ರೋ # {0}: ನಕಲು ಉಲ್ಲೇಖಗಳು ಪ್ರವೇಶ {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ಉತ್ಪಾದನಾ ಕಾರ್ಯಗಳ ಅಲ್ಲಿ ನಿರ್ವಹಿಸುತ್ತಾರೆ.
 DocType: Asset Movement,Source Warehouse,ಮೂಲ ವೇರ್ಹೌಸ್
 DocType: Installation Note,Installation Date,ಅನುಸ್ಥಾಪನ ದಿನಾಂಕ
@@ -3184,7 +3187,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ಮುದ್ರಣ ಟೆಂಪ್ಲೆಟ್ಗಳನ್ನು letterheads .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ಮುದ್ರಣ ಶೀರ್ಷಿಕೆ ಇ ಜಿ ಟೆಂಪ್ಲೇಟ್ಗಳು Proforma ಸರಕುಪಟ್ಟಿ .
 DocType: Student Guardian,Student Guardian,ವಿದ್ಯಾರ್ಥಿ ಗಾರ್ಡಿಯನ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,ಮೌಲ್ಯಾಂಕನ ರೀತಿಯ ಆರೋಪಗಳನ್ನು ಇನ್ಕ್ಲೂಸಿವ್ ಎಂದು ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 ತಪ್ಪು ( ಒಟ್ಟು ) ನೆಟ್ ತೂಕ ಮೌಲ್ಯವನ್ನು ಕಾರಣವಾಗುತ್ತದೆ . ಪ್ರತಿ ಐಟಂ ಮಾಡಿ surethat ನೆಟ್ ತೂಕ ಅದೇ UOM ಹೊಂದಿದೆ .
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,ಬಿಒಎಮ್ ದರ
@@ -3212,7 +3215,7 @@
 DocType: Company,Exchange Gain / Loss Account,ವಿನಿಮಯ ಗಳಿಕೆ / ನಷ್ಟ ಖಾತೆ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ನೌಕರರ ಮತ್ತು ಅಟೆಂಡೆನ್ಸ್
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ಉದ್ದೇಶ ಒಂದು ಇರಬೇಕು {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ರೂಪ ಭರ್ತಿ ಮಾಡಿ ಮತ್ತು ಅದನ್ನು ಉಳಿಸಲು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,ಸಮುದಾಯ ವೇದಿಕೆ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,ಸ್ಟಾಕ್ ವಾಸ್ತವಿಕ ಪ್ರಮಾಣ
@@ -3228,7 +3231,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ಪ್ರಸ್ತುತ ಉದ್ಯೋಗ ಅವಕಾಶಗಳನ್ನು
 DocType: Company,Stock Adjustment Account,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ ಖಾತೆ
-DocType: Journal Entry,Write Off,ಆಫ್ ಬರೆಯಿರಿ
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ಆಫ್ ಬರೆಯಿರಿ
 DocType: Timesheet Detail,Operation ID,ಆಪರೇಷನ್ ಐಡಿ
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ವ್ಯವಸ್ಥೆ ಬಳಕೆದಾರರು ( ಲಾಗಿನ್ ) id. ಹೊಂದಿಸಿದಲ್ಲಿ , ಎಲ್ಲಾ ಮಾನವ ಸಂಪನ್ಮೂಲ ರೂಪಗಳು ಡೀಫಾಲ್ಟ್ ಪರಿಣಮಿಸುತ್ತದೆ ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ಗೆ {1}
@@ -3239,27 +3242,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ಸರಬರಾಜುದಾರ ಗ್ರಾಹಕ ನೀಡುತ್ತದೆ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ಫಾರ್ಮ್ / ಐಟಂ / {0}) ಷೇರುಗಳ ಔಟ್
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ಮುಂದಿನ ದಿನಾಂಕ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಹೆಚ್ಚು ಇರಬೇಕು
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,ಶೋ ತೆರಿಗೆ ಮುರಿದುಕೊಂಡು
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ಕಾರಣ / ಉಲ್ಲೇಖ ದಿನಾಂಕ ನಂತರ ಇರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ಡೇಟಾ ಆಮದು ಮತ್ತು ರಫ್ತು
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ಸ್ಟಾಕ್ ನಮೂದುಗಳನ್ನು, ವೇರ್ಹೌಸ್ {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿವೆ ಆದ್ದರಿಂದ ನೀವು ಮರು ನಿಯೋಜಿಸಲು ಅಥವಾ ಮಾರ್ಪಡಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳು ಕಂಡುಬಂದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ಸರಕುಪಟ್ಟಿ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,ಮಾರಾಟ
 DocType: Sales Invoice,Rounded Total,ದುಂಡಾದ ಒಟ್ಟು
 DocType: Product Bundle,List items that form the package.,ಪಟ್ಟಿ ಐಟಂಗಳನ್ನು ಪ್ಯಾಕೇಜ್ ರೂಪಿಸಲು ಮಾಡಿದರು .
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ಶೇಕಡಾವಾರು ಅಲೋಕೇಶನ್ 100% ಸಮನಾಗಿರುತ್ತದೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,ದಯವಿಟ್ಟು ಪಕ್ಷದ ಆರಿಸುವ ಮೊದಲು ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆ
 DocType: Program Enrollment,School House,ಸ್ಕೂಲ್ ಹೌಸ್
 DocType: Serial No,Out of AMC,ಎಎಂಸಿ ಔಟ್
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ದಯವಿಟ್ಟು ಉಲ್ಲೇಖಗಳು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ಬುಕ್ಡ್ Depreciations ಸಂಖ್ಯೆ ಒಟ್ಟು ಸಂಖ್ಯೆ Depreciations ಕ್ಕೂ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ನಿರ್ವಹಣೆ ಭೇಟಿ ಮಾಡಿ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ಮಾರಾಟದ ಮಾಸ್ಟರ್ ಮ್ಯಾನೇಜರ್ {0} ಪಾತ್ರದಲ್ಲಿ ಹೊಂದಿರುವ ಬಳಕೆದಾರರಿಗೆ ಸಂಪರ್ಕಿಸಿ
 DocType: Company,Default Cash Account,ಡೀಫಾಲ್ಟ್ ನಗದು ಖಾತೆ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ಕಂಪನಿ ( ಗ್ರಾಹಕ ಅಥವಾ ಸರಬರಾಜುದಾರ ) ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ಈ ವಿದ್ಯಾರ್ಥಿ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿಗಳ ರಲ್ಲಿ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ಹೆಚ್ಚಿನ ಐಟಂಗಳನ್ನು ಅಥವಾ ಮುಕ್ತ ಪೂರ್ಣ ರೂಪ ಸೇರಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' ನಿರೀಕ್ಷಿತ ಡೆಲಿವರಿ ದಿನಾಂಕ ' ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ಡೆಲಿವರಿ ಟಿಪ್ಪಣಿಗಳು {0} ಈ ಮಾರಾಟದ ಆದೇಶವನ್ನು ರದ್ದುಗೊಳಿಸುವ ಮೊದಲು ರದ್ದು ಮಾಡಬೇಕು
@@ -3291,6 +3295,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ಐಟಂ 3
 DocType: Purchase Order,Customer Contact Email,ಗ್ರಾಹಕ ಸಂಪರ್ಕ ಇಮೇಲ್
 DocType: Warranty Claim,Item and Warranty Details,ಐಟಂ ಮತ್ತು ಖಾತರಿ ವಿವರಗಳು
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ಐಟಂ ಕೋಡ್&gt; ಐಟಂ ಗ್ರೂಪ್&gt; ಬ್ರ್ಯಾಂಡ್
 DocType: Sales Team,Contribution (%),ಕೊಡುಗೆ ( % )
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ಗಮನಿಸಿ : ಪಾವತಿ ಎಂಟ್ರಿ 'ನಗದು ಅಥವಾ ಬ್ಯಾಂಕ್ ಖಾತೆ ' ಏನು ನಿರ್ದಿಷ್ಟಪಡಿಸಿಲ್ಲ ರಿಂದ ರಚಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,ಕಡ್ಡಾಯ ಶಿಕ್ಷಣ ಪಡೆದುಕೊಳ್ಳಲು ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಆಯ್ಕೆಮಾಡಿ.
@@ -3306,9 +3311,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ಸಮನ್ವಯ ಮೊದಲು
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ಗೆ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ಸೇರಿಸಲಾಗಿದೆ ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ಐಟಂ ತೆರಿಗೆ ರೋ {0} ಬಗೆಯ ತೆರಿಗೆ ಅಥವಾ ಆದಾಯ ಅಥವಾ ಖರ್ಚು ಅಥವಾ ಶುಲ್ಕಕ್ಕೆ ಖಾತೆಯನ್ನು ಹೊಂದಿರಬೇಕು
 DocType: Sales Order,Partly Billed,ಹೆಚ್ಚಾಗಿ ಖ್ಯಾತವಾದ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ಐಟಂ {0} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ಐಟಂ {0} ಸ್ಥಿರ ಆಸ್ತಿ ಐಟಂ ಇರಬೇಕು
 DocType: Item,Default BOM,ಡೀಫಾಲ್ಟ್ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ಮರು ಮಾದರಿ ಕಂಪನಿ ಹೆಸರು ದೃಢೀಕರಿಸಿ ದಯವಿಟ್ಟು
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ಒಟ್ಟು ಅತ್ಯುತ್ತಮ ಆಮ್ಟ್
@@ -3318,8 +3323,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ಆಟೋಮೋಟಿವ್
 DocType: Vehicle,Insurance Company,ವಿಮಾ ಕಂಪನಿ
 DocType: Asset Category Account,Fixed Asset Account,ಸ್ಥಿರ ಆಸ್ತಿ ಖಾತೆಯನ್ನು
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ವೇರಿಯಬಲ್
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ವೇರಿಯಬಲ್
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ಡೆಲಿವರಿ ಗಮನಿಸಿ
 DocType: Student,Student Email Address,ವಿದ್ಯಾರ್ಥಿ ಇಮೇಲ್ ವಿಳಾಸ
 DocType: Timesheet Detail,From Time,ಸಮಯದಿಂದ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ಉಪಲಬ್ದವಿದೆ:
@@ -3331,12 +3336,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ಬೆಲೆ ಪಟ್ಟಿ ವಿನಿಮಯ ದರ
 DocType: Purchase Invoice Item,Rate,ದರ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ಆಂತರಿಕ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ವಿಳಾಸ ಹೆಸರು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ವಿಳಾಸ ಹೆಸರು
 DocType: Stock Entry,From BOM,BOM ಗೆ
 DocType: Assessment Code,Assessment Code,ಅಸೆಸ್ಮೆಂಟ್ ಕೋಡ್
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ಮೂಲಭೂತ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ಮೊದಲು ಸ್ಟಾಕ್ ವ್ಯವಹಾರ ಘನೀಭವಿಸಿದ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',ವೇಳಾಪಟ್ಟಿ ' ' ರಚಿಸಿ 'ಅನ್ನು ಕ್ಲಿಕ್ ಮಾಡಿ
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ಇ ಜಿ ಕೆಜಿ, ಘಟಕ , ಸೂಲ , ಮೀ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ನೀವು ರೆಫರೆನ್ಸ್ ದಿನಾಂಕ ನಮೂದಿಸಿದರೆ ರೆಫರೆನ್ಸ್ ನಂ ಕಡ್ಡಾಯ
 DocType: Bank Reconciliation Detail,Payment Document,ಪಾವತಿ ಡಾಕ್ಯುಮೆಂಟ್
@@ -3344,19 +3349,19 @@
 DocType: Salary Slip,Salary Structure,ಸಂಬಳ ರಚನೆ
 DocType: Account,Bank,ಬ್ಯಾಂಕ್
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ಏರ್ಲೈನ್
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ಸಂಚಿಕೆ ಮೆಟೀರಿಯಲ್
 DocType: Material Request Item,For Warehouse,ಗೋದಾಮಿನ
 DocType: Employee,Offer Date,ಆಫರ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ಉಲ್ಲೇಖಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,ಆಫ್ಲೈನ್ ಕ್ರಮದಲ್ಲಿ ಇವೆ. ನೀವು ಜಾಲಬಂಧ ತನಕ ರಿಲೋಡ್ ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ಯಾವುದೇ ವಿದ್ಯಾರ್ಥಿ ಗುಂಪುಗಳು ದಾಖಲಿಸಿದವರು.
 DocType: Purchase Invoice Item,Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ಮಾಸಿಕ ಮರುಪಾವತಿಯ ಪ್ರಮಾಣ ಸಾಲದ ಪ್ರಮಾಣ ಅಧಿಕವಾಗಿರುತ್ತದೆ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,ಮೊದಲ Maintaince ವಿವರಗಳು ನಮೂದಿಸಿ
 DocType: Purchase Invoice,Print Language,ಮುದ್ರಣ ಭಾಷಾ
 DocType: Salary Slip,Total Working Hours,ಒಟ್ಟು ವರ್ಕಿಂಗ್ ಅವರ್ಸ್
 DocType: Stock Entry,Including items for sub assemblies,ಉಪ ಅಸೆಂಬ್ಲಿಗಳಿಗೆ ಐಟಂಗಳನ್ನು ಸೇರಿದಂತೆ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,ನಮೂದಿಸಿ ಮೌಲ್ಯವನ್ನು ಧನಾತ್ಮಕವಾಗಿರಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ಎಲ್ಲಾ ಪ್ರಾಂತ್ಯಗಳು
 DocType: Purchase Invoice,Items,ಐಟಂಗಳನ್ನು
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ವಿದ್ಯಾರ್ಥಿ ಈಗಾಗಲೇ ದಾಖಲಿಸಲಾಗಿದೆ.
@@ -3376,17 +3381,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ಭಿನ್ನ ಚಟುವಟಿಕೆ ಡೀಫಾಲ್ಟ್ ಘಟಕ &#39;{0}&#39; ಟೆಂಪ್ಲೇಟು ಅದೇ ಇರಬೇಕು &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ಆಧರಿಸಿದ ಲೆಕ್ಕ
 DocType: Delivery Note Item,From Warehouse,ಗೋದಾಮಿನ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ ಯಾವುದೇ ವಸ್ತುಗಳು ತಯಾರಿಸಲು
 DocType: Assessment Plan,Supervisor Name,ಮೇಲ್ವಿಚಾರಕ ಹೆಸರು
 DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
 DocType: Program Enrollment Course,Program Enrollment Course,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ದಾಖಲಾತಿ ಕೋರ್ಸ್
-DocType: Grading Structure,Grading Structure,ಗ್ರೇಡಿಂಗ್ ರಚನೆ
 DocType: Purchase Taxes and Charges,Valuation and Total,ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು
 DocType: Tax Rule,Shipping City,ಶಿಪ್ಪಿಂಗ್ ನಗರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಭೇದ. 'ಯಾವುದೇ ನಕಲಿಸಿ' ಸೆಟ್ ಹೊರತು ಲಕ್ಷಣಗಳು ಟೆಂಪ್ಲೇಟ್ ನಕಲು ಮಾಡಲಾಗುತ್ತದೆ
 DocType: Notification Control,Customize the Notification,ಅಧಿಸೂಚನೆ ಕಸ್ಟಮೈಸ್
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ಕಾರ್ಯಾಚರಣೆ ಕ್ಯಾಶ್ ಫ್ಲೋ
 DocType: Sales Invoice,Shipping Rule,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್
@@ -3407,8 +3410,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},ಯಾವುದೇ ಡೀಫಾಲ್ಟ್ BOM ಐಟಂ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,ಮೊದಲ ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ದಿನಾಂಕ ತೆರೆಯುವ ದಿನಾಂಕ ಮುಚ್ಚುವ ಮೊದಲು ಇರಬೇಕು
 DocType: Leave Control Panel,Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ವ್ಯವಹಾರಗಳು ವೆಚ್ಚ ಸೆಂಟರ್ ಲೆಡ್ಜರ್ ಪರಿವರ್ತನೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Department,Days for which Holidays are blocked for this department.,ಯಾವ ರಜಾದಿನಗಳಲ್ಲಿ ಡೇಸ್ ಈ ಇಲಾಖೆಗೆ ನಿರ್ಬಂಧಿಸಲಾಗುತ್ತದೆ.
@@ -3421,7 +3424,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ತಲೆಬರಹ ಲಗತ್ತಿಸಿ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ಕೊನೆಯ ಸಂವಹನ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ಕೊನೆಯ ಸಂವಹನ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ವರ್ಗದಲ್ಲಿ ' ಮೌಲ್ಯಾಂಕನ ' ಅಥವಾ ' ಮೌಲ್ಯಾಂಕನ ಮತ್ತು ಒಟ್ಟು ' ಫಾರ್ ಯಾವಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ಇನ್ವಾಯ್ಸ್ಗಳು ಜೊತೆ ಪಾವತಿಗಳು ಹೊಂದಿಕೆ
@@ -3437,7 +3440,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ಒಟ್ಟು (ಆಮ್ಟ್)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ಮನರಂಜನೆ ಮತ್ತು ವಿರಾಮ
 DocType: Quality Inspection,Item Serial No,ಐಟಂ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ನೌಕರರ ದಾಖಲೆಗಳು ರಚಿಸಿ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ಒಟ್ಟು ಪ್ರೆಸೆಂಟ್
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,ಲೆಕ್ಕಪರಿಶೋಧಕ ಹೇಳಿಕೆಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ಗಂಟೆ
@@ -3450,10 +3453,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,ಅಜ್ಞಾತ
 DocType: Shipping Rule,Shipping Rule Conditions,ಶಿಪ್ಪಿಂಗ್ ರೂಲ್ ನಿಯಮಗಳು
 DocType: BOM Replace Tool,The new BOM after replacement,ಬದಲಿ ನಂತರ ಹೊಸ BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,ಪಾಯಿಂಟ್ ಆಫ್ ಸೇಲ್
 DocType: Payment Entry,Received Amount,ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ದಯವಿಟ್ಟು ಸೆಟಪ್ ನೌಕರರ ಮಾನವ ಸಂಪನ್ಮೂಲ ವ್ಯವಸ್ಥೆ ಹೆಸರಿಸುವ&gt; ಮಾನವ ಸಂಪನ್ಮೂಲ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ಆದೇಶದ ಈಗಾಗಲೇ ಪ್ರಮಾಣ ಕಡೆಗಣಿಸಿ, ಪೂರ್ಣ ಪ್ರಮಾಣದ ರಚಿಸಿ"
 DocType: Account,Tax,ತೆರಿಗೆ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ಗುರುತು ಮಾಡದಿರುವ
@@ -3466,9 +3467,9 @@
 DocType: Batch,Source Document Name,ಮೂಲ ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರು
 DocType: Batch,Source Document Name,ಮೂಲ ಡಾಕ್ಯುಮೆಂಟ್ ಹೆಸರು
 DocType: Job Opening,Job Title,ಕೆಲಸದ ಶೀರ್ಷಿಕೆ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ಬಳಕೆದಾರರು ರಚಿಸಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ಗ್ರಾಮ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ತಯಾರಿಸಲು ಪ್ರಮಾಣ 0 ಹೆಚ್ಚು ಇರಬೇಕು.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ನಿರ್ವಹಣೆ ಕಾಲ್ ವರದಿ ಭೇಟಿ .
 DocType: Stock Entry,Update Rate and Availability,ಅಪ್ಡೇಟ್ ದರ ಮತ್ತು ಲಭ್ಯತೆ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ನೀವು ಪ್ರಮಾಣ ವಿರುದ್ಧ ಹೆಚ್ಚು ಸ್ವೀಕರಿಸಲು ಅಥವಾ ತಲುಪಿಸಲು ಅವಕಾಶ ಶೇಕಡಾವಾರು ಆದೇಶ . ಉದಾಹರಣೆಗೆ : ನೀವು 100 ಘಟಕಗಳು ಆದೇಶ ಇದ್ದರೆ . ನಿಮ್ಮ ಸೇವನೆ ನೀವು 110 ಘಟಕಗಳು ಸ್ವೀಕರಿಸಲು 10% ಅವಕಾಶವಿರುತ್ತದೆ ಇದೆ .
@@ -3478,28 +3479,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ಐಟಂ ಕಡ್ಡಾಯ {0}
 DocType: BOM,Website Description,ವೆಬ್ಸೈಟ್ ವಿವರಣೆ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ಇಕ್ವಿಟಿ ನಿವ್ವಳ ವ್ಯತ್ಯಾಸದ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ಖರೀದಿ ಸರಕುಪಟ್ಟಿ {0} ರದ್ದು ಮೊದಲು
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ಇಮೇಲ್ ವಿಳಾಸ, ಅನನ್ಯ ಇರಬೇಕು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {0}"
 DocType: Serial No,AMC Expiry Date,ಎಎಂಸಿ ಅಂತ್ಯ ದಿನಾಂಕ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ರಸೀತಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ರಸೀತಿ
 ,Sales Register,ಮಾರಾಟದ ರಿಜಿಸ್ಟರ್
 DocType: Daily Work Summary Settings Company,Send Emails At,ನಲ್ಲಿ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
 DocType: Quotation,Quotation Lost Reason,ನುಡಿಮುತ್ತುಗಳು ಲಾಸ್ಟ್ ಕಾರಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,ನಿಮ್ಮನ್ನು ಆಯ್ಕೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ವ್ಯವಹಾರ ಉಲ್ಲೇಖ ಯಾವುದೇ {0} ರ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ಸಂಪಾದಿಸಲು ಏನೂ ಇಲ್ಲ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ಈ ತಿಂಗಳ ಬಾಕಿ ಚಟುವಟಿಕೆಗಳಿಗೆ ಸಾರಾಂಶ
 DocType: Customer Group,Customer Group Name,ಗ್ರಾಹಕ ಗುಂಪಿನ ಹೆಸರು
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ಇನ್ನೂ ಯಾವುದೇ ಗ್ರಾಹಕರು!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ಕ್ಯಾಶ್ ಫ್ಲೋ ಹೇಳಿಕೆ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ಸಾಲದ ಪ್ರಮಾಣ ಗರಿಷ್ಠ ಸಾಲದ ಪ್ರಮಾಣ ಮೀರುವಂತಿಲ್ಲ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ಪರವಾನಗಿ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ಸಿ ಫಾರ್ಮ್ ಈ ಸರಕುಪಟ್ಟಿ {0} ತೆಗೆದುಹಾಕಿ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,ಖಾತೆ ಆಫ್ ಬರೆಯಿರಿ ನಮೂದಿಸಿ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ಕೊನೆಯ ಆದೇಶ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ಖಾತೆ {0} ಮಾಡುತ್ತದೆ ಕಂಪನಿ ಸೇರಿದೆ ಅಲ್ಲ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,ಸಾಲು {0} ಸರಣಿ ಸಂಖ್ಯೆಗಳು ಡೆಲಿವರಿ ಗಮನಿಸಿ ಹೊಂದುವುದಿಲ್ಲ
 DocType: Student,Guardian Details,ಗಾರ್ಡಿಯನ್ ವಿವರಗಳು
 DocType: C-Form,C-Form,ಸಿ ಆಕಾರ
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ಅನೇಕ ನೌಕರರು ಮಾರ್ಕ್ ಅಟೆಂಡೆನ್ಸ್
@@ -3524,20 +3527,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ರೋ {0} # ಖಾತೆ ರೀತಿಯ ಇರಬೇಕು &#39;ಸ್ಥಿರ ಸ್ವತ್ತು&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ಪ್ರಮಾಣ ಔಟ್
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ಒಂದು ಮಾರಾಟ ಹಡಗು ಪ್ರಮಾಣವನ್ನು ಲೆಕ್ಕಾಚಾರ ನಿಯಮಗಳು
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ಸರಣಿ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ಹಣಕಾಸು ಸೇವೆಗಳು
 DocType: Student Sibling,Student ID,ವಿದ್ಯಾರ್ಥಿ ಗುರುತು
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ಸಮಯ ದಾಖಲೆಗಳು ಚಟುವಟಿಕೆಗಳನ್ನು ವಿಧಗಳು
 DocType: Tax Rule,Sales,ಮಾರಾಟದ
 DocType: Stock Entry Detail,Basic Amount,ಬೇಸಿಕ್ ಪ್ರಮಾಣ
 DocType: Training Event,Exam,ಪರೀಕ್ಷೆ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ಸ್ಟಾಕ್ ಐಟಂ ಅಗತ್ಯವಿದೆ ವೇರ್ಹೌಸ್ {0}
 DocType: Leave Allocation,Unused leaves,ಬಳಕೆಯಾಗದ ಎಲೆಗಳು
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,ಕೋಟಿ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,ಕೋಟಿ
 DocType: Tax Rule,Billing State,ಬಿಲ್ಲಿಂಗ್ ರಾಜ್ಯ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ವರ್ಗಾವಣೆ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ಪಕ್ಷದ ಖಾತೆಗೆ ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ಪಕ್ಷದ ಖಾತೆಗೆ ಸಂಬಂಧಿಸಿದ ಇಲ್ಲ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),( ಉಪ ಜೋಡಣೆಗಳಿಗೆ ಸೇರಿದಂತೆ ) ಸ್ಫೋಟಿಸಿತು BOM ಪಡೆದುಕೊಳ್ಳಿ
 DocType: Authorization Rule,Applicable To (Employee),ಅನ್ವಯವಾಗುತ್ತದೆ ( ಉದ್ಯೋಗಗಳು)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,ಕಾರಣ ದಿನಾಂಕ ಕಡ್ಡಾಯ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ಗುಣಲಕ್ಷಣ ಹೆಚ್ಚಳವನ್ನು {0} 0 ಸಾಧ್ಯವಿಲ್ಲ
@@ -3548,13 +3551,13 @@
 ,Inactive Customers,ನಿಷ್ಕ್ರಿಯ ಗ್ರಾಹಕರು
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ಖರೀದಿ ರಸೀದಿಗಳನ್ನು
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ಹೇಗೆ ಬೆಲೆ ರೂಲ್ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ಹೇಗೆ ಬೆಲೆ ರೂಲ್ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ?
 DocType: Stock Entry,Delivery Note No,ಡೆಲಿವರಿ ನೋಟ್ ನಂ
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",ಪರಿಶೀಲಿಸಿದರೆ ಮಾತ್ರ ಅಂತಿಮ ಕಚ್ಚಾ ಪದಾರ್ಥಗಳ ವಸ್ತು ವಿನಂತಿಗಳನ್ನು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ಸೇರಿಸಲಾಗುವುದು ಖರೀದಿಸಿ. ಮೇಲಿಂಗ್ ಪೋಷಕರ ಐಟಂಗಳನ್ನು ಮೆಟೀರಿಯಲ್ ವಿನಂತಿಗಳು ನಿರ್ಮಿಸಲಾಗುತ್ತದೆ
 DocType: Cheque Print Template,Message to show,ತೋರಿಸಲು ಸಂದೇಶ
 DocType: Company,Retail,ಚಿಲ್ಲರೆ ವ್ಯಪಾರ
 DocType: Attendance,Absent,ಆಬ್ಸೆಂಟ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ಸಾಲು {0}: ಅಮಾನ್ಯ ಉಲ್ಲೇಖಿತ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ತೆರಿಗೆಗಳು ಮತ್ತು ಶುಲ್ಕಗಳು ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 DocType: Upload Attendance,Download Template,ಡೌನ್ಲೋಡ್ ಟೆಂಪ್ಲೇಟು
@@ -3564,10 +3567,10 @@
 DocType: Payment Entry,Account Paid From,ಖಾತೆ ಪಾವತಿಸಿದ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ರಾ ಮೆಟೀರಿಯಲ್ ಐಟಂ ಕೋಡ್
 DocType: Journal Entry,Write Off Based On,ಆಧರಿಸಿದ ಆಫ್ ಬರೆಯಿರಿ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ಲೀಡ್ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ಲೀಡ್ ಮಾಡಿ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ಮುದ್ರಣ ಮತ್ತು ಲೇಖನ ಸಾಮಗ್ರಿ
 DocType: Stock Settings,Show Barcode Field,ಶೋ ಬಾರ್ಕೋಡ್ ಫೀಲ್ಡ್
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ಸರಬರಾಜುದಾರ ಇಮೇಲ್ಗಳನ್ನು ಕಳುಹಿಸಿ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ಸಂಬಳ ಈಗಾಗಲೇ ನಡುವೆ {0} ಮತ್ತು {1}, ಬಿಡಿ ಅಪ್ಲಿಕೇಶನ್ ಅವಧಿಯಲ್ಲಿ ಈ ದಿನಾಂಕ ಶ್ರೇಣಿ ನಡುವೆ ಸಾಧ್ಯವಿಲ್ಲ ಕಾಲ ಸಂಸ್ಕರಿಸಿದ."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ಒಂದು ನೆಯ ಅನುಸ್ಥಾಪನೆ ದಾಖಲೆ .
 DocType: Guardian Interest,Guardian Interest,ಗಾರ್ಡಿಯನ್ ಬಡ್ಡಿ
@@ -3580,6 +3583,7 @@
 DocType: Offer Letter,Awaiting Response,ಪ್ರತಿಕ್ರಿಯೆ ಕಾಯುತ್ತಿದ್ದ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ಮೇಲೆ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ಅಮಾನ್ಯ ಗುಣಲಕ್ಷಣ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ಹೇಳಿರಿ ಅಲ್ಲದ ಪ್ರಮಾಣಿತ ಪಾವತಿಸಬೇಕು ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Salary Slip,Earning & Deduction,ದುಡಿಯುತ್ತಿದ್ದ & ಡಿಡಕ್ಷನ್
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ಐಚ್ಛಿಕ . ಈ ಸೆಟ್ಟಿಂಗ್ ವಿವಿಧ ವ್ಯವಹಾರಗಳಲ್ಲಿ ಫಿಲ್ಟರ್ ಬಳಸಲಾಗುತ್ತದೆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ನಕಾರಾತ್ಮಕ ಮೌಲ್ಯಾಂಕನ ದರ ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
@@ -3595,10 +3599,9 @@
 DocType: Production Order Item,Production Order Item,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ಯಾವುದೇ ದಾಖಲೆ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,ಕೈಬಿಟ್ಟಿತು ಆಸ್ತಿ ವೆಚ್ಚ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ಭಾಗಶಃ ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ವೆಚ್ಚ ಸೆಂಟರ್ ಐಟಂ ಕಡ್ಡಾಯ {2}
 DocType: Vehicle,Policy No,ನೀತಿ ಇಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ಉತ್ಪನ್ನ ಬಂಡಲ್ ವಸ್ತುಗಳನ್ನು ಪಡೆಯಲು
 DocType: Asset,Straight Line,ಸರಳ ರೇಖೆ
 DocType: Project User,Project User,ಪ್ರಾಜೆಕ್ಟ್ ಬಳಕೆದಾರ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ಒಡೆದ
@@ -3616,7 +3619,7 @@
 DocType: Program Enrollment Tool,Get Students From,ವಿದ್ಯಾರ್ಥಿಗಳನ್ನು ಪಡೆಯಿರಿ
 DocType: Hub Settings,Seller Country,ಮಾರಾಟಗಾರ ಕಂಟ್ರಿ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಐಟಂಗಳನ್ನು ಪ್ರಕಟಿಸಿ
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ಹಂತಹಂತವಾಗಿ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಗ್ರೂಪ್
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ಹಂತಹಂತವಾಗಿ ನಿಮ್ಮ ವಿದ್ಯಾರ್ಥಿಗಳು ಗ್ರೂಪ್
 DocType: Authorization Rule,Authorization Rule,ಅಧಿಕಾರ ರೂಲ್
 DocType: Sales Invoice,Terms and Conditions Details,ನಿಯಮಗಳು ಮತ್ತು ನಿಯಮಗಳು ವಿವರಗಳು
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ವಿಶೇಷಣಗಳು
@@ -3669,14 +3672,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ಚೆಕ್ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},ಖಾತೆ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿ ಸೇರುವುದಿಲ್ಲ: {2}
 DocType: Program Enrollment Tool,Student Applicants,ವಿದ್ಯಾರ್ಥಿ ಅರ್ಜಿದಾರರು
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,ಯಶಸ್ವಿಯಾಗಿ ಈ ಕಂಪನಿಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ವ್ಯವಹಾರಗಳನ್ನು ಅಳಿಸಲಾಗಿದೆ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ದಿನಾಂಕದಂದು
 DocType: Appraisal,HR,ಮಾನವ ಸಂಪನ್ಮೂಲ
 DocType: Program Enrollment,Enrollment Date,ನೋಂದಣಿ ದಿನಾಂಕ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ಪರೀಕ್ಷಣೆ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ಸಂಬಳ ಘಟಕಗಳು
 DocType: Program Enrollment Tool,New Academic Year,ಹೊಸ ಶೈಕ್ಷಣಿಕ ವರ್ಷದ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,ರಿಟರ್ನ್ / ಕ್ರೆಡಿಟ್ ಗಮನಿಸಿ
 DocType: Stock Settings,Auto insert Price List rate if missing,ಆಟೋ ಇನ್ಸರ್ಟ್ ದರ ಪಟ್ಟಿ ದರ ಕಾಣೆಯಾಗಿದೆ ವೇಳೆ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ಒಟ್ಟು ಗಳಿಸುವ ಪ್ರಮಾಣ
 DocType: Production Order Item,Transferred Qty,ಪ್ರಮಾಣ ವರ್ಗಾಯಿಸಲಾಯಿತು
@@ -3696,7 +3699,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ಪ್ರಾಸಂಗಿಕ , ಅನಾರೋಗ್ಯ , ಇತ್ಯಾದಿ ಎಲೆಗಳ ಪ್ರಕಾರ"
 DocType: Email Digest,Send regular summary reports via Email.,ಇಮೇಲ್ ಮೂಲಕ ಸಾಮಾನ್ಯ ಸಾರಾಂಶ ವರದಿ ಕಳುಹಿಸಿ.
 DocType: Payment Entry,PE-,ಪೆ-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},ದಯವಿಟ್ಟು ಖರ್ಚು ಹಕ್ಕು ಪ್ರಕಾರ ಡೀಫಾಲ್ಟ್ ಖಾತೆಯನ್ನು ಸೆಟ್ {0}
 DocType: Assessment Result,Student Name,ವಿದ್ಯಾರ್ಥಿಯ ಹೆಸರು
 DocType: Brand,Item Manager,ಐಟಂ ಮ್ಯಾನೇಜರ್
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,ವೇತನದಾರರ ಪಾವತಿಸಲಾಗುವುದು
@@ -3717,6 +3720,7 @@
 ,Sales Funnel,ಮಾರಾಟ ಕೊಳವೆಯನ್ನು
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ಸಂಕ್ಷೇಪಣ ಕಡ್ಡಾಯ
 DocType: Project,Task Progress,ಟಾಸ್ಕ್ ಪ್ರೋಗ್ರೆಸ್
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ಕಾರ್ಟ್
 ,Qty to Transfer,ವರ್ಗಾವಣೆ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ಪಾತ್ರಗಳ ಅಥವಾ ಗ್ರಾಹಕರಿಗೆ ಹಿಟ್ಟಿಗೆ .
 DocType: Stock Settings,Role Allowed to edit frozen stock,ಪಾತ್ರ ಹೆಪ್ಪುಗಟ್ಟಿದ ಸ್ಟಾಕ್ ಸಂಪಾದಿಸಲು ಅನುಮತಿಸಲಾಗಿದೆ
@@ -3744,13 +3748,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ಐಟಂ ವೈಸ್ ತೆರಿಗೆ ವಿವರ
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ಇನ್ಸ್ಟಿಟ್ಯೂಟ್ ಸಂಕ್ಷೇಪಣ
 ,Item-wise Price List Rate,ಐಟಂ ಬಲ್ಲ ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,ಸರಬರಾಜುದಾರ ನುಡಿಮುತ್ತುಗಳು
 DocType: Quotation,In Words will be visible once you save the Quotation.,ನೀವು ಉದ್ಧರಣ ಉಳಿಸಲು ಒಮ್ಮೆ ವರ್ಡ್ಸ್ ಗೋಚರಿಸುತ್ತದೆ.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ಪ್ರಮಾಣ ({0}) ಸತತವಾಗಿ ಭಾಗವನ್ನು ಸಾಧ್ಯವಿಲ್ಲ {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ಶುಲ್ಕ ಸಂಗ್ರಹಿಸಿ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ಬಾರ್ಕೋಡ್ {0} ಈಗಾಗಲೇ ಐಟಂ ಬಳಸಲಾಗುತ್ತದೆ {1}
 DocType: Lead,Add to calendar on this date,ಈ ದಿನಾಂಕದಂದು ಕ್ಯಾಲೆಂಡರ್ಗೆ ಸೇರಿಸು
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ಹಡಗು ವೆಚ್ಚ ಸೇರಿಸುವ ನಿಯಮಗಳು .
 DocType: Item,Opening Stock,ಸ್ಟಾಕ್ ತೆರೆಯುವ
@@ -3768,8 +3772,8 @@
  'ಟೈಮ್ ಲಾಗ್' ಮೂಲಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ"
 DocType: Customer,From Lead,ಮುಂಚೂಣಿಯಲ್ಲಿವೆ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ಉತ್ಪಾದನೆಗೆ ಬಿಡುಗಡೆ ಆರ್ಡರ್ಸ್ .
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ಹಣಕಾಸಿನ ವರ್ಷ ಆಯ್ಕೆ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ಪಿಓಎಸ್ ಪ್ರೊಫೈಲ್ ಪಿಓಎಸ್ ಎಂಟ್ರಿ ಮಾಡಲು ಅಗತ್ಯವಿದೆ
 DocType: Program Enrollment Tool,Enroll Students,ವಿದ್ಯಾರ್ಥಿಗಳು ದಾಖಲು
 DocType: Hub Settings,Name Token,ಹೆಸರು ಟೋಕನ್
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ಸ್ಟ್ಯಾಂಡರ್ಡ್ ವಿಕ್ರಯ
@@ -3780,7 +3784,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ ವಿರುದ್ಧ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ಪ್ರಾಜೆಕ್ಟ್ ಹೆಸರು
-DocType: Supplier,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
+DocType: Customer,Mention if non-standard receivable account,ಬಗ್ಗೆ ಸ್ಟಾಂಡರ್ಡ್ ಅಲ್ಲದ ಸ್ವೀಕೃತಿ ಖಾತೆಯನ್ನು ವೇಳೆ
 DocType: Journal Entry Account,If Income or Expense,ವೇಳೆ ಆದಾಯ ಅಥವಾ ಖರ್ಚು
 DocType: Production Order,Required Items,ಅಗತ್ಯ ವಸ್ತುಗಳ
 DocType: Stock Ledger Entry,Stock Value Difference,ಸ್ಟಾಕ್ ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ
@@ -3801,7 +3805,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ಸೆಟ್ ಗುರಿಗಳನ್ನು ಐಟಂ ಗುಂಪು ಬಲ್ಲ ಈ ಮಾರಾಟ ವ್ಯಕ್ತಿಗೆ .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ಫ್ರೀಜ್ ಸ್ಟಾಕ್ಗಳು ಹಳೆಯದಾಗಿರುವ [ ಡೇಸ್ ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ರೋ # {0}: ಆಸ್ತಿ ಸ್ಥಿರ ಆಸ್ತಿ ಖರೀದಿ / ಮಾರಾಟ ಕಡ್ಡಾಯ
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ಎರಡು ಅಥವಾ ಹೆಚ್ಚು ಬೆಲೆ ನಿಯಮಗಳು ಮೇಲೆ ಆಧರಿಸಿ ಕಂಡುಬರದಿದ್ದಲ್ಲಿ, ಆದ್ಯತಾ ಅನ್ವಯಿಸಲಾಗುತ್ತದೆ. ಡೀಫಾಲ್ಟ್ ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ (ಖಾಲಿ) ಹಾಗೆಯೇ ಆದ್ಯತಾ 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.,ಕೆಳಗಿನ ಬಳಕೆದಾರರಿಗೆ ಬ್ಲಾಕ್ ದಿನಗಳ ಬಿಟ್ಟು ಅನ್ವಯಗಳು ಅನುಮೋದಿಸಲು ಅನುಮತಿಸಿ .
@@ -3827,7 +3831,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ಇದು ಒಂದು ಸ್ಟಾಕ್ ಐಟಂ ಕಾರಣ ಐಟಂ {0} ಕಡೆಗಣಿಸಲಾಗುತ್ತದೆ
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ಒಂದು ನಿರ್ಧಿಷ್ಟ ವ್ಯವಹಾರಕ್ಕೆ ಬೆಲೆ ನಿಯಮ ಅನ್ವಯಿಸುವುದಿಲ್ಲ, ಎಲ್ಲಾ ಅನ್ವಯಿಸುವ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ಒಂದು ನಿರ್ಧಿಷ್ಟ ವ್ಯವಹಾರಕ್ಕೆ ಬೆಲೆ ನಿಯಮ ಅನ್ವಯಿಸುವುದಿಲ್ಲ, ಎಲ್ಲಾ ಅನ್ವಯಿಸುವ ಬೆಲೆ ನಿಯಮಗಳಲ್ಲಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮಾಡಬೇಕು."
 DocType: Assessment Group,Parent Assessment Group,ಪೋಷಕ ಅಸೆಸ್ಮೆಂಟ್ ಗುಂಪು
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ಉದ್ಯೋಗ
 ,Sales Order Trends,ಮಾರಾಟದ ಆರ್ಡರ್ ಟ್ರೆಂಡ್ಸ್
@@ -3838,7 +3842,7 @@
 DocType: Stock Entry Detail,Additional Cost,ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ಹಣಕಾಸು ವರ್ಷಾಂತ್ಯದ ದಿನಾಂಕ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ಚೀಟಿ ಮೂಲಕ ವರ್ಗೀಕರಿಸಲಾಗಿದೆ ವೇಳೆ , ಚೀಟಿ ಸಂಖ್ಯೆ ಆಧರಿಸಿ ಫಿಲ್ಟರ್ ಸಾಧ್ಯವಿಲ್ಲ"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ ಮಾಡಿ
 DocType: Quality Inspection,Incoming,ಒಳಬರುವ
 DocType: BOM,Materials Required (Exploded),ಬೇಕಾದ ಸಾಮಗ್ರಿಗಳು (ಸ್ಫೋಟಿಸಿತು )
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ನಿಮ್ಮನ್ನು ಬೇರೆ, ನಿಮ್ಮ ಸಂಸ್ಥೆಗೆ ಬಳಕೆದಾರರು ಸೇರಿಸಿ"
@@ -3866,6 +3870,7 @@
 DocType: Employee,History In Company,ಕಂಪನಿ ಇತಿಹಾಸ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ಸುದ್ದಿಪತ್ರಗಳು
 DocType: Stock Ledger Entry,Stock Ledger Entry,ಸ್ಟಾಕ್ ಲೆಡ್ಜರ್ ಎಂಟ್ರಿ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ಗ್ರಾಹಕ&gt; ಗ್ರಾಹಕನಿಗೆ ಗ್ರೂಪ್&gt; ಟೆರಿಟರಿ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ಒಂದೇ ಐಟಂ ಅನ್ನು ಹಲವಾರು ಬಾರಿ ನಮೂದಿಸಲಾದ
 DocType: Department,Leave Block List,ಖಂಡ ಬಿಡಿ
 DocType: Sales Invoice,Tax ID,ತೆರಿಗೆಯ ID
@@ -3875,7 +3880,7 @@
 DocType: Customer,Sales Partner and Commission,ಮಾರಾಟದ ಸಂಗಾತಿ ಮತ್ತು ಆಯೋಗದ
 DocType: Employee Loan,Rate of Interest (%) / Year,ಬಡ್ಡಿ (%) / ವರ್ಷದ ದರ
 ,Project Quantity,ಪ್ರಾಜೆಕ್ಟ್ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ಒಟ್ಟು {0} ಎಲ್ಲಾ ಐಟಂಗಳನ್ನು, ಶೂನ್ಯವಾಗಿರುತ್ತದೆ ನೀವು ರಂದು ಆಧರಿಸಿ ಚಾರ್ಜಸ್ ವಿತರಿಸಿ &#39;ಬದಲಿಸಬೇಕಾಗುತ್ತದೆ ಇರಬಹುದು"
 DocType: Opportunity,To Discuss,ಡಿಸ್ಕಸ್
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ಘಟಕಗಳು {1} ನಲ್ಲಿ {2} ಈ ವ್ಯವಹಾರವನ್ನು ಪೂರ್ಣಗೊಳಿಸಲು ಅಗತ್ಯವಿದೆ.
 DocType: Loan Type,Rate of Interest (%) Yearly,ಬಡ್ಡಿ ದರ (%) ವಾರ್ಷಿಕ
@@ -3890,7 +3895,7 @@
 DocType: Purchase Invoice,Return,ರಿಟರ್ನ್
 DocType: Production Order Operation,Production Order Operation,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಆಪರೇಷನ್
 DocType: Pricing Rule,Disable,ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ಪಾವತಿಸುವ ವಿಧಾನ ಪಾವತಿ ಮಾಡಬೇಕಿರುತ್ತದೆ
 DocType: Project Task,Pending Review,ಬಾಕಿ ರಿವ್ಯೂ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",ಇದು ಈಗಾಗಲೇ ಆಸ್ತಿ {0} ನಿಷ್ಕ್ರಿಯವಾಗಲ್ಪಟ್ಟವು ಸಾಧ್ಯವಿಲ್ಲ {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(ಖರ್ಚು ಹಕ್ಕು ಮೂಲಕ) ಒಟ್ಟು ಖರ್ಚು ಹಕ್ಕು
@@ -3898,11 +3903,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ಮಾರ್ಕ್ ಆಬ್ಸೆಂಟ್
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ರೋ {0}: ಆಫ್ ಬಿಒಎಮ್ # ಕರೆನ್ಸಿ {1} ಆಯ್ಕೆ ಕರೆನ್ಸಿ ಸಮಾನ ಇರಬೇಕು {2}
 DocType: Journal Entry Account,Exchange Rate,ವಿನಿಮಯ ದರ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ಮಾರಾಟದ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸದಿದ್ದರೆ
 DocType: Homepage,Tag Line,ಟ್ಯಾಗ್ ಲೈನ್
 DocType: Fee Component,Fee Component,ಶುಲ್ಕ ಕಾಂಪೊನೆಂಟ್
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ಫ್ಲೀಟ್ ಮ್ಯಾನೇಜ್ಮೆಂಟ್
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,ಐಟಂಗಳನ್ನು ಸೇರಿಸಿ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},ವೇರ್ಹೌಸ್ {0}: ಪೋಷಕರ ಖಾತೆಯ {1} ಕಂಪನಿಗೆ ಸದಸ್ಯ ಮಾಡುವುದಿಲ್ಲ {2}
 DocType: Cheque Print Template,Regular,ನಿಯಮಿತ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,ಎಲ್ಲಾ ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು
@@ -3915,7 +3920,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ಆಯ್ದುಕೊಂಡ ಬ್ಯಾಚ್ ಹೊಂದುವಂತಿಲ್ಲ
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ಮೌಲ್ಯಾಂಕನ ದರ ಲೆಕ್ಕಪತ್ರ ನಮೂದುಗಳನ್ನು ಮಾಡಲು ಅಗತ್ಯವಿದೆ ಇದು ಐಟಂ {0}, ಕಂಡುಬಂದಿಲ್ಲ {1} {2}. ಐಟಂ ಒಂದು ಮಾದರಿ ಐಟಂ ವಹಿವಾಟುಗಳನ್ನು ವೇಳೆ {1}, {1} ಐಟಂ ಕೋಷ್ಟಕದಲ್ಲಿ ಕುರಿತು ಮಾಹಿತಿ ನೀಡಿ. ಇಲ್ಲವಾದರೆ, ಐಟಂ ದಾಖಲೆಯಲ್ಲಿ ಐಟಂ ಅಥವಾ ಉಲ್ಲೇಖವನ್ನು ಮೌಲ್ಯಮಾಪನ ದರ ಒಳಬರುವ ಶೇರು ವಹಿವಾಟು ರಚಿಸಲು, ತದನಂತರ / submiting ಪ್ರಯತ್ನಿಸಿ ಈ ನಮೂದನ್ನು ರದ್ದು ಮಾಡಿ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ಈ ಡೆಲಿವರಿ ಗಮನಿಸಿ ವಿರುದ್ಧ ವಿತರಿಸಲಾಯಿತು ವಸ್ತುಗಳ %
 DocType: Project,Customer Details,ಗ್ರಾಹಕ ವಿವರಗಳು
@@ -3924,15 +3929,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ರಿಸೀವರ್ ಸೂಲ URL ಅನ್ನು ನಿಯತಾಂಕ ಯನ್ನು
 DocType: Payment Entry,Paid Amount,ಮೊತ್ತವನ್ನು
 DocType: Assessment Plan,Supervisor,ಮೇಲ್ವಿಚಾರಕ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ಆನ್ಲೈನ್
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ಆನ್ಲೈನ್
 ,Available Stock for Packing Items,ಐಟಂಗಳು ಪ್ಯಾಕಿಂಗ್ ಸ್ಟಾಕ್ ಲಭ್ಯವಿದೆ
 DocType: Item Variant,Item Variant,ಐಟಂ ಭಿನ್ನ
 DocType: Assessment Result Tool,Assessment Result Tool,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ಟೂಲ್
 DocType: BOM Scrap Item,BOM Scrap Item,ಬಿಒಎಮ್ ಸ್ಕ್ರ್ಯಾಪ್ ಐಟಂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ಸಲ್ಲಿಸಲಾಗಿದೆ ಆದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದಿಲ್ಲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,ಗುಣಮಟ್ಟ ನಿರ್ವಹಣೆ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee Loan,Repay Fixed Amount per Period,ಅವಧಿಯ ಪ್ರತಿ ಸ್ಥಿರ ಪ್ರಮಾಣದ ಮರುಪಾವತಿ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ಐಟಂ ಪ್ರಮಾಣ ನಮೂದಿಸಿ {0}
 DocType: Employee External Work History,Employee External Work History,ಬಾಹ್ಯ ಕೆಲಸದ ಇತಿಹಾಸ
@@ -3959,7 +3964,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ವಿದ್ಯಾರ್ಥಿ ಈಮೇಲ್ ಅಡ್ರೆಸ್
 DocType: Employee,Notice (days),ಎಚ್ಚರಿಕೆ ( ದಿನಗಳು)
 DocType: Tax Rule,Sales Tax Template,ಮಾರಾಟ ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ಸರಕುಪಟ್ಟಿ ಉಳಿಸಲು ಐಟಂಗಳನ್ನು ಆಯ್ಕೆ
 DocType: Employee,Encashment Date,ನಗದೀಕರಣ ದಿನಾಂಕ
 DocType: Training Event,Internet,ಇಂಟರ್ನೆಟ್
 DocType: Account,Stock Adjustment,ಸ್ಟಾಕ್ ಹೊಂದಾಣಿಕೆ
@@ -3983,7 +3988,7 @@
 DocType: Item Variant Attribute,Attribute,ಲಕ್ಷಣ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,ವ್ಯಾಪ್ತಿ / ರಿಂದ ಸೂಚಿಸಿ
 DocType: Serial No,Under AMC,ಎಎಂಸಿ ಅಂಡರ್
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ದರ ಬಂದಿಳಿದ ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಿ recalculated ಇದೆ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,ಐಟಂ ಮೌಲ್ಯಮಾಪನ ದರ ಬಂದಿಳಿದ ವೆಚ್ಚ ಚೀಟಿ ಪ್ರಮಾಣವನ್ನು ಪರಿಗಣಿಸಿ recalculated ಇದೆ
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ವ್ಯವಹಾರ ಮಾರಾಟ ಡೀಫಾಲ್ಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳನ್ನು .
 DocType: Guardian,Guardian Of ,ಗಾರ್ಡಿಯನ್
 DocType: Grading Scale Interval,Threshold,ಮಿತಿ
@@ -3993,6 +3998,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ಡೆಬಿಟ್ ಚೀಟಿಯನ್ನು ನೀಡಲಾಗಿದೆ
 DocType: Production Order,Warehouses,ಗೋದಾಮುಗಳು
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ಆಸ್ತಿ ವರ್ಗಾವಣೆ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ಈ ಐಟಂ {0} (ಟೆಂಪ್ಲೇಟು) ಒಂದು ಪ್ರಕಾರವಾಗಿದ್ದು.
 DocType: Workstation,per hour,ಗಂಟೆಗೆ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ಖರೀದಿ
 DocType: Announcement,Announcement,ಪ್ರಕಟಣೆ
@@ -4008,8 +4014,8 @@
 DocType: Account,Receivable,ಲಭ್ಯ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ರೋ # {0}: ಆರ್ಡರ್ ಖರೀದಿಸಿ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಪೂರೈಕೆದಾರ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ಪಾತ್ರ ವ್ಯವಹಾರ ಸೆಟ್ ಕ್ರೆಡಿಟ್ ಮಿತಿಯನ್ನು ಮಾಡಲಿಲ್ಲ ಸಲ್ಲಿಸಲು ಅವಕಾಶ ನೀಡಲಿಲ್ಲ .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ಉತ್ಪಾದನೆ ಐಟಂಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","ಮಾಸ್ಟರ್ ಡಾಟಾ ಸಿಂಕ್, ಇದು ಸ್ವಲ್ಪ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು"
 DocType: Item,Material Issue,ಮೆಟೀರಿಯಲ್ ಸಂಚಿಕೆ
 DocType: Hub Settings,Seller Description,ಮಾರಾಟಗಾರ ವಿವರಣೆ
 DocType: Employee Education,Qualification,ಅರ್ಹತೆ
@@ -4021,7 +4027,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ಆದೇಶ
 DocType: Salary Detail,Component,ಕಾಂಪೊನೆಂಟ್
 DocType: Assessment Criteria,Assessment Criteria Group,ಅಸೆಸ್ಮೆಂಟ್ ಕ್ರೈಟೀರಿಯಾ ಗ್ರೂಪ್
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ಕ್ರೋಢಿಕೃತ ಸವಕಳಿ ತೆರೆಯುವ ಸಮಾನವಾಗಿರುತ್ತದೆ ಕಡಿಮೆ ಇರಬೇಕು {0}
 DocType: Warehouse,Warehouse Name,ವೇರ್ಹೌಸ್ ಹೆಸರು
 DocType: Naming Series,Select Transaction,ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಆಯ್ಕೆ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ಪಾತ್ರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ಅಥವಾ ಬಳಕೆದಾರ ಅನುಮೋದಿಸಲಾಗುತ್ತಿದೆ ನಮೂದಿಸಿ
@@ -4034,7 +4040,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,ಸಲ್ಲಿಸಿದ ಸ್ಟಾಕ್ ಎಂಟ್ರಿ {0} ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ ಏಕೆಂದರೆ ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Employee Loan,Disbursement Date,ವಿತರಣೆ ದಿನಾಂಕ
 DocType: Vehicle,Vehicle,ವಾಹನ
 DocType: Purchase Invoice,In Words,ವರ್ಡ್ಸ್
@@ -4049,14 +4055,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ಎದುರು / ಲೀಡ್%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ಆಸ್ತಿ Depreciations ಮತ್ತು ಸಮತೋಲನ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},ಪ್ರಮಾಣ {0} {1} ವರ್ಗಾಯಿಸಲಾಯಿತು {2} ನಿಂದ {3}
 DocType: Sales Invoice,Get Advances Received,ಅಡ್ವಾನ್ಸಸ್ ಸ್ವೀಕರಿಸಲಾಗಿದೆ ಪಡೆಯಿರಿ
 DocType: Email Digest,Add/Remove Recipients,ಸೇರಿಸಿ / ತೆಗೆದುಹಾಕಿ ಸ್ವೀಕೃತದಾರರ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ ಟ್ರಾನ್ಸಾಕ್ಷನ್ ಉತ್ಪಾದನೆ ಆರ್ಡರ್ ವಿರುದ್ಧ ನಿಲ್ಲಿಸಿತು {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ಡೀಫಾಲ್ಟ್ ಎಂದು ಈ ಆರ್ಥಿಕ ವರ್ಷ ಹೊಂದಿಸಲು, ' ಪೂರ್ವನಿಯೋಜಿತವಾಗಿನಿಗದಿಪಡಿಸು ' ಕ್ಲಿಕ್"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ಸೇರಲು
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ಕೊರತೆ ಪ್ರಮಾಣ
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ಐಟಂ ಭಿನ್ನ {0} ಅದೇ ಲಕ್ಷಣಗಳು ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ
 DocType: Employee Loan,Repay from Salary,ಸಂಬಳದಿಂದ ಬಂದ ಮರುಪಾವತಿ
 DocType: Leave Application,LAP/,ಲ್ಯಾಪ್ /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ವಿರುದ್ಧ ಪಾವತಿ ಮನವಿ {0} {1} ಪ್ರಮಾಣದ {2}
@@ -4074,7 +4080,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ ವಿವರ
 DocType: Employee Education,Employee Education,ನೌಕರರ ಶಿಕ್ಷಣ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ನಕಲು ಐಟಂ ಗುಂಪು ಐಟಂ ಗುಂಪು ಟೇಬಲ್ ಕಂಡುಬರುವ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ಇದು ಐಟಂ ವಿವರಗಳು ತರಲು ಅಗತ್ಯವಿದೆ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ಈಗಾಗಲೇ ಸ್ವೀಕರಿಸಲಾಗಿದೆ
@@ -4083,7 +4089,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","ವೇರ್ಹೌಸ್ {0} ಯಾವುದೇ ಖಾತೆಗೆ ಲಿಂಕ್, ದಯವಿಟ್ಟು / ಲಿಂಕ್ ಗೋದಾಮಿನ ಅನುಗುಣವಾದ (ಆಸ್ತಿ) ಖಾತೆಯನ್ನು ರಚಿಸಲು."
 DocType: Purchase Invoice,Recurring Id,ಮರುಕಳಿಸುವ ಸಂ
 DocType: Customer,Sales Team Details,ಮಾರಾಟ ತಂಡದ ವಿವರಗಳು
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,ಶಾಶ್ವತವಾಗಿ ಅಳಿಸಿ?
 DocType: Expense Claim,Total Claimed Amount,ಹಕ್ಕು ಪಡೆದ ಒಟ್ಟು ಪ್ರಮಾಣ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ಮಾರಾಟ ಸಮರ್ಥ ಅವಕಾಶಗಳನ್ನು .
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ಅಮಾನ್ಯವಾದ {0}
@@ -4094,13 +4100,14 @@
 DocType: Warehouse,PIN,ಪಿನ್
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ನಿಮ್ಮ ಸ್ಕೂಲ್ ಸೆಟಪ್
 DocType: Sales Invoice,Base Change Amount (Company Currency),ಬೇಸ್ ಬದಲಾಯಿಸಬಹುದು ಪ್ರಮಾಣ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ನಂತರ ಗೋದಾಮುಗಳು ಯಾವುದೇ ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,ಕೊನೆಯ ಆರ್ಡರ್ ಪ್ರಮಾಣ
+DocType: Task,Is Milestone,ಮೈಲ್ಸ್ಟೋನ್ ಈಸ್
 DocType: Daily Work Summary,Email Sent To,ಇಮೇಲ್ ಕಳುಹಿಸಲಾಗಿದೆ
 DocType: Budget,Warn,ಎಚ್ಚರಿಕೆ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ಯಾವುದೇ ಟೀಕೆಗಳನ್ನು, ದಾಖಲೆಗಳಲ್ಲಿ ಹೋಗಬೇಕು ಎಂದು ವಿವರಣೆಯಾಗಿದೆ ಪ್ರಯತ್ನ."
@@ -4121,7 +4128,7 @@
 DocType: Item Attribute Value,Attribute Value,ಮೌಲ್ಯ ಲಕ್ಷಣ
 ,Itemwise Recommended Reorder Level,Itemwise ಮರುಕ್ರಮಗೊಳಿಸಿ ಮಟ್ಟ ಶಿಫಾರಸು
 DocType: Salary Detail,Salary Detail,ಸಂಬಳ ವಿವರ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,ಮೊದಲ {0} ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,ಐಟಂ ಬ್ಯಾಚ್ {0} {1} ಮುಗಿದಿದೆ.
 DocType: Sales Invoice,Commission,ಆಯೋಗ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ಉತ್ಪಾದನೆ ಟೈಮ್ ಶೀಟ್.
@@ -4133,41 +4140,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` ಸ್ಟಾಕ್ಗಳು ದ್ಯಾನ್ ಫ್ರೀಜ್ ` ಹಳೆಯ % d ದಿನಗಳಲ್ಲಿ ಹೆಚ್ಚು ಚಿಕ್ಕದಾಗಿರಬೇಕು.
 DocType: Tax Rule,Purchase Tax Template,ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟು ಖರೀದಿಸಿ
 ,Project wise Stock Tracking,ಪ್ರಾಜೆಕ್ಟ್ ಬುದ್ಧಿವಂತ ಸ್ಟಾಕ್ ಟ್ರ್ಯಾಕಿಂಗ್
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ನಿರ್ವಹಣೆ ವೇಳಾಪಟ್ಟಿ {0} {0} ವಿರುದ್ಧ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 DocType: Stock Entry Detail,Actual Qty (at source/target),ನಿಜವಾದ ಪ್ರಮಾಣ ( ಮೂಲ / ಗುರಿ )
 DocType: Item Customer Detail,Ref Code,ಉಲ್ಲೇಖ ಕೋಡ್
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ನೌಕರರ ದಾಖಲೆಗಳು .
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ಮುಂದಿನ ಸವಕಳಿ ದಿನಾಂಕ ಸೆಟ್ ಮಾಡಿ
 DocType: HR Settings,Payroll Settings,ವೇತನದಾರರ ಸೆಟ್ಟಿಂಗ್ಗಳು
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ಅಲ್ಲದ ಲಿಂಕ್ ಇನ್ವಾಯ್ಸ್ ಮತ್ತು ಪಾವತಿಗಳು ಫಲಿತಾಂಶ .
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ಪ್ಲೇಸ್ ಆರ್ಡರ್
 DocType: Email Digest,New Purchase Orders,ಹೊಸ ಖರೀದಿ ಆದೇಶಗಳನ್ನು
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ರೂಟ್ ಪೋಷಕರು ವೆಚ್ಚ ಸೆಂಟರ್ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ಆಯ್ಕೆ ಬ್ರ್ಯಾಂಡ್ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ಆಯ್ಕೆ ಬ್ರ್ಯಾಂಡ್ ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ಮೇಲೆ ಸವಕಳಿ ಕ್ರೋಢಿಕೃತ
 DocType: Sales Invoice,C-Form Applicable,ಅನ್ವಯಿಸುವ ಸಿ ಆಕಾರ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ಆಪರೇಷನ್ ಟೈಮ್ ಆಪರೇಷನ್ 0 ಹೆಚ್ಚು ಇರಬೇಕು {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ವೇರ್ಹೌಸ್ ಕಡ್ಡಾಯ
 DocType: Supplier,Address and Contacts,ವಿಳಾಸ ಮತ್ತು ಸಂಪರ್ಕಗಳು
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ಪರಿವರ್ತನೆ ವಿವರಗಳು
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px ವೆಬ್ ಸ್ನೇಹಿ 900px ( W ) ನೋಡಿಕೊಳ್ಳಿ ( H )
 DocType: Program,Program Abbreviation,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ಸಂಕ್ಷೇಪಣ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ ಒಂದು ಐಟಂ ಟೆಂಪ್ಲೇಟು ವಿರುದ್ಧ ಬೆಳೆದ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ಆರೋಪಗಳನ್ನು ಪ್ರತಿ ಐಟಂ ವಿರುದ್ಧ ಖರೀದಿ ರಿಸೀಟ್ನ್ನು ನವೀಕರಿಸಲಾಗುವುದು
 DocType: Warranty Claim,Resolved By,ಪರಿಹರಿಸಲಾಗುವುದು
 DocType: Bank Guarantee,Start Date,ಪ್ರಾರಂಭ ದಿನಾಂಕ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ಕಾಲ ಎಲೆಗಳು ನಿಯೋಜಿಸಿ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ಚೆಕ್ ಮತ್ತು ಠೇವಣಿಗಳ ತಪ್ಪಾಗಿ ತೆರವುಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ಖಾತೆ {0}: ನೀವು ಪೋಷಕರ ಖಾತೆಯ ಎಂದು ಸ್ವತಃ ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Purchase Invoice Item,Price List Rate,ಬೆಲೆ ಪಟ್ಟಿ ದರ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ಗ್ರಾಹಕ ಉಲ್ಲೇಖಗಳು ರಚಿಸಿ
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ಗ್ರಾಹಕ ಉಲ್ಲೇಖಗಳು ರಚಿಸಿ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",""" ಸ್ಟಾಕ್ ರಲ್ಲಿ "" ತೋರಿಸು ಅಥವಾ "" ಅಲ್ಲ ಸ್ಟಾಕ್ "" ಈ ಉಗ್ರಾಣದಲ್ಲಿ ಲಭ್ಯವಿರುವ ಸ್ಟಾಕ್ ಆಧರಿಸಿ ."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ಮೆಟೀರಿಯಲ್ಸ್ ಬಿಲ್ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ಪೂರೈಕೆದಾರರಿಂದ ವಿಧವಾಗಿ ಸಮಯ ತಲುಪಿಸಲು
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,ಅಸೆಸ್ಮೆಂಟ್ ಫಲಿತಾಂಶ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ಅವರ್ಸ್
 DocType: Project,Expected Start Date,ನಿರೀಕ್ಷಿತ ಪ್ರಾರಂಭ ದಿನಾಂಕ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ಆರೋಪಗಳನ್ನು ಐಟಂ ಅನ್ವಯಿಸುವುದಿಲ್ಲ ವೇಳೆ ಐಟಂ ತೆಗೆದುಹಾಕಿ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ವ್ಯವಹಾರ ಕರೆನ್ಸಿ ಪೇಮೆಂಟ್ ಗೇಟ್ ವೇ ಕರೆನ್ಸಿ ಅದೇ ಇರಬೇಕು
 DocType: Payment Entry,Receive,ಸ್ವೀಕರಿಸಿ
@@ -4178,19 +4184,19 @@
 DocType: Workstation,Operating Costs,ವೆಚ್ಚದ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ಆಕ್ಷನ್ ಮಾಸಿಕ ಬಜೆಟ್ ಮೀರಿದೆ ತನ್ನತ್ತ
 DocType: Purchase Invoice,Submit on creation,ಸೃಷ್ಟಿ ಸಲ್ಲಿಸಿ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},ಕರೆನ್ಸಿ {0} ಇರಬೇಕು {1}
 DocType: Asset,Disposal Date,ವಿಲೇವಾರಿ ದಿನಾಂಕ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ಇಮೇಲ್ಗಳನ್ನು ಅವರು ರಜಾ ಹೊಂದಿಲ್ಲ ವೇಳೆ, ಗಂಟೆ ಕಂಪನಿಯ ಎಲ್ಲಾ ಸಕ್ರಿಯ ನೌಕರರು ಕಳುಹಿಸಲಾಗುವುದು. ಪ್ರತಿಕ್ರಿಯೆಗಳ ಸಾರಾಂಶ ಮಧ್ಯರಾತ್ರಿ ಕಳುಹಿಸಲಾಗುವುದು."
 DocType: Employee Leave Approver,Employee Leave Approver,ನೌಕರರ ಲೀವ್ ಅನುಮೋದಕ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ಸಾಲು {0}: ಒಂದು ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರವೇಶ ಈಗಾಗಲೇ ಈ ಗೋದಾಮಿನ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ಸೋತು ಉದ್ಧರಣ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ , ಘೋಷಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ತರಬೇತಿ ಪ್ರತಿಕ್ರಿಯೆ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ಪ್ರೊಡಕ್ಷನ್ ಆರ್ಡರ್ {0} ಸಲ್ಲಿಸಬೇಕು
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಐಟಂ ಎಂಡ್ ದಿನಾಂಕ ಆಯ್ಕೆ ಮಾಡಿ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ಕೋರ್ಸ್ ಸತತವಾಗಿ ಕಡ್ಡಾಯ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ಇಲ್ಲಿಯವರೆಗೆ fromDate ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ ಸಂಪಾದಿಸಿ ಬೆಲೆಗಳು ಸೇರಿಸಿ
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Batch,Parent Batch,ಪೋಷಕ ಬ್ಯಾಚ್
 DocType: Cheque Print Template,Cheque Print Template,ಚೆಕ್ ಪ್ರಿಂಟ್ ಟೆಂಪ್ಲೇಟು
@@ -4204,7 +4210,7 @@
 ,Ordered Items To Be Delivered,ನೀಡಬೇಕಾಗಿದೆ ಐಟಂಗಳು ಆದೇಶ
 DocType: Account,Income,ಆದಾಯ
 DocType: Industry Type,Industry Type,ಉದ್ಯಮ ಪ್ರಕಾರ
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ಏನೋ ತಪ್ಪಾಗಿದೆ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,ಎಚ್ಚರಿಕೆ : ಅಪ್ಲಿಕೇಶನ್ ಬಿಡಿ ಕೆಳಗಿನ ಬ್ಲಾಕ್ ದಿನಾಂಕಗಳನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,ಮಾರಾಟದ ಸರಕುಪಟ್ಟಿ {0} ಈಗಾಗಲೇ ಸಲ್ಲಿಸಲಾಗಿದೆ
 DocType: Assessment Result Detail,Score,ಸ್ಕೋರ್
@@ -4235,17 +4241,17 @@
 DocType: Item,Variant Based On,ಭಿನ್ನ ಬೇಸ್ಡ್ ರಂದು
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ನಿಯೋಜಿಸಲಾಗಿದೆ ಒಟ್ಟು ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು 100% ಇರಬೇಕು. ಇದು {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ನಿಮ್ಮ ಪೂರೈಕೆದಾರರು
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ಮಾರಾಟದ ಆರ್ಡರ್ ಮಾಡಿದ ಎಂದು ಕಳೆದು ಹೊಂದಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ .
 DocType: Request for Quotation Item,Supplier Part No,ಸರಬರಾಜುದಾರ ಭಾಗ ಯಾವುದೇ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ಸ್ವೀಕರಿಸಿದ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ವರ್ಗದಲ್ಲಿ &#39;ಮೌಲ್ಯಾಂಕನ&#39; ಅಥವಾ &#39;Vaulation ಮತ್ತು ಒಟ್ಟು&#39; ಆಗಿದೆ ಮಾಡಿದಾಗ ಕಡಿತಗೊಳಿಸದಿರುವುದರ ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ಸ್ವೀಕರಿಸಿದ
 DocType: Lead,Converted,ಪರಿವರ್ತಿತ
 DocType: Item,Has Serial No,ಅನುಕ್ರಮ ಸಂಖ್ಯೆ ಹೊಂದಿದೆ
 DocType: Employee,Date of Issue,ಸಂಚಿಕೆ ದಿನಾಂಕ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: ಗೆ {0} ಫಾರ್ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ರೋ # {0}: ಐಟಂ ಹೊಂದಿಸಿ ಸರಬರಾಜುದಾರ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ರೋ {0}: ಗಂಟೆಗಳು ಮೌಲ್ಯವನ್ನು ಶೂನ್ಯ ಹೆಚ್ಚು ಇರಬೇಕು.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ಐಟಂ {1} ಜೋಡಿಸಲಾದ ವೆಬ್ಸೈಟ್ ಚಿತ್ರ {0} ದೊರೆಯುತ್ತಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,ವೆಬ್ಸೈಟ್ನಲ್ಲಿ ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಈ ಐಟಂ ಪಟ್ಟಿ .
@@ -4254,20 +4260,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ನೀವು ಫ್ರೋಜನ್ ಮೌಲ್ಯವನ್ನು ಅಧಿಕಾರ
 DocType: Payment Reconciliation,Get Unreconciled Entries,ರಾಜಿಯಾಗದ ನಮೂದುಗಳು ಪಡೆಯಿರಿ
 DocType: Payment Reconciliation,From Invoice Date,ಸರಕುಪಟ್ಟಿ ದಿನಾಂಕ ಗೆ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ಬಿಲ್ಲಿಂಗ್ ಕರೆನ್ಸಿ ಡೀಫಾಲ್ಟ್ comapany ಕರೆನ್ಸಿ ಅಥವಾ ಪಕ್ಷದ ಖಾತೆಯನ್ನು ಕರೆನ್ಸಿ ಸಮನಾಗಿರಬೇಕು
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ನಗದಾಗಿಸುವಿಕೆ ಬಿಡಿ
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ಇದು ಏನು ಮಾಡುತ್ತದೆ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ಗೋದಾಮಿನ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ಎಲ್ಲಾ ವಿದ್ಯಾರ್ಥಿ ಪ್ರವೇಶ
 ,Average Commission Rate,ಸರಾಸರಿ ಆಯೋಗದ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' ಸೀರಿಯಲ್ ನಂ ಹ್ಯಾಸ್ ' ನಾನ್ ಸ್ಟಾಕ್ ಐಟಂ ' ಹೌದು ' ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ಅಟೆಂಡೆನ್ಸ್ ಭವಿಷ್ಯದ ದಿನಾಂಕ ಗುರುತಿಸಲಾಗಿದೆ ಸಾಧ್ಯವಿಲ್ಲ
 DocType: Pricing Rule,Pricing Rule Help,ಬೆಲೆ ನಿಯಮ ಸಹಾಯ
 DocType: School House,House Name,ಹೌಸ್ ಹೆಸರು
 DocType: Purchase Taxes and Charges,Account Head,ಖಾತೆ ಹೆಡ್
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ಐಟಂಗಳ ಬಂದಿಳಿದ ವೆಚ್ಚ ಲೆಕ್ಕ ಹೆಚ್ಚುವರಿ ವೆಚ್ಚ ನವೀಕರಿಸಿ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ವಿದ್ಯುತ್ತಿನ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ನಿಮ್ಮ ಬಳಕೆದಾರರಿಗೆ ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಉಳಿದ ಸೇರಿಸಿ. ನೀವು ಸಂಪರ್ಕಗಳು ಅವುಗಳನ್ನು ಸೇರಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಪೋರ್ಟಲ್ ಗ್ರಾಹಕರಿಗೆ ಆಮಂತ್ರಿಸಲು ಸೇರಿಸಬಹುದು
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ನಿಮ್ಮ ಬಳಕೆದಾರರಿಗೆ ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಉಳಿದ ಸೇರಿಸಿ. ನೀವು ಸಂಪರ್ಕಗಳು ಅವುಗಳನ್ನು ಸೇರಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಪೋರ್ಟಲ್ ಗ್ರಾಹಕರಿಗೆ ಆಮಂತ್ರಿಸಲು ಸೇರಿಸಬಹುದು
 DocType: Stock Entry,Total Value Difference (Out - In),ಒಟ್ಟು ಮೌಲ್ಯ ವ್ಯತ್ಯಾಸ (ಔಟ್ - ರಲ್ಲಿ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4276,7 +4282,7 @@
 DocType: Item,Customer Code,ಗ್ರಾಹಕ ಕೋಡ್
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ಹುಟ್ಟುಹಬ್ಬದ ಜ್ಞಾಪನೆ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ದಿನಗಳಿಂದಲೂ ಕೊನೆಯ ಆರ್ಡರ್
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ಖಾತೆಗೆ ಡೆಬಿಟ್ ಬ್ಯಾಲೆನ್ಸ್ ಶೀಟ್ ಖಾತೆ ಇರಬೇಕು
 DocType: Buying Settings,Naming Series,ಸರಣಿ ಹೆಸರಿಸುವ
 DocType: Leave Block List,Leave Block List Name,ಖಂಡ ಬಿಡಿ ಹೆಸರು
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ವಿಮೆ ಪ್ರಾರಂಭ ದಿನಾಂಕ ವಿಮಾ ಅಂತಿಮ ದಿನಾಂಕ ಕಡಿಮೆ ಇರಬೇಕು
@@ -4291,9 +4297,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ಉದ್ಯೋಗಿ ಸಂಬಳ ಸ್ಲಿಪ್ {0} ಈಗಾಗಲೇ ಸಮಯ ಹಾಳೆ ದಾಖಲಿಸಿದವರು {1}
 DocType: Vehicle Log,Odometer,ದೂರಮಾಪಕ
 DocType: Sales Order Item,Ordered Qty,ಪ್ರಮಾಣ ಆದೇಶ
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ಐಟಂ {0} ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Stock Settings,Stock Frozen Upto,ಸ್ಟಾಕ್ ಘನೀಕೃತ ವರೆಗೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,ಬಿಒಎಮ್ ಯಾವುದೇ ಸ್ಟಾಕ್ ಐಟಂ ಹೊಂದಿಲ್ಲ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ಗೆ ಅವಧಿಯ ಮರುಕಳಿಸುವ ಕಡ್ಡಾಯವಾಗಿ ದಿನಾಂಕಗಳನ್ನು ಅವಧಿಯಲ್ಲಿ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ಪ್ರಾಜೆಕ್ಟ್ ಚಟುವಟಿಕೆ / ಕೆಲಸ .
 DocType: Vehicle Log,Refuelling Details,Refuelling ವಿವರಗಳು
@@ -4303,8 +4309,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,ಕೊನೆಯ ಖರೀದಿ ಕಂಡುಬಂದಿಲ್ಲ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ಪ್ರಮಾಣದ ಆಫ್ ಬರೆಯಿರಿ (ಕಂಪನಿ ಕರೆನ್ಸಿ)
 DocType: Sales Invoice Timesheet,Billing Hours,ಬಿಲ್ಲಿಂಗ್ ಅವರ್ಸ್
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,ಫಾರ್ {0} ಕಂಡುಬಂದಿಲ್ಲ ಡೀಫಾಲ್ಟ್ ಬಿಒಎಮ್
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ರೋ # {0}: ಮರುಕ್ರಮಗೊಳಿಸಿ ಪ್ರಮಾಣ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ಅವುಗಳನ್ನು ಇಲ್ಲಿ ಸೇರಿಸಲು ಐಟಂಗಳನ್ನು ಟ್ಯಾಪ್
 DocType: Fees,Program Enrollment,ಕಾರ್ಯಕ್ರಮದಲ್ಲಿ ನೋಂದಣಿ
 DocType: Landed Cost Voucher,Landed Cost Voucher,ಇಳಿಯಿತು ವೆಚ್ಚ ಚೀಟಿ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ಸೆಟ್ ದಯವಿಟ್ಟು {0}
@@ -4328,7 +4335,7 @@
 DocType: Maintenance Visit,Maintenance Date,ನಿರ್ವಹಣೆ ದಿನಾಂಕ
 DocType: Purchase Invoice Item,Rejected Serial No,ತಿರಸ್ಕರಿಸಲಾಗಿದೆ ಅನುಕ್ರಮ ಸಂಖ್ಯೆ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,ವರ್ಷದ ಆರಂಭದ ದಿನಾಂಕ ಅಥವಾ ಅಂತಿಮ ದಿನಾಂಕ {0} ಜೊತೆ ಅತಿಕ್ರಮಿಸುವ. ತಪ್ಪಿಸಲು ಕಂಪನಿ ಸೆಟ್ ಮಾಡಿ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},ಪ್ರಾರಂಭ ದಿನಾಂಕ ಐಟಂ ಅಂತಿಮ ದಿನಾಂಕವನ್ನು ಕಡಿಮೆ Shoulderstand {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 ##### 
 , ನಂತರ ಸ್ವಯಂಚಾಲಿತ ಕ್ರಮಸಂಖ್ಯೆ ಈ ಸರಣಿ ಮೇಲೆ ನಡೆಯಲಿದೆ. ನೀವು ಯಾವಾಗಲೂ ಸ್ಪಷ್ಟವಾಗಿ ಈ ಐಟಂ ಸೀರಿಯಲ್ ನಾವು ಬಗ್ಗೆ ಬಯಸಿದರೆ. ಈ ಜಾಗವನ್ನು ಖಾಲಿ ಬಿಡುತ್ತಾರೆ."
@@ -4406,7 +4413,6 @@
 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,ಅನೇಕ ಗುಂಪುಗಳಲ್ಲಿ ಐಟಂ ಅಡ್ಡ ಪಟ್ಟಿ
-DocType: Grade Interval,Grade Interval,ಗ್ರೇಡ್ ಇಂಟರ್ವಲ್
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ಹಣಕಾಸಿನ ವರ್ಷ ಪ್ರಾರಂಭ ದಿನಾಂಕ ಮತ್ತು ಹಣಕಾಸಿನ ವರ್ಷದ ಅಂತ್ಯ ದಿನಾಂಕ ಈಗಾಗಲೇ ವಿತ್ತೀಯ ವರ್ಷದಲ್ಲಿ ಸೆಟ್ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ಕ್ಲಿಯರೆನ್ಸ್ ದಿನಾಂಕ ಅಪ್ಡೇಟ್ಗೊಳಿಸಲಾಗಿದೆ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ಒಡೆದ ಬ್ಯಾಚ್
@@ -4453,14 +4459,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ನೀವು ಕೋರ್ಸ್ ಆಧಾರಿತ ಗುಂಪುಗಳನ್ನು ಮಾಡುವಾಗ ಬ್ಯಾಚ್ ಪರಿಗಣಿಸಲು ಬಯಸದಿದ್ದರೆ ಪರಿಶೀಲಿಸದೆ ಬಿಟ್ಟುಬಿಡಿ.
 DocType: Asset,Frequency of Depreciation (Months),ಸವಕಳಿ ಆವರ್ತನ (ತಿಂಗಳ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ಕ್ರೆಡಿಟ್ ಖಾತೆ
 DocType: Landed Cost Item,Landed Cost Item,ಇಳಿಯಿತು ವೆಚ್ಚ ಐಟಂ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ಶೂನ್ಯ ಮೌಲ್ಯಗಳು ತೋರಿಸಿ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ಕಚ್ಚಾ ವಸ್ತುಗಳ givenName ಪ್ರಮಾಣದಲ್ಲಿ repacking / ತಯಾರಿಕಾ ನಂತರ ಪಡೆದುಕೊಂಡು ಐಟಂ ಪ್ರಮಾಣ
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ಸೆಟಪ್ ನನ್ನ ಸಂಸ್ಥೆಗೆ ಒಂದು ಸರಳ ವೆಬ್ಸೈಟ್
 DocType: Payment Reconciliation,Receivable / Payable Account,ಸ್ವೀಕರಿಸುವಂತಹ / ಪಾವತಿಸಲಾಗುವುದು ಖಾತೆ
 DocType: Delivery Note Item,Against Sales Order Item,ಮಾರಾಟದ ಆರ್ಡರ್ ಐಟಂ ವಿರುದ್ಧ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ಗುಣಲಕ್ಷಣ ಮೌಲ್ಯ ಗುಣಲಕ್ಷಣ ಸೂಚಿಸಿ {0}
 DocType: Item,Default Warehouse,ಡೀಫಾಲ್ಟ್ ವೇರ್ಹೌಸ್
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ಬಜೆಟ್ ಗ್ರೂಪ್ ಖಾತೆ ವಿರುದ್ಧ ನಿಯೋಜಿಸಲಾಗುವುದು ಸಾಧ್ಯವಿಲ್ಲ {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ಮೂಲ ವೆಚ್ಚ ಸೆಂಟರ್ ನಮೂದಿಸಿ
@@ -4506,7 +4512,7 @@
 DocType: Opportunity Item,Basic Rate,ಮೂಲ ದರದ
 DocType: GL Entry,Credit Amount,ಕ್ರೆಡಿಟ್ ಪ್ರಮಾಣ
 DocType: Cheque Print Template,Signatory Position,ಸಹಿ ಪೊಸಿಷನ್
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ಲಾಸ್ಟ್ ಹೊಂದಿಸಿ
 DocType: Timesheet,Total Billable Hours,ಒಟ್ಟು ಬಿಲ್ ಮಾಡಬಹುದಾದ ಗಂಟೆಗಳ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ಪಾವತಿ ರಸೀತಿ ಗಮನಿಸಿ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ಈ ಗ್ರಾಹಕ ವಿರುದ್ಧ ವ್ಯವಹಾರ ಆಧರಿಸಿದೆ. ಮಾಹಿತಿಗಾಗಿ ಕೆಳಗೆ ಟೈಮ್ಲೈನ್ ನೋಡಿ
@@ -4520,11 +4526,11 @@
 ,Items To Be Requested,ಮನವಿ ಐಟಂಗಳನ್ನು
 DocType: Purchase Order,Get Last Purchase Rate,ಕೊನೆಯ ಖರೀದಿ ದರ ಸಿಗುತ್ತದೆ
 DocType: Company,Company Info,ಕಂಪನಿ ಮಾಹಿತಿ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,ಆಯ್ಕೆಮಾಡಿ ಅಥವಾ ಹೊಸ ಗ್ರಾಹಕ ಸೇರಿಸು
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,ವೆಚ್ಚದ ಕೇಂದ್ರವಾಗಿ ಒಂದು ಖರ್ಚು ಹಕ್ಕು ಕಾಯ್ದಿರಿಸಲು ಅಗತ್ಯವಿದೆ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ನಿಧಿಗಳು ಅಪ್ಲಿಕೇಶನ್ ( ಆಸ್ತಿಗಳು )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ಈ ನೌಕರರ ಹಾಜರಾತಿ ಆಧರಿಸಿದೆ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ಡೆಬಿಟ್ ಖಾತೆ
 DocType: Fiscal Year,Year Start Date,ವರ್ಷದ ಆರಂಭ ದಿನಾಂಕ
 DocType: Attendance,Employee Name,ನೌಕರರ ಹೆಸರು
 DocType: Sales Invoice,Rounded Total (Company Currency),ದುಂಡಾದ ಒಟ್ಟು ( ಕಂಪನಿ ಕರೆನ್ಸಿ )
@@ -4533,13 +4539,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ಕೆಳಗಿನ ದಿನಗಳಲ್ಲಿ ಲೀವ್ ಅಪ್ಲಿಕೇಶನ್ ಮಾಡುವ ಬಳಕೆದಾರರನ್ನು ನಿಲ್ಲಿಸಿ .
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ಖರೀದಿಯ ಮೊತ್ತ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ಸರಬರಾಜುದಾರ ಉದ್ಧರಣ {0} ದಾಖಲಿಸಿದವರು
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ಅಂತ್ಯ ವರ್ಷ ಪ್ರಾರಂಭ ವರ್ಷ ಮೊದಲು ಸಾಧ್ಯವಿಲ್ಲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ಉದ್ಯೋಗಿ ಸೌಲಭ್ಯಗಳು
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ದಯವಿಟ್ಟು ಡೀಫಾಲ್ಟ್ ನೌಕರರ ಹಾಲಿಡೇ ಪಟ್ಟಿ ಸೆಟ್ {0} ಅಥವಾ ಕಂಪನಿ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ಮಾಡುವುದಿಲ್ಲ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ಗ್ರಾಹಕರು ಬೆಳೆದ ಬಿಲ್ಲುಗಳನ್ನು .
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ಪ್ರಾಜೆಕ್ಟ್ ಐಡಿ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ರೋ ಯಾವುದೇ {0}: ಪ್ರಮಾಣ ಖರ್ಚು ಹಕ್ಕು {1} ವಿರುದ್ಧ ಪ್ರಮಾಣ ಬಾಕಿ ಹೆಚ್ಚು ಸಾಧ್ಯವಿಲ್ಲ. ಬಾಕಿ ಪ್ರಮಾಣ {2}
@@ -4548,15 +4554,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 ಓದುವಿಕೆ
 ,Hub,ಹಬ್
 DocType: GL Entry,Voucher Type,ಚೀಟಿ ಪ್ರಕಾರ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,ದರ ಪಟ್ಟಿ ಕಂಡುಬಂದಿಲ್ಲ ಅಥವಾ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ
 DocType: Employee Loan Application,Approved,Approved
 DocType: Pricing Rule,Price,ಬೆಲೆ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ಮೇಲೆ ಬಿಡುಗಡೆ ನೌಕರರ ' ಎಡ ' ಹೊಂದಿಸಿ
 DocType: Guardian,Guardian,ಗಾರ್ಡಿಯನ್
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ಅಪ್ರೇಸಲ್ {0} ನೌಕರ ದಾಖಲಿಸಿದವರು {1} givenName ದಿನಾಂಕ ವ್ಯಾಪ್ತಿಯಲ್ಲಿ
 DocType: Employee,Education,ಶಿಕ್ಷಣ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ಡೆಲ್
 DocType: Selling Settings,Campaign Naming By,ಅಭಿಯಾನ ಹೆಸರಿಸುವ
 DocType: Employee,Current Address Is,ಪ್ರಸ್ತುತ ವಿಳಾಸ ಈಸ್
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ಮಾರ್ಪಡಿಸಿದ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ಐಚ್ಛಿಕ. ನಿರ್ದಿಷ್ಟಪಡಿಸಿದ ಅಲ್ಲ, ಕಂಪನಿಯ ಡೀಫಾಲ್ಟ್ ಕರೆನ್ಸಿ ಹೊಂದಿಸುತ್ತದೆ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,ಲೆಕ್ಕಪರಿಶೋಧಕ ಜರ್ನಲ್ ನಮೂದುಗಳು .
 DocType: Delivery Note Item,Available Qty at From Warehouse,ಗೋದಾಮಿನ ಲಭ್ಯವಿದೆ ಪ್ರಮಾಣ
@@ -4565,7 +4573,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ಸಾಲು {0}: ಪಕ್ಷದ / ಖಾತೆ ಹೊಂದಿಕೆಯಾಗುವುದಿಲ್ಲ {1} / {2} ನಲ್ಲಿ {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ವೆಚ್ಚದಲ್ಲಿ ಖಾತೆಯನ್ನು ನಮೂದಿಸಿ
 DocType: Account,Stock,ಸ್ಟಾಕ್
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ರೋ # {0}: ರೆಫರೆನ್ಸ್ ಡಾಕ್ಯುಮೆಂಟ್ ಕೌಟುಂಬಿಕತೆ ಆರ್ಡರ್ ಖರೀದಿಸಿ ಒಂದು, ಖರೀದಿ ಸರಕುಪಟ್ಟಿ ಅಥವಾ ಜರ್ನಲ್ ಎಂಟ್ರಿ ಇರಬೇಕು"
 DocType: Employee,Current Address,ಪ್ರಸ್ತುತ ವಿಳಾಸ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ನಿಗದಿಸಬಹುದು ಹೊರತು ಐಟಂ ನಂತರ ವಿವರಣೆ, ಇಮೇಜ್, ಬೆಲೆ, ತೆರಿಗೆ ಟೆಂಪ್ಲೇಟ್ ಸೆಟ್ ಮಾಡಲಾಗುತ್ತದೆ ಇತ್ಯಾದಿ ಮತ್ತೊಂದು ಐಟಂ ಒಂದು ಭೇದ ವೇಳೆ"
 DocType: Serial No,Purchase / Manufacture Details,ಖರೀದಿ / ತಯಾರಿಕೆ ವಿವರಗಳು
@@ -4593,7 +4601,7 @@
 DocType: Hub Settings,Hub Settings,ಹಬ್ ಸೆಟ್ಟಿಂಗ್ಗಳು
 DocType: Project,Gross Margin %,ಒಟ್ಟು ಅಂಚು %
 DocType: BOM,With Operations,ಕಾರ್ಯಾಚರಣೆ
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,ಲೆಕ್ಕಪರಿಶೋಧಕ ನಮೂದುಗಳನ್ನು ಈಗಾಗಲೇ ಕರೆನ್ಸಿ ಮಾಡಲಾಗಿದೆ {0} ಕಂಪನಿಗೆ {1}. ಕರೆನ್ಸಿಯ ಜತೆ ಸ್ವೀಕೃತಿ ಅಥವಾ ಕೊಡಬೇಕಾದ ಖಾತೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ {0}.
 DocType: Asset,Is Existing Asset,ಆಸ್ತಿ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ ಇದೆ
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
 DocType: Salary Detail,Statistical Component,ಸ್ಟ್ಯಾಟಿಸ್ಟಿಕಲ್ ಕಾಂಪೊನೆಂಟ್
@@ -4618,7 +4626,7 @@
 DocType: Assessment Plan,Room,ಕೊಠಡಿ
 DocType: Purchase Order,Advance Paid,ಅಡ್ವಾನ್ಸ್ ಪಾವತಿಸಿದ
 DocType: Item,Item Tax,ಐಟಂ ತೆರಿಗೆ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,ಸರಬರಾಜುದಾರ ವಸ್ತು
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ಅಬಕಾರಿ ಸರಕುಪಟ್ಟಿ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ಟ್ರೆಶ್ಹೋಲ್ಡ್ {0}% ಹೆಚ್ಚು ಬಾರಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತದೆ
 DocType: Expense Claim,Employees Email Id,ನೌಕರರು ಇಮೇಲ್ ಐಡಿ
@@ -4649,9 +4657,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ಲೋಗೋ ಲಗತ್ತಿಸಿ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ಸ್ಟಾಕ್ ಲೆವೆಲ್ಸ್
 DocType: Customer,Commission Rate,ಕಮಿಷನ್ ದರ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ಭಿನ್ನ ಮಾಡಿ
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ಭಿನ್ನ ಮಾಡಿ
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ಇಲಾಖೆ ರಜೆ ಅನ್ವಯಗಳನ್ನು ನಿರ್ಬಂಧಿಸಿ .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","ಪಾವತಿ ಕೌಟುಂಬಿಕತೆ, ಸ್ವೀಕರಿಸಿ ಒಂದು ಇರಬೇಕು ಪೇ ಮತ್ತು ಆಂತರಿಕ ಟ್ರಾನ್ಸ್ಫರ್"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ಅನಾಲಿಟಿಕ್ಸ್
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ಕಾರ್ಟ್ ಖಾಲಿಯಾಗಿದೆ
 DocType: Vehicle,Model,ಮಾದರಿ
@@ -4662,6 +4670,7 @@
 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 +161,Capital Stock,ಬಂಡವಾಳ
+DocType: Shopping Cart Settings,Show Public Attachments,ಸಾರ್ವಜನಿಕ ಲಗತ್ತುಗಳು ತೋರಿಸಿ
 DocType: Packing Slip,Package Weight Details,ಪ್ಯಾಕೇಜ್ ತೂಕ ವಿವರಗಳು
 DocType: Payment Gateway Account,Payment Gateway Account,ಪಾವತಿ ಗೇಟ್ವೇ ಖಾತೆ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ಪಾವತಿ ನಂತರ ಆಯ್ಕೆ ಪುಟ ಬಳಕೆದಾರ ಮರುನಿರ್ದೇಶನ.
@@ -4680,15 +4689,15 @@
 DocType: Batch,Expiry Date,ಅಂತ್ಯ ದಿನಾಂಕ
 ,Supplier Addresses and Contacts,ಸರಬರಾಜುದಾರ ವಿಳಾಸಗಳು ಮತ್ತು ಸಂಪರ್ಕಗಳು
 ,accounts-browser,ಖಾತೆಗಳನ್ನು ಬ್ರೌಸರ್
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,ಮೊದಲ ವರ್ಗ ಆಯ್ಕೆ ಮಾಡಿ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ಪ್ರಾಜೆಕ್ಟ್ ಮಾಸ್ಟರ್ .
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ಮೇಲೆ-ಬಿಲ್ಲಿಂಗ್ ಅಥವಾ ಅತಿ ಆದೇಶ ಅವಕಾಶ, ನವೀಕರಿಸಿ &quot;ಸೇವನೆ&quot; ಸ್ಟಾಕ್ ಸೆಟ್ಟಿಂಗ್ಗಳು ಅಥವಾ ಅಂಶದಲ್ಲಿ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ಮುಂದಿನ ಕರೆನ್ಸಿಗಳ $ ಇತ್ಯಾದಿ ಯಾವುದೇ ಸಂಕೇತ ತೋರಿಸುವುದಿಲ್ಲ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ಅರ್ಧ ದಿನ)
 DocType: Supplier,Credit Days,ಕ್ರೆಡಿಟ್ ಡೇಸ್
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ವಿದ್ಯಾರ್ಥಿ ಬ್ಯಾಚ್ ಮಾಡಿ
 DocType: Leave Type,Is Carry Forward,ಮುಂದಕ್ಕೆ ಸಾಗಿಸುವ ಇದೆ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM ಐಟಂಗಳು ಪಡೆಯಿರಿ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ಟೈಮ್ ಡೇಸ್ ಲೀಡ್
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ರೋ # {0}: ಪೋಸ್ಟಿಂಗ್ ದಿನಾಂಕ ಖರೀದಿ ದಿನಾಂಕ ಅದೇ ಇರಬೇಕು {1} ಸ್ವತ್ತಿನ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ದಯವಿಟ್ಟು ಮೇಲಿನ ಕೋಷ್ಟಕದಲ್ಲಿ ಮಾರಾಟದ ಆರ್ಡರ್ಸ್ ನಮೂದಿಸಿ
@@ -4705,8 +4714,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ಮಂಜೂರಾದ ಹಣದಲ್ಲಿ
 DocType: GL Entry,Is Opening,ಆರಂಭ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ಸಾಲು {0}: ಡೆಬಿಟ್ ಪ್ರವೇಶ ಸಂಬಂಧ ಸಾಧ್ಯವಿಲ್ಲ ಒಂದು {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ಸೆಟಪ್ ಸೆಟಪ್ ಮೂಲಕ ಅಟೆಂಡೆನ್ಸ್ ಕ್ರಮಾಂಕಗಳನ್ನು ದಯವಿಟ್ಟು ಸರಣಿ&gt; ನಂಬರಿಂಗ್ ಸರಣಿ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 093cc1a..e580528 100644
--- a/erpnext/translations/ko.csv
+++ b/erpnext/translations/ko.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,대여
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,사용자에 대한 적용
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","중지 생산 주문이 취소 될 수 없으며, 취소 먼저 ...의 마개를 따다"
 DocType: Vehicle Service,Mileage,사용량
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,당신은 정말이 자산을 스크랩 하시겠습니까?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,선택 기본 공급 업체
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,선택 기본 공급 업체
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},환율은 가격 목록에 필요한 {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* 트랜잭션에서 계산됩니다.
 DocType: Purchase Order,Customer Contact,고객 연락처
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),뛰어난 {0}보다 작을 수 없습니다에 대한 ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 분을 기본
 DocType: Leave Type,Leave Type Name,유형 이름을 남겨주세요
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,오픈보기
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,오픈보기
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,시리즈가 업데이트
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,점검
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural 분개가 제출
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,일괄 상품 만료 상태
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,은행 어음
 DocType: Mode of Payment Account,Mode of Payment Account,지불 계정의 모드
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,쇼 변형
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,쇼 변형
 DocType: Academic Term,Academic Term,학술 용어
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,자료
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,수량
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,수량
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,계정 테이블은 비워 둘 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),대출 (부채)
 DocType: Employee Education,Year of Passing,전달의 해
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",참조 : % s의 상품 코드 : % s 및 고객 %의
 DocType: Item,Country of Origin,원산지
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,재고 있음
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,알려진 문제
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,건강 관리
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),지급 지연 (일)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,서비스 비용
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,송장
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},일련 번호 : {0}은 (는) 판매 송장에서 이미 참조되었습니다. {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,송장
 DocType: Maintenance Schedule Item,Periodicity,주기성
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,회계 연도는 {0} 필요
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,예상 배달 날짜는 판매 주문 날짜 전에 할 수있다
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","두 개의 열, 이전 이름에 대해 하나의 새로운 이름을 하나 .CSV 파일 첨부"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}하지 활성 회계 연도한다.
 DocType: Packed Item,Parent Detail docname,부모 상세 docName 같은
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","참조 : {0}, 상품 코드 : {1} 및 고객 : {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,KG
 DocType: Student Log,Log,기록
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,작업에 대한 열기.
 DocType: Item Attribute,Increment,증가
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,창고를 선택합니다 ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,창고를 선택합니다 ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,광고
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,같은 회사가 두 번 이상 입력
 DocType: Employee,Married,결혼 한
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},허용되지 {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,에서 항목을 가져 오기
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},허용되지 {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,에서 항목을 가져 오기
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},스톡 배달 주에 업데이트 할 수 없습니다 {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},제품 {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,나열된 항목이 없습니다.
 DocType: Payment Reconciliation,Reconcile,조정
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,식료품 점
 DocType: Quality Inspection Reading,Reading 1,읽기 1
 DocType: Process Payroll,Make Bank Entry,은행 입장 확인
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,연금 펀드
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,다음 감가 상각 날짜는 구매 날짜 이전 될 수 없습니다
 DocType: SMS Center,All Sales Person,모든 판매 사람
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** 월간 배포 ** 당신이 당신의 사업에 계절성이있는 경우는 개월에 걸쳐 예산 / 대상을 배포하는 데 도움이됩니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,항목을 찾을 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,항목을 찾을 수 없습니다
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,급여 구조 누락
 DocType: Lead,Person Name,사람 이름
 DocType: Sales Invoice Item,Sales Invoice Item,판매 송장 상품
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","예를 들어, &quot;초등 학교&quot;또는 &quot;대학&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,재고 보고서
 DocType: Warehouse,Warehouse Detail,창고 세부 정보
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},신용 한도는 고객에 대한 교차 된 {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,계약 기간 종료 날짜 나중에 용어가 연결되는 학술 올해의 연말 날짜 초과 할 수 없습니다 (학년 {}). 날짜를 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","자산 레코드 항목에 대해 존재하는, 선택 해제 할 수 없습니다 &quot;고정 자산&quot;"
 DocType: Vehicle Service,Brake Oil,브레이크 오일
 DocType: Tax Rule,Tax Type,세금의 종류
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},당신은 전에 항목을 추가하거나 업데이트 할 수있는 권한이 없습니다 {0}
 DocType: BOM,Item Image (if not slideshow),상품의 이미지 (그렇지 않으면 슬라이드 쇼)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,고객은 같은 이름을 가진
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(시간  / 60) * 실제 작업 시간
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,선택 BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,선택 BOM
 DocType: SMS Log,SMS Log,SMS 로그
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,배달 항목의 비용
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0}의 휴가 날짜부터 현재까지 사이 아니다
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,학교
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},직원에 대한 검색 휴가를 기록하지 {0}의 {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,첫 번째 회사를 입력하십시오
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,처음 회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,총 비용
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,청구 금액
 DocType: Employee,Mr,씨
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer 그룹 테이블에서 발견 중복 된 고객 그룹
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,공급 업체 유형 / 공급 업체
 DocType: Naming Series,Prefix,접두사
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,소모품
 DocType: Employee,B-,비-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,학년
 DocType: Sales Invoice Item,Delivered By Supplier,공급 업체에 의해 전달
 DocType: SMS Center,All Contact,모든 연락처
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,생산 주문이 이미 BOM 모든 항목에 대해 작성
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,연봉
 DocType: Daily Work Summary,Daily Work Summary,매일 작업 요약
 DocType: Period Closing Voucher,Closing Fiscal Year,회계 연도 결산
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} 냉동입니다
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} 냉동입니다
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,계정의 차트를 만드는 기존 회사를 선택하세요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,재고 비용
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,대상 창고 선택
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,콘트라 항목
 DocType: Journal Entry Account,Credit in Company Currency,회사 통화 신용
 DocType: Delivery Note,Installation Status,설치 상태
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",당신은 출석을 업데이트 하시겠습니까? <br> 현재 : {0} \ <br> 부재 {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},수락 + 거부 수량이 항목에 대한 수신 수량이 동일해야합니다 {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,공급 원료 구매
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,결제 적어도 하나의 모드는 POS 송장이 필요합니다.
 DocType: Products Settings,Show Products as a List,제품 표시 목록으로
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", 템플릿을 다운로드 적절한 데이터를 입력하고 수정 된 파일을 첨부합니다.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,감가 상각 항목 확인
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,요청 유형
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,직원을
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,직원을
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,방송
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,실행
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,작업의 세부 사항은 실시.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,유지 보수 방문을 계획합니다.
 DocType: SMS Settings,Enter url parameter for message,메시지의 URL 매개 변수를 입력
 DocType: POS Profile,Customer Groups,고객 그룹
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,재무 제표
 DocType: Guardian,Students,재학생
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,가격 및 할인을 적용하기위한 규칙.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,가격리스트는 구매 또는 판매에 적용해야합니다
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},사전 금액보다 클 수 없습니다 {0} {1}
 DocType: Naming Series,Series List for this Transaction,이 트랜잭션에 대한 시리즈 일람
 DocType: Company,Default Payroll Payable Account,기본 급여 지급 계정
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,업데이트 이메일 그룹
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,업데이트 이메일 그룹
 DocType: Sales Invoice,Is Opening Entry,개시 항목
 DocType: Customer Group,Mention if non-standard receivable account applicable,표준이 아닌 채권 계정 (해당되는 경우)
 DocType: Course Schedule,Instructor Name,강사 이름
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,창고가 필요한 내용은 이전에 제출
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,리셀러
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","이 옵션이 선택되면, 자재 요청에 재고 항목이 포함됩니다."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,견적서 항목에 대하여
 ,Production Orders in Progress,진행 중 생산 주문
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Financing의 순 현금
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","로컬 저장이 가득, 저장하지 않은"
 DocType: Lead,Address & Contact,주소 및 연락처
 DocType: Leave Allocation,Add unused leaves from previous allocations,이전 할당에서 사용하지 않는 잎 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},다음 반복 {0} 생성됩니다 {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(시간 시트를 통해) 총 원가 계산 금액
 DocType: Item Website Specification,Item Website Specification,항목 웹 사이트 사양
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,남겨 차단
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,은행 입장
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},항목 {0}에 수명이 다한 {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,은행 입장
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,연간
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,재고 조정 항목
 DocType: Stock Entry,Sales Invoice No,판매 송장 번호
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,허브에 게시
 DocType: Student Admission,Student Admission,학생 입학
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} 항목 취소
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,자료 요청
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} 항목 취소
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,자료 요청
 DocType: Bank Reconciliation,Update Clearance Date,업데이트 통관 날짜
 DocType: Item,Purchase Details,구매 상세 정보
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},구매 주문에 &#39;원료 공급&#39;테이블에없는 항목 {0} {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,뛰어난 수표 및 취소 예금
 DocType: Item,Synced With Hub,허브와 동기화
 DocType: Vehicle,Fleet Manager,함대 관리자
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},행 번호 {0} : {1} 항목에 대한 음수가 될 수 없습니다 {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,잘못된 비밀번호
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},행 번호 {0} : {1} 항목에 대한 음수가 될 수 없습니다 {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,잘못된 비밀번호
 DocType: Item,Variant Of,의 변형
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',보다 '수량 제조하는'완료 수량은 클 수 없습니다
 DocType: Period Closing Voucher,Closing Account Head,마감 계정 헤드
 DocType: Employee,External Work History,외부 작업의 역사
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,순환 참조 오류
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,자동 자료 요청의 생성에 이메일로 통보
 DocType: Journal Entry,Multi Currency,멀티 통화
 DocType: Payment Reconciliation Invoice,Invoice Type,송장 유형
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,상품 수령증
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,상품 수령증
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,세금 설정
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,판매 자산의 비용
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,당신이 그것을 끌어 후 결제 항목이 수정되었습니다.다시 당깁니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
-DocType: Grade Interval,Min Score,최소 점수
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} 항목의 세금에 두 번 입력
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,이번 주 보류중인 활동에 대한 요약
 DocType: Student Applicant,Admitted,인정
 DocType: Workstation,Rent Cost,임대 비용
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,주문 금액
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,자에 대하여 또는 내부 전송을위한 은행 / 현금 거래
 DocType: Shipping Rule,Valid for Countries,나라 유효한
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,이 항목은 템플릿과 거래에 사용할 수 없습니다.'카피'가 설정되어 있지 않는 항목 속성은 변형에 복사합니다
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,고려 총 주문
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","직원 지정 (예 : CEO, 이사 등)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,필드 값을 '이달의 날 반복'을 입력하십시오
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},행 # {0} : 구매 송장 기존 자산에 대해 할 수 없습니다 {1}
 DocType: Item Tax,Tax Rate,세율
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} 이미 직원에 할당 {1}에 기간 {2}에 대한 {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,항목 선택
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,항목 선택
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,구매 송장 {0}이 (가) 이미 제출
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},행 번호 {0} : 일괄 없음은 동일해야합니다 {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,비 그룹으로 변환
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,항목의 일괄처리 (lot).
 DocType: C-Form Invoice Detail,Invoice Date,송장의 날짜
 DocType: GL Entry,Debit Amount,직불 금액
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},만에 회사 당 1 계정이있을 수 있습니다 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,첨부 파일을 참조하시기 바랍니다
 DocType: Purchase Order,% Received,% 수신
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,학생 그룹 만들기
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,견적 요청
 DocType: Salary Slip Timesheet,Working Hours,근무 시간
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,기존 시리즈의 시작 / 현재의 순서 번호를 변경합니다.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,새로운 고객을 만들기
-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.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,구매 오더를 생성
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,새로운 고객을 만들기
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","여러 가격의 규칙이 우선 계속되면, 사용자는 충돌을 해결하기 위해 수동으로 우선 순위를 설정하라는 메시지가 표시됩니다."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,구매 오더를 생성
 ,Purchase Register,회원에게 구매
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,적용 요금
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 역할이 있어야합니다 '휴가 승인'
 DocType: Purchase Receipt,Vehicle Date,차량 날짜
 DocType: Student Log,Medical,의료
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,잃는 이유
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,잃는 이유
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,리드 소유자는 납과 동일 할 수 없습니다
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,할당 된 금액은 조정되지 않은 금액보다 큰 수
 DocType: Announcement,Receiver,리시버
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,수량 및 평가
 DocType: Delivery Note,% Installed,% 설치
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,교실 / 강의는 예약 할 수 있습니다 연구소 등.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,첫 번째 회사 이름을 입력하십시오
 DocType: Purchase Invoice,Supplier Name,공급 업체 이름
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext 설명서를 읽어
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,필수 입력란 - Academic Year
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,필수 입력란 - Academic Year
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,해당 이메일의 일부로가는 소개 텍스트를 사용자 정의 할 수 있습니다.각 트랜잭션은 별도의 소개 텍스트가 있습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},회사 {0}에 대한 기본 지불 계정을 설정하십시오.
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,모든 제조 공정에 대한 글로벌 설정.
 DocType: Accounts Settings,Accounts Frozen Upto,까지에게 동결계정
 DocType: SMS Log,Sent On,에 전송
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,속성 {0} 속성 테이블에서 여러 번 선택
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,적용 할 수 없음
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,휴일 마스터.
 DocType: Request for Quotation Item,Required Date,필요한 날짜
 DocType: Delivery Note,Billing Address,청구 주소
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,상품 코드를 입력 해 주시기 바랍니다.
 DocType: BOM,Costing,원가 계산
 DocType: Tax Rule,Billing County,결제 카운티
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",선택하면 이미 인쇄 속도 / 인쇄 금액에 포함되어있는 세액은 간주됩니다
@@ -508,6 +512,7 @@
 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,증권 및 예치금
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",자체 평가 방법이없는 일부 품목에 대한 거래가 있기 때문에 평가 방법을 변경할 수 없습니다.
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,할당 된 총 잎은 필수입니다
 DocType: Job Opening,Description of a Job Opening,구인에 대한 설명
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,오늘 보류 활동
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,코스를 선택하십시오
 DocType: Timesheet Detail,Hrs,시간
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,회사를 선택하세요
 DocType: Stock Entry Detail,Difference Account,차이 계정
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,종속 작업 {0}이 닫혀 있지 가까운 작업을 할 수 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,자료 요청이 발생합니다있는 창고를 입력 해주십시오
 DocType: Production Order,Additional Operating Cost,추가 운영 비용
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,화장품
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",병합하려면 다음과 같은 속성이 두 항목에 대해 동일해야합니다
 DocType: Shipping Rule,Net Weight,순중량
 DocType: Employee,Emergency Phone,긴급 전화
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,사다
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,임계 값 0 %의 등급을 정의하십시오.
 DocType: Sales Order,To Deliver,전달하기
 DocType: Purchase Invoice Item,Item,항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,일련 번호 항목 일부가 될 수 없습니다
 DocType: Journal Entry,Difference (Dr - Cr),차이 (박사 - 크롬)
 DocType: Account,Profit and Loss,이익과 손실
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,관리 하도급
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,증가는 0이 될 수 없습니다
 DocType: Production Planning Tool,Material Requirement,자료 요구
 DocType: Company,Delete Company Transactions,회사 거래 삭제
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,참조 번호 및 참조 날짜는 은행 거래를위한 필수입니다
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,세금과 요금 추가/편집
 DocType: Purchase Invoice,Supplier Invoice No,공급 업체 송장 번호
 DocType: Territory,For reference,참고로
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,설치 노트 항목
 DocType: Production Plan Item,Pending Qty,보류 수량
 DocType: Budget,Ignore,무시
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} 활성화되지 않습니다
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} 활성화되지 않습니다
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS는 다음 번호로 전송 : {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,인쇄 설정 확인 치수
 DocType: Salary Slip,Salary Slip Timesheet,급여 슬립 표
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,전체위원회
 DocType: Pricing Rule,Sales Partner,영업 파트너
 DocType: Buying Settings,Purchase Receipt Required,필수 구입 영수증
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,열기 재고 입력 한 경우 평가 비율은 필수입니다
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,송장 테이블에있는 레코드 없음
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,첫번째 회사와 파티 유형을 선택하세요
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,금융 / 회계 연도.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,누적 값
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","죄송합니다, 시리얼 NOS는 병합 할 수 없습니다"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,확인 판매 주문
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,확인 판매 주문
 DocType: Project Task,Project Task,프로젝트 작업
 ,Lead Id,리드 아이디
 DocType: C-Form Invoice Detail,Grand Total,총 합계
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,이력서 첨부
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,반복 고객
 DocType: Leave Control Panel,Allocate,할당
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,판매로 돌아 가기
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,판매로 돌아 가기
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,참고 : 총 할당 잎 {0} 이미 승인 나뭇잎 이상이어야한다 {1} 기간 동안
 DocType: Announcement,Posted By,에 의해 게시 됨
 DocType: Item,Delivered by Supplier (Drop Ship),공급 업체에 의해 전달 (드롭 선박)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,에 견적
 DocType: Lead,Middle Income,중간 소득
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),오프닝 (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,할당 된 금액은 음수 일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,회사를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,회사를 설정하십시오.
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,판매 송장 표
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},참조 번호 및 참고 날짜가 필요합니다 {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,선택 결제 계좌는 은행 항목을 만들려면
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","잎, 비용 청구 및 급여를 관리하는 직원 레코드를 작성"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,기술 자료 추가
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,제안서 작성
 DocType: Payment Entry Deduction,Payment Entry Deduction,결제 항목 공제
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}'하지 회계 연도에 {2}
 DocType: Buying Settings,Settings for Buying Module,모듈 구매에 대한 설정
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},자산 {0} 회사에 속하지 않는 {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,첫 구매 영수증을 입력하세요
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","그런 가격 설정 규칙은 고객에 따라 필터링됩니다, 고객 그룹, 지역, 공급 업체, 공급 업체 유형, 캠페인, 판매 파트너 등"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,재고의 순 변화
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,직원 대출 관리
 DocType: Employee,Passport Number,여권 번호
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2와의 관계
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,관리자
 DocType: Payment Entry,Payment From / To,/에서로 지불
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,날짜 범위
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},새로운 신용 한도는 고객의 현재 뛰어난 양 미만이다. 신용 한도이어야 수있다 {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'Based On'과  'Group By'는 달라야 합니다.
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,분에서
 DocType: Issue,Resolution Date,결의일
 DocType: Student Batch Name,Batch Name,배치 이름
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,작업 표 작성 :
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,작업 표 작성 :
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},지불 모드로 기본 현금 또는 은행 계정을 설정하십시오 {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,싸다
 DocType: Selling Settings,Customer Naming By,고객 이름 지정으로
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,학생 월별 출석 보고서에서와 같이 현재 학생을 보여줍니다
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,실제 시작 시간
 DocType: BOM Operation,Operation Time,운영 시간
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,끝
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,베이스
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,베이스
 DocType: Timesheet,Total Billed Hours,총 청구 시간
 DocType: Journal Entry,Write Off Amount,금액을 상각
 DocType: Journal Entry,Bill No,청구 번호
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,학생의 출석
 DocType: Sales Invoice Timesheet,Time Sheet,시간 시트
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,백 플러시 원료 기반에
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,항목의 세부 사항을 입력하십시오
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,항목의 세부 사항을 입력하십시오
 DocType: Interest,Interest,관심
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,사전 판매
 DocType: Purchase Receipt,Other Details,기타 세부 사항
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,결제 항목이 이미 생성
 DocType: Purchase Receipt Item Supplied,Current Stock,현재 재고
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},행 번호는 {0} : {1} 자산이 항목에 연결되지 않는 {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,미리보기 연봉 슬립
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,미리보기 연봉 슬립
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,계정 {0} 여러 번 입력 된
 DocType: Account,Expenses Included In Valuation,비용은 평가에 포함
 DocType: Hub Settings,Seller City,판매자 도시
 ,Absent Student Report,결석 한 학생 보고서
 DocType: Email Digest,Next email will be sent on:,다음 이메일에 전송됩니다 :
 DocType: Offer Letter Term,Offer Letter Term,편지 기간을 제공
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,항목 변종이있다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,항목 변종이있다.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,{0} 항목을 찾을 수 없습니다
 DocType: Bin,Stock Value,재고 가치
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,회사 {0} 존재하지 않습니다
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,나무의 종류
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,나무의 종류
 DocType: BOM Explosion Item,Qty Consumed Per Unit,수량 단위 시간당 소비
 DocType: Serial No,Warranty Expiry Date,보증 유효 기간
 DocType: Material Request Item,Quantity and Warehouse,수량 및 창고
 DocType: Sales Invoice,Commission Rate (%),위원회 비율 (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,프로그램을 선택하십시오.
 DocType: Project,Estimated Cost,예상 비용
@@ -768,7 +770,7 @@
 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,기본 계정
 DocType: Payment Entry,Received Amount (Company Currency),받은 금액 (회사 통화)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,기회고객을 리드고객으로 만든 경우 리드고객를 설정해야합니다
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,매주 오프 날짜를 선택하세요
 DocType: Production Order Operation,Planned End Time,계획 종료 시간
 ,Sales Person Target Variance Item Group-Wise,영업 사원 대상 분산 상품 그룹 와이즈
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,기회에서
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,월급의 문.
 DocType: BOM,Website Specifications,웹 사이트 사양
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}에서 {0} 유형의 {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,행 {0} : 변환 계수는 필수입니다
@@ -837,6 +840,7 @@
 DocType: Employee,Bank A/C No.,은행 A / C 번호
 DocType: Bank Guarantee,Project,프로젝트
 DocType: Quality Inspection Reading,Reading 7,7 읽기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,부분적으로 정렬
 DocType: Expense Claim Detail,Expense Claim Type,비용 청구 유형
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,쇼핑 카트에 대한 기본 설정
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},분개를 통해 폐기 자산 {0}
@@ -844,14 +848,14 @@
 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 +107,Office Maintenance Expenses,사무실 유지 비용
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,이메일 계정 설정
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,첫 번째 항목을 입력하십시오
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,첫 번째 항목을 입력하십시오
 DocType: Account,Liability,부채
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,제재 금액 행에 청구 금액보다 클 수 없습니다 {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,가격 목록을 선택하지
 DocType: Employee,Family Background,가족 배경
 DocType: Request for Quotation Supplier,Send Email,이메일 보내기
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},경고 : 잘못된 첨부 파일 {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,아무 권한이 없습니다
 DocType: Company,Default Bank Account,기본 은행 계좌
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",파티를 기반으로 필터링하려면 선택 파티 첫 번째 유형
@@ -864,8 +868,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,검색된 직원이 없습니다
 DocType: Supplier Quotation,Stopped,중지
 DocType: Item,If subcontracted to a vendor,공급 업체에 하청하는 경우
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,학생 그룹이 이미 업데이트되었습니다.
 DocType: SMS Center,All Customer Contact,모든 고객에게 연락
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV를 통해 재고의 균형을 업로드 할 수 있습니다.
 DocType: Warehouse,Tree Details,트리 세부 사항
@@ -876,8 +880,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,최소 송장 금액
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1} : 코스트 센터 {2} 회사에 속하지 않는 {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} 계정 {2} 그룹이 될 수 없습니다
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,항목 행 {IDX} {문서 타입} {DOCNAME} 위에 존재하지 않는 &#39;{문서 타입}&#39;테이블
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,표 {0} 이미 완료 또는 취소
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,어떤 작업을하지
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","자동 청구서는 05, 28 등의 예를 들어 생성되는 달의 날"
 DocType: Asset,Opening Accumulated Depreciation,감가 상각 누계액 열기
@@ -893,7 +897,7 @@
 DocType: Bin,Moving Average Rate,이동 평균 속도
 DocType: Production Planning Tool,Select Items,항목 선택
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} 빌에 대해 {1} 일자 {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,코스 일정
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,코스 일정
 DocType: Maintenance Visit,Completion Status,완료 상태
 DocType: HR Settings,Enter retirement age in years,년에 은퇴 연령을 입력
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,목표웨어 하우스
@@ -901,7 +905,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,이 퍼센트 개까지 배달 또는 영수증을 통해 허용
 DocType: Stock Entry,STE-,스테
 DocType: Upload Attendance,Import Attendance,수입 출석
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,모든 상품 그룹
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,모든 상품 그룹
 DocType: Process Payroll,Activity Log,활동 로그
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,당기 순이익 / 손실
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,자동 거래의 제출에 메시지를 작성합니다.
@@ -912,7 +916,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,지불하기 위해 구매
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,수량을 예상
 DocType: Sales Invoice,Payment Due Date,지불 기한
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,항목 변형 {0} 이미 동일한 속성을 가진 존재
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;열기&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,수행하려면 열기
 DocType: Notification Control,Delivery Note Message,납품서 메시지
@@ -928,7 +932,7 @@
 DocType: Item Reorder,Re-Order Qty,다시 주문 수량
 DocType: Leave Block List Date,Leave Block List Date,차단 목록 날짜를 남겨
 DocType: Pricing Rule,Price or Discount,가격 또는 할인
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,구매 영수증 항목 테이블에 전체 적용 요금은 총 세금 및 요금과 동일해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,구매 영수증 항목 테이블에 전체 적용 요금은 총 세금 및 요금과 동일해야합니다
 DocType: Sales Team,Incentives,장려책
 DocType: SMS Log,Requested Numbers,신청 번호
 DocType: Production Planning Tool,Only Obtain Raw Materials,만 원료를 얻
@@ -957,13 +961,13 @@
 DocType: Supplier Quotation,Is Subcontracted,하청
 DocType: Item Attribute,Item Attribute Values,항목 속성 값
 DocType: Examination Result,Examination Result,시험 결과
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,구입 영수증
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,구입 영수증
 ,Received Items To Be Billed,청구에 주어진 항목
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,제출 급여 전표
 DocType: Employee,Ms,MS
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,통화 환율 마스터.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},참고없는 Doctype 중 하나 여야합니다 {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},참고없는 Doctype 중 하나 여야합니다 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},작업에 대한 다음 {0} 일 시간 슬롯을 찾을 수 없습니다 {1}
 DocType: Production Order,Plan material for sub-assemblies,서브 어셈블리 계획 물질
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,판매 파트너 및 지역
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,이미 계정에 재고 밸런스가 자동으로 계정을 만들 수 없습니다. 이 창고에 항목을 만들 수 있습니다 전에 일치하는 계정을 만들어야합니다
@@ -986,10 +990,9 @@
 DocType: Supplier,Default Payable Accounts,기본 미지급금
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,직원 {0} 활성화되지 않거나 존재하지 않습니다
 DocType: Fee Structure,Components,구성 요소들
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,항목 변형 {0} 업데이트
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},상품에 자산 카테고리를 입력하세요 {0}
 DocType: Quality Inspection Reading,Reading 6,6 읽기
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,하지 {0} {1} {2}없이 음의 뛰어난 송장 수
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,송장 전진에게 구입
 DocType: Hub Settings,Sync Now,지금 동기화
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},행은 {0} : 신용 항목에 링크 할 수 없습니다 {1}
@@ -1003,11 +1006,11 @@
 DocType: Item,Is Purchase Item,구매 상품입니다
 DocType: Asset,Purchase Invoice,구매 송장
 DocType: Stock Ledger Entry,Voucher Detail No,바우처 세부 사항 없음
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,새로운 판매 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,새로운 판매 송장
 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,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,날짜 및 마감일을 열면 동일 회계 연도 내에 있어야합니다
 DocType: Lead,Request for Information,정보 요청
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,동기화 오프라인 송장
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,동기화 오프라인 송장
 DocType: Payment Request,Paid,지불
 DocType: Program Fee,Program Fee,프로그램 비용
 DocType: Salary Slip,Total in words,즉 전체
@@ -1017,7 +1020,7 @@
 DocType: Employee Loan,Sanctioned,제재
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;을 복사됩니다."
 DocType: Job Opening,Publish on website,웹 사이트에 게시
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,고객에게 선적.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,공급 업체 송장 날짜 게시 날짜보다 클 수 없습니다
@@ -1028,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,변화
 ,Company Name,회사 명
 DocType: SMS Center,Total Message(s),전체 메시지 (들)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,전송 항목 선택
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,검사가 입금 된 은행 계좌 머리를 선택합니다.
@@ -1039,8 +1042,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,행 {0} : 판매 / 구매 주문에 대한 결제가 항상 사전으로 표시해야
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,화학
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,이 모드를 선택하면 기본 은행 / 현금 계정이 자동으로 급여 업무 일지 항목에 업데이트됩니다.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",등급 코드의 간격은 {0} 다른 학년 학년 간격과 겹칩니다. 확인하시기 바랍니다 간격 {0}과 {1} 다시 시도
 DocType: BOM,Raw Material Cost(Company Currency),원료 비용 (기업 통화)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,모든 항목은 이미 생산 주문에 대한 전송되었습니다.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},행 번호 {0} : 요율은 {1}에서 사용 된 요율보다 클 수 없습니다 {2}
@@ -1053,14 +1054,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM 웹 사이트 항목
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,편지의 머리와 로고를 업로드합니다. (나중에 편집 할 수 있습니다).
 DocType: Timesheet Detail,Bill,계산서
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,다음 감가 상각 날짜는 과거 날짜로 입력
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,화이트
 DocType: SMS Center,All Lead (Open),모든 납 (열기)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),행 {0}에 대한 수량을 사용할 수없는 {4}웨어 하우스의 {1} 항목의 시간을 게시에 ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,선불지급
 DocType: Item,Automatically Create New Batch,새로운 배치 자동 생성
 DocType: Item,Automatically Create New Batch,새로운 배치 자동 생성
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,확인
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,확인
 DocType: Student Admission,Admission Start Date,입장료 시작 날짜
 DocType: Journal Entry,Total Amount in Words,단어의 합계 금액
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,오류가 발생했습니다.한 가지 가능한 이유는 양식을 저장하지 않은 경우입니다.문제가 계속되면 support@erpnext.com에 문의하시기 바랍니다.
@@ -1068,7 +1069,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,열기 수량
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,변경 금액에 대한 계정을 입력하세요
 DocType: Student Batch Name,Student Batch Name,학생 배치 이름
 DocType: Holiday List,Holiday List Name,휴일 목록 이름
 DocType: Repayment Schedule,Balance Loan Amount,잔액 대출 금액
@@ -1088,10 +1089,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},지정하여 주시기 바랍니다 {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,양 또는 값의 변화없이 제거 항목.
 DocType: Delivery Note,Delivery To,에 배달
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,속성 테이블은 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,속성 테이블은 필수입니다
 DocType: Production Planning Tool,Get Sales Orders,판매 주문을 받아보세요
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} 음수가 될 수 없습니다
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,할인
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,할인
 DocType: Asset,Total Number of Depreciations,감가 상각의 총 수
 DocType: Sales Invoice Item,Rate With Margin,이익률
 DocType: Sales Invoice Item,Rate With Margin,이익률
@@ -1107,7 +1108,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,판매 주문 / 완제품 창고에서 예약 창고
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,판매 금액
 DocType: Repayment Schedule,Interest Amount,이자 금액
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,이 기록에 대한 비용 승인자입니다.'상태'를 업데이트하고 저장하십시오
 DocType: Serial No,Creation Document No,작성 문서 없음
 DocType: Issue,Issue,이슈
 DocType: Asset,Scrapped,폐기
@@ -1115,12 +1116,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","항목 변형의 속성. 예를 들어, 크기, 색상 등"
 DocType: Purchase Invoice,Returns,보고
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP 창고
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},일련 번호는 {0}까지 유지 보수 계약에 따라 {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,신병 모집
 DocType: Lead,Organization Name,조직 이름
 DocType: Tax Rule,Shipping State,배송 상태
 ,Projected Quantity as Source,소스로 예상 수량
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,항목 버튼 '구매 영수증에서 항목 가져 오기'를 사용하여 추가해야합니다
 DocType: Employee,A-,에이-
 DocType: Production Planning Tool,Include non-stock items,재고 항목을 포함
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,영업 비용
@@ -1128,12 +1129,12 @@
 DocType: GL Entry,Against,에 대하여
 DocType: Item,Default Selling Cost Center,기본 판매 비용 센터
 DocType: Sales Partner,Implementation Partner,구현 파트너
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,우편 번호
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,우편 번호
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},판매 주문 {0}를 {1}
 DocType: Opportunity,Contact Info,연락처 정보
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,재고 항목 만들기
 DocType: Packing Slip,Net Weight UOM,순 중량 UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} 결과
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} 결과
 DocType: Item,Default Supplier,기본 공급 업체
 DocType: Manufacturing Settings,Over Production Allowance Percentage,생산 수당 비율 이상
 DocType: Employee Loan,Repayment Schedule,상환 일정
@@ -1141,7 +1142,7 @@
 DocType: Holiday List,Get Weekly Off Dates,날짜 매주 하차
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,종료 날짜는 시작 날짜보다 작을 수 없습니다
 DocType: Sales Person,Select company name first.,첫 번째 회사 이름을 선택합니다.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,박사
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,박사
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,인용문은 공급 업체에서 받았다.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},에 {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,평균 연령
@@ -1161,7 +1162,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,핵심 성과 지역
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,교통비
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,잘못된 속성
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} 제출해야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} 제출해야합니다
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},수량보다 작거나 같아야합니다 {0}
 DocType: SMS Center,Total Characters,전체 문자
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},상품에 대한 BOM 필드에서 BOM을 선택하세요 {0}
@@ -1172,7 +1173,7 @@
 DocType: Sales Partner,Distributor,분배 자
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,쇼핑 카트 배송 규칙
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,생산 순서는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',설정 &#39;에 추가 할인을 적용&#39;하세요
 ,Ordered Items To Be Billed,청구 항목을 주문한
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,범위이어야한다보다는에게 범위
 DocType: Global Defaults,Global Defaults,글로벌 기본값
@@ -1182,7 +1183,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,시작 년도
 DocType: Purchase Invoice,Start date of current invoice's period,현재 송장의 기간의 시작 날짜
 DocType: Salary Slip,Leave Without Pay,지불하지 않고 종료
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,용량 계획 오류
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,용량 계획 오류
 ,Trial Balance for Party,파티를위한 시산표
 DocType: Lead,Consultant,컨설턴트
 DocType: Salary Slip,Earnings,당기순이익
@@ -1197,7 +1198,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","이 변형의 상품 코드에 추가됩니다.귀하의 약어는 ""SM""이며, 예를 들어, 아이템 코드는 ""T-SHIRT"", ""T-SHIRT-SM""입니다 변형의 항목 코드"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,당신이 급여 슬립을 저장하면 (즉) 순 유료가 표시됩니다.
 DocType: Purchase Invoice,Is Return,돌아가요
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,반품 / 직불 참고
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,반품 / 직불 참고
 DocType: Price List Country,Price List Country,가격 목록 나라
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},항목에 대한 {0} 유효한 일련 NOS {1}
@@ -1207,11 +1208,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,배치 번호를 얻기 위해 상품 코드를 입력하세요
 DocType: Stock Settings,Default Item Group,기본 항목 그룹
 DocType: Employee Loan,Partially Disbursed,부분적으로 지급
-DocType: Grading Structure,Grading System Name,등급 시스템 이름
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,공급 업체 데이터베이스.
 DocType: Account,Balance Sheet,대차 대조표
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ','상품 코드와 항목에 대한 센터 비용
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",지불 방식은 구성되어 있지 않습니다. 계정 결제의 모드 또는 POS 프로필에 설정되어 있는지 확인하십시오.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,귀하의 영업 사원은 고객에게 연락이 날짜에 알림을 얻을 것이다
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,동일 상품을 여러 번 입력 할 수 없습니다.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","또한 계정의 그룹에서 제조 될 수 있지만, 항목은 비 - 그룹에 대해 만들어 질 수있다"
@@ -1223,7 +1223,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,재고 원장 항목 및 GL 항목은 선택 구매 영수증에 대한 재 게시된다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,재고 원장 항목 및 GL 항목은 선택 구매 영수증에 대한 재 게시된다
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,항목 1
 DocType: Holiday,Holiday,휴일
 DocType: Support Settings,Close Issue After Days,일 후 닫기 문제
@@ -1250,11 +1250,11 @@
 DocType: Maintenance Visit Purpose,Work Done,작업 완료
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,속성 테이블에서 하나 이상의 속성을 지정하십시오
 DocType: Announcement,All Students,모든 학생
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} 상품은 재고 항목 있어야합니다
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,보기 원장
 DocType: Grading Scale,Intervals,간격
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,처음
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",항목 그룹이 동일한 이름을 가진 항목의 이름을 변경하거나 항목 그룹의 이름을 바꾸십시오
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,학생 휴대 전화 번호
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,세계의 나머지
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,항목 {0} 배치를 가질 수 없습니다
@@ -1294,9 +1294,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},에 {0}에서 급여의 지급 {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},동결 계정을 편집 할 수있는 권한이 없습니다 {0}
 DocType: Journal Entry,Get Outstanding Invoices,미결제 송장를 얻을
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,판매 주문 {0} 유효하지 않습니다
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,구매 주문은 당신이 계획하는 데 도움이 당신의 구입에 후속
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","죄송합니다, 회사는 병합 할 수 없습니다"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",자료 요청의 총 발행 / 전송 양 {0} {1} \ 항목에 대한 요청한 수량 {2}보다 클 수 없습니다 {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,작은
@@ -1317,10 +1317,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,간접 비용
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,행 {0} : 수량은 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,농업
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,싱크 마스터 데이터
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,싱크 마스터 데이터
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,귀하의 제품이나 서비스
 DocType: Mode of Payment,Mode of Payment,결제 방식
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,웹 사이트의 이미지가 공개 파일 또는 웹 사이트 URL이어야합니다
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,이 루트 항목 그룹 및 편집 할 수 없습니다.
@@ -1338,18 +1338,18 @@
 DocType: Student Group Student,Group Roll Number,그룹 롤 번호
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} 만 신용 계정은 자동 이체 항목에 링크 할 수 있습니다 들어
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,모든 작업 가중치의 합계 1. 따라 모든 프로젝트 작업의 가중치를 조정하여주십시오해야한다
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,배송 참고 {0} 제출되지
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","가격 규칙은 첫 번째 항목, 항목 그룹 또는 브랜드가 될 수있는 필드 '에 적용'에 따라 선택됩니다."
 DocType: Hub Settings,Seller Website,판매자 웹 사이트
 DocType: Item,ITEM-,목-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,영업 팀의 총 할당 비율은 100해야한다
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},생산 오더의 상태는 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},생산 오더의 상태는 {0}
 DocType: Appraisal Goal,Goal,골
 DocType: Sales Invoice Item,Edit Description,편집 설명
 ,Team Updates,팀 업데이트
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,공급 업체
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,공급 업체
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,계정 유형을 설정하면 트랜잭션이 계정을 선택하는 데 도움이됩니다.
 DocType: Purchase Invoice,Grand Total (Company Currency),총계 (회사 통화)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,인쇄 형식 만들기
@@ -1365,7 +1365,7 @@
 DocType: Depreciation Schedule,Journal Entry,분개
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,진행중인 {0} 항목
 DocType: Workstation,Workstation Name,워크 스테이션 이름
-DocType: Grade Interval,Grade Code,등급 코드
+DocType: Grading Scale Interval,Grade Code,등급 코드
 DocType: POS Item Group,POS Item Group,POS 항목 그룹
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,다이제스트 이메일 :
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} 아이템에 속하지 않는 {1}
@@ -1382,7 +1382,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,하드웨어
 DocType: Sales Order,Recurring Upto,반복 개까지
 DocType: Attendance,HR Manager,HR 관리자
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,회사를 선택하세요
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,회사를 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,권한 허가
 DocType: Purchase Invoice,Supplier Invoice Date,공급 업체 송장 날짜
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,당신은 쇼핑 카트를 활성화해야
@@ -1398,7 +1398,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,음식
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,고령화 범위 3
 DocType: Maintenance Schedule Item,No of Visits,방문 없음
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,마크 출석율
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,마크 출석율
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1}에 대한 유지 관리 일정 {0}이 (가) 있습니다.
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,등록 학생
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},닫기 계정의 통화가 있어야합니다 {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},모든 목표에 대한 포인트의 합은 그것이 100해야한다 {0}
@@ -1423,7 +1424,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,평균 일일 보내는
 DocType: POS Profile,Campaign,캠페인
 DocType: Supplier,Name and Type,이름 및 유형
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',승인 상태가 '승인'또는 '거부'해야
 DocType: Purchase Invoice,Contact Person,담당자
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','예상 시작 날짜'는'예상 종료 날짜 ' 이전이어야 합니다.
 DocType: Course Scheduling Tool,Course End Date,코스 종료 날짜
@@ -1446,14 +1447,15 @@
 DocType: Sales Invoice,Shipping Address Name,배송 주소 이름
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,계정 차트
 DocType: Material Request,Terms and Conditions Content,약관 내용
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100보다 큰 수 없습니다
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100보다 큰 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} 항목을 재고 항목이 없습니다
 DocType: Maintenance Visit,Unscheduled,예약되지 않은
 DocType: Employee,Owned,소유
 DocType: Salary Detail,Depends on Leave Without Pay,무급 휴가에 따라 다름
 DocType: Pricing Rule,"Higher the number, higher the priority",숫자가 클수록 더 높은 우선 순위
 ,Purchase Invoice Trends,송장 동향을 구입
 DocType: Employee,Better Prospects,더 나은 전망
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",행 # {0} : 배치 {1}에는 {2} 개의 수량 만 있습니다. {3} 수량이있는 다른 배치를 선택하거나 행을 여러 행으로 분할하여 여러 배치에서 전달 / 발행하십시오.
 DocType: Vehicle,License Plate,차량 번호판
 DocType: Appraisal,Goals,목표
 DocType: Warranty Claim,Warranty / AMC Status,보증 / AMC 상태
@@ -1472,7 +1474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,직원은 자신에게보고 할 수 없습니다.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","계정이 동결 된 경우, 항목은 제한된 사용자에게 허용됩니다."
 DocType: Email Digest,Bank Balance,은행 잔액
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} 만 통화 할 수있다 : {0}에 대한 회계 항목 {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","필요한 작업 프로필, 자격 등"
 DocType: Journal Entry Account,Account Balance,계정 잔액
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,거래에 대한 세금 규칙.
@@ -1483,7 +1485,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,닫히지 않은 회계 연도의 P &amp; L 잔액을보기
 DocType: Shipping Rule,Shipping Account,배송 계정
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} 계정 {2} 비활성
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,판매 주문이 당신의 일을 계획하는 데 도움과에 시간 제공 할 수 있도록
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,판매 주문이 당신의 일을 계획하는 데 도움과에 시간 제공 할 수 있도록
 DocType: Quality Inspection,Readings,읽기
 DocType: Stock Entry,Total Additional Costs,총 추가 비용
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1496,7 @@
 DocType: Shipping Rule Condition,To Value,값
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,포장 명세서
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,포장 명세서
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,사무실 임대
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,설치 SMS 게이트웨이 설정
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,가져 오기 실패!
@@ -1516,11 +1518,11 @@
 DocType: Company,Services,Services (서비스)
 DocType: HR Settings,Email Salary Slip to Employee,직원에게 이메일 급여 슬립
 DocType: Cost Center,Parent Cost Center,부모의 비용 센터
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,가능한 공급 업체를 선택
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,가능한 공급 업체를 선택
 DocType: Sales Invoice,Source,소스
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,쇼 폐쇄
 DocType: Leave Type,Is Leave Without Pay,지불하지 않고 남겨주세요
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,자산의 종류는 고정 자산 항목에 대해 필수입니다
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,지불 테이블에있는 레코드 없음
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},이 {0} 충돌 {1}의 {2} {3}
 DocType: Student Attendance Tool,Students HTML,학생들 HTML
@@ -1538,7 +1540,7 @@
 DocType: Student,Date of Leaving,떠나는 날짜
 DocType: Pricing Rule,For Price List,가격 목록을 보려면
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,대표 조사
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,리드 만들기
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,리드 만들기
 DocType: Maintenance Schedule,Schedules,일정
 DocType: Purchase Invoice Item,Net Amount,순액
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM 세부 사항 없음
@@ -1566,9 +1568,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,프로그램 등록 계약
 DocType: Sales Invoice Item,Brand Name,브랜드 명
 DocType: Purchase Receipt,Transporter Details,수송기 상세
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,기본 창고가 선택한 항목에 대한 필요
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,상자
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,가능한 공급 업체
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,가능한 공급 업체
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,조직
 DocType: Budget,Monthly Distribution,예산 월간 배분
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,수신기 목록이 비어 있습니다.수신기 목록을 만드십시오
@@ -1576,8 +1578,8 @@
 DocType: Sales Partner,Sales Partner Target,영업 파트너 대상
 DocType: Loan Type,Maximum Loan Amount,최대 대출 금액
 DocType: Pricing Rule,Pricing Rule,가격 규칙
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},학생 {0}의 중복 롤 번호
 DocType: Budget,Action if Annual Budget Exceeded,액션 연간 예산 초과하는 경우
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,주문을 (를) 구매하려면 자료 요청
 DocType: Shopping Cart Settings,Payment Success URL,지불 성공 URL
@@ -1598,9 +1600,9 @@
 DocType: Employee Loan,Repayment Method,상환 방법
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",선택하면 홈 페이지는 웹 사이트에 대한 기본 항목 그룹이 될 것입니다
 DocType: Quality Inspection Reading,Reading 4,4 읽기
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} 프로젝트 찾을 수 없습니다에 대한 기본 BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} 프로젝트 찾을 수 없습니다에 대한 기본 BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,회사 경비 주장한다.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","학생들은 시스템의 중심에, 모든 학생들이 추가된다"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","학생들은 시스템의 중심에, 모든 학생들이 추가된다"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},행 # {0} : 정리 날짜는 {1} 수표 날짜 전에 할 수 없습니다 {2}
 DocType: Company,Default Holiday List,휴일 목록 기본
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},행 {0}의 시간과 시간에서 {1}과 중첩된다 {2}
@@ -1612,21 +1614,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,당신이 휴가를 신청하는 날 (들)은 휴일입니다. 당신은 휴가를 신청할 필요가 없습니다.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,지불 이메일을 다시 보내
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,새 작업
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,견적 확인
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,견적 확인
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,기타 보고서
 DocType: Dependent Task,Dependent Task,종속 작업
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},측정의 기본 단위에 대한 변환 계수는 행에 반드시 1이 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},유형의 휴가는 {0}을 넘을 수 없습니다 {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,사전에 X 일에 대한 작업을 계획 해보십시오.
 DocType: HR Settings,Stop Birthday Reminders,정지 생일 알림
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},회사에서 기본 급여 채무 계정을 설정하십시오 {0}
 DocType: SMS Center,Receiver List,수신기 목록
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,검색 항목
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,검색 항목
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,소비 금액
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,현금의 순 변화
 DocType: Assessment Plan,Grading Scale,등급 규모
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,이미 완료
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,측정 단위는 {0}보다 변환 계수 표에 두 번 이상 입력 한
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,이미 완료
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},지불 요청이 이미 존재 {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,발행 항목의 비용
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},수량 이하이어야한다 {0}
@@ -1658,12 +1660,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,지급 항목을 만듭니다
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,행 {0} : 공급 업체에 대한 사전 직불해야
 DocType: Company,Default Values,기본값
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{빈도} 다이제스트
 DocType: Expense Claim,Total Amount Reimbursed,총 금액 상환
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,이이 차량에 대한 로그를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,수집
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},공급 업체 청구서를 {0} 일자 {1}
 DocType: Customer,Default Price List,기본 가격리스트
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,자산 이동 기록 {0} 작성
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,자산 이동 기록 {0} 작성
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,당신은 삭제할 수 없습니다 회계 연도 {0}. 회계 연도 {0} 전역 설정에서 기본값으로 설정
 DocType: Journal Entry,Entry Type,항목 유형
 ,Customer Credit Balance,고객 신용 잔액
@@ -1683,7 +1686,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,항목 중에 양 또는 값의 변화가 없다.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,필수 입력란 - 프로그램
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,필수 입력란 - 프로그램
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,보증 청구
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,보증 청구
 ,Lead Details,리드 세부 사항
 DocType: Salary Slip,Loan repayment,대출 상환
 DocType: Purchase Invoice,End date of current invoice's period,현재 송장의 기간의 종료 날짜
@@ -1702,12 +1705,10 @@
 DocType: Employee,Permanent Address,영구 주소
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",총계보다 \ {0} {1} 초과 할 수 없습니다에 대해 지불 사전 {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,품목 코드를 선택하세요
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,품목 코드를 선택하세요
 DocType: Student Sibling,Studying in Same Institute,같은 연구소에서 공부
 DocType: Territory,Territory Manager,지역 관리자
 DocType: Packed Item,To Warehouse (Optional),웨어 하우스 (선택 사항)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Payment Entry,Paid Amount (Company Currency),지불 금액 (회사 통화)
 DocType: Purchase Invoice,Additional Discount,추가 할인
 DocType: Selling Settings,Selling Settings,판매 설정
@@ -1717,9 +1718,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,쇼핑 카트에보기
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,마케팅 비용
 ,Item Shortage Report,매물 부족 보고서
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","무게도 ""무게 UOM""를 언급 해주십시오 \n, 언급"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,자료 요청이 재고 항목을 확인하는 데 사용
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,다음 감가 상각 날짜는 새로운 자산에 대한 필수입니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,다음 감가 상각 날짜는 새로운 자산에 대한 필수입니다
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,모든 일괄 처리를위한 별도의 과정 기반 그룹
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,모든 일괄 처리를위한 별도의 과정 기반 그룹
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,항목의 하나의 단위.
@@ -1736,9 +1737,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,추신-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1} : 코스트 센터가 &#39;손익&#39;계정이 필요합니다 {2}. 회사의 기본 비용 센터를 설치하시기 바랍니다.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,고객 그룹이 동일한 이름으로 존재하는 것은 고객의 이름을 변경하거나 고객 그룹의 이름을 바꾸십시오
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 읽기
@@ -1755,7 +1754,7 @@
 ,Item-wise Sales Register,상품이 많다는 판매 등록
 DocType: Asset,Gross Purchase Amount,총 구매 금액
 DocType: Asset,Depreciation Method,감가 상각 방법
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,오프라인
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,오프라인
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,이 세금은 기본 요금에 포함되어 있습니까?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,총 대상
 DocType: Program Course,Required,필수
@@ -1765,21 +1764,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,화해 JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,열이 너무 많습니다.보고서를 내 보낸 스프레드 시트 응용 프로그램을 사용하여 인쇄 할 수 있습니다.
 DocType: Purchase Invoice Item,Batch No,배치 없음
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},환율을 찾을 수 없습니다 {0}에 {1} 키 날짜 {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,고객의 구매 주문에 대해 여러 판매 주문 허용
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 DocType: Student Group Instructor,Student Group Instructor,학생 그룹 강사
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 모바일 없음
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,주요 기능
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,변체
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,주요 기능
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,변체
 DocType: Naming Series,Set prefix for numbering series on your transactions,트랜잭션에 일련 번호에 대한 설정 접두사
 DocType: Employee Attendance Tool,Employees HTML,직원 HTML을
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,기본 BOM은 ({0})이 항목 또는 템플릿에 대한 활성화되어 있어야합니다
 DocType: Employee,Leave Encashed?,Encashed 남겨?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,필드에서 기회는 필수입니다
 DocType: Email Digest,Annual Expenses,연간 비용
 DocType: Item,Variants,변종
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,확인 구매 주문
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,확인 구매 주문
 DocType: SMS Center,Send To,보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},허가 유형에 대한 충분한 휴가 밸런스가 없습니다 {0}
 DocType: Payment Reconciliation Payment,Allocated amount,할당 된 양
@@ -1787,7 +1785,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,작업중인 창고는 제출하기 전에 필요
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,작업을 위해 신청자.
 DocType: Purchase Order Item,Warehouse and Reference,창고 및 참조
 DocType: Supplier,Statutory info and other general information about your Supplier,법정 정보 및 공급 업체에 대한 다른 일반적인 정보
@@ -1795,11 +1793,10 @@
 DocType: Item,Serial Nos and Batches,일련 번호 및 배치
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,학생 그룹의 힘
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,학생 그룹의 힘
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,저널에 대하여 항목 {0} 어떤 타의 추종을 불허 {1} 항목이없는
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,감정
 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: Grading Structure,Grading Intervals,등급 간격
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,들어 오세요
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",행의 항목 {0}에 대한 overbill 수 없습니다 {1}보다 {2}. 과다 청구를 허용하려면 설정을 구매에서 설정하시기 바랍니다
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,상품 또는웨어 하우스를 기반으로 필터를 설정하십시오
@@ -1811,17 +1808,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM은 {0} 제출해야합니다
 DocType: Authorization Control,Authorization Control,권한 제어
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},행 번호 {0} : 창고 거부 거부 항목에 대해 필수입니다 {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,지불
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,주문 관리
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,지불
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,주문 관리
 DocType: Production Order Operation,Actual Time and Cost,실제 시간과 비용
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},최대의 자료 요청은 {0} 항목에 대한 {1}에 대해 수행 할 수있는 판매 주문 {2}
 DocType: Employee,Salutation,인사말
 DocType: Course,Course Abbreviation,코스 약어
 DocType: Student Leave Application,Student Leave Application,학생 휴가 신청
 DocType: Item,Will also apply for variants,또한 변형 적용됩니다
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",이미 같이 자산은 취소 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},에 반나절에 직원 {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},총 근무 시간은 최대 근무 시간보다 더 안 {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,켜기
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,판매 상품을 동시에 번들.
 DocType: Quotation Item,Actual Qty,실제 수량
 DocType: Sales Invoice Item,References,참조
@@ -1831,7 +1829,7 @@
 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 +91,Associate,준
 DocType: Asset Movement,Asset Movement,자산 이동
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,새로운 장바구니
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,새로운 장바구니
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} 항목을 직렬화 된 상품이 없습니다
 DocType: SMS Center,Create Receiver List,수신기 목록 만들기
 DocType: Vehicle,Wheels,휠
@@ -1863,10 +1861,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,생산 오더에 대한 시간 로그의 생성을 사용하지 않습니다. 작업은 생산 오더에 대해 추적 할 수 없다
 DocType: Student,Student Mobile Number,학생 휴대 전화 번호
 DocType: Item,Has Variants,변형을 가지고
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},이미에서 항목을 선택한 {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,월별 분포의 이름
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,일괄 ID는 필수 항목입니다.
 DocType: Sales Person,Parent Sales Person,부모 판매 사람
 DocType: Purchase Invoice,Recurring Invoice,경상 송장
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,프로젝트 관리
@@ -1874,11 +1872,11 @@
 DocType: Budget,Fiscal Year,회계 연도
 DocType: Vehicle Log,Fuel Price,연료 가격
 DocType: Budget,Budget,예산
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,고정 자산 항목은 재고 항목 있어야합니다.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",이 수입 또는 비용 계정이 아니다으로 예산이에 대해 {0}에 할당 할 수 없습니다
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,달성
 DocType: Student Admission,Application Form Route,신청서 경로
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,지역 / 고객
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,지역 / 고객
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,예) 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,그것은 지불하지 않고 종료되기 때문에 유형 {0}를 할당 할 수 없습니다 남겨주세요
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},행 {0} : 할당 된 양 {1} 미만 또는 잔액을 청구하기 위해 동일합니다 {2}
@@ -1898,15 +1896,15 @@
 ,Serial No Status,일련 번호 상태
 DocType: Payment Entry Reference,Outstanding,두드러진
 ,Daily Timesheet Summary,매일 작업 표 요약
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","행 {0} : 설정하려면 {1} 주기성에서 날짜와 \
 에 차이는보다 크거나 같아야합니다 {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,이는 재고의 움직임을 기반으로합니다. 참조 {0} 자세한 내용은
 DocType: Pricing Rule,Selling,판매
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},금액은 {0} {1}에 대해 공제 {2}
 DocType: Employee,Salary Information,급여정보
 DocType: Sales Person,Name and Employee ID,이름 및 직원 ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,기한 날짜를 게시하기 전에 할 수 없습니다
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,관세 및 세금
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,참고 날짜를 입력 해주세요
@@ -1918,14 +1916,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,이 충전 유형에 대한보다 크거나 현재의 행의 수와 동일한 행 번호를 참조 할 수 없습니다
 DocType: Asset,Sold,판매
 ,Item-wise Purchase History,상품 현명한 구입 내역
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},시리얼 번호는 항목에 대한 추가 가져 오기 위해 '생성 일정'을 클릭하십시오 {0}
 DocType: Account,Frozen,동결
 ,Open Production Orders,오픈 생산 주문
 DocType: Sales Invoice Payment,Base Amount (Company Currency),자료의 양 (회사 통화)
 DocType: Payment Reconciliation Payment,Reference Row,참고 행
 DocType: Installation Note,Installation Time,설치 시간
 DocType: Sales Invoice,Accounting Details,회계 세부 사항
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,이 회사의 모든 거래를 삭제
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,투자
 DocType: Issue,Resolution Details,해상도 세부 사항
@@ -1958,14 +1956,14 @@
 DocType: Discussion,Discussion,토론
 DocType: Payment Entry,Transaction ID,트랜잭션 ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,가격 규칙은 또한 수량에 따라 필터링됩니다.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},직원 {0}의 가입 날짜를 설정하십시오.
 DocType: Task,Total Billing Amount (via Time Sheet),총 결제 금액 (시간 시트를 통해)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,반복 고객 수익
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1})은 '지출 승인자'이어야 합니다.
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,페어링
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,생산을위한 BOM 및 수량 선택
 DocType: Asset,Depreciation Schedule,감가 상각 일정
 DocType: Bank Reconciliation Detail,Against Account,계정에 대하여
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,하프 데이 데이트 날짜부터 현재까지 사이에 있어야한다
@@ -1979,16 +1977,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},회사의 &#39;자산 감가 상각 비용 센터&#39;를 설정하십시오 {0}
 ,Maintenance Schedules,관리 스케줄
 DocType: Task,Actual End Date (via Time Sheet),실제 종료 날짜 (시간 시트를 통해)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},양 {0} {1}에 대한 {2} {3}
 ,Quotation Trends,견적 동향
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},항목에 대한 항목을 마스터에 언급되지 않은 항목 그룹 {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,차변계정은 채권 계정이어야합니다
 DocType: Shipping Rule Condition,Shipping Amount,배송 금액
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,대기중인 금액
 DocType: Purchase Invoice Item,Conversion Factor,변환 계수
 DocType: Purchase Order,Delivered,배달
 ,Vehicle Expenses,차량 비용
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
+DocType: Serial No,Invoice Details,인보이스 세부 정보
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},연수 후 예상 값보다 크거나 같아야합니다 {0}
 DocType: Purchase Receipt,Vehicle Number,차량 번호
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,반복 송장이 중단 될 일자
 DocType: Employee Loan,Loan Amount,대출금
@@ -2007,12 +2006,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,작업 표
 DocType: HR Settings,HR Settings,HR 설정
 DocType: Salary Slip,net pay info,순 임금 정보
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,비용 청구가 승인 대기 중입니다.만 비용 승인자 상태를 업데이트 할 수 있습니다.
 DocType: Email Digest,New Expenses,새로운 비용
 DocType: Purchase Invoice,Additional Discount Amount,추가 할인 금액
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",행 번호 {0} 항목이 고정 자산이기 때문에 수량은 1이어야합니다. 여러 수량에 대해 별도의 행을 사용하십시오.
 DocType: Leave Block List Allow,Leave Block List Allow,차단 목록은 허용 남겨
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,약어는 비워둘수 없습니다
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,약어는 비워둘수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,비 그룹에 그룹
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,스포츠
 DocType: Loan Type,Loan Name,대출 이름
@@ -2024,6 +2023,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,당신이 거부 된 품목의 재고를 유지하고 창고
 DocType: Production Order,Skip Material Transfer,자재 전송 건너 뛰기
 DocType: Production Order,Skip Material Transfer,자재 전송 건너 뛰기
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,주요 날짜 {2}에 대해 {0}에서 {1}까지의 환율을 찾을 수 없습니다. 통화 기록을 수동으로 작성하십시오.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,재무 년에 종료
 DocType: POS Profile,Price List,가격리스트
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} 이제 기본 회계 연도이다.변경 내용을 적용하기 위해 브라우저를 새로 고침하십시오.
@@ -2040,19 +2040,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},계정 {0} 유효하지 않습니다. 계정 통화가 있어야합니다 {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM 변환 계수는 행에 필요한 {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","행 번호 {0} 참조 문서 형식은 판매 주문 중 하나, 판매 송장 또는 분개해야합니다"
 DocType: Salary Component,Deduction,공제
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,행 {0} : 시간에서와 시간은 필수입니다.
 DocType: Stock Reconciliation Item,Amount Difference,금액 차이
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},상품 가격은 추가 {0} 가격 목록에서 {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,이 영업 사원의 직원 ID를 입력하십시오
 DocType: Territory,Classification of Customers by region,지역별 고객의 분류
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,차이 금액이 0이어야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,차이 금액이 0이어야합니다
 DocType: Project,Gross Margin,매출 총 이익률
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,첫 번째 생산 품목을 입력하십시오
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,계산 된 은행 잔고 잔액
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,사용하지 않는 사용자
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,인용
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,인용
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,총 공제
 ,Production Analytics,생산 분석
@@ -2061,9 +2061,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},경고 : 첨부 파일에 잘못된 SSL 인증서 {0}
 DocType: Student Admission,Eligibility,적임
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","리드는 당신이 사업은, 모든 연락처 등을 리드로 추가하는 데 도움"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","리드는 당신이 사업은, 모든 연락처 등을 리드로 추가하는 데 도움"
 DocType: Production Order Operation,Actual Operation Time,실제 작업 시간
 DocType: Authorization Rule,Applicable To (User),에 적용 (사용자)
 DocType: Purchase Taxes and Charges,Deduct,공제
@@ -2078,7 +2078,7 @@
 DocType: Guardian,Work Address,직장 주소
 DocType: Appraisal,Calculate Total Score,총 점수를 계산
 DocType: Request for Quotation,Manufacturing Manager,제조 관리자
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},일련 번호는 {0}까지 보증 {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,패키지로 배달 주를 분할합니다.
 apps/erpnext/erpnext/hooks.py +87,Shipments,선적
 DocType: Payment Entry,Total Allocated Amount (Company Currency),총 할당 된 금액 (회사 통화)
@@ -2099,10 +2099,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,참고 : 전자 메일을 사용할 사용자에게 전송되지 않습니다
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,상호 작용 수
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,상호 작용 수
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,회사를 선택 ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,회사를 선택 ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,모든 부서가 있다고 간주 될 경우 비워 둡니다
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","고용 (영구, 계약, 인턴 등)의 종류."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} 항목에 대한 필수입니다 {1}
 DocType: Process Payroll,Fortnightly,이주일에 한번의
 DocType: Currency Exchange,From Currency,통화와
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","이어야 한 행에 할당 된 금액, 송장 유형 및 송장 번호를 선택하세요"
@@ -2111,14 +2111,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),속도 (회사 통화)
 DocType: Student Guardian,Others,기타사항
 DocType: Payment Entry,Unallocated Amount,할당되지 않은 금액
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,일치하는 항목을 찾을 수 없습니다. 에 대한 {0} 다른 값을 선택하십시오.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,더 이상 업데이트되지
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,첫 번째 행에 대한 '이전 행 전체에'이전 행에 금액 '또는로 충전 타입을 선택할 수 없습니다
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,하위 항목은 제품 번들이어야한다. 항목을 제거`{0}`와 저장하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,은행
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,작업 표를 추가
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,작업 표를 추가
 DocType: Vehicle Service,Service Item,서비스 항목
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
 DocType: Bank Guarantee,Bank Guarantee,은행 보증
@@ -2144,6 +2144,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},행 번호 {0} 자산이 {1} 이미 {2}
 DocType: Quotation Item,Stock Balance,재고 대차
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,지불에 판매 주문
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,설정&gt; 설정&gt; 이름 지정 시리즈를 통해 이름 지정 시리즈를 {0}으로 설정하십시오.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,최고 경영자
 DocType: Expense Claim Detail,Expense Claim Detail,비용 청구 상세 정보
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,올바른 계정을 선택하세요
@@ -2168,14 +2169,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,가격리스트가 설정되지 않은 경우 가격이 표시되지
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,이 배송 규칙에 대한 국가를 지정하거나 전세계 배송을 확인하시기 바랍니다
 DocType: Stock Entry,Total Incoming Value,총 수신 값
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,직불 카드에 대한이 필요합니다
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,직불 카드에 대한이 필요합니다
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","작업 표는 팀에 의해 수행하는 행동이 시간, 비용 및 결제 추적 할 수 있도록"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,구매 가격 목록
 DocType: Offer Letter Term,Offer Term,행사 기간
 DocType: Quality Inspection,Quality Manager,품질 관리자
 DocType: Job Applicant,Job Opening,구인
 DocType: Payment Reconciliation,Payment Reconciliation,결제 조정
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,INCHARGE 사람의 이름을 선택하세요
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,기술
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},총 미지급 : {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM 웹 사이트 운영
@@ -2203,23 +2204,23 @@
 DocType: Opportunity,Lost Reason,분실 된 이유
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,새 주소
 DocType: Quality Inspection,Sample Size,표본 크기
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,수신 문서를 입력하세요
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,모든 상품은 이미 청구 된
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,수신 문서를 입력하세요
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,또한 비용 센터 그룹에서 할 수 있지만 항목이 아닌 그룹에 대해 할 수있다
 DocType: Project,External,외부
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,사용자 및 권한
 DocType: Vehicle Log,VLOG.,동영상 블로그.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},생산 오더 생성 : {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},생산 오더 생성 : {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,휴대 전화 번호
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,인쇄 및 브랜딩
 DocType: Bin,Actual Quantity,실제 수량
 DocType: Shipping Rule,example: Next Day Shipping,예 : 익일 배송
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,발견되지 일련 번호 {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,발견되지 일련 번호 {0}
 DocType: Scheduling Tool,Student Batch,학생 배치
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,고객
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,학생을
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,학생을
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},당신은 프로젝트 공동 작업에 초대되었습니다 : {0}
 DocType: Leave Block List Date,Block Date,블록 날짜
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,지금 적용
@@ -2241,8 +2242,9 @@
 DocType: SMS Log,Sent To,전송
 DocType: Payment Request,Make Sales Invoice,견적서에게 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,소프트웨어
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,다음으로 연락 날짜는 과거가 될 수 없습니다
 DocType: Company,For Reference Only.,참조 용으로 만 사용됩니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,배치 번호 선택
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},잘못된 {0} : {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,사전의 양
@@ -2256,7 +2258,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,케이스 번호는 0이 될 수 없습니다
 DocType: Item,Show a slideshow at the top of the page,페이지의 상단에 슬라이드 쇼보기
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM을
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,상점
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,상점
 DocType: Serial No,Delivery Time,배달 시간
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,을 바탕으로 고령화
 DocType: Item,End of Life,수명 종료
@@ -2268,12 +2270,12 @@
 DocType: Rename Tool,Rename Tool,이름바꾸기 툴
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,업데이트 비용
 DocType: Item Reorder,Item Reorder,항목 순서 바꾸기
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,쇼 급여 슬립
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,전송 자료
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,쇼 급여 슬립
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,전송 자료
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","운영, 운영 비용을 지정하고 작업에 고유 한 작업에게 더를 제공합니다."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,이 문서에 의해 제한을 초과 {0} {1} 항목 {4}. 당신은하고 있습니다 동일에 대한 또 다른 {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,저장 한 후 반복 설정하십시오
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,선택 변화량 계정
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,저장 한 후 반복 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,선택 변화량 계정
 DocType: Purchase Invoice,Price List Currency,가격리스트 통화
 DocType: Naming Series,User must always select,사용자는 항상 선택해야합니다
 DocType: Stock Settings,Allow Negative Stock,음의 재고 허용
@@ -2284,7 +2286,7 @@
 DocType: Budget Account,Budget Account,예산 계정
 DocType: Quality Inspection,Verified By,에 의해 확인
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","기존의 트랜잭션이 있기 때문에, 회사의 기본 통화를 변경할 수 없습니다.거래 기본 통화를 변경하려면 취소해야합니다."
-DocType: Grade Interval,Grade Description,등급 설명
+DocType: Grading Scale Interval,Grade Description,등급 설명
 DocType: Stock Entry,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,급여 슬립을 만듭니다
@@ -2322,7 +2324,7 @@
 DocType: Upload Attendance,Attendance To Date,날짜 출석
 DocType: Warranty Claim,Raised By,에 의해 제기
 DocType: Payment Gateway Account,Payment Account,결제 계정
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,진행하는 회사를 지정하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,진행하는 회사를 지정하십시오
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,채권에 순 변경
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,보상 오프
 DocType: Offer Letter,Accepted,허용
@@ -2332,12 +2334,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,당신이 정말로이 회사에 대한 모든 트랜잭션을 삭제 하시겠습니까 확인하시기 바랍니다. 그대로 마스터 데이터는 유지됩니다. 이 작업은 취소 할 수 없습니다.
 DocType: Room,Room Number,방 번호
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},잘못된 참조 {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{3}  생산 주문시 {0} ({1}) 수량은 ({2})} 보다 클 수 없습니다.
 DocType: Shipping Rule,Shipping Rule Label,배송 규칙 라벨
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,사용자 포럼
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,원료는 비워 둘 수 없습니다.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,빠른 분개
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","주식을 업데이트 할 수 없습니다, 송장은 하락 선박 항목이 포함되어 있습니다."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,빠른 분개
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM 어떤 항목 agianst 언급 한 경우는 속도를 변경할 수 없습니다
 DocType: Employee,Previous Work Experience,이전 작업 경험
 DocType: Stock Entry,For Quantity,수량
@@ -2350,7 +2352,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,약관 및 상태 인 경우 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,연구소의 이름은 당신이 시스템을 설정하고 있습니다.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","회계 항목이 날짜까지 동결, 아무도 / 아래 지정된 역할을 제외하고 항목을 수정하지 않을 수 있습니다."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,유지 보수 일정을 생성하기 전에 문서를 저장하십시오
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,프로젝트 상태
 DocType: UOM,Check this to disallow fractions. (for Nos),분수를 허용하려면이 옵션을 선택합니다. (NOS의 경우)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,다음 생산 오더가 생성했다 :
@@ -2377,7 +2379,7 @@
 ,Employees working on a holiday,휴일에 일하는 직원
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,마크 선물
 DocType: Project,% Complete Method,완료율 방법
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},유지 보수 시작 날짜 일련 번호에 대한 배달 날짜 이전 할 수 없습니다 {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},유지 보수 시작 날짜 일련 번호에 대한 배달 날짜 이전 할 수 없습니다 {0}
 DocType: Production Order,Actual End Date,실제 종료 날짜
 DocType: BOM,Operating Cost (Company Currency),운영 비용 (기업 통화)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2394,7 +2396,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,승인 된 휴가 신청 기록과 일치하지 않습니다 지불하지 않고 남겨주세요
 DocType: Campaign,Campaign-.####,캠페인.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,다음 단계
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,최상의 요금으로 지정된 항목을 제공하십시오
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 일이 경과되면 자동 가까운 기회
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,최종 년도
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,따옴표 / 리드 %
@@ -2451,7 +2453,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd 수량
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},요금 기록 작성 - {0}
 DocType: Asset Category Account,Asset Category Account,자산 분류 계정
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},더 많은 항목을 생성 할 수 없습니다 {0}보다 판매 주문 수량 {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,재고 입력 {0} 미작성
 DocType: Payment Reconciliation,Bank / Cash Account,은행 / 현금 계정
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,다음으로 연락으로는 리드 이메일 주소와 동일 할 수 없습니다
@@ -2473,7 +2475,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,통관 날짜가 언급되지 않았습니다
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,생산
 DocType: Guardian,Occupation,직업
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,행 {0} : 시작 날짜가 종료 날짜 이전이어야합니다
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),합계 (수량)
 DocType: Sales Invoice,This Document,이 문서
 DocType: Installation Note Item,Installed Qty,설치 수량
@@ -2489,15 +2492,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,문제 신고
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,광열비
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 위
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,행 번호 {0} 저널 항목 {1} 계정이없는이 {2} 또는 이미 다른 쿠폰에 대해 일치
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,행 번호 {0} 저널 항목 {1} 계정이없는이 {2} 또는 이미 다른 쿠폰에 대해 일치
 DocType: Buying Settings,Default Buying Price List,기본 구매 가격 목록
 DocType: Process Payroll,Salary Slip Based on Timesheet,표를 바탕으로 급여 슬립
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,위의 선택 기준 또는 급여 명세서에 대한 어떤 직원이 이미 만들어
 DocType: Notification Control,Sales Order Message,판매 주문 메시지
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","기타 회사, 통화, 당해 사업 연도와 같은 기본값을 설정"
 DocType: Payment Entry,Payment Type,지불 유형
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,{0} 항목에 대한 배치를 선택하십시오. 이 요구 사항을 충족하는 단일 배치를 찾을 수 없습니다.
 DocType: Process Payroll,Select Employees,직원 선택
 DocType: Opportunity,Potential Sales Deal,잠재적 인 판매 거래
 DocType: Payment Entry,Cheque/Reference Date,수표 / 참조 날짜
@@ -2514,7 +2517,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},이미 회사를 위해 만든 글로벌 POS 프로필 {0} {1}
 DocType: Purchase Order,Ref SQ,참조 SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,모든 BOM에있는 부품 / BOM을 대체
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,영수증 문서를 제출해야합니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,영수증 문서를 제출해야합니다
 DocType: Purchase Invoice Item,Received Qty,수량에게받은
 DocType: Stock Entry Detail,Serial No / Batch,일련 번호 / 배치
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,아니 지불하고 전달되지 않음
@@ -2523,11 +2526,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,시간 시트 없음
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} 수행-전달할 수 없습니다 유형을 남겨주세요
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',유지 보수 일정은 모든 항목에 대해 생성되지 않습니다.'생성 일정'을 클릭 해주세요
 ,To Produce,생산
 apps/erpnext/erpnext/config/hr.py +93,Payroll,급여
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",행에 대해 {0}에서 {1}. 상품 요금에 {2} 포함하려면 행은 {3}도 포함해야
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,사용자 확인
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,사용자 확인
 DocType: Packing Slip,Identification of the package for the delivery (for print),(프린트) 전달을위한 패키지의 식별
 DocType: Bin,Reserved Quantity,예약 주문
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,유효한 이메일 주소를 입력하십시오.
@@ -2541,15 +2544,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,장애인 템플릿은 기본 템플릿이 아니어야합니다
 DocType: Account,Income Account,수익 계정
 DocType: Payment Request,Amount in customer's currency,고객의 통화 금액
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,배달
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,배달
 DocType: Stock Reconciliation Item,Current Qty,현재 수량
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","절 원가 계산의 ""에 근거를 자료의 평가""를 참조하십시오"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,예전
 DocType: Appraisal Goal,Key Responsibility Area,주요 책임 지역
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","학생 배치는 학생에 대한 출석, 평가 및 비용을 추적하는 데 도움이"
 DocType: Payment Entry,Total Allocated Amount,총 할당 된 금액
 DocType: Item Reorder,Material Request Type,자료 요청 유형
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0}에에서 급여에 대한 Accural 분개 {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","로컬 저장이 가득, 저장하지 않은"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","로컬 저장이 가득, 저장하지 않은"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,행 {0} : UOM 변환 계수는 필수입니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,참조
 DocType: Budget,Cost Center,비용 센터
@@ -2559,16 +2563,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,판매 거래에서 고객의 세금 아이디를 숨기기
 DocType: Upload Attendance,Upload HTML,업로드 HTML
 DocType: Employee,Relieving Date,날짜를 덜어
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","가격 규칙은 몇 가지 기준에 따라, 가격 목록 / 할인 비율을 정의 덮어 쓰기를한다."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,창고 재고 만 입력 / 배달 주 / 구매 영수증을 통해 변경 될 수 있습니다
 DocType: Employee Education,Class / Percentage,클래스 / 비율
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,마케팅 및 영업 책임자
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","선택 가격 규칙은 '가격'을 위해 만든 경우, 가격 목록을 덮어 쓰게됩니다.가격 규칙 가격이 최종 가격이기 때문에 더 이상의 할인은 적용되지해야합니다.따라서, 등 판매 주문, 구매 주문 등의 거래에있어서, 그것은 오히려 '가격 목록 평가'분야보다 '속도'필드에서 가져온 것입니다."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","선택 가격 규칙은 '가격'을 위해 만든 경우, 가격 목록을 덮어 쓰게됩니다.가격 규칙 가격이 최종 가격이기 때문에 더 이상의 할인은 적용되지해야합니다.따라서, 등 판매 주문, 구매 주문 등의 거래에있어서, 그것은 오히려 '가격 목록 평가'분야보다 '속도'필드에서 가져온 것입니다."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,트랙은 산업 유형에 의해 리드.
 DocType: Item Supplier,Item Supplier,부품 공급 업체
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,더 배치를 얻을 수 상품 코드를 입력하시기 바랍니다
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},값을 선택하세요 {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,모든 주소.
 DocType: Company,Stock Settings,재고 설정
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","다음과 같은 속성이 모두 기록에 같은 경우 병합에만 가능합니다. 그룹, 루트 유형, 회사는"
@@ -2578,6 +2582,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',상태 직원들에게 이벤트에 대한 이메일을 보내드립니다 &#39;열기&#39;
 DocType: Task,Depends on Tasks,작업에 따라 달라집니다
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,고객 그룹 트리를 관리 할 수 있습니다.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,장바구니를 사용하지 않고 첨부 파일을 표시 할 수 있습니다.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,새로운 비용 센터의 이름
 DocType: Leave Control Panel,Leave Control Panel,제어판에게 남겨
@@ -2590,12 +2595,10 @@
 DocType: Sales Invoice,Debit To,To 직불
 DocType: Delivery Note,Required only for sample item.,단지 샘플 항목에 필요합니다.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,거래 후 실제 수량
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,공급 업체&gt; 공급 업체 유형
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},사이 찾지 급여 슬립하지 {0}과 {1}
 ,Pending SO Items For Purchase Request,구매 요청에 대한 SO 항목 보류
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,학생 입학
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} 비활성화
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} 비활성화
 DocType: Supplier,Billing Currency,결제 통화
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,아주 큰
@@ -2612,9 +2615,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,홈페이지 주요 제품
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,모든 평가 그룹
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,새로운웨어 하우스 이름
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),총 {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),총 {0} ({1})
 DocType: C-Form Invoice Detail,Territory,국가
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,언급 해주십시오 필요한 방문 없음
 DocType: Stock Settings,Default Valuation Method,기본 평가 방법
 DocType: Vehicle Log,Fuel Qty,연료 수량
 DocType: Production Order Operation,Planned Start Time,계획 시작 시간
@@ -2630,7 +2633,7 @@
 DocType: Price List,Price List Master,가격 목록 마스터
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,당신이 설정 한 목표를 모니터링 할 수 있도록 모든 판매 트랜잭션은 여러 ** 판매 사람 **에 태그 할 수 있습니다.
 ,S.O. No.,SO 번호
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},리드에서 고객을 생성 해주세요 {0}
 DocType: Price List,Applicable for Countries,국가에 대한 적용
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,만 제출할 수 있습니다 &#39;거부&#39; &#39;승인&#39;상태와 응용 프로그램을 남겨주세요
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},학생 그룹 이름은 행의 필수 {0}
@@ -2674,7 +2677,7 @@
 DocType: Project,Copied From,에서 복사 됨
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},이름 오류 : {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,부족
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1}과 연관되지 않는 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1}과 연관되지 않는 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,직원의 출석 {0}이 (가) 이미 표시되어
 DocType: Packing Slip,If more than one package of the same type (for print),만약 (프린트) 동일한 유형의 하나 이상의 패키지
 ,Salary Register,연봉 회원 가입
@@ -2693,7 +2696,7 @@
 DocType: Tax Rule,Use for Shopping Cart,쇼핑 카트에 사용
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},값은 {0} 속성에 대한 {1} 항목에 대한 속성 값 유효한 항목 목록에 존재하지 않는 {2}
 DocType: BOM Item,Scrap %,스크랩 %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","요금은 비례 적으로 사용자의 선택에 따라, 상품 수량 또는 금액에 따라 배포됩니다"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","요금은 비례 적으로 사용자의 선택에 따라, 상품 수량 또는 금액에 따라 배포됩니다"
 DocType: Maintenance Visit,Purposes,목적
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,이어야 하나의 항목이 반환 문서에 부정적인 수량 입력해야합니다
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","작업 {0} 워크 스테이션에서 사용 가능한 근무 시간 이상 {1}, 여러 작업으로 작업을 분해"
@@ -2714,16 +2717,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,지역의 나무를 관리합니다.
 DocType: Journal Entry Account,Sales Invoice,판매 송장
 DocType: Journal Entry Account,Party Balance,파티 밸런스
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,할인에 적용을 선택하세요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,할인에 적용을 선택하세요
 DocType: Company,Default Receivable Account,기본 채권 계정
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,위의 선택 기준에 대해 지불 한 총 연봉 은행 항목 만들기
 DocType: Stock Entry,Material Transfer for Manufacture,제조에 대한 자료 전송
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,할인 비율은 가격 목록에 대해 또는 전체 가격 목록에 하나를 적용 할 수 있습니다.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,할인 비율은 가격 목록에 대해 또는 전체 가격 목록에 하나를 적용 할 수 있습니다.
 DocType: Purchase Invoice,Half-yearly,반년마다
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,재고에 대한 회계 항목
 DocType: Vehicle Service,Engine Oil,엔진 오일
 DocType: Sales Invoice,Sales Team1,판매 Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,{0} 항목이 존재하지 않습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,{0} 항목이 존재하지 않습니다
 DocType: Sales Invoice,Customer Address,고객 주소
 DocType: Employee Loan,Loan Details,대출 세부 사항
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,행 {0} : 완성 된 수량은 0보다 커야합니다.
@@ -2731,24 +2734,24 @@
 DocType: Account,Root Type,루트 유형
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},행 번호 {0} : 이상 반환 할 수 없습니다 {1} 항목에 대한 {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,줄거리
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},목표웨어 하우스는 행에 대해 필수입니다 {0}
 DocType: Cheque Print Template,Primary Settings,기본 설정
 DocType: Purchase Invoice,Select Supplier Address,선택 공급 업체 주소
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,직원 추가
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,직원 추가
 DocType: Purchase Invoice Item,Quality Inspection,품질 검사
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,매우 작은
 DocType: Company,Standard Template,표준 템플릿
 DocType: Training Event,Theory,이론
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,경고 : 수량 요청 된 자료는 최소 주문 수량보다 적은
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,계정 {0} 동결
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,조직에 속한 계정의 별도의 차트와 법인 / 자회사.
 DocType: Payment Request,Mute Email,음소거 이메일
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","음식, 음료 및 담배"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},단지에 대한 지불을 할 수 미 청구 {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,수수료율은 100보다 큰 수 없습니다
 DocType: Stock Entry,Subcontract,하청
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,첫 번째 {0}을 입력하세요
@@ -2788,7 +2791,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,기존 거래와 창고 그룹으로 변환 할 수 없습니다.
 DocType: Assessment Result Tool,Result HTML,결과 HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,에 만료
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,학생들 추가
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,학생들 추가
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},선택하세요 {0}
 DocType: C-Form,C-Form No,C-양식 없음
 DocType: BOM,Exploded_items,Exploded_items
@@ -2831,7 +2834,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,회계 연도 선택
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,재정렬 수준
 DocType: Company,Chart Of Accounts Template,계정 템플릿의 차트
 DocType: Attendance,Attendance Date,출석 날짜
@@ -2846,14 +2849,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,항목을 중복
 DocType: Program Enrollment Tool,Get Students,학생들 가져 오기
 DocType: Serial No,Under Warranty,보증에 따른
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[오류]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[오류]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,당신이 판매 주문을 저장하면 단어에서 볼 수 있습니다.
 ,Employee Birthday,직원 생일
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,학생 배치 출석 도구
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,한계를 넘어
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,벤처 캐피탈
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,이 &#39;학년&#39;과 학술 용어는 {0}과 &#39;기간 이름&#39;{1} 이미 존재합니다. 이 항목을 수정하고 다시 시도하십시오.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","항목 {0}에 대한 기존의 트랜잭션이, 당신은의 값을 변경할 수 없습니다 {1}"
 DocType: UOM,Must be Whole Number,전체 숫자 여야합니다
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(일) 할당 된 새로운 잎
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,일련 번호 {0}이 (가) 없습니다
@@ -2873,7 +2876,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,이 판매 주문에 대해 청구 자료 %
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,기간 결산 항목
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,기존의 트랜잭션 비용 센터는 그룹으로 변환 할 수 없습니다
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},양 {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},양 {0} {1} {2} {3}
 DocType: Account,Depreciation,감가 상각
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),공급 업체 (들)
 DocType: Employee Attendance Tool,Employee Attendance Tool,직원의 출석 도구
@@ -2897,7 +2900,7 @@
 DocType: Supplier,Last Day of the Next Month,다음 달의 마지막 날
 DocType: Support Settings,Auto close Issue after 7 days,칠일 후 자동으로 닫 문제
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","이전에 할당 할 수없는 남기기 {0}, 휴가 균형이 이미 반입 전달 미래 휴가 할당 기록되었습니다로 {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),참고 : 지원 / 참조 날짜가 {0} 일에 의해 허용 된 고객의 신용 일을 초과 (들)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,학생 신청자
 DocType: Asset Category Account,Accumulated Depreciation Account,누적 감가 상각 계정
 DocType: Stock Settings,Freeze Stock Entries,동결 재고 항목
@@ -2908,7 +2911,7 @@
 ,Stock Analytics,재고 분석
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,작업은 비워 둘 수 없습니다
 DocType: Maintenance Visit Purpose,Against Document Detail No,문서의 세부 사항에 대한 없음
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,파티의 종류는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,파티의 종류는 필수입니다
 DocType: Quality Inspection,Outgoing,발신
 DocType: Material Request,Requested For,에 대해 요청
 DocType: Quotation Item,Against Doctype,문서 종류에 대하여
@@ -2925,11 +2928,11 @@
 DocType: Asset,Item Code,상품 코드
 DocType: Production Planning Tool,Create Production Orders,생산 오더를 생성
 DocType: Serial No,Warranty / AMC Details,보증 / AMC의 자세한 사항
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,활동 기반 그룹을 위해 학생들을 수동으로 선택하십시오.
 DocType: Journal Entry,User Remark,사용자 비고
 DocType: Lead,Market Segment,시장 세분
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},지불 금액은 총 음의 뛰어난 금액보다 클 수 없습니다 {0}
 DocType: Employee Internal Work History,Employee Internal Work History,직원 내부 작업 기록
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),결산 (박사)
 DocType: Cheque Print Template,Cheque Size,수표 크기
@@ -2945,7 +2948,7 @@
 DocType: Production Planning Tool,Create Material Requests,자료 요청을 만듭니다
 DocType: Employee Education,School/University,학교 / 대학
 DocType: Payment Request,Reference Details,참조 세부 사항
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,내용 연수 후 예상 값은 총 구매 금액보다 작아야합니다
 DocType: Sales Invoice Item,Available Qty at Warehouse,창고에서 사용 가능한 수량
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,청구 금액
 DocType: Asset,Double Declining Balance,이중 체감
@@ -2966,20 +2969,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","콘텐츠 화해는 열기 항목이기 때문에 차이 계정, 자산 / 부채 형 계정이어야합니다"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},지급 금액은 대출 금액보다 클 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},구매 주문 번호 항목에 필요한 {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,생산 주문이 작성되지
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,생산 주문이 작성되지
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','시작일자'는  '마감일자' 이전이어야 합니다
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},학생으로 상태를 변경할 수 없습니다 {0} 학생 응용 프로그램과 연결되어 {1}
 DocType: Asset,Fully Depreciated,완전 상각
 ,Stock Projected Qty,재고 수량을 예상
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},고객 {0} 프로젝트에 속하지 않는 {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,표시된 출석 HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","견적, 당신은 당신의 고객에게 보낸 입찰 제안서 있습니다"
 DocType: Sales Order,Customer's Purchase Order,고객의 구매 주문
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,일련 번호 및 배치
 DocType: Warranty Claim,From Company,회사에서
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,평가 기준의 점수의 합 {0} 할 필요가있다.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,값 또는 수량
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,감가 상각 수 예약을 설정하십시오
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,값 또는 수량
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,생산 주문을 사육 할 수 없습니다
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,분
 DocType: Purchase Invoice,Purchase Taxes and Charges,구매 세금과 요금
@@ -2992,7 +2995,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,모든 창고
 DocType: Sales Partner,Retailer,소매상 인
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,계정에 신용은 대차 대조표 계정이어야합니다
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,모든 공급 유형
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,모든 공급 유형
 DocType: Global Defaults,Disable In Words,단어에서 해제
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,항목이 자동으로 번호가되어 있지 않기 때문에 상품 코드는 필수입니다
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},견적 {0}은 유형 {1}
@@ -3001,6 +3004,7 @@
 DocType: Production Order,PRO-,찬성-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,당좌 차월 계정
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,급여 슬립을
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,행 번호 {0} : 할당 된 금액은 미납 금액을 초과 할 수 없습니다.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,찾아 BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,보안 대출
 DocType: Purchase Invoice,Edit Posting Date and Time,편집 게시 날짜 및 시간
@@ -3040,7 +3044,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},이상 재고 거래는 이전 업데이트 할 수 없습니다 {0}
 DocType: Purchase Invoice Item,PR Detail,PR의 세부 사항
 DocType: Sales Order,Fully Billed,완전 청구
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},직원에 기본 지불 계정을 설정하십시오 {0}
 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 +127,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),패키지의 총 무게.보통 그물 무게 + 포장 재료의 무게. (프린트)
@@ -3051,7 +3054,7 @@
 DocType: Student Group,Group Based On,그룹 기반
 DocType: Journal Entry,Bill Date,청구 일자
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","서비스 항목, 유형, 주파수 및 비용 금액이 필요합니다"
-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:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","우선 순위가 가장 높은 가격에 여러 규칙이있는 경우에도, 그 다음 다음 내부의 우선 순위가 적용됩니다"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},당신이 정말로 {0}에 대한 모든 급여 슬립 제출 하시겠습니까 {1}
 DocType: Cheque Print Template,Cheque Height,수표 높이
 DocType: Supplier,Supplier Details,공급 업체의 상세 정보
@@ -3063,7 +3066,7 @@
 DocType: Vehicle Log,Invoice Ref,송장 참조
 DocType: Purchase Order,Recurring Order,반복 주문
 DocType: Company,Default Income Account,기본 수입 계정
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,고객 그룹 / 고객
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,고객 그룹 / 고객
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),닫히지 않은 회계 연도 이익 / 손실 (신용)
 DocType: Sales Invoice,Time Sheets,시간 시트
 DocType: Payment Gateway Account,Default Payment Request Message,기본 지불 요청 메시지
@@ -3083,10 +3086,10 @@
 DocType: Notification Control,Quotation Message,견적 메시지
 DocType: Employee Loan,Employee Loan Application,직원 대출 신청
 DocType: Issue,Opening Date,Opening 날짜
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,출석이 성공적으로 표시되었습니다.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,출석이 성공적으로 표시되었습니다.
 DocType: Journal Entry,Remark,비고
 DocType: Purchase Receipt Item,Rate and Amount,속도 및 양
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},계정 유형 {0}해야합니다에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},계정 유형 {0}해야합니다에 대한 {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,잎과 휴일
 DocType: School Settings,Current Academic Term,현재 학기
 DocType: School Settings,Current Academic Term,현재 학기
@@ -3109,7 +3112,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,학생 그룹
 DocType: Shopping Cart Settings,Quotation Series,견적 시리즈
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",항목 ({0}) 항목의 그룹 이름을 변경하거나 항목의 이름을 변경하시기 바랍니다 같은 이름을 가진
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,고객을 선택하세요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,고객을 선택하세요
 DocType: C-Form,I,나는
 DocType: Company,Asset Depreciation Cost Center,자산 감가 상각 비용 센터
 DocType: Sales Order Item,Sales Order Date,판매 주문 날짜
@@ -3128,20 +3131,20 @@
 DocType: Vehicle,Insurance Details,보험의 자세한 사항
 DocType: Account,Payable,지급
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,상환 기간을 입력하세요
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),채무자 ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),채무자 ({0})
 DocType: Pricing Rule,Margin,마진
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,신규 고객
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,매출 총 이익 %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,통관 날짜
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,총 구매 금액이 필수입니다
 DocType: Lead,Address Desc,제품 설명에게 주소
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,파티는 필수입니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,파티는 필수입니다
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,항목 이름
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,판매 또는 구매의이어야 하나를 선택해야합니다
-DocType: Grading Structure,Grade Intervals,학년 간격
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,비즈니스의 성격을 선택합니다.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},행 # {0} : 참조 {1}에 중복 항목이 있습니다. {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,제조 작업은 어디를 수행한다.
 DocType: Asset Movement,Source Warehouse,자료 창고
 DocType: Installation Note,Installation Date,설치 날짜
@@ -3178,7 +3181,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,인쇄 템플릿에 대한 편지 머리.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,인쇄 템플릿의 제목은 형식 상 청구서를 예.
 DocType: Student Guardian,Student Guardian,가디언
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,평가 유형 요금은 포괄적으로 표시 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 평가
@@ -3206,7 +3209,7 @@
 DocType: Company,Exchange Gain / Loss Account,교환 이득 / 손실 계정
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,직원 및 출석
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},목적 중 하나 여야합니다 {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,양식을 작성하고 저장
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,커뮤니티 포럼
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,재고 실제 수량
@@ -3222,7 +3225,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,재주문 수량
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,현재 채용
 DocType: Company,Stock Adjustment Account,재고 조정 계정
-DocType: Journal Entry,Write Off,탕치다
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,탕치다
 DocType: Timesheet Detail,Operation ID,작업 ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","시스템 사용자 (로그인) ID. 설정하면, 모든 HR 양식의 기본이 될 것입니다."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}에서 {1}
@@ -3233,27 +3236,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,공급자는 고객에게 제공
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# 양식 / 상품 / {0}) 품절
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,다음 날짜 게시 날짜보다 커야합니다
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,쇼 세금 해체
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,쇼 세금 해체
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},때문에 / 참조 날짜 이후 수 없습니다 {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,데이터 가져 오기 및 내보내기
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","재고 항목은 따라서 당신이 다시 할당하거나 수정할 수 없습니다, {0} 창고에 존재"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,어떤 학생들은 찾을 수 없음
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,어떤 학생들은 찾을 수 없음
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,송장 전기 일
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,팔다
 DocType: Sales Invoice,Rounded Total,둥근 총
 DocType: Product Bundle,List items that form the package.,패키지를 형성하는 목록 항목.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,백분율 할당은 100 % 같아야
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,파티를 선택하기 전에 게시 날짜를 선택하세요
 DocType: Program Enrollment,School House,학교 하우스
 DocType: Serial No,Out of AMC,AMC의 아웃
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,견적을 선택하십시오
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,견적을 선택하십시오
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,유지 보수 방문을합니다
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,견적을 선택하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,예약 감가 상각의 수는 감가 상각의 총 수보다 클 수 없습니다
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,유지 보수 방문을합니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,판매 마스터 관리자 {0} 역할이 사용자에게 문의하시기 바랍니다
 DocType: Company,Default Cash Account,기본 현금 계정
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,회사 (안 고객 또는 공급 업체) 마스터.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,이이 학생의 출석을 기반으로
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,학생 없음
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,더 많은 항목 또는 완전 개방 형태로 추가
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','예상 배달 날짜'를 입력하십시오
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,배달 노트는 {0}이 판매 주문을 취소하기 전에 취소해야합니다
@@ -3285,6 +3289,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,항목 3
 DocType: Purchase Order,Customer Contact Email,고객 연락처 이메일
 DocType: Warranty Claim,Item and Warranty Details,상품 및 보증의 자세한 사항
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,상품 코드&gt; 상품 그룹&gt; 브랜드
 DocType: Sales Team,Contribution (%),기여도 (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,참고 : 결제 항목이 '현금 또는 은행 계좌'이 지정되지 않았기 때문에 생성되지 않습니다
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,필수 과목을 가져 오려면 프로그램을 선택하십시오.
@@ -3300,9 +3305,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,계정조정전
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},에 {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),추가 세금 및 수수료 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,상품 세금 행 {0} 유형의 세금 또는 수입 비용 또는 청구의 계정이 있어야합니다
 DocType: Sales Order,Partly Billed,일부 청구
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,항목 {0} 고정 자산 항목이어야합니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,항목 {0} 고정 자산 항목이어야합니다
 DocType: Item,Default BOM,기본 BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,다시 입력 회사 이름은 확인하시기 바랍니다
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,총 발행 AMT 사의
@@ -3312,8 +3317,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,자동차
 DocType: Vehicle,Insurance Company,보험 회사
 DocType: Asset Category Account,Fixed Asset Account,고정 자산 계정
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,변하기 쉬운
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,배달 주에서
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,변하기 쉬운
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,배달 주에서
 DocType: Student,Student Email Address,학생 이메일 주소
 DocType: Timesheet Detail,From Time,시간에서
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,재고:
@@ -3325,12 +3330,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,가격 기준 환율
 DocType: Purchase Invoice Item,Rate,비율
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,인턴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,주소 명
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,주소 명
 DocType: Stock Entry,From BOM,BOM에서
 DocType: Assessment Code,Assessment Code,평가 코드
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,기본
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} 전에 재고 거래는 동결
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule','생성 일정'을 클릭 해주세요
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","예) kg, 단위, NOS, M"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,당신이 참조 날짜를 입력 한 경우 참조 번호는 필수입니다
 DocType: Bank Reconciliation Detail,Payment Document,결제 문서
@@ -3338,19 +3343,19 @@
 DocType: Salary Slip,Salary Structure,급여 체계
 DocType: Account,Bank,은행
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,항공 회사
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,문제의 소재
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,문제의 소재
 DocType: Material Request Item,For Warehouse,웨어 하우스
 DocType: Employee,Offer Date,제공 날짜
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,견적
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,당신은 오프라인 모드에 있습니다. 당신은 당신이 네트워크를 때까지 다시로드 할 수 없습니다.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,어떤 학생 그룹이 생성되지 않습니다.
 DocType: Purchase Invoice Item,Serial No,일련 번호
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,월별 상환 금액은 대출 금액보다 클 수 없습니다
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince를 세부 사항을 먼저 입력하십시오
 DocType: Purchase Invoice,Print Language,인쇄 언어
 DocType: Salary Slip,Total Working Hours,총 근로 시간
 DocType: Stock Entry,Including items for sub assemblies,서브 어셈블리에 대한 항목을 포함
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,입력 값은 양수 여야합니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,입력 값은 양수 여야합니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,모든 국가
 DocType: Purchase Invoice,Items,아이템
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,학생이 이미 등록되어 있습니다.
@@ -3370,17 +3375,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',변형에 대한 측정의 기본 단위는 &#39;{0}&#39;템플릿에서와 동일해야합니다 &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,에 의거에게 계산
 DocType: Delivery Note Item,From Warehouse,창고에서
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,재료 명세서 (BOM)와 어떤 항목은 제조 없습니다
 DocType: Assessment Plan,Supervisor Name,관리자 이름
 DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
 DocType: Program Enrollment Course,Program Enrollment Course,프로그램 등록 과정
-DocType: Grading Structure,Grading Structure,등급 구조
 DocType: Purchase Taxes and Charges,Valuation and Total,평가 및 총
 DocType: Tax Rule,Shipping City,배송시
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,이 항목은 {0} (템플릿)의 변종이다.'카피'가 설정되어 있지 않는 속성은 템플릿에서 복사됩니다
 DocType: Notification Control,Customize the Notification,알림 사용자 지정
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,운영으로 인한 현금 흐름
 DocType: Sales Invoice,Shipping Rule,배송 규칙
@@ -3401,8 +3404,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},기본의 BOM은 존재하지 않습니다 항목에 대한 {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,첫 번째 게시 날짜를 선택하세요
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,날짜를 열기 날짜를 닫기 전에해야
 DocType: Leave Control Panel,Carry Forward,이월하다
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,기존의 트랜잭션 비용 센터 원장으로 변환 할 수 없습니다
 DocType: Department,Days for which Holidays are blocked for this department.,휴일이 부서 차단하는 일.
@@ -3415,7 +3418,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,레터 첨부하기
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,마지막 커뮤니케이션
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,마지막 커뮤니케이션
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',카테고리는 '평가'또는 '평가 및 전체'에 대한 때 공제 할 수 없습니다
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},직렬화 된 항목에 대한 일련 NOS 필수 {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,송장과 일치 결제
@@ -3431,7 +3434,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),총 AMT ()
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,엔터테인먼트 & 레저
 DocType: Quality Inspection,Item Serial No,상품 시리얼 번호
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,직원 레코드 만들기
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,직원 레코드 만들기
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,전체 현재
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,회계 문
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,시간
@@ -3444,10 +3447,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,알 수 없는
 DocType: Shipping Rule,Shipping Rule Conditions,배송 규칙 조건
 DocType: BOM Replace Tool,The new BOM after replacement,교체 후 새로운 BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,판매 시점
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,판매 시점
 DocType: Payment Entry,Received Amount,받은 금액
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,인력&gt; 인사말 설정에서 직원 네임 시스템 설정
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",전체 수량에 대한 만들기 위해 이미 양을 무시
 DocType: Account,Tax,세금
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,표시되지
@@ -3460,9 +3461,9 @@
 DocType: Batch,Source Document Name,원본 문서 이름
 DocType: Batch,Source Document Name,원본 문서 이름
 DocType: Job Opening,Job Title,직책
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,사용자 만들기
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,사용자 만들기
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,그램
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,제조하는 수량은 0보다 커야합니다.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,유지 보수 통화에 대해 보고서를 참조하십시오.
 DocType: Stock Entry,Update Rate and Availability,업데이트 속도 및 가용성
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,당신이 양에 대해 더 수신하거나 전달하도록 허용 비율 명령했다.예를 들면 : 당신이 100 대를 주문한 경우. 당신의 수당은 다음 110 단위를받을 10 % 허용된다.
@@ -3472,28 +3473,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},비용 계정 항목에 대한 필수 {0}
 DocType: BOM,Website Description,웹 사이트 설명
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,자본에 순 변경
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,첫 번째 구매 송장 {0}을 취소하십시오
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","이메일 주소는 이미 존재, 고유해야합니다 {0}"
 DocType: Serial No,AMC Expiry Date,AMC 유효 날짜
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,영수증
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,영수증
 ,Sales Register,판매 등록
 DocType: Daily Work Summary Settings Company,Send Emails At,에 이메일 보내기
 DocType: Quotation,Quotation Lost Reason,견적 잃어버린 이유
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,귀하의 도메인을 선택
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},거래 기준은 {0}에 제출하지 {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,편집 할 수있는 것은 아무 것도 없습니다.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,이 달 보류중인 활동에 대한 요약
 DocType: Customer Group,Customer Group Name,고객 그룹 이름
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,아직 고객 없음!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,현금 흐름표
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},대출 금액은 최대 대출 금액을 초과 할 수 없습니다 {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,특허
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-양식에서이 송장 {0}을 제거하십시오 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,계정을 끄기 쓰기 입력하십시오
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,마지막 주문 날짜
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},계정 {0} 수행은 회사 소유하지 {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,행 {0}의 일련 번호가 배달 참고와 일치하지 않습니다.
 DocType: Student,Guardian Details,가디언의 자세한 사항
 DocType: C-Form,C-Form,C-양식
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,여러 직원 마크 출석
@@ -3518,20 +3521,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',행 {0} # 계정 유형이어야합니다 &#39;고정 자산&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,수량 아웃
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,판매 배송 금액을 계산하는 규칙
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,시리즈는 필수입니다
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,시리즈는 필수입니다
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,금융 서비스
 DocType: Student Sibling,Student ID,학생 아이디
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,시간 로그에 대한 활동의 종류
 DocType: Tax Rule,Sales,판매
 DocType: Stock Entry Detail,Basic Amount,기본 금액
 DocType: Training Event,Exam,시험
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},재고 품목에 필요한 창고 {0}
 DocType: Leave Allocation,Unused leaves,사용하지 않는 잎
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,CR
 DocType: Tax Rule,Billing State,결제 주
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,이체
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} 파티 계정과 연결되어 있지 않습니다 {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} 파티 계정과 연결되어 있지 않습니다 {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(서브 어셈블리 포함) 폭발 BOM 가져 오기
 DocType: Authorization Rule,Applicable To (Employee),에 적용 (직원)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,마감일은 필수입니다
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,속성에 대한 증가는 {0} 0이 될 수 없습니다
@@ -3542,13 +3545,13 @@
 ,Inactive Customers,비활성 고객
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,구매 영수증
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,어떻게 가격의 규칙이 적용됩니다?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,어떻게 가격의 규칙이 적용됩니다?
 DocType: Stock Entry,Delivery Note No,납품서 없음
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","이 옵션이 선택되면, 단지 최종 원자재에 대한 자료 요청은 자료 요청에 포함됩니다 구입합니다. 그렇지 않으면, 부모 항목에 대한 자료 요청이 생성됩니다"
 DocType: Cheque Print Template,Message to show,메시지 표시합니다
 DocType: Company,Retail,소매의
 DocType: Attendance,Absent,없는
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,번들 제품
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,번들 제품
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},행 {0} : 잘못된 참조 {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,구매세금 및 요금 템플릿
 DocType: Upload Attendance,Download Template,다운로드 템플릿
@@ -3558,10 +3561,10 @@
 DocType: Payment Entry,Account Paid From,계정에서 유료
 DocType: Purchase Order Item Supplied,Raw Material Item Code,원료 상품 코드
 DocType: Journal Entry,Write Off Based On,에 의거 오프 쓰기
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,리드를 확인
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,리드를 확인
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,인쇄 및 문구
 DocType: Stock Settings,Show Barcode Field,쇼 바코드 필드
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,공급 업체 이메일 보내기
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,공급 업체 이메일 보내기
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","급여는 이미 {0}과 {1},이 기간 사이가 될 수 없습니다 신청 기간을 남겨 사이의 기간에 대해 처리."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,일련 번호의 설치 기록
 DocType: Guardian Interest,Guardian Interest,가디언 관심
@@ -3574,6 +3577,7 @@
 DocType: Offer Letter,Awaiting Response,응답을 기다리는 중
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,위
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},잘못된 속성 {0} {1}
+DocType: Supplier,Mention if non-standard payable account,표준이 아닌 지불 계정에 대한 언급
 DocType: Salary Slip,Earning & Deduction,당기순이익/손실
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,선택.이 설정은 다양한 거래를 필터링하는 데 사용됩니다.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,부정 평가 비율은 허용되지 않습니다
@@ -3589,10 +3593,9 @@
 DocType: Production Order Item,Production Order Item,생산 오더 항목
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,검색된 레코드가 없습니다
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,폐기 자산의 비용
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,부분적으로 ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1} : 코스트 센터는 항목에 대해 필수입니다 {2}
 DocType: Vehicle,Policy No,정책 없음
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,제품 번들에서 항목 가져 오기
 DocType: Asset,Straight Line,일직선
 DocType: Project User,Project User,프로젝트 사용자
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,스플릿
@@ -3610,7 +3613,7 @@
 DocType: Program Enrollment Tool,Get Students From,학생들 가져 오기
 DocType: Hub Settings,Seller Country,판매자 나라
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,웹 사이트에 항목을 게시
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,일괄 그룹 학생
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,일괄 그룹 학생
 DocType: Authorization Rule,Authorization Rule,권한 부여 규칙
 DocType: Sales Invoice,Terms and Conditions Details,약관의 자세한 사항
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,사양
@@ -3663,14 +3666,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,수표 날짜
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},계정 {0} : 부모 계정 {1} 회사에 속하지 않는 {2}
 DocType: Program Enrollment Tool,Student Applicants,학생 지원자
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,성공적으로이 회사에 관련된 모든 트랜잭션을 삭제!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,날짜에로
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,등록 날짜
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,근신
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,급여의 구성 요소
 DocType: Program Enrollment Tool,New Academic Year,새 학년
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,반품 / 신용 참고
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,반품 / 신용 참고
 DocType: Stock Settings,Auto insert Price List rate if missing,자동 삽입 가격표 속도없는 경우
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,총 지불 금액
 DocType: Production Order Item,Transferred Qty,수량에게 전송
@@ -3690,7 +3693,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","캐주얼, 병 등과 같은 잎의 종류"
 DocType: Email Digest,Send regular summary reports via Email.,이메일을 통해 정기적으로 요약 보고서를 보냅니다.
 DocType: Payment Entry,PE-,체육-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},경비 요청 유형에 기본 계정을 설정하십시오 {0}
 DocType: Assessment Result,Student Name,학생 이름
 DocType: Brand,Item Manager,항목 관리자
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,채무 급여
@@ -3711,6 +3714,7 @@
 ,Sales Funnel,판매 퍼넬
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,약자는 필수입니다
 DocType: Project,Task Progress,작업 진행
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,카트
 ,Qty to Transfer,전송하는 수량
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,리드 또는 고객에게 인용.
 DocType: Stock Settings,Role Allowed to edit frozen stock,동결 재고을 편집 할 수 있는 역할
@@ -3738,13 +3742,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,항목 와이즈 세금 세부 정보
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,연구소 약어
 ,Item-wise Price List Rate,상품이 많다는 가격리스트 평가
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,공급 업체 견적
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,공급 업체 견적
 DocType: Quotation,In Words will be visible once you save the Quotation.,당신은 견적을 저장 한 단어에서 볼 수 있습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},수량 ({0})은 행 {1}의 분수가 될 수 없습니다.
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,수수료를 수집
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},바코드 {0}이 (가) 이미 상품에 사용되는 {1}
 DocType: Lead,Add to calendar on this date,이 날짜에 캘린더에 추가
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,비용을 추가하는 규칙.
 DocType: Item,Opening Stock,열기 증권
@@ -3761,8 +3765,8 @@
 Updated via 'Time Log'",'소요시간 로그' 분단위 업데이트
 DocType: Customer,From Lead,리드에서
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,생산 발표 순서.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,회계 연도 선택 ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,회계 연도 선택 ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS 프로필 POS 항목을 만드는 데 필요한
 DocType: Program Enrollment Tool,Enroll Students,학생 등록
 DocType: Hub Settings,Name Token,이름 토큰
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,표준 판매
@@ -3773,7 +3777,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} 견적서에 대한 {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,프로젝트 이름
-DocType: Supplier,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
+DocType: Customer,Mention if non-standard receivable account,언급 표준이 아닌 채권 계정의 경우
 DocType: Journal Entry Account,If Income or Expense,만약 소득 또는 비용
 DocType: Production Order,Required Items,필수 항목
 DocType: Stock Ledger Entry,Stock Value Difference,재고 가치의 차이
@@ -3794,7 +3798,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,목표를 설정 항목 그룹 방향이 판매 사람입니다.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],고정 재고 이전보다 [일]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,행 # {0} : 자산은 고정 자산 구매 / 판매를위한 필수입니다
-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 (공백) 동안 우선 순위는 0-20 사이의 숫자입니다.숫자가 높을수록 동일한 조건으로 여러 가격 규칙이있는 경우는 우선 순위를 의미합니다."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","둘 이상의 가격 결정 규칙은 상기 조건에 따라 발견되면, 우선 적용된다.기본 값이 0 (공백) 동안 우선 순위는 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.,다음 사용자가 블록 일에 대한 허가 신청을 승인 할 수 있습니다.
@@ -3820,7 +3824,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,그것은 재고 품목이 아니기 때문에 {0} 항목을 무시
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",특정 트랜잭션에서 가격 규칙을 적용하지 않으려면 모두 적용 가격 규칙 비활성화해야합니다.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",특정 트랜잭션에서 가격 규칙을 적용하지 않으려면 모두 적용 가격 규칙 비활성화해야합니다.
 DocType: Assessment Group,Parent Assessment Group,상위 평가 그룹
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,채용 정보
 ,Sales Order Trends,판매 주문 동향
@@ -3831,7 +3835,7 @@
 DocType: Stock Entry Detail,Additional Cost,추가 비용
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,회계 연도 종료일
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","바우처를 기반으로 필터링 할 수 없음, 바우처로 그룹화하는 경우"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,공급 업체의 견적을
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,공급 업체의 견적을
 DocType: Quality Inspection,Incoming,수신
 DocType: BOM,Materials Required (Exploded),필요한 재료 (분해)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",자신보다 다른 조직에 사용자를 추가
@@ -3859,6 +3863,7 @@
 DocType: Employee,History In Company,회사의 역사
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,뉴스 레터
 DocType: Stock Ledger Entry,Stock Ledger Entry,재고 원장 입력
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,고객&gt; 고객 그룹&gt; 지역
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,같은 항목을 여러 번 입력 된
 DocType: Department,Leave Block List,차단 목록을 남겨주세요
 DocType: Sales Invoice,Tax ID,세금 아이디
@@ -3868,7 +3873,7 @@
 DocType: Customer,Sales Partner and Commission,판매 파트너 및위원회
 DocType: Employee Loan,Rate of Interest (%) / Year,이자 (%) / 년의 속도
 ,Project Quantity,프로젝트 수량
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","총 {0} 모든 항목에 대해 당신이 &#39;를 기반으로 요금을 분배&#39;변경해야 할 수있다, 제로"
 DocType: Opportunity,To Discuss,토론하기
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} 단위 {1} {2}이 거래를 완료하는 필요.
 DocType: Loan Type,Rate of Interest (%) Yearly,이자의 비율 (%) 연간
@@ -3883,7 +3888,7 @@
 DocType: Purchase Invoice,Return,반환
 DocType: Production Order Operation,Production Order Operation,생산 오더 운영
 DocType: Pricing Rule,Disable,사용 안함
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,지불 모드는 지불 할 필요
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,지불 모드는 지불 할 필요
 DocType: Project Task,Pending Review,검토 중
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","이미 같이 자산 {0}, 폐기 될 수 없다 {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(비용 청구를 통해) 총 경비 요청
@@ -3891,11 +3896,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,마크 결석
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},행 {0} 다음 BOM 번호의 통화 {1} 선택한 통화 같아야한다 {2}
 DocType: Journal Entry Account,Exchange Rate,환율
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,판매 주문 {0} 제출되지 않았습니다.
 DocType: Homepage,Tag Line,태그 라인
 DocType: Fee Component,Fee Component,요금 구성 요소
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,함대 관리
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,에서 항목 추가
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,에서 항목 추가
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},창고 {0} : 부모 계정이 {1} 회사에 BOLONG하지 않는 {2}
 DocType: Cheque Print Template,Regular,정규병
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,모든 평가 기준 총 Weightage 100 %이어야합니다
@@ -3908,7 +3913,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,선택한 항목이 배치를 가질 수 없습니다
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","평가 비율은 회계 항목을 수행하는 데 필요한 항목 {0} 찾을 수 없습니다 {1} {2}. 항목의 샘플 항목으로 거래되는 경우 {1}, {1} (으) 항목 테이블에서 그 언급 해주십시오. 그렇지 않으면, / 제출 중 노력이 항목을 취소 한 다음 항목 레코드의 항목이나 언급 평가 비율에 대한 들어오는 재고 트랜잭션을 생성하고십시오"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,이 납품서에 대해 배송자재 %
 DocType: Project,Customer Details,고객 상세 정보
@@ -3917,15 +3922,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,수신기 NOS에 대한 URL 매개 변수를 입력
 DocType: Payment Entry,Paid Amount,지불 금액
 DocType: Assessment Plan,Supervisor,감독자
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,온라인으로
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,온라인으로
 ,Available Stock for Packing Items,항목 포장 재고품
 DocType: Item Variant,Item Variant,항목 변형
 DocType: Assessment Result Tool,Assessment Result Tool,평가 결과 도구
 DocType: BOM Scrap Item,BOM Scrap Item,BOM 스크랩 항목
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,제출 된 주문은 삭제할 수 없습니다
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,품질 관리
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} 항목이 비활성화되었습니다
 DocType: Employee Loan,Repay Fixed Amount per Period,기간 당 고정 금액을 상환
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},제품의 수량을 입력 해주십시오 {0}
 DocType: Employee External Work History,Employee External Work History,직원 외부 일 역사
@@ -3952,7 +3957,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,학생 이메일 ID
 DocType: Employee,Notice (days),공지 사항 (일)
 DocType: Tax Rule,Sales Tax Template,판매 세 템플릿
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,송장을 저장하는 항목을 선택
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,송장을 저장하는 항목을 선택
 DocType: Employee,Encashment Date,현금화 날짜
 DocType: Training Event,Internet,인터넷
 DocType: Account,Stock Adjustment,재고 조정
@@ -3976,7 +3981,7 @@
 DocType: Item Variant Attribute,Attribute,속성
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,범위 /에서 지정하십시오
 DocType: Serial No,Under AMC,AMC에서
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,항목 평가 비율은 착륙 비용 바우처 금액을 고려하여 계산됩니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,항목 평가 비율은 착륙 비용 바우처 금액을 고려하여 계산됩니다
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,트랜잭션을 판매의 기본 설정.
 DocType: Guardian,Guardian Of ,의 가디언
 DocType: Grading Scale Interval,Threshold,문지방
@@ -3986,6 +3991,7 @@
 DocType: Purchase Invoice,Debit Note Issued,직불 주 발행
 DocType: Production Order,Warehouses,창고
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} 자산은 양도 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,이 아이템은 {0}의 변형입니다 (템플릿).
 DocType: Workstation,per hour,시간당
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,구매
 DocType: Announcement,Announcement,발표
@@ -4001,8 +4007,8 @@
 DocType: Account,Receivable,받을 수있는
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,행 번호 {0} : 구매 주문이 이미 존재로 공급 업체를 변경할 수 없습니다
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,설정 신용 한도를 초과하는 거래를 제출하도록 허용 역할.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,제조 할 항목을 선택합니다
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,제조 할 항목을 선택합니다
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","마스터 데이터 동기화, 그것은 시간이 걸릴 수 있습니다"
 DocType: Item,Material Issue,소재 호
 DocType: Hub Settings,Seller Description,판매자 설명
 DocType: Employee Education,Qualification,자격
@@ -4014,7 +4020,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,주문
 DocType: Salary Detail,Component,구성 요소
 DocType: Assessment Criteria,Assessment Criteria Group,평가 기준 그룹
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},감가 상각 누계액을 열면 동일 미만이어야합니다 {0}
 DocType: Warehouse,Warehouse Name,창고의 이름
 DocType: Naming Series,Select Transaction,거래 선택
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,역할을 승인 또는 사용을 승인 입력하십시오
@@ -4027,7 +4033,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,제출 된 재고 항목 {0}이 존재하기 때문에 취소 할 수 없습니다
 DocType: Employee Loan,Disbursement Date,지급 날짜
 DocType: Vehicle,Vehicle,차량
 DocType: Purchase Invoice,In Words,즉
@@ -4042,14 +4048,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead %
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,자산 감가 상각 및 잔액
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},금액은 {0} {1}에서 전송 {2}에 {3}
 DocType: Sales Invoice,Get Advances Received,선불수취
 DocType: Email Digest,Add/Remove Recipients,추가 /받는 사람을 제거
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},거래 정지 생산 오더에 대해 허용되지 {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",기본값으로이 회계 연도 설정하려면 '기본값으로 설정'을 클릭
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,어울리다
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,부족 수량
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,항목 변형 {0} 같은 속성을 가진 존재
 DocType: Employee Loan,Repay from Salary,급여에서 상환
 DocType: Leave Application,LAP/,무릎/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},에 대한 지불을 요청 {0} {1} 금액에 대한 {2}
@@ -4067,7 +4073,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,평가 결과의 세부 사항
 DocType: Employee Education,Employee Education,직원 교육
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,항목 그룹 테이블에서 발견 중복 항목 그룹
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,그것은 상품 상세을 가져 오기 위해 필요하다.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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}이 (가) 이미 수신 된
@@ -4076,7 +4082,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","창고 {0} 모든 계정에 연결되지 않고, /웨어 하우스에 대한 대응 (자산) 계정을 연결 작성하시기 바랍니다."
 DocType: Purchase Invoice,Recurring Id,경상 아이디
 DocType: Customer,Sales Team Details,판매 팀의 자세한 사항
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,영구적으로 삭제 하시겠습니까?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,영구적으로 삭제 하시겠습니까?
 DocType: Expense Claim,Total Claimed Amount,총 주장 금액
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,판매를위한 잠재적 인 기회.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},잘못된 {0}
@@ -4087,13 +4093,14 @@
 DocType: Warehouse,PIN,핀
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext에 설치 학교
 DocType: Sales Invoice,Base Change Amount (Company Currency),자료 변경 금액 (회사 통화)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,다음 창고에 대한 회계 항목이 없음
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,마지막 주문 금액
+DocType: Task,Is Milestone,마일스톤이다
 DocType: Daily Work Summary,Email Sent To,이메일로 발송
 DocType: Budget,Warn,경고
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","다른 발언, 기록에 가야한다 주목할만한 노력."
@@ -4114,7 +4121,7 @@
 DocType: Item Attribute Value,Attribute Value,속성 값
 ,Itemwise Recommended Reorder Level,Itemwise는 재주문 수준에게 추천
 DocType: Salary Detail,Salary Detail,급여 세부 정보
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,먼저 {0}를 선택하세요
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,먼저 {0}를 선택하세요
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,항목의 일괄 {0} {1} 만료되었습니다.
 DocType: Sales Invoice,Commission,위원회
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,제조 시간 시트.
@@ -4126,41 +4133,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`확정된 재고'는 `% d의 일보다 작아야한다.
 DocType: Tax Rule,Purchase Tax Template,세금 템플릿을 구입
 ,Project wise Stock Tracking,프로젝트 현명한 재고 추적
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},유지 보수 일정은 {0}에있는 {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),실제 수량 (소스 / 대상에서)
 DocType: Item Customer Detail,Ref Code,참조 코드
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,직원 기록.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,다음 감가 상각 날짜를 설정하십시오
 DocType: HR Settings,Payroll Settings,급여 설정
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,연결되지 않은 청구서 지불을 일치시킵니다.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,장소 주문
 DocType: Email Digest,New Purchase Orders,새로운 구매 주문
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,루트는 부모의 비용 센터를 가질 수 없습니다
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,선택 브랜드 ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,선택 브랜드 ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,등의 감가 상각 누계액
 DocType: Sales Invoice,C-Form Applicable,해당 C-양식
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},작업 시간은 작업에 대한 0보다 큰 수 있어야 {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,창고는 필수입니다
 DocType: Supplier,Address and Contacts,주소 및 연락처
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM 변환 세부 사항
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100 픽셀로 웹 친화적 인 900px (W)를 유지 (H)
 DocType: Program,Program Abbreviation,프로그램의 약자
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,생산 주문은 항목 템플릿에 대해 제기 할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,요금은 각 항목에 대해 구매 영수증에 업데이트됩니다
 DocType: Warranty Claim,Resolved By,에 의해 해결
 DocType: Bank Guarantee,Start Date,시작 날짜
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,기간 동안 잎을 할당합니다.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,수표와 예금 잘못 삭제
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,계정 {0} : 당신은 부모 계정 자체를 할당 할 수 없습니다
 DocType: Purchase Invoice Item,Price List Rate,가격리스트 평가
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,고객 따옴표를 만들기
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,고객 따옴표를 만들기
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""재고""표시 또는 ""재고 부족""이 창고에 재고를 기반으로."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),재료 명세서 (BOM)
 DocType: Item,Average time taken by the supplier to deliver,공급 업체에 의해 촬영 평균 시간 제공하는
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,평가 결과
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,시간
 DocType: Project,Expected Start Date,예상 시작 날짜
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,요금은 해당 항목에 적용 할 수없는 경우 항목을 제거
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,거래 통화는 지불 게이트웨이 통화와 동일해야합니다
 DocType: Payment Entry,Receive,수신
@@ -4171,19 +4177,19 @@
 DocType: Workstation,Operating Costs,운영 비용
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,액션 월별 예산이 초과 축적 된 경우
 DocType: Purchase Invoice,Submit on creation,창조에 제출
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},환율 {0}해야합니다에 대한 {1}
 DocType: Asset,Disposal Date,폐기 날짜
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","그들은 휴일이없는 경우 이메일은, 주어진 시간에 회사의 모든 Active 직원에 전송됩니다. 응답 요약 자정에 전송됩니다."
 DocType: Employee Leave Approver,Employee Leave Approver,직원 허가 승인자
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},행 {0} : 재주문 항목이 이미이웨어 하우스 존재 {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","손실로 견적이되었습니다 때문에, 선언 할 수 없습니다."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,교육 피드백
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,생산 오더 {0} 제출해야합니다
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},시작 날짜와 항목에 대한 종료 날짜를 선택하세요 {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},코스 행의 필수 {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,지금까지 날로부터 이전 할 수 없습니다
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc의 문서 종류
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,가격 추가/편집
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,가격 추가/편집
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Batch,Parent Batch,상위 일괄 처리
 DocType: Cheque Print Template,Cheque Print Template,수표 인쇄 템플릿
@@ -4197,7 +4203,7 @@
 ,Ordered Items To Be Delivered,전달 될 품목을 주문
 DocType: Account,Income,수익
 DocType: Industry Type,Industry Type,산업 유형
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,문제가 발생했습니다!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,문제가 발생했습니다!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,경고 : 응용 프로그램이 다음 블록 날짜를 포함 남겨
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,판매 송장 {0}이 (가) 이미 제출되었습니다
 DocType: Assessment Result Detail,Score,점수
@@ -4228,17 +4234,17 @@
 DocType: Item,Variant Based On,변형 기반에
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},할당 된 총 weightage 100 %이어야한다.그것은 {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,공급 업체
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,판매 주문이 이루어질으로 분실로 설정할 수 없습니다.
 DocType: Request for Quotation Item,Supplier Part No,공급 업체 부품 번호
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,에서 수신
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',카테고리는 &#39;평가&#39;또는 &#39;Vaulation과 전체&#39;에 대한 때 공제 할 수 없음
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,에서 수신
 DocType: Lead,Converted,변환
 DocType: Item,Has Serial No,시리얼 No에게 있습니다
 DocType: Employee,Date of Issue,발행일
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}에서 {0}에 대한 {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},행 번호 {0} 항목에 대한 설정 공급 업체 {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,행 {0} : 시간의 값은 0보다 커야합니다.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,부품 {1}에 연결된 웹 사이트 콘텐츠 {0}를 찾을 수없는
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,웹 사이트에 여러 그룹에이 항목을 나열합니다.
@@ -4247,20 +4253,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,당신은 고정 된 값을 설정할 수있는 권한이 없습니다
 DocType: Payment Reconciliation,Get Unreconciled Entries,비 조정 항목을보세요
 DocType: Payment Reconciliation,From Invoice Date,송장 일로부터
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,결제 통화 중 기본의 comapany의 통화 또는 파티 계정 통화와 동일해야합니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,현금화를 남겨
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,그것은 무엇을 하는가?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,창고
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,모든 학생 입학
 ,Average Commission Rate,평균위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'시리얼 번호를 가지고 있음'의 경우 무재고 항목에 대해 '예'일 수 없습니다
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,출석은 미래의 날짜에 표시 할 수 없습니다
 DocType: Pricing Rule,Pricing Rule Help,가격 규칙 도움말
 DocType: School House,House Name,집 이름
 DocType: Purchase Taxes and Charges,Account Head,계정 헤드
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,상품의 도착 비용을 계산하기 위해 추가적인 비용을 업데이트
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,전기의
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,사용자로 조직의 나머지 부분을 추가합니다. 또한 연락처에서 추가하여 포털에 고객을 초대 추가 할 수 있습니다
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,사용자로 조직의 나머지 부분을 추가합니다. 또한 연락처에서 추가하여 포털에 고객을 초대 추가 할 수 있습니다
 DocType: Stock Entry,Total Value Difference (Out - In),총 가치 차이 (아웃 -에서)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4269,7 +4275,7 @@
 DocType: Item,Customer Code,고객 코드
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},생일 알림 {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,일 이후 마지막 주문
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,계정에 직불는 대차 대조표 계정이어야합니다
 DocType: Buying Settings,Naming Series,시리즈 이름 지정
 DocType: Leave Block List,Leave Block List Name,차단 목록의 이름을 남겨주세요
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,보험 시작일은 보험 종료일보다 작아야합니다
@@ -4284,9 +4290,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},직원의 급여 슬립 {0} 이미 시간 시트 생성 {1}
 DocType: Vehicle Log,Odometer,주행 거리계
 DocType: Sales Order Item,Ordered Qty,수량 주문
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,항목 {0} 사용할 수 없습니다
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,항목 {0} 사용할 수 없습니다
 DocType: Stock Settings,Stock Frozen Upto,재고 동결 개까지
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM은 재고 아이템을 포함하지 않는
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},에서와 기간 반복 필수 날짜로 기간 {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,프로젝트 활동 / 작업.
 DocType: Vehicle Log,Refuelling Details,급유 세부 사항
@@ -4296,8 +4302,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,마지막 구매 비율을 찾을 수 없습니다
 DocType: Purchase Invoice,Write Off Amount (Company Currency),금액을 상각 (회사 통화)
 DocType: Sales Invoice Timesheet,Billing Hours,결제 시간
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0}를 찾을 수 없습니다에 대한 기본 BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,행 번호 {0} : 재주문 수량을 설정하세요
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,항목을 탭하여 여기에 추가하십시오.
 DocType: Fees,Program Enrollment,프로그램 등록
 DocType: Landed Cost Voucher,Landed Cost Voucher,착륙 비용 바우처
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},설정하십시오 {0}
@@ -4321,7 +4328,7 @@
 DocType: Maintenance Visit,Maintenance Date,유지 보수 날짜
 DocType: Purchase Invoice Item,Rejected Serial No,시리얼 No 거부
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,올해의 시작 날짜 또는 종료 날짜 {0}과 중첩된다. 회사를 설정하시기 바랍니다 방지하려면
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},시작 날짜는 항목에 대한 종료 날짜보다 작아야합니다 {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### 
  후 자동 일련 번호는이 시리즈를 기반으로 생성됩니다.당신은 항상 명시 적으로이 항목에 대한 일련 번호를 언급합니다. 이 비워 둡니다."
@@ -4399,7 +4406,6 @@
 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,여러 그룹에서 항목의 크로스 리스팅
-DocType: Grade Interval,Grade Interval,학년 간격
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},회계 연도의 시작 날짜 및 회계 연도 종료 날짜가 이미 회계 연도에 설정되어 {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,정리 날짜 업데이트
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,배치 분할
@@ -4446,14 +4452,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 배치를 고려하지 않으려면 선택하지 마십시오.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,과정 기반 그룹을 만드는 동안 일괄 처리를 고려하지 않으려면 선택하지 않습니다.
 DocType: Asset,Frequency of Depreciation (Months),감가 상각의 주파수 (월)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,신용 계정
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,신용 계정
 DocType: Landed Cost Item,Landed Cost Item,착륙 비용 항목
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,0 값을보기
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,원료의 부여 수량에서 재 포장 / 제조 후의 아이템의 수량
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,설정 내 조직에 대한 간단한 웹 사이트
 DocType: Payment Reconciliation,Receivable / Payable Account,채권 / 채무 계정
 DocType: Delivery Note Item,Against Sales Order Item,판매 주문 항목에 대하여
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},속성에 대한 속성 값을 지정하십시오 {0}
 DocType: Item,Default Warehouse,기본 창고
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},예산은 그룹 계정에 할당 할 수 없습니다 {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,부모의 비용 센터를 입력 해주십시오
@@ -4499,7 +4505,7 @@
 DocType: Opportunity Item,Basic Rate,기본 요금
 DocType: GL Entry,Credit Amount,신용 금액
 DocType: Cheque Print Template,Signatory Position,서명자 위치
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,분실로 설정
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,분실로 설정
 DocType: Timesheet,Total Billable Hours,총 청구 시간
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,지불 영수증 참고
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,이이 고객에 대한 거래를 기반으로합니다. 자세한 내용은 아래 일정을 참조하십시오
@@ -4513,11 +4519,11 @@
 ,Items To Be Requested,요청 할 항목
 DocType: Purchase Order,Get Last Purchase Rate,마지막 구매께서는보세요
 DocType: Company,Company Info,회사 소개
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,선택하거나 새로운 고객을 추가
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,선택하거나 새로운 고객을 추가
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,비용 센터 비용 청구를 예약 할 필요
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),펀드의 응용 프로그램 (자산)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,이이 직원의 출석을 기반으로
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,자동 이체 계좌
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,자동 이체 계좌
 DocType: Fiscal Year,Year Start Date,년 시작 날짜
 DocType: Attendance,Employee Name,직원 이름
 DocType: Sales Invoice,Rounded Total (Company Currency),둥근 합계 (회사 통화)
@@ -4526,13 +4532,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,다음과 같은 일에 허가 신청을하는 사용자가 중지합니다.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,구매 금액
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,공급 업체의 견적 {0} 작성
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,종료 연도는 시작 연도 이전 될 수 없습니다
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,종업원 급여
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},직원에 대한 기본 홀리데이 목록을 설정하십시오 {0} 또는 회사 {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0} : {1} 수행하지 존재
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0} : {1} 수행하지 존재
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,고객에게 제기 지폐입니다.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,프로젝트 ID
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},행 번호 {0} : 금액 경비 요청 {1}에 대해 금액을 보류보다 클 수 없습니다. 등록되지 않은 금액은 {2}
@@ -4541,15 +4547,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 읽기
 ,Hub,허브
 DocType: GL Entry,Voucher Type,바우처 유형
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,가격 목록 발견되지 않았거나 비활성화
 DocType: Employee Loan Application,Approved,인가 된
 DocType: Pricing Rule,Price,가격
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}에 안심 직원은 '왼쪽'으로 설정해야합니다
 DocType: Guardian,Guardian,보호자
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,평가 {0} {1} 지정된 날짜 범위에서 직원에 대해 생성
 DocType: Employee,Education,교육
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,델
 DocType: Selling Settings,Campaign Naming By,캠페인 이름 지정으로
 DocType: Employee,Current Address Is,현재 주소는
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,수정 된
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","선택 사항. 지정하지 않을 경우, 회사의 기본 통화를 설정합니다."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,회계 분개.
 DocType: Delivery Note Item,Available Qty at From Warehouse,창고에서 이용 가능한 수량
@@ -4558,7 +4566,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},행 {0} : 파티 / 계정과 일치하지 않는 {1} / {2}에서 {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,비용 계정을 입력하십시오
 DocType: Account,Stock,재고
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",행 번호 {0} 참조 문서 형식은 구매 주문 중 하나를 구매 송장 또는 분개해야합니다
 DocType: Employee,Current Address,현재 주소
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","명시 적으로 지정하지 않는 항목은 다음 설명, 이미지, 가격은 세금이 템플릿에서 설정됩니다 등 다른 항목의 변형 인 경우"
 DocType: Serial No,Purchase / Manufacture Details,구매 / 제조 세부 사항
@@ -4586,7 +4594,7 @@
 DocType: Hub Settings,Hub Settings,허브 설정
 DocType: Project,Gross Margin %,매출 총 이익률의 %
 DocType: BOM,With Operations,운영과
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,회계 항목이 이미 통화로 된 {0} 회사의 {1}. 통화와 채권 또는 채무 계정을 선택하세요 {0}.
 DocType: Asset,Is Existing Asset,자산을 기존됩니다
 DocType: Salary Detail,Statistical Component,통계 구성 요소
 DocType: Salary Detail,Statistical Component,통계 구성 요소
@@ -4611,7 +4619,7 @@
 DocType: Assessment Plan,Room,방
 DocType: Purchase Order,Advance Paid,사전 유료
 DocType: Item,Item Tax,상품의 세금
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,공급 업체에 소재
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,공급 업체에 소재
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,소비세 송장
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0} %가 한 번 이상 나타납니다
 DocType: Expense Claim,Employees Email Id,직원 이드 이메일
@@ -4642,9 +4650,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,로고 첨부
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,재고 수준
 DocType: Customer,Commission Rate,위원회 평가
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,변형을 확인
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,변형을 확인
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,부서에서 허가 응용 프로그램을 차단합니다.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","결제 유형, 수신 중 하나가 될 지불하고 내부 전송합니다"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,분석
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,바구니가 비어 있습니다
 DocType: Vehicle,Model,모델
@@ -4655,6 +4663,7 @@
 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 +161,Capital Stock,자본금
+DocType: Shopping Cart Settings,Show Public Attachments,공용 첨부 파일 표시
 DocType: Packing Slip,Package Weight Details,포장 무게 세부 정보
 DocType: Payment Gateway Account,Payment Gateway Account,지불 게이트웨이 계정
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,결제 완료 후 선택한 페이지로 사용자를 리디렉션.
@@ -4673,15 +4682,15 @@
 DocType: Batch,Expiry Date,유효 기간
 ,Supplier Addresses and Contacts,공급 업체 주소 및 연락처
 ,accounts-browser,계정 브라우저
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,첫 번째 범주를 선택하십시오
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,첫 번째 범주를 선택하십시오
 apps/erpnext/erpnext/config/projects.py +13,Project master.,프로젝트 마스터.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",주식 설정 또는 항목에 &quot;수당&quot;을 업데이트 청구 오버 또는 과잉 주문 가능합니다.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,다음 통화 $ 등과 같은 모든 기호를 표시하지 마십시오.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(반나절)
 DocType: Supplier,Credit Days,신용 일
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,학생 배치 확인
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,학생 배치 확인
 DocType: Leave Type,Is Carry Forward,이월된다
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM에서 항목 가져 오기
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM에서 항목 가져 오기
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,시간 일 리드
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},행 # {0} : 날짜를 게시하면 구입 날짜와 동일해야합니다 {1} 자산의 {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,위의 표에 판매 주문을 입력하세요
@@ -4698,8 +4707,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,제재 금액
 DocType: GL Entry,Is Opening,개시
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},행 {0} 차변 항목과 링크 될 수 없다 {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,설정&gt; 번호 매기기 시리즈를 통해 출석을위한 번호 매기기 시리즈를 설정하십시오.
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,계정 {0}이 (가) 없습니다
 DocType: Account,Cash,자금
 DocType: Employee,Short biography for website and other publications.,웹 사이트 및 기타 간행물에 대한 짧은 전기.
diff --git a/erpnext/translations/ku.csv b/erpnext/translations/ku.csv
index 0d6d166..40051b6 100644
--- a/erpnext/translations/ku.csv
+++ b/erpnext/translations/ku.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,bi kirê
 DocType: Purchase Order,PO-,"ramyarî,"
 DocType: POS Profile,Applicable for User,Wergirtinê ji bo User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Rawestandin Production Order ne dikarin bên îptal kirin, ew unstop yekem to cancel"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Rawestandin Production Order ne dikarin bên îptal kirin, ew unstop yekem to cancel"
 DocType: Vehicle Service,Mileage,Mileage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ma tu bi rastî dixwazî bibit vê hebûnê?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Supplier Default Hilbijêre
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Supplier Default Hilbijêre
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Pereyan ji bo List Price pêwîst e {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Dê di mêjera hejmartin.
 DocType: Purchase Order,Customer Contact,mişterî Contact
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Outstanding ji bo {0} nikare were kêmî ji sifir ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 mins
 DocType: Leave Type,Leave Type Name,Dev ji Name Type
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,nîşan vekirî
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,nîşan vekirî
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series Demê serket
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Lêkolîn
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Peyam Journal Şandin
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch babet Status Expiry
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,pêşnûmeya Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mode of Account Payment
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Variants
 DocType: Academic Term,Academic Term,Term (Ekadîmî)
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Mal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Jimarî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Jimarî
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,table Hesabên nikare bibe vala.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Deyn (Deynên)
 DocType: Employee Education,Year of Passing,Sal ji Dr.Kemal
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","World: Kurdî:% s, Code babet:% s û Mişterî:% s"
 DocType: Item,Country of Origin,Welatê jêderk
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Ez bêzarim
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Issues vekirî
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Parastina saxlemîyê
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delay di peredana (Days)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Expense Service
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Biha
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Hejmara Serial: {0} jixwe li Sales bi fatûreyên referans: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Biha
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Sal malî {0} pêwîst e
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Bende ji Date Delivery e berî Sales Order Date be
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Attach .csv file bi du stûnên, yek ji bo ku bi navê kevin û yek jî ji bo navê xwe yê nû"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne jî di tu aktîv sala diravî.
 DocType: Packed Item,Parent Detail docname,docname Detail dê û bav
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","World: Kurdî: {0}, Code babet: {1} û Mişterî: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Rojname
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vekirina ji bo Job.
 DocType: Item Attribute,Increment,Increment
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Select Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Select Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reqlam
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,"Di heman şirketê de ye ketin, ji carekê zêdetir"
 DocType: Employee,Married,Zewicî
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ji bo destûr ne {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Get tomar ji
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ji bo destûr ne {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Get tomar ji
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock dikare li hember Delivery Têbînî ne bê ewe {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,No tomar di lîsteyê de
 DocType: Payment Reconciliation,Reconcile,li hev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,torpîl
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Make Peyam Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,kalîyê
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next Date Farhad. Nikarim li ber Date Purchase be
 DocType: SMS Center,All Sales Person,Hemû Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Belavkariya Ayda ** alîkariya te dike belavkirin Budçeya / Armanc seranser mehan Eger tu dzanî seasonality di karê xwe.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ne tumar hatin dîtin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ne tumar hatin dîtin
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Missing Structure meaş
 DocType: Lead,Person Name,Navê kesê
 DocType: Sales Invoice Item,Sales Invoice Item,Babetê firotina bi fatûreyên
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",eg &quot;Dibistana Seretayî&quot; an &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Reports Stock
 DocType: Warehouse,Warehouse Detail,Detail warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},limit Credit hatiye dîtin ji bo mişterî re derbas {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,The Date Term End ne dikarin paşê ji Date Sal End of the Year (Ekadîmî) ji bo ku di dema girêdayî be (Year (Ekadîmî) {}). Ji kerema xwe re li rojên bike û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ma Asset Fixed&quot; nikare bibe nedixwest, wek record Asset li dijî babete heye"
 DocType: Vehicle Service,Brake Oil,Oil şikand
 DocType: Tax Rule,Tax Type,Type bacê
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Destûra te tune ku lê zêde bike an update entries berî {0}
 DocType: BOM,Item Image (if not slideshow),Wêne Babetê (eger Mîhrîcana ne)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,An Mişterî ya bi heman navî heye
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saet Rate / 60) * Time Actual Operation
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Hilbijêre BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Hilbijêre BOM
 DocType: SMS Log,SMS Log,SMS bike Têkeve Têkeve
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Cost ji Nawy Çiyan
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cejna li ser {0} e di navbera From Date û To Date ne
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,dibistanên
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},No record îzna dîtin ji bo karker {0} ji bo {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ji kerema xwe ve yekemîn şîrketa binivîse
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Ji kerema xwe ve yekem Company hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Ji kerema xwe ve yekem Company hilbijêre
 DocType: Employee Education,Under Graduate,di bin Graduate
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,target ser
 DocType: BOM,Total Cost,Total Cost
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Şêwaz îdîaya
 DocType: Employee,Mr,Birêz
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,koma mişterî hate dîtin li ser sifrê koma cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Supplier Type / Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Supplier Type / Supplier
 DocType: Naming Series,Prefix,Pêşkîte
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,bikaranînê
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Sinif
 DocType: Sales Invoice Item,Delivered By Supplier,Teslîmî By Supplier
 DocType: SMS Center,All Contact,Hemû Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Production Order berê ve ji bo hemû tomar bi BOM tên afirandin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salary salane
 DocType: Daily Work Summary,Daily Work Summary,Nasname Work rojane
 DocType: Period Closing Voucher,Closing Fiscal Year,Girtina sala diravî
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} frozen e
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} frozen e
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Ji kerema xwe ve û taybet de Company ji bo afirandina Chart Dageriyê hilbijêre
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Mesref Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Select Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Peyam kontrayî
 DocType: Journal Entry Account,Credit in Company Currency,Credit li Company Exchange
 DocType: Delivery Note,Installation Status,Rewş installation
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ma tu dixwazî ji bo rojanekirina amadebûnê? <br> Present: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},"Qebûlkirin + Redkirin Qty, divê ji bo pêşwazî qasêsa wekhev de ji bo babet bê {0}"
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Madeyên Raw ji bo Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,De bi kêmanî yek mode of tezmînat ji bo fatûra POS pêwîst e.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,De bi kêmanî yek mode of tezmînat ji bo fatûra POS pêwîst e.
 DocType: Products Settings,Show Products as a List,Show Products wek List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Download Şablon, welat guncaw tije û pelê de hate guherandin ve girêbidin. Hemû dîrokên û karker combination di dema hilbijartî dê di şablon bên, bi records amadebûnê heyî"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Make Peyam Farhad.
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,request type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Make Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Make Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Birêverbirî
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details ji operasyonên hatiye lidarxistin.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan ji bo serdanên maintenance.
 DocType: SMS Settings,Enter url parameter for message,parametre url ji bo peyamek binivîse
 DocType: POS Profile,Customer Groups,Groups mişterî
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Rageyendrawekanî Financial
 DocType: Guardian,Students,xwendekarên
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Qaîdeyên ji bo hukm û sewqiyata û discount.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,"List Price, divê pêkanîn, ji bo Kirîna an Firotina be"
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},mîqdara Advance ne dikarin bibin mezintir {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lîsteya Series ji bo vê Transaction
 DocType: Company,Default Payroll Payable Account,Default maeş cîhde Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Ma Opening Peyam
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Behs, eger ne-standard account teleb pêkanîn,"
 DocType: Course Schedule,Instructor Name,Navê Instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Ji bo Warehouse berî pêwîst e Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Ji bo Warehouse berî pêwîst e Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,pêşwazî li
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Eger kontrolkirin, Will de tomar non-stock di Requests Material."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Li dijî Sales bi fatûreyên babetî
 ,Production Orders in Progress,Ordênên Production in Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Cash Net ji Fînansa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage tije ye, rizgar ne"
 DocType: Lead,Address & Contact,Navnîşana &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lê zêde bike pelên feyde ji xerciyên berê
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Next Aksarayê {0} dê li ser tên afirandin {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Bi tevahî bi qurûşekî jî Mîqdar (via Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Specification babete Website
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Dev ji astengkirin
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Arşîva Bank
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Babetê {0} dawiya wê ya jiyanê li ser gihîşt {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Arşîva Bank
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yeksalî
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Babetê Stock Lihevkirinê
 DocType: Stock Entry,Sales Invoice No,Sales bi fatûreyên No
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Weşana Hub
 DocType: Student Admission,Student Admission,Admission Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Babetê {0} betal e
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Daxwaza maddî
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Babetê {0} betal e
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Daxwaza maddî
 DocType: Bank Reconciliation,Update Clearance Date,Update Date Clearance
 DocType: Item,Purchase Details,Details kirîn
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Babetê {0} di &#39;Delîlên Raw Supplied&#39; sifrê li Purchase Kom nehate dîtin {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques Outstanding û meden ji bo paqijkirina
 DocType: Item,Synced With Hub,Senkronîzekirin Bi Hub
 DocType: Vehicle,Fleet Manager,Fîloya Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nikare were ji bo em babete neyînî {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Şîfreya çewt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nikare were ji bo em babete neyînî {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Şîfreya çewt
 DocType: Item,Variant Of,guhertoya Of
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Qediya Qty ne dikarin bibin mezintir &#39;Qty ji bo Manufacture&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Qediya Qty ne dikarin bibin mezintir &#39;Qty ji bo Manufacture&#39;
 DocType: Period Closing Voucher,Closing Account Head,Girtina Serokê Account
 DocType: Employee,External Work History,Dîroka Work Link
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference bezandin
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notify by Email li ser çêkirina Daxwaza Material otomatîk
 DocType: Journal Entry,Multi Currency,Multi Exchange
 DocType: Payment Reconciliation Invoice,Invoice Type,bi fatûreyên Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Delivery Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Delivery Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Avakirina Baca
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost ji Asset Sold
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Peyam di peredana hatiye guherandin, piştî ku we paş de vekişiyaye. Ji kerema xwe re dîsa ew vekişîne."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} du caran li Bacê babet ketin
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Nasname ji bo vê hefteyê û çalakiyên hîn
 DocType: Student Applicant,Admitted,xwe mikur
 DocType: Workstation,Rent Cost,Cost kirê
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Order Nirx
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,muamele Bank / Cash dijî partî an jî ji bo veguhestina navxweyî
 DocType: Shipping Rule,Valid for Countries,Pasport tenê ji bo welatên
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Em babete a Şablon e û dikare karê bê bikaranîn. xerîbkirin babete wê bê ser nav Guhertoyên kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Em babete a Şablon e û dikare karê bê bikaranîn. xerîbkirin babete wê bê ser nav Guhertoyên kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Order çavlêkirina
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","teklîfê Employee (nimûne: CEO, Director û hwd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ji kerema xwe ve nirxa warê &#39;li ser Day of Month Dubare&#39; binivîse
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Purchase bi fatûreyên nikare li hemberî sermaye heyî ne bên kirin {1}
 DocType: Item Tax,Tax Rate,Rate bacê
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} berê ji bo karkirinê yên bi rêk û {1} ji bo dema {2} ji bo {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Hilbijêre babetî
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Hilbijêre babetî
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Bikirin bi fatûreyên {0} ji xwe şandin
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No divê eynî wek {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert to non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (gelek) ji vî babetî.
 DocType: C-Form Invoice Detail,Invoice Date,Date bi fatûreyên
 DocType: GL Entry,Debit Amount,Şêwaz Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Li wir bi tenê dikare 1 Account per Company di be {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ji kerema xwe ve attachment bibînin
 DocType: Purchase Order,% Received,% pêşwazî
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Create komên xwendekaran
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Daxwaza ji bo Quotation
 DocType: Salary Slip Timesheet,Working Hours,dema xebatê
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Guhertina Guherandinên / hejmara cihekê niha ya series heyî.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Create a Mişterî ya nû
-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.","Ger Rules Pricing multiple berdewam bi ser keve, bikarhênerên pirsî danîna Priority bi destan ji bo çareserkirina pevçûnan."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Create Orders Purchase
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Create a Mişterî ya nû
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ger Rules Pricing multiple berdewam bi ser keve, bikarhênerên pirsî danîna Priority bi destan ji bo çareserkirina pevçûnan."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Create Orders Purchase
 ,Purchase Register,Buy Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Li dijî wan doz wergirtinê
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), divê rola heye &#39;Leave Approver&#39;"
 DocType: Purchase Receipt,Vehicle Date,Date Vehicle
 DocType: Student Log,Medical,Pizişkî
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Sedem ji bo winda
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Sedem ji bo winda
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Xwedîyê Lead nikare bibe wek beşa Komedî de
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,butçe dikare ne mezintir mîqdara unadjusted
 DocType: Announcement,Receiver,Receiver
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Quantity û Rate
 DocType: Delivery Note,% Installed,% firin
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Sinifên / kolîja hwd ku ders dikare bê destnîşankirin.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ji kerema xwe re navê şîrketa binivîse
 DocType: Purchase Invoice,Supplier Name,Supplier Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Xandinê Manual ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,warê Mandatory - Year (Ekadîmî)
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,warê Mandatory - Year (Ekadîmî)
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Sīroveyan text destpêkê de ku wekî beşek ji ku email diçe. Her Kirarî a text destpêkê de ji hev cuda.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Tikaye default account cîhde danîn ji bo ku şîrketa {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,settings Global ji bo hemû pêvajoyên bi aktîvîteyên.
 DocType: Accounts Settings,Accounts Frozen Upto,Hesabên Frozen Upto
 DocType: SMS Log,Sent On,şandin ser
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Pêşbîr {0} çend caran li Attributes Table hilbijartin
 DocType: HR Settings,Employee record is created using selected field. ,record Employee bikaranîna hilbijartî tên afirandin e.
 DocType: Sales Order,Not Applicable,Rêveber
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,master Holiday.
 DocType: Request for Quotation Item,Required Date,Date pêwîst
 DocType: Delivery Note,Billing Address,Telefona berîkan
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Tikaye kodî babetî bikevin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Tikaye kodî babetî bikevin.
 DocType: BOM,Costing,yên arzane ku
 DocType: Tax Rule,Billing County,County Billing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Eger kontrolkirin, mîqdara bacê dê were hesibandin ku jixwe di Rate Print / Print Mîqdar de"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Ji No. Package
 DocType: Item Attribute,To Range,to range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Birûmet û meden
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Can rêbaza nirxandina ku nayê guhertin, çawa ku muamele li dijî hin tomar ku ev ne li wir rêbaza nirxandinê ya xwe ye"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Hemû pelên bi rêk û wêneke e
 DocType: Job Opening,Description of a Job Opening,Description of a Opening Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,çalakiyên hîn ji bo îro
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Tikaye Kurs hilbijêre
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Ji kerema xwe ve Company hilbijêre
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Ji kerema xwe ve Company hilbijêre
 DocType: Stock Entry Detail,Difference Account,Account Cudahiya
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Can karê nêzîkî wek karekî girêdayî wê {0} e girtî ne ne.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ji kerema xwe ve Warehouse ji bo ku Daxwaza Material wê werin zindî binivîse
 DocType: Production Order,Additional Operating Cost,Cost Operating Additional
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetics
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","To merge, milkên li jêr, divê ji bo hem tomar be"
 DocType: Shipping Rule,Net Weight,Loss net
 DocType: Employee,Emergency Phone,Phone Emergency
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kirrîn
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Tikaye pola bo Qeyrana 0% define
 DocType: Sales Order,To Deliver,Gihandin
 DocType: Purchase Invoice Item,Item,Şanî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial no babete nikare bibe fraction
 DocType: Journal Entry,Difference (Dr - Cr),Cudahiya (Dr - Kr)
 DocType: Account,Profit and Loss,Qezenc û Loss
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,birêvebirina îhaleya
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Increment nikare bibe 0
 DocType: Production Planning Tool,Material Requirement,Divê materyalên
 DocType: Company,Delete Company Transactions,Vemirandina Transactions Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Çavkanî No û Date: Çavkanî ji bo muameleyan Bank wêneke e
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lê zêde bike Baca / Edit û doz li
 DocType: Purchase Invoice,Supplier Invoice No,Supplier bi fatûreyên No
 DocType: Territory,For reference,ji bo referansa
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Installation Têbînî babetî
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Berçavnegirtin
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} e çalak ne
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} e çalak ne
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},"SMS şandin, da ku hejmarên jêr e: {0}"
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,aliyên check Setup ji bo çapkirinê
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet meaş Slip
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Total Komîsyona
 DocType: Pricing Rule,Sales Partner,Partner Sales
 DocType: Buying Settings,Purchase Receipt Required,Meqbûz kirînê pêwîst
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Rate Valuation diyarkirî ye, eger Opening Stock ketin"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,No records dîtin li ser sifrê bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ji kerema xwe ve yekem Company û Partiya Type hilbijêre
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financial / salê.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nirxên Accumulated
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Mixabin, Serial Nos bi yek bên"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Make Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Make Sales Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,ÃƒÆ Bi tevahî
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Attachment resume
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,muşteriyan repeat
 DocType: Leave Control Panel,Allocate,Pardan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Return Sales
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Return Sales
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nîşe: Hemû pelên bi rêk û {0} ne pêwîst be kêmtir ji pelên jixwe pejirandin {1} ji bo dema
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Teslîmî destê Supplier (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,quotation To
 DocType: Lead,Middle Income,Dahata Navîn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Default Unit ji pîvanê ji bo babet {0} rasterast nikarin bên guhertin ji ber ku te berê kirin hin muameleyan (s) bi UOM din. Ji we re lazim ê ji bo afirandina a babet nû bi kar Default UOM cuda.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,butçe ne dikare bibe neyînî
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Xêra xwe li Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Xêra xwe li Company
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales bi fatûreyên timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Çavkanî No &amp; Date: Çavkanî pêwîst e ji bo {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Hilbijêre Account Payment ji bo Peyam Bank
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Qeydên a Karkeran, ji bo birêvebirina pelên, îdîaya k&#39;îsî û payroll"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Add to Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Writing Pêşniyarek
 DocType: Payment Entry Deduction,Payment Entry Deduction,Payment dabirîna Peyam
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; ne di sala diravî {2}
 DocType: Buying Settings,Settings for Buying Module,Mîhengên ji bo Kirîna Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} nayê ji şîrketa girêdayî ne {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Ji kerema xwe ve yekem Meqbûz Purchase binivîse
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Ji kerema xwe ve yekem Meqbûz Purchase binivîse
 DocType: Buying Settings,Supplier Naming By,Supplier Qada By
 DocType: Activity Type,Default Costing Rate,Default bi qurûşekî jî Rate
 DocType: Maintenance Schedule,Maintenance Schedule,Cedwela Maintenance
-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.","Rules Hingê Pricing bi filtrata derve li ser bingeha Mişterî, Mişterî Group, Herêma, Supplier, Supplier Type, Kampanya, Sales Partner hwd."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Rules Hingê Pricing bi filtrata derve li ser bingeha Mişterî, Mişterî Group, Herêma, Supplier, Supplier Type, Kampanya, Sales Partner hwd."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Change Net di Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Xebatkarê Management Loan
 DocType: Employee,Passport Number,Nimareya pasaportê
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Peywendiya bi Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Rêvebir
 DocType: Payment Entry,Payment From / To,Payment From / To
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Date Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},limit credit New kêmtir ji yê mayî niha ji bo mişterî e. limit Credit heye Hindîstan be {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,babete heman hatiye bicihkirin çend caran.
 DocType: SMS Settings,Receiver Parameter,Receiver parametreyê
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&#39;Li ser&#39; û &#39;Koma By&#39; nikare bibe heman
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,li minutes
 DocType: Issue,Resolution Date,Date Resolution
 DocType: Student Batch Name,Batch Name,Navê batch
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet tên afirandin:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet tên afirandin:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ji kerema xwe ve Cash default an account Bank set li Mode of Payment {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Nivîsîn
 DocType: Selling Settings,Customer Naming By,Qada Mişterî By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ê ku xwendekarê ku di Student Beşdariyê Report Ayda Present nîşan
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Time rastî Start
 DocType: BOM Operation,Operation Time,Time Operation
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Qedandin
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bingeh
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Bingeh
 DocType: Timesheet,Total Billed Hours,Total Hours billed
 DocType: Journal Entry,Write Off Amount,Hewe Off Mîqdar
 DocType: Journal Entry,Bill No,Bill No
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Beşdariyê Student
 DocType: Sales Invoice Timesheet,Time Sheet,Bîlançoya Time
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush madeyên xav ser
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ji kerema xwe ve hûragahiyan babete binivîse
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ji kerema xwe ve hûragahiyan babete binivîse
 DocType: Interest,Interest,Zem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,din Details
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Peyam di peredana ji nuha ve tên afirandin
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock niha:
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ne ji Babetê girêdayî ne {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Bikini Salary
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Bikini Salary
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} hatiye bicihkirin çend caran
 DocType: Account,Expenses Included In Valuation,Mesrefên di nav Valuation
 DocType: Hub Settings,Seller City,Seller City
 ,Absent Student Report,Absent Report Student
 DocType: Email Digest,Next email will be sent on:,email Next dê li ser şand:
 DocType: Offer Letter Term,Offer Letter Term,Pêşkêşkirina Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Em babete Guhertoyên.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Em babete Guhertoyên.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Babetê {0} nehate dîtin
 DocType: Bin,Stock Value,Stock Nirx
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} tune
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Type dara
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Type dara
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty telef Per Unit
 DocType: Serial No,Warranty Expiry Date,Mîsoger Date Expiry
 DocType: Material Request Item,Quantity and Warehouse,Quantity û Warehouse
 DocType: Sales Invoice,Commission Rate (%),Komîsyona Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Please select Program
 DocType: Project,Estimated Cost,Cost texmînkirin
@@ -768,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} e a stock babet ne
 DocType: Mode of Payment Account,Default Account,Account Default
 DocType: Payment Entry,Received Amount (Company Currency),Pêşwaziya Mîqdar (Company Exchange)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead bê mîhenkirin eger derfetek e ji Lead kirin
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ji kerema xwe re bi roj off heftane hilbijêre
 DocType: Production Order Operation,Planned End Time,Bi plan Time End
 ,Sales Person Target Variance Item Group-Wise,Person firotina Target Variance babetî Pula-Wise
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,derfet ji
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,daxuyaniyê de meaşê mehane.
 DocType: BOM,Website Specifications,Specifications Website
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Ji {0} ji type {1}
 DocType: Warranty Claim,CI-,çi-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Factor Converter wêneke e
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,"Na, Bankaya A / C"
 DocType: Bank Guarantee,Project,Rêvename
 DocType: Quality Inspection Reading,Reading 7,Reading 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Qismen Ordered
 DocType: Expense Claim Detail,Expense Claim Type,Expense Type Îdîaya
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,mîhengên standard ji bo Têxe selikê
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset belav via Peyam Journal {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Mesref Maintenance Office
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Avakirina Account Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ji kerema xwe ve yekem babetî bikevin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ji kerema xwe ve yekem babetî bikevin
 DocType: Account,Liability,Bar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Şêwaz belê ne dikarin li Row mezintir Mîqdar Îdîaya {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default Cost ji Account Goods Sold
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,List Price hilbijartî ne
 DocType: Employee,Family Background,Background Family
 DocType: Request for Quotation Supplier,Send Email,Send Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Hişyarî: Attachment Invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,No Destûr
 DocType: Company,Default Bank Account,Account Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Fîltre li ser bingeha Partîya, Partîya select yekem Type"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,No karker dîtin
 DocType: Supplier Quotation,Stopped,rawestandin
 DocType: Item,If subcontracted to a vendor,Eger ji bo vendor subcontracted
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Xwendekarên Pol ji xwe ve.
 DocType: SMS Center,All Customer Contact,Hemû Mişterî Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload balance stock via CSV.
 DocType: Warehouse,Tree Details,Details dara
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Herî kêm Mîqdar bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Navenda Cost {2} ne ji Company girêdayî ne {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} dikarin bi a Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne &#39;{doctype}&#39; sifrê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Babetê Row {IDX}: {doctype} {docname} nayê li jor de tune ne &#39;{doctype}&#39; sifrê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ji xwe temam an jî betalkirin
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,No erkên
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dotira rojê ya meha ku li ser fatûra auto nimûne, 05, 28 û hwd. Jî wê bi giştî bê"
 DocType: Asset,Opening Accumulated Depreciation,Vekirina Farhad. Accumulated
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Nawy Hilbijêre
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} dijî Bill {1} dîroka {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Cedwela Kurs
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Cedwela Kurs
 DocType: Maintenance Visit,Completion Status,Rewş cebîr
 DocType: HR Settings,Enter retirement age in years,temenê teqawidîyê Enter di salên
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse target
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Destûrê bide ser teslîmkirina an jî meqbûza upto ev ji sedî
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Beşdariyê Import
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Hemû Groups babetî
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Hemû Groups babetî
 DocType: Process Payroll,Activity Log,Activity bike Têkeve Têkeve
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Profit Net / Loss
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,"Otomatîk helbestan, peyamek li ser sertewandina muamele."
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,"Bikirin, ji bo Payment"
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,projeya Qty
 DocType: Sales Invoice,Payment Due Date,Payment Date ji ber
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Babetê Variant {0} ji xwe bi taybetmendiyên xwe heman heye
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Dergeh&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Delivery Têbînî Message
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Dev ji Lîsteya Block Date
 DocType: Pricing Rule,Price or Discount,Price an Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Total doz li wergirtinê li Purchase Nawy Meqbûz sifrê divê eynî wek Total Bac, û doz li be"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Total doz li wergirtinê li Purchase Nawy Meqbûz sifrê divê eynî wek Total Bac, û doz li be"
 DocType: Sales Team,Incentives,aborîve
 DocType: SMS Log,Requested Numbers,Numbers xwestin
 DocType: Production Planning Tool,Only Obtain Raw Materials,Tenê Wergirtin Alav Raw
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Ma Subcontracted
 DocType: Item Attribute,Item Attribute Values,Nirxên Pêşbîr babetî
 DocType: Examination Result,Examination Result,Encam muayene
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Meqbûz kirîn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Meqbûz kirîn
 ,Received Items To Be Billed,Pêşwaziya Nawy ye- Be
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Şandin Slips Salary
 DocType: Employee,Ms,çirkan de
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,rêjeya qotîk master.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},"Çavkanî Doctype, divê yek ji yên bê {0}"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},"Çavkanî Doctype, divê yek ji yên bê {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nikare bibînin Slot Time di pêş {0} rojan de ji bo Operasyona {1}
 DocType: Production Order,Plan material for sub-assemblies,maddî Plan ji bo sub-meclîsên
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners Sales û Herêmê
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Can Account ne automatically create wek e jixwe balance stock di Account hene. Divê tu account hevcotî ava berî tu an entry li ser vê warehouse bide
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Default Accounts cîhde
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Xebatkarê {0} e çalak ne an tune ne
 DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Babetê Variants {0} ve
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ji kerema xwe ve Asset Category li babet binivîse {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Can ne {0} {1} {2} bêyî ku fatûra hilawîstî neyînî
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Bikirin bi fatûreyên Advance
 DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: entry Credit ne bi were bi girêdayî a {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,E Purchase babetî
 DocType: Asset,Purchase Invoice,Buy bi fatûreyên
 DocType: Stock Ledger Entry,Voucher Detail No,Detail fîşeke No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,New bi fatûreyên Sales
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,New bi fatûreyên Sales
 DocType: Stock Entry,Total Outgoing Value,Total Nirx Afganî
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Vekirina Date û roja dawî divê di heman sala diravî be
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Vekirina Date û roja dawî divê di heman sala diravî be
 DocType: Lead,Request for Information,Daxwaza ji bo Information
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Syncê girêdayî hisab
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Syncê girêdayî hisab
 DocType: Payment Request,Paid,tê dayin
 DocType: Program Fee,Program Fee,Fee Program
 DocType: Salary Slip,Total in words,Bi tevahî di peyvên
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,belê
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,bivênevê ye. Dibe ku rekor Exchange ji bo tên afirandin ne
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Row # {0}: kerema xwe diyar bike Serial No bo Babetê {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","Ji bo tomar &#39;Product Bundle&#39;, Warehouse, Serial No û Batch No wê ji ser sifrê &#39;Lîsteya Packing&#39; nirxandin. Ger Warehouse û Batch No bo hemû tomar bo barkirinê bo em babete ti &#39;Bundle Product&#39; eynî ne, wan nirxan dikare li ser sifrê Babetê serekî ketin, nirxên wê bê kopîkirin to &#39;tê de Lîsteya&#39; sifrê."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Ji bo tomar &#39;Product Bundle&#39;, Warehouse, Serial No û Batch No wê ji ser sifrê &#39;Lîsteya Packing&#39; nirxandin. Ger Warehouse û Batch No bo hemû tomar bo barkirinê bo em babete ti &#39;Bundle Product&#39; eynî ne, wan nirxan dikare li ser sifrê Babetê serekî ketin, nirxên wê bê kopîkirin to &#39;tê de Lîsteya&#39; sifrê."
 DocType: Job Opening,Publish on website,Weşana li ser malpera
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Ber bi mişterîyên.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Date Supplier bi fatûreyên ne dikarin bibin mezintir Mesaj Date
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,Navê Company
 DocType: SMS Center,Total Message(s),Total Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Hilbijêre babet ji bo transfera
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Hilbijêre babet ji bo transfera
 DocType: Purchase Invoice,Additional Discount Percentage,Rêjeya Discount Additional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,View lîsteya hemû videos alîkarî
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,serê account Hilbijêre ji bank ku check danenîye bû.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,"Row {0}: Payment dijî Sales / Purchase Order, divê her tim wek krêdî nîşankirin bê"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Şîmyawî
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default account Bank / Cash wê were li Salary Peyam Journal ve dema ku ev moda hilbijartî ye.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",The bi navberan ji bo Code Ast {0} yek bi navberan ji sinifa bo din notên. Ji kerema xwe bi navberan {0} û {1} û careke din biceribîne
 DocType: BOM,Raw Material Cost(Company Currency),Raw Cost Material (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Hemû tomar niha ji bo vê Production Order hatine veguhastin.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Rate ne dikarin bibin mezintir rêjeya bikaranîn di {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM babet Website
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload nameya serokê û logo xwe. (Tu ji wan paşê biguherîne).
 DocType: Timesheet Detail,Bill,Hesab
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next Date Farhad wek date borî ketin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Spî
 DocType: SMS Center,All Lead (Open),Hemû Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty ji bo amade ne {4} li warehouse {1} hate dem bi mesaj û ji entry ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Get pêşketina Paid
 DocType: Item,Automatically Create New Batch,Otomatîk Create Batch New
 DocType: Item,Automatically Create New Batch,Otomatîk Create Batch New
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Kirin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Kirin
 DocType: Student Admission,Admission Start Date,Admission Serî Date
 DocType: Journal Entry,Total Amount in Words,Temamê meblaxa li Words
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"çewtiyek derket. Yek ji sedemên muhtemel, dikarin bibin, ku tu formê de hatine tomarkirin ne. Ji kerema xwe ve support@erpnext.com li gel ku pirsgirêk berdewam dike."
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},"Order Type, divê yek ji yên bê {0}"
 DocType: Lead,Next Contact Date,Next Contact Date
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,vekirina Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ji kerema xwe ve Account ji bo Guhertina Mîqdar binivîse
 DocType: Student Batch Name,Student Batch Name,Xwendekarên Name Batch
 DocType: Holiday List,Holiday List Name,Navê Lîsteya Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Balance Loan Mîqdar
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ji kerema xwe binivîsin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,tomar rakirin bi ti guhertinek di dorpêçê de an nirxê.
 DocType: Delivery Note,Delivery To,Delivery To
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,table taybetmendiyê de bivênevê ye
 DocType: Production Planning Tool,Get Sales Orders,Get Orders Sales
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne dikare bibe neyînî
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Kêmkirinî
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Kêmkirinî
 DocType: Asset,Total Number of Depreciations,Hejmara giştî ya Depreciations
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
 DocType: Sales Invoice Item,Rate With Margin,Rate Bi Kenarê
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse Reserved li Sales Order / Qediya Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Şêwaz firotin
 DocType: Repayment Schedule,Interest Amount,Şêwaz Interest
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu Approver Expense ji bo vê qeyda. Ji kerema xwe ve ya &#39;status&#39; û Save baştir bike
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Tu Approver Expense ji bo vê qeyda. Ji kerema xwe ve ya &#39;status&#39; û Save baştir bike
 DocType: Serial No,Creation Document No,Creation dokumênt No
 DocType: Issue,Issue,Pirs
 DocType: Asset,Scrapped,belav
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","De ev peyam ji bo babet Variants. eg Size, Color hwd."
 DocType: Purchase Invoice,Returns,vegere
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Warehouse WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} e di bin peymana parastina upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} e di bin peymana parastina upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,pistgirîya
 DocType: Lead,Organization Name,Navê rêxistina
 DocType: Tax Rule,Shipping State,Dewletê Shipping
 ,Projected Quantity as Source,Quantity projeya wek Source
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Babetê, divê bikaranîna &#39;Get Nawy ji Purchase Receipts&#39; button bê zêdekirin"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Babetê, divê bikaranîna &#39;Get Nawy ji Purchase Receipts&#39; button bê zêdekirin"
 DocType: Employee,A-,YEK-
 DocType: Production Planning Tool,Include non-stock items,Usa jî tomar non-stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Mesref Sales
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,Dijî
 DocType: Item,Default Selling Cost Center,Default Navenda Cost Selling
 DocType: Sales Partner,Implementation Partner,Partner Kiryariya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kode ya postî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Kode ya postî
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} e {1}
 DocType: Opportunity,Contact Info,Têkilî
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Arşîva
 DocType: Packing Slip,Net Weight UOM,Net Loss UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Results
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Results
 DocType: Item,Default Supplier,Default Supplier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Li ser Production Rêjeya Berdêlên
 DocType: Employee Loan,Repayment Schedule,Cedwela vegerandinê
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Weekly Off Kurdî Nexşe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nikare bibe kêmtir ji Serî Date
 DocType: Sales Person,Select company name first.,Hilbijêre navê kompaniya yekemîn a me.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Quotations ji Suppliers wergirt.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Average Age
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Area Performance Key
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Neqlîye
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Pêşbîr Invalid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} de divê bê şandin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} de divê bê şandin
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Quantity gerek kêmtir an jî wekhev be {0}
 DocType: SMS Center,Total Characters,Total Characters
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Ji kerema xwe ve BOM di warê BOM hilbijêre ji bo babet {0}
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,Belavkirina
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Têxe selikê Rule Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Production Order {0} divê berî betalkirinê ev Sales Order were betalkirin
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ji kerema xwe ve set &#39;Bisepîne Discount Additional Li ser&#39; &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ji kerema xwe ve set &#39;Bisepîne Discount Additional Li ser&#39; &#39;
 ,Ordered Items To Be Billed,Nawy emir ye- Be
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Ji Range ev be ku kêmtir ji To Range
 DocType: Global Defaults,Global Defaults,Têrbûn Global
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Serî Sal
 DocType: Purchase Invoice,Start date of current invoice's period,date ji dema fatûra niha ve dest bi
 DocType: Salary Slip,Leave Without Pay,Leave Bê Pay
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Error Planning kapasîteya
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Error Planning kapasîteya
 ,Trial Balance for Party,Balance Trial bo Party
 DocType: Lead,Consultant,Şêwirda
 DocType: Salary Slip,Earnings,Earnings
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ev dê ji qanûna Babetê ji guhertoya bendên. Ji bo nimûne, eger kurtenivîsên SYR ji we &quot;SM&quot;, e û code babete de ye &quot;T-SHIRT&quot;, code babete ji yên ku guhertoya wê bibe &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay Net (di peyvên) xuya wê carekê hûn Slip Salary li xilas bike.
 DocType: Purchase Invoice,Is Return,e Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / Debit Têbînî
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / Debit Têbînî
 DocType: Price List Country,Price List Country,List Price Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nos serial derbasdar e ji bo vî babetî {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Tikaye kodî babet bikeve to get Hejmara Batch
 DocType: Stock Settings,Default Item Group,Default babetî Pula
 DocType: Employee Loan,Partially Disbursed,Qismen dandin de
-DocType: Grading Structure,Grading System Name,Name System di pîvanê de
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,heye Supplier.
 DocType: Account,Balance Sheet,Bîlançoya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Navenda bihagiranîyê ji bo babet bi Code Babetê &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode tezmînatê nehatiye mîhenkirin. Ji kerema xwe, gelo account hatiye dîtin li ser Mode of Payments an li ser POS Profile danîn."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,kesê firotina we dê bîrxistineke li ser vê date get ku serî li mişterî
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,babete eynî ne dikarin ketin bê çend caran.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","bikarhênerên berfireh dikarin di bin Groups kirin, di heman demê de entries dikare li dijî non-Groups kirin"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Buy Order Nawy ye- Be
 DocType: Purchase Invoice Item,Net Rate,Rate net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Bikirin bi fatûreyên babetî
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Arşîva û GL berheman ji bo hilbijartin Purchase Receipts reposted
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Arşîva û GL berheman ji bo hilbijartin Purchase Receipts reposted
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Babetê 1
 DocType: Holiday,Holiday,Karbetalî
 DocType: Support Settings,Close Issue After Days,Close Doza Piştî Rojan
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,work Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Ji kerema xwe re bi kêmanî yek taybetmendiyê de li ser sifrê, taybetiyên xwe diyar bike"
 DocType: Announcement,All Students,Hemû xwendekarên
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Babetê {0}, divê babete non-stock be"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Babetê {0}, divê babete non-stock be"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,navberan
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Kevintirîn
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","An Pol babet bi heman navî heye, ji kerema xwe biguherînin navê babete an jî datayê biguherîne koma babete de"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,"Na, xwendekarê Mobile"
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Din ên cîhanê
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,The babet {0} ne dikarin Batch hene
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Dayina meaş ji {0} ji bo {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},destûr ne ji bo weşînertiya frozen Account {0}
 DocType: Journal Entry,Get Outstanding Invoices,Get Outstanding hisab
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} ne derbasdar e
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,emir kirînê alîkariya we û plankirina û li pey xwe li ser kirînên te
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Mixabin, şîrketên bi yek bên"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}","Bi giştî dikele, Doza / Transfer {0} li Daxwaza Material {1} \ ne dikarin bibin mezintir dorpêçê de xwestin {2} ji bo babet {3}"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Biçûk
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Mesref nerasterast di
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Cotyarî
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Syncê Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Syncê Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Products an Services te
 DocType: Mode of Payment,Mode of Payment,Mode of Payment
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,"Website Wêne, divê pel giştî an URL malpera be"
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ev komeke babete root e û ne jî dikarim di dahatûyê de were.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Pol Hejmara Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Ji bo {0}, tenê bikarhênerên credit dikare li dijî entry debit din ve girêdayî"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bi tevahî ji hemû pîvan Erka divê bê nîşandan 1. kerema xwe pîvan ji hemû erkên Project eyar bikin li gorî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Têbînî {0} tê şandin ne
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,"Babetê {0}, divê babete-bînrawe bi peyman be"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Teçxîzatên hatiye 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.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rule Pricing is yekem li ser esasê hilbijartin &#39;Bisepîne Li ser&#39; qada, ku dikare bê Babetê, Babetê Pol an Brand."
 DocType: Hub Settings,Seller Website,Seller Website
 DocType: Item,ITEM-,ŞANÎ-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Total beşek veqetand ji bo tîma firotina divê 100 be
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Production Order status e {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Production Order status e {0}
 DocType: Appraisal Goal,Goal,Armanc
 DocType: Sales Invoice Item,Edit Description,biguherîne Description
 ,Team Updates,Updates Team
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,ji bo Supplier
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Bikin Type Account di bijartina vê Account li muamele dike.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (Company Exchange)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Create Print Format
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,Peyam di Journal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} tomar di pêşketina
 DocType: Workstation,Workstation Name,Navê Workstation
-DocType: Grade Interval,Grade Code,Code pola
+DocType: Grading Scale Interval,Grade Code,Code pola
 DocType: POS Item Group,POS Item Group,POS babetî Pula
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nayê to Babetê girêdayî ne {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Car
 DocType: Sales Order,Recurring Upto,nişankirin Upto
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ji kerema xwe re Company hilbijêre
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ji kerema xwe re Company hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Supplier Date bi fatûreyên
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Divê tu ji bo çalakkirina Têxe selikê
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Xûrek
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,No ji Serdan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Maintenance Cedwela {0} dijî heye {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,xwendekarê qeyîtkirine
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Pereyan ji Account Girtina divê {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum ji xalên ji bo hemû armancên divê bê 100. Ev e {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Afganî
 DocType: POS Profile,Campaign,Bêşvekirin
 DocType: Supplier,Name and Type,Name û Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Rewş erêkirina divê &#39;status&#39; an jî &#39;Redkirin&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Rewş erêkirina divê &#39;status&#39; an jî &#39;Redkirin&#39;
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Hêvîkirin Date Serî&#39; nikare bibe mezintir &#39;ya bende Date End&#39;
 DocType: Course Scheduling Tool,Course End Date,Kurs End Date
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Shipping Name Address
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Chart Dageriyê
 DocType: Material Request,Terms and Conditions Content,Şert û mercan Content
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,dikarin bibin mezintir 100 ne
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,dikarin bibin mezintir 100 ne
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Babetê {0} e a stock babete ne
 DocType: Maintenance Visit,Unscheduled,rayis
 DocType: Employee,Owned,Owned
 DocType: Salary Detail,Depends on Leave Without Pay,Dimîne li ser Leave Bê Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Bilind hejmara, bilind pêşanî"
 ,Purchase Invoice Trends,Bikirin Trends bi fatûreyên
 DocType: Employee,Better Prospects,baştir e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: The hevîrê {1} tenê {2} qty. Tikaye Demîralp, ku {3} qty License de hilbijêre yan parçekirina row nav rêzên multiple, bi azadkirina / pirsa ji lekerên multiple"
 DocType: Vehicle,License Plate,License Plate
 DocType: Appraisal,Goals,armancên
 DocType: Warranty Claim,Warranty / AMC Status,Mîsoger / AMC Rewş
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Xebatkarê ne dikarin ji xwe re rapor.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Eger account bêhest e, entries bi bikarhênerên sînorkirin destûr."
 DocType: Email Digest,Bank Balance,Balance Bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Peyam Accounting ji bo {0}: {1} dikarin tenê li pereyan kir: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile kar, bi dawîanîna pêwîst hwd."
 DocType: Journal Entry Account,Account Balance,Mêzîna Hesabê
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rule Bacê ji bo muameleyên.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Nîşan P &amp; hevsengiyên L sala diravî ya negirtî ya
 DocType: Shipping Rule,Shipping Account,Account Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} neçalak e
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Make Orders Sales ji bo alîkarîya te plana karê xwe û azad li ser-dem
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Make Orders Sales ji bo alîkarîya te plana karê xwe û azad li ser-dem
 DocType: Quality Inspection,Readings,bi xwendina
 DocType: Stock Entry,Total Additional Costs,Total Xercên din
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,to Nirx
 DocType: Asset Movement,Stock Manager,Stock Manager
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},warehouse Source bo row wêneke e {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Packing Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Packing Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,settings deryek Setup SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import ser neket!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Salary ji bo karkirinê
 DocType: Cost Center,Parent Cost Center,Navenda Cost dê û bav
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Select Supplier muhtemel
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Select Supplier muhtemel
 DocType: Sales Invoice,Source,Kanî
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show girtî
 DocType: Leave Type,Is Leave Without Pay,Ma Leave Bê Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Category bo em babete Asset Fixed wêneke e
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,No records dîtin li ser sifrê (DGD)
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ev {0} pevçûnên bi {1} ji bo {2} {3}
 DocType: Student Attendance Tool,Students HTML,xwendekarên HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,Date of Leaving
 DocType: Pricing Rule,For Price List,Ji bo List Price
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Rêveber Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Create Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Create Leads
 DocType: Maintenance Schedule,Schedules,schedules
 DocType: Purchase Invoice Item,Net Amount,Şêwaz net
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM No
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Enrollments Program
 DocType: Sales Invoice Item,Brand Name,Navê marka
 DocType: Purchase Receipt,Transporter Details,Details Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Default warehouse bo em babete helbijartî pêwîst e
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Qûtîk
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Supplier gengaz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Supplier gengaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Rêxistina
 DocType: Budget,Monthly Distribution,Belavkariya mehane
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lîsteya Receiver vala ye. Ji kerema Lîsteya Receiver
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximum Mîqdar Loan
 DocType: Pricing Rule,Pricing Rule,Rule Pricing
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},hejmara roll Pekana ji bo xwendekarê {0}
 DocType: Budget,Action if Annual Budget Exceeded,Action eger salane ya Budceyê de DYE&#39;yê
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Daxwaza madî ji bo Buy Order
 DocType: Shopping Cart Settings,Payment Success URL,Payment URL bi serket
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,Method vegerandinê
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Eger kontrolkirin, rûpel Home de dê bibe Pol default babet ji bo malpera"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default ji bo {0} ji bo Project dîtin ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM Default ji bo {0} ji bo Project dîtin ne {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Îdîaya ji bo şîrketa hisabê.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Xwendekarên bi li dilê sîstema, lê zêde bike hemû xwendekarên xwe"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Xwendekarên bi li dilê sîstema, lê zêde bike hemû xwendekarên xwe"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: date Clearance {1} ne berî Date Cheque be {2}
 DocType: Company,Default Holiday List,Default Lîsteya Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Ji Time û To Time of {1} bi gihîjte {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dotira rojê (s) li ser ku hûn bi ji bo xatir hukm û cejnên in. Tu divê ji bo xatir ne.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ji nûve Payment Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,erka New
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Make Quotation
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Make Quotation
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,din Reports
 DocType: Dependent Task,Dependent Task,Task girêdayî
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},faktora Converter ji bo default Unit ji pîvanê divê 1 li row be {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave a type {0} nikare were êdî ji {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Try plan operasyonên ji bo rojên X di pêş.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday Reminders
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ji kerema xwe ve Default payroll cîhde Account set li Company {0}
 DocType: SMS Center,Receiver List,Lîsteya Receiver
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Search babetî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Search babetî
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Şêwaz telef
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Change Net di Cash
 DocType: Assessment Plan,Grading Scale,pîvanê de
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jixwe temam
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,"Unit ji Measure {0} hatiye, ji carekê zêdetir li Converter Factor Table nivîsandin"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,jixwe temam
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Daxwaza peredana ji berê ve heye {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost ji Nawy Issued
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},"Dorpêçê de ne, divê bêhtir ji {0}"
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Make Disbursement Peyam
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance dijî Supplier divê kom kirin
 DocType: Company,Default Values,Nirxên Default
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total qasa dayîna
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ev li ser têketin li dijî vê Vehicle bingeha. Dîtina cedwela li jêr bo hûragahiyan
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Berhevkirin
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Li dijî Supplier bi fatûreyên {0} dîroka {1}
 DocType: Customer,Default Price List,Default List Price
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,record Tevgera Asset {0} tên afirandin
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Tu nikarî bibî Fiscal Sal {0}. Sal malî {0} wek default li Settings Global danîn
 DocType: Journal Entry,Entry Type,Type entry
 ,Customer Credit Balance,Balance Credit Mişterî
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ne yek ji tomar ti guhertinê di dorpêçê de an nirxê.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,warê Mandatory - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,warê Mandatory - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Îdîaya Warranty
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Îdîaya Warranty
 ,Lead Details,Details Lead
 DocType: Salary Slip,Loan repayment,"dayinê, deyn"
 DocType: Purchase Invoice,End date of current invoice's period,roja dawî ji dema fatûra niha ya
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,daîmî Address
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Pêşwext li dijî {0} {1} nikare were mezintir pere \ ji Grand Total {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Tikaye kodî babete hilbijêre
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Tikaye kodî babete hilbijêre
 DocType: Student Sibling,Studying in Same Institute,Xwendina di heman Enstîtuya
 DocType: Territory,Territory Manager,Manager axa
 DocType: Packed Item,To Warehouse (Optional),To Warehouse (Li gorî daxwazê)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Pereyan (Company Exchange)
 DocType: Purchase Invoice,Additional Discount,Discount Additional
 DocType: Selling Settings,Selling Settings,Firoştina Settings
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View li Têxe
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mesref marketing
 ,Item Shortage Report,Babetê Report pirsgirêka
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Loss de behsa, \ nJi kerema xwe behsa &quot;Loss UOM&quot; jî"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Daxwaza maddî tê bikaranîn ji bo ku ev Stock Peyam
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Next Date Farhad ji bo sermaye nû wêneke e
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next Date Farhad ji bo sermaye nû wêneke e
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Cuda Bêguman Pol bingeha ji bo her Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Cuda Bêguman Pol bingeha ji bo her Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,yekeya an Babetê.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Navenda Cost ji bo &#39;Profit û wendakirin&#39; account pêwîst e {2}. Ji kerema xwe ve set up a Navenda Cost default ji bo Company.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Pol Mişterî ya bi heman navî heye ji kerema xwe biguherînin navê Mişterî li an rename Pol Mişterî ya
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A Pol Mişterî ya bi heman navî heye ji kerema xwe biguherînin navê Mişterî li an rename Pol Mişterî ya
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,New Contact
 DocType: Territory,Parent Territory,Herêmê dê û bav
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,Babetê-şehreza Sales Register
 DocType: Asset,Gross Purchase Amount,Şêwaz Purchase Gross
 DocType: Asset,Depreciation Method,Method Farhad.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Ne girêdayî
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Ne girêdayî
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ma ev Tax di nav Rate Basic?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Target
 DocType: Program Course,Required,pêwîst
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Lihevkirin JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Jî gelek stûnên. Versiyon ji raporê û print ew bikaranîna serlêdana spreadsheet.
 DocType: Purchase Invoice Item,Batch No,batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nikare bibînin rate ji bo {0} ji bo {1} ji bo date key {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Destûrê bide multiple Orders Sales dijî Mişterî ya Purchase Order
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 DocType: Student Group Instructor,Student Group Instructor,Instructor Student Group
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ser
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ser
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix ji bo ku hijmara series li ser danûstandinên xwe
 DocType: Employee Attendance Tool,Employees HTML,karmendên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"Default BOM ({0}), divê ji bo em babete an şablonê xwe çalak be"
 DocType: Employee,Leave Encashed?,Dev ji Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Derfeta ji qadê de bivênevê ye
 DocType: Email Digest,Annual Expenses,Mesref ya salane
 DocType: Item,Variants,Guhertoyên
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Make Purchase Order
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Make Purchase Order
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},e balance îzna bes ji bo Leave Type li wir ne {0}
 DocType: Payment Reconciliation Payment,Allocated amount,butçe
@@ -1767,7 +1765,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Mişterî ya Code babetî
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Lihevkirinê
 DocType: Territory,Territory Name,Name axa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Kar-li-Terakî Warehouse berî pêwîst e Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Kar-li-Terakî Warehouse berî pêwîst e Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Applicant bo Job.
 DocType: Purchase Order Item,Warehouse and Reference,Warehouse û Reference
 DocType: Supplier,Statutory info and other general information about your Supplier,"info ya zagonî û din, agahiyên giştî li ser Supplier te"
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,Serial Nos û lekerên
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Hêz Student Group
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Hêz Student Group
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,"Li dijî Journal Peyam di {0} ti {1} entry berdar, ne xwedî"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,"Li dijî Journal Peyam di {0} ti {1} entry berdar, ne xwedî"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Şiroveyên
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Curenivîsên Serial No bo Babetê ketin {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A rewşa ji bo Rule Shipping
-DocType: Grading Structure,Grading Intervals,navberan de tunin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ji kerema xwe re têkevin
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ne dikarin ji bo vî babetî {0} li row overbill {1} zêdetir {2}. To rê li ser-billing, ji kerema xwe danîn li Peydakirina Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ji kerema xwe ve filter li ser Babetî an Warehouse danîn
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} de divê bê şandin
 DocType: Authorization Control,Authorization Control,Control Authorization
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Redkirin Warehouse dijî babet red wêneke e {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Diravdanî
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Manage fermana xwe
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Diravdanî
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Manage fermana xwe
 DocType: Production Order Operation,Actual Time and Cost,Time û Cost rastî
 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},Daxwaza maddî yên herî zêde {0} de ji bo babet {1} dijî Sales Order kirin {2}
 DocType: Employee,Salutation,Silav
 DocType: Course,Course Abbreviation,Abbreviation Kurs
 DocType: Student Leave Application,Student Leave Application,Xwendekarên Leave Application
 DocType: Item,Will also apply for variants,jî wê ji bo Guhertoyên serî
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Sermaye ne bi dikarin bên îptal kirin, wekî ku ji niha ve {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Xebatkarê {0} roja Half li ser {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Total dema xebatê ne, divê ji bilî dema xebatê max be mezintir {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Li
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,"tomar boxçe, li dema sale."
 DocType: Quotation Item,Actual Qty,rastî Qty
 DocType: Sales Invoice Item,References,Çavkanî
@@ -1811,7 +1809,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Hûn ketin tomar lînkek kirine. Ji kerema xwe re çak û careke din biceribîne.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Şirîk
 DocType: Asset Movement,Asset Movement,Tevgera Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Têxe New
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Têxe New
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Babetê {0} e a babete weşandin ne
 DocType: SMS Center,Create Receiver List,Create Lîsteya Receiver
 DocType: Vehicle,Wheels,wheels
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Modê de creation ji dem têketin dijî Orders Production. Operasyonên wê li hember Production Order ne bê Molla
 DocType: Student,Student Mobile Number,Xwendekarên Hejmara Mobile
 DocType: Item,Has Variants,has Variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jixwe te tomar ji hilbijartî {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Name ji Belavkariya Ayda
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID wêneke e
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID wêneke e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID wêneke e
 DocType: Sales Person,Parent Sales Person,Person bav Sales
 DocType: Purchase Invoice,Recurring Invoice,bi fatûreyên nûkirin
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,birêvebirina Projeyên
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,sala diravî ya
 DocType: Vehicle Log,Fuel Price,sotemeniyê Price
 DocType: Budget,Budget,Sermîyan
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,"Babetê Asset Fixed, divê babete non-stock be."
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budceya dikare li hember {0} ne bên wezîfedarkirin, wek ku ev hesabê Hatinê an jî Expense ne"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,nebine
 DocType: Student Admission,Application Form Route,Forma serlêdana Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Axa / Mişterî
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Axa / Mişterî
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,eg 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Dev ji Type {0} nikare bê veqetandin, ji ber ku bê pere bihêle"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: veqetandin mîqdara {1} gerek kêmtir be an jî li beramberî bo Fatûreya mayî {2}
@@ -1878,14 +1876,14 @@
 ,Serial No Status,Serial Status No
 DocType: Payment Entry Reference,Outstanding,Mayî
 ,Daily Timesheet Summary,Nasname timesheet rojane
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: To set {1} periodicity, cudahiya di navbera ji û bo date \ divê mezintir an wekhev bin {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ev li ser tevgera stock bingeha. Dîtina {0} Ji bo hûragahiyan li
 DocType: Pricing Rule,Selling,firotin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Şêwaz {0} {1} dabirîn dijî {2}
 DocType: Employee,Salary Information,Information meaş
 DocType: Sales Person,Name and Employee ID,Name û Xebatkarê ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Date ji ber nikarim li ber Mesaj Date be
 DocType: Website Item Group,Website Item Group,Website babetî Pula
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Erk û Baca
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ji kerema xwe ve date Çavkanî binivîse
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Can hejmara row mezintir an wekhev ji bo hejmara row niha ji bo vî cureyê Charge kirîza ne
 DocType: Asset,Sold,firotin
 ,Item-wise Purchase History,Babetê-şehreza Dîroka Purchase
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to pędivî Serial No bo Babetê added {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; click to pędivî Serial No bo Babetê added {0}
 DocType: Account,Frozen,Qeşa girtî
 ,Open Production Orders,Ordênên Production Open
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Şêwaz Base (Company Exchange)
 DocType: Payment Reconciliation Payment,Reference Row,Çavkanî Row
 DocType: Installation Note,Installation Time,installation Time
 DocType: Sales Invoice,Accounting Details,Details Accounting
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Vemirandina hemû Transactions ji bo vê Company
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Vemirandina hemû Transactions ji bo vê 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} ji bo {2} QTY ji malê xilas li Production temam ne Order # {3}. Ji kerema xwe ve status Karê rojanekirina via Têketin Time
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,învêstîsîaên
 DocType: Issue,Resolution Details,Resolution Details
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,Nîqaş
 DocType: Payment Entry,Transaction ID,ID ya muameleyan
 DocType: Employee,Resignation Letter Date,Îstîfa Date Letter
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Rules Pricing bi zêdetir li ser bingeha dorpêçê de tê fîltrekirin.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Rules Pricing bi zêdetir li ser bingeha dorpêçê de tê fîltrekirin.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Xêra xwe li Date Of bizaveka bo karker {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Temamê meblaxa Billing (via Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Hatiniyên Mişterî Repeat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), divê rola &#39;Approver Expense&#39; heye"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), divê rola &#39;Approver Expense&#39; heye"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Cot
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Select BOM û Qty bo Production
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Select BOM û Qty bo Production
 DocType: Asset,Depreciation Schedule,Cedwela Farhad.
 DocType: Bank Reconciliation Detail,Against Account,li dijî Account
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Nîv Date Day divê di navbera From Date û To Date be
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ji kerema xwe ve &#39;Asset Navenda Farhad. Cost&#39; li Company set {0}
 ,Maintenance Schedules,Schedules Maintenance
 DocType: Task,Actual End Date (via Time Sheet),Rastî End Date (via Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Şêwaz {0} {1} dijî {2} {3}
 ,Quotation Trends,Trends quotation
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Babetê Pol di master babete bo em babete behsa ne {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,"Debit To account, divê hesabekî teleb be"
 DocType: Shipping Rule Condition,Shipping Amount,Şêwaz Shipping
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,hîn Mîqdar
 DocType: Purchase Invoice Item,Conversion Factor,Factor converter
 DocType: Purchase Order,Delivered,teslîmî
 ,Vehicle Expenses,Mesref Vehicle
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
+DocType: Serial No,Invoice Details,Details bi fatûreyên
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"nirxa hêvîkirin ku piştî jiyana kêrhatî, divê mezintir an wekhev bin {0}"
 DocType: Purchase Receipt,Vehicle Number,Hejmara Vehicle
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Roja ku dubare fatûra bê dê bê rawestandin
 DocType: Employee Loan,Loan Amount,Şêwaz deyn
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Settings HR
 DocType: Salary Slip,net pay info,info net pay
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Mesrefan hîn erêkirina. Tenê Approver Expense dikare status update.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Mesrefan hîn erêkirina. Tenê Approver Expense dikare status update.
 DocType: Email Digest,New Expenses,Mesref New
 DocType: Purchase Invoice,Additional Discount Amount,Şêwaz Discount Additional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty divê 1 be, wek babete a hebûnê sabît e. Ji kerema xwe ve row cuda ji bo QTY multiple bi kar tînin."
 DocType: Leave Block List Allow,Leave Block List Allow,Dev ji Lîsteya Block Destûrê bide
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Kurte nikare bibe vala an space
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Kurte nikare bibe vala an space
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Pol to non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sports
 DocType: Loan Type,Loan Name,Navê deyn
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse tu li ku derê bi parastina stock ji tomar red
 DocType: Production Order,Skip Material Transfer,Skip Transfer Material
 DocType: Production Order,Skip Material Transfer,Skip Transfer Material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nikare bibînin rate ji bo {0} ji bo {1} ji bo date key {2}. Ji kerema xwe re qeyda Exchange biafirîne bi destan
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,sala te ya aborî dawî li ser
 DocType: POS Profile,Price List,Lîsteya bihayan
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} e niha standard sala diravî. Ji kerema xwe (browser) xwe nû dikin ji bo vê guhertinê ji bandora.
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Account {0} ne derbasdar e. Account Exchange divê {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},faktora UOM Converter li row pêwîst e {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Sales Order, Sales bi fatûreyên an Peyam Journal be"
 DocType: Salary Component,Deduction,Jêkişî
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Ji Time û To Time de bivênevê ye.
 DocType: Stock Reconciliation Item,Amount Difference,Cudahiya di Mîqdar
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Babetê Price added for {0} li List Price {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ji kerema xwe ve Employee Id bikevin vî kesî yên firotina
 DocType: Territory,Classification of Customers by region,Dabeşandina yên muşteriyan bi herêma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Şêwaz Cudahiya divê sifir be
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Şêwaz Cudahiya divê sifir be
 DocType: Project,Gross Margin,Kenarê Gross
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Ji kerema xwe ve yekemîn babet Production binivîse
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Di esasa balance Bank Statement
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,user seqet
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Girtebêje
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Girtebêje
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total dabirîna
 ,Production Analytics,Analytics Production
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Babetê {0} ji niha ve hatine vegerandin
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiscal Sal ** temsîl Sal Financial. Re hemû ketanên hisêba û din muamele mezin bi dijî Sal Fiscal ** Molla **.
 DocType: Opportunity,Customer / Lead Address,Mişterî / Lead Address
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Hişyarî: belgeya SSL çewt li ser attachment {0}
 DocType: Student Admission,Eligibility,ku mafê
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Rêça te alîkarîya te bike business, lê zêde bike hemû têkiliyên xwe û zêdetir wek rêça te"
 DocType: Production Order Operation,Actual Operation Time,Rastî Time Operation
 DocType: Authorization Rule,Applicable To (User),To de evin: (User)
 DocType: Purchase Taxes and Charges,Deduct,Jinavkişîn
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,Navnîşana karê
 DocType: Appraisal,Calculate Total Score,Calcolo Total Score
 DocType: Request for Quotation,Manufacturing Manager,manufacturing Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} e bin garantiya upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} e bin garantiya upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dîmenê Têbînî Delivery nav pakêtan.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Barên
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,"balance Account ({0}) ji bo {1} û nirxê stock ({2}) ji bo warehouse {3}, divê heman be"
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Note: Email dê ji bo bikarhênerên seqet ne bên şandin
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Hejmara Nimite
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Hejmara Nimite
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Select Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Select Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Vala bihêlin, eger ji bo hemû beşên nirxandin"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Cure yên kar (daîmî, peymana, û hwd. Intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ji bo babet wêneke e {1}
 DocType: Process Payroll,Fortnightly,Livînê
 DocType: Currency Exchange,From Currency,ji Exchange
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ji kerema xwe ve butçe, Type bi fatûreyên û Number bi fatûreyên li Hindîstan û yek row hilbijêre"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company Exchange)
 DocType: Student Guardian,Others,yên din
 DocType: Payment Entry,Unallocated Amount,Şêwaz PV
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Can a Hêmanên nedît. Ji kerema xwe re hin nirxên din, ji bo {0} hilbijêre."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Can a Hêmanên nedît. Ji kerema xwe re hin nirxên din, ji bo {0} hilbijêre."
 DocType: POS Profile,Taxes and Charges,Bac û doz li
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","A Product an a Xizmeta ku kirîn, firotin an li stock girt."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,No updates more
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Can type pere weke &#39;li ser Previous Mîqdar Row&#39; hilbijêre ne an &#39;li ser Previous Row Total&#39; ji bo rêza yekem
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Babetê zarok ne pêwîst be gurzek Product. Ji kerema xwe ve babete jê `{0}` û xilas bike
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,lê zêde bike timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,lê zêde bike timesheets
 DocType: Vehicle Service,Service Item,Babetê Service
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
 DocType: Bank Guarantee,Bank Guarantee,garantiyalênêrînê Bank
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} berê ji {2}
 DocType: Quotation Item,Stock Balance,Balance Stock
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Firotina ji bo Payment
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Xêra xwe Bidin Series ji bo {0} bi rêya Setup&gt; Settings&gt; Navên Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Detail Îdîaya
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Ji kerema xwe ve hesabê xwe rast hilbijêre
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Bihayê wê li banî tê ne bê eger List Price is set ne
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ji kerema xwe ve welatekî ji bo vê Rule Shipping diyar bike an jî Shipping Worldwide
 DocType: Stock Entry,Total Incoming Value,Total Nirx Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit To pêwîst e
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit To pêwîst e
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets alîkariya şopandibe, dem, mesrefa û fatûre ji bo activites kirin ji aliyê ekîba xwe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Buy List Price
 DocType: Offer Letter Term,Offer Term,Term Pêşnîyaza
 DocType: Quality Inspection,Quality Manager,Manager Quality
 DocType: Job Applicant,Job Opening,Opening Job
 DocType: Payment Reconciliation,Payment Reconciliation,Lihevhatin û dayina
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Ji kerema xwe re navê Incharge Person ya hilbijêre
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Ji kerema xwe re navê Incharge Person ya hilbijêre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknolocî
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Unpaid: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,ji dest Sedem
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,New Address
 DocType: Quality Inspection,Sample Size,Size rate
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ji kerema xwe ve dokumênt Meqbûz binivîse
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Hemû tomar niha ji fatore dîtin
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Ji kerema xwe binivîsin derbasbar a &#39;Ji Case Na&#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,navendên mesrefa berfireh dikarin di bin Groups made di heman demê de entries dikare li dijî non-Groups kirin
 DocType: Project,External,Xûkirînî
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Bikarhêner û Permissions
 DocType: Vehicle Log,VLOG.,Sjnaka.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordênên Production nû: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ordênên Production nû: {0}
 DocType: Branch,Branch,Liq
 DocType: Guardian,Mobile Number,Hejmara Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printing û Branding
 DocType: Bin,Actual Quantity,Quantity rastî
 DocType: Shipping Rule,example: Next Day Shipping,nimûne: Shipping Next Day
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} nehate dîtin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} nehate dîtin
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,muşteriyan te
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Make Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Make Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Hûn hatine vexwendin ji bo hevkariyê li ser vê projeyê: {0}
 DocType: Leave Block List Date,Block Date,Date block
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apply Now
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,şandin To
 DocType: Payment Request,Make Sales Invoice,Make Sales bi fatûreyên
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Contact Date ne di dema borî de be
 DocType: Company,For Reference Only.,For Reference Only.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Hilbijêre Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-direvin
 DocType: Sales Invoice Advance,Advance Amount,Advance Mîqdar
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,"Case Na, nikare bibe 0"
 DocType: Item,Show a slideshow at the top of the page,Nîşan a slideshow li jor li ser vê rûpelê
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,dikeye
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,dikanên
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,dikanên
 DocType: Serial No,Delivery Time,Time Delivery
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing li ser bingeha
 DocType: Item,End of Life,End of Life
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,update Cost
 DocType: Item Reorder,Item Reorder,Babetê DIRTYHERTZ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip Show Salary
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip Show Salary
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,transfer Material
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Hên operasyonên, mesrefa xebatê û bide Operation yekane no ji bo operasyonên xwe."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ev belge li ser sînor ji aliyê {0} {1} ji bo em babete {4}. Ma tu ji yekî din {3} li dijî heman {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Hilbijêre guhertina account mîqdara
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Ji kerema xwe ve set dubare piştî tomarkirinê
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Hilbijêre guhertina account mîqdara
 DocType: Purchase Invoice,Price List Currency,List Price Exchange
 DocType: Naming Series,User must always select,Bikarhêner her tim divê hilbijêre
 DocType: Stock Settings,Allow Negative Stock,Destûrê bide Stock Negative
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,Account budceya
 DocType: Quality Inspection,Verified By,Sîîrtê By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Can currency default şîrketê nayê guhertin, ji ber ku muamele heyî heye. Transactions bên îptal kirin, ji bo guhertina pereyan default."
-DocType: Grade Interval,Grade Description,Ast Description
+DocType: Grading Scale Interval,Grade Description,Ast Description
 DocType: Stock Entry,Purchase Receipt No,Meqbûz kirînê No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Money bi xîret
 DocType: Process Payroll,Create Salary Slip,Create Slip Salary
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,Amadebûna To Date
 DocType: Warranty Claim,Raised By,rakir By
 DocType: Payment Gateway Account,Payment Account,Account Payment
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Ji kerema xwe ve Company diyar bike ji bo berdewamiyê
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Change Net li hesabê hilgirtinê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,heger Off
 DocType: Offer Letter,Accepted,qebûlkirin
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Kerema xwe binêre ka tu bi rastî dixwazî jê bibî hemû muamele û ji bo vê şirketê. Daneyên axayê te dê pevê wekî xwe ye. Ev çalakî nayê vegerandin.
 DocType: Room,Room Number,Hejmara room
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referansa çewt {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne dikarin bibin mezintir quanitity plankirin ({2}) li Production Order {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne dikarin bibin mezintir quanitity plankirin ({2}) li Production Order {3}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping Rule
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum Bikarhêner
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Madeyên xav nikare bibe vala.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Peyam di Journal Quick
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Gelo stock update ne, fatûra dihewîne drop babete shipping."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Peyam di Journal Quick
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Tu dikarî rêjeya nayê guhertin, eger BOM agianst tu babete behsa"
 DocType: Employee,Previous Work Experience,Previous serê kurda
 DocType: Stock Entry,For Quantity,ji bo Diravan
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termên û Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,The name of peymangeha ji bo ku hûn bi avakirina vê sîstemê.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","entry Accounting ji vê dîrokê de sar up, kes nikare do / ya xeyrandin di entry ji bilî rola li jêr hatiye diyarkirin."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ji kerema xwe ve belgeya ku berî bi afrandina schedule maintenance xilas bike
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ji kerema xwe ve belgeya ku berî bi afrandina schedule maintenance xilas bike
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Rewş Project
 DocType: UOM,Check this to disallow fractions. (for Nos),Vê kontrol bike li hevûdu fractions. (Ji bo Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,The Orders Production li jêr tên kirin:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,Karmendên li ser dixebitin ku cejna
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Present Mark
 DocType: Project,% Complete Method,% Method Complete
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},date destpêka Maintenance nikarim li ber roja çêbûna ji bo Serial No be {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},date destpêka Maintenance nikarim li ber roja çêbûna ji bo Serial No be {0}
 DocType: Production Order,Actual End Date,Rastî Date End
 DocType: BOM,Operating Cost (Company Currency),Cost Operating (Company Exchange)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Leave bê pere nayê bi erêkirin records Leave Application hev nagirin
 DocType: Campaign,Campaign-.####,Bêşvekirin-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Steps Next
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Ji kerema xwe wan tedarîk bikin ji tomar xwe bişinî at the best, rêjeya muhtemel"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity nêzîkî piştî 15 rojan de
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,End Sal
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Diravan
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records Fee Created - {0}
 DocType: Asset Category Account,Asset Category Account,Account Asset Kategorî
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Can babet zêdetir {0} ji Sales Order dorpêçê de hilberandina ne {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Can babet zêdetir {0} ji Sales Order dorpêçê de hilberandina ne {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Peyam di {0} tê şandin ne
 DocType: Payment Reconciliation,Bank / Cash Account,Account Bank / Cash
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Next Contact By nikare bibe wek Email Address Lead
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Date Clearance behsa ne
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Çêkerî
 DocType: Guardian,Occupation,Sinet
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Destpêk Date divê berî End Date be
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,Ev Document
 DocType: Installation Note Item,Installed Qty,sazkirin Qty
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Report an Dozî Kurd
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Mesref Bikaranîn
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Li jorê
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Peyam {1} nayê Hesabê te nîne {2} an ji niha ve bi rêk û pêk li dijî fîşeke din
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Peyam {1} nayê Hesabê te nîne {2} an ji niha ve bi rêk û pêk li dijî fîşeke din
 DocType: Buying Settings,Default Buying Price List,Default Lîsteya Buying Price
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip meaş Li ser timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,No karker ji bo ku krîterên ku li jor hatiye hilbijartin yan slip meaş jixwe tên afirandin
 DocType: Notification Control,Sales Order Message,Sales Order Message
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Set Nirxên Default wek Company, Exchange, niha: Sala diravî, û hwd."
 DocType: Payment Entry,Payment Type,Type Payment
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ji kerema xwe re Batch ji bo babet hilbijêre {0}. Nikare bibînin hevîrê single ku vê daxwazê ji cî û
 DocType: Process Payroll,Select Employees,Hilbijêre Karmendên
 DocType: Opportunity,Potential Sales Deal,Deal Sales Potential
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Date Reference
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profile POS Global {0} berê ji bo şîrketa tên afirandin {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Replace babet / BOM di hemû dikeye
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,belgeya wergirtina divê bê şandin
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,belgeya wergirtina divê bê şandin
 DocType: Purchase Invoice Item,Received Qty,pêşwaziya Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Paid ne û Delivered ne
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,DN-direvin
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,No sheets dem
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Dev ji Type {0} ne dikare were hilgirtin-bicîkirin
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Maintenance nehatî ji bo hemû tomar bi giştî ne. Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Maintenance nehatî ji bo hemû tomar bi giştî ne. Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
 ,To Produce,ji bo hilberîna
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Rêza yomîya
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Ji bo row {0} li {1}. To de {2} di rêjeya Babetê, rêzikan {3} jî, divê di nav de bê"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Make Bikarhêner
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Make Bikarhêner
 DocType: Packing Slip,Identification of the package for the delivery (for print),Diyarkirina pakêta ji bo gihandina (ji bo print)
 DocType: Bin,Reserved Quantity,Quantity reserved.
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Kerema xwe, navnîşana email derbasdar têkeve ji"
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,şablonê seqet ne divê şablonê default
 DocType: Account,Income Account,Account hatina
 DocType: Payment Request,Amount in customer's currency,Şêwaz li currency mişterî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Şandinî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Şandinî
 DocType: Stock Reconciliation Item,Current Qty,Qty niha:
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Bibînin &quot;Rate ji materyalên li ser&quot; li qurûşekî jî Beþ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Borî
 DocType: Appraisal Goal,Key Responsibility Area,Area Berpirsiyariya Key
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Lekerên Student alîkarîya we bişopîne hazirbûn, nirxandinên û xercên ji bo xwendekaran"
 DocType: Payment Entry,Total Allocated Amount,Temamê meblaxa veqetandin
 DocType: Item Reorder,Material Request Type,Maddî request type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Peyam di Journal Accural ji bo mûçeyên ji {0} ji bo {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage tije ye, rizgar ne"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage tije ye, rizgar ne"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Factor Converter wêneke e
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Navenda cost
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Id Bacê Mişterî ji Transactions Sales
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Destkêşana 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.","Rule Pricing çêkirin ji bo binivîsî List Price / define rêjeya discount, li ser bingeha hinek pîvanên."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rule Pricing çêkirin ji bo binivîsî List Price / define rêjeya discount, li ser bingeha hinek pîvanên."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse tenê dikare bi rêya Stock Peyam guherî / Delivery Têbînî / Meqbûz Purchase
 DocType: Employee Education,Class / Percentage,Class / Rêjeya
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Head of Marketing û Nest
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Bacê hatina
-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.","Heke hatibe hilbijartin Pricing Rule ji bo &#39;Price&#39; çêkir, ew dê List Price binivîsî. Rule Pricing price buhayê dawî ye, da tu discount zêdetir bên bicîanîn. Ji ber vê yekê, di karbazarên wek Sales Order, Buy Kom hwd., Ev dê di warê &#39;Pûan&#39; biribû, bêtir ji qadê &#39;Price List Rate&#39;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Heke hatibe hilbijartin Pricing Rule ji bo &#39;Price&#39; çêkir, ew dê List Price binivîsî. Rule Pricing price buhayê dawî ye, da tu discount zêdetir bên bicîanîn. Ji ber vê yekê, di karbazarên wek Sales Order, Buy Kom hwd., Ev dê di warê &#39;Pûan&#39; biribû, bêtir ji qadê &#39;Price List Rate&#39;."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads by Type Industry.
 DocType: Item Supplier,Item Supplier,Supplier babetî
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Tikaye kodî babet bikeve ji bo hevîrê tune
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Ji kerema xwe re nirx ji bo {0} quotation_to hilbijêre {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Hemû Navnîşan.
 DocType: Company,Stock Settings,Settings Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Yedega tenê mimkun e, eger taybetiyên jêrîn heman in hem records in. E Group, Type Root, Company"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Dê an email di derbarê bûyerê de ji bo karmendên bi statûya bişîne &#39;Open&#39;
 DocType: Task,Depends on Tasks,Dimîne li ser Peywir
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage Mişterî Pol Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Attachments dikare bê derfet û Têxe selikê li banî tê
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Name Navenda Cost
 DocType: Leave Control Panel,Leave Control Panel,Dev ji Control Panel
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,Debit To
 DocType: Delivery Note,Required only for sample item.,tenê ji bo em babete test pêwîst.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty rastî Piştî Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; Type Supplier
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},No slip meaş dîtin di navbera {0} û {1}
 ,Pending SO Items For Purchase Request,Hîn SO Nawy Ji bo Daxwaza Purchase
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissions Student
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} neçalak e
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} neçalak e
 DocType: Supplier,Billing Currency,Billing Exchange
 DocType: Sales Invoice,SINV-RET-,SINV-direvin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Product Dawiyê
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Hemû Groups Nirxandina
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Name Warehouse
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Herêm
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ji kerema xwe re tu ji serdanên pêwîst behsa
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ji kerema xwe re tu ji serdanên pêwîst behsa
 DocType: Stock Settings,Default Valuation Method,Default Method Valuation
 DocType: Vehicle Log,Fuel Qty,Qty mazotê
 DocType: Production Order Operation,Planned Start Time,Bi plan Time Start
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,Price List Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Hemû Transactions Sales dikare li dijî multiple Persons Sales ** ** tagged, da ku tu set û şopandina hedef."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Ji kerema Mişterî ji Lead {0}
 DocType: Price List,Applicable for Countries,Wergirtinê ji bo welatên
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Tenê Applications bi statûya Leave &#39;status&#39; û &#39;Redkirin&#39; dikare were şandin
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Xwendekarên Navê babetî Pula li row wêneke e {0}
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,Kopiyek ji From
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},error Name: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kêmasî
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nayê bi têkildar ne {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nayê bi têkildar ne {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Amadebûna ji bo karker {0} jixwe nîşankirin
 DocType: Packing Slip,If more than one package of the same type (for print),Eger zêdetir ji pakêta cureyê eynî (ji bo print)
 ,Salary Register,meaş Register
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Bi kar tînin ji bo Têxe selikê
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nirx {0} ji bo Pêşbîr {1} nayê ji di lîsteyê de Babetê derbasdar tune ne derbasbare Nirxên ji bo babet {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Li dijî wan doz dê were belavkirin bibihure li ser QTY babete an miqdar bingeha, wek per selection te"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Li dijî wan doz dê were belavkirin bibihure li ser QTY babete an miqdar bingeha, wek per selection te"
 DocType: Maintenance Visit,Purposes,armancên
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Li Hindîstan û yek babete divê bi elemanekî negatîvî di belgeya vegera ketin
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasyona {0} êdî ji hemû dema xebatê di linux {1}, birûxîne operasyona nav operasyonên piralî"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Tree Herêmê.
 DocType: Journal Entry Account,Sales Invoice,bi fatûreyên Sales
 DocType: Journal Entry Account,Party Balance,Balance Partiya
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Ji kerema xwe ve Apply Discount Li ser hilbijêre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Ji kerema xwe ve Apply Discount Li ser hilbijêre
 DocType: Company,Default Receivable Account,Default Account teleb
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Create Peyam Bank ji bo meaş total pere ji bo ku krîterên ku li jor hatiye hilbijartin
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer madî ji bo 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.,Rêjeya Discount jî yan li dijî List Price an jî ji bo hemû List Price sepandin.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rêjeya Discount jî yan li dijî List Price an jî ji bo hemû List Price sepandin.
 DocType: Purchase Invoice,Half-yearly,Nîvsal carekî pişkinînên didanan
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Peyam Accounting bo Stock
 DocType: Vehicle Service,Engine Oil,Oil engine
 DocType: Sales Invoice,Sales Team1,Team1 Sales
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Babetê {0} tune
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Babetê {0} tune
 DocType: Sales Invoice,Customer Address,Address mişterî
 DocType: Employee Loan,Loan Details,deyn Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Qediya Qty divê ji sifirê mezintir be.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,Type root
 DocType: Item,FIFO,FIFOScheduler
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nikare zêdetir vegerin {1} ji bo babet {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Erd
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Erd
 DocType: Item Group,Show this slideshow at the top of the page,Nîşan bide vî slideshow li jor li ser vê rûpelê
 DocType: BOM,Item UOM,Babetê UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Şêwaz Bacê Piştî Mîqdar Discount (Company Exchange)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},warehouse Target bo row wêneke e {0}
 DocType: Cheque Print Template,Primary Settings,Settings seretayî ya
 DocType: Purchase Invoice,Select Supplier Address,Address Supplier Hilbijêre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,lê zêde bike Karmendên
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,lê zêde bike Karmendên
 DocType: Purchase Invoice Item,Quality Inspection,Serperiştiya Quality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Şablon Standard
 DocType: Training Event,Theory,Dîtinî
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Hişyarî: Material Wîkîpediyayê Qty kêmtir ji Minimum Order Qty e
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Account {0} frozen e
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / destekkirinê bi Chart cuda yên Accounts mensûbê Rêxistina.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Food, Beverage &amp; tutunê"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},dikarin bi tenê peredayînê dijî make unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,rêjeya Komîsyona ne dikarin bibin mezintir ji 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ji kerema xwe {0} yekem binivîse
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Wargehan de bi mêjera yên heyî dikarin bi komeke ne bê guhertin.
 DocType: Assessment Result Tool,Result HTML,Di encama HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ketin ser
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,lê zêde bike Xwendekarên
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,lê zêde bike Xwendekarên
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} ji kerema xwe hilbijêre
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Navê kampanyaya Enter, eger source lêkolînê ya kampanyaya e"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Weşanxane rojnameya
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Select sala diravî
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Select sala diravî
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Level DIRTYHERTZ
 DocType: Company,Chart Of Accounts Template,Chart bikarhênerên Şablon
 DocType: Attendance,Attendance Date,Date amadebûnê
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,entry Pekana
 DocType: Program Enrollment Tool,Get Students,Get Xwendekarên
 DocType: Serial No,Under Warranty,di bin Warranty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Şaşî]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Şaşî]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Li Words xuya wê carekê hûn xilas Sales Order.
 ,Employee Birthday,Xebatkarê Birthday
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Xwendekarên Tool Batch Beşdariyê
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Sînora Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,An term akademîk bi vê &#39;Sala (Ekadîmî)&#39; {0} û &#39;Name Term&#39; {1} ji berê ve heye. Ji kerema xwe re van entries xeyrandin û careke din biceribîne.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","As in muamele heyî dijî babete {0} hene, tu bi nirxê biguherînin {1}"
 DocType: UOM,Must be Whole Number,Divê Hejmara Whole
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Leaves New veqetandin (Di Days)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} tune
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Ji materyalên li dijî vê Sales Order billed
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Peyam di dema Girtina
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Navenda Cost bi muamele û yên heyî dikarin bi komeke ne venegerin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Şêwaz {0} {1} {2} {3}
 DocType: Account,Depreciation,Farhad.
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Supplier (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Xebatkarê Tool Beşdariyê
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Last Day of the Month Next
 DocType: Support Settings,Auto close Issue after 7 days,Auto Doza nêzîkî piştî 7 rojan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Leave nikarim li ber terxan kirin {0}, wekî parsenga îzinê jixwe-hilgire hatiye şandin, di qeyda dabeşkirina îzna pêş {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Têbînî: Ji ber / Date: Çavkanî qat bi destûr rojan credit mişterî destê {0} roj (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Xwendekarên Applicant
 DocType: Asset Category Account,Accumulated Depreciation Account,Account Farhad. Accumulated
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Arşîva
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operasyonên bi vala neyê hiştin
 DocType: Maintenance Visit Purpose,Against Document Detail No,Li dijî Detail dokumênt No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Type Partiya wêneke e
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Type Partiya wêneke e
 DocType: Quality Inspection,Outgoing,nikarbe
 DocType: Material Request,Requested For,"xwestin, çimkî"
 DocType: Quotation Item,Against Doctype,li dijî Doctype
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,Code babetî
 DocType: Production Planning Tool,Create Production Orders,Create Orders Production
 DocType: Serial No,Warranty / AMC Details,Mîsoger / Details AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,xwendekarên bi destan ji bo Activity bingeha Pol Hilbijêre
 DocType: Journal Entry,User Remark,Remark Bikarhêner
 DocType: Lead,Market Segment,Segment Market
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Şêwaz pere ne dikarin bibin mezintir total mayî neyînî {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Xebatkarê Navxweyî Dîroka Work
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Girtina (Dr)
 DocType: Cheque Print Template,Cheque Size,Size Cheque
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,Create Requests Material
 DocType: Employee Education,School/University,School / Zanîngeha
 DocType: Payment Request,Reference Details,Details Reference
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nirx a bende Piştî Jiyana gerek kêmtir ji Gross Purchase Mîqdar be
 DocType: Sales Invoice Item,Available Qty at Warehouse,Available Qty li Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Şêwaz billed
 DocType: Asset,Double Declining Balance,Double Balance Îro
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Account Cudahiya, divê hesabekî type Asset / mesulîyetê be, ji ber ku ev Stock Lihevkirinê an Peyam Opening e"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Şêwaz dandin de ne dikarin bibin mezintir Loan Mîqdar {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Bikirin siparîşê pêwîst ji bo vî babetî {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Production Order tên afirandin ne
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Production Order tên afirandin ne
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Ji Date&#39; Divê piştî &#39;To Date&#39; be
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Dikare biguhere status wek xwendekarê bi {0} bi serlêdana xwendekaran ve girêdayî {1}
 DocType: Asset,Fully Depreciated,bi temamî bicūkkirin
 ,Stock Projected Qty,Stock projeya Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Mişterî {0} ne aîdî raxe {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Beşdariyê nîşankirin HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Quotations pêşniyarên in, bids ku hûn û mişterîyên xwe şandin"
 DocType: Sales Order,Customer's Purchase Order,Mişterî ya Purchase Order
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No û Batch
 DocType: Warranty Claim,From Company,ji Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Sum ji Jimareke Krîterên Nirxandina divê {0} be.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nirx an Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ji kerema xwe ve set Hejmara Depreciations civanan
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nirx an Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,"Ordênên Productions dikarin ji bo ne, bêne zindî kirin:"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Deqqe
 DocType: Purchase Invoice,Purchase Taxes and Charges,"Bikirin Bac, û doz li"
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Hemû enbar
 DocType: Sales Partner,Retailer,"jê dikire,"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,"Credit To account, divê hesabekî Bîlançoya be"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,All Types Supplier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,All Types Supplier
 DocType: Global Defaults,Disable In Words,Disable Li Words
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Code babete wêneke e ji ber ku em babete bixweber hejmartî ne
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Quotation {0} ne ji type {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,refaqetê
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Account Overdraft Bank
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Make Slip Salary
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: butçe ne dikarin bibin mezintir mayî bidin.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,"Loans temînatê,"
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Mesaj Date û Time
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},destûra te ya rojanekirina muameleyên borsayê yên kevintir ji {0}
 DocType: Purchase Invoice Item,PR Detail,Detail PR
 DocType: Sales Order,Fully Billed,bi temamî billed
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Ji kerema xwe ve default account cîhde set di Xebatkarê {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash Li Hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},warehouse Delivery pêwîst bo em babete stock {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Giraniya derewîn û ji pakêta. Bi piranî weight net + pakêta weight maddî. (Ji bo print)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Li ser Group
 DocType: Journal Entry,Bill Date,Bill Date
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Babetê Service, Type, frequency û mîqdara kîsî pêwîst in"
-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:","Heta eger ne Rules Pricing multiple bi Girîngiya herî bilind heye, pêşengiyê navxweyî ye, wê li jêr tên sepandin:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Heta eger ne Rules Pricing multiple bi Girîngiya herî bilind heye, pêşengiyê navxweyî ye, wê li jêr tên sepandin:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Ma tu bi rastî dixwazî Submit hemû Slip Salary ji {0} ji bo {1}
 DocType: Cheque Print Template,Cheque Height,Bilindahiya Cheque
 DocType: Supplier,Supplier Details,Details Supplier
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,bi fatûreyên Ref
 DocType: Purchase Order,Recurring Order,nişankirin Order
 DocType: Company,Default Income Account,Account Default da-
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Mişterî Group / mişterî
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Mişterî Group / mişterî
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Negirtî Fiscal Years Profit / Loss (Credit)
 DocType: Sales Invoice,Time Sheets,Sheets Time
 DocType: Payment Gateway Account,Default Payment Request Message,Şerhê peredana Daxwaza Message
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,quotation Message
 DocType: Employee Loan,Employee Loan Application,Xebatkarê Loan Application
 DocType: Issue,Opening Date,Date vekirinê
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Amadebûna serkeftin nîşankirin.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Amadebûna serkeftin nîşankirin.
 DocType: Journal Entry,Remark,Bingotin
 DocType: Purchase Receipt Item,Rate and Amount,Rate û Mîqdar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Type hesabekî ji {0} divê {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Type hesabekî ji {0} divê {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Pelên û Holiday
 DocType: School Settings,Current Academic Term,Term (Ekadîmî) Current
 DocType: School Settings,Current Academic Term,Term (Ekadîmî) Current
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Komeleya Xwendekarên
 DocType: Shopping Cart Settings,Quotation Series,quotation Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","An babete bi heman navî heye ({0}), ji kerema xwe biguherînin li ser navê koma babete an navê babete"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ji kerema xwe ve mişterî hilbijêre
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Ji kerema xwe ve mişterî hilbijêre
 DocType: C-Form,I,ez
 DocType: Company,Asset Depreciation Cost Center,Asset Navenda Farhad. Cost
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,Details sîgorta
 DocType: Account,Payable,Erzan
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ji kerema xwe ve Maweya vegerandinê binivîse
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Deyndarên ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Deyndarên ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,muşteriyan New
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Profit% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Date clearance
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Şêwaz Purchase Gross wêneke e
 DocType: Lead,Address Desc,adres Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partiya wêneke e
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partiya wêneke e
 DocType: Journal Entry,JV-,nájv-
 DocType: Topic,Topic Name,Navê topic
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Li Hindîstan û yek ji Selling an Buying divê bên hilbijartin
-DocType: Grading Structure,Grade Intervals,navberan pola
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,xwezaya business xwe hilbijêrin.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Curenivîsên entry di Çavkanî {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Li ku derê operasyonên bi aktîvîteyên bi çalakiyek hatiye lidarxistin.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,Date installation
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Serên nameyek ji bo şablonan print.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titles ji bo şablonan print wek proforma.
 DocType: Student Guardian,Student Guardian,Xwendekarên Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,doz type Valuation ne dikarin weke berfireh nîşankirin
 DocType: POS Profile,Update Stock,update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM cuda ji bo tomar dê ji bo Şaşî (Total) nirxa Loss Net rê. Bawer bî ku Loss Net ji hev babete di UOM heman e.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / Account Loss
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Karker û Beşdariyê
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Armanca divê yek ji yên bê {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Formê tije bikin û wê xilas bike
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Formê tije bikin û wê xilas bike
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Download rapora dihewînin, mînakên hemû madeyên xav bi dawî status envanterê xwe"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Forûma Civakî
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,qty Actual li stock
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,DIRTYHERTZ Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Openings Job niha:
 DocType: Company,Stock Adjustment Account,Account Adjustment Stock
-DocType: Journal Entry,Write Off,hewe Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,hewe Off
 DocType: Timesheet Detail,Operation ID,operasyona ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sîstema User (login) ID. Heke were avakirin, ew jî wê bibin standard ji bo hemû formên HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Ji {1}
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Supplier xelas dike ji bo Mişterî
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (Form # / babet / {0}) e ji stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Date Next divê mezintir Mesaj Date be
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show bacê break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Show bacê break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Date ji ber / Çavkanî ne dikarin piştî be {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import û Export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock li dijî Warehouse {0} hene, vê yekê hûn ne dikarin ji nû ve bê peywirdarkirin an xeyrandin ew"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,No xwendekarên dîtin.Di
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,No xwendekarên dîtin.Di
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Bi fatûreyên Mesaj Date
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Firotin
 DocType: Sales Invoice,Rounded Total,Rounded Total
 DocType: Product Bundle,List items that form the package.,tomar Lîsteya ku pakêta avakirin.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Kodek rêjeya divê ji% 100 wekhev be
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Ji kerema xwe ve Mesaj Date Beriya hilbijartina Partiya hilbijêre
 DocType: Program Enrollment,School House,House School
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Tikaye Quotations hilbijêre
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Tikaye Quotations hilbijêre
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Make Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Tikaye Quotations hilbijêre
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Hejmara Depreciations civanan ne dikarin bibin mezintir Hejmara Depreciations
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Make Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ji kerema xwe re ji bo ku bikarhêner ku Sales Manager Master {0} rola xwedî têkilî bi
 DocType: Company,Default Cash Account,Account Cash Default
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ne Mişterî an Supplier) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ev li ser amadebûna vê Xwendekarên li
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No Xwendekarên li
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lê zêde bike tomar zêdetir an form tije vekirî
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ji kerema xwe ve &#39;ya bende Date Delivery&#39; binivîse
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Notes Delivery {0} divê berî betalkirinê ev Sales Order were betalkirin
@@ -3237,6 +3241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Babetê 3
 DocType: Purchase Order,Customer Contact Email,Mişterî Contact Email
 DocType: Warranty Claim,Item and Warranty Details,Babetê û Warranty Details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Code babete&gt; babetî Pula&gt; Brand
 DocType: Sales Team,Contribution (%),Alîkarên (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Têbînî: em Peyam Pere dê ji ber ku tên afirandin, ne bê &#39;Cash an Account Bank&#39; ne diyar bû"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Bernameya xeberdanê kursên wêneke Select.
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,berî ku lihevhatina
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Bac û tawana Ev babete ji layê: (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Bacê babete {0} de divê hesabê type Bacê an Hatinê an jî Expense an Chargeable hene
 DocType: Sales Order,Partly Billed,hinekî billed
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,"Babetê {0}, divê babete Asset Fixed be"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,"Babetê {0}, divê babete Asset Fixed be"
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ji kerema xwe re-type navê şîrketa ku piştrast
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total Outstanding Amt
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Company sîgorta
 DocType: Asset Category Account,Fixed Asset Account,Account Asset Fixed
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Têgûherr
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Ji Delivery Note
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Têgûherr
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Ji Delivery Note
 DocType: Student,Student Email Address,Xwendekarên Email Address
 DocType: Timesheet Detail,From Time,ji Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Ez bêzarim:
@@ -3277,12 +3282,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,List Price Exchange Rate
 DocType: Purchase Invoice Item,Rate,Qûrs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Pizişka destpêker
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Address Name
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Address Name
 DocType: Stock Entry,From BOM,ji BOM
 DocType: Assessment Code,Assessment Code,Code nirxandina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Bingehîn
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,muamele Stock berî {0} sar bi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Ji kerema xwe re li ser &#39;Çêneke Cedwela&#39; klîk bike
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","eg Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Çavkanî No diyarkirî ye, eger tu ketin Date Reference"
 DocType: Bank Reconciliation Detail,Payment Document,Dokumentê Payment
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,Structure meaş
 DocType: Account,Bank,Banke
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Şîrketa balafiran
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Doza Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Doza Material
 DocType: Material Request Item,For Warehouse,ji bo Warehouse
 DocType: Employee,Offer Date,Pêşkêşiya Date
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Tu di moda negirêdayî ne. Tu nikarî wê ji nû ve, heta ku hûn torê."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,No komên xwendekaran tên afirandin.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Şêwaz vegerandinê mehane ne dikarin bibin mezintir Loan Mîqdar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ji kerema xwe ve yekem Maintaince Details binivîse
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ji kerema xwe ve yekem Maintaince Details binivîse
 DocType: Purchase Invoice,Print Language,Print Ziman
 DocType: Salary Slip,Total Working Hours,Total dema xebatê
 DocType: Stock Entry,Including items for sub assemblies,Di nav wan de tomar bo sub meclîsên
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Enter nirxa divê erênî be
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Enter nirxa divê erênî be
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Hemû Territories
 DocType: Purchase Invoice,Items,Nawy
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Xwendekarên jixwe digirin.
@@ -3322,17 +3327,15 @@
 DocType: Issue,Opening Time,Time vekirinê
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,From û To dîrokên pêwîst
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Ewlehiya &amp; Borsayên Tirkiyeyê
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Default Unit ji pîvanê ji bo Variant &#39;{0}&#39;, divê wekî li Şablon be &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Calcolo li ser
 DocType: Delivery Note Item,From Warehouse,ji Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,No babet bi Bill ji materyalên ji bo Manufacture
 DocType: Assessment Plan,Supervisor Name,Navê Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
 DocType: Program Enrollment Course,Program Enrollment Course,Program hejmartina Kurs
-DocType: Grading Structure,Grading Structure,Beşên di pîvanê de
 DocType: Purchase Taxes and Charges,Valuation and Total,Valuation û Total
 DocType: Tax Rule,Shipping City,Shipping City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Em babete guhertoya ji {0} (Şablon) e. Xerîbkirin, wê bê ser ji şablonê kopîkirin, eger &#39;No ber Bigire&#39; Biryar e"
 DocType: Notification Control,Customize the Notification,Sīroveyan agahdar bike
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Flow Cash ji operasyonên
 DocType: Sales Invoice,Shipping Rule,Rule Shipping
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,account zarok ji bo vê çîrokê de heye. Tu dikarî vê account jêbirin.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,An QTY hedef an miqdar hedef diyarkirî e
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},No BOM default ji bo vî babetî heye {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Vekirina Date divê berî Girtina Date be
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Ji kerema xwe ve yekem Mesaj Date hilbijêre
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Vekirina Date divê berî Girtina Date be
 DocType: Leave Control Panel,Carry Forward,çêşît Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Navenda Cost bi muamele heyî nikare bê guhartina ji bo ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Rojan de ji bo ku Holidays bi ji bo vê beşê astengkirin.
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,attach letterhead
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ragihandina dawî
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ragihandina dawî
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Valuation û Total&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Valuation û Total&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lîsteya serê baca xwe (wek mînak baca bikaranînê, Gumruk û hwd; divê ew navên xweser heye) û rêjeyên standard xwe. Ev dê şablonê standard, ku tu dikarî biguherînî û lê zêde bike paşê zêdetir biafirîne."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Nos pêwîst ji bo vî babetî weşandin {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Payments Match bi fatûreyên
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Music &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Babetê No Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,"Create a Karkeran, Records"
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,"Create a Karkeran, Records"
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Rageyendrawekanî Accounting
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Seet
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Nenas
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Şertên Rule
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM nû piştî gotina
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,pêşwaziya Mîqdar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Tikaye Employee setup Bidin System Di çavkaniyê binirxîne Mirovan&gt; Settings HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Create bo dikele, full, ji wişeyên dikele, jixwe li ser da"
 DocType: Account,Tax,Bac
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Marked ne
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,Source Name dokumênt
 DocType: Batch,Source Document Name,Source Name dokumênt
 DocType: Job Opening,Job Title,Manşeta şolê
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Create Users
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Create Users
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Xiram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Diravan ji bo Manufacture divê mezintir 0 be.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,rapora ji bo banga parastina biçin.
 DocType: Stock Entry,Update Rate and Availability,Update Rate û Amadeyî
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Rêjeya we bi destûr bistînin an rizgar zêdetir li dijî dorpêçê de ferman da. Ji bo nimûne: Ger tu 100 yekîneyên emir kirine. û bistînin xwe 10% îdî tu bi destûr bo wergirtina 110 yekîneyên e.
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},account Expense bo em babete wêneke e {0}
 DocType: BOM,Website Description,Website Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Change Net di Sebra min
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ji kerema xwe ve poşmaniya kirînê bi fatûreyên {0} pêşîn
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email Address divê yekta be, ji niha ve ji bo heye {0}"
 DocType: Serial No,AMC Expiry Date,AMC Expiry Date
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Meqbûz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Meqbûz
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send Emails At
 DocType: Quotation,Quotation Lost Reason,Quotation Lost Sedem
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Select Domain te
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Muameleyan referansa no {0} dîroka {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,e ku tu tişt ji bo weşînertiya hene.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Nasname ji bo vê mehê de û çalakiyên hîn
 DocType: Customer Group,Customer Group Name,Navê Mişterî Group
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No muşteriyan yet!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Daxûyanîya Flow Cash
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Deyn Mîqdar dikarin Maximum Mîqdar deyn ji mideyeka ne bêtir ji {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Îcaze
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Ji kerema xwe re vê bi fatûreyên {0} ji C-Form jê {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Ji kerema xwe ve çêşît Forward hilbijêre, eger hûn jî dixwazin ku di nav hevsengiyê sala diravî ya berî bernadin ji bo vê sala diravî ya"
 DocType: GL Entry,Against Voucher Type,Li dijî Type Vienna
 DocType: Item,Attributes,taybetmendiyên xwe
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Ji kerema xwe re têkevin hewe Off Account
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} nayê ji şîrketa endamê ne {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numbers Serial li row {0} nayê bi Delivery Têbînî hev nagirin
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Beşdariyê Mark ji bo karmendên multiple
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Account divê ji type be &#39;Asset Fixed&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Qaîdeyên ji bo hesibandina mîqdara shipping ji bo firotina
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series wêneke e
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series wêneke e
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financial Services
 DocType: Student Sibling,Student ID,ID Student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Cureyên çalakiyên ji bo Têketin Time
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,Şêwaz bingehîn
 DocType: Training Event,Exam,Bilbilên
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse pêwîst ji bo vî babetî stock {0}
 DocType: Leave Allocation,Unused leaves,pelên Unused
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Kr
 DocType: Tax Rule,Billing State,Dewletê Billing
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Derbaskirin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nayê bi Account Partiya re têkildar ne {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nayê bi Account Partiya re têkildar ne {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch BOM teqiya (di nav wan de sub-meclîs)
 DocType: Authorization Rule,Applicable To (Employee),To wergirtinê (Xebatkarê)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Date ji ber wêneke e
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Increment bo Pêşbîr {0} nikare bibe 0
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,muşteriyan neçalak e
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Receipts kirîn
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Çawa Pricing Rule sepandin?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Çawa Pricing Rule sepandin?
 DocType: Stock Entry,Delivery Note No,Delivery Têbînî No
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Eger kontrolkirin, tenê Buy daxwazên madî ji bo materyalên xav dawî dê di Requests Material di nav de. An na, Requests Material ji bo tomar dê û bav tên afirandin, wê bê"
 DocType: Cheque Print Template,Message to show,Message bo nîşan bide
 DocType: Company,Retail,Yektacirî
 DocType: Attendance,Absent,Neamade
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Row {0}: Referansa çewt {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,"Bikirin Bac, û doz li Şablon"
 DocType: Upload Attendance,Download Template,download Şablon
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,Hesabê From
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Code babetî
 DocType: Journal Entry,Write Off Based On,Hewe Off li ser
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Make Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Make Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print û Stationery
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Emails Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Send Emails Supplier
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Meaşê niha ve ji bo dema di navbera {0} û {1}, Leave dema serlêdana ne di navbera vê R‧ezkirina dema bê vehûnandin."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,record Installation bo No. Serial
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,li benda Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ser
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},taybetmendiyê de çewt {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Qala eger ne-standard account cîhde
 DocType: Salary Slip,Earning & Deduction,Maaş &amp; dabirîna
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Bixwe. Vê mîhengê wê were bikaranîn ji bo palavtina karê cuda cuda.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Rate Valuation neyînî nayê ne bi destûr
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,Production Order babetî
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,No rekor hate dîtin
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Cost ji Asset belav
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Qismen ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Navenda Cost ji bo babet wêneke e {2}
 DocType: Vehicle,Policy No,siyaseta No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Get Nawy ji Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Get Nawy ji Bundle Product
 DocType: Asset,Straight Line,Line Straight
 DocType: Project User,Project User,Project Bikarhêner
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Qelişandin
@@ -3561,7 +3564,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get xwendekarên ji
 DocType: Hub Settings,Seller Country,Seller Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Weşana Nawy li ser Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Pol xwendekarên xwe li lekerên
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Pol xwendekarên xwe li lekerên
 DocType: Authorization Rule,Authorization Rule,Rule Authorization
 DocType: Sales Invoice,Terms and Conditions Details,Şert û mercan Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifications
@@ -3614,14 +3617,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Date Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Account {0}: account Parent {1} ne aîdî ji şîrketa: {2}
 DocType: Program Enrollment Tool,Student Applicants,Applicants Student
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Bi serkeftin hat hemû muameleyên girêdayî vê şîrketê!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Bi serkeftin hat hemû muameleyên girêdayî vê şîrketê!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Wekî ku li ser Date
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Date nivîsînî
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Dema cerribandinê
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Components meaş
 DocType: Program Enrollment Tool,New Academic Year,New Year (Ekadîmî)
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Têbînî
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Credit Têbînî
 DocType: Stock Settings,Auto insert Price List rate if missing,insert Auto List Price rêjeya eger wenda
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Temamê meblaxa Paid
 DocType: Production Order Item,Transferred Qty,veguhestin Qty
@@ -3641,7 +3644,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type of pelên mîna casual, nexweş hwd."
 DocType: Email Digest,Send regular summary reports via Email.,Send raporên summary nîzamî bi rêya Email.
 DocType: Payment Entry,PE-,Şerqê
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Ji kerema xwe ve account default set li Type mesrefan {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Ji kerema xwe ve account default set li Type mesrefan {0}
 DocType: Assessment Result,Student Name,Navê Student
 DocType: Brand,Item Manager,Manager babetî
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,payroll cîhde
@@ -3662,6 +3665,7 @@
 ,Sales Funnel,govekeke Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abbreviation wêneke e
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Ereboka destan
 ,Qty to Transfer,Qty to Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Quotes and Leads an muşteriyan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role Yorumlar ji bo weşînertiya stock bêhest
@@ -3689,13 +3693,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Babetê Detail Wise Bacê
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abbreviation Enstîtuya
 ,Item-wise Price List Rate,List Price Rate babete-şehreza
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Supplier Quotation
 DocType: Quotation,In Words will be visible once you save the Quotation.,Li Words xuya dê bibe dema ku tu Quotation xilas bike.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Diravan ({0}) ne dikarin bibin fraction li row {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,berhev Fees
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} niha di vî babetî bikaranîn {1}
 DocType: Lead,Add to calendar on this date,Lê zêde bike salnameya li ser vê date
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,"Qaîdeyên ji bo got, heqê şandinê."
 DocType: Item,Opening Stock,vekirina Stock
@@ -3712,8 +3716,8 @@
 Updated via 'Time Log'",li Minutes Demê via &#39;Time Têkeve&#39;
 DocType: Customer,From Lead,ji Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Emir ji bo hilberîna berdan.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Select Fiscal Sal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Select Fiscal Sal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile pêwîst ji bo Peyam POS
 DocType: Program Enrollment Tool,Enroll Students,kul Xwendekarên
 DocType: Hub Settings,Name Token,Navê Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Selling Standard
@@ -3724,7 +3728,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} dijî Sales bi fatûreyên {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Navê Project
-DocType: Supplier,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
+DocType: Customer,Mention if non-standard receivable account,"Behs, eger ne-standard account teleb"
 DocType: Journal Entry Account,If Income or Expense,Ger Hatinê an jî Expense
 DocType: Production Order,Required Items,Nawy pêwîst
 DocType: Stock Ledger Entry,Stock Value Difference,Cudahiya di Nirx Stock
@@ -3745,7 +3749,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,armancên Set babetî Pula-şehreza ji bo vê Person Sales.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Rêzefîlma Cîran Cîran Freeze kevintir Than [Rojan]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ji bo sermaye sabît kirîn / sale wêneke e
-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.","Eger du an jî zêdetir Rules Pricing dîtin li ser şert û mercên li jor li, Priority sepandin. Girîngî hejmareke di navbera 0 to 20 e dema ku nirxa standard zero (vala) e. hejmara Bilind tê wê wateyê ku ew dê sertir eger ne Rules Pricing multiple bi eynî şert û li wir bigirin."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Eger du an jî zêdetir Rules Pricing dîtin li ser şert û mercên li jor li, Priority sepandin. Girîngî hejmareke di navbera 0 to 20 e dema ku nirxa standard zero (vala) e. hejmara Bilind tê wê wateyê ku ew dê sertir eger ne Rules Pricing multiple bi eynî şert û li wir bigirin."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Sal malî: {0} nayê heye ne
 DocType: Currency Exchange,To Currency,to Exchange
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Destûrê bide bikarhêneran li jêr ji bo pejirandina Applications Leave ji bo rojên block.
@@ -3771,7 +3775,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Babetê {0} hesibandin ji ber ku ew e ku em babete stock ne
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Submit ev Production Order bo processing zêdetir.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","To Rule Pricing di danûstandina bi taybetî jî derbas nabe, hemû Rules Pricing pêkanîn, divê neçalak bibin."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","To Rule Pricing di danûstandina bi taybetî jî derbas nabe, hemû Rules Pricing pêkanîn, divê neçalak bibin."
 DocType: Assessment Group,Parent Assessment Group,Dê û bav Nirxandina Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Order Trends
@@ -3782,7 +3786,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost Additional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Financial Sal End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Can filter li ser Voucher No bingeha ne, eger ji aliyê Vienna kom"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Make Supplier Quotation
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Make Supplier Quotation
 DocType: Quality Inspection,Incoming,Incoming
 DocType: BOM,Materials Required (Exploded),Materyalên pêwîst (teqandin)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Lê zêde bike bikarhênerên bi rêxistina xwe, ji xwe"
@@ -3810,6 +3814,7 @@
 DocType: Employee,History In Company,Dîroka Li Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,bultenên me
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Peyam Ledger
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Mişterî&gt; Mişterî Pol&gt; Herêma
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,babete heman hatiye nivîsandin çend caran
 DocType: Department,Leave Block List,Dev ji Lîsteya Block
 DocType: Sales Invoice,Tax ID,ID bacê
@@ -3819,7 +3824,7 @@
 DocType: Customer,Sales Partner and Commission,Partner Sales û Komîsyona
 DocType: Employee Loan,Rate of Interest (%) / Year,Rêjeya faîzên (%) / Sal
 ,Project Quantity,Quantity Project
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} ji bo hemû tomar sifir e, dibe ku ji te re pêwîst &#39;Li dijî wan doz li ser xwer&#39;a&#39; biguhere"
 DocType: Opportunity,To Discuss,birîn
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} yekîneyên {1} pêwîst in {2} ji bo temamkirina vê de mêjera.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rêjeya faîzên (%) Hit
@@ -3834,7 +3839,7 @@
 DocType: Purchase Invoice,Return,Vegerr
 DocType: Production Order Operation,Production Order Operation,Production Order Operation
 DocType: Pricing Rule,Disable,neçalak bike
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Mode dayinê pêwist e ji bo ku tezmînat
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Mode dayinê pêwist e ji bo ku tezmînat
 DocType: Project Task,Pending Review,hîn Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nikarin belav bibin, wekî ku ji niha ve {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Îdîaya Expense Total (via mesrefan)
@@ -3842,11 +3847,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Exchange ji BOM # di {1} de divê ji bo pereyê hilbijartin wekhev be {2}
 DocType: Journal Entry Account,Exchange Rate,Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} tê şandin ne
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Management ya Korsan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Lê zêde bike tomar ji
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Lê zêde bike tomar ji
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},"Warehouse {0}: account Parent {1} ne ji şîrketa, yê bi {2}"
 DocType: Cheque Print Template,Regular,Rêzbirêz
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage tevahî ji hemû Krîterên Nirxandina divê 100% be
@@ -3859,7 +3864,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} tune
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Register Ji bo ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Sedaneya Belavkariya mehane
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,The em babete kilîk ne dikarin Batch hene
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","rêjeya Valuation ji bo babet {0}, ku pêwîst e ji bo ku ez entries, hesabgirê bo dîtin ne {1} {2}. Ger babete drust wek babete test li transacting li {1}, ji kerema xwe ve behsa ku di {1} sifrê Babetê. Na, ji kerema xwe mêjera stock höndör bo em babete an behsa rêjeya muhletan di qeyda Babetê hatî, û piştre hewl Submiting / betalkirinê ev entry"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Ji materyalên li dijî vê Delivery Têbînî teslîmî
 DocType: Project,Customer Details,Details mişterî
@@ -3868,15 +3873,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,parametre url Enter ji bo destikê nos
 DocType: Payment Entry,Paid Amount,Şêwaz pere
 DocType: Assessment Plan,Supervisor,Gûhliser
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,bike
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,bike
 ,Available Stock for Packing Items,Stock ji bo Nawy jî tê de
 DocType: Item Variant,Item Variant,Babetê Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Nirxandina Tool Encam
 DocType: BOM Scrap Item,BOM Scrap Item,BOM babet Scrap
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,emir Submitted nikare were jêbirin
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","balance Account jixwe di Debit, hûn bi destûr ne ji bo danîna wek &#39;Credit&#39; &#39;Balance Must Be&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Management Quality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Babetê {0} neçalakirin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Babetê {0} neçalakirin
 DocType: Employee Loan,Repay Fixed Amount per Period,Bergîdana yekûnê sabît Period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ji kerema xwe ve dorpêçê de ji bo babet binivîse {0}
 DocType: Employee External Work History,Employee External Work History,Xebatkarê History Kar Derve
@@ -3903,7 +3908,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Xwendekarên ID Email
 DocType: Employee,Notice (days),Notice (rojan)
 DocType: Tax Rule,Sales Tax Template,Şablon firotina Bacê
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Select tomar bo rizgarkirina fatûra
 DocType: Employee,Encashment Date,Date Encashment
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Adjustment Stock
@@ -3927,7 +3932,7 @@
 DocType: Item Variant Attribute,Attribute,Pêşbîr
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Ji kerema xwe ve ji xwe diyar bike / ji bo maweyên
 DocType: Serial No,Under AMC,di bin AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,rêjeya muhletan babete ji nuh ve ji ber kefte mesrefa mîqdara fîşeke
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,rêjeya muhletan babete ji nuh ve ji ber kefte mesrefa mîqdara fîşeke
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,mîhengên standard ji bo firotina muamele.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Nepxok
@@ -3937,6 +3942,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Têbînî Issued
 DocType: Production Order,Warehouses,wargehan de
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sermaye ne bi dikarin bê veguhestin
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ev babet guhertoya ji {0} (Şablon) e.
 DocType: Workstation,per hour,Serî saetê
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,kirînê
 DocType: Announcement,Announcement,Daxûyanî
@@ -3952,8 +3958,8 @@
 DocType: Account,Receivable,teleb
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: destûr Not bo guherandina Supplier wek Purchase Order jixwe heye
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rola ku destûr ji bo pêşkêşkirina muamele ku di mideyeka sînorên credit danîn.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Select Nawy ji bo Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Select Nawy ji bo Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master senkronîzekirina welat, bibe hinek dem bigire"
 DocType: Item,Material Issue,Doza maddî
 DocType: Hub Settings,Seller Description,Seller Description
 DocType: Employee Education,Qualification,Zanyarî
@@ -3965,7 +3971,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,emir kir
 DocType: Salary Detail,Component,Perçe
 DocType: Assessment Criteria,Assessment Criteria Group,Şertên Nirxandina Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Vekirina Farhad. Accumulated gerek kêmtir ji bo ku bibe yeksan û {0}
 DocType: Warehouse,Warehouse Name,Navê warehouse
 DocType: Naming Series,Select Transaction,Hilbijêre Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ji kerema xwe re têkevin Erêkirina Role an Erêkirina Bikarhêner
@@ -3978,7 +3984,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},To Date divê di nava sala diravî be. Bihesibînin To Date = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Li vir tu dikarî height, giranî, alerjî, fikarên tibbî û hwd. Bidomînin"
 DocType: Leave Block List,Applies to Company,Ji bo Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,ne dikarin betal bike ji ber ku nehatine şandin Stock Peyam di {0} heye
 DocType: Employee Loan,Disbursement Date,Date Disbursement
 DocType: Vehicle,Vehicle,Erebok
 DocType: Purchase Invoice,In Words,li Words
@@ -3993,14 +3999,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp /% Lead
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Depreciations Asset û hevsengiyên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Şêwaz {0} {1} veguhestin ji {2} ji bo {3}
 DocType: Sales Invoice,Get Advances Received,Get pêşketina pêşwazî
 DocType: Email Digest,Add/Remove Recipients,Zêde Bike / Rake Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Bo danûstandina li dijî Production rawestandin destûr ne Order {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Ji bo danîna vê sala diravî wek Default, klîk le &#39;Set wek Default&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Bihevgirêdan
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,kêmbûna Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant babete {0} bi taybetmendiyên xwe heman heye
 DocType: Employee Loan,Repay from Salary,H&#39;eyfê ji Salary
 DocType: Leave Application,LAP/,HIMBÊZ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ku daxwaz dikin tezmînat li dijî {0} {1} ji bo mîktarê {2}
@@ -4018,7 +4024,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Nirxandina Detail Encam
 DocType: Employee Education,Employee Education,Perwerde karker
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,koma babete hate dîtin li ser sifrê koma babete
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Ev pêwîst e ji bo pędivî Details Babetê.
 DocType: Salary Slip,Net Pay,Pay net
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} ji niha ve wergirtin
@@ -4027,7 +4033,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} ji bo her account ne girêdayî ye, ji kerema xwe ve biafirîne / berve destdayî (e) account ji bo kargehên mezin."
 DocType: Purchase Invoice,Recurring Id,nişankirin Id
 DocType: Customer,Sales Team Details,Details firotina Team
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Vemirandina mayînde?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Vemirandina mayînde?
 DocType: Expense Claim,Total Claimed Amount,Temamê meblaxa îdîa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,derfetên Potential ji bo firotina.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4038,13 +4044,14 @@
 DocType: Warehouse,PIN,DERZÎ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup Dibistana xwe li ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Mîqdar (Company Exchange)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,No entries hisêba ji bo wargehan de li jêr
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Save yekemîn belgeya.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,Change Abbreviation
 DocType: Expense Claim Detail,Expense Date,Date Expense
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Last Order Mîqdar
+DocType: Task,Is Milestone,e Milestone
 DocType: Daily Work Summary,Email Sent To,Email şandin
 DocType: Budget,Warn,Gazîgîhandin
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bęjeyek ji axaftinên din jî, hewldana wê xalê de, ku divê di qeydên here."
@@ -4065,7 +4072,7 @@
 DocType: Item Attribute Value,Attribute Value,nirxê taybetmendiyê
 ,Itemwise Recommended Reorder Level,Itemwise Baştir DIRTYHERTZ Level
 DocType: Salary Detail,Salary Detail,Detail meaş
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Ji kerema xwe {0} hilbijêre yekem
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} yên babet {1} xelas bûye.
 DocType: Sales Invoice,Commission,Simsarî
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Bîlançoya Time ji bo febrîkayan.
@@ -4077,41 +4084,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Cîran Cîran Freeze kevintir Than` divê kêmtir ji% d roj be.
 DocType: Tax Rule,Purchase Tax Template,Bikirin Şablon Bacê
 ,Project wise Stock Tracking,Project Tracking Stock zana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Maintenance Cedwela {0} dijî heye {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qty rastî (di source / target)
 DocType: Item Customer Detail,Ref Code,Code Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,records Employee.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ji kerema xwe ve set Next Date Farhad.
 DocType: HR Settings,Payroll Settings,Settings payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Hev hisab ne-girêdayî û Payments.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,cihê Order
 DocType: Email Digest,New Purchase Orders,Ordênên Buy New
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root ne dikare navenda mesrefa dê û bav hene
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Hilbijêre Brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Hilbijêre Brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Accumulated Farhad ku li ser
 DocType: Sales Invoice,C-Form Applicable,C-Forma serlêdanê
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operasyona Time divê mezintir 0 bo operasyonê bibin {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse wêneke e
 DocType: Supplier,Address and Contacts,Address û Têkilî
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Converter
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Keep it 900px web dostane (w) ji aliyê 100px (h)
 DocType: Program,Program Abbreviation,Abbreviation Program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,"Production Order dikarin li dijî Şablon babet ne, bêne zindî kirin"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Li dijî wan doz bi wergirtina Purchase dijî hev babete ve
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,"Production Order dikarin li dijî Şablon babet ne, bêne zindî kirin"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Li dijî wan doz bi wergirtina Purchase dijî hev babete ve
 DocType: Warranty Claim,Resolved By,Biryar By
 DocType: Bank Guarantee,Start Date,Destpêk Date
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,"Veqetandin, pelên ji bo demeke."
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques û meden bi şaşî kenîştê
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Account {0}: Tu dikarî xwe wek account dê û bav bê peywirdarkirin ne
 DocType: Purchase Invoice Item,Price List Rate,Price List Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Create quotes mişterî
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Create quotes mişterî
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Nîşan bide &quot;In Stock&quot; an &quot;Not li Stock&quot; li ser bingeha stock di vê warehouse.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bill ji Alav (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Dema averaj ji aliyê şîrketa elektrîkê ji bo gihandina
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Encam nirxandina
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,saetan
 DocType: Project,Expected Start Date,Hêvîkirin Date Start
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Jê babete eger doz e ji bo ku em babete ne
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Jê babete eger doz e ji bo ku em babete ne
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Eg. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,currency muameleyan divê eynî wek Payment Gateway pereyan be
 DocType: Payment Entry,Receive,Wergirtin
@@ -4122,19 +4128,19 @@
 DocType: Workstation,Operating Costs,Mesrefên xwe Operating
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Action eger Accumulated Ayda Budget derbas
 DocType: Purchase Invoice,Submit on creation,Submit li ser çêkirina
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Pereyan ji bo {0} divê {1}
 DocType: Asset,Disposal Date,Date çespandina
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails wê ji bo hemû xebatkarên me Active ji şîrketa saet dayîn şandin, eger ew cejna tune ne. Nasname ji bersivên wê li nîvê şevê şandin."
 DocType: Employee Leave Approver,Employee Leave Approver,Xebatkarê Leave Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: An entry DIRTYHERTZ berê ve ji bo vê warehouse heye {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ne dikare ragihîne wek wenda, ji ber ku Quotation hatiye çêkirin."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Training Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Production Order {0} de divê bê şandin
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ji kerema xwe ve Date Start û End Date ji bo babet hilbijêre {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ji kerema xwe ve Date Start û End Date ji bo babet hilbijêre {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Helbet li row wêneke e {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,To date nikarim li ber ji date be
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lê zêde bike / Edit Prices
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lê zêde bike / Edit Prices
 DocType: Batch,Parent Batch,Batch dê û bav
 DocType: Cheque Print Template,Cheque Print Template,Cheque Şablon bo çapkirinê
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Chart Navendên Cost
@@ -4147,7 +4153,7 @@
 ,Ordered Items To Be Delivered,Nawy emir kir ku bên radestkirin
 DocType: Account,Income,Hatin
 DocType: Industry Type,Industry Type,Type Industry
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Tiştek xelet çû!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Tiştek xelet çû!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Hişyarî: Ji sepanê dihewîne di dîrokên block van
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Sales bi fatûreyên {0} ji niha ve hatine radestkirin
 DocType: Assessment Result Detail,Score,Rewşa nixtan
@@ -4178,17 +4184,17 @@
 DocType: Item,Variant Based On,Li ser varyanta
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage rêdan divê 100% be. Ev e {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Suppliers te
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ne dikarin set wek Lost wek Sales Order çêkirin.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,pêşwaziya From
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ne dikarin dadixînin dema kategoriyê e ji bo &#39;Valuation&#39; an jî &#39;Vaulation û Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,pêşwaziya From
 DocType: Lead,Converted,xwe guhert
 DocType: Item,Has Serial No,Has No Serial
 DocType: Employee,Date of Issue,Date of Dozî Kurd
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Ji {0} ji bo {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Ji {0} ji bo {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Supplier bo em babete {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: value Hours divê ji sifirê mezintir be.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Website Wêne {0} girêdayî babet {1} nayê dîtin
 DocType: Issue,Content Type,Content Type
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komûter
 DocType: Item,List this Item in multiple groups on the website.,Lîsteya ev babet di koman li ser malpera me.
@@ -4197,20 +4203,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Tu bi destûr ne ji bo danîna nirxa Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,Get Unreconciled Arşîva
 DocType: Payment Reconciliation,From Invoice Date,Ji fatûreyên Date
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"currency Billing, divê ji bo pereyan an account partiya currency yan jî standard comapany ya wekhev be"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Dev ji Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Çi bikim?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,to Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Hemû Admissions Student
 ,Average Commission Rate,Average Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;Has No Serial&#39; nikare bibe &#39;&#39; Erê &#39;&#39; ji bo non-stock babete
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Amadebûna dikarin di dîrokên pêşeroja bo ne bên nîşankirin
 DocType: Pricing Rule,Pricing Rule Help,Rule Pricing Alîkarî
 DocType: School House,House Name,Navê House
 DocType: Purchase Taxes and Charges,Account Head,Serokê account
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Baştir bike mesrefên din jî ji bo hesabkirina mesrefên peya bûn ji tomar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Zêde ji yên din rêxistina xwe wek bikarhênerên xwe. Tu dikarî gazî muşteriyan bi portal xwe lê zêde bike by got, wan ji Têkilî"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Zêde ji yên din rêxistina xwe wek bikarhênerên xwe. Tu dikarî gazî muşteriyan bi portal xwe lê zêde bike by got, wan ji Têkilî"
 DocType: Stock Entry,Total Value Difference (Out - In),Cudahiya di Total Nirx (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Row {0}: Exchange Rate wêneke e
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},ID&#39;ya bikarhêner ji bo karkirinê set ne {0}
@@ -4219,7 +4225,7 @@
 DocType: Item,Customer Code,Code mişterî
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Reminder Birthday ji bo {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Rojan de ji sala Last Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,"Debit To account, divê hesabekî Bîlançoya be"
 DocType: Buying Settings,Naming Series,Series Bidin
 DocType: Leave Block List,Leave Block List Name,Dev ji Lîsteya Block Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Serî divê kêmtir ji date Insurance End be
@@ -4234,9 +4240,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip meaşê karmendekî {0} berê ji bo kaxeza dem tên afirandin {1}
 DocType: Vehicle Log,Odometer,Green
 DocType: Sales Order Item,Ordered Qty,emir kir Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Babetê {0} neçalak e
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Babetê {0} neçalak e
 DocType: Stock Settings,Stock Frozen Upto,Stock Upto Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nade ti stock babete ne
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nade ti stock babete ne
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Dema From û dema To dîrokên diyarkirî ji bo dubare {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,çalakiyên Project / erka.
 DocType: Vehicle Log,Refuelling Details,Details Refuelling
@@ -4246,8 +4252,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Ev rûpel cara rêjeya kirîn nehate dîtin
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Hewe Off Mîqdar (Company Exchange)
 DocType: Sales Invoice Timesheet,Billing Hours,Saet Billing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM Default ji bo {0} nehate dîtin
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Hêvîye set dorpêçê de DIRTYHERTZ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tap tomar ji wan re lê zêde bike here
 DocType: Fees,Program Enrollment,Program nivîsînî
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Voucher Cost
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ji kerema xwe ve set {0}
@@ -4271,7 +4278,7 @@
 DocType: Maintenance Visit,Maintenance Date,Date Maintenance
 DocType: Purchase Invoice Item,Rejected Serial No,No Serial red
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,date destpêka salê de an roja dawî gihîjte bi {0}. To rê ji kerema xwe ve set company
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Start date divê kêmtir ji roja dawî ji bo babet bê {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Start date divê kêmtir ji roja dawî ji bo babet bê {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.","Mînak:. ABCD ##### Eger series Biryar e û No Serial di livûtevgerên behsa ne, serial number paşê otomatîk dê li ser bingeha vê series tên afirandin. Ger tu tim dixwazin ji bo ku eşkere behsa Serial Nos bo em babete binûse. vala bihêle."
 DocType: Upload Attendance,Upload Attendance,Upload Beşdariyê
@@ -4348,7 +4355,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retail &amp; Wholesale
 DocType: Issue,First Responded On,First Responded ser
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Xaça Listing of babetî di koman
-DocType: Grade Interval,Grade Interval,Ast Navber
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Malî Sal Date Start û malî Sal End Date bi xwe di sala diravî set {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Date Clearance ve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
@@ -4395,14 +4401,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dev ji zilma eger tu dixwazî ji bo ku li hevîrê di dema çêkirina komên Helbet bingeha.
 DocType: Asset,Frequency of Depreciation (Months),Frequency ji Farhad (meh)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Account Credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Account Credit
 DocType: Landed Cost Item,Landed Cost Item,Landed babet Cost
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Nîşan bide nirxên zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Mêjera babete bidestxistin piştî manufacturing / repacking ji quantities dayîn ji madeyên xav
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup a website sade ji bo rêxistina xwe
 DocType: Payment Reconciliation,Receivable / Payable Account,Teleb / cîhde Account
 DocType: Delivery Note Item,Against Sales Order Item,Li dijî Sales Order babetî
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ji kerema xwe binivîsin nirxê taybetmendiyê ji bo pêşbîrê {0}
 DocType: Item,Default Warehouse,Default Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budceya dikare li hember Account Pol ne bibin xwediyê rêdan û {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ji kerema xwe ve navenda mesrefa bav binivîse
@@ -4448,7 +4454,7 @@
 DocType: Opportunity Item,Basic Rate,Rate bingehîn
 DocType: GL Entry,Credit Amount,Şêwaz Credit
 DocType: Cheque Print Template,Signatory Position,Asta îmze
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Set as Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Set as Lost
 DocType: Timesheet,Total Billable Hours,Total Hours Billable
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Payment Meqbûz Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ev li ser danûstandinên li dijî vê Mişterî bingeha. Dîtina cedwela li jêr bo hûragahiyan
@@ -4462,11 +4468,11 @@
 ,Items To Be Requested,Nawy To bê xwestin
 DocType: Purchase Order,Get Last Purchase Rate,Get Last Purchase Rate
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Select an jî lê zêde bike mişterî nû
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Select an jî lê zêde bike mişterî nû
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,navenda Cost pêwîst e ji bo kitêba mesrefan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Sepanê ji Funds (Maldarî)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ev li ser amadebûna vê Xebatkara li
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Account Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Account Debit
 DocType: Fiscal Year,Year Start Date,Sal Serî Date
 DocType: Attendance,Employee Name,Navê xebatkara
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Rounded (Company Exchange)
@@ -4475,13 +4481,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Dev ji bikarhêneran ji çêkirina Applications Leave li ser van rojan de.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Asta kirîn
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Supplier Quotation {0} tên afirandin
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End Sal nikarim li ber Serî Sal be
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Qezenca kardarîyê
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},"dorpêçê de bi timamî, divê dorpêçê de ji bo babet {0} li row pêşya {1}"
 DocType: Production Order,Manufactured Qty,Manufactured Qty
 DocType: Purchase Receipt Item,Accepted Quantity,Quantity qebûlkirin
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ji kerema xwe ve set a default Lîsteya Holiday ji bo karkirinê {0} an Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nizane heye ne
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nizane heye ne
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Fatûrayên xwe rakir, ji bo muşteriyan."
 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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row No {0}: Mîqdar ne mezintir Pending Mîqdar dijî {1} mesrefan. Hîn Mîqdar e {2}
@@ -4490,15 +4496,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,hub
 DocType: GL Entry,Voucher Type,fîşeke Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,List Price nehate dîtin an jî neçalakirinName
 DocType: Employee Loan Application,Approved,pejirandin
 DocType: Pricing Rule,Price,Biha
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Xebatkarê hebekî li ser {0} bê mîhenkirin wek &#39;Çepê&#39;
 DocType: Guardian,Guardian,Wekîl
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} ji bo karkirinê yên tên afirandin {1} di R‧ezkirina dema daye
 DocType: Employee,Education,Zanyarî
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Qada kampanyaya By
 DocType: Employee,Current Address Is,Niha navnîşana e
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,de hate
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Bixwe. Sets currency default şîrketê, eger xwe dişinî ne."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,entries Accounting Kovara.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Available Qty li From Warehouse
@@ -4507,7 +4515,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partiya / Account nayê bi hev nagirin {1} / {2} li {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ji kerema xwe ve Expense Account binivîse
 DocType: Account,Stock,Embar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: World: Kurdî: Corî dokumênt, divê yek ji Purchase Order, Buy bi fatûreyên an Peyam Journal be"
 DocType: Employee,Current Address,niha Address
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ger babete guhertoya yên babete din wê description, wêne, sewqiyata, bac û hwd dê ji şablonê set e, heta ku eşkere û diyar"
 DocType: Serial No,Purchase / Manufacture Details,Buy / Details Manufacture
@@ -4535,7 +4543,7 @@
 DocType: Hub Settings,Hub Settings,Settings hub
 DocType: Project,Gross Margin %,Kenarê% Gross
 DocType: BOM,With Operations,bi operasyonên
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries Accounting niha ve li currency kirin {0} ji bo şîrketa {1}. Ji kerema xwe re hesabekî teleb an cîhde bi pereyan hilbijêre {0}.
 DocType: Asset,Is Existing Asset,Ma karpêkirî Asset
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
 DocType: Salary Detail,Statistical Component,Component Îstatîstîkê
@@ -4560,7 +4568,7 @@
 DocType: Assessment Plan,Room,Jûre
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Bacê babetî
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Madî ji bo Supplier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Madî ji bo Supplier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,baca bi fatûreyên
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ji carekê zêdetir xuya
 DocType: Expense Claim,Employees Email Id,Karmendên Email Id
@@ -4591,9 +4599,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,attach Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,di dereca Stock
 DocType: Customer,Commission Rate,Rate Komîsyona
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Make Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Make Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,sepanên Block xatir ji aliyê beşa.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Type pereyî, divê yek ji peyamek be, Pay û Şandina Hundirîn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Type pereyî, divê yek ji peyamek be, Pay û Şandina Hundirîn"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Têxe vala ye
 DocType: Vehicle,Model,Cins
@@ -4604,6 +4612,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Destûrê bide Production li ser Holidays
 DocType: Sales Order,Customer's Purchase Order Date,Mişterî ya Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Nîşan Attachments Public
 DocType: Packing Slip,Package Weight Details,Package Details Loss
 DocType: Payment Gateway Account,Payment Gateway Account,Account Gateway Payment
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Piştî encamdayîna peredana beralî bike user ji bo rûpel hilbijartin.
@@ -4622,15 +4631,15 @@
 DocType: Batch,Expiry Date,Date Expiry
 ,Supplier Addresses and Contacts,Navnîşan Supplier û Têkilî
 ,accounts-browser,bikarhênerên-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Ji kerema xwe ve yekem Kategorî hilbijêre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Ji kerema xwe ve yekem Kategorî hilbijêre
 apps/erpnext/erpnext/config/projects.py +13,Project master.,master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","To rê li ser-billing an li ser-Ręzkirin, update &quot;Berdêlên&quot; li Stock Settings an jî Babetê."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nîşan nede ti sembola wek $ etc next to currencies.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Day Half)
 DocType: Supplier,Credit Days,Rojan Credit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Batch Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Batch Student
 DocType: Leave Type,Is Carry Forward,Ma çêşît Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Get Nawy ji BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Get Nawy ji BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Rê Time Rojan
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Mesaj Date divê eynî wek tarîxa kirînê be {1} ji sermaye {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ji kerema xwe ve Orders Sales li ser sifrê li jor binivîse
@@ -4647,8 +4656,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Şêwaz ambargoyê
 DocType: GL Entry,Is Opening,e Opening
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debît entry dikarin bi ne bê lînkkirî a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Tikaye setup hijmara series ji bo beşdarbûna bi rêya Setup&gt; Nî Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Account {0} tune
 DocType: Account,Cash,Perê pêşîn
 DocType: Employee,Short biography for website and other publications.,biography kurt de ji bo malpera û belavokên din.
diff --git a/erpnext/translations/lo.csv b/erpnext/translations/lo.csv
index cc5dec9..87bb735 100644
--- a/erpnext/translations/lo.csv
+++ b/erpnext/translations/lo.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ເຊົ່າ
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ສາມາດນໍາໃຊ້ສໍາລັບຜູ້ໃຊ້
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ໃບສັ່ງຜະລິດຢຸດເຊົາບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ຈຸກມັນຄັ້ງທໍາອິດເພື່ອຍົກເລີກການ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","ໃບສັ່ງຜະລິດຢຸດເຊົາບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ຈຸກມັນຄັ້ງທໍາອິດເພື່ອຍົກເລີກການ"
 DocType: Vehicle Service,Mileage,mileage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ທ່ານກໍ່ຕ້ອງການທີ່ຈະ scrap ຊັບສິນນີ້?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ເລືອກຜູ້ຜະລິດມາດຕະຖານ
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ເລືອກຜູ້ຜະລິດມາດຕະຖານ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ສະກຸນເງິນແມ່ນຕ້ອງການສໍາລັບລາຄາ {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ຈະໄດ້ຮັບການຄິດໄລ່ໃນການໄດ້.
 DocType: Purchase Order,Customer Contact,ຕິດຕໍ່ລູກຄ້າ
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ທີ່ຍັງຄ້າງຄາສໍາລັບ {0} ບໍ່ສາມາດຈະຫນ້ອຍກ່ວາສູນ ({1})
 DocType: Manufacturing Settings,Default 10 mins,ມາດຕະຖານ 10 ນາທີ
 DocType: Leave Type,Leave Type Name,ອອກຈາກຊື່ປະເພດ
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ສະແດງໃຫ້ເຫັນການເປີດ
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ສະແດງໃຫ້ເຫັນການເປີດ
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,ຊຸດອັບເດດຮຽບຮ້ອຍ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ກວດເບິ່ງ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,ຖືກຕ້ອງອະນຸ Submitted
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ຊຸດສິນຄ້າສະຖານະຫມົດອາຍຸ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ຮ່າງຂອງທະນາຄານ
 DocType: Mode of Payment Account,Mode of Payment Account,ຮູບແບບຂອງບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ສະແດງໃຫ້ເຫັນທີ່ແຕກຕ່າງກັນ
 DocType: Academic Term,Academic Term,ໄລຍະທາງວິຊາການ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ອຸປະກອນການ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ປະລິມານ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,ປະລິມານ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ຕາຕະລາງບັນຊີບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ເງິນກູ້ຢືມ (ຫນີ້ສິນ)
 DocType: Employee Education,Year of Passing,ປີທີ່ຜ່ານ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","ກະສານອ້າງອີງ:% s, ລະຫັດສິນຄ້າ:% s ແລະລູກຄ້າ:% s"
 DocType: Item,Country of Origin,ປະເທດກໍາເນີດສິນຄ້າ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ໃນສາງ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ເປີດປະເດັນ
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ຮັກສາສຸຂະພາບ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ຄວາມຊັກຊ້າໃນການຈ່າຍເງິນ (ວັນ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ຄ່າໃຊ້ຈ່າຍໃນການບໍລິການ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ອ້າງອິງແລ້ວໃນ Sales ໃບເກັບເງິນ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ໃບເກັບເງິນ
 DocType: Maintenance Schedule Item,Periodicity,ໄລຍະເວລາ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ປີງົບປະມານ {0} ຈໍາເປັນຕ້ອງມີ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,ວັນທີຄາດວ່າສົ່ງແມ່ນຈະກ່ອນທີ່ຈະສັ່ງຊື້ຂາຍວັນທີ່
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ຄັດຕິດເອກະສານ .csv ມີສອງຖັນ, ຫນຶ່ງສໍາລັບຊື່ເກົ່າແລະຫນຶ່ງສໍາລັບຊື່ໃຫມ່"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ບໍ່ໄດ້ຢູ່ໃນການເຄື່ອນໄຫວປີໃດງົບປະມານ.
 DocType: Packed Item,Parent Detail docname,ພໍ່ແມ່ຂໍ້ docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ອ້າງອິງ: {0}, ລະຫັດສິນຄ້າ: {1} ແລະລູກຄ້າ: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,ກິໂລກຣາມ
 DocType: Student Log,Log,ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ການເປີດກວ້າງການວຽກ.
 DocType: Item Attribute,Increment,ການເພີ່ມຂຶ້ນ
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ເລືອກ Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ເລືອກ 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/purchase_invoice/purchase_invoice.js +556,Get items from,ໄດ້ຮັບການລາຍການຈາກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ບໍ່ອະນຸຍາດໃຫ້ສໍາລັບການ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,ໄດ້ຮັບການລາຍການຈາກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ບໍ່ສາມາດຮັບການປັບປຸງຕໍ່ການສົ່ງເງິນ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ຜະລິດຕະພັນ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ບໍ່ມີລາຍະລະບຸໄວ້
 DocType: Payment Reconciliation,Reconcile,ທໍາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ຂາຍເຄື່ອງແຫ້ງ
 DocType: Quality Inspection Reading,Reading 1,ອ່ານ 1
 DocType: Process Payroll,Make Bank Entry,ເຮັດໃຫ້ການເຂົ້າທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ກອງທຶນບໍານານ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາບໍ່ສາມາດກ່ອນທີ່ວັນເວລາຊື້
 DocType: SMS Center,All Sales Person,ທັງຫມົດຄົນຂາຍ
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ການແຜ່ກະຈາຍລາຍເດືອນ ** ຈະຊ່ວຍໃຫ້ທ່ານການແຈກຢາຍງົບປະມານ / ເປົ້າຫມາຍໃນທົ່ວເດືອນຖ້າຫາກວ່າທ່ານມີຕາມລະດູໃນທຸລະກິດຂອງທ່ານ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ບໍ່ພົບລາຍການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,ບໍ່ພົບລາຍການ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ໂຄງປະກອບການເງິນເດືອນທີ່ຫາຍໄປ
 DocType: Lead,Person Name,ຊື່ບຸກຄົນ
 DocType: Sales Invoice Item,Sales Invoice Item,ສິນຄ້າລາຄາ Invoice
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ຕົວຢ່າງ: &quot;ໂຮງຮຽນປະຖົມ&quot; ຫຼື &quot;ວິທະຍາໄລ&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ບົດລາຍງານ Stock
 DocType: Warehouse,Warehouse Detail,ຂໍ້ມູນ Warehouse
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໄດ້ຮັບການ crossed ສໍາລັບລູກຄ້າ {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ວັນທີໄລຍະສຸດທ້າຍບໍ່ສາມາດຈະຕໍ່ມາກ່ວາປີທີ່ສິ້ນສຸດຂອງປີທາງວິຊາການທີ່ໃນໄລຍະການມີການເຊື່ອມຕໍ່ (ປີທາງວິຊາການ {}). ກະລຸນາແກ້ໄຂຂໍ້ມູນວັນແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ແມ່ນຊັບສິນຄົງທີ່&quot; ບໍ່ສາມາດຈະມີການກວດກາ, ເປັນການບັນທຶກຊັບສິນລາຄາຕໍ່ລາຍການ"
 DocType: Vehicle Service,Brake Oil,ນ້ໍາມັນຫ້າມລໍ້
 DocType: Tax Rule,Tax Type,ປະເພດອາກອນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ເພີ່ມຫຼືການປັບປຸງການອອກສຽງກ່ອນ {0}
 DocType: BOM,Item Image (if not slideshow),ລາຍການຮູບພາບ (ຖ້າຫາກວ່າບໍ່ໂຊ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ການລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(ຊົ່ວໂມງອັດຕາ / 60) * ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ເລືອກ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,ເລືອກ BOM
 DocType: SMS Log,SMS Log,SMS ເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ຄ່າໃຊ້ຈ່າຍຂອງການສົ່ງ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ວັນພັກໃນ {0} ບໍ່ແມ່ນລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,ໂຮງຮຽນ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ບໍ່ມີການບັນທຶກໃບພົບພະນັກງານ {0} ສໍາລັບ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ກະລຸນາໃສ່ບໍລິສັດທໍາອິດ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,ກະລຸນາເລືອກບໍລິສັດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ຄ່າໃຊ້ຈ່າຍທັງຫມົດ
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,ຈໍານວນການຮ້ອງຂໍ
 DocType: Employee,Mr,ທ້າວ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,ກຸ່ມລູກຄ້າຊ້ໍາກັນພົບເຫັນຢູ່ໃນຕາຕະລາງກຸ່ມ cutomer ໄດ້
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ປະເພດຜະລິດ / ຜູ້ຈັດຈໍາຫນ່າຍ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ປະເພດຜະລິດ / ຜູ້ຈັດຈໍາຫນ່າຍ
 DocType: Naming Series,Prefix,ຄໍານໍາຫນ້າ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,ຜູ້ບໍລິໂພກ
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Grade
 DocType: Sales Invoice Item,Delivered By Supplier,ສົ່ງໂດຍຜູ້ສະຫນອງ
 DocType: SMS Center,All Contact,ທັງຫມົດຕິດຕໍ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ໃບສັ່ງຜະລິດສ້າງແລ້ວສໍາລັບລາຍການທັງຫມົດທີ່ມີ BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ເງິນເດືອນປະຈໍາປີ
 DocType: Daily Work Summary,Daily Work Summary,Summary ວຽກປະຈໍາວັນ
 DocType: Period Closing Voucher,Closing Fiscal Year,ປິດປີງົບປະມານ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ແມ່ນ frozen
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ກະລຸນາເລືອກບໍລິສັດທີ່ມີຢູ່ສໍາລັບການສ້າງຕາຕະລາງຂອງການບັນຊີ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ຄ່າໃຊ້ຈ່າຍ Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ເລືອກ Warehouse ເປົ້າຫມາຍ
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,ການປ່ອຍສິນເຊື່ອໃນບໍລິສັດສະກຸນເງິນ
 DocType: Delivery Note,Installation Status,ສະຖານະການຕິດຕັ້ງ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ທ່ານຕ້ອງການທີ່ຈະປັບປຸງການເຂົ້າຮຽນ? <br> ປະຈຸບັນ: {0} \ <br> ບໍ່ມີ: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},+ ທີ່ໄດ້ຮັບການປະຕິເສດຈໍານວນຕ້ອງເທົ່າກັບປະລິມານທີ່ໄດ້ຮັບສໍາລັບລາຍການ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ວັດສະດຸສະຫນອງວັດຖຸດິບສໍາຫລັບການຊື້
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ຢ່າງຫນ້ອຍຫນຶ່ງຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນສໍາລັບໃບເກັບເງິນ POS.
 DocType: Products Settings,Show Products as a List,ສະແດງໃຫ້ເຫັນຜະລິດຕະພັນເປັນຊີ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ດາວນ໌ໂຫລດແມ່ແບບ, ໃຫ້ຕື່ມຂໍ້ມູນທີ່ເຫມາະສົມແລະຕິດແຟ້ມທີ່ແກ້ໄຂໄດ້. ທັງຫມົດກໍານົດວັນທີແລະພະນັກງານປະສົມປະສານໃນໄລຍະເວລາທີ່ເລືອກຈະມາໃນແມ່ແບບ, ມີການບັນທຶກການເຂົ້າຮຽນທີ່ມີຢູ່ແລ້ວ"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ເຮັດໃຫ້ການເຂົ້າຄ່າເສື່ອມລາຄາ
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ຄໍາຮ້ອງຂໍປະເພດ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ເຮັດໃຫ້ພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ເຮັດໃຫ້ພະນັກງານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ກະຈາຍສຽງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ການປະຕິບັດ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ລາຍລະອຽດຂອງການດໍາເນີນງານປະຕິບັດ.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ແຜນການສໍາລັບການໄປຢ້ຽມຢາມບໍາລຸງຮັກສາ.
 DocType: SMS Settings,Enter url parameter for message,ກະລຸນາໃສ່ພາລາມິເຕີ url ສໍາລັບຂໍ້ຄວາມ
 DocType: POS Profile,Customer Groups,ກຸ່ມສົນທະນາຂອງລູກຄ້າ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ງົບການເງິນ
 DocType: Guardian,Students,ນັກສຶກສາ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ກົດລະບຽບສໍາລັບການຍື່ນຄໍາຮ້ອງຂໍລາຄາແລະພິເສດ.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ລາຄາຈະຕ້ອງສາມາດນໍາໃຊ້ສໍາລັບການຊື້ຫຼືການຂາຍ
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ຈໍານວນເງິນລ່ວງຫນ້າບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ {0} {1}
 DocType: Naming Series,Series List for this Transaction,ບັນຊີໄລຍະສໍາລັບການນີ້
 DocType: Company,Default Payroll Payable Account,Default Payroll Account Payable
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Group Email ການປັບປຸງ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Group Email ການປັບປຸງ
 DocType: Sales Invoice,Is Opening Entry,ຄືການເປີດ Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້ສາມາດນໍາໃຊ້
 DocType: Course Schedule,Instructor Name,ຊື່ instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ສໍາລັບການຄັງສິນຄ້າທີ່ຕ້ອງການກ່ອນທີ່ຈະຍື່ນສະເຫນີການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,ຕົວແທນຈໍາຫນ່າຍ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","ຖ້າຫາກວ່າການກວດກາ, ຈະປະກອບມີລາຍການລາຍການທີ່ບໍ່ແມ່ນຫຼັກຊັບໃນຄໍາຮ້ອງຂໍການວັດສະດຸ."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,ຕໍ່ຕ້ານການຂາຍໃບແຈ້ງຫນີ້ສິນຄ້າ
 ,Production Orders in Progress,ໃບສັ່ງຜະລິດໃນຄວາມຄືບຫນ້າ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ເງິນສົດສຸດທິຈາກການເງິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
 DocType: Lead,Address & Contact,ທີ່ຢູ່ຕິດຕໍ່
 DocType: Leave Allocation,Add unused leaves from previous allocations,ຕື່ມການໃບທີ່ບໍ່ໄດ້ໃຊ້ຈາກການຈັດສັນທີ່ຜ່ານມາ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Recurring ຕໍ່ໄປ {0} ຈະໄດ້ຮັບການສ້າງຕັ້ງຂື້ນໃນ {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ມູນຄ່າທັງຫມົດຈໍານວນເງິນ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 DocType: Item Website Specification,Item Website Specification,ຂໍ້ມູນຈໍາເພາະລາຍການເວັບໄຊທ໌
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ອອກຈາກສະກັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ການອອກສຽງທະນາຄານ
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ລາຍການ {0} ໄດ້ບັນລຸໃນຕອນທ້າຍຂອງຊີວິດໃນ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ການອອກສຽງທະນາຄານ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ປະຈໍາປີ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Reconciliation Item
 DocType: Stock Entry,Sales Invoice No,ຂາຍໃບເກັບເງິນທີ່ບໍ່ມີ
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,ເຜີຍແຜ່ໃນ Hub
 DocType: Student Admission,Student Admission,ຮັບສະຫມັກນັກສຶກສາ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ຂໍອຸປະກອນການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ລາຍການ {0} ຈະຖືກຍົກເລີກ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,ຂໍອຸປະກອນການ
 DocType: Bank Reconciliation,Update Clearance Date,ວັນທີ່ປັບປຸງການເກັບກູ້
 DocType: Item,Purchase Details,ລາຍລະອຽດການຊື້
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ລາຍການ {0} ບໍ່ພົບເຫັນຢູ່ໃນຕາຕະລາງ &#39;ຈໍາຫນ່າຍວັດຖຸດິບໃນການສັ່ງຊື້ {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ເຊັກທີ່ຍັງຄ້າງຄາແລະຄ່າມັດຈໍາເພື່ອອະນາໄມ
 DocType: Item,Synced With Hub,ຊິ້ງຂໍ້ມູນກັບ Hub
 DocType: Vehicle,Fleet Manager,ຜູ້ຈັດການເຮືອ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},ແຖວ # {0}: {1} ບໍ່ສາມາດຈະລົບສໍາລັບລາຍການ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,ລະຫັດຜ່ານຜິດ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},ແຖວ # {0}: {1} ບໍ່ສາມາດຈະລົບສໍາລັບລາຍການ {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,ລະຫັດຜ່ານຜິດ
 DocType: Item,Variant Of,variant ຂອງ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',ສໍາເລັດຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ &#39;ຈໍານວນການຜະລິດ&#39;
 DocType: Period Closing Voucher,Closing Account Head,ປິດຫົວຫນ້າບັນຊີ
 DocType: Employee,External Work History,ວັດການເຮັດວຽກພາຍນອກ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Error Reference ວົງ
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ແຈ້ງໂດຍ Email ກ່ຽວກັບການສ້າງຂອງຄໍາຮ້ອງຂໍອຸປະກອນອັດຕະໂນມັດ
 DocType: Journal Entry,Multi Currency,ສະກຸນເງິນຫຼາຍ
 DocType: Payment Reconciliation Invoice,Invoice Type,ປະເພດໃບເກັບເງິນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ການສົ່ງເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ການສົ່ງເງິນ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ການຕັ້ງຄ່າພາສີອາກອນ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ຄ່າໃຊ້ຈ່າຍຂອງຊັບສິນຂາຍ
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Entry ການຊໍາລະເງິນໄດ້ຮັບການແກ້ໄຂພາຍຫຼັງທີ່ທ່ານໄດ້ດຶງມັນ. ກະລຸນາດຶງມັນອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
-DocType: Grade Interval,Min Score,ຄະແນນຕ່ໍາສຸດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ເຂົ້າສອງຄັ້ງໃນພາສີສິນຄ້າ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ສະຫຼຸບສັງລວມສໍາລັບອາທິດນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Student Applicant,Admitted,ຍອມຮັບຢ່າງຈິງ
 DocType: Workstation,Rent Cost,ເຊົ່າທຶນ
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ມູນຄ່າການສັ່ງຊື້
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ເຮັດທຸລະກໍາທະນາຄານ / ເງິນສົດຕໍ່ຕ້ານພັກຫຼືສໍາລັບການຍົກຍ້າຍພາຍໃນ
 DocType: Shipping Rule,Valid for Countries,ຖືກຕ້ອງສໍາລັບປະເທດ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແມ່ແບບແລະບໍ່ສາມາດຖືກນໍາໃຊ້ໃນການຄ້າຂາຍ. ຄຸນລັກສະນະລາຍການຈະໄດ້ຮັບການຄັດລອກໄປເຂົ້າໄປໃນ variants ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ຄໍາສັ່ງທັງຫມົດພິຈາລະນາ
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ການອອກແບບຂອງພະນັກງານ (ຕົວຢ່າງ CEO, ຜູ້ອໍານວຍການແລະອື່ນໆ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ກະລຸນາໃສ່ &#39;ຊ້ໍາໃນວັນປະຈໍາເດືອນມູນຄ່າພາກສະຫນາມ
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},"ຕິດຕໍ່ກັນ, {0}: Purchase Invoice ບໍ່ສາມາດຈະດໍາເນີນຕໍ່ຊັບສິນທີ່ມີຢູ່ແລ້ວ {1}"
 DocType: Item Tax,Tax Rate,ອັດຕາພາສີ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ຈັດສັນແລ້ວສໍາລັບພະນັກງານ {1} ສໍາລັບໄລຍະເວລາ {2} ກັບ {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ເລືອກລາຍການ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,ເລືອກລາຍການ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ຊື້ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"ຕິດຕໍ່ກັນ, {0}: Batch ບໍ່ຕ້ອງເຊັ່ນດຽວກັນກັບ {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,ປ່ຽນກັບທີ່ບໍ່ແມ່ນ Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (ຫຼາຍ) ຂອງສິນຄ້າ.
 DocType: C-Form Invoice Detail,Invoice Date,ວັນທີ່ໃບເກັບເງິນ
 DocType: GL Entry,Debit Amount,ຈໍານວນເງິນເດບິດ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},ມີພຽງແຕ່ສາມາດ 1 ບັນຊີຕໍ່ບໍລິສັດໃນ {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ກະລຸນາເບິ່ງການຕິດ
 DocType: Purchase Order,% Received,% ທີ່ໄດ້ຮັບ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ສ້າງກຸ່ມນັກສຶກສາ
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,ການຮ້ອງຂໍສໍາລັບວົງຢືມ
 DocType: Salary Slip Timesheet,Working Hours,ຊົ່ວໂມງເຮັດວຽກ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ການປ່ຽນແປງ / ຈໍານວນລໍາດັບການເລີ່ມຕົ້ນໃນປັດຈຸບັນຂອງໄລຍະການທີ່ມີຢູ່ແລ້ວ.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
-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.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ສ້າງລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ຖ້າຫາກວ່າກົດລະບຽບການຕັ້ງລາຄາທີ່ຫຼາກຫຼາຍສືບຕໍ່ໄຊຊະນະ, ຜູ້ໃຊ້ໄດ້ຮ້ອງຂໍໃຫ້ກໍານົດບຸລິມະສິດດ້ວຍຕົນເອງເພື່ອແກ້ໄຂບັນຫາຂໍ້ຂັດແຍ່ງ."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,ສ້າງໃບສັ່ງຊື້
 ,Purchase Register,ລົງທະບຽນການຊື້
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ຄ່າບໍລິການສາມາດນໍາໃຊ້
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ອອກຈາກການອະນຸມັດ
 DocType: Purchase Receipt,Vehicle Date,ວັນທີ່ສະຫມັກຍານພາຫະນະ
 DocType: Student Log,Medical,ທາງການແພດ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ເຫດຜົນສໍາລັບການສູນເສຍ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ເຈົ້າຂອງເປັນຜູ້ນໍາພາບໍ່ສາມາດຈະດຽວກັນເປັນຜູ້ນໍາ
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ຈໍານວນເງິນທີ່ຈັດສັນສາມາດເຮັດໄດ້ບໍ່ຫຼາຍກ່ວາຈໍານວນ unadjusted
 DocType: Announcement,Receiver,ຮັບ
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ປະລິມານແລະອັດຕາການ
 DocType: Delivery Note,% Installed,% ການຕິດຕັ້ງ
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ຫ້ອງຮຽນ / ຫ້ອງປະຕິບັດແລະອື່ນໆທີ່ບັນຍາຍສາມາດໄດ້ຮັບການກໍານົດ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ກະລຸນາໃສ່ຊື່ບໍລິສັດທໍາອິດ
 DocType: Purchase Invoice,Supplier Name,ຊື່ຜູ້ຜະລິດ
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ອ່ານຄູ່ມື ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ພາກສະຫນາມບັງຄັບ - ປີທາງວິຊາການ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ພາກສະຫນາມບັງຄັບ - ປີທາງວິຊາການ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ປັບຂໍ້ຄວາມແນະນໍາທີ່ດີເປັນສ່ວນຫນຶ່ງຂອງອີເມລ໌ທີ່ເປັນ. ແຕ່ລະຄົນມີຄວາມແນະນໍາທີ່ແຍກຕ່າງຫາກ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},ກະລຸນາຕັ້ງບັນຊີທີ່ຕ້ອງຈ່າຍໃນຕອນຕົ້ນສໍາລັບການບໍລິສັດ {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,ການຕັ້ງຄ່າທົ່ວໂລກສໍາລັບຂະບວນການຜະລິດທັງຫມົດ.
 DocType: Accounts Settings,Accounts Frozen Upto,ບັນຊີ Frozen ເກີນ
 DocType: SMS Log,Sent On,ສົ່ງກ່ຽວກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ຄຸນລັກສະນະ {0} ເລືອກເວລາຫຼາຍໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: HR Settings,Employee record is created using selected field. ,ການບັນທຶກຂອງພະນັກງານແມ່ນການສ້າງຕັ້ງການນໍາໃຊ້ພາກສະຫນາມການຄັດເລືອກ.
 DocType: Sales Order,Not Applicable,ບໍ່ສາມາດໃຊ້
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ຕົ້ນສະບັບວັນພັກ.
 DocType: Request for Quotation Item,Required Date,ວັນທີ່ສະຫມັກທີ່ກໍານົດໄວ້
 DocType: Delivery Note,Billing Address,ທີ່ຢູ່ໃບບິນ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,ກະລຸນາໃສ່ລະຫັດສິນຄ້າ.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,ກະລຸນາໃສ່ລະຫັດສິນຄ້າ.
 DocType: BOM,Costing,ການໃຊ້ຈ່າຍ
 DocType: Tax Rule,Billing County,County Billing
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ຖ້າຫາກວ່າການກວດກາ, ຈໍານວນເງິນພາສີຈະໄດ້ຮັບການພິຈາລະນາເປັນລວມຢູ່ໃນອັດຕາການພິມ / ການພິມຈໍານວນເງິນ"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,ຈາກ Package ສະບັບເລກທີ
 DocType: Item Attribute,To Range,ການຊ່ວງ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,ຫລັກຊັບແລະເງິນຝາກ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ບໍ່ສາມາດມີການປ່ຽນແປງວິທີການປະເມີນມູນຄ່າ, ເນື່ອງຈາກວ່າມີທຸລະກໍາກັບບາງລາຍການທີ່ບໍ່ມີມັນເປັນວິທີການປະເມີນມູນຄ່າຂອງຕົນເອງ"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ໃບທັງຫມົດການຈັດສັນແມ່ນການບັງຄັບ
 DocType: Job Opening,Description of a Job Opening,ລາຍລະອຽດຂອງການໃຊ້ວຽກ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ກິດຈະກໍາທີ່ຍັງຄ້າງສໍາລັບມື້ນີ້
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,ກະລຸນາເລືອກລາຍວິຊາ
 DocType: Timesheet Detail,Hrs,ຊົ່ວໂມງ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,ກະລຸນາເລືອກບໍລິສັດ
 DocType: Stock Entry Detail,Difference Account,ບັນຊີທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ສາມາດເຮັດໄດ້ບໍ່ແມ່ນວຽກງານຢ່າງໃກ້ຊິດເປັນວຽກງານຂຶ້ນຂອງຕົນ {0} ບໍ່ໄດ້ປິດ.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +538,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ການຜະສານຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ຈະຕ້ອງດຽວກັນສໍາລັບການລາຍການທັງສອງ
 DocType: Shipping Rule,Net Weight,ນໍ້າຫນັກສຸດທິ
 DocType: Employee,Emergency Phone,ໂທລະສັບສຸກເສີນ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ຊື້
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ກະລຸນາອະທິບາຍຊັ້ນສໍາລັບ Threshold 0%
 DocType: Sales Order,To Deliver,ການສົ່ງ
 DocType: Purchase Invoice Item,Item,ລາຍການ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial ລາຍການທີ່ບໍ່ມີບໍ່ສາມາດຈະສ່ວນຫນຶ່ງເປັນ
 DocType: Journal Entry,Difference (Dr - Cr),ຄວາມແຕກຕ່າງກັນ (Dr - Cr)
 DocType: Account,Profit and Loss,ກໍາໄລແລະຂາດທຶນ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,ການຄຸ້ມຄອງການ Subcontracting
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ການເພີ່ມຂຶ້ນບໍ່ສາມາດຈະເປັນ 0
 DocType: Production Planning Tool,Material Requirement,ຄວາມຕ້ອງການອຸປະກອນການ
 DocType: Company,Delete Company Transactions,ລົບລາຍະການບໍລິສັດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ກະສານອ້າງອີງບໍ່ມີແລະວັນທີເອກະສານແມ່ນການບັງຄັບສໍາລັບການເຮັດທຸລະກໍາທະນາຄານ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,ເພີ່ມ / ແກ້ໄຂພາສີອາກອນແລະຄ່າບໍລິການ
 DocType: Purchase Invoice,Supplier Invoice No,Supplier Invoice No
 DocType: Territory,For reference,ສໍາລັບການກະສານອ້າງອີງ
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,ການຕິດຕັ້ງຫມາຍເຫດລາຍການ
 DocType: Production Plan Item,Pending Qty,ຢູ່ລະຫວ່າງການຈໍານວນ
 DocType: Budget,Ignore,ບໍ່ສົນໃຈ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ບໍ່ເຮັດວຽກ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS ສົ່ງໄປຈໍານວນດັ່ງຕໍ່ໄປນີ້: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ຂະຫນາດການຕິດຕັ້ງການກວດສໍາລັບການພິມ
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet ເງິນເດືອນ Slip
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,ຄະນະກໍາມະການທັງຫມົດ
 DocType: Pricing Rule,Sales Partner,Partner ຂາຍ
 DocType: Buying Settings,Purchase Receipt Required,ຊື້ຮັບທີ່ກໍານົດໄວ້
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ອັດຕາມູນຄ່າເປັນການບັງຄັບຖ້າຫາກວ່າການເປີດກວ້າງການຕະຫຼາດເຂົ້າໄປ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການບັນທຶກການໃບເກັບເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ກະລຸນາເລືອກບໍລິສັດແລະພັກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ທາງດ້ານການເງິນ / ການບັນຊີປີ.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ຄ່າສະສົມ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ຂໍອະໄພ, Serial Nos ບໍ່ສາມາດລວມ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,ເຮັດໃຫ້ຂາຍສິນຄ້າ
 DocType: Project Task,Project Task,ໂຄງການ Task
 ,Lead Id,Id ນໍາ
 DocType: C-Form Invoice Detail,Grand Total,ລວມທັງຫມົດ
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,ຊີວະປະຫວັດ Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ລູກຄ້າຊ້ໍາ
 DocType: Leave Control Panel,Allocate,ຈັດສັນ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Return ຂາຍ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Return ຂາຍ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ຫມາຍເຫດ: ໃບຈັດສັນທັງຫມົດ {0} ບໍ່ຄວນຈະຫນ້ອຍກ່ວາໃບອະນຸມັດແລ້ວ {1} ສໍາລັບໄລຍະເວລາ
 DocType: Announcement,Posted By,ຈັດພີມມາໂດຍ
 DocType: Item,Delivered by Supplier (Drop Ship),ນໍາສະເຫນີໂດຍຜູ້ຜະລິດ (Drop ການຂົນສົ່ງ)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,ສະເຫນີລາຄາການ
 DocType: Lead,Middle Income,ລາຍໄດ້ປານກາງ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ເປີດ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,ມາດຕະຖານ Unit of Measure ສໍາລັບລາຍການ {0} ບໍ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍກົງເພາະວ່າທ່ານໄດ້ເຮັດແລ້ວການເຮັດທຸລະກໍາບາງ (s) ມີ UOM ອື່ນ. ທ່ານຈະຕ້ອງການເພື່ອສ້າງເປັນລາຍການໃຫມ່ທີ່ຈະນໍາໃຊ້ UOM ມາດຕະຖານທີ່ແຕກຕ່າງກັນ.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ຈໍານວນເງິນທີ່ຈັດສັນບໍ່ສາມາດຈະກະທົບທາງລົບ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ກະລຸນາຕັ້ງບໍລິສັດໄດ້
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ຂາຍ Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ກະສານອ້າງອີງບໍ່ມີວັນແລະເວລາກະສານອ້າງອີງຕ້ອງການສໍາລັບ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ເລືອກບັນຊີຊໍາລະເງິນເພື່ອເຮັດໃຫ້ການອອກສຽງທະນາຄານ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ສ້າງການບັນທຶກຂອງພະນັກວຽກໃນການຄຸ້ມຄອງໃບ, ການຮຽກຮ້ອງຄ່າໃຊ້ຈ່າຍແລະການຈ່າຍເງິນເດືອນ"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ຕື່ມການກັບຖານຄວາມຮູ້ຂອງ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ຂຽນບົດສະເຫນີ
 DocType: Payment Entry Deduction,Payment Entry Deduction,ການຫັກ Entry ການຊໍາລະເງິນ
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} &#39;ບໍ່ໄດ້ຢູ່ໃນປີງົບປະມານ {2}
 DocType: Buying Settings,Settings for Buying Module,ການຕັ້ງຄ່າສໍາຫລັບການຊື້ Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,ກະລຸນາໃສ່ຮັບຊື້ຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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.","ກົດລະບຽບຫຼັງຈາກນັ້ນລາຄາຖືກກັ່ນຕອງອອກໂດຍອີງໃສ່ລູກຄ້າກຸ່ມລູກຄ້າ, ອານາເຂດ, ຜູ້ຜະລິດ, ປະເພດເຄື່ອງໃຊ້, ການໂຄສະນາ, Partner ຂາຍແລະອື່ນໆ"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ກົດລະບຽບຫຼັງຈາກນັ້ນລາຄາຖືກກັ່ນຕອງອອກໂດຍອີງໃສ່ລູກຄ້າກຸ່ມລູກຄ້າ, ອານາເຂດ, ຜູ້ຜະລິດ, ປະເພດເຄື່ອງໃຊ້, ການໂຄສະນາ, Partner ຂາຍແລະອື່ນໆ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ການປ່ຽນແປງສຸດທິໃນສິນຄ້າຄົງຄັງ
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ການບໍລິຫານເງິນກູ້ພະນັກງານ
 DocType: Employee,Passport Number,ຈໍານວນຫນັງສືຜ່ານແດນ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ຄວາມສໍາພັນກັບ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ຜູ້ຈັດການ
 DocType: Payment Entry,Payment From / To,ການຊໍາລະເງິນຈາກ / ໄປ
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Range ວັນທີ່
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອໃຫມ່ແມ່ນຫນ້ອຍກວ່າຈໍານວນເງິນທີ່ຍັງຄ້າງຄາໃນປະຈຸບັນສໍາລັບລູກຄ້າ. ຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອຈະຕ້ອງມີ atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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;Group ໂດຍ&#39; ບໍ່ສາມາດຈະເປັນຄືກັນ
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,ໃນນາທີ
 DocType: Issue,Resolution Date,ວັນທີ່ສະຫມັກການແກ້ໄຂ
 DocType: Student Batch Name,Batch Name,ຊື່ batch
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ສ້າງ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet ສ້າງ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ກະລຸນາທີ່ກໍານົດໄວ້ເງິນສົດໃນຕອນຕົ້ນຫຼືບັນຊີທະນາຄານໃນຮູບແບບການຊໍາລະເງິນ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ລົງທະບຽນ
 DocType: Selling Settings,Customer Naming By,ຊື່ລູກຄ້າໂດຍ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ຈະສະແດງໃຫ້ເຫັນນັກຮຽນເປັນປັດຈຸບັນໃນບົດລາຍງານການເຂົ້າຮ່ວມລາຍເດືອນນັກສຶກສາ
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,ເວລາທີ່ແທ້ຈິງ
 DocType: BOM Operation,Operation Time,ທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,ສໍາເລັດຮູບ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ຖານ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,ຖານ
 DocType: Timesheet,Total Billed Hours,ທັງຫມົດຊົ່ວໂມງບິນ
 DocType: Journal Entry,Write Off Amount,ຂຽນ Off ຈໍານວນ
 DocType: Journal Entry,Bill No,ບັນຊີລາຍການບໍ່ມີ
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,ຜູ້ເຂົ້າຮ່ວມນັກສຶກສາ
 DocType: Sales Invoice Timesheet,Time Sheet,ທີ່ໃຊ້ເວລາ Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,ວັດຖຸດິບ Backflush ຖານກ່ຽວກັບ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ກະລຸນາໃສ່ລາຍລະອຽດລາຍການ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ກະລຸນາໃສ່ລາຍລະອຽດລາຍການ
 DocType: Interest,Interest,ທີ່ຫນ້າສົນໃຈ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales Pre
 DocType: Purchase Receipt,Other Details,ລາຍລະອຽດອື່ນໆ
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Entry ການຈ່າຍເງິນແມ່ນສ້າງຮຽບຮ້ອຍແລ້ວ
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock ປັດຈຸບັນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ບໍ່ໄດ້ຕິດພັນກັບການ Item {2}"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ສະແດງຄວາມຜິດພາດພຽງເງິນເດືອນ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ບັນຊີ {0} ໄດ້ຮັບການປ້ອນເວລາຫຼາຍ
 DocType: Account,Expenses Included In Valuation,ຄ່າໃຊ້ຈ່າຍລວມຢູ່ໃນການປະເມີນຄ່າ
 DocType: Hub Settings,Seller City,ຜູ້ຂາຍເມືອງ
 ,Absent Student Report,ບົດລາຍງານນັກສຶກສາບໍ່
 DocType: Email Digest,Next email will be sent on:,email ຕໍ່ໄປຈະຖືກສົ່ງໄປຕາມ:
 DocType: Offer Letter Term,Offer Letter Term,ສະເຫນີຈົດຫມາຍໄລຍະ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ລາຍການມີ variants.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ລາຍການມີ variants.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ບໍ່ພົບລາຍການ {0}
 DocType: Bin,Stock Value,ມູນຄ່າຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,ບໍລິສັດ {0} ບໍ່ມີ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ປະເພດຕົ້ນໄມ້
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,ປະເພດຕົ້ນໄມ້
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ຈໍານວນການບໍລິໂພກຕໍ່ຫນ່ວຍ
 DocType: Serial No,Warranty Expiry Date,ການຮັບປະກັນວັນທີ່ຫມົດອາຍຸ
 DocType: Material Request Item,Quantity and Warehouse,ປະລິມານແລະຄັງສິນຄ້າ
 DocType: Sales Invoice,Commission Rate (%),ຄະນະກໍາມະອັດຕາ (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,ກະລຸນາເລືອກໂຄງການ
 DocType: Project,Estimated Cost,ຕົ້ນທຶນຄາດຄະເນ
@@ -768,7 +770,7 @@
 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,ບັນຊີມາດຕະຖານ
 DocType: Payment Entry,Received Amount (Company Currency),ໄດ້ຮັບຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,ຜູ້ນໍາພາຕ້ອງໄດ້ຮັບການກໍານົດຖ້າຫາກວ່າໂອກາດແມ່ນໄດ້ມາຈາກຜູ້ນໍາ
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ກະລຸນາເລືອກວັນໄປປະຈໍາອາທິດ
 DocType: Production Order Operation,Planned End Time,ການວາງແຜນທີ່ໃຊ້ເວລາສຸດທ້າຍ
 ,Sales Person Target Variance Item Group-Wise,"Sales Person ເປົ້າຫມາຍຕ່າງ Item Group, ສະຫລາດ"
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,ໂອກາດຈາກ
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ຄໍາຖະແຫຼງທີ່ເງິນເດືອນ.
 DocType: BOM,Website Specifications,ຂໍ້ມູນຈໍາເພາະເວັບໄຊທ໌
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: ຈາກ {0} ຂອງປະເພດ {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: ປັດໄຈການແປງເປັນການບັງຄັບ
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C ສະບັບເລກທີ
 DocType: Bank Guarantee,Project,ໂຄງການ
 DocType: Quality Inspection Reading,Reading 7,ອ່ານ 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,ຄໍາສັ່ງບາງສ່ວນ
 DocType: Expense Claim Detail,Expense Claim Type,ຄ່າໃຊ້ຈ່າຍປະເພດການຮ້ອງຂໍ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການຄ້າໂຄງຮ່າງການ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ຊັບສິນຢຸດຜ່ານ Journal Entry {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,ຄ່າໃຊ້ຈ່າຍສໍານັກວຽກບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ການສ້າງຕັ້ງບັນຊີ Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,ກະລຸນາໃສ່ລາຍການທໍາອິດ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ກະລຸນາໃສ່ລາຍການທໍາອິດ
 DocType: Account,Liability,ຄວາມຮັບຜິດຊອບ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ທີ່ຖືກເກືອດຫ້າມຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກວ່າການຮຽກຮ້ອງຈໍານວນເງິນໃນແຖວ {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,ບັນຊີລາຄາບໍ່ໄດ້ເລືອກ
 DocType: Employee,Family Background,ຄວາມເປັນມາຂອງຄອບຄົວ
 DocType: Request for Quotation Supplier,Send Email,ການສົ່ງອີເມວ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},ການເຕືອນໄພ: Attachment ບໍ່ຖືກຕ້ອງ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ບໍ່ມີການອະນຸຍາດ
 DocType: Company,Default Bank Account,ມາດຕະຖານບັນຊີທະນາຄານ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","ການກັ່ນຕອງໂດຍອີງໃສ່ພັກ, ເລືອກເອົາພັກປະເພດທໍາອິດ"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ພະນັກງານທີ່ບໍ່ມີພົບເຫັນ
 DocType: Supplier Quotation,Stopped,ຢຸດເຊົາການ
 DocType: Item,If subcontracted to a vendor,ຖ້າຫາກວ່າເຫມົາຊ່ວງກັບຜູ້ຂາຍ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Group ນັກສຶກສາມີການປັບປຸງແລ້ວ.
 DocType: SMS Center,All Customer Contact,ທັງຫມົດຕິດຕໍ່ລູກຄ້າ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,ອັບຍອດຫຸ້ນຜ່ານ csv.
 DocType: Warehouse,Tree Details,ລາຍລະອຽດເປັນໄມ້ຢືນຕົ້ນ
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,ຈໍານວນໃບເກັບເງິນຂັ້ນຕ່ໍາ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ສູນຕົ້ນທຶນ {2} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} ບໍ່ສາມາດເປັນກຸ່ມ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ລາຍການຕິດຕໍ່ກັນ {idx}: {doctype} {docname} ບໍ່ມີຢູ່ໃນຂ້າງເທິງ &#39;{doctype}&#39; ຕາຕະລາງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ແມ່ນໄດ້ສໍາເລັດໄປແລ້ວຫລືຍົກເລີກ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ມີວຽກງານທີ່
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ມື້ຂອງເດືອນທີ່ໃບເກັບເງິນອັດຕະໂນມັດຈະໄດ້ຮັບການຜະລິດເຊັ່ນ: 05, 28 ແລະອື່ນໆ"
 DocType: Asset,Opening Accumulated Depreciation,ເປີດຄ່າເສື່ອມລາຄາສະສົມ
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,ການເຄື່ອນຍ້າຍອັດຕາສະເລ່ຍ
 DocType: Production Planning Tool,Select Items,ເລືອກລາຍການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ກັບບັນຊີລາຍການ {1} ວັນ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ກະດານຂ່າວ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ກະດານຂ່າວ
 DocType: Maintenance Visit,Completion Status,ສະຖານະສໍາເລັດ
 DocType: HR Settings,Enter retirement age in years,ກະລຸນາໃສ່ອາຍຸບໍານານໃນປີ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Warehouse ເປົ້າຫມາຍ
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ອະນຸຍາດໃຫ້ໃນໄລຍະການຈັດສົ່ງຫຼືໄດ້ຮັບບໍ່ເກີນຮ້ອຍນີ້
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ການນໍາເຂົ້າເຂົ້າຮ່ວມ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ທັງຫມົດກຸ່ມສິນຄ້າ
 DocType: Process Payroll,Activity Log,ກິດຈະກໍາເຂົ້າສູ່ລະບົບ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ກໍາໄຮ / ການສູນເສຍ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ປະກອບອັດຕະໂນມັດຂໍ້ຄວາມກ່ຽວກັບການຍື່ນສະເຫນີຂອງກິດຈະກໍາ.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ການສັ່ງຊື້ກັບການຊໍາລະເງິນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ຄາດຈໍານວນ
 DocType: Sales Invoice,Payment Due Date,ການຊໍາລະເງິນກໍາຫນົດ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ລາຍການ Variant {0} ມີຢູ່ແລ້ວກັບຄຸນລັກສະນະດຽວກັນ
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;ເປີດ &#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ເປີດການເຮັດ
 DocType: Notification Control,Delivery Note Message,ການສົ່ງເງິນເຖິງຂໍ້ຄວາມ
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re: ຄໍາສັ່ງຈໍານວນ
 DocType: Leave Block List Date,Leave Block List Date,ອອກຈາກ Block ຊີວັນ
 DocType: Pricing Rule,Price or Discount,ລາຄາຫຼືສ່ວນລົດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ຄ່າໃຊ້ຈ່າຍທັງຫມົດໃນການຊື້ຕາຕະລາງໃບລາຍການຈະຕ້ອງເຊັ່ນດຽວກັນກັບພາສີອາກອນທັງຫມົດແລະຄ່າບໍລິການ
 DocType: Sales Team,Incentives,ສິ່ງຈູງໃຈ
 DocType: SMS Log,Requested Numbers,ຈໍານວນການຮ້ອງຂໍ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ໄດ້ຮັບພຽງແຕ່ວັດຖຸດິບ
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,ແມ່ນເຫມົາຊ່ວງ
 DocType: Item Attribute,Item Attribute Values,ຄ່າລາຍການຄຸນລັກສະນະ
 DocType: Examination Result,Examination Result,ຜົນການສອບເສັງ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ຮັບຊື້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ຮັບຊື້
 ,Received Items To Be Billed,ລາຍການທີ່ໄດ້ຮັບການໄດ້ຮັບການ billed
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ສົ່ງ Slips ເງິນເດືອນ
 DocType: Employee,Ms,ນາງສາວ
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,ອັດຕາແລກປ່ຽນສະກຸນເງິນຕົ້ນສະບັບ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},ກະສານອ້າງອີງ DOCTYPE ຕ້ອງເປັນຫນຶ່ງໃນ {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},ກະສານອ້າງອີງ DOCTYPE ຕ້ອງເປັນຫນຶ່ງໃນ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ບໍ່ສາມາດຊອກຫາສະລັອດຕິງໃຊ້ເວລາໃນ {0} ວັນຕໍ່ໄປສໍາລັບການດໍາເນີນງານ {1}
 DocType: Production Order,Plan material for sub-assemblies,ອຸປະກອນການວາງແຜນສໍາລັບອະນຸສະພາແຫ່ງ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partners ການຂາຍແລະອານາເຂດ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,ບໍ່ສາມາດອັດຕະໂນມັດສ້າງບັນຊີທີ່ມີຢູ່ແລ້ວຍອດຂາຍຫຸ້ນໃນບັນຊີ. ທ່ານຕ້ອງສ້າງບັນຊີຂອງໂຍບາຍຄວາມລັບກ່ອນທີ່ທ່ານຈະສາມາດເຮັດໃຫ້ເຂົ້າໃນຄັງສິນຄ້ານີ້
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,ມາດຕະຖານບັນຊີເຈົ້າຫນີ້
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ບໍ່ແມ່ນການເຄື່ອນໄຫວຫຼືບໍ່ມີ
 DocType: Fee Structure,Components,ອົງປະກອບ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ລາຍການທີ່ແຕກຕ່າງກັນ {0} ການປັບປຸງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ກະລຸນາໃສ່ປະເພດຊັບສິນໃນ Item {0}
 DocType: Quality Inspection Reading,Reading 6,ອ່ານ 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,ສາມາດເຮັດໄດ້ບໍ່ {0} {1} {2} ໂດຍບໍ່ມີການໃບເກັບເງິນທີ່ຍັງຄ້າງຄາໃນທາງລົບ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ຊື້ Invoice Advance
 DocType: Hub Settings,Sync Now,Sync ໃນປັດຈຸບັນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າ Credit ບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,ສັ່ງຊື້ສິນຄ້າ
 DocType: Asset,Purchase Invoice,ໃບເກັບເງິນຊື້
 DocType: Stock Ledger Entry,Voucher Detail No,ຂໍ້ມູນຄູປອງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,ໃບເກັບເງິນໃນການຂາຍໃຫມ່
 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,ເປີດວັນທີ່ສະຫມັກແລະວັນທີຢ່າງໃກ້ຊິດຄວນຈະຢູ່ພາຍໃນດຽວກັນຂອງປີງົບປະມານ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,ເປີດວັນທີ່ສະຫມັກແລະວັນທີຢ່າງໃກ້ຊິດຄວນຈະຢູ່ພາຍໃນດຽວກັນຂອງປີງົບປະມານ
 DocType: Lead,Request for Information,ການຮ້ອງຂໍສໍາລັບການຂໍ້ມູນຂ່າວສານ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline ໃບແຈ້ງຫນີ້
 DocType: Payment Request,Paid,ການຊໍາລະເງິນ
 DocType: Program Fee,Program Fee,ຄ່າບໍລິການໂຄງການ
 DocType: Salary Slip,Total in words,ທັງຫມົດໃນຄໍາສັບຕ່າງໆ
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,ທີ່ຖືກເກືອດຫ້າມ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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}: ກະລຸນາລະບຸ Serial No ສໍາລັບລາຍການ {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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 ແລະ Batch ບໍ່ມີຈະໄດ້ຮັບການພິຈາລະນາຈາກ&#39; Packing ຊີ &#39;ຕາຕະລາງ. ຖ້າຫາກວ່າ Warehouse ແລະ Batch ບໍ່ແມ່ນອັນດຽວກັນສໍາລັບລາຍການບັນຈຸທັງຫມົດສໍາລັບຄວາມຮັກ &#39;Bundle ຜະລິດພັນສິນຄ້າ, ຄຸນຄ່າເຫຼົ່ານັ້ນສາມາດໄດ້ຮັບເຂົ້າໄປໃນຕາຕະລາງລາຍການຕົ້ນຕໍ, ຄຸນຄ່າຈະໄດ້ຮັບການຄັດລອກໄປທີ່&#39; Packing ຊີ &#39;ຕາຕະລາງ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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 ແລະ Batch ບໍ່ມີຈະໄດ້ຮັບການພິຈາລະນາຈາກ&#39; Packing ຊີ &#39;ຕາຕະລາງ. ຖ້າຫາກວ່າ Warehouse ແລະ Batch ບໍ່ແມ່ນອັນດຽວກັນສໍາລັບລາຍການບັນຈຸທັງຫມົດສໍາລັບຄວາມຮັກ &#39;Bundle ຜະລິດພັນສິນຄ້າ, ຄຸນຄ່າເຫຼົ່ານັ້ນສາມາດໄດ້ຮັບເຂົ້າໄປໃນຕາຕະລາງລາຍການຕົ້ນຕໍ, ຄຸນຄ່າຈະໄດ້ຮັບການຄັດລອກໄປທີ່&#39; Packing ຊີ &#39;ຕາຕະລາງ."
 DocType: Job Opening,Publish on website,ເຜີຍແຜ່ກ່ຽວກັບເວັບໄຊທ໌
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ການຂົນສົ່ງໃຫ້ແກ່ລູກຄ້າ.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,ວັນທີ່ສະຫມັກສະຫນອງ Invoice ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະກາດວັນທີ່
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ການປ່ຽນແປງ
 ,Company Name,ຊື່ບໍລິສັດ
 DocType: SMS Center,Total Message(s),ຂໍ້ຄວາມທັງຫມົດ (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ເລືອກລາຍການສໍາລັບການຖ່າຍໂອນ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ເລືອກຫົວບັນຊີຂອງທະນາຄານບ່ອນທີ່ເຊັກອິນໄດ້ຝາກ.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ຕິດຕໍ່ກັນ {0}: ການຊໍາລະເງິນກັບ Sales / ການສັ່ງຊື້ສະເຫມີໄປຄວນຈະໄດ້ຮັບການຫມາຍເປັນການລ່ວງຫນ້າ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,ສານເຄມີ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ມາດຕະຖານບັນຊີທະນາຄານ / ເງິນສົດຈະໄດ້ຮັບການປັບປຸງອັດຕະໂນມັດໃນເງິນເດືອນ Journal Entry ໃນເວລາທີ່ຮູບແບບນີ້ແມ່ນການຄັດເລືອກ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ໄລຍະສໍາລັບການລະຫັດ Grade {0} ມີການຊໍ້າຊ້ອນທີ່ມີໄລຍະການຮຽນສໍາລັບຊັ້ນຮຽນອື່ນໆ. ກະລຸນາກວດສອບໄລຍະ {0} ແລະ {1} ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ
 DocType: BOM,Raw Material Cost(Company Currency),ຕົ້ນທຶນວັດຖຸດິບ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ລາຍການທັງຫມົດໄດ້ຮັບການຍົກຍ້າຍສໍາລັບໃບສັ່ງຜະລິດນີ້.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ແຖວ # {0}: ອັດຕາບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາອັດຕາທີ່ໃຊ້ໃນ {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Item ເວັບໄຊທ໌
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ອັບຫົວຈົດຫມາຍສະບັບແລະສັນຍາລັກຂອງທ່ານ. (ທ່ານສາມາດແກ້ໄຂໃຫ້ເຂົາເຈົ້າຕໍ່ມາ).
 DocType: Timesheet Detail,Bill,ບັນຊີລາຍການ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາແມ່ນເຂົ້າໄປເປັນວັນທີ່ຜ່ານມາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ສີຂາວ
 DocType: SMS Center,All Lead (Open),Lead ທັງຫມົດ (ເປີດ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ຕິດຕໍ່ກັນ {0}: ຈໍານວນບໍ່ສາມາດໃຊ້ສໍາລັບການ {4} ໃນສາງ {1} ທີ່ປຊຊກິນທີ່ໃຊ້ເວລາຂອງການເຂົ້າມາ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ໄດ້ຮັບການຄວາມກ້າວຫນ້າຂອງການຊໍາລະເງິນ
 DocType: Item,Automatically Create New Batch,ສ້າງ Batch ໃຫມ່ອັດຕະໂນມັດ
 DocType: Item,Automatically Create New Batch,ສ້າງ Batch ໃຫມ່ອັດຕະໂນມັດ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,ເຮັດໃຫ້
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,ເຮັດໃຫ້
 DocType: Student Admission,Admission Start Date,ເປີດປະຕູຮັບວັນທີ່
 DocType: Journal Entry,Total Amount in Words,ຈໍານວນທັງຫມົດໃນຄໍາສັບຕ່າງໆ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ມີຄວາມຜິດພາດ. ຫນຶ່ງໃນເຫດຜົນອາດຈະສາມາດຈະເປັນທີ່ທ່ານຍັງບໍ່ທັນໄດ້ບັນທຶກໄວ້ໃນແບບຟອມ. ກະລຸນາຕິດຕໍ່ຫາ support@erpnext.com ຖ້າຫາກວ່າບັນຫາຍັງຄົງ.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,ເປີດຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ກະລຸນາໃສ່ບັນຊີສໍາລັບການປ່ຽນແປງຈໍານວນເງິນ
 DocType: Student Batch Name,Student Batch Name,ຊື່ນັກ Batch
 DocType: Holiday List,Holiday List Name,ລາຍຊື່ຂອງວັນພັກ
 DocType: Repayment Schedule,Balance Loan Amount,ການດຸ່ນດ່ຽງຈໍານວນເງິນກູ້
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ກະລຸນາລະບຸ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ລາຍການໂຍກຍ້າຍອອກມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າບໍ່ມີ.
 DocType: Delivery Note,Delivery To,ການຈັດສົ່ງກັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ຕາຕະລາງຄຸນສົມບັດເປັນການບັງຄັບ
 DocType: Production Planning Tool,Get Sales Orders,ໄດ້ຮັບໃບສັ່ງຂາຍ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ບໍ່ສາມາດຈະກະທົບທາງລົບ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ສ່ວນລົດ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ສ່ວນລົດ
 DocType: Asset,Total Number of Depreciations,ຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
 DocType: Sales Invoice Item,Rate With Margin,ອັດຕາດ້ວຍ Margin
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Warehouse ໄວ້ໃນ Sales Order / Finished Goods Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ຈໍານວນການຂາຍ
 DocType: Repayment Schedule,Interest Amount,ຈໍານວນເງິນທີ່ຫນ້າສົນໃຈ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,ທ່ານມີການອະນຸມັດຄ່າໃຊ້ຈ່າຍສໍາລັບການບັນທຶກນີ້. ກະລຸນາປັບປຸງສະຖານະການແລະບັນທຶກ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,ທ່ານມີການອະນຸມັດຄ່າໃຊ້ຈ່າຍສໍາລັບການບັນທຶກນີ້. ກະລຸນາປັບປຸງສະຖານະການແລະບັນທຶກ
 DocType: Serial No,Creation Document No,ການສ້າງເອກະສານທີ່ບໍ່ມີ
 DocType: Issue,Issue,ບັນຫາ
 DocType: Asset,Scrapped,ທະເລາະວິວາດ
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ຄຸນລັກສະນະສໍາລັບລາຍການທີ່ແຕກຕ່າງກັນ. ຕົວຢ່າງ: ຂະຫນາດ, ສີແລະອື່ນໆ"
 DocType: Purchase Invoice,Returns,ຜົນຕອບແທນ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Warehouse WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ສັນຍາບໍາລຸງຮັກສາບໍ່ເກີນ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ສັນຍາບໍາລຸງຮັກສາບໍ່ເກີນ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ການທົດແທນທີ່
 DocType: Lead,Organization Name,ຊື່ອົງການຈັດຕັ້ງ
 DocType: Tax Rule,Shipping State,State Shipping
 ,Projected Quantity as Source,ຄາດປະລິມານເປັນແຫລ່ງກໍາເນີດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມການນໍາໃຊ້ &#39;ຮັບສິນຄ້າຈາກຊື້ຮັບ&#39; ປຸ່ມ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ລາຍການຈະຕ້ອງໄດ້ຮັບການເພີ່ມການນໍາໃຊ້ &#39;ຮັບສິນຄ້າຈາກຊື້ຮັບ&#39; ປຸ່ມ
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,ປະກອບມີລາຍການລາຍການທີ່ບໍ່ແມ່ນຫຼັກຊັບ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ຄ່າໃຊ້ຈ່າຍຂາຍ
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,ຕໍ່
 DocType: Item,Default Selling Cost Center,ມາດຕະຖານສູນຕົ້ນທຶນຂາຍ
 DocType: Sales Partner,Implementation Partner,Partner ການປະຕິບັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ລະຫັດໄປສະນີ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,ລະຫັດໄປສະນີ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ໃບສັ່ງຂາຍ {0} ເປັນ {1}
 DocType: Opportunity,Contact Info,ຂໍ້ມູນຕິດຕໍ່
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ເຮັດໃຫ້ການອອກສຽງ Stock
 DocType: Packing Slip,Net Weight UOM,ສຸດທິ UOM ນ້ໍາຫນັກ
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ຜົນການຄົ້ນຫາ
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ຜົນການຄົ້ນຫາ
 DocType: Item,Default Supplier,ຜູ້ຜະລິດມາດຕະຖານ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ໃນໄລຍະການຜະລິດເຜື່ອຮ້ອຍ
 DocType: Employee Loan,Repayment Schedule,ຕາຕະລາງການຊໍາລະຫນີ້
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ໄດ້ຮັບປະຈໍາອາທິດ Off ວັນ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ວັນທີ່ສິ້ນສຸດບໍ່ສາມາດຈະຫນ້ອຍກ່ວາການເລີ່ມຕົ້ນວັນທີ່
 DocType: Sales Person,Select company name first.,ເລືອກຊື່ບໍລິສັດທໍາອິດ.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ສະເຫນີລາຄາທີ່ໄດ້ຮັບຈາກຜູ້ຜະລິດ.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},ເພື່ອ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ສະເລ່ຍອາຍຸ
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,ພື້ນທີ່ການປະຕິບັດທີ່ສໍາຄັນ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ການຂົນສົ່ງ
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ຄຸນລັກສະນະທີ່ບໍ່ຖືກຕ້ອງ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} ຕ້ອງໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ປະລິມານຈະຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: SMS Center,Total Characters,ລັກສະນະທັງຫມົດ
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},ກະລຸນາເລືອກ BOM ໃນພາກສະຫນາມ BOM ສໍາລັບລາຍການ {0}
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,ຈໍາຫນ່າຍ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ການຄ້າໂຄງຮ່າງກົດລະບຽບ Shipping
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',ກະລຸນາຕັ້ງ &#39;ສະຫມັກຕໍາສ່ວນລົດເພີ່ມເຕີມກ່ຽວກັບ&#39;
 ,Ordered Items To Be Billed,ລາຍການຄໍາສັ່ງຈະ billed
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ຈາກລະດັບທີ່ຈະຫນ້ອຍມີກ່ວາເພື່ອ Range
 DocType: Global Defaults,Global Defaults,ຄ່າເລີ່ມຕົ້ນຂອງໂລກ
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ປີເລີ່ມຕົ້ນ
 DocType: Purchase Invoice,Start date of current invoice's period,ວັນທີເລີ່ມຕົ້ນຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
 DocType: Salary Slip,Leave Without Pay,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Error ວາງແຜນຄວາມອາດສາມາດ
 ,Trial Balance for Party,ດຸນການທົດລອງສໍາລັບການພັກ
 DocType: Lead,Consultant,ທີ່ປຶກສາ
 DocType: Salary Slip,Earnings,ລາຍຮັບຈາກການ
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ນີ້ຈະໄດ້ຮັບການຜນວກເຂົ້າກັບຂໍ້ມູນລະຫັດຂອງຕົວແປ. ສໍາລັບການຍົກຕົວຢ່າງ, ຖ້າຫາກວ່າຕົວຫຍໍ້ຂອງທ່ານແມ່ນ &quot;SM&quot;, ແລະລະຫັດສິນຄ້າແມ່ນ &quot;ເສື້ອທີເຊີດ&quot;, ລະຫັດສິນຄ້າຂອງ variant ຈະ &quot;ເສື້ອທີເຊີດ, SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ຈ່າຍສຸດທິ (ໃນຄໍາສັບຕ່າງໆ) ຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດ Slip ເງິນເດືອນໄດ້.
 DocType: Purchase Invoice,Is Return,ແມ່ນກັບຄືນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / ເດບິດຫມາຍເຫດ
 DocType: Price List Country,Price List Country,ລາຄາປະເທດ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} ພວກເຮົາອະນຸກົມທີ່ຖືກຕ້ອງສໍາລັບລາຍການ {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບຈໍານວນ Batch
 DocType: Stock Settings,Default Item Group,ກຸ່ມສິນຄ້າມາດຕະຖານ
 DocType: Employee Loan,Partially Disbursed,ຈ່າຍບາງສ່ວນ
-DocType: Grading Structure,Grading System Name,ຊື່ການຈັດລໍາດັບລະບົບ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ຖານຂໍ້ມູນຜູ້ສະຫນອງ.
 DocType: Account,Balance Sheet,ງົບດຸນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',ສູນເສຍຄ່າໃຊ້ຈ່າຍສໍາລັບການລາຍການທີ່ມີລະຫັດສິນຄ້າ &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ການຊໍາລະເງິນບໍ່ໄດ້ຖືກຕັ້ງ. ກະລຸນາກວດສອບ, ບໍ່ວ່າຈະເປັນບັນຊີໄດ້ຮັບການກໍານົດກ່ຽວກັບຮູບແບບການຊໍາລະເງິນຫຼືຂໍ້ມູນ POS."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ຄົນຂາຍຂອງທ່ານຈະໄດ້ຮັບການເຕືອນໃນວັນນີ້ຈະຕິດຕໍ່ຫາລູກຄ້າ
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ລາຍການແມ່ນບໍ່ສາມາດເຂົ້າໄປໃນເວລາຫຼາຍ.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","ບັນຊີເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ການກຸ່ມ, ແຕ່ການອອກສຽງສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,ລາຍການສັ່ງຊື້ເພື່ອໄດ້ຮັບການ 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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Entries and GL Entries ແມ່ນ reposted ສໍາລັບຮັບຊື້ເລືອກ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Entries and GL Entries ແມ່ນ reposted ສໍາລັບຮັບຊື້ເລືອກ
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ລາຍການ 1
 DocType: Holiday,Holiday,ວັນພັກ
 DocType: Support Settings,Close Issue After Days,ປິດບັນຫາຫຼັງຈາກວັນ
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,ວຽກເຮັດ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ກະລຸນາລະບຸຢູ່ໃນຢ່າງຫນ້ອຍຫນຶ່ງໃຫ້ເຫດຜົນໃນຕາຕະລາງຄຸນສົມບັດ
 DocType: Announcement,All Students,ນັກສຶກສາທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,ໄລຍະ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ທໍາອິດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ເປັນກຸ່ມສິນຄ້າລາຄາທີ່ມີຊື່ດຽວກັນ, ກະລຸນາມີການປ່ຽນແປງຊື່ສິນຄ້າຫລືປ່ຽນຊື່ກຸ່ມລາຍການ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ເລກນັກສຶກສາໂທລະສັບມືຖື
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},ການຈ່າຍເງິນເດືອນຈາກ {0} ກັບ {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ບໍ່ອະນຸຍາດໃຫ້ແກ້ໄຂບັນຊີ frozen {0}
 DocType: Journal Entry,Get Outstanding Invoices,ໄດ້ຮັບໃບແຈ້ງຫນີ້ທີ່ຍັງຄ້າງຄາ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,ໃບສັ່ງຂາຍ {0} ບໍ່ຖືກຕ້ອງ
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,ສັ່ງຊື້ຊ່ວຍໃຫ້ທ່ານວາງແຜນແລະປະຕິບັດຕາມເຖິງກ່ຽວກັບການຊື້ຂອງທ່ານ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ຂໍອະໄພ, ບໍລິສັດບໍ່ສາມາດລວມ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ປະລິມານທີ່ຈົດທະບຽນ / ການຖ່າຍໂອນທັງຫມົດ {0} ໃນວັດສະດຸການຈອງ {1} \ ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານການຮ້ອງຂໍ {2} ສໍາລັບລາຍການ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ຂະຫນາດນ້ອຍ
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ຄ່າໃຊ້ຈ່າຍທາງອ້ອມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ຕິດຕໍ່ກັນ {0}: ຈໍານວນເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,ການກະສິກໍາ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync ຂໍ້ມູນຫລັກ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ຜະລິດຕະພັນຫຼືການບໍລິການຂອງທ່ານ
 DocType: Mode of Payment,Mode of Payment,ຮູບແບບການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ເວັບໄຊທ໌ຮູບພາບຄວນຈະເປັນເອກະສານສາທາລະນະຫຼືທີ່ຢູ່ເວັບເວັບໄຊທ໌
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ນີ້ເປັນກຸ່ມລາຍການຮາກແລະບໍ່ສາມາດໄດ້ຮັບການແກ້ໄຂ.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Group ຈໍານວນມ້ວນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, ພຽງແຕ່ລະເງິນກູ້ຢືມສາມາດໄດ້ຮັບການເຊື່ອມຕໍ່ເຂົ້າເດບິດອື່ນ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,ຈໍານວນທັງຫມົດຂອງທັງຫມົດນ້ໍາວຽກງານຄວນຈະ 1. ກະລຸນາປັບປຸງນ້ໍາຂອງວຽກງານໂຄງການທັງຫມົດຕາມຄວາມເຫມາະສົມ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ສົ່ງຫມາຍເຫດ {0} ບໍ່ໄດ້ສົ່ງ
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກຄັດເລືອກທໍາອິດໂດຍອີງໃສ່ &#39;ສະຫມັກຕໍາກ່ຽວກັບ&#39; ພາກສະຫນາມ, ທີ່ສາມາດຈະມີລາຍການ, ກຸ່ມສິນຄ້າຫຼືຍີ່ຫໍ້."
 DocType: Hub Settings,Seller Website,ຜູ້ຂາຍເວັບໄຊທ໌
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ອັດຕາສ່ວນການຈັດສັນທັງຫມົດສໍາລັບທີມງານການຂາຍຄວນຈະເປັນ 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ສະຖານະການສັ່ງຊື້ຜະລິດຕະພັນ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ສະຖານະການສັ່ງຊື້ຜະລິດຕະພັນ {0}
 DocType: Appraisal Goal,Goal,ເປົ້າຫມາຍຂອງ
 DocType: Sales Invoice Item,Edit Description,ແກ້ໄຂລາຍລະອຽດ
 ,Team Updates,ການປັບປຸງທີມງານ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,ສໍາລັບຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,ສໍາລັບຜູ້ຜະລິດ
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ການສ້າງຕັ້ງປະເພດບັນຊີຊ່ວຍໃນການຄັດເລືອກບັນຊີນີ້ໃນການຄ້າຂາຍ.
 DocType: Purchase Invoice,Grand Total (Company Currency),ລວມທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ສ້າງຮູບແບບພິມ
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,ວາລະສານການອອກສຽງ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ລາຍການມີຄວາມຄືບຫນ້າ
 DocType: Workstation,Workstation Name,ຊື່ Workstation
-DocType: Grade Interval,Grade Code,ລະຫັດ Grade
+DocType: Grading Scale Interval,Grade Code,ລະຫັດ Grade
 DocType: POS Item Group,POS Item Group,ກຸ່ມສິນຄ້າ POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ອີເມວສໍາຄັນ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ບໍ່ໄດ້ຂຶ້ນກັບ Item {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ອຸປະກອນ
 DocType: Sales Order,Recurring Upto,Recurring ເກີນ
 DocType: Attendance,HR Manager,Manager HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ກະລຸນາເລືອກບໍລິສັດ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ສິດທິພິເສດອອກຈາກ
 DocType: Purchase Invoice,Supplier Invoice Date,ຜູ້ສະຫນອງວັນໃບກໍາກັບ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ທ່ານຕ້ອງການເພື່ອເຮັດໃຫ້ໂຄງຮ່າງການຊື້
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ສະບຽງອາຫານ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,ບໍ່ມີການລົງໂທດ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ຕາຕະລາງການບໍາລຸງຮັກ {0} ມີຢູ່ຕ້ານ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ນັກສຶກສາລົງທະບຽນຮຽນ
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},ສະກຸນເງິນຂອງບັນຊີປິດຈະຕ້ອງ {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ຜົນບວກຂອງຈຸດສໍາລັບເປົ້າຫມາຍທັງຫມົດຄວນຈະເປັນ 100 ມັນເປັນ {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,avg ປະຈໍາວັນລາຍຈ່າຍ
 DocType: POS Profile,Campaign,ການໂຄສະນາ
 DocType: Supplier,Name and Type,ຊື່ແລະປະເພດ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',ສະຖານະການອະນຸມັດຕ້ອງໄດ້ຮັບການ &#39;ອະນຸມັດ&#39; ຫລື &#39;ປະຕິເສດ&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',ສະຖານະການອະນຸມັດຕ້ອງໄດ້ຮັບການ &#39;ອະນຸມັດ&#39; ຫລື &#39;ປະຕິເສດ&#39;
 DocType: Purchase Invoice,Contact Person,ຕິດຕໍ່ບຸກຄົນ
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ວັນທີຄາດວ່າເລີ່ມຕົ້ນ &quot;ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ&#39; ວັນທີຄາດວ່າສຸດທ້າຍ &#39;
 DocType: Course Scheduling Tool,Course End Date,ແນ່ນອນວັນທີ່ສິ້ນສຸດ
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Shipping Address ຊື່
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ຕາຕະລາງຂອງການບັນຊີ
 DocType: Material Request,Terms and Conditions Content,ຂໍ້ກໍານົດແລະເງື່ອນໄຂເນື້ອໃນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ລາຍການ {0} ບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Maintenance Visit,Unscheduled,ນອກເຫນືອຈາກ
 DocType: Employee,Owned,ເປັນເຈົ້າຂອງ
 DocType: Salary Detail,Depends on Leave Without Pay,ຂຶ້ນຢູ່ກັບອອກໂດຍບໍ່ມີການຈ່າຍ
 DocType: Pricing Rule,"Higher the number, higher the priority","ສູງກວ່າຕົວເລກທີ່, ທີ່ສູງກວ່າບູລິມະສິດ"
 ,Purchase Invoice Trends,ຊື້ແນວໂນ້ມ Invoice
 DocType: Employee,Better Prospects,ອະນາຄົດທີ່ດີກວ່າ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ແຖວ # {0}: ການ batch {1} ມີພຽງແຕ່ {2} ຈໍານວນ. ກະລຸນາເລືອກ batch ທີ່ມີ {3} ຈໍານວນສາມາດໃຊ້ໄດ້ອີກຫລືແຍກແຖວເປັນແຖວເກັດທີ່ຢູ່ຫຼາຍ, ເພື່ອສົ່ງ / ບັນຫາຈາກຂະບວນການທີ່ຫຼາກຫຼາຍ"
 DocType: Vehicle,License Plate,ແຜ່ນໃບອະນຸຍາດ
 DocType: Appraisal,Goals,ເປົ້າຫມາຍ
 DocType: Warranty Claim,Warranty / AMC Status,ການຮັບປະກັນ / AMC ສະຖານະ
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ພະນັກງານບໍ່ສາມາດລາຍງານໃຫ້ຕົນເອງ.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ຖ້າຫາກວ່າບັນຊີແມ່ນ frozen, entries ກໍາລັງອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຈໍາກັດ."
 DocType: Email Digest,Bank Balance,ທະນາຄານ Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Entry ບັນຊີສໍາລັບ {0}: {1} ສາມາດເຮັດໄດ້ພຽງແຕ່ຢູ່ໃນສະກຸນເງິນ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","profile ວຽກເຮັດງານທໍາ, ຄຸນນະວຸດທິທີ່ຕ້ອງການແລະອື່ນໆ"
 DocType: Journal Entry Account,Account Balance,ດຸນບັນຊີ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ກົດລະບຽບອາກອນສໍາລັບທຸລະກໍາ.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,ສະແດງໃຫ້ເຫັນ P &amp; ຍອດ L ປີງົບປະມານ unclosed ຂອງ
 DocType: Shipping Rule,Shipping Account,ບັນຊີ Shipping
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ແມ່ນ inactive
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ເຮັດໃຫ້ຄໍາສັ່ງການຂາຍຈະຊ່ວຍໃຫ້ທ່ານວາງແຜນການເຮັດວຽກຂອງທ່ານແລະໃຫ້ສຸດທີ່ໃຊ້ເວລາ
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ເຮັດໃຫ້ຄໍາສັ່ງການຂາຍຈະຊ່ວຍໃຫ້ທ່ານວາງແຜນການເຮັດວຽກຂອງທ່ານແລະໃຫ້ສຸດທີ່ໃຊ້ເວລາ
 DocType: Quality Inspection,Readings,ອ່ານ
 DocType: Stock Entry,Total Additional Costs,ທັງຫມົດຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,ກັບມູນຄ່າ
 DocType: Asset Movement,Stock Manager,Manager Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},ຄັງສິນຄ້າທີ່ມາເປັນການບັງຄັບສໍາລັບການຕິດຕໍ່ກັນ {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,ບັນຈຸ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ບັນຈຸ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ຫ້ອງການໃຫ້ເຊົ່າ
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,ການຕັ້ງຄ່າປະຕູການຕິດຕັ້ງ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ການນໍາເຂົ້າບໍ່ສາມາດ!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,ການບໍລິການ
 DocType: HR Settings,Email Salary Slip to Employee,Email ເງິນເດືອນ Slip ກັບພະນັກງານ
 DocType: Cost Center,Parent Cost Center,ສູນຕົ້ນທຶນຂອງພໍ່ແມ່
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ເລືອກຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ເລືອກຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 DocType: Sales Invoice,Source,ແຫຼ່ງຂໍ້ມູນ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,ສະແດງໃຫ້ເຫັນປິດ
 DocType: Leave Type,Is Leave Without Pay,ແມ່ນອອກຈາກໂດຍບໍ່ມີການຈ່າຍ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ປະເພດຊັບສິນທີ່ເປັນການບັງຄັບສໍາລັບລາຍການຊັບສິນຄົງທີ່
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ບໍ່ມີພົບເຫັນຢູ່ໃນຕາຕະລາງການຊໍາລະເງິນການບັນທຶກການ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ນີ້ {0} ຄວາມຂັດແຍ້ງກັບ {1} ສໍາລັບ {2} {3}
 DocType: Student Attendance Tool,Students HTML,ນັກສຶກສາ HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,ວັນທີຂອງການຊຶ່ງເຮັດໃຫ້
 DocType: Pricing Rule,For Price List,ສໍາລັບລາຄາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ຄົ້ນຫາການບໍລິຫານ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ສ້າງ Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ສ້າງ Leads
 DocType: Maintenance Schedule,Schedules,ຕາຕະລາງ
 DocType: Purchase Invoice Item,Net Amount,ຈໍານວນສຸດທິ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM ຂໍ້ມູນທີ່ບໍ່ມີ
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ການລົງທະບຽນໂຄງການ
 DocType: Sales Invoice Item,Brand Name,ຊື່ຍີ່ຫໍ້
 DocType: Purchase Receipt,Transporter Details,ລາຍລະອຽດການຂົນສົ່ງ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,ສາງມາດຕະຖານທີ່ຕ້ອງການສໍາລັບການເລືອກເອົາລາຍການ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ຜູ້ຜະລິດທີ່ເປັນໄປໄດ້
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,ອົງການຈັດຕັ້ງ
 DocType: Budget,Monthly Distribution,ການແຜ່ກະຈາຍປະຈໍາເດືອນ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ຮັບບັນຊີບໍ່ມີ. ກະລຸນາສ້າງບັນຊີຮັບ
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner ເປົ້າຫມາຍ
 DocType: Loan Type,Maximum Loan Amount,ຈໍານວນເງິນກູ້ສູງສຸດ
 DocType: Pricing Rule,Pricing Rule,ກົດລະບຽບການຕັ້ງລາຄາ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ຈໍານວນມ້ວນຊ້ໍາກັນສໍາລັບນັກຮຽນ {0}
 DocType: Budget,Action if Annual Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າງົບປະມານປະຈໍາປີເກີນ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ຂໍອຸປະກອນການການສັ່ງຊື້
 DocType: Shopping Cart Settings,Payment Success URL,ການຊໍາລະເງິນ URL ສົບຜົນສໍາເລັດ
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,ວິທີການຊໍາລະ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","ຖ້າຫາກວ່າການກວດກາ, ຫນ້າທໍາອິດຈະເປັນກຸ່ມສິນຄ້າມາດຕະຖານສໍາລັບການເວັບໄຊທ໌"
 DocType: Quality Inspection Reading,Reading 4,ອ່ານ 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default ສໍາລັບ {0} ບໍ່ພົບ Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM Default ສໍາລັບ {0} ບໍ່ພົບ Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ຮຽກຮ້ອງສໍາລັບຄ່າໃຊ້ຈ່າຍຂອງບໍລິສັດ.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ນັກສຶກສາແມ່ນຢູ່ໃນຫົວໃຈຂອງລະບົບການ, ເພີ່ມນັກສຶກສາຂອງທ່ານທັງຫມົດ"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ນັກສຶກສາແມ່ນຢູ່ໃນຫົວໃຈຂອງລະບົບການ, ເພີ່ມນັກສຶກສາຂອງທ່ານທັງຫມົດ"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},"ຕິດຕໍ່ກັນ, {0}: ວັນ Clearance {1} ບໍ່ສາມາດກ່ອນທີ່ວັນ Cheque {2}"
 DocType: Company,Default Holiday List,ມາດຕະຖານບັນຊີ Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະການໃຊ້ເວລາຂອງ {1} ແມ່ນ overlapping ກັບ {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ມື້ (s) ທີ່ທ່ານກໍາລັງສະຫມັກສໍາລັບໃບມີວັນພັກ. ທ່ານບໍ່ຈໍາເປັນຕ້ອງນໍາໃຊ້ສໍາລັບການອອກຈາກ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,resend ການຊໍາລະເງິນ Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,ວຽກງານໃຫມ່
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ບົດລາຍງານອື່ນ ໆ
 DocType: Dependent Task,Dependent Task,Task ຂຶ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ປັດໄຈທີ່ປ່ຽນແປງສໍາລັບຫນ່ວຍໃນຕອນຕົ້ນຂອງການປະມານ 1 ປີຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},ອອກຈາກການປະເພດ {0} ບໍ່ສາມາດຈະຕໍ່ໄປອີກແລ້ວກ່ວາ {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ພະຍາຍາມການວາງແຜນການດໍາເນີນງານສໍາລັບມື້ X ໃນການລ່ວງຫນ້າ.
 DocType: HR Settings,Stop Birthday Reminders,ຢຸດວັນເດືອນປີເກີດເຕືອນ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານ Payroll Account Payable ໃນບໍລິສັດ {0}
 DocType: SMS Center,Receiver List,ບັນຊີຮັບ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ຄົ້ນຫາສິນຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,ຄົ້ນຫາສິນຄ້າ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ຈໍານວນການບໍລິໂພກ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ການປ່ຽນແປງສຸດທິໃນເງິນສົດ
 DocType: Assessment Plan,Grading Scale,ຂະຫນາດການຈັດລໍາດັບ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ສໍາເລັດແລ້ວ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,ຫນ່ວຍບໍລິການຂອງການ {0} ໄດ້ຮັບເຂົ້າໄປຫຼາຍກ່ວາຫນຶ່ງຄັ້ງໃນການສົນທະນາປັດໄຈຕາຕະລາງ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ສໍາເລັດແລ້ວ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ຄໍາຂໍຊໍາລະຢູ່ແລ້ວ {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ຄ່າໃຊ້ຈ່າຍຂອງລາຍການອອກ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},ປະລິມານຈະຕ້ອງບໍ່ຫຼາຍກ່ວາ {0}
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ເຮັດໃຫ້ນໍາເຂົ້າການອອກສຽງ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ຕິດຕໍ່ກັນ {0}: Advance ຕໍ່ຜູ້ຜະລິດຕ້ອງໄດ້ຮັບການຫັກ
 DocType: Company,Default Values,ຄ່າເລີ່ມຕົ້ນ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ຄວາມຖີ່} ຫົວຂໍ້ສໍາຄັນ
 DocType: Expense Claim,Total Amount Reimbursed,ຈໍານວນທັງຫມົດການຊົດເຊີຍຄືນ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ໄມ້ຕໍ່ກັບຍານພາຫະນະນີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ເກັບກໍາ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ຕໍ່ Supplier Invoice {0} ວັນ {1}
 DocType: Customer,Default Price List,ລາຄາມາດຕະຖານ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ການບັນທຶກການເຄື່ອນໄຫວຊັບສິນ {0} ສ້າງ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ທ່ານບໍ່ສາມາດລົບປະຈໍາປີ {0}. ປີງົບປະມານ {0} ກໍານົດເປັນມາດຕະຖານໃນການຕັ້ງຄ່າ Global
 DocType: Journal Entry,Entry Type,ປະເພດເຂົ້າ
 ,Customer Credit Balance,ຍອດສິນເຊື່ອລູກຄ້າ
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ບໍ່ມີລາຍການທີ່ມີການປ່ຽນແປງໃນປະລິມານຫຼືມູນຄ່າ.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ພາກສະຫນາມບັງຄັບ - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ພາກສະຫນາມບັງຄັບ - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,ການຮ້ອງຂໍການຮັບປະກັນ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ການຮ້ອງຂໍການຮັບປະກັນ
 ,Lead Details,ລາຍລະອຽດນໍາ
 DocType: Salary Slip,Loan repayment,ການຊໍາລະຫນີ້
 DocType: Purchase Invoice,End date of current invoice's period,ວັນທີໃນຕອນທ້າຍຂອງໄລຍະເວລາໃບເກັບເງິນໃນປັດຈຸບັນ
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,ທີ່ຢູ່ຖາວອນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",ແບບພິເສດການຈ່າຍຄ່າຕໍ່ {0} {1} ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນ \ ກ່ວາຈໍານວນທັງຫມົດ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ກະລຸນາເລືອກລະຫັດສິນຄ້າ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,ກະລຸນາເລືອກລະຫັດສິນຄ້າ
 DocType: Student Sibling,Studying in Same Institute,ການສຶກສາໃນສະຖາບັນດຽວກັນ
 DocType: Territory,Territory Manager,ຜູ້ຈັດການອານາເຂດ
 DocType: Packed Item,To Warehouse (Optional),ການຄັງສິນຄ້າ (ຖ້າຕ້ອງການ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Payment Entry,Paid Amount (Company Currency),ການຊໍາລະເງິນຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Invoice,Additional Discount,ສ່ວນລົດເພີ່ມເຕີມ
 DocType: Selling Settings,Selling Settings,ຂາຍ Settings
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ເບິ່ງໃນໂຄງຮ່າງການ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ຄ່າໃຊ້ຈ່າຍການຕະຫຼາດ
 ,Item Shortage Report,ບົດລາຍງານການຂາດແຄນສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ນ້ໍາທີ່ໄດ້ກ່າວມາ, \ nPlease ເວົ້າເຖິງ &quot;ນ້ໍາຫນັກ UOM&quot; ເຊັ່ນດຽວກັນ"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ຂໍອຸປະກອນການນໍາໃຊ້ເພື່ອເຮັດໃຫ້ການອອກສຽງ Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາເປັນການບັງຄັບສໍາລັບຊັບສິນໃຫມ່
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາເປັນການບັງຄັບສໍາລັບຊັບສິນໃຫມ່
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Group ແຍກຕາມແນ່ນອນສໍາລັບທຸກຊຸດ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Group ແຍກຕາມແນ່ນອນສໍາລັບທຸກຊຸດ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ຫນ່ວຍບໍລິການດຽວຂອງສິນຄ້າ.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ສູນຕົ້ນທຶນທີ່ຕ້ອງການສໍາລັບການ &#39;ກໍາໄຮຂາດທຶນບັນຊີ {2}. ກະລຸນາສ້າງຕັ້ງຂຶ້ນເປັນສູນຕົ້ນທຶນມາດຕະຖານສໍາລັບການບໍລິສັດ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A ກຸ່ມລູກຄ້າທີ່ມີຢູ່ມີຊື່ດຽວກັນກະລຸນາມີການປ່ຽນແປງຊື່ລູກຄ້າຫຼືປ່ຽນຊື່ກຸ່ມລູກຄ້າ
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,ຕິດຕໍ່ໃຫມ່
 DocType: Territory,Parent Territory,ອານາເຂດຂອງພໍ່ແມ່
 DocType: Quality Inspection Reading,Reading 2,ອ່ານ 2
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,ລາຍການສະຫລາດ Sales ຫມັກສະມາຊິກ
 DocType: Asset,Gross Purchase Amount,ການຊື້ທັງຫມົດ
 DocType: Asset,Depreciation Method,ວິທີການຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ອອຟໄລ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ອອຟໄລ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ເປັນພາສີນີ້ລວມຢູ່ໃນອັດຕາພື້ນຖານ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ເປົ້າຫມາຍທັງຫມົດ
 DocType: Program Course,Required,ທີ່ກໍານົດໄວ້
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,reconciliation JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ຄໍລໍາຈໍານວນຫຼາຍເກີນໄປ. ສົ່ງອອກບົດລາຍງານແລະພິມການນໍາໃຊ້ຄໍາຮ້ອງສະຫມັກລາງໄດ້.
 DocType: Purchase Invoice Item,Batch No,ຊຸດບໍ່ມີ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ອະນຸຍາດໃຫ້ຂາຍສິນຄ້າຫລາຍຕໍ່ການສັ່ງຊື້ຂອງລູກຄ້າເປັນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 DocType: Student Group Instructor,Student Group Instructor,Group Student ສອນ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ຕົ້ນຕໍ
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ຕົ້ນຕໍ
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,ຕັ້ງຄໍານໍາຫນ້າສໍາລັບການຈໍານວນໄລຍະກ່ຽວກັບການໂອນຂອງທ່ານ
 DocType: Employee Attendance Tool,Employees HTML,ພະນັກງານ HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,ມາດຕະຖານ BOM ({0}) ຕ້ອງມີການເຄື່ອນໄຫວສໍາລັບລາຍການນີ້ຫຼືແມ່ຂອງຕົນ
 DocType: Employee,Leave Encashed?,ອອກຈາກ Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ໂອກາດຈາກພາກສະຫນາມເປັນການບັງຄັບ
 DocType: Email Digest,Annual Expenses,ຄ່າໃຊ້ຈ່າຍປະຈໍາປີ
 DocType: Item,Variants,variants
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ເຮັດໃຫ້ການສັ່ງຊື້
 DocType: SMS Center,Send To,ສົ່ງເຖິງ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ຍັງບໍ່ທັນມີຄວາມສົມດູນອອກພຽງພໍສໍາລັບການອອກຈາກປະເພດ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ຈໍານວນເງິນທີ່ຈັດສັນ
@@ -1767,7 +1765,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,ຂອງລູກຄ້າລະຫັດສິນຄ້າ
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Reconciliation
 DocType: Territory,Territory Name,ຊື່ອານາເຂດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse ກ່ອນການຍື່ນສະເຫນີການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,ການເຮັດວຽກໃນຄວາມຄືບຫນ້າ Warehouse ກ່ອນການຍື່ນສະເຫນີການ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ສະຫມັກສໍາລັບການວຽກເຮັດງານທໍາໄດ້.
 DocType: Purchase Order Item,Warehouse and Reference,ຄັງສິນຄ້າແລະເອກສານອ້າງອິງ
 DocType: Supplier,Statutory info and other general information about your Supplier,ຂໍ້ມູນນິຕິບັນຍັດແລະຂໍ້ມູນທົ່ວໄປອື່ນໆກ່ຽວກັບຜູ້ຜະລິດຂອງທ່ານ
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,Serial Nos ແລະສໍາຫລັບຂະບວນ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Strength Group ນັກສຶກສາ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Strength Group ນັກສຶກສາ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ຕໍ່ຕ້ານອະນຸ {0} ບໍ່ມີການ unmatched {1} ເຂົ້າ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ຕໍ່ຕ້ານອະນຸ {0} ບໍ່ມີການ unmatched {1} ເຂົ້າ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},ຊ້ໍາບໍ່ມີ Serial ເຂົ້າສໍາລັບລາຍການ {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,A ເງື່ອນໄຂສໍາລັບລະບຽບການຈັດສົ່ງສິນຄ້າ
-DocType: Grading Structure,Grading Intervals,ໄລຍະການຈັດລໍາດັບ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ກະລຸນາໃສ່
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ບໍ່ສາມາດ overbill ສໍາລັບລາຍການ {0} ຕິດຕໍ່ກັນ {1} ຫຼາຍກ່ວາ {2}. ການອະນຸຍາດໃຫ້ຫຼາຍກວ່າ, ໃບບິນ, ກະລຸນາເກັບໄວ້ໃນຊື້ Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ກະລຸນາທີ່ກໍານົດໄວ້ການກັ່ນຕອງໂດຍອີງໃສ່ລາຍການຫຼື Warehouse
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: Authorization Control,Authorization Control,ການຄວບຄຸມການອະນຸຍາດ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},"ຕິດຕໍ່ກັນ, {0}: ປະຕິເສດ Warehouse ເປັນການບັງຄັບຕໍ່ຕ້ານສິນຄ້າປະຕິເສດ {1}"
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ການຊໍາລະເງິນ
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ການຄຸ້ມຄອງຄໍາສັ່ງຂອງທ່ານ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ການຊໍາລະເງິນ
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ການຄຸ້ມຄອງຄໍາສັ່ງຂອງທ່ານ
 DocType: Production Order Operation,Actual Time and Cost,ທີ່ໃຊ້ເວລາແລະຄ່າໃຊ້ຈ່າຍຕົວຈິງ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ຂໍອຸປະກອນການສູງສຸດ {0} ສາມາດເຮັດໄດ້ສໍາລັບລາຍການ {1} ຕໍ່ຂາຍສິນຄ້າ {2}
 DocType: Employee,Salutation,ຄໍາຂຶ້ນຕົ້ນ
 DocType: Course,Course Abbreviation,ຊື່ຫຍໍ້ຂອງລາຍວິຊາ
 DocType: Student Leave Application,Student Leave Application,ຄໍາຮ້ອງສະຫມັກອອກຈາກນັກສຶກສາ
 DocType: Item,Will also apply for variants,ຍັງຈະນໍາໃຊ້ສໍາລັບການ variants
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການຍົກເລີກ, ເປັນມັນແມ່ນແລ້ວ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} ວັນເຄິ່ງຫນຶ່ງໃນ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ຊົ່ວໂມງການເຮັດວຽກທັງຫມົດບໍ່ຄວນຈະມີຫຼາຍກ່ວາຊົ່ວໂມງເຮັດວຽກສູງສຸດ {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ກ່ຽວກັບ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ລາຍການມັດທີ່ໃຊ້ເວລາຂອງການຂາຍ.
 DocType: Quotation Item,Actual Qty,ຕົວຈິງຈໍານວນ
 DocType: Sales Invoice Item,References,ເອກະສານ
@@ -1811,7 +1809,7 @@
 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 +91,Associate,ສະມາຄົມ
 DocType: Asset Movement,Asset Movement,ການເຄື່ອນໄຫວຊັບສິນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ໂຄງຮ່າງການໃຫມ່
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,ໂຄງຮ່າງການໃຫມ່
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ລາຍການ {0} ບໍ່ແມ່ນລາຍການຕໍ່ເນື່ອງ
 DocType: SMS Center,Create Receiver List,ສ້າງບັນຊີຮັບ
 DocType: Vehicle,Wheels,ຂັບລົດ
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ປິດການໃຊ້ວຽກການສ້າງຂໍ້ມູນບັນທຶກທີ່ໃຊ້ເວລາຕໍ່ໃບສັ່ງຜະລິດ. ການດໍາເນີນງານຈະບໍ່ໄດ້ຮັບການຕິດຕາມຕໍ່ສັ່ງຊື້ສິນຄ້າ
 DocType: Student,Student Mobile Number,ຈໍານວນໂທລະສັບມືຖືນັກສຶກສາ
 DocType: Item,Has Variants,ມີ Variants
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ທ່ານໄດ້ຄັດເລືອກເອົາແລ້ວລາຍການຈາກ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ຊື່ຂອງການແຜ່ກະຈາຍລາຍເດືອນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID batch ເປັນການບັງຄັບ
 DocType: Sales Person,Parent Sales Person,ບຸກຄົນຜູ້ປົກຄອງ Sales
 DocType: Purchase Invoice,Recurring Invoice,ໃບເກັບເງິນທີ່ເກີດຂຶ້ນ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ການຄຸ້ມຄອງການໂຄງການ
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,ປີງົບປະມານ
 DocType: Vehicle Log,Fuel Price,ລາຄານໍ້າມັນເຊື້ອໄຟ
 DocType: Budget,Budget,ງົບປະມານ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ລາຍການສິນຊັບຖາວອນຕ້ອງຈະເປັນລາຍການບໍ່ແມ່ນຫຼັກຊັບ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ຕ້ານ {0}, ຍ້ອນວ່າມັນບໍ່ແມ່ນເປັນບັນຊີລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ໄດ້ບັນລຸຜົນ
 DocType: Student Admission,Application Form Route,ຄໍາຮ້ອງສະຫມັກແບບຟອມການເສັ້ນທາງ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,ອານາເຂດຂອງ / ລູກຄ້າ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,ອານາເຂດຂອງ / ລູກຄ້າ
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ຕົວຢ່າງ: 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ອອກຈາກປະເພດ {0} ບໍ່ສາມາດຈັດຕັ້ງແຕ່ມັນໄດ້ຖືກອອກໂດຍບໍ່ມີການຈ່າຍເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ຕິດຕໍ່ກັນ {0}: ຈັດສັນຈໍານວນເງິນ {1} ຕ້ອງຫນ້ອຍກ່ວາຫຼືເທົ່າກັບໃບເກັບເງິນຈໍານວນທີ່ຍັງຄ້າງຄາ {2}
@@ -1878,14 +1876,14 @@
 ,Serial No Status,ບໍ່ມີ Serial ສະຖານະ
 DocType: Payment Entry Reference,Outstanding,ທີ່ຍັງຄ້າງຄາ
 ,Daily Timesheet Summary,Summary Timesheet ປະຈໍາວັນ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ຕິດຕໍ່ກັນ {0}: ເພື່ອກໍານົດ {1} ໄລຍະເວລາ, ຄວາມແຕກຕ່າງກັນລະຫວ່າງຈາກແລະກັບວັນທີ \ ຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ນີ້ແມ່ນອີງໃສ່ການເຄື່ອນຍ້າຍ. ເບິ່ງ {0} ສໍາລັບລາຍລະອຽດ
 DocType: Pricing Rule,Selling,ຂາຍ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},ຈໍານວນ {0} {1} ຫັກຕໍ່ {2}
 DocType: Employee,Salary Information,ຂໍ້ມູນເງິນເດືອນ
 DocType: Sales Person,Name and Employee ID,ຊື່ແລະລະຫັດພະນັກງານ
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ເນື່ອງຈາກວັນທີບໍ່ສາມາດກ່ອນທີ່ໂພດວັນທີ່
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,ຫນ້າທີ່ແລະພາສີອາກອນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ກະລຸນາໃສ່ວັນທີເອກະສານ
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ບໍ່ສາມາດສົ່ງຈໍານວນການຕິດຕໍ່ກັນຫຼາຍກ່ວາຫຼືເທົ່າກັບຈໍານວນການຕິດຕໍ່ກັນໃນປັດຈຸບັນສໍາລັບປະເພດຄ່າໃຊ້ຈ່າຍນີ້
 DocType: Asset,Sold,ຂາຍ
 ,Item-wise Purchase History,ປະວັດການຊື້ລາຍການທີ່ສະຫລາດ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ &#39;ມາດດຶງຂໍ້ມູນ Serial No ເພີ່ມຂຶ້ນສໍາລັບສິນຄ້າ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ &#39;ມາດດຶງຂໍ້ມູນ Serial No ເພີ່ມຂຶ້ນສໍາລັບສິນຄ້າ {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,ໃບສັ່ງຜະລິດເປີດ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),ຈໍານວນພື້ນຖານ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Payment Reconciliation Payment,Reference Row,Row ກະສານອ້າງອີງ
 DocType: Installation Note,Installation Time,ທີ່ໃຊ້ເວລາການຕິດຕັ້ງ
 DocType: Sales Invoice,Accounting Details,ລາຍລະອຽດການບັນຊີ
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ລົບລາຍະການທັງຫມົດສໍາລັບການບໍລິສັດນີ້
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ການລົງທຶນ
 DocType: Issue,Resolution Details,ລາຍລະອຽດຄວາມລະອຽດ
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,ການສົນທະນາ
 DocType: Payment Entry,Transaction ID,ID Transaction
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ກົດລະບຽບການຕັ້ງລາຄາໄດ້ຖືກກັ່ນຕອງຕື່ມອີກໂດຍອີງໃສ່ປະລິມານ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ກະລຸນາຕັ້ງວັນທີ່ຂອງການເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ {0}
 DocType: Task,Total Billing Amount (via Time Sheet),ຈໍານວນການເອີ້ນເກັບເງິນທັງຫມົດ (ໂດຍຜ່ານທີ່ໃຊ້ເວລາ Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ລາຍການລູກຄ້າຊ້ໍາ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ຄ່າໃຊ້ຈ່າຍການອະນຸມັດ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ຕ້ອງມີພາລະບົດບາດ &#39;ຄ່າໃຊ້ຈ່າຍການອະນຸມັດ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ຄູ່
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ເລືອກ BOM ແລະຈໍານວນການຜະລິດ
 DocType: Asset,Depreciation Schedule,ຕາຕະລາງຄ່າເສື່ອມລາຄາ
 DocType: Bank Reconciliation Detail,Against Account,ຕໍ່ບັນຊີ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ເຄິ່ງຫນຶ່ງຂອງວັນທີ່ຄວນຈະມີລະຫວ່າງຕັ້ງແຕ່ວັນທີ່ແລະວັນທີ
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},ກະລຸນາຕັ້ງຊັບ Center ຄ່າເສື່ອມລາຄາຕົ້ນທຶນໃນບໍລິສັດ {0}
 ,Maintenance Schedules,ຕາຕະລາງການບໍາລຸງຮັກສາ
 DocType: Task,Actual End Date (via Time Sheet),ຕົວຈິງວັນທີ່ສິ້ນສຸດ (ຜ່ານທີ່ໃຊ້ເວລາ Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},ຈໍານວນ {0} {1} ກັບ {2} {3}
 ,Quotation Trends,ແນວໂນ້ມວົງຢືມ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ກຸ່ມສິນຄ້າບໍ່ໄດ້ກ່າວເຖິງໃນຕົ້ນສະບັບລາຍການສໍາລັບການ item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີລູກຫນີ້
 DocType: Shipping Rule Condition,Shipping Amount,ການຂົນສົ່ງຈໍານວນເງິນ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ທີ່ຍັງຄ້າງຈໍານວນ
 DocType: Purchase Invoice Item,Conversion Factor,ປັດໄຈການປ່ຽນແປງ
 DocType: Purchase Order,Delivered,ສົ່ງ
 ,Vehicle Expenses,ຄ່າໃຊ້ຈ່າຍຍານພາຫະນະ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
+DocType: Serial No,Invoice Details,ລາຍລະອຽດໃບແຈ້ງຫນີ້
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງໄດ້ຫຼາຍກ່ວາຫຼືເທົ່າກັບ {0}
 DocType: Purchase Receipt,Vehicle Number,ຈໍານວນຍານພາຫະນະ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ວັນທີ່ໃບເກັບເງິນທີ່ເກີດຂຶ້ນຈະໄດ້ຮັບການຢຸດເຊົາການ
 DocType: Employee Loan,Loan Amount,ຈໍານວນເງິນກູ້ຢືມເງິນ
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,ການຕັ້ງຄ່າ HR
 DocType: Salary Slip,net pay info,ຂໍ້ມູນການຈ່າຍເງິນສຸດທິ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງແມ່ນທີ່ຍັງຄ້າງການອະນຸມັດ. ພຽງແຕ່ອະນຸມັດຄ່າໃຊ້ຈ່າຍທີ່ສາມາດປັບປຸງສະຖານະພາບ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງແມ່ນທີ່ຍັງຄ້າງການອະນຸມັດ. ພຽງແຕ່ອະນຸມັດຄ່າໃຊ້ຈ່າຍທີ່ສາມາດປັບປຸງສະຖານະພາບ.
 DocType: Email Digest,New Expenses,ຄ່າໃຊ້ຈ່າຍໃຫມ່
 DocType: Purchase Invoice,Additional Discount Amount,ເພີ່ມເຕີມຈໍານວນສ່ວນລົດ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ຕິດຕໍ່ກັນ, {0}: ຈໍານວນປະມານ 1 ປີ, ເປັນລາຍການເປັນສິນຊັບຖາວອນ. ກະລຸນາໃຊ້ຕິດຕໍ່ກັນທີ່ແຍກຕ່າງຫາກສໍາລັບການຈໍານວນຫຼາຍ."
 DocType: Leave Block List Allow,Leave Block List Allow,ອອກຈາກສະໄຫມອະນຸຍາດໃຫ້
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,abbr ບໍ່ສາມາດມີຊ່ອງຫວ່າງຫຼືຊ່ອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,ກຸ່ມທີ່ບໍ່ແມ່ນກຸ່ມ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ກິລາ
 DocType: Loan Type,Loan Name,ຊື່ການກູ້ຢືມເງິນ
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse ບ່ອນທີ່ທ່ານກໍາລັງຮັກສາຫຼັກຊັບຂອງລາຍການຖືກປະຕິເສດ
 DocType: Production Order,Skip Material Transfer,ຂ້າມການວັດສະດຸໂອນ
 DocType: Production Order,Skip Material Transfer,ຂ້າມການວັດສະດຸໂອນ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ບໍ່ສາມາດຊອກຫາອັດຕາແລກປ່ຽນໃນລາຄາ {0} ກັບ {1} ສໍາລັບວັນທີທີ່ສໍາຄັນ {2}. ກະລຸນາສ້າງບັນທຶກຕາແລກປ່ຽນເງິນດ້ວຍຕົນເອງ
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ປີທາງດ້ານການເງິນຂອງທ່ານສິ້ນສຸດລົງໃນ
 DocType: POS Profile,Price List,ລາຍການລາຄາ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ແມ່ນໃນປັດຈຸບັນເລີ່ມຕົ້ນປີງົບປະມານ. ກະລຸນາໂຫຼດຫນ້າຈໍຄືນຂອງຕົວທ່ອງເວັບຂອງທ່ານສໍາລັບການປ່ຽນແປງທີ່ຈະມີຜົນກະທົບ.
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},ບັນຊີ {0} ບໍ່ຖືກຕ້ອງ. ບັນຊີສະກຸນເງິນຈະຕ້ອງ {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ປັດໄຈທີ່ UOM ສົນທະນາແມ່ນຕ້ອງການໃນການຕິດຕໍ່ກັນ {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຂາຍ, ຂາຍໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Salary Component,Deduction,ການຫັກ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ຕິດຕໍ່ກັນ {0}: ຈາກທີ່ໃຊ້ເວລາແລະຈະໃຊ້ເວລາເປັນການບັງຄັບ.
 DocType: Stock Reconciliation Item,Amount Difference,ຈໍານວນທີ່ແຕກຕ່າງກັນ
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},ລາຍການລາຄາເພີ່ມຂຶ້ນສໍາລັບ {0} ໃນລາຄາ {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ກະລຸນາໃສ່ລະຫັດພະນັກງານຂອງບຸກຄົນການຂາຍນີ້
 DocType: Territory,Classification of Customers by region,ການຈັດປະເພດຂອງລູກຄ້າຕາມພູມິພາກ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນຕ້ອງເປັນສູນ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ຄວາມແຕກຕ່າງກັນຈໍານວນເງິນຕ້ອງເປັນສູນ
 DocType: Project,Gross Margin,ຂອບໃບລວມຍອດ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,ກະລຸນາໃສ່ການຜະລິດສິນຄ້າຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ການຄິດໄລ່ຄວາມດຸ່ນດ່ຽງທະນາຄານ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ຜູ້ໃຊ້ຄົນພິການ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ວົງຢືມ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ວົງຢືມ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ຫັກຈໍານວນທັງຫມົດ
 ,Production Analytics,ການວິເຄາະການຜະລິດ
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,ລາຍການ {0} ໄດ້ຖືກສົ່ງຄືນແລ້ວ
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** ປີງົບປະມານ ** ເປັນຕົວແທນເປັນປີການເງິນ. entries ບັນຊີທັງຫມົດແລະເຮັດທຸລະກໍາທີ່ສໍາຄັນອື່ນໆມີການຕິດຕາມຕໍ່ປີງົບປະມານ ** **.
 DocType: Opportunity,Customer / Lead Address,ລູກຄ້າ / ທີ່ຢູ່ນໍາ
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},ການເຕືອນໄພ: ໃບຢັ້ງຢືນການ SSL ບໍ່ຖືກຕ້ອງກ່ຽວກັບສິ່ງທີ່ແນບມາ {0}
 DocType: Student Admission,Eligibility,ມີສິດໄດ້ຮັບ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ນໍາໄປສູ່ການຊ່ວຍເຫຼືອທີ່ທ່ານໄດ້ຮັບທຸລະກິດ, ເພີ່ມການຕິດຕໍ່ທັງຫມົດຂອງທ່ານແລະຫຼາຍເປັນຜູ້ນໍາພາຂອງທ່ານ"
 DocType: Production Order Operation,Actual Operation Time,ທີ່ແທ້ຈິງທີ່ໃຊ້ເວລາການດໍາເນີນງານ
 DocType: Authorization Rule,Applicable To (User),ສາມາດນໍາໃຊ້ໄປ (User)
 DocType: Purchase Taxes and Charges,Deduct,ຫັກ
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,ຢູ່ບ່ອນເຮັດວຽກ
 DocType: Appraisal,Calculate Total Score,ຄິດໄລ່ຄະແນນທັງຫມົດ
 DocType: Request for Quotation,Manufacturing Manager,ຜູ້ຈັດການການຜະລິດ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ການຮັບປະກັນບໍ່ເກີນ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} ແມ່ນຢູ່ພາຍໃຕ້ການຮັບປະກັນບໍ່ເກີນ {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ການແບ່ງປັນການຈັດສົ່ງເຂົ້າໄປໃນການຫຸ້ມຫໍ່.
 apps/erpnext/erpnext/hooks.py +87,Shipments,ການຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ຍອດ Account ({0}) ໃນລາຄາ {1} ແລະມູນຄ່າຫຼັກຊັບ ({2}) ສໍາລັບການສາງ {3} ຕ້ອງດຽວກັນ
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,ຫມາຍເຫດ: ອີເມວຈະບໍ່ຖືກສົ່ງກັບຜູ້ໃຊ້ຄົນພິການ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ຈໍານວນປະຕິສໍາພັນ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ຈໍານວນປະຕິສໍາພັນ
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ເລືອກບໍລິສັດ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ເລືອກບໍລິສັດ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,ໃຫ້ຫວ່າງໄວ້ຖ້າພິຈາລະນາສໍາລັບການພະແນກການທັງຫມົດ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ປະເພດຂອງການຈ້າງງານ (ຖາວອນ, ສັນຍາ, ແລະອື່ນໆພາຍໃນ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ເປັນການບັງຄັບສໍາລັບລາຍການ {1}
 DocType: Process Payroll,Fortnightly,ສອງອາທິດ
 DocType: Currency Exchange,From Currency,ຈາກສະກຸນເງິນ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","ກະລຸນາເລືອກນວນການຈັດສັນ, ປະເພດໃບເກັບເງິນແລະຈໍານວນໃບເກັບເງິນໃນ atleast ຫນຶ່ງຕິດຕໍ່ກັນ"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),ອັດຕາການ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Student Guardian,Others,ຄົນອື່ນ
 DocType: Payment Entry,Unallocated Amount,ຈໍານວນເງິນບໍ່ໄດ້ປັນສ່ວນ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ບໍ່ສາມາດຊອກຫາສິນຄ້າ. ກະລຸນາເລືອກບາງມູນຄ່າອື່ນໆ {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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.","A ຜະລິດຕະພັນຫຼືການບໍລິການທີ່ຊື້, ຂາຍຫຼືເກັບຮັກສາໄວ້ໃນຫຼັກຊັບ."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,ບໍ່ມີຂໍ້ມູນເພີ່ມເຕີມ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ບໍ່ສາມາດເລືອກເອົາປະເພດຄ່າໃຊ້ຈ່າຍເປັນຈໍານວນເງິນຕິດຕໍ່ກັນກ່ອນຫນ້ານີ້ &#39;ຫລື&#39; ໃນທີ່ຜ່ານມາຕິດຕໍ່ກັນທັງຫມົດສໍາລັບການຕິດຕໍ່ກັນຄັ້ງທໍາອິດ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item ບໍ່ຄວນຈະເປັນມັດຜະລິດຕະພັນ. ກະລຸນາເອົາລາຍ `{0}` ແລະຊ່ວຍປະຢັດ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ທະນາຄານ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,ຕື່ມການ Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,ຕື່ມການ Timesheets
 DocType: Vehicle Service,Service Item,ສິນຄ້າການບໍລິການ
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
 DocType: Bank Guarantee,Bank Guarantee,ຮັບປະກັນທະນາຄານ
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},"ຕິດຕໍ່ກັນ, {0}: Asset {1} ແມ່ນແລ້ວ {2}"
 DocType: Quotation Item,Stock Balance,ຍອດ Stock
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ໃບສັ່ງຂາຍການຊໍາລະເງິນ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,ກະລຸນາຕັ້ງການຕັ້ງຊື່ Series ໃນລາຄາ {0} ຜ່ານ Setup&gt; Settings&gt; ຕັ້ງຊື່ Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,ຄ່າໃຊ້ຈ່າຍຂໍ້ມູນການຮ້ອງຂໍ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,ກະລຸນາເລືອກບັນຊີທີ່ຖືກຕ້ອງ
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ລາຄາຈະບໍ່ໄດ້ຮັບການສະແດງໃຫ້ເຫັນວ່າລາຄາບໍ່ໄດ້ຕັ້ງ
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ກະລຸນາລະບຸປະເທດສໍາລັບກົດລະບຽບດັ່ງກ່າວນີ້ຫຼືກວດເບິ່ງເຮືອໃນທົ່ວໂລກ
 DocType: Stock Entry,Total Incoming Value,ມູນຄ່າຂາເຂົ້າທັງຫມົດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ເດບິດການຈໍາເປັນຕ້ອງ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ຊ່ວຍຮັກສາຕິດຕາມຂອງທີ່ໃຊ້ເວລາ, ຄ່າໃຊ້ຈ່າຍແລະການເອີ້ນເກັບເງິນສໍາລັບກິດຈະກໍາເຮັດໄດ້ໂດຍທີມງານຂອງທ່ານ"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ລາຄາຊື້
 DocType: Offer Letter Term,Offer Term,ຄໍາສະເຫນີ
 DocType: Quality Inspection,Quality Manager,ຜູ້ຈັດການຄຸນະພາບ
 DocType: Job Applicant,Job Opening,ເປີດວຽກເຮັດງານທໍາ
 DocType: Payment Reconciliation,Payment Reconciliation,ສ້າງຄວາມປອງດອງການຊໍາລະເງິນ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ກະລຸນາເລືອກຊື່ Incharge ຂອງບຸກຄົນ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ກະລຸນາເລືອກຊື່ Incharge ຂອງບຸກຄົນ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ເຕັກໂນໂລຊີ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},ທັງຫມົດບໍ່ທັນໄດ້ຈ່າຍ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ການດໍາເນີນງານເວັບໄຊທ໌
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,ລືມເຫດຜົນ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ທີ່ຢູ່ໃຫມ່
 DocType: Quality Inspection,Sample Size,ຂະຫນາດຕົວຢ່າງ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ກະລຸນາໃສ່ເອກະສານຮັບ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ລາຍການທັງຫມົດໄດ້ຮັບການອະນຸແລ້ວ
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',ກະລຸນາລະບຸທີ່ຖືກຕ້ອງ &#39;ຈາກກໍລະນີສະບັບເລກທີ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ສູນຕົ້ນທຶນເພີ່ມເຕີມສາມາດເຮັດໄດ້ພາຍໃຕ້ Groups ແຕ່ລາຍະການສາມາດຈະດໍາເນີນຕໍ່ບໍ່ແມ່ນ Groups
 DocType: Project,External,ພາຍນອກ
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ຜູ້ຊົມໃຊ້ແລະການອະນຸຍາດ
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ໃບສັ່ງຜະລິດຂຽນເມື່ອ: {0}
 DocType: Branch,Branch,ສາຂາ
 DocType: Guardian,Mobile Number,ເບີໂທລະສັບ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ການພິມແລະຍີ່ຫໍ້
 DocType: Bin,Actual Quantity,ຈໍານວນຈິງ
 DocType: Shipping Rule,example: Next Day Shipping,ຍົກຕົວຢ່າງ: Shipping ວັນຖັດໄປ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ບໍ່ໄດ້ພົບເຫັນ
 DocType: Scheduling Tool,Student Batch,Batch ນັກສຶກສາ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ລູກຄ້າຂອງທ່ານ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ເຮັດໃຫ້ນັກສຶກສາ
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ທ່ານໄດ້ຖືກເຊື້ອເຊີນເພື່ອເຮັດວຽກຮ່ວມກັນກ່ຽວກັບໂຄງການ: {0}
 DocType: Leave Block List Date,Block Date,Block ວັນທີ່
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ສະຫມັກວຽກນີ້
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,ຖືກສົ່ງໄປ
 DocType: Payment Request,Make Sales Invoice,ເຮັດໃຫ້ຍອດຂາຍ Invoice
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,ຊອບແວ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ຖັດໄປວັນທີບໍ່ສາມາດຈະຢູ່ໃນໄລຍະຜ່ານມາ
 DocType: Company,For Reference Only.,ສໍາລັບການກະສານອ້າງອີງເທົ່ານັ້ນ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ເລືອກຊຸດ No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ບໍ່ຖືກຕ້ອງ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,"PINV, RET-"
 DocType: Sales Invoice Advance,Advance Amount,ລ່ວງຫນ້າຈໍານວນເງິນ
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,ກໍລະນີສະບັບເລກທີບໍ່ສາມາດຈະເປັນ 0
 DocType: Item,Show a slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ເປັນຢູ່ປາຍສຸດຂອງຫນ້າ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,ແອບເປີ້ນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ຮ້ານຄ້າ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ຮ້ານຄ້າ
 DocType: Serial No,Delivery Time,ເວລາຂົນສົ່ງ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ຜູ້ສູງອາຍຸຈາກຈໍານວນກ່ຽວກັບ
 DocType: Item,End of Life,ໃນຕອນທ້າຍຂອງການມີຊີວິດ
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,ປ່ຽນຊື່ເຄື່ອງມື
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,ການປັບປຸງຄ່າໃຊ້ຈ່າຍ
 DocType: Item Reorder,Item Reorder,ລາຍການຮຽງລໍາດັບໃຫມ່
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip ສະແດງໃຫ້ເຫັນເງິນເດືອນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ການຖ່າຍໂອນການວັດສະດຸ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ລະບຸການດໍາເນີນງານ, ຄ່າໃຊ້ຈ່າຍປະຕິບັດແລະໃຫ້ການດໍາເນີນງານເປັນເອກະລັກທີ່ບໍ່ມີການປະຕິບັດງານຂອງທ່ານ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ເອກະສານນີ້ແມ່ນໃນໄລຍະຂອບເຂດຈໍາກັດໂດຍ {0} {1} ສໍາລັບ item {4}. ທ່ານກໍາລັງເຮັດໃຫ້ຄົນອື່ນ {3} ຕໍ່ຕ້ານດຽວກັນ {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,ກະລຸນາທີ່ກໍານົດໄວ້ໄດ້ເກີດຂຶ້ນຫລັງຈາກບັນທຶກ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ບັນຊີຈໍານວນເລືອກການປ່ຽນແປງ
 DocType: Purchase Invoice,Price List Currency,ລາຄາສະກຸນເງິນ
 DocType: Naming Series,User must always select,ຜູ້ໃຊ້ຕ້ອງໄດ້ເລືອກ
 DocType: Stock Settings,Allow Negative Stock,ອະນຸຍາດໃຫ້ລົບ Stock
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,ບັນຊີງົບປະມານ
 DocType: Quality Inspection,Verified By,ການຢັ້ງຢືນໂດຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ບໍ່ສາມາດມີການປ່ຽນແປງສະກຸນເງິນເລີ່ມຂອງບໍລິສັດ, ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວ. ເຮັດທຸລະກໍາຕ້ອງໄດ້ຮັບການຍົກເລີກການປ່ຽນແປງສະກຸນເງິນໄວ້ໃນຕອນຕົ້ນ."
-DocType: Grade Interval,Grade Description,Grade ລາຍລະອຽດ
+DocType: Grading Scale Interval,Grade Description,Grade ລາຍລະອຽດ
 DocType: Stock Entry,Purchase Receipt No,ຊື້ໃບບໍ່ມີ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,ເງິນ earnest
 DocType: Process Payroll,Create Salary Slip,ສ້າງຄວາມຜິດພາດພຽງເງິນເດືອນ
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,ຜູ້ເຂົ້າຮ່ວມເຖິງວັນທີ່
 DocType: Warranty Claim,Raised By,ຍົກຂຶ້ນມາໂດຍ
 DocType: Payment Gateway Account,Payment Account,ບັນຊີຊໍາລະເງິນ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,ກະລຸນາລະບຸບໍລິສັດເພື່ອດໍາເນີນການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ການປ່ຽນແປງສຸດທິໃນບັນຊີລູກຫນີ້
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ການຊົດເຊີຍ Off
 DocType: Offer Letter,Accepted,ຮັບການຍອມຮັບ
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ກະລຸນາເຮັດໃຫ້ແນ່ໃຈວ່າທ່ານຕ້ອງການທີ່ຈະລົບເຮັດທຸລະກໍາທັງຫມົດຂອງບໍລິສັດນີ້. ຂໍ້ມູນຕົ້ນສະບັບຂອງທ່ານຈະຍັງຄົງເປັນມັນເປັນ. ການດໍາເນີນການນີ້ບໍ່ສາມາດຍົກເລີກໄດ້.
 DocType: Room,Room Number,ຈໍານວນຫ້ອງ
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},ກະສານອ້າງອີງທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ quanitity ການວາງແຜນ ({2}) ໃນການຜະລິດການສັ່ງຊື້ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ quanitity ການວາງແຜນ ({2}) ໃນການຜະລິດການສັ່ງຊື້ {3}
 DocType: Shipping Rule,Shipping Rule Label,Label Shipping ກົດລະບຽບ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,User Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ວັດຖຸດິບບໍ່ສາມາດມີຊ່ອງຫວ່າງ.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ໄວອະນຸທິນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ບໍ່ສາມາດປັບປຸງຫຼັກຊັບ, ໃບເກັບເງິນປະກອບດ້ວຍການຫຼຸດລົງລາຍການການຂົນສົ່ງ."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ໄວອະນຸທິນ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງອັດຕາການຖ້າຫາກວ່າ BOM ທີ່ໄດ້ກ່າວມາ agianst ລາຍການໃດ
 DocType: Employee,Previous Work Experience,ຕໍາແຫນ່ງທີ່ເຄີຍເຮັດຜ່ານມາ
 DocType: Stock Entry,For Quantity,ສໍາລັບປະລິມານ
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ຂໍ້ກໍານົດແລະ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ຊື່ຂອງສະຖາບັນສໍາລັບການທີ່ທ່ານຈະຕິດຕັ້ງລະບົບນີ້.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ເຂົ້າບັນຊີ frozen ເຖິງວັນນີ້, ບໍ່ມີໃຜສາມາດເຮັດໄດ້ / ປັບປຸງແກ້ໄຂການເຂົ້າຍົກເວັ້ນພາລະບົດບາດທີ່ລະບຸໄວ້ຂ້າງລຸ່ມນີ້."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ກະລຸນາຊ່ວຍປະຢັດເອກະສານກ່ອນການສ້າງຕາຕະລາງການບໍາລຸງຮັກສາ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ສະຖານະການ
 DocType: UOM,Check this to disallow fractions. (for Nos),ກວດສອບນີ້ຈະບໍ່ອະນຸຍາດແຕ່ສ່ວນຫນຶ່ງ. (ສໍາລັບພວກເຮົາ)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,ໄດ້ໃບສັ່ງຜະລິດຕໍ່ໄປນີ້ໄດ້ຮັບການສ້າງຕັ້ງ:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,ພະນັກງານເຮັດວຽກກ່ຽວກັບວັນພັກ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,ເຄື່ອງຫມາຍປັດຈຸບັນ
 DocType: Project,% Complete Method,% ວິທີການສໍາເລັດ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ວັນທີເລີ່ມຕົ້ນບໍາລຸງຮັກສາບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບການບໍ່ມີ Serial {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ວັນທີເລີ່ມຕົ້ນບໍາລຸງຮັກສາບໍ່ສາມາດກ່ອນທີ່ວັນທີສໍາລັບການບໍ່ມີ Serial {0}
 DocType: Production Order,Actual End Date,ຕົວຈິງວັນທີ່ສິ້ນສຸດ
 DocType: BOM,Operating Cost (Company Currency),ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ອອກຈາກໂດຍບໍ່ມີການຈ່າຍບໍ່ມີຄໍາວ່າດ້ວຍການອະນຸມັດການບັນທຶກການອອກຈາກຄໍາຮ້ອງສະຫມັກ
 DocType: Campaign,Campaign-.####,ຂະບວນການ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ຂັ້ນຕອນຕໍ່ໄປ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,ກະລຸນາສະຫນອງໃຫ້ແກ່ລາຍການທີ່ລະບຸໄວ້ໃນລາຄາທີ່ເປັນໄປໄດ້ທີ່ດີທີ່ສຸດ
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto ໃກ້ໂອກາດພາຍໃນ 15 ວັນ
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ປີສຸດທ້າຍ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,quot /% Lead
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ຈໍານວນ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ຄ່າບໍລິການບັນທຶກຂຽນເມື່ອຫລາຍ - {0}
 DocType: Asset Category Account,Asset Category Account,ບັນຊີຊັບສິນປະເພດ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},ບໍ່ສາມາດຜະລິດສິນຄ້າຫຼາຍ {0} ກ່ວາປະລິມານສັ່ງຂາຍ {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Stock Entry {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Payment Reconciliation,Bank / Cash Account,ບັນຊີທະນາຄານ / ເງິນສົດ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,ຖັດໄປໂດຍບໍ່ສາມາດເຊັ່ນດຽວກັນກັບທີ່ຢູ່ອີເມວ Lead
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ການເກັບກູ້ Date ບໍ່ໄດ້ກ່າວເຖິງ
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ການຜະລິດ
 DocType: Guardian,Occupation,ອາຊີບ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ຕິດຕໍ່ກັນ {0}: ວັນທີ່ເລີ່ມຕ້ອງມີກ່ອນວັນທີ່ສິ້ນສຸດ
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ທັງຫມົດ (ຈໍານວນ)
 DocType: Sales Invoice,This Document,ເອກະສານນີ້
 DocType: Installation Note Item,Installed Qty,ການຕິດຕັ້ງຈໍານວນ
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ລາຍງານສະບັບທີ່ເປັນ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ຄ່າໃຊ້ຈ່າຍຜົນປະໂຫຍດ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 ຂ້າງເທິງ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"ຕິດຕໍ່ກັນ, {0}: Journal Entry {1} ບໍ່ມີບັນຊີ {2} ຫລືແລ້ວປຽບທຽບ voucher ອື່ນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,"ຕິດຕໍ່ກັນ, {0}: Journal Entry {1} ບໍ່ມີບັນຊີ {2} ຫລືແລ້ວປຽບທຽບ voucher ອື່ນ"
 DocType: Buying Settings,Default Buying Price List,ມາດຕະຖານບັນຊີການຊື້ລາຄາ
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip ເງິນເດືອນຈາກ Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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.","ກໍານົດມູນຄ່າມາດຕະຖານຄືບໍລິສັດ, ສະກຸນເງິນ, ປັດຈຸບັນປີງົບປະມານ, ແລະອື່ນໆ"
 DocType: Payment Entry,Payment Type,ປະເພດການຊໍາລະເງິນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ກະລຸນາເລືອກຊຸດສໍາລັບລາຍການທີ່ {0}. ບໍ່ສາມາດຊອກຫາ batch ດຽວທີ່ຕອບສະຫນອງຂໍ້ກໍານົດນີ້
 DocType: Process Payroll,Select Employees,ເລືອກພະນັກງານ
 DocType: Opportunity,Potential Sales Deal,Deal Sales ທ່າແຮງ
 DocType: Payment Entry,Cheque/Reference Date,ກະແສລາຍວັນ / ວັນທີ່ເອກະສານ
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ຂໍ້ມູນ POS Global {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບບໍລິສັດ {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,ທົດແທນສິນຄ້າ / BOM ໃນແອບເປີ້ນທັງຫມົດ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ເອກະສານໄດ້ຮັບຕ້ອງໄດ້ຮັບການສົ່ງ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ເອກະສານໄດ້ຮັບຕ້ອງໄດ້ຮັບການສົ່ງ
 DocType: Purchase Invoice Item,Received Qty,ໄດ້ຮັບຈໍານວນ
 DocType: Stock Entry Detail,Serial No / Batch,ບໍ່ມີ Serial / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ບໍ່ໄດ້ຈ່າຍແລະບໍ່ສົ່ງ
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,"DN, RET-"
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ບໍ່ມີແຜ່ນທີ່ໃຊ້ເວລາ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"ອອກຈາກປະເພດ {0} ບໍ່ສາມາດໄດ້ຮັບການປະຕິບັດ, ການສົ່ງ"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ບໍາລຸງຮັກສາເປັນເວລາທີ່ບໍ່ໄດ້ສ້າງຂຶ້ນສໍາລັບການລາຍການທັງຫມົດ. ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
 ,To Produce,ກັບຜະລິດຕະພັນ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","ສໍາລັບການຕິດຕໍ່ກັນ {0} ໃນ {1}. ເພື່ອປະກອບມີ {2} ໃນອັດຕາການສິນຄ້າ, ແຖວເກັດທີ່ຢູ່ {3} ຍັງຕ້ອງໄດ້ຮັບການປະກອບ"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ເຮັດໃຫ້ຜູ້ໃຊ້
 DocType: Packing Slip,Identification of the package for the delivery (for print),ການກໍານົດຂອງຊຸດສໍາລັບການຈັດສົ່ງ (ສໍາລັບການພິມ)
 DocType: Bin,Reserved Quantity,ຈໍານວນສະຫງວນ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ກະລຸນາໃສ່ທີ່ຢູ່ອີເມວທີ່ຖືກຕ້ອງ
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ແມ່ແບບຄົນພິການຈະຕ້ອງບໍ່ແມ່ແບບມາດຕະຖານ
 DocType: Account,Income Account,ບັນຊີລາຍໄດ້
 DocType: Payment Request,Amount in customer's currency,ຈໍານວນເງິນໃນສະກຸນເງິນຂອງລູກຄ້າ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ສົ່ງ
 DocType: Stock Reconciliation Item,Current Qty,ຈໍານວນໃນປັດຈຸບັນ
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ເບິ່ງ &quot;ອັດຕາການວັດສະດຸພື້ນຖານກ່ຽວກັບ&quot; ໃນມາຕາ Costing
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,ຄວາມຮັບຜິດຊອບທີ່ສໍາຄັນ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ສໍາຫລັບຂະບວນນັກສຶກສາຊ່ວຍໃຫ້ທ່ານຕິດຕາມການເຂົ້າຮຽນ, ການປະເມີນຜົນແລະຄ່າທໍານຽມສໍາລັບນັກສຶກສາ"
 DocType: Payment Entry,Total Allocated Amount,ນວນການຈັດສັນທັງຫມົດ
 DocType: Item Reorder,Material Request Type,ອຸປະກອນການຮ້ອງຂໍປະເພດ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},ຖືກຕ້ອງອະນຸເງິນເດືອນຈາກ {0} ກັບ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage ແມ່ນອັນເຕັມທີ່, ບໍ່ໄດ້ປະຢັດ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ຕິດຕໍ່ກັນ {0}: UOM ປັດໄຈການແປງເປັນການບັງຄັບ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,ສູນຕົ້ນທຶນ
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ເຊື່ອງ Id ພາສີຂອງລູກຄ້າຈາກທຸລະກໍາການຂາຍ
 DocType: Upload Attendance,Upload HTML,Upload HTML
 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.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ທີ່ຈະຂຽນທັບລາຄາ / ກໍານົດອັດຕາສ່ວນພິເສດ, ອີງໃສ່ເງື່ອນໄຂບາງຢ່າງ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ກົດລະບຽບການຕັ້ງລາຄາໄດ້ທີ່ຈະຂຽນທັບລາຄາ / ກໍານົດອັດຕາສ່ວນພິເສດ, ອີງໃສ່ເງື່ອນໄຂບາງຢ່າງ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Warehouse ພຽງແຕ່ສາມາດໄດ້ຮັບການປ່ຽນແປງໂດຍຜ່ານ Stock Entry / ການສົ່ງເງິນ / Receipt ຊື້
 DocType: Employee Education,Class / Percentage,ຫ້ອງຮຽນ / ອັດຕາສ່ວນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ຫົວຫນ້າການຕະຫຼາດແລະການຂາຍ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","ຖ້າຫາກວ່າກົດລະບຽບລາຄາການຄັດເລືອກແມ່ນສໍາລັບລາຄາ, ມັນຈະຂຽນທັບລາຄາ. ລາຄາລາຄາກົດລະບຽບແມ່ນລາຄາສຸດທ້າຍ, ສະນັ້ນບໍ່ມີສ່ວນລົດເພີ່ມເຕີມຄວນຈະນໍາໃຊ້. ເພາະສະນັ້ນ, ໃນການຄ້າຂາຍເຊັ່ນ: Sales Order, ການສັ່ງຊື້ແລະອື່ນໆ, ມັນຈະໄດ້ຮັບການຈຶ່ງສວຍໂອກາດໃນພາກສະຫນາມອັດຕາ &#39;, ແທນທີ່ຈະກ່ວາພາກສະຫນາມ&#39; ລາຄາອັດຕາ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ຖ້າຫາກວ່າກົດລະບຽບລາຄາການຄັດເລືອກແມ່ນສໍາລັບລາຄາ, ມັນຈະຂຽນທັບລາຄາ. ລາຄາລາຄາກົດລະບຽບແມ່ນລາຄາສຸດທ້າຍ, ສະນັ້ນບໍ່ມີສ່ວນລົດເພີ່ມເຕີມຄວນຈະນໍາໃຊ້. ເພາະສະນັ້ນ, ໃນການຄ້າຂາຍເຊັ່ນ: Sales Order, ການສັ່ງຊື້ແລະອື່ນໆ, ມັນຈະໄດ້ຮັບການຈຶ່ງສວຍໂອກາດໃນພາກສະຫນາມອັດຕາ &#39;, ແທນທີ່ຈະກ່ວາພາກສະຫນາມ&#39; ລາຄາອັດຕາ."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ການຕິດຕາມຊີ້ນໍາໂດຍປະເພດອຸດສາຫະກໍາ.
 DocType: Item Supplier,Item Supplier,ຜູ້ຜະລິດລາຍການ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,ກະລຸນາໃສ່ລະຫັດສິນຄ້າເພື່ອໃຫ້ໄດ້ຮັບ batch ທີ່ບໍ່ມີ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},ກະລຸນາເລືອກຄ່າ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ທີ່ຢູ່ທັງຫມົດ.
 DocType: Company,Stock Settings,ການຕັ້ງຄ່າ Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","ການລວມເປັນໄປໄດ້ພຽງແຕ່ຖ້າຫາກວ່າມີຄຸນສົມບັດດັ່ງຕໍ່ໄປນີ້ແມ່ນອັນດຽວກັນໃນການບັນທຶກການທັງສອງ. ເປັນກຸ່ມ, ປະເພດຮາກ, ບໍລິສັດ"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',ຈະສົ່ງອີເມວກ່ຽວກັບກໍລະນີທີ່ພະນັກງານທີ່ມີສະຖານະພາບ &quot;ເປີດ &#39;
 DocType: Task,Depends on Tasks,ຂຶ້ນຢູ່ກັບວຽກ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ການຄຸ້ມຄອງການເປັນໄມ້ຢືນຕົ້ນກຸ່ມລູກຄ້າ.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ໄຟລ໌ແນບສາມາດໄດ້ຮັບການສະແດງໃຫ້ເຫັນໂດຍບໍ່ມີການເຮັດໃຫ້ບັດຊື້ສິນຄ້າ
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ໃຫມ່ສູນຕົ້ນທຶນຊື່
 DocType: Leave Control Panel,Leave Control Panel,ອອກຈາກກະດານຄວບຄຸມ
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,ເດບິດໄປ
 DocType: Delivery Note,Required only for sample item.,ຕ້ອງການສໍາລັບລາຍການຕົວຢ່າງ.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ຈໍານວນຕົວຈິງຫຼັງຈາກການ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Supplier&gt; ປະເພດຜະລິດ
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ບໍ່ມີຄວາມຜິດພາດພຽງເງິນເດືອນພົບໃນລະຫວ່າງ {0} ແລະ {1}
 ,Pending SO Items For Purchase Request,ທີ່ຍັງຄ້າງ SO ລາຍການສໍາລັບການຈອງຊື້
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ຮັບສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ເປັນຄົນພິການ
 DocType: Supplier,Billing Currency,ສະກຸນເງິນ Billing
 DocType: Sales Invoice,SINV-RET-,"SINV, RET-"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ຂະຫນາດໃຫຍ່ພິເສດ
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ຫນ້າທໍາອິດຜະລິດຕະພັນທີ່ແນະນໍາ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ທັງຫມົດກຸ່ມການປະເມີນຜົນ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ຊື່ Warehouse ໃຫມ່
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ທັງຫມົດ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ທັງຫມົດ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ອານາເຂດຂອງ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ກະລຸນາທີ່ບໍ່ມີການໄປຢ້ຽມຢາມທີ່ຕ້ອງການ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ກະລຸນາທີ່ບໍ່ມີການໄປຢ້ຽມຢາມທີ່ຕ້ອງການ
 DocType: Stock Settings,Default Valuation Method,ວິທີການປະເມີນມູນຄ່າໃນຕອນຕົ້ນ
 DocType: Vehicle Log,Fuel Qty,ນໍ້າມັນເຊື້ອໄຟຈໍານວນ
 DocType: Production Order Operation,Planned Start Time,ເວລາການວາງແຜນ
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,ລາຄາຕົ້ນສະບັບ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ທັງຫມົດຂອງທຸລະກໍາສາມາດຕິດແທຕໍ່ຫລາຍຄົນຂາຍ ** ** ດັ່ງນັ້ນທ່ານສາມາດກໍານົດແລະຕິດຕາມກວດກາເປົ້າຫມາຍ.
 ,S.O. No.,ດັ່ງນັ້ນສະບັບເລກທີ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ກະລຸນາສ້າງລູກຄ້າຈາກ Lead {0}
 DocType: Price List,Applicable for Countries,ສາມາດນໍາໃຊ້ສໍາລັບປະເທດ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ອອກພຽງແຕ່ຄໍາຮ້ອງສະຫມັກທີ່ມີສະຖານະພາບ &#39;ອະນຸມັດ&#39; ແລະ &#39;ປະຕິເສດ&#39; ສາມາດໄດ້ຮັບການສົ່ງ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ນັກສຶກສາ Group Name ເປັນຂໍ້ບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,ຄັດລອກຈາກ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},ຄວາມຜິດພາດຊື່: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ການຂາດແຄນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານ {0} ແມ່ນຫມາຍແລ້ວ
 DocType: Packing Slip,If more than one package of the same type (for print),ຖ້າຫາກວ່າຫຼາຍກ່ວາຫນຶ່ງຊຸດຂອງປະເພດດຽວກັນ (ສໍາລັບການພິມ)
 ,Salary Register,ເງິນເດືອນຫມັກສະມາຊິກ
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ນໍາໃຊ້ສໍາລັບໂຄງຮ່າງການໄປຊື້ເຄື່ອງ
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ມູນຄ່າ {0} ສໍາລັບຄຸນສົມບັດ {1} ບໍ່ມີຢູ່ໃນບັນຊີລາຍຊື່ຂອງສິນຄ້າທີ່ຖືກຕ້ອງຂອງສິນຄຸນຄ່າສໍາລັບລາຍການ {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ຄ່າບໍລິການຈະໄດ້ຮັບການແຈກຢາຍໂດຍອີງທຽບໃນຈໍານວນລາຍການຫຼືຈໍານວນເງິນທີ່, ເປັນຕໍ່ການຄັດເລືອກຂອງ"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ຄ່າບໍລິການຈະໄດ້ຮັບການແຈກຢາຍໂດຍອີງທຽບໃນຈໍານວນລາຍການຫຼືຈໍານວນເງິນທີ່, ເປັນຕໍ່ການຄັດເລືອກຂອງ"
 DocType: Maintenance Visit,Purposes,ວັດຖຸປະສົງ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,atleast ຫນຶ່ງລາຍການຄວນຈະໄດ້ຮັບເຂົ້າໄປໃນປະລິມານກະທົບທາງລົບໃນເອກະສານຜົນຕອບແທນ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ການດໍາເນີນງານ {0} ຕໍ່ໄປອີກແລ້ວກ່ວາຊົ່ວໂມງການເຮັດວຽກທີ່ມີຢູ່ໃນເວີກສະເຕຊັນ {1}, ທໍາລາຍລົງດໍາເນີນການເຂົ້າໄປໃນການດໍາເນີນງານຫຼາຍ"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ການຄຸ້ມຄອງການເປັນໄມ້ຢືນຕົ້ນອານາເຂດຂອງ.
 DocType: Journal Entry Account,Sales Invoice,ໃບເກັບເງິນການຂາຍ
 DocType: Journal Entry Account,Party Balance,ດຸນພັກ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ກະລຸນາເລືອກສະຫມັກຕໍາ Discount On
 DocType: Company,Default Receivable Account,ມາດຕະຖານ Account Receivable
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ສ້າງ Entry ທະນາຄານສໍາລັບການເງິນເດືອນທັງຫມົດໄດ້ຈ່າຍສໍາລັບເງື່ອນໄຂການຄັດເລືອກຂ້າງເທິງ
 DocType: 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.,ເປີເຊັນສ່ວນລົດສາມາດນໍາໃຊ້ບໍ່ວ່າຈະຕໍ່ລາຄາຫຼືສໍາລັບລາຄາທັງຫມົດ.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ເປີເຊັນສ່ວນລົດສາມາດນໍາໃຊ້ບໍ່ວ່າຈະຕໍ່ລາຄາຫຼືສໍາລັບລາຄາທັງຫມົດ.
 DocType: Purchase Invoice,Half-yearly,ເຄິ່ງຫນຶ່ງຂອງການປະຈໍາປີ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Entry ບັນຊີສໍາລັບ Stock
 DocType: Vehicle Service,Engine Oil,ນ້ໍາມັນເຄື່ອງຈັກ
 DocType: Sales Invoice,Sales Team1,Team1 ຂາຍ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ລາຍການ {0} ບໍ່ມີ
 DocType: Sales Invoice,Customer Address,ທີ່ຢູ່ຂອງລູກຄ້າ
 DocType: Employee Loan,Loan Details,ລາຍລະອຽດການກູ້ຢືມເງິນ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ສໍາເລັດຈໍານວນຕ້ອງໄດ້ຫຼາຍກ່ວາສູນ.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,ປະເພດຮາກ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},"ຕິດຕໍ່ກັນ, {0}: ບໍ່ສາມາດກັບຄືນຫຼາຍກ່ວາ {1} ສໍາລັບລາຍການ {2}"
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ຕອນດິນຂອງຕົນ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,ຕອນດິນຂອງຕົນ
 DocType: Item Group,Show this slideshow at the top of the page,ສະແດງໃຫ້ເຫັນ slideshow ນີ້ຢູ່ສົ້ນເທິງຂອງຫນ້າ
 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}
 DocType: Cheque Print Template,Primary Settings,ການຕັ້ງຄ່າປະຖົມ
 DocType: Purchase Invoice,Select Supplier Address,ເລືອກທີ່ຢູ່ຜູ້ຜະລິດ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ຕື່ມການພະນັກງານ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ຕື່ມການພະນັກງານ
 DocType: Purchase Invoice Item,Quality Inspection,ກວດສອບຄຸນະພາບ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,ພິເສດຂະຫນາດນ້ອຍ
 DocType: Company,Standard Template,ແມ່ແບບມາດຕະຖານ
 DocType: Training Event,Theory,ທິດສະດີ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,ການເຕືອນໄພ: ວັດສະດຸຂໍຈໍານວນແມ່ນຫນ້ອຍກ່ວາສັ່ງຊື້ຂັ້ນຕ່ໍາຈໍານວນ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ບັນຊີ {0} ແມ່ນ frozen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,ນິຕິບຸກຄົນ / ບໍລິສັດຍ່ອຍທີ່ມີໃນຕາຕະລາງທີ່ແຍກຕ່າງຫາກຂອງບັນຊີເປັນອົງການຈັດຕັ້ງ.
 DocType: Payment Request,Mute Email,mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ສະບຽງອາຫານ, ເຄື່ອງດື່ມແລະຢາສູບ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},ພຽງແຕ່ສາມາດເຮັດໃຫ້ຊໍາລະເງິນກັບຍັງບໍ່ເອີ້ນເກັບ {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ອັດຕາການຄະນະກໍາມະບໍ່ສາມາດຈະຫຼາຍກ່ວາ 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,ກະລຸນາໃສ່ {0} ທໍາອິດ
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ຄັງສິນຄ້າກັບການຊື້ຂາຍທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ.
 DocType: Assessment Result Tool,Result HTML,ຜົນ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ທີ່ຫມົດອາຍຸ
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ຕື່ມການນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ຕື່ມການນັກສຶກສາ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},ກະລຸນາເລືອກ {0}
 DocType: C-Form,C-Form No,C ແບບຟອມ No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ເລືອກປີງົບປະມານ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ລະດັບລໍາດັບ
 DocType: Company,Chart Of Accounts Template,ຕາຕະລາງຂອງບັນຊີແມ່ແບບ
 DocType: Attendance,Attendance Date,ວັນທີ່ສະຫມັກຜູ້ເຂົ້າຮ່ວມ
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ເຂົ້າຊ້ໍາກັນ
 DocType: Program Enrollment Tool,Get Students,ໄດ້ຮັບນັກສຶກສາ
 DocType: Serial No,Under Warranty,ພາຍໃຕ້ການຮັບປະກັນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ຂາຍ]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ຂາຍ]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດໃບສັ່ງຂາຍ.
 ,Employee Birthday,ພະນັກງານວັນເດືອນປີເກີດ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ນັກສຶກສາເຄື່ອງມືການເຂົ້າຮ່ວມກຸ່ມ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ຂອບເຂດຈໍາກັດອົງການກາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ການຮ່ວມລົງທຶນ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ເປັນໄລຍະທາງວິຊາການກັບນີ້ປີທາງວິຊາການ &#39;{0} ແລະ&#39; ໄລຍະຊື່ &#39;{1} ມີຢູ່ແລ້ວ. ກະລຸນາປັບປຸງແກ້ໄຂການອອກສຽງເຫຼົ່ານີ້ແລະພະຍາຍາມອີກເທື່ອຫນຶ່ງ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ເນື່ອງຈາກວ່າມີທຸລະກໍາທີ່ມີຢູ່ແລ້ວຕໍ່ item {0}, ທ່ານບໍ່ສາມາດມີການປ່ຽນແປງມູນຄ່າຂອງ {1}"
 DocType: UOM,Must be Whole Number,ຕ້ອງເປັນຈໍານວນທັງຫມົດ
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ໃບໃຫມ່ຈັດສັນ (ໃນວັນ)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} ບໍ່ມີ
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% ຂອງອຸປະກອນການບິນຕໍ່ຂາຍສິນຄ້ານີ້
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Entry ໄລຍະເວລາປິດ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສກຸ່ມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},ຈໍານວນ {0} {1} {2} {3}
 DocType: Account,Depreciation,ຄ່າເສື່ອມລາຄາ
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ຜູ້ສະຫນອງ (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ເຄື່ອງມືການເຂົ້າຮ່ວມຂອງພະນັກງານ
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,ວັນສຸດທ້າຍຂອງເດືອນຖັດໄປ
 DocType: Support Settings,Auto close Issue after 7 days,Auto ໃກ້ Issue ພາຍໃນ 7 ມື້
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ອອກຈາກບໍ່ສາມາດໄດ້ຮັບການຈັດສັນກ່ອນ {0}, ເປັນການດຸ່ນດ່ຽງອອກໄດ້ແລ້ວປະຕິບັດ, ສົ່ງໃນການບັນທຶກການຈັດສັນອອກໃນອະນາຄົດ {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),ຫມາຍເຫດ: ເນື່ອງຈາກ / ວັນທີ່ເອກະສານຫຼາຍກວ່າວັນການປ່ອຍສິນເຊື່ອຂອງລູກຄ້າອະນຸຍາດໃຫ້ໂດຍ {0} ວັນ (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ສະຫມັກນັກສຶກສາ
 DocType: Asset Category Account,Accumulated Depreciation Account,ບັນຊີຄ່າເສື່ອມລາຄາສະສົມ
 DocType: Stock Settings,Freeze Stock Entries,Freeze Entries Stock
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,ການວິເຄາະຫຼັກຊັບ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ການດໍາເນີນງານບໍ່ສາມາດໄດ້ຮັບການປະໄວ້ເປົ່າ
 DocType: Maintenance Visit Purpose,Against Document Detail No,ຕໍ່ຂໍ້ມູນເອກະສານທີ່ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,ປະເພດບຸກຄົນທີ່ບັງຄັບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,ປະເພດບຸກຄົນທີ່ບັງຄັບ
 DocType: Quality Inspection,Outgoing,ລາຍຈ່າຍ
 DocType: Material Request,Requested For,ຕ້ອງການສໍາລັບ
 DocType: Quotation Item,Against Doctype,ຕໍ່ DOCTYPE
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,ລະຫັດສິນຄ້າ
 DocType: Production Planning Tool,Create Production Orders,ສ້າງໃບສັ່ງຜະລິດ
 DocType: Serial No,Warranty / AMC Details,ການຮັບປະກັນ / ລາຍລະອຽດ AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ເລືອກນັກສຶກສາດ້ວຍຕົນເອງສໍາລັບກຸ່ມບໍລິສັດກິດຈະກໍາຕາມ
 DocType: Journal Entry,User Remark,User ຂໍ້ສັງເກດ
 DocType: Lead,Market Segment,ສ່ວນຕະຫຼາດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ການຊໍາລະເງິນຈໍານວນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດປະລິມານທີ່ຍັງຄ້າງຄາໃນທາງລົບ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ພະນັກງານປະຫວັດການເຮັດພາຍໃນປະເທດ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ປິດ (Dr)
 DocType: Cheque Print Template,Cheque Size,ຂະຫນາດກະແສລາຍວັນ
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,ສ້າງການຮ້ອງຂໍການວັດສະດຸ
 DocType: Employee Education,School/University,ໂຮງຮຽນ / ວິທະຍາໄລ
 DocType: Payment Request,Reference Details,ລາຍລະອຽດກະສານອ້າງອີງ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ມູນຄ່າຄາດວ່າຫຼັງຈາກຊີວິດທີ່ເປັນປະໂຫຍດຕ້ອງຫນ້ອຍກ່ວາລວມຍອດການຊື້ຈໍານວນ
 DocType: Sales Invoice Item,Available Qty at Warehouse,ມີຈໍານວນຢູ່ໃນສາງ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ຈໍານວນເງິນເກັບ
 DocType: Asset,Double Declining Balance,ດຸນຫລຸດ Double
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ບັນຊີທີ່ແຕກຕ່າງກັນຈະຕ້ອງບັນຊີປະເພດຊັບສິນ / ຫນີ້ສິນ, ນັບຕັ້ງແຕ່ນີ້ Stock Reconciliation ເປັນ Entry ເປີດ"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ຈ່າຍຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາເງິນກູ້ຈໍານວນ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ຊື້ຈໍານວນຄໍາສັ່ງທີ່ຕ້ອງການສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ຜະລິດພັນທີ່ບໍ່ໄດ້ສ້າງ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ຈາກວັນທີ່ສະຫມັກ&#39; ຈະຕ້ອງຫລັງຈາກທີ່ໄປວັນ &#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ບໍ່ສາມາດມີການປ່ຽນແປງສະຖານະພາບເປັນນັກສຶກສາ {0} ແມ່ນການເຊື່ອມຕໍ່ກັບຄໍາຮ້ອງສະຫມັກນັກສຶກສາ {1}
 DocType: Asset,Fully Depreciated,ຄ່າເສື່ອມລາຄາຢ່າງເຕັມສ່ວນ
 ,Stock Projected Qty,Stock ປະມານການຈໍານວນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ລູກຄ້າ {0} ບໍ່ໄດ້ຂຶ້ນກັບໂຄງການ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມ HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ການຊື້ຂາຍແມ່ນການສະເຫນີ, ສະເຫນີລາຄາທີ່ທ່ານໄດ້ຖືກສົ່ງໄປໃຫ້ກັບລູກຄ້າຂອງທ່ານ"
 DocType: Sales Order,Customer's Purchase Order,ການສັ່ງຊື້ຂອງລູກຄ້າ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ບໍ່ມີ Serial ແລະ Batch
 DocType: Warranty Claim,From Company,ຈາກບໍລິສັດ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ຜົນບວກຂອງຄະແນນຂອງເງື່ອນໄຂການປະເມີນຜົນທີ່ຕ້ອງການຈະ {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ກະລຸນາທີ່ກໍານົດໄວ້ຈໍານວນຂອງການອ່ອນຄ່າຈອງ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ມູນຄ່າຫຼືຈໍານວນ
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາສໍາລັບການ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ນາທີ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,ຄັງສິນຄ້າທັງຫມົດ
 DocType: Sales Partner,Retailer,ທຸລະກິດ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,ການປ່ອຍສິນເຊື່ອການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ທຸກປະເພດຜະລິດ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ທຸກປະເພດຜະລິດ
 DocType: Global Defaults,Disable In Words,ປິດການໃຊ້ງານໃນຄໍາສັບຕ່າງໆ
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,ລະຫັດສິນຄ້າເປັນການບັງຄັບເນື່ອງຈາກວ່າລາຍການບໍ່ໄດ້ນັບຈໍານວນອັດຕະໂນມັດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},ສະເຫນີລາຄາ {0} ບໍ່ປະເພດ {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,ຈັດງານ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ທະນາຄານບັນຊີເບີກເກີນບັນຊີ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ເຮັດໃຫ້ຄວາມຜິດພາດພຽງເງິນເດືອນ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ແຖວ # {0}: ຈັດສັນຈໍານວນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາປະລິມານທີ່ຍັງຄ້າງຄາ.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,ກູ້ໄພ
 DocType: Purchase Invoice,Edit Posting Date and Time,ແກ້ໄຂວັນທີ່ປະກາດແລະເວລາ
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ບໍ່ອະນຸຍາດໃຫ້ປັບປຸງການເຮັດທຸລະຫຸ້ນອາຍຸຫຼາຍກວ່າ {0}
 DocType: Purchase Invoice Item,PR Detail,ຂໍ້ມູນ PR
 DocType: Sales Order,Fully Billed,ບິນໄດ້ຢ່າງເຕັມສ່ວນ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ກະລຸນາທີ່ກໍານົດໄວ້ໃນບັນຊີທີ່ຕ້ອງຈ່າຍໃນຕອນຕົ້ນໃນພະນັກງານ {0}
 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 +127,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),ນ້ໍາລວມທັງຫມົດຂອງຊຸດການ. ປົກກະຕິແລ້ວນ້ໍາຫນັກສຸດທິ + ຫຸ້ມຫໍ່ນ້ໍາອຸປະກອນການ. (ສໍາລັບການພິມ)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Group Based On
 DocType: Journal Entry,Bill Date,ບັນຊີລາຍການວັນທີ່
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","ບໍລິການສິນຄ້າ, ປະເພດ, ຄວາມຖີ່ແລະປະລິມານຄ່າໃຊ້ຈ່າຍຖືກກໍານົດ"
-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:","ເຖິງແມ່ນວ່າຖ້າຫາກວ່າບໍ່ມີກົດລະບຽບການຕັ້ງລາຄາດ້ວຍບູລິມະສິດທີ່ສູງທີ່ສຸດ, ຫຼັງຈາກນັ້ນປະຕິບັດຕາມບູລິມະສິດພາຍໃນໄດ້ຖືກນໍາໃຊ້:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ເຖິງແມ່ນວ່າຖ້າຫາກວ່າບໍ່ມີກົດລະບຽບການຕັ້ງລາຄາດ້ວຍບູລິມະສິດທີ່ສູງທີ່ສຸດ, ຫຼັງຈາກນັ້ນປະຕິບັດຕາມບູລິມະສິດພາຍໃນໄດ້ຖືກນໍາໃຊ້:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},ເຮັດແນວໃດທ່ານຕ້ອງການທີ່ຈະຍື່ນສະເຫນີການທັງຫມົດ Slip ເງິນເດືອນຈາກ {0} ກັບ {1}
 DocType: Cheque Print Template,Cheque Height,ກະແສລາຍວັນສູງ
 DocType: Supplier,Supplier Details,ລາຍລະອຽດສະຫນອງ
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref ໃບເກັບເງິນ
 DocType: Purchase Order,Recurring Order,Order Recurring
 DocType: Company,Default Income Account,ບັນຊີມາດຕະຖານລາຍໄດ້
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ກຸ່ມລູກຄ້າ / ລູກຄ້າ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ກຸ່ມລູກຄ້າ / ລູກຄ້າ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),unclosed ປີງົບປະມານກໍາໄຮ / ການສູນເສຍ (Credit)
 DocType: Sales Invoice,Time Sheets,ແຜ່ນທີ່ໃຊ້ເວລາ
 DocType: Payment Gateway Account,Default Payment Request Message,ມາດຕະຖານຄໍາຂໍຊໍາລະຂໍ້ຄວາມ
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,ວົງຢືມຂໍ້ຄວາມ
 DocType: Employee Loan,Employee Loan Application,ຄໍາຮ້ອງສະຫມັກເງິນກູ້ພະນັກງານ
 DocType: Issue,Opening Date,ວັນທີ່ສະຫມັກເປີດ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,ຜູ້ເຂົ້າຮ່ວມໄດ້ຮັບການຫມາຍຢ່າງສໍາເລັດຜົນ.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,ຜູ້ເຂົ້າຮ່ວມໄດ້ຮັບການຫມາຍຢ່າງສໍາເລັດຜົນ.
 DocType: Journal Entry,Remark,ຂໍ້ສັງເກດ
 DocType: Purchase Receipt Item,Rate and Amount,ອັດຕາການແລະຈໍານວນເງິນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ປະເພດບັນຊີສໍາລັບ {0} ຕ້ອງ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ປະເພດບັນຊີສໍາລັບ {0} ຕ້ອງ {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ໃບແລະພັກຜ່ອນ
 DocType: School Settings,Current Academic Term,ໄລຍະວິຊາການໃນປະຈຸບັນ
 DocType: School Settings,Current Academic Term,ໄລຍະວິຊາການໃນປະຈຸບັນ
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ກຸ່ມນັກສຶກສາ
 DocType: Shopping Cart Settings,Quotation Series,ວົງຢືມ Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ລາຍການລາຄາທີ່ມີຊື່ດຽວກັນ ({0}), ກະລຸນາມີການປ່ຽນແປງຊື່ກຸ່ມສິນຄ້າຫລືປ່ຽນຊື່ລາຍການ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,ກະລຸນາເລືອກລູກຄ້າ
 DocType: C-Form,I,ຂ້າພະເຈົ້າ
 DocType: Company,Asset Depreciation Cost Center,Asset Center ຄ່າເສື່ອມລາຄາຄ່າໃຊ້ຈ່າຍ
 DocType: Sales Order Item,Sales Order Date,ວັນທີ່ສະຫມັກໃບສັ່ງຂາຍ
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,ລາຍລະອຽດການປະກັນໄພ
 DocType: Account,Payable,ຈ່າຍ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ກະລຸນາໃສ່ໄລຍະເວລາຊໍາລະຄືນ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ລູກຫນີ້ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ລູກຫນີ້ ({0})
 DocType: Pricing Rule,Margin,margin
 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 +76,Gross Profit %,ກໍາໄຮ% Gross
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ວັນເກັບກູ້ລະເບີດ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ການຊື້ທັງຫມົດເປັນການບັງຄັບ
 DocType: Lead,Address Desc,ທີ່ຢູ່ Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ພັກເປັນການບັງຄັບ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,ພັກເປັນການບັງຄັບ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ຊື່ກະທູ້
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,atleast ຫນຶ່ງຂອງການຂາຍຫຼືຊື້ຕ້ອງໄດ້ຮັບການຄັດເລືອກ
-DocType: Grading Structure,Grade Intervals,ໄລຍະການຮຽນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ເລືອກລັກສະນະຂອງທຸລະກິດຂອງທ່ານ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},ແຖວ # {0}: ຊ້ໍາເຂົ້າໃນການອ້າງອິງ {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ບ່ອນທີ່ການດໍາເນີນງານການຜະລິດກໍາລັງດໍາເນີນ.
 DocType: Asset Movement,Source Warehouse,Warehouse Source
 DocType: Installation Note,Installation Date,ວັນທີ່ສະຫມັກການຕິດຕັ້ງ
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ຫົວຫນ້າຈົດຫມາຍສະບັບສໍາລັບການພິມແມ່ແບບ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ຫົວຂໍ້ສໍາລັບແມ່ແບບພິມເຊັ່ນ Proforma Invoice.
 DocType: Student Guardian,Student Guardian,ຜູ້ປົກຄອງນັກສຶກສາ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,ຄ່າບໍລິການປະເພດການປະເມີນຄ່າບໍ່ສາມາດເຮັດເຄື່ອງຫມາຍເປັນ 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 ທີ່ແຕກຕ່າງກັນສໍາລັບລາຍການທີ່ຈະນໍາໄປສູ່ການທີ່ບໍ່ຖືກຕ້ອງ (Total) ຄ່ານ້ໍາຫນັກສຸດທິ. ໃຫ້ແນ່ໃຈວ່ານ້ໍາຫນັກສຸດທິຂອງແຕ່ລະລາຍການແມ່ນຢູ່ໃນ UOM ດຽວກັນ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM ອັດຕາ
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,ແລກປ່ຽນກໍາໄຮ / ບັນຊີການສູນເສຍ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ພະນັກງານແລະຜູ້ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ຈຸດປະສົງຕ້ອງເປັນຫນຶ່ງໃນ {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ຕື່ມຂໍ້ມູນໃສ່ໃນແບບຟອມແລະຊ່ວຍປະຢັດມັນ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Forum ຊຸມຊົນ
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,ຈໍານວນທີ່ແທ້ຈິງໃນຫຸ້ນ
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ລໍາດັບຈໍານວນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ເປີດຮັບສະຫມັກໃນປະຈຸບັນ
 DocType: Company,Stock Adjustment Account,ບັນຊີການປັບ Stock
-DocType: Journal Entry,Write Off,ຂຽນ Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ຂຽນ Off
 DocType: Timesheet Detail,Operation ID,ການດໍາເນີນງານ ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","ຜູ້ໃຊ້ລະບົບ (ເຂົ້າສູ່ລະບົບ) ID. ຖ້າຫາກວ່າກໍານົດໄວ້, ມັນຈະກາຍເປັນມາດຕະຖານສໍາລັບຮູບແບບ HR ທັງຫມົດ."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: ຈາກ {1}
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ຜູ້ຈັດຈໍາຫນ່າຍໃຫ້ກັບລູກຄ້າ
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (ແບບຟອມ # / Item / {0}) ເປັນ out of stock
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,ວັນຖັດໄປຈະຕ້ອງຫຼາຍກ່ວາປະກາດວັນທີ່
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,"ສະແດງໃຫ້ເຫັນອາການພັກຜ່ອນ, ເຖິງ"
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ກໍາຫນົດ / Reference ບໍ່ສາມາດໄດ້ຮັບຫຼັງຈາກ {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ນໍາເຂົ້າຂໍ້ມູນແລະສົ່ງອອກ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock ມີຕໍ່ Warehouse {0}, ເພາະສະນັ້ນທ່ານບໍ່ສາມາດມີການກໍາຫນົດຫຼືປັບປຸງແກ້ໄຂມັນ"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ບໍ່ພົບຂໍ້ມູນນັກສຶກສາ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ບໍ່ພົບຂໍ້ມູນນັກສຶກສາ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ໃບເກັບເງິນວັນທີ່ປະກາດ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,ຂາຍ
 DocType: Sales Invoice,Rounded Total,ກົມທັງຫມົດ
 DocType: Product Bundle,List items that form the package.,ລາຍການບັນຊີລາຍການທີ່ປະກອບເປັນຊຸດຂອງ.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ອັດຕາສ່ວນການຈັດສັນຄວນຈະເທົ່າກັບ 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,ກະລຸນາເລືອກວັນທີ່ປະກາດກ່ອນທີ່ຈະເລືອກພັກ
 DocType: Program Enrollment,School House,ໂຮງຮຽນບ້ານ
 DocType: Serial No,Out of AMC,ອອກຈາກ AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ກະລຸນາເລືອກແນວໂນ້ມ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ຈໍານວນຂອງການອ່ອນຄ່າຈອງບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນທັງຫມົດຂອງຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ເຮັດໃຫ້ບໍາລຸງຮັກສາ Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ກະລຸນາຕິດຕໍ່ກັບຜູ້ໃຊ້ທີ່ມີການຂາຍລິນຍາໂທ Manager {0} ພາລະບົດບາດ
 DocType: Company,Default Cash Account,ມາດຕະຖານບັນຊີເງິນສົດ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ບໍລິສັດ (ໄດ້ລູກຄ້າຫລືຜູ້ຜະລິດ) ຕົ້ນສະບັບ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງນັກສຶກສານີ້
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No ນັກສຶກສາໃນ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ເພີ່ມລາຍການເພີ່ມເຕີມຫຼືເຕັມຮູບແບບເປີດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',ກະລຸນາໃສ່ &#39;ວັນທີຄາດວ່າສົ່ງ&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ການຈັດສົ່ງ {0} ຕ້ອງໄດ້ຮັບການຍົກເລີກກ່ອນການຍົກເລີກການຂາຍສິນຄ້ານີ້
@@ -3237,6 +3241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ຂໍ້ 3
 DocType: Purchase Order,Customer Contact Email,ລູກຄ້າຕິດຕໍ່ Email
 DocType: Warranty Claim,Item and Warranty Details,ລາຍການແລະການຮັບປະກັນລາຍລະອຽດ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ລະຫັດສິນຄ້າ&gt; ກຸ່ມສິນຄ້າ&gt; ຍີ່ຫໍ້
 DocType: Sales Team,Contribution (%),ການປະກອບສ່ວນ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,ຫມາຍເຫດ: ແບບການຊໍາລະເງິນຈະບໍ່ໄດ້ຮັບການສ້າງຂຶ້ນຕັ້ງແຕ່ &#39;ເງິນສົດຫຼືບັນຊີທະນາຄານບໍ່ໄດ້ລະບຸ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,ເລືອກໂຄງການທີ່ຈະດຶງຂໍ້ມູນຫລັກສູດການບັງຄັບ.
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ກ່ອນທີ່ຈະ reconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ເພື່ອ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ພາສີອາກອນແລະຄ່າບໍລິການເພີ່ມ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row ພາສີລາຍ {0} ຕ້ອງມີບັນຊີຂອງສ່ວຍສາອາກອນປະເພດຫຼືລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍຫຼື Chargeable
 DocType: Sales Order,Partly Billed,ບິນສ່ວນຫນຶ່ງແມ່ນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ລາຍການ {0} ຈະຕ້ອງເປັນລາຍການຊັບສິນຄົງທີ່
 DocType: Item,Default BOM,ມາດຕະຖານ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,ກະລຸນາປະເພດຊື່ບໍລິສັດຢືນຢັນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,ທັງຫມົດ Amt ເດັ່ນ
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ຍານຍົນ
 DocType: Vehicle,Insurance Company,ບໍລິສັດປະກັນໄພ
 DocType: Asset Category Account,Fixed Asset Account,ບັນຊີຊັບສົມບັດຄົງ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ການປ່ຽນແປງ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ຈາກການສົ່ງເງິນ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ການປ່ຽນແປງ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ຈາກການສົ່ງເງິນ
 DocType: Student,Student Email Address,ທີ່ຢູ່ອີເມວຂອງນັກຮຽນ
 DocType: Timesheet Detail,From Time,ຈາກທີ່ໃຊ້ເວລາ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ໃນສາງ:
@@ -3277,12 +3282,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ລາຄາອັດຕາແລກປ່ຽນບັນຊີ
 DocType: Purchase Invoice Item,Rate,ອັດຕາການ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ລິງທີ່ກ່ຽວຂ້ອງ
 DocType: Stock Entry,From BOM,ຈາກ BOM
 DocType: Assessment Code,Assessment Code,ລະຫັດການປະເມີນຜົນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ພື້ນຖານ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ເຮັດທຸລະກໍາຫຼັກຊັບກ່ອນ {0} ໄດ້ຖືກ frozen
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',ກະລຸນາຄລິກໃສ່ &quot;ສ້າງຕາຕະລາງ&quot;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ຕົວຢ່າງ Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ກະສານອ້າງອີງທີ່ບໍ່ມີແມ່ນການບັງຄັບຖ້າຫາກວ່າທ່ານເຂົ້າໄປວັນກະສານອ້າງອີງ
 DocType: Bank Reconciliation Detail,Payment Document,ເອກະສານການຊໍາລະເງິນ
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,ໂຄງສ້າງເງິນເດືອນ
 DocType: Account,Bank,ທະນາຄານ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ສາຍການບິນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ວັດສະດຸບັນຫາ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ວັດສະດຸບັນຫາ
 DocType: Material Request Item,For Warehouse,ສໍາລັບການຄັງສິນຄ້າ
 DocType: Employee,Offer Date,ວັນທີ່ສະຫມັກສະເຫນີ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ການຊື້ຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,ທ່ານຢູ່ໃນຮູບແບບອອຟໄລ. ທ່ານຈະບໍ່ສາມາດທີ່ຈະໂຫລດຈົນກ່ວາທ່ານມີເຄືອຂ່າຍ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ບໍ່ມີກຸ່ມນັກສຶກສາສ້າງຕັ້ງຂື້ນ.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ຈໍານວນເງິນຊໍາລະຄືນປະຈໍາເດືອນບໍ່ສາມາດຈະຫຼາຍກ່ວາຈໍານວນເງິນກູ້
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,ກະລຸນາໃສ່ລາຍລະອຽດ Maintaince ທໍາອິດ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,ກະລຸນາໃສ່ລາຍລະອຽດ Maintaince ທໍາອິດ
 DocType: Purchase Invoice,Print Language,ພິມພາສາ
 DocType: Salary Slip,Total Working Hours,ທັງຫມົດຊົ່ວໂມງເຮັດວຽກ
 DocType: Stock Entry,Including items for sub assemblies,ລວມທັງລາຍການສໍາລັບການສະພາແຫ່ງຍ່ອຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,ມູນຄ່າໃສ່ຈະຕ້ອງໃນທາງບວກ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ອານາເຂດທັງຫມົດ
 DocType: Purchase Invoice,Items,ລາຍການ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ນັກສຶກສາແມ່ນໄດ້ລົງທະບຽນແລ້ວ.
@@ -3322,17 +3327,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ມາດຕະຖານຫນ່ວຍງານຂອງມາດຕະການ Variant &#39;{0}&#39; ຈະຕ້ອງເຊັ່ນດຽວກັນກັບໃນແມ່ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ຄິດໄລ່ພື້ນຖານກ່ຽວກັບ
 DocType: Delivery Note Item,From Warehouse,ຈາກ Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,ບໍ່ມີສິນຄ້າທີ່ມີບັນຊີລາຍການຂອງວັດສະດຸໃນການຜະລິດ
 DocType: Assessment Plan,Supervisor Name,ຊື່ Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
 DocType: Program Enrollment Course,Program Enrollment Course,ຂອງລາຍວິຊາການເຂົ້າໂຮງຮຽນໂຄງການ
-DocType: Grading Structure,Grading Structure,ໂຄງປະກອບການຈັດລໍາດັບ
 DocType: Purchase Taxes and Charges,Valuation and Total,ປະເມີນມູນຄ່າແລະຈໍານວນ
 DocType: Tax Rule,Shipping City,Shipping City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,ລາຍການນີ້ແມ່ນແຕກຕ່າງຈາກ {0} (Template). ຄຸນລັກສະນະຈະໄດ້ຮັບການຄັດລອກໄປຈາກແມ່ເວັ້ນເສຍແຕ່ວ່າ &#39;ບໍ່ມີສໍາເນົາ&#39; ໄດ້ຖືກກໍານົດ
 DocType: Notification Control,Customize the Notification,ປັບແຈ້ງການ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ກະແສເງິນສົດຈາກການດໍາເນີນວຽກ
 DocType: Sales Invoice,Shipping Rule,ກົດລະບຽບການຂົນສົ່ງ
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},ບໍ່ມີມາດຕະຖານ BOM ຢູ່ສໍາລັບລາຍການ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,ກະລຸນາເລືອກວັນທີ່ປະກາດຄັ້ງທໍາອິດ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,ເປີດວັນທີ່ຄວນເປັນກ່ອນທີ່ຈະປິດວັນທີ່
 DocType: Leave Control Panel,Carry Forward,ປະຕິບັດໄປຂ້າງຫນ້າ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ສູນຕົ້ນທຶນກັບທຸລະກໍາທີ່ມີຢູ່ແລ້ວບໍ່ສາມາດປ່ຽນໃຈເຫລື້ອມໃສຊີແຍກປະເພດ
 DocType: Department,Days for which Holidays are blocked for this department.,ວັນທີ່ວັນພັກແມ່ນຖືກສະກັດສໍາລັບພະແນກນີ້.
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ຄັດຕິດຈົດຫມາຍ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ການສື່ສານທີ່ຜ່ານມາ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,ການສື່ສານທີ່ຜ່ານມາ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;ການປະເມີນຄ່າແລະທັງຫມົດ&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;ການປະເມີນຄ່າແລະທັງຫມົດ&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},Serial Nos ຕ້ອງການສໍາລັບລາຍການຕໍ່ເນື່ອງ {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ການຊໍາລະເງິນກົງກັບໃບແຈ້ງຫນີ້
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ທັງຫມົດ (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ຄວາມບັນເທີງແລະສັນທະນາການ
 DocType: Quality Inspection,Item Serial No,ລາຍການບໍ່ມີ Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ສ້າງການບັນທຶກຂອງພະນັກວຽກ
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ສ້າງການບັນທຶກຂອງພະນັກວຽກ
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ປັດຈຸບັນທັງຫມົດ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,ການບັນຊີ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ຊົ່ວໂມງ
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,ບໍ່ຮູ້ຈັກ
 DocType: Shipping Rule,Shipping Rule Conditions,ເງື່ອນໄຂການຂົນສົ່ງ
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM ໃຫມ່ຫຼັງຈາກທົດແທນ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ຈຸດຂອງການຂາຍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,ຈຸດຂອງການຂາຍ
 DocType: Payment Entry,Received Amount,ຈໍານວນເງິນທີ່ໄດ້ຮັບ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ກະລຸນາຕິດຕັ້ງພະນັກງານແຜນການຕັ້ງຊື່ System ໃນຊັບພະຍາກອນມະນຸດ&gt; Settings HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ສ້າງສໍາລັບປະລິມານຢ່າງເຕັມທີ່, ບໍ່ສົນໃຈປະລິມານແລ້ວກ່ຽວກັບຄໍາສັ່ງ"
 DocType: Account,Tax,ພາສີ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ບໍ່ໄດ້ຫມາຍ
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,ແຫຼ່ງຂໍ້ມູນຊື່ Document
 DocType: Batch,Source Document Name,ແຫຼ່ງຂໍ້ມູນຊື່ Document
 DocType: Job Opening,Job Title,ຕໍາແຫນ່ງ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ສ້າງຜູ້ໃຊ້
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ສ້າງຜູ້ໃຊ້
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ກໍາ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ປະລິມານການຜະລິດຕ້ອງໄດ້ຫຼາຍກ່ວາ 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ໄປຢ້ຽມຢາມບົດລາຍງານສໍາລັບການໂທບໍາລຸງຮັກສາ.
 DocType: Stock Entry,Update Rate and Availability,ການປັບປຸງອັດຕາແລະຈໍາຫນ່າຍ
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ອັດຕາສ່ວນທີ່ທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບຫຼືໃຫ້ຫຼາຍຕໍ່ກັບປະລິມານຂອງຄໍາສັ່ງ. ສໍາລັບການຍົກຕົວຢ່າງ: ຖ້າຫາກວ່າທ່ານມີຄໍາສັ່ງ 100 ຫົວຫນ່ວຍ. ແລະອະນຸຍາດຂອງທ່ານແມ່ນ 10% ຫຼັງຈາກນັ້ນທ່ານກໍາລັງອະນຸຍາດໃຫ້ໄດ້ຮັບ 110 ຫົວຫນ່ວຍ.
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ບັນຊີຄ່າໃຊ້ຈ່າຍເປັນການບັງຄັບສໍາລັບ item {0}
 DocType: BOM,Website Description,ລາຍລະອຽດເວັບໄຊທ໌
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ການປ່ຽນແປງສຸດທິໃນການລົງທຶນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ກະລຸນາຍົກເລີກການຊື້ Invoice {0} ທໍາອິດ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ທີ່ຢູ່ອີເມວຈະຕ້ອງເປັນເອກະລັກ, ລາຄາສໍາລັບ {0}"
 DocType: Serial No,AMC Expiry Date,AMC ຫມົດເຂດ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ຮັບ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ຮັບ
 ,Sales Register,ລົງທະບຽນການຂາຍ
 DocType: Daily Work Summary Settings Company,Send Emails At,ສົ່ງອີເມວໃນ
 DocType: Quotation,Quotation Lost Reason,ວົງຢືມລືມເຫດຜົນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,ເລືອກ Domain ຂອງທ່ານ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ກະສານອ້າງອີງການທີ່ບໍ່ມີ {0} ວັນ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ມີບໍ່ມີຫຍັງທີ່ຈະແກ້ໄຂແມ່ນ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ສະຫຼຸບສັງລວມສໍາລັບເດືອນນີ້ແລະກິດຈະກໍາທີ່ຍັງຄ້າງ
 DocType: Customer Group,Customer Group Name,ຊື່ກຸ່ມລູກຄ້າ
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No ລູກຄ້າທັນ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ຖະແຫຼງການກະແສເງິນສົດ
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ຈໍານວນເງິນກູ້ບໍ່ເກີນຈໍານວນເງິນກູ້ສູງສຸດຂອງ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ໃບອະນຸຍາດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},ກະລຸນາເອົາໃບເກັບເງິນນີ້ {0} ຈາກ C ແບບຟອມ {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,ກະລຸນາເລືອກປະຕິບັດຕໍ່ຖ້າຫາກວ່າທ່ານຍັງຕ້ອງການທີ່ຈະປະກອບມີຍອດເຫຼືອເດືອນກ່ອນປີງົບປະມານຂອງໃບປີງົບປະມານນີ້
 DocType: GL Entry,Against Voucher Type,ຕໍ່ຕ້ານປະເພດ Voucher
 DocType: Item,Attributes,ຄຸນລັກສະນະ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,ກະລຸນາໃສ່ການຕັດບັນຊີ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,ຄັ້ງສຸດທ້າຍວັນ Order
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ບັນຊີ {0} ບໍ່ໄດ້ເປັນບໍລິສັດ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,ຈໍານວນ serial ໃນແຖວ {0} ບໍ່ກົງກັບກັບການຈັດສົ່ງຫມາຍເຫດ
 DocType: Student,Guardian Details,ລາຍລະອຽດຜູ້ປົກຄອງ
 DocType: C-Form,C-Form,"C, ແບບຟອມການ"
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ເຄື່ອງຫມາຍຜູ້ເຂົ້າຮ່ວມສໍາລັບພະນັກງານທີ່ຫຼາກຫຼາຍ
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ຕິດຕໍ່ກັນ {0} # ບັນຊີຈະຕ້ອງການປະເພດ &#39;ສິນຊັບຖາວອນ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ອອກຈໍານວນ
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ກົດລະບຽບການຄິດໄລ່ຈໍານວນການຂົນສົ່ງສໍາລັບການຂາຍ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series ເປັນການບັງຄັບ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series ເປັນການບັງຄັບ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ການບໍລິການທາງດ້ານການເງິນ
 DocType: Student Sibling,Student ID,ID ນັກສຶກສາ
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ປະເພດຂອງກິດຈະກໍາສໍາລັບການທີ່ໃຊ້ເວລາບັນທຶກ
 DocType: Tax Rule,Sales,Sales
 DocType: Stock Entry Detail,Basic Amount,ຈໍານວນພື້ນຖານ
 DocType: Training Event,Exam,ການສອບເສັງ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Warehouse ຕ້ອງການສໍາລັບສິນຄ້າຫຼັກຊັບ {0}
 DocType: Leave Allocation,Unused leaves,ໃບທີ່ບໍ່ໄດ້ໃຊ້
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,State Billing
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ການຖ່າຍໂອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບບັນຊີພັກ {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ບໍ່ທີ່ກ່ຽວຂ້ອງກັບບັນຊີພັກ {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),ມາດດຶງຂໍ້ມູນລະເບີດ BOM (ລວມທັງອະນຸປະກອບ)
 DocType: Authorization Rule,Applicable To (Employee),ສາມາດນໍາໃຊ້ການ (ພະນັກງານ)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,ອັນເນື່ອງມາຈາກວັນທີ່ເປັນການບັງຄັບ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ເພີ່ມຂຶ້ນສໍາລັບຄຸນສົມບັດ {0} ບໍ່ສາມາດຈະເປັນ 0
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,ລູກຄ້າບໍ່ໄດ້ໃຊ້ວຽກ
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ລາຍໄດ້ຈາກການຊື້
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ວິທີການກົດລະບຽບລາຄາຖືກນໍາໃຊ້?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ວິທີການກົດລະບຽບລາຄາຖືກນໍາໃຊ້?
 DocType: Stock Entry,Delivery Note No,ການສົ່ງເງິນເຖິງບໍ່ມີ
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","ຖ້າຫາກວ່າການກວດກາ, ພຽງແຕ່ຊື້ການຮ້ອງຂໍອຸປະກອນການສໍາລັບອຸປະກອນການເປັນວັດຖຸດິບຂັ້ນສຸດທ້າຍຈະໄດ້ຮັບການມີຢູ່ໃນການຮ້ອງຂໍການວັດສະດຸ. ຖ້າບໍ່ດັ່ງນັ້ນ, ຄໍາຮ້ອງຂໍການວັດສະດຸສໍາລັບລາຍການພໍ່ແມ່ຈະໄດ້ຮັບການສ້າງ"
 DocType: Cheque Print Template,Message to show,ຂໍ້ຄວາມທີ່ຈະສະແດງໃຫ້ເຫັນ
 DocType: Company,Retail,ຂາຍຍ່ອຍ
 DocType: Attendance,Absent,ບໍ່
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle ຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle ຜະລິດຕະພັນ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ຕິດຕໍ່ກັນ {0}: ກະສານອ້າງອີງບໍ່ຖືກຕ້ອງ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ຊື້ພາສີອາກອນແລະຄ່າບໍລິການ Template
 DocType: Upload Attendance,Download Template,ດາວໂຫລດ Template
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,ບັນຊີຊໍາລະເງິນຈາກ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ວັດຖຸດິບລະຫັດສິນຄ້າ
 DocType: Journal Entry,Write Off Based On,ຂຽນ Off ຖານກ່ຽວກັບ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ເຮັດໃຫ້ຕະກົ່ວ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print ແລະເຄື່ອງຮັບໃຊ້ຫ້ອງ
 DocType: Stock Settings,Show Barcode Field,ສະແດງໃຫ້ເຫັນພາກສະຫນາມ Barcode
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ສົ່ງອີເມວ Supplier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ສົ່ງອີເມວ Supplier
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ເງິນເດືອນດໍາເນີນການສໍາລັບການໄລຍະເວລາລະຫວ່າງ {0} ແລະ {1}, ອອກຈາກໄລຍະເວລາຄໍາຮ້ອງສະຫມັກບໍ່ສາມາດຈະຢູ່ລະຫວ່າງລະດັບວັນທີນີ້."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ການບັນທຶກການຕິດຕັ້ງສໍາລັບການສະບັບເລກທີ Serial
 DocType: Guardian Interest,Guardian Interest,ຜູ້ປົກຄອງທີ່ຫນ້າສົນໃຈ
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,ລັງລໍຖ້າການຕອບໂຕ້
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ຂ້າງເທິງ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ເຫດຜົນທີ່ບໍ່ຖືກຕ້ອງ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ກ່າວເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີທີ່ຕ້ອງຈ່າຍ
 DocType: Salary Slip,Earning & Deduction,ທີ່ໄດ້ຮັບແລະການຫັກ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ຖ້າຕ້ອງການ. ການຕັ້ງຄ່ານີ້ຈະໄດ້ຮັບການນໍາໃຊ້ການກັ່ນຕອງໃນການຄ້າຂາຍຕ່າງໆ.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ອັດຕາການປະເມີນຄ່າທາງລົບບໍ່ໄດ້ຮັບອະນຸຍາດ
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,ການຜະລິດສິນຄ້າການສັ່ງຊື້
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,ບໍ່ພົບການບັນທຶກ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,ຄ່າໃຊ້ຈ່າຍຂອງສິນຊັບທະເລາະວິວາດ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred ບາງສ່ວນ
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ສູນຕົ້ນທຶນເປັນການບັງຄັບສໍາລັບລາຍການ {2}
 DocType: Vehicle,Policy No,ນະໂຍບາຍທີ່ບໍ່ມີ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ຮັບສິນຄ້າຈາກມັດດຽວກັນຜະລິດຕະພັນ
 DocType: Asset,Straight Line,Line ຊື່
 DocType: Project User,Project User,User ໂຄງການ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
@@ -3562,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,ໄດ້ຮັບນັກສຶກສາຈາກ
 DocType: Hub Settings,Seller Country,ຜູ້ຂາຍປະເທດ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ເຜີຍແຜ່ລາຍການກ່ຽວກັບເວັບໄຊທ໌
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ກຸ່ມນັກສຶກສາຂອງທ່ານໃນຂະບວນການ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ກຸ່ມນັກສຶກສາຂອງທ່ານໃນຂະບວນການ
 DocType: Authorization Rule,Authorization Rule,ກົດລະບຽບການອະນຸຍາດ
 DocType: Sales Invoice,Terms and Conditions Details,ຂໍ້ກໍານົດແລະເງື່ອນໄຂລາຍລະອຽດ
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ຂໍ້ມູນຈໍາເພາະ
@@ -3615,14 +3618,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ວັນທີ່ສະຫມັກ Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},ບັນຊີ {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ໄດ້ຂຶ້ນກັບບໍລິສັດ: {2}
 DocType: Program Enrollment Tool,Student Applicants,ສະຫມັກນັກສຶກສາ
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,ສົບຜົນສໍາເລັດການລຶບເຮັດທຸລະກໍາທັງຫມົດທີ່ກ່ຽວຂ້ອງກັບບໍລິສັດນີ້!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,ສົບຜົນສໍາເລັດການລຶບເຮັດທຸລະກໍາທັງຫມົດທີ່ກ່ຽວຂ້ອງກັບບໍລິສັດນີ້!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ໃນຖານະເປັນວັນທີ
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,ວັນທີ່ສະຫມັກການລົງທະບຽນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,ການທົດລອງ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ອົງປະກອບເງິນເດືອນ
 DocType: Program Enrollment Tool,New Academic Year,ປີທາງວິຊາການໃຫມ່
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,ໃສ່ອັດຕະໂນມັດອັດຕາລາຄາຖ້າຫາກວ່າຫາຍສາບສູນ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ຈໍານວນເງິນທີ່ຊໍາລະທັງຫມົດ
 DocType: Production Order Item,Transferred Qty,ການຍົກຍ້າຍຈໍານວນ
@@ -3642,7 +3645,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ປະເພດຂອງໃບເຊັ່ນ: ບາດເຈັບແລະ, ການເຈັບປ່ວຍແລະອື່ນໆ"
 DocType: Email Digest,Send regular summary reports via Email.,ສົ່ງບົດລາຍງານສະຫຼຸບສັງລວມເປັນປົກກະຕິໂດຍຜ່ານ Email.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},ກະລຸນາທີ່ກໍານົດໄວ້ບັນຊີມາດຕະຖານຢູ່ໃນປະເພດຄ່າໃຊ້ຈ່າຍການຮ້ອງຂໍ {0}
 DocType: Assessment Result,Student Name,ນາມສະກຸນ
 DocType: Brand,Item Manager,ການບໍລິຫານ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll Payable
@@ -3663,6 +3666,7 @@
 ,Sales Funnel,ຊ່ອງທາງການຂາຍ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ຊື່ຫຍໍ້ເປັນການບັງຄັບ
 DocType: Project,Task Progress,ຄວາມຄືບຫນ້າວຽກງານ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ໂຄງຮ່າງການ
 ,Qty to Transfer,ຈໍານວນການໂອນ
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ໃຫ້ຄໍາປຶກສາຈະນໍາໄປສູ່ຫຼືລູກຄ້າ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ພາລະບົດບາດອະນຸຍາດໃຫ້ແກ້ໄຂຫຸ້ນ frozen
@@ -3690,13 +3694,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ລາຍການຂໍ້ມູນພາສີສະຫລາດ
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ສະຖາບັນສະບັບຫຍໍ້
 ,Item-wise Price List Rate,ລາຍການສະຫລາດອັດຕາລາຄາ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quotation,In Words will be visible once you save the Quotation.,ໃນຄໍາສັບຕ່າງໆຈະສັງເກດເຫັນເມື່ອທ່ານຊ່ວຍປະຢັດການຊື້ຂາຍ.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ປະລິມານ ({0}) ບໍ່ສາມາດຈະສ່ວນໃນຕິດຕໍ່ກັນ {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ເກັບຄ່າທໍານຽມ
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} ນໍາໃຊ້ແລ້ວໃນ Item {1}
 DocType: Lead,Add to calendar on this date,ຕື່ມການກັບປະຕິທິນໃນວັນນີ້
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ກົດລະບຽບສໍາລັບການເພີ່ມຄ່າໃຊ້ຈ່າຍໃນການຂົນສົ່ງ.
 DocType: Item,Opening Stock,ເປີດ Stock
@@ -3713,8 +3717,8 @@
 Updated via 'Time Log'",ໃນນາທີ Updated ໂດຍຜ່ານການ &#39;ທີ່ໃຊ້ເວລາເຂົ້າ&#39;
 DocType: Customer,From Lead,ຈາກ Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ຄໍາສັ່ງປ່ອຍອອກມາເມື່ອສໍາລັບການຜະລິດ.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ເລືອກປີງົບປະມານ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ຂໍ້ມູນທີ່ຕ້ອງການເພື່ອເຮັດໃຫ້ POS Entry
 DocType: Program Enrollment Tool,Enroll Students,ລົງທະບຽນນັກສຶກສາ
 DocType: Hub Settings,Name Token,ຊື່ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ຂາຍມາດຕະຖານ
@@ -3725,7 +3729,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} ກັບການຂາຍທີ່ເຊັນ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ຊື່ໂຄງການ
-DocType: Supplier,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
+DocType: Customer,Mention if non-standard receivable account,ເວົ້າເຖິງຖ້າຫາກວ່າບໍ່ໄດ້ມາດຕະຖານບັນຊີລູກຫນີ້
 DocType: Journal Entry Account,If Income or Expense,ຖ້າຫາກລາຍໄດ້ຫຼືຄ່າໃຊ້ຈ່າຍ
 DocType: Production Order,Required Items,ລາຍການທີ່ກໍານົດໄວ້
 DocType: Stock Ledger Entry,Stock Value Difference,ຄວາມແຕກຕ່າງມູນຄ່າຫຼັກຊັບ
@@ -3746,7 +3750,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ກໍານົດເປົ້າຫມາຍສິນຄ້າກຸ່ມສະຫລາດນີ້ເປັນສ່ວນຕົວຂາຍ.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze ຫຸ້ນເກີນ [ວັນ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,"ຕິດຕໍ່ກັນ, {0}: ຊັບສິນເປັນການບັງຄັບສໍາລັບຊັບສິນຄົງທີ່ຊື້ / ຂາຍ"
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","ຖ້າຫາກວ່າທັງສອງຫຼືຫຼາຍກວ່າກົດລະບຽບລາຄາຖືກພົບເຫັນຢູ່ຕາມເງື່ອນໄຂຂ້າງເທິງນີ້, ບູລິມະສິດໄດ້ຖືກນໍາໃຊ້. ບູລິມະສິດເປັນຈໍານວນລະຫວ່າງ 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.,ອະນຸຍາດໃຫ້ຜູ້ຊົມໃຊ້ຕໍ່ໄປນີ້ເພື່ອອະນຸມັດຄໍາຮ້ອງສະຫມັກສໍາລັບໃບວັນຕັນ.
@@ -3772,7 +3776,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ລາຍການ {0} ລະເລີຍຕັ້ງແຕ່ມັນບໍ່ແມ່ນຫົວຂໍ້ຫຼັກຊັບ
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ບໍ່ໃຊ້ກົດລະບຽບການຕັ້ງລາຄາໃນການສະເພາະໃດຫນຶ່ງ, ກົດລະບຽບການຕັ້ງລາຄາສາມາດນໍາໃຊ້ທັງຫມົດທີ່ຄວນຈະໄດ້ຮັບການພິການ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ບໍ່ໃຊ້ກົດລະບຽບການຕັ້ງລາຄາໃນການສະເພາະໃດຫນຶ່ງ, ກົດລະບຽບການຕັ້ງລາຄາສາມາດນໍາໃຊ້ທັງຫມົດທີ່ຄວນຈະໄດ້ຮັບການພິການ."
 DocType: Assessment Group,Parent Assessment Group,ພໍ່ແມ່ກຸ່ມການປະເມີນຜົນ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ວຽກເຮັດງານທໍາ
 ,Sales Order Trends,Sales ແນວໂນ້ມຄໍາສັ່ງ
@@ -3783,7 +3787,7 @@
 DocType: Stock Entry Detail,Additional Cost,ຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມ
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ທາງດ້ານການເງິນປີສິ້ນສຸດວັນທີ່
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ບໍ່ສາມາດກັ່ນຕອງໂດຍອີງໃສ່ Voucher No, ຖ້າຫາກວ່າເປັນກຸ່ມຕາມ Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,ເຮັດໃຫ້ສະເຫນີລາຄາຜູ້ຜະລິດ
 DocType: Quality Inspection,Incoming,ເຂົ້າມາ
 DocType: BOM,Materials Required (Exploded),ອຸປະກອນທີ່ຕ້ອງການ (ລະເບີດ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ເພີ່ມຜູ້ຊົມໃຊ້ທີ່ອົງການຈັດຕັ້ງຂອງທ່ານ, ນອກຈາກຕົວທ່ານເອງ"
@@ -3811,6 +3815,7 @@
 DocType: Employee,History In Company,ປະຫວັດສາດໃນບໍລິສັດ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,ຈົດຫມາຍຂ່າວ
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; ອານາເຂດ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ລາຍການດຽວກັນໄດ້ຮັບເຂົ້າໄປຫຼາຍຄັ້ງ
 DocType: Department,Leave Block List,ອອກຈາກບັນຊີ Block
 DocType: Sales Invoice,Tax ID,ID ພາສີ
@@ -3820,7 +3825,7 @@
 DocType: Customer,Sales Partner and Commission,Partner ຂາຍແລະຄະນະກໍາມະ
 DocType: Employee Loan,Rate of Interest (%) / Year,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) / ປີ
 ,Project Quantity,ຈໍານວນໂຄງການ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",ທັງຫມົດ {0} ສໍາລັບລາຍການທັງຫມົດເປັນສູນອາດຈະເປັນທີ່ທ່ານຄວນຈະມີການປ່ຽນແປງ &#39;ແຈກຢາຍຄ່າບໍລິການຂຶ້ນຢູ່ກັບ&#39;
 DocType: Opportunity,To Discuss,ເພື່ອປຶກສາຫາລື
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ຫົວຫນ່ວຍຂອງ {1} ທີ່ຈໍາເປັນໃນ {2} ເພື່ອໃຫ້ສໍາເລັດການນີ້.
 DocType: Loan Type,Rate of Interest (%) Yearly,ອັດຕາການທີ່ຫນ້າສົນໃຈ (%) ປະຈໍາປີ
@@ -3835,7 +3840,7 @@
 DocType: Purchase Invoice,Return,ການກັບຄືນມາ
 DocType: Production Order Operation,Production Order Operation,ການດໍາເນີນງານໃບສັ່ງຜະລິດ
 DocType: Pricing Rule,Disable,ປິດການທໍາງານ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ຮູບແບບຂອງການຈ່າຍເງິນເປັນສິ່ງຈໍາເປັນເພື່ອເຮັດໃຫ້ການຊໍາລະເງິນ
 DocType: Project Task,Pending Review,ລໍຖ້າການທົບທວນຄືນ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",Asset {0} ບໍ່ສາມາດໄດ້ຮັບການທະເລາະວິວາດກັນແລ້ວ {1}
 DocType: Task,Total Expense Claim (via Expense Claim),ການຮ້ອງຂໍຄ່າໃຊ້ຈ່າຍທັງຫມົດ (ໂດຍຜ່ານຄ່າໃຊ້ຈ່າຍການຮຽກຮ້ອງ)
@@ -3843,11 +3848,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,ເຄື່ອງຫມາຍຂາດ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ຕິດຕໍ່ກັນ {0}: ສະກຸນເງິນຂອງ BOM: {1} ຄວນຈະເທົ່າກັບສະກຸນເງິນການຄັດເລືອກ {2}
 DocType: Journal Entry Account,Exchange Rate,ອັດຕາແລກປ່ຽນ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,ໃບສັ່ງຂາຍ {0} ບໍ່ໄດ້ສົ່ງ
 DocType: Homepage,Tag Line,Line Tag
 DocType: Fee Component,Fee Component,ຄ່າບໍລິການສ່ວນປະກອບ
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ການຈັດການ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,ເພີ່ມລາຍການລາຍການ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,ເພີ່ມລາຍການລາຍການ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: ບັນຊີຂອງພໍ່ແມ່ {1} ບໍ່ Bolong ກັບບໍລິສັດ {2}
 DocType: Cheque Print Template,Regular,ເປັນປົກກະຕິ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage ທັງຫມົດຂອງທັງຫມົດເງື່ອນໄຂການປະເມີນຜົນຈະຕ້ອງ 100%
@@ -3860,7 +3865,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} ບໍ່ມີ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ລົງທະບຽນສໍາລັບ ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,ອັດຕາສ່ວນການແຜ່ກະຈາຍປະຈໍາເດືອນ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ການລາຍການທີ່ເລືອກບໍ່ສາມາດມີ Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","ອັດຕາການປະເມີນມູນຄ່າບໍ່ໄດ້ພົບເຫັນສໍາລັບລາຍການ {0}, ຊຶ່ງຈໍາເປັນຕ້ອງເຮັດແນວໃດການອອກສຽງການບັນຊີສໍາລັບ {1} {2}. ຖ້າຫາກວ່າລາຍການແມ່ນ transacting ເປັນລາຍການຕົວຢ່າງໃນ {1}, ກະລຸນາລະບຸວ່າໃນ {1} ຕາຕະລາງລາຍການ. ຖ້າບໍ່ດັ່ງນັ້ນ, ກະລຸນາສ້າງທຸລະກໍາຫຼັກຊັບເຂົ້າມາສໍາລັບລາຍການຫຼືການກ່າວເຖິງອັດຕາການປະເມີນມູນຄ່າສິນຄ້າບັນທຶກ, ແລະຫຼັງຈາກນັ້ນພະຍາຍາມ submiting / ຍົກເລີກພານີ້"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ຂອງອຸປະກອນການສົ່ງຕໍ່ສົ່ງນີ້ຫມາຍເຫດ
 DocType: Project,Customer Details,ລາຍລະອຽດຂອງລູກຄ້າ
@@ -3869,15 +3874,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ກະລຸນາໃສ່ພາລາມິເຕີ url ສໍາລັບຮັບພວກເຮົາ
 DocType: Payment Entry,Paid Amount,ຈໍານວນເງິນຊໍາລະເງິນ
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ອອນໄລນ໌
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ອອນໄລນ໌
 ,Available Stock for Packing Items,ສິນຄ້າສໍາລັບການບັນຈຸ
 DocType: Item Variant,Item Variant,ລາຍການ Variant
 DocType: Assessment Result Tool,Assessment Result Tool,ເຄື່ອງມືການປະເມີນຜົນ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ຄໍາສັ່ງສົ່ງບໍ່ສາມາດລຶບ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","ການດຸ່ນດ່ຽງບັນຊີແລ້ວໃນເດບິດ, ທ່ານຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ກໍານົດ &#39;ສົມຕ້ອງໄດ້ຮັບ&#39; ເປັນ &#39;Credit&#39;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,ການບໍລິຫານຄຸນະພາບ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ລາຍການ {0} ໄດ້ຖືກປິດ
 DocType: Employee Loan,Repay Fixed Amount per Period,ຈ່າຍຄືນຈໍານວນເງິນທີ່ມີກໍານົດໄລຍະເວລາຕໍ່
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ກະລຸນາໃສ່ປະລິມານສໍາລັບລາຍການ {0}
 DocType: Employee External Work History,Employee External Work History,ພະນັກງານປະຫວັດການເຮັດ External
@@ -3904,7 +3909,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID Email ນັກສຶກສາ
 DocType: Employee,Notice (days),ຫນັງສືແຈ້ງການ (ວັນ)
 DocType: Tax Rule,Sales Tax Template,ແມ່ແບບພາສີການຂາຍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ເລືອກລາຍການທີ່ຈະຊ່ວຍປະຢັດໃບເກັບເງິນ
 DocType: Employee,Encashment Date,ວັນທີ່ສະຫມັກ Encashment
 DocType: Training Event,Internet,ອິນເຕີເນັດ
 DocType: Account,Stock Adjustment,ການປັບ Stock
@@ -3928,7 +3933,7 @@
 DocType: Item Variant Attribute,Attribute,ຄຸນລັກສະນະ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,ກະລຸນາລະບຸຈາກ / ກັບສະ
 DocType: Serial No,Under AMC,ພາຍໃຕ້ AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,ອັດຕາການປະເມີນມູນຄ່າສິນຄ້າແມ່ນການຄໍານວນພິຈາລະນາຈໍານວນບັດຄ່າໃຊ້ຈ່າຍລູກຈ້າງ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,ອັດຕາການປະເມີນມູນຄ່າສິນຄ້າແມ່ນການຄໍານວນພິຈາລະນາຈໍານວນບັດຄ່າໃຊ້ຈ່າຍລູກຈ້າງ
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ການຕັ້ງຄ່າມາດຕະຖານສໍາລັບການຂາຍທຸລະກໍາ.
 DocType: Guardian,Guardian Of ,ຜູ້ປົກຄອງຂອງ
 DocType: Grading Scale Interval,Threshold,ໃກ້ຈະເຂົ້າສູ່
@@ -3938,6 +3943,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note ອອກ
 DocType: Production Order,Warehouses,ຄັງສິນຄ້າ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ຊັບສິນບໍ່ສາມາດໄດ້ຮັບການໂອນ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ລາຍການນີ້ເປັນຂໍ້ແຕກຕ່າງຂອງ {0} (Template).
 DocType: Workstation,per hour,ຕໍ່ຊົ່ວໂມງ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ຈັດຊື້
 DocType: Announcement,Announcement,ປະກາດ
@@ -3953,8 +3959,8 @@
 DocType: Account,Receivable,ຮັບ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"ຕິດຕໍ່ກັນ, {0}: ບໍ່ອະນຸຍາດໃຫ້ມີການປ່ຽນແປງຜູ້ຜະລິດເປັນການສັ່ງຊື້ຢູ່ແລ້ວ"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ພາລະບົດບາດທີ່ຖືກອະນຸຍາດໃຫ້ສົ່ງການທີ່ເກີນຂອບເຂດຈໍາກັດການປ່ອຍສິນເຊື່ອທີ່ກໍານົດໄວ້.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ເລືອກລາຍການການຜະລິດ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","ຕົ້ນສະບັບການຊິ້ງຂໍ້ມູນຂໍ້ມູນ, ມັນອາດຈະໃຊ້ເວລາທີ່ໃຊ້ເວລາບາງ"
 DocType: Item,Material Issue,ສະບັບອຸປະກອນການ
 DocType: Hub Settings,Seller Description,ຜູ້ຂາຍລາຍລະອຽດ
 DocType: Employee Education,Qualification,ຄຸນສົມບັດ
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ຄໍາສັ່ງ
 DocType: Salary Detail,Component,ອົງປະກອບ
 DocType: Assessment Criteria,Assessment Criteria Group,Group ເງື່ອນໄຂການປະເມີນຜົນ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},ເປີດຄ່າເສື່ອມລາຄາສະສົມຕ້ອງຫນ້ອຍກ່ວາເທົ່າກັບ {0}
 DocType: Warehouse,Warehouse Name,ຊື່ Warehouse
 DocType: Naming Series,Select Transaction,ເລືອກເຮັດທຸລະກໍາ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,ກະລຸນາໃສ່ອະນຸມັດການພາລະບົດບາດຫຼືອະນຸມັດຜູ້ໃຊ້
@@ -3979,7 +3985,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},ຈົນເຖິງວັນທີ່ຄວນຈະຢູ່ໃນປີງົບປະມານ. ສົມມຸດວ່າການ 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 +199,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,ບໍ່ສາມາດຍົກເລີກເພາະວ່າສົ່ງ Stock Entry {0} ມີຢູ່
 DocType: Employee Loan,Disbursement Date,ວັນທີ່ສະຫມັກນໍາເຂົ້າ
 DocType: Vehicle,Vehicle,ຍານພາຫະນະ
 DocType: Purchase Invoice,In Words,ໃນຄໍາສັບຕ່າງໆ
@@ -3994,14 +4000,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ຄ່າເສື່ອມລາຄາຂອງຊັບສິນແລະຍອດ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},ຈໍານວນ {0} {1} ການຍົກຍ້າຍຈາກ {2} ກັບ {3}
 DocType: Sales Invoice,Get Advances Received,ໄດ້ຮັບການຄວາມກ້າວຫນ້າທີ່ໄດ້ຮັບ
 DocType: Email Digest,Add/Remove Recipients,Add / Remove ຜູ້ຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ການບໍ່ອະນຸຍາດໃຫ້ຕໍ່ຕ້ານການຜະລິດຢຸດເຊົາການສັ່ງຊື້ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","ການຕັ້ງຄ່ານີ້ປີງົບປະມານເປັນຄ່າເລີ່ມຕົ້ນ, ໃຫ້ຄລິກໃສ່ &#39;ກໍານົດເປັນມາດຕະຖານ&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ເຂົ້າຮ່ວມ
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ການຂາດແຄນຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,variant item {0} ມີຢູ່ກັບຄຸນລັກສະນະດຽວກັນ
 DocType: Employee Loan,Repay from Salary,ຕອບບຸນແທນຄຸນຈາກເງິນເດືອນ
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ຂໍຊໍາລະເງິນກັບ {0} {1} ສໍາລັບຈໍານວນເງິນທີ່ {2}
@@ -4019,7 +4025,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,ການປະເມີນຜົນຂໍ້ມູນຜົນການຄົ້ນຫາ
 DocType: Employee Education,Employee Education,ການສຶກສາພະນັກງານ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ກຸ່ມລາຍການຊ້ໍາກັນພົບເຫັນຢູ່ໃນຕາຕະລາງກຸ່ມລາຍການ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ມັນຕ້ອງການເພື່ອດຶງຂໍ້ມູນລາຍລະອຽດສິນຄ້າ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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,Serial No {0} ໄດ້ຮັບແລ້ວ
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} ບໍ່ໄດ້ເຊື່ອມໂຍງກັບບັນຊີໃດກໍ່ຕາມ, ກະລຸນາສ້າງ / ການເຊື່ອມຕໍ່ທີ່ສອດຄ້ອງກັນ (ຊັບສິນ) ບັນຊີສໍາລັບການສາງໄດ້."
 DocType: Purchase Invoice,Recurring Id,Id Recurring
 DocType: Customer,Sales Team Details,ລາຍລະອຽດ Team Sales
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ລຶບຢ່າງຖາວອນ?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,ລຶບຢ່າງຖາວອນ?
 DocType: Expense Claim,Total Claimed Amount,ຈໍານວນທັງຫມົດອ້າງວ່າ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ກາລະໂອກາດທີ່ອາດມີສໍາລັບການຂາຍ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ບໍ່ຖືກຕ້ອງ {0}
@@ -4039,13 +4045,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ຕິດຕັ້ງໂຮງຮຽນຂອງທ່ານໃນ ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ຖານການປ່ຽນແປງຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ບໍ່ມີການຈົດບັນຊີສໍາລັບການສາງດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,ຈໍານວນຄໍາສັ່ງຫຼ້າສຸດ
+DocType: Task,Is Milestone,ແມ່ນເຫດການສໍາຄັນ
 DocType: Daily Work Summary,Email Sent To,ສົ່ງອີເມວການ
 DocType: Budget,Warn,ເຕືອນ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","ໃດຂໍ້ສັງເກດອື່ນໆ, ຄວາມພະຍາຍາມສັງເກດວ່າຄວນຈະຢູ່ໃນບັນທຶກດັ່ງກ່າວ."
@@ -4066,7 +4073,7 @@
 DocType: Item Attribute Value,Attribute Value,ສະແດງມູນຄ່າ
 ,Itemwise Recommended Reorder Level,Itemwise ແນະນໍາຈັດລໍາດັບລະດັບ
 DocType: Salary Detail,Salary Detail,ຂໍ້ມູນເງິນເດືອນ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,ກະລຸນາເລືອກ {0} ທໍາອິດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} ຂໍ້ມູນ {1} ໄດ້ຫມົດອາຍຸແລ້ວ.
 DocType: Sales Invoice,Commission,ຄະນະກໍາມະ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Sheet ທີ່ໃຊ້ເວລາສໍາລັບການຜະລິດ.
@@ -4078,41 +4085,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze ຫຸ້ນເກົ່າ Than` ຄວນຈະເປັນຂະຫນາດນ້ອຍກ່ວາ% d ມື້.
 DocType: Tax Rule,Purchase Tax Template,ຊື້ແມ່ແບບພາສີ
 ,Project wise Stock Tracking,ໂຄງການຕິດຕາມສະຫລາດ Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ຕາຕະລາງການບໍາລຸງຮັກສາ {0} ມີຢູ່ຕໍ່ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),ຕົວຈິງຈໍານວນ (ທີ່ມາ / ເປົ້າຫມາຍ)
 DocType: Item Customer Detail,Ref Code,ລະຫັດກະສານອ້າງອີງ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ການບັນທຶກຂອງພະນັກງານ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ກະລຸນາທີ່ກໍານົດໄວ້ຕໍ່ໄປວັນທີ່ຄ່າເສື່ອມລາຄາ
 DocType: HR Settings,Payroll Settings,ການຕັ້ງຄ່າ Payroll
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,"ຄໍາວ່າໃບແຈ້ງຫນີ້ທີ່ບໍ່ແມ່ນ, ການເຊື່ອມຕໍ່ແລະການຊໍາລະເງິນ."
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ສັ່ງຊື້
 DocType: Email Digest,New Purchase Orders,ໃບສັ່ງຊື້ໃຫມ່
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ຮາກບໍ່ສາມາດມີສູນຕົ້ນທຶນພໍ່ແມ່
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ເລືອກຍີ່ຫໍ້ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ເລືອກຍີ່ຫໍ້ ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ສະສົມຄ່າເສື່ອມລາຄາເປັນ
 DocType: Sales Invoice,C-Form Applicable,"C, ໃບສະຫມັກ"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ການດໍາເນີນງານທີ່ໃຊ້ເວລາຕ້ອງໄດ້ຫຼາຍກ່ວາ 0 ສໍາລັບການດໍາເນີນງານ {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse ເປັນການບັງຄັບ
 DocType: Supplier,Address and Contacts,ທີ່ຢູ່ແລະຕິດຕໍ່ພົວພັນ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ແປງຂໍ້ມູນ
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),ໃຫ້ເກັບຮັກສາມັນອັນ 900px ມິດ (w) ໂດຍ 100px (h)
 DocType: Program,Program Abbreviation,ຊື່ຫຍໍ້ໂຄງການ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາຕໍ່ຕ້ານແມ່ແບບລາຍການ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ຜະລິດພັນທີ່ບໍ່ສາມາດໄດ້ຮັບການຍົກຂຶ້ນມາຕໍ່ຕ້ານແມ່ແບບລາຍການ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ຄ່າບໍລິການມີການປັບປຸງໃນການຮັບຊື້ຕໍ່ແຕ່ລະລາຍການ
 DocType: Warranty Claim,Resolved By,ການແກ້ໄຂໂດຍ
 DocType: Bank Guarantee,Start Date,ວັນທີ່ເລີ່ມ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ຈັດສັນໃບສໍາລັບໄລຍະເວລາ.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,ເຊັກແລະເງິນຝາກການເກັບກູ້ບໍ່ຖືກຕ້ອງ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ບັນຊີ {0}: ທ່ານບໍ່ສາມາດກໍາຫນົດຕົວຂອງມັນເອງເປັນບັນຊີຂອງພໍ່ແມ່
 DocType: Purchase Invoice Item,Price List Rate,ລາຄາອັດຕາ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ສ້າງລູກຄ້າ
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ສ້າງລູກຄ້າ
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",ສະແດງໃຫ້ເຫັນ &quot;ຢູ່ໃນສະຕັອກ&quot; ຫຼື &quot;ບໍ່ໄດ້ຢູ່ໃນ Stock&quot; ໂດຍອີງໃສ່ຫຼັກຊັບທີ່ມີຢູ່ໃນສາງນີ້.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),ບັນຊີລາຍການຂອງວັດສະດຸ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ທີ່ໃຊ້ເວລາສະເລ່ຍປະຕິບັດໂດຍຜູ້ປະກອບການເພື່ອໃຫ້
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,ຜົນການປະເມີນຜົນ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ຊົ່ວໂມງ
 DocType: Project,Expected Start Date,ຄາດວ່າຈະເລີ່ມວັນທີ່
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ເອົາລາຍການຖ້າຫາກວ່າຄ່າໃຊ້ຈ່າຍແມ່ນບໍ່ສາມາດໃຊ້ກັບສິນຄ້າທີ່
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ສະກຸນເງິນລະຕ້ອງໄດ້ຮັບເຊັ່ນດຽວກັນກັບການຊໍາລະເງິນສະກຸນເງິນ Gateway
 DocType: Payment Entry,Receive,ໄດ້ຮັບ
@@ -4123,19 +4129,19 @@
 DocType: Workstation,Operating Costs,ຄ່າໃຊ້ຈ່າຍປະຕິບັດການ
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ການປະຕິບັດຖ້າຫາກວ່າສະສົມງົບປະມານປະຈໍາເດືອນເກີນ
 DocType: Purchase Invoice,Submit on creation,ຍື່ນສະເຫນີກ່ຽວກັບການສ້າງ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},ສະກຸນເງິນສໍາລັບ {0} ຕ້ອງ {1}
 DocType: Asset,Disposal Date,ວັນທີ່ຈໍາຫນ່າຍ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ອີເມວຈະຖືກສົ່ງໄປຫາພະນັກງານກິດຈະກໍາຂອງບໍລິສັດຢູ່ໃນຊົ່ວໂມງດັ່ງກ່າວ, ຖ້າຫາກວ່າພວກເຂົາເຈົ້າບໍ່ມີວັນພັກ. ສະຫຼຸບສັງລວມຂອງການຕອບສະຫນອງຈະໄດ້ຮັບການສົ່ງໄປຢູ່ໃນເວລາທ່ຽງຄືນ."
 DocType: Employee Leave Approver,Employee Leave Approver,ພະນັກງານອອກຈາກອະນຸມັດ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ຕິດຕໍ່ກັນ {0}: ຍະການຮຽງລໍາດັບໃຫມ່ທີ່ມີຢູ່ແລ້ວສໍາລັບການສາງນີ້ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ບໍ່ສາມາດປະກາດເປັນການສູນເສຍ, ເນື່ອງຈາກວ່າສະເຫນີລາຄາໄດ້ຖືກເຮັດໃຫ້."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ການຝຶກອົບຮົມຜົນຕອບຮັບ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ສັ່ງຊື້ສິນຄ້າ {0} ຕ້ອງໄດ້ຮັບການສົ່ງ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ກະລຸນາເລືອກເອົາວັນທີເລີ່ມຕົ້ນແລະການສິ້ນສຸດວັນທີ່ສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ກະລຸນາເລືອກເອົາວັນທີເລີ່ມຕົ້ນແລະການສິ້ນສຸດວັນທີ່ສໍາລັບລາຍການ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},ຂອງລາຍວິຊາແມ່ນບັງຄັບໃນການຕິດຕໍ່ກັນ {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ວັນທີບໍ່ສາມາດຈະກ່ອນທີ່ຈະຈາກວັນທີ່
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,ເພີ່ມ / ແກ້ໄຂລາຄາ
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Batch,Parent Batch,ຊຸດຂອງພໍ່ແມ່
 DocType: Cheque Print Template,Cheque Print Template,ແມ່ແບບພິມກະແສລາຍວັນ
@@ -4149,7 +4155,7 @@
 ,Ordered Items To Be Delivered,ລາຍການຄໍາສັ່ງທີ່ຈະສົ່ງ
 DocType: Account,Income,ລາຍໄດ້
 DocType: Industry Type,Industry Type,ປະເພດອຸດສາຫະກໍາ
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,ບາງສິ່ງບາງຢ່າງໄດ້ຜິດພາດ!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ບາງສິ່ງບາງຢ່າງໄດ້ຜິດພາດ!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,ການເຕືອນໄພ: ອອກຈາກຄໍາຮ້ອງສະຫມັກປະກອບດ້ວຍຂໍ້ມູນວັນ block ດັ່ງຕໍ່ໄປນີ້
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,ຂາຍ Invoice {0} ໄດ້ຖືກສົ່ງແລ້ວ
 DocType: Assessment Result Detail,Score,ຄະແນນ
@@ -4180,17 +4186,17 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage ທັງຫມົດໄດ້ຮັບມອບຫມາຍຄວນຈະເປັນ 100%. ມັນເປັນ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ຜູ້ສະຫນອງຂອງທ່ານ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ບໍ່ສາມາດກໍານົດເປັນການສູນເສຍທີ່ເປັນຄໍາສັ່ງຂາຍແມ່ນ.
 DocType: Request for Quotation Item,Supplier Part No,Supplier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ໄດ້ຮັບຈາກ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ບໍ່ສາມາດຫັກໃນເວລາທີ່ປະເພດແມ່ນສໍາລັບການ &#39;ປະເມີນມູນຄ່າ&#39; ຫຼື &#39;Vaulation ແລະລວມ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ໄດ້ຮັບຈາກ
 DocType: Lead,Converted,ປ່ຽນໃຈເຫລື້ອມໃສ
 DocType: Item,Has Serial No,ມີບໍ່ມີ Serial
 DocType: Employee,Date of Issue,ວັນທີຂອງການຈົດທະບຽນ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: ຈາກ {0} ສໍາລັບ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: ຈາກ {0} ສໍາລັບ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},"ຕິດຕໍ່ກັນ, {0} ຕັ້ງຄ່າການຜະລິດສໍາລັບການ item {1}"
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ຕິດຕໍ່ກັນ {0}: ມູນຄ່າຊົ່ວໂມງຕ້ອງມີຄ່າຫລາຍກ່ວາສູນ.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Image ເວັບໄຊທ໌ {0} ຕິດກັບ Item {1} ບໍ່ສາມາດໄດ້ຮັບການພົບເຫັນ
 DocType: Issue,Content Type,ປະເພດເນື້ອຫາ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,ຄອມພິວເຕີ
 DocType: Item,List this Item in multiple groups on the website.,ລາຍຊື່ສິນຄ້ານີ້ຢູ່ໃນກຸ່ມຫຼາກຫຼາຍກ່ຽວກັບເວັບໄຊທ໌.
@@ -4199,20 +4205,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ເຈົ້າຍັງບໍ່ໄດ້ອະນຸຍາດໃຫ້ຕັ້ງຄ່າ Frozen
 DocType: Payment Reconciliation,Get Unreconciled Entries,ໄດ້ຮັບ Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,ຈາກ Invoice ວັນທີ່
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ສະກຸນເງິນໃບບິນຈະຕ້ອງເທົ່າທຽມກັນກັບສະກຸນເງິນຫຼືບັນຊີຝ່າຍບໍ່ວ່າຈະ comapany ໃນຕອນຕົ້ນຂອງສະກຸນເງິນ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ອອກຈາກ Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ມັນຈະເປັນແນວໃດເຮັດແນວໃດ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ການຄັງສິນຄ້າ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ທັງຫມົດ Admissions ນັກສຶກສາ
 ,Average Commission Rate,ສະເລ່ຍອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ມີບໍ່ມີ Serial&#39; ບໍ່ສາມາດຈະ &quot;ແມ່ນ&quot; ລາຍການຫຼັກຊັບບໍ່
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ຜູ້ເຂົ້າຮ່ວມບໍ່ສາມາດໄດ້ຮັບການຫມາຍໄວ້ສໍາລັບກໍານົດວັນທີໃນອະນາຄົດ
 DocType: Pricing Rule,Pricing Rule Help,ລາຄາກົດລະບຽບຊ່ວຍເຫລືອ
 DocType: School House,House Name,ຊື່ບ້ານ
 DocType: Purchase Taxes and Charges,Account Head,ຫົວຫນ້າບັນຊີ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ປັບປຸງຄ່າໃຊ້ຈ່າຍເພີ່ມເຕີມທີ່ຈະຄິດໄລ່ຄ່າໃຊ້ຈ່າຍລູກຈ້າງຂອງລາຍການລາຍການ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ໄຟຟ້າ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ຕື່ມສ່ວນທີ່ເຫຼືອຂອງອົງການຈັດຕັ້ງຂອງທ່ານເປັນຜູ້ຊົມໃຊ້ຂອງທ່ານ. ນອກນັ້ນທ່ານຍັງສາມາດເພີ່ມເຊື້ອເຊີນລູກຄ້າກັບປະຕູຂອງທ່ານໂດຍການເພີ່ມໃຫ້ເຂົາເຈົ້າຈາກການຕິດຕໍ່
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ຕື່ມສ່ວນທີ່ເຫຼືອຂອງອົງການຈັດຕັ້ງຂອງທ່ານເປັນຜູ້ຊົມໃຊ້ຂອງທ່ານ. ນອກນັ້ນທ່ານຍັງສາມາດເພີ່ມເຊື້ອເຊີນລູກຄ້າກັບປະຕູຂອງທ່ານໂດຍການເພີ່ມໃຫ້ເຂົາເຈົ້າຈາກການຕິດຕໍ່
 DocType: Stock Entry,Total Value Difference (Out - In),ມູນຄ່າຄວາມແຕກຕ່າງ (Out - ໃນ)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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},User ID ບໍ່ກໍານົດສໍາລັບພະນັກງານ {0}
@@ -4221,7 +4227,7 @@
 DocType: Item,Customer Code,ລະຫັດລູກຄ້າ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},ເຕືອນວັນເດືອນປີເກີດສໍາລັບ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ວັນນັບຕັ້ງແຕ່ສັ່ງຫຼ້າສຸດ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ເດບິດການບັນຊີຈະຕ້ອງບັນຊີງົບດຸນ
 DocType: Buying Settings,Naming Series,ການຕັ້ງຊື່ Series
 DocType: Leave Block List,Leave Block List Name,ອອກຈາກຊື່ Block ຊີ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ວັນປະກັນໄພ Start ຄວນຈະມີຫນ້ອຍກ່ວາວັນການປະກັນໄພ End
@@ -4236,9 +4242,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip ເງິນເດືອນຂອງພະນັກງານ {0} ສ້າງຮຽບຮ້ອຍແລ້ວສໍາລັບເອກະສານທີ່ໃຊ້ເວລາ {1}
 DocType: Vehicle Log,Odometer,ໄມ
 DocType: Sales Order Item,Ordered Qty,ຄໍາສັ່ງຈໍານວນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ລາຍການ {0} ເປັນຄົນພິການ
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen ເກີນ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ບໍ່ໄດ້ປະກອບດ້ວຍລາຍການຫຼັກຊັບໃດຫນຶ່ງ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ໄລຍະເວລາຈາກແລະໄລຍະເວລາມາຮອດປະຈຸບັງຄັບສໍາລັບທີ່ເກີດຂຶ້ນ {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ກິດຈະກໍາໂຄງການ / ວຽກງານ.
 DocType: Vehicle Log,Refuelling Details,ລາຍລະອຽດເຊື້ອເພີງ
@@ -4248,8 +4254,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,ບໍ່ພົບອັດຕາການຊື້ຫຼ້າສຸດ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ຂຽນ Off ຈໍານວນເງິນ (ບໍລິສັດສະກຸນເງິນ)
 DocType: Sales Invoice Timesheet,Billing Hours,ຊົ່ວໂມງໃນການເກັບເງິນ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM ມາດຕະຖານສໍາລັບການ {0} ບໍ່ໄດ້ພົບເຫັນ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"ຕິດຕໍ່ກັນ, {0}: ກະລຸນາທີ່ກໍານົດໄວ້ປະລິມານ reorder"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ແຕະລາຍການຈະເພີ່ມໃຫ້ເຂົາເຈົ້າຢູ່ທີ່ນີ້
 DocType: Fees,Program Enrollment,ໂຄງການລົງທະບຽນ
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher ມູນຄ່າທີ່ດິນ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},ກະລຸນາຕັ້ງ {0}
@@ -4273,7 +4280,7 @@
 DocType: Maintenance Visit,Maintenance Date,ວັນທີ່ສະຫມັກບໍາລຸງຮັກສາ
 DocType: Purchase Invoice Item,Rejected Serial No,ປະຕິເສດບໍ່ມີ Serial
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,ປີວັນທີເລີ່ມຕົ້ນຫລືວັນທີ່ສິ້ນສຸດແມ່ນ overlapping ກັບ {0}. ເພື່ອຫຼີກເວັ້ນການກະລຸນາຕັ້ງບໍລິສັດ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},ວັນທີ່ເລີ່ມຕົ້ນຄວນຈະມີຫນ້ອຍກ່ວາວັນທີ່ສິ້ນສຸດສໍາລັບລາຍການ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### ຖ້າຫາກວ່າຊຸດໄດ້ຖືກກໍານົດແລະບໍ່ມີ Serial ບໍ່ໄດ້ກ່າວມາໃນການເຮັດທຸລະ, ຈໍານວນ serial ຫຼັງຈາກນັ້ນອັດຕະໂນມັດຈະໄດ້ຮັບການສ້າງຕັ້ງໂດຍອີງໃສ່ຊຸດນີ້. ຖ້າຫາກວ່າທ່ານສະເຫມີຕ້ອງການທີ່ຈະບອກຢ່າງຊັດເຈນ Serial Nos ສໍາລັບລາຍການນີ້. ໃຫ້ຫວ່າງໄວ້."
 DocType: Upload Attendance,Upload Attendance,ຜູ້ເຂົ້າຮ່ວມ Upload
@@ -4350,7 +4357,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,ຂາຍຍ່ອຍແລະຂາຍສົ່ງ
 DocType: Issue,First Responded On,ຄັ້ງທໍາອິດຕອບຫຼ້າສຸດໂດຍ
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Cross ລາຍການລາຍການໃນຫລາຍກຸ່ມ
-DocType: Grade Interval,Grade Interval,Grade ໄລຍະຫ່າງ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ງົບປະມານປີເລີ່ມວັນແລະງົບປະມານປີສຸດທ້າຍວັນທີ່ກໍານົດໄວ້ແລ້ວໃນປີງົບປະມານ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ການເກັບກູ້ວັນທີ່ປັບປຸງ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ຊຸດ Split
@@ -4397,14 +4403,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ອອກຈາກການກວດກາຖ້າຫາກວ່າທ່ານບໍ່ຕ້ອງການທີ່ຈະພິຈາລະນາໃນຂະນະທີ່ batch ເຮັດໃຫ້ກຸ່ມແນ່ນອນຕາມ.
 DocType: Asset,Frequency of Depreciation (Months),ຄວາມຖີ່ຂອງການເສື່ອມລາຄາ (ເດືອນ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ການບັນຊີ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ການບັນຊີ
 DocType: Landed Cost Item,Landed Cost Item,ລູກຈ້າງສິນຄ້າຕົ້ນທຶນ
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ສະແດງໃຫ້ເຫັນຄຸນຄ່າສູນ
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ປະລິມານຂອງສິນຄ້າໄດ້ຮັບຫຼັງຈາກການຜະລິດ / repacking ຈາກປະລິມານຂອງວັດຖຸດິບ
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,ການຕິດຕັ້ງເວັບໄຊທ໌ງ່າຍດາຍສໍາລັບອົງການຈັດຕັ້ງຂອງຂ້າພະເຈົ້າ
 DocType: Payment Reconciliation,Receivable / Payable Account,Receivable / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,ຕໍ່ສັ່ງຂາຍສິນຄ້າ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ກະລຸນາລະບຸຄຸນສົມບັດມູນຄ່າສໍາລັບເຫດຜົນ {0}
 DocType: Item,Default Warehouse,ມາດຕະຖານ Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ງົບປະມານບໍ່ສາມາດໄດ້ຮັບການມອບຫມາຍຕໍ່ບັນຊີ Group {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,ກະລຸນາເຂົ້າໄປໃນສູນຄ່າໃຊ້ຈ່າຍຂອງພໍ່ແມ່
@@ -4450,7 +4456,7 @@
 DocType: Opportunity Item,Basic Rate,ອັດຕາພື້ນຖານ
 DocType: GL Entry,Credit Amount,ການປ່ອຍສິນເຊື່ອ
 DocType: Cheque Print Template,Signatory Position,ຕໍາແຫນ່ງລົງນາມ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ກໍານົດເປັນການສູນເສຍ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ກໍານົດເປັນການສູນເສຍ
 DocType: Timesheet,Total Billable Hours,ທັງຫມົດຊົ່ວໂມງເອີ້ນເກັບເງິນ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ການຊໍາລະເງິນການຮັບ Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ນີ້ແມ່ນອີງໃສ່ການເຮັດທຸລະກໍາຕໍ່ລູກຄ້ານີ້. ເບິ່ງໄລຍະເວລາຂ້າງລຸ່ມນີ້ສໍາລັບລາຍລະອຽດ
@@ -4464,11 +4470,11 @@
 ,Items To Be Requested,ລາຍການທີ່ຈະໄດ້ຮັບການຮ້ອງຂໍ
 DocType: Purchase Order,Get Last Purchase Rate,ໄດ້ຮັບຫຼ້າສຸດອັດຕາການຊື້
 DocType: Company,Company Info,ຂໍ້ມູນບໍລິສັດ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,ເລືອກຫລືເພີ່ມລູກຄ້າໃຫມ່
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,ສູນຕົ້ນທຶນທີ່ຈໍາເປັນຕ້ອງເຂົ້າເອີ້ນຮ້ອງຄ່າໃຊ້ຈ່າຍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ຄໍາຮ້ອງສະຫມັກຂອງກອງທຶນ (ຊັບສິນ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ນີ້ແມ່ນອີງໃສ່ການເຂົ້າຮ່ວມຂອງພະນັກງານນີ້
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ບັນຊີເດບິດ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ບັນຊີເດບິດ
 DocType: Fiscal Year,Year Start Date,ປີເລີ່ມວັນທີ່
 DocType: Attendance,Employee Name,ຊື່ພະນັກງານ
 DocType: Sales Invoice,Rounded Total (Company Currency),ກົມທັງຫມົດ (ບໍລິສັດສະກຸນເງິນ)
@@ -4477,13 +4483,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,ຢຸດເຊົາການຜູ້ໃຊ້ຈາກການເຮັດໃຫ້ຄໍາຮ້ອງສະຫມັກອອກຈາກໃນມື້ດັ່ງຕໍ່ໄປນີ້.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ການຊື້
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ສະເຫນີລາຄາຜູ້ຜະລິດ {0} ສ້າງ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ປີສຸດທ້າຍບໍ່ສາມາດກ່ອນທີ່ Start ປີ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ຜົນປະໂຫຍດພະນັກງານ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ກະລຸນາທີ່ກໍານົດໄວ້ມາດຕະຖານບັນຊີພັກຜ່ອນສໍາລັບພະນັກງານ {0} ຫລືບໍລິສັດ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ບໍ່ໄດ້ຢູ່
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ໃບບິນຄ່າໄດ້ຍົກຂຶ້ນມາໃຫ້ກັບລູກຄ້າ.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id ໂຄງການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ຕິດຕໍ່ກັນບໍ່ໄດ້ຊື້ {0}: ຈໍານວນເງິນບໍ່ສາມາດຈະມີຫຼາຍຂຶ້ນກ່ວາ Pending ຈໍານວນຕໍ່ຄ່າໃຊ້ຈ່າຍ {1} ການຮຽກຮ້ອງ. ທີ່ຍັງຄ້າງຈໍານວນເງິນເປັນ {2}
@@ -4492,15 +4498,17 @@
 DocType: Quality Inspection Reading,Reading 3,ອ່ານ 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,ປະເພດ Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,ລາຄາບໍ່ພົບຫຼືຄົນພິການ
 DocType: Employee Loan Application,Approved,ການອະນຸມັດ
 DocType: Pricing Rule,Price,ລາຄາ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',ພະນັກງານສະບາຍໃຈໃນ {0} ຕ້ອງໄດ້ຮັບການສ້າງຕັ້ງເປັນ &#39;ຊ້າຍ&#39;
 DocType: Guardian,Guardian,ຜູ້ປົກຄອງ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ການປະເມີນ {0} ສ້າງຕັ້ງສໍາລັບພະນັກງານ {1} ໃນຊ່ວງວັນທີ່ໄດ້ຮັບ
 DocType: Employee,Education,ການສຶກສາ
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,ຊື່ແຄມເປນໂດຍ
 DocType: Employee,Current Address Is,ທີ່ຢູ່ປັດຈຸບັນແມ່ນ
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ດັດແກ້
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ຖ້າຕ້ອງການ. ກໍານົດກຸນເງິນເລີ່ມຕົ້ນຂອງບໍລິສັດ, ຖ້າຫາກວ່າບໍ່ໄດ້ລະບຸ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,entries ວາລະສານການບັນຊີ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ມີຈໍານວນທີ່ຈາກ Warehouse
@@ -4509,7 +4517,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ຕິດຕໍ່ກັນ {0}: ພັກ / ບັນຊີບໍ່ກົງກັບ {1} / {2} ໃນ {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ກະລຸນາໃສ່ທີ່ຄຸ້ມຄ່າ
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ຕິດຕໍ່ກັນ, {0}: Reference ປະເພດເອກະສານຕ້ອງເປັນສ່ວນຫນຶ່ງຂອງຄໍາສັ່ງຊື້, ຊື້ໃບເກັບເງິນຫຼືການອະນຸທິນ"
 DocType: Employee,Current Address,ທີ່ຢູ່ປະຈຸບັນ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ຖ້າຫາກວ່າລາຍການແມ່ນ variant ຂອງລາຍການອື່ນຫຼັງຈາກນັ້ນອະທິບາຍ, ຮູບພາບ, ລາຄາ, ພາສີອາກອນແລະອື່ນໆຈະໄດ້ຮັບການກໍານົດໄວ້ຈາກແມ່ແບບເວັ້ນເສຍແຕ່ລະບຸຢ່າງຊັດເຈນ"
 DocType: Serial No,Purchase / Manufacture Details,ຊື້ / ລາຍລະອຽດຜະລິດ
@@ -4537,7 +4545,7 @@
 DocType: Hub Settings,Hub Settings,ການຕັ້ງຄ່າ Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,ກັບການປະຕິບັດ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,entries ບັນຊີໄດ້ຮັບການເຮັດໃຫ້ຢູ່ໃນສະກຸນເງິນ {0} ສໍາລັບບໍລິສັດ {1}. ກະລຸນາເລືອກບັນຊີລູກຫນີ້ຫລືເຈົ້າຫນີ້ທີ່ມີສະກຸນເງິນ {0}.
 DocType: Asset,Is Existing Asset,ແມ່ນທີ່ມີຢູ່ Asset
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
 DocType: Salary Detail,Statistical Component,Component ສະຖິຕິ
@@ -4562,7 +4570,7 @@
 DocType: Assessment Plan,Room,ຫ້ອງ
 DocType: Purchase Order,Advance Paid,ລ່ວງຫນ້າການຊໍາລະເງິນ
 DocType: Item,Item Tax,ພາສີລາຍ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,ອຸປະກອນການຜະລິດ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,ອຸປະກອນການຜະລິດ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ອາກອນຊົມໃຊ້ໃບເກັບເງິນ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% ປະກົດວ່າຫຼາຍກ່ວາຫນຶ່ງຄັ້ງ
 DocType: Expense Claim,Employees Email Id,Id ພະນັກງານ Email
@@ -4593,9 +4601,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ຄັດຕິດ Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ລະດັບ Stock
 DocType: Customer,Commission Rate,ອັດຕາຄະນະກໍາມະ
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ເຮັດໃຫ້ Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ເຮັດໃຫ້ Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ຄໍາຮ້ອງສະຫມັກ Block ໃບໂດຍພະແນກ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","ປະເພດການຈ່າຍເງິນຕ້ອງເປັນຫນຶ່ງໃນໄດ້ຮັບການ, ການຊໍາລະເງິນແລະພາຍໃນການຖ່າຍໂອນ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,ການວິເຄາະ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ໂຄງຮ່າງການແມ່ນບໍ່ມີ
 DocType: Vehicle,Model,ຮູບແບບ
@@ -4606,6 +4614,7 @@
 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 +161,Capital Stock,ນະຄອນຫຼວງ Stock
+DocType: Shopping Cart Settings,Show Public Attachments,ສະແດງ Attachments ສາທາລະນະ
 DocType: Packing Slip,Package Weight Details,Package Details ນ້ໍາຫນັກ
 DocType: Payment Gateway Account,Payment Gateway Account,ການຊໍາລະເງິນບັນຊີ Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ຫຼັງຈາກສໍາເລັດການຊໍາລະເງິນໂອນຜູ້ໃຊ້ຫນ້າທີ່ເລືອກ.
@@ -4624,15 +4633,15 @@
 DocType: Batch,Expiry Date,ວັນຫມົດອາຍຸ
 ,Supplier Addresses and Contacts,ທີ່ຢູ່ຜູ້ສະຫນອງແລະການຕິດຕໍ່
 ,accounts-browser,ບັນຊີຂອງຕົວທ່ອງເວັບ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ກະລຸນາເລືອກປະເພດທໍາອິດ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,ກະລຸນາເລືອກປະເພດທໍາອິດ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ຕົ້ນສະບັບຂອງໂຄງການ.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","ການອະນຸຍາດໃຫ້ໃນໄລຍະການເກັບເງິນຫຼືໄລຍະກໍາລັງສັ່ງ, ການປັບປຸງ &quot;ອະນຸຍາດ&quot; ໃນການຕັ້ງຄ່າຫຼັກຊັບຫຼືຂໍ້ມູນ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ບໍ່ສະແດງໃຫ້ເຫັນສັນຍາລັກເຊັ່ນ: $ etc ໃດຕໍ່ກັບສະກຸນເງິນ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ຄຶ່ງວັນ)
 DocType: Supplier,Credit Days,Days ການປ່ອຍສິນເຊື່ອ
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ເຮັດໃຫ້ກຸ່ມນັກສຶກສາ
 DocType: Leave Type,Is Carry Forward,ແມ່ນປະຕິບັດຕໍ່
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,ຮັບສິນຄ້າຈາກ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ນໍາໄປສູ່ການທີ່ໃຊ້ເວລາວັນ
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ຕິດຕໍ່ກັນ, {0}: ປະກາດວັນທີ່ຈະຕ້ອງເຊັ່ນດຽວກັນກັບວັນທີ່ຊື້ {1} ຂອງຊັບສິນ {2}"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ກະລຸນາໃສ່ຄໍາສັ່ງຂາຍໃນຕາຕະລາງຂ້າງເທິງ
@@ -4649,8 +4658,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ຈໍານວນເງິນທີ່ຖືກເກືອດຫ້າມ
 DocType: GL Entry,Is Opening,ເປັນການເປີດກວ້າງການ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ຕິດຕໍ່ກັນ {0}: ເຂົ້າເດບິດບໍ່ສາມາດໄດ້ຮັບການຕິດພັນກັບ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ກະລຸນາຕິດຕັ້ງນໍ້າເບີຊຸດສໍາລັບຜູ້ເຂົ້າຮ່ວມໂດຍຜ່ານການຕິດຕັ້ງ&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ບັນຊີ {0} ບໍ່ມີ
 DocType: Account,Cash,ເງິນສົດ
 DocType: Employee,Short biography for website and other publications.,biography ສັ້ນສໍາລັບເວັບໄຊທ໌ແລະສິ່ງພິມອື່ນໆ.
diff --git a/erpnext/translations/lt.csv b/erpnext/translations/lt.csv
index 51dbeb2..f798714 100644
--- a/erpnext/translations/lt.csv
+++ b/erpnext/translations/lt.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,nuomojamos
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Taikoma Vartotojo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Sustabdyta Gamybos nurodymas negali būti atšauktas, atkišti ji pirmą kartą atšaukti"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Sustabdyta Gamybos nurodymas negali būti atšauktas, atkišti ji pirmą kartą atšaukti"
 DocType: Vehicle Service,Mileage,Rida
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ar tikrai norite atsisakyti šios turtą?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pasirinkti Default Tiekėjas
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pasirinkti Default Tiekėjas
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valiutų reikia kainoraščio {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bus apskaičiuojama sandorį.
 DocType: Purchase Order,Customer Contact,Klientų Susisiekite
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Neįvykdyti {0} negali būti mažesnė už nulį ({1})
 DocType: Manufacturing Settings,Default 10 mins,Numatytasis 10 min
 DocType: Leave Type,Leave Type Name,Palikite Modelio pavadinimas
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Rodyti atvira
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rodyti atvira
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serija Atnaujinta sėkmingai
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Užsakymas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural leidinys Įėjimo Pateikė
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Serija punktas Galiojimo Būsena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,bankas projektas
 DocType: Mode of Payment Account,Mode of Payment Account,mokėjimo sąskaitos režimas
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Rodyti Variantai
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rodyti Variantai
 DocType: Academic Term,Academic Term,akademinė terminas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,medžiaga
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,kiekis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,kiekis
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Sąskaitos lentelė gali būti tuščias.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Paskolos (įsipareigojimai)
 DocType: Employee Education,Year of Passing,Metus artimųjų
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Nuoroda: &quot;% s&quot;, Prekės kodas:% s &quot;ir klientų:% s&quot;"
 DocType: Item,Country of Origin,Kilmės šalis
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Prekyboje
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Atviri klausimai
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sveikatos apsauga
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Delsimas mokėjimo (dienomis)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Paslaugų išlaidų
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,faktūra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijos numeris: {0} jau yra nuorodos į pardavimo sąskaita-faktūra: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,faktūra
 DocType: Maintenance Schedule Item,Periodicity,periodiškumas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Finansiniai metai {0} reikalingas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Numatomas pristatymo data yra būti prieš Pardavimų įsakymu data
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Prisegti .csv failą su dviem stulpeliais, po vieną seną pavadinimą ir vieną naują vardą"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} jokiu aktyviu finansinius metus.
 DocType: Packed Item,Parent Detail docname,Tėvų Išsamiau DOCNAME
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Nuoroda: {0}, Prekės kodas: {1} ir klientų: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogramas
 DocType: Student Log,Log,Prisijungti
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atidarymo dėl darbo.
 DocType: Item Attribute,Increment,prieaugis
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Pasirinkite sandėlio ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pasirinkite sandėlio ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,reklaminis
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Pati bendrovė yra įrašytas daugiau nei vieną kartą
 DocType: Employee,Married,Vedęs
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Neleidžiama {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Gauk elementus iš
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Neleidžiama {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Gauk elementus iš
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},"Akcijų, negali būti atnaujintas prieš važtaraštyje {0}"
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Prekės {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nėra išvardytus punktus
 DocType: Payment Reconciliation,Reconcile,suderinti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Parduotuvė
 DocType: Quality Inspection Reading,Reading 1,Skaitymas 1
 DocType: Process Payroll,Make Bank Entry,Padaryti Bank įrašą
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensijų fondai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Kitas Nusidėvėjimas data negali būti prieš perkant data
 DocType: SMS Center,All Sales Person,Visi pardavimo asmuo
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mėnesio pasiskirstymas ** Jums padės platinti biudžeto / target visoje mėnesius, jei turite sezoniškumą savo verslą."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nerasta daiktai
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nerasta daiktai
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Darbo užmokesčio struktūrą Trūksta
 DocType: Lead,Person Name,"asmens vardas, pavardė"
 DocType: Sales Invoice Item,Sales Invoice Item,Pardavimų sąskaita faktūra punktas
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",pvz &quot;pradinė mokykla&quot; arba &quot;Universitetas&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Akcijų ataskaitos
 DocType: Warehouse,Warehouse Detail,Sandėlių detalės
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredito limitas buvo kirto klientui {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Kadencijos pabaigos data negali būti vėlesnė nei metų pabaigoje mokslo metų data, iki kurios terminas yra susijęs (akademiniai metai {}). Ištaisykite datas ir bandykite dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ar Ilgalaikio turto&quot; negali būti nepažymėta, kaip Turto įrašas egzistuoja nuo elemento"
 DocType: Vehicle Service,Brake Oil,stabdžių Nafta
 DocType: Tax Rule,Tax Type,mokesčių tipas
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jūs nesate įgaliotas pridėti ar atnaujinti įrašus prieš {0}
 DocType: BOM,Item Image (if not slideshow),Prekė vaizdas (jei ne skaidrių)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientų egzistuoja to paties pavadinimo
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valandą greičiu / 60) * Tikrasis veikimo laikas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pasirinkite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Pasirinkite BOM
 DocType: SMS Log,SMS Log,SMS Prisijungti
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Išlaidos pristatyto objekto
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Atostogų į {0} yra ne tarp Nuo datos ir iki šiol
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,Mokyklos
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ne atostogos rekordas darbuotojo rado {0} už {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Prašome įvesti įmonę pirmas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Prašome pasirinkti Company pirmas
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Prašome pasirinkti Company pirmas
 DocType: Employee Education,Under Graduate,pagal diplomas
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Tikslinė Apie
 DocType: BOM,Total Cost,Iš viso išlaidų
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,reikalavimo suma
 DocType: Employee,Mr,Ponas
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,rasti abonentu grupės lentelėje dublikatas klientų grupė
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tiekėjas Tipas / Tiekėjas
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tiekėjas Tipas / Tiekėjas
 DocType: Naming Series,Prefix,priešdėlis
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,vartojimo
 DocType: Employee,B-,B
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,klasė
 DocType: Sales Invoice Item,Delivered By Supplier,Paskelbta tiekėjo
 DocType: SMS Center,All Contact,visi Susisiekite
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Gamybos Užsakyti jau sukurtas visų daiktų su BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Metinis atlyginimas
 DocType: Daily Work Summary,Daily Work Summary,Dienos darbo santrauka
 DocType: Period Closing Voucher,Closing Fiscal Year,Uždarius finansinius metus
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} yra sušaldyti
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} yra sušaldyti
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Prašome pasirinkti veikiančią bendrovę kurti sąskaitų planą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akcijų išlaidos
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pasirinkite Target sandėlis
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,contra įrašas
 DocType: Journal Entry Account,Credit in Company Currency,Kredito įmonėje Valiuta
 DocType: Delivery Note,Installation Status,Įrengimas būsena
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Norite atnaujinti lankomumą? <br> Dovana: {0} \ <br> Nėra: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Priimamos + Atmesta Kiekis turi būti lygi Gauta kiekio punktui {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Tiekimo Žaliavos pirkimas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Bent vienas režimas mokėjimo reikalingas POS sąskaitą.
 DocType: Products Settings,Show Products as a List,Rodyti produktus sąraše
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Atsisiųskite šabloną, užpildykite reikiamus duomenis ir pridėti naują failą. Visos datos ir darbuotojas kombinacija Pasirinkto laikotarpio ateis šabloną, su esamais lankomumo įrašų"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Padaryti nusidėvėjimo įrašą
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,prašymas tipas
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Padaryti Darbuotojas
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Padaryti Darbuotojas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,transliavimas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,vykdymas
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Išsami informacija apie atliktas operacijas.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planas techninės priežiūros apsilankymų.
 DocType: SMS Settings,Enter url parameter for message,Įveskite URL parametrą pranešimą
 DocType: POS Profile,Customer Groups,klientų Grupės
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansinės ataskaitos
 DocType: Guardian,Students,studentai
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Taikymo taisyklės kainodaros ir nuolaida.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Kainų sąrašas turi būti taikoma perkant ar parduodant
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Avanso suma gali būti ne didesnė kaip {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serija sąrašas šio sandorio
 DocType: Company,Default Payroll Payable Account,Numatytasis darbo užmokesčio mokamas paskyra
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atnaujinti paštas grupė
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atnaujinti paštas grupė
 DocType: Sales Invoice,Is Opening Entry,Ar atidarymas įrašą
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Nurodyk, jei nestandartinis gautinos sąskaitos taikoma"
 DocType: Course Schedule,Instructor Name,instruktorius Vardas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Sandėliavimo reikalingas prieš Pateikti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Sandėliavimo reikalingas prieš Pateikti
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,gautas
 DocType: Sales Partner,Reseller,perpardavinėjimo
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jei pažymėta, apims ne atsargos medžiagoje prašymus."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Prieš Pardavimų sąskaitos punktas
 ,Production Orders in Progress,Gamybos užsakymai Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Grynieji pinigų srautai iš finansavimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage &quot;yra pilna, neišsaugojo"
 DocType: Lead,Address & Contact,Adresas ir kontaktai
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridėti nepanaudotas lapus iš ankstesnių paskirstymų
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Kitas Pasikartojančios {0} bus sukurta {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Iš viso Sąnaudų suma (per Time lapas)
 DocType: Item Website Specification,Item Website Specification,Prekė svetainė Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Palikite Užblokuoti
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banko įrašai
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Prekė {0} pasiekė savo gyvenimo pabaigos apie {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Banko įrašai
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,metinis
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Akcijų Susitaikymas punktas
 DocType: Stock Entry,Sales Invoice No,Pardavimų sąskaita faktūra nėra
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Skelbia Hub
 DocType: Student Admission,Student Admission,Studentų Priėmimas
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Prekė {0} atšaukiamas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,medžiaga Prašymas
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Prekė {0} atšaukiamas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,medžiaga Prašymas
 DocType: Bank Reconciliation,Update Clearance Date,Atnaujinti Sąskaitų data
 DocType: Item,Purchase Details,pirkimo informacija
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Prekė {0} nerastas &quot;In žaliavos&quot; stalo Užsakymo {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neįvykdyti čekiai ir užstatai ir išvalyti
 DocType: Item,Synced With Hub,Sinchronizuojami su Hub
 DocType: Vehicle,Fleet Manager,laivyno direktorius
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Eilutė # {0}: {1} negali būti neigiamas už prekę {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Neteisingas slaptažodis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Eilutė # {0}: {1} negali būti neigiamas už prekę {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Neteisingas slaptažodis
 DocType: Item,Variant Of,variantas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Užbaigtas Kiekis negali būti didesnis nei &quot;Kiekis iki Gamyba&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Užbaigtas Kiekis negali būti didesnis nei &quot;Kiekis iki Gamyba&quot;
 DocType: Period Closing Voucher,Closing Account Head,Uždarymo sąskaita vadovas
 DocType: Employee,External Work History,Išorinis darbo istoriją
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ciklinę nuorodą Klaida
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Praneškite elektroniniu paštu steigti automatinio Medžiaga Užsisakyti
 DocType: Journal Entry,Multi Currency,Daugiafunkciniai Valiuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Sąskaitos faktūros tipas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Važtaraštis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Važtaraštis
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Įsteigti Mokesčiai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kaina Parduota turto
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Mokėjimo Įrašas buvo pakeistas po to, kai ištraukė ją. Prašome traukti jį dar kartą."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
-DocType: Grade Interval,Min Score,min balas
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} įvestas du kartus Prekės mokesčio
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Santrauka šią savaitę ir laukiant veikla
 DocType: Student Applicant,Admitted,pripažino
 DocType: Workstation,Rent Cost,nuomos kaina
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Užsakyti Vertė
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bankas / Grynųjų pinigų operacijos nuo šalies arba dėl vidinio pervedimo
 DocType: Shipping Rule,Valid for Countries,Galioja šalių
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Šis punktas yra šablonų ir negali būti naudojamas sandoriams. Elemento atributai bus nukopijuoti į variantai nebent &quot;Ne Kopijuoti&quot; yra nustatytas
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Šis punktas yra šablonų ir negali būti naudojamas sandoriams. Elemento atributai bus nukopijuoti į variantai nebent &quot;Ne Kopijuoti&quot; yra nustatytas
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Viso Užsakyti Laikomas
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbuotojų žymėjimas (pvz Vadovas, direktorius ir tt)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Prašome įvesti &quot;Pakartokite Mėnesio diena&quot; lauko reikšmę
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Eilutės # {0}: Pirkimo sąskaita faktūra negali būti pareikštas esamo turto {1}
 DocType: Item Tax,Tax Rate,Mokesčio tarifas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau skirta darbuotojo {1} laikotarpiui {2} į {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pasirinkite punktas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Pasirinkite punktas
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Pirkimo sąskaita faktūra {0} jau pateiktas
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Eilutės # {0}: Serijos Nr turi būti toks pat, kaip {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertuoti į ne grupės
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (daug) elemento.
 DocType: C-Form Invoice Detail,Invoice Date,Sąskaitos data
 DocType: GL Entry,Debit Amount,debeto suma
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Gali būti tik 1 sąskaita už Bendrovės {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Žiūrėkite priedą
 DocType: Purchase Order,% Received,% vartojo
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Sukurti studentų grupių
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Užklausimas
 DocType: Salary Slip Timesheet,Working Hours,Darbo valandos
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Pakeisti pradinį / trumpalaikiai eilės numerį esamo serijos.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Sukurti naują klientų
-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.","Jei ir toliau vyrauja daug kainodaros taisyklės, vartotojai, prašoma, kad prioritetas rankiniu būdu išspręsti konfliktą."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Sukurti Pirkimų užsakymus
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Sukurti naują klientų
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jei ir toliau vyrauja daug kainodaros taisyklės, vartotojai, prašoma, kad prioritetas rankiniu būdu išspręsti konfliktą."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Sukurti Pirkimų užsakymus
 ,Purchase Register,pirkimo Registruotis
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Taikomi Mokesčiai
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) turi vaidmenį &quot;Atostogos Tvirtintojas&quot;
 DocType: Purchase Receipt,Vehicle Date,Automobilio data
 DocType: Student Log,Medical,medicinos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,"Priežastis, dėl kurios praranda"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,"Priežastis, dėl kurios praranda"
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,"Švinas savininkas gali būti toks pat, kaip pirmaujančios"
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Paskirti suma gali ne didesnis nei originalios suma
 DocType: Announcement,Receiver,imtuvas
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kiekis ir Balsuok
 DocType: Delivery Note,% Installed,% Įdiegta
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Kabinetai / Laboratorijos tt, kai paskaitos gali būti planuojama."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Prašome įvesti įmonės pavadinimą pirmoji
 DocType: Purchase Invoice,Supplier Name,tiekėjas Vardas
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Skaityti ERPNext vadovas
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Privalomas laukas - akademiniai metai
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Privalomas laukas - akademiniai metai
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Tinkinti įvadinį tekstą, kad eina kaip tos paštu dalį. Kiekvienas sandoris turi atskirą įžanginį tekstą."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Prašome nustatyti numatytąją mokėtiną sąskaitos už bendrovės {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Global nustatymai visus gamybos procesus.
 DocType: Accounts Settings,Accounts Frozen Upto,Sąskaitos Šaldyti upto
 DocType: SMS Log,Sent On,išsiųstas
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Įgūdis {0} pasirinktas kelis kartus požymiai lentelėje
 DocType: HR Settings,Employee record is created using selected field. ,Darbuotojų įrašas sukurtas naudojant pasirinktą lauką.
 DocType: Sales Order,Not Applicable,Netaikoma
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Atostogų meistras.
 DocType: Request for Quotation Item,Required Date,Reikalinga data
 DocType: Delivery Note,Billing Address,atsiskaitymo Adresas
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Prašome įvesti Prekės kodas.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Prašome įvesti Prekės kodas.
 DocType: BOM,Costing,Sąnaudų
 DocType: Tax Rule,Billing County,atsiskaitymo apskritis
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jei pažymėta, mokesčių suma bus laikoma jau įtrauktas Print Rate / Spausdinti Suma"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Nuo paketas Nr
 DocType: Item Attribute,To Range,Norėdami Diapazonas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vertybiniai popieriai ir užstatai
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nepavyksta pakeisti vertinimo metodą, nes yra sandoriai prieš kai daiktų kuri neturi tai savo vertinimo metodas"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,skiriamos viso lapai yra privalomi
 DocType: Job Opening,Description of a Job Opening,Aprašymas apie Darbo skelbimai
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Kol veikla šiandien
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Prašome pasirinkti kursai
 DocType: Timesheet Detail,Hrs,h
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Prašome pasirinkti kompaniją
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Prašome pasirinkti kompaniją
 DocType: Stock Entry Detail,Difference Account,skirtumas paskyra
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Ar nėra artimas užduotis, nes jos priklauso nuo užduoties {0} nėra uždarytas."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prašome įvesti sandėlis, kuris bus iškeltas Medžiaga Prašymas"
 DocType: Production Order,Additional Operating Cost,Papildoma eksploatavimo išlaidos
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Sujungti, šie savybės turi būti tokios pačios tiek daiktų"
 DocType: Shipping Rule,Net Weight,Grynas svoris
 DocType: Employee,Emergency Phone,avarinis telefonas
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,nupirkti
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Prašome apibrėžti kokybės už slenksčio 0%
 DocType: Sales Order,To Deliver,Pristatyti
 DocType: Purchase Invoice Item,Item,punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serijos Nr punktas negali būti frakcija
 DocType: Journal Entry,Difference (Dr - Cr),Skirtumas (dr - Cr)
 DocType: Account,Profit and Loss,Pelnas ir nuostoliai
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,valdymas Subranga
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,"Prieaugis negali būti 0,"
 DocType: Production Planning Tool,Material Requirement,medžiagų poreikis
 DocType: Company,Delete Company Transactions,Ištrinti bendrovės verslo sandoriai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Nuorodos Nr ir nuoroda data yra privalomas banko sandorio
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Įdėti / Redaguoti mokesčių ir rinkliavų
 DocType: Purchase Invoice,Supplier Invoice No,Tiekėjas sąskaitoje Nr
 DocType: Territory,For reference,prašymą priimti prejudicinį sprendimą
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Įrengimas Pastaba Prekė
 DocType: Production Plan Item,Pending Qty,Kol Kiekis
 DocType: Budget,Ignore,ignoruoti
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} is not active
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} is not active
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS siunčiami šiais numeriais: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Sąranka patikrinti matmenys spausdinti
 DocType: Salary Slip,Salary Slip Timesheet,Pajamos Kuponas Lapą
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Iš viso Komisija
 DocType: Pricing Rule,Sales Partner,Partneriai pardavimo
 DocType: Buying Settings,Purchase Receipt Required,Pirkimo kvito Reikalinga
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Vertinimo rodiklis yra privalomas, jei atidarymas sandėlyje įvesta"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,rasti sąskaitos faktūros lentelės Nėra įrašų
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Prašome pasirinkti bendrovė ir šalies tipo pirmas
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansų / apskaitos metus.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,sukauptos vertybės
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atsiprašome, Eilės Nr negali būti sujungtos"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Padaryti pardavimo užsakymų
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Padaryti pardavimo užsakymų
 DocType: Project Task,Project Task,Projektų Užduotis
 ,Lead Id,Švinas ID
 DocType: C-Form Invoice Detail,Grand Total,Bendra suma
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Gyvenimo Priedas
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Pakartokite Klientai
 DocType: Leave Control Panel,Allocate,paskirstyti
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,pardavimų Grįžti
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,pardavimų Grįžti
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Pastaba: Iš viso skiriami lapai {0} turi būti ne mažesnis nei jau patvirtintų lapų {1} laikotarpiui
 DocType: Announcement,Posted By,Paskelbtas
 DocType: Item,Delivered by Supplier (Drop Ship),Paskelbta tiekėjo (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,citatos
 DocType: Lead,Middle Income,vidutines pajamas
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Anga (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,"Numatytasis Matavimo vienetas už prekę {0} negali būti pakeistas tiesiogiai, nes jūs jau padarė tam tikrą sandorį (-ius) su kitu UOM. Jums reikės sukurti naują elementą naudoti kitą numatytąjį UOM."
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Paskirti suma negali būti neigiama
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Prašome nurodyti Bendrovei
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Prašome nurodyti Bendrovei
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pardavimų sąskaita faktūra Lapą
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nuorodos Nr &amp; nuoroda data reikalingas {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Pasirinkite mokėjimo sąskaitos, kad bankų įėjimo"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Sukurti darbuotojams įrašus valdyti lapai, išlaidų paraiškos ir darbo užmokesčio"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pridėti į žinių bazės
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pasiūlymas rašymas
 DocType: Payment Entry Deduction,Payment Entry Deduction,Mokėjimo Įėjimo išskaičiavimas
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &quot;{1}&quot; ne fiskaliniais metais {2}
 DocType: Buying Settings,Settings for Buying Module,Nustatymai Ieško modulis
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Turto {0} nepriklauso bendrovei {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Prašome įvesti pirkimo kvito pirmasis
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Prašome įvesti pirkimo kvito pirmasis
 DocType: Buying Settings,Supplier Naming By,Tiekėjas įvardijimas Iki
 DocType: Activity Type,Default Costing Rate,Numatytasis Sąnaudų norma
 DocType: Maintenance Schedule,Maintenance Schedule,Priežiūros planas
-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.","Tada Kainodaros taisyklės yra išfiltruotas remiantis Klientui, klientų grupės, teritorijoje, tiekėjas, Tiekėjas tipas, kampanijos partneris pardavimo ir tt"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Tada Kainodaros taisyklės yra išfiltruotas remiantis Klientui, klientų grupės, teritorijoje, tiekėjas, Tiekėjas tipas, kampanijos partneris pardavimo ir tt"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Grynasis pokytis Inventorius
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Darbuotojų Paskolos valdymas
 DocType: Employee,Passport Number,Paso numeris
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Ryšys su Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,vadybininkas
 DocType: Payment Entry,Payment From / To,Mokėjimo Nuo / Iki
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Data asortimentas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nauja kredito limitas yra mažesnis nei dabartinio nesumokėtos sumos klientui. Kredito limitas turi būti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Tas pats daiktas buvo įvesta kelis kartus.
 DocType: SMS Settings,Receiver Parameter,imtuvas Parametras
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,&quot;Remiantis&quot; ir &quot;grupę&quot; negali būti tas pats
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,per kelias minutes
 DocType: Issue,Resolution Date,geba data
 DocType: Student Batch Name,Batch Name,Serija Vardas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Lapą sukurta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Lapą sukurta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prašome nustatyti numatytąją grynaisiais ar banko sąskaitą mokėjimo būdas {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,įrašyti
 DocType: Selling Settings,Customer Naming By,Klientų įvardijimas Iki
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Parodys studentą kaip pristatyti Studentų Mėnesio Lankomumas ataskaitos
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Tikrasis Pradžios laikas
 DocType: BOM Operation,Operation Time,veikimo laikas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Baigti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bazė
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Bazė
 DocType: Timesheet,Total Billed Hours,Iš viso Apmokestintos valandos
 DocType: Journal Entry,Write Off Amount,Nurašyti suma
 DocType: Journal Entry,Bill No,Billas Nėra
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Studentų dalyvavimas
 DocType: Sales Invoice Timesheet,Time Sheet,laikas lapas
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Žaliavos remiantis
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Prašome įvesti Išsamesnė informacija
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Prašome įvesti Išsamesnė informacija
 DocType: Interest,Interest,palūkanos
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Pardavimai
 DocType: Purchase Receipt,Other Details,Kitos detalės
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Mokėjimo įrašas jau yra sukurta
 DocType: Purchase Receipt Item Supplied,Current Stock,Dabartinis sandėlyje
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},"Eilutės # {0}: Turto {1} nėra susijęs su straipsniais, {2}"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Peržiūrėti darbo užmokestį
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Peržiūrėti darbo užmokestį
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Sąskaita {0} buvo įrašytas kelis kartus
 DocType: Account,Expenses Included In Valuation,"Sąnaudų, įtrauktų Vertinimo"
 DocType: Hub Settings,Seller City,Pardavėjo Miestas
 ,Absent Student Report,Nėra studento ataskaitos
 DocType: Email Digest,Next email will be sent on:,Kitas laiškas bus išsiųstas į:
 DocType: Offer Letter Term,Offer Letter Term,Laiško su pasiūlymu terminas
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Prekė turi variantus.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Prekė turi variantus.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Prekė {0} nerastas
 DocType: Bin,Stock Value,vertybinių popierių kaina
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Įmonės {0} neegzistuoja
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,medis tipas
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,medis tipas
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kiekis Suvartoti Vieneto
 DocType: Serial No,Warranty Expiry Date,Garantija Galiojimo data
 DocType: Material Request Item,Quantity and Warehouse,Kiekis ir sandėliavimo
 DocType: Sales Invoice,Commission Rate (%),Komisija tarifas (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Prašome pasirinkti programą
 DocType: Project,Estimated Cost,Numatoma kaina
@@ -768,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} nėra sandėlyje punktas
 DocType: Mode of Payment Account,Default Account,numatytoji paskyra
 DocType: Payment Entry,Received Amount (Company Currency),Gautos sumos (Įmonės valiuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Švinas turi būti nustatyti, jei galimybės yra pagamintas iš švino"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Prašome pasirinkti savaitę nuo dieną
 DocType: Production Order Operation,Planned End Time,Planuojamas Pabaigos laikas
 ,Sales Person Target Variance Item Group-Wise,Pardavimų Asmuo Tikslinė Dispersija punktas grupė-Išminčius
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,galimybė Nuo
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mėnesinis darbo užmokestis pareiškimas.
 DocType: BOM,Website Specifications,Interneto svetainė duomenys
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nuo {0} tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Eilutės {0}: konversijos faktorius yra privalomas
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C Nr
 DocType: Bank Guarantee,Project,projektas
 DocType: Quality Inspection Reading,Reading 7,Skaitymas 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,dalinai Užsakytas
 DocType: Expense Claim Detail,Expense Claim Type,Kompensuojamos Paraiškos tipas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Numatytieji nustatymai krepšelį
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Turto sunaikintas per žurnalo įrašą {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,biotechnologijos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Biuro išlaikymo sąnaudos
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Įsteigti pašto dėžutę
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Prašome įvesti Elementą pirmas
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Prašome įvesti Elementą pirmas
 DocType: Account,Liability,atsakomybė
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcijos suma negali būti didesnė nei ieškinio suma eilutėje {0}.
 DocType: Company,Default Cost of Goods Sold Account,Numatytasis išlaidos parduotų prekių sąskaita
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Kainų sąrašas nepasirinkote
 DocType: Employee,Family Background,šeimos faktai
 DocType: Request for Quotation Supplier,Send Email,Siųsti laišką
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Įspėjimas: Neteisingas Priedas {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nėra leidimo
 DocType: Company,Default Bank Account,Numatytasis banko sąskaitos
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Filtruoti remiantis partijos, pasirinkite Šalis Įveskite pirmą"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nėra darbuotojas nerasta
 DocType: Supplier Quotation,Stopped,sustabdyta
 DocType: Item,If subcontracted to a vendor,Jei subrangos sutartį pardavėjas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentų grupė jau yra atnaujinama.
 DocType: SMS Center,All Customer Contact,Viskas Klientų Susisiekite
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Įkelti akcijų likutį naudodami CSV.
 DocType: Warehouse,Tree Details,medis detalės
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalus sąskaitos faktūros suma
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kaina centras {2} nepriklauso Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Sąskaitos {2} negali būti Grupė
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus &quot;{DOCTYPE}&quot; stalo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prekė eilutė {IDX}: {DOCTYPE} {DOCNAME} neegzistuoja viršaus &quot;{DOCTYPE}&quot; stalo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Lapą {0} jau baigė arba atšaukti
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,nėra užduotys
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mėnesio diena, kurią bus sukurta pvz 05, 28 ir tt automatinis sąskaitos faktūros"
 DocType: Asset,Opening Accumulated Depreciation,Atidarymo sukauptas nusidėvėjimas
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Balsuok
 DocType: Production Planning Tool,Select Items,pasirinkite prekę
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} prieš Bill {1} {2} data
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Žinoma Tvarkaraštis
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Žinoma Tvarkaraštis
 DocType: Maintenance Visit,Completion Status,užbaigimo būsena
 DocType: HR Settings,Enter retirement age in years,Įveskite pensinį amžių metais
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Tikslinė sandėlis
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Leisti per pristatymą ar gavimo net iki šio proc
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,importas Lankomumas
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Visi punktas Grupės
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punktas Grupės
 DocType: Process Payroll,Activity Log,veiklos žurnalas
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Grynasis pelnas / nuostolis
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatiškai kurti pranešimą pateikus sandorius.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Pirkimo užsakymas su mokėjimo
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,"prognozuojama, Kiekis"
 DocType: Sales Invoice,Payment Due Date,Sumokėti iki
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Prekė variantas {0} jau egzistuoja su tais pačiais atributais
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Atidarymas&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atidarykite daryti
 DocType: Notification Control,Delivery Note Message,Važtaraštis pranešimas
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re Užsakomas kiekis
 DocType: Leave Block List Date,Leave Block List Date,Palikite Blokuoti sąrašą data
 DocType: Pricing Rule,Price or Discount,Kaina arba nuolaida
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Iš viso taikomi mokesčiai į pirkimo kvito sumų lentelė turi būti tokios pačios kaip viso mokesčių ir rinkliavų
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Iš viso taikomi mokesčiai į pirkimo kvito sumų lentelė turi būti tokios pačios kaip viso mokesčių ir rinkliavų
 DocType: Sales Team,Incentives,paskatos
 DocType: SMS Log,Requested Numbers,Pageidaujami numeriai
 DocType: Production Planning Tool,Only Obtain Raw Materials,Gauti tik žaliavų panaudojimas
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,subrangos sutartis
 DocType: Item Attribute,Item Attribute Values,Prekė atributų reikšmes
 DocType: Examination Result,Examination Result,tyrimo rezultatas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,pirkimo kvito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,pirkimo kvito
 ,Received Items To Be Billed,Gauti duomenys turi būti apmokestinama
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Pateikė Pajamos Apatinukai
 DocType: Employee,Ms,ponia
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valiutos kursas meistras.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Nuoroda Dokumento tipo turi būti vienas iš {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Nuoroda Dokumento tipo turi būti vienas iš {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nepavyko rasti laiko tarpsnių per ateinančius {0} dienų darbui {1}
 DocType: Production Order,Plan material for sub-assemblies,Planas medžiaga mazgams
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pardavimų Partneriai ir teritorija
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Negalima automatiškai sukurti paskyrą nes jau akcijų likutį Sąskaitoje. Jūs turite sukurti atitikimo sąskaitą iki jūs galite padaryti įrašą apie šį sandėlį
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Numatytieji mokėtinų sumų
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbuotojų {0} is not active arba neegzistuoja
 DocType: Fee Structure,Components,komponentai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Prekė Variantai {0} atnaujinama
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Prašome įvesti Turto kategorija prekės {0}
 DocType: Quality Inspection Reading,Reading 6,Skaitymas 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Negaliu {0} {1} {2} be jokio neigiamo išskirtinis sąskaita
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkimo faktūros Advance
 DocType: Hub Settings,Sync Now,Sinchronizuoti dabar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Eilutės {0}: Kredito įrašas negali būti susieta su {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,Ar pirkimas Prekės
 DocType: Asset,Purchase Invoice,pirkimo sąskaita faktūra
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Išsamiau Nėra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nauja pardavimo sąskaita-faktūra
 DocType: Stock Entry,Total Outgoing Value,Iš viso Siuntimo kaina
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Atidarymo data ir galutinis terminas turėtų būti per patį finansiniams metams
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Atidarymo data ir galutinis terminas turėtų būti per patį finansiniams metams
 DocType: Lead,Request for Information,Paprašyti informacijos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sinchronizuoti Atsijungęs Sąskaitos
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sinchronizuoti Atsijungęs Sąskaitos
 DocType: Payment Request,Paid,Mokama
 DocType: Program Fee,Program Fee,programos mokestis
 DocType: Salary Slip,Total in words,Iš viso žodžiais
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,sankcijos
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,yra privaloma. Gal valiutų įrašas nėra sukurtas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},Eilutės # {0}: Prašome nurodyti Serijos Nr už prekę {1}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","Dėl &quot;produktas Bundle reikmenys, sandėlis, Serijos Nr paketais Nėra bus laikomas iš&quot; apyrašas stalo &quot;. Jei Sandėlio ir Serija Ne yra vienoda visoms pakavimo jokių daiktų &quot;produktas Bundle&quot; elemento, tos vertės gali būti įrašoma į pagrindinę punkto lentelėje, vertės bus nukopijuoti į &quot;apyrašas stalo."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Dėl &quot;produktas Bundle reikmenys, sandėlis, Serijos Nr paketais Nėra bus laikomas iš&quot; apyrašas stalo &quot;. Jei Sandėlio ir Serija Ne yra vienoda visoms pakavimo jokių daiktų &quot;produktas Bundle&quot; elemento, tos vertės gali būti įrašoma į pagrindinę punkto lentelėje, vertės bus nukopijuoti į &quot;apyrašas stalo."
 DocType: Job Opening,Publish on website,Skelbti tinklapyje
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Vežimas klientams.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Tiekėjas sąskaitos faktūros išrašymo data negali būti didesnis nei Skelbimo data
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,variantiškumas
 ,Company Name,Įmonės pavadinimas
 DocType: SMS Center,Total Message(s),Bendras pranešimas (-ai)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Pasirinkite punktas perkelti
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Pasirinkite punktas perkelti
 DocType: Purchase Invoice,Additional Discount Percentage,Papildoma nuolaida procentais
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Peržiūrėkite visas pagalbos video sąrašą
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Pasirinkite sąskaita Banko vadovas kurioje patikrinimas buvo deponuoti.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Eilutės {0}: Mokėjimo prieš pirkimo / pardavimo ordino visada turi būti pažymėtas kaip anksto
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,cheminis
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Numatytasis Bankas / Pinigų sąskaita bus automatiškai atnaujinta užmokesčių žurnalo įrašą, kai pasirinktas šis būdas."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Už Įvertinimas kodekso intervalai {0} sutampa su klasės intervalais kitų klasių. Prašome patikrinti intervalai {0} ir {1} ir bandykite dar kartą
 DocType: BOM,Raw Material Cost(Company Currency),Žaliavų kaina (Įmonės valiuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Visos prekės jau buvo pervestos šios produkcijos įsakymu.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Eilutė # {0}: Įvertinti gali būti ne didesnis nei naudotu dydžiu {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM svetainė punktas
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Įkelti savo laiške galvą ir logotipą. (Galite redaguoti juos vėliau).
 DocType: Timesheet Detail,Bill,sąskaita
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Kitas Nusidėvėjimas data yra įvesta kaip praeities datos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,baltas
 DocType: SMS Center,All Lead (Open),Visi švinas (Atviras)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Eilutės {0}: Kiekis neprieinama {4} sandėlyje {1} ne komandiruotės laiką įrašo ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Gauti avansai Mokama
 DocType: Item,Automatically Create New Batch,Automatiškai Sukurti naują partiją
 DocType: Item,Automatically Create New Batch,Automatiškai Sukurti naują partiją
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,padaryti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,padaryti
 DocType: Student Admission,Admission Start Date,Priėmimo pradžios data
 DocType: Journal Entry,Total Amount in Words,Iš viso suma žodžiais
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Įvyko klaida. Vienas tikėtina priežastis gali būti, kad jūs neišsaugojote formą. Prašome susisiekti su support@erpnext.com jei problema išlieka."
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Pavedimo tipas turi būti vienas iš {0}
 DocType: Lead,Next Contact Date,Kitas Kontaktinė data
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,atidarymo Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Prašome įvesti sąskaitą pokyčio sumą
 DocType: Student Batch Name,Student Batch Name,Studentų Serija Vardas
 DocType: Holiday List,Holiday List Name,Atostogų sąrašas Vardas
 DocType: Repayment Schedule,Balance Loan Amount,Balansas Paskolos suma
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Nurodykite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,"Pašalinti elementai, be jokių kiekio ar vertės pokyčius."
 DocType: Delivery Note,Delivery To,Pristatyti
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Įgūdis lentelė yra privalomi
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Įgūdis lentelė yra privalomi
 DocType: Production Planning Tool,Get Sales Orders,Gauk pardavimo užsakymus
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negali būti neigiamas
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Nuolaida
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Nuolaida
 DocType: Asset,Total Number of Depreciations,Viso nuvertinimai
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
 DocType: Sales Invoice Item,Rate With Margin,Norma atsargos
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserved Sandėlis pardavimų užsakymų / Finished produkcijos sandėlis
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Parduodami suma
 DocType: Repayment Schedule,Interest Amount,palūkanų suma
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Jūs esate sąskaita Tvirtintojas už šio įrašo. Atnaujinkite parametras &quot;status&quot; ir sutaupykite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Jūs esate sąskaita Tvirtintojas už šio įrašo. Atnaujinkite parametras &quot;status&quot; ir sutaupykite
 DocType: Serial No,Creation Document No,Kūrimas dokumentas Nr
 DocType: Issue,Issue,emisija
 DocType: Asset,Scrapped,metalo laužą
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Savybės už prekę variantų. pvz dydis, spalva ir tt"
 DocType: Purchase Invoice,Returns,grąžinimas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP sandėlis
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serijos Nr {0} yra pagal priežiūros sutartį net iki {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijos Nr {0} yra pagal priežiūros sutartį net iki {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,verbavimas
 DocType: Lead,Organization Name,Organizacijos pavadinimas
 DocType: Tax Rule,Shipping State,Pristatymas valstybė
 ,Projected Quantity as Source,"Prognozuojama, Kiekis, kaip šaltinį"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Prekė turi būti pridėta naudojant &quot;gauti prekes nuo pirkimo kvitus&quot; mygtuką
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Prekė turi būti pridėta naudojant &quot;gauti prekes nuo pirkimo kvitus&quot; mygtuką
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Įtraukti ne atsargos
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,pardavimų sąnaudos
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,prieš
 DocType: Item,Default Selling Cost Center,Numatytasis Parduodami Kaina centras
 DocType: Sales Partner,Implementation Partner,įgyvendinimas partneriu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Pašto kodas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Pašto kodas
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pardavimų užsakymų {0} yra {1}
 DocType: Opportunity,Contact Info,Kontaktinė informacija
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Padaryti atsargų papildymams
 DocType: Packing Slip,Net Weight UOM,Grynasis svoris UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} rezultatai
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} rezultatai
 DocType: Item,Default Supplier,numatytasis Tiekėjas
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Per Gamybos pašalpų procentinė dalis
 DocType: Employee Loan,Repayment Schedule,grąžinimo grafikas
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Gauk Savaitinis Off Datos
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Pabaigos data negali būti mažesnė negu pradžios data
 DocType: Sales Person,Select company name first.,Pasirinkite įmonės pavadinimas pirmas.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citatos, gautų iš tiekėjų."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Norėdami {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidutinis amžius
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Pagrindiniai veiklos sritis
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportavimas
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neteisingas Įgūdis
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} turi būti pateiktas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} turi būti pateiktas
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kiekis turi būti mažesnis arba lygus {0}
 DocType: SMS Center,Total Characters,Iš viso Veikėjai
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Prašome pasirinkti BOM BOM į lauką punkte {0}
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,skirstytuvas
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Krepšelis Pristatymas taisyklė
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Gamybos Užsakyti {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Prašome nustatyti &quot;Taikyti papildomą nuolaidą On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Prašome nustatyti &quot;Taikyti papildomą nuolaidą On&quot;
 ,Ordered Items To Be Billed,Užsakytas prekes Norėdami būti mokami
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Iš klasės turi būti mažesnis nei svyruoja
 DocType: Global Defaults,Global Defaults,Global Numatytasis
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,pradžios metus
 DocType: Purchase Invoice,Start date of current invoice's period,Pradžios data einamųjų sąskaitos faktūros laikotarpį
 DocType: Salary Slip,Leave Without Pay,Palikite be darbo užmokesčio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Talpa planavimas Klaida
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Talpa planavimas Klaida
 ,Trial Balance for Party,Bandomoji likutis partijos
 DocType: Lead,Consultant,konsultantas
 DocType: Salary Slip,Earnings,Pajamos
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tai bus pridėtas prie elemento kodekso variante. Pavyzdžiui, jei jūsų santrumpa yra &quot;S.&quot;, o prekės kodas yra T-shirt &quot;, elementas kodas variantas bus&quot; T-shirt-SM &quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto darbo užmokestis (žodžiais) bus matomas, kai jums sutaupyti darbo užmokestį."
 DocType: Purchase Invoice,Is Return,Ar Grįžti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Prekių grąžinimas / debeto aviza
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Prekių grąžinimas / debeto aviza
 DocType: Price List Country,Price List Country,Kainų sąrašas Šalis
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} galioja eilės numeriai už prekę {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Prašome įvesti Prekės kodas gauti SERIJOS NUMERIS
 DocType: Stock Settings,Default Item Group,Numatytasis Elementas Grupė
 DocType: Employee Loan,Partially Disbursed,dalinai Išmokėta
-DocType: Grading Structure,Grading System Name,Vertinimo sistemą Vardas
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tiekėjas duomenų bazę.
 DocType: Account,Balance Sheet,Balanso lapas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Kainuos centras už prekę su Prekės kodas &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mokėjimo būdas yra neužpildė. Prašome patikrinti, ar sąskaita buvo nustatytas mokėjimų Mode arba POS profilis."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Jūsų pardavimų asmuo bus gauti priminimą šią dieną kreiptis į klientų
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Tas pats daiktas negali būti įrašytas kelis kartus.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Daugiau sąskaitos gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Pirkimui užsakyti klausimai turi būti apmokestinama
 DocType: Purchase Invoice Item,Net Rate,grynasis Balsuok
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkimo faktūros Elementą
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akcijų Ledgeris Įrašai ir GL Įrašai pakartotinai paskelbtas kur nors pasirinktų įsigijimo kvitai
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akcijų Ledgeris Įrašai ir GL Įrašai pakartotinai paskelbtas kur nors pasirinktų įsigijimo kvitai
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,1 punktas
 DocType: Holiday,Holiday,atostogų
 DocType: Support Settings,Close Issue After Days,Uždaryti išdavimas Po dienos
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Darbas pabaigtas
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Prašome nurodyti bent vieną atributą Atributų lentelės
 DocType: Announcement,All Students,Visi studentai
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Prekė {0} turi būti ne akcijų punktas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Prekė {0} turi būti ne akcijų punktas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Peržiūrėti Ledgeris
 DocType: Grading Scale,Intervals,intervalai
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Seniausi
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Prekę grupė egzistuoja to paties pavadinimo, prašom pakeisti elementą vardą ar pervardyti elementą grupę"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Studentų Mobilus Ne
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Likęs pasaulis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Naudodami {0} punktas negali turėti Serija
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Apmokėjimas algos nuo {0} ir {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Neregistruota redaguoti įšaldytą sąskaitą {0}
 DocType: Journal Entry,Get Outstanding Invoices,Gauk neapmokėtų sąskaitų faktūrų
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pardavimų užsakymų {0} negalioja
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Pirkimo pavedimai padės jums planuoti ir sekti savo pirkimų
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Atsiprašome, įmonės negali būti sujungtos"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Bendras išdavimas / Pervežimas kiekis {0} Krovimas Užsisakyti {1} \ negali būti didesnis nei prašomo kiekio {2} už prekę {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,mažas
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,netiesioginės išlaidos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Eilutės {0}: Kiekis yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Žemdirbystė
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sinchronizavimo Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sinchronizavimo Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Savo produktus ar paslaugas
 DocType: Mode of Payment,Mode of Payment,mokėjimo būdas
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Interneto svetainė Paveikslėlis turėtų būti valstybės failą ar svetainės URL
 DocType: Student Applicant,AP,A.
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tai yra šaknis punktas grupė ir negali būti pakeisti.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Grupė salė Taškų
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",Dėl {0} tik kredito sąskaitos gali būti susijęs su kitos debeto įrašą
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Bendras visų užduočių svoriai turėtų būti 1. Prašome reguliuoti svareliai visų projekto užduotis atitinkamai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Važtaraštis {0} nebus pateiktas
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,Prekė {0} turi būti Prekė pagal subrangos sutartis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,kapitalo įranga
-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.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Kainodaros taisyklė pirmiausia atrenkami remiantis &quot;Taikyti&quot; srityje, kuris gali būti punktas, punktas Grupė ar prekės ženklą."
 DocType: Hub Settings,Seller Website,Pardavėjo Interneto svetainė
 DocType: Item,ITEM-,item-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Iš viso skyrė procentas pardavimų vadybininkas turi būti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Gamybos Užsakymo statusas yra {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Gamybos Užsakymo statusas yra {0}
 DocType: Appraisal Goal,Goal,Tikslas
 DocType: Sales Invoice Item,Edit Description,Redaguoti Aprašymas
 ,Team Updates,komanda Atnaujinimai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,tiekėjas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,tiekėjas
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,"Nustatymas sąskaitos rūšis, padedanti renkantis šį Narystė sandoriuose."
 DocType: Purchase Invoice,Grand Total (Company Currency),Bendra suma (Įmonės valiuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Sukurti Spausdinti formatas
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,žurnalo įrašą
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementų pažangą
 DocType: Workstation,Workstation Name,Kompiuterizuotos darbo vietos Vardas
-DocType: Grade Interval,Grade Code,Įvertinimas kodas
+DocType: Grading Scale Interval,Grade Code,Įvertinimas kodas
 DocType: POS Item Group,POS Item Group,POS punktas grupė
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Siųskite Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepriklauso punkte {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,techninė įranga
 DocType: Sales Order,Recurring Upto,pasikartojančios upto
 DocType: Attendance,HR Manager,Žmogiškųjų išteklių vadybininkas
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Prašome pasirinkti įmonę,"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Prašome pasirinkti įmonę,"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,privilegija atostogos
 DocType: Purchase Invoice,Supplier Invoice Date,Tiekėjas sąskaitos faktūros išrašymo data
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Jums reikia įgalinti Prekių krepšelis
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,maistas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Senėjimas klasės 3
 DocType: Maintenance Schedule Item,No of Visits,Nėra apsilankymų
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Pažymėti Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Pažymėti Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Techninės priežiūros grafikas {0} egzistuoja nuo {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,mokosi studentas
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valiuta uždarymo sąskaita turi būti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma kiekis visų tikslų turėtų būti 100. Tai {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Vid Dienos Siunčiami
 DocType: POS Profile,Campaign,Kampanija
 DocType: Supplier,Name and Type,Pavadinimas ir tipas
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Patvirtinimo būsena turi būti &quot;Patvirtinta&quot; arba &quot;Atmesta&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Patvirtinimo būsena turi būti &quot;Patvirtinta&quot; arba &quot;Atmesta&quot;
 DocType: Purchase Invoice,Contact Person,kontaktinis asmuo
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Tikėtinas pradžios data&quot; gali būti ne didesnis nei &quot;Expected Pabaigos data&quot;
 DocType: Course Scheduling Tool,Course End Date,Žinoma Pabaigos data
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Pristatymas Adresas Pavadinimas
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Sąskaitų planas
 DocType: Material Request,Terms and Conditions Content,Terminai ir sąlygos turinys
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,negali būti didesnis nei 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,negali būti didesnis nei 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Prekė {0} nėra sandėlyje punktas
 DocType: Maintenance Visit,Unscheduled,Neplanuotai
 DocType: Employee,Owned,priklauso
 DocType: Salary Detail,Depends on Leave Without Pay,Priklauso nuo atostogų be Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Kuo didesnis skaičius, didesnis prioritetas"
 ,Purchase Invoice Trends,Pirkimo faktūros tendencijos
 DocType: Employee,Better Prospects,Geresnės perspektyvos
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Eilutė # {0}: Partija {1} turi tik {2} vnt. Prašome pasirinkti kitą partiją, kuri turi gauti {3} Kiekis arba padalinti eilutę į kelias eilutes, pristatyti / problemą iš kelių partijų"
 DocType: Vehicle,License Plate,Valstybinis numeris
 DocType: Appraisal,Goals,Tikslai
 DocType: Warranty Claim,Warranty / AMC Status,Garantija / AMC Būsena
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbuotojas negali pranešti pats.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jei sąskaita yra sušaldyti, įrašai leidžiama ribojamų vartotojams."
 DocType: Email Digest,Bank Balance,banko balansas
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Apskaitos įrašas už {0}: {1} galima tik valiuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darbo profilis, reikalingas kvalifikacijos ir tt"
 DocType: Journal Entry Account,Account Balance,Sąskaitos balansas
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Mokesčių taisyklė sandorius.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rodyti Atvirų fiskalinius metus anketa P &amp; L likučius
 DocType: Shipping Rule,Shipping Account,Pristatymas paskyra
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Sąskaitos {2} yra neaktyvus
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Padaryti pardavimo užsakymus, siekiant padėti jums planuoti savo darbą ir įgyvendinti laiku"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Padaryti pardavimo užsakymus, siekiant padėti jums planuoti savo darbą ir įgyvendinti laiku"
 DocType: Quality Inspection,Readings,Skaitiniai
 DocType: Stock Entry,Total Additional Costs,Iš viso papildomų išlaidų
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,Vertinti
 DocType: Asset Movement,Stock Manager,akcijų direktorius
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Šaltinis sandėlis yra privalomas eilės {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Pakavimo lapelis
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakavimo lapelis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Biuro nuoma
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Sąranka SMS Gateway nustatymai
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importas Nepavyko!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,Paslaugos
 DocType: HR Settings,Email Salary Slip to Employee,Siųsti darbo užmokestį į darbuotojų
 DocType: Cost Center,Parent Cost Center,Tėvų Kaina centras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Pasirinkite Galima Tiekėjo
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Pasirinkite Galima Tiekėjo
 DocType: Sales Invoice,Source,šaltinis
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rodyti uždarytas
 DocType: Leave Type,Is Leave Without Pay,Ar palikti be Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Turto Kategorija privaloma ilgalaikio turto
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,rasti Mokėjimo stalo Nėra įrašų
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šis {0} prieštarauja {1} ir {2} {3}
 DocType: Student Attendance Tool,Students HTML,studentai HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,Data Palikus
 DocType: Pricing Rule,For Price List,Kaina sąrašas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Sukurti leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Sukurti leads
 DocType: Maintenance Schedule,Schedules,tvarkaraščiai
 DocType: Purchase Invoice Item,Net Amount,Grynoji suma
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Išsamiau Nėra
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,programa mokinių
 DocType: Sales Invoice Item,Brand Name,Markės pavadinimas
 DocType: Purchase Receipt,Transporter Details,Transporter detalės
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Numatytasis sandėlis reikalingas pasirinktą elementą
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Dėžė
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,galimas Tiekėjas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,galimas Tiekėjas
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
 DocType: Budget,Monthly Distribution,Mėnesio pasiskirstymas
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Imtuvas sąrašas tuščias. Prašome sukurti imtuvas sąrašas
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Partneriai pardavimo Tikslinė
 DocType: Loan Type,Maximum Loan Amount,Maksimali paskolos suma
 DocType: Pricing Rule,Pricing Rule,kainodaros taisyklė
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dublikatas ritinys numeris studentas {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Veiksmų, jei metinio biudžeto Viršytas"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Medžiaga Prašymas Pirkimo užsakymas
 DocType: Shopping Cart Settings,Payment Success URL,Mokėjimo Sėkmės adresas
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,grąžinimas būdas
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jei pažymėta, Titulinis puslapis bus numatytasis punktas grupė svetainėje"
 DocType: Quality Inspection Reading,Reading 4,svarstymą 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Numatytąją BOM už {0} ne projekto rasti {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Numatytąją BOM už {0} ne projekto rasti {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Ieškiniai dėl įmonės sąskaita.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentai ne sistemos širdyje, pridėti visus savo mokinius"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentai ne sistemos širdyje, pridėti visus savo mokinius"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Eilutės # {0} klirensas data {1} negali būti prieš čekis data {2}
 DocType: Company,Default Holiday List,Numatytasis poilsis sąrašas
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Eilutės {0}: Nuo laiką ir Laikas {1} iš dalies sutampa su {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dieną (-os), kada prašote atostogų yra šventės. Jums nereikia prašyti atostogų."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Persiųsti Mokėjimo paštu
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nauja užduotis
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Padaryti Citata
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Padaryti Citata
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Kiti pranešimai
 DocType: Dependent Task,Dependent Task,priklauso nuo darbo
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijos koeficientas pagal nutylėjimą Matavimo vienetas turi būti 1 eilės {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atostogos tipo {0} negali būti ilgesnis nei {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Pabandykite planuoja operacijas X dienų iš anksto.
 DocType: HR Settings,Stop Birthday Reminders,Sustabdyti Gimimo diena Priminimai
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Prašome Set Default Darbo užmokesčio MOKĖTINOS Narystė Bendrovėje {0}
 DocType: SMS Center,Receiver List,imtuvas sąrašas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Paieška punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Paieška punktas
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,suvartoti suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Grynasis Pakeisti pinigais
 DocType: Assessment Plan,Grading Scale,vertinimo skalė
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jau baigtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Matavimo vienetas {0} buvo įrašytas daugiau nei vieną kartą konversijos koeficientas lentelėje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,jau baigtas
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Mokėjimo prašymas jau yra {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kaina išduotą prekės
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Kiekis turi būti ne daugiau kaip {0}
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Padaryti Išmok ÷ jimo įrašas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Eilutės {0}: Išankstinis prieš Tiekėjas turi būti nurašyti
 DocType: Company,Default Values,numatytosios vertės
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Dažnis} Digest &quot;
 DocType: Expense Claim,Total Amount Reimbursed,Iš viso kompensuojama suma
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tai grindžiama rąstų prieš šią transporto priemonę. Žiūrėti grafikas žemiau detales
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,rinkti
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Prieš tiekėjo sąskaitoje {0} data {1}
 DocType: Customer,Default Price List,Numatytasis Kainų sąrašas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Turto Judėjimo įrašas {0} sukūrė
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs negalite trinti finansiniai metai {0}. Finansiniai metai {0} yra numatytoji Global Settings
 DocType: Journal Entry,Entry Type,įrašo tipas
 ,Customer Credit Balance,Klientų kredito likučio
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nė vienas iš daiktų turite kokių nors kiekio ar vertės pokyčius.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Privalomas laukas - Programa
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Privalomas laukas - Programa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantija Pretenzija
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantija Pretenzija
 ,Lead Details,Švino detalės
 DocType: Salary Slip,Loan repayment,paskolos grąžinimo
 DocType: Purchase Invoice,End date of current invoice's period,Pabaigos data einamųjų sąskaitos faktūros laikotarpį
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,Nuolatinis adresas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Iš anksto sumokėta prieš {0} {1} negali būti didesnis \ nei IŠ VISO {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Prašome pasirinkti Prekės kodas
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Prašome pasirinkti Prekės kodas
 DocType: Student Sibling,Studying in Same Institute,Studijos pačiu instituto
 DocType: Territory,Territory Manager,teritorija direktorius
 DocType: Packed Item,To Warehouse (Optional),Į sandėlį (neprivalomas)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
 DocType: Payment Entry,Paid Amount (Company Currency),Mokama suma (Įmonės valiuta)
 DocType: Purchase Invoice,Additional Discount,Papildoma nuolaida
 DocType: Selling Settings,Selling Settings,parduoda Nustatymai
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Žiūrėti krepšelį
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,rinkodaros išlaidos
 ,Item Shortage Report,Prekė trūkumas ataskaita
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",Svoris paminėta \ nLūdzu paminėti &quot;Svoris UOM&quot; per
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Medžiaga Prašymas naudojamas, kad šių išteklių įrašas"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Kitas Nusidėvėjimas data yra privalomas naujo turto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Kitas Nusidėvėjimas data yra privalomas naujo turto
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atskiras kursas grindžiamas grupė kiekvieną partiją
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atskiras kursas grindžiamas grupė kiekvieną partiją
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Vieno vieneto elementą.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kaina centras yra reikalingas &quot;Pelno ir nuostolio&quot; sąskaitos {2}. Prašome įkurti numatytąją sąnaudų centro bendrovei.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Klientų grupė egzistuoja to paties pavadinimo prašome pakeisti kliento vardą arba pervardyti klientų grupei
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,Klientų grupė egzistuoja to paties pavadinimo prašome pakeisti kliento vardą arba pervardyti klientų grupei
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,nauja Susisiekite
 DocType: Territory,Parent Territory,tėvų teritorija
 DocType: Quality Inspection Reading,Reading 2,Skaitymas 2
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,Prekė išmintingas Pardavimų Registruotis
 DocType: Asset,Gross Purchase Amount,Pilna Pirkimo suma
 DocType: Asset,Depreciation Method,nusidėvėjimo metodas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Atsijungęs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Atsijungęs
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Ar šis mokestis įtrauktas į bazinę palūkanų normą?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Iš viso Tikslinė
 DocType: Program Course,Required,Reikalinga
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,susitaikymas JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Per daug stulpelių. Eksportuoti ataskaitą ir jį atspausdinti naudojant skaičiuoklės programą.
 DocType: Purchase Invoice Item,Batch No,Serijos Nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepavyko rasti keitimo kursą {0} ir {1} pagrindiniams datos {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Leisti kelis pardavimų užsakymų prieš Kliento Užsakymo
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 DocType: Student Group Instructor,Student Group Instructor,Studentų grupė instruktorius
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobilus Nėra
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,pagrindinis
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variantas
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,pagrindinis
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variantas
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nustatyti priešdėlis numeracijos seriją apie sandorius savo
 DocType: Employee Attendance Tool,Employees HTML,darbuotojai HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Numatytasis BOM ({0}) turi būti aktyvus šią prekę ar jo šabloną
 DocType: Employee,Leave Encashed?,Palikite Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Galimybė Nuo srityje yra privalomas
 DocType: Email Digest,Annual Expenses,metinės išlaidos
 DocType: Item,Variants,variantai
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Padaryti pirkinių užsakymą
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Padaryti pirkinių užsakymą
 DocType: SMS Center,Send To,siųsti
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nėra pakankamai atostogos balansas Palikti tipas {0}
 DocType: Payment Reconciliation Payment,Allocated amount,skirtos sumos
@@ -1767,7 +1765,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kliento punktas kodas
 DocType: Stock Reconciliation,Stock Reconciliation,akcijų suderinimas
 DocType: Territory,Territory Name,teritorija Vardas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Darbas-in-progress sandėlio reikalingas prieš Pateikti
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Darbas-in-progress sandėlio reikalingas prieš Pateikti
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidatui į darbą.
 DocType: Purchase Order Item,Warehouse and Reference,Sandėliavimo ir nuoroda
 DocType: Supplier,Statutory info and other general information about your Supplier,Teisės aktų informacijos ir kita bendra informacija apie jūsų tiekėjas
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,Eilės Nr ir Partijos
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentų grupė Stiprumas
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentų grupė Stiprumas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Prieš leidinyje Įėjimo {0} neturi neprilygstamą {1} įrašą
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Prieš leidinyje Įėjimo {0} neturi neprilygstamą {1} įrašą
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vertinimai
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Duplicate Serijos Nr įvestas punkte {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Sąlyga laivybos taisyklės
-DocType: Grading Structure,Grading Intervals,klasifikavimo intervalai
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prašome įvesti
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Negali overbill už prekę {0} iš eilės {1} daugiau nei {2}. Leisti per lpi, prašome nustatyti Ieško Nustatymai"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prašome nustatyti filtrą remiantis punktą arba sandėlyje
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} turi būti pateiktas
 DocType: Authorization Control,Authorization Control,autorizacija Valdymo
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Eilutės # {0}: Atmesta Sandėlis yra privalomas prieš atmetė punkte {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,mokėjimas
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Tvarkykite savo užsakymus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,mokėjimas
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Tvarkykite savo užsakymus
 DocType: Production Order Operation,Actual Time and Cost,Tikrasis Laikas ir kaina
 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},Medžiaga Prašymas maksimalių {0} galima už prekę {1} prieš Pardavimų ordino {2}
 DocType: Employee,Salutation,pasveikinimas
 DocType: Course,Course Abbreviation,Žinoma santrumpa
 DocType: Student Leave Application,Student Leave Application,Studentų atostogos taikymas
 DocType: Item,Will also apply for variants,Bus taikoma variantų
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Turto negali būti atšauktas, nes jis jau yra {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbuotojų {0} pusę dienos {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Iš viso darbo valandų turi būti ne didesnis nei maks darbo valandų {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,apie
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Rinkinys daiktų metu pardavimas.
 DocType: Quotation Item,Actual Qty,Tikrasis Kiekis
 DocType: Sales Invoice Item,References,Nuorodos
@@ -1811,7 +1809,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Jūs įvedėte pasikartojančius elementus. Prašome ištaisyti ir bandykite dar kartą.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Bendradarbis
 DocType: Asset Movement,Asset Movement,turto judėjimas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nauja krepšelį
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,nauja krepšelį
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Prekė {0} nėra išspausdintas punktas
 DocType: SMS Center,Create Receiver List,Sukurti imtuvas sąrašas
 DocType: Vehicle,Wheels,ratai
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Išjungia kūrimą laiko rąstų prieš Gamybos užsakymus. Veikla neturi būti stebimi nuo gamybos ordino
 DocType: Student,Student Mobile Number,Studentų Mobilusis Telefonas Numeris
 DocType: Item,Has Variants,turi variantams
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jūs jau pasirinkote elementus iš {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Pavadinimas Mėnesio pasiskirstymas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID privalomi
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID privalomi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID privalomi
 DocType: Sales Person,Parent Sales Person,Tėvų pardavimų asmuo
 DocType: Purchase Invoice,Recurring Invoice,pasikartojančios Sąskaita
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,projektų valdymas
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,Fiskaliniai metai
 DocType: Vehicle Log,Fuel Price,kuro Kaina
 DocType: Budget,Budget,biudžetas
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Ilgalaikio turto turi būti ne akcijų punktas.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Biudžetas negali būti skiriamas prieš {0}, nes tai ne pajamos ar sąnaudos sąskaita"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,pasiektas
 DocType: Student Admission,Application Form Route,Prašymo forma Vartojimo būdas
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Teritorija / Klientų
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Teritorija / Klientų
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,pvz 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Palikite tipas {0} negali būti paskirstytos, nes ji yra palikti be darbo užmokesčio"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Eilutės {0}: Paskirti suma {1} turi būti mažesnis arba lygus sąskaitą skolos likutį {2}
@@ -1878,14 +1876,14 @@
 ,Serial No Status,Serijos Nr Būsena
 DocType: Payment Entry Reference,Outstanding,neišspręstas
 ,Daily Timesheet Summary,Dienos Lapą santrauka
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Eilutės {0}: Norėdami nustatyti {1} periodiškumas, skirtumas tarp iš ir į datą \ turi būti didesnis nei arba lygus {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Tai remiantis akcijų judėjimo. Žiūrėti {0} daugiau informacijos
 DocType: Pricing Rule,Selling,pardavimas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Suma {0} {1} išskaičiuota nuo {2}
 DocType: Employee,Salary Information,Pajamos Informacija
 DocType: Sales Person,Name and Employee ID,Vardas ir darbuotojo ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Terminas negali būti prieš paskelbdami data
 DocType: Website Item Group,Website Item Group,Interneto svetainė punktas grupė
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Muitai ir mokesčiai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Prašome įvesti Atskaitos data
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Negali remtis eilutės skaičius didesnis nei arba lygus dabartinės eilutės numeris Šio mokesčio tipą
 DocType: Asset,Sold,parduota
 ,Item-wise Purchase History,Prekė išmintingas pirkimas Istorija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Prašome spausti &quot;Generuoti grafiką&quot; parsiųsti Serijos Nr pridėta punkte {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Prašome spausti &quot;Generuoti grafiką&quot; parsiųsti Serijos Nr pridėta punkte {0}
 DocType: Account,Frozen,užšalęs
 ,Open Production Orders,Atviri gamybos užsakymus
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Bazinė suma (Įmonės valiuta)
 DocType: Payment Reconciliation Payment,Reference Row,nuoroda eilutė
 DocType: Installation Note,Installation Time,montavimo laikas
 DocType: Sales Invoice,Accounting Details,apskaitos informacija
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Ištrinti visus sandorių šiai bendrovei
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Ištrinti visus sandorių šiai bendrovei
 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,Eilutės # {0}: Operacija {1} nėra baigtas {2} Kiekis gatavų prekių gamybos Užsakyti # {3}. Atnaujinkite veikimo būseną per Time Įrašai
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,investicijos
 DocType: Issue,Resolution Details,geba detalės
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,Diskusija
 DocType: Payment Entry,Transaction ID,sandorio ID
 DocType: Employee,Resignation Letter Date,Atsistatydinimas raštas data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Kainodaros taisyklės yra toliau filtruojamas remiantis kiekį.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Kainodaros taisyklės yra toliau filtruojamas remiantis kiekį.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Prašome nustatykite data Prisijungimas darbuotojo {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Iš viso Atsiskaitymo suma (per Time lapas)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Pakartokite Klientų pajamos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) turi vaidmenį &quot;sąskaita patvirtinusio&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) turi vaidmenį &quot;sąskaita patvirtinusio&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pora
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Pasirinkite BOM ir Kiekis dėl gamybos
 DocType: Asset,Depreciation Schedule,Nusidėvėjimas Tvarkaraštis
 DocType: Bank Reconciliation Detail,Against Account,prieš sąskaita
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pusė dienos data turi būti tarp Nuo datos ir iki šiol
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Prašome nustatyti &quot;turto nusidėvėjimo sąnaudų centro&quot; įmonėje {0}
 ,Maintenance Schedules,priežiūros Tvarkaraščiai
 DocType: Task,Actual End Date (via Time Sheet),Tikrasis Pabaigos data (per Time lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Suma {0} {1} prieš {2} {3}
 ,Quotation Trends,Kainų tendencijos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Prekė Grupė nepaminėta prekės šeimininkui už prekę {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debeto sąskaitą turi būti Gautinos sąskaitos
 DocType: Shipping Rule Condition,Shipping Amount,Pristatymas suma
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,kol suma
 DocType: Purchase Invoice Item,Conversion Factor,konversijos koeficientas
 DocType: Purchase Order,Delivered,Pristatyta
 ,Vehicle Expenses,Transporto išlaidos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
+DocType: Serial No,Invoice Details,informacija apie sąskaitą
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Tikimasi vertė po naudingo tarnavimo laiką turi būti didesnis nei arba lygus {0}
 DocType: Purchase Receipt,Vehicle Number,Automobilio numeris
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Data, kada bus sustabdyti kartojasi sąskaita"
 DocType: Employee Loan,Loan Amount,Paskolos suma
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,laiko apskaitos žiniaraščiai
 DocType: HR Settings,HR Settings,HR Nustatymai
 DocType: Salary Slip,net pay info,neto darbo užmokestis informacijos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Kompensuojamos reikalavimas yra laukiama patvirtinimo. Tik sąskaita Tvirtintojas gali atnaujinti statusą.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Kompensuojamos reikalavimas yra laukiama patvirtinimo. Tik sąskaita Tvirtintojas gali atnaujinti statusą.
 DocType: Email Digest,New Expenses,Nauja išlaidos
 DocType: Purchase Invoice,Additional Discount Amount,Papildoma Nuolaida suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Eilutės # {0}: Kiekis turi būti 1, kaip elementas yra ilgalaikio turto. Prašome naudoti atskirą eilutę daugkartiniam vnt."
 DocType: Leave Block List Allow,Leave Block List Allow,Palikite Blokuoti sąrašas Leisti
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr negali būti tuščias arba vietos
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupė ne grupės
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,sporto
 DocType: Loan Type,Loan Name,paskolos Vardas
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sandėlis, kuriame jūs išlaikyti atsargų atmestų daiktų"
 DocType: Production Order,Skip Material Transfer,Pereiti medžiagos pernešimas
 DocType: Production Order,Skip Material Transfer,Pereiti medžiagos pernešimas
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Negali rasti keitimo kursą {0}, kad {1} rakto dienos {2}. Prašome sukurti valiutos keitykla įrašą rankiniu būdu"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Jūsų finansiniai metai baigiasi
 DocType: POS Profile,Price List,Kainoraštis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} dabar numatytasis finansinius metus. Prašome atnaujinti savo naršyklę pakeitimas įsigaliotų.
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Sąskaita {0} yra neteisinga. Sąskaitos valiuta turi būti {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konversijos koeficientas yra reikalaujama iš eilės {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pardavimų užsakymų, pardavimo sąskaitoje-faktūroje ar žurnalo įrašą"
 DocType: Salary Component,Deduction,Atskaita
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Eilutės {0}: Nuo Laikas ir laiko yra privalomas.
 DocType: Stock Reconciliation Item,Amount Difference,suma skirtumas
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Prekė Kaina pridėta {0} kainoraštis {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Prašome įvesti darbuotojo ID Šio pardavimo asmuo
 DocType: Territory,Classification of Customers by region,Klasifikacija klientams regione
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Skirtumas suma turi būti lygi nuliui
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Skirtumas suma turi būti lygi nuliui
 DocType: Project,Gross Margin,bendroji marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Prašome įvesti Gamybos Elementą pirmas
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Apskaičiuota bankas pareiškimas balansas
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,neįgaliesiems vartotojas
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Pasiūlymas
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Pasiūlymas
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Iš viso išskaičiavimas
 ,Production Analytics,gamybos Analytics &quot;
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Prekė {0} jau grįžo
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Finansiniai metai ** reiškia finansinius metus. Visi apskaitos įrašai ir kiti pagrindiniai sandoriai yra stebimi nuo ** finansiniams metams **.
 DocType: Opportunity,Customer / Lead Address,Klientas / Švino Adresas
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Įspėjimas: Neteisingas SSL sertifikatas nuo prisirišimo {0}
 DocType: Student Admission,Eligibility,Tinkamumas
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Laidai padėti jums gauti verslo, pridėti visus savo kontaktus ir daugiau kaip jūsų laidų"
 DocType: Production Order Operation,Actual Operation Time,Tikrasis veikimo laikas
 DocType: Authorization Rule,Applicable To (User),Taikoma (Vartotojas)
 DocType: Purchase Taxes and Charges,Deduct,atskaityti
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,Darbovietės adresas
 DocType: Appraisal,Calculate Total Score,Apskaičiuokite bendras rezultatas
 DocType: Request for Quotation,Manufacturing Manager,gamybos direktorius
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serijos Nr {0} yra garantija net iki {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijos Nr {0} yra garantija net iki {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Splitas Važtaraštis į paketus.
 apps/erpnext/erpnext/hooks.py +87,Shipments,vežimas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,"Sąskaitos balansas ({0}), skirtą {1} ir atsargų vertę ({2}) už sandėlį {3} turi būti tokios pačios"
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Pastaba: elektroninio pašto adresas nebus siunčiami neįgaliems vartotojams
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Taškų sąveika
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Taškų sąveika
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pasirinkite bendrovė ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pasirinkite bendrovė ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Palikite tuščią, jei manoma, skirtų visiems departamentams"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipai darbo (nuolatinis, sutarčių, vidaus ir kt.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} yra privalomas punktas {1}
 DocType: Process Payroll,Fortnightly,kas dvi savaitės
 DocType: Currency Exchange,From Currency,nuo valiuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Prašome pasirinkti skirtos sumos, sąskaitos faktūros tipas ir sąskaitos numerį atleast vienoje eilėje"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Norma (Įmonės valiuta)
 DocType: Student Guardian,Others,kiti
 DocType: Payment Entry,Unallocated Amount,Nepaskirstytas kiekis
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nerandate atitikimo elementą. Prašome pasirinkti kokią nors kitą vertę {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nerandate atitikimo elementą. Prašome pasirinkti kokią nors kitą vertę {0}.
 DocType: POS Profile,Taxes and Charges,Mokesčiai ir rinkliavos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produktas arba paslauga, kuri yra perkama, parduodama arba laikomi sandėlyje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ne daugiau atnaujinimai
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Negalima pasirinkti įkrovimo tipas, kaip &quot;Dėl ankstesnės eilės Suma&quot; arba &quot;Dėl ankstesnės eilės Total&quot; už pirmoje eilutėje"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Vaikų punktas neturėtų būti Prekės paketas. Prašome pašalinti elementą `{0}` ir sutaupyti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,bankinis
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Įdėti laiko apskaitos žiniaraščiai
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Įdėti laiko apskaitos žiniaraščiai
 DocType: Vehicle Service,Service Item,Paslaugų punktas
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
 DocType: Bank Guarantee,Bank Guarantee,Banko garantija
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Eilutės # {0}: Turto {1} jau yra {2}
 DocType: Quotation Item,Stock Balance,akcijų balansas
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,"Pardavimų užsakymų, kad mokėjimo"
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Prašome nurodyti Pavadinimų serijos {0} per Sąranka&gt; Parametrai&gt; Webdesign Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Vadovas
 DocType: Expense Claim Detail,Expense Claim Detail,Kompensuojamos Pretenzija detalės
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Prašome pasirinkti tinkamą sąskaitą
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Kainos nebus rodomas, jei Kainų sąrašas nenustatytas"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Prašome nurodyti šalį šio Pristatymo taisyklės arba patikrinti pasaulio Pristatymas
 DocType: Stock Entry,Total Incoming Value,Iš viso Priimamojo Vertė
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debeto reikalingas
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debeto reikalingas
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Laiko apskaitos žiniaraščiai padėti sekti laiko, išlaidų ir sąskaitų už veiklose padaryti jūsų komanda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkimo Kainų sąrašas
 DocType: Offer Letter Term,Offer Term,Siūlau terminas
 DocType: Quality Inspection,Quality Manager,Kokybės vadybininkas
 DocType: Job Applicant,Job Opening,darbo skelbimai
 DocType: Payment Reconciliation,Payment Reconciliation,Mokėjimo suderinimas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Prašome pasirinkti Incharge Asmens vardas
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Prašome pasirinkti Incharge Asmens vardas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologija
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Iš viso nesumokėtas: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM svetainė Operacija
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,Pamiršote Priežastis
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Naujas adresas
 DocType: Quality Inspection,Sample Size,imties dydis
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Prašome įvesti Gavimas dokumentą
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Visos prekės jau išrašyta sąskaita
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',Nurodykite tinkamą &quot;Nuo byloje Nr &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daugiau kaštų centrai gali būti grupėse, tačiau įrašai gali būti pareikštas ne grupės"
 DocType: Project,External,išorinis
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Vartotojai ir leidimai
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Gamybos užsakymų Sukurta: {0}
 DocType: Branch,Branch,filialas
 DocType: Guardian,Mobile Number,Mobilaus telefono numeris
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Spausdinimo ir paviljonai
 DocType: Bin,Actual Quantity,Tikrasis Kiekis
 DocType: Shipping Rule,example: Next Day Shipping,Pavyzdys: Sekanti diena Pristatymas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijos Nr {0} nerastas
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijos Nr {0} nerastas
 DocType: Scheduling Tool,Student Batch,Studentų Serija
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsų klientai
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Padaryti Studentas
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Padaryti Studentas
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Jūs buvote pakviestas bendradarbiauti su projektu: {0}
 DocType: Leave Block List Date,Block Date,Blokuoti data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,taikyti Dabar
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,Siunčiami į
 DocType: Payment Request,Make Sales Invoice,Padaryti pardavimo sąskaita-faktūra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programinė įranga
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Kitas Kontaktinė data negali būti praeityje
 DocType: Company,For Reference Only.,Tik nuoroda.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Pasirinkite Serija Nėra
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neteisingas {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,avanso suma
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Byla Nr negali būti 0
 DocType: Item,Show a slideshow at the top of the page,Rodyti skaidrių peržiūrą į puslapio viršuje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,parduotuvės
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,parduotuvės
 DocType: Serial No,Delivery Time,Pristatymo laikas
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Senėjimo remiantis
 DocType: Item,End of Life,Gyvenimo pabaiga
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,pervadinti įrankis
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Atnaujinti Kaina
 DocType: Item Reorder,Item Reorder,Prekė Pertvarkyti
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Rodyti Pajamos Kuponas
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,perduoti medžiagą
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Rodyti Pajamos Kuponas
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,perduoti medžiagą
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Nurodykite operacijas, veiklos sąnaudas ir suteikti unikalią eksploatuoti ne savo operacijas."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokumentas yra virš ribos iki {0} {1} už prekę {4}. Darai dar {3} prieš patį {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pasirinkite Keisti suma sąskaita
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Prašome nustatyti pasikartojančių po taupymo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pasirinkite Keisti suma sąskaita
 DocType: Purchase Invoice,Price List Currency,Kainų sąrašas Valiuta
 DocType: Naming Series,User must always select,Vartotojas visada turi pasirinkti
 DocType: Stock Settings,Allow Negative Stock,Leiskite Neigiama Stock
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,biudžeto sąskaita
 DocType: Quality Inspection,Verified By,Patvirtinta
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nepavyksta pakeisti įmonės numatytasis valiuta, nes yra esami sandoriai. Sandoriai turi būti atšauktas pakeisti numatytasis valiuta."
-DocType: Grade Interval,Grade Description,Įvertinimas Aprašymas
+DocType: Grading Scale Interval,Grade Description,Įvertinimas Aprašymas
 DocType: Stock Entry,Purchase Receipt No,Pirkimo kvito Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,rimtai Pinigai
 DocType: Process Payroll,Create Salary Slip,Sukurti apie darbo užmokestį
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,Dalyvavimas data
 DocType: Warranty Claim,Raised By,Užaugino
 DocType: Payment Gateway Account,Payment Account,Mokėjimo sąskaita
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Prašome nurodyti Bendrovei toliau
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Grynasis pokytis gautinos
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,kompensacinė Išjungtas
 DocType: Offer Letter,Accepted,priimtas
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Prašome įsitikinkite, kad jūs tikrai norite ištrinti visus šios bendrovės sandorius. Jūsų pagrindiniai duomenys liks kaip ji yra. Šis veiksmas negali būti atšauktas."
 DocType: Room,Room Number,Kambario numeris
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Neteisingas nuoroda {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) negali būti didesnis nei planuota quanitity ({2}) Gamybos Užsakyti {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) negali būti didesnis nei planuota quanitity ({2}) Gamybos Užsakyti {3}
 DocType: Shipping Rule,Shipping Rule Label,Pristatymas taisyklė Etiketė
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,vartotojas Forumas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Žaliavos negali būti tuščias.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Greita leidinys įrašas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nepavyko atnaujinti atsargų, sąskaitos faktūros yra lašas laivybos elementą."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Greita leidinys įrašas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Jūs negalite keisti greitį, jei BOM minėta agianst bet kurį elementą"
 DocType: Employee,Previous Work Experience,Ankstesnis Darbo patirtis
 DocType: Stock Entry,For Quantity,dėl Kiekis
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Taisyklės ir sąlygų1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Instituto pavadinimas, kurį nustatote šią sistemą."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Apskaitos įrašas, užšaldyti iki šios datos, niekas negali padaryti / pakeisti įrašą, išskyrus žemiau nurodytą vaidmenį."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Prašome įrašyti dokumentą prieš generuoti priežiūros tvarkaraštį
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Prašome įrašyti dokumentą prieš generuoti priežiūros tvarkaraštį
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,projekto statusas
 DocType: UOM,Check this to disallow fractions. (for Nos),Pažymėkite tai norėdami atmesti frakcijas. (Už Nr)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Buvo sukurtos naujos gamybos užsakymų:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,"Darbuotojai, dirbantys atostogų"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Pažymėti dabartis
 DocType: Project,% Complete Method,% Visiškas būdas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Priežiūra pradžios data negali būti iki pristatymo datos Serijos Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Priežiūra pradžios data negali būti iki pristatymo datos Serijos Nr {0}
 DocType: Production Order,Actual End Date,Tikrasis Pabaigos data
 DocType: BOM,Operating Cost (Company Currency),Operacinė Kaina (Įmonės valiuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Palikite be darbo užmokesčio nesutampa su patvirtintais prašymo suteikti atostogas įrašų
 DocType: Campaign,Campaign-.####,Kampanija-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Tolesni žingsniai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Prašome pateikti nurodytus elementus ne į geriausias įmanomas normas
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto arti Galimybė po 15 dienų
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,pabaigos metai
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Švinas%
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kiekis
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Įrašai Sukurta - {0}
 DocType: Asset Category Account,Asset Category Account,Turto Kategorija paskyra
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Negali gaminti daugiau Elementą {0} nei pardavimų užsakymų kiekio {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Negali gaminti daugiau Elementą {0} nei pardavimų užsakymų kiekio {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,"Atsargų, {0} nebus pateiktas"
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Pinigų paskyra
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Kitas Susisiekti negali būti toks pat, kaip pagrindiniam pašto adresas"
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Sąskaitų data nepaminėta
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Gamyba
 DocType: Guardian,Occupation,okupacija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Eilutės {0}: pradžios data turi būti prieš End data
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Iš viso (Kiekis)
 DocType: Sales Invoice,This Document,Šis dokumentas
 DocType: Installation Note Item,Installed Qty,įdiegta Kiekis
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Pranešti apie problemą
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Komunalinė sąnaudos
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virš
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Eilutės # {0}: leidinys Įėjimo {1} neturi paskyros {2} arba jau lyginami su kito kuponą
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Eilutės # {0}: leidinys Įėjimo {1} neturi paskyros {2} arba jau lyginami su kito kuponą
 DocType: Buying Settings,Default Buying Price List,Numatytasis Ieško Kainų sąrašas
 DocType: Process Payroll,Salary Slip Based on Timesheet,Pajamos Kuponas Remiantis darbo laiko apskaitos žiniaraštis
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Nė vienas darbuotojas dėl pirmiau pasirinktus kriterijus arba alga slydimo jau sukurta
 DocType: Notification Control,Sales Order Message,Pardavimų užsakymų pranešimas
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Numatytosios reikšmės, kaip kompanija, valiuta, einamuosius fiskalinius metus, ir tt"
 DocType: Payment Entry,Payment Type,Mokėjimo tipas
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Prašome pasirinkti partiją punktas {0}. Nepavyko rasti vieną partiją, kuri atitinka šį reikalavimą"
 DocType: Process Payroll,Select Employees,pasirinkite Darbuotojai
 DocType: Opportunity,Potential Sales Deal,Galimas Pardavimų Spręsti
 DocType: Payment Entry,Cheque/Reference Date,Čekis / Nuoroda data
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Pasaulinis POS profilis {0} jau sukurtas kompanijos {1}
 DocType: Purchase Order,Ref SQ,teisėjas SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Pakeiskite prekę / BOM visose BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Gavimas turi būti pateiktas dokumentas
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Gavimas turi būti pateiktas dokumentas
 DocType: Purchase Invoice Item,Received Qty,gavo Kiekis
 DocType: Stock Entry Detail,Serial No / Batch,Serijos Nr / Serija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nesumokėjo ir nepateikė
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nėra darbo laiko apskaitos žiniaraščiai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"Palikite tipas {0}, negali būti atlikti, perduodami"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Priežiūra Tvarkaraštis negeneruojama visų daiktų. Prašome spausti &quot;Generuoti grafiką&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Priežiūra Tvarkaraštis negeneruojama visų daiktų. Prašome spausti &quot;Generuoti grafiką&quot;
 ,To Produce,Gaminti
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Darbo užmokesčio
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Dėl eilės {0} iš {1}. Įtraukti {2} prekės norma, eilutės {3} taip pat turi būti įtraukti"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Padaryti vartotoją
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Padaryti vartotoją
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikavimas pakuotės už pristatymą (spausdinimui)
 DocType: Bin,Reserved Quantity,reserved Kiekis
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Prašome įvesti galiojantį elektroninio pašto adresą,"
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Neįgaliųjų šablonas turi būti ne numatytasis šablonas
 DocType: Account,Income Account,pajamų sąskaita
 DocType: Payment Request,Amount in customer's currency,Suma kliento valiuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,pristatymas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,pristatymas
 DocType: Stock Reconciliation Item,Current Qty,Dabartinis Kiekis
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Žiūrėkite &quot;norma medžiagų pagrindu&quot; į kainuojančios skirsnyje
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Ankstesnis
 DocType: Appraisal Goal,Key Responsibility Area,Pagrindinė atsakomybė Plotas
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentų Partijos padėti jums sekti lankomumo, vertinimai ir rinkliavos studentams"
 DocType: Payment Entry,Total Allocated Amount,Visos skirtos sumos
 DocType: Item Reorder,Material Request Type,Medžiaga Prašymas tipas
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural leidinys Įėjimo atlyginimus iš {0} ir {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage &quot;yra pilna, neišsaugojo"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage &quot;yra pilna, neišsaugojo"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Eilutės {0}: UOM konversijos faktorius yra privalomas
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,teisėjas
 DocType: Budget,Cost Center,kaina centras
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Slėpti Kliento mokesčių ID iš pardavimo sandorių
 DocType: Upload Attendance,Upload HTML,Įkelti HTML
 DocType: Employee,Relieving Date,malšinančių data
-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.","Kainodaros taisyklė yra pagamintas perrašyti Kainoraštis / define diskonto procentas, remiantis kai kuriais kriterijais."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Kainodaros taisyklė yra pagamintas perrašyti Kainoraštis / define diskonto procentas, remiantis kai kuriais kriterijais."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sandėlių gali būti pakeista tik per vertybinių popierių Entry / Važtaraštis / Pirkimo gavimas
 DocType: Employee Education,Class / Percentage,Klasė / procentas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Vadovas rinkodarai ir pardavimams
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Pajamų mokestis
-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.","Jei pasirinkta kainodaros taisyklė yra numatyta &quot;kaina&quot;, tai bus perrašyti Kainoraštis. Kainodaros taisyklė kaina yra galutinė kaina, todėl turėtų būti taikomas ne toliau nuolaida. Vadinasi, sandorių, pavyzdžiui, pardavimų užsakymų, pirkimo užsakymą ir tt, tai bus pasitinkami ir &quot;norma&quot; srityje, o ne &quot;kainoraštį norma&quot; srityje."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jei pasirinkta kainodaros taisyklė yra numatyta &quot;kaina&quot;, tai bus perrašyti Kainoraštis. Kainodaros taisyklė kaina yra galutinė kaina, todėl turėtų būti taikomas ne toliau nuolaida. Vadinasi, sandorių, pavyzdžiui, pardavimų užsakymų, pirkimo užsakymą ir tt, tai bus pasitinkami ir &quot;norma&quot; srityje, o ne &quot;kainoraštį norma&quot; srityje."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Įrašo Leads pramonės tipo.
 DocType: Item Supplier,Item Supplier,Prekė Tiekėjas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Prašome įvesti Prekės kodas gauti partiją nėra
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Prašome pasirinkti vertę už {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Visi adresai.
 DocType: Company,Stock Settings,Akcijų Nustatymai
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Sujungimas yra galimas tik tada, jei šie savybės yra tos pačios tiek įrašų. Ar grupė, Šaknų tipas, Įmonės"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ar siųsti žinutę apie renginį darbuotojams su statusu &quot;Atidaryti&quot;
 DocType: Task,Depends on Tasks,Priklauso nuo Užduotys
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Valdyti klientų grupei medį.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Priedai gali būti rodomas be leidžianti krepšelis
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nauja kaina centras vardas
 DocType: Leave Control Panel,Leave Control Panel,Palikite Valdymo skydas
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,debeto
 DocType: Delivery Note,Required only for sample item.,Reikalinga tik imties elemento.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Tikrasis Kiekis Po Sandorio
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tiekėjas tiekiantis&gt; tiekėjas tipas
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ne darbo užmokestį rasti tarp {0} ir {1}
 ,Pending SO Items For Purchase Request,Kol SO daiktai įsigyti Užsisakyti
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentų Priėmimo
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} yra išjungtas
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} yra išjungtas
 DocType: Supplier,Billing Currency,atsiskaitymo Valiuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Labai didelis
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pagrindinis puslapis Teminiai Prekės
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Visi Vertinimo Grupės
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Naujas sandėlys Vardas
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Viso {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Viso {0} ({1})
 DocType: C-Form Invoice Detail,Territory,teritorija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Paminėkite nėra apsilankymų reikalingų
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Paminėkite nėra apsilankymų reikalingų
 DocType: Stock Settings,Default Valuation Method,Numatytasis vertinimo metodas
 DocType: Vehicle Log,Fuel Qty,kuro Kiekis
 DocType: Production Order Operation,Planned Start Time,Planuojamas Pradžios laikas
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,Kainų sąrašas magistras
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pardavimo sandoriai gali būti pažymėti prieš kelis ** pardavėjai **, kad būtų galima nustatyti ir stebėti tikslus."
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Prašome sukurti klientui Švinas {0}
 DocType: Price List,Applicable for Countries,Taikoma šalių
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,gali būti pateiktas palikti tik programas su statusu &quot;Patvirtinta&quot; ir &quot;Atmesta&quot;
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Studentų grupės pavadinimas yra privalomas eilės {0}
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,Nukopijuota iš
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Vardas klaida: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Trūkumas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nėra susijęs su {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nėra susijęs su {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Lankomumas darbuotojo {0} jau yra pažymėtas
 DocType: Packing Slip,If more than one package of the same type (for print),Jeigu yra daugiau nei vienas paketas tos pačios rūšies (spausdinimui)
 ,Salary Register,Pajamos Registruotis
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Naudokite krepšelį
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vertė {0} atributas {1} neegzistuoja taikomi tinkamos prekių ar paslaugų sąrašą Įgūdis vertes punkte {2}
 DocType: BOM Item,Scrap %,laužas%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Mokesčiai bus platinamas proporcingai remiantis punktas Kiekis arba sumos, kaip už savo pasirinkimą"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Mokesčiai bus platinamas proporcingai remiantis punktas Kiekis arba sumos, kaip už savo pasirinkimą"
 DocType: Maintenance Visit,Purposes,Tikslai
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Atleast vienas punktas turi būti įrašomas neigiamas kiekio grąžinimo dokumentą
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} ilgiau nei bet kokiomis darbo valandų darbo vietos {1}, suskaidyti operaciją į kelių operacijų"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Tvarkyti Teritorija medį.
 DocType: Journal Entry Account,Sales Invoice,pardavimų sąskaita faktūra
 DocType: Journal Entry Account,Party Balance,šalis balansas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Prašome pasirinkti Taikyti nuolaidą
 DocType: Company,Default Receivable Account,Numatytasis Gautinos sąskaitos
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Sukurti Bank įrašas visos algos, mokamos už pirmiau pasirinktus kriterijus"
 DocType: Stock Entry,Material Transfer for Manufacture,Medžiagos pernešimas gamybai
-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.,Nuolaida procentas gali būti taikomas bet prieš kainoraštis arba visų kainų sąrašas.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Nuolaida procentas gali būti taikomas bet prieš kainoraštis arba visų kainų sąrašas.
 DocType: Purchase Invoice,Half-yearly,Kartą per pusmetį
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Apskaitos įrašas už Sandėlyje
 DocType: Vehicle Service,Engine Oil,Variklio alyva
 DocType: Sales Invoice,Sales Team1,pardavimų team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Prekė {0} neegzistuoja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Prekė {0} neegzistuoja
 DocType: Sales Invoice,Customer Address,Klientų Adresas
 DocType: Employee Loan,Loan Details,paskolos detalės
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Eilutės {0}: baigė Kiekis turi būti didesnė už nulį.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,Šaknų tipas
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Eilutės # {0}: negali grįžti daugiau nei {1} už prekę {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,sklypas
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,sklypas
 DocType: Item Group,Show this slideshow at the top of the page,Parodyti šią demonstraciją prie puslapio viršuje
 DocType: BOM,Item UOM,Prekė UOM
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),"Mokesčių suma, nuolaidos suma (Įmonės valiuta)"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},Tikslinė sandėlis yra privalomas eilės {0}
 DocType: Cheque Print Template,Primary Settings,pirminiai nustatymai
 DocType: Purchase Invoice,Select Supplier Address,Pasirinkite Tiekėjas Adresas
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Pridėti Darbuotojai
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Pridėti Darbuotojai
 DocType: Purchase Invoice Item,Quality Inspection,kokybės inspekcija
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Papildomas Mažas
 DocType: Company,Standard Template,standartinį šabloną
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Įspėjimas: Medžiaga Prašoma Kiekis yra mažesnis nei minimalus užsakymas Kiekis
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Sąskaita {0} yra sušaldyti
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridinio asmens / Dukterinė įmonė su atskiru Chart sąskaitų, priklausančių organizacijos."
 DocType: Payment Request,Mute Email,Nutildyti paštas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Maistas, gėrimai ir tabako"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Gali tik sumokėti prieš Neapmokestinama {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisinis mokestis gali būti ne didesnė kaip 100
 DocType: Stock Entry,Subcontract,subrangos sutartys
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Prašome įvesti {0} pirmas
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sandėliai su esamais sandoris negali būti konvertuojamos į grupę.
 DocType: Assessment Result Tool,Result HTML,rezultatas HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Baigia galioti
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pridėti Studentai
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pridėti Studentai
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Prašome pasirinkti {0}
 DocType: C-Form,C-Form No,C-formos Nėra
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Įveskite vardą kampanijos jei šaltinis tyrimo yra akcija
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,laikraščių leidėjai
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pasirinkite finansiniai metai
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Pasirinkite finansiniai metai
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pertvarkyti lygis
 DocType: Company,Chart Of Accounts Template,Sąskaitų planas Šablonas
 DocType: Attendance,Attendance Date,lankomumas data
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,pasikartojantis įrašas
 DocType: Program Enrollment Tool,Get Students,Gauk Studentai
 DocType: Serial No,Under Warranty,pagal Garantija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ERROR]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ERROR]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Žodžiais bus matomas, kai jūs išgelbėti pardavimų užsakymų."
 ,Employee Birthday,Darbuotojų Gimimo diena
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Studentų Serija Lankomumas įrankis
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,riba Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital &quot;
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademinis terminas su šia &quot;Akademinio metų&quot; {0} ir &quot;Terminas Vardas&quot; {1} jau egzistuoja. Prašome pakeisti šiuos įrašus ir pabandykite dar kartą.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kadangi yra esami sandoriai prieš {0} elementą, jūs negalite pakeisti vertę {1}"
 DocType: UOM,Must be Whole Number,Turi būti sveikasis skaičius
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Naujų lapų Pervedimaiį (dienomis)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijos Nr {0} neegzistuoja
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Medžiagų yra mokami nuo šio pardavimo užsakymų
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Laikotarpis uždarymas Įėjimas
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kaina centras su esamais sandoriai negali būti konvertuojamos į grupės
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tiekėjas (-ai)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbuotojų dalyvavimas įrankis
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Paskutinė diena iki kito mėnesio
 DocType: Support Settings,Auto close Issue after 7 days,Auto arti išdavimas po 7 dienų
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Palikite negali būti skiriama iki {0}, kaip atostogos balansas jau perkėlimo persiunčiami būsimos atostogos paskirstymo įrašo {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Pastaba: Dėl / Nuoroda data viršija leidžiama klientų kredito dienas iki {0} dieną (-ai)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Studentų Pareiškėjas
 DocType: Asset Category Account,Accumulated Depreciation Account,Sukauptas nusidėvėjimas paskyra
 DocType: Stock Settings,Freeze Stock Entries,Freeze Akcijų įrašai
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,Akcijų Analytics &quot;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operacijos negali būti paliktas tuščias
 DocType: Maintenance Visit Purpose,Against Document Detail No,Su dokumentų Išsamiau Nėra
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Šalis tipas yra privalomi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Šalis tipas yra privalomi
 DocType: Quality Inspection,Outgoing,išeinantis
 DocType: Material Request,Requested For,prašoma Dėl
 DocType: Quotation Item,Against Doctype,prieš DOCTYPE
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,Prekės kodas
 DocType: Production Planning Tool,Create Production Orders,Sukurti gamybos užsakymus
 DocType: Serial No,Warranty / AMC Details,Garantija / AMC detalės
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pasirinkite studentai rankiniu veikla grindžiamo grupės
 DocType: Journal Entry,User Remark,vartotojas Pastaba
 DocType: Lead,Market Segment,Rinkos segmentas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Sumokėta suma negali būti didesnė nei visos neigiamos nesumokėtos sumos {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Darbuotojų vidaus darbo Istorija
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uždarymo (dr)
 DocType: Cheque Print Template,Cheque Size,Komunalinės dydis
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,Sukurti Materialieji Prašymai
 DocType: Employee Education,School/University,Mokykla / Universitetas
 DocType: Payment Request,Reference Details,nuoroda detalės
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Tikimasi Vertė Po naudingo tarnavimo laiką turi būti mažesnis nei bendrojo pirkinio sumos
 DocType: Sales Invoice Item,Available Qty at Warehouse,Turimas Kiekis į sandėlį
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,įvardintas suma
 DocType: Asset,Double Declining Balance,Dvivietis mažėjančio balanso
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Skirtumas paskyra turi būti turto / įsipareigojimų tipo sąskaita, nes tai sandėlyje Susitaikymas yra atidarymas įrašas"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Išmokėta suma negali būti didesnis nei paskolos suma {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Pirkimo užsakymo numerį, reikalingą punkto {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Gamybos Kad nebūtų sukurta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Gamybos Kad nebūtų sukurta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Nuo data&quot; turi būti po &quot;Iki datos&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nepavyksta pakeisti statusą kaip studentas {0} yra susijęs su studento taikymo {1}
 DocType: Asset,Fully Depreciated,visiškai nusidėvėjusi
 ,Stock Projected Qty,Akcijų Numatoma Kiekis
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klientų {0} nepriklauso projekto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pažymėti Lankomumas HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citatos yra pasiūlymų, pasiūlymai turite atsiųsti savo klientams"
 DocType: Sales Order,Customer's Purchase Order,Kliento Užsakymo
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijos Nr paketais
 DocType: Warranty Claim,From Company,iš Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma balais vertinimo kriterijai turi būti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vertė arba Kiekis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prašome nustatyti Taškų nuvertinimai Užsakytas
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vertė arba Kiekis
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions pavedimai negali būti padidinta:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutė
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkimo mokesčius bei rinkliavas
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Visi Sandėliai
 DocType: Sales Partner,Retailer,mažmenininkas
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Kreditas sąskaitos turi būti balansas sąskaitos
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Visi Tiekėjo tipai
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Visi Tiekėjo tipai
 DocType: Global Defaults,Disable In Words,Išjungti žodžiais
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Prekės kodas yra privalomas, nes prekės nėra automatiškai sunumeruoti"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Citata {0} nėra tipo {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bankas Overdraftas paskyra
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Padaryti darbo užmokestį
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Eilutė # {0}: Paskirstytas suma gali būti ne didesnis nei likutinę sumą.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Žmonės BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,užtikrintos paskolos
 DocType: Purchase Invoice,Edit Posting Date and Time,Redaguoti Siunčiamos data ir laikas
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Neleidžiama atnaujinti akcijų sandorius senesnis nei {0}
 DocType: Purchase Invoice Item,PR Detail,PR detalės
 DocType: Sales Order,Fully Billed,pilnai Įvardintas
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Prašome nustatyti numatytąją mokėtiną sąskaitą darbuotojui {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Grynieji pinigai kasoje
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Pristatymas sandėlis reikalingas akcijų punkte {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Bendras svoris pakuotės. Paprastai neto masė + pakavimo medžiagos svorio. (Spausdinimo)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Grupė remiantis
 DocType: Journal Entry,Bill Date,Billas data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Paslaugų Punktas, tipas, dažnis ir išlaidų suma yra privalomi"
-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:","Net jei yra keli kainodaros taisyklės, kurių didžiausias prioritetas, tada šie vidiniai prioritetai taikomi:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Net jei yra keli kainodaros taisyklės, kurių didžiausias prioritetas, tada šie vidiniai prioritetai taikomi:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Ar tikrai norite pateikti visą darbo užmokestį iš {0} ir {1}
 DocType: Cheque Print Template,Cheque Height,Komunalinės Ūgis
 DocType: Supplier,Supplier Details,Tiekėjo informacija
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,Sąskaitos faktūros Nuoroda
 DocType: Purchase Order,Recurring Order,pasikartojančios Užsakyti
 DocType: Company,Default Income Account,Numatytasis pajamų sąskaita
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientų grupė / Klientų
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klientų grupė / Klientų
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuždara fiskalinių metų pelnas / nuostolis (kreditas)
 DocType: Sales Invoice,Time Sheets,darbo laiko apskaitos žiniaraščiai
 DocType: Payment Gateway Account,Default Payment Request Message,Numatytąjį mokėjimo prašymas pranešimas
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,citata pranešimas
 DocType: Employee Loan,Employee Loan Application,Darbuotojų paraišką paskolai gauti
 DocType: Issue,Opening Date,atidarymo data
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Žiūrovų buvo pažymėta sėkmingai.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Žiūrovų buvo pažymėta sėkmingai.
 DocType: Journal Entry,Remark,pastaba
 DocType: Purchase Receipt Item,Rate and Amount,Norma ir dydis
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},"Sąskaitos tipas {0}, turi būti {1}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},"Sąskaitos tipas {0}, turi būti {1}"
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lapai ir poilsis
 DocType: School Settings,Current Academic Term,Dabartinis akademinės terminas
 DocType: School Settings,Current Academic Term,Dabartinis akademinės terminas
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentų grupė
 DocType: Shopping Cart Settings,Quotation Series,citata serija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Elementas egzistuoja to paties pavadinimo ({0}), prašome pakeisti elementą grupės pavadinimą ar pervardyti elementą"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Prašome pasirinkti klientui
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Prašome pasirinkti klientui
 DocType: C-Form,I,aš
 DocType: Company,Asset Depreciation Cost Center,Turto nusidėvėjimo išlaidos centras
 DocType: Sales Order Item,Sales Order Date,Pardavimų užsakymų data
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,draudimo detalės
 DocType: Account,Payable,mokėtinas
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Prašome įvesti grąžinimo terminams
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skolininkai ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skolininkai ({0})
 DocType: Pricing Rule,Margin,marža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nauji klientai
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bendrasis pelnas %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Sąskaitų data
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Pilna Pirkimo suma yra privalomi
 DocType: Lead,Address Desc,Adresas desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Šalis yra privalomi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Šalis yra privalomi
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Temos pavadinimas
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,"Atleast vienas, pardavimas arba pirkimas turi būti parenkamas"
-DocType: Grading Structure,Grade Intervals,intervalai Įvertinimas
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pasirinkite savo verslo pobūdį.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Eilutė # {0}: pasikartojantis įrašas nuorodose {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kur gamybos operacijos atliekamos.
 DocType: Asset Movement,Source Warehouse,šaltinis sandėlis
 DocType: Installation Note,Installation Date,Įrengimas data
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Laiškas vadovai dėl spausdinimo šablonus.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Pavadinimus spausdinimo šablonų pvz išankstinio mokėjimo sąskaitą.
 DocType: Student Guardian,Student Guardian,Studentų globėjas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Vertinimo tipas mokesčiai negali pažymėta kaip įskaičiuota
 DocType: POS Profile,Update Stock,Atnaujinti sandėlyje
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Įvairūs UOM daiktų bus neteisinga (iš viso) Grynasis svoris vertės. Įsitikinkite, kad grynasis svoris kiekvieno elemento yra toje pačioje UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Balsuok
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,Valiutų Pelnas / nuostolis paskyra
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Darbuotojų ir lankymas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Tikslas turi būti vienas iš {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Užpildykite formą ir išsaugokite jį
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Užpildykite formą ir išsaugokite jį
 DocType: Production Planning Tool,Download a report containing all raw materials with their latest inventory status,"Atsisiųskite ataskaitą, kurioje visų žaliavų su savo naujausia inventoriaus būklę"
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Bendruomenė Forumas
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Tikrasis Kiekis sandėlyje
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pertvarkyti Kiekis
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Dabartinis darbas Angos
 DocType: Company,Stock Adjustment Account,Vertybinių popierių reguliavimas paskyra
-DocType: Journal Entry,Write Off,Nusirašinėti
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Nusirašinėti
 DocType: Timesheet Detail,Operation ID,operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistemos vartotojas (Prisijunk) adresas. Jei nustatyta, ji taps nutylėjimą visiems HR formas."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nuo {1}
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tiekėjas pristato Klientui
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Prekės / {0}) yra sandelyje
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Kitas data turi būti didesnis nei Skelbimo data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Rodyti mokesčių lengvata viršų
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Rodyti mokesčių lengvata viršų
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Dėl / Nuoroda data negali būti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Duomenų importas ir eksportas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Akcijų įrašai egzistuoti prieš {0} sandėlio, todėl jūs negalite iš naujo priskirti ar pakeisti ją"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Studentai Surasta
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Studentai Surasta
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Sąskaita Siunčiamos data
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Parduoti
 DocType: Sales Invoice,Rounded Total,Suapvalinta bendra suma
 DocType: Product Bundle,List items that form the package.,"Sąrašas daiktų, kurie sudaro paketą."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentas paskirstymas turi būti lygus 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Prašome pasirinkti Skelbimo data prieš pasirinkdami Šaliai
 DocType: Program Enrollment,School House,Mokykla Namas
 DocType: Serial No,Out of AMC,Iš AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Prašome pasirinkti Citatos
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Prašome pasirinkti Citatos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Padaryti Priežiūros vizitas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Prašome pasirinkti Citatos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Taškų nuvertinimai REZERVUOTA negali būti didesnis nei bendras skaičius nuvertinimai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Padaryti Priežiūros vizitas
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prašome susisiekti su vartotojo, kuris turi pardavimo magistras Manager {0} vaidmenį"
 DocType: Company,Default Cash Account,Numatytasis pinigų sąskaitos
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Įmonės (ne klientas ar tiekėjas) meistras.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Tai yra, remiantis šio mokinių lankomumą"
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nėra Studentai
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridėti daugiau elementų arba atidaryti visą formą
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Prašome įvesti &quot;numatyta pristatymo data&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Pristatymo Pastabos {0} turi būti atšauktas prieš panaikinant šį pardavimo užsakymų
@@ -3237,6 +3241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,3 punktas
 DocType: Purchase Order,Customer Contact Email,Klientų Kontaktai El.paštas
 DocType: Warranty Claim,Item and Warranty Details,Punktas ir garantijos informacija
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prekės kodas&gt; Prekė grupė&gt; Mascus Prekės Ženklo
 DocType: Sales Team,Contribution (%),Indėlis (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,Pastaba: mokėjimo įrašas nebus sukurtos nuo &quot;pinigais arba banko sąskaitos&quot; nebuvo nurodyta
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,"Pasirinkite programą, kad parsiųsti privalomus kursus."
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,prieš susitaikymo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Norėdami {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Mokesčiai ir rinkliavos Pridėta (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Prekė Mokesčių eilutė {0} turi atsižvelgti tipo mokesčio ar pajamų ar sąnaudų arba Apmokestinimo
 DocType: Sales Order,Partly Billed,dalinai Įvardintas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Prekė {0} turi būti ilgalaikio turto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prekė {0} turi būti ilgalaikio turto
 DocType: Item,Default BOM,numatytasis BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Prašome iš naujo tipo įmonės pavadinimas patvirtinti
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Visos negrąžintos Amt
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiliai
 DocType: Vehicle,Insurance Company,Draudimo bendrovė
 DocType: Asset Category Account,Fixed Asset Account,Ilgalaikio turto sąskaita
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,kintamas
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nuo važtaraštyje
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,kintamas
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Nuo važtaraštyje
 DocType: Student,Student Email Address,Studentų elektroninio pašto adresas
 DocType: Timesheet Detail,From Time,nuo Laikas
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Prekyboje:
@@ -3277,12 +3282,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Kainų sąrašas Valiutų kursai
 DocType: Purchase Invoice Item,Rate,Kaina
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,internas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresas pavadinimas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,adresas pavadinimas
 DocType: Stock Entry,From BOM,nuo BOM
 DocType: Assessment Code,Assessment Code,vertinimas kodas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,pagrindinis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akcijų sandoriai iki {0} yra sušaldyti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Prašome spausti &quot;Generuoti grafiką&quot;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Prašome spausti &quot;Generuoti grafiką&quot;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","pvz KG, padalinys, Nr m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Nuorodos Nr yra privaloma, jei įvedėte Atskaitos data"
 DocType: Bank Reconciliation Detail,Payment Document,mokėjimo dokumentą
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,Pajamos struktūra
 DocType: Account,Bank,bankas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviakompanija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,klausimas Medžiaga
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,klausimas Medžiaga
 DocType: Material Request Item,For Warehouse,Sandėliavimo
 DocType: Employee,Offer Date,Siūlau data
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,citatos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Jūs esate neprisijungę. Jūs negalite įkelti, kol turite tinklą."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Nėra Studentų grupės sukurta.
 DocType: Purchase Invoice Item,Serial No,Serijos Nr
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mėnesio grąžinimo suma negali būti didesnė nei paskolos suma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Prašome įvesti maintaince Details pirmas
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Prašome įvesti maintaince Details pirmas
 DocType: Purchase Invoice,Print Language,Spausdinti kalba
 DocType: Salary Slip,Total Working Hours,Iš viso darbo valandų
 DocType: Stock Entry,Including items for sub assemblies,Įskaitant daiktų sub asamblėjose
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Įveskite vertė turi būti teigiamas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Įveskite vertė turi būti teigiamas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,visos teritorijos
 DocType: Purchase Invoice,Items,Daiktai
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studentų jau mokosi.
@@ -3322,17 +3327,15 @@
 DocType: Issue,Opening Time,atidarymo laikas
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"Iš ir į datas, reikalingų"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Vertybinių popierių ir prekių biržose
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Numatytasis vienetas priemonė variantas &quot;{0}&quot; turi būti toks pat, kaip Šablonas &quot;{1}&quot;"
 DocType: Shipping Rule,Calculate Based On,Apskaičiuoti remiantis
 DocType: Delivery Note Item,From Warehouse,iš sandėlio
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,"Neturite prekių su Bill iš medžiagų, Gamyba"
 DocType: Assessment Plan,Supervisor Name,priežiūros Vardas
 DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
 DocType: Program Enrollment Course,Program Enrollment Course,Programos Priėmimas kursai
-DocType: Grading Structure,Grading Structure,rūšiavimas struktūra
 DocType: Purchase Taxes and Charges,Valuation and Total,Vertinimas ir viso
 DocType: Tax Rule,Shipping City,Pristatymas Miestas
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Šis elementas yra {0} (Šablonas) Variantas. Atributai bus nukopijuoti iš šablono, jei &quot;Ne Kopijuoti&quot; yra nustatytas"
 DocType: Notification Control,Customize the Notification,Tinkinti Pranešimas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Pinigų srautai iš operacijų
 DocType: Sales Invoice,Shipping Rule,Pristatymas taisyklė
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Vaikų sąskaita egzistuoja šioje sąskaitoje. Jūs negalite trinti šią sąskaitą.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Bet tikslas Kiekis arba planuojama suma yra privalomi
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Nėra numatytąją BOM egzistuoja punkte {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atidarymo data turėtų būti prieš uždarant data
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Prašome pasirinkti Skelbimo data pirmas
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Atidarymo data turėtų būti prieš uždarant data
 DocType: Leave Control Panel,Carry Forward,Tęsti
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kaina centras su esamais sandoriai negali būti konvertuojamos į sąskaitų knygos
 DocType: Department,Days for which Holidays are blocked for this department.,"Dienų, kuriomis Šventės blokuojami šiame skyriuje."
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,prisegti Firminiai
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Paskutinis Bendravimas
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Paskutinis Bendravimas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;vertinimo ir viso&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;vertinimo ir viso&quot;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Sąrašas savo mokesčių vadovai (pvz PVM, muitinės ir tt, jie turėtų turėti unikalius vardus) ir jų standartiniai tarifai. Tai padės sukurti standartinį šabloną, kurį galite redaguoti ir pridėti daugiau vėliau."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Eilės Nr Reikalinga už Serijinis punkte {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Rungtynių Mokėjimai sąskaitų faktūrų
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Iš viso (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Pramogos ir poilsis
 DocType: Quality Inspection,Item Serial No,Prekė Serijos Nr
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Sukurti darbuotojų įrašus
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Sukurti darbuotojų įrašus
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Iš viso dabartis
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,apskaitos ataskaitos
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,valanda
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,nežinomas
 DocType: Shipping Rule,Shipping Rule Conditions,Pristatymas taisyklė sąlygos
 DocType: BOM Replace Tool,The new BOM after replacement,Naujas BOM po pakeitimo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Pardavimo punktas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Pardavimo punktas
 DocType: Payment Entry,Received Amount,gautos sumos
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prašome nustatymas Darbuotojų vardų sistemos žmogiškųjų išteklių&gt; HR Nustatymai
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Sukurti visiškai kiekio, ignoruojant kiekį jau tam"
 DocType: Account,Tax,mokestis
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nežymimi
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,Šaltinis Dokumento pavadinimas
 DocType: Batch,Source Document Name,Šaltinis Dokumento pavadinimas
 DocType: Job Opening,Job Title,Darbo pavadinimas
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Sukurti Vartotojai
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Sukurti Vartotojai
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gramas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Kiekis, Gamyba turi būti didesnis nei 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Aplankykite ataskaitą priežiūros skambučio.
 DocType: Stock Entry,Update Rate and Availability,Atnaujinti Įvertinti ir prieinamumas
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentas jums leidžiama gauti arba pristatyti daugiau prieš užsakyto kiekio. Pavyzdžiui: Jei užsisakėte 100 vienetų. ir jūsų pašalpa yra 10%, tada jums yra leidžiama gauti 110 vienetų."
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kompensuojamos sąskaitos yra privalomas už prekę {0}
 DocType: BOM,Website Description,Interneto svetainė Aprašymas
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Grynasis pokytis nuosavo kapitalo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Prašome anuliuoti sąskaitą-faktūrą {0} pirmas
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Pašto adresas turi būti unikalus, jau egzistuoja {0}"
 DocType: Serial No,AMC Expiry Date,AMC Galiojimo data
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,gavimas
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,gavimas
 ,Sales Register,pardavimų Registruotis
 DocType: Daily Work Summary Settings Company,Send Emails At,Siųsti laiškus Šiuo
 DocType: Quotation,Quotation Lost Reason,Citata Pamiršote Priežastis
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Pasirinkite savo domeną
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Operacijos identifikacinis ne {0} data {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nėra nieko keisti.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Santrauka šį mėnesį ir laukiant veikla
 DocType: Customer Group,Customer Group Name,Klientų Grupės pavadinimas
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nėra Klientai dar!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pinigų srautų ataskaita
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Paskolos suma negali viršyti maksimalios paskolos sumos iš {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},Prašome pašalinti šioje sąskaitoje faktūroje {0} iš C formos {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,"Prašome pasirinkti perkelti skirtumą, jei taip pat norite įtraukti praėjusius finansinius metus balanso palieka šią fiskalinių metų"
 DocType: GL Entry,Against Voucher Type,Prieš čekių tipas
 DocType: Item,Attributes,atributai
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Prašome įvesti nurašyti paskyrą
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Paskutinė užsakymo data
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Sąskaita {0} nėra siejamas su kompanijos {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serijiniai numeriai {0} eilės nesutampa su Važtaraštis
 DocType: Student,Guardian Details,&quot;guardian&quot; informacija
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Pažymėti Dalyvavimas kelių darbuotojų
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Eilutės {0} # sąskaita turi būti tipo &quot;ilgalaikio turto&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,iš Kiekis
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Taisyklės apskaičiuoti siuntimo sumą už pardavimą
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija yra privalomi
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija yra privalomi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansinės paslaugos
 DocType: Student Sibling,Student ID,Studento pažymėjimas
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Veiklos rūšys Time Įrašai
 DocType: Tax Rule,Sales,pardavimų
 DocType: Stock Entry Detail,Basic Amount,bazinis dydis
 DocType: Training Event,Exam,Egzaminas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Sandėlių reikalingas akcijų punkte {0}
 DocType: Leave Allocation,Unused leaves,nepanaudoti lapai
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,kr
 DocType: Tax Rule,Billing State,atsiskaitymo valstybė
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,perkėlimas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nėra susijęs su asmens sąskaita {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nėra susijęs su asmens sąskaita {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Paduok sprogo BOM (įskaitant mazgus)
 DocType: Authorization Rule,Applicable To (Employee),Taikoma (Darbuotojų)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Terminas yra privalomi
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Taškinis atributas {0} negali būti 0
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,neaktyvūs Klientai
 DocType: Landed Cost Voucher,LCV,lengvųjų komercinių automobilių
 DocType: Landed Cost Voucher,Purchase Receipts,pirkimo kvitai
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kaip kainodaros taisyklė yra taikoma?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kaip kainodaros taisyklė yra taikoma?
 DocType: Stock Entry,Delivery Note No,Važtaraštis Nėra
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Jei pažymėta, tik Pirkimo medžiaga prašymai galutinių žaliavų bus įtrauktas į Materialiųjų prašymus. Priešingu atveju, bus sukurta Medžiaga Prašymai tėvų daiktų"
 DocType: Cheque Print Template,Message to show,Žinutė rodoma
 DocType: Company,Retail,Mažmeninė
 DocType: Attendance,Absent,nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Prekės Rinkinys
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Prekės Rinkinys
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Eilutės {0}: Neteisingas nuoroda {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Pirkimo mokesčius bei rinkliavas šabloną
 DocType: Upload Attendance,Download Template,parsisiųsti Šablonas
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,Sąskaita mokama iš
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Žaliavų punktas kodas
 DocType: Journal Entry,Write Off Based On,Nurašyti remiantis
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Padaryti Švinas
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Padaryti Švinas
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Spausdinti Kanceliarinės
 DocType: Stock Settings,Show Barcode Field,Rodyti Brūkšninis kodas laukas
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Siųsti Tiekėjo laiškus
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Siųsti Tiekėjo laiškus
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Pajamos jau tvarkomi laikotarpį tarp {0} ir {1}, palikite taikymo laikotarpį negali būti tarp šios datos intervalą."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Įrengimas rekordas Serijos Nr
 DocType: Guardian Interest,Guardian Interest,globėjas Palūkanos
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,Laukiama atsakymo
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,virš
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neteisingas atributas {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Paminėkite, jei nestandartinis mokama sąskaita"
 DocType: Salary Slip,Earning & Deduction,Pelningiausi &amp; išskaičiavimas
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Neprivaloma. Šis nustatymas bus naudojami filtruoti įvairiais sandoriais.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Neigiamas vertinimas Balsuok neleidžiama
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,Gamybos Užsakyti punktas
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Įrašų rasta
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Išlaidos metalo laužą turto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,dalinai ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kaina centras yra privalomas punktas {2}
 DocType: Vehicle,Policy No,politikos Nėra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Gauti prekes iš prekė Bundle
 DocType: Asset,Straight Line,Tiesi linija
 DocType: Project User,Project User,Projektų Vartotojas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,skilimas
@@ -3562,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,Gauk Studentai iš
 DocType: Hub Settings,Seller Country,Pardavėjo šalis
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Paskelbti daiktai tinklalapyje
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupė jūsų mokiniai partijomis
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupė jūsų mokiniai partijomis
 DocType: Authorization Rule,Authorization Rule,autorizacija taisyklė
 DocType: Sales Invoice,Terms and Conditions Details,Nuostatos ir sąlygos detalės
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specifikacija
@@ -3615,14 +3618,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,čekis data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Sąskaita {0}: Tėvų sąskaitą {1} nepriklauso įmonės: {2}
 DocType: Program Enrollment Tool,Student Applicants,studentų Pareiškėjai
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Sėkmingai ištrinta visus sandorius, susijusius su šios bendrovės!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Sėkmingai ištrinta visus sandorius, susijusius su šios bendrovės!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Kaip ir data
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Priėmimo data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,išbandymas
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Atlyginimo komponentai
 DocType: Program Enrollment Tool,New Academic Year,Nauja akademiniai metai
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Prekių grąžinimas / Kredito Pastaba
 DocType: Stock Settings,Auto insert Price List rate if missing,"Automatinis įterpti Kainų sąrašas norma, jei trūksta"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Iš viso sumokėta suma
 DocType: Production Order Item,Transferred Qty,perkelta Kiekis
@@ -3642,7 +3645,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipas lapų kaip atsitiktinis, serga ir tt"
 DocType: Email Digest,Send regular summary reports via Email.,Siųsti reguliarius suvestines ataskaitas elektroniniu paštu.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Prašome nustatyti numatytąją sąskaitą išlaidų teiginio tipas {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Prašome nustatyti numatytąją sąskaitą išlaidų teiginio tipas {0}
 DocType: Assessment Result,Student Name,Studento vardas
 DocType: Brand,Item Manager,Prekė direktorius
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Darbo užmokesčio Mokėtina
@@ -3663,6 +3666,7 @@
 ,Sales Funnel,pardavimų piltuvas
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Santrumpa yra privalomi
 DocType: Project,Task Progress,užduotis pažanga
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,krepšelis
 ,Qty to Transfer,Kiekis perkelti
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citatos klientų ar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vaidmuo leidžiama redaguoti šaldytą žaliavą
@@ -3690,13 +3694,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Prekė Išminčius Mokesčių detalės
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,institutas santrumpa
 ,Item-wise Price List Rate,Prekė išmintingas Kainų sąrašas Balsuok
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,tiekėjas Citata
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,tiekėjas Citata
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Žodžiais bus matomas, kai jūs išgelbėti citatos."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kiekis ({0}) negali būti iš eilės frakcija {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,rinkti mokesčius
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Brūkšninis kodas {0} jau naudojamas prekės {1}
 DocType: Lead,Add to calendar on this date,Pridėti į kalendorių šią dieną
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Taisyklės pridedant siuntimo išlaidas.
 DocType: Item,Opening Stock,atidarymo sandėlyje
@@ -3713,8 +3717,8 @@
 Updated via 'Time Log'",minutėmis Atnaujinta per &quot;Time Prisijungti&quot;
 DocType: Customer,From Lead,nuo švino
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Užsakymai išleido gamybai.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pasirinkite fiskalinių metų ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS profilis reikalaujama, kad POS įrašą"
 DocType: Program Enrollment Tool,Enroll Students,stoti Studentai
 DocType: Hub Settings,Name Token,vardas ženklas
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standartinė Parduodami
@@ -3725,7 +3729,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} prieš pardavimo sąskaita-faktūra {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,projekto pavadinimas
-DocType: Supplier,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
+DocType: Customer,Mention if non-standard receivable account,"Nurodyk, jei gautina nestandartinis sąskaita"
 DocType: Journal Entry Account,If Income or Expense,Jei pajamos ar sąnaudos
 DocType: Production Order,Required Items,Reikalingi daiktai
 DocType: Stock Ledger Entry,Stock Value Difference,Akcijų vertės skirtumas
@@ -3746,7 +3750,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nustatyti tikslai punktas grupė-protingas šiam Pardavimų asmeniui.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Atsargos senesnis nei [diena]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Eilutės # {0}: turtas yra privalomas ilgalaikio turto pirkimas / pardavimas
-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.","Jei du ar daugiau Kainodaros taisyklės yra rasta remiantis pirmiau minėtų sąlygų, pirmenybė taikoma. Prioritetas yra skaičius nuo 0 iki 20, o numatytoji reikšmė yra nulis (tuščias). Didesnis skaičius reiškia, kad jis bus viršesnės jei yra keli kainodaros taisyklės, kurių pačiomis sąlygomis."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jei du ar daugiau Kainodaros taisyklės yra rasta remiantis pirmiau minėtų sąlygų, pirmenybė taikoma. Prioritetas yra skaičius nuo 0 iki 20, o numatytoji reikšmė yra nulis (tuščias). Didesnis skaičius reiškia, kad jis bus viršesnės jei yra keli kainodaros taisyklės, kurių pačiomis sąlygomis."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskalinė Metai: {0} neegzistuoja
 DocType: Currency Exchange,To Currency,valiutos
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Leiskite šie vartotojai patvirtinti Leave Paraiškos bendrosios dienų.
@@ -3772,7 +3776,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Prekė {0} ignoruojami, nes tai nėra sandėlyje punktas"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Pateikti šios produkcijos Rūšiuoti tolesniam perdirbimui.
-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.","Norėdami netaikoma kainodaros taisyklė konkrečiu sandoriu, visos taikomos kainodaros taisyklės turi būti išjungta."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Norėdami netaikoma kainodaros taisyklė konkrečiu sandoriu, visos taikomos kainodaros taisyklės turi būti išjungta."
 DocType: Assessment Group,Parent Assessment Group,Tėvų vertinimas Grupė
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Darbas
 ,Sales Order Trends,Pardavimų užsakymų tendencijos
@@ -3783,7 +3787,7 @@
 DocType: Stock Entry Detail,Additional Cost,Papildoma Kaina
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Finansinių metų pabaigos data
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Negali filtruoti pagal lakšto, jei grupuojamas kuponą"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Padaryti Tiekėjo Citata
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Padaryti Tiekėjo Citata
 DocType: Quality Inspection,Incoming,įeinantis
 DocType: BOM,Materials Required (Exploded),"Medžiagų, reikalingų (Išpjovinė)"
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Įtraukti vartotojus į savo organizaciją, išskyrus save"
@@ -3811,6 +3815,7 @@
 DocType: Employee,History In Company,Istorija Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Naujienų prenumerata
 DocType: Stock Ledger Entry,Stock Ledger Entry,Akcijų Ledgeris įrašas
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientų&gt; Klientų grupė&gt; teritorija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Tas pats daiktas buvo įvesta kelis kartus
 DocType: Department,Leave Block List,Palikite Blokuoti sąrašas
 DocType: Sales Invoice,Tax ID,Mokesčių ID
@@ -3820,7 +3825,7 @@
 DocType: Customer,Sales Partner and Commission,Pardavimų partneris ir Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Palūkanų norma (%) / metus
 ,Project Quantity,Projektų Kiekis
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Viso {0} visoms prekėms yra lygus nuliui, gali būti, jūs turėtumėte pakeisti &quot;Paskirstyti mokesčius pagal&quot;"
 DocType: Opportunity,To Discuss,Diskutuoti
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} vienetai {1} reikia {2} užbaigti šį sandorį.
 DocType: Loan Type,Rate of Interest (%) Yearly,Palūkanų norma (%) Metinės
@@ -3835,7 +3840,7 @@
 DocType: Purchase Invoice,Return,sugrįžimas
 DocType: Production Order Operation,Production Order Operation,Gamybos Užsakyti Operacija
 DocType: Pricing Rule,Disable,išjungti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,mokėjimo būdas turi atlikti mokėjimą
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,mokėjimo būdas turi atlikti mokėjimą
 DocType: Project Task,Pending Review,kol apžvalga
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Turto {0} negali būti sunaikintas, nes jis jau yra {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Bendras išlaidų pretenzija (per expense punktą)
@@ -3843,11 +3848,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Pažymėti Nėra
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Eilutės {0}: Valiuta BOM # {1} turi būti lygus pasirinkta valiuta {2}
 DocType: Journal Entry Account,Exchange Rate,Valiutos kursas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pardavimų užsakymų {0} nebus pateiktas
 DocType: Homepage,Tag Line,Gairė linija
 DocType: Fee Component,Fee Component,mokestis komponentas
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,laivyno valdymo
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Pridėti elementus iš
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Pridėti elementus iš
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sandėlių {0}: Tėvų sąskaitą {1} nėra Bolong bendrovės {2}
 DocType: Cheque Print Template,Regular,reguliarus
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Iš viso weightage visų vertinimo kriterijai turi būti 100%
@@ -3860,7 +3865,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sandėlių {0} neegzistuoja
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registruotis Dėl ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mėnesio Paskirstymo Procentai
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Pasirinktas elementas negali turėti Serija
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vertinimo rodiklis į {0} punkte, kurie privalo daryti apskaitos įrašus nerastas {1} {2}. Jei elementas yra santykiuose kaip imties elementą {1}, paminėkite, kad {1} punkto lentelėje. Priešingu atveju, prašome sukurti atvykstamąjį akcijų sandorį elemento arba paminėti vertinimo lygis Prekės įrašo, tada bandykite submiting / atšaukti šį įrašą"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Medžiagų pristatytas prieš šią važtaraštyje
 DocType: Project,Customer Details,klientų informacija
@@ -3869,15 +3874,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Įveskite URL parametrą imtuvo Nr
 DocType: Payment Entry,Paid Amount,sumokėta suma
 DocType: Assessment Plan,Supervisor,vadovas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Prisijunges
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Prisijunges
 ,Available Stock for Packing Items,Turimas sandėlyje pakuoti prekės
 DocType: Item Variant,Item Variant,Prekė variantas
 DocType: Assessment Result Tool,Assessment Result Tool,Vertinimo rezultatas įrankis
 DocType: BOM Scrap Item,BOM Scrap Item,BOM laužas punktas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Pateikė užsakymai negali būti ištrintas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Sąskaitos likutis jau debeto, jums neleidžiama nustatyti &quot;Balansas turi būti&quot; kaip &quot;Kreditas&quot;"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,kokybės valdymas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Prekė {0} buvo išjungta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prekė {0} buvo išjungta
 DocType: Employee Loan,Repay Fixed Amount per Period,Grąžinti fiksuotas dydis vienam laikotarpis
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Prašome įvesti kiekį punkte {0}
 DocType: Employee External Work History,Employee External Work History,Darbuotojų Išorinis Darbo istorija
@@ -3904,7 +3909,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Studentų E-mail ID
 DocType: Employee,Notice (days),Pranešimas (dienų)
 DocType: Tax Rule,Sales Tax Template,Pardavimo mokestis Šablono
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Pasirinkite elementus išsaugoti sąskaitą faktūrą
 DocType: Employee,Encashment Date,išgryninimo data
 DocType: Training Event,Internet,internetas
 DocType: Account,Stock Adjustment,vertybinių popierių reguliavimas
@@ -3928,7 +3933,7 @@
 DocType: Item Variant Attribute,Attribute,atributas
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Prašome nurodyti nuo / iki svyruoja
 DocType: Serial No,Under AMC,pagal AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Prekė vertinimas norma perskaičiuojama atsižvelgiant iškrauti išlaidų kvito sumą
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Prekė vertinimas norma perskaičiuojama atsižvelgiant iškrauti išlaidų kvito sumą
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Numatytieji nustatymai pardavimo sandorius.
 DocType: Guardian,Guardian Of ,sergėtojos
 DocType: Grading Scale Interval,Threshold,Slenkstis
@@ -3938,6 +3943,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debeto Pastaba Išduotas
 DocType: Production Order,Warehouses,Sandėliai
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} turtas negali būti perduotas
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Šis elementas yra {0} (šablonų) variantas.
 DocType: Workstation,per hour,per valandą
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Pirkimas
 DocType: Announcement,Announcement,skelbimas
@@ -3953,8 +3959,8 @@
 DocType: Account,Receivable,gautinos
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Eilutės # {0}: Neleidžiama keisti tiekėjo Užsakymo jau egzistuoja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vaidmenį, kurį leidžiama pateikti sandorius, kurie viršija nustatytus kredito limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pasirinkite prekę Gamyba
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Pasirinkite prekę Gamyba
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master Data sinchronizavimą, tai gali užtrukti šiek tiek laiko"
 DocType: Item,Material Issue,medžiaga išdavimas
 DocType: Hub Settings,Seller Description,pardavėjas Aprašymas
 DocType: Employee Education,Qualification,kvalifikacija
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Užsakytas
 DocType: Salary Detail,Component,Komponentas
 DocType: Assessment Criteria,Assessment Criteria Group,Vertinimo kriterijai grupė
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atidarymo Sukauptas nusidėvėjimas turi būti mažesnis arba lygus {0}
 DocType: Warehouse,Warehouse Name,Sandėlių Vardas
 DocType: Naming Series,Select Transaction,Pasirinkite Sandorio
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Prašome įvesti patvirtinimo vaidmuo arba patvirtinimo vartotoją
@@ -3979,7 +3985,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},"Data turi būti per finansinius metus. Darant prielaidą, kad Norėdami data = {0}"
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Čia galite išsaugoti ūgį, svorį, alergijos, medicinos problemas ir tt"
 DocType: Leave Block List,Applies to Company,Taikoma Company
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Negali atšaukti, nes pateiktas sandėlyje Įėjimo {0} egzistuoja"
 DocType: Employee Loan,Disbursement Date,išmokėjimas data
 DocType: Vehicle,Vehicle,transporto priemonė
 DocType: Purchase Invoice,In Words,Žodžiais
@@ -3994,14 +4000,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Švinas%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Turto Nusidėvėjimas ir likučiai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} perkeliamas iš {2} į {3}
 DocType: Sales Invoice,Get Advances Received,Gauti gautų išankstinių
 DocType: Email Digest,Add/Remove Recipients,Įdėti / pašalinti gavėjus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Sandorio neleidžiama prieš nutraukė gamybą Užsakyti {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Norėdami nustatyti šią fiskalinių metų kaip numatytąjį, spustelėkite ant &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,prisijungti
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,trūkumo Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Prekė variantas {0} egzistuoja pačių savybių
 DocType: Employee Loan,Repay from Salary,Grąžinti iš Pajamos
 DocType: Leave Application,LAP/,juosmens /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},"Prašančioji mokėjimą nuo {0} {1} už sumą, {2}"
@@ -4019,7 +4025,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vertinimo rezultatas detalės
 DocType: Employee Education,Employee Education,Darbuotojų Švietimas
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dubliuoti punktas grupė rastas daiktas grupės lentelėje
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Jis reikalingas, kad parsiųsti Išsamesnė informacija."
 DocType: Salary Slip,Net Pay,Grynasis darbo užmokestis
 DocType: Account,Account,sąskaita
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijos Nr {0} jau gavo
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sandėlių {0} nėra susijęs su bet kokios sąskaitos, prašome sukurti / sujungti atitinkamą (turto) sąskaitą sandėlį."
 DocType: Purchase Invoice,Recurring Id,pasikartojančios ID
 DocType: Customer,Sales Team Details,Sales Team detalės
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Ištrinti visam laikui?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Ištrinti visam laikui?
 DocType: Expense Claim,Total Claimed Amount,Iš viso ieškinių suma
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Galimas galimybės pardavinėti.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neteisingas {0}
@@ -4039,13 +4045,14 @@
 DocType: Warehouse,PIN,PIN kodas
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nustatykite savo mokykla ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Bazinė Pakeisti Suma (Įmonės valiuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nieko apskaitos įrašai šiuos sandėlius
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Išsaugoti dokumentą pirmas.
 DocType: Account,Chargeable,Apmokestinimo
 DocType: Company,Change Abbreviation,Pakeisti santrumpa
 DocType: Expense Claim Detail,Expense Date,Kompensuojamos data
 DocType: Item,Max Discount (%),Maksimali nuolaida (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Paskutinė užsakymo suma
+DocType: Task,Is Milestone,Ar Milestone
 DocType: Daily Work Summary,Email Sent To,Paštas siunčiami
 DocType: Budget,Warn,įspėti
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bet koks kitas pastabas, pažymėtina pastangų, kad reikia eiti į apskaitą."
@@ -4066,7 +4073,7 @@
 DocType: Item Attribute Value,Attribute Value,Pavadinimas Reikšmė
 ,Itemwise Recommended Reorder Level,Itemwise Rekomenduojama Pertvarkyti lygis
 DocType: Salary Detail,Salary Detail,Pajamos detalės
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Prašome pasirinkti {0} pirmas
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Prašome pasirinkti {0} pirmas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Serija {0} punkto {1} yra pasibaigęs.
 DocType: Sales Invoice,Commission,Komisija
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Laikas lapas gamybai.
@@ -4078,41 +4085,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&quot;Freeze Atsargos Senesni Than` turėtų būti mažesnis nei% d dienų.
 DocType: Tax Rule,Purchase Tax Template,Pirkimo Mokesčių šabloną
 ,Project wise Stock Tracking,Projektų protinga sandėlyje sekimo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Priežiūros planas {0} egzistuoja nuo {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Tikrasis Kiekis (bent šaltinio / target)
 DocType: Item Customer Detail,Ref Code,teisėjas kodas
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbuotojų įrašus.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Prašome nustatyti Kita nusidėvėjimo data
 DocType: HR Settings,Payroll Settings,Payroll Nustatymai
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Rungtynių nesusieti sąskaitų faktūrų ir mokėjimų.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Vieta Užsakyti
 DocType: Email Digest,New Purchase Orders,Nauja Užsakymų
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Šaknų negali turėti tėvų ekonominį centrą
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Pasirinkite prekės ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Pasirinkite prekės ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Sukauptas nusidėvėjimas nuo
 DocType: Sales Invoice,C-Form Applicable,"C-formos, taikomos"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacijos metu turi būti didesnis nei 0 darbui {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Sandėlių yra privalomi
 DocType: Supplier,Address and Contacts,Adresas ir kontaktai
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM konversijos detalės
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Laikykite jį interneto draugiškas 900px (w) iki 100 piks (H)
 DocType: Program,Program Abbreviation,programos santrumpa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Gamybos nurodymas negali būti iškeltas prieš Prekės Šablonas
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Mokesčiai yra atnaujinama pirkimo kvitą su kiekvieno elemento
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Gamybos nurodymas negali būti iškeltas prieš Prekės Šablonas
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Mokesčiai yra atnaujinama pirkimo kvitą su kiekvieno elemento
 DocType: Warranty Claim,Resolved By,sprendžiami
 DocType: Bank Guarantee,Start Date,Pradžios data
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Skirti lapai laikotarpiui.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čekiai ir užstatai neteisingai išvalytas
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Sąskaita {0}: Jūs negalite priskirti save kaip patronuojančios sąskaitą
 DocType: Purchase Invoice Item,Price List Rate,Kainų sąrašas Balsuok
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Sukurti klientų citatos
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Sukurti klientų citatos
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",Rodyti &quot;Sandėlyje&quot; arba &quot;nėra sandėlyje&quot; remiantis sandėlyje turimus šiame sandėlį.
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Bilis medžiagos (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Vidutinis laikas, per kurį tiekėjas pateikia"
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,vertinimo rezultatas
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,valandos
 DocType: Project,Expected Start Date,"Tikimasi, pradžios data"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Pašalinti elementą jei mokesčiai nėra taikomi šio elemento
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Pašalinti elementą jei mokesčiai nėra taikomi šio elemento
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Pvz. smsgateway.com/api/send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,"Operacijos valiuta turi būti toks pat, kaip mokėjimo šliuzai valiuta"
 DocType: Payment Entry,Receive,gauti
@@ -4123,19 +4129,19 @@
 DocType: Workstation,Operating Costs,Veiklos sąnaudos
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Veiksmų, jei sukauptos mėnesio biudžetas Viršytas"
 DocType: Purchase Invoice,Submit on creation,Pateikti steigti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valiuta {0} turi būti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valiuta {0} turi būti {1}
 DocType: Asset,Disposal Date,Atliekų data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Laiškai bus siunčiami į visus aktyvius bendrovės darbuotojams už tam tikrą valandą, jei jie neturi atostogų. Atsakymų santrauka bus išsiųstas vidurnaktį."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbuotojų atostogos Tvirtintojas
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Eilutės {0}: an Pertvarkyti įrašas jau yra šiam sandėlį {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Negali paskelbti, kad prarastas, nes Citata buvo padaryta."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Mokymai Atsiliepimai
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Gamybos Užsakyti {0} turi būti pateiktas
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Prašome pasirinkti pradžios ir pabaigos data punkte {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Prašome pasirinkti pradžios ir pabaigos data punkte {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},"Žinoma, yra privalomi eilės {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Iki šiol gali būti ne anksčiau iš dienos
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc dokumentų tipas
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Įdėti / Redaguoti kainas
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Įdėti / Redaguoti kainas
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Batch,Parent Batch,tėvų Serija
 DocType: Cheque Print Template,Cheque Print Template,Čekis Spausdinti Šablono
@@ -4149,7 +4155,7 @@
 ,Ordered Items To Be Delivered,Užsakytas prekes turi būti pateikta
 DocType: Account,Income,Pajamos
 DocType: Industry Type,Industry Type,pramonė tipas
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Kažkas atsitiko!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Kažkas atsitiko!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Įspėjimas: Palikite paraiškoje yra šie blokas datos
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Pardavimų sąskaita faktūra {0} jau buvo pateikta
 DocType: Assessment Result Detail,Score,rezultatas
@@ -4180,17 +4186,17 @@
 DocType: Item,Variant Based On,Variantas remiantis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Iš viso weightage priskirti turi būti 100%. Ji yra {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Jūsų tiekėjai
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Negalima nustatyti kaip Pamiršote nes yra pagamintas pardavimų užsakymų.
 DocType: Request for Quotation Item,Supplier Part No,Tiekėjas partijos nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Gautas nuo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Negali atskaityti, kai kategorija skirta &quot;Vertinimo&quot; arba &quot;Vaulation ir viso&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Gautas nuo
 DocType: Lead,Converted,Perskaičiuotas
 DocType: Item,Has Serial No,Turi Serijos Nr
 DocType: Employee,Date of Issue,Išleidimo data
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Nuo {0} už {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Nuo {0} už {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Eilutės # {0}: Nustatykite Tiekėjas už prekę {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Eilutės {0}: valandos vertė turi būti didesnė už nulį.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Interneto svetainė Paveikslėlis {0} pridedamas prie punkto {1} negali būti rastas
 DocType: Issue,Content Type,turinio tipas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Kompiuteris
 DocType: Item,List this Item in multiple groups on the website.,Sąrašas šį Elementą keliomis grupėmis svetainėje.
@@ -4199,20 +4205,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Jūs nesate įgaliotas nustatyti Frozen vertę
 DocType: Payment Reconciliation,Get Unreconciled Entries,Gauk Unreconciled įrašai
 DocType: Payment Reconciliation,From Invoice Date,Iš sąskaitos faktūros išrašymo data
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Atsiskaitymo valiuta turi būti lygi arba numatytosios comapany anketa valiutos arba asmens sąskaita valiuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Palikite išgryninimo
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ką tai daro?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,į sandėlį
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visi Studentų Priėmimo
 ,Average Commission Rate,Vidutinis Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&quot;Ar Serijos ne&quot; negali būti &quot;Taip&quot; už NON-STOCK punktą
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Dalyvavimas negali būti ženklinami ateities datas
 DocType: Pricing Rule,Pricing Rule Help,Kainodaros taisyklė Pagalba
 DocType: School House,House Name,Namas Vardas
 DocType: Purchase Taxes and Charges,Account Head,sąskaita vadovas
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atnaujinkite papildomas išlaidas apskaičiuoti iškrauti išlaidas daiktų
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elektros
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridėti jūsų organizacijos pailsėti kaip savo vartotojams. Taip pat galite pridėti kviečiame klientus į jūsų portalą pridedant juos nuo Kontaktai
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridėti jūsų organizacijos pailsėti kaip savo vartotojams. Taip pat galite pridėti kviečiame klientus į jūsų portalą pridedant juos nuo Kontaktai
 DocType: Stock Entry,Total Value Difference (Out - In),Viso vertės skirtumas (iš - į)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Eilutės {0}: Valiutų kursai yra privalomi
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Vartotojo ID nenustatyti Darbuotojo {0}
@@ -4221,7 +4227,7 @@
 DocType: Item,Customer Code,Kliento kodas
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Gimimo diena priminimas {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas nuo paskutinė užsakymo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debeto sąskaitą turi būti balansas sąskaitos
 DocType: Buying Settings,Naming Series,Pavadinimų serija
 DocType: Leave Block List,Leave Block List Name,Palikite blokuojamų sąrašą pavadinimas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Draudimo pradžios data turėtų būti ne mažesnė nei draudimo pabaigos data
@@ -4236,9 +4242,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Pajamos Kuponas darbuotojo {0} jau sukurta laiko lape {1}
 DocType: Vehicle Log,Odometer,odometras
 DocType: Sales Order Item,Ordered Qty,Užsakytas Kiekis
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Prekė {0} yra išjungtas
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Prekė {0} yra išjungtas
 DocType: Stock Settings,Stock Frozen Upto,Akcijų Šaldyti upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nėra jokių akcijų elementą
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Laikotarpis nuo ir laikotarpis datų privalomų pasikartojančios {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Projekto veikla / užduotis.
 DocType: Vehicle Log,Refuelling Details,Degalų detalės
@@ -4248,8 +4254,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Paskutinis pirkinys norma nerastas
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Nurašyti suma (Įmonės valiuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Atsiskaitymo laikas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Numatytasis BOM už {0} nerastas
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Eilutės # {0}: Prašome nustatyti pertvarkyti kiekį
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Bakstelėkite elementus įtraukti juos čia
 DocType: Fees,Program Enrollment,programos Įrašas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Nusileido kaina čekis
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prašome nustatyti {0}
@@ -4273,7 +4280,7 @@
 DocType: Maintenance Visit,Maintenance Date,priežiūra data
 DocType: Purchase Invoice Item,Rejected Serial No,Atmesta Serijos Nr
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Metų pradžios datą arba pabaigos data sutampa su {0}. Norėdami išvengti nustatykite įmonę
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Pradžios data turėtų būti mažesnis nei pabaigos datos punkte {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Pradžios data turėtų būti mažesnis nei pabaigos datos punkte {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.","Pavyzdys:. ABCD ##### Jei serija yra nustatytas ir Serijos Nr nepaminėtas sandorius, tada automatinis serijos numeris bus sukurta remiantis šios serijos. Jei norite visada aiškiai paminėti eilės numeriai šią prekę nėra. Palikite šį lauką tuščią."
 DocType: Upload Attendance,Upload Attendance,Įkelti Lankomumas
@@ -4350,7 +4357,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Mažmeninė prekyba ir didmeninė prekyba
 DocType: Issue,First Responded On,Pirma atsakė
 DocType: Website Item Group,Cross Listing of Item in multiple groups,"Kryžius, sąrašas elementą kelių grupių"
-DocType: Grade Interval,Grade Interval,Įvertinimas intervalas
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalinė metų pradžios data ir fiskalinių metų pabaigos data jau nustatyta fiskaliniais metais {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Atnaujintas klirensas data
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Splitas Serija
@@ -4397,14 +4403,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Palikite nepažymėtą jei nenorite atsižvelgti į partiją, o todėl kursų pagrįstas grupes."
 DocType: Asset,Frequency of Depreciation (Months),Dažnio nusidėvėjimo (mėnesiais)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kreditinė sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kreditinė sąskaita
 DocType: Landed Cost Item,Landed Cost Item,Nusileido Kaina punktas
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Rodyti nulines vertes
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Kiekis objekto gauti po gamybos / perpakavimas iš pateiktų žaliavų kiekius
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Sąranka paprastas svetainė mano organizacijoje
 DocType: Payment Reconciliation,Receivable / Payable Account,Gautinos / mokėtinos sąskaitos
 DocType: Delivery Note Item,Against Sales Order Item,Prieš Pardavimų įsakymu punktas
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Prašome nurodyti Įgūdis požymio reikšmę {0}
 DocType: Item,Default Warehouse,numatytasis sandėlis
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Biudžetas negali būti skiriamas prieš grupės sąskaitoje {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Prašome įvesti patronuojanti kaštų centrą
@@ -4450,7 +4456,7 @@
 DocType: Opportunity Item,Basic Rate,bazinis tarifas
 DocType: GL Entry,Credit Amount,kredito suma
 DocType: Cheque Print Template,Signatory Position,signataras pozicijos
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Nustatyti kaip Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Nustatyti kaip Lost
 DocType: Timesheet,Total Billable Hours,Iš viso apmokamas valandas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Mokėjimo kvitą Pastaba
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tai grindžiama sandorių atžvilgiu šis klientas. Žiūrėti grafikas žemiau detales
@@ -4464,11 +4470,11 @@
 ,Items To Be Requested,"Daiktai, kurių bus prašoma"
 DocType: Purchase Order,Get Last Purchase Rate,Gauk paskutinį pirkinį Balsuok
 DocType: Company,Company Info,Įmonės informacija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pasirinkite arba pridėti naujų klientų
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Pasirinkite arba pridėti naujų klientų
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kaina centras privalo užsakyti sąnaudomis pretenziją
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Taikymas lėšos (turtas)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Tai yra, remiantis šio darbuotojo dalyvavimo"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,debeto sąskaita
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,debeto sąskaita
 DocType: Fiscal Year,Year Start Date,Metų pradžios data
 DocType: Attendance,Employee Name,Darbuotojo vardas
 DocType: Sales Invoice,Rounded Total (Company Currency),Suapvalinti Iš viso (Įmonės valiuta)
@@ -4477,13 +4483,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Stop vartotojus nuo priėmimo prašymų įstoti į šių dienų.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkimo suma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tiekėjas Citata {0} sukūrė
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Pabaiga metai bus ne anksčiau pradžios metus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Išmokos darbuotojams
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Supakuotas kiekis turi vienodas kiekis už prekę {0} iš eilės {1}
 DocType: Production Order,Manufactured Qty,pagaminta Kiekis
 DocType: Purchase Receipt Item,Accepted Quantity,Priimamos Kiekis
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prašome nustatyti numatytąjį Atostogų sąrašas Darbuotojo {0} arba Įmonės {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neegzistuoja
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neegzistuoja
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Vekseliai iškelti į klientams.
 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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Eilutės Nėra {0}: suma negali būti didesnė nei Kol Suma prieš expense punktą {1}. Kol suma yra {2}
@@ -4492,15 +4498,17 @@
 DocType: Quality Inspection Reading,Reading 3,Skaitymas 3
 ,Hub,įvorė
 DocType: GL Entry,Voucher Type,Bon tipas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Kainų sąrašas nerastas arba išjungtas
 DocType: Employee Loan Application,Approved,patvirtinta
 DocType: Pricing Rule,Price,kaina
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Darbuotojų atleidžiamas nuo {0} turi būti nustatyti kaip &quot;Left&quot;
 DocType: Guardian,Guardian,globėjas
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vertinimas {0} sukurtas darbuotojo {1} konkrečioje dat
 DocType: Employee,Education,švietimas
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanija įvardijimas Iki
 DocType: Employee,Current Address Is,Dabartinis adresas
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,keistas
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Neprivaloma. Nustato įmonės numatytasis valiuta, jeigu nenurodyta."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Apskaitos žurnalo įrašai.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Turimas Kiekis ne iš sandėlio
@@ -4509,7 +4517,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Eilutės {0}: Šalis / Sąskaita nesutampa su {1} / {2} į {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Prašome įvesti sąskaita paskyrą
 DocType: Account,Stock,ištekliai
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Eilutės # {0}: Informacinis dokumentas tipas turi būti vienas iš pirkimo tvarka, pirkimo sąskaitoje faktūroje ar žurnalo įrašą"
 DocType: Employee,Current Address,Dabartinis adresas
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jei elementas yra kito elemento, tada aprašymas, vaizdo, kainodara, mokesčiai ir tt bus nustatytas nuo šablono variantas, nebent aiškiai nurodyta"
 DocType: Serial No,Purchase / Manufacture Details,Pirkimas / Gamyba detalės
@@ -4537,7 +4545,7 @@
 DocType: Hub Settings,Hub Settings,Hub Nustatymai
 DocType: Project,Gross Margin %,"Bendroji marža,%"
 DocType: BOM,With Operations,su operacijų
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Apskaitos įrašai jau buvo padaryta valiuta {0} kompanijai {1}. Prašome pasirinkti gautinai ar mokėtinai sumai sąskaitą valiuta {0}.
 DocType: Asset,Is Existing Asset,Ar turimo turto
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
 DocType: Salary Detail,Statistical Component,Statistiniai komponentas
@@ -4562,7 +4570,7 @@
 DocType: Assessment Plan,Room,Kambarys
 DocType: Purchase Order,Advance Paid,sumokėto avanso
 DocType: Item,Item Tax,Prekė Mokesčių
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,"Medžiaga, iš Tiekėjui"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,"Medžiaga, iš Tiekėjui"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,akcizo Sąskaita
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% atrodo daugiau nei vieną kartą
 DocType: Expense Claim,Employees Email Id,Darbuotojai elektroninio pašto numeris
@@ -4593,9 +4601,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,prisegti logotipas
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,atsargų kiekis
 DocType: Customer,Commission Rate,Komisija Balsuok
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Padaryti variantas
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Padaryti variantas
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokuoti atostogų prašymai departamento.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Mokėjimo tipas turi būti vienas iš Gauti Pay ir vidaus perkėlimo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",Mokėjimo tipas turi būti vienas iš Gauti Pay ir vidaus perkėlimo
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Krepšelis tuščias
 DocType: Vehicle,Model,Modelis
@@ -4606,6 +4614,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Leiskite gamyba Šventės
 DocType: Sales Order,Customer's Purchase Order Date,Kliento Užsakymo data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalas
+DocType: Shopping Cart Settings,Show Public Attachments,Rodyti Viešieji Priedai
 DocType: Packing Slip,Package Weight Details,Pakuotės svoris detalės
 DocType: Payment Gateway Account,Payment Gateway Account,Mokėjimo šliuzai paskyra
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po mokėjimo pabaigos nukreipti vartotoją į pasirinktame puslapyje.
@@ -4624,15 +4633,15 @@
 DocType: Batch,Expiry Date,Galiojimo data
 ,Supplier Addresses and Contacts,Tiekėjo Adresai ir kontaktai
 ,accounts-browser,sąskaitos-naršyklė
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Prašome pasirinkti Kategorija pirmas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Prašome pasirinkti Kategorija pirmas
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektų meistras.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Leisti per sąskaitų arba per užsakymą, atnaujinti &quot;pašalpa&quot; sandėlyje nustatymus arba elementą."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nerodyti kaip $ ir tt simbolis šalia valiutomis.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pusė dienos)
 DocType: Supplier,Credit Days,kredito dienų
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Padaryti Studentų Serija
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Padaryti Studentų Serija
 DocType: Leave Type,Is Carry Forward,Ar perkelti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Gauti prekes iš BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Gauti prekes iš BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Švinas Laikas dienas
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Eilutės # {0}: Siunčiamos data turi būti tokia pati kaip pirkimo datos {1} Turto {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Prašome įvesti pardavimų užsakymų pirmiau pateiktoje lentelėje
@@ -4649,8 +4658,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,sankcijos suma
 DocType: GL Entry,Is Opening,Ar atidarymas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Eilutės {0}: debeto įrašą negali būti susieta su {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prašome nustatymas numeracijos serijos Lankomumas per Setup&gt; numeravimas serija
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Sąskaita {0} neegzistuoja
 DocType: Account,Cash,pinigai
 DocType: Employee,Short biography for website and other publications.,Trumpa biografija interneto svetainės ir kitų leidinių.
diff --git a/erpnext/translations/lv.csv b/erpnext/translations/lv.csv
index 8f84a90..ce4b4a9 100644
--- a/erpnext/translations/lv.csv
+++ b/erpnext/translations/lv.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Īrēts
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Piemērojams Lietotājs
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Pārtraucis ražošanu rīkojums nevar tikt atcelts, Unstop to vispirms, lai atceltu"
 DocType: Vehicle Service,Mileage,Nobraukums
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vai jūs tiešām vēlaties atteikties šo aktīvu?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Select Default piegādātājs
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Select Default piegādātājs
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valūta ir nepieciešama Cenrāža {0}
 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
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Iekavēti {0} nevar būt mazāka par nulli ({1})
 DocType: Manufacturing Settings,Default 10 mins,Pēc noklusējuma 10 min
 DocType: Leave Type,Leave Type Name,Atstājiet veida nosaukums
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Rādīt open
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Rādīt open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Series Atjaunots Veiksmīgi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,izrakstīšanās
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Ievietots
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Partijas Prece derīguma statuss
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka projekts
 DocType: Mode of Payment Account,Mode of Payment Account,Mode maksājumu konta
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Rādīt Variants
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Rādīt Variants
 DocType: Academic Term,Academic Term,Akadēmiskā Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,materiāls
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Daudzums
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Daudzums
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Konti tabula nevar būt tukšs.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Kredītiem (pasīvi)
 DocType: Employee Education,Year of Passing,Gads Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",Atsauce:% s punkts Kods:% s un Klients:% s
 DocType: Item,Country of Origin,Izcelsmes valsts
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Noliktavā
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Atvērt jautājumi
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Veselības aprūpe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Maksājuma kavējums (dienas)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Servisa izdevumu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Pavadzīme
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sērijas numurs: {0} jau ir atsauce pārdošanas rēķina: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Pavadzīme
 DocType: Maintenance Schedule Item,Periodicity,Periodiskums
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiskālā gads {0} ir vajadzīga
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Paredzamais piegādes datums ir jābūt pirms pārdošanas pasūtījuma datuma
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pievienojiet .csv failu ar divām kolonnām, viena veco nosaukumu un vienu jaunu nosaukumu"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nekādā aktīvajā fiskālajā gadā.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Reference: {0}, Produkta kods: {1} un Klients: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Atvēršana uz darbu.
 DocType: Item Attribute,Increment,Pieaugums
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Izvēlieties noliktava ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Izvēlieties noliktava ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklāma
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Dabūtu preces no
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Aizliegts {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Dabūtu preces no
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Preces nevar atjaunināt pret piegāde piezīme {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkta {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nav minētie posteņi
 DocType: Payment Reconciliation,Reconcile,Saskaņot
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Pārtikas veikals
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nākamais nolietojums datums nevar būt pirms iegādes datuma
 DocType: SMS Center,All Sales Person,Visi Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mēneša Distribution ** palīdz izplatīt Budžeta / Target pāri mēnešiem, ja jums ir sezonalitātes jūsu biznesu."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nav atrastas preces
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nav atrastas preces
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Algu struktūra Trūkst
 DocType: Lead,Person Name,Persona Name
 DocType: Sales Invoice Item,Sales Invoice Item,PPR produkts
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","piemēram, &quot;Pamatskola&quot; vai &quot;universitāte&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,akciju Ziņojumi
 DocType: Warehouse,Warehouse Detail,Noliktava Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredīta limits ir šķērsojis klientam {0}{1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term Beigu datums nedrīkst būt vēlāk kā gadu beigu datums akadēmiskā gada, uz kuru termiņš ir saistīts (akadēmiskais gads {}). Lūdzu izlabojiet datumus un mēģiniet vēlreiz."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Vai pamatlīdzeklis&quot; nevar būt nekontrolēti, jo Asset ieraksts pastāv pret posteņa"
 DocType: Vehicle Service,Brake Oil,bremžu eļļa
 DocType: Tax Rule,Tax Type,Nodokļu Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Jums nav atļauts pievienot vai atjaunināt ierakstus pirms {0}
 DocType: BOM,Item Image (if not slideshow),Postenis attēls (ja ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Klientu pastāv ar tādu pašu nosaukumu
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Stundas likme / 60) * Faktiskais darba laiks
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Izmaksas piegādāto preču
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Svētki uz {0} nav starp No Datums un līdz šim
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,skolas
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nav atvaļinājums ieraksts down darbiniekam {0} uz {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ievadiet uzņēmuma pirmais
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Lūdzu, izvēlieties Company pirmais"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Mērķa On
 DocType: BOM,Total Cost,Kopējās izmaksas
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Prasības summa
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Dublikāts klientu grupa atrodama cutomer grupas tabulas
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Piegādātājs Type / piegādātājs
 DocType: Naming Series,Prefix,Priedēklis
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Patērējamās
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,pakāpe
 DocType: Sales Invoice Item,Delivered By Supplier,Pasludināts piegādātāja
 DocType: SMS Center,All Contact,Visi Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Ražošanas rīkojums jau radīta visiem posteņiem ar BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gada alga
 DocType: Daily Work Summary,Daily Work Summary,Ikdienas darbs kopsavilkums
 DocType: Period Closing Voucher,Closing Fiscal Year,Noslēguma fiskālajā gadā
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ir iesaldēts
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ir iesaldēts
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Lūdzu, izvēlieties esošo uzņēmumu radīšanai kontu plānu"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Akciju Izdevumi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Atlasīt Target noliktava
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredītu uzņēmumā Valūta
 DocType: Delivery Note,Installation Status,Instalācijas statuss
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vai vēlaties atjaunināt apmeklēšanu? <br> Present: {0} \ <br> Nekonstatē: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pieņemts + Noraidīts Daudz ir jābūt vienādam ar Saņemts daudzumu postenī {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Piegādes izejvielas iegādei
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Vismaz viens maksājuma veids ir nepieciešams POS rēķinu.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Vismaz viens maksājuma veids ir nepieciešams POS rēķinu.
 DocType: Products Settings,Show Products as a List,Rādīt produktus kā sarakstu
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Padarīt Nolietojums Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Pieprasījums Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Izveidot darbinieku
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Izveidot darbinieku
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Apraides
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Izpildīšana
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Sīkāka informācija par veiktajām darbībām.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plāns apkopes apmeklējumiem.
 DocType: SMS Settings,Enter url parameter for message,Ievadiet url parametrs ziņu
 DocType: POS Profile,Customer Groups,klientu grupas
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finanšu pārskati
 DocType: Guardian,Students,Students
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Noteikumus cenas un atlaides.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenrādis ir jāpiemēro pērk vai pārdod
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance summa nevar būt lielāka par {0} {1}
 DocType: Naming Series,Series List for this Transaction,Sērija saraksts par šo darījumu
 DocType: Company,Default Payroll Payable Account,Default Algu Kreditoru konts
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Vai atvēršana Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Pieminēt ja nestandarta saņemama konts piemērojams
 DocType: Course Schedule,Instructor Name,instruktors Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,"Par noliktava ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,"Par noliktava ir nepieciešams, pirms iesniegt"
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Saņemta
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ja ieslēgts, ietvers nav pieejama preces materiāla pieprasījumiem."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Pret pārdošanas rēķinu posteni
 ,Production Orders in Progress,Pasūtījums Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto naudas no finansēšanas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage ir pilna, nebija glābt"
 DocType: Lead,Address & Contact,Adrese un kontaktinformācija
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pievienot neizmantotās lapas no iepriekšējiem piešķīrumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nākamais Atkārtojas {0} tiks izveidota {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Kopā Izmaksu summa (via laiks lapas)
 DocType: Item Website Specification,Item Website Specification,Postenis Website Specifikācija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Atstājiet Bloķēts
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankas ieraksti
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Postenis {0} ir sasniedzis beigas dzīves uz {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,bankas ieraksti
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Gada
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Samierināšanās postenis
 DocType: Stock Entry,Sales Invoice No,PPR Nr
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Publicē Hub
 DocType: Student Admission,Student Admission,Studentu uzņemšana
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Postenis {0} ir atcelts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiāls Pieprasījums
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Postenis {0} ir atcelts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Izcilas Čeki un noguldījumi, lai nodzēstu"
 DocType: Item,Synced With Hub,Sinhronizēts ar Hub
 DocType: Vehicle,Fleet Manager,flotes vadītājs
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rinda # {0}: {1} nevar būt negatīvs postenim {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Nepareiza Parole
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Rinda # {0}: {1} nevar būt negatīvs postenim {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Nepareiza Parole
 DocType: Item,Variant Of,Variants
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Pabeigts Daudz nevar būt lielāks par ""Daudz, lai ražotu"""
 DocType: Period Closing Voucher,Closing Account Head,Noslēguma konta vadītājs
 DocType: Employee,External Work History,Ārējā Work Vēsture
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Apļveida Reference kļūda
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Paziņot pa e-pastu uz izveidojot automātisku Material pieprasījuma
 DocType: Journal Entry,Multi Currency,Multi Valūtas
 DocType: Payment Reconciliation Invoice,Invoice Type,Rēķins Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Piegāde Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Piegāde Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Iestatīšana Nodokļi
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Izmaksas Sold aktīva
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ieraksta divreiz Vienības nodokli
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Kopsavilkums par šo nedēļu un izskatāmo darbību
 DocType: Student Applicant,Admitted,uzņemta
 DocType: Workstation,Rent Cost,Rent izmaksas
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Pasūtījuma vērtība
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Skaidras naudas darījumi pret pusi vai iekšējai pārskaitījumu
 DocType: Shipping Rule,Valid for Countries,Derīgs valstīm
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Šis postenis ir Template un nevar tikt izmantoti darījumos. Postenis atribūti tiks pārkopēti uz variantiem, ja ""Nē Copy"" ir iestatīts"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Kopā Order Uzskata
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Darbinieku apzīmējums (piemēram, CEO, direktors uc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Ievadiet ""Atkārtot mēneša diena"" lauka vērtību"
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Pirkuma rēķins nevar būt pret esošā aktīva {1}
 DocType: Item Tax,Tax Rate,Nodokļa likme
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} jau piešķirtais Darbinieku {1} par periodu {2} līdz {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select postenis
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Select postenis
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Pirkuma rēķins {0} jau ir iesniegts
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Partijas Nr jābūt tāda pati kā {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Pārvērst ne-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,(Sērijas) posteņa.
 DocType: C-Form Invoice Detail,Invoice Date,Rēķina datums
 DocType: GL Entry,Debit Amount,Debets Summa
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tur var būt tikai 1 konts per Company {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Lūdzu, skatiet pielikumu"
 DocType: Purchase Order,% Received,% Saņemts
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Izveidot studentu grupas
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Pieprasījums piedāvājumam
 DocType: Salary Slip Timesheet,Working Hours,Darba laiks
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Mainīt sākuma / pašreizējo kārtas numuru esošam sēriju.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Izveidot jaunu Klientu
-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.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Izveidot jaunu Klientu
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ja vairāki Cenu Noteikumi turpina dominēt, lietotāji tiek aicināti noteikt prioritāti manuāli atrisināt konfliktu."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Izveidot pirkuma pasūtījumu
 ,Purchase Register,Pirkuma Reģistrēties
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Piemērojamām izmaksām
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ir jābūt lomu 'Leave apstiprinātājs'
 DocType: Purchase Receipt,Vehicle Date,Transportlīdzekļu Datums
 DocType: Student Log,Medical,Medicīnisks
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Iemesls zaudēt
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Iemesls zaudēt
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Svins Īpašnieks nevar būt tāds pats kā galvenajam
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Piešķirtā summa nevar pārsniedz nekoriģētajām summu
 DocType: Announcement,Receiver,Saņēmējs
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Daudzums un Rate
 DocType: Delivery Note,% Installed,% Uzstādīts
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Klases / Laboratories etc kur lekcijas var tikt plānots.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ievadiet uzņēmuma nosaukumu pirmais
 DocType: Purchase Invoice,Supplier Name,Piegādātājs Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lasīt ERPNext rokasgrāmatu
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligāts lauks - akadēmiskais gads
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligāts lauks - akadēmiskais gads
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Pielāgot ievada tekstu, kas iet kā daļu no šīs e-pastu. Katrs darījums ir atsevišķa ievada tekstu."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Lūdzu iestatīt noklusēto maksājams konts uzņēmumam {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globālie uzstādījumi visām ražošanas procesiem.
 DocType: Accounts Settings,Accounts Frozen Upto,Konti Frozen Līdz pat
 DocType: SMS Log,Sent On,Nosūtīts
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Prasme {0} izvēlēts vairākas reizes atribūtos tabulā
 DocType: HR Settings,Employee record is created using selected field. ,"Darbinieku ieraksts tiek izveidota, izmantojot izvēlēto laukumu."
 DocType: Sales Order,Not Applicable,Nav piemērojams
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Brīvdienu pārvaldnieks
 DocType: Request for Quotation Item,Required Date,Nepieciešamais Datums
 DocType: Delivery Note,Billing Address,Norēķinu adrese
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ievadiet Preces kods.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ievadiet Preces kods.
 DocType: BOM,Costing,Izmaksu
 DocType: Tax Rule,Billing County,norēķinu County
 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"
@@ -506,6 +510,7 @@
 DocType: Packing Slip,From Package No.,No Package Nr
 DocType: Item Attribute,To Range,Svārstās
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vērtspapīri un noguldījumi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nevar mainīt vērtēšanas metode, jo ir darījumi pret dažām precēm, kuras nav tā paša novērtēšanas metode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Kopā lapas piešķirtās ir obligāta
 DocType: Job Opening,Description of a Job Opening,Apraksts par vakanču
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Neapstiprinātas aktivitātes šodienu
@@ -527,13 +532,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Lūdzu, izvēlieties kurss"
 DocType: Timesheet Detail,Hrs,h
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Lūdzu, izvēlieties Uzņēmums"
 DocType: Stock Entry Detail,Difference Account,Atšķirība konts
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nevar aizvērt uzdevums, jo tās atkarīgas uzdevums {0} nav slēgta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Ievadiet noliktava, par kuru Materiāls Pieprasījums tiks izvirzīts"
 DocType: Production Order,Additional Operating Cost,Papildus ekspluatācijas izmaksas
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmētika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Apvienoties, šādi īpašībām jābūt vienādam abiem posteņiem"
 DocType: Shipping Rule,Net Weight,Neto svars
 DocType: Employee,Emergency Phone,Avārijas Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,pirkt
@@ -543,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Lūdzu noteikt atzīmi par sliekšņa 0%
 DocType: Sales Order,To Deliver,Piegādāt
 DocType: Purchase Invoice Item,Item,Prece
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Sērijas neviens punkts nevar būt daļa
 DocType: Journal Entry,Difference (Dr - Cr),Starpība (Dr - Cr)
 DocType: Account,Profit and Loss,Peļņa un zaudējumi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Apakšuzņēmēji
@@ -558,7 +563,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Pieaugums nevar būt 0
 DocType: Production Planning Tool,Material Requirement,Materiālu vajadzības
 DocType: Company,Delete Company Transactions,Dzēst Uzņēmums Darījumi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Atsauces Nr un atsauces datums ir obligāta Bank darījumu
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Pievienot / rediģēt nodokļiem un maksājumiem
 DocType: Purchase Invoice,Supplier Invoice No,Piegādātāju rēķinu Nr
 DocType: Territory,For reference,Par atskaites
@@ -569,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Uzstādīšana Note postenis
 DocType: Production Plan Item,Pending Qty,Kamēr Daudz
 DocType: Budget,Ignore,Ignorēt
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nav aktīvs
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nav aktīvs
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS nosūtīts šādiem numuriem: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup pārbaudīt izmēri drukāšanai
 DocType: Salary Slip,Salary Slip Timesheet,Alga Slip laika kontrolsaraksts
@@ -578,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Kopā Komisija
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Pirkuma čeka Nepieciešamais
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Vērtēšana Rate ir obligāta, ja atvēršana Stock ievadīts"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nav atrasti rēķinu tabulas ieraksti
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Lūdzu, izvēlieties Uzņēmumu un Party tips pirmais"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanšu / grāmatvedības gadā.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Uzkrātās vērtības
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Atvainojiet, Serial Nos nevar tikt apvienots"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Veikt klientu pasūtījumu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Veikt klientu pasūtījumu
 DocType: Project Task,Project Task,Projekta uzdevums
 ,Lead Id,Potenciālā klienta ID
 DocType: C-Form Invoice Detail,Grand Total,Pavisam kopā
@@ -601,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,atsākt Pielikums
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Atkārtojiet Klienti
 DocType: Leave Control Panel,Allocate,Piešķirt
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Piezīme: Kopā piešķirtie lapas {0} nedrīkst būt mazāks par jau apstiprināto lapām {1} par periodu
 DocType: Announcement,Posted By,rakstīja
 DocType: Item,Delivered by Supplier (Drop Ship),Pasludināts ar piegādātāja (Drop Ship)
@@ -611,7 +616,7 @@
 DocType: Quotation,Quotation To,Piedāvājums:
 DocType: Lead,Middle Income,Middle Ienākumi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Atvere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Piešķirtā summa nevar būt negatīvs
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lūdzu noteikt Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lūdzu noteikt Company
@@ -623,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Pārdošanas rēķins laika kontrolsaraksts
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Atsauces Nr & Reference datums ir nepieciešama {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Izvēlieties Maksājumu konts padarīt Banka Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Izveidot Darbinieku uzskaiti, lai pārvaldītu lapiņas, izdevumu deklarācijas un algas"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pievienot zināšanu bāzes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Priekšlikums Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Maksājumu Entry atskaitīšana
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nav fiskālajā gadā {2}
 DocType: Buying Settings,Settings for Buying Module,Iestatījumi Buying modulis
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} nav pieder uzņēmumam {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Ievadiet pirkuma čeka pirmais
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Ievadiet pirkuma čeka pirmais
 DocType: Buying Settings,Supplier Naming By,Piegādātājs nosaukšana Līdz
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Neto Izmaiņas sarakstā
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Darbinieku Loan Management
 DocType: Employee,Passport Number,Pases numurs
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Saistība ar Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Vadītājs
 DocType: Payment Entry,Payment From / To,Maksājums no / uz
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,datumu diapazons
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Jaunais kredītlimits ir mazāks nekā pašreizējais nesamaksātās summas par klientam. Kredīta limits ir jābūt atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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 ""Grupēt pēc"", nevar būt vienādi"
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,Minūtēs
 DocType: Issue,Resolution Date,Izšķirtspēja Datums
 DocType: Student Batch Name,Batch Name,partijas nosaukums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Kontrolsaraksts izveidots:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Kontrolsaraksts izveidots:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Lūdzu iestatītu standarta kases vai bankas kontu maksājuma veidu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,uzņemt
 DocType: Selling Settings,Customer Naming By,Klientu nosaukšana Līdz
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Rādīs studentam par klātesošu studentu ikmēneša Apmeklējumu ziņojums
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Faktiskais Sākuma laiks
 DocType: BOM Operation,Operation Time,Darbība laiks
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,apdare
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,bāze
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,bāze
 DocType: Timesheet,Total Billed Hours,Kopā Apmaksājamie Stundas
 DocType: Journal Entry,Write Off Amount,Uzrakstiet Off summa
 DocType: Journal Entry,Bill No,Bill Nr
@@ -719,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,Student apmeklējums
 DocType: Sales Invoice Timesheet,Time Sheet,Laika uzskaites tabula
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush izejvielas Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ievadiet Papildus informācija
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ievadiet Papildus informācija
 DocType: Interest,Interest,Interese
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Cita informācija
@@ -730,24 +734,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Maksājums ieraksts ir jau radīta
 DocType: Purchase Receipt Item Supplied,Current Stock,Pašreizējā Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nav saistīts ar posteni {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Alga Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Alga Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konts {0} ir ievadīts vairākas reizes
 DocType: Account,Expenses Included In Valuation,Izdevumi iekļauts vērtēšanā
 DocType: Hub Settings,Seller City,Pārdevējs City
 ,Absent Student Report,Nekonstatē Student pārskats
 DocType: Email Digest,Next email will be sent on:,Nākamais e-pastu tiks nosūtīts uz:
 DocType: Offer Letter Term,Offer Letter Term,Akcija vēstule termins
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Prece ir varianti.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Uzņēmuma {0} neeksistē
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Daudz Patērētā Vienības
 DocType: Serial No,Warranty Expiry Date,Garantijas Derīguma termiņš
 DocType: Material Request Item,Quantity and Warehouse,Daudzums un Noliktavas
 DocType: Sales Invoice,Commission Rate (%),Komisijas likme (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Lūdzu, izvēlieties programma"
 DocType: Project,Estimated Cost,Paredzamās izmaksas
@@ -766,7 +768,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Saņemtā summa (Company valūta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Potenciālais klients ir jānosaka, ja IESPĒJA ir izveidota no Potenciālā klienta"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Lūdzu, izvēlieties nedēļas off diena"
 DocType: 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
@@ -782,6 +784,7 @@
 DocType: Opportunity,Opportunity From,Iespēja no
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mēnešalga paziņojumu.
 DocType: BOM,Website Specifications,Website specifikācijas
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: No {0} tipa {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rinda {0}: pārveidošanas koeficients ir obligāta
@@ -816,6 +819,7 @@
 DocType: Employee,Bank A/C No.,Bank / C No.
 DocType: Bank Guarantee,Project,Projekts
 DocType: Quality Inspection Reading,Reading 7,Lasīšana 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,daļēji Sakārtoti
 DocType: Expense Claim Detail,Expense Claim Type,Izdevumu Pretenzija Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Noklusējuma iestatījumi Grozs
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset metāllūžņos via Journal Entry {0}
@@ -823,14 +827,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnoloģija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Biroja uzturēšanas izdevumiem
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Iestatīšana e-pasta konts
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ievadiet Prece pirmais
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ievadiet Prece pirmais
 DocType: Account,Liability,Atbildība
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sodīt Summa nevar būt lielāka par prasības summas rindā {0}.
 DocType: Company,Default Cost of Goods Sold Account,Default pārdotās produkcijas ražošanas izmaksas konta
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cenrādis nav izvēlēts
 DocType: Employee,Family Background,Ģimene Background
 DocType: Request for Quotation Supplier,Send Email,Sūtīt e-pastu
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Brīdinājums: Invalid Pielikums {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nav Atļaujas
 DocType: Company,Default Bank Account,Default bankas kontu
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Lai filtrētu pamatojoties uz partijas, izvēlieties Party Type pirmais"
@@ -843,8 +847,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Darbinieks nav atrasts
 DocType: Supplier Quotation,Stopped,Apturēts
 DocType: Item,If subcontracted to a vendor,Ja apakšlīgumu nodot pārdevējs
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentu grupa jau ir atjaunināts.
 DocType: SMS Center,All Customer Contact,Visas klientu Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Augšupielādēt akciju līdzsvaru caur csv.
 DocType: Warehouse,Tree Details,Tree Details
@@ -855,8 +859,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimālā Rēķina summa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} nepieder Uzņēmumu {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: kontu {2} nevar būt grupa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš &#39;{DOCTYPE}&#39; tabula
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Prece Row {idx}: {DOCTYPE} {DOCNAME} neeksistē iepriekš &#39;{DOCTYPE}&#39; tabula
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Kontrolsaraksts {0} jau ir pabeigts vai atcelts
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nav uzdevumi
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Mēneša diena, kurā auto rēķins tiks radīts, piemēram 05, 28 utt"
 DocType: Asset,Opening Accumulated Depreciation,Atklāšanas Uzkrātais nolietojums
@@ -872,7 +876,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} pret likumprojektu {1} datēts {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursu grafiks
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursu grafiks
 DocType: Maintenance Visit,Completion Status,Pabeigšana statuss
 DocType: HR Settings,Enter retirement age in years,Ievadiet pensionēšanās vecumu gados
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mērķa Noliktava
@@ -880,7 +884,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Atļaut pār piegādi vai saņemšanu līdz pat šim procentiem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import apmeklējums
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Visi punkts grupas
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Visi punkts grupas
 DocType: Process Payroll,Activity Log,Aktivitāte Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Neto peļņa / zaudējumi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automātiski komponēt ziņu iesniegšanas darījumiem.
@@ -891,7 +895,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Iegādājieties Rīkojumu Apmaksa
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozēts Daudz
 DocType: Sales Invoice,Payment Due Date,Maksājuma Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postenis Variant {0} jau eksistē ar tiem pašiem atribūtiem
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Atklāšana&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atvērt darīt
 DocType: Notification Control,Delivery Note Message,Piegāde Note Message
@@ -907,7 +911,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Daudz
 DocType: Leave Block List Date,Leave Block List Date,Atstājiet Block saraksts datums
 DocType: Pricing Rule,Price or Discount,Cenu vai Atlaide
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Kopā piemērojamām izmaksām, kas pirkuma čeka Items galda jābūt tāds pats kā Kopā nodokļiem un nodevām"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Kopā piemērojamām izmaksām, kas pirkuma čeka Items galda jābūt tāds pats kā Kopā nodokļiem un nodevām"
 DocType: Sales Team,Incentives,Stimuli
 DocType: SMS Log,Requested Numbers,Pieprasītie Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Iegūt tikai izejvielas
@@ -936,13 +940,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Tiek slēgti apakšuzņēmuma līgumi
 DocType: Item Attribute,Item Attribute Values,Postenis Prasme Vērtības
 DocType: Examination Result,Examination Result,eksāmens rezultāts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Pirkuma čeka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Pirkuma čeka
 ,Received Items To Be Billed,Saņemtie posteņi ir Jāmaksā
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Ievietots algas lapas
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valūtas maiņas kurss meistars.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Atsauce Doctype jābūt vienam no {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Atsauce Doctype jābūt vienam no {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nevar atrast laika nišu nākamajos {0} dienas ekspluatācijai {1}
 DocType: Production Order,Plan material for sub-assemblies,Plāns materiāls mezgliem
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Pārdošanas Partneri un teritorija
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Nevar automātiski izveidot kontu, jo jau pastāv krājumu atlikumu Kontā. Jums ir jāizveido saskaņošanas konts, pirms jūs varat veikt ierakstu par šo noliktavā"
@@ -965,10 +969,9 @@
 DocType: Supplier,Default Payable Accounts,Noklusējuma samaksu konti
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Darbinieku {0} nav aktīvs vai neeksistē
 DocType: Fee Structure,Components,sastāvdaļas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postenis Variants {0} atjaunināta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ievadiet aktīvu kategorijas postenī {0}
 DocType: Quality Inspection Reading,Reading 6,Lasīšana 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Nevar {0} {1} {2} bez jebkāda negatīva izcili rēķins
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Pirkuma rēķins Advance
 DocType: Hub Settings,Sync Now,Sync Tagad
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rinda {0}: Credit ierakstu nevar saistīt ar {1}
@@ -982,11 +985,11 @@
 DocType: Item,Is Purchase Item,Vai iegāde postenis
 DocType: Asset,Purchase Invoice,Pirkuma rēķins
 DocType: Stock Ledger Entry,Voucher Detail No,Kuponu Detail Nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Jaunu pārdošanas rēķinu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Jaunu pārdošanas rēķinu
 DocType: Stock Entry,Total Outgoing Value,Kopā Izejošais vērtība
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Atvēršanas datums un aizvēršanas datums ir jāatrodas vienā fiskālā gada
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Atvēršanas datums un aizvēršanas datums ir jāatrodas vienā fiskālā gada
 DocType: Lead,Request for Information,Lūgums sniegt informāciju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline rēķini
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline rēķini
 DocType: Payment Request,Paid,Samaksāts
 DocType: Program Fee,Program Fee,Program Fee
 DocType: Salary Slip,Total in words,Kopā ar vārdiem
@@ -996,7 +999,7 @@
 DocType: Employee Loan,Sanctioned,sodīts
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publicēt mājas lapā
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Sūtījumiem uz klientiem.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Piegādātājs Rēķina datums nevar būt lielāks par norīkošanu Datums
@@ -1007,7 +1010,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Pretruna
 ,Company Name,Uzņēmuma nosaukums
 DocType: SMS Center,Total Message(s),Kopējais ziņojumu (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Izvēlieties Prece pārneses
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1018,8 +1021,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Naudas konts tiks automātiski atjaunināti Algu Journal Entry ja ir izvēlēts šis režīms.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Par Novērtējums kodeksa intervāli {0} pārklājas ar klases intervālu citu kategoriju. Lūdzu, pārbaudiet intervāli {0} un {1} un mēģiniet vēlreiz"
 DocType: BOM,Raw Material Cost(Company Currency),Izejvielu izmaksas (Company valūta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Rinda # {0}: Rate nevar būt lielāks par kursu, kas izmantots {1} {2}"
@@ -1032,14 +1033,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website punkts
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Augšupielādēt jūsu vēstules galva un logo. (Jūs varat rediģēt tos vēlāk).
 DocType: Timesheet Detail,Bill,Rēķins
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nākamais Nolietojums datums tiek ievadīta kā pagātnes datumu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Balts
 DocType: SMS Center,All Lead (Open),Visi Svins (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rinda {0}: Daudz nav pieejams {4} noliktavā {1} pēc norīkojuma laiku ieraksta ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Get Avansa Paid
 DocType: Item,Automatically Create New Batch,Automātiski Izveidot jaunu partiju
 DocType: Item,Automatically Create New Batch,Automātiski Izveidot jaunu partiju
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Izveidot
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Izveidot
 DocType: Student Admission,Admission Start Date,Uzņemšana sākuma datums
 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."
@@ -1047,7 +1048,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ievadiet Kontu pārmaiņu summa
 DocType: Student Batch Name,Student Batch Name,Student Partijas nosaukums
 DocType: Holiday List,Holiday List Name,Brīvdienu saraksta Nosaukums
 DocType: Repayment Schedule,Balance Loan Amount,Balance Kredīta summa
@@ -1067,10 +1068,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},"Lūdzu, norādiet {0}"
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Noņemts preces bez izmaiņām daudzumā vai vērtībā.
 DocType: Delivery Note,Delivery To,Piegāde uz
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribūts tabula ir obligāta
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribūts tabula ir obligāta
 DocType: Production Planning Tool,Get Sales Orders,Saņemt klientu pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nevar būt negatīvs
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Atlaide
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Atlaide
 DocType: Asset,Total Number of Depreciations,Kopējais skaits nolietojuma
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
 DocType: Sales Invoice Item,Rate With Margin,Novērtēt Ar Margin
@@ -1086,7 +1087,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervēts noliktavām Sales Order / gatavu preču noliktava
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Pārdošanas apjoms
 DocType: Repayment Schedule,Interest Amount,procentu summa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Jūs esat Izdevumu apstiprinātājs šā ieraksta. Lūdzu Update ""Statuss"" un Saglabāt"
 DocType: Serial No,Creation Document No,Izveide Dokumenta Nr
 DocType: Issue,Issue,Izdevums
 DocType: Asset,Scrapped,iznīcināts
@@ -1094,12 +1095,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atribūti postenī Varianti. piemēram, lielumu, krāsu uc"
 DocType: Purchase Invoice,Returns,atgriešana
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Noliktava
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Sērijas Nr {0} ir zem uzturēšanas līgumu līdz pat {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,vervēšana
 DocType: Lead,Organization Name,Organizācijas nosaukums
 DocType: Tax Rule,Shipping State,Piegāde Valsts
 ,Projected Quantity as Source,Prognozēts daudzums kā resurss
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Postenī, jāpievieno, izmantojot ""dabūtu preces no pirkumu čekus 'pogu"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Iekļaut nav krājumu priekšmetiem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Pārdošanas izmaksas
@@ -1107,12 +1108,12 @@
 DocType: GL Entry,Against,Pret
 DocType: Item,Default Selling Cost Center,Default pārdošana Izmaksu centrs
 DocType: Sales Partner,Implementation Partner,Īstenošana Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Pasta indekss
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Pasta indekss
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} {1}
 DocType: Opportunity,Contact Info,Kontaktinformācija
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Krājumu
 DocType: Packing Slip,Net Weight UOM,Neto svara Mērvienība
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} rezultāti
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} rezultāti
 DocType: Item,Default Supplier,Default piegādātājs
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Ražošanas pielaide procentos
 DocType: Employee Loan,Repayment Schedule,atmaksas grafiks
@@ -1120,7 +1121,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Saņemt Nedēļas Off Datumi
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Beigu Datums nevar būt mazāks par sākuma datuma
 DocType: Sales Person,Select company name first.,Izvēlieties uzņēmuma nosaukums pirmo reizi.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,"Citāti, kas saņemti no piegādātājiem."
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Uz {0} | {1}{2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vidējais vecums
@@ -1140,7 +1141,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Platība
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportēšana
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Nederīga Atribūtu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0}{1} jāiesniedz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0}{1} jāiesniedz
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Daudzumam ir jābūt mazākam vai vienādam ar {0}
 DocType: SMS Center,Total Characters,Kopā rakstzīmes
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Lūdzu, izvēlieties BOM BOM jomā postenim {0}"
@@ -1151,7 +1152,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 +224,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 +52,Please set 'Apply Additional Discount On',Lūdzu noteikt &quot;piemērot papildu Atlaide On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,No Range ir jābūt mazāk nekā svārstās
 DocType: Global Defaults,Global Defaults,Globālie Noklusējumi
@@ -1161,7 +1162,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start gads
 DocType: Purchase Invoice,Start date of current invoice's period,Sākuma datums kārtējā rēķinā s perioda
 DocType: Salary Slip,Leave Without Pay,Bezalgas atvaļinājums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Capacity Planning kļūda
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1176,7 +1177,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Tas tiks pievienots Vienības kodeksa variantu. Piemēram, ja jūsu saīsinājums ir ""SM"", un pozīcijas kods ir ""T-krekls"", postenis kods variants būs ""T-krekls-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (vārdiem), būs redzams pēc tam, kad esat saglabāt algas aprēķinu."
 DocType: Purchase Invoice,Is Return,Vai Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Atgriešana / debeta Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Atgriešana / debeta Note
 DocType: Price List Country,Price List Country,Cenrādis Valsts
 DocType: Item,UOMs,Mērvienības
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} derīgas sērijas nos postenim {1}
@@ -1186,11 +1187,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Ievadiet pozīcijas kods, lai iegūtu partijas numurs"
 DocType: Stock Settings,Default Item Group,Default Prece Group
 DocType: Employee Loan,Partially Disbursed,Daļēji Izmaksātā
-DocType: Grading Structure,Grading System Name,Šķirošana System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Piegādātājs datu bāze.
 DocType: Account,Balance Sheet,Bilance
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',"Izmaksās Center postenī ar Preces kods """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Maksājums Mode nav konfigurēta. Lūdzu, pārbaudiet, vai konts ir iestatīts uz maksājumu Mode vai POS profils."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Jūsu pārdošanas persona saņems atgādinājumu par šo datumu, lai sazināties ar klientu"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Pašu posteni nevar ievadīt vairākas reizes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Turpmākas kontus var veikt saskaņā grupās, bet ierakstus var izdarīt pret nepilsoņu grupām"
@@ -1202,7 +1202,7 @@
 ,Purchase Order Items To Be Billed,Pirkuma pasūtījuma posteņi ir Jāmaksā
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Pirkuma rēķins postenis
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akciju Ledger Ieraksti un GL Ieraksti tiek nepārpublicēt izraudzītajiem pirkumu čekus
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Akciju Ledger Ieraksti un GL Ieraksti tiek nepārpublicēt izraudzītajiem pirkumu čekus
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postenis 1
 DocType: Holiday,Holiday,Brīvdiena
 DocType: Support Settings,Close Issue After Days,Aizvērt Issue Pēc dienas
@@ -1229,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Darbs Gatavs
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Lūdzu, norādiet vismaz vienu atribūtu Atribūti tabulā"
 DocType: Announcement,All Students,Visi studenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Prece {0} ir jābūt ne-akciju postenis
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervāli
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Senākās
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Prece Group pastāv ar tādu pašu nosaukumu, lūdzu mainīt rindas nosaukumu vai pārdēvēt objektu grupu"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1273,9 +1273,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Izmaksa algas no {0} līdz {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pasūtījumu {0} nav derīga
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Pirkuma pasūtījumu palīdzēt jums plānot un sekot līdzi saviem pirkumiem
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Atvainojiet, uzņēmumi nevar tikt apvienots"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Kopējais Issue / Transfer daudzums {0} Iekraušanas Pieprasījums {1} \ nedrīkst būt lielāks par pieprasīto daudzumu {2} postenim {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mazs
@@ -1296,10 +1296,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Netiešie izdevumi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rinda {0}: Daudz ir obligāta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Lauksaimniecība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Jūsu Produkti vai Pakalpojumi
 DocType: Mode of Payment,Mode of Payment,Maksājuma veidu
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,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 +180,Website Image should be a public file or website URL,Website Image vajadzētu būt publiski failu vai tīmekļa URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Tas ir sakne posteni grupas un to nevar rediģēt.
@@ -1317,18 +1317,18 @@
 DocType: Student Group Student,Group Roll Number,Grupas Roll skaits
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Par {0}, tikai kredīta kontus var saistīt pret citu debeta ierakstu"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Kopējais visu uzdevumu atsvari būtu 1. Lūdzu regulēt svaru visām projekta uzdevumus atbilstoši
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Piegāde piezīme {0} nav iesniegta
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cenu noteikums vispirms izvēlas, pamatojoties uz ""Apply On 'jomā, kas var būt punkts, punkts Koncerns vai Brand."
 DocType: Hub Settings,Seller Website,Pārdevējs Website
 DocType: Item,ITEM-,PRIEKŠMETS-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Kopējais piešķirtais procentuālu pārdošanas komanda būtu 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Ražošanas Pasūtījuma statuss ir {0}
 DocType: Appraisal Goal,Goal,Mērķis
 DocType: Sales Invoice Item,Edit Description,Edit Apraksts
 ,Team Updates,Team Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Piegādātājam
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Izveidot Drukas formāts
@@ -1344,7 +1344,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} preces progress
 DocType: Workstation,Workstation Name,Darba vietas nosaukums
-DocType: Grade Interval,Grade Code,grade Code
+DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS Prece Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-pasts Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepieder posteni {1}
@@ -1361,7 +1361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Detaļas
 DocType: Sales Order,Recurring Upto,Periodisks Līdz pat
 DocType: Attendance,HR Manager,HR vadītājs
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Lūdzu, izvēlieties Company"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Lūdzu, izvēlieties Company"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Piegādātāju rēķinu Datums
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,"Jums ir nepieciešams, lai dotu iespēju Grozs"
@@ -1377,7 +1377,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Pārtika
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Novecošana Range 3
 DocType: Maintenance Schedule Item,No of Visits,Nē apmeklējumu
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Maintenance grafiks {0} eksistē pret {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Mācās students
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valūta Noslēguma kontā jābūt {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Punktu summa visiem mērķiem vajadzētu būt 100. Tas ir {0}
@@ -1402,7 +1403,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Izejošais
 DocType: POS Profile,Campaign,Kampaņa
 DocType: Supplier,Name and Type,Nosaukums un veids
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Apstiprinājums statuss ir ""Apstiprināts"" vai ""noraidīts"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Apstiprinājums statuss ir ""Apstiprināts"" vai ""noraidīts"""
 DocType: Purchase Invoice,Contact Person,Kontaktpersona
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Sagaidāmais Sākuma datums"" nevar būt lielāka par ""Sagaidāmais beigu datums"""
 DocType: Course Scheduling Tool,Course End Date,"Protams, beigu datums"
@@ -1425,14 +1426,15 @@
 DocType: Sales Invoice,Shipping Address Name,Piegāde Adrese Nosaukums
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,nevar būt lielāks par 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nevar būt lielāks par 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Postenis {0} nav krājums punkts
 DocType: Maintenance Visit,Unscheduled,Neplānotā
 DocType: Employee,Owned,Pieder
 DocType: Salary Detail,Depends on Leave Without Pay,Atkarīgs Bezalgas atvaļinājums
 DocType: Pricing Rule,"Higher the number, higher the priority","Lielāks skaitlis, augstākā prioritāte"
 ,Purchase Invoice Trends,Pirkuma rēķins tendences
 DocType: Employee,Better Prospects,Labākas izredzes
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rinda # {0}: Partiju {1} ir tikai {2} gb. Lūdzu, izvēlieties citu partiju, kas ir {3} qty pieejama vai sadalīt rindu uz vairākās rindās, lai nodrošinātu / problēmu no vairākām partijām"
 DocType: Vehicle,License Plate,Numurzīme
 DocType: Appraisal,Goals,Mērķi
 DocType: Warranty Claim,Warranty / AMC Status,Garantijas / AMC statuss
@@ -1450,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Darbinieks nevar ziņot sev.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ja konts ir sasalusi, ieraksti ir atļauts ierobežotas lietotājiem."
 DocType: Email Digest,Bank Balance,Bankas bilance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Grāmatvedības ieraksts par {0}: {1} var veikt tikai valūtā: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Darba profils, nepieciešams kvalifikācija uc"
 DocType: Journal Entry Account,Account Balance,Konta atlikuma
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Nodokļu noteikums par darījumiem.
@@ -1461,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Rādīt Atvērto fiskālajā gadā ir P &amp; L atlikumus
 DocType: Shipping Rule,Shipping Account,Piegāde Konts
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} ir neaktīvs
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Padarīt Pārdošanas pasūtījumu lai palīdzētu jums plānot savu darbu un piegādāt uz laiku
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Padarīt Pārdošanas pasūtījumu lai palīdzētu jums plānot savu darbu un piegādāt uz laiku
 DocType: Quality Inspection,Readings,Rādījumus
 DocType: Stock Entry,Total Additional Costs,Kopējās papildu izmaksas
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,Vērtēt
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Iepakošanas Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Iepakošanas Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office Rent
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS vārti iestatījumi
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import neizdevās!
@@ -1494,11 +1496,11 @@
 DocType: Company,Services,Pakalpojumi
 DocType: HR Settings,Email Salary Slip to Employee,Email Alga Slip darbiniekam
 DocType: Cost Center,Parent Cost Center,Parent Izmaksu centrs
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Izvēlieties Iespējamais Piegādātāja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Izvēlieties Iespējamais Piegādātāja
 DocType: Sales Invoice,Source,Avots
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Rādīt slēgts
 DocType: Leave Type,Is Leave Without Pay,Vai atstāt bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategorija ir obligāta ilgtermiņa ieguldījumu postenim
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nav atrasti Maksājuma tabulā ieraksti
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Šī {0} konflikti ar {1} uz {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenti HTML
@@ -1516,7 +1518,7 @@
 DocType: Student,Date of Leaving,Aiziešanas datumu
 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/utilities/activation.py +64,Create Leads,Izveidot Sasaistes
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Izveidot Sasaistes
 DocType: Maintenance Schedule,Schedules,Saraksti
 DocType: Purchase Invoice Item,Net Amount,Neto summa
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nr
@@ -1544,9 +1546,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,programma iestājas
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Default noliktava ir nepieciešama atsevišķiem posteni
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kaste
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,iespējams piegādātājs
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,iespējams piegādātājs
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizācija
 DocType: Budget,Monthly Distribution,Mēneša Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Uztvērējs saraksts ir tukšs. Lūdzu, izveidojiet Uztvērēja saraksts"
@@ -1554,8 +1556,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Mērķa
 DocType: Loan Type,Maximum Loan Amount,Maksimālais Kredīta summa
 DocType: Pricing Rule,Pricing Rule,Cenu noteikums
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicate roll numurs students {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicate roll numurs students {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicate roll numurs students {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicate roll numurs students {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Rīcība, ja gada budžets pārsniegts"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiāls Pieprasījums Pirkuma pasūtījums
 DocType: Shopping Cart Settings,Payment Success URL,Maksājumu Success URL
@@ -1576,9 +1578,9 @@
 DocType: Employee Loan,Repayment Method,atmaksas metode
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ja ieslēgts, tad mājas lapa būs noklusējuma punkts grupa mājas lapā"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Default BOM par {0} nav atrasts Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Default BOM par {0} nav atrasts Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Prasības attiecībā uz uzņēmuma rēķina.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenti tiek centrā sistēmas, pievienot visus savus skolēnus"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenti tiek centrā sistēmas, pievienot visus savus skolēnus"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance datums {1} nevar būt pirms Čeku datums {2}
 DocType: Company,Default Holiday List,Default brīvdienu sarakstu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rinda {0}: laiku un uz laiku no {1} pārklājas ar {2}
@@ -1590,21 +1592,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Diena (-s), kad jūs piesakāties atvaļinājumu ir brīvdienas. Jums ir nepieciešams, neattiecas uz atvaļinājumu."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Atkārtoti nosūtīt maksājumu E-pasts
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,jauns uzdevums
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Padarīt citāts
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Padarīt citāts
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,citas Ziņojumi
 DocType: Dependent Task,Dependent Task,Atkarīgs Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Konversijas faktors noklusējuma mērvienība ir 1 kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Atvaļinājums tipa {0} nevar būt ilgāks par {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Mēģiniet plānojot operācijas X dienas iepriekš.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday atgādinājumi
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Lūdzu noteikt Noklusējuma Algas Kreditoru kontu Uzņēmumu {0}
 DocType: SMS Center,Receiver List,Uztvērējs Latviešu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Meklēt punkts
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Meklēt punkts
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Patērētā summa
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto izmaiņas naudas
 DocType: Assessment Plan,Grading Scale,Šķirošana Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,jau pabeigts
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mērvienība {0} ir ievadīts vairāk nekā vienu reizi Conversion Factor tabulā
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,jau pabeigts
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Maksājuma pieprasījums jau eksistē {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Izmaksas Izdoti preces
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Daudzums nedrīkst būt lielāks par {0}
@@ -1636,12 +1638,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Padarīt izmaksa Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance pret Piegādātāju ir norakstīt
 DocType: Company,Default Values,Noklusējuma vērtības
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvence} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Atmaksāto līdzekļu kopsummas
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Tas ir balstīts uz baļķiem pret šo Vehicle. Skatīt grafiku zemāk informāciju
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,savākt
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Pret Piegādātāju rēķinu {0} datēts {1}
 DocType: Customer,Default Price List,Default Cenrādis
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Kustība ierakstīt {0} izveidots
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Jūs nevarat izdzēst saimnieciskais gads {0}. Fiskālā gads {0} ir noteikta kā noklusējuma Global iestatījumi
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klientu kredīta atlikuma
@@ -1661,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Neviens no priekšmetiem ir kādas izmaiņas daudzumā vai vērtībā.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligāts lauks - programma
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligāts lauks - programma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantijas Prasība
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantijas Prasība
 ,Lead Details,Potenciālā klienta detaļas
 DocType: Salary Slip,Loan repayment,Kredīta atmaksa
 DocType: Purchase Invoice,End date of current invoice's period,Beigu datums no kārtējā rēķinā s perioda
@@ -1680,12 +1683,10 @@
 DocType: Employee,Permanent Address,Pastāvīga adrese
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Lūdzu izvēlieties kodu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Lūdzu izvēlieties kodu
 DocType: Student Sibling,Studying in Same Institute,Studijas pašā institūtā
 DocType: Territory,Territory Manager,Teritorija vadītājs
 DocType: Packed Item,To Warehouse (Optional),Lai Noliktava (pēc izvēles)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Apmaksātais Summa (Company valūta)
 DocType: Purchase Invoice,Additional Discount,Papildu Atlaide
 DocType: Selling Settings,Selling Settings,Pārdošanas iestatījumi
@@ -1695,9 +1696,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,View in grozs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Mārketinga izdevumi
 ,Item Shortage Report,Postenis trūkums ziņojums
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Svars ir minēts, \ nLūdzu nerunājot ""Svara UOM"" too"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Materiāls Pieprasījums izmantoti, lai šā krājuma Entry"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Nākamais Nolietojums datums ir obligāta jaunu aktīvu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nākamais Nolietojums datums ir obligāta jaunu aktīvu
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atsevišķa kurss balstās grupa katru Partijas
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Atsevišķa kurss balstās grupa katru Partijas
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Viena vienība posteņa.
@@ -1714,9 +1715,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Izmaksu centrs ir nepieciešams peļņas un zaudējumu &quot;konta {2}. Lūdzu izveidot noklusējuma izmaksu centru uzņēmumam.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Jauns kontakts
 DocType: Territory,Parent Territory,Parent Teritorija
 DocType: Quality Inspection Reading,Reading 2,Lasīšana 2
@@ -1733,7 +1732,7 @@
 ,Item-wise Sales Register,Postenis gudrs Sales Reģistrēties
 DocType: Asset,Gross Purchase Amount,Gross Pirkuma summa
 DocType: Asset,Depreciation Method,nolietojums metode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Bezsaistē
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Bezsaistē
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Vai šis nodoklis iekļauts pamatlikmes?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Kopā Mērķa
 DocType: Program Course,Required,Nepieciešamais
@@ -1743,21 +1742,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Izlīgums JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,"Pārāk daudz kolonnas. Eksportēt ziņojumu un izdrukāt to, izmantojot izklājlapu lietotni."
 DocType: Purchase Invoice Item,Batch No,Partijas Nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nevar atrast kursu {0} līdz {1} atslēgai datumā {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Atļaut vairākas pārdošanas pasūtījumos pret Klienta Pirkuma pasūtījums
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 DocType: Student Group Instructor,Student Group Instructor,Studentu grupas instruktors
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobilo Nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Galvenais
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variants
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Galvenais
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variants
 DocType: Naming Series,Set prefix for numbering series on your transactions,Uzstādīt tituls numerāciju sērijas par jūsu darījumiem
 DocType: Employee Attendance Tool,Employees HTML,darbinieki HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) ir jābūt aktīvam par šo priekšmetu vai tās veidni
 DocType: Employee,Leave Encashed?,Atvaļinājums inkasēta?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Iespēja No jomā ir obligāta
 DocType: Email Digest,Annual Expenses,gada izdevumi
 DocType: Item,Variants,Varianti
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Izveidot pirkuma pasūtījumu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Izveidot pirkuma pasūtījumu
 DocType: SMS Center,Send To,Sūtīt
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nav pietiekami daudz atvaļinājums bilance Atstāt tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Piešķirtā summa
@@ -1765,7 +1763,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Klienta Produkta kods
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Izlīgums
 DocType: Territory,Territory Name,Teritorija Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,"Work-in-Progress Warehouse ir nepieciešams, pirms iesniegt"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pretendents uz darbu.
 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
@@ -1773,11 +1771,10 @@
 DocType: Item,Serial Nos and Batches,Sērijas Nr un Partijām
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentu grupa Strength
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentu grupa Strength
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Pret Vēstnesī Entry {0} nav nekādas nesaskaņota {1} ierakstu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vērtējumi
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,šķirošanas intervāli
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ievadiet
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nevar overbill par postenī {0} rindā {1} vairāk nekā {2}. Lai ļautu pār-rēķinu, lūdzu, noteikti Pērkot Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Lūdzu iestatīt filtru pamatojoties postenī vai noliktavā
@@ -1789,17 +1786,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} jāiesniedz
 DocType: Authorization Control,Authorization Control,Autorizācija Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Noraidīts Warehouse ir obligāta pret noraidīts postenī {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Maksājums
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Pārvaldīt savus pasūtījumus
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Maksājums
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Pārvaldīt savus pasūtījumus
 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
 DocType: Course,Course Abbreviation,Protams saīsinājums
 DocType: Student Leave Application,Student Leave Application,Studentu atvaļinājums
 DocType: Item,Will also apply for variants,Attieksies arī uz variantiem
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nevar atcelt, jo tas jau ir {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Darbinieku {0} uz pusi dienas uz {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Kopējais darba laiks nedrīkst būt lielāks par max darba stundas {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Par
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Paka posteņus pēc pārdošanas laikā.
 DocType: Quotation Item,Actual Qty,Faktiskais Daudz
 DocType: Sales Invoice Item,References,Atsauces
@@ -1809,7 +1807,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Esat ievadījis dublikātus preces. Lūdzu, labot un mēģiniet vēlreiz."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Līdzstrādnieks
 DocType: Asset Movement,Asset Movement,Asset kustība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Jauns grozs
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Jauns grozs
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postenis {0} nav sērijveida punkts
 DocType: SMS Center,Create Receiver List,Izveidot Uztvērēja sarakstu
 DocType: Vehicle,Wheels,Riteņi
@@ -1841,10 +1839,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Izslēdz izveidi laika apaļkoku pret pasūtījumu. Darbības nedrīkst izsekot pret Ražošanas uzdevums
 DocType: Student,Student Mobile Number,Studentu Mobilā tālruņa numurs
 DocType: Item,Has Variants,Ir Varianti
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Jūs jau atsevišķus posteņus {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nosaukums Mēneša Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partijas ID ir obligāta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Partijas ID ir obligāta
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Partijas ID ir obligāta
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Atkārtojas rēķins
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1852,11 +1850,11 @@
 DocType: Budget,Fiscal Year,Fiskālā gads
 DocType: Vehicle Log,Fuel Price,degvielas cena
 DocType: Budget,Budget,Budžets
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Ilgtermiņa ieguldījumu postenim jābūt ne-akciju posteni.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budžets nevar iedalīt pret {0}, jo tas nav ienākumu vai izdevumu kontu"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Izpildīts
 DocType: Student Admission,Application Form Route,Pieteikums forma
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Teritorija / Klientu
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Teritorija / Klientu
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,"piemēram, 5"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Atstājiet Type {0} nevar tikt piešķirts, jo tas ir atstāt bez samaksas"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rinda {0}: piešķirtā summa {1} jābūt mazākam par vai vienāds ar rēķinu nenomaksāto summu {2}
@@ -1876,14 +1874,14 @@
 ,Serial No Status,Sērijas Nr statuss
 DocType: Payment Entry Reference,Outstanding,izcils
 ,Daily Timesheet Summary,Ikdienas laika kontrolsaraksts kopsavilkums
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rinda {0}: Lai iestatītu {1} periodiskumu, atšķirība no un uz datuma \ jābūt lielākam par vai vienādam ar {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,"Tas ir balstīts uz krājumu kustības. Skatīt {0}, lai uzzinātu"
 DocType: Pricing Rule,Selling,Pārdošana
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Summa {0} {1} atskaitīt pret {2}
 DocType: Employee,Salary Information,Alga informācija
 DocType: Sales Person,Name and Employee ID,Darbinieka Vārds un ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Due Date nevar būt pirms nosūtīšanas datums
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Nodevas un nodokļi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ievadiet Atsauces datums
@@ -1895,14 +1893,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Nevar atsaukties rindu skaits ir lielāks par vai vienāds ar pašreizējo rindu skaitu šim Charge veida
 DocType: Asset,Sold,Pārdots
 ,Item-wise Purchase History,Postenis gudrs Pirkumu vēsture
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Lūdzu, noklikšķiniet uz ""Generate grafiks"" atnest Sērijas Nr piebilda postenī {0}"
 DocType: Account,Frozen,Sasalis
 ,Open Production Orders,Atvērt pasūtījumus
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Summa (Company valūta)
 DocType: Payment Reconciliation Payment,Reference Row,atsauce Row
 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 +70,Delete all the Transactions for this Company,"Dzēst visas darījumi, par šo uzņēmumu"
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investīcijas
 DocType: Issue,Resolution Details,Izšķirtspēja Details
@@ -1935,14 +1933,14 @@
 DocType: Discussion,Discussion,diskusija
 DocType: Payment Entry,Transaction ID,darījuma ID
 DocType: Employee,Resignation Letter Date,Atkāpšanās no amata vēstule Datums
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,"Cenu Noteikumi tālāk filtrē, pamatojoties uz daudzumu."
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Lūdzu datumu nosaka Pievienojoties par darbiniekam {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Kopā Norēķinu Summa (via laiks lapas)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Atkārtot Klientu Ieņēmumu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) ir jābūt lomu rēķina apstiprinātāja """
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pāris
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Izvēlieties BOM un Daudzums nobarojamām
 DocType: Asset,Depreciation Schedule,nolietojums grafiks
 DocType: Bank Reconciliation Detail,Against Account,Pret kontu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date jābūt starp No Datums un līdz šim
@@ -1956,16 +1954,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Lūdzu noteikt &quot;nolietojuma izmaksas centrs&quot; uzņēmumā {0}
 ,Maintenance Schedules,Apkopes grafiki
 DocType: Task,Actual End Date (via Time Sheet),Faktiskā Beigu datums (via laiks lapas)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Summa {0} {1} pret {2} {3}
 ,Quotation Trends,Piedāvājumu tendences
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Postenis Group vienības kapteinis nav minēts par posteni {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kamēr Summa
 DocType: Purchase Invoice Item,Conversion Factor,Conversion Factor
 DocType: Purchase Order,Delivered,Pasludināts
 ,Vehicle Expenses,transportlīdzekļu Izdevumi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
+DocType: Serial No,Invoice Details,Informācija par rēķinu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Sagaidāmais vērtība pēc lietderīgās jābūt lielākam vai vienādam ar {0}
 DocType: Purchase Receipt,Vehicle Number,Transportlīdzekļu skaits
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datums, kurā atkārtojas rēķins tiks apstāties"
 DocType: Employee Loan,Loan Amount,Kredīta summa
@@ -1984,12 +1983,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR iestatījumi
 DocType: Salary Slip,net pay info,Neto darba samaksa info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Jauni izdevumi
 DocType: Purchase Invoice,Additional Discount Amount,Papildus Atlaides summa
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Daudz jābūt 1, jo prece ir pamatlīdzeklis. Lūdzu, izmantojiet atsevišķu rindu daudzkārtējai qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Atstājiet Block Latviešu Atļaut
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nevar būt tukšs vai telpa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Group Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporta
 DocType: Loan Type,Loan Name,aizdevums Name
@@ -2001,6 +2000,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Noliktava, kur jums ir saglabāt krājumu noraidīto posteņiem"
 DocType: Production Order,Skip Material Transfer,Izlaist materiāla pārnese
 DocType: Production Order,Skip Material Transfer,Izlaist materiāla pārnese
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Nevar atrast valūtas kursu {0} uz {1} par galveno dienas {2}. Lūdzu, izveidojiet Valūtas maiņas rekordu manuāli"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Jūsu finanšu gads beidzas
 DocType: POS Profile,Price List,Cenrādis
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} tagad ir noklusējuma saimnieciskais gads. Lūdzu, atsvaidziniet savu pārlūkprogrammu, lai izmaiņas stātos spēkā."
@@ -2017,19 +2017,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konts {0} ir nederīgs. Konta valūta ir {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM pārrēķināšanas koeficients ir nepieciešams rindā {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no pārdošanas rīkojumu, pārdošanas rēķinu vai Journal Entry"
 DocType: Salary Component,Deduction,Atskaitīšana
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rinda {0}: laiku un uz laiku ir obligāta.
 DocType: Stock Reconciliation Item,Amount Difference,summa Starpība
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Prece Cena pievienots {0} Cenrādī {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ievadiet Darbinieku Id šīs pārdošanas persona
 DocType: Territory,Classification of Customers by region,Klasifikācija klientiem pa reģioniem
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Starpības summa ir nulle
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Starpības summa ir nulle
 DocType: Project,Gross Margin,Bruto peļņa
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Ievadiet Ražošanas Prece pirmais
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Aprēķinātais Bankas pārskats bilance
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,invalīdiem lietotāju
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Piedāvājums
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Piedāvājums
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Kopā atskaitīšana
 ,Production Analytics,ražošanas Analytics
@@ -2038,9 +2038,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,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 +210,Warning: Invalid SSL certificate on attachment {0},Brīdinājums: Invalid SSL sertifikātu par arestu {0}
 DocType: Student Admission,Eligibility,Tiesības
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Sasaistes palīdzēt jums iegūt biznesa, pievienot visus savus kontaktus un vairāk kā jūsu rezultātā"
 DocType: Production Order Operation,Actual Operation Time,Faktiskais Darbības laiks
 DocType: Authorization Rule,Applicable To (User),Piemērojamais Lai (lietotājs)
 DocType: Purchase Taxes and Charges,Deduct,Atskaitīt
@@ -2055,7 +2055,7 @@
 DocType: Guardian,Work Address,darba adrese
 DocType: Appraisal,Calculate Total Score,Aprēķināt kopējo punktu skaitu
 DocType: Request for Quotation,Manufacturing Manager,Ražošanas vadītājs
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Sērijas Nr {0} ir garantijas līdz pat {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Piegāde piezīme paketēs.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Sūtījumi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Konta atlikums ({0}) par {1} un stock vērtību ({2}) noliktava {3} jābūt vienādi
@@ -2078,10 +2078,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Piezīme: e-pasts netiks nosūtīts invalīdiem
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Skaits mijiedarbības
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Skaits mijiedarbības
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Izvēlieties Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izvēlieties Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Atstāt tukšu, ja to uzskata par visu departamentu"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Nodarbinātības veidi (pastāvīgs, līgums, intern uc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ir obligāta postenī {1}
 DocType: Process Payroll,Fortnightly,divnedēļu
 DocType: Currency Exchange,From Currency,No Valūta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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ā"
@@ -2090,14 +2090,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Company valūta)
 DocType: Student Guardian,Others,Pārējie
 DocType: Payment Entry,Unallocated Amount,nepiešķirto Summa
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Nevar atrast atbilstošas objektu. Lūdzu, izvēlieties kādu citu vērtību {0}."
 DocType: POS Profile,Taxes and Charges,Nodokļi un maksājumi
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkts vai pakalpojums, kas tiek pirkti, pārdot vai turēt noliktavā."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ne vairāk atjauninājumi
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nav iespējams izvēlēties maksas veidu, kā ""Par iepriekšējo rindu summas"" vai ""Par iepriekšējā rindā Total"" par pirmās rindas"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Bērnu Prece nedrīkst būt Product Bundle. Lūdzu, noņemiet objektu `{0}` un saglabāt"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banku
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Pievienot laika uzskaites
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Pievienot laika uzskaites
 DocType: Vehicle Service,Service Item,Servisa punkts
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
 DocType: Bank Guarantee,Bank Guarantee,Bankas garantija
@@ -2123,6 +2123,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} jau {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order to Apmaksa
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Lūdzu noteikt Naming Series {0}, izmantojot Setup&gt; Uzstādījumi&gt; nosaucot Series"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Izdevumu Pretenzija Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Lūdzu, izvēlieties pareizo kontu"
@@ -2147,14 +2148,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cenas netiks parādīts, ja Cenrādis nav noteikts"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Lūdzu, norādiet valsti šim Shipping noteikuma vai pārbaudīt Worldwide Shipping"
 DocType: Stock Entry,Total Incoming Value,Kopā Ienākošais vērtība
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debets ir nepieciešama
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debets ir nepieciešama
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets palīdz sekot līdzi laika, izmaksu un rēķinu par aktivitātēm, ko veic savu komandu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pirkuma Cenrādis
 DocType: Offer Letter Term,Offer Term,Piedāvājums Term
 DocType: Quality Inspection,Quality Manager,Kvalitātes vadītājs
 DocType: Job Applicant,Job Opening,Darba atklāšana
 DocType: Payment Reconciliation,Payment Reconciliation,Maksājumu Izlīgums
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Lūdzu, izvēlieties incharge Personas vārds"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnoloģija
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Pavisam Neapmaksāta: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Mājas Darbība
@@ -2182,23 +2183,23 @@
 DocType: Opportunity,Lost Reason,Zaudēja Iemesls
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ievadiet saņemšana dokuments
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Visi posteņi jau ir rēķinā
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ievadiet saņemšana dokuments
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Turpmākie izmaksu centrus var izdarīt ar grupu, bet ierakstus var izdarīt pret nepilsoņu grupām"
 DocType: Project,External,Ārējs
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Lietotāji un atļaujas
 DocType: Vehicle Log,VLOG.,Vlogi.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ražošanas Pasūtījumi Izveidoja: {0}
 DocType: Branch,Branch,Filiāle
 DocType: Guardian,Mobile Number,Mobilā telefona numurs
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukāšana un zīmols
 DocType: Bin,Actual Quantity,Faktiskais daudzums
 DocType: Shipping Rule,example: Next Day Shipping,Piemērs: Nākošā diena Piegāde
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Sērijas Nr {0} nav atrasts
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Sērijas Nr {0} nav atrasts
 DocType: Scheduling Tool,Student Batch,Student Partijas
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Jūsu klienti
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,padarīt Students
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,padarīt Students
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Jūs esat uzaicināts sadarboties projektam: {0}
 DocType: Leave Block List Date,Block Date,Block Datums
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Pieteikties tagad
@@ -2222,8 +2223,9 @@
 DocType: SMS Log,Sent To,Nosūtīts
 DocType: Payment Request,Make Sales Invoice,Izveidot PPR
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programmatūra
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nākamais Kontaktinformācija datums nedrīkst būt pagātnē
 DocType: Company,For Reference Only.,Tikai atsaucei.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Izvēlieties Partijas Nr
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nederīga {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Summa
@@ -2237,7 +2239,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case No. nevar būt 0
 DocType: Item,Show a slideshow at the top of the page,Parādiet slaidrādi augšpusē lapas
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Veikali
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Veikali
 DocType: Serial No,Delivery Time,Piegādes laiks
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Novecošanās Based On
 DocType: Item,End of Life,End of Life
@@ -2249,12 +2251,12 @@
 DocType: Rename Tool,Rename Tool,Pārdēvēt rīks
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Atjaunināt izmaksas
 DocType: Item Reorder,Item Reorder,Postenis Pārkārtot
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Rādīt Alga Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Materiāls
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Rādīt Alga Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Šis dokuments ir pāri robežai ar {0} {1} par posteni {4}. Jūs padarīt vēl {3} pret pats {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Izvēlieties Mainīt summu konts
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Lūdzu noteikt atkārtojas pēc glābšanas
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Izvēlieties Mainīt summu konts
 DocType: Purchase Invoice,Price List Currency,Cenrādis Currency
 DocType: Naming Series,User must always select,Lietotājam ir vienmēr izvēlēties
 DocType: Stock Settings,Allow Negative Stock,Atļaut negatīvs Stock
@@ -2265,7 +2267,7 @@
 DocType: Budget Account,Budget Account,budžeta kontā
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nevar mainīt uzņēmuma noklusējuma valūtu, jo ir kādi darījumi. Darījumi jāanulē, lai mainītu noklusējuma valūtu."
-DocType: Grade Interval,Grade Description,grade Apraksts
+DocType: Grading Scale Interval,Grade Description,grade Apraksts
 DocType: Stock Entry,Purchase Receipt No,Pirkuma čeka Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Rokas naudas
 DocType: Process Payroll,Create Salary Slip,Izveidot algas lapu
@@ -2303,7 +2305,7 @@
 DocType: Upload Attendance,Attendance To Date,Apmeklējumu Lai datums
 DocType: Warranty Claim,Raised By,Paaugstināts Līdz
 DocType: Payment Gateway Account,Payment Account,Maksājumu konts
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Lūdzu, norādiet Company, lai turpinātu"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto izmaiņas debitoru
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensējošs Off
 DocType: Offer Letter,Accepted,Pieņemts
@@ -2313,12 +2315,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Istabas numurs
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Nederīga atsauce {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto daudzumu ({2}) ražošanas pasūtījumā {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}), nevar būt lielāks par plānoto daudzumu ({2}) ražošanas pasūtījumā {3}"
 DocType: Shipping Rule,Shipping Rule Label,Piegāde noteikums Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,lietotāju forums
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Izejvielas nevar būt tukšs.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2331,7 +2333,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Noteikumi un Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Institūta nosaukums, ko jums ir izveidot šo sistēmu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Grāmatvedības ieraksts iesaldēta līdz šim datumam, neviens nevar darīt / mainīt ierakstu izņemot lomu zemāk norādīto."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Lūdzu, saglabājiet dokumentu pirms ražošanas apkopes grafiku"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projekta statuss
 DocType: UOM,Check this to disallow fractions. (for Nos),Pārbaudiet to neatļaut frakcijas. (Par Nr)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Tika izveidoti šādi pasūtījumu:
@@ -2358,7 +2360,7 @@
 ,Employees working on a holiday,Darbinieki strādā par brīvdienu
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete metode
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Uzturēšana sākuma datums nevar būt pirms piegādes datuma Serial Nr {0}
 DocType: Production Order,Actual End Date,Faktiskais beigu datums
 DocType: BOM,Operating Cost (Company Currency),Ekspluatācijas izmaksas (Company valūta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2375,7 +2377,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Atstāt bez samaksas nesakrīt ar apstiprināto atvaļinājums ierakstus
 DocType: Campaign,Campaign-.####,Kampaņa -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nākamie soļi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Lūdzu sniegt norādītos objektus pēc iespējas zemas cenas
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto tuvu Opportunity pēc 15 dienām
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,beigu gads
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2413,7 +2415,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd daudzums
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Maksa Records Izveidoja - {0}
 DocType: Asset Category Account,Asset Category Account,Asset kategorija konts
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Entry {0} nav iesniegts
 DocType: Payment Reconciliation,Bank / Cash Account,Bankas / Naudas konts
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Nākamais Kontaktinformācija Ar nevar būt tāda pati kā vadošais e-pasta adrese
@@ -2435,7 +2437,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Klīrenss datums nav minēts
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Ražošana
 DocType: Guardian,Occupation,nodarbošanās
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rinda {0}: Sākuma datumam jābūt pirms beigu datuma
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Kopā (Daudz)
 DocType: Sales Invoice,This Document,šo dokumentu
 DocType: Installation Note Item,Installed Qty,Uzstādītas Daudz
@@ -2451,15 +2454,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Ziņojiet par problēmu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Izdevumi
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Virs
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nav konta {2} vai jau saskaņota pret citu talonu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nav konta {2} vai jau saskaņota pret citu talonu
 DocType: Buying Settings,Default Buying Price List,Default Pirkšana Cenrādis
 DocType: Process Payroll,Salary Slip Based on Timesheet,Alga Slip Pamatojoties uz laika kontrolsaraksts
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Maksājuma veids
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Lūdzu, izvēlieties partijai postenis {0}. Nevar atrast vienu partiju, kas atbilst šo prasību"
 DocType: Process Payroll,Select Employees,Izvēlieties Darbinieki
 DocType: Opportunity,Potential Sales Deal,Potenciālie Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Čeks / Reference Date
@@ -2476,7 +2479,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} jau radīts uzņēmums {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Aizstāt preci / BOM visās BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvīts dokuments ir jāiesniedz
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvīts dokuments ir jāiesniedz
 DocType: Purchase Invoice Item,Received Qty,Saņēma Daudz
 DocType: Stock Entry Detail,Serial No / Batch,Sērijas Nr / Partijas
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"Nav samaksāta, un nav sniegusi"
@@ -2485,11 +2488,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nav laika uzskaites lapas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"Atstājiet Type {0} nevar veikt, nosūta"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Uzturēšana Kalendārs nav radīts visiem posteņiem. Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 ,To Produce,Ražot
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Algas
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Par rindu {0} jo {1}. Lai iekļautu {2} vienības likmi, rindas {3} jāiekļauj arī"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,padarīt lietotāju
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,padarīt lietotāju
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikācija paketes par piegādi (drukāšanai)
 DocType: Bin,Reserved Quantity,Rezervēts daudzums
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ievadiet derīgu e-pasta adresi
@@ -2503,15 +2506,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Invalīdu veidni nedrīkst noklusējuma veidni
 DocType: Account,Income Account,Ienākumu konta
 DocType: Payment Request,Amount in customer's currency,Summa klienta valūtā
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Nodošana
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Nodošana
 DocType: Stock Reconciliation Item,Current Qty,Pašreizējais Daudz
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Skatīt ""Rate Materiālu Balstoties uz"" in tāmēšanu iedaļā"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Iepriekšējā
 DocType: Appraisal Goal,Key Responsibility Area,Key Atbildība Platība
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Studentu Partijas palīdzēs jums izsekot apmeklējumu, slēdzienus un maksu studentiem"
 DocType: Payment Entry,Total Allocated Amount,Kopējā piešķirtā summa
 DocType: Item Reorder,Material Request Type,Materiāls Pieprasījuma veids
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry algām no {0} līdz {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage ir pilna, nav ietaupīt"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage ir pilna, nav ietaupīt"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Conversion Factor ir obligāta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Izmaksas Center
@@ -2521,16 +2525,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Slēpt Klienta nodokļu ID no pārdošanas darījumu
 DocType: Upload Attendance,Upload HTML,Augšupielāde HTML
 DocType: Employee,Relieving Date,Atbrīvojot Datums
-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.","Cenu noteikums ir, lai pārrakstītu Cenrādī / noteikt diskonta procentus, pamatojoties uz dažiem kritērijiem."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cenu noteikums ir, lai pārrakstītu Cenrādī / noteikt diskonta procentus, pamatojoties uz dažiem kritērijiem."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Noliktavu var mainīt tikai ar Fondu Entry / Piegāde Note / pirkuma čeka
 DocType: Employee Education,Class / Percentage,Klase / procentuālā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Mārketinga un pārdošanas vadītājs
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Ienākuma nodoklis
-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.","Ja izvēlētais Cenu noteikums ir paredzēts ""cena"", tas pārrakstīs cenrādi. Cenu noteikums cena ir galīgā cena, tāpēc vairs atlaide jāpiemēro. Tādējādi, darījumos, piemēram, pārdošanas rīkojumu, pirkuma pasūtījuma utt, tas tiks atnesa 'ātrums' laukā, nevis ""Cenu saraksts likmes"" laukā."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ja izvēlētais Cenu noteikums ir paredzēts ""cena"", tas pārrakstīs cenrādi. Cenu noteikums cena ir galīgā cena, tāpēc vairs atlaide jāpiemēro. Tādējādi, darījumos, piemēram, pārdošanas rīkojumu, pirkuma pasūtījuma utt, tas tiks atnesa 'ātrums' laukā, nevis ""Cenu saraksts likmes"" laukā."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track noved līdz Rūpniecības Type.
 DocType: Item Supplier,Item Supplier,Postenis piegādātājs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Lūdzu, izvēlieties vērtību {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Ievadiet posteņu kodu, lai iegūtu partiju nē"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Visas adreses.
 DocType: Company,Stock Settings,Akciju iestatījumi
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2540,6 +2544,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vai Uzrakstīt par pasākumu darbiniekiem ar statusu &quot;Atvērt&quot;
 DocType: Task,Depends on Tasks,Atkarīgs no uzdevumiem
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Pārvaldīt Klientu grupa Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Pielikumi var parādīt bez ļaujot iepirkumu grozu
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Jaunais Izmaksu centrs Name
 DocType: Leave Control Panel,Leave Control Panel,Atstājiet Control Panel
@@ -2552,12 +2557,10 @@
 DocType: Sales Invoice,Debit To,Debets
 DocType: Delivery Note,Required only for sample item.,Nepieciešams tikai paraugu posteni.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiskais Daudz Pēc Darījuma
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Piegādātājs&gt; Piegādātājs veids
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nav alga slip atrasts starp {0} un {1}
 ,Pending SO Items For Purchase Request,Kamēr SO šeit: pirkuma pieprasījumu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentu Uzņemšana
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ir izslēgts
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ir izslēgts
 DocType: Supplier,Billing Currency,Norēķinu valūta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Īpaši liels
@@ -2574,9 +2577,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Visi novērtēšanas grupas
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Jauns Noliktava vārds
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Kopā {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Kopā {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritorija
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Lūdzu, norādiet neviena apmeklējumu nepieciešamo"
 DocType: Stock Settings,Default Valuation Method,Default Vērtēšanas metode
 DocType: Vehicle Log,Fuel Qty,degvielas Daudz
 DocType: Production Order Operation,Planned Start Time,Plānotais Sākuma laiks
@@ -2592,7 +2595,7 @@
 DocType: Price List,Price List Master,Cenrādis Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Visi pārdošanas darījumi var tagged pret vairāku ** pārdevēji **, lai jūs varat noteikt un kontrolēt mērķus."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Lūdzu, izveidojiet Klientam no Svins {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Atstājiet Pieteikumus ar statusu tikai &quot;Apstiprināts&quot; un &quot;Noraidīts&quot; var iesniegt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Grupas nosaukums ir obligāta kārtas {0}
@@ -2624,7 +2627,7 @@
 DocType: Project,Copied From,kopēts no
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Vārds kļūda: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,trūkums
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nav saistīta ar {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nav saistīta ar {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Apmeklējumu par darbiniekam {0} jau ir atzīmēts
 DocType: Packing Slip,If more than one package of the same type (for print),"Ja vairāk nekā viens iepakojums, no tā paša veida (drukāšanai)"
 ,Salary Register,alga Reģistrēties
@@ -2643,7 +2646,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Izmantot Grozs
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vērtība {0} atribūtam {1} neeksistē sarakstā derīgu posteņa īpašības vērtības posteni {2}
 DocType: BOM Item,Scrap %,Lūžņi %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksas tiks izplatīts proporcionāli, pamatojoties uz vienību Daudz vai summu, kā par savu izvēli"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Maksas tiks izplatīts proporcionāli, pamatojoties uz vienību Daudz vai summu, kā par savu izvēli"
 DocType: Maintenance Visit,Purposes,Mērķiem
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Darbība {0} vairāk nekā visus pieejamos darba stundas darbstaciju {1}, nojauktu darbību vairākos operācijām"
@@ -2664,16 +2667,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Pārvaldīt Territory Tree.
 DocType: Journal Entry Account,Sales Invoice,PPR (Pārdošanas Pavadzīme)
 DocType: Journal Entry Account,Party Balance,Party Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Lūdzu, izvēlieties Piesakies atlaide"
 DocType: Company,Default Receivable Account,Default pasūtītāju konta
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Izveidot Bank ierakstu par kopējo algu maksā par iepriekš izvēlētajiem kritērijiem
 DocType: Stock Entry,Material Transfer for Manufacture,Materiāls pārsūtīšana Ražošana
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Atlaide Procentos var piemērot vai nu pret Cenrādī vai visām Cenrāža.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Atlaide Procentos var piemērot vai nu pret Cenrādī vai visām Cenrāža.
 DocType: Purchase Invoice,Half-yearly,Reizi pusgadā
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Grāmatvedības Entry par noliktavā
 DocType: Vehicle Service,Engine Oil,Motora eļļas
 DocType: Sales Invoice,Sales Team1,Sales team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Postenis {0} nepastāv
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Postenis {0} nepastāv
 DocType: Sales Invoice,Customer Address,Klientu adrese
 DocType: Employee Loan,Loan Details,aizdevums Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rinda {0}: Pabeigts Daudz jābūt lielākai par nulli.
@@ -2681,24 +2684,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Nevar atgriezties vairāk nekā {1} postenī {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Gabals
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Gabals
 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(Item) 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}
 DocType: Cheque Print Template,Primary Settings,primārās iestatījumi
 DocType: Purchase Invoice,Select Supplier Address,Select Piegādātājs adrese
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Pievienot Darbinieki
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Pievienot Darbinieki
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitātes pārbaudes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Brīdinājums: Materiāls Pieprasītā Daudz ir mazāks nekā minimālais pasūtījums Daudz
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konts {0} ir sasalusi
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Juridiskā persona / meitas uzņēmums ar atsevišķu kontu plānu, kas pieder Organizācijai."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Pārtika, dzērieni un tabakas"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Var tikai veikt maksājumus pret unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisijas likme nevar būt lielāka par 100
 DocType: Stock Entry,Subcontract,Apakšlīgumu
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ievadiet {0} pirmais
@@ -2738,7 +2741,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Noliktavas ar esošo darījumu nevar pārvērst grupai.
 DocType: Assessment Result Tool,Result HTML,rezultāts HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Beigu termiņš
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pievienot Students
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pievienot Students
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Lūdzu, izvēlieties {0}"
 DocType: C-Form,C-Form No,C-Form Nr
 DocType: BOM,Exploded_items,Exploded_items
@@ -2781,7 +2784,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Ievadiet nosaukumu, kampaņas, ja avots izmeklēšanas ir kampaņa"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Laikrakstu izdevēji
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izvēlieties saimnieciskais gads
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Izvēlieties saimnieciskais gads
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pārkārtot Level
 DocType: Company,Chart Of Accounts Template,Kontu plāns Template
 DocType: Attendance,Attendance Date,Apmeklējumu Datums
@@ -2796,14 +2799,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Dublikāts ieraksts
 DocType: Program Enrollment Tool,Get Students,Iegūt Students
 DocType: Serial No,Under Warranty,Zem Garantija
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Kļūda]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Kļūda]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Vārdos būs redzams pēc tam, kad esat saglabāt klientu pasūtījumu."
 ,Employee Birthday,Darbinieku Birthday
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Partijas Apmeklējumu Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akadēmiskā termins ar šo &quot;mācību gada&quot; {0} un &quot;Termina nosaukums&quot; {1} jau eksistē. Lūdzu mainīt šos ierakstus un mēģiniet vēlreiz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Tā kā ir esošie darījumi pret posteni {0}, jūs nevarat mainīt vērtību {1}"
 DocType: UOM,Must be Whole Number,Jābūt veselam skaitlim
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Jaunas lapas Piešķirtas (dienās)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Sērijas Nr {0} nepastāv
@@ -2823,7 +2826,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Materiālu jāmaksā pret šo pārdošanas pasūtījumu
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Periods Noslēguma Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par grupai"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Summa {0} {1} {2} {3}
 DocType: Account,Depreciation,Nolietojums
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Piegādātājs (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Darbinieku apmeklējums Tool
@@ -2847,7 +2850,7 @@
 DocType: Supplier,Last Day of the Next Month,Pēdējā diena nākamajā mēnesī
 DocType: Support Settings,Auto close Issue after 7 days,Auto tuvu Issue pēc 7 dienām
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Atvaļinājumu nevar tikt piešķirts pirms {0}, jo atvaļinājumu bilance jau ir rokas nosūtīja nākotnē atvaļinājumu piešķiršanas ierakstu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Piezīme: Due / Reference Date pārsniedz ļāva klientu kredītu dienām ar {0} dienā (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Pretendents
 DocType: Asset Category Account,Accumulated Depreciation Account,Uzkrātais nolietojums konts
 DocType: Stock Settings,Freeze Stock Entries,Iesaldēt krājumu papildināšanu
@@ -2858,7 +2861,7 @@
 ,Stock Analytics,Akciju Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Darbības nevar atstāt tukšu
 DocType: Maintenance Visit Purpose,Against Document Detail No,Pret Dokumentu Detail Nr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Puse Type ir obligāts
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Puse Type ir obligāts
 DocType: Quality Inspection,Outgoing,Izejošs
 DocType: Material Request,Requested For,Pieprasīts Par
 DocType: Quotation Item,Against Doctype,Pret DOCTYPE
@@ -2875,11 +2878,11 @@
 DocType: Asset,Item Code,Postenis Code
 DocType: Production Planning Tool,Create Production Orders,Izveidot pasūtījumu
 DocType: Serial No,Warranty / AMC Details,Garantijas / AMC Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Izvēlieties studenti manuāli Grupas darbības balstītas
 DocType: Journal Entry,User Remark,Lietotājs Piezīme
 DocType: Lead,Market Segment,Tirgus segmentā
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Samaksātā summa nedrīkst būt lielāka par kopējo negatīvo nenomaksātās summas {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Darbinieku Iekšējā Work Vēsture
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Noslēguma (Dr)
 DocType: Cheque Print Template,Cheque Size,Čeku Size
@@ -2895,7 +2898,7 @@
 DocType: Production Planning Tool,Create Material Requests,Izveidot Materiāls Pieprasījumi
 DocType: Employee Education,School/University,Skola / University
 DocType: Payment Request,Reference Details,Atsauce Details
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Paredzams, Value Pēc Lietderīgās lietošanas laika jābūt mazākam nekā Bruto Pirkuma summa"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Pieejams Daudz at Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jāmaksā Summa
 DocType: Asset,Double Declining Balance,Paātrināto norakstīšanas
@@ -2916,20 +2919,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Starpība Konts jābūt aktīva / saistību veidu konts, jo šis fonds Salīdzināšana ir atklāšana Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Izmaksātā summa nedrīkst būt lielāka par aizdevuma summu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Pasūtījuma skaitu, kas nepieciešams postenī {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produkcija Pasūtījums nav izveidots
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Produkcija Pasūtījums nav izveidots
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""No Datuma 'jābūt pēc"" Uz Datumu'"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nevar mainīt statusu kā studentam {0} ir saistīta ar studentu pieteikumu {1}
 DocType: Asset,Fully Depreciated,pilnībā amortizēta
 ,Stock Projected Qty,Stock Plānotais Daudzums
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klientu {0} nepieder projekta {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Ievērojama Apmeklējumu HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citāti ir priekšlikumi, cenas jums ir nosūtīti uz jūsu klientiem"
 DocType: Sales Order,Customer's Purchase Order,Klienta Pasūtījuma
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Sērijas Nr un partijas
 DocType: Warranty Claim,From Company,No Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summa rādītājus vērtēšanas kritēriju jābūt {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vērtība vai Daudz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Lūdzu noteikts skaits nolietojuma Rezervēts
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vērtība vai Daudz
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Iestudējumi Rīkojumi nevar izvirzīts par:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minūte
 DocType: Purchase Invoice,Purchase Taxes and Charges,Pirkuma nodokļiem un maksājumiem
@@ -2942,7 +2945,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Visas Noliktavas
 DocType: Sales Partner,Retailer,Mazumtirgotājs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Visi Piegādātājs veidi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Visi Piegādātājs veidi
 DocType: Global Defaults,Disable In Words,Atslēgt vārdos
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Piedāvājums {0} nav tips {1}
@@ -2951,6 +2954,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Banka Overdrafts konts
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Padarīt par atalgojumu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: piešķirtā summa nedrīkst būt lielāka par nesamaksāto summu.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Pārlūkot BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Nodrošināti aizdevumi
 DocType: Purchase Invoice,Edit Posting Date and Time,Labot ziņas datums un laiks
@@ -2990,7 +2994,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Nav atļauts izmainīt akciju darījumiem, kas vecāki par {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Pilnībā Jāmaksā
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Lūdzu iestatīt noklusēto maksājamo kontu darbinieks {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Cash In Hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Piegāde noliktava nepieciešama akciju posteni {0}
 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)
@@ -3001,7 +3004,7 @@
 DocType: Student Group,Group Based On,"Grupu, kuras pamatā"
 DocType: Journal Entry,Bill Date,Bill Datums
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Servisa punkts, Type, biežumu un izdevumu summa ir nepieciešami"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Pat tad, ja ir vairāki cenu noteikšanas noteikumus ar augstāko prioritāti, tiek piemēroti tad šādi iekšējie prioritātes:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vai jūs tiešām vēlaties iesniegt visus Algas pazustu no {0} līdz {1}
 DocType: Cheque Print Template,Cheque Height,Čeku augstums
 DocType: Supplier,Supplier Details,Piegādātājs Details
@@ -3013,7 +3016,7 @@
 DocType: Vehicle Log,Invoice Ref,rēķina Ref
 DocType: Purchase Order,Recurring Order,Atkārtojas rīkojums
 DocType: Company,Default Income Account,Default Ienākumu konta
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klientu Group / Klientu
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klientu Group / Klientu
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neaizvērta Fiskālā Years peļņa / zaudējumi (Credit)
 DocType: Sales Invoice,Time Sheets,laika Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Default maksājuma pieprasījums Message
@@ -3033,10 +3036,10 @@
 DocType: Notification Control,Quotation Message,Piedāvājuma Ziņojums
 DocType: Employee Loan,Employee Loan Application,Darbinieku Loan Application
 DocType: Issue,Opening Date,Atvēršanas datums
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Apmeklētība ir veiksmīgi atzīmēts.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Apmeklētība ir veiksmīgi atzīmēts.
 DocType: Journal Entry,Remark,Piezīme
 DocType: Purchase Receipt Item,Rate and Amount,Novērtēt un Summa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Konta tips par {0} ir {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Konta tips par {0} ir {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lapas un brīvdienu
 DocType: School Settings,Current Academic Term,Pašreizējais Akadēmiskā Term
 DocType: School Settings,Current Academic Term,Pašreizējais Akadēmiskā Term
@@ -3059,7 +3062,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Studentu grupa
 DocType: Shopping Cart Settings,Quotation Series,Piedāvājuma sērija
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Priekšmets pastāv ar tādu pašu nosaukumu ({0}), lūdzu, nomainiet priekšmets grupas nosaukumu vai pārdēvēt objektu"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Lūdzu, izvēlieties klientu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Lūdzu, izvēlieties klientu"
 DocType: C-Form,I,es
 DocType: Company,Asset Depreciation Cost Center,Aktīvu amortizācijas izmaksas Center
 DocType: Sales Order Item,Sales Order Date,Sales Order Date
@@ -3078,20 +3081,20 @@
 DocType: Vehicle,Insurance Details,apdrošināšana Details
 DocType: Account,Payable,Maksājams
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ievadiet atmaksas termiņi
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitori ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitori ({0})
 DocType: Pricing Rule,Margin,Robeža
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Jauni klienti
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto peļņa%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Klīrenss Datums
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto Pirkuma summa ir obligāta
 DocType: Lead,Address Desc,Adrese Dilst
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Puse ir obligāta
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Puse ir obligāta
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tēma Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Jāizvēlas Vismaz viens pirkšana vai pārdošana
-DocType: Grading Structure,Grade Intervals,Novērtējums intervāli
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izvēlieties raksturu jūsu biznesu.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rinda # {0}: Duplicate ierakstu atsaucēs {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Gadījumos, kad ražošanas darbības tiek veiktas."
 DocType: Asset Movement,Source Warehouse,Source Noliktava
 DocType: Installation Note,Installation Date,Uzstādīšana Datums
@@ -3128,7 +3131,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Vēstuļu Heads iespiesto veidnes.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Nosaukumi drukāt veidnes, piemēram, rēķins."
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Vērtēšanas veida maksājumus nevar atzīmēts kā Inclusive
 DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Different UOM objektus, novedīs pie nepareizas (kopā) Neto svars vērtību. Pārliecinieties, ka neto svars katru posteni ir tādā pašā UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3156,7 +3159,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / zaudējumu aprēķins
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Darbinieku un apmeklējums
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,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 +117,Fill the form and save it,Aizpildiet formu un saglabājiet to
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Faktiskais Daudzums noliktavā
@@ -3172,7 +3175,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pārkārtot Daudz
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Pašreizējās vakanču
 DocType: Company,Stock Adjustment Account,Stock konta korekcijas
-DocType: Journal Entry,Write Off,Uzrakstiet Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Uzrakstiet Off
 DocType: Timesheet Detail,Operation ID,Darbība ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Ja kas, tas kļūs noklusējuma visiem HR formām."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: No {1}
@@ -3183,27 +3186,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Piegādātājs piegādā Klientam
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / postenis / {0}) ir no krājumiem
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nākamais datums nedrīkst būt lielāks par norīkošanu Datums
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Rādīt nodokļu break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Rādīt nodokļu break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Atsauce Date nevar būt pēc {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datu importēšana un eksportēšana
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Krājumu pastāvēt pret Warehouse {0}, līdz ar to nevar atkārtoti piešķirt vai mainīt to"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nav studenti Atrasts
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nav studenti Atrasts
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Rēķina Posting Date
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,pārdot
 DocType: Sales Invoice,Rounded Total,Noapaļota Kopā
 DocType: Product Bundle,List items that form the package.,"Saraksts priekšmeti, kas veido paketi."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuālais sadalījums būtu vienāda ar 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Lūdzu, izvēlieties Publicēšanas datums pirms izvēloties puse"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Lūdzu, izvēlieties citāti"
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Lūdzu, izvēlieties citāti"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Lūdzu, izvēlieties citāti"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Skaits nolietojuma kartīti nedrīkst būt lielāks par kopskaita nolietojuma
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Izveidot tehniskās apkopes vizīti
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Lūdzu, sazinieties ar lietotāju, kurš ir Sales Master vadītājs {0} lomu"
 DocType: Company,Default Cash Account,Default Naudas konts
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nav Klients vai piegādātājs) kapteinis.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Tas ir balstīts uz piedalīšanos šajā Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nav Skolēni
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pievienotu citus objektus vai Atvērt pilnu formu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Ievadiet ""piegādes paredzētais datums"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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
@@ -3235,6 +3239,7 @@
 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: Warranty Claim,Item and Warranty Details,Elements un Garantija Details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Prece Kods&gt; Prece Group&gt; Brand
 DocType: Sales Team,Contribution (%),Ieguldījums (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Izvēlieties programmu ieneses obligātos kursus.
@@ -3250,9 +3255,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pirms samierināšanās
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Uz {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Nodokļi un maksājumi Pievienoja (Company valūta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Postenis Nodokļu Row {0} ir jābūt vērā tipa nodokli vai ienākumu vai izdevumu, vai jāmaksā"
 DocType: Sales Order,Partly Billed,Daļēji Jāmaksā
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Prece {0} ir jābūt pamatlīdzekļu posteni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Prece {0} ir jābūt pamatlīdzekļu posteni
 DocType: Item,Default BOM,Default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3262,8 +3267,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobiļu
 DocType: Vehicle,Insurance Company,Apdrošināšanas sabiedrība
 DocType: Asset Category Account,Fixed Asset Account,Pamatlīdzekļa konts
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,mainīgs
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,No piegāde piezīme
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,mainīgs
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,No piegāde piezīme
 DocType: Student,Student Email Address,Student e-pasta adrese
 DocType: Timesheet Detail,From Time,No Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Noliktavā:
@@ -3275,12 +3280,12 @@
 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 +66,Intern,Interns
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adrese nosaukums
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adrese nosaukums
 DocType: Stock Entry,From BOM,No BOM
 DocType: Assessment Code,Assessment Code,novērtējums Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Pamata
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Akciju darījumiem pirms {0} ir iesaldēti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Lūdzu, noklikšķiniet uz ""Generate sarakstā '"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","piemēram Kg, Unit, numurus, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Atsauces Nr ir obligāta, ja esat norādījis atsauces datumā"
 DocType: Bank Reconciliation Detail,Payment Document,maksājuma dokumentu
@@ -3288,19 +3293,19 @@
 DocType: Salary Slip,Salary Structure,Algu struktūra
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Aviokompānija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Jautājums Materiāls
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Jautājums Materiāls
 DocType: Material Request Item,For Warehouse,Noliktavai
 DocType: Employee,Offer Date,Piedāvājuma Datums
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citāti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Jūs esat bezsaistes režīmā. Jūs nevarēsiet, lai pārlādētu, kamēr jums ir tīkls."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Nav Studentu grupas izveidots.
 DocType: Purchase Invoice Item,Serial No,Sērijas Nr
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Ikmēneša atmaksa summa nedrīkst būt lielāka par aizdevuma summu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ievadiet Maintaince Details pirmais
 DocType: Purchase Invoice,Print Language,print valoda
 DocType: Salary Slip,Total Working Hours,Kopējais darba laiks
 DocType: Stock Entry,Including items for sub assemblies,Ieskaitot posteņiem apakš komplektiem
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Ievadiet vērtība ir pozitīva
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Ievadiet vērtība ir pozitīva
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Visas teritorijas
 DocType: Purchase Invoice,Items,Preces
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Students jau ir uzņemti.
@@ -3319,17 +3324,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default mērvienība Variant &#39;{0}&#39; jābūt tāds pats kā Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,"Aprēķināt, pamatojoties uz"
 DocType: Delivery Note Item,From Warehouse,No Noliktavas
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nav Preces ar Bill materiālu ražošana
 DocType: Assessment Plan,Supervisor Name,uzraudzītājs Name
 DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
 DocType: Program Enrollment Course,Program Enrollment Course,Programmas Uzņemšana kurss
-DocType: Grading Structure,Grading Structure,Šķirošana struktūra
 DocType: Purchase Taxes and Charges,Valuation and Total,Vērtēšana un Total
 DocType: Tax Rule,Shipping City,Piegāde City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Pielāgot paziņojumu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Naudas plūsma no darbības
 DocType: Sales Invoice,Shipping Rule,Piegāde noteikums
@@ -3350,8 +3353,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Lūdzu, izvēlieties Publicēšanas datums pirmais"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Atvēršanas datums būtu pirms slēgšanas datums
 DocType: Leave Control Panel,Carry Forward,Virzīt uz priekšu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Izmaksas Center ar esošajiem darījumiem, nevar pārvērst par virsgrāmatā"
 DocType: Department,Days for which Holidays are blocked for this department.,Dienas kuriem Brīvdienas ir bloķēta šajā departamentā.
@@ -3364,7 +3367,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pievienojiet iespiedveidlapām
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Pēdējais paziņojums
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Pēdējais paziņojums
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nevar atskaitīt, ja kategorija ir ""vērtēšanas"" vai ""Novērtēšanas un Total"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Sarakstu jūsu nodokļu galvas (piemēram, PVN, muitas uc; viņiem ir unikālas nosaukumi) un to standarta likmes. Tas radīs standarta veidni, kuru varat rediģēt un pievienot vēl vēlāk."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Maksājumi ar rēķini
@@ -3380,7 +3383,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Kopā (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Postenis Sērijas Nr
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Izveidot Darbinieku Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Izveidot Darbinieku Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Kopā Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,grāmatvedības pārskati
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Stunda
@@ -3393,10 +3396,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,nezināms
 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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Saņemtā summa
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lūdzu uzstādīšana Darbinieku nosaukumu sistēmai cilvēkresursu&gt; HR Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Izveidot pilnu daudzumu, ignorējot daudzumu jau pēc pasūtījuma"
 DocType: Account,Tax,Nodoklis
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nav marķēti
@@ -3409,9 +3410,9 @@
 DocType: Batch,Source Document Name,Avota Dokumenta nosaukums
 DocType: Batch,Source Document Name,Avota Dokumenta nosaukums
 DocType: Job Opening,Job Title,Amats
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Izveidot lietotāju
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Izveidot lietotāju
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,grams
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Daudzums, ražošana jābūt lielākam par 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Apmeklējiet pārskatu uzturēšanas zvanu.
 DocType: Stock Entry,Update Rate and Availability,Atjaunināšanas ātrumu un pieejamība
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procents jums ir atļauts saņemt vai piegādāt vairāk pret pasūtīto daudzumu. Piemēram: Ja esi pasūtījis 100 vienības. un jūsu pabalsts ir, tad jums ir atļauts saņemt 110 vienības 10%."
@@ -3421,28 +3422,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Izdevumu konts ir obligāta posteni {0}
 DocType: BOM,Website Description,Mājas lapa Apraksts
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto pašu kapitāla izmaiņas
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Lūdzu atcelt pirkuma rēķina {0} pirmais
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-pasta adrese ir unikāls, jau pastāv {0}"
 DocType: Serial No,AMC Expiry Date,AMC Derīguma termiņš
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,kvīts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,kvīts
 ,Sales Register,Sales Reģistrēties
 DocType: Daily Work Summary Settings Company,Send Emails At,Sūtīt e-pastus
 DocType: Quotation,Quotation Lost Reason,Piedāvājuma Zaudējuma Iemesls
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Izvēlieties savu domēnu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Darījuma atsauces numurs {0} datēts {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Nav nekas, lai rediģētu."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Kopsavilkums par šo mēnesi un izskatāmo darbību
 DocType: Customer Group,Customer Group Name,Klientu Grupas nosaukums
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,"No klientiem, kuri vēl!"
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Naudas plūsmas pārskats
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredīta summa nedrīkst pārsniegt maksimālo summu {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licence
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Ievadiet norakstīt kontu
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Pēdējā pasūtījuma datums
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konts {0} nav pieder uzņēmumam {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sērijas numurus kārtas {0} nesakrīt ar piegādes piezīme
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark apmeklēšana vairākiem darbiniekiem
@@ -3467,20 +3470,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rinda {0} # jāņem tipa &quot;pamatlīdzekļu&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Daudz
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Noteikumi aprēķināt kuģniecības summu pārdošanu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Dokumenta numurs ir obligāts
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Dokumenta numurs ir obligāts
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanšu pakalpojumi
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Darbības veidi Time Baļķi
 DocType: Tax Rule,Sales,Pārdevums
 DocType: Stock Entry Detail,Basic Amount,Pamatsumma
 DocType: Training Event,Exam,eksāmens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Noliktava nepieciešama krājumu postenī {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Norēķinu Valsts
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Nodošana
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nav saistīta ar partijas kontā {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nav saistīta ar partijas kontā {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Atnest eksplodēja BOM (ieskaitot mezglus)
 DocType: Authorization Rule,Applicable To (Employee),Piemērojamais Lai (Darbinieku)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date ir obligāts
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Pieaugums par atribūtu {0} nevar būt 0
@@ -3491,13 +3494,13 @@
 ,Inactive Customers,neaktīvi Klienti
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pirkuma Kvītis
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kā Cenu noteikums tiek piemērots?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kā Cenu noteikums tiek piemērots?
 DocType: Stock Entry,Delivery Note No,Piegāde Note Nr
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ja ieslēgts, tikai Iegādāties materiālu pieprasījumi gala izejvielu tiks iekļauts materiāls pieprasījumiem. Pretējā gadījumā tiks izveidots materiālu pieprasījumi mātes posteņiem"
 DocType: Cheque Print Template,Message to show,"Ziņa, lai parādītu"
 DocType: Company,Retail,Mazumtirdzniecība
 DocType: Attendance,Absent,Nekonstatē
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Produkta Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3507,10 +3510,10 @@
 DocType: Payment Entry,Account Paid From,Konts maksā no
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Izejvielas Produkta kods
 DocType: Journal Entry,Write Off Based On,Uzrakstiet Off Based On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,padarīt Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,padarīt Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Drukas un Kancelejas
 DocType: Stock Settings,Show Barcode Field,Rādīt Svītrkoda Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Nosūtīt Piegādātāja e-pastu
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Alga jau sagatavotas laika posmā no {0} un {1}, atstājiet piemērošanas periods nevar būt starp šo datumu diapazonā."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Uzstādīšana rekords Serial Nr
 DocType: Guardian Interest,Guardian Interest,Guardian Procentu
@@ -3523,6 +3526,7 @@
 DocType: Offer Letter,Awaiting Response,Gaida atbildi
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Iepriekš
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nederīga atribūts {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Pieminēt ja nestandarta jāmaksā konts
 DocType: Salary Slip,Earning & Deduction,Nopelnot & atskaitīšana
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,"Pēc izvēles. Šis iestatījums tiks izmantota, lai filtrētu dažādos darījumos."
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatīva Vērtēšana Rate nav atļauta
@@ -3538,10 +3542,9 @@
 DocType: Production Order Item,Production Order Item,Ražošanas Order punkts
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ieraksts nav atrasts
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Izmaksas metāllūžņos aktīva
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,daļēji ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0}{1}: Izmaksu centrs ir obligāta postenī {2}
 DocType: Vehicle,Policy No,politikas Nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Dabūtu preces no produkta Bundle
 DocType: Asset,Straight Line,Taisne
 DocType: Project User,Project User,projekta User
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,sadalīt
@@ -3559,7 +3562,7 @@
 DocType: Program Enrollment Tool,Get Students From,Iegūt studentus no
 DocType: Hub Settings,Seller Country,Pārdevējs Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicēt punkti Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupu jūsu skolēni partijās
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupu jūsu skolēni partijās
 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 +85,Specifications,Specifikācijas
@@ -3612,14 +3615,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Čeku Datums
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konts {0}: Mātes vērā {1} nepieder uzņēmumam: {2}
 DocType: Program Enrollment Tool,Student Applicants,studentu Pretendentiem
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Veiksmīgi svītrots visas ar šo uzņēmumu darījumus!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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ā
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Uzņemšanas datums
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probācija
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,algu komponenti
 DocType: Program Enrollment Tool,New Academic Year,Jaunā mācību gada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Atgriešana / kredītu piezīmi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Atgriešana / kredītu piezīmi
 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 +28,Total Paid Amount,Kopējais samaksāto summu
 DocType: Production Order Item,Transferred Qty,Nodota Daudz
@@ -3639,7 +3642,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Veids lapām, piemēram, gadījuma, slimības uc"
 DocType: Email Digest,Send regular summary reports via Email.,Regulāri jānosūta kopsavilkuma ziņojumu pa e-pastu.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Lūdzu iestatīt noklusēto kontu Izdevumu prasījuma veida {0}
 DocType: Assessment Result,Student Name,Studenta vārds
 DocType: Brand,Item Manager,Prece vadītājs
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Algas Kreditoru
@@ -3660,6 +3663,7 @@
 ,Sales Funnel,Pārdošanas piltuve
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Saīsinājums ir obligāta
 DocType: Project,Task Progress,uzdevums Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Rati
 ,Qty to Transfer,Daudz Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citāti par potenciālajiem klientiem vai klientiem.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Loma Atļauts rediģēt saldētas krājumus
@@ -3687,13 +3691,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postenis Wise Nodokļu Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute saīsinājums
 ,Item-wise Price List Rate,Postenis gudrs Cenrādis Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Piegādātāja Piedāvājums
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Piegādātāja Piedāvājums
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Vārdos būs redzami, kad saglabājat citāts."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Daudzums ({0}) nevar būt daļa rindā {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,savākt maksas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Svītrkodu {0} jau izmanto postenī {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Noteikumi par piebilstot piegādes izmaksas.
 DocType: Item,Opening Stock,Atklāšanas Stock
@@ -3710,8 +3714,8 @@
 Updated via 'Time Log'","minūtēs Atjaunināts izmantojot 'Time Ieiet """
 DocType: Customer,From Lead,No Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pasūtījumi izlaists ražošanai.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izvēlieties fiskālajā gadā ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile jāveic POS Entry
 DocType: Program Enrollment Tool,Enroll Students,uzņemt studentus
 DocType: Hub Settings,Name Token,Nosaukums Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard pārdošana
@@ -3722,7 +3726,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} pret pārdošanas rēķinu {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projekta nosaukums
-DocType: Supplier,Mention if non-standard receivable account,Pieminēt ja nestandarta debitoru konts
+DocType: Customer,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: Production Order,Required Items,Nepieciešamie Items
 DocType: Stock Ledger Entry,Stock Value Difference,Preces vērtība Starpība
@@ -3743,7 +3747,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Noteikt mērķus Prece Group-gudrs šai Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Iesaldēt Krājumi Vecāki par [dienas]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset ir obligāta Pamatlīdzekļu pirkšana / pārdošana
-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.","Ja divi vai vairāki Cenu novērtēšanas noteikumi ir balstīti uz iepriekš minētajiem nosacījumiem, prioritāte tiek piemērota. Prioritāte ir skaitlis no 0 lìdz 20, kamēr noklusējuma vērtība ir nulle (tukšs). Lielāks skaitlis nozīmē, ka tas ir prioritāte, ja ir vairāki cenu veidošanas noteikumi, ar tādiem pašiem nosacījumiem."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ja divi vai vairāki Cenu novērtēšanas noteikumi ir balstīti uz iepriekš minētajiem nosacījumiem, prioritāte tiek piemērota. Prioritāte ir skaitlis no 0 lìdz 20, kamēr noklusējuma vērtība ir nulle (tukšs). Lielāks skaitlis nozīmē, ka tas ir prioritāte, ja ir vairāki cenu veidošanas noteikumi, ar tādiem pašiem nosacījumiem."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiskālā Gads: {0} neeksistē
 DocType: Currency Exchange,To Currency,Līdz Valūta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Ļauj šie lietotāji apstiprināt Leave Pieteikumi grupveida dienas.
@@ -3769,7 +3773,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"{0} priekšmets ignorēt, jo tas nav akciju postenis"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Iesniedz šo ražošanas kārtību tālākai apstrādei.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nepiemērot cenošanas Reglamenta konkrētā darījumā, visi piemērojamie Cenu noteikumi būtu izslēgta."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nepiemērot cenošanas Reglamenta konkrētā darījumā, visi piemērojamie Cenu noteikumi būtu izslēgta."
 DocType: Assessment Group,Parent Assessment Group,Parent novērtējums Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Darbs
 ,Sales Order Trends,Pasūtījumu tendences
@@ -3780,7 +3784,7 @@
 DocType: Stock Entry Detail,Additional Cost,Papildu izmaksas
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Finanšu gads beigu datums
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Izveidot Piegādātāja piedāvājumu
 DocType: Quality Inspection,Incoming,Ienākošs
 DocType: BOM,Materials Required (Exploded),Nepieciešamie materiāli (eksplodēja)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Pievienot lietotājus jūsu organizācijā, izņemot sevi"
@@ -3808,6 +3812,7 @@
 DocType: Employee,History In Company,Vēsture Company
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biļeteni
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klientu&gt; Klientu grupas&gt; Teritorija
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Same postenis ir ievadīts vairākas reizes
 DocType: Department,Leave Block List,Atstājiet Block saraksts
 DocType: Sales Invoice,Tax ID,Nodokļu ID
@@ -3817,7 +3822,7 @@
 DocType: Customer,Sales Partner and Commission,Pārdošanas Partner un Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Procentu likme (%) / gads
 ,Project Quantity,projekta daudzums
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Kopā {0} uz visiem posteņiem ir nulle, var būt jums vajadzētu mainīt &quot;Sadalīt maksa ir atkarīga no&quot;"
 DocType: Opportunity,To Discuss,Apspriediet
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} vienības {1} nepieciešama {2}, lai pabeigtu šo darījumu."
 DocType: Loan Type,Rate of Interest (%) Yearly,Procentu likme (%) Gada
@@ -3832,7 +3837,7 @@
 DocType: Purchase Invoice,Return,Atgriešanās
 DocType: Production Order Operation,Production Order Operation,Ražošanas Order Operation
 DocType: Pricing Rule,Disable,Atslēgt
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,"maksāšanas režīmā ir nepieciešams, lai veiktu maksājumu"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,"maksāšanas režīmā ir nepieciešams, lai veiktu maksājumu"
 DocType: Project Task,Pending Review,Kamēr apskats
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nevar tikt izmesta, jo tas jau ir {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Kopējo izdevumu Pretenzijas (via Izdevumu Claim)
@@ -3840,11 +3845,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Nekonstatē
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rinda {0}: valūta BOM # {1} jābūt vienādam ar izvēlētās valūtas {2}
 DocType: Journal Entry Account,Exchange Rate,Valūtas kurss
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pasūtījumu {0} nav iesniegta
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,maksa Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Pievienot preces no
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Pievienot preces no
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,regulārs
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Kopējais weightage no visiem vērtēšanas kritērijiem ir jābūt 100%
@@ -3857,7 +3862,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Noliktava {0} nepastāv
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Reģistrēties Par ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mēneša procentuālo sadalījumu
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izvēlētais objekts nevar būt partijas
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Vērtēšanas likme nav atrasts par Pozīcijas {0}, kas ir nepieciešama, lai darīt grāmatvedības ierakstus {1} {2}. Ja prece ir transakcijas kā izlases vienumu {1}, lūdzu, norādiet, ka {1} Vienības tabulā. Pretējā gadījumā, lūdzu, izveidojiet ienākošo krājumu darījumu par objektu vai pieminēt vērtēšanas likmi postenī ierakstu, un tad mēģiniet submiting / šo ierakstu atcelšana"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materiālu piegādā pret šo piegāde piezīmes
 DocType: Project,Customer Details,Klientu Details
@@ -3866,15 +3871,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Ievadiet url parametrs uztvērēja nos
 DocType: Payment Entry,Paid Amount,Samaksāta summa
 DocType: Assessment Plan,Supervisor,uzraugs
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Pieejams Stock uz iepakojuma vienības
 DocType: Item Variant,Item Variant,Postenis Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Novērtējums rezultāts Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Metāllūžņu punkts
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Iesniegtie pasūtījumus nevar izdzēst
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Kvalitātes vadība
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Prece {0} ir atspējota
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Prece {0} ir atspējota
 DocType: Employee Loan,Repay Fixed Amount per Period,Atmaksāt summu par vienu periodu
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ievadiet daudzumu postenī {0}
 DocType: Employee External Work History,Employee External Work History,Darbinieku Ārējās Work Vēsture
@@ -3901,7 +3906,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Paziņojums (dienas)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Izvēlētos objektus, lai saglabātu rēķinu"
 DocType: Employee,Encashment Date,Inkasācija Datums
 DocType: Training Event,Internet,internets
 DocType: Account,Stock Adjustment,Stock korekcija
@@ -3925,7 +3930,7 @@
 DocType: Item Variant Attribute,Attribute,Īpašība
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Lūdzu, norādiet no / uz svārstīties"
 DocType: Serial No,Under AMC,Zem AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Posteņu novērtēšana likme tiek pārrēķināts apsver izkraut izmaksu kupona summa
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Posteņu novērtēšana likme tiek pārrēķināts apsver izkraut izmaksu kupona summa
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Noklusējuma iestatījumi pārdošanas darījumu.
 DocType: Guardian,Guardian Of ,sargs
 DocType: Grading Scale Interval,Threshold,slieksnis
@@ -3935,6 +3940,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Parādzīme Izdoti
 DocType: Production Order,Warehouses,Noliktavas
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktīvu nevar nodot
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Šis postenis ir variants {0} (veidnes).
 DocType: Workstation,per hour,stundā
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,paziņojums
@@ -3950,8 +3956,8 @@
 DocType: Account,Receivable,Saņemams
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Row # {0}: Nav atļauts mainīt piegādātāju, jo jau pastāv Pasūtījuma"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Loma, kas ir atļauts iesniegt darījumus, kas pārsniedz noteiktos kredīta limitus."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Izvēlieties preces Rūpniecība
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Izvēlieties preces Rūpniecība
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master datu sinhronizācija, tas var aizņemt kādu laiku"
 DocType: Item,Material Issue,Materiāls Issue
 DocType: Hub Settings,Seller Description,Pārdevējs Apraksts
 DocType: Employee Education,Qualification,Kvalifikācija
@@ -3963,7 +3969,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pasūtīts
 DocType: Salary Detail,Component,komponents
 DocType: Assessment Criteria,Assessment Criteria Group,Vērtēšanas kritēriji Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Atklāšanas Uzkrātais nolietojums jābūt mazākam nekā vienādam ar {0}
 DocType: Warehouse,Warehouse Name,Noliktavas nosaukums
 DocType: Naming Series,Select Transaction,Izvēlieties Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ievadiet apstiprināšana loma vai apstiprināšana lietotāju
@@ -3976,7 +3982,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nevar atcelt, jo iesniegts Stock Entry {0} eksistē"
 DocType: Employee Loan,Disbursement Date,izmaksu datums
 DocType: Vehicle,Vehicle,transporta līdzeklis
 DocType: Purchase Invoice,In Words,In Words
@@ -3991,14 +3997,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktīvu vērtības kritumu un Svari
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Summa {0} {1} pārcelts no {2} līdz {3}
 DocType: Sales Invoice,Get Advances Received,Get Saņemtā Avansa
 DocType: Email Digest,Add/Remove Recipients,Add / Remove saņēmējus
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Darījums nav atļauts pret pārtrauca ražošanu Pasūtīt {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Lai uzstādītu šo taksācijas gadu kā noklusējumu, noklikšķiniet uz ""Set as Default"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pievienoties
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Trūkums Daudz
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,Item variant {0} exists with same attributes,Postenis variants {0} nepastāv ar tiem pašiem atribūtiem
 DocType: Employee Loan,Repay from Salary,Atmaksāt no algas
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Pieprasot samaksu pret {0} {1} par summu {2}
@@ -4016,7 +4022,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Novērtējums rezultāts Detail
 DocType: Employee Education,Employee Education,Darbinieku izglītība
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dublikāts postenis grupa atrodama postenī grupas tabulas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Tas ir vajadzīgs, lai atnest Papildus informācija."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Konts
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Sērijas Nr {0} jau ir saņēmis
@@ -4025,7 +4031,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Noliktava {0} nav saistīts ar jebkuru kontu, lūdzu, izveidojiet / saiti atbilstošo (aktīvs) kontu noliktavā."
 DocType: Purchase Invoice,Recurring Id,Atkārtojas Id
 DocType: Customer,Sales Team Details,Sales Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Izdzēst neatgriezeniski?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Izdzēst neatgriezeniski?
 DocType: Expense Claim,Total Claimed Amount,Kopējais pieprasītā summa
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciālie iespējas pārdot.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nederīga {0}
@@ -4036,13 +4042,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup jūsu skola ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Summa (Company valūta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nav grāmatvedības ieraksti par šādām noliktavām
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Saglabājiet dokumentu pirmās.
 DocType: Account,Chargeable,Iekasējams
 DocType: Company,Change Abbreviation,Mainīt saīsinājums
 DocType: Expense Claim Detail,Expense Date,Izdevumu Datums
 DocType: Item,Max Discount (%),Max Atlaide (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Pēdējā pasūtījuma Summa
+DocType: Task,Is Milestone,Vai Milestone
 DocType: Daily Work Summary,Email Sent To,E-pasts nosūtīts
 DocType: Budget,Warn,Brīdināt
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Jebkādas citas piezīmes, ievērības cienīgs piepūles ka jāiet ierakstos."
@@ -4063,7 +4070,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribūta vērtība
 ,Itemwise Recommended Reorder Level,Itemwise Ieteicams Pārkārtot Level
 DocType: Salary Detail,Salary Detail,alga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Lūdzu, izvēlieties {0} pirmais"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Sērija {0} no posteņa {1} ir beidzies.
 DocType: Sales Invoice,Commission,Komisija
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet for ražošanā.
@@ -4075,41 +4082,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Iesaldēt Krājumus vecākus par` jābūt mazākam par %d dienām.
 DocType: Tax Rule,Purchase Tax Template,Iegādāties Nodokļu veidne
 ,Project wise Stock Tracking,Projekts gudrs Stock izsekošana
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Uzturēšana Kalendārs {0} nepastāv pret {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiskā Daudz (pie avota / mērķa)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Darbinieku ieraksti.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Lūdzu noteikt Next Nolietojums datums
 DocType: HR Settings,Payroll Settings,Algas iestatījumi
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match nesaistītajos rēķiniem un maksājumiem.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Pasūtīt
 DocType: Email Digest,New Purchase Orders,Jauni pirkuma pasūtījumu
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root nevar būt vecāks izmaksu centru
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Izvēlēties Brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Izvēlēties Brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Uzkrātais nolietojums kā uz
 DocType: Sales Invoice,C-Form Applicable,C-Form Piemērojamais
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Darbība Time jābūt lielākam par 0 ekspluatācijai {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Noliktava ir obligāta
 DocType: Supplier,Address and Contacts,Adrese un kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Paturiet to tīmekļa draudzīgu 900px (w) ar 100px (h)
 DocType: Program,Program Abbreviation,Program saīsinājums
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ražošanas rīkojums nevar tikt izvirzīts pret Vienības Template
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Izmaksas tiek atjauninātas pirkuma čeka pret katru posteni
 DocType: Warranty Claim,Resolved By,Atrisināts Līdz
 DocType: Bank Guarantee,Start Date,Sākuma datums
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Piešķirt atstāj uz laiku.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki un noguldījumi nepareizi noskaidroti
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Izveidot klientu citātus
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Izveidot klientu citātus
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Vidējais laiks, ko piegādātājs piegādāt"
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,novērtējums rezultāts
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Stundas
 DocType: Project,Expected Start Date,"Paredzams, sākuma datums"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Noņemt objektu, ja maksa nav piemērojama šim postenim"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Darījuma valūta jābūt tāds pats kā maksājumu Gateway valūtu
 DocType: Payment Entry,Receive,Saņemt
@@ -4120,19 +4126,19 @@
 DocType: Workstation,Operating Costs,Ekspluatācijas Izmaksas
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Darbība ja uzkrātie ikmēneša budžets pārsniegts
 DocType: Purchase Invoice,Submit on creation,Iesniegt radīšanas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valūta {0} ir {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valūta {0} ir {1}
 DocType: Asset,Disposal Date,Atbrīvošanās datums
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pastu tiks nosūtīts visiem Active uzņēmuma darbiniekiem tajā konkrētajā stundā, ja viņiem nav brīvdienu. Atbilžu kopsavilkums tiks nosūtīts pusnaktī."
 DocType: Employee Leave Approver,Employee Leave Approver,Darbinieku Leave apstiprinātājs
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rinda {0}: Pārkārtot ieraksts jau eksistē šī noliktava {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nevar atzīt par zaudēto, jo citāts ir veikts."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,apmācības Atsauksmes
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Ražošanas Order {0} jāiesniedz
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Lūdzu, izvēlieties sākuma datumu un beigu datums postenim {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurss ir obligāta kārtas {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Līdz šim nevar būt agrāk no dienas
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Pievienot / rediģēt Cenas
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Pievienot / rediģēt Cenas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Batch,Parent Batch,Mātes Partijas
 DocType: Cheque Print Template,Cheque Print Template,Čeku Print Template
@@ -4146,7 +4152,7 @@
 ,Ordered Items To Be Delivered,Pasūtītās preces jāpiegādā
 DocType: Account,Income,Ienākums
 DocType: Industry Type,Industry Type,Industry Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Kaut kas nogāja greizi!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Kaut kas nogāja greizi!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,PPR {0} jau ir iesniegts
 DocType: Assessment Result Detail,Score,Score
@@ -4177,17 +4183,17 @@
 DocType: Item,Variant Based On,"Variants, kura pamatā"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Kopā weightage piešķirts vajadzētu būt 100%. Tas ir {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Jūsu Piegādātāji
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nevar iestatīt kā Lost kā tiek veikts Sales Order.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Piegādātājs daļas nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Saņemts no
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nevar atskaitīt, ja kategorija ir &quot;vērtēšanas&quot; vai &quot;Vaulation un Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Saņemts no
 DocType: Lead,Converted,Konvertē
 DocType: Item,Has Serial No,Ir Sērijas nr
 DocType: Employee,Date of Issue,Izdošanas datums
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: No {0} uz {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: No {0} uz {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Piegādātājs posteni {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rinda {0}: Stundas vērtībai ir jābūt lielākai par nulli.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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ā.
@@ -4196,20 +4202,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Norēķinu valūta ir jābūt vienādam vai nu noklusējuma comapany valūtu vai partija konta valūtā
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,atstājiet inkasācijas
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ko tas dod?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Uz noliktavu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Visas Studentu Uzņemšana
 ,Average Commission Rate,Vidēji Komisija likme
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Apmeklējumu nevar atzīmēti nākamajām datumiem
 DocType: Pricing Rule,Pricing Rule Help,Cenu noteikums Palīdzība
 DocType: School House,House Name,Māja vārds
 DocType: Purchase Taxes and Charges,Account Head,Konts Head
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrības
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Pievienojiet pārējo Jūsu organizācija, kā jūsu lietotājiem. Jūs varat pievienot arī uzaicināt klientus, lai jūsu portāla, pievienojot tos no kontaktiem"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Pievienojiet pārējo Jūsu organizācija, kā jūsu lietotājiem. Jūs varat pievienot arī uzaicināt klientus, lai jūsu portāla, pievienojot tos no kontaktiem"
 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 +348,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}"
@@ -4218,7 +4224,7 @@
 DocType: Item,Customer Code,Klienta kods
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Dzimšanas dienu atgādinājums par {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dienas Kopš pēdējā pasūtījuma
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debets kontā jābūt bilance konts
 DocType: Buying Settings,Naming Series,Nosaucot Series
 DocType: Leave Block List,Leave Block List Name,Atstājiet Block Saraksta nosaukums
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Apdrošināšanas Sākuma datums jābūt mazākam nekā apdrošināšana Beigu datums
@@ -4233,9 +4239,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Alga Slip darbinieka {0} jau radīts laiks lapas {1}
 DocType: Vehicle Log,Odometer,odometra
 DocType: Sales Order Item,Ordered Qty,Pasūtīts daudzums
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postenis {0} ir invalīds
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postenis {0} ir invalīds
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Līdz pat
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nesatur krājuma priekšmetu
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projekta aktivitāte / uzdevums.
 DocType: Vehicle Log,Refuelling Details,Degvielas uzpildes Details
@@ -4245,8 +4251,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Pēdējā pirkuma likmes nav atrasts
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Norakstīt summu (Company valūta)
 DocType: Sales Invoice Timesheet,Billing Hours,Norēķinu Stundas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Default BOM par {0} nav atrasts
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Default BOM par {0} nav atrasts
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Lūdzu noteikt pasūtīšanas daudzumu
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Pieskarieties objektus, lai pievienotu tos šeit"
 DocType: Fees,Program Enrollment,Program Uzņemšanas
 DocType: Landed Cost Voucher,Landed Cost Voucher,Izkrauti izmaksas kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lūdzu noteikt {0}
@@ -4270,7 +4277,7 @@
 DocType: Maintenance Visit,Maintenance Date,Uzturēšana Datums
 DocType: Purchase Invoice Item,Rejected Serial No,Noraidīts Sērijas Nr
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Gadu sākuma datums vai beigu datums ir pārklāšanās ar {0}. Lai izvairītos lūdzu iestatītu uzņēmumu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Sākuma datums ir jābūt mazākam par beigu datumu postenī {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.","Piemērs:. ABCD ##### Ja sērija ir iestatīts un sērijas Nr darījumos nav minēts, tad automātiskā sērijas numurs tiks veidotas, pamatojoties uz šajā sērijā. Ja jūs vienmēr vēlas skaidri norādīt Serial Nr par šo priekšmetu. šo atstāj tukšu."
 DocType: Upload Attendance,Upload Attendance,Augšupielāde apmeklējums
@@ -4347,7 +4354,6 @@
 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
-DocType: Grade Interval,Grade Interval,grade intervāls
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskālā gada sākuma datums un fiskālā gada beigu datums jau ir paredzēta fiskālā gada {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,atjaunināts klīrenss Datums
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Partijas
@@ -4394,14 +4400,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Atstājiet neieslēgtu ja nevēlaties izskatīt partiju, vienlaikus, protams, balstās grupas."
 DocType: Asset,Frequency of Depreciation (Months),Biežums nolietojums (mēneši)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kredīta konts
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kredīta konts
 DocType: Landed Cost Item,Landed Cost Item,Izkrauti izmaksu pozīcijas
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Uzstādīt vienkāršu mājas lapu manai organizācijai
 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 +666,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 +649,Please specify Attribute Value for attribute {0},"Lūdzu, norādiet īpašības Value atribūtam {0}"
 DocType: Item,Default Warehouse,Default Noliktava
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budžets nevar iedalīt pret grupas kontā {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ievadiet mātes izmaksu centru
@@ -4447,7 +4453,7 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Kredīta summa
 DocType: Cheque Print Template,Signatory Position,Parakstītājs Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Uzstādīt kā Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Uzstādīt kā Lost
 DocType: Timesheet,Total Billable Hours,Kopējais apmaksājamo stundu
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Maksājumu saņemšana Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Tas ir balstīts uz darījumiem pret šo klientu. Skatīt grafiku zemāk informāciju
@@ -4461,11 +4467,11 @@
 ,Items To Be Requested,"Preces, kas jāpieprasa"
 DocType: Purchase Order,Get Last Purchase Rate,Saņemt pēdējā pirkšanas likme
 DocType: Company,Company Info,Uzņēmuma informācija
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Izvēlieties vai pievienot jaunu klientu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Izmaksu centrs ir nepieciešams rezervēt izdevumu prasību
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Līdzekļu (aktīvu)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Tas ir balstīts uz piedalīšanos šī darbinieka
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debeta kontu
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4474,13 +4480,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,pirkuma summa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Piegādātājs Piedāvājums {0} izveidots
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Beigu gads nevar būt pirms Start gads
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Darbinieku pabalsti
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Lūdzu iestatīt noklusējuma brīvdienu sarakstu par darbinieka {0} vai Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neeksistē
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neeksistē
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nr {0}: Summa nevar būt lielāks par rezervēta summa pret Izdevumu pretenzijā {1}. Līdz Summa ir {2}
@@ -4489,15 +4495,17 @@
 DocType: Quality Inspection Reading,Reading 3,Lasīšana 3
 ,Hub,Rumba
 DocType: GL Entry,Voucher Type,Kuponu Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Cenrādis nav atrasts vai invalīds
 DocType: Employee Loan Application,Approved,Apstiprināts
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Darbinieku atvieglots par {0} ir jānosaka kā ""Kreisais"""
 DocType: Guardian,Guardian,aizbildnis
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Izvērtēšana {0} radīts Darbinieku {1} dotajā datumu diapazonā
 DocType: Employee,Education,Izglītība
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampaņas nosaukšana Līdz
 DocType: Employee,Current Address Is,Pašreizējā adrese ir
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,pārveidots
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Pēc izvēles. Komplekti uzņēmuma noklusējuma valūtu, ja nav norādīts."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Grāmatvedības dienasgrāmatas ieraksti.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Pieejams Daudz at No noliktavas
@@ -4506,7 +4514,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Party / Account nesakrīt ar {1} / {2} jo {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ievadiet izdevumu kontu
 DocType: Account,Stock,Noliktava
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type jābūt vienam no Pirkuma ordeņa, Pirkuma rēķins vai Journal Entry"
 DocType: Employee,Current Address,Pašreizējā adrese
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ja prece ir variants citā postenī, tad aprakstu, attēlu, cenas, nodokļi utt tiks noteikts no šablona, ja vien nav skaidri norādīts"
 DocType: Serial No,Purchase / Manufacture Details,Pirkuma / Ražošana Details
@@ -4534,7 +4542,7 @@
 DocType: Hub Settings,Hub Settings,Hub iestatījumi
 DocType: Project,Gross Margin %,Bruto rezerve%
 DocType: BOM,With Operations,Ar operāciju
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Grāmatvedības ieraksti jau ir veikts valūtā {0} kompānijai {1}. Lūdzu, izvēlieties saņemamo vai maksājamo konts valūtā {0}."
 DocType: Asset,Is Existing Asset,Vai esošajam aktīvam
 DocType: Salary Detail,Statistical Component,statistikas komponents
 DocType: Salary Detail,Statistical Component,statistikas komponents
@@ -4559,7 +4567,7 @@
 DocType: Assessment Plan,Room,istaba
 DocType: Purchase Order,Advance Paid,Izmaksāto avansu
 DocType: Item,Item Tax,Postenis Nodokļu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiāls piegādātājam
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiāls piegādātājam
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Akcīzes Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% parādās vairāk nekā vienu reizi
 DocType: Expense Claim,Employees Email Id,Darbinieki e-pasta ID
@@ -4590,9 +4598,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pievienojiet Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,krājumu līmeņi
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Izveidot Variantu
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Izveidot Variantu
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block atvaļinājums iesniegumi departamentā.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksājuma veids ir viens no saņemšana, Pay un Iekšējās Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Maksājuma veids ir viens no saņemšana, Pay un Iekšējās Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Grozs ir tukšs
 DocType: Vehicle,Model,modelis
@@ -4603,6 +4611,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Pamatkapitāls
+DocType: Shopping Cart Settings,Show Public Attachments,Parādīt publisko pielikumus
 DocType: Packing Slip,Package Weight Details,Iepakojuma svars Details
 DocType: Payment Gateway Account,Payment Gateway Account,Maksājumu Gateway konts
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pēc maksājuma pabeigšanas novirzīt lietotāju uz izvēlētā lapā.
@@ -4621,15 +4630,15 @@
 DocType: Batch,Expiry Date,Derīguma termiņš
 ,Supplier Addresses and Contacts,Piegādātāju Adreses un kontakti
 ,accounts-browser,konti pārlūkprogrammu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Lūdzu, izvēlieties Kategorija pirmais"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projekts meistars.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Lai ļautu pār-rēķinu vai pārāk pasūtīšana, atjaunināt &quot;pabalstu&quot; Noliktavā iestatījumi vai punktā."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nerādīt kādu simbolu, piemēram, $$ utt blakus valūtām."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Puse dienas)
 DocType: Supplier,Credit Days,Kredīta dienas
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Padarīt Student Sērija
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Padarīt Student Sērija
 DocType: Leave Type,Is Carry Forward,Vai Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dabūtu preces no BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Dabūtu preces no BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Izpildes laiks dienas
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: norīkošana datums jābūt tāds pats kā iegādes datums {1} no aktīva {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ievadiet klientu pasūtījumu tabulā iepriekš
@@ -4646,8 +4655,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Rinda {0}: debeta ierakstu nevar saistīt ar {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Lūdzu uzstādīšana numerācijas sērijas apmeklēšanu, izmantojot Setup&gt; numerācija Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 845ece7..2989cab 100644
--- a/erpnext/translations/mk.csv
+++ b/erpnext/translations/mk.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Изнајмени
 DocType: Purchase Order,PO-,поли-
 DocType: POS Profile,Applicable for User,Применливи за пристап
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Престана производството со цел да не може да биде укинат, отпушвам тоа прво да го откажете"
 DocType: Vehicle Service,Mileage,километражата
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Дали навистина сакате да ја укине оваа предност?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Одберете Default Добавувачот
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Одберете Default Добавувачот
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Е потребно валута за Ценовник {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Ќе се пресметува во трансакцијата.
 DocType: Purchase Order,Customer Contact,Контакт со клиентите
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Најдобро за {0} не може да биде помала од нула ({1})
 DocType: Manufacturing Settings,Default 10 mins,Стандардно 10 минути
 DocType: Leave Type,Leave Type Name,Остави видот на името
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Show open
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Show open
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Серија успешно ажурирани
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Плаќање
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural весник Влегување Поднесени
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Серија ставка истечен статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банкарски Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Начин на плаќање сметка
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Прикажи Варијанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Прикажи Варијанти
 DocType: Academic Term,Academic Term,академски мандат
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материјал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Кол
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Кол
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Табела со сметки не може да биде празно.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Кредити (Пасива)
 DocType: Employee Education,Year of Passing,Година на полагање
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Суд:% s, Точка Код:% s и корисници:% s"
 DocType: Item,Country of Origin,Земја на потекло
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Залиха
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,отворени прашања
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравствена заштита
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задоцнување на плаќањето (во денови)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Расходи на услуги
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Сериски број: {0} веќе е наведено во Продај фактура: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Поените
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} е потребен
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Се очекува испорака датум е да се биде пред Продај Побарувања Датум
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикачи CSV датотека со две колони, еден за старото име и еден за ново име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не во било кој активно фискална година.
 DocType: Packed Item,Parent Detail docname,Родител Детална docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Суд: {0}, Точка Код: {1} и од купувачи: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Кг
 DocType: Student Log,Log,Пријавете се
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отворање на работа.
 DocType: Item Attribute,Increment,Прираст
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Изберете Магацински ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изберете Магацински ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Рекламирање
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Истата компанија се внесе повеќе од еднаш
 DocType: Employee,Married,Брак
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не се дозволени за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Се предмети од
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не се дозволени за {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Се предмети од
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Акции не може да се ажурира против Испратница {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Нема ставки наведени
 DocType: Payment Reconciliation,Reconcile,Помират
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 DocType: Process Payroll,Make Bank Entry,Направете банка Влегување
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиски фондови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следна Амортизација датум не може да биде пред Дата на продажба
 DocType: SMS Center,All Sales Person,Сите продажбата на лице
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** ** Месечен Дистрибуција помага да се дистрибуираат на буџетот / Целна низ месеци, ако има сезоната во вашиот бизнис."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не се пронајдени производи
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Не се пронајдени производи
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Плата Структура исчезнати
 DocType: Lead,Person Name,Име лице
 DocType: Sales Invoice Item,Sales Invoice Item,Продажна Фактура Артикал
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","на пример, &quot;ОУ&quot; или &quot;Универзитетот&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,акции на извештаи
 DocType: Warehouse,Warehouse Detail,Магацински Детал
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитен лимит е преминаа за клиентите {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Термин Датум на завршување не може да биде подоцна од годината Датум на завршување на учебната година во која е поврзана на зборот (академска година {}). Ве молам поправете датумите и обидете се повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Дали е фиксни средства"" не може да е немаркирано , како што постои евиденција на средствата во однос на ставките"
 DocType: Vehicle Service,Brake Oil,кочница нафта
 DocType: Tax Rule,Tax Type,Тип на данок
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Немате дозвола за да додадете или да ги ажурирате записи пред {0}
 DocType: BOM,Item Image (if not slideshow),Точка слика (доколку не слајдшоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Постои клиентите со исто име
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час Оцени / 60) * Крај на време операција
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,изберете Бум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,изберете Бум
 DocType: SMS Log,SMS Log,SMS Влез
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Цената на испорачани материјали
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празникот на {0} не е меѓу Од датум и до денес
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,училишта
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Не остава рекорд најде за вработените {0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ве молиме внесете компанија прв
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Ве молиме изберете ја првата компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Вкупно Трошоци
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Износ барање
 DocType: Employee,Mr,Г-дин
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Дупликат група на потрошувачи пронајден во табелата на cutomer група
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Добавувачот Вид / Добавувачот
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Потрошни
 DocType: Employee,B-,Б-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,одделение
 DocType: Sales Invoice Item,Delivered By Supplier,Дадено од страна на Добавувачот
 DocType: SMS Center,All Contact,Сите Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Производството со цел веќе создадена за сите предмети со Бум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишна плата
 DocType: Daily Work Summary,Daily Work Summary,Секојдневната работа Резиме
 DocType: Period Closing Voucher,Closing Fiscal Year,Затворање на фискалната година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} е замрзнат
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} е замрзнат
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Ве молиме одберете постоечка компанија за создавање сметковниот
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Трошоци
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Одберете Целна Магацински
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Контра Влегување
 DocType: Journal Entry Account,Credit in Company Currency,Кредит во компанијата Валута
 DocType: Delivery Note,Installation Status,Инсталација Статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Дали сакате да го обновите присуство? <br> Присутни: {0} \ <br> Отсутни: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прифатени + Отфрлени Количина мора да биде еднаков Доби количество за Точка {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Снабдување на суровини за набавка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Потребна е барем еден начин за плаќање на POS фактура.
 DocType: Products Settings,Show Products as a List,Прикажи производи во облик на листа
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преземете ја Шаблон, пополнете соодветни податоци и да го прикачите по промената на податотеката. Сите датуми и вработен комбинација на избраниот период ќе дојде во дефиниција, со постоечките записи посетеност"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Направете Амортизација Влегување
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Тип на Барањето
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Направете вработените
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Направете вработените
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Емитување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Извршување
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детали за операции извршени.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План за посети одржување.
 DocType: SMS Settings,Enter url parameter for message,Внесете URL параметар за порака
 DocType: POS Profile,Customer Groups,Групи на клиентите
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,финансиски извештаи
 DocType: Guardian,Students,студентите
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила за примена на цените и попуст.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Мора да се примени Ценовник за Купување или Продажба
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Однапред сума не може да биде поголема од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за оваа трансакција
 DocType: Company,Default Payroll Payable Account,Аватарот на Даноци се плаќаат сметка
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Ажурирање на е-мејл група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Ажурирање на е-мејл група
 DocType: Sales Invoice,Is Opening Entry,Се отвора Влегување
 DocType: Customer Group,Mention if non-standard receivable account applicable,Да се наведе ако нестандардни побарувања сметка за важечките
 DocType: Course Schedule,Instructor Name,инструктор Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,За Магацински се бара пред Поднесете
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,Препродавач
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако е избрано, ќе ги вклучува не-акции ставки во материјалот барања."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Во однос на ставка од Продажна фактура
 ,Production Orders in Progress,Производство налози во прогрес
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето паричен тек од финансирањето
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage е полна, не штедеше"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додади неискористени листови од претходните алокации
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следна Повторувачки {0} ќе се креира {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Вкупно Износ на трошоци (преку време лист)
 DocType: Item Website Specification,Item Website Specification,Точка на вебсајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Остави блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банката записи
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Точка {0} достигна својот крај на животот на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Банката записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Годишен
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Акции помирување Точка
 DocType: Stock Entry,Sales Invoice No,Продажна Фактура Бр.
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Објави во Hub
 DocType: Student Admission,Student Admission,за прием на студентите
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Точка {0} е откажана
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Материјал Барање
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Точка {0} е откажана
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Материјал Барање
 DocType: Bank Reconciliation,Update Clearance Date,Ажурирање Чистење Датум
 DocType: Item,Purchase Details,Купување Детали за
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Точка {0} не се најде во &quot;суровини испорачува&quot; маса во нарачката {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Најдобро Чекови и депозити да се расчисти
 DocType: Item,Synced With Hub,Синхронизираат со Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може да биде негативен за ставката {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Погрешна лозинка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може да биде негативен за ставката {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Погрешна лозинка
 DocType: Item,Variant Of,Варијанта на
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Завршено Количина не може да биде поголем од &quot;Количина на производство&quot;
 DocType: Period Closing Voucher,Closing Account Head,Завршната сметка на главата
 DocType: Employee,External Work History,Надворешни Историја работа
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Кружни Суд Грешка
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Да го извести преку е-пошта на создавање на автоматски материјал Барање
 DocType: Journal Entry,Multi Currency,Мулти Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип на фактура
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Потврда за испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Потврда за испорака
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Поставување Даноци
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Трошоци на продадени средства
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Плаќање Влегување е изменета откако ќе го влечат. Ве молиме да се повлече повторно.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
-DocType: Grade Interval,Min Score,мин рејтинг
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} влезе двапати во ставка Данок
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,"Резимето на оваа недела, а во очекување на активности"
 DocType: Student Applicant,Admitted,призна
 DocType: Workstation,Rent Cost,Изнајмување на трошоците
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,цел вредност
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банка / Готовински трансакции од страна или за внатрешен трансфер
 DocType: Shipping Rule,Valid for Countries,Важат за земјите
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Оваа содржина е моделот и не може да се користи во трансакциите. Точка атрибути ќе бидат копирани во текот на варијанти освен ако е &quot;Не Копирај&quot; е поставена
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Вкупно Разгледани Нарачки
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ознака за вработените (на пример, извршен директор, директор итн)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ве молиме внесете &quot;Повторување на Денот на месец областа вредност
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: Набавка фактура не може да се направи против постоечко средство {1}
 DocType: Item Tax,Tax Rate,Даночна стапка
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} веќе наменети за вработените {1} за период {2} до {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Одберете ја изборната ставка
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Одберете ја изборната ставка
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Купување на фактура {0} е веќе поднесен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серија Не мора да биде иста како {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претворат во не-групата
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Серија (дел) од една ставка.
 DocType: C-Form Invoice Detail,Invoice Date,Датум на фактурата
 DocType: GL Entry,Debit Amount,Износ дебитна
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може да има само 1 профил на компанијата во {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ве молиме погледнете приврзаност
 DocType: Purchase Order,% Received,% Доби
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Креирај студентски групи
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Барање за прибирање НА ПОНУДИ
 DocType: Salary Slip Timesheet,Working Hours,Работно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промените почетниот / тековниот број на секвенца на постоечки серија.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Креирај нов клиент
-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.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Создаде купување на налози
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Креирај нов клиент
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако има повеќе Правила Цените и понатаму преовладуваат, корисниците се бара да поставите приоритет рачно за решавање на конфликтот."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Создаде купување на налози
 ,Purchase Register,Купување Регистрирај се
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Се применува Давачки
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора да имаат улога &quot;Остави Approver&quot;
 DocType: Purchase Receipt,Vehicle Date,Датум на возилото
 DocType: Student Log,Medical,Медицинска
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина за губење
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Причина за губење
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Водечкиот сопственикот не може да биде ист како олово
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Распределени износ може да не е поголема од износот нерегулиран
 DocType: Announcement,Receiver,приемник
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и брзина
 DocType: Delivery Note,% Installed,% Инсталирана
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Училници / лаборатории итн, каде што можат да бидат закажани предавања."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ве молиме внесете го името на компанијата прв
 DocType: Purchase Invoice,Supplier Name,Добавувачот Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте го упатството ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Задолжително поле - академска година
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Задолжително поле - академска година
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Персонализација на воведниот текст што оди како дел од е-мејл. Секоја трансакција има посебна воведен текст.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Поставете стандардно треба да се плати сметка за компанијата {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобалните поставувања за сите производствени процеси.
 DocType: Accounts Settings,Accounts Frozen Upto,Сметки замрзнати до
 DocType: SMS Log,Sent On,Испрати на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} одбрани неколку пати во атрибути на табелата
 DocType: HR Settings,Employee record is created using selected field. ,Рекорд вработен е креирана преку избрани поле.
 DocType: Sales Order,Not Applicable,Не е применливо
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Одмор господар.
 DocType: Request for Quotation Item,Required Date,Бараниот датум
 DocType: Delivery Note,Billing Address,Платежна адреса
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ве молиме внесете Точка законик.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ве молиме внесете Точка законик.
 DocType: BOM,Costing,Чини
 DocType: Tax Rule,Billing County,округот платежна
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако е обележано, износот на данокот што ќе се смета како веќе се вклучени во Print Оцени / Печатење Износ"
@@ -507,6 +511,7 @@
 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,Хартии од вредност и депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не може да го смените начинот на вреднување, како што постојат трансакции против некои предмети кои не го имаат свој метод на вреднување"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Вкупно Отсуства распределени е задолжително
 DocType: Job Opening,Description of a Job Opening,Опис на работно место
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Во очекување на активности за денес
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Ве молиме изберете курсот
 DocType: Timesheet Detail,Hrs,часот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Ве молиме изберете ја компанијата
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Ве молиме изберете ја компанијата
 DocType: Stock Entry Detail,Difference Account,Разликата профил
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Не може да се затвори задача како свој зависни задача {0} не е затворена.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ве молиме внесете Магацински за кои ќе се зголеми материјал Барање
 DocType: Production Order,Additional Operating Cost,Дополнителни оперативни трошоци
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","За да се логирате, следниве својства мора да биде иста за двата предмети"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Итни Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Размислете за купување
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ве молиме да се дефинира одделение за Праг 0%
 DocType: Sales Order,To Deliver,За да овозможи
 DocType: Purchase Invoice Item,Item,Точка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Сериски број ставка не може да биде дел
 DocType: Journal Entry,Difference (Dr - Cr),Разлика (Д-р - Cr)
 DocType: Account,Profit and Loss,Добивка и загуба
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управување Склучување
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Зголемување не може да биде 0
 DocType: Production Planning Tool,Material Requirement,Материјал Потребно
 DocType: Company,Delete Company Transactions,Избриши компанијата Трансакции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Референтен број и референтен датум е задолжително за банкарски трансакции
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додај / Уреди даноци и такси
 DocType: Purchase Invoice,Supplier Invoice No,Добавувачот Фактура бр
 DocType: Territory,For reference,За референца
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Забелешка Точка
 DocType: Production Plan Item,Pending Qty,Во очекување на Количина
 DocType: Budget,Ignore,Игнорирај
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не е активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не е активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},СМС испратен до следните броеви: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,проверка подесување димензии за печатење
 DocType: Salary Slip,Salary Slip Timesheet,Плата фиш timesheet
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Вкупно Маргина
 DocType: Pricing Rule,Sales Partner,Продажбата партнер
 DocType: Buying Settings,Purchase Receipt Required,Купување Прием Потребно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Вреднување курс е задолжително ако влезе отворање на Акции
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не се пронајдени во табелата Фактура рекорди
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Ве молиме изберете компанија и Партијата Тип прв
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансиски / пресметковната година.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Акумулирана вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","За жал, сериски броеви не можат да се спојат"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Направи Продај Побарувања
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Направи Продај Побарувања
 DocType: Project Task,Project Task,Проектна задача
 ,Lead Id,Потенцијален клиент Id
 DocType: C-Form Invoice Detail,Grand Total,Сѐ Вкупно
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,продолжи Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Повтори клиенти
 DocType: Leave Control Panel,Allocate,Распредели
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажбата Враќање
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Продажбата Враќање
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Забелешка: Вкупно распределени лисја {0} не треба да биде помал од веќе одобрен лисја {1} за периодот
 DocType: Announcement,Posted By,Испратено од
 DocType: Item,Delivered by Supplier (Drop Ship),Дадено од страна на Добавувачот (Капка Брод)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Понуда за
 DocType: Lead,Middle Income,Среден приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Отворање (ЦР)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Распределени износ не може да биде негативен
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ве молиме да се постави на компанијата
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ве молиме да се постави на компанијата
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продај фактура timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Референтен број и референтен датум е потребно за {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Изберете Account плаќање да се направи банка Влегување
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Креирај вработен евиденција за управување со лисја, барања за трошоци и плати"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додади во База на знаење
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Пишување предлози
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаќање за влез Одбивање
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;не во фискалната {2}
 DocType: Buying Settings,Settings for Buying Module,Поставки за купување Модул
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Асет {0} не му припаѓа на компанијата {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Ве молиме внесете Набавка Потврда прв
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Потоа цени Правила се филтрирани врз основа на клиент, група на потрошувачи, територија, Добавувачот, Набавувачот Тип на кампањата, продажба партнер итн"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Нето промени во Инвентар
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Вработен за управување со кредит
 DocType: Employee,Passport Number,Број на пасош
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Врска со Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менаџер
 DocType: Payment Entry,Payment From / To,Плаќање од / до
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Период
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нов кредитен лимит е помала од сегашната преостанатиот износ за клиентите. Кредитен лимит мора да биде барем {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; не може да биде ист
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,Во минути
 DocType: Issue,Resolution Date,Резолуцијата Датум
 DocType: Student Batch Name,Batch Name,Име на серијата
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet е основан:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet е основан:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ве молиме да поставите основен готовина или Банкарска сметка во начинот на плаќање {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,запишат
 DocType: Selling Settings,Customer Naming By,Именувањето на клиентите со
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ќе се покаже на ученикот како Присутни во Студентски Публика Месечен извештај
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Старт на проектот Време
 DocType: BOM Operation,Operation Time,Операција Време
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Заврши
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,база
 DocType: Timesheet,Total Billed Hours,Вкупно Опишан часа
 DocType: Journal Entry,Write Off Amount,Отпише Износ
 DocType: Journal Entry,Bill No,Бил Не
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,студентски Публика
 DocType: Sales Invoice Timesheet,Time Sheet,време лист
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Суровини врз основа на
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ве молиме внесете детали ставка
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ве молиме внесете детали ставка
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,пред продажбата
 DocType: Purchase Receipt,Other Details,Други детали
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Плаќање Влегување веќе е создадена
 DocType: Purchase Receipt Item Supplied,Current Stock,Тековни берза
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: {1} средства не се поврзани со Точка {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Преглед Плата фиш
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Преглед Плата фиш
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Сметка {0} е внесен повеќе пати
 DocType: Account,Expenses Included In Valuation,Трошоци Вклучени Во Вреднување
 DocType: Hub Settings,Seller City,Продавачот на градот
 ,Absent Student Report,Отсутни Студентски извештај
 DocType: Email Digest,Next email will be sent on:,Следната е-мејл ќе бидат испратени на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда писмо Рок
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Ставка има варијанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Ставка има варијанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Точка {0} не е пронајдена
 DocType: Bin,Stock Value,Акции вредност
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанијата {0} не постои
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Тип на дрвото
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Тип на дрвото
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Количина Потрошена по единица
 DocType: Serial No,Warranty Expiry Date,Гаранција датумот на истекување
 DocType: Material Request Item,Quantity and Warehouse,Кол и Магацински
 DocType: Sales Invoice,Commission Rate (%),Комисијата стапка (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Ве молиме одберете програма
 DocType: Project,Estimated Cost,Проценетите трошоци
@@ -768,7 +770,7 @@
 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,Стандардно профил
 DocType: Payment Entry,Received Amount (Company Currency),Добиениот износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Мора да се креира Потенцијален клиент ако Можноста е направена од Потенцијален клиент
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Ве молиме изберете неделно слободен ден
 DocType: Production Order Operation,Planned End Time,Планирани Крај
 ,Sales Person Target Variance Item Group-Wise,Продажбата на лице Целна група Варијанса точка-wise
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Можност од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечен извештај плата.
 DocType: BOM,Website Specifications,Веб-страница Спецификации
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} од типот на {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор на конверзија е задолжително
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Банката A / C број
 DocType: Bank Guarantee,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Читање 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,делумно подредено
 DocType: Expense Claim Detail,Expense Claim Type,Сметка побарувањето Вид
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Стандардните поставувања за Кошничка
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Средства укинати преку весник Влегување {0}
@@ -825,14 +829,14 @@
 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 +107,Office Maintenance Expenses,Канцеларија Одржување трошоци
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Поставување на e-mail сметка
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ве молиме внесете стварта прв
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ве молиме внесете стварта прв
 DocType: Account,Liability,Одговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционирани сума не може да биде поголема од Тврдат Износ во ред {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,Ценовник не е избрано
 DocType: Employee,Family Background,Семејно потекло
 DocType: Request for Quotation Supplier,Send Email,Испрати E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Предупредување: Невалиден прилог {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Нема дозвола
 DocType: Company,Default Bank Account,Стандардно банкарска сметка
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","За филтрирање врз основа на партија, изберете партија Тип прв"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не се пронајдени вработен
 DocType: Supplier Quotation,Stopped,Запрен
 DocType: Item,If subcontracted to a vendor,Ако иницираат да продавач
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Група на студенти веќе се ажурираат.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Група на студенти веќе се ажурираат.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Група на студенти веќе се ажурираат.
 DocType: SMS Center,All Customer Contact,Сите корисници Контакт
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Внеси акции рамнотежа преку CSV.
 DocType: Warehouse,Tree Details,Детали за дрво
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минималниот износ на фактура
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Цена Центар {2} не припаѓа на компанијата {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Сметка {2} не може да биде група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Точка ред IDX {}: {DOCTYPE} {docname} не постои во над &quot;{DOCTYPE}&quot; маса
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} е веќе завршен проект или откажани
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Не задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","На ден од месецот на кој авто фактура ќе биде генериранa на пример 05, 28 итн"
 DocType: Asset,Opening Accumulated Depreciation,Отворање Акумулирана амортизација
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,Преселба Просечна стапка
 DocType: Production Planning Tool,Select Items,Одбирајте ги изборните ставки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} од Бил {1} датум {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Распоред на курсот
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Распоред на курсот
 DocType: Maintenance Visit,Completion Status,Проектот Статус
 DocType: HR Settings,Enter retirement age in years,Внесете пензионирање возраст во години
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целна Магацински
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволете врз доставувањето или приемот до овој процент
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Увоз Публика
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Сите групи на ставки
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Сите групи на ставки
 DocType: Process Payroll,Activity Log,Активност Влез
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нето добивка / загуба
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматски компонира порака на поднесување на трансакции.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Нарачка на плаќање
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Проектирани Количина
 DocType: Sales Invoice,Payment Due Date,Плаќање најдоцна до Датум
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Ставка Варијанта {0} веќе постои со истите атрибути
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Отворање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Отворете го направите
 DocType: Notification Control,Delivery Note Message,Испратница порака
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Повторно да Количина
 DocType: Leave Block List Date,Leave Block List Date,Остави Забрани Листа Датум
 DocType: Pricing Rule,Price or Discount,Цена или попуст
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Вкупно применливи давачки во Набавка Потврда Предмети маса мора да биде иста како и вкупните даноци и давачки
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Вкупно применливи давачки во Набавка Потврда Предмети маса мора да биде иста како и вкупните даноци и давачки
 DocType: Sales Team,Incentives,Стимулации
 DocType: SMS Log,Requested Numbers,Бара броеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Добивање само суровини
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Се дава под договор
 DocType: Item Attribute,Item Attribute Values,Точка атрибут вредности
 DocType: Examination Result,Examination Result,испитување резултат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Купување Потврда
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Купување Потврда
 ,Received Items To Be Billed,Примените предмети да бидат фактурирани
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Поднесени исплатните листи
 DocType: Employee,Ms,Г-ѓа
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Валута на девизниот курс господар.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Суд DOCTYPE мора да биде еден од {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Суд DOCTYPE мора да биде еден од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Не можам да најдам временски слот во следните {0} денови за работа {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за потсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продај Партнери и територија
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,не може автоматски да креирате сметка што веќе има акции биланс на сметката. Мора да се создаде појавување на сметка пред да може да се направи влез на овој магацин
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Стандардно Обврски
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Вработен {0} не е активна или не постои
 DocType: Fee Structure,Components,делови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Точка Варијанти {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ве молиме внесете Категорија средства во точка {0}
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Не може да се {0} {1} {2} без никакви негативни извонредна фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Купување на фактура напредување
 DocType: Hub Settings,Sync Now,Sync Сега
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ред {0}: Кредитни влез не можат да бидат поврзани со {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,Е Набавка Точка
 DocType: Asset,Purchase Invoice,Купување на фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детална Не
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Нов почеток на продажбата на фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Нов почеток на продажбата на фактура
 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,Датум на отворање и затворање Датум треба да биде во рамките на истата фискална година
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Датум на отворање и затворање Датум треба да биде во рамките на истата фискална година
 DocType: Lead,Request for Information,Барање за информации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Офлајн Фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Офлајн Фактури
 DocType: Payment Request,Paid,Платени
 DocType: Program Fee,Program Fee,Надомест програма
 DocType: Salary Slip,Total in words,Вкупно со зборови
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,санкционирани
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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.","За предмети од ""Пакет производ"", Складиште, сериски број и Batch нема да се смета од табелата ""Паковна Листа"". Ако магацински и Batch број не се исти за сите ставки за пакување во ""Пакет производи"", тие вредности може да се внесат во главната табела со ставки, вредностите ќе бидат копирани во табелата ""Паковна Листа""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","За предмети од ""Пакет производ"", Складиште, сериски број и Batch нема да се смета од табелата ""Паковна Листа"". Ако магацински и Batch број не се исти за сите ставки за пакување во ""Пакет производи"", тие вредности може да се внесат во главната табела со ставки, вредностите ќе бидат копирани во табелата ""Паковна Листа""."
 DocType: Job Opening,Publish on website,Објавуваат на веб-страницата
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Пратки на клиентите.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Датум на Добавувачот фактура не може да биде поголем од објавувањето Датум
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Варијанса
 ,Company Name,Име на компанијата
 DocType: SMS Center,Total Message(s),Вкупно пораки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Одберете ја изборната ставка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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 главата на банката во која е депониран чек.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ред {0}: Плаќање против продажба / нарачка секогаш треба да бидат означени како однапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хемиски
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Аватарот на банка / готовинска сметка ќе се ажурира автоматски во Плата весник Влегување кога е избран овој режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервалите за Степен законик {0} поклопува со интервали одделение за другите одделенија. Ве молиме проверете интервали {0} и {1} и обидете се повторно
 DocType: BOM,Raw Material Cost(Company Currency),Суровина Цена (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Сите ставки се веќе префрлени за оваа нарачка за производство.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ред # {0}: стапка не може да биде поголема од стапката користи во {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM на вебсајт ставки
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Внеси писмо главата и логото. (Можете да ги менувате подоцна).
 DocType: Timesheet Detail,Bill,Бил
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следна Амортизација Регистриран е внесен како со поминат рок
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бела
 DocType: SMS Center,All Lead (Open),Сите Потенцијални клиенти (Отворени)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина не се достапни за {4} во магацин {1} на објавување времето на стапување ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Се Напредокот Платени
 DocType: Item,Automatically Create New Batch,Автоматски Креирај нова серија
 DocType: Item,Automatically Create New Batch,Автоматски Креирај нова серија
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Направете
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Направете
 DocType: Student Admission,Admission Start Date,Услови за прием Дата на започнување
 DocType: Journal Entry,Total Amount in Words,Вкупен износ со зборови
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Се случи грешка. Можеби не сте ја зачувале формата. Ве молиме контактирајте не на support@erpnext.com ако проблемот продолжи.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,Отворање Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ве молиме внесете го за промени Износ
 DocType: Student Batch Name,Student Batch Name,Студентски Серија Име
 DocType: Holiday List,Holiday List Name,Одмор Листа на Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс на кредит Износ
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ве молиме наведете {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Отстранет предмети без промена во количината или вредноста.
 DocType: Delivery Note,Delivery To,Испорака на
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут маса е задолжително
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут маса е задолжително
 DocType: Production Planning Tool,Get Sales Orders,Земете Продај Нарачка
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може да биде негативен
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Вкупен број на амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
 DocType: Sales Invoice Item,Rate With Margin,Стапка со маргина
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Задржани Магацински во Продај Побарувања / готови производи Магацински
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Продажба Износ
 DocType: Repayment Schedule,Interest Amount,Износот на каматата
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја &quot;статус&quot; и заштеди
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Вие сте на сметка Approver за овој запис. Ве молиме инсталирајте ја &quot;статус&quot; и заштеди
 DocType: Serial No,Creation Document No,Документот за создавање Не
 DocType: Issue,Issue,Прашање
 DocType: Asset,Scrapped,укинат
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за точка варијанти. на пример, големината, бојата и др"
 DocType: Purchase Invoice,Returns,Се враќа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Магацински
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Сериски № {0} е под договор за одржување до {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,вработување
 DocType: Lead,Organization Name,Име на организацијата
 DocType: Tax Rule,Shipping State,Превозот држава
 ,Projected Quantity as Source,Проектирани Кол како Извор
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора да се додаде со користење на &quot;се предмети од Набавка Разписки&quot; копчето
 DocType: Employee,A-,А-
 DocType: Production Planning Tool,Include non-stock items,Вклучуваат не-акции предмети
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Трошоци за продажба
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,Стандарден Продажен трошочен центар
 DocType: Sales Partner,Implementation Partner,Партнер имплементација
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Поштенски
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Поштенски
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Продај Побарувања {0} е {1}
 DocType: Opportunity,Contact Info,Контакт инфо
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Акции правење записи
 DocType: Packing Slip,Net Weight UOM,Нето тежина UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Резултати
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Резултати
 DocType: Item,Default Supplier,Стандардно Добавувачот
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Во текот на производство Додаток Процент
 DocType: Employee Loan,Repayment Schedule,Распоред на отплата
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Земете Неделен Off Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Датум на крајот не може да биде помал од Почеток Датум
 DocType: Sales Person,Select company name first.,Изберете името на компанијата во прв план.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Д-р
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Д-р
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Понуди добиени од Добавувачи.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просечна возраст
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Основна област на ефикасноста
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Превоз
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Невалиден Атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} мора да се поднесе
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} мора да се поднесе
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количините може да биде помалку од или еднакво на {0}
 DocType: SMS Center,Total Characters,Вкупно Карактери
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Ве молиме изберете Бум Бум во полето за предмет {0}
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа за испорака Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производство на налози {0} мора да биде укинат пред да го раскине овој Продај Побарувања
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Ве молиме да се постави на &quot;Примени Дополнителни попуст на &#39;
 ,Ordered Items To Be Billed,Нареди ставки за да бидат фактурирани
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од опсег мора да биде помала од на опсег
 DocType: Global Defaults,Global Defaults,Глобална Стандардни
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Почетна година
 DocType: Purchase Invoice,Start date of current invoice's period,Датум на почеток на периодот тековната сметка е
 DocType: Salary Slip,Leave Without Pay,Неплатено отсуство
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Капацитет Грешка планирање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Капацитет Грешка планирање
 ,Trial Balance for Party,Судскиот биланс за партија
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Приходи
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ова ќе биде додаден на Кодексот точка на варијанта. На пример, ако вашиот кратенката е &quot;СМ&quot; и кодот на предметот е &quot;Т-маица&quot;, кодот го ставка на варијанта ќе биде &quot;Т-маица-СМ&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плати (со зборови) ќе биде видлив откако ќе ја зачувате фиш плата.
 DocType: Purchase Invoice,Is Return,Е враќање
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Враќање / задолжување
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Враќање / задолжување
 DocType: Price List Country,Price List Country,Ценовник Земја
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} валидна сериски броеви за ставката {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ве молиме внесете Точка законик за да се добие број на серијата
 DocType: Stock Settings,Default Item Group,Стандардно Точка група
 DocType: Employee Loan,Partially Disbursed,делумно исплатени
-DocType: Grading Structure,Grading System Name,Име на систем на оценување
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдувач база на податоци.
 DocType: Account,Balance Sheet,Биланс на состојба
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Цена центар за предмет со точка законик &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Начин на плаќање не е конфигуриран. Ве молиме проверете, дали сметка е поставен на режим на пари или на POS профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Продажбата на лицето ќе добиете потсетување на овој датум да се јавите на клиент
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Истата ставка не може да се внесе повеќе пати.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Понатаму сметки може да се направи под Групи, но записи може да се направи врз несрпското групи"
@@ -1204,7 +1204,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Акции Леџер записи и GL записи се објавува за избраниот Набавка Разписки
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Акции Леџер записи и GL записи се објавува за избраниот Набавка Разписки
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Точка 1
 DocType: Holiday,Holiday,Празник
 DocType: Support Settings,Close Issue After Days,Затвори прашање по денови
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Работата е завршена
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ве молиме да наведете барем еден атрибут во табелата атрибути
 DocType: Announcement,All Students,сите студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Ставка {0} мора да биде не-складишни ставки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Ставка {0} мора да биде не-складишни ставки
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Види Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Први
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Ставка група постои со истото име, Ве молиме да се промени името на точка или преименувате групата точка"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Студентски мобилен број
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Исплата на плата од {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Кои не се овластени да ги уредувате замрзната сметка {0}
 DocType: Journal Entry,Get Outstanding Invoices,Земете ненаплатени фактури
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Продај Побарувања {0} не е валиден
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Купување на налози да ви помогне да планираат и да се надоврзе на вашите купувања
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","За жал, компаниите не можат да се спојат"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",вкупната количина на прашањето / Трансфер {0} во Материјал Барање {1} \ не може да биде поголема од бараната количина {2} за ставката {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Мали
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Индиректни трошоци
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ред {0}: Количина е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Земјоделството
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync мајстор на податоци
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync мајстор на податоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Вашите производи или услуги
 DocType: Mode of Payment,Mode of Payment,Начин на плаќање
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Веб-страница на слика треба да биде јавен датотеката или URL на веб страната
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,BOM (Список на материјали)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ова е корен елемент група и не може да се уредува.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Група тек број
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитни сметки може да се поврзат против друг запис дебитна"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Вкупниот износ на сите задача тежина треба да биде 1. Ве молиме да се приспособат тежини на сите задачи на проектот соодветно
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Испратница {0} не е поднесен
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; поле, која може да биде точка, точка група или бренд."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цените правило е првата избрана врз основа на &quot;Apply On&quot; поле, која може да биде точка, точка група или бренд."
 DocType: Hub Settings,Seller Website,Продавачот веб-страница
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Вкупно одобрени процентот за продажбата на тимот треба да биде 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Производство статус е {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Производство статус е {0}
 DocType: Appraisal Goal,Goal,Цел
 DocType: Sales Invoice Item,Edit Description,Измени Опис
 ,Team Updates,тим Новости
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,За Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,За Добавувачот
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Поставување тип на сметка помага во изборот на оваа сметка во трансакции.
 DocType: Purchase Invoice,Grand Total (Company Currency),Сѐ Вкупно (Валута на Фирма)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Креирај печати формат
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,Весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ставки во тек
 DocType: Workstation,Workstation Name,Работна станица Име
-DocType: Grade Interval,Grade Code,одделение законик
+DocType: Grading Scale Interval,Grade Code,одделение законик
 DocType: POS Item Group,POS Item Group,ПОС Точка група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail билтени:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не му припаѓа на идентот {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Хардвер
 DocType: Sales Order,Recurring Upto,Повторувачки Upto
 DocType: Attendance,HR Manager,Менаџер за човечки ресурси
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ве молиме изберете една компанија
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ве молиме изберете една компанија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегија Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Добавувачот датум на фактурата
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вие треба да им овозможи на Корпа
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Храна
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Стареењето опсег од 3
 DocType: Maintenance Schedule Item,No of Visits,Број на посети
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},"Одржување распоред {0} постои се против, {1}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Запишувањето на студентите
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута на завршната сметка мора да биде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир на бодови за сите цели треба да бидат 100. Тоа е {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ср Дневен заминување
 DocType: POS Profile,Campaign,Кампања
 DocType: Supplier,Name and Type,Име и вид
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Одобрување статус мора да биде &#39;одобрена&#39; или &#39;Одбиен&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Одобрување статус мора да биде &#39;одобрена&#39; или &#39;Одбиен&#39;
 DocType: Purchase Invoice,Contact Person,Лице за контакт
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекуваниот почетен датум"" не може да биде поголем од 'очекуван краен датум """
 DocType: Course Scheduling Tool,Course End Date,Курс Датум на завршување
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Адреса за Испорака Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Сметковниот план
 DocType: Material Request,Terms and Conditions Content,Услови и правила Содржина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може да биде поголема од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,не може да биде поголема од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Ставка {0} не е складишна ставка
 DocType: Maintenance Visit,Unscheduled,Непланирана
 DocType: Employee,Owned,Сопственост
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи неплатено отсуство
 DocType: Pricing Rule,"Higher the number, higher the priority","Повисок број, поголем приоритет"
 ,Purchase Invoice Trends,Купување на фактура трендови
 DocType: Employee,Better Prospects,Подобри можности
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","На редот бр # {0}: на серијата {1} има само {2} Количина. Ве молам изберете друга серија која има на располагање {3} Количина или поделени на ред во повеќе редови, да ја испорача / прашање од повеќе серии"
 DocType: Vehicle,License Plate,Табличка
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ Статус
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Вработените не можат да известуваат за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Ако на сметката е замрзната, записи им е дозволено да ограничено корисници."
 DocType: Email Digest,Bank Balance,Банката биланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Сметководство за влез на {0}: {1} може да се направи само во валута: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Работа профил, потребните квалификации итн"
 DocType: Journal Entry Account,Account Balance,Баланс на сметка
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Правило данок за трансакции.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Прикажи незатворени фискална година L салда на P &amp;
 DocType: Shipping Rule,Shipping Account,Испорака на профилот
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Сметка {2} е неактивен
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Направете Продај Нарачка да ви помогне да планирате вашата работа и дава на време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Направете Продај Нарачка да ви помогне да планирате вашата работа и дава на време
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Вкупно Дополнителни трошоци
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,На вредноста
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Пакување фиш
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Пакување фиш
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Канцеларијата изнајмување
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Поставките за поставка на SMS портал
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз Не успеав!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,Е-пошта Плата лизга на вработените
 DocType: Cost Center,Parent Cost Center,Родител цена центар
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Изберете Можни Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Изберете Можни Добавувачот
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Прикажи затворени
 DocType: Leave Type,Is Leave Without Pay,Е неплатено отсуство
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категорија средства е задолжително за ставка од основните средства
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не се пронајдени во табелата за платен записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} конфликти со {1} и {2} {3}
 DocType: Student Attendance Tool,Students HTML,студентите HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,Дата на Оставањето
 DocType: Pricing Rule,For Price List,За Ценовник
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Извршниот Барај
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Креирај води
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Креирај води
 DocType: Maintenance Schedule,Schedules,Распоред
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детален број
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Програмата запишувања
 DocType: Sales Invoice Item,Brand Name,Името на брендот
 DocType: Purchase Receipt,Transporter Details,Транспортерот Детали
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Потребен е стандарден магацин за избраната ставка
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Кутија
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,можни Добавувачот
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,можни Добавувачот
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организацијата
 DocType: Budget,Monthly Distribution,Месечен Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Листа на приемник е празна. Ве молиме да се создаде листа ресивер
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Продажбата партнер Целна
 DocType: Loan Type,Maximum Loan Amount,Максимален заем Износ
 DocType: Pricing Rule,Pricing Rule,Цените Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicate број ролна за ученикот {0}
 DocType: Budget,Action if Annual Budget Exceeded,Акција доколку годишниот буџет пречекорување
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материјал Барање за нарачка
 DocType: Shopping Cart Settings,Payment Success URL,Плаќање успех URL
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,Начин на отплата
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако е означено, на почетната страница ќе биде стандардно Точка група за веб-страницата на"
 DocType: Quality Inspection Reading,Reading 4,Читање 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Аватарот на бирото за {0} не е пронајден за Проектот {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Аватарот на бирото за {0} не е пронајден за Проектот {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Барања за сметка на компанијата.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студентите се во центарот на системот, да додадете сите ваши студенти"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студентите се во центарот на системот, да додадете сите ваши студенти"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: датум Чистење {1} не може да биде пред Чек Датум {2}
 DocType: Company,Default Holiday List,Стандардно летни Листа
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од време и на време од {1} е се преклопуваат со {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ден (а) на која аплицирате за дозвола се одмори. Вие не треба да аплицираат за одмор.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Препратат на плаќање E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,нова задача
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направете цитат
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направете цитат
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,други извештаи
 DocType: Dependent Task,Dependent Task,Зависни Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Фактор на конверзија за стандардно единица мерка мора да биде 1 во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Отсуство од типот {0} не може да биде подолг од {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Обидете се планира операции за X дена однапред.
 DocType: HR Settings,Stop Birthday Reminders,Стоп роденден потсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Поставете Стандардна Даноци се плаќаат сметка во Друштвото {0}
 DocType: SMS Center,Receiver List,Листа на примачот
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Барај точка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Барај точка
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Конзумира Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промени во Пари
 DocType: Assessment Plan,Grading Scale,скала за оценување
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,веќе завршени
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица мерка {0} е внесен повеќе од еднаш во конверзија Фактор Табела
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,веќе завршени
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Веќе постои плаќање Барам {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Цената на издадени материјали
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Кол не смее да биде повеќе од {0}
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Направете исплата Влегување
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Адванс против Добавувачот мора да се задолжи
 DocType: Company,Default Values,Стандардни вредности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Фреквенција} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Вкупен износ Надоместени
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ова се базира на логови против ова возило. Види времеплов подолу за детали
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Собери
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против Добавувачот Фактура {0} датум {1}
 DocType: Customer,Default Price List,Стандардно Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,рекорд движење средства {0} создадена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,рекорд движење средства {0} создадена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Не може да избришете фискалната {0}. Фискалната година {0} е поставена како стандардна во глобалните поставувања
 DocType: Journal Entry,Entry Type,Тип на влез
 ,Customer Credit Balance,Клиент кредитна биланс
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ниту еден од предметите имаат каква било промена во количината или вредноста.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Задолжително поле - Програма
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Задолжително поле - Програма
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Гаранција побарување
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Гаранција побарување
 ,Lead Details,Детали за Потенцијален клиент
 DocType: Salary Slip,Loan repayment,отплата на кредитот
 DocType: Purchase Invoice,End date of current invoice's period,Датум на завршување на периодот тековната сметка е
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,Постојана адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Авансно платени во однос на {0} {1} не може да биде поголемо \ од Сѐ Вкупно {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ве молиме изберете код ставка
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Ве молиме изберете код ставка
 DocType: Student Sibling,Studying in Same Institute,Студирање во истиот институт
 DocType: Territory,Territory Manager,Територија менаџер
 DocType: Packed Item,To Warehouse (Optional),До Магацински (опционално)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Платениот износ (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Дополнителен попуст
 DocType: Selling Settings,Selling Settings,Нагодувања за Продажби
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Види во кошничката
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинг трошоци
 ,Item Shortage Report,Точка Недостаток Извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се споменува, \ Променете спомене &quot;Тежина UOM&quot; премногу"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Барање користат да се направи овој парк Влегување
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следна Амортизација Регистриран е задолжително за нови средства
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следна Амортизација Регистриран е задолжително за нови средства
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Посебен разбира врз основа група за секоја серија
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Посебен разбира врз основа група за секоја серија
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Една единица на некој објект.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Не е потребно трошоците центар за &#39;Добивка и загуба на сметка {2}. Ве молиме да се воспостави центар стандардно Цена за компанијата.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Веќе има Група на клиенти со истото име, Ве молиме сменете го Името на клиентот или преименувајте ја Групата на клиенти"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,Точка-мудар Продажбата Регистрирај се
 DocType: Asset,Gross Purchase Amount,Бруто купување износ
 DocType: Asset,Depreciation Method,амортизација Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Надвор од мрежа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Надвор од мрежа
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Е овој данок се вклучени во основната стапка?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Вкупно Целна вредност
 DocType: Program Course,Required,Задолжителни
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирување JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Премногу колона. Извоз на извештајот и печатење со помош на апликацијата табела.
 DocType: Purchase Invoice Item,Batch No,Серија Не
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Им овозможи на повеќе Продај Нарачка против нарачка на купувачи
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 DocType: Student Group Instructor,Student Group Instructor,Група на студенти инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Мобилен телефон
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Главните
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Главните
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Намести префикс за нумерирање серија на вашиот трансакции
 DocType: Employee Attendance Tool,Employees HTML,вработените HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Стандардно Бум ({0}) мора да бидат активни за оваа стварта или нејзиниот дефиниција
 DocType: Employee,Leave Encashed?,Остави Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Можност од поле е задолжително
 DocType: Email Digest,Annual Expenses,годишните трошоци
 DocType: Item,Variants,Варијанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Направи нарачка
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Направи нарачка
 DocType: SMS Center,Send To,Испрати до
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Нема доволно одмор биланс за Оставете Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,"Лимит,"
@@ -1767,7 +1765,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Работа во прогрес Магацински се бара пред Прати
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносителот на барањето за работа.
 DocType: Purchase Order Item,Warehouse and Reference,Магацин и упатување
 DocType: Supplier,Statutory info and other general information about your Supplier,Законски информации и други општи информации за вашиот снабдувач
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,Сериски броеви и Пакетите
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Група на студенти Сила
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Група на студенти Сила
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Против весник Влегување {0} не се имате било какви неспоредлив {1} влез
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,оценувања
 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: Grading Structure,Grading Intervals,оценување интервали
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ве молиме внесете
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може да се overbill за предмет {0} во ред {1} повеќе од {2}. Да им овозможи на над-платежна, Ве молиме да се постави за купување на Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Поставете филтер врз основа на точка или Магацински
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Бум {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овластување за контрола
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Отфрлени Магацински е задолжително против отфрли Точка {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плаќање
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управување со вашите нарачки
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Плаќање
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управување со вашите нарачки
 DocType: Production Order Operation,Actual Time and Cost,Крај на време и трошоци
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материјал Барање за максимум {0} може да се направи за ставката {1} против Продај Побарувања {2}
 DocType: Employee,Salutation,Титула
 DocType: Course,Course Abbreviation,Кратенка на курсот
 DocType: Student Leave Application,Student Leave Application,Студентски оставите апликацијата
 DocType: Item,Will also apply for variants,Ќе се применуваат и за варијанти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Средства не може да се откаже, како што е веќе {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Вработен {0} на половина ден на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Вкупно работно време не смее да биде поголема од работното време max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Група предмети во моментот на продажба
 DocType: Quotation Item,Actual Qty,Крај на Количина
 DocType: Sales Invoice Item,References,Референци
@@ -1811,7 +1809,7 @@
 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 +91,Associate,Соработник
 DocType: Asset Movement,Asset Movement,средства движење
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,нов кошничка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,нов кошничка
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ставка {0} не е во серија
 DocType: SMS Center,Create Receiver List,Креирај Листа ресивер
 DocType: Vehicle,Wheels,тркала
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Оневозможува создавање на време логови против производство наредби. Операции нема да бидат следени од цел производство
 DocType: Student,Student Mobile Number,Студентски мобилен број
 DocType: Item,Has Variants,Има варијанти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Веќе сте одбрале предмети од {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Име на месечна Дистрибуција
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID е задолжително
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID е задолжително
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID е задолжително
 DocType: Sales Person,Parent Sales Person,Родител продажбата на лице
 DocType: Purchase Invoice,Recurring Invoice,Повторувачки Фактура
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управување со проекти
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Vehicle Log,Fuel Price,гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Фиксни средства точка мора да биде точка на не-парк.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџетот не може да биде доделен од {0}, како што не е сметката за приходи и трошоци"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнати
 DocType: Student Admission,Application Form Route,Формулар Пат
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Подрачје / клиентите
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Подрачје / клиентите
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,на пример 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Оставете Тип {0} не може да се одвои, бидејќи тоа е остави без плати"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: распределени износ {1} мора да биде помалку од или еднакво на фактура преостанатиот износ за наплата {2}
@@ -1878,14 +1876,14 @@
 ,Serial No Status,Сериски № Статус
 DocType: Payment Entry Reference,Outstanding,Најдобро
 ,Daily Timesheet Summary,Дневен timesheet Резиме
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ред {0}: За да го поставите {1} поените, разликата помеѓу од и до денес \ мора да биде поголем или еднаков на {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ова е врз основа на акциите на движење. Види {0} за повеќе детали
 DocType: Pricing Rule,Selling,Продажби
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Износот {0} {1} одзема против {2}
 DocType: Employee,Salary Information,Плата Информации
 DocType: Sales Person,Name and Employee ID,Име и вработените проект
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Поради Датум не може да биде пред Праќање пораки во Датум
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Давачки и даноци
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ве молиме внесете референтен датум
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Не може да се однесува ред број е поголема или еднаква на тековниот број на ред за овој тип на полнење
 DocType: Asset,Sold,продаден
 ,Item-wise Purchase History,Точка-мудар Набавка Историја
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ве молиме кликнете на &quot;Генерирање Распоред&quot; да достигне цена Сериски Без додадеме точка за {0}
 DocType: Account,Frozen,Замрзнати
 ,Open Production Orders,Отворен Нарачка производство
 DocType: Sales Invoice Payment,Base Amount (Company Currency),База Износ (Фирма валута)
 DocType: Payment Reconciliation Payment,Reference Row,Суд ред
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Детали за сметководство
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Бришење на сите трансакции за оваа компанија
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Резолуцијата Детали за
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,дискусија
 DocType: Payment Entry,Transaction ID,трансакција проект
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Правила цените се уште се филтрирани врз основа на квантитетот.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Поставете го датумот на пристап за вработените {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Вкупен износ за наплата (преку време лист)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторете приходи за корисници
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора да имаат улога &quot;расход Approver&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Пар
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изберете BOM и Количина за производство
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Изберете BOM и Количина за производство
 DocType: Asset,Depreciation Schedule,амортизација Распоред
 DocType: Bank Reconciliation Detail,Against Account,Против профил
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Половина ден датум треба да биде помеѓу Од датум и до денес
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Поставете &quot;Асет Амортизација трошоците центар во компанијата {0}
 ,Maintenance Schedules,Распоред за одржување
 DocType: Task,Actual End Date (via Time Sheet),Крај Крај Датум (преку време лист)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Износот {0} {1} од {2} {3}
 ,Quotation Trends,Трендови на Понуди
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Точка Група кои не се споменати во точка мајстор за ставката {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебит сметка мора да биде побарувања сметка
 DocType: Shipping Rule Condition,Shipping Amount,Испорака Износ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Во очекување Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Дадени
 ,Vehicle Expenses,Трошоци возило
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
+DocType: Serial No,Invoice Details,Детали за фактура
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Предвидена вредност по корисен век мора да биде поголемо од или еднакво на {0}
 DocType: Purchase Receipt,Vehicle Number,Број на возило
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датумот на кој се повторуваат фактура ќе се запре
 DocType: Employee Loan,Loan Amount,Износ на кредитот
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Поставки за човечки ресурси
 DocType: Salary Slip,net pay info,нето плата информации
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Сметка тврдат дека е во очекување на одобрување. Само на сметка Approver може да го ажурира статусот.
 DocType: Email Digest,New Expenses,нови трошоци
 DocType: Purchase Invoice,Additional Discount Amount,Дополнителен попуст Износ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Количина мора да биде 1, како точка е на основните средства. Ве молиме користете посебен ред за повеќе количество."
 DocType: Leave Block List Allow,Leave Block List Allow,Остави Забрани Листа Дозволете
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr не може да биде празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr не може да биде празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група за Не-групата
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 DocType: Loan Type,Loan Name,заем Име
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Складиште, каде што се одржување на залихи на одбиени предмети"
 DocType: Production Order,Skip Material Transfer,Скокни на материјалот трансфер
 DocType: Production Order,Skip Material Transfer,Скокни на материјалот трансфер
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Не може да се најде на девизниот курс за {0} до {1} за клучните датум {2}. Ве молиме да се создаде рекорд Девизен рачно
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Вашата финансиска година завршува на
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} сега е стандардно фискална година. Ве молиме да обновите вашиот прелистувач за промените да имаат ефект.
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Сметка {0} не е валиден. Валута сметка мора да биде {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор UOM конверзија е потребно во ред {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од Продај Побарувања, продажба фактура или весник Влегување"
 DocType: Salary Component,Deduction,Одбивање
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од време и на време е задолжително.
 DocType: Stock Reconciliation Item,Amount Difference,износот на разликата
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Ставка Цена додаде за {0} во Ценовник {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ве молиме внесете Id на вработените на ова продажбата на лице
 DocType: Territory,Classification of Customers by region,Класификација на клиенти од регионот
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Разликата Износот мора да биде нула
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разликата Износот мора да биде нула
 DocType: Project,Gross Margin,Бруто маржа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Ве молиме внесете Производство стварта прв
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Пресметаната извод од банка биланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,корисник со посебни потреби
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Понуда
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Вкупно Расходи
 ,Production Analytics,производство и анализатор
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Предупредување: Невалиден SSL сертификат прикачување {0}
 DocType: Student Admission,Eligibility,подобност
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Води да ви помогне да се бизнис, да додадете сите ваши контакти и повеќе како вашиот води"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Води да ви помогне да се бизнис, да додадете сите ваши контакти и повеќе како вашиот води"
 DocType: Production Order Operation,Actual Operation Time,Крај на време операција
 DocType: Authorization Rule,Applicable To (User),Се применуваат за (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одземе
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,работа адреса
 DocType: Appraisal,Calculate Total Score,Пресметај Вкупен резултат
 DocType: Request for Quotation,Manufacturing Manager,Производство менаџер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Сериски № {0} е под гаранција до {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит за испорака во пакети.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Пратки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Состојба на сметка ({0}) за {1} и акциите на вредност ({2}) за магацин {3} мора да биде иста
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Забелешка: Е-пошта нема да биде испратена до корисниците со посебни потреби
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број на интеракција
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број на интеракција
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изберете компанијата ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изберете компанијата ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставете го празно ако се земе предвид за сите одделенија
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Видови на вработување (постојан, договор, стаж итн)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} е задолжително за ставката {1}
 DocType: Process Payroll,Fortnightly,на секои две недели
 DocType: Currency Exchange,From Currency,Од валутен
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Ве молиме изберете распределени износот, видот Фактура и број на фактурата во барем еден ред"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Цена (Валута на Фирма)
 DocType: Student Guardian,Others,"Други, пак,"
 DocType: Payment Entry,Unallocated Amount,Износ на неиздвоена
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Не може да се најде ставка. Ве молиме одберете некои други вредност за {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Нема повеќе надградби
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не може да го изберете видот на пресметување како 'Износ на претходниот ред' или 'Вкупно на претходниот ред' за првиот ред
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ставката од подгрупата, не треба да биде во Пакетот Производи. Ве молиме отстранете ја ставката '{0}'"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банкарство
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додади Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додади Timesheets
 DocType: Vehicle Service,Service Item,послужната ствар
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Ред # {0}: Асет {1} е веќе {2}
 DocType: Quotation Item,Stock Balance,Биланс на акции
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Продај Побарувања на плаќање
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Поставете Именување серија за {0} преку поставување&gt; Прилагодување&gt; Именување Серија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,извршен директор
 DocType: Expense Claim Detail,Expense Claim Detail,Барање Детална сметка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Ве молиме изберете ја точната сметка
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цените нема да бидат прикажани ако цената листата не е поставена
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведи земјата за оваа Испорака Правило или проверете Во светот испорака
 DocType: Stock Entry,Total Incoming Value,Вкупно Вредност на Прилив
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебитна Да се бара
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебитна Да се бара
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets помогне да ги пратите на време, трошоци и платежна за активности направено од страна на вашиот тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Откупната цена Листа
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Менаџер за квалитет
 DocType: Job Applicant,Job Opening,Отворање работа
 DocType: Payment Reconciliation,Payment Reconciliation,Плаќање помирување
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Ве молиме изберете име incharge на лицето
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологија
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Вкупно ненаплатени: {0}
 DocType: BOM Website Operation,BOM Website Operation,Бум на вебсајт Операција
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,Си ја заборавивте Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Големина на примерокот
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ве молиме внесете Потврда документ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Сите ставки се спремни за фактурирање
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ве молиме внесете Потврда документ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Понатаму центри цена може да се направи под Групи но записи може да се направи врз несрпското групи
 DocType: Project,External,Надворешни
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволи
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производство наредби Направено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Производство наредби Направено: {0}
 DocType: Branch,Branch,Филијали
 DocType: Guardian,Mobile Number,Мобилен број
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печатење и Брендирање
 DocType: Bin,Actual Quantity,Крај на Кол
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следен ден на испорака
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Сериски № {0} не е пронајдена
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Сериски № {0} не е пронајдена
 DocType: Scheduling Tool,Student Batch,студентски Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Вашите клиенти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Направете Студентски
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Направете Студентски
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вие сте поканети да соработуваат на проектот: {0}
 DocType: Leave Block List Date,Block Date,Датум на блок
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Аплицирај сега
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,Испратени до
 DocType: Payment Request,Make Sales Invoice,Направи Продажна Фактура
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,софтвери
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следна Контакт датум не може да биде во минатото
 DocType: Company,For Reference Only.,За повикување само.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Изберете Серија Не
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невалиден {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Однапред Износ
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,На случај бр не може да биде 0
 DocType: Item,Show a slideshow at the top of the page,Прикажи слајдшоу на врвот на страната
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Продавници
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Продавници
 DocType: Serial No,Delivery Time,Време на испорака
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Стареењето Врз основа на
 DocType: Item,End of Life,Крајот на животот
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,Преименувај алатката
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Ажурирање на трошоците
 DocType: Item Reorder,Item Reorder,Пренареждане точка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Прикажи Плата фиш
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Пренос на материјал
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Прикажи Плата фиш
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Пренос на материјал
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведете операции, оперативните трошоци и даде единствена работа нема да вашето работење."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овој документ е над границата од {0} {1} за ставката {4}. Ви се прави уште една {3} против истиот {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Поставете се повторуваат по спасување
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,износот сметка Одберете промени
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Поставете се повторуваат по спасување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,износот сметка Одберете промени
 DocType: Purchase Invoice,Price List Currency,Ценовник Валута
 DocType: Naming Series,User must always select,Корисникот мора секогаш изберете
 DocType: Stock Settings,Allow Negative Stock,Дозволете негативна состојба
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,За буџетот на профилот
 DocType: Quality Inspection,Verified By,Заверена од
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Не може да се промени стандардно валута компанијата, бидејќи постојат постојните трансакции. Трансакции треба да бидат откажани да се промени валута на стандардните."
-DocType: Grade Interval,Grade Description,степен Опис
+DocType: Grading Scale Interval,Grade Description,степен Опис
 DocType: Stock Entry,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,Креирај Плата фиш
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,Публика: Да најдам
 DocType: Warranty Claim,Raised By,Покренати од страна на
 DocType: Payment Gateway Account,Payment Account,Уплатна сметка
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Ве молиме назначете фирма, да се продолжи"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нето промени во Побарувања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Обесштетување Off
 DocType: Offer Letter,Accepted,Прифатени
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Ве молиме бидете сигурни дека навистина сакате да ги избришете сите трансакции за оваа компанија. Вашиот господар на податоци ќе остане како што е. Ова дејство не може да се врати назад.
 DocType: Room,Room Number,Број на соба
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Невалидна референца {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да биде поголема од планираното quanitity ({2}) во продукција налог {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може да биде поголема од планираното quanitity ({2}) во продукција налог {3}
 DocType: Shipping Rule,Shipping Rule Label,Испорака Правило Етикета
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,корисникот форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,"Суровини, не може да биде празна."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо весник Влегување
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не може да го ажурира трговија, фактура содржи капка превозот ставка."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Брзо весник Влегување
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Вие не може да го промени стапка ако Бум споменати agianst која било ставка
 DocType: Employee,Previous Work Experience,Претходно работно искуство
 DocType: Stock Entry,For Quantity,За Кол
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Името на Институтот за кои ќе се поставување на овој систем.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Сметководство влез замрзнати до овој датум, никој не може да се направи / менувате влез освен улога наведени подолу."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ве молиме да ги зачувате документот пред генерирање на одржување распоред
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус на проектот
 DocType: UOM,Check this to disallow fractions. (for Nos),Изберете го ова за да ги оневозможите фракции. (За NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,се создадени по производство наредби:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,Вработени кои работат на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Тековен
 DocType: Project,% Complete Method,% Комплетен метод
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Почеток одржување датум не може да биде пред датумот на испорака за серија № {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Почеток одржување датум не може да биде пред датумот на испорака за серија № {0}
 DocType: Production Order,Actual End Date,Крај Крај Датум
 DocType: BOM,Operating Cost (Company Currency),Оперативни трошоци (Фирма валута)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Неплатено отсуство не се поклопува со одобрен евиденција оставите апликацијата
 DocType: Campaign,Campaign-.####,Кампања -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следните чекори
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Внесете ја определени предмети на најдобар можен стапки
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто блиску можност по 15 дена
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,крајот на годината
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / олово%
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Кол
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Надомест записи создадени - {0}
 DocType: Asset Category Account,Asset Category Account,Средства Категорија сметка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе од ставка {0} од количина {1} во Продажна нарачка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Не може да произведе повеќе од ставка {0} од количина {1} во Продажна нарачка
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Акции Влегување {0} не е поднесен
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовинска сметка
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Следна Контакт Со тоа што не може да биде ист како олово-мејл адреса
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Чистење Датум кои не се споменати
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,професија
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0}: Почеток Датум мора да биде пред Крај Датум
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Вкупно (Количина)
 DocType: Sales Invoice,This Document,овој документ
 DocType: Installation Note Item,Installed Qty,Инсталиран Количина
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Изнеле
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Комунални трошоци
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Над 90-
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: весник Влегување {1} нема сметка {2} или веќе се исти против друг ваучер
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: весник Влегување {1} нема сметка {2} или веќе се исти против друг ваучер
 DocType: Buying Settings,Default Buying Price List,Стандардно Купување Ценовник
 DocType: Process Payroll,Salary Slip Based on Timesheet,Плата фиш Врз основа на timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Веќе создаде ниту еден вработен за горе избраните критериуми или плата се лизга
 DocType: Notification Control,Sales Order Message,Продај Побарувања порака
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Постави стандардните вредности, како компанија, валута, тековната фискална година, и др"
 DocType: Payment Entry,Payment Type,Тип на плаќање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Ве молиме одберете Серија за Точка {0}. Не може да се најде една серија која ги исполнува ова барање
 DocType: Process Payroll,Select Employees,Избери Вработени
 DocType: Opportunity,Potential Sales Deal,Потенцијален Продај договор
 DocType: Payment Entry,Cheque/Reference Date,Чек / референтен датум
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобална ПОС Профил {0} веќе создадена за компанија {1}
 DocType: Purchase Order,Ref SQ,Реф SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменете Точка / Бум во сите BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,мора да се поднесе приемот на документи
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,мора да се поднесе приемот на документи
 DocType: Purchase Invoice Item,Received Qty,Доби Количина
 DocType: Stock Entry Detail,Serial No / Batch,Сериски Не / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Што не се платени и не испорачува
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Нема време листови
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Остави Тип {0} не може да се носат-пренасочат
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Распоред за одржување не е генерирана за сите предмети. Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 ,To Produce,Да произведе
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Даноци
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","На ред {0} во {1}. Да {2} вклучите во стапката точка, редови {3} исто така, мора да бидат вклучени"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Направете пристап
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Направете пристап
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација на пакетот за испорака (за печатење)
 DocType: Bin,Reserved Quantity,Кол задржани
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ве молиме внесете валидна е-мејл адреса
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Лицата со посебни потреби образецот не мора да биде стандардна дефиниција
 DocType: Account,Income Account,Сметка приходи
 DocType: Payment Request,Amount in customer's currency,Износ во валута на клиентите
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Испорака
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Испорака
 DocType: Stock Reconciliation Item,Current Qty,Тековни Количина
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Видете &quot;стапката на материјали врз основа на&quot; Чини во Дел
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Пред
 DocType: Appraisal Goal,Key Responsibility Area,Клучна одговорност Површина
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентски Пакетите да ви помогне да ги пратите на посетеност, проценки и такси за студентите"
 DocType: Payment Entry,Total Allocated Amount,"Вкупно лимит,"
 DocType: Item Reorder,Material Request Type,Материјал Тип на Барањето
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural весник за влез на платите од {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage е полна, не штедеше"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage е полна, не штедеше"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: UOM конверзија фактор е задолжително
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Реф
 DocType: Budget,Cost Center,Трошоците центар
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скриј даночен број купувачи од продажбата на трансакции
 DocType: Upload Attendance,Upload HTML,Upload HTML
 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.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цените Правило е направен за да ја пребришете Ценовник / дефинира попуст процент, врз основа на некои критериуми."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може да се менува само преку берза за влез / Испратница / Купување Потврда
 DocType: Employee Education,Class / Percentage,Класа / Процент
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Раководител на маркетинг и продажба
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Ако е избрано Цените правило е направен за &quot;цената&quot;, таа ќе ги избрише ценовникот. Цените Правило цена е крајната цена, па нема повеќе Попустот треба да биде применет. Оттука, во трансакции како Продај Побарувања, нарачка итн, тоа ќе биде Земени се во полето &#39;стапка &quot;, отколку полето&quot; Ценовник стапка."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако е избрано Цените правило е направен за &quot;цената&quot;, таа ќе ги избрише ценовникот. Цените Правило цена е крајната цена, па нема повеќе Попустот треба да биде применет. Оттука, во трансакции како Продај Побарувања, нарачка итн, тоа ќе биде Земени се во полето &#39;стапка &quot;, отколку полето&quot; Ценовник стапка."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Следи ги Потенцијалните клиенти по вид на индустрија.
 DocType: Item Supplier,Item Supplier,Точка Добавувачот
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Ве молиме внесете Точка законик за да се добие серија не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Ве молиме изберете вредност за {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Сите адреси.
 DocType: Company,Stock Settings,Акции Settings
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спојувањето е можно само ако следниве својства се исти во двата записи. Е група, корен Тип компанијата"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ќе испрати е-маил за случај на вработените со статус на &quot;Отворени&quot;
 DocType: Task,Depends on Tasks,Зависи Задачи
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управување на клиентите група на дрвото.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Додатоци може да бидат прикажани без овозможување на количката
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Нова цена центар Име
 DocType: Leave Control Panel,Leave Control Panel,Остави контролен панел
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,Дебит
 DocType: Delivery Note,Required only for sample item.,Потребно е само за примерок точка.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Крај Количина По трансакцијата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добавувачот&gt; Добавувачот Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Не се лизга плата и помеѓу {0} и {1}
 ,Pending SO Items For Purchase Request,Во очекување на ПА Теми за купување Барање
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,студент Запишување
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} е исклучен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} е исклучен
 DocType: Supplier,Billing Currency,Платежна валута
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Почетната страница од пребарувачот Избрана производ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Сите оценка групи
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нова Магацински Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Вкупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Вкупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ве молиме спомнете Број на посети бара
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ве молиме спомнете Број на посети бара
 DocType: Stock Settings,Default Valuation Method,Метод за проценка стандардно
 DocType: Vehicle Log,Fuel Qty,Количина на гориво
 DocType: Production Order Operation,Planned Start Time,Планирани Почеток Време
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,Ценовник мајстор
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Сите Продажбата Трансакцијата може да бидат означени против повеќе ** продажба на лица **, така што ќе може да се постави и да се следи цели."
 ,S.O. No.,ПА број
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Ве молиме креирајте Клиент од Потенцијален клиент {0}
 DocType: Price List,Applicable for Countries,Применливи за земјите
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Оставете само апликации со статус &#39;одобрена &quot;и&quot; Отфрлени &quot;може да се поднесе
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Група на студенти Името е задолжително во ред {0}
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,копирани од
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Име грешка: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недостаток
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} не се поврзани со {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} не се поврзани со {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Публика за вработен {0} е веќе означени
 DocType: Packing Slip,If more than one package of the same type (for print),Ако повеќе од еден пакет од ист тип (за печатење)
 ,Salary Register,плата Регистрирај се
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Користите за Кошничка
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} {1} Атрибут не постои во листа на валидни Точка атрибут вредности за ставката {2}
 DocType: BOM Item,Scrap %,Отпад%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Кривична пријава ќе биде дистрибуиран пропорционално врз основа на точка количество: Контакт лице или количина, како на вашиот избор"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Кривична пријава ќе биде дистрибуиран пропорционално врз основа на точка количество: Контакт лице или количина, како на вашиот избор"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Барем една ставка треба да се внесуваат со негативен количество во замена документ
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} подолго од било кој на располагање на работното време во станица {1}, се прекине работењето во повеќе операции"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управување со Територија на дрвото.
 DocType: Journal Entry Account,Sales Invoice,Продажна Фактура
 DocType: Journal Entry Account,Party Balance,Партијата Биланс
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Ве молиме изберете Примени попуст на
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Ве молиме изберете Примени попуст на
 DocType: Company,Default Receivable Account,Стандардно побарувања профил
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Креирај Банка Влез за вкупниот износ на плата исплатена за погоре избраниот критериум
 DocType: Stock Entry,Material Transfer for Manufacture,Материјал трансфер за Производство
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Процент може да се примени или против некој Ценовник или за сите ценовникот.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Процент може да се примени или против некој Ценовник или за сите ценовникот.
 DocType: Purchase Invoice,Half-yearly,Полугодишен
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Сметководство за влез на берза
 DocType: Vehicle Service,Engine Oil,на моторното масло
 DocType: Sales Invoice,Sales Team1,Продажбата Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Точка {0} не постои
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Точка {0} не постои
 DocType: Sales Invoice,Customer Address,Клиент адреса
 DocType: Employee Loan,Loan Details,Детали за заем
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршено Количина мора да биде поголема од нула.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,Корен Тип
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не можам да се вратат повеќе од {1} за Точка {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Двор
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},Целна склад е задолжително за спорот {0}
 DocType: Cheque Print Template,Primary Settings,Примарен Settings
 DocType: Purchase Invoice,Select Supplier Address,Изберете Добавувачот адреса
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Додај вработени
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Додај вработени
 DocType: Purchase Invoice Item,Quality Inspection,Квалитет инспекција
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Екстра Мали
 DocType: Company,Standard Template,стандардна дефиниција
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Предупредување: Материјал Бараниот Количина е помалку од Минимална Подреди Количина
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,На сметка {0} е замрзнат
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правното лице / Подружница со посебен сметковен кои припаѓаат на Организацијата.
 DocType: Payment Request,Mute Email,Неми-пошта
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна, пијалаци и тутун"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Може само да се направи исплата против нефактурираното {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Комисијата стапка не може да биде поголема од 100
 DocType: Stock Entry,Subcontract,Поддоговор
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ве молиме внесете {0} прв
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Магацини со постоечките трансакцијата не може да се конвертира во групата.
 DocType: Assessment Result Tool,Result HTML,резултат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,истекува на
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додај Студентите
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додај Студентите
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Ве молиме изберете {0}
 DocType: C-Form,C-Form No,C-Образец бр
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,АМТ
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Изберете фискалната година
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Пренареждане ниво
 DocType: Company,Chart Of Accounts Template,Сметковниот план Шаблон
 DocType: Attendance,Attendance Date,Публика Датум
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дупликат внес
 DocType: Program Enrollment Tool,Get Students,Студентите се добие
 DocType: Serial No,Under Warranty,Под гаранција
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Во Зборови ќе бидат видливи откако ќе го спаси Продај Побарувања.
 ,Employee Birthday,Вработен Роденден
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Студентски Серија Публика алатката
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,граница Преминал
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вложување на капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академски мандат, со ова &#39;академска година&#39; {0} и &quot;Рок Име&quot; {1} веќе постои. Ве молиме да ги менувате овие ставки и обидете се повторно."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Како што веќе постојат трансакции против ставка {0}, не може да се промени вредноста на {1}"
 DocType: UOM,Must be Whole Number,Мора да биде цел број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нови лисја распределени (во денови)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Сериски № {0} не постои
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% На материјали фактурирани против оваа Продај Побарувања
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Период Затворање Влегување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Трошоците центар со постојните трансакции не може да се конвертира во групата
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Износот {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Износот {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизација
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Добавувачот (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Вработен Публика алатката
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Последниот ден од наредниот месец
 DocType: Support Settings,Auto close Issue after 7 days,Авто блиску прашање по 7 дена
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Одмор не може да се одвои пред {0}, како рамнотежа одмор веќе е рачна пренасочат во рекордно идната распределба одмор {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Забелешка: Поради / референтен датум надминува дозволено клиент кредит дена од {0} ден (а)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студентски Подносител
 DocType: Asset Category Account,Accumulated Depreciation Account,Акумулирана амортизација сметка
 DocType: Stock Settings,Freeze Stock Entries,Замрзнување берза записи
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,Акции анализи
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Работење не може да се остави празно
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против Детална л.к
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Тип на партијата е задолжително
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Тип на партијата е задолжително
 DocType: Quality Inspection,Outgoing,Заминување
 DocType: Material Request,Requested For,Се бара за
 DocType: Quotation Item,Against Doctype,Против DOCTYPE
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,Точка законик
 DocType: Production Planning Tool,Create Production Orders,Креирај Производство Нарачка
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детали за
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изберете рачно студентите за активност врз група
 DocType: Journal Entry,User Remark,Корисникот Напомена
 DocType: Lead,Market Segment,Сегмент од пазарот
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Уплатениот износ нема да биде поголема од вкупните одобрени негативен износ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Вработен внатрешна работа Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Затворање (д-р)
 DocType: Cheque Print Template,Cheque Size,чек Големина
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,Креирај Материјал Барања
 DocType: Employee Education,School/University,Училиште / Факултет
 DocType: Payment Request,Reference Details,Референца Детали
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Предвидена вредност По корисен век мора да биде помала од бруто купување износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,На располагање Количина на складиште
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Фактурирани Износ
 DocType: Asset,Double Declining Balance,Двоен опаѓачки баланс
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разликата сметките мора да бидат типот на средствата / одговорност сметка, бидејќи овој парк помирување претставува Отворање Влегување"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Повлечениот износ не може да биде поголема од кредит Износ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Нарачка број потребен за Точка {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производство цел не создаде
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Производство цел не создаде
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датум"" мора да биде по ""до датум"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},не може да го промени својот статус како студент {0} е поврзан со примена студент {1}
 DocType: Asset,Fully Depreciated,целосно амортизираните
 ,Stock Projected Qty,Акции Проектирани Количина
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не му припаѓа на проектот {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Забележително присуство на HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",Цитати се и понудите што сте ги испратиле на вашите клиенти
 DocType: Sales Order,Customer's Purchase Order,Нарачка на купувачот
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Сериски Не и серија
 DocType: Warranty Claim,From Company,Од компанијата
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Збирот на резултатите на критериумите за оценување треба да биде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Вредност или Количина
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Поставете Број на амортизациони Резервирано
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Вредност или Количина
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,"Продукција наредби, а не може да се зголеми за:"
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Купување на даноци и такси
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,сите Магацини
 DocType: Sales Partner,Retailer,Трговија на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Кредит на сметка мора да биде на сметка Биланс на состојба
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Сите типови на Добавувачот
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Сите типови на Добавувачот
 DocType: Global Defaults,Disable In Words,Оневозможи со зборови
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Точка законик е задолжително, бидејќи точка не се нумерирани автоматски"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Понудата {0} не е од типот {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,про-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Банка пречекорување на профилот
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Направете Плата фиш
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Ред # {0}: лимит, не може да биде поголем од преостанатиот износ."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Преглед на бирото
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Препорачана кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Измени Праќање пораки во Датум и време
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не е дозволено да се ажурира акции трансакции постари од {0}
 DocType: Purchase Invoice Item,PR Detail,ПР Детална
 DocType: Sales Order,Fully Billed,Целосно Опишан
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Поставете стандардно треба да се плати сметка во вработен {0}
 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 +127,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),Бруто тежина на пакувањето. Обично нето тежина + материјал за пакување тежина. (За печатење)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Група врз основа на
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","се бара послужната ствар, Вид, фреквенција и износот сметка"
-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:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Дури и ако постојат повеќе Цените правила со највисок приоритет, тогаш се применуваат следните интерни приоритети:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Дали навистина сакате да ги достават сите Плата лизга од {0} до {1}
 DocType: Cheque Print Template,Cheque Height,чек Висина
 DocType: Supplier,Supplier Details,Добавувачот Детали за
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,фактура Реф
 DocType: Purchase Order,Recurring Order,Повторувачки Побарувања
 DocType: Company,Default Income Account,Сметка стандардно на доход
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Клиент група / клиентите
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Клиент група / клиентите
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Незатворени фискални години Добивка / загуба (кредит)
 DocType: Sales Invoice,Time Sheets,време плочи
 DocType: Payment Gateway Account,Default Payment Request Message,Стандардно плаќање Порака со барање
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,Понуда порака
 DocType: Employee Loan,Employee Loan Application,Вработен апликација за заем
 DocType: Issue,Opening Date,Отворање датум
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Присуство е обележан успешно.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Присуство е обележан успешно.
 DocType: Journal Entry,Remark,Напомена
 DocType: Purchase Receipt Item,Rate and Amount,Цена и Износ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Тип на сметка за {0} мора да биде {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Тип на сметка за {0} мора да биде {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Лисја и Холидеј
 DocType: School Settings,Current Academic Term,Тековни академски мандат
 DocType: School Settings,Current Academic Term,Тековни академски мандат
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,група на студенти
 DocType: Shopping Cart Settings,Quotation Series,Серија на Понуди
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ставка ({0}) со исто име веќе постои, ве молиме сменете го името на групата ставки или името на ставката"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ве молам изберете клиентите
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Ве молам изберете клиентите
 DocType: C-Form,I,јас
 DocType: Company,Asset Depreciation Cost Center,Центар Амортизација Трошоци средства
 DocType: Sales Order Item,Sales Order Date,Продажбата на Ред Датум
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,Детали за осигурување
 DocType: Account,Payable,Треба да се плати
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ве молиме внесете отплата периоди
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Должници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Должници ({0})
 DocType: Pricing Rule,Margin,маргина
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нови клиенти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Бруто добивка%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Чистење Датум
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто купување износ е задолжително
 DocType: Lead,Address Desc,Адреса Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Партијата е задолжително
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Партијата е задолжително
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Име на тема
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Најмалку едно мора да биде избрано од Продажби или Купување
-DocType: Grading Structure,Grade Intervals,интервали одделение
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изберете од природата на вашиот бизнис.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Ред # {0}: двојна влез во Референци {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Каде што се врши производните операции.
 DocType: Asset Movement,Source Warehouse,Извор Магацински
 DocType: Installation Note,Installation Date,Инсталација Датум
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Писмо глави за печатење на обрасци.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Наслови за печатење шаблони пр проформа фактура.
 DocType: Student Guardian,Student Guardian,студентски Гардијан
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Трошоци тип вреднување не може да го означи како Инклузивна
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,Различни ЕМ за Артикли ќе доведе до Неточна (Вкупно) вредност за Нето тежина. Проверете дали Нето тежината на секој артикал е во иста ЕМ.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Бум стапка
@@ -3157,7 +3160,7 @@
 DocType: Company,Exchange Gain / Loss Account,Размена добивка / загуба сметка
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Вработените и Публика
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Целта мора да биде еден од {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Пополнете го формуларот и го спаси
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Форуми во заедницата
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Крај на количество на залиха
@@ -3173,7 +3176,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Пренареждане Количина
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Тековни работни места
 DocType: Company,Stock Adjustment Account,Акциите прилагодување профил
-DocType: Journal Entry,Write Off,Отпис
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отпис
 DocType: Timesheet Detail,Operation 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}
@@ -3184,27 +3187,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Снабдувачот доставува до клиентите
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Образец / ставка / {0}) е надвор од складиште
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следниот датум мора да биде поголема од објавувањето Датум
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Шоуто данок распадот
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Шоуто данок распадот
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Поради / референтен датум не може да биде по {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Податоци за увоз и извоз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Акции записи постојат против Магацински {0}, па оттука не може повторно да се додели или да ја менувате"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Не е пронајдено студенти
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Не е пронајдено студенти
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Датум на фактура во врска со Мислењата
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,продаде
 DocType: Sales Invoice,Rounded Total,Вкупно заокружено
 DocType: Product Bundle,List items that form the package.,Листа на предмети кои ја формираат пакет.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент распределба треба да биде еднаква на 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Ве молам изберете Праќање пораки во Датум пред изборот партија
 DocType: Program Enrollment,School House,школа куќа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Ве молиме изберете Цитати
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Ве молиме изберете Цитати
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Направете Одржување Посета
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Ве молиме изберете Цитати
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Број на амортизациони резервација не може да биде поголем од вкупниот број на амортизација
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Направете Одржување Посета
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ве молиме контактирајте на корисникот кој има {0} функции Продажбата мајстор менаџер
 DocType: Company,Default Cash Account,Стандардно готовинска сметка
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компанијата (не клиент или добавувач) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ова се базира на присуството на овој студент
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Не Студентите во
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додај повеќе ставки или отвори образец
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ве молиме внесете &#39;очекува испорака датум &quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Испорака белешки {0} мора да биде укинат пред да го раскине овој Продај Побарувања
@@ -3236,6 +3240,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Точка 3
 DocType: Purchase Order,Customer Contact Email,Контакт е-маил клиент
 DocType: Warranty Claim,Item and Warranty Details,Точка и гаранција Детали за
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Точка Код&gt; Точка Група&gt; Бренд
 DocType: Sales Team,Contribution (%),Придонес (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Забелешка: Плаќањето за влез нема да бидат направивме од &quot;Пари или банкарска сметка &#39;не е одредено,"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Изберете ја програмата за собирање на задолжителни предмети.
@@ -3251,9 +3256,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пред помирување
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Даноци и давачки Додадено (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Точка Даночниот спор во {0} мора да има предвид типот Данок или на приход или трошок или Наплатлив
 DocType: Sales Order,Partly Billed,Делумно Опишан
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Ставка {0} мора да биде основни средства
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Ставка {0} мора да биде основни средства
 DocType: Item,Default BOM,Стандардно Бум
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Ве молиме име ре-вид на компанија за да се потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Вкупен Неизмирен Изн.
@@ -3263,8 +3268,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилски
 DocType: Vehicle,Insurance Company,Друштво за осигурување
 DocType: Asset Category Account,Fixed Asset Account,Фиксни средства на сметката
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,променлива
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Од Испратница
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,променлива
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Од Испратница
 DocType: Student,Student Email Address,Студент е-мејл адреса
 DocType: Timesheet Detail,From Time,Од време
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,На залиха:
@@ -3276,12 +3281,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Ценовник курс
 DocType: Purchase Invoice Item,Rate,Цена
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Практикант
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,адреса
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,адреса
 DocType: Stock Entry,From BOM,Од бирото
 DocType: Assessment Code,Assessment Code,Код оценување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основни
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,На акции трансакции пред {0} се замрзнати
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Ве молиме кликнете на &quot;Генерирање Распоред &#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","на пр Kg, единица бр, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Референтен број е задолжително ако влезе референтен датум
 DocType: Bank Reconciliation Detail,Payment Document,плаќање документ
@@ -3289,19 +3294,19 @@
 DocType: Salary Slip,Salary Structure,Структура плата
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиокомпанијата
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Материјал прашање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Материјал прашање
 DocType: Material Request Item,For Warehouse,За Магацински
 DocType: Employee,Offer Date,Датум на понуда
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Понуди
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Вие сте моментално во режим без мрежа. Вие нема да бидете во можност да ја превчитате додека имате мрежа.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Не студентски групи создадени.
 DocType: Purchase Invoice Item,Serial No,Сериски Не
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може да биде поголем од кредит Износ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ве молиме внесете Maintaince Детали за прв
 DocType: Purchase Invoice,Print Language,Печати јазик
 DocType: Salary Slip,Total Working Hours,Вкупно Работно време
 DocType: Stock Entry,Including items for sub assemblies,Вклучувајќи и предмети за суб собранија
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Внесете ја вредноста мора да биде позитивен
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Сите територии
 DocType: Purchase Invoice,Items,Теми
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студентот се веќе запишани.
@@ -3321,17 +3326,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Стандардно единица мерка за Варијанта &#39;{0}&#39; мора да биде иста како и во Мострата &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Се пресмета врз основа на
 DocType: Delivery Note Item,From Warehouse,Од Магацин
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Нема предмети со Бил на материјали за производство на
 DocType: Assessment Plan,Supervisor Name,Име супервизор
 DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
 DocType: Program Enrollment Course,Program Enrollment Course,Програма за запишување на курсот
-DocType: Grading Structure,Grading Structure,оценување Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Вреднување и Вкупно
 DocType: Tax Rule,Shipping City,Превозот Сити
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Персонализација на известувањето
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Парични текови од работење
 DocType: Sales Invoice,Shipping Rule,Испорака Правило
@@ -3352,8 +3355,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Постои стандарден Бум постои точка за {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Ве молиме изберете ја со Мислењата Датум прв
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Отворање датум треба да биде пред крајниот датум
 DocType: Leave Control Panel,Carry Forward,Пренесување
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Трошоците центар со постојните трансакции не може да се конвертира Леџер
 DocType: Department,Days for which Holidays are blocked for this department.,Деновите за кои Празници се блокирани за овој оддел.
@@ -3366,7 +3369,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Прикачи меморандум
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,последната комуникација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,последната комуникација
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одземе кога категорија е за 'Вреднување' или 'Вреднување и Вкупно'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Не може да се одземе кога категорија е за 'Вреднување' или 'Вреднување и Вкупно'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Натпреварот плаќања со фактури
@@ -3382,7 +3385,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Вкупно (Износ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Точка Сериски Не
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Креирај вработените рекорди
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Креирај вработените рекорди
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Вкупно Сегашно
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,сметководствени извештаи
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3395,10 +3398,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,непознат
 DocType: Shipping Rule,Shipping Rule Conditions,Услови за испорака Правило
 DocType: BOM Replace Tool,The new BOM after replacement,Новиот Бум по замена
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точка на продажба
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Точка на продажба
 DocType: Payment Entry,Received Amount,добиениот износ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ве молиме поставете вработените Именување систем во управување со хумани ресурси&gt; Поставки за човечки ресурси
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Се создаде целосна количина, неа веќе количина на ред"
 DocType: Account,Tax,Данок
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,не е означен
@@ -3411,9 +3412,9 @@
 DocType: Batch,Source Document Name,Извор документ Име
 DocType: Batch,Source Document Name,Извор документ Име
 DocType: Job Opening,Job Title,Работно место
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,креирате корисници
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,креирате корисници
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количина за производство мора да биде поголем од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетете извештај за одржување повик.
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и Достапност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент ви е дозволено да примате или да испорача повеќе во однос на количината нареди. На пример: Ако го наредил 100 единици. и вашиот додаток е 10%, тогаш ви е дозволено да се добијат 110 единици."
@@ -3423,28 +3424,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Сметка сметка е задолжително за ставката {0}
 DocType: BOM,Website Description,Веб-сајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промени во капиталот
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ве молиме откажете купувањето фактура {0} првиот
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mail адреса мора да биде уникатен, веќе постои за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ датумот на истекување
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,приемот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,приемот
 ,Sales Register,Продажбата Регистрирај се
 DocType: Daily Work Summary Settings Company,Send Emails At,Испрати е-пошта во
 DocType: Quotation,Quotation Lost Reason,Причина за Нереализирана Понуда
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Изберете го вашиот домен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},референтна трансакцијата не {0} {1} датум
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Нема ништо да се променат.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резиме за овој месец и во очекување на активности
 DocType: Customer Group,Customer Group Name,Клиент Име на групата
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Сè уште нема клиенти!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај за паричниот тек
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ на кредитот не може да надмине максимален заем во износ од {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Ве молиме да се отстрани оваа фактура {0} од C-Форма {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,Ве молиме внесете го отпише профил
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последните Ред Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},На сметка {0} не припаѓа на компанијата {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Сериски броеви во ред {0} не се поклопува со Потврда за испорака
 DocType: Student,Guardian Details,Гардијан Детали
 DocType: C-Form,C-Form,C-Форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посетеност за повеќе вработени
@@ -3469,20 +3472,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # сметка мора да биде од типот &quot;основни средства&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Количина
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за да се пресмета износот превозот за продажба
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серија е задолжително
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серија е задолжително
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансиски Услуги
 DocType: Student Sibling,Student ID,студентски проект
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Типови на активности за Време на дневници
 DocType: Tax Rule,Sales,Продажба
 DocType: Stock Entry Detail,Basic Amount,Основицата
 DocType: Training Event,Exam,испит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Магацински потребни за акции Точка {0}
 DocType: Leave Allocation,Unused leaves,Неискористени листови
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Платежна држава
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Трансфер
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} не се поврзани со сметка партија {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} не се поврзани со сметка партија {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Земи експлодира Бум (вклучувајќи ги и потсклопови)
 DocType: Authorization Rule,Applicable To (Employee),Применливи To (вработените)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Поради Датум е задолжително
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Интервалот за Атрибут {0} не може да биде 0
@@ -3493,13 +3496,13 @@
 ,Inactive Customers,неактивни корисници
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Набавка Разписки
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како Цените правило се применува?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Како Цените правило се применува?
 DocType: Stock Entry,Delivery Note No,Испратница Не
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ако е означено, само купување материјал барања за конечниот суровини ќе бидат вклучени во материјалните барања. Во спротивно, ќе бидат создадени Материјал Барања за предмети родител"
 DocType: Cheque Print Template,Message to show,Порака за да се покаже
 DocType: Company,Retail,Трговија на мало
 DocType: Attendance,Absent,Отсутен
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Производ Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Производ Бовча
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Невалидна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купување на даноци и такси Шаблон
 DocType: Upload Attendance,Download Template,Преземи Шаблон
@@ -3509,10 +3512,10 @@
 DocType: Payment Entry,Account Paid From,Сметка платени од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Суровина Точка законик
 DocType: Journal Entry,Write Off Based On,Отпише врз основа на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Направете Водач
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Направете Водач
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печатење и идентитет
 DocType: Stock Settings,Show Barcode Field,Прикажи Баркод поле
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Испрати Добавувачот пораки
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Испрати Добавувачот пораки
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Плата веќе обработени за периодот од {0} и {1} Остави период апликација не може да биде помеѓу овој период.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Инсталација рекорд за сериски број
 DocType: Guardian Interest,Guardian Interest,Гардијан камати
@@ -3525,6 +3528,7 @@
 DocType: Offer Letter,Awaiting Response,Чекам одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Над
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Невалиден атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Спомене, ако не-стандардни плаќа сметката"
 DocType: Salary Slip,Earning & Deduction,Заработувајќи &amp; Одбивање
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Опционални. Оваа поставка ќе се користи за филтрирање на различни трансакции.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативни Вреднување стапка не е дозволено
@@ -3540,10 +3544,9 @@
 DocType: Production Order Item,Production Order Item,Производството со цел Точка
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не се пронајдени рекорд
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Цената на расходувани средства
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,делумно ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Цена центар е задолжително за ставката {2}
 DocType: Vehicle,Policy No,Не политика
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Се предмети од производот Бовча
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Се предмети од производот Бовча
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,корисник на проектот
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Подели
@@ -3561,7 +3564,7 @@
 DocType: Program Enrollment Tool,Get Students From,Земете студенти од
 DocType: Hub Settings,Seller Country,Продавачот Земја
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Предмети објавуваат на веб-страницата
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група на учениците во групи
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група на учениците во групи
 DocType: Authorization Rule,Authorization Rule,Овластување Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови и правила Детали за
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3614,14 +3617,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},На сметка {0}: Родител на сметка {1} не припаѓа на компанијата: {2}
 DocType: Program Enrollment Tool,Student Applicants,студентите Кандидатите
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Успешно избришани сите трансакции поврзани со оваа компанија!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Како на датум
 DocType: Appraisal,HR,човечки ресурси
 DocType: Program Enrollment,Enrollment Date,Датумот на запишување
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Условна казна
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата Делови
 DocType: Program Enrollment Tool,New Academic Year,Новата академска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Врати / кредит Забелешка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Врати / кредит Забелешка
 DocType: Stock Settings,Auto insert Price List rate if missing,Авто вметнете Ценовник стапка ако недостасува
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Вкупно Исплатен износ
 DocType: Production Order Item,Transferred Qty,Пренесува Количина
@@ -3641,7 +3644,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип на листовите како повик, болни итн"
 DocType: Email Digest,Send regular summary reports via Email.,Испрати редовни збирни извештаи преку E-mail.
 DocType: Payment Entry,PE-,пе-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Поставете стандардна сметка во трошок Тип на приговор {0}
 DocType: Assessment Result,Student Name,студентски Име
 DocType: Brand,Item Manager,Точка менаџер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Даноци се плаќаат
@@ -3662,6 +3665,7 @@
 ,Sales Funnel,Продажбата на инка
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Кратенка задолжително
 DocType: Project,Task Progress,задача за напредокот
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Количка
 ,Qty to Transfer,Количина да се Трансфер на
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Понуди до Потенцијални клиенти или Клиенти.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улогата дозволено да ја менувате замрзнати акции
@@ -3689,13 +3693,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Точка Мудриот Данок Детална
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Институтот Кратенка
 ,Item-wise Price List Rate,Точка-мудар Ценовник стапка
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Понуда од Добавувач
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Понуда од Добавувач
 DocType: Quotation,In Words will be visible once you save the Quotation.,Во Зборови ќе бидат видливи откако ќе го спаси котација.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може да биде дел во ред {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,собирање на претплатата
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Баркод {0} веќе се користи во ставка {1}
 DocType: Lead,Add to calendar on this date,Додади во календарот на овој датум
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила за додавање на трошоците за испорака.
 DocType: Item,Opening Stock,отворање на Акции
@@ -3712,8 +3716,8 @@
 Updated via 'Time Log'",во минути освежено преку &quot;Време Вклучи се &#39;
 DocType: Customer,From Lead,Од Потенцијален клиент
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Нарачка пуштени во производство.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изберете фискалната година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изберете фискалната година ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Профил потребно да се направи ПОС Влегување
 DocType: Program Enrollment Tool,Enroll Students,Студентите кои се запишуваат
 DocType: Hub Settings,Name Token,Име знак
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продажба
@@ -3724,7 +3728,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} во однос на Продажна фактура {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Име на проектот
-DocType: Supplier,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
+DocType: Customer,Mention if non-standard receivable account,Наведе ако нестандардни побарувања сметка
 DocType: Journal Entry Account,If Income or Expense,Ако приходите и расходите
 DocType: Production Order,Required Items,Задолжителни предмети
 DocType: Stock Ledger Entry,Stock Value Difference,Акции Вредност разликата
@@ -3745,7 +3749,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставените таргети Точка група-мудар за ова продажбата на лице.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Замрзнување резерви постари од [Денови]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: Асет е задолжително за фиксни средства купување / продажба
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако две или повеќе правила Цените се наоѓаат врз основа на горенаведените услови, се применува приоритет. Приоритет е број помеѓу 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.,Им овозможи на овие корисници да се одобри отсуство Апликации за блок дена.
@@ -3771,7 +3775,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Точка {0} игнорира, бидејќи тоа не е предмет на акции"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","Да не се применуваат Цените правило во одредена трансакција, сите важечки правила на цените треба да биде исклучен."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не се применуваат Цените правило во одредена трансакција, сите важечки правила на цените треба да биде исклучен."
 DocType: Assessment Group,Parent Assessment Group,Родител група за оценување
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Вработувања
 ,Sales Order Trends,Продај Побарувања трендови
@@ -3782,7 +3786,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнителни трошоци
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Финансиска година Крај Датум
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не може да се филтрираат врз основа на ваучер Не, ако се групираат според ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Направете Добавувачот цитат
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Направете Добавувачот цитат
 DocType: Quality Inspection,Incoming,Дојдовни
 DocType: BOM,Materials Required (Exploded),Потребни материјали (експлодира)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додади корисниците на вашата организација, освен себе"
@@ -3810,6 +3814,7 @@
 DocType: Employee,History In Company,Во историјата на компанијата
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтени
 DocType: Stock Ledger Entry,Stock Ledger Entry,Акции Леџер Влегување
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиентите&gt; клиентот група&gt; Територија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Истата ставка се внесени повеќе пати
 DocType: Department,Leave Block List,Остави Забрани Листа
 DocType: Sales Invoice,Tax ID,Данок проект
@@ -3819,7 +3824,7 @@
 DocType: Customer,Sales Partner and Commission,Продажба партнер и на Комисијата
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стапка (%) / година
 ,Project Quantity,проектот Кол
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Вкупно {0} за сите предмети е нула, може да треба да се менува &quot;Дистрибуирање промени врз основа на&quot;"
 DocType: Opportunity,To Discuss,За да дискутираат
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} единици од {1} потребни {2} за да се заврши оваа трансакција.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стапка (%) Годишен
@@ -3834,7 +3839,7 @@
 DocType: Purchase Invoice,Return,Враќање
 DocType: Production Order Operation,Production Order Operation,Производството со цел Операција
 DocType: Pricing Rule,Disable,Оневозможи
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Начин на плаќање е потребно да се изврши плаќање
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Начин на плаќање е потребно да се изврши плаќање
 DocType: Project Task,Pending Review,Во очекување Преглед
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Асет {0} не може да се уништи, како што е веќе {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Вкупно Побарување за Расход (преку Побарување за Расход)
@@ -3842,11 +3847,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Отсутни
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута на Бум # {1} треба да биде еднаква на избраната валута {2}
 DocType: Journal Entry Account,Exchange Rate,На девизниот курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Продај Побарувања {0} не е поднесен
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,надомест Компонента
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,транспортен менаџмент
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Додадете ставки од
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Додадете ставки од
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацински {0}: Родител на сметка {1} не bolong на компанијата {2}
 DocType: Cheque Print Template,Regular,редовни
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Вкупно weightage на сите критериуми за оценување мора да биде 100%
@@ -3859,7 +3864,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Магацински {0} не постои
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистрирајте се за ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечен Процентите Дистрибуција
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,На избраната ставка не може да има Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,На избраната ставка не може да има Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","стапка на вреднување не најде за Точка {0}, кои се потребни да се направи на сметководствените ставки за {1} {2}. Ако објектот е transacting како вид на примерок во {1}, Ве молиме да се напомене дека во {1} маса точка. Ако не е, се создаде дојдовен акциите на трансакцијата за стапката на вреднување ставка или споменува во евиденцијата на објектот, а потоа се обиде доставување / поништување на овој запис"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% На материјалите доставени од ова за испорака
 DocType: Project,Customer Details,Детали за корисници
@@ -3868,15 +3873,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Внесете URL параметар за примачот бр
 DocType: Payment Entry,Paid Amount,Уплатениот износ
 DocType: Assessment Plan,Supervisor,супервизор
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,онлајн
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,онлајн
 ,Available Stock for Packing Items,Достапни берза за материјали за пакување
 DocType: Item Variant,Item Variant,Точка Варијанта
 DocType: Assessment Result Tool,Assessment Result Tool,Проценка Резултат алатката
 DocType: BOM Scrap Item,BOM Scrap Item,BOM на отпад/кало
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Поднесени налози не може да биде избришан
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Управување со квалитет
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Точка {0} е исклучена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Точка {0} е исклучена
 DocType: Employee Loan,Repay Fixed Amount per Period,Отплати фиксен износ за период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ве молиме внесете количество за Точка {0}
 DocType: Employee External Work History,Employee External Work History,Вработен Надворешни Историја работа
@@ -3903,7 +3908,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Студент e-mail проект
 DocType: Employee,Notice (days),Известување (во денови)
 DocType: Tax Rule,Sales Tax Template,Данок на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Изберете предмети за да се спаси фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Изберете предмети за да се спаси фактура
 DocType: Employee,Encashment Date,Датум на инкасо
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Акциите прилагодување
@@ -3927,7 +3932,7 @@
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Ве молиме наведете од / до движат
 DocType: Serial No,Under AMC,Според АМЦ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Точка стапка вреднување е пресметаните оглед слета ваучер износ на трошоците
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Точка стапка вреднување е пресметаните оглед слета ваучер износ на трошоците
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Стандардни нагодувања за продажни трансакции.
 DocType: Guardian,Guardian Of ,чувар на
 DocType: Grading Scale Interval,Threshold,праг
@@ -3937,6 +3942,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Задолжување Издадено
 DocType: Production Order,Warehouses,Магацини
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} средства не можат да се пренесат
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Оваа содржина е варијанта на {0} (дефиниција).
 DocType: Workstation,per hour,на час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,купување
 DocType: Announcement,Announcement,најава
@@ -3952,8 +3958,8 @@
 DocType: Account,Receivable,Побарувања
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Не е дозволено да се промени Добавувачот како веќе постои нарачка
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улогата што може да поднесе трансакции кои надминуваат кредитни лимити во собата.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изберете предмети за производство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Изберете предмети за производство
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Господар синхронизација на податоци, тоа може да потрае некое време"
 DocType: Item,Material Issue,Материјал Број
 DocType: Hub Settings,Seller Description,Продавачот Опис
 DocType: Employee Education,Qualification,Квалификација
@@ -3965,7 +3971,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Нареди
 DocType: Salary Detail,Component,компонента
 DocType: Assessment Criteria,Assessment Criteria Group,Критериуми за оценување група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отворање Акумулирана амортизација треба да биде помалку од еднаква на {0}
 DocType: Warehouse,Warehouse Name,Магацински Име
 DocType: Naming Series,Select Transaction,Изберете Трансакција
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ве молиме внесете Одобрување улога или одобрување на пристап
@@ -3978,7 +3984,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Не може да се откаже затоа што {0} постои поднесени берза Влегување
 DocType: Employee Loan,Disbursement Date,Датум на повлекување средства
 DocType: Vehicle,Vehicle,возило
 DocType: Purchase Invoice,In Words,Со зборови
@@ -3993,14 +3999,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / олово%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Средства амортизација и рамнотежа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Износот {0} {1} премина од {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Се аванси
 DocType: Email Digest,Add/Remove Recipients,Додадете / отстраните примачи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Трансакцијата не е дозволено против запре производството со цел {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да го поставите на оваа фискална година како стандарден, кликнете на &quot;Постави како стандарден&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Зачлени се
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Недостаток Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Постои ставка варијанта {0} со истите атрибути
 DocType: Employee Loan,Repay from Salary,Отплати од плата
 DocType: Leave Application,LAP/,КРУГ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Барајќи исплата од {0} {1} за износот {2}
@@ -4018,7 +4024,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Проценка Резултат детали
 DocType: Employee Education,Employee Education,Вработен образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Дупликат група точка најде во табелата на точката група
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Потребно е да се достигне цена Ставка Детали.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} е веќе доби
@@ -4027,7 +4033,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацински {0} не е поврзана со било која сметка, Ве молиме да креирате / водат соодветните (средства) се за склад."
 DocType: Purchase Invoice,Recurring Id,Повторувачки Id
 DocType: Customer,Sales Team Details,Тим за продажба Детали за
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Избриши засекогаш?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Избриши засекогаш?
 DocType: Expense Claim,Total Claimed Amount,Вкупен Износ на Побарувања
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијални можности за продажба.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважечки {0}
@@ -4038,13 +4044,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Конфигурирање на вашиот школа во ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),База промени Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Не сметководствените ставки за следните магацини
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,Последна нарачана Износ
+DocType: Task,Is Milestone,е Milestone
 DocType: Daily Work Summary,Email Sent To,-Мејл испратен до
 DocType: Budget,Warn,Предупреди
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било други забелешки, да се спомене напори кои треба да одат во евиденцијата."
@@ -4065,7 +4072,7 @@
 DocType: Item Attribute Value,Attribute Value,Вредноста на атрибутот
 ,Itemwise Recommended Reorder Level,Itemwise Препорачани Пренареждане ниво
 DocType: Salary Detail,Salary Detail,плата детали
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Ве молиме изберете {0} Првиот
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Ве молиме изберете {0} Првиот
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Серија {0} од ставка {1} е истечен.
 DocType: Sales Invoice,Commission,Комисијата
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Временски план за производство.
@@ -4077,41 +4084,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Замрзнување резерви Постарите Than` треба да биде помала од% d дена.
 DocType: Tax Rule,Purchase Tax Template,Купување Данок Шаблон
 ,Project wise Stock Tracking,Проектот мудро берза за следење
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Постои Распоред за одржување {0} од {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Крај Количина (на изворот на / target)
 DocType: Item Customer Detail,Ref Code,Реф законик
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Вработен евиденција.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Поставете Следна Амортизација Датум
 DocType: HR Settings,Payroll Settings,Settings Даноци
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Одговара на не-поврзани фактури и плаќања.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Поставите цел
 DocType: Email Digest,New Purchase Orders,Нови нарачки
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Корен не може да има цена центар родител
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Изберете бренд ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Изберете бренд ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,"Акумулираната амортизација, како на"
 DocType: Sales Invoice,C-Form Applicable,C-Форма Применливи
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операција на времето мора да биде поголема од 0 за операција {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Складиште е задолжително
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Детална UOM конверзија
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Чувајте го веб пријателски 900px (w) од 100пк (ж)
 DocType: Program,Program Abbreviation,Програмата Кратенка
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производство цел не може да се зголеми во однос на точка Шаблон
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Обвиненијата се ажурирани Набавка Потврда против секоја ставка
 DocType: Warranty Claim,Resolved By,Реши со
 DocType: Bank Guarantee,Start Date,Датум на почеток
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Распредели листови за одреден период.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити неправилно исчистена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,На сметка {0}: Вие не може да се додели како родител сметка
 DocType: Purchase Invoice Item,Price List Rate,Ценовник стапка
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Креирај понуди на клиентите
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Креирај понуди на клиентите
 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 +38,Bill of Materials (BOM),Бил на материјали (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Просечно време преземени од страна на снабдувачот да испорача
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Резултат оценување
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часови
 DocType: Project,Expected Start Date,Се очекува Почеток Датум
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Отстрани точка ако обвиненијата не се применува на таа ставка
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Валута трансакција мора да биде иста како и за исплата портал валута
 DocType: Payment Entry,Receive,Добивате
@@ -4122,19 +4128,19 @@
 DocType: Workstation,Operating Costs,Оперативни трошоци
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција доколку акумулираните Месечен буџет пречекорување
 DocType: Purchase Invoice,Submit on creation,Достават на создавањето
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Валута за {0} мора да биде {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Валута за {0} мора да биде {1}
 DocType: Asset,Disposal Date,отстранување Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Пораките ќе бидат испратени до сите активни вработени на компанијата во дадениот час, ако тие немаат одмор. Резиме на одговорите ќе бидат испратени на полноќ."
 DocType: Employee Leave Approver,Employee Leave Approver,Вработен Остави Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ред {0}: Тоа е внесување Пренареждане веќе постои за оваа магацин {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не може да се декларираат како изгубени, бидејќи цитат е направен."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Повратни информации
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производство на налози {0} мора да се поднесе
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ве молиме одберете Start Датум и краен датум за Точка {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курсот е задолжително во ред {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До денес не може да биде пред од денот
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додај / Уреди цени
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додај / Уреди цени
 DocType: Batch,Parent Batch,родител Batch
 DocType: Batch,Parent Batch,родител Batch
 DocType: Cheque Print Template,Cheque Print Template,Чек Шаблон за печатење
@@ -4148,7 +4154,7 @@
 ,Ordered Items To Be Delivered,Нарачани да бидат испорачани
 DocType: Account,Income,Приходи
 DocType: Industry Type,Industry Type,Индустрија Тип
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Нешто не беше во ред!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нешто не беше во ред!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Предупредување: Оставете апликација ги содржи следниве датуми блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Продажната Фактура {0} веќе е поднесена
 DocType: Assessment Result Detail,Score,резултат
@@ -4179,17 +4185,17 @@
 DocType: Item,Variant Based On,Варијанта врз основа на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Вкупно weightage доделени треба да биде 100%. Тоа е {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Вашите добавувачи
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не може да се постави како изгубени како Продај Побарувања е направен.
 DocType: Request for Quotation Item,Supplier Part No,Добавувачот Дел Не
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Добиени од
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не може да се одбие кога категорија е наменета за &quot;оценка&quot; или &quot;Vaulation и вкупно&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Добиени од
 DocType: Lead,Converted,Конвертираната
 DocType: Item,Has Serial No,Има серија №
 DocType: Employee,Date of Issue,Датум на издавање
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Од {0} {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Од {0} {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ред # {0}: Постави Добавувачот за ставката {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ред {0}: часови вредност мора да биде поголема од нула.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Веб-страница на слика {0} прилог Точка {1} Не може да се најде
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Листа на оваа точка во повеќе групи на веб страната.
@@ -4198,20 +4204,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Немате дозвола да го поставите Замрзнати вредност
 DocType: Payment Reconciliation,Get Unreconciled Entries,Земете неусогласеност записи
 DocType: Payment Reconciliation,From Invoice Date,Фактура од Датум
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Платежна валута мора да биде еднаков на валута или партиската сметка валута или comapany е стандардно
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставете Инкасо
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Што да направам?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да се Магацински
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Сите студентски приемните
 ,Average Commission Rate,Просечната стапка на Комисијата
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Серискиот број"" не може да биде ""Да"" за не-складишни ставки"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Публика не можат да бидат означени за идните датуми
 DocType: Pricing Rule,Pricing Rule Help,Цените Правило Помош
 DocType: School House,House Name,Име куќа
 DocType: Purchase Taxes and Charges,Account Head,Сметка на главата
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Ажурирање на дополнителни трошоци за да се пресмета слета трошоците за предмети
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електрични
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додадете го остатокот од вашата организација, како на вашите корисници. Можете исто така да ги покани на клиентите да вашиот портал со додавање на нив од Contacts"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додадете го остатокот од вашата организација, како на вашите корисници. Можете исто така да ги покани на клиентите да вашиот портал со додавање на нив од Contacts"
 DocType: Stock Entry,Total Value Difference (Out - In),Вкупно Разлика во Вредност (Излез - Влез)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4220,7 +4226,7 @@
 DocType: Item,Customer Code,Код на клиентите
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Роденден Потсетник за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дена од денот на нарачка
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Должење на сметка мора да биде на сметка Биланс на состојба
 DocType: Buying Settings,Naming Series,Именување Серија
 DocType: Leave Block List,Leave Block List Name,Остави Забрани Листа на Име
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Дата на започнување осигурување треба да биде помал од осигурување Дата на завршување
@@ -4235,9 +4241,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Плата фиш на вработените {0} веќе создадена за време лист {1}
 DocType: Vehicle Log,Odometer,километража
 DocType: Sales Order Item,Ordered Qty,Нареди Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Ставката {0} е оневозможено
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Ставката {0} е оневозможено
 DocType: Stock Settings,Stock Frozen Upto,Акции Замрзнати до
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не содржи количини
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM не содржи количини
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период од периодот и роковите на задолжителна за периодични {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна активност / задача.
 DocType: Vehicle Log,Refuelling Details,Полнење Детали
@@ -4247,8 +4253,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Последните купување стапка не е пронајден
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпише Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,платежна часа
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Аватарот на бирото за {0} не е пронајден
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ред # {0}: Поставете редоследот квантитетот
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Допрете ставки за да го додадете ги овде
 DocType: Fees,Program Enrollment,програма за запишување
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слета Цена на ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ве молиме да се постави {0}
@@ -4272,7 +4279,7 @@
 DocType: Maintenance Visit,Maintenance Date,Датум на одржување
 DocType: Purchase Invoice Item,Rejected Serial No,Одбиени Сериски Не
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Година датум за почеток или крај датум се преклопуваат со {0}. За да се избегне молам постави компанијата
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Датум на почеток треба да биде помал од крајот датум за Точка {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,Upload Публика
@@ -4349,7 +4356,6 @@
 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,Крстот на оглас на точка во повеќе групи
-DocType: Grade Interval,Grade Interval,одделение Интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Почеток Датум и фискалната година Крај Датум веќе се поставени во фискалната {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Дозвола Датум ажурирани
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит Batch
@@ -4396,14 +4402,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Оставете неизбрано ако не сакате да се разгледа серија правејќи се разбира врз основа групи.
 DocType: Asset,Frequency of Depreciation (Months),Фреквенција на амортизација (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитна сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Кредитна сметка
 DocType: Landed Cost Item,Landed Cost Item,Слета Цена Точка
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Прикажи нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина на ставки добиени по производство / препакувани од дадени количини на суровини
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Поставување на едноставен веб-сајт за мојата организација
 DocType: Payment Reconciliation,Receivable / Payable Account,Побарувања / Платив сметка
 DocType: Delivery Note Item,Against Sales Order Item,Во однос на ставка од продажна нарачка
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ве молиме наведете Атрибут Вредноста за атрибутот {0}
 DocType: Item,Default Warehouse,Стандардно Магацински
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџетот не може да биде доделен од група на сметка {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ве молиме внесете цена центар родител
@@ -4449,7 +4455,7 @@
 DocType: Opportunity Item,Basic Rate,Основната стапка
 DocType: GL Entry,Credit Amount,Износ на кредитот
 DocType: Cheque Print Template,Signatory Position,потписник Позиција
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Постави како изгубени
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Постави како изгубени
 DocType: Timesheet,Total Billable Hours,Вкупно фактурираните часа
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаќање Потврда Забелешка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ова е врз основа на трансакциите од овој корисник. Види времеплов подолу за детали
@@ -4463,11 +4469,11 @@
 ,Items To Be Requested,Предмети да се бара
 DocType: Purchase Order,Get Last Purchase Rate,Земете Последна Набавка стапка
 DocType: Company,Company Info,Инфо за компанијата
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изберете или да додадете нови клиенти
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Изберете или да додадете нови клиенти
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,центар за трошоци е потребно да се резервира на барање за сметка
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Примена на средства (средства)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ова се базира на присуството на вработениот
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебитни сметка
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Дебитни сметка
 DocType: Fiscal Year,Year Start Date,Година започнува на Датум
 DocType: Attendance,Employee Name,Име на вработениот
 DocType: Sales Invoice,Rounded Total (Company Currency),Вкупно Заокружено (Валута на Фирма)
@@ -4476,13 +4482,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп за корисниците од правење Остави апликации на наредните денови.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,купување износ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Добавувачот Цитати {0} создадена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Крајот на годината не може да биде пред почетокот на годината
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Користи за вработените
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Поставете стандардно летни Листа за вработените {0} или куќа {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постои
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не постои
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Сметки се зголеми на клиенти.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,На проект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Нема {0}: Износ не може да биде поголема од До Износ против расходи Тврдат {1}. Во очекување сума е {2}
@@ -4491,15 +4497,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Центар
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Ценовник не е пронајдена или со посебни потреби
 DocType: Employee Loan Application,Approved,Одобрени
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Вработен ослободен на {0} мора да биде поставено како &quot;Лево&quot;
 DocType: Guardian,Guardian,Гардијан
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Процена {0} создадена за вработените {1} во дадениот период
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
 DocType: Selling Settings,Campaign Naming By,Именувањето на кампањата од страна на
 DocType: Employee,Current Address Is,Тековни адреса е
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,изменета
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опционални. Ја поставува стандардната валута компанијата, ако не е одредено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Сметководствени записи во дневникот.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Количина на располагање од магацин
@@ -4508,7 +4516,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Забава / профилот не се поклопува со {1} / {2} со {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ве молиме внесете сметка сметка
 DocType: Account,Stock,На акции
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референтен документ тип треба да биде еден од нарачка, купување фактура или весник Влегување"
 DocType: Employee,Current Address,Тековна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако предмет е варијанта на друг елемент тогаш опис, слики, цени, даноци и слично ќе бидат поставени од дефиниција освен ако експлицитно не е наведено"
 DocType: Serial No,Purchase / Manufacture Details,Купување / Производство Детали за
@@ -4536,7 +4544,7 @@
 DocType: Hub Settings,Hub Settings,Settings центар
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Со операции
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Сметководствени записи се веќе направени во валута {0} за компанија {1}. Ве молиме одберете побарувања или треба да се плати сметката со валутна {0}.
 DocType: Asset,Is Existing Asset,Е постојните средства
 DocType: Salary Detail,Statistical Component,Компонента за статистика
 DocType: Salary Detail,Statistical Component,Компонента за статистика
@@ -4561,7 +4569,7 @@
 DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Однапред платени
 DocType: Item,Item Tax,Точка Данок
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Материјал на Добавувачот
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Материјал на Добавувачот
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Акцизни Фактура
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% чини повеќе од еднаш
 DocType: Expense Claim,Employees Email Id,Вработените-пошта Id
@@ -4592,9 +4600,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикачи Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,акции степени
 DocType: Customer,Commission Rate,Комисијата стапка
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Направи Варијанта
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Направи Варијанта
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Апликации одмор блок од страна на одделот.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип на плаќање мора да биде еден од примање, Плати и внатрешен трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,анализатор
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Кошничка е празна
 DocType: Vehicle,Model,модел
@@ -4605,6 +4613,7 @@
 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 +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Прикажи јавни додатоци
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детали за
 DocType: Payment Gateway Account,Payment Gateway Account,Исплата Портал профил
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,По уплатата пренасочува корисникот да избраната страница.
@@ -4623,15 +4632,15 @@
 DocType: Batch,Expiry Date,Датумот на истекување
 ,Supplier Addresses and Contacts,Добавувачот адреси и контакти
 ,accounts-browser,сметки пребарувач
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Ве молиме изберете категорија во првата
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Ве молиме изберете категорија во првата
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Господар на проектот.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Да им овозможи на над-платежна или над-нарачување, ажурирање &quot;додаток&quot; во парк Прилагодувања или точка."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не покажува никакви симбол како $ итн до валути.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола ден)
 DocType: Supplier,Credit Days,Кредитна дена
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Направете Студентски Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Направете Студентски Batch
 DocType: Leave Type,Is Carry Forward,Е пренесување
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Земи ставки од BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Земи ставки од BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Потенцијален клиент Време Денови
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Праќање пораки во Датум мора да биде иста како датум на купување {1} на средства {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ве молиме внесете Продај Нарачка во горната табела
@@ -4648,8 +4657,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Износ санкционира
 DocType: GL Entry,Is Opening,Се отвора
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ред {0}: Дебитна влез не можат да бидат поврзани со {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ве молиме поставете брои серија за присуство преку поставување&gt; нумерација Серија
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 a3d0f38..adfbe1b 100644
--- a/erpnext/translations/ml.csv
+++ b/erpnext/translations/ml.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,വാടകയ്ക്ക് എടുത്തത്
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ഉപയോക്താവ് ബാധകമായ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","പ്രൊഡക്ഷൻ ഓർഡർ റദ്ദാക്കാൻ ആദ്യം Unstop, റദ്ദാക്കാൻ കഴിയില്ല നിർത്തി"
 DocType: Vehicle Service,Mileage,മൈലേജ്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ശരിക്കും ഈ അസറ്റ് മുൻസർക്കാരിന്റെ ആഗ്രഹിക്കുന്നുണ്ടോ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,സ്വതേ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,സ്വതേ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},കറൻസി വില പട്ടിക {0} ആവശ്യമാണ്
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ഇടപാടിലും കണക്കു കൂട്ടുക.
 DocType: Purchase Order,Customer Contact,കസ്റ്റമർ കോൺടാക്റ്റ്
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),പ്രമുഖ {0} പൂജ്യം ({1}) കുറവായിരിക്കണം കഴിയില്ല വേണ്ടി
 DocType: Manufacturing Settings,Default 10 mins,10 മിനിറ്റ് സ്വതേ സ്വതേ
 DocType: Leave Type,Leave Type Name,ടൈപ്പ് പേര് വിടുക
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,തുറക്കുക കാണിക്കുക
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,തുറക്കുക കാണിക്കുക
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,സീരീസ് വിജയകരമായി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ചെക്ക് ഔട്ട്
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ജേണൽ എൻട്രി സമർപ്പിച്ചു
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,ബാച്ച് ഇനം കാലഹരണപ്പെടൽ അവസ്ഥ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ബാങ്ക് ഡ്രാഫ്റ്റ്
 DocType: Mode of Payment Account,Mode of Payment Account,പേയ്മെന്റ് അക്കൗണ്ട് മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ഷോ രൂപഭേദങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ഷോ രൂപഭേദങ്ങൾ
 DocType: Academic Term,Academic Term,അക്കാദമിക് ടേം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,മെറ്റീരിയൽ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ക്വാണ്ടിറ്റി
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,അക്കൗണ്ടുകൾ മേശ ശൂന്യമായിടരുത്.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),വായ്പകൾ (ബാദ്ധ്യതകളും)
 DocType: Employee Education,Year of Passing,പാസ് ആയ വര്ഷം
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","പരാമർശം:% ങ്ങൾ, ഇനം കോഡ്:% s കസ്റ്റമർ:% ങ്ങള്"
 DocType: Item,Country of Origin,മാതൃരാജ്യം
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,സ്റ്റോക്കുണ്ട്
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,തുറന്ന പ്രശ്നങ്ങൾ
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ആരോഗ്യ പരിരക്ഷ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),പേയ്മെന്റ് കാലതാമസം (ദിവസം)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,സേവന ചിലവേറിയ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,വികയപതം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},സീരിയൽ നമ്പർ: {0} ഇതിനകം സെയിൽസ് ഇൻവോയ്സ് പരാമർശിച്ചിരിക്കുന്ന ആണ്: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,വികയപതം
 DocType: Maintenance Schedule Item,Periodicity,ഇതേ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,സാമ്പത്തിക വർഷത്തെ {0} ആവശ്യമാണ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,പ്രതീക്ഷിക്കുന്ന ഡെലിവറി തീയതിയും സെയിൽസ് ഓർഡർ തീയതി മുമ്പ് വേണ്ടത്
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","രണ്ടു നിരകൾ, പഴയ പേര് ഒന്നു പുതിയ പേര് ഒന്നു കൂടി .csv ഫയൽ അറ്റാച്ച്"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} അല്ല സജീവമായ സാമ്പത്തിക വർഷത്തിൽ.
 DocType: Packed Item,Parent Detail docname,പാരന്റ് വിശദാംശം docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","പരാമർശം: {2}: {0}, ഇനം കോഡ്: {1} ഉപഭോക്തൃ"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,കി. ഗ്രാം
 DocType: Student Log,Log,പ്രവേശിക്കുക
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ഒരു ജോലിക്കായി തുറക്കുന്നു.
 DocType: Item Attribute,Increment,വർദ്ധന
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,വെയർഹൗസ് തിരഞ്ഞെടുക്കുക ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,അഡ്വർടൈസിങ്
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ഒരേ കമ്പനി ഒന്നിലധികം തവണ നൽകുമ്പോഴുള്ള
 DocType: Employee,Married,വിവാഹിത
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} അനുവദനീയമല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} അനുവദനീയമല്ല
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,നിന്ന് ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},ഓഹരി ഡെലിവറി നോട്ട് {0} നേരെ അപ്ഡേറ്റ് ചെയ്യാൻ സാധിക്കില്ല
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ഉൽപ്പന്ന {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ഇനങ്ങളൊന്നും ലിസ്റ്റ്
 DocType: Payment Reconciliation,Reconcile,രഞ്ജിപ്പുണ്ടാക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,പലചരക്ക്
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 DocType: Process Payroll,Make Bank Entry,ബാങ്ക് എൻട്രി നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,പെൻഷൻ ഫണ്ട്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി വാങ്ങിയ തിയതി ആകരുത്
 DocType: SMS Center,All Sales Person,എല്ലാ സെയിൽസ് വ്യാക്തി
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** പ്രതിമാസ വിതരണം ** നിങ്ങളുടെ ബിസിനസ്സിൽ seasonality ഉണ്ടെങ്കിൽ മാസം ഉടനീളം ബജറ്റ് / target വിതരണം സഹായിക്കുന്നു.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,കണ്ടെത്തിയില്ല ഇനങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,ശമ്പള ഘടന കാണാതായ
 DocType: Lead,Person Name,വ്യക്തി നാമം
 DocType: Sales Invoice Item,Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ഉദാ: &quot;പ്രൈമറി സ്കൂൾ&quot; അല്ലെങ്കിൽ &quot;യൂണിവേഴ്സിറ്റി&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,ഓഹരി റിപ്പോർട്ടുകൾ
 DocType: Warehouse,Warehouse Detail,വെയർഹൗസ് വിശദാംശം
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ക്രെഡിറ്റ് പരിധി {1} / {2} {0} ഉപഭോക്താവിന് മുറിച്ചുകടന്നു ചെയ്തു
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,ടേം അവസാന തീയതി പിന്നീട് ഏത് പദം (അക്കാദമിക് വർഷം {}) ബന്ധിപ്പിച്ചിട്ടുള്ളാതാവനായി അക്കാദമിക വർഷത്തിന്റെ വർഷം അവസാനം തീയതി കൂടുതലാകാൻ പാടില്ല. എൻറർ ശരിയാക്കി വീണ്ടും ശ്രമിക്കുക.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ഫിക്സ്ഡ് സ്വത്ത്&quot; അസറ്റ് റെക്കോർഡ് ഇനം നേരെ നിലവിലുള്ളതിനാൽ, അൺചെക്കുചെയ്തു പാടില്ല"
 DocType: Vehicle Service,Brake Oil,ബ്രേക്ക് ഓയിൽ
 DocType: Tax Rule,Tax Type,നികുതി തരം
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},നിങ്ങൾ {0} മുമ്പായി എൻട്രികൾ ചേർക്കാൻ അല്ലെങ്കിൽ അപ്ഡേറ്റ് ചെയ്യാൻ അധികാരമില്ല
 DocType: BOM,Item Image (if not slideshow),ഇനം ഇമേജ് (അതില് അല്ല എങ്കിൽ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ഒരു കസ്റ്റമർ സമാന പേരിൽ നിലവിലുണ്ട്
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(അന്ത്യസമയം റേറ്റ് / 60) * യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM ൽ തിരഞ്ഞെടുക്കുക
 DocType: SMS Log,SMS Log,എസ്എംഎസ് ലോഗ്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,കൈമാറി ഇനങ്ങൾ ചെലവ്
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,ന് {0} അവധി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള അല്ല
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,സ്കൂളുകൾ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},വേണ്ടി {1} {0} ജീവനക്കാരൻ കണ്ടെത്തിയില്ല ലീവ് റിക്കോർഡുകളൊന്നും
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ആദ്യം കമ്പനി നൽകുക
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,കമ്പനി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,മൊത്തം ചെലവ്
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,ക്ലെയിം തുക
 DocType: Employee,Mr,മിസ്റ്റർ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer ഗ്രൂപ്പ് പട്ടികയിൽ കണ്ടെത്തി തനിപ്പകർപ്പ് ഉപഭോക്തൃ ഗ്രൂപ്പ്
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,വിതരണക്കമ്പനിയായ ടൈപ്പ് / വിതരണക്കാരൻ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,വിതരണക്കമ്പനിയായ ടൈപ്പ് / വിതരണക്കാരൻ
 DocType: Naming Series,Prefix,പ്രിഫിക്സ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,ലോകോത്തര
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,പദവി
 DocType: Sales Invoice Item,Delivered By Supplier,വിതരണക്കാരൻ രക്ഷപ്പെടുത്തി
 DocType: SMS Center,All Contact,എല്ലാ കോൺടാക്റ്റ്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ഇതിനകം BOM ലേക്ക് എല്ലാ ഇനങ്ങളും സൃഷ്ടിച്ച പ്രൊഡക്ഷൻ ഓർഡർ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,വാർഷിക ശമ്പളം
 DocType: Daily Work Summary,Daily Work Summary,നിത്യജീവിതത്തിലെ ഔദ്യോഗിക ചുരുക്കം
 DocType: Period Closing Voucher,Closing Fiscal Year,അടയ്ക്കുന്ന ധനകാര്യ വർഷം
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} മരവിച്ചു
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} മരവിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട് സൃഷ്ടിക്കുന്നതിനുള്ള കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,സ്റ്റോക്ക് ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ടാർഗെറ്റ് വെയർഹൗസ് തിരഞ്ഞെടുക്കുക
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,കോൺട്ര എൻട്രി
 DocType: Journal Entry Account,Credit in Company Currency,കമ്പനി കറൻസി ക്രെഡിറ്റ്
 DocType: Delivery Note,Installation Status,ഇന്സ്റ്റലേഷന് അവസ്ഥ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",നിങ്ങൾ ഹാജർ അപ്ഡേറ്റ് ചെയ്യാൻ താൽപ്പര്യമുണ്ടോ? <br> അവതരിപ്പിക്കുക: {0} \ <br> നിലവില്ല: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},സമ്മതിച്ച + Qty ഇനം {0} ലഭിച്ചത് അളവ് തുല്യമോ ആയിരിക്കണം നിരസിച്ചു
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,വാങ്ങൽ വേണ്ടി സപ്ലൈ അസംസ്കൃത വസ്തുക്കൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,പേയ്മെന്റ് കുറഞ്ഞത് ഒരു മോഡ് POS ൽ ഇൻവോയ്സ് ആവശ്യമാണ്.
 DocType: Products Settings,Show Products as a List,ഒരു പട്ടിക ഉൽപ്പന്നങ്ങൾ കാണിക്കുക
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ഫലകം ഡൗൺലോഡ്, ഉചിതമായ ഡാറ്റ പൂരിപ്പിക്കുക പ്രമാണത്തെ കൂട്ടിച്ചേർക്കുക. തിരഞ്ഞെടുത്ത കാലയളവിൽ എല്ലാ തീയതി ജീവനക്കാരൻ കോമ്പിനേഷൻ നിലവിലുള്ള ഹാജർ രേഖകളുമായി, ടെംപ്ലേറ്റ് വരും"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,മൂല്യത്തകർച്ച എൻട്രി നിർമ്മിക്കുക
 DocType: Appraisal Template Goal,KRA,ക്ര
 DocType: Lead,Request Type,അഭ്യർത്ഥന തരം
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ജീവനക്കാരുടെ നിർമ്മിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,പ്രക്ഷേപണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,വധശിക്ഷയുടെ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,പ്രവർത്തനങ്ങൾ വിശദാംശങ്ങൾ പുറത്തു കൊണ്ടുപോയി.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,അറ്റകുറ്റപ്പണി സന്ദർശനവേളയിൽ പ്ലാൻ.
 DocType: SMS Settings,Enter url parameter for message,സന്ദേശം വേണ്ടി URL പാരമീറ്റർ നൽകുക
 DocType: POS Profile,Customer Groups,ഉപഭോക്തൃ ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,സാമ്പത്തിക പ്രസ്താവനകൾ
 DocType: Guardian,Students,വിദ്യാർത്ഥികൾ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,വിലനിർണ്ണയവും നല്കിയിട്ടുള്ള അപേക്ഷിക്കുവാനുള്ള നിയമങ്ങൾ.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,വില പട്ടിക വാങ്ങുമ്പോള് വില്ക്കുകയും ബാധകമായ ആയിരിക്കണം
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},അഡ്വാൻസ് തുക {0} {1} ശ്രേഷ്ഠ പാടില്ല
 DocType: Naming Series,Series List for this Transaction,ഈ ഇടപാടിനായി സീരീസ് പട്ടിക
 DocType: Company,Default Payroll Payable Account,സ്ഥിരസ്ഥിതി പേയ്റോൾ അടയ്ക്കേണ്ട അക്കൗണ്ട്
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,അപ്ഡേറ്റ് ഇമെയിൽ ഗ്രൂപ്പ്
 DocType: Sales Invoice,Is Opening Entry,എൻട്രി തുറക്കുകയാണ്
 DocType: Customer Group,Mention if non-standard receivable account applicable,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് ബാധകമാണെങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Course Schedule,Instructor Name,പരിശീലകൻ പേര്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,വെയർഹൗസ് ആവശ്യമാണ് എന്ന മുമ്പ് സമർപ്പിക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,റീസെല്ലറിൽ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","പരിശോധിച്ചാൽ, മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ അല്ലാത്ത സ്റ്റോക്ക് ഇനങ്ങൾ ഉൾപ്പെടുത്തും."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,സെയിൽസ് ഇൻവോയിസ് ഇനം എഗെൻസ്റ്റ്
 ,Production Orders in Progress,പുരോഗതിയിലാണ് പ്രൊഡക്ഷൻ ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ഫിനാൻസിംഗ് നിന്നുള്ള നെറ്റ് ക്യാഷ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
 DocType: Lead,Address & Contact,വിലാസം &amp; ബന്ധപ്പെടാനുള്ള
 DocType: Leave Allocation,Add unused leaves from previous allocations,മുൻ വിഹിതം നിന്ന് ഉപയോഗിക്കാത്ത ഇലകൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},അടുത്തത് ആവർത്തിക്കുന്നു {0} {1} സൃഷ്ടിക്കപ്പെടും
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),ആകെ ആറെണ്ണവും തുക (ടൈം ഷീറ്റ് വഴി)
 DocType: Item Website Specification,Item Website Specification,ഇനം വെബ്സൈറ്റ് സ്പെസിഫിക്കേഷൻ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,വിടുക തടയപ്പെട്ട
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ബാങ്ക് എൻട്രികൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},ഇനം {0} {1} ജീവിതം അതിന്റെ അവസാനം എത്തിയിരിക്കുന്നു
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ബാങ്ക് എൻട്രികൾ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,വാർഷിക
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,ഓഹരി അനുരഞ്ജനം ഇനം
 DocType: Stock Entry,Sales Invoice No,സെയിൽസ് ഇൻവോയിസ് ഇല്ല
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,ഹബ് ലെ പ്രസിദ്ധീകരിക്കുക
 DocType: Student Admission,Student Admission,വിദ്യാർത്ഥിയുടെ അഡ്മിഷൻ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,ഇനം {0} റദ്ദാക്കി
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Bank Reconciliation,Update Clearance Date,അപ്ഡേറ്റ് ക്ലിയറൻസ് തീയതി
 DocType: Item,Purchase Details,വിശദാംശങ്ങൾ വാങ്ങുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},ഇനം {0} വാങ്ങൽ ഓർഡർ {1} ൽ &#39;അസംസ്കൃത വസ്തുക്കളുടെ നൽകിയത് മേശയിൽ കണ്ടെത്തിയില്ല
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ക്ലിയർ നിലവിലുള്ള ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 DocType: Item,Synced With Hub,ഹബ് കൂടി സമന്വയിപ്പിച്ചു
 DocType: Vehicle,Fleet Manager,ഫ്ലീറ്റ് മാനേജർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},വരി # {0}: {1} ഇനം {2} നെഗറ്റീവ് പാടില്ല
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,തെറ്റായ പാസ്വേഡ്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},വരി # {0}: {1} ഇനം {2} നെഗറ്റീവ് പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,തെറ്റായ പാസ്വേഡ്
 DocType: Item,Variant Of,ഓഫ് വേരിയന്റ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',പൂർത്തിയാക്കി Qty &#39;Qty നിർമ്മിക്കാനുള്ള&#39; വലുതായിരിക്കും കഴിയില്ല
 DocType: Period Closing Voucher,Closing Account Head,അടയ്ക്കുന്ന അക്കൗണ്ട് ഹെഡ്
 DocType: Employee,External Work History,പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,വൃത്താകൃതിയിലുള്ള റഫറൻസ് പിശക്
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ഓട്ടോമാറ്റിക് മെറ്റീരിയൽ അഭ്യർത്ഥന സൃഷ്ടിക്ക് ന് ഇമെയിൽ വഴി അറിയിക്കുക
 DocType: Journal Entry,Multi Currency,മൾട്ടി കറൻസി
 DocType: Payment Reconciliation Invoice,Invoice Type,ഇൻവോയിസ് തരം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ഡെലിവറി നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ഡെലിവറി നോട്ട്
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,നികുതികൾ സജ്ജമാക്കുന്നു
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,വിറ്റത് അസറ്റ് ചെലവ്
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,നിങ്ങൾ അതു കടിച്ചുകീറി ശേഷം പെയ്മെന്റ് എൻട്രി പരിഷ്ക്കരിച്ചു. വീണ്ടും തുടയ്ക്കുക ദയവായി.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
-DocType: Grade Interval,Min Score,കുറഞ്ഞത് സ്കോർ
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ഇനം നികുതി തവണ പ്രവേശിച്ചപ്പോൾ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ഈ ആഴ്ച തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾക്കായി ചുരുക്കം
 DocType: Student Applicant,Admitted,പ്രവേശിപ്പിച്ചു
 DocType: Workstation,Rent Cost,രെംട് ചെലവ്
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ഓർഡർ മൂല്യം
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,പാർട്ടി വിരുദ്ധ അല്ലെങ്കിൽ ആന്തരിക കൈമാറ്റം ബാങ്ക് / ക്യാഷ് ഇടപാടുകൾ
 DocType: Shipping Rule,Valid for Countries,രാജ്യങ്ങൾ സാധുവായ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ഈ ഇനം ഒരു ഫലകം ആണ് ഇടപാടുകൾ ഉപയോഗിക്കാവൂ കഴിയില്ല. &#39;നോ പകർത്തുക&#39; വെച്ചിരിക്കുന്നു ചെയ്തിട്ടില്ലെങ്കിൽ ഇനം ആട്റിബ്യൂട്ടുകൾക്ക് വകഭേദങ്ങളും കടന്നുവന്നു പകർത്തുന്നു
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ആകെ ഓർഡർ പരിഗണിക്കും
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ജീവനക്കാർ പദവിയും (ഉദാ സിഇഒ, ഡയറക്ടർ മുതലായവ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ഫീൽഡ് മൂല്യം &#39;ഡേ മാസം ആവർത്തിക്കുക&#39; നൽകുക
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},വരി # {0}: വാങ്ങൽ ഇൻവോയ്സ് നിലവിലുള്ള അസറ്റ് {1} നേരെ ഉണ്ടാക്കി കഴിയില്ല
 DocType: Item Tax,Tax Rate,നികുതി നിരക്ക്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ഇതിനകം കാലാവധിയിൽ എംപ്ലോയിസ് {1} അനുവദിച്ചിട്ടുണ്ട് {2} {3} വരെ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,വാങ്ങൽ ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു ആണ്
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},വരി # {0}: ബാച്ച് ഇല്ല {1} {2} അതേ ആയിരിക്കണം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,നോൺ-ഗ്രൂപ്പ് പരിവർത്തനം
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ഒരു ഇനത്തിന്റെ ബാച്ച് (ചീട്ടു).
 DocType: C-Form Invoice Detail,Invoice Date,രസീത് തീയതി
 DocType: GL Entry,Debit Amount,ഡെബിറ്റ് തുക
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},മാത്രം {0} {1} കമ്പനി 1 അക്കൗണ്ട് ഉണ്ട് ആകാം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,അറ്റാച്ച്മെന്റ് ദയവായി
 DocType: Purchase Order,% Received,% ലഭിച്ചു
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,വിദ്യാർത്ഥി ഗ്രൂപ്പുകൾ സൃഷ്ടിക്കുക
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,ക്വട്ടേഷൻ അഭ്യർത്ഥന
 DocType: Salary Slip Timesheet,Working Hours,ജോലിചെയ്യുന്ന സമയം
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,നിലവിലുള്ള ഒരു പരമ്പരയിലെ തുടങ്ങുന്ന / നിലവിലെ ക്രമസംഖ്യ മാറ്റുക.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
-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.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ഒരു പുതിയ കസ്റ്റമർ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","ഒന്നിലധികം പ്രൈസിങ് നിയമങ്ങൾ വിജയം തുടരുകയാണെങ്കിൽ, ഉപയോക്താക്കൾക്ക് വൈരുദ്ധ്യം പരിഹരിക്കാൻ മാനുവലായി മുൻഗണന സജ്ജീകരിക്കാൻ ആവശ്യപ്പെട്ടു."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,വാങ്ങൽ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 ,Purchase Register,രജിസ്റ്റർ വാങ്ങുക
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ബാധകമായ നിരക്കുകളും
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) പങ്ക് &#39;അനുവാദ Approver&#39; ഉണ്ടായിരിക്കണം
 DocType: Purchase Receipt,Vehicle Date,വാഹന തീയതി
 DocType: Student Log,Medical,മെഡിക്കൽ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,നഷ്ടപ്പെടുമെന്നു കാരണം
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ലീഡ് ഉടമ ലീഡ് അതേ പാടില്ല
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,പദ്ധതി തുക unadjusted തുക ശ്രേഷ്ഠ കഴിയില്ല
 DocType: Announcement,Receiver,റിസീവർ
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,"ക്വാണ്ടിറ്റി, റേറ്റ്"
 DocType: Delivery Note,% Installed,% ഇൻസ്റ്റാളുചെയ്തു
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ക്ലാസ്മുറിയുടെ / ലബോറട്ടറീസ് തുടങ്ങിയവ പ്രഭാഷണങ്ങളും ഷെഡ്യൂൾ കഴിയും.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,കമ്പനിയുടെ പേര് ആദ്യം നൽകുക
 DocType: Purchase Invoice,Supplier Name,വിതരണക്കാരൻ പേര്
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext മാനുവൽ വായിക്കുക
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,നിർബന്ധമായ ഒരു ഫീൽഡ് - അക്കാദമിക് വർഷം
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,നിർബന്ധമായ ഒരു ഫീൽഡ് - അക്കാദമിക് വർഷം
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ആ ഇമെയിൽ ഭാഗമായി പോകുന്ന ആമുഖ വാചകം ഇഷ്ടാനുസൃതമാക്കുക. ഓരോ ഇടപാട് ഒരു പ്രത്യേക ആമുഖ ടെക്സ്റ്റ് ഉണ്ട്.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},കമ്പനി {0} സ്ഥിരസ്ഥിതി മാറാവുന്ന അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,എല്ലാ നിർമാണ പ്രക്രിയകൾ വേണ്ടി ആഗോള ക്രമീകരണങ്ങൾ.
 DocType: Accounts Settings,Accounts Frozen Upto,ശീതീകരിച്ച വരെ അക്കൗണ്ടുകൾ
 DocType: SMS Log,Sent On,ദിവസം അയച്ചു
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ഗുണ {0} വിശേഷണങ്ങൾ പട്ടിക ഒന്നിലധികം തവണ തെരഞ്ഞെടുത്തു
 DocType: HR Settings,Employee record is created using selected field. ,ജീവനക്കാർ റെക്കോർഡ് തിരഞ്ഞെടുത്ത ഫീൽഡ് ഉപയോഗിച്ച് സൃഷ്ടിക്കപ്പെട്ടിരിക്കുന്നത്.
 DocType: Sales Order,Not Applicable,ബാധകമല്ല
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,ഹോളിഡേ മാസ്റ്റർ.
 DocType: Request for Quotation Item,Required Date,ആവശ്യമായ തീയതി
 DocType: Delivery Note,Billing Address,ബില്ലിംഗ് വിലാസം
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,ഇനം കോഡ് നൽകുക.
 DocType: BOM,Costing,ആറെണ്ണവും
 DocType: Tax Rule,Billing County,ബില്ലിംഗ് കൗണ്ടി
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","ചെക്കുചെയ്തെങ്കിൽ ഇതിനകം പ്രിന്റ് റേറ്റ് / പ്രിന്റ് തുക ഉൾപ്പെടുത്തിയിട്ടുണ്ട് പോലെ, നികുതി തുക പരിഗണിക്കും"
@@ -507,6 +511,7 @@
 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,സെക്യൂരിറ്റീസ് ആൻഡ് നിക്ഷേപങ്ങൾ
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",വിപണിമൂല്യം രീതി മാറ്റാൻ കഴിയില്ല അത് സ്വന്തം മതിപ്പു രീതി ഇല്ല ചില ഇനങ്ങൾ നേരെ ഇടപാടുകൾ ഉണ്ട് പോലെ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,അനുവദിച്ച മൊത്തം ഇലകൾ നിർബന്ധമായും
 DocType: Job Opening,Description of a Job Opening,ഒരു ഇയ്യോബ് തുറക്കുന്നു വിവരണം
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ഇന്ന് അവശേഷിക്കുന്ന പ്രവർത്തനങ്ങൾ
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,കോഴ്സ് തിരഞ്ഞെടുക്കുക
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,കമ്പനി തിരഞ്ഞെടുക്കുക
 DocType: Stock Entry Detail,Difference Account,വ്യത്യാസം അക്കൗണ്ട്
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,അതിന്റെ ചുമതല {0} ക്ലോസ്ഡ് അല്ല അടുത്തുവരെ കാര്യമല്ല Can.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,സംഭരണശാല മെറ്റീരിയൽ അഭ്യർത്ഥന ഉയർത്തുകയും ചെയ്യുന്ന വേണ്ടി നൽകുക
 DocType: Production Order,Additional Operating Cost,അധിക ഓപ്പറേറ്റിംഗ് ചെലവ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,കോസ്മെറ്റിക്സ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ലയിപ്പിക്കാൻ, താഴെ പറയുന്ന ആണ് ഇരു ഇനങ്ങളുടെ ഒരേ ആയിരിക്കണം"
 DocType: Shipping Rule,Net Weight,മൊത്തം ഭാരം
 DocType: Employee,Emergency Phone,എമർജൻസി ഫോൺ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,വാങ്ങാൻ
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ത്രെഷോൾഡ് 0% വേണ്ടി ഗ്രേഡ് define ദയവായി
 DocType: Sales Order,To Deliver,വിടുവിപ്പാൻ
 DocType: Purchase Invoice Item,Item,ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,സീരിയൽ യാതൊരു ഇനം ഒരു അംശം കഴിയില്ല
 DocType: Journal Entry,Difference (Dr - Cr),വ്യത്യാസം (ഡോ - CR)
 DocType: Account,Profit and Loss,ലാഭവും നഷ്ടവും
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,മാനേജിംഗ് ചൂടുകാലമാണെന്നത്
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,വർദ്ധന 0 ആയിരിക്കും കഴിയില്ല
 DocType: Production Planning Tool,Material Requirement,മെറ്റീരിയൽ ആവശ്യകതകൾ
 DocType: Company,Delete Company Transactions,കമ്പനി ഇടപാടുകൾ ഇല്ലാതാക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,യാതൊരു പരാമർശവുമില്ല ആൻഡ് റഫറൻസ് തീയതി ബാങ്ക് ഇടപാട് നിര്ബന്ധമാണ്
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ എഡിറ്റ് നികുതികളും ചുമത്തിയിട്ടുള്ള ചേർക്കുക
 DocType: Purchase Invoice,Supplier Invoice No,വിതരണക്കമ്പനിയായ ഇൻവോയിസ് ഇല്ല
 DocType: Territory,For reference,പരിഗണനയ്ക്കായി
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,ഇന്സ്റ്റലേഷന് കുറിപ്പ് ഇനം
 DocType: Production Plan Item,Pending Qty,തീർച്ചപ്പെടുത്തിയിട്ടില്ല Qty
 DocType: Budget,Ignore,അവഗണിക്കുക
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} സജീവമല്ല
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} സജീവമല്ല
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},താഴെക്കൊടുത്തിരിക്കുന്ന നമ്പറുകൾ അയയ്ക്കുന്ന എസ്എംഎസ്: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,അച്ചടിക്കുള്ള സെറ്റപ്പ് ചെക്ക് അളവുകൾ
 DocType: Salary Slip,Salary Slip Timesheet,ശമ്പള ജി Timesheet
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,ആകെ കമ്മീഷൻ
 DocType: Pricing Rule,Sales Partner,സെയിൽസ് പങ്കാളി
 DocType: Buying Settings,Purchase Receipt Required,വാങ്ങൽ രസീത് ആവശ്യമാണ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ഓപ്പണിങ് സ്റ്റോക്ക് നൽകിയിട്ടുണ്ടെങ്കിൽ മൂലധനം നിരക്ക് നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ഇൻവോയിസ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"ആദ്യം കമ്പനി, പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ഫിനാൻഷ്യൽ / അക്കൌണ്ടിംഗ് വർഷം.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,കുമിഞ്ഞു മൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ക്ഷമിക്കണം, സീരിയൽ ഒഴിവ് ലയിപ്പിക്കാൻ കഴിയില്ല"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,സെയിൽസ് ഓർഡർ നിർമ്മിക്കുക
 DocType: Project Task,Project Task,പ്രോജക്ട് ടാസ്ക്
 ,Lead Id,ലീഡ് ഐഡി
 DocType: C-Form Invoice Detail,Grand Total,ആകെ തുക
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,പുനരാരംഭിക്കുക അറ്റാച്ച്മെന്റ്
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ആവർത്തിക്കുക ഇടപാടുകാർ
 DocType: Leave Control Panel,Allocate,നീക്കിവയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,സെയിൽസ് മടങ്ങിവരവ്
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,ശ്രദ്ധിക്കുക: നീക്കിവെച്ചത് മൊത്തം ഇല {0} കാലയളവിൽ {1} ഇതിനകം അംഗീകാരം ഇല കുറവ് പാടില്ല
 DocType: Announcement,Posted By,പോസ്റ്റ് ചെയ്തത്
 DocType: Item,Delivered by Supplier (Drop Ship),വിതരണക്കാരൻ (ഡ്രോപ്പ് കപ്പൽ) നൽകുന്ന
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,ക്വട്ടേഷൻ ചെയ്യുക
 DocType: Lead,Middle Income,മിഡിൽ ആദായ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),തുറക്കുന്നു (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,പദ്ധതി തുക നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,കമ്പനി സജ്ജീകരിക്കുക
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,വിൽപ്പന ഇൻവോയ്സ് Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},പരാമർശം ഇല്ല &amp; റഫറൻസ് തീയതി {0} ആവശ്യമാണ്
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ബാങ്ക് എൻട്രി ഉണ്ടാക്കുവാൻ പേയ്മെന്റ് അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ഇല, ചെലവിൽ വാദങ്ങളിൽ പേറോളിന് നിയന്ത്രിക്കാൻ ജീവനക്കാരൻ റെക്കോർഡുകൾ സൃഷ്ടിക്കുക"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,ബേസ് ചേർക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Proposal എഴുത്ത്
 DocType: Payment Entry Deduction,Payment Entry Deduction,പേയ്മെന്റ് എൻട്രി കിഴിച്ചുകൊണ്ടു
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; അല്ല സാമ്പത്തിക വർഷം {2} ൽ
 DocType: Buying Settings,Settings for Buying Module,വാങ്ങൽ മൊഡ്യൂൾ വേണ്ടി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},അസറ്റ് {0} കമ്പനി ഭാഗമല്ല {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,പർച്ചേസ് റെസീപ്റ്റ് ആദ്യം നൽകുക
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","അപ്പോൾ വിലനിർണ്ണയത്തിലേക്ക് കസ്റ്റമർ, കസ്റ്റമർ ഗ്രൂപ്പ്, ടെറിട്ടറി, വിതരണക്കാരൻ, വിതരണക്കാരൻ ടൈപ്പ്, കാമ്പയിൻ, തുടങ്ങിയവ സെയിൽസ് പങ്കാളി അടിസ്ഥാനമാക്കി ഔട്ട് ഫിൽറ്റർ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ഇൻവെന്ററി ലെ മൊത്തം മാറ്റം
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ജീവനക്കാരുടെ ലോൺ മാനേജ്മെന്റ്
 DocType: Employee,Passport Number,പാസ്പോർട്ട് നമ്പർ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ഗുഅര്ദിഅന്൨ കൂടെ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,മാനേജർ
 DocType: Payment Entry,Payment From / To,/ To നിന്നുള്ള പേയ്മെന്റ്
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,തീയതി ശ്രേണി
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},പുതിയ ക്രെഡിറ്റ് പരിധി ഉപഭോക്താവിന് നിലവിലെ മുന്തിയ തുക കുറവാണ്. വായ്പാ പരിധി ആയിരിക്കും കുറഞ്ഞത് {0} ഉണ്ട്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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;ഗ്രൂപ്പ് സത്യം ഒന്നുതന്നെയായിരിക്കരുത്
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,മിനിറ്റുകൾക്കുള്ളിൽ
 DocType: Issue,Resolution Date,റെസല്യൂഷൻ തീയതി
 DocType: Student Batch Name,Batch Name,ബാച്ച് പേര്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet സൃഷ്ടിച്ചത്:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},അടക്കേണ്ട രീതി {0} ൽ സ്ഥിരസ്ഥിതി ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,പേരെഴുതുക
 DocType: Selling Settings,Customer Naming By,ഉപയോക്താക്കൾക്കായി നാമകരണ
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,വിദ്യാർത്ഥി പ്രതിമാസ ഹാജർ റിപ്പോർട്ട് അവതരിപ്പിക്കുക പോലെ വിദ്യാർത്ഥി കാണിക്കും
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,യഥാർത്ഥ ആരംഭിക്കേണ്ട സമയം
 DocType: BOM Operation,Operation Time,ഓപ്പറേഷൻ സമയം
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,തീര്ക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,അടിത്തറ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,അടിത്തറ
 DocType: Timesheet,Total Billed Hours,ആകെ ബില്ലുചെയ്യുന്നത് മണിക്കൂർ
 DocType: Journal Entry,Write Off Amount,തുക ഓഫാക്കുക എഴുതുക
 DocType: Journal Entry,Bill No,ബിൽ ഇല്ല
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,വിദ്യാർത്ഥിയുടെ ഹാജർ
 DocType: Sales Invoice Timesheet,Time Sheet,സമയം ഷീറ്റ്
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush അസംസ്കൃത വസ്തുക്കൾ അടിസ്ഥാനത്തിൽ ഓൺ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ഐറ്റം വിശദാംശങ്ങൾ നൽകുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ഐറ്റം വിശദാംശങ്ങൾ നൽകുക
 DocType: Interest,Interest,പലിശ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,പ്രീ സെയിൽസ്
 DocType: Purchase Receipt,Other Details,മറ്റ് വിവരങ്ങൾ
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,പേയ്മെന്റ് എൻട്രി സൃഷ്ടിക്കപ്പെടാത്ത
 DocType: Purchase Receipt Item Supplied,Current Stock,ഇപ്പോഴത്തെ സ്റ്റോക്ക്
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},വരി # {0}: അസറ്റ് {1} ഇനം {2} ലിങ്കുചെയ്തിട്ടില്ല ഇല്ല
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,പ്രിവ്യൂ ശമ്പളം ജി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,അക്കൗണ്ട് {0} ഒന്നിലധികം തവണ നൽകിയിട്ടുണ്ടെന്നും
 DocType: Account,Expenses Included In Valuation,മൂലധനം ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ചിലവുകൾ
 DocType: Hub Settings,Seller City,വില്പനക്കാരന്റെ സിറ്റി
 ,Absent Student Report,നിലവില്ല വിദ്യാർത്ഥി റിപ്പോർട്ട്
 DocType: Email Digest,Next email will be sent on:,അടുത്തത് ഇമെയിൽ ന് അയയ്ക്കും:
 DocType: Offer Letter Term,Offer Letter Term,കത്ത് ടേം ഓഫർ
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,ഇനം വകഭേദങ്ങളും ഉണ്ട്.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,ഇനം {0} കാണാനായില്ല
 DocType: Bin,Stock Value,സ്റ്റോക്ക് മൂല്യം
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,കമ്പനി {0} നിലവിലില്ല
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ട്രീ തരം
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക
 DocType: Project,Estimated Cost,കണക്കാക്കിയ ചെലവ്
@@ -768,7 +770,7 @@
 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,സ്ഥിര അക്കൗണ്ട്
 DocType: Payment Entry,Received Amount (Company Currency),ലഭിച്ച തുകയുടെ (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,അവസരം ലീഡ് നിന്നും ചെയ്താൽ ലീഡ് സജ്ജമാക്കാൻ വേണം
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,പ്രതിവാര അവധി ദിവസം തിരഞ്ഞെടുക്കുക
 DocType: Production Order Operation,Planned End Time,പ്ലാൻ ചെയ്തു അവസാനിക്കുന്ന സമയം
 ,Sales Person Target Variance Item Group-Wise,സെയിൽസ് പേഴ്സൺ ടാര്ഗറ്റ് പൊരുത്തമില്ലായ്മ ഇനം ഗ്രൂപ്പ് യുക്തിമാനുമാണ്
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,നിന്ന് ഓപ്പർച്യൂനിറ്റി
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,പ്രതിമാസ ശമ്പളം പ്രസ്താവന.
 DocType: BOM,Website Specifications,വെബ്സൈറ്റ് വ്യതിയാനങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} തരത്തിലുള്ള {0} നിന്ന്
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,വരി {0}: പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,ബാങ്ക് / സി നം
 DocType: Bank Guarantee,Project,പ്രോജക്ട്
 DocType: Quality Inspection Reading,Reading 7,7 Reading
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,ഭാഗികമായി ക്രമപ്പെടുത്തിയ
 DocType: Expense Claim Detail,Expense Claim Type,ചിലവേറിയ ക്ലെയിം തരം
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ജേർണൽ എൻട്രി {0} വഴി തയ്യാർ അസറ്റ്
@@ -825,14 +829,14 @@
 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 +107,Office Maintenance Expenses,ഓഫീസ് മെയിൻറനൻസ് ചെലവുകൾ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ഇമെയിൽ അക്കൗണ്ട് സജ്ജീകരിക്കുന്നതിന്
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,ആദ്യം ഇനം നൽകുക
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ആദ്യം ഇനം നൽകുക
 DocType: Account,Liability,ബാധ്യത
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,അനുവദിക്കപ്പെട്ട തുക വരി {0} ൽ ക്ലെയിം തുക വലുതായിരിക്കണം കഴിയില്ല.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,വില പട്ടിക തിരഞ്ഞെടുത്തിട്ടില്ല
 DocType: Employee,Family Background,കുടുംബ പശ്ചാത്തലം
 DocType: Request for Quotation Supplier,Send Email,ഇമെയിൽ അയയ്ക്കുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},മുന്നറിയിപ്പ്: അസാധുവായ സഹപത്രങ്ങൾ {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ഇല്ല അനുമതി
 DocType: Company,Default Bank Account,സ്ഥിരസ്ഥിതി ബാങ്ക് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","പാർട്ടി അടിസ്ഥാനമാക്കി ഫിൽട്ടർ, ആദ്യം പാർട്ടി ടൈപ്പ് തിരഞ്ഞെടുക്കുക"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ജീവനക്കാരൻ കണ്ടെത്തിയില്ല
 DocType: Supplier Quotation,Stopped,നിർത്തി
 DocType: Item,If subcontracted to a vendor,ഒരു വെണ്ടർ വരെ subcontracted എങ്കിൽ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ഇതിനകം അപ്ഡേറ്റ് ചെയ്യുന്നത്.
 DocType: SMS Center,All Customer Contact,എല്ലാ കസ്റ്റമർ കോൺടാക്റ്റ്
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV വഴി സ്റ്റോക്ക് ബാലൻസ് അപ്ലോഡ് ചെയ്യുക.
 DocType: Warehouse,Tree Details,ട്രീ വിശദാംശങ്ങൾ
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,മിനിമം ഇൻവോയിസ് തുക
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: കോസ്റ്റ് സെന്റർ {2} കമ്പനി {3} സ്വന്തമല്ല
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: അക്കൗണ്ട് {2} ഒരു ഗ്രൂപ്പ് കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,ഇനം വരി {IDX}: {doctype} {DOCNAME} മുകളിൽ &#39;{doctype}&#39; പട്ടികയിൽ നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ഇതിനകം പൂർത്തിയായി അല്ലെങ്കിൽ റദ്ദാക്കി
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ടാസ്ക്കുകളൊന്നുമില്ല
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ഓട്ടോ ഇൻവോയ്സ് 05, 28 തുടങ്ങിയവ ഉദാ നിർമ്മിക്കപ്പെടും ഏതെല്ലാം മാസത്തിലെ ദിവസം"
 DocType: Asset,Opening Accumulated Depreciation,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,മാറുന്ന ശരാശരി റേറ്റ്
 DocType: Production Planning Tool,Select Items,ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ബിൽ {1} നേരെ {2} dated
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,കോഴ്സ് ഷെഡ്യൂൾ
 DocType: Maintenance Visit,Completion Status,പൂർത്തീകരണവും അവസ്ഥ
 DocType: HR Settings,Enter retirement age in years,വർഷങ്ങളിൽ വിരമിക്കൽ പ്രായം നൽകുക
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ടാർജറ്റ് വെയർഹൗസ്
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ഈ ശതമാനം വരെ ഡെലിവറി അല്ലെങ്കിൽ രസീത് മേൽ അനുവദിക്കുക
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ഇംപോർട്ട് ഹാജർ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,എല്ലാ ഇനം ഗ്രൂപ്പുകൾ
 DocType: Process Payroll,Activity Log,പ്രവർത്തന ലോഗ്
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,അറ്റാദായം / നഷ്ടം
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,യാന്ത്രികമായി ഇടപാടുകളുടെ സമർപ്പിക്കാനുള്ള സന്ദേശം എഴുതുക.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,പെയ്മെന്റ് നയിക്കുന്ന വാങ്ങുക
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,അനുമാനിക്കപ്പെടുന്ന Qty
 DocType: Sales Invoice,Payment Due Date,പെയ്മെന്റ് നിശ്ചിത തീയതിയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,ഇനം വേരിയന്റ് {0} ഇതിനകം അതേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;തുറക്കുന്നു&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ചെയ്യാനുള്ളത് തുറക്കുക
 DocType: Notification Control,Delivery Note Message,ഡെലിവറി നോട്ട് സന്ദേശം
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,വീണ്ടും ഓർഡർ Qty
 DocType: Leave Block List Date,Leave Block List Date,ബ്ലോക്ക് പട്ടിക തീയതി വിടുക
 DocType: Pricing Rule,Price or Discount,വില അല്ലെങ്കിൽ ഡിസ്ക്കൌണ്ട്
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,വാങ്ങൽ രസീത് ഇനങ്ങൾ പട്ടികയിൽ ആകെ ബാധകമായ നിരക്കുകളും ആകെ നികുതി ചാർജുകളും തുല്യമായിരിക്കണം
 DocType: Sales Team,Incentives,ഇൻസെന്റീവ്സ്
 DocType: SMS Log,Requested Numbers,അഭ്യർത്ഥിച്ചു സംഖ്യാപുസ്തകം
 DocType: Production Planning Tool,Only Obtain Raw Materials,അസംസ്കൃത വസ്തുക്കൾ മാത്രം ലഭ്യമാക്കുക
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted മാത്രമാവില്ലല്ലോ
 DocType: Item Attribute,Item Attribute Values,ഇനം ഗുണ മൂല്യങ്ങൾ
 DocType: Examination Result,Examination Result,പരീക്ഷാ ഫലം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,വാങ്ങൽ രസീത്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,വാങ്ങൽ രസീത്
 ,Received Items To Be Billed,ബില്ല് ലഭിച്ച ഇനങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,സമർപ്പിച്ച ശമ്പളം സ്ലിപ്പുകൾ
 DocType: Employee,Ms,മിസ്
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,നാണയ വിനിമയ നിരക്ക് മാസ്റ്റർ.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},പരാമർശം Doctype {0} ഒന്ന് ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},പരാമർശം Doctype {0} ഒന്ന് ആയിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ഓപ്പറേഷൻ {1} അടുത്ത {0} ദിവസങ്ങളിൽ സമയം സ്ലോട്ട് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Production Order,Plan material for sub-assemblies,സബ് സമ്മേളനങ്ങൾ പദ്ധതി മെറ്റീരിയൽ
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,സെയിൽസ് പങ്കാളികളും ടെറിട്ടറി
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,അക്കൗണ്ട് സ്റ്റോക്ക് ബാലൻസ് ഇതിനകം പോലെ സ്വയം അക്കൗണ്ട് സൃഷ്ടിക്കാൻ കഴിയില്ല. നിങ്ങൾ ഈ വെയർഹൗസ് ഒരു എൻട്രി മുമ്പ് നിങ്ങൾ ഒരു ചേരുന്ന അക്കൗണ്ട് സൃഷ്ടിക്കണം
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,സ്ഥിരസ്ഥിതി അടയ്ക്കേണ്ട തുക
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ജീവനക്കാർ {0} സജീവമല്ല അല്ലെങ്കിൽ നിലവിലില്ല
 DocType: Fee Structure,Components,ഘടകങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,ഇനം രൂപഭേദങ്ങൾ {0} നവീകരിച്ചത്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},ദയവായി ഇനം {0} ൽ അസറ്റ് വിഭാഗം നൽകുക
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,അല്ല {0} കഴിയുമോ {1} {2} നെഗറ്റിവ് കുടിശ്ശിക ഇൻവോയ്സ് ഇല്ലാതെ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,വാങ്ങൽ ഇൻവോയിസ് അഡ്വാൻസ്
 DocType: Hub Settings,Sync Now,ഇപ്പോൾ സമന്വയിപ്പിക്കുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},വരി {0}: ക്രെഡിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,വാങ്ങൽ ഇനം തന്നെയല്ലേ
 DocType: Asset,Purchase Invoice,വാങ്ങൽ ഇൻവോയിസ്
 DocType: Stock Ledger Entry,Voucher Detail No,സാക്ഷപ്പെടുത്തല് വിശദാംശം ഇല്ല
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,പുതിയ സെയിൽസ് ഇൻവോയ്സ്
 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,തീയതിയും അടയ്ക്കുന്ന തീയതി തുറക്കുന്നു ഒരേ സാമ്പത്തിക വർഷത്തിൽ ഉള്ളിൽ ആയിരിക്കണം
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,തീയതിയും അടയ്ക്കുന്ന തീയതി തുറക്കുന്നു ഒരേ സാമ്പത്തിക വർഷത്തിൽ ഉള്ളിൽ ആയിരിക്കണം
 DocType: Lead,Request for Information,വിവരങ്ങൾ അഭ്യർത്ഥന
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,സമന്വയം ഓഫ്ലൈൻ ഇൻവോയിസുകൾ
 DocType: Payment Request,Paid,പണമടച്ചു
 DocType: Program Fee,Program Fee,പ്രോഗ്രാം ഫീസ്
 DocType: Salary Slip,Total in words,വാക്കുകളിൽ ആകെ
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,അനുവദിച്ചു
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; മേശയുടെ പകർത്തുന്നു."
 DocType: Job Opening,Publish on website,വെബ്സൈറ്റിൽ പ്രസിദ്ധീകരിക്കുക
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ഉപഭോക്താക്കൾക്ക് കയറ്റുമതി.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,വിതരണക്കാരൻ ഇൻവോയ്സ് തീയതി തീയതി നോട്സ് ശ്രേഷ്ഠ പാടില്ല
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ഭിന്നിച്ചു
 ,Company Name,കമ്പനി പേര്
 DocType: SMS Center,Total Message(s),ആകെ സന്ദേശം (ങ്ങൾ)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,ട്രാൻസ്ഫർ വേണ്ടി ഇനം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,ചെക്ക് സൂക്ഷിച്ചത് എവിടെ ബാങ്കിന്റെ അക്കൗണ്ട് തല തിരഞ്ഞെടുക്കുക.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,വരി {0}: / വാങ്ങൽ ഓർഡർ എപ്പോഴും മുൻകൂട്ടി എന്ന് അടയാളപ്പെടുത്തി വേണം സെയിൽസ് നേരെ പേയ്മെന്റ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,കെമിക്കൽ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ഈ മോഡ് തെരഞ്ഞെടുക്കുമ്പോഴും സ്വതേ ബാങ്ക് / ക്യാഷ് അംഗത്വം സ്വയം ശമ്പള ജേണൽ എൻട്രി ലെ അപ്ഡേറ്റ് ചെയ്യും.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","ഗ്രേഡ് കോഡ് {0} വേണ്ടി ഇടവേളകളിൽ മറ്റ് ഗ്രേഡിലും ഗ്രേഡ് ഇടവേളകളിൽ ഓവർലാപ്പുചെയ്യുന്നു. ഇടവേളകളിൽ {0}, {1} പരിശോധിച്ച് വീണ്ടും ശ്രമിക്കുക"
 DocType: BOM,Raw Material Cost(Company Currency),അസംസ്കൃത വസ്തുക്കളുടെ വില (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,എല്ലാ ഇനങ്ങളും ഇതിനകം ഈ പ്രൊഡക്ഷൻ ഓർഡർ കൈമാറ്റം ചെയ്തു.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},വരി # {0}: നിരക്ക് {1} {2} ഉപയോഗിക്കുന്ന നിരക്ക് അധികമാകരുത് കഴിയില്ല
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM ൽ വെബ്സൈറ്റ് ഇനം
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,നിങ്ങളുടെ കത്ത് തലയും ലോഗോ അപ്ലോഡ്. (നിങ്ങൾക്ക് പിന്നീട് എഡിറ്റ് ചെയ്യാൻ കഴിയും).
 DocType: Timesheet Detail,Bill,ബില്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,അടുത്ത മൂല്യത്തകർച്ച തീയതി കഴിഞ്ഞ തീയതി നൽകിയിട്ടുള്ളതെന്ന്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,വൈറ്റ്
 DocType: SMS Center,All Lead (Open),എല്ലാ ലീഡ് (തുറക്കുക)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),വരി {0}: അളവ് ({2} {3}) വെയർഹൗസിൽ ലെ {4} ലഭ്യമല്ല {1} ചേരുന്ന സമയത്ത് പോസ്റ്റുചെയ്യുന്നതിൽ
 DocType: Purchase Invoice,Get Advances Paid,അഡ്വാൻസുകളും പണം ലഭിക്കുന്നത്
 DocType: Item,Automatically Create New Batch,പുതിയ ബാച്ച് യാന്ത്രികമായി സൃഷ്ടിക്കുക
 DocType: Item,Automatically Create New Batch,പുതിയ ബാച്ച് യാന്ത്രികമായി സൃഷ്ടിക്കുക
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,നിർമ്മിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,നിർമ്മിക്കുക
 DocType: Student Admission,Admission Start Date,അഡ്മിഷൻ ആരംഭ തീയതി
 DocType: Journal Entry,Total Amount in Words,വാക്കുകൾ മൊത്തം തുക
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ഒരു പിശക് ഉണ്ടായിരുന്നു. ഒന്ന് ഇതെന്നു കാരണം ഫോം രക്ഷിച്ചു ചെയ്തിട്ടില്ല വരാം. പ്രശ്നം നിലനിൽക്കുകയാണെങ്കിൽ support@erpnext.com ബന്ധപ്പെടുക.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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 തുറക്കുന്നു
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ദയവായി തുക മാറ്റത്തിനായി അക്കൗണ്ട് നൽകുക
 DocType: Student Batch Name,Student Batch Name,വിദ്യാർത്ഥിയുടെ ബാച്ച് പേര്
 DocType: Holiday List,Holiday List Name,ഹോളിഡേ പട്ടിക പേര്
 DocType: Repayment Schedule,Balance Loan Amount,ബാലൻസ് വായ്പാ തുക
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ദയവായി ഒരു {0} വ്യക്തമാക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,അളവ് അല്ലെങ്കിൽ മൂല്യം മാറ്റമൊന്നും വരുത്താതെ ഇനങ്ങളെ നീക്കംചെയ്തു.
 DocType: Delivery Note,Delivery To,ഡെലിവറി
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ഗുണ മേശ നിർബന്ധമാണ്
 DocType: Production Planning Tool,Get Sales Orders,സെയിൽസ് ഉത്തരവുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} നെഗറ്റീവ് ആയിരിക്കാൻ കഴിയില്ല
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ഡിസ്കൗണ്ട്
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ഡിസ്കൗണ്ട്
 DocType: Asset,Total Number of Depreciations,Depreciations ആകെ എണ്ണം
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
 DocType: Sales Invoice Item,Rate With Margin,മാർജിൻ കൂടി നിരക്ക്
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,സെയിൽസ് ഓർഡർ / പൂർത്തിയായ ഗുഡ്സ് സംഭരണശാല കരുതിവച്ചിരിക്കുന്ന വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,തുക വിൽക്കുന്ന
 DocType: Repayment Schedule,Interest Amount,പലിശ തുക
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,നിങ്ങൾ ഈ റെക്കോർഡ് വേണ്ടി ചിലവിടൽ Approver ആകുന്നു. &#39;സ്റ്റാറ്റസ്&#39; സേവ് അപ്ഡേറ്റ് ദയവായി
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,നിങ്ങൾ ഈ റെക്കോർഡ് വേണ്ടി ചിലവിടൽ Approver ആകുന്നു. &#39;സ്റ്റാറ്റസ്&#39; സേവ് അപ്ഡേറ്റ് ദയവായി
 DocType: Serial No,Creation Document No,ക്രിയേഷൻ ഡോക്യുമെന്റ് ഇല്ല
 DocType: Issue,Issue,ഇഷ്യൂ
 DocType: Asset,Scrapped,തയ്യാർ
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","ഇനം മോഡലുകൾക്കാണ് ഗുണവിശേഷതകൾ. ഉദാ വലിപ്പം, കളർ തുടങ്ങിയവ"
 DocType: Purchase Invoice,Returns,റിട്ടേൺസ്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP വെയർഹൗസ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ അറ്റകുറ്റപ്പണി കരാർ പ്രകാരം ആണ്
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,റിക്രൂട്ട്മെന്റ്
 DocType: Lead,Organization Name,സംഘടനയുടെ പേര്
 DocType: Tax Rule,Shipping State,ഷിപ്പിംഗ് സ്റ്റേറ്റ്
 ,Projected Quantity as Source,ഉറവിടം പ്രൊജക്റ്റുചെയ്തു ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,ഇനം ബട്ടൺ &#39;വാങ്ങൽ വരവ് നിന്നുള്ള ഇനങ്ങൾ നേടുക&#39; ഉപയോഗിച്ച് ചേർക്കണം
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,നോൺ-ഓഹരി ഇനങ്ങൾ ഉൾപ്പെടുത്തുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,സെയിൽസ് ചെലവുകൾ
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,എഗെൻസ്റ്റ്
 DocType: Item,Default Selling Cost Center,സ്ഥിരസ്ഥിതി അതേസമയം ചെലവ് കേന്ദ്രം
 DocType: Sales Partner,Implementation Partner,നടപ്പാക്കൽ പങ്കാളി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,സിപ്പ് കോഡ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,സിപ്പ് കോഡ്
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},സെയിൽസ് ഓർഡർ {0} {1} ആണ്
 DocType: Opportunity,Contact Info,ബന്ധപ്പെടുന്നതിനുള്ള വിവരം
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,സ്റ്റോക്ക് എൻട്രികളിൽ ഉണ്ടാക്കുന്നു
 DocType: Packing Slip,Net Weight UOM,മൊത്തം ഭാരം UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ഫലങ്ങൾ
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ഫലങ്ങൾ
 DocType: Item,Default Supplier,സ്ഥിരസ്ഥിതി വിതരണക്കാരൻ
 DocType: Manufacturing Settings,Over Production Allowance Percentage,പ്രൊഡക്ഷൻ അലവൻസ് ശതമാനം ഓവര്
 DocType: Employee Loan,Repayment Schedule,തിരിച്ചടവ് ഷെഡ്യൂൾ
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,വീക്കിലി ഓഫാക്കുക നേടുക തീയതി
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,അവസാനിക്കുന്ന തീയതി ആരംഭിക്കുന്ന തീയതി കുറവായിരിക്കണം കഴിയില്ല
 DocType: Sales Person,Select company name first.,ആദ്യം കമ്പനിയുടെ പേര് തിരഞ്ഞെടുക്കുക.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ഡോ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ഡോ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ഉദ്ധരണികളും വിതരണക്കാരിൽനിന്നുമാണ് ലഭിച്ചു.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} ചെയ്യുക | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ശരാശരി പ്രായം
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,കീ പ്രകടനം ഏരിയ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ഗതാഗതം
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,അസാധുവായ ആട്രിബ്യൂട്ട്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} സമർപ്പിക്കേണ്ടതാണ്
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ക്വാണ്ടിറ്റി കുറവോ {0} തുല്യമായിരിക്കണം
 DocType: SMS Center,Total Characters,ആകെ പ്രതീകങ്ങൾ
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},ഇനം വേണ്ടി BOM ലേക്ക് വയലിൽ {0} BOM തിരഞ്ഞെടുക്കുക
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,വിതരണക്കാരൻ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,ഷോപ്പിംഗ് കാർട്ട് ഷിപ്പിംഗ് റൂൾ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,പ്രൊഡക്ഷൻ ഓർഡർ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',&#39;പ്രയോഗിക്കുക അഡീഷണൽ ഡിസ്കൌണ്ട്&#39; സജ്ജീകരിക്കുക
 ,Ordered Items To Be Billed,ബില്ല് ഉത്തരവിട്ടു ഇനങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,റേഞ്ച് നിന്നും പരിധി വരെ കുറവ് ഉണ്ട്
 DocType: Global Defaults,Global Defaults,ആഗോള സ്ഥിരസ്ഥിതികൾ
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ആരംഭ വർഷം
 DocType: Purchase Invoice,Start date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലഘട്ടത്തിലെ തീയതി ആരംഭിക്കുക
 DocType: Salary Slip,Leave Without Pay,ശമ്പള ഇല്ലാതെ വിടുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ശേഷി ആസൂത്രണ പിശക്
 ,Trial Balance for Party,പാർട്ടി ട്രയൽ ബാലൻസ്
 DocType: Lead,Consultant,ഉപദേഷ്ടാവ്
 DocType: Salary Slip,Earnings,വരുമാനം
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ഈ വകഭേദം എന്ന ഇനം കോഡ് ചേർക്കപ്പെടുകയും ചെയ്യും. നിങ്ങളുടെ ചുരുക്കെഴുത്ത് &quot;എസ് എം &#39;എന്താണ്, ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട് &#39;ഉദാഹരണത്തിന്, വകഭേദം എന്ന ഐറ്റം കോഡ്&#39; ടി-ഷർട്ട്-എസ് എം&quot; ആയിരിക്കും"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,നിങ്ങൾ ശമ്പളം ജി ലാഭിക്കാൻ ഒരിക്കൽ (വാക്കുകളിൽ) നെറ്റ് വേതനം ദൃശ്യമാകും.
 DocType: Purchase Invoice,Is Return,മടക്കം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,മടക്ക / ഡെബിറ്റ് നോട്ട്
 DocType: Price List Country,Price List Country,വില പട്ടിക രാജ്യം
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},ഇനം {1} വേണ്ടി {0} സാധുവായ സീരിയൽ എണ്ണം
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,ബാച്ച് നമ്പർ ലഭിക്കാൻ ദയവായി ഇനം കോഡ് നൽകുക
 DocType: Stock Settings,Default Item Group,സ്ഥിരസ്ഥിതി ഇനം ഗ്രൂപ്പ്
 DocType: Employee Loan,Partially Disbursed,ഭാഗികമായി വിതരണം
-DocType: Grading Structure,Grading System Name,ഗ്രേഡിംഗ് സിസ്റ്റം പേര്
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,വിതരണക്കാരൻ ഡാറ്റാബേസ്.
 DocType: Account,Balance Sheet,ബാലൻസ് ഷീറ്റ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',ഇനം കോഡ് ഉപയോഗിച്ച് ഇനം വേണ്ടി ചെലവ് കേന്ദ്രം &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","പേയ്മെന്റ് മോഡ് ക്രമീകരിച്ചിട്ടില്ല. അക്കൗണ്ട് പെയ്മെന്റിന്റെയും മോഡ് അല്ലെങ്കിൽ POS ൽ പ്രൊഫൈൽ വെച്ചിരിക്കുന്ന എന്ന്, പരിശോധിക്കുക."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,നിങ്ങളുടെ വിൽപ്പന വ്യക്തിയെ ഉപഭോക്തൃ ബന്ധപ്പെടാൻ ഈ തീയതി ഒരു ഓർമ്മപ്പെടുത്തൽ ലഭിക്കും
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി കഴിയില്ല.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","കൂടുതലായ അക്കൗണ്ടുകൾ ഗ്രൂപ്പ്സ് കീഴിൽ കഴിയും, പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും"
@@ -1204,7 +1204,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ഓഹരി ലെഡ്ജർ എൻട്രികളും ജിഎൽ എൻട്രികൾ തിരഞ്ഞെടുത്ത വാങ്ങൽ വരവ് വേണ്ടി ലൈനില് ചെയ്യുന്നു
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,ഓഹരി ലെഡ്ജർ എൻട്രികളും ജിഎൽ എൻട്രികൾ തിരഞ്ഞെടുത്ത വാങ്ങൽ വരവ് വേണ്ടി ലൈനില് ചെയ്യുന്നു
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,ഇനം 1
 DocType: Holiday,Holiday,ഹോളിഡേ
 DocType: Support Settings,Close Issue After Days,ദിവസം കഴിഞ്ഞശേഷം അടയ്ക്കുക പ്രശ്നം
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,വർക്ക് ചെയ്തുകഴിഞ്ഞു
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,വിശേഷണങ്ങൾ പട്ടികയിൽ കുറഞ്ഞത് ഒരു ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Announcement,All Students,എല്ലാ വിദ്യാർത്ഥികൾക്കും
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,ഇനം {0} ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,കാണുക ലെഡ്ജർ
 DocType: Grading Scale,Intervals,ഇടവേളകളിൽ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,പഴയവ
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ഒരു ഇനം ഗ്രൂപ്പ് ഇതേ പേരിലുള്ള നിലവിലുണ്ട്, ഐറ്റം പേര് മാറ്റാനോ ഐറ്റം ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,വിദ്യാർത്ഥി മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ലോകം റെസ്റ്റ്
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,ഇനം {0} ബാച്ച് പാടില്ല
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},ലേക്ക് {1} {0} നിന്ന് ശമ്പളം പേയ്മെന്റ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ശീതീകരിച്ച അക്കൗണ്ട് {0} എഡിറ്റുചെയ്യാൻ
 DocType: Journal Entry,Get Outstanding Invoices,മികച്ച ഇൻവോയിസുകൾ നേടുക
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,സെയിൽസ് ഓർഡർ {0} സാധുവല്ല
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,വാങ്ങൽ ഓർഡറുകൾ നിങ്ങളുടെ വാങ്ങലുകൾ ന് ആസൂത്രണം ഫോളോ അപ്പ് സഹായിക്കാൻ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","ക്ഷമിക്കണം, കമ്പനികൾ ലയിപ്പിക്കാൻ കഴിയില്ല"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",മൊത്തം ഇഷ്യു / ട്രാൻസ്ഫർ അളവ് {0} മെറ്റീരിയൽ അഭ്യർത്ഥനയിൽ {1} \ അഭ്യർത്ഥിച്ച അളവ് {2} ഇനം {3} വേണ്ടി ശ്രേഷ്ഠ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,ചെറുകിട
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,പരോക്ഷമായ ചെലവുകൾ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,വരി {0}: Qty നിർബന്ധമായും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,കൃഷി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,സമന്വയം മാസ്റ്റർ ഡാറ്റ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,നിങ്ങളുടെ ഉല്പന്നങ്ങൾ അല്ലെങ്കിൽ സേവനങ്ങൾ
 DocType: Mode of Payment,Mode of Payment,അടക്കേണ്ട മോഡ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,വെബ്സൈറ്റ് ചിത്രം ഒരു പൊതു ഫയൽ അല്ലെങ്കിൽ വെബ്സൈറ്റ് URL ആയിരിക്കണം
 DocType: Student Applicant,AP,എ.പി.
 DocType: Purchase Invoice Item,BOM,BOM ൽ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ഇത് ഒരു റൂട്ട് ഐറ്റം ഗ്രൂപ്പ് ആണ് എഡിറ്റ് ചെയ്യാൻ കഴിയില്ല.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,ഗ്രൂപ്പ് റോൾ നമ്പർ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} മാത്രം ക്രെഡിറ്റ് അക്കൗണ്ടുകൾ മറ്റൊരു ഡെബിറ്റ് എൻട്രി നേരെ ലിങ്ക്ഡ് കഴിയും
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,എല്ലാ ടാസ്ക് തൂക്കം ആകെ 1. അതനുസരിച്ച് എല്ലാ പദ്ധതി ചുമതലകളുടെ തൂക്കം ക്രമീകരിക്കാൻ വേണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ഡെലിവറി നോട്ട് {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","പ്രൈസിങ് റൂൾ ആദ്യം ഇനം, ഇനം ഗ്രൂപ്പ് അല്ലെങ്കിൽ ബ്രാൻഡ് ആകാം വയലിലെ &#39;പുരട്ടുക&#39; അടിസ്ഥാനമാക്കി തിരഞ്ഞെടുത്തുവെന്ന്."
 DocType: Hub Settings,Seller Website,വില്പനക്കാരന്റെ വെബ്സൈറ്റ്
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,വിൽപ്പന സംഘത്തെ വേണ്ടി ആകെ നീക്കിവച്ചിരുന്നു ശതമാനം 100 ആയിരിക്കണം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},പ്രൊഡക്ഷൻ ഓർഡർ നില {0} ആണ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},പ്രൊഡക്ഷൻ ഓർഡർ നില {0} ആണ്
 DocType: Appraisal Goal,Goal,ഗോൾ
 DocType: Sales Invoice Item,Edit Description,എഡിറ്റ് വിവരണം
 ,Team Updates,ടീം അപ്ഡേറ്റുകൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,വിതരണക്കാരൻ വേണ്ടി
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,വിതരണക്കാരൻ വേണ്ടി
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,അക്കൗണ്ട് തരം സജ്ജീകരിക്കുന്നു ഇടപാടുകൾ ഈ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുന്നതിൽ സഹായിക്കുന്നു.
 DocType: Purchase Invoice,Grand Total (Company Currency),ആകെ മൊത്തം (കമ്പനി കറൻസി)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,പ്രിന്റ് ഫോർമാറ്റ് സൃഷ്ടിക്കുക
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} പുരോഗതിയിലാണ് ഇനങ്ങൾ
 DocType: Workstation,Workstation Name,വറ്ക്ക്സ്റ്റേഷൻ പേര്
-DocType: Grade Interval,Grade Code,ഗ്രേഡ് കോഡ്
+DocType: Grading Scale Interval,Grade Code,ഗ്രേഡ് കോഡ്
 DocType: POS Item Group,POS Item Group,POS ഇനം ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ഡൈജസ്റ്റ് ഇമെയിൽ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM ലേക്ക് {0} ഇനം വരെ {1} സ്വന്തമല്ല
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ഹാര്ഡ്വെയര്
 DocType: Sales Order,Recurring Upto,വരെയും ആവർത്തന
 DocType: Attendance,HR Manager,എച്ച് മാനേജർ
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ഒരു കമ്പനി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,പ്രിവിലേജ് അവധി
 DocType: Purchase Invoice,Supplier Invoice Date,വിതരണക്കാരൻ ഇൻവോയിസ് തീയതി
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,നിങ്ങൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ഭക്ഷ്യ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,എയ്ജിങ് ശ്രേണി 3
 DocType: Maintenance Schedule Item,No of Visits,സന്ദർശനങ്ങൾ ഒന്നും
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,മാർക്ക് Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,മാർക്ക് Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},മെയിൻറനൻസ് ഷെഡ്യൂൾ {0} നേരെ {1} നിലവിലുണ്ട്
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,എൻറോൾ വിദ്യാർത്ഥി
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},സമാപന അക്കൗണ്ട് കറൻസി {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},എല്ലാ ഗോളുകൾ വേണ്ടി പോയിന്റിന്റെ സം 100 ആയിരിക്കണം അത് {0} ആണ്
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,പേർക്കുള്ള ഡെയ്ലി അയയ്ക്കുന്ന
 DocType: POS Profile,Campaign,കാമ്പെയ്ൻ
 DocType: Supplier,Name and Type,പേര് ടൈപ്പ്
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',അംഗീകാരം സ്റ്റാറ്റസ് &#39;അംഗീകരിച്ചു&#39; അല്ലെങ്കിൽ &#39;നിഷേധിക്കപ്പെട്ടിട്ടുണ്ട്&#39; വേണം
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',അംഗീകാരം സ്റ്റാറ്റസ് &#39;അംഗീകരിച്ചു&#39; അല്ലെങ്കിൽ &#39;നിഷേധിക്കപ്പെട്ടിട്ടുണ്ട്&#39; വേണം
 DocType: Purchase Invoice,Contact Person,സമ്പർക്ക വ്യക്തി
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;പ്രതീക്ഷിച്ച ആരംഭ തീയതി&#39; &#39;പ്രതീക്ഷിച്ച അവസാന തീയതി&#39; വലുതായിരിക്കും കഴിയില്ല
 DocType: Course Scheduling Tool,Course End Date,കോഴ്സ് അവസാന തീയതി
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,ഷിപ്പിംഗ് വിലാസം പേര്
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,അക്കൗണ്ട്സ് ചാർട്ട്
 DocType: Material Request,Terms and Conditions Content,നിബന്ധനകളും വ്യവസ്ഥകളും ഉള്ളടക്കം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,ഇനം {0} ഒരു സ്റ്റോക്ക് ഇനം അല്ല
 DocType: Maintenance Visit,Unscheduled,വരണേ
 DocType: Employee,Owned,ഉടമസ്ഥതയിലുള്ളത്
 DocType: Salary Detail,Depends on Leave Without Pay,ശമ്പള പുറത്തുകടക്കാൻ ആശ്രയിച്ചിരിക്കുന്നു
 DocType: Pricing Rule,"Higher the number, higher the priority","ഹയർ സംഖ്യ, ഉയർന്ന മുൻഗണന"
 ,Purchase Invoice Trends,വാങ്ങൽ ഇൻവോയിസ് ട്രെൻഡുകൾ
 DocType: Employee,Better Prospects,മെച്ചപ്പെട്ട സാദ്ധ്യതകളും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","വരി # {0}: ബാച്ച് {1} മാത്രമേ {2} അളവ് ഉണ്ട്. ഉണ്ട് {3} ലഭ്യമായ അളവ് മറ്റൊരു ബാച്ച് തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ഒന്നിലധികം ബാച്ചുകൾ നിന്ന് / പ്രശ്നം വിടുവിപ്പാൻ, ഒന്നിലധികം വരികൾ കയറി വരി വേർതിരിക്കുക"
 DocType: Vehicle,License Plate,ലൈസൻസ് പ്ലേറ്റ്
 DocType: Appraisal,Goals,ലക്ഷ്യങ്ങൾ
 DocType: Warranty Claim,Warranty / AMC Status,വാറന്റി / എഎംസി അവസ്ഥ
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ജീവനക്കാർ തനിക്കായി റിപ്പോർട്ട് ചെയ്യാൻ കഴിയില്ല.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","അക്കൗണ്ട് മരവിപ്പിച്ചു എങ്കിൽ, എൻട്രികൾ നിയന്ത്രിത ഉപയോക്താക്കൾക്ക് അനുവദിച്ചിരിക്കുന്ന."
 DocType: Email Digest,Bank Balance,ബാങ്ക് ബാലൻസ്
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി: {1} മാത്രം കറൻസി കഴിയും: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ഇയ്യോബ് പ്രൊഫൈൽ, യോഗ്യത തുടങ്ങിയവ ആവശ്യമാണ്"
 DocType: Journal Entry Account,Account Balance,അക്കൗണ്ട് ബാലൻസ്
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ഇടപാടുകൾക്ക് നികുതി റൂൾ.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,അടയ്ക്കാത്ത സാമ്പത്തിക വർഷത്തെ പി &amp; എൽ തുലാസിൽ കാണിക്കുക
 DocType: Shipping Rule,Shipping Account,ഷിപ്പിംഗ് അക്കൗണ്ട്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: അക്കൗണ്ട് {2} സജ്ജമല്ല
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,നിങ്ങളുടെ പ്രവൃത്തി പദ്ധതിയും സഹായിക്കാൻ ഓൺ സമയം വിടുവിപ്പാൻ സെയിൽസ് ഓർഡറുകൾ നടത്തുക
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,നിങ്ങളുടെ പ്രവൃത്തി പദ്ധതിയും സഹായിക്കാൻ ഓൺ സമയം വിടുവിപ്പാൻ സെയിൽസ് ഓർഡറുകൾ നടത്തുക
 DocType: Quality Inspection,Readings,വായന
 DocType: Stock Entry,Total Additional Costs,ആകെ അധിക ചെലവ്
 DocType: Course Schedule,SH,എസ്.എച്ച്
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,മൂല്യത്തിലേക്ക്
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,പാക്കിംഗ് സ്ലിപ്പ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ഓഫീസ് രെംട്
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,സെറ്റപ്പ് എസ്എംഎസ് ഗേറ്റ്വേ ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ഇംപോർട്ട് പരാജയപ്പെട്ടു!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,സേവനങ്ങള്
 DocType: HR Settings,Email Salary Slip to Employee,രേഖയെ ഇമെയിൽ ശമ്പളം ജി
 DocType: Cost Center,Parent Cost Center,പാരന്റ് ചെലവ് കേന്ദ്രം
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ തിരഞ്ഞെടുക്കുക
 DocType: Sales Invoice,Source,ഉറവിടം
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,അടച്ചു കാണിക്കുക
 DocType: Leave Type,Is Leave Without Pay,ശമ്പള ഇല്ലാതെ തന്നെ തന്നു
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,അസറ്റ് വിഭാഗം ഫിക്സ്ഡ് അസറ്റ് ഇനം നിര്ബന്ധമാണ്
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,പേയ്മെന്റ് പട്ടികയിൽ കണ്ടെത്തിയില്ല റെക്കോർഡുകൾ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ഈ {0} {2} {3} ഉപയോഗിച്ച് {1} വൈരുദ്ധ്യങ്ങൾ
 DocType: Student Attendance Tool,Students HTML,വിദ്യാർത്ഥികൾ എച്ച്ടിഎംഎൽ
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,വിടുന്നത് തീയതി
 DocType: Pricing Rule,For Price List,വില ലിസ്റ്റിനായി
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,എക്സിക്യൂട്ടീവ് തിരച്ചിൽ
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,വിജയസാധ്യതയുള്ളത് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,വിജയസാധ്യതയുള്ളത് സൃഷ്ടിക്കുക
 DocType: Maintenance Schedule,Schedules,സമയക്രമങ്ങൾ
 DocType: Purchase Invoice Item,Net Amount,ആകെ തുക
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM വിശദാംശം ഇല്ല
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,പ്രോഗ്രാം പ്രവേശനം
 DocType: Sales Invoice Item,Brand Name,ബ്രാൻഡ് പേര്
 DocType: Purchase Receipt,Transporter Details,ട്രാൻസ്പോർട്ടർ വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,സ്വതേ വെയർഹൗസ് തിരഞ്ഞെടുത്ത ഇനം ആവശ്യമാണ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,ബോക്സ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,സാധ്യമായ വിതരണക്കാരൻ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,സംഘടന
 DocType: Budget,Monthly Distribution,പ്രതിമാസ വിതരണം
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,റിസീവർ പട്ടിക ശൂന്യമാണ്. റിസീവർ പട്ടിക സൃഷ്ടിക്കാൻ ദയവായി
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,സെയിൽസ് പങ്കാളി ടാർജറ്റ്
 DocType: Loan Type,Maximum Loan Amount,പരമാവധി വായ്പാ തുക
 DocType: Pricing Rule,Pricing Rule,പ്രൈസിങ് റൂൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},വിദ്യാർത്ഥി {0} എന്ന റോൾ നമ്പർ തനിപ്പകർപ്പ്
 DocType: Budget,Action if Annual Budget Exceeded,ആക്ഷൻ വാർഷിക ബജറ്റ് കവിഞ്ഞു എങ്കിൽ
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ഓർഡർ വാങ്ങാൻ മെറ്റീരിയൽ അഭ്യർത്ഥന
 DocType: Shopping Cart Settings,Payment Success URL,പേയ്മെന്റ് വിജയം യുആർഎൽ
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,തിരിച്ചടവ് രീതി
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","പരിശോധിച്ചാൽ, ഹോം പേജ് വെബ്സൈറ്റ് സ്ഥിര ഇനം ഗ്രൂപ്പ് ആയിരിക്കും"
 DocType: Quality Inspection Reading,Reading 4,4 Reading
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} പദ്ധതി {1} കണ്ടില്ല സ്ഥിര യുഎഇ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} പദ്ധതി {1} കണ്ടില്ല സ്ഥിര യുഎഇ
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,കമ്പനി ചെലവിൽ വേണ്ടി ക്ലെയിമുകൾ.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","വിദ്യാർഥികൾ, സിസ്റ്റം ഹൃദയം അവസാനിക്കുന്നു എല്ലാ നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക് ചേർക്കുക"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","വിദ്യാർഥികൾ, സിസ്റ്റം ഹൃദയം അവസാനിക്കുന്നു എല്ലാ നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക് ചേർക്കുക"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},വരി # {0}: ക്ലിയറൻസ് തീയതി {1} {2} ചെക്ക് തിയതി ആകരുത്
 DocType: Company,Default Holiday List,സ്വതേ ഹോളിഡേ പട്ടിക
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},വരി {0}: സമയവും ചെയ്യുക കുറഞ്ഞ സമയത്തിനുള്ളില് {1} {2} ഓവർലാപ്പുചെയ്യുന്നു ആണ്
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,നിങ്ങൾ അനുവാദം അപേക്ഷിക്കുന്ന ചെയ്തിട്ടുള്ള ദിവസം (ങ്ങൾ) വിശേഷദിവസങ്ങൾ ആകുന്നു. നിങ്ങൾ അനുവാദം അപേക്ഷ നല്കേണ്ടതില്ല.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,പേയ്മെന്റ് ഇമെയിൽ വീണ്ടും
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,പുതിയ ചുമതല
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ക്വട്ടേഷൻ നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,മറ്റ് റിപ്പോർട്ടുകളിൽ
 DocType: Dependent Task,Dependent Task,ആശ്രിത ടാസ്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},അളവു സ്വതവേയുള്ള യൂണിറ്റ് വേണ്ടി പരിവർത്തന ഘടകം വരി 1 {0} ആയിരിക്കണം
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} ഇനി {1} അധികം ആകാൻ പാടില്ല തരത്തിലുള്ള വിടുക
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,മുൻകൂട്ടി എക്സ് ദിവസം വേണ്ടി ഓപ്പറേഷൻസ് ആസൂത്രണം ശ്രമിക്കുക.
 DocType: HR Settings,Stop Birthday Reminders,ജന്മദിന ഓർമ്മക്കുറിപ്പുകൾ നിർത്തുക
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},കമ്പനി {0} ൽ സ്ഥിര ശമ്പളപ്പട്ടിക പേയബിൾ അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: SMS Center,Receiver List,റിസീവർ പട്ടിക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,തിരയൽ ഇനം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,തിരയൽ ഇനം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,ക്ഷയിച്ചിരിക്കുന്നു തുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,പണമായി നെറ്റ് മാറ്റുക
 DocType: Assessment Plan,Grading Scale,ഗ്രേഡിംഗ് സ്കെയിൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ഇതിനകം പൂർത്തിയായ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,മെഷർ {0} യൂണിറ്റ് ഒരിക്കൽ പരിവർത്തന ഫാക്ടർ പട്ടികയിലെ അധികം നൽകി
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ഇതിനകം പൂർത്തിയായ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},പേയ്മെന്റ് അഭ്യർത്ഥന ഇതിനകം {0} നിലവിലുണ്ട്
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ഇഷ്യൂ ഇനങ്ങൾ ചെലവ്
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},ക്വാണ്ടിറ്റി {0} അധികം പാടില്ല
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ചിലവ് എൻട്രി നടത്തുക
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,വരി {0}: വിതരണക്കാരൻ നേരെ അഡ്വാൻസ് ഡെബിറ്റ് വേണം
 DocType: Company,Default Values,സ്ഥിരസ്ഥിതി മൂല്യങ്ങൾ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ആവൃത്തി} ഡൈജസ്റ്റ്
 DocType: Expense Claim,Total Amount Reimbursed,ആകെ തുക Reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ഇത് ഈ വാഹനം നേരെ രേഖകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,ശേഖരിക്കുക
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},വിതരണക്കാരൻ ഇൻവോയിസ് {0} എഗെൻസ്റ്റ് {1} dated
 DocType: Customer,Default Price List,സ്ഥിരസ്ഥിതി വില പട്ടിക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,അസറ്റ് മൂവ്മെന്റ് റെക്കോർഡ് {0} സൃഷ്ടിച്ചു
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,നിങ്ങൾ സാമ്പത്തിക വർഷത്തെ {0} ഇല്ലാതാക്കാൻ കഴിയില്ല. സാമ്പത്തിക വർഷത്തെ {0} ആഗോള ക്രമീകരണങ്ങൾ സ്വതവേ സജ്ജീകരിച്ച
 DocType: Journal Entry,Entry Type,എൻട്രി തരം
 ,Customer Credit Balance,കസ്റ്റമർ ക്രെഡിറ്റ് ബാലൻസ്
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ഇനങ്ങളുടെ ഒന്നുമില്ല അളവിലും അല്ലെങ്കിൽ മൂല്യം എന്തെങ്കിലും മാറ്റം ഉണ്ടാകും.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,നിർബന്ധമായ ഒരു ഫീൽഡ് - പ്രോഗ്രാം
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,നിർബന്ധമായ ഒരു ഫീൽഡ് - പ്രോഗ്രാം
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,വാറന്റി ക്ലെയിം
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,വാറന്റി ക്ലെയിം
 ,Lead Details,ലീഡ് വിവരങ്ങൾ
 DocType: Salary Slip,Loan repayment,വായ്പാ തിരിച്ചടവ്
 DocType: Purchase Invoice,End date of current invoice's period,നിലവിലെ ഇൻവോയ്സ് ന്റെ കാലയളവിൽ അന്ത്യം തീയതി
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,സ്ഥിര വിലാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} ആകെ മൊത്തം {2} വലിയവനല്ല \ ആകാൻ പാടില്ല നേരെ പെയ്ഡ് മുൻകൂർ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,ഐറ്റം കോഡ് തിരഞ്ഞെടുക്കുക
 DocType: Student Sibling,Studying in Same Institute,ഇതേ ഇൻസ്റ്റിറ്റ്യൂട്ട് പഠിക്കുന്ന
 DocType: Territory,Territory Manager,ടെറിട്ടറി മാനേജർ
 DocType: Packed Item,To Warehouse (Optional),സംഭരണശാല (ഓപ്ഷണൽ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Payment Entry,Paid Amount (Company Currency),തുക (കമ്പനി കറൻസി)
 DocType: Purchase Invoice,Additional Discount,അധിക ഡിസ്ക്കൌണ്ട്
 DocType: Selling Settings,Selling Settings,സജ്ജീകരണങ്ങൾ വിൽക്കുന്ന
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,വണ്ടിയിൽ കാണുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,മാർക്കറ്റിംഗ് ചെലവുകൾ
 ,Item Shortage Report,ഇനം ദൗർലഭ്യം റിപ്പോർട്ട്
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","ഭാരോദ്വഹനം പരാമർശിച്ചിരിക്കുന്നത്, \ n ദയവായി വളരെ &quot;ഭാരോദ്വഹനം UOM&quot; മറന്ന"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ഈ ഓഹരി എൻട്രി ചെയ്യുന്നതിനുപയോഗിക്കുന്ന മെറ്റീരിയൽ അഭ്യർത്ഥന
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,അടുത്ത മൂല്യത്തകർച്ച തീയതി പുതിയ അസറ്റ് നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,അടുത്ത മൂല്യത്തകർച്ച തീയതി പുതിയ അസറ്റ് നിര്ബന്ധമാണ്
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പ് പ്രത്യേക കോഴ്സ് ഓരോ ബാച്ച് വേണ്ടി
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പ് പ്രത്യേക കോഴ്സ് ഓരോ ബാച്ച് വേണ്ടി
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ഒരു ഇനത്തിന്റെ സിംഗിൾ യൂണിറ്റ്.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,വെയിറ്റേജ്
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: കോസ്റ്റ് സെന്റർ &#39;ലാഭവും നഷ്ടവും&#39; അക്കൗണ്ട് {2} ആവശ്യമാണ്. കമ്പനി ഒരു സ്ഥിര കോസ്റ്റ് സെന്റർ സ്ഥാപിക്കും ദയവായി.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ഉപഭോക്താവിനെ ഗ്രൂപ്പ് സമാന പേരിൽ നിലവിലുണ്ട് കസ്റ്റമർ പേര് മാറ്റാനോ കസ്റ്റമർ ഗ്രൂപ്പ് പുനർനാമകരണം ദയവായി
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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,Reading 2
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,ഇനം തിരിച്ചുള്ള സെയിൽസ് രജിസ്റ്റർ
 DocType: Asset,Gross Purchase Amount,മൊത്തം വാങ്ങൽ തുക
 DocType: Asset,Depreciation Method,മൂല്യത്തകർച്ച രീതി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ഓഫ്ലൈൻ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ഓഫ്ലൈൻ
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ബേസിക് റേറ്റ് ഉൾപ്പെടുത്തിയിട്ടുണ്ട് ഈ നികുതി ആണോ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,ആകെ ടാർഗെറ്റ്
 DocType: Program Course,Required,ആവശ്യമായ
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,അനുരഞ്ജനം JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,വളരെയധികം നിരകൾ. റിപ്പോർട്ട് കയറ്റുമതി ഒരു സ്പ്രെഡ്ഷീറ്റ് ആപ്ലിക്കേഷൻ ഉപയോഗിച്ച് അത് പ്രിന്റ്.
 DocType: Purchase Invoice Item,Batch No,ബാച്ച് ഇല്ല
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ലേക്ക് {1} കീ തീയതിയിൽ {2} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,കസ്റ്റമറുടെ വാങ്ങൽ ഓർഡർ നേരെ ഒന്നിലധികം സെയിൽസ് ഉത്തരവുകൾ അനുവദിക്കുക
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 DocType: Student Group Instructor,Student Group Instructor,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പരിശീലകൻ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,ഗുഅര്ദിഅന്൨ മൊബൈൽ ഇല്ല
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,പ്രധാന
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,മാറ്റമുള്ള
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,പ്രധാന
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,മാറ്റമുള്ള
 DocType: Naming Series,Set prefix for numbering series on your transactions,നിങ്ങളുടെ ഇടപാടുകൾ പരമ്പര എണ്ണം പ്രിഫിക്സ് സജ്ജമാക്കുക
 DocType: Employee Attendance Tool,Employees HTML,എംപ്ലോയീസ് എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,സ്വതേ BOM ({0}) ഈ ഇനം അല്ലെങ്കിൽ അതിന്റെ ടെംപ്ലേറ്റ് സജീവമാകും ആയിരിക്കണം
 DocType: Employee,Leave Encashed?,കാശാക്കാം വിടണോ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,വയലിൽ നിന്ന് ഓപ്പർച്യൂനിറ്റി നിർബന്ധമാണ്
 DocType: Email Digest,Annual Expenses,വാർഷിക ചെലവുകൾ
 DocType: Item,Variants,വകഭേദങ്ങളും
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,വാങ്ങൽ ഓർഡർ നിർമ്മിക്കുക
 DocType: SMS Center,Send To,അയക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},അനുവാദ ടൈപ്പ് {0} മതി ലീവ് ബാലൻസ് ഒന്നും ഇല്ല
 DocType: Payment Reconciliation Payment,Allocated amount,പദ്ധതി തുക
@@ -1767,7 +1765,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,വർക്ക്-ഇൻ-പുരോഗതി വെയർഹൗസ് മുമ്പ് സമർപ്പിക്കുക ആവശ്യമാണ്
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ഒരു ജോലിക്കായി അപേക്ഷകന്.
 DocType: Purchase Order Item,Warehouse and Reference,വെയർഹൗസ് റഫറൻസ്
 DocType: Supplier,Statutory info and other general information about your Supplier,നിയമപ്രകാരമുള്ള വിവരങ്ങളും നിങ്ങളുടെ വിതരണക്കാരൻ കുറിച്ചുള്ള മറ്റ് ജനറൽ വിവരങ്ങൾ
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,സീരിയൽ എണ്ണം ബാച്ചുകളും
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ദൃഢത
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,സ്റ്റുഡന്റ് ഗ്രൂപ്പ് ദൃഢത
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ജേർണൽ എൻട്രി {0} എഗെൻസ്റ്റ് ഏതെങ്കിലും സമാനതകളില്ലാത്ത {1} എൻട്രി ഇല്ല
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,വിലയിരുത്തലുകളും
 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: Grading Structure,Grading Intervals,ഗ്രേഡിംഗ് ഇടവേളകൾ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ദയവായി നൽകുക
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ഇനം {0} നിരയിൽ {1} അധികം {2} കൂടുതൽ വേണ്ടി ഒവെര്ബില്ല് കഴിയില്ല. മേൽ-ബില്ലിംഗ് അനുവദിക്കുന്നതിന്, ക്രമീകരണങ്ങൾ വാങ്ങാൻ ക്രമീകരിക്കുകയും ചെയ്യുക"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ഇനം അപാകതയുണ്ട് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ സജ്ജീകരിക്കുക
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM ലേക്ക് {0} സമർപ്പിക്കേണ്ടതാണ്
 DocType: Authorization Control,Authorization Control,അംഗീകാര നിയന്ത്രണ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},വരി # {0}: നിരസിച്ചു വെയർഹൗസ് തള്ളിക്കളഞ്ഞ ഇനം {1} നേരെ നിർബന്ധമായും
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,പേയ്മെന്റ്
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,നിങ്ങളുടെ ഓർഡറുകൾ നിയന്ത്രിക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,പേയ്മെന്റ്
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,നിങ്ങളുടെ ഓർഡറുകൾ നിയന്ത്രിക്കുക
 DocType: Production Order Operation,Actual Time and Cost,യഥാർത്ഥ സമയവും ചെലവ്
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},പരമാവധി ഭൗതിക അഭ്യർത്ഥന {0} സെയിൽസ് ഓർഡർ {2} നേരെ ഇനം {1} വേണ്ടി കഴിയും
 DocType: Employee,Salutation,വന്ദനംപറച്ചില്
 DocType: Course,Course Abbreviation,കോഴ്സ് സംഗ്രഹം
 DocType: Student Leave Application,Student Leave Application,വിദ്യാർത്ഥി അനുവാദ അപ്ലിക്കേഷൻ
 DocType: Item,Will also apply for variants,കൂടാതെ മോഡലുകൾക്കാണ് ബാധകമാകും
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","അത് ഇതിനകം {0} പോലെ, അസറ്റ് റദ്ദാക്കാൻ സാധിക്കില്ല"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ന് {1} ജീവനക്കാർ {0} ഹാഫ് ദിവസം
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ആകെ തൊഴിൽ സമയം ജോലി സമയം {0} MAX ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,ഓൺ
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,വില്പനയ്ക്ക് സമയത്ത് ഇനങ്ങളുടെ ചേർത്തുവെക്കുന്നു.
 DocType: Quotation Item,Actual Qty,യഥാർത്ഥ Qty
 DocType: Sales Invoice Item,References,അവലംബം
@@ -1811,7 +1809,7 @@
 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 +91,Associate,അസോസിയേറ്റ്
 DocType: Asset Movement,Asset Movement,അസറ്റ് പ്രസ്ഥാനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,പുതിയ കാർട്ട്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,പുതിയ കാർട്ട്
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,ഇനം {0} ഒരു സീരിയൽ ഇനം അല്ല
 DocType: SMS Center,Create Receiver List,റിസീവർ ലിസ്റ്റ് സൃഷ്ടിക്കുക
 DocType: Vehicle,Wheels,ചക്രങ്ങളും
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,പ്രൊഡക്ഷൻ ഉത്തരവുകൾ നേരെ സമയം രേഖകൾ സൃഷ്ടി പ്രവർത്തനരഹിതമാക്കുന്നു. ഓപറേഷൻസ് പ്രൊഡക്ഷൻ ഓർഡർ നേരെ ട്രാക്ക് ചെയ്യപ്പെടാൻ വരികയുമില്ല
 DocType: Student,Student Mobile Number,സ്റ്റുഡന്റ് മൊബൈൽ നമ്പർ
 DocType: Item,Has Variants,രൂപഭേദങ്ങൾ ഉണ്ട്
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},നിങ്ങൾ ഇതിനകം നിന്ന് {0} {1} ഇനങ്ങൾ തിരഞ്ഞെടുത്തു
 DocType: Monthly Distribution,Name of the Monthly Distribution,പ്രതിമാസ വിതരണം പേര്
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ബാച്ച് ഐഡി നിർബന്ധമായും
 DocType: Sales Person,Parent Sales Person,പേരന്റ്ഫോള്ഡര് സെയിൽസ് വ്യാക്തി
 DocType: Purchase Invoice,Recurring Invoice,ആവർത്തക ഇൻവോയിസ്
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,മാനേജിംഗ് പ്രോജക്റ്റുകൾ
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,സാമ്പത്തിക വർഷം
 DocType: Vehicle Log,Fuel Price,ഇന്ധന വില
 DocType: Budget,Budget,ബജറ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ഫിക്സ്ഡ് അസറ്റ് ഇനം ഒരു നോൺ-സ്റ്റോക്ക് ഇനം ആയിരിക്കണം.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","അത് ഒരു ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ല പോലെ ബജറ്റ്, {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,കൈവരിച്ച
 DocType: Student Admission,Application Form Route,അപേക്ഷാ ഫോം റൂട്ട്
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,ടെറിട്ടറി / കസ്റ്റമർ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,ടെറിട്ടറി / കസ്റ്റമർ
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ഉദാ 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,ഇനം {0} വിടുക അതു വേതനം വിടണമെന്ന് മുതൽ വകയിരുത്തി കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},വരി {0}: പദ്ധതി തുക {1} കുറവ് അഥവാ മുന്തിയ തുക {2} ഇൻവോയ്സ് സമൻമാരെ ആയിരിക്കണം
@@ -1878,14 +1876,14 @@
 ,Serial No Status,സീരിയൽ നില ഇല്ല
 DocType: Payment Entry Reference,Outstanding,പ്രമുഖ
 ,Daily Timesheet Summary,നിത്യജീവിതത്തിലെ Timesheet ചുരുക്കം
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","വരി {0}: തീയതി \ എന്നിവ തമ്മിലുള്ള വ്യത്യാസം വലിയവനോ അല്ലെങ്കിൽ {2} തുല്യമോ ആയിരിക്കണം, {1} കാലഘട്ടം സജ്ജമാക്കുന്നതിനായി"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ഈ സ്റ്റോക്ക് പ്രസ്ഥാനം അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിവരങ്ങൾക്ക് {0} കാണുക
 DocType: Pricing Rule,Selling,വിൽപ്പനയുള്ളത്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},തുക {0} {1} {2} നേരെ കുറച്ചുകൊണ്ടിരിക്കും
 DocType: Employee,Salary Information,ശമ്പളം വിവരങ്ങൾ
 DocType: Sales Person,Name and Employee ID,പേര് തൊഴിൽ ഐഡി
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,നിശ്ചിത തീയതി തീയതി പതിച്ച മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,"കടമകൾ, നികുതി"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,റഫറൻസ് തീയതി നൽകുക
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ഈ ചാർജ് തരം വേണ്ടി ശ്രേഷ്ഠ അഥവാ നിലവിലെ വരി നമ്പറിലേക്ക് തുല്യ വരി എണ്ണം റെഫർ ചെയ്യാൻ കഴിയില്ല
 DocType: Asset,Sold,വിറ്റത്
 ,Item-wise Purchase History,ഇനം തിരിച്ചുള്ള വാങ്ങൽ ചരിത്രം
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},സീരിയൽ ഇല്ല കൊണ്ടുവരുവാൻ &#39;ജനറേറ്റ് ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി ഇനം {0} വേണ്ടി ചേർത്തു
 DocType: Account,Frozen,ശീതീകരിച്ച
 ,Open Production Orders,ഓപ്പൺ പ്രൊഡക്ഷൻ ഓർഡറുകൾ
 DocType: Sales Invoice Payment,Base Amount (Company Currency),അടിസ്ഥാന സംഖ്യ (കമ്പനി കറൻസി)
 DocType: Payment Reconciliation Payment,Reference Row,റഫറൻസ് വരി
 DocType: Installation Note,Installation Time,ഇന്സ്റ്റലേഷന് സമയം
 DocType: Sales Invoice,Accounting Details,അക്കൗണ്ടിംഗ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ഈ കമ്പനി വേണ്ടി എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കുക
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,നിക്ഷേപങ്ങൾ
 DocType: Issue,Resolution Details,മിഴിവ് വിശദാംശങ്ങൾ
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,സംവാദം
 DocType: Payment Entry,Transaction ID,ഇടപാട് ഐഡി
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,പ്രൈസിങ് നിയമങ്ങൾ കൂടുതൽ അളവ് അടിസ്ഥാനമാക്കി ഫിൽറ്റർ.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ജീവനക്കാരൻ {0} പ്രവേശനത്തിനുള്ള തീയതി സജ്ജീകരിക്കുക
 DocType: Task,Total Billing Amount (via Time Sheet),ആകെ ബില്ലിംഗ് തുക (ടൈം ഷീറ്റ് വഴി)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ആവർത്തിക്കുക കസ്റ്റമർ റവന്യൂ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) പങ്ക് &#39;ചിലവിടൽ Approver&#39; ഉണ്ടായിരിക്കണം
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,ജോഡി
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ഉത്പാദനം BOM ലേക്ക് ആൻഡ് അളവ് തിരഞ്ഞെടുക്കുക
 DocType: Asset,Depreciation Schedule,മൂല്യത്തകർച്ച ഷെഡ്യൂൾ
 DocType: Bank Reconciliation Detail,Against Account,അക്കൗണ്ടിനെതിരായ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,അര ദിവസം തീയതി തീയതി മുതൽ ദിവസവും തമ്മിലുള്ള ആയിരിക്കണം
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},കമ്പനി {0} ൽ &#39;അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ&#39; സജ്ജമാക്കുക
 ,Maintenance Schedules,മെയിൻറനൻസ് സമയക്രമങ്ങൾ
 DocType: Task,Actual End Date (via Time Sheet),യഥാർത്ഥ അവസാന തീയതി (ടൈം ഷീറ്റ് വഴി)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},തുക {0} {1} {2} {3} നേരെ
 ,Quotation Trends,ക്വട്ടേഷൻ ട്രെൻഡുകൾ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ഐറ്റം {0} ഐറ്റം മാസ്റ്റർ പരാമർശിച്ചു അല്ല ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു സ്വീകാ അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Shipping Rule Condition,Shipping Amount,ഷിപ്പിംഗ് തുക
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക
 DocType: Purchase Invoice Item,Conversion Factor,പരിവർത്തന ഫാക്ടർ
 DocType: Purchase Order,Delivered,കൈമാറി
 ,Vehicle Expenses,വാഹന ചെലവുകൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
+DocType: Serial No,Invoice Details,ഇൻവോയ്സ് വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ഉപയോഗപ്രദമായ ജീവിതം ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം ശ്രേഷ്ഠ അല്ലെങ്കിൽ {0} തുല്യമായിരിക്കണം
 DocType: Purchase Receipt,Vehicle Number,വാഹന നമ്പർ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ആവർത്തന ഇൻവോയ്സ് സ്റ്റോപ്പ് ആയിരിക്കും തീയതി
 DocType: Employee Loan,Loan Amount,വായ്പാ തുക
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Salary Slip,net pay info,വല ശമ്പള വിവരം
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ചിലവിടൽ ക്ലെയിം അംഗീകാരത്തിനായി ശേഷിക്കുന്നു. മാത്രം ചിലവിടൽ Approver സ്റ്റാറ്റസ് അപ്ഡേറ്റ് ചെയ്യാം.
 DocType: Email Digest,New Expenses,പുതിയ ചെലവുകൾ
 DocType: Purchase Invoice,Additional Discount Amount,അധിക ഡിസ്ക്കൌണ്ട് തുക
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","വരി # {0}: അളവ് 1, ഇനം ഒരു നിശ്ചിത അസറ്റ് പോലെ ആയിരിക്കണം. ഒന്നിലധികം അളവ് പ്രത്യേകം വരി ഉപയോഗിക്കുക."
 DocType: Leave Block List Allow,Leave Block List Allow,അനുവദിക്കുക ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ബ്ലാങ്ക് ബഹിരാകാശ ആകാൻ പാടില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,നോൺ-ഗ്രൂപ്പ് വരെ ഗ്രൂപ്പ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,സ്പോർട്സ്
 DocType: Loan Type,Loan Name,ലോൺ പേര്
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,നിങ്ങൾ നിരസിച്ചു ഇനങ്ങളുടെ സ്റ്റോക്ക് നിലനിർത്തുന്നുവെന്നോ എവിടെ വെയർഹൗസ്
 DocType: Production Order,Skip Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ ഒഴിവാക്കുക
 DocType: Production Order,Skip Material Transfer,മെറ്റീരിയൽ ട്രാൻസ്ഫർ ഒഴിവാക്കുക
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,കീ തീയതി {2} വരെ {1} {0} വിനിമയ നിരക്ക് കണ്ടെത്താൻ കഴിഞ്ഞില്ല. സ്വയം ഒരു കറൻസി എക്സ്ചേഞ്ച് റെക്കോർഡ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,നിങ്ങളുടെ സാമ്പത്തിക വർഷം ന് അവസാനിക്കും
 DocType: POS Profile,Price List,വിലവിവരപട്ടിക
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ഇപ്പോൾ സ്വതവേയുള്ള ധനകാര്യ വർഷം ആണ്. പ്രാബല്യത്തിൽ മാറ്റം നിങ്ങളുടെ ബ്രൗസർ പുതുക്കുക.
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},അക്കൗണ്ട് {0} അസാധുവാണ്. അക്കൗണ്ട് കറന്സി {1} ആയിരിക്കണം
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM പരിവർത്തന ഘടകം വരി {0} ആവശ്യമാണ്
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം വിൽപ്പന ഓർഡർ, സെയിൽസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Salary Component,Deduction,കുറയ്ക്കല്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,വരി {0}: സമയവും സമയാസമയങ്ങളിൽ നിർബന്ധമാണ്.
 DocType: Stock Reconciliation Item,Amount Difference,തുക വ്യത്യാസം
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},ഇനം വില വില പട്ടിക {1} ൽ {0} വേണ്ടി ചേർത്തു
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ഈ വിൽപ്പന ആളിന്റെ ജീവനക്കാരന്റെ ഐഡി നൽകുക
 DocType: Territory,Classification of Customers by region,പ്രാദേശികതയും ഉപഭോക്താക്കൾക്ക് തിരിക്കൽ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,വ്യത്യാസം തുക പൂജ്യം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,വ്യത്യാസം തുക പൂജ്യം ആയിരിക്കണം
 DocType: Project,Gross Margin,മൊത്തം മാർജിൻ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,പ്രൊഡക്ഷൻ ഇനം ആദ്യം നൽകുക
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,കണക്കുകൂട്ടിയത് ബാങ്ക് സ്റ്റേറ്റ്മെന്റ് ബാലൻസ്
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,അപ്രാപ്തമാക്കിയ ഉപയോക്താവിനെ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ഉദ്ധരണി
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ഉദ്ധരണി
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,ആകെ കിഴിച്ചുകൊണ്ടു
 ,Production Analytics,പ്രൊഡക്ഷൻ അനലിറ്റിക്സ്
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},മുന്നറിയിപ്പ്: അറ്റാച്ച്മെന്റ് {0} ന് അസാധുവായ SSL സർട്ടിഫിക്കറ്റ്
 DocType: Student Admission,Eligibility,യോഗ്യത
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ലീഡുകൾ നിങ്ങളുടെ നയിക്കുന്നത് പോലെയും നിങ്ങളുടെ എല്ലാ ബന്ധങ്ങൾ കൂടുതൽ ചേർക്കുക, നിങ്ങൾ ബിസിനസ്സ് ലഭിക്കാൻ സഹായിക്കും"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ലീഡുകൾ നിങ്ങളുടെ നയിക്കുന്നത് പോലെയും നിങ്ങളുടെ എല്ലാ ബന്ധങ്ങൾ കൂടുതൽ ചേർക്കുക, നിങ്ങൾ ബിസിനസ്സ് ലഭിക്കാൻ സഹായിക്കും"
 DocType: Production Order Operation,Actual Operation Time,യഥാർത്ഥ ഓപ്പറേഷൻ സമയം
 DocType: Authorization Rule,Applicable To (User),(ഉപയോക്താവ്) ബാധകമായ
 DocType: Purchase Taxes and Charges,Deduct,കുറയ്ക്കാവുന്നതാണ്
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,ഔദ്യോഗിക വിലാസം
 DocType: Appraisal,Calculate Total Score,ആകെ സ്കോർ കണക്കുകൂട്ടുക
 DocType: Request for Quotation,Manufacturing Manager,ണം മാനേജർ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},സീരിയൽ ഇല്ല {0} {1} വരെ വാറന്റി കീഴിൽ ആണ്
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,പാക്കേജുകൾ കടന്നു ഡെലിവറി നോട്ട് വിഭജിക്കുക.
 apps/erpnext/erpnext/hooks.py +87,Shipments,കയറ്റുമതി
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,അക്കൗണ്ട് ബാലൻസ് ({0}) വേണ്ടി {1} ഓഹരി മൂല്യം ({2}) വെയർഹൗസ് വേണ്ടി {3} ഒരേ ആയിരിക്കണം
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,കുറിപ്പ്: ഇമെയിൽ ഉപയോക്താക്കൾക്ക് അയച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ഇടപെടൽ എണ്ണം
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ഇടപെടൽ എണ്ണം
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,കമ്പനി തിരഞ്ഞെടുക്കുക ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,എല്ലാ വകുപ്പുകളുടെയും വേണ്ടി പരിഗണിക്കും എങ്കിൽ ശൂന്യമായിടൂ
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","തൊഴിൽ വിവിധതരം (സ്ഥിരമായ, കരാർ, തടവുകാരി മുതലായവ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ഇനം {1} നിര്ബന്ധമാണ്
 DocType: Process Payroll,Fortnightly,രണ്ടാഴ്ചയിലൊരിക്കൽ
 DocType: Currency Exchange,From Currency,കറൻസി
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","കുറഞ്ഞത് ഒരു വരിയിൽ പദ്ധതി തുക, ഇൻവോയിസ് ടൈപ്പ് ഇൻവോയിസ് നമ്പർ തിരഞ്ഞെടുക്കുക"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),നിരക്ക് (കമ്പനി കറൻസി)
 DocType: Student Guardian,Others,മറ്റുള്ളവ
 DocType: Payment Entry,Unallocated Amount,ലഭ്യമല്ലാത്ത തുക
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ഒരു പൊരുത്തമുള്ള ഇനം കണ്ടെത്താൻ കഴിയുന്നില്ല. {0} വേണ്ടി മറ്റ് ചില മൂല്യം തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,കൂടുതൽ അപ്ഡേറ്റുകൾ ഇല്ല
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ആദ്യവരിയിൽ &#39;മുൻ വരി തുകയ്ക്ക്&#39; അല്ലെങ്കിൽ &#39;മുൻ വരി ആകെ ന്&#39; ചുമതലയേറ്റു തരം തിരഞ്ഞെടുക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ശിശു ഇനം ഒരു ഉൽപ്പന്നം ബണ്ടിൽ പാടില്ല. ഇനം നീക്കംചെയ്യുക `{0}` സംരക്ഷിക്കാനുമാവും
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ബാങ്കിംഗ്
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,തിമെശെഎത്സ് ചേർക്കുക
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,തിമെശെഎത്സ് ചേർക്കുക
 DocType: Vehicle Service,Service Item,സേവന ഇനം
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
 DocType: Bank Guarantee,Bank Guarantee,ബാങ്ക് ഗ്യാരന്റി
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},വരി # {0}: അസറ്റ് {1} {2} ഇതിനകം
 DocType: Quotation Item,Stock Balance,ഓഹരി ബാലൻസ്
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,പെയ്മെന്റ് വിൽപ്പന ഓർഡർ
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,സജ്ജീകരണം&gt; ക്രമീകരണങ്ങൾ&gt; നാമകരണം സീരീസ് വഴി {0} സീരീസ് പേര് സജ്ജീകരിക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,സിഇഒ
 DocType: Expense Claim Detail,Expense Claim Detail,ചിലവേറിയ ക്ലെയിം വിശദാംശം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,ശരിയായ അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,വിലവിവര ലിസ്റ്റ് സജ്ജമാക്കിയിട്ടില്ലെങ്കിൽ വിലകൾ കാണിക്കില്ല
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ഈ ഷിപ്പിംഗ് റൂൾ ഒരു രാജ്യം വ്യക്തമാക്കൂ ലോകമൊട്ടാകെ ഷിപ്പിംഗ് പരിശോധിക്കുക
 DocType: Stock Entry,Total Incoming Value,ആകെ ഇൻകമിംഗ് മൂല്യം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ഡെബിറ്റ് ആവശ്യമാണ്
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","തിമെശെഎത്സ് സമയം, നിങ്ങളുടെ ടീം നടക്കുന്ന പ്രവർത്തനങ്ങൾ ചിലവു ബില്ലിംഗ് ട്രാക്ക് സൂക്ഷിക്കാൻ സഹായിക്കുന്നു"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,വാങ്ങൽ വില പട്ടിക
 DocType: Offer Letter Term,Offer Term,ആഫര് ടേം
 DocType: Quality Inspection,Quality Manager,ക്വാളിറ്റി മാനേജർ
 DocType: Job Applicant,Job Opening,ഇയ്യോബ് തുറക്കുന്നു
 DocType: Payment Reconciliation,Payment Reconciliation,പേയ്മെന്റ് അനുരഞ്ജനം
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Incharge വ്യക്തിയുടെ പേര് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge വ്യക്തിയുടെ പേര് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ടെക്നോളജി
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},ആകെ ലഭിക്കാത്ത: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ൽ വെബ്സൈറ്റ് ഓപ്പറേഷൻ
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,നഷ്ടപ്പെട്ട കാരണം
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,പുതിയ വിലാസം
 DocType: Quality Inspection,Sample Size,സാമ്പിളിന്റെവലിപ്പം
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,എല്ലാ ഇനങ്ങളും ഇതിനകം invoiced ചെയ്തു
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ദയവായി രസീത് പ്രമാണം നൽകുക
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,പ്രശ്നപരിഹാരത്തിനായി കുറഞ്ഞ കേന്ദ്രങ്ങൾ ഗ്രൂപ്പുകൾ കീഴിൽ കഴിയും പക്ഷേ എൻട്രികൾ നോൺ-ഗ്രൂപ്പുകൾ നേരെ കഴിയും
 DocType: Project,External,പുറത്തേക്കുള്ള
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ഉപയോക്താക്കൾ അനുമതികളും
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},സൃഷ്ടിച്ചു പ്രൊഡക്ഷൻ ഓർഡറുകൾ: {0}
 DocType: Branch,Branch,ബ്രാഞ്ച്
 DocType: Guardian,Mobile Number,മൊബൈൽ നമ്പർ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,"അച്ചടി, ബ്രാൻഡിംഗ്"
 DocType: Bin,Actual Quantity,യഥാർത്ഥ ക്വാണ്ടിറ്റി
 DocType: Shipping Rule,example: Next Day Shipping,ഉദാഹരണം: അടുത്ത ദിവസം ഷിപ്പിംഗ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} കാണാനായില്ല സീരിയൽ ഇല്ല
 DocType: Scheduling Tool,Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച്
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,നിങ്ങളുടെ ഉപഭോക്താക്കളെ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,കുട്ടിയാണെന്ന്
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,കുട്ടിയാണെന്ന്
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},നിങ്ങൾ പദ്ധതി സഹകരിക്കുക ക്ഷണിച്ചു: {0}
 DocType: Leave Block List Date,Block Date,ബ്ലോക്ക് തീയതി
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ഇപ്പോൾ പ്രയോഗിക്കുക
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,ലേക്ക് അയച്ചു
 DocType: Payment Request,Make Sales Invoice,സെയിൽസ് ഇൻവോയിസ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,സോഫ്റ്റ്വെയറുകൾ
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,അടുത്ത ബന്ധപ്പെടുക തീയതി കഴിഞ്ഞ ലെ പാടില്ല
 DocType: Company,For Reference Only.,മാത്രം റഫറൻസിനായി.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,തിരഞ്ഞെടുക്കുക ബാച്ച് ഇല്ല
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},അസാധുവായ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,മുൻകൂർ തുക
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,കേസ് നമ്പർ 0 ആയിരിക്കും കഴിയില്ല
 DocType: Item,Show a slideshow at the top of the page,പേജിന്റെ മുകളിൽ ഒരു സ്ലൈഡ്ഷോ കാണിക്കുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,സ്റ്റോറുകൾ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,സ്റ്റോറുകൾ
 DocType: Serial No,Delivery Time,വിതരണ സമയം
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,എയ്ജിങ് അടിസ്ഥാനത്തിൽ ഓൺ
 DocType: Item,End of Life,ജീവിതാവസാനം
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,ടൂൾ പുനർനാമകരണം ചെയ്യുക
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,അപ്ഡേറ്റ് ചെലവ്
 DocType: Item Reorder,Item Reorder,ഇനം പുനഃക്രമീകരിക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,ശമ്പള ജി കാണിക്കുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,മെറ്റീരിയൽ കൈമാറുക
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", ഓപ്പറേഷൻസ് വ്യക്തമാക്കുക ഓപ്പറേറ്റിങ് വില നിങ്ങളുടെ പ്രവർത്തനങ്ങൾക്ക് ഒരു അതുല്യമായ ഓപ്പറേഷൻ ഒന്നും തരും."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ഈ പ്രമാണം ഇനം {4} വേണ്ടി {0} {1} വഴി പരിധിക്കു. നിങ്ങൾ നിർമ്മിക്കുന്നത് ഒരേ {2} നേരെ മറ്റൊരു {3}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,സംരക്ഷിക്കുന്നതിൽ ശേഷം ആവർത്തിക്കുന്ന സജ്ജമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,മാറ്റം തുക അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക
 DocType: Purchase Invoice,Price List Currency,വില പട്ടിക കറന്സി
 DocType: Naming Series,User must always select,ഉപയോക്താവ് എപ്പോഴും തിരഞ്ഞെടുക്കണം
 DocType: Stock Settings,Allow Negative Stock,നെഗറ്റീവ് സ്റ്റോക്ക് അനുവദിക്കുക
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,ബജറ്റ് അക്കൗണ്ട്
 DocType: Quality Inspection,Verified By,പരിശോധിച്ചു
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","നിലവിലുള്ള ഇടപാടുകൾ ഉള്ളതിനാൽ, കമ്പനിയുടെ സഹജമായ കറൻസി മാറ്റാൻ കഴിയില്ല. ഇടപാട് സ്വതവേയുള്ള കറൻസി മാറ്റാൻ റദ്ദാക്കി വേണം."
-DocType: Grade Interval,Grade Description,ഗ്രേഡ് വിവരണം
+DocType: Grading Scale Interval,Grade Description,ഗ്രേഡ് വിവരണം
 DocType: Stock Entry,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,ശമ്പളം ജി സൃഷ്ടിക്കുക
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,തീയതി ആരംഭിക്കുന്ന ഹാജർ
 DocType: Warranty Claim,Raised By,ഉന്നയിക്കുന്ന
 DocType: Payment Gateway Account,Payment Account,പേയ്മെന്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,തുടരാനായി കമ്പനി വ്യക്തമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,അക്കൗണ്ടുകൾ സ്വീകാര്യം ലെ നെറ്റ് മാറ്റുക
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ഓഫാക്കുക നഷ്ടപരിഹാര
 DocType: Offer Letter,Accepted,സ്വീകരിച്ചു
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ശരിക്കും ഈ കമ്പനിയുടെ എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കാൻ ആഗ്രഹിക്കുന്ന ദയവായി ഉറപ്പാക്കുക. അത് പോലെ നിങ്ങളുടെ മാസ്റ്റർ ഡാറ്റ തുടരും. ഈ പ്രവർത്തനം തിരുത്താൻ കഴിയില്ല.
 DocType: Room,Room Number,മുറി നമ്പർ
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},അസാധുവായ റഫറൻസ് {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) പ്രൊഡക്ഷൻ ഓർഡർ {3} ആസൂത്രണം quanitity ({2}) വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) പ്രൊഡക്ഷൻ ഓർഡർ {3} ആസൂത്രണം quanitity ({2}) വലുതായിരിക്കും കഴിയില്ല
 DocType: Shipping Rule,Shipping Rule Label,ഷിപ്പിംഗ് റൂൾ ലേബൽ
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ഉപയോക്തൃ ഫോറം
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,അസംസ്കൃത വസ്തുക്കൾ ശൂന്യമായിരിക്കാൻ കഴിയില്ല.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ഇൻവോയ്സ് ഡ്രോപ്പ് ഷിപ്പിംഗ് ഇനം ഉൾപ്പെടുന്നു, സ്റ്റോക്ക് അപ്ഡേറ്റുചെയ്യാനായില്ല."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ദ്രുത ജേർണൽ എൻട്രി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ലേക്ക് ഏതെങ്കിലും ഇനത്തിന്റെ agianst പരാമർശിച്ചു എങ്കിൽ നിങ്ങൾ നിരക്ക് മാറ്റാൻ കഴിയില്ല
 DocType: Employee,Previous Work Experience,മുമ്പത്തെ ജോലി പരിചയം
 DocType: Stock Entry,For Quantity,ക്വാണ്ടിറ്റി വേണ്ടി
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,നിബന്ധനകളും Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ഈ സിസ്റ്റത്തിൽ സജ്ജീകരിക്കുന്നത് ഏത് ഇൻസ്റ്റിറ്റ്യൂട്ട് പേര്.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","ഈ കാലികമായി മരവിപ്പിച്ചു അക്കൗണ്ടിംഗ് എൻട്രി, ആരും ചെയ്യാൻ കഴിയും / ചുവടെ വ്യക്തമാക്കിയ പങ്ക് ഒഴികെ എൻട്രി പരിഷ്ക്കരിക്കുക."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,അറ്റകുറ്റപ്പണി ഷെഡ്യൂൾ സൃഷ്ടിക്കുന്നതിൽ മുമ്പ് പ്രമാണം സംരക്ഷിക്കുക ദയവായി
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,പ്രോജക്ട് അവസ്ഥ
 DocType: UOM,Check this to disallow fractions. (for Nos),ഘടകാംശങ്ങൾ അനുമതി ഇല്ലാതാക്കുന്നത് ഇത് ചെക്ക്. (ഒഴിവ് വേണ്ടി)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,താഴെ പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിച്ചിട്ടില്ല:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,ഒരു അവധിക്കാലം പ്രവർത്തിക്കുന്ന ജീവനക്കാരിൽ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,മർക്കോസ് നിലവിലുള്ളജാലകങ്ങള്
 DocType: Project,% Complete Method,% പൂർത്തിയായി രീതി
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},മെയിൻറനൻസ് ആരംഭ തീയതി സീരിയൽ ഇല്ല {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},മെയിൻറനൻസ് ആരംഭ തീയതി സീരിയൽ ഇല്ല {0} വേണ്ടി ഡെലിവറി തീയതി മുമ്പ് ആകാൻ പാടില്ല
 DocType: Production Order,Actual End Date,യഥാർത്ഥ അവസാന തീയതി
 DocType: BOM,Operating Cost (Company Currency),ഓപ്പറേറ്റിങ് ചെലവ് (കമ്പനി കറൻസി)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ശമ്പള വിടണമെന്ന് അംഗീകൃത അനുവാദ ആപ്ലിക്കേഷന് രേഖകളുമായി പൊരുത്തപ്പെടുന്നില്ല
 DocType: Campaign,Campaign-.####,കാമ്പയിൻ -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,അടുത്ത ഘട്ടങ്ങൾ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,മികച്ച സാധ്യത നിരക്കിൽ വ്യക്തമാക്കിയ ഇനങ്ങൾ നൽകുക
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ദിവസം കഴിഞ്ഞ് ഓട്ടോ അടയ്ക്കൂ അവസരം
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,അവസാനിക്കുന്ന വർഷം
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},സൃഷ്ടിച്ചു ഫീസ് റെക്കോർഡ്സ് - {0}
 DocType: Asset Category Account,Asset Category Account,അസറ്റ് വർഗ്ഗം അക്കൗണ്ട്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},സെയിൽസ് ഓർഡർ അളവ് {1} അധികം ഇനം {0} ഉത്പാദിപ്പിക്കാനുള്ള കഴിയുന്നില്ലേ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,ഓഹരി എൻട്രി {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Payment Reconciliation,Bank / Cash Account,ബാങ്ക് / ക്യാഷ് അക്കൗണ്ട്
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,അടുത്തത് ബന്ധപ്പെടുക നയിക്കുന്നത് ഇമെയിൽ വിലാസം തന്നെ പാടില്ല
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ക്ലിയറൻസ് തീയതി പറഞ്ഞിട്ടില്ലാത്ത
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,പ്രൊഡക്ഷൻ
 DocType: Guardian,Occupation,തൊഴില്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,വരി {0}: ആരംഭ തീയതി അവസാന തീയതി മുമ്പ് ആയിരിക്കണം
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),ആകെ (Qty)
 DocType: Sales Invoice,This Document,ഈ പ്രമാണം
 DocType: Installation Note Item,Installed Qty,ഇൻസ്റ്റോൾ ചെയ്ത Qty
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ഒരു പ്രശ്നം റിപ്പോർട്ടുചെയ്യുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,യൂട്ടിലിറ്റി ചെലവുകൾ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-മുകളിൽ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,വരി # {0}: ജേണൽ എൻട്രി {1} മറ്റൊരു വൗച്ചർ പൊരുത്തപ്പെടും അക്കൗണ്ട് {2} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,വരി # {0}: ജേണൽ എൻട്രി {1} മറ്റൊരു വൗച്ചർ പൊരുത്തപ്പെടും അക്കൗണ്ട് {2} ഞങ്ങൾക്കുണ്ട് അല്ലെങ്കിൽ ഇതിനകം ഇല്ല
 DocType: Buying Settings,Default Buying Price List,സ്ഥിരസ്ഥിതി വാങ്ങൽ വില പട്ടിക
 DocType: Process Payroll,Salary Slip Based on Timesheet,ശമ്പള ജി Timesheet അടിസ്ഥാനമാക്കി
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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.","കമ്പനി, കറൻസി, നടപ്പു സാമ്പത്തിക വർഷം, തുടങ്ങിയ സജ്ജമാക്കുക സ്വതേ മൂല്യങ്ങൾ"
 DocType: Payment Entry,Payment Type,പേയ്മെന്റ് തരം
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,ഇനം {0} ഒരു ബാച്ച് തിരഞ്ഞെടുക്കുക. ഈ നിബന്ധനയുടെ പൂര്ത്തീകരിക്കുന്നു എന്ന് ഒരു ബാച്ച് കണ്ടെത്താൻ കഴിഞ്ഞില്ല
 DocType: Process Payroll,Select Employees,എംപ്ലോയീസ് തിരഞ്ഞെടുക്കുക
 DocType: Opportunity,Potential Sales Deal,സാധ്യതയുള്ള സെയിൽസ് പ്രവർത്തിച്ചു
 DocType: Payment Entry,Cheque/Reference Date,ചെക്ക് / റഫറൻസ് തീയതി
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} ഇതിനകം കമ്പനി {1} വേണ്ടി സൃഷ്ടിച്ച ആഗോള POS പ്രൊഫൈൽ
 DocType: Purchase Order,Ref SQ,റഫറൻസ് ചതുരശ്ര
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,എല്ലാ BOMs ലെ ഇനം / BOM മാറ്റിസ്ഥാപിക്കുക
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,കൈപ്പറ്റുമ്പോൾ പ്രമാണം സമർപ്പിക്കേണ്ടതാണ്
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,കൈപ്പറ്റുമ്പോൾ പ്രമാണം സമർപ്പിക്കേണ്ടതാണ്
 DocType: Purchase Invoice Item,Received Qty,Qty ലഭിച്ചു
 DocType: Stock Entry Detail,Serial No / Batch,സീരിയൽ ഇല്ല / ബാച്ച്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,"പെയ്ഡ്, ഒരിക്കലും പാടില്ല കൈമാറിയില്ല"
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,ഡിഎൻ-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ഇല്ല സമയം ഷീറ്റുകൾ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} കയറ്റികൊണ്ടു-ഫോർവേഡ് ചെയ്യാൻ കഴിയില്ല ടൈപ്പ് വിടുക
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',മെയിൻറനൻസ് ഷെഡ്യൂൾ എല്ലാ ഇനങ്ങളും വേണ്ടി നിർമ്മിക്കുന്നില്ല ആണ്. &#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 ,To Produce,ഉത്പാദിപ്പിക്കാൻ
 apps/erpnext/erpnext/config/hr.py +93,Payroll,ശന്വളപ്പട്ടിക
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} ൽ {0} വരി വേണ്ടി. {2} ഇനം നിരക്ക്, വരികൾ {3} ഉൾപ്പെടുത്തും ഉണ്ടായിരിക്കണം ഉൾപ്പെടുത്തുന്നതിനായി"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ഉപയോക്താവിന്റെ നിർമ്മിക്കുക
 DocType: Packing Slip,Identification of the package for the delivery (for print),(പ്രിന്റ് വേണ്ടി) ഡെലിവറി പാക്കേജിന്റെ തിരിച്ചറിയൽ
 DocType: Bin,Reserved Quantity,സംരക്ഷിത ക്വാണ്ടിറ്റി
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,ദയവായി സാധുവായ ഇമെയിൽ വിലാസം നൽകുക
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,അപ്രാപ്തമാക്കി ടെംപ്ലേറ്റ് സ്ഥിരസ്ഥിതി ടെംപ്ലേറ്റ് പാടില്ല
 DocType: Account,Income Account,ആദായ അക്കൗണ്ട്
 DocType: Payment Request,Amount in customer's currency,ഉപഭോക്താവിന്റെ കറൻസി തുക
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ഡെലിവറി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ഡെലിവറി
 DocType: Stock Reconciliation Item,Current Qty,ഇപ്പോഴത്തെ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",വിഭാഗം ആറെണ്ണവും ലെ &quot;മെറ്റീരിയൽസ് അടിസ്ഥാനപ്പെടുത്തിയ ഓൺ നിരക്ക്&quot; കാണുക
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,മുമ്പത്തെ
 DocType: Appraisal Goal,Key Responsibility Area,കീ ഉത്തരവാദിത്വം ഏരിയ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",സ്റ്റുഡന്റ് ബാച്ചുകൾ നിങ്ങൾ വിദ്യാർത്ഥികൾക്ക് ഹാജർ അസെസ്മെന്റുകൾ ഫീസും കണ്ടെത്താൻ സഹായിക്കുന്ന
 DocType: Payment Entry,Total Allocated Amount,ആകെ തുക
 DocType: Item Reorder,Material Request Type,മെറ്റീരിയൽ അഭ്യർത്ഥന തരം
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} ലേക്ക് {1} നിന്ന് ശമ്പളം വേണ്ടി Accural ജേണൽ എൻട്രി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage രക്ഷിച്ചില്ല, നിറഞ്ഞിരിക്കുന്നു"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,വരി {0}: UOM പരിവർത്തന ഫാക്ടർ നിർബന്ധമായും
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,റഫറൻസ്
 DocType: Budget,Cost Center,ചെലവ് കേന്ദ്രം
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,സെയിൽസ് ഇടപാടുകളിൽ നിന്നുള്ള ഉപഭോക്താവിന്റെ ടാക്സ് ഐഡി മറയ്ക്കുക
 DocType: Upload Attendance,Upload HTML,എച്ച്ടിഎംഎൽ അപ്ലോഡ് ചെയ്യുക
 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.","പ്രൈസിങ് റൂൾ ചില മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി, നല്കിയിട്ടുള്ള ശതമാനം define / വില പട്ടിക മാറ്റണമോ ഉണ്ടാക്കിയ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","പ്രൈസിങ് റൂൾ ചില മാനദണ്ഡങ്ങൾ അടിസ്ഥാനമാക്കി, നല്കിയിട്ടുള്ള ശതമാനം define / വില പട്ടിക മാറ്റണമോ ഉണ്ടാക്കിയ."
 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 +96,Head of Marketing and Sales,മാർക്കറ്റിങ് ആൻഡ് സെയിൽസ് ഹെഡ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","തിരഞ്ഞെടുത്ത പ്രൈസിങ് ഭരണം &#39;വില&#39; വേണ്ടി ഉണ്ടാക്കിയ, അത് വില പട്ടിക തിരുത്തിയെഴുതും. പ്രൈസിങ് റൂൾ വില അവസാന വില ആണ്, അതിനാൽ യാതൊരു കൂടുതൽ നല്കിയിട്ടുള്ള നടപ്പാക്കണം. അതുകൊണ്ട്, സെയിൽസ് ഓർഡർ, പർച്ചേസ് ഓർഡർ തുടങ്ങിയ ഇടപാടുകൾ, അതു മറിച്ച് &#39;വില പട്ടിക റേറ്റ്&#39; ഫീൽഡ് അധികം, &#39;റേറ്റ്&#39; ഫീൽഡിലെ വീണ്ടെടുക്കാൻ ചെയ്യും."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ട്രാക്ക് ഇൻഡസ്ട്രി തരം നയിക്കുന്നു.
 DocType: Item Supplier,Item Supplier,ഇനം വിതരണക്കാരൻ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,യാതൊരു ബാച്ച് ലഭിക്കാൻ ഇനം കോഡ് നൽകുക
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{1} quotation_to {0} ഒരു മൂല്യം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,എല്ലാ വിലാസങ്ങൾ.
 DocType: Company,Stock Settings,സ്റ്റോക്ക് ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","താഴെ പ്രോപ്പർട്ടികൾ ഇരു രേഖകളിൽ ഒരേ തന്നെയുള്ള സംയോജിപ്പിച്ചുകൊണ്ട് മാത്രമേ സാധിക്കുകയുള്ളൂ. ഗ്രൂപ്പ്, റൂട്ട് ടൈപ്പ്, കമ്പനിയാണ്"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',സ്റ്റാറ്റസ് ഉള്ള ജീവനക്കാർക്ക് അതെപ്പറ്റി ഒരു ഇമെയിൽ അയയ്ക്കും &#39;തുറക്കുക&#39;
 DocType: Task,Depends on Tasks,ചുമതലകൾ ആശ്രയിച്ചിരിക്കുന്നു
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,കസ്റ്റമർ ഗ്രൂപ്പ് ട്രീ നിയന്ത്രിക്കുക.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,അറ്റാച്ചുമെന്റുകൾ ഷോപ്പിംഗ് കാർട്ട് പ്രവർത്തനക്ഷമമാക്കാതെ കാണിക്കാൻ കഴിയും
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,പുതിയ ചെലവ് കേന്ദ്രം പേര്
 DocType: Leave Control Panel,Leave Control Panel,നിയന്ത്രണ പാനൽ വിടുക
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,ഡെബിറ്റ് ചെയ്യുക
 DocType: Delivery Note,Required only for sample item.,മാത്രം സാമ്പിൾ ഇനത്തിന്റെ ആവശ്യമാണ്.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ഇടപാട് ശേഷം യഥാർത്ഥ Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,വിതരണക്കാരൻ&gt; വിതരണക്കാരൻ തരം
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},"ശമ്പളം സ്ലിപ്പ് ഇല്ല {0}, {1} തമ്മിലുള്ള കണ്ടെത്തി"
 ,Pending SO Items For Purchase Request,പർച്ചേസ് അഭ്യർത്ഥന അവശേഷിക്കുന്ന ഷൂട്ട്ഔട്ട് ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,സ്റ്റുഡന്റ് പ്രവേശന
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} അപ്രാപ്തമാക്കിയിട്ടുണ്ടെങ്കിൽ
 DocType: Supplier,Billing Currency,ബില്ലിംഗ് കറന്സി
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,അതിബൃഹത്തായ
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,ഹോംപേജ് ഫീച്ചർ ഉൽപ്പന്ന
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,എല്ലാ അസസ്മെന്റ് ഗ്രൂപ്പുകൾ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,പുതിയ വെയർഹൗസ് പേര്
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),ആകെ {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),ആകെ {0} ({1})
 DocType: C-Form Invoice Detail,Territory,ടെറിട്ടറി
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ആവശ്യമായ സന്ദർശനങ്ങൾ യാതൊരു സൂചിപ്പിക്കുക
 DocType: Stock Settings,Default Valuation Method,സ്ഥിരസ്ഥിതി മൂലധനം രീതിയുടെ
 DocType: Vehicle Log,Fuel Qty,ഇന്ധന അളവ്
 DocType: Production Order Operation,Planned Start Time,ആസൂത്രണം ചെയ്ത ആരംഭിക്കുക സമയം
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,വില പട്ടിക മാസ്റ്റർ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,എല്ലാ സെയിൽസ് ഇടപാട് ഒന്നിലധികം ** സെയിൽസ് പേഴ്സൺസ് നേരെ ടാഗ് ചെയ്യാൻ കഴിയും ** നിങ്ങൾ ലക്ഷ്യങ്ങളിലൊന്നാണ് സജ്ജമാക്കാൻ നിരീക്ഷിക്കുവാനും കഴിയും.
 ,S.O. No.,ഷൂട്ട്ഔട്ട് നമ്പർ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ലീഡ് നിന്ന് {0} കസ്റ്റമർ സൃഷ്ടിക്കാൻ ദയവായി
 DocType: Price List,Applicable for Countries,രാജ്യങ്ങൾ വേണ്ടി ബാധകമായ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,മാത്രം നില അപ്ലിക്കേഷനുകൾ വിടുക &#39;അംഗീകരിച്ചത്&#39; ഉം &#39;നിരസിച്ചു സമർപ്പിക്കാൻ
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},സ്റ്റുഡന്റ് ഗ്രൂപ്പ് പേര് വരി {0} ലെ നിർബന്ധമായും
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,നിന്നും പകർത്തി
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},പേര് പിശക്: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,കുറവ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} ബന്ധപ്പെടുത്തിയ ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} ബന്ധപ്പെടുത്തിയ ഇല്ല
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ജീവനക്കാരൻ {0} വേണ്ടി ഹാജർ ഇതിനകം മലിനമായിരിക്കുന്നു
 DocType: Packing Slip,If more than one package of the same type (for print),(പ്രിന്റ് വേണ്ടി) ഒരേ തരത്തിലുള്ള ഒന്നിലധികം പാക്കേജ് എങ്കിൽ
 ,Salary Register,ശമ്പള രജിസ്റ്റർ
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ഷോപ്പിംഗ് കാർട്ട് വേണ്ടി ഉപയോഗിക്കുക
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},മൂല്യം {0} ആട്രിബ്യൂട്ടിനായുള്ള {1} സാധുവായ ഇനം പട്ടികയിൽ നിലവിലില്ല ഇനം {2} മൂല്യങ്ങളെ ആട്രിബ്യൂട്ടുചെയ്യുക
 DocType: BOM Item,Scrap %,സ്ക്രാപ്പ്%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","നിരക്കുകൾ നിങ്ങളുടെ നിരക്കു പ്രകാരം, ഐറ്റം qty അല്ലെങ്കിൽ തുക അടിസ്ഥാനമാക്കി ആനുപാതികമായി വിതരണം ചെയ്യും"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","നിരക്കുകൾ നിങ്ങളുടെ നിരക്കു പ്രകാരം, ഐറ്റം qty അല്ലെങ്കിൽ തുക അടിസ്ഥാനമാക്കി ആനുപാതികമായി വിതരണം ചെയ്യും"
 DocType: Maintenance Visit,Purposes,ആവശ്യകതകൾ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,കുറഞ്ഞത് ഒരു ഐറ്റം മടക്കം പ്രമാണത്തിൽ നെഗറ്റീവ് അളവ് കടന്നു വേണം
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ഓപ്പറേഷൻ {0} ഇനി വറ്ക്ക്സ്റ്റേഷൻ {1} ഏതെങ്കിലും ലഭ്യമായ പ്രവ്യത്തി അധികം, ഒന്നിലധികം ഓപ്പറേഷൻസ് കടന്നു ഓപ്പറേഷൻ ഇടിച്ചു"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,ടെറിട്ടറി ട്രീ നിയന്ത്രിക്കുക.
 DocType: Journal Entry Account,Sales Invoice,സെയിൽസ് ഇൻവോയിസ്
 DocType: Journal Entry Account,Party Balance,പാർട്ടി ബാലൻസ്
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ഡിസ്കൌണ്ട് പ്രയോഗിക്കുക തിരഞ്ഞെടുക്കുക
 DocType: Company,Default Receivable Account,സ്ഥിരസ്ഥിതി സ്വീകാ അക്കൗണ്ട്
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,മുകളിൽ തിരഞ്ഞെടുത്ത തിരയാം അടച്ച മൊത്തം ശമ്പളത്തിനായി ബാങ്ക് എൻട്രി സൃഷ്ടിക്കുക
 DocType: Stock Entry,Material Transfer for Manufacture,ഉല്പാദനത്തിനുള്ള മെറ്റീരിയൽ ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,കിഴിവും ശതമാനം ഒരു വില പട്ടിക നേരെ അല്ലെങ്കിൽ എല്ലാ വില പട്ടിക വേണ്ടി ഒന്നുകിൽ പ്രയോഗിക്കാൻ കഴിയും.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,കിഴിവും ശതമാനം ഒരു വില പട്ടിക നേരെ അല്ലെങ്കിൽ എല്ലാ വില പട്ടിക വേണ്ടി ഒന്നുകിൽ പ്രയോഗിക്കാൻ കഴിയും.
 DocType: Purchase Invoice,Half-yearly,അർദ്ധവാർഷികം
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,ഓഹരി വേണ്ടി അക്കൗണ്ടിംഗ് എൻട്രി
 DocType: Vehicle Service,Engine Oil,എഞ്ചിൻ ഓയിൽ
 DocType: Sales Invoice,Sales Team1,സെയിൽസ് ടീം 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,ഇനം {0} നിലവിലില്ല
 DocType: Sales Invoice,Customer Address,കസ്റ്റമർ വിലാസം
 DocType: Employee Loan,Loan Details,വായ്പ വിശദാംശങ്ങൾ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,വരി {0}: പൂർത്തിയായി അളവ് പൂജ്യം വലുതായിരിക്കണം.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,റൂട്ട് തരം
 DocType: Item,FIFO,fifo തുറക്കാന്കഴിയില്ല
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},വരി # {0}: {1} ഇനം വേണ്ടി {2} അധികം മടങ്ങിപ്പോകാനാകില്ല
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,പ്ലോട്ട്
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},ടാർജറ്റ് വെയർഹൗസ് വരി {0} നിര്ബന്ധമാണ്
 DocType: Cheque Print Template,Primary Settings,പ്രാഥമിക ക്രമീകരണങ്ങൾ
 DocType: Purchase Invoice,Select Supplier Address,വിതരണക്കാരൻ വിലാസം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ജീവനക്കാരെ ചേർക്കുക
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ജീവനക്കാരെ ചേർക്കുക
 DocType: Purchase Invoice Item,Quality Inspection,ക്വാളിറ്റി ഇൻസ്പെക്ഷൻ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,എക്സ്ട്രാ ചെറുകിട
 DocType: Company,Standard Template,സ്റ്റാൻഡേർഡ് ഫലകം
 DocType: Training Event,Theory,സിദ്ധാന്തം
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,മുന്നറിയിപ്പ്: Qty അഭ്യർത്ഥിച്ചു മെറ്റീരിയൽ മിനിമം ഓർഡർ Qty കുറവാണ്
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,അക്കൗണ്ട് {0} മരവിച്ചു
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,സംഘടന പെടുന്ന അക്കൗണ്ടുകൾ ഒരു പ്രത്യേക ചാർട്ട് കൊണ്ട് നിയമ വിഭാഗമായാണ് / സബ്സിഡിയറി.
 DocType: Payment Request,Mute Email,നിശബ്ദമാക്കുക ഇമെയിൽ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ഫുഡ്, ബീവറേജ് &amp; പുകയില"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},മാത്രം unbilled {0} നേരെ തീർക്കാം കഴിയുമോ
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,കമ്മീഷൻ നിരക്ക് 100 വലുതായിരിക്കും കഴിയില്ല
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,ആദ്യം {0} നൽകുക
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,നിലവിലുള്ള ഇടപാടിനെ അബദ്ധങ്ങളും ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല.
 DocType: Assessment Result Tool,Result HTML,ഫലം എച്ച്ടിഎംഎൽ
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,ഓൺ കാലഹരണപ്പെടുന്നു
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,വിദ്യാർത്ഥികൾ ചേർക്കുക
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} തിരഞ്ഞെടുക്കുക
 DocType: C-Form,C-Form No,സി-ഫോം ഇല്ല
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ശാരീരിക
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,പുനഃക്രമീകരിക്കുക ലെവൽ
 DocType: Company,Chart Of Accounts Template,അക്കൗണ്ടുകൾ ഫലകം ചാർട്ട്
 DocType: Attendance,Attendance Date,ഹാജർ തീയതി
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,എൻട്രി തനിപ്പകർപ്പെടുക്കുക
 DocType: Program Enrollment Tool,Get Students,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Serial No,Under Warranty,വാറന്റി കീഴിൽ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[പിശക്]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[പിശക്]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,നിങ്ങൾ സെയിൽസ് ഓർഡർ രക്ഷിക്കും ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 ,Employee Birthday,ജീവനക്കാരുടെ ജന്മദിനം
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,സ്റ്റുഡന്റ് ബാച്ച് ഹാജർ ടൂൾ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,പരിധി ക്രോസ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,വെഞ്ച്വർ ക്യാപ്പിറ്റൽ
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"ഈ &#39;അക്കാദമിക് വർഷം&#39; {0}, {1} ഇതിനകം നിലവിലുണ്ട് &#39;ടേം പേര്&#39; ഒരു അക്കാദമിക് കാലാവധി. ഈ എൻട്രികൾ പരിഷ്ക്കരിച്ച് വീണ്ടും ശ്രമിക്കുക."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ഇനം {0} നേരെ നിലവിലുള്ള ഇടപാടുകൾ ഉണ്ട് നിലയിൽ, {1} മൂല്യം മാറ്റാൻ കഴിയില്ല"
 DocType: UOM,Must be Whole Number,മുഴുവനുമുള്ള നമ്പർ ആയിരിക്കണം
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(ദിവസങ്ങളിൽ) അനുവദിച്ചതായും പുതിയ ഇലകൾ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,സീരിയൽ ഇല്ല {0} നിലവിലില്ല
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ഈ സെയിൽസ് ഓർഡർ നേരെ ഈടാക്കും വസ്തുക്കൾ%
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,കാലയളവ് സമാപന എൻട്രി
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ഗ്രൂപ്പ് പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},തുക {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},തുക {0} {1} {2} {3}
 DocType: Account,Depreciation,മൂല്യശോഷണം
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),വിതരണക്കമ്പനിയായ (കൾ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ജീവനക്കാരുടെ ഹാജർ ടൂൾ
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,അടുത്തത് മാസത്തിലെ അവസാന ദിവസം
 DocType: Support Settings,Auto close Issue after 7 days,7 ദിവസം കഴിഞ്ഞശേഷം ഓട്ടോ അടയ്ക്കൂ പ്രശ്നം
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ലീവ് ബാലൻസ് ഇതിനകം ഭാവിയിൽ ലീവ് അലോക്കേഷൻ റെക്കോർഡ് {1} ൽ കാരി മുന്നോട്ടയയ്ക്കുകയും ലീവ്, {0} മുമ്പ് വിഹിതം കഴിയില്ല"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),കുറിപ്പ്: ചില / പരാമർശം തീയതി {0} ദിവസം (ങ്ങൾ) അനുവദിച്ചിരിക്കുന്ന ഉപഭോക്തൃ ക്രെഡിറ്റ് ദിവസം അധികരിക്കുന്നു
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,സ്റ്റുഡന്റ് അപേക്ഷകന്
 DocType: Asset Category Account,Accumulated Depreciation Account,സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച അക്കൗണ്ട്
 DocType: Stock Settings,Freeze Stock Entries,ഫ്രീസുചെയ്യുക സ്റ്റോക്ക് എൻട്രികളിൽ
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,സ്റ്റോക്ക് അനലിറ്റിക്സ്
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ഓപ്പറേഷൻ ശൂന്യമായിടാൻ കഴിയില്ല
 DocType: Maintenance Visit Purpose,Against Document Detail No,ഡോക്യുമെന്റ് വിശദാംശം പോസ്റ്റ് എഗൻസ്റ്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,പാർട്ടി ഇനം നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,പാർട്ടി ഇനം നിർബന്ധമായും
 DocType: Quality Inspection,Outgoing,അയയ്ക്കുന്ന
 DocType: Material Request,Requested For,ഇൻവേർനോ
 DocType: Quotation Item,Against Doctype,Doctype എഗെൻസ്റ്റ്
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,ഇനം കോഡ്
 DocType: Production Planning Tool,Create Production Orders,പ്രൊഡക്ഷൻ ഓർഡറുകൾ സൃഷ്ടിക്കുക
 DocType: Serial No,Warranty / AMC Details,വാറന്റി / എഎംസി വിവരങ്ങൾ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,പ്രവർത്തനം അടിസ്ഥാനമാക്കി ഗ്രൂപ്പ് മാനുവലായി വിദ്യാർത്ഥികളെ തിരഞ്ഞെടുക്കുക
 DocType: Journal Entry,User Remark,ഉപയോക്താവിന്റെ അഭിപ്രായപ്പെടുക
 DocType: Lead,Market Segment,മാർക്കറ്റ് സെഗ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},തുക മൊത്തം നെഗറ്റീവ് ശേഷിക്കുന്ന തുക {0} ശ്രേഷ്ഠ പാടില്ല
 DocType: Employee Internal Work History,Employee Internal Work History,ജീവനക്കാർ ആന്തരിക വർക്ക് ചരിത്രം
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),(ഡോ) അടയ്ക്കുന്നു
 DocType: Cheque Print Template,Cheque Size,ചെക്ക് വലിപ്പം
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ സൃഷ്ടിക്കുക
 DocType: Employee Education,School/University,സ്കൂൾ / യൂണിവേഴ്സിറ്റി
 DocType: Payment Request,Reference Details,റഫറൻസ് വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ഉപയോഗപ്രദമായ ലൈഫ് ശേഷം പ്രതീക്ഷിക്കുന്ന മൂല്യം മൊത്തം വാങ്ങൽ തുക കുറവായിരിക്കണം
 DocType: Sales Invoice Item,Available Qty at Warehouse,സംഭരണശാല ലഭ്യമാണ് Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ഈടാക്കൂ തുക
 DocType: Asset,Double Declining Balance,ഇരട്ട കുറയുന്ന
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ഈ ഓഹരി അനുരഞ്ജനം ഒരു തുറക്കുന്നു എൻട്രി മുതൽ വ്യത്യാസം അക്കൗണ്ട്, ഒരു അസറ്റ് / ബാധ്യത തരം അക്കൌണ്ട് ആയിരിക്കണം"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},വിതരണം തുക വായ്പാ തുക {0} അധികമാകരുത് കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},ഇനം {0} വേണ്ടി ആവശ്യമാണ് വാങ്ങൽ ഓർഡർ നമ്പർ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,പ്രൊഡക്ഷൻ ഓർഡർ സൃഷ്ടിച്ചിട്ടില്ല
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;ഈ തീയതി മുതൽ&#39; &#39;തീയതി ആരംഭിക്കുന്ന&#39; ശേഷം ആയിരിക്കണം
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ആയി വിദ്യാർഥി {0} വിദ്യാർഥി അപേക്ഷ {1} ലിങ്കുചെയ്തതിരിക്കുന്നതിനാൽ നില മാറ്റാൻ കഴിയില്ല
 DocType: Asset,Fully Depreciated,പൂർണ്ണമായി മൂല്യത്തകർച്ചയുണ്ടായ
 ,Stock Projected Qty,ഓഹരി Qty അനുമാനിക്കപ്പെടുന്ന
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},കസ്റ്റമർ {0} {1} പ്രൊജക്ട് സ്വന്തമല്ല
 DocType: Employee Attendance Tool,Marked Attendance HTML,അടയാളപ്പെടുത്തിയിരിക്കുന്ന ഹാജർ എച്ച്ടിഎംഎൽ
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ഉദ്ധരണികൾ നിർദേശങ്ങൾ, നിങ്ങളുടെ ഉപഭോക്താക്കൾക്ക് അയച്ചിരിക്കുന്നു ബിഡ്ഡുകൾ ആകുന്നു"
 DocType: Sales Order,Customer's Purchase Order,കസ്റ്റമർ പർച്ചേസ് ഓർഡർ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,സീരിയൽ ഇല്ല ആൻഡ് ബാച്ച്
 DocType: Warranty Claim,From Company,കമ്പനി നിന്നും
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,വിലയിരുത്തിയശേഷം മാനദണ്ഡം സ്കോററായ സം {0} വേണം.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,മൂല്യം അഥവാ Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ബുക്കുചെയ്തു Depreciations എണ്ണം ക്രമീകരിക്കുക ദയവായി
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,മൂല്യം അഥവാ Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,പ്രൊഡക്ഷൻസ് ഓർഡറുകൾ ഉയിർപ്പിച്ചുമിരിക്കുന്ന കഴിയില്ല:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,മിനിറ്റ്
 DocType: Purchase Invoice,Purchase Taxes and Charges,നികുതി ചാർജുകളും വാങ്ങുക
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,എല്ലാ അബദ്ധങ്ങളും
 DocType: Sales Partner,Retailer,ഫേയ്സ്
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ക്രെഡിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,എല്ലാ വിതരണക്കാരൻ രീതികൾ
 DocType: Global Defaults,Disable In Words,വാക്കുകളിൽ പ്രവർത്തനരഹിതമാക്കുക
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,ഇനം സ്വയം നമ്പരുള്ള കാരണം ഇനം കോഡ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},{0} അല്ല തരത്തിലുള്ള ക്വട്ടേഷൻ {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ബാങ്ക് ഓവർഡ്രാഫ്റ്റിലായില്ല അക്കൗണ്ട്
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,ശമ്പളം വ്യതിചലിപ്പിച്ചു
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,വരി # {0}: തുക കുടിശ്ശിക തുക അധികമാകരുത് കഴിയില്ല.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ബ്രൗസ് BOM ലേക്ക്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,അടച്ച് വായ്പകൾ
 DocType: Purchase Invoice,Edit Posting Date and Time,എഡിറ്റ് പോസ്റ്റിംഗ് തീയതിയും സമയവും
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ചെന്നവർ സ്റ്റോക്ക് ഇടപാടുകൾ പുതുക്കുന്നതിനായി അനുവാദമില്ല
 DocType: Purchase Invoice Item,PR Detail,പി ആർ വിശദാംശം
 DocType: Sales Order,Fully Billed,പൂർണ്ണമായി ഈടാക്കൂ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ജീവനക്കാരൻ {0} ൽ സ്ഥിര മാറാവുന്ന അക്കൗണ്ട് സജ്ജീകരിക്കുക
 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 +127,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),പാക്കേജിന്റെ ആകെ ഭാരം. മൊത്തം ഭാരം + പാക്കേജിംഗ് മെറ്റീരിയൽ ഭാരം സാധാരണയായി. (പ്രിന്റ് വേണ്ടി)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,ഗ്രൂപ്പ് അടിസ്ഥാനമാക്കിയുള്ള
 DocType: Journal Entry,Bill Date,ബിൽ തീയതി
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","സേവന ഇനം, തരം, ഫ്രീക്വൻസി, ചെലവിൽ തുക ആവശ്യമാണ്"
-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:","ഏറ്റവും മുന്തിയ പരിഗണന ഉപയോഗിച്ച് ഒന്നിലധികം വിലനിർണ്ണയത്തിലേക്ക് അവിടെ പോലും, പിന്നെ താഴെ ആന്തരിക പരിഗണനയാണ് ബാധകമാക്കുന്നു:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ഏറ്റവും മുന്തിയ പരിഗണന ഉപയോഗിച്ച് ഒന്നിലധികം വിലനിർണ്ണയത്തിലേക്ക് അവിടെ പോലും, പിന്നെ താഴെ ആന്തരിക പരിഗണനയാണ് ബാധകമാക്കുന്നു:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},നിങ്ങൾ ശരിക്കും {0} നിന്ന് {1} എല്ലാ ശമ്പളം ജി സമർപ്പിക്കുക താൽപ്പര്യമുണ്ടോ
 DocType: Cheque Print Template,Cheque Height,ചെക്ക് ഉയരം
 DocType: Supplier,Supplier Details,വിതരണക്കാരൻ വിശദാംശങ്ങൾ
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,ഇൻവോയ്സ് റഫറൻസ്
 DocType: Purchase Order,Recurring Order,ആവർത്തക ഓർഡർ
 DocType: Company,Default Income Account,സ്ഥിരസ്ഥിതി ആദായ അക്കൗണ്ട്
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,കസ്റ്റമർ ഗ്രൂപ്പ് / കസ്റ്റമർ
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,കസ്റ്റമർ ഗ്രൂപ്പ് / കസ്റ്റമർ
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),അടയ്ക്കാത്ത വർഷത്തേക്ക് ലാഭം / നഷ്ടം (ക്രെഡിറ്റ്)
 DocType: Sales Invoice,Time Sheets,സമയം ഷീറ്റുകൾ
 DocType: Payment Gateway Account,Default Payment Request Message,കാശടയ്ക്കല് അഭ്യർത്ഥന സന്ദേശം
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,ക്വട്ടേഷൻ സന്ദേശം
 DocType: Employee Loan,Employee Loan Application,ജീവനക്കാരുടെ ലോൺ അപ്ലിക്കേഷൻ
 DocType: Issue,Opening Date,തീയതി തുറക്കുന്നു
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,ഹാജർ വിജയകരമായി അടയാളപ്പെടുത്തി.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,ഹാജർ വിജയകരമായി അടയാളപ്പെടുത്തി.
 DocType: Journal Entry,Remark,അഭിപായപ്പെടുക
 DocType: Purchase Receipt Item,Rate and Amount,റേറ്റ് തുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},{0} വേണ്ടി അക്കൗണ്ട് ഇനം ആയിരിക്കണം {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},{0} വേണ്ടി അക്കൗണ്ട് ഇനം ആയിരിക്കണം {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ഇലകളും ഹോളിഡേ
 DocType: School Settings,Current Academic Term,നിലവിലെ അക്കാദമിക് ടേം
 DocType: School Settings,Current Academic Term,നിലവിലെ അക്കാദമിക് ടേം
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,സ്റ്റുഡന്റ് ഗ്രൂപ്പ്
 DocType: Shopping Cart Settings,Quotation Series,ക്വട്ടേഷൻ സീരീസ്
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ഒരു ഇനം ഇതേ പേര് ({0}) നിലവിലുണ്ട്, ഐറ്റം ഗ്രൂപ്പിന്റെ പേര് മാറ്റാനോ ഇനം പുനർനാമകരണം ദയവായി"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,കസ്റ്റമർ തിരഞ്ഞെടുക്കുക
 DocType: C-Form,I,ഞാന്
 DocType: Company,Asset Depreciation Cost Center,അസറ്റ് മൂല്യത്തകർച്ച കോസ്റ്റ് സെന്റർ
 DocType: Sales Order Item,Sales Order Date,സെയിൽസ് ഓർഡർ തീയതി
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,ഇൻഷുറൻസ് വിശദാംശങ്ങൾ
 DocType: Account,Payable,അടയ്ക്കേണ്ട
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ദയവായി തിരിച്ചടവ് ഭരണവും നൽകുക
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),കടക്കാർ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),കടക്കാർ ({0})
 DocType: Pricing Rule,Margin,മാർജിൻ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,പുതിയ ഉപഭോക്താക്കളെ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,മൊത്തം ലാഭം %
 DocType: Appraisal Goal,Weightage (%),വെയിറ്റേജ് (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ക്ലിയറൻസ് തീയതി
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,ഗ്രോസ് വാങ്ങൽ തുക നിര്ബന്ധമാണ്
 DocType: Lead,Address Desc,DESC വിലാസ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,പാർട്ടി നിർബന്ധമായും
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,പാർട്ടി നിർബന്ധമായും
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,വിഷയം പേര്
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,കച്ചവടവും അല്ലെങ്കിൽ വാങ്ങുന്നതിനു കുറഞ്ഞത് ഒരു തിരഞ്ഞെടുത്ത വേണം
-DocType: Grading Structure,Grade Intervals,ഗ്രേഡ് ഇടവേളകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,നിങ്ങളുടെ ബിസിനസ്സ് സ്വഭാവം തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},വരി # {0}: അവലംബം {1} {2} ൽ ഡ്യൂപ്ളിക്കേറ്റ്എന്ട്രി
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,എവിടെ നിർമാണ ഓപ്പറേഷനുകൾ നടപ്പിലാക്കുന്നത്.
 DocType: Asset Movement,Source Warehouse,ഉറവിട വെയർഹൗസ്
 DocType: Installation Note,Installation Date,ഇന്സ്റ്റലേഷന് തീയതി
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി കത്ത് മേധാവികൾ.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,പ്രിന്റ് ടെംപ്ലേറ്റുകൾക്കായി ശീര്ഷകം ഇൻവോയ്സിന്റെ ഉദാഹരണമാണ്.
 DocType: Student Guardian,Student Guardian,സ്റ്റുഡന്റ് ഗാർഡിയൻ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,മൂലധനം തരം ചാർജ് സഹായകം ആയി അടയാളപ്പെടുത്തി കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 റേറ്റ്
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,എക്സ്ചേഞ്ച് ഗെയിൻ / നഷ്ടം അക്കൗണ്ട്
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ജീവനക്കാർ എന്നാല് ബി
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ഉദ്ദേശ്യം {0} ഒന്നാണ് ആയിരിക്കണം
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ഫോം പൂരിപ്പിച്ച് സേവ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,കമ്മ്യൂണിറ്റി ഫോറം
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,സ്റ്റോക്ക് ലെ യഥാർത്ഥ അളവ്
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,പുനഃക്രമീകരിക്കുക Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,നിലവിൽ ജോലികൾ
 DocType: Company,Stock Adjustment Account,സ്റ്റോക്ക് ക്രമീകരണ അക്കൗണ്ട്
-DocType: Journal Entry,Write Off,എഴുതുക
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,എഴുതുക
 DocType: Timesheet Detail,Operation 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} നിന്ന്
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,വിതരണക്കമ്പനിയായ ഉപയോക്താക്കൾക്കായി വിടുവിക്കുന്നു
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ഫോം / ഇനം / {0}) സ്റ്റോക്കില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,അടുത്ത തീയതി തീയതി നോട്സ് വലുതായിരിക്കണം
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,കാണിക്കുക നികുതി ബ്രേക്ക്-അപ്പ്
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ഇക്കാരണങ്ങൾ / പരാമർശം തീയതി {0} ശേഷം ആകാൻ പാടില്ല
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ഡാറ്റാ ഇറക്കുമതി എക്സ്പോർട്ട്
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","ഓഹരി എൻട്രികൾ, വെയർഹൗസ് {0} നേരെ നിലവിലില്ല ഇവിടെനിന്നു നിങ്ങൾ വീണ്ടും നിയോഗിക്കുകയോ അല്ലെങ്കിൽ പരിഷ്കരിക്കുന്നതിനായി"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ഇല്ല വിദ്യാർത്ഥികൾ കണ്ടെത്തിയില്ല
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ഇല്ല വിദ്യാർത്ഥികൾ കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ഇൻവോയിസ് പ്രസിദ്ധീകരിക്കൽ തീയതി
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,വിൽക്കുക
 DocType: Sales Invoice,Rounded Total,വൃത്തത്തിലുള്ള ആകെ
 DocType: Product Bundle,List items that form the package.,പാക്കേജ് രൂപീകരിക്കുന്നു ഇനങ്ങൾ കാണിയ്ക്കുക.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ശതമാന അലോക്കേഷൻ 100% തുല്യമോ വേണം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,പാർട്ടി തിരഞ്ഞെടുക്കുന്നതിന് മുമ്പ് പോസ്റ്റിംഗ് തീയതി തിരഞ്ഞെടുക്കുക
 DocType: Program Enrollment,School House,സ്കൂൾ ഹൗസ്
 DocType: Serial No,Out of AMC,എഎംസി പുറത്താണ്
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ഉദ്ധരണികൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ബുക്കുചെയ്തു Depreciations എണ്ണം Depreciations മൊത്തം എണ്ണം വലുതായിരിക്കും കഴിയില്ല
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,മെയിൻറനൻസ് സന്ദർശനം നിർമ്മിക്കുക
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,സെയിൽസ് മാസ്റ്റർ മാനേജർ {0} പങ്കുണ്ട് ആർ ഉപയോക്താവിന് ബന്ധപ്പെടുക
 DocType: Company,Default Cash Account,സ്ഥിരസ്ഥിതി ക്യാഷ് അക്കൗണ്ട്
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,കമ്പനി (അല്ല കസ്റ്റമർ അല്ലെങ്കിൽ വിതരണക്കാരൻ) മാസ്റ്റർ.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ഇത് ഈ വിദ്യാർത്ഥി ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,ഇല്ല വിദ്യാർത്ഥികൾ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,കൂടുതൽ ഇനങ്ങൾ അല്ലെങ്കിൽ തുറക്കാറുണ്ട് ഫോം ചേർക്കുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;പ്രതീക്ഷിച്ച ഡെലിവറി തീയതി&#39; നൽകുക
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ഡെലിവറി കുറിപ്പുകൾ {0} ഈ സെയിൽസ് ഓർഡർ റദ്ദാക്കുന്നതിൽ മുമ്പ് റദ്ദാക്കി വേണം
@@ -3237,6 +3241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ഇനം 3
 DocType: Purchase Order,Customer Contact Email,കസ്റ്റമർ കോൺടാക്റ്റ് ഇമെയിൽ
 DocType: Warranty Claim,Item and Warranty Details,ഇനം വാറണ്ടിയുടെയും വിശദാംശങ്ങൾ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,ഇനം കോഡ്&gt; ഇനം ഗ്രൂപ്പ്&gt; ബ്രാൻഡ്
 DocType: Sales Team,Contribution (%),കോൺട്രിബ്യൂഷൻ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,കുറിപ്പ്: &#39;ക്യാഷ് അല്ലെങ്കിൽ ബാങ്ക് അക്കൗണ്ട്&#39; വ്യക്തമാക്കിയില്ല മുതലുള്ള പേയ്മെന്റ് എൻട്രി സൃഷ്ടിച്ച ചെയ്യില്ല
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,നിർബന്ധിത കോഴ്സുകൾ ലഭ്യമാക്കാൻ പ്രോഗ്രാം തിരഞ്ഞെടുക്കുക.
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,"നിരപ്പു മുമ്പ്,"
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} ചെയ്യുക
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ചേർത്തു നികുതി ചാർജുകളും (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,ഇനം നികുതി റോ {0} ടൈപ്പ് നികുതി അഥവാ ആദായ അല്ലെങ്കിൽ ചിലവേറിയ അല്ലെങ്കിൽ ഈടാക്കുന്നതല്ല എന്ന അക്കൗണ്ട് ഉണ്ടായിരിക്കണം
 DocType: Sales Order,Partly Billed,ഭാഗികമായി ഈടാക്കൂ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,ഇനം {0} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,ഇനം {0} ഒരു നിശ്ചിത അസറ്റ് ഇനം ആയിരിക്കണം
 DocType: Item,Default BOM,സ്വതേ BOM ലേക്ക്
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,സ്ഥിരീകരിക്കാൻ കമ്പനിയുടെ പേര്-തരം റീ ദയവായി
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,മൊത്തം ശാരീരിക
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ഓട്ടോമോട്ടീവ്
 DocType: Vehicle,Insurance Company,ഇൻഷ്വറൻസ് കമ്പനി
 DocType: Asset Category Account,Fixed Asset Account,ഫിക്സ്ഡ് അസറ്റ് അക്കൗണ്ട്
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,വേരിയബിൾ
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,വേരിയബിൾ
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ഡെലിവറി നോട്ട് നിന്ന്
 DocType: Student,Student Email Address,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ വിലാസം
 DocType: Timesheet Detail,From Time,സമയം മുതൽ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,സ്റ്റോക്കുണ്ട്:
@@ -3277,12 +3282,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,വില പട്ടിക എക്സ്ചേഞ്ച് റേറ്റ്
 DocType: Purchase Invoice Item,Rate,റേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,തടവുകാരി
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,വിലാസം പേര്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,വിലാസം പേര്
 DocType: Stock Entry,From BOM,BOM നിന്നും
 DocType: Assessment Code,Assessment Code,അസസ്മെന്റ് കോഡ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,അടിസ്ഥാന
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} ഫ്രീസുചെയ്തിരിക്കുമ്പോൾ സ്റ്റോക്ക് ഇടപാടുകൾ മുമ്പ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;ജനറേറ്റുചെയ്യൂ ഷെഡ്യൂൾ&#39; ക്ലിക്ക് ചെയ്യുക ദയവായി
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ഉദാ കിലോ, യൂണിറ്റ്, ഒഴിവ്, മീറ്റർ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,റഫറൻസ് നിങ്ങൾ റഫറൻസ് തീയതി നൽകിയിട്ടുണ്ടെങ്കിൽ ഇല്ല നിർബന്ധമായും
 DocType: Bank Reconciliation Detail,Payment Document,പേയ്മെന്റ് പ്രമാണം
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,ശമ്പളം ഘടന
 DocType: Account,Bank,ബാങ്ക്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,എയർ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,പ്രശ്നം മെറ്റീരിയൽ
 DocType: Material Request Item,For Warehouse,വെയർഹൗസ് വേണ്ടി
 DocType: Employee,Offer Date,ആഫര് തീയതി
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ഉദ്ധരണികളും
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,നിങ്ങൾ ഓഫ്ലൈൻ മോഡിലാണ്. നിങ്ങൾ നെറ്റ്വർക്ക് ഞങ്ങൾക്കുണ്ട് വരെ ലോഡുചെയ്യണോ കഴിയില്ല.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ഇല്ല സ്റ്റുഡന്റ് ഗ്രൂപ്പുകൾ സൃഷ്ടിച്ചു.
 DocType: Purchase Invoice Item,Serial No,സീരിയൽ ഇല്ല
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,പ്രതിമാസ തിരിച്ചടവ് തുക വായ്പാ തുക ശ്രേഷ്ഠ പാടില്ല
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince വിവരങ്ങൾ ആദ്യ നൽകുക
 DocType: Purchase Invoice,Print Language,പ്രിന്റ് ഭാഷ
 DocType: Salary Slip,Total Working Hours,ആകെ ജോലി മണിക്കൂർ
 DocType: Stock Entry,Including items for sub assemblies,സബ് സമ്മേളനങ്ങൾ ഇനങ്ങൾ ഉൾപ്പെടെ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,നൽകുക മൂല്യം പോസിറ്റീവ് ആയിരിക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,എല്ലാ പ്രദേശങ്ങളും
 DocType: Purchase Invoice,Items,ഇനങ്ങൾ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,വിദ്യാർത്ഥി ഇതിനകം എൻറോൾ ചെയ്തു.
@@ -3322,17 +3327,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',മോഡലിന് അളവു യൂണിറ്റ് &#39;{0}&#39; ഫലകം അതേ ആയിരിക്കണം &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,അടിസ്ഥാനത്തിൽ ഓൺ കണക്കുകൂട്ടുക
 DocType: Delivery Note Item,From Warehouse,വെയർഹൗസിൽ നിന്ന്
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,നിർമ്മിക്കാനുള്ള വസ്തുക്കളുടെ ബിൽ കൂടിയ ഇനങ്ങൾ ഇല്ല
 DocType: Assessment Plan,Supervisor Name,സൂപ്പർവൈസർ പേര്
 DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
 DocType: Program Enrollment Course,Program Enrollment Course,പ്രോഗ്രാം എൻറോൾമെന്റ് കോഴ്സ്
-DocType: Grading Structure,Grading Structure,ഗ്രേഡിംഗ് ഘടന
 DocType: Purchase Taxes and Charges,Valuation and Total,"മൂലധനം, മൊത്ത"
 DocType: Tax Rule,Shipping City,ഷിപ്പിംഗ് സിറ്റി
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,അറിയിപ്പ് ഇഷ്ടാനുസൃതമാക്കുക
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ഓപ്പറേഷൻസ് നിന്നുള്ള ക്യാഷ് ഫ്ളോ
 DocType: Sales Invoice,Shipping Rule,ഷിപ്പിംഗ് റൂൾ
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},BOM ലേക്ക് ഇനം {0} വേണ്ടി നിലവിലുണ്ട് സഹജമായ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,പോസ്റ്റിംഗ് തീയതി ആദ്യം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,തീയതി തുറക്കുന്നു തീയതി അടയ്ക്കുന്നത് മുമ്പ് ആയിരിക്കണം
 DocType: Leave Control Panel,Carry Forward,മുന്നോട്ട് കൊണ്ടുപോകും
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,നിലവിലുള്ള ഇടപാടുകൾ ചെലവ് കേന്ദ്രം ലെഡ്ജർ പരിവർത്തനം ചെയ്യാൻ കഴിയില്ല
 DocType: Department,Days for which Holidays are blocked for this department.,അവധിദിനങ്ങൾ ഈ വകുപ്പിന്റെ വേണ്ടി തടഞ്ഞ ചെയ്തിട്ടുളള ദിനങ്ങൾ.
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ലെറ്റർ അറ്റാച്ച്
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,അവസാനം കമ്യൂണിക്കേഷൻ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,അവസാനം കമ്യൂണിക്കേഷൻ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"വിഭാഗം &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; വേണ്ടി എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് ചെയ്യാൻ കഴിയില്ല"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"വിഭാഗം &#39;മൂലധനം&#39; അഥവാ &#39;മൂലധനം, മൊത്ത&#39; വേണ്ടി എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് ചെയ്യാൻ കഴിയില്ല"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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} വേണ്ടി സീരിയൽ ഒഴിവ് ആവശ്യമുണ്ട്
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ഇൻവോയിസുകൾ കളിയിൽ പേയ്മെന്റുകൾ
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),ആകെ (ശാരീരിക)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,വിനോദം &amp; ഒഴിവുസമയ
 DocType: Quality Inspection,Item Serial No,ഇനം സീരിയൽ പോസ്റ്റ്
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ജീവനക്കാരുടെ റെക്കോർഡ്സ് സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ജീവനക്കാരുടെ റെക്കോർഡ്സ് സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ആകെ നിലവിലുള്ളജാലകങ്ങള്
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,അക്കൗണ്ടിംഗ് പ്രസ്താവനകൾ
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,അന്ത്യസമയം
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,അറിയപ്പെടാത്ത
 DocType: Shipping Rule,Shipping Rule Conditions,ഷിപ്പിംഗ് റൂൾ അവസ്ഥകൾ
 DocType: BOM Replace Tool,The new BOM after replacement,പകരക്കാരനെ ശേഷം പുതിയ BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,വിൽപ്പന പോയിന്റ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,വിൽപ്പന പോയിന്റ്
 DocType: Payment Entry,Received Amount,ലഭിച്ച തുകയുടെ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,ദയവായി സെറ്റപ്പ് ജീവനക്കാർ ഹ്യൂമൻ റിസോഴ്സ് ൽ സംവിധാനവും&gt; എച്ച് ക്രമീകരണങ്ങൾ
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",", പൂർണ്ണ അളവ് വേണ്ടി സൃഷ്ടിക്കുക ഓർഡർ ഇതിനകം അളവ് അവഗണിക്കുന്നതിൽ"
 DocType: Account,Tax,നികുതി
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,അടയാളപ്പെടുത്തി
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,ഉറവിട പ്രമാണം പേര്
 DocType: Batch,Source Document Name,ഉറവിട പ്രമാണം പേര്
 DocType: Job Opening,Job Title,തൊഴില് പേര്
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,ഉപയോക്താക്കളെ സൃഷ്ടിക്കുക
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,പയറ്
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,നിർമ്മിക്കാനുള്ള ക്വാണ്ടിറ്റി 0 വലുതായിരിക്കണം.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,അറ്റകുറ്റപ്പണി കോൾ വേണ്ടി റിപ്പോർട്ട് സന്ദർശിക്കുക.
 DocType: Stock Entry,Update Rate and Availability,റേറ്റ് ലഭ്യത അപ്ഡേറ്റ്
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ശതമാനം നിങ്ങളെ ഉത്തരവിട്ടു അളവ് നേരെ കൂടുതൽ സ്വീകരിക്കാനോ വിടുവിപ്പാൻ അനുവദിച്ചിരിക്കുന്ന. ഉദാഹരണം: 100 യൂണിറ്റ് ഉത്തരവിട്ടു ഉണ്ടെങ്കിൽ. ഒപ്പം നിങ്ങളുടെ അലവൻസ് നിങ്ങളെ 110 യൂണിറ്റുകൾ സ്വീകരിക്കാൻ അനുവദിച്ചിരിക്കുന്ന പിന്നീട് 10% ആണ്.
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ചിലവേറിയ ഇനത്തിന്റെ {0} നിര്ബന്ധമാണ്
 DocType: BOM,Website Description,വെബ്സൈറ്റ് വിവരണം
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ഇക്വിറ്റി ലെ മൊത്തം മാറ്റം
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,വാങ്ങൽ ഇൻവോയ്സ് {0} ആദ്യം റദ്ദാക്കുകയോ ചെയ്യുക
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ഇമെയിൽ വിലാസം അതുല്യമായ ആയിരിക്കണം, ഇതിനകം {0} നിലവിലുണ്ട്"
 DocType: Serial No,AMC Expiry Date,എഎംസി കാലഹരണ തീയതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,രസീത്
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,രസീത്
 ,Sales Register,സെയിൽസ് രജിസ്റ്റർ
 DocType: Daily Work Summary Settings Company,Send Emails At,ഇമെയിലുകൾ അയയ്ക്കുക
 DocType: Quotation,Quotation Lost Reason,ക്വട്ടേഷൻ ലോസ്റ്റ് കാരണം
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,നിങ്ങളുടെ ഡൊമെയ്ൻ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ഇടപാട് യാതൊരു പരാമർശവുമില്ല {0} dated {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,തിരുത്തിയെഴുതുന്നത് ഒന്നുമില്ല.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ഈ മാസത്തെ ചുരുക്കം തിർച്ചപ്പെടുത്താത്ത പ്രവർത്തനങ്ങൾ
 DocType: Customer Group,Customer Group Name,കസ്റ്റമർ ഗ്രൂപ്പ് പേര്
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ഇതുവരെ ഉപഭോക്താക്കൾ!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ക്യാഷ് ഫ്ളോ പ്രസ്താവന
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},വായ്പാ തുക {0} പരമാവധി വായ്പാ തുക കവിയാൻ പാടില്ല
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,അനുമതി
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},സി-ഫോം {1} നിന്നും ഈ ഇൻവോയിസ് {0} നീക്കം ദയവായി
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,അക്കൗണ്ട് ഓഫാക്കുക എഴുതുക നൽകുക
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,അവസാന ഓർഡർ തീയതി
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},അക്കൗണ്ട് {0} കമ്പനി {1} വകയാണ് ഇല്ല
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,തുടർച്ചയായ സീരിയൽ നമ്പറുകൾ {0} ഡെലിവറി നോട്ട് ഉപയോഗിച്ച് പൊരുത്തപ്പെടുന്നില്ല
 DocType: Student,Guardian Details,ഗാർഡിയൻ വിവരങ്ങൾ
 DocType: C-Form,C-Form,സി-ഫോം
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ഒന്നിലധികം ജീവനക്കാരുടെ അടയാളപ്പെടുത്തുക ഹാജർ
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',&#39;നിശ്ചിത അസറ്റ്&#39; വരിയുടെ {0} # അക്കൗണ്ട് തരം ആയിരിക്കണം
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty ഔട്ട്
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ഒരു വില്പനയ്ക്ക് ഷിപ്പിംഗ് തുക കണക്കുകൂട്ടാൻ നിയമങ്ങൾ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,സീരീസ് നിർബന്ധമാണ്
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,സാമ്പത്തിക സേവനങ്ങൾ
 DocType: Student Sibling,Student ID,സ്റ്റുഡന്റ് ഐഡി
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,സമയം ലോഗുകൾക്കായി പ്രവർത്തനങ്ങൾ തരങ്ങൾ
 DocType: Tax Rule,Sales,സെയിൽസ്
 DocType: Stock Entry Detail,Basic Amount,അടിസ്ഥാന തുക
 DocType: Training Event,Exam,പരീക്ഷ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ഓഹരി ഇനം {0} ആവശ്യമുള്ളതിൽ വെയർഹൗസ്
 DocType: Leave Allocation,Unused leaves,ഉപയോഗിക്കപ്പെടാത്ത ഇല
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,കോടിയുടെ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,കോടിയുടെ
 DocType: Tax Rule,Billing State,ബില്ലിംഗ് സ്റ്റേറ്റ്
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ട്രാൻസ്ഫർ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} പാർട്ടി അക്കൗണ്ട് {2} ബന്ധപ്പെടുത്തിയ ഇല്ല
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} പാർട്ടി അക്കൗണ്ട് {2} ബന്ധപ്പെടുത്തിയ ഇല്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(സബ്-സമ്മേളനങ്ങൾ ഉൾപ്പെടെ) പൊട്ടിത്തെറിക്കുന്ന BOM ലഭ്യമാക്കുക
 DocType: Authorization Rule,Applicable To (Employee),(ജീവനക്കാർ) ബാധകമായ
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,അവസാന തീയതി നിർബന്ധമാണ്
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,ഗുണ {0} 0 ആകാൻ പാടില്ല വേണ്ടി വർദ്ധന
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,നിഷ്ക്രിയ ഇടപാടുകാർ
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,വാങ്ങൽ രസീതുകൾ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,എങ്ങനെ പ്രൈസിങ് റൂൾ പ്രയോഗിക്കുന്നു?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,എങ്ങനെ പ്രൈസിങ് റൂൾ പ്രയോഗിക്കുന്നു?
 DocType: Stock Entry,Delivery Note No,ഡെലിവറി നോട്ട് ഇല്ല
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","പരിശോധിച്ചാൽ, മാത്രം അവസാന അസംസ്കൃത വസ്തുക്കൾ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ വാങ്ങുക മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ ഉൾപ്പെടുത്തും. അല്ലാത്തപക്ഷം, പാരന്റ് ഇനങ്ങൾ മെറ്റീരിയൽ അഭ്യർത്ഥനകൾ സൃഷ്ടിക്കപ്പെടും"
 DocType: Cheque Print Template,Message to show,കാണിക്കാൻ സന്ദേശം
 DocType: Company,Retail,റീട്ടെയിൽ
 DocType: Attendance,Absent,അസാന്നിദ്ധ്യം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},വരി {0}: അസാധുവായ റഫറൻസ് {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,നികുതി ചാർജുകളും ഫലകം വാങ്ങുക
 DocType: Upload Attendance,Download Template,ഡൗൺലോഡ് ഫലകം
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,അക്കൗണ്ടിൽ നിന്ന് പണമടച്ചു
 DocType: Purchase Order Item Supplied,Raw Material Item Code,അസംസ്കൃത വസ്തുക്കളുടെ ഇനം കോഡ്
 DocType: Journal Entry,Write Off Based On,അടിസ്ഥാനത്തിൽ ന് എഴുതുക
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ലീഡ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ലീഡ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,അച്ചടിച്ച് സ്റ്റേഷനറി
 DocType: Stock Settings,Show Barcode Field,കാണിക്കുക ബാർകോഡ് ഫീൽഡ്
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,വിതരണക്കാരൻ ഇമെയിലുകൾ അയയ്ക്കുക
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","ശമ്പള ഇതിനകം തമ്മിലുള്ള {0} കാലയളവിൽ പ്രോസസ്സ് {1}, അപ്ലിക്കേഷൻ കാലയളവിൽ വിടുക ഈ തീയതി പരിധിയിൽ തമ്മിലുള്ള പാടില്ല."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ഒരു സീരിയൽ നമ്പർ ഇന്സ്റ്റലേഷന് റെക്കോർഡ്
 DocType: Guardian Interest,Guardian Interest,ഗാർഡിയൻ പലിശ
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,കാത്തിരിക്കുന്നു പ്രതികരണത്തിന്റെ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,മുകളിൽ
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},അസാധുവായ ആട്രിബ്യൂട്ട് {0} {1}
+DocType: Supplier,Mention if non-standard payable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത മാറാവുന്ന അക്കൗണ്ട് എങ്കിൽ പരാമർശിക്കുക
 DocType: Salary Slip,Earning & Deduction,സമ്പാദിക്കാനുള്ള &amp; കിഴിച്ചുകൊണ്ടു
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ഓപ്ഷണൽ. ഈ ക്രമീകരണം വിവിധ വ്യവഹാരങ്ങളിൽ ഫിൽട്ടർ ഉപയോഗിക്കും.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,നെഗറ്റീവ് മൂലധനം റേറ്റ് അനുവദനീയമല്ല
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,പ്രൊഡക്ഷൻ ഓർഡർ ഇനം
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,റെക്കോർഡ് കണ്ടെത്തിയില്ല
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,എന്തുതോന്നുന്നു അസറ്റ് ചെലവ്
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ഭാഗികമായി ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: കോസ്റ്റ് കേന്ദ്രം ഇനം {2} നിര്ബന്ധമാണ്
 DocType: Vehicle,Policy No,നയം
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ഉൽപ്പന്ന ബണ്ടിൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 DocType: Asset,Straight Line,വര
 DocType: Project User,Project User,പദ്ധതി ഉപയോക്താവ്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,രണ്ടായി പിരിയുക
@@ -3562,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,വിദ്യാർത്ഥികൾ നേടുക
 DocType: Hub Settings,Seller Country,വില്പനക്കാരന്റെ രാജ്യം
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,വെബ്സൈറ്റ് ഇനങ്ങൾ പ്രസിദ്ധീകരിക്കുക
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ബാച്ചുകളായി ഗ്രൂപ്പ് നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക്
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ബാച്ചുകളായി ഗ്രൂപ്പ് നിങ്ങളുടെ വിദ്യാർത്ഥികൾക്ക്
 DocType: Authorization Rule,Authorization Rule,അംഗീകാര റൂൾ
 DocType: Sales Invoice,Terms and Conditions Details,നിബന്ധനകളും വ്യവസ്ഥകളും വിവരങ്ങള്
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,വ്യതിയാനങ്ങൾ
@@ -3615,14 +3618,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ചെക്ക് തീയതി
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},അക്കൗണ്ട് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി ഭാഗമല്ല: {2}
 DocType: Program Enrollment Tool,Student Applicants,സ്റ്റുഡന്റ് അപേക്ഷകർ
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,വിജയകരമായി ഈ കമ്പനിയുമായി ബന്ധപ്പെട്ട എല്ലാ ഇടപാടുകൾ ഇല്ലാതാക്കി!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,തീയതിയിൽ
 DocType: Appraisal,HR,എച്ച്
 DocType: Program Enrollment,Enrollment Date,എൻറോൾമെന്റ് തീയതി
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,പരീക്ഷണകാലഘട്ടം
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ശമ്പള ഘടകങ്ങൾ
 DocType: Program Enrollment Tool,New Academic Year,ന്യൂ അക്കാദമിക് വർഷം
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,മടക്ക / ക്രെഡിറ്റ് നോട്ട്
 DocType: Stock Settings,Auto insert Price List rate if missing,ഓട്ടോ insert വില പട്ടിക നിരക്ക് കാണാനില്ല എങ്കിൽ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ആകെ തുക
 DocType: Production Order Item,Transferred Qty,മാറ്റിയത് Qty
@@ -3642,7 +3645,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","കാഷ്വൽ, രോഗികളെ മുതലായ ഇല തരം"
 DocType: Email Digest,Send regular summary reports via Email.,ഇമെയിൽ വഴി പതിവ് സംഗ്രഹം റിപ്പോർട്ടുകൾ അയയ്ക്കുക.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},ചിലവേറിയ ക്ലെയിം തരം {0} ൽ സ്ഥിര അക്കൗണ്ട് സജ്ജീകരിക്കുക
 DocType: Assessment Result,Student Name,വിദ്യാർഥിയുടെ പേര്
 DocType: Brand,Item Manager,ഇനം മാനേജർ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,ശമ്പളപ്പട്ടിക പേയബിൾ
@@ -3663,6 +3666,7 @@
 ,Sales Funnel,സെയിൽസ് നാലുവിക്കറ്റ്
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ചുരുക്കെഴുത്ത് നിർബന്ധമാണ്
 DocType: Project,Task Progress,ടാസ്ക് പുരോഗതി
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,കാർട്ട്
 ,Qty to Transfer,ട്രാൻസ്ഫർ ചെയ്യാൻ Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,നയിക്കുന്നു അല്ലെങ്കിൽ ഉപഭോക്താക്കൾക്ക് ഉദ്ധരണികൾ.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ശീതീകരിച്ച സ്റ്റോക്ക് തിരുത്തിയെഴുതുന്നത് അനുവദനീയം റോൾ
@@ -3690,13 +3694,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,ഇനം യുക്തിമാനും നികുതി വിശദാംശം
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ഇൻസ്റ്റിറ്റ്യൂട്ട് സംഗ്രഹം
 ,Item-wise Price List Rate,ഇനം തിരിച്ചുള്ള വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ
 DocType: Quotation,In Words will be visible once you save the Quotation.,നിങ്ങൾ ക്വട്ടേഷൻ ലാഭിക്കാൻ ഒരിക്കൽ വാക്കുകളിൽ ദൃശ്യമാകും.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ക്വാണ്ടിറ്റി ({0}) വരി {1} ഒരു അംശം പാടില്ല
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ഫീസ് ശേഖരിക്കുക
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},ബാർകോഡ് {0} ഇതിനകം ഇനം {1} ഉപയോഗിക്കുന്ന
 DocType: Lead,Add to calendar on this date,ഈ തീയതി കലണ്ടർ ചേർക്കുക
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,ഷിപ്പിംഗ് ചിലവും ചേർത്ത് നിയമങ്ങൾ.
 DocType: Item,Opening Stock,ഓഹരി തുറക്കുന്നു
@@ -3713,8 +3717,8 @@
 Updated via 'Time Log'",&#39;ടൈം ലോഗ്&#39; വഴി അപ്ഡേറ്റ് മിനിറ്റിനുള്ളിൽ
 DocType: Customer,From Lead,ലീഡ് നിന്ന്
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ഉത്പാദനത്തിന് പുറത്തുവിട്ട ഉത്തരവ്.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ധനകാര്യ വർഷം തിരഞ്ഞെടുക്കുക ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ൽ എൻട്രി ഉണ്ടാക്കുവാൻ ആവശ്യമായ POS പ്രൊഫൈൽ
 DocType: Program Enrollment Tool,Enroll Students,വിദ്യാർഥികൾ എൻറോൾ
 DocType: Hub Settings,Name Token,ടോക്കൺ പേര്
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,സ്റ്റാൻഡേർഡ് വിൽപ്പനയുള്ളത്
@@ -3725,7 +3729,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} സെയിൽസ് ഇൻവോയിസ് {1} നേരെ
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,പ്രോജക്ട് പേര്
-DocType: Supplier,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
+DocType: Customer,Mention if non-standard receivable account,സ്റ്റാൻഡേർഡ് അല്ലാത്ത സ്വീകരിക്കുന്ന അക്കൌണ്ട് എങ്കിൽ പ്രസ്താവിക്കുക
 DocType: Journal Entry Account,If Income or Expense,ആദായ അല്ലെങ്കിൽ ചിലവേറിയ ചെയ്താൽ
 DocType: Production Order,Required Items,ആവശ്യമായ ഇനങ്ങൾ
 DocType: Stock Ledger Entry,Stock Value Difference,സ്റ്റോക്ക് മൂല്യം വ്യത്യാസം
@@ -3746,7 +3750,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ഈ സെയിൽസ് പേഴ്സൺ വേണ്ടി ലക്ഷ്യങ്ങളിലൊന്നാണ് ഇനം ഗ്രൂപ്പ് തിരിച്ചുള്ള സജ്ജമാക്കുക.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[ദിനങ്ങൾ] ചെന്നവർ സ്റ്റോക്കുകൾ ഫ്രീസ്
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,വരി # {0}: അസറ്റ് നിർണയത്തിനുള്ള അസറ്റ് വാങ്ങൽ / വില്പനയ്ക്ക് നിര്ബന്ധമാണ്
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","രണ്ടോ അതിലധികമോ പ്രൈസിങ് നിയമങ്ങൾ മുകളിൽ നിബന്ധനകൾ അടിസ്ഥാനമാക്കി കണ്ടെത്തിയാൽ, മുൻഗണന പ്രയോഗിക്കുന്നു. സ്വതവേയുള്ള മൂല്യം പൂജ്യം (ഇടുക) പോൾ മുൻഗണന 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.,താഴെ ഉപയോക്താക്കളെ ബ്ലോക്ക് ദിവസം വേണ്ടി ലീവ് ആപ്ലിക്കേഷൻസ് അംഗീകരിക്കാൻ അനുവദിക്കുക.
@@ -3772,7 +3776,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,അത് ഒരു സ്റ്റോക്ക് ഇനവും സ്ഥിതിക്ക് ഇനം {0} അവഗണിച്ച
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ഒരു പ്രത്യേക ഇടപാടിലും പ്രൈസിങ് .കൂടുതൽ ചെയ്യുന്നതിനായി, ബാധകമായ എല്ലാ വിലനിർണ്ണയത്തിലേക്ക് പ്രവർത്തനരഹിതമാകും വേണം."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ഒരു പ്രത്യേക ഇടപാടിലും പ്രൈസിങ് .കൂടുതൽ ചെയ്യുന്നതിനായി, ബാധകമായ എല്ലാ വിലനിർണ്ണയത്തിലേക്ക് പ്രവർത്തനരഹിതമാകും വേണം."
 DocType: Assessment Group,Parent Assessment Group,രക്ഷാകർതൃ അസസ്മെന്റ് ഗ്രൂപ്പ്
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ജോലി
 ,Sales Order Trends,സെയിൽസ് ഓർഡർ ട്രെൻഡുകൾ
@@ -3783,7 +3787,7 @@
 DocType: Stock Entry Detail,Additional Cost,അധിക ചെലവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","വൗച്ചർ ഭൂഖണ്ടക്രമത്തിൽ എങ്കിൽ, വൗച്ചർ പോസ്റ്റ് അടിസ്ഥാനമാക്കി ഫിൽട്ടർ ചെയ്യാൻ കഴിയില്ല"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,വിതരണക്കാരൻ ക്വട്ടേഷൻ നിർമ്മിക്കുക
 DocType: Quality Inspection,Incoming,ഇൻകമിംഗ്
 DocType: BOM,Materials Required (Exploded),ആവശ്യമായ മെറ്റീരിയൽസ് (പൊട്ടിത്തെറിക്കുന്ന)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",നിങ്ങൾ സ്വയം പുറമെ നിങ്ങളുടെ സ്ഥാപനത്തിൻറെ ഉപയോക്താക്കളെ ചേർക്കുക
@@ -3811,6 +3815,7 @@
 DocType: Employee,History In Company,കമ്പനിയിൽ ചരിത്രം
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,വാർത്താക്കുറിപ്പുകൾ
 DocType: Stock Ledger Entry,Stock Ledger Entry,ഓഹരി ലെഡ്ജർ എൻട്രി
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,കസ്റ്റമർ&gt; കസ്റ്റമർ ഗ്രൂപ്പ്&gt; ടെറിട്ടറി
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ഒരേ ഇനം ഒന്നിലധികം തവണ നൽകി
 DocType: Department,Leave Block List,ബ്ലോക്ക് ലിസ്റ്റ് വിടുക
 DocType: Sales Invoice,Tax ID,നികുതി ഐഡി
@@ -3820,7 +3825,7 @@
 DocType: Customer,Sales Partner and Commission,"സെയിൽസ് പങ്കാളി, കമ്മീഷൻ"
 DocType: Employee Loan,Rate of Interest (%) / Year,പലിശ നിരക്ക് (%) / വർഷം
 ,Project Quantity,പദ്ധതി ക്വാണ്ടിറ്റി
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","ആകെ {0} എല്ലാ ഇനങ്ങൾ, പൂജ്യമാണ് നിങ്ങൾ &#39;അടിസ്ഥാനമാക്കി ചുമത്തിയിട്ടുള്ള വിതരണം&#39; മാറേണ്ടത് വരാം"
 DocType: Opportunity,To Discuss,ചർച്ച ചെയ്യാൻ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ഈ ഇടപാട് പൂർത്തിയാക്കാൻ {2} ൽ ആവശ്യമായ {1} യൂണിറ്റ്.
 DocType: Loan Type,Rate of Interest (%) Yearly,പലിശ നിരക്ക് (%) വാർഷികം
@@ -3835,7 +3840,7 @@
 DocType: Purchase Invoice,Return,മടങ്ങിവരവ്
 DocType: Production Order Operation,Production Order Operation,പ്രൊഡക്ഷൻ ഓർഡർ ഓപ്പറേഷൻ
 DocType: Pricing Rule,Disable,അപ്രാപ്തമാക്കുക
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,പേയ്മെന്റ് മോഡ് പേയ്മെന്റ് നടത്താൻ ആവശ്യമാണ്
 DocType: Project Task,Pending Review,അവശേഷിക്കുന്ന അവലോകനം
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","അത് ഇതിനകം {1} പോലെ അസറ്റ്, {0} ബോംബെടുക്കുന്നവനും കഴിയില്ല"
 DocType: Task,Total Expense Claim (via Expense Claim),(ചിലവിടൽ ക്ലെയിം വഴി) ആകെ ചിലവേറിയ ക്ലെയിം
@@ -3843,11 +3848,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,മാർക് േചാദി
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},വരി {0}: കറന്സി BOM ൽ # ന്റെ {1} {2} തിരഞ്ഞെടുത്തു കറൻസി തുല്യമോ വേണം
 DocType: Journal Entry Account,Exchange Rate,വിനിമയ നിരക്ക്
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,സെയിൽസ് ഓർഡർ {0} സമർപ്പിച്ചിട്ടില്ലെന്നതും
 DocType: Homepage,Tag Line,ടാഗ് ലൈൻ
 DocType: Fee Component,Fee Component,ഫീസ്
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ഫ്ലീറ്റ് മാനേജ്മെന്റ്
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,നിന്ന് ഇനങ്ങൾ ചേർക്കുക
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},വെയർഹൗസ് {0}: പാരന്റ് അക്കൌണ്ട് {1} കമ്പനി {2} ലേക്ക് bolong ഇല്ല
 DocType: Cheque Print Template,Regular,സ്ഥിരമായ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,എല്ലാ വിലയിരുത്തിയശേഷം മാനദണ്ഡം ആകെ വെയ്റ്റേജ് 100% ആയിരിക്കണം
@@ -3860,7 +3865,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,തിരഞ്ഞെടുത്ത ഐറ്റം ബാച്ച് പാടില്ല
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","മൂലധനം നിരക്ക് ഇനം {0}, വേണ്ടി {2} {1} അക്കൗണ്ടിങ് എൻട്രികൾ ചെയ്യാൻ ആവശ്യമായ കണ്ടില്ല. ഇനത്തിൽ {1} ഒരു സാമ്പിൾ ഇനമായി transacting എങ്കിൽ, {1} ഇനം പട്ടികയിലെ ആ പരാമർശിക്കുക. അല്ലാത്തപക്ഷം, ഒരു ഇൻകമിംഗ് സ്റ്റോക്ക് ഇടപാട് ഇനം റെക്കോർഡിൽ മൂലധനം നിരക്ക് ഇനം വേണ്ടി സൃഷ്ടിക്കുക പരാമർശിക്കാനോ, തുടർന്ന് submiting / ഈ എൻട്രി റദ്ദാക്കുന്നതിൽ ശ്രമിക്കുക"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ഈ ഡെലിവറി നോട്ട് നേരെ ഏല്പിച്ചു വസ്തുക്കൾ%
 DocType: Project,Customer Details,ഉപഭോക്തൃ വിശദാംശങ്ങൾ
@@ -3869,15 +3874,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,റിസീവർ എണ്ണം വേണ്ടി URL പാരമീറ്റർ നൽകുക
 DocType: Payment Entry,Paid Amount,തുക
 DocType: Assessment Plan,Supervisor,പരിശോധക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ഓൺലൈൻ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ഓൺലൈൻ
 ,Available Stock for Packing Items,ഇനങ്ങൾ ക്ലാസ്സിലേക് ലഭ്യമാണ് ഓഹരി
 DocType: Item Variant,Item Variant,ഇനം മാറ്റമുള്ള
 DocType: Assessment Result Tool,Assessment Result Tool,അസസ്മെന്റ് ഫലം ടൂൾ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM ലേക്ക് സ്ക്രാപ്പ് ഇനം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,സമർപ്പിച്ച ഓർഡറുകൾ ഇല്ലാതാക്കാൻ കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,ക്വാളിറ്റി മാനേജ്മെന്റ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,ഇനം {0} അപ്രാപ്തമാക്കി
 DocType: Employee Loan,Repay Fixed Amount per Period,കാലയളവ് അനുസരിച്ച് നിശ്ചിത പകരം
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},ഇനം {0} വേണ്ടി അളവ് നൽകുക
 DocType: Employee External Work History,Employee External Work History,ജീവനക്കാർ പുറത്തേക്കുള്ള വർക്ക് ചരിത്രം
@@ -3904,7 +3909,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,വിദ്യാർത്ഥിയുടെ ഇമെയിൽ ഐഡി
 DocType: Employee,Notice (days),അറിയിപ്പ് (ദിവസം)
 DocType: Tax Rule,Sales Tax Template,സെയിൽസ് ടാക്സ് ഫലകം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ഇൻവോയ്സ് സംരക്ഷിക്കാൻ ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
 DocType: Employee,Encashment Date,ലീവ് തീയതി
 DocType: Training Event,Internet,ഇന്റർനെറ്റ്
 DocType: Account,Stock Adjustment,സ്റ്റോക്ക് ക്രമീകരണം
@@ -3928,7 +3933,7 @@
 DocType: Item Variant Attribute,Attribute,ഗുണ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,പരിധി വരെ / നിന്നും വ്യക്തമാക്കുക
 DocType: Serial No,Under AMC,എഎംസി കീഴിൽ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,ഇനം മൂലധനം നിരക്ക് ഭൂസ്വത്തുള്ള കുറഞ്ഞ വൗച്ചർ തുക പരിഗണിച്ച് recalculated ആണ്
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,ഇനം മൂലധനം നിരക്ക് ഭൂസ്വത്തുള്ള കുറഞ്ഞ വൗച്ചർ തുക പരിഗണിച്ച് recalculated ആണ്
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ഇടപാടുകൾ വിൽക്കുന്ന സ്ഥിരസ്ഥിതി ക്രമീകരണങ്ങൾ.
 DocType: Guardian,Guardian Of ,മേൽനോട്ടം
 DocType: Grading Scale Interval,Threshold,ഉമ്മറം
@@ -3938,6 +3943,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ഡെബിറ്റ് കുറിപ്പ് നൽകിയത്
 DocType: Production Order,Warehouses,അബദ്ധങ്ങളും
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} അസറ്റ് കൈമാറാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ഈ ഇനം {0} (ഫലകം) ഒരു പാഠം.
 DocType: Workstation,per hour,മണിക്കൂറിൽ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,പർച്ചേസിംഗ്
 DocType: Announcement,Announcement,അറിയിപ്പ്
@@ -3953,8 +3959,8 @@
 DocType: Account,Receivable,സ്വീകാ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,വരി # {0}: പർച്ചേസ് ഓർഡർ ഇതിനകം നിലവിലുണ്ട് പോലെ വിതരണക്കാരൻ മാറ്റാൻ അനുവദനീയമല്ല
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,സജ്ജമാക്കാൻ ക്രെഡിറ്റ് പരിധി ഇടപാടുകള് സമർപ്പിക്കാൻ അനുവാദമുള്ളൂ ആ റോൾ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,നിർമ്മിക്കാനുള്ള ഇനങ്ങൾ തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","മാസ്റ്റർ ഡാറ്റ സമന്വയിപ്പിക്കുന്നത്, അതു കുറച്ച് സമയം എടുത്തേക്കാം"
 DocType: Item,Material Issue,മെറ്റീരിയൽ പ്രശ്നം
 DocType: Hub Settings,Seller Description,വില്പനക്കാരന്റെ വിവരണം
 DocType: Employee Education,Qualification,യോഗ്യത
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ഉത്തരവിട്ടു
 DocType: Salary Detail,Component,ഘടകം
 DocType: Assessment Criteria,Assessment Criteria Group,അസസ്മെന്റ് മാനദണ്ഡം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച തുറക്കുന്നു {0} തുല്യമോ കുറവായിരിക്കണം
 DocType: Warehouse,Warehouse Name,വെയർഹൗസ് പേര്
 DocType: Naming Series,Select Transaction,ഇടപാട് തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,റോൾ അംഗീകരിക്കുന്നു അല്ലെങ്കിൽ ഉപയോക്താവ് അംഗീകരിക്കുന്നു നൽകുക
@@ -3979,7 +3985,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,സമർപ്പിച്ച ഓഹരി എൻട്രി {0} നിലവിലുണ്ട് കാരണം റദ്ദാക്കാൻ കഴിയില്ല
 DocType: Employee Loan,Disbursement Date,ചിലവ് തീയതി
 DocType: Vehicle,Vehicle,വാഹനം
 DocType: Purchase Invoice,In Words,വാക്കുകളിൽ
@@ -3994,14 +4000,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,സ്ഥലം പരിശോധന / ലീഡ്%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,അസറ്റ് Depreciations നീക്കിയിരിപ്പും
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},തുക {0} {1} ലേക്ക് {3} {2} നിന്ന് കൈമാറി
 DocType: Sales Invoice,Get Advances Received,അഡ്വാൻസുകളും സ്വീകരിച്ചു നേടുക
 DocType: Email Digest,Add/Remove Recipients,ചേർക്കുക / സ്വീകരിക്കുന്നവരെ നീക്കംചെയ്യുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ഇടപാട് നിർത്തിവച്ചു പ്രൊഡക്ഷൻ ഓർഡർ {0} നേരെ അനുവദിച്ചിട്ടില്ല
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","സഹജമായിസജ്ജീകരിയ്ക്കുക സാമ്പത്തിക വർഷം സജ്ജമാക്കാൻ, &#39;സഹജമായിസജ്ജീകരിയ്ക്കുക&#39; ക്ലിക്ക് ചെയ്യുക"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ചേരുക
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ദൌർലഭ്യം Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ഇനം വേരിയന്റ് {0} ഒരേ ആട്രിബ്യൂട്ടുകളുമുള്ള നിലവിലുണ്ട്
 DocType: Employee Loan,Repay from Salary,ശമ്പളത്തിൽ നിന്ന് പകരം
 DocType: Leave Application,LAP/,ലാപ് /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},തുക {0} {1} നേരെ പേയ്മെന്റ് അഭ്യർത്ഥിക്കുന്നു {2}
@@ -4019,7 +4025,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,അസസ്മെന്റ് ഫലം വിശദാംശം
 DocType: Employee Education,Employee Education,ജീവനക്കാരുടെ വിദ്യാഭ്യാസം
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ഇനം ഗ്രൂപ്പ് പട്ടികയിൽ കണ്ടെത്തി തനിപ്പകർപ്പ് ഇനം ഗ്രൂപ്പ്
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ഇത് ഇനം വിശദാംശങ്ങൾ കൊണ്ടുവരാം ആവശ്യമാണ്.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ഇതിനകം ലഭിച്ചു ചെയ്തു
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","വെയർഹൗസ് {0} ഏതെങ്കിലും അക്കൗണ്ട് ലിങ്കുചെയ്തിട്ടില്ല, ദയവായി സൃഷ്ടിക്കുക / പൊരുത്തപ്പെടുന്ന (അസറ്റ്) അക്കൗണ്ട് വെയർഹൗസ് ലിങ്ക്."
 DocType: Purchase Invoice,Recurring Id,ആവർത്തക ഐഡി
 DocType: Customer,Sales Team Details,സെയിൽസ് ടീം വിശദാംശങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,ശാശ്വതമായി ഇല്ലാതാക്കുക?
 DocType: Expense Claim,Total Claimed Amount,ആകെ ക്ലെയിം ചെയ്ത തുക
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,വില്ക്കുകയും വരാവുന്ന അവസരങ്ങൾ.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},അസാധുവായ {0}
@@ -4039,13 +4045,14 @@
 DocType: Warehouse,PIN,പിൻ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,സജ്ജീകരണം എര്പ്നെക്സത് നിങ്ങളുടെ സ്കൂൾ
 DocType: Sales Invoice,Base Change Amount (Company Currency),തുക ബേസ് മാറ്റുക (കമ്പനി കറൻസി)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,താഴെ അബദ്ധങ്ങളും വേണ്ടി ഇല്ല അക്കൌണ്ടിങ് എൻട്രികൾ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,കഴിഞ്ഞ ഓർഡർ തുക
+DocType: Task,Is Milestone,Milestone ആണോ
 DocType: Daily Work Summary,Email Sent To,അയച്ച ഇമെയിൽ
 DocType: Budget,Warn,മുന്നറിയിപ്പുകൊടുക്കുക
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","മറ്റേതെങ്കിലും പരാമർശമാണ്, റെക്കോർഡുകൾ ചെല്ലേണ്ടതിന്നു ശ്രദ്ധേയമാണ് ശ്രമം."
@@ -4066,7 +4073,7 @@
 DocType: Item Attribute Value,Attribute Value,ന്റെതിരച്ചറിവിനു്തെറ്റായധാര്മ്മികമൂല്യം
 ,Itemwise Recommended Reorder Level,Itemwise പുനഃക്രമീകരിക്കുക ലെവൽ ശുപാർശിത
 DocType: Salary Detail,Salary Detail,ശമ്പള വിശദാംശം
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,ആദ്യം {0} തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,ബാച്ച് {0} ഇനത്തിന്റെ {1} കാലഹരണപ്പെട്ടു.
 DocType: Sales Invoice,Commission,കമ്മീഷൻ
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,നിർമാണ സമയം ഷീറ്റ്.
@@ -4078,41 +4085,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ഫ്രീസുചെയ്യുക സ്റ്റോക്കുകൾ പഴയ Than`% d ദിവസം കുറവായിരിക്കണം.
 DocType: Tax Rule,Purchase Tax Template,വാങ്ങൽ നികുതി ഫലകം
 ,Project wise Stock Tracking,പ്രോജക്ട് ജ്ഞാനികൾ സ്റ്റോക്ക് ട്രാക്കിംഗ്
-apps/erpnext/erpnext/maintenance/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 +12,Employee records.,ജീവനക്കാരുടെ റെക്കോർഡുകൾ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,അടുത്ത മൂല്യത്തകർച്ച തീയതി സജ്ജമാക്കുക ദയവായി
 DocType: HR Settings,Payroll Settings,ശമ്പളപ്പട്ടിക ക്രമീകരണങ്ങൾ
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,നോൺ-ലിങ്ക്ഡ് ഇൻവോയ്സുകളും പേയ്മെൻറുകൾ ചേരു.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,സ്ഥല ഓർഡർ
 DocType: Email Digest,New Purchase Orders,പുതിയ വാങ്ങൽ ഓർഡറുകൾ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,റൂട്ട് ഒരു പാരന്റ് ചെലവ് കേന്ദ്രം പാടില്ല
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ബ്രാൻഡ് തിരഞ്ഞെടുക്കുക ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ബ്രാൻഡ് തിരഞ്ഞെടുക്കുക ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ഓൺ ആയി സൂക്ഷിക്കുന്നത് മൂല്യത്തകർച്ച
 DocType: Sales Invoice,C-Form Applicable,ബാധകമായ സി-ഫോം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ഓപ്പറേഷൻ സമയം ഓപ്പറേഷൻ {0} വേണ്ടി 0 വലുതായിരിക്കണം
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,വെയർഹൗസ് നിർബന്ധമാണ്
 DocType: Supplier,Address and Contacts,വിശദാംശവും ബന്ധങ്ങൾ
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM പരിവർത്തന വിശദാംശം
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px (എച്ച്) വെബ് സൗഹൃദ 900px (W) നിലനിർത്തുക
 DocType: Program,Program Abbreviation,പ്രോഗ്രാം സംഗ്രഹം
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,പ്രൊഡക്ഷൻ ഓർഡർ ഒരു ഇനം ഫലകം ഈടിന്മേൽ ചെയ്യാൻ കഴിയില്ല
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,വിചാരണ ഓരോ ഇനത്തിനും നേരെ പർച്ചേസ് രസീതിലെ അപ്ഡേറ്റ്
 DocType: Warranty Claim,Resolved By,തന്നെയാണ പരിഹരിക്കപ്പെട്ട
 DocType: Bank Guarantee,Start Date,തുടങ്ങുന്ന ദിവസം
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ഒരു കാലയളവിൽ ഇല മതി.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,തെറ്റായി മായ്ച്ചു ചെക്കുകൾ ആൻഡ് നിക്ഷേപങ്ങൾ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,അക്കൗണ്ട് {0}: നിങ്ങൾ പാരന്റ് അക്കൌണ്ട് സ്വയം നിശ്ചയിക്കാന് കഴിയില്ല
 DocType: Purchase Invoice Item,Price List Rate,വില പട്ടിക റേറ്റ്
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ഉപഭോക്തൃ ഉദ്ധരണികൾ സൃഷ്ടിക്കുക
 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 +38,Bill of Materials (BOM),വസ്തുക്കളുടെ ബിൽ (DEL)
 DocType: Item,Average time taken by the supplier to deliver,ശരാശരി സമയം വിടുവിപ്പാൻ വിതരണക്കാരൻ എടുത്ത
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,അസസ്മെന്റ് ഫലം
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,മണിക്കൂറുകൾ
 DocType: Project,Expected Start Date,പ്രതീക്ഷിച്ച ആരംഭ തീയതി
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ചാർജ് ആ ഇനത്തിനും ബാധകമായ എങ്കിൽ ഇനം നീക്കം
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ഇടപാട് കറൻസി പേയ്മെന്റ് ഗേറ്റ്വേ കറൻസി അതേ ആയിരിക്കണം
 DocType: Payment Entry,Receive,സ്വീകരിക്കുക
@@ -4123,19 +4129,19 @@
 DocType: Workstation,Operating Costs,ഓപ്പറേറ്റിംഗ് വിലയും
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,സൂക്ഷിക്കുന്നത് പ്രതിമാസം ബജറ്റ് നടപടികൾ കവിഞ്ഞു
 DocType: Purchase Invoice,Submit on creation,സൃഷ്ടിക്കൽ സമർപ്പിക്കുക
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},{0} {1} ആയിരിക്കണം വേണ്ടി കറൻസി
 DocType: Asset,Disposal Date,തീർപ്പ് തീയതി
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ഇമെയിലുകൾ അവർ അവധി ഇല്ലെങ്കിൽ, തന്നിരിക്കുന്ന നാഴിക കമ്പനിയുടെ എല്ലാ സജീവ ജീവനക്കാർക്ക് അയയ്ക്കും. പ്രതികരണങ്ങളുടെ സംഗ്രഹം അർദ്ധരാത്രിയിൽ അയയ്ക്കും."
 DocType: Employee Leave Approver,Employee Leave Approver,ജീവനക്കാരുടെ അവധി Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},വരി {0}: ഒരു പുനഃക്രമീകരിക്കുക എൻട്രി ഇതിനകം ഈ വെയർഹൗസ് {1} നിലവിലുണ്ട്
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","നഷ്ടപ്പെട്ട പോലെ ക്വട്ടേഷൻ വെളിപ്പെടുത്താമോ കാരണം, വർണ്ണിക്കും ചെയ്യാൻ കഴിയില്ല."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,പരിശീലന പ്രതികരണം
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,പ്രൊഡക്ഷൻ ഓർഡർ {0} സമർപ്പിക്കേണ്ടതാണ്
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},ഇനം {0} ആരംഭ തീയതിയും അവസാന തീയതി തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},കോഴ്സ് വരി {0} ലെ നിർബന്ധമായും
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ഇന്നുവരെ തീയതി മുതൽ മുമ്പ് ആകാൻ പാടില്ല
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,എഡിറ്റ് വിലകൾ / ചേർക്കുക
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Batch,Parent Batch,പാരന്റ് ബാച്ച്
 DocType: Cheque Print Template,Cheque Print Template,ചെക്ക് പ്രിന്റ് ഫലകം
@@ -4149,7 +4155,7 @@
 ,Ordered Items To Be Delivered,പ്രസവം ഉത്തരവിട്ടു ഇനങ്ങൾ
 DocType: Account,Income,ആദായ
 DocType: Industry Type,Industry Type,വ്യവസായം തരം
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,എന്തോ കുഴപ്പം സംഭവിച്ചു!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,എന്തോ കുഴപ്പം സംഭവിച്ചു!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,മുന്നറിയിപ്പ്: വിടുക അപേക്ഷ താഴെ ബ്ലോക്ക് തീയതി അടങ്ങിയിരിക്കുന്നു
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,സെയിൽസ് ഇൻവോയിസ് {0} ഇതിനകം സമർപ്പിച്ചു
 DocType: Assessment Result Detail,Score,സ്കോർ
@@ -4180,17 +4186,17 @@
 DocType: Item,Variant Based On,വേരിയന്റ് അടിസ്ഥാനമാക്കിയുള്ള
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},അസൈൻ ആകെ വെയിറ്റേജ് 100% ആയിരിക്കണം. ഇത് {0} ആണ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,നിങ്ങളുടെ വിതരണക്കാരും
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,സെയിൽസ് ഓർഡർ കഴിക്കുന്ന പോലെ ലോസ്റ്റ് ആയി സജ്ജമാക്കാൻ കഴിയില്ല.
 DocType: Request for Quotation Item,Supplier Part No,വിതരണക്കാരൻ ഭാഗം ഇല്ല
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,നിന്നു ലഭിച്ച
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',വർഗ്ഗം &#39;മൂലധനം&#39; അല്ലെങ്കിൽ &#39;Vaulation മൊത്തം&#39; എന്ന എപ്പോൾ കുറയ്ക്കാവുന്നതാണ് കഴിയില്ല
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,നിന്നു ലഭിച്ച
 DocType: Lead,Converted,പരിവർത്തനം
 DocType: Item,Has Serial No,സീരിയൽ പോസ്റ്റ് ഉണ്ട്
 DocType: Employee,Date of Issue,പുറപ്പെടുവിച്ച തീയതി
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} {1} വേണ്ടി നിന്ന്
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},വരി # {0}: ഇനത്തിന്റെ വേണ്ടി സജ്ജമാക്കുക വിതരണക്കാരൻ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,വരി {0}: മണിക്കൂറുകൾ മൂല്യം പൂജ്യത്തേക്കാൾ വലുതായിരിക്കണം.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,വെബ്സൈറ്റ് ചിത്രം {0} ഇനം ഘടിപ്പിച്ചിരിക്കുന്ന {1} കണ്ടെത്താൻ കഴിയുന്നില്ല
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,വെബ്സൈറ്റിൽ ഒന്നിലധികം സംഘങ്ങളായി ഈ ഇനം കാണിയ്ക്കുക.
@@ -4199,20 +4205,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,നിങ്ങൾ ശീതീകരിച്ച മൂല്യം സജ്ജീകരിക്കാൻ അംഗീകാരമില്ല
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled എൻട്രികൾ നേടുക
 DocType: Payment Reconciliation,From Invoice Date,ഇൻവോയിസ് തീയതി മുതൽ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ബില്ലിംഗ് കറൻസി ഒന്നുകിൽ സ്ഥിര comapany നാണയത്തിൽ അല്ലെങ്കിൽ പാർട്ടി അക്കൗണ്ട് കറൻസി തുല്യമായിരിക്കണം
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ലീവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,അത് എന്തു ചെയ്യുന്നു?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,വെയർഹൗസ് ചെയ്യുക
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,എല്ലാ സ്റ്റുഡന്റ് പ്രവേശന
 ,Average Commission Rate,ശരാശരി കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;അതെ&#39; നോൺ-ഓഹരി ഇനത്തിന്റെ വേണ്ടി ആകാൻ പാടില്ല &#39;സീരിയൽ നോ ഉണ്ട്&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ഹാജർ ഭാവി തീയതി വേണ്ടി അടയാളപ്പെടുത്തും കഴിയില്ല
 DocType: Pricing Rule,Pricing Rule Help,പ്രൈസിങ് റൂൾ സഹായം
 DocType: School House,House Name,ഹൗസ് പേര്
 DocType: Purchase Taxes and Charges,Account Head,അക്കൗണ്ട് ഹെഡ്
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ഇനങ്ങളുടെ വന്നിറങ്ങി ചെലവ് കണക്കാക്കാൻ അധിക ചെലവ് അപ്ഡേറ്റ്
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ഇലക്ട്രിക്കൽ
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,നിങ്ങളുടെ ഉപയോക്താക്കളെ നിങ്ങളുടെ ഓർഗനൈസേഷന്റെ ബാക്കി ചേർക്കുക. നിങ്ങൾക്ക് ബന്ധങ്ങൾ നിന്ന് ചേർത്തുകൊണ്ട് നിങ്ങളുടെ പോർട്ടൽ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ചേർക്കാൻ കഴിയും
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,നിങ്ങളുടെ ഉപയോക്താക്കളെ നിങ്ങളുടെ ഓർഗനൈസേഷന്റെ ബാക്കി ചേർക്കുക. നിങ്ങൾക്ക് ബന്ധങ്ങൾ നിന്ന് ചേർത്തുകൊണ്ട് നിങ്ങളുടെ പോർട്ടൽ ഉപയോക്താക്കളെ ക്ഷണിക്കാൻ ചേർക്കാൻ കഴിയും
 DocType: Stock Entry,Total Value Difference (Out - In),(- ഔട്ട്) ആകെ മൂല്യം വ്യത്യാസം
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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} വെച്ചിരിക്കുന്നു അല്ല
@@ -4221,7 +4227,7 @@
 DocType: Item,Customer Code,കസ്റ്റമർ കോഡ്
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} വേണ്ടി ജന്മദിനം
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,കഴിഞ്ഞ ഓർഡർ നു ശേഷം ദിനങ്ങൾ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,അക്കൗണ്ടിലേക്ക് ഡെബിറ്റ് ഒരു ബാലൻസ് ഷീറ്റ് അക്കൗണ്ട് ആയിരിക്കണം
 DocType: Buying Settings,Naming Series,സീരീസ് നാമകരണം
 DocType: Leave Block List,Leave Block List Name,ബ്ലോക്ക് പട്ടിക പേര് വിടുക
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ഇൻഷുറൻസ് ആരംഭ തീയതി ഇൻഷുറൻസ് അവസാന തീയതി കുറവായിരിക്കണം
@@ -4236,9 +4242,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ഉദ്യോഗസ്ഥ ജാമ്യം ജി {0} ഇതിനകം സമയം ഷീറ്റ് {1} സൃഷ്ടിച്ച
 DocType: Vehicle Log,Odometer,ഓഡോമീറ്റർ
 DocType: Sales Order Item,Ordered Qty,ഉത്തരവിട്ടു Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,ഇനം {0} പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ
 DocType: Stock Settings,Stock Frozen Upto,ഓഹരി ശീതീകരിച്ച വരെ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ലേക്ക് ഏതെങ്കിലും ഓഹരി ഇനം അടങ്ങിയിട്ടില്ല
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},നിന്നും കാലഘട്ടം {0} ആവർത്ത വേണ്ടി നിർബന്ധമായി തീയതി വരെയുള്ള
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,പ്രോജക്ട് പ്രവർത്തനം / ചുമതല.
 DocType: Vehicle Log,Refuelling Details,Refuelling വിശദാംശങ്ങൾ
@@ -4248,8 +4254,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,അവസാനം വാങ്ങൽ നിരക്ക് കണ്ടെത്തിയില്ല
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ഓഫാക്കുക എഴുതുക തുക (കമ്പനി കറൻസി)
 DocType: Sales Invoice Timesheet,Billing Hours,ബില്ലിംഗ് മണിക്കൂർ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} കണ്ടെത്തിയില്ല സ്ഥിര BOM ൽ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,വരി # {0}: സജ്ജീകരിക്കുക പുനഃക്രമീകരിക്കുക അളവ്
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ഇവിടെ ചേർക്കാൻ ഇനങ്ങൾ ടാപ്പ്
 DocType: Fees,Program Enrollment,പ്രോഗ്രാം എൻറോൾമെന്റ്
 DocType: Landed Cost Voucher,Landed Cost Voucher,ചെലവ് വൗച്ചർ റജിസ്റ്റർ
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} സജ്ജീകരിക്കുക
@@ -4273,7 +4280,7 @@
 DocType: Maintenance Visit,Maintenance Date,മെയിൻറനൻസ് തീയതി
 DocType: Purchase Invoice Item,Rejected Serial No,നിരസിച്ചു സീരിയൽ പോസ്റ്റ്
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,വർഷം ആരംഭിക്കുന്ന തീയതി അല്ലെങ്കിൽ അവസാന തീയതി {0} ഓവർലാപ്പുചെയ്യുന്നു ആണ്. ഒഴിവാക്കാൻ കമ്പനി സജ്ജമാക്കാൻ ദയവായി
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},തീയതി ഇനം {0} വേണ്ടി അവസാനം തീയതി കുറവായിരിക്കണം ആരംഭിക്കുക
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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.","ഉദാഹരണം:. എബിസിഡി ##### പരമ്പര സജ്ജമാക്കുമ്പോൾ സീരിയൽ ഇടപാടുകൾ ഒന്നുമില്ല പരാമർശിച്ച അല്ല, പിന്നെ ഓട്ടോമാറ്റിക് സീരിയൽ നമ്പർ ഈ പരമ്പര അടിസ്ഥാനമാക്കി സൃഷ്ടിച്ച ചെയ്യുന്നതെങ്കിൽ. നിങ്ങൾക്ക് എല്ലായ്പ്പോഴും കീഴ്വഴക്കമായി ഈ ഇനത്തിന്റെ വേണ്ടി സീരിയൽ ഒഴിവ് മറന്ന ആഗ്രഹിക്കുന്നുവെങ്കിൽ. ശ്യൂന്യമായിടുകയാണെങ്കിൽ."
 DocType: Upload Attendance,Upload Attendance,ഹാജർ അപ്ലോഡുചെയ്യുക
@@ -4350,7 +4357,6 @@
 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,ഒന്നിലധികം സംഘങ്ങളായി ഇനത്തിന്റെ ലിസ്റ്റിങ്
-DocType: Grade Interval,Grade Interval,ഗ്രേഡ് ഇടവേള
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},സാമ്പത്തിക വർഷത്തെ ആരംഭ തീയതി സാമ്പത്തിക വർഷം അവസാനിക്കുന്ന തീയതി ഇതിനകം സാമ്പത്തിക വർഷം {0} സജ്ജമാക്കിയിരിക്കുന്നുവെങ്കിലും
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ക്ലിയറൻസ് തീയതി അപ്ഡേറ്റ്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,സ്പ്ലിറ്റ് ബാച്ച്
@@ -4397,14 +4403,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,നിങ്ങൾ കോഴ്സ് അടിസ്ഥാനമാക്കിയുള്ള ഗ്രൂപ്പുകൾ അവസരത്തിൽ ബാച്ച് പരിഗണിക്കുക ആഗ്രഹിക്കുന്നില്ല പരിശോധിക്കാതെ വിടുക.
 DocType: Asset,Frequency of Depreciation (Months),മൂല്യത്തകർച്ചയെത്തുടർന്ന് ഫ്രീക്വൻസി (മാസം)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ക്രെഡിറ്റ് അക്കൗണ്ട്
 DocType: Landed Cost Item,Landed Cost Item,റജിസ്റ്റർ ചെലവ് ഇനം
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,പൂജ്യം മൂല്യങ്ങൾ കാണിക്കുക
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,അസംസ്കൃത വസ്തുക്കളുടെ തന്നിരിക്കുന്ന അളവിൽ നിന്ന് തിരസ്കൃതമൂല്യങ്ങള് / നിര്മ്മാണ ശേഷം ഇനത്തിന്റെ അളവ്
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,സെറ്റപ്പ് എന്റെ ഓർഗനൈസേഷന് ഒരു ലളിതമായ വെബ്സൈറ്റ്
 DocType: Payment Reconciliation,Receivable / Payable Account,സ്വീകാ / അടയ്ക്കേണ്ട അക്കൗണ്ട്
 DocType: Delivery Note Item,Against Sales Order Item,സെയിൽസ് ഓർഡർ ഇനം എഗെൻസ്റ്റ്
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},ആട്രിബ്യൂട്ട് {0} മൂല്യം ആട്രിബ്യൂട്ട് വ്യക്തമാക്കുക
 DocType: Item,Default Warehouse,സ്ഥിരസ്ഥിതി വെയർഹൗസ്
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ബജറ്റ് ഗ്രൂപ്പ് അക്കൗണ്ട് {0} നേരെ നിയോഗിക്കുകയും കഴിയില്ല
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,പാരന്റ് കോസ്റ്റ് സെന്റർ നൽകുക
@@ -4450,7 +4456,7 @@
 DocType: Opportunity Item,Basic Rate,അടിസ്ഥാന റേറ്റ്
 DocType: GL Entry,Credit Amount,ക്രെഡിറ്റ് തുക
 DocType: Cheque Print Template,Signatory Position,ഒപ്പുടമയുടെ സ്ഥാനം
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ലോസ്റ്റ് സജ്ജമാക്കുക
 DocType: Timesheet,Total Billable Hours,ആകെ ബില്ലടയ്ക്കണം മണിക്കൂർ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,പേയ്മെന്റ് രസീത് കുറിപ്പ്
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ഇത് ഈ കസ്റ്റമർ നേരെ ഇടപാടുകൾ അടിസ്ഥാനമാക്കിയുള്ളതാണ്. വിശദാംശങ്ങൾക്ക് ടൈംലൈൻ കാണുക
@@ -4464,11 +4470,11 @@
 ,Items To Be Requested,അഭ്യർത്ഥിച്ചു ഇനങ്ങൾ
 DocType: Purchase Order,Get Last Purchase Rate,അവസാനം വാങ്ങൽ റേറ്റ് നേടുക
 DocType: Company,Company Info,കമ്പനി വിവരങ്ങൾ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,പുതിയ ഉപഭോക്തൃ തിരഞ്ഞെടുക്കുക അല്ലെങ്കിൽ ചേർക്കുക
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,കോസ്റ്റ് സെന്റർ ഒരു ചെലവിൽ ക്ലെയിം ബുക്ക് ആവശ്യമാണ്
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ഫണ്ട് അപേക്ഷാ (ആസ്തികൾ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ഈ ജോലിയില് ഹാജർ അടിസ്ഥാനമാക്കിയുള്ളതാണ്
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ഡെബിറ്റ് അക്കൗണ്ട്
 DocType: Fiscal Year,Year Start Date,വർഷം ആരംഭ തീയതി
 DocType: Attendance,Employee Name,ജീവനക്കാരുടെ പേര്
 DocType: Sales Invoice,Rounded Total (Company Currency),വൃത്തത്തിലുള്ള ആകെ (കമ്പനി കറൻസി)
@@ -4477,13 +4483,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,താഴെ ദിവസങ്ങളിൽ അവധി അപേക്ഷിക്കുന്നതിനുള്ള നിന്നും ഉപയോക്താക്കളെ നിർത്തുക.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,വാങ്ങൽ തുക
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,വിതരണക്കാരൻ ക്വട്ടേഷൻ {0} സൃഷ്ടിച്ചു
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,അവസാനിക്കുന്ന വർഷം ആരംഭിക്കുന്ന വർഷം മുമ്പ് ആകാൻ പാടില്ല
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ജീവനക്കാരുടെ ആനുകൂല്യങ്ങൾ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ഒരു സ്ഥിര ഹോളിഡേ ലിസ്റ്റ് സജ്ജമാക്കാൻ ദയവായി എംപ്ലോയിസ് {0} അല്ലെങ്കിൽ കമ്പനി {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} നിലവിലുണ്ട് ഇല്ല
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ഉപഭോക്താക്കൾക്ക് ഉയർത്തുകയും ബില്ലുകള്.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,പ്രോജക്ട് ഐഡി
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},വരി ഇല്ല {0}: തുക ചിലവിടൽ ക്ലെയിം {1} നേരെ തുക തീർച്ചപ്പെടുത്തിയിട്ടില്ല വലുതായിരിക്കണം കഴിയില്ല. തീർച്ചപ്പെടുത്തിയിട്ടില്ല തുക {2} ആണ്
@@ -4492,15 +4498,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ഹബ്
 DocType: GL Entry,Voucher Type,സാക്ഷപ്പെടുത്തല് തരം
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,വില പട്ടിക കണ്ടെത്തിയില്ല അല്ലെങ്കിൽ പ്രവർത്തനരഹിതമാക്കിയിട്ടില്ലെന്ന്
 DocType: Employee Loan Application,Approved,അംഗീകരിച്ചു
 DocType: Pricing Rule,Price,വില
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;ഇടത്&#39; ആയി സജ്ജമാക്കാൻ വേണം ന് ആശ്വാസമായി ജീവനക്കാരൻ
 DocType: Guardian,Guardian,ഗാർഡിയൻ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,മൂല്യനിർണയം {0} നൽകിയ തീയതി പരിധി എംപ്ലോയിസ് {1} വേണ്ടി സൃഷ്ടിച്ചു
 DocType: Employee,Education,വിദ്യാഭ്യാസം
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ആയപ്പോഴേക്കും നാമകരണം കാമ്പെയ്ൻ
 DocType: Employee,Current Address Is,ഇപ്പോഴത്തെ വിലാസമാണിത്
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,തിരുത്തപ്പെട്ടത്
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ഓപ്ഷണൽ. വ്യക്തമാക്കിയിട്ടില്ല എങ്കിൽ കമ്പനിയുടെ സ്വതവേ കറൻസി, സജ്ജമാക്കുന്നു."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,അക്കൗണ്ടിംഗ് എൻട്രികൾ.
 DocType: Delivery Note Item,Available Qty at From Warehouse,വെയർഹൗസിൽ നിന്ന് ലഭ്യമായ Qty
@@ -4509,7 +4517,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},വരി {0}: പാർട്ടി / അക്കൗണ്ട് {3} {4} ൽ {1} / {2} കൂടെ പൊരുത്തപ്പെടുന്നില്ല
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ചിലവേറിയ നൽകുക
 DocType: Account,Stock,സ്റ്റോക്ക്
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","വരി # {0}: പരാമർശം ഡോക്യുമെന്റ് തരം പർച്ചേസ് ഓർഡർ, പർച്ചേസ് ഇൻവോയ്സ് അല്ലെങ്കിൽ ജേർണൽ എൻട്രി ഒന്ന് ആയിരിക്കണം"
 DocType: Employee,Current Address,ഇപ്പോഴത്തെ വിലാസം
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ഇനത്തിന്റെ മറ്റൊരു ഇനത്തിന്റെ ഒരു വകഭേദം ഇതാണെങ്കിൽ കീഴ്വഴക്കമായി വ്യക്തമാക്കപ്പെടുന്നതുവരെ പിന്നെ വിവരണം, ചിത്രം, ഉള്ളവയും, നികുതികൾ തുടങ്ങിയവ ടെംപ്ലേറ്റിൽ നിന്നും ആയിരിക്കും"
 DocType: Serial No,Purchase / Manufacture Details,വാങ്ങൽ / ഉത്പാദനം വിവരങ്ങൾ
@@ -4537,7 +4545,7 @@
 DocType: Hub Settings,Hub Settings,ഹബ് ക്രമീകരണങ്ങൾ
 DocType: Project,Gross Margin %,മൊത്തം മാർജിൻ%
 DocType: BOM,With Operations,പ്രവർത്തനവുമായി
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,അക്കൗണ്ടിംഗ് എൻട്രികൾ ഇതിനകം കമ്പനി {1} വേണ്ടി കറൻസി {0} ഉണ്ടായിട്ടുണ്ട്. കറൻസി {0} ഉപയോഗിച്ച് ഒരു സ്വീകരിക്കുന്ന അല്ലെങ്കിൽ മാറാവുന്ന അക്കൗണ്ട് തിരഞ്ഞെടുക്കുക.
 DocType: Asset,Is Existing Asset,നിലവിലുള്ള സ്വത്ത്
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
 DocType: Salary Detail,Statistical Component,സ്റ്റാറ്റിസ്റ്റിക്കൽ ഘടക
@@ -4562,7 +4570,7 @@
 DocType: Assessment Plan,Room,ഇടം
 DocType: Purchase Order,Advance Paid,മുൻകൂർ പണമടച്ചു
 DocType: Item,Item Tax,ഇനം നികുതി
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,വിതരണക്കാരൻ വരെ മെറ്റീരിയൽ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,എക്സൈസ് ഇൻവോയിസ്
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ത്രെഷോൾഡ് {0}% ഒന്നിലധികം തവണ ലഭ്യമാകുന്നു
 DocType: Expense Claim,Employees Email Id,എംപ്ലോയീസ് ഇമെയിൽ ഐഡി
@@ -4593,9 +4601,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ലോഗോ അറ്റാച്ച്
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ഓഹരി ലെവലുകൾ
 DocType: Customer,Commission Rate,കമ്മീഷൻ നിരക്ക്
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,വേരിയന്റ് നിർമ്മിക്കുക
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,വകുപ്പിന്റെ ലീവ് പ്രയോഗങ്ങൾ തടയുക.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","പേയ്മെന്റ് ഇനം, സ്വീകരിക്കുക ഒന്ന് ആയിരിക്കണം അടച്ച് ആന്തരിക ട്രാൻസ്ഫർ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,അനലിറ്റിക്സ്
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,കാർട്ട് ശൂന്യമാണ്
 DocType: Vehicle,Model,മാതൃക
@@ -4606,6 +4614,7 @@
 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 +161,Capital Stock,ക്യാപിറ്റൽ സ്റ്റോക്ക്
+DocType: Shopping Cart Settings,Show Public Attachments,പൊതു അറ്റാച്മെന്റ് കാണിക്കുക
 DocType: Packing Slip,Package Weight Details,പാക്കേജ് ഭാരം വിശദാംശങ്ങൾ
 DocType: Payment Gateway Account,Payment Gateway Account,പേയ്മെന്റ് ഗേറ്റ്വേ അക്കൗണ്ട്
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,പേയ്മെന്റ് പൂർത്തിയായ ശേഷം തിരഞ്ഞെടുത്ത പേജിലേക്ക് ഉപയോക്താവിനെ തിരിച്ചുവിടൽ.
@@ -4624,15 +4633,15 @@
 DocType: Batch,Expiry Date,കാലഹരണപ്പെടുന്ന തീയതി
 ,Supplier Addresses and Contacts,വിതരണക്കമ്പനിയായ വിലാസങ്ങളും ബന്ധങ്ങൾ
 ,accounts-browser,അക്കൗണ്ടുകൾ-ബ്രൗസർ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,ആദ്യം വർഗ്ഗം തിരഞ്ഞെടുക്കുക
 apps/erpnext/erpnext/config/projects.py +13,Project master.,പ്രോജക്ട് മാസ്റ്റർ.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","മേൽ-ബില്ലിംഗ് അല്ലെങ്കിൽ മേൽ-ക്രമം ഓഹരി ക്രമീകരണങ്ങൾ അല്ലെങ്കിൽ ഇനത്തിൽ, അപ്ഡേറ്റ് &quot;അലവൻസ്&quot; അനുവദിക്കുക."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,കറൻസികൾ വരെ തുടങ്ങിയവ $ പോലുള്ള ഏതെങ്കിലും ചിഹ്നം അടുത്ത കാണിക്കരുത്.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(അര ദിവസം)
 DocType: Supplier,Credit Days,ക്രെഡിറ്റ് ദിനങ്ങൾ
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,വിദ്യാർത്ഥിയുടെ ബാച്ച് നിർമ്മിക്കുക
 DocType: Leave Type,Is Carry Forward,മുന്നോട്ട് വിലക്കുണ്ടോ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM ൽ നിന്നുള്ള ഇനങ്ങൾ നേടുക
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ലീഡ് സമയം ദിനങ്ങൾ
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},വരി # {0}: {1} പോസ്റ്റുചെയ്ത തീയതി വാങ്ങൽ തീയതി തുല്യമായിരിക്കണം ആസ്തിയുടെ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,മുകളിലുള്ള പട്ടികയിൽ സെയിൽസ് ഓർഡറുകൾ നൽകുക
@@ -4649,8 +4658,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,അനുവദിക്കപ്പെട്ട തുക
 DocType: GL Entry,Is Opening,തുറക്കുകയാണ്
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},വരി {0}: ഡെബിറ്റ് എൻട്രി ഒരു {1} ലിങ്കുചെയ്തിരിക്കുന്നതിനാൽ ചെയ്യാൻ കഴിയില്ല
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ദയവായി സജ്ജീകരണം&gt; നമ്പറിംഗ് സീരീസ് വഴി ഹാജർ വിവരത്തിനു നമ്പറിംഗ് പരമ്പര
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 2661c50..0dfb42b 100644
--- a/erpnext/translations/mr.csv
+++ b/erpnext/translations/mr.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,भाड्याने
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,वापरकर्त्यांसाठी  लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","थांबविलेली  उत्पादन ऑर्डर रद्द करता येणार नाही, रद्द करण्यासाठी प्रथम ती Unstop करा"
 DocType: Vehicle Service,Mileage,मायलेज
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,आपण खरोखर या मालमत्ता स्क्रॅप इच्छित आहे का?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,निवडा मुलभूत पुरवठादार
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,निवडा मुलभूत पुरवठादार
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},चलन दर सूची आवश्यक आहे {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* व्यवहारामधे  हिशोब केला जाईल.
 DocType: Purchase Order,Customer Contact,ग्राहक संपर्क
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} साठीची बाकी   शून्य ({1}) पेक्षा कमी असू शकत नाही
 DocType: Manufacturing Settings,Default 10 mins,10 मि डीफॉल्ट
 DocType: Leave Type,Leave Type Name,रजा प्रकारचे नाव
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,खुल्या दर्शवा
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,खुल्या दर्शवा
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,मालिका यशस्वीपणे अद्यतनित
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,चेकआऊट
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural जर्नल प्रवेश सबमिट
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,बॅच बाबींचा कालावधी समाप्ती स्थिती
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,बँक ड्राफ्ट
 DocType: Mode of Payment Account,Mode of Payment Account,भरणा खात्याचे  मोड
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,रूपे दर्शवा
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,रूपे दर्शवा
 DocType: Academic Term,Academic Term,शैक्षणिक मुदत
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,साहित्य
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,प्रमाण
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,प्रमाण
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,खाती टेबल रिक्त असू शकत नाही.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),कर्ज (दायित्व)
 DocType: Employee Education,Year of Passing,उत्तीर्ण वर्ष
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",संदर्भ:% s बाबींचा कोड आहे:% s आणि ग्राहक आहे:% s
 DocType: Item,Country of Origin,मूळ देश
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,स्टॉक
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,खुल्या समस्या
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,हेल्थ केअर
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),भरणा विलंब (दिवस)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,सेवा खर्च
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,चलन
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},अनुक्रमांक: {0} आधीच विक्री चलन संदर्भ आहे: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,चलन
 DocType: Maintenance Schedule Item,Periodicity,ठराविक मुदतीने पुन: पुन्हा उगवणे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,आर्थिक वर्ष {0} आवश्यक आहे
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,अपेक्षित वितरणाची तारीख विक्री ऑर्डर तारीख आधी आहे
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","दोन स्तंभ, जुना नाव आणि एक नवीन नाव एक .csv फाइल संलग्न"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} कोणत्याही सक्रिय आर्थिक वर्षात.
 DocType: Packed Item,Parent Detail docname,पालक तपशील docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","संदर्भ: {0}, आयटम कोड: {1} आणि ग्राहक: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,किलो
 DocType: Student Log,Log,लॉग
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,जॉब साठी उघडत आहे.
 DocType: Item Attribute,Increment,बढती
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,वखार निवडा ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,वखार निवडा ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,जाहिरात
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,त्याच कंपनीने  एका  पेक्षा अधिक प्रवेश केला आहे
 DocType: Employee,Married,लग्न
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} ला परवानगी नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,आयटम मिळवा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ला परवानगी नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},शेअर वितरण टीप विरुद्ध अद्यतनित करणे शक्य नाही {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},उत्पादन {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,कोणतेही आयटम सूचीबद्ध
 DocType: Payment Reconciliation,Reconcile,समेट
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,किराणा
 DocType: Quality Inspection Reading,Reading 1,1 वाचन
 DocType: Process Payroll,Make Bank Entry,बँक प्रवेश करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,पेन्शन फंड्स
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,पुढील घसारा तारीख खरेदी तारीख असू शकत नाही
 DocType: SMS Center,All Sales Person,सर्व विक्री व्यक्ती
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** मासिक वितरण ** आपण आपल्या व्यवसायात हंगामी असेल तर बजेट / लक्ष्य महिने ओलांडून वितरण मदत करते.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,नाही आयटम आढळला
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,नाही आयटम आढळला
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,पगार संरचना गहाळ
 DocType: Lead,Person Name,व्यक्ती नाव
 DocType: Sales Invoice Item,Sales Invoice Item,विक्री चलन आयटम
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",उदा &quot;प्राथमिक शाळा&quot; किंवा &quot;युनिव्हर्सिटी&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,शेअर अहवाल
 DocType: Warehouse,Warehouse Detail,वखार तपशील
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ग्राहक {0} {1} / {2} साठी क्रेडिट मर्यादा पार गेले आहे
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,मुदत समाप्ती तारीख नंतर जे मुदत लिंक आहे शैक्षणिक वर्ष वर्ष अंतिम तारीख पेक्षा असू शकत नाही (शैक्षणिक वर्ष {}). तारखा दुरुस्त करा आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;मुदत मालमत्ता आहे&quot; मालमत्ता रेकॉर्ड आयटम विरुद्ध अस्तित्वात आहे म्हणून, अनचेक केले जाऊ शकत नाही"
 DocType: Vehicle Service,Brake Oil,ब्रेक तेल
 DocType: Tax Rule,Tax Type,कर प्रकार
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},आपल्याला आधी नोंदी जमा करण्यासाठी  किंवा सुधारणा करण्यासाठी अधिकृत नाही {0}
 DocType: BOM,Item Image (if not slideshow),आयटम प्रतिमा (स्लाईड शो नसेल  तर)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,एक ग्राहक समान नाव अस्तित्वात
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(तास रेट / 60) * प्रत्यक्ष ऑपरेशन वेळ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM निवडा
 DocType: SMS Log,SMS Log,एसएमएस लॉग
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,वितरित केले आयटम खर्च
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} वरील  सुट्टी तारखेपासून आणि तारखेपर्यंत  च्या दरम्यान नाही
@@ -168,7 +170,7 @@
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},रजा रेकॉर्ड कर्मचारी आढळला नाही {0} साठी {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"पहिली  कंपनीची
 यादी  प्रविष्ट करा"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,कृपया पहिले कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,एकूण खर्च
@@ -183,7 +185,7 @@
 DocType: Expense Claim Detail,Claim Amount,दाव्याची रक्कम
 DocType: Employee,Mr,श्री
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer गट टेबल मध्ये आढळले डुप्लिकेट ग्राहक गट
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,पुरवठादार प्रकार / पुरवठादार
 DocType: Naming Series,Prefix,पूर्वपद
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumable
 DocType: Employee,B-,B-
@@ -192,11 +194,11 @@
 DocType: Training Result Employee,Grade,ग्रेड
 DocType: Sales Invoice Item,Delivered By Supplier,पुरवठादार करून वितरित
 DocType: SMS Center,All Contact,सर्व संपर्क
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,उत्पादन ऑर्डर BOM सर्व आयटम आधीपासूनच तयार
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,वार्षिक पगार
 DocType: Daily Work Summary,Daily Work Summary,दररोज काम सारांश
 DocType: Period Closing Voucher,Closing Fiscal Year,आर्थिक वर्ष बंद
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} गोठविले
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} गोठविले
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,कृपया खाती चार्ट तयार करण्यासाठी विद्यमान कंपनी निवडा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,शेअर खर्च
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,लक्ष्य वखार निवडा
@@ -205,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,विरुद्ध प्रवेश
 DocType: Journal Entry Account,Credit in Company Currency,कंपनी चलन क्रेडिट
 DocType: Delivery Note,Installation Status,प्रतिष्ठापन स्थिती
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",आपण उपस्थिती अद्यतनित करू इच्छिता का? <br> सादर करा: {0} \ <br> अनुपस्थित: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},प्रमाण नाकारलेले + स्वीकारले आयटम साठी प्राप्त प्रमाण समान असणे आवश्यक आहे {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,पुरवठा कच्चा माल खरेदी
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,पैसे किमान एक मोड POS चलन आवश्यक आहे.
 DocType: Products Settings,Show Products as a List,उत्पादने शो सूची
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","टेम्पलेट डाउनलोड करा , योग्य डेटा भरा आणि संचिकेशी संलग्न करा . निवडलेल्या कालावधीत मध्ये सर्व तारखा आणि कर्मचारी संयोजन , विद्यमान उपस्थिती रेकॉर्ड सह टेम्पलेट मधे येइल"
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,घसारा प्रवेश करा
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,विनंती प्रकार
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,कर्मचारी करा
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,कर्मचारी करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,प्रसारण
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,कार्यवाही
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ऑपरेशन तपशील चालते.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,देखभाल भेटींसाठी योजना.
 DocType: SMS Settings,Enter url parameter for message,संदेश साठी मापदंड प्रविष्ट करा
 DocType: POS Profile,Customer Groups,ग्राहक गट
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,आर्थिक विवरणपत्रे
 DocType: Guardian,Students,विद्यार्थी
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,किंमत आणि सवलत लागू नियम.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,किंमत सूची खरेदी किंवा विक्रीसाठी  लागू असणे आवश्यक आहे
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},आगाऊ रक्कम पेक्षा जास्त असू शकत नाही {0} {1}
 DocType: Naming Series,Series List for this Transaction,या व्यवहारासाठी मालिका यादी
 DocType: Company,Default Payroll Payable Account,डीफॉल्ट वेतनपट देय खाते
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ईमेल गट सुधारणा
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ईमेल गट सुधारणा
 DocType: Sales Invoice,Is Opening Entry,प्रवेश उघडत आहे
 DocType: Customer Group,Mention if non-standard receivable account applicable,गैर-मानक प्राप्त खाते लागू असल्यास उल्लेख करावा
 DocType: Course Schedule,Instructor Name,प्रशिक्षक नाव
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,कोठार सादर करा करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,विक्रेता
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","चेक केलेले असल्यास, साहित्य विनंत्या गैर-स्टॉक आयटम समाविष्ट होईल."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,विक्री चलन आयटम विरुद्ध
 ,Production Orders in Progress,प्रगती उत्पादन आदेश
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,आर्थिक निव्वळ रोख
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage पूर्ण आहे, जतन नाही"
 DocType: Lead,Address & Contact,पत्ता व संपर्क
 DocType: Leave Allocation,Add unused leaves from previous allocations,मागील वाटप पासून न वापरलेल्या पाने जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},पुढील आवर्ती {1} {0} वर तयार केले जाईल
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),एकूण कोस्टींग रक्कम (वेळ पत्रक द्वारे)
 DocType: Item Website Specification,Item Website Specification,आयटम वेबसाइट तपशील
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,रजा अवरोधित
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,बँक नोंदी
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},आयटम {0} ने त्याच्या जीवनाचा शेवट  {1} वर गाठला  आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,बँक नोंदी
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,वार्षिक
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,शेअर मेळ आयटम
 DocType: Stock Entry,Sales Invoice No,विक्री चलन क्रमांक
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,हब मध्ये प्रकाशित
 DocType: Student Admission,Student Admission,विद्यार्थी प्रवेश
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} आयटम रद्द
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,साहित्य विनंती
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} आयटम रद्द
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,साहित्य विनंती
 DocType: Bank Reconciliation,Update Clearance Date,अद्यतन लाभ तारीख
 DocType: Item,Purchase Details,खरेदी तपशील
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},आयटम {0} खरेदी ऑर्डर {1} मध्ये ' कच्चा माल पुरवठा ' टेबल मध्ये आढळला  नाही
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,थकबाकी चेक आणि स्पष्ट ठेवी
 DocType: Item,Synced With Hub,हबला  समक्रमित
 DocType: Vehicle,Fleet Manager,वेगवान व्यवस्थापक
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},पंक्ती # {0}: {1} आयटम नकारात्मक असू शकत नाही {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,चुकीचा संकेतशब्द
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},पंक्ती # {0}: {1} आयटम नकारात्मक असू शकत नाही {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,चुकीचा संकेतशब्द
 DocType: Item,Variant Of,जिच्यामध्ये variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',पूर्ण Qty  'Qty निर्मिती करण्या ' पेक्षा जास्त असू शकत नाही
 DocType: Period Closing Voucher,Closing Account Head,खाते प्रमुख बंद
 DocType: Employee,External Work History,बाह्य कार्य इतिहास
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,परिपत्रक संदर्भ त्रुटी
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,स्वयंचलित साहित्य विनंती निर्माण ईमेल द्वारे सूचित करा
 DocType: Journal Entry,Multi Currency,मल्टी चलन
 DocType: Payment Reconciliation Invoice,Invoice Type,चलन प्रकार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,डिलिव्हरी टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,डिलिव्हरी टीप
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,कर सेट अप
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,विक्री मालमत्ता खर्च
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,तुम्ही तो pull केल्यानंतर भरणा प्रवेशात   सुधारणा करण्यात आली आहे. तो पुन्हा  खेचा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
-DocType: Grade Interval,Min Score,मि धावसंख्या
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ने आयटम कर दोनदा प्रवेश केला
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,या आठवड्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Student Applicant,Admitted,दाखल
 DocType: Workstation,Rent Cost,भाडे खर्च
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,क्रम मूल्य
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,बँक / रोख पक्ष विरोधात किंवा अंतर्गत हस्तांतरण व्यवहार
 DocType: Shipping Rule,Valid for Countries,देश वैध
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,हा आयटम साचा आहे आणि व्यवहारात  वापरला  जाऊ शकत नाही. 'प्रत बनवू नका ' वर सेट केले नसेल आयटम गुणधर्म पर्यायी रूपांमध्ये प्रती कॉपी होईल
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,मानलेली  एकूण ऑर्डर
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","कर्मचारी नाव (उदा मुख्य कार्यकारी अधिकारी, संचालक इ)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,फील्ड मूल्य दिन 'म्हणून महिन्याच्या दिवसाची  पुनरावृत्ती' प्रविष्ट करा
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},सलग # {0}: चलन खरेदी विद्यमान मालमत्तेचे विरुद्ध केली जाऊ शकत नाही {1}
 DocType: Item Tax,Tax Rate,कर दर
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} आधीच कर्मचार्यांसाठी वाटप {1} काळात {2} साठी {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,आयटम निवडा
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,आयटम निवडा
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,चलन  खरेदी {0} आधीच सादर केलेला आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},रो # {0}: बॅच क्रमांक  {1} {2} ला  समान असणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,नॉन-गट रूपांतरित करा
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,एक आयटम बॅच (भरपूर).
 DocType: C-Form Invoice Detail,Invoice Date,चलन तारीख
 DocType: GL Entry,Debit Amount,डेबिट रक्कम
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},{0} {1} मधे प्रत्येक  कंपनीला 1 खाते असू शकते
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,कृपया संलग्नक पहा
 DocType: Purchase Order,% Received,% मिळाले
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,विद्यार्थी गट तयार करा
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,कोटेशन विनंती
 DocType: Salary Slip Timesheet,Working Hours,कामाचे तास
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,विद्यमान मालिकेत सुरू / वर्तमान क्रम संख्या बदला.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,एक नवीन ग्राहक तयार करा
-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.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,खरेदी ऑर्डर तयार करा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,एक नवीन ग्राहक तयार करा
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","अनेक किंमत नियम विजय सुरू केल्यास, वापरकर्त्यांना संघर्षाचे निराकरण करण्यासाठी स्वतः प्राधान्य सेट करण्यास सांगितले जाते."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,खरेदी ऑर्डर तयार करा
 ,Purchase Register,खरेदी नोंदणी
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,लागू असलेले शुल्क
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) 'रजा  मंजूर' भूमिका असणे आवश्यक आहे
 DocType: Purchase Receipt,Vehicle Date,वाहन तारीख
 DocType: Student Log,Medical,वैद्यकीय
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,तोट्याचे  कारण
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,तोट्याचे  कारण
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,आघाडी मालक लीड म्हणून समान असू शकत नाही
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,रक्कम unadjusted रक्कम अधिक करू शकता
 DocType: Announcement,Receiver,स्वीकारणारा
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,प्रमाण आणि दर
 DocType: Delivery Note,% Installed,% स्थापित
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,वर्ग / प्रयोगशाळा इत्यादी व्याख्याने होणार जाऊ शकतात.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,पहिल्या कंपनीचे नाव प्रविष्ट करा
 DocType: Purchase Invoice,Supplier Name,पुरवठादार नाव
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext मॅन्युअल वाचा
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,अनिवार्य फील्ड - शैक्षणिक वर्ष
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,अनिवार्य फील्ड - शैक्षणिक वर्ष
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,प्रास्ताविक मजकूर सानुकूलित करा जो ईमेलचा  एक भाग म्हणून जातो.   प्रत्येक व्यवहाराला स्वतंत्र प्रास्ताविक मजकूर आहे.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},कंपनी मुलभूत देय खाते सेट करा {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,सर्व उत्पादन प्रक्रिया साठीचे ग्लोबल सेटिंग्ज.
 DocType: Accounts Settings,Accounts Frozen Upto,खाती फ्रोजन पर्यंत
 DocType: SMS Log,Sent On,रोजी पाठविले
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,विशेषता {0} विशेषता टेबल अनेक वेळा निवडले
 DocType: HR Settings,Employee record is created using selected field. ,कर्मचारी रेकॉर्ड निवडलेले  फील्ड वापरून तयार आहे.
 DocType: Sales Order,Not Applicable,लागू नाही
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,सुट्टी मास्टर.
 DocType: Request for Quotation Item,Required Date,आवश्यक तारीख
 DocType: Delivery Note,Billing Address,बिलिंग पत्ता
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,आयटम कोड प्रविष्ट करा.
 DocType: BOM,Costing,भांडवलाच्या
 DocType: Tax Rule,Billing County,बिलिंग परगणा
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","तपासल्यास आधीच प्रिंट रेट / प्रिंट रक्कम समाविष्ट म्हणून, कर रक्कम विचारात घेतली जाईल"
@@ -508,6 +512,7 @@
 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,सिक्युरिटीज आणि ठेवी
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", बदलू शकत नाही मूल्यांकन पद्धत काही आयटम विरुद्ध व्यवहार जे नाही आहेत म्हणून स्वत: च्या मूल्यांकन पद्धत आहे"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,वाटप एकूण रजा  अनिवार्य आहे
 DocType: Job Opening,Description of a Job Opening,एक जॉब ओपनिंग वर्णन
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,आज प्रलंबित उपक्रम
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,कृपया कोर्स निवडा
 DocType: Timesheet Detail,Hrs,तास
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,कृपया कंपनी निवडा
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,कृपया कंपनी निवडा
 DocType: Stock Entry Detail,Difference Account,फरक खाते
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,त्याच्या भोवतालची कार्य {0} बंद नाही म्हणून बंद कार्य करू शकत नाही.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ज्या  वखाराविरुद्ध साहित्य विनंती उठविली  जाईल ते  प्रविष्ट करा
 DocType: Production Order,Additional Operating Cost,अतिरिक्त कार्यकारी खर्च
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,सौंदर्यप्रसाधन
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","विलीन करण्यासाठी, खालील गुणधर्म दोन्ही आयटम समान असणे आवश्यक आहे"
 DocType: Shipping Rule,Net Weight,नेट वजन
 DocType: Employee,Emergency Phone,आणीबाणी फोन
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,खरेदी
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,सुरूवातीचे 0% ग्रेड व्याख्या करा
 DocType: Sales Order,To Deliver,वितरीत करण्यासाठी
 DocType: Purchase Invoice Item,Item,आयटम
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,सिरियल नाही आयटम एक अपूर्णांक असू शकत नाही
 DocType: Journal Entry,Difference (Dr - Cr),फरक  (Dr - Cr)
 DocType: Account,Profit and Loss,नफा व तोटा
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,व्यवस्थापकीय Subcontracting
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,बढती 0 असू शकत नाही
 DocType: Production Planning Tool,Material Requirement,साहित्य आवश्यकता
 DocType: Company,Delete Company Transactions,कंपनी व्यवहार हटवा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,संदर्भ व संदर्भ तारीख बँक व्यवहार अनिवार्य आहे
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,कर आणि शुल्क जोडा / संपादित करा
 DocType: Purchase Invoice,Supplier Invoice No,पुरवठादार चलन क्रमांक
 DocType: Territory,For reference,संदर्भासाठी
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,प्रतिष्ठापन टीप आयटम
 DocType: Production Plan Item,Pending Qty,प्रलंबित Qty
 DocType: Budget,Ignore,दुर्लक्ष करा
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} सक्रिय नाही
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} सक्रिय नाही
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},एसएमएस खालील संख्येला  पाठविले: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,मुद्रणासाठी सेटअप तपासणी परिमाणे
 DocType: Salary Slip,Salary Slip Timesheet,पगाराच्या स्लिप्स Timesheet
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,एकूण आयोग
 DocType: Pricing Rule,Sales Partner,विक्री भागीदार
 DocType: Buying Settings,Purchase Receipt Required,खरेदी पावती आवश्यक
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,शेअर उघडत प्रविष्ट केले असतील तर मूल्यांकन दर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,चलन टेबल मधे  रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,कृपया पहिले कंपनी आणि पक्षाचे प्रकार निवडा
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,आर्थिक / लेखा वर्षी.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,जमा मूल्ये
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","क्षमस्व, सिरीयल क्रमांक विलीन करणे शक्य नाही"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,विक्री ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,विक्री ऑर्डर करा
 DocType: Project Task,Project Task,प्रकल्प कार्य
 ,Lead Id,लीड आयडी
 DocType: C-Form Invoice Detail,Grand Total,एकूण
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,सारांश संलग्नक
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ग्राहक पुन्हा करा
 DocType: Leave Control Panel,Allocate,वाटप
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,विक्री परत
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,विक्री परत
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,टीप: एकूण वाटप पाने {0} आधीच मंजूर पाने कमी असू नये {1} कालावधीसाठी
 DocType: Announcement,Posted By,द्वारा पोस्ट केलेले
 DocType: Item,Delivered by Supplier (Drop Ship),पुरवठादार द्वारे वितरित (ड्रॉप जहाज)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,करण्यासाठी कोटेशन
 DocType: Lead,Middle Income,मध्यम उत्पन्न
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),उघडणे (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,रक्कम नकारात्मक असू शकत नाही
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कंपनी सेट करा
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,कंपनी सेट करा
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,विक्री चलन Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0} साठी  संदर्भ क्रमांक  आणि संदर्भ तारीख आवश्यक आहे
 DocType: Process Payroll,Select Payment Account to make Bank Entry,भरणा खाते निवडा बँक प्रवेश करण्यासाठी
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","पाने, खर्च दावे आणि उपयोग पे रोल व्यवस्थापित करण्यासाठी कर्मचारी रेकॉर्ड तयार"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,नॉलेज बेस जोडा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,प्रस्ताव लेखन
 DocType: Payment Entry Deduction,Payment Entry Deduction,भरणा प्रवेश कापून
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' आथिर्क वर्षात नाही {2}
 DocType: Buying Settings,Settings for Buying Module,विभाग खरेदी साठी सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},मालमत्ता {0} कंपनी संबंधित नाही {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,पहिले           खरेदी पावती प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","त्यानंतर किंमत नियम ग्राहक, ग्राहक गट, प्रदेश पुरवठादार, पुरवठादार प्रकार, मोहीम, विक्री भागीदार   इ  वर आधारित बाहेर फिल्टर आहेत"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,यादी निव्वळ बदला
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,कर्मचारी कर्ज व्यवस्थापन
 DocType: Employee,Passport Number,पासपोर्ट क्रमांक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 संबंध
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,व्यवस्थापक
 DocType: Payment Entry,Payment From / To,भरणा / मधून
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,तारीख श्रेणी
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},नवीन क्रेडिट मर्यादा ग्राहक वर्तमान थकबाकी रक्कम कमी आहे. क्रेडिट मर्यादा किमान असणे आवश्यक आहे {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'आधारीत' आणि 'गट करून' समान असू शकत नाही
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,मिनिटे
 DocType: Issue,Resolution Date,ठराव तारीख
 DocType: Student Batch Name,Batch Name,बॅच नाव
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet तयार:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet तयार:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},मोड ऑफ पेमेंट्स मध्ये डीफॉल्ट रोख किंवा बँक खाते सेट करा {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,नाव नोंदणी करा
 DocType: Selling Settings,Customer Naming By,करून ग्राहक नामांकन
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,विद्यार्थी मासिक उपस्थिती अहवाल म्हणून सादर विद्यार्थी दर्शवेल
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,वास्तविक प्रारंभ वेळ
 DocType: BOM Operation,Operation Time,ऑपरेशन वेळ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,समाप्त
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,बेस
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,बेस
 DocType: Timesheet,Total Billed Hours,एकूण बिल आकारले तास
 DocType: Journal Entry,Write Off Amount,Write Off रक्कम
 DocType: Journal Entry,Bill No,बिल नाही
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,विद्यार्थी उपस्थिती
 DocType: Sales Invoice Timesheet,Time Sheet,वेळ पत्रक
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush कच्चा माल आधारित रोजी
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,आयटम तपशील प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,आयटम तपशील प्रविष्ट करा
 DocType: Interest,Interest,व्याज
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,पूर्व विक्री
 DocType: Purchase Receipt,Other Details,इतर तपशील
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,भरणा प्रवेश आधीच तयार आहे
 DocType: Purchase Receipt Item Supplied,Current Stock,वर्तमान शेअर
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},सलग # {0}: {1} मालमत्ता आयटम लिंक नाही {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,पूर्वावलोकन पगाराच्या स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,खाते {0} अनेक वेळा प्रविष्ट केले गेले आहे
 DocType: Account,Expenses Included In Valuation,खर्च मूल्यांकन मध्ये समाविष्ट
 DocType: Hub Settings,Seller City,विक्रेता सिटी
 ,Absent Student Report,अनुपस्थित विद्यार्थी अहवाल
 DocType: Email Digest,Next email will be sent on:,पुढील ई-मेल वर पाठविण्यात येईल:
 DocType: Offer Letter Term,Offer Letter Term,पत्र मुदत ऑफर
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,आयटमला रूपे आहेत.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,आयटमला रूपे आहेत.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,आयटम {0} आढळला नाही
 DocType: Bin,Stock Value,शेअर मूल्य
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,कंपनी {0} अस्तित्वात नाही
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,वृक्ष प्रकार
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,कृपया निवडा कार्यक्रम
 DocType: Project,Estimated Cost,अंदाजे खर्च
@@ -769,7 +771,7 @@
 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,मुलभूत खाते
 DocType: Payment Entry,Received Amount (Company Currency),प्राप्त केलेली रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,संधी आघाडी केले आहे तर आघाडी सेट करणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,कृपया साप्ताहिक बंद दिवस निवडा
 DocType: Production Order Operation,Planned End Time,नियोजनबद्ध समाप्ती वेळ
 ,Sales Person Target Variance Item Group-Wise,आयटम गट निहाय विक्री व्यक्ती लक्ष्य फरक
@@ -785,6 +787,7 @@
 DocType: Opportunity,Opportunity From,पासून संधी
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,मासिक पगार विधान.
 DocType: BOM,Website Specifications,वेबसाइट वैशिष्ट्य
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} पासून {1} प्रकारच्या
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,रो {0}: रूपांतरण फॅक्टर अनिवार्य आहे
@@ -819,6 +822,7 @@
 DocType: Employee,Bank A/C No.,बँक / सी क्रमांक
 DocType: Bank Guarantee,Project,प्रकल्प
 DocType: Quality Inspection Reading,Reading 7,7 वाचन
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,अंशतः मागणी
 DocType: Expense Claim Detail,Expense Claim Type,खर्च हक्क प्रकार
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,हे खरेदी सूचीत टाका साठी मुलभूत सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},मालमत्ता जर्नल प्रवेश द्वारे रद्द {0}
@@ -826,14 +830,14 @@
 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 +107,Office Maintenance Expenses,कार्यालय देखभाल खर्च
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ईमेल खाते सेट अप करत आहे
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,पहिल्या आयटम लिस्ट मधे प्रविष्ट करा
 DocType: Account,Liability,दायित्व
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,मंजूर रक्कम रो {0} मधे मागणी रक्कमेपेक्षा  जास्त असू शकत नाही.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,किंमत सूची निवडलेली  नाही
 DocType: Employee,Family Background,कौटुंबिक पार्श्वभूमी
 DocType: Request for Quotation Supplier,Send Email,ईमेल पाठवा
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},चेतावणी: अवैध संलग्नक {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,कोणतीही परवानगी नाही
 DocType: Company,Default Bank Account,मुलभूत बँक खाते
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","पार्टी आधारित फिल्टर कर यासाठी,   पहिले पार्टी पयायय टाइप करा"
@@ -846,8 +850,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,कर्मचारी आढळले  नाहीत
 DocType: Supplier Quotation,Stopped,थांबवले
 DocType: Item,If subcontracted to a vendor,विक्रेता करण्यासाठी subcontracted असेल  तर
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,विद्यार्थी गट आधीपासूनच सुधारित केले आहे.
 DocType: SMS Center,All Customer Contact,सर्व ग्राहक संपर्क
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,csv द्वारे स्टॉक शिल्लक अपलोड करा.
 DocType: Warehouse,Tree Details,झाड तपशील
@@ -858,8 +862,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,किमान चलन रक्कम
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: खर्च केंद्र {2} कंपनी संबंधित नाही {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: खाते {2} एक गट असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,आयटम रो {idx}: {doctype} {docName} वरील अस्तित्वात नाही &#39;{doctype}&#39; टेबल
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} आधीच पूर्ण किंवा रद्द
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,कोणतीही कार्ये
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ऑटो अशी यादी तयार करणे 05, 28 इत्यादी उदा निर्माण होणार महिन्याचा दिवस"
 DocType: Asset,Opening Accumulated Depreciation,जमा घसारा उघडत
@@ -875,7 +879,7 @@
 DocType: Bin,Moving Average Rate,हलवित/Moving सरासरी  दर
 DocType: Production Planning Tool,Select Items,निवडा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} बिल विरुद्ध {1} दिनांक {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,अर्थात वेळापत्रक
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,अर्थात वेळापत्रक
 DocType: Maintenance Visit,Completion Status,पूर्ण स्थिती
 DocType: HR Settings,Enter retirement age in years,वर्षांत निवृत्तीचे वय प्रविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,लक्ष्य कोठार
@@ -883,7 +887,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,या टक्के पर्यंत डिलिव्हरी किंवा पावती अनुमती द्या
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,आयात हजेरी
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,सर्व आयटम गट
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,सर्व आयटम गट
 DocType: Process Payroll,Activity Log,क्रियाकलाप लॉग
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,निव्वळ नफा / तोटा
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,स्वयंचलितपणे व्यवहार सादर संदेश तयार करा.
@@ -894,7 +898,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,भरणा करण्यासाठी खरेदी
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,अंदाज Qty
 DocType: Sales Invoice,Payment Due Date,पैसे भरण्याची शेवटची तारिख
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,आयटम व्हेरियंट {0} आधीच समान गुणधर्म अस्तित्वात आहे
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;उघडणे&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,का मुक्त
 DocType: Notification Control,Delivery Note Message,डिलिव्हरी टीप संदेश
@@ -910,7 +914,7 @@
 DocType: Item Reorder,Re-Order Qty,पुन्हा-क्रम Qty
 DocType: Leave Block List Date,Leave Block List Date,रजा ब्लॉक यादी तारीख
 DocType: Pricing Rule,Price or Discount,किंमत किंवा सवलत
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,खरेदी पावती आयटम टेबल एकूण लागू शुल्क एकूण कर आणि शुल्क म्हणून समान असणे आवश्यक आहे
 DocType: Sales Team,Incentives,प्रोत्साहन
 DocType: SMS Log,Requested Numbers,विनंती संख्या
 DocType: Production Planning Tool,Only Obtain Raw Materials,फक्त कच्चा माल प्राप्त
@@ -939,13 +943,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted आहे
 DocType: Item Attribute,Item Attribute Values,आयटम विशेषता मूल्ये
 DocType: Examination Result,Examination Result,परीक्षेचा निकाल
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,खरेदी पावती
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,खरेदी पावती
 ,Received Items To Be Billed,बिल करायचे प्राप्त आयटम
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,सादर पगार स्लिप
 DocType: Employee,Ms,श्रीमती
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,चलन विनिमय दर मास्टर.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},संदर्भ Doctype एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},संदर्भ Doctype एक असणे आवश्यक आहे {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ऑपरेशन  {1} साठी पुढील {0} दिवसांत वेळ शोधू शकला नाही
 DocType: Production Order,Plan material for sub-assemblies,उप-विधानसभा योजना साहित्य
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,विक्री भागीदार आणि प्रदेश
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,खाते शेअर शिल्लक आधीच आहे म्हणून आपोआप खाते तयार करू शकत नाही. आपण या कोठार एक नोंद करण्यापूर्वी आपल्याला एक जुळणारे खाते तयार करणे आवश्यक
@@ -968,10 +972,9 @@
 DocType: Supplier,Default Payable Accounts,मुलभूत देय खाती
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,कर्मचारी {0} सक्रिय नाही आहे किंवा अस्तित्वात नाही
 DocType: Fee Structure,Components,घटक
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,आयटम रूपे {0} सुधारित
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},आयटम मध्ये मालमत्ता वर्ग प्रविष्ट करा {0}
 DocType: Quality Inspection Reading,Reading 6,6 वाचन
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,नाही {0} {1} {2} कोणत्याही नकारात्मक थकबाकी चलन करू शकता
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,चलन आगाऊ खरेदी
 DocType: Hub Settings,Sync Now,आता समक्रमण
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},रो {0}: क्रेडिट प्रवेश {1} सोबत  दुवा साधली  जाऊ शकत नाही
@@ -985,11 +988,11 @@
 DocType: Item,Is Purchase Item,खरेदी आयटम आहे
 DocType: Asset,Purchase Invoice,खरेदी चलन
 DocType: Stock Ledger Entry,Voucher Detail No,प्रमाणक तपशील नाही
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,नवीन विक्री चलन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,नवीन विक्री चलन
 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,उघडण्याची  तारीख आणि अखेरची दिनांक त्याच आर्थिक वर्षात  असावे
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,उघडण्याची  तारीख आणि अखेरची दिनांक त्याच आर्थिक वर्षात  असावे
 DocType: Lead,Request for Information,माहिती विनंती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,समक्रमण ऑफलाइन पावत्या
 DocType: Payment Request,Paid,पेड
 DocType: Program Fee,Program Fee,कार्यक्रम शुल्क
 DocType: Salary Slip,Total in words,शब्दात एकूण
@@ -999,7 +1002,7 @@
 DocType: Employee Loan,Sanctioned,मंजूर
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","' उत्पादन बंडल ' आयटम, वखार , सिरीयल व बॅच नाही ' पॅकिंग यादी' टेबल पासून विचार केला जाईल. वखार आणि बॅच कोणत्याही ' उत्पादन बंडल ' आयटम सर्व पॅकिंग आयटम समान असतील तर, त्या मूल्ये मुख्य बाबींचा टेबल मध्ये प्रविष्ट केले जाऊ शकतात , मूल्ये टेबल ' यादी पॅकिंग ' कॉपी केली जाईल ."
 DocType: Job Opening,Publish on website,वेबसाइट वर प्रकाशित
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ग्राहकांना निर्यात.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,पुरवठादार चलन तारीख पोस्ट दिनांक पेक्षा जास्त असू शकत नाही
@@ -1010,7 +1013,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,फरक
 ,Company Name,कंपनी नाव
 DocType: SMS Center,Total Message(s),एकूण संदेशा  (चे)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,हस्तांतरणासाठी आयटम निवडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,जेथे चेक जमा होतात  ते  बँक प्रमुख खाते निवडा .
@@ -1021,8 +1024,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,रो {0}: विक्री / खरेदी आदेशा भरणा नेहमी आगाऊ म्हणून चिन्हांकित पाहिजे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,रासायनिक
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,मुलभूत बँक / रोख खाते आपोआप या मोडमध्ये निवडलेले असताना पगार जर्नल प्रवेश मध्ये सुधारीत केले जाईल.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ग्रेड कोड कालांतराने {0} इतर ग्रेड ग्रेड कालांतराने ओव्हरलॅप करत आहे. कालांतराने कृपया तपासा {0} आणि {1} आणि पुन्हा प्रयत्न करा
 DocType: BOM,Raw Material Cost(Company Currency),कच्चा माल खर्च (कंपनी चलन)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,सर्व आयटम आधीच या उत्पादन ऑर्डर बदल्या करण्यात आल्या आहेत.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},पंक्ती # {0}: दर वापरले दर पेक्षा जास्त असू शकत नाही {1} {2}
@@ -1035,14 +1036,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM वेबसाइट बाबींचा
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,आपले पत्र डोके आणि लोगो अपलोड करा. (आपण नंतर संपादित करू शकता).
 DocType: Timesheet Detail,Bill,बिल
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,पुढील घसारा तारीख मागील तारीख प्रवेश केला आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,व्हाइट
 DocType: SMS Center,All Lead (Open),सर्व लीड (उघडा)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),सलग {0}: प्रमाण उपलब्ध नाही {4} कोठार मध्ये {1} नोंद वेळ पोस्ट करण्यात ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,सुधारण अदा करा
 DocType: Item,Automatically Create New Batch,नवीन बॅच आपोआप तयार करा
 DocType: Item,Automatically Create New Batch,नवीन बॅच आपोआप तयार करा
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,करा
 DocType: Student Admission,Admission Start Date,प्रवेश प्रारंभ तारीख
 DocType: Journal Entry,Total Amount in Words,शब्द एकूण रक्कम
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,एक त्रुटी होती . एक संभाव्य कारण तुम्ही  फॉर्म जतन केले नाहीत हे असू शकते. समस्या कायम राहिल्यास support@erpnext.com येथे संपर्क साधा.
@@ -1050,7 +1051,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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 उघडणे
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,रक्कम बदल खाते प्रविष्ट करा
 DocType: Student Batch Name,Student Batch Name,विद्यार्थी बॅच नाव
 DocType: Holiday List,Holiday List Name,सुट्टी यादी नाव
 DocType: Repayment Schedule,Balance Loan Amount,शिल्लक कर्ज रक्कम
@@ -1070,10 +1071,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},निर्दिष्ट करा एक {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,प्रमाणात किंवा मूल्यात बदल नसलेले   आयटम काढले    .
 DocType: Delivery Note,Delivery To,वितरण
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,विशेषता टेबल अनिवार्य आहे
 DocType: Production Planning Tool,Get Sales Orders,विक्री ऑर्डर मिळवा
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} नकारात्मक असू शकत नाही
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,सवलत
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,सवलत
 DocType: Asset,Total Number of Depreciations,Depreciations एकूण क्रमांक
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
 DocType: Sales Invoice Item,Rate With Margin,मार्जिन दर
@@ -1089,7 +1090,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,विक्री ऑर्डर / तयार वस्तू भांडार मध्ये राखीव कोठार
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,विक्री रक्कम
 DocType: Repayment Schedule,Interest Amount,व्याज रक्कम
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' अद्यतनित करा आणि जतन करा
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,आपण या रेकॉर्डसाठी खर्चाचे माफीचा साक्षीदार आहेत. 'स्थिती' अद्यतनित करा आणि जतन करा
 DocType: Serial No,Creation Document No,निर्मिती दस्तऐवज नाही
 DocType: Issue,Issue,अंक
 DocType: Asset,Scrapped,रद्द
@@ -1097,12 +1098,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","आयटम रूपे साठी विशेषता. उदा आकार, रंग इ"
 DocType: Purchase Invoice,Returns,परतावा
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP कोठार
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},सिरियल क्रमांक  {0} हा  {1} पर्यंत देखभाल करार अंतर्गत आहे
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},सिरियल क्रमांक  {0} हा  {1} पर्यंत देखभाल करार अंतर्गत आहे
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,भरती
 DocType: Lead,Organization Name,संस्थेचे नाव
 DocType: Tax Rule,Shipping State,शिपिंग राज्य
 ,Projected Quantity as Source,स्रोत म्हणून प्रक्षेपित प्रमाण
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,आयटम ' खरेदी पावत्यापासून  आयटम मिळवा' या बटणाचा   वापर करून समाविष्ट करणे आवश्यक आहे
 DocType: Employee,A-,अ-
 DocType: Production Planning Tool,Include non-stock items,नॉन-स्टॉक आयटम समाविष्ट करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,विक्री खर्च
@@ -1110,12 +1111,12 @@
 DocType: GL Entry,Against,विरुद्ध
 DocType: Item,Default Selling Cost Center,मुलभूत विक्री खर्च केंद्र
 DocType: Sales Partner,Implementation Partner,अंमलबजावणी भागीदार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,पिनकोड
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,पिनकोड
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},विक्री ऑर्डर {0} हे  {1}आहे
 DocType: Opportunity,Contact Info,संपर्क माहिती
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,शेअर नोंदी करून देणे
 DocType: Packing Slip,Net Weight UOM,नेट वजन UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} निकाल
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} निकाल
 DocType: Item,Default Supplier,मुलभूत पुरवठादार
 DocType: Manufacturing Settings,Over Production Allowance Percentage,उत्पादन भत्ता टक्केवारी प्रती
 DocType: Employee Loan,Repayment Schedule,परतफेड वेळापत्रकाच्या
@@ -1123,7 +1124,7 @@
 DocType: Holiday List,Get Weekly Off Dates,साप्ताहिक बंद तारखा मिळवा
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,समाप्ती तारीख प्रारंभ तारखेच्या पेक्षा कमी असू शकत नाही
 DocType: Sales Person,Select company name first.,प्रथम  कंपनीचे नाव निवडा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,डॉ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,डॉ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,अवतरणे पुरवठादारांकडून   प्राप्त झाली.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},करण्यासाठी {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,सरासरी वय
@@ -1143,7 +1144,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,की कामगिरी क्षेत्र
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,वाहतूक
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,अवैध विशेषता
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} सादर करणे आवश्यक आहे
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},प्रमाणात या पेक्षा कमी किंवा या समान असणे आवश्यक आहे {0}
 DocType: SMS Center,Total Characters,एकूण वर्ण
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},कृपया आयटम {0} साठी BOM क्षेत्रात BOM निवडा
@@ -1154,7 +1155,7 @@
 DocType: Sales Partner,Distributor,वितरक
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,हे खरेदी सूचीत टाका शिपिंग नियम
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,उत्पादन ऑर्डर {0} या विक्री ऑर्डरआधी  रद्द आधी रद्द करणे आवश्यक आहे
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',कृपया 'वर अतिरिक्त सवलत लागू करा'  सेट  करा
 ,Ordered Items To Be Billed,आदेश दिलेले  आयटम बिल करायचे
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,श्रेणी पासून श्रेणी पर्यंत कमी असली पाहिजे
 DocType: Global Defaults,Global Defaults,ग्लोबल डीफॉल्ट
@@ -1164,7 +1165,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,प्रारंभ वर्ष
 DocType: Purchase Invoice,Start date of current invoice's period,चालू चलन च्या कालावधी प्रारंभ तारीख
 DocType: Salary Slip,Leave Without Pay,पे न करता रजा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,क्षमता नियोजन त्रुटी
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,क्षमता नियोजन त्रुटी
 ,Trial Balance for Party,पार्टी चाचणी शिल्लक
 DocType: Lead,Consultant,सल्लागार
 DocType: Salary Slip,Earnings,कमाई
@@ -1179,7 +1180,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","हा  जिच्यामध्ये variant आयटम कोड आहे त्यासाठी जोडला  जाईल. उदाहरणार्थ जर आपला  संक्षेप ""SM"", आहे आणि , आयटम कोड ""टी-शर्ट"", ""टी-शर्ट-एम"" असेल जिच्यामध्ये variant आयटम कोड आहे"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,आपल्या  पगाराच्या स्लिप्स  एकदा जतन केल्यावर  निव्वळ वेतन ( शब्दांत ) दृश्यमान होईल.
 DocType: Purchase Invoice,Is Return,परत आहे
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,परत / डेबिट टीप
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,परत / डेबिट टीप
 DocType: Price List Country,Price List Country,किंमत यादी देश
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} हा आयटम {1} साठी वैध सिरीयल क्रमांक आहे
@@ -1189,11 +1190,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,बॅच क्रमांक आयटम कोड प्रविष्ट करा
 DocType: Stock Settings,Default Item Group,मुलभूत आयटम गट
 DocType: Employee Loan,Partially Disbursed,अंशत: वाटप
-DocType: Grading Structure,Grading System Name,ग्रेडिंग प्रणाली नाव
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,पुरवठादार डेटाबेस.
 DocType: Account,Balance Sheet,ताळेबंद
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',खर्च केंद्र आयटम साठी  'आयटम कोड' बरोबर
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",भरणा मोड कॉन्फिगर केलेली नाही. खाते मोड ऑफ पेमेंट्स किंवा पीओएस प्रोफाइल वर सेट केली गेली आहे का ते कृपया तपासा.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,आपल्या  विक्री व्यक्तीला  ग्राहक संपर्क साधण्यासाठी या तारखेला एक स्मरणपत्र मिळेल
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,सारख्या आयटमचा एकाधिक वेळा प्रविष्ट करणे शक्य नाही.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","पुढील खाती गट अंतर्गत केले जाऊ शकते, पण नोंदी नॉन-गट  करू शकता"
@@ -1205,7 +1205,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,शेअर लेजर नोंदी आणि जी नोंदी निवडलेल्या खरेदी पावत्या साठी पुन्हा पोस्ट केले आहेत
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,शेअर लेजर नोंदी आणि जी नोंदी निवडलेल्या खरेदी पावत्या साठी पुन्हा पोस्ट केले आहेत
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,आयटम 1
 DocType: Holiday,Holiday,सुट्टी
 DocType: Support Settings,Close Issue After Days,अंक दिवसांनी बंद करा
@@ -1232,11 +1232,11 @@
 DocType: Maintenance Visit Purpose,Work Done,कार्य पूर्ण झाले
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,विशेषता टेबल मध्ये किमान एक गुणधर्म निर्दिष्ट करा
 DocType: Announcement,All Students,सर्व विद्यार्थी
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} आयटम एक नॉन-स्टॉक आयटम असणे आवश्यक आहे
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,लेजर पहा
 DocType: Grading Scale,Intervals,कालांतराने
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,लवकरात लवकर
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","आयटम त्याच नावाने अस्तित्वात  असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,विद्यार्थी भ्रमणध्वनी क्रमांक
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,उर्वरित जग
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,आयटम {0} बॅच असू शकत नाही
@@ -1276,9 +1276,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},ते {0} पासून पगार भरणा {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},गोठविलेले खाते   {0}  संपादित करण्यासाठी आपण अधिकृत नाही
 DocType: Journal Entry,Get Outstanding Invoices,थकबाकी पावत्या मिळवा
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,विक्री ऑर्डर {0} वैध नाही
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,खरेदी आदेश योजना मदत आणि आपल्या खरेदी पाठपुरावा
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","क्षमस्व, कंपन्या विलीन करणे शक्य नाही"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",एकूण अंक / हस्तांतरण प्रमाणात{0} साहित्य विनंती {1} मध्ये  \ विनंती प्रमाण {2} पेक्षा आयटम{3} साठी    जास्त असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,लहान
@@ -1299,10 +1299,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,अप्रत्यक्ष खर्च
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,रो {0}: Qty अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,कृषी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,समक्रमण मास्टर डेटा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,समक्रमण मास्टर डेटा
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,आपली उत्पादने किंवा सेवा
 DocType: Mode of Payment,Mode of Payment,मोड ऑफ पेमेंट्स
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,वेबसाइट प्रतिमा सार्वजनिक फाइल किंवा वेबसाइट URL असावी
 DocType: Student Applicant,AP,आंध्र प्रदेश
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,हा रूट आयटम गट आहे आणि संपादित केला जाऊ शकत नाही.
@@ -1320,18 +1320,18 @@
 DocType: Student Group Student,Group Roll Number,गट आसन क्रमांक
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, फक्त क्रेडिट खात्यांच्या दुसऱ्या नावे नोंद लिंक जाऊ शकते"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,सर्व कार्य वजन एकूण असू 1. त्यानुसार सर्व प्रकल्प कार्ये वजन समायोजित करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,"डिलिव्हरी टीप {0} सबमिट केलेली नाही,"
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","किंमत नियम 'रोजी लागू करा' field वर  आधारित पहिले निवडलेला आहे , जो आयटम, आयटम गट किंवा ब्रॅण्ड असू शकतो"
 DocType: Hub Settings,Seller Website,विक्रेता वेबसाइट
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,विक्री संघ एकूण वाटप टक्केवारी 100 असावे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},उत्पादन आदेश स्थिती {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},उत्पादन आदेश स्थिती {0}
 DocType: Appraisal Goal,Goal,लक्ष्य
 DocType: Sales Invoice Item,Edit Description,वर्णन संपादित करा
 ,Team Updates,टीम सुधारणा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,पुरवठादार साठी
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,पुरवठादार साठी
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,खाते प्रकार सेट करणे हे व्यवहारामधील account निवडण्यास मदत करते.
 DocType: Purchase Invoice,Grand Total (Company Currency),एकूण (कंपनी चलन)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,प्रिंट स्वरूप तयार करा
@@ -1347,7 +1347,7 @@
 DocType: Depreciation Schedule,Journal Entry,जर्नल प्रवेश
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} प्रगतीपथावर आयटम
 DocType: Workstation,Workstation Name,वर्कस्टेशन नाव
-DocType: Grade Interval,Grade Code,ग्रेड कोड
+DocType: Grading Scale Interval,Grade Code,ग्रेड कोड
 DocType: POS Item Group,POS Item Group,POS बाबींचा गट
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ई-मेल सारांश:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} आयटम संबंधित नाही {1}
@@ -1364,7 +1364,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,हार्डवेअर
 DocType: Sales Order,Recurring Upto,आवर्ती पर्यंत
 DocType: Attendance,HR Manager,एचआर व्यवस्थापक
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,कृपया कंपनी निवडा
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,कृपया कंपनी निवडा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,रजा
 DocType: Purchase Invoice,Supplier Invoice Date,पुरवठादार चलन तारीख
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,आपण हे खरेदी सूचीत टाका सक्षम करणे आवश्यक आहे
@@ -1380,7 +1380,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,अन्न
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing श्रेणी 3
 DocType: Maintenance Schedule Item,No of Visits,भेटी क्रमांक
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,मार्क हजेरी
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,मार्क हजेरी
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,नोंदणी विद्यार्थी
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},बंद खात्याचे चलन {0} असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},सर्व goalsसाठी  गुणांची  सम 100 असावी.  हे  {0} आहे
@@ -1405,7 +1406,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,सरासरी दैनिक जाणारे
 DocType: POS Profile,Campaign,मोहीम
 DocType: Supplier,Name and Type,नाव आणि प्रकार
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',मंजूरीची स्थिती &#39;मंजूर&#39; किंवा &#39;नाकारलेली&#39; करणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',मंजूरीची स्थिती &#39;मंजूर&#39; किंवा &#39;नाकारलेली&#39; करणे आवश्यक आहे
 DocType: Purchase Invoice,Contact Person,संपर्क व्यक्ती
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','अपेक्षित प्रारंभ तारीख' ही 'अपेक्षित शेवटची तारीख' पेक्षा जास्त असू शकत नाही.
 DocType: Course Scheduling Tool,Course End Date,अर्थात अंतिम तारीख
@@ -1428,14 +1429,15 @@
 DocType: Sales Invoice,Shipping Address Name,शिपिंग पत्ता नाव
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,लेखा चार्ट
 DocType: Material Request,Terms and Conditions Content,अटी आणि शर्ती सामग्री
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,पेक्षा जास्त 100 असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} आयटम स्टॉक आयटम नाही
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,मालकीचे
 DocType: Salary Detail,Depends on Leave Without Pay,वेतन न करता सोडा अवलंबून असते
 DocType: Pricing Rule,"Higher the number, higher the priority","उच्च संख्या, जास्त प्राधान्य"
 ,Purchase Invoice Trends,चलन  खरेदी ट्रेन्ड्स
 DocType: Employee,Better Prospects,उत्तम प्रॉस्पेक्ट
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","पंक्ती # {0}: बॅच {1} फक्त {2} प्रमाण आहे. कृपया {3} प्रमाण उपलब्ध आहे, जे आणखी एक बॅच निवडा किंवा अनेक बॅचेस पासून / वितरीत करण्यासाठी समस्या, अनेक पंक्ती मध्ये सलग विभाजन"
 DocType: Vehicle,License Plate,परवाना प्लेट
 DocType: Appraisal,Goals,गोल
 DocType: Warranty Claim,Warranty / AMC Status,हमी / जेथे एएमसी स्थिती
@@ -1453,7 +1455,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,कर्मचारी स्वत: ला तक्रार करू शकत नाही.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","खाते गोठविले तर, नोंदी मर्यादित वापरकर्त्यांना परवानगी आहे."
 DocType: Email Digest,Bank Balance,बँक बॅलन्स
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Accounting प्रवेश  {0}: {1} साठी फक्त चलन {2} मधे केले जाऊ शकते
 DocType: Job Opening,"Job profile, qualifications required etc.","कामाचे, पात्रता आवश्यक इ"
 DocType: Journal Entry Account,Account Balance,खाते शिल्लक
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,व्यवहार कर नियम.
@@ -1464,7 +1466,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,बंद न केलेली आथिर्क वर्षात पी &amp; एल शिल्लक दर्शवा
 DocType: Shipping Rule,Shipping Account,शिपिंग खाते
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: खाते {2} निष्क्रिय आहे
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,विक्री आदेश आपण आपले कार्य योजना आणि मदत ऑन वेळ वितरीत करण्यासाठी करा
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,विक्री आदेश आपण आपले कार्य योजना आणि मदत ऑन वेळ वितरीत करण्यासाठी करा
 DocType: Quality Inspection,Readings,वाचन
 DocType: Stock Entry,Total Additional Costs,एकूण अतिरिक्त खर्च
 DocType: Course Schedule,SH,एस एच
@@ -1475,7 +1477,7 @@
 DocType: Shipping Rule Condition,To Value,मूल्य
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,पॅकिंग स्लिप्स
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,पॅकिंग स्लिप्स
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,कार्यालय भाडे
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,सेटअप एसएमएस गेटवे सेटिंग
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,आयात अयशस्वी!
@@ -1497,11 +1499,11 @@
 DocType: Company,Services,सेवा
 DocType: HR Settings,Email Salary Slip to Employee,कर्मचारी ईमेल पगाराच्या स्लिप्स
 DocType: Cost Center,Parent Cost Center,पालक खर्च केंद्र
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,संभाव्य पुरवठादार निवडा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,संभाव्य पुरवठादार निवडा
 DocType: Sales Invoice,Source,स्रोत
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,बंद शो
 DocType: Leave Type,Is Leave Without Pay,पे न करता सोडू आहे
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,मालमत्ता वर्ग मुदत मालमत्ता आयटम अनिवार्य आहे
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,भरणा टेबल मधे रेकॉर्ड आढळले नाहीत
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},या {0} संघर्ष {1} साठी {2} {3}
 DocType: Student Attendance Tool,Students HTML,विद्यार्थी HTML
@@ -1519,7 +1521,7 @@
 DocType: Student,Date of Leaving,सोडून दिनांक
 DocType: Pricing Rule,For Price List,किंमत सूची
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,कार्यकारी शोध
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,निष्पन्न तयार करा
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,निष्पन्न तयार करा
 DocType: Maintenance Schedule,Schedules,वेळापत्रक
 DocType: Purchase Invoice Item,Net Amount,निव्वळ रक्कम
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM तपशील नाही
@@ -1547,9 +1549,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,कार्यक्रम नामांकनाची
 DocType: Sales Invoice Item,Brand Name,ब्रँड नाव
 DocType: Purchase Receipt,Transporter Details,वाहतुक तपशील
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,मुलभूत कोठार निवडलेले आयटम आवश्यक आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,बॉक्स
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,शक्य पुरवठादार
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,शक्य पुरवठादार
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,संघटना
 DocType: Budget,Monthly Distribution,मासिक वितरण
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,स्वीकारणार्याची सूची रिक्त आहे. स्वीकारणारा यादी तयार करा
@@ -1557,8 +1559,8 @@
 DocType: Sales Partner,Sales Partner Target,विक्री भागीदार लक्ष्य
 DocType: Loan Type,Maximum Loan Amount,कमाल कर्ज रक्कम
 DocType: Pricing Rule,Pricing Rule,किंमत नियम
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},विद्यार्थी रोल नंबर डुप्लिकेट {0}
 DocType: Budget,Action if Annual Budget Exceeded,कृती वार्षिक अर्थसंकल्प ओलांडला तर
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ऑर्डर खरेदी करण्यासाठी साहित्य विनंती
 DocType: Shopping Cart Settings,Payment Success URL,भरणा यशस्वी URL मध्ये
@@ -1579,9 +1581,9 @@
 DocType: Employee Loan,Repayment Method,परतफेड पद्धत
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","चेक केलेले असल्यास, मुख्यपृष्ठ वेबसाइट मुलभूत बाबींचा गट असेल"
 DocType: Quality Inspection Reading,Reading 4,4 वाचन
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},साठी {0} प्रकल्प आढळले नाही डीफॉल्ट BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},साठी {0} प्रकल्प आढळले नाही डीफॉल्ट BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,कंपनी खर्च दावे.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","विद्यार्थी प्रणाली हृदय आहात, आपली सर्व विद्यार्थ्यांना जोडा"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","विद्यार्थी प्रणाली हृदय आहात, आपली सर्व विद्यार्थ्यांना जोडा"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},सलग # {0}: निपटारा तारीख {1} धनादेश तारीख असू शकत नाही {2}
 DocType: Company,Default Holiday List,सुट्टी यादी डीफॉल्ट
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},सलग {0}: कडून वेळ आणि वेळ {1} आच्छादित आहे {2}
@@ -1593,21 +1595,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,आपण ज्या दिवशी रजेचे  अर्ज करत आहात  ते दिवस  सुटीचे  आहेत. आपण रजा अर्ज करण्याची गरज नाही.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,भरणा ईमेल पुन्हा पाठवा
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,नवीन कार्य
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,कोटेशन करा
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,कोटेशन करा
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,इतर अहवाल
 DocType: Dependent Task,Dependent Task,अवलंबित कार्य
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},रूपांतरण घटक माप मुलभूत युनिट साठी सलग {0} मधे 1 असणे आवश्यक आहे
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} प्रकारच्या रजा  {1} पेक्षा  जास्त असू शकत नाही
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,आगाऊ एक्स दिवस ऑपरेशन नियोजन प्रयत्न करा.
 DocType: HR Settings,Stop Birthday Reminders,थांबवा वाढदिवस स्मरणपत्रे
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},कंपनी मध्ये डीफॉल्ट वेतनपट देय खाते सेट करा {0}
 DocType: SMS Center,Receiver List,स्वीकारण्याची  यादी
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,आयटम शोध
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,आयटम शोध
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,नाश रक्कम
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,रोख निव्वळ बदला
 DocType: Assessment Plan,Grading Scale,प्रतवारी स्केल
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,आधीच पूर्ण
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,माप {0} युनिट रुपांतर फॅक्टर टेबलमधे  एका  पेक्षा अधिक प्रविष्ट केले गेले आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,आधीच पूर्ण
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},भरणा विनंती आधीपासूनच अस्तित्वात {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,जारी आयटम खर्च
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},प्रमाण {0} पेक्षा  जास्त असू शकत नाही
@@ -1639,12 +1641,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,वितरण प्रवेश करा
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,सलग  {0}: पुरवठादाराविरुद्ध  आगाऊ डेबिट करणे आवश्यक आहे
 DocType: Company,Default Values,मुलभूत मुल्य
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{वारंवारता} डायजेस्ट
 DocType: Expense Claim,Total Amount Reimbursed,एकूण रक्कम परत देऊन
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,हे या वाहन विरुद्ध नोंदी आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,गोळा
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},पुरवठादार विरुद्ध चलन {0} दिनांक {1}
 DocType: Customer,Default Price List,मुलभूत दर सूची
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,मालमत्ता चळवळ रेकॉर्ड {0} तयार
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,आपण हटवू शकत नाही आर्थिक वर्ष {0}. आर्थिक वर्ष {0} वैश्विक सेटिंग्ज मध्ये डीफॉल्ट म्हणून सेट केले आहे
 DocType: Journal Entry,Entry Type,प्रवेश प्रकार
 ,Customer Credit Balance,ग्राहक क्रेडिट शिल्लक
@@ -1664,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,कोणत्याही आयटमधे   प्रमाण किंवा मूल्यांमध्ये  बदल नाहीत .
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,अनिवार्य फील्ड - कार्यक्रम
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,अनिवार्य फील्ड - कार्यक्रम
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,हमी दावा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,हमी दावा
 ,Lead Details,लीड तपशील
 DocType: Salary Slip,Loan repayment,कर्जाची परतफेड
 DocType: Purchase Invoice,End date of current invoice's period,चालू चलन च्या कालावधी समाप्ती तारीख
@@ -1683,12 +1686,10 @@
 DocType: Employee,Permanent Address,स्थायी पत्ता
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",आगाऊ \ एकूण पेक्षा {2} विरुद्ध {0} {1} जास्त असू शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,कृपया आयटम कोड निवडा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,कृपया आयटम कोड निवडा
 DocType: Student Sibling,Studying in Same Institute,याच संस्थेचे शिकत
 DocType: Territory,Territory Manager,प्रदेश व्यवस्थापक
 DocType: Packed Item,To Warehouse (Optional),गुदाम (पर्यायी)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Payment Entry,Paid Amount (Company Currency),पेड रक्कम (कंपनी चलन)
 DocType: Purchase Invoice,Additional Discount,अतिरिक्त सवलत
 DocType: Selling Settings,Selling Settings,सेटिंग्ज विक्री
@@ -1698,9 +1699,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,टाका पहा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,विपणन खर्च
 ,Item Shortage Report,आयटम कमतरता अहवाल
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","वजनाचा उल्लेख आहे \ n कृपया खूप ""वजन UOM"" उल्लेख करा"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,साहित्य विनंती या शेअर नोंद करण्यासाठी   वापरले
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,पुढील घसारा तारीख नवीन मालमत्ता अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,पुढील घसारा तारीख नवीन मालमत्ता अनिवार्य आहे
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बॅच स्वतंत्र अभ्यासक्रम आधारित गट
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,प्रत्येक बॅच स्वतंत्र अभ्यासक्रम आधारित गट
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,एका  आयटम एकच एकक.
@@ -1717,9 +1718,7 @@
 DocType: Course Assessment Criteria,Weightage,वजन
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: &#39;नफा व तोटा&#39; खात्यासाठी खर्च केंद्र आवश्यक आहे {2}. कंपनी साठी डीफॉल्ट खर्च केंद्र सेट करा.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,एक ग्राहक गट त्याच नावाने अस्तित्वात असेल तर ग्राहक नाव बदला किंवा ग्राहक गट नाव बदला
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 वाचन
@@ -1736,7 +1735,7 @@
 ,Item-wise Sales Register,आयटमनूसार विक्री नोंदणी
 DocType: Asset,Gross Purchase Amount,एकूण खरेदी रक्कम
 DocType: Asset,Depreciation Method,घसारा पद्धत
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ऑफलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ऑफलाइन
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,हा कर बेसिक रेट मध्ये समाविष्ट केला आहे का ?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,एकूण लक्ष्य
 DocType: Program Course,Required,आवश्यक
@@ -1746,21 +1745,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,मेळ JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,बरेच स्तंभ. अहवाल निर्यात करा आणि एक स्प्रेडशीट अनुप्रयोग वापरून मुद्रित करा.
 DocType: Purchase Invoice Item,Batch No,बॅच नाही
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,एक ग्राहक पर्चेस विरुद्ध अनेक विक्री आदशची परवानगी द्या
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 DocType: Student Group Instructor,Student Group Instructor,विद्यार्थी गट प्रशिक्षक
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 मोबाइल नं
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,मुख्य
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,जिच्यामध्ये variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,मुख्य
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,जिच्यामध्ये variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,तुमचा व्यवहार वर मालिका संख्या सेट पूर्वपद
 DocType: Employee Attendance Tool,Employees HTML,कर्मचारी एचटीएमएल
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,मुलभूत BOM ({0}) या आयटम किंवा त्याच्या साचा सक्रिय असणे आवश्यक आहे
 DocType: Employee,Leave Encashed?,रजा  मिळविता?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,field पासून संधी अनिवार्य आहे
 DocType: Email Digest,Annual Expenses,वार्षिक खर्च
 DocType: Item,Variants,रूपे
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,खरेदी ऑर्डर करा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,खरेदी ऑर्डर करा
 DocType: SMS Center,Send To,पाठवा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},रजा प्रकार {0} साठी पुरेशी रजा शिल्लक नाही
 DocType: Payment Reconciliation Payment,Allocated amount,रक्कम
@@ -1768,7 +1766,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,कार्य प्रगती मध्ये असलेले कोठार सबमिट करण्यापूर्वी आवश्यक आहे
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,नोकरी साठी अर्जदार
 DocType: Purchase Order Item,Warehouse and Reference,वखार आणि संदर्भ
 DocType: Supplier,Statutory info and other general information about your Supplier,आपल्या पुरवठादार बद्दल वैधानिक माहिती आणि इतर सर्वसाधारण माहिती
@@ -1776,11 +1774,10 @@
 DocType: Item,Serial Nos and Batches,सिरियल क्र आणि बॅच
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,विद्यार्थी गट शक्ती
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,विद्यार्थी गट शक्ती
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,जर्नल विरुद्ध प्रवेश {0} कोणत्याही न जुळणारी {1} नोंद नाही
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,त्यावेळच्या
 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: Grading Structure,Grading Intervals,प्रतवारी मध्यांतरे
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,प्रविष्ट करा
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","सलग आयटम {0} साठी overbill करू शकत नाही {1} जास्त {2}. प्रती-बिलिंग परवानगी करण्यासाठी, सेटिंग्ज खरेदी सेट करा"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,आयटम किंवा वखार आधारित फिल्टर सेट करा
@@ -1792,17 +1789,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} सादर करणे आवश्यक आहे
 DocType: Authorization Control,Authorization Control,प्राधिकृत नियंत्रण
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},रो # {0}: नाकारलेले वखार नाकारले आयटम विरुद्ध अनिवार्य आहे {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,भरणा
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,आपल्या ऑर्डर व्यवस्थापित करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,भरणा
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,आपल्या ऑर्डर व्यवस्थापित करा
 DocType: Production Order Operation,Actual Time and Cost,वास्तविक वेळ आणि खर्च
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},जास्तीत जास्त {0} साहित्याची  विनंती आयटम {1} साठी  विक्री आदेशा विरुद्ध केली  जाऊ शकते {2}
 DocType: Employee,Salutation,नमस्कार
 DocType: Course,Course Abbreviation,अर्थात संक्षेप
 DocType: Student Leave Application,Student Leave Application,विद्यार्थी रजेचा अर्ज
 DocType: Item,Will also apply for variants,तसेच रूपे लागू राहील
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","मालमत्ता तो आधीपासूनच आहे म्हणून, रद्द करता येणार नाही {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},वर अर्धा दिवशी कर्मचारी {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},एकूण कामाचे तास कमाल कामाचे तास पेक्षा जास्त असू नये {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,रोजी
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,विक्रीच्या वेळी बंडल आयटम.
 DocType: Quotation Item,Actual Qty,वास्तविक Qty
 DocType: Sales Invoice Item,References,संदर्भ
@@ -1812,7 +1810,7 @@
 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 +91,Associate,सहकारी
 DocType: Asset Movement,Asset Movement,मालमत्ता चळवळ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,नवीन टाका
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,नवीन टाका
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} आयटम सिरीयलाइज आयटम नाही
 DocType: SMS Center,Create Receiver List,स्वीकारणारा यादी तयार करा
 DocType: Vehicle,Wheels,रणधुमाळी
@@ -1844,10 +1842,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,उत्पादन आदेश विरुद्ध वेळ नोंदी तयार करणे अक्षम करते .ऑपरेशन उत्पादन ऑर्डर विरुद्ध मागे काढला जाऊ नये
 DocType: Student,Student Mobile Number,विद्यार्थी मोबाइल क्रमांक
 DocType: Item,Has Variants,रूपे आहेत
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},आपण आधीच आयटम निवडले आहेत {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,मासिक वितरण नाव
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,बॅच आयडी आवश्यक आहे
 DocType: Sales Person,Parent Sales Person,पालक विक्री व्यक्ती
 DocType: Purchase Invoice,Recurring Invoice,आवर्ती चलन
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,प्रकल्प व्यवस्थापकीय
@@ -1855,11 +1853,11 @@
 DocType: Budget,Fiscal Year,आर्थिक वर्ष
 DocType: Vehicle Log,Fuel Price,इंधन किंमत
 DocType: Budget,Budget,अर्थसंकल्प
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,मुदत मालमत्ता आयटम नॉन-स्टॉक आयटम असणे आवश्यक आहे.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",प्राप्तिकर किंवा खर्च खाते नाही म्हणून बजेट विरुद्ध {0} नियुक्त केले जाऊ शकत नाही
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,साध्य
 DocType: Student Admission,Application Form Route,अर्ज मार्ग
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,प्रदेश / ग्राहक
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,प्रदेश / ग्राहक
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,उदा 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,सोडा प्रकार {0} तो वेतन न करता सोडू असल्यामुळे वाटप जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},सलग  {0}: रक्कम  {1}  थकबाकी रक्कम चलन {2} पेक्षा कमी किवा पेक्षा समान असणे आवश्यक आहे
@@ -1879,14 +1877,14 @@
 ,Serial No Status,सिरियल क्रमांक स्थिती
 DocType: Payment Entry Reference,Outstanding,शिल्लक
 ,Daily Timesheet Summary,दैनिक Timesheet सारांश
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","रो {0}: {1} periodicity सेट करण्यासाठी , पासून आणि पर्यंत  तारीख \ दरम्यानचा  फरक {2} पेक्षा मोठे किंवा समान असणे आवश्यक आहे"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,हा स्टॉक चळवळ आधारित आहे. पहा {0} तपशील
 DocType: Pricing Rule,Selling,विक्री
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},रक्कम {0} {1} विरुद्ध वजा {2}
 DocType: Employee,Salary Information,पगार माहिती
 DocType: Sales Person,Name and Employee ID,नाव आणि कर्मचारी आयडी
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,देय तारीख  पोस्ट करण्यापूर्वीची  तारीख असू शकत नाही
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,कर आणि कर्तव्ये
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,संदर्भ तारीख प्रविष्ट करा
@@ -1898,14 +1896,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,या शुल्क प्रकार चालू पंक्ती संख्या पेक्षा मोठे किंवा समान पंक्ती संख्या refer करू शकत नाही
 DocType: Asset,Sold,विक्री
 ,Item-wise Purchase History,आयटमनूसार खरेदी इतिहास
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},कृपया   आयटम {0} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},कृपया   आयटम {0} ला  जोडलेला सिरियल क्रमांक प्राप्त करण्यासाठी 'व्युत्पन्न वेळापत्रक' वर क्लिक करा
 DocType: Account,Frozen,फ्रोजन
 ,Open Production Orders,उत्पादन ऑर्डर ओपन करा
 DocType: Sales Invoice Payment,Base Amount (Company Currency),बेस रक्कम (कंपनी चलन)
 DocType: Payment Reconciliation Payment,Reference Row,संदर्भ पंक्ती
 DocType: Installation Note,Installation Time,प्रतिष्ठापन वेळ
 DocType: Sales Invoice,Accounting Details,लेखा माहिती
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ह्या कंपनीसाठी सर्व व्यवहार हटवा
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,गुंतवणूक
 DocType: Issue,Resolution Details,ठराव तपशील
@@ -1938,14 +1936,14 @@
 DocType: Discussion,Discussion,चर्चा
 DocType: Payment Entry,Transaction ID,Transaction ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,किंमत नियमांना   पुढील प्रमाणावर आधारित फिल्टर आहेत.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},कर्मचारी सामील तारीख सेट करा {0}
 DocType: Task,Total Billing Amount (via Time Sheet),एकूण बिलिंग रक्कम (वेळ पत्रक द्वारे)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ग्राहक महसूल पुन्हा करा
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'खर्च मंजूर' भूमिका असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 'खर्च मंजूर' भूमिका असणे आवश्यक आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,जोडी
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,उत्पादन BOM आणि प्रमाण निवडा
 DocType: Asset,Depreciation Schedule,घसारा वेळापत्रक
 DocType: Bank Reconciliation Detail,Against Account,खाते विरुद्ध
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,अर्धा दिवस तारीख पासून आणि तारिक करण्यासाठी दरम्यान असावे
@@ -1959,16 +1957,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},कंपनी मध्ये &#39;मालमत्ता घसारा खर्च केंद्र&#39; सेट करा {0}
 ,Maintenance Schedules,देखभाल वेळापत्रक
 DocType: Task,Actual End Date (via Time Sheet),प्रत्यक्ष समाप्ती तारीख (वेळ पत्रक द्वारे)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},रक्कम {0} {1} विरुद्ध {2} {3}
 ,Quotation Trends,कोटेशन ट्रेन्ड
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},आयटम गट आयटम मास्त्रे साठी आयटम  {0} मधे  नमूद केलेला नाही
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,खात्यात डेबिट एक प्राप्तीयोग्य खाते असणे आवश्यक आहे
 DocType: Shipping Rule Condition,Shipping Amount,शिपिंग रक्कम
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,प्रलंबित रक्कम
 DocType: Purchase Invoice Item,Conversion Factor,रूपांतरण फॅक्टर
 DocType: Purchase Order,Delivered,वितरित केले
 ,Vehicle Expenses,वाहन खर्च
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
+DocType: Serial No,Invoice Details,चलन तपशील
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},उपयुक्त जीवन नंतर अपेक्षित मूल्य पेक्षा मोठे किंवा समान असणे आवश्यक आहे {0}
 DocType: Purchase Receipt,Vehicle Number,वाहन क्रमांक
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,आवर्ती अशी यादी तयार करणे बंद होणार तारीख
 DocType: Employee Loan,Loan Amount,कर्ज रक्कम
@@ -1987,12 +1986,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,एचआर सेटिंग्ज
 DocType: Salary Slip,net pay info,निव्वळ वेतन माहिती
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,खर्च दावा मंजुरीसाठी प्रलंबित आहे. फक्त खर्च माफीचा साक्षीदार स्थिती अद्यतनित करू शकता.
 DocType: Email Digest,New Expenses,नवीन खर्च
 DocType: Purchase Invoice,Additional Discount Amount,अतिरिक्त सवलत रक्कम
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","सलग # {0}: प्रमाण 1, आयटम निश्चित मालमत्ता आहे असणे आवश्यक आहे. कृपया एकाधिक प्रमाण स्वतंत्र सलग वापरा."
 DocType: Leave Block List Allow,Leave Block List Allow,रजा ब्लॉक यादी परवानगी द्या
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr रिक्त किंवा जागा असू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,गट  पासून नॉन-गट पर्यंत
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,क्रीडा
 DocType: Loan Type,Loan Name,कर्ज नाव
@@ -2004,6 +2003,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,तुम्ही नाकारलेले  आयटम राखण्यासाठी आहेत ते  कोठार
 DocType: Production Order,Skip Material Transfer,साहित्य हस्तांतरण जा
 DocType: Production Order,Skip Material Transfer,साहित्य हस्तांतरण जा
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,विनिमय दर शोधण्यात अक्षम {0} करण्यासाठी {1} की तारीख {2}. स्वतः एक चलन विनिमय रेकॉर्ड तयार करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,आपले आर्थिक वर्ष रोजी संपत आहे
 DocType: POS Profile,Price List,किंमत सूची
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} मुलभूत आर्थिक वर्ष आहे. बदल प्रभावाखाली येण्यासाठी आपल्या ब्राउझर रीफ्रेश करा.
@@ -2020,19 +2020,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},खाते {0} अवैध आहे. खाते चलन {1} असणे आवश्यक आहे
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM रुपांतर घटक सलग  {0} मधे आवश्यक आहे
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","सलग # {0}: संदर्भ दस्तऐवज प्रकार विक्री ऑर्डर एक, विक्री चलन किंवा जर्नल प्रवेश असणे आवश्यक आहे"
 DocType: Salary Component,Deduction,कपात
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,सलग {0}: पासून वेळ आणि वेळ करणे बंधनकारक आहे.
 DocType: Stock Reconciliation Item,Amount Difference,रक्कम फरक
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},किंमत यादी  {1} मध्ये आयटम किंमत  {0} साठी जोडली आहे
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,या विक्री व्यक्तीसाठी  कर्मचारी आयडी प्रविष्ट करा
 DocType: Territory,Classification of Customers by region,प्रदेशानुसार ग्राहक वर्गीकरण
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,फरक रक्कम शून्य असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,फरक रक्कम शून्य असणे आवश्यक आहे
 DocType: Project,Gross Margin,एकूण मार्जिन
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,पहिले  उत्पादन आयटम प्रविष्ट करा
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,गणिती बँक स्टेटमेंट शिल्लक
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,अक्षम वापरकर्ता
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,कोटेशन
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,कोटेशन
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,एकूण कपात
 ,Production Analytics,उत्पादन विश्लेषण
@@ -2041,9 +2041,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},चेतावणी: जोड वर अवैध SSL प्रमाणपत्र {0}
 DocType: Student Admission,Eligibility,पात्रता
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","निष्पन्न आपल्याला प्राप्त व्यवसाय, आपल्या निष्पन्न म्हणून सर्व आपले संपर्क जोडू शकता आणि अधिक मदत"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","निष्पन्न आपल्याला प्राप्त व्यवसाय, आपल्या निष्पन्न म्हणून सर्व आपले संपर्क जोडू शकता आणि अधिक मदत"
 DocType: Production Order Operation,Actual Operation Time,वास्तविक ऑपरेशन वेळ
 DocType: Authorization Rule,Applicable To (User),लागू करण्यासाठी (सदस्य)
 DocType: Purchase Taxes and Charges,Deduct,वजा
@@ -2058,7 +2058,7 @@
 DocType: Guardian,Work Address,काम पत्ता
 DocType: Appraisal,Calculate Total Score,एकूण धावसंख्या गणना
 DocType: Request for Quotation,Manufacturing Manager,उत्पादन व्यवस्थापक
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},सिरियल क्रमांक {0} हा  {1} पर्यंत हमी अंतर्गत आहे
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},सिरियल क्रमांक {0} हा  {1} पर्यंत हमी अंतर्गत आहे
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,वितरण टीप  मधे संकुल मधे  Split करा .
 apps/erpnext/erpnext/hooks.py +87,Shipments,निर्यात
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,खाते शिल्लक ({0}) {1} आणि स्टॉक मूल्य ({2}) कोठार साठी {3} समान असणे आवश्यक आहे
@@ -2081,10 +2081,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,टीप: ईमेल वापरकर्त्यांना अक्षम पाठविली जाऊ शकत नाही
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,संवाद संख्या
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,संवाद संख्या
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,कंपनी निवडा ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,कंपनी निवडा ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,सर्व विभागांसाठी विचारल्यास रिक्त सोडा
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","रोजगार प्रकार (कायम, करार, हद्दीच्या इ)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} हा आयटम {1} साठी अनिवार्य आहे
 DocType: Process Payroll,Fortnightly,पाक्षिक
 DocType: Currency Exchange,From Currency,चलन पासून
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","किमान एक सलग रक्कम, चलन प्रकार आणि चलन क्रमांक निवडा"
@@ -2093,14 +2093,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),दर (कंपनी चलन)
 DocType: Student Guardian,Others,इतर
 DocType: Payment Entry,Unallocated Amount,न वाटप केलेली रक्कम
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,मानक क्षेत्रात हटवू शकत नाही. आपण {0} साठी काही इतर मूल्य निवडा.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,आणखी कोणतेही अद्यतने
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,पहिल्या रांगेत साठी 'मागील पंक्ती एकूण रोजी' किंवा  'मागील पंक्ती रकमेवर' म्हणून जबाबदारी प्रकार निवडू शकत नाही
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child आयटम उत्पादन बंडल मधे असू नये. आयटम  '{0}' काढा आणि जतन करा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,बँकिंग
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets जोडा
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets जोडा
 DocType: Vehicle Service,Service Item,सेवा बाबींचा
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
 DocType: Bank Guarantee,Bank Guarantee,बँक हमी
@@ -2126,6 +2126,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},सलग # {0}: मालमत्ता {1} आधीच आहे {2}
 DocType: Quotation Item,Stock Balance,शेअर शिल्लक
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,भरणा करण्यासाठी विक्री आदेश
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} द्वारे सेटअप&gt; सेिटंगेंेंें&gt; नामांकन मालिका मालिका नामांकन सेट करा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,मुख्य कार्यकारी अधिकारी
 DocType: Expense Claim Detail,Expense Claim Detail,खर्च हक्क तपशील
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,कृपया  योग्य खाते निवडा
@@ -2150,14 +2151,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,दर सूची सेट केले नसल्यास दर दर्शविली जाणार नाही
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,या शिपिंग नियमासाठी देश निर्दिष्ट करा किंवा जगभरातील शिपिंग तपासा
 DocType: Stock Entry,Total Incoming Value,एकूण येणारी  मूल्य
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,डेबिट करणे आवश्यक आहे
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,डेबिट करणे आवश्यक आहे
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets आपला संघ केले activites साठी वेळ, खर्च आणि बिलिंग ट्रॅक ठेवण्यात मदत"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,खरेदी दर सूची
 DocType: Offer Letter Term,Offer Term,ऑफर मुदत
 DocType: Quality Inspection,Quality Manager,गुणवत्ता व्यवस्थापक
 DocType: Job Applicant,Job Opening,जॉब ओपनिंग
 DocType: Payment Reconciliation,Payment Reconciliation,भरणा मेळ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,कृपया  पहिले प्रभारी व्यक्तीचे नाव निवडा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,कृपया  पहिले प्रभारी व्यक्तीचे नाव निवडा
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,तंत्रज्ञान
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},एकूण न चुकता: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM वेबसाइट ऑपरेशन
@@ -2185,23 +2186,23 @@
 DocType: Opportunity,Lost Reason,कारण गमावले
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,नवीन पत्ता
 DocType: Quality Inspection,Sample Size,नमुना आकार
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,सर्व आयटम आधीच invoiced आहेत
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,पावती दस्तऐवज प्रविष्ट करा
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,पुढील खर्च केंद्रे गट अंतर्गत केले जाऊ शकते पण नोंदी नॉन-गट करू शकता
 DocType: Project,External,बाह्य
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,वापरकर्ते आणि परवानग्या
 DocType: Vehicle Log,VLOG.,व्हिलॉग.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},उत्पादन आदेश तयार केलेले: {0}
 DocType: Branch,Branch,शाखा
 DocType: Guardian,Mobile Number,मोबाइल क्रमांक
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,मुद्रण आणि ब्रांडिंग
 DocType: Bin,Actual Quantity,वास्तविक प्रमाण
 DocType: Shipping Rule,example: Next Day Shipping,उदाहरण: पुढील दिवस शिपिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,सिरियल क्रमांक {0} आढळला  नाही
 DocType: Scheduling Tool,Student Batch,विद्यार्थी बॅच
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,आपले ग्राहक
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,विद्यार्थी करा
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,विद्यार्थी करा
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},आपण प्रकल्प सहयोग करण्यासाठी आमंत्रित आहेत: {0}
 DocType: Leave Block List Date,Block Date,ब्लॉक तारीख
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,आता लागू
@@ -2225,8 +2226,9 @@
 DocType: SMS Log,Sent To,करण्यासाठी पाठविले
 DocType: Payment Request,Make Sales Invoice,विक्री चलन करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,सॉफ्टवेअर
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,पुढील संपर्क तारीख भूतकाळातील असू शकत नाही
 DocType: Company,For Reference Only.,संदर्भ केवळ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,बॅच निवडा कोणत्याही
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},अवैध {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,आगाऊ रक्कम
@@ -2240,7 +2242,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,प्रकरण क्रमांक 0 असू शकत नाही
 DocType: Item,Show a slideshow at the top of the page,पृष्ठाच्या शीर्षस्थानी स्लाईड शो दर्शवा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,स्टोअर्स
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,स्टोअर्स
 DocType: Serial No,Delivery Time,वितरण वेळ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,आधारित Ageing
 DocType: Item,End of Life,आयुष्याच्या शेवटी
@@ -2252,12 +2254,12 @@
 DocType: Rename Tool,Rename Tool,साधन पुनर्नामित करा
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,अद्यतन खर्च
 DocType: Item Reorder,Item Reorder,आयटम पुनर्क्रमित
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,पगार शो स्लिप्स
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ट्रान्सफर साहित्य
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,पगार शो स्लिप्स
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ट्रान्सफर साहित्य
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","ऑपरेशन, ऑपरेटिंग खर्च  आणि आपल्या ऑपरेशनसाठी    एक अद्वितीय ऑपरेशन क्रमांक निर्देशीत करा ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,हा दस्तऐवज करून मर्यादेपेक्षा अधिक {0} {1} आयटम {4}. आपण करत आहेत दुसर्या {3} त्याच विरुद्ध {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,बदल निवडा रक्कम खाते
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,जतन केल्यानंतर आवर्ती सेट करा
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,बदल निवडा रक्कम खाते
 DocType: Purchase Invoice,Price List Currency,किंमत सूची चलन
 DocType: Naming Series,User must always select,सदस्य नेहमी निवडणे आवश्यक आहे
 DocType: Stock Settings,Allow Negative Stock,नकारात्मक शेअर परवानगी द्या
@@ -2268,7 +2270,7 @@
 DocType: Budget Account,Budget Account,बजेट खाते
 DocType: Quality Inspection,Verified By,द्वारा सत्यापित केली
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","विद्यमान व्यवहार आहेत कारण, कंपनीच्या मुलभूत चलन बदलू शकत नाही. व्यवहार मुलभूत चलन बदलण्यासाठी रद्द करणे आवश्यक आहे."
-DocType: Grade Interval,Grade Description,ग्रेड वर्णन
+DocType: Grading Scale Interval,Grade Description,ग्रेड वर्णन
 DocType: Stock Entry,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,पगाराच्या स्लिप्स तयार करा
@@ -2306,7 +2308,7 @@
 DocType: Upload Attendance,Attendance To Date,उपस्थिती पासून तारीख
 DocType: Warranty Claim,Raised By,उपस्थित
 DocType: Payment Gateway Account,Payment Account,भरणा खाते
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,कृपया पुढे जाण्यासाठी कंपनी निर्दिष्ट करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,खाते प्राप्तीयोग्य निव्वळ बदला
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,भरपाई देणारा बंद
 DocType: Offer Letter,Accepted,स्वीकारले
@@ -2316,12 +2318,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,आपण खरोखर या कंपनीतील  सर्व व्यवहार हटवू इच्छिता याची खात्री करा. तुमचा master  data  आहे तसा राहील. ही क्रिया पूर्ववत केली जाऊ शकत नाही.
 DocType: Room,Room Number,खोली क्रमांक
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},अवैध संदर्भ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादन ऑर्डर {3} मधे {0} ({1}) नियोजित प्रमाण पेक्षा जास्त असू शकत नाही ({2})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},उत्पादन ऑर्डर {3} मधे {0} ({1}) नियोजित प्रमाण पेक्षा जास्त असू शकत नाही ({2})
 DocType: Shipping Rule,Shipping Rule Label,शिपिंग नियम लेबल
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,वापरकर्ता मंच
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,कच्चा माल रिक्त असू शकत नाही.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,जलद प्रवेश जर्नल
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","शेअर अद्यतनित करू शकत नाही, चलन ड्रॉप शिपिंग आयटम समाविष्टीत आहे."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,जलद प्रवेश जर्नल
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM कोणत्याही आयटम agianst उल्लेख केला तर आपण दर बदलू शकत नाही
 DocType: Employee,Previous Work Experience,मागील कार्य अनुभव
 DocType: Stock Entry,For Quantity,प्रमाण साठी
@@ -2334,7 +2336,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,अटी आणि Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,संस्था नाव साठी आपण या प्रणाली सेट आहेत.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Accounting प्रवेश गोठविली लेखा नोंद, कोणीही करून  / सुधारुन खालील  निर्दिष्ट भूमिका वगळता नोंद संपादीत करताू शकतात ."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,देखभाल वेळापत्रक निर्मिती करण्यापूर्वी दस्तऐवज जतन करा
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,प्रकल्प स्थिती
 DocType: UOM,Check this to disallow fractions. (for Nos),अपूर्णांक अनुमती रद्द करण्यासाठी हे तपासा. (क्रमांकासाठी)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,खालील उत्पादन आदेश तयार केले होते:
@@ -2361,7 +2363,7 @@
 ,Employees working on a holiday,सुट्टी काम कर्मचारी
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,मार्क सध्याची
 DocType: Project,% Complete Method,% पूर्ण पद्धत
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},सिरियल क्रमांक  {0}साठी देखभाल प्रारंभ तारीख माणे वितरणाच्या  तारीखेआधी असू शकत नाही
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},सिरियल क्रमांक  {0}साठी देखभाल प्रारंभ तारीख माणे वितरणाच्या  तारीखेआधी असू शकत नाही
 DocType: Production Order,Actual End Date,वास्तविक अंतिम तारीख
 DocType: BOM,Operating Cost (Company Currency),ऑपरेटिंग खर्च (कंपनी चलन)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2378,7 +2380,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,वेतन न करता सोडू मंजूर रजा रेकॉर्ड जुळत नाही
 DocType: Campaign,Campaign-.####,मोहीम -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,पुढील पायऱ्या
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,शक्य तितका सर्वोत्कृष्ट दरात निर्दिष्ट आयटम पुरवठा करा
 DocType: Selling Settings,Auto close Opportunity after 15 days,त्यानंतर 15 दिवसांनी ऑटो संधी बंद
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,समाप्त वर्ष
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / लीड%
@@ -2416,7 +2418,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd प्रमाण
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},फी रेकॉर्ड तयार - {0}
 DocType: Asset Category Account,Asset Category Account,मालमत्ता वर्ग खाते
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},विक्री ऑर्डर पेक्षा {1} प्रमाणात जास्त {0} item उत्पादन करू शकत नाही
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,शेअर प्रवेश {0} सबमिट केलेला  नाही
 DocType: Payment Reconciliation,Bank / Cash Account,बँक / रोख खाते
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,पुढील संपर्क होऊ ईमेल पत्ता समान असू शकत नाही
@@ -2438,7 +2440,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,निपटारा तारीख नमूद केलेली नाही
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,उत्पादन
 DocType: Guardian,Occupation,व्यवसाय
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,रो {0}: प्रारंभ तारीख अंतिम तारखेपूर्वी असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),एकूण (Qty)
 DocType: Sales Invoice,This Document,हा दस्तऐवज
 DocType: Installation Note Item,Installed Qty,स्थापित Qty
@@ -2454,15 +2457,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,समस्या नोंदवणे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,उपयुक्तता खर्च
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-वर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,सलग # {0}: जर्नल प्रवेश {1} खाते नाही {2} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,सलग # {0}: जर्नल प्रवेश {1} खाते नाही {2} किंवा आधीच दुसर्या व्हाउचर विरुद्ध जुळलेल्या
 DocType: Buying Settings,Default Buying Price List,मुलभूत खरेदी दर सूची
 DocType: Process Payroll,Salary Slip Based on Timesheet,Timesheet आधारित पगाराच्या स्लिप्स
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,वर निवडलेल्या निकषानुसार कर्मचारी नाही  किंवा पगारपत्रक आधीच तयार केले आहे
 DocType: Notification Control,Sales Order Message,विक्री ऑर्डर संदेश
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","कंपनी, चलन, वर्तमान आर्थिक वर्ष इ  मुलभूत मुल्य  सेट करा"
 DocType: Payment Entry,Payment Type,भरणा प्रकार
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,कृपया आयटम एक बॅच निवडा {0}. ही गरज पूर्ण एकाच बॅच शोधण्यात अक्षम
 DocType: Process Payroll,Select Employees,निवडा कर्मचारी
 DocType: Opportunity,Potential Sales Deal,संभाव्य विक्री करार
 DocType: Payment Entry,Cheque/Reference Date,धनादेश / संदर्भ तारीख
@@ -2479,7 +2482,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ग्लोबल पीओएस प्रोफाइल {0}  कंपनी {1} साठी आधीच निर्माण केली आहे
 DocType: Purchase Order,Ref SQ,संदर्भ SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,सर्व BOMs मधले  आयटम / BOM बदला
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,पावती दस्तऐवज सादर करणे आवश्यक आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,पावती दस्तऐवज सादर करणे आवश्यक आहे
 DocType: Purchase Invoice Item,Received Qty,प्राप्त Qty
 DocType: Stock Entry Detail,Serial No / Batch,सिरियल क्रमांक/  बॅच
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,अदा केलेला नाही  आणि वितरित नाही
@@ -2488,11 +2491,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,नाही वेळ पत्रके
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,रजा प्रकार {0} carry-forward केला  जाऊ शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',देखभाल वेळापत्रक सर्व आयटम व्युत्पन्न नाही. &#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 ,To Produce,उत्पन्न करण्यासाठी
 apps/erpnext/erpnext/config/hr.py +93,Payroll,उपयोग पे रोल
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","सलग {0} मधील {1} साठी . आयटम दर {2} समाविष्ट करण्यासाठी, पंक्ति {3} समाविष्ट करणे आवश्यक आहे"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,वापरकर्ता करा
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,वापरकर्ता करा
 DocType: Packing Slip,Identification of the package for the delivery (for print),डिलिव्हरी संकुल ओळख (मुद्रण)
 DocType: Bin,Reserved Quantity,राखीव प्रमाण
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,वैध ईमेल पत्ता प्रविष्ट करा
@@ -2506,15 +2509,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,अक्षम साचा डीफॉल्ट टेम्पलेट असणे आवश्यक नाही
 DocType: Account,Income Account,उत्पन्न खाते
 DocType: Payment Request,Amount in customer's currency,ग्राहक चलनात रक्कम
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,डिलिव्हरी
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,डिलिव्हरी
 DocType: Stock Reconciliation Item,Current Qty,वर्तमान Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","कोटीच्या विभागमधे  ""सामुग्री आधारित रोजी दर"" पहा"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,मागील
 DocType: Appraisal Goal,Key Responsibility Area,की जबाबदारी क्षेत्र
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","विद्यार्थी बॅचेस आपण उपस्थिती, विद्यार्थ्यांना आकलन आणि शुल्क ठेवण्यात मदत"
 DocType: Payment Entry,Total Allocated Amount,एकूण रक्कम
 DocType: Item Reorder,Material Request Type,साहित्य विनंती प्रकार
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},पासून {0} करण्यासाठी वेतन Accural जर्नल प्रवेश {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage पूर्ण आहे, जतन नाही"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage पूर्ण आहे, जतन नाही"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,रो {0}: UOM रुपांतर फॅक्टर अनिवार्य आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,संदर्भ
 DocType: Budget,Cost Center,खर्च केंद्र
@@ -2524,16 +2528,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,पासून विक्री व्यवहार ग्राहक कर आयडी लपवा
 DocType: Upload Attendance,Upload HTML,HTML अपलोड करा
 DocType: Employee,Relieving Date,Relieving तारीख
-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.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारीने  परिभाषित केले आहे."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","किंमत नियम काही निकषांच्या आधारे, / यादी किंमत पुन्हा खोडून सवलतीच्या टक्केवारीने  परिभाषित केले आहे."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,कोठार फक्त शेअर प्रवेश / डिलिव्हरी टीप / खरेदी पावती द्वारे बदलले जाऊ शकते
 DocType: Employee Education,Class / Percentage,वर्ग / टक्केवारी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,विपणन आणि विक्री प्रमुख
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","निवडलेला  किंमत नियम 'किंमत' साठी केला असेल , तर  तर ते दर सूची अधिलिखित केले जाईल. किंमत नियम किंमत अंतिम किंमत आहे, त्यामुळे पुढील सवलतीच्या लागू केले जावे त्यामुळे, इ विक्री आदेश, पर्चेस जसे व्यवहार, 'दर सूची दर' फील्डमध्ये ऐवजी, 'दर' फील्डमध्ये प्राप्त करता येईल."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","निवडलेला  किंमत नियम 'किंमत' साठी केला असेल , तर  तर ते दर सूची अधिलिखित केले जाईल. किंमत नियम किंमत अंतिम किंमत आहे, त्यामुळे पुढील सवलतीच्या लागू केले जावे त्यामुळे, इ विक्री आदेश, पर्चेस जसे व्यवहार, 'दर सूची दर' फील्डमध्ये ऐवजी, 'दर' फील्डमध्ये प्राप्त करता येईल."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ट्रॅक उद्योग प्रकार करून ठरतो.
 DocType: Item Supplier,Item Supplier,आयटम पुरवठादार
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,बॅच नाही मिळविण्यासाठी आयटम कोड प्रविष्ट करा
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},कृपया {0} साठी एक मूल्य निवडा quotation_to  {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,सर्व पत्ते.
 DocType: Company,Stock Settings,शेअर सेटिंग्ज
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","खालील गुणधर्म दोन्ही रेकॉर्ड मधे  समान आहेत तर, विलीन फक्त शक्य आहे. गट आहे, रूट प्रकार, कंपनी"
@@ -2543,6 +2547,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',दर्जा कर्मचार्यांना घटना एक ईमेल पाठवू &#39;उघडा&#39;
 DocType: Task,Depends on Tasks,कार्ये अवलंबून
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ग्राहक गट वृक्ष व्यवस्थापित करा.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,संलग्नक हे खरेदी सूचीत टाका सक्षम न दर्शविला जाऊ शकतो
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,नवी खर्च केंद्र नाव
 DocType: Leave Control Panel,Leave Control Panel,नियंत्रण पॅनेल सोडा
@@ -2555,12 +2560,10 @@
 DocType: Sales Invoice,Debit To,करण्यासाठी डेबिट
 DocType: Delivery Note,Required only for sample item.,फक्त नमुन्यासाठी  आवश्यक आयटम .
 DocType: Stock Ledger Entry,Actual Qty After Transaction,व्यवहार केल्यानंतर प्रत्यक्ष प्रमाण
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,पुरवठादार&gt; पुरवठादार प्रकार
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},पगारपत्रक दरम्यान आढळले नाही {0} आणि {1}
 ,Pending SO Items For Purchase Request,खरेदी विनंती म्हणून प्रलंबित आयटम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,विद्यार्थी प्रवेश
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} अक्षम आहे
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} अक्षम आहे
 DocType: Supplier,Billing Currency,बिलिंग चलन
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,अधिक मोठे
@@ -2577,9 +2580,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,मुख्यपृष्ठ वैशिष्ट्यीकृत उत्पादन
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,सर्व मूल्यांकन गट
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,नवीन वखार नाव
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),एकूण {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),एकूण {0} ({1})
 DocType: C-Form Invoice Detail,Territory,प्रदेश
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,आवश्यक भेटी क्रमांकाचा उल्लेख करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,आवश्यक भेटी क्रमांकाचा उल्लेख करा
 DocType: Stock Settings,Default Valuation Method,मुलभूत मूल्यांकन पद्धत
 DocType: Vehicle Log,Fuel Qty,इंधन प्रमाण
 DocType: Production Order Operation,Planned Start Time,नियोजनबद्ध प्रारंभ वेळ
@@ -2595,7 +2598,7 @@
 DocType: Price List,Price List Master,किंमत सूची मास्टर
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"सर्व विक्री व्यवहार अनेक ** विक्री व्यक्ती ** विरुद्ध टॅग केले जाऊ शकते यासाठी की, तुम्ही सेट आणि लक्ष्य निरीक्षण करू शकता"
 ,S.O. No.,S.O.  क्रमांक
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},लीडपासून  ग्राहक तयार करा {0}
 DocType: Price List,Applicable for Countries,देशांसाठी  लागू
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,फक्त स्थिती सह अनुप्रयोग सोडा &#39;मंजूर&#39; आणि &#39;रिजेक्टेड&#39; सादर केला जाऊ शकतो
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},विद्यार्थी गट नाव सलग आवश्यक आहे {0}
@@ -2627,7 +2630,7 @@
 DocType: Project,Copied From,कॉपी
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},नाव त्रुटी: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,कमतरता
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} संबंधित नाही {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} संबंधित नाही {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,कर्मचारी {0} हजेरी आधीच खूण आहे
 DocType: Packing Slip,If more than one package of the same type (for print),तर समान प्रकारच्या एकापेक्षा जास्त पॅकेज (मुद्रण)
 ,Salary Register,पगार नोंदणी
@@ -2646,7 +2649,7 @@
 DocType: Tax Rule,Use for Shopping Cart,वापरासाठी हे खरेदी सूचीत टाका
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},मूल्य {0} विशेषता साठी {1} वैध आयटम यादी अस्तित्वात नाही आयटम विशेषता मूल्ये {2}
 DocType: BOM Item,Scrap %,स्क्रॅप%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",शुल्क प्रमाणातील आपल्या  निवडीनुसार आयटम प्रमाण किंवा रक्कम आधारित वाटप केले जाणार आहे
 DocType: Maintenance Visit,Purposes,हेतू
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,किमान एक आयटम परत दस्तऐवज नकारात्मक प्रमाणात प्रवेश केला पाहिजे
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ऑपरेशन {0} वर्कस्टेशन{1} मधे   कोणत्याही उपलब्ध काम तासांपेक्षा जास्त आहे , ऑपरेशन अनेक ऑपरेशन मध्ये  तोडा"
@@ -2667,16 +2670,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,प्रदेश वृक्ष व्यवस्थापित करा.
 DocType: Journal Entry Account,Sales Invoice,विक्री चलन
 DocType: Journal Entry Account,Party Balance,पार्टी शिल्लक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,कृपया सवलत लागू निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,कृपया सवलत लागू निवडा
 DocType: Company,Default Receivable Account,मुलभूत प्राप्तीयोग्य खाते
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,वर निवडलेल्या निकष देण्यासाठी अदा एकूण पगार बँक नोंद तयार करा
 DocType: Stock Entry,Material Transfer for Manufacture,उत्पादन साठी साहित्य ट्रान्सफर
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,सवलत टक्केवारी एका दर सूची विरुद्ध किंवा सर्व दर सूची एकतर लागू होऊ शकते.
 DocType: Purchase Invoice,Half-yearly,सहामाही
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,शेअर एकट्या प्रवेश
 DocType: Vehicle Service,Engine Oil,इंजिन तेल
 DocType: Sales Invoice,Sales Team1,विक्री Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,आयटम {0} अस्तित्वात नाही
 DocType: Sales Invoice,Customer Address,ग्राहक पत्ता
 DocType: Employee Loan,Loan Details,कर्ज तपशील
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,सलग {0}: पूर्ण प्रमाण शून्य पेक्षा जास्त असणे आवश्यक आहे.
@@ -2684,24 +2687,24 @@
 DocType: Account,Root Type,रूट प्रकार
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},रो # {0}:  आयटम {2} साठी  {1} पेक्षा अधिक परत करू शकत नाही
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,प्लॉट
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},लक्ष्य कोठार सलग {0} साठी अनिवार्य आहे
 DocType: Cheque Print Template,Primary Settings,प्राथमिक सेटिंग्ज
 DocType: Purchase Invoice,Select Supplier Address,पुरवठादाराचा  पत्ता निवडा
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,कर्मचारी जोडा
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,कर्मचारी जोडा
 DocType: Purchase Invoice Item,Quality Inspection,गुणवत्ता तपासणी
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,अतिरिक्त लहान
 DocType: Company,Standard Template,मानक साचा
 DocType: Training Event,Theory,सिद्धांत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,चेतावनी:  मागणी साहित्य Qty किमान Qty पेक्षा कमी आहे
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,खाते {0} गोठविले
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,कायदेशीर अस्तित्व / उपकंपनी स्वतंत्र लेखा चार्ट सह संघटनेला संबंधित करते
 DocType: Payment Request,Mute Email,निःशब्द ईमेल
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","अन्न, पेय आणि तंबाखू"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},फक्त बिल न केलेली विरुद्ध रक्कम करू शकता {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,आयोग दर 100 पेक्षा जास्त असू शकत नाही
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,प्रथम {0} प्रविष्ट करा
@@ -2741,7 +2744,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,विद्यमान व्यवहार गोदामे गट रूपांतरीत केले जाऊ शकत नाही.
 DocType: Assessment Result Tool,Result HTML,HTML निकाल
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,रोजी कालबाह्य
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,विद्यार्थी जोडा
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,विद्यार्थी जोडा
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},कृपया  {0} निवडा
 DocType: C-Form,C-Form No,सी-फॉर्म नाही
 DocType: BOM,Exploded_items,Exploded_items
@@ -2784,7 +2787,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,रक्कम
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,आर्थिक वर्ष निवडा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,स्तर पुनर्क्रमित करा
 DocType: Company,Chart Of Accounts Template,खाती साचा चार्ट
 DocType: Attendance,Attendance Date,उपस्थिती दिनांक
@@ -2799,14 +2802,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,डुप्लिकेट नोंदणी
 DocType: Program Enrollment Tool,Get Students,विद्यार्थी मिळवा
 DocType: Serial No,Under Warranty,हमी अंतर्गत
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[त्रुटी]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[त्रुटी]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,तुम्ही विक्री ऑर्डर एकदा जतन केल्यावर शब्दा मध्ये दृश्यमान होईल.
 ,Employee Birthday,कर्मचारी वाढदिवस
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,विद्यार्थी बॅच विधान परिषदेच्या साधन
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,मर्यादा क्रॉस
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,व्हेंचर कॅपिटल
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,या &#39;शैक्षणिक वर्ष&#39; एक शैक्षणिक मुदत {0} आणि &#39;मुदत नाव&#39; {1} आधीच अस्तित्वात आहे. या नोंदी सुधारित आणि पुन्हा प्रयत्न करा.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","आयटम {0} विरुद्ध विद्यमान व्यवहार आहेत, तुम्ही मूल्य बदलू शकत नाही {1}"
 DocType: UOM,Must be Whole Number,संपूर्ण क्रमांक असणे आवश्यक आहे
 DocType: Leave Control Panel,New Leaves Allocated (In Days),नवी पाने वाटप (दिवस मध्ये)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,सिरियल क्रमांक {0} अस्तित्वात नाही
@@ -2826,7 +2829,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,साहित्याचे % या विक्री ऑर्डर विरोधात बिल केले आहे
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,कालावधी संवरण
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,विद्यमान व्यवहार खर्चाच्या केंद्र गट रूपांतरीत केले जाऊ शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},रक्कम {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},रक्कम {0} {1} {2} {3}
 DocType: Account,Depreciation,घसारा
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),पुरवठादार (चे)
 DocType: Employee Attendance Tool,Employee Attendance Tool,कर्मचारी उपस्थिती साधन
@@ -2850,7 +2853,7 @@
 DocType: Supplier,Last Day of the Next Month,पुढील महिन्याच्या शेवटच्या दिवशी
 DocType: Support Settings,Auto close Issue after 7 days,7 दिवस स्वयं अंक बंद
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","रजेचे  {0} च्या आधी वाटप जाऊ शकत नाही, कारण  रजा शिल्लक आधीच वाहून-अग्रेषित भविष्यात रजा वाटप रेकॉर्ड केले आहे {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),टीप: मुळे / संदर्भ तारीख {0} दिवसा परवानगी ग्राहक क्रेडिट दिवस पेक्षा जास्त (चे)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,विद्यार्थी अर्जदाराचे
 DocType: Asset Category Account,Accumulated Depreciation Account,जमा घसारा खाते
 DocType: Stock Settings,Freeze Stock Entries,फ्रीझ शेअर नोंदी
@@ -2861,7 +2864,7 @@
 ,Stock Analytics,शेअर Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ऑपरेशन रिक्त सोडले जाऊ शकत नाही
 DocType: Maintenance Visit Purpose,Against Document Detail No,दस्तऐवज तपशील विरुद्ध नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,पक्ष प्रकार अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,पक्ष प्रकार अनिवार्य आहे
 DocType: Quality Inspection,Outgoing,जाणारे
 DocType: Material Request,Requested For,विनंती
 DocType: Quotation Item,Against Doctype,Doctype विरुद्ध
@@ -2878,11 +2881,11 @@
 DocType: Asset,Item Code,आयटम कोड
 DocType: Production Planning Tool,Create Production Orders,उत्पादन ऑर्डर तयार करा
 DocType: Serial No,Warranty / AMC Details,हमी / जेथे एएमसी तपशील
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,क्रियाकलाप आधारित गट विद्यार्थ्यांना निवडा स्वतः
 DocType: Journal Entry,User Remark,सदस्य शेरा
 DocType: Lead,Market Segment,बाजार विभाग
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},अदा केलेली रक्कम एकूण नकारात्मक थकबाकी रक्कम पेक्षा जास्त असू शकत नाही {0}
 DocType: Employee Internal Work History,Employee Internal Work History,कर्मचारी अंतर्गत कार्य इतिहास
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),बंद (डॉ)
 DocType: Cheque Print Template,Cheque Size,धनादेश आकार
@@ -2898,7 +2901,7 @@
 DocType: Production Planning Tool,Create Material Requests,साहित्य विनंत्या तयार करा
 DocType: Employee Education,School/University,शाळा / विद्यापीठ
 DocType: Payment Request,Reference Details,संदर्भ तपशील
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,अपेक्षित मूल्य उपयुक्त जीवन नंतर एकूण खरेदी रक्कम कमी असणे आवश्यक आहे
 DocType: Sales Invoice Item,Available Qty at Warehouse,कोठार वर उपलब्ध आहे Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,बिल केलेली रक्कम
 DocType: Asset,Double Declining Balance,दुहेरी नाकारून शिल्लक
@@ -2919,20 +2922,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","फरक खाते, एक मालमत्ता / दायित्व प्रकार खाते असणे आवश्यक आहे कारण  शेअर मेळ हे उदघाटन नोंद आहे"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},वितरित करण्यात आलेल्या रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},आयटम आवश्यक मागणीसाठी  क्रमांक खरेदी {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,उत्पादन ऑर्डर तयार नाही
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,उत्पादन ऑर्डर तयार नाही
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','तारीख पासून' नंतर 'तारखेपर्यंत' असणे आवश्यक आहे
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},विद्यार्थी म्हणून स्थिती बदलू शकत नाही {0} विद्यार्थी अर्ज लिंक आहे {1}
 DocType: Asset,Fully Depreciated,पूर्णपणे अवमूल्यन
 ,Stock Projected Qty,शेअर Qty अंदाज
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ग्राहक {0}  प्रोजेक्ट {1} ला संबंधित नाही
 DocType: Employee Attendance Tool,Marked Attendance HTML,चिन्हांकित उपस्थिती एचटीएमएल
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","आंतरशालेय, प्रस्ताव आपण आपल्या ग्राहकांना पाठवले आहे बोली"
 DocType: Sales Order,Customer's Purchase Order,ग्राहकाच्या पर्चेस
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,सिरियल क्रमांक आणि बॅच
 DocType: Warranty Claim,From Company,कंपनी पासून
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,मूल्यांकन निकष स्कोअर बेरीज {0} असणे आवश्यक आहे.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,मूल्य किंवा Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations संख्या बुक सेट करा
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,मूल्य किंवा Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,प्रॉडक्शन आदेश उठविले जाऊ शकत नाही:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,मिनिट
 DocType: Purchase Invoice,Purchase Taxes and Charges,कर आणि शुल्क खरेदी
@@ -2945,7 +2948,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,सर्व गोदामांची
 DocType: Sales Partner,Retailer,किरकोळ विक्रेता
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,क्रेडिट खाते ताळेबंद खाते असणे आवश्यक आहे
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,सर्व पुरवठादार प्रकार
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,सर्व पुरवठादार प्रकार
 DocType: Global Defaults,Disable In Words,शब्द मध्ये अक्षम
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,आयटम कोड बंधनकारक आहे कारण आयटम स्वयंचलितपणे गणती केलेला  नाही
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},कोटेशन {0}  प्रकारच्या {1} नाहीत
@@ -2954,6 +2957,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,बँक ओव्हरड्राफ्ट खाते
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,पगाराच्या स्लिप्स करा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,पंक्ती # {0}: रक्कम थकबाकी रक्कम पेक्षा जास्त असू शकत नाही.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ब्राउझ करा BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,सुरक्षित कर्ज
 DocType: Purchase Invoice,Edit Posting Date and Time,पोस्टिंग तारीख आणि वेळ संपादित
@@ -2993,7 +2997,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} पेक्षा जुने स्टॉक व्यवहार अद्ययावत करण्याची परवानगी नाही
 DocType: Purchase Invoice Item,PR Detail,जनसंपर्क(PR ) तपशील
 DocType: Sales Order,Fully Billed,पूर्णतः बिल
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},कर्मचारी मध्ये डीफॉल्ट देय खाते सेट करा {0}
 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 +127,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),संकुल एकूण वजन. सहसा निव्वळ वजन + पॅकेजिंग साहित्य वजन. (मुद्रण)
@@ -3004,7 +3007,7 @@
 DocType: Student Group,Group Based On,गट आधारित
 DocType: Journal Entry,Bill Date,बिल तारीख
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","सेवा बाबींचा, प्रकार, वारंवारता आणि खर्च रक्कम आवश्यक आहे"
-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:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम असतील , तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","सर्वोच्च प्राधान्य एकाधिक किंमत नियम असतील , तर खालील अंतर्गत प्राधान्यक्रम लागू केले आहेत:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},आपण खरोखर पासून {0} सर्व पगाराच्या स्लिप्स सबमिट करू इच्छिता {1}
 DocType: Cheque Print Template,Cheque Height,धनादेश उंची
 DocType: Supplier,Supplier Details,पुरवठादार तपशील
@@ -3016,7 +3019,7 @@
 DocType: Vehicle Log,Invoice Ref,चलन संदर्भ
 DocType: Purchase Order,Recurring Order,आवर्ती ऑर्डर
 DocType: Company,Default Income Account,मुलभूत उत्पन्न खाते
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ग्राहक गट / ग्राहक
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ग्राहक गट / ग्राहक
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),बंद न केलेली आर्थिक वर्ष नफा / तोटा (क्रेडिट)
 DocType: Sales Invoice,Time Sheets,वेळ पत्रके
 DocType: Payment Gateway Account,Default Payment Request Message,मुलभूत भरणा विनंती संदेश
@@ -3036,10 +3039,10 @@
 DocType: Notification Control,Quotation Message,कोटेशन संदेश
 DocType: Employee Loan,Employee Loan Application,कर्मचारी कर्ज अर्ज
 DocType: Issue,Opening Date,उघडण्याची  तारीख
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,उपस्थिती यशस्वीरित्या चिन्हांकित केले गेले.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,उपस्थिती यशस्वीरित्या चिन्हांकित केले गेले.
 DocType: Journal Entry,Remark,शेरा
 DocType: Purchase Receipt Item,Rate and Amount,दर आणि रक्कम
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},खाते प्रकार {0} असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},खाते प्रकार {0} असणे आवश्यक आहे {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,रजा आणि सुट्टी
 DocType: School Settings,Current Academic Term,चालू शैक्षणिक मुदत
 DocType: School Settings,Current Academic Term,चालू शैक्षणिक मुदत
@@ -3062,7 +3065,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,विद्यार्थी गट
 DocType: Shopping Cart Settings,Quotation Series,कोटेशन मालिका
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","आयटम त्याच नावाने अस्तित्वात ( {0} ) असेल , तर आयटम गट नाव बदल  किंवा आयटम पुनर्नामित करा"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,कृपया ग्राहक निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,कृपया ग्राहक निवडा
 DocType: C-Form,I,मी
 DocType: Company,Asset Depreciation Cost Center,मालमत्ता घसारा खर्च केंद्र
 DocType: Sales Order Item,Sales Order Date,विक्री ऑर्डर तारीख
@@ -3081,20 +3084,20 @@
 DocType: Vehicle,Insurance Details,विमा तपशील
 DocType: Account,Payable,देय
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,परतफेड कालावधी प्रविष्ट करा
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),कर्जदार ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),कर्जदार ({0})
 DocType: Pricing Rule,Margin,मार्जिन
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,नवीन ग्राहक
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,निव्वळ नफा%
 DocType: Appraisal Goal,Weightage (%),वजन (%)
 DocType: Bank Reconciliation Detail,Clearance Date,मंजुरी तारीख
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,एकूण खरेदी रक्कम अनिवार्य आहे
 DocType: Lead,Address Desc,Desc पत्ता
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,पक्ष अनिवार्य आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,पक्ष अनिवार्य आहे
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,विषय नाव
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,विक्री किंवा खरेदी कमीत कमी एक निवडणे आवश्यक आहे
-DocType: Grading Structure,Grade Intervals,ग्रेड मध्यांतरे
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,आपल्या व्यवसाय स्वरूप निवडा.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},पंक्ती # {0}: डुप्लीकेट संदर्भ नोंद {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,उत्पादन ऑपरेशन कोठे नेले जातात.
 DocType: Asset Movement,Source Warehouse,स्त्रोत कोठार
 DocType: Installation Note,Installation Date,प्रतिष्ठापन तारीख
@@ -3131,7 +3134,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,प्रिंट टेम्पलेट साठी letter.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,प्रिंट टेम्पलेट साठी शोध शिर्षके फाईल नाव उदा. Proforma चलन
 DocType: Student Guardian,Student Guardian,विद्यार्थी पालक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,मूल्यांकन प्रकार शुल्क समावेश म्हणून चिन्हांकित करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 दर
@@ -3159,7 +3162,7 @@
 DocType: Company,Exchange Gain / Loss Account,विनिमय लाभ / तोटा लेखा
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,कर्मचारी आणि उपस्थिती
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},हेतू एक असणे आवश्यक आहे {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,फॉर्म भरा आणि तो जतन
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,समूह
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,शेअर प्रत्यक्ष प्रमाण
@@ -3175,7 +3178,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qty पुनर्क्रमित करा
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,वर्तमान नोकरी संबंधी
 DocType: Company,Stock Adjustment Account,शेअर समायोजन खाते
-DocType: Journal Entry,Write Off,बंद लिहा
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,बंद लिहा
 DocType: Timesheet Detail,Operation 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}
@@ -3186,27 +3189,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,पुरवठादार ग्राहक वितरण
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# फॉर्म / आयटम / {0}) स्टॉक बाहेर आहे
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,पुढील तारीख पोस्ट दिनांक पेक्षा जास्त असणे आवश्यक
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,ब्रेक अप कर शो
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,ब्रेक अप कर शो
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},मुळे / संदर्भ तारीख  {0} नंतर असू शकत नाही
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,डेटा आयात आणि निर्यात
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","शेअर नोंदी, {0} वखार विरुद्ध अस्तित्वात त्यामुळे आपण पुन्हा नियुक्त किंवा फेरफार करणे शक्य नाही"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,नाही विद्यार्थ्यांनी सापडले
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,नाही विद्यार्थ्यांनी सापडले
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,अशी यादी तयार करण्यासाठी   पोस्ट तारीख
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,विक्री
 DocType: Sales Invoice,Rounded Total,गोळाबेरीज एकूण
 DocType: Product Bundle,List items that form the package.,सूची आयटम पॅकेज तयार करा
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,टक्केवारी वाटप 100% समान असावी
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,कृपया पार्टी निवड केली पोस्टिंग तारीख निवडा
 DocType: Program Enrollment,School House,शाळा हाऊस
 DocType: Serial No,Out of AMC,एएमसी पैकी
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया अवतरणे निवडा
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,कृपया अवतरणे निवडा
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,देखभाल भेट करा
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,कृपया अवतरणे निवडा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,पूर्वनियोजित Depreciations संख्या Depreciations एकूण संख्या पेक्षा जास्त असू शकत नाही
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,देखभाल भेट करा
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,ज्या वापरकर्त्याची  विक्री मास्टर व्यवस्थापक {0} भूमिका आहे त्याला कृपया संपर्ग साधा
 DocType: Company,Default Cash Account,मुलभूत रोख खाते
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,कंपनी ( ग्राहक किंवा पुरवठादार नाही) मास्टर.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,हे या विद्यार्थी पोषाख आधारित आहे
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,नाही विद्यार्थी
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,अधिक आयटम किंवा ओपन पूर्ण फॉर्म जोडा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;अपेक्षित डिलिव्हरी तारीख&#39; प्रविष्ट करा
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,डिलिव्हरी टिपा {0} या विक्री ऑर्डर रद्द आधी रद्द करणे आवश्यक आहे
@@ -3238,6 +3242,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,आयटम 3
 DocType: Purchase Order,Customer Contact Email,ग्राहक संपर्क ईमेल
 DocType: Warranty Claim,Item and Warranty Details,आयटम आणि हमी तपशील
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,आयटम कोड&gt; आयटम गट&gt; ब्रँड
 DocType: Sales Team,Contribution (%),योगदान (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,टीप: भरणा प्रवेश पासून तयार केले जाणार नाहीत &#39;रोख किंवा बँक खाते&#39; निर्दिष्ट नाही
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,अनिवार्य अभ्यासक्रम आणण्यास कार्यक्रम निवडा.
@@ -3253,9 +3258,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,समेट करण्यापूर्वी
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},करण्यासाठी {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),कर आणि शुल्क जोडले (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,आयटम कर रो {0}  कर  किंवा उत्पन्न किंवा खर्चाचे किंवा भार प्रकारचे खाते असणे आवश्यक आहे
 DocType: Sales Order,Partly Billed,अंशतः बिल आकारले
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,आयटम {0} मुदत मालमत्ता आयटम असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,आयटम {0} मुदत मालमत्ता आयटम असणे आवश्यक आहे
 DocType: Item,Default BOM,मुलभूत BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,कंपनीचे नाव  पुष्टी करण्यासाठी पुन्हा-टाइप करा
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,एकूण थकबाकी रक्कम
@@ -3265,8 +3270,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ऑटोमोटिव्ह
 DocType: Vehicle,Insurance Company,विमा कंपनी
 DocType: Asset Category Account,Fixed Asset Account,मुदत मालमत्ता खाते
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,अस्थिर
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,डिलिव्हरी टीप पासून
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,अस्थिर
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,डिलिव्हरी टीप पासून
 DocType: Student,Student Email Address,विद्यार्थी ई-मेल पत्ता
 DocType: Timesheet Detail,From Time,वेळ पासून
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,स्टॉक मध्ये:
@@ -3278,12 +3283,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,किंमत सूची विनिमय दर
 DocType: Purchase Invoice Item,Rate,दर
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,हद्दीच्या
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,पत्ता नाव
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,पत्ता नाव
 DocType: Stock Entry,From BOM,BOM पासून
 DocType: Assessment Code,Assessment Code,मूल्यांकन कोड
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,मूलभूत
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} पूर्वीचे  शेअर व्यवहार गोठविली आहेत
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;व्युत्पन्न वेळापत्रक&#39; वर क्लिक करा
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","उदा किलो, युनिट, क्रमांक, मीटर"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,तुम्ही संदर्भ तारीख प्रविष्ट केली  असल्यास संदर्भ क्रमांक बंधनकारक आहे
 DocType: Bank Reconciliation Detail,Payment Document,भरणा दस्तऐवज
@@ -3291,19 +3296,19 @@
 DocType: Salary Slip,Salary Structure,वेतन रचना
 DocType: Account,Bank,बँक
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,एयरलाईन
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,समस्या साहित्य
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,समस्या साहित्य
 DocType: Material Request Item,For Warehouse,वखार साठी
 DocType: Employee,Offer Date,ऑफर तारीख
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,बोली
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,आपण ऑफलाइन मोड मध्ये आहोत. आपण नेटवर्क पर्यंत रीलोड सक्षम होणार नाही.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,नाही विद्यार्थी गट निर्माण केले.
 DocType: Purchase Invoice Item,Serial No,सिरियल नाही
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,मासिक परतफेड रक्कम कर्ज रक्कम पेक्षा जास्त असू शकत नाही
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,पहिले  Maintaince तपशील प्रविष्ट करा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,पहिले  Maintaince तपशील प्रविष्ट करा
 DocType: Purchase Invoice,Print Language,मुद्रण भाषा
 DocType: Salary Slip,Total Working Hours,एकूण कार्याचे तास
 DocType: Stock Entry,Including items for sub assemblies,उप विधानसभा आयटम समावेश
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,प्रविष्ट मूल्य सकारात्मक असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,सर्व प्रदेश
 DocType: Purchase Invoice,Items,आयटम
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,विद्यार्थी आधीच नोंदणी केली आहे.
@@ -3323,17 +3328,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"'{0}' प्रकार करीता माप मुलभूत युनिट साचा म्हणून समान असणे आवश्यक आहे, '{1}'"
 DocType: Shipping Rule,Calculate Based On,आधारित असणे
 DocType: Delivery Note Item,From Warehouse,वखार पासून
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,कारखानदार सामग्रीचा बिल नाही आयटम
 DocType: Assessment Plan,Supervisor Name,पर्यवेक्षक नाव
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
 DocType: Program Enrollment Course,Program Enrollment Course,कार्यक्रम नावनोंदणी कोर्स
-DocType: Grading Structure,Grading Structure,प्रतवारी संरचना
 DocType: Purchase Taxes and Charges,Valuation and Total,मूल्यांकन आणि एकूण
 DocType: Tax Rule,Shipping City,शिपिंग शहर
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,या आयटम {0}च्या  (साचा) चा एक प्रकार आहे. 'नाही प्रत बनवा' वर सेट केले नसेल विशेषता टेम्पलेट प्रती कॉपी होईल
 DocType: Notification Control,Customize the Notification,सूचना सानुकूलित करा
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ऑपरेशन्स रोख प्रवाह
 DocType: Sales Invoice,Shipping Rule,शिपिंग नियम
@@ -3354,8 +3357,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},डीफॉल्ट BOM आयटम {0} साठी अस्तित्वात नाही
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,कृपया पहले पोस्टिंग तारीख निवडा
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,तारीख उघडण्याच्या तारीख बंद करण्यापूर्वी असावे
 DocType: Leave Control Panel,Carry Forward,कॅरी फॉरवर्ड
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,विद्यमान व्यवहार खर्चाच्या केंद्र लेजर मधे रूपांतरीत केले जाऊ शकत नाही
 DocType: Department,Days for which Holidays are blocked for this department.,दिवस जे सुट्ट्या या विभागात अवरोधित केलेली आहेत.
@@ -3368,7 +3371,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,नाव संलग्न
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,गेल्या कम्युनिकेशन
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,गेल्या कम्युनिकेशन
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',गटात मूल्यांकन &#39;किंवा&#39; मूल्यांकन आणि एकूण &#39;आहे तेव्हा वजा करू शकत नाही
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","आपल्या  tax headsची आणि त्यांच्या  प्रमाण दरांची यादी करा  (उदा, व्हॅट , जकात वगैरे त्यांना  वेगळी नावे असणे आवश्यक आहे ) . हे मानक टेम्पलेट, तयार करेल, जे आपण संपादित करू शकता आणि नंतर अधिक जोडू शकता."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},सिरीयलाइज आयटम  {0}साठी सिरियल क्रमांक आवश्यक
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,पावत्या सह देयके सामना
@@ -3384,7 +3387,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),एकूण (रक्कम)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,मनोरंजन आणि फुरसतीचा वेळ
 DocType: Quality Inspection,Item Serial No,आयटम सिरियल क्रमांक
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,कर्मचारी रेकॉर्ड तयार करा
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,कर्मचारी रेकॉर्ड तयार करा
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,एकूण उपस्थित
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,लेखा स्टेटमेन्ट
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,तास
@@ -3397,10 +3400,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,अज्ञात
 DocType: Shipping Rule,Shipping Rule Conditions,शिपिंग नियम अटी
 DocType: BOM Replace Tool,The new BOM after replacement,बदली नवीन BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,विक्री पॉइंट
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,विक्री पॉइंट
 DocType: Payment Entry,Received Amount,प्राप्त केलेली रक्कम
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,कृपया सेटअप कर्मचारी मानव संसाधन मध्ये प्रणाली नामांकन&gt; एचआर सेटिंग्ज
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ऑर्डर आधीच प्रमाणात दुर्लक्ष करून, पूर्ण प्रमाणात साठी तयार करा"
 DocType: Account,Tax,कर
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,चिन्हांकित नाही
@@ -3413,9 +3414,9 @@
 DocType: Batch,Source Document Name,स्रोत दस्तऐवज नाव
 DocType: Batch,Source Document Name,स्रोत दस्तऐवज नाव
 DocType: Job Opening,Job Title,कार्य शीर्षक
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,वापरकर्ते तयार करा
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,वापरकर्ते तयार करा
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ग्राम
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,उत्पादनासाठीचे  प्रमाण 0 पेक्षा जास्त असणे आवश्यक आहे.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,देखभाल कॉल अहवाल भेट द्या.
 DocType: Stock Entry,Update Rate and Availability,रेट अद्यतनित करा आणि उपलब्धता
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"टक्केवारी तुम्हांला स्वीकारण्याची  किंवा आदेश दिलेल्या  प्रमाणा विरुद्ध अधिक वितरीत करण्याची परवानगी आहे. उदाहरणार्थ: जर तुम्ही 100 युनिट्स चा आदेश दिला  असेल, आणि आपला  भत्ता 10%  असेल तर तुम्हाला 110 units  प्राप्त करण्याची अनुमती आहे."
@@ -3425,28 +3426,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},खर्च खाते आयटम  {0} साठी अनिवार्य आहे
 DocType: BOM,Website Description,वेबसाइट वर्णन
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,इक्विटी निव्वळ बदला
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,चलन खरेदी {0} रद्द करा पहिला
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ई-मेल पत्ता, अद्वितीय असणे आवश्यक आहे आधीच अस्तित्वात आहे {0}"
 DocType: Serial No,AMC Expiry Date,एएमसी कालावधी समाप्ती तारीख
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,पावती
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,पावती
 ,Sales Register,विक्री नोंदणी
 DocType: Daily Work Summary Settings Company,Send Emails At,वेळी ई-मेल पाठवा
 DocType: Quotation,Quotation Lost Reason,कोटेशन हरवले कारण
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,आपल्या डोमेन निवडा
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},व्यवहार संदर्भ नाहीत {0} दिनांक {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,संपादित करण्यासाठी काहीही नाही.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,या महिन्यासाठी  आणि प्रलंबित उपक्रम सारांश
 DocType: Customer Group,Customer Group Name,ग्राहक गट नाव
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,अद्याप कोणत्याही ग्राहक!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,रोख फ्लो स्टेटमेंट
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},कर्ज रक्कम कमाल कर्ज रक्कम जास्त असू शकत नाही {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,परवाना
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},सी-फॉर्म{1} मधून  चलन {0} काढून टाका
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,Write Off खाते प्रविष्ट करा
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,गेल्या ऑर्डर तारीख
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},खाते {0} ला  कंपनी {1} मालकीचे नाही
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} सलग मालिका संख्या डिलिव्हरी टीप जुळत नाही
 DocType: Student,Guardian Details,पालक तपशील
 DocType: C-Form,C-Form,सी-फॉर्म
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,अनेक कर्मचाऱ्यांना उपस्थिती चिन्ह
@@ -3471,20 +3474,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',सलग {0} # खाते प्रकार असणे आवश्यक आहे &#39;निश्चित मालमत्ता&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,आउट Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,नियम विक्रीसाठी शिपिंग रक्कम गणना
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,मालिका अनिवार्य आहे
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,मालिका अनिवार्य आहे
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,वित्तीय सेवा
 DocType: Student Sibling,Student ID,विद्यार्थी ओळखपत्र
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,वेळ नोंदी उपक्रम प्रकार
 DocType: Tax Rule,Sales,विक्री
 DocType: Stock Entry Detail,Basic Amount,मूलभूत रक्कम
 DocType: Training Event,Exam,परीक्षा
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},स्टॉक आयटम  {0} साठी आवश्यक कोठार
 DocType: Leave Allocation,Unused leaves,न वापरलेल्या  रजा
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,कोटी
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,कोटी
 DocType: Tax Rule,Billing State,बिलिंग राज्य
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ट्रान्सफर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खात्यासह संबद्ध नाही {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} पार्टी खात्यासह संबद्ध नाही {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(उप-मंडळ्यांना समावेश) स्फोट झाला BOM प्राप्त
 DocType: Authorization Rule,Applicable To (Employee),लागू करण्यासाठी (कर्मचारी)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,देय तारीख अनिवार्य आहे
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,विशेषता साठी बढती {0} 0 असू शकत नाही
@@ -3495,13 +3498,13 @@
 ,Inactive Customers,निष्क्रिय ग्राहक
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,खरेदी पावती
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,कसे किंमत नियम लागू आहे?
 DocType: Stock Entry,Delivery Note No,डिलिव्हरी टीप क्रमांक
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","चेक केलेले असल्यास, फक्त अंतिम कच्चा माल साहित्य विनंत्या साहित्य विनंत्या मध्ये समाविष्ट केले जाईल खरेदी करा. अन्यथा, पालक आयटम साहित्य विनंत्या तयार केले जाईल"
 DocType: Cheque Print Template,Message to show,दर्शविण्यासाठी संदेश
 DocType: Company,Retail,किरकोळ
 DocType: Attendance,Absent,अनुपस्थित
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,उत्पादन बंडल
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,उत्पादन बंडल
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},रो {0}: अवैध संदर्भ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,कर आणि शुल्क साचा खरेदी
 DocType: Upload Attendance,Download Template,डाउनलोड साचा
@@ -3511,10 +3514,10 @@
 DocType: Payment Entry,Account Paid From,पासून खाते सशुल्क
 DocType: Purchase Order Item Supplied,Raw Material Item Code,कच्चा माल आयटम कोड
 DocType: Journal Entry,Write Off Based On,आधारित Write Off
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,लीड करा
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,लीड करा
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,प्रिंट आणि स्टेशनरी
 DocType: Stock Settings,Show Barcode Field,बारकोड फिल्ड दर्शवा
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,पुरवठादार ई-मेल पाठवा
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",पगार दरम्यान {0} आणि {1} द्या अनुप्रयोग या कालावधीत तारीख श्रेणी दरम्यान असू शकत नाही कालावधीसाठी आधीपासून प्रक्रिया.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,एक सिरियल क्रमांकासाठी  प्रतिष्ठापन रेकॉर्ड
 DocType: Guardian Interest,Guardian Interest,पालक व्याज
@@ -3527,6 +3530,7 @@
 DocType: Offer Letter,Awaiting Response,प्रतिसाद प्रतीक्षा करत आहे
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,वर
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},अवैध विशेषता {0} {1}
+DocType: Supplier,Mention if non-standard payable account,उल्लेख मानक-नसलेला देय खाते तर
 DocType: Salary Slip,Earning & Deduction,कमाई आणि कपात
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,पर्यायी. हे सेटिंग विविध व्यवहार फिल्टर करण्यासाठी वापरले  जाईल.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,नकारात्मक मूल्यांकन दर परवानगी नाही
@@ -3542,10 +3546,9 @@
 DocType: Production Order Item,Production Order Item,उत्पादन ऑर्डर बाबींचा
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,रेकॉर्ड आढळले नाही
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,रद्द मालमत्ता खर्च
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,अंशतः ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: आयटम {2} ला खर्च केंद्र अनिवार्य आहे
 DocType: Vehicle,Policy No,कोणतेही धोरण नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,उत्पादन बंडलचे आयटम मिळवा
 DocType: Asset,Straight Line,सरळ रेष
 DocType: Project User,Project User,प्रकल्प वापरकर्ता
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,स्प्लिट
@@ -3563,7 +3566,7 @@
 DocType: Program Enrollment Tool,Get Students From,पासून विद्यार्थी मिळवा
 DocType: Hub Settings,Seller Country,विक्रेता देश
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,वेबसाइट वर प्रकाशित आयटम
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,बॅच मध्ये आपल्या विद्यार्थ्यांना गट
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,बॅच मध्ये आपल्या विद्यार्थ्यांना गट
 DocType: Authorization Rule,Authorization Rule,प्राधिकृत नियम
 DocType: Sales Invoice,Terms and Conditions Details,अटी आणि शर्ती तपशील
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,वैशिष्ट्य
@@ -3616,14 +3619,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,धनादेश तारीख
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},खाते {0}: पालक खाते {1} कंपनी {2} ला संबंधित नाही:
 DocType: Program Enrollment Tool,Student Applicants,विद्यार्थी अर्जदाराच्या
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,यशस्वीरित्या या  कंपनी संबंधित सर्व व्यवहार हटवला!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,यशस्वीरित्या या  कंपनी संबंधित सर्व व्यवहार हटवला!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,तारखेला
 DocType: Appraisal,HR,एचआर
 DocType: Program Enrollment,Enrollment Date,नोंदणी दिनांक
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,उमेदवारीचा काळ
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,पगार घटक
 DocType: Program Enrollment Tool,New Academic Year,नवीन शैक्षणिक वर्ष
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,परत / क्रेडिट टीप
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,परत / क्रेडिट टीप
 DocType: Stock Settings,Auto insert Price List rate if missing,दर सूची दर गहाळ असेल तर आपोआप घाला
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,एकूण देय रक्कम
 DocType: Production Order Item,Transferred Qty,हस्तांतरित Qty
@@ -3643,7 +3646,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","प्रासंगिक जसे पाने प्रकार, आजारी इ"
 DocType: Email Digest,Send regular summary reports via Email.,ईमेल द्वारे नियमित सारांश अहवाल पाठवा.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},खर्च हक्क प्रकार मध्ये डीफॉल्ट खाते सेट करा {0}
 DocType: Assessment Result,Student Name,विद्यार्थी नाव
 DocType: Brand,Item Manager,आयटम व्यवस्थापक
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,उपयोग पे रोल देय
@@ -3664,6 +3667,7 @@
 ,Sales Funnel,विक्री धुराचा
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,संक्षेप करणे आवश्यक आहे
 DocType: Project,Task Progress,कार्य प्रगती
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,कार्ट
 ,Qty to Transfer,हस्तांतरित करण्याची Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,निष्पन्न किंवा ग्राहकांना कोट्स.
 DocType: Stock Settings,Role Allowed to edit frozen stock,भूमिका गोठविलेला  स्टॉक संपादित करण्याची परवानगी
@@ -3691,13 +3695,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,आयटमनूसार  कर तपशील
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,संस्था संक्षेप
 ,Item-wise Price List Rate,आयटमनूसार  किंमत सूची दर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,पुरवठादार कोटेशन
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,पुरवठादार कोटेशन
 DocType: Quotation,In Words will be visible once you save the Quotation.,तुम्ही अवतरण एकदा जतन केल्यावर  शब्दा मध्ये दृश्यमान होईल.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},प्रमाण ({0}) एकापाठोपाठ एक अपूर्णांक असू शकत नाही {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,शुल्क गोळा
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},बारकोड {0} आधीच आयटम वापरले {1}
 DocType: Lead,Add to calendar on this date,या तारखेला कॅलेंडरमध्ये समाविष्ट करा
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,शिपिंग खर्च जोडून नियम.
 DocType: Item,Opening Stock,शेअर उघडत
@@ -3714,8 +3718,8 @@
 Updated via 'Time Log'",मिनिटे मध्ये &#39;लॉग इन टाइम&#39; द्वारे अद्यतनित
 DocType: Customer,From Lead,लीड पासून
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ऑर्डर उत्पादनासाठी  प्रकाशीत.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,आर्थिक वर्ष निवडा ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,पीओएस प्रोफाइल पीओएस नोंद करण्यासाठी  आवश्यक
 DocType: Program Enrollment Tool,Enroll Students,विद्यार्थी ची नोंदणी करा
 DocType: Hub Settings,Name Token,नाव टोकन
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,मानक विक्री
@@ -3726,7 +3730,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} विक्री चलन विरुद्ध {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,प्रकल्प नाव
-DocType: Supplier,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
+DocType: Customer,Mention if non-standard receivable account,उल्लेख गैर-मानक प्राप्त खाते तर
 DocType: Journal Entry Account,If Income or Expense,उत्पन्न किंवा खर्च असेल तर
 DocType: Production Order,Required Items,आवश्यक आयटम
 DocType: Stock Ledger Entry,Stock Value Difference,शेअर मूल्य फरक
@@ -3747,7 +3751,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,या विक्री व्यक्ती साठी item गट निहाय लक्ष्य सेट करा .
 DocType: Stock Settings,Freeze Stocks Older Than [Days],फ्रीज स्टॉक  पेक्षा जुने [दिवस]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,सलग # {0}: मालमत्ता निश्चित मालमत्ता खरेदी / विक्री अनिवार्य आहे
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","दोन किंवा अधिक किंमत नियम वरील स्थितीवर आधारित आढळल्यास, अग्रक्रम लागू आहे. डीफॉल्ट मूल्य शून्य (रिक्त) आहे, तर प्राधान्य 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.,खालील वापरकर्त्यांना ब्लॉक दिवस रजा अर्ज मंजूर करण्याची परवानगी द्या.
@@ -3773,7 +3777,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,आयटम {0} एक स्टॉक आयटम नसल्यामुळे  दुर्लक्षित केला आहे
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","एका विशिष्ट व्यवहारात  किंमत नियम लागू न करण्यासाठी, सर्व लागू किंमत नियम अक्षम करणे आवश्यक आहे."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","एका विशिष्ट व्यवहारात  किंमत नियम लागू न करण्यासाठी, सर्व लागू किंमत नियम अक्षम करणे आवश्यक आहे."
 DocType: Assessment Group,Parent Assessment Group,पालक मूल्यांकन गट
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,नोकरी
 ,Sales Order Trends,विक्री ऑर्डर ट्रेन्ड
@@ -3784,7 +3788,7 @@
 DocType: Stock Entry Detail,Additional Cost,अतिरिक्त खर्च
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,आर्थिक वर्ष अंतिम तारीख
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","व्हाउचर नाही आधारित फिल्टर करू शकत नाही, व्हाउचर प्रमाणे गटात समाविष्ट केले तर"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,पुरवठादार कोटेशन करा
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,पुरवठादार कोटेशन करा
 DocType: Quality Inspection,Incoming,येणार्या
 DocType: BOM,Materials Required (Exploded),साहित्य आवश्यक(स्फोट झालेले )
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","स्वत: पेक्षा इतर, आपल्या संस्थेसाठी वापरकर्ते जोडा"
@@ -3812,6 +3816,7 @@
 DocType: Employee,History In Company,कंपनी मध्ये इतिहास
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,वृत्तपत्रे
 DocType: Stock Ledger Entry,Stock Ledger Entry,शेअर खतावणीत नोंद
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ग्राहक&gt; ग्राहक गट&gt; प्रदेश
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,त्याच आयटम अनेक वेळा केलेला आहे
 DocType: Department,Leave Block List,रजा ब्लॉक यादी
 DocType: Sales Invoice,Tax ID,कर आयडी
@@ -3821,7 +3826,7 @@
 DocType: Customer,Sales Partner and Commission,विक्री भागीदार व आयोगाच्या
 DocType: Employee Loan,Rate of Interest (%) / Year,व्याज (%) / वर्ष दर
 ,Project Quantity,प्रकल्प प्रमाण
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","एकूण {0} सर्व आयटम शून्य आहे, आपण &#39;वर आधारित शुल्क वितरण&#39; बदलू पाहिजे"
 DocType: Opportunity,To Discuss,चर्चा करण्यासाठी
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} युनिट {1} {2} हा व्यवहार पूर्ण करण्यासाठी आवश्यक.
 DocType: Loan Type,Rate of Interest (%) Yearly,व्याज दर (%) वार्षिक
@@ -3836,7 +3841,7 @@
 DocType: Purchase Invoice,Return,परत
 DocType: Production Order Operation,Production Order Operation,उत्पादन ऑर्डर ऑपरेशन
 DocType: Pricing Rule,Disable,अक्षम करा
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,भरण्याची पध्दत देयक आवश्यक आहे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,भरण्याची पध्दत देयक आवश्यक आहे
 DocType: Project Task,Pending Review,प्रलंबित पुनरावलोकन
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","मालमत्ता {0} तो आधीपासूनच आहे म्हणून, रद्द जाऊ शकत नाही {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),(खर्च दावा द्वारे) एकूण खर्च दावा
@@ -3844,11 +3849,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,मार्क अनुपिस्थत
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},सलग {0}: BOM # चलन {1} निवडले चलन समान असावी {2}
 DocType: Journal Entry Account,Exchange Rate,विनिमय दर
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,"विक्री ऑर्डर {0} सबमिट केलेली नाही,"
 DocType: Homepage,Tag Line,टॅग लाइन
 DocType: Fee Component,Fee Component,शुल्क घटक
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,वेगवान व्यवस्थापन
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,आयटम जोडा
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,आयटम जोडा
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},कोठार {0}: पालक खाते {1} कंपनी{2} ला संबंधित नाही
 DocType: Cheque Print Template,Regular,नियमित
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,सर्व मूल्यांकन निकष एकूण वजन 100% असणे आवश्यक आहे
@@ -3861,7 +3866,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,निवडलेले आयटमला  बॅच असू शकत नाही
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","मूल्यांकन दर बाबींचा {0}, जे लेखा नोंदी करणे आवश्यक आहे आढळले नाही {1} {2}. आयटम एक नमुना आयटम म्हणून व्यवहार असेल, तर {1}, {1} बाबींचा टेबल की उल्लेख करा. अन्यथा, लेखाचे रेकॉर्ड आयटम किंवा त्याचा उल्लेख मूल्यांकन दर येणाऱ्या स्टॉक व्यवहार एक तयार करा, आणि नंतर / submiting प्रयत्न नोंद रद्द"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,साहित्याचे % या पोच पावती विरोधात वितरित केले आहे
 DocType: Project,Customer Details,ग्राहक तपशील
@@ -3870,15 +3875,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,स्वीकारणारा नग साठी मापदंड प्रविष्ट करा
 DocType: Payment Entry,Paid Amount,पेड रक्कम
 DocType: Assessment Plan,Supervisor,पर्यवेक्षक
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ऑनलाइन
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ऑनलाइन
 ,Available Stock for Packing Items,पॅकिंग आयटम उपलब्ध शेअर
 DocType: Item Variant,Item Variant,आयटम व्हेरियंट
 DocType: Assessment Result Tool,Assessment Result Tool,मूल्यांकन निकाल साधन
 DocType: BOM Scrap Item,BOM Scrap Item,BOM स्क्रॅप बाबींचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,सबमिट आदेश हटविले जाऊ शकत नाही
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,गुणवत्ता व्यवस्थापन
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} आयटम अक्षम केले गेले आहे
 DocType: Employee Loan,Repay Fixed Amount per Period,प्रति कालावधी मुदत रक्कम परतफेड
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},आयटम {0} साठी  संख्या प्रविष्ट करा
 DocType: Employee External Work History,Employee External Work History,कर्मचारी बाह्य कार्य इतिहास
@@ -3905,7 +3910,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,विद्यार्थी ईमेल आयडी
 DocType: Employee,Notice (days),सूचना (दिवस)
 DocType: Tax Rule,Sales Tax Template,विक्री कर साचा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,अशी यादी तयार करणे जतन करण्यासाठी आयटम निवडा
 DocType: Employee,Encashment Date,एनकॅशमेंट तारीख
 DocType: Training Event,Internet,इंटरनेट
 DocType: Account,Stock Adjustment,शेअर समायोजन
@@ -3929,7 +3934,7 @@
 DocType: Item Variant Attribute,Attribute,विशेषता
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,कृपया  पासून / पर्यंत श्रेणी निर्दिष्ट करा
 DocType: Serial No,Under AMC,एएमसी अंतर्गत
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,आयटम मूल्यांकन दर उतरले खर्च व्हाउचर रक्कमचा  विचार करून  recalculate केले  आहे
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,आयटम मूल्यांकन दर उतरले खर्च व्हाउचर रक्कमचा  विचार करून  recalculate केले  आहे
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,विक्री व्यवहारासाठी  मुलभूत सेटिंग्ज.
 DocType: Guardian,Guardian Of ,पालकमंत्री
 DocType: Grading Scale Interval,Threshold,उंबरठा
@@ -3939,6 +3944,7 @@
 DocType: Purchase Invoice,Debit Note Issued,डेबिट टीप जारी
 DocType: Production Order,Warehouses,गोदामे
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} मालमत्ता हस्तांतरित केली जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,हा आयटम {0} (साचा) एक प्रकार आहे.
 DocType: Workstation,per hour,प्रती तास
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,खरेदी
 DocType: Announcement,Announcement,घोषणा
@@ -3954,8 +3960,8 @@
 DocType: Account,Receivable,प्राप्त
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,रो # {0}: पर्चेस आधिपासूनच अस्तित्वात आहे म्हणून पुरवठादार बदलण्याची परवानगी नाही
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,भूमिका ज्याला सेट क्रेडिट मर्यादा ओलांडत व्यवहार सादर करण्याची परवानगी आहे .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,उत्पादन करण्यासाठी आयटम निवडा
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","मास्टर डेटा समक्रमित करणे, तो काही वेळ लागू शकतो"
 DocType: Item,Material Issue,साहित्य अंक
 DocType: Hub Settings,Seller Description,विक्रेता वर्णन
 DocType: Employee Education,Qualification,पात्रता
@@ -3967,7 +3973,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,आदेश दिले
 DocType: Salary Detail,Component,घटक
 DocType: Assessment Criteria,Assessment Criteria Group,मूल्यांकन निकष गट
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},जमा घसारा उघडत समान पेक्षा कमी असणे आवश्यक {0}
 DocType: Warehouse,Warehouse Name,वखार नाव
 DocType: Naming Series,Select Transaction,निवडक व्यवहार
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,भूमिका मंजूर किंवा सदस्य मंजूर प्रविष्ट करा
@@ -3980,7 +3986,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,सादर शेअर प्रवेश {0} अस्तित्वात असल्याने रद्द करू शकत नाही
 DocType: Employee Loan,Disbursement Date,खर्च तारीख
 DocType: Vehicle,Vehicle,वाहन
 DocType: Purchase Invoice,In Words,शब्द मध्ये
@@ -3995,14 +4001,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,डॉ / लीड%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,मालमत्ता Depreciations आणि शिल्लक
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},रक्कम {0} {1} हस्तांतरित {2} करण्यासाठी {3}
 DocType: Sales Invoice,Get Advances Received,सुधारण प्राप्त करा
 DocType: Email Digest,Add/Remove Recipients,प्राप्तकर्ते  जोडा / काढा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},व्यवहार बंद उत्पादन विरुद्ध परवानगी नाही ऑर्डर {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","डीफॉल्ट म्हणून या आर्थिक वर्षात सेट करण्यासाठी, 'डीफॉल्ट म्हणून सेट करा' वर क्लिक करा"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,सामील व्हा
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,कमतरता Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,आयटम  variant {0} ज्याच्यामध्ये समान गुणधर्म अस्तित्वात आहेत
 DocType: Employee Loan,Repay from Salary,पगार पासून परत फेड करा
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},विरुद्ध पैसे विनंती {0} {1} रक्कम {2}
@@ -4020,7 +4026,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,मूल्यांकन निकाल तपशील
 DocType: Employee Education,Employee Education,कर्मचारी शिक्षण
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,आयटम गट टेबल मध्ये आढळले डुप्लिकेट आयटम गट
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,हा आयटम तपशील प्राप्त करण्यासाठी  आवश्यक आहे.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} आधीच प्राप्त झाला  आहे
@@ -4029,7 +4035,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","वखार {0} कोणत्याही खात्यावर दुवा साधला गेला नाही, संबंधित (मालमत्ता) खाते / निर्देशित पानाशी जोडले आहेत कोठार तयार करा."
 DocType: Purchase Invoice,Recurring Id,आवर्ती आयडी
 DocType: Customer,Sales Team Details,विक्री कार्यसंघ तपशील
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,कायमचे हटवा?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,कायमचे हटवा?
 DocType: Expense Claim,Total Claimed Amount,एकूण हक्क सांगितला रक्कम
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,विक्री संभाव्य संधी.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},अवैध {0}
@@ -4040,13 +4046,14 @@
 DocType: Warehouse,PIN,पिन
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext आपल्या शाळा सेटअप
 DocType: Sales Invoice,Base Change Amount (Company Currency),बेस बदला रक्कम (कंपनी चलन)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,खालील गोदामांची लेखा नोंदी नाहीत
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,पहिला  दस्तऐवज जतन करा.
 DocType: Account,Chargeable,आकारण्यास
 DocType: Company,Change Abbreviation,बदला Abbreviation
 DocType: Expense Claim Detail,Expense Date,खर्च तारीख
 DocType: Item,Max Discount (%),कमाल सवलत (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,गेल्या ऑर्डर रक्कम
+DocType: Task,Is Milestone,मैलाचा दगड आहे
 DocType: Daily Work Summary,Email Sent To,ई-मेल पाठविले
 DocType: Budget,Warn,चेतावणी द्या
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","इतर कोणताही अभिप्राय, रेकॉर्ड जावे की लक्षात घेण्याजोगा प्रयत्न."
@@ -4067,7 +4074,7 @@
 DocType: Item Attribute Value,Attribute Value,मूल्य विशेषता
 ,Itemwise Recommended Reorder Level,Itemwise पुनर्क्रमित स्तर शिफारस
 DocType: Salary Detail,Salary Detail,पगार तपशील
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,कृपया प्रथम {0} निवडा
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,कृपया प्रथम {0} निवडा
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,आयटम बॅच {0} {1} कालबाह्य झाले आहे.
 DocType: Sales Invoice,Commission,आयोग
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,उत्पादन वेळ पत्रक.
@@ -4079,41 +4086,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`फ्रीज स्टॉक जुने Than`% d दिवस कमी असणे आवश्यक आहे.
 DocType: Tax Rule,Purchase Tax Template,कर साचा खरेदी
 ,Project wise Stock Tracking,प्रकल्प शहाणा शेअर ट्रॅकिंग
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},देखभाल वेळापत्रक {0} विरुद्ध अस्तित्वात {0} आहे
 DocType: Stock Entry Detail,Actual Qty (at source/target),प्रत्यक्ष प्रमाण (स्त्रोत / लक्ष्य येथे)
 DocType: Item Customer Detail,Ref Code,संदर्भ कोड
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,कर्मचारी रेकॉर्ड.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,पुढील घसारा तारीख सेट करा
 DocType: HR Settings,Payroll Settings,पे रोल सेटिंग्ज
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,नॉन-लिंक्ड पावत्या आणि देयके जुळत.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,मागणी नोंद करा
 DocType: Email Digest,New Purchase Orders,नवीन खरेदी ऑर्डर
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,रूट एक पालक खर्च केंद्र असू शकत नाही
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ब्रँड निवडा
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ब्रँड निवडा
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,म्हणून घसारा जमा
 DocType: Sales Invoice,C-Form Applicable,सी-फॉर्म लागू
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ऑपरेशन वेळ ऑपरेशन  {0} साठी 0 पेक्षा जास्त असणे आवश्यक आहे
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,वखार अनिवार्य आहे
 DocType: Supplier,Address and Contacts,पत्ता आणि संपर्क
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM रुपांतर तपशील
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),ते 100px करून  (h) वेब अनुकूल 900px (w ) ठेवा
 DocType: Program,Program Abbreviation,कार्यक्रम संक्षेप
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,उत्पादन ऑर्डर एक आयटम साचा निषेध जाऊ शकत नाही
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,शुल्क प्रत्येक आयटम विरुद्ध खरेदी पावती मध्ये अद्यतनित केले जातात
 DocType: Warranty Claim,Resolved By,ने  निराकरण
 DocType: Bank Guarantee,Start Date,प्रारंभ तारीख
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,एक काळ साठी पाने वाटप करा.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,चेक आणि ठेवी चुकीचे  साफ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,खाते {0}: आपण पालक खाते म्हणून स्वत: नियुक्त करू शकत नाही
 DocType: Purchase Invoice Item,Price List Rate,किंमत सूची दर
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ग्राहक कोट तयार करा
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ग्राहक कोट तयार करा
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","""स्टॉक मध्ये"" किंवा या कोठारमधे  उपलब्ध स्टॉक आधारित "" स्टॉक मध्ये नाही"" दर्शवा."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),साहित्य बिल (DEL)
 DocType: Item,Average time taken by the supplier to deliver,पुरवठादार घेतलेल्या सरासरी वेळ वितरीत करण्यासाठी
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,मूल्यांकन निकाल
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,तास
 DocType: Project,Expected Start Date,अपेक्षित प्रारंभ तारीख
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,शुल्क जर आयटमला  लागू होत नाही तर आयटम काढा
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,व्यवहार चलन पेमेंट गेटवे चलन म्हणून समान असणे आवश्यक आहे
 DocType: Payment Entry,Receive,प्राप्त
@@ -4124,19 +4130,19 @@
 DocType: Workstation,Operating Costs,खर्च
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,क्रिया जमा मासिक अंदाजपत्रक ओलांडला तर
 DocType: Purchase Invoice,Submit on creation,निर्माण केल्यावर सबमिट
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},चलन {0} असणे आवश्यक आहे {1}
 DocType: Asset,Disposal Date,विल्हेवाट दिनांक
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ई-मेल ते सुट्टी नसेल तर दिले क्षणी कंपनी सर्व सक्रिय कर्मचारी पाठवला जाईल. प्रतिसादांचा सारांश मध्यरात्री पाठवला जाईल.
 DocType: Employee Leave Approver,Employee Leave Approver,कर्मचारी रजा मंजुरी
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},रो {0}: कोठार {1} साठी एक पुन्हा क्रमवारी लावा नोंद आधीच अस्तित्वात आहे
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","कोटेशन केले आहे कारण, म्हणून गमवलेले जाहीर करू शकत नाही."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,प्रशिक्षण अभिप्राय
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,उत्पादन ऑर्डर {0} सादर करणे आवश्यक आहे
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},कृपया आयटम   {0} साठी   प्रारंभ तारीख आणि अंतिम तारीख निवडा
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},कृपया आयटम   {0} साठी   प्रारंभ तारीख आणि अंतिम तारीख निवडा
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},अर्थात सलग आवश्यक आहे {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,तारीखे पर्यंत  तारखेपासूनच्या  आधी असू शकत नाही
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ संपादित करा किंमती जोडा
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ संपादित करा किंमती जोडा
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Batch,Parent Batch,पालक बॅच
 DocType: Cheque Print Template,Cheque Print Template,धनादेश प्रिंट साचा
@@ -4150,7 +4156,7 @@
 ,Ordered Items To Be Delivered,आदेश दिलेले  आयटम वितरित करणे
 DocType: Account,Income,उत्पन्न
 DocType: Industry Type,Industry Type,उद्योग प्रकार
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,काहीतरी चूक झाली!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,काहीतरी चूक झाली!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,चेतावणी: रजा अर्जा मधे खालील  ब्लॉक तारखा समाविष्टीत आहेत
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,विक्री चलन {0} आधीच सादर केला गेला आहे
 DocType: Assessment Result Detail,Score,धावसंख्या
@@ -4181,17 +4187,17 @@
 DocType: Item,Variant Based On,चल आधारित
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},एकूण नियुक्त वजन 100% असावे. हे  {0} आहे
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,आपले पुरवठादार
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,विक्री आदेश केली आहे म्हणून गमावले म्हणून सेट करू शकत नाही.
 DocType: Request for Quotation Item,Supplier Part No,पुरवठादार भाग नाही
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,पासून प्राप्त
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',गटात मूल्यांकन &#39;किंवा&#39; Vaulation आणि एकूण &#39;करिता वजा करू शकत नाही
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,पासून प्राप्त
 DocType: Lead,Converted,रूपांतरित
 DocType: Item,Has Serial No,सिरियल क्रमांक  आहे
 DocType: Employee,Date of Issue,समस्येच्या तारीख
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} पासून {1} साठी
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} पासून {1} साठी
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},रो # {0}: पुरवठादार {1} साठी  आयटम सेट करा
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,सलग {0}: तास मूल्य शून्य पेक्षा जास्त असणे आवश्यक आहे.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,आयटम {1} ला संलग्न वेबसाइट प्रतिमा {0} सापडू शकत नाही
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,वेबसाइट वर अनेक गट मधे हे  आयटम सूचीबद्ध .
@@ -4200,20 +4206,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,आपल्याला गोठविलेले  मूल्य सेट करण्यासाठी अधिकृत नाही
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled नोंदी मिळवा
 DocType: Payment Reconciliation,From Invoice Date,चलन तारखेपासून
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,बिलिंग चलन एकतर मुलभूत comapany चलनात किंवा पक्ष खाते चलन समान असणे आवश्यक आहे
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,एनकॅशमेंट द्या
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ती काय करते?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,गुदाम
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,सर्व विद्यार्थी प्रवेश
 ,Average Commission Rate,सरासरी आयोग दर
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'नॉन-स्टॉक आयटम 'साठी अनुक्रमांक 'होय' असू शकत नाही.
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,उपस्थिती भविष्यात तारखा चिन्हांकित केला जाऊ शकत नाही
 DocType: Pricing Rule,Pricing Rule Help,किंमत नियम मदत
 DocType: School House,House Name,घर नाव
 DocType: Purchase Taxes and Charges,Account Head,खाते प्रमुख
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,आयटम अतिरिक्त खर्चाची  सुधारणा करण्यासाठी  अतिरिक्त खर्च अद्यतनित करा
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,इलेक्ट्रिकल
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,आपल्या वापरकर्त्यांना आपल्या संस्थेसाठी उर्वरित जोडा. आपण संपर्क जोडून त्यांना आपले पोर्टल ग्राहकांना आमंत्रित करा जोडू शकता
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,आपल्या वापरकर्त्यांना आपल्या संस्थेसाठी उर्वरित जोडा. आपण संपर्क जोडून त्यांना आपले पोर्टल ग्राहकांना आमंत्रित करा जोडू शकता
 DocType: Stock Entry,Total Value Difference (Out - In),एकूण मूल्य फरक (आउट - मध्ये)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}साठी सेट नाही
@@ -4222,7 +4228,7 @@
 DocType: Item,Customer Code,ग्राहक कोड
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},साठी जन्मदिवस अनुस्मरण {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,गेल्या ऑर्डर असल्याने दिवस
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,खाते करण्यासाठी डेबिट एक ताळेबंद खाते असणे आवश्यक आहे
 DocType: Buying Settings,Naming Series,नामांकन मालिका
 DocType: Leave Block List,Leave Block List Name,रजा ब्लॉक यादी नाव
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,विमा प्रारंभ तारखेच्या विमा समाप्ती तारीख कमी असावे
@@ -4237,9 +4243,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},{0} वेळ पत्रक आधीपासूनच तयार कर्मचा पगाराच्या स्लिप्स {1}
 DocType: Vehicle Log,Odometer,ओडोमीटर
 DocType: Sales Order Item,Ordered Qty,आदेश दिलेली  Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,आयटम {0} अक्षम आहे
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,आयटम {0} अक्षम आहे
 DocType: Stock Settings,Stock Frozen Upto,शेअर फ्रोजन पर्यंत
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM कोणत्याही शेअर आयटम असणे नाही
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},कालावधी पासून आणि कालावधी   पर्यंत  तारखा  कालावधी  आवर्ती {0} साठी बंधनकारक
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,प्रकल्प क्रियाकलाप / कार्य.
 DocType: Vehicle Log,Refuelling Details,Refuelling तपशील
@@ -4249,8 +4255,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,गेल्या खरेदी दर आढळले नाही
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Write Off रक्कम (कंपनी चलन)
 DocType: Sales Invoice Timesheet,Billing Hours,बिलिंग तास
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,साठी {0} आढळले नाही मुलभूत BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,रो # {0}: पुनर्क्रमित प्रमाणात सेट करा
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,त्यांना येथे जोडण्यासाठी आयटम टॅप करा
 DocType: Fees,Program Enrollment,कार्यक्रम नावनोंदणी
 DocType: Landed Cost Voucher,Landed Cost Voucher,स्थावर खर्च व्हाउचर
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} सेट करा
@@ -4274,7 +4281,7 @@
 DocType: Maintenance Visit,Maintenance Date,देखभाल तारीख
 DocType: Purchase Invoice Item,Rejected Serial No,नाकारल्याचे सिरियल क्रमांक
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,वर्ष प्रारंभ तारीख किंवा समाप्ती तारीख {0} आच्छादित आहे. टाळण्यासाठी कृपया कंपनी
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},आयटम  {0} साठी प्रारंभ तारीखेपेक्षा अंतिम तारीख कमी असणे आवश्यक आहे
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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.","उदाहरण: . एबीसीडी ##### मालिका सेट केले जाते आणि सिरियल कोणतेही व्यवहार उल्लेख , तर स्वयंचलित सिरीयल क्रमांक या मालिकेवर आधारित तयार होईल. आपण नेहमी स्पष्टपणे या आयटम साठी सिरिअल क्रमांक उल्लेख करू इच्छित असल्यास हे रिक्त सोडा."
 DocType: Upload Attendance,Upload Attendance,हजेरी अपलोड करा
@@ -4351,7 +4358,6 @@
 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,अनेक गटामध्ये आयटम च्या क्रॉस यादी
-DocType: Grade Interval,Grade Interval,ग्रेड मध्यांतर
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},आर्थिक वर्ष प्रारंभ तारीख आणि आर्थिक वर्ष अंतिम तारीख आधीच आर्थिक वर्षात सेट केल्या आहेत {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,सुधारित मंजुरी दिनांक
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,स्प्लिट बॅच
@@ -4398,14 +4404,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,आपण अर्थातच आधारित गटांमध्ये करताना बॅच विचार करू इच्छित नाही तर अनचेक.
 DocType: Asset,Frequency of Depreciation (Months),घसारा वारंवारता (महिने)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,क्रेडिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,क्रेडिट खाते
 DocType: Landed Cost Item,Landed Cost Item,स्थावर खर्च आयटम
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,शून्य मूल्ये दर्शवा
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,आयटम प्रमाण कच्चा माल दिलेल्या प्रमाणात repacking / उत्पादन नंतर प्राप्त
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,सेटअप माझ्या संस्थेसाठी एक साधी वेबसाइट
 DocType: Payment Reconciliation,Receivable / Payable Account,प्राप्त / देय खाते
 DocType: Delivery Note Item,Against Sales Order Item,विक्री ऑर्डर आयटम विरुद्ध
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},कृपया विशेषता{0} साठी  विशेषतेसाठी मूल्य निर्दिष्ट करा
 DocType: Item,Default Warehouse,मुलभूत कोठार
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},अर्थसंकल्प गट खाते विरुद्ध नियुक्त केला जाऊ शकत नाही {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,पालक खर्च केंद्र प्रविष्ट करा
@@ -4451,7 +4457,7 @@
 DocType: Opportunity Item,Basic Rate,बेसिक रेट
 DocType: GL Entry,Credit Amount,क्रेडिट रक्कम
 DocType: Cheque Print Template,Signatory Position,ना स्थिती
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,हरवले म्हणून सेट करा
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,हरवले म्हणून सेट करा
 DocType: Timesheet,Total Billable Hours,एकूण बिल तास
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,भरणा पावती टीप
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,हे या ग्राहक विरुद्ध व्यवहार आधारित आहे. तपशीलासाठी खालील टाइमलाइन पाहू
@@ -4465,11 +4471,11 @@
 ,Items To Be Requested,आयटम विनंती करण्यासाठी
 DocType: Purchase Order,Get Last Purchase Rate,गेल्या खरेदी दर मिळवा
 DocType: Company,Company Info,कंपनी माहिती
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,निवडा किंवा नवीन ग्राहक जोडणे
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,खर्च केंद्र खर्च दावा बुक करणे आवश्यक आहे
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),निधी मालमत्ता (assets) अर्ज
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,हे या कर्मचा उपस्थिती आधारित आहे
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,डेबिट खाते
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,डेबिट खाते
 DocType: Fiscal Year,Year Start Date,वर्ष प्रारंभ तारीख
 DocType: Attendance,Employee Name,कर्मचारी नाव
 DocType: Sales Invoice,Rounded Total (Company Currency),गोळाबेरीज एकूण (कंपनी चलन)
@@ -4478,13 +4484,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,खालील दिवस रजा अनुप्रयोग बनवण्यासाठी वापरकर्त्यांना थांबवा.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,खरेदी रक्कम
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,पुरवठादार अवतरण {0} तयार
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,समाप्त वर्ष प्रारंभ वर्ष असू शकत नाही
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,कर्मचारी फायदे
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},एक मुलभूत कर्मचारी सुट्टी यादी सेट करा {0} किंवा कंपनी {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} अस्तित्वात नाही
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ग्राहक असण्याचा बिले.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,प्रकल्प आयडी
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},रो नाही {0}: रक्कम खर्च दावा {1} विरुद्ध रक्कम प्रलंबित पेक्षा जास्त असू शकत नाही. प्रलंबित रक्कम  {2} आहे
@@ -4493,15 +4499,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 वाचन
 ,Hub,हब
 DocType: GL Entry,Voucher Type,प्रमाणक प्रकार
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,किंमत सूची आढळली किंवा अकार्यान्वीत केलेली  नाही
 DocType: Employee Loan Application,Approved,मंजूर
 DocType: Pricing Rule,Price,किंमत
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} वर मुक्त केलेले कर्मचारी 'Left' म्हणून set करणे आवश्यक आहे
 DocType: Guardian,Guardian,पालक
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,मूल्यमापन {0} {1} दिलेल्या तारखेपासून श्रेणीत कर्मचारी तयार
 DocType: Employee,Education,शिक्षण
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,देल
 DocType: Selling Settings,Campaign Naming By,करून मोहीम नामांकन
 DocType: Employee,Current Address Is,सध्याचा पत्ता आहे
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,सुधारित
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","पर्यायी. निर्देशीत न केल्यास, कंपनीच्या मुलभूत चलन ठरावा ."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,लेखा जर्नल नोंदी.
 DocType: Delivery Note Item,Available Qty at From Warehouse,वखार पासून वर उपलब्ध Qty
@@ -4510,7 +4518,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},रो {0}: {3} {4} मधील  {1} / {2} पक्ष / खात्याशी जुळत नाही
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,खर्चाचे खाते प्रविष्ट करा
 DocType: Account,Stock,शेअर
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",सलग # {0}: संदर्भ दस्तऐवज प्रकार ऑर्डर खरेदी एक बीजक किंवा जर्नल प्रवेश खरेदी असणे आवश्यक आहे
 DocType: Employee,Current Address,सध्याचा पत्ता
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","आयटम आणखी एक नग प्रकार असेल  तर  वर्णन , प्रतिमा, किंमत, कर आदी टेम्पलेट निश्चित केली जाईल"
 DocType: Serial No,Purchase / Manufacture Details,खरेदी / उत्पादन तपशील
@@ -4538,7 +4546,7 @@
 DocType: Hub Settings,Hub Settings,हब सेटिंग्ज
 DocType: Project,Gross Margin %,एकूण मार्जिन%
 DocType: BOM,With Operations,ऑपरेशन
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,लेखा नोंदी आधीच चलन {0} मधे कंपनी {1} साठी केले गेले आहेत. कृपया चलन एक प्राप्त किंवा देय खाते निवडा {0} .
 DocType: Asset,Is Existing Asset,मालमत्ता अस्तित्वात आहे
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
 DocType: Salary Detail,Statistical Component,सांख्यिकी घटक
@@ -4563,7 +4571,7 @@
 DocType: Assessment Plan,Room,खोली
 DocType: Purchase Order,Advance Paid,आगाऊ अदा
 DocType: Item,Item Tax,आयटम कर
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,पुरवठादार साहित्य
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,पुरवठादार साहित्य
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,उत्पादन शुल्क चलन
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,थ्रेशोल्ड {0}% एकदा एकापेक्षा जास्त वेळा दिसून
 DocType: Expense Claim,Employees Email Id,कर्मचारी ई मेल आयडी
@@ -4594,9 +4602,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,लोगो संलग्न
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,शेअर स्तर
 DocType: Customer,Commission Rate,आयोगाने दर
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,व्हेरियंट करा
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,व्हेरियंट करा
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,विभागाने ब्लॉक रजा अनुप्रयोग.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",भरणा प्रकार मिळतील एक द्या आणि अंतर्गत ट्रान्सफर करणे आवश्यक आहे
 apps/erpnext/erpnext/config/selling.py +179,Analytics,विश्लेषण
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,कार्ट रिक्त आहे
 DocType: Vehicle,Model,मॉडेल
@@ -4607,6 +4615,7 @@
 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 +161,Capital Stock,कॅपिटल शेअर
+DocType: Shopping Cart Settings,Show Public Attachments,सार्वजनिक संलग्नक दर्शवा
 DocType: Packing Slip,Package Weight Details,संकुल वजन तपशील
 DocType: Payment Gateway Account,Payment Gateway Account,पेमेंट गेटवे खाते
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,पैसे पूर्ण भरल्यानंतर  वापरकर्ता निवडलेल्या पृष्ठला  पुनर्निर्देशित झाला पाहिजे
@@ -4625,15 +4634,15 @@
 DocType: Batch,Expiry Date,कालावधी समाप्ती तारीख
 ,Supplier Addresses and Contacts,पुरवठादार पत्ते आणि संपर्क
 ,accounts-browser,खाती ब्राउझर
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,कृपया   पहिले  वर्ग निवडा
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,कृपया   पहिले  वर्ग निवडा
 apps/erpnext/erpnext/config/projects.py +13,Project master.,प्रकल्प मास्टर.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",", प्रती-बिलिंग किंवा क्रमवारी लावणे परवानगी शेअर सेटिंग्ज किंवा Item &quot;भत्ता&quot; अद्यतनित."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,चलने इ $ असे कोणत्याही प्रतीक पुढील दर्शवू नका.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(अर्धा दिवस)
 DocType: Supplier,Credit Days,क्रेडिट दिवस
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,विद्यार्थी बॅच करा
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,विद्यार्थी बॅच करा
 DocType: Leave Type,Is Carry Forward,कॅरी फॉरवर्ड आहे
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM चे आयटम मिळवा
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM चे आयटम मिळवा
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,आघाडी  वेळ दिवस
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},सलग # {0}: पोस्ट दिनांक खरेदी तारीख एकच असणे आवश्यक आहे {1} मालमत्ता {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,वरील टेबलमधे  विक्री आदेश प्रविष्ट करा
@@ -4650,8 +4659,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,मंजूर रक्कम
 DocType: GL Entry,Is Opening,उघडत आहे
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},रो {0}: नावे नोंद  {1} सोबत लिंक केले जाऊ शकत नाही
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,सेटअप सेटअप द्वारे उपस्थिती मालिका संख्या करा&gt; क्रमांकन मालिका
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 ec3cf15..e1f0ad9 100644
--- a/erpnext/translations/ms.csv
+++ b/erpnext/translations/ms.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Disewa
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Digunakan untuk Pengguna
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Perintah Pengeluaran berhenti tidak boleh dibatalkan, Unstop terlebih dahulu untuk membatalkan"
 DocType: Vehicle Service,Mileage,Jarak tempuh
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Adakah anda benar-benar mahu menghapuskan aset ini?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Pilih Pembekal Lalai
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Pilih Pembekal Lalai
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Mata wang diperlukan untuk Senarai Harga {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Akan dikira dalam urus niaga.
 DocType: Purchase Order,Customer Contact,Pelanggan Hubungi
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Cemerlang untuk {0} tidak boleh kurang daripada sifar ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minit
 DocType: Leave Type,Leave Type Name,Tinggalkan Nama Jenis
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Tunjukkan terbuka
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Tunjukkan terbuka
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Siri Dikemaskini Berjaya
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checkout
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Kemasukan Dihantar
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Perkara Status luput
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draf
 DocType: Mode of Payment Account,Mode of Payment Account,Cara Pembayaran Akaun
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show Kelainan
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show Kelainan
 DocType: Academic Term,Academic Term,Jangka akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,bahan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kuantiti
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Kuantiti
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Jadual account tidak boleh kosong.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Pinjaman (Liabiliti)
 DocType: Employee Education,Year of Passing,Tahun Pemergian
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Rujukan:% s, Item Kod:% s dan Pelanggan:% s"
 DocType: Item,Country of Origin,Negara asal
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,In Stock
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Isu Terbuka
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Penjagaan Kesihatan
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Kelewatan dalam pembayaran (Hari)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Perbelanjaan perkhidmatan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Invois
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Nombor siri: {0} sudah dirujuk dalam Sales Invoice: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Invois
 DocType: Maintenance Schedule Item,Periodicity,Jangka masa
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Tahun fiskal {0} diperlukan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Dijangka Tarikh penghantaran adalah menjadi sebelum Pesanan Jualan Tarikh
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Lampirkan fail csv dengan dua lajur, satu untuk nama lama dan satu untuk nama baru"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} tidak dalam apa-apa aktif Tahun Anggaran.
 DocType: Packed Item,Parent Detail docname,Detail Ibu Bapa docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Rujukan: {0}, Kod Item: {1} dan Pelanggan: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Membuka pekerjaan.
 DocType: Item Attribute,Increment,Kenaikan
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Pilih Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Pilih Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Pengiklanan
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Mendapatkan barangan dari
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Tidak dibenarkan untuk {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Mendapatkan barangan dari
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Saham tidak boleh dikemaskini terhadap Penghantaran Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produk {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Tiada perkara yang disenaraikan
 DocType: Payment Reconciliation,Reconcile,Mendamaikan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Barang runcit
 DocType: Quality Inspection Reading,Reading 1,Membaca 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Selepas Tarikh Susut nilai tidak boleh sebelum Tarikh Pembelian
 DocType: SMS Center,All Sales Person,Semua Orang Jualan
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Pengagihan Bulanan ** membantu anda mengedarkan Bajet / sasaran seluruh bulan jika anda mempunyai bermusim dalam perniagaan anda.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Bukan perkakas yang terdapat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Bukan perkakas yang terdapat
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktur Gaji Hilang
 DocType: Lead,Person Name,Nama Orang
 DocType: Sales Invoice Item,Sales Invoice Item,Perkara Invois Jualan
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",contohnya &quot;Sekolah Rendah&quot; atau &quot;Universiti&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Laporan saham
 DocType: Warehouse,Warehouse Detail,Detail Gudang
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Had kredit telah menyeberang untuk pelanggan {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Tarikh Akhir Term tidak boleh lewat daripada Tarikh Akhir Tahun Akademik Tahun yang istilah ini dikaitkan (Akademik Tahun {}). Sila betulkan tarikh dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Adakah Aset Tetap&quot; tidak boleh dibiarkan, kerana rekod aset wujud terhadap item"
 DocType: Vehicle Service,Brake Oil,Brek Minyak
 DocType: Tax Rule,Tax Type,Jenis Cukai
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Anda tidak dibenarkan untuk menambah atau update entri sebelum {0}
 DocType: BOM,Item Image (if not slideshow),Perkara imej (jika tidak menayang)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Satu Pelanggan wujud dengan nama yang sama
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Kadar sejam / 60) * Masa Operasi Sebenar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Pilih BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Pilih BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kos Item Dihantar
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Cuti pada {0} bukan antara Dari Tarikh dan To Date
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,sekolah
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Tiada rekod cuti dijumpai untuk pekerja {0} untuk {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Sila masukkan syarikat pertama
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Sila pilih Syarikat pertama
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Sasaran Pada
 DocType: BOM,Total Cost,Jumlah Kos
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Tuntutan Amaun
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,kumpulan pelanggan Duplicate dijumpai di dalam jadual kumpulan cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Jenis pembekal / Pembekal
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Jenis pembekal / Pembekal
 DocType: Naming Series,Prefix,Awalan
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Guna habis
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,gred
 DocType: Sales Invoice Item,Delivered By Supplier,Dihantar Oleh Pembekal
 DocType: SMS Center,All Contact,Semua Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Order Production telah dicipta untuk semua item dengan BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Gaji Tahunan
 DocType: Daily Work Summary,Daily Work Summary,Ringkasan Kerja Harian
 DocType: Period Closing Voucher,Closing Fiscal Year,Penutup Tahun Anggaran
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} dibekukan
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} dibekukan
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Sila pilih Syarikat Sedia Ada untuk mewujudkan Carta Akaun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Perbelanjaan saham
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Pilih Warehouse sasaran
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kredit dalam Mata Wang Syarikat
 DocType: Delivery Note,Installation Status,Pemasangan Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Adakah anda mahu untuk mengemaskini kehadiran? <br> Turut hadir: {0} \ <br> Tidak hadir: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Qty Diterima + Ditolak mestilah sama dengan kuantiti yang Diterima untuk Perkara {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Bahan mentah untuk bekalan Pembelian
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Sekurang-kurangnya satu cara pembayaran adalah diperlukan untuk POS invois.
 DocType: Products Settings,Show Products as a List,Show Produk sebagai Senarai yang
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Buat Entry Susutnilai
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Jenis Permintaan
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,membuat pekerja
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,membuat pekerja
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Penyiaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Pelaksanaan
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Butiran operasi dijalankan.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Rancangan untuk lawatan penyelenggaraan.
 DocType: SMS Settings,Enter url parameter for message,Masukkan parameter url untuk mesej
 DocType: POS Profile,Customer Groups,Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Penyata kewangan
 DocType: Guardian,Students,pelajar
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Peraturan untuk menggunakan penentuan harga dan diskaun.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Senarai Harga mesti pakai untuk Membeli atau Menjual
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},jumlah pendahuluan tidak boleh lebih besar daripada {0} {1}
 DocType: Naming Series,Series List for this Transaction,Senarai Siri bagi Urusniaga ini
 DocType: Company,Default Payroll Payable Account,Lalai Payroll Akaun Kena Bayar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update E-mel Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update E-mel Group
 DocType: Sales Invoice,Is Opening Entry,Apakah Membuka Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Sebut jika akaun belum terima tidak standard yang diguna pakai
 DocType: Course Schedule,Instructor Name,pengajar Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Untuk Gudang diperlukan sebelum Hantar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Diterima Dalam
 DocType: Sales Partner,Reseller,Penjual Semula
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jika disemak, Akan termasuk barangan tanpa saham dalam Permintaan Bahan."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Terhadap Jualan Invois Perkara
 ,Production Orders in Progress,Pesanan Pengeluaran di Kemajuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tunai bersih daripada Pembiayaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage penuh, tidak menyelamatkan"
 DocType: Lead,Address & Contact,Alamat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Tambahkan daun yang tidak digunakan dari peruntukan sebelum
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Seterusnya berulang {0} akan diwujudkan pada {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Jumlah Kos Jumlah (melalui Lembaran Time)
 DocType: Item Website Specification,Item Website Specification,Spesifikasi Item Laman Web
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Tinggalkan Disekat
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Penyertaan
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Perkara {0} telah mencapai penghujungnya kehidupan di {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Penyertaan
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Tahunan
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Saham Penyesuaian Perkara
 DocType: Stock Entry,Sales Invoice No,Jualan Invois No
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Menyiarkan dalam Hab
 DocType: Student Admission,Student Admission,Kemasukan pelajar
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Perkara {0} dibatalkan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Permintaan bahan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Perkara {0} dibatalkan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cek cemerlang dan Deposit untuk membersihkan
 DocType: Item,Synced With Hub,Segerakkan Dengan Hub
 DocType: Vehicle,Fleet Manager,Pengurus Fleet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak boleh negatif untuk item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Salah Kata Laluan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} tidak boleh negatif untuk item {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Salah Kata Laluan
 DocType: Item,Variant Of,Varian Daripada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Siap Qty tidak boleh lebih besar daripada &#39;Kuantiti untuk Pengeluaran&#39;
 DocType: Period Closing Voucher,Closing Account Head,Penutup Kepala Akaun
 DocType: Employee,External Work History,Luar Sejarah Kerja
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Ralat Rujukan Pekeliling
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Memberitahu melalui e-mel pada penciptaan Permintaan Bahan automatik
 DocType: Journal Entry,Multi Currency,Mata Multi
 DocType: Payment Reconciliation Invoice,Invoice Type,Jenis invois
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Penghantaran Nota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Penghantaran Nota
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Menubuhkan Cukai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kos Aset Dijual
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
-DocType: Grade Interval,Min Score,min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dimasukkan dua kali dalam Cukai Perkara
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Ringkasan untuk minggu ini dan aktiviti-aktiviti yang belum selesai
 DocType: Student Applicant,Admitted,diterima Masuk
 DocType: Workstation,Rent Cost,Kos sewa
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Order Nilai
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,transaksi Bank / Tunai terhadap pihak atau untuk pemindahan dalaman
 DocType: Shipping Rule,Valid for Countries,Sah untuk Negara
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Perkara ini adalah Template dan tidak boleh digunakan dalam urus niaga. Sifat-sifat perkara akan disalin ke atas ke dalam varian kecuali &#39;Tiada Salinan&#39; ditetapkan
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Jumlah Pesanan Dianggap
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Jawatan Pekerja (contohnya Ketua Pegawai Eksekutif, Pengarah dan lain-lain)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Sila masukkan &#39;Ulangi pada hari Bulan&#39; nilai bidang
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Invois Belian tidak boleh dibuat terhadap aset yang sedia ada {1}
 DocType: Item Tax,Tax Rate,Kadar Cukai
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} telah diperuntukkan untuk pekerja {1} untuk tempoh {2} kepada {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Pilih Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Pilih Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Membeli Invois {0} telah dikemukakan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No mestilah sama dengan {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Tukar ke Kumpulan bukan-
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (banyak) dari Perkara yang.
 DocType: C-Form Invoice Detail,Invoice Date,Tarikh invois
 DocType: GL Entry,Debit Amount,Jumlah Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Hanya akan ada 1 Akaun setiap Syarikat dalam {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Sila lihat lampiran
 DocType: Purchase Order,% Received,% Diterima
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Cipta Kumpulan Pelajar
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Permintaan untuk sebut harga
 DocType: Salary Slip Timesheet,Working Hours,Waktu Bekerja
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Menukar nombor yang bermula / semasa urutan siri yang sedia ada.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Buat Pelanggan baru
-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.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Buat Pesanan Pembelian
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Buat Pelanggan baru
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jika beberapa Peraturan Harga terus diguna pakai, pengguna diminta untuk menetapkan Keutamaan secara manual untuk menyelesaikan konflik."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Buat Pesanan Pembelian
 ,Purchase Register,Pembelian Daftar
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Caj yang dikenakan
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Cuti'
 DocType: Purchase Receipt,Vehicle Date,Kenderaan Tarikh
 DocType: Student Log,Medical,Perubatan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Sebab bagi kehilangan
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Sebab bagi kehilangan
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead Pemilik tidak boleh menjadi sama seperti Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Jumlah yang diperuntukkan tidak boleh lebih besar daripada jumlah tidak dilaras
 DocType: Announcement,Receiver,penerima
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kuantiti dan Kadar
 DocType: Delivery Note,% Installed,% Dipasang
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Bilik darjah / Laboratories dan lain-lain di mana kuliah boleh dijadualkan.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Sila masukkan nama syarikat pertama
 DocType: Purchase Invoice,Supplier Name,Nama Pembekal
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Baca Manual ERPNext yang
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,medan mandatori - Academic Year
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,medan mandatori - Academic Year
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Menyesuaikan teks pengenalan yang berlaku sebagai sebahagian daripada e-mel itu. Setiap transaksi mempunyai teks pengenalan yang berasingan.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Sila menetapkan akaun dibayar lalai bagi syarikat itu {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tetapan global untuk semua proses pembuatan.
 DocType: Accounts Settings,Accounts Frozen Upto,Akaun-akaun Dibekukan Sehingga
 DocType: SMS Log,Sent On,Dihantar Pada
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Sifat {0} dipilih beberapa kali dalam Atribut Jadual
 DocType: HR Settings,Employee record is created using selected field. ,Rekod pekerja dicipta menggunakan bidang dipilih.
 DocType: Sales Order,Not Applicable,Tidak Berkenaan
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Master bercuti.
 DocType: Request for Quotation Item,Required Date,Tarikh Diperlukan
 DocType: Delivery Note,Billing Address,Alamat Bil
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Sila masukkan Kod Item.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Sila masukkan Kod Item.
 DocType: BOM,Costing,Berharga
 DocType: Tax Rule,Billing County,County Billing
 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"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Dari Pakej No.
 DocType: Item Attribute,To Range,Untuk Julat
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Sekuriti dan Deposit
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Tidak boleh menukar kaedah penilaian, kerana terdapat urus niaga terhadap beberapa item yang tidak mempunyai ia kaedah penilaian sendiri"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Jumlah daun diperuntukkan adalah wajib
 DocType: Job Opening,Description of a Job Opening,Keterangan yang Lowongan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Sementara menunggu aktiviti untuk hari ini
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Sila pilih Course
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Sila pilih Syarikat
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Sila pilih Syarikat
 DocType: Stock Entry Detail,Difference Account,Akaun perbezaan
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Tidak boleh tugas sedekat tugas takluknya {0} tidak ditutup.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Sila masukkan Gudang yang mana Bahan Permintaan akan dibangkitkan
 DocType: Production Order,Additional Operating Cost,Tambahan Kos Operasi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetik
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Untuk bergabung, sifat berikut mestilah sama bagi kedua-dua perkara"
 DocType: Shipping Rule,Net Weight,Berat Bersih
 DocType: Employee,Emergency Phone,Telefon Kecemasan
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Beli
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Sila menentukan gred bagi Ambang 0%
 DocType: Sales Order,To Deliver,Untuk Menyampaikan
 DocType: Purchase Invoice Item,Item,Perkara
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial tiada perkara tidak boleh menjadi sebahagian kecil
 DocType: Journal Entry,Difference (Dr - Cr),Perbezaan (Dr - Cr)
 DocType: Account,Profit and Loss,Untung dan Rugi
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Urusan subkontrak
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Kenaikan tidak boleh 0
 DocType: Production Planning Tool,Material Requirement,Keperluan Bahan
 DocType: Company,Delete Company Transactions,Padam Transaksi Syarikat
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Rujukan dan Tarikh Rujukan adalah wajib untuk transaksi Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Tambah / Edit Cukai dan Caj
 DocType: Purchase Invoice,Supplier Invoice No,Pembekal Invois No
 DocType: Territory,For reference,Untuk rujukan
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Pemasangan Nota Perkara
 DocType: Production Plan Item,Pending Qty,Menunggu Kuantiti
 DocType: Budget,Ignore,Abaikan
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} tidak aktif
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} tidak aktif
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS yang dihantar ke nombor berikut: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,dimensi Persediaan cek percetakan
 DocType: Salary Slip,Salary Slip Timesheet,Slip Gaji Timesheet
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Jumlah Suruhanjaya
 DocType: Pricing Rule,Sales Partner,Rakan Jualan
 DocType: Buying Settings,Purchase Receipt Required,Resit pembelian Diperlukan
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Kadar Penilaian adalah wajib jika Stok Awal memasuki
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Tiada rekod yang terdapat dalam jadual Invois yang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Sila pilih Syarikat dan Parti Jenis pertama
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Tahun kewangan / perakaunan.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Nilai terkumpul
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Maaf, Serial No tidak boleh digabungkan"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Buat Jualan Pesanan
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Buat Jualan Pesanan
 DocType: Project Task,Project Task,Projek Petugas
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Jumlah Besar
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,resume Lampiran
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ulang Pelanggan
 DocType: Leave Control Panel,Allocate,Memperuntukkan
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Jualan Pulangan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Jualan Pulangan
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Nota: Jumlah daun diperuntukkan {0} hendaklah tidak kurang daripada daun yang telah pun diluluskan {1} untuk tempoh yang
 DocType: Announcement,Posted By,Posted By
 DocType: Item,Delivered by Supplier (Drop Ship),Dihantar oleh Pembekal (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Sebutharga Untuk
 DocType: Lead,Middle Income,Pendapatan Tengah
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Pembukaan (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Jumlah yang diperuntukkan tidak boleh negatif
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Sila tetapkan Syarikat
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Sila tetapkan Syarikat
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Invois Jualan Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Rujukan &amp; Tarikh Rujukan diperlukan untuk {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Pilih Akaun Pembayaran untuk membuat Bank Kemasukan
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Mencipta rekod pekerja untuk menguruskan daun, tuntutan perbelanjaan dan gaji"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Tambahkan ke Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Penulisan Cadangan
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pembayaran Potongan Kemasukan
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' tidak dalam Tahun Kewangan {2}
 DocType: Buying Settings,Settings for Buying Module,Tetapan untuk Membeli Modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} bukan milik syarikat {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Sila masukkan Resit Pembelian pertama
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Sila masukkan Resit Pembelian pertama
 DocType: Buying Settings,Supplier Naming By,Pembekal Menamakan Dengan
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Perubahan Bersih dalam Inventori
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Pengurusan Pinjaman pekerja
 DocType: Employee,Passport Number,Nombor Pasport
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Berhubung dengan Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Pengurus
 DocType: Payment Entry,Payment From / To,Pembayaran Dari / Ke
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Julat tarikh
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},had kredit baru adalah kurang daripada amaun tertunggak semasa untuk pelanggan. had kredit perlu atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,Dalam beberapa minit
 DocType: Issue,Resolution Date,Resolusi Tarikh
 DocType: Student Batch Name,Batch Name,Batch Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet dicipta:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet dicipta:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Sila tetapkan lalai Tunai atau akaun Bank dalam Mod Bayaran {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,mendaftar
 DocType: Selling Settings,Customer Naming By,Menamakan Dengan Pelanggan
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Akan menunjukkan pelajar sebagai Turut hadir dalam Laporan Kehadiran Bulanan Pelajar
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Masa Mula Sebenar
 DocType: BOM Operation,Operation Time,Masa Operasi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Selesai
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,base
 DocType: Timesheet,Total Billed Hours,Jumlah Jam Diiktiraf
 DocType: Journal Entry,Write Off Amount,Tulis Off Jumlah
 DocType: Journal Entry,Bill No,Rang Undang-Undang No
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Kehadiran pelajar
 DocType: Sales Invoice Timesheet,Time Sheet,Lembaran masa
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Bahan Mentah Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Sila masukkan butiran item
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Sila masukkan butiran item
 DocType: Interest,Interest,Faedah
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Jualan pra
 DocType: Purchase Receipt,Other Details,Butiran lain
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Kemasukan bayaran telah membuat
 DocType: Purchase Receipt Item Supplied,Current Stock,Saham Semasa
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} tidak dikaitkan dengan Perkara {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Slip Gaji
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Slip Gaji
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Akaun {0} telah dibuat beberapa kali
 DocType: Account,Expenses Included In Valuation,Perbelanjaan Termasuk Dalam Penilaian
 DocType: Hub Settings,Seller City,Penjual City
 ,Absent Student Report,Tidak hadir Laporan Pelajar
 DocType: Email Digest,Next email will be sent on:,E-mel seterusnya akan dihantar pada:
 DocType: Offer Letter Term,Offer Letter Term,Menawarkan Surat Jangka
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Perkara mempunyai varian.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Syarikat {0} tidak wujud
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Jenis
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Jenis
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Kuantiti Digunakan Seunit
 DocType: Serial No,Warranty Expiry Date,Waranti Tarikh Luput
 DocType: Material Request Item,Quantity and Warehouse,Kuantiti dan Gudang
 DocType: Sales Invoice,Commission Rate (%),Kadar komisen (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Sila pilih Program
 DocType: Project,Estimated Cost,Anggaran kos
@@ -768,7 +770,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Pendapatan daripada (Syarikat Mata Wang)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead mesti ditetapkan jika Peluang diperbuat daripada Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Sila pilih hari cuti mingguan
 DocType: Production Order Operation,Planned End Time,Dirancang Akhir Masa
 ,Sales Person Target Variance Item Group-Wise,Orang Jualan Sasaran Varian Perkara Kumpulan Bijaksana
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Peluang Daripada
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Kenyataan gaji bulanan.
 DocType: BOM,Website Specifications,Laman Web Spesifikasi
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Dari {0} dari jenis {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Faktor penukaran adalah wajib
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Projek
 DocType: Quality Inspection Reading,Reading 7,Membaca 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,sebahagiannya Tertib
 DocType: Expense Claim Detail,Expense Claim Type,Perbelanjaan Jenis Tuntutan
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Tetapan lalai untuk Troli Beli Belah
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset dimansuhkan melalui Journal Kemasukan {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Perbelanjaan Penyelenggaraan
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Menyediakan Akaun E-mel
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Sila masukkan Perkara pertama
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Sila masukkan Perkara pertama
 DocType: Account,Liability,Liabiliti
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Amaun yang dibenarkan tidak boleh lebih besar daripada Tuntutan Jumlah dalam Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Kos Default Akaun Barangan Dijual
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Senarai Harga tidak dipilih
 DocType: Employee,Family Background,Latar Belakang Keluarga
 DocType: Request for Quotation Supplier,Send Email,Hantar E-mel
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Amaran: Lampiran sah {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Tiada Kebenaran
 DocType: Company,Default Bank Account,Akaun Bank Default
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Untuk menapis berdasarkan Parti, pilih Parti Taipkan pertama"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Tiada pekerja didapati
 DocType: Supplier Quotation,Stopped,Berhenti
 DocType: Item,If subcontracted to a vendor,Jika subkontrak kepada vendor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Kumpulan pelajar sudah dikemaskini.
 DocType: SMS Center,All Customer Contact,Semua Hubungi Pelanggan
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Memuat naik keseimbangan saham melalui csv.
 DocType: Warehouse,Tree Details,Tree Butiran
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Amaun Invois Minimum
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: PTJ {2} bukan milik Syarikat {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Akaun {2} tidak boleh menjadi Kumpulan
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas &#39;{DOCTYPE}&#39; meja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Perkara Row {IDX}: {DOCTYPE} {} DOCNAME tidak wujud dalam di atas &#39;{DOCTYPE}&#39; meja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} sudah selesai atau dibatalkan
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Tiada tugasan
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Hari dalam bulan di mana invois automatik akan dijana contohnya 05, 28 dan lain-lain"
 DocType: Asset,Opening Accumulated Depreciation,Membuka Susut Nilai Terkumpul
@@ -874,7 +878,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} terhadap Bil {1} bertarikh {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Jadual kursus
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Jadual kursus
 DocType: Maintenance Visit,Completion Status,Siap Status
 DocType: HR Settings,Enter retirement age in years,Masukkan umur persaraan pada tahun-tahun
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Sasaran Gudang
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Membolehkan lebih penghantaran atau penerimaan hamper peratus ini
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Import Kehadiran
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Semua Kumpulan Perkara
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Semua Kumpulan Perkara
 DocType: Process Payroll,Activity Log,Log Aktiviti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Keuntungan bersih / Rugi
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Mengarang mesej secara automatik pada penyerahan transaksi.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Membeli Perintah untuk Pembayaran
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Unjuran Qty
 DocType: Sales Invoice,Payment Due Date,Tarikh Pembayaran
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Perkara Variant {0} telah wujud dengan sifat-sifat yang sama
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Pembukaan&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Terbuka To Do
 DocType: Notification Control,Delivery Note Message,Penghantaran Nota Mesej
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Tinggalkan Sekat Senarai Tarikh
 DocType: Pricing Rule,Price or Discount,Harga atau diskaun
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Jumlah Caj Terpakai di Purchase meja Resit Item mesti sama dengan Jumlah Cukai dan Caj
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Jumlah Caj Terpakai di Purchase meja Resit Item mesti sama dengan Jumlah Cukai dan Caj
 DocType: Sales Team,Incentives,Insentif
 DocType: SMS Log,Requested Numbers,Nombor diminta
 DocType: Production Planning Tool,Only Obtain Raw Materials,Hanya Dapatkan Bahan Mentah
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Apakah Subkontrak
 DocType: Item Attribute,Item Attribute Values,Nilai Perkara Sifat
 DocType: Examination Result,Examination Result,Keputusan peperiksaan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Resit Pembelian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Resit Pembelian
 ,Received Items To Be Billed,Barangan yang diterima dikenakan caj
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Dihantar Gaji Slip
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Mata Wang Kadar pertukaran utama.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Rujukan DOCTYPE mesti menjadi salah satu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Rujukan DOCTYPE mesti menjadi salah satu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Tidak dapat mencari Slot Masa di akhirat {0} hari untuk Operasi {1}
 DocType: Production Order,Plan material for sub-assemblies,Bahan rancangan untuk sub-pemasangan
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Jualan rakan-rakan dan Wilayah
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,tidak boleh secara automatik membuat Akaun kerana sudah ada baki stok dalam Akaun. Anda perlu membuat akaun yang hampir sama sebelum anda boleh membuat entri pada gudang ini
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Default Akaun Belum Bayar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pekerja {0} tidak aktif atau tidak wujud
 DocType: Fee Structure,Components,komponen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Perkara Kelainan {0} dikemaskini
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Sila masukkan Kategori Asset dalam Perkara {0}
 DocType: Quality Inspection Reading,Reading 6,Membaca 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Tidak boleh {0} {1} {2} tanpa sebarang invois tertunggak negatif
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Membeli Advance Invois
 DocType: Hub Settings,Sync Now,Sync Sekarang
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: kemasukan Kredit tidak boleh dikaitkan dengan {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,Adalah Pembelian Item
 DocType: Asset,Purchase Invoice,Invois Belian
 DocType: Stock Ledger Entry,Voucher Detail No,Detail baucar Tiada
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,New Invois Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,New Invois Jualan
 DocType: Stock Entry,Total Outgoing Value,Jumlah Nilai Keluar
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarikh dan Tarikh Tutup merasmikan perlu berada dalam sama Tahun Anggaran
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tarikh dan Tarikh Tutup merasmikan perlu berada dalam sama Tahun Anggaran
 DocType: Lead,Request for Information,Permintaan Maklumat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Invois
 DocType: Payment Request,Paid,Dibayar
 DocType: Program Fee,Program Fee,Yuran program
 DocType: Salary Slip,Total in words,Jumlah dalam perkataan
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,Diiktiraf
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Menerbitkan di laman web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Penghantaran kepada pelanggan.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Pembekal Invois Tarikh tidak boleh lebih besar daripada Pos Tarikh
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varian
 ,Company Name,Nama Syarikat
 DocType: SMS Center,Total Message(s),Jumlah Mesej (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Pilih Item Pemindahan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Lalai akaun Bank / Tunai akan secara automatik dikemaskini dalam Gaji Journal Kemasukan apabila mod ini dipilih.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Selang untuk Kod Gred {0} bertindih dengan selang gred bagi gred lain. Sila menyemak selang {0} dan {1} dan cuba lagi
 DocType: BOM,Raw Material Cost(Company Currency),Bahan mentah Kos (Syarikat Mata Wang)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Semua barang-barang telah dipindahkan bagi Perintah Pengeluaran ini.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Kadar tidak boleh lebih besar daripada kadar yang digunakan dalam {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM laman Perkara
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Memuat naik kepala surat dan logo. (Anda boleh mengeditnya kemudian).
 DocType: Timesheet Detail,Bill,Rang Undang-Undang
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Selepas Tarikh Susutnilai dimasukkan sebagai tarikh lepas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,White
 DocType: SMS Center,All Lead (Open),Semua Lead (Terbuka)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty tidak tersedia untuk {4} dalam gudang {1} di mencatat masa catatan ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Mendapatkan Pendahuluan Dibayar
 DocType: Item,Automatically Create New Batch,Secara automatik Buat Batch New
 DocType: Item,Automatically Create New Batch,Secara automatik Buat Batch New
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Buat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Buat
 DocType: Student Admission,Admission Start Date,Kemasukan Tarikh Mula
 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.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Sila masukkan Akaun untuk Perubahan Jumlah
 DocType: Student Batch Name,Student Batch Name,Pelajar Batch Nama
 DocType: Holiday List,Holiday List Name,Nama Senarai Holiday
 DocType: Repayment Schedule,Balance Loan Amount,Jumlah Baki Pinjaman
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Sila nyatakan {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Barangan dikeluarkan dengan tiada perubahan dalam kuantiti atau nilai.
 DocType: Delivery Note,Delivery To,Penghantaran Untuk
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Jadual atribut adalah wajib
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Jadual atribut adalah wajib
 DocType: Production Planning Tool,Get Sales Orders,Dapatkan Perintah Jualan
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} tidak boleh negatif
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Diskaun
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Diskaun
 DocType: Asset,Total Number of Depreciations,Jumlah penurunan nilai
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
 DocType: Sales Invoice Item,Rate With Margin,Kadar Dengan Margin
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gudang Terpelihara dalam Sales Order / Selesai Barang Gudang
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Jumlah Jualan
 DocType: Repayment Schedule,Interest Amount,Amaun Faedah
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda Pelulus Perbelanjaan untuk rekod ini. Sila Kemas kini &#39;Status&#39; dan Jimat
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Anda Pelulus Perbelanjaan untuk rekod ini. Sila Kemas kini &#39;Status&#39; dan Jimat
 DocType: Serial No,Creation Document No,Penciptaan Dokumen No
 DocType: Issue,Issue,Isu
 DocType: Asset,Scrapped,dibatalkan
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Sifat-sifat bagi Perkara Kelainan. contohnya Saiz, Warna dan lain-lain"
 DocType: Purchase Invoice,Returns,pulangan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Gudang
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},No siri {0} adalah di bawah kontrak penyelenggaraan hamper {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recruitment
 DocType: Lead,Organization Name,Nama Pertubuhan
 DocType: Tax Rule,Shipping State,Negeri Penghantaran
 ,Projected Quantity as Source,Kuantiti Unjuran sebagai Sumber
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Item mesti ditambah menggunakan &#39;Dapatkan Item daripada Pembelian Resit&#39; butang
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Termasuk barangan tanpa saham yang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Perbelanjaan jualan
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,Terhadap
 DocType: Item,Default Selling Cost Center,Default Jualan Kos Pusat
 DocType: Sales Partner,Implementation Partner,Rakan Pelaksanaan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poskod
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Poskod
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pesanan Jualan {0} ialah {1}
 DocType: Opportunity,Contact Info,Maklumat perhubungan
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Membuat Kemasukan Stok
 DocType: Packing Slip,Net Weight UOM,Berat UOM bersih
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Keputusan
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Keputusan
 DocType: Item,Default Supplier,Pembekal Default
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Lebih Pengeluaran Peratus Peruntukan
 DocType: Employee Loan,Repayment Schedule,Jadual Pembayaran Balik
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Dapatkan Mingguan Off Tarikh
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Tarikh akhir tidak boleh kurang daripada Tarikh Mula
 DocType: Sales Person,Select company name first.,Pilih nama syarikat pertama.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sebut Harga yang diterima daripada Pembekal.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Untuk {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Purata Umur
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Kawasan Prestasi Utama
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Pengangkutan
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Sifat tidak sah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} mestilah diserahkan
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} mestilah diserahkan
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kuantiti mesti kurang daripada atau sama dengan {0}
 DocType: SMS Center,Total Characters,Jumlah Watak
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Sila pilih BOM dalam bidang BOM untuk Perkara {0}
@@ -1153,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Sila menetapkan &#39;Guna Diskaun tambahan On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Dari Range mempunyai kurang daripada Untuk Julat
 DocType: Global Defaults,Global Defaults,Lalai Global
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Mula Tahun
 DocType: Purchase Invoice,Start date of current invoice's period,Tarikh tempoh invois semasa memulakan
 DocType: Salary Slip,Leave Without Pay,Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapasiti Ralat Perancangan
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapasiti Ralat Perancangan
 ,Trial Balance for Party,Baki percubaan untuk Parti
 DocType: Lead,Consultant,Perunding
 DocType: Salary Slip,Earnings,Pendapatan
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ini akan dilampirkan Kod Item bagi varian. Sebagai contoh, jika anda adalah singkatan &quot;SM&quot;, dan kod item adalah &quot;T-SHIRT&quot;, kod item varian akan &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Gaji bersih (dengan perkataan) akan dapat dilihat selepas anda menyimpan Slip Gaji.
 DocType: Purchase Invoice,Is Return,Tempat kembalinya
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Pulangan / Nota Debit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Pulangan / Nota Debit
 DocType: Price List Country,Price List Country,Senarai harga Negara
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nombor siri sah untuk Perkara {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Sila masukkan Kod Item untuk mendapatkan Nombor kumpulan
 DocType: Stock Settings,Default Item Group,Default Perkara Kumpulan
 DocType: Employee Loan,Partially Disbursed,sebahagiannya Dikeluarkan
-DocType: Grading Structure,Grading System Name,Sistem Nama Grading
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Pangkalan data pembekal.
 DocType: Account,Balance Sheet,Kunci Kira-kira
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Pusat Kos Bagi Item Kod Item &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode bayaran tidak dikonfigurasikan. Sila semak, sama ada akaun ini tidak ditetapkan Mod Pembayaran atau POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Orang jualan anda akan mendapat peringatan pada tarikh ini untuk menghubungi pelanggan
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,item yang sama tidak boleh dimasukkan beberapa kali.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Akaun lanjut boleh dibuat di bawah Kumpulan, tetapi penyertaan boleh dibuat terhadap bukan Kumpulan"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Item Pesanan Belian dikenakan caj
 DocType: Purchase Invoice Item,Net Rate,Kadar bersih
 DocType: Purchase Invoice Item,Purchase Invoice Item,Membeli Invois Perkara
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Saham Lejar Penyertaan dan GL Penyertaan diumumkan bagi Resit Pembelian dipilih
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Saham Lejar Penyertaan dan GL Penyertaan diumumkan bagi Resit Pembelian dipilih
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Perkara 1
 DocType: Holiday,Holiday,Holiday
 DocType: Support Settings,Close Issue After Days,Tutup Isu Selepas Hari
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Kerja Selesai
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Sila nyatakan sekurang-kurangnya satu atribut dalam jadual Atribut
 DocType: Announcement,All Students,semua Pelajar
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Perkara {0} perlu menjadi item tanpa saham yang
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Lihat Lejar
 DocType: Grading Scale,Intervals,selang
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Terawal
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Satu Kumpulan Item wujud dengan nama yang sama, sila tukar nama item atau menamakan semula kumpulan item"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Pelajar Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Pembayaran gaji daripada {0} kepada {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pesanan Jualan {0} tidak sah
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,pesanan pembelian membantu anda merancang dan mengambil tindakan susulan ke atas pembelian anda
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Maaf, syarikat tidak boleh digabungkan"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Jumlah kuantiti Terbitan / Transfer {0} dalam Permintaan Bahan {1} \ tidak boleh lebih besar daripada kuantiti diminta {2} untuk item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Kecil
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Perbelanjaan tidak langsung
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Pertanian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Laman web Image perlu fail awam atau URL laman web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ini adalah kumpulan item akar dan tidak boleh diedit.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Kumpulan Nombor Roll
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Untuk {0}, hanya akaun kredit boleh dikaitkan terhadap kemasukan debit lain"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Jumlah semua berat tugas harus 1. Laraskan berat semua tugas Projek sewajarnya
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Penghantaran Nota {0} tidak dikemukakan
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Peraturan harga mula-mula dipilih berdasarkan &#39;Guna Mengenai&#39; bidang, yang boleh menjadi Perkara, Perkara Kumpulan atau Jenama."
 DocType: Hub Settings,Seller Website,Penjual Laman Web
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Jumlah peratusan yang diperuntukkan bagi pasukan jualan harus 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status Perintah Pengeluaran adalah {0}
 DocType: Appraisal Goal,Goal,Matlamat
 DocType: Sales Invoice Item,Edit Description,Edit Penerangan
 ,Team Updates,Pasukan Terbaru
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Untuk Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Buat Format Cetak
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,Jurnal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} item dalam kemajuan
 DocType: Workstation,Workstation Name,Nama stesen kerja
-DocType: Grade Interval,Grade Code,Kod gred
+DocType: Grading Scale Interval,Grade Code,Kod gred
 DocType: POS Item Group,POS Item Group,POS Item Kumpulan
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mel Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} bukan milik Perkara {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Perkakasan
 DocType: Sales Order,Recurring Upto,berulang Hamper
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Sila pilih sebuah Syarikat
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Sila pilih sebuah Syarikat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Cuti
 DocType: Purchase Invoice,Supplier Invoice Date,Pembekal Invois Tarikh
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Anda perlu untuk membolehkan Troli
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Makanan
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Range Penuaan 3
 DocType: Maintenance Schedule Item,No of Visits,Jumlah Lawatan
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Kehadiran
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Kehadiran
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Jadual Penyelenggaraan {0} wujud daripada {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,pelajar yang mendaftar
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Mata Wang Akaun Penutupan mestilah {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Jumlah mata untuk semua matlamat harus 100. Ia adalah {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Purata harian Keluar
 DocType: POS Profile,Campaign,Kempen
 DocType: Supplier,Name and Type,Nama dan Jenis
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Kelulusan Status mesti &#39;diluluskan&#39; atau &#39;Ditolak&#39;
 DocType: Purchase Invoice,Contact Person,Dihubungi
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Jangkaan Tarikh Bermula' tidak boleh menjadi lebih besar daripada 'Jangkaan Tarikh Tamat'
 DocType: Course Scheduling Tool,Course End Date,Kursus Tarikh Akhir
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Alamat Penghantaran Nama
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,tidak boleh lebih besar daripada 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Perkara {0} bukan Item saham
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,tidak boleh lebih besar daripada 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Perkara {0} bukan Item saham
 DocType: Maintenance Visit,Unscheduled,Tidak Berjadual
 DocType: Employee,Owned,Milik
 DocType: Salary Detail,Depends on Leave Without Pay,Bergantung kepada Cuti Tanpa Gaji
 DocType: Pricing Rule,"Higher the number, higher the priority","Lebih tinggi nombor tersebut, lebih tinggi keutamaan"
 ,Purchase Invoice Trends,Membeli Trend Invois
 DocType: Employee,Better Prospects,Prospek yang lebih baik
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Row # {0}: batch The {1} hanya {2} qty. Sila pilih satu lagi kumpulan yang mempunyai {3} qty ada atau berpecah baris ke dalam pelbagai baris, untuk menyampaikan / isu dari pelbagai kelompok"
 DocType: Vehicle,License Plate,Plate lesen
 DocType: Appraisal,Goals,Matlamat
 DocType: Warranty Claim,Warranty / AMC Status,Waranti / AMC Status
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pekerja tidak boleh melaporkan kepada dirinya sendiri.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jika akaun dibekukan, entri dibenarkan pengguna terhad."
 DocType: Email Digest,Bank Balance,Baki Bank
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kemasukan Perakaunan untuk {0}: {1} hanya boleh dibuat dalam mata wang: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil kerja, kelayakan yang diperlukan dan lain-lain"
 DocType: Journal Entry Account,Account Balance,Baki Akaun
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Peraturan cukai bagi urus niaga.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Tunjukkan P &amp; baki L tahun fiskal unclosed ini
 DocType: Shipping Rule,Shipping Account,Akaun Penghantaran
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Akaun {2} tidak aktif
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Buat Jualan Pesanan untuk membantu anda merancang kerja anda dan menyampaikan pada masa
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Buat Jualan Pesanan untuk membantu anda merancang kerja anda dan menyampaikan pada masa
 DocType: Quality Inspection,Readings,Bacaan
 DocType: Stock Entry,Total Additional Costs,Jumlah Kos Tambahan
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,Untuk Nilai
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Slip pembungkusan
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Slip pembungkusan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pejabat Disewa
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Tetapan gateway Persediaan SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import Gagal!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,Perkhidmatan
 DocType: HR Settings,Email Salary Slip to Employee,Email Slip Gaji kepada Pekerja
 DocType: Cost Center,Parent Cost Center,Kos Pusat Ibu Bapa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Pilih Pembekal Kemungkinan
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Pilih Pembekal Kemungkinan
 DocType: Sales Invoice,Source,Sumber
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Show ditutup
 DocType: Leave Type,Is Leave Without Pay,Apakah Tinggalkan Tanpa Gaji
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Kategori Asset adalah wajib bagi item Aset Tetap
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Tiada rekod yang terdapat dalam jadual Pembayaran
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ini {0} konflik dengan {1} untuk {2} {3}
 DocType: Student Attendance Tool,Students HTML,pelajar HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,Tarikh Meninggalkan
 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/utilities/activation.py +64,Create Leads,Buat Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Buat Leads
 DocType: Maintenance Schedule,Schedules,Jadual
 DocType: Purchase Invoice Item,Net Amount,Jumlah Bersih
 DocType: Purchase Order Item Supplied,BOM Detail No,Detail BOM Tiada
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,pendaftaran program
 DocType: Sales Invoice Item,Brand Name,Nama jenama
 DocType: Purchase Receipt,Transporter Details,Butiran Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,gudang lalai diperlukan untuk item yang dipilih
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Pembekal mungkin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Pembekal mungkin
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Pertubuhan
 DocType: Budget,Monthly Distribution,Pengagihan Bulanan
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Penerima Senarai kosong. Sila buat Penerima Senarai
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Jualan Rakan Sasaran
 DocType: Loan Type,Maximum Loan Amount,Jumlah Pinjaman maksimum
 DocType: Pricing Rule,Pricing Rule,Peraturan Harga
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},jumlah roll salinan untuk pelajar {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tindakan jika Bajet Tahunan Melebihi
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Permintaan bahan Membeli Pesanan
 DocType: Shopping Cart Settings,Payment Success URL,Pembayaran URL Kejayaan
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,Kaedah Bayaran Balik
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jika disemak, page Utama akan menjadi lalai Item Kumpulan untuk laman web"
 DocType: Quality Inspection Reading,Reading 4,Membaca 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM lalai untuk {0} tidak dijumpai untuk Projek {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM lalai untuk {0} tidak dijumpai untuk Projek {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Tuntutan perbelanjaan syarikat.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Pelajar di tengah-tengah sistem, menambah semua pelajar anda"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Pelajar di tengah-tengah sistem, menambah semua pelajar anda"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Tarikh Clearance {1} tidak boleh sebelum Tarikh Cek {2}
 DocType: Company,Default Holiday List,Default Senarai Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Dari Masa dan Untuk Masa {1} adalah bertindih dengan {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Hari (s) di mana anda memohon cuti adalah cuti. Anda tidak perlu memohon cuti.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Hantar semula Pembayaran E-mel
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Tugasan baru
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Membuat Sebut Harga
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Membuat Sebut Harga
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Laporan lain
 DocType: Dependent Task,Dependent Task,Petugas bergantung
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktor penukaran Unit keingkaran Langkah mesti 1 berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Cuti jenis {0} tidak boleh lebih panjang daripada {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Cuba merancang operasi untuk hari X terlebih dahulu.
 DocType: HR Settings,Stop Birthday Reminders,Stop Hari Lahir Peringatan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Sila menetapkan Payroll Akaun Belum Bayar Lalai dalam Syarikat {0}
 DocType: SMS Center,Receiver List,Penerima Senarai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Cari Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Cari Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Jumlah dimakan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Perubahan Bersih dalam Tunai
 DocType: Assessment Plan,Grading Scale,Skala penggredan
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,sudah selesai
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unit Langkah {0} telah memasuki lebih daripada sekali dalam Factor Penukaran Jadual
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,sudah selesai
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Permintaan Bayaran sudah wujud {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kos Item Dikeluarkan
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Kuantiti mestilah tidak lebih daripada {0}
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Membuat Pengeluaran Kemasukan
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance terhadap Pembekal hendaklah mendebitkan
 DocType: Company,Default Values,Nilai lalai
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Kekerapan} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Jumlah dibayar balik
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ini adalah berdasarkan kepada balak terhadap kenderaan ini. Lihat garis masa di bawah untuk maklumat
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mengumpul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Terhadap Pembekal Invois {0} bertarikh {1}
 DocType: Customer,Default Price List,Senarai Harga Default
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,rekod Pergerakan Aset {0} dicipta
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Anda tidak boleh memadam Tahun Anggaran {0}. Tahun Anggaran {0} ditetapkan sebagai piawai dalam Tetapan Global
 DocType: Journal Entry,Entry Type,Jenis Kemasukan
 ,Customer Credit Balance,Baki Pelanggan Kredit
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Tiada item mempunyai apa-apa perubahan dalam kuantiti atau nilai.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,medan mandatori - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,medan mandatori - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Jaminan Tuntutan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Jaminan Tuntutan
 ,Lead Details,Butiran Lead
 DocType: Salary Slip,Loan repayment,bayaran balik pinjaman
 DocType: Purchase Invoice,End date of current invoice's period,Tarikh akhir tempoh invois semasa
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,Alamat Tetap
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Sila pilih kod item
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Sila pilih kod item
 DocType: Student Sibling,Studying in Same Institute,Belajar di Institut Sama
 DocType: Territory,Territory Manager,Pengurus Wilayah
 DocType: Packed Item,To Warehouse (Optional),Untuk Gudang (pilihan)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
 DocType: Payment Entry,Paid Amount (Company Currency),Jumlah yang dibayar (Syarikat Mata Wang)
 DocType: Purchase Invoice,Additional Discount,Diskaun tambahan
 DocType: Selling Settings,Selling Settings,Menjual Tetapan
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Lihat dalam Troli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Perbelanjaan pemasaran
 ,Item Shortage Report,Perkara Kekurangan Laporan
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Berat disebutkan, \ nSila menyebut &quot;Berat UOM&quot; terlalu"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Permintaan bahan yang digunakan untuk membuat ini Entry Saham
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Selepas Tarikh Susutnilai adalah wajib bagi aset baru
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Selepas Tarikh Susutnilai adalah wajib bagi aset baru
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Berasingan Kumpulan berdasarkan kursus untuk setiap Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Berasingan Kumpulan berdasarkan kursus untuk setiap Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unit tunggal Item satu.
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,Wajaran
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Pusat Kos yang diperlukan untuk akaun &#39;Untung Rugi&#39; {2}. Sila menubuhkan Pusat Kos lalai untuk Syarikat.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Kenalan Baru
 DocType: Territory,Parent Territory,Wilayah Ibu Bapa
 DocType: Quality Inspection Reading,Reading 2,Membaca 2
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,Perkara-bijak Jualan Daftar
 DocType: Asset,Gross Purchase Amount,Jumlah Pembelian Kasar
 DocType: Asset,Depreciation Method,Kaedah susut nilai
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Cukai ini adalah termasuk dalam Kadar Asas?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Jumlah Sasaran
 DocType: Program Course,Required,diperlukan
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Penyesuaian JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Terlalu banyak tiang. Mengeksport laporan dan mencetak penggunaan aplikasi spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Tidak dapat mencari Kadar pertukaran bagi {0} kepada {1} untuk tarikh kunci {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Membenarkan pelbagai Pesanan Jualan terhadap Perintah Pembelian yang Pelanggan
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 DocType: Student Group Instructor,Student Group Instructor,Pengajar Kumpulan Pelajar
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Bimbit
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Utama
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varian
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Utama
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varian
 DocType: Naming Series,Set prefix for numbering series on your transactions,Terletak awalan untuk penomboran siri transaksi anda
 DocType: Employee Attendance Tool,Employees HTML,pekerja HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,BOM lalai ({0}) mesti aktif untuk item ini atau template yang
 DocType: Employee,Leave Encashed?,Cuti ditunaikan?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Peluang Daripada bidang adalah wajib
 DocType: Email Digest,Annual Expenses,Perbelanjaan tahunan
 DocType: Item,Variants,Kelainan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Buat Pesanan Belian
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Buat Pesanan Belian
 DocType: SMS Center,Send To,Hantar Kepada
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Tidak ada baki cuti yang cukup untuk Cuti Jenis {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Jumlah yang diperuntukkan
@@ -1767,7 +1765,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kod Item Pelanggan
 DocType: Stock Reconciliation,Stock Reconciliation,Saham Penyesuaian
 DocType: Territory,Territory Name,Wilayah Nama
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Kerja dalam Kemajuan Gudang diperlukan sebelum Hantar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Pemohon pekerjaan.
 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
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,Serial Nos dan Kelompok
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Kekuatan Kumpulan Pelajar
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Kekuatan Kumpulan Pelajar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Terhadap Journal Entry {0} tidak mempunyai apa-apa yang tidak dapat ditandingi {1} masuk
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,penilaian
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Selang Grading
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Sila masukkan
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Tidak dapat overbill untuk item {0} berturut-turut {1} lebih {2}. Untuk membolehkan lebih-bil, sila tetapkan dalam Membeli Tetapan"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Sila menetapkan penapis di Perkara atau Warehouse
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} hendaklah dikemukakan
 DocType: Authorization Control,Authorization Control,Kawalan Kuasa
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Warehouse Telah adalah wajib terhadap Perkara ditolak {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pembayaran
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Menguruskan pesanan anda
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pembayaran
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Menguruskan pesanan anda
 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
 DocType: Course,Course Abbreviation,Singkatan Course
 DocType: Student Leave Application,Student Leave Application,Pelajar Permohonan Cuti
 DocType: Item,Will also apply for variants,Juga akan memohon varian
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aset tidak boleh dibatalkan, kerana ia sudah {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pekerja {0} pada hari Half pada {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Jumlah jam kerja tidak harus lebih besar daripada waktu kerja max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pada
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Barangan bundle pada masa jualan.
 DocType: Quotation Item,Actual Qty,Kuantiti Sebenar
 DocType: Sales Invoice Item,References,Rujukan
@@ -1811,7 +1809,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Anda telah memasukkan perkara yang sama. Sila membetulkan dan cuba lagi.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Madya
 DocType: Asset Movement,Asset Movement,Pergerakan aset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Troli baru
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Troli baru
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Perkara {0} bukan Item bersiri
 DocType: SMS Center,Create Receiver List,Cipta Senarai Penerima
 DocType: Vehicle,Wheels,Wheels
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Melumpuhkan penciptaan balak masa terhadap Pesanan Pengeluaran. Operasi tidak boleh dikesan terhadap Perintah Pengeluaran
 DocType: Student,Student Mobile Number,Pelajar Nombor Telefon
 DocType: Item,Has Variants,Mempunyai Kelainan
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Anda telah memilih barangan dari {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nama Pembahagian Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID adalah wajib
 DocType: Sales Person,Parent Sales Person,Orang Ibu Bapa Jualan
 DocType: Purchase Invoice,Recurring Invoice,Invois berulang
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menguruskan Projek
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,Tahun Anggaran
 DocType: Vehicle Log,Fuel Price,Harga bahan api
 DocType: Budget,Budget,Bajet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Asset Item tetap perlu menjadi item tanpa saham.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bajet tidak boleh diberikan terhadap {0}, kerana ia bukan satu akaun Pendapatan atau Perbelanjaan"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Tercapai
 DocType: Student Admission,Application Form Route,Borang Permohonan Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Wilayah / Pelanggan
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Wilayah / Pelanggan
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,contohnya 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Tinggalkan Jenis {0} tidak boleh diperuntukkan sejak ia meninggalkan tanpa gaji
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Jumlah Peruntukan {1} mesti kurang daripada atau sama dengan invois Jumlah tertunggak {2}
@@ -1878,14 +1876,14 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,cemerlang
 ,Daily Timesheet Summary,Ringkasan Timesheet harian
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Untuk menetapkan {1} jangka masa, perbezaan antara dari dan ke tarikh \ mesti lebih besar daripada atau sama dengan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ini adalah berdasarkan kepada pergerakan saham. Lihat {0} untuk mendapatkan butiran
 DocType: Pricing Rule,Selling,Jualan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Jumlah {0} {1} ditolak daripada {2}
 DocType: Employee,Salary Information,Maklumat Gaji
 DocType: Sales Person,Name and Employee ID,Nama dan ID Pekerja
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Tarikh Akhir tidak boleh sebelum Tarikh Pos
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Tugas dan Cukai
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Sila masukkan tarikh Rujukan
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Tidak boleh merujuk beberapa berturut-turut lebih besar daripada atau sama dengan bilangan baris semasa untuk jenis Caj ini
 DocType: Asset,Sold,dijual
 ,Item-wise Purchase History,Perkara-bijak Pembelian Sejarah
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Sila klik pada &#39;Menjana Jadual&#39; mengambil No Serial ditambah untuk Perkara {0}
 DocType: Account,Frozen,Beku
 ,Open Production Orders,Pesanan Pengeluaran terbuka
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Jumlah (Syarikat Mata Wang)
 DocType: Payment Reconciliation Payment,Reference Row,rujukan Row
 DocType: Installation Note,Installation Time,Masa pemasangan
 DocType: Sales Invoice,Accounting Details,Maklumat Perakaunan
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Memadam semua Transaksi Syarikat ini
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Pelaburan
 DocType: Issue,Resolution Details,Resolusi Butiran
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,perbincangan
 DocType: Payment Entry,Transaction ID,ID transaksi
 DocType: Employee,Resignation Letter Date,Peletakan jawatan Surat Tarikh
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Peraturan harga yang lagi ditapis berdasarkan kuantiti.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Sila menetapkan Tarikh Of Menyertai untuk pekerja {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Jumlah Bil (melalui Lembaran Time)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ulang Hasil Pelanggan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mesti mempunyai peranan 'Pelulus Perbelanjaan'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pasangan
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Pilih BOM dan Kuantiti untuk Pengeluaran
 DocType: Asset,Depreciation Schedule,Jadual susutnilai
 DocType: Bank Reconciliation Detail,Against Account,Terhadap Akaun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Tarikh Hari harus antara Dari Tarikh dan To Date
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Sila set &#39;Asset Susutnilai Kos Center&#39; dalam Syarikat {0}
 ,Maintenance Schedules,Jadual Penyelenggaraan
 DocType: Task,Actual End Date (via Time Sheet),Sebenar Tarikh Akhir (melalui Lembaran Time)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Jumlah {0} {1} daripada {2} {3}
 ,Quotation Trends,Trend Sebut Harga
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Perkara Kumpulan tidak dinyatakan dalam perkara induk untuk item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,Debit Untuk akaun mestilah akaun Belum Terima
 DocType: Shipping Rule Condition,Shipping Amount,Penghantaran Jumlah
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Sementara menunggu Jumlah
 DocType: Purchase Invoice Item,Conversion Factor,Faktor penukaran
 DocType: Purchase Order,Delivered,Dihantar
 ,Vehicle Expenses,Perbelanjaan kenderaan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
+DocType: Serial No,Invoice Details,Butiran invois
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Nilai jangkaan selepas hayat berguna mesti lebih besar daripada atau sama dengan {0}
 DocType: Purchase Receipt,Vehicle Number,Bilangan Kenderaan
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Tarikh di mana invois berulang akan berhenti
 DocType: Employee Loan,Loan Amount,Jumlah pinjaman
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Tetapan HR
 DocType: Salary Slip,net pay info,maklumat gaji bersih
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Perbelanjaan baru
 DocType: Purchase Invoice,Additional Discount Amount,Jumlah Diskaun tambahan
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty mesti menjadi 1, sebagai item adalah aset tetap. Sila gunakan baris berasingan untuk berbilang qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Tinggalkan Sekat Senarai Benarkan
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr tidak boleh kosong atau senggang
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Kumpulan kepada Bukan Kumpulan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sukan
 DocType: Loan Type,Loan Name,Nama Loan
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Gudang di mana anda mengekalkan stok barangan ditolak
 DocType: Production Order,Skip Material Transfer,Skip Transfer Bahan
 DocType: Production Order,Skip Material Transfer,Skip Transfer Bahan
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Tidak dapat mencari kadar pertukaran untuk {0} kepada {1} untuk tarikh kunci {2}. Sila buat rekod Penukaran Mata Wang secara manual
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Tahun kewangan anda berakhir pada
 DocType: POS Profile,Price List,Senarai Harga
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} kini Tahun Anggaran asalan. Sila muat semula browser anda untuk mengemaskini perubahan
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Akaun {0} tidak sah. Mata Wang Akaun mesti {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Penukaran diperlukan berturut-turut {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Perintah Jualan, Jualan Invois atau Kemasukan Journal"
 DocType: Salary Component,Deduction,Potongan
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Dari Masa dan Untuk Masa adalah wajib.
 DocType: Stock Reconciliation Item,Amount Difference,jumlah Perbezaan
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Perkara Harga ditambah untuk {0} dalam senarai harga {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Sila masukkan ID Pekerja orang jualan ini
 DocType: Territory,Classification of Customers by region,Pengelasan Pelanggan mengikut wilayah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Perbezaan Jumlah mestilah sifar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Perbezaan Jumlah mestilah sifar
 DocType: Project,Gross Margin,Margin kasar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Sila masukkan Pengeluaran Perkara pertama
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Dikira-kira Penyata Bank
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,pengguna orang kurang upaya
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Sebut Harga
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Sebut Harga
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Jumlah Potongan
 ,Production Analytics,Analytics pengeluaran
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Amaran: Sijil SSL tidak sah pada lampiran {0}
 DocType: Student Admission,Eligibility,kelayakan
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads membantu anda mendapatkan perniagaan, tambah semua kenalan anda dan lebih sebagai petunjuk anda"
 DocType: Production Order Operation,Actual Operation Time,Masa Sebenar Operasi
 DocType: Authorization Rule,Applicable To (User),Terpakai Untuk (pengguna)
 DocType: Purchase Taxes and Charges,Deduct,Memotong
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,kerja Alamat
 DocType: Appraisal,Calculate Total Score,Kira Jumlah Skor
 DocType: Request for Quotation,Manufacturing Manager,Pembuatan Pengurus
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},No siri {0} adalah di bawah jaminan hamper {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Penghantaran Split Nota ke dalam pakej.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Penghantaran
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,baki akaun ({0}) untuk {1} dan nilai saham ({2}) untuk gudang {3} mestilah sama
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: Email tidak akan dihantar kepada pengguna kurang upaya
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Bilangan Interaksi
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Bilangan Interaksi
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Pilih Syarikat ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Pilih Syarikat ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tinggalkan kosong jika dipertimbangkan untuk semua jabatan
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Jenis pekerjaan (tetap, kontrak, pelatih dan lain-lain)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} adalah wajib bagi Perkara {1}
 DocType: Process Payroll,Fortnightly,setiap dua minggu
 DocType: Currency Exchange,From Currency,Dari Mata Wang
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Kadar (Syarikat mata wang)
 DocType: Student Guardian,Others,Lain
 DocType: Payment Entry,Unallocated Amount,Jumlah yang tidak diperuntukkan
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Tidak dapat mencari item yang sepadan. Sila pilih beberapa nilai lain untuk {0}.
 DocType: POS Profile,Taxes and Charges,Cukai dan Caj
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Satu Produk atau Perkhidmatan yang dibeli, dijual atau disimpan dalam stok."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Tiada lagi kemas kini
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Tidak boleh pilih jenis bayaran sebagai &#39;Pada Row Jumlah Sebelumnya&#39; atau &#39;Pada Sebelumnya Row Jumlah&#39; untuk baris pertama
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Kanak-kanak Item tidak seharusnya menjadi Fail Produk. Sila keluarkan item `{0}` dan menyelamatkan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Perbankan
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,menambah Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,menambah Timesheets
 DocType: Vehicle Service,Service Item,perkhidmatan Item
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
 DocType: Bank Guarantee,Bank Guarantee,Jaminan bank
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} sudah {2}
 DocType: Quotation Item,Stock Balance,Baki saham
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Perintah Jualan kepada Pembayaran
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Sila menetapkan Penamaan Siri untuk {0} melalui Persediaan&gt; Tetapan&gt; Menamakan Siri
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Ketua Pegawai Eksekutif
 DocType: Expense Claim Detail,Expense Claim Detail,Perbelanjaan Tuntutan Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Sila pilih akaun yang betul
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Harga tidak akan dipaparkan jika Senarai Harga tidak ditetapkan
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Sila nyatakan negara untuk Peraturan Penghantaran ini atau daftar Penghantaran di seluruh dunia
 DocType: Stock Entry,Total Incoming Value,Jumlah Nilai masuk
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debit Untuk diperlukan
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debit Untuk diperlukan
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets membantu menjejaki masa, kos dan bil untuk kegiatan yang dilakukan oleh pasukan anda"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Pembelian Senarai Harga
 DocType: Offer Letter Term,Offer Term,Tawaran Jangka
 DocType: Quality Inspection,Quality Manager,Pengurus Kualiti
 DocType: Job Applicant,Job Opening,Lowongan
 DocType: Payment Reconciliation,Payment Reconciliation,Penyesuaian bayaran
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Sila pilih nama memproses permohonan lesen Orang
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Jumlah belum dibayar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operasi laman web
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,Hilang Akal
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Sila masukkan Dokumen Resit
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Semua barang-barang telah diinvois
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Sila masukkan Dokumen Resit
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Pusat kos lanjut boleh dibuat di bawah Kumpulan tetapi penyertaan boleh dibuat terhadap bukan Kumpulan
 DocType: Project,External,Luar
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Pengguna dan Kebenaran
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Pesanan Pengeluaran Ditubuhkan: {0}
 DocType: Branch,Branch,Cawangan
 DocType: Guardian,Mobile Number,Nombor telefon
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Percetakan dan Penjenamaan
 DocType: Bin,Actual Quantity,Kuantiti sebenar
 DocType: Shipping Rule,example: Next Day Shipping,contoh: Penghantaran Hari Seterusnya
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,No siri {0} tidak dijumpai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,No siri {0} tidak dijumpai
 DocType: Scheduling Tool,Student Batch,Batch pelajar
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Pelanggan anda
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Buat Pelajar
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Buat Pelajar
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Anda telah dijemput untuk bekerjasama dalam projek: {0}
 DocType: Leave Block List Date,Block Date,Sekat Tarikh
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Mohon sekarang
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,Dihantar Kepada
 DocType: Payment Request,Make Sales Invoice,Buat Jualan Invois
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Hubungi Selepas Tarikh tidak boleh pada masa lalu
 DocType: Company,For Reference Only.,Untuk Rujukan Sahaja.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Pilih Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Tidak sah {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Jumlah
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Perkara No. tidak boleh 0
 DocType: Item,Show a slideshow at the top of the page,Menunjukkan tayangan slaid di bahagian atas halaman
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Kedai
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Kedai
 DocType: Serial No,Delivery Time,Masa penghantaran
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Penuaan Berasaskan
 DocType: Item,End of Life,Akhir Hayat
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,Nama semula Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Update Kos
 DocType: Item Reorder,Item Reorder,Perkara Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Show Slip Gaji
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Pemindahan Bahan
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Show Slip Gaji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dokumen ini melebihi had oleh {0} {1} untuk item {4}. Adakah anda membuat terhadap yang sama satu lagi {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Pilih perubahan kira jumlah
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Sila menetapkan berulang selepas menyimpan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Pilih perubahan kira jumlah
 DocType: Purchase Invoice,Price List Currency,Senarai Harga Mata Wang
 DocType: Naming Series,User must always select,Pengguna perlu sentiasa pilih
 DocType: Stock Settings,Allow Negative Stock,Benarkan Saham Negatif
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,anggaran Akaun
 DocType: Quality Inspection,Verified By,Disahkan oleh
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Tidak boleh menukar mata wang lalai syarikat itu, kerana terdapat urus niaga yang sedia ada. Transaksi mesti dibatalkan untuk menukar mata wang lalai."
-DocType: Grade Interval,Grade Description,gred Penerangan
+DocType: Grading Scale Interval,Grade Description,gred Penerangan
 DocType: Stock Entry,Purchase Receipt No,Resit Pembelian No
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Wang Earnest
 DocType: Process Payroll,Create Salary Slip,Membuat Slip Gaji
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,Kehadiran Untuk Tarikh
 DocType: Warranty Claim,Raised By,Dibangkitkan Oleh
 DocType: Payment Gateway Account,Payment Account,Akaun Pembayaran
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Sila nyatakan Syarikat untuk meneruskan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Perubahan Bersih dalam Akaun Belum Terima
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Pampasan Off
 DocType: Offer Letter,Accepted,Diterima
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Nombor bilik
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Rujukan tidak sah {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) tidak boleh lebih besar dari kuantiti yang dirancang ({2}) dalam Pesanan Pengeluaran {3}
 DocType: Shipping Rule,Shipping Rule Label,Peraturan Penghantaran Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum pengguna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Bahan mentah tidak boleh kosong.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Pantas Journal Kemasukan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Tidak dapat kemas kini saham, invois mengandungi drop item penghantaran."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Pantas Journal Kemasukan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Terma dan Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Nama institut yang mana anda menyediakan sistem ini.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Catatan Perakaunan dibekukan sehingga tarikh ini, tiada siapa boleh melakukan / mengubah suai kemasukan kecuali yang berperanan seperti di bawah."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sila simpan dokumen itu sebelum menjana jadual penyelenggaraan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projek
 DocType: UOM,Check this to disallow fractions. (for Nos),Semak ini untuk tidak membenarkan pecahan. (Untuk Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Perintah Pengeluaran berikut telah dibuat:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,Kakitangan yang bekerja pada hari cuti
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Hadir
 DocType: Project,% Complete Method,% Kaedah Lengkap
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Tarikh mula penyelenggaraan tidak boleh sebelum tarikh penghantaran untuk No Serial {0}
 DocType: Production Order,Actual End Date,Tarikh Akhir Sebenar
 DocType: BOM,Operating Cost (Company Currency),Kos operasi (Syarikat Mata Wang)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Cuti Tanpa Gaji tidak sepadan dengan rekod Cuti Permohonan diluluskan
 DocType: Campaign,Campaign-.####,Kempen -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Langkah seterusnya
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Sila membekalkan barangan tertentu pada kadar terbaik mungkin
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Peluang dekat selepas 15 hari
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,akhir Tahun
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kuantiti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Rekod Bayaran Dibuat - {0}
 DocType: Asset Category Account,Asset Category Account,Akaun Kategori Asset
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Tidak boleh menghasilkan Perkara lebih {0} daripada kuantiti Sales Order {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Saham Entry {0} tidak dikemukakan
 DocType: Payment Reconciliation,Bank / Cash Account,Akaun Bank / Tunai
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Seterusnya Hubungi Dengan tidak boleh menjadi sama seperti Alamat E-mel Lead
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance Tarikh tidak dinyatakan
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Pengeluaran
 DocType: Guardian,Occupation,Pekerjaan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Tarikh Mula mestilah sebelum Tarikh Akhir
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Jumlah (Kuantiti)
 DocType: Sales Invoice,This Document,Dokumen ini
 DocType: Installation Note Item,Installed Qty,Dipasang Qty
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Laporkan Isu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Perbelanjaan utiliti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Ke atas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Kemasukan {1} tidak mempunyai akaun {2} atau sudah dipadankan dengan baucar lain
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Kemasukan {1} tidak mempunyai akaun {2} atau sudah dipadankan dengan baucar lain
 DocType: Buying Settings,Default Buying Price List,Default Senarai Membeli Harga
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Gaji Berdasarkan Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Jenis Pembayaran
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Sila pilih Batch untuk item {0}. Tidak dapat mencari kumpulan tunggal yang memenuhi keperluan ini
 DocType: Process Payroll,Select Employees,Pilih Pekerja
 DocType: Opportunity,Potential Sales Deal,Deal Potensi Jualan
 DocType: Payment Entry,Cheque/Reference Date,Cek Tarikh / Rujukan
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Profil POS Global {0} telah dicipta untuk syarikat {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Ganti Perkara / BOM dalam semua BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,dokumen Resit hendaklah dikemukakan
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,dokumen Resit hendaklah dikemukakan
 DocType: Purchase Invoice Item,Received Qty,Diterima Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Not Paid dan Tidak Dihantar
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Tiada lembaran masa
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Tinggalkan Jenis {0} tidak boleh bawa dikemukakan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Jadual penyelenggaraan tidak dihasilkan untuk semua item. Sila klik pada &#39;Menjana Jadual&#39;
 ,To Produce,Hasilkan
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Bagi barisan {0} dalam {1}. Untuk memasukkan {2} dalam kadar Perkara, baris {3} hendaklah juga disediakan"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Buat Pengguna
 DocType: Packing Slip,Identification of the package for the delivery (for print),Pengenalan pakej untuk penghantaran (untuk cetak)
 DocType: Bin,Reserved Quantity,Cipta Terpelihara Kuantiti
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Sila masukkan alamat emel yang sah
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Templat kurang upaya tidak perlu menjadi templat lalai
 DocType: Account,Income Account,Akaun Pendapatan
 DocType: Payment Request,Amount in customer's currency,Amaun dalam mata wang pelanggan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Penghantaran
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Penghantaran
 DocType: Stock Reconciliation Item,Current Qty,Kuantiti semasa
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Lihat &quot;Kadar Bahan Based On&quot; dalam Seksyen Kos
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,terdahulu
 DocType: Appraisal Goal,Key Responsibility Area,Kawasan Tanggungjawab Utama
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Kelompok pelajar membantu anda mengesan kehadiran, penilaian dan yuran untuk pelajar"
 DocType: Payment Entry,Total Allocated Amount,Jumlah Diperuntukkan
 DocType: Item Reorder,Material Request Type,Permintaan Jenis Bahan
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Kemasukan Journal bagi gaji dari {0} kepada {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyelamatkan"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage penuh, tidak menyelamatkan"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Faktor Penukaran UOM adalah wajib
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,PTJ
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Menyembunyikan Id Cukai Pelanggan dari Transaksi Jualan
 DocType: Upload Attendance,Upload HTML,Naik HTML
 DocType: Employee,Relieving Date,Melegakan Tarikh
-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.","Peraturan Harga dibuat untuk menulis ganti Senarai Harga / menentukan peratusan diskaun, berdasarkan beberapa kriteria."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Peraturan Harga dibuat untuk menulis ganti Senarai Harga / menentukan peratusan diskaun, berdasarkan beberapa kriteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Gudang hanya boleh ditukar melalui Saham Entry / Penghantaran Nota / Resit Pembelian
 DocType: Employee Education,Class / Percentage,Kelas / Peratus
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Ketua Pemasaran dan Jualan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Cukai Pendapatan
-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.","Jika Peraturan Harga dipilih dibuat untuk &#39;Harga&#39;, ia akan menulis ganti Senarai Harga. Harga Peraturan Harga adalah harga akhir, jadi tidak ada diskaun lagi boleh diguna pakai. Oleh itu, dalam urus niaga seperti Perintah Jualan, Pesanan Belian dan lain-lain, ia akan berjaya meraih jumlah dalam bidang &#39;Rate&#39;, daripada bidang &#39;Senarai Harga Rate&#39;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jika Peraturan Harga dipilih dibuat untuk &#39;Harga&#39;, ia akan menulis ganti Senarai Harga. Harga Peraturan Harga adalah harga akhir, jadi tidak ada diskaun lagi boleh diguna pakai. Oleh itu, dalam urus niaga seperti Perintah Jualan, Pesanan Belian dan lain-lain, ia akan berjaya meraih jumlah dalam bidang &#39;Rate&#39;, daripada bidang &#39;Senarai Harga Rate&#39;."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Leads mengikut Jenis Industri.
 DocType: Item Supplier,Item Supplier,Perkara Pembekal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Sila masukkan Kod Item untuk mendapatkan kumpulan tidak
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Sila pilih nilai untuk {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Semua Alamat.
 DocType: Company,Stock Settings,Tetapan saham
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Akan menghantar e-mel mengenai acara untuk pekerja dengan status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Bergantung kepada Tugas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Menguruskan Tree Kumpulan Pelanggan.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Lampiran boleh dipaparkan tanpa membolehkan troli membeli-belah
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Nama PTJ
 DocType: Leave Control Panel,Leave Control Panel,Tinggalkan Panel Kawalan
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,Debit Untuk
 DocType: Delivery Note,Required only for sample item.,Diperlukan hanya untuk item sampel.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Kuantiti Sebenar Selepas Transaksi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Pembekal&gt; Jenis pembekal
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Tiada slip gaji mendapati antara {0} dan {1}
 ,Pending SO Items For Purchase Request,Sementara menunggu SO Item Untuk Pembelian Permintaan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Kemasukan pelajar
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} dilumpuhkan
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} dilumpuhkan
 DocType: Supplier,Billing Currency,Bil Mata Wang
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Lebih Besar
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage produk yang ditampilkan
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Semua Kumpulan Penilaian
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nama Warehouse New
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Jumlah {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Jumlah {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Wilayah
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Sila menyebut ada lawatan diperlukan
 DocType: Stock Settings,Default Valuation Method,Kaedah Penilaian Default
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 DocType: Production Order Operation,Planned Start Time,Dirancang Mula Masa
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,Senarai Harga Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Semua Transaksi Jualan boleh tagged terhadap pelbagai ** Jualan Orang ** supaya anda boleh menetapkan dan memantau sasaran.
 ,S.O. No.,PP No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Sila buat Pelanggan dari Lead {0}
 DocType: Price List,Applicable for Countries,Digunakan untuk Negara
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Hanya Tinggalkan Permohonan dengan status &#39;diluluskan&#39; dan &#39;Telah&#39; boleh dikemukakan
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Pelajar Kumpulan Nama adalah wajib berturut-turut {0}
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,disalin Dari
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},ralat Nama: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,kekurangan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} tidak berkaitan dengan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} tidak berkaitan dengan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Kehadiran bagi pekerja {0} telah ditandakan
 DocType: Packing Slip,If more than one package of the same type (for print),Jika lebih daripada satu bungkusan dari jenis yang sama (untuk cetak)
 ,Salary Register,gaji Daftar
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Gunakan untuk Troli
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Nilai {0} untuk Sifat {1} tidak wujud dalam senarai item sah Atribut Nilai untuk item {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Caj akan diagihkan mengikut kadar berdasarkan item qty atau amaunnya, seperti pilihan anda"
 DocType: Maintenance Visit,Purposes,Tujuan
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operasi {0} lebih lama daripada mana-mana waktu kerja yang terdapat di stesen kerja {1}, memecahkan operasi ke dalam pelbagai operasi"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Mengurus Wilayah Tree.
 DocType: Journal Entry Account,Sales Invoice,Invois jualan
 DocType: Journal Entry Account,Party Balance,Baki pihak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Sila pilih Memohon Diskaun Pada
 DocType: Company,Default Receivable Account,Default Akaun Belum Terima
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Buat Bank Entry untuk jumlah gaji yang dibayar bagi kriteria yang dipilih di atas
 DocType: Stock Entry,Material Transfer for Manufacture,Pemindahan Bahan untuk Pembuatan
-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.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Peratus diskaun boleh digunakan baik dengan menentang Senarai Harga atau untuk semua Senarai Harga.
 DocType: Purchase Invoice,Half-yearly,Setengah tahun
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Catatan Perakaunan untuk Stok
 DocType: Vehicle Service,Engine Oil,Minyak enjin
 DocType: Sales Invoice,Sales Team1,Team1 Jualan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Perkara {0} tidak wujud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Perkara {0} tidak wujud
 DocType: Sales Invoice,Customer Address,Alamat Pelanggan
 DocType: Employee Loan,Loan Details,Butiran pinjaman
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Bidang Qty mesti lebih besar daripada sifar.
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,Jenis akar
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Tidak boleh kembali lebih daripada {1} untuk Perkara {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plot
 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}
 DocType: Cheque Print Template,Primary Settings,Tetapan utama
 DocType: Purchase Invoice,Select Supplier Address,Pilih Alamat Pembekal
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Tambahkan Pekerja
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Tambahkan Pekerja
 DocType: Purchase Invoice Item,Quality Inspection,Pemeriksaan Kualiti
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Tambahan Kecil
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Amaran: Bahan Kuantiti yang diminta adalah kurang daripada Minimum Kuantiti Pesanan
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Akaun {0} dibekukan
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Undang-undang Entiti / Anak Syarikat dengan Carta berasingan Akaun milik Pertubuhan.
 DocType: Payment Request,Mute Email,Senyapkan E-mel
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Makanan, Minuman &amp; Tembakau"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Hanya boleh membuat pembayaran terhadap belum dibilkan {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Kadar Suruhanjaya tidak boleh lebih besar daripada 100
 DocType: Stock Entry,Subcontract,Subkontrak
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Sila masukkan {0} pertama
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Gudang dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan.
 DocType: Assessment Result Tool,Result HTML,keputusan HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Luput pada
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Tambahkan Pelajar
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Tambahkan Pelajar
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Sila pilih {0}
 DocType: C-Form,C-Form No,C-Borang No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Masukkan nama kempen jika sumber siasatan adalah kempen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Akhbar Penerbit
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Pilih Tahun Anggaran
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Pilih Tahun Anggaran
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Pesanan semula Level
 DocType: Company,Chart Of Accounts Template,Carta Of Akaun Template
 DocType: Attendance,Attendance Date,Kehadiran Tarikh
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Entri pendua
 DocType: Program Enrollment Tool,Get Students,Dapatkan Pelajar
 DocType: Serial No,Under Warranty,Di bawah Waranti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Ralat]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Ralat]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Perintah Jualan.
 ,Employee Birthday,Pekerja Hari Lahir
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Pelajar Tool Batch Kehadiran
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,had Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Modal Teroka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Istilah akademik dengan ini &#39;Academic Year&#39; {0} dan &#39;Nama Term&#39; {1} telah wujud. Sila ubah suai entri ini dan cuba lagi.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Oleh kerana terdapat urus niaga yang sedia ada terhadap item {0}, anda tidak boleh menukar nilai {1}"
 DocType: UOM,Must be Whole Number,Mesti Nombor Seluruh
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Daun baru Diperuntukkan (Dalam Hari)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,No siri {0} tidak wujud
@@ -2825,7 +2828,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 +49,Period Closing Entry,Kemasukan Tempoh Penutup
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar kepada kumpulan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Jumlah {0} {1} {2} {3}
 DocType: Account,Depreciation,Susutnilai
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Pembekal (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Pekerja Tool Kehadiran
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,Hari terakhir Bulan Depan
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue dekat selepas 7 hari
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Cuti yang tidak boleh diperuntukkan sebelum {0}, sebagai baki cuti telah pun dibawa dikemukakan dalam rekod peruntukan cuti masa depan {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: Disebabkan Tarikh / Rujukan melebihi dibenarkan hari kredit pelanggan dengan {0} hari (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Pemohon pelajar
 DocType: Asset Category Account,Accumulated Depreciation Account,Akaun Susut Nilai Terkumpul
 DocType: Stock Settings,Freeze Stock Entries,Freeze Saham Penyertaan
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,Saham Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operasi tidak boleh dibiarkan kosong
 DocType: Maintenance Visit Purpose,Against Document Detail No,Terhadap Detail Dokumen No
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Jenis Parti adalah wajib
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Jenis Parti adalah wajib
 DocType: Quality Inspection,Outgoing,Keluar
 DocType: Material Request,Requested For,Diminta Untuk
 DocType: Quotation Item,Against Doctype,Terhadap DOCTYPE
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,Kod Item
 DocType: Production Planning Tool,Create Production Orders,Buat Pesanan Pengeluaran
 DocType: Serial No,Warranty / AMC Details,Waranti / AMC Butiran
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Pilih pelajar secara manual untuk Aktiviti berasaskan Kumpulan
 DocType: Journal Entry,User Remark,Catatan pengguna
 DocType: Lead,Market Segment,Segmen pasaran
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Jumlah yang dibayar tidak boleh lebih besar daripada jumlah terkumpul negatif {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Pekerja Dalam Sejarah Kerja
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Penutup (Dr)
 DocType: Cheque Print Template,Cheque Size,Saiz Cek
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,Buat Permintaan Bahan
 DocType: Employee Education,School/University,Sekolah / Universiti
 DocType: Payment Request,Reference Details,Rujukan Butiran
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Nilai dijangka After Life Berguna mesti kurang daripada Jumlah Kasar Pembelian
 DocType: Sales Invoice Item,Available Qty at Warehouse,Kuantiti didapati di Gudang
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Jumlah dibilkan
 DocType: Asset,Double Declining Balance,Baki Penurunan Double
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Akaun perbezaan mestilah akaun jenis Aset / Liabiliti, kerana ini adalah Penyesuaian Saham Masuk Pembukaan"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Amaun yang dikeluarkan tidak boleh lebih besar daripada Jumlah Pinjaman {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Membeli nombor Perintah diperlukan untuk Perkara {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Order Production tidak dicipta
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Order Production tidak dicipta
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Dari Tarikh' mesti selepas 'Sehingga'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},tidak boleh menukar status sebagai pelajar {0} dikaitkan dengan permohonan pelajar {1}
 DocType: Asset,Fully Depreciated,disusutnilai sepenuhnya
 ,Stock Projected Qty,Saham Unjuran Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Pelanggan {0} bukan milik projek {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Kehadiran ketara HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Sebutharga cadangan, bida yang telah anda hantar kepada pelanggan anda"
 DocType: Sales Order,Customer's Purchase Order,Pesanan Pelanggan
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No dan Batch
 DocType: Warranty Claim,From Company,Daripada Syarikat
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Jumlah Markah Kriteria Penilaian perlu {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Nilai atau Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Sila menetapkan Bilangan penurunan nilai Ditempah
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Nilai atau Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Pesanan Productions tidak boleh dibangkitkan untuk:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Saat
 DocType: Purchase Invoice,Purchase Taxes and Charges,Membeli Cukai dan Caj
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,semua Gudang
 DocType: Sales Partner,Retailer,Peruncit
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Semua Jenis Pembekal
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Semua Jenis Pembekal
 DocType: Global Defaults,Disable In Words,Matikan Dalam Perkataan
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Sebut Harga {0} bukan jenis {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Akaun Overdraf bank
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Membuat Slip Gaji
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Jumlah Diperuntukkan tidak boleh lebih besar daripada jumlah tertunggak.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Browse BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Pinjaman Bercagar
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Tarikh Posting dan Masa
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Tidak dibenarkan untuk mengemaskini transaksi saham lebih tua daripada {0}
 DocType: Purchase Invoice Item,PR Detail,Detail PR
 DocType: Sales Order,Fully Billed,Membilkan sepenuhnya
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Sila menetapkan akaun dibayar lalai dalam pekerja {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tunai Dalam Tangan
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Gudang penghantaran diperlukan untuk item stok {0}
 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)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Pada Based Group
 DocType: Journal Entry,Bill Date,Rang Undang-Undang Tarikh
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Perkhidmatan Item, Jenis, kekerapan dan jumlah perbelanjaan yang diperlukan"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Walaupun terdapat beberapa Peraturan Harga dengan keutamaan tertinggi, keutamaan dalaman maka berikut digunakan:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Adakah anda benar-benar mahu Mengemukakan semua Slip Gaji dari {0} kepada {1}
 DocType: Cheque Print Template,Cheque Height,Cek Tinggi
 DocType: Supplier,Supplier Details,Butiran Pembekal
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,invois Ref
 DocType: Purchase Order,Recurring Order,Pesanan berulang
 DocType: Company,Default Income Account,Akaun Pendapatan Default
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kumpulan pelanggan / Pelanggan
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskal Tahun Keuntungan / Kerugian (Kredit)
 DocType: Sales Invoice,Time Sheets,Lembaran masa
 DocType: Payment Gateway Account,Default Payment Request Message,Lalai Permintaan Bayaran Mesej
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,Sebut Harga Mesej
 DocType: Employee Loan,Employee Loan Application,Permohonan Pinjaman pekerja
 DocType: Issue,Opening Date,Tarikh pembukaan
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Kehadiran telah ditandakan dengan jayanya.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Kehadiran telah ditandakan dengan jayanya.
 DocType: Journal Entry,Remark,Catatan
 DocType: Purchase Receipt Item,Rate and Amount,Kadar dan Jumlah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Jenis Akaun untuk {0} mesti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Jenis Akaun untuk {0} mesti {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Daun dan Holiday
 DocType: School Settings,Current Academic Term,Jangka Akademik Semasa
 DocType: School Settings,Current Academic Term,Jangka Akademik Semasa
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Kumpulan pelajar
 DocType: Shopping Cart Settings,Quotation Series,Sebutharga Siri
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Item wujud dengan nama yang sama ({0}), sila tukar nama kumpulan item atau menamakan semula item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Sila pilih pelanggan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Sila pilih pelanggan
 DocType: C-Form,I,Saya
 DocType: Company,Asset Depreciation Cost Center,Aset Pusat Susutnilai Kos
 DocType: Sales Order Item,Sales Order Date,Pesanan Jualan Tarikh
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,Butiran Insurance
 DocType: Account,Payable,Kena dibayar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Sila masukkan Tempoh Bayaran Balik
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Penghutang ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Penghutang ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Pelanggan Baru
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Keuntungan kasar%
 DocType: Appraisal Goal,Weightage (%),Wajaran (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Tarikh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Jumlah Pembelian Kasar adalah wajib
 DocType: Lead,Address Desc,Alamat Deskripsi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parti adalah wajib
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Parti adalah wajib
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Nama
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast salah satu atau Jualan Membeli mesti dipilih
-DocType: Grading Structure,Grade Intervals,Selang gred
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Pilih jenis perniagaan anda.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: salinan catatan dalam Rujukan {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Tempat operasi pembuatan dijalankan.
 DocType: Asset Movement,Source Warehouse,Sumber Gudang
 DocType: Installation Note,Installation Date,Tarikh pemasangan
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Ketua surat untuk template cetak.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tajuk untuk template cetak seperti Proforma Invois.
 DocType: Student Guardian,Student Guardian,Guardian pelajar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Caj jenis penilaian tidak boleh ditandakan sebagai Inclusive
 DocType: POS Profile,Update Stock,Update Saham
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM berbeza untuk perkara akan membawa kepada tidak betul (Jumlah) Nilai Berat Bersih. Pastikan Berat bersih setiap item adalah dalam UOM yang sama.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Kadar BOM
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain Akaun / Kerugian
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pekerja dan Kehadiran
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Tujuan mestilah salah seorang daripada {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Isi borang dan simpannya
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,qty sebenar dalam stok
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Pesanan semula Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Lowongan Kerja Semasa
 DocType: Company,Stock Adjustment Account,Akaun Pelarasan saham
-DocType: Journal Entry,Write Off,Tulis Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Tulis Off
 DocType: Timesheet Detail,Operation ID,ID Operasi
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem Pengguna (log masuk) ID. Jika ditetapkan, ia akan menjadi lalai untuk semua bentuk HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Dari {1}
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Pembekal menyampaikan kepada Pelanggan
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Borang / Item / {0}) kehabisan stok
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Tarikh akan datang mesti lebih besar daripada Pos Tarikh
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show cukai Perpecahan
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Show cukai Perpecahan
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Oleh kerana / Rujukan Tarikh dan boleh dikenakan {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import dan Eksport
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","penyertaan saham wujud terhadap Warehouse {0}, oleh itu anda tidak boleh semula menetapkan-atau mengubahsuainya"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Tiada pelajar Terdapat
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Tiada pelajar Terdapat
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Posting Invois Tarikh
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Jual
 DocType: Sales Invoice,Rounded Total,Bulat Jumlah
 DocType: Product Bundle,List items that form the package.,Senarai item yang membentuk pakej.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Peratus Peruntukan hendaklah sama dengan 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Sila pilih Tarikh Pengeposan sebelum memilih Parti
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Daripada AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sila pilih Sebutharga
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Sila pilih Sebutharga
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Sila pilih Sebutharga
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Jumlah penurunan nilai Ditempah tidak boleh lebih besar daripada Jumlah penurunan nilai
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Buat Penyelenggaraan Lawatan
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Sila hubungi untuk pengguna yang mempunyai Master Pengurus Jualan {0} peranan
 DocType: Company,Default Cash Account,Akaun Tunai Default
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Syarikat (tidak Pelanggan atau Pembekal) induk.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ini adalah berdasarkan kepada kehadiran Pelajar ini
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,No Pelajar dalam
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Tambah lagi item atau bentuk penuh terbuka
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Sila masukkan &#39;Jangkaan Tarikh Penghantaran&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Nota Penghantaran {0} hendaklah dibatalkan sebelum membatalkan Perintah Jualan ini
@@ -3237,6 +3241,7 @@
 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: Warranty Claim,Item and Warranty Details,Perkara dan Jaminan Maklumat
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod item&gt; Item Group&gt; Jenama
 DocType: Sales Team,Contribution (%),Sumbangan (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Pilih Program yang mengambil kursus mandatori.
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Sebelum perdamaian
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Untuk {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Cukai dan Caj Ditambah (Syarikat mata wang)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Perkara Cukai {0} mesti mempunyai akaun Cukai jenis atau Pendapatan atau Perbelanjaan atau bercukai
 DocType: Sales Order,Partly Billed,Sebahagiannya Membilkan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Perkara {0} perlu menjadi Asset Perkara Tetap
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Perkara {0} perlu menjadi Asset Perkara Tetap
 DocType: Item,Default BOM,BOM Default
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotif
 DocType: Vehicle,Insurance Company,Syarikat insurans
 DocType: Asset Category Account,Fixed Asset Account,Akaun Aset Tetap
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ubah
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Dari Penghantaran Nota
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ubah
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Dari Penghantaran Nota
 DocType: Student,Student Email Address,Pelajar Alamat E-mel
 DocType: Timesheet Detail,From Time,Dari Masa
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Dalam stok:
@@ -3277,12 +3282,12 @@
 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 +66,Intern,Pelatih
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,alamat Nama
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,alamat Nama
 DocType: Stock Entry,From BOM,Dari BOM
 DocType: Assessment Code,Assessment Code,Kod penilaian
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Asas
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksi saham sebelum {0} dibekukan
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Sila klik pada &#39;Menjana Jadual&#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","contohnya Kg, Unit, No, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Rujukan adalah wajib jika anda masukkan Tarikh Rujukan
 DocType: Bank Reconciliation Detail,Payment Document,Dokumen pembayaran
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,Struktur gaji
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Syarikat Penerbangan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Isu Bahan
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Anda berada di dalam mod luar talian. Anda tidak akan dapat untuk menambah nilai sehingga anda mempunyai rangkaian.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Tiada Kumpulan Pelajar diwujudkan.
 DocType: Purchase Invoice Item,Serial No,No siri
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Jumlah Pembayaran balik bulanan tidak boleh lebih besar daripada Jumlah Pinjaman
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Sila masukkan Maintaince Butiran pertama
 DocType: Purchase Invoice,Print Language,Cetak Bahasa
 DocType: Salary Slip,Total Working Hours,Jumlah Jam Kerja
 DocType: Stock Entry,Including items for sub assemblies,Termasuk perkara untuk sub perhimpunan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Masukkan nilai mesti positif
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Masukkan nilai mesti positif
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Semua Wilayah
 DocType: Purchase Invoice,Items,Item
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Pelajar sudah mendaftar.
@@ -3322,17 +3327,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unit keingkaran Langkah untuk Variant &#39;{0}&#39; hendaklah sama seperti dalam Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Kira Based On
 DocType: Delivery Note Item,From Warehouse,Dari Gudang
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Tiada item dengan Bill Bahan untuk pembuatan
 DocType: Assessment Plan,Supervisor Name,Nama penyelia
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
 DocType: Program Enrollment Course,Program Enrollment Course,Kursus Program Pendaftaran
-DocType: Grading Structure,Grading Structure,Struktur Grading
 DocType: Purchase Taxes and Charges,Valuation and Total,Penilaian dan Jumlah
 DocType: Tax Rule,Shipping City,Penghantaran Bandar
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Menyesuaikan Pemberitahuan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Aliran Tunai daripada Operasi
 DocType: Sales Invoice,Shipping Rule,Peraturan Penghantaran
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Tidak lalai BOM wujud untuk Perkara {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Sila pilih Penempatan Tarikh pertama
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tarikh pembukaan perlu sebelum Tarikh Tutup
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,PTJ dengan urus niaga yang sedia ada tidak boleh ditukar ke dalam lejar
 DocType: Department,Days for which Holidays are blocked for this department.,Hari yang mana Holidays disekat untuk jabatan ini.
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Lampirkan Kepala Surat
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi lalu
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikasi lalu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Tidak boleh memotong apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Penilaian dan Jumlah&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Senarai kepala cukai anda (contohnya VAT, Kastam dan lain-lain, mereka harus mempunyai nama-nama yang unik) dan kadar standard mereka. Ini akan mewujudkan templat standard, yang anda boleh menyunting dan menambah lebih kemudian."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pembayaran perlawanan dengan Invois
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Jumlah (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Hiburan &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Item No Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Cipta Rekod pekerja
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Cipta Rekod pekerja
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Jumlah Hadir
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Penyata perakaunan
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Jam
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,tidak diketahui
 DocType: Shipping Rule,Shipping Rule Conditions,Penghantaran Peraturan Syarat
 DocType: BOM Replace Tool,The new BOM after replacement,The BOM baru selepas penggantian
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Tempat Jualan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Tempat Jualan
 DocType: Payment Entry,Received Amount,Pendapatan daripada
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Sila setup pekerja Penamaan Sistem dalam Sumber Manusia&gt; Tetapan HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Buat untuk kuantiti penuh, mengabaikan kuantiti sudah di perintah"
 DocType: Account,Tax,Cukai
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,tidak Ditandakan
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,Source Document Nama
 DocType: Batch,Source Document Name,Source Document Nama
 DocType: Job Opening,Job Title,Tajuk Kerja
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Buat Pengguna
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Buat Pengguna
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kuantiti untuk pembuatan mesti lebih besar daripada 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Lawati laporan untuk panggilan penyelenggaraan.
 DocType: Stock Entry,Update Rate and Availability,Kadar Update dan Ketersediaan
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Peratus anda dibenarkan untuk menerima atau menyampaikan lebih daripada kuantiti yang ditempah. Sebagai contoh: Jika anda telah menempah 100 unit. dan Elaun anda adalah 10% maka anda dibenarkan untuk menerima 110 unit.
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Akaun perbelanjaan adalah wajib bagi item {0}
 DocType: BOM,Website Description,Laman Web Penerangan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Perubahan Bersih dalam Ekuiti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Sila membatalkan Invois Belian {0} pertama
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Alamat e-mel mesti menjadi unik, sudah wujud untuk {0}"
 DocType: Serial No,AMC Expiry Date,AMC Tarikh Tamat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,resit
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,resit
 ,Sales Register,Jualan Daftar
 DocType: Daily Work Summary Settings Company,Send Emails At,Menghantar e-mel di
 DocType: Quotation,Quotation Lost Reason,Sebut Harga Hilang Akal
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Pilih Domain anda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},rujukan transaksi tidak {0} bertarikh {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Ada apa-apa untuk mengedit.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Ringkasan untuk bulan ini dan aktiviti-aktiviti yang belum selesai
 DocType: Customer Group,Customer Group Name,Nama Kumpulan Pelanggan
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,No Pelanggan lagi!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Penyata aliran tunai
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Jumlah Pinjaman tidak boleh melebihi Jumlah Pinjaman maksimum {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,lesen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Sila masukkan Tulis Off Akaun
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Lepas Tarikh Perintah
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Akaun {0} tidak dimiliki oleh syarikat {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Nombor siri berturut-turut {0} tidak sepadan dengan penghantaran Nota
 DocType: Student,Guardian Details,Guardian Butiran
 DocType: C-Form,C-Form,C-Borang
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Kehadiran beberapa pekerja
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Akaun mestilah jenis &#39;Aset Tetap&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Keluar Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Kaedah-kaedah untuk mengira jumlah penghantaran untuk jualan
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Siri adalah wajib
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Siri adalah wajib
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Perkhidmatan Kewangan
 DocType: Student Sibling,Student ID,ID pelajar
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Jenis aktiviti untuk Masa Balak
 DocType: Tax Rule,Sales,Jualan
 DocType: Stock Entry Detail,Basic Amount,Jumlah Asas
 DocType: Training Event,Exam,peperiksaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Gudang diperlukan untuk saham Perkara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Negeri Bil
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Pemindahan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} tidak berkaitan dengan Akaun Pihak {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} tidak berkaitan dengan Akaun Pihak {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Kutip BOM meletup (termasuk sub-pemasangan)
 DocType: Authorization Rule,Applicable To (Employee),Terpakai Untuk (Pekerja)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Tarikh Akhir adalah wajib
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Kenaikan untuk Atribut {0} tidak boleh 0
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,Pelanggan aktif
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Resit Pembelian
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Bagaimana Harga Peraturan digunakan?
 DocType: Stock Entry,Delivery Note No,Penghantaran Nota Tiada
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Jika disemak, hanya Membeli permintaan bahan untuk bahan-bahan mentah akhir akan dimasukkan ke dalam Permintaan Bahan. Jika tidak, Permintaan Bahan untuk barangan ibu bapa akan dicipta"
 DocType: Cheque Print Template,Message to show,Mesej untuk menunjukkan
 DocType: Company,Retail,Runcit
 DocType: Attendance,Absent,Tidak hadir
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle Produk
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,Akaun Dibayar Dari
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Bahan mentah Item Code
 DocType: Journal Entry,Write Off Based On,Tulis Off Based On
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,membuat Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,membuat Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Cetak dan Alat Tulis
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Hantar Email Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Hantar Email Pembekal
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Gaji sudah diproses untuk tempoh antara {0} dan {1}, Tinggalkan tempoh permohonan tidak boleh di antara julat tarikh ini."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Rekod pemasangan untuk No. Siri
 DocType: Guardian Interest,Guardian Interest,Guardian Faedah
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,Menunggu Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Di atas
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},sifat yang tidak sah {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Menyebut jika tidak standard akaun yang perlu dibayar
 DocType: Salary Slip,Earning & Deduction,Pendapatan &amp; Potongan
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Pilihan. Tetapan ini akan digunakan untuk menapis dalam pelbagai transaksi.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Kadar Penilaian negatif tidak dibenarkan
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,Pengeluaran Item pesanan
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Rekod tidak dijumpai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kos Aset Dihapuskan
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,sebahagiannya ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Pusat Kos adalah wajib bagi Perkara {2}
 DocType: Vehicle,Policy No,Polisi Tiada
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Dapatkan Item daripada Fail Produk
 DocType: Asset,Straight Line,Garis lurus
 DocType: Project User,Project User,projek Pengguna
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
@@ -3562,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dapatkan Pelajar Dari
 DocType: Hub Settings,Seller Country,Penjual Negara
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Terbitkan Item dalam Laman Web
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Kumpulan pelajar anda dalam kelompok
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Kumpulan pelajar anda dalam kelompok
 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 +85,Specifications,Spesifikasi
@@ -3615,14 +3618,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cek Tarikh
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Akaun {0}: akaun Induk {1} bukan milik syarikat: {2}
 DocType: Program Enrollment Tool,Student Applicants,Pemohon pelajar
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Berjaya memadam semua transaksi yang berkaitan dengan syarikat ini!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Tarikh pendaftaran
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Percubaan
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponen gaji
 DocType: Program Enrollment Tool,New Academic Year,New Akademik Tahun
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Pulangan / Nota Kredit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Pulangan / Nota Kredit
 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 +28,Total Paid Amount,Jumlah Amaun Dibayar
 DocType: Production Order Item,Transferred Qty,Dipindahkan Qty
@@ -3642,7 +3645,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Jenis daun seperti biasa, sakit dan lain-lain"
 DocType: Email Digest,Send regular summary reports via Email.,Hantar laporan ringkasan tetap melalui E-mel.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Sila menetapkan akaun lalai dalam Jenis Perbelanjaan Tuntutan {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Sila menetapkan akaun lalai dalam Jenis Perbelanjaan Tuntutan {0}
 DocType: Assessment Result,Student Name,Nama pelajar
 DocType: Brand,Item Manager,Perkara Pengurus
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,gaji Dibayar
@@ -3663,6 +3666,7 @@
 ,Sales Funnel,Saluran Jualan
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Singkatan adalah wajib
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Dalam Troli
 ,Qty to Transfer,Qty untuk Pemindahan
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Petikan untuk Leads atau Pelanggan.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Peranan dibenarkan untuk mengedit saham beku
@@ -3690,13 +3694,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Perkara Bijaksana Cukai Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institut Singkatan
 ,Item-wise Price List Rate,Senarai Harga Kadar Perkara-bijak
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Sebutharga Pembekal
 DocType: Quotation,In Words will be visible once you save the Quotation.,Dalam Perkataan akan dapat dilihat selepas anda menyimpan Sebut Harga tersebut.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kuantiti ({0}) tidak boleh menjadi sebahagian kecil berturut-turut {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,memungut Yuran
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} telah digunakan dalam Perkara {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Peraturan untuk menambah kos penghantaran.
 DocType: Item,Opening Stock,Stok Awal
@@ -3713,8 +3717,8 @@
 Updated via 'Time Log'",dalam minit dikemaskini melalui &#39;Time Log&#39;
 DocType: Customer,From Lead,Dari Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Perintah dikeluarkan untuk pengeluaran.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Pilih Tahun Anggaran ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Pilih Tahun Anggaran ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil dikehendaki membuat POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Daftarkan Pelajar
 DocType: Hub Settings,Name Token,Nama Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Jualan Standard
@@ -3725,7 +3729,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} terhadap Invois Jualan  {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nama Projek
-DocType: Supplier,Mention if non-standard receivable account,Sebut jika akaun belum terima tidak standard
+DocType: Customer,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: Production Order,Required Items,Item yang diperlukan
 DocType: Stock Ledger Entry,Stock Value Difference,Nilai saham Perbezaan
@@ -3746,7 +3750,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sasaran yang ditetapkan Perkara Kumpulan-bijak untuk Orang Jualan ini.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stok Freeze Lama Than [Hari]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Aset adalah wajib bagi aset tetap pembelian / penjualan
-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.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jika dua atau lebih Peraturan Harga yang didapati berdasarkan syarat-syarat di atas, Keutamaan digunakan. Keutamaan adalah nombor antara 0 hingga 20 manakala nilai lalai adalah sifar (kosong). Jumlah yang lebih tinggi bermakna ia akan diberi keutamaan jika terdapat berbilang Peraturan Harga dengan keadaan yang sama."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Tahun fiskal: {0} tidak wujud
 DocType: Currency Exchange,To Currency,Untuk Mata Wang
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Membenarkan pengguna berikut untuk meluluskan Permohonan Cuti untuk hari blok.
@@ -3772,7 +3776,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Perkara {0} diabaikan kerana ia bukan satu perkara saham
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Hantar Pesanan Pengeluaran ini untuk proses seterusnya.
-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.","Tidak memohon Peraturan Harga dalam transaksi tertentu, semua Peraturan Harga berkenaan perlu dimatikan."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Tidak memohon Peraturan Harga dalam transaksi tertentu, semua Peraturan Harga berkenaan perlu dimatikan."
 DocType: Assessment Group,Parent Assessment Group,Persatuan Ibu Bapa Penilaian
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Pekerjaan
 ,Sales Order Trends,Trend Pesanan Jualan
@@ -3783,7 +3787,7 @@
 DocType: Stock Entry Detail,Additional Cost,Kos tambahan
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Akhir Tahun Kewangan Tarikh
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Tidak boleh menapis berdasarkan Baucer Tidak, jika dikumpulkan oleh Baucar"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Membuat Sebutharga Pembekal
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Membuat Sebutharga Pembekal
 DocType: Quality Inspection,Incoming,Masuk
 DocType: BOM,Materials Required (Exploded),Bahan yang diperlukan (Meletup)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Tambah pengguna kepada organisasi anda, selain daripada diri sendiri"
@@ -3811,6 +3815,7 @@
 DocType: Employee,History In Company,Sejarah Dalam Syarikat
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Surat Berita
 DocType: Stock Ledger Entry,Stock Ledger Entry,Saham Lejar Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Pelanggan&gt; Kumpulan Pelanggan&gt; Wilayah
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,item yang sama telah dimasukkan beberapa kali
 DocType: Department,Leave Block List,Tinggalkan Sekat Senarai
 DocType: Sales Invoice,Tax ID,ID Cukai
@@ -3820,7 +3825,7 @@
 DocType: Customer,Sales Partner and Commission,Rakan Jualan dan Suruhanjaya
 DocType: Employee Loan,Rate of Interest (%) / Year,Kadar faedah (%) / Tahun
 ,Project Quantity,projek Kuantiti
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Jumlah {0} untuk semua barangan adalah sifar, mungkin anda perlu menukar &#39;Mengedarkan Caj Berasaskan&#39;"
 DocType: Opportunity,To Discuss,Bincang
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unit {1} diperlukan dalam {2} untuk melengkapkan urus niaga ini.
 DocType: Loan Type,Rate of Interest (%) Yearly,Kadar faedah (%) tahunan
@@ -3835,7 +3840,7 @@
 DocType: Purchase Invoice,Return,Pulangan
 DocType: Production Order Operation,Production Order Operation,Pengeluaran Operasi Pesanan
 DocType: Pricing Rule,Disable,Melumpuhkan
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Cara pembayaran adalah dikehendaki untuk membuat pembayaran
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Cara pembayaran adalah dikehendaki untuk membuat pembayaran
 DocType: Project Task,Pending Review,Sementara menunggu Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} tidak boleh dimansuhkan, kerana ia sudah {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Jumlah Tuntutan Perbelanjaan (melalui Perbelanjaan Tuntutan)
@@ -3843,11 +3848,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Tidak Hadir
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Matawang BOM # {1} hendaklah sama dengan mata wang yang dipilih {2}
 DocType: Journal Entry Account,Exchange Rate,Kadar pertukaran
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} tidak dikemukakan
 DocType: Homepage,Tag Line,Line tag
 DocType: Fee Component,Fee Component,Komponen Bayaran
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Pengurusan Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Tambah item dari
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Tambah item dari
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Gudang {0}: akaun Ibu Bapa {1} tidak Bolong kepada syarikat {2}
 DocType: Cheque Print Template,Regular,biasa
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Jumlah Wajaran semua Kriteria Penilaian mesti 100%
@@ -3860,7 +3865,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Gudang {0} tidak wujud
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Daftar Untuk ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Peratusan Taburan Bulanan
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Item yang dipilih tidak boleh mempunyai Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Kadar penilaian tidak dijumpai untuk Perkara {0}, yang diperlukan untuk melakukan catatan perakaunan untuk {1} {2}. Jika yang menjalankan transaksi sebagai item sampel dalam {1}, sila sebut bahawa dalam {1} meja Item. Jika tidak, sila buat transaksi stok masuk untuk item atau sebutan kadar penilaian dalam rekod Item, dan kemudian cuba submiting / membatalkan entri ini"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% bahan-bahan yang dihantar untuk Nota Penghantaran ini
 DocType: Project,Customer Details,Butiran Pelanggan
@@ -3869,15 +3874,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Masukkan parameter url untuk penerima nos
 DocType: Payment Entry,Paid Amount,Jumlah yang dibayar
 DocType: Assessment Plan,Supervisor,penyelia
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,talian
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,talian
 ,Available Stock for Packing Items,Saham tersedia untuk Item Pembungkusan
 DocType: Item Variant,Item Variant,Perkara Varian
 DocType: Assessment Result Tool,Assessment Result Tool,Penilaian Keputusan Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,penghantaran pesanan tidak boleh dihapuskan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Pengurusan Kualiti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Perkara {0} telah dilumpuhkan
 DocType: Employee Loan,Repay Fixed Amount per Period,Membayar balik Jumlah tetap setiap Tempoh
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Sila masukkan kuantiti untuk Perkara {0}
 DocType: Employee External Work History,Employee External Work History,Luar pekerja Sejarah Kerja
@@ -3904,7 +3909,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Pelajar Email ID
 DocType: Employee,Notice (days),Notis (hari)
 DocType: Tax Rule,Sales Tax Template,Template Cukai Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Pilih item untuk menyelamatkan invois
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Pilih item untuk menyelamatkan invois
 DocType: Employee,Encashment Date,Penunaian Tarikh
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Pelarasan saham
@@ -3928,7 +3933,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Sila nyatakan dari / ke berkisar
 DocType: Serial No,Under AMC,Di bawah AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Perkara kadar penilaian dikira semula memandangkan jumlah baucar kos mendarat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Perkara kadar penilaian dikira semula memandangkan jumlah baucar kos mendarat
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Tetapan lalai untuk menjual transaksi.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,ambang
@@ -3938,6 +3943,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Nota Dikeluarkan
 DocType: Production Order,Warehouses,Gudang
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aset tidak boleh dipindahkan
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Perkara ini adalah Variant {0} (Template).
 DocType: Workstation,per hour,sejam
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Membeli
 DocType: Announcement,Announcement,Pengumuman
@@ -3953,8 +3959,8 @@
 DocType: Account,Receivable,Belum Terima
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Tidak dibenarkan untuk menukar pembekal sebagai Perintah Pembelian sudah wujud
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Peranan yang dibenarkan menghantar transaksi yang melebihi had kredit ditetapkan.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Pilih item untuk mengeluarkan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Pilih item untuk mengeluarkan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master penyegerakan data, ia mungkin mengambil sedikit masa"
 DocType: Item,Material Issue,Isu Bahan
 DocType: Hub Settings,Seller Description,Penjual Penerangan
 DocType: Employee Education,Qualification,Kelayakan
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Mengarahkan
 DocType: Salary Detail,Component,komponen
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteria Penilaian Kumpulan
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Membuka Susut Nilai Terkumpul mesti kurang dari sama dengan {0}
 DocType: Warehouse,Warehouse Name,Nama Gudang
 DocType: Naming Series,Select Transaction,Pilih Transaksi
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Sila masukkan Meluluskan Peranan atau Meluluskan pengguna
@@ -3979,7 +3985,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Tidak boleh membatalkan kerana dikemukakan Saham Entry {0} wujud
 DocType: Employee Loan,Disbursement Date,Tarikh pembayaran
 DocType: Vehicle,Vehicle,kenderaan
 DocType: Purchase Invoice,In Words,Dalam Perkataan
@@ -3994,14 +4000,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,RRJP / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Penurunan nilai aset dan Baki
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Jumlah {0} {1} dipindahkan dari {2} kepada {3}
 DocType: Sales Invoice,Get Advances Received,Mendapatkan Pendahuluan Diterima
 DocType: Email Digest,Add/Remove Recipients,Tambah / Buang Penerima
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaksi tidak dibenarkan terhadap Pengeluaran berhenti Perintah {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Untuk menetapkan Tahun Fiskal ini sebagai lalai, klik pada &#39;Tetapkan sebagai lalai&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Sertai
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Kekurangan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Varian item {0} wujud dengan ciri yang sama
 DocType: Employee Loan,Repay from Salary,Membayar balik dari Gaji
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Meminta pembayaran daripada {0} {1} untuk jumlah {2}
@@ -4019,7 +4025,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Penilaian Keputusan terperinci
 DocType: Employee Education,Employee Education,Pendidikan Pekerja
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,kumpulan item Duplicate dijumpai di dalam jadual kumpulan item
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Ia diperlukan untuk mengambil Butiran Item.
 DocType: Salary Slip,Net Pay,Gaji bersih
 DocType: Account,Account,Akaun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,No siri {0} telah diterima
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} tidak dikaitkan dengan mana-mana akaun, sila membuat / menghubungkan akaun yang sama (Aset) untuk gudang."
 DocType: Purchase Invoice,Recurring Id,Id berulang
 DocType: Customer,Sales Team Details,Butiran Pasukan Jualan
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Padam selama-lamanya?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Padam selama-lamanya?
 DocType: Expense Claim,Total Claimed Amount,Jumlah Jumlah Tuntutan
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Peluang yang berpotensi untuk jualan.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Tidak sah {0}
@@ -4039,13 +4045,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Persediaan Sekolah anda di ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Tukar Jumlah Asas (Syarikat Mata Wang)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Tiada catatan perakaunan bagi gudang berikut
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Simpan dokumen pertama.
 DocType: Account,Chargeable,Boleh dikenakan cukai
 DocType: Company,Change Abbreviation,Perubahan Singkatan
 DocType: Expense Claim Detail,Expense Date,Perbelanjaan Tarikh
 DocType: Item,Max Discount (%),Max Diskaun (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Perintah lepas Jumlah
+DocType: Task,Is Milestone,adalah Milestone
 DocType: Daily Work Summary,Email Sent To,E-mel Dihantar Untuk
 DocType: Budget,Warn,Beri amaran
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Sebarang kenyataan lain, usaha perlu diberi perhatian yang sepatutnya pergi dalam rekod."
@@ -4066,7 +4073,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Nilai
 ,Itemwise Recommended Reorder Level,Itemwise lawatan Reorder Level
 DocType: Salary Detail,Salary Detail,Detail gaji
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Sila pilih {0} pertama
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Sila pilih {0} pertama
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} Item {1} telah tamat.
 DocType: Sales Invoice,Commission,Suruhanjaya
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Lembaran Masa untuk pembuatan.
@@ -4078,41 +4085,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Bekukan Stok Yang Lebih Lama Dari` hendaklah lebih kecil daripada %d hari.
 DocType: Tax Rule,Purchase Tax Template,Membeli Template Cukai
 ,Project wise Stock Tracking,Projek Landasan Saham bijak
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Jadual Penyelenggaraan {0} wujud terhadap {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Kuantiti sebenar (pada sumber / sasaran)
 DocType: Item Customer Detail,Ref Code,Ref Kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekod pekerja.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sila menetapkan Selepas Tarikh Susutnilai
 DocType: HR Settings,Payroll Settings,Tetapan Gaji
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Padankan Invois tidak berkaitan dan Pembayaran.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Meletakkan pesanan
 DocType: Email Digest,New Purchase Orders,Pesanan Pembelian baru
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Akar tidak boleh mempunyai pusat kos ibu bapa
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Pilih Jenama ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Pilih Jenama ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Susutnilai Terkumpul seperti pada
 DocType: Sales Invoice,C-Form Applicable,C-Borang Berkaitan
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Masa operasi mesti lebih besar daripada 0 untuk operasi {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse adalah wajib
 DocType: Supplier,Address and Contacts,Alamat dan Kenalan
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail UOM Penukaran
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Pastikan ia web 900px mesra (w) dengan 100px (h)
 DocType: Program,Program Abbreviation,Singkatan program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Perintah Pengeluaran tidak boleh dibangkitkan terhadap Templat Perkara
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Caj akan dikemas kini di Resit Pembelian terhadap setiap item
 DocType: Warranty Claim,Resolved By,Diselesaikan oleh
 DocType: Bank Guarantee,Start Date,Tarikh Mula
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Memperuntukkan daun untuk suatu tempoh.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cek dan Deposit tidak betul dibersihkan
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Membuat sebut harga pelanggan
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Membuat sebut harga pelanggan
 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 +38,Bill of Materials (BOM),Rang Undang-Undang Bahan (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Purata masa yang diambil oleh pembekal untuk menyampaikan
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Keputusan penilaian
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Jam
 DocType: Project,Expected Start Date,Jangkaan Tarikh Mula
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Buang item jika caj tidak berkenaan dengan perkara yang
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Mata wang urus niaga mesti sama dengan mata wang Pembayaran Gateway
 DocType: Payment Entry,Receive,Menerima
@@ -4123,19 +4129,19 @@
 DocType: Workstation,Operating Costs,Kos operasi
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tindakan jika Terkumpul Anggaran Bulanan Melebihi
 DocType: Purchase Invoice,Submit on creation,Mengemukakan kepada penciptaan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Mata wang untuk {0} mesti {1}
 DocType: Asset,Disposal Date,Tarikh pelupusan
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mel akan dihantar kepada semua Pekerja Active syarikat itu pada jam yang diberikan, jika mereka tidak mempunyai percutian. Ringkasan jawapan akan dihantar pada tengah malam."
 DocType: Employee Leave Approver,Employee Leave Approver,Pekerja Cuti Pelulus
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Suatu catatan Reorder telah wujud untuk gudang ini {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Tidak boleh mengaku sebagai hilang, kerana Sebutharga telah dibuat."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Maklum balas latihan
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Pengeluaran Pesanan {0} hendaklah dikemukakan
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Sila pilih Mula Tarikh dan Tarikh Akhir untuk Perkara {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursus adalah wajib berturut-turut {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Setakat ini tidak boleh sebelum dari tarikh
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Tambah / Edit Harga
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Tambah / Edit Harga
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Batch,Parent Batch,Batch ibubapa
 DocType: Cheque Print Template,Cheque Print Template,Cek Cetak Template
@@ -4149,7 +4155,7 @@
 ,Ordered Items To Be Delivered,Item mengarahkan Akan Dihantar
 DocType: Account,Income,Pendapatan
 DocType: Industry Type,Industry Type,Jenis industri
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Sesuatu telah berlaku!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Sesuatu telah berlaku!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Amaran: Tinggalkan permohonan mengandungi tarikh blok berikut
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Jualan Invois {0} telah diserahkan
 DocType: Assessment Result Detail,Score,Rata
@@ -4180,17 +4186,17 @@
 DocType: Item,Variant Based On,Based On Variant
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Jumlah wajaran yang diberikan harus 100%. Ia adalah {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Pembekal anda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Tidak boleh ditetapkan sebagai Kalah sebagai Sales Order dibuat.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Pembekal bahagian No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Pemberian
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Tidak dapat menolak apabila kategori adalah untuk &#39;Penilaian&#39; atau &#39;Vaulation dan Jumlah&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Pemberian
 DocType: Lead,Converted,Ditukar
 DocType: Item,Has Serial No,Mempunyai No Siri
 DocType: Employee,Date of Issue,Tarikh Keluaran
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Dari {0} untuk {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Tetapkan Pembekal untuk item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Nilai Waktu mesti lebih besar daripada sifar.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4199,20 +4205,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,mata wang bil mesti sama dengan mata wang atau akaun pihak mata wang sama ada lalai comapany ini
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,meninggalkan Penunaian
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Apa yang ia buat?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Untuk Gudang
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Semua Kemasukan Pelajar
 ,Average Commission Rate,Purata Kadar Suruhanjaya
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Kehadiran tidak boleh ditandakan untuk masa hadapan
 DocType: Pricing Rule,Pricing Rule Help,Peraturan Harga Bantuan
 DocType: School House,House Name,Nama rumah
 DocType: Purchase Taxes and Charges,Account Head,Kepala Akaun
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Menambah seluruh organisasi anda sebagai pengguna anda. Anda juga boleh menambah menjemput Pelanggan untuk portal anda dengan menambah mereka dari Kenalan
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Menambah seluruh organisasi anda sebagai pengguna anda. Anda juga boleh menambah menjemput Pelanggan untuk portal anda dengan menambah mereka dari Kenalan
 DocType: Stock Entry,Total Value Difference (Out - In),Jumlah Perbezaan Nilai (Out - Dalam)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4221,7 +4227,7 @@
 DocType: Item,Customer Code,Kod Pelanggan
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Peringatan hari jadi untuk {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Sejak hari Perintah lepas
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debit Untuk akaun perlu menjadi akaun Kunci Kira-kira
 DocType: Buying Settings,Naming Series,Menamakan Siri
 DocType: Leave Block List,Leave Block List Name,Tinggalkan Nama Sekat Senarai
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Mula Tarikh harus kurang daripada tarikh Insurance End
@@ -4236,9 +4242,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Gaji pekerja {0} telah dicipta untuk lembaran masa {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Mengarahkan Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Perkara {0} dilumpuhkan
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Perkara {0} dilumpuhkan
 DocType: Stock Settings,Stock Frozen Upto,Saham beku Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM tidak mengandungi apa-apa butiran saham
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Aktiviti projek / tugasan.
 DocType: Vehicle Log,Refuelling Details,Refuelling Butiran
@@ -4248,8 +4254,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Kadar pembelian seluruh dunia: terdapat
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tulis Off Jumlah (Syarikat Mata Wang)
 DocType: Sales Invoice Timesheet,Billing Hours,Waktu Billing
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM lalai untuk {0} tidak dijumpai
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Sila menetapkan kuantiti pesanan semula
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Ketik item untuk menambah mereka di sini
 DocType: Fees,Program Enrollment,program Pendaftaran
 DocType: Landed Cost Voucher,Landed Cost Voucher,Baucer Kos mendarat
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Sila set {0}
@@ -4273,7 +4280,7 @@
 DocType: Maintenance Visit,Maintenance Date,Tarikh Penyelenggaraan
 DocType: Purchase Invoice Item,Rejected Serial No,Tiada Serial Ditolak
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Tahun tarikh mula atau tarikh akhir adalah bertindih dengan {0}. Untuk mengelakkan sila menetapkan syarikat
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Tarikh mula boleh kurang daripada tarikh akhir untuk Perkara {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Contoh:. ABCD ##### Jika siri ditetapkan dan No Serial tidak disebut dalam urus niaga, nombor siri maka automatik akan diwujudkan berdasarkan siri ini. Jika anda sentiasa mahu dengan jelas menyebut Serial No untuk item ini. kosongkan ini."
 DocType: Upload Attendance,Upload Attendance,Naik Kehadiran
@@ -4350,7 +4357,6 @@
 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
-DocType: Grade Interval,Grade Interval,gred Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Tahun Anggaran Tarikh Mula dan Tahun Anggaran Tarikh Tamat sudah ditetapkan dalam Tahun Anggaran {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Tarikh update
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4397,14 +4403,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Biarkan tak bertanda jika anda tidak mahu mempertimbangkan kumpulan semasa membuat kumpulan kursus berasaskan.
 DocType: Asset,Frequency of Depreciation (Months),Kekerapan Susutnilai (Bulan)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Akaun Kredit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Akaun Kredit
 DocType: Landed Cost Item,Landed Cost Item,Tanah Kos Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Persediaan sebuah laman web yang mudah untuk organisasi saya
 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 +666,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Sila nyatakan Atribut Nilai untuk atribut {0}
 DocType: Item,Default Warehouse,Gudang Default
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bajet tidak boleh diberikan terhadap Akaun Kumpulan {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Sila masukkan induk pusat kos
@@ -4450,7 +4456,7 @@
 DocType: Opportunity Item,Basic Rate,Kadar asas
 DocType: GL Entry,Credit Amount,Jumlah Kredit
 DocType: Cheque Print Template,Signatory Position,Jawatan penandatangan
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Ditetapkan sebagai Hilang
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Ditetapkan sebagai Hilang
 DocType: Timesheet,Total Billable Hours,Jumlah jam kerja yang dibayar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pembayaran Penerimaan Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ini adalah berdasarkan kepada urus niaga terhadap Pelanggan ini. Lihat garis masa di bawah untuk maklumat
@@ -4464,11 +4470,11 @@
 ,Items To Be Requested,Item Akan Diminta
 DocType: Purchase Order,Get Last Purchase Rate,Dapatkan lepas Kadar Pembelian
 DocType: Company,Company Info,Maklumat Syarikat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Pilih atau menambah pelanggan baru
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Pilih atau menambah pelanggan baru
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,pusat kos diperlukan untuk menempah tuntutan perbelanjaan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Permohonan Dana (Aset)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ini adalah berdasarkan kepada kehadiran pekerja ini
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Akaun Debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4477,13 +4483,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Jumlah pembelian
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Sebutharga Pembekal {0} dicipta
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Akhir Tahun tidak boleh sebelum Start Tahun
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Manfaat Pekerja
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Sila menetapkan lalai Senarai Holiday untuk pekerja {0} atau Syarikat {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} tidak wujud
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} tidak wujud
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Tiada {0}: Jumlah tidak boleh lebih besar daripada Pending Jumlah Perbelanjaan terhadap Tuntutan {1}. Sementara menunggu Amaun adalah {2}
@@ -4492,15 +4498,17 @@
 DocType: Quality Inspection Reading,Reading 3,Membaca 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Baucer Jenis
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Senarai Harga tidak dijumpai atau orang kurang upaya
 DocType: Employee Loan Application,Approved,Diluluskan
 DocType: Pricing Rule,Price,Harga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Pekerja lega pada {0} mesti ditetapkan sebagai &#39;kiri&#39;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Penilaian {0} dicipta untuk Pekerja {1} dalam julat tarikh yang diberikan
 DocType: Employee,Education,Pendidikan
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Menamakan Kempen Dengan
 DocType: Employee,Current Address Is,Alamat semasa
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,diubahsuai
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Pilihan. Set mata wang lalai syarikat, jika tidak dinyatakan."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Catatan jurnal perakaunan.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Kuantiti Boleh didapati di Dari Gudang
@@ -4509,7 +4517,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Majlis / Akaun tidak sepadan dengan {1} / {2} dalam {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Sila masukkan Akaun Perbelanjaan
 DocType: Account,Stock,Saham
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Rujukan Dokumen Jenis mesti menjadi salah satu Purchase Order, Invois Belian atau Kemasukan Journal"
 DocType: Employee,Current Address,Alamat Semasa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jika item adalah variasi yang lain item maka penerangan, gambar, harga, cukai dan lain-lain akan ditetapkan dari template melainkan jika dinyatakan secara jelas"
 DocType: Serial No,Purchase / Manufacture Details,Pembelian / Butiran Pembuatan
@@ -4537,7 +4545,7 @@
 DocType: Hub Settings,Hub Settings,Tetapan Hub
 DocType: Project,Gross Margin %,Margin kasar%
 DocType: BOM,With Operations,Dengan Operasi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Entri perakaunan telah dibuat dalam mata wang {0} untuk syarikat {1}. Sila pilih belum terima atau yang kena dibayar dengan mata wang {0}.
 DocType: Asset,Is Existing Asset,Adakah Aset Sedia Ada
 DocType: Salary Detail,Statistical Component,Komponen statistik
 DocType: Salary Detail,Statistical Component,Komponen statistik
@@ -4562,7 +4570,7 @@
 DocType: Assessment Plan,Room,bilik
 DocType: Purchase Order,Advance Paid,Advance Dibayar
 DocType: Item,Item Tax,Perkara Cukai
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Bahan kepada Pembekal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Bahan kepada Pembekal
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Cukai Invois
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Ambang {0}% muncul lebih daripada sekali
 DocType: Expense Claim,Employees Email Id,Id Pekerja E-mel
@@ -4593,9 +4601,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Lampirkan Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Tahap saham
 DocType: Customer,Commission Rate,Kadar komisen
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Membuat Varian
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Membuat Varian
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Permohonan cuti blok oleh jabatan.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis bayaran mesti menjadi salah satu Menerima, Bayar dan Pindahan Dalaman"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Jenis bayaran mesti menjadi salah satu Menerima, Bayar dan Pindahan Dalaman"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Troli kosong
 DocType: Vehicle,Model,model
@@ -4606,6 +4614,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Benarkan Pengeluaran pada Cuti
 DocType: Sales Order,Customer's Purchase Order Date,Pesanan Belian Tarikh Pelanggan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Modal Saham
+DocType: Shopping Cart Settings,Show Public Attachments,Tunjuk Lampiran Awam
 DocType: Packing Slip,Package Weight Details,Pakej Berat Butiran
 DocType: Payment Gateway Account,Payment Gateway Account,Akaun Gateway Pembayaran
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Setelah selesai pembayaran mengarahkan pengguna ke halaman yang dipilih.
@@ -4624,15 +4633,15 @@
 DocType: Batch,Expiry Date,Tarikh Luput
 ,Supplier Addresses and Contacts,Alamat Pembekal dan Kenalan
 ,accounts-browser,akaun pelayar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Sila pilih Kategori pertama
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Sila pilih Kategori pertama
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Induk projek.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Untuk membolehkan lebih-bil atau terlebih-tempahan, mengemas kini &quot;Elaun&quot; dalam Tetapan Saham atau item itu."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Tidak menunjukkan apa-apa simbol seperti $ dsb sebelah mata wang.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Separuh Hari)
 DocType: Supplier,Credit Days,Hari Kredit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Buat Batch Pelajar
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Buat Batch Pelajar
 DocType: Leave Type,Is Carry Forward,Apakah Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Dapatkan Item dari BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Dapatkan Item dari BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Membawa Hari Masa
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Pos Tarikh mesti sama dengan tarikh pembelian {1} aset {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Sila masukkan Pesanan Jualan dalam jadual di atas
@@ -4649,8 +4658,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: Debit kemasukan tidak boleh dikaitkan dengan {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Sila setup penomboran siri untuk Kehadiran melalui Persediaan&gt; Penomboran Siri
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 f0585f7..e1147d1 100644
--- a/erpnext/translations/my.csv
+++ b/erpnext/translations/my.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,ငှားရမ်းထားသော
 DocType: Purchase Order,PO-,ရည်ညွှန်း
 DocType: POS Profile,Applicable for User,အသုံးပြုသူများအတွက်သက်ဆိုင်သော
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ထုတ်လုပ်မှုအမိန့်ကိုပယ်ဖျက်ဖို့ပထမဦးဆုံးက Unstop ဖျက်သိမ်းလိုက်ရမရနိုင်ပါရပ်တန့်
 DocType: Vehicle Service,Mileage,မိုင်အကွာအဝေး
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,သင်အမှန်တကယ်ဒီပိုင်ဆိုင်မှုဖျက်သိမ်းရန်ချင်ပါသလား
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,ပုံမှန်ပေးသွင်းကို Select လုပ်ပါ
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,ပုံမှန်ပေးသွင်းကို Select လုပ်ပါ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ငွေကြေးစျေးနှုန်းစာရင်း {0} သည်လိုအပ်သည်
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ထိုအရောင်းအဝယ်အတွက်တွက်ချက်ခြင်းကိုခံရလိမ့်မည်။
 DocType: Purchase Order,Customer Contact,customer ဆက်သွယ်ရန်
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ထူးချွန် {0} သုည ({1}) ထက်နည်းမဖြစ်နိုင်
 DocType: Manufacturing Settings,Default 10 mins,10 မိနစ် default
 DocType: Leave Type,Leave Type Name,Type အမည် Leave
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ပွင့်လင်းပြရန်
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ပွင့်လင်းပြရန်
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,စီးရီးအောင်မြင်စွာကျင်းပပြီးစီး Updated
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,ထွက်ခွာသည်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Submitted တိကျစွာဂျာနယ် Entry &#39;
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,အသုတ်ပစ္စည်းသက်တမ်းကုန်ဆုံးအခြေအနေ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ဘဏ်မှမူကြမ်း
 DocType: Mode of Payment Account,Mode of Payment Account,ငွေပေးချေမှုရမည့်အကောင့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Show ကို Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Show ကို Variant
 DocType: Academic Term,Academic Term,ပညာရေးဆိုင်ရာ Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ပစ္စည်း
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,အရေအတွက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,အရေအတွက်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,စားပွဲအလွတ်မဖွစျနိုငျအကောင့်။
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ချေးငွေများ (စိစစ်)
 DocType: Employee Education,Year of Passing,Pass ၏တစ်နှစ်တာ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","ကိုးကားစရာ:% s ကို, Item Code ကို:% s နှင့်ဖောက်သည်:% s ကို"
 DocType: Item,Country of Origin,မူရင်းထုတ်လုပ်သည့်နိုင်ငံ
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ကုန်ပစ္စည်းလက်ဝယ်ရှိ
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ပွင့်လင်းကိစ္စများ
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ကျန်းမာရေးစောင့်ရှောက်မှု
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ငွေပေးချေမှုအတွက်နှောင့်နှေး (နေ့ရက်များ)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ဝန်ဆောင်မှုကုန်ကျစရိတ်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ဝယ်ကုန်စာရင်း
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serial Number: {0} ပြီးသားအရောင်းပြေစာအတွက်ရည်ညွှန်းသည်: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ဝယ်ကုန်စာရင်း
 DocType: Maintenance Schedule Item,Periodicity,ကာလ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} လိုအပ်သည်
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,မျှော်လင့်ထားသည့် Delivery နေ့စွဲအရောင်းအမိန့်နေ့စွဲမတိုင်မီဖြစ်ဖြစ်ပါသည်
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","ကော်လံနှစ်ခု, ဟောင်းနာမအဘို့တယောက်နှင့်အသစ်များနာမအဘို့တယောက်နှင့်အတူ .csv file ကို Attach"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} မတက်ကြွဘဏ္ဍာရေးတစ်နှစ်တာ။
 DocType: Packed Item,Parent Detail docname,မိဘ Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","ကိုးကားစရာ: {0}, Item Code ကို: {1} နှင့်ဖောက်သည်: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,ကီလိုဂရမ်
 DocType: Student Log,Log,တုံး
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,တစ်ဦးယောဘသည်အဖွင့်။
 DocType: Item Attribute,Increment,increment
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ဂိုဒေါင်ကိုရွေးပါ ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Advertising ကြော်ငြာ
 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/purchase_invoice/purchase_invoice.js +556,Get items from,အထဲကပစ္စည်းတွေကို Get
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} ဘို့ခွင့်မပြု
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,အထဲကပစ္စည်းတွေကို Get
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},စတော့အိတ် Delivery မှတ်ချက် {0} ဆန့်ကျင် updated မရနိုင်ပါ
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ကုန်ပစ္စည်း {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ဖော်ပြထားသောအရာများမရှိပါ
 DocType: Payment Reconciliation,Reconcile,ပြန်လည်သင့်မြတ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ကုန်စုံ
 DocType: Quality Inspection Reading,Reading 1,1 Reading
 DocType: Process Payroll,Make Bank Entry,ဘဏ်မှ Entry &#39;ပါစေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ပင်စင်ရန်ပုံငွေ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Next ကိုတန်ဖိုးနေ့စွဲဝယ်ယူနေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: SMS Center,All Sales Person,အားလုံးသည်အရောင်းပုဂ္ဂိုလ်
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** လစဉ်ဖြန့်ဖြူး ** သင်သည်သင်၏စီးပွားရေးလုပ်ငန်းမှာရာသီအလိုက်ရှိပါကသင်သည်လအတွင်းဖြတ်ပြီးဘတ်ဂျက် / Target ကဖြန့်ဝေကူညီပေးသည်။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,မတွေ့ရှိပစ္စည်းများ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,မတွေ့ရှိပစ္စည်းများ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,လစာဖွဲ့စည်းပုံပျောက်ဆုံး
 DocType: Lead,Person Name,လူတစ်ဦးအမည်
 DocType: Sales Invoice Item,Sales Invoice Item,အရောင်းပြေစာ Item
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ဥပမာ &quot;မူလတန်းကျောင်း&quot; သို့မဟုတ် &quot;တက္ကသိုလ်က&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,စတော့အိတ်အစီရင်ခံစာများ
 DocType: Warehouse,Warehouse Detail,ဂိုဒေါင် Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ခရက်ဒစ်န့်သတ်ချက် {1} / {2} {0} ဖောက်သည်များအတွက်ကူးခဲ့
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,အဆိုပါ Term အဆုံးနေ့စွဲနောက်ပိုင်းတွင်သက်တမ်း (Academic တစ်နှစ်တာ {}) နှင့်ဆက်စပ်သောမှပညာရေးဆိုင်ရာတစ်နှစ်တာ၏တစ်နှစ်တာပြီးဆုံးရက်စွဲထက်မဖွစျနိုငျသညျ။ အရက်စွဲများပြင်ဆင်ရန်နှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ပိုင်ဆိုင်မှုစံချိန်ပစ္စည်းဆန့်ကျင်တည်ရှိအဖြစ်, ထိနျးခြုပျမဖွစျနိုငျ &quot;Fixed Asset ရှိ၏&quot;"
 DocType: Vehicle Service,Brake Oil,ဘရိတ်ရေနံ
 DocType: Tax Rule,Tax Type,အခွန် Type အမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},သင် {0} ခင် entries တွေကို add သို့မဟုတ် update ကိုမှခွင့်ပြုမထား
 DocType: BOM,Item Image (if not slideshow),item ပုံရိပ် (Slideshow မလျှင်)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,တစ်ဦးဖုန်းဆက်သူအမည်တူနှင့်အတူတည်ရှိ
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(အချိန်နာရီနှုန်း / 60) * အမှန်တကယ်စစ်ဆင်ရေးအချိန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM ကို Select လုပ်ပါ
 DocType: SMS Log,SMS Log,SMS ကိုအထဲ
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ကယ်နှုတ်တော်မူ၏ပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} အပေါ်အားလပ်ရက်နေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားမဖြစ်
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,ကျောင်းများ
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},{1} များအတွက် {0} ဝန်ထမ်းများအတွက်မျှမတွေ့ခွင့်စံချိန်တင်
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,ပထမဦးဆုံးကုမ္ပဏီတစ်ခုကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,ကုမ္ပဏီပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Target ကတွင်
 DocType: BOM,Total Cost,စုစုပေါင်းကုန်ကျစရိတ်
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,ပြောဆိုချက်ကိုငွေပမာဏ
 DocType: Employee,Mr,ဦး
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,အ cutomer အုပ်စု table ထဲမှာကိုတွေ့မိတ္တူပွားဖောက်သည်အုပ်စု
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ပေးသွင်း Type / ပေးသွင်း
 DocType: Naming Series,Prefix,ရှေ့ဆကျတှဲ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumer
 DocType: Employee,B-,ပါဘူးရှငျ
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,ပေးသွင်းခြင်းအားဖြင့်ကယ်နှုတ်တော်မူ၏
 DocType: SMS Center,All Contact,အားလုံးသည်ဆက်သွယ်ရန်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ပြီးသား BOM နှင့်အတူပစ္စည်းများအားလုံးဖန်တီးထုတ်လုပ်မှုအမိန့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,နှစ်ပတ်လည်လစာ
 DocType: Daily Work Summary,Daily Work Summary,Daily သတင်းစာလုပ်ငန်းခွင်အကျဉ်းချုပ်
 DocType: Period Closing Voucher,Closing Fiscal Year,နိဂုံးချုပ်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} အေးစက်နေတဲ့ဖြစ်ပါသည်
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,ငွေစာရင်းဇယားအတွက်ဖြစ်တည်မှုကုမ္ပဏီကို select လုပ်ပါကျေးဇူးပြုပြီး
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,စတော့အိတ်အသုံးစရိတ်များ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ပစ်မှတ်ဂိုဒေါင်ကို Select လုပ်ပါ
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry &#39;
 DocType: Journal Entry Account,Credit in Company Currency,Company မှငွေကြေးစနစ်အတွက်အကြွေး
 DocType: Delivery Note,Installation Status,Installation လုပ်တဲ့နဲ့ Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",သငျသညျတက်ရောက်သူကို update ချင်ပါသလား? <br> ပစ္စုပ္ပန်: {0} \ <br> ပျက်ကွက်: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},လက်ခံထားတဲ့ + Qty Item {0} သည်ရရှိထားသည့်အရေအတွက်နှင့်ညီမျှဖြစ်ရမည်ငြင်းပယ်
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,ဝယ်ယူခြင်းအဘို့အ supply ကုန်ကြမ်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ငွေပေးချေမှု၏အနည်းဆုံး mode ကို POS ငွေတောင်းခံလွှာဘို့လိုအပ်ပါသည်။
 DocType: Products Settings,Show Products as a List,တစ်ဦးစာရင်းအဖြစ် Show ကိုထုတ်ကုန်များ
 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 မှာရောက်လိမ့်မည်"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,တန်ဖိုး Entry &#39;Make
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,တောင်းဆိုမှုကအမျိုးအစား
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ထမ်း Make
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ထမ်း Make
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,အသံလွှင့်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,သတ်ခြင်း
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,ထိုစစ်ဆင်ရေး၏အသေးစိတျထုတျဆောင်သွားကြ၏။
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,ပြုပြင်ထိန်းသိမ်းမှုလာလည်သူများသည် Plan စ။
 DocType: SMS Settings,Enter url parameter for message,မက်ဆေ့ခ်ျကိုသည် url parameter ကိုရိုက်ထည့်
 DocType: POS Profile,Customer Groups,ဖောက်သည်အဖွဲ့များ
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ဘဏ္ဍာရေးရှင်းတမ်း
 DocType: Guardian,Students,ကျောင်းသားများ
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,စျေးနှုန်းနှင့်လျော့စျေးလျှောက်ထားသည်နည်းဥပဒေများ။
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,စျေးနှုန်း List ကိုဝယ်ယူသို့မဟုတ်ရောင်းချသည့်အဘို့အသက်ဆိုင်သောဖြစ်ရမည်
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ကြိုတင်မဲငွေပမာဏ {0} {1} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Naming Series,Series List for this Transaction,ဒီ Transaction သည်စီးရီးများစာရင်း
 DocType: Company,Default Payroll Payable Account,default လစာပေးရန်အကောင့်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update ကိုအီးမေးလ်အုပ်စု
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update ကိုအီးမေးလ်အုပ်စု
 DocType: Sales Invoice,Is Opening Entry,Entry &#39;ဖွင့်လှစ်တာဖြစ်ပါတယ်
 DocType: Customer Group,Mention if non-standard receivable account applicable,Non-စံကိုရရန်အကောင့်ကိုသက်ဆိုင်လျှင်ဖော်ပြထားခြင်း
 DocType: Course Schedule,Instructor Name,သှအမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ဂိုဒေါင်လိုအပ်သည်သည်ခင် Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,ဂိုဒေါင်လိုအပ်သည်သည်ခင် Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,တွင်ရရှိထားသည့်
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","check လုပ်ထားလျှင်, ပစ္စည်းတောင်းဆိုချက်များတွင် non-စတော့ရှယ်ယာပစ္စည်းများပါဝင်တော်မူမည်။"
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,အရောင်းပြေစာ Item ဆန့်ကျင်
 ,Production Orders in Progress,တိုးတက်မှုအတွက်ထုတ်လုပ်မှုကိုအမိန့်
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ဘဏ္ဍာရေးကနေ Net ကငွေ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage ပြည့်ဝ၏, မကယ်တင်ခဲ့"
 DocType: Lead,Address & Contact,လိပ်စာ &amp; ဆက်သွယ်ရန်
 DocType: Leave Allocation,Add unused leaves from previous allocations,ယခင်ခွဲတမ်းအနေဖြင့်အသုံးမပြုတဲ့အရွက် Add
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Next ကိုထပ်တလဲလဲ {0} {1} အပေါ်နေသူများကဖန်တီးလိမ့်မည်
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းကုန်ကျငွေပမာဏ
 DocType: Item Website Specification,Item Website Specification,item ဝက်ဘ်ဆိုက် Specification
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,ဘဏ်မှ Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},item {0} {1} အပေါ်အသက်၏အဆုံးရောက်ရှိခဲ့သည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,ဘဏ်မှ Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,နှစ်ပတ်လည်
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး Item
 DocType: Stock Entry,Sales Invoice No,အရောင်းပြေစာမရှိ
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Hub အတွက်ထုတ်ဝေ
 DocType: Student Admission,Student Admission,ကျောင်းသားသမဂ္ဂင်ခွင့်
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,material တောင်းဆိုခြင်း
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,item {0} ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,material တောင်းဆိုခြင်း
 DocType: Bank Reconciliation,Update Clearance Date,Update ကိုရှင်းလင်းရေးနေ့စွဲ
 DocType: Item,Purchase Details,အသေးစိတ်ဝယ်ယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},item {0} ဝယ်ယူခြင်းအမိန့် {1} အတွက် &#39;&#39; ကုန်ကြမ်းထောက်ပံ့ &#39;&#39; table ထဲမှာမတှေ့
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,ရှင်းရှင်းလင်းလင်းမှထူးချွန်ထက်မြက် Cheques နှင့်စာရင်း
 DocType: Item,Synced With Hub,Hub နှင့်အတူ Sync လုပ်ထား
 DocType: Vehicle,Fleet Manager,ရေယာဉ်စု Manager ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},အတန်း # {0}: {1} ကို item {2} ဘို့အနုတ်လက္ခဏာမဖွစျနိုငျ
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,မှားယွင်းနေ Password ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},အတန်း # {0}: {1} ကို item {2} ဘို့အနုတ်လက္ခဏာမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,မှားယွင်းနေ Password ကို
 DocType: Item,Variant Of,အမျိုးမျိုးမူကွဲ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',ပြီးစီး Qty &#39;&#39; Qty ထုတ်လုပ်ခြင်းမှ &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Period Closing Voucher,Closing Account Head,နိဂုံးချုပ်အကောင့်ဌာနမှူး
 DocType: Employee,External Work History,ပြင်ပလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,မြို့ပတ်ရထားကိုးကားစရာအမှား
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,အော်တိုပစ္စည်းတောင်းဆိုမှု၏ဖန်တီးမှုအပေါ်အီးမေးလ်ကိုအကြောင်းကြား
 DocType: Journal Entry,Multi Currency,multi ငွေကြေးစနစ်
 DocType: Payment Reconciliation Invoice,Invoice Type,ကုန်ပို့လွှာ Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Delivery မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Delivery မှတ်ချက်
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,အခွန်ကိုတည်ဆောက်ခြင်း
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ရောင်းချပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,သင်ကထွက်ခွာသွားပြီးနောက်ငွေပေးချေမှုရမည့် Entry modified သိရသည်။ တဖန်ဆွဲပေးပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
-DocType: Grade Interval,Min Score,min ရမှတ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} Item ခွန်အတွက်နှစ်ကြိမ်သို့ဝင်
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ယခုရက်သတ္တပတ်များနှင့် Pend လှုပ်ရှားမှုများအကျဉ်းချုပ်
 DocType: Student Applicant,Admitted,ဝန်ခံ
 DocType: Workstation,Rent Cost,ငှားရန်ကုန်ကျစရိတ်
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,အမိန့် Value ကို
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,ပါတီဆန့်ကျင်သို့မဟုတ်ပြည်တွင်းရေးလွှဲပြောင်းဘို့ဘဏ် / ငွေကြေးအရောင်းအဝယ်ပြုလုပ်
 DocType: Shipping Rule,Valid for Countries,နိုင်ငံများအဘို့သက်တမ်းရှိ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ဒါဟာ Item တစ်ခု Template နှင့်ငွေကြေးလွှဲပြောင်းမှုမှာအသုံးပြုမရနိုင်ပါ။ &#39;မ Copy ကူး&#39; &#39;ကိုသတ်မှတ်ထားမဟုတ်လျှင် item ဂုဏ်တော်များကိုမျိုးကွဲသို့ကူးကူးယူလိမ့်မည်
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,စုစုပေါင်းအမိန့်သတ်မှတ်
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","ဝန်ထမ်းသတ်မှတ်ရေး (ဥပမာ CEO ဖြစ်သူ, ဒါရိုက်တာစသည်တို့) ။"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,လယ်ပြင်၌တန်ဖိုးကို &#39;&#39; Day ကို Month ရဲ့အပေါ် Repeat &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},အတန်း # {0}: အရစ်ကျငွေတောင်းခံလွှာရှိပြီးသားပိုင်ဆိုင်မှု {1} ဆန့်ကျင်ရာ၌မရနိုငျ
 DocType: Item Tax,Tax Rate,အခွန်နှုန်း
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ပြီးသားကာလထမ်း {1} များအတွက်ခွဲဝေ {2} {3} မှ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Item ကိုရွေးပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Item ကိုရွေးပါ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ဝယ်ယူခြင်းပြေစာ {0} ပြီးသားတင်သွင်းတာဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},row # {0}: Batch မရှိပါ {1} {2} အဖြစ်အတူတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Non-Group ကမှ convert
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,တစ်ဦး Item ၏ batch (အများကြီး) ။
 DocType: C-Form Invoice Detail,Invoice Date,ကုန်ပို့လွှာနေ့စွဲ
 DocType: GL Entry,Debit Amount,debit ပမာဏ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},သာ {0} {1} အတွက် Company မှနှုန်းနဲ့ 1 အကောင့်ကိုအဲဒီမှာရှိနိုင်ပါသည်
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,ပူးတွဲဖိုင်ကြည့်ပေးပါ
 DocType: Purchase Order,% Received,% ရရှိထားသည့်
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ကျောင်းသားအဖွဲ့များ Create
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,စျေးနှုန်းအဘို့တောင်းဆိုခြင်း
 DocType: Salary Slip Timesheet,Working Hours,အလုပ်လုပ်နာရီ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ရှိပြီးသားစီးရီး၏စတင်ကာ / လက်ရှိ sequence number ကိုပြောင်းပါ။
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
-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.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,အရစ်ကျမိန့် Create
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,အသစ်တစ်ခုကိုဖောက်သည် Create
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","မျိုးစုံစျေးနှုန်းများနည်းဥပဒေများနိုင်မှတည်လျှင်, အသုံးပြုသူများပဋိပက္ခဖြေရှင်းရန်ကို manually ဦးစားပေးသတ်မှတ်ဖို့တောင်းနေကြသည်။"
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,အရစ်ကျမိန့် Create
 ,Purchase Register,မှတ်ပုံတင်မည်ဝယ်ယူ
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,သက်ဆိုင်စွပ်စွဲချက်
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; ထွက်ခွာခွင့်ပြုချက် &#39;&#39; ရှိရမယ်
 DocType: Purchase Receipt,Vehicle Date,မော်တော်ယာဉ်နေ့စွဲ
 DocType: Student Log,Medical,ဆေးဘက်ဆိုင်ရာ
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,ဆုံးရှုံးရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ခဲပိုင်ရှင်အခဲအဖြစ်အတူတူပင်မဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ခွဲဝေငွေပမာဏ unadjusted ငွေပမာဏထက် သာ. ကြီးမြတ်သည်မဟုတ်နိုင်
 DocType: Announcement,Receiver,receiver
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,အရေအတွက်နှင့် Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,စာသင်ခန်း / Laboratories စသည်တို့ကိုပို့ချချက်စီစဉ်ထားနိုင်ပါတယ်ဘယ်မှာ။
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,ကုမ္ပဏီအမည်ကိုပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice,Supplier Name,ပေးသွင်းအမည်
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ထို ERPNext လက်စွဲစာအုပ် Read
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,မသင်မနေရကိုလယ် - ပညာရေးဆိုင်ရာတစ်နှစ်တာ
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,မသင်မနေရကိုလယ် - ပညာရေးဆိုင်ရာတစ်နှစ်တာ
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,အီးမေးလ်ရဲ့တစ်စိတ်တစ်ပိုင်းအဖြစ်ဝင်သောနိဒါန်းစာသားစိတ်ကြိုက်ပြုလုပ်ပါ။ အသီးအသီးအရောင်းအဝယ်သီးခြားနိဒါန်းစာသားရှိပါတယ်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},ကုမ္ပဏီ {0} များအတွက် default အနေနဲ့ပေးဆောင်အကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,အားလုံးထုတ်လုပ်မှုလုပ်ငန်းစဉ်များသည်ကမ္ဘာလုံးဆိုင်ရာ setting ကို။
 DocType: Accounts Settings,Accounts Frozen Upto,Frozen ထိအကောင့်
 DocType: SMS Log,Sent On,တွင် Sent
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,attribute {0} Attribute တွေကစားပွဲတင်အတွက်အကြိမ်ပေါင်းများစွာကိုရှေးခယျြ
 DocType: HR Settings,Employee record is created using selected field. ,ဝန်ထမ်းစံချိန်ရွေးချယ်ထားသောလယ်ကို အသုံးပြု. နေသူများကဖန်တီး။
 DocType: Sales Order,Not Applicable,မသက်ဆိုင်ပါ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,အားလပ်ရက်မာစတာ။
 DocType: Request for Quotation Item,Required Date,လိုအပ်သောနေ့စွဲ
 DocType: Delivery Note,Billing Address,ကျသင့်ငွေတောင်းခံလွှာပေးပို့မည့်လိပ်စာ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Item Code ကိုရိုက်ထည့်ပေးပါ။
 DocType: BOM,Costing,ကုန်ကျ
 DocType: Tax Rule,Billing County,ငွေတောင်းခံကောင်တီ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","checked အကယ်. ထားပြီးပုံနှိပ် Rate / ပုံနှိပ်ပမာဏတွင်ထည့်သွင်းသကဲ့သို့, အခွန်ပမာဏကိုထည့်သွင်းစဉ်းစားလိမ့်မည်"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Package ကိုအမှတ်ကနေ
 DocType: Item Attribute,To Range,Range ကိုမှ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Securities and စာရင်း
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ဒါဟာ၏ကိုယ်ပိုင်အဘိုးပြတ်နည်းလမ်းမရှိပါဘူးရသောအချို့သောပစ္စည်းဆန့်ကျင်အရောင်းအရှိဖြစ်သကဲ့သို့, အဘိုးပြတ်နည်းလမ်းမပြောင်းနိုင်သလား"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ခွဲဝေ Total ကုမ္ပဏီအရွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Job Opening,Description of a Job Opening,တစ်ဦးယောဘဖွင့်ပွဲ၏ဖော်ပြချက်များ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ယနေ့ဆိုင်းငံ့ထားလှုပ်ရှားမှုများ
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,သင်တန်းကို select ပေးပါ
 DocType: Timesheet Detail,Hrs,နာရီ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,ကုမ္ပဏီကို select ကျေးဇူးပြု.
 DocType: Stock Entry Detail,Difference Account,ခြားနားချက်အကောင့်
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,၎င်း၏မှီခိုအလုပ်တစ်ခုကို {0} တံခါးပိတ်မဟုတ်ပါအဖြစ်အနီးကပ်အလုပ်တစ်ခုကိုမနိုင်သလား။
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +538,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ပေါင်းစည်းဖို့, အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးပစ္စည်းများသည်အတူတူပင်ဖြစ်ရပါမည်"
 DocType: Shipping Rule,Net Weight,အသားတင်အလေးချိန်
 DocType: Employee,Emergency Phone,အရေးပေါ်ဖုန်း
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ယ်ယူရန်
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Threshold 0% များအတွက်တန်းသတ်မှတ်ပေးပါ
 DocType: Sales Order,To Deliver,လှတျတျောမူရန်
 DocType: Purchase Invoice Item,Item,အချက်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,serial မရှိ item ကိုတစ်အစိတ်အပိုင်းမဖွစျနိုငျ
 DocType: Journal Entry,Difference (Dr - Cr),ခြားနားချက် (ဒေါက်တာ - Cr)
 DocType: Account,Profit and Loss,အမြတ်နှင့်အရှုံး
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,စီမံခန့်ခွဲ Subcontracting
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,increment 0 င်မဖွစျနိုငျ
 DocType: Production Planning Tool,Material Requirement,ပစ္စည်းလိုအပ်ချက်
 DocType: Company,Delete Company Transactions,ကုမ္ပဏီငွေကြေးကိစ္စရှင်းလင်းမှု Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ကိုးကားစရာအဘယ်သူမျှမနှင့်ကိုးကားစရာနေ့စွဲဘဏ်မှငွေပေးငွေယူဘို့မဖြစ်မနေဖြစ်ပါသည်
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ Edit ကိုအခွန်နှင့်စွပ်စွဲချက် Add
 DocType: Purchase Invoice,Supplier Invoice No,ပေးသွင်းပြေစာမရှိ
 DocType: Territory,For reference,ကိုးကားနိုင်ရန်
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Installation မှတ်ချက် Item
 DocType: Production Plan Item,Pending Qty,ဆိုင်းငံ့ထား Qty
 DocType: Budget,Ignore,ဂရုမပြု
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} တက်ကြွမဟုတ်ပါဘူး
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},အောက်ပါနံပါတ်များကိုစလှေတျ SMS ကို: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ပုံနှိပ်ခြင်းအဘို့အ Setup ကိုစစ်ဆေးမှုများရှုထောင့်
 DocType: Salary Slip,Salary Slip Timesheet,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Timesheet
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,စုစုပေါင်းကော်မရှင်
 DocType: Pricing Rule,Sales Partner,အရောင်း Partner
 DocType: Buying Settings,Purchase Receipt Required,ဝယ်ယူခြင်း Receipt လိုအပ်သော
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ဖွင့်လှစ်စတော့အိတ်ဝသို့ဝင်လျှင်အဘိုးပြတ်နှုန်းမဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ထိုပြေစာ table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,ပထမဦးဆုံးကုမ္ပဏီနှင့်ပါတီ Type ကိုရွေးပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ဘဏ္ဍာရေး / စာရင်းကိုင်တစ်နှစ်။
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,စုဆောင်းတန်ဖိုးများ
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","ဝမ်းနည်းပါတယ်, Serial အမှတ်ပေါင်းစည်းမရနိုင်ပါ"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,အရောင်းအမိန့်လုပ်ပါ
 DocType: Project Task,Project Task,စီမံကိန်းရဲ့ Task
 ,Lead Id,ခဲ Id
 DocType: C-Form Invoice Detail,Grand Total,စုစုပေါင်း
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,ကိုယ်ရေးမှတ်တမ်းတွယ်တာ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,repeat Customer များ
 DocType: Leave Control Panel,Allocate,နေရာချထား
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,အရောင်းသို့ပြန်သွားသည်
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,အရောင်းသို့ပြန်သွားသည်
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,မှတ်ချက်: စုစုပေါင်းခွဲဝေရွက် {0} ကာလအဘို့ပြီးသားအတည်ပြုရွက် {1} ထက်လျော့နည်းမဖြစ်သင့်ပါဘူး
 DocType: Announcement,Posted By,အားဖြင့် Posted
 DocType: Item,Delivered by Supplier (Drop Ship),ပေးသွင်း (Drop သင်္ဘော) ဖြင့်ကယ်လွှတ်
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,စျေးနှုန်းရန်
 DocType: Lead,Middle Income,အလယျပိုငျးဝင်ငွေခွန်
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ဖွင့်ပွဲ (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,ခွဲဝေငွေပမာဏအနုတ်လက္ခဏာမဖြစ်နိုင်
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,ကုမ္ပဏီသတ်မှတ်ပေးပါ
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,အရောင်းပြေစာ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ကိုးကားစရာမရှိပါ &amp; ကိုးကားစရာနေ့စွဲ {0} သည်လိုအပ်သည်
 DocType: Process Payroll,Select Payment Account to make Bank Entry,ဘဏ်မှ Entry စေရန်ငွေပေးချေမှုရမည့်အကောင့်ကို Select လုပ်ပါ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","အရွက်, စရိတ်တောင်းဆိုမှုများနှင့်လုပ်ခလစာကိုစီမံခန့်ခွဲဖို့ထမ်းမှတ်တမ်းများ Create"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,အသိပညာတပ်စခန်းမှ Add
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,အဆိုပြုချက်ကို Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,ငွေပေးချေမှုရမည့် Entry ထုတ်ယူ
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} &#39;&#39; မဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {2} အတွက်
 DocType: Buying Settings,Settings for Buying Module,ဝယ်ယူ Module သည် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},ပိုင်ဆိုင်မှု {0} ကုမ္ပဏီမှ {1} ပိုင်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,ဝယ်ယူခြင်းပြေစာပထမဦးဆုံးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,ဝယ်ယူခြင်းပြေစာပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Buying Settings,Supplier Naming By,အားဖြင့်ပေးသွင်း Name
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","ထိုအခါ Pricing နည်းဥပဒေများဖောက်သည်, ဖောက်သည်အုပ်စု, နယ်မြေတွေကို, ပေးသွင်း, ပေးသွင်းရေးထည့်ပြီးကင်ပိန်းစသည်တို့ကိုအရောင်း Partner အပေါ်အခြေခံပြီးထုတ် filtered နေကြတယ်"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Inventory ထဲမှာပိုက်ကွန်ကိုပြောင်းရန်
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ဝန်ထမ်းချေးငွေစီမံခန့်ခွဲမှု
 DocType: Employee,Passport Number,နိုင်ငံကူးလက်မှတ်နံပါတ်
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 နှင့်အတူ relation
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager က
 DocType: Payment Entry,Payment From / To,/ စေရန် မှစ. ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,နေ့စွဲ Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},နယူးအကြွေးကန့်သတ်ဖောက်သည်များအတွက်လက်ရှိထူးချွန်ငွေပမာဏထက်လျော့နည်းသည်။ အကြွေးကန့်သတ် atleast {0} ဖြစ်ဖို့ရှိပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; အတူတူမဖွစျနိုငျ
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,မိနစ်
 DocType: Issue,Resolution Date,resolution နေ့စွဲ
 DocType: Student Batch Name,Batch Name,batch အမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ကဖန်တီး:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet ကဖန်တီး:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ငွေပေးချေမှုရမည့်၏ Mode ကို {0} အတွက် default အနေနဲ့ငွေသို့မဟုတ်ဘဏ်မှအကောင့်ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,စာရင်းသွင်း
 DocType: Selling Settings,Customer Naming By,အားဖြင့်ဖောက်သည် Name
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ကျောင်းသားလစဉ်တက်ရောက်အစီရင်ခံစာအတွက်လက်ရှိအဖြစ်ကျောင်းသားကိုပြသပါလိမ့်မယ်
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,အမှန်တကယ် Start ကိုအချိန်
 DocType: BOM Operation,Operation Time,စစ်ဆင်ရေးအချိန်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,အပြီးသတ်
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,base
 DocType: Timesheet,Total Billed Hours,စုစုပေါင်းကောက်ခံခဲ့နာရီ
 DocType: Journal Entry,Write Off Amount,ငွေပမာဏပိတ်ရေးထား
 DocType: Journal Entry,Bill No,ဘီလ်မရှိပါ
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,ကျောင်းသားများကျောင်း
 DocType: Sales Invoice Timesheet,Time Sheet,အချိန်ဇယား
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush ကုန်ကြမ်းပစ္စည်းများအခြေပြုတွင်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,ဆောင်းပါးတပုဒ်ကအသေးစိတ်ရိုက်ထည့်ပေးပါ
 DocType: Interest,Interest,စိတ်ဝင်စားမှု
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,အကြိုအရောင်း
 DocType: Purchase Receipt,Other Details,အခြားအသေးစိတ်
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ငွေပေးချေမှုရမည့် Entry &#39;ပြီးသားနေသူများကဖန်တီး
 DocType: Purchase Receipt Item Supplied,Current Stock,လက်ရှိစတော့အိတ်
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} Item {2} နှင့်ဆက်စပ်ပါဘူး
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ကို Preview လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,အကောင့် {0} အကြိမ်ပေါင်းများစွာသို့ဝင်ခဲ့
 DocType: Account,Expenses Included In Valuation,အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်တွင်ထည့်သွင်းကုန်ကျစရိတ်
 DocType: Hub Settings,Seller City,ရောင်းချသူစီးတီး
 ,Absent Student Report,ပျက်ကွက်ကျောင်းသားအစီရင်ခံစာ
 DocType: Email Digest,Next email will be sent on:,Next ကိုအီးမေးလ်အပေါ်ကိုစလှေတျပါလိမ့်မည်:
 DocType: Offer Letter Term,Offer Letter Term,ပေးစာ Term ကိုပူဇော်
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,item မျိုးကွဲရှိပါတယ်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,ကုမ္ပဏီ {0} မတည်ရှိပါဘူး
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,သစ်ပင်ကို Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,သစ်ပင်ကို Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,တစ်ယူနစ်ကိုလောင် Qty
 DocType: Serial No,Warranty Expiry Date,အာမခံသက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
 DocType: Material Request Item,Quantity and Warehouse,အရေအတွက်နှင့်ဂိုဒေါင်
 DocType: Sales Invoice,Commission Rate (%),ကော်မရှင် Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,အစီအစဉ်ကို select ပေးပါ
 DocType: Project,Estimated Cost,ခန့်မှန်းခြေကုန်ကျစရိတ်
@@ -768,7 +770,7 @@
 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 အကောင့်
 DocType: Payment Entry,Received Amount (Company Currency),ရရှိထားသည့်ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,အခွင့်အလမ်းများခဲကနေလုပ်ပါကခဲသတ်မှတ်ရမည်
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,အပတ်စဉ်ထုတ်ပယ်သောနေ့ရက်ကိုရွေးပါ ကျေးဇူးပြု.
 DocType: Production Order Operation,Planned End Time,စီစဉ်ထားသည့်အဆုံးအချိန်
 ,Sales Person Target Variance Item Group-Wise,အရောင်းပုဂ္ဂိုလ် Target ကကှဲလှဲ Item Group မှ-ပညာရှိ
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,မှစ. အခွင့်အလမ်း
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,လစဉ်လစာကြေငြာချက်။
 DocType: BOM,Website Specifications,website သတ်မှတ်ချက်များ
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {1} အမျိုးအစား {0} မှစ.
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,row {0}: ကူးပြောင်းခြင်း Factor မသင်မနေရ
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,ဘဏ်မှ A / C အမှတ်
 DocType: Bank Guarantee,Project,စီမံကိန်း
 DocType: Quality Inspection Reading,Reading 7,7 Reading
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,တစ်စိတ်တစ်ပိုင်းမိန့်ထုတ်
 DocType: Expense Claim Detail,Expense Claim Type,စရိတ်တောင်းဆိုမှုများ Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,စျေးဝယ်ခြင်းတွန်းလှည်းသည် default setting များ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ဂျာနယ် Entry &#39;{0} ကနေတဆင့်ဖျက်သိမ်းပိုင်ဆိုင်မှု
@@ -825,14 +829,14 @@
 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 +107,Office Maintenance Expenses,Office ကို Maintenance အသုံးစရိတ်များ
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,အီးမေးလ်အကောင့်ကိုဖွင့်သတ်မှတ်
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,ပထမဦးဆုံးပစ္စည်းကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Liability,တာဝန်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ပိတ်ဆို့ငွေပမာဏ Row {0} အတွက်တောင်းဆိုမှုများငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။
 DocType: Company,Default Cost of Goods Sold Account,ကုန်စည်၏ default ကုန်ကျစရိတ်အကောင့်ရောင်းချ
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,စျေးနှုန်း List ကိုမရွေးချယ်
 DocType: Employee,Family Background,မိသားစုနောက်ခံသမိုင်း
 DocType: Request for Quotation Supplier,Send Email,အီးမေးလ်ပို့ပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},သတိပေးချက်: မမှန်ကန်ခြင်းနှောင်ကြိုး {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,အဘယ်သူမျှမခွင့်ပြုချက်
 DocType: Company,Default Bank Account,default ဘဏ်မှအကောင့်
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ပါတီအပေါ်အခြေခံပြီး filter မှပထမဦးဆုံးပါတီ Type ကိုရွေးပါ
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ဝန်ထမ်းမျှမတွေ့ပါ
 DocType: Supplier Quotation,Stopped,ရပ်တန့်
 DocType: Item,If subcontracted to a vendor,တစ်ရောင်းချသူမှ subcontracted မယ်ဆိုရင်
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ကျောင်းသားအုပ်စုပြီးသား updated ဖြစ်ပါတယ်။
 DocType: SMS Center,All Customer Contact,အားလုံးသည်ဖောက်သည်ဆက်သွယ်ရန်
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV ကနေတဆင့်စတော့ရှယ်ယာချိန်ခွင်လျှာ upload ။
 DocType: Warehouse,Tree Details,သစ်ပင်ကိုအသေးစိတ်
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,နိမ့်ဆုံးပမာဏပြေစာ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ကုန်ကျစရိတ်စင်တာ {2} ကုမ္ပဏီ {3} ပိုင်ပါဘူး
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: အကောင့် {2} တဲ့ Group ကိုမဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် &#39;&#39; {DOCTYPE} &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,item Row {idx}: {DOCTYPE} {DOCNAME} အထက် &#39;&#39; {DOCTYPE} &#39;&#39; table ထဲမှာမတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ပြီးသားပြီးစီးခဲ့သို့မဟုတ်ဖျက်သိမ်းလိုက်
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,အဘယ်သူမျှမတာဝန်များကို
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","အော်တိုကုန်ပို့လွှာ 05, 28 စသည်တို့ကိုဥပမာ generated လိမ့်မည်ဟူသောရက်နေ့တွင်လ၏နေ့"
 DocType: Asset,Opening Accumulated Depreciation,စုဆောင်းတန်ဖိုးဖွင့်လှစ်
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,Moving ပျမ်းမျှနှုန်း
 DocType: Production Planning Tool,Select Items,ပစ္စည်းများကိုရွေးပါ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} ဘီလ် {1} ဆန့်ကျင် {2} ရက်စွဲပါ
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,သင်တန်းဇယား
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,သင်တန်းဇယား
 DocType: Maintenance Visit,Completion Status,ပြီးစီးနဲ့ Status
 DocType: HR Settings,Enter retirement age in years,နှစ်များတွင်အငြိမ်းစားအသက်အရွယ် Enter
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target ကဂိုဒေါင်
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ဒီရာခိုင်နှုန်းအထိပေးပို့သို့မဟုတ်လက်ခံရရှိကျော် Allow
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,သွင်းကုန်တက်ရောက်
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,All item အဖွဲ့များ
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,All item အဖွဲ့များ
 DocType: Process Payroll,Activity Log,လုပ်ဆောင်ချက်အထဲ
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Net ကအမြတ်ခွန် / ပျောက်ဆုံးခြင်း
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,အလိုအလျှောက်ငွေကြေးလွှဲပြောင်းမှုမှာတင်သွင်းခဲ့တဲ့အပေါ်သတင်းစကား compose ။
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ငွေပေးချေမှုရမည့်ရန်အမိန့်ကိုဝယ်ယူရန်
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,စီမံကိန်း Qty
 DocType: Sales Invoice,Payment Due Date,ငွေပေးချေမှုရမည့်ကြောင့်နေ့စွဲ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,item Variant {0} ပြီးသားအတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;&#39; ဖွင့်ပွဲ &#39;&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,လုပ်ပါရန်ပွင့်လင်း
 DocType: Notification Control,Delivery Note Message,Delivery Note ကို Message
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Qty
 DocType: Leave Block List Date,Leave Block List Date,Block List ကိုနေ့စွဲ Leave
 DocType: Pricing Rule,Price or Discount,စျေးနှုန်းသို့မဟုတ်လျှော့
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,အရစ်ကျငွေလက်ခံပြေစာပစ္စည်းများ table ထဲမှာစုစုပေါင်းသက်ဆိုင်သောစွပ်စွဲချက်စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်အဖြစ်အတူတူပင်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,အရစ်ကျငွေလက်ခံပြေစာပစ္စည်းများ table ထဲမှာစုစုပေါင်းသက်ဆိုင်သောစွပ်စွဲချက်စုစုပေါင်းအခွန်နှင့်စွပ်စွဲချက်အဖြစ်အတူတူပင်ဖြစ်ရပါမည်
 DocType: Sales Team,Incentives,မက်လုံးတွေပေးပြီး
 DocType: SMS Log,Requested Numbers,တောင်းဆိုထားသော Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,ကုန်ကြမ်းကိုသာရယူ
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subcontracted ဖြစ်ပါတယ်
 DocType: Item Attribute,Item Attribute Values,item Attribute တန်ဖိုးများ
 DocType: Examination Result,Examination Result,စာမေးပွဲရလဒ်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ဝယ်ယူခြင်း Receipt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ဝယ်ယူခြင်း Receipt
 ,Received Items To Be Billed,ကြေညာတဲ့ခံရဖို့ရရှိထားသည့်ပစ္စည်းများ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Submitted လစာစလစ်
 DocType: Employee,Ms,ဒေါ်
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,ငွေကြေးလဲလှယ်မှုနှုန်းမာစတာ။
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},ကိုးကားစရာ DOCTYPE {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},ကိုးကားစရာ DOCTYPE {0} တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},စစ်ဆင်ရေး {1} သည်လာမည့် {0} လက်ထက်ကာလ၌အချိန်အပေါက်ရှာတွေ့ဖို့မအောင်မြင်ဘူး
 DocType: Production Order,Plan material for sub-assemblies,က sub-အသင်းတော်တို့အဘို့အစီအစဉ်ကိုပစ္စည်း
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,အရောင်းအပေါင်းအဖေါ်များနှင့်နယ်မြေတွေကို
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,စတော့ရှယ်ယာငွေလက်ကျန်အကောင့်ရှိပြီးသားလည်းမရှိအဖြစ်ကိုအလိုအလျောက်အကောင့်ကိုမဖန်တီးနိုင်။ သင်ဤဂိုဒေါင်တခုတခုအပေါ်မှာ entry ကိုဖြစ်စေနိုင်ပါတယ်မတိုင်မီသင်တစ်ဦးတူညီသည့်အကောင့်ဖန်တီးရမယ်
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,default ပေးဆောင် Accounts ကို
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,ဝန်ထမ်း {0} တက်ကြွမဟုတ်ပါဘူးသို့မဟုတ်မတည်ရှိပါဘူး
 DocType: Fee Structure,Components,components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,item Variant {0} updated
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Item {0} အတွက်ပိုင်ဆိုင်မှုအမျိုးအစားကိုရိုက်သွင်းပါ
 DocType: Quality Inspection Reading,Reading 6,6 Reading
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,နိုင်သလားမ {0} {1} {2} မည်သည့်အနှုတ်လက္ခဏာထူးချွန်ငွေတောင်းခံလွှာမပါဘဲ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ဝယ်ယူခြင်းပြေစာကြိုတင်ထုတ်
 DocType: Hub Settings,Sync Now,အခုတော့ Sync ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},row {0}: Credit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,ဝယ်ယူခြင်း Item ဖြစ်ပါတယ်
 DocType: Asset,Purchase Invoice,ဝယ်ယူခြင်းပြေစာ
 DocType: Stock Ledger Entry,Voucher Detail No,ဘောက်ချာ Detail မရှိပါ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,နယူးအရောင်းပြေစာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,နယူးအရောင်းပြေစာ
 DocType: Stock Entry,Total Outgoing Value,စုစုပေါင်းအထွက် Value တစ်ခု
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,နေ့စွဲနှင့်ပိတ်ရက်ဖွင့်လှစ်အတူတူဘဏ္ဍာရေးနှစ်တစ်နှစ်တာအတွင်းဖြစ်သင့်
 DocType: Lead,Request for Information,ပြန်ကြားရေးဝန်ကြီးဌာနတောင်းဆိုခြင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync ကိုအော့ဖ်လိုင်းဖြင့်ငွေတောင်းခံလွှာ
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,Program ကိုလျှောက်လွှာကြေး
 DocType: Salary Slip,Total in words,စကားစုစုပေါင်း
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,ဒဏ်ခတ်အရေးယူ
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; စားပွဲကိုမှကူးယူလိမ့်မည်။"
 DocType: Job Opening,Publish on website,website တွင် Publish
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,ဖောက်သည်တင်ပို့ရောင်းချမှု။
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,ပေးသွင်းငွေတောင်းခံလွှာနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ကှဲလှဲ
 ,Company Name,ကုမ္ပဏီအမည်
 DocType: SMS Center,Total Message(s),စုစုပေါင်း Message (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,လွှဲပြောင်းသည် Item ကိုရွေးပါ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,စစ်ဆေးမှုများအနည်ရာဘဏ်အကောင့်ဖွင့်ဦးခေါင်းကိုရွေးချယ်ပါ။
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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,ဓါတုဗေဒ
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ဒီ mode ကိုရှေးခယျြထားသညျ့အခါ default ဘဏ် / ငွေအကောင့်ကိုအလိုအလျောက်လစာဂျာနယ် Entry အတွက် update လုပ်ပါလိမ့်မည်။
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",အဆင့် Code ကို {0} များအတွက်ကြားကာလအခြားအဆင့်များအတွက်တန်းကြားကာလနှင့်အတူထပ်နေသည်။ ကြားကာလ {0} နှင့် {1} စစ်ဆေးထပ်ကြိုးစားပါ
 DocType: BOM,Raw Material Cost(Company Currency),ကုန်ကြမ်းပစ္စည်းကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ပစ္စည်းများအားလုံးပြီးပြီဒီထုတ်လုပ်မှုအမိန့်သည်ပြောင်းရွှေ့ခဲ့တာဖြစ်ပါတယ်။
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},အတန်း # {0}: နှုန်း {1} {2} များတွင်အသုံးပြုနှုန်းထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM ဝက်ဘ်ဆိုက် Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,သင့်ရဲ့စာကိုဦးခေါင်းနှင့်လိုဂို upload ။ (သင်နောက်ပိုင်းမှာသူတို့ကိုတည်းဖြတ်နိုင်သည်) ။
 DocType: Timesheet Detail,Bill,ဘီလ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Next ကိုတန်ဖိုးနေ့စွဲအတိတ်နေ့စွဲအဖြစ်ထဲသို့ဝင်သည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,အဖြူ
 DocType: SMS Center,All Lead (Open),အားလုံးသည်ခဲ (ပွင့်လင်း)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),အတန်း {0}: ({2} {3}) entry ကို၏အချိန်ပို့စ်တင်မှာ {1} ဂိုဒေါင်ထဲမှာ {4} များအတွက်အရည်အတွက်ရရှိနိုင်မ
 DocType: Purchase Invoice,Get Advances Paid,ကြိုတင်ငွေ Paid Get
 DocType: Item,Automatically Create New Batch,နယူးသုတ်အလိုအလျှောက် Create
 DocType: Item,Automatically Create New Batch,နယူးသုတ်အလိုအလျှောက် Create
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,လုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,လုပ်ပါ
 DocType: Student Admission,Admission Start Date,ဝန်ခံချက် Start ကိုနေ့စွဲ
 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 ကိုဆက်သွယ်ပါ။
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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 ဖွင့်လှစ်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,ပြောင်းလဲမှုပမာဏအဘို့အကောင့်ရိုက်ထည့်ပေးပါ
 DocType: Student Batch Name,Student Batch Name,ကျောင်းသားအသုတ်လိုက်အမည်
 DocType: Holiday List,Holiday List Name,အားလပ်ရက် List ကိုအမည်
 DocType: Repayment Schedule,Balance Loan Amount,balance ချေးငွေပမာဏ
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},တစ် {0} ကိုသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,အရေအတွက်သို့မဟုတ်တန်ဖိုးမျှပြောင်းလဲမှုနှင့်အတူပစ္စည်းများကိုဖယ်ရှားခဲ့သည်။
 DocType: Delivery Note,Delivery To,ရန် Delivery
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,attribute စားပွဲပေါ်မှာမဖြစ်မနေဖြစ်ပါသည်
 DocType: Production Planning Tool,Get Sales Orders,အရောင်းအမိန့် Get
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} အနုတ်လက္ခဏာမဖြစ်နိုင်
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,လြှော့ခွငျး
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,လြှော့ခွငျး
 DocType: Asset,Total Number of Depreciations,တန်ဖိုးစုစုပေါင်းအရေအတွက်
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
 DocType: Sales Invoice Item,Rate With Margin,Margin အတူ rate
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,အရောင်းအမိန့် / Finished ကုန်စည်ဂိုဒေါင်ထဲမှာ Reserved ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ငွေပမာဏရောင်းချနေ
 DocType: Repayment Schedule,Interest Amount,အကျိုးစီးပွားငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို &#39;နဲ့ Status&#39; နှင့် Save ကို Update ကျေးဇူးပြု.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,သင်သည်ဤစံချိန်များအတွက်ကုန်ကျစရိတ်အတည်ပြုချက်ဖြစ်ကြ၏။ ကို &#39;နဲ့ Status&#39; နှင့် Save ကို Update ကျေးဇူးပြု.
 DocType: Serial No,Creation Document No,ဖန်ဆင်းခြင်း Document ဖိုင်မရှိပါ
 DocType: Issue,Issue,ထုတ်ပြန်သည်
 DocType: Asset,Scrapped,ဖျက်သိမ်း
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Item Variant သည် attributes ။ ဥပမာ Size အ, အရောင်စသည်တို့"
 DocType: Purchase Invoice,Returns,ပြန်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP ဂိုဒေါင်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},serial No {0} {1} ထိပြုပြင်ထိန်းသိမ်းမှုစာချုပ်အောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,်ထမ်းခေါ်ယူမှု
 DocType: Lead,Organization Name,အစည်းအရုံးအမည်
 DocType: Tax Rule,Shipping State,သဘောင်္တင်ခပြည်နယ်
 ,Projected Quantity as Source,အရင်းအမြစ်အဖြစ်စီမံကိန်းအရေအတွက်
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,item button ကို &#39;&#39; ဝယ်ယူလက်ခံရရှိသည့်ရက်မှပစ္စည်းများ Get &#39;&#39; ကို အသုံးပြု. ထည့်သွင်းပြောကြားခဲ့သည်ရမည်
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Non-စတော့ရှယ်ယာပစ္စည်းများပါဝင်စေ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,အရောင်းအသုံးစရိတ်များ
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,ဆန့်ကျင်
 DocType: Item,Default Selling Cost Center,default ရောင်းချသည့်ကုန်ကျစရိတ် Center က
 DocType: Sales Partner,Implementation Partner,အကောင်အထည်ဖော်ရေး Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,စာပို့သင်္ကေတ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,စာပို့သင်္ကေတ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},အရောင်းအမှာစာ {0} {1} ဖြစ်ပါသည်
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,စတော့အိတ် Entries ဖော်ဆောင်ရေး
 DocType: Packing Slip,Net Weight UOM,Net ကအလေးချိန် UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ရလဒ်များ
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ရလဒ်များ
 DocType: Item,Default Supplier,default ပေးသွင်း
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ထုတ်လုပ်မှု Allow ရာခိုင်နှုန်းကျော်
 DocType: Employee Loan,Repayment Schedule,ပြန်ဆပ်ဇယား
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,အပတ်စဉ်ပိတ် Get နေ့ရက်များ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,အဆုံးနေ့စွဲ Start ကိုနေ့စွဲထက်လျော့နည်းမဖွစျနိုငျ
 DocType: Sales Person,Select company name first.,ပထမဦးဆုံးကုမ္ပဏီ၏နာမကိုရွေးချယ်ပါ။
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ဒေါက်တာ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ဒေါက်တာ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ကိုးကားချက်များပေးသွင်းထံမှလက်ခံရရှိခဲ့သည်။
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{1} {2} | {0} မှ
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,ပျမ်းမျှအားဖြင့်ခေတ်
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key ကိုစွမ်းဆောင်ရည်ဧရိယာ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,သယ်ယူပို့ဆောင်ရေး
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,မှားနေသော Attribute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} တင်သွင်းရဦးမည်
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},အရေအတွက်ထက်လျော့နည်းသို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
 DocType: SMS Center,Total Characters,စုစုပေါင်းဇာတ်ကောင်
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Item သည် BOM လယ်ပြင်၌ {0} BOM ကို select ကျေးဇူးပြု.
@@ -1153,7 +1154,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 +224,Production Order {0} must be cancelled before cancelling this Sales Order,ထုတ်လုပ်မှုအမိန့် {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;&#39; Apply ဖြည့်စွက်လျှော့တွင် &#39;&#39; set ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Range ထဲထဲကနေ A မျိုးမျိုးရန်ထက်လျော့နည်းဖြစ်ဖို့ရှိပါတယ်
 DocType: Global Defaults,Global Defaults,ဂလိုဘယ် Defaults ကို
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start ကိုတစ်နှစ်တာ
 DocType: Purchase Invoice,Start date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏နေ့စွဲ Start
 DocType: Salary Slip,Leave Without Pay,Pay ကိုမရှိရင် Leave
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,စွမ်းဆောင်ရည်မြှင့်စီမံကိန်းအမှား
 ,Trial Balance for Party,ပါတီများအတွက် trial Balance ကို
 DocType: Lead,Consultant,အကြံပေး
 DocType: Salary Slip,Earnings,င်ငွေ
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ဤသည်မူကွဲ၏ Item Code ကိုမှ appended လိမ့်မည်။ သင့်ရဲ့အတိုကောက် &quot;SM&quot; ဖြစ်ပြီး, ပစ္စည်း code ကို &quot;သည် T-shirt&quot; ဖြစ်ပါတယ်လျှင်ဥပမာ, ကိုမူကွဲ၏ပစ္စည်း code ကို &quot;သည် T-shirt-SM&quot; ဖြစ်လိမ့်မည်"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,သင်လစာစလစ်ဖြတ်ပိုင်းပုံစံကိုကယ်တင်တခါ (စကား) Net က Pay ကိုမြင်နိုင်ပါလိမ့်မည်။
 DocType: Purchase Invoice,Is Return,သို့ပြန်သွားသည်ဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ပြန်သွား / မြီစားမှတ်ချက်
 DocType: Price List Country,Price List Country,စျေးနှုန်းကိုစာရင်းနိုင်ငံ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},Item {1} သည် {0} တရားဝင် serial nos
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,အသုတ်လိုက်နံပါတ်ရဖို့ Item Code ကိုရိုက်ထည့်ပေးပါ
 DocType: Stock Settings,Default Item Group,default Item Group က
 DocType: Employee Loan,Partially Disbursed,တစ်စိတ်တစ်ပိုင်းထုတ်ချေး
-DocType: Grading Structure,Grading System Name,ဂမ် System ကိုအမည်
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ပေးသွင်းဒေတာဘေ့စ။
 DocType: Account,Balance Sheet,ချိန်ခွင် Sheet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Item Code ကိုအတူ Item သည်ကုန်ကျစရိတ် Center က &#39;&#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ငွေပေးချေမှုရမည့် Mode ကို configured ကိုမရ။ အကောင့်ငွေပေးချေ၏ Mode ကိုအပေါ်သို့မဟုတ် POS Profile ကိုအပေါ်သတ်မှတ်ပြီးပါပြီဖြစ်စေ, စစ်ဆေးပါ။"
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,သင့်ရဲ့ရောင်းအားလူတစ်ဦးကိုဖောက်သည်ကိုဆက်သွယ်ရန်ဤနေ့စွဲအပေါ်တစ်ဦးသတိပေးရလိမ့်မည်
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ရနိုင်မှာမဟုတ်ဘူး။
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",နောက်ထပ်အကောင့်အဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,ကြေညာတဲ့ခံရဖို့အမိန့်ပစ္စည်းများဝယ်ယူရန်
 DocType: Purchase Invoice Item,Net Rate,Net က Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,ဝယ်ယူခြင်းပြေစာ Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,စတော့အိတ်လယ်ဂျာ Entries နှင့် GL Entries ရွေးချယ်ထားတဲ့ဝယ်ယူလက်ခံသည်ထပ်မံတင်ပို့နေကြသည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,စတော့အိတ်လယ်ဂျာ Entries နှင့် GL Entries ရွေးချယ်ထားတဲ့ဝယ်ယူလက်ခံသည်ထပ်မံတင်ပို့နေကြသည်
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,item 1
 DocType: Holiday,Holiday,အားလပ်ရက်များ
 DocType: Support Settings,Close Issue After Days,နေ့ရက်များပြီးနောက်နီးကပ် Issue
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,အလုပ် Done
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,ထို Attribute တွေက table ထဲမှာအနည်းဆုံးတစ်ခု attribute ကို specify ကျေးဇူးပြု.
 DocType: Announcement,All Students,အားလုံးကျောင်းသားများ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,item {0} non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,view လယ်ဂျာ
 DocType: Grading Scale,Intervals,အကြား
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,အစောဆုံး
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","တစ်ဦး Item Group မှအမည်တူနှင့်အတူရှိနေတယ်, ပစ္စည်းအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းအုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ကျောင်းသားသမဂ္ဂမိုဘိုင်းအမှတ်
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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 ရှိသည်မဟုတ်နိုင်
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{1} မှ {0} ကနေလစာ၏ငွေပေးချေမှုရမည့်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},အေးခဲအကောင့် {0} တည်းဖြတ်ခွင့်ပြုချက်မရ
 DocType: Journal Entry,Get Outstanding Invoices,ထူးချွန်ငွေတောင်းခံလွှာကိုရယူပါ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,အရောင်းအမှာစာ {0} တရားဝင်မဟုတ်
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,အရစ်ကျအမိန့်သင်သည်သင်၏ဝယ်ယူမှုအပေါ်စီစဉ်ထားခြင်းနှင့်ဖွင့်အတိုင်းလိုက်နာကူညီ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","စိတ်မကောင်းပါဘူး, ကုမ္ပဏီများပေါင်းစည်းမရနိုင်ပါ"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",စုစုပေါင်းစာစောင် / လွှဲပြောင်းအရေအတွက် {0} ပစ္စည်းတောင်းဆိုမှုအတွက် {1} \ မေတ္တာရပ်ခံအရေအတွက် {2} Item {3} သည်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,သေးငယ်သော
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,သွယ်ဝိုက်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,row {0}: Qty မသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,လယ်ယာစိုက်ပျိုးရေး
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync ကိုမာစတာ Data ကို
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync ကိုမာစတာ Data ကို
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,သင့်ရဲ့ထုတ်ကုန်များသို့မဟုတ်န်ဆောင်မှုများ
 DocType: Mode of Payment,Mode of Payment,ငွေပေးချေမှုရမည့်၏ Mode ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,website က Image ကိုအများသုံးတဲ့ဖိုင်သို့မဟုတ် website ကို URL ကိုဖြစ်သင့်
 DocType: Student Applicant,AP,အေပီ
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ဒါကအမြစ်ကို item အဖွဲ့နှင့်တည်းဖြတ်မရနိုင်ပါ။
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Group မှ Roll နံပါတ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} သည်ကိုသာအကြွေးအကောင့်အသစ်များ၏အခြား debit entry ကိုဆန့်ကျင်နှင့်ဆက်စပ်နိုင်
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,အားလုံး task ကိုအလေးစုစုပေါင်း 1. အညီအားလုံးစီမံကိန်းအလုပ်များကိုအလေးချိန်ညှိပေးပါရပါမည်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery မှတ်ချက် {0} တင်သွင်းသည်မဟုတ်
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","စျေးနှုန်း Rule ပထမဦးဆုံး Item, Item အုပ်စုသို့မဟုတ်အမှတ်တံဆိပ်ဖြစ်နိုငျသောလယ်ပြင်၌, &#39;&#39; တွင် Apply &#39;&#39; အပေါ်အခြေခံပြီးရွေးချယ်ထားဖြစ်ပါတယ်။"
 DocType: Hub Settings,Seller Website,ရောင်းချသူဝက်ဘ်ဆိုက်
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,အရောင်းအဖွဲ့မှာသည်စုစုပေါင်းခွဲဝေရာခိုင်နှုန်းက 100 ဖြစ်သင့်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ထုတ်လုပ်မှုအမိန့် status ကို {0} သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ထုတ်လုပ်မှုအမိန့် status ကို {0} သည်
 DocType: Appraisal Goal,Goal,ရည်မှန်းချက်
 DocType: Sales Invoice Item,Edit Description,Edit ကိုဖော်ပြချက်
 ,Team Updates,အသင်းကိုအပ်ဒိတ်များ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,ပေးသွင်းအကြောင်းမူကား
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ပုံနှိပ်ပါ Format ကို Create
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,ဂျာနယ် Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,တိုးတက်မှုအတွက် {0} ပစ္စည်းများ
 DocType: Workstation,Workstation Name,Workstation နှင့်အမည်
-DocType: Grade Interval,Grade Code,grade Code ကို
+DocType: Grading Scale Interval,Grade Code,grade Code ကို
 DocType: POS Item Group,POS Item Group,POS ပစ္စည်းအုပ်စု
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,အီးမေးလ် Digest မဂ္ဂဇင်း:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} Item မှ {1} ပိုင်ပါဘူး
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,hardware
 DocType: Sales Order,Recurring Upto,နူန်းကျော်ကျော်ထပ်တလဲလဲ
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,တစ်ကုမ္ပဏီလီမိတက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,အခွင့်ထူးထွက်ခွာ
 DocType: Purchase Invoice,Supplier Invoice Date,ပေးသွင်းပြေစာနေ့စွဲ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,သင်ကစျေးဝယ်ခြင်းတွန်းလှည်း enable ရန်လိုအပ်သည်
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,အစာ
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,လည်ပတ်သူများမရှိပါ
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,မာကုကိုတက်ရောက်ဖို့
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},ကို Maintenance ဇယား {0} {1} ဆန့်ကျင်တည်ရှိ
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,စာရင်းသွင်းကျောင်းသား
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},အနီးကပ်အကောင့်ကို၏ငွေကြေး {0} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},အားလုံးပန်းတိုင်သည်ရမှတ် sum 100 ဖြစ်သင့်သည်က {0} သည်
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,AVG Daily သတင်းစာအထွက်
 DocType: POS Profile,Campaign,ကင်ပိန်း
 DocType: Supplier,Name and Type,အမည်နှင့်အမျိုးအစား
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',ခွင့်ပြုချက်နဲ့ Status &#39;&#39; Approved &#39;သို့မဟုတ်&#39; &#39;ငြင်းပယ်&#39; &#39;ရမည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',ခွင့်ပြုချက်နဲ့ Status &#39;&#39; Approved &#39;သို့မဟုတ်&#39; &#39;ငြင်းပယ်&#39; &#39;ရမည်
 DocType: Purchase Invoice,Contact Person,ဆက်သွယ်ရမည့်သူ
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;&#39; မျှော်မှန်း Start ကိုနေ့စွဲ &#39;&#39; မျှော်မှန်း End Date ကို &#39;&#39; ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Course Scheduling Tool,Course End Date,သင်တန်းပြီးဆုံးရက်စွဲ
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,သဘောင်္တင်ခလိပ်စာအမည်
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ငွေစာရင်း၏ဇယား
 DocType: Material Request,Terms and Conditions Content,စည်းကမ်းသတ်မှတ်ချက်များအကြောင်းအရာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 ကိုထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,item {0} တစ်စတော့ရှယ်ယာ Item မဟုတ်ပါဘူး
 DocType: Maintenance Visit,Unscheduled,Unscheduled
 DocType: Employee,Owned,ပိုင်ဆိုင်
 DocType: Salary Detail,Depends on Leave Without Pay,Pay ကိုမရှိရင်ထွက်ခွာအပေါ်မူတည်
 DocType: Pricing Rule,"Higher the number, higher the priority","ပိုမိုမြင့်မားသောအရေအတွက်, မြင့်ဦးစားပေး"
 ,Purchase Invoice Trends,ဝယ်ယူခြင်းပြေစာခေတ်ရေစီးကြောင်း
 DocType: Employee,Better Prospects,သာ. ကောင်း၏အလားအလာ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","အတန်း # {0}: အဆိုပါအသုတ် {1} ရှိသော {2} အရည်အတွက်ရှိပါတယ်။ ရရှိနိုင်ပါ {3} အရည်အတွက်ဟာအခြားအသုတ်ကိုရွေးချယ်ပါသို့မဟုတ်မျိုးစုံနေသည်ဟုသူများထံမှ / ကိစ္စကိုကယ်လွှတ်ခြင်းငှါ, မျိုးစုံတန်းသို့အတန်းခွဲ ကျေးဇူးပြု."
 DocType: Vehicle,License Plate,လိုင်စင်ပြား
 DocType: Appraisal,Goals,ရည်မှန်းချက်များ
 DocType: Warranty Claim,Warranty / AMC Status,အာမခံ / AMC နဲ့ Status
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ဝန်ထမ်းကိုယ်တော်တိုင်မှသတင်းပို့လို့မရပါဘူး။
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","အကောင့်အေးခဲသည်မှန်လျှင်, entries တွေကိုကန့်သတ်အသုံးပြုသူများမှခွင့်ပြုထားသည်။"
 DocType: Email Digest,Bank Balance,ဘဏ်ကို Balance ကို
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} များအတွက်စာရင်းကိုင် Entry: {1} သာငွေကြေးကိုအတွက်ဖန်ဆင်းနိုင်ပါသည်: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","ယောဘသည် profile ကို, အရည်အချင်းများနှင့်ပြည့်စသည်တို့မလိုအပ်"
 DocType: Journal Entry Account,Account Balance,အကောင့်ကို Balance
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ငွေပေးငွေယူဘို့အခွန်နည်းဥပဒေ။
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,မပိတ်ထားသည့်ဘဏ္ဍာနှစ်ရဲ့ P &amp; L ကိုချိန်ခွင်ပြရန်
 DocType: Shipping Rule,Shipping Account,သဘောင်္တင်ခအကောင့်
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: အကောင့် {2} မလှုပ်မရှားဖြစ်ပါသည်
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,သင်သည်သင်၏အလုပ်စီစဉ်ကူညီအပေါ်အချိန်မကယ်မလွှတ်မှအရောင်းအမိန့် Make
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,သင်သည်သင်၏အလုပ်စီစဉ်ကူညီအပေါ်အချိန်မကယ်မလွှတ်မှအရောင်းအမိန့် Make
 DocType: Quality Inspection,Readings,ဖတ်
 DocType: Stock Entry,Total Additional Costs,စုစုပေါင်းအထပ်ဆောင်းကုန်ကျစရိတ်
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,Value တစ်ခုမှ
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ထုပ်ပိုးစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Office ကိုငှား
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup ကို SMS ကို gateway ဟာ setting များ
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,သွင်းကုန်မအောင်မြင်ပါ!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,န်ဆောင်မှုများ
 DocType: HR Settings,Email Salary Slip to Employee,ထမ်းအီးမေးလ်လစာစလစ်ဖြတ်ပိုင်းပုံစံ
 DocType: Cost Center,Parent Cost Center,မိဘကုန်ကျစရိတ် Center က
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်းကို Select လုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်းကို Select လုပ်ပါ
 DocType: Sales Invoice,Source,အရင်းအမြစ်
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show ကိုပိတ်ထား
 DocType: Leave Type,Is Leave Without Pay,Pay ကိုမရှိရင် Leave ဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ပိုင်ဆိုင်မှုအမျိုးအစား Fixed Asset ကို item များအတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ထိုငွေပေးချေမှုရမည့် table ထဲမှာတွေ့ရှိမရှိပါမှတ်တမ်းများ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ဒီ {2} {3} ဘို့ {1} နှင့်အတူ {0} ပဋိပက္ခများကို
 DocType: Student Attendance Tool,Students HTML,ကျောင်းသားများက HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,ထွက်ခွာ၏နေ့စွဲ
 DocType: Pricing Rule,For Price List,စျေးနှုန်း List တွေ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,အလုပ်အမှုဆောင်ရှာရန်
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ဦးဆောင်လမ်းပြ Create
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ဦးဆောင်လမ်းပြ Create
 DocType: Maintenance Schedule,Schedules,အချိန်ဇယားများ
 DocType: Purchase Invoice Item,Net Amount,Net ကပမာဏ
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail မရှိပါ
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program ကိုကျောင်းအပ်
 DocType: Sales Invoice Item,Brand Name,ကုန်အမှတ်တံဆိပ်အမည်
 DocType: Purchase Receipt,Transporter Details,Transporter Details ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,default ဂိုဒေါင်ရွေးချယ်ထားသောအရာအတွက်လိုအပ်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,သေတ္တာ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ဖြစ်နိုင်ပါ့မလားပေးသွင်း
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,အဖွဲ့
 DocType: Budget,Monthly Distribution,လစဉ်ဖြန့်ဖြူး
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,receiver List ကိုအချည်းနှီးပါပဲ။ Receiver များစာရင်းဖန်တီး ကျေးဇူးပြု.
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,အရောင်း Partner Target က
 DocType: Loan Type,Maximum Loan Amount,အများဆုံးချေးငွေပမာဏ
 DocType: Pricing Rule,Pricing Rule,စျေးနှုန်း Rule
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ကျောင်းသား {0} အဘို့အလိပ်အရေအတွက်က Duplicate
 DocType: Budget,Action if Annual Budget Exceeded,လှုပ်ရှားမှုနှစ်ပတ်လည်ဘတ်ဂျက်ကျော်သွားပါပြီလျှင်
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,အမိန့်ကိုဝယ်ယူအသုံးပြုမှ material တောင်းဆိုခြင်း
 DocType: Shopping Cart Settings,Payment Success URL,ငွေပေးချေမှုရမည့်အောင်မြင်မှု URL ကို
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,ပြန်ဆပ် Method ကို
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","check လုပ်ထားလျှင်, ပင်မစာမျက်နှာဝက်ဘ်ဆိုက်များအတွက် default အနေနဲ့ Item Group မှဖြစ်လိမ့်မည်"
 DocType: Quality Inspection Reading,Reading 4,4 Reading
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} စီမံကိန်း {1} ဘို့မတွေ့ရှိများအတွက် default BOM
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} စီမံကိန်း {1} ဘို့မတွေ့ရှိများအတွက် default BOM
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,ကုမ္ပဏီစရိတ်များအတွက်တောင်းဆိုမှုများ။
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","ကျောင်းသားများသည်စနစ်၏နှလုံးမှာဖြစ်ကြောင်း, ရှိသမျှကိုသင်၏ကျောင်းသားများကို add"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","ကျောင်းသားများသည်စနစ်၏နှလုံးမှာဖြစ်ကြောင်း, ရှိသမျှကိုသင်၏ကျောင်းသားများကို add"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},အတန်း # {0}: ရှင်းလင်းခြင်းနေ့စွဲ {1} {2} Cheque တစ်စောင်လျှင်နေ့စွဲမတိုင်မီမဖွစျနိုငျ
 DocType: Company,Default Holiday List,default အားလပ်ရက်များစာရင်း
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},အတန်း {0}: အချိန်နှင့်ရန်ကနေ {1} ၏အချိန် {2} နှင့်အတူထပ်ဖြစ်ပါတယ်
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,သငျသညျခွင့်များအတွက်လျှောက်ထားထားတဲ့နေ့ (သို့) အားလပ်ရက်ဖြစ်ကြ၏။ သငျသညျခွင့်လျှောက်ထားစရာမလိုပေ။
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ငွေပေးချေမှုရမည့်အီးမေးလ် Resend
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,တဲ့ New task
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,စျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,စျေးနှုန်းလုပ်ပါ
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,အခြားအစီရင်ခံစာများ
 DocType: Dependent Task,Dependent Task,မှီခို Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},တိုင်း၏ default အနေနဲ့ယူနစ်သည်ကူးပြောင်းခြင်းအချက်အတန်းအတွက် 1 {0} ဖြစ်ရမည်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},{0} တော့ဘူး {1} ထက်မဖွစျနိုငျအမျိုးအစား Leave
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ကြိုတင်မဲအတွက် X ကိုနေ့ရက်ကာလအဘို့စစ်ဆင်ရေးစီစဉ်ကြိုးစားပါ။
 DocType: HR Settings,Stop Birthday Reminders,မွေးနေသတိပေးချက်များကိုရပ်တန့်
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},ကုမ္ပဏီ {0} အတွက်ပုံမှန်လစာပေးချေအကောင့်ကိုသတ်မှတ်ပေးပါ
 DocType: SMS Center,Receiver List,receiver များစာရင်း
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ရှာရန် Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,ရှာရန် Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,စားသုံးသည့်ပမာဏ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,ငွေအတွက်ပိုက်ကွန်ကိုပြောင်းရန်
 DocType: Assessment Plan,Grading Scale,grade စကေး
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ယခုပင်လျှင်ပြီးစီး
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,တိုင်း {0} ၏ယူနစ်တခါကူးပြောင်းခြင်း Factor ဇယားအတွက်ထက်ပိုပြီးဝသို့ဝင်ခဲ့သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ယခုပင်လျှင်ပြီးစီး
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ငွေပေးချေမှုရမည့်တောင်းခံခြင်းပြီးသား {0} ရှိတယ်ဆိုတဲ့
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ထုတ်ပေးခြင်းပစ္စည်းများ၏ကုန်ကျစရိတ်
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},အရေအတွက် {0} ထက်ပိုပြီးမဖြစ်ရပါမည်
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ငွေပေးချေ Entry &#39;Make
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,row {0}: ပေးသွင်းဆန့်ကျင်ကြိုတင်ငွေကြိုပေးရမညျ
 DocType: Company,Default Values,default တန်ဖိုးများ
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{အကြိမ်ရေ} Digest မဂ္ဂဇင်း
 DocType: Expense Claim,Total Amount Reimbursed,စုစုပေါင်းငွေပမာဏ Reimbursed
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ဒီယာဉ်ဆန့်ကျင်ရာ Logs အပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,စုဝေး
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},ပေးသွင်းပြေစာ {0} ဆန့်ကျင် {1} ရက်စွဲပါ
 DocType: Customer,Default Price List,default စျေးနှုန်းများစာရင်း
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ပိုင်ဆိုင်မှုလပ်ြရြားမြစံချိန် {0} ကဖန်တီး
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,သငျသညျဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} မဖျက်နိုင်ပါ။ ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} ကမ္တာ့ချိန်ညှိအတွက် default အနေနဲ့အဖြစ်သတ်မှတ်
 DocType: Journal Entry,Entry Type,entry Type အမျိုးအစား
 ,Customer Credit Balance,customer Credit Balance
@@ -1663,7 +1666,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ထိုပစ္စည်းများကိုအဘယ်သူအားမျှအရေအတွက်သို့မဟုတ်တန်ဖိုးကိုအတွက်မည်သည့်အပြောင်းအလဲရှိသည်။
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,မသင်မနေရကိုလယ် - အစီအစဉ်
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,မသင်မနေရကိုလယ် - အစီအစဉ်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,အာမခံပြောဆိုချက်ကို
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,အာမခံပြောဆိုချက်ကို
 ,Lead Details,ခဲအသေးစိတ်ကို
 DocType: Salary Slip,Loan repayment,ချေးငွေပြန်ဆပ်
 DocType: Purchase Invoice,End date of current invoice's period,လက်ရှိကုန်ပို့လွှာရဲ့ကာလ၏အဆုံးနေ့စွဲ
@@ -1682,12 +1685,10 @@
 DocType: Employee,Permanent Address,အမြဲတမ်းလိပ်စာ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} က Grand စုစုပေါင်း {2} ထက် သာ. ကြီးမြတ် \ မဖွစျနိုငျဆန့်ကျင်ပေးဆောင်ကြိုတင်မဲ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,ကို item code ကို select လုပ်ပါ ကျေးဇူးပြု.
 DocType: Student Sibling,Studying in Same Institute,တူ Institute ကိုလေ့လာနေ
 DocType: Territory,Territory Manager,နယ်မြေတွေကို Manager က
 DocType: Packed Item,To Warehouse (Optional),ဂိုဒေါင် (Optional) မှ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Payment Entry,Paid Amount (Company Currency),Paid ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Purchase Invoice,Additional Discount,အပိုဆောင်းလျှော့
 DocType: Selling Settings,Selling Settings,Settings ကိုရောင်းချနေ
@@ -1697,9 +1698,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,လှည်းအတွက်ကြည့်ရန်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,marketing အသုံးစရိတ်များ
 ,Item Shortage Report,item ပြတ်လပ်အစီရင်ခံစာ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","အလေးချိန်ဖော်ပြခဲ့သောဖြစ်ပါတယ်, \ nPlease လွန်း &quot;အလေးချိန် UOM&quot; ဖော်ပြထားခြင်း"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ဒီစတော့အိတ် Entry &#39;ပါစေရန်အသုံးပြုပစ္စည်းတောင်းဆိုခြင်း
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Next ကိုတန်ဖိုးနေ့စွဲအသစ်ပိုင်ဆိုင်မှုများအတွက်မဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Next ကိုတန်ဖိုးနေ့စွဲအသစ်ပိုင်ဆိုင်မှုများအတွက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,တိုင်းအသုတ်လိုက်အဘို့အုပ်စုအခြေစိုက်သီးခြားသင်တန်း
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,တိုင်းအသုတ်လိုက်အဘို့အုပ်စုအခြေစိုက်သီးခြားသင်တန်း
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,တစ်ဦး Item ၏လူပျိုယူနစ်။
@@ -1716,9 +1717,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: ကုန်ကျစရိတ်စင်တာ &#39;&#39; အကျိုးအမြတ်နှင့်ဆုံးရှုံးမှု &#39;&#39; အကောင့် {2} ဘို့လိုအပ်ပါသည်။ ကုမ္ပဏီတစ်ခုက default ကုန်ကျစရိတ်စင်တာထူထောင်ပေးပါ။
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,တစ်ဖောက်သည်အုပ်စုနာမည်တူနှင့်အတူတည်ရှိသုံးစွဲသူအမည်ကိုပြောင်းလဲဒါမှမဟုတ်ဖောက်သည်အုပ်စုအမည်ပြောင်းကျေးဇူးတင်ပါ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 Reading
@@ -1735,7 +1734,7 @@
 ,Item-wise Sales Register,item-ပညာရှိသအရောင်းမှတ်ပုံတင်မည်
 DocType: Asset,Gross Purchase Amount,စုစုပေါင်းအရစ်ကျငွေပမာဏ
 DocType: Asset,Depreciation Method,တန်ဖိုး Method ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,အော့ဖ်လိုင်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,အော့ဖ်လိုင်း
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,အခြေခံပညာနှုန်းတွင်ထည့်သွင်းဒီအခွန်ဖြစ်သနည်း
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,စုစုပေါင်း Target က
 DocType: Program Course,Required,တောင်းဆိုနေတဲ့
@@ -1745,21 +1744,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ပြန်လည်သင့်မြတ်ရေး JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,အများကြီးစစ်ကြောင်းများ။ အစီရင်ခံစာတင်ပို့ပြီး spreadsheet ပလီကေးရှင်းကိုအသုံးပြုခြင်းက print ထုတ်။
 DocType: Purchase Invoice Item,Batch No,batch မရှိပါ
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},{1} ကီးကိုရက်စွဲအဘို့ {2} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေနိုင်ခြင်း
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,တစ်ဖောက်သည်ရဲ့ဝယ်ယူမိန့်ဆန့်ကျင်မျိုးစုံအရောင်းအမိန့် Allow
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 DocType: Student Group Instructor,Student Group Instructor,ကျောင်းသားအုပ်စုနည်းပြ
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 မိုဘိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,အဓိက
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,မူကွဲ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,အဓိက
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,မူကွဲ
 DocType: Naming Series,Set prefix for numbering series on your transactions,သင့်ရဲ့ငွေကြေးလွှဲပြောင်းအပေါ်စီးရီးဦးရေသည်ရှေ့ဆက် Set
 DocType: Employee Attendance Tool,Employees HTML,ဝန်ထမ်းများ HTML ကို
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,default BOM ({0}) ဒီအချက်ကိုသို့မဟုတ်ယင်း၏ template ကိုသည်တက်ကြွသောဖြစ်ရမည်
 DocType: Employee,Leave Encashed?,Encashed Leave?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,လယ်ပြင်၌ မှစ. အခွင့်အလမ်းမသင်မနေရ
 DocType: Email Digest,Annual Expenses,နှစ်ပတ်လည်ကုန်ကျစရိတ်
 DocType: Item,Variants,မျိုးကွဲ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,ဝယ်ယူခြင်းအမိန့်လုပ်ပါ
 DocType: SMS Center,Send To,ရန် Send
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ထွက်ခွာ Type {0} လုံလောက်ခွင့်ချိန်ခွင်မရှိ
 DocType: Payment Reconciliation Payment,Allocated amount,ခွဲဝေပမာဏ
@@ -1767,7 +1765,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,customer ရဲ့ Item Code ကို
 DocType: Stock Reconciliation,Stock Reconciliation,စတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေး
 DocType: Territory,Territory Name,နယ်မြေတွေကိုအမည်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,အလုပ်-In-တိုးတက်ရေးပါတီဂိုဒေါင်ခင် Submit လိုအပ်သည်
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,တစ်ဦးယောဘသည်လျှောက်ထားသူ။
 DocType: Purchase Order Item,Warehouse and Reference,ဂိုဒေါင်နှင့်ကိုးကားစရာ
 DocType: Supplier,Statutory info and other general information about your Supplier,ပြဋ္ဌာန်းဥပဒေအချက်အလက်နှင့်သင်၏ပေးသွင်းအကြောင်းကိုအခြားအထွေထွေသတင်းအချက်အလက်
@@ -1775,11 +1773,10 @@
 DocType: Item,Serial Nos and Batches,serial Nos နှင့် batch
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ကျောင်းသားအုပ်စုအစွမ်းသတ္တိ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ကျောင်းသားအုပ်စုအစွမ်းသတ္တိ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ဂျာနယ် Entry &#39;{0} ဆန့်ကျင်မည်သည့် unmatched {1} entry ကိုမရှိပါဘူး
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,တန်ဖိုးခြင်း
 apps/erpnext/erpnext/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 များအတွက်အခြေအနေ
-DocType: Grading Structure,Grading Intervals,ဂမ် Interval
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ကျေးဇူးပြု. ထည့်သွင်းပါ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","{2} ထက် {0} အတန်းအတွက် {1} ကပိုပစ္စည်းများအတွက် overbill လို့မရပါဘူး။ Over-ငွေတောင်းခံခွင့်ပြုပါရန်, Settings များဝယ်ယူထားကျေးဇူးပြုပြီး"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,ပစ္စည်းသို့မဟုတ်ဂိုဒေါင်အပေါ်အခြေခံပြီး filter ကိုသတ်မှတ်ထားပေးပါ
@@ -1791,17 +1788,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} တင်သွင်းရမည်
 DocType: Authorization Control,Authorization Control,authorization ထိန်းချုပ်ရေး
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},row # {0}: ငြင်းပယ်ဂိုဒေါင်ပယ်ချခဲ့ Item {1} ဆန့်ကျင်မဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ငွေပေးချေမှုရမည့်
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,သင့်ရဲ့အမိန့်ကိုစီမံခန့်ခွဲ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ငွေပေးချေမှုရမည့်
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,သင့်ရဲ့အမိန့်ကိုစီမံခန့်ခွဲ
 DocType: Production Order Operation,Actual Time and Cost,အမှန်တကယ်အချိန်နှင့်ကုန်ကျစရိတ်
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},အများဆုံး၏ပစ္စည်းတောင်းဆိုမှု {0} အရောင်းအမိန့် {2} ဆန့်ကျင်ပစ္စည်း {1} သည်ဖန်ဆင်းနိုင်
 DocType: Employee,Salutation,နှုတ်ဆက်
 DocType: Course,Course Abbreviation,သင်တန်းအတိုကောက်
 DocType: Student Leave Application,Student Leave Application,ကျောင်းသားသမဂ္ဂခွင့်လျှောက်လွှာ
 DocType: Item,Will also apply for variants,စမျိုးကွဲလျှောက်ထားလိမ့်မည်ဟု
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","ဒါကြောင့် {0} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု, ဖျက်သိမ်းမရနိုငျ"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} အပေါ်တစ်ဝက်နေ့၌ဝန်ထမ်း {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},စုစုပေါင်းအလုပ်ချိန်နာရီ {0} အလုပ်လုပ် max ကိုထက် သာ. ကြီးမြတ်မဖြစ်သင့်ပါဘူး
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,အပေါ်
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,ရောင်းရငွေ၏အချိန်ပစ္စည်းများကို bundle ။
 DocType: Quotation Item,Actual Qty,အမှန်တကယ် Qty
 DocType: Sales Invoice Item,References,ကိုးကား
@@ -1811,7 +1809,7 @@
 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 +91,Associate,အပေါင်းအဖေါ်
 DocType: Asset Movement,Asset Movement,ပိုင်ဆိုင်မှုလပ်ြရြားမြ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,နယူးလှည်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,နယူးလှည်း
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,item {0} တဲ့နံပါတ်စဉ်အလိုက် Item မဟုတ်ပါဘူး
 DocType: SMS Center,Create Receiver List,Receiver များစာရင်း Create
 DocType: Vehicle,Wheels,ရထားဘီး
@@ -1843,10 +1841,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ထုတ်လုပ်မှုအမိန့်ဆန့်ကျင်အချိန်သစ်လုံး၏ဖန်ဆင်းခြင်းလုပ်မလုပ်။ စစ်ဆင်ရေးထုတ်လုပ်မှုကိုအမိန့်ဆန့်ကျင်ခြေရာခံလိမ့်မည်မဟုတ်
 DocType: Student,Student Mobile Number,ကျောင်းသားသမဂ္ဂမိုဘိုင်းနံပါတ်
 DocType: Item,Has Variants,မူကွဲရှိပါတယ်
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},သငျသညျပြီးသား {0} {1} ကနေပစ္စည်းကိုရှေးခယျြခဲ့ကြ
 DocType: Monthly Distribution,Name of the Monthly Distribution,အဆိုပါလစဉ်ဖြန့်ဖြူးအမည်
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,batch ID ကိုမဖြစ်မနေဖြစ်ပါသည်
 DocType: Sales Person,Parent Sales Person,မိဘအရောင်းပုဂ္ဂိုလ်
 DocType: Purchase Invoice,Recurring Invoice,ထပ်တလဲလဲပြေစာ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,စီမံခန့်ခွဲမှုစီမံကိန်းများ
@@ -1854,11 +1852,11 @@
 DocType: Budget,Fiscal Year,ဘဏ္ဍာရေးနှစ်
 DocType: Vehicle Log,Fuel Price,လောင်စာစျေးနှုန်း
 DocType: Budget,Budget,ဘတ်ဂျက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,သတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုပစ္စည်း non-စတော့ရှယ်ယာကို item ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","ဒါကြောင့်တစ်ဦးဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုအကောင့်ကိုဖွင့်မရအဖြစ်ဘတ်ဂျက်, {0} ဆန့်ကျင်တာဝန်ပေးအပ်ရနိုင်မှာမဟုတ်ဘူး"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,အောင်မြင်
 DocType: Student Admission,Application Form Route,လျှောက်လွှာ Form ကိုလမ်းကြောင်း
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,နယ်မြေတွေကို / ဖောက်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ဥပမာ 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,အမျိုးအစား {0} Leave ကြောင့်လစာမပါဘဲထွက်သွားသည်ကတည်းကခွဲဝေမရနိုငျ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},row {0}: ခွဲဝေငွေပမာဏ {1} ထက်လျော့နည်းသို့မဟုတ်ထူးချွန်ငွေပမာဏ {2} ငွေတောင်းပြေစာပို့ဖို့နဲ့ညီမျှပါတယ်ဖြစ်ရမည်
@@ -1878,14 +1876,14 @@
 ,Serial No Status,serial မရှိပါနဲ့ Status
 DocType: Payment Entry Reference,Outstanding,ထူးချွန်
 ,Daily Timesheet Summary,Daily သတင်းစာ Timesheet အကျဉ်းချုပ်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","row {0}: နေ့စွဲ \ ထဲကနေနှင့်မှအကြားခြားနားချက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {2} တန်းတူဖြစ်ရမည်, {1} ကာလကိုသတ်မှတ်ဖို့"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ဒီစတော့ရှယ်ယာလှုပ်ရှားမှုအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ {0} ကိုကြည့်ပါ
 DocType: Pricing Rule,Selling,အရောင်းရဆုံး
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},ငွေပမာဏ {0} {1} {2} ဆန့်ကျင်နုတ်ယူ
 DocType: Employee,Salary Information,လစာပြန်ကြားရေး
 DocType: Sales Person,Name and Employee ID,အမည်နှင့်ထမ်း ID ကို
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,ကြောင့်နေ့စွဲနေ့စွဲများသို့တင်ပြခြင်းမပြုမီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,တာဝန်နှင့်အခွန်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,ကိုးကားစရာနေ့စွဲကိုရိုက်ထည့်ပေးပါ
@@ -1897,14 +1895,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ဒီတာဝန်ခံအမျိုးအစားသည်ထက် သာ. ကြီးမြတ်သို့မဟုတ်လက်ရှိအတန်းအရေအတွက်တန်းတူအတန်းအရေအတွက်ကိုရည်ညွှန်းနိုင်ဘူး
 DocType: Asset,Sold,ကိုရောင်းချ
 ,Item-wise Purchase History,item-ပညာရှိသဝယ်ယူခြင်းသမိုင်း
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Serial No ဆွဲယူဖို့ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု. Item {0} သည်ကဆက်ပြောသည်
 DocType: Account,Frozen,ရေခဲသော
 ,Open Production Orders,ပွင့်လင်းထုတ်လုပ်မှုအမိန့်
 DocType: Sales Invoice Payment,Base Amount (Company Currency),base ငွေပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Payment Reconciliation Payment,Reference Row,ကိုးကားစရာ Row
 DocType: Installation Note,Installation Time,Installation လုပ်တဲ့အချိန်
 DocType: Sales Invoice,Accounting Details,စာရင်းကိုင် Details ကို
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ဒီကုမ္ပဏီအပေါငျးတို့သငွေကြေးကိစ္စရှင်းလင်းမှု Delete
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ရင်းနှီးမြှုပ်နှံမှုများ
 DocType: Issue,Resolution Details,resolution အသေးစိတ်ကို
@@ -1937,14 +1935,14 @@
 DocType: Discussion,Discussion,ဆွေးနွေးချက်
 DocType: Payment Entry,Transaction ID,ငွေသွင်းငွေထုတ် ID ကို
 DocType: Employee,Resignation Letter Date,နုတ်ထွက်ပေးစာနေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,စျေးနှုန်းနည်းဥပဒေများနောက်ထပ်အရေအတွက်ပေါ် အခြေခံ. filtered နေကြပါတယ်။
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ဝန်ထမ်း {0} အဘို့အချိတ်တွဲ၏နေ့စွဲသတ်မှတ်ပေးပါ
 DocType: Task,Total Billing Amount (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) စုစုပေါင်းငွေတောင်းခံလွှာပမာဏ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,repeat ဖောက်သည်အခွန်ဝန်ကြီးဌာန
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) အခန်းကဏ္ဍ &#39;&#39; သုံးစွဲမှုအတည်ပြုချက် &#39;&#39; ရှိရမယ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,လင်မယား
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ထုတ်လုပ်မှုများအတွက် BOM နှင့်အရည်အတွက်ကို Select လုပ်ပါ
 DocType: Asset,Depreciation Schedule,တန်ဖိုးဇယား
 DocType: Bank Reconciliation Detail,Against Account,အကောင့်ဆန့်ကျင်
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ဝက်နေ့နေ့စွဲနေ့စွဲ မှစ. နှင့်နေ့စွဲစေရန်အကြားဖြစ်သင့်တယ်
@@ -1958,16 +1956,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},ကုမ္ပဏီ {0} ၌ &#39;ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ&#39; &#39;set ကျေးဇူးပြု.
 ,Maintenance Schedules,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယား
 DocType: Task,Actual End Date (via Time Sheet),(အချိန်စာရွက်မှတဆင့်) အမှန်တကယ်ပြီးဆုံးရက်စွဲ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},ငွေပမာဏ {0} {1} {2} {3} ဆန့်ကျင်
 ,Quotation Trends,စျေးနှုန်းခေတ်ရေစီးကြောင်း
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},ကို item {0} သည်ကို item မာစတာတှငျဖျောပွမ item Group က
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,အကောင့်ဖွင့်ရန် debit တစ် receiver အကောင့်ကိုရှိရမည်
 DocType: Shipping Rule Condition,Shipping Amount,သဘောင်္တင်ခပမာဏ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,ဆိုင်းငံ့ထားသောငွေပမာဏ
 DocType: Purchase Invoice Item,Conversion Factor,ကူးပြောင်းခြင်း Factor
 DocType: Purchase Order,Delivered,ကယ်နှုတ်တော်မူ၏
 ,Vehicle Expenses,ယာဉ်ကုန်ကျစရိတ်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
+DocType: Serial No,Invoice Details,ငွေတောင်းခံလွှာအသေးစိတ်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},အသုံးဝင်သောဘဝပြီးနောက်မျှော်မှန်းတန်ဖိုးထက်ထက် သာ. ကြီးမြတ်သို့မဟုတ် {0} တန်းတူဖြစ်ရပါမည်
 DocType: Purchase Receipt,Vehicle Number,မော်တော်ယာဉ်နံပါတ်
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,ထပ်တလဲလဲကုန်ပို့လွှာရပ်တန့်ဖြစ်ရလိမ့်မည်သည့်နေ့ရက်
 DocType: Employee Loan,Loan Amount,ချေးငွေပမာဏ
@@ -1986,12 +1985,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,HR Settings ကို
 DocType: Salary Slip,net pay info,အသားတင်လစာအချက်အလက်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,စရိတ်တောင်းဆိုမှုများအတည်ပြုချက်ဆိုင်းငံ့ထားတာဖြစ်ပါတယ်။ ကိုသာသုံးစွဲမှုအတည်ပြုချက် status ကို update ပြုလုပ်နိုင်ပါသည်။
 DocType: Email Digest,New Expenses,နယူးကုန်ကျစရိတ်
 DocType: Purchase Invoice,Additional Discount Amount,အပိုဆောင်းလျှော့ငွေပမာဏ
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","အတန်း # {0}: item ကိုသတ်မှတ်ထားတဲ့အရာတစ်ခုပါပဲအဖြစ်အရည်အတွက်, 1 ဖြစ်ရမည်။ မျိုးစုံအရည်အတွက်ကိုခွဲတန်းကိုသုံးပေးပါ။"
 DocType: Leave Block List Allow,Leave Block List Allow,Allow Block List ကို Leave
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr အလွတ်သို့မဟုတ်အာကာသမဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,က Non-Group ကိုမှ Group က
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,အားကစား
 DocType: Loan Type,Loan Name,ချေးငွေအမည်
@@ -2003,6 +2002,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,သင်ပယ်ချပစ္စည်းများစတော့ရှယ်ယာကိုထိန်းသိမ်းရာဂိုဒေါင်
 DocType: Production Order,Skip Material Transfer,ပစ္စည်းလွှဲပြောင်း Skip
 DocType: Production Order,Skip Material Transfer,ပစ္စည်းလွှဲပြောင်း Skip
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,သော့ချက်နေ့စွဲ {2} များအတွက် {1} မှ {0} လဲလှယ်မှုနှုန်းကိုရှာဖွေမပေးနိုင်ပါ။ ကိုယ်တိုင်တစ်ငွေကြေးလဲလှယ်ရေးစံချိန်ဖန်တီး ကျေးဇူးပြု.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,သင့်ရဲ့ဘဏ္ဍာရေးနှစ်တွင်အပေါ်အဆုံးသတ်
 DocType: POS Profile,Price List,စျေးနှုန်းများစာရင်း
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ယခုက default ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာဖြစ်ပါတယ်။ အကျိုးသက်ရောက်မှုယူမှအပြောင်းအလဲအတွက်သင့် browser refresh ပေးပါ။
@@ -2019,19 +2019,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},အကောင့်ကို {0} မမှန်ကန်ဘူး။ အကောင့်ကိုငွေကြေးစနစ် {1} ဖြစ်ရပါမည်
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM ကူးပြောင်းခြင်းအချက်အတန်း {0} အတွက်လိုအပ်သည်
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရောင်းအမိန့်အရောင်းပြေစာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်
 DocType: Salary Component,Deduction,သဘောအယူအဆ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,အတန်း {0}: အချိန်နှင့်ရန်အချိန် မှစ. မဖြစ်မနေဖြစ်ပါတယ်။
 DocType: Stock Reconciliation Item,Amount Difference,ငွေပမာဏ Difference
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},item စျေးနှုန်းကိုစျေးနှုန်းကိုစာရင်း {1} အတွက် {0} များအတွက်ဖြည့်စွက်
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ဒီအရောင်းလူတစ်ဦး၏န်ထမ်း Id ကိုရိုက်ထည့်ပေးပါ
 DocType: Territory,Classification of Customers by region,ဒေသအားဖြင့် Customer များ၏ခွဲခြား
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ကွာခြားချက်ပမာဏသုညဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ကွာခြားချက်ပမာဏသုညဖြစ်ရပါမည်
 DocType: Project,Gross Margin,gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,ထုတ်လုပ်မှု Item ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,တွက်ချက် Bank မှဖော်ပြချက်ချိန်ခွင်လျှာ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,မသန်မစွမ်းအသုံးပြုသူ
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ကိုးကာချက်
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ကိုးကာချက်
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,စုစုပေါင်းထုတ်ယူ
 ,Production Analytics,ထုတ်လုပ်မှု Analytics မှ
@@ -2040,9 +2040,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},သတိပေးချက်: attachment ကို {0} အပေါ်မမှန်ကန်ခြင်း SSL ကိုလက်မှတ်ကို
 DocType: Student Admission,Eligibility,အရည်အချင်းများ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ဦးဆောင်လမ်းပြသင့်ရဲ့ဆောင်အဖြစ်အားလုံးသင့်ရဲ့အဆက်အသွယ်နဲ့ပိုပြီး add, သင်စီးပွားရေးလုပ်ငန်း get ကူညီ"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ဦးဆောင်လမ်းပြသင့်ရဲ့ဆောင်အဖြစ်အားလုံးသင့်ရဲ့အဆက်အသွယ်နဲ့ပိုပြီး add, သင်စီးပွားရေးလုပ်ငန်း get ကူညီ"
 DocType: Production Order Operation,Actual Operation Time,အမှန်တကယ်စစ်ဆင်ရေးအချိန်
 DocType: Authorization Rule,Applicable To (User),(အသုံးပြုသူ) ရန်သက်ဆိုင်သော
 DocType: Purchase Taxes and Charges,Deduct,နှုတ်ယူ
@@ -2057,7 +2057,7 @@
 DocType: Guardian,Work Address,အလုပ်လိပ်စာ
 DocType: Appraisal,Calculate Total Score,စုစုပေါင်းရမှတ်ကိုတွက်ချက်
 DocType: Request for Quotation,Manufacturing Manager,ကုန်ထုတ်လုပ်မှု Manager က
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},serial No {0} {1} ထိအာမခံအောက်မှာဖြစ်ပါတယ်
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,packages များသို့ Delivery Note ကို Split ။
 apps/erpnext/erpnext/hooks.py +87,Shipments,တင်ပို့ရောင်းချမှု
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ဂိုဒေါင်များအတွက်အကောင့်လက်ကျန်ငွေ ({0}) {1} နှင့်စတော့ရှယ်ယာတန်ဖိုး ({2}) {3} အတူတူပင်ဖြစ်ရပါမည်
@@ -2080,10 +2080,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,မှတ်ချက်: အီးမေးလ်မသန်မစွမ်းအသုံးပြုသူများထံသို့စေလွှတ်လိမ့်မည်မဟုတ်ပေ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Interaction အရေအတွက်
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Interaction အရေအတွက်
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,ကုမ္ပဏီကိုရွေးချယ်ပါ ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,အားလုံးဌာနများစဉ်းစားလျှင်အလွတ် Leave
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","အလုပ်အကိုင်အခွင့်အအမျိုးအစားများ (ရာသက်ပန်, စာချုပ်, အလုပ်သင်ဆရာဝန်စသည်တို့) ။"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Item {1} သည်မသင်မနေရ
 DocType: Process Payroll,Fortnightly,နှစ်ပတ်တ
 DocType: Currency Exchange,From Currency,ငွေကြေးစနစ်ကနေ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","atleast တယောက်အတန်းအတွက်ခွဲဝေငွေပမာဏ, ပြေစာ Type နှင့်ပြေစာနံပါတ်ကို select ကျေးဇူးပြု."
@@ -2092,14 +2092,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),rate (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Student Guardian,Others,အခြားသူများ
 DocType: Payment Entry,Unallocated Amount,ထဲကအသုံးမပြုတဲ့ငွေပမာဏ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,တစ်ကိုက်ညီတဲ့ပစ္စည်းရှာမတှေ့နိုငျပါသညျ။ {0} များအတွက်အချို့သောအခြား value ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: POS Profile,Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.",အဖြေထုတ်ကုန်ပစ္စည်းသို့မဟုတ်စတော့ရှယ်ယာအတွက်ဝယ်ရောင်းမစောင့်ဘဲပြုလုပ်ထားတဲ့န်ဆောင်မှု။
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,အဘယ်သူမျှမကပို updates များကို
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ပထမဦးဆုံးအတန်းအတွက် &#39;ယခင် Row ပမာဏတွင်&#39; သို့မဟုတ် &#39;&#39; ယခင် Row စုစုပေါင်းတွင် &#39;အဖြစ်တာဝန်ခံ type ကိုရွေးချယ်လို့မရပါဘူး
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ကလေး Item တစ်ကုန်ပစ္စည်း Bundle ကိုမဖြစ်သင့်ပါဘူး။ `{0} ကို item ကိုဖယ်ရှား` ကယ်တင်ပေးပါ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,ဘဏ်လုပ်ငန်း
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets Add
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets Add
 DocType: Vehicle Service,Service Item,Service ကို Item
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
 DocType: Bank Guarantee,Bank Guarantee,ဘဏ်အာမခံ
@@ -2125,6 +2125,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},အတန်း # {0}: ပိုင်ဆိုင်မှု {1} {2} ပြီးသားဖြစ်ပါတယ်
 DocType: Quotation Item,Stock Balance,စတော့အိတ် Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ငွေပေးချေမှုရမည့်မှအရောင်းအမိန့်
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setup ကို&gt; Setting&gt; အမည်ဖြင့်သမုတ်စီးရီးကနေတဆင့် {0} များအတွက်စီးရီးအမည်ဖြင့်သမုတ်သတ်မှတ်ထား ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,စီအီးအို
 DocType: Expense Claim Detail,Expense Claim Detail,စရိတ်တောင်းဆိုမှုများ Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,မှန်ကန်သောအကောင့်ကို select လုပ်ပါ ကျေးဇူးပြု.
@@ -2149,14 +2150,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,စျေးစာရင်းမသတ်မှတ်လျှင်စျေးနှုန်းများပြလိမ့်မည်မဟုတ်
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ဒီအသဘောင်္တင်စိုးမိုးရေးများအတွက်တိုင်းပြည် specify သို့မဟုတ် Worldwide မှသဘောင်္တင်စစ်ဆေးပါ
 DocType: Stock Entry,Total Incoming Value,စုစုပေါင်း Incoming Value တစ်ခု
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,debit ရန်လိုအပ်သည်
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,debit ရန်လိုအပ်သည်
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets သင့်ရဲ့အဖွဲ့ကအမှုကိုပြု Activite ဘို့အချိန်, ကုန်ကျစရိတ်နှင့်ငွေတောင်းခံခြေရာခံစောင့်ရှောက်ကူညီပေးရန်"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Offer Letter Term,Offer Term,ကမ်းလှမ်းမှုကို Term
 DocType: Quality Inspection,Quality Manager,အရည်အသွေးအ Manager က
 DocType: Job Applicant,Job Opening,ယောဘသည်အဖွင့်ပွဲ
 DocType: Payment Reconciliation,Payment Reconciliation,ငွေပေးချေမှုရမည့်ပြန်လည်ရင်ကြားစေ့ရေး
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Incharge ပုဂ္ဂိုလ်ရဲ့နာမညျကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,နည်းပညာတက္ကသိုလ်
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},စုစုပေါင်းကြွေးကျန်: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM ဝက်ဘ်ဆိုက်စစ်ဆင်ရေး
@@ -2184,23 +2185,23 @@
 DocType: Opportunity,Lost Reason,ပျောက်ဆုံးသွားရသည့်အကြောင်းရင်း
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,နယူးလိပ်စာ
 DocType: Quality Inspection,Sample Size,နမူနာ Size အ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ပစ္စည်းများအားလုံးပြီးသား invoiced ပြီ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,ငွေလက်ခံပြေစာစာရွက်စာတမ်းရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,နောက်ထပ်ကုန်ကျစရိတ်စင်တာများအဖွဲ့များအောက်မှာလုပ်နိုင်ပေမယ့် entries တွေကို Non-အဖွဲ့များဆန့်ကျင်စေနိုင်ပါတယ်
 DocType: Project,External,external
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,အသုံးပြုသူများနှင့်ခွင့်ပြုချက်
 DocType: Vehicle Log,VLOG.,ရုပ်ရှင်ဘလော့ဂ်။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Created ထုတ်လုပ်မှုအမိန့်: {0}
 DocType: Branch,Branch,အညွန့
 DocType: Guardian,Mobile Number,လက်ကိုင်ဖုန်းနာပတ်
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ပုံနှိပ်နှင့် Branding
 DocType: Bin,Actual Quantity,အမှန်တကယ်ပမာဏ
 DocType: Shipping Rule,example: Next Day Shipping,ဥပမာအား: Next ကိုနေ့ Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} မတွေ့ရှိ serial No
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} မတွေ့ရှိ serial No
 DocType: Scheduling Tool,Student Batch,ကျောင်းသားအသုတ်လိုက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,သင့် Customer
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ကျောင်းသား Make
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ကျောင်းသား Make
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},သငျသညျစီမံကိန်းကိုအပေါ်ပူးပေါင်းဖို့ဖိတ်ခေါ်ခဲ့ကြ: {0}
 DocType: Leave Block List Date,Block Date,block နေ့စွဲ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,အခုဆိုရင် Apply
@@ -2224,8 +2225,9 @@
 DocType: SMS Log,Sent To,ရန်ကိုစလှေတျ
 DocType: Payment Request,Make Sales Invoice,အရောင်းပြေစာလုပ်ပါ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next ကိုဆက်သွယ်ပါနေ့စွဲအတိတ်ထဲမှာမဖွစျနိုငျ
 DocType: Company,For Reference Only.,သာလျှင်ကိုးကားစရာသည်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,ကို Select လုပ်ပါအသုတ်လိုက်အဘယ်သူမျှမ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},မမှန်ကန်ခြင်း {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ကြိုတင်ငွေပမာဏ
@@ -2239,7 +2241,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,အမှုနံပါတ် 0 မဖြစ်နိုင်
 DocType: Item,Show a slideshow at the top of the page,စာမျက်နှာ၏ထိပ်မှာတစ်ဆလိုက်ရှိုးပြရန်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,စတိုးဆိုင်များ
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,စတိုးဆိုင်များ
 DocType: Serial No,Delivery Time,ပို့ဆောင်ချိန်
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing အခြေပြုတွင်
 DocType: Item,End of Life,အသက်တာ၏အဆုံး
@@ -2251,12 +2253,12 @@
 DocType: Rename Tool,Rename Tool,Tool ကို Rename
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Update ကိုကုန်ကျစရိတ်
 DocType: Item Reorder,Item Reorder,item Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ပစ္စည်းလွှဲပြောင်း
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Show ကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ပစ္စည်းလွှဲပြောင်း
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",အဆိုပါစစ်ဆင်ရေးကိုသတ်မှတ်မှာ operating ကုန်ကျစရိတ်နှင့်သင်တို့၏စစ်ဆင်ရေးမှတစ်မူထူးခြားစစ်ဆင်ရေးမျှမပေး။
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ဤစာရွက်စာတမ်းကို item {4} ဘို့ {0} {1} အားဖြင့်ကန့်သတ်ကျော်ပြီဖြစ်ပါသည်။ သငျသညျ {2} အတူတူဆန့်ကျင်သည်အခြား {3} လုပ်နေပါတယ်?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,ချွေပြီးနောက်ထပ်တလဲလဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,ပြောင်းလဲမှုငွေပမာဏကိုအကောင့်ကို Select လုပ်ပါ
 DocType: Purchase Invoice,Price List Currency,စျေးနှုန်း List ကိုငွေကြေးစနစ်
 DocType: Naming Series,User must always select,အသုံးပြုသူအမြဲရွေးချယ်ရမည်
 DocType: Stock Settings,Allow Negative Stock,အပြုသဘောမဆောင်သောစတော့အိတ် Allow
@@ -2267,7 +2269,7 @@
 DocType: Budget Account,Budget Account,ဘတ်ဂျက်အကောင့်
 DocType: Quality Inspection,Verified By,By Verified
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","လက်ရှိအရောင်းအရှိပါသည်ကြောင့်, ကုမ္ပဏီ၏ default ငွေကြေးမပြောင်းနိုင်ပါတယ်။ အရောင်းအကို default ငွေကြေးပြောင်းလဲဖို့ဖျက်သိမ်းရပါမည်။"
-DocType: Grade Interval,Grade Description,grade ဖျေါပွခကျြ
+DocType: Grading Scale Interval,Grade Description,grade ဖျေါပွခကျြ
 DocType: Stock Entry,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,လစာစလစ်ဖြတ်ပိုင်းပုံစံ Create
@@ -2305,7 +2307,7 @@
 DocType: Upload Attendance,Attendance To Date,နေ့စွဲရန်တက်ရောက်
 DocType: Warranty Claim,Raised By,By ထမြောက်စေတော်
 DocType: Payment Gateway Account,Payment Account,ငွေပေးချေမှုရမည့်အကောင့်
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,ဆက်လက်ဆောင်ရွက်ရန်ကုမ္ပဏီသတ်မှတ် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Accounts ကို receiver များတွင် Net က Change ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ပိတ် Compensatory
 DocType: Offer Letter,Accepted,လက်ခံထားတဲ့
@@ -2315,12 +2317,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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 ပြင်. မရပါ။
 DocType: Room,Room Number,အခန်းနံပတ်
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},မမှန်ကန်ခြင်းရည်ညွှန်းကိုးကား {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ထုတ်လုပ်မှုအမိန့် {3} အတွက်စီစဉ်ထား quanitity ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ထုတ်လုပ်မှုအမိန့် {3} အတွက်စီစဉ်ထား quanitity ({2}) ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Shipping Rule,Shipping Rule Label,သဘောင်္တင်ခ Rule Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,အသုံးပြုသူဖိုရမ်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,ကုန်ကြမ်းပစ္စည်းများအလွတ်မဖြစ်နိုင်။
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ငွေတောင်းခံလွှာတစ်စက်ရေကြောင်းကို item များပါရှိသည်, စတော့ရှယ်ယာကို update မရနိုင်ပါ။"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,လျင်မြန်စွာ Journal မှ Entry &#39;
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM ဆိုတဲ့ item agianst ဖော်ပြခဲ့သောဆိုရင်နှုန်းကိုမပြောင်းနိုင်ပါ
 DocType: Employee,Previous Work Experience,ယခင်လုပ်ငန်းအတွေ့အကြုံ
 DocType: Stock Entry,For Quantity,ပမာဏများအတွက်
@@ -2333,7 +2335,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,စည်းကမ်းချက်များနှင့် Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,သငျသညျဤစနစ်တည်ထောင်ထားတဲ့များအတွက်အဖွဲ့အစည်း၏နာမတော်။
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ဒီ up to date ဖြစ်နေအေးခဲစာရင်းကိုင် entry ကိုဘယ်သူမှလုပ်နိုင် / အောက်တွင်သတ်မှတ်ထားသောအခန်းကဏ္ဍ မှလွဲ. entry ကို modify ။
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,ပြုပြင်ထိန်းသိမ်းမှုအချိန်ဇယားထုတ်လုပ်ဖို့ရှေ့တော်၌ထိုစာရွက်စာတမ်းကိုကယ်တင် ကျေးဇူးပြု.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,စီမံချက်လက်ရှိအခြေအနေ
 DocType: UOM,Check this to disallow fractions. (for Nos),အပိုငျးအမြစ်တားရန်ဤစစ်ဆေးပါ။ (အမှတ်အတွက်)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,အောက်ပါထုတ်လုပ်မှုအမိန့်ကိုဖန်ဆင်းခဲ့သည်:
@@ -2360,7 +2362,7 @@
 ,Employees working on a holiday,တစ်အားလပ်ရက်တွင်လုပ်ကိုင်န်ထမ်းများ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,မာကုလက်ရှိ
 DocType: Project,% Complete Method,% အပြီးအစီး Method ကို
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},ပြုပြင်ထိန်းသိမ်းမှုစတင်နေ့စွဲ Serial No {0} သည်ပို့ဆောင်မှုနေ့စွဲခင်မဖွစျနိုငျ
 DocType: Production Order,Actual End Date,အမှန်တကယ် End Date ကို
 DocType: BOM,Operating Cost (Company Currency),operating ကုန်ကျစရိတ် (ကုမ္ပဏီငွေကြေးစနစ်)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2377,7 +2379,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Pay ကိုမရှိရင် Leave အတည်ပြုခွင့်လျှောက်လွှာမှတ်တမ်းများနှင့်အတူမကိုက်ညီ
 DocType: Campaign,Campaign-.####,ကင်ပိန်း - ။ ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Next ကိုခြေလှမ်းများ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,အကောငျးဆုံးနှုန်းထားများမှာသတ်မှတ်ထားသောပစ္စည်းများထောက်ပံ့ပေးပါ
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 ရက်အကြာမှာအော်တိုနီးစပ်အခွင့်အလမ်း
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,အဆုံးတစ်နှစ်တာ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quote /% ကိုပို့ဆောငျ
@@ -2415,7 +2417,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ပမာဏ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Created ကြေး Records ကို - {0}
 DocType: Asset Category Account,Asset Category Account,ပိုင်ဆိုင်မှုအမျိုးအစားအကောင့်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},အရောင်းအမိန့်အရေအတွက် {1} ထက်ပိုပစ္စည်း {0} မထုတ်လုပ်နိုင်သ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,စတော့အိတ် Entry &#39;{0} တင်သွင်းသည်မဟုတ်
 DocType: Payment Reconciliation,Bank / Cash Account,ဘဏ်မှ / ငွေအကောင့်
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Next ကိုဆက်သွယ်ပါအားဖြင့်ခဲအီးမေးလ်လိပ်စာအတိုင်းအတူတူမဖွစျနိုငျ
@@ -2437,7 +2439,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,ရှင်းလင်းရေးနေ့စွဲဖော်ပြခဲ့သောမဟုတ်
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ထုတ်လုပ်မှု
 DocType: Guardian,Occupation,အလုပ်အကိုင်
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,row {0}: Start ကိုနေ့စွဲ End Date ကိုခင်ဖြစ်ရမည်
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),စုစုပေါင်း (Qty)
 DocType: Sales Invoice,This Document,ဒီစာရွက်စာတမ်း
 DocType: Installation Note Item,Installed Qty,Install လုပ်ရတဲ့ Qty
@@ -2453,15 +2456,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,တစ်ဦး Issue သတင်းပို့
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility ကိုအသုံးစရိတ်များ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-အထက်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,အတန်း # {0}: ဂျာနယ် Entry &#39;{1} အကောင့် {2} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,အတန်း # {0}: ဂျာနယ် Entry &#39;{1} အကောင့် {2} ရှိသည်သို့မဟုတ်ပြီးသားအခြားဘောက်ချာဆန့်ကျင်လိုက်ဖက်ပါဘူး
 DocType: Buying Settings,Default Buying Price List,default ဝယ်ယူစျေးနှုန်းများစာရင်း
 DocType: Process Payroll,Salary Slip Based on Timesheet,Timesheet အပေါ်အခြေခံပြီးလစာစလစ်ဖြတ်ပိုင်းပုံစံ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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.","ကုမ္ပဏီ, ငွေကြေးစနစ်, လက်ရှိဘဏ္ဍာရေးနှစ်တစ်နှစ်တာစသည်တို့ကိုတူ Set Default တန်ဖိုးများ"
 DocType: Payment Entry,Payment Type,ငွေပေးချေမှုရမည့် Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Item {0} များအတွက်အသုတ်လိုက်ရွေးပါ။ ဒီလိုအပ်ချက်ပြည့်တဲ့တစ်ခုတည်းသောအသုတ်ကိုရှာဖွေနိုင်ခြင်း
 DocType: Process Payroll,Select Employees,ဝန်ထမ်းများကိုရွေးပါ
 DocType: Opportunity,Potential Sales Deal,အလားအလာရှိသောအရောင်း Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque တစ်စောင်လျှင် / ကိုးကားစရာနေ့စွဲ
@@ -2478,7 +2481,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} ပြီးသားကုမ္ပဏီ {1} ဖန်တီးသော Global POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Purchase Order,Ref SQ,Ref စတုရန်းမိုင်
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,အားလုံး BOMs အတွက် Item / BOM အစားထိုးဖို့
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ငွေလက်ခံပြေစာစာရွက်စာတမ်းတင်ပြရဦးမည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ငွေလက်ခံပြေစာစာရွက်စာတမ်းတင်ပြရဦးမည်
 DocType: Purchase Invoice Item,Received Qty,Qty ရရှိထားသည့်
 DocType: Stock Entry Detail,Serial No / Batch,serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Paid နှင့်မကယ်မနှုတ်မရ
@@ -2487,11 +2490,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,အဘယ်သူမျှမအချိန်စာရွက်များ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} သယ်-forward နိုင်သည်မရနိုင်ပါ Type နေရာမှာ Leave
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ပြုပြင်ထိန်းသိမ်းမှုဇယားအပေါငျးတို့သပစ္စည်းများသည် generated မဟုတ်ပါ။ &#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 ,To Produce,ထုတ်လုပ်
 apps/erpnext/erpnext/config/hr.py +93,Payroll,အခစာရင်း
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{1} အတွက် {0} အတန်းသည်။ {2} Item မှုနှုန်း, အတန်း {3} ကိုလည်းထည့်သွင်းရမည်ကိုထည့်သွင်းရန်"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,အသုံးပြုသူ Make
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,အသုံးပြုသူ Make
 DocType: Packing Slip,Identification of the package for the delivery (for print),(ပုံနှိပ်သည်) ကိုပေးပို့များအတွက်အထုပ်၏ identification
 DocType: Bin,Reserved Quantity,Reserved ပမာဏ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,မှန်ကန်သော email address ကိုရိုက်ထည့်ပေးပါ
@@ -2505,15 +2508,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,မသန်စွမ်း template ကို default အနေနဲ့ template ကိုမဖွစျရပါမညျ
 DocType: Account,Income Account,ဝင်ငွေခွန်အကောင့်
 DocType: Payment Request,Amount in customer's currency,ဖောက်သည်ရဲ့ငွေကြေးပမာဏ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,delivery
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,delivery
 DocType: Stock Reconciliation Item,Current Qty,လက်ရှိ Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ပုဒ်မကုန်ကျမှာ &quot;ပစ္စည်းများအခြေတွင်အမျိုးမျိုးနှုန်း&quot; ကိုကြည့်ပါ
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key ကိုတာဝန်သိမှုဧရိယာ
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ကျောင်းသား batch သင်ကျောင်းသားများအတွက်တက်ရောက်သူ, အကဲဖြတ်ခြင်းနှင့်အဖိုးအခကိုခြေရာခံကိုကူညီ"
 DocType: Payment Entry,Total Allocated Amount,စုစုပေါင်းခွဲဝေပမာဏ
 DocType: Item Reorder,Material Request Type,material တောင်းဆိုမှုကအမျိုးအစား
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1} မှလစာများအတွက်တိကျမှန်ကန်ဂျာနယ် Entry &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage အပြည့်အဝဖြစ်ပါသည်, မကယ်တင်ခဲ့ဘူး"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage အပြည့်အဝဖြစ်ပါသည်, မကယ်တင်ခဲ့ဘူး"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,row {0}: UOM ကူးပြောင်းခြင်း Factor နဲ့မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,ကုန်ကျစရိတ် Center က
@@ -2523,16 +2527,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,အရောင်းအရောင်းအဝယ်ကနေဖောက်သည်ရဲ့အခွန် Id Hide
 DocType: Upload Attendance,Upload HTML,HTML ကို upload
 DocType: Employee,Relieving Date,နေ့စွဲ Relieving
-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.","စျေးနှုန်းနည်းဥပဒေအချို့သတ်မှတ်ချက်များအပေါ်အခြေခံပြီး, လျှော့စျေးရာခိုင်နှုန်းသတ်မှတ် / စျေးနှုန်း List ကို overwrite မှလုပ်ဖြစ်ပါတယ်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","စျေးနှုန်းနည်းဥပဒေအချို့သတ်မှတ်ချက်များအပေါ်အခြေခံပြီး, လျှော့စျေးရာခိုင်နှုန်းသတ်မှတ် / စျေးနှုန်း List ကို overwrite မှလုပ်ဖြစ်ပါတယ်။"
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ဂိုဒေါင်သာစတော့အိတ် Entry / Delivery မှတ်ချက် / ဝယ်ယူခြင်းပြေစာကနေတဆင့်ပြောင်းလဲနိုင်ပါသည်
 DocType: Employee Education,Class / Percentage,class / ရေရာခိုင်နှုန်း
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,ဈေးကွက်နှင့်အရောင်း၏ဦးခေါင်းကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","ရွေးချယ်ထားသည့်စျေးနှုန်းများ Rule &#39;စျေးနှုန်း&#39; &#39;အဘို့သည်ဆိုပါကစျေးနှုန်း List ကို overwrite လုပ်သွားမှာ။ စျေးနှုန်း Rule စျေးနှုန်းနောက်ဆုံးစျေးနှုန်းဖြစ်ပါတယ်, ဒါကြောင့်အဘယ်သူမျှမကနောက်ထပ်လျှော့စျေးလျှောက်ထားရပါမည်။ ဒါကွောငျ့, အရောင်းအမိန့်, ဝယ်ယူခြင်းအမိန့်စသည်တို့ကဲ့သို့သောကိစ္စများကိုအတွက်ကြောင့်မဟုတ်ဘဲ &#39;&#39; စျေးနှုန်း List ကို Rate &#39;&#39; လယ်ပြင်ထက်, &#39;&#39; Rate &#39;&#39; လယ်ပြင်၌ခေါ်ယူသောအခါလိမ့်မည်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ရွေးချယ်ထားသည့်စျေးနှုန်းများ Rule &#39;စျေးနှုန်း&#39; &#39;အဘို့သည်ဆိုပါကစျေးနှုန်း List ကို overwrite လုပ်သွားမှာ။ စျေးနှုန်း Rule စျေးနှုန်းနောက်ဆုံးစျေးနှုန်းဖြစ်ပါတယ်, ဒါကြောင့်အဘယ်သူမျှမကနောက်ထပ်လျှော့စျေးလျှောက်ထားရပါမည်။ ဒါကွောငျ့, အရောင်းအမိန့်, ဝယ်ယူခြင်းအမိန့်စသည်တို့ကဲ့သို့သောကိစ္စများကိုအတွက်ကြောင့်မဟုတ်ဘဲ &#39;&#39; စျေးနှုန်း List ကို Rate &#39;&#39; လယ်ပြင်ထက်, &#39;&#39; Rate &#39;&#39; လယ်ပြင်၌ခေါ်ယူသောအခါလိမ့်မည်။"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track စက်မှုလက်မှုလုပ်ငန်းရှင်များကအမျိုးအစားအားဖြင့် Leads ။
 DocType: Item Supplier,Item Supplier,item ပေးသွင်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,အဘယ်သူမျှမသုတ်ရ Item Code ကိုရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{1} quotation_to {0} လို့တန်ဖိုးကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,အားလုံးသည်လိပ်စာ။
 DocType: Company,Stock Settings,စတော့အိတ် Settings ကို
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","အောက်ပါဂုဏ်သတ္တိနှစ်မျိုးလုံးမှတ်တမ်းများအတွက်တူညီသော အကယ်. merge သာဖြစ်နိုင်ပါတယ်။ အုပ်စု, Root Type, ကုမ္ပဏီဖြစ်ပါတယ်"
@@ -2542,6 +2546,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',&#39;&#39; ပွင့်လင်း &#39;&#39; အဆင့်အတန်းနှင့်အတူန်ထမ်းမှအဖြစ်အပျက်နှင့် ပတ်သက်. အီးမေးလ်တစ်စောင်ပေးပို့ပါလိမ့်မယ်
 DocType: Task,Depends on Tasks,လုပ်ငန်းများအပေါ်မူတည်
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,ဖောက်သည်အုပ်စု Tree Manage ။
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ပူးတွဲဖိုင်စျေးဝယ်လှည်းအားဖွင့်ခြင်းမရှိဘဲပြသနိုင်ပါသည်
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,နယူးကုန်ကျစရိတ် Center ကအမည်
 DocType: Leave Control Panel,Leave Control Panel,Control Panel ကို Leave
@@ -2554,12 +2559,10 @@
 DocType: Sales Invoice,Debit To,debit ရန်
 DocType: Delivery Note,Required only for sample item.,သာနမူနာကို item လိုအပ်သည်။
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Transaction ပြီးနောက်အမှန်တကယ် Qty
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ပေးသွင်း&gt; ပေးသွင်းအမျိုးအစား
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} နှင့် {1} အကြားမျှမတွေ့လစာစလစ်
 ,Pending SO Items For Purchase Request,ဝယ်ယူခြင်းတောင်းဆိုခြင်းသည်ဆိုင်းငံ SO ပစ္စည်းများ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ကိုပိတ်ထားသည်
 DocType: Supplier,Billing Currency,ငွေတောင်းခံငွေကြေးစနစ်
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,အပိုအကြီးစား
@@ -2576,9 +2579,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,မူလစာမျက်နှာ Featured ကုန်ပစ္စည်း
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,အားလုံးအကဲဖြတ်အဖွဲ့များ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,နယူးဂိုဒေါင်အမည်
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),စုစုပေါင်း {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),စုစုပေါင်း {0} ({1})
 DocType: C-Form Invoice Detail,Territory,နယျမွေ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,လိုအပ်သောလာရောက်လည်ပတ်သူမျှဖော်ပြထားခြင်း ကျေးဇူးပြု.
 DocType: Stock Settings,Default Valuation Method,default အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နည်းနိဿယ
 DocType: Vehicle Log,Fuel Qty,လောင်စာအရည်အတွက်
 DocType: Production Order Operation,Planned Start Time,စီစဉ်ထား Start ကိုအချိန်
@@ -2594,7 +2597,7 @@
 DocType: Price List,Price List Master,စျေးနှုန်း List ကိုမဟာ
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,အားလုံးသည်အရောင်းငွေကြေးကိစ္စရှင်းလင်းမှုမျိုးစုံ ** အရောင်း Persons ဆန့်ကျင် tagged နိုင်ပါတယ် ** သင်ပစ်မှတ် ထား. စောင့်ကြည့်နိုင်အောင်။
 ,S.O. No.,SO အမှတ်
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ခဲထံမှ {0} ဖောက်သည်ဖန်တီး ကျေးဇူးပြု.
 DocType: Price List,Applicable for Countries,နိုင်ငံများအဘို့သက်ဆိုင်သော
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;&#39; Approved &#39;နဲ့&#39; ငြင်းပယ် &#39;&#39; တင်သွင်းနိုင်ပါသည် status ကိုအတူ Applications ကိုသာလျှင် Leave
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ကျောင်းသားအုပ်စုအမည်အတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
@@ -2626,7 +2629,7 @@
 DocType: Project,Copied From,မှစ. ကူးယူ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},အမှားအမည်: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ပြတ်လပ်မှု
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} နှင့်ဆက်စပ်ပါဘူး
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ဝန်ထမ်း {0} သည်တက်ရောက်သူပြီးသားမှတ်သားသည်
 DocType: Packing Slip,If more than one package of the same type (for print),(ပုံနှိပ်သည်) တူညီသောအမျိုးအစားတစ်ခုထက် ပို. package ကို အကယ်.
 ,Salary Register,လစာမှတ်ပုံတင်မည်
@@ -2645,7 +2648,7 @@
 DocType: Tax Rule,Use for Shopping Cart,စျေးဝယ်လှည်းအသုံးပြု
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Value ကို {0} Attribute ဘို့ {1} တရားဝင်ပစ္စည်းများ၏စာရင်းထဲတွင်မတည်ရှိပါဘူး Item {2} များအတွက်တန်ဖိုးများ Attribute
 DocType: BOM Item,Scrap %,တစ်ရွက်%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",စွဲချက်သင့်ရဲ့ရွေးချယ်မှုနှုန်းအဖြစ်ကို item qty သို့မဟုတ်ပမာဏအပေါ်အခြေခံပြီးအခြိုးအစားဖြန့်ဝေပါလိမ့်မည်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",စွဲချက်သင့်ရဲ့ရွေးချယ်မှုနှုန်းအဖြစ်ကို item qty သို့မဟုတ်ပမာဏအပေါ်အခြေခံပြီးအခြိုးအစားဖြန့်ဝေပါလိမ့်မည်
 DocType: Maintenance Visit,Purposes,ရည်ရွယ်ချက်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Atleast တယောက်ကို item ပြန်လာစာရွက်စာတမ်းအတွက်အနုတ်လက္ခဏာအရေအတွက်နှင့်အတူသို့ဝင်သင့်ပါတယ်
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","စစ်ဆင်ရေး {0} ရှည်ကို Workstation {1} အတွက်မဆိုရရှိနိုင်အလုပ်လုပ်နာရီထက်, မျိုးစုံစစ်ဆင်ရေးသို့စစ်ဆင်ရေးဖြိုဖျက်"
@@ -2666,16 +2669,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,နယ်မြေတွေကို Tree Manage ။
 DocType: Journal Entry Account,Sales Invoice,အရောင်းပြေစာ
 DocType: Journal Entry Account,Party Balance,ပါတီ Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,လျှော့တွင် Apply ကို select ကျေးဇူးပြု.
 DocType: Company,Default Receivable Account,default receiver အကောင့်
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,အထက်ပါရွေးချယ်ထားသောသတ်မှတ်ချက်များသည်ပေးဆောင်စုစုပေါင်းလစာများအတွက်ဘဏ်မှ Entry Create
 DocType: Stock Entry,Material Transfer for Manufacture,Manufacturing သည်ပစ္စည်းလွှဲပြောင်း
-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.,လျော့စျေးရာခိုင်နှုန်းတစ်စျေးနှုန်း List ကိုဆန့်ကျင်သို့မဟုတ်အားလုံးစျေးနှုန်းစာရင်းများအတွက်လည်းကောင်းလျှောက်ထားနိုင်ပါသည်။
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,လျော့စျေးရာခိုင်နှုန်းတစ်စျေးနှုန်း List ကိုဆန့်ကျင်သို့မဟုတ်အားလုံးစျေးနှုန်းစာရင်းများအတွက်လည်းကောင်းလျှောက်ထားနိုင်ပါသည်။
 DocType: Purchase Invoice,Half-yearly,ဝက်နှစ်စဉ်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,စတော့အိတ်သည်စာရင်းကိုင် Entry &#39;
 DocType: Vehicle Service,Engine Oil,အင်ဂျင်ပါဝါရေနံ
 DocType: Sales Invoice,Sales Team1,အရောင်း Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,item {0} မတည်ရှိပါဘူး
 DocType: Sales Invoice,Customer Address,customer လိပ်စာ
 DocType: Employee Loan,Loan Details,ချေးငွေအသေးစိတ်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,အတန်း {0}: Completed အရည်အတွက်သုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
@@ -2683,24 +2686,24 @@
 DocType: Account,Root Type,အမြစ်ကအမျိုးအစား
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},row # {0}: {1} Item သည် {2} ထက်ပိုမပြန်နိုင်သလား
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,မွေကှကျ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,မွေကှကျ
 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} သည်မသင်မနေရ
 DocType: Cheque Print Template,Primary Settings,မူလတန်းက Settings
 DocType: Purchase Invoice,Select Supplier Address,ပေးသွင်းလိပ်စာကို Select လုပ်ပါ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ဝန်ထမ်းများ Add
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ဝန်ထမ်းများ Add
 DocType: Purchase Invoice Item,Quality Inspection,အရည်အသွေးအစစ်ဆေးရေး
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,အပိုအသေးစား
 DocType: Company,Standard Template,စံ Template
 DocType: Training Event,Theory,သဘောတရား
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,သတိပေးချက်: Qty တောင်းဆိုထားသောပစ္စည်းအနည်းဆုံးအမိန့် Qty ထက်နည်းသော
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,အကောင့်ကို {0} အေးခဲသည်
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,အဖွဲ့ပိုင်ငွေစာရင်း၏သီးခြားဇယားနှင့်အတူဥပဒေကြောင်းအရ Entity / လုပ်ငန်းခွဲများ။
 DocType: Payment Request,Mute Email,အသံတိတ်အီးမေးလ်
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","အစားအစာ, Beverage &amp; ဆေးရွက်ကြီး"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},သာ unbilled {0} ဆန့်ကျင်ငွေပေးချေမှုကိုဖြစ်စေနိုင်ပါတယ်
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,ကော်မရှင်နှုန်းက 100 မှာထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,ပထမဦးဆုံး {0} မဝင်ရ ကျေးဇူးပြု.
@@ -2740,7 +2743,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,လက်ရှိငွေပေးငွေယူနှင့်အတူဂိုဒေါင်အုပ်စုအဖြစ်ပြောင်းလဲမရနိုင်ပါ။
 DocType: Assessment Result Tool,Result HTML,ရလဒ်က HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,တွင်သက်တမ်းကုန်ဆုံးမည်
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,ကျောင်းသားများ Add
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,ကျောင်းသားများ Add
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},{0} ကို select ကျေးဇူးပြု.
 DocType: C-Form,C-Form No,C-Form တွင်မရှိပါ
 DocType: BOM,Exploded_items,Exploded_items
@@ -2783,7 +2786,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder အဆင့်
 DocType: Company,Chart Of Accounts Template,Accounts ကို Template ၏ဇယား
 DocType: Attendance,Attendance Date,တက်ရောက်သူနေ့စွဲ
@@ -2798,14 +2801,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,entry ကို Duplicate
 DocType: Program Enrollment Tool,Get Students,ကျောင်းသားများ get
 DocType: Serial No,Under Warranty,အာမခံအောက်မှာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[အမှား]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[အမှား]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,သင်အရောင်းအမိန့်ကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 ,Employee Birthday,ဝန်ထမ်းမွေးနေ့
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ကျောင်းသားအသုတ်လိုက်တက်ရောက် Tool ကို
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,ကန့်သတ်ဖြတ်ကူး
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,အကျိုးတူ Capital ကို
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ဒီ &#39;&#39; ပညာရေးတစ်နှစ်တာ &#39;&#39; {0} နှင့် {1} ပြီးသားတည်ရှိ &#39;&#39; Term အမည် &#39;&#39; နှင့်အတူတစ်ဦးပညာသင်နှစ်သက်တမ်း။ ဤအ entries တွေကိုပြုပြင်မွမ်းမံခြင်းနှင့်ထပ်ကြိုးစားပါ။
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","ကို item {0} ဆန့်ကျင်တည်ဆဲအရောင်းအရှိဖြစ်သကဲ့သို့, သင်က {1} ၏တန်ဖိုးမပြောင်းနိုင်ပါ"
 DocType: UOM,Must be Whole Number,လုံးနံပါတ်ဖြစ်ရမည်
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(Days ခုနှစ်တွင်) ခွဲဝေနယူးရွက်
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,serial No {0} မတည်ရှိပါဘူး
@@ -2825,7 +2828,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,ဒီအရောင်းအမိန့်ဆန့်ကျင်ကြေညာတဲ့ပစ္စည်း%
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ကာလသင်တန်းဆင်းပွဲ Entry &#39;
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကအုပ်စုအဖြစ်ပြောင်းလဲမပြနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},ငွေပမာဏ {0} {1} {2} {3}
 DocType: Account,Depreciation,တန်ဖိုး
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ပေးသွင်းသူ (များ)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ဝန်ထမ်းတက်ရောက် Tool ကို
@@ -2849,7 +2852,7 @@
 DocType: Supplier,Last Day of the Next Month,နောက်လ၏နောက်ဆုံးနေ့
 DocType: Support Settings,Auto close Issue after 7 days,7 ရက်အတွင်းအပြီးအော်တိုအနီးကပ်ပြဿနာ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ခွင့်ချိန်ခွင်လျှာထားပြီးအနာဂတ်ခွင့်ခွဲဝေစံချိန် {1} အတွက် PPP ဖြင့်ချဉ်းကပ်-forward နိုင်သည်သိရသည်အဖြစ် Leave, {0} မီကခွဲဝေမရနိုငျ"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),မှတ်ချက်: ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} တနေ့ (များ) ကခွင့်ပြုဖောက်သည်အကြွေးရက်ပတ်လုံးထက်ကျော်လွန်
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ကျောင်းသားသမဂ္ဂလျှောက်ထားသူ
 DocType: Asset Category Account,Accumulated Depreciation Account,စုဆောင်းတန်ဖိုးအကောင့်
 DocType: Stock Settings,Freeze Stock Entries,အေးစတော့အိတ် Entries
@@ -2860,7 +2863,7 @@
 ,Stock Analytics,စတော့အိတ် Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,စစ်ဆင်ရေးအလွတ်ကျန်ရစ်မရနိုငျ
 DocType: Maintenance Visit Purpose,Against Document Detail No,Document ဖိုင် Detail မရှိဆန့်ကျင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,ပါတီအမျိုးအစားမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,ပါတီအမျိုးအစားမဖြစ်မနေဖြစ်ပါသည်
 DocType: Quality Inspection,Outgoing,outgoing
 DocType: Material Request,Requested For,အကြောင်းမူကားမေတ္တာရပ်ခံ
 DocType: Quotation Item,Against Doctype,DOCTYPE ဆန့်ကျင်
@@ -2877,11 +2880,11 @@
 DocType: Asset,Item Code,item Code ကို
 DocType: Production Planning Tool,Create Production Orders,ထုတ်လုပ်မှုအမိန့် Create
 DocType: Serial No,Warranty / AMC Details,အာမခံ / AMC အသေးစိတ်ကို
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,ယင်းလုပ်ဆောင်ချက်ကိုအခြေခံပြီး Group မှအဘို့ကို manually ကျောင်းသားများကိုကို Select လုပ်ပါ
 DocType: Journal Entry,User Remark,အသုံးပြုသူမှတ်ချက်
 DocType: Lead,Market Segment,Market မှာအပိုင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Paid ငွေပမာဏစုစုပေါင်းအနုတ်ထူးချွန်ငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 DocType: Employee Internal Work History,Employee Internal Work History,ဝန်ထမ်းပြည်တွင်းလုပ်ငန်းခွင်သမိုင်း
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),(ဒေါက်တာ) ပိတ်ပွဲ
 DocType: Cheque Print Template,Cheque Size,Cheque တစ်စောင်လျှင် Size ကို
@@ -2897,7 +2900,7 @@
 DocType: Production Planning Tool,Create Material Requests,ပစ္စည်းတောင်းဆို Create
 DocType: Employee Education,School/University,ကျောင်း / တက္ကသိုလ်က
 DocType: Payment Request,Reference Details,ကိုးကားစရာ Details ကို
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,အသုံးဝင်သောဘဝပြီးနောက်မျှော်လင့်ထားသည့် Value တစ်ခုစုစုပေါင်းအရစ်ကျငွေပမာဏထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Sales Invoice Item,Available Qty at Warehouse,ဂိုဒေါင်ကနေရယူနိုင်ပါတယ် Qty
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,ကြေညာတဲ့ငွေပမာဏ
 DocType: Asset,Double Declining Balance,နှစ်ချက်ကျဆင်းနေ Balance
@@ -2918,20 +2921,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",ဒီစတော့အိတ်ပြန်လည်ရင်ကြားစေ့ရေးတစ်ဦးဖွင့်ပွဲ Entry ဖြစ်ပါတယ်ကတည်းကခြားနားချက်အကောင့်တစ်ခု Asset / ဆိုက်အမျိုးအစားအကောင့်ကိုရှိရမည်
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ထုတ်ချေးငွေပမာဏချေးငွေပမာဏ {0} ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Item {0} လိုအပ်ဝယ်ယူခြင်းအမိန့်အရေအတွက်
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ထုတ်လုပ်မှုအမိန့်နေသူများကဖန်တီးမပေး
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;&#39; နေ့စွဲ မှစ. &#39;&#39; နေ့စွဲရန် &#39;&#39; နောက်မှာဖြစ်ရပါမည်
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ကျောင်းသား {0} ကျောင်းသားလျှောက်လွှာ {1} နှင့်အတူဆက်စပ်အဖြစ်အဆင့်အတန်းမပြောင်းနိုင်သ
 DocType: Asset,Fully Depreciated,အပြည့်အဝတန်ဖိုးလျော့ကျ
 ,Stock Projected Qty,စတော့အိတ် Qty စီမံကိန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},customer {0} {1} သည်စီမံကိန်းပိုင်ပါဘူး
 DocType: Employee Attendance Tool,Marked Attendance HTML,တခုတ်တရတက်ရောက် HTML ကို
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","ကိုးကားအဆိုပြုချက်, သင်သည်သင်၏ဖောက်သည်များစေလွှတ်ပြီလေလံများမှာ"
 DocType: Sales Order,Customer's Purchase Order,customer ရဲ့အမိန့်ကိုဝယ်ယူ
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,serial ဘယ်သူမျှမကနှင့်အသုတ်လိုက်
 DocType: Warranty Claim,From Company,ကုမ္ပဏီအနေဖြင့်
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,အကဲဖြတ်လိုအပ်ချက်များ၏ရမှတ်များပေါင်းလဒ် {0} ဖြစ်ရန်လိုအပ်ပါသည်။
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Value တစ်ခုသို့မဟုတ် Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions အမိန့်သည်အထမြောက်စေတော်မရနိုင်သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,မိနစ်
 DocType: Purchase Invoice,Purchase Taxes and Charges,အခွန်နှင့်စွပ်စွဲချက်ယ်ယူ
@@ -2944,7 +2947,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,အားလုံးသိုလှောင်ရုံ
 DocType: Sales Partner,Retailer,လက်လီအရောင်းဆိုင်
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,အကောင့်ကိုရန်အကြွေးတစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,အားလုံးသည်ပေးသွင်းအမျိုးအစားများ
 DocType: Global Defaults,Disable In Words,စကားထဲမှာ disable
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,Item တွေကိုအလိုအလျောက်နံပါတ်အမကဘယ်ကြောင့်ဆိုသော် item Code ကိုမသင်မနေရ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},{0} မဟုတ်အမျိုးအစားစျေးနှုန်း {1}
@@ -2953,6 +2956,7 @@
 DocType: Production Order,PRO-,လုံးတွင်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,ဘဏ်မှ Overdraft အကောင့်
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,လစာစလစ်ဖြတ်ပိုင်းပုံစံလုပ်ပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,အတန်း # {0}: ခွဲဝေငွေပမာဏထူးချွန်ငွေပမာဏထက် သာ. ကြီးမြတ်မဖြစ်နိုင်ပါ။
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Browse ကို BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,လုံခြုံသောချေးငွေ
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit ကို Post date နှင့်အချိန်
@@ -2992,7 +2996,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} ထက်အသက်အရွယ်ကြီးစတော့ရှယ်ယာအရောင်းအ update လုပ်ဖို့ခွင့်မပြု
 DocType: Purchase Invoice Item,PR Detail,PR စနစ် Detail
 DocType: Sales Order,Fully Billed,အပြည့်အဝကြေညာ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},အလုပျသမား {0} အတွက် default အနေနဲ့ပေးဆောင်အကောင့်ကိုသတ်မှတ်ပေးပါ
 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 +127,Delivery warehouse required for stock item {0},စတော့ရှယ်ယာကို item {0} များအတွက်လိုအပ်သော delivery ဂိုဒေါင်
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),အထုပ်၏စုစုပေါင်းအလေးချိန်။ ပိုက်ကွန်ကိုအလေးချိန် + ထုပ်ပိုးပစ္စည်းအလေးချိန်များသောအားဖြင့်။ (ပုံနှိပ်သည်)
@@ -3003,7 +3006,7 @@
 DocType: Student Group,Group Based On,Group မှအခြေပြုတွင်
 DocType: Journal Entry,Bill Date,ဘီလ်နေ့စွဲ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service ကိုပစ္စည်း, အမျိုးအစား, ကြိမ်နှုန်းနှင့်စရိတ်ငွေပမာဏကိုလိုအပ်သည်"
-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:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","အမြင့်ဆုံးဦးစားပေးနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်တောင်မှလျှင်, အောက်ပါပြည်တွင်းရေးဦးစားပေးလျှောက်ထားနေကြပါတယ်:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},သင်အမှန်တကယ် {0} ကနေ {1} ဖို့အားလုံးကိုလစာစလစ်ဖြတ်ပိုင်းပုံစံ Submit ချင်ပါနဲ့
 DocType: Cheque Print Template,Cheque Height,Cheque တစ်စောင်လျှင်အမြင့်
 DocType: Supplier,Supplier Details,ပေးသွင်းအသေးစိတ်ကို
@@ -3015,7 +3018,7 @@
 DocType: Vehicle Log,Invoice Ref,ငွေတောင်းခံလွှာ Ref
 DocType: Purchase Order,Recurring Order,ထပ်တလဲလဲအမိန့်
 DocType: Company,Default Income Account,default ဝင်ငွေခွန်အကောင့်
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,ဖောက်သည်အုပ်စု / ဖောက်သည်
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),မပိတ်ထားသည့်ဘဏ္ဍာရေးနှစ်တွင်အမြတ် / ပျောက်ဆုံးခြင်းစဉ် (Credit)
 DocType: Sales Invoice,Time Sheets,အချိန် Sheet များ
 DocType: Payment Gateway Account,Default Payment Request Message,Default အနေနဲ့ငွေပေးချေမှုရမည့်တောင်းဆိုခြင်းကို Message
@@ -3035,10 +3038,10 @@
 DocType: Notification Control,Quotation Message,စျေးနှုန်း Message
 DocType: Employee Loan,Employee Loan Application,ဝန်ထမ်းချေးငွေလျှောက်လွှာ
 DocType: Issue,Opening Date,နေ့စွဲဖွင့်လှစ်
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,တက်ရောက်သူအောင်မြင်စွာမှတ်လိုက်ပါပြီ။
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,တက်ရောက်သူအောင်မြင်စွာမှတ်လိုက်ပါပြီ။
 DocType: Journal Entry,Remark,ပွောဆို
 DocType: Purchase Receipt Item,Rate and Amount,rate နှင့်ငွေပမာဏ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},{0} ဘို့အကောင့်အမျိုးအစားဖြစ်ရပါမည် {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},{0} ဘို့အကောင့်အမျိုးအစားဖြစ်ရပါမည် {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,အရွက်များနှင့်အားလပ်ရက်
 DocType: School Settings,Current Academic Term,လက်ရှိပညာရေးဆိုင်ရာ Term
 DocType: School Settings,Current Academic Term,လက်ရှိပညာရေးဆိုင်ရာ Term
@@ -3061,7 +3064,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ကျောင်းသားအုပ်စု
 DocType: Shopping Cart Settings,Quotation Series,စျေးနှုန်းစီးရီး
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","တစ်ဦးကို item နာမည်တူ ({0}) နှင့်အတူရှိနေတယ်, ပစ္စည်းအုပ်စုအမည်ကိုပြောင်းလဲသို့မဟုတ်ပစ္စည်းကိုအမည်ပြောင်းကျေးဇူးတင်ပါ"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,ဖောက်သည်ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: C-Form,I,ငါ
 DocType: Company,Asset Depreciation Cost Center,ပိုင်ဆိုင်မှုတန်ဖိုးကုန်ကျစရိတ်စင်တာ
 DocType: Sales Order Item,Sales Order Date,အရောင်းအမှာစာနေ့စွဲ
@@ -3080,20 +3083,20 @@
 DocType: Vehicle,Insurance Details,အာမခံအသေးစိတ်
 DocType: Account,Payable,ပေးအပ်သော
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ပြန်ဆပ်ကာလကိုရိုက်ထည့်ပေးပါ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ကိုက် ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ကိုက် ({0})
 DocType: Pricing Rule,Margin,margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,နယူး Customer များ
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,စုစုပေါင်းအမြတ်%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,ရှင်းလင်းရေးနေ့စွဲ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,စုစုပေါင်းအရစ်ကျငွေပမာဏမဖြစ်မနေဖြစ်ပါသည်
 DocType: Lead,Address Desc,Desc လိပ်စာ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ပါတီမဖြစ်မနေဖြစ်ပါသည်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,ပါတီမဖြစ်မနေဖြစ်ပါသည်
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ခေါင်းစဉ်အမည်
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,ရောင်းစျေးသို့မဟုတ်ဝယ်ယူ၏ Atleast တယောက်ရွေးချယ်ထားရမည်ဖြစ်သည်
-DocType: Grading Structure,Grade Intervals,grade Interval
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,သင့်ရဲ့စီးပွားရေးလုပ်ငန်း၏သဘောသဘာဝကို Select လုပ်ပါ။
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},အတန်း # {0}: ကိုးကား {1} {2} အတွက်မိတ္တူပွား entry ကို
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,အဘယ်မှာရှိကုန်ထုတ်လုပ်မှုလုပ်ငန်းများကိုသယ်ဆောင်ကြသည်။
 DocType: Asset Movement,Source Warehouse,source ဂိုဒေါင်
 DocType: Installation Note,Installation Date,Installation လုပ်တဲ့နေ့စွဲ
@@ -3130,7 +3133,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ပုံနှိပ်တင်းပလိတ်များအဘို့အပေးစာခေါင်းဆောင်များ။
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ပုံနှိပ်တင်းပလိတ်များသည်ခေါင်းစဉ်များငွေလွှဲစာတမ်းတန်ဖိုးပြေစာဥပမာ။
 DocType: Student Guardian,Student Guardian,ကျောင်းသားသမဂ္ဂဂါးဒီးယန်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,အဘိုးပြတ်သည်အတိုင်း type ကိုစွဲချက် Inclusive အဖြစ်မှတ်သားမရပါဘူး
 DocType: POS Profile,Update Stock,စတော့အိတ် Update
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,ပစ္စည်းများသည်ကွဲပြားခြားနားသော UOM မမှန်ကန် (Total) Net ကအလေးချိန်တန်ဖိုးကိုဆီသို့ဦးတည်ပါလိမ့်မယ်။ အသီးအသီးကို item ၏ Net ကအလေးချိန်တူညီ UOM အတွက်ကြောင်းသေချာပါစေ။
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3158,7 +3161,7 @@
 DocType: Company,Exchange Gain / Loss Account,ချိန်း Gain / ပျောက်ဆုံးခြင်းအကောင့်
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ဝန်ထမ်းနှင့်တက်ရောက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ရည်ရွယ်ချက် {0} တယောက်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,ပုံစံဖြည့်ခြင်းနှင့်ကယ်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,ကွန်မြူနတီဖိုရမ်၏
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,စတော့ရှယ်ယာအတွက်အမှန်တကယ်အရည်အတွက်
@@ -3174,7 +3177,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,လက်ရှိယောဘသည်င့်
 DocType: Company,Stock Adjustment Account,စတော့အိတ်ချိန်ညှိအကောင့်
-DocType: Journal Entry,Write Off,အကြွေးလျှော်ပစ်ခြင်း
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,အကြွေးလျှော်ပစ်ခြင်း
 DocType: Timesheet Detail,Operation ID,စစ်ဆင်ရေး ID ကို
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System ကိုအသုံးပြုသူ (login လုပ်လို့ရပါတယ်) ID ကို။ ထားလျှင်, အားလုံး HR ပုံစံများသည် default အဖြစ်လိမ့်မည်။"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} မှစ.
@@ -3185,27 +3188,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ပေးသွင်းဖောက်သည်မှကယ်တင်
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form ကို / ပစ္စည်း / {0}) စတော့ရှယ်ယာထဲကဖြစ်ပါတယ်
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Next ကိုနေ့စွဲနေ့စွဲပို့စ်တင်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show ကိုအခွန်ချိုး-up က
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Show ကိုအခွန်ချိုး-up က
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},ကြောင့် / ကိုးကားစရာနေ့စွဲ {0} ပြီးနောက်မဖွစျနိုငျ
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ဒေတာပို့ကုန်သွင်းကုန်
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","စတော့အိတ် entries တွေကိုသွားတော့သင် re-assign သို့မဟုတ်ပါကပြုပြင်မွမ်းမံလို့မရပါဘူး, ဂိုဒေါင် {0} ဆန့်ကျင်တည်ရှိ"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ကျောင်းသားများကို Found ဘယ်သူမျှမက
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ကျောင်းသားများကို Found ဘယ်သူမျှမက
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ငွေတောင်းခံလွှာ Post date
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,ရောင်းချ
 DocType: Sales Invoice,Rounded Total,rounded စုစုပေါင်း
 DocType: Product Bundle,List items that form the package.,အထုပ်ဖွဲ့စည်းကြောင်းပစ္စည်းများစာရင်း။
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ရာခိုင်နှုန်းဖြန့်ဝေ 100% နဲ့ညီမျှဖြစ်သင့်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,ပါတီမရွေးခင် Post date ကို select လုပ်ပါကျေးဇူးပြုပြီး
 DocType: Program Enrollment,School House,School တွင်အိမ်
 DocType: Serial No,Out of AMC,AMC ထဲက
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,ကိုးကားချက်များကို select ပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,ကြိုတင်ဘွတ်ကင်တန်ဖိုးအရေအတွက်တန်ဖိုးစုစုပေါင်းအရေအတွက်ထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maintenance ကိုအလည်တစ်ခေါက်လုပ်ပါ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,အရောင်းမဟာ Manager က {0} အခန်းကဏ္ဍကိုသူအသုံးပြုသူမှဆက်သွယ်ပါ
 DocType: Company,Default Cash Account,default ငွေအကောင့်
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,ကုမ္ပဏီ (မဖောက်သည်သို့မဟုတ်ပေးသွင်းသူ) သခင်သည်။
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ဒီကျောင်းသားသမဂ္ဂများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,မကျောင်းသားများ
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,ပိုပြီးပစ္စည်းသို့မဟုတ်ဖွင့်အပြည့်အဝ form ကို Add
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;&#39; မျှော်မှန်း Delivery Date ကို &#39;&#39; ကိုရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Delivery မှတ်စုများ {0} ဒီအရောင်းအမိန့်ကိုပယ်ဖျက်မီဖျက်သိမ်းရပါမည်
@@ -3237,6 +3241,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,item 3
 DocType: Purchase Order,Customer Contact Email,customer ဆက်သွယ်ရန်အီးမေးလ်
 DocType: Warranty Claim,Item and Warranty Details,item နှင့်အာမခံအသေးစိတ်
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,item Code ကို&gt; item Group မှ&gt; အမှတ်တံဆိပ်
 DocType: Sales Team,Contribution (%),contribution (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,မှတ်ချက်: &#39;&#39; ငွေသို့မဟုတ်ဘဏ်မှအကောင့် &#39;&#39; သတ်မှတ်ထားသောမဟုတ်ခဲ့ကတည်းကငွေပေးချေမှုရမည့် Entry နေသူများကဖန်တီးမည်မဟုတ်
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,မဖြစ်မနေသင်တန်းများဆွဲယူဖို့အစီအစဉ်ကိုရွေးချယ်ပါ။
@@ -3252,9 +3257,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ပြန်လည်သင့်မြတ်ရေးမဖြစ်မီ
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} မှ
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Added အခွန်အခများနှင့်စွပ်စွဲချက် (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,item ခွန် Row {0} type ကိုခွန်သို့မဟုတ်ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုသို့မဟုတ်နှော၏အကောင့်ကိုရှိရမယ်
 DocType: Sales Order,Partly Billed,တစ်စိတ်တစ်ပိုင်းကြေညာ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,item {0} တစ် Fixed Asset item ဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,item {0} တစ် Fixed Asset item ဖြစ်ရပါမည်
 DocType: Item,Default BOM,default BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,အတည်ပြုရန်ကုမ္ပဏီ၏နာမ-type ကိုပြန်လည် ကျေးဇူးပြု.
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,စုစုပေါင်းထူးချွန် Amt
@@ -3264,8 +3269,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,မော်တော်ယာဉ်
 DocType: Vehicle,Insurance Company,အာမခံကုမ္ပဏီ
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset အကောင့်
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ပွောငျးလဲတတျသော
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Delivery မှတ်ချက်ထံမှ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ပွောငျးလဲတတျသော
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Delivery မှတ်ချက်ထံမှ
 DocType: Student,Student Email Address,ကျောင်းသားအီးမေးလ်လိပ်စာ
 DocType: Timesheet Detail,From Time,အချိန်ကနေ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ကုန်ပစ္စည်းလက်ဝယ်ရှိ:
@@ -3277,12 +3282,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,စျေးနှုန်း List ကိုချိန်း Rate
 DocType: Purchase Invoice Item,Rate,rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,အလုပ်သင်ဆရာဝန်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,လိပ်စာအမည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,လိပ်စာအမည်
 DocType: Stock Entry,From BOM,BOM ကနေ
 DocType: Assessment Code,Assessment Code,အကဲဖြတ် Code ကို
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,အခြေခံပညာ
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} အေးခဲနေကြပါတယ်စတော့အိတ်အရောင်းအမီ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;&#39; Generate ဇယား &#39;&#39; ကို click ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ဥပမာကီလို, ယူနစ်, အမှတ်, ဍ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ရည်ညွန်းသင်ကိုးကားစရာနေ့စွဲသို့ဝင်လျှင်အဘယ်သူမျှမသင်မနေရ
 DocType: Bank Reconciliation Detail,Payment Document,ငွေပေးချေမှုရမည့်စာရွက်စာတမ်း
@@ -3290,19 +3295,19 @@
 DocType: Salary Slip,Salary Structure,လစာဖွဲ့စည်းပုံ
 DocType: Account,Bank,ကမ်း
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,လကွောငျး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ပြဿနာပစ္စည်း
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ပြဿနာပစ္စည်း
 DocType: Material Request Item,For Warehouse,ဂိုဒေါင်အကြောင်းမူကား
 DocType: Employee,Offer Date,ကမ်းလှမ်းမှုကိုနေ့စွဲ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ကိုးကား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,သငျသညျအော့ဖ်လိုင်း mode မှာရှိပါတယ်။ သငျသညျကှနျယရှိသည်သည်အထိသင်ပြန်ဖွင့်နိုင်ပါလိမ့်မည်မဟုတ်။
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,အဘယ်သူမျှမကျောင်းသားသမဂ္ဂအဖွဲ့များကိုဖန်တီးခဲ့တယ်။
 DocType: Purchase Invoice Item,Serial No,serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,လစဉ်ပြန်ဆပ်ငွေပမာဏချေးငွေပမာဏထက် သာ. ကြီးမြတ်မဖွစျနိုငျ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince အသေးစိတ်ပထမဦးဆုံးရိုက်ထည့်ပေးပါ
 DocType: Purchase Invoice,Print Language,ပုံနှိပ်ပါဘာသာစကားများ
 DocType: Salary Slip,Total Working Hours,စုစုပေါင်းအလုပ်အဖွဲ့နာရီ
 DocType: Stock Entry,Including items for sub assemblies,ခွဲများအသင်းတော်တို့အဘို့ပစ္စည်းများအပါအဝင်
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,တန်ဖိုးအားအပြုသဘောဆောင်သူဖြစ်ရမည် Enter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,အားလုံးသည် Territories
 DocType: Purchase Invoice,Items,items
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ကျောင်းသားသမဂ္ဂပြီးသားစာရင်းသွင်းသည်။
@@ -3322,17 +3327,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant များအတွက်တိုင်း၏ default အနေနဲ့ Unit မှ &#39;&#39; {0} &#39;&#39; Template: ထဲမှာရှိသကဲ့သို့တူညီသူဖြစ်ရမည် &#39;&#39; {1} &#39;&#39;
 DocType: Shipping Rule,Calculate Based On,အခြေတွင်တွက်ချက်
 DocType: Delivery Note Item,From Warehouse,ဂိုဒေါင်ထဲကနေ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများ၏ဘီလ်နှင့်အတူပစ္စည်းများအဘယ်သူမျှမ
 DocType: Assessment Plan,Supervisor Name,ကြီးကြပ်ရေးမှူးအမည်
 DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
 DocType: Program Enrollment Course,Program Enrollment Course,Program ကိုကျောင်းအပ်သင်တန်းအမှတ်စဥ်
-DocType: Grading Structure,Grading Structure,grade ဖွဲ့စည်းပုံ
 DocType: Purchase Taxes and Charges,Valuation and Total,အဘိုးပြတ်နှင့်စုစုပေါင်း
 DocType: Tax Rule,Shipping City,သဘောင်္တင်ခစီးတီး
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,ထိုအမိန့်ကြော်ငြာစာ Customize
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,စစ်ဆင်ရေးအနေဖြင့်ငွေသားဖြင့် Flow
 DocType: Sales Invoice,Shipping Rule,သဘောင်္တင်ခ Rule
@@ -3353,8 +3356,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},BOM Item {0} သည်တည်ရှိမရှိပါက default
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Post date ပထမဦးဆုံးကိုရွေးပါ ကျေးဇူးပြု.
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,နေ့စွဲဖွင့်လှစ်နေ့စွဲပိတ်ပြီးမတိုင်မှီဖြစ်သင့်
 DocType: Leave Control Panel,Carry Forward,Forward သယ်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,လက်ရှိအရောင်းအနှင့်အတူကုန်ကျစရိတ် Center ကလယ်ဂျာမှပြောင်းလဲမပြနိုင်
 DocType: Department,Days for which Holidays are blocked for this department.,အားလပ်ရက်ဒီဌာနကိုပိတ်ဆို့ထားသောနေ့ရကျ။
@@ -3367,7 +3370,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Letterhead Attach
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,နောက်ဆုံးဆက်သွယ်ရေး
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,နောက်ဆုံးဆက်သွယ်ရေး
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည်နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏သောအခါအနှိမ်မချနိုင်
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","သင့်ရဲ့အခှနျဦးခေါင်းစာရင်း (ဥပမာ VAT, အကောက်ခွန်စသည်တို့ကိုကြ၏ထူးခြားသောအမည်များရှိသင့်) နှင့်သူတို့၏စံနှုန်းထားများ။ ဒါဟာသင်တည်းဖြတ်များနှင့်ပိုမိုအကြာတွင်ထည့်နိုင်သည်ဟူသောတစ်ဦးစံ template တွေဖန်တီးပေးလိမ့်မည်။"
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Serial Item {0} သည် serial အမှတ်လိုအပ်ပါသည်
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ငွေတောင်းခံလွှာနှင့်အတူပွဲစဉ်ငွေပေးချေ
@@ -3383,7 +3386,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),စုစုပေါင်း (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment က &amp; Leisure
 DocType: Quality Inspection,Item Serial No,item Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ထမ်းမှတ်တမ်း Create
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ထမ်းမှတ်တမ်း Create
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,စုစုပေါင်းလက်ရှိ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,စာရင်းကိုင်ဖော်ပြချက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,နာရီ
@@ -3396,10 +3399,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,အမည်မသိ
 DocType: Shipping Rule,Shipping Rule Conditions,သဘောင်္တင်ခ Rule စည်းကမ်းချက်များ
 DocType: BOM Replace Tool,The new BOM after replacement,အစားထိုးပြီးနောက်အသစ် BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,ရောင်းမည်၏ပွိုင့်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,ရောင်းမည်၏ပွိုင့်
 DocType: Payment Entry,Received Amount,ရရှိထားသည့်ငွေပမာဏ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,လူ့စွမ်းအားအရင်းအမြစ်အတွက် System ကိုအမည်ဖြင့်သမုတ် ကျေးဇူးပြု. setup ကိုထမ်း&gt; HR က Settings
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","အမိန့်အပေါ်ပြီးသားအရေအတွက်လျစ်လျူရှု, အပြည့်အဝအရေအတွက်အဘို့အ Create"
 DocType: Account,Tax,အခွန်
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,မှတ်သားရန်မ
@@ -3412,9 +3413,9 @@
 DocType: Batch,Source Document Name,source စာရွက်စာတမ်းအမည်
 DocType: Batch,Source Document Name,source စာရွက်စာတမ်းအမည်
 DocType: Job Opening,Job Title,အလုပ်အကိုင်အမည်
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,အသုံးပြုသူများ Create
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,အသုံးပြုသူများ Create
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ဂရမ်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ထုတ်လုပ်ခြင်းမှအရေအတွက်ပါ 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်။
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,ပြုပြင်ထိန်းသိမ်းမှုခေါ်ဆိုမှုအစီရင်ခံစာသွားရောက်ခဲ့ကြသည်။
 DocType: Stock Entry,Update Rate and Availability,နှုန်းနှင့် Available Update
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ရာခိုင်နှုန်းသင်အမိန့်ကိုဆန့်ကျင်အရေအတွက်ပိုမိုလက်ခံရယူသို့မဟုတ်ကယ်လွှတ်ခြင်းငှါခွင့်ပြုထားပါသည်။ ဥပမာ: သင်က 100 ယူနစ်အမိန့်ရပြီဆိုပါက။ နှင့်သင်၏ Allow သင် 110 ယူနစ်ကိုခံယူခွင့်ရနေကြပြီးတော့ 10% ဖြစ်ပါတယ်။
@@ -3424,28 +3425,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},စရိတ် account item ကို {0} သည်မသင်မနေရ
 DocType: BOM,Website Description,website ဖော်ပြချက်များ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Equity အတွက်ပိုက်ကွန်ကိုပြောင်းရန်
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,ပထမဦးဆုံးဝယ်ယူငွေတောင်းခံလွှာ {0} ဖျက်သိမ်းပေးပါ
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Email လိပ်စာထူးခြားတဲ့သူဖြစ်ရမည်, ပြီးသား {0} များအတွက်တည်ရှိ"
 DocType: Serial No,AMC Expiry Date,AMC သက်တမ်းကုန်ဆုံးသည့်ရက်စွဲ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ပွေစာ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ပွေစာ
 ,Sales Register,အရောင်းမှတ်ပုံတင်မည်
 DocType: Daily Work Summary Settings Company,Send Emails At,မှာထားတဲ့အီးမေးလ်ပို့ပါ
 DocType: Quotation,Quotation Lost Reason,စျေးနှုန်းပျောက်ဆုံးသွားသောအကြောင်းရင်း
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,သင့်ရဲ့ဒိုမိန်းကို Select လုပ်ပါ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ငွေသွင်းငွေထုတ်ရည်ညွှန်းမရှိ {0} {1} ရက်စွဲပါ
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,တည်းဖြတ်ရန်မရှိပါ။
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ဒီလအတှကျအကျဉ်းချုပ်နှင့် Pend လှုပ်ရှားမှုများ
 DocType: Customer Group,Customer Group Name,ဖောက်သည်အုပ်စုအမည်
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,မရှိသေးပါဖောက်သည်!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,ငွေသား Flow ဖော်ပြချက်
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ချေးငွေပမာဏ {0} အများဆုံးချေးငွေပမာဏထက်မပိုနိုင်
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,လိုင်စင်
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-Form တွင် {1} ကနေဒီပြေစာ {0} ကိုဖယ်ရှား ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,အကောင့်ပိတ်ရေးထားရိုက်ထည့်ပေးပါ
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,နောက်ဆုံးအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},အကောင့်ကို {0} ကုမ္ပဏီ {1} ပိုင်ပါဘူး
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,အတန်းအတွက် serial နံပါတ် {0} Delivery မှတ်ချက်နှင့်အတူမကိုက်ညီ
 DocType: Student,Guardian Details,ဂါးဒီးယန်းအသေးစိတ်
 DocType: C-Form,C-Form,C-Form တွင်
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,မျိုးစုံန်ထမ်းများအတွက်မာကုတက်ရောက်
@@ -3470,20 +3473,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',အတန်း {0} # အကောင့်အမျိုးအစားဖြစ်ရပါမည် &#39;&#39; Fixed Asset &#39;&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qty out
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ရောင်းချမှုသည်ရေကြောင်းပမာဏကိုတွက်ချက်ရန်စည်းမျဉ်းများ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,စီးရီးမသင်မနေရ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,စီးရီးမသင်မနေရ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ဘဏ္ဍာရေးန်ဆောင်မှုများ
 DocType: Student Sibling,Student ID,ကျောင်းသား ID ကို
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,အချိန်မှတ်တမ်းများအဘို့အလှုပ်ရှားမှုများအမျိုးအစားများ
 DocType: Tax Rule,Sales,အရောင်း
 DocType: Stock Entry Detail,Basic Amount,အခြေခံပညာပမာဏ
 DocType: Training Event,Exam,စာမေးပွဲ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},စတော့ရှယ်ယာ Item {0} လိုအပ်ဂိုဒေါင်
 DocType: Leave Allocation,Unused leaves,အသုံးမပြုသောအရွက်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,ငွေတောင်းခံပြည်နယ်
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,လွှဲပြောင်း
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ပါတီအကောင့် {2} နှင့်ဆက်စပ်ပါဘူး
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ပါတီအကောင့် {2} နှင့်ဆက်စပ်ပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(Sub-အသင်းတော်များအပါအဝင်) ပေါက်ကွဲခဲ့ BOM Fetch
 DocType: Authorization Rule,Applicable To (Employee),(န်ထမ်း) ရန်သက်ဆိုင်သော
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,ကြောင့်နေ့စွဲမသင်မနေရ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute {0} ပါ 0 င်မဖွစျနိုငျဘို့ increment
@@ -3494,13 +3497,13 @@
 ,Inactive Customers,မလှုပ်မရှား Customer များ
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ဝယ်ယူလက်ခံ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ဘယ်လိုစျေးနှုန်းများ Rule လျှောက်ထားသလဲ?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ဘယ်လိုစျေးနှုန်းများ Rule လျှောက်ထားသလဲ?
 DocType: Stock Entry,Delivery Note No,Delivery မှတ်ချက်မရှိပါ
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","check လုပ်ထားပါက, သာအပြီးသတ်ကုန်ကြမ်းများအတွက်ပစ္စည်းကိုတောင်းဆိုမှုများကိုဝယ်ယူထိုပစ္စည်းတောင်းဆိုချက်များတွင်ထည့်သွင်းပါလိမ့်မည်။ ဒီလိုမှမဟုတ်ရင်, မိဘပစ္စည်းသည်အပစ္စည်းတောင်းဆိုချက်များနေသူများကဖန်တီးလိမ့်မည်"
 DocType: Cheque Print Template,Message to show,ပြသနိုင်ဖို့ကို Message
 DocType: Company,Retail,လက်လီ
 DocType: Attendance,Absent,မရှိသော
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကို
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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:
@@ -3510,10 +3513,10 @@
 DocType: Payment Entry,Account Paid From,ကနေ Paid အကောင့်
 DocType: Purchase Order Item Supplied,Raw Material Item Code,ကုန်ကြမ်းပစ္စည်း Code ကို
 DocType: Journal Entry,Write Off Based On,အခြေတွင်ပိတ်ရေးထား
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ခဲ Make
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ခဲ Make
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ပုံနှိပ်နှင့်စာရေးကိရိယာ
 DocType: Stock Settings,Show Barcode Field,Show ကိုဘားကုဒ်ဖျော်ဖြေမှု
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ပေးသွင်းထားတဲ့အီးမေးလ်ပို့ပါ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","လစာပြီးသားဤရက်စွဲအကွာအဝေးအကြားမဖွစျနိုငျ {0} အကြားကာလအတွက်လုပ်ငန်းများ၌နှင့် {1}, လျှောက်လွှာကာလချန်ထားပါ။"
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,တစ် Serial နံပါတ်ထည့်သွင်းခြင်းစံချိန်တင်
 DocType: Guardian Interest,Guardian Interest,ဂါးဒီးယန်းအကျိုးစီးပွား
@@ -3526,6 +3529,7 @@
 DocType: Offer Letter,Awaiting Response,စောင့်ဆိုင်းတုန့်ပြန်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,အထက်
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},မှားနေသော attribute ကို {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Non-စံပေးဆောင်အကောင့်လျှင်ဖော်ပြထားခြင်း
 DocType: Salary Slip,Earning & Deduction,ဝင်ငွေ &amp; ထုတ်ယူ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,optional ။ ဒီ setting ကိုအမျိုးမျိုးသောငွေကြေးလွှဲပြောင်းမှုမှာ filter မှအသုံးပြုလိမ့်မည်။
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,negative အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် Rate ခွင့်မပြု
@@ -3541,10 +3545,9 @@
 DocType: Production Order Item,Production Order Item,ထုတ်လုပ်မှုအမိန့် Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,စံချိန်မျှမတွေ့ပါ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,ဖျက်သိမ်းပိုင်ဆိုင်မှု၏ကုန်ကျစရိတ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,တစ်စိတ်တစ်ပိုင်း ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: ကုန်ကျစရိတ် Center က Item {2} သည်မသင်မနေရ
 DocType: Vehicle,Policy No,ပေါ်လစီအဘယ်သူမျှမ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ထုတ်ကုန်ပစ္စည်း Bundle ကိုထံမှပစ္စည်းများ Get
 DocType: Asset,Straight Line,မျဥ်းဖြောင့်
 DocType: Project User,Project User,Project မှအသုံးပြုသူတို့၏
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ကွဲ
@@ -3562,7 +3565,7 @@
 DocType: Program Enrollment Tool,Get Students From,ကနေကျောင်းသားများ Get
 DocType: Hub Settings,Seller Country,ရောင်းချသူနိုင်ငံ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ဝက်ဘ်ဆိုက်ပေါ်တွင်ပစ္စည်းများ Publish
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,သုတ်ထဲမှာ Group မှသင့်ရဲ့ကျောင်းသားများအတွက်
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,သုတ်ထဲမှာ Group မှသင့်ရဲ့ကျောင်းသားများအတွက်
 DocType: Authorization Rule,Authorization Rule,authorization Rule
 DocType: Sales Invoice,Terms and Conditions Details,စည်းကမ်းသတ်မှတ်ချက်များအသေးစိတ်ကို
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,သတ်မှတ်ချက်များ
@@ -3615,14 +3618,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cheques နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},အကောင့်ကို {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီပိုင်ပါဘူး: {2}
 DocType: Program Enrollment Tool,Student Applicants,ကျောင်းသားသမဂ္ဂလျှောက်ထား
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,အောင်မြင်စွာဒီကုမ္ပဏီနှင့်ဆက်စပ်သောအားလုံးအရောင်းအဖျက်ပြီး!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,နေ့စွဲအပေါ်အဖြစ်
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,ကျောင်းအပ်နေ့စွဲ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,အစမ်းထား
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,လစာ Components
 DocType: Program Enrollment Tool,New Academic Year,နယူးပညာရေးဆိုင်ရာတစ်နှစ်တာ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,ပြန်သွား / ခရက်ဒစ်မှတ်ချက်
 DocType: Stock Settings,Auto insert Price List rate if missing,auto INSERT စျေးနှုန်းကိုစာရင်းနှုန်းကပျောက်ဆုံးနေဆဲလျှင်
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,စုစုပေါင်း Paid ငွေပမာဏ
 DocType: Production Order Item,Transferred Qty,လွှဲပြောင်း Qty
@@ -3642,7 +3645,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","ကျပန်း, ဖျားနာစသည်တို့ကဲ့သို့သောအရွက်အမျိုးအစား"
 DocType: Email Digest,Send regular summary reports via Email.,အီးမေးလ်ကနေတဆင့်ပုံမှန်အကျဉ်းချုပ်အစီရင်ခံစာပေးပို့ပါ။
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},သုံးစွဲမှုအရေးဆိုသောအမျိုးအစား {0} အတွက် default အနေနဲ့အကောင့်သတ်မှတ်ထားပေးပါ
 DocType: Assessment Result,Student Name,ကျောင်းသားအမည်
 DocType: Brand,Item Manager,item Manager က
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,လုပ်ခလစာပေးချေ
@@ -3663,6 +3666,7 @@
 ,Sales Funnel,အရောင်းကတော့
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,အတိုကောက်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Project,Task Progress,task ကိုတိုးတက်ရေးပါတီ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,လှည်း
 ,Qty to Transfer,သို့လွှဲပြောင်းရန် Qty
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ခဲသို့မဟုတ် Customer များ quotes ။
 DocType: Stock Settings,Role Allowed to edit frozen stock,အေးခဲစတော့ရှယ်ယာတည်းဖြတ်ရန် Allowed အခန်းကဏ္ဍ
@@ -3690,13 +3694,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,item ပညာရှိခွန် Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute မှအတိုကောက်
 ,Item-wise Price List Rate,item ပညာစျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,ပေးသွင်းစျေးနှုန်း
 DocType: Quotation,In Words will be visible once you save the Quotation.,သင်စျေးနှုန်းကိုကယ်တင်တစ်ချိန်ကစကားမြင်နိုင်ပါလိမ့်မည်။
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},အရေအတွက် ({0}) တန်း {1} အတွက်အစိတ်အပိုင်းမဖွစျနိုငျ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,အခကြေးငွေများစုဆောင်း
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} ပြီးသား Item {1} များတွင်အသုံးပြု
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,သင်္ဘောစရိတ်ပေါင်းထည့်သည်နည်းဥပဒေများ။
 DocType: Item,Opening Stock,စတော့အိတ်ဖွင့်လှစ်
@@ -3713,8 +3717,8 @@
 Updated via 'Time Log'",&#39;&#39; အချိန်အထဲ &#39;&#39; ကနေတဆင့် Updated မိနစ်အနည်းငယ်အတွက်
 DocType: Customer,From Lead,ခဲကနေ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ထုတ်လုပ်မှုပြန်လွှတ်ပေးခဲ့အမိန့်။
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာကိုရွေးပါ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Entry &#39;ပါစေရန်လိုအပ်သည် POS ကိုယ်ရေးအချက်အလက်များ profile
 DocType: Program Enrollment Tool,Enroll Students,ကျောင်းသားများကျောင်းအပ်
 DocType: Hub Settings,Name Token,Token အမည်
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,စံရောင်းချသည့်
@@ -3725,7 +3729,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} အရောင်းပြေစာ {1} ဆန့်ကျင်
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,စီမံကိန်းအမည်
-DocType: Supplier,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
+DocType: Customer,Mention if non-standard receivable account,Non-စံ receiver အကောင့်ကိုလျှင်ဖော်ပြထားခြင်း
 DocType: Journal Entry Account,If Income or Expense,ဝင်ငွေခွန်သို့မဟုတ်သုံးစွဲမှုမယ်ဆိုရင်
 DocType: Production Order,Required Items,လိုအပ်သောပစ္စည်းများ
 DocType: Stock Ledger Entry,Stock Value Difference,စတော့အိတ် Value တစ်ခု Difference
@@ -3746,7 +3750,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ဒီအရောင်းပုဂ္ဂိုလ်များအတွက်ပစ်မှတ် Item Group မှပညာ Set ။
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] သန်း Older စတော့စျေးကွက်အေးခဲ
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,အတန်း # {0}: ပိုင်ဆိုင်မှုသတ်မှတ်ထားတဲ့ပိုင်ဆိုင်မှုဝယ်ယူ / ရောင်းမည်မဖြစ်မနေဖြစ်ပါသည်
-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.","နှစ်ခုသို့မဟုတ်ထို့ထက်ပိုသောစျေးနှုန်းနည်းဥပဒေများအထက်ဖော်ပြပါအခြေအနေများအပေါ် အခြေခံ. တွေ့ရှိနေတယ်ဆိုရင်, ဦးစားပေးလျှောက်ထားတာဖြစ်ပါတယ်။ default value ကိုသုည (အလွတ်) ဖြစ်ပါသည်စဉ်ဦးစားပေး 0 င်မှ 20 အကြားတစ်ဦးအရေအတွက်ဖြစ်ပါတယ်။ ပိုမိုမြင့်မားသောအရေအတွက်တူညီသည့်အခြေအနေများနှင့်အတူမျိုးစုံစျေးနှုန်းများနည်းဥပဒေများရှိပါတယ်လျှင်ဦးစားပေးယူလိမ့်မည်ဆိုလိုသည်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","နှစ်ခုသို့မဟုတ်ထို့ထက်ပိုသောစျေးနှုန်းနည်းဥပဒေများအထက်ဖော်ပြပါအခြေအနေများအပေါ် အခြေခံ. တွေ့ရှိနေတယ်ဆိုရင်, ဦးစားပေးလျှောက်ထားတာဖြစ်ပါတယ်။ default value ကိုသုည (အလွတ်) ဖြစ်ပါသည်စဉ်ဦးစားပေး 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.,အောက်ပါအသုံးပြုသူများလုပ်ကွက်နေ့ရက်ကာလအဘို့ထွက်ခွာ Applications ကိုအတည်ပြုခွင့်ပြုပါ။
@@ -3772,7 +3776,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,ကစတော့ရှယ်ယာကို item မဟုတ်ပါဘူးကတည်းက item {0} လျစ်လျူရှု
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,နောက်ထပ် processing အဘို့ဤထုတ်လုပ်မှုအမိန့် Submit ။
-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.","တစ်ဦးအထူးသဖြင့်အရောင်းအဝယ်အတွက်စျေးနှုန်းများ Rule လျှောက်ထားမ, ရှိသမျှသက်ဆိုင်သောစျေးနှုန်းများနည်းဥပဒေများကိုပိတ်ထားသင့်ပါတယ်။"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","တစ်ဦးအထူးသဖြင့်အရောင်းအဝယ်အတွက်စျေးနှုန်းများ Rule လျှောက်ထားမ, ရှိသမျှသက်ဆိုင်သောစျေးနှုန်းများနည်းဥပဒေများကိုပိတ်ထားသင့်ပါတယ်။"
 DocType: Assessment Group,Parent Assessment Group,မိဘအကဲဖြတ် Group မှ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ဂျော့ဘ်
 ,Sales Order Trends,အရောင်းအမိန့်ခေတ်ရေစီးကြောင်း
@@ -3783,7 +3787,7 @@
 DocType: Stock Entry Detail,Additional Cost,အပိုဆောင်းကုန်ကျစရိတ်
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ဘဏ္ဍာရေးတစ်နှစ်တာအဆုံးနေ့စွဲ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ဘောက်ချာများကအုပ်စုဖွဲ့လျှင်, voucher မရှိပါအပေါ်အခြေခံပြီး filter နိုင်ဘူး"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,ပေးသွင်းစျေးနှုန်းလုပ်ပါ
 DocType: Quality Inspection,Incoming,incoming
 DocType: BOM,Materials Required (Exploded),လိုအပ်သောပစ္စည်းများ (ပေါက်ကွဲ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ကိုယ့်ကိုကိုယ်ထက်အခြား, သင့်အဖွဲ့အစည်းမှအသုံးပြုသူများကို Add"
@@ -3811,6 +3815,7 @@
 DocType: Employee,History In Company,ကုမ္ပဏီခုနှစ်တွင်သမိုင်းကြောင်း
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,သတင်းလွှာ
 DocType: Stock Ledger Entry,Stock Ledger Entry,စတော့အိတ်လယ်ဂျာ Entry &#39;
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ဖောက်သည်&gt; ဖောက်သည် Group မှ&gt; နယ်မြေတွေကို
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,တူညီသောပစ္စည်းကိုအကြိမ်ပေါင်းများစွာထဲသို့ဝင်ထားပြီး
 DocType: Department,Leave Block List,Block List ကို Leave
 DocType: Sales Invoice,Tax ID,အခွန် ID ကို
@@ -3820,7 +3825,7 @@
 DocType: Customer,Sales Partner and Commission,အရောင်း partner နှင့်ကော်မရှင်မှ
 DocType: Employee Loan,Rate of Interest (%) / Year,အကျိုးစီးပွား၏နှုန်းမှာ (%) / တစ်နှစ်တာ
 ,Project Quantity,စီမံကိန်းအရေအတွက်
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","စုစုပေါင်း {0} ပစ္စည်းများအားလုံးအဘို့, သုညဖြစ်ပါသည်သင်က &#39;&#39; ဖြန့်ဝေတွင် အခြေခံ. စွပ်စွဲချက် &#39;&#39; ကိုပြောင်းလဲသင့်ပါတယ်ဖြစ်နိုင်သည်"
 DocType: Opportunity,To Discuss,ဆွေးနွေးသည်မှ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} ဒီအရောင်းအဝယ်ပြီးမြောက်ရန် {2} လိုသေး {1} ၏ယူနစ်။
 DocType: Loan Type,Rate of Interest (%) Yearly,အကျိုးစီးပွား၏နှုန်းမှာ (%) နှစ်အလိုက်
@@ -3835,7 +3840,7 @@
 DocType: Purchase Invoice,Return,ပြန်လာ
 DocType: Production Order Operation,Production Order Operation,ထုတ်လုပ်မှုအမိန့်စစ်ဆင်ရေး
 DocType: Pricing Rule,Disable,ကို disable
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ငွေပေးချေမှု၏ Mode ကိုငွေပေးချေရန်လိုအပ်ပါသည်
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ငွေပေးချေမှု၏ Mode ကိုငွေပေးချေရန်လိုအပ်ပါသည်
 DocType: Project Task,Pending Review,ဆိုင်းငံ့ထားပြန်လည်ဆန်းစစ်ခြင်း
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","ဒါကြောင့် {1} ပြီးသားဖြစ်သကဲ့သို့ပိုင်ဆိုင်မှု {0}, ဖျက်သိမ်းမရနိုငျ"
 DocType: Task,Total Expense Claim (via Expense Claim),(ကုန်ကျစရိတ်တောင်းဆိုမှုများကနေတဆင့်) စုစုပေါင်းကုန်ကျစရိတ်တောင်းဆိုမှုများ
@@ -3843,11 +3848,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,မာကုဒူးယောင်
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},အတန်း {0}: အ BOM # ၏ငွေကြေး {1} ရွေးချယ်ထားတဲ့ငွေကြေး {2} တန်းတူဖြစ်သင့်
 DocType: Journal Entry Account,Exchange Rate,ငွေလဲလှယ်နှုန်း
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,အရောင်းအမှာစာ {0} တင်သွင်းသည်မဟုတ်
 DocType: Homepage,Tag Line,tag ကိုလိုင်း
 DocType: Fee Component,Fee Component,အခကြေးငွေစိတျအပိုငျး
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ရေယာဉ်စုစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,အထဲကပစ္စည်းတွေကို Add
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,အထဲကပစ္စည်းတွေကို Add
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},ဂိုဒေါင် {0}: မိဘအကောင့်ကို {1} ကုမ္ပဏီက {2} မှ bolong ပါဘူး
 DocType: Cheque Print Template,Regular,ပုံမှန်အစည်းအဝေး
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,အားလုံးအကဲဖြတ်လိုအပ်ချက်စုစုပေါင်း Weightage 100% ရှိရပါမည်
@@ -3860,7 +3865,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ဂိုဒေါင် {0} မတည်ရှိပါဘူး
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub သည် Register
 DocType: Monthly Distribution,Monthly Distribution Percentages,လစဉ်ဖြန့်ဖြူးရာခိုင်နှုန်း
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ရွေးချယ်ထားတဲ့ item Batch ရှိသည်မဟုတ်နိုင်
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","အဘိုးပြတ်မှုနှုန်း {1} {2} များအတွက်စာရင်းကိုင် entries တွေကိုလုပ်ဖို့လိုအပ်သောပစ္စည်း {0}, အဘို့ရှာမတွေ့ပါ။ ပစ္စည်းကတော့ {1} အတွက်နမူနာကို item အဖြစ်လုပ်ဆောင်လျှင်, {1} Item table ထဲမှာကြောင်းဖော်ပြထားခြင်းပါ။ ဒီလိုမှမဟုတ်ရင်ပစ္စည်းတစ်ခုဝင်လာသောစတော့ရှယ်ယာအရောင်းအဝယ်အတွက်ဖန်တီးသို့မဟုတ်ဖော်ပြထားခြင်းအဘိုးပြတ်နှုန်း Item စံချိန်အတွက်, ပြီးတော့ဒီ entry ပယ်ဖျက် / submiting ကြိုးစားကြည့်ပါ"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,ဒီ Delivery Note ကိုဆန့်ကျင်ကယ်နှုတ်တော်မူ၏ပစ္စည်း%
 DocType: Project,Customer Details,customer အသေးစိတ်ကို
@@ -3869,15 +3874,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,လက်ခံ nos သည် url parameter ကိုရိုက်ထည့်
 DocType: Payment Entry,Paid Amount,Paid ငွေပမာဏ
 DocType: Assessment Plan,Supervisor,ကြီးကြပ်သူ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,အွန်လိုင်း
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,အွန်လိုင်း
 ,Available Stock for Packing Items,ပစ္စည်းများထုပ်ပိုးရရှိနိုင်ပါသည်စတော့အိတ်
 DocType: Item Variant,Item Variant,item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,အကဲဖြတ်ရလဒ် Tool ကို
 DocType: BOM Scrap Item,BOM Scrap Item,BOM အပိုင်းအစ Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Submitted အမိန့်ပယ်ဖျက်မရပါ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,အရည်အသွေးအစီမံခန့်ခွဲမှု
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,item {0} ကိုပိတ်ထားသည်
 DocType: Employee Loan,Repay Fixed Amount per Period,ကာလနှုန်း Fixed ငွေပမာဏပြန်ဆပ်
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Item {0} သည်အရေအတွက်ရိုက်ထည့်ပေးပါ
 DocType: Employee External Work History,Employee External Work History,ဝန်ထမ်းပြင်ပလုပ်ငန်းခွင်သမိုင်း
@@ -3904,7 +3909,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ကျောင်းသားသမဂ္ဂအီးမေးလ် ID ကို
 DocType: Employee,Notice (days),အသိပေးစာ (ရက်)
 DocType: Tax Rule,Sales Tax Template,အရောင်းခွန် Template ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ငွေတောင်းခံလွှာကိုကယ်တင်ပစ္စည်းများကို Select လုပ်ပါ
 DocType: Employee,Encashment Date,Encashment နေ့စွဲ
 DocType: Training Event,Internet,အင်တာနက်ကို
 DocType: Account,Stock Adjustment,စတော့အိတ် Adjustments
@@ -3928,7 +3933,7 @@
 DocType: Item Variant Attribute,Attribute,attribute
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,အကွာအဝေးမှ / ထံမှ specify ကျေးဇူးပြု.
 DocType: Serial No,Under AMC,AMC အောက်မှာ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,item အဘိုးပြတ်မှုနှုန်းဆင်းသက်ကုန်ကျစရိတ်ဘောက်ချာပမာဏကိုထည့်သွင်းစဉ်းစားပြန်လည်တွက်ချက်နေပါတယ်
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,item အဘိုးပြတ်မှုနှုန်းဆင်းသက်ကုန်ကျစရိတ်ဘောက်ချာပမာဏကိုထည့်သွင်းစဉ်းစားပြန်လည်တွက်ချက်နေပါတယ်
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,အရောင်းအရောင်းချနေသည် default setting များ။
 DocType: Guardian,Guardian Of ,၏ဂါးဒီးယန်း
 DocType: Grading Scale Interval,Threshold,တံခါးဝ
@@ -3938,6 +3943,7 @@
 DocType: Purchase Invoice,Debit Note Issued,debit မှတ်ချက်ထုတ်ပေး
 DocType: Production Order,Warehouses,ကုနျလှောငျရုံ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ပိုင်ဆိုင်မှုလွှဲပြောင်းမရနိုငျ
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ဤသည်အရာဝတ္ထု {0} (Template) ၏မူကွဲဖြစ်ပါတယ်။
 DocType: Workstation,per hour,တစ်နာရီကို
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,ယ်ယူခြင်း
 DocType: Announcement,Announcement,အသိပေးကြေငြာခြင်း
@@ -3953,8 +3959,8 @@
 DocType: Account,Receivable,receiver
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,row # {0}: ဝယ်ယူအမိန့်ရှိနှင့်ပြီးသားအဖြစ်ပေးသွင်းပြောင်းလဲပစ်ရန်ခွင့်ပြုခဲ့မဟုတ်
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,ထားချေးငွေကန့်သတ်ထက်ကျော်လွန်ကြောင်းကိစ္စများကိုတင်ပြခွင့်ပြုခဲ့ကြောင်းအခန်းကဏ္ဍကို။
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,ထုတ်လုပ်ခြင်းမှပစ္စည်းများကို Select လုပ်ပါ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","မဟာဒေတာထပ်တူပြုခြင်း, ကအချို့သောအချိန်ယူစေခြင်းငှါ,"
 DocType: Item,Material Issue,material Issue
 DocType: Hub Settings,Seller Description,ရောင်းချသူဖော်ပြချက်များ
 DocType: Employee Education,Qualification,အရည်အချင်း
@@ -3966,7 +3972,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,အမိန့်ထုတ်
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,အကဲဖြတ်လိုအပ်ချက် Group မှ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},စုဆောင်းတန်ဖိုးဖွင့်လှစ် {0} ညီမျှထက်လျော့နည်းဖြစ်ရပါမည်
 DocType: Warehouse,Warehouse Name,ဂိုဒေါင်အမည်
 DocType: Naming Series,Select Transaction,Transaction ကိုရွေးပါ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,အခန်းက္ပအတည်ပြုပေးသောသို့မဟုတ်အသုံးပြုသူအတည်ပြုပေးသောရိုက်ထည့်ပေးပါ
@@ -3979,7 +3985,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"တင်သွင်းစတော့အိတ် Entry &#39;{0} တည်ရှိသောကြောင့်, ဖျက်သိမ်းနိုင်ဘူး"
 DocType: Employee Loan,Disbursement Date,ငွေပေးချေနေ့စွဲ
 DocType: Vehicle,Vehicle,ယာဉ်
 DocType: Purchase Invoice,In Words,စကားအတွက်
@@ -3994,14 +4000,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ခဲ%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ပိုင်ဆိုင်မှုတန်ဖိုးနှင့် Balance
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},ငွေပမာဏ {0} {1} {3} မှ {2} ကနေလွှဲပြောင်း
 DocType: Sales Invoice,Get Advances Received,ကြိုတင်ငွေရရှိထားသည့် Get
 DocType: Email Digest,Add/Remove Recipients,Add / Remove လက်ခံရယူ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},transaction ရပ်တန့်ထုတ်လုပ်ရေးအမိန့် {0} ဆန့်ကျင်ခွင့်မပြု
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Default အဖြစ်ဒီဘဏ္ဍာရေးနှစ်တစ်နှစ်တာတင်ထားရန်, &#39;&#39; Default အဖြစ်သတ်မှတ်ပါ &#39;&#39; ကို click လုပ်ပါ"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ပူးပေါင်း
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ပြတ်လပ်မှု Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,item မူကွဲ {0} အတူတူ Attribute တွေနှင့်အတူတည်ရှိမှု့
 DocType: Employee Loan,Repay from Salary,လစာထဲကနေပြန်ဆပ်
 DocType: Leave Application,LAP/,ရင်ခွင် /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ငွေပမာဏများအတွက် {0} {1} ဆန့်ကျင်ငွေပေးချေမှုတောင်းခံ {2}
@@ -4019,7 +4025,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,အကဲဖြတ်ရလဒ်အသေးစိတ်
 DocType: Employee Education,Employee Education,ဝန်ထမ်းပညာရေး
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,ပစ္စည်းအုပ်စု table ထဲမှာကိုတွေ့မိတ္တူပွားကို item အုပ်စု
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,ဒါဟာပစ္စည်း Details ကိုဆွဲယူဖို့လိုသည်။
 DocType: Salary Slip,Net Pay,Net က Pay ကို
 DocType: Account,Account,အကောင့်ဖွင့်
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,serial No {0} ပြီးသားကိုလက်ခံရရှိခဲ့ပြီး
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ဂိုဒေါင် {0} မည်သည့်အကောင့်နှင့်ဆက်စပ်သည်မဖန်တီး / ဂိုဒေါင်များအတွက်သက်ဆိုင်ရာ (ပိုင်ဆိုင်မှု) အကောင့်သို့လင့်ထားသည်ပါ။
 DocType: Purchase Invoice,Recurring Id,ထပ်တလဲလဲ Id
 DocType: Customer,Sales Team Details,အရောင်းရေးအဖွဲ့အသေးစိတ်ကို
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,အမြဲတမ်းပယ်ဖျက်?
 DocType: Expense Claim,Total Claimed Amount,စုစုပေါင်းအခိုင်အမာငွေပမာဏ
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,ရောင်းချခြင်းသည်အလားအလာရှိသောအခွင့်အလမ်း။
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},မမှန်ကန်ခြင်း {0}
@@ -4039,13 +4045,14 @@
 DocType: Warehouse,PIN,PIN ကို
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup ကို ERPNext ၌သင်တို့၏ကျောင်း
 DocType: Sales Invoice,Base Change Amount (Company Currency),base ပြောင်းလဲမှုပမာဏ (ကုမ္ပဏီငွေကြေးစနစ်)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,အောက်ပါသိုလှောင်ရုံမရှိပါစာရင်းကိုင် posts များ
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,ပထမဦးဆုံးစာရွက်စာတမ်း Save လိုက်ပါ။
 DocType: Account,Chargeable,နှော
 DocType: Company,Change Abbreviation,ပြောင်းလဲမှုအတိုကောက်
 DocType: Expense Claim Detail,Expense Date,စရိတ်နေ့စွဲ
 DocType: Item,Max Discount (%),max လျှော့ (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,နောက်ဆုံးအမိန့်ငွေပမာဏ
+DocType: Task,Is Milestone,မှတ်တိုင်ဖြစ်ပါသည်
 DocType: Daily Work Summary,Email Sent To,ရန် Sent အီးမေးလ်
 DocType: Budget,Warn,အသိပေး
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","အခြားမည်သည့်သဘောထားမှတ်ချက်, မှတ်တမ်းများအတွက်သွားသင့်ကြောင်းမှတ်သားဖွယ်အားထုတ်မှု။"
@@ -4066,7 +4073,7 @@
 DocType: Item Attribute Value,Attribute Value,attribute Value တစ်ခု
 ,Itemwise Recommended Reorder Level,Itemwise Reorder အဆင့်အကြံပြုထား
 DocType: Salary Detail,Salary Detail,လစာ Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,ပထမဦးဆုံး {0} ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,batch {0} Item ၏ {1} သက်တမ်းကုန်ဆုံးခဲ့သည်။
 DocType: Sales Invoice,Commission,ကော်မရှင်
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ကုန်ထုတ်လုပ်မှုများအတွက်အချိန်စာရွက်။
@@ -4078,41 +4085,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze စတော့စျေးကွက် Older Than`%d ရက်ထက်နည်းသင့်သည်။
 DocType: Tax Rule,Purchase Tax Template,ဝယ်ယူခွန် Template ကို
 ,Project wise Stock Tracking,Project သည်ပညာရှိသောသူသည်စတော့အိတ်ခြေရာကောက်
-apps/erpnext/erpnext/maintenance/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,Ref Code ကို
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ဝန်ထမ်းမှတ်တမ်းများ။
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Next ကိုတန်ဖိုးနေ့စွဲသတ်မှတ်ထားပေးပါ
 DocType: HR Settings,Payroll Settings,လုပ်ခလစာ Settings ကို
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Non-နှင့်ဆက်စပ်ငွေတောင်းခံလွှာနှင့်ပေးသွင်းခြင်းနှင့်ကိုက်ညီ။
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,အရပ်ဌာနအမိန့်
 DocType: Email Digest,New Purchase Orders,နယူးဝယ်ယူခြင်းအမိန့်
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,အမြစ်မိဘတစ်ဦးကုန်ကျစရိတ်အလယ်ဗဟိုရှိသည်မဟုတ်နိုင်
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,ကုန်အမှတ်တံဆိပ်ကိုရွေးပါ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,ကုန်အမှတ်တံဆိပ်ကိုရွေးပါ ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,အပေါ်အဖြစ်စုဆောင်းတန်ဖိုး
 DocType: Sales Invoice,C-Form Applicable,သက်ဆိုင်သည့် C-Form တွင်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},စစ်ဆင်ရေးအချိန်ကစစ်ဆင်ရေး {0} များအတွက် 0 င်ထက် သာ. ကြီးမြတ်ဖြစ်ရပါမည်
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ဂိုဒေါင်မဖြစ်မနေဖြစ်ပါသည်
 DocType: Supplier,Address and Contacts,လိပ်စာနှင့်ဆက်သွယ်ရန်
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM ကူးပြောင်းခြင်း Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px (ဇ) ကဝဘ်ဖော်ရွေ 900px (w) သည်ထိုပွဲကို
 DocType: Program,Program Abbreviation,Program ကိုအတိုကောက်
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ထုတ်လုပ်မှုအမိန့်တစ်ခု Item Template ဆန့်ကျင်ထမွောကျနိုငျမညျမဟု
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,စွဲချက်အသီးအသီးကို item ဆန့်ကျင်ဝယ်ယူခြင်းပြေစာ Update လုပ်ပေး
 DocType: Warranty Claim,Resolved By,အားဖြင့်ပြေလည်
 DocType: Bank Guarantee,Start Date,စတင်သည့်ရက်စွဲ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,တစ်ဦးကာလသည်အရွက်ခွဲဝေချထားပေးရန်။
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,မှားယွင်းစွာရှင်းလင်း Cheques နှင့်စာရင်း
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,အကောင့်ကို {0}: သင့်မိဘအကောင့်ကိုတခုအဖြစ်သတ်မှတ်လို့မရပါဘူး
 DocType: Purchase Invoice Item,Price List Rate,စျေးနှုန်း List ကို Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,ဖောက်သည်ကိုးကား Create
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,ဖောက်သည်ကိုးကား Create
 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 +38,Bill of Materials (BOM),ပစ္စည်းများ၏ဘီလ် (BOM)
 DocType: Item,Average time taken by the supplier to deliver,ပျမ်းမျှအားဖြင့်အချိန်မကယ်မလွှတ်မှပေးသွင်းခြင်းဖြင့်ယူ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,အကဲဖြတ်ရလဒ်
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,နာရီ
 DocType: Project,Expected Start Date,မျှော်လင့်ထားသည့် Start ကိုနေ့စွဲ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,စွဲချက်က item တခုကိုသက်ဆိုင်မဖြစ်လျှင်တဲ့ item Remove
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,transaction ငွေကြေးငွေပေးချေမှုရမည့် Gateway မှာငွေကြေးအဖြစ်အတူတူဖြစ်ရပါမည်
 DocType: Payment Entry,Receive,လက်ခံရရှိ
@@ -4123,19 +4129,19 @@
 DocType: Workstation,Operating Costs,operating ကုန်ကျစရိတ်
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,စုဆောင်းမိလစဉ်ဘတ်ဂျက်လျှင်လှုပ်ရှားမှုကျော်သွားပါပြီ
 DocType: Purchase Invoice,Submit on creation,ဖန်ဆင်းခြင်းအပေါ် Submit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},{0} {1} ရှိရမည်များအတွက်ငွေကြေး
 DocType: Asset,Disposal Date,စွန့်ပစ်နေ့စွဲ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","သူတို့အားလပ်ရက်ရှိသည်မဟုတ်ကြဘူးလျှင်အီးမေးလ်များ, ပေးထားသောနာရီမှာကုမ္ပဏီအပေါငျးတို့သ Active ကိုဝန်ထမ်းများထံသို့စေလွှတ်လိမ့်မည်။ တုံ့ပြန်မှု၏အကျဉ်းချုပ်သန်းခေါင်မှာကိုစလှေတျပါလိမ့်မည်။"
 DocType: Employee Leave Approver,Employee Leave Approver,ဝန်ထမ်းထွက်ခွာခွင့်ပြုချက်
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},row {0}: An Reorder entry ကိုပြီးသားဒီကိုဂိုဒေါင် {1} သည်တည်ရှိ
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","ဆုံးရှုံးအဖြစ်စျေးနှုန်းကိုဖန်ဆင်းခဲ့ပြီးကြောင့်, ကြေညာလို့မရပါဘူး။"
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,လေ့ကျင့်ရေးတုံ့ပြန်ချက်
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ထုတ်လုပ်မှုအမိန့် {0} တင်သွင်းရမည်
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Item {0} သည် Start ကိုနေ့စွဲနဲ့ End Date ကို select လုပ်ပါ ကျေးဇူးပြု.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},သင်တန်းအတန်း {0} အတွက်မဖြစ်မနေဖြစ်ပါသည်
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,ယနေ့အထိသည့်နေ့ရက်မှခင်မဖွစျနိုငျ
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Edit ကိုဈေးနှုန်းများ Add /
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Batch,Parent Batch,မိဘအသုတ်လိုက်
 DocType: Cheque Print Template,Cheque Print Template,Cheque တစ်စောင်လျှင်ပရင့်ထုတ်ရန် Template
@@ -4149,7 +4155,7 @@
 ,Ordered Items To Be Delivered,လွတ်ပေးရန်အမိန့်ထုတ်ပစ္စည်းများ
 DocType: Account,Income,ဝင်ငွေခွန်
 DocType: Industry Type,Industry Type,စက်မှုဝန်ကြီး Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,တစ်ခုခုမှားသွားတယ်!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,သတိပေးချက်: Leave ပလီကေးရှင်းအောက်ပါလုပ်ကွက်ရက်စွဲများင်
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,အရောင်းပြေစာ {0} ပြီးသားတင်သွင်းခဲ့
 DocType: Assessment Result Detail,Score,နိုင်ပြီ
@@ -4180,17 +4186,17 @@
 DocType: Item,Variant Based On,မူကွဲအခြေပြုတွင်
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},တာဝန်ပေးစုစုပေါင်း weightage 100% ဖြစ်သင့်သည်။ ဒါဟာ {0} သည်
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,သင့်ရဲ့ပေးသွင်း
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,အရောင်းအမိန့်ကိုဖန်ဆင်းသည်အဖြစ်ပျောက်ဆုံးသွားသောအဖြစ်သတ်မှတ်လို့မရပါဘူး။
 DocType: Request for Quotation Item,Supplier Part No,ပေးသွင်းအပိုင်းဘယ်သူမျှမက
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,မှစ. ရရှိထားသည့်
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',အမျိုးအစား &#39;&#39; အကောက်ခွန်တန်ဖိုးသတ်မှတ်မည် &#39;သို့မဟုတ်&#39; &#39;Vaulation နှင့်စုစုပေါင်း&#39; &#39;အဘို့ဖြစ်၏ရသောအခါနုတ်မနိုင်
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,မှစ. ရရှိထားသည့်
 DocType: Lead,Converted,ပွောငျး
 DocType: Item,Has Serial No,Serial No ရှိပါတယ်
 DocType: Employee,Date of Issue,ထုတ်ဝေသည့်ရက်စွဲ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} {1} သည် မှစ.
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},row # {0}: ကို item များအတွက် Set ပေးသွင်း {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,အတန်း {0}: နာရီတန်ဖိုးကိုသုညထက်ကြီးမြတ်ဖြစ်ရပါမည်။
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,website က Image ကို {0} ပစ္စည်းမှပူးတွဲပါ {1} မတွေ့ရှိနိုင်
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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 စာရင်း။
@@ -4199,20 +4205,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,သင်က Frozen တန်ဖိုးကိုသတ်မှတ်ခွင့်မဟုတ်
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled Entries Get
 DocType: Payment Reconciliation,From Invoice Date,ပြေစာနေ့စွဲထဲကနေ
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,ငွေတောင်းခံငွေကြေးသော်လည်းကောင်း default အနေနဲ့ comapany ရဲ့ငွေကြေးသို့မဟုတ်ပါတီအကောင့်ငွေကြေးတန်းတူဖြစ်ရပါမည်
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Encashment Leave
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ဒါကြောင့်အဘယ်သို့ပြုရပါသနည်း?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ဂိုဒေါင်မှ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,အားလုံးကျောင်းသားသမဂ္ဂအဆင့်လက်ခံရေး
 ,Average Commission Rate,ပျမ်းမျှအားဖြင့်ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,တက်ရောက်သူအနာဂတ်ရက်စွဲများကိုချောင်းမြောင်းမရနိုင်ပါ
 DocType: Pricing Rule,Pricing Rule Help,စျေးနှုန်း Rule အကူအညီ
 DocType: School House,House Name,အိမ်အမည်
 DocType: Purchase Taxes and Charges,Account Head,အကောင့်ဖွင့်ဦးခေါင်း
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ပစ္စည်းများဆင်းသက်ကုန်ကျစရိတ်ကိုတွက်ချက်ဖို့အပိုဆောင်းကုန်ကျစရိတ်များကို Update
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,electrical
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,သင်၏အသုံးပြုသူများအဖြစ်သင်၏အဖွဲ့အစည်း၏ကျန်ထည့်ပါ။ သင်တို့သည်လည်း Contacts မှသူတို့ကိုထည့်သွင်းခြင်းအားဖြင့်သင့်ပေါ်တယ်မှ Customer များဖိတ်ခေါ် add နိုင်ပါတယ်
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,သင်၏အသုံးပြုသူများအဖြစ်သင်၏အဖွဲ့အစည်း၏ကျန်ထည့်ပါ။ သင်တို့သည်လည်း Contacts မှသူတို့ကိုထည့်သွင်းခြင်းအားဖြင့်သင့်ပေါ်တယ်မှ Customer များဖိတ်ခေါ် add နိုင်ပါတယ်
 DocType: Stock Entry,Total Value Difference (Out - In),(- ခုနှစ်တွင် Out) စုစုပေါင်းတန်ဖိုး Difference
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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} သည်စွဲလမ်းခြင်းမ
@@ -4221,7 +4227,7 @@
 DocType: Item,Customer Code,customer Code ကို
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} သည်မွေးနေသတိပေး
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ပြီးခဲ့သည့်အမိန့် ခုနှစ်မှစ. ရက်ပတ်လုံး
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,အကောင့်ကိုရန် debit တစ်ဦး Balance ကိုစာရွက်အကောင့်ကိုသူဖြစ်ရမည်
 DocType: Buying Settings,Naming Series,စီးရီးအမည်
 DocType: Leave Block List,Leave Block List Name,Block List ကိုအမည် Leave
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,အာမခံ Start ကိုရက်စွဲအာမခံအဆုံးနေ့စွဲထက်လျော့နည်းဖြစ်သင့်
@@ -4236,9 +4242,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ဝန်ထမ်း၏လစာစလစ်ဖြတ်ပိုင်းပုံစံ {0} ပြီးသားအချိန်စာရွက် {1} ဖန်တီး
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,အမိန့် Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,item {0} ပိတ်ထားတယ်
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,item {0} ပိတ်ထားတယ်
 DocType: Stock Settings,Stock Frozen Upto,စတော့အိတ် Frozen အထိ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ဆိုစတော့ရှယ်ယာကို item ဆံ့မပါဘူး
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},မှစ. နှင့်ကာလ {0} ထပ်တလဲလဲများအတွက်မဖြစ်မနေရက်စွဲများရန် period
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,စီမံကိန်းလှုပ်ရှားမှု / အလုပ်တစ်ခုကို။
 DocType: Vehicle Log,Refuelling Details,ဆီဖြည့အသေးစိတ်
@@ -4248,8 +4254,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,ပြီးခဲ့သည့်ဝယ်ယူနှုန်းကိုမတွေ့ရှိ
 DocType: Purchase Invoice,Write Off Amount (Company Currency),ဟာ Off ရေးဖို့ပမာဏ (Company မှငွေကြေးစနစ်)
 DocType: Sales Invoice Timesheet,Billing Hours,ငွေတောင်းခံနာရီ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} မတွေ့ရှိများအတွက် default BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,row # {0}: set ကျေးဇူးပြု. reorder အအရေအတွက်
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,ဒီနေရာမှာသူတို့ကိုထည့်သွင်းဖို့ပစ္စည်းများကိုအသာပုတ်
 DocType: Fees,Program Enrollment,Program ကိုကျောင်းအပ်
 DocType: Landed Cost Voucher,Landed Cost Voucher,ကုန်ကျစရိတ်ဘောက်ချာဆင်းသက်
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},{0} set ကျေးဇူးပြု.
@@ -4273,7 +4280,7 @@
 DocType: Maintenance Visit,Maintenance Date,ပြုပြင်ထိန်းသိမ်းမှုနေ့စွဲ
 DocType: Purchase Invoice Item,Rejected Serial No,ပယ်ချ Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,တစ်နှစ်တာစတင်နေ့စွဲသို့မဟုတ်အဆုံးနေ့စွဲ {0} နှင့်အတူထပ်ဖြစ်ပါတယ်။ ရှောင်ရှားရန်ကုမ္ပဏီသတ်မှတ်ထားကျေးဇူးပြုပြီး
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},နေ့စွဲ Item {0} သည်အဆုံးနေ့စွဲထက်နည်းဖြစ်သင့် Start
 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 ##### စီးရီးကိုသတ်မှတ်ထားခြင်းနှင့် Serial No ငွေကြေးလွှဲပြောင်းမှုမှာဖျောပွမပြီးတော့အော်တို serial number ကိုဒီစီးရီးအပေါ်အခြေခံပြီးနေသူများကဖန်တီးလိမ့်မည်ဆိုပါက။ သင်တို့၌အစဉ်အတိအလင်းဒီအချက်ကိုသည် Serial အမှတ်ဖော်ပြထားခြင်းချင်လျှင်။ ဒီကွက်လပ်ထားခဲ့။
 DocType: Upload Attendance,Upload Attendance,တက်ရောက် upload
@@ -4350,7 +4357,6 @@
 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 ၏လက်ဝါးကပ်တိုင်အိမ်ခန်းနှင့်
-DocType: Grade Interval,Grade Interval,grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ Start ကိုနေ့စွဲနှင့်ဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ End Date ကိုပြီးသားဘဏ္ဍာရေးနှစ်တစ်နှစ်တာ {0} အတွက်သတ်မှတ်ကြသည်
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,ရှင်းလင်းရေးနေ့စွဲ updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split ကိုအသုတ်လိုက်
@@ -4397,14 +4403,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,သငျသညျသင်တန်းအခြေစိုက်အုပ်စုများအောင်နေချိန်တွင်အသုတ်စဉ်းစားရန်မလိုကြပါလျှင်အမှတ်ကိုဖြုတ်လိုက်ပါချန်ထားပါ။
 DocType: Asset,Frequency of Depreciation (Months),တန်ဖိုး၏ frequency (လ)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ခရက်ဒစ်အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ခရက်ဒစ်အကောင့်ကို
 DocType: Landed Cost Item,Landed Cost Item,ဆင်းသက်ကုန်ကျစရိတ် Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,သုညတန်ဖိုးများကိုပြရန်
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,ကုန်ကြမ်းပေးသောပမာဏကနေ repacking / ထုတ်လုပ်ပြီးနောက်ရရှိသောတဲ့ item ၏အရေအတွက်
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup ကိုငါ့အအဖွဲ့အစည်းအတွက်ရိုးရှင်းတဲ့ဝက်ဘ်ဆိုက်
 DocType: Payment Reconciliation,Receivable / Payable Account,receiver / ပေးဆောင်အကောင့်
 DocType: Delivery Note Item,Against Sales Order Item,အရောင်းအမိန့် Item ဆန့်ကျင်
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},attribute က {0} များအတွက် Value ကို Attribute ကိုသတ်မှတ် ကျေးဇူးပြု.
 DocType: Item,Default Warehouse,default ဂိုဒေါင်
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},ဘဏ္ဍာငွေအရအသုံး Group မှအကောင့် {0} ဆန့်ကျင်တာဝန်ပေးမရနိုင်ပါ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,မိဘကုန်ကျစရိတ်အလယ်ဗဟိုကိုရိုက်ထည့်ပေးပါ
@@ -4450,7 +4456,7 @@
 DocType: Opportunity Item,Basic Rate,အခြေခံပညာ Rate
 DocType: GL Entry,Credit Amount,အကြွေးပမာဏ
 DocType: Cheque Print Template,Signatory Position,လက်မှတ်ရေးထိုးရာထူး
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ပျောက်ဆုံးသွားသောအဖြစ် Set
 DocType: Timesheet,Total Billable Hours,စုစုပေါင်းဘီလ်ဆောင်နာရီ
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ငွေပေးချေမှုရမည့်ပြေစာမှတ်ချက်
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ဒီဖောက်သည်ဆန့်ကျင်ငွေကြေးလွှဲပြောင်းမှုမှာအပေါ်အခြေခံသည်။ အသေးစိတျအဘို့ကိုအောက်တွင်အချိန်ဇယားကိုကြည့်ပါ
@@ -4464,11 +4470,11 @@
 ,Items To Be Requested,တောင်းဆိုထားသောခံရဖို့ items
 DocType: Purchase Order,Get Last Purchase Rate,ပြီးခဲ့သည့်ဝယ်ယူ Rate Get
 DocType: Company,Company Info,ကုမ္ပဏီ Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,အသစ်ဖောက်သည်ကို Select လုပ်ပါသို့မဟုတ် add
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,ကုန်ကျစရိတ်စင်တာတစ်ခုစရိတ်ပြောဆိုချက်ကိုစာအုပ်ဆိုင်လိုအပ်ပါသည်
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ရန်ပုံငွေ၏လျှောက်လွှာ (ပိုင်ဆိုင်မှုများ)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ဒီထမ်းများ၏တက်ရောက်သူအပေါ်အခြေခံသည်
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,debit အကောင့်ကို
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,debit အကောင့်ကို
 DocType: Fiscal Year,Year Start Date,တစ်နှစ်တာ Start ကိုနေ့စွဲ
 DocType: Attendance,Employee Name,ဝန်ထမ်းအမည်
 DocType: Sales Invoice,Rounded Total (Company Currency),rounded စုစုပေါင်း (ကုမ္ပဏီငွေကြေးစနစ်)
@@ -4477,13 +4483,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,အောက်ပါရက်ထွက်ခွာ Applications ကိုအောင်ကနေအသုံးပြုသူများကိုရပ်တန့်။
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,အရစ်ကျငွေပမာဏ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ပေးသွင်းစျေးနှုန်း {0} ကဖန်တီး
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,အဆုံးတစ်နှစ်တာ Start ကိုတစ်နှစ်တာမတိုင်မီမဖွစျနိုငျ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ဝန်ထမ်းအကျိုးကျေးဇူးများ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},{1} ထမ်း {0} သို့မဟုတ်ကုမ္ပဏီတစ်ခုက default အားလပ်ရက် List ကိုသတ်မှတ်ထားပေးပါ
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} တည်ရှိပါဘူး
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},အတန်းမရှိ {0}: ပမာဏသုံးစွဲမှုတောင်းဆိုမှုများ {1} ဆန့်ကျင်ငွေပမာဏဆိုင်းငံ့ထားထက် သာ. ကြီးမြတ်မဖြစ်နိုင်။ ဆိုင်းငံ့ထားသောငွေပမာဏ {2} သည်
@@ -4492,15 +4498,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 Reading
 ,Hub,hub
 DocType: GL Entry,Voucher Type,ဘောက်ချာကအမျိုးအစား
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,စျေးနှုန်း List ကိုတွေ့ရှိသို့မဟုတ်မသန်မစွမ်းမဟုတ်
 DocType: Employee Loan Application,Approved,Approved
 DocType: Pricing Rule,Price,စျေးနှုန်း
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;&#39; လက်ဝဲ &#39;အဖြစ်သတ်မှတ်ရမည်အပေါ်စိတ်သက်သာရာန်ထမ်း
 DocType: Guardian,Guardian,ဂေါကလူကြီး
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,စိစစ်ရေး {0} ပေးထားသောနေ့စွဲအကွာအဝေးအတွက်န်ထမ်း {1} ဖန်တီး
 DocType: Employee,Education,ပညာရေး
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,အားဖြင့်အမည်ကင်ပိန်း
 DocType: Employee,Current Address Is,လက်ရှိလိပ်စာ Is
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ပြုပြင်ထားသော
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",optional ။ သတ်မှတ်ထားသောမဟုတ်လျှင်ကုမ္ပဏီတစ်ခုရဲ့ default ငွေကြေးသတ်မှတ်ပါတယ်။
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,စာရင်းကိုင်ဂျာနယ် entries တွေကို။
 DocType: Delivery Note Item,Available Qty at From Warehouse,ဂိုဒေါင် မှစ. မှာရရှိနိုင်တဲ့ Qty
@@ -4509,7 +4517,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},row {0}: ပါတီ / အကောင့်ကို {3} {4} အတွက် {1} / {2} နှင့်ကိုက်ညီမပါဘူး
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,အသုံးအကောင့်ကိုရိုက်ထည့်ပေးပါ
 DocType: Account,Stock,စတော့အိတ်
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","အတန်း # {0}: ကိုးကားစရာစာရွက်စာတမ်းအမျိုးအစားအရစ်ကျအမိန့်, အရစ်ကျငွေတောင်းခံလွှာသို့မဟုတ်ဂျာနယ် Entry တယောက်ဖြစ်ရပါမည်"
 DocType: Employee,Current Address,လက်ရှိလိပ်စာ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","ကို item အခြားတဲ့ item တစ်ခုမူကွဲဖြစ်ပါတယ် အကယ်. အတိအလင်းသတ်မှတ်လိုက်သောမဟုတ်လျှင်ထို့နောက်ဖော်ပြချက်, ပုံရိပ်, စျေးနှုန်း, အခွန်စသည်တို့အတွက် template ကိုကနေသတ်မှတ်ကြလိမ့်မည်"
 DocType: Serial No,Purchase / Manufacture Details,ဝယ်ယူခြင်း / ထုတ်လုပ်ခြင်းလုပ်ငန်းအသေးစိတ်ကို
@@ -4537,7 +4545,7 @@
 DocType: Hub Settings,Hub Settings,hub Settings ကို
 DocType: Project,Gross Margin %,gross Margin%
 DocType: BOM,With Operations,စစ်ဆင်ရေးနှင့်အတူ
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,စာရင်းကိုင် entries တွေကိုပြီးသားကုမ္ပဏီတစ်ခု {1} များအတွက်ငွေကြေး {0} အတွက်ဖန်ဆင်းခဲ့ကြ။ ငွေကြေး {0} နှင့်အတူ receiver သို့မဟုတ်ပေးဆောင်အကောင့်ကို select လုပ်ပါကိုကျေးဇူးတင်ပါ။
 DocType: Asset,Is Existing Asset,လက်ရှိပိုင်ဆိုင်မှုဖြစ်ပါသည်
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
 DocType: Salary Detail,Statistical Component,စာရင်းအင်းစိတျအပိုငျး
@@ -4562,7 +4570,7 @@
 DocType: Assessment Plan,Room,အခန်းတခန်း
 DocType: Purchase Order,Advance Paid,ကြိုတင်မဲ Paid
 DocType: Item,Item Tax,item ခွန်
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,ပေးသွင်းဖို့ material
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,ပေးသွင်းဖို့ material
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ယစ်မျိုးပြေစာ
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% တစ်ကြိမ်ထက်ပိုပြီးပုံပေါ်
 DocType: Expense Claim,Employees Email Id,န်ထမ်းအီးမေးလ် Id
@@ -4593,9 +4601,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ကို Attach
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,စတော့အိတ် Levels
 DocType: Customer,Commission Rate,ကော်မရှင် Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variant Make
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variant Make
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ဦးစီးဌာနကခွင့် applications များပိတ်ဆို့။
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","ငွေပေးချေမှုရမည့်အမျိုးအစား, လက်ခံတယောက်ဖြစ် Pay နှင့်ပြည်တွင်းလွှဲပြောင်းရမယ်"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,လှည်း Empty ဖြစ်ပါသည်
 DocType: Vehicle,Model,ပုံစံ
@@ -4606,6 +4614,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,အားလပ်ရက်အပေါ်ထုတ်လုပ်မှု Allow
 DocType: Sales Order,Customer's Purchase Order Date,customer ရဲ့ဝယ်ယူခြင်းအမိန့်နေ့စွဲ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,မြို့တော်စတော့အိတ်
+DocType: Shopping Cart Settings,Show Public Attachments,ပြည်သူ့ပူးတွဲပါပြရန်
 DocType: Packing Slip,Package Weight Details,package အလေးချိန်အသေးစိတ်ကို
 DocType: Payment Gateway Account,Payment Gateway Account,ငွေပေးချေမှုရမည့် Gateway ရဲ့အကောင့်ကို
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ငွေပေးချေမှုပြီးစီးပြီးနောက်ရွေးချယ်ထားသည့်စာမျက်နှာအသုံးပြုသူ redirect ။
@@ -4624,15 +4633,15 @@
 DocType: Batch,Expiry Date,သက်တမ်းကုန်ဆုံးရက်
 ,Supplier Addresses and Contacts,ပေးသွင်းလိပ်စာနှင့်ဆက်သွယ်ရန်
 ,accounts-browser,အကောင့်-browser ကို
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,ပထမဦးဆုံးအမျိုးအစားလိုက်ကို select ကျေးဇူးပြု.
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project မှမာစတာ။
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",စတော့အိတ်ချိန်ညှိခြင်းသို့မဟုတ်အရာဝတ္ထုအတွက် update ကို &quot;Allow&quot; ငွေတောင်းခံ-ကျော်သို့မဟုတ် Over-သာသနာကိုခွင့်ပြုပါရန်။
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ငွေကြေးကိုမှစသည်တို့ $ တူသောသင်္ကေတကိုလာမယ့်မပြပါနဲ့။
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(တစ်ဝက်နေ့)
 DocType: Supplier,Credit Days,ခရက်ဒစ် Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ကျောင်းသားအသုတ်လိုက် Make
 DocType: Leave Type,Is Carry Forward,Forward ယူသွားတာဖြစ်ပါတယ်
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM ထံမှပစ္စည်းများ Get
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ခဲအချိန် Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ပိုင်ဆိုင်မှု၏ CV ကိုနေ့စွဲဝယ်ယူနေ့စွဲအဖြစ်အတူတူပင်ဖြစ်ရပါမည် {1} {2}: row # {0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,အထက်ပါဇယားတွင်အရောင်းအမိန့်ကိုထည့်သွင်းပါ
@@ -4649,8 +4658,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ပိတ်ဆို့ငွေပမာဏ
 DocType: GL Entry,Is Opening,ဖွင့်လှစ်တာဖြစ်ပါတယ်
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},row {0}: Debit entry ကိုတစ် {1} နဲ့ဆက်စပ်မရနိုငျ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,ကျေးဇူးပြု. Setup ကို&gt; နံပါတ်စီးရီးကနေတစ်ဆင့်တက်ရောက်ဘို့ setup ကိုစာရငျးစီးရီး
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 542d2b6..6b49d6e 100644
--- a/erpnext/translations/nl.csv
+++ b/erpnext/translations/nl.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Verhuurd
 DocType: Purchase Order,PO-,PO
 DocType: POS Profile,Applicable for User,Toepasselijk voor gebruiker
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Gestopt productieorder kan niet worden geannuleerd, opendraaien het eerst te annuleren"
 DocType: Vehicle Service,Mileage,Mileage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Wilt u dit actief echt schrappen?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selecteer Standaard Leverancier
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selecteer Standaard Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Munt is nodig voor prijslijst {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zal worden berekend in de transactie.
 DocType: Purchase Order,Customer Contact,Contactpersoon Klant
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Openstaand bedrag voor {0} mag niet kleiner zijn dan nul ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standaard 10 min
 DocType: Leave Type,Leave Type Name,Verlof Type Naam
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Toon geopend
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Toon geopend
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Reeks succesvol bijgewerkt
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Uitchecken
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Submitted
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Item Vervaldatum Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankcheque
 DocType: Mode of Payment Account,Mode of Payment Account,Modus van Betaalrekening
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Toon Varianten
-DocType: Academic Term,Academic Term,academische Term
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Toon Varianten
+DocType: Academic Term,Academic Term,Academisch semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiaal
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Hoeveelheid
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Hoeveelheid
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Accounts tabel mag niet leeg zijn.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Leningen (Passiva)
 DocType: Employee Education,Year of Passing,Voorbije Jaar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referentie:% s, Item Code:% s en Klant:% s"
 DocType: Item,Country of Origin,Land van herkomst
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Op Voorraad
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Open Issues
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Gezondheidszorg
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vertraging in de betaling (Dagen)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,dienst Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factuur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} is reeds verwezen in de verkoopfactuur: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Factuur
 DocType: Maintenance Schedule Item,Periodicity,Periodiciteit
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Boekjaar {0} is vereist
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Verwachte leverdatum is voordat Orderdatum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bevestig .csv-bestand met twee kolommen, één voor de oude naam en één voor de nieuwe naam"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} in geen actieve fiscale jaar.
 DocType: Packed Item,Parent Detail docname,Bovenliggende Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referentie: {0}, Artikelcode: {1} en klant: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vacature voor een baan.
 DocType: Item Attribute,Increment,Aanwas
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Kies Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Kies Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Adverteren
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Krijgen items uit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Niet toegestaan voor {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Krijgen items uit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Voorraad kan niet worden bijgewerkt obv Vrachtbrief {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Geen artikelen vermeld
 DocType: Payment Reconciliation,Reconcile,Afletteren
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Kruidenierswinkel
 DocType: Quality Inspection Reading,Reading 1,Meting 1
 DocType: Process Payroll,Make Bank Entry,Maak Bank Entry
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,pensioenfondsen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Volgende afschrijvingen datum kan niet vóór Aankoopdatum
 DocType: SMS Center,All Sales Person,Alle Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Maandelijkse Distributie ** helpt u om de begroting / Target verdelen over maanden als u de seizoensgebondenheid in uw bedrijf.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Niet artikelen gevonden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Niet artikelen gevonden
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Salarisstructuur Missing
 DocType: Lead,Person Name,Persoon Naam
 DocType: Sales Invoice Item,Sales Invoice Item,Verkoopfactuur Artikel
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",bijvoorbeeld &quot;Primary School&quot; of &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Reports
 DocType: Warehouse,Warehouse Detail,Magazijn Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredietlimiet is overschreden voor de klant {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,De Term Einddatum kan niet later dan het jaar Einddatum van het studiejaar waarop de term wordt gekoppeld zijn (Academisch Jaar {}). Corrigeer de data en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Is vaste activa"" kan niet worden uitgeschakeld, als Asset record bestaat voor dit item"
 DocType: Vehicle Service,Brake Oil,remolie
 DocType: Tax Rule,Tax Type,Belasting Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},U bent niet bevoegd om items toe te voegen of bij te werken voor {0}
 DocType: BOM,Item Image (if not slideshow),Artikel Afbeelding (indien niet diashow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Een klant bestaat met dezelfde naam
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Uurtarief / 60) * Werkelijk Gepresteerde Tijd
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kosten van geleverde zaken
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,De vakantie op {0} is niet tussen Van Datum en To Date
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,scholen
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Geen verlof gevonden record voor werknemer {0} voor {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Vul aub eerst bedrijf in
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Selecteer Company eerste
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Selecteer Company eerste
 DocType: Employee Education,Under Graduate,Student zonder graad
 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
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Claim Bedrag
 DocType: Employee,Mr,De heer
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate klantengroep in de cutomer groep tafel
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverancier Type / leverancier
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Leverancier Type / leverancier
 DocType: Naming Series,Prefix,Voorvoegsel
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Verbruiksartikelen
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Rang
 DocType: Sales Invoice Item,Delivered By Supplier,Geleverd door Leverancier
 DocType: SMS Center,All Contact,Alle Contact
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Productieorder al gemaakt voor alle items met BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Jaarsalaris
 DocType: Daily Work Summary,Daily Work Summary,Dagelijks Werk Samenvatting
 DocType: Period Closing Voucher,Closing Fiscal Year,Het sluiten van het fiscale jaar
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} is bevroren
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} is bevroren
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Kies een bestaand bedrijf voor het maken van Rekeningschema
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Voorraadkosten
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecteer Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Credit Company in Valuta
 DocType: Delivery Note,Installation Status,Installatie Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Wilt u aanwezig updaten? <br> Aanwezig: {0} \ <br> Afwezig: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Geaccepteerde + Verworpen Aantal moet gelijk zijn aan Ontvangen aantal zijn voor Artikel {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Supply Grondstoffen voor Aankoop
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ten minste één wijze van betaling is vereist voor POS factuur.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ten minste één wijze van betaling is vereist voor POS factuur.
 DocType: Products Settings,Show Products as a List,Producten weergeven als een lijst
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Maak Afschrijvingen Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Aanvraag type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,maak Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,maak Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Uitzenden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Uitvoering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Details van de uitgevoerde handelingen.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan voor onderhoud bezoeken.
 DocType: SMS Settings,Enter url parameter for message,Voer URL-parameter voor bericht in
 DocType: POS Profile,Customer Groups,Doelgroepen
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Jaarrekening
 DocType: Guardian,Students,leerlingen
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regels voor de toepassing van prijzen en kortingen .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prijslijst moet van toepassing zijn op Inkoop of Verkoop
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance bedrag kan niet groter zijn dan {0} {1}
 DocType: Naming Series,Series List for this Transaction,Reeks voor deze transactie
 DocType: Company,Default Payroll Payable Account,Default Payroll Payable Account
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Pas E-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Pas E-Group
 DocType: Sales Invoice,Is Opening Entry,Wordt Opening Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Vermeld als niet-standaard te ontvangen houdend met de toepasselijke
 DocType: Course Schedule,Instructor Name,instructeur Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Voor Magazijn is vereist voor het Indienen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Voor Magazijn is vereist voor het Indienen
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Ontvangen op
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Indien aangevinkt, zullen ook niet-voorraad artikelen op het materiaal aanvragen."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Tegen Sales Invoice Item
 ,Production Orders in Progress,Productieorders in behandeling
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,De netto kasstroom uit financieringsactiviteiten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage vol is, niet te redden"
 DocType: Lead,Address & Contact,Adres &amp; Contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Voeg ongebruikte bladeren van de vorige toewijzingen
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Volgende terugkerende {0} zal worden gemaakt op {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totaal bedrag Costing (via Urenregistratie)
 DocType: Item Website Specification,Item Website Specification,Artikel Website Specificatie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Verlof Geblokkeerd
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Gegevens
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Artikel {0} heeft het einde van zijn levensduur bereikt op {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Gegevens
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,jaar-
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Voorraad Afletteren Artikel
 DocType: Stock Entry,Sales Invoice No,Verkoopfactuur nr.
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Publiceren in Hub
 DocType: Student Admission,Student Admission,student Toelating
 ,Terretory,Regio
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Artikel {0} is geannuleerd
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materiaal Aanvraag
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Artikel {0} is geannuleerd
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Materiaal Aanvraag
 DocType: Bank Reconciliation,Update Clearance Date,Werk Clearance Datum bij
 DocType: Item,Purchase Details,Inkoop Details
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Uitstekende Cheques en Deposito&#39;s te ontruimen
 DocType: Item,Synced With Hub,Gesynchroniseerd met Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kan niet negatief voor producten van post {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Verkeerd Wachtwoord
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} kan niet negatief voor producten van post {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Verkeerd Wachtwoord
 DocType: Item,Variant Of,Variant van
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Voltooid aantal mag niet groter zijn dan 'Aantal te produceren'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Voltooid aantal mag niet groter zijn dan 'Aantal te produceren'
 DocType: Period Closing Voucher,Closing Account Head,Sluiten Account Hoofd
 DocType: Employee,External Work History,Externe Werk Geschiedenis
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kringverwijzing Error
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificeer per e-mail bij automatisch aanmaken van Materiaal Aanvraag
 DocType: Journal Entry,Multi Currency,Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Factuur Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Vrachtbrief
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Vrachtbrief
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Het opzetten van Belastingen
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kosten van Verkochte Asset
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} twee keer opgenomen in Artikel BTW
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Samenvatting voor deze week en in afwachting van activiteiten
 DocType: Student Applicant,Admitted,toegelaten
 DocType: Workstation,Rent Cost,Huurkosten
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestellingswaarde
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash-transacties tegen de partij of voor interne overplaatsing
 DocType: Shipping Rule,Valid for Countries,Geldig voor Landen
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Dit artikel is een sjabloon en kunnen niet worden gebruikt bij transacties. Item attributen zal worden gekopieerd naar de varianten tenzij 'No Copy' is ingesteld
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Totaal Bestel Beschouwd
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Werknemer aanduiding ( bijv. CEO , directeur enz. ) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Vul de 'Herhaal op dag van de maand' waarde in
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rij # {0}: Aankoop factuur kan niet worden ingediend tegen een bestaand actief {1}
 DocType: Item Tax,Tax Rate,Belastingtarief
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} reeds toegewezen voor Employee {1} voor periode {2} te {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecteer Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Selecteer Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Inkoopfactuur {0} is al ingediend
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rij # {0}: Batch Geen moet hetzelfde zijn als zijn {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converteren naar non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partij van een artikel.
 DocType: C-Form Invoice Detail,Invoice Date,Factuurdatum
 DocType: GL Entry,Debit Amount,Debet Bedrag
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Er kan slechts 1 account per Bedrijf in zijn {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Zie bijlage
 DocType: Purchase Order,% Received,% Ontvangen
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Maak Student Groepen
@@ -437,9 +439,9 @@
 DocType: Request for Quotation,Request for Quotation,Offerte
 DocType: Salary Slip Timesheet,Working Hours,Werkuren
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Wijzig het start-/ huidige volgnummer van een bestaande serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Maak een nieuwe klant
-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.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Maak Bestellingen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Maak een nieuwe klant
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Als er meerdere prijzen Regels blijven die gelden, worden gebruikers gevraagd om Prioriteit handmatig instellen om conflicten op te lossen."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Maak Bestellingen
 ,Purchase Register,Inkoop Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Toepasselijke kosten
@@ -447,7 +449,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) moet rol hebben 'Verlof Goedkeurder' hebben
 DocType: Purchase Receipt,Vehicle Date,Voertuiggegegevns
 DocType: Student Log,Medical,medisch
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Reden voor het verliezen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Reden voor het verliezen
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Lead eigenaar kan niet hetzelfde zijn als de lead zijn
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Toegekende bedrag kan niet hoger zijn dan niet-gecorrigeerde bedrag
 DocType: Announcement,Receiver,Ontvanger
@@ -464,6 +466,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Hoeveelheid en Tarief
 DocType: Delivery Note,% Installed,% Geïnstalleerd
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klaslokalen / Laboratories etc, waar lezingen kunnen worden gepland."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vul aub eerst de naam van het bedrijf in
 DocType: Purchase Invoice,Supplier Name,Leverancier Naam
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lees de ERPNext Manual
@@ -480,16 +483,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Verplicht veld - Academiejaar
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Verplicht veld - Academiejaar
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Pas de inleidende tekst aan die meegaat als een deel van die e-mail. Elke transactie heeft een aparte inleidende tekst.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Stel alsjeblieft de standaard betaalbare rekening voor het bedrijf in {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Algemene instellingen voor alle productieprocessen.
 DocType: Accounts Settings,Accounts Frozen Upto,Rekeningen bevroren tot
 DocType: SMS Log,Sent On,Verzonden op
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Kenmerk {0} meerdere keren geselecteerd in Attributes Tabel
 DocType: HR Settings,Employee record is created using selected field. ,Werknemer regel wordt gemaakt met behulp van geselecteerd veld.
 DocType: Sales Order,Not Applicable,Niet van toepassing
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Vakantie meester .
 DocType: Request for Quotation Item,Required Date,Benodigd op datum
 DocType: Delivery Note,Billing Address,Factuuradres
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Vul Artikelcode in.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Vul Artikelcode in.
 DocType: BOM,Costing,Costing
 DocType: Tax Rule,Billing County,Billing County
 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"
@@ -505,6 +509,7 @@
 DocType: Packing Slip,From Package No.,Van Pakket No
 DocType: Item Attribute,To Range,Om Bereik
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Effecten en Deposito's
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan de waarderingsmethode niet wijzigen, aangezien er transacties zijn tegen sommige items die geen eigen waarderingsmethode hebben"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totaal bladeren toegewezen is verplicht
 DocType: Job Opening,Description of a Job Opening,Omschrijving van een Vacature
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Afwachting van activiteiten voor vandaag
@@ -526,13 +531,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selecteer de cursus
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Selecteer Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Selecteer Company
 DocType: Stock Entry Detail,Difference Account,Verschillenrekening
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan taak niet afsluiten als haar afhankelijke taak {0} niet is afgesloten.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vul magazijn in waarvoor Materiaal Aanvragen zullen worden ingediend.
 DocType: Production Order,Additional Operating Cost,Additionele Operationele Kosten
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetica
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Om samen te voegen, moeten de volgende eigenschappen hetzelfde zijn voor beide artikelen"
 DocType: Shipping Rule,Net Weight,Netto Gewicht
 DocType: Employee,Emergency Phone,Noodgeval Telefoonnummer
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kopen
@@ -542,7 +547,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Gelieve te definiëren cijfer voor drempel 0%
 DocType: Sales Order,To Deliver,Bezorgen
 DocType: Purchase Invoice Item,Item,Artikel
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial geen item kan niet een fractie te zijn
 DocType: Journal Entry,Difference (Dr - Cr),Verschil (Db - Cr)
 DocType: Account,Profit and Loss,Winst en Verlies
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Managing Subcontracting
@@ -557,7 +562,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Toename kan niet worden 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Verwijder Company Transactions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referentienummer en Reference Data is verplicht voor Bank transactie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Toevoegen / Bewerken Belastingen en Heffingen
 DocType: Purchase Invoice,Supplier Invoice No,Factuurnr. Leverancier
 DocType: Territory,For reference,Ter referentie
@@ -568,7 +573,7 @@
 DocType: Installation Note Item,Installation Note Item,Installatie Opmerking Item
 DocType: Production Plan Item,Pending Qty,In afwachting Aantal
 DocType: Budget,Ignore,Negeren
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} is niet actief
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} is niet actief
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS verzonden naar volgende nummers: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Setup check afmetingen voor afdrukken
 DocType: Salary Slip,Salary Slip Timesheet,Loonstrook Timesheet
@@ -577,13 +582,13 @@
 DocType: Sales Invoice,Total Commission,Totaal Commissie
 DocType: Pricing Rule,Sales Partner,Verkoop Partner
 DocType: Buying Settings,Purchase Receipt Required,Ontvangstbevestiging Verplicht
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Valuation Rate is verplicht als Opening Stock ingevoerd
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Geen records gevonden in de factuur tabel
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Selecteer Company en Party Type eerste
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financiële / boekjaar .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Verzamelde waarden
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Sorry , serienummers kunnen niet worden samengevoegd"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Maak verkooporder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Maak verkooporder
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Algemeen totaal
@@ -600,7 +605,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Terugkerende klanten
 DocType: Leave Control Panel,Allocate,Toewijzen
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Terugkerende verkoop
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Terugkerende verkoop
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opmerking: Totaal toegewezen bladeren {0} mag niet kleiner zijn dan die reeds zijn goedgekeurd bladeren zijn {1} voor de periode
 DocType: Announcement,Posted By,Gepost door
 DocType: Item,Delivered by Supplier (Drop Ship),Geleverd door Leverancier (Drop Ship)
@@ -610,7 +615,7 @@
 DocType: Quotation,Quotation To,Offerte Voor
 DocType: Lead,Middle Income,Modaal Inkomen
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Opening ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Toegekende bedrag kan niet negatief zijn
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stel het bedrijf alstublieft in
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stel het bedrijf alstublieft in
@@ -622,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referentienummer en referentiedatum nodig is voor {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecteer Betaalrekening aan Bank Entry maken
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Maak Employee records bladeren, declaraties en salarisadministratie beheren"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Voeg toe aan Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Voorstel Schrijven
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Aftrek
@@ -653,19 +658,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1} ' niet in het boekjaar {2}
 DocType: Buying Settings,Settings for Buying Module,Instellingen voor het kopen van Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} niet behoort tot bedrijf {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Vul Kwitantie eerste
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Vul Kwitantie eerste
 DocType: Buying Settings,Supplier Naming By,Leverancier Benaming Door
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Netto wijziging in Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Employee Lening Beheer
 DocType: Employee,Passport Number,Paspoortnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relatie met Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling van / naar
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumbereik
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},New kredietlimiet lager is dan de huidige uitstaande bedrag voor de klant. Kredietlimiet moet minstens zijn {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -674,8 +678,8 @@
 DocType: Production Order Operation,In minutes,In minuten
 DocType: Issue,Resolution Date,Oplossing Datum
 DocType: Student Batch Name,Batch Name,batch Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Rooster gemaakt:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Rooster gemaakt:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Stel een standaard Kas- of Bankrekening in bij Betaalwijze {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Inschrijven
 DocType: Selling Settings,Customer Naming By,Klant Naming Door
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Zal de student zoals aanwezig in Student Maandelijkse Rapport Aanwezigheid tonen
@@ -703,7 +707,7 @@
 DocType: Production Order Operation,Actual Start Time,Werkelijke Starttijd
 DocType: BOM Operation,Operation Time,Operatie Tijd
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Afwerking
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baseren
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Baseren
 DocType: Timesheet,Total Billed Hours,Totaal gefactureerd Hours
 DocType: Journal Entry,Write Off Amount,Afschrijvingsbedrag
 DocType: Journal Entry,Bill No,Factuur nr
@@ -718,7 +722,7 @@
 DocType: Student Attendance,Student Attendance,student Attendance
 DocType: Sales Invoice Timesheet,Time Sheet,Urenregistratie
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Grondstoffen afgeboekt op basis van
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Vul artikeldetails in
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Vul artikeldetails in
 DocType: Interest,Interest,Interesseren
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Voorverkoop
 DocType: Purchase Receipt,Other Details,Andere Details
@@ -729,24 +733,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Betaling Entry is al gemaakt
 DocType: Purchase Receipt Item Supplied,Current Stock,Huidige voorraad
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Rij # {0}: Asset {1} is niet gekoppeld aan artikel {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Voorbeschouwing loonstrook
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Voorbeschouwing loonstrook
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Account {0} is meerdere keren ingevoerd
 DocType: Account,Expenses Included In Valuation,Kosten inbegrepen in waardering
 DocType: Hub Settings,Seller City,Verkoper Stad
-,Absent Student Report,Absent Student Report
+,Absent Student Report,Studenten afwezigheidsrapport
 DocType: Email Digest,Next email will be sent on:,Volgende e-mail wordt verzonden op:
 DocType: Offer Letter Term,Offer Letter Term,Aanbod Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item heeft varianten.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Company {0} bestaat niet
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Boom Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Boom Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Aantal verbruikt per eenheid
 DocType: Serial No,Warranty Expiry Date,Garantie Vervaldatum
 DocType: Material Request Item,Quantity and Warehouse,Hoeveelheid en magazijn
 DocType: Sales Invoice,Commission Rate (%),Commissie Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecteer alsjeblieft Programma
 DocType: Project,Estimated Cost,Geschatte kosten
@@ -765,7 +767,7 @@
 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,Standaardrekening
 DocType: Payment Entry,Received Amount (Company Currency),Ontvangen bedrag (Company Munt)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead moet worden ingesteld als de opportuniteit is gemaakt obv een lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Selecteer wekelijkse vrije dag
 DocType: Production Order Operation,Planned End Time,Geplande Eindtijd
 ,Sales Person Target Variance Item Group-Wise,Sales Person Doel Variance Post Group - Wise
@@ -781,6 +783,7 @@
 DocType: Opportunity,Opportunity From,Opportuniteit Van
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Maandsalaris overzicht.
 DocType: BOM,Website Specifications,Website Specificaties
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Van {0} van type {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rij {0}: Conversie Factor is verplicht
@@ -834,6 +837,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr.
 DocType: Bank Guarantee,Project,Project
 DocType: Quality Inspection Reading,Reading 7,Meting 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,gedeeltelijk Bestelde
 DocType: Expense Claim Detail,Expense Claim Type,Kostendeclaratie Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standaardinstellingen voor Winkelwagen
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset gesloopt via Journal Entry {0}
@@ -841,14 +845,14 @@
 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 +107,Office Maintenance Expenses,Gebouwen Onderhoudskosten
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Het opzetten van e-mailaccount
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Vul eerst artikel in
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vul eerst artikel in
 DocType: Account,Liability,Verplichting
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Gesanctioneerde bedrag kan niet groter zijn dan Claim Bedrag in Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standaard kosten van verkochte goederen Account
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prijslijst niet geselecteerd
 DocType: Employee,Family Background,Familie Achtergrond
 DocType: Request for Quotation Supplier,Send Email,E-mail verzenden
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Waarschuwing: Invalid Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Geen toestemming
 DocType: Company,Default Bank Account,Standaard bankrekening
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Om te filteren op basis van Party, selecteer Party Typ eerst"
@@ -861,7 +865,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Geen werknemer gevonden
 DocType: Supplier Quotation,Stopped,Gestopt
 DocType: Item,If subcontracted to a vendor,Als uitbesteed aan een leverancier
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgroep is al bijgewerkt.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgroep is al bijgewerkt.
 DocType: SMS Center,All Customer Contact,Alle Customer Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Upload voorraadsaldo via csv.
 DocType: Warehouse,Tree Details,Tree Details
@@ -872,8 +876,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Factuurbedrag
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: kostenplaats {2} behoort niet tot Company {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan geen Group
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande &#39;{} doctype&#39; table
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {doctype} {DocName} bestaat niet in bovenstaande &#39;{} doctype&#39; table
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} is al voltooid of geannuleerd
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,geen taken
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","De dag van de maand waarop de automatische factuur zal bijvoorbeeld 05, 28 etc worden gegenereerd"
 DocType: Asset,Opening Accumulated Depreciation,Het openen van de cumulatieve afschrijvingen
@@ -889,7 +893,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} tegen Factuur {1} gedateerd {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Course Schedule
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Course Schedule
 DocType: Maintenance Visit,Completion Status,Voltooiingsstatus
 DocType: HR Settings,Enter retirement age in years,Voer de pensioengerechtigde leeftijd in jaren
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Doel Magazijn
@@ -897,7 +901,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Laat dan levering of ontvangst upto deze procent
 DocType: Stock Entry,STE-,STEREO
 DocType: Upload Attendance,Import Attendance,Import Toeschouwers
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle Artikel Groepen
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle Artikel Groepen
 DocType: Process Payroll,Activity Log,Activiteitenlogboek
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto winst / verlies
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Bericht automatisch samenstellen overlegging van transacties .
@@ -908,7 +912,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Aanschaffen om de betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Verwachte Aantal
 DocType: Sales Invoice,Payment Due Date,Betaling Vervaldatum
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Artikel Variant {0} bestaat al met dezelfde kenmerken
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Opening&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Open To Do
 DocType: Notification Control,Delivery Note Message,Vrachtbrief Bericht
@@ -924,7 +928,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-order Aantal
 DocType: Leave Block List Date,Leave Block List Date,Laat Block List Datum
 DocType: Pricing Rule,Price or Discount,Prijs of korting
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totaal van toepassing zijnde kosten in Kwitantie Items tabel moet hetzelfde zijn als de totale belastingen en heffingen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totaal van toepassing zijnde kosten in Kwitantie Items tabel moet hetzelfde zijn als de totale belastingen en heffingen
 DocType: Sales Team,Incentives,Incentives
 DocType: SMS Log,Requested Numbers,Gevraagde Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Alleen verkrijgen Grondstoffen
@@ -953,13 +957,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Wordt uitbesteed
 DocType: Item Attribute,Item Attribute Values,Item Attribuutwaarden
 DocType: Examination Result,Examination Result,examenresultaat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Ontvangstbevestiging
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Ontvangstbevestiging
 ,Received Items To Be Billed,Ontvangen artikelen nog te factureren
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Ingezonden loonbrieven
 DocType: Employee,Ms,Mevrouw
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Wisselkoers stam.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referentie Doctype moet een van {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referentie Doctype moet een van {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Kan Time Slot in de volgende {0} dagen voor Operatie vinden {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiaal voor onderdelen
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners en Territory
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Kan niet automatisch account aanmaken als er al voorraad saldo op de rekening. U moet een bijpassende account aan te maken voordat u een vermelding op dit magazijn kan maken
@@ -982,10 +986,9 @@
 DocType: Supplier,Default Payable Accounts,Standaard Crediteuren Accounts
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Werknemer {0} is niet actief of bestaat niet
 DocType: Fee Structure,Components,Components
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Varianten {0} bijgewerkt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vul Asset Categorie op post {0}
 DocType: Quality Inspection Reading,Reading 6,Meting 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Kan niet {0} {1} {2} zonder negatieve openstaande factuur
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inkoopfactuur Voorschot
 DocType: Hub Settings,Sync Now,Nu synchroniseren
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rij {0}: kan creditering niet worden gekoppeld met een {1}
@@ -999,11 +1002,11 @@
 DocType: Item,Is Purchase Item,Is inkoopartikel
 DocType: Asset,Purchase Invoice,Inkoopfactuur
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nieuwe Sales Invoice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nieuwe Sales Invoice
 DocType: Stock Entry,Total Outgoing Value,Totaal uitgaande waardeoverdrachten
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en de uiterste datum moet binnen dezelfde fiscale jaar
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Openingsdatum en de uiterste datum moet binnen dezelfde fiscale jaar
 DocType: Lead,Request for Information,Informatieaanvraag
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Facturen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Facturen
 DocType: Payment Request,Paid,Betaald
 DocType: Program Fee,Program Fee,programma Fee
 DocType: Salary Slip,Total in words,Totaal in woorden
@@ -1013,7 +1016,7 @@
 DocType: Employee Loan,Sanctioned,Sanctioned
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publiceren op de website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Verzendingen naar klanten.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Leverancier Factuurdatum kan niet groter zijn dan Posting Date
@@ -1024,7 +1027,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variantie
 ,Company Name,Bedrijfsnaam
 DocType: SMS Center,Total Message(s),Totaal Bericht(en)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Kies Punt voor Overdracht
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1035,8 +1038,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Bank / Cash account wordt automatisch bijgewerkt in Salaris Journal Entry als deze modus wordt geselecteerd.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",De intervallen voor Grade Code {0} overlapt met het cijfer intervallen voor andere kwaliteiten. Controleer intervallen {0} en {1} en probeer het opnieuw
 DocType: BOM,Raw Material Cost(Company Currency),Grondstofkosten (Company Munt)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle items zijn al overgebracht voor deze productieorder.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rij # {0}: De tarief kan niet groter zijn dan de tarief die wordt gebruikt in {1} {2}
@@ -1049,14 +1050,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Upload uw brief hoofd en logo. (Je kunt ze later bewerken).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Volgende Afschrijvingen Date wordt ingevoerd als datum in het verleden
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Wit
 DocType: SMS Center,All Lead (Open),Alle Leads (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rij {0}: Aantal niet beschikbaar voor {4} in het magazijn van {1} op het plaatsen van tijd van de invoer ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Get betaalde voorschotten
 DocType: Item,Automatically Create New Batch,Maak automatisch een nieuwe partij aan
 DocType: Item,Automatically Create New Batch,Maak automatisch een nieuwe partij aan
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Maken
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Maken
 DocType: Student Admission,Admission Start Date,Entree Startdatum
 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 .
@@ -1064,7 +1065,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vul Account for Change Bedrag
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vul Account for Change Bedrag
 DocType: Student Batch Name,Student Batch Name,Student batchnaam
 DocType: Holiday List,Holiday List Name,Holiday Lijst Naam
 DocType: Repayment Schedule,Balance Loan Amount,Balance Leningen
@@ -1084,10 +1085,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Geef een {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Verwijderde items met geen verandering in de hoeveelheid of waarde.
 DocType: Delivery Note,Delivery To,Leveren Aan
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributentabel is verplicht
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributentabel is verplicht
 DocType: Production Planning Tool,Get Sales Orders,Get Verkooporders
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan niet negatief zijn
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Korting
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Korting
 DocType: Asset,Total Number of Depreciations,Totaal aantal Afschrijvingen
 DocType: Sales Invoice Item,Rate With Margin,Beoordeel met marges
 DocType: Workstation,Wages,Loon
@@ -1102,7 +1103,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Gereserveerd Magazijn in Verkooporder / Magazijn Gereed Product
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Selling Bedrag
 DocType: Repayment Schedule,Interest Amount,Interestbedrag
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,U bent de Onkosten Goedkeurder voor dit record. Werk de 'Status' bij en sla op.
 DocType: Serial No,Creation Document No,Aanmaken Document nr
 DocType: Issue,Issue,Kwestie
 DocType: Asset,Scrapped,gesloopt
@@ -1110,12 +1111,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributen voor post Varianten. zoals grootte, kleur etc."
 DocType: Purchase Invoice,Returns,opbrengst
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serienummer {0} valt binnen onderhoudscontract tot {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Werving
 DocType: Lead,Organization Name,Naam van de Organisatie
 DocType: Tax Rule,Shipping State,Scheepvaart State
 ,Projected Quantity as Source,Geprojecteerd Hoeveelheid als Bron
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Het punt moet worden toegevoegd met behulp van 'Get Items uit Aankoopfacturen' knop
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Omvatten niet-voorraadartikelen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Verkoopkosten
@@ -1123,12 +1124,12 @@
 DocType: GL Entry,Against,Tegen
 DocType: Item,Default Selling Cost Center,Standaard Verkoop kostenplaats
 DocType: Sales Partner,Implementation Partner,Implementatie Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postcode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postcode
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} is {1}
 DocType: Opportunity,Contact Info,Contact Info
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Maken Stock Inzendingen
 DocType: Packing Slip,Net Weight UOM,Netto Gewicht Eenheid
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} resultaten
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} resultaten
 DocType: Item,Default Supplier,Standaardleverancier
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Production Allowance Percentage
 DocType: Employee Loan,Repayment Schedule,Terugbetalingsschema
@@ -1136,7 +1137,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Ontvang wekelijkse Uit Data
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Einddatum kan niet vroeger zijn dan startdatum
 DocType: Sales Person,Select company name first.,Kies eerst een bedrijfsnaam.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offertes ontvangen van leveranciers.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Naar {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gemiddelde Leeftijd
@@ -1155,7 +1156,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vervoer
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ongeldige attribuut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} moet worden ingediend
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} moet worden ingediend
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Hoeveelheid moet kleiner dan of gelijk aan {0}
 DocType: SMS Center,Total Characters,Totaal Tekens
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Selecteer BOM in BOM veld voor post {0}
@@ -1166,7 +1167,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 +224,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 +52,Please set 'Apply Additional Discount On',Stel &#39;Solliciteer Extra Korting op&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Van Range moet kleiner zijn dan om het bereik
 DocType: Global Defaults,Global Defaults,Global Standaardwaarden
@@ -1176,7 +1177,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Jaar
 DocType: Purchase Invoice,Start date of current invoice's period,Begindatum van de huidige factuurperiode
 DocType: Salary Slip,Leave Without Pay,Onbetaald verlof
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Capacity Planning Fout
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Capacity Planning Fout
 ,Trial Balance for Party,Trial Balance voor Party
 DocType: Lead,Consultant,Consultant
 DocType: Salary Slip,Earnings,Verdiensten
@@ -1191,7 +1192,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dit zal worden toegevoegd aan de Code van het punt van de variant. Bijvoorbeeld, als je de afkorting is ""SM"", en de artikelcode is ""T-SHIRT"", de artikelcode van de variant zal worden ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettoloon (in woorden) zal zichtbaar zijn zodra de Salarisstrook wordt opgeslagen.
 DocType: Purchase Invoice,Is Return,Is Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / betaalkaart Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / betaalkaart Note
 DocType: Price List Country,Price List Country,Prijslijst Land
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} geldig serienummers voor Artikel {1}
@@ -1201,11 +1202,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vul de artikelcode voor Batch Number krijgen
 DocType: Stock Settings,Default Item Group,Standaard Artikelgroep
 DocType: Employee Loan,Partially Disbursed,gedeeltelijk uitbetaald
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverancierbestand
 DocType: Account,Balance Sheet,Balans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Kostenplaats Item met Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode is niet geconfigureerd. Controleer, of rekening is ingesteld op de wijze van betalingen of op POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Uw verkoper krijgt een herinnering op deze datum om contact op te nemen met de klant
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Hetzelfde item kan niet meerdere keren worden ingevoerd.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Verdere accounts kan worden gemaakt onder groepen, maar items kunnen worden gemaakt tegen niet-Groepen"
@@ -1217,7 +1217,7 @@
 ,Purchase Order Items To Be Billed,Inkooporder Artikelen nog te factureren
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inkoopfactuur Artikel
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Voorraad boekingen en Journaalposten worden opnieuw geboekt voor de geselecteerde Ontvangstbewijzen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Voorraad boekingen en Journaalposten worden opnieuw geboekt voor de geselecteerde Ontvangstbewijzen
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Punt 1
 DocType: Holiday,Holiday,Feestdag
 DocType: Support Settings,Close Issue After Days,Sluiten Probleem Na Days
@@ -1244,11 +1244,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Afgerond Werk
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Gelieve ten minste één attribuut in de tabel attributen opgeven
 DocType: Announcement,All Students,Alle studenten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} moet een niet-voorraad artikel zijn
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Bekijk Grootboek
 DocType: Grading Scale,Intervals,intervallen
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Vroegst
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Een artikel Group bestaat met dezelfde naam , moet u de naam van het item of de naam van de artikelgroep"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1288,9 +1288,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},De betaling van het salaris van {0} tot {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Verkooporder {0} is niet geldig
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Inkooporders helpen bij het plannen en opvolgen van uw aankopen
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sorry , bedrijven kunnen niet worden samengevoegd"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",De totale Issue / Transfer hoeveelheid {0} in Materiaal Request {1} \ kan niet groter zijn dan de gevraagde hoeveelheid {2} voor post zijn {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Klein
@@ -1311,10 +1311,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirecte Kosten
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rij {0}: Aantal is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,landbouw
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Website Afbeelding moet een openbaar bestand of website URL zijn
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dit is een basis artikelgroep en kan niet worden bewerkt .
@@ -1332,18 +1332,18 @@
 DocType: Student Group Student,Group Roll Number,Groepsrolnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Voor {0}, kan alleen credit accounts worden gekoppeld tegen een andere debetboeking"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totaal van alle taak gewichten moeten 1. Pas gewichten van alle Project taken dienovereenkomstig
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Vrachtbrief {0} is niet ingediend
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prijsbepalingsregel wordt eerst geselecteerd op basis van 'Toepassen op' veld, dat kan zijn artikel, artikelgroep of merk."
 DocType: Hub Settings,Seller Website,Verkoper Website
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totaal toegewezen percentage voor verkoopteam moet 100 zijn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Productie Order status is {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Productie Order status is {0}
 DocType: Appraisal Goal,Goal,Doel
 DocType: Sales Invoice Item,Edit Description,Bewerken Beschrijving
 ,Team Updates,team updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,voor Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Maak Print Format
@@ -1359,7 +1359,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journaalpost
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} items in progress
 DocType: Workstation,Workstation Name,Naam van werkstation
-DocType: Grade Interval,Grade Code,Grade Code
+DocType: Grading Scale Interval,Grade Code,Grade Code
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Stuklijst {0} behoort niet tot Artikel {1}
@@ -1375,7 +1375,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,hardware
 DocType: Sales Order,Recurring Upto,terugkerende Tot
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Selecteer aub een andere vennootschap
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Selecteer aub een andere vennootschap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Bijzonder Verlof
 DocType: Purchase Invoice,Supplier Invoice Date,Factuurdatum Leverancier
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,U moet Winkelwagen activeren.
@@ -1391,7 +1391,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Voeding
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Vergrijzing Range 3
 DocType: Maintenance Schedule Item,No of Visits,Aantal bezoeken
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark presentielijst
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark presentielijst
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Onderhoudsplan {0} bestaat tegen {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,student die zich inschrijft
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta van de Closing rekening moet worden {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Som van de punten voor alle doelen moeten zijn 100. Het is {0}
@@ -1416,7 +1417,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gem Daily Uitgaande
 DocType: POS Profile,Campaign,Campagne
 DocType: Supplier,Name and Type,Naam en Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Goedkeuring Status moet worden ' goedgekeurd ' of ' Afgewezen '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Goedkeuring Status moet worden ' goedgekeurd ' of ' Afgewezen '
 DocType: Purchase Invoice,Contact Person,Contactpersoon
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Verwacht Startdatum' kan niet groter zijn dan 'Verwachte Einddatum'
 DocType: Course Scheduling Tool,Course End Date,Cursus Einddatum
@@ -1439,14 +1440,15 @@
 DocType: Sales Invoice,Shipping Address Name,Verzenden Adres Naam
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Rekeningschema
 DocType: Material Request,Terms and Conditions Content,Algemene Voorwaarden Inhoud
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,mag niet groter zijn dan 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,mag niet groter zijn dan 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Artikel {0} is geen voorraadartikel
 DocType: Maintenance Visit,Unscheduled,Ongeplande
 DocType: Employee,Owned,Eigendom
 DocType: Salary Detail,Depends on Leave Without Pay,Afhankelijk van onbetaald verlof
 DocType: Pricing Rule,"Higher the number, higher the priority","Hoe hoger het getal, hoe hoger de prioriteit"
 ,Purchase Invoice Trends,Inkoopfactuur Trends
 DocType: Employee,Better Prospects,Betere vooruitzichten
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rij # {0}: De partij {1} heeft slechts {2} aantal. Selecteer alstublieft een andere partij die {3} beschikbaar heeft of verdeel de rij in meerdere rijen, om te leveren / uit te voeren vanuit meerdere batches"
 DocType: Vehicle,License Plate,Nummerplaat
 DocType: Appraisal,Goals,Doelen
 DocType: Warranty Claim,Warranty / AMC Status,Garantie / AMC Status
@@ -1465,7 +1467,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Werknemer kan niet rapporteren aan zichzelf.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Als de rekening is bevroren, kunnen boekingen alleen door daartoe bevoegde gebruikers gedaan worden."
 DocType: Email Digest,Bank Balance,Banksaldo
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Post voor {0}: {1} kan alleen worden gedaan in valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Post voor {0}: {1} kan alleen worden gedaan in valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Functieprofiel, benodigde kwalificaties enz."
 DocType: Journal Entry Account,Account Balance,Rekeningbalans
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Fiscale Regel voor transacties.
@@ -1476,7 +1478,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Toon ongesloten fiscale jaar P &amp; L saldi
 DocType: Shipping Rule,Shipping Account,Verzending Rekening
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} is niet actief
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Maak verkooporders om u te helpen uw werk en leveren op tijd
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Maak verkooporders om u te helpen uw werk en leveren op tijd
 DocType: Quality Inspection,Readings,Lezingen
 DocType: Stock Entry,Total Additional Costs,Totaal Bijkomende kosten
 DocType: Course Schedule,SH,SH
@@ -1487,7 +1489,7 @@
 DocType: Shipping Rule Condition,To Value,Tot Waarde
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Pakbon
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakbon
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kantoorhuur
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Instellingen SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Importeren mislukt!
@@ -1509,11 +1511,11 @@
 DocType: Company,Services,Services
 DocType: HR Settings,Email Salary Slip to Employee,E-mail loonstrook te Employee
 DocType: Cost Center,Parent Cost Center,Bovenliggende kostenplaats
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Stel mogelijke Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Stel mogelijke Leverancier
 DocType: Sales Invoice,Source,Bron
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Toon gesloten
 DocType: Leave Type,Is Leave Without Pay,Is onbetaald verlof
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Categorie is verplicht voor post der vaste activa
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Geen records gevonden in de betaling tabel
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Deze {0} in strijd is met {1} voor {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenten HTML
@@ -1531,7 +1533,7 @@
 DocType: Student,Date of Leaving,Datum waarop het vaartuig
 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/utilities/activation.py +64,Create Leads,Maak Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Maak Leads
 DocType: Maintenance Schedule,Schedules,Schema
 DocType: Purchase Invoice Item,Net Amount,Netto Bedrag
 DocType: Purchase Order Item Supplied,BOM Detail No,Stuklijst Detail nr.
@@ -1559,9 +1561,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,programma Inschrijvingen
 DocType: Sales Invoice Item,Brand Name,Merknaam
 DocType: Purchase Receipt,Transporter Details,Transporter Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standaard magazijn is nodig voor geselecteerde punt
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Doos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mogelijke Leverancier
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mogelijke Leverancier
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,De Organisatie
 DocType: Budget,Monthly Distribution,Maandelijkse Verdeling
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Ontvanger Lijst is leeg. Maak Ontvanger Lijst
@@ -1569,8 +1571,8 @@
 DocType: Sales Partner,Sales Partner Target,Verkoop Partner Doel
 DocType: Loan Type,Maximum Loan Amount,Maximum Leningen
 DocType: Pricing Rule,Pricing Rule,Prijsbepalingsregel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dubbele rolnummer voor student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Actie als jaarlijkse begroting overschreden
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiaal aanvragen tot Purchase Order
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Succes URL
@@ -1591,9 +1593,9 @@
 DocType: Employee Loan,Repayment Method,terugbetaling Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Indien aangevinkt, zal de startpagina de standaard Item Group voor de website"
 DocType: Quality Inspection Reading,Reading 4,Meting 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standaard BOM voor {0} niet gevonden voor Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Standaard BOM voor {0} niet gevonden voor Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Claims voor bedrijfsonkosten
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenten worden in het hart van het systeem, voegt al jouw leerlingen"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenten worden in het hart van het systeem, voegt al jouw leerlingen"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rij # {0}: Clearance date {1} kan niet vóór Cheque Date {2}
 DocType: Company,Default Holiday List,Standaard Vakantiedagen Lijst
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rij {0}: Van tijd en de tijd van de {1} overlapt met {2}
@@ -1605,21 +1607,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,De dag (en) waarop je solliciteert verlof zijn vakantie. U hoeft niet voor verlof.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,E-mail opnieuw te verzenden Betaling
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nieuwe taak
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Maak Offerte
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Maak Offerte
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andere rapporten
 DocType: Dependent Task,Dependent Task,Afhankelijke taak
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Conversiefactor voor Standaard meeteenheid moet 1 zijn in rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Verlof van type {0} kan niet langer zijn dan {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Probeer plan operaties voor X dagen van tevoren.
 DocType: HR Settings,Stop Birthday Reminders,Stop verjaardagsherinneringen
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Stel Default Payroll Payable account in Company {0}
 DocType: SMS Center,Receiver List,Ontvanger Lijst
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Zoekitem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Zoekitem
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Verbruikte hoeveelheid
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto wijziging in cash
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Reeds voltooid
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Eenheid {0} is meer dan eens ingevoerd in Conversie Factor Tabel
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Reeds voltooid
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalingsverzoek bestaat al {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kosten van Items Afgegeven
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Hoeveelheid mag niet meer zijn dan {0}
@@ -1651,12 +1653,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Maak uitbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rij {0}: Advance tegen Leverancier worden debiteren
 DocType: Company,Default Values,Standaard Waarden
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequentie} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totaal bedrag terug!
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dit is gebaseerd op stammen tegen dit voertuig. Zie tijdlijn hieronder voor meer informatie
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Verzamelen
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Tegen Leverancier Factuur {0} gedateerd {1}
 DocType: Customer,Default Price List,Standaard Prijslijst
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset bewegingsartikel {0} aangemaakt
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Je kunt niet verwijderen boekjaar {0}. Boekjaar {0} is ingesteld als standaard in Global Settings
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Klant Kredietsaldo
@@ -1676,7 +1679,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Geen van de items hebben een verandering in hoeveelheid of waarde.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Verplicht veld - Programma
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Verplicht veld - Programma
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantie Claim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantie Claim
 ,Lead Details,Lead Details
 DocType: Salary Slip,Loan repayment,Lening terugbetaling
 DocType: Purchase Invoice,End date of current invoice's period,Einddatum van de huidige factuurperiode
@@ -1695,12 +1698,10 @@
 DocType: Employee,Permanent Address,Vast Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Selecteer artikelcode
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Selecteer artikelcode
 DocType: Student Sibling,Studying in Same Institute,Het bestuderen in hetzelfde instituut
 DocType: Territory,Territory Manager,Regio Manager
 DocType: Packed Item,To Warehouse (Optional),Om Warehouse (optioneel)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
 DocType: Payment Entry,Paid Amount (Company Currency),Betaald bedrag (Bedrijfsvaluta)
 DocType: Purchase Invoice,Additional Discount,EXTRA KORTING
 DocType: Selling Settings,Selling Settings,Verkoop Instellingen
@@ -1710,9 +1711,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Bekijk in winkelwagen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingkosten
 ,Item Shortage Report,Artikel Tekort Rapport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Het gewicht wordt vermeld, \n Vermeld ""Gewicht UOM"" te"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiaal Aanvraag is gebruikt om deze Voorraad  Entry te maken
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Volgende Afschrijvingen Date is verplicht voor nieuwe aanwinst
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Volgende Afschrijvingen Date is verplicht voor nieuwe aanwinst
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afzonderlijke cursusgroep voor elke partij
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Afzonderlijke cursusgroep voor elke partij
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkel exemplaar van een artikel.
@@ -1729,9 +1730,7 @@
 DocType: Course Assessment Criteria,Weightage,Weging
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: kostenplaats is nodig voor &#39;Winst- en verliesrekening&#39; account {2}. Gelieve het opzetten van een standaard kostenplaats voor de onderneming.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nieuw contact
 DocType: Territory,Parent Territory,Bovenliggende Regio
 DocType: Quality Inspection Reading,Reading 2,Meting 2
@@ -1748,7 +1747,7 @@
 ,Item-wise Sales Register,Artikelgebaseerde Verkoop Register
 DocType: Asset,Gross Purchase Amount,Gross Aankoopbedrag
 DocType: Asset,Depreciation Method,afschrijvingsmethode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Is dit inbegrepen in de Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totaal Doel
 DocType: Program Course,Required,nodig
@@ -1758,21 +1757,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Aflettering JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Teveel kolommen. Exporteer het rapport en druk het af via een Spreadsheet programma.
 DocType: Purchase Invoice Item,Batch No,Partij nr.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Kan geen wisselkoers te vinden {0} tot {1} voor de belangrijkste datum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Kunnen meerdere verkooporders tegen een klant bestelling
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 DocType: Student Group Instructor,Student Group Instructor,Student Groep Instructeur
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoofd
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoofd
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Instellen voorvoegsel voor nummerreeksen voor uw transacties
 DocType: Employee Attendance Tool,Employees HTML,medewerkers HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Default BOM ({0}) moet actief voor dit artikel of zijn template
 DocType: Employee,Leave Encashed?,Verlof verzilverd?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"""Opportuniteit Van"" veld is verplicht"
 DocType: Email Digest,Annual Expenses,jaarlijkse kosten
 DocType: Item,Variants,Varianten
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Maak inkooporder
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Maak inkooporder
 DocType: SMS Center,Send To,Verzenden naar
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Er is niet genoeg verlofsaldo voor Verlof type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Toegewezen bedrag
@@ -1780,7 +1778,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Artikelcode van Klant
 DocType: Stock Reconciliation,Stock Reconciliation,Voorraad Aflettering
 DocType: Territory,Territory Name,Regio Naam
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Werk in uitvoering Magazijn is vereist alvorens in te dienen
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidaat voor een baan.
 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
@@ -1788,11 +1786,10 @@
 DocType: Item,Serial Nos and Batches,Serienummers en batches
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentengroep Sterkte
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentengroep Sterkte
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Tegen Journal Entry {0} heeft geen ongeëvenaarde {1} binnenkomst hebben
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,taxaties
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Grading intervallen
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Kom binnen alstublieft
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan niet overbill voor post {0} in rij {1} meer dan {2}. Om over-facturering mogelijk te maken, stelt u in het kopen van Instellingen"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Stel filter op basis van artikel of Warehouse
@@ -1804,17 +1801,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Stuklijst {0} moet worden ingediend
 DocType: Authorization Control,Authorization Control,Autorisatie controle
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rij # {0}: Afgekeurd Warehouse is verplicht tegen verworpen Item {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Beheer uw bestellingen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Betaling
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Beheer uw bestellingen
 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
 DocType: Course,Course Abbreviation,cursus Afkorting
 DocType: Student Leave Application,Student Leave Application,Student verlofaanvraag
 DocType: Item,Will also apply for variants,Geldt ook voor varianten
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan niet worden geannuleerd, want het is al {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} op een halve dag op {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Totaal aantal werkuren mag niet groter zijn dan max werktijden {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Op
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundel artikelen op moment van verkoop.
 DocType: Quotation Item,Actual Qty,Werkelijk aantal
 DocType: Sales Invoice Item,References,Referenties
@@ -1824,7 +1822,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,U hebt dubbele artikelen ingevoerd. Aub aanpassen en opnieuw proberen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,associëren
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nieuwe winkelwagen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,nieuwe winkelwagen
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Artikel {0} is geen seriegebonden artikel
 DocType: SMS Center,Create Receiver List,Maak Ontvanger Lijst
 DocType: Vehicle,Wheels,Wheels
@@ -1856,10 +1854,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Schakelt creatie uit van tijdlogs tegen productieorders. Operaties worden niet bijgehouden tegen productieorder
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Heeft Varianten
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},U heeft reeds geselecteerde items uit {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Naam van de verdeling per maand
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID is verplicht
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID is verplicht
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID is verplicht
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Terugkerende Factuur
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1867,11 +1865,11 @@
 DocType: Budget,Fiscal Year,Boekjaar
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Begroting
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset punt moet een niet-voorraad artikel zijn.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan niet worden toegewezen tegen {0}, want het is geen baten of lasten rekening"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Bereikt
 DocType: Student Admission,Application Form Route,Aanvraagformulier Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Regio / Klantenservice
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Regio / Klantenservice
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,bijv. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Laat Type {0} kan niet worden toegewezen omdat het te verlaten zonder te betalen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rij {0}: Toegewezen bedrag {1} moet kleiner zijn dan of gelijk aan openstaande bedrag te factureren {2}
@@ -1891,15 +1889,15 @@
 ,Serial No Status,Serienummer Status
 DocType: Payment Entry Reference,Outstanding,uitstekend
 ,Daily Timesheet Summary,Dagelijks Timesheet Samenvatting
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rij {0}: Instellen {1} periodiciteit, tijdsverschil tussen begin- en einddatum \
  groter dan of gelijk aan {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dit is gebaseerd op voorraad beweging. Zie {0} voor meer informatie
 DocType: Pricing Rule,Selling,Verkoop
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Bedrag {0} {1} in mindering gebracht tegen {2}
 DocType: Employee,Salary Information,Salaris Informatie
 DocType: Sales Person,Name and Employee ID,Naam en Werknemer ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Vervaldatum mag niet voor de boekingsdatum zijn
 DocType: Website Item Group,Website Item Group,Website Artikel Groep
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Invoerrechten en Belastingen
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vul Peildatum in
@@ -1911,14 +1909,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kan niet verwijzen rij getal groter dan of gelijk aan de huidige rijnummer voor dit type Charge
 DocType: Asset,Sold,uitverkocht
 ,Item-wise Purchase History,Artikelgebaseerde Inkoop Geschiedenis
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Klik op 'Genereer Planning' om serienummer op te halen voor Artikel {0}
 DocType: Account,Frozen,Bevroren
 ,Open Production Orders,Open productieorders
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basisbedrag (Company Munt)
 DocType: Payment Reconciliation Payment,Reference Row,Referentie Row
 DocType: Installation Note,Installation Time,Installatie Tijd
 DocType: Sales Invoice,Accounting Details,Boekhouding Details
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Verwijder alle transacties voor dit bedrijf
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringen
 DocType: Issue,Resolution Details,Oplossing Details
@@ -1950,14 +1948,14 @@
 DocType: Discussion,Discussion,Discussie
 DocType: Payment Entry,Transaction ID,Transactie ID
 DocType: Employee,Resignation Letter Date,Ontslagbrief Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prijsbepalingsregels worden verder gefilterd op basis van aantal.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Stel de datum van aansluiting in voor werknemer {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Totaal Billing Bedrag (via Urenregistratie)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Terugkerende klanten Opbrengsten
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) moet de rol 'Onkosten Goedkeurder' hebben
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,paar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Selecteer BOM en Aantal voor productie
 DocType: Asset,Depreciation Schedule,afschrijving Schedule
 DocType: Bank Reconciliation Detail,Against Account,Tegen Rekening
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halve dag datum moet zijn tussen Van Datum en To Date
@@ -1971,16 +1969,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Stel &#39;Asset Afschrijvingen Cost Center&#39; in Company {0}
 ,Maintenance Schedules,Onderhoudsschema&#39;s
 DocType: Task,Actual End Date (via Time Sheet),Werkelijke Einddatum (via Urenregistratie)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Bedrag {0} {1} tegen {2} {3}
 ,Quotation Trends,Offerte Trends
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Artikelgroep niet genoemd in Artikelstam voor Artikel {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,Debet Om rekening moet een vordering-account
 DocType: Shipping Rule Condition,Shipping Amount,Verzendbedrag
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,In afwachting van Bedrag
 DocType: Purchase Invoice Item,Conversion Factor,Conversiefactor
 DocType: Purchase Order,Delivered,Geleverd
 ,Vehicle Expenses,Vehicle Uitgaven
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
+DocType: Serial No,Invoice Details,Factuurgegevens
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Verwachtingswaarde na levensduur groter dan of gelijk aan {0}
 DocType: Purchase Receipt,Vehicle Number,Voertuig Aantal
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,De datum waarop terugkerende factuur stopt
 DocType: Employee Loan,Loan Amount,Leenbedrag
@@ -1999,12 +1998,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR-instellingen
 DocType: Salary Slip,net pay info,nettoloon info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,nieuwe Uitgaven
 DocType: Purchase Invoice,Additional Discount Amount,Extra korting Bedrag
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Rij # {0}: Aantal moet 1 als item is een vaste activa. Gebruik aparte rij voor meerdere aantal.
 DocType: Leave Block List Allow,Leave Block List Allow,Laat Block List Laat
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr kan niet leeg of ruimte
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Groep om Non-groep
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,lening Naam
@@ -2016,6 +2015,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazijn waar u voorraad bijhoudt van afgewezen artikelen
 DocType: Production Order,Skip Material Transfer,Materiaaloverdracht overslaan
 DocType: Production Order,Skip Material Transfer,Materiaaloverdracht overslaan
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan wisselkoers voor {0} tot {1} niet vinden voor de sleuteldatum {2}. Creëer alsjeblieft een valuta-wisselrecord
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Uw financiële jaar eindigt op
 DocType: POS Profile,Price List,Prijslijst
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} is nu het standaard Boekjaar. Ververs uw browser om de wijziging door te voeren .
@@ -2032,19 +2032,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Account {0} is ongeldig. Account Valuta moet {1} zijn
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Eenheid Omrekeningsfactor is vereist in rij {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rij # {0}: Reference document moet een van Sales Order, verkoopfactuur of Inboeken zijn"
 DocType: Salary Component,Deduction,Aftrek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rij {0}: Van tijd en binnen Tijd is verplicht.
 DocType: Stock Reconciliation Item,Amount Difference,bedrag Verschil
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Item Prijs toegevoegd {0} in de prijslijst {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vul Employee Id van deze verkoper
 DocType: Territory,Classification of Customers by region,Indeling van de klanten per regio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Verschil Bedrag moet nul zijn
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Verschil Bedrag moet nul zijn
 DocType: Project,Gross Margin,Bruto Marge
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Vul eerst Productie Artikel in
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Berekende bankafschrift balans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Uitgeschakelde gebruiker
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Offerte
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Offerte
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totaal Aftrek
 ,Production Analytics,Production Analytics
@@ -2053,9 +2053,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Waarschuwing: Ongeldig SSL certificaat op attachment {0}
 DocType: Student Admission,Eligibility,verkiesbaarheid
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads u helpen om zaken, voeg al uw contacten en nog veel meer als uw leads"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads u helpen om zaken, voeg al uw contacten en nog veel meer als uw leads"
 DocType: Production Order Operation,Actual Operation Time,Werkelijke Operatie Duur
 DocType: Authorization Rule,Applicable To (User),Van toepassing zijn op (Gebruiker)
 DocType: Purchase Taxes and Charges,Deduct,Aftrekken
@@ -2070,7 +2070,7 @@
 DocType: Guardian,Work Address,Werk adres
 DocType: Appraisal,Calculate Total Score,Bereken Totaalscore
 DocType: Request for Quotation,Manufacturing Manager,Productie Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serienummer {0} is onder garantie tot {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Splits Vrachtbrief in pakketten.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Zendingen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Accountbalans ({0}) voor {1} en voorraadwaarde ({2}) voor magazijn {3} moet hetzelfde zijn
@@ -2092,10 +2092,10 @@
 DocType: Leave Application,Total Leave Days,Totaal verlofdagen
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opmerking: E-mail wordt niet verzonden naar uitgeschakelde gebruikers
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Aantal interacties
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecteer Bedrijf ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecteer Bedrijf ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Laat leeg indien dit voor alle afdelingen is
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vormen van dienstverband (permanent, contract, stage, etc. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} is verplicht voor Artikel {1}
 DocType: Process Payroll,Fortnightly,van twee weken
 DocType: Currency Exchange,From Currency,Van Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Selecteer toegewezen bedrag, Factuur Type en factuurnummer in tenminste één rij"
@@ -2104,14 +2104,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Tarief (Bedrijfsvaluta)
 DocType: Student Guardian,Others,anderen
 DocType: Payment Entry,Unallocated Amount,Niet-toegewezen bedrag
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Kan een bijpassende Item niet vinden. Selecteer een andere waarde voor {0}.
 DocType: POS Profile,Taxes and Charges,Belastingen en Toeslagen
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Een Product of een Dienst dat wordt gekocht, verkocht of in voorraad wordt gehouden."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Niet meer updates
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan het type lading niet selecteren als 'On Vorige Row Bedrag ' of ' On Vorige Row Totaal ' voor de eerste rij
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Onderliggend item mag geen productbundel zijn. Gelieve item `{0}` te verwijderen en op te slaan
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankieren
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Voeg Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Voeg Timesheets
 DocType: Vehicle Service,Service Item,dienst Item
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
 DocType: Bank Guarantee,Bank Guarantee,Bankgarantie
@@ -2137,6 +2137,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Rij # {0}: Asset {1} al {2}
 DocType: Quotation Item,Stock Balance,Voorraad Saldo
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales om de betaling
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Stel namenreeks voor {0} in via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Directeur
 DocType: Expense Claim Detail,Expense Claim Detail,Kostendeclaratie Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Selecteer juiste account
@@ -2161,14 +2162,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,De prijzen zullen niet worden weergegeven als prijslijst niet is ingesteld
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Geef aub een land dat voor deze verzending Rule of kijk Wereldwijde verzending
 DocType: Stock Entry,Total Incoming Value,Totaal Inkomende Waarde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet Om vereist
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet Om vereist
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets helpen bijhouden van de tijd, kosten en facturering voor activiteiten gedaan door uw team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Purchase Price List
 DocType: Offer Letter Term,Offer Term,Aanbod Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Vacature
 DocType: Payment Reconciliation,Payment Reconciliation,Afletteren
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Selecteer de naam van de Verantwoordelijk Persoon
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,technologie
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Totaal Onbetaalde: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
@@ -2196,23 +2197,23 @@
 DocType: Opportunity,Lost Reason,Reden van verlies
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vul Ontvangst Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle items zijn reeds gefactureerde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vul Ontvangst Document
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Verdere kostenplaatsen kan in groepen worden gemaakt, maar items kunnen worden gemaakt tegen niet-Groepen"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Gebruikers en machtigingen
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Productieorders Gemaakt: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Productieorders Gemaakt: {0}
 DocType: Branch,Branch,Tak
 DocType: Guardian,Mobile Number,Mobiel nummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printen en Branding
 DocType: Bin,Actual Quantity,Werkelijke hoeveelheid
 DocType: Shipping Rule,example: Next Day Shipping,Bijvoorbeeld: Next Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serienummer {0} niet gevonden
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serienummer {0} niet gevonden
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Uw Klanten
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,maak Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,maak Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},U bent uitgenodigd om mee te werken aan het project: {0}
 DocType: Leave Block List Date,Block Date,Blokeer Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nu toepassen
@@ -2236,8 +2237,9 @@
 DocType: SMS Log,Sent To,Verzenden Naar
 DocType: Payment Request,Make Sales Invoice,Maak verkoopfactuur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Volgende Contact datum kan niet in het verleden
 DocType: Company,For Reference Only.,Alleen voor referentie.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Selecteer batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ongeldige {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-terugwerkende
 DocType: Sales Invoice Advance,Advance Amount,Voorschot Bedrag
@@ -2251,7 +2253,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Zaak nr. mag geen 0
 DocType: Item,Show a slideshow at the top of the page,Laat een diavoorstelling zien aan de bovenkant van de pagina
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Winkels
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Winkels
 DocType: Serial No,Delivery Time,Levertijd
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Vergrijzing Based On
 DocType: Item,End of Life,End of Life
@@ -2263,12 +2265,12 @@
 DocType: Rename Tool,Rename Tool,Hernoem Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Kosten bijwerken
 DocType: Item Reorder,Item Reorder,Artikel opnieuw ordenen
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Show loonstrook
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Verplaats Materiaal
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Show loonstrook
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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 ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dit document is dan limiet van {0} {1} voor punt {4}. Bent u het maken van een andere {3} tegen dezelfde {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Stel terugkerende na het opslaan
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecteer verandering bedrag rekening
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Stel terugkerende na het opslaan
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecteer verandering bedrag rekening
 DocType: Purchase Invoice,Price List Currency,Prijslijst Valuta
 DocType: Naming Series,User must always select,Gebruiker moet altijd kiezen
 DocType: Stock Settings,Allow Negative Stock,Laat Negatieve voorraad
@@ -2279,7 +2281,7 @@
 DocType: Budget Account,Budget Account,budget account
 DocType: Quality Inspection,Verified By,Geverifieerd door
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",Kan standaard valuta van het bedrijf niet veranderen want er zijn bestaande transacties. Transacties moeten worden geannuleerd om de standaard valuta te wijzigen.
-DocType: Grade Interval,Grade Description,Grade Beschrijving
+DocType: Grading Scale Interval,Grade Description,Grade Beschrijving
 DocType: Stock Entry,Purchase Receipt No,Ontvangstbevestiging nummer
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Onderpand
 DocType: Process Payroll,Create Salary Slip,Maak loonstrook
@@ -2317,7 +2319,7 @@
 DocType: Upload Attendance,Attendance To Date,Aanwezigheid graag:
 DocType: Warranty Claim,Raised By,Opgevoed door
 DocType: Payment Gateway Account,Payment Account,Betaalrekening
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Specificeer Bedrijf om verder te gaan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Netto wijziging in Debiteuren
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compenserende Off
 DocType: Offer Letter,Accepted,Geaccepteerd
@@ -2326,12 +2328,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Kamernummer
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ongeldige referentie {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan niet groter zijn dan geplande hoeveelheid ({2}) in productieorders {3}
 DocType: Shipping Rule,Shipping Rule Label,Verzendregel Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Gebruikers Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Grondstoffen kan niet leeg zijn.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kon niet bijwerken voorraad, factuur bevat daling van de scheepvaart punt."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2344,7 +2346,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Algemene Voorwaarden1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,De naam van het instituut waarvoor u het opzetten van dit systeem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Boekingen bevroren tot deze datum, niemand kan / de boeking wijzigen behalve de hieronder gespecificeerde rol."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Sla het document op voordat u het onderhoudsschema genereert
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Project Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Aanvinken om delingen te verbieden.
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,De volgende productieorders zijn gemaakt:
@@ -2371,7 +2373,7 @@
 ,Employees working on a holiday,Werknemers die op vakantie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Voltooid Methode
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Onderhoud startdatum kan niet voor de leveringsdatum voor Serienummer {0}
 DocType: Production Order,Actual End Date,Werkelijke Einddatum
 DocType: BOM,Operating Cost (Company Currency),Bedrijfskosten (Company Munt)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2388,7 +2390,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Onbetaald verlof komt niet overeen met de goedgekeurde verlofaanvraag verslagen
 DocType: Campaign,Campaign-.####,Campagne-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Volgende stappen
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Gelieve de opgegeven items aan de best mogelijke prijzen
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto dicht Opportunity na 15 dagen
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Eindjaar
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2446,7 +2448,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Benodigde hoeveelheid
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Gemaakt - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Categorie Account
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Entry {0} is niet ingediend
 DocType: Payment Reconciliation,Bank / Cash Account,Bank- / Kasrekening
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Volgende Contact Door het kan niet hetzelfde zijn als de Lead e-mailadres
@@ -2468,7 +2470,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Ontruiming Datum niet vermeld
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,productie
 DocType: Guardian,Occupation,Bezetting
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rij {0} : Start Datum moet voor Einddatum zijn
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totaal (Aantal)
 DocType: Sales Invoice,This Document,Dit document
 DocType: Installation Note Item,Installed Qty,Aantal geïnstalleerd
@@ -2484,14 +2487,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Issue melden?
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utiliteitskosten
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Boven
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rij # {0}: Journal Entry {1} heeft geen account {2} of al vergeleken met een ander voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rij # {0}: Journal Entry {1} heeft geen account {2} of al vergeleken met een ander voucher
 DocType: Buying Settings,Default Buying Price List,Standaard Inkoop Prijslijst
 DocType: Process Payroll,Salary Slip Based on Timesheet,Salarisstrook Op basis van Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Betaling Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecteer een partij voor item {0}. Kan geen enkele batch vinden die aan deze eis voldoet
 DocType: Process Payroll,Select Employees,Selecteer Medewerkers
 DocType: Opportunity,Potential Sales Deal,Potentiële Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Cheque / Reference Data
@@ -2508,7 +2511,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profiel {0} al gemaakt voor bedrijf {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Vervang Artikel / Stuklijst in alle stuklijsten
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Ontvangst document moet worden ingediend
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Ontvangst document moet worden ingediend
 DocType: Purchase Invoice Item,Received Qty,Ontvangen Aantal
 DocType: Stock Entry Detail,Serial No / Batch,Serienummer / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Niet betaald en niet geleverd
@@ -2517,11 +2520,11 @@
 DocType: Delivery Note,DN-RET-,DN-terugwerkende
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Geen tijd sheets
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Verlaat Type {0} kan niet worden doorgestuurd dragen-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Onderhoudsschema wordt niet gegenereerd voor alle items . Klik op ' Generate Schedule'
 ,To Produce,Produceren
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Loonlijst
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Voor rij {0} in {1}. Om {2} onder in punt tarief, rijen {3} moet ook opgenomen worden"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,maak Gebruiker
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,maak Gebruiker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificatie van het pakket voor de levering (voor afdrukken)
 DocType: Bin,Reserved Quantity,Gereserveerde Hoeveelheid
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vul alstublieft een geldig e-mailadres in
@@ -2534,15 +2537,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Gehandicapte template mag niet standaard template
 DocType: Account,Income Account,Inkomstenrekening
 DocType: Payment Request,Amount in customer's currency,Bedrag in de valuta van de klant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Huidige Aantal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Zie &quot;Rate Of Materials Based On&quot; in Costing Sectie
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Vorige
 DocType: Appraisal Goal,Key Responsibility Area,Key verantwoordelijkheid Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Batches helpen bijhouden opkomst, evaluaties en kosten voor studenten"
 DocType: Payment Entry,Total Allocated Amount,Totaal toegewezen bedrag
 DocType: Item Reorder,Material Request Type,Materiaal Aanvraag Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry voor de salarissen van {0} tot {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage vol is, niet te redden"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage vol is, niet te redden"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rij {0}: Verpakking Conversie Factor is verplicht
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Kostenplaats
@@ -2552,16 +2556,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Klant het BTW-nummer van Verkooptransacties
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Ontslagdatum
-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.","Prijsbepalingsregel overschrijft de prijslijst / defininieer een kortingspercentage, gebaseerd op een aantal criteria."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prijsbepalingsregel overschrijft de prijslijst / defininieer een kortingspercentage, gebaseerd op een aantal criteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazijn kan alleen via Voorraad Invoer / Vrachtbrief / Ontvangstbewijs worden veranderd
 DocType: Employee Education,Class / Percentage,Klasse / Percentage
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Hoofd Marketing en Verkoop
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Inkomstenbelasting
-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.","Als geselecteerde Pricing Regel is gemaakt voor 'Prijs', zal het Prijslijst overschrijven. Prijsstelling Regel prijs is de uiteindelijke prijs, dus geen verdere korting moet worden toegepast. Vandaar dat in transacties zoals Sales Order, Purchase Order etc, het zal worden opgehaald in 'tarief' veld, in plaats van het veld 'prijslijst Rate'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Als geselecteerde Pricing Regel is gemaakt voor 'Prijs', zal het Prijslijst overschrijven. Prijsstelling Regel prijs is de uiteindelijke prijs, dus geen verdere korting moet worden toegepast. Vandaar dat in transacties zoals Sales Order, Purchase Order etc, het zal worden opgehaald in 'tarief' veld, in plaats van het veld 'prijslijst Rate'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Houd Leads bij per de industrie type.
 DocType: Item Supplier,Item Supplier,Artikel Leverancier
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Vul de artikelcode  in om batchnummer op te halen
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Selecteer een waarde voor {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adressen.
 DocType: Company,Stock Settings,Voorraad Instellingen
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2571,6 +2575,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Zal een e-mail over het evenement aan de werknemers met de status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Hangt af van Taken
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Beheer Customer Group Boom .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Bijlagen kunnen worden getoond zonder de winkelwagentje in te schakelen
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nieuwe Kostenplaats Naam
 DocType: Leave Control Panel,Leave Control Panel,Verlof Configuratiescherm
@@ -2583,12 +2588,10 @@
 DocType: Sales Invoice,Debit To,Debitering van
 DocType: Delivery Note,Required only for sample item.,Alleen benodigd voor Artikelmonster.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Werkelijke Aantal Na Transactie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverancier&gt; Type leverancier
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Geen loonstrook gevonden tussen {0} en {1}
 ,Pending SO Items For Purchase Request,In afwachting van Verkoop Artikelen voor Inkoopaanvraag
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,studentenadministratie
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} is uitgeschakeld
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} is uitgeschakeld
 DocType: Supplier,Billing Currency,Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-terugwerkende
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Groot
@@ -2605,9 +2608,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment Groepen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nieuwe Warehouse Naam
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totaal {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totaal {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Regio
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vermeld het benodigde aantal bezoeken
 DocType: Stock Settings,Default Valuation Method,Standaard Waarderingsmethode
 DocType: Vehicle Log,Fuel Qty,brandstof Aantal
 DocType: Production Order Operation,Planned Start Time,Geplande Starttijd
@@ -2623,7 +2626,7 @@
 DocType: Price List,Price List Master,Prijslijst Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Alle Verkoop Transacties kunnen worden gelabeld tegen meerdere ** Sales Personen **, zodat u kunt instellen en controleren doelen."
 ,S.O. No.,VO nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Maak Klant van Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Maak Klant van Lead {0}
 DocType: Price List,Applicable for Countries,Toepasselijk voor Landen
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Alleen verlofaanvragen met de status &#39;Goedgekeurd&#39; en &#39;Afgewezen&#39; kunnen worden ingediend
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student groepsnaam is verplicht in de rij {0}
@@ -2667,7 +2670,7 @@
 DocType: Project,Copied From,Gekopieerd van
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Naam fout: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Tekort
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} niet gekoppeld aan {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} niet gekoppeld aan {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Aanwezigheid voor werknemer {0} is al gemarkeerd
 DocType: Packing Slip,If more than one package of the same type (for print),Als er meer dan een pakket van hetzelfde type (voor afdrukken)
 ,Salary Register,salaris Register
@@ -2686,7 +2689,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Gebruik voor de Winkelwagen
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Waarde {0} voor Attribute {1} bestaat niet in de lijst van geldige Punt Attribute Values voor post {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kosten zullen worden proportioneel gedistribueerd op basis van punt aantal of de hoeveelheid, als per uw selectie"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kosten zullen worden proportioneel gedistribueerd op basis van punt aantal of de hoeveelheid, als per uw selectie"
 DocType: Maintenance Visit,Purposes,Doeleinden
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} langer dan alle beschikbare werktijd in werkstation {1}, breken de operatie in meerdere operaties"
@@ -2707,16 +2710,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Beheer Grondgebied Boom.
 DocType: Journal Entry Account,Sales Invoice,Verkoopfactuur
 DocType: Journal Entry Account,Party Balance,Partij Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Selecteer Apply Korting op
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Selecteer Apply Korting op
 DocType: Company,Default Receivable Account,Standaard Vordering Account
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Maak Bank Entry voor het totale salaris betaald voor de hierboven geselecteerde criteria
 DocType: Stock Entry,Material Transfer for Manufacture,Materiaal Verplaatsing voor Productie
-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.,Kortingspercentage kan worden toegepast tegen een prijslijst of voor alle prijslijsten.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Kortingspercentage kan worden toegepast tegen een prijslijst of voor alle prijslijsten.
 DocType: Purchase Invoice,Half-yearly,Halfjaarlijks
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Boekingen voor Voorraad
 DocType: Vehicle Service,Engine Oil,Motorolie
 DocType: Sales Invoice,Sales Team1,Verkoop Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Artikel {0} bestaat niet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Artikel {0} bestaat niet
 DocType: Sales Invoice,Customer Address,Klant Adres
 DocType: Employee Loan,Loan Details,Loan Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rij {0}: Voltooid Aantal moet groter zijn dan nul.
@@ -2724,24 +2727,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Rij # {0}: Kan niet meer dan terugkeren {1} voor post {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,plot
 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}
 DocType: Cheque Print Template,Primary Settings,Primaire Instellingen
 DocType: Purchase Invoice,Select Supplier Address,Select Leverancier Adres
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Werknemers toevoegen
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Werknemers toevoegen
 DocType: Purchase Invoice Item,Quality Inspection,Kwaliteitscontrole
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Standard Template
 DocType: Training Event,Theory,Theorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Waarschuwing: Materiaal Aanvraag Aantal is minder dan Minimum Bestelhoeveelheid
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Rekening {0} is bevroren
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Rechtspersoon / Dochteronderneming met een aparte Rekeningschema behoren tot de Organisatie.
 DocType: Payment Request,Mute Email,Mute-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Voeding, Drank en Tabak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Kan alleen betaling uitvoeren voor ongefactureerde {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Commissietarief kan niet groter zijn dan 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Voer {0} eerste
@@ -2759,7 +2762,7 @@
 DocType: Training Event,Scheduled,Geplande
 apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,Aanvraag voor een offerte.
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle","Selecteer Item, waar &quot;Is Stock Item&quot; is &quot;Nee&quot; en &quot;Is Sales Item&quot; is &quot;Ja&quot; en er is geen enkel ander product Bundle"
-DocType: Student Log,Academic,Academic
+DocType: Student Log,Academic,Academisch
 apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),Totaal vooraf ({0}) tegen Orde {1} kan niet groter zijn dan de Grand totaal zijn ({2})
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,Selecteer Maandelijkse Distribution om ongelijk te verdelen doelen in heel maanden.
 DocType: Purchase Invoice Item,Valuation Rate,Waardering Tarief
@@ -2781,7 +2784,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Warehouses met bestaande transactie kan niet worden geconverteerd naar groep.
 DocType: Assessment Result Tool,Result HTML,resultaat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Verloopt op
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Studenten toevoegen
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Studenten toevoegen
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Selecteer {0}
 DocType: C-Form,C-Form No,C-vorm nr.
 DocType: BOM,Exploded_items,Uitgeklapte Artikelen
@@ -2824,7 +2827,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Voer de naam van de campagne in als bron van onderzoek Campagne is
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Kranten Uitgeverijen
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecteer het fiscale jaar
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selecteer het fiscale jaar
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Bestelniveau
 DocType: Company,Chart Of Accounts Template,Rekeningschema Template
 DocType: Attendance,Attendance Date,Aanwezigheid Datum
@@ -2839,14 +2842,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Dubbele invoer
 DocType: Program Enrollment Tool,Get Students,krijg Studenten
 DocType: Serial No,Under Warranty,Binnen Garantie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Fout]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Fout]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,In Woorden zijn zichtbaar zodra u de Verkooporder opslaat.
 ,Employee Birthday,Werknemer Verjaardag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Attendance Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Een wetenschappelijke term met deze &#39;Academisch Jaar&#39; {0} en &#39;Term Name&#39; {1} bestaat al. Wijzig deze ingangen en probeer het opnieuw.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Als er bestaande transacties tegen punt {0}, kunt u de waarde van het niet veranderen {1}"
 DocType: UOM,Must be Whole Number,Moet heel getal zijn
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nieuwe Verloven Toegewezen (in dagen)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} bestaat niet
@@ -2866,7 +2869,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 +49,Period Closing Entry,Periode sluitpost
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostenplaats met bestaande transacties kan niet worden omgezet in groep
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Bedrag {0} {1} {2} {3}
 DocType: Account,Depreciation,Afschrijvingskosten
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverancier(s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Attendance Tool
@@ -2890,7 +2893,7 @@
 DocType: Supplier,Last Day of the Next Month,Laatste dag van de volgende maand
 DocType: Support Settings,Auto close Issue after 7 days,Auto dicht Issue na 7 dagen
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Verlof kan niet eerder worden toegewezen {0}, als verlof balans al-carry doorgestuurd in de toekomst toewijzing verlof record is {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opmerking: Vanwege / Reference Data overschrijdt toegestaan klantenkrediet dagen door {0} dag (en)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Aanvrager
 DocType: Asset Category Account,Accumulated Depreciation Account,Cumulatieve afschrijvingen Account
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2901,7 +2904,7 @@
 ,Stock Analytics,Voorraad Analyses
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operations kan niet leeg zijn
 DocType: Maintenance Visit Purpose,Against Document Detail No,Tegen Document Detail nr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Type is verplicht
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party Type is verplicht
 DocType: Quality Inspection,Outgoing,Uitgaande
 DocType: Material Request,Requested For,Aangevraagd voor
 DocType: Quotation Item,Against Doctype,Tegen Doctype
@@ -2918,11 +2921,11 @@
 DocType: Asset,Item Code,Artikelcode
 DocType: Production Planning Tool,Create Production Orders,Maak Productieorders
 DocType: Serial No,Warranty / AMC Details,Garantie / AMC Details
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecteer studenten handmatig voor de activiteit gebaseerde groep
 DocType: Journal Entry,User Remark,Gebruiker Opmerking
 DocType: Lead,Market Segment,Marktsegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Betaalde bedrag kan niet groter zijn dan de totale negatieve openstaande bedrag {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Werknemer Interne Werk Geschiedenis
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Sluiten (Db)
 DocType: Cheque Print Template,Cheque Size,Cheque Size
@@ -2937,7 +2940,7 @@
 DocType: Production Planning Tool,Create Material Requests,Maak Materiaal Aanvragen
 DocType: Employee Education,School/University,School / Universiteit
 DocType: Payment Request,Reference Details,Reference Details
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Verwachte waarde na Praktische Het leven moet minder dan Gross Aankoopbedrag zijn
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty bij Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Gefactureerd Bedrag
 DocType: Asset,Double Declining Balance,Double degressief
@@ -2958,20 +2961,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Verschil moet Account een type Asset / Liability rekening zijn, aangezien dit Stock Verzoening is een opening Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Uitbetaalde bedrag kan niet groter zijn dan Leningen zijn {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Inkoopordernummer nodig voor Artikel {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Productieorder niet gemaakt
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Productieorder niet gemaakt
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Van Datum' moet na 'Tot Datum' zijn
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan niet status als student te veranderen {0} is gekoppeld aan student toepassing {1}
 DocType: Asset,Fully Depreciated,volledig is afgeschreven
 ,Stock Projected Qty,Verwachte voorraad hoeveelheid
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klant {0} behoort niet tot project {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Marked Attendance HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Offertes zijn voorstellen, biedingen u uw klanten hebben gestuurd"
 DocType: Sales Order,Customer's Purchase Order,Klant Bestelling
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serienummer en Batch
 DocType: Warranty Claim,From Company,Van Bedrijf
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Som van de scores van de beoordelingscriteria moet {0} te zijn.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Waarde of Aantal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Stel Aantal geboekte afschrijvingen
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Waarde of Aantal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestellingen kunnen niet worden verhoogd voor:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,minuut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inkoop Belastingen en Toeslagen
@@ -2984,7 +2987,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Alle magazijnen
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Alle Leverancier Types
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Leverancier Types
 DocType: Global Defaults,Disable In Words,Uitschakelen In Woorden
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Offerte {0} niet van het type {1}
@@ -2993,6 +2996,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bank Kredietrekening
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Maak Salarisstrook
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rij # {0}: Toegewezen bedrag mag niet groter zijn dan het uitstaande bedrag.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Bladeren BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Leningen met onderpand
 DocType: Purchase Invoice,Edit Posting Date and Time,Wijzig Posting Datum en tijd
@@ -3032,7 +3036,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niet toegestaan om voorraadtransacties ouder dan  {0} bij te werken
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Volledig gefactureerd
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Stel standaard betaalbaar houden bij de werknemer {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Contanten in de hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Levering magazijn vereist voor voorraad artikel {0}
 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)
@@ -3043,7 +3046,7 @@
 DocType: Student Group,Group Based On,Groep Gebaseerd op
 DocType: Journal Entry,Bill Date,Factuurdatum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service Punt, Type, de frequentie en de kosten bedragen nodig zijn"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Als er meerdere Prijsbepalings Regels zijn met de hoogste prioriteit, dan wordt de volgende interene prioriteit gehanteerd:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Wil je echt wilt toevoegen Alle loonstrook van {0} tot {1}
 DocType: Cheque Print Template,Cheque Height,Cheque Hoogte
 DocType: Supplier,Supplier Details,Leverancier Details
@@ -3055,7 +3058,7 @@
 DocType: Vehicle Log,Invoice Ref,factuur Ref
 DocType: Purchase Order,Recurring Order,Terugkerende Bestel
 DocType: Company,Default Income Account,Standaard Inkomstenrekening
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Klantengroep / Klant
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Klantengroep / Klant
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed Boekjaren winst / verlies (Credit)
 DocType: Sales Invoice,Time Sheets,Time Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Standaard bericht Payment Request
@@ -3075,10 +3078,10 @@
 DocType: Notification Control,Quotation Message,Offerte Bericht
 DocType: Employee Loan,Employee Loan Application,Werknemer lening aanvraag
 DocType: Issue,Opening Date,Openingsdatum
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Aanwezigheid is met succes gemarkeerd.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Aanwezigheid is met succes gemarkeerd.
 DocType: Journal Entry,Remark,Opmerking
 DocType: Purchase Receipt Item,Rate and Amount,Tarief en Bedrag
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Account Type voor {0} moet {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Account Type voor {0} moet {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Bladeren en vakantie
 DocType: School Settings,Current Academic Term,Huidige academische term
 DocType: School Settings,Current Academic Term,Huidige academische term
@@ -3101,7 +3104,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Group
 DocType: Shopping Cart Settings,Quotation Series,Offerte Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Een item bestaat met dezelfde naam ( {0} ) , wijzigt u de naam van het item groep of hernoem het item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Maak een keuze van de klant
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Maak een keuze van de klant
 DocType: C-Form,I,ik
 DocType: Company,Asset Depreciation Cost Center,Asset Afschrijvingen kostenplaats
 DocType: Sales Order Item,Sales Order Date,Verkooporder Datum
@@ -3120,20 +3123,20 @@
 DocType: Vehicle,Insurance Details,verzekering Details
 DocType: Account,Payable,betaalbaar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vul de aflossingsperiode
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debiteuren ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debiteuren ({0})
 DocType: Pricing Rule,Margin,Marge
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nieuwe klanten
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brutowinst%
 DocType: Appraisal Goal,Weightage (%),Weging (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Aankoopbedrag is verplicht
 DocType: Lead,Address Desc,Adres Omschr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party is verplicht
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party is verplicht
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,topic Naam
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Tenminste een van de verkopen of aankopen moeten worden gekozen
-DocType: Grading Structure,Grade Intervals,Grade intervallen
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selecteer de aard van uw bedrijf.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rij # {0}: Duplicate entry in Referenties {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Waar de productie-activiteiten worden uitgevoerd.
 DocType: Asset Movement,Source Warehouse,Bron Magazijn
 DocType: Installation Note,Installation Date,Installatie Datum
@@ -3170,7 +3173,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Briefhoofden voor print sjablonen.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titels voor print sjablonen bijv. Proforma Factuur.
 DocType: Student Guardian,Student Guardian,student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Soort waardering kosten kunnen niet zo Inclusive gemarkeerd
 DocType: POS Profile,Update Stock,Voorraad bijwerken
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Verschillende eenheden voor artikelen zal leiden tot een onjuiste (Totaal) Netto gewicht. Zorg ervoor dat Netto gewicht van elk artikel in dezelfde eenheid is.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Stuklijst tarief
@@ -3198,7 +3201,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange winst / verliesrekening
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Werknemer en Aanwezigheid
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Doel moet één zijn van {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Vul het formulier in en sla het op
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Werkelijke hoeveelheid op voorraad
@@ -3214,7 +3217,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Bestelaantal
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Huidige vacatures
 DocType: Company,Stock Adjustment Account,Voorraad Aanpassing Rekening
-DocType: Journal Entry,Write Off,Afschrijven
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Afschrijven
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systeemgebruiker (login) ID. Indien ingesteld, zal het de standaard worden voor alle HR-formulieren."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Van {1}
@@ -3225,27 +3228,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverancier levert aan de Klant
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Vorm / Item / {0}) is niet op voorraad
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Volgende Date moet groter zijn dan Posting Date
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Toon tax break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Toon tax break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Verval- / Referentiedatum kan niet na {0} zijn
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Gegevens importeren en exporteren
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stock inzendingen bestaan tegen Warehouse {0}, dus u kunt niet opnieuw toe te wijzen of aan te passen"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Geen studenten gevonden
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Geen studenten gevonden
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Factuur Boekingsdatum
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Verkopen
 DocType: Sales Invoice,Rounded Total,Afgerond Totaal
 DocType: Product Bundle,List items that form the package.,Lijst items die het pakket vormen.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentage toewijzing moet gelijk zijn aan 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Selecteer Boekingsdatum voordat Party selecteren
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Uit AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecteer alsjeblieft Offerte
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecteer alsjeblieft Offerte
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Maak Maintenance Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecteer alsjeblieft Offerte
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Aantal afschrijvingen geboekt kan niet groter zijn dan het totale aantal van de afschrijvingen zijn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Maak Maintenance Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Neem dan contact op met de gebruiker die hebben Sales Master Manager {0} rol
 DocType: Company,Default Cash Account,Standaard Kasrekening
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Bedrijf ( geen klant of leverancier ) meester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dit is gebaseerd op de aanwezigheid van de Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Geen studenten in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Voeg meer items of geopend volledige vorm
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vul 'Verwachte leverdatum' in
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Vrachtbrief {0} moet worden geannuleerd voordat het annuleren van deze Verkooporder
@@ -3277,6 +3281,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Punt 3
 DocType: Purchase Order,Customer Contact Email,E-mail Contactpersoon Klant
 DocType: Warranty Claim,Item and Warranty Details,Item en garantie Details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelcode&gt; Itemgroep&gt; Merk
 DocType: Sales Team,Contribution (%),Bijdrage (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Selecteer het programma om verplichte vakken te halen.
@@ -3292,9 +3297,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Voordat verzoening
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Naar {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Belastingen en Toeslagen toegevoegd (Bedrijfsvaluta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Tax Rij {0} moet rekening houden met het type belasting of inkomsten of uitgaven of Chargeable
 DocType: Sales Order,Partly Billed,Deels Gefactureerd
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} moet een post der vaste activa zijn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} moet een post der vaste activa zijn
 DocType: Item,Default BOM,Standaard Stuklijst
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3304,8 +3309,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Verzekeringsbedrijf
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,veranderlijk
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Van Vrachtbrief
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,veranderlijk
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Van Vrachtbrief
 DocType: Student,Student Email Address,Student e-mailadres
 DocType: Timesheet Detail,From Time,Van Tijd
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Op voorraad:
@@ -3317,12 +3322,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Prijslijst Wisselkoers
 DocType: Purchase Invoice Item,Rate,Tarief
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres naam
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adres naam
 DocType: Stock Entry,From BOM,Van BOM
 DocType: Assessment Code,Assessment Code,assessment Code
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Basis
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Voorraadtransacties voor {0} zijn bevroren
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Klik op 'Genereer Planning'
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","bijv. Kg, Stuks, Doos, Paar"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referentienummer is verplicht als u een referentiedatum hebt ingevoerd
 DocType: Bank Reconciliation Detail,Payment Document,betaling Document
@@ -3330,19 +3335,19 @@
 DocType: Salary Slip,Salary Structure,Salarisstructuur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,vliegmaatschappij
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Materiaal uitgeven
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Materiaal uitgeven
 DocType: Material Request Item,For Warehouse,Voor Magazijn
 DocType: Employee,Offer Date,Aanbieding datum
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Citaten
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je netwerk.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Je bent in de offline modus. Je zult niet in staat om te herladen tot je netwerk.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Geen groepen studenten gecreëerd.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Maandelijks te betalen bedrag kan niet groter zijn dan Leningen zijn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Vul eerst Onderhoudsdetails in
 DocType: Purchase Invoice,Print Language,Print Taal
 DocType: Salary Slip,Total Working Hours,Totaal aantal Werkuren
 DocType: Stock Entry,Including items for sub assemblies,Inclusief items voor sub assemblies
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Voer waarde moet positief zijn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Voer waarde moet positief zijn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle gebieden
 DocType: Purchase Invoice,Items,Artikelen
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student is reeds ingeschreven.
@@ -3362,17 +3367,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standaard maateenheid voor Variant &#39;{0}&#39; moet hetzelfde zijn als in zijn Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Berekenen gebaseerd op
 DocType: Delivery Note Item,From Warehouse,Van Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Geen Items met Bill of Materials voor fabricage
 DocType: Assessment Plan,Supervisor Name,supervisor Naam
 DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
 DocType: Program Enrollment Course,Program Enrollment Course,Programma Inschrijvingscursus
-DocType: Grading Structure,Grading Structure,Grading Structuur
 DocType: Purchase Taxes and Charges,Valuation and Total,Waardering en Totaal
 DocType: Tax Rule,Shipping City,Verzending Stad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Aanpassen Kennisgeving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,De cashflow uit bedrijfsoperaties
 DocType: Sales Invoice,Shipping Rule,Verzendregel
@@ -3393,8 +3396,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Selecteer Boekingsdatum eerste
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Selecteer Boekingsdatum eerste
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Openingsdatum moeten vóór Sluitingsdatum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostenplaats met bestaande transacties kan niet worden omgezet naar grootboek
 DocType: Department,Days for which Holidays are blocked for this department.,Dagen waarvoor feestdagen zijn geblokkeerd voor deze afdeling.
@@ -3407,7 +3410,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Bevestig briefhoofd
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Laatste Communicatie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Laatste Communicatie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan niet aftrekken als categorie is voor ' Valuation ' of ' Valuation en Total '
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lijst uw fiscale koppen (bv BTW, douane etc, ze moeten unieke namen hebben) en hun standaard tarieven. Dit zal een standaard template, die u kunt bewerken en voeg later meer te creëren."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalingen met Facturen
@@ -3423,7 +3426,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totaal (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Vrije Tijd
 DocType: Quality Inspection,Item Serial No,Artikel Serienummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Maak Employee Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Maak Employee Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Totaal Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Boekhouding Jaarrekening
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,uur
@@ -3436,10 +3439,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Onbekend
 DocType: Shipping Rule,Shipping Rule Conditions,Verzendregel Voorwaarden
 DocType: BOM Replace Tool,The new BOM after replacement,De nieuwe Stuklijst na vervanging
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,ontvangen Bedrag
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Installeer alsjeblieft het Systeem van de personeelsnaam in het menselijk hulpmiddel&gt; HR-instellingen
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Maak voor de volledige hoeveelheid, het negeren van de hoeveelheid reeds bestelde"
 DocType: Account,Tax,Belasting
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ongemerkt
@@ -3452,9 +3453,9 @@
 DocType: Batch,Source Document Name,Bron Document Naam
 DocType: Batch,Source Document Name,Bron Document Naam
 DocType: Job Opening,Job Title,Functietitel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Gebruikers maken
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Gebruikers maken
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Hoeveelheid voor fabricage moet groter dan 0 zijn.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bezoek rapport voor onderhoud gesprek.
 DocType: Stock Entry,Update Rate and Availability,Update snelheid en beschikbaarheid
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Percentage dat u meer mag ontvangen of leveren dan de bestelde hoeveelheid. Bijvoorbeeld: Als u  100 eenheden heeft besteld en uw bandbreedte is 10% dan mag u 110 eenheden ontvangen.
@@ -3464,28 +3465,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Kostenrekening is verplicht voor artikel {0}
 DocType: BOM,Website Description,Website Beschrijving
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto wijziging in het eigen vermogen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Annuleer Purchase Invoice {0} eerste
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailadres moet uniek zijn, bestaat al voor {0}"
 DocType: Serial No,AMC Expiry Date,AMC Vervaldatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Ontvangst
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Ontvangst
 ,Sales Register,Verkoopregister
 DocType: Daily Work Summary Settings Company,Send Emails At,Stuur e-mails
 DocType: Quotation,Quotation Lost Reason,Reden verlies van Offerte
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Kies uw domeinnaam
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transactiereferentie geen {0} van {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Er is niets om te bewerken .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Nog geen klanten!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kasstroomoverzicht
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Geleende bedrag kan niet hoger zijn dan maximaal bedrag van de lening van {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licentie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Voer Afschrijvingenrekening in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Laatste Bestel Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Account {0} behoort niet tot bedrijf {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienummers in rij {0} komt niet overeen met bezorgingsnota
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Attendance voor meerdere medewerkers
@@ -3510,20 +3513,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rij {0} # Account moet van het type zijn &#39;Vaste Activa&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,out Aantal
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regels om verzendkosten te berekenen voor een verkooptransactie
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Reeks is verplicht
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Reeks is verplicht
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Financiële Dienstverlening
 DocType: Student Sibling,Student ID,student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Soorten activiteiten voor Time Logs
 DocType: Tax Rule,Sales,Verkoop
 DocType: Stock Entry Detail,Basic Amount,Basisbedrag
 DocType: Training Event,Exam,tentamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Magazijn nodig voor voorraad Artikel {0}
 DocType: Leave Allocation,Unused leaves,Ongebruikte afwezigheden
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Verplaatsen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} niet geassocieerd met Party Account {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} niet geassocieerd met Party Account {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Haal uitgeklapte Stuklijst op (inclusief onderdelen)
 DocType: Authorization Rule,Applicable To (Employee),Van toepassing zijn op (Werknemer)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Vervaldatum is verplicht
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Toename voor Attribute {0} kan niet worden 0
@@ -3534,13 +3537,13 @@
 ,Inactive Customers,inactieve klanten
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Aankoopfacturen
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hoe wordt de Prijsregel toegepast?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hoe wordt de Prijsregel toegepast?
 DocType: Stock Entry,Delivery Note No,Vrachtbrief Nr
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Indien aangevinkt, alleen Aankoop materiaal aanvragen voor finale grondstoffen zullen worden opgenomen in de Material Verzoeken. Anders zal Materiaal Verzoeken om bovenliggende items worden aangemaakt"
 DocType: Cheque Print Template,Message to show,Bericht om te laten zien
 DocType: Company,Retail,Retail
 DocType: Attendance,Absent,Afwezig
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Product Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3550,10 +3553,10 @@
 DocType: Payment Entry,Account Paid From,Account betaald uit
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Grondstof Artikelcode
 DocType: Journal Entry,Write Off Based On,Afschrijving gebaseerd op
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,maak Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,maak Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print en stationaire
 DocType: Stock Settings,Show Barcode Field,Show streepjescodeveld
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Stuur Leverancier Emails
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Stuur Leverancier Emails
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salaris al verwerkt voor de periode tussen {0} en {1}, Laat aanvraagperiode kan niet tussen deze periode."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installatie record voor een Serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian Interest
@@ -3566,6 +3569,7 @@
 DocType: Offer Letter,Awaiting Response,Wachten op antwoord
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Boven
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ongeldige eigenschap {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Noem als niet-standaard betaalbaar account
 DocType: Salary Slip,Earning & Deduction,Verdienen &amp; Aftrek
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Optioneel. Deze instelling wordt gebruikt om te filteren op diverse transacties .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatieve Waarderingstarief is niet toegestaan
@@ -3581,10 +3585,9 @@
 DocType: Production Order Item,Production Order Item,Productieorder Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Geen record gevonden
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kosten van Gesloopt Asset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,gedeeltelijk bestelde Thaise dessertlekkernijen zat
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: kostenplaats is verplicht voor Artikel {2}
 DocType: Vehicle,Policy No,beleid Geen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Krijg Items uit Product Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Krijg Items uit Product Bundle
 DocType: Asset,Straight Line,Rechte lijn
 DocType: Project User,Project User,project Gebruiker
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,spleet
@@ -3602,7 +3605,7 @@
 DocType: Program Enrollment Tool,Get Students From,Krijgen studenten uit
 DocType: Hub Settings,Seller Country,Verkoper Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Artikelen publiceren op de website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Groep uw leerlingen in batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Groep uw leerlingen in batches
 DocType: Authorization Rule,Authorization Rule,Autorisatie Rule
 DocType: Sales Invoice,Terms and Conditions Details,Algemene Voorwaarden Details
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,specificaties
@@ -3655,14 +3658,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Cheque Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Rekening {0}: Bovenliggende rekening {1} hoort niet bij bedrijf: {2}
 DocType: Program Enrollment Tool,Student Applicants,student Aanvragers
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Succesvol verwijderd alle transacties met betrekking tot dit bedrijf!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,inschrijfdatum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,proeftijd
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,salaris Components
 DocType: Program Enrollment Tool,New Academic Year,New Academisch Jaar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Credit Note
 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 +28,Total Paid Amount,Totale betaalde bedrag
 DocType: Production Order Item,Transferred Qty,Verplaatst Aantal
@@ -3677,12 +3680,12 @@
 DocType: Journal Entry,Cash Entry,Cash Entry
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,Child nodes kunnen alleen worden gemaakt op grond van het type nodes &#39;Groep&#39;
 DocType: Leave Application,Half Day Date,Halve dag Date
-DocType: Academic Year,Academic Year Name,Academisch Jaar Naam
+DocType: Academic Year,Academic Year Name,Academisch jaar naam
 DocType: Sales Partner,Contact Desc,Contact Omschr
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type verloven zoals, buitengewoon, ziekte, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Stuur regelmatige samenvattende rapporten via e-mail.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Stel standaard account aan Expense conclusie Type {0}
 DocType: Assessment Result,Student Name,Studenten naam
 DocType: Brand,Item Manager,Item Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,payroll Payable
@@ -3703,6 +3706,7 @@
 ,Sales Funnel,Verkoop Trechter
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Afkorting is verplicht
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kar
 ,Qty to Transfer,Aantal te verplaatsen
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offertes naar leads of klanten.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol toegestaan om bevroren voorraden bewerken
@@ -3730,13 +3734,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Artikelgebaseerde BTW Details
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Instituut Afkorting
 ,Item-wise Price List Rate,Artikelgebaseerde Prijslijst Tarief
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Leverancier Offerte
 DocType: Quotation,In Words will be visible once you save the Quotation.,In Woorden zijn zichtbaar zodra u de Offerte opslaat.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Hoeveelheid ({0}) kan geen fractie in rij {1} zijn
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Verzamel Vergoedingen
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} is al gebruikt in het Item {1}
 DocType: Lead,Add to calendar on this date,Toevoegen aan agenda op deze datum
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regels voor het toevoegen van verzendkosten.
 DocType: Item,Opening Stock,Opening Stock
@@ -3754,8 +3758,8 @@
  Bijgewerkt via 'Time Log'"
 DocType: Customer,From Lead,Van Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Orders vrijgegeven voor productie.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecteer boekjaar ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecteer boekjaar ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profiel nodig om POS Entry maken
 DocType: Program Enrollment Tool,Enroll Students,inschrijven Studenten
 DocType: Hub Settings,Name Token,Naam Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standaard Verkoop
@@ -3766,7 +3770,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} tegen verkoopfactuur {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Naam van het project
-DocType: Supplier,Mention if non-standard receivable account,Vermelden of niet-standaard te ontvangen rekening
+DocType: Customer,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: Production Order,Required Items,Vereiste items
 DocType: Stock Ledger Entry,Stock Value Difference,Voorraad Waarde Verschil
@@ -3787,7 +3791,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Set richt Item Group-wise voor deze verkoper.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Bevries Voorraden ouder dan [dagen]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rij # {0}: Asset is verplicht voor vaste activa aankoop / verkoop
-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.","Als twee of meer Pricing Regels zijn gevonden op basis van de bovenstaande voorwaarden, wordt prioriteit toegepast. Prioriteit is een getal tussen 0 en 20, terwijl standaardwaarde nul (blanco). Hoger aantal betekent dat het voorrang krijgen als er meerdere prijzen Regels met dezelfde voorwaarden."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Als twee of meer Pricing Regels zijn gevonden op basis van de bovenstaande voorwaarden, wordt prioriteit toegepast. Prioriteit is een getal tussen 0 en 20, terwijl standaardwaarde nul (blanco). Hoger aantal betekent dat het voorrang krijgen als er meerdere prijzen Regels met dezelfde voorwaarden."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Boekjaar: {0} bestaat niet
 DocType: Currency Exchange,To Currency,Naar Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Laat de volgende gebruikers te keuren Verlof Aanvragen voor blok dagen.
@@ -3813,7 +3817,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Artikel {0} genegeerd omdat het niet een voorraadartikel is
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Dien deze productieorder in voor verdere verwerking .
-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.","Om de prijsbepalingsregel in een specifieke transactie niet toe te passen, moeten alle toepasbare prijsbepalingsregels worden uitgeschakeld."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Om de prijsbepalingsregel in een specifieke transactie niet toe te passen, moeten alle toepasbare prijsbepalingsregels worden uitgeschakeld."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Verkooporder Trends
@@ -3824,7 +3828,7 @@
 DocType: Stock Entry Detail,Additional Cost,Bijkomende kosten
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Boekjaar Einddatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Maak Leverancier Offerte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Maak Leverancier Offerte
 DocType: Quality Inspection,Incoming,Inkomend
 DocType: BOM,Materials Required (Exploded),Benodigde materialen (uitgeklapt)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Gebruikers toe te voegen aan uw organisatie, anders dan jezelf"
@@ -3852,6 +3856,7 @@
 DocType: Employee,History In Company,Geschiedenis In Bedrijf
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nieuwsbrieven
 DocType: Stock Ledger Entry,Stock Ledger Entry,Voorraad Dagboek post
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klant&gt; Klantengroep&gt; Territorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Hetzelfde artikel is meerdere keren ingevoerd
 DocType: Department,Leave Block List,Verlof bloklijst
 DocType: Sales Invoice,Tax ID,BTW-nummer
@@ -3861,7 +3866,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner en de Commissie
 DocType: Employee Loan,Rate of Interest (%) / Year,Rate of Interest (%) / Jaar
 ,Project Quantity,project Hoeveelheid
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totaal {0} voor alle items nul is, kan je zou moeten veranderen &#39;Verdeel heffingen op basis van&#39;"
 DocType: Opportunity,To Discuss,Te bespreken
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} eenheden van {1} die nodig zijn in {2} om deze transactie te voltooien.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rate of Interest (%) Jaarlijkse
@@ -3876,7 +3881,7 @@
 DocType: Purchase Invoice,Return,Terugkeer
 DocType: Production Order Operation,Production Order Operation,Productie Order Operatie
 DocType: Pricing Rule,Disable,Uitschakelen
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Wijze van betaling is vereist om een betaling te doen
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Wijze van betaling is vereist om een betaling te doen
 DocType: Project Task,Pending Review,In afwachting van Beoordeling
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan niet worden gesloopt, want het is al {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense Claim)
@@ -3884,11 +3889,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Afwezig
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rij {0}: Munt van de BOM # {1} moet gelijk zijn aan de geselecteerde valuta zijn {2}
 DocType: Journal Entry Account,Exchange Rate,Wisselkoers
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Verkooporder {0} is niet ingediend
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Vloot beheer
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Items uit voegen
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Items uit voegen
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazijn {0}: Bovenliggende rekening {1} behoort niet tot bedrijf {2}
 DocType: Cheque Print Template,Regular,regelmatig
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Totaal weightage van alle beoordelingscriteria moet 100% zijn
@@ -3901,7 +3906,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazijn {0} bestaat niet
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inschrijven Voor ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Maandelijkse Verdeling Percentages
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Het geselecteerde item kan niet Batch hebben
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Waardering tarief niet gevonden voor het artikel {0}, die nodig is om boekingen te doen {1} {2}. Als het item wordt transacties als een monster punt in de {1}, gelieve dat in de {1} Item tafel. Zo niet, maak dan een inkomend aandelen transactie voor het item of de vermelding waardering tarief in de Item record, en dan proberen submiting / annuleren van dit item"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% van de geleverde materialen voor deze Vrachtbrief
 DocType: Project,Customer Details,Klant Details
@@ -3910,15 +3915,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Voer URL-parameter voor de ontvanger nos
 DocType: Payment Entry,Paid Amount,Betaald Bedrag
 DocType: Assessment Plan,Supervisor,opzichter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Beschikbaar voor Verpakking Items
 DocType: Item Variant,Item Variant,Artikel Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Result Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Ingezonden bestellingen kunnen niet worden verwijderd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Accountbalans reeds in Debet, 'Balans moet zijn' mag niet als 'Credit' worden ingesteld"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Quality Management
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} is uitgeschakeld
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} is uitgeschakeld
 DocType: Employee Loan,Repay Fixed Amount per Period,Terugbetalen vast bedrag per periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vul het aantal in voor artikel {0}
 DocType: Employee External Work History,Employee External Work History,Werknemer Externe Werk Geschiedenis
@@ -3945,7 +3950,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Kennisgeving ( dagen )
 DocType: Tax Rule,Sales Tax Template,Sales Tax Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecteer items om de factuur te slaan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Selecteer items om de factuur te slaan
 DocType: Employee,Encashment Date,Betalingsdatum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Voorraad aanpassing
@@ -3969,7 +3974,7 @@
 DocType: Item Variant Attribute,Attribute,Attribuut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Gelieve te specificeren van / naar variëren
 DocType: Serial No,Under AMC,Onder AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Item waardering tarief wordt herberekend overweegt landde kosten voucherbedrag
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Item waardering tarief wordt herberekend overweegt landde kosten voucherbedrag
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standaardinstellingen voor Verkooptransacties .
 DocType: Guardian,Guardian Of ,Beschermer van
 DocType: Grading Scale Interval,Threshold,Drempel
@@ -3979,6 +3984,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debetnota
 DocType: Production Order,Warehouses,Magazijnen
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} actief kan niet worden overgedragen
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Dit artikel is een variant van {0} (Sjabloon).
 DocType: Workstation,per hour,per uur
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,inkoop
 DocType: Announcement,Announcement,Mededeling
@@ -3994,8 +4000,8 @@
 DocType: Account,Receivable,Vordering
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rij # {0}: Niet toegestaan om van leverancier te veranderen als bestelling al bestaat
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol welke is toegestaan om transacties in te dienen die gestelde kredietlimieten overschrijden .
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecteer Items voor fabricage
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Selecteer Items voor fabricage
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master data synchronisatie, kan het enige tijd duren"
 DocType: Item,Material Issue,Materiaal uitgifte
 DocType: Hub Settings,Seller Description,Verkoper Beschrijving
 DocType: Employee Education,Qualification,Kwalificatie
@@ -4007,7 +4013,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Besteld
 DocType: Salary Detail,Component,bestanddeel
 DocType: Assessment Criteria,Assessment Criteria Group,Beoordelingscriteria Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Het openen van de cumulatieve afschrijvingen moet kleiner zijn dan gelijk aan {0}
 DocType: Warehouse,Warehouse Name,Magazijn Naam
 DocType: Naming Series,Select Transaction,Selecteer Transactie
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vul de Goedkeurders Rol of Goedkeurende Gebruiker in
@@ -4020,7 +4026,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Kan niet annuleren omdat ingediende Voorraad Invoer {0} bestaat
 DocType: Employee Loan,Disbursement Date,uitbetaling Date
 DocType: Vehicle,Vehicle,Voertuig
 DocType: Purchase Invoice,In Words,In Woorden
@@ -4034,14 +4040,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Afschrijvingen en Weegschalen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Bedrag {0} {1} overgebracht van {2} naar {3}
 DocType: Sales Invoice,Get Advances Received,Get ontvangen voorschotten
 DocType: Email Digest,Add/Remove Recipients,Toevoegen / verwijderen Ontvangers
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transactie niet toegestaan met gestopte productieorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Om dit boekjaar in te stellen als standaard, klik op 'Als standaard instellen'"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,toetreden
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Tekort Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Artikel variant {0} bestaat met dezelfde kenmerken
 DocType: Employee Loan,Repay from Salary,Terugbetalen van Loon
 DocType: Leave Application,LAP/,RONDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Betalingsverzoeken tegen {0} {1} van {2} bedrag
@@ -4059,7 +4065,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Assessment Resultaat Detail
 DocType: Employee Education,Employee Education,Werknemer Opleidingen
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate artikelgroep gevonden in de artikelgroep tafel
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Het is nodig om Item Details halen.
 DocType: Salary Slip,Net Pay,Nettoloon
 DocType: Account,Account,Rekening
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} is reeds ontvangen
@@ -4068,7 +4074,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} is niet gekoppeld aan een rekening, maak / verbinden de overeenkomstige (Asset) zijn goed voor het magazijn."
 DocType: Purchase Invoice,Recurring Id,Terugkerende Id
 DocType: Customer,Sales Team Details,Verkoop Team Details
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Permanent verwijderen?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Permanent verwijderen?
 DocType: Expense Claim,Total Claimed Amount,Totaal gedeclareerd bedrag
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiële mogelijkheden voor verkoop.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ongeldige {0}
@@ -4079,13 +4085,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Stel uw School in ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Change Bedrag (Company Munt)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Geen boekingen voor de volgende magazijnen
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Sla het document eerst.
 DocType: Account,Chargeable,Aan te rekenen
 DocType: Company,Change Abbreviation,Afkorting veranderen
 DocType: Expense Claim Detail,Expense Date,Kosten Datum
 DocType: Item,Max Discount (%),Max Korting (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Laatste Orderbedrag
+DocType: Task,Is Milestone,Is Milestone
 DocType: Daily Work Summary,Email Sent To,Email verzonden naar
 DocType: Budget,Warn,Waarschuwen
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuele andere opmerkingen, noemenswaardig voor in de boekhouding,"
@@ -4106,7 +4113,7 @@
 DocType: Item Attribute Value,Attribute Value,Eigenschap Waarde
 ,Itemwise Recommended Reorder Level,Artikelgebaseerde Aanbevolen Bestelniveau
 DocType: Salary Detail,Salary Detail,salaris Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Selecteer eerst {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Selecteer eerst {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} van Item {1} is verlopen.
 DocType: Sales Invoice,Commission,commissie
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet voor de productie.
@@ -4118,41 +4125,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Bevries Voorraden Ouder dan' moet minder dan %d dagen zijn.
 DocType: Tax Rule,Purchase Tax Template,Kopen Tax Template
 ,Project wise Stock Tracking,Projectgebaseerde Aandelenhandel
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Onderhoudsschema {0} bestaat tegen {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Werkelijke Aantal (bij de bron / doel)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Werknemer regel.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Stel Volgende Afschrijvingen Date
 DocType: HR Settings,Payroll Settings,Loonadministratie Instellingen
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match niet-gekoppelde facturen en betalingen.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Plaats bestelling
 DocType: Email Digest,New Purchase Orders,Nieuwe Inkooporders
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kan niet een bovenliggende kostenplaats hebben
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Selecteer merk ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Selecteer merk ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Cumulatieve afschrijvingen Op
 DocType: Sales Invoice,C-Form Applicable,C-Form Toepasselijk
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operatie tijd moet groter zijn dan 0 voor de operatie zijn {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazijn is verplicht
 DocType: Supplier,Address and Contacts,Adres en Contacten
 DocType: UOM Conversion Detail,UOM Conversion Detail,Eenheid Omrekeningsfactor Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Houd het web vriendelijk 900px (w) bij 100px (h)
 DocType: Program,Program Abbreviation,programma Afkorting
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Productie bestelling kan niet tegen een Item Template worden verhoogd
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kosten worden bijgewerkt in Kwitantie tegen elk item
 DocType: Warranty Claim,Resolved By,Opgelost door
 DocType: Bank Guarantee,Start Date,Startdatum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Toewijzen bladeren voor een periode .
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques en Deposito verkeerd ontruimd
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Maak een offerte voor de klant
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Maak een offerte voor de klant
 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 +38,Bill of Materials (BOM),Stuklijsten
 DocType: Item,Average time taken by the supplier to deliver,De gemiddelde tijd die door de leverancier te leveren
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,assessment Resultaat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Uren
 DocType: Project,Expected Start Date,Verwachte startdatum
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Artikel verwijderen als de kosten niet van toepassing zijn op dat artikel
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transactie valuta moet hetzelfde zijn als Payment Gateway valuta
 DocType: Payment Entry,Receive,Ontvangen
@@ -4163,19 +4169,19 @@
 DocType: Workstation,Operating Costs,Bedrijfskosten
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Actie als gezamenlijke maandelijkse budget overschreden
 DocType: Purchase Invoice,Submit on creation,Toevoegen aan de creatie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Munt voor {0} moet {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Munt voor {0} moet {1}
 DocType: Asset,Disposal Date,verwijdering Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emails worden meegedeeld aan alle actieve werknemers van het bedrijf worden verzonden op het opgegeven uur, als ze geen vakantie. Samenvatting van de reacties zal worden verzonden om middernacht."
 DocType: Employee Leave Approver,Employee Leave Approver,Werknemer Verlof Fiatteur
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rij {0}: Er bestaat al een nabestelling voor dit magazijn {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan niet als verloren instellen, omdat offerte is gemaakt."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,training Terugkoppeling
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Productie Order {0} moet worden ingediend
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Selecteer Start- en Einddatum voor Artikel {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Natuurlijk is verplicht in de rij {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tot Datum kan niet eerder zijn dan Van Datum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Toevoegen / bewerken Prijzen
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Toevoegen / bewerken Prijzen
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Batch,Parent Batch,Ouderlijk Batch
 DocType: Cheque Print Template,Cheque Print Template,Cheque Print Template
@@ -4189,7 +4195,7 @@
 ,Ordered Items To Be Delivered,Bestelde artikelen te leveren
 DocType: Account,Income,Inkomsten
 DocType: Industry Type,Industry Type,Industrie Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Er is iets fout gegaan!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Er is iets fout gegaan!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Waarschuwing: Verlof applicatie bevat volgende blok data
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Verkoopfactuur {0} is al ingediend
 DocType: Assessment Result Detail,Score,partituur
@@ -4220,17 +4226,17 @@
 DocType: Item,Variant Based On,Variant gebaseerd op
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totaal toegewezen gewicht moet 100% zijn. Het is {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Uw Leveranciers
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Kan niet als verloren instellen, omdat er al een verkooporder is gemaakt."
+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 verkooporder is gemaakt."
 DocType: Request for Quotation Item,Supplier Part No,Leverancier Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Gekregen van
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan niet aftrekken als categorie is voor &#39;Valuation&#39; of &#39;Vaulation en Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Gekregen van
 DocType: Lead,Converted,Omgezet
 DocType: Item,Has Serial No,Heeft Serienummer
 DocType: Employee,Date of Issue,Datum van afgifte
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Van {0} voor {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Van {0} voor {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rij # {0}: Stel Leverancier voor punt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rij {0}: Aantal uren moet groter zijn dan nul.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4239,20 +4245,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Billing munt moet gelijk zijn aan valuta of partij rekening valuta ofwel default comapany&#39;s zijn
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Laat Inning
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Wat doet het?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Tot Magazijn
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle studentenadministratie
 ,Average Commission Rate,Gemiddelde Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Aanwezigheid kan niet aangemerkt worden voor toekomstige data
 DocType: Pricing Rule,Pricing Rule Help,Prijsbepalingsregel Help
 DocType: School House,House Name,Huis naam
 DocType: Purchase Taxes and Charges,Account Head,Hoofdrekening
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Update de bijkomende kosten om de totaalkost te berekenen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elektrisch
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg de rest van uw organisatie als uw gebruikers. U kunt ook toevoegen uitnodigen klanten naar uw portal door ze toe te voegen vanuit Contacten
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Voeg de rest van uw organisatie als uw gebruikers. U kunt ook toevoegen uitnodigen klanten naar uw portal door ze toe te voegen vanuit Contacten
 DocType: Stock Entry,Total Value Difference (Out - In),Totale waarde Verschil (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4261,7 +4267,7 @@
 DocType: Item,Customer Code,Klantcode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Verjaardagsherinnering voor {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagen sinds laatste Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debitering van rekening moet een balansrekening zijn
 DocType: Buying Settings,Naming Series,Benoemen Series
 DocType: Leave Block List,Leave Block List Name,Laat Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum moet kleiner zijn dan de verzekering einddatum
@@ -4276,9 +4282,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Loonstrook van de werknemer {0} al gemaakt voor urenregistratie {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Besteld Aantal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punt {0} is uitgeschakeld
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punt {0} is uitgeschakeld
 DocType: Stock Settings,Stock Frozen Upto,Voorraad Bevroren Tot
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM geen voorraad artikel bevatten
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Project activiteit / taak.
 DocType: Vehicle Log,Refuelling Details,Tanken Details
@@ -4288,8 +4294,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Laatste aankoop tarief niet gevonden
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Af te schrijven bedrag (Bedrijfsvaluta)
 DocType: Sales Invoice Timesheet,Billing Hours,Billing Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standaard BOM voor {0} niet gevonden
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rij # {0}: Stel nabestelling hoeveelheid
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tik op items om ze hier toe te voegen
 DocType: Fees,Program Enrollment,programma Inschrijving
 DocType: Landed Cost Voucher,Landed Cost Voucher,Vrachtkosten Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Stel {0} in
@@ -4313,7 +4320,7 @@
 DocType: Maintenance Visit,Maintenance Date,Onderhoud Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Afgewezen Serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Jaar begindatum of einddatum overlapt met {0}. Om te voorkomen dat stel bedrijf
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Startdatum moet kleiner zijn dan einddatum voor Artikel {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.","Voorbeeld: ABCD.##### Als reeks is ingesteld en het serienummer is niet vermeld in een transactie, dan zal een serienummer automatisch worden aangemaakt, op basis van deze reeks. Als u altijd expliciet een serienummer wilt vemelden voor dit artikel bij een transatie, laat dan dit veld leeg."
 DocType: Upload Attendance,Upload Attendance,Upload Aanwezigheid
@@ -4389,7 +4396,6 @@
 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
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Boekjaar Startdatum en Boekjaar Einddatum zijn al ingesteld voor het fiscale jaar {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Ontruiming Geactualiseerd
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4436,14 +4442,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Verlaat het vinkje als u geen batch wilt overwegen tijdens het maken van cursussen op basis van cursussen.
 DocType: Asset,Frequency of Depreciation (Months),Frequentie van afschrijvingen (Maanden)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit Account
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Credit Account
 DocType: Landed Cost Item,Landed Cost Item,Vrachtkosten Artikel
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup een eenvoudige website voor mijn organisatie
 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 +666,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Geef aub attribuut Waarde voor kenmerk {0}
 DocType: Item,Default Warehouse,Standaard Magazijn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan niet tegen Group rekening worden toegewezen {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vul bovenliggende kostenplaats in
@@ -4489,7 +4495,7 @@
 DocType: Opportunity Item,Basic Rate,Basis Tarief
 DocType: GL Entry,Credit Amount,Credit Bedrag
 DocType: Cheque Print Template,Signatory Position,ondertekenaar Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Instellen als Verloren
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Instellen als Verloren
 DocType: Timesheet,Total Billable Hours,Totaal factureerbare uren
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Ontvangst Opmerking
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dit is gebaseerd op transacties tegen deze klant. Zie tijdlijn hieronder voor meer informatie
@@ -4503,11 +4509,11 @@
 ,Items To Be Requested,Aan te vragen artikelen
 DocType: Purchase Order,Get Last Purchase Rate,Get Laatst Purchase Rate
 DocType: Company,Company Info,Bedrijfsinformatie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecteer of voeg nieuwe klant
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Selecteer of voeg nieuwe klant
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kostenplaats nodig is om een declaratie te boeken
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Toepassing van kapitaal (Activa)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dit is gebaseerd op de aanwezigheid van deze werknemer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetrekening
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Debetrekening
 DocType: Fiscal Year,Year Start Date,Jaar Startdatum
 DocType: Attendance,Employee Name,Werknemer Naam
 DocType: Sales Invoice,Rounded Total (Company Currency),Afgerond Totaal (Bedrijfsvaluta)
@@ -4516,13 +4522,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Aankoopbedrag
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverancier Offerte {0} aangemaakt
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Eindjaar kan niet voor Start Jaar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Employee Benefits
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Stel een standaard Holiday-lijst voor Employee {0} of Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} bestaat niet
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} bestaat niet
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rij Geen {0}: Bedrag kan niet groter zijn dan afwachting Bedrag tegen Expense conclusie {1} zijn. In afwachting van Bedrag is {2}
@@ -4531,15 +4537,17 @@
 DocType: Quality Inspection Reading,Reading 3,Meting 3
 ,Hub,Naaf
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Prijslijst niet gevonden of uitgeschakeld
 DocType: Employee Loan Application,Approved,Aangenomen
 DocType: Pricing Rule,Price,prijs
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Werknemer ontslagen op {0} moet worden ingesteld als 'Verlaten'
 DocType: Guardian,Guardian,Voogd
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Beoordeling {0} gemaakt voor Employee {1} in de bepaalde periode
 DocType: Employee,Education,Onderwijs
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campagnenaam gegeven door
 DocType: Employee,Current Address Is,Huidige adres is
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,gemodificeerde
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Optioneel. Stelt bedrijf prijslijst, indien niet opgegeven."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Journaalposten.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Aantal beschikbaar bij Van Warehouse
@@ -4548,7 +4556,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rij {0}: Party / Account komt niet overeen met {1} / {2} in {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vul Kostenrekening in
 DocType: Account,Stock,Voorraad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rij # {0}: Reference document moet een van Purchase Order, Purchase Invoice of Inboeken zijn"
 DocType: Employee,Current Address,Huidige adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Als artikel is een variant van een ander item dan beschrijving, afbeelding, prijzen, belastingen etc zal worden ingesteld van de sjabloon, tenzij expliciet vermeld"
 DocType: Serial No,Purchase / Manufacture Details,Inkoop / Productie Details
@@ -4576,7 +4584,7 @@
 DocType: Hub Settings,Hub Settings,Hub Instellingen
 DocType: Project,Gross Margin %,Bruto marge %
 DocType: BOM,With Operations,Met Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Boekingen zijn reeds geboekt in valuta {0} voor bedrijf {1}. Selecteer een vordering of te betalen rekening met valuta {0}.
 DocType: Asset,Is Existing Asset,Is Bestaande Asset
 DocType: Salary Detail,Statistical Component,Statistische Component
 DocType: Salary Detail,Statistical Component,Statistische Component
@@ -4601,7 +4609,7 @@
 DocType: Assessment Plan,Room,Kamer
 DocType: Purchase Order,Advance Paid,Voorschot Betaald
 DocType: Item,Item Tax,Artikel Belasting
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiaal aan Leverancier
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiaal aan Leverancier
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Accijnzen Factuur
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% meer dan eens
 DocType: Expense Claim,Employees Email Id,Medewerkers E-mail ID
@@ -4632,9 +4640,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bevestig Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stock Levels
 DocType: Customer,Commission Rate,Commissie Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Maak Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Maak Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blokkeer verlofaanvragen per afdeling.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type moet een van te ontvangen, betalen en Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Betaling Type moet een van te ontvangen, betalen en Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Winkelwagen is leeg
 DocType: Vehicle,Model,Model
@@ -4645,6 +4653,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Laat Productie op vakantie
 DocType: Sales Order,Customer's Purchase Order Date,Inkooporder datum van Klant
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitaal Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Publieke bijlagen tonen
 DocType: Packing Slip,Package Weight Details,Pakket gewicht details
 DocType: Payment Gateway Account,Payment Gateway Account,Payment Gateway Account
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Na betaling voltooiing omleiden gebruiker geselecteerde pagina.
@@ -4663,15 +4672,15 @@
 DocType: Batch,Expiry Date,Vervaldatum
 ,Supplier Addresses and Contacts,Leverancier Adressen en Contacten
 ,accounts-browser,accounts-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Selecteer eerst een Categorie
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Selecteer eerst een Categorie
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Project stam.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Om ervoor te zorgen over-facturering of over-bestellen, &quot;Allowance&quot; actualiseren Stock Settings of het item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Vertoon geen symbool zoals $, enz. naast valuta."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halve Dag)
 DocType: Supplier,Credit Days,Credit Dagen
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Maak Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Maak Student Batch
 DocType: Leave Type,Is Carry Forward,Is Forward Carry
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Artikelen ophalen van Stuklijst
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Artikelen ophalen van Stuklijst
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead Time Dagen
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rij # {0}: Plaatsingsdatum moet hetzelfde zijn als aankoopdatum {1} van de activa {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vul verkooporders in de bovenstaande tabel
@@ -4688,8 +4697,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Gesanctioneerde Bedrag
 DocType: GL Entry,Is Opening,Opent
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Rij {0}: debitering niet kan worden verbonden met een {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Gelieve op te stellen nummeringsreeks voor Attendance via Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Rekening {0} bestaat niet
 DocType: Account,Cash,Contant
 DocType: Employee,Short biography for website and other publications.,Korte biografie voor website en andere publicaties.
diff --git a/erpnext/translations/no.csv b/erpnext/translations/no.csv
index 985a9eb..b0ac73f 100644
--- a/erpnext/translations/no.csv
+++ b/erpnext/translations/no.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Leide
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Gjelder for User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppet produksjonsordre kan ikke avbestilles, Døves det første å avbryte"
 DocType: Vehicle Service,Mileage,Kilometer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Har du virkelig ønsker å hugge denne eiendelen?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Velg Standard Leverandør
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Velg Standard Leverandør
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta er nødvendig for Prisliste {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Vil bli beregnet i transaksjonen.
 DocType: Purchase Order,Customer Contact,Kundekontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Enestående for {0} kan ikke være mindre enn null ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minutter
 DocType: Leave Type,Leave Type Name,La Type Navn
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Vis åpen
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Vis åpen
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serien er oppdatert
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sjekk ut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Sendt inn
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Element Utløps Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 DocType: Mode of Payment Account,Mode of Payment Account,Modus for betaling konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Vis Varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Vis Varianter
 DocType: Academic Term,Academic Term,semester
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiale
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Antall
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Antall
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Regnskap bordet kan ikke være tomt.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Lån (gjeld)
 DocType: Employee Education,Year of Passing,Year of Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referanse:% s, Elementkode:% s og Kunde:% s"
 DocType: Item,Country of Origin,Opprinnelsesland
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,På Lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,åpne spørsmål
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Helsevesen
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Forsinket betaling (dager)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjenesten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} er allerede referert i salgsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodisitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Regnskapsår {0} er nødvendig
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Forventet Leveringsdato er være før Salgsordre Dato
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Fest CSV-fil med to kolonner, en for det gamle navnet og en for det nye navnet"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ikke i noen aktiv regnskapsåret.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Henvisning: {0}, Varenummer: {1} og kunde: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Logg
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Åpning for en jobb.
 DocType: Item Attribute,Increment,Tilvekst
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Velg Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Velg Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Annonsering
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Få elementer fra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ikke tillatt for {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Få elementer fra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock kan ikke oppdateres mot følgeseddel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Ingen elementer oppført
 DocType: Payment Reconciliation,Reconcile,Forsone
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Dagligvare
 DocType: Quality Inspection Reading,Reading 1,Lesing 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Neste Avskrivninger Datoen kan ikke være før Kjøpsdato
 DocType: SMS Center,All Sales Person,All Sales Person
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månedlig Distribusjon ** hjelper deg distribuere Budsjett / Target over måneder hvis du har sesongvariasjoner i din virksomhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ikke elementer funnet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ikke elementer funnet
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lønn Struktur Missing
 DocType: Lead,Person Name,Person Name
 DocType: Sales Invoice Item,Sales Invoice Item,Salg Faktura Element
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",for eksempel &quot;Primary School&quot; eller &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lager rapporter
 DocType: Warehouse,Warehouse Detail,Warehouse Detalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredittgrense er krysset for kunde {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Begrepet Sluttdato kan ikke være senere enn året sluttdato av studieåret som begrepet er knyttet (studieåret {}). Korriger datoene, og prøv igjen."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Er Fixed Asset&quot; ikke kan være ukontrollert, som Asset post eksisterer mot elementet"
 DocType: Vehicle Service,Brake Oil,bremse~~POS=TRUNC Oil
 DocType: Tax Rule,Tax Type,Skatt Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du er ikke autorisert til å legge til eller oppdatere bloggen før {0}
 DocType: BOM,Item Image (if not slideshow),Sak Image (hvis ikke show)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En Customer eksisterer med samme navn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timepris / 60) * Faktisk Operation Tid
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Velg BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Velg BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad for leverte varer
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Ferien på {0} er ikke mellom Fra dato og Til dato
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,skoler
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen forlater plate funnet for ansatt {0} og {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Skriv inn et selskap først
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vennligst velg selskapet først
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target På
 DocType: BOM,Total Cost,Totalkostnad
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Krav Beløp
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate kundegruppen funnet i cutomer gruppetabellen
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverandør Type / leverandør
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Leverandør Type / leverandør
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Konsum
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,grade
 DocType: Sales Invoice Item,Delivered By Supplier,Levert av Leverandør
 DocType: SMS Center,All Contact,All kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Produksjonsordre allerede opprettet for alle varer med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årslønn
 DocType: Daily Work Summary,Daily Work Summary,Daglig arbeid Oppsummering
 DocType: Period Closing Voucher,Closing Fiscal Year,Lukke regnskapsår
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} er frosset
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} er frosset
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Velg eksisterende selskap for å skape Konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Aksje Utgifter
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Velg Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Kreditt i selskapet Valuta
 DocType: Delivery Note,Installation Status,Installasjon Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ønsker du å oppdatere oppmøte? <br> Present: {0} \ <br> Fraværende: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Akseptert + Avvist Antall må være lik mottatt kvantum for Element {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Leverer råvare til Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,I det minste én modus av betaling er nødvendig for POS faktura.
 DocType: Products Settings,Show Products as a List,Vis produkter på en liste
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Gjør Avskrivninger Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Forespørsel Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Gjør Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Gjør Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Kringkasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execution
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljene for operasjonen utføres.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan for vedlikeholdsbesøk.
 DocType: SMS Settings,Enter url parameter for message,Skriv inn url parameter for melding
 DocType: POS Profile,Customer Groups,kunde~~POS=TRUNC grupper~~POS=HEADCOMP
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Årsregnskap
 DocType: Guardian,Students,studenter
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler for bruk av prising og rabatt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prisliste må være aktuelt for å kjøpe eller selge
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beløpet kan ikke være større enn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serien Liste for denne transaksjonen
 DocType: Company,Default Payroll Payable Account,Standard Lønn betales konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Oppdater E-postgruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Oppdater E-postgruppe
 DocType: Sales Invoice,Is Opening Entry,Åpner Entry
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nevn hvis ikke-standard fordring konto aktuelt
 DocType: Course Schedule,Instructor Name,instruktør Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,For Warehouse er nødvendig før Send
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottatt On
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Hvis det er merket, vil omfatte ikke-lager i materialet forespørsler."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot Salg Faktura Element
 ,Production Orders in Progress,Produksjonsordrer i Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Netto kontantstrøm fra finansierings
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Localstorage er full, ikke spare"
 DocType: Lead,Address & Contact,Adresse og kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Legg ubrukte blader fra tidligere bevilgninger
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Neste Recurring {0} vil bli opprettet på {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Costing Beløp (via Timeregistrering)
 DocType: Item Website Specification,Item Website Specification,Sak Nettsted Spesifikasjon
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,La Blokkert
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bank Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Element {0} har nådd slutten av livet på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bank Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Avstemming Element
 DocType: Stock Entry,Sales Invoice No,Salg Faktura Nei
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Publisere i Hub
 DocType: Student Admission,Student Admission,student Entre
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Element {0} er kansellert
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialet Request
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Element {0} er kansellert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående Sjekker og Innskudd å tømme
 DocType: Item,Synced With Hub,Synkronisert Med Hub
 DocType: Vehicle,Fleet Manager,Flåtesjef
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} ikke kan være negativ for elementet {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Feil Passord
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} ikke kan være negativ for elementet {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Feil Passord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Fullført Antall kan ikke være større enn &quot;Antall å Manufacture &#39;
 DocType: Period Closing Voucher,Closing Account Head,Lukke konto Leder
 DocType: Employee,External Work History,Ekstern Work History
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Rundskriv Reference Error
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Varsle på e-post om opprettelse av automatisk Material Request
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Levering Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Levering Note
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Sette opp skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Cost of Selges Asset
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} registrert to ganger i pkt Skatte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Oppsummering for denne uken og ventende aktiviteter
 DocType: Student Applicant,Admitted,innrømmet
 DocType: Workstation,Rent Cost,Rent Cost
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Bestillingsverdi
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / kontanter transaksjoner mot part eller for intern overføring
 DocType: Shipping Rule,Valid for Countries,Gyldig for Land
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Denne varen er en mal, og kan ikke brukes i transaksjoner. Element attributter vil bli kopiert over i varianter med mindre &#39;No Copy&#39; er satt"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total Bestill Regnes
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Ansatt betegnelse (f.eks CEO, direktør etc.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Skriv inn &#39;Gjenta på dag i måneden&#39; feltverdi
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Kjøp Faktura kan ikke gjøres mot en eksisterende eiendel {1}
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} allerede bevilget for Employee {1} for perioden {2} til {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Velg element
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Velg element
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Fakturaen {0} er allerede sendt
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch No må være samme som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konverter til ikke-konsernet
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (mye) av et element.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadato
 DocType: GL Entry,Debit Amount,Debet Beløp
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Det kan bare være en konto per Company i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vennligst se vedlegg
 DocType: Purchase Order,% Received,% Mottatt
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Opprett studentgrupper
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Forespørsel om kostnadsoverslag
 DocType: Salary Slip Timesheet,Working Hours,Arbeidstid
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Endre start / strøm sekvensnummer av en eksisterende serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Opprett en ny kunde
-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.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Opprette innkjøpsordrer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Opprett en ny kunde
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Hvis flere Pris Regler fortsette å råde, blir brukerne bedt om å sette Priority manuelt for å løse konflikten."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Opprette innkjøpsordrer
 ,Purchase Register,Kjøp Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Gjeldende avgifter
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) må ha rollen «La Godkjenner &#39;
 DocType: Purchase Receipt,Vehicle Date,Vehicle Dato
 DocType: Student Log,Medical,Medisinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Grunnen for å tape
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Grunnen for å tape
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Bly Eier kan ikke være det samme som Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Avsatt beløp kan ikke større enn ujustert beløp
 DocType: Announcement,Receiver,mottaker
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet og Rate
 DocType: Delivery Note,% Installed,% Installert
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Klasserom / Laboratorier etc hvor forelesningene kan planlegges.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Skriv inn firmanavn først
 DocType: Purchase Invoice,Supplier Name,Leverandør Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Les ERPNext Manual
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatorisk felt - akademisk år
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Tilpass innledende tekst som går som en del av e-posten. Hver transaksjon har en egen innledende tekst.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Vennligst angi standard betalbar konto for selskapet {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globale innstillinger for alle produksjonsprosesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Regnskap Frozen Opp
 DocType: SMS Log,Sent On,Sendte På
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Attributtet {0} valgt flere ganger i attributter Table
 DocType: HR Settings,Employee record is created using selected field. ,Ansatt posten er opprettet ved hjelp av valgte feltet.
 DocType: Sales Order,Not Applicable,Gjelder ikke
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday mester.
 DocType: Request for Quotation Item,Required Date,Nødvendig Dato
 DocType: Delivery Note,Billing Address,Fakturaadresse
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Skriv inn Element Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Skriv inn Element Code.
 DocType: BOM,Costing,Costing
 DocType: Tax Rule,Billing County,Billings County
 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"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Fra Package No.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Verdipapirer og innskudd
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan ikke endre verdsettelsesmetoden, da det er transaksjoner mot enkelte poster som ikke har egen verdsettelsesmetode"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blader tildelte er obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivelse av en ledig jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Ventende aktiviteter for i dag
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vennligst velg Kurs
 DocType: Timesheet Detail,Hrs,timer
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vennligst velg selskapet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Vennligst velg selskapet
 DocType: Stock Entry Detail,Difference Account,Forskjellen konto
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Kan ikke lukke oppgaven som sin avhengige oppgave {0} er ikke lukket.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Skriv inn Warehouse hvor Material Request vil bli hevet
 DocType: Production Order,Additional Operating Cost,Ekstra driftskostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetikk
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Å fusjonere, må følgende egenskaper være lik for begge elementene"
 DocType: Shipping Rule,Net Weight,Netto Vekt
 DocType: Employee,Emergency Phone,Emergency Phone
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kjøpe
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vennligst definer karakter for Terskel 0%
 DocType: Sales Order,To Deliver,Å Levere
 DocType: Purchase Invoice Item,Item,Sak
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serie ingen element kan ikke være en brøkdel
 DocType: Journal Entry,Difference (Dr - Cr),Forskjellen (Dr - Cr)
 DocType: Account,Profit and Loss,Gevinst og tap
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Administrerende Underleverandører
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tilveksten kan ikke være 0
 DocType: Production Planning Tool,Material Requirement,Material Requirement
 DocType: Company,Delete Company Transactions,Slett transaksjoner
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referansenummer og Reference Date er obligatorisk for Bank transaksjon
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Legg til / Rediger skatter og avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverandør Faktura Nei
 DocType: Territory,For reference,For referanse
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Installasjon Merk Element
 DocType: Production Plan Item,Pending Qty,Venter Stk
 DocType: Budget,Ignore,Ignorer
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} er ikke aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} er ikke aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS sendt til følgende nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Oppsett sjekk dimensjoner for utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lønn Slip Timeregistrering
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Total Commission
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Kvitteringen Påkrevd
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Verdsettelse Rate er obligatorisk hvis Åpning Stock oppgitt
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ingen poster ble funnet i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vennligst velg først selskapet og Party Type
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finansiell / regnskap år.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,akkumulerte verdier
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Gjør Salgsordre
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Gjør Salgsordre
 DocType: Project Task,Project Task,Prosjektet Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Fortsett Vedlegg
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Gjenta kunder
 DocType: Leave Control Panel,Allocate,Bevilge
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Merk: Totalt tildelte blader {0} bør ikke være mindre enn allerede innvilgede permisjoner {1} for perioden
 DocType: Announcement,Posted By,Postet av
 DocType: Item,Delivered by Supplier (Drop Ship),Levert av Leverandør (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Sitat Å
 DocType: Lead,Middle Income,Middle Income
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Åpning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Bevilget beløpet kan ikke være negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vennligst sett selskapet
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vennligst sett selskapet
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Salg Faktura Timeregistrering
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referansenummer og Reference Date er nødvendig for {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Velg betalingskonto å lage Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Lag personalregistre for å håndtere blader, refusjonskrav og lønn"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Legg til Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Forslaget Writing
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betaling Entry Fradrag
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} ikke i regnskapsåret {2}
 DocType: Buying Settings,Settings for Buying Module,Innstillinger for kjøp Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} tilhører ikke selskapet {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Skriv inn Kjøpskvittering først
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Skriv inn Kjøpskvittering først
 DocType: Buying Settings,Supplier Naming By,Leverandør Naming Av
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Netto endring i varelager
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Ansattes lån Ledelse
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relasjon med Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Betaling fra / til
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datointervall
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Ny kredittgrensen er mindre enn dagens utestående beløp for kunden. Kredittgrense må være atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,I løpet av minutter
 DocType: Issue,Resolution Date,Oppløsning Dato
 DocType: Student Batch Name,Batch Name,batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timeregistrering opprettet:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timeregistrering opprettet:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vennligst angi standard kontanter eller bankkontoen i modus for betaling {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Registrere
 DocType: Selling Settings,Customer Naming By,Kunden Naming Av
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Vil vise studenten som Tilstede i Student Månedlig fremmøterapport
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Faktisk Starttid
 DocType: BOM Operation,Operation Time,Operation Tid
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Bli ferdig
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Utgangspunkt
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Utgangspunkt
 DocType: Timesheet,Total Billed Hours,Totalt fakturert timer
 DocType: Journal Entry,Write Off Amount,Skriv Off Beløp
 DocType: Journal Entry,Bill No,Bill Nei
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,student Oppmøte
 DocType: Sales Invoice Timesheet,Time Sheet,Tids skjema
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Spylings Råvare basert på
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Skriv inn elementdetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Skriv inn elementdetaljer
 DocType: Interest,Interest,Renter
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Før salg
 DocType: Purchase Receipt,Other Details,Andre detaljer
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Betaling Entry er allerede opprettet
 DocType: Purchase Receipt Item Supplied,Current Stock,Nåværende Stock
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ikke knyttet til Element {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Forhåndsvisning Lønn Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Forhåndsvisning Lønn Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} er angitt flere ganger
 DocType: Account,Expenses Included In Valuation,Kostnader som inngår i verdivurderings
 DocType: Hub Settings,Seller City,Selger by
 ,Absent Student Report,Fraværende Student Rapporter
 DocType: Email Digest,Next email will be sent on:,Neste post vil bli sendt på:
 DocType: Offer Letter Term,Offer Letter Term,Tilby Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Elementet har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Selskapet {0} finnes ikke
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tre Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tre Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antall som forbrukes per enhet
 DocType: Serial No,Warranty Expiry Date,Garantiutløpsdato
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet og Warehouse
 DocType: Sales Invoice,Commission Rate (%),Kommisjonen Rate (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vennligst velg Program
 DocType: Project,Estimated Cost,anslått pris
@@ -768,7 +770,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Mottatt beløp (Selskap Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Lead må stilles inn hvis Opportunity er laget av Lead
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vennligst velg ukentlig off dag
 DocType: Production Order Operation,Planned End Time,Planlagt Sluttid
 ,Sales Person Target Variance Item Group-Wise,Sales Person Target Avviks varegruppe-Wise
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Opportunity Fra
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månedslønn uttalelse.
 DocType: BOM,Website Specifications,Nettstedet Spesifikasjoner
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Deltakelse via Oppsett&gt; Nummereringsserie
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Fra {0} av typen {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rad {0}: Omregningsfaktor er obligatorisk
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Prosjekt
 DocType: Quality Inspection Reading,Reading 7,Reading 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,delvis Bestilt
 DocType: Expense Claim Detail,Expense Claim Type,Expense krav Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinnstillingene for handlekurv
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset kasserte via bilagsregistrering {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Kontor Vedlikehold Utgifter
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Sette opp e-postkonto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Skriv inn Sak først
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Skriv inn Sak først
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanksjonert Beløpet kan ikke være større enn krav Beløp i Rad {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standard varekostnader konto
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prisliste ikke valgt
 DocType: Employee,Family Background,Familiebakgrunn
 DocType: Request for Quotation Supplier,Send Email,Send E-Post
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Advarsel: Ugyldig Vedlegg {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ingen tillatelse
 DocType: Company,Default Bank Account,Standard Bank Account
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Hvis du vil filtrere basert på partiet, velger partiet Skriv inn først"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen ansatte funnet
 DocType: Supplier Quotation,Stopped,Stoppet
 DocType: Item,If subcontracted to a vendor,Dersom underleverandør til en leverandør
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede oppdatert.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede oppdatert.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen er allerede oppdatert.
 DocType: SMS Center,All Customer Contact,All Kundekontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Last opp lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Informasjon
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimum Fakturert beløp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnadssted {2} ikke tilhører selskapet {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Account {2} kan ikke være en gruppe
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Sak Row {idx}: {doctype} {DOCNAME} finnes ikke i oven {doctype} tabellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timeregistrering {0} er allerede gjennomført eller kansellert
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ingen oppgaver
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dagen i måneden som auto faktura vil bli generert for eksempel 05, 28 osv"
 DocType: Asset,Opening Accumulated Depreciation,Åpning akkumulerte avskrivninger
@@ -874,7 +878,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} mot Bill {1} datert {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursplan
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursplan
 DocType: Maintenance Visit,Completion Status,Completion Status
 DocType: HR Settings,Enter retirement age in years,Skriv inn pensjonsalder i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillat løpet levering eller mottak opp denne prosent
 DocType: Stock Entry,STE-,an- drogene
 DocType: Upload Attendance,Import Attendance,Import Oppmøte
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alle varegrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alle varegrupper
 DocType: Process Payroll,Activity Log,Aktivitetsloggen
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto gevinst / tap
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Skriv melding automatisk ved innlevering av transaksjoner.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Bestilling til betaling
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Anslått Antall
 DocType: Sales Invoice,Payment Due Date,Betalingsfrist
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Sak Variant {0} finnes allerede med samme attributtene
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Opening&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Åpne for å gjøre
 DocType: Notification Control,Delivery Note Message,Levering Note Message
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Antall
 DocType: Leave Block List Date,Leave Block List Date,La Block List Dato
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt gjeldende avgifter i kvitteringen Elementer tabellen må være det samme som total skatter og avgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt gjeldende avgifter i kvitteringen Elementer tabellen må være det samme som total skatter og avgifter
 DocType: Sales Team,Incentives,Motivasjon
 DocType: SMS Log,Requested Numbers,Etterspør Numbers
 DocType: Production Planning Tool,Only Obtain Raw Materials,Bare Skaffe råstoffer
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Er underleverandør
 DocType: Item Attribute,Item Attribute Values,Sak attributtverdier
 DocType: Examination Result,Examination Result,Sensur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Kvitteringen
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Kvitteringen
 ,Received Items To Be Billed,Mottatte elementer å bli fakturert
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Innsendte lønnsslipper
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valutakursen mester.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referanse DOCTYPE må være en av {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referanse DOCTYPE må være en av {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Å finne tidsluke i de neste {0} dager for Operation klarer {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan materiale for sub-assemblies
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Salgs Partnere og Territory
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Kan ikke automatisk opprette konto som det er allerede lagersaldo på kontoen. Du må opprette en matchende konto før du kan lage en oppføring på dette lageret
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Standard Leverandørgjeld
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Ansatt {0} er ikke aktiv eller ikke eksisterer
 DocType: Fee Structure,Components,komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Sak Varianter {0} oppdatert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Fyll inn Asset kategori i Element {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Kan ikke {0} {1} {2} uten noen negativ utestående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fakturaen Advance
 DocType: Hub Settings,Sync Now,Synkroniser nå
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: Credit oppføring kan ikke være knyttet til en {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,Er Purchase Element
 DocType: Asset,Purchase Invoice,Fakturaen
 DocType: Stock Ledger Entry,Voucher Detail No,Kupong Detail Ingen
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Ny salgsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Ny salgsfaktura
 DocType: Stock Entry,Total Outgoing Value,Total Utgående verdi
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Åpningsdato og sluttdato skal være innenfor samme regnskapsår
 DocType: Lead,Request for Information,Spør etter informasjon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synkroniser Offline Fakturaer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synkroniser Offline Fakturaer
 DocType: Payment Request,Paid,Betalt
 DocType: Program Fee,Program Fee,program Fee
 DocType: Salary Slip,Total in words,Totalt i ord
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,sanksjonert
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publiser på nettstedet
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Forsendelser til kunder.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Leverandør Fakturadato kan ikke være større enn konteringsdato
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Selskapsnavn
 DocType: SMS Center,Total Message(s),Total melding (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Velg elementet for Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / minibank konto vil bli automatisk oppdatert i Lønn bilagsregistrering når denne modusen er valgt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallene for Grade Kode {0} overlapper med karakteren intervaller for andre karakterer. Vennligst sjekk intervaller {0} og {1} og prøv på nytt
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Selskap Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alle elementene er allerede blitt overført til denne produksjonsordre.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Prisen kan ikke være større enn frekvensen som brukes i {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Nettstedet Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Last opp din brevhode og logo. (Du kan redigere dem senere).
 DocType: Timesheet Detail,Bill,Regning
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Neste avskrivningsdato legges inn som siste dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Hvit
 DocType: SMS Center,All Lead (Open),All Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antall ikke tilgjengelig for {4} i lageret {1} ved å legge tidspunktet for innreise ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalt forskudd
 DocType: Item,Automatically Create New Batch,Opprett automatisk ny batch automatisk
 DocType: Item,Automatically Create New Batch,Opprett automatisk ny batch automatisk
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Gjøre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Gjøre
 DocType: Student Admission,Admission Start Date,Opptak Startdato
 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.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vennligst oppgi konto for Change Beløp
 DocType: Student Batch Name,Student Batch Name,Student Batch Name
 DocType: Holiday List,Holiday List Name,Holiday Listenavn
 DocType: Repayment Schedule,Balance Loan Amount,Balanse Lånebeløp
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vennligst oppgi en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Fjernet elementer med ingen endring i mengde eller verdi.
 DocType: Delivery Note,Delivery To,Levering Å
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributt tabellen er obligatorisk
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributt tabellen er obligatorisk
 DocType: Production Planning Tool,Get Sales Orders,Få salgsordrer
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan ikke være negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt antall Avskrivninger
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
 DocType: Sales Invoice Item,Rate With Margin,Vurder med margin
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reservert Industribygg i salgsordre / ferdigvarelageret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Selge Beløp
 DocType: Repayment Schedule,Interest Amount,rente~~POS=TRUNC
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater &quot;Status&quot; og Lagre
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Du er den Expense Godkjenner denne posten. Oppdater &quot;Status&quot; og Lagre
 DocType: Serial No,Creation Document No,Creation Dokument nr
 DocType: Issue,Issue,Problem
 DocType: Asset,Scrapped,skrotet
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Attributter for varen Varianter. f.eks størrelse, farge etc."
 DocType: Purchase Invoice,Returns,returer
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial No {0} er under vedlikeholdskontrakt opp {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekruttering
 DocType: Lead,Organization Name,Organization Name
 DocType: Tax Rule,Shipping State,Shipping State
 ,Projected Quantity as Source,Anslått Antall som kilde
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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
 DocType: Employee,A-,EN-
 DocType: Production Planning Tool,Include non-stock items,Inkluder ikke-lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Salgs Utgifter
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,Against
 DocType: Item,Default Selling Cost Center,Standard Selling kostnadssted
 DocType: Sales Partner,Implementation Partner,Gjennomføring Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Post kode
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Post kode
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Salgsordre {0} er {1}
 DocType: Opportunity,Contact Info,Kontaktinfo
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Making Stock Entries
 DocType: Packing Slip,Net Weight UOM,Vekt målenheter
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} resultater
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} resultater
 DocType: Item,Default Supplier,Standard Leverandør
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Over Produksjon Fradrag Prosent
 DocType: Employee Loan,Repayment Schedule,tilbakebetaling Schedule
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Få Ukentlig Off Datoer
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Sluttdato kan ikke være mindre enn startdato
 DocType: Sales Person,Select company name first.,Velg firmanavn først.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Sitater mottatt fra leverandører.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Til {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Gjennomsnittsalder
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance-området
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ugyldig Egenskap
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} må sendes
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} må sendes
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Antall må være mindre enn eller lik {0}
 DocType: SMS Center,Total Characters,Totalt tegn
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vennligst velg BOM i BOM felt for Element {0}
@@ -1153,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Vennligst sett &#39;Apply Ytterligere rabatt på&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Fra Range må være mindre enn til kolleksjonen
 DocType: Global Defaults,Global Defaults,Global Defaults
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,start-år
 DocType: Purchase Invoice,Start date of current invoice's period,Startdato for nåværende fakturaperiode
 DocType: Salary Slip,Leave Without Pay,La Uten Pay
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapasitetsplanlegging Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapasitetsplanlegging Error
 ,Trial Balance for Party,Trial Balance for partiet
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Inntjeningen
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Dette vil bli lagt til Element Code of varianten. For eksempel, hvis din forkortelsen er &quot;SM&quot;, og elementet kode er &quot;T-SHIRT&quot;, elementet koden til variant vil være &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolønn (i ord) vil være synlig når du lagrer Lønn Slip.
 DocType: Purchase Invoice,Is Return,Er Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retur / debitnota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retur / debitnota
 DocType: Price List Country,Price List Country,Prisliste Land
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} gyldig serie nos for Element {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Fyll inn Element kode for å få Batch Number
 DocType: Stock Settings,Default Item Group,Standard varegruppe
 DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-DocType: Grading Structure,Grading System Name,Grading System Name
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverandør database.
 DocType: Account,Balance Sheet,Balanse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Koste Center For Element med Element kode &#39;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betaling Mode er ikke konfigurert. Kontroller, om kontoen er satt på modus for betalinger eller på POS-profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din selger vil få en påminnelse på denne datoen for å kontakte kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samme elementet kan ikke legges inn flere ganger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligere kontoer kan gjøres under grupper, men oppføringene kan gjøres mot ikke-grupper"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Purchase Order Elementer som skal faktureres
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Fakturaen Element
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Arkiv Ledger Oppføringer og GL Oppføringer repostes for de valgte Kjøps Receipts
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Arkiv Ledger Oppføringer og GL Oppføringer repostes for de valgte Kjøps Receipts
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Sak 1
 DocType: Holiday,Holiday,Ferie
 DocType: Support Settings,Close Issue After Days,Lukk Issue Etter dager
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbeidet Som Er Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vennligst oppgi minst ett attributt i Attributter tabellen
 DocType: Announcement,All Students,alle studenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} må være et ikke-lagervare
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vis Ledger
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidligste
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","En varegruppe eksisterer med samme navn, må du endre elementnavnet eller endre navn varegruppen"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Utbetaling av lønn fra {0} til {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Salgsordre {0} er ikke gyldig
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Innkjøpsordrer hjelpe deg å planlegge og følge opp kjøpene
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Sorry, kan selskapene ikke fusjoneres"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totale Issue / Transfer mengde {0} i Material Request {1} \ kan ikke være større enn ønsket antall {2} for Element {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekte kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rad {0}: Antall er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Landbruk
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Website Bilde bør være en offentlig fil eller nettside URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Dette er en rot varegruppe og kan ikke redigeres.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Gruppe-nummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",For {0} kan bare kredittkontoer kobles mot en annen belastning oppføring
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summen av alle oppgave vekter bør være 1. Juster vekter av alle prosjektoppgaver tilsvar
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Levering Note {0} er ikke innsendt
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prising Rule først valgt basert på &quot;Apply On-feltet, som kan være varen, varegruppe eller Brand."
 DocType: Hub Settings,Seller Website,Selger Hjemmeside
 DocType: Item,ITEM-,PUNKT-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totalt bevilget prosent for salgsteam skal være 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Produksjonsordrestatus er {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produksjonsordrestatus er {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Rediger Beskrivelse
 ,Team Updates,laget Oppdateringer
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,For Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Opprett Print Format
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elementer i fremgang
 DocType: Workstation,Workstation Name,Arbeidsstasjon Name
-DocType: Grade Interval,Grade Code,grade Kode
+DocType: Grading Scale Interval,Grade Code,grade Kode
 DocType: POS Item Group,POS Item Group,POS Varegruppe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-post Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} tilhører ikke Element {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Tilbakevendende Opp
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vennligst velg et selskap
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vennligst velg et selskap
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege La
 DocType: Purchase Invoice,Supplier Invoice Date,Leverandør Fakturadato
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du må aktivere Handlevogn
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Aldring Range 3
 DocType: Maintenance Schedule Item,No of Visits,Ingen av besøk
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark frammøte
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark frammøte
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Vedlikeholdsplan {0} eksisterer mot {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,påmelding student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta ifølge kursen konto må være {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summen av poeng for alle mål bør være 100. Det er {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Gjennomsnittlig Daily Utgående
 DocType: POS Profile,Campaign,Kampanje
 DocType: Supplier,Name and Type,Navn og Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Godkjenningsstatus må være &quot;Godkjent&quot; eller &quot;Avvist&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Godkjenningsstatus må være &quot;Godkjent&quot; eller &quot;Avvist&quot;
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;Tiltredelse&#39; ikke kan være større enn &quot;Forventet sluttdato
 DocType: Course Scheduling Tool,Course End Date,Kurs Sluttdato
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Leveringsadresse Navn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Konto
 DocType: Material Request,Terms and Conditions Content,Betingelser innhold
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,kan ikke være større enn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Element {0} er ikke en lagervare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,kan ikke være større enn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Element {0} er ikke en lagervare
 DocType: Maintenance Visit,Unscheduled,Ikke planlagt
 DocType: Employee,Owned,Eies
 DocType: Salary Detail,Depends on Leave Without Pay,Avhenger La Uten Pay
 DocType: Pricing Rule,"Higher the number, higher the priority","Høyere tallet er, høyere prioritet"
 ,Purchase Invoice Trends,Fakturaen Trender
 DocType: Employee,Better Prospects,Bedre utsikter
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Row # {0}: Batch {1} har bare {2} antall. Vennligst velg en annen batch som har {3} antall tilgjengelig eller del opp raden i flere rader for å levere / utføre fra flere batcher
 DocType: Vehicle,License Plate,Bilskilt
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
@@ -1452,7 +1454,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Arbeidstaker kan ikke rapportere til seg selv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hvis kontoen er fryst, er oppføringer lov til begrensede brukere."
 DocType: Email Digest,Bank Balance,Bank Balanse
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Regnskap Entry for {0}: {1} kan bare gjøres i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikasjoner som kreves etc."
 DocType: Journal Entry Account,Account Balance,Saldo
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Skatteregel for transaksjoner.
@@ -1463,7 +1465,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Vis unclosed regnskapsårets P &amp; L balanserer
 DocType: Shipping Rule,Shipping Account,Shipping konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} er inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gjør salgsordrer for å hjelpe deg med å planlegge arbeidet ditt og levere i tide
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gjør salgsordrer for å hjelpe deg med å planlegge arbeidet ditt og levere i tide
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Samlede merkostnader
 DocType: Course Schedule,SH,SH
@@ -1474,7 +1476,7 @@
 DocType: Shipping Rule Condition,To Value,I Value
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Pakkseddel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakkseddel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontor Leie
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Oppsett SMS gateway-innstillinger
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import mislyktes!
@@ -1496,11 +1498,11 @@
 DocType: Company,Services,Tjenester
 DocType: HR Settings,Email Salary Slip to Employee,E-post Lønn Slip til Employee
 DocType: Cost Center,Parent Cost Center,Parent kostnadssted
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Velg Mulig Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Velg Mulig Leverandør
 DocType: Sales Invoice,Source,Source
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Vis stengt
 DocType: Leave Type,Is Leave Without Pay,Er permisjon uten Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategori er obligatorisk for Fixed Asset element
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ingen poster ble funnet i Payment tabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Denne {0} konflikter med {1} for {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenter HTML
@@ -1518,7 +1520,7 @@
 DocType: Student,Date of Leaving,Dato Leaving
 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/utilities/activation.py +64,Create Leads,Lag Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Lag Leads
 DocType: Maintenance Schedule,Schedules,Rutetider
 DocType: Purchase Invoice Item,Net Amount,Nettobeløp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Nei
@@ -1546,9 +1548,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program~~POS=TRUNC påmeldinger
 DocType: Sales Invoice Item,Brand Name,Merkenavn
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standardlager er nødvendig til den valgte artikkelen
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Eske
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mulig Leverandør
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mulig Leverandør
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisasjonen
 DocType: Budget,Monthly Distribution,Månedlig Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottaker-listen er tom. Opprett Receiver Liste
@@ -1556,8 +1558,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maksimal Lånebeløp
 DocType: Pricing Rule,Pricing Rule,Prising Rule
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dupliseringsnummer for student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Tiltak hvis Årlig budsjett Skredet
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materialet Request til innkjøpsordre
 DocType: Shopping Cart Settings,Payment Success URL,Betaling Suksess URL
@@ -1578,9 +1580,9 @@
 DocType: Employee Loan,Repayment Method,tilbakebetaling Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Hvis det er merket, vil hjemmesiden være standard Varegruppe for nettstedet"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM for {0} ikke funnet for Prosjekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Standard BOM for {0} ikke funnet for Prosjekt {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Krav på bekostning av selskapet.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentene er i hjertet av systemet, legge til alle elevene"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentene er i hjertet av systemet, legge til alle elevene"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Clearance date {1} kan ikke være før Cheque Dato {2}
 DocType: Company,Default Holiday List,Standard Holiday List
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Fra tid og klokkeslett {1} er overlappende med {2}
@@ -1592,21 +1594,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (e) der du søker om permisjon er helligdager. Du trenger ikke søke om permisjon.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Sende Betaling Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny oppgave
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Gjør sitat
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Gjør sitat
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andre rapporter
 DocType: Dependent Task,Dependent Task,Avhengig Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omregningsfaktor for standard Enhet må være en i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Permisjon av typen {0} kan ikke være lengre enn {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Prøv å planlegge operasjoner for X dager i forveien.
 DocType: HR Settings,Stop Birthday Reminders,Stop bursdagspåminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vennligst sette Standard Lønn betales konto i selskapet {0}
 DocType: SMS Center,Receiver List,Mottaker List
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Søk Element
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Søk Element
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Forbrukes Beløp
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Netto endring i kontanter
 DocType: Assessment Plan,Grading Scale,Grading Scale
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,allerede fullført
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Enhet {0} har blitt lagt inn mer enn én gang i omregningsfaktor tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,allerede fullført
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betaling Request allerede eksisterer {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Cost of Utstedte Items
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Antall må ikke være mer enn {0}
@@ -1638,12 +1640,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Gjør Utbetaling Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverandøren skal belaste
 DocType: Company,Default Values,Standardverdier
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totalbeløp Refusjon
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Dette er basert på loggene mot denne bilen. Se tidslinjen nedenfor for detaljer
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samle inn
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Mot Leverandør Faktura {0} datert {1}
 DocType: Customer,Default Price List,Standard Prisliste
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Movement rekord {0} er opprettet
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan ikke slette regnskapsår {0}. Regnskapsåret {0} er satt som standard i Globale innstillinger
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Customer Credit Balance
@@ -1661,7 +1664,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,innkjøp
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ingen av elementene har noen endring i mengde eller verdi.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligatorisk felt - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantikrav
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantikrav
 ,Lead Details,Lead Detaljer
 DocType: Salary Slip,Loan repayment,lån tilbakebetaling
 DocType: Purchase Invoice,End date of current invoice's period,Sluttdato for gjeldende faktura periode
@@ -1680,11 +1683,10 @@
 DocType: Employee,Permanent Address,Permanent Adresse
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Velg elementet kode
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Velg elementet kode
 DocType: Student Sibling,Studying in Same Institute,Å studere i samme institutt
 DocType: Territory,Territory Manager,Distriktssjef
 DocType: Packed Item,To Warehouse (Optional),Til Warehouse (valgfritt)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Payment Entry,Paid Amount (Company Currency),Innbetalt beløp (Company Valuta)
 DocType: Purchase Invoice,Additional Discount,Ekstra rabatt
 DocType: Selling Settings,Selling Settings,Selge Innstillinger
@@ -1694,9 +1696,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vis i handlekurven
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Markedsføringskostnader
 ,Item Shortage Report,Sak Mangel Rapporter
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vekt er nevnt, \ nVennligst nevne &quot;Weight målenheter&quot; også"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materialet Request brukes til å gjøre dette lager Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Neste Avskrivninger dato er obligatorisk for ny aktiva
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbasert gruppe for hver batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbasert gruppe for hver batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enkelt enhet av et element.
@@ -1713,9 +1715,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Det kreves kostnadssted for &#39;resultat&#39; konto {2}. Sett opp en standardkostnadssted for selskapet.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Ny kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1732,7 +1732,7 @@
 ,Item-wise Sales Register,Element-messig Sales Register
 DocType: Asset,Gross Purchase Amount,Bruttobeløpet
 DocType: Asset,Depreciation Method,avskrivningsmetode
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Er dette inklusiv i Basic Rate?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total Target
 DocType: Program Course,Required,Må
@@ -1742,20 +1742,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstemming JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,For mange kolonner. Eksportere rapporten og skrive den ut ved hjelp av et regnearkprogram.
 DocType: Purchase Invoice Item,Batch No,Batch No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},å finne valutakursen for klarer {0} til {1} for viktig dato {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillat flere salgsordrer mot kundens innkjøpsordre
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppeinstruktør
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hoved
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hoved
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Still prefiks for nummerering serien på dine transaksjoner
 DocType: Employee Attendance Tool,Employees HTML,ansatte HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) må være aktiv for denne varen eller dens mal
 DocType: Employee,Leave Encashed?,Permisjon encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Fra-feltet er obligatorisk
 DocType: Email Digest,Annual Expenses,årlige utgifter
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Gjør innkjøpsordre
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Gjør innkjøpsordre
 DocType: SMS Center,Send To,Send Til
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det er ikke nok permisjon balanse for La Type {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Bevilget beløp
@@ -1763,17 +1762,16 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Elementkode
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Avstemming
 DocType: Territory,Territory Name,Territorium Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Work-in-progress Warehouse er nødvendig før Send
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Kandidat til en jobb.
 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
 DocType: Item,Serial Nos and Batches,Serienummer og partier
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppestyrke
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal Entry {0} har ikke noen enestående {1} oppføring
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,medarbeidersamtaler
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Grading intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vennligst skriv inn
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Kan ikke bill for Element {0} i rad {1} mer enn {2}. For å tillate overfakturering, kan du sette i å kjøpe Innstillinger"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vennligst sette filter basert på varen eller Warehouse
@@ -1785,17 +1783,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} må sendes
 DocType: Authorization Control,Authorization Control,Autorisasjon kontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Avvist Warehouse er obligatorisk mot avvist Element {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betaling
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Administrere dine bestillinger
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Betaling
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Administrere dine bestillinger
 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
 DocType: Course,Course Abbreviation,Kurs forkortelse
 DocType: Student Leave Application,Student Leave Application,Student La Application
 DocType: Item,Will also apply for variants,Vil også gjelde for varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan ikke avbestilles, som det allerede er {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} på halv dag {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Samlet arbeidstid må ikke være større enn maks arbeidstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle elementer på salgstidspunktet.
 DocType: Quotation Item,Actual Qty,Selve Antall
 DocType: Sales Invoice Item,References,Referanser
@@ -1805,7 +1804,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har skrevet inn like elementer. Vennligst utbedre og prøv igjen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Forbinder
 DocType: Asset Movement,Asset Movement,Asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New Handlekurv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,New Handlekurv
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Element {0} er ikke en serie Element
 DocType: SMS Center,Create Receiver List,Lag Receiver List
 DocType: Vehicle,Wheels,hjul
@@ -1837,10 +1836,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Deaktiverer etableringen av tids logger mot produksjonsordrer. Driften skal ikke spores mot produksjonsordre
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har allerede valgt elementer fra {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Navn på Monthly Distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID er obligatorisk
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID er obligatorisk
 DocType: Sales Person,Parent Sales Person,Parent Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Tilbakevendende Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managing Projects
@@ -1848,11 +1847,11 @@
 DocType: Budget,Fiscal Year,Regnskapsår
 DocType: Vehicle Log,Fuel Price,Fuel Pris
 DocType: Budget,Budget,Budsjett
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset varen må være et ikke-lagervare.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budsjettet kan ikke overdras mot {0}, som det er ikke en inntekt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Oppnås
 DocType: Student Admission,Application Form Route,Søknadsskjema Rute
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territorium / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territorium / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,f.eks 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,La Type {0} kan ikke tildeles siden det er permisjon uten lønn
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Nummerert mengden {1} må være mindre enn eller lik fakturere utestående beløp {2}
@@ -1872,14 +1871,14 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
 ,Daily Timesheet Summary,Daglig Timeregistrering Oppsummering
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Slik stiller {1} periodisitet, forskjellen mellom fra og til dato \ må være større enn eller lik {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Dette er basert på lagerbevegelse. Se {0} for detaljer
 DocType: Pricing Rule,Selling,Selling
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Mengden {0} {1} trukket mot {2}
 DocType: Employee,Salary Information,Lønn Informasjon
 DocType: Sales Person,Name and Employee ID,Navn og Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Due Date kan ikke være før konteringsdato
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Skatter og avgifter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Skriv inn Reference dato
@@ -1891,14 +1890,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kan ikke se rad tall større enn eller lik gjeldende rad nummer for denne debiteringstype
 DocType: Asset,Sold,selges
 ,Item-wise Purchase History,Element-messig Purchase History
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vennligst klikk på &quot;Generer Schedule &#39;for å hente serienummer lagt for Element {0}
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Åpne produksjonsordrer
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Grunnbeløp (Selskap Valuta)
 DocType: Payment Reconciliation Payment,Reference Row,Referanse Row
 DocType: Installation Note,Installation Time,Installasjon Tid
 DocType: Sales Invoice,Accounting Details,Regnskap Detaljer
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Slett alle transaksjoner for dette selskapet
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringer
 DocType: Issue,Resolution Details,Oppløsning Detaljer
@@ -1931,14 +1930,14 @@
 DocType: Discussion,Discussion,Diskusjon
 DocType: Payment Entry,Transaction ID,Transaksjons-ID
 DocType: Employee,Resignation Letter Date,Resignasjon Letter Dato
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prising Reglene er videre filtreres basert på kvantitet.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vennligst sett datoen for å bli med på ansatt {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Billing Beløp (via Timeregistrering)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Gjenta kunden Revenue
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) må ha rollen &#39;Expense Godkjenner&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Velg BOM og Stk for produksjon
 DocType: Asset,Depreciation Schedule,avskrivninger Schedule
 DocType: Bank Reconciliation Detail,Against Account,Mot konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date bør være mellom Fra dato og Til dato
@@ -1952,16 +1951,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Vennligst sett &#39;Asset Avskrivninger kostnadssted &quot;i selskapet {0}
 ,Maintenance Schedules,Vedlikeholdsplaner
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Sluttdato (via Timeregistrering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Mengden {0} {1} mot {2} {3}
 ,Quotation Trends,Anførsels Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Varegruppe ikke nevnt i punkt master for elementet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Avventer Beløp
 DocType: Purchase Invoice Item,Conversion Factor,Omregningsfaktor
 DocType: Purchase Order,Delivered,Levert
 ,Vehicle Expenses,Vehicle Utgifter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
+DocType: Serial No,Invoice Details,Fakturadetaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Forventet verdi etter levetid må være større enn eller lik {0}
 DocType: Purchase Receipt,Vehicle Number,Vehicle Number
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Datoen som tilbakevendende faktura vil bli stoppe
 DocType: Employee Loan,Loan Amount,Lånebeløp
@@ -1980,12 +1980,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timelister
 DocType: HR Settings,HR Settings,HR-innstillinger
 DocType: Salary Slip,net pay info,nettolønn info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense krav venter på godkjenning. Bare den Expense Godkjenner kan oppdatere status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,nye Utgifter
 DocType: Purchase Invoice,Additional Discount Amount,Ekstra rabatt Beløp
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",Row # {0}: Antall må være en som elementet er et anleggsmiddel. Bruk egen rad for flere stk.
 DocType: Leave Block List Allow,Leave Block List Allow,La Block List Tillat
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr kan ikke være tomt eller plass
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Gruppe til Non-gruppe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,lån Name
@@ -1997,6 +1997,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Warehouse hvor du opprettholder lager avviste elementer
 DocType: Production Order,Skip Material Transfer,Hopp over materialoverføring
 DocType: Production Order,Skip Material Transfer,Hopp over materialoverføring
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Kan ikke finne valutakurs for {0} til {1} for nøkkeldato {2}. Vennligst opprett en valutautvekslingsrekord manuelt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din regnskapsår avsluttes på
 DocType: POS Profile,Price List,Pris Liste
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} er nå standard regnskapsåret. Vennligst oppdater nettleser for at endringen skal tre i kraft.
@@ -2013,19 +2014,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} er ugyldig. Account Valuta må være {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Målenheter Omregningsfaktor er nødvendig i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av salgsordre, salgsfaktura eller bilagsregistrering"
 DocType: Salary Component,Deduction,Fradrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rad {0}: Fra tid og Tid er obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,beløp Difference
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Varen Pris lagt for {0} i Prisliste {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Skriv inn Employee Id av denne salgs person
 DocType: Territory,Classification of Customers by region,Klassifisering av kunder etter region
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Forskjellen Beløpet må være null
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Forskjellen Beløpet må være null
 DocType: Project,Gross Margin,Bruttomargin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Skriv inn Produksjon varen først
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beregnet kontoutskrift balanse
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,deaktivert bruker
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Sitat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Sitat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Fradrag
 ,Production Analytics,produksjons~~POS=TRUNC Analytics
@@ -2034,9 +2035,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Advarsel: Ugyldig SSL-sertifikat på vedlegg {0}
 DocType: Student Admission,Eligibility,kvalifikasjon
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjelpe deg å få virksomheten, legge til alle dine kontakter og mer som dine potensielle kunder"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjelpe deg å få virksomheten, legge til alle dine kontakter og mer som dine potensielle kunder"
 DocType: Production Order Operation,Actual Operation Time,Selve Operasjon Tid
 DocType: Authorization Rule,Applicable To (User),Gjelder til (User)
 DocType: Purchase Taxes and Charges,Deduct,Trekke
@@ -2051,7 +2052,7 @@
 DocType: Guardian,Work Address,arbeid Adresse
 DocType: Appraisal,Calculate Total Score,Beregn Total Score
 DocType: Request for Quotation,Manufacturing Manager,Produksjonssjef
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial No {0} er under garanti opptil {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split følgeseddel i pakker.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Forsendelser
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Kontosaldo ({0}) for {1} og lagerverdi ({2}) for lager {3} må være den samme
@@ -2074,10 +2075,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Merk: E-post vil ikke bli sendt til funksjonshemmede brukere
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antall interaksjoner
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antall interaksjoner
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Velg Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Velg Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,La stå tom hvis vurderes for alle avdelinger
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer arbeid (fast, kontrakt, lærling etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} er obligatorisk for Element {1}
 DocType: Process Payroll,Fortnightly,hver fjortende dag
 DocType: Currency Exchange,From Currency,Fra Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2086,14 +2087,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rate (Selskap Valuta)
 DocType: Student Guardian,Others,Annet
 DocType: Payment Entry,Unallocated Amount,uallokert Beløp
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Kan ikke finne en matchende element. Vennligst velg en annen verdi for {0}.
 DocType: POS Profile,Taxes and Charges,Skatter og avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Et produkt eller en tjeneste som er kjøpt, solgt eller holdes på lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Ingen flere oppdateringer
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Kan ikke velge charge type som &#39;On Forrige Row beløp &quot;eller&quot; On Forrige Row Totals for første rad
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Varen bør ikke være et produkt Bundle. Vennligst fjern element `{0}` og lagre
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Legg Timelister
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Legg Timelister
 DocType: Vehicle Service,Service Item,tjenesten Element
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
@@ -2119,6 +2120,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} er allerede {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Salgsordre til betaling
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vennligst still inn navngivningsserien for {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,administrerende direktør
 DocType: Expense Claim Detail,Expense Claim Detail,Expense krav Detalj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Velg riktig konto
@@ -2143,14 +2145,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prisene vil ikke bli vist hvis prislisten er ikke satt
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vennligst oppgi et land for denne Shipping Regel eller sjekk Worldwide Shipping
 DocType: Stock Entry,Total Incoming Value,Total Innkommende Verdi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debet Å kreves
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debet Å kreves
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timelister bidra til å holde styr på tid, kostnader og fakturering for aktiviteter gjort av teamet ditt"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Kjøp Prisliste
 DocType: Offer Letter Term,Offer Term,Tilbudet Term
 DocType: Quality Inspection,Quality Manager,Quality Manager
 DocType: Job Applicant,Job Opening,Job Opening
 DocType: Payment Reconciliation,Payment Reconciliation,Betaling Avstemming
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vennligst velg Incharge persons navn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vennligst velg Incharge persons navn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologi
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Ubetalte: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Nettstedet Operasjon
@@ -2178,23 +2180,23 @@
 DocType: Opportunity,Lost Reason,Mistet Reason
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Fyll inn Kvittering Document
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alle elementene er allerede blitt fakturert
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Fyll inn Kvittering Document
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligere kostnadsbærere kan gjøres under Grupper men oppføringene kan gjøres mot ikke-grupper
 DocType: Project,External,Ekstern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Brukere og tillatelser
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produksjonsordrer Laget: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Produksjonsordrer Laget: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Trykking og merkevarebygging
 DocType: Bin,Actual Quantity,Selve Antall
 DocType: Shipping Rule,example: Next Day Shipping,Eksempel: Neste Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} ikke funnet
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} ikke funnet
 DocType: Scheduling Tool,Student Batch,student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dine kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Gjør Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Gjør Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du har blitt invitert til å samarbeide om prosjektet: {0}
 DocType: Leave Block List Date,Block Date,Block Dato
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Søk nå
@@ -2218,8 +2220,9 @@
 DocType: SMS Log,Sent To,Sendt til
 DocType: Payment Request,Make Sales Invoice,Gjør Sales Faktura
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programvare
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Neste Kontakt Datoen kan ikke være i fortiden
 DocType: Company,For Reference Only.,For referanse.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Velg batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ugyldig {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Forskuddsbeløp
@@ -2233,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Sak nr kan ikke være 0
 DocType: Item,Show a slideshow at the top of the page,Vis en lysbildeserie på toppen av siden
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butikker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butikker
 DocType: Serial No,Delivery Time,Leveringstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Aldring Based On
 DocType: Item,End of Life,Slutten av livet
@@ -2245,12 +2248,12 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Oppdater Cost
 DocType: Item Reorder,Item Reorder,Sak Omgjøre
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Vis Lønn Slip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Vis Lønn Slip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Dette dokumentet er over grensen av {0} {1} for elementet {4}. Er du gjør en annen {3} mot samme {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vennligst sett gjentakende etter lagring
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Velg endring mengde konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Vennligst sett gjentakende etter lagring
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Velg endring mengde konto
 DocType: Purchase Invoice,Price List Currency,Prisliste Valuta
 DocType: Naming Series,User must always select,Brukeren må alltid velge
 DocType: Stock Settings,Allow Negative Stock,Tillat Negative Stock
@@ -2261,7 +2264,7 @@
 DocType: Budget Account,Budget Account,budsjett konto
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Kan ikke endre selskapets standardvaluta, fordi det er eksisterende transaksjoner. Transaksjoner må avbestilles å endre valgt valuta."
-DocType: Grade Interval,Grade Description,grade Beskrivelse
+DocType: Grading Scale Interval,Grade Description,grade Beskrivelse
 DocType: Stock Entry,Purchase Receipt No,Kvitteringen Nei
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Penger
 DocType: Process Payroll,Create Salary Slip,Lag Lønn Slip
@@ -2299,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Oppmøte To Date
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Betaling konto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Vennligst oppgi selskapet å fortsette
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Netto endring i kundefordringer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenserende Off
 DocType: Offer Letter,Accepted,Akseptert
@@ -2308,12 +2311,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Romnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ugyldig referanse {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan ikke være større enn planlagt quanitity ({2}) i produksjonsordre {3}
 DocType: Shipping Rule,Shipping Rule Label,Shipping Rule Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,bruker~~POS=TRUNC
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råvare kan ikke være blank.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hurtig Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Kunne ikke oppdatere lager, inneholder faktura slippe frakt element."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Hurtig Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2326,7 +2329,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Vilkår og forhold 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Navnet på institutt for som du setter opp dette systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Regnskap oppføring frosset opp til denne datoen, kan ingen gjøre / endre oppføring unntatt rolle angitt nedenfor."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vennligst lagre dokumentet før du genererer vedlikeholdsplan
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Prosjekt Status
 DocType: UOM,Check this to disallow fractions. (for Nos),Sjekk dette for å forby fraksjoner. (For Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Følgende produksjonsordrer ble opprettet:
@@ -2353,7 +2356,7 @@
 ,Employees working on a holiday,Arbeidstakere som arbeider på ferie
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Komplett Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Vedlikehold startdato kan ikke være før leveringsdato for Serial No {0}
 DocType: Production Order,Actual End Date,Selve sluttdato
 DocType: BOM,Operating Cost (Company Currency),Driftskostnader (Selskap Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2370,7 +2373,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,La Uten Pay ikke samsvarer med godkjente La Søknad poster
 DocType: Campaign,Campaign-.####,Kampanje -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Neste skritt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Vennligst oppgi de angitte elementene på de best mulige priser
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto nær mulighet etter 15 dager
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slutt År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2408,7 +2411,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Antall
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Laget - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategori konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Kan ikke produsere mer Element {0} enn Salgsordre kvantitet {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Entry {0} er ikke innsendt
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / minibank konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Neste Kontakt By kan ikke være samme som Lead e-postadresse
@@ -2430,7 +2433,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Klaring Dato ikke nevnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produksjon
 DocType: Guardian,Occupation,Okkupasjon
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdato må være før sluttdato
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Stk)
 DocType: Sales Invoice,This Document,dette dokumentet
 DocType: Installation Note Item,Installed Qty,Installert antall
@@ -2446,15 +2450,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Melde om et problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Utgifter
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Above
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Bilagsregistrering {1} har ikke konto {2} eller allerede matchet mot en annen kupong
 DocType: Buying Settings,Default Buying Price List,Standard Kjøpe Prisliste
 DocType: Process Payroll,Salary Slip Based on Timesheet,Lønn Slip Basert på Timeregistrering
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Betalings Type
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vennligst velg en batch for element {0}. Kunne ikke finne en enkelt batch som oppfyller dette kravet
 DocType: Process Payroll,Select Employees,Velg Medarbeidere
 DocType: Opportunity,Potential Sales Deal,Potensielle Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Sjekk / Reference Date
@@ -2471,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalt POS profil {0} allerede opprettet for selskap {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Erstatte varen / BOM i alle stykklister
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvittering dokumentet må sendes
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvittering dokumentet må sendes
 DocType: Purchase Invoice Item,Received Qty,Mottatt Antall
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ikke betalt og ikke levert
@@ -2480,11 +2484,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ingen timelister
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,La Type {0} kan ikke bære-videre
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Vedlikeholdsplan genereres ikke for alle elementene. Vennligst klikk på &quot;Generer Schedule &#39;
 ,To Produce,Å Produsere
 apps/erpnext/erpnext/config/hr.py +93,Payroll,lønn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","For rad {0} i {1}. For å inkludere {2} i Element rate, rader {3} må også inkluderes"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Gjør Bruker
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Gjør Bruker
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikasjon av pakken for levering (for print)
 DocType: Bin,Reserved Quantity,Reservert Antall
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vennligst skriv inn gyldig e-postadresse
@@ -2498,15 +2502,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Funksjonshemmede malen må ikke være standardmal
 DocType: Account,Income Account,Inntekt konto
 DocType: Payment Request,Amount in customer's currency,Beløp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Levering
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Levering
 DocType: Stock Reconciliation Item,Current Qty,Nåværende Antall
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate Of materialer basert på&quot; i Costing Seksjon
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Ansvar Område
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student batcher hjelpe deg med å spore oppmøte, vurderinger og avgifter for studenter"
 DocType: Payment Entry,Total Allocated Amount,Totalt tildelte beløp
 DocType: Item Reorder,Material Request Type,Materialet Request Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural dagboken til lønninger fra {0} i {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Localstorage er full, ikke redde"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Localstorage er full, ikke redde"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: målenheter omregningsfaktor er obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Kostnadssted
@@ -2516,16 +2521,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skjule Kundens Tax ID fra salgstransaksjoner
 DocType: Upload Attendance,Upload HTML,Last opp HTML
 DocType: Employee,Relieving Date,Lindrende Dato
-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.","Prising Rule er laget for å overskrive Prisliste / definere rabattprosenten, basert på noen kriterier."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Prising Rule er laget for å overskrive Prisliste / definere rabattprosenten, basert på noen kriterier."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lageret kan bare endres via Stock Entry / følgeseddel / Kjøpskvittering
 DocType: Employee Education,Class / Percentage,Klasse / Prosent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Head of Marketing and Sales
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Inntektsskatt
-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.","Hvis valgt Pricing Rule er laget for &#39;Pris&#39;, det vil overskrive Prisliste. Priser Rule prisen er den endelige prisen, så ingen ytterligere rabatt bør påføres. Derfor, i transaksjoner som Salgsordre, innkjøpsordre osv, det vil bli hentet i &quot;Valuta-feltet, heller enn&quot; Prisliste Valuta-feltet."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Hvis valgt Pricing Rule er laget for &#39;Pris&#39;, det vil overskrive Prisliste. Priser Rule prisen er den endelige prisen, så ingen ytterligere rabatt bør påføres. Derfor, i transaksjoner som Salgsordre, innkjøpsordre osv, det vil bli hentet i &quot;Valuta-feltet, heller enn&quot; Prisliste Valuta-feltet."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spor Leads etter bransje Type.
 DocType: Item Supplier,Item Supplier,Sak Leverandør
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Skriv inn Element kode for å få batch no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Velg en verdi for {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Alle adresser.
 DocType: Company,Stock Settings,Aksje Innstillinger
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2535,6 +2540,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Vil sende en e-post om hendelsen til ansatte med status &#39;Open&#39;
 DocType: Task,Depends on Tasks,Avhenger Oppgaver
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Administrere kunde Gruppe treet.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Vedlegg kan vises uten å tillate handlekurven
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New kostnadssted Navn
 DocType: Leave Control Panel,Leave Control Panel,La Kontrollpanel
@@ -2547,12 +2553,10 @@
 DocType: Sales Invoice,Debit To,Debet Å
 DocType: Delivery Note,Required only for sample item.,Kreves bare for prøve element.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Selve Antall Etter Transaksjons
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverandør&gt; Leverandør Type
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lønn slip funnet mellom {0} og {1}
 ,Pending SO Items For Purchase Request,Avventer SO varer for kjøp Request
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,student Opptak
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} er deaktivert
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} er deaktivert
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra large
@@ -2569,9 +2573,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Hjemmeside Aktuelle produkter
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alle Assessment grupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Warehouse navn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vennligst oppgi ingen av besøk som kreves
 DocType: Stock Settings,Default Valuation Method,Standard verdsettelsesmetode
 DocType: Vehicle Log,Fuel Qty,drivstoff Antall
 DocType: Production Order Operation,Planned Start Time,Planlagt Starttid
@@ -2587,7 +2591,7 @@
 DocType: Price List,Price List Master,Prisliste Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alle salgstransaksjoner kan være merket mot flere ** Salgs Personer ** slik at du kan stille inn og overvåke mål.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Opprett Customer fra Lead {0}
 DocType: Price List,Applicable for Countries,Gjelder for Land
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Bare La Applikasjoner med status &#39;Godkjent&#39; og &#39;Avvist&#39; kan sendes inn
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Gruppenavn er obligatorisk i rad {0}
@@ -2619,7 +2623,7 @@
 DocType: Project,Copied From,Kopiert fra
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Navn feil: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Mangel
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ikke er knyttet til {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Oppmøte for arbeidstaker {0} er allerede merket
 DocType: Packing Slip,If more than one package of the same type (for print),Hvis mer enn en pakke av samme type (for print)
 ,Salary Register,lønn Register
@@ -2638,7 +2642,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Brukes til handlekurv
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Verdi {0} for Egenskap {1} finnes ikke i listen over gyldige elementattributtet Verdier for Element {2}
 DocType: BOM Item,Scrap %,Skrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostnader vil bli fordelt forholdsmessig basert på element stk eller beløp, som per ditt valg"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Kostnader vil bli fordelt forholdsmessig basert på element stk eller beløp, som per ditt valg"
 DocType: Maintenance Visit,Purposes,Formål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} lenger enn noen tilgjengelige arbeidstimer i arbeidsstasjonen {1}, bryte ned driften i flere operasjoner"
@@ -2659,16 +2663,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Administrer Territory treet.
 DocType: Journal Entry Account,Sales Invoice,Salg Faktura
 DocType: Journal Entry Account,Party Balance,Fest Balance
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vennligst velg Bruk rabatt på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Vennligst velg Bruk rabatt på
 DocType: Company,Default Receivable Account,Standard fordringer konto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Lag Bank Entry for den totale lønn for de ovenfor valgte kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer for Produksjon
-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.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabattprosenten kan brukes enten mot en prisliste eller for alle Prisliste.
 DocType: Purchase Invoice,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Regnskap Entry for Stock
 DocType: Vehicle Service,Engine Oil,Motorolje
 DocType: Sales Invoice,Sales Team1,Salg TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} finnes ikke
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} finnes ikke
 DocType: Sales Invoice,Customer Address,Kunde Adresse
 DocType: Employee Loan,Loan Details,lån Detaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rad {0}: Fullført Antall må være større enn null.
@@ -2676,24 +2680,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Kan ikke returnere mer enn {1} for Element {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plott
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plott
 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}
 DocType: Cheque Print Template,Primary Settings,primære Innstillinger
 DocType: Purchase Invoice,Select Supplier Address,Velg Leverandør Adresse
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Legg Medarbeidere
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Legg Medarbeidere
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Advarsel: Material Requested Antall er mindre enn Minimum Antall
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} er frosset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Legal Entity / Datterselskap med en egen konto tilhørighet til organisasjonen.
 DocType: Payment Request,Mute Email,Demp Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, drikke og tobakk"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Kan bare gjøre betaling mot fakturert {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Kommisjon kan ikke være større enn 100
 DocType: Stock Entry,Subcontract,Underentrepriser
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Fyll inn {0} først
@@ -2733,7 +2737,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Næringslokaler med eksisterende transaksjon kan ikke konverteres til gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut på dato den
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Legg Studenter
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Legg Studenter
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vennligst velg {0}
 DocType: C-Form,C-Form No,C-Form Nei
 DocType: BOM,Exploded_items,Exploded_items
@@ -2776,7 +2780,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Skriv inn navnet på kampanjen hvis kilden til henvendelsen er kampanje
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Avis Publishers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Velg regnskapsår
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Velg regnskapsår
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Omgjøre nivå
 DocType: Company,Chart Of Accounts Template,Konto Mal
 DocType: Attendance,Attendance Date,Oppmøte Dato
@@ -2791,14 +2795,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicate entry
 DocType: Program Enrollment Tool,Get Students,Få Studenter
 DocType: Serial No,Under Warranty,Under Garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord vil være synlig når du lagrer kundeordre.
 ,Employee Birthday,Ansatt Bursdag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Oppmøte Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Krysset
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Et semester med denne &#39;Academic Year&#39; {0} og &quot;Term Name {1} finnes allerede. Vennligst endre disse oppføringene og prøv igjen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Ettersom det er eksisterende transaksjoner mot item {0}, kan du ikke endre verdien av {1}"
 DocType: UOM,Must be Whole Number,Må være hele tall
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nye Løv Tildelte (i dager)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial No {0} finnes ikke
@@ -2818,7 +2822,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 +49,Period Closing Entry,Periode Closing Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til gruppen
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Mengden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivninger
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverandør (er)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Employee Oppmøte Tool
@@ -2842,7 +2846,7 @@
 DocType: Supplier,Last Day of the Next Month,Siste dag av neste måned
 DocType: Support Settings,Auto close Issue after 7 days,Auto nær Issue etter 7 dager
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Permisjon kan ikke tildeles før {0}, som permisjon balanse har allerede vært carry-sendt i fremtiden permisjon tildeling posten {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Merk: På grunn / Reference Date stiger tillatt kunde kreditt dager med {0} dag (er)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,student Søker
 DocType: Asset Category Account,Accumulated Depreciation Account,Akkumulerte avskrivninger konto
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2853,7 +2857,7 @@
 ,Stock Analytics,Aksje Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operasjoner kan ikke være tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Mot Document Detail Nei
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Partiet Type er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Partiet Type er obligatorisk
 DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Spurt For
 DocType: Quotation Item,Against Doctype,Mot Doctype
@@ -2870,10 +2874,10 @@
 DocType: Asset,Item Code,Sak Kode
 DocType: Production Planning Tool,Create Production Orders,Opprett produksjonsordrer
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Velg studenter manuelt for aktivitetsbasert gruppe
 DocType: Journal Entry,User Remark,Bruker Remark
 DocType: Lead,Market Segment,Markedssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Betalt Beløpet kan ikke være større enn total negativ utestående beløp {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Ansatt Intern Work History
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Lukking (Dr)
 DocType: Cheque Print Template,Cheque Size,sjekk Size
@@ -2889,7 +2893,7 @@
 DocType: Production Planning Tool,Create Material Requests,Opprett Material Forespørsler
 DocType: Employee Education,School/University,Skole / universitet
 DocType: Payment Request,Reference Details,Referanse Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Forventet verdi Etter Nyttig Livet må være mindre enn Bruttobeløpet
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tilgjengelig Antall på Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturert beløp
 DocType: Asset,Double Declining Balance,Dobbel degressiv
@@ -2910,20 +2914,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Forskjellen konto må være en eiendel / forpliktelse type konto, siden dette Stock Forsoning er en åpning Entry"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Utbetalt Mengde kan ikke være større enn låne beløpet {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Innkjøpsordrenummeret som kreves for Element {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produksjonsordre ikke opprettet
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Produksjonsordre ikke opprettet
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Fra dato&quot; må være etter &#39;To Date&#39;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Kan ikke endre status som student {0} er knyttet til studentens søknad {1}
 DocType: Asset,Fully Depreciated,fullt avskrevet
 ,Stock Projected Qty,Lager Antall projiserte
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kunden {0} ikke hører til prosjektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Merket Oppmøte HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Sitater er forslag, bud du har sendt til dine kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens innkjøpsordre
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial No og Batch
 DocType: Warranty Claim,From Company,Fra Company
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summen av Resultater av vurderingskriterier må være {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Verdi eller Stk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vennligst sett Antall Avskrivninger bestilt
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Verdi eller Stk
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Bestillinger kan ikke heves for:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutt
 DocType: Purchase Invoice,Purchase Taxes and Charges,Kjøpe skatter og avgifter
@@ -2935,7 +2939,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,alle Næringslokaler
 DocType: Sales Partner,Retailer,Forhandler
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Alle Leverandør Typer
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alle Leverandør Typer
 DocType: Global Defaults,Disable In Words,Deaktiver I Ord
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Sitat {0} ikke av typen {1}
@@ -2944,6 +2948,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Kassekreditt konto
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Gjør Lønn Slip
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rad # {0}: Tilordnet beløp kan ikke være større enn utestående beløp.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Bla BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Sikret lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Rediger konteringsdato og klokkeslett
@@ -2983,7 +2988,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ikke lov til å oppdatere lagertransaksjoner eldre enn {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt Fakturert
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Vennligst angi standard betales konto i den ansattes {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontanter
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Levering lager nødvendig for lagervare {0}
 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)
@@ -2994,7 +2998,7 @@
 DocType: Student Group,Group Based On,Gruppe basert på
 DocType: Journal Entry,Bill Date,Bill Dato
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Tjenesten varen, type, frekvens og utgiftene beløp kreves"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Selv om det er flere Prising regler med høyest prioritet, deretter følgende interne prioriteringer til grunn:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Har du virkelig ønsker å sende alle Lønn Slip fra {0} til {1}
 DocType: Cheque Print Template,Cheque Height,sjekk Høyde
 DocType: Supplier,Supplier Details,Leverandør Detaljer
@@ -3006,7 +3010,7 @@
 DocType: Vehicle Log,Invoice Ref,faktura~~POS=TRUNC Ref
 DocType: Purchase Order,Recurring Order,Gjentakende Bestill
 DocType: Company,Default Income Account,Standard Inntekt konto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kunden Group / Kunde
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kunden Group / Kunde
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed regnskapsårene Profit / Loss (Credit)
 DocType: Sales Invoice,Time Sheets,timelister
 DocType: Payment Gateway Account,Default Payment Request Message,Standard betalingsforespørsel Message
@@ -3026,10 +3030,10 @@
 DocType: Notification Control,Quotation Message,Sitat Message
 DocType: Employee Loan,Employee Loan Application,Medarbeider lånesøknad
 DocType: Issue,Opening Date,Åpningsdato
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Oppmøte er merket med hell.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Oppmøte er merket med hell.
 DocType: Journal Entry,Remark,Bemerkning
 DocType: Purchase Receipt Item,Rate and Amount,Rate og Beløp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Kontotype for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Kontotype for {0} må være {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blader og Holiday
 DocType: School Settings,Current Academic Term,Nåværende faglig term
 DocType: School Settings,Current Academic Term,Nåværende faglig term
@@ -3052,7 +3056,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,student Gruppe
 DocType: Shopping Cart Settings,Quotation Series,Sitat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Et element eksisterer med samme navn ({0}), må du endre navn varegruppen eller endre navn på elementet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Velg kunde
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Velg kunde
 DocType: C-Form,I,Jeg
 DocType: Company,Asset Depreciation Cost Center,Asset Avskrivninger kostnadssted
 DocType: Sales Order Item,Sales Order Date,Salgsordre Dato
@@ -3071,20 +3075,20 @@
 DocType: Vehicle,Insurance Details,forsikring Detaljer
 DocType: Account,Payable,Betales
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Fyll inn nedbetalingstid
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Skyldnere ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Skyldnere ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nye kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttofortjeneste%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Klaring Dato
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttobeløpet er obligatorisk
 DocType: Lead,Address Desc,Adresse Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party er obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party er obligatorisk
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,emne Name
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Minst én av de selge eller kjøpe må velges
-DocType: Grading Structure,Grade Intervals,Vurder intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Velg formålet med virksomheten.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Row # {0}: Dupliseringsoppføring i Referanser {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Hvor fabrikasjonsvirksomhet gjennomføres.
 DocType: Asset Movement,Source Warehouse,Kilde Warehouse
 DocType: Installation Note,Installation Date,Installasjonsdato
@@ -3121,7 +3125,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevark for utskriftsmaler.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titler for utskriftsmaler f.eks Proforma Faktura.
 DocType: Student Guardian,Student Guardian,student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Verdsettelse typen kostnader kan ikke merket som Inclusive
 DocType: POS Profile,Update Stock,Oppdater Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ulik målenheter for elementer vil føre til feil (Total) Netto vekt verdi. Sørg for at nettovekt av hvert element er i samme målenheter.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3149,7 +3153,7 @@
 DocType: Company,Exchange Gain / Loss Account,Valutagevinst / tap-konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Medarbeider og oppmøte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Hensikten må være en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Fyll ut skjemaet og lagre det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Faktisk antall på lager
@@ -3165,7 +3169,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Omgjøre Antall
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nåværende jobb Åpninger
 DocType: Company,Stock Adjustment Account,Stock Adjustment konto
-DocType: Journal Entry,Write Off,Skriv Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Skriv Off
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemet bruker (innlogging) ID. Hvis satt, vil det bli standard for alle HR-skjemaer."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Fra {1}
@@ -3176,26 +3180,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverandør leverer til kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / post / {0}) er utsolgt
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Neste dato må være større enn konteringsdato
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Vis skatt break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Vis skatt break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Reference Datoen kan ikke være etter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data import og eksport
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Aksjeoppføringer finnes mot Warehouse {0}, dermed kan du ikke re-tildele eller endre den"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ingen studenter Funnet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Ingen studenter Funnet
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Publiseringsdato
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Selge
 DocType: Sales Invoice,Rounded Total,Avrundet Total
 DocType: Product Bundle,List items that form the package.,Listeelementer som danner pakken.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Prosentvis Tildeling skal være lik 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Vennligst velg Publiseringsdato før du velger Partiet
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,Ut av AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vennligst velg tilbud
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Gjør Vedlikehold Visit
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vennligst velg tilbud
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antall Avskrivninger reservert kan ikke være større enn Totalt antall Avskrivninger
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Gjør Vedlikehold Visit
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ta kontakt for brukeren som har salgs Master manager {0} rolle
 DocType: Company,Default Cash Account,Standard Cash konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ikke kunde eller leverandør) mester.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Dette er basert på tilstedeværelse av denne Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Ingen studenter i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Legg til flere elementer eller åpne full form
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Skriv inn &quot;Forventet Leveringsdato &#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Levering Merknader {0} må avbestilles før den avbryter denne salgsordre
@@ -3227,6 +3232,7 @@
 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: Warranty Claim,Item and Warranty Details,Element og Garanti Detaljer
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Varenummer&gt; Varegruppe&gt; Varemerke
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Velg Programmet for å hente obligatoriske kurs.
@@ -3242,9 +3248,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Før avstemming
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Til {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter og avgifter legges (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Sak Skatte Rad {0} må ha konto for type skatt eller inntekt eller kostnad eller Charge
 DocType: Sales Order,Partly Billed,Delvis Fakturert
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} må være et driftsmiddel element
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3254,8 +3260,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automotive
 DocType: Vehicle,Insurance Company,Forsikringsselskap
 DocType: Asset Category Account,Fixed Asset Account,Fast Asset konto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variabel
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Fra følgeseddel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,variabel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Fra følgeseddel
 DocType: Student,Student Email Address,Student e-postadresse
 DocType: Timesheet Detail,From Time,Fra Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,På lager:
@@ -3267,12 +3273,12 @@
 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 +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adressenavn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adressenavn
 DocType: Stock Entry,From BOM,Fra BOM
 DocType: Assessment Code,Assessment Code,Assessment Kode
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grunnleggende
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Lagertransaksjoner før {0} er frosset
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Vennligst klikk på &quot;Generer Schedule &#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","f.eks Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referansenummer er obligatorisk hvis du skrev Reference Date
 DocType: Bank Reconciliation Detail,Payment Document,betaling Document
@@ -3280,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Lønn Struktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flyselskap
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Issue Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Du er i frakoblet modus. Du vil ikke være i stand til å laste før du har nettverk.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ingen studentgrupper opprettet.
 DocType: Purchase Invoice Item,Serial No,Serial No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månedlig nedbetaling beløpet kan ikke være større enn Lånebeløp
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Skriv inn maintaince detaljer Første
 DocType: Purchase Invoice,Print Language,Print Språk
 DocType: Salary Slip,Total Working Hours,Samlet arbeidstid
 DocType: Stock Entry,Including items for sub assemblies,Inkludert elementer for sub samlinger
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Oppgi verdien skal være positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Oppgi verdien skal være positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alle Territories
 DocType: Purchase Invoice,Items,Elementer
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student er allerede registrert.
@@ -3312,17 +3318,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard Enhet for Variant {0} må være samme som i malen {1}
 DocType: Shipping Rule,Calculate Based On,Beregn basert på
 DocType: Delivery Note Item,From Warehouse,Fra Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Ingen elementer med Bill of Materials til Manufacture
 DocType: Assessment Plan,Supervisor Name,Supervisor Name
 DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
 DocType: Program Enrollment Course,Program Enrollment Course,Programopptakskurs
-DocType: Grading Structure,Grading Structure,Grading Struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Verdivurdering og Total
 DocType: Tax Rule,Shipping City,Shipping by
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Tilpass varslings
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Kontantstrøm fra driften
 DocType: Sales Invoice,Shipping Rule,Shipping Rule
@@ -3343,8 +3347,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Ingen standard BOM finnes for Element {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vennligst velg Publiseringsdato først
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Vennligst velg Publiseringsdato først
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Åpningsdato bør være før påmeldingsfristens utløp
 DocType: Leave Control Panel,Carry Forward,Fremføring
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadssted med eksisterende transaksjoner kan ikke konverteres til Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Dager som Holidays er blokkert for denne avdelingen.
@@ -3357,7 +3361,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Fest Brev
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Siste kommunikasjon
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Siste kommunikasjon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kan ikke trekke når kategorien er for verdsetting &quot;eller&quot; Verdsettelse og Totals
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","List dine skatte hoder (f.eks merverdiavgift, toll etc, de bør ha unike navn) og deres standardsatser. Dette vil skape en standard mal, som du kan redigere og legge til mer senere."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalinger med Fakturaer
@@ -3373,7 +3377,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Sak Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Lag Medarbeider Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Lag Medarbeider Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,regnskaps~~POS=TRUNC Uttalelser
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Time
@@ -3386,10 +3390,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Ukjent
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt Regel betingelser
 DocType: BOM Replace Tool,The new BOM after replacement,Den nye BOM etter utskiftning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Utsalgssted
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Utsalgssted
 DocType: Payment Entry,Received Amount,mottatt beløp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vennligst oppsett Ansattes navngivningssystem i menneskelig ressurs&gt; HR-innstillinger
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Lag full mengde, ignorerer mengde allerede er i ordre"
 DocType: Account,Tax,Skatte
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ikke Merket
@@ -3402,9 +3404,9 @@
 DocType: Batch,Source Document Name,Kilde dokumentnavn
 DocType: Batch,Source Document Name,Kilde dokumentnavn
 DocType: Job Opening,Job Title,Jobbtittel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Lag brukere
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Lag brukere
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Antall å Manufacture må være større enn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besøk rapport for vedlikehold samtale.
 DocType: Stock Entry,Update Rate and Availability,Oppdateringsfrekvens og tilgjengelighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Prosentvis du har lov til å motta eller levere mer mot antall bestilte produkter. For eksempel: Hvis du har bestilt 100 enheter. og din Fradrag er 10% så du har lov til å motta 110 enheter.
@@ -3414,28 +3416,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Utgiftskonto er obligatorisk for elementet {0}
 DocType: BOM,Website Description,Website Beskrivelse
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Netto endring i egenkapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vennligst avbryte fakturaen {0} først
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-post adresse må være unikt, allerede eksisterer for {0}"
 DocType: Serial No,AMC Expiry Date,AMC Utløpsdato
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Kvittering
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Kvittering
 ,Sales Register,Salg Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Send e-post til
 DocType: Quotation,Quotation Lost Reason,Sitat av Lost Reason
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Velg Domene
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transaksjonsreferanse ikke {0} datert {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det er ingenting å redigere.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Ingen kunder ennå!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kontantstrømoppstilling
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeløp kan ikke overstige maksimalt lånebeløp på {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Tillatelse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Skriv inn avskrive konto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Siste Order Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} ikke tilhører selskapet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumre i rad {0} stemmer ikke overens med leveringsnotat
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Oppmøte for flere ansatte
@@ -3460,20 +3464,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # konto må være av typen &quot;Fixed Asset &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antall
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler for å beregne frakt beløp for et salg
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien er obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serien er obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansielle Tjenester
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typer aktiviteter for Tid Logger
 DocType: Tax Rule,Sales,Salgs
 DocType: Stock Entry Detail,Basic Amount,Grunnbeløp
 DocType: Training Event,Exam,Eksamen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Warehouse nødvendig for lager Element {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Billing State
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party-konto {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ikke forbundet med Party-konto {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Hente eksploderte BOM (inkludert underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Gjelder til (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date er obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Økning for Egenskap {0} kan ikke være 0
@@ -3484,13 +3488,13 @@
 ,Inactive Customers,inaktive kunder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kjøps Kvitteringer
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hvordan Pricing Rule er brukt?
 DocType: Stock Entry,Delivery Note No,Levering Note Nei
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Hvis det er merket, bare kjøpe materielle forespørsler for endelig råvarer vil bli inkludert i materialet forespørsler. Ellers vil material Forespørsler om ordnede elementer opprettes"
 DocType: Cheque Print Template,Message to show,Melding for visning
 DocType: Company,Retail,Retail
 DocType: Attendance,Absent,Fraværende
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produktet Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Produktet Bundle
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3500,10 +3504,10 @@
 DocType: Payment Entry,Account Paid From,Konto betalt fra
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Elementkode
 DocType: Journal Entry,Write Off Based On,Skriv Off basert på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Gjør Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Gjør Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Skriv ut og Saker
 DocType: Stock Settings,Show Barcode Field,Vis strekkodefelt
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Send Leverandør e-post
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Send Leverandør e-post
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Lønn allerede behandlet for perioden mellom {0} og {1}, La søknadsperioden kan ikke være mellom denne datoperioden."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installasjon rekord for en Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Rente
@@ -3516,6 +3520,7 @@
 DocType: Offer Letter,Awaiting Response,Venter på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Fremfor
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ugyldig egenskap {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Nevn hvis ikke-standard betalingskonto
 DocType: Salary Slip,Earning & Deduction,Tjene &amp; Fradrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Valgfritt. Denne innstillingen vil bli brukt for å filtrere i forskjellige transaksjoner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negative Verdivurdering Rate er ikke tillatt
@@ -3531,10 +3536,9 @@
 DocType: Production Order Item,Production Order Item,Produksjonsordre Element
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen rekord funnet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kostnad for kasserte Asset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,delvis ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadssted er obligatorisk for Element {2}
 DocType: Vehicle,Policy No,Regler Nei
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Få Elementer fra Produkt Bundle
 DocType: Asset,Straight Line,Rett linje
 DocType: Project User,Project User,prosjekt Bruker
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dele
@@ -3552,7 +3556,7 @@
 DocType: Program Enrollment Tool,Get Students From,Få studenter fra
 DocType: Hub Settings,Seller Country,Selger Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publiser Elementer på nettstedet
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Gruppe elevene i grupper
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Gruppe elevene i grupper
 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 +85,Specifications,Spesifikasjoner
@@ -3605,14 +3609,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Sjekk Dato
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Parent konto {1} ikke tilhører selskapet: {2}
 DocType: Program Enrollment Tool,Student Applicants,student Søkere
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Slettet alle transaksjoner knyttet til dette selskapet!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,påmelding Dato
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Prøvetid
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lønn Components
 DocType: Program Enrollment Tool,New Academic Year,Nytt studieår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retur / kreditnota
 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 +28,Total Paid Amount,Totalt innbetalt beløp
 DocType: Production Order Item,Transferred Qty,Overført Antall
@@ -3632,7 +3636,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Type blader som casual, syke etc."
 DocType: Email Digest,Send regular summary reports via Email.,Send vanlige oppsummeringsrapporter via e-post.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Vennligst angi standardkonto i Expense krav Type {0}
 DocType: Assessment Result,Student Name,Student navn
 DocType: Brand,Item Manager,Sak manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,lønn Betales
@@ -3653,6 +3657,7 @@
 ,Sales Funnel,Sales trakt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Forkortelsen er obligatorisk
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kurven
 ,Qty to Transfer,Antall overføre
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Sitater for å Leads eller kunder.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rolle tillatt å redigere frossen lager
@@ -3680,13 +3685,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Sak Wise Skatt Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute forkortelse
 ,Item-wise Price List Rate,Element-messig Prisliste Ranger
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Leverandør sitat
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord vil være synlig når du lagrer Tilbud.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Antall ({0}) kan ikke være en brøkdel i rad {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,samle gebyrer
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} allerede brukt i Element {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Regler for å legge til fraktkostnader.
 DocType: Item,Opening Stock,åpning Stock
@@ -3703,8 +3708,8 @@
 Updated via 'Time Log'",Minutter Oppdatert via &#39;Time Logg&#39;
 DocType: Customer,From Lead,Fra Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Bestillinger frigitt for produksjon.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Velg regnskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Velg regnskapsår ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profile nødvendig å foreta POS Entry
 DocType: Program Enrollment Tool,Enroll Students,Meld Studenter
 DocType: Hub Settings,Name Token,Navn Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard Selling
@@ -3715,7 +3720,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mot Sales Faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Prosjektnavn
-DocType: Supplier,Mention if non-standard receivable account,Nevn hvis ikke-standard fordring konto
+DocType: Customer,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: Production Order,Required Items,nødvendige elementer
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Verdi Difference
@@ -3736,7 +3741,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Sette mål varegruppe-messig for Sales Person.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Aksjer Eldre enn [dager]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset er obligatorisk for anleggsmiddel kjøp / salg
-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.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Hvis to eller flere Prising Reglene er funnet basert på de ovennevnte forhold, er Priority brukt. Prioritet er et tall mellom 0 og 20, mens standardverdi er null (blank). Høyere tall betyr at det vil ha forrang dersom det er flere Prising regler med samme betingelser."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiscal Year: {0} ikke eksisterer
 DocType: Currency Exchange,To Currency,Å Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillat følgende brukere å godkjenne La Applications for blokk dager.
@@ -3761,7 +3766,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Element {0} ignorert siden det ikke er en lagervare
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Send dette produksjonsordre for videre behandling.
-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.","Hvis du ikke vil bruke Prissetting regel i en bestemt transaksjon, bør alle gjeldende reglene for prissetting deaktiveres."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Hvis du ikke vil bruke Prissetting regel i en bestemt transaksjon, bør alle gjeldende reglene for prissetting deaktiveres."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Salgsordre Trender
@@ -3772,7 +3777,7 @@
 DocType: Stock Entry Detail,Additional Cost,Tilleggs Cost
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Regnskapsårets slutt Dato
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Gjør Leverandør sitat
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Gjør Leverandør sitat
 DocType: Quality Inspection,Incoming,Innkommende
 DocType: BOM,Materials Required (Exploded),Materialer som er nødvendige (Exploded)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Legge til brukere i organisasjonen, annet enn deg selv"
@@ -3800,6 +3805,7 @@
 DocType: Employee,History In Company,Historie I selskapet
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kunde&gt; Kundegruppe&gt; Territorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Samme element er angitt flere ganger
 DocType: Department,Leave Block List,La Block List
 DocType: Sales Invoice,Tax ID,Skatt ID
@@ -3809,7 +3815,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner og Kommisjonen
 DocType: Employee Loan,Rate of Interest (%) / Year,Rente (%) / År
 ,Project Quantity,prosjekt Antall
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Totalt {0} for alle elementer er null, kan være du bør endre &#39;Fordel Avgifter basert på&#39;"
 DocType: Opportunity,To Discuss,Å Diskutere
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} trengs i {2} for å fullføre denne transaksjonen.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rente (%) Årlig
@@ -3824,7 +3830,7 @@
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Produksjon Bestill Operation
 DocType: Pricing Rule,Disable,Deaktiver
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Modus for betaling er nødvendig å foreta en betaling
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Modus for betaling er nødvendig å foreta en betaling
 DocType: Project Task,Pending Review,Avventer omtale
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} kan ikke bli vraket, som det er allerede {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense krav (via Expense krav)
@@ -3832,11 +3838,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Fraværende
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: valuta BOM # {1} bør være lik den valgte valutaen {2}
 DocType: Journal Entry Account,Exchange Rate,Vekslingskurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Salgsordre {0} er ikke innsendt
 DocType: Homepage,Tag Line,tag Linje
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Flåtestyring
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Legg elementer fra
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Legg elementer fra
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Warehouse {0}: Parent konto {1} ikke BOLONG til selskapet {2}
 DocType: Cheque Print Template,Regular,Regelmessig
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Totalt weightage av alle vurderingskriteriene må være 100%
@@ -3849,7 +3855,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Warehouse {0} finnes ikke
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrer For ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månedlig Distribusjonsprosent
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Den valgte elementet kan ikke ha Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Verdsettelse hastighet ikke funnet med Element {0}, som er nødvendig for å gjøre regnskap oppføringer for {1} {2}. Hvis elementet er transacting som en prøve element i {1}, kan nevnes at i {1} Element tabell. Ellers må du opprette en innkommende lager transaksjon for varen eller omtale verdivurdering hastighet i element posten, og deretter prøve submiting / avbryter denne oppføringen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av materialer leveres mot denne følgeseddel
 DocType: Project,Customer Details,Kunde Detaljer
@@ -3858,15 +3864,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Skriv inn url parameter for mottaker nos
 DocType: Payment Entry,Paid Amount,Innbetalt beløp
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,på nett
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,på nett
 ,Available Stock for Packing Items,Tilgjengelig på lager for pakk gjenstander
 DocType: Item Variant,Item Variant,Sak Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Resultat Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Element
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Innsendte bestillinger kan ikke slettes
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Kvalitetsstyring
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} har blitt deaktivert
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} har blitt deaktivert
 DocType: Employee Loan,Repay Fixed Amount per Period,Smelle fast beløp per periode
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Skriv inn antall for Element {0}
 DocType: Employee External Work History,Employee External Work History,Ansatt Ekstern Work History
@@ -3892,7 +3898,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Varsel (dager)
 DocType: Tax Rule,Sales Tax Template,Merverdiavgift Mal
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Velg elementer for å lagre fakturaen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Velg elementer for å lagre fakturaen
 DocType: Employee,Encashment Date,Encashment Dato
 DocType: Training Event,Internet,Internett
 DocType: Account,Stock Adjustment,Stock Adjustment
@@ -3915,7 +3921,7 @@
 DocType: Item Variant Attribute,Attribute,Attributt
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Vennligst oppgi fra / til spenner
 DocType: Serial No,Under AMC,Under AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Sak verdivurdering rente beregnes på nytt vurderer inntakskost kupong beløp
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Sak verdivurdering rente beregnes på nytt vurderer inntakskost kupong beløp
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardinnstillingene for salg transaksjoner.
 DocType: Guardian,Guardian Of ,Guardian Av
 DocType: Grading Scale Interval,Threshold,Terskel
@@ -3925,6 +3931,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debitnota Utstedt
 DocType: Production Order,Warehouses,Næringslokaler
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} eiendelen kan ikke overføres
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denne varen er en variant av {0} (mal).
 DocType: Workstation,per hour,per time
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,innkjøp
 DocType: Announcement,Announcement,Kunngjøring
@@ -3940,8 +3947,8 @@
 DocType: Account,Receivable,Fordring
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Ikke lov til å endre Leverandør som innkjøpsordre allerede eksisterer
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rollen som får lov til å sende transaksjoner som overstiger kredittgrenser fastsatt.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Velg delbetaling Produksjon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Velg delbetaling Produksjon
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master data synkronisering, kan det ta litt tid"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Selger Beskrivelse
 DocType: Employee Education,Qualification,Kvalifisering
@@ -3953,7 +3960,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Bestilt
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Vurderingskriterier Gruppe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Åpning akkumulerte avskrivninger må være mindre enn eller lik {0}
 DocType: Warehouse,Warehouse Name,Warehouse Name
 DocType: Naming Series,Select Transaction,Velg Transaksjons
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Skriv inn Godkjenne Rolle eller Godkjenne User
@@ -3966,7 +3973,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Kan ikke avbryte fordi innsendt Stock Entry {0} finnes
 DocType: Employee Loan,Disbursement Date,Innbetalingsdato
 DocType: Vehicle,Vehicle,Kjøretøy
 DocType: Purchase Invoice,In Words,I Words
@@ -3980,14 +3987,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivninger og Balanserer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Mengden {0} {1} overført fra {2} til {3}
 DocType: Sales Invoice,Get Advances Received,Få Fremskritt mottatt
 DocType: Email Digest,Add/Remove Recipients,Legg til / fjern Mottakere
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaksjonen ikke lov mot stoppet Produksjonsordre {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","For å sette dette regnskapsåret som standard, klikk på &quot;Angi som standard &#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Bli med
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mangel Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Sak variant {0} finnes med samme attributtene
 DocType: Employee Loan,Repay from Salary,Smelle fra Lønn
 DocType: Leave Application,LAP/,RUNDE/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Ber om betaling mot {0} {1} for mengden {2}
@@ -4005,7 +4012,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Assessment Resultat Detalj
 DocType: Employee Education,Employee Education,Ansatt Utdanning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicate varegruppe funnet i varegruppen bordet
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Det er nødvendig å hente Element detaljer.
 DocType: Salary Slip,Net Pay,Netto Lønn
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial No {0} er allerede mottatt
@@ -4014,7 +4021,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Warehouse {0} er ikke knyttet til noen konto, kan du opprette / knytte tilsvarende (Asset) står for lageret."
 DocType: Purchase Invoice,Recurring Id,Gjentakende Id
 DocType: Customer,Sales Team Details,Salgsteam Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Slett permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Slett permanent?
 DocType: Expense Claim,Total Claimed Amount,Total Hevdet Beløp
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potensielle muligheter for å selge.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ugyldig {0}
@@ -4025,13 +4032,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Oppsettet ditt School i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Endre Beløp (Selskap Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ingen regnskapspostene for følgende varehus
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lagre dokumentet først.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Endre Forkortelse
 DocType: Expense Claim Detail,Expense Date,Expense Dato
 DocType: Item,Max Discount (%),Max Rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Siste ordrebeløp
+DocType: Task,Is Milestone,Er Milestone
 DocType: Daily Work Summary,Email Sent To,E-post sendt Å
 DocType: Budget,Warn,Advare
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Eventuelle andre bemerkninger, bemerkelsesverdig innsats som bør gå i postene."
@@ -4052,7 +4060,7 @@
 DocType: Item Attribute Value,Attribute Value,Attributtverdi
 ,Itemwise Recommended Reorder Level,Itemwise Anbefalt Omgjøre nivå
 DocType: Salary Detail,Salary Detail,lønn Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Vennligst velg {0} først
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Vennligst velg {0} først
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} av Element {1} er utløpt.
 DocType: Sales Invoice,Commission,Kommisjon
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Timeregistrering for produksjon.
@@ -4064,41 +4072,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Aksjer Eldre Than` bør være mindre enn% d dager.
 DocType: Tax Rule,Purchase Tax Template,Kjøpe Tax Mal
 ,Project wise Stock Tracking,Prosjektet klok Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Vedlikeholdsplan {0} finnes mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiske antall (ved kilden / target)
 DocType: Item Customer Detail,Ref Code,Ref Kode
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Medarbeider poster.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vennligst sett Neste Avskrivninger Dato
 DocType: HR Settings,Payroll Settings,Lønn Innstillinger
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Matche ikke bundet fakturaer og betalinger.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Legg inn bestilling
 DocType: Email Digest,New Purchase Orders,Nye innkjøpsordrer
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kan ikke ha en forelder kostnadssted
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Velg merke ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Velg merke ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Akkumulerte avskrivninger som på
 DocType: Sales Invoice,C-Form Applicable,C-Form Gjelder
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Tid må være større enn 0 for operasjon {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse er obligatorisk
 DocType: Supplier,Address and Contacts,Adresse og Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Målenheter Conversion Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Hold det web vennlig 900px (w) ved 100px (h)
 DocType: Program,Program Abbreviation,program forkortelse
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produksjonsordre kan ikke heves mot et elementmal
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Kostnader er oppdatert i Purchase Mottak mot hvert element
 DocType: Warranty Claim,Resolved By,Løst Av
 DocType: Bank Guarantee,Start Date,Startdato
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Bevilge blader for en periode.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Sjekker og Innskudd feil ryddet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Opprett kunde sitater
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Opprett kunde sitater
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Gjennomsnittlig tid tatt av leverandøren til å levere
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Assessment Resultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timer
 DocType: Project,Expected Start Date,Tiltredelse
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Fjern artikkel om avgifter er ikke aktuelt til dette elementet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaksjons valuta må være samme som Payment Gateway valuta
 DocType: Payment Entry,Receive,Motta
@@ -4109,19 +4116,19 @@
 DocType: Workstation,Operating Costs,Driftskostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Tiltak hvis Snø Månedlig budsjett Skredet
 DocType: Purchase Invoice,Submit on creation,Send inn på skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta for {0} må være {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta for {0} må være {1}
 DocType: Asset,Disposal Date,Deponering Dato
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post vil bli sendt til alle aktive ansatte i selskapet ved den gitte timen, hvis de ikke har ferie. Oppsummering av svarene vil bli sendt ved midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Ansatt La Godkjenner
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Omgjøre oppføring finnes allerede for dette lageret {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kan ikke erklære som tapt, fordi tilbudet er gjort."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,trening Tilbakemelding
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produksjonsordre {0} må sendes
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vennligst velg startdato og sluttdato for Element {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurset er obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Til dags dato kan ikke være før fra dato
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Legg til / Rediger priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Legg til / Rediger priser
 DocType: Batch,Parent Batch,Parent Batch
 DocType: Cheque Print Template,Cheque Print Template,Sjekk ut Mal
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plan Kostnadssteder
@@ -4134,7 +4141,7 @@
 ,Ordered Items To Be Delivered,Bestilte varer som skal leveres
 DocType: Account,Income,Inntekt
 DocType: Industry Type,Industry Type,Industry Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Noe gikk galt!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Noe gikk galt!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Salg Faktura {0} er allerede innsendt
 DocType: Assessment Result Detail,Score,Score
@@ -4165,17 +4172,17 @@
 DocType: Item,Variant Based On,Variant basert på
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage tilordnet skal være 100%. Det er {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dine Leverandører
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan ikke settes som tapt som Salgsordre er gjort.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Leverandør varenummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Mottatt fra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Kan ikke trekke når kategorien er for verdsetting &#39;eller&#39; Vaulation og Total &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Mottatt fra
 DocType: Lead,Converted,Omregnet
 DocType: Item,Has Serial No,Har Serial No
 DocType: Employee,Date of Issue,Utstedelsesdato
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Fra {0} for {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Fra {0} for {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Sett Leverandør for elementet {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rad {0}: Timer verdien må være større enn null.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4184,20 +4191,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturering valuta må være lik enten standard comapany valuta eller fremmed regning av valuta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,La Encashment
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Hva gjør det?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Til Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alle Student Opptak
 ,Average Commission Rate,Gjennomsnittlig kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Oppmøte kan ikke merkes for fremtidige datoer
 DocType: Pricing Rule,Pricing Rule Help,Prising Rule Hjelp
 DocType: School House,House Name,Husnavn
 DocType: Purchase Taxes and Charges,Account Head,Account Leder
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsett resten av organisasjonen som brukerne. Du kan også legge invitere kunder til portalen ved å legge dem fra Kontakter
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Tilsett resten av organisasjonen som brukerne. Du kan også legge invitere kunder til portalen ved å legge dem fra Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total verdi Difference (ut -)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4206,7 +4213,7 @@
 DocType: Item,Customer Code,Kunden Kode
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Bursdag Påminnelse for {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dager siden siste Bestill
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Uttak fra kontoen må være en balansekonto
 DocType: Buying Settings,Naming Series,Navngi Series
 DocType: Leave Block List,Leave Block List Name,La Block List Name
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Forsikring Startdatoen må være mindre enn Forsikring Sluttdato
@@ -4221,9 +4228,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Lønn Slip av ansattes {0} allerede opprettet for timeregistrering {1}
 DocType: Vehicle Log,Odometer,Kilometerteller
 DocType: Sales Order Item,Ordered Qty,Bestilte Antall
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Element {0} er deaktivert
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Element {0} er deaktivert
 DocType: Stock Settings,Stock Frozen Upto,Stock Frozen Opp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inneholder ikke lagervare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM inneholder ikke lagervare
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Prosjektet aktivitet / oppgave.
 DocType: Vehicle Log,Refuelling Details,Fylle drivstoff Detaljer
@@ -4233,8 +4240,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Siste kjøp sats ikke funnet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv Off Beløp (Selskap Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings~~POS=TRUNC Timer
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard BOM for {0} ikke funnet
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Vennligst sett omgjøring kvantitet
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Trykk på elementer for å legge dem til her
 DocType: Fees,Program Enrollment,program Påmelding
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed Cost Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vennligst sett {0}
@@ -4258,7 +4266,7 @@
 DocType: Maintenance Visit,Maintenance Date,Vedlikehold Dato
 DocType: Purchase Invoice Item,Rejected Serial No,Avvist Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,År startdato eller sluttdato er overlappende med {0}. For å unngå vennligst sett selskap
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Startdato skal være mindre enn sluttdato for Element {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.","Eksempel:. ABCD ##### Hvis serien er satt og serienummer er ikke nevnt i transaksjoner, og deretter automatisk serienummer vil bli opprettet basert på denne serien. Hvis du alltid vil eksplisitt nevne Serial Nos for dette elementet. la dette stå tomt."
 DocType: Upload Attendance,Upload Attendance,Last opp Oppmøte
@@ -4334,7 +4342,6 @@
 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
-DocType: Grade Interval,Grade Interval,grade Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Regnskapsår Startdato og regnskapsår sluttdato er allerede satt i regnskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Lagersalg oppdatert
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4381,14 +4388,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,La være ukontrollert hvis du ikke vil vurdere batch mens du lager kursbaserte grupper.
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av Avskrivninger (måneder)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Credit konto
 DocType: Landed Cost Item,Landed Cost Item,Landed Cost Element
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Oppsett en enkel nettside for min organisasjon
 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 +666,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Vennligst oppgi data Verdi for attributtet {0}
 DocType: Item,Default Warehouse,Standard Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budsjettet kan ikke overdras mot gruppekonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Skriv inn forelder kostnadssted
@@ -4434,7 +4441,7 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Credit Beløp
 DocType: Cheque Print Template,Signatory Position,Signataren plassering
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Sett som tapte
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Sett som tapte
 DocType: Timesheet,Total Billable Hours,Totalt fakturerbare timer
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Betaling Kvittering Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Dette er basert på transaksjoner mot denne kunden. Se tidslinjen nedenfor for detaljer
@@ -4448,11 +4455,11 @@
 ,Items To Be Requested,Elementer å bli forespurt
 DocType: Purchase Order,Get Last Purchase Rate,Få siste kjøp Ranger
 DocType: Company,Company Info,Selskap Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Velg eller legg til ny kunde
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Velg eller legg til ny kunde
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kostnadssted er nødvendig å bestille en utgift krav
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Anvendelse av midler (aktiva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Dette er basert på tilstedeværelse av denne Employee
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debet konto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4461,13 +4468,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,kjøpesummen
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverandør sitat {0} er opprettet
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Slutt År kan ikke være før start År
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Slutt År kan ikke være før start År
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Ytelser til ansatte
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vennligst angi en standard Holiday Liste for Employee {0} eller selskapet {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ikke eksisterer
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ikke eksisterer
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Nei {0}: Beløpet kan ikke være større enn utestående beløpet mot Expense krav {1}. Avventer Beløp er {2}
@@ -4476,15 +4483,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Kupong Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Prisliste ikke funnet eller deaktivert
 DocType: Employee Loan Application,Approved,Godkjent
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Ansatt lettet på {0} må være angitt som &quot;venstre&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Appraisal {0} skapt for Employee {1} i den gitte datointervall
 DocType: Employee,Education,Utdanning
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanje Naming Av
 DocType: Employee,Current Address Is,Gjeldende adresse Er
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifisert
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Valgfritt. Setter selskapets standardvaluta, hvis ikke spesifisert."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Regnskap posteringer.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tilgjengelig Antall på From Warehouse
@@ -4493,7 +4502,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / Account samsvarer ikke med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Skriv inn Expense konto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Document Type må være en av innkjøpsordre, faktura eller bilagsregistrering"
 DocType: Employee,Current Address,Nåværende Adresse
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Hvis elementet er en variant av et annet element da beskrivelse, image, priser, avgifter osv vil bli satt fra malen uten eksplisitt spesifisert"
 DocType: Serial No,Purchase / Manufacture Details,Kjøp / Produksjon Detaljer
@@ -4521,7 +4530,7 @@
 DocType: Hub Settings,Hub Settings,Hub-innstillinger
 DocType: Project,Gross Margin %,Bruttomargin%
 DocType: BOM,With Operations,Med Operations
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Regnskapspostene har allerede blitt gjort i valuta {0} for selskap {1}. Vennligst velg en fordring eller betales konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Er Eksisterende Asset
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -4546,7 +4555,7 @@
 DocType: Assessment Plan,Room,Rom
 DocType: Purchase Order,Advance Paid,Advance Betalt
 DocType: Item,Item Tax,Sak Skatte
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale til Leverandør
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale til Leverandør
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Vesenet Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% kommer mer enn én gang
 DocType: Expense Claim,Employees Email Id,Ansatte Email Id
@@ -4577,9 +4586,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fest Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lagernivåer
 DocType: Customer,Commission Rate,Kommisjon
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Gjør Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Gjør Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block permisjon applikasjoner ved avdelingen.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Betalingstype må være en av Motta, Lønn og Internal Transfer"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Handlevognen er tom
 DocType: Vehicle,Model,Modell
@@ -4590,6 +4599,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillat Produksjonen på helligdager
 DocType: Sales Order,Customer's Purchase Order Date,Kundens Purchase Order Date
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitalbeholdningen
+DocType: Shopping Cart Settings,Show Public Attachments,Vis offentlige vedlegg
 DocType: Packing Slip,Package Weight Details,Pakken vektdetaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betaling Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Etter betaling ferdigstillelse omdirigere brukeren til valgt side.
@@ -4608,15 +4618,15 @@
 DocType: Batch,Expiry Date,Utløpsdato
 ,Supplier Addresses and Contacts,Leverandør Adresser og kontakter
 ,accounts-browser,kontoer-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vennligst første velg kategori
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vennligst første velg kategori
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Prosjektet mester.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Å tillate overfakturering eller over-bestilling, oppdatere &quot;Fradrag&quot; på lager Innstillinger eller elementet."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Ikke viser noen symbol som $ etc ved siden av valutaer.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditt Days
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Gjør Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Gjør Student Batch
 DocType: Leave Type,Is Carry Forward,Er fremføring
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Få Elementer fra BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Få Elementer fra BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledetid Days
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: konteringsdato må være det samme som kjøpsdato {1} av eiendelen {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Fyll inn salgsordrer i tabellen ovenfor
@@ -4633,8 +4643,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: Debet oppføring kan ikke være knyttet til en {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vennligst oppsett nummereringsserie for Tilstedeværelse via Oppsett&gt; Nummereringsserie
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 32c8711..e84a338 100644
--- a/erpnext/translations/pl.csv
+++ b/erpnext/translations/pl.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Wynajęty
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Zastosowanie dla użytkownika
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zatrzymany Zamówienie produkcji nie mogą być anulowane, odetkać najpierw anulować"
 DocType: Vehicle Service,Mileage,Przebieg
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Czy naprawdę chcemy zlikwidować ten atut?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Wybierz Domyślne Dostawca
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Wybierz Domyślne Dostawca
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Waluta jest wymagana dla Cenniku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Zostanie policzony dla transakcji.
 DocType: Purchase Order,Customer Contact,Kontakt z klientem
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Zaległość za {0} nie może być mniejsza niż ({1})
 DocType: Manufacturing Settings,Default 10 mins,Domyślnie 10 minut
 DocType: Leave Type,Leave Type Name,Nazwa typu urlopu
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Pokaż otwarta
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Pokaż otwarta
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Seria zaktualizowana
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Sprawdzić
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Zgłoszony
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Przedmiot status ważności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Przekaz bankowy
 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 +58,Show Variants,Pokaż Warianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Pokaż Warianty
 DocType: Academic Term,Academic Term,semestr
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiał
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Ilość
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Ilość
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Konta tabeli nie może być puste.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Kredyty (zobowiązania)
 DocType: Employee Education,Year of Passing,Mijający rok
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Numer referencyjny:% s, kod:% s oraz klienta:% s"
 DocType: Item,Country of Origin,Kraj pochodzenia
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,W magazynie
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Otwarte kwestie
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Opieka zdrowotna
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Opóźnienie w płatności (dni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Koszty usługi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numer seryjny: {0} znajduje się już w fakturze sprzedaży: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Okresowość
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Rok fiskalny {0} jest wymagane
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Oczekuje Dostawa Data jest być przed Sales data
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Dołączyć plik .csv z dwoma kolumnami, po jednym dla starej nazwy i jeden dla nowej nazwy"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nie w każdej aktywnej roku obrotowego.
 DocType: Packed Item,Parent Detail docname,Nazwa dokumentu ze szczegółami nadrzędnego rodzica
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odniesienie: {0}, Kod pozycji: {1} i klient: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,kg
 DocType: Student Log,Log,Log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Ogłoszenie o pracę
 DocType: Item Attribute,Increment,Przyrost
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Wybierz Magazyn ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Wybierz Magazyn ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamowanie
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Ta sama Spółka wpisana jest więcej niż jeden raz
 DocType: Employee,Married,Żonaty / Zamężna
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nie dopuszczony do {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Pobierz zawartość z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nie dopuszczony do {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Pobierz zawartość z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Brak elementów na liście
 DocType: Payment Reconciliation,Reconcile,Wyrównywać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Artykuły spożywcze
 DocType: Quality Inspection Reading,Reading 1,Odczyt 1
 DocType: Process Payroll,Make Bank Entry,Dodaj Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundusze Emerytalne
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Następny Amortyzacja Data nie może być wcześniejsza Data zakupu
 DocType: SMS Center,All Sales Person,Wszyscy Sprzedawcy
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Miesięczny Dystrybucja ** pomaga rozprowadzić Budget / target całej miesięcy, jeśli masz sezonowości w firmie."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nie znaleziono przedmiotów
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nie znaleziono przedmiotów
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura Wynagrodzenie Brakujący
 DocType: Lead,Person Name,Imię i nazwisko osoby
 DocType: Sales Invoice Item,Sales Invoice Item,Przedmiot Faktury Sprzedaży
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",np &quot;Szkoła Podstawowa&quot; lub &quot;Uniwersytet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Raporty seryjne
 DocType: Warehouse,Warehouse Detail,Szczegóły magazynu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limit kredytowy został przekroczony dla klienta {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termin Data zakończenia nie może być późniejsza niż data zakończenia roku na rok akademicki, którego termin jest związany (Academic Year {}). Popraw daty i spróbuj ponownie."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Jest Środkiem Trwałym"" nie może być odznaczone, jeśli istnieją pozycje z takim ustawieniem"
 DocType: Vehicle Service,Brake Oil,Olej hamulcowy
 DocType: Tax Rule,Tax Type,Rodzaj podatku
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nie masz uprawnień aby zmieniać lub dodawać elementy przed {0}
 DocType: BOM,Item Image (if not slideshow),Element Obrazek (jeśli nie slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Istnieje Klient o tej samej nazwie
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Godzina Kursy / 60) * Rzeczywista Czas pracy
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Wybierz BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Wybierz BOM
 DocType: SMS Log,SMS Log,Dziennik zdarzeń SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Koszt dostarczonych przedmiotów
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Święto w dniu {0} nie jest pomiędzy Od Data i do tej pory
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,Szkoły
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nie znaleziono rekordu urlopu pracownika {0} dla {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Proszę najpierw wpisać Firmę
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Najpierw wybierz firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,Najpierw wybierz firmę
 DocType: Employee Education,Under Graduate,Absolwent
 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
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Kwota roszczenia
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplikat grupa klientów znajduje się w tabeli grupy cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Typ dostawy / dostawca
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Typ dostawy / dostawca
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Konsumpcyjny
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Stopień
 DocType: Sales Invoice Item,Delivered By Supplier,Dostarczane przez Dostawcę
 DocType: SMS Center,All Contact,Wszystkie dane Kontaktu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Produkcja Zamów już stworzony dla wszystkich elementów z BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Roczne Wynagrodzenie
 DocType: Daily Work Summary,Daily Work Summary,Dziennie Podsumowanie zawodowe
 DocType: Period Closing Voucher,Closing Fiscal Year,Zamknięcie roku fiskalnego
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} jest zamrożone
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} jest zamrożone
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Wybierz istniejącą spółkę do tworzenia planu kont
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Wydatki magazynowe
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Wybierz Magazyn docelowy
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry (Zapis przeciwstawny)
 DocType: Journal Entry Account,Credit in Company Currency,Kredyt w walucie Spółki
 DocType: Delivery Note,Installation Status,Status instalacji
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Czy chcesz zaktualizować frekwencję? <br> Obecni: {0} \ <br> Nieobecne {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Ilość Przyjętych + Odrzuconych musi odpowiadać ilości Odebranych (Element {0})
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dostawa surowce Skupu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Co najmniej jeden tryb płatności POS jest wymagane dla faktury.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Co najmniej jeden tryb płatności POS jest wymagane dla faktury.
 DocType: Products Settings,Show Products as a List,Wyświetl produkty w układzie listy
 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.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Bądź Amortyzacja Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ zapytania
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Bądź pracownika
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Bądź pracownika
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmitowanie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Wykonanie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Szczegóły dotyczące przeprowadzonych operacji.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plan wizyt serwisowych.
 DocType: SMS Settings,Enter url parameter for message,Wpisz URL dla wiadomości
 DocType: POS Profile,Customer Groups,Grupy klientów
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Sprawozdania finansowe
 DocType: Guardian,Students,studenci
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Zasady określania cen i zniżek
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cennik musi być przyporządkowany do kupna albo sprzedaży
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Ilość wyprzedzeniem nie może być większa niż {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista serii dla tej transakcji
 DocType: Company,Default Payroll Payable Account,Domyślny Płace Płatne konta
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizacja Grupa E
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizacja Grupa E
 DocType: Sales Invoice,Is Opening Entry,
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Wspomnieć, jeśli nie standardowe konto należności dotyczy"
 DocType: Course Schedule,Instructor Name,Instruktor Nazwa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Dla magazynu jest wymagane przed wysłaniem
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Dla magazynu jest wymagane przed wysłaniem
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Otrzymana w dniu
 DocType: Sales Partner,Reseller,Dystrybutor
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Jeśli zaznaczone, będzie zawierać elementy non-stock w materiale żądań."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Na podstawie pozycji faktury sprzedaży
 ,Production Orders in Progress,Zamówienia Produkcji w toku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Przepływy pieniężne netto z finansowania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage jest pełna, nie zapisać"
 DocType: Lead,Address & Contact,Adres i kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj niewykorzystane urlopy z poprzednich alokacji
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Następny cykliczne {0} zostanie utworzony w dniu {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Całkowita kwota Costing (przez czas arkuszu)
 DocType: Item Website Specification,Item Website Specification,Element Specyfikacja Strony
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Urlop Zablokowany
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Operacje bankowe
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Element {0} osiągnął kres przydatności {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Operacje bankowe
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roczny
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Uzgodnienia Stanu Pozycja
 DocType: Stock Entry,Sales Invoice No,Nr faktury sprzedaży
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Publikowanie w Hub
 DocType: Student Admission,Student Admission,Wstęp Student
 ,Terretory,Obszar
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Element {0} jest anulowany
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zamówienie produktu
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Element {0} jest anulowany
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Zamówienie produktu
 DocType: Bank Reconciliation,Update Clearance Date,Aktualizacja daty rozliczenia
 DocType: Item,Purchase Details,Szczegóły zakupu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Wybitni Czeki i depozytów, aby usunąć"
 DocType: Item,Synced With Hub,Synchronizowane z Hub
 DocType: Vehicle,Fleet Manager,Menadżer floty
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Wiersz # {0}: {1} nie może być negatywne dla pozycji {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Niepoprawne hasło
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Wiersz # {0}: {1} nie może być negatywne dla pozycji {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Niepoprawne hasło
 DocType: Item,Variant Of,Wariant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Zakończono Ilość nie może być większa niż ""Ilość w produkcji"""
 DocType: Period Closing Voucher,Closing Account Head,
 DocType: Employee,External Work History,Historia Zewnętrzna Pracy
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Circular Error Referencje
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Informuj za pomocą Maila (automatyczne)
 DocType: Journal Entry,Multi Currency,Wielowalutowy
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktury
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dowód dostawy
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Dowód dostawy
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Konfigurowanie podatki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Koszt sprzedanych aktywów
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
-DocType: Grade Interval,Min Score,min-line
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dwa razy wprowadzone w podatku produktu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Podsumowanie na ten tydzień i działań toczących
 DocType: Student Applicant,Admitted,Przyznał
 DocType: Workstation,Rent Cost,Koszt Wynajmu
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Wartość zamówienia
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transakcje Bank / Gotówka przeciwko osobie lub do przenoszenia wewnętrznego
 DocType: Shipping Rule,Valid for Countries,Ważny dla krajów
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Pozycja ta jest szablon i nie mogą być wykorzystywane w transakcjach. Atrybuty pozycji zostaną skopiowane nad do wariantów chyba ""Nie Kopiuj"" jest ustawiony"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Zamówienie razem Uważany
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Stanowisko pracownika (np. Dyrektor Generalny, Dyrektor)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Proszę wpisz wartości w pola ""Powtórz w dni miesiąca"""
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Wiersz # {0}: Zakup Faktura nie może być dokonywane wobec istniejącego zasobu {1}
 DocType: Item Tax,Tax Rate,Stawka podatku
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} już przydzielone Pracodawcy {1} dla okresu {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Wybierz produkt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Wybierz produkt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Faktura zakupu {0} została już wysłana
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Wiersz # {0}: Batch Nie musi być taki sam, jak {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Przekształć w nie-Grupę
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Partia (pakiet) produktu.
 DocType: C-Form Invoice Detail,Invoice Date,Data faktury
 DocType: GL Entry,Debit Amount,Kwota Debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nie może być tylko jedno konto na Spółkę w {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Proszę przejrzeć załącznik
 DocType: Purchase Order,% Received,% Otrzymanych
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tworzenie grup studenckich
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Zapytanie ofertowe
 DocType: Salary Slip Timesheet,Working Hours,Godziny pracy
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Zmień początkowy / obecny numer seryjny istniejącej serii.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Tworzenie nowego klienta
-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.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Stwórz zamówienie zakupu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Tworzenie nowego klienta
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Jeśli wiele Zasady ustalania cen nadal dominować, użytkownicy proszeni są o ustawienie Priorytet ręcznie rozwiązać konflikt."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Stwórz zamówienie zakupu
 ,Purchase Register,Rejestracja Zakupu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Obowiązujące opłaty
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) musi mieć rolę 'Leave Approver'
 DocType: Purchase Receipt,Vehicle Date,Pojazd Data
 DocType: Student Log,Medical,Medyczny
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Powód straty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Powód straty
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Ołów Właściciel nie może być taka sama jak Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Przyznana kwota nie może większa niż ilość niewyrównanej
 DocType: Announcement,Receiver,Odbiorca
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Ilość i Wskaźnik
 DocType: Delivery Note,% Installed,% Zainstalowanych
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Sale / laboratoria etc gdzie zajęcia mogą być planowane.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Proszę najpierw wpisać nazwę Firmy
 DocType: Purchase Invoice,Supplier Name,Nazwa dostawcy
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Przeczytać instrukcję ERPNext
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Pole obowiązkowe - rok akademicki
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Pole obowiązkowe - rok akademicki
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Proszę ustawić domyślne konto płatne dla firmy {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne ustawienia dla wszystkich procesów produkcyjnych.
 DocType: Accounts Settings,Accounts Frozen Upto,Konta zamrożone do
 DocType: SMS Log,Sent On,Wysłano w
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Atrybut {0} wybrane atrybuty kilka razy w tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Rekord pracownika tworzony jest przy użyciu zaznaczonego pola.
 DocType: Sales Order,Not Applicable,Nie dotyczy
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,
 DocType: Request for Quotation Item,Required Date,Data wymagana
 DocType: Delivery Note,Billing Address,Adres Faktury
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Proszę wpisać Kod Produktu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Proszę wpisać Kod Produktu
 DocType: BOM,Costing,Zestawienie kosztów
 DocType: Tax Rule,Billing County,Hrabstwo Billings
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Jeśli zaznaczone, kwota podatku zostanie wliczona w cenie Drukuj Cenę / Drukuj Podsumowanie"
@@ -508,6 +512,7 @@
 DocType: Packing Slip,From Package No.,Nr Przesyłki
 DocType: Item Attribute,To Range,Do osiągnięcia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Papiery wartościowe i depozyty
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nie można zmienić metody wyceny, ponieważ istnieją transakcje dotyczące niektórych pozycji, które nie mają własnej metody wyceny"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Wszystkich liście przeznaczone jest obowiązkowe
 DocType: Job Opening,Description of a Job Opening,Opis Ogłoszenia o Pracę
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Działania oczekujące na dziś
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Proszę wybrać Kurs
 DocType: Timesheet Detail,Hrs,godziny
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Proszę wybrać firmę
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Proszę wybrać firmę
 DocType: Stock Entry Detail,Difference Account,Konto Różnic
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nie można zamknąć zadanie, jak jego zależne zadaniem {0} nie jest zamknięta."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,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 +538,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Aby scalić, poniższe właściwości muszą być takie same dla obu przedmiotów"
 DocType: Shipping Rule,Net Weight,Waga netto
 DocType: Employee,Emergency Phone,Telefon bezpieczeństwa
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Kupować
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Proszę określić stopień dla progu 0%
 DocType: Sales Order,To Deliver,Dostarczyć
 DocType: Purchase Invoice Item,Item,Asortyment
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Nr seryjny element nie może być ułamkiem
 DocType: Journal Entry,Difference (Dr - Cr),Różnica (Dr - Cr)
 DocType: Account,Profit and Loss,Zyski i Straty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Zarządzanie Podwykonawstwo
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Przyrost nie może być 0
 DocType: Production Planning Tool,Material Requirement,Wymagania odnośnie materiału
 DocType: Company,Delete Company Transactions,Usuń Transakcje Spółki
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Numer referencyjny i data jest obowiązkowe dla transakcji Banku
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,
 DocType: Purchase Invoice,Supplier Invoice No,Nr faktury dostawcy
 DocType: Territory,For reference,Dla referencji
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,
 DocType: Production Plan Item,Pending Qty,Oczekuje szt
 DocType: Budget,Ignore,Ignoruj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} jest nieaktywny
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} jest nieaktywny
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS wysłany do następujących numerów: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Wymiary Sprawdź konfigurację do druku
 DocType: Salary Slip,Salary Slip Timesheet,Slip Wynagrodzenie grafiku
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,Całkowita kwota prowizji
 DocType: Pricing Rule,Sales Partner,Partner Sprzedaży
 DocType: Buying Settings,Purchase Receipt Required,Wymagane Potwierdzenie Zakupu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Wycena Cena jest obowiązkowe, jeżeli wprowadzone Otwarcie Zdjęcie"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nie znaleziono w tabeli faktury rekordy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Najpierw wybierz typ firmy, a Party"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Rok finansowy / księgowy.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,skumulowane wartości
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Niestety, numery seryjne nie mogą zostać połączone"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Stwórz Zamówienie Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Stwórz Zamówienie Sprzedaży
 DocType: Project Task,Project Task,Zadanie projektu
 ,Lead Id,ID Tropu
 DocType: C-Form Invoice Detail,Grand Total,Suma Całkowita
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,W skrócie Załącznik
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Powtarzający się klient
 DocType: Leave Control Panel,Allocate,Przydziel
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Zwrot sprzedaży
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Zwrot sprzedaży
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Uwaga: Wszystkie przydzielone liście {0} nie powinna być mniejsza niż już zatwierdzonych liści {1} dla okresu
 DocType: Announcement,Posted By,Wysłane przez
 DocType: Item,Delivered by Supplier (Drop Ship),Dostarczane przez Dostawcę (Drop Ship)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,Wycena dla
 DocType: Lead,Middle Income,Średni Dochód
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otwarcie (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Przydzielona kwota nie może być ujemna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Proszę ustawić firmę
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Proszę ustawić firmę
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Faktura sprzedaży grafiku
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nr Odniesienia & Data Odniesienia jest wymagana do {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Wybierz Konto Płatność aby bankowego Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Tworzenie rekordów pracownika do zarządzania liście, roszczenia o wydatkach i płac"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Pisanie Wniosku
 DocType: Payment Entry Deduction,Payment Entry Deduction,Płatność Wejście Odliczenie
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nie w roku podatkowym {2}
 DocType: Buying Settings,Settings for Buying Module,Ustawienia Zakup modułu
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Zaleta {0} nie należą do firmy {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Proszę wpierw wprowadzić dokument zakupu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Proszę wpierw wprowadzić dokument zakupu
 DocType: Buying Settings,Supplier Naming By,Po nazwie dostawcy
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Zmiana netto stanu zapasów
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Zarząd Kredyt pracownik
 DocType: Employee,Passport Number,Numer Paszportu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relacja z Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menager
 DocType: Payment Entry,Payment From / To,Płatność Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Zakres dat
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nowy limit kredytowy wynosi poniżej aktualnej kwoty należności dla klienta. Limit kredytowy musi być conajmniej {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,Ta 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"
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,W ciągu kilku minut
 DocType: Issue,Resolution Date,Data Rozstrzygnięcia
 DocType: Student Batch Name,Batch Name,Batch Nazwa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Grafiku stworzył:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Grafiku stworzył:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Proszę ustawić domyślne konto Gotówka lub Bank dla płatności typu {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Zapisać
 DocType: Selling Settings,Customer Naming By,
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Pokaże studenta jako obecny w Student Monthly Uczestnictwo Raporcie
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,Rzeczywisty Czas Rozpoczęcia
 DocType: BOM Operation,Operation Time,Czas operacji
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,koniec
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Baza
 DocType: Timesheet,Total Billed Hours,Wszystkich Zafakturowane Godziny
 DocType: Journal Entry,Write Off Amount,Wartość Odpisu
 DocType: Journal Entry,Bill No,Numer Rachunku
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,Obecność Studenta
 DocType: Sales Invoice Timesheet,Time Sheet,Czas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Płukanie surowce na podstawie
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Proszę wpisać Szczegóły Przedmiotu
 DocType: Interest,Interest,Zainteresowanie
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Przedsprzedaż
 DocType: Purchase Receipt,Other Details,Pozostałe szczegóły
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Zapis takiej Płatności już został utworzony
 DocType: Purchase Receipt Item Supplied,Current Stock,Bieżący asortyment
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Wiersz # {0}: {1} aktywami nie związane w pozycji {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Podgląd Zarobki Slip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Podgląd Zarobki Slip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} została wprowadzona wielokrotnie
 DocType: Account,Expenses Included In Valuation,Zaksięgowane wydatki w wycenie
 DocType: Hub Settings,Seller City,Sprzedawca Miasto
 ,Absent Student Report,Nieobecny Raport Student
 DocType: Email Digest,Next email will be sent on:,Kolejny e-mali zostanie wysłany w dniu:
 DocType: Offer Letter Term,Offer Letter Term,Oferta List Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Pozycja ma warianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Pozycja ma warianty.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Element {0} nie został znaleziony
 DocType: Bin,Stock Value,Wartość zapasów
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nie istnieje
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Typ drzewa
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Typ drzewa
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Ilość skonsumowana na Jednostkę
 DocType: Serial No,Warranty Expiry Date,Data upływu gwarancji
 DocType: Material Request Item,Quantity and Warehouse,Ilość i magazyn
 DocType: Sales Invoice,Commission Rate (%),Wartość prowizji (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Proszę wybrać Program
 DocType: Project,Estimated Cost,Szacowany koszt
@@ -769,7 +771,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Otrzymaną kwotą (Spółka waluty)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Wybierz tygodniowe dni wolne
 DocType: Production Order Operation,Planned End Time,Planowany czas zakończenia
 ,Sales Person Target Variance Item Group-Wise,
@@ -785,6 +787,7 @@
 DocType: Opportunity,Opportunity From,Szansa od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Miesięczny wyciąg do wynagrodzeń.
 DocType: BOM,Website Specifications,Specyfikacja strony WWW
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: od {0} typu {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Wiersz {0}: Współczynnik konwersji jest obowiązkowe
@@ -838,6 +841,7 @@
 DocType: Employee,Bank A/C No.,Numer rachunku bankowego
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Odczyt 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,częściowo Zamówione
 DocType: Expense Claim Detail,Expense Claim Type,Typ Zwrotu Kosztów
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Domyślne ustawienia koszyku
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Zaleta złomowany poprzez Journal Entry {0}
@@ -845,14 +849,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Technologia Bio
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Wydatki na obsługę biura
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Konfigurowanie konta e-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Proszę najpierw wprowadzić Przedmiot
 DocType: Account,Liability,Zobowiązania
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Usankcjonowane Kwota nie może być większa niż ilość roszczenia w wierszu {0}.
 DocType: Company,Default Cost of Goods Sold Account,Domyślne Konto Wartości Dóbr Sprzedanych
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cennik nie wybrany
 DocType: Employee,Family Background,Tło rodzinne
 DocType: Request for Quotation Supplier,Send Email,Wyślij E-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warning: Invalid Załącznik {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Brak uprawnień
 DocType: Company,Default Bank Account,Domyślne konto bankowe
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Aby filtrować na podstawie partii, wybierz Party Wpisz pierwsze"
@@ -865,8 +869,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nie znaleziono pracowników
 DocType: Supplier Quotation,Stopped,Zatrzymany
 DocType: Item,If subcontracted to a vendor,Jeśli zlecona dostawcy
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupa studentów jest już aktualizowana.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupa studentów jest już aktualizowana.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupa studentów jest już aktualizowana.
 DocType: SMS Center,All Customer Contact,Wszystkie dane kontaktowe klienta
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Wyślij bilans asortymentu używając csv.
 DocType: Warehouse,Tree Details,drzewo Szczegóły
@@ -877,8 +881,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna kwota faktury
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: MPK {2} nie należy do Spółki {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1} {2} Konto nie może być grupą
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej &#39;{doctype}&#39; Stół
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Przedmiot Row {idx} {} {doctype DOCNAME} nie istnieje w wyżej &#39;{doctype}&#39; Stół
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Grafiku {0} jest już zakończone lub anulowane
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Brak zadań
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dzień miesiąca, w którym auto faktury będą generowane na przykład 05, 28 itd"
 DocType: Asset,Opening Accumulated Depreciation,Otwarcie Skumulowana amortyzacja
@@ -894,7 +898,7 @@
 DocType: Bin,Moving Average Rate,Cena Średnia Ruchoma
 DocType: Production Planning Tool,Select Items,Wybierz Elementy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} przed rachunkiem {1} z dnia {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Plan zajęć
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Plan zajęć
 DocType: Maintenance Visit,Completion Status,Status ukończenia
 DocType: HR Settings,Enter retirement age in years,Podaj wiek emerytalny w latach
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Magazyn docelowy
@@ -902,7 +906,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Pozostawić na dostawę lub odbiór zapisu do tego procent
 DocType: Stock Entry,STE-,STEMI
 DocType: Upload Attendance,Import Attendance,Importuj Frekwencję
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Wszystkie grupy produktów
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Wszystkie grupy produktów
 DocType: Process Payroll,Activity Log,Dziennik aktywności
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Zysk / strata netto
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatyczna wiadomość o założeniu transakcji
@@ -913,7 +917,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Zamówienie zakupu do płatności
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Prognozowana ilość
 DocType: Sales Invoice,Payment Due Date,Termin Płatności
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Pozycja Wersja {0} istnieje już z samymi atrybutami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Otwarcie&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Otwarty na uwagi
 DocType: Notification Control,Delivery Note Message,Wiadomość z Dowodu Dostawy
@@ -929,7 +933,7 @@
 DocType: Item Reorder,Re-Order Qty,Ilość w ponowieniu zamówienia
 DocType: Leave Block List Date,Leave Block List Date,Opuść Zablokowaną Listę Dat
 DocType: Pricing Rule,Price or Discount,Cena albo Zniżka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Wszystkich obowiązujących opłat w ZAKUPU Elementy tabeli muszą być takie same jak Wszystkich podatkach i opłatach
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Wszystkich obowiązujących opłat w ZAKUPU Elementy tabeli muszą być takie same jak Wszystkich podatkach i opłatach
 DocType: Sales Team,Incentives,
 DocType: SMS Log,Requested Numbers,Wymagane numery
 DocType: Production Planning Tool,Only Obtain Raw Materials,Uzyskanie wyłącznie materiały
@@ -958,13 +962,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Czy zlecony
 DocType: Item Attribute,Item Attribute Values,Wartości atrybutu elementu
 DocType: Examination Result,Examination Result,badanie Wynik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Potwierdzenia Zakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Potwierdzenia Zakupu
 ,Received Items To Be Billed,Otrzymane przedmioty czekające na zaksięgowanie
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Zgłoszony Zarobki Poślizgnięcia
 DocType: Employee,Ms,Pani
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Główna wartość Wymiany walut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Doctype referencyjny musi być jednym z {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Doctype referencyjny musi być jednym z {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nie udało się znaleźć wolnego przedziału czasu w najbliższych {0} dniach do pracy {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiał plan podzespołów
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Partnerzy handlowi i terytorium
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Nie może automatycznie utworzyć konto, ponieważ nie jest już równowaga Zdjęcie na Rachunku. Musisz utworzyć konto dopasowanie zanim będzie można dokonać wpisu w tym hurtowni"
@@ -987,10 +991,9 @@
 DocType: Supplier,Default Payable Accounts,Domyślne konta Rozrachunki z dostawcami
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Pracownik {0} jest nieaktywny lub nie istnieje
 DocType: Fee Structure,Components,składniki
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Pozycja Warianty {0} zaktualizowane
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Proszę podać kategorię aktywów w pozycji {0}
 DocType: Quality Inspection Reading,Reading 6,Odczyt 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Nie można {0} {1} {2} bez negatywnego wybitne faktury
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Wyślij Fakturę Zaliczkową / Proformę
 DocType: Hub Settings,Sync Now,Synchronizuj teraz
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Wiersz {0}: wejście kredytowe nie mogą być powiązane z {1}
@@ -1004,11 +1007,11 @@
 DocType: Item,Is Purchase Item,Jest pozycją kupowalną
 DocType: Asset,Purchase Invoice,Faktura zakupu
 DocType: Stock Ledger Entry,Voucher Detail No,Nr Szczegółu Bonu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nowa faktura sprzedaży
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nowa faktura sprzedaży
 DocType: Stock Entry,Total Outgoing Value,Całkowita wartość wychodząca
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Otwarcie Data i termin powinien być w obrębie samego roku podatkowego
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Otwarcie Data i termin powinien być w obrębie samego roku podatkowego
 DocType: Lead,Request for Information,Prośba o informację
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synchronizacja Offline Faktury
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synchronizacja Offline Faktury
 DocType: Payment Request,Paid,Zapłacono
 DocType: Program Fee,Program Fee,Opłata Program
 DocType: Salary Slip,Total in words,Ogółem słownie
@@ -1018,7 +1021,7 @@
 DocType: Employee Loan,Sanctioned,usankcjonowane
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publikuje na stronie internetowej
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Dostawy do klientów.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Faktura dostawca Data nie może być większe niż Data publikacji
@@ -1029,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Zmienność
 ,Company Name,Nazwa firmy
 DocType: SMS Center,Total Message(s),Razem ilość wiadomości
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Wybierz produkt Transferu
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,
@@ -1040,8 +1043,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Domyślne konto bank / bankomat zostanie automatycznie zaktualizowana wynagrodzenia Journal Entry po wybraniu tego trybu.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Przedziały Grade Kodeksu {0} pokrywa się z okresami klasy dla innych klas. Proszę sprawdzać harmonogram {0} i {1} i spróbuj ponownie
 DocType: BOM,Raw Material Cost(Company Currency),Koszt surowca (Spółka waluty)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Dla tego zamówienia produkcji wszystkie pozycje zostały już przeniesione.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Wiersz {0}: stawka nie może być większa niż stawka stosowana w {1} {2}
@@ -1054,14 +1055,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Prześlij nagłówek firmowy i logo. (Można je edytować później).
 DocType: Timesheet Detail,Bill,Rachunek
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Następny Amortyzacja Data jest wpisana w minionym dniem
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Biały
 DocType: SMS Center,All Lead (Open),Wszystkie Leady (Otwarte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Wiersz {0}: Ilość nie jest dostępny dla {4} w magazynie {1} w delegowania chwili wejścia ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Uzyskaj opłacone zaliczki
 DocType: Item,Automatically Create New Batch,Automatyczne tworzenie nowych partii
 DocType: Item,Automatically Create New Batch,Automatyczne tworzenie nowych partii
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Stwórz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Stwórz
 DocType: Student Admission,Admission Start Date,Wstęp Data rozpoczęcia
 DocType: Journal Entry,Total Amount in Words,Wartość całkowita słownie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Wystąpił błąd. Przypuszczalnie zostało to spowodowane niezapisaniem formularza. Proszę skontaktować się z support@erpnext.com jeżeli problem będzie nadal występował.
@@ -1069,7 +1070,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Rodzaj zlecenia musi być jednym z {0}
 DocType: Lead,Next Contact Date,Data Następnego Kontaktu
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Ilość Otwarcia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Proszę wpisać uwagę do zmiany kwoty
 DocType: Student Batch Name,Student Batch Name,Student Batch Nazwa
 DocType: Holiday List,Holiday List Name,Lista imion na wakacje
 DocType: Repayment Schedule,Balance Loan Amount,Kwota salda kredytu
@@ -1089,10 +1090,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Proszę podać {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Usunięte pozycje bez zmian w ilości lub wartości.
 DocType: Delivery Note,Delivery To,Dostawa do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Stół atrybut jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Stół atrybut jest obowiązkowy
 DocType: Production Planning Tool,Get Sales Orders,Pobierz zamówienia sprzedaży
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nie może być ujemna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Zniżka (rabat)
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Zniżka (rabat)
 DocType: Asset,Total Number of Depreciations,Całkowita liczba amortyzacją
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
 DocType: Sales Invoice Item,Rate With Margin,Rate With Margin
@@ -1108,7 +1109,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Kwota sprzedaży
 DocType: Repayment Schedule,Interest Amount,Kwota procentowa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Zatwierdzasz wydatek dla tego rekordu. Proszę zaktualizować ""status"" i Zachowaj"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Zatwierdzasz wydatek dla tego rekordu. Proszę zaktualizować ""status"" i Zachowaj"
 DocType: Serial No,Creation Document No,
 DocType: Issue,Issue,Zdarzenie
 DocType: Asset,Scrapped,złomowany
@@ -1116,12 +1117,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atrybuty Element wariantów. np rozmiar, kolor itd."
 DocType: Purchase Invoice,Returns,zwroty
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Magazyn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Nr seryjny {0} w ramach umowy serwisowej do {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrutacja
 DocType: Lead,Organization Name,Nazwa organizacji
 DocType: Tax Rule,Shipping State,Stan zakupu
 ,Projected Quantity as Source,Prognozowana ilość jako źródło
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Rzecz musi być dodane za ""elementy z zakupu wpływy"" przycisk"
 DocType: Employee,A-,ZA-
 DocType: Production Planning Tool,Include non-stock items,Zawierać elementy non-stock
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Koszty Sprzedaży
@@ -1129,12 +1130,12 @@
 DocType: GL Entry,Against,Wyklucza
 DocType: Item,Default Selling Cost Center,Domyśle Centrum Kosztów Sprzedaży
 DocType: Sales Partner,Implementation Partner,Partner Wdrożeniowy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kod pocztowy
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Kod pocztowy
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Zamówienie sprzedaży jest {0} {1}
 DocType: Opportunity,Contact Info,Dane kontaktowe
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Dokonywanie stockowe Wpisy
 DocType: Packing Slip,Net Weight UOM,Jednostka miary wagi netto
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} wyników
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} wyników
 DocType: Item,Default Supplier,Domyślny dostawca
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad zasiłkach Procent Produkcji
 DocType: Employee Loan,Repayment Schedule,Harmonogram spłaty
@@ -1142,7 +1143,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Pobierz Tygodniowe zestawienie dat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Data zakończenia nie może być wcześniejsza, niż data rozpoczęcia"
 DocType: Sales Person,Select company name first.,Wybierz najpierw nazwę firmy
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Wyceny otrzymane od dostawców
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Do {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Średni wiek
@@ -1161,7 +1162,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Kluczowy obszar wyników
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Nieprawidłowy Atrybut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} musi zostać dodane
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} musi zostać dodane
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Ilość musi być mniejsze niż lub równe {0}
 DocType: SMS Center,Total Characters,Wszystkich Postacie
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Proszę wybrać LM w dziedzinie BOM dla pozycji {0}
@@ -1172,7 +1173,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 +224,Production Order {0} must be cancelled before cancelling this Sales Order,Zamówienie Produkcji {0} musi być odwołane przed odwołaniem Zamówienia Sprzedaży
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Proszę ustawić &quot;Zastosuj dodatkowe zniżki na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Od Zakres musi być mniejsza niż do zakresu
 DocType: Global Defaults,Global Defaults,Globalne wartości domyślne
@@ -1182,7 +1183,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Rok rozpoczęcia
 DocType: Purchase Invoice,Start date of current invoice's period,Początek okresu rozliczeniowego dla faktury
 DocType: Salary Slip,Leave Without Pay,Urlop bezpłatny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Planowanie zdolności błąd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1197,7 +1198,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To będzie dołączany do Kodeksu poz wariantu. Na przykład, jeśli skrót to ""SM"", a kod element jest ""T-SHIRT"" Kod poz wariantu będzie ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Wynagrodzenie netto (słownie) będzie widoczna po zapisaniu na Liście Płac.
 DocType: Purchase Invoice,Is Return,Czy Wróć
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Powrót / noty obciążeniowej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Powrót / noty obciążeniowej
 DocType: Price List Country,Price List Country,Cena Kraj
 DocType: Item,UOMs,Jednostki miary
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} prawidłowe numery seryjne dla Pozycji {1}
@@ -1207,11 +1208,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Proszę wpisać kod produkt, aby uzyskać numer partii"
 DocType: Stock Settings,Default Item Group,Domyślna Grupa Przedmiotów
 DocType: Employee Loan,Partially Disbursed,częściowo wypłacona
-DocType: Grading Structure,Grading System Name,Nazwa standaryzacji systemu
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza dostawców
 DocType: Account,Balance Sheet,Arkusz Bilansu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centrum kosztów dla Przedmiotu z Kodem Przedmiotu '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Tryb płatność nie jest skonfigurowana. Proszę sprawdzić, czy konto zostało ustawione na tryb płatności lub na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Sprzedawca otrzyma w tym dniu przypomnienie, aby skontaktować się z klientem"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Sama pozycja nie może być wprowadzone wiele razy.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Dalsze relacje mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
@@ -1223,7 +1223,7 @@
 ,Purchase Order Items To Be Billed,Przedmioty oczekujące na rachunkowość Zamówienia Kupna
 DocType: Purchase Invoice Item,Net Rate,Cena netto
 DocType: Purchase Invoice Item,Purchase Invoice Item,Przedmiot Faktury Zakupu
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zapisy księgi zapasów oraz księgi głównej są odświeżone dla wybranego dokumentu zakupu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zapisy księgi zapasów oraz księgi głównej są odświeżone dla wybranego dokumentu zakupu
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pozycja 1
 DocType: Holiday,Holiday,Święto
 DocType: Support Settings,Close Issue After Days,Po blisko Issue Dni
@@ -1250,11 +1250,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Praca wykonana
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Proszę zaznaczyć co najmniej jeden atrybut w tabeli atrybutów
 DocType: Announcement,All Students,Wszyscy uczniowie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Element {0} musi być elementem non-stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Podgląd księgi
 DocType: Grading Scale,Intervals,przedziały
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najwcześniejszy
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",Istnieje element Grupy o takiej nazwie. Zmień nazwę elementu lub tamtej Grupy.
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nie Student Komórka
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1294,9 +1294,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Wypłata wynagrodzenia z {0} {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Zlecenie Sprzedaży {0} jest niepoprawne
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Zamówienia pomoże Ci zaplanować i śledzić na zakupy
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",Przepraszamy ale firmy nie mogą zostać połaczone
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Całkowita ilość Issue / Przelew {0} w dziale Zamówienie {1} \ nie może być większa od ilości wnioskowanej dla {2} {3} Przedmiot
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Mały
@@ -1317,10 +1317,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Wydatki pośrednie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Wiersz {0}: Ilość jest obowiązkowe
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Rolnictwo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Strona Obraz powinien być plik publiczny lub adres witryny
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,To jest grupa przedmiotów root i nie mogą być edytowane.
@@ -1338,18 +1338,18 @@
 DocType: Student Group Student,Group Roll Number,Numer grupy
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Dla {0}, tylko Kredytowane konta mogą być połączone z innym zapisem po stronie debetowej"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Suma wszystkich wagach zadanie powinno być 1. Proszę ustawić wagi wszystkich zadań projektowych odpowiednio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Dowód dostawy {0} nie został wysłany
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Wycena Zasada jest najpierw wybiera się na podstawie ""Zastosuj Na"" polu, które może być pozycja, poz Grupa lub Marka."
 DocType: Hub Settings,Seller Website,Sprzedawca WWW
 DocType: Item,ITEM-,POZYCJA-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Łącznie przydzielony procent sprzedaży dla zespołu powinien wynosić 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Zlecenie produkcji ma status: {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Zlecenie produkcji ma status: {0}
 DocType: Appraisal Goal,Goal,Cel
 DocType: Sales Invoice Item,Edit Description,Edytuj opis
 ,Team Updates,Aktualizacje zespół
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Dla dostawcy
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Dla dostawcy
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Ustawienie Typu Konta pomaga w wyborze tego konta w transakcji.
 DocType: Purchase Invoice,Grand Total (Company Currency),Całkowita suma (w walucie firmy)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Tworzenie format wydruku
@@ -1365,7 +1365,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zapis księgowy
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} pozycji w przygotowaniu
 DocType: Workstation,Workstation Name,Nazwa stacji roboczej
-DocType: Grade Interval,Grade Code,Kod klasy
+DocType: Grading Scale Interval,Grade Code,Kod klasy
 DocType: POS Item Group,POS Item Group,POS Pozycja Grupy
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,przetwarzanie maila
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nie należy do pozycji {1}
@@ -1382,7 +1382,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Sprzęt komputerowy
 DocType: Sales Order,Recurring Upto,Cyklicznie upto
 DocType: Attendance,HR Manager,
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Wybierz firmę
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Wybierz firmę
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,
 DocType: Purchase Invoice,Supplier Invoice Date,Data faktury dostawcy
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musisz włączyć Koszyk
@@ -1398,7 +1398,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Żywność
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Starzenie Zakres 3
 DocType: Maintenance Schedule Item,No of Visits,Numer wizyt
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Harmonogram konserwacji {0} istnieje przeciwko {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Zapis uczeń
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Waluta Rachunku Zamknięcie musi być {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma punktów dla wszystkich celów powinno być 100. {0}
@@ -1423,7 +1424,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Średnia dzienna Wychodzące
 DocType: POS Profile,Campaign,Kampania
 DocType: Supplier,Name and Type,Nazwa i typ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Status Zatwierdzenia musi być 'Zatwierdzono' albo 'Odrzucono'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Status Zatwierdzenia musi być 'Zatwierdzono' albo 'Odrzucono'
 DocType: Purchase Invoice,Contact Person,Osoba kontaktowa
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Przewidywana data rozpoczęcia' nie może nastąpić później niż 'Przewidywana data zakończenia'
 DocType: Course Scheduling Tool,Course End Date,Data zakończenia kursu
@@ -1446,14 +1447,15 @@
 DocType: Sales Invoice,Shipping Address Name,Adres do wysyłki Nazwa
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plan Kont
 DocType: Material Request,Terms and Conditions Content,Zawartość regulaminu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,nie może być większa niż 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Element {0} nie jest w magazynie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nie może być większa niż 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Element {0} nie jest w magazynie
 DocType: Maintenance Visit,Unscheduled,Nieplanowany
 DocType: Employee,Owned,Zawłaszczony
 DocType: Salary Detail,Depends on Leave Without Pay,Zależy od urlopu bezpłatnego
 DocType: Pricing Rule,"Higher the number, higher the priority","Im wyższa liczba, wyższy priorytet"
 ,Purchase Invoice Trends,Trendy Faktur Zakupów
 DocType: Employee,Better Prospects,Lepsze Alternatywy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Wiersz # {0}: partia {1} ma tylko {2} qty. Wybierz inną partię, która ma {3} qty dostępną lub podzielisz wiersz na wiele wierszy, aby dostarczyć / wydać z wielu partii"
 DocType: Vehicle,License Plate,Tablica rejestracyjna
 DocType: Appraisal,Goals,Cele
 DocType: Warranty Claim,Warranty / AMC Status,Gwarancja / AMC Status
@@ -1472,7 +1474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Pracownik nie może odpowiadać do samego siebie.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Jeśli konto jest zamrożone, zapisy mogą wykonywać tylko wyznaczone osoby."
 DocType: Email Digest,Bank Balance,Saldo bankowe
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Wprowadzenia danych księgowych dla {0}: {1} może być dokonywane wyłącznie w walucie: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil stanowiska pracy, wymagane kwalifikacje itp."
 DocType: Journal Entry Account,Account Balance,Bilans konta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Reguła podatkowa dla transakcji.
@@ -1483,7 +1485,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Pokaż niezamkniętych rok obrotowy za P &amp; L sald
 DocType: Shipping Rule,Shipping Account,Konto dostawy
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1} {2} konto jest nieaktywne
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Dokonać zamówienia sprzedaży, które pomogą Ci zaplanować swoją pracę i dostarczyć na czas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Dokonać zamówienia sprzedaży, które pomogą Ci zaplanować swoją pracę i dostarczyć na czas"
 DocType: Quality Inspection,Readings,Odczyty
 DocType: Stock Entry,Total Additional Costs,Wszystkich Dodatkowe koszty
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1496,7 @@
 DocType: Shipping Rule Condition,To Value,Określ wartość
 DocType: Asset Movement,Stock Manager,Kierownik magazynu
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},Magazyn źródłowy jest obowiązkowy dla wiersza {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,List przewozowy
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,List przewozowy
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Wydatki na wynajem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Konfiguracja ustawień bramki SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import nie powiódł się!
@@ -1516,11 +1518,11 @@
 DocType: Company,Services,Usługi
 DocType: HR Settings,Email Salary Slip to Employee,Email Wynagrodzenie Slip pracownikowi
 DocType: Cost Center,Parent Cost Center,Nadrzędny dział kalkulacji kosztów
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Wybierz Możliwa Dostawca
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Wybierz Możliwa Dostawca
 DocType: Sales Invoice,Source,Źródło
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Pokaż closed
 DocType: Leave Type,Is Leave Without Pay,Czy urlopu bezpłatnego
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Kategoria atutem jest obowiązkowe dla Fixed pozycja aktywów
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nie znaleziono rekordów w tabeli płatności
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ten {0} konflikty z {1} do {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenci HTML
@@ -1538,7 +1540,7 @@
 DocType: Student,Date of Leaving,Data Pozostawiając
 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/utilities/activation.py +64,Create Leads,Tworzenie Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Tworzenie Leads
 DocType: Maintenance Schedule,Schedules,Harmonogramy
 DocType: Purchase Invoice Item,Net Amount,Kwota netto
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Numer
@@ -1566,9 +1568,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Zgłoszenia
 DocType: Sales Invoice Item,Brand Name,Nazwa marki
 DocType: Purchase Receipt,Transporter Details,Szczegóły transportu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Domyślny magazyn jest wymagana dla wybranego elementu
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Pudło
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Dostawca możliwe
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Dostawca możliwe
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacja
 DocType: Budget,Monthly Distribution,Miesięczny Dystrybucja
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Lista odbiorców jest pusta. Proszę stworzyć Listę Odbiorców
@@ -1576,8 +1578,8 @@
 DocType: Sales Partner,Sales Partner Target,Cel Partnera Sprzedaży
 DocType: Loan Type,Maximum Loan Amount,Maksymalna kwota kredytu
 DocType: Pricing Rule,Pricing Rule,Reguła cenowa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplikat numeru rolki dla ucznia {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Akcja, jeśli roczny budżet Przekroczono"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Twoje zamówienie jest w realizacji
 DocType: Shopping Cart Settings,Payment Success URL,Płatność Sukces URL
@@ -1598,9 +1600,9 @@
 DocType: Employee Loan,Repayment Method,Sposób spłaty
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Jeśli zaznaczone, strona główna będzie Grupa domyślna pozycja na stronie"
 DocType: Quality Inspection Reading,Reading 4,Odczyt 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Domyślny BOM dla {0} Nie znaleziono Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Domyślny BOM dla {0} Nie znaleziono Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Zwrot wydatków
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenci są w samym sercu systemu, dodanie wszystkich swoich uczniów"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenci są w samym sercu systemu, dodanie wszystkich swoich uczniów"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Wiersz # {0}: Data Rozliczenie {1} nie może być wcześniejsza niż data Czek {2}
 DocType: Company,Default Holiday List,Domyślnie lista urlopowa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Wiersz {0}: od czasu do czasu i od {1} pokrywa się z {2}
@@ -1612,21 +1614,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dzień (s), w którym starasz się o urlop jest święta. Nie musisz ubiegać się o urlop."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Wyślij ponownie płatności E-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nowe zadanie
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Dodać Oferta
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Dodać Oferta
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Inne raporty
 DocType: Dependent Task,Dependent Task,Zadanie zależne
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Współczynnikiem konwersji dla domyślnej Jednostki Pomiaru musi być 1 w rzędzie {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Urlop typu {0} nie może być dłuższy niż {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Spróbuj planowania operacji dla X dni wcześniej.
 DocType: HR Settings,Stop Birthday Reminders,Zatrzymaj przypomnienia o urodzinach
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Proszę ustawić domyślny Payroll konto płatne w Spółce {0}
 DocType: SMS Center,Receiver List,Lista odbiorców
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Szukaj przedmiotu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Szukaj przedmiotu
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Skonsumowana wartość
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Zmiana netto stanu środków pieniężnych
 DocType: Assessment Plan,Grading Scale,Skala ocen
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Zakończone
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Jednostka miary {0} została wprowadzona więcej niż raz w Tabelce Współczynnika Konwersji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Zakończone
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Płatność Zapytanie już istnieje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Koszt Emitowanych Przedmiotów
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Ilość nie może być większa niż {0}
@@ -1658,12 +1660,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Dokonaj wydatkowania Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Wiersz {0}: Advance przed Dostawcę należy obciążyć
 DocType: Company,Default Values,Domyślne Wartości
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Całkowitej kwoty zwrotów
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Opiera się to na dzienniki przeciwko tego pojazdu. Zobacz harmonogram poniżej w szczegółach
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zebrać
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Przeciwko Dostawcę faktury {0} {1} dnia
 DocType: Customer,Default Price List,Domyślna List Cen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Rekord Ruch atutem {0} tworzone
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nie można usunąć Fiscal Year {0}. Rok fiskalny {0} jest ustawiona jako domyślna w Ustawienia globalne
 DocType: Journal Entry,Entry Type,Rodzaj wpisu
 ,Customer Credit Balance,Saldo kredytowe klienta
@@ -1681,7 +1684,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Żaden z elementów ma żadnych zmian w ilości lub wartości.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Pole obowiązkowe - program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Pole obowiązkowe - program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Roszczenie gwarancyjne
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Roszczenie gwarancyjne
 ,Lead Details,Dane Tropu
 DocType: Salary Slip,Loan repayment,Spłata pożyczki
 DocType: Purchase Invoice,End date of current invoice's period,Data zakończenia okresu bieżącej faktury
@@ -1700,12 +1703,10 @@
 DocType: Employee,Permanent Address,Stały adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Wybierz kod produktu
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Wybierz kod produktu
 DocType: Student Sibling,Studying in Same Institute,Studia w sam instytut
 DocType: Territory,Territory Manager,Kierownik Regionalny
 DocType: Packed Item,To Warehouse (Optional),Aby Warehouse (opcjonalnie)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
 DocType: Payment Entry,Paid Amount (Company Currency),Zapłacona kwota (waluta firmy)
 DocType: Purchase Invoice,Additional Discount,Dodatkowe zniżki
 DocType: Selling Settings,Selling Settings,Ustawienia Sprzedaży
@@ -1715,9 +1716,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobacz Koszyk
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Wydatki marketingowe
 ,Item Shortage Report,Element Zgłoś Niedobór
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Waga jest określona, \n Ustaw także ""Wagę jednostkową"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Następny Amortyzacja Data jest obowiązkowe dla nowych aktywów
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Następny Amortyzacja Data jest obowiązkowe dla nowych aktywów
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Oddzielna grupa kursów dla każdej partii
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Oddzielna grupa kursów dla każdej partii
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Jednostka produktu.
@@ -1734,9 +1735,7 @@
 DocType: Course Assessment Criteria,Weightage,Waga/wiek
 DocType: Packing Slip,PS-,PS
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: MPK jest wymagane dla &quot;zysków i strat&quot; konta {2}. Proszę ustawić domyślny centrum kosztów dla firmy.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nowy kontakt
 DocType: Territory,Parent Territory,Nadrzędne terytorium
 DocType: Quality Inspection Reading,Reading 2,Odczyt 2
@@ -1753,7 +1752,7 @@
 ,Item-wise Sales Register,
 DocType: Asset,Gross Purchase Amount,Zakup Kwota brutto
 DocType: Asset,Depreciation Method,Metoda amortyzacji
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Czy podatek wliczony jest w opłaty?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Łączna docelowa
 DocType: Program Course,Required,wymagany
@@ -1763,21 +1762,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Wyrównywanie JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Zbyt wiele kolumn. Wyeksportować raport i wydrukować go za pomocą arkusza kalkulacyjnego.
 DocType: Purchase Invoice Item,Batch No,Nr Partii
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nie można znaleźć kurs wymiany {0} {1} dla terminu kluczowego {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Zezwalaj na wiele zleceń sprzedaży wobec Klienta Zamówienia
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 DocType: Student Group Instructor,Student Group Instructor,Instruktor grupy studentów
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Komórka Nie
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Główny
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Wariant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Główny
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Wariant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ustaw prefiks dla numeracji serii na swoich transakcji
 DocType: Employee Attendance Tool,Employees HTML,Pracownicy HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Domyślnie Wykaz Materiałów ({0}) musi być aktywny dla tej pozycji lub jej szablonu
 DocType: Employee,Leave Encashed?,"Jesteś pewien, że chcesz wyjść z Wykupinych?"
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Szansa Od pola jest obowiązkowe
 DocType: Email Digest,Annual Expenses,roczne koszty
 DocType: Item,Variants,Warianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Wprowadź Zamówienie
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Wprowadź Zamówienie
 DocType: SMS Center,Send To,Wyślij do
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},
 DocType: Payment Reconciliation Payment,Allocated amount,Przyznana kwota
@@ -1785,7 +1783,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kod Przedmiotu Klienta
 DocType: Stock Reconciliation,Stock Reconciliation,Uzgodnienia stanu
 DocType: Territory,Territory Name,Nazwa Regionu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Magazyn z produkcją w toku jest wymagany przed wysłaniem
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikant do Pracy.
 DocType: Purchase Order Item,Warehouse and Reference,Magazyn i punkt odniesienia
 DocType: Supplier,Statutory info and other general information about your Supplier,Informacje prawne na temat dostawcy
@@ -1793,11 +1791,10 @@
 DocType: Item,Serial Nos and Batches,Numery seryjne i partie
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Siła grupy studentów
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Siła grupy studentów
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Przeciwko Urzędowym Wejście {0} nie ma niezrównaną pozycję {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,wyceny
 apps/erpnext/erpnext/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,Warunki wysyłki
-DocType: Grading Structure,Grading Intervals,Odstępy skarpy
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Podaj
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nie można overbill do pozycji {0} w wierszu {1} więcej niż {2}. Aby umożliwić nad-billing, należy ustawić w Ustawienia zakupów"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Proszę ustawić filtr na podstawie pkt lub magazynie
@@ -1809,17 +1806,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} musi być złożony
 DocType: Authorization Control,Authorization Control,Kontrola Autoryzacji
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Wiersz # {0}: Odrzucone Magazyn jest obowiązkowe przed odrzucony poz {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Płatność
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Zarządzanie zamówień
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Płatność
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Zarządzanie zamówień
 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},Zamówienie produktu o maksymalnej ilości {0} może być zrealizowane dla przedmiotu {1} w zamówieniu {2}
 DocType: Employee,Salutation,Forma grzecznościowa
 DocType: Course,Course Abbreviation,Skrót golfowe
 DocType: Student Leave Application,Student Leave Application,Student Application Leave
 DocType: Item,Will also apply for variants,Również zastosowanie do wariantów
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Aktywów nie mogą być anulowane, ponieważ jest już {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Pracownik {0} na pół dnia na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Całkowita liczba godzin pracy nie powinna być większa niż max godzinach pracy {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,włączony
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pakiet przedmiotów w momencie sprzedaży
 DocType: Quotation Item,Actual Qty,Rzeczywista Ilość
 DocType: Sales Invoice Item,References,Referencje
@@ -1829,7 +1827,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Wprowadziłeś duplikat istniejących rzeczy. Sprawdź i spróbuj ponownie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Współpracownik
 DocType: Asset Movement,Asset Movement,Zaleta Ruch
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nowy Koszyk
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Nowy Koszyk
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,
 DocType: SMS Center,Create Receiver List,Stwórz listę odbiorców
 DocType: Vehicle,Wheels,Koła
@@ -1861,10 +1859,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Wyłącza tworzenie dzienników razem przeciwko zleceń produkcyjnych. Operacje nie będą śledzone przed produkcja na zamówienie
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ma Warianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Już wybrane pozycje z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nazwa dystrybucji miesięcznej
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Identyfikator zbiorczy jest obowiązkowy
 DocType: Sales Person,Parent Sales Person,Nadrzędny Przedstawiciel Handlowy
 DocType: Purchase Invoice,Recurring Invoice,Powtarzająca się faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Zarządzanie projektami
@@ -1872,11 +1870,11 @@
 DocType: Budget,Fiscal Year,Rok Podatkowy
 DocType: Vehicle Log,Fuel Price,Cena paliwa
 DocType: Budget,Budget,Budżet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Trwałego Rzecz musi być element non-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budżet nie może być przypisany przed {0}, ponieważ nie jest to konto przychodów lub kosztów"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Osiągnięte
 DocType: Student Admission,Application Form Route,Formularz zgłoszeniowy Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Regin / Klient
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Regin / Klient
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Zostaw Type {0} nie może być przyznane, ponieważ jest pozostawić bez wynagrodzenia"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Wiersz {0}: Przyznana kwota {1} musi być mniejsza lub równa pozostałej kwoty faktury {2}
@@ -1896,15 +1894,15 @@
 ,Serial No Status,Status nr seryjnego
 DocType: Payment Entry Reference,Outstanding,Wybitny
 ,Daily Timesheet Summary,Codzienne grafiku Podsumowanie
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: aby okresowość {1} w zależności od od i do tej pory \
  musi być większa niż lub równe {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Jest to oparte na ruchu zapasów. Zobacz {0} o szczegóły
 DocType: Pricing Rule,Selling,Sprzedaż
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Kwota {0} {1} odliczone przed {2}
 DocType: Employee,Salary Information,Informacja na temat wynagrodzenia
 DocType: Sales Person,Name and Employee ID,Imię i Identyfikator Pracownika
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Termin nie może być po Dacie Umieszczenia
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Podatki i cła
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,
@@ -1916,14 +1914,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Nie można wskazać numeru wiersza większego lub równego numerowi dla tego typu Opłaty
 DocType: Asset,Sold,Sprzedany
 ,Item-wise Purchase History,
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Proszę kliknąć na ""Generowanie Harmonogramu"", aby sprowadzić nr seryjny dodany do pozycji {0}"
 DocType: Account,Frozen,Zamrożony
 ,Open Production Orders,Otwórz zamówienia produkcji
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Kwota bazowa (Spółka waluty)
 DocType: Payment Reconciliation Payment,Reference Row,Odniesienie Row
 DocType: Installation Note,Installation Time,Czas instalacji
 DocType: Sales Invoice,Accounting Details,Dane księgowe
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,"Usuń wszystkie transakcje, dla tej firmy"
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Inwestycje
 DocType: Issue,Resolution Details,Szczegóły Rozstrzygnięcia
@@ -1956,14 +1954,14 @@
 DocType: Discussion,Discussion,Dyskusja
 DocType: Payment Entry,Transaction ID,Identyfikator transakcji
 DocType: Employee,Resignation Letter Date,Data wypowiedzenia
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Zasady ustalania cen są dalej filtrowane na podstawie ilości.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Proszę ustawić datę dołączenia do pracownika {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Całkowita kwota płatności (poprzez Czas Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Powtórz Przychody klienta
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) musi mieć rolę 'Zatwierdzający Koszty
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Para
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Wybierz BOM i ilosc Produkcji
 DocType: Asset,Depreciation Schedule,amortyzacja Harmonogram
 DocType: Bank Reconciliation Detail,Against Account,Konto korespondujące
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Pół Dzień Data powinna być pomiędzy Od Data i do tej pory
@@ -1977,16 +1975,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Proszę ustawić &quot;aktywa Amortyzacja Cost Center&quot; w towarzystwie {0}
 ,Maintenance Schedules,Plany Konserwacji
 DocType: Task,Actual End Date (via Time Sheet),Faktyczna data zakończenia (przez czas arkuszu)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Kwota {0} {1} przeciwko {2} {3}
 ,Quotation Trends,Trendy Wyceny
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Pozycja Grupa nie wymienione w pozycji do pozycji mistrza {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Debetowane Konto musi być kontem typu Należności
 DocType: Shipping Rule Condition,Shipping Amount,Ilość dostawy
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Kwota Oczekiwana
 DocType: Purchase Invoice Item,Conversion Factor,Współczynnik konwersji
 DocType: Purchase Order,Delivered,Dostarczono
 ,Vehicle Expenses,Wydatki Samochodowe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
+DocType: Serial No,Invoice Details,Dane do faktury
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Oczekiwana wartość po okresie użytkowania musi być większe niż lub równe {0}
 DocType: Purchase Receipt,Vehicle Number,Numer pojazdu
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,
 DocType: Employee Loan,Loan Amount,Kwota kredytu
@@ -2004,12 +2003,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,ewidencja czasu pracy
 DocType: HR Settings,HR Settings,Ustawienia HR
 DocType: Salary Slip,net pay info,Informacje o wynagrodzeniu netto
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Nowe wydatki
 DocType: Purchase Invoice,Additional Discount Amount,Kwota dodatkowego rabatu
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Wiersz # {0}: Ilość musi być jeden, a element jest trwałego. Proszę używać osobny wiersz dla stwardnienia st."
 DocType: Leave Block List Allow,Leave Block List Allow,Możesz opuścić Blok Zablokowanych List
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,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 +276,Abbr can not be blank or space,Skrót nie może być pusty lub być spacją
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupa do Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sporty
 DocType: Loan Type,Loan Name,pożyczka Nazwa
@@ -2020,6 +2019,7 @@
 ,Customer Acquisition and Loyalty,
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazyn w którym zarządzasz odrzuconymi przedmiotami
 DocType: Production Order,Skip Material Transfer,Pomiń Przesył materiału
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nie można znaleźć kursu wymiany dla {0} do {1} dla daty klucza {2}. Proszę utworzyć ręcznie rekord wymiany walut
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Zakończenie roku podatkowego
 DocType: POS Profile,Price List,Cennik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} jest teraz domyślnym rokiem finansowym. Odśwież swoją przeglądarkę aby zmiana weszła w życie
@@ -2036,19 +2036,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} jest nieprawidłowe. Walutą konta musi być {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Współczynnik konwersji jednostki miary jest wymagany w rzędzie {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym zlecenia sprzedaży, sprzedaży lub faktury Journal Entry"
 DocType: Salary Component,Deduction,Odliczenie
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Wiersz {0}: od czasu do czasu i jest obowiązkowe.
 DocType: Stock Reconciliation Item,Amount Difference,kwota różnicy
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Pozycja Cena dodany do {0} w Cenniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Proszę podać ID pracownika tej osoby ze sprzedaży
 DocType: Territory,Classification of Customers by region,Klasyfikacja Klientów od regionu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Różnica Kwota musi wynosić zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Różnica Kwota musi wynosić zero
 DocType: Project,Gross Margin,Marża brutto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Wprowadź jako pierwszą Produkowaną Rzecz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Obliczony bilans wyciągu bankowego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Wyłączony użytkownik
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Wycena
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Wycena
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Całkowita kwota odliczenia
 ,Production Analytics,Analizy produkcyjne
@@ -2057,9 +2057,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Element {0} został zwrócony
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Rok finansowy** reprezentuje rok finansowy. Wszystkie zapisy księgowe oraz inne znaczące transakcje są śledzone przed ** roku podatkowego **.
 DocType: Opportunity,Customer / Lead Address,Adres Klienta / Tropu
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Ostrzeżenie: Nieprawidłowy certyfikat SSL w załączniku {0}
 DocType: Student Admission,Eligibility,Wybieralność
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Przewody pomóc biznesu, dodać wszystkie kontakty i więcej jak swoich klientów"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Przewody pomóc biznesu, dodać wszystkie kontakty i więcej jak swoich klientów"
 DocType: Production Order Operation,Actual Operation Time,Rzeczywisty Czas pracy
 DocType: Authorization Rule,Applicable To (User),Stosowne dla (Użytkownik)
 DocType: Purchase Taxes and Charges,Deduct,Odlicz
@@ -2074,7 +2074,7 @@
 DocType: Guardian,Work Address,Adres miejsca pracy
 DocType: Appraisal,Calculate Total Score,Oblicz całkowity wynik
 DocType: Request for Quotation,Manufacturing Manager,Kierownik Produkcji
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nr seryjny {0} w ramach gwarancji do {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Przypisz dokumenty dostawy do paczek.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Przesyłki
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Saldo konta ({0}) dla {1} i wartości zapasów ({2}) dla magazynu {3} muszą być takie same
@@ -2097,10 +2097,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Uwaga: E-mail nie zostanie wysłany do nieaktywnych użytkowników
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Liczba interakcji
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Liczba interakcji
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Wybierz firmą ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Wybierz firmą ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Zostaw puste jeśli jest to rozważane dla wszystkich departamentów
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Rodzaje zatrudnienia (umowa o pracę, zlecenie, praktyka zawodowa itd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} jest obowiązkowe dla elementu {1}
 DocType: Process Payroll,Fortnightly,Dwutygodniowy
 DocType: Currency Exchange,From Currency,Od Waluty
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2109,14 +2109,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Stawka (waluta firmy)
 DocType: Student Guardian,Others,Inni
 DocType: Payment Entry,Unallocated Amount,Kwota nieprzydzielone
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nie możesz znaleźć pasujący element. Proszę wybrać jakąś inną wartość dla {0}.
 DocType: POS Profile,Taxes and Charges,Podatki i opłaty
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt lub usługa, która jest kupiona, sprzedana lub przechowywana w magazynie."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Brak więcej aktualizacji
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nie można wybrać typu opłaty jako ""Sumy Poprzedniej Komórki"" lub ""Całkowitej kwoty poprzedniej Komórki"" w pierwszym rzędzie"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dziecko pozycja nie powinna być Bundle produktu. Proszę usunąć pozycję `` {0} i zapisać
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankowość
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj ewidencja czasu pracy
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj ewidencja czasu pracy
 DocType: Vehicle Service,Service Item,service Element
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
 DocType: Bank Guarantee,Bank Guarantee,Gwarancja bankowa
@@ -2142,6 +2142,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Wiersz # {0}: {1} aktywami jest już {2}
 DocType: Quotation Item,Stock Balance,Bilans zapasów
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Płatności do zamówienia sprzedaży
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Proszę ustawić Serie nazw dla {0} przez Konfiguracja&gt; Ustawienia&gt; Serie nazw
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Szczegóły o zwrotach kosztów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Proszę wybrać prawidłową konto
@@ -2166,14 +2167,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny nie będą wyświetlane, jeśli Cennik nie jest ustawiony"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Proszę podać kraj, w tym wysyłka Reguły lub sprawdź wysyłka na cały świat"
 DocType: Stock Entry,Total Incoming Value,Całkowita wartość przychodów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetowane Konto jest wymagane
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetowane Konto jest wymagane
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Ewidencja czasu pomaga śledzić czasu, kosztów i rozliczeń dla aktywnosci przeprowadzonych przez zespół"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cennik zakupowy
 DocType: Offer Letter Term,Offer Term,Oferta Term
 DocType: Quality Inspection,Quality Manager,Manager Jakości
 DocType: Job Applicant,Job Opening,Otwarcie naboru na stanowisko
 DocType: Payment Reconciliation,Payment Reconciliation,Uzgodnienie płatności
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Wybierz nazwisko Osoby Zarządzającej
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Razem Niepłatny: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operacja WWW
@@ -2201,23 +2202,23 @@
 DocType: Opportunity,Lost Reason,Powód straty
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Wszystkie pozycje zostały już zafakturowane
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Proszę podać Otrzymanie dokumentu
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Kolejne centra kosztów mogą być wykonane w ramach grup, ale wpisy mogą być wykonane przed spoza grup"
 DocType: Project,External,Zewnętrzny
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Użytkownicy i uprawnienia
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Zlecenia produkcyjne Utworzono: {0}
 DocType: Branch,Branch,Odddział
 DocType: Guardian,Mobile Number,Numer telefonu komórkowego
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Drukowanie i firmowanie
 DocType: Bin,Actual Quantity,Rzeczywista Ilość
 DocType: Shipping Rule,example: Next Day Shipping,przykład: Wysyłka następnego dnia
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Nr seryjny {0} nie znaleziono
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr seryjny {0} nie znaleziono
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Twoi Klienci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Dokonaj Studenta
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Dokonaj Studenta
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Zostałeś zaproszony do współpracy przy projekcie: {0}
 DocType: Leave Block List Date,Block Date,Zablokowana Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplikuj teraz
@@ -2241,8 +2242,9 @@
 DocType: SMS Log,Sent To,Wysłane Do
 DocType: Payment Request,Make Sales Invoice,Nowa faktura sprzedaży
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Oprogramowania
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Następnie Kontakt Data nie może być w przeszłości
 DocType: Company,For Reference Only.,Wyłącznie w celach informacyjnych.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Wybierz numer partii
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Nieprawidłowy {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET
 DocType: Sales Invoice Advance,Advance Amount,Kwota Zaliczki
@@ -2256,7 +2258,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Numer sprawy nie może wynosić 0
 DocType: Item,Show a slideshow at the top of the page,Pokazuj slideshow na górze strony
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,LM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Sklepy
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Sklepy
 DocType: Serial No,Delivery Time,Czas dostawy
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,
 DocType: Item,End of Life,Zakończenie okresu eksploatacji
@@ -2268,12 +2270,12 @@
 DocType: Rename Tool,Rename Tool,Zmień nazwę narzędzia
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Zaktualizuj Koszt
 DocType: Item Reorder,Item Reorder,Element Zamów ponownie
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Slip Pokaż Wynagrodzenie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer materiału
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Slip Pokaż Wynagrodzenie
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Transfer materiału
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Niniejszy dokument ma na granicy przez {0} {1} dla pozycji {4}. Robisz kolejny {3} przeciwko samo {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Wybierz opcję Zmień konto kwotę
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Proszę ustawić cykliczne po zapisaniu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Wybierz opcję Zmień konto kwotę
 DocType: Purchase Invoice,Price List Currency,Waluta cennika
 DocType: Naming Series,User must always select,Użytkownik musi zawsze zaznaczyć
 DocType: Stock Settings,Allow Negative Stock,Dozwolony ujemny stan
@@ -2284,7 +2286,7 @@
 DocType: Budget Account,Budget Account,budżet konta
 DocType: Quality Inspection,Verified By,Zweryfikowane przez
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nie można zmienić domyślnej waluty firmy, ponieważ istnieją przypisane do niej transakcje. Anuluj transakcje, aby zmienić domyślną walutę"
-DocType: Grade Interval,Grade Description,Stopień Opis
+DocType: Grading Scale Interval,Grade Description,Stopień Opis
 DocType: Stock Entry,Purchase Receipt No,Nr Potwierdzenia Zakupu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Pieniądze zaliczkowe
 DocType: Process Payroll,Create Salary Slip,Utwórz pasek wynagrodzenia
@@ -2322,7 +2324,7 @@
 DocType: Upload Attendance,Attendance To Date,Obecność do Daty
 DocType: Warranty Claim,Raised By,Wywołany przez
 DocType: Payment Gateway Account,Payment Account,Konto Płatność
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Sprecyzuj firmę aby przejść dalej
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Zmiana netto stanu należności
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,
 DocType: Offer Letter,Accepted,Przyjęte
@@ -2332,12 +2334,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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ąć."
 DocType: Room,Room Number,Numer pokoju
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Nieprawidłowy odniesienia {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nie może być większa niż zaplanowana ilość ({2}) w Zleceniu Produkcyjnym {3}
 DocType: Shipping Rule,Shipping Rule Label,Etykieta z zasadami wysyłki i transportu
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum użytkowników
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Surowce nie może być puste.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Szybkie Księgowanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nie można zaktualizować stanu - faktura zawiera pozycję, której proces wysyłki scedowano na dostawcę."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Szybkie Księgowanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Nie możesz zmienić danych jeśli BOM jest przeciw jakiejkolwiek rzeczy
 DocType: Employee,Previous Work Experience,Poprzednie doświadczenie zawodowe
 DocType: Stock Entry,For Quantity,Dla Ilości
@@ -2350,7 +2352,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Warunki1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Nazwa instytutu, dla którego jest utworzenie tego systemu."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Zapisywanie kont zostało zamrożone do tej daty, nikt  nie może tworzyć / modyfikować zapisów poza uprawnionymi użytkownikami wymienionymi poniżej."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Zapisz dokument przed wygenerowaniem harmonogram konserwacji
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),Zaznacz to by zakazać ułamków (dla liczby jednostek)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Poniższe Zlecenia produkcyjne powstały:
@@ -2377,7 +2379,7 @@
 ,Employees working on a holiday,Pracownicy zatrudnieni na wakacje
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,Kompletna Metoda%
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Początek daty konserwacji nie może być wcześniejszy od daty numeru seryjnego {0}
 DocType: Production Order,Actual End Date,Rzeczywista Data Zakończenia
 DocType: BOM,Operating Cost (Company Currency),Koszty operacyjne (Spółka waluty)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2394,7 +2396,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Urlopu bezpłatnego nie jest zgodny z zatwierdzonymi zapisów Leave aplikacji
 DocType: Campaign,Campaign-.####,Kampania-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Następne kroki
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Proszę dostarczyć określone przedmioty w najlepszych możliwych cenach
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blisko Szansa po 15 dniach
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roku
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Kwota / kwota procentowa
@@ -2452,7 +2454,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Zapisana Ilość
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Utworzono Records Fee - {0}
 DocType: Asset Category Account,Asset Category Account,Konto Aktywów Kategoria
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Nie można wyprodukować więcej przedmiotów {0} niż wartość {1} na Zamówieniu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Zdjęcie Wejście {0} nie jest składany
 DocType: Payment Reconciliation,Bank / Cash Account,Konto Bank / Gotówka
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Następnie Kontakt By nie może być taki sam jak adres e-mail Wiodącego
@@ -2474,7 +2476,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produkcja
 DocType: Guardian,Occupation,Zawód
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Wiersz {0}: Data Początku musi być przed Datą Końca
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Razem (szt)
 DocType: Sales Invoice,This Document,Ten dokument
 DocType: Installation Note Item,Installed Qty,Liczba instalacji
@@ -2490,15 +2493,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Zgłoś problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,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 +64,90-Above,90-Ponad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Wiersz # {0}: Journal Entry {1} nie masz konta {2} lub już porównywana z innym kuponie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Wiersz # {0}: Journal Entry {1} nie masz konta {2} lub już porównywana z innym kuponie
 DocType: Buying Settings,Default Buying Price List,Domyślna Lista Cen Kupowania
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Wynagrodzenie podstawie grafiku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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.","Ustaw wartości domyślne jak firma, waluta, bieżący rok rozliczeniowy, itd."
 DocType: Payment Entry,Payment Type,Typ płatności
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Wybierz partię dla elementu {0}. Nie można znaleźć pojedynczej partii, która spełnia ten wymóg"
 DocType: Process Payroll,Select Employees,Wybierz Pracownicy
 DocType: Opportunity,Potential Sales Deal,Szczegóły potencjalnych sprzedaży
 DocType: Payment Entry,Cheque/Reference Date,Czek / Reference Data
@@ -2515,7 +2518,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalny POS Profil {0} już stworzony dla firmy {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zastąp rzecz ? BOM we wszystkich BOM
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Otrzymanie dokumentu należy składać
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Otrzymanie dokumentu należy składać
 DocType: Purchase Invoice Item,Received Qty,Otrzymana ilość
 DocType: Stock Entry Detail,Serial No / Batch,Nr seryjny / partia
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nie Płatny i nie Dostarczany
@@ -2524,11 +2527,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Brak karty czasu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Zostaw typu {0} nie może być przenoszenie przekazywane
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plan Konserwacji nie jest generowany dla wszystkich przedmiotów. Proszę naciśnij ""generuj plan"""
 ,To Produce,Do produkcji
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Lista płac
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Do rzędu {0} w {1}. Aby dołączyć {2} w cenę towaru, wiersze {3} musi być włączone"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Dokonaj użytkownika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Dokonaj użytkownika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Nr identyfikujący paczkę do dostawy (do druku)
 DocType: Bin,Reserved Quantity,Zarezerwowana ilość
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Proszę wprowadzić poprawny adres email
@@ -2542,15 +2545,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Szablon niepełnosprawnych nie może być domyślny szablon
 DocType: Account,Income Account,Konto przychodów
 DocType: Payment Request,Amount in customer's currency,Kwota w walucie klienta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dostarczanie
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Dostarczanie
 DocType: Stock Reconciliation Item,Current Qty,Obecna ilość
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Patrz ""Oceń Materiały w oparciu o"" w sekcji Kalkulacji kosztów"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Poprzedni
 DocType: Appraisal Goal,Key Responsibility Area,Kluczowy obszar obowiązków
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Partie studenckich pomóc śledzenie obecności, oceny i opłat dla studentów"
 DocType: Payment Entry,Total Allocated Amount,Łączna kwota przyznanego wsparcia
 DocType: Item Reorder,Material Request Type,Typ zamówienia produktu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry na wynagrodzenia z {0} {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage jest pełna, nie oszczędzać"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage jest pełna, nie oszczędzać"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Wiersz {0}: JM Współczynnik konwersji jest obowiązkowe
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Centrum kosztów
@@ -2560,16 +2564,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ukryj NIP Klienta z transakcji sprzedaży
 DocType: Upload Attendance,Upload HTML,Wyślij HTML
 DocType: Employee,Relieving Date,Data zwolnienia
-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.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Wycena Zasada jest nadpisanie cennik / określenie procentowego rabatu, w oparciu o pewne kryteria."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazyn może być tylko zmieniony poprzez Wpis Asortymentu / Notę Dostawy / Potwierdzenie zakupu
 DocType: Employee Education,Class / Percentage,
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Kierownik Marketingu i Sprzedaży
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Podatek dochodowy
-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.","Jeśli wybrana reguła Wycena jest dla 'Cena' spowoduje zastąpienie cennik. Zasada jest cena Wycena ostateczna cena, więc dalsze zniżki powinny być stosowane. W związku z tym, w transakcjach takich jak zlecenia sprzedaży, zamówienia itp, będzie pobrana w polu ""stopa"", a nie polu ""Cennik stopa""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Jeśli wybrana reguła Wycena jest dla 'Cena' spowoduje zastąpienie cennik. Zasada jest cena Wycena ostateczna cena, więc dalsze zniżki powinny być stosowane. W związku z tym, w transakcjach takich jak zlecenia sprzedaży, zamówienia itp, będzie pobrana w polu ""stopa"", a nie polu ""Cennik stopa""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Śledź leady przez typy przedsiębiorstw
 DocType: Item Supplier,Item Supplier,Dostawca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Proszę wprowadzić Kod Produktu w celu przyporządkowania serii
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Proszę wprowadzić wartość dla wyceny {0} {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Wszystkie adresy
 DocType: Company,Stock Settings,Ustawienia magazynu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2579,6 +2583,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Wyśle wiadomość e-mail o zdarzeniu pracowników ze statusem &quot;Otwórz&quot;
 DocType: Task,Depends on Tasks,Zależy Zadania
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Zarządzaj drzewem grupy klientów
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Załączniki mogą być wyświetlane bez włączania koszyka
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nazwa nowego Centrum Kosztów
 DocType: Leave Control Panel,Leave Control Panel,Panel do obsługi Urlopów
@@ -2591,12 +2596,10 @@
 DocType: Sales Invoice,Debit To,Debetowane Konto (Winien)
 DocType: Delivery Note,Required only for sample item.,
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Rzeczywista Ilość Po Transakcji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dostawca&gt; Typ dostawcy
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nie znaleziono wynagrodzenie poślizg między {0} i {1}
 ,Pending SO Items For Purchase Request,Oczekiwane elementy Zamówień Sprzedaży na Prośbę Zakupu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Rekrutacja dla studentów
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} jest wyłączony
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} jest wyłączony
 DocType: Supplier,Billing Currency,Waluta Rozliczenia
 DocType: Sales Invoice,SINV-RET-,SINV-RET
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Bardzo Duży
@@ -2613,9 +2616,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Ciekawa Strona produktu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Wszystkie grupy oceny
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nowy magazyn Nazwa
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Razem {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Razem {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Region
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,
 DocType: Stock Settings,Default Valuation Method,Domyślna metoda wyceny
 DocType: Vehicle Log,Fuel Qty,Ilość paliwa
 DocType: Production Order Operation,Planned Start Time,Planowany czas rozpoczęcia
@@ -2631,7 +2634,7 @@
 DocType: Price List,Price List Master,Ustawienia Cennika
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Wszystkie transakcje sprzedaży mogą być oznaczone przed wieloma ** Osoby sprzedaży **, dzięki czemu można ustawić i monitorować cele."
 ,S.O. No.,
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Proszę utworzyć Klienta z {0}
 DocType: Price List,Applicable for Countries,Zastosowanie dla krajów
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pozostawić tylko Aplikacje ze statusem „Approved” i „Odrzucone” mogą być składane
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Nazwa grupy jest obowiązkowe w wierszu {0}
@@ -2675,7 +2678,7 @@
 DocType: Project,Copied From,Skopiowano z
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Błąd Nazwa: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Niedobór
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nie jest skojarzony z {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nie jest skojarzony z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Frekwencja pracownika {0} jest już zaznaczona
 DocType: Packing Slip,If more than one package of the same type (for print),Jeśli więcej niż jedna paczka tego samego typu (do druku)
 ,Salary Register,wynagrodzenie Rejestracja
@@ -2694,7 +2697,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Służy do koszyka
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Wartość {0} atrybutu {1} nie istnieje w liście ważnej pozycji wartości atrybutów dla pozycji {2}
 DocType: BOM Item,Scrap %,
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Koszty zostaną rozdzielone proporcjonalnie na podstawie Ilość pozycji lub kwoty, jak na swój wybór"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Koszty zostaną rozdzielone proporcjonalnie na podstawie Ilość pozycji lub kwoty, jak na swój wybór"
 DocType: Maintenance Visit,Purposes,Cele
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacja {0} dłużej niż wszelkie dostępne w godzinach pracy stacji roboczej {1}, rozbić na kilka operacji operacji"
@@ -2715,16 +2718,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Zarządzaj drzewem terytorium
 DocType: Journal Entry Account,Sales Invoice,Faktura sprzedaży
 DocType: Journal Entry Account,Party Balance,Bilans Grupy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Proszę wybrać Zastosuj RABAT
 DocType: Company,Default Receivable Account,Domyślnie konto Rozrachunki z odbiorcami
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Utwórz zapis bankowy dla sumy wynagrodzenia dla wybranych wyżej kryteriów
 DocType: Stock Entry,Material Transfer for Manufacture,Materiał transferu dla Produkcja
-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.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabat procentowy może być stosowany zarówno przed cenniku dla wszystkich Cenniku.
 DocType: Purchase Invoice,Half-yearly,Półroczny
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Zapis księgowy dla zapasów
 DocType: Vehicle Service,Engine Oil,Olej silnikowy
 DocType: Sales Invoice,Sales Team1,Team Sprzedażowy1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} nie istnieje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} nie istnieje
 DocType: Sales Invoice,Customer Address,Adres klienta
 DocType: Employee Loan,Loan Details,pożyczka Szczegóły
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Wiersz {0}: Zakończony Ilość musi być większa od zera.
@@ -2732,24 +2735,24 @@
 DocType: Account,Root Type,Typ Root
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Wiersz # {0}: Nie można wrócić więcej niż {1} dla pozycji {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Wątek
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Wątek
 DocType: Item Group,Show this slideshow at the top of the page,Pokaż slideshow na górze strony
 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},Magazyn docelowy jest obowiązkowy dla wiersza {0}
 DocType: Cheque Print Template,Primary Settings,Ustawienia podstawowe
 DocType: Purchase Invoice,Select Supplier Address,Wybierz Dostawca Adres
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj Pracownikom
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Dodaj Pracownikom
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola jakości
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Szablon Standardowy
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Ostrzeżenie: Ilość Zapotrzebowanego Materiału jest mniejsza niż minimalna ilość na zamówieniu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Konto {0} jest zamrożone
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Osobowość prawna / Filia w oddzielny planu kont należących do Organizacji.
 DocType: Payment Request,Mute Email,Wyciszenie email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Żywność, Trunki i Tytoń"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Mogą jedynie wpłaty przed Unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Wartość prowizji nie może być większa niż 100
 DocType: Stock Entry,Subcontract,Zlecenie
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Podaj {0} pierwszy
@@ -2789,7 +2792,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Magazyny z istniejącymi transakcji nie mogą być zamieniane na grupy.
 DocType: Assessment Result Tool,Result HTML,wynik HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Upływa w dniu
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj uczniów
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj uczniów
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Proszę wybrać {0}
 DocType: C-Form,C-Form No,
 DocType: BOM,Exploded_items,Exploded_items
@@ -2832,7 +2835,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Wpisz nazwę przeprowadzanej kampanii jeżeli źródło pytania jest kampanią
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Wydawcy Gazet
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Wybierz rok podatkowy
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Wybierz rok podatkowy
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Poziom Uporządkowania
 DocType: Company,Chart Of Accounts Template,Szablon planu kont
 DocType: Attendance,Attendance Date,Data usługi
@@ -2847,14 +2850,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Wpis zduplikowany
 DocType: Program Enrollment Tool,Get Students,Uzyskaj Studentów
 DocType: Serial No,Under Warranty,Pod Gwarancją
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Błąd]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Błąd]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Słownie, będzie widoczne w Zamówieniu Sprzedaży, po zapisaniu"
 ,Employee Birthday,Data urodzenia pracownika
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Obecność narzędzia
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Kapitał wysokiego ryzyka
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Semestr z tym &quot;Roku Akademickiego&quot; {0} i &#39;Nazwa Termin&#39; {1} już istnieje. Proszę zmodyfikować te dane i spróbuj jeszcze raz.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Ponieważ istnieje istniejące transakcje przeciwko elementu {0}, nie można zmienić wartość {1}"
 DocType: UOM,Must be Whole Number,Musi być liczbą całkowitą
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nowe Zwolnienie Przypisano (W Dniach)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Nr seryjny {0} nie istnieje
@@ -2874,7 +2877,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 +49,Period Closing Entry,Wpis Kończący Okres
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w grupę
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Kwota {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortyzacja
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dostawca(y)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Narzędzie Frekwencji
@@ -2898,7 +2901,7 @@
 DocType: Supplier,Last Day of the Next Month,Ostatni dzień następnego miesiąca
 DocType: Support Settings,Auto close Issue after 7 days,Auto blisko Issue po 7 dniach
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Urlopu nie może być przyznane przed {0}, a bilans urlopu zostało już przeniesionych przekazywane w przyszłości rekordu alokacji urlopu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Uwaga: Ze względu / Data odniesienia przekracza dozwolony dzień kredytowej klienta przez {0} dni (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Wnioskodawca
 DocType: Asset Category Account,Accumulated Depreciation Account,Skumulowana konta Amortyzacja
 DocType: Stock Settings,Freeze Stock Entries,Zamroź Wpisy do Asortymentu
@@ -2909,7 +2912,7 @@
 ,Stock Analytics,Analityka magazynu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operacje nie może być puste
 DocType: Maintenance Visit Purpose,Against Document Detail No,
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Rodzaj Partia jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Rodzaj Partia jest obowiązkowe
 DocType: Quality Inspection,Outgoing,Wychodzący
 DocType: Material Request,Requested For,Prośba o
 DocType: Quotation Item,Against Doctype,
@@ -2926,11 +2929,11 @@
 DocType: Asset,Item Code,Kod identyfikacyjny
 DocType: Production Planning Tool,Create Production Orders,Utwórz Zamówienie produkcji
 DocType: Serial No,Warranty / AMC Details,Gwarancja / AMC Szczegóły
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Wybierz uczniów ręcznie dla grupy działań
 DocType: Journal Entry,User Remark,Nota Użytkownika
 DocType: Lead,Market Segment,Segment rynku
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Wpłaconej kwoty nie może być większa od całkowitej ujemnej kwoty należności {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Historia zatrudnienia pracownika w firmie
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zamknięcie (Dr)
 DocType: Cheque Print Template,Cheque Size,Czek Rozmiar
@@ -2946,7 +2949,7 @@
 DocType: Production Planning Tool,Create Material Requests,
 DocType: Employee Education,School/University,Szkoła/Uniwersytet
 DocType: Payment Request,Reference Details,Szczegóły odniesienia
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Oczekiwana wartość Po okres użytkowania może być mniejsza niż brutto Kwota do zapłaty
 DocType: Sales Invoice Item,Available Qty at Warehouse,Ilość dostępna w magazynie
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Ilość Rozliczenia
 DocType: Asset,Double Declining Balance,Podwójne Bilans Spadek
@@ -2967,20 +2970,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Konto różnica musi być kontem typu aktywami / pasywami, ponieważ Zdjęcie Pojednanie jest Wejście otwarcia"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Wypłacona kwota nie może być wyższa niż Kwota kredytu {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Numer Zamówienia Kupna wymagany do {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produkcja Zamówienie nie stworzył
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Produkcja Zamówienie nie stworzył
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',Pole 'Od daty' musi następować później niż 'Do daty'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nie można zmienić status studenta {0} jest powiązany z aplikacją studentów {1}
 DocType: Asset,Fully Depreciated,pełni zamortyzowanych
 ,Stock Projected Qty,Przewidywana ilość zapasów
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Klient {0} nie należy do projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Zaznaczona Obecność HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Notowania są propozycje, oferty Wysłane do klientów"
 DocType: Sales Order,Customer's Purchase Order,Klienta Zamówienia
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Numer seryjny oraz Batch
 DocType: Warranty Claim,From Company,Od Firmy
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma punktów kryteriów oceny musi być {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Wartość albo Ilość
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Proszę ustawić ilość amortyzacji zarezerwowano
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Wartość albo Ilość
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produkcje Zamówienia nie mogą być podnoszone przez:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Podatki i opłaty kupna
@@ -2993,7 +2996,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Wszystkie Magazyny
 DocType: Sales Partner,Retailer,Detalista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Kredytowane konto powinno być kontem bilansowym
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Typy wszystkich dostawców
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Typy wszystkich dostawców
 DocType: Global Defaults,Disable In Words,Wyłącz w słowach
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Kod elementu jest obowiązkowy, ponieważ pozycja ta nie jest automatycznie numerowana"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Wycena {0} nie jest typem {1}
@@ -3002,6 +3005,7 @@
 DocType: Production Order,PRO-,ZAWODOWIEC-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Konto z kredytem w rachunku bankowym
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Wiersz {0}: alokowana kwota nie może być większa niż kwota pozostająca do spłaty.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Przeglądaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Kredyty Hipoteczne
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit data księgowania i czas
@@ -3041,7 +3045,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Niedozwolona jest modyfikacja transakcji zapasów starszych niż {0}
 DocType: Purchase Invoice Item,PR Detail,
 DocType: Sales Order,Fully Billed,Całkowicie Rozliczone
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Proszę ustawić domyślny płatne konto w pracownika {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Gotówka w kasie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Dostawa wymagane dla magazynu pozycji magazynie {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Waga brutto opakowania. Zazwyczaj waga netto + waga materiału z jakiego jest wykonane opakowanie. (Do druku)
@@ -3051,7 +3054,7 @@
 DocType: Student Group,Group Based On,Grupa oparta na
 DocType: Journal Entry,Bill Date,Data Rachunku
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Wymagane są Service Element, typ, częstotliwość i wysokość wydatków"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","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:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Czy na pewno chcesz się przekazywać wszelkie Slip Wynagrodzenie od {0} {1}
 DocType: Cheque Print Template,Cheque Height,Czek Wysokość
 DocType: Supplier,Supplier Details,Szczegóły dostawcy
@@ -3063,7 +3066,7 @@
 DocType: Vehicle Log,Invoice Ref,faktura Ref
 DocType: Purchase Order,Recurring Order,Powtarzające się Zamówienie
 DocType: Company,Default Income Account,Domyślne konto przychodów
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupa Klientów / Klient
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupa Klientów / Klient
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiskalna Lata Zysk / Strata (Credit)
 DocType: Sales Invoice,Time Sheets,arkusze czasu
 DocType: Payment Gateway Account,Default Payment Request Message,Domyślnie Płatność Zapytanie Wiadomość
@@ -3083,10 +3086,10 @@
 DocType: Notification Control,Quotation Message,Wiadomość Wyceny
 DocType: Employee Loan,Employee Loan Application,Pracownik Loan Application
 DocType: Issue,Opening Date,Data Otwarcia
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Obecność została oznaczona pomyślnie.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Obecność została oznaczona pomyślnie.
 DocType: Journal Entry,Remark,Uwaga
 DocType: Purchase Receipt Item,Rate and Amount,Stawka i Ilość
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Typ konta dla {0} musi być {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Typ konta dla {0} musi być {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Urlopy i święta
 DocType: School Settings,Current Academic Term,Obecny termin akademicki
 DocType: School Settings,Current Academic Term,Obecny termin akademicki
@@ -3109,7 +3112,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupa Student
 DocType: Shopping Cart Settings,Quotation Series,Serie Wyeceny
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",Istnieje element  o takiej nazwie. Zmień nazwę Grupy lub tego elementu.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Wybierz klienta
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Wybierz klienta
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Zaleta Centrum Amortyzacja kosztów
 DocType: Sales Order Item,Sales Order Date,Data Zlecenia
@@ -3128,20 +3131,20 @@
 DocType: Vehicle,Insurance Details,Szczegóły ubezpieczenia
 DocType: Account,Payable,Płatność
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Proszę wprowadzić okresy spłaty
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dłużnicy ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dłużnicy ({0})
 DocType: Pricing Rule,Margin,
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nowi klienci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Zysk brutto%
 DocType: Appraisal Goal,Weightage (%),Waga/wiek (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Czystki
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Zakup Kwota brutto jest obowiązkowe
 DocType: Lead,Address Desc,Opis adresu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partia jest obowiązkowe
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partia jest obowiązkowe
 DocType: Journal Entry,JV-,V-
 DocType: Topic,Topic Name,Nazwa tematu
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Conajmniej jeden sprzedaż lub zakup musi być wybrany
-DocType: Grading Structure,Grade Intervals,Stopień Odstępy
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Wybierz charakteru swojej działalności.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Wiersz # {0}: Duplikuj wpis w odsyłaczach {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"W przypadku, gdy czynności wytwórcze są prowadzone."
 DocType: Asset Movement,Source Warehouse,Magazyn źródłowy
 DocType: Installation Note,Installation Date,Data instalacji
@@ -3178,7 +3181,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Nagłówki to wzorów druku
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Tytuł szablonu wydruku np.: Faktura Proforma
 DocType: Student Guardian,Student Guardian,Student Stróża
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Opłaty typu Wycena nie oznaczone jako Inclusive
 DocType: POS Profile,Update Stock,Aktualizuj Stan
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Kursy
@@ -3206,7 +3209,7 @@
 DocType: Company,Exchange Gain / Loss Account,Wymiana Zysk / strat
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Pracownik i obecność
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Cel musi być jednym z {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Wypełnij formularz i zapisz
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Rzeczywista ilość w magazynie
@@ -3222,7 +3225,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ilość do ponownego zamówienia
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktualne ofert pracy
 DocType: Company,Stock Adjustment Account,Konto korekty
-DocType: Journal Entry,Write Off,Odpis
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpis
 DocType: Timesheet Detail,Operation ID,Operacja ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Użytkownik systemu (login) ID. Jeśli ustawiono, stanie się on domyślnym dla wszystkich formularzy HR"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: {1} od
@@ -3233,27 +3236,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dostawca dostarcza Klientowi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Postać / poz / {0}) jest niedostępne
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Następna data musi być większe niż Data publikacji
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Pokaż Podatek rozpad
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Pokaż Podatek rozpad
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Data referencyjne / Termin nie może być po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import i eksport danych
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Zbiory wpisy istnieją wobec hurtowni {0}, a więc nie można ponownie przydzielić lub modyfikować"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nie znaleziono studentów
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nie znaleziono studentów
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktura Data zamieszczenia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Sprzedać
 DocType: Sales Invoice,Rounded Total,Końcowa zaokrąglona kwota
 DocType: Product Bundle,List items that form the package.,Lista elementów w pakiecie
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Przydział Procentowy powinien wynosić 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Proszę wybrać Data księgowania przed wybraniem Stronę
 DocType: Program Enrollment,School House,school House
 DocType: Serial No,Out of AMC,
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Proszę wybrać cytaty
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Proszę wybrać cytaty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Stwórz Wizytę Konserwacji
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Proszę wybrać cytaty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Ilość amortyzacją Zarezerwowane nie może być większa od ogólnej liczby amortyzacją
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Stwórz Wizytę Konserwacji
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Proszę się skontaktować z użytkownikiem pełniącym rolę Główny Menadżer Sprzedaży {0}
 DocType: Company,Default Cash Account,Domyślne Konto Gotówkowe
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Informacje o własnej firmie.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Jest to oparte na obecności tego Studenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Brak uczniów w Poznaniu
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodać więcej rzeczy lub otworzyć pełną formę
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Proszę wprowadź 'Spodziewaną Datę Dstawy'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dowody Dostawy {0} muszą być anulowane przed anulowanie Zamówienia Sprzedaży
@@ -3285,6 +3289,7 @@
 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: Warranty Claim,Item and Warranty Details,Przedmiot i gwarancji Szczegóły
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kod pozycji&gt; Grupa towarów&gt; Marka
 DocType: Sales Team,Contribution (%),Udział (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Uwaga: Płatność nie zostanie utworzona, gdyż nie określono konta 'Gotówka lub Bank'"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,"Wybierz Program, aby pobrać obowiązkowe kursy."
@@ -3300,9 +3305,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Przed pojednania
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Do {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Dodano podatki i opłaty (Firmowe)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,
 DocType: Sales Order,Partly Billed,Częściowo Zapłacono
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Element {0} musi być trwałego przedmiotu
 DocType: Item,Default BOM,Domyślne Zestawienie Materiałów
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3312,8 +3317,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,
 DocType: Vehicle,Insurance Company,Firma ubezpieczeniowa
 DocType: Asset Category Account,Fixed Asset Account,Konto trwałego
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Zmienna
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dowodu dostawy
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Zmienna
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Od dowodu dostawy
 DocType: Student,Student Email Address,Student adres email
 DocType: Timesheet Detail,From Time,Od czasu
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,W magazynie:
@@ -3325,12 +3330,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cennik Kursowy
 DocType: Purchase Invoice Item,Rate,Stawka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stażysta
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adres
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Kod Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Podstawowy
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Operacje magazynowe przed {0} są zamrożone
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Proszę kliknąć na ""Wygeneruj Harmonogram"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","np. Kg, Jednostka, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Nr Odniesienia jest obowiązkowy jest wprowadzono Datę Odniesienia
 DocType: Bank Reconciliation Detail,Payment Document,Płatność Dokument
@@ -3338,19 +3343,19 @@
 DocType: Salary Slip,Salary Structure,Struktura Wynagrodzenia
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linia lotnicza
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Wydanie Materiał
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Jesteś w trybie offline. Nie będzie mógł przeładować dopóki masz sieć.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Brak grup studenckich utworzony.
 DocType: Purchase Invoice Item,Serial No,Nr seryjny
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Miesięczna kwota spłaty nie może być większa niż Kwota kredytu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Proszę wprowadzić szczegóły dotyczące konserwacji
 DocType: Purchase Invoice,Print Language,Język drukowania
 DocType: Salary Slip,Total Working Hours,Całkowita liczba godzin pracy
 DocType: Stock Entry,Including items for sub assemblies,W tym elementów dla zespołów sub
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Wprowadź wartość musi być dodatnia
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Wprowadź wartość musi być dodatnia
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Wszystkie obszary
 DocType: Purchase Invoice,Items,Produkty
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student jest już zarejestrowany.
@@ -3370,17 +3375,15 @@
 DocType: Issue,Opening Time,Czas Otwarcia
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,Daty Od i Do są wymagane
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Papiery i Notowania Giełdowe
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"Domyślne jednostki miary dla wariantu &quot;{0}&quot; musi być taki sam, jak w szablonie &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Obliczone na podstawie
 DocType: Delivery Note Item,From Warehouse,Z magazynu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Brak przedmioty z Bill of Materials do produkcji
 DocType: Assessment Plan,Supervisor Name,Nazwa Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Kurs rejestracyjny programu
 DocType: Program Enrollment Course,Program Enrollment Course,Kurs rekrutacji
-DocType: Grading Structure,Grading Structure,Klasyfikację Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Wycena i kwota całkowita
 DocType: Tax Rule,Shipping City,Wysyłka Miasto
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Dostosuj powiadomienie
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Przepływy środków pieniężnych z działalności
 DocType: Sales Invoice,Shipping Rule,Zasada dostawy
@@ -3401,8 +3404,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Brak standardowego BOM dla produktu {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Najpierw wybierz zamieszczenia Data
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data otwarcia powinien być przed Dniem Zamknięcia
 DocType: Leave Control Panel,Carry Forward,Przeniesienie
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrum Kosztów z istniejącą transakcją nie może być przekształcone w rejestr
 DocType: Department,Days for which Holidays are blocked for this department.,Dni kiedy urlop jest zablokowany dla tego departamentu
@@ -3415,7 +3418,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Załącz blankiet firmowy
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ostatnia komunikacja
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ostatnia komunikacja
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nie można wywnioskować, kiedy kategoria dotyczy ""Ocena"" a kiedy ""Oceny i Total"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nie można wywnioskować, kiedy kategoria dotyczy ""Ocena"" a kiedy ""Oceny i Total"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lista podatków (np. VAT, cło, itp. - powinny mieć unikatowe nazwy) i ich standardowe stawki. Spowoduje to utworzenie standardowego szablonu, który można edytować później lub posłuży za wzór do dodania kolejnych podatków."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nr-y seryjne Wymagane do szeregowania pozycji {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Płatności mecz fakturami
@@ -3431,7 +3434,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Razem (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Rozrywka i relaks
 DocType: Quality Inspection,Item Serial No,Nr seryjny
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Tworzenie pracownicze Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Tworzenie pracownicze Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Razem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Raporty księgowe
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Godzina
@@ -3444,10 +3447,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Nieznany
 DocType: Shipping Rule,Shipping Rule Conditions,Warunki zasady dostawy
 DocType: BOM Replace Tool,The new BOM after replacement,Nowy BOM po wymianie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Punkt Sprzedaży (POS)
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Punkt Sprzedaży (POS)
 DocType: Payment Entry,Received Amount,Kwota otrzymana
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Proszę skonfigurować system nazwisk pracowników w zasobach ludzkich&gt; ustawienia HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Tworzenie pełnej ilości, ignorując ilości już zamówionych"
 DocType: Account,Tax,Podatek
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nieoznaczone
@@ -3460,9 +3461,9 @@
 DocType: Batch,Source Document Name,Nazwa dokumentu źródłowego
 DocType: Batch,Source Document Name,Nazwa dokumentu źródłowego
 DocType: Job Opening,Job Title,Nazwa stanowiska pracy
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Tworzenie użytkowników
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Tworzenie użytkowników
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Ilość do produkcji musi być większy niż 0 ° C.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Raport wizyty dla wezwania konserwacji.
 DocType: Stock Entry,Update Rate and Availability,Aktualizuj cenę i dostępność
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procent który wolno Ci otrzymać lub dostarczyć ponad zamówioną ilość. Na przykład: jeśli zamówiłeś 100 jednostek i Twój procent wynosi 10% oznacza to, że możesz otrzymać 110 jednostek"
@@ -3472,28 +3473,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Konto wydatków jest obowiązkowe dla przedmiotu {0}
 DocType: BOM,Website Description,Opis strony WWW
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Zmiana netto w kapitale własnym
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Anuluj faktura zakupu {0} Pierwszy
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adres e-mail musi być unikalny, istnieje już dla {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data Ważności
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Paragon
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Paragon
 ,Sales Register,Rejestracja Sprzedaży
 DocType: Daily Work Summary Settings Company,Send Emails At,Wyślij pocztę elektroniczną w
 DocType: Quotation,Quotation Lost Reason,Utracony Powód Wyceny
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Wybierz swoją domenę
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transakcja ma odniesienia {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nie ma nic do edycji
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Podsumowanie dla tego miesiąca i działań toczących
 DocType: Customer Group,Customer Group Name,Nazwa Grupy Klientów
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Brak klientów!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Raport kasowy
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kwota kredytu nie może przekroczyć maksymalna kwota kredytu o {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licencja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,Please remove this Invoice {0} from C-Form {1},Proszę usunąć tę fakturę {0} z C-Form {1}
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Proszę wybrać Przeniesienie jeżeli chcesz uwzględnić balans poprzedniego roku rozliczeniowego do tego roku rozliczeniowego
 DocType: GL Entry,Against Voucher Type,Rodzaj dowodu
 DocType: Item,Attributes,Atrybuty
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,Proszę zdefiniować konto odpisów
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data Ostatniego Zamówienia
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Konto {0} nie należy do firmy {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numery seryjne w wierszu {0} nie pasują do opisu dostawy
 DocType: Student,Guardian Details,Szczegóły Stróża
 DocType: C-Form,C-Form,
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Zaznacz Obecność dla wielu pracowników
@@ -3518,20 +3521,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Wiersz {0} # Konto musi być typu &quot;trwałego&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Brak Ilości
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Zasady obliczeń kwot przesyłki przy sprzedaży
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serie jest obowiązkowa
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serie jest obowiązkowa
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Usługi finansowe
 DocType: Student Sibling,Student ID,legitymacja studencka
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Rodzaje działalności za czas Logi
 DocType: Tax Rule,Sales,Sprzedaż
 DocType: Stock Entry Detail,Basic Amount,Kwota podstawowa
 DocType: Training Event,Exam,Egzamin
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazyn wymagany dla przedmiotu {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Kr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Kr
 DocType: Tax Rule,Billing State,Stan Billing
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nie jest skojarzony z kontem odbiorcy {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nie jest skojarzony z kontem odbiorcy {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),
 DocType: Authorization Rule,Applicable To (Employee),Stosowne dla (Pracownik)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date jest obowiązkowe
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Przyrost dla atrybutu {0} nie może być 0
@@ -3542,13 +3545,13 @@
 ,Inactive Customers,Nieaktywne Klienci
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Potwierdzenia Zakupu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak reguła jest stosowana Wycena?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak reguła jest stosowana Wycena?
 DocType: Stock Entry,Delivery Note No,Nr dowodu dostawy
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Jeśli zaznaczone, tylko zakup materiałów do wniosków końcowych surowców będą zawarte w materiale żądań. W przeciwnym razie zostanie utworzony Wnioski materiałowe elementów nadrzędnych"
 DocType: Cheque Print Template,Message to show,Wiadomość pokazać
 DocType: Company,Retail,Detal
 DocType: Attendance,Absent,Nieobecny
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Pakiet produktów
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Pakiet produktów
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3558,10 +3561,10 @@
 DocType: Payment Entry,Account Paid From,Konto Płatny Z
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Kod surowca
 DocType: Journal Entry,Write Off Based On,Odpis bazowano na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Dokonaj Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Dokonaj Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Druk i papiernicze
 DocType: Stock Settings,Show Barcode Field,Pokaż pole kodu kreskowego
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Wyślij e-maile Dostawca
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Wyślij e-maile Dostawca
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Wynagrodzenie już przetwarzane w okresie od {0} i {1} Zostaw okresu stosowania nie może być pomiędzy tym zakresie dat.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Numer instalacyjny dla numeru seryjnego
 DocType: Guardian Interest,Guardian Interest,Strażnik Odsetki
@@ -3574,6 +3577,7 @@
 DocType: Offer Letter,Awaiting Response,Oczekuje na Odpowiedź
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Powyżej
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Nieprawidłowy atrybut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Wspomnij, jeśli nietypowe konto płatne"
 DocType: Salary Slip,Earning & Deduction,Dochód i Odliczenie
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcjonalne. Te Ustawienie będzie użyte w filtrze dla różnych transacji.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Błąd Szacowania Wartość nie jest dozwolona
@@ -3589,10 +3593,9 @@
 DocType: Production Order Item,Production Order Item,Produkcja Zamówienie Pozycja
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nie znaleziono wyników
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Koszt złomowany aktywach
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Zamówiono częściowo
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: MPK jest obowiązkowe dla pozycji {2}
 DocType: Vehicle,Policy No,Polityka nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Elementy z Bundle produktu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Elementy z Bundle produktu
 DocType: Asset,Straight Line,Linia prosta
 DocType: Project User,Project User,Użytkownik projektu
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdzielać
@@ -3610,7 +3613,7 @@
 DocType: Program Enrollment Tool,Get Students From,Uzyskaj studentów z
 DocType: Hub Settings,Seller Country,Sprzedawca Kraj
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikowanie przedmioty na stronie internetowej
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa uczniowie w partiach
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa uczniowie w partiach
 DocType: Authorization Rule,Authorization Rule,Reguła autoryzacji
 DocType: Sales Invoice,Terms and Conditions Details,Szczegóły regulaminu
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specyfikacje
@@ -3663,14 +3666,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data czeku
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Konto nadrzędne {1} nie należy do firmy: {2}
 DocType: Program Enrollment Tool,Student Applicants,Wnioskodawcy studenckie
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Pomyślnie usunięte wszystkie transakcje związane z tą firmą!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Data rejestracji
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Wyrok lub staż
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,składników wynagrodzenia
 DocType: Program Enrollment Tool,New Academic Year,Nowy rok akademicki
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Powrót / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Powrót / Credit Note
 DocType: Stock Settings,Auto insert Price List rate if missing,Automatycznie wstaw wartość z cennika jeśli jej brakuje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Kwota całkowita Płatny
 DocType: Production Order Item,Transferred Qty,Przeniesione ilości
@@ -3690,7 +3693,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ urlopu (okolicznościowy, chorobowy, itp.)"
 DocType: Email Digest,Send regular summary reports via Email.,Wyślij regularne raporty podsumowujące poprzez e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Proszę ustawić domyślne konto w Expense Claim typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Proszę ustawić domyślne konto w Expense Claim typu {0}
 DocType: Assessment Result,Student Name,Nazwa Student
 DocType: Brand,Item Manager,Pozycja menedżera
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Płace Płatne
@@ -3711,6 +3714,7 @@
 ,Sales Funnel,Lejek Sprzedaży
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skrót jest obowiązkowy
 DocType: Project,Task Progress,Postęp wykonywania zadania
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Koszyk
 ,Qty to Transfer,Ilość do transferu
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Wycena dla Tropów albo Klientów
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rola Zezwala na edycję zamrożonych zasobów
@@ -3738,13 +3742,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Instytut Skrót
 ,Item-wise Price List Rate,
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Wyznaczony dostawca
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Wyznaczony dostawca
 DocType: Quotation,In Words will be visible once you save the Quotation.,
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Liczba ({0}) nie może być ułamkiem w rzędzie {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,pobierania opłat
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Kod kreskowy {0} jest już używana dla przedmiotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Zasady naliczania kosztów transportu.
 DocType: Item,Opening Stock,Otwarcie Zdjęcie
@@ -3762,8 +3766,8 @@
  Aktualizacja poprzez ""Czas Zaloguj"""
 DocType: Customer,From Lead,Od śladu
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Zamówienia puszczone do produkcji.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Wybierz rok finansowy ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Wybierz rok finansowy ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Profil POS wymagany do tworzenia wpisu z POS
 DocType: Program Enrollment Tool,Enroll Students,zapisać studentów
 DocType: Hub Settings,Name Token,Nazwa jest już w użyciu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standard sprzedaży
@@ -3774,7 +3778,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} na fakturę sprzedaży {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nazwa projektu
-DocType: Supplier,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
+DocType: Customer,Mention if non-standard receivable account,"Wskazać, jeśli niestandardowe konto należności"
 DocType: Journal Entry Account,If Income or Expense,Jeśli przychód lub koszt
 DocType: Production Order,Required Items,wymagane przedmioty
 DocType: Stock Ledger Entry,Stock Value Difference,Różnica wartości zapasów
@@ -3795,7 +3799,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Zamroź asortyment starszy niż [dni]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Wiersz # {0}: atutem jest obowiązkowe w przypadku środków trwałych kupna / sprzedaży
-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.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Jeśli dwóch lub więcej Zasady ustalania cen na podstawie powyższych warunków, jest stosowana Priorytet. Priorytetem jest liczba z zakresu od 0 do 20, podczas gdy wartość domyślna wynosi zero (puste). Wyższa liczba oznacza, że będzie mieć pierwszeństwo, jeśli istnieje wiele przepisów dotyczących cen z samych warunkach."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Rok fiskalny: {0} nie istnieje
 DocType: Currency Exchange,To Currency,Do przewalutowania
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,
@@ -3821,7 +3825,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Element {0} jest ignorowany od momentu, kiedy nie ma go w magazynie"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Zgłoś zamówienie produkcji dla dalszego przetwarzania.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Cennik nie stosuje regułę w danej transakcji, wszystkie obowiązujące przepisy dotyczące cen powinny być wyłączone."
 DocType: Assessment Group,Parent Assessment Group,Rodzic Assesment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Oferty pracy
 ,Sales Order Trends,
@@ -3832,7 +3836,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatkowy koszt
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data końca roku finansowego
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,
 DocType: Quality Inspection,Incoming,Przychodzące
 DocType: BOM,Materials Required (Exploded),Materiał Wymaga (Rozdzielony)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Dodaj użytkowników do swojej organizacji, innych niż siebie"
@@ -3860,6 +3864,7 @@
 DocType: Employee,History In Company,Historia Firmy
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Biuletyny
 DocType: Stock Ledger Entry,Stock Ledger Entry,Zapis w księdze zapasów
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Klient&gt; Grupa klienta&gt; Terytorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Sama pozycja została wprowadzona wielokrotnie
 DocType: Department,Leave Block List,Lista Blokowanych Urlopów
 DocType: Sales Invoice,Tax ID,Identyfikator podatkowy (NIP)
@@ -3869,7 +3874,7 @@
 DocType: Customer,Sales Partner and Commission,Partner sprzedaży i Prowizja
 DocType: Employee Loan,Rate of Interest (%) / Year,Stopa procentowa (% / rok)
 ,Project Quantity,Ilość projektów
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Razem {0} dla wszystkich elementów wynosi zero, może trzeba zmienić „Dystrybucja opłat na podstawie”"
 DocType: Opportunity,To Discuss,Do omówienia
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} jednostki {1} potrzebne w {2}, aby zakończyć tę transakcję."
 DocType: Loan Type,Rate of Interest (%) Yearly,Stopa procentowa (%) Roczne
@@ -3884,7 +3889,7 @@
 DocType: Purchase Invoice,Return,Powrót
 DocType: Production Order Operation,Production Order Operation,Produkcja Zamówienie Praca
 DocType: Pricing Rule,Disable,Wyłącz
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,"Sposób płatności jest wymagane, aby dokonać płatności"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,"Sposób płatności jest wymagane, aby dokonać płatności"
 DocType: Project Task,Pending Review,Czekający na rewizję
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Składnik {0} nie może zostać wycofane, jak to jest już {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Razem zwrot kosztów (przez zwrot kosztów)
@@ -3892,11 +3897,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Oznacz Nieobecna
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Wiersz {0}: Waluta BOM # {1} powinna być równa wybranej walucie {2}
 DocType: Journal Entry Account,Exchange Rate,Kurs wymiany
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,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 +555,Sales Order {0} is not submitted,Zlecenie Sprzedaży {0} nie jest jeszcze złożone
 DocType: Homepage,Tag Line,tag Linia
 DocType: Fee Component,Fee Component,opłata Komponent
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Dodaj elementy z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Dodaj elementy z
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,Regularny
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Razem weightage wszystkich kryteriów oceny muszą być w 100%
@@ -3909,7 +3914,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazyn {0} nie istnieje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Zarejestruj Dla Hubu ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Miesięczne Procenty Dystrybucja
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Wybrany element nie może mieć Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Wybrany element nie może mieć Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopa wycena nie znaleziono Item {0}, który jest zobowiązany do zapisów księgowych dla {1} {2}. Jeśli pozycja jest transakcje jako elementu próbki w {1}, należy wspomnieć, że w {1} tabeli poz. W przeciwnym razie, należy utworzyć połączenie przychodzące transakcję akcji na artykuł lub wzmianka kursu wyceny w rekordzie element, a następnie spróbuj wysłaniem / anulowanie tego wpisu"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiałów dostarczonych w stosunku do dowodu dostawy
 DocType: Project,Customer Details,Dane Klienta
@@ -3918,15 +3923,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Wpisz URL dla odbiorcy numeru
 DocType: Payment Entry,Paid Amount,Zapłacona kwota
 DocType: Assessment Plan,Supervisor,Kierownik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,online
 ,Available Stock for Packing Items,Dostępne ilości dla materiałów opakunkowych
 DocType: Item Variant,Item Variant,Pozycja Wersja
 DocType: Assessment Result Tool,Assessment Result Tool,Wynik oceny Narzędzie
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Złom Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Złożone zlecenia nie mogą zostać usunięte
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Konto jest na minusie, nie możesz ustawić wymagań jako kredyt."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Zarządzanie jakością
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Element {0} została wyłączona
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Element {0} została wyłączona
 DocType: Employee Loan,Repay Fixed Amount per Period,Spłacić ustaloną kwotę za okres
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Wprowadź ilość dla przedmiotu {0}
 DocType: Employee External Work History,Employee External Work History,Historia zatrudnienia pracownika poza firmą
@@ -3953,7 +3958,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student ID email
 DocType: Employee,Notice (days),Wymówienie (dni)
 DocType: Tax Rule,Sales Tax Template,Szablon Podatek od sprzedaży
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Wybierz elementy, aby zapisać fakturę"
 DocType: Employee,Encashment Date,Data Inkaso
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Korekta
@@ -3977,7 +3982,7 @@
 DocType: Item Variant Attribute,Attribute,Atrybut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Proszę określić zakres od/do
 DocType: Serial No,Under AMC,Pod AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilość kupon wylądował
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Jednostkowy wskaźnik wyceny przeliczone z uwzględnieniem kosztów ilość kupon wylądował
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Domyślne ustawienia dla transakcji sprzedaży
 DocType: Guardian,Guardian Of ,Strażnik
 DocType: Grading Scale Interval,Threshold,Próg
@@ -3987,6 +3992,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nocie debetowej
 DocType: Production Order,Warehouses,Magazyny
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} zasób nie może zostać przetransferowany
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ta pozycja jest wariantem {0} (szablon).
 DocType: Workstation,per hour,na godzinę
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Nabywczy
 DocType: Announcement,Announcement,Ogłoszenie
@@ -4002,8 +4008,8 @@
 DocType: Account,Receivable,Należności
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Wiersz # {0}: Nie wolno zmienić dostawcę, jak już istnieje Zamówienie"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Rola pozwala na zatwierdzenie transakcji, których kwoty przekraczają ustalone limity kredytowe."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Wybierz produkty do Manufacture
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Wybierz produkty do Manufacture
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Mistrz synchronizacja danych, może to zająć trochę czasu"
 DocType: Item,Material Issue,Wydanie materiałów
 DocType: Hub Settings,Seller Description,Sprzedawca Opis
 DocType: Employee Education,Qualification,Kwalifikacja
@@ -4015,7 +4021,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Zamówione
 DocType: Salary Detail,Component,Składnik
 DocType: Assessment Criteria,Assessment Criteria Group,Kryteria oceny grupowej
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otwarcie Skumulowana amortyzacja powinna być mniejsza niż równa {0}
 DocType: Warehouse,Warehouse Name,Nazwa magazynu
 DocType: Naming Series,Select Transaction,Wybierz Transakcję
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Proszę wprowadzić Rolę osoby zatwierdzającej dla użytkownika zatwierdzającego
@@ -4028,7 +4034,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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","Tutaj wypełnij i przechowaj dane takie jak wzrost, waga, alergie, problemy medyczne itd"
 DocType: Leave Block List,Applies to Company,Dotyczy Firmy
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nie można anulować, ponieważ wskazane Wprowadzenie na magazyn {0} istnieje"
 DocType: Employee Loan,Disbursement Date,wypłata Data
 DocType: Vehicle,Vehicle,Pojazd
 DocType: Purchase Invoice,In Words,Słownie
@@ -4043,14 +4049,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / ołów%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Aktywów Amortyzacja i salda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},"Kwota {0} {1} przeniesione z {2} {3}, aby"
 DocType: Sales Invoice,Get Advances Received,Uzyskaj otrzymane zaliczki
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Usuń odbiorców
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Aby ustawić ten rok finansowy jako domyślny, kliknij przycisk ""Ustaw jako domyślne"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,łączyć
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Niedobór szt
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Pozycja wariant {0} istnieje z samymi atrybutami
 DocType: Employee Loan,Repay from Salary,Spłaty z pensji
 DocType: Leave Application,LAP/,LAP/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Żądanie zapłatę przed {0} {1} w ilości {2}
@@ -4068,7 +4074,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Wynik oceny Szczegóły
 DocType: Employee Education,Employee Education,Wykształcenie pracownika
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplikat grupę pozycji w tabeli grupy produktów
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Jest to niezbędne, aby pobrać szczegółowe dotyczące pozycji."
 DocType: Salary Slip,Net Pay,Stawka Netto
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nr seryjny {0} otrzymano
@@ -4077,7 +4083,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazyn {0} nie jest powiązany z żadnym kontem, tworzyć / odwołuje się odpowiedni (aktywo) konto na magazynie."
 DocType: Purchase Invoice,Recurring Id,Powtarzające się ID
 DocType: Customer,Sales Team Details,Szczegóły dotyczące Teamu Sprzedażowego
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Usuń na stałe?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Usuń na stałe?
 DocType: Expense Claim,Total Claimed Amount,Całkowita kwota roszczeń
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencjalne szanse na sprzedaż.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Nieprawidłowy {0}
@@ -4088,13 +4094,14 @@
 DocType: Warehouse,PIN,KOŁEK
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Konfiguracja swoją szkołę w ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Kwota bazowa Change (Spółka waluty)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Brak zapisów księgowych dla następujących magazynów
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Zapisz dokument jako pierwszy.
 DocType: Account,Chargeable,Odpowedni do pobierania opłaty.
 DocType: Company,Change Abbreviation,Zmień Skrót
 DocType: Expense Claim Detail,Expense Date,Data wydatku
 DocType: Item,Max Discount (%),Maksymalny rabat (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Kwota ostatniego zamówienia
+DocType: Task,Is Milestone,Jest Milestone
 DocType: Daily Work Summary,Email Sent To,Email wysłany do
 DocType: Budget,Warn,Ostrzeż
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Wszelkie inne uwagi, zauważyć, że powinien iść nakładu w ewidencji."
@@ -4115,7 +4122,7 @@
 DocType: Item Attribute Value,Attribute Value,Wartość atrybutu
 ,Itemwise Recommended Reorder Level,Pozycja Zalecany poziom powtórnego zamówienia
 DocType: Salary Detail,Salary Detail,Wynagrodzenie Szczegóły
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Proszę najpierw wybrać {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Proszę najpierw wybrać {0}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} pozycji {1} wygasł.
 DocType: Sales Invoice,Commission,Prowizja
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Arkusz Czas produkcji.
@@ -4127,41 +4134,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,Zapasy starsze niż' powinny być starczyć na %d dni
 DocType: Tax Rule,Purchase Tax Template,Szablon podatkowy zakupów
 ,Project wise Stock Tracking,
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plan Konserwacji {0} występuje przeciw {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Rzeczywista Ilość (u źródła/celu)
 DocType: Item Customer Detail,Ref Code,Ref kod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Rekordy pracownika.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Proszę ustawić Następny Amortyzacja Data
 DocType: HR Settings,Payroll Settings,Ustawienia Listy Płac
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Łączenie faktur z płatnościami
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Złóż zamówienie
 DocType: Email Digest,New Purchase Orders,
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root nie może mieć rodzica w centrum kosztów
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Wybierz markę ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Wybierz markę ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Skumulowana amortyzacja jak na
 DocType: Sales Invoice,C-Form Applicable,
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Czas działania musi być większy niż 0 do operacji {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazyn jest obowiązkowe
 DocType: Supplier,Address and Contacts,Adres i Kontakt
 DocType: UOM Conversion Detail,UOM Conversion Detail,Szczegóły konwersji jednostki miary
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Staraj się być przyjazny dla WWW 900px (szerokość) na 100px (wysokość)
 DocType: Program,Program Abbreviation,Skrót programu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produkcja Zamówienie nie może zostać podniesiona przed Szablon Element
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Opłaty są aktualizowane w ZAKUPU każdej pozycji
 DocType: Warranty Claim,Resolved By,Rozstrzygnięte przez
 DocType: Bank Guarantee,Start Date,Data startu
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Przydziel zwolnienia dla tego okresu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Czeki i Depozyty nieprawidłowo rozliczone
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Tworzenie cytaty z klientami
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Tworzenie cytaty z klientami
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Pokazuj ""W magazynie"" lub ""Brak w magazynie"" bazując na ilości dostępnej w tym magazynie."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Zestawienie materiałowe (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Średni czas podjęte przez dostawcę do dostarczenia
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Wynik oceny
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Godziny
 DocType: Project,Expected Start Date,Spodziewana data startowa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Usuń element, jeśli opłata nie ma zastosowania do tej pozycji"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,"Waluta transakcji musi być taka sama, jak waluta wybranej płatności"
 DocType: Payment Entry,Receive,Odbierać
@@ -4172,19 +4178,19 @@
 DocType: Workstation,Operating Costs,Koszty operacyjne
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Działanie w przypadku nagromadzonych miesięcznego budżetu Przekroczono
 DocType: Purchase Invoice,Submit on creation,Prześlij na tworzeniu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Waluta dla {0} musi być {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Waluta dla {0} musi być {1}
 DocType: Asset,Disposal Date,Utylizacja Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Emaile zostaną wysłane do wszystkich aktywnych pracowników Spółki w danej godzinie, jeśli nie mają wakacji. Streszczenie odpowiedzi będą wysyłane na północy."
 DocType: Employee Leave Approver,Employee Leave Approver,Zgoda na zwolnienie dla pracownika
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},"Wiersz {0}: Zapis ponownego zamawiania dla tego magazynu, {1}"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",Nie można zadeklarować jako zagubiony z powodu utworzenia kwotacji
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Szkolenie Zgłoszenie
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Zamówienie Produkcji {0} musi być zgłoszone
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Wybierz Datę Startu i Zakończenia dla elementu {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kurs jest obowiązkowy w wierszu {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,"""Do daty"" nie może być terminem przed ""od daty"""
 DocType: Supplier Quotation Item,Prevdoc DocType,Typ dokumentu dla poprzedniego dokumentu
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Edytuj ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Edytuj ceny
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Batch,Parent Batch,Nadrzędna partia
 DocType: Cheque Print Template,Cheque Print Template,Czek Szablon Drukuj
@@ -4198,7 +4204,7 @@
 ,Ordered Items To Be Delivered,Zamówione produkty do dostarczenia
 DocType: Account,Income,Przychody
 DocType: Industry Type,Industry Type,Typ Przedsiębiorstwa
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Coś poszło nie tak!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Coś poszło nie tak!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Faktura Sprzedaży {0} została już wprowadzona
 DocType: Assessment Result Detail,Score,Wynik
@@ -4229,17 +4235,17 @@
 DocType: Item,Variant Based On,Wariant na podstawie
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Całkowita przypisana waga powinna wynosić 100%. Jest {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Twoi Dostawcy
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Nie można ustawić jako Utracone Zamówienia Sprzedaży
 DocType: Request for Quotation Item,Supplier Part No,Dostawca Część nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Otrzymane od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nie można odliczyć, gdy kategoria jest dla &#39;Wycena&#39; lub &#39;Vaulation i Total&#39;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Otrzymane od
 DocType: Lead,Converted,Przekształcono
 DocType: Item,Has Serial No,Posiada numer seryjny
 DocType: Employee,Date of Issue,Data wydania
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Wiersz # {0}: Ustaw Dostawca dla pozycji {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Wiersz {0}: Godziny wartość musi być większa od zera.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,Website Image {0} attached to Item {1} cannot be found,Strona Obraz {0} dołączone do pozycji {1} nie można znaleźć
 DocType: Issue,Content Type,Typ zawartości
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Komputer
 DocType: Item,List this Item in multiple groups on the website.,Pokaż ten produkt w wielu grupach na stronie internetowej.
@@ -4248,20 +4254,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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 daty faktury
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Walutą Rozliczenia musi być równa lub rachunku walutowego waluty dowolnej ze stron domyślnego comapany za
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Zostawić Inkaso
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Czym się zajmuje?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do magazynu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Wszystkie Przyjęć studenckie
 ,Average Commission Rate,Średnia prowizja
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Obecność nie może być oznaczana na przyszłość
 DocType: Pricing Rule,Pricing Rule Help,Wycena Zasada Pomoc
 DocType: School House,House Name,Nazwa domu
 DocType: Purchase Taxes and Charges,Account Head,Konto główne
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektryczne
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodać resztę organizacji jako użytkowników. Można również dodać zaprosić klientów do portalu dodając je z Kontaktów
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodać resztę organizacji jako użytkowników. Można również dodać zaprosić klientów do portalu dodając je z Kontaktów
 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 +348,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}
@@ -4270,7 +4276,7 @@
 DocType: Item,Customer Code,Kod Klienta
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Przypomnienie o Urodzinach dla {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od ostatniego zamówienia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Debetowane konto musi być kontem bilansowym
 DocType: Buying Settings,Naming Series,Seria nazw
 DocType: Leave Block List,Leave Block List Name,Opuść Zablokowaną Listę Nazw
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Data rozpoczęcia ubezpieczenia powinna być mniejsza niż data zakończenia ubezpieczenia
@@ -4285,9 +4291,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Slip Wynagrodzenie pracownika {0} już stworzony dla arkusza czasu {1}
 DocType: Vehicle Log,Odometer,Drogomierz
 DocType: Sales Order Item,Ordered Qty,Ilość Zamówiona
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Element {0} jest wyłączony
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Element {0} jest wyłączony
 DocType: Stock Settings,Stock Frozen Upto,Zamroź zapasy do
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nie zawiera żadnego elementu akcji
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Czynność / zadanie projektu
 DocType: Vehicle Log,Refuelling Details,Szczegóły tankowania
@@ -4297,8 +4303,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Ostatni kurs kupna nie został znaleziony
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Kwota Odpisu (Waluta Firmy)
 DocType: Sales Invoice Timesheet,Billing Hours,Godziny billingowe
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Domyślnie BOM dla {0} Nie znaleziono
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Wiersz # {0}: Proszę ustawić ilość zmienić kolejność
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotknij elementów, aby je dodać tutaj"
 DocType: Fees,Program Enrollment,Rejestracja w programie
 DocType: Landed Cost Voucher,Landed Cost Voucher,Koszt kuponu
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ustaw {0}
@@ -4322,7 +4329,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data Konserwacji
 DocType: Purchase Invoice Item,Rejected Serial No,Odrzucony Nr Seryjny
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,data rozpoczęcia roku lub data końca pokrywa się z {0}. Aby uniknąć należy ustawić firmę
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data startu powinna być niższa od daty końca dla {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data startu powinna być niższa od daty końca dla {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.","Przykład:. ABCD ##### 
  Jeśli seria jest ustawiona i nr seryjny nie jest wymieniony w transakcjach, automatyczny numer seryjny zostanie utworzony na podstawie tej serii. Jeśli chcesz zawsze jednoznacznie ustawiać numery seryjne dla tej pozycji, pozostaw to pole puste."
@@ -4400,7 +4407,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Hurt i Detal
 DocType: Issue,First Responded On,Data pierwszej odpowiedzi
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Krzyż Notowania pozycji w wielu grupach
-DocType: Grade Interval,Grade Interval,Stopień Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Rok obrotowy Data rozpoczęcia i Data zakończenia roku obrotowego są już ustawione w roku podatkowym {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Rozliczenie Data aktualizacji
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Podział partii
@@ -4447,14 +4453,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Opuść zaznaczenie, jeśli nie chcesz rozważyć partii przy jednoczesnym tworzeniu grup kursów."
 DocType: Asset,Frequency of Depreciation (Months),Częstotliwość Amortyzacja (miesiące)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Konto kredytowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Konto kredytowe
 DocType: Landed Cost Item,Landed Cost Item,Koszt Przedmiotu
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Konfiguracja prosta strona mojej organizacji
 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 +666,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Proszę podać wartość atrybutu dla atrybutu {0}
 DocType: Item,Default Warehouse,Domyślny magazyn
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budżet nie może być przypisany do rachunku grupy {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Proszę podać nadrzędne centrum kosztów
@@ -4500,7 +4506,7 @@
 DocType: Opportunity Item,Basic Rate,Podstawowy wskaźnik
 DocType: GL Entry,Credit Amount,Kwota kredytu
 DocType: Cheque Print Template,Signatory Position,Sygnatariusz Pozycja
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Ustaw jako utracony
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Ustaw jako utracony
 DocType: Timesheet,Total Billable Hours,Całkowita liczba godzin rozliczanych
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Otrzymanie płatności Uwaga
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Jest to oparte na operacjach przeciwko tym Klienta. Zobacz harmonogram poniżej w szczegółach
@@ -4514,11 +4520,11 @@
 ,Items To Be Requested,
 DocType: Purchase Order,Get Last Purchase Rate,Uzyskaj stawkę z ostatniego zakupu
 DocType: Company,Company Info,Informacje o firmie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Wybierz lub dodaj nowego klienta
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Wybierz lub dodaj nowego klienta
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,centrum kosztów jest zobowiązany do zwrotu kosztów rezerwacji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aktywa
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Jest to oparte na obecności pracownika
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Konto debetowe
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4527,13 +4533,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Zatrzymaj możliwość składania zwolnienia chorobowego użytkownikom w następujące dni.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Kwota zakupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dostawca notowań {0} tworzone
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Koniec roku nie może być przed rozpoczęciem Roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Świadczenia pracownicze
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Wartość spakowana musi równać się ilości dla przedmiotu {0} w rzędzie {1}
 DocType: Production Order,Manufactured Qty,Ilość wyprodukowanych
 DocType: Purchase Receipt Item,Accepted Quantity,Przyjęta Ilość
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Proszę ustawić domyślnej listy wypoczynkowe dla pracowników {0} lub {1} firmy
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nie istnieje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nie istnieje
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Wiersz nr {0}: Kwota nie może być większa niż oczekiwaniu Kwota wobec Kosztów zastrzeżenia {1}. W oczekiwaniu Kwota jest {2}
@@ -4542,15 +4548,17 @@
 DocType: Quality Inspection Reading,Reading 3,Odczyt 3
 ,Hub,Piasta
 DocType: GL Entry,Voucher Type,Typ Podstawy
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Cennik nie został znaleziony lub wyłączone
 DocType: Employee Loan Application,Approved,Zatwierdzono
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',pracownik zwalnia się na {0} musi być ustawiony jako 'opuścił'
 DocType: Guardian,Guardian,Opiekun
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Ocena {0} utworzona dla Pracownika {1} w datach od-do
 DocType: Employee,Education,Edukacja
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nazwa Kampanii Przez
 DocType: Employee,Current Address Is,Obecny adres to
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Zmodyfikowano
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcjonalny. Ustawia domyślną walutę firmy, jeśli nie podano."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Dziennik zapisów księgowych.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Dostępne szt co z magazynu
@@ -4559,7 +4567,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Wiersz {0}: Party / konto nie jest zgodny z {1} / {2} w {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Wprowadź konto Wydatków
 DocType: Account,Stock,Magazyn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Wiersz # {0}: Reference Document Type musi być jednym z Zamówieniem, faktura zakupu lub Journal Entry"
 DocType: Employee,Current Address,Obecny adres
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Jeśli pozycja jest wariant innego elementu, a następnie opis, zdjęcia, ceny, podatki itp zostanie ustalony z szablonu, o ile nie określono wyraźnie"
 DocType: Serial No,Purchase / Manufacture Details,Szczegóły Zakupu / Produkcji
@@ -4587,7 +4595,7 @@
 DocType: Hub Settings,Hub Settings,Ustawienia Hub
 DocType: Project,Gross Margin %,Marża brutto %
 DocType: BOM,With Operations,Wraz z działaniami
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Zapisy księgowe zostały już dokonane w walucie {0} dla firmy {1}. Proszę wybrać należności lub zobowiązania konto w walucie {0}.
 DocType: Asset,Is Existing Asset,Czy istniejącego środka trwałego
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
 DocType: Salary Detail,Statistical Component,Składnik statystyczny
@@ -4612,7 +4620,7 @@
 DocType: Assessment Plan,Room,Pokój
 DocType: Purchase Order,Advance Paid,Zaliczka
 DocType: Item,Item Tax,Podatek dla tej pozycji
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiał do Dostawcy
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiał do Dostawcy
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Akcyza Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Próg {0}% występuje więcej niż jeden raz
 DocType: Expense Claim,Employees Email Id,Email ID pracownika
@@ -4643,9 +4651,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Załącz Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Poziom zapasów
 DocType: Customer,Commission Rate,Wartość prowizji
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Bądź Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Bądź Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Zablokuj wnioski urlopowe według departamentów
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ płatności musi być jednym z Odbierz Pay and przelew wewnętrzny
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ płatności musi być jednym z Odbierz Pay and przelew wewnętrzny
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analityka
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Koszyk jest pusty
 DocType: Vehicle,Model,Model
@@ -4656,6 +4664,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapitał zakładowy
+DocType: Shopping Cart Settings,Show Public Attachments,Pokaż załączniki publiczne
 DocType: Packing Slip,Package Weight Details,Informacje o wadze paczki
 DocType: Payment Gateway Account,Payment Gateway Account,Płatność konto Brama
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokonaniu płatności przekierować użytkownika do wybranej strony.
@@ -4674,15 +4683,15 @@
 DocType: Batch,Expiry Date,Data ważności
 ,Supplier Addresses and Contacts,Adresy i kontakty dostawcy
 ,accounts-browser,Rachunki przeglądarkami
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Proszę najpierw wybrać kategorię
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Proszę najpierw wybrać kategorię
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Dyrektor projektu
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Aby umożliwić over-fakturowania lub zbyt zamawiającego, update &quot;dodatek&quot; w ustawieniach zasobu lub elementu."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Nie pokazuj żadnych symboli przy walutach, takich jak $"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pół dnia)
 DocType: Supplier,Credit Days,
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Bądź Batch Studenta
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Bądź Batch Studenta
 DocType: Leave Type,Is Carry Forward,
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Weź produkty z zestawienia materiałowego
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Weź produkty z zestawienia materiałowego
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Czas realizacji (dni)
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Wiersz # {0}: Data księgowania musi być taka sama jak data zakupu {1} z {2} aktywów
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Proszę podać zleceń sprzedaży w powyższej tabeli
@@ -4699,8 +4708,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Zatwierdzona Kwota
 DocType: GL Entry,Is Opening,Otwiera się
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Wiersz {0}: Debit wpis nie może być związana z {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Proszę skonfigurować serie numeracyjne dla uczestnictwa w programie Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Konto {0} nie istnieje
 DocType: Account,Cash,Gotówka
 DocType: Employee,Short biography for website and other publications.,Krótka notka na stronę i do innych publikacji
diff --git a/erpnext/translations/ps.csv b/erpnext/translations/ps.csv
index 1a679ae..05f9504 100644
--- a/erpnext/translations/ps.csv
+++ b/erpnext/translations/ps.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,د کشت
 DocType: Purchase Order,PO-,تبديليږي
 DocType: POS Profile,Applicable for User,د کارن د تطبيق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ودرول تولید نظم نه لغوه شي کولای، نو دا د لومړي Unstop لغوه
 DocType: Vehicle Service,Mileage,ګټه
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,آيا تاسو په رښتيا غواړئ چې دا شتمني راټولوي؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,انتخاب Default عرضه
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,انتخاب Default عرضه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},د اسعارو د بیې په لېست کې د اړتیا {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* به په راکړې ورکړې محاسبه شي.
 DocType: Purchase Order,Customer Contact,پيرودونکو سره اړيکي
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بيالنس د {0} کولای شي او نه د صفر څخه کم ({1})
 DocType: Manufacturing Settings,Default 10 mins,افتراضي 10 دقیقه
 DocType: Leave Type,Leave Type Name,پريږدئ ډول نوم
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,وښایاست خلاص
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,وښایاست خلاص
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,لړۍ Updated په بریالیتوب
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,بشپړ ی وګوره
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ژورنال انفاذ ته وسپارل
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,دسته شمیره د پای حالت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,بانک مسوده
 DocType: Mode of Payment Account,Mode of Payment Account,د تادیاتو حساب اکر
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,انکړپټه ښودل تانبه
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,انکړپټه ښودل تانبه
 DocType: Academic Term,Academic Term,علمي مهاله
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,د مادي
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,کمیت
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,کمیت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,جوړوي جدول نه خالي وي.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),پورونه (مسؤلیتونه)
 DocType: Employee Education,Year of Passing,د تصویب کال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",ماخذ:٪ s، د قالب کود:٪ s او پيرودونکو:٪ s
 DocType: Item,Country of Origin,د استوګنی اصلی ځای
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,په ګدام کښي
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,د پرانیستې مسایل
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,روغتیایی پاملرنه
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),د ځنډ په پیسو (ورځې)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,خدمتونو د اخراجاتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,صورتحساب
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},مسلسله شمېره: {0} د مخکې نه په خرڅلاو صورتحساب ماخذ: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,صورتحساب
 DocType: Maintenance Schedule Item,Periodicity,Periodicity
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالي کال د {0} ته اړتیا لیدل کیږي
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,د تمی د سپارلو نېټه ده مخکې خرڅلاو نظم نېټه وي
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",سره دوه ستنې، یو زوړ نوم لپاره او يوه د نوي نوم لپاره .csv دوتنې سره ضمیمه
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} د {1} په هر فعال مالي کال نه.
 DocType: Packed Item,Parent Detail docname,Parent تفصیلي docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ماخذ: {0}، شمیره کوډ: {1} او پيرودونکو: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,کيلوګرام
 DocType: Student Log,Log,يادښت
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,د دنده پرانيستل.
 DocType: Item Attribute,Increment,بهرمن
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,وټاکئ ګدام ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,وټاکئ ګدام ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,د اعلاناتو
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,همدې شرکت څخه یو ځل بیا ننوتل
 DocType: Employee,Married,واده
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},لپاره نه اجازه {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,له توکي ترلاسه کړئ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},لپاره نه اجازه {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,له توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},دحمل د سپارنې يادونه په وړاندې د تازه نه شي {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},د محصول د {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,هیڅ توکي لست
 DocType: Payment Reconciliation,Reconcile,پخلا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,دغذا
 DocType: Quality Inspection Reading,Reading 1,لوستلو 1
 DocType: Process Payroll,Make Bank Entry,بانک د انفاذ د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,د تقاعد د بسپنو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,بل د استهالک نېټه مخکې رانيول نېټه نه شي
 DocType: SMS Center,All Sales Person,ټول خرڅلاو شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** میاشتنی ویش ** تاسو سره مرسته کوي که تاسو د خپل کاروبار د موسمي لري د بودجې د / د هدف په ټول مياشتو وویشي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,نه توکي موندل
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,نه توکي موندل
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,معاش جوړښت ورک
 DocType: Lead,Person Name,کس نوم
 DocType: Sales Invoice Item,Sales Invoice Item,خرڅلاو صورتحساب د قالب
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",د بيلګې په توګه: &quot;لومړنی ښوونځی&quot; یا &quot;پوهنتون&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,دحمل راپورونه
 DocType: Warehouse,Warehouse Detail,ګدام تفصیلي
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},پورونو د حد لپاره د مشتريانو د اوښتي دي {0} د {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,د دورې د پای نیټه نه وروسته د کال د پای د تعليمي کال د نېټه چې د اصطلاح ده سره تړاو لري په پرتله وي (تعليمي کال د {}). لطفا د خرما د اصلاح او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;آیا ثابته شتمني&quot; کولای وناکتل نه وي، ځکه چې د توکي په وړاندې د شتمنیو د ثبت شتون لري
 DocType: Vehicle Service,Brake Oil,لنت ترمز د تیلو
 DocType: Tax Rule,Tax Type,د مالياتو ډول
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تاسو اختيار نه لري چې مخکې ثبت کرښې زیاتولی او یا تازه {0}
 DocType: BOM,Item Image (if not slideshow),د قالب د انځور (که سلاید نه)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,د پيرودونکو سره په همدې نوم شتون لري
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(قيامت Rate / 60) * د عملیاتو د وخت
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,انتخاب هیښ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,انتخاب هیښ
 DocType: SMS Log,SMS Log,SMS ننوتنه
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,د تحویلوونکی سامان لګښت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,د {0} د رخصتۍ له تاريخ او د تاريخ تر منځ نه ده
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,د ښوونځيو
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},نه رخصت شی پيدا نشول لپاره کارکوونکي {0} د {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,مهرباني وکړئ لومړی شرکت ته ننوځي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,مهرباني غوره شرکت لومړۍ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ټولیز لګښت،
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,ادعا مقدار
 DocType: Employee,Mr,ښاغلی
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,دوه ګونو مشتريانو د ډلې په cutomer ډلې جدول کې وموندل
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,عرضه ډول / عرضه
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,عرضه ډول / عرضه
 DocType: Naming Series,Prefix,هغه مختاړی
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,د مصرف
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,ټولګي
 DocType: Sales Invoice Item,Delivered By Supplier,تحویلوونکی By عرضه
 DocType: SMS Center,All Contact,ټول سره اړيکي
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,تولید نظم لا سره د هیښ ټول توکي جوړ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,کلنی معاش
 DocType: Daily Work Summary,Daily Work Summary,هره ورځ د کار لنډیز
 DocType: Period Closing Voucher,Closing Fiscal Year,مالي کال تړل
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} د {1} ده کنګل
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} د {1} ده کنګل
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,لورينه وکړئ د د حسابونو چارټ جوړولو موجوده شرکت وټاکئ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,دحمل داخراجاتو
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,وټاکئ هدف ګدام
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra انفاذ
 DocType: Journal Entry Account,Credit in Company Currency,په شرکت د پیسو د اعتبار
 DocType: Delivery Note,Installation Status,نصب او وضعیت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",تاسو غواړئ چې د حاضرۍ د اوسمهالولو؟ <br> اوسنی: {0} \ <br> حاضر: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},منل + رد Qty باید د قالب برابر رارسيدلي مقدار وي {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,رسولو لپاره خام توکي د رانيول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,د پیسو تر لږه یوه اکر لپاره POS صورتحساب ته اړتيا لري.
 DocType: Products Settings,Show Products as a List,انکړپټه ښودل محصوالت په توګه بشپړفهرست
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",دانلود د کينډۍ، د مناسبو معلوماتو د ډکولو او د دوتنه کې ضمیمه کړي. د ټاکل شوې مودې په ټولو نیټې او کارمند ترکیب به په کېنډۍ کې راغلي، د موجوده حاضري سوابق
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,د استهالک د داخلولو د کمکیانو لپاره
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,غوښتنه ډول
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,د کارګر د کمکیانو لپاره
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,د کارګر د کمکیانو لپاره
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,د اجرا
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,د عملیاتو په بشپړه توګه کتل ترسره.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,د ساتنې کتنو پلان.
 DocType: SMS Settings,Enter url parameter for message,د پیغام url عوامل وليکئ
 DocType: POS Profile,Customer Groups,پيرودونکو ډلې
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,مالي بیانونه
 DocType: Guardian,Students,زده کوونکي
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,لپاره درخواست قیمتونو او د تخفیف اصول.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,د بیې په لېست باید د شځينه يا خرڅول د تطبيق وړ وي
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},پرمختللی اندازه نه شي کولای څخه ډيره وي {0} د {1}
 DocType: Naming Series,Series List for this Transaction,د دې پیسو د انتقال د لړۍ بشپړفهرست
 DocType: Company,Default Payroll Payable Account,Default د معاشاتو د راتلوونکې حساب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,تازه بريښناليک ګروپ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,تازه بريښناليک ګروپ
 DocType: Sales Invoice,Is Opening Entry,ده انفاذ پرانيستل
 DocType: Customer Group,Mention if non-standard receivable account applicable,یادونه که غیر معیاري ترلاسه حساب د تطبيق وړ
 DocType: Course Schedule,Instructor Name,د لارښوونکي نوم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,د ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,د پلورنې
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",که وکتل، به په مادي غوښتنې غیر سټاک توکي شامل دي.
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,په وړاندې د خرڅلاو صورتحساب د قالب
 ,Production Orders in Progress,په پرمختګ تولید امر
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,له مالي خالص د نغدو
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",LocalStorage ډک شي، نه د ژغورلو نه
 DocType: Lead,Address & Contact,پته تماس
 DocType: Leave Allocation,Add unused leaves from previous allocations,د تیرو تخصیص ناکارول پاڼي ورزیات کړئ
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},بل د راګرځېدل {0} به جوړ شي {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total لګښت مقدار (د وخت پاڼه له لارې)
 DocType: Item Website Specification,Item Website Specification,د قالب د ځانګړتیاوو وېب پاڼه
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,د وتو بنديز لګېدلی
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,بانک توکي
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},{0} د قالب په خپلو د ژوند پای ته ورسېدئ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,بانک توکي
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,کلنی
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,دحمل پخلاينې د قالب
 DocType: Stock Entry,Sales Invoice No,خرڅلاو صورتحساب نه
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,په مرکز د خپرېدو
 DocType: Student Admission,Student Admission,د زده کونکو د شاملیدو
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} د قالب دی لغوه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,د موادو غوښتنه
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} د قالب دی لغوه
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,د موادو غوښتنه
 DocType: Bank Reconciliation,Update Clearance Date,تازه چاڼېزو نېټه
 DocType: Item,Purchase Details,رانيول نورولوله
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},د قالب {0} په خام مواد &#39;جدول په اخستلو امر ونه موندل {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بيالنس Cheques او سپما او پاکول
 DocType: Item,Synced With Hub,دفارسی د مرکزي
 DocType: Vehicle,Fleet Manager,د بیړیو د مدير
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,غلط شفر
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},د کتارونو تر # {0}: {1} نه شي لپاره توکی منفي وي {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,غلط شفر
 DocType: Item,Variant Of,د variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',بشپړ Qty نه شي کولای په پرتله &#39;Qty تولید&#39; وي
 DocType: Period Closing Voucher,Closing Account Head,حساب مشر تړل
 DocType: Employee,External Work History,بهرني کار تاریخ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,متحدالمال ماخذ کې تېروتنه
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,د اتومات د موادو غوښتنه رامنځته کېدو له امله دبرېښنا ليک خبر
 DocType: Journal Entry,Multi Currency,څو د اسعارو
 DocType: Payment Reconciliation Invoice,Invoice Type,صورتحساب ډول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,د سپارنې پرمهال یادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,د سپارنې پرمهال یادونه
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,مالیات ترتیبول
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,د شتمنيو د دلال لګښت
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,د پیسو د داخلولو بدل شوی دی وروسته کش تاسو دا. دا بیا لطفا وباسي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
-DocType: Grade Interval,Min Score,Min نمره
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} په قالب د مالياتو د دوه ځله ننوتل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,لنډيز دې اوونۍ او په تمه د فعالیتونو لپاره
 DocType: Student Applicant,Admitted,اعتراف وکړ
 DocType: Workstation,Rent Cost,د کرايې لګښت
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,نظم ارزښت
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,بانک / د نقدو پیسو د ګوند پر وړاندې او یا د داخلي د لیږد لپاره د معاملو
 DocType: Shipping Rule,Valid for Countries,لپاره د اعتبار وړ هیوادونه
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,دا د قالب يو کينډۍ ده او په معاملو کې نه شي کارېدلی. د قالب صفاتو به د بېرغونو کې کاپي شي، مګر نه کاپي &#39;ټاکل شوې ده
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total نظم نیول کیږی
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",د کارګر ونومول شي (لکه د اجرايي، رييس او داسې نور).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,لطفا ډګر ارزښت &#39;د مياشتې په ورځ تکرار&#39;
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},د کتارونو تر # {0}: رانيول صورتحساب د شته شتمنیو په وړاندې نه شي کولای شي د {1}
 DocType: Item Tax,Tax Rate,د مالياتو د Rate
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} لپاره د کارګر لا ځانګړې {1} لپاره موده {2} د {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,انتخاب د قالب
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,انتخاب د قالب
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,پیري صورتحساب {0} لا وسپارل
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},د کتارونو تر # {0}: دسته نه باید ورته وي {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,د غیر ګروپ ته واړوئ
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,دسته (ډېر) د یو قالب.
 DocType: C-Form Invoice Detail,Invoice Date,صورتحساب نېټه
 DocType: GL Entry,Debit Amount,ډیبیټ مقدار
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},هلته يوازې کولای شي په هر شرکت 1 حساب وي {0} د {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,مهرباني مل وګورئ
 DocType: Purchase Order,% Received,٪ د ترلاسه
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,د زده کونکو د ډلو جوړول
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,لپاره د داوطلبۍ غوښتنه
 DocType: Salary Slip Timesheet,Working Hours,کار ساعتونه
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,د پیل / اوسني تسلسل کې د شته لړ شمېر کې بدلون راولي.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,یو نوی پيرودونکو جوړول
-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.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,رانيول امر جوړول
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,یو نوی پيرودونکو جوړول
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",که څو د بیو د اصولو دوام پراخیدل، د کاروونکو څخه پوښتنه کيږي چي د لومړیتوب ټاکل لاسي د شخړې حل کړي.
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,رانيول امر جوړول
 ,Purchase Register,رانيول د نوم ثبتول
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,د تطبيق په تور
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) باید رول لري &#39;اجازه Approver&#39;
 DocType: Purchase Receipt,Vehicle Date,موټر نېټه
 DocType: Student Log,Medical,د طب
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,د له لاسه ورکولو لامل
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,د له لاسه ورکولو لامل
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,سرب د خاوند نه شي کولی چې په غاړه په توګه ورته وي
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ځانګړې اندازه کولای بوختوکارګرانو مقدار څخه زياته نه
 DocType: Announcement,Receiver,د اخيستونکي
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,کمیت او Rate
 DocType: Delivery Note,% Installed,٪ ولګول شو
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,درسي / لابراتوارونو او نور هلته د لکچر کولای ټاکل شي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,مهرباني وکړئ د شرکت نوم د لومړي ننوځي
 DocType: Purchase Invoice,Supplier Name,عرضه کوونکي نوم
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,د ERPNext لارښود ادامه
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,اجباري ډګر - تعليمي کال د
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,د مقدماتي متن چې د دغې ایمیل يوې برخې په توګه ځي دتنظيمولو. هر معامله جلا مقدماتي متن لري.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},مهرباني وکړئ د شرکت لپاره د تلوالیزه د تادیې وړ ګڼون جوړ {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,د ټولو د توليد د پروسې Global امستنې.
 DocType: Accounts Settings,Accounts Frozen Upto,جوړوي ګنګل ترمړوندونو پورې
 DocType: SMS Log,Sent On,ته وليږدول د
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ځانتیا د {0} په صفات جدول څو ځلې غوره
 DocType: HR Settings,Employee record is created using selected field. ,د کارګر ریکارډ انتخاب ډګر په کارولو سره جوړ.
 DocType: Sales Order,Not Applicable,کاروړی نه دی
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,د رخصتۍ د بادار.
 DocType: Request for Quotation Item,Required Date,د اړتیا نېټه
 DocType: Delivery Note,Billing Address,دبیل پته
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,لطفا د قالب کود داخل کړي.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,لطفا د قالب کود داخل کړي.
 DocType: BOM,Costing,لګښت
 DocType: Tax Rule,Billing County,د بیلونو په County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",که وکتل، د مالیې د مقدار په پام کې به شي ځکه چې لا له وړاندې په د چاپ Rate / چاپ مقدار شامل
@@ -506,6 +510,7 @@
 DocType: Packing Slip,From Package No.,له مجموعې شمیره
 DocType: Item Attribute,To Range,ته Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,امنيت او د سپما
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",د ارزښت د میتود بدل نه شي، لکه د ځينو توکو په وړاندې د معاملو چې دا نه لري شته د خپل ارزښت د میتود
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total پاڼي تخصيص الزامی دی
 DocType: Job Opening,Description of a Job Opening,د دنده تفصيل پرانیستل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,د نن په تمه فعالیتونو
@@ -527,13 +532,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,لطفا کورس انتخاب
 DocType: Timesheet Detail,Hrs,بجو
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,مهرباني وکړئ د شرکت وټاکئ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,مهرباني وکړئ د شرکت وټاکئ
 DocType: Stock Entry Detail,Difference Account,توپير اکانټ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,نږدې دنده په توګه خپل دنده پورې تړلې {0} تړلي نه ده نه شي کولای.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,لطفا د ګدام د کوم لپاره چې د موادو غوښتنه به راپورته شي ننوځي
 DocType: Production Order,Additional Operating Cost,اضافي عملياتي لګښت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,د سينګار
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ته لېږدونه، لاندې شتمنۍ باید د دواړو توکي ورته وي
 DocType: Shipping Rule,Net Weight,خالص وزن
 DocType: Employee,Emergency Phone,بيړنۍ تيليفون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,کشاورزی
@@ -543,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,لطفا لپاره قدمه 0٪ ټولګي تعریف
 DocType: Sales Order,To Deliver,ته تحویل
 DocType: Purchase Invoice Item,Item,د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,سریال نه توکی نه شي کولای یوه برخه وي
 DocType: Journal Entry,Difference (Dr - Cr),توپير (ډاکټر - CR)
 DocType: Account,Profit and Loss,ګټه او زیان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,د اداره کولو په ټیکه
@@ -558,7 +563,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,بهرمن نه شي کولای 0 وي
 DocType: Production Planning Tool,Material Requirement,مادي غوښتنې
 DocType: Company,Delete Company Transactions,شرکت معاملې ړنګول
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ماخذ نه او ماخذ نېټه د بانک د راکړې ورکړې الزامی دی
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / سمول مالیات او په تور
 DocType: Purchase Invoice,Supplier Invoice No,عرضه صورتحساب نه
 DocType: Territory,For reference,د ماخذ
@@ -569,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,نصب او يادونه د قالب
 DocType: Production Plan Item,Pending Qty,تصویبه Qty
 DocType: Budget,Ignore,له پامه
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} د {1} فعاله نه وي
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} د {1} فعاله نه وي
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},پیغامونه د دې لاندې شمېرې ته استول: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,د چاپ Setup چک ابعادو
 DocType: Salary Slip,Salary Slip Timesheet,معاش ټوټه Timesheet
@@ -578,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Total کمیسیون
 DocType: Pricing Rule,Sales Partner,خرڅلاو همکار
 DocType: Buying Settings,Purchase Receipt Required,رانيول رسيد اړین
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,سنجي Rate فرض ده که پرانيستل دحمل ته ننوتل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,هیڅ ډول ثبتونې په صورتحساب جدول کې وموندل
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,لطفا د شرکت او د ګوند ډول لومړی انتخاب
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,د مالي / جوړوي کال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع ارزښتونه
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",بښنه غواړو، سریال وځيري نه مدغم شي
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,د کمکیانو لپاره د خرڅلاو د ترتیب پر اساس
 DocType: Project Task,Project Task,د پروژې د کاري
 ,Lead Id,سرب د Id
 DocType: C-Form Invoice Detail,Grand Total,ستره مجموعه
@@ -601,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,سوانح ضميمه
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,تکرار پېرودونکي
 DocType: Leave Control Panel,Allocate,تخصيص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,خرڅلاو Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,خرڅلاو Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوټ: ټولې اختصاص پاڼي {0} بايد نه مخکې تصویب پاڼو څخه کم وي {1} د مودې لپاره
 DocType: Announcement,Posted By,خپرندوی
 DocType: Item,Delivered by Supplier (Drop Ship),تحویلوونکی له خوا عرضه (لاسرسئ کښتۍ)
@@ -611,7 +616,7 @@
 DocType: Quotation,Quotation To,د داوطلبۍ
 DocType: Lead,Middle Income,د منځني عايداتو
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),د پرانستلو په (آر)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,د قالب اندازه Default اداره {0} نه شي په مستقيمه شي ځکه بدل مو چې ځينې راکړې ورکړې (ص) سره د یو بل UOM لا کړې. تاسو به اړ یو نوی د قالب د بل Default UOM ګټه رامنځ ته کړي.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,ځانګړې اندازه نه کېدای شي منفي وي
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,مهرباني وکړئ د شرکت جوړ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,مهرباني وکړئ د شرکت جوړ
@@ -623,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,خرڅلاو صورتحساب Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ماخذ نه &amp; ماخذ نېټه لپاره اړتیا ده {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,انتخاب د پیسو حساب ته د بانک د داخلولو لپاره
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",د پاڼو، لګښت د ادعاوو او د معاشونو د اداره کارکوونکی د اسنادو جوړول
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,د علم ورزیات کړئ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,د پروپوزل ليکلو
 DocType: Payment Entry Deduction,Payment Entry Deduction,د پیسو د داخلولو Deduction
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1} نه مالي کال په {2}
 DocType: Buying Settings,Settings for Buying Module,د شځينه ماډل امستنې
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},د شتمنیو د {0} نه شرکت سره تړاو نه لري {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,مهرباني وکړئ لومړی رانيول رسيد ننوځي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,مهرباني وکړئ لومړی رانيول رسيد ننوځي
 DocType: Buying Settings,Supplier Naming By,عرضه کوونکي نوم By
 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.",بيا د بیې اصول دي فلتر څخه پر بنسټ د پيرودونکو، پيرودونکو ګروپ، خاوره، عرضه، عرضه ډول، د کمپاین، خرڅلاو همکار او نور
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",بيا د بیې اصول دي فلتر څخه پر بنسټ د پيرودونکو، پيرودونکو ګروپ، خاوره، عرضه، عرضه ډول، د کمپاین، خرڅلاو همکار او نور
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,په موجودي خالص د بدلون
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,د کارګر د پور د مدیریت
 DocType: Employee,Passport Number,د پاسپورټ ګڼه
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,سره د اړیکو Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مدير
 DocType: Payment Entry,Payment From / To,د پیسو له / د
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,نېټه Range
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},د پورونو د نوي محدودیت دی لپاره د پیریدونکو د اوسني بيالنس مقدار څخه لږ. پورونو د حد لري تيروخت وي {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; کولای شي په څېر نه وي
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,په دقيقو
 DocType: Issue,Resolution Date,لیک نیټه
 DocType: Student Batch Name,Batch Name,دسته نوم
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet جوړ:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet جوړ:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},لطفا د تادیاتو په اکر کې default د نغدي او يا بانک حساب جوړ {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,کې شامل کړي
 DocType: Selling Settings,Customer Naming By,پيرودونکو نوم By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,به د زده کوونکو په توګه د زده کوونکو د حاضرۍ میاشتنی رپوټ وړاندې ښيي
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,واقعي د پیل وخت
 DocType: BOM Operation,Operation Time,د وخت د عملياتو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,فنلند
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,اډه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,اډه
 DocType: Timesheet,Total Billed Hours,Total محاسبې ته ساعتونه
 DocType: Journal Entry,Write Off Amount,مقدار ولیکئ پړاو
 DocType: Journal Entry,Bill No,بیل نه
@@ -720,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,د زده کوونکو د حاضرۍ
 DocType: Sales Invoice Timesheet,Time Sheet,د وخت پاڼه
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مواد پر بنسټ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,لطفا توکی جزئيات داخل
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,لطفا توکی جزئيات داخل
 DocType: Interest,Interest,په زړه پوري
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,مخکې خرڅلاو
 DocType: Purchase Receipt,Other Details,نور جزئيات
@@ -731,24 +735,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,د پیسو د داخلولو د مخکې نه جوړ
 DocType: Purchase Receipt Item Supplied,Current Stock,اوسني دحمل
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},د کتارونو تر # {0}: د شتمنیو د {1} نه د قالب تړاو نه {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,د مخکتنې معاش ټوټه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,د مخکتنې معاش ټوټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ګڼون {0} په څو ځله داخل شوي دي
 DocType: Account,Expenses Included In Valuation,لګښتونه شامل په ارزښت
 DocType: Hub Settings,Seller City,پلورونکی ښار
 ,Absent Student Report,غیر حاضر زده کوونکو راپور
 DocType: Email Digest,Next email will be sent on:,بل برېښليک به واستول شي په:
 DocType: Offer Letter Term,Offer Letter Term,وړاندې لیک مهاله
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,د قالب د بېرغونو لري.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,د قالب د بېرغونو لري.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,د قالب {0} ونه موندل شو
 DocType: Bin,Stock Value,دحمل ارزښت
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,شرکت {0} نه شته
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,د ونې ډول
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,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/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,مهرباني غوره پروګرام
 DocType: Project,Estimated Cost,اټکل شوی لګښت
@@ -767,7 +769,7 @@
 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 اکانټ
 DocType: Payment Entry,Received Amount (Company Currency),د مبلغ (شرکت د اسعارو)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,اداره کوونکۍ باید جوړ شي که فرصت څخه په غاړه کړې
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,لطفا اونیز پړاو ورځ وټاکئ
 DocType: Production Order Operation,Planned End Time,پلان د پاي وخت
 ,Sales Person Target Variance Item Group-Wise,خرڅلاو شخص د هدف وړ توپیر د قالب ګروپ تدبيراومصلحت
@@ -783,6 +785,7 @@
 DocType: Opportunity,Opportunity From,فرصت له
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,میاشتنی معاش خبرپاڼه.
 DocType: BOM,Website Specifications,وېب پاڼه ځانګړتیاو
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: د {0} د ډول {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,د کتارونو تر {0}: د تغیر فکتور الزامی دی
@@ -817,6 +820,7 @@
 DocType: Employee,Bank A/C No.,بانک A / C شمیره
 DocType: Bank Guarantee,Project,د پروژې د
 DocType: Quality Inspection Reading,Reading 7,لوستلو 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,په قسمي توګه د سپارښتنې
 DocType: Expense Claim Detail,Expense Claim Type,اخراجاتو ادعا ډول
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,کولر په ګاډۍ تلواله امستنو
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},د شتمنیو د پرزه ژورنال انفاذ له لارې د {0}
@@ -824,14 +828,14 @@
 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 +107,Office Maintenance Expenses,دفتر د ترمیم لګښتونه
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ترتیبول بريښناليک حساب
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,مهرباني وکړئ لومړی د قالب ته ننوځي
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,مهرباني وکړئ لومړی د قالب ته ننوځي
 DocType: Account,Liability,Liability
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,تحریم مقدار نه شي کولای په کتارونو ادعا مقدار څخه ډيره وي {0}.
 DocType: Company,Default Cost of Goods Sold Account,د حساب د پلورل شوو اجناسو Default لګښت
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,بیې په لېست کې نه ټاکل
 DocType: Employee,Family Background,د کورنۍ مخينه
 DocType: Request for Quotation Supplier,Send Email,برېښنا لیک ولېږه
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},خبرداری: ناسم ضميمه {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,نه د اجازې د
 DocType: Company,Default Bank Account,Default بانک حساب
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پر بنسټ د ګوند چاڼ، غوره ګوند د لومړي ډول
@@ -844,8 +848,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,هیڅ یو کارمند وموندل شول
 DocType: Supplier Quotation,Stopped,ودرول
 DocType: Item,If subcontracted to a vendor,که قرارداد ته د يو خرڅوونکي په
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,د زده کوونکو د ډلې لا تازه.
 DocType: SMS Center,All Customer Contact,ټول پيرودونکو سره اړيکي
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,پورته سټاک csv له لارې د توازن.
 DocType: Warehouse,Tree Details,د ونو په بشپړه توګه کتل
@@ -856,8 +860,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,لږ تر لږه صورتحساب مقدار
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} د {1}: لګښت مرکز {2} کوي چې د دې شرکت سره تړاو نه لري {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} د {1}: Account {2} نه شي کولای د يو ګروپ وي
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,د قالب د کتارونو تر {idx}: {doctype} {docname} په پورته نه شته &#39;{doctype}&#39; جدول
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} لا د مخه د بشپړې او يا لغوه
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,نه دندو
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",د مياشتې په ورځ چې د موټرو د صورتحساب به د مثال په 05، 28 او نور تولید شي
 DocType: Asset,Opening Accumulated Depreciation,د استهلاک د پرانيستلو
@@ -873,7 +877,7 @@
 DocType: Bin,Moving Average Rate,حرکت اوسط نرخ
 DocType: Production Planning Tool,Select Items,انتخاب سامان
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} بیل په وړاندې د {1} مورخ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,کورس د مهال ويش
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,کورس د مهال ويش
 DocType: Maintenance Visit,Completion Status,تکميل حالت
 DocType: HR Settings,Enter retirement age in years,په کلونو کې د تقاعد د عمر وليکئ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,هدف ګدام
@@ -881,7 +885,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,د وړاندې کولو یا رسید ترمړوندونو پورې دې په سلو کې اجازه باندې
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,د وارداتو د حاضرۍ
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ټول د قالب ډلې
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ټول د قالب ډلې
 DocType: Process Payroll,Activity Log,فعالیت ننوتنه
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,خالصه ګټه / له لاسه ورکول
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,په اتوماتيک ډول د معاملو د سپارلو پېغام کمپوز.
@@ -892,7 +896,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,نظم ته د پیسو پیري
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,وړاندوینی Qty
 DocType: Sales Invoice,Payment Due Date,د پیسو له امله نېټه
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,د قالب variant {0} لا د همدې صفتونو شتون لري
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;پرانیستل&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,د پرانستې ته ایا
 DocType: Notification Control,Delivery Note Message,د سپارنې پرمهال يادونه پيغام
@@ -908,7 +912,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-نظم Qty
 DocType: Leave Block List Date,Leave Block List Date,پريږدئ بالک بشپړفهرست نېټه
 DocType: Pricing Rule,Price or Discount,د بیې او يا کمښت
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,په رانيول رسيد توکي جدول ټولې د تطبیق په تور باید په توګه ټول ماليات او په تور ورته وي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,په رانيول رسيد توکي جدول ټولې د تطبیق په تور باید په توګه ټول ماليات او په تور ورته وي
 DocType: Sales Team,Incentives,هڅوونکي
 DocType: SMS Log,Requested Numbers,غوښتنه شميرې
 DocType: Production Planning Tool,Only Obtain Raw Materials,یوازې خام مواد په لاس راوړئ
@@ -937,13 +941,13 @@
 DocType: Supplier Quotation,Is Subcontracted,د دې لپاره قرارداد
 DocType: Item Attribute,Item Attribute Values,د قالب ځانتیا ارزښتونه
 DocType: Examination Result,Examination Result,د ازموینې د پایلو د
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,رانيول رسيد
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,رانيول رسيد
 ,Received Items To Be Billed,ترلاسه توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ته وسپارل معاش رسید
 DocType: Employee,Ms,اغلی
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,د اسعارو د تبادلې نرخ د بادار.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},ماخذ Doctype بايد د يو شي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ته د وخت د عملياتو په راتلونکو {0} ورځو کې د څوکۍ د موندلو توان نلري {1}
 DocType: Production Order,Plan material for sub-assemblies,فرعي شوراګانو لپاره پلان مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,خرڅلاو همکارانو او خاوره
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,آيا نه په اتوماتيک ډول ګڼون جوړول په توګه هلته لا د ده سټاک په ګڼون بیلانس. تاسو باید د یو تطابق ګڼون جوړ مخکې تاسو کولای شي په دې ګودام یو د ننوتلو لپاره
@@ -966,10 +970,9 @@
 DocType: Supplier,Default Payable Accounts,Default د راتلوونکې حسابونه
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,د کارګر {0} فعاله نه وي او یا موجود ندی
 DocType: Fee Structure,Components,د اجزاو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,د قالب تانبه {0} تازه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},لطفا په قالب د شتمنیو کټه ګورۍ ته ننوځي {0}
 DocType: Quality Inspection Reading,Reading 6,لوستلو 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,نه شی کولای د {0} د {1} {2} کومه منفي بيالنس صورتحساب پرته
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,پیري صورتحساب پرمختللی
 DocType: Hub Settings,Sync Now,پرانیځئ اوس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},د کتارونو تر {0}: پورونو د ننوتلو سره د نه تړاو شي کولای {1}
@@ -983,11 +986,11 @@
 DocType: Item,Is Purchase Item,آیا د رانيول د قالب
 DocType: Asset,Purchase Invoice,رانيول صورتحساب
 DocType: Stock Ledger Entry,Voucher Detail No,ګټمنو تفصیلي نه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,نوي خرڅلاو صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,نوي خرڅلاو صورتحساب
 DocType: Stock Entry,Total Outgoing Value,Total باورلیک ارزښت
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,پرانيستل نېټه او د بندولو نېټه باید ورته مالي کال په چوکاټ کې وي
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,پرانيستل نېټه او د بندولو نېټه باید ورته مالي کال په چوکاټ کې وي
 DocType: Lead,Request for Information,معلومات د غوښتنې لپاره
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,پرانیځئ نالیکی صورتحساب
 DocType: Payment Request,Paid,ورکړل
 DocType: Program Fee,Program Fee,پروګرام فیس
 DocType: Salary Slip,Total in words,په لفظ Total
@@ -997,7 +1000,7 @@
 DocType: Employee Loan,Sanctioned,تحریم
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;پروپیلن لیست جدول.
 DocType: Job Opening,Publish on website,په ويب پاڼه د خپرېدو
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,مشتریانو ته د مالونو.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,عرضه صورتحساب نېټه نه شي کولای پست کوي نېټه څخه ډيره وي
@@ -1008,7 +1011,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,متفرقه
 ,Company Name,دکمپنی نوم
 DocType: SMS Center,Total Message(s),Total پيغام (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,د انتقال انتخاب د قالب
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,د بانک انتخاب حساب مشر هلته پوستې شو امانت.
@@ -1019,8 +1022,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,د کتارونو تر {0}: خرڅلاو / د اخستلو د امر په وړاندې د پیسو باید د تل لپاره له مخکې په نښه شي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کيمياوي
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default بانک / د نقدو پیسو حساب به په معاش ژورنال انفاذ په اتوماتيک ډول پرلیکه شي کله چې دا اکر انتخاب.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",د ټولګي کوډ انټروال {0} تداخل د نورو ټولګي د رتبې انټروال. انټروال مهرباني وکړئ وګورئ {0} او {1} او بیا کوښښ وکړه
 DocType: BOM,Raw Material Cost(Company Currency),لومړنیو توکو لګښت (شرکت د اسعارو)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,ټول توکي لا له وړاندې د دې تولید نظم ته انتقال شوي دي.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},د کتارونو تر # {0}: اندازه کېدای شي نه په ميزان کې کارول په پرتله زیات وي {1} {2}
@@ -1033,14 +1034,14 @@
 DocType: BOM Website Item,BOM Website Item,هیښ وېب پاڼه شمیره
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,پورته ستاسو لیک مشر او لوګو. (کولی شئ چې وروسته د سمولو لپاره).
 DocType: Timesheet Detail,Bill,بیل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,بل د استهالک نېټه ده ته ننوتل په توګه په تېرو نیټه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,سپین
 DocType: SMS Center,All Lead (Open),ټول کوونکۍ (خلاص)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),د کتارونو تر {0}: Qty لپاره نه {4} په ګودام {1} د ننوتلو وخت امخ د ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,ترلاسه کړئ پرمختګونه ورکړل
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
 DocType: Item,Automatically Create New Batch,په خپلکارې توګه د نوي دسته جوړول
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,د کمکیانو لپاره د
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,د کمکیانو لپاره د
 DocType: Student Admission,Admission Start Date,د شاملیدو د پیل نیټه
 DocType: Journal Entry,Total Amount in Words,په وييکي Total مقدار
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,یوه تېروتنه وه. يو احتمالي لامل کیدای شي چې تاسو په بڼه نه وژغوره. لطفا تماس support@erpnext.com که ستونزه دوام ولري.
@@ -1048,7 +1049,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,مهرباني وکړئ د بدلون لپاره د مقدار حساب ته ننوځي
 DocType: Student Batch Name,Student Batch Name,د زده کونکو د دسته نوم
 DocType: Holiday List,Holiday List Name,رخصتي بشپړفهرست نوم
 DocType: Repayment Schedule,Balance Loan Amount,د توازن د پور مقدار
@@ -1068,10 +1069,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},مهرباني وکړئ مشخص یو {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,په اندازه او ارزښت نه بدلون لرې توکي.
 DocType: Delivery Note,Delivery To,ته د وړاندې کولو
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ځانتیا جدول الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ځانتیا جدول الزامی دی
 DocType: Production Planning Tool,Get Sales Orders,خرڅلاو امر ترلاسه کړئ
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} کېدای شي منفي نه وي
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,تخفیف
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,تخفیف
 DocType: Asset,Total Number of Depreciations,Total د Depreciations شمېر
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
 DocType: Sales Invoice Item,Rate With Margin,کچه د څنډی څخه
@@ -1087,7 +1088,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,په خرڅلاو نظم / د بشپړو شویو جنسونو ګدام خوندي دي ګدام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,پلورل مقدار
 DocType: Repayment Schedule,Interest Amount,په زړه مقدار
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د &#39;حالت او د Save اوسمهالی
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,تاسو د دې ریکارډ د اخراجاتو Approver. لطفا د &#39;حالت او د Save اوسمهالی
 DocType: Serial No,Creation Document No,خلقت Document No
 DocType: Issue,Issue,Issue
 DocType: Asset,Scrapped,پرزه
@@ -1095,12 +1096,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",لپاره د قالب تانبه خصوصیتونه. د مثال په اندازه، رنګ او نور
 DocType: Purchase Invoice,Returns,په راستنېدو
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP ګدام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},شعبه {0} ترمړوندونو مراقبت د قرارداد په اساس دی {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},شعبه {0} ترمړوندونو مراقبت د قرارداد په اساس دی {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,د استخدام
 DocType: Lead,Organization Name,د ادارې نوم
 DocType: Tax Rule,Shipping State,انتقال د بهرنیو چارو
 ,Projected Quantity as Source,وړاندوینی مقدار په توګه سرچینه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,د قالب بايد د کارولو تڼی څخه رانيول معاملو لپاره توکي ترلاسه کړئ &#39;زياته شي
 DocType: Employee,A-,خبرتیاوي
 DocType: Production Planning Tool,Include non-stock items,غیر سټاک توکي شامل دي
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,خرڅلاو داخراجاتو
@@ -1108,12 +1109,12 @@
 DocType: GL Entry,Against,په وړاندې
 DocType: Item,Default Selling Cost Center,Default پلورل لګښت مرکز
 DocType: Sales Partner,Implementation Partner,د تطبیق همکار
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,زیپ کوډ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,زیپ کوډ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},خرڅلاو نظم {0} دی {1}
 DocType: Opportunity,Contact Info,تماس پيژندنه
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,جوړول دحمل توکي
 DocType: Packing Slip,Net Weight UOM,خالص وزن UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} پایلې
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} پایلې
 DocType: Item,Default Supplier,default عرضه
 DocType: Manufacturing Settings,Over Production Allowance Percentage,تولید امتياز سلنه
 DocType: Employee Loan,Repayment Schedule,بیرته ورکړې مهالویش
@@ -1121,7 +1122,7 @@
 DocType: Holiday List,Get Weekly Off Dates,د اونۍ پړاو نیټی ترلاسه کړئ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,د پای نیټه نه شي کولای په پرتله د پیل نیټه کمه وي
 DocType: Sales Person,Select company name first.,انتخاب شرکت نوم د لومړي.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ډاکټر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ډاکټر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,د داوطلبۍ څخه عرضه ترلاسه کړ.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},د {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,منځنی عمر
@@ -1141,7 +1142,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,د اجراآتو مهم Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,د ترانسپورت
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,ناباوره ځانتیا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} د {1} بايد وسپارل شي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},مقدار باید د لږ-تر یا مساوي وي {0}
 DocType: SMS Center,Total Characters,Total خویونه
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},لطفا هیښ لپاره د قالب په هیښ برخه کې غوره {0}
@@ -1152,7 +1153,7 @@
 DocType: Sales Partner,Distributor,ویشونکی-
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خرید په ګاډۍ نقل حاکمیت
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,تولید نظم {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',مهرباني وکړئ ټاکل &#39;د اضافي کمښت Apply&#39;
 ,Ordered Items To Be Billed,امر توکي چې د محاسبې ته شي
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,له Range لري چې کم وي په پرتله د Range
 DocType: Global Defaults,Global Defaults,Global افتراضیو
@@ -1162,7 +1163,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,بیا کال
 DocType: Purchase Invoice,Start date of current invoice's period,بیا د روان صورتحساب د مودې نېټه
 DocType: Salary Slip,Leave Without Pay,پرته له معاشونو څخه ووځي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,د ظرفیت د پلان کې تېروتنه
 ,Trial Balance for Party,د محاکمې بیلانس د ګوندونو
 DocType: Lead,Consultant,مشاور
 DocType: Salary Slip,Earnings,عوايد
@@ -1177,7 +1178,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",دا به د د variant د قالب کوډ appended شي. د بیلګې په توګه، که ستا اختصاري دی &quot;SM&quot;، او د توکي کوډ دی &quot;T-کميس&quot;، د variant توکی کوډ به &quot;T-کميس-SM&quot;
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,خالص د معاشونو (په لفظ) به د ليدو وړ وي. هر کله چې تاسو د معاش ټوټه وژغوري.
 DocType: Purchase Invoice,Is Return,آیا بیرته
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,بیرته / ګزارې يادونه
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,بیرته / ګزارې يادونه
 DocType: Price List Country,Price List Country,بیې په لېست کې د هېواد
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} لپاره د قالب د اعتبار وړ سریال ترانسفارمرونو د {1}
@@ -1187,11 +1188,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,لطفا شمیره کود داخل ته د بستې شمېره تر لاسه
 DocType: Stock Settings,Default Item Group,Default د قالب ګروپ
 DocType: Employee Loan,Partially Disbursed,په نسبی ډول مصرف
-DocType: Grading Structure,Grading System Name,د رتبو د سیستم نوم
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,عرضه ډیټابیس.
 DocType: Account,Balance Sheet,توازن پاڼه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',لګښت لپاره مرکز سره د قالب کوډ &#39;د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",د پیسو په اکر کې نده شکل بندي شوې ده. مهرباني وکړئ وګورئ، چې آيا حساب په د تادياتو د اکر یا د POS پېژندنه ټاکل شوي دي.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ستاسې د پلورنې کس به د پند په دې نېټې ته د مشتريانو د تماس ترلاسه
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ورته توکی نه شي کولای شي د څو ځله ننوتل.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",لا حسابونو شي ډلو لاندې کړې، خو د زياتونې شي غیر ډلو په وړاندې د
@@ -1203,7 +1203,7 @@
 ,Purchase Order Items To Be Billed,د اخستلو امر توکي چې د محاسبې ته شي
 DocType: Purchase Invoice Item,Net Rate,خالص Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,صورتحساب د قالب پیري
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,دحمل د پنډو توکي او GL توکي د ټاکل رانيول معاملو لپاره reposted دي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,دحمل د پنډو توکي او GL توکي د ټاکل رانيول معاملو لپاره reposted دي
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,د قالب 1
 DocType: Holiday,Holiday,رخصتي
 DocType: Support Settings,Close Issue After Days,بندول Issue ورځې وروسته
@@ -1229,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کار وشو
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,مهرباني وکړی په صفات جدول کې لږ تر لږه يو د خاصه مشخص
 DocType: Announcement,All Students,ټول زده کوونکي
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} د قالب باید یو غیر سټاک وي
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,محتویات پنډو
 DocType: Grading Scale,Intervals,انټروال
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ژر
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",د قالب ګروپ سره په همدې نوم شتون لري، لطفا توکی نوم بدل کړي او يا د توکي ډلې نوم
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,د زده کوونکو د موبايل په شمیره
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,د نړۍ پاتې
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,د قالب {0} نه شي کولای دسته لري
@@ -1273,9 +1273,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},څخه د {0} د معاش د ورکړې د {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},نه اجازه کنګل حساب د سمولو {0}
 DocType: Journal Entry,Get Outstanding Invoices,يو وتلي صورتحساب ترلاسه کړئ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,خرڅلاو نظم {0} د اعتبار وړ نه دی
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,رانيول امر تاسو سره مرسته پلان او ستاسو د اخیستلو تعقيب
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",بښنه غواړو، شرکتونو نه مدغم شي
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",په مادي غوښتنه د Issue / انتقال مجموعي مقدار {0} د {1} \ نه غوښتنه کمیت لپاره د قالب {2} څخه ډيره وي {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,د کوچنیو
@@ -1296,10 +1296,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,غیر مستقیم مصارف
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,د کتارونو تر {0}: Qty الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,د کرنې
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,پرانیځئ ماسټر معلوماتو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,پرانیځئ ماسټر معلوماتو
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ستاسو د تولیداتو يا خدمتونو
 DocType: Mode of Payment,Mode of Payment,د تادیاتو اکر
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,وېب پاڼه د انځور بايد د عامه دوتنه يا ويب URL وي
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,هیښ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,دا یو د ريښي توکی ډلې او نه تصحيح شي.
@@ -1317,18 +1317,18 @@
 DocType: Student Group Student,Group Roll Number,ګروپ رول شمیره
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",د {0}، يوازې د پور حسابونو بل ډیبیټ د ننوتلو په وړاندې سره وتړل شي
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,د ټولو دنده وزن Total باید 1. مهرباني وکړی د ټولو د پروژې د دندو وزن سره سم عیار
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,د سپارنې پرمهال يادونه {0} نه سپارل
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",د بیې د حاکمیت لومړی پر بنسټ ټاکل &#39;Apply د&#39; ډګر، چې کولای شي د قالب، د قالب ګروپ یا نښې وي.
 DocType: Hub Settings,Seller Website,پلورونکی وېب پاڼه
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,د خرڅلاو ټيم ټولې سلنه بايد 100 وي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},تولید نظم حالت دی {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},تولید نظم حالت دی {0}
 DocType: Appraisal Goal,Goal,موخه
 DocType: Sales Invoice Item,Edit Description,سمول Description
 ,Team Updates,ټيم اوسمهالونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,د عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,د عرضه
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,د خوښو حساب ډول په معاملو دې حساب په ټاکلو کې مرسته کوي.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (شرکت د اسعارو)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,چاپ شکل جوړول
@@ -1344,7 +1344,7 @@
 DocType: Depreciation Schedule,Journal Entry,په ورځپانه کی ثبت شوی مطلب
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} په پرمختګ توکي
 DocType: Workstation,Workstation Name,Workstation نوم
-DocType: Grade Interval,Grade Code,ټولګي کوډ
+DocType: Grading Scale Interval,Grade Code,ټولګي کوډ
 DocType: POS Item Group,POS Item Group,POS د قالب ګروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ولېږئ Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},هیښ {0} نه د قالب سره تړاو نه لري {1}
@@ -1361,7 +1361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,هډوتري
 DocType: Sales Order,Recurring Upto,راګرځېدل ترمړوندونو پورې
 DocType: Attendance,HR Manager,د بشري حقونو څانګې د مدير
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,لطفا یو شرکت غوره
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,لطفا یو شرکت غوره
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,امتیاز څخه ځي
 DocType: Purchase Invoice,Supplier Invoice Date,عرضه صورتحساب نېټه
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,تاسو باید د خرید په ګاډۍ وتوانوي
@@ -1377,7 +1377,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,د خوړو د
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Ageing Range 3
 DocType: Maintenance Schedule Item,No of Visits,نه د ليدنې
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},د ساتنې او ویش {0} په وړاندې د شته {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,شمولیت محصل
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},د تړل د حساب اسعارو باید د {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},د ټولو موخو ټکي مبلغ بايد 100. وي دا د {0}
@@ -1402,7 +1403,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg دورځني باورلیک
 DocType: POS Profile,Campaign,د کمپاین
 DocType: Supplier,Name and Type,نوم او ډول
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',تصویب حالت بايد د تصویب &#39;يا&#39; رد &#39;
 DocType: Purchase Invoice,Contact Person,د اړیکې نفر
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;د تمی د پیل نیټه د&#39; نه وي زیات &#39;د تمی د پای نیټه&#39;
 DocType: Course Scheduling Tool,Course End Date,د کورس د پای نیټه
@@ -1425,14 +1426,15 @@
 DocType: Sales Invoice,Shipping Address Name,استونې پته نوم
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,د حسابونو چارټ
 DocType: Material Request,Terms and Conditions Content,د قرارداد شرايط منځپانګه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,نه شي کولای په پرتله 100 وي
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,نه شي کولای په پرتله 100 وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} د قالب يو سټاک د قالب نه دی
 DocType: Maintenance Visit,Unscheduled,ناپلان شوې
 DocType: Employee,Owned,د دولتي
 DocType: Salary Detail,Depends on Leave Without Pay,په پرته د معاشونو اذن سره تړلی دی
 DocType: Pricing Rule,"Higher the number, higher the priority",د شمېر د لوړو، لوړو لومړیتوب
 ,Purchase Invoice Trends,پیري صورتحساب رجحانات
 DocType: Employee,Better Prospects,ته ښه زمينه
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",د کتارونو تر # {0}: د د ستې {1} لري یوازې {2} qty. لطفا بل batch چې {3} qty موجود ټاکلو او یا د څو کتارونو د قطار ویشل، د موضوع له څو دستو ورسوي /
 DocType: Vehicle,License Plate,منښتليک ذريعه
 DocType: Appraisal,Goals,موخې
 DocType: Warranty Claim,Warranty / AMC Status,ګرنټی / AMC حالت
@@ -1450,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,کارکوونکی کولای شي چې د ځان راپور نه ورکوي.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",که په پام کې ده کنګل، زياتونې پورې محدود کاروونکو اجازه لري.
 DocType: Email Digest,Bank Balance,بانک دبیلانس
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},د محاسبې د داخلولو لپاره د {0}: {1} ولري يوازې په اسعارو کړې: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",دنده پېژنڅېر، وړتوبونه اړتیا او داسې نور
 DocType: Journal Entry Account,Account Balance,موجوده حساب
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,د معاملو د ماليې حاکمیت.
@@ -1461,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,وښایاست ناتړل مالي کال د P &amp; L توازن
 DocType: Shipping Rule,Shipping Account,انتقال حساب
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} د {1}: Account {2} ده ناچارنده
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,د کمکیانو لپاره د خرڅلاو امر تاسو ته د خپل کاري پلان کې مرسته وکړي او پر وخت ورسوي
 DocType: Quality Inspection,Readings,نانود
 DocType: Stock Entry,Total Additional Costs,Total اضافي لګښتونو
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,ته ارزښت
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,بسته بنديو ټوټه
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,بسته بنديو ټوټه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر کرایې
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS ورننوتلو امستنې
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,د وارداتو کې ناکام شو!
@@ -1494,11 +1496,11 @@
 DocType: Company,Services,خدمتونه
 DocType: HR Settings,Email Salary Slip to Employee,Email معاش د کارکونکو ټوټه
 DocType: Cost Center,Parent Cost Center,Parent لګښت مرکز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ممکنه عرضه وټاکئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ممکنه عرضه وټاکئ
 DocType: Sales Invoice,Source,سرچینه
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,انکړپټه ښودل تړل
 DocType: Leave Type,Is Leave Without Pay,ده پرته د معاشونو د وتو
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,د شتمنیو کټه ګورۍ لپاره شتمن توکی الزامی دی
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,هیڅ ډول ثبتونې په قطعا د جدول کې وموندل
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},دا {0} د شخړو د {1} د {2} {3}
 DocType: Student Attendance Tool,Students HTML,زده کوونکو د HTML
@@ -1516,7 +1518,7 @@
 DocType: Student,Date of Leaving,د پریښودل نېټه
 DocType: Pricing Rule,For Price List,د بیې په لېست کې
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,اجرايي پلټنه
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,لامل جوړول
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,لامل جوړول
 DocType: Maintenance Schedule,Schedules,مهال ويش
 DocType: Purchase Invoice Item,Net Amount,خالص مقدار
 DocType: Purchase Order Item Supplied,BOM Detail No,هیښ تفصیلي نه
@@ -1544,9 +1546,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,د پروګرام د شموليت
 DocType: Sales Invoice Item,Brand Name,دتوليد نوم
 DocType: Purchase Receipt,Transporter Details,ته لېږدول، په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Default ګودام لپاره غوره توکی اړتیا
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,بکس
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ممکنه عرضه
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ممکنه عرضه
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,د سازمان
 DocType: Budget,Monthly Distribution,میاشتنی ویش
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,د اخيستونکي بشپړفهرست تش دی. لطفا رامنځته اخيستونکي بشپړفهرست
@@ -1554,8 +1556,8 @@
 DocType: Sales Partner,Sales Partner Target,خرڅلاو همکار هدف
 DocType: Loan Type,Maximum Loan Amount,اعظمي پور مقدار
 DocType: Pricing Rule,Pricing Rule,د بیې د حاکمیت
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},د زده کوونکو د دوه ګونو رول شمېر {0}
 DocType: Budget,Action if Annual Budget Exceeded,که کړنه کلنۍ بودیجه زیات شو
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,د نظم پیري موادو غوښتنه
 DocType: Shopping Cart Settings,Payment Success URL,د پیسو د برياليتوب په حافظی
@@ -1576,9 +1578,9 @@
 DocType: Employee Loan,Repayment Method,دبيرته طريقه
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",که وکتل، د کور مخ کې به د دغې ویب پاڼې د تلواله د قالب ګروپ وي
 DocType: Quality Inspection Reading,Reading 4,لوستلو 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},د {0} نه د پروژو په موندل Default هیښ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},د {0} نه د پروژو په موندل Default هیښ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,د شرکت د لګښت د ادعا.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",زده کوونکي دي د نظام په زړه کې، ستاسو د ټولو زده کوونکو اضافه
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",زده کوونکي دي د نظام په زړه کې، ستاسو د ټولو زده کوونکو اضافه
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},د کتارونو تر # {0}: چاڼېزو نېټې {1} نه مخکې آرډر نېټه وي {2}
 DocType: Company,Default Holiday List,افتراضي رخصتي بشپړفهرست
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},د کتارونو تر {0}: د وخت او د وخت د {1} له ده سره د تداخل {2}
@@ -1590,21 +1592,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,په هغه ورځ (s) چې تاسو د رخصتۍ درخواست دي رخصتي. تاسو ته اړتيا نه لري د درخواست.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,بیا ولېږې قطعا د ليک
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,نوې دنده
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,د داوطلبۍ د کمکیانو لپاره د
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,نور راپورونه
 DocType: Dependent Task,Dependent Task,اتکا کاري
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},لپاره د اندازه کولو واحد default تغیر فکتور باید 1 په قطار وي {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},د ډول رخصت {0} په پرتله نور نه شي {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,له مخکې پلان لپاره د X ورځو عملیاتو کوښښ وکړئ.
 DocType: HR Settings,Stop Birthday Reminders,Stop کالیزې په دوراني ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},لطفا په شرکت Default د معاشاتو د راتلوونکې حساب جوړ {0}
 DocType: SMS Center,Receiver List,د اخيستونکي بشپړفهرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,د لټون د قالب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,د لټون د قالب
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,په مصرف مقدار
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,په نغدو خالص د بدلون
 DocType: Assessment Plan,Grading Scale,د رتبو او مقياس
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,لا د بشپړ
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,د {0} اندازه واحد په د تغیر فکتور جدول څخه يو ځل داخل شوي دي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,لا د بشپړ
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},د پیسو غوښتنه د مخکې نه شتون {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,د خپریدلو سامان لګښت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},اندازه بايد زيات نه وي {0}
@@ -1636,12 +1638,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,د تادياتو د داخلولو د کمکیانو لپاره د
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,د کتارونو تر {0}: عرضه په وړاندې پرمختللی باید ډیبیټ شي
 DocType: Company,Default Values,تلواله ارزښتونو ته
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} د فریکونسي Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total مقدار بیرته
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,دا په دې د موټرو پر وړاندې د يادښتونه پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,راټول
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},په وړاندې د عرضه صورتحساب {0} د میاشتې په {1}
 DocType: Customer,Default Price List,Default د بیې په لېست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,د شتمنیو د غورځنګ ریکارډ {0} جوړ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,تاسې کولای شی نه ړنګول مالي کال {0}. مالي {0} کال په توګه په نړیوال امستنې default ټاکل
 DocType: Journal Entry,Entry Type,د ننوتلو ډول
 ,Customer Credit Balance,پيرودونکو پور بیلانس
@@ -1661,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,د توکو نه لري او په اندازه او ارزښت کوم بدلون.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,اجباري ډګر - پروګرام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,ګرنټی ادعا
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,ګرنټی ادعا
 ,Lead Details,سرب د نورولوله
 DocType: Salary Slip,Loan repayment,دبيرته
 DocType: Purchase Invoice,End date of current invoice's period,د روان صورتحساب د دورې د پای نیټه
@@ -1680,12 +1683,10 @@
 DocType: Employee,Permanent Address,دایمی استو ګنځی
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",په پرتله Grand Total په وړاندې د {0} د {1} زیات نه شي ورکول پرمختللی \ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,لطفا توکی کوډ وټاکئ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,لطفا توکی کوډ وټاکئ
 DocType: Student Sibling,Studying in Same Institute,په ورته انستیتیوت زده کړه
 DocType: Territory,Territory Manager,خاوره د مدير
 DocType: Packed Item,To Warehouse (Optional),ته ګدام (اختیاري)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
 DocType: Payment Entry,Paid Amount (Company Currency),ورکړل مقدار (شرکت د اسعارو)
 DocType: Purchase Invoice,Additional Discount,اضافي کمښت
 DocType: Selling Settings,Selling Settings,خرڅول امستنې
@@ -1695,9 +1696,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,محتویات یی په ګاډۍ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,بازار موندنه داخراجاتو
 ,Item Shortage Report,د قالب په کمښت کې راپور
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",د وزن دی، \ n لطفا ذکر &quot;وزن UOM&quot; هم
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,د موادو غوښتنه د دې دحمل د داخلولو لپاره په کار وړل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,بل د استهالک نېټه د نوي شتمنیو الزامی دی
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,جلا کورس د هر دسته بنسټ ګروپ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,د يو قالب واحد واحد.
@@ -1714,9 +1715,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} د {1}: لګښت مرکز د &#39;ګټه او زیان&#39; ګڼون اړتیا {2}. لطفا يو default لپاره د دې شرکت د لګښت مرکز جوړ.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,A پيرودونکو ګروپ سره په همدې نوم موجود دی لطفا د پيرودونکو نوم بدل کړي او يا د مراجعينو د ګروپ نوم بدلولی شی
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,نوي سره اړيکي
 DocType: Territory,Parent Territory,Parent خاوره
 DocType: Quality Inspection Reading,Reading 2,لوستلو 2
@@ -1733,7 +1732,7 @@
 ,Item-wise Sales Register,د قالب-هوښيار خرڅلاو د نوم ثبتول
 DocType: Asset,Gross Purchase Amount,Gross رانيول مقدار
 DocType: Asset,Depreciation Method,د استهالک Method
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,د نالیکي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,د نالیکي
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,آیا دا د مالياتو په اساسي Rate شامل دي؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Total هدف
 DocType: Program Course,Required,د غوښتل شوي
@@ -1743,20 +1742,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,پخلاینې JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,ډېر زيات ستنې. په راپور کې د صادرولو او د چاپولو لپاره دا وېړې پاڼې د درخواست په کارولو.
 DocType: Purchase Invoice Item,Batch No,دسته نه
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} مهمو نېټې د {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,د مراجعينو د اخستلو امر په وړاندې د څو خرڅلاو فرمانونو په اجازه
 DocType: Student Group Instructor,Student Group Instructor,د زده کوونکو د ډلې د لارښوونکي
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 د موبايل په هيڅ
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,اصلي
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,اصلي
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,چې د خپلې راکړې ورکړې شمیر لړ جوړ مختاړی
 DocType: Employee Attendance Tool,Employees HTML,د کارکوونکو د HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Default هیښ ({0}) باید د دې توکي او يا د هغې کېنډۍ فعاله وي
 DocType: Employee,Leave Encashed?,ووځي Encashed؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,فرصت له ډګر الزامی دی
 DocType: Email Digest,Annual Expenses,د کلني لګښتونو
 DocType: Item,Variants,تانبه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,د کمکیانو لپاره د اخستلو امر
 DocType: SMS Center,Send To,لېږل
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},لپاره اجازه او ډول په کافي اندازه رخصت توازن نه شته {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ځانګړې اندازه
@@ -1764,7 +1762,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,کار-in-پرمختګ ګدام مخکې اړتیا سپارل
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,د دنده متقاضي.
 DocType: Purchase Order Item,Warehouse and Reference,ګدام او ماخذ
 DocType: Supplier,Statutory info and other general information about your Supplier,قانوني معلومات او ستاسو د عرضه په هکله د نورو عمومي معلومات
@@ -1772,11 +1770,10 @@
 DocType: Item,Serial Nos and Batches,سریال وځيري او دستو
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,د زده کوونکو د ډلې پياوړتيا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ژورنال په وړاندې د انفاذ {0} نه کوم السوري {1} د ننوتلو لري
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ارزونه
 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: Grading Structure,Grading Intervals,د رتبو انټروال
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,ولیکۍ
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",په قطار د {0} شمیره overbill نه شي کولای {1} څخه زيات {2}. ته-د بیلونو په اجازه، لطفا په اخیستلو ته امستنې جوړ
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,لطفا چاڼګر جوړ پر بنسټ د قالب یا ګدام
@@ -1788,17 +1785,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,هیښ {0} بايد وسپارل شي
 DocType: Authorization Control,Authorization Control,د واک ورکولو د کنټرول
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},د کتارونو تر # {0}: رد ګدام رد د قالب په وړاندې د الزامی دی {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,د پیسو
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ستاسو د امر اداره
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,د پیسو
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ستاسو د امر اداره
 DocType: Production Order Operation,Actual Time and Cost,واقعي وخت او لګښت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},د اعظمي {0} د موادو غوښتنه کولای {1} په وړاندې د خرڅلاو نظم شي لپاره د قالب جوړ {2}
 DocType: Employee,Salutation,سلام
 DocType: Course,Course Abbreviation,کورس Abbreviation
 DocType: Student Leave Application,Student Leave Application,د زده کوونکو ته لاړل کاریال
 DocType: Item,Will also apply for variants,به هم د بېرغونو درخواست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",د شتمنیو د نه لغوه شي، لکه څنګه چې د مخه دی {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},کارکوونکی د {0} په نيمه ورځ په {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Total کار ساعتونو کې باید په پرتله max کار ساعتونو زيات نه وي {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,د
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,د خرڅلاو وخت بنډل په پېژندتورو.
 DocType: Quotation Item,Actual Qty,واقعي Qty
 DocType: Sales Invoice Item,References,ماخذونه
@@ -1808,7 +1806,7 @@
 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 +91,Associate,ملګري
 DocType: Asset Movement,Asset Movement,د شتمنیو غورځنګ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,د نوي په ګاډۍ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,د نوي په ګاډۍ
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} د قالب يو serialized توکی نه دی
 DocType: SMS Center,Create Receiver List,جوړول د اخيستونکي بشپړفهرست
 DocType: Vehicle,Wheels,په عرابو
@@ -1840,10 +1838,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,معلولينو د تولید امر په وړاندې د وخت يادښتونه رامنځته. عملیاتو بايد د تولید نظم په وړاندې له پښو نه شي
 DocType: Student,Student Mobile Number,د زده کوونکو د موبايل په شمېر
 DocType: Item,Has Variants,لري تانبه
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},تاسو وخته ټاکل څخه توکي {0} د {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,د میاشتنی ویش نوم
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته تذکرو الزامی دی
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,دسته تذکرو الزامی دی
 DocType: Sales Person,Parent Sales Person,Parent خرڅلاو شخص
 DocType: Purchase Invoice,Recurring Invoice,راګرځېدل صورتحساب
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,د پروژو د اداره کولو
@@ -1851,11 +1849,11 @@
 DocType: Budget,Fiscal Year,پولي کال، مالي کال
 DocType: Vehicle Log,Fuel Price,د ګازو د بیو
 DocType: Budget,Budget,د بودجې د
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,د ثابت د شتمنیو د قالب باید یو غیر سټاک وي.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",د بودجې د {0} په وړاندې د ګمارل نه شي، ځکه چې نه يو عايد يا اخراجاتو حساب
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,السته
 DocType: Student Admission,Application Form Route,د غوښتنليک فورمه لار
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,خاوره / پيرودونکو
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,خاوره / پيرودونکو
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,د مثال په 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,پريږدئ ډول {0} نه شي ځانګړي شي ځکه چې دی پرته له معاش څخه ووځي
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},د کتارونو تر {0}: ځانګړې اندازه {1} بايد په پرتله لږ وي او یا مساوي له بيالنس اندازه صورتحساب {2}
@@ -1875,14 +1873,14 @@
 ,Serial No Status,شعبه حالت
 DocType: Payment Entry Reference,Outstanding,بيالنس
 ,Daily Timesheet Summary,هره ورځ Timesheet لنډيز
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",د کتارونو تر {0}: د ټاکل {1} Periodicity، له او تر اوسه پورې \ تر منځ توپیر باید په پرتله لویه یا د مساوي وي {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,دا په دحمل پر بنسټ. وګورئ: {0} تفصيل لپاره د
 DocType: Pricing Rule,Selling,پلورل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},مقدار د {0} د {1} مجرايي په وړاندې د {2}
 DocType: Employee,Salary Information,معاش معلومات
 DocType: Sales Person,Name and Employee ID,نوم او د کارګر ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,له امله نېټه پست کوي نېټه مخکې نه شي
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,دندې او مالیات
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,لطفا ماخذ نېټې ته ننوځي
@@ -1894,14 +1892,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,نه قطار شمېر په پرتله لویه یا مساوي دې مسؤوليت په ډول د اوسني قطار شمېر ته راجع
 DocType: Asset,Sold,پلورل
 ,Item-wise Purchase History,د قالب-هوښيار رانيول تاریخ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا شعبه لپاره د قالب زياته کړه راوړلو په &#39;تولید مهال ویش&#39; کلیک {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},لطفا شعبه لپاره د قالب زياته کړه راوړلو په &#39;تولید مهال ویش&#39; کلیک {0}
 DocType: Account,Frozen,ګنګل
 ,Open Production Orders,د پرانیستې تولید امر
 DocType: Sales Invoice Payment,Base Amount (Company Currency),داساسی مبلغ (شرکت د اسعارو)
 DocType: Payment Reconciliation Payment,Reference Row,ماخذ د کتارونو
 DocType: Installation Note,Installation Time,نصب او د وخت
 DocType: Sales Invoice,Accounting Details,د محاسبې په بشپړه توګه کتل
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,دا د شرکت د ټولو معاملې ړنګول
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,پانګه اچونه
 DocType: Issue,Resolution Details,د حل په بشپړه توګه کتل
@@ -1934,14 +1932,14 @@
 DocType: Discussion,Discussion,د بحث
 DocType: Payment Entry,Transaction ID,د راکړې ورکړې ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,د بیې اصول دي لا فلتر پر بنسټ اندازه.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},لطفا د ټولګې لپاره د کارمند په یوځای کېدو د نېټه {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total اولګښت مقدار (د وخت پاڼه له لارې)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,تکرار پيرودونکو د عوایدو
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) باید رول &#39;اخراجاتو Approver&#39; لري
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جوړه
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,د تولید لپاره د هیښ او Qty وټاکئ
 DocType: Asset,Depreciation Schedule,د استهالک ويش
 DocType: Bank Reconciliation Detail,Against Account,په وړاندې حساب
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,نيمه ورځ نېټه بايد د تاريخ او تر اوسه پورې تر منځ وي
@@ -1955,16 +1953,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},مهرباني وکړئ ټاکل په شرکت د شتمنيو د استهالک لګښت مرکز &#39;{0}
 ,Maintenance Schedules,د ساتنې او ویش
 DocType: Task,Actual End Date (via Time Sheet),واقعي د پای نیټه (د وخت پاڼه له لارې)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},مقدار د {0} د {1} په وړاندې د {2} {3}
 ,Quotation Trends,د داوطلبۍ رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},د قالب ګروپ نه د توکی په توکی بادار ذکر {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,د حساب ډیبیټ باید یو ترلاسه حساب وي
 DocType: Shipping Rule Condition,Shipping Amount,انتقال مقدار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,انتظار مقدار
 DocType: Purchase Invoice Item,Conversion Factor,د تغیر فکتور
 DocType: Purchase Order,Delivered,تحویلوونکی
 ,Vehicle Expenses,موټر داخراجاتو
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
+DocType: Serial No,Invoice Details,صورتحساب نورولوله
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ګټور ژوند وروسته د ارزښت د تمې باید په پرتله لویه یا د مساوي وي {0}
 DocType: Purchase Receipt,Vehicle Number,موټر شمېر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,د نېټې په اړه چې د تکراري صورتحساب به بند شي
 DocType: Employee Loan,Loan Amount,د پور مقدار
@@ -1983,12 +1982,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,دحاضري
 DocType: HR Settings,HR Settings,د بشري حقونو څانګې امستنې
 DocType: Salary Slip,net pay info,خالص د معاشونو پيژندنه
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجاتو ادعا ده د تصویب په تمه ده. يوازې د اخراجاتو Approver کولای حالت د اوسمهالولو.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجاتو ادعا ده د تصویب په تمه ده. يوازې د اخراجاتو Approver کولای حالت د اوسمهالولو.
 DocType: Email Digest,New Expenses,نوي داخراجاتو
 DocType: Purchase Invoice,Additional Discount Amount,اضافي کمښت مقدار
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",د کتارونو تر # {0}: Qty باید 1، لکه توکی يوه ثابته شتمني ده. لورينه وکړئ د څو qty جلا قطار وکاروي.
 DocType: Leave Block List Allow,Leave Block List Allow,پريږدئ بالک بشپړفهرست اجازه
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr نه شي خالي يا ځای وي
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,د غیر ګروپ ګروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,لوبې
 DocType: Loan Type,Loan Name,د پور نوم
@@ -2000,6 +1999,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ګدام ځای کې چې تاسو د رد په پېژندتورو سټاک ساتلو
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
 DocType: Production Order,Skip Material Transfer,ته وګرځه توکو لېږدونه د
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,لپاره د تبادلې نرخ د موندلو توان نلري {0} د {1} د مهمو نېټه {2}. مهرباني وکړئ د پیسو د بدلولو ریکارډ په لاسي جوړ کړي
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ستاسو د مالي کال د پای رسیدو په
 DocType: POS Profile,Price List,د بیې په لېست
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} اوس د مالي کال تلواله. لطفا خپل د کتنمل تازه لپاره د بدلون د اغېز لپاره.
@@ -2016,19 +2016,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},ګڼون {0} ناباوره دی. حساب د اسعارو باید د {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},په قطار UOM تغیر فکتور ته اړتيا ده {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د خرڅلاو نظم یو، خرڅلاو صورتحساب یا ژورنال انفاذ وي
 DocType: Salary Component,Deduction,مجرايي
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,د کتارونو تر {0}: له وخت او د وخت فرض ده.
 DocType: Stock Reconciliation Item,Amount Difference,اندازه بدلون
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},د قالب بیه لپاره زياته کړه {0} په بیې په لېست کې د {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,مهرباني وکړئ او دې د پلورنې کس ته ننوځي د کارګر Id
 DocType: Territory,Classification of Customers by region,له خوا د سيمې د پېرېدونکي طبقه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,توپیر رقم بايد صفر وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,توپیر رقم بايد صفر وي
 DocType: Project,Gross Margin,Gross څنډی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,مهرباني وکړئ لومړی تولید د قالب ته ننوځي
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محاسبه شوې بانک اعلامیه توازن
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معيوبينو د کارونکي عکس
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,د داوطلبۍ
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total Deduction
 ,Production Analytics,تولید کړي.
@@ -2037,9 +2037,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},خبرداری: په ضمیمه کی ناسم ایس ایس د سند د {0}
 DocType: Student Admission,Eligibility,وړتيا
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",لامل تاسو سره مرسته ترلاسه سوداګرۍ، ټولې خپلې اړيکې او نور ستاسو د لامل اضافه
 DocType: Production Order Operation,Actual Operation Time,واقعي عملياتو د وخت
 DocType: Authorization Rule,Applicable To (User),د تطبیق وړ د (کارن)
 DocType: Purchase Taxes and Charges,Deduct,وضع
@@ -2054,7 +2054,7 @@
 DocType: Guardian,Work Address,د کار پته
 DocType: Appraisal,Calculate Total Score,ټولې نمرې محاسبه
 DocType: Request for Quotation,Manufacturing Manager,دفابريکي مدير
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},شعبه {0} لاندې ترمړوندونو تضمین دی {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},شعبه {0} لاندې ترمړوندونو تضمین دی {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,بیلتون د سپارنې يادونه په چمدان.
 apps/erpnext/erpnext/hooks.py +87,Shipments,مالونو
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ګڼون بیلانس ({0}) د {1} او سټاک ارزښت ({2}) لپاره ګدام {3} بايد ورته وي
@@ -2077,10 +2077,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,يادونه: دبرېښنا ليک به د معلولينو کارنان نه واستول شي
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,د عمل له شمیره
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,د عمل له شمیره
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,وټاکئ شرکت ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,وټاکئ شرکت ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,خالي پريږدئ که د ټولو څانګو په پام کې
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",د کار ډولونه (د دایمي، قرارداد، intern او داسې نور).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} لپاره د قالب الزامی دی {1}
 DocType: Process Payroll,Fortnightly,جلالت
 DocType: Currency Exchange,From Currency,څخه د پیسو د
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",لطفا په تيروخت کي يو قطار تخصيص مقدار، صورتحساب ډول او صورتحساب شمېر غوره
@@ -2089,14 +2089,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),کچه (د شرکت د اسعارو)
 DocType: Student Guardian,Others,نور
 DocType: Payment Entry,Unallocated Amount,Unallocated مقدار
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,کولی کوم ساری توکی ونه موندل. لورينه وکړئ د {0} يو شمېر نورو ارزښت ټاکي.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,نه زیات تازه
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,آیا تور د ډول په توګه په تیره د کتارونو تر مقدار &#39;انتخاب نه یا د&#39; په تیره د کتارونو تر Total لپاره په اول قطار
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,د ماشومانو د قالب باید د محصول د بنډل نه وي. لطفا توکی لرې `{0}` او وژغوري
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بانکداري
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Add ویشونو
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Add ویشونو
 DocType: Vehicle Service,Service Item,د خدمتونو د قالب
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
 DocType: Bank Guarantee,Bank Guarantee,بانکي تضمین
@@ -2122,6 +2122,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},د کتارونو تر # {0}: د شتمنیو د {1} ده لا د {2}
 DocType: Quotation Item,Stock Balance,دحمل بیلانس
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ته قطعا د خرڅلاو د ترتیب پر اساس
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,لطفا جوړ د {0} Setup&gt; امستنې له لارې&gt; نومول لړۍ لړۍ نوم
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,اجرايوي ريس
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجاتو ادعا تفصیلي
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,لطفا صحيح حساب وټاکئ
@@ -2146,14 +2147,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,بيې به که بیې په لېست کې نه دی جوړ نه ښودل شي
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,لطفا د دې نقل حاکمیت يو هېواد مشخص او يا د نړۍ په نقل وګورئ
 DocType: Stock Entry,Total Incoming Value,Total راتلونکي ارزښت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ډیبیټ ته اړتيا ده
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ډیبیټ ته اړتيا ده
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",ویشونو لپاره activites ستاسو د ډلې له خوا تر سره د وخت، لګښت او د بلونو د تګلورې کې مرسته وکړي
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,رانيول بیې لېست
 DocType: Offer Letter Term,Offer Term,وړاندیز مهاله
 DocType: Quality Inspection,Quality Manager,د کیفیت د مدير
 DocType: Job Applicant,Job Opening,دنده پرانیستل
 DocType: Payment Reconciliation,Payment Reconciliation,قطعا د پخلاينې
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,مهرباني غوره قی کس نوم
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,مهرباني غوره قی کس نوم
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,تکنالوژي
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total معاش: {0}
 DocType: BOM Website Operation,BOM Website Operation,هیښ وېب پاڼه د عملياتو
@@ -2181,23 +2182,23 @@
 DocType: Opportunity,Lost Reason,له لاسه دلیل
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,نوې پته
 DocType: Quality Inspection,Sample Size,نمونه اندازه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,لطفا د رسيد سند ته ننوځي
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,ټول توکي لا له وړاندې د رسیدونو شوي
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',لطفا &#39;له Case شمیره&#39; مشخص معتبر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,لا لګښت مرکزونه کولای شي ډلو لاندې کړې خو زياتونې شي غیر ډلو په وړاندې د
 DocType: Project,External,د بهرنيو
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,کارنان او حلال
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},تولید امر ايجاد شده: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},تولید امر ايجاد شده: {0}
 DocType: Branch,Branch,څانګه
 DocType: Guardian,Mobile Number,ګرځنده شمیره
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,د چاپونې او د عالمه
 DocType: Bin,Actual Quantity,واقعي اندازه
 DocType: Shipping Rule,example: Next Day Shipping,مثال په توګه: بل د ورځې په نقل
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,شعبه {0} ونه موندل شو
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,شعبه {0} ونه موندل شو
 DocType: Scheduling Tool,Student Batch,د زده کونکو د دسته
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ستاسو پېرودونکي
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,د زده کوونکو د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,د زده کوونکو د کمکیانو لپاره د
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},تاسو ته په دغه پروژه کې همکاري بلل شوي دي: {0}
 DocType: Leave Block List Date,Block Date,د بنديز نېټه
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اوس غوښتنه وکړه
@@ -2221,8 +2222,9 @@
 DocType: SMS Log,Sent To,لیږل شوی ورته
 DocType: Payment Request,Make Sales Invoice,د کمکیانو لپاره د خرڅلاو صورتحساب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,دکمپیوتر
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,بل د تماس نېټه نه شي کولای د پخوا په وي
 DocType: Company,For Reference Only.,د ماخذ یوازې.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,انتخاب دسته نه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},باطلې {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,پرمختللی مقدار
@@ -2236,7 +2238,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Case شمیره نه شي کولای 0 وي
 DocType: Item,Show a slideshow at the top of the page,د پاڼې په سر کې یو سلاید وښایاست
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,دوکانونه
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,دوکانونه
 DocType: Serial No,Delivery Time,د لېږدون وخت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Ageing پر بنسټ
 DocType: Item,End of Life,د ژوند تر پايه
@@ -2248,12 +2250,12 @@
 DocType: Rename Tool,Rename Tool,ونوموئ اوزار
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,تازه لګښت
 DocType: Item Reorder,Item Reorder,د قالب ترمیمي
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,انکړپټه ښودل معاش ټوټه
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,د انتقال د موادو
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,انکړپټه ښودل معاش ټوټه
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,د انتقال د موادو
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",د عملیاتو، د عملیاتي مصارفو ليکئ او نه ستاسو په عملیاتو یو بې ساری عملياتو ورکړي.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,دغه سند له خوا حد دی {0} د {1} لپاره توکی {4}. آیا تاسو د ورته په وړاندې د بل {3} {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,انتخاب بدلون اندازه حساب
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,لطفا جوړ ژغورلو وروسته تکراري
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,انتخاب بدلون اندازه حساب
 DocType: Purchase Invoice,Price List Currency,د اسعارو بیې لېست
 DocType: Naming Series,User must always select,کارن بايد تل انتخاب
 DocType: Stock Settings,Allow Negative Stock,د منفی دحمل اجازه
@@ -2264,7 +2266,7 @@
 DocType: Budget Account,Budget Account,د بودجې د حساب
 DocType: Quality Inspection,Verified By,تایید شوي By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",شرکت د تلواله اسعارو بدل نشي کولای، ځکه هلته موجوده معاملو دي. انتقال باید لغوه شي چې د تلواله د اسعارو بدلون.
-DocType: Grade Interval,Grade Description,ټولګي Description
+DocType: Grading Scale Interval,Grade Description,ټولګي Description
 DocType: Stock Entry,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,معاش ټوټه جوړول
@@ -2302,7 +2304,7 @@
 DocType: Upload Attendance,Attendance To Date,د نېټه حاضرۍ
 DocType: Warranty Claim,Raised By,راپورته By
 DocType: Payment Gateway Account,Payment Account,د پیسو حساب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,مهرباني وکړئ د شرکت مشخص چې مخکې لاړ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,په حسابونه ترلاسه خالص د بدلون
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,د معاوضې پړاو
 DocType: Offer Letter,Accepted,منل
@@ -2312,12 +2314,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,لطفا باوري تاسو په رښتيا غواړئ چې د دې شرکت د ټولو معاملو کې د ړنګولو. ستاسو بادار ارقام به پاتې شي دا. دا عمل ناکړل نه شي.
 DocType: Room,Room Number,کوټه شمېر
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},باطلې مرجع {0} د {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) د نه په پام کې quanitity څخه ډيره وي ({2}) په تولید نظم {3}
 DocType: Shipping Rule,Shipping Rule Label,انتقال حاکمیت نښه د
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,کارن فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مواد نه شي خالي وي.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,د چټک ژورنال انفاذ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",کیدای شي سټاک د اوسمهالولو لپاره نه، صورتحساب لرونکی د څاڅکی انتقال توکی.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,د چټک ژورنال انفاذ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,تاسو نه شي کولای کچه بدلون که هیښ agianst مواد یاد
 DocType: Employee,Previous Work Experience,مخکینی کاری تجربه
 DocType: Stock Entry,For Quantity,د مقدار
@@ -2330,7 +2332,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,اصطلاحات او Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,د انستیتوت نوم د کوم لپاره چې تاسو دا سيستم د جوړولو.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",د محاسبې د ننوتلو د دې نېټې کنګل کړي، څوک کولای شي / رول د لاندې ټاکل شوي پرته د ننوتلو لپاره تعديلوي.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,لطفا د توليد ساتنې مهال ویش مخکې د سند د ژغورلو
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,د پروژې د حالت
 DocType: UOM,Check this to disallow fractions. (for Nos),وګورئ دا ښیی disallow. (د وځيري)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,دغه لانديني تولید امر جوړ شو:
@@ -2357,7 +2359,7 @@
 ,Employees working on a holiday,د کارکوونکو په رخصتۍ کار کوي
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک حاضر
 DocType: Project,% Complete Method,٪ بشپړ Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},د ساتنې د پيل نيټه د شعبه د سپارلو نېټې مخکې نه شي {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},د ساتنې د پيل نيټه د شعبه د سپارلو نېټې مخکې نه شي {0}
 DocType: Production Order,Actual End Date,واقعي د پای نیټه
 DocType: BOM,Operating Cost (Company Currency),عادي لګښت (شرکت د اسعارو)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2374,7 +2376,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,پرته د معاشونو د وتو سره تصويب اجازه کاریال اسنادو سمون نه خوري
 DocType: Campaign,Campaign-.####,کمپاين - ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,نور ګامونه
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,لطفا په ښه کچه د مشخص توکو د رسولو
 DocType: Selling Settings,Auto close Opportunity after 15 days,د موټرونو په 15 ورځو وروسته نږدې فرصت
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,د پای کال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / مشري٪
@@ -2412,7 +2414,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},فیس سوابق ايجاد - {0}
 DocType: Asset Category Account,Asset Category Account,د شتمنیو د حساب کټه ګورۍ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},آیا د پلورنې نظم کمیت څخه زیات د قالب {0} د توليد نه {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,دحمل {0} د ننوتلو نه سپارل
 DocType: Payment Reconciliation,Bank / Cash Account,بانک / د نقدو پیسو حساب
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,بل تماس By نه شي کولای په غاړه دبرېښنا ليک پته په توګه ورته وي
@@ -2434,7 +2436,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,بېلوګډو چاڼېزو نېټه نه ذکر
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,تولید
 DocType: Guardian,Occupation,وظيفه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,د کتارونو تر {0}: بیا نېټه دمخه بايد د پای نیټه وي
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qty)
 DocType: Sales Invoice,This Document,دا لاسوند
 DocType: Installation Note Item,Installed Qty,نصب Qty
@@ -2450,15 +2453,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,یو Issue راپور
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ټولګټې داخراجاتو
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-پورته
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,د کتارونو تر # {0}: ژورنال انفاذ {1} نه ګڼون لری {2} يا لا نه خوری بل کوپون پر وړاندې د
 DocType: Buying Settings,Default Buying Price List,Default د خريداري د بیې په لېست
 DocType: Process Payroll,Salary Slip Based on Timesheet,معاش ټوټه پر بنسټ Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,د پورته انتخاب معیارونه یا معاش ټوټه هیڅ یو کارمند د مخه جوړ
 DocType: Notification Control,Sales Order Message,خرڅلاو نظم پيغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",د ټاکلو په تلواله ارزښتونو شرکت، د اسعارو، روان مالي کال، او داسې نور په شان
 DocType: Payment Entry,Payment Type,د پیسو ډول
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,لطفا لپاره توکي داځکه غوره {0}. ته د یو واحد داځکه چې دا اړتیا پوره کوي د موندلو توان نلري
 DocType: Process Payroll,Select Employees,انتخاب مامورین
 DocType: Opportunity,Potential Sales Deal,احتمالي خرڅلاو تړون
 DocType: Payment Entry,Cheque/Reference Date,آرډر / ماخذ نېټه
@@ -2475,7 +2478,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS پيژند {0} لا د شرکت جوړ {1}
 DocType: Purchase Order,Ref SQ,دسرچینی یادونه مربع
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,په ټولو BOMs د قالب / هیښ ځاېناستول
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,د رسيد سند بايد وسپارل شي
 DocType: Purchase Invoice Item,Received Qty,ترلاسه Qty
 DocType: Stock Entry Detail,Serial No / Batch,شعبه / دسته
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,نه ورکړل او نه تحویلوونکی
@@ -2484,11 +2487,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,هيڅ وخت پاڼې
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,ډول ووځي {0} شي ترسره-استولې نه
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',د ساتنې او ویش لپاره د ټول سامان د تولید نه. مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
 ,To Produce,توليدول
 apps/erpnext/erpnext/config/hr.py +93,Payroll,د معاشاتو
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",لپاره چي په کتارونو {0} د {1}. په قالب کچه {2} شامل دي، د قطارونو په {3} هم باید شامل شي
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,د کارن د کمکیانو لپاره د
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,د کارن د کمکیانو لپاره د
 DocType: Packing Slip,Identification of the package for the delivery (for print),لپاره د وړاندې کولو د ټولګې د پيژندنې (د چاپي)
 DocType: Bin,Reserved Quantity,خوندي دي مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,لطفا د اعتبار وړ ایمیل ادرس ولیکۍ
@@ -2502,15 +2505,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,معلولینو کېنډۍ باید default کېنډۍ نه وي
 DocType: Account,Income Account,پر عايداتو باندې حساب
 DocType: Payment Request,Amount in customer's currency,په مشتري د پيسو اندازه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,د سپارنې پرمهال
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,د سپارنې پرمهال
 DocType: Stock Reconciliation Item,Current Qty,اوسني Qty
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",وګورئ: په لګښت برخه کې د &quot;د موادو پر بنسټ Rate&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,قبلی
 DocType: Appraisal Goal,Key Responsibility Area,مهم مسوولیت په سیمه
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",د زده کوونکو دستو مرسته وکړي چې تاسو د زده کوونکو لپاره د حاضرۍ، د ارزونو او د فيس تعقیب کړي
 DocType: Payment Entry,Total Allocated Amount,ټولې پیسې د
 DocType: Item Reorder,Material Request Type,د موادو غوښتنه ډول
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},څخه د {0} ته د معاشونو Accural ژورنال دکانکورازموينه {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",LocalStorage دی پوره، خو د ژغورلو نه
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,د کتارونو تر {0}: UOM د تغیر فکتور الزامی دی
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,دسرچینی یادونه
 DocType: Budget,Cost Center,لګښت مرکز
@@ -2520,16 +2524,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,د پیرودونکو د مالياتو د Id څخه د خرڅلاو معاملې پټول
 DocType: Upload Attendance,Upload HTML,upload HTML
 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.",د بیې د حاکمیت دی ځاېناستول د بیې په لېست / تعريف تخفیف سلنه، پر بنسټ د ځینو معیارونو.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",د بیې د حاکمیت دی ځاېناستول د بیې په لېست / تعريف تخفیف سلنه، پر بنسټ د ځینو معیارونو.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,ګدام يوازې دحمل د ننوتلو لارې بدليدای شي / د سپارنې پرمهال یادونه / رانيول رسيد
 DocType: Employee Education,Class / Percentage,ټولګی / سلنه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,د بازار موندنې او خرڅلاو مشر
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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;د بیې په لېست Rate&#39; ډګر.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",که ټاکل د بیې د حاکمیت لپاره &#39;د بیو د&#39; کړې، نو دا به د بیې په لېست ليکلی. د بیې د حاکمیت بيه وروستۍ بيه، له دې امله د لا تخفیف نه بايد پلی شي. نو له دې کبله، لکه د خرڅلاو د ترتیب پر اساس، د اخستلو امر او نور معاملو، نو دا به په کچه د ساحوي پايلي شي، پر ځای &#39;د بیې په لېست Rate&#39; ډګر.
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track له خوا د صنعت ډول ځای شوی.
 DocType: Item Supplier,Item Supplier,د قالب عرضه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,لطفا د قالب کوډ داخل ته داځکه تر لاسه نه
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},لورينه وکړئ د {0} quotation_to د ارزښت ټاکلو {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ټول Addresses.
 DocType: Company,Stock Settings,دحمل امستنې
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",آژانسونو هغه مهال ممکنه ده که لاندې شتمنۍ په دواړو اسنادو يو شان دي. دی ګروپ، د ریښی ډول، د شرکت
@@ -2539,6 +2543,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',به د غونډې په اړه يو بريښناليک چي حالت کارمندانو ته واستوي &#39;پرانيستلی&#39;
 DocType: Task,Depends on Tasks,په دندې پورې تړاو لري
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage پيرودونکو ګروپ د ونو.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ضميمې کولای شي پرته د سودا کراچۍ مساعد ښودل شي
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نوي لګښت مرکز نوم
 DocType: Leave Control Panel,Leave Control Panel,پريږدئ Control Panel
@@ -2551,12 +2556,10 @@
 DocType: Sales Invoice,Debit To,د ډیبیټ
 DocType: Delivery Note,Required only for sample item.,يوازې د نمونه توکی ته اړتيا لري.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,واقعي Qty د راکړې ورکړې وروسته
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,عرضه&gt; عرضه ډول
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},نه معاش ټوټه تر منځ موندل {0} او {1}
 ,Pending SO Items For Purchase Request,SO سامان د اخستلو غوښتنه په تمه
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,د زده کوونکو د شمولیت
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} د {1} معلول دی
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} د {1} معلول دی
 DocType: Supplier,Billing Currency,د بیلونو د اسعارو
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ډېر لوی
@@ -2573,9 +2576,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,کورپاڼه د ځانګړي محصول
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ټول د ارزونې ډلې
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نوي ګدام نوم
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,خاوره
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,لورينه وکړئ د اړتيا کتنو نه یادونه
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,لورينه وکړئ د اړتيا کتنو نه یادونه
 DocType: Stock Settings,Default Valuation Method,تلواله ارزښت Method
 DocType: Vehicle Log,Fuel Qty,د تیلو د Qty
 DocType: Production Order Operation,Planned Start Time,پلان د پیل وخت
@@ -2591,7 +2594,7 @@
 DocType: Price List,Price List Master,د بیې په لېست ماسټر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ټول خرڅلاو معاملې کولی شی څو ** خرڅلاو اشخاص ** په وړاندې د سکس شي تر څو چې تاسو کولای شي او د اهدافو څخه څارنه وکړي.
 ,S.O. No.,SO شمیره
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لطفآ د سرب د پيرودونکو رامنځته {0}
 DocType: Price List,Applicable for Countries,لپاره هیوادونه د تطبيق وړ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,يوازې سره حالت غوښتنلیکونه پرېږدئ &#39;تصویب&#39; او &#39;رد&#39; کولای وسپارل شي
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},د زده کونکو د ډلې نوم په قطار الزامی دی {0}
@@ -2623,7 +2626,7 @@
 DocType: Project,Copied From,کاپي له
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},نوم تېروتنه: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,په کمښت کې
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} د {1} سره تړاو نه {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,د {0} کارمند په ګډون لا د مخه په نښه
 DocType: Packing Slip,If more than one package of the same type (for print),که د همدې ډول له يوه څخه زيات بسته (د چاپي)
 ,Salary Register,معاش د نوم ثبتول
@@ -2642,7 +2645,7 @@
 DocType: Tax Rule,Use for Shopping Cart,کولر په ګاډۍ استفاده
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ارزښت {0} د خاصې لپاره {1} نه د اعتبار د قالب په لست کې شته لپاره د قالب ارزښتونه ځانتیا {2}
 DocType: BOM Item,Scrap %,د اوسپنې٪
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",په تور به د خپرولو په متناسب ډول پر توکی qty يا اندازه وي، ستاسو د انتخاب په هر توګه
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",په تور به د خپرولو په متناسب ډول پر توکی qty يا اندازه وي، ستاسو د انتخاب په هر توګه
 DocType: Maintenance Visit,Purposes,په موخه
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,تيروخت د یوه جنس بايد په بدل کې سند سره منفي کمیت ته داخل شي
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",د عملياتو {0} په پرتله په workstation هر موجود کار ساعتونو نور {1}، په څو عملیاتو کې د عملياتو تجزيه
@@ -2663,16 +2666,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage خاوره د ونو.
 DocType: Journal Entry Account,Sales Invoice,خرڅلاو صورتحساب
 DocType: Journal Entry Account,Party Balance,ګوند بیلانس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,مهرباني غوره Apply کمښت د
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,مهرباني غوره Apply کمښت د
 DocType: Company,Default Receivable Account,Default ترلاسه اکانټ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,مجموعي معاش لپاره د پورته انتخاب معیارونه ورکول د بانک د انفاذ جوړول
 DocType: 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.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,تخفیف سلنه يا په وړاندې د بیې په لېست کې او یا د ټولو د بیې په لېست کارول کيداي شي.
 DocType: Purchase Invoice,Half-yearly,Half-کلنی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,لپاره دحمل محاسبې انفاذ
 DocType: Vehicle Service,Engine Oil,د انجن د تیلو
 DocType: Sales Invoice,Sales Team1,خرڅلاو Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,د قالب {0} نه شته
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,د قالب {0} نه شته
 DocType: Sales Invoice,Customer Address,پيرودونکو پته
 DocType: Employee Loan,Loan Details,د پور نورولوله
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,د کتارونو تر {0}: بشپړ Qty باید له صفر څخه زیات وي.
@@ -2680,24 +2683,24 @@
 DocType: Account,Root Type,د ريښي ډول
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},د کتارونو تر # {0}: بېرته نشي څخه زيات {1} لپاره د قالب {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ايښودنې په
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},هدف ګودام لپاره چي په کتارونو الزامی دی {0}
 DocType: Cheque Print Template,Primary Settings,لومړنۍ امستنې
 DocType: Purchase Invoice,Select Supplier Address,انتخاب عرضه پته
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,مامورین ورزیات کړئ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,مامورین ورزیات کړئ
 DocType: Purchase Invoice Item,Quality Inspection,د کیفیت د تفتیش
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,اضافي واړه
 DocType: Company,Standard Template,معياري کينډۍ
 DocType: Training Event,Theory,تیوری
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,خبرداری: مادي غوښتل Qty دی لږ تر لږه نظم Qty څخه کم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ګڼون {0} ده کنګل
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,قانوني نهاد / مستقلې سره د حسابونه د يو جلا چارت د سازمان پورې.
 DocType: Payment Request,Mute Email,ګونګ دبرېښنا ليک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",د خوړو، او نوشابه &amp; تنباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},يوازې په وړاندې پیسې unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,کمیسیون کچه نه شي کولای په پرتله 100 وي
 DocType: Stock Entry,Subcontract,فرعي
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,لطفا {0} په لومړي
@@ -2737,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,د موجوده د راکړې ورکړې د ګدامونو د ډلې بدل نه شي.
 DocType: Assessment Result Tool,Result HTML,د پایلو د HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,په ختمېږي
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,زده کوونکي ورزیات کړئ
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,زده کوونکي ورزیات کړئ
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},مهرباني غوره {0}
 DocType: C-Form,C-Form No,C-فورمه نشته
 DocType: BOM,Exploded_items,Exploded_items
@@ -2780,7 +2783,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,نننیو
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,مالي کال وټاکئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترمیمي د ليول
 DocType: Company,Chart Of Accounts Template,د حسابونو کينډۍ چارت
 DocType: Attendance,Attendance Date,د حاضرۍ نېټه
@@ -2795,14 +2798,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,دوه ګونو ننوتلو
 DocType: Program Enrollment Tool,Get Students,زده کوونکي ترلاسه کړئ
 DocType: Serial No,Under Warranty,لاندې ګرنټی
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[تېروتنه]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[تېروتنه]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د خرڅلاو نظم وژغوري.
 ,Employee Birthday,د کارګر کالیزې
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,د زده کوونکو د حاضرۍ دسته اوزار
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,حد اوښتي
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,تصدي پلازمیینه
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,سره د دې د تعليمي کال د &#39;يوه علمي اصطلاح {0} او مهاله نوم&#39; {1} مخکې نه شتون لري. لطفا د دې زياتونې کې بدلون او بیا کوښښ وکړه.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",لکه {0} توکی په وړاندې د موجودو معاملو شته دي، تاسو نه شي کولای د ارزښت د بدلون {1}
 DocType: UOM,Must be Whole Number,باید ټول شمېر وي
 DocType: Leave Control Panel,New Leaves Allocated (In Days),نوې پاڼې د تخصيص (په ورځې)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,شعبه {0} نه شته
@@ -2822,7 +2825,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,٪ د توکو د خرڅلاو د دې نظم په وړاندې د بلونو د
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,د دورې په تړلو انفاذ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,د موجوده معاملو لګښت مرکز ته ډلې بدل نه شي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},مقدار د {0} د {1} {2} {3}
 DocType: Account,Depreciation,د استهالک
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),عرضه (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,د کارګر د حاضرۍ اوزار
@@ -2846,7 +2849,7 @@
 DocType: Supplier,Last Day of the Next Month,د د راتلونکې میاشتې په وروستۍ ورځ
 DocType: Support Settings,Auto close Issue after 7 days,د موټرونو 7 ورځې وروسته له نږدې Issue
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",تر وتلو وړاندې نه شي کولای ځانګړي شي {0} په توګه رخصت انډول لا شوي دي انتقال-استولې چې په راتلونکي کې رخصت تخصيص ریکارډ {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوټ: له کبله / ماخذ نېټه له خوا د {0} په ورځ اجازه مشتريانو د پورونو ورځو څخه زيات (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,د زده کوونکو د غوښتنليک
 DocType: Asset Category Account,Accumulated Depreciation Account,د استهلاک د حساب
 DocType: Stock Settings,Freeze Stock Entries,د يخبندان دحمل توکي
@@ -2857,7 +2860,7 @@
 ,Stock Analytics,دحمل Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,عملیاتو په خالي نه شي پاتې کېدای
 DocType: Maintenance Visit Purpose,Against Document Detail No,په وړاندې د سند جزییات نشته
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,ګوند ډول فرض ده
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,ګوند ډول فرض ده
 DocType: Quality Inspection,Outgoing,د تېرې
 DocType: Material Request,Requested For,غوښتنه د
 DocType: Quotation Item,Against Doctype,په وړاندې د Doctype
@@ -2874,11 +2877,11 @@
 DocType: Asset,Item Code,د قالب کوډ
 DocType: Production Planning Tool,Create Production Orders,تولید امر جوړول
 DocType: Serial No,Warranty / AMC Details,ګرنټی / AMC نورولوله
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,د فعالیت پر بنسټ د ګروپ لپاره د انتخاب کوونکو لاسي
 DocType: Journal Entry,User Remark,کارن تبصره
 DocType: Lead,Market Segment,بازار برخه
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ورکړل مقدار نه شي کولای ټولو منفي بيالنس مقدار څخه ډيره وي {0}
 DocType: Employee Internal Work History,Employee Internal Work History,د کارګر کورني کار تاریخ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),تړل د (ډاکټر)
 DocType: Cheque Print Template,Cheque Size,آرډر اندازه
@@ -2894,7 +2897,7 @@
 DocType: Production Planning Tool,Create Material Requests,د موادو غوښتنه جوړول
 DocType: Employee Education,School/University,ښوونځی / پوهنتون
 DocType: Payment Request,Reference Details,ماخذ په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,د تمی وړ ارزښت ګټور ژوند وروسته باید Gross رانيول مقدار څخه لږ وي
 DocType: Sales Invoice Item,Available Qty at Warehouse,موجود Qty په ګدام
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,د بلونو د مقدار
 DocType: Asset,Double Declining Balance,Double کموالی بیلانس
@@ -2915,20 +2918,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",توپير حساب باید یو د شتمنیو / Liability ډول په پام کې وي، ځکه په دې کې دحمل پخلاينې يو پرانیستل انفاذ دی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},ورکړل شوي مقدار نه شي کولای د پور مقدار زیات وي {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},نظم لپاره د قالب اړتیا پیري {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,تولید نظم نه جوړ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,تولید نظم نه جوړ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;له نېټه باید وروسته&#39; ته د نېټه وي
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},آیا په توګه د زده کوونکو حالت بدل نه {0} کې د زده کوونکو د غوښتنلیک سره تړاو دی {1}
 DocType: Asset,Fully Depreciated,په بشپړه توګه راکم شو
 ,Stock Projected Qty,دحمل وړاندوینی Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},پيرودونکو {0} نه تړاو نه لري د پروژې د {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,د پام وړ د حاضرۍ د HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",د داوطلبۍ دي وړانديزونه، د داوطلبۍ د خپل مشتريان تاسو ته ليږلي دي
 DocType: Sales Order,Customer's Purchase Order,پيرودونکو د اخستلو امر
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,شعبه او دسته
 DocType: Warranty Claim,From Company,له شرکت
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,د ارزونې معیارونه په لسګونو Sum ته اړتيا لري د {0} وي.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ارزښت او يا د Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,مهرباني وکړئ ټاکل د Depreciations شمېر بک
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ارزښت او يا د Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions امر لپاره نه شي مطرح شي:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,دقیقه
 DocType: Purchase Invoice,Purchase Taxes and Charges,مالیات او په تور پیري
@@ -2941,7 +2944,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,ټول Warehouses
 DocType: Sales Partner,Retailer,پرچون
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,د حساب د پور باید د موازنې د پاڼه په پام کې وي
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ټول عرضه ډولونه
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ټول عرضه ډولونه
 DocType: Global Defaults,Disable In Words,نافعال په وييکي
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,د قالب کوډ لازمي ده، ځکه د قالب په اتوماتيک ډول شمېر نه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},د داوطلبۍ {0} نه د ډول {1}
@@ -2950,6 +2953,7 @@
 DocType: Production Order,PRO-,پلوه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,بانک قرضې اکانټ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,معاش ټوټه د کمکیانو لپاره
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,د کتارونو تر # {0}: ځانګړې شوې مقدار نه بيالنس اندازه په پرتله زیات وي.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,کتنه د هیښ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,خوندي پور
 DocType: Purchase Invoice,Edit Posting Date and Time,سمول نوکرې نېټه او وخت
@@ -2989,7 +2993,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},اجازه نه سټاک معاملو د اوسمهالولو په پرتله د زړو {0}
 DocType: Purchase Invoice Item,PR Detail,PR تفصیلي
 DocType: Sales Order,Fully Billed,په بشپړ ډول محاسبې ته
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},مهرباني وکړی په کارمند تلوالیزه د تادیې وړ ګڼون جوړ {0}
 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 +127,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),د بنډل خالص وزن. معمولا د خالص وزن + د بسته بندۍ مواد وزن. (د چاپي)
@@ -3000,7 +3003,7 @@
 DocType: Student Group,Group Based On,ګروپ پر بنسټ
 DocType: Journal Entry,Bill Date,بیل نېټه
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",د خدمتونو د قالب، ډول، د فریکونسي او لګښتونو اندازه اړ دي
-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:",حتی که د لوړ لومړیتوب څو د بیو اصول شته دي، نو لاندې داخلي لومړیتوبونو دي استعمال:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",حتی که د لوړ لومړیتوب څو د بیو اصول شته دي، نو لاندې داخلي لومړیتوبونو دي استعمال:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},تاسو په رښتيا غواړئ چې د {0} چې په معاش د ټولو ټوټه سپارل {1}
 DocType: Cheque Print Template,Cheque Height,آرډر لوړوالی
 DocType: Supplier,Supplier Details,عرضه نورولوله
@@ -3012,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,صورتحساب ګروف
 DocType: Purchase Order,Recurring Order,راګرځېدل نظم
 DocType: Company,Default Income Account,Default د عوايدو د حساب
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,پيرودونکو ډله / پيرودونکو
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,پيرودونکو ډله / پيرودونکو
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),ناتړل مالي کلونو ګټه / زیان (اعتبار)
 DocType: Sales Invoice,Time Sheets,د وخت د سکيچ
 DocType: Payment Gateway Account,Default Payment Request Message,Default د پیسو غوښتنه پيغام
@@ -3032,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,د داوطلبۍ پيغام
 DocType: Employee Loan,Employee Loan Application,د کارګر د پور کاریال
 DocType: Issue,Opening Date,د پرانستلو نېټه
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,د حاضرۍ په بریالیتوب سره په نښه شوي دي.
 DocType: Journal Entry,Remark,تبصره
 DocType: Purchase Receipt Item,Rate and Amount,اندازه او مقدار
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ګڼون په ډول د {0} بايد د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ګڼون په ډول د {0} بايد د {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,پاڼو او رخصتي
 DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
 DocType: School Settings,Current Academic Term,اوسنۍ علمي مهاله
@@ -3058,7 +3061,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,د زده کونکو د ګروپ
 DocType: Shopping Cart Settings,Quotation Series,د داوطلبۍ لړۍ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",توکی سره د ورته نوم شتون لري ({0})، لطفا د توکي ډلې نوم بدل کړي او يا د جنس نوم بدلولی شی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,لطفا د مشتريانو د ټاکلو
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,لطفا د مشتريانو د ټاکلو
 DocType: C-Form,I,زه
 DocType: Company,Asset Depreciation Cost Center,د شتمنيو د استهالک لګښت مرکز
 DocType: Sales Order Item,Sales Order Date,خرڅلاو نظم نېټه
@@ -3077,20 +3080,20 @@
 DocType: Vehicle,Insurance Details,د بیمې په بشپړه توګه کتل
 DocType: Account,Payable,د تادیې وړ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,لطفا د پور بيرته پړاوونه داخل
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),پوروړو ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),پوروړو ({0})
 DocType: Pricing Rule,Margin,څنډی
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نوي پېرېدونکي
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,ټولټال ګټه ٪
 DocType: Appraisal Goal,Weightage (%),Weightage)٪ (
 DocType: Bank Reconciliation Detail,Clearance Date,بېلوګډو چاڼېزو نېټه
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross رانيول مقدار الزامی دی
 DocType: Lead,Address Desc,د حل نزولی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,ګوند الزامی دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,ګوند الزامی دی
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع نوم
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,تيروخت د خرڅالو او يا د خريداري يو باید وټاکل شي
-DocType: Grading Structure,Grade Intervals,ټولګي انټروال
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,د خپلې سوداګرۍ د ماهیت وټاکئ.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},د کتارونو تر # {0}: دوه ځلي په ماخذونه د ننوتلو {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,هلته عملیاتو په جوړولو سره کيږي.
 DocType: Asset Movement,Source Warehouse,سرچینه ګدام
 DocType: Installation Note,Installation Date,نصب او نېټه
@@ -3127,7 +3130,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,د چاپي کينډۍ لیک مشرانو.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,د چاپي کينډۍ عنوانونه لکه فورمه صورتحساب.
 DocType: Student Guardian,Student Guardian,د زده کونکو د ګارډین
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,سنجي ډول تورونه نه په توګه د ټوليزې په نښه کولای شي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 به د ناسم (Total) خالص وزن ارزښت لامل شي. ډاډه کړئ چې د هر توکی خالص وزن په همدې UOM ده.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,هیښ Rate
@@ -3155,7 +3158,7 @@
 DocType: Company,Exchange Gain / Loss Account,په بدل کې لاسته راغلې ګټه / زیان اکانټ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,د کارګر او د حاضرۍ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},هدف باید د یو وي {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,د فورمې په ډکولو او بيا يې خوندي
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,د ټولنې د بحث فورم
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,په سټاک واقعي qty
@@ -3171,7 +3174,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترمیمي Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,اوسنۍ دنده په پرانیستولو
 DocType: Company,Stock Adjustment Account,دحمل اصلاحاتو اکانټ
-DocType: Journal Entry,Write Off,ولیکئ پړاو
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ولیکئ پړاو
 DocType: Timesheet Detail,Operation ID,تذکرو د عملياتو
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",سيستم کارن (د ننوتو) پېژند. که ټاکل شوی، دا به د ټولو د بشري حقونو څانګې د فورمو default شي.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: له {1}
@@ -3182,27 +3185,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,عرضه کوونکي ته پيرودونکو برابروی
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# فورمه / د قالب / {0}) د ونډې څخه ده
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,بل نېټه بايد پست کوي نېټه څخه ډيره وي
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,خپرونه د ماليې راپرځيدو
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,خپرونه د ماليې راپرځيدو
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},له امله / ماخذ نېټه وروسته نه شي {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,په معلوماتو کې د وارداتو او صادراتو د
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",دحمل زياتونې ګدام {0} په وړاندې شتون لري، نو تاسو نشی کولای د بيا ورکړی او یا د بدلون لپاره دا
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,نه زده کوونکي موندل
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,نه زده کوونکي موندل
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,صورتحساب نوکرې نېټه
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,وپلوري
 DocType: Sales Invoice,Rounded Total,غونډ مونډ Total
 DocType: Product Bundle,List items that form the package.,لست کې د اقلامو چې د بنډل جوړوي.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,سلنه تخصيص بايد مساوي له 100٪ وي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,لطفا د ګوند په ټاکلو مخکې نوکرې نېټه وټاکئ
 DocType: Program Enrollment,School House,د ښوونځي ماڼۍ
 DocType: Serial No,Out of AMC,د AMC له جملې څخه
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,لطفا د داوطلبۍ انتخاب
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,لطفا د داوطلبۍ انتخاب
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,د Depreciations بک شمېر نه شي کولای ټول د Depreciations شمېر څخه ډيره وي
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,د کمکیانو لپاره د ساتنې او سفر
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,لطفا د کارونکي چې د خرڅلاو ماسټر مدير {0} رول سره اړیکه
 DocType: Company,Default Cash Account,Default د نقدو پیسو حساب
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,شرکت (نه پيرودونکو يا عرضه) بادار.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,دا د دې د زده کوونکو د ګډون پر بنسټ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,په هيڅ ډول زده کوونکي
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,نور توکي یا علني بشپړه فورمه ورزیات کړئ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',لطفا &#39;د تمی د سپارلو نېټه&#39;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,د سپارنې پرمهال یاداښتونه {0} بايد بندول د دې خرڅلاو نظم مخکې لغوه شي
@@ -3234,6 +3238,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,د قالب 3
 DocType: Purchase Order,Customer Contact Email,پيرودونکو سره اړيکي دبرېښنا ليک
 DocType: Warranty Claim,Item and Warranty Details,د قالب او ګرنټی نورولوله
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,شمیره code&gt; توکی ګروپ&gt; نښې
 DocType: Sales Team,Contribution (%),بسپنه)٪ (
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,يادونه: د پیسو د داخلولو به راهیسې جوړ نه شي &#39;د نغدي او يا بانک حساب ته&#39; نه مشخص
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,د پروګرام جبري کورسونه راوړي وټاکئ.
@@ -3249,9 +3254,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,مخکې له پخلاینې
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},د {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),مالیه او په تور د ورزیاتولو (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,د قالب د مالياتو د کتارونو تر {0} بايد د ډول د مالياتو او يا د عايداتو او يا اخراجاتو یا Chargeable ګڼون لری
 DocType: Sales Order,Partly Billed,خفيف د محاسبې
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,د قالب {0} بايد يوه ثابته شتمني د قالب وي
 DocType: Item,Default BOM,default هیښ
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,مهرباني وکړئ د بيا ډول شرکت نوم د تایید
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total وتلي نننیو
@@ -3261,8 +3266,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,مشين
 DocType: Vehicle,Insurance Company,د بیمې کمپنۍ
 DocType: Asset Category Account,Fixed Asset Account,د ثابت د شتمنیو د حساب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variable
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,څخه د سپارنې يادونه
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,variable
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,څخه د سپارنې يادونه
 DocType: Student,Student Email Address,د زده کوونکو دبرېښنا ليک پته:
 DocType: Timesheet Detail,From Time,له وخت
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,په ګدام کښي:
@@ -3274,12 +3279,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,د بیې په لېست د بدلولو نرخ
 DocType: Purchase Invoice Item,Rate,Rate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,پته نوم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,پته نوم
 DocType: Stock Entry,From BOM,له هیښ
 DocType: Assessment Code,Assessment Code,ارزونه کوډ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,د اساسي
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,مخکې {0} دي کنګل دحمل معاملو
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',مهرباني وکړی د &#39;تولید مهال ویش&#39; کیکاږۍ
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",د بيلګې په توګه کيلوګرامه، واحد، وځيري، متر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ماخذ نه فرض ده که تاسو ماخذ نېټه ته ننوتل
 DocType: Bank Reconciliation Detail,Payment Document,د پیسو د سند
@@ -3287,19 +3292,19 @@
 DocType: Salary Slip,Salary Structure,معاش جوړښت
 DocType: Account,Bank,بانک د
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,هوايي شرکت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Issue مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Issue مواد
 DocType: Material Request Item,For Warehouse,د ګدام
 DocType: Employee,Offer Date,وړاندیز نېټه
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Quotations
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,تاسو په نالیکي اکر کې دي. تاسو به ونه کړای شي تر هغه وخته چې د شبکې لري بيا راولېښئ.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,نه د زده کوونکو ډلو جوړ.
 DocType: Purchase Invoice Item,Serial No,پر له پسې ګڼه
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,میاشتنی پور بيرته مقدار نه شي کولای د پور مقدار زیات شي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,مهرباني وکړئ لومړی داخل Maintaince نورولوله
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,مهرباني وکړئ لومړی داخل Maintaince نورولوله
 DocType: Purchase Invoice,Print Language,چاپ ژبه
 DocType: Salary Slip,Total Working Hours,Total کاري ساعتونه
 DocType: Stock Entry,Including items for sub assemblies,په شمول د فرعي شوراګانو لپاره شیان
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,وليکئ ارزښت باید مثبتې وي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ټول سیمې
 DocType: Purchase Invoice,Items,توکي
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,د زده کوونکو د مخکې شامل.
@@ -3319,17 +3324,15 @@
 DocType: Issue,Opening Time,د پرانستلو په وخت
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,څخه او د خرما اړتیا
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,امنيت &amp; Commodity exchanges
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',د variant اندازه Default واحد &#39;{0}&#39; باید په کينډۍ ورته وي &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,محاسبه په اساس
 DocType: Delivery Note Item,From Warehouse,له ګدام
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,سره د توکو بیل نه توکي تولید
 DocType: Assessment Plan,Supervisor Name,څارونکي نوم
 DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
 DocType: Program Enrollment Course,Program Enrollment Course,پروګرام شمولیت کورس
-DocType: Grading Structure,Grading Structure,د رتبو جوړښت
 DocType: Purchase Taxes and Charges,Valuation and Total,ارزښت او Total
 DocType: Tax Rule,Shipping City,انتقال ښار
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,دا قالب د {0} (کينډۍ) يو variant ده. صفات به د کېنډۍ څخه مګر نه کاپي &#39;ټاکل شوې ده باندې د ټولګړو شي
 DocType: Notification Control,Customize the Notification,د خبرتیا دتنظيمولو
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,له عملیاتو په نقدو پیسو د جریان
 DocType: Sales Invoice,Shipping Rule,انتقال حاکمیت
@@ -3350,8 +3353,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},نه default هیښ لپاره د قالب موجود {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,مهرباني وکړئ لومړی انتخاب نوکرې نېټه
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,پرانيستل نېټه بايد تړل د نیټې څخه مخکې وي
 DocType: Leave Control Panel,Carry Forward,مخ په وړاندې ترسره کړي
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,د موجوده معاملو لګښت مرکز بدل نه شي چې د پنډو
 DocType: Department,Days for which Holidays are blocked for this department.,ورځو لپاره چې د رخصتۍ لپاره د دې ادارې تړل شوي دي.
@@ -3364,7 +3367,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,مل ليک
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,تېر مخابراتو
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;ارزښت او Total&#39; دی
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.",ستاسو د مالیه سرونه لست؛ د دوی د معياري کچه (د بيلګې په VAT، د ګمرکونو او نور نو بايد بې سارې نومونو لري) او. دا به د يوې معياري کېنډۍ، چې تاسو کولای شي د سمولو او وروسته اضافه رامنځته کړي.
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},د Serialized د قالب سریال ترانسفارمرونو د مطلوب {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,سره صورتحساب لوبه د پیسو ورکړه
@@ -3380,7 +3383,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (نننیو)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,ساعتېري &amp; تفريح
 DocType: Quality Inspection,Item Serial No,د قالب شعبه
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,کارکوونکی سوابق جوړول
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,کارکوونکی سوابق جوړول
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total حاضر
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,د محاسبې څرګندونې
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ساعت
@@ -3393,10 +3396,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,نامعلوم
 DocType: Shipping Rule,Shipping Rule Conditions,انتقال حاکمیت شرايط
 DocType: BOM Replace Tool,The new BOM after replacement,د ځای ناستی وروسته د نوي هیښ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,د دخرسون ټکی
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,د دخرسون ټکی
 DocType: Payment Entry,Received Amount,د مبلغ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,لطفا د تشکیلاتو کارکوونکی کې د بشري منابعو د سیستم نوم&gt; د بشري حقونو څانګې امستنې
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",د بشپړ مقدار جوړول، لا له وړاندي په موخه سترګې پټې کمیت
 DocType: Account,Tax,د مالياتو
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نه ولمانځل شوه
@@ -3409,9 +3410,9 @@
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Batch,Source Document Name,سرچینه د سند نوم
 DocType: Job Opening,Job Title,د دندې سرلیک
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,کارنان جوړول
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,کارنان جوړول
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ګرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,مقدار تولید باید په پرتله 0 ډيره وي.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,د ساتنې غوښتنې ته راپور ته سفر وکړي.
 DocType: Stock Entry,Update Rate and Availability,تازه Rate او پیدايښت
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,سلنه تاسو اجازه لري چې د تر لاسه او یا د کمیت امر په وړاندې د زيات ورسوي. د مثال په توګه: که تاسو د 100 واحدونو ته امر وکړ. او ستاسو امتياز٪ 10 نو بيا تاسو ته اجازه لري چې 110 واحدونه ترلاسه ده.
@@ -3421,28 +3422,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اخراجاتو حساب لپاره توکی الزامی دی {0}
 DocType: BOM,Website Description,وېب پاڼه Description
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,په مساوات خالص د بدلون
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,لطفا لغوه رانيول صورتحساب {0} په لومړي
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",دبرېښنا ليک پته بايد د بې سارې وي، له مخکې د شتون {0}
 DocType: Serial No,AMC Expiry Date,AMC د پای نېټه
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,رسيد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,رسيد
 ,Sales Register,خرڅلاو د نوم ثبتول
 DocType: Daily Work Summary Settings Company,Send Emails At,برېښناليک وليږئ کې
 DocType: Quotation,Quotation Lost Reason,د داوطلبۍ ورک دلیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,ستاسو د Domain وټاکئ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},د راکړې ورکړې اشاره نه {0} د میاشتې په {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,هيڅ د سمولو لپاره شتون لري.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,لنډيز لپاره د دې مياشتې او په تمه فعالیتونو
 DocType: Customer Group,Customer Group Name,پيرودونکو ډلې نوم
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,نه پېرېدونکي تر اوسه!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,نقدو پیسو د جریان اعلامیه
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},د پور مقدار نه شي کولای د اعظمي پور مقدار زیات {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,منښتليک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},لطفا لرې دې صورتحساب {0} څخه C-فورمه {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,لطفا حساب ولیکئ پړاو
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,تېره نظم نېټه
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ګڼون {0} کوي شرکت ته نه پورې {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,په قطار {0} سریال شمیرې سره د سپارلو يادونه سره سمون نه خوري
 DocType: Student,Guardian Details,د ګارډین په بشپړه توګه کتل
 DocType: C-Form,C-Form,C-فورمه
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,د څو کارکوونکي مارک حاضريدل
@@ -3467,20 +3470,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',د کتارونو تر {0} # حساب بايد د ډول وي شتمن &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,له جملې څخه Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,اصول د يو خرڅلاو لپاره انتقال د مقدار دمحاسبې
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,لړۍ الزامی دی
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,لړۍ الزامی دی
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالي خدمتونه
 DocType: Student Sibling,Student ID,زده کوونکي د پیژندنې
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,لپاره د وخت کندي د فعالیتونو ډولونه
 DocType: Tax Rule,Sales,خرڅلاو
 DocType: Stock Entry Detail,Basic Amount,اساسي مقدار
 DocType: Training Event,Exam,ازموينه
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},ګدام لپاره سټاک د قالب اړتیا {0}
 DocType: Leave Allocation,Unused leaves,ناکارېدلې پاڼي
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,CR
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,CR
 DocType: Tax Rule,Billing State,د بیلونو د بهرنیو چارو
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,د انتقال د
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} د {1} سره ګوند حساب تړاو نه {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} د {1} سره ګوند حساب تړاو نه {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),چاودنه هیښ (فرعي شوراګانو په ګډون) د راوړلو
 DocType: Authorization Rule,Applicable To (Employee),د تطبیق وړ د (کارکوونکی)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,له امله نېټه الزامی دی
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,د خاصې لپاره بهرمن {0} 0 نه شي
@@ -3491,13 +3494,13 @@
 ,Inactive Customers,ناچارنده پېرودونکي
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,معاملو رانيول
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,څنګه د بیې د حاکمیت د اجرا وړ ده؟
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,څنګه د بیې د حاکمیت د اجرا وړ ده؟
 DocType: Stock Entry,Delivery Note No,د سپارنې پرمهال يادونه نه
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",که وکتل، يوازې پیري وروستۍ خامو موادو د مادي غوښتنې به په مادي غوښتنې شامل شي. که نه نو، د مور او پلار په پېژندتورو مادي غوښتنې به رامنځته شي
 DocType: Cheque Print Template,Message to show,پيغام تر څو وښيي
 DocType: Company,Retail,پرچون
 DocType: Attendance,Absent,غیرحاضر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,د محصول د بنډل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,د محصول د بنډل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},د کتارونو تر {0}: ناسم مرجع {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,پیري مالیات او په تور کينډۍ
 DocType: Upload Attendance,Download Template,دانلود کينډۍ
@@ -3507,10 +3510,10 @@
 DocType: Payment Entry,Account Paid From,حساب ورکړل له
 DocType: Purchase Order Item Supplied,Raw Material Item Code,لومړنیو توکو د قالب کوډ
 DocType: Journal Entry,Write Off Based On,ولیکئ پړاو پر بنسټ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,د کمکیانو لپاره د مشرتابه
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,د کمکیانو لپاره د مشرتابه
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,چاپ او قرطاسيه
 DocType: Stock Settings,Show Barcode Field,انکړپټه ښودل Barcode ساحوي
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,عرضه برېښناليک وليږئ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,عرضه برېښناليک وليږئ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",معاش لا د تر منځ د {0} او {1}، پريږدئ درخواست موده دې نېټې لړ تر منځ نه وي موده پروسس.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,لپاره د سریال شمیره نصب ریکارډ
 DocType: Guardian Interest,Guardian Interest,د ګارډین په زړه پوري
@@ -3523,6 +3526,7 @@
 DocType: Offer Letter,Awaiting Response,په تمه غبرګون
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,پورته
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},ناباوره ځانتیا د {0} د {1}
+DocType: Supplier,Mention if non-standard payable account,یادونه که غیر معیاري د تادیې وړ حساب
 DocType: Salary Slip,Earning & Deduction,وټې &amp; Deduction
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاري. دا امستنې به په بېلا بېلو معاملو چاڼ وکارول شي.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفي ارزښت Rate اجازه نه وي
@@ -3538,10 +3542,9 @@
 DocType: Production Order Item,Production Order Item,تولید نظم قالب
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,څه شی پيدا نشول
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,د پرزه د شتمنیو د لګښت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,په نسبی ډول ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} د {1}: لګښت لپاره مرکز د قالب الزامی دی {2}
 DocType: Vehicle,Policy No,د پالیسۍ نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,څخه د محصول د بنډل توکي ترلاسه کړئ
 DocType: Asset,Straight Line,سیده کرښه
 DocType: Project User,Project User,د پروژې د کارن
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,وېشل شوى
@@ -3559,7 +3562,7 @@
 DocType: Program Enrollment Tool,Get Students From,زده کونکي له ترلاسه کړئ
 DocType: Hub Settings,Seller Country,پلورونکی هېواد
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,په وېب پاڼه د خپرېدو لپاره توکي
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,ګروپ په دستو ستاسو د زده کوونکو
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,ګروپ په دستو ستاسو د زده کوونکو
 DocType: Authorization Rule,Authorization Rule,د واک ورکولو د حاکمیت
 DocType: Sales Invoice,Terms and Conditions Details,د قرارداد شرايط په بشپړه توګه کتل
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,مشخصاتو
@@ -3612,14 +3615,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,آرډر نېټه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},ګڼون {0}: Parent حساب {1} نه پورې شرکت نه لري چې: {2}
 DocType: Program Enrollment Tool,Student Applicants,د زده کونکو د درخواست
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,په بریالیتوب سره د دې شرکت ته اړوند ټولو معاملو ړنګ!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,په بریالیتوب سره د دې شرکت ته اړوند ټولو معاملو ړنګ!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,په توګه د تاريخ
 DocType: Appraisal,HR,د بشري حقونو څانګه
 DocType: Program Enrollment,Enrollment Date,د شموليت نېټه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,تعليقي
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,معاش د اجزاو
 DocType: Program Enrollment Tool,New Academic Year,د نوي تعليمي کال د
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,بیرته / اعتبار يادونه
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,بیرته / اعتبار يادونه
 DocType: Stock Settings,Auto insert Price List rate if missing,کړکېو کې درج د بیې په لېست کچه که ورک
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,ټولې ورکړل شوې پیسې د
 DocType: Production Order Item,Transferred Qty,انتقال Qty
@@ -3639,7 +3642,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",د پاڼو په شان واله ډول، ناروغ او داسې نور
 DocType: Email Digest,Send regular summary reports via Email.,منظم لنډیز راپورونه ليک له لارې واستوئ.
 DocType: Payment Entry,PE-,پيشبيني شوي
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},لطفا په اخراجاتو ادعا ډول default ګڼون جوړ {0}
 DocType: Assessment Result,Student Name,د زده کوونکو نوم
 DocType: Brand,Item Manager,د قالب مدير
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,د معاشونو د راتلوونکې
@@ -3660,6 +3663,7 @@
 ,Sales Funnel,خرڅلاو کیږدئ
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abbreviation الزامی دی
 DocType: Project,Task Progress,کاري پرمختګ
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,کراچۍ
 ,Qty to Transfer,Qty ته سپاري
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ته د ياه یا پېرېدونکي له قوله.
 DocType: Stock Settings,Role Allowed to edit frozen stock,رول اجازه کنګل سټاک د سمولو
@@ -3687,13 +3691,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,د قالب تدبيراومصلحت سره د مالياتو د تفصیلي
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,انستیتوت Abbreviation
 ,Item-wise Price List Rate,د قالب-هوښيار بیې په لېست کې و ارزوئ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,عرضه کوونکي د داوطلبۍ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,عرضه کوونکي د داوطلبۍ
 DocType: Quotation,In Words will be visible once you save the Quotation.,په کلیمو کې به د ليدو وړ وي. هر کله چې تاسو د داوطلبۍ وژغوري.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) نه په قطار یوه برخه وي {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,فیس راټول
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} د مخه په قالب کارول {1}
 DocType: Lead,Add to calendar on this date,په دې نېټې جنتري ورزیات کړئ
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,د زياته کړه لېږد لګښتونه اصول.
 DocType: Item,Opening Stock,پرانيستل دحمل
@@ -3710,8 +3714,8 @@
 Updated via 'Time Log'",په دقيقه يي روز &#39;د وخت څېره&#39; له لارې
 DocType: Customer,From Lead,له کوونکۍ
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,امر د تولید لپاره د خوشې شول.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالي کال لپاره وټاکه ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالي کال لپاره وټاکه ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS د پېژندنې اړتيا ته POS انفاذ لپاره
 DocType: Program Enrollment Tool,Enroll Students,زده کوونکي شامل کړي
 DocType: Hub Settings,Name Token,نوم د نښې
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,معياري پلورل
@@ -3722,7 +3726,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} خرڅلاو صورتحساب په وړاندې د {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,د پروژې نوم
-DocType: Supplier,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
+DocType: Customer,Mention if non-standard receivable account,یادونه که غیر معیاري ترلاسه حساب
 DocType: Journal Entry Account,If Income or Expense,که پر عايداتو او يا اخراجاتو
 DocType: Production Order,Required Items,د اړتیا توکي
 DocType: Stock Ledger Entry,Stock Value Difference,دحمل ارزښت بدلون
@@ -3743,7 +3747,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ټولګې اهدافو د قالب ګروپ-هوښيار د دې خرڅلاو شخص.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],د يخبندان په ډیپو کې د زړو څخه [ورځې]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,د کتارونو تر # {0}: د شتمنیو لپاره ثابته شتمني د اخیستلو / خرڅلاو الزامی دی
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",که دوه يا زيات د بیې اصول دي د پورته شرايطو پر بنسټ وموندل شول، د لومړيتوب په توګه استعماليږي. د لومړیتوب دا دی چې 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.,اجازه لاندې کاروونکو لپاره د بنديز ورځو اجازه غوښتنلیکونه تصویب کړي.
@@ -3769,7 +3773,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,د قالب {0} ځکه چې له پامه غورځول يوه سټاک توکی نه دی
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",ته په یوه ځانګړی د راکړې ورکړې د بیو د حاکمیت د پلي کېدو وړ نه، ټولو تطبيقېدونکو د بیې اصول بايد نافعال شي.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ته په یوه ځانګړی د راکړې ورکړې د بیو د حاکمیت د پلي کېدو وړ نه، ټولو تطبيقېدونکو د بیې اصول بايد نافعال شي.
 DocType: Assessment Group,Parent Assessment Group,د موروپلار د ارزونې ګروپ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,دندې
 ,Sales Order Trends,خرڅلاو نظم رجحانات
@@ -3780,7 +3784,7 @@
 DocType: Stock Entry Detail,Additional Cost,اضافي لګښت
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,د مالي کال د پای نیټه
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",نه ګټمنو نه پر بنسټ کولای شي Filter، که ګروپ له خوا د ګټمنو
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,عرضه د داوطلبۍ د کمکیانو لپاره
 DocType: Quality Inspection,Incoming,راتلونکي
 DocType: BOM,Materials Required (Exploded),د توکو ته اړتیا ده (چاودنه)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",کارنان ستاسو د سازمان په پرتله خپل ځان د نورو ورزیات کړئ،
@@ -3808,6 +3812,7 @@
 DocType: Employee,History In Company,تاریخ په شرکت
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرپا
 DocType: Stock Ledger Entry,Stock Ledger Entry,دحمل د پنډو انفاذ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,پيرودونکو&gt; پيرودونکو ګروپ&gt; خاوره
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ورته توکی دی څو ځله داخل شوي دي
 DocType: Department,Leave Block List,پريږدئ بالک بشپړفهرست
 DocType: Sales Invoice,Tax ID,د مالياتو د تذکرو
@@ -3817,7 +3822,7 @@
 DocType: Customer,Sales Partner and Commission,خرڅلاو همکار او کميسيون
 DocType: Employee Loan,Rate of Interest (%) / Year,د په زړه پوری (٪) / کال کچه
 ,Project Quantity,د پروژې د مقدار
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Total {0} لپاره ټول توکي صفر دی، کېدی شي چې تاسو باید بدلون &#39;په تور ویشي پر بنسټ&#39;
 DocType: Opportunity,To Discuss,د خبرو اترو
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} د واحدونو {1} د {2} د دې معاملې د بشپړولو لپاره اړتيا لري.
 DocType: Loan Type,Rate of Interest (%) Yearly,د ګټې کچه)٪ (کلنی
@@ -3832,7 +3837,7 @@
 DocType: Purchase Invoice,Return,بیرته راتګ
 DocType: Production Order Operation,Production Order Operation,تولید نظم عمليات
 DocType: Pricing Rule,Disable,نافعال
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,د پیسو اکر ته اړتيا ده چې د پیسو لپاره
 DocType: Project Task,Pending Review,انتظار کتنه
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",د شتمنیو د {0} نه پرزه شي، لکه څنګه چې د مخه د {1}
 DocType: Task,Total Expense Claim (via Expense Claim),Total اخراجاتو ادعا (اخراجاتو ادعا له لارې)
@@ -3840,11 +3845,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک حاضر
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},د کتارونو تر {0}: د هیښ # د اسعارو د {1} بايد مساوي د ټاکل اسعارو وي {2}
 DocType: Journal Entry Account,Exchange Rate,د بدلولو نرخ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,خرڅلاو نظم {0} نه سپارل
 DocType: Homepage,Tag Line,Tag کرښې
 DocType: Fee Component,Fee Component,فیس برخه
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,د بیړیو د مدیریت
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Add له توکي
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Add له توکي
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},ګدام {0}: Parent حساب {1} نه د شرکت ته نه bolong {2}
 DocType: Cheque Print Template,Regular,منظم
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,د ټولو د ارزونې معیارونه ټول Weightage باید 100٪ شي
@@ -3857,7 +3862,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,د ټاکل شوي توکي نه شي کولای دسته لري
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",سنجي کچه د {0} د توکي، چې اړتيا ده چې د محاسبې د زياتونې نه موندل {1} {2}. که توکی په توګه په یوه نمونه توکی transacting د {1}، لطفا یادونه چې په {1} شمیره جدول. که نه نو، لطفا لپاره په سامان ریکارډ د توکی یا ذکر د ارزښت په کچه راتلونکي سټاک معامله جوړ کړي، او بیا هڅه submiting / دا ننوت فسخه
 DocType: Delivery Note,% of materials delivered against this Delivery Note,٪ د توکو د دې سپارنې يادونه وړاندې کولو
 DocType: Project,Customer Details,پيرودونکو په بشپړه توګه کتل
@@ -3866,15 +3871,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,د ترلاسه وځيري url عوامل وليکئ
 DocType: Payment Entry,Paid Amount,ورکړل مقدار
 DocType: Assessment Plan,Supervisor,څارونکي
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,په آنلاین توګه
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,په آنلاین توګه
 ,Available Stock for Packing Items,د ت توکي موجود دحمل
 DocType: Item Variant,Item Variant,د قالب variant
 DocType: Assessment Result Tool,Assessment Result Tool,د ارزونې د پایلو د اوزار
 DocType: BOM Scrap Item,BOM Scrap Item,هیښ Scrap د قالب
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ته وسپارل امر نه ړنګ شي
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,د کیفیت د مدیریت
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} د قالب نافعال شوی دی
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} د قالب نافعال شوی دی
 DocType: Employee Loan,Repay Fixed Amount per Period,هر دوره ثابته مقدار ورکول
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},لورينه وکړئ د قالب اندازه داخل {0}
 DocType: Employee External Work History,Employee External Work History,د کارګر د بهرنيو کار تاریخ
@@ -3901,7 +3906,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,د زده کونکو د ليک ID
 DocType: Employee,Notice (days),خبرتیا (ورځې)
 DocType: Tax Rule,Sales Tax Template,خرڅلاو د مالياتو د کينډۍ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,توکي چې د صورتحساب د ژغورلو وټاکئ
 DocType: Employee,Encashment Date,د ورکړې نېټه
 DocType: Training Event,Internet,د انټرنېټ
 DocType: Account,Stock Adjustment,دحمل اصلاحاتو
@@ -3925,7 +3930,7 @@
 DocType: Item Variant Attribute,Attribute,ځانتیا
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,لطفآ د مشخص / ته ښیی
 DocType: Serial No,Under AMC,لاندې AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,د قالب د ارزښت په کچه لګیدلي لګښت کوپون اندازه په پام کې recalculated
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,د قالب د ارزښت په کچه لګیدلي لګښت کوپون اندازه په پام کې recalculated
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,د معاملو د پلورلو تلواله امستنو.
 DocType: Guardian,Guardian Of ,ګارډین د
 DocType: Grading Scale Interval,Threshold,حد
@@ -3935,6 +3940,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ډیبیټ يادونه خپور شوی
 DocType: Production Order,Warehouses,Warehouses
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} د شتمنیو نه انتقال شي
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,د دې توکي د {0} (کينډۍ) يو variant ده.
 DocType: Workstation,per hour,په يوه ګړۍ کې
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,د خريدارۍ د
 DocType: Announcement,Announcement,اعلانونه
@@ -3950,8 +3956,8 @@
 DocType: Account,Receivable,ترلاسه
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,د کتارونو تر # {0}: نه، اجازه لري چې عرضه بدلون په توګه د اخستلو د امر د مخکې نه شتون
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,رول چې اجازه راکړه ورکړه چې د پور د حدودو ټاکل تجاوز ته وړاندې کړي.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,وړانديزونه وټاکئ جوړون
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",د بادار د معلوماتو syncing، دا به يو څه وخت ونيسي
 DocType: Item,Material Issue,مادي Issue
 DocType: Hub Settings,Seller Description,پلورونکی Description
 DocType: Employee Education,Qualification,وړتوب
@@ -3963,7 +3969,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,امر وکړ
 DocType: Salary Detail,Component,برخه
 DocType: Assessment Criteria,Assessment Criteria Group,د ارزونې معیارونه ګروپ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},د استهلاک د پرانيستلو باید په پرتله مساوي کمه وي {0}
 DocType: Warehouse,Warehouse Name,ګدام نوم
 DocType: Naming Series,Select Transaction,انتخاب معامالتو
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,لطفا رول تصويب يا تصويب کارن
@@ -3976,7 +3982,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,لغوه نه شي کولای، ځکه وړاندې دحمل انفاذ {0} شتون لري
 DocType: Employee Loan,Disbursement Date,دویشلو نېټه
 DocType: Vehicle,Vehicle,موټر
 DocType: Purchase Invoice,In Words,په وييکي
@@ -3991,14 +3997,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,د کارموندنۍ / مشري٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,د شتمنیو Depreciations او انډول.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},مقدار د {0} د {1} څخه انتقال {2} د {3}
 DocType: Sales Invoice,Get Advances Received,ترلاسه کړئ پرمختګونه تر لاسه کړي
 DocType: Email Digest,Add/Remove Recipients,Add / اخیستونکو کړئ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},د راکړې ورکړې ودرول تولید په وړاندې د نه اجازه نظم {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",د دې مالي کال په توګه (Default) جوړ، په &#39;د ټاکلو په توګه Default&#39; کیکاږۍ
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,سره یو ځای شول
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,په کمښت کې Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,د قالب variant {0} سره ورته صفاتو شتون
 DocType: Employee Loan,Repay from Salary,له معاش ورکول
 DocType: Leave Application,LAP/,دورو /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},د غوښتنې په وړاندې د پیسو {0} د {1} لپاره د اندازه {2}
@@ -4016,7 +4022,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,د ارزونې د پایلو د تفصیلي
 DocType: Employee Education,Employee Education,د کارګر ښوونه
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,دوه ګونو توکی ډلې په توکی ډلې جدول کې وموندل
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,دا ته اړتيا ده، د قالب نورولوله راوړي.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} لا ترلاسه شوي دي
@@ -4025,7 +4031,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",ګدام {0} دی چې د هر حساب سره اړيکي نه لري، نو مهرباني رامنځته / د ګدام د استازیتوب د (د شتمنیو د) حساب سره تړنې لري.
 DocType: Purchase Invoice,Recurring Id,راګرځېدل Id
 DocType: Customer,Sales Team Details,خرڅلاو ټيم په بشپړه توګه کتل
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,د تل لپاره ړنګ کړئ؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,د تل لپاره ړنګ کړئ؟
 DocType: Expense Claim,Total Claimed Amount,Total ادعا مقدار
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,د پلورلو د بالقوه فرصتونو.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},باطلې {0}
@@ -4036,13 +4042,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup په ERPNext ستاسو په ښوونځي
 DocType: Sales Invoice,Base Change Amount (Company Currency),اډه د بدلون مقدار (شرکت د اسعارو)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,د لاندې زېرمتونونه د محاسبې نه زياتونې
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,لومړی سند وژغورۍ.
 DocType: Account,Chargeable,Chargeable
 DocType: Company,Change Abbreviation,د بدلون Abbreviation
 DocType: Expense Claim Detail,Expense Date,اخراجاتو نېټه
 DocType: Item,Max Discount (%),Max کمښت)٪ (
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,تېره نظم مقدار
+DocType: Task,Is Milestone,آیا د معیار
 DocType: Daily Work Summary,Email Sent To,د برېښناليک لېږلو
 DocType: Budget,Warn,خبرداری
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کوم بل څرګندونې، د یادولو وړ هڅې چې بايد په اسنادو ته ولاړ شي.
@@ -4063,7 +4070,7 @@
 DocType: Item Attribute Value,Attribute Value,منسوب ارزښت
 ,Itemwise Recommended Reorder Level,نورتسهیالت وړانديز شوي ترمیمي د ليول
 DocType: Salary Detail,Salary Detail,معاش تفصیلي
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,مهرباني غوره {0} په لومړي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,مهرباني غوره {0} په لومړي
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,دسته {0} د قالب {1} تېر شوی دی.
 DocType: Sales Invoice,Commission,کمیسیون
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,د تولید د وخت پاڼه.
@@ -4075,41 +4082,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`د يخبندان په ډیپو کې د زړو Than` بايد٪ d ورځو په پرتله کوچنی وي.
 DocType: Tax Rule,Purchase Tax Template,پیري د مالياتو د کينډۍ
 ,Project wise Stock Tracking,د پروژې هوښيار دحمل څارلو
-apps/erpnext/erpnext/maintenance/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 +12,Employee records.,د کارګر اسناد.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,مهرباني وکړئ ټاکل بل د استهالک نېټه
 DocType: HR Settings,Payroll Settings,د معاشاتو په امستنې
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غیر تړاو بلونه او د تادياتو لوبه.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ځای نظم
 DocType: Email Digest,New Purchase Orders,نوي رانيول امر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,د ريښو نه شي کولای د يو مور او لګښت مرکز لری
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,انتخاب دتوليد ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,انتخاب دتوليد ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,جمع د استهالک په توګه د
 DocType: Sales Invoice,C-Form Applicable,C-فورمه د تطبیق وړ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},د وخت عمليات بايد د عملياتو 0 څخه ډيره وي {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ګدام الزامی دی
 DocType: Supplier,Address and Contacts,پته او اړیکې
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM اړونه تفصیلي
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),له خوا 100px (w) وېب دوستانه 900px وساتي دا (h)
 DocType: Program,Program Abbreviation,پروګرام Abbreviation
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,يو قالب کينډۍ پر وړاندې د تولید نظم نه راپورته شي
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,په تور د هري برخي په وړاندې په رانيول رسيد تازه دي
 DocType: Warranty Claim,Resolved By,حل د
 DocType: Bank Guarantee,Start Date,پیل نېټه
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,د يوې مودې لپاره پاڼي تخصيص.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques او سپما په ناسم ډول پاکه
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ګڼون {0}: تاسو نه شي کولاي ځان د مور او پلار په پام کې وګماری
 DocType: Purchase Invoice Item,Price List Rate,د بیې په لېست Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,د پېرېدونکو يادي جوړول
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,د پېرېدونکو يادي جوړول
 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 +38,Bill of Materials (BOM),د توکو Bill (هیښ)
 DocType: Item,Average time taken by the supplier to deliver,د وخت اوسط د عرضه کوونکي له خوا اخيستل ته ورسوي
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,د ارزونې د پايلو
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ساعتونه
 DocType: Project,Expected Start Date,د تمی د پیل نیټه
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,توکی لرې که په تور د تطبیق وړ نه دی چې توکی
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,د راکړې ورکړې د اسعارو په توګه باید د پیسو ليدونکی اسعارو ورته وي
 DocType: Payment Entry,Receive,تر لاسه
@@ -4120,19 +4126,19 @@
 DocType: Workstation,Operating Costs,د عملیاتي لګښتونو
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,که کړنه جمع میاشتنی بودجې زیات شو
 DocType: Purchase Invoice,Submit on creation,پر رامنځته سپارل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},د اسعارو د {0} بايد د {1}
 DocType: Asset,Disposal Date,برطرف نېټه
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",برېښناليک به د ورکړل ساعت چې د شرکت د ټولو فعاله کارمندان واستول شي، که رخصتي نه لرو. د ځوابونو لنډیز به په نيمه شپه ته واستول شي.
 DocType: Employee Leave Approver,Employee Leave Approver,د کارګر اجازه Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},د کتارونو تر {0}: د نورو ترمیمي د ننوتلو مخکې د دې ګودام شتون {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",په توګه له لاسه نه اعلان کولای، ځکه د داوطلبۍ شوی دی.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,د زده کړې Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,تولید نظم {0} بايد وسپارل شي
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},مهرباني غوره لپاره د قالب د پیل نیټه او پای نیټه {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},مهرباني غوره لپاره د قالب د پیل نیټه او پای نیټه {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},د کورس په قطار الزامی دی {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تر اوسه پورې ونه شي کولای له نېټې څخه مخکې وي
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Add / سمول نرخونه
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Add / سمول نرخونه
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Batch,Parent Batch,د موروپلار دسته
 DocType: Cheque Print Template,Cheque Print Template,آرډر چاپ کينډۍ
@@ -4146,7 +4152,7 @@
 ,Ordered Items To Be Delivered,امر سامان ته تحویلیږي
 DocType: Account,Income,پر عايداتو
 DocType: Industry Type,Industry Type,صنعت ډول
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,کومه تیروتنه وشوه!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,کومه تیروتنه وشوه!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,خبرداری: د وتو درخواست لاندې د بنديز خرما لرونکی د
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,خرڅلاو صورتحساب {0} د مخکې نه سپارل
 DocType: Assessment Result Detail,Score,نمره
@@ -4177,17 +4183,17 @@
 DocType: Item,Variant Based On,variant پر بنسټ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Total weightage ګمارل باید 100٪ شي. دا د {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ستاسو د عرضه کوونکي
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,نه شي په توګه له السه په توګه خرڅلاو نظم جوړ شوی دی.
 DocType: Request for Quotation Item,Supplier Part No,عرضه برخه نه
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ترلاسه له
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',وضع نه شي کله چې وېشنيزه کې د &#39;ارزښت&#39; یا د &#39;Vaulation او Total&#39; دی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ترلاسه له
 DocType: Lead,Converted,بدلوی
 DocType: Item,Has Serial No,لري شعبه
 DocType: Employee,Date of Issue,د صدور نېټه
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: د {0} د {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: د {0} د {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},د کتارونو تر # {0}: د جنس د ټاکلو په عرضه {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,د کتارونو تر {0}: ساعتونه ارزښت باید له صفر څخه زیات وي.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,وېب پاڼه Image {0} چې په قالب {1} وصل ونه موندل شي
 DocType: Issue,Content Type,منځپانګه ډول
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,کمپيوټر
 DocType: Item,List this Item in multiple groups on the website.,په د ويب پاڼې د څو ډلو د دې توکي لست کړئ.
@@ -4196,20 +4202,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,تاسو د ګنګل ارزښت جوړ واک نه دي
 DocType: Payment Reconciliation,Get Unreconciled Entries,تطبیق توکي ترلاسه کړئ
 DocType: Payment Reconciliation,From Invoice Date,له صورتحساب نېټه
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,د بلونو د اسعارو بايد مساوي يا default comapany د پيسو او يا د ګوند حساب اسعارو وي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,په نقطو څخه ووځي
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,دا څه کوي؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ته ګدام
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ټول د زده کوونکو د شمولیت
 ,Average Commission Rate,په اوسط ډول د کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;لري شعبه&#39; د غیر سټاک توکی نه وي &#39;هو&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,د حاضرۍ د راتلونکي لپاره د خرما نه په نښه شي
 DocType: Pricing Rule,Pricing Rule Help,د بیې د حاکمیت مرسته
 DocType: School House,House Name,ماڼۍ نوم
 DocType: Purchase Taxes and Charges,Account Head,ګڼون مشر
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,اضافي لګښتونه د اوسمهالولو لپاره د توکو لګیدلي لګښت محاسبه
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,برق
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ستاسو د کاروونکو د خپل سازمان د پاتې کړئ. تاسو هم کولای شی چې ستاسو تانبه پېرېدونکي ته بلنه اضافه له خوا څخه د اړيکې شمېره زياته يې
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ستاسو د کاروونکو د خپل سازمان د پاتې کړئ. تاسو هم کولای شی چې ستاسو تانبه پېرېدونکي ته بلنه اضافه له خوا څخه د اړيکې شمېره زياته يې
 DocType: Stock Entry,Total Value Difference (Out - In),Total ارزښت بدلون (له جملې څخه - په)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4218,7 +4224,7 @@
 DocType: Item,Customer Code,پيرودونکو کوډ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},د کالیزې په ياد راولي {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ورځو راهیسې تېر نظم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,د حساب ډیبیټ باید د موازنې د پاڼه په پام کې وي
 DocType: Buying Settings,Naming Series,نوم لړۍ
 DocType: Leave Block List,Leave Block List Name,پريږدئ بالک بشپړفهرست نوم
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,د بيمې د پیل نیټه بايد د بيمې د پای نیټه په پرتله کمه وي
@@ -4233,9 +4239,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},د کارکوونکي معاش ټوټه {0} د مخه د وخت په پاڼه کې جوړ {1}
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,امر Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,د قالب {0} معلول دی
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,د قالب {0} معلول دی
 DocType: Stock Settings,Stock Frozen Upto,دحمل ګنګل ترمړوندونو پورې
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,هیښ کوم سټاک توکی نه لري
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},دوره او د د دورې ته د خرما د تکراري اجباري {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,د پروژې د فعاليت / دنده.
 DocType: Vehicle Log,Refuelling Details,Refuelling نورولوله
@@ -4245,8 +4251,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,تېره اخیستلو کچه ونه موندل شو
 DocType: Purchase Invoice,Write Off Amount (Company Currency),مقدار ولیکئ پړاو (د شرکت د اسعارو)
 DocType: Sales Invoice Timesheet,Billing Hours,بلونو ساعتونه
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,د {0} ونه موندل Default هیښ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,د کتارونو تر # {0}: مهرباني وکړئ ټاکل ترمیمي کمیت
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,دلته يې اضافه توکي tap
 DocType: Fees,Program Enrollment,پروګرام شمولیت
 DocType: Landed Cost Voucher,Landed Cost Voucher,تيرماښام لګښت ګټمنو
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},لطفا جوړ {0}
@@ -4270,7 +4277,7 @@
 DocType: Maintenance Visit,Maintenance Date,د ساتنې او نېټه
 DocType: Purchase Invoice Item,Rejected Serial No,رد شعبه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,کال د پيل نيټه او يا پای نیټه سره {0} تداخل. د مخنيوي لطفا شرکت جوړ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},د پیل نیټه باید د قالب پای د نېټې په پرتله کمه وي {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,upload حاضريدل
@@ -4346,7 +4353,6 @@
 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,په څو ډلو د قالب صلیب داعلاناتو
-DocType: Grade Interval,Grade Interval,ټولګي وقفه
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالي کال د پیل نیټه او د مالي کال د پای نیټه لا پخوا د مالي کال کې جوړ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,تازه چاڼېزو نېټه
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,ویش په دسته
@@ -4393,14 +4399,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,وناکتل پريږدئ که تاسو نه غواړي چې په داسې حال کې د کورس پر بنسټ ډلو جوړولو داځکه پام کې ونیسي.
 DocType: Asset,Frequency of Depreciation (Months),د استهالک د فريکوينسي (مياشتې)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,اعتبار اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,اعتبار اکانټ
 DocType: Landed Cost Item,Landed Cost Item,تيرماښام لګښت د قالب
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر ارزښتونو وښایاست
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,د توکي مقدار توليدي وروسته ترلاسه / څخه د خامو موادو ورکول اندازه ګیلاسو
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup زما د سازمان لپاره یو ساده ویب پاڼه
 DocType: Payment Reconciliation,Receivable / Payable Account,ترلاسه / د راتلوونکې اکانټ
 DocType: Delivery Note Item,Against Sales Order Item,په وړاندې د خرڅلاو نظم قالب
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},مهرباني وکړئ مشخص د خاصې لپاره ارزښت ځانتیا {0}
 DocType: Item,Default Warehouse,default ګدام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},د بودجې د ګروپ د حساب په وړاندې نه شي کولای {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,لطفا مورنی لګښت مرکز ته ننوځي
@@ -4446,7 +4452,7 @@
 DocType: Opportunity Item,Basic Rate,اساسي Rate
 DocType: GL Entry,Credit Amount,اعتبار مقدار
 DocType: Cheque Print Template,Signatory Position,لاسليک مقام
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,د ټاکل شويو Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,د ټاکل شويو Lost
 DocType: Timesheet,Total Billable Hours,Total Billable ساعتونه
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,د پيسو د رسيد يادونه
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,دا په دې پيرودونکو پر وړاندې د معاملو پر بنسټ. د تفصیلاتو لپاره په لاندی مهال ویش وګورئ
@@ -4460,11 +4466,11 @@
 ,Items To Be Requested,د ليکنو ته غوښتنه وشي
 DocType: Purchase Order,Get Last Purchase Rate,ترلاسه تېره رانيول Rate
 DocType: Company,Company Info,پيژندنه
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,وټاکئ او يا د نوي مشتريانو د اضافه
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,لګښت مرکز ته اړتيا ده چې د لګښت ادعا کتاب
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),د بسپنو (شتمني) کاریال
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,دا د دې د کارکونکو د راتګ پر بنسټ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ډیبیټ اکانټ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ډیبیټ اکانټ
 DocType: Fiscal Year,Year Start Date,کال د پیل نیټه
 DocType: Attendance,Employee Name,د کارګر نوم
 DocType: Sales Invoice,Rounded Total (Company Currency),غونډ مونډ Total (شرکت د اسعارو)
@@ -4473,13 +4479,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,څخه په لاندې ورځو کولو اجازه غوښتنلیکونه کاروونکو ودروي.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,رانيول مقدار
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,عرضه کوونکي د داوطلبۍ {0} جوړ
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,د پای کال د پیل کال مخکې نه شي
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,د کارګر ګټې
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},لطفا یو default رخصتي بشپړفهرست لپاره د کارګر جوړ {0} یا د شرکت د {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} نه شتون
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} نه شتون
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,بلونه د پېرېدونکي راپورته کړې.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,د پروژې Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},د قطار نه {0}: مقدار نه شي اخراجاتو ادعا {1} په وړاندې د مقدار د انتظار څخه ډيره وي. انتظار مقدار دی {2}
@@ -4488,15 +4494,17 @@
 DocType: Quality Inspection Reading,Reading 3,لوستلو 3
 ,Hub,مرکز
 DocType: GL Entry,Voucher Type,ګټمنو ډول
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,بیې په لېست کې ونه موندل او يا معيوب
 DocType: Employee Loan Application,Approved,تصویب شوې
 DocType: Pricing Rule,Price,د بیې
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',د کارګر د کرارۍ د {0} بايد جوړ شي د &quot;کيڼ &#39;
 DocType: Guardian,Guardian,ګارډین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ارزونې {0} په ټاکلې نیټه لړ {1} لپاره د کارګر جوړ
 DocType: Employee,Education,ښوونه
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,دل
 DocType: Selling Settings,Campaign Naming By,د کمپاین نوم By
 DocType: Employee,Current Address Is,اوسني پته ده
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,بدلون موندلی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاري. ټاکي شرکت د تلواله اسعارو، که مشخصه نه ده.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,د محاسبې ژورنال زياتونې.
 DocType: Delivery Note Item,Available Qty at From Warehouse,موجود Qty په له ګدام
@@ -4505,7 +4513,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},د کتارونو تر {0}: ګوند / حساب سره سمون نه خوري {1} / {2} د {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,لطفا اخراجاتو حساب ته ننوځي
 DocType: Account,Stock,سټاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",د کتارونو تر # {0}: ماخذ لاسوند ډول باید د اخستلو امر يو، رانيول صورتحساب یا ژورنال انفاذ وي
 DocType: Employee,Current Address,اوسني پته
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",که جنس د بل جنس بيا توضيحات، انځور، د قيمتونو، ماليه او نور به د کېنډۍ څخه جوړ شي يو variant دی، مګر په واضح ډول مشخص
 DocType: Serial No,Purchase / Manufacture Details,رانيول / جوړون نورولوله
@@ -4533,7 +4541,7 @@
 DocType: Hub Settings,Hub Settings,مرکزي امستنې
 DocType: Project,Gross Margin %,د ناخالصه عايد٪
 DocType: BOM,With Operations,سره د عملیاتو په
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,په اسعارو د محاسبې زياتونې لا شوي دي {0} د شرکت {1}. لطفا د کرنسۍ ته د ترلاسه يا د ورکړې وړ حساب غوره {0}.
 DocType: Asset,Is Existing Asset,آیا موجوده د شتمنیو
 DocType: Salary Detail,Statistical Component,د احصایې برخه
 DocType: Salary Detail,Statistical Component,د احصایې برخه
@@ -4558,7 +4566,7 @@
 DocType: Assessment Plan,Room,کوټه
 DocType: Purchase Order,Advance Paid,پرمختللی ورکړل
 DocType: Item,Item Tax,د قالب د مالياتو
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,ته عرضه مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,ته عرضه مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,وسیله صورتحساب
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ښکاري څخه یو ځل بیا
 DocType: Expense Claim,Employees Email Id,د کارکوونکو دبرېښنا ليک Id
@@ -4589,9 +4597,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo ضمیمه
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,سټاک کچه
 DocType: Customer,Commission Rate,کمیسیون Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,د کمکیانو لپاره د variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,د کمکیانو لپاره د variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,له خوا د رياست د بنديز رخصت غوښتنلیکونه.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",د پیسو ډول بايد د تر لاسه شي، د تنخاوو او کورني انتقال
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,کراچۍ ده خالي
 DocType: Vehicle,Model,د نمونوي
@@ -4602,6 +4610,7 @@
 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 +161,Capital Stock,پلازمیینه دحمل
+DocType: Shopping Cart Settings,Show Public Attachments,د عامې ضم وښایاست
 DocType: Packing Slip,Package Weight Details,بستې وزن نورولوله
 DocType: Payment Gateway Account,Payment Gateway Account,د پیسو ليدونکی اکانټ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,د پیسو له بشپړېدو وروسته ټاکل مخ ته د کارونکي عکس د تاوولو.
@@ -4620,15 +4629,15 @@
 DocType: Batch,Expiry Date,د ختم نیټه
 ,Supplier Addresses and Contacts,عرضه Addresses او د اړيکې
 ,accounts-browser,حسابونو-کتنمل
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,مهرباني وکړئ لومړی ټولۍ وټاکئ
 apps/erpnext/erpnext/config/projects.py +13,Project master.,د پروژې د بادار.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ته-بلونو او یا د فرمایشاتو لپاره اجازه ورکړي، په سټاک امستنې او يا د قالب &quot;امتياز&quot; د اوسمهالولو.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,مه $ نور په څېر د هر سمبول تر څنګ اسعارو نه ښيي.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(نیمه ورځ)
 DocType: Supplier,Credit Days,اعتبار ورځې
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,د کمکیانو لپاره د زده کونکو د دسته
 DocType: Leave Type,Is Carry Forward,مخ په وړاندې د دې لپاره ترسره کړي
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,له هیښ توکي ترلاسه کړئ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,له هیښ توکي ترلاسه کړئ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,د وخت ورځې سوق
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},د کتارونو تر # {0}: پست کوي نېټه بايد په توګه د اخیستلو نېټې ورته وي {1} د شتمنیو د {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,مهرباني وکړی په پورته جدول خرڅلاو امر ته ننوځي
@@ -4645,8 +4654,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,تحریم مقدار
 DocType: GL Entry,Is Opening,ده پرانيستل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},د کتارونو تر {0}: ډیبیټ د ننوتلو سره د نه تړاو شي کولای {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,لطفا د تشکیلاتو Setup له لارې د حاضرۍ لړۍ شمېر&gt; شمیرې لړۍ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,ګڼون {0} نه شته
 DocType: Account,Cash,د نغدو پيسو
 DocType: Employee,Short biography for website and other publications.,د ويب سايټ او نورو خپرونو لنډ ژوندلیک.
diff --git a/erpnext/translations/pt-BR.csv b/erpnext/translations/pt-BR.csv
index d352454..a234d1a 100644
--- a/erpnext/translations/pt-BR.csv
+++ b/erpnext/translations/pt-BR.csv
@@ -11,7 +11,7 @@
 DocType: Employee,Leave Approvers,Aprovadores de Licença
 DocType: Purchase Order,PO-,PC-
 DocType: POS Profile,Applicable for User,Aplicável para o usuário
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Parou ordem de produção não pode ser cancelado, desentupir-lo primeiro para cancelar"
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Você realmente quer se desfazer deste ativo?
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},É necessário informar a Moeda na Lista de Preço {0}
 DocType: Job Applicant,Job Applicant,Candidato à Vaga
@@ -27,7 +27,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Excelente para {0} não pode ser inferior a zero ( {1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão 10 minutos
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Licença
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostrar aberta
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar aberta
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Finalizar Compra
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Entrada de Diário de Acréscimo Enviada
 DocType: Pricing Rule,Apply On,Aplicar em
@@ -43,25 +43,28 @@
 DocType: Mode of Payment Account,Mode of Payment Account,Modo de pagamento da conta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Tabela de Contas não pode estar vazia.
 DocType: Employee Education,Year of Passing,Ano de passagem
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em Estoque
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes Abertos
 DocType: Production Plan Item,Production Plan Item,Item do Planejamento de Produção
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},Usuário {0} já está atribuído ao Colaborador {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Plano de Saúde
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no Pagamento (Dias)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa com Manutenção de Veículos
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Nota Fiscal
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Nota Fiscal
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Ano Fiscal {0} é necessário
 DocType: Appraisal Goal,Score (0-5),Pontuação (0-5)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +225,Row {0}: {1} {2} does not match with {3},Linha {0}: {1} {2} não corresponde com {3}
 DocType: Delivery Note,Vehicle No,Placa do Veículo
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,"Por favor, selecione Lista de Preço"
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contador
+DocType: Cost Center,Stock User,Usuário de Estoque
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Nova {0}: # {1}
 ,Sales Partners Commission,Comissão dos Parceiros de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,Abreviatura não pode ter mais de 5 caracteres
 DocType: Payment Request,Payment Request,Pedido de Pagamento
 DocType: Asset,Value After Depreciation,Valor após Depreciação
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,Relacionados
+DocType: Grading Scale,Grading Scale Name,Nome escala de avaliação
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,Esta é uma conta de root e não pode ser editada.
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Não é possível definir a autorização com base em desconto para {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexar arquivo .csv com duas colunas, uma para o nome antigo e um para o novo nome"
@@ -69,25 +72,25 @@
 DocType: Packed Item,Parent Detail docname,Nome do documento do detalhe pai
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga de emprego.
 DocType: Item Attribute,Increment,Incremento
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selecione Armazém...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Selecione Armazém...
 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 +429,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Não permitido para {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Banco não pode ser atualizado contra nota de entrega {0}
 DocType: Process Payroll,Make Bank Entry,Fazer Lançamento Bancário
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Estrutura salarial ausente
 DocType: Sales Invoice Item,Sales Invoice Item,Item da Nota Fiscal de Venda
 DocType: POS Profile,Write Off Cost Center,Centro de custo do abatimento
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Estoque
 DocType: Warehouse,Warehouse Detail,Detalhes do Armazén
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},O limite de crédito foi analisado para o cliente {0} {1} / {2}
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É Ativo Fixo"" não pode ser desmarcado se já existe um registro de Ativo relacionado ao item"
 DocType: Vehicle Service,Brake Oil,Óleo de Freio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Você não está autorizado para adicionar ou atualizar entradas antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo de operação real
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selecionar LDM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Selecionar LDM
 DocType: SMS Log,SMS Log,Log de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Produtos Entregues
 DocType: Student Log,Student Log,Log do Aluno
@@ -101,7 +104,7 @@
 DocType: Lead,Product Enquiry,Consulta de Produto
 DocType: Academic Term,Schools,Acadêmico
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Por favor insira primeira empresa
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Por favor, selecione Empresa primeiro"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Meta em
 DocType: BOM,Total Cost,Custo total
@@ -112,7 +115,7 @@
 DocType: Purchase Invoice Item,Is Fixed Asset,É Ativo Imobilizado
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}","A qtde disponível é {0}, você necessita de {1}"
 DocType: Expense Claim Detail,Claim Amount,Valor Requerido
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Fornecedor Tipo / Fornecedor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Fornecedor Tipo / Fornecedor
 DocType: Upload Attendance,Import Log,Log de Importação
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,Puxar Requisição de Material do tipo Fabricação com base nos critérios acima
 DocType: Training Result Employee,Grade,Nota de Avaliação
@@ -120,7 +123,7 @@
 DocType: SMS Center,All Contact,Todo o Contato
 DocType: Daily Work Summary,Daily Work Summary,Resumo de Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,Encerramento do Exercício Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} está congelado
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} está congelado
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, selecione empresa já existente para a criação de Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despesas com Estoque
 DocType: Journal Entry,Contra Entry,Contrapartida de Entrada
@@ -138,7 +141,7 @@
 DocType: Sales Invoice,Change Amount,Troco
 DocType: Depreciation Schedule,Make Depreciation Entry,Fazer Lançamento de Depreciação
 DocType: Appraisal Template Goal,KRA,APR
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Criar Colaborador
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Criar Colaborador
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Radio-difusão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os detalhes das operações realizadas.
@@ -169,10 +172,10 @@
 DocType: Production Order Operation,Updated via 'Time Log',Atualizado via 'Time Log'
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},O valor do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de séries para esta transação
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atualizar Grupo de Email
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atualizar Grupo de Email
 DocType: Sales Invoice,Is Opening Entry,É Lançamento de Abertura
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se a conta a receber aplicável não for a conta padrão
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Armazén de destino necessário antes de enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recebeu em
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,"Por favor, indique Empresa"
 DocType: Delivery Note Item,Against Sales Invoice Item,Contra Vendas Nota Fiscal do Item
@@ -196,8 +199,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Custo Total (via Registro de Tempo)
 DocType: Item Website Specification,Item Website Specification,Especificação do Site do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licenças Bloqueadas
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Lançamentos do Banco
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} chegou ao fim da vida em {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Lançamentos do Banco
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item da Conciliação de Estoque
 DocType: Stock Entry,Sales Invoice No,Nº da Nota Fiscal de Venda
 DocType: Material Request Item,Min Order Qty,Pedido Mínimo
@@ -210,8 +213,8 @@
 DocType: POS Profile,Allow user to edit Rate,Permitir que o usuário altere o preço
 DocType: Item,Publish in Hub,Publicar no Hub
 DocType: Student Admission,Student Admission,Admissão do Aluno
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} é cancelada
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Requisição de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} é cancelada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Requisição de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data Liquidação
 DocType: Item,Purchase Details,Detalhes de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Item {0} não encontrado em 'matérias-primas fornecidas"" na tabela Pedido de Compra {1}"
@@ -237,7 +240,7 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques em circulação e depósitos para apagar
 DocType: Item,Synced With Hub,Sincronizado com o Hub
 DocType: Vehicle,Fleet Manager,Gerente de Frota
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluída não pode ser maior do que ""Qtde de Fabricação"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Qtde concluída não pode ser maior do que ""Qtde de Fabricação"""
 DocType: Period Closing Voucher,Closing Account Head,Conta de Fechamento
 DocType: Employee,External Work History,Histórico Profissional no Exterior
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,Por extenso (Exportação) será visível quando você salvar a Guia de Remessa.
@@ -249,13 +252,12 @@
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Nota Fiscal
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurando Impostos
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
-DocType: Grade Interval,Min Score,Nota Mínima
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrou duas vezes no Imposto do Item
 DocType: Workstation,Rent Cost,Custo do Aluguel
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,Próximos Eventos do Calendário
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,Selecione mês e ano
 DocType: GL Entry,Debit Amount in Account Currency,Débito em moeda da conta
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Este artigo é um modelo e não podem ser usados em transações. Atributos item será copiado para as variantes a menos 'No Copy' é definido
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Total considerado em pedidos
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Designação do colaborador (por exemplo, CEO, Diretor, etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, digite 'Repeat no Dia do Mês ' valor do campo"
@@ -264,14 +266,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser criada uma Nota Fiscal de Compra para um ativo existente {1}
 DocType: Item Tax,Tax Rate,Alíquota do Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já está alocado para o Colaborador {1} para o período de {2} até {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecionar item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Selecionar item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,A Nota Fiscal de Compra  {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: Nº do Lote deve ser o mesmo que {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter para Não-Grupo
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lote de um item.
 DocType: C-Form Invoice Detail,Invoice Date,Data do Faturamento
 DocType: GL Entry,Debit Amount,Total do Débito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Pode haver apenas uma conta por empresa em {0} {1}
 DocType: Purchase Order,% Received,Recebido %
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Alunos
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,Instalação já está concluída!
@@ -291,22 +293,21 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Orçamento
 DocType: Salary Slip Timesheet,Working Hours,Horas de trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Alterar o número sequencial de início/atual de uma série existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Criar novo Cliente
-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.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Criar Pedidos de Compra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Criar novo Cliente
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias regras de preços continuam a prevalecer, os usuários são convidados a definir a prioridade manualmente para resolver o conflito."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Criar Pedidos de Compra
 ,Purchase Register,Registro de Compras
 DocType: Landed Cost Item,Applicable Charges,Encargos aplicáveis
 DocType: Workstation,Consumable Cost,Custo dos Consumíveis
 DocType: Purchase Receipt,Vehicle Date,Data do Veículo
 DocType: Student Log,Medical,Médico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motivo para perder
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motivo para perder
 DocType: Announcement,Receiver,Recebedor
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},"Workstation é fechado nas seguintes datas, conforme lista do feriado: {0}"
 DocType: Employee,Single,Solteiro
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, indique Centro de Custo"
 DocType: Journal Entry Account,Sales Order,Pedido de Venda
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Valor Médio de Venda
-DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,Instalado %
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o manual de ERPNext
 DocType: Email Digest,Pending Purchase Orders,Pedidos de Compra Pendentes
@@ -320,11 +321,11 @@
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As configurações globais para todos os processos de fabricação.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas congeladas até
 DocType: SMS Log,Sent On,Enviado em
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atributo {0} selecionada várias vezes na tabela de atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registro do colaborador é criado usando o campo selecionado.
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Cadastro de feriados.
 DocType: Request for Quotation Item,Required Date,Para o Dia
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Por favor, insira o Código Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Por favor, insira o Código Item."
 DocType: BOM,Costing,Custo
 DocType: Tax Rule,Billing County,País de Faturamento
 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"
@@ -348,12 +349,12 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,Receita Direta
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account","Não é possível filtrar com base em conta , se agrupados por Conta"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Escritório Administrativo
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Por favor, selecione Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Por favor, selecione Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta Diferença
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Não pode fechar tarefa como sua tarefa dependente {0} não está fechado.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, indique Armazén para as quais as Requisições de Material serão levantadas"
 DocType: Production Order,Additional Operating Cost,Custo Operacional Adicional
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Para mesclar , seguintes propriedades devem ser os mesmos para ambos os itens"
 ,Serial No Warranty Expiry,Vencimento da Garantia com Nº de Série
 DocType: Sales Invoice,Offline POS Name,Nome do POS Offline
 DocType: Sales Order,To Deliver,Para Entregar
@@ -376,7 +377,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),Fechamento (Cr)
 DocType: Installation Note Item,Installation Note Item,Item da Nota de Instalação
 DocType: Production Plan Item,Pending Qty,Pendente Qtde
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} não está ativo
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} não está ativo
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Configurar dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Controle de Tempo do Demonstrativo de Pagamento
 apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,Fornecedor Armazém obrigatório para sub- contratados Recibo de compra
@@ -395,14 +396,14 @@
 DocType: Job Applicant,Resume Attachment,Anexo currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes Repetidos
 DocType: Leave Control Panel,Allocate,Alocar
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Devolução de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Devolução de Vendas
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Drop Ship)
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,Banco de dados de clientes potenciais.
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,Banco de Dados de Clientes
 DocType: Quotation,Quotation To,Orçamento para
 DocType: Lead,Middle Income,Média Renda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Abertura (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,Unidade de medida padrão para item {0} não pode ser alterado diretamente porque você já fez alguma transação (s) com outra Unidade de Medida. Você precisará criar um novo item para usar uma Unidade de Medida padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,Total alocado não pode ser negativo
 DocType: Purchase Order Item,Billed Amt,Valor Faturado
 DocType: Training Result Employee,Training Result Employee,Resultado do Treinamento do Colaborador
@@ -429,23 +430,22 @@
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,Detalhes da Nota Fiscal/Lançamento no Livro Diário
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' não localizado no Ano Fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Configurações para o Módulo de Compras
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Digite Recibo de compra primeiro
 DocType: Buying Settings,Supplier Naming By,Nomeação do Fornecedor por
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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/config/hr.py +157,Employee Loan Management,Gestão de Emprestimos à Colaboradores
 DocType: Employee,Passport Number,Número do Passaporte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gerente
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalo entre datas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Novo limite de crédito é inferior ao saldo devedor atual do cliente. O limite de crédito deve ser de pelo menos {0}
 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 Minutos
 DocType: Issue,Resolution Date,Data da Solução
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Registro de Tempo criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Registro de Tempo criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Defina Caixa padrão ou conta bancária no Modo de pagamento {0}
 DocType: Selling Settings,Customer Naming By,Nomeação de Cliente por
 DocType: Depreciation Schedule,Depreciation Amount,Valor de Depreciação
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter em Grupo
@@ -474,7 +474,7 @@
 DocType: Student Attendance,Student Attendance,Frequência do Aluno
 DocType: Sales Invoice Timesheet,Time Sheet,Registro de Tempo
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmação de matérias-primas baseada em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Por favor insira os detalhes do item
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Por favor insira os detalhes do item
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré Venda
 DocType: Purchase Receipt,Other Details,Outros detalhes
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +18,Suplier,Fornecedor
@@ -487,10 +487,10 @@
 ,Absent Student Report,Relatório de Frequência do Aluno
 DocType: Email Digest,Next email will be sent on:,Próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termos da Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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 +84,Tree Type,Tipo de árvore
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tipo de árvore
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qtde Consumida por Unidade
 DocType: Sales Invoice,Commission Rate (%),Percentual de Comissão (%)
 DocType: Project,Estimated Cost,Custo estimado
@@ -505,7 +505,7 @@
 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 +93,{0} is not a stock Item,{0} não é um item de estoque
 DocType: Payment Entry,Received Amount (Company Currency),Total recebido (moeda da empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,O Cliente em Potencial deve ser informado se a Oportunidade foi feita para um Cliente em Potencial.
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Por favor selecione dia de folga semanal
 DocType: Production Order Operation,Planned End Time,Horário Planejado de Término
 ,Sales Person Target Variance Item Group-Wise,Variação de Público do Vendedor por Grupo de Item
@@ -565,13 +565,14 @@
  8. Digite Row: Se baseado em ""Anterior Row Total"", você pode selecionar o número da linha que será tomado como base para este cálculo (o padrão é a linha anterior).
  9. É este imposto incluído na Taxa Básica ?: Se você verificar isso, significa que este imposto não será exibido abaixo da tabela de item, mas será incluída na taxa básica em sua tabela item principal. Isso é útil quando você quer dar um preço fixo (incluindo todos os impostos) dos preços para os clientes."
 DocType: Employee,Bank A/C No.,Nº Cta. Bancária
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Parcialmente Comprados
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Pedido de Reembolso de Despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As configurações padrão para Carrinho de Compras
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Despesas com Manutenção de Escritório
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurando Conta de Email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Por favor, indique primeiro item"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, indique primeiro item"
 DocType: Account,Liability,Passivo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Montante Sanctioned não pode ser maior do que na Reivindicação Montante Fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Conta de Custo Padrão de Mercadorias Vendidas
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Lista de Preço não selecionado
 DocType: Employee,Family Background,Antecedentes familiares
@@ -593,7 +594,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.","Se você tem alguma pergunta, por favor nos contate."
 DocType: Item,Website Warehouse,Armazém do Site
 DocType: Payment Reconciliation,Minimum Invoice Amount,Valor Mínimo da Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,O Registro de Tempo {0} está finalizado ou cancelado
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que auto factura será gerado por exemplo, 05, 28, etc"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.js +49,Score must be less than or equal to 5,Pontuação deve ser inferior ou igual a 5
 apps/erpnext/erpnext/config/accounts.py +299,C-Form records,Registros C -Form
@@ -603,13 +604,13 @@
 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 +372,{0} against Bill {1} dated {2},{0} contra duplicata {1} na data {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Agenda do Curso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Agenda do Curso
 DocType: Maintenance Visit,Completion Status,Status de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da aposentadoria em anos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazén de Destino
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir entrega ou recebimento adicional até este percentual
-DocType: Upload Attendance,Import Attendance,Importação de Atendimento
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos os grupos de itens
+DocType: Upload Attendance,Import Attendance,Importação de Ponto
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os grupos de itens
 DocType: Process Payroll,Activity Log,Log de Atividade
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compor automaticamente mensagem no envio de transações.
 DocType: Production Order,Item To Manufacture,Item para Fabricação
@@ -618,7 +619,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Pedido de Compra para Pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtde Projetada
 DocType: Sales Invoice,Payment Due Date,Data de Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Variant item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Abrindo'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Atribuições em aberto
 DocType: Notification Control,Delivery Note Message,Mensagem da Guia de Remessa
@@ -652,7 +653,7 @@
 DocType: Item Attribute,Item Attribute Values,Valores dos Atributos
 ,Received Items To Be Billed,"Itens Recebidos, mas não Faturados"
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Cadastro de Taxa de Câmbio
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar entalhe Tempo nos próximos {0} dias para a Operação {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,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 +510,BOM {0} must be active,LDM {0} deve ser ativa
 DocType: Journal Entry,Depreciation Entry,Lançamento de Depreciação
@@ -667,8 +668,7 @@
 apps/erpnext/erpnext/accounts/general_ledger.py +142,Please mention Round Off Account in Company,"Por favor, mencione completam Conta in Company"
 DocType: Purchase Receipt,Range,Alcance
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Colaborador {0} não está ativo ou não existe
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variante(s) do Item {0} atualizada(s)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Adiantamento da Nota Fiscal de Compra
 DocType: Hub Settings,Sync Now,Sincronizar agora
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: Lançamento de crédito não pode ser relacionado a uma {1}
@@ -680,15 +680,15 @@
 DocType: Item,Is Purchase Item,É item de compra
 DocType: Asset,Purchase Invoice,Nota Fiscal de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Nº do Detalhe do Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nova Nota Fiscal de Venda
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nova Nota Fiscal de Venda
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Abertura Data e Data de Fechamento deve estar dentro mesmo ano fiscal
 DocType: Lead,Request for Information,Solicitação de Informação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sincronizar Faturas Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sincronizar Faturas Offline
 DocType: Program Fee,Program Fee,Taxa do Programa
 DocType: Material Request Item,Lead Time Date,Prazo de Entrega
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publicar no site
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Entregas para clientes.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,A data da nota fiscal do fornecedor não pode ser maior do que data do lançamento
@@ -705,8 +705,6 @@
 						Please enter a valid Invoice","Row {0}: Fatura {1} é inválido, poderia ser cancelado / não existe. \ Por favor, indique uma factura válida"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento relacionado a Pedidos de Compra/Venda deve ser sempre marcado como adiantamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,químico
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Os intervalos para o Código de Nota de Avaliação {0} se sobrepõe com os intervalos de outras notas de avaliação. Por favor verifique intervalos {0} e {1} e tente novamente
 DocType: BOM,Raw Material Cost(Company Currency),Custo da matéria-prima (moeda da empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Todos os itens já foram transferidos para esta ordem de produção.
 DocType: Workstation,Electricity Cost,Custo de Energia Elétrica
@@ -716,7 +714,7 @@
 DocType: SMS Center,All Lead (Open),Todos os Clientes em Potencial em Aberto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: Qtde não disponível do item {4} no armazén {1} no horário do lançamento ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obter adiantamentos pagos
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Fazer
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,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 +5,My Cart,Meu carrinho
@@ -738,7 +736,7 @@
 DocType: Packing Slip Item,Packing Slip Item,Item da Guia de Remessa
 DocType: Purchase Invoice,Cash/Bank Account,Conta do Caixa/Banco
 DocType: Delivery Note,Delivery To,Entregar Para
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,A tabela de atributos é obrigatório
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,A tabela de atributos é obrigatório
 DocType: Production Planning Tool,Get Sales Orders,Obter Pedidos de Venda
 DocType: Asset,Total Number of Depreciations,Número Total de Depreciações
 DocType: Workstation,Wages,Salário
@@ -748,24 +746,24 @@
 DocType: POS Profile,Sales Invoice Payment,Pagamento da Nota Fiscal de Venda
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém reservada no Pedido de Venda / Armazém de Produtos Acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Valor de Venda
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Status' e salve
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Você é o aprovador de despesa para esse registro. Atualize o 'Status' e salve
 DocType: Serial No,Creation Document No,Número de Criação do Documento
 DocType: Asset,Scrapped,Sucateada
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +28,Account does not match with Company,A conta não coincide com a Empresa
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para item variantes. por exemplo, tamanho, cor etc."
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Armazén de Trabalho em Andamento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Nº de Série {0} está sob contrato de manutenção até {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Nº de Série {0} está sob contrato de manutenção até {1}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,Compra padrão
 DocType: GL Entry,Against,Contra
 DocType: Item,Default Selling Cost Center,Centro de Custo Padrão de Vendas
 DocType: Sales Partner,Implementation Partner,Parceiro de implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,CEP
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,CEP
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Pedido de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações para Contato
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Fazendo Lançamentos no Estoque
 DocType: Packing Slip,Net Weight UOM,Unidade de Medida do Peso Líquido
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Resultado
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Resultado
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentual Permitido de Produção Excedente
 DocType: Employee Loan,Repayment Schedule,Agenda de Pagamentos
 DocType: Shipping Rule Condition,Shipping Rule Condition,Regra Condições de envio
@@ -788,14 +786,14 @@
 DocType: Company,Company registration numbers for your reference. Tax numbers etc.,"Números de registro da empresa para sua referência. Exemplo: CNPJ, IE, etc"
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio do Carrinho de Compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Ordem de produção {0} deve ser cancelado antes de cancelar este Pedido de Venda
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, defina &quot;Aplicar desconto adicional em &#39;"
 ,Ordered Items To Be Billed,"Itens Vendidos, mas não Faturados"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,De Gama tem de ser inferior à gama
 DocType: Global Defaults,Global Defaults,Padrões Globais
 apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,Convite para Colaboração em Projeto
 DocType: Purchase Invoice,Start date of current invoice's period,Data de início do período de fatura atual
 DocType: Salary Slip,Leave Without Pay,Licença não remunerada
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Erro de Planejamento de Capacidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Erro de Planejamento de Capacidade
 ,Trial Balance for Party,Balancete para o Sujeito
 DocType: Salary Slip,Earnings,Ganhos
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +390,Finished Item {0} must be entered for Manufacture type entry,O Item finalizado {0} deve ser digitado para a o lançamento de tipo de fabricação
@@ -807,7 +805,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isso vai ser anexado ao Código do item da variante. Por exemplo, se a sua abreviatura é ""SM"", e o código do item é ""t-shirt"", o código do item da variante será ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pagamento líquido (por extenso) será visível quando você salvar a folha de pagamento.
 DocType: Purchase Invoice,Is Return,É Devolução
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Devolução / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Devolução / Nota de Débito
 DocType: Price List Country,Price List Country,Preço da lista País
 DocType: Item,UOMs,Unidades de Medida
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} números de série válidos para o item {1}
@@ -815,9 +813,8 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},Perfil do PDV {0} já criado para o usuário: {1} e empresa {2}
 DocType: Sales Invoice Item,UOM Conversion Factor,Fator de Conversão da Unidade de Medida
 DocType: Stock Settings,Default Item Group,Grupo de Itens padrão
-DocType: Grading Structure,Grading System Name,Nome do Sistema de Nota de Avaliação
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados do fornecedor.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centro de Custos para Item com Código '
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Outras contas podem ser feitas em Grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 DocType: Lead,Lead,Cliente em Potencial
@@ -826,7 +823,7 @@
 apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,Linha # {0}: Qtde rejeitada não pode ser lançada na devolução da compra
 ,Purchase Order Items To Be Billed,"Itens Comprados, mas não Faturados"
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item da Nota Fiscal de Compra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Banco de Ledger Entradas e GL As entradas são reenviados para os recibos de compra selecionados
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Banco de Ledger Entradas e GL As entradas são reenviados para os recibos de compra selecionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Número 1
 DocType: Holiday,Holiday,Feriado
 DocType: Support Settings,Close Issue After Days,Fechar Incidente Após Dias
@@ -840,10 +837,10 @@
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,Por favor selecione o prefixo primeiro
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Feito
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Especifique pelo menos um atributo na tabela de atributos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro Razão
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais antigas
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Um grupo de itens existe com o mesmo nome, por favor, mude o nome do item ou mude o nome do grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Celular do Aluno
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto do Mundo
@@ -870,8 +867,8 @@
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,Resumo do Contas a Pagar
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não autorizado para editar conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter notas pendentes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Pedido de Venda {0} não é válido
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Pedido de Venda {0} não é válido
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Desculpe , as empresas não podem ser mescladas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total Saída / Transferir {0} na Requisição de Material {1} \ não pode ser maior do que a quantidade solicitada {2} para o Item {3}
 DocType: Employee,Employee Number,Número do Colaborador
@@ -886,10 +883,10 @@
 DocType: Email Digest,Add Quote,Adicionar Citar
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,UOM coversion factor required for UOM: {0} in Item: {1},Fator de Conversão de Unidade de Medida é necessário para Unidade de Medida: {0} no Item: {1}
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Linha {0}: Qtde é obrigatória
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronizar com o Servidor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sincronizar com o Servidor
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Site de imagem deve ser um arquivo público ou URL do site
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um grupo de itens de raiz e não pode ser editada.
 DocType: Journal Entry Account,Purchase Order,Pedido de Compra
 DocType: Vehicle,Fuel UOM,UDM do Combustível
@@ -903,13 +900,13 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"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/stock/get_item_details.py +141,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,Bens 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.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regra de Preços é o primeiro selecionado com base em ""Aplicar On 'campo, que pode ser Item, item de grupo ou Marca."
 DocType: Hub Settings,Seller Website,Site do Vendedor
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Porcentagem total alocado para a equipe de vendas deve ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status de ordem de produção é {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status de ordem de produção é {0}
 DocType: Appraisal Goal,Goal,Meta
 ,Team Updates,Updates da Equipe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Para Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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),Total geral (moeda da empresa)
 apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},Não havia nenhuma item chamado {0}
@@ -921,7 +918,7 @@
 DocType: Depreciation Schedule,Journal Entry,Lançamento no Livro Diário
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} itens em andamento
 DocType: Workstation,Workstation Name,Nome da Estação de Trabalho
-DocType: Grade Interval,Grade Code,Código de Nota de Avaliação
+DocType: Grading Scale Interval,Grade Code,Código de Nota de Avaliação
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Resumo por Email:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},A LDM {0} não pertencem ao Item {1}
 DocType: Sales Partner,Target Distribution,Distribuição de metas
@@ -932,7 +929,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Ferramentas
 DocType: Sales Order,Recurring Upto,recorrente Upto
 DocType: Attendance,HR Manager,Gerente de RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, selecione uma empresa"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, selecione uma empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Deixar
 DocType: Purchase Invoice,Supplier Invoice Date,Data de emissão da nota fiscal
 DocType: Appraisal Template Goal,Appraisal Template Goal,Meta do Modelo de Avaliação
@@ -959,7 +956,7 @@
 DocType: Item,Will also apply to variants,Também se aplica às variantes
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,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/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Média Diária de Saída
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Status de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Status de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Purchase Invoice,Contact Person,Pessoa de Contato
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data de Início Esperada' não pode ser maior que 'Data Final Esperada'
 DocType: Holiday List,Holidays,Feriados
@@ -977,7 +974,7 @@
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,Valor de Compra
 DocType: Sales Invoice,Shipping Address Name,Endereço de Entrega
 DocType: Material Request,Terms and Conditions Content,Conteúdo dos Termos e Condições
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} não é um item de estoque
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} não é um item de estoque
 DocType: Maintenance Visit,Unscheduled,Sem Agendamento
 DocType: Salary Detail,Depends on Leave Without Pay,Depende de licença sem vencimento
 ,Purchase Invoice Trends,Tendência de Notas Fiscais de Compra
@@ -994,7 +991,7 @@
 Used for Taxes and Charges",Detalhe da tabela de imposto obtido a partir do cadastro do item como texto e armazenado neste campo. Usado para Tributos e Encargos
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Colaborador não pode denunciar a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta for congelada, os lançamentos só serão permitidos aos usuários restritos."
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilidade de entrada para {0}: {1} só pode ser feito em moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil da vaga, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da conta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regra de imposto para transações.
@@ -1008,7 +1005,7 @@
 DocType: Shipping Rule Condition,To Value,Para o Valor
 DocType: Asset Movement,Stock Manager,Gerente de Estoque
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},O armazén de origem é obrigatório para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Guia de Remessa
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Guia de Remessa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Aluguel do Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurações de gateway SMS Setup
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha na Importação!
@@ -1021,7 +1018,7 @@
 apps/erpnext/erpnext/config/stock.py +300,Item Variants,Variantes dos Itens
 DocType: HR Settings,Email Salary Slip to Employee,Enviar contracheque para colaborador via email
 DocType: Cost Center,Parent Cost Center,Centro de Custo pai
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selecione Possível Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Selecione Possível Fornecedor
 DocType: Sales Invoice,Source,Origem
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar fechada
 DocType: Leave Type,Is Leave Without Pay,É Licença não remunerada
@@ -1053,7 +1050,7 @@
 DocType: Delivery Note,In Words will be visible once you save the Delivery Note.,Por extenso será visível quando você salvar a Guia de Remessa.
 apps/erpnext/erpnext/config/stock.py +200,Brand master.,Cadastro de Marca.
 DocType: Purchase Receipt,Transporter Details,Detalhes da Transportadora
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Possível Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Possível Fornecedor
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Lista Receiver está vazio. Por favor, crie Lista Receiver"
 DocType: Production Plan Sales Order,Production Plan Sales Order,Pedido de Venda do Plano de Produção
 DocType: Sales Partner,Sales Partner Target,Metas do Parceiro de Vendas
@@ -1084,15 +1081,16 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar email de pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova Tarefa
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Relatórios Adicionais
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Fator de conversão de unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Deixar do tipo {0} não pode ser maior que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planejar operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Interromper lembretes de aniversários
 DocType: SMS Center,Receiver List,Lista de recebedores
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Quantidade Consumida
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida em Dinheiro
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Já concluído
+DocType: Assessment Plan,Grading Scale,Escala de avaliação
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unidade de Medida {0} foi inserida mais de uma vez na Tabela de Conversão de Fator
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Já concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Pedido de Pagamento já existe {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Produtos Enviados
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Quantidade não deve ser mais do que {0}
@@ -1116,7 +1114,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Linha {0}: Adiantamento relacionado com o fornecedor deve ser um débito
 DocType: Expense Claim,Total Amount Reimbursed,Quantia total reembolsada
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Relacionado à nota fiscal do fornecedor nº {0} emitida em {1}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Registro de Movimentação de Ativos {0} criado
 DocType: Journal Entry,Entry Type,Tipo de Lançamento
 ,Customer Credit Balance,Saldo de Crédito do Cliente
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',Necessário para ' Customerwise Discount ' Cliente
@@ -1143,7 +1141,7 @@
 DocType: Employee,Permanent Address,Endereço permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Por favor selecione o código do item
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Por favor selecione o código do item
 DocType: Territory,Territory Manager,Gestor de Territórios
 DocType: Packed Item,To Warehouse (Optional),Para o Armazén (Opcional)
 DocType: Payment Entry,Paid Amount (Company Currency),Valor pago (moeda da empresa)
@@ -1152,7 +1150,7 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order_dashboard.py +17,Fulfillment,Realização
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas com Marketing
 ,Item Shortage Report,Relatório de Escassez de Itens
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Peso é mencionado, \n Também mencione ""Unidade de Medida de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Requisição de Material usada para fazer esta Entrada de Material
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unidade única de um item.
 DocType: Fee Category,Fee Category,Categoria de Taxas
@@ -1164,7 +1162,7 @@
 DocType: Employee,Date Of Retirement,Data da aposentadoria
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,Configuração do ERPNext Concluída!
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: Centro de Custo é necessário para a conta de ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Existe um grupo de clientes com o mesmo nome, por favor modifique o nome do cliente ou renomeie o grupo de clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo Contato
 DocType: Territory,Parent Territory,Território pai
 DocType: Stock Entry,Material Receipt,Entrada de Material
@@ -1175,7 +1173,7 @@
 DocType: Purchase Invoice,Notification Email Address,Endereço de email de notificação
 ,Item-wise Sales Register,Registro de Vendas por Item
 DocType: Asset,Gross Purchase Amount,Valor Bruto de Compra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este Imposto Está Incluído na Base de Cálculo?
 DocType: Program Course,Required,Necessário
 DocType: Job Applicant,Applicant for a Job,Candidato à uma Vaga
@@ -1186,21 +1184,20 @@
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir vários Pedidos de Venda relacionados ao Pedido de Compra do Cliente
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para séries de numeração em suas transações
 DocType: Employee Attendance Tool,Employees HTML,Colaboradores HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,LDM Padrão ({0}) precisa estar ativo para este item ou o seu modelo
 DocType: Employee,Leave Encashed?,Licenças Cobradas?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"O campo ""Oportunidade de"" é obrigatório"
 DocType: Email Digest,Annual Expenses,Despesas Anuais
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Criar Pedido de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Criar Pedido de Compra
 DocType: Payment Reconciliation Payment,Allocated amount,Quantidade atribuída
 DocType: Stock Reconciliation,Stock Reconciliation,Conciliação de Estoque
 DocType: Territory,Territory Name,Nome do Território
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Armazén de Trabalho em Andamento é necessário antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Armazén de Trabalho em Andamento é necessário antes de Enviar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidato à uma Vaga.
 DocType: Supplier,Statutory info and other general information about your Supplier,Informações contratuais e outras informações gerais sobre o seu fornecedor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,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
-DocType: Grading Structure,Grading Intervals,Intervalos de Nota de Avaliação
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base em artigo ou Armazém"
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),O peso líquido do pacote. (Calculado automaticamente como soma do peso líquido dos itens)
 DocType: Sales Order,To Deliver and Bill,Para Entregar e Faturar
@@ -1208,13 +1205,13 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controle de autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha # {0}: Armazén Rejeitado é obrigatório para o item rejeitado {1}
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gerir seus pedidos
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gerir seus pedidos
 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},Requisição de Material de no máximo {0} pode ser feita para item {1} relacionado à ordem de venda {2}
 DocType: Course,Course Abbreviation,Abreviação do Curso
 DocType: Student Leave Application,Student Leave Application,Pedido de Licença do Aluno
 DocType: Item,Will also apply for variants,Também se aplica às variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activo não podem ser canceladas, como já é {0}"
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Empacotar itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtde Real
 apps/erpnext/erpnext/public/js/setup_wizard.js +289,"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.",Liste os produtos ou serviços que você comprar ou vender.
@@ -1267,13 +1264,13 @@
 ,Serial No Status,Status do Nº de Série
 DocType: Payment Entry Reference,Outstanding,Saldo devedor
 ,Daily Timesheet Summary,Resumo Diário dos Registros de Tempo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Fila {0}: Para definir {1} periodicidade, diferença entre a data de \
  e deve ser maior do que ou igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Isto é baseado no movimento de estoque. Veja o {0} para maiores detalhes
 DocType: Employee,Salary Information,Informação Salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Colaborador
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A data de vencimento não pode ser anterior à data de postagem
 DocType: Website Item Group,Website Item Group,Grupo de Itens do Site
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Impostos e Contribuições
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, indique data de referência"
@@ -1283,13 +1280,13 @@
 DocType: Purchase Order Item,Material Request Item,Item da Requisição de Material
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,Árvore de Grupos de itens .
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível consultar número da linha superior ou igual ao número da linha atual para este tipo de carga
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para buscar Serial Sem adição de item {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para buscar Serial Sem adição de item {0}"
 DocType: Account,Frozen,Congelado
 ,Open Production Orders,Ordens a Serem Produzidas
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Valor Base (moeda da empresa)
 DocType: Installation Note,Installation Time,O tempo de Instalação
 DocType: Sales Invoice,Accounting Details,Detalhes da Contabilidade
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Apagar todas as transações para esta empresa
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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,"Linha # {0}: Operação {1} não está completa para {2} qtde de produtos acabados na ordem de produção # {3}. Por favor, atualize o status da operação via Registros de Tempo"
 DocType: Issue,Resolution Details,Detalhes da Solução
 apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,alocações
@@ -1303,6 +1300,7 @@
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,Gráfico de Gantt de todas as tarefas.
 DocType: Opportunity,Mins to First Response,Minutos para Primeira Resposta
 DocType: Pricing Rule,Margin Type,Tipo da Margem
+DocType: Course,Default Grading Scale,Escala de avaliação padrão
 DocType: Appraisal,For Employee Name,Para Nome do Colaborador
 DocType: C-Form Invoice Detail,Invoice No,Nota nº
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +342,Make Payment,Fazer Pagamento
@@ -1310,11 +1308,11 @@
 DocType: Activity Cost,Costing Rate,Preço de Custo
 ,Customer Addresses And Contacts,Endereços e Contatos do Cliente
 DocType: Employee,Resignation Letter Date,Data da Carta de Demissão
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,As regras de tarifação são ainda filtrados com base na quantidade.
 DocType: Task,Total Billing Amount (via Time Sheet),Total Faturado (via Registro de Tempo)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Receita Clientes Repetidos
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter o papel 'Aprovador de Despesas'
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Selecionar LDM e quantidade para produção
 DocType: Asset,Depreciation Schedule,Tabela de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Contra à Conta
 DocType: Item,Has Batch No,Tem nº de Lote
@@ -1326,7 +1324,7 @@
 DocType: Task,Actual End Date (via Time Sheet),Data Final Real (via Registro de Tempo)
 ,Quotation Trends,Tendência de Orçamentos
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupo item não mencionado no mestre de item para item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,De débito em conta deve ser uma conta a receber
 DocType: Shipping Rule Condition,Shipping Amount,Valor do Transporte
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Total pendente
 ,Vehicle Expenses,Despesas com Veículos
@@ -1342,12 +1340,12 @@
 DocType: Landed Cost Voucher,Distribute Charges Based On,Distribuir encargos baseado em
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Registros de Tempo
 DocType: HR Settings,HR Settings,Configurações de RH
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,O pedido de reembolso de despesas está pendente de aprovação. Somente o aprovador de despesas pode atualizar o status.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,O pedido de reembolso de despesas está pendente de aprovação. Somente o aprovador de despesas pode atualizar o status.
 DocType: Email Digest,New Expenses,Novas despesas
 DocType: Purchase Invoice,Additional Discount Amount,Total do Desconto Adicional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtde deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para múltiplas qtdes."
 DocType: Leave Block List Allow,Leave Block List Allow,Deixe Lista de Bloqueios Permitir
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,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 +276,Abbr can not be blank or space,Abbr não pode estar em branco ou espaço
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo para Não-Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Esportes
 DocType: Loan Type,Loan Name,Nome do Empréstimo
@@ -1371,22 +1369,22 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Conta {0} é inválido. Conta de moeda deve ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Fator de Conversão da Unidade de Medida é necessário na linha {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Venda, uma Nota Fiscal de Venda ou um Lançamento Contábil"
 DocType: Stock Reconciliation Item,Amount Difference,Valor da Diferença
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Item Preço adicionada para {0} na lista de preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Digite o ID de Colaborador deste Vendedor
 DocType: Territory,Classification of Customers by region,Classificação dos clientes por região
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,O Valor da Diferença deve ser zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,O Valor da Diferença deve ser zero
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Por favor, indique item Produção primeiro"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo calculado do extrato bancário
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,usuário desativado
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Orçamento
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Orçamento
 DocType: Salary Slip,Total Deduction,Dedução total
 ,Production Analytics,Análise de Produção
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Aviso: certificado SSL inválido no anexo {0}
 DocType: Production Order Operation,Actual Operation Time,Tempo Real da Operação
 DocType: Authorization Rule,Applicable To (User),Aplicável Para (Usuário)
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,Descrição do Trabalho
@@ -1396,9 +1394,10 @@
 ,SO Qty,Qtde na OV
 DocType: Appraisal,Calculate Total Score,Calcular a Pontuação Total
 DocType: Request for Quotation,Manufacturing Manager,Gerente de Fabricação
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Nº de Série {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir Guia de Remessa em pacotes.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Entregas
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,O saldo da conta {1} ({0}) e o valor do estoque ({2}) para o armazém {3} devem ser os mesmos
 DocType: Payment Entry,Total Allocated Amount (Company Currency),Total alocado (moeda da empresa)
 DocType: Purchase Order Item,To be delivered to customer,Para ser entregue ao cliente
 DocType: BOM,Scrap Material Cost,Custo do Material Sucateado
@@ -1409,25 +1408,27 @@
 DocType: Employee Loan,Employee Loan Account,Conta de Empréstimo para Colaboradores
 DocType: Leave Application,Total Leave Days,Total de dias de licença
 DocType: Email Digest,Note: Email will not be sent to disabled users,Observação: Emails não serão enviado para usuários desabilitados
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecione a Empresa...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecione a Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se considerado para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente , contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} é obrigatório para o item {1}
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione montante atribuído, tipo de fatura e número da fatura em pelo menos uma fileira"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,Custo da Nova Compra
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},Pedido de Venda necessário para o item {0}
 DocType: Purchase Invoice Item,Rate (Company Currency),Preço (moeda da empresa)
 DocType: Payment Entry,Unallocated Amount,Total não alocado
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Não consegue encontrar um item correspondente. Por favor, selecione algum outro valor para {0}."
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um produto ou um serviço que é comprado, vendido ou mantido em estoque."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nenhum update
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de carga como "" Valor Em linha anterior ' ou ' On Anterior Row Total ' para a primeira linha"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Criança item não deve ser um pacote de produtos. Por favor remover o item `` {0} e salvar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancário
 DocType: Vehicle Service,Service Item,Item de Manutenção
+DocType: Bank Guarantee,Bank Guarantee,Garantia Bancária
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,"Por favor, clique em ""Gerar Agenda"" para obter cronograma"
 DocType: Bin,Ordered Quantity,Quantidade Encomendada
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ex: ""Desenvolve ferramentas para construtores """
+DocType: Grading Scale,Grading Scale Intervals,Intervalos da escala de avaliação
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Entradas contabeis para {2} só pode ser feito em moeda: {3}
 DocType: Production Order,In Process,Em Processo
 DocType: Authorization Rule,Itemwise Discount,Desconto relativo ao Item
@@ -1456,12 +1457,12 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não serão mostrados se a lista de preços não estiver configurada
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta regra de envio ou verifique Transporte mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total Recebido
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Para Débito é necessária
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Para Débito é necessária
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Preço de Compra Lista
 DocType: Offer Letter Term,Offer Term,Termos da Oferta
 DocType: Quality Inspection,Quality Manager,Gerente de Qualidade
 DocType: Job Applicant,Job Opening,Vaga de Trabalho
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, selecione o nome do Incharge Pessoa"
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total a Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,LDM da Operação do Site
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,Carta de Ofeta
@@ -1482,7 +1483,7 @@
 DocType: Item,Customer Item Codes,Código do Item para o Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,Ganho/Perda com Câmbio
 DocType: Opportunity,Lost Reason,Motivo da Perda
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Por favor insira o Documento de Recibo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Por favor insira o Documento de Recibo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um válido &#39;De Caso No.&#39;"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Mais centros de custo podem ser feitos em grupos, mas as entradas podem ser feitas contra os Não-Grupos"
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Usuários e Permissões
@@ -1490,10 +1491,10 @@
 DocType: Guardian,Mobile Number,Telefone Celular
 DocType: Bin,Actual Quantity,Quantidade Real
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: envio no dia seguinte
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial No {0} não foi encontrado
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial No {0} não foi encontrado
 DocType: Scheduling Tool,Student Batch,Série de Alunos
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Fazer Aluno
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Fazer Aluno
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Você foi convidado para colaborar com o projeto: {0}
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplique agora
 ,Bank Clearance Summary,Resumo da Liquidação Bancária
@@ -1527,17 +1528,17 @@
 DocType: Rename Tool,Rename Tool,Ferramenta de Renomear
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Atualize o custo
 DocType: Item Reorder,Item Reorder,Reposição de Item
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Mostrar Contracheque
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Mostrar Contracheque
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Especificar as operações, custos operacionais e dar um número único de operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está fora do limite {0} {1} para o item {4}. Você está fazendo outro(a) {3} relacionado(a) a(o) mesmo(a) {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecione a conta de troco
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Por favor, defina recorrentes depois de salvar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecione a conta de troco
 DocType: Naming Series,User must always select,O Usuário deve sempre selecionar
 DocType: Stock Settings,Allow Negative Stock,Permitir Estoque Negativo
 DocType: Topic,Topic,Tópico
 DocType: Quality Inspection,Verified By,Verificado por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações existentes. Transações devem ser canceladas para alterar a moeda padrão."
-DocType: Grade Interval,Grade Description,Descrição da Nota de Avaliação
+DocType: Grading Scale Interval,Grade Description,Descrição da Nota de Avaliação
 DocType: Stock Entry,Purchase Receipt No,Nº do Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal/Garantia em Dinheiro
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Pagamento
@@ -1565,18 +1566,18 @@
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,Nº da LDM para um Item Bom Acabado
 DocType: Upload Attendance,Attendance To Date,Data Final de Comparecimento
 DocType: Warranty Claim,Raised By,Levantadas por
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Por favor, especifique Empresa proceder"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,compensatória Off
 DocType: Offer Letter,Accepted,Aceito
 DocType: SG Creation Tool Course,Student Group Name,Nome do Grupo de Alunos
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que você realmente quer apagar todas as operações para esta empresa. Os seus dados mestre vai permanecer como está. Essa ação não pode ser desfeita."
 DocType: Room,Room Number,Número da Sala
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planejada ({2}) na ordem de produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Rótudo da Regra de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Usuários
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Matérias-primas não pode ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Lançamento no Livro Diário Rápido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar estoque, fatura contém gota artigo do transporte."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Lançamento no Livro Diário Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Você não pode alterar a taxa se a LDM é mencionada em algum item
 DocType: Employee,Previous Work Experience,Experiência anterior de trabalho
 DocType: Stock Entry,For Quantity,Para Quantidade
@@ -1586,7 +1587,7 @@
 ,Minutes to First Response for Issues,Minutos para Primeira Resposta em Incidentes
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Condições
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Registros contábeis congelados até a presente data, ninguém pode criar/modificar registros com exceção do perfil especificado abaixo."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, salve o documento antes de gerar programação de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Marque esta opção para não permitir frações. (Para n)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,As ordens de produção seguintes foram criadas:
@@ -1605,7 +1606,7 @@
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,Árvore da Lista de Materiais
 ,Employees working on a holiday,Colaboradores Trabalhando no Feriado
 DocType: Project,% Complete Method,% Método Completo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Manutenção data de início não pode ser anterior à data de entrega para Serial Não {0}
 DocType: Production Order,Actual End Date,Data Final Real
 DocType: BOM,Operating Cost (Company Currency),Custo operacional (moeda da empresa)
 DocType: Purchase Invoice,PINV-,NFC-
@@ -1619,7 +1620,7 @@
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo com a UDM do estoque)
 DocType: SMS Log,No of Requested SMS,Nº de SMS pedidos
 DocType: Campaign,Campaign-.####,Campanha - . # # # #
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Por favor, informe os melhores valores e condições possíveis para os itens especificados"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Por favor, informe os melhores valores e condições possíveis para os itens especificados"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Fechar automaticamente a oportunidade após 15 dias
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Ano Final
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,Data de Encerramento do Contrato deve ser maior que Data de Inicio
@@ -1674,7 +1675,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Quantidade Recebida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Registos de Taxas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Ativo Categoria Conta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade no Pedido de Venda {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais item {0} do que a quantidade no Pedido de Venda {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Lançamento no Estoque {0} não é enviado
 DocType: Payment Reconciliation,Bank / Cash Account,Banco / Conta Caixa
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,O responsável pelo Próximo Contato não pode ser o mesmo que o Endereço de Email de Potencial Cliente
@@ -1686,7 +1687,7 @@
 DocType: Purchase Invoice,Currency and Price List,Moeda e Preço
 DocType: Opportunity,Customer / Lead Name,Nome do Cliente/Cliente em Potencial
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Apuramento data não mencionada
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Linha {0}: Data de início deve ser anterior a data de término
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Linha {0}: Data de início deve ser anterior a data de término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtde)
 DocType: Installation Note Item,Installed Qty,Qtde Instalada
 DocType: Purchase Taxes and Charges,Parenttype,Parenttype
@@ -1717,16 +1718,16 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global de POS perfil {0} já criado para a empresa {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Substituir item / LDM em todas as LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,O Documento de Recibo precisa ser enviado
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,O Documento de Recibo precisa ser enviado
 DocType: Purchase Invoice Item,Received Qty,Qtde Recebida
 DocType: Stock Entry Detail,Serial No / Batch,N º de Série / lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Não pago e não entregue
 DocType: Product Bundle,Parent Item,Item Pai
 DocType: Delivery Note,DN-RET-,GDR-DEV
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Deixe tipo {0} não pode ser encaminhado carry-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerada para todos os itens. Por favor, clique em ""Gerar Agenda"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Programação de manutenção não é gerada para todos os itens. Por favor, clique em ""Gerar Agenda"""
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para linha {0} em {1}. Para incluir {2} na taxa de Item, linhas {3} também devem ser incluídos"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Fazer Usuário
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Fazer Usuário
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a Entrega (para impressão)
 DocType: Landed Cost Voucher,Purchase Receipt Items,Itens do Recibo de Compra
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,Total de Depreciação durante o período
@@ -1746,14 +1747,14 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Esconder CPF/CNPJ em transações de vendas
 DocType: Upload Attendance,Upload HTML,Upload HTML
 DocType: Employee,Relieving Date,Data da Liberação
-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.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regra de preços é feita para substituir Lista de Preços / define percentual de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Armazém só pode ser alterado através de entrada / entrega  da nota / recibo de compra
 DocType: Employee Education,Class / Percentage,Classe / Percentual
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Imposto de Renda
-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 regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como Pedido de Venda, Pedido de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Valor na Lista de Preços""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se regra de preços selecionado é feita por 'preço', ele irá substituir Lista de Preços. Preço regra de preço é o preço final, de forma que nenhum desconto adicional deve ser aplicada. Assim, em operações como Pedido de Venda, Pedido de Compra etc, será buscado no campo ""taxa"", ao invés de campo ""Valor na Lista de Preços""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,"Rastreia Clientes em Potencial, por Segmento."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Por favor, insira o Código Item para obter lotes não"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Por favor selecione um valor para {0} orçamento_para {1}
 DocType: Company,Stock Settings,Configurações de Estoque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Ganho/Perda no Descarte de Ativo
@@ -1777,7 +1778,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},Aviso: Outra {0} # {1} existe contra entrada de material {2}
 DocType: Homepage Featured Product,Homepage Featured Product,Produtos em Destaque na Página Inicial
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nome do Novo Armazén
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Por favor, não mencione de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Avaliação padrão
 DocType: Vehicle Log,Fuel Qty,Qtde de Combustível
 DocType: Production Order Operation,Planned Start Time,Horário Planejado de Início
@@ -1790,7 +1791,7 @@
 DocType: Price List,Price List Master,Cadastro da Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as transações de vendas pode ser marcado contra várias pessoas das vendas ** ** para que você pode definir e monitorar as metas.
 ,S.O. No.,Número da Ordem de Venda
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, crie um Cliente apartir do Cliente em Potencial {0}"
 DocType: Price List,Applicable for Countries,Aplicável para os Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Somente pedidos de licença com o status ""Aprovado"" ou ""Rejeitado"" podem ser enviados"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Nome do Grupo de Alunos é obrigatório na linha {0}
@@ -1831,6 +1832,7 @@
 DocType: Packing Slip,If more than one package of the same type (for print),Se mais do que uma embalagem do mesmo tipo (para impressão)
 DocType: Warehouse,Parent Warehouse,Armazén Pai
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Defina vários tipos de empréstimos
+DocType: Bin,FCFS Rate,Taxa FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Valor Devido
 DocType: Project Task,Working,Trabalhando
 DocType: Stock Ledger Entry,Stock Queue (FIFO),Fila do estoque (PEPS)
@@ -1838,7 +1840,7 @@
 DocType: Account,Round Off,Arredondamento
 ,Requested Qty,Qtde Solicitada
 DocType: Tax Rule,Use for Shopping Cart,Use para Compras
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Encargos serão distribuídos proporcionalmente com base na qtde de itens ou valor, conforme sua seleção"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Encargos serão distribuídos proporcionalmente com base na qtde de itens ou valor, conforme sua seleção"
 DocType: Maintenance Visit,Purposes,Fins
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"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"
@@ -1854,34 +1856,34 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gerenciar territórios
 DocType: Journal Entry Account,Sales Invoice,Nota Fiscal de Venda
 DocType: Journal Entry Account,Party Balance,Saldo do Sujeito
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Por favor, selecione Aplicar Discount On"
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Criar registro bancário para o total pago de salários pelos critérios acima selecionados
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material para Fabricação
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Percentual de desconto pode ser aplicado contra uma lista de preços ou para todos Lista de Preços.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Percentual de desconto pode ser aplicado contra uma lista de preços ou para todos Lista de Preços.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Lançamento Contábil de Estoque
 DocType: Sales Invoice,Sales Team1,Equipe de Vendas 1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} não existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço do Cliente
 DocType: Employee Loan,Loan Details,Detalhes do Empréstimo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A qtde concluída deve superior a zero.
 DocType: Purchase Invoice,Apply Additional Discount On,Aplicar Desconto Adicional em
 DocType: Account,Root Type,Tipo de Raiz
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível retornar mais de {1} para o item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,enredo
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plotar
 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,Unidade de Medida do Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do imposto após desconto (moeda da empresa)
 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}
 DocType: Purchase Invoice,Select Supplier Address,Selecione um Endereço do Fornecedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Adicionar Colaboradores
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Adicionar Colaboradores
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Muito Pequeno
 DocType: Company,Standard Template,Template Padrão
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A quantidade de material solicitado é menor do que o Pedido Mínimo
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A Conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um gráfico separado de Contas pertencente à Organização.
 DocType: Payment Request,Mute Email,Mudo Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Alimentos, Bebidas e Fumo"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Só pode fazer o pagamento contra a faturar {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Percentual de comissão não pode ser maior do que 100
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Por favor, indique {0} primeiro"
 DocType: Production Order Operation,Actual End Time,Tempo Final Real
@@ -1902,7 +1904,7 @@
 DocType: Rename Tool,Rename Log,Renomear Log
 DocType: Maintenance Visit Purpose,Against Document No,Contra o Documento Nº
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,Gerenciar parceiros de vendas.
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adicionar Alunos
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adicionar Alunos
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Por favor selecione {0}
 DocType: C-Form,C-Form No,Nº do Formulário-C
 DocType: BOM,Exploded_items,Exploded_items
@@ -1936,7 +1938,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,"Por favor, indique data da liberação."
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Total
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Digite o nome da campanha se o motivo da consulta foi uma campanha.
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecione Ano Fiscal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selecione Ano Fiscal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Estoque Mínimo
 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.
@@ -1965,7 +1967,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% do material faturado deste Pedido de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Lançamento de Encerramento do Período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centro de custo com as operações existentes não podem ser convertidos em grupo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Total {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Total {0} {1} {2} {3}
 DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta para Lançamento de Ponto
 apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,Os Registos de Pagamento {0} não estão relacionados
 DocType: GL Entry,Voucher No,Nº do Comprovante
@@ -1977,7 +1979,7 @@
 DocType: Supplier,Last Day of the Next Month,Último dia do mês seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar atuomaticamente o incidente após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Deixe não pode ser alocado antes {0}, como saldo licença já tenha sido no futuro recorde alocação licença encaminhadas-carry {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Observação: Devido /  Data de referência excede dias de crédito de cliente permitido por {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Inscrição do Aluno
 DocType: Stock Settings,Freeze Stock Entries,Congelar Lançamentos no Estoque
 DocType: Asset,Expected Value After Useful Life,Valor Esperado Após Sua Vida Útil
@@ -1986,7 +1988,7 @@
 ,Qty to Deliver,Qtde para Entregar
 ,Stock Analytics,Análise do Estoque
 DocType: Maintenance Visit Purpose,Against Document Detail No,Contra o Nº do Documento Detalhado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,É obrigatório colocar o Tipo de Sujeito
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,É obrigatório colocar o Tipo de Sujeito
 DocType: Quality Inspection,Outgoing,De Saída
 DocType: Material Request,Requested For,Solicitado para
 DocType: Quotation Item,Against Doctype,Contra o Doctype
@@ -2001,7 +2003,7 @@
 DocType: Serial No,Warranty / AMC Details,Garantia / Detalhes do CAM
 DocType: Journal Entry,User Remark,Observação do Usuário
 DocType: Lead,Market Segment,Segmento de Renda
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},O valor pago não pode ser superior ao saldo devedor {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Histórico de Trabalho Interno do Colaborador
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Fechamento (Dr)
 DocType: Cheque Print Template,Cheque Size,Tamanho da Folha de Cheque
@@ -2013,7 +2015,7 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Requisição de Material
 DocType: Employee Education,School/University,Escola / Universidade
 DocType: Payment Request,Reference Details,Detalhes Referência
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valor Esperado após sua vida útil deve ser inferior a Valor Bruto de Compra
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtde Disponível no Estoque
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Total Faturado
 DocType: Asset,Double Declining Balance,Equilíbrio decrescente duplo
@@ -2032,15 +2034,16 @@
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o status pois o aluno {0} está relacionado à candidatura à vaga de estudo {1}
 DocType: Asset,Fully Depreciated,Depreciados Totalmente
 ,Stock Projected Qty,Projeção de Estoque
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Presença marcante HTML
 DocType: Sales Order,Customer's Purchase Order,Pedido de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Número de Série e Lote
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor ou Qtde
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor ou Qtde
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Ordens de produção não puderam ser geradas para:
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Encargos sobre Compras
 ,Qty to Receive,Qtde para Receber
 DocType: Leave Block List,Leave Block List Allowed,Deixe Lista de Bloqueios admitidos
+DocType: Grading Scale Interval,Grading Scale Interval,Intervalo da escala de avaliação
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},Reembolso de Despesa para o Log do Veículo {0}
 DocType: Sales Partner,Retailer,Varejista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Para crédito de conta deve ser uma conta de Balanço
@@ -2082,7 +2085,7 @@
 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
 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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias regras de preços com maior prioridade, então seguintes prioridades internas são aplicadas:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Você realmente quer enviar todos os contracheques de {0} para {1}
 DocType: Supplier,Supplier Details,Detalhes do Fornecedor
 DocType: Expense Claim,Approval Status,Estado da Aprovação
@@ -2092,7 +2095,7 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,Verifique todos
 DocType: Vehicle Log,Invoice Ref,Nota Fiscal de Referência
 DocType: Company,Default Income Account,Conta Padrão de Recebimento
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Cliente/Cliente
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupo de Cliente/Cliente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Lucro / Prejuízo (Crédito) de Anos Fiscais não Encerrados
 DocType: Sales Invoice,Time Sheets,Registros de Tempo
 DocType: Payment Gateway Account,Default Payment Request Message,Mensagem Padrão de Pedido de Pagamento
@@ -2122,7 +2125,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo de Alunos
 DocType: Shopping Cart Settings,Quotation Series,Séries de Orçamento
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Um item existe com o mesmo nome ( {0}) , por favor, altere o nome do grupo de itens ou renomeie o item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Selecione o cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Selecione o cliente
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo do Ativo Depreciado
 DocType: Sales Order Item,Sales Order Date,Data do Pedido de Venda
 DocType: Sales Invoice Item,Delivered Qty,Qtde Entregue
@@ -2136,12 +2139,11 @@
 DocType: Account,Payable,A pagar
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Lucro Bruto %
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liberação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valor Bruto de Compra é obrigatório
 DocType: Lead,Address Desc,Descrição do Endereço
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,É obrigatório colocar o sujeito
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,É obrigatório colocar o sujeito
 DocType: Topic,Topic Name,Nome do tópico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Pelo menos um dos Vendedores ou Compradores deve ser selecionado
-DocType: Grading Structure,Grade Intervals,Intervalos de Nota de Avaliação
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selecione a natureza do seu negócio.
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Onde as operações de fabricação são realizadas.
 DocType: Asset Movement,Source Warehouse,Armazém de origem
@@ -2168,7 +2170,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Cabeçalhos para modelos de impressão.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão , por exemplo, Proforma Invoice ."
 DocType: Student Guardian,Student Guardian,Responsável pelo Aluno
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Encargos tipo de avaliação não pode marcado como Inclusive
 DocType: POS Profile,Update Stock,Atualizar Estoque
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UDM diferente para itens gerará um Peso Líquido (Total ) incorreto. Certifique-se de que o peso líquido de cada item está na mesma UDM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Valor na LDM
@@ -2190,7 +2192,7 @@
 DocType: Company,Exchange Gain / Loss Account,Conta de Ganho / Perda com Câmbio
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Colaborador e Ponto
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Objetivo deve ser um dos {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Preencha o formulário e salve
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,Fill the form and save it,Preencha o formulário e salve
 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 status mais recente no inventário
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Community Forum
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças Antes da Solicitação
@@ -2202,7 +2204,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qtde para Reposição
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas Disponíveis Atualmente
 DocType: Company,Stock Adjustment Account,Conta de Ajuste
-DocType: Journal Entry,Write Off,Abatimento
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Abatimento
 DocType: Timesheet Detail,Operation ID,ID da Operação
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Identificação do usuário no 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}
@@ -2211,17 +2213,17 @@
 DocType: Sales Order Item,Supplier delivers to Customer,O fornecedor entrega diretamente ao cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há [{0}] ({0}) em estoque.
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Próxima Data deve ser maior que data de lançamento
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar imposto detalhado
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mostrar imposto detalhado
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vencimento / Data de Referência não pode ser depois de {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importação e Exportação de Dados
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nenhum Aluno Encontrado
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nenhum Aluno Encontrado
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data do Lançamento da Fatura
 DocType: Product Bundle,List items that form the package.,Lista de itens que compõem o pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Percentual de alocação deve ser igual a 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Por favor, selecione data de lançamento antes de selecionar o sujeito"
 DocType: Serial No,Out of AMC,Fora do CAM
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Criar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,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 de Cadastros de Vendas"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Criar Visita de Manutenção
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,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 de Cadastros de Vendas"
 DocType: Company,Default Cash Account,Conta Caixa padrão
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,"Cadastro da Empresa  (a própria companhia, não se refere ao cliente, nem ao fornecedor)"
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto é baseado na frequência do aluno
@@ -2252,34 +2254,33 @@
 DocType: POS Item Group,Item Group,Grupo de Itens
 DocType: Item,Safety Stock,Estoque de Segurança
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e taxas acrescidos (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Item Imposto Row {0} deve ter em conta tipo de imposto ou de renda ou de despesa ou carregável
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Por favor, digite novamente o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Total devido
 DocType: Journal Entry,Printing Settings,Configurações de impressão
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,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
 DocType: Asset Category Account,Fixed Asset Account,Conta do Ativo Imobilizado
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,De Nota de Entrega
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,De Nota de Entrega
 DocType: Timesheet Detail,From Time,Do Horário
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,No Estoque:
 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/purchase_invoice/purchase_invoice.py +73,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 Item,Rate,Valor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,internar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transações com ações antes {0} são congelados
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Por favor, clique em ""Gerar Agenda"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ex: Kg, Unidade, nº, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referência Não é obrigatório se você entrou Data de Referência
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,Data de Contratação deve ser maior do que a Data de Nascimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Saída de Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Saída de Material
 DocType: Material Request Item,For Warehouse,Para Armazén
 DocType: Employee,Offer Date,Data da Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Orçamentos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Você está em modo offline. Você não será capaz de recarregar até ter conexão.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Você está em modo offline. Você não será capaz de recarregar até ter conexão.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Não foi criado nenhum grupo de alunos.
 DocType: Purchase Invoice Item,Serial No,Nº de Série
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Por favor, indique Maintaince Detalhes primeiro"
 DocType: Stock Entry,Including items for sub assemblies,Incluindo itens para subconjuntos
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Aluno já está inscrito.
 DocType: Fiscal Year,Year Name,Nome do ano
@@ -2292,13 +2293,11 @@
 DocType: Asset,Partially Depreciated,parcialmente depreciados
 DocType: Issue,Opening Time,Horário de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,De e datas necessárias
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A unidade de medida padrão para a variante '{0}' deve ser o mesmo que no modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcule Baseado em
 DocType: Delivery Note Item,From Warehouse,Armazén de Origem
 DocType: Assessment Plan,Supervisor Name,Nome do supervisor
-DocType: Grading Structure,Grading Structure,Estrutura de Nota de Avaliação
 DocType: Purchase Taxes and Charges,Valuation and Total,Valorização e Total
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Personalizar a Notificação
 DocType: Manufacturer,Limited to 12 characters,Limitados a 12 caracteres
 DocType: Journal Entry,Print Heading,Cabeçalho de Impressão
@@ -2312,8 +2311,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Existe uma conta inferior para esta conta. Você não pode excluir esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,Ou qty alvo ou valor alvo é obrigatório
 apps/erpnext/erpnext/stock/get_item_details.py +516,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 +334,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,Data de Abertura deve ser antes da Data de Fechamento
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Por favor, selecione Data de lançamento primeiro"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Data de Abertura deve ser antes da Data de Fechamento
 DocType: Leave Control Panel,Carry Forward,Encaminhar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centro de custo com as operações existentes não podem ser convertidos em registro
 DocType: Department,Days for which Holidays are blocked for this department.,Dias para que feriados são bloqueados para este departamento.
@@ -2321,7 +2320,7 @@
 DocType: Issue,Raised By (Email),Levantadas por (Email)
 DocType: Training Event,Trainer Name,Nome do Instrutor
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Anexar Timbrado
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Não pode deduzir quando é para categoria ' Avaliação ' ou ' Avaliação e Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lista de suas cabeças fiscais (por exemplo, IVA, etc aduaneiras; eles devem ter nomes exclusivos) e suas taxas normais. Isto irá criar um modelo padrão, que você pode editar e adicionar mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},Nº de Série Obrigatório para o Item Serializado {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Conciliação de Pagamentos
@@ -2334,7 +2333,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Quantia)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento & Lazer
 DocType: Quality Inspection,Item Serial No,Nº de série do Item
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Criar registros de colaboradores
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Criar registros de colaboradores
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Presente
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Demonstrativos Contábeis
 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"
@@ -2345,34 +2344,34 @@
 DocType: Item,Default Material Request Type,Tipo de Requisição de Material Padrão
 DocType: Shipping Rule,Shipping Rule Conditions,Regra Condições de envio
 DocType: BOM Replace Tool,The new BOM after replacement,A nova LDM após substituição
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Ponto de Vendas
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Ponto de Vendas
 DocType: Payment Entry,Received Amount,Total recebido
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Criar para quantidade total, ignorar quantidade já pedida"
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planejamento da Produção
 DocType: Quality Inspection,Report Date,Data do Relatório
 DocType: Job Opening,Job Title,Cargo
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Criar Usuários
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Criar Usuários
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Quantidade de Fabricação deve ser maior que 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório da visita da chamada de manutenção.
 DocType: Stock Entry,Update Rate and Availability,Atualizar Valor e Disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percentagem que estão autorizados a receber ou entregar mais contra a quantidade encomendada. Por exemplo: Se você encomendou 100 unidades. e seu subsídio é de 10%, então você está autorizada a receber 110 unidades."
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Conta de despesa é obrigatória para item {0}
 DocType: BOM,Website Description,Descrição do Site
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Mudança no Patrimônio Líquido
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Por favor cancelar a Nota Fiscal de Compra {0} primeiro
 DocType: Serial No,AMC Expiry Date,Data de Validade do CAM
 ,Sales Register,Registro de Vendas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails em
 DocType: Quotation,Quotation Lost Reason,Motivo da perda do Orçamento
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Selecione o seu Domínio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referência da transação nº {0} em {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referência da transação nº {0} em {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada a ser editado.
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstrativo de Fluxo de Caixa
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Invoice {0} a partir de C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Encaminhar se você também quer incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,Contra o Tipo de Comprovante
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Por favor, indique a conta de abatimento"
-apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Última data do pedido
+apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data do último pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Conta {0} não pertence à empresa {1}
 DocType: Student,Guardian Details,Detalhes do Responsável
 DocType: C-Form,C-Form,Formulário-C
@@ -2392,14 +2391,14 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Linha {0} # A conta deve ser do tipo ""Ativo Imobilizado"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qtde Saída
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regras para calcular valor de frete para uma venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série é obrigatório
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série é obrigatório
 DocType: Student Sibling,Student ID,ID do Aluno
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de Atividades para Registros de Tempo
 DocType: Stock Entry Detail,Basic Amount,Valor Base
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Armazém necessário para o ítem do estoque {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} não está associado com a Conta do Sujeito {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} não está associado com a Conta do Sujeito {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Buscar LDM explodida (incluindo sub-conjuntos )
 DocType: Authorization Rule,Applicable To (Employee),Aplicável para (Colaborador)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date é obrigatória
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Atributo incremento para {0} não pode ser 0
@@ -2408,7 +2407,7 @@
 DocType: Payment Reconciliation,To Invoice Date,Até a Data de Faturamento
 DocType: Supplier,Contact HTML,Contato HTML
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de compra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Como regra de preços é aplicada?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Como regra de preços é aplicada?
 DocType: Stock Entry,Delivery Note No,Nº da Guia de Remessa
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Se for selecionado, só as Requisições de Material de Compra para matérias-primas finais é que serão incluídas nas Requisições de Material. Caso contrário, serão criadas Requisições de Material para os itens de origem"
 DocType: Company,Retail,Varejo
@@ -2419,7 +2418,7 @@
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matérias-primas
 DocType: Journal Entry,Write Off Based On,Abater baseado em
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo Código de Barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar emails a fornecedores
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Enviar emails a fornecedores
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Registro de instalação de um nº de série
 apps/erpnext/erpnext/config/hr.py +177,Training,Treinamento
 DocType: Timesheet,Employee Detail,Detalhes do Colaborador
@@ -2440,10 +2439,9 @@
 ,Monthly Attendance Sheet,Folha de Ponto Mensal
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nenhum registro encontrado
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Custo do Ativo Sucateado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Parcialmente pedido
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Centro de Custo é obrigatória para item {2}
 DocType: Vehicle,Policy No,Nº da Apólice
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obter Itens do Pacote de Produtos
 DocType: Asset,Straight Line,Linha reta
 DocType: Project User,Project User,Usuário do Projeto
 DocType: GL Entry,Is Advance,É Adiantamento
@@ -2489,11 +2487,10 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,A Conta: {0} com moeda: {1} não pode ser selecionada
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Conta {0}: A Conta Superior {1} não pertence à empresa: {2}
 DocType: Program Enrollment Tool,Student Applicants,Candidatos à Vaga de Estudo
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Todas as transações relacionadas a esta empresa foram excluídas com sucesso!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Como na Data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Provação
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Devolução / Nota de Crédito
-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/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Devolução / Nota de Crédito
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Quantia total paga
 DocType: Production Order Item,Transferred Qty,Qtde Transferida
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,Planejamento
@@ -2504,7 +2501,7 @@
 DocType: Sales Partner,Contact Desc,Descrição do Contato
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, doença, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios periódicos de síntese via Email.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Por favor configure uma conta padrão no tipo de Reembolso de Despesas {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Por favor configure uma conta padrão no tipo de Reembolso de Despesas {0}
 DocType: Brand,Item Manager,Gerente de Item
 DocType: Buying Settings,Default Supplier Type,Padrão de Tipo de Fornecedor
 DocType: Production Order,Total Operating Cost,Custo de Operacional Total
@@ -2541,9 +2538,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,Linha # {0}: O número de série é obrigatório
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detalhes do Imposto Vinculados ao Item
 ,Item-wise Price List Rate,Lista de Preços por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Orçamento de Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Orçamento de Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível quando você salvar o orçamento.
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Código de barras {0} já utilizado em item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 data ao calendário
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Regras para adicionar os custos de envio .
 DocType: Item,Opening Stock,Abertura de Estoque
@@ -2560,8 +2557,8 @@
  Atualizado via 'Registro de Tempo'"
 DocType: Customer,From Lead,Do Cliente em Potencial
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Ordens liberadas para produção.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,Perfil do PDV necessário para fazer entrada no PDV
 DocType: Program Enrollment Tool,Enroll Students,Matricular Alunos
 DocType: Hub Settings,Name Token,Nome do token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda padrão
@@ -2570,7 +2567,7 @@
 DocType: Production Order,Unstopped,Retomado
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} contra Nota Fiscal de Vendas {1}
 DocType: Sales Invoice,SINV-,NFV-
-DocType: Supplier,Mention if non-standard receivable account,Mencione se a conta a receber não for a conta padrão
+DocType: Customer,Mention if non-standard receivable account,Mencione se a conta a receber não for a conta padrão
 DocType: Journal Entry Account,If Income or Expense,Se é Receita ou Despesa
 DocType: Production Order,Required Items,Itens Necessários
 DocType: Stock Ledger Entry,Stock Value Difference,Diferença de valor do estoque
@@ -2584,7 +2581,7 @@
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,Valor Devido
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estabelecer Metas para este Vendedor por Grupo de Itens
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Congelar lançamentos mais antigos do que [Dias]
-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.","Se duas ou mais regras de preços são encontrados com base nas condições acima, a prioridade é aplicada. Prioridade é um número entre 0 a 20, enquanto o valor padrão é zero (em branco). Número maior significa que ele terá prioridade se houver várias regras de preços com as mesmas condições."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se duas ou mais regras de preços são encontrados com base nas condições acima, a prioridade é aplicada. Prioridade é um número entre 0 a 20, enquanto o valor padrão é zero (em branco). Número maior significa que ele terá prioridade se houver várias regras de preços com as mesmas condições."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Ano Fiscal: {0} não existe
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir que os usuários a seguir para aprovar aplicações deixam para os dias de bloco.
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,Tipos de reembolso de despesas.
@@ -2598,7 +2595,7 @@
 DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,Configurações Resumo de Trabalho Diário da Empresa
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Item {0} ignorado uma vez que não é um item de estoque
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Enviar esta ordem de produção para posterior processamento.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços em uma transação particular, todas as regras de preços aplicáveis devem ser desativados."
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Tarefas
 ,Sales Order Trends,Tendência de Pedidos de Venda
 DocType: Employee,Held On,Realizada em
@@ -2607,8 +2604,8 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,Rate (%),Percentual (%)
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data do Encerramento do Exercício Fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Criar Orçamento do Fornecedor
-DocType: BOM,Materials Required (Exploded),Materiais necessários (explodida)
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Criar Orçamento do Fornecedor
+DocType: BOM,Materials Required (Exploded),Materiais necessários (lista explodida)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Adicione usuários à sua organização, além de você mesmo"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,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 +48,Casual Leave,Casual Deixar
@@ -2645,7 +2642,8 @@
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,ID do Cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausente
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
+DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Pedido de Venda {0} não foi enviado
 DocType: Homepage,Tag Line,Slogan
 DocType: Fee Component,Fee Component,Componente da Taxa
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: Conta Superior {1} não pertence à empresa {2}
@@ -2657,7 +2655,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Cadastre-se no ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens distribuição mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,O item selecionado não pode ter Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter Batch
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% do material entregue contra esta Guia de Remessa
 DocType: Project,Customer Details,Detalhes do Cliente
 ,Unpaid Expense Claim,Reembolso de Despesas Não Pago
@@ -2666,7 +2664,7 @@
 ,Available Stock for Packing Items,Estoque Disponível para o Empacotamento de Itens
 DocType: Item Variant,Item Variant,Item Variant
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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/asset/asset.py +40,Item {0} has been disabled,Item {0} foi desativado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} foi desativado
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, indique a quantidade de item {0}"
 DocType: Employee External Work History,Employee External Work History,Histórico de Trabalho Externo do Colaborador
 DocType: Tax Rule,Purchase,Compras
@@ -2685,7 +2683,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Email do Aluno
 DocType: Employee,Notice (days),Aviso Prévio ( dias)
 DocType: Tax Rule,Sales Tax Template,Modelo de Impostos sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecione os itens para salvar a nota
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Selecione os itens para salvar a nota
 DocType: Employee,Encashment Date,Data da cobrança
 DocType: Account,Stock Adjustment,Ajuste do estoque
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +34,Default Activity Cost exists for Activity Type - {0},Existe Atividade Custo Padrão para o Tipo de Atividade - {0}
@@ -2704,7 +2702,7 @@
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},Número de séries é obrigatório para item {0}
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Por favor, especifique de / para variar"
 DocType: Serial No,Under AMC,Sob CAM
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Taxa de valorização do item é recalculado considerando valor do voucher custo desembarcou
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Configuração padrão para transações de vendas.
 DocType: Guardian,Guardian Of ,Responsável por
 DocType: Grading Scale Interval,Threshold,Média
@@ -2719,8 +2717,8 @@
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,Max desconto permitido para o item: {0} é {1}%
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha # {0}: Não é permitido mudar de fornecedor quando o Pedido de Compra já existe
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Papel que é permitido submeter transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecionar Itens para Produzir
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Selecionar Itens para Produzir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Os dados estão sendo sincronizados, isto pode demorar algum tempo"
 DocType: Item Price,Item Price,Preço do Item
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,Soap & detergente
 DocType: BOM,Show Items,Mostrar Itens
@@ -2735,7 +2733,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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, restrições médicas, etc"
 DocType: Leave Block List,Applies to Company,Aplica-se a Empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar por causa da entrada submetido {0} existe
 DocType: Employee Loan,Disbursement Date,Data do Desembolso
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +217,Today is {0}'s birthday!,{0} faz aniversário hoje!
 DocType: Production Planning Tool,Material Request For Warehouse,Requisição de Material para Armazém
@@ -2749,7 +2747,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir esse Ano Fiscal como padrão , clique em ' Definir como padrão '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Junte-se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Escassez Qtde
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Variante item {0} existe com os mesmos atributos
 DocType: Leave Application,LAP/,SDL/
 DocType: Salary Slip,Salary Slip,Contracheque
 DocType: Pricing Rule,Margin Rate or Amount,Percentual ou Valor de Margem
@@ -2761,14 +2759,14 @@
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.","Quando qualquer uma das operações marcadas são ""Enviadas"", um pop-up abre automaticamente para enviar um email para o ""Contato"" associado a transação, com a transação como um anexo. O usuário pode ou não enviar o email."
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,Configurações Globais
 DocType: Employee Education,Employee Education,Escolaridade do Colaborador
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,É preciso buscar Número detalhes.
 DocType: Salary Slip,Net Pay,Pagamento Líquido
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Nº de Série {0} já foi recebido
 ,Requested Items To Be Transferred,"Items Solicitados, mas não Transferidos"
 DocType: Expense Claim,Vehicle Log,Log do Veículo
 DocType: Purchase Invoice,Recurring Id,Id recorrente
 DocType: Customer,Sales Team Details,Detalhes da Equipe de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Apagar de forma permanente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Apagar de forma permanente?
 DocType: Expense Claim,Total Claimed Amount,Quantia total reivindicada
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Oportunidades potenciais para a venda.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +52,Sick Leave,Licença Médica
@@ -2776,7 +2774,7 @@
 DocType: Delivery Note,Billing Address Name,Endereço de Faturamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +22,Department Stores,Lojas de Departamento
 DocType: Sales Invoice,Base Change Amount (Company Currency),Troco (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nenhuma entrada de contabilidade para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salve o documento pela primeira vez.
 DocType: Account,Chargeable,Taxável
 DocType: Company,Change Abbreviation,Mudança abreviação
@@ -2795,7 +2793,7 @@
 DocType: Item Attribute Value,Attribute Value,Atributo Valor
 ,Itemwise Recommended Reorder Level,Níves de Reposição Recomendados por Item
 DocType: Salary Detail,Salary Detail,Detalhes de Salário
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Por favor selecione {0} primeiro
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Por favor selecione {0} primeiro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Lote {0} de {1} item expirou.
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Registro de Tempo para fabricação
 DocType: Salary Detail,Default Amount,Quantidade Padrão
@@ -2805,10 +2803,9 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Congelar Estoque anterior a' deve ser menor que %d dias .
 DocType: Tax Rule,Purchase Tax Template,Modelo de Impostos sobre a compra
 ,Project wise Stock Tracking,Rastreio de Estoque por Projeto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programação de manutenção {0} existe contra {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtde Real (na origem / destino)
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registros de colaboradores.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Por favor configure a próxima data de depreciação
 DocType: HR Settings,Payroll Settings,Configurações da Folha de Pagamento
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não relacionados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Fazer pedido
@@ -2816,23 +2813,23 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root não pode ter um centro de custos pai
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Depreciação acumulada como em
 DocType: Sales Invoice,C-Form Applicable,Formulário-C Aplicável
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Tempo de Operação deve ser maior que 0 para a operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Armazém é obrigatório
 DocType: Supplier,Address and Contacts,Endereços e Contatos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detalhe da Conversão de Unidade de Medida
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),"Escolha um formato amigável para web, com 900px de largura por 100px de altura"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Ordem de produção não pode ser levantada contra um modelo de item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Encargos são atualizados em Recibo de compra para cada item
 DocType: Warranty Claim,Resolved By,Resolvido por
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alocar licenças por um período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cheques e depósitos apagados incorretamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Conta {0}: Você não pode definir a própria conta como uma conta superior
 DocType: Purchase Invoice Item,Price List Rate,Preço na Lista de Preços
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Criar orçamentos de clientes
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Criar orçamentos de clientes
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""Em Estoque"" ou ""Esgotado"" baseado no estoque disponível neste armazén."
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário para entrega do fornecedor.
 DocType: Project,Expected Start Date,Data Prevista de Início
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Remover item, se as cargas não é aplicável a esse elemento"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Moeda de transação deve ser o mesmo da moeda gateway de pagamento
 apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,Orçamentos:
@@ -2841,13 +2838,13 @@
 DocType: Purchase Invoice,Submit on creation,Enviar ao criar
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os e-mails serão enviados para todos os colaboradores ativos da empresa na hora informada, caso não estejam de férias. O resumo das respostas serão enviadas à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Licença do Colaborador Aprovada
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Linha {0}: Uma entrada de reposição já existe para este armazém {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Não se pode declarar como perdido , porque foi realizado um Orçamento."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback do Treinamento
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Ordem de produção {0} deve ser enviado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},Por favor selecione a Data de início e a Data de Término do Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Por favor selecione a Data de início e a Data de Término do Item {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Até o momento não pode ser antes a partir da data
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adicionar / Editar preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adicionar / Editar preços
 DocType: Cheque Print Template,Cheque Print Template,Template para Impressão de Cheques
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Plano de Centros de Custo
 ,Requested Items To Be Ordered,"Itens Solicitados, mas não Comprados"
@@ -2857,7 +2854,7 @@
 ,Ordered Items To Be Delivered,"Itens Vendidos, mas não Entregues"
 DocType: Account,Income,Receita
 DocType: Industry Type,Industry Type,Tipo de Indústria
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Algo deu errado!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Algo deu errado!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,A Nota Fiscal de Venda {0} já foi enviada
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,Ano Fiscal {0} não existe
@@ -2880,14 +2877,14 @@
 DocType: Naming Series,Help HTML,Ajuda HTML
 DocType: Student Group Creation Tool,Student Group Creation Tool,Ferramenta de Criação de Grupos de Alunos
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Peso total atribuído deve ser de 100%. É {0}
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Não é possível definir como Perdido uma vez que foi feito um Pedido de Venda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não é possível definir como Perdido uma vez que foi feito um Pedido de Venda
 DocType: Request for Quotation Item,Supplier Part No,Nº da Peça no Fornecedor
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recebido de
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Recebido de
 DocType: Item,Has Serial No,Tem nº de Série
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: A partir de {0} para {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: A partir de {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Linha # {0}: Defina o fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Linha {0}: Horas deve ser um valor maior que zero
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,Website Image {0} attached to Item {1} cannot be found,Site Imagem {0} anexada ao Item {1} não pode ser encontrado
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos no site.
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,"Por favor, verifique multi opção de moeda para permitir que contas com outra moeda"
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,Item: {0} não existe no sistema
@@ -2898,13 +2895,13 @@
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Para o Armazén
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas Admissões de Alunos
 ,Average Commission Rate,Percentual de Comissão Médio
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'Has Serial No' can not be 'Yes' for non-stock item,'Tem Número Serial' não pode ser confirmado para itens sem controle de estoque
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Comparecimento não pode ser marcado para datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Regra Preços Ajuda
 DocType: Purchase Taxes and Charges,Account Head,Conta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atualize custos adicionais para calcular o custo de desembarque dos itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,elétrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Adicione o resto de sua organização como seus usuários. Você também pode adicionar clientes convidados ao seu portal adicionando-os de Contatos
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Adicione o resto de sua organização como seus usuários. Você também pode adicionar clientes convidados ao seu portal adicionando-os de Contatos
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença do Valor Total (Saída - Entrada)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Linha {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 de usuário não definida para Colaborador {0}
@@ -2912,7 +2909,7 @@
 DocType: Item,Customer Code,Código do Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de aniversário para {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias desde a última compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Débito em conta deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Código dos Documentos
 DocType: Leave Block List,Leave Block List Name,Deixe o nome Lista de Bloqueios
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de início da cobertura do seguro deve ser inferior a data de término da cobertura
@@ -2925,9 +2922,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Contracheque do colaborador {0} já criado para o registro de tempo {1}
 DocType: Vehicle Log,Odometer,Odômetro
 DocType: Sales Order Item,Ordered Qty,Qtde Encomendada
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Estoque congelado até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,LDM não contém nenhum item de estoque
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,LDM não contém nenhum item de estoque
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Período Do período Para datas e obrigatórias para os recorrentes {0}
 DocType: Vehicle Log,Refuelling Details,Detalhes de Abastecimento
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,Gerar contracheques
@@ -2935,7 +2932,7 @@
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,Desconto deve ser inferior a 100
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Último valor de compra não encontrado
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Valor abatido (moeda da empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Linha # {0}: Por favor, defina a quantidade de reposição"
 DocType: Landed Cost Voucher,Landed Cost Voucher,Comprovante de Custos de Desembarque
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Defina {0}
 DocType: Employee,Health Details,Detalhes sobre a Saúde
@@ -2949,7 +2946,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data da Manutenção
 DocType: Purchase Invoice Item,Rejected Serial No,Nº de Série Rejeitado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Ano data de início ou data de término é a sobreposição com {0}. Para evitar defina empresa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data de início deve ser inferior a data final para o item {0}
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","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."
@@ -3003,7 +3000,6 @@
 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
-DocType: Grade Interval,Grade Interval,Intervalo de Nota de Avaliação
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},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 +131,Successfully Reconciled,Reconciliados com sucesso
 DocType: Production Order,Planned End Date,Data Planejada de Término
@@ -3032,14 +3028,14 @@
 DocType: Delivery Note Item,Against Sales Invoice,Contra a Nota Fiscal de Venda
 DocType: Bin,Reserved Qty for Production,Qtde Reservada para Produção
 DocType: Asset,Frequency of Depreciation (Months),Frequência das Depreciações (meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conta de crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Conta de crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de Desembarque do Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores zerados
 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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configurar um website simples para a minha organização
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta de Recebimento/Pagamento
 DocType: Delivery Note Item,Against Sales Order Item,Relacionado ao Item do Pedido de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique Atributo Valor para o atributo {0}"
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Orçamento não pode ser atribuído contra a conta de grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Por favor entre o centro de custo pai
 DocType: Delivery Note,Print Without Amount,Imprimir sem valores
@@ -3066,7 +3062,7 @@
 ,BOM Stock Report,Relatório de Estoque por LDM
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,Processamento de Folha de Pagamento
 DocType: GL Entry,Credit Amount,Total de crédito
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Definir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Definir como Perdido
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,O pagamento Recibo Nota
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Isto é baseado nas transações envolvendo este Cliente. Veja a linha do tempo abaixo para maiores detalhes
 DocType: Supplier,Credit Days Based On,Crédito baseado em
@@ -3075,7 +3071,7 @@
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,Planejar Registros de Tempo fora do horário de trabalho da estação de trabalho.
 ,Items To Be Requested,Itens para Requisitar
 DocType: Purchase Order,Get Last Purchase Rate,Obter Valor da Última Compra
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecione ou adicione um novo cliente
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Selecione ou adicione um novo cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Recursos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Isto é baseado na frequência deste Colaborador
 DocType: Fiscal Year,Year Start Date,Data do início do ano
@@ -3086,7 +3082,7 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impedir que usuários solicitem licenças em dias seguintes
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Valor de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Orçamento do fornecedor {0} criado
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,O ano final não pode ser antes do ano de início
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefícios a Colaboradores
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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
@@ -3099,7 +3095,7 @@
 DocType: Account,Parent Account,Conta Superior
 ,Hub,Cubo
 DocType: GL Entry,Voucher Type,Tipo de Comprovante
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Preço de tabela não encontrado ou deficientes
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Colaborador dispensado em {0} deve ser definido como 'Desligamento'
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Avaliação {0} criada para o Colaborador {1} no intervalo de datas informado
 DocType: Selling Settings,Campaign Naming By,Nomeação de Campanha por
@@ -3112,7 +3108,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: Sujeito / Conta não coincidem com {1} / {2} em {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Por favor insira Conta Despesa
 DocType: Account,Stock,Estoque
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha #{0}: O Tipo de Documento de Referência deve ser um Pedido de Compra, uma Nota Fiscal de Compra ou um Lançamento Contábil"
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item é uma variante de outro item, em seguida, descrição, imagem, preços, impostos etc será definido a partir do modelo, a menos que explicitamente especificado"
 DocType: Serial No,Purchase / Manufacture Details,Detalhes Compra / Fabricação
 apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,Inventário por Lote
@@ -3131,7 +3127,7 @@
 DocType: Sales Order,% of materials delivered against this Sales Order,% do material entregue deste Pedido de Venda
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,Gravar o movimento item.
 DocType: Hub Settings,Hub Settings,Configurações Hub
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Lançamentos contábeis já foram feitas em moeda {0} para {1} empresa. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É Ativo Existente
 DocType: Warranty Claim,If different than customer address,Se diferente do endereço do cliente
 DocType: BOM Operation,BOM Operation,Operação da LDM
@@ -3142,7 +3138,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,Salário líquido não pode ser negativo
 DocType: SMS Settings,Static Parameters,Parâmetros estáticos
 DocType: Assessment Plan,Room,Sala
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material a Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material a Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Guia de Recolhimento de Tributos
 DocType: Expense Claim,Employees Email Id,Endereços de Email dos Colaboradores
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,Passivo Circulante
@@ -3182,11 +3178,11 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,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}
 ,Item-wise Purchase Register,Registro de Compras por Item
 ,Supplier Addresses and Contacts,Endereços e Contatos de Fornecedores
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Por favor selecione a Categoria primeiro
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Por favor selecione a Categoria primeiro
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Cadastro de Projeto.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar nenhum símbolo como R$ etc ao lado de moedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Meio Período)
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Faça uma Série de Alunos
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Faça uma Série de Alunos
 DocType: Leave Type,Is Carry Forward,É encaminhado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Prazo de Entrega (em dias)
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Por favor, indique os pedidos de venda na tabela acima"
@@ -3196,7 +3192,7 @@
 DocType: Employee,Reason for Leaving,Motivo da saída
 DocType: BOM Operation,Operating Cost(Company Currency),Custo operacional (moeda da empresa)
 DocType: Employee Loan Application,Rate of Interest,Taxa de Juros
-DocType: Expense Claim Detail,Sanctioned Amount,Quantidade sancionada
+DocType: Expense Claim Detail,Sanctioned Amount,Valor Sancionado
 DocType: GL Entry,Is Opening,É Abertura
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Lançamento de débito não pode ser relacionado a uma {1}
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A Conta {0} não existe
diff --git a/erpnext/translations/pt.csv b/erpnext/translations/pt.csv
index 96da0cc..a321be2 100644
--- a/erpnext/translations/pt.csv
+++ b/erpnext/translations/pt.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Alugado
 DocType: Purchase Order,PO-,OC-
 DocType: POS Profile,Applicable for User,Aplicável para o utilizador
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","A Ordem de Produção parada não pode ser cancelada, continue com mesma antes para depois cancelar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","A Ordem de Produção parada não pode ser cancelada, continue com mesma antes para depois cancelar"
 DocType: Vehicle Service,Mileage,Quilometragem
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Você realmente quer descartar esse ativo?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selecione o Fornecedor Padrão
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selecione o Fornecedor Padrão
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Moeda é necessária para a Lista de Preços {0}
 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
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Pendente para {0} não pode ser menor que zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Padrão de 10 min
 DocType: Leave Type,Leave Type Name,Nome do Tipo de Baixa
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Mostrar aberto
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Mostrar aberto
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Série Atualizada com Sucesso
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Check-out
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Submetido
@@ -57,23 +57,23 @@
 ,Batch Item Expiry Status,Batch item de status de validade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Depósito Bancário
 DocType: Mode of Payment Account,Mode of Payment Account,Modo da Conta de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Mostrar Variantes
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Mostrar Variantes
 DocType: Academic Term,Academic Term,Período Letivo
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Quantidade
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Quantidade
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,A tabela de contas não pode estar vazia.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Empréstimos (Passivo)
-DocType: Employee Education,Year of Passing,Ano de Falecimento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referência: %s, Código do Artigo: %s e Cliente: %s"
+DocType: Employee Education,Year of Passing,Ano de conclusão
 DocType: Item,Country of Origin,País de origem
-apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em Estoque
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Em stock
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Incidentes em Aberto
 DocType: Production Plan Item,Production Plan Item,Artigo do Plano de Produção
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},O usuário {0} já está atribuído ao funcionário {1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},O utilizador {0} já está atribuído ao funcionário {1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Assistência Médica
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Atraso no pagamento (Dias)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Despesa de Serviço
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fatura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Número de série: {0} já está referenciado na fatura de vendas: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periodicidade
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,O Ano Fiscal {0} é obrigatório
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Data prevista de entrega é de ser antes de Ordem de Vendas Data
@@ -90,7 +90,7 @@
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,Por favor selecione a data
 DocType: Employee,Holiday List,Lista de Feriados
 apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,Contabilista
-DocType: Cost Center,Stock User,Usuário de Estoque
+DocType: Cost Center,Stock User,Utilizador de Stock
 DocType: Company,Phone No,Nº de Telefone
 apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,Cronogramas de Curso criados:
 apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},Novo {0}: #{1}
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Anexe o ficheiro .csv com duas colunas, uma para o nome antigo e uma para o novo nome"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} não em qualquer ano fiscal ativa.
 DocType: Packed Item,Parent Detail docname,Dados Principais de docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referência: {0}, Código do Item: {1} e Cliente: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Registo
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Vaga para um Emprego.
 DocType: Item Attribute,Increment,Aumento
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selecionar Armazém...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Selecionar Armazém...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicidade
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Esta mesma empresa está inscrita mais do que uma vez
 DocType: Employee,Married,Casado/a
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Não tem permissão para {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Obter itens de
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Não tem permissão para {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Obter itens de
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},O Stock não pode ser atualizado nesta Guia de Remessa {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produto {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nenhum item listado
 DocType: Payment Reconciliation,Reconcile,Conciliar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Mercearia
 DocType: Quality Inspection Reading,Reading 1,Leitura 1
 DocType: Process Payroll,Make Bank Entry,Efetuar Registo Bancário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fundos de Pensão
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Próxima Depreciação A data não pode ser antes Data da compra
 DocType: SMS Center,All Sales Person,Todos os Vendedores
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"A **Distribuição Mensal** ajuda-o a distribuir o Orçamento/Meta por vários meses, caso o seu negócio seja sazonal."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Não itens encontrados
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Não itens encontrados
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Falta a Estrutura Salarial
 DocType: Lead,Person Name,Nome da Pessoa
 DocType: Sales Invoice Item,Sales Invoice Item,Item de Fatura de Vendas
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","ex: ""Escola Primária"" ou ""Universidade"""
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Relatórios de Stock
 DocType: Warehouse,Warehouse Detail,Detalhe Armazém
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},O cliente {0} {1}/{2} ultrapassou o limite de crédito
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"O Prazo de Data de Término não pode ser posterior à Data de Término de Ano do Ano Letivo, com a qual está relacionado o termo (Ano Lectivo {}). Por favor, corrija as datas e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""É um Ativo Imobilizado"" não pode ser desmarcado, pois existe um registo de ativos desse item"
 DocType: Vehicle Service,Brake Oil,Óleo dos Travões
 DocType: Tax Rule,Tax Type,Tipo de imposto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Não está autorizado a adicionar ou atualizar registos antes de {0}
 DocType: BOM,Item Image (if not slideshow),Imagem do Item (se não for diapositivo de imagens)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Existe um Cliente com o mesmo nome
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Valor por Hora / 60) * Tempo Real Operacional
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selecionar BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Selecionar BOM
 DocType: SMS Log,SMS Log,Registo de SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Custo de Itens Entregues
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,O feriado em {0} não é entre De Data e To Date
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,Escolas
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nenhum registo de falta encontrados para o funcionário {0} para {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Por favor, insira primeiro a empresa"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Por favor, selecione primeiro a Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,Please select Company first,"Por favor, selecione primeiro a Empresa"
 DocType: Employee Education,Under Graduate,Universitário
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.js +27,Target On,Objetivo
 DocType: BOM,Total Cost,Custo Total
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Quantidade do Pedido
 DocType: Employee,Mr,Sr.
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Foi encontrado um grupo de clientes duplicado na tabela de grupo do cliente
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tipo de Fornecedor / Fornecedor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tipo de Fornecedor / Fornecedor
 DocType: Naming Series,Prefix,Prefixo
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumíveis
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Classe
 DocType: Sales Invoice Item,Delivered By Supplier,Entregue Pelo Fornecedor
 DocType: SMS Center,All Contact,Todos os Contactos
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Ordem de produção já criado para todos os artigos com BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salário Anual
 DocType: Daily Work Summary,Daily Work Summary,Resumo do Trabalho Diário
 DocType: Period Closing Voucher,Closing Fiscal Year,A Encerrar Ano Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} foi suspenso
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} foi suspenso
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Por favor, seleccione uma Empresa Existente para a criação do Plano de Contas"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Despesas de Stock
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selecionar depósito de destino
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contrapartida
 DocType: Journal Entry Account,Credit in Company Currency,Crédito na Moeda da Empresa
 DocType: Delivery Note,Installation Status,Estado da Instalação
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Você deseja atualizar atendimento? <br> Presente: {0} \ <br> Ausente: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},A Qtd Aceite + Rejeitada deve ser igual à quantidade Recebida pelo Item {0}
 DocType: Request for Quotation,RFQ-,SDC-
 DocType: Item,Supply Raw Materials for Purchase,Abastecimento de Matérias-Primas para Compra
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,É necessário pelo menos um modo de pagamento para a fatura POS.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,É necessário pelo menos um modo de pagamento para a fatura POS.
 DocType: Products Settings,Show Products as a List,Mostrar os Produtos como Lista
 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","Transfira o Modelo, preencha os dados apropriados e anexe o ficheiro modificado.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Efetuar Registo de Depreciação
 DocType: Appraisal Template Goal,KRA,ACR
 DocType: Lead,Request Type,Tipo de Solicitação
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Tornar Funcionário
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Tornar Funcionário
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmissão
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Execução
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Os dados das operações realizadas.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plano de visitas de manutenção.
 DocType: SMS Settings,Enter url parameter for message,Insira o parâmetro url da mensagem
 DocType: POS Profile,Customer Groups,Grupos de Clientes
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Declarações financeiras
 DocType: Guardian,Students,Estudantes
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,As regras para aplicação de preços e descontos.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,A Lista de Preços deve ser aplicável a Comprar ou Vender
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},O montante do adiantamento não pode ser maior do que {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de Séries para esta Transação
 DocType: Company,Default Payroll Payable Account,Folha de pagamento padrão Contas a Pagar
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Atualização Email Grupo
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Atualização Email Grupo
 DocType: Sales Invoice,Is Opening Entry,É Registo de Entrada
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mencione se é uma conta a receber não padrão
 DocType: Course Schedule,Instructor Name,Nome do Instrutor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,É necessário colocar Para o Armazém antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,É necessário colocar Para o Armazém antes de Enviar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Recebido Em
 DocType: Sales Partner,Reseller,Revendedor
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Se for selecionado, Incluirá itens não armazenáveis nos Pedidos de Material."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Na Nota Fiscal de Venda do Item
 ,Production Orders in Progress,Pedidos de Produção em Progresso
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Caixa Líquido de Financiamento
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","O Armazenamento Local está cheio, não foi guardado"
 DocType: Lead,Address & Contact,Endereço e Contacto
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adicionar licenças não utilizadas através de atribuições anteriores
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},O próximo Recorrente {0} será criado em {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Quantia de Custo Total (através da Folha de Serviço)
 DocType: Item Website Specification,Item Website Specification,Especificação de Website do Item
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Licença Bloqueada
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Registos Bancários
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},O Item {0} expirou em {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Registos Bancários
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Item de Reconciliação de Stock
 DocType: Stock Entry,Sales Invoice No,Fatura de Vendas Nr
@@ -318,12 +321,12 @@
 DocType: Pricing Rule,Supplier Type,Tipo de Fornecedor
 DocType: Course Scheduling Tool,Course Start Date,Data de Início do Curso
 ,Student Batch-Wise Attendance,Assiduidade de Estudantes em Classe
-DocType: POS Profile,Allow user to edit Rate,Permitir que o utilizador edite Taxa
+DocType: POS Profile,Allow user to edit Rate,Permitir que o utilizador altere o preço
 DocType: Item,Publish in Hub,Publicar na Plataforma
 DocType: Student Admission,Student Admission,Admissão de Estudante
 ,Terretory,Território
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,O Item {0} foi cancelado
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Solicitação de Material
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,O Item {0} foi cancelado
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Solicitação de Material
 DocType: Bank Reconciliation,Update Clearance Date,Atualizar Data de Liquidação
 DocType: Item,Purchase Details,Dados de Compra
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},O Item {0} não foi encontrado na tabela das 'Matérias-primas Fornecidas' na Ordens de Compra {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cheques a Cobrar e Depósitos a receber
 DocType: Item,Synced With Hub,Sincronizado com a Plataforma
 DocType: Vehicle,Fleet Manager,Gestor de Frotas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} não pode ser negativo para o item {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Senha Incorreta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} não pode ser negativo para o item {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Senha Incorreta
 DocType: Item,Variant Of,Variante de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"A Qtd Concluída não pode ser superior à ""Qtd de Fabrico"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"A Qtd Concluída não pode ser superior à ""Qtd de Fabrico"""
 DocType: Period Closing Voucher,Closing Account Head,A Fechar Título de Contas
 DocType: Employee,External Work History,Histórico Profissional Externo
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Erro de Referência Circular
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notificar por Email na criação de Solicitações de Material automáticas
 DocType: Journal Entry,Multi Currency,Múltiplas Moedas
 DocType: Payment Reconciliation Invoice,Invoice Type,Tipo de Fatura
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Guia de Remessa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Guia de Remessa
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,A Configurar Impostos
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Custo do Ativo Vendido
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"O Registo de Pagamento foi alterado após o ter retirado. Por favor, retire-o novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
-DocType: Grade Interval,Min Score,min Pontuação
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} entrou duas vezes na Taxa de Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Resumo para esta semana e atividades pendentes
 DocType: Student Applicant,Admitted,Admitido/a
 DocType: Workstation,Rent Cost,Custo de Aluguer
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valor do pedido
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Transações Bancárias/Dinheiro de terceiros ou de transferências internas
 DocType: Shipping Rule,Valid for Countries,Válido para Países
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este Item é um Modelo e não pode ser utilizado nas transações. Os atributos doItem serão copiados para as variantes a menos que defina ""Não Copiar"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Este Item é um Modelo e não pode ser utilizado nas transações. Os atributos doItem serão copiados para as variantes a menos que defina ""Não Copiar"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,PedidoTotal Considerado
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Categoria profissional do funcionário (por exemplo, Presidente Executivo , Diretor , etc.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Por favor, insira o valor do campo ""Repetir no Dia do Mês"""
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Linha #{0}: Não pode ser efetuada uma Fatura de Compra para o ativo existente {1}
 DocType: Item Tax,Tax Rate,Taxa de Imposto
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} já foi alocado para o Funcionário {1} para o período de {2} a {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selecionar Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Selecionar Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,A Fatura de Compra {0} já foi enviada
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Linha # {0}: O Nº de Lote deve ser igual a {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converter a Fora do Grupo
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lote de um Item.
 DocType: C-Form Invoice Detail,Invoice Date,Data da Fatura
 DocType: GL Entry,Debit Amount,Montante de Débito
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Só pode haver 1 Conta por Empresa em {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Por favor, veja o anexo"
 DocType: Purchase Order,% Received,% Recebida
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Criar Grupos de Estudantes
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Solicitação de Cotação
 DocType: Salary Slip Timesheet,Working Hours,Horas de Trabalho
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Altera o número de sequência inicial / atual duma série existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Criar um novo cliente
-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.","Se várias Regras de Fixação de Preços continuarem a prevalecer, será pedido aos utilizadores que definam a Prioridade manualmente para que este conflito seja resolvido."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Criar ordens de compra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Criar um novo cliente
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Se várias Regras de Fixação de Preços continuarem a prevalecer, será pedido aos utilizadores que definam a Prioridade manualmente para que este conflito seja resolvido."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Criar ordens de compra
 ,Purchase Register,Registo de Compra
 DocType: Course Scheduling Tool,Rechedule,Remarcar
 DocType: Landed Cost Item,Applicable Charges,Encargos Aplicáveis
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) deve ter a função 'Aprovador de Licenças'
 DocType: Purchase Receipt,Vehicle Date,Data de Veículo
 DocType: Student Log,Medical,Clínico
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motivo de perda
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motivo de perda
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,O Dono do Potencial Cliente não pode ser o mesmo que o Potencial Cliente
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,O montante atribuído não pode ser superior ao montante não ajustado
 DocType: Announcement,Receiver,Recetor
@@ -462,11 +464,12 @@
 DocType: Purchase Invoice,Yearly,Anual
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,"Por favor, insira o Centro de Custos"
 DocType: Journal Entry Account,Sales Order,Ordem de Venda
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Taxa de Venda Méd.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,Preço de Venda Médio
 DocType: Assessment Plan,Examiner Name,Nome do Examinador
-DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Taxa
+DocType: Purchase Invoice Item,Quantity and Rate,Quantidade e Valor
 DocType: Delivery Note,% Installed,% Instalada
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Salas de Aula / Laboratórios, etc. onde podem ser agendadas palestras."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de Fornecedor
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Por favor, insira o nome da empresa primeiro"
 DocType: Purchase Invoice,Supplier Name,Nome do Fornecedor
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Leia o Manual de ERPNext
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Campo obrigatório - Ano Acadêmico
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Campo obrigatório - Ano Acadêmico
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Personaliza o texto introdutório que vai fazer parte desse email. Cada transação tem um texto introdutório em separado.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Defina a conta pagável padrão da empresa {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,As definições gerais para todos os processos de fabrico.
 DocType: Accounts Settings,Accounts Frozen Upto,Contas Congeladas Até
 DocType: SMS Log,Sent On,Enviado Em
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,O Atributo {0} foi selecionado várias vezes na Tabela de Atributos
 DocType: HR Settings,Employee record is created using selected field. ,O registo de funcionário é criado ao utilizar o campo selecionado.
 DocType: Sales Order,Not Applicable,Não Aplicável
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Definidor de Feriados.
 DocType: Request for Quotation Item,Required Date,Data Obrigatória
 DocType: Delivery Note,Billing Address,Endereço de Faturamento
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Por favor, insira o Código do Item."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Por favor, insira o Código do Item."
 DocType: BOM,Costing,Cálculo dos Custos
 DocType: Tax Rule,Billing County,Condado de Faturamento
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Se for selecionado, será considerado que o valor do imposto já está incluído na Taxa de Impressão / Quantidade de Impressão"
@@ -508,6 +512,7 @@
 DocType: Packing Slip,From Package No.,Do Pacote Nr.
 DocType: Item Attribute,To Range,Para Gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Títulos e Depósitos
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Não é possível alterar o método de avaliação, uma vez que há transações contra alguns itens que não tem seu próprio método de avaliação"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,É obrigatório o total de licenças alocadas
 DocType: Job Opening,Description of a Job Opening,Descrição de uma Vaga de Emprego
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Atividades pendentes para hoje
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Por favor selecione Curso
 DocType: Timesheet Detail,Hrs,Hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Por favor, selecione a Empresa"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Por favor, selecione a Empresa"
 DocType: Stock Entry Detail,Difference Account,Conta de Diferenças
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Não pode encerrar a tarefa pois a sua tarefa dependente {0} não está encerrada.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Por favor, insira o Armazém em que será levantanda a Solicitação de Material"
 DocType: Production Order,Additional Operating Cost,Custos Operacionais Adicionais
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosméticos
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Para unir, as seguintes propriedades devem ser iguais para ambos items"
 DocType: Shipping Rule,Net Weight,Peso Líquido
 DocType: Employee,Emergency Phone,Telefone de Emergência
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Comprar
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Por favor defina o grau para o Limiar 0%
 DocType: Sales Order,To Deliver,A Entregar
 DocType: Purchase Invoice Item,Item,Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,O nr. de série do item não pode ser uma fração
 DocType: Journal Entry,Difference (Dr - Cr),Diferença (Db - Cr)
 DocType: Account,Profit and Loss,Lucros e Perdas
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestão de Subcontratação
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,O Aumento não pode ser 0
 DocType: Production Planning Tool,Material Requirement,Requisito de Material
 DocType: Company,Delete Company Transactions,Eliminar Transações da Empresa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,É obrigatório colocar o Nº de Referência e a Data de Referência para as transações bancárias
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,É obrigatório colocar o Nº de Referência e a Data de Referência para as transações bancárias
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adicionar / Editar Impostos e Taxas
 DocType: Purchase Invoice,Supplier Invoice No,Nr. de Fatura de Fornecedor
 DocType: Territory,For reference,Para referência
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,Nota de Instalação de Item
 DocType: Production Plan Item,Pending Qty,Qtd Pendente
 DocType: Budget,Ignore,Ignorar
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} não é activa
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} não é activa
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS enviado a seguintes números: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Defina as dimensões do cheque para impressão
 DocType: Salary Slip,Salary Slip Timesheet,Folha de Presença nas Folhas de Vencimento
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,Comissão Total
 DocType: Pricing Rule,Sales Partner,Parceiro de Vendas
 DocType: Buying Settings,Purchase Receipt Required,É Obrigatório o Recibo de Compra
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,É obrigatório colocar a Taxa de Avaliação se foi introduzido o Stock de Abertura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Não foram encontrados nenhuns registos na tabela da Fatura
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Por favor, selecione primeiro a Empresa e o Tipo de Parte"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Ano fiscal / financeiro.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valores Acumulados
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Desculpe, mas os Nrs. de Série não podem ser unidos"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Criar Pedido de Venda
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Criar Pedido de Venda
 DocType: Project Task,Project Task,Tarefa do Projeto
 ,Lead Id,ID de Potencial Cliente
 DocType: C-Form Invoice Detail,Grand Total,Total Geral
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,Anexo de Currículo
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clientes Fiéis
 DocType: Leave Control Panel,Allocate,Atribuir
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Retorno de Vendas
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Retorno de Vendas
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Nota: O total de licenças atribuídas {0} não deve ser menor do que as licenças já aprovadas {1}, para esse período"
 DocType: Announcement,Posted By,Postado Por
 DocType: Item,Delivered by Supplier (Drop Ship),Entregue pelo Fornecedor (Envio Direto)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,Orçamento Para
 DocType: Lead,Middle Income,Rendimento Médio
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Inicial (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,Default Unit of Measure for Item {0} cannot be changed directly because you have already made some transaction(s) with another UOM. You will need to create a new Item to use a different Default UOM.,A Unidade de Medida Padrão do Item {0} não pode ser alterada diretamente porque já efetuou alguma/s transação/transações com outra UNID. Irá precisar criar um novo Item para poder utilizar uma UNID Padrão diferente.
 apps/erpnext/erpnext/accounts/utils.py +352,Allocated amount can not be negative,O montante atribuído não pode ser negativo
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Defina a Empresa
 DocType: Purchase Order Item,Billed Amt,Qtd Faturada
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Folha de Presença de Fatura de Vendas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},É necessário colocar o Nr. de Referência e a Data de Referência em {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selecione a Conta de Pagamento para efetuar um Registo Bancário
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Criar registos de funcionários para gerir faltas, declarações de despesas e folha de salários"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Adicionar à Base de Conhecimento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Elaboração de Proposta
 DocType: Payment Entry Deduction,Payment Entry Deduction,Dedução de Registo de Pagamento
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' não se encontra no Ano Fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Definições para Comprar Módulo
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},O ativo {0} não pertence à empresa {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Por favor, insira primeiro o Recibo de Compra"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Por favor, insira primeiro o Recibo de Compra"
 DocType: Buying Settings,Supplier Naming By,Nome de Fornecedor Por
 DocType: Activity Type,Default Costing Rate,Taxa de Custo Padrão
 DocType: Maintenance Schedule,Maintenance Schedule,Cronograma 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 as Regras de Fixação de Preços serão filtradas com base no Cliente, Grupo de Clientes, Território, Fornecedor, Tipo de fornecedor, Campanha, Parceiro de Vendas etc."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Então as Regras de Fixação de Preços serão filtradas com base no Cliente, Grupo de Clientes, Território, Fornecedor, Tipo de fornecedor, Campanha, Parceiro de Vendas etc."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Variação Líquida no Inventário
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Gestão de empréstimos a funcionários
 DocType: Employee,Passport Number,Número de Passaporte
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relação com Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Gestor
 DocType: Payment Entry,Payment From / To,Pagamento De / Para
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Intervalo de datas
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},O novo limite de crédito é inferior ao montante em dívida atual para o cliente. O limite de crédito tem que ser pelo menos {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,Same item has been entered multiple times.,O mesmo artigo foi introduzido várias vezes.
 DocType: SMS Settings,Receiver Parameter,Parâmetro do Recetor
 apps/erpnext/erpnext/controllers/trends.py +39,'Based On' and 'Group By' can not be same,'Baseado em' e 'Agrupado por' não podem ser iguais
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,Em minutos
 DocType: Issue,Resolution Date,Data de Resolução
 DocType: Student Batch Name,Batch Name,Nome de Lote
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Folha de Presença criado:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Folha de Presença criado:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Por favor defina o Dinheiro ou Conta Bancária padrão no Modo de Pagamento {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Matricular
 DocType: Selling Settings,Customer Naming By,Nome de Cliente Por
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Irá mostrar ao aluno como Presente em Student Relatório de Frequência Mensal
@@ -684,7 +688,7 @@
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,Converter a Grupo
 DocType: Activity Cost,Activity Type,Tipo de Atividade
 DocType: Request for Quotation,For individual supplier,Para cada fornecedor
-DocType: BOM Operation,Base Hour Rate(Company Currency),Valor Base por Hora (Moeda da Empresa)
+DocType: BOM Operation,Base Hour Rate(Company Currency),Preço Base por Hora (Moeda da Empresa)
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,Montante Entregue
 DocType: Supplier,Fixed Days,Dias Fixos
 DocType: Quotation Item,Item Balance,Saldo do Item
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Hora de Início Efetiva
 DocType: BOM Operation,Operation Time,Tempo de Operação
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Terminar
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Base
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Base
 DocType: Timesheet,Total Billed Hours,Horas Totais Faturadas
 DocType: Journal Entry,Write Off Amount,Liquidar Quantidade
 DocType: Journal Entry,Bill No,Nr. de Conta
@@ -714,11 +718,11 @@
 DocType: Selling Settings,Delivery Note Required,Guia de Remessa Necessária
 DocType: Bank Guarantee,Bank Guarantee Number,Número de Garantia Bancária
 DocType: Assessment Criteria,Assessment Criteria,Critérios de avaliação
-DocType: BOM Item,Basic Rate (Company Currency),Taxa Básica (Moeda da Empresa)
+DocType: BOM Item,Basic Rate (Company Currency),Preço Unitário (Moeda da Empresa)
 DocType: Student Attendance,Student Attendance,Assiduidade de Estudante
 DocType: Sales Invoice Timesheet,Time Sheet,Folha de Presença
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Confirmar Matérias-Primas com Base Em
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Por favor, insira os dados do item"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Por favor, insira os dados do item"
 DocType: Interest,Interest,Juros
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pré-vendas
 DocType: Purchase Receipt,Other Details,Outros Dados
@@ -729,23 +733,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,O Registo de Pagamento já tinha sido criado
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock Atual
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Linha #{0}: O Ativo {1} não está vinculado ao Item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Pré-visualizar Folha de Pagamento
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Pré-visualizar Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,A Conta {0} foi inserida várias vezes
 DocType: Account,Expenses Included In Valuation,Despesas Incluídas na Estimativa
 DocType: Hub Settings,Seller City,Cidade do Vendedor
 ,Absent Student Report,Relatório de Faltas de Estudante
 DocType: Email Digest,Next email will be sent on:,O próximo email será enviado em:
 DocType: Offer Letter Term,Offer Letter Term,Termo de Carta de Oferta
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,O Item tem variantes.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,O Item tem variantes.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Não foi encontrado o Item {0}
 DocType: Bin,Stock Value,Valor do Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,A Empresa {0} não existe
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tipo de Esquema
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tipo de Esquema
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qtd Consumida Por Unidade
 DocType: Serial No,Warranty Expiry Date,Data de Validade da Garantia
 DocType: Material Request Item,Quantity and Warehouse,Quantidade e Armazém
 DocType: Sales Invoice,Commission Rate (%),Taxa de Comissão (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} através da Configuração&gt; Configurações&gt; Nomeação de Série
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selecione o programa
 DocType: Project,Estimated Cost,Custo Estimado
 DocType: Purchase Order,Link to material requests,Link para pedidos de material
@@ -763,7 +766,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Montante Recebido (Moeda da Empresa)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,O Potencial Cliente deve ser definido se for efetuada uma Oportunidade para um Potencial Cliente
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Por favor, seleccione os dias de folga semanal"
 DocType: Production Order Operation,Planned End Time,Tempo de Término Planeado
 ,Sales Person Target Variance Item Group-Wise,Item de Variância Alvo de Vendedores em Grupo
@@ -779,6 +782,7 @@
 DocType: Opportunity,Opportunity From,Oportunidade De
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declaração salarial mensal.
 DocType: BOM,Website Specifications,Especificações do Website
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Por favor, configure as séries de numeração para Atendimento por meio da Configuração&gt; Série de numeração"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: De {0} do tipo {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão
@@ -832,6 +836,7 @@
 DocType: Employee,Bank A/C No.,Nr. de Conta Bancária
 DocType: Bank Guarantee,Project,Projeto
 DocType: Quality Inspection Reading,Reading 7,Leitura 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,parcialmente ordenados
 DocType: Expense Claim Detail,Expense Claim Type,Tipo de Reembolso de Despesas
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,As definições padrão para o Carrinho de Compras
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Ativo excluído através do Lançamento Contabilístico {0}
@@ -839,14 +844,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotecnologia
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Despesas de Manutenção de Escritório
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurar conta de email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Por favor, insira o Item primeiro"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Por favor, insira o Item primeiro"
 DocType: Account,Liability,Responsabilidade
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,O Montante Sancionado não pode ser maior do que o Montante de Reembolso na Fila {0}.
 DocType: Company,Default Cost of Goods Sold Account,Custo Padrão de Conta de Produtos Vendidos
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,A Lista de Preços não foi selecionada
 DocType: Employee,Family Background,Antecedentes Familiares
 DocType: Request for Quotation Supplier,Send Email,Enviar Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Aviso: Anexo inválido {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Sem Permissão
 DocType: Company,Default Bank Account,Conta Bancária Padrão
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Para filtrar com base nas Partes, selecione o Tipo de Parte primeiro"
@@ -859,7 +864,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Não foi encontrado nenhum funcionário
 DocType: Supplier Quotation,Stopped,Parado
 DocType: Item,If subcontracted to a vendor,Se for subcontratado a um fornecedor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,O grupo de alunos já está atualizado.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,O grupo de alunos já está atualizado.
 DocType: SMS Center,All Customer Contact,Todos os Contactos de Clientes
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Carregar saldo de stock através de csv.
 DocType: Warehouse,Tree Details,Dados de Esquema
@@ -870,8 +875,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Montante Mínimo da Fatura
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: O Centro de Custo {2} não pertence à Empresa {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: A Conta {2} não pode ser um Grupo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname}  não existe na tabela '{doctype}'
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,A Folha de Presenças {0} já está concluída ou foi cancelada
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,A Linha do Item {idx}: {doctype} {docname}  não existe na tabela '{doctype}'
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,A Folha de Presenças {0} já está concluída ou foi cancelada
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,não há tarefas
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","O dia do mês em que a fatura automática será gerada. Por exemplo, 05, 28, etc."
 DocType: Asset,Opening Accumulated Depreciation,Depreciação Acumulada Inicial
@@ -887,7 +892,7 @@
 DocType: Bin,Moving Average Rate,Taxa Média de Mudança
 DocType: Production Planning Tool,Select Items,Selecionar Itens
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} na Fatura {1} com a data de {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Cronograma de Curso
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Cronograma de Curso
 DocType: Maintenance Visit,Completion Status,Estado de Conclusão
 DocType: HR Settings,Enter retirement age in years,Insira a idade da reforma em anos
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Armazém Alvo
@@ -895,7 +900,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permitir  entrega ou receção em excesso até esta percentagem
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Importar Assiduidade
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Todos os Grupos de Itens
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Todos os Grupos de Itens
 DocType: Process Payroll,Activity Log,Registo de Atividade
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Lucro / Prejuízo Líquido
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Criar mensagem automática no envio de transações.
@@ -906,7 +911,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Ordem de Compra para pagamento
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Qtd Projetada
 DocType: Sales Invoice,Payment Due Date,Data Limite de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,A Variante do Item {0} já existe com mesmos atributos
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','Abertura'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Tarefas Abertas
 DocType: Notification Control,Delivery Note Message,Mensagem de Guia de Remessa
@@ -922,7 +927,7 @@
 DocType: Item Reorder,Re-Order Qty,Qtd de Reencomenda
 DocType: Leave Block List Date,Leave Block List Date,Data de Lista de Bloqueio de Licenças
 DocType: Pricing Rule,Price or Discount,Preço ou Desconto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de encargos aplicáveis em Purchase mesa Itens recibo deve ser o mesmo que o total Tributos e Encargos
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Total de encargos aplicáveis em Purchase mesa Itens recibo deve ser o mesmo que o total Tributos e Encargos
 DocType: Sales Team,Incentives,Incentivos
 DocType: SMS Log,Requested Numbers,Números Solicitados
 DocType: Production Planning Tool,Only Obtain Raw Materials,Só Obter as Matérias-primas
@@ -951,16 +956,16 @@
 DocType: Supplier Quotation,Is Subcontracted,É Subcontratado
 DocType: Item Attribute,Item Attribute Values,Valores do Atributo do Item
 DocType: Examination Result,Examination Result,Resultado do Exame
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Recibo de Compra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Recibo de Compra
 ,Received Items To Be Billed,Itens Recebidos a Serem Faturados
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Folhas de salário Submetido
 DocType: Employee,Ms,Sra.
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Definidor de taxa de câmbio de moeda.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},O Tipo de Documento de Referência deve ser um de {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},O Tipo de Documento de Referência deve ser um de {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Incapaz de encontrar o Horário nos próximos {0} dias para a Operação {1}
 DocType: Production Order,Plan material for sub-assemblies,Planear material para subconjuntos
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parceiros de Vendas e Território
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Não é possível criar automaticamente conta como já existe saldo de estoque na conta. Você deve criar uma conta de correspondência antes de poder fazer uma entrada neste armazém
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Não é possível criar a conta automaticamente porque já existe saldo de stock na conta. Você deve criar uma conta de correspondência antes de poder fazer uma entrada neste armazém
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,A LDM {0} deve estar ativa
 DocType: Journal Entry,Depreciation Entry,Registo de Depreciação
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,"Por favor, selecione primeiro o tipo de documento"
@@ -980,10 +985,9 @@
 DocType: Supplier,Default Payable Accounts,Contas a Pagar Padrão
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,O(A) Funcionário(a) {0} não está ativo(a) ou não existe
 DocType: Fee Structure,Components,Componentes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Variantes do Item {0} atualizadas
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Por favor, insira a Categoria de Ativo no Item {0}"
 DocType: Quality Inspection Reading,Reading 6,Leitura 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Não é possível {0} {1} {2} sem qualquer fatura pendente negativa
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Avanço de Fatura de Compra
 DocType: Hub Settings,Sync Now,Sincronizar Agora
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Linha {0}: O registo de crédito não pode ser ligado a {1}
@@ -997,11 +1001,11 @@
 DocType: Item,Is Purchase Item,É o Item de Compra
 DocType: Asset,Purchase Invoice,Fatura de Compra
 DocType: Stock Ledger Entry,Voucher Detail No,Dado de Voucher Nr.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nova Fatura de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nova Fatura de Venda
 DocType: Stock Entry,Total Outgoing Value,Valor Total de Saída
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,A Data de Abertura e a Data de Término devem estar dentro do mesmo Ano Fiscal
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,A Data de Abertura e a Data de Término devem estar dentro do mesmo Ano Fiscal
 DocType: Lead,Request for Information,Pedido de Informação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sincronização de Facturas Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sincronização de Facturas Offline
 DocType: Payment Request,Paid,Pago
 DocType: Program Fee,Program Fee,Proprina do Programa
 DocType: Salary Slip,Total in words,Total por extenso
@@ -1011,7 +1015,7 @@
 DocType: Employee Loan,Sanctioned,sancionada
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,é obrigatório. Talvez o registo de Câmbio não tenha sido criado para
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +111,Row #{0}: Please specify Serial No for Item {1},"Linha #{0}: Por favor, especifique o Nr. de Série para o Item {1}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +642,"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 dos ""Pacote de Produtos"", o Armazém e Nr. de Lote serão considerados a partir da tabela de ""Lista de Empacotamento"". Se o Armazém e o Nr. de Lote forem os mesmos para todos os itens empacotados para qualquer item dum ""Pacote de Produto"", esses valores podem ser inseridos na tabela do Item principal, e os valores serão copiados para a tabela da ""Lista de Empacotamento'""."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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 dos ""Pacote de Produtos"", o Armazém e Nr. de Lote serão considerados a partir da tabela de ""Lista de Empacotamento"". Se o Armazém e o Nr. de Lote forem os mesmos para todos os itens empacotados para qualquer item dum ""Pacote de Produto"", esses valores podem ser inseridos na tabela do Item principal, e os valores serão copiados para a tabela da ""Lista de Empacotamento'""."
 DocType: Job Opening,Publish on website,Publicar no website
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Os envios para os clientes.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,A Data da Fatura do Fornecedor não pode ser maior que Data de Lançamento
@@ -1022,7 +1026,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variação
 ,Company Name,Nome da Empresa
 DocType: SMS Center,Total Message(s),Mensagens Totais
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Selecionar Item para Transferência
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Selecionar Item para Transferência
 DocType: Purchase Invoice,Additional Discount Percentage,Percentagem de Desconto Adicional
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Veja uma lista de todos os vídeos de ajuda
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,Selecione o título de conta do banco onde cheque foi depositado.
@@ -1033,8 +1037,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Linha {0}: O pagamento na Ordem de Venda/Compra deve ser sempre marcado como um adiantamento
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Produto Químico
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"A conta Bancária / Dinheiro padrão será atualizada automaticamente no Registo de Lançamento Contabilístico, quando for selecionado este modo."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Os intervalos para a Classe de Código {0} sobrepõe-se com os intervalos de classes para outras classes. Por favor verifique os intervalos {0} e {1} e tente novamente
 DocType: BOM,Raw Material Cost(Company Currency),Custo da Matéria-prima (Moeda da Empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Linha # {0}: A taxa não pode ser maior que a taxa usada em {1} {2}
@@ -1047,14 +1049,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Site item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Carregue o cabeçalho e logótipo da carta. (Pode editá-los mais tarde.)
 DocType: Timesheet Detail,Bill,Fatura
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,A Próxima Data de Depreciação é inserida como data passada
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Branco
 DocType: SMS Center,All Lead (Open),Todos Potenciais Clientes (Abertos)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Linha {0}: A qtd não está disponível para {4} no armazém {1} no momento da postagem do registo ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obter Adiantamentos Pagos
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
 DocType: Item,Automatically Create New Batch,Criar novo lote automaticamente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Efetuar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Registar
 DocType: Student Admission,Admission Start Date,Data de Início de Admissão
 DocType: Journal Entry,Total Amount in Words,Valor Total por Extenso
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Houve um erro. Um dos motivos prováveis para isto ter ocorrido, poderá ser por ainda não ter guardado o formulário. Se o problema persistir, por favor contacte support@erpnext.com."
@@ -1062,7 +1064,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},O Tipo de Pedido deve pertencer a {0}
 DocType: Lead,Next Contact Date,Data do Próximo Contacto
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Qtd Inicial
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Por favor, insira a Conta para o Montante de Alterações"
 DocType: Student Batch Name,Student Batch Name,Nome de Classe de Estudantes
 DocType: Holiday List,Holiday List Name,Lista de Nomes de Feriados
 DocType: Repayment Schedule,Balance Loan Amount,Saldo Valor do Empréstimo
@@ -1082,10 +1084,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Por favor especificar um {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Itens removidos sem nenhuma alteração na quantidade ou valor.
 DocType: Delivery Note,Delivery To,Entregue A
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,É obrigatório colocar a tabela do atributos
 DocType: Production Planning Tool,Get Sales Orders,Obter Ordens de Venda
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} não pode ser negativo
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Desconto
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Desconto
 DocType: Asset,Total Number of Depreciations,Número total de Depreciações
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
 DocType: Sales Invoice Item,Rate With Margin,Taxa com margem
@@ -1101,7 +1103,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Armazém Reservado na Ordem de Vendas / Armazém de Produtos Acabados
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Valor de Vendas
 DocType: Repayment Schedule,Interest Amount,Montante de juros
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Você é o Aprovador de Gastos para este registo. Por favor, atualize o ""Estado"" e Guarde"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Você é o Aprovador de Gastos para este registo. Por favor, atualize o ""Estado"" e Guarde"
 DocType: Serial No,Creation Document No,Nr. de Documento de Criação
 DocType: Issue,Issue,Incidente
 DocType: Asset,Scrapped,Descartado
@@ -1109,12 +1111,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributos para Variantes do Item. Por exemplo: Tamanho, Cor, etc."
 DocType: Purchase Invoice,Returns,Devoluções
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,Armazém WIP
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},O Nr. de Série {0} está sob o contrato de manutenção até {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},O Nr. de Série {0} está sob o contrato de manutenção até {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutamento
 DocType: Lead,Organization Name,Nome da Organização
 DocType: Tax Rule,Shipping State,Estado de Envio
 ,Projected Quantity as Source,Quantidade Projetada como Fonte
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"O item deve ser adicionado utilizando o botão ""Obter Itens de Recibos de Compra"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"O item deve ser adicionado utilizando o botão ""Obter Itens de Recibos de Compra"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Incluir itens não armazenáveis
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Despesas com Vendas
@@ -1122,12 +1124,12 @@
 DocType: GL Entry,Against,Em
 DocType: Item,Default Selling Cost Center,Centro de Custo de Venda Padrão
 DocType: Sales Partner,Implementation Partner,Parceiro de Implementação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Código Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Código Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},A Ordem de Venda {0} é {1}
 DocType: Opportunity,Contact Info,Informações de Contacto
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Efetuar Registos de Stock
 DocType: Packing Slip,Net Weight UOM,Peso Líquido de UNID
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Resultados
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Resultados
 DocType: Item,Default Supplier,Fornecedor Padrão
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Percentagem Permitida de Sobreprodução
 DocType: Employee Loan,Repayment Schedule,Cronograma de amortização
@@ -1135,7 +1137,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obter Datas de Folgas Semanais
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,A Data de Término não pode ser mais recente que a Data de Início
 DocType: Sales Person,Select company name first.,Selecione o nome da empresa primeiro.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotações recebidas de Fornecedores.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Para {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Idade Média
@@ -1155,7 +1157,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Área de Desempenho Fundamental
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transporte
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributo Inválido
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} deve ser enviado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} deve ser enviado
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},A quantidade deve ser inferior ou igual a {0}
 DocType: SMS Center,Total Characters,Total de Caracteres
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Por favor, selecione a LDM no campo LDM para o Item {0}"
@@ -1166,7 +1168,7 @@
 DocType: Sales Partner,Distributor,Distribuidor
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Regra de Envio de Carrinho de Compras
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,a Ordem de Produção {0} deve ser cancelado antes de cancelar esta Ordem de Vendas
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Por favor, defina ""Aplicar Desconto Adicional Em"""
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Por favor, defina ""Aplicar Desconto Adicional Em"""
 ,Ordered Items To Be Billed,Itens Pedidos A Serem Faturados
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,A Faixa De tem de ser inferior à Faixa Para
 DocType: Global Defaults,Global Defaults,Padrões Gerais
@@ -1176,7 +1178,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Ano de Início
 DocType: Purchase Invoice,Start date of current invoice's period,A data de início do período de fatura atual
 DocType: Salary Slip,Leave Without Pay,Licença Sem Vencimento
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Erro de Planeamento de Capacidade
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Erro de Planeamento de Capacidade
 ,Trial Balance for Party,Balancete para a Parte
 DocType: Lead,Consultant,Consultor
 DocType: Salary Slip,Earnings,Remunerações
@@ -1191,7 +1193,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Isto será anexado ao Código do Item da variante. Por exemplo, se a sua abreviatura for ""SM"", e o código do item é ""T-SHIRT"", o código do item da variante será ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,A Remuneração Líquida (por extenso) será visível assim que guardar a Folha de Vencimento.
 DocType: Purchase Invoice,Is Return,É um Retorno
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retorno / Nota de Débito
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retorno / Nota de Débito
 DocType: Price List Country,Price List Country,País da Lista de Preços
 DocType: Item,UOMs,UNIDs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},Nr. de série válido {0} para o Item {1}
@@ -1201,11 +1203,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Por favor insira o Código Item para obter número de lote
 DocType: Stock Settings,Default Item Group,Grupo de Item Padrão
 DocType: Employee Loan,Partially Disbursed,parcialmente Desembolso
-DocType: Grading Structure,Grading System Name,Nome Sistema de Classificação
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Banco de dados de fornecedores.
 DocType: Account,Balance Sheet,Balanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',O Centro de Custo Para o Item com o Código de Item '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","O Modo de Pagamento não está configurado. Por favor, verifique se conta foi definida no Modo de Pagamentos ou no Perfil POS."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,O seu vendedor receberá um lembrete nesta data para contatar o cliente
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Mesmo item não pode ser inserido várias vezes.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Podem ser realizadas outras contas nos Grupos, e os registos podem ser efetuados em Fora do Grupo"
@@ -1217,7 +1218,7 @@
 ,Purchase Order Items To Be Billed,Itens da Ordem de Compra a faturar
 DocType: Purchase Invoice Item,Net Rate,Taxa Líquida
 DocType: Purchase Invoice Item,Purchase Invoice Item,Item de Fatura de Compra
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Os Registos do Livro de Stock e Registos GL são reenviados para os Recibos de Compra selecionados
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Os Registos do Livro de Stock e Registos GL são reenviados para os Recibos de Compra selecionados
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Artigo 1
 DocType: Holiday,Holiday,Férias
 DocType: Support Settings,Close Issue After Days,Fechar incidentes após dias
@@ -1242,11 +1243,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Trabalho Efetuado
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Por favor, especifique pelo menos um atributo na tabela de Atributos"
 DocType: Announcement,All Students,Todos os Alunos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,O Item {0} deve ser um item não inventariado
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ver Livro
 DocType: Grading Scale,Intervals,intervalos
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Mais Cedo
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group","Já existe um Grupo de Itens com o mesmo nome, Por favor, altere o nome desse grupo de itens ou modifique o nome deste grupo de itens"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Nr. de Telemóvel de Estudante
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Resto Do Mundo
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,O Item {0} não pode ter um Lote
@@ -1286,9 +1287,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},O pagamento do salário de {0} para {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Não está autorizado a editar a Conta congelada {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obter Faturas Pendentes
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,A Ordem de Vendas {0} não é válida
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,As ordens de compra ajudá-lo a planejar e acompanhar suas compras
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Desculpe, mas as empresas não podem ser unidas"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",A quantidade total da Emissão / Transferência {0} no Pedido de Material {1} \ não pode ser maior do que a quantidade pedida {2} para o Item {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Pequeno
@@ -1309,10 +1310,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Despesas Indiretas
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Linha {0}: É obrigatório colocar a qtd
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultura
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronização de Def. de Dados
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sincronização de Def. de Dados
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Os seus Produtos ou Serviços
 DocType: Mode of Payment,Mode of Payment,Modo de Pagamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,O Website de Imagem deve ser um ficheiro público ou um URL de website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,LDM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Este é um item principal e não pode ser editado.
@@ -1329,18 +1330,18 @@
 DocType: Student Group Student,Group Roll Number,Número de rolo de grupo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Para {0}, só podem ser ligadas contas de crédito noutro registo de débito"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,O total de todos os pesos da tarefa deve ser 1. Por favor ajuste os pesos de todas as tarefas do Projeto em conformidade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,A Guia de Remessa {0} não foi enviada
 apps/erpnext/erpnext/stock/get_item_details.py +141,Item {0} must be a Sub-contracted Item,O Item {0} deve ser um Item Subcontratado
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +41,Capital Equipments,Bens de Equipamentos
-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.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","A Regra de Fixação de Preços é selecionada primeiro com base no campo ""Aplicar Em"", que pode ser um Item, Grupo de Itens ou Marca."
 DocType: Hub Settings,Seller Website,Website do Vendedor
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,A percentagem total atribuída à equipa de vendas deve ser de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Estado do Pedido de Produção é {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Estado do Pedido de Produção é {0}
 DocType: Appraisal Goal,Goal,Objetivo
 DocType: Sales Invoice Item,Edit Description,Editar Descrição
 ,Team Updates,equipe Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Para o Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Para o Fornecedor
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Definir o Tipo de Conta ajuda na seleção desta Conta em transações.
 DocType: Purchase Invoice,Grand Total (Company Currency),Total Geral (Moeda da Empresa)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Criar Formato de Impressão
@@ -1356,7 +1357,7 @@
 DocType: Depreciation Schedule,Journal Entry,Lançamento Contabilístico
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} itens em progresso
 DocType: Workstation,Workstation Name,Nome do Posto de Trabalho
-DocType: Grade Interval,Grade Code,Classe de Código
+DocType: Grading Scale Interval,Grade Code,Classe de Código
 DocType: POS Item Group,POS Item Group,Grupo de Itens POS
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email de Resumo:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},A LDM {0} não pertence ao Item {1}
@@ -1368,12 +1369,12 @@
 DocType: Purchase Invoice,Taxes and Charges Calculation,Cálculo de Impostos e Encargos
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Entrada de Depreciação de Ativos do Livro Automaticamente
 DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,Entrada de Depreciação de Ativos do Livro Automaticamente
-DocType: BOM Operation,Workstation,Posto deTrabalho
+DocType: BOM Operation,Workstation,Posto de Trabalho
 DocType: Request for Quotation Supplier,Request for Quotation Supplier,Solicitação de Cotação de Fornecedor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,Recorrente Até
 DocType: Attendance,HR Manager,Gestor de RH
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Por favor, selecione uma Empresa"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Por favor, selecione uma Empresa"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Licença Especial
 DocType: Purchase Invoice,Supplier Invoice Date,Data de Fatura de Fornecedor
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,É preciso ativar o Carrinho de Compras
@@ -1389,7 +1390,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Comida
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Faixa de Idade 3
 DocType: Maintenance Schedule Item,No of Visits,Nº de Visitas
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Marcar Assiduidade
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Marcar Assiduidade
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},O Cronograma de Manutenção {0} existe contra {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,estudante de inscrição
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},A Moeda da Conta de Encerramento deve ser {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},A soma dos pontos para todos os objetivos deve ser 100. É {0}
@@ -1414,7 +1416,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Saída Diária Média
 DocType: POS Profile,Campaign,Campanha
 DocType: Supplier,Name and Type,Nome e Tipo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"O Estado de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"O Estado de Aprovação deve ser ""Aprovado"" ou ""Rejeitado"""
 DocType: Purchase Invoice,Contact Person,Contactar Pessoa
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"A ""Data de Início Esperada"" não pode ser mais recente que a ""Data de Término Esperada"""
 DocType: Course Scheduling Tool,Course End Date,Data de Término do Curso
@@ -1427,7 +1429,7 @@
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,Variação Líquida no Ativo Imobilizado
 DocType: Leave Control Panel,Leave blank if considered for all designations,Deixe em branco se for para todas as designações
 apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,Armazém é obrigatória para contas não grupo do tipo da
-apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída na Taxa do Item"
+apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,"A cobrança do tipo ""Real"" na linha {0} não pode ser incluída no preço do Item"
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +260,Max: {0},Máx.: {0}
 apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,Data e Hora De
 DocType: Email Digest,For Company,Para a Empresa
@@ -1437,14 +1439,15 @@
 DocType: Sales Invoice,Shipping Address Name,Nome de Endereço de Envio
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Plano de Contas
 DocType: Material Request,Terms and Conditions Content,Conteúdo de Termos e Condições
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,não pode ser maior do que 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,O Item {0} não é um item de stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,não pode ser maior do que 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,O Item {0} não é um item de stock
 DocType: Maintenance Visit,Unscheduled,Sem Marcação
 DocType: Employee,Owned,Pertencente
 DocType: Salary Detail,Depends on Leave Without Pay,Depende da Licença Sem Vencimento
 DocType: Pricing Rule,"Higher the number, higher the priority","Quanto maior o número, maior a prioridade"
 ,Purchase Invoice Trends,Tendências de Fatura de Compra
 DocType: Employee,Better Prospects,Melhores Perspetivas
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Linha # {0}: O lote {1} tem apenas {2} qty. Selecione outro lote com {3} qty disponível ou dividido a linha em várias linhas, para entregar / emitir de vários lotes"
 DocType: Vehicle,License Plate,Matrícula
 DocType: Appraisal,Goals,Objetivos
 DocType: Warranty Claim,Warranty / AMC Status,Garantia / Estado CMA
@@ -1463,7 +1466,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,O Funcionário não pode reportar-se a si mesmo.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Se a conta está congelada, só são permitidos registos a utilizadores restritos."
 DocType: Email Digest,Bank Balance,Saldo Bancário
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},O Lançamento Contabilístico para {0}: {1} só pode ser criado na moeda: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Perfil de emprego, qualificações exigidas, etc."
 DocType: Journal Entry Account,Account Balance,Saldo da Conta
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regra de Impostos para transações.
@@ -1474,7 +1477,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Mostrar saldos P&L de ano fiscal não encerrado
 DocType: Shipping Rule,Shipping Account,Conta de Envio
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: A Conta {2} está inativa
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Faça Ordens de vendas para ajudar a planear o seu trabalho e entregar dentro do prazo
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Faça Ordens de vendas para ajudar a planear o seu trabalho e entregar dentro do prazo
 DocType: Quality Inspection,Readings,Leituras
 DocType: Stock Entry,Total Additional Costs,Total de Custos Adicionais
 DocType: Course Schedule,SH,SH
@@ -1485,7 +1488,7 @@
 DocType: Shipping Rule Condition,To Value,Ao Valor
 DocType: Asset Movement,Stock Manager,Gestor de Stock
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},É obrigatório colocar o armazém de origem para a linha {0}
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +814,Packing Slip,Nota Fiscal
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Nota Fiscal
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Alugar Escritório
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Configurar definições de portal de SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Falha ao Importar!
@@ -1507,11 +1510,11 @@
 DocType: Company,Services,Serviços
 DocType: HR Settings,Email Salary Slip to Employee,Enviar Email de Folha de Pagamento a um Funcionário
 DocType: Cost Center,Parent Cost Center,Centro de Custo Principal
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selecione Fornecedor Possível
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Selecione Fornecedor Possível
 DocType: Sales Invoice,Source,Fonte
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Mostrar encerrado
 DocType: Leave Type,Is Leave Without Pay,É uma Licença Sem Vencimento
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,É obrigatório colocar a Categoria Ativo para um item de Ativo Imobilizado
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Não foram encontrados nenhuns registos na tabela Pagamento
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Este/a {0} entra em conflito com {1} por {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML de Estudantes
@@ -1529,7 +1532,7 @@
 DocType: Student,Date of Leaving,Data de saída
 DocType: Pricing Rule,For Price List,Para a Lista de Preços
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Recrutamento de Executivos
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Criar Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Criar Leads
 DocType: Maintenance Schedule,Schedules,Horários
 DocType: Purchase Invoice Item,Net Amount,Valor Líquido
 DocType: Purchase Order Item Supplied,BOM Detail No,Nº de Dados da LDM
@@ -1557,9 +1560,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscrições no Programa
 DocType: Sales Invoice Item,Brand Name,Nome da Marca
 DocType: Purchase Receipt,Transporter Details,Dados da Transportadora
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,É necessário colocar o armazém padrão para o item selecionado
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Caixa
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Fornecedor possível
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Fornecedor possível
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,A Organização
 DocType: Budget,Monthly Distribution,Distribuição Mensal
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"A Lista de Recetores está vazia. Por favor, crie uma Lista de Recetores"
@@ -1567,8 +1570,8 @@
 DocType: Sales Partner,Sales Partner Target,Objetivo de Parceiro de Vendas
 DocType: Loan Type,Maximum Loan Amount,Montante máximo do empréstimo
 DocType: Pricing Rule,Pricing Rule,Regra de Fixação de Preços
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Número de rolo duplicado para o estudante {0}
 DocType: Budget,Action if Annual Budget Exceeded,Medidas caso o Orçamento Anual seja Excedido
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Pedido de Material para Ordem de Compra
 DocType: Shopping Cart Settings,Payment Success URL,URL de Sucesso de Pagamento
@@ -1589,9 +1592,9 @@
 DocType: Employee Loan,Repayment Method,Método de reembolso
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Se for selecionado, a Página Inicial será o Grupo de Itens padrão do website"
 DocType: Quality Inspection Reading,Reading 4,Leitura 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM padrão para {0} não foi encontrado para o projeto {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM padrão para {0} não foi encontrado para o projeto {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Os reembolsos de despesa da empresa.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Os estudantes estão no centro do sistema, adicione todos os seus alunos"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Os estudantes estão no centro do sistema, adicione todos os seus alunos"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Linha #{0}: A Data de Liquidação {1} não pode ser anterior à Data do Cheque {2}
 DocType: Company,Default Holiday List,Lista de Feriados Padrão
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Linha {0}: A Periodicidade de {1} está a sobrepor-se com {2}
@@ -1603,21 +1606,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,O(s) dia(s) em que está a solicitar a licença são feriados. Não necessita solicitar uma licença.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Reenviar Email de Pagamento
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova tarefa
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Faça Cotação
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Faça Cotação
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Outros Relatórios
 DocType: Dependent Task,Dependent Task,Tarefa Dependente
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},O fator de conversão da unidade de medida padrão deve ser 1 na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},A licença do tipo {0} não pode ser mais longa do que {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Tente planear operações para X dias de antecedência.
 DocType: HR Settings,Stop Birthday Reminders,Parar Lembretes de Aniversário
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Por favor definir Payroll Conta a Pagar padrão in Company {0}
 DocType: SMS Center,Receiver List,Lista de Destinatários
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Pesquisar Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Pesquisar Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Montante Consumido
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Variação Líquida na Caixa
 DocType: Assessment Plan,Grading Scale,Escala de classificação
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Já foi concluído
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,A Unidade de Medida {0} foi inserido mais do que uma vez na Tabela de Conversão de Fatores
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Já foi concluído
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},A Solicitação de Pagamento {0} já existe
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Custo dos Itens Emitidos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},A quantidade não deve ser superior a {0}
@@ -1649,12 +1652,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Faça Desembolso Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Linha {0}: O Avanço do Fornecedor deve ser um débito
 DocType: Company,Default Values,Valores Padrão
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Montante Total Reembolsado
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Isto é baseado em registos deste veículo. Veja o cronograma abaixo para obter mais detalhes
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Cobrar
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Na Fatura de Fornecedor {0} datada de {1}
 DocType: Customer,Default Price List,Lista de Preços Padrão
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Foi criado o registo do Movimento do Ativo {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Não pode eliminar o Ano Fiscal de {0}. O Ano Fiscal de {0} está definido como padrão nas Definições Gerais
 DocType: Journal Entry,Entry Type,Tipo de Registo
 ,Customer Credit Balance,Saldo de Crédito de Cliente
@@ -1674,7 +1678,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nenhum dos itens teve qualquer alteração na sua quantidade ou montante.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Campo obrigatório - Programa
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Campo obrigatório - Programa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Reclamação de Garantia
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Reclamação de Garantia
 ,Lead Details,Dados de Potencial Cliente
 DocType: Salary Slip,Loan repayment,Pagamento de empréstimo
 DocType: Purchase Invoice,End date of current invoice's period,A data de término do período de fatura atual
@@ -1693,12 +1697,10 @@
 DocType: Employee,Permanent Address,Endereço Permanente
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",O Adiantamento pago em {0} {1} não pode ser superior do que o Montante Global {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Por favor, seleccione o código do item"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Por favor, seleccione o código do item"
 DocType: Student Sibling,Studying in Same Institute,Estudar no mesmo instituto
 DocType: Territory,Territory Manager,Gestor de Território
 DocType: Packed Item,To Warehouse (Optional),Para Armazém (Opcional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Grupo de Item&gt; Marca
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Grupo de Item&gt; Marca
 DocType: Payment Entry,Paid Amount (Company Currency),Montante Pago (Moeda da Empresa)
 DocType: Purchase Invoice,Additional Discount,Desconto Adicional
 DocType: Selling Settings,Selling Settings,Definições de Vendas
@@ -1708,9 +1710,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Ver Carrinho
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Despesas de Marketing
 ,Item Shortage Report,Comunicação de Falta de Item
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Foi mencionado um Peso,\n Por favor, mencione também a ""UNID de Peso"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,A Solicitação de Material utilizada para efetuar este Registo de Stock
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação em novos ativos
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,É obrigatório colocar a Próxima Data de Depreciação em novos ativos
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado baseado em cursos para cada lote
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Grupo separado baseado em cursos para cada lote
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Única unidade de um item.
@@ -1727,9 +1729,7 @@
 DocType: Course Assessment Criteria,Weightage,Peso
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,"{0} {1}: É necessário colocar o centro de custo para a conta ""Lucros e Perdas"" {2}. Por favor, crie um Centro de Custo padrão para a Empresa."
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Já existe um Grupo de Clientes com o mesmo nome, por favor altere o nome do Cliente ou do Grupo de Clientes"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Já existe um Grupo de Clientes com o mesmo nome, por favor altere o nome do Cliente ou do Grupo de Clientes"
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Novo Contacto
 DocType: Territory,Parent Territory,Território Principal
 DocType: Quality Inspection Reading,Reading 2,Leitura 2
@@ -1746,7 +1746,7 @@
 ,Item-wise Sales Register,Registo de Vendas de Item Inteligente
 DocType: Asset,Gross Purchase Amount,Montante de Compra Bruto
 DocType: Asset,Depreciation Method,Método de Depreciação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Off-line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Off-line
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Esta Taxa está incluída na Taxa Básica?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Alvo total
 DocType: Program Course,Required,Solicitados
@@ -1756,21 +1756,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Conciliação JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Muitas colunas. Exportar o relatório e imprimi-lo usando um aplicativo de planilha.
 DocType: Purchase Invoice Item,Batch No,Nº de Lote
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Incapaz de encontrar a taxa de câmbio para {0} para {1} data chave para {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permitir várias Ordens de Venda relacionadas a mesma Ordem de Compra do Cliente
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 DocType: Student Group Instructor,Student Group Instructor,Instrutor de Grupo de Estudantes
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 móvel Não
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variante
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variante
 DocType: Naming Series,Set prefix for numbering series on your transactions,Definir prefixo para numeração de série em suas transações
 DocType: Employee Attendance Tool,Employees HTML,HTML de Funcionários
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,A LDM Padrão ({0}) deve estar ativa para este item ou para o seu modelo
 DocType: Employee,Leave Encashed?,Sair de Pagos?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,É obrigatório colocar o campo Oportunidade De
 DocType: Email Digest,Annual Expenses,Despesas anuais
 DocType: Item,Variants,Variantes
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Criar Ordem de Compra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Criar Ordem de Compra
 DocType: SMS Center,Send To,Enviar para
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Não há o suficiente equilíbrio pela licença Tipo {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Montante alocado
@@ -1778,7 +1777,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Código do Item do Cliente
 DocType: Stock Reconciliation,Stock Reconciliation,Da Reconciliação
 DocType: Territory,Territory Name,Nome território
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Trabalho em andamento Warehouse é necessário antes de Enviar
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Candidato a um Emprego.
 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
@@ -1786,11 +1785,10 @@
 DocType: Item,Serial Nos and Batches,Números de série e lotes
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupo de Estudantes Força
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupo de Estudantes Força
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,No Lançamento Contábil {0} não possui qualquer registo {1} ímpar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,No Lançamento Contábil {0} não possui qualquer registo {1} ímpar
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Avaliações
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +201,Duplicate Serial No entered for Item {0},Foi inserido um Nº de Série em duplicado para o Item {0}
 DocType: Shipping Rule Condition,A condition for a Shipping Rule,Uma condição para uma Regra de Envio
-DocType: Grading Structure,Grading Intervals,Intervalos de classificação
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,"Por favor, insira"
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","não pode overbill por item {0} na linha {1} mais de {2}. Para permitir que o excesso de faturamento, defina em Comprar Configurações"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Por favor, defina o filtro com base no Item ou no Armazém"
@@ -1802,17 +1800,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,A LDM {0} deve ser enviada
 DocType: Authorization Control,Authorization Control,Controlo de Autorização
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Linha #{0}:  É obrigatório colocar o Armazém Rejeitado no Item Rejeitado {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagamento
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gerir as suas encomendas
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pagamento
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gerir as suas encomendas
 DocType: Production Order Operation,Actual Time and Cost,Horas e Custos Efetivos
 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},"Para a Ordem de Venda {2},  o máximo do Pedido de Material para o Item {1} é {0}"
 DocType: Employee,Salutation,Saudação
 DocType: Course,Course Abbreviation,Abreviação de Curso
 DocType: Student Leave Application,Student Leave Application,Solicitação de Licença de Estudante
 DocType: Item,Will also apply for variants,Também se aplicará para as variantes
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","O ativo não pode ser cancelado, pois já é {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} no Meio dia em {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},O total de horas de trabalho não deve ser maior que o nr. máx. de horas de trabalho {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Em
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Pacote de itens no momento da venda.
 DocType: Quotation Item,Actual Qty,Qtd Efetiva
 DocType: Sales Invoice Item,References,Referências
@@ -1823,7 +1822,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Inseriu itens duplicados. Por favor retifique esta situação, e tente novamente."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sócio
 DocType: Asset Movement,Asset Movement,Movimento de Ativo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,New Cart
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,New Cart
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,O Item {0} não é um item de série
 DocType: SMS Center,Create Receiver List,Criar Lista de Destinatários
 DocType: Vehicle,Wheels,Rodas
@@ -1855,10 +1854,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Desativa a criação de registos de tempo dos Pedidos de Produção. As operações não devem ser acompanhadas no Pedido de Produção
 DocType: Student,Student Mobile Number,Número de telemóvel do Estudante
 DocType: Item,Has Variants,Tem Variantes
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Já selecionou itens de {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Nome da Distribuição Mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,O ID do lote é obrigatório
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,O ID do lote é obrigatório
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,O ID do lote é obrigatório
 DocType: Sales Person,Parent Sales Person,Vendedor Principal
 DocType: Purchase Invoice,Recurring Invoice,Fatura Recorrente
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Gestão de Projetos
@@ -1866,11 +1865,11 @@
 DocType: Budget,Fiscal Year,Ano Fiscal
 DocType: Vehicle Log,Fuel Price,Preço de Combustível
 DocType: Budget,Budget,Orçamento
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,O Item Ativo Imobilizado deve ser um item não inventariado.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","O Orçamento não pode ser atribuído a {0}, pois não é uma conta de Rendimentos ou Despesas"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Alcançados
 DocType: Student Admission,Application Form Route,Percurso de Formulário de Candidatura
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Território / Cliente
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Território / Cliente
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ex: 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"O Tipo de Licença {0} não pode ser atribuído, uma vez que é uma licença sem vencimento"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Linha {0}: O montante alocado {1} deve ser menor ou igual ao saldo pendente da fatura {2}
@@ -1890,15 +1889,15 @@
 ,Serial No Status,Estado do Nr. de Série
 DocType: Payment Entry Reference,Outstanding,Excelente
 ,Daily Timesheet Summary,Resumo da Folha de Presenças Diária
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Linha {0}: Para definir a periodicidade {1}, a diferença entre a data de
  e a data para deve superior ou igual a {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Esta baseia-se no movimento de stock. Veja {0} para obter mais detalhes
 DocType: Pricing Rule,Selling,Vendas
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido em {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Montante {0} {1} deduzido em {2}
 DocType: Employee,Salary Information,Informação salarial
 DocType: Sales Person,Name and Employee ID,Nome e ID do Funcionário
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,A Data de Vencimento não pode ser anterior à Data de Lançamento
 DocType: Website Item Group,Website Item Group,Website de Grupo de Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Impostos e Taxas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Por favor, insira a Data de referência"
@@ -1910,14 +1909,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Não é possível referir o número da linha como superior ou igual ao número da linha atual para este tipo de Cobrança
 DocType: Asset,Sold,Vendido
 ,Item-wise Purchase History,Histórico de Compras por Item
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para obter o Nr. de Série adicionado ao Item {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Por favor, clique em ""Gerar Cronograma"" para obter o Nr. de Série adicionado ao Item {0}"
 DocType: Account,Frozen,Suspenso
 ,Open Production Orders,Ordens de Produção pendentes
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Valor Base (Moeda da Empresa)
 DocType: Payment Reconciliation Payment,Reference Row,Linha de Referência
 DocType: Installation Note,Installation Time,Tempo de Instalação
 DocType: Sales Invoice,Accounting Details,Dados Contabilísticos
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Eliminar todas as Transações desta Empresa
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,Delete all the Transactions for this Company,Eliminar todas as Transações desta 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,"Linha {0}: A Operação {1} não está concluída para a quantidade {2} de produtos acabados na Ordem de Produção # {3}. Por favor, atualize o estado da operação através dos Registos de Tempo"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investimentos
 DocType: Issue,Resolution Details,Dados de Resolução
@@ -1944,20 +1943,20 @@
 DocType: Room,Room Name,Nome da Sala
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser aplicada/cancelada antes de {0}, pois o saldo da licença já foi encaminhado no registo de atribuição de licenças futuras {1}"
 DocType: Activity Cost,Costing Rate,Taxa de Cálculo dos Custos
-,Customer Addresses And Contacts,Endereços e Contactos de Cliente
+,Customer Addresses And Contacts,Endereços e Contactos de Clientes
 ,Campaign Efficiency,Eficiência da Campanha
 ,Campaign Efficiency,Eficiência da Campanha
 DocType: Discussion,Discussion,Discussão
 DocType: Payment Entry,Transaction ID,ID da Transação
 DocType: Employee,Resignation Letter Date,Data de Carta de Demissão
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,As Regras de Fixação de Preços são filtradas adicionalmente com base na quantidade.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,As Regras de Fixação de Preços são filtradas adicionalmente com base na quantidade.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Defina a data de início da sessão para o empregado {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Montante de Faturamento Total (através da Folha de Presenças)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Rendimento de Cliente Fiel
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a função de 'Aprovador de Despesas'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) deve ter a função de 'Aprovador de Despesas'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Selecione BOM e Qtde de Produção
 DocType: Asset,Depreciation Schedule,Cronograma de Depreciação
 DocType: Bank Reconciliation Detail,Against Account,Na Conta
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Metade Data Day deve estar entre De Data e To Date
@@ -1971,16 +1970,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},"Por favor, defina o ""Centro de Custos de Depreciação de Ativos"" na Empresa {0}"
 ,Maintenance Schedules,Cronogramas de Manutenção
 DocType: Task,Actual End Date (via Time Sheet),Data de Término Efetiva (através da Folha de Presenças)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Quantidade {0} {1} em {2} {3}
 ,Quotation Trends,Tendências de Cotação
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},O Grupo do Item não foi mencionado no definidor de item para o item {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,A conta de Débito Para deve ser uma conta A Receber
 DocType: Shipping Rule Condition,Shipping Amount,Montante de Envio
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Montante Pendente
 DocType: Purchase Invoice Item,Conversion Factor,Fator de Conversão
 DocType: Purchase Order,Delivered,Entregue
 ,Vehicle Expenses,Despesas de Veículos
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
+DocType: Serial No,Invoice Details,Detalhes da fatura
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},O valor previsto após a vida útil deve ser maior ou igual a {0}
 DocType: Purchase Receipt,Vehicle Number,Número de Veículos
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,A data em que fatura recorrente parará
 DocType: Employee Loan,Loan Amount,Montante do empréstimo
@@ -1999,12 +1999,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Folhas de Presença
 DocType: HR Settings,HR Settings,Definições de RH
 DocType: Salary Slip,net pay info,Informações net pay
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,A aprovação do Reembolso de Despesas está pendente. Só o Aprovador de Despesas é que pode atualizar o seu estado.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,A aprovação do Reembolso de Despesas está pendente. Só o Aprovador de Despesas é que pode atualizar o seu estado.
 DocType: Email Digest,New Expenses,Novas Despesas
 DocType: Purchase Invoice,Additional Discount Amount,Quantia de Desconto Adicional
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Linha #{0}: A qtd deve ser 1, pois o item é um ativo imobilizado. Por favor, utilize uma linha separada para diversas qtds."
 DocType: Leave Block List Allow,Leave Block List Allow,Permissão de Lista de Bloqueio de Licenças
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,A Abr. não pode estar em branco ou conter espaços em branco
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupo a Fora do Grupo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Desportos
 DocType: Loan Type,Loan Name,Nome do empréstimo
@@ -2016,6 +2016,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Armazém onde está mantendo o stock de itens rejeitados
 DocType: Production Order,Skip Material Transfer,Ignorar transferência de material
 DocType: Production Order,Skip Material Transfer,Ignorar transferência de material
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Não é possível encontrar a taxa de câmbio para {0} a {1} para a data-chave {2}. Crie um registro de troca de moeda manualmente
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,O seu ano fiscal termina em
 DocType: POS Profile,Price List,Lista de Preços
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} é agora o Ano Fiscal padrão. Por favor, atualize o seu navegador para a alteração poder ser efetuada."
@@ -2032,19 +2033,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},A conta {0} é inválida. A Moeda da Conta deve ser {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},É necessário colocar o fator de Conversão de UNID na linha {0}
 DocType: Production Plan Item,material_request_item,item_de_solicitação_de_material
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Linha #{0}: O tipo de documento referênciado deve ser umas Ordem de Venda, uma Fatura de Venda ou um Lançamento Contabilístico"
 DocType: Salary Component,Deduction,Dedução
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Linha {0}: É obrigatório colocar a Periodicidade.
 DocType: Stock Reconciliation Item,Amount Difference,Diferença de Montante
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},O Preço de Item foi adicionada a {0} na Lista de Preços {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Por favor, insira a ID de Funcionário deste(a) vendedor(a)"
 DocType: Territory,Classification of Customers by region,Classificação dos Clientes por Região
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,O Montante de Diferença deve ser zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,O Montante de Diferença deve ser zero
 DocType: Project,Gross Margin,Margem Bruta
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Por favor, insira primeiro o Item de Produção"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Saldo de de Extrato Bancário calculado
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizador desativado
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Cotação
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Cotação
 DocType: Quotation,QTN-,QUEST-
 DocType: Salary Slip,Total Deduction,Total de Reduções
 ,Production Analytics,Analytics produção
@@ -2053,9 +2054,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,O Item {0} já foi devolvido
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,O **Ano Fiscal** representa um Ano de Exercício Financeiro. Todos os lançamentos contabilísticos e outras transações principais são controladas no **Ano Fiscal**.
 DocType: Opportunity,Customer / Lead Address,Endereço de Cliente / Potencial Cliente
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Aviso: Certificado SSL inválido no anexo {0}
 DocType: Student Admission,Eligibility,Elegibilidade
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads ajudá-lo a começar o negócio, adicione todos os seus contatos e mais como suas ligações"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads ajudá-lo a começar o negócio, adicione todos os seus contatos e mais como suas ligações"
 DocType: Production Order Operation,Actual Operation Time,Tempo Operacional Efetivo
 DocType: Authorization Rule,Applicable To (User),Aplicável Ao/À (Utilizador/a)
 DocType: Purchase Taxes and Charges,Deduct,Deduzir
@@ -2070,7 +2071,7 @@
 DocType: Guardian,Work Address,Endereço de Trabalho
 DocType: Appraisal,Calculate Total Score,Calcular a Classificação Total
 DocType: Request for Quotation,Manufacturing Manager,Gestor de Fabrico
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},O Nr. de Série {0} está na garantia até {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},O Nr. de Série {0} está na garantia até {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Dividir a Guia de Remessa em pacotes.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Envios
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,O saldo da conta ({0}) para {1} eo valor da ação ({2}) para o depósito {3} devem ser os mesmos
@@ -2093,10 +2094,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Nota: O email não será enviado a utilizadores desativados
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de Interações
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Número de Interações
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selecionar Empresa...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selecionar Empresa...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Deixe em branco se for para todos os departamentos
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipos de emprego (permanente, a contrato, estagiário, etc.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} é obrigatório para o Item {1}
 DocType: Process Payroll,Fortnightly,Quinzenal
 DocType: Currency Exchange,From Currency,De Moeda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Por favor, selecione o Montante Alocado, o Tipo de Fatura e o Número de Fatura em pelo menos uma linha"
@@ -2105,14 +2106,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Taxa (Moeda da Empresa)
 DocType: Student Guardian,Others,Outros
 DocType: Payment Entry,Unallocated Amount,Montante Não Atribuído
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Não foi possível encontrar um item para esta pesquisa. Por favor, selecione outro valor para {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Não foi possível encontrar um item para esta pesquisa. Por favor, selecione outro valor para {0}."
 DocType: POS Profile,Taxes and Charges,Impostos e Encargos
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Um Produto ou Serviço que é comprado, vendido ou mantido em stock."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Não há mais atualizações
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Não é possível selecionar o tipo de cobrança como ""No Valor da Linha Anterior"" ou ""No Total da Linha Anterior"" para a primeira linha"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Um Subitem não deve ser um Pacote de Produtos. Por favor remova o item `{0}` e guarde-o
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Ativ. Bancária
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Adicionar Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Adicionar Timesheets
 DocType: Vehicle Service,Service Item,Item de Serviço
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
 DocType: Bank Guarantee,Bank Guarantee,Garantia bancária
@@ -2138,6 +2139,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Linha #{0}: O Ativo {1} já é {2}
 DocType: Quotation Item,Stock Balance,Balanço de Stock
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ordem de Venda para Pagamento
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Defina Naming Series para {0} por Configuração&gt; Configurações&gt; Série de nomeação
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Dados de Reembolso de Despesas
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Por favor, selecione a conta correta"
@@ -2162,14 +2164,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Os preços não será mostrado se Preço de tabela não está definido
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Por favor, especifique um país para esta Regra de Envio ou verifique o Envio Mundial"
 DocType: Stock Entry,Total Incoming Value,Valor Total de Entrada
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,É necessário colocar o Débito Para
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ajudar a manter o controle de tempo, custo e faturamento para atividades feitas por sua equipe"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,É necessário colocar o Débito Para
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ajudar a manter o controle de tempo, custo e faturamento para atividades feitas por sua equipe"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Lista de Preços de Compra
 DocType: Offer Letter Term,Offer Term,Termo de Oferta
 DocType: Quality Inspection,Quality Manager,Gestor da Qualidade
 DocType: Job Applicant,Job Opening,Oferta de Emprego
 DocType: Payment Reconciliation,Payment Reconciliation,Conciliação de Pagamento
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Por favor, selecione o nome da Pessoa Responsável"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Por favor, selecione o nome da Pessoa Responsável"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tecnologia
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total Por Pagar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Operação Site
@@ -2187,8 +2189,8 @@
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,A Lista de Preços {0} está desativada
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},Linha {0}: A Qtd Concluída não pode ser superior a {1} para a operação {2}
 DocType: Manufacturing Settings,Allow Overtime,Permitir Horas Extra
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item serializado {0} não pode ser atualizado usando Reconciliação de estoque, use a Entrada de estoque"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item serializado {0} não pode ser atualizado usando Reconciliação de estoque, use a Entrada de estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry","O item de série {0} não pode ser atualizado usando Reconciliação de stock, use a Entrada de stock"
 DocType: Training Event Employee,Training Event Employee,Evento de Formação de Funcionário
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +197,{0} Serial Numbers required for Item {1}. You have provided {2}.,São necessários {0} Nrs. de Série para o Item {1}. Forneceu {2}.
 DocType: Stock Reconciliation Item,Current Valuation Rate,Avaliação Atual da Taxa
@@ -2197,23 +2199,23 @@
 DocType: Opportunity,Lost Reason,Motivo de Perda
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Por favor, insira o Documento de Recepção"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Todos os itens já foram faturados
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Por favor, insira o Documento de Recepção"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,All items have already been invoiced,Todos os itens já foram faturados
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +47,Please specify a valid 'From Case No.',"Por favor, especifique um ""De Nr. de Processo"" válido"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Podem ser criados outros centros de custo nos Grupos, e os registos podem ser criados em Fora do Grupo"
 DocType: Project,External,Externo
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizadores e Permissões
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Ordens de produção Criado: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Ordens de produção Criado: {0}
 DocType: Branch,Branch,Filial
 DocType: Guardian,Mobile Number,Número de Telemóvel
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Impressão e Branding
 DocType: Bin,Actual Quantity,Quantidade Efetiva
 DocType: Shipping Rule,example: Next Day Shipping,exemplo: Envio no Dia Seguinte
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Nr. de Série {0} não foi encontrado
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Nr. de Série {0} não foi encontrado
 DocType: Scheduling Tool,Student Batch,Classe de Estudantes
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Seus Clientes
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Faça Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Faça Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Foi convidado para colaborar com o projeto: {0}
 DocType: Leave Block List Date,Block Date,Bloquear Data
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Candidatar-me Já
@@ -2237,8 +2239,9 @@
 DocType: SMS Log,Sent To,Enviado Para
 DocType: Payment Request,Make Sales Invoice,Efetuar Fatura de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,A Próxima Data de Contacto não pode ocorrer no passado
 DocType: Company,For Reference Only.,Só para Referência.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Selecione lote não
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Inválido {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,FPAG-DEV-
 DocType: Sales Invoice Advance,Advance Amount,Montante de Adiantamento
@@ -2252,7 +2255,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,O Nr. de Processo não pode ser 0
 DocType: Item,Show a slideshow at the top of the page,Ver uma apresentação de slides no topo da página
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Lojas
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Lojas
 DocType: Serial No,Delivery Time,Prazo de Entrega
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Idade Baseada em
 DocType: Item,End of Life,Expiração
@@ -2264,12 +2267,12 @@
 DocType: Rename Tool,Rename Tool,Ferr. de Alt. de Nome
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Atualizar Custo
 DocType: Item Reorder,Item Reorder,Reencomenda do Item
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Mostrar Folha de Vencimento
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transferência de Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Mostrar Folha de Vencimento
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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, custo operacional e dar um só Nr. Operação às suas operações."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Este documento está acima do limite por {0} {1} para o item {4}. Está a fazer outra {3} no/a mesmo/a {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Selecionar alterar montante de conta
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Por favor, defina como recorrente depois de guardar"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Selecionar alterar montante de conta
 DocType: Purchase Invoice,Price List Currency,Moeda da Lista de Preços
 DocType: Naming Series,User must always select,O utilizador tem sempre que escolher
 DocType: Stock Settings,Allow Negative Stock,Permitir Stock Negativo
@@ -2280,7 +2283,7 @@
 DocType: Budget Account,Budget Account,Conta do Orçamento
 DocType: Quality Inspection,Verified By,Verificado Por
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Não é possível alterar a moeda padrão da empresa, porque existem operações com a mesma. Deverá cancelar as transações para alterar a moeda padrão."
-DocType: Grade Interval,Grade Description,Descrição de Classe
+DocType: Grading Scale Interval,Grade Description,Descrição de Classe
 DocType: Stock Entry,Purchase Receipt No,Nº de Recibo de Compra
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Sinal
 DocType: Process Payroll,Create Salary Slip,Criar Folha de Vencimento
@@ -2318,7 +2321,7 @@
 DocType: Upload Attendance,Attendance To Date,Assiduidade Até À Data
 DocType: Warranty Claim,Raised By,Levantado Por
 DocType: Payment Gateway Account,Payment Account,Conta de Pagamento
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Por favor, especifique a Empresa para poder continuar"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Variação Líquida em Contas a Receber
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Descanso de Compensação
 DocType: Offer Letter,Accepted,Aceite
@@ -2327,12 +2330,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Por favor, certifique-se de que realmente deseja apagar todas as transações para esta empresa. Os seus dados principais permanecerão como estão. Esta ação não pode ser anulada."
 DocType: Room,Room Number,Número de Sala
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referência inválida {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planeada ({2}) no Pedido de Produção {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) não pode ser maior do que a quantidade planeada ({2}) no Pedido de Produção {3}
 DocType: Shipping Rule,Shipping Rule Label,Regra Rotulação de Envio
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Fórum de Utilizadores
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,As Matérias-primas não podem ficar em branco.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Lançamento Contabilístico Rápido
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Não foi possível atualizar o stock, a fatura contém um item de envio direto."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Lançamento Contabilístico Rápido
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Não pode alterar a taxa se a LDM for mencionada nalgum item
 DocType: Employee,Previous Work Experience,Experiência Laboral Anterior
 DocType: Stock Entry,For Quantity,Para a Quantidade
@@ -2345,7 +2348,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termos e Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,O nome do instituto para o qual está a instalar este sistema.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","O lançamento contabilístico está congelado até à presente data, ninguém pode efetuar / alterar o registo exceto alguém com as funções especificadas abaixo."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Por favor, guarde o documento antes de gerar o cronograma de manutenção"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Por favor, guarde o documento antes de gerar o cronograma de manutenção"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Estado do Projeto
 DocType: UOM,Check this to disallow fractions. (for Nos),Selecione esta opção para não permitir frações. (Para Nrs.)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Foram criados os seguintes Pedidos de Produção:
@@ -2372,7 +2375,7 @@
 ,Employees working on a holiday,Os funcionários que trabalham num feriado
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Marcar Presença
 DocType: Project,% Complete Method,% de Método Completa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},A data de início da manutenção não pode ser anterior à data de entrega do Nr. de Série {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},A data de início da manutenção não pode ser anterior à data de entrega do Nr. de Série {0}
 DocType: Production Order,Actual End Date,Data de Término Efetiva
 DocType: BOM,Operating Cost (Company Currency),Custo Operacional (Moeda da Empresa)
 DocType: Purchase Invoice,PINV-,FPAG-
@@ -2384,12 +2387,12 @@
 DocType: Production Order,Manufacture against Material Request,Fabrico em Solicitação de Material
 DocType: Item Reorder,Request for,Pedido para
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,O Utilizador Aprovador não pode o mesmo que o da regra Aplicável A
-DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Taxa Básica (de acordo com a UNID de Stock)
+DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),Preço Unitário (de acordo com a UDM de Stock)
 DocType: SMS Log,No of Requested SMS,Nr. de SMS Solicitados
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,A Licença Sem Vencimento não coincide com os registos de Pedido de Licença aprovados
 DocType: Campaign,Campaign-.####,Campanha-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Próximos Passos
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Por favor, forneça os itens especificados com as melhores taxas possíveis"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Por favor, forneça os itens especificados com as melhores taxas possíveis"
 DocType: Selling Settings,Auto close Opportunity after 15 days,perto Opportunity Auto após 15 dias
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fim do Ano
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2447,7 +2450,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Qtd Recebida
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Registos de Propinas Criados - {0}
 DocType: Asset Category Account,Asset Category Account,Categoria de Conta de Ativo
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais Itens {0} do que a quantidade da Ordem de Vendas {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Não é possível produzir mais Itens {0} do que a quantidade da Ordem de Vendas {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,O Registo de Stock {0} não foi enviado
 DocType: Payment Reconciliation,Bank / Cash Account,Conta Bancária / Dinheiro
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,O Próximo Contacto Por não pode ser o mesmo que o Endereço de Email de Potencial Cliente
@@ -2469,7 +2472,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Data de Liquidação não mencionada
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produção
 DocType: Guardian,Occupation,Ocupação
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Linha {0}: A Data de Início deve ser anterior à Data de Término
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configure o Sistema de Nomeação de Empregados em Recursos Humanos&gt; Configurações de RH
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Linha {0}: A Data de Início deve ser anterior à Data de Término
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Qtd)
 DocType: Sales Invoice,This Document,Este Documento
 DocType: Installation Note Item,Installed Qty,Qtd Instalada
@@ -2485,15 +2489,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Relatar um Incidente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Despesas de Serviços
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Acima-de-90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Linha # {0}: O Lançamento Contabilístico {1} não tem uma conta {2} ou está relacionado a outro voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Linha # {0}: O Lançamento Contabilístico {1} não tem uma conta {2} ou está relacionado a outro voucher
 DocType: Buying Settings,Default Buying Price List,Lista de Compra de Preço Padrão
 DocType: Process Payroll,Salary Slip Based on Timesheet,Folha de Vencimento Baseada na Folha de Presença
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Não existe nenhum funcionário para os critérios selecionados acima OU já foi criada a folha de vencimento
 DocType: Notification Control,Sales Order Message,Mensagem da Ordem de Venda
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Definir Valores Padrão, como a Empresa, Moeda, Ano Fiscal Atual, etc."
 DocType: Payment Entry,Payment Type,Tipo de Pagamento
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selecione um lote para o item {0}. Não é possível encontrar um único lote que preenche este requisito
 DocType: Process Payroll,Select Employees,Selecionar Funcionários
 DocType: Opportunity,Potential Sales Deal,Potenciais Negócios de Vendas
 DocType: Payment Entry,Cheque/Reference Date,Data do Cheque/Referência
@@ -2510,7 +2514,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Já foi criado um Perfil Geral de POS {0} para a empresa {1}
 DocType: Purchase Order,Ref SQ,SQ de Ref
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Substituir Item / LDM em todas as LDMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Deve ser enviado o documento de entrega
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Deve ser enviado o documento de entrega
 DocType: Purchase Invoice Item,Received Qty,Qtd Recebida
 DocType: Stock Entry Detail,Serial No / Batch,Nr. de Série / Lote
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Não Pago e Não Entregue
@@ -2519,11 +2523,11 @@
 DocType: Delivery Note,DN-RET-,NE-DEV-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Não há folhas de tempo
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,O Tipo de  Licença {0} não pode ser do tipo avançar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Não foi criado um Cronograma de Manutenção para todos os itens. Por favor, clique em ""Gerar Cronograma"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Não foi criado um Cronograma de Manutenção para todos os itens. Por favor, clique em ""Gerar Cronograma"""
 ,To Produce,Para Produzir
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Folha de Pagamento
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Para a linha {0} em {1}. Para incluir {2} na taxa do Item, também devem ser incluídas as linhas {3}"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Criar utilizador
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Criar utilizador
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificação do pacote para a entrega (para impressão)
 DocType: Bin,Reserved Quantity,Quantidade Reservada
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Por favor insira o endereço de e-mail válido
@@ -2537,15 +2541,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,O modelo desativado não deve ser o modelo padrão
 DocType: Account,Income Account,Conta de Rendimento
 DocType: Payment Request,Amount in customer's currency,Montante na moeda do cliente
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Entrega
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Entrega
 DocType: Stock Reconciliation Item,Current Qty,Qtd Atual
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Consulte a ""Taxa de Materiais Baseados Em"" na Seção de Custos"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Área de Responsabilidade Fundamental
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Os lotes de estudante ajudar a controlar assiduidade, avaliação e taxas para estudantes"
 DocType: Payment Entry,Total Allocated Amount,Valor Total Atribuído
 DocType: Item Reorder,Material Request Type,Tipo de Solicitação de Material
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural entrada de diário para salários de {0} para {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage está cheio, não salvou"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage está cheio, não salvou"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Linha {0}: É obrigatório colocar o Fator de Conversão de UNID
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref.
 DocType: Budget,Cost Center,Centro de Custos
@@ -2555,16 +2560,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Esconder do Cliente Tax Id de Transações de vendas
 DocType: Upload Attendance,Upload HTML,Carregar HTML
 DocType: Employee,Relieving Date,Data de Dispensa
-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.","A Regra de Fixação de Preços é efetuada para substituir a Lista de Preços / definir a percentagem de desconto, com base em alguns critérios."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","A Regra de Fixação de Preços é efetuada para substituir a Lista de Preços / definir a percentagem de desconto, com base em alguns critérios."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,O Armazém só pode ser alterado através do Registo de Stock / Guia de Remessa / Recibo de Compra
 DocType: Employee Education,Class / Percentage,Classe / Percentagem
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Diretor de Marketing e Vendas
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Imposto Sobre o Rendimento
-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 a Regra de Fixação de Preços selecionada for efetuada para o ""Preço"", ela irá substituir a Lista de Preços. A Regra de Fixação de Preços é o preço final, portanto nenhum outro desconto deverá ser aplicado. Portanto, em transações como o Pedido de Venda, Pedido de Compra, etc., será obtida do campo ""Taxa"", em vez do campo ""Taxa de Lista de Preços""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Se a Regra de Fixação de Preços selecionada for efetuada para o ""Preço"", ela irá substituir a Lista de Preços. A Regra de Fixação de Preços é o preço final, portanto nenhum outro desconto deverá ser aplicado. Portanto, em transações como o Pedido de Venda, Pedido de Compra, etc., será obtida do campo ""Taxa"", em vez do campo ""Taxa de Lista de Preços""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Acompanhar Potenciais Clientes por Tipo de Setor.
 DocType: Item Supplier,Item Supplier,Fornecedor do Item
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Por favor, insira o Código do Item para obter o nr. de lote"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Por favor, selecione um valor para {0} a cotação_para {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Todos os Endereços.
 DocType: Company,Stock Settings,Definições de Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","A união só é possível caso as seguintes propriedades sejam iguais em ambos os registos. Estes são o Grupo, Tipo Principal, Empresa"
@@ -2574,6 +2579,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Enviará um email acerca do evento para os funcionários com estado ""Aberto"""
 DocType: Task,Depends on Tasks,Depende de Tarefas
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gerir o Esquema de Grupo de Cliente.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Os anexos podem ser mostrados sem ativar o carrinho de compras
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Novo Nome de Centro de Custos
 DocType: Leave Control Panel,Leave Control Panel,Painel de Controlo de Licenças
@@ -2586,12 +2592,10 @@
 DocType: Sales Invoice,Debit To,Débito Para
 DocType: Delivery Note,Required only for sample item.,Só é necessário para o item de amostra.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qtd Efetiva Após Transação
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Fornecedor&gt; Tipo de fornecedor
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Sem folha de salário encontrada entre {0} e {1}
 ,Pending SO Items For Purchase Request,Itens Pendentes PV para Solicitação de Compra
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admissão de Estudantes
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} está desativado
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} está desativado
 DocType: Supplier,Billing Currency,Moeda de Faturamento
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra-Grande
@@ -2608,9 +2612,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Página Inicial do Produto Em Destaque
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Todos os Grupos de Avaliação
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo Nome de Armazém
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Território
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Por favor, mencione o nr. de visitas necessárias"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Por favor, mencione o nr. de visitas necessárias"
 DocType: Stock Settings,Default Valuation Method,Método de Estimativa Padrão
 DocType: Vehicle Log,Fuel Qty,Qtd de Comb.
 DocType: Production Order Operation,Planned Start Time,Tempo de Início Planeado
@@ -2626,7 +2630,7 @@
 DocType: Price List,Price List Master,Definidor de Lista de Preços
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Todas as Transações de Vendas podem ser assinaladas em vários **Vendedores** para que possa definir e monitorizar as metas.
 ,S.O. No.,Nr. de P.E.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Por favor, crie um Cliente a partir dum Potencial Cliente {0}"
 DocType: Price List,Applicable for Countries,Aplicável aos Países
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Apenas Deixar Aplicações com status de &#39;Aprovado&#39; e &#39;Rejeitado&#39; podem ser submetidos
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},É obrigatório colocar o Nome do Grupo de Estudantes na linha {0}
@@ -2670,14 +2674,14 @@
 DocType: Project,Copied From,Copiado de
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Nome de erro: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Escassez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} não está associado a {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} não está associado a {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Já foi registada a presença do funcionário {0}
 DocType: Packing Slip,If more than one package of the same type (for print),Se houver mais do que um pacote do mesmo tipo (por impressão)
 ,Salary Register,salário Register
 DocType: Warehouse,Parent Warehouse,Armazém Principal
 DocType: C-Form Invoice Detail,Net Total,Total Líquido
 apps/erpnext/erpnext/config/hr.py +163,Define various loan types,Definir vários tipos de empréstimo
-DocType: Bin,FCFS Rate,Taxa FCFS
+DocType: Bin,FCFS Rate,Preço FCFS
 DocType: Payment Reconciliation Invoice,Outstanding Amount,Montante em Dívida
 apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),Tempo (em minutos)
 DocType: Project Task,Working,A Trabalhar
@@ -2689,7 +2693,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Utilizar para o Carrinho de Compras
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Não existe o Valor {0} para o Atributo {1} na lista Valores de Atributos de Item válidos para o Item {2}
 DocType: BOM Item,Scrap %,Sucata %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Os custos serão distribuídos proporcionalmente com base na qtd ou montante, conforme tiver selecionado"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Os custos serão distribuídos proporcionalmente com base na qtd ou montante, conforme tiver selecionado"
 DocType: Maintenance Visit,Purposes,Objetivos
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Para devolver um documento deve ser inserido pelo menos um item com quantidade negativa
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","A Operação {0} maior do que as horas de trabalho disponíveis no posto de trabalho {1}, quebra a operação em várias operações"
@@ -2710,16 +2714,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gerir Esquema de Território.
 DocType: Journal Entry Account,Sales Invoice,Fatura de Vendas
 DocType: Journal Entry Account,Party Balance,Saldo da Parte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Por favor, selecione Aplicar Desconto Em"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Por favor, selecione Aplicar Desconto Em"
 DocType: Company,Default Receivable Account,Contas a Receber Padrão
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Criar Registo Bancário  para o salário total pago, para os critérios acima selecionados"
 DocType: Stock Entry,Material Transfer for Manufacture,Transferência de Material para Fabrico
-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.,A Percentagem de Desconto pode ser aplicada numa Lista de Preços ou em todas as Listas de Preços.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,A Percentagem de Desconto pode ser aplicada numa Lista de Preços ou em todas as Listas de Preços.
 DocType: Purchase Invoice,Half-yearly,Semestral
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Registo Contabilístico de Stock
 DocType: Vehicle Service,Engine Oil,Óleo de Motor
 DocType: Sales Invoice,Sales Team1,Equipa de Vendas1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,O Item {0} não existe
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,O Item {0} não existe
 DocType: Sales Invoice,Customer Address,Endereço de Cliente
 DocType: Employee Loan,Loan Details,Detalhes empréstimo
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Linha {0}: A Qtd Concluída deve superior a zero.
@@ -2727,24 +2731,24 @@
 DocType: Account,Root Type,Tipo de Fonte
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Linha # {0}: Não é possível devolver mais de {1} para o Item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Gráfico
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Gráfico
 DocType: Item Group,Show this slideshow at the top of the page,Mostrar esta apresentação de diapositivos no topo da página
 DocType: BOM,Item UOM,UNID de Item
 DocType: Sales Taxes and Charges,Tax Amount After Discount Amount (Company Currency),Valor do Imposto Após Montante de Desconto (Moeda da Empresa)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},É obrigatório colocar o Destino do Armazém para a linha {0}
 DocType: Cheque Print Template,Primary Settings,Definições Principais
 DocType: Purchase Invoice,Select Supplier Address,Escolha um Endereço de Fornecedor
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Adicionar Funcionários
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Adicionar Funcionários
 DocType: Purchase Invoice Item,Quality Inspection,Inspeção de Qualidade
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra-pequeno
 DocType: Company,Standard Template,Modelo Padrão
 DocType: Training Event,Theory,Teoria
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Aviso: A Qtd do Material requisitado é menor que a Qtd de Pedido Mínima
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,A conta {0} está congelada
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entidade Legal / Subsidiária com um Gráfico de Contas separado pertencente à Organização.
 DocType: Payment Request,Mute Email,Email Sem Som
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Comida, Bebidas e Tabaco"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Só pode efetuar o pagamento no {0} não faturado
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Só pode efetuar o pagamento no {0} não faturado
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,A taxa de comissão não pode ser superior a 100
 DocType: Stock Entry,Subcontract,Subcontratar
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Por favor, insira {0} primeiro"
@@ -2784,7 +2788,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Os Armazéns com a transação existente não podem ser convertidos num grupo.
 DocType: Assessment Result Tool,Result HTML,resultado HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira em
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adicionar alunos
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adicionar alunos
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Por favor, selecione {0}"
 DocType: C-Form,C-Form No,Nr. de Form-C
 DocType: BOM,Exploded_items,Vista_expandida_de_items
@@ -2827,7 +2831,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Mtt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Insira o nome da campanha se a fonte da consulta for a campanha
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editores de Jornais
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selecionar Ano Fiscal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selecionar Ano Fiscal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordenar Nível
 DocType: Company,Chart Of Accounts Template,Modelo de Plano de Contas
 DocType: Attendance,Attendance Date,Data de Presença
@@ -2842,14 +2846,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicar registo
 DocType: Program Enrollment Tool,Get Students,Obter Estudantes
 DocType: Serial No,Under Warranty,Sob Garantia
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Erro]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Erro]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Por Extenso será visível quando guardar a Ordem de Venda.
 ,Employee Birthday,Aniversário do Funcionário
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Ferramenta de Assiduidade de Classe de Estudantes
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limite Ultrapassado
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risco
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Já existe um prazo académico com este""Ano Lectivo"" {0} e ""Nome do Prazo"" {1}. Por favor, altere estes registos e tente novamente."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Como existem transações existentes contra item de {0}, você não pode alterar o valor de {1}"
 DocType: UOM,Must be Whole Number,Deve ser Número Inteiro
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Novas Licenças Alocadas (Em Dias)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,O Nr. de Série {0} não existe
@@ -2869,7 +2873,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiais faturados desta Ordem de Venda
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Registo de Término de Período
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,O Centro de Custo com as operações existentes não pode ser convertido em grupo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Montante {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Montante {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciação
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Fornecedor(es)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Ferramenta de Assiduidade do Funcionário
@@ -2893,18 +2897,18 @@
 DocType: Supplier,Last Day of the Next Month,Último Dia do Mês Seguinte
 DocType: Support Settings,Auto close Issue after 7 days,Fechar automáticamente incidentes após 7 dias
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","A licença não pode ser atribuída antes de {0}, pois o saldo de licenças já foi carregado no registo de atribuição de licenças {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Nota: A Data de Vencimento / Referência excede os dias de crédito permitidos por cliente em {0} dia(s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Candidatura de Estudante
 DocType: Asset Category Account,Accumulated Depreciation Account,Conta de Depreciação Acumulada
 DocType: Stock Settings,Freeze Stock Entries,Suspender Registos de Stock
 DocType: Asset,Expected Value After Useful Life,Valor Previsto Após Vida Útil
 DocType: Item,Reorder level based on Warehouse,Nível de reencomenda no Armazém
-DocType: Activity Cost,Billing Rate,Taxa de Faturamento
+DocType: Activity Cost,Billing Rate,Preço de faturação padrão
 ,Qty to Deliver,Qtd a Entregar
 ,Stock Analytics,Análise de Stock
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,As operações não podem ser deixadas em branco
 DocType: Maintenance Visit Purpose,Against Document Detail No,No Nr. de Dados de Documento
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,É obrigatório colocar o Tipo de Parte
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,É obrigatório colocar o Tipo de Parte
 DocType: Quality Inspection,Outgoing,Saída
 DocType: Material Request,Requested For,Solicitado Para
 DocType: Quotation Item,Against Doctype,No Tipo de Documento
@@ -2921,10 +2925,10 @@
 DocType: Asset,Item Code,Código do Item
 DocType: Production Planning Tool,Create Production Orders,Criar Ordens de Produção
 DocType: Serial No,Warranty / AMC Details,Garantia / Dados CMA
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selecionar os alunos manualmente para o grupo baseado em atividade
 DocType: Journal Entry,User Remark,Observação de Utiliz.
 DocType: Lead,Market Segment,Segmento de Mercado
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},O Montante Pago não pode ser superior ao montante em dívida total negativo {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Historial de Trabalho Interno do Funcionário
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),A Fechar (Db)
 DocType: Cheque Print Template,Cheque Size,Tamanho do Cheque
@@ -2940,7 +2944,7 @@
 DocType: Production Planning Tool,Create Material Requests,Criar Solicitações de Materiais
 DocType: Employee Education,School/University,Escola/Universidade
 DocType: Payment Request,Reference Details,Dados de Referência
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,O Valor Previsto Após a Vida Útil deve ser inferior ao Valor de Compra a Grosso
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qtd Disponível no Armazém
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Montante Faturado
 DocType: Asset,Double Declining Balance,Saldo Decrescente Duplo
@@ -2961,20 +2965,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","A Conta de Diferenças deve ser uma conta do tipo Ativo/Passivo, pois esta Conciliação de Stock é um Registo de Abertura"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Desembolso Valor não pode ser maior do que o valor do empréstimo {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Nº da Ordem de Compra necessário para o Item {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Ordem de produção não foi criado
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Ordem de produção não foi criado
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"A ""Data De"" deve ser depois da ""Data Para"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Não é possível alterar o estado pois o estudante {0} está ligado à candidatura de estudante {1}
 DocType: Asset,Fully Depreciated,Totalmente Depreciados
 ,Stock Projected Qty,Qtd Projetada de Stock
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},O Cliente {0} não pertence ao projeto {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,HTML de Presenças Marcadas
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citações são propostas, as propostas que enviou aos seus clientes"
 DocType: Sales Order,Customer's Purchase Order,Ordem de Compra do Cliente
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,O Nr. de Série e de Lote
 DocType: Warranty Claim,From Company,Da Empresa
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Soma dos escores de critérios de avaliação precisa ser {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valor ou Qtd
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Por favor, defina o Número de Depreciações Marcado"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valor ou Qtd
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Não podem ser criados Pedidos de Produção para:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minuto
 DocType: Purchase Invoice,Purchase Taxes and Charges,Impostos e Taxas de Compra
@@ -2987,7 +2991,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Todos os Armazéns
 DocType: Sales Partner,Retailer,Retalhista
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,A conta de Crédito Para deve ser uma conta de Balanço
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Todos os Tipos de Fornecedores
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Todos os Tipos de Fornecedores
 DocType: Global Defaults,Disable In Words,Desativar Por Extenso
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,É obrigatório colocar o Código do Item  porque o Item não é automaticamente numerado
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},A Cotação {0} não é do tipo {1}
@@ -2996,6 +3000,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Descoberto na Conta Bancária
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Criar Folha de Vencimento
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Allocated Amount não pode ser maior do que o montante pendente.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Pesquisar na LDM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Empréstimos Garantidos
 DocType: Purchase Invoice,Edit Posting Date and Time,Editar postagem Data e Hora
@@ -3035,7 +3040,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Não é permitido atualizar transações com ações mais antigas que {0}
 DocType: Purchase Invoice Item,PR Detail,Dados de RC
 DocType: Sales Order,Fully Billed,Totalmente Faturado
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Por favor, definir conta de pagamento padrão  para o funcionário {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Dinheiro Em Caixa
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},É necessário colocar o armazém de entrega para o item de stock {0}
 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)
@@ -3046,7 +3050,7 @@
 DocType: Student Group,Group Based On,Grupo baseado em
 DocType: Journal Entry,Bill Date,Data de Faturação
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","É necessário colocar o Item de Serviço, Tipo, frequência e valor da despesa"
-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 Fixação de Preços com alta prioridade, as seguintes prioridades internas serão aplicadas:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Mesmo se houver várias Regras de Fixação de Preços com alta prioridade, as seguintes prioridades internas serão aplicadas:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Deseja realmente Enviar todas as Folhas de Vencimento de {0} para {1}
 DocType: Cheque Print Template,Cheque Height,Altura do Cheque
 DocType: Supplier,Supplier Details,Dados de Fornecedor
@@ -3058,7 +3062,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref. de Fatura
 DocType: Purchase Order,Recurring Order,Ordem Recorrente
 DocType: Company,Default Income Account,Conta de Rendimentos Padrão
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupo de Clientes / Cliente
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupo de Clientes / Cliente
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Lucro / Perdas (Crédito) de Anos Fiscais Não Encerrados
 DocType: Sales Invoice,Time Sheets,Folhas de Presença
 DocType: Payment Gateway Account,Default Payment Request Message,Mensagem de Solicitação de Pagamento Padrão
@@ -3078,10 +3082,10 @@
 DocType: Notification Control,Quotation Message,Mensagem de Cotação
 DocType: Employee Loan,Employee Loan Application,Pedido de empréstimo a funcionário
 DocType: Issue,Opening Date,Data de Abertura
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,A presença foi registada com sucesso.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,A presença foi registada com sucesso.
 DocType: Journal Entry,Remark,Observação
 DocType: Purchase Receipt Item,Rate and Amount,Taxa e Montante
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},O Tipo de Conta para {0} deverá ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},O Tipo de Conta para {0} deverá ser {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Licenças e Férias
 DocType: School Settings,Current Academic Term,Termo acadêmico atual
 DocType: School Settings,Current Academic Term,Termo acadêmico atual
@@ -3104,7 +3108,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupo Estudantil
 DocType: Shopping Cart Settings,Quotation Series,Série de Cotação
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Já existe um item com o mesmo nome ({0}), por favor, altere o nome deste item ou altere o nome deste item"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Por favor, selecione o cliente"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Por favor, selecione o cliente"
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,Centro de Custo de Depreciação de Ativo
 DocType: Sales Order Item,Sales Order Date,Data da Ordem de Venda
@@ -3123,20 +3127,20 @@
 DocType: Vehicle,Insurance Details,Dados de Seguro
 DocType: Account,Payable,A Pagar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Por favor, indique períodos de reembolso"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Devedores ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Devedores ({0})
 DocType: Pricing Rule,Margin,Margem
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Novos Clientes
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,% de Lucro Bruto
 DocType: Appraisal Goal,Weightage (%),Peso (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data de Liquidação
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,É obrigatório colocar o Montante de Compra Bruto
 DocType: Lead,Address Desc,Descrição de Endereço
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,É obrigatório colocar a parte
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,É obrigatório colocar a parte
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nome do Tópico
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Deverá ser selecionado pelo menos um dos Vendedores ou Compradores
-DocType: Grading Structure,Grade Intervals,Intervalos de Classe
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Seleccione a natureza do seu negócio.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Linha # {0}: Entrada duplicada em referências {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Sempre que são realizadas operações de fabrico.
 DocType: Asset Movement,Source Warehouse,Armazém Fonte
 DocType: Installation Note,Installation Date,Data de Instalação
@@ -3173,10 +3177,10 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Os Cabeçalhos de Carta para modelos de impressão.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Títulos para modelos de impressão, por exemplo, Fatura Proforma."
 DocType: Student Guardian,Student Guardian,Responsável do Estudante
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Os encargos do tipo de avaliação não podem ser marcados como Inclusivos
 DocType: POS Profile,Update Stock,Actualizar Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Uma UNID diferente para os itens levará a um Valor de Peso Líquido (Total) incorreto. Certifique-se de que o Peso Líquido de cada item está na mesma UNID.
-apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Taxa da LDM
+apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Preço na LDM
 DocType: Asset,Journal Entry for Scrap,Lançamento Contabilístico para Sucata
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,"Por favor, remova os itens da Guia de Remessa"
 apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,Os Lançamentos Contabilísticos {0} não estão vinculados
@@ -3201,11 +3205,11 @@
 DocType: Company,Exchange Gain / Loss Account,Conta de Ganhos / Perdas de Câmbios
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Funcionário e Assiduidade
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},O objetivo deve pertencer a {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Preencha o formulário e guarde-o
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Transfira um relatório que contém todas as matérias-primas com o seu estado mais recente no inventário
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +26,Community Forum,Fórum Comunitário
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em estoque
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em estoque
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em stock
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Quantidade real em stock
 DocType: Homepage,"URL for ""All Products""","URL para ""Todos os Produtos"""
 DocType: Leave Application,Leave Balance Before Application,Saldo de Licenças Antes do Pedido
 DocType: SMS Center,Send SMS,Enviar SMS
@@ -3217,7 +3221,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Qtd de Reencomenda
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Vagas de Emprego Atuais
 DocType: Company,Stock Adjustment Account,Conta de Acerto de Stock
-DocType: Journal Entry,Write Off,Liquidar
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Liquidar
 DocType: Timesheet Detail,Operation ID,ID de Operação
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistema de ID do Utilizador (login). Se for definido, ele vai ser o padrão para todas as formas de RH."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: De {1}
@@ -3228,26 +3232,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Entregas de Fornecedor ao Cliente
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,Não há stock de [{0}](#Formulário/Item/{0})
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,A Próxima Data deve ser mais antiga que a Data de Postagem
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Mostrar decomposição do imposto
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Mostrar decomposição do imposto
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},A Data de Vencimento / Referência não pode ser após {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Dados de Importação e Exportação
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Existem registos de Stock no Armazém {0}, portanto, não pode voltar a atribuí-los ou modificá-los"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Não foi Encontrado nenhum aluno
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Não foi Encontrado nenhum aluno
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Data de Lançamento da Fatura
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vender
 DocType: Sales Invoice,Rounded Total,Total Arredondado
 DocType: Product Bundle,List items that form the package.,Lista de itens que fazem parte do pacote.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,A Percentagem de Atribuição deve ser igual a 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Por favor, selecione a Data de Lançamento antes de selecionar a Parte"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Sem CMA
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selecione Citações
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Efetuar Visita de Manutenção
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selecione Citações
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,O Número de Depreciações Reservadas não pode ser maior do que o Número Total de Depreciações
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Efetuar Visita de Manutenção
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Por favor, contacte o utilizador com a função de Gestor Definidor de Vendas {0}"
 DocType: Company,Default Cash Account,Conta Caixa Padrão
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Definidor da Empresa (não Cliente ou Fornecedor).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Isto baseia-se na assiduidade deste Estudante
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Não alunos em
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adicionar mais itens ou abrir formulário inteiro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Por favor, insira a ""Data de Entrega Prevista"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Deverá cancelar as Guias de Remessa {0} antes de cancelar esta Ordem de Venda
@@ -3279,6 +3284,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Item 3
 DocType: Purchase Order,Customer Contact Email,Email de Contacto de Cliente
 DocType: Warranty Claim,Item and Warranty Details,Itens e Dados de Garantia
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Código do Item&gt; Item Group&gt; Brand
 DocType: Sales Team,Contribution (%),Contribuição (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Nota: Não será criado nenhum Registo de Pagamento, pois não foi especificado se era a ""Dinheiro ou por Conta Bancária"""
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Selecione o Programa para buscar cursos obrigatórios.
@@ -3294,9 +3300,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Antes da conciliação
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Para {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impostos e Taxas Adicionados (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
+apps/erpnext/erpnext/stock/doctype/item/item.py +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,A linha de Taxa do Item {0} deve ter em conta o tipo de Taxa ou de Rendimento ou de Despesa ou de Cobrança
 DocType: Sales Order,Partly Billed,Parcialmente Faturado
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,O Item {0} deve ser um Item de Ativo Imobilizado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,O Item {0} deve ser um Item de Ativo Imobilizado
 DocType: Item,Default BOM,LDM Padrão
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Por favor, reescreva o nome da empresa para confirmar"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Qtd Total Em Falta
@@ -3306,25 +3312,25 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automóvel
 DocType: Vehicle,Insurance Company,Companhia de Seguros
 DocType: Asset Category Account,Fixed Asset Account,Conta de Ativos Imobilizados
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variável
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Da Guia de Remessa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variável
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Da Guia de Remessa
 DocType: Student,Student Email Address,Endereço de Email do Estudante
 DocType: Timesheet Detail,From Time,Hora De
-apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Em estoque:
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Em stock:
 DocType: Notification Control,Custom Message,Mensagem Personalizada
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,Banco de Investimentos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,É obrigatório colocar o Dinheiro ou a Conta Bancária para efetuar um registo de pagamento
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Endereço do estudante
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,Endereço do estudante
 DocType: Purchase Invoice,Price List Exchange Rate,Taxa de Câmbio da Lista de Preços
-DocType: Purchase Invoice Item,Rate,Taxa
+DocType: Purchase Invoice Item,Rate,Valor
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Estagiário
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Nome endereço
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Nome endereço
 DocType: Stock Entry,From BOM,Da LDM
 DocType: Assessment Code,Assessment Code,Código de Avaliação
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Básico
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Estão congeladas as transações com stock antes de {0}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Por favor, clique em  'Gerar Cronograma'"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Por favor, clique em  'Gerar Cronograma'"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ex: Kg, Unidades, Nrs., m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,É obrigatório colocar o Nr. de Referência se tiver inserido a Data de Referência
 DocType: Bank Reconciliation Detail,Payment Document,Documento de Pagamento
@@ -3332,19 +3338,19 @@
 DocType: Salary Slip,Salary Structure,Estrutura Salarial
 DocType: Account,Bank,Banco
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Companhia Aérea
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Enviar Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Enviar Material
 DocType: Material Request Item,For Warehouse,Para o Armazém
 DocType: Employee,Offer Date,Data de Oferta
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Cotações
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Está em modo offline. Não poderá recarregar até ter rede.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Não foi criado nenhum Grupo de Estudantes.
 DocType: Purchase Invoice Item,Serial No,Nr. de Série
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mensal Reembolso Valor não pode ser maior do que o valor do empréstimo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Por favor, insira os Dados de Manutenção primeiro"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Por favor, insira os Dados de Manutenção primeiro"
 DocType: Purchase Invoice,Print Language,Idioma de Impressão
 DocType: Salary Slip,Total Working Hours,Total de Horas de Trabalho
 DocType: Stock Entry,Including items for sub assemblies,A incluir itens para subconjuntos
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,O valor introduzido deve ser positivo
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,O valor introduzido deve ser positivo
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Todos os Territórios
 DocType: Purchase Invoice,Items,Itens
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,O Estudante já está inscrito.
@@ -3364,17 +3370,15 @@
 DocType: Issue,Opening Time,Tempo de Abertura
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,São necessárias as datas De e A
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Valores Mobiliários e Bolsas de Mercadorias
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',A Unidade de Medida Padrão para a Variante '{0}' deve ser igual à do Modelo '{1}'
 DocType: Shipping Rule,Calculate Based On,Calcular com Base Em
 DocType: Delivery Note Item,From Warehouse,Armazém De
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Não há itens com Bill of Materials para Fabricação
 DocType: Assessment Plan,Supervisor Name,Nome do Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
 DocType: Program Enrollment Course,Program Enrollment Course,Curso de inscrição no programa
-DocType: Grading Structure,Grading Structure,Estrutura de Classificação
 DocType: Purchase Taxes and Charges,Valuation and Total,Avaliação e Total
 DocType: Tax Rule,Shipping City,Cidade de Envio
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Este Item é uma Variante de {0} (Modelo). Os Atributos serão copiados a partir do modelo, a menos que defina ""Não Copiar"""
 DocType: Notification Control,Customize the Notification,Personalizar Notificação
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Fluxo de Caixa das Operações
 DocType: Sales Invoice,Shipping Rule,Regra de Envio
@@ -3395,8 +3399,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,Child account exists for this account. You can not delete this account.,Existe uma subconta para esta conta. Não pode eliminar esta conta.
 apps/erpnext/erpnext/setup/doctype/territory/territory.py +19,Either target qty or target amount is mandatory,É obrigatório colocar a qtd prevista ou o montante previsto
 apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},Não existe nenhuma LDM padrão para o Item {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,A Data de Abertura deve ser antes da Data de Término
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Por favor, selecione a Data de Postagem primeiro"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,A Data de Abertura deve ser antes da Data de Término
 DocType: Leave Control Panel,Carry Forward,Continuar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"O Centro de Custo, com as operações existentes, não pode ser convertido em livro"
 DocType: Department,Days for which Holidays are blocked for this department.,Dias em que as Férias estão bloqueadas para este departamento.
@@ -3409,7 +3413,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Anexar Cabeçalho
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicação
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Última comunicação
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Não pode deduzir quando a categoria é da ""Estimativa"" ou ""Estimativa e Total"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Não pode deduzir quando a categoria é da ""Estimativa"" ou ""Estimativa e Total"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Liste os seus títulos fiscais (por exemplo, IVA, Alfândega; eles devem ter nomes únicos) e as suas taxas normais. Isto irá criar um modelo padrão, em que poderá efetuar edições e adições mais tarde."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},É Necessário colocar o Nr. de Série para o Item em Série {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Combinar Pagamentos com Faturas
@@ -3425,7 +3429,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Qtd)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entretenimento e Lazer
 DocType: Quality Inspection,Item Serial No,Nº de Série do Item
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Criar Funcionário Registros
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Criar Funcionário Registros
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Total Atual
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Demonstrações Contabilísticas
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hora
@@ -3438,25 +3442,23 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Desconhecido
 DocType: Shipping Rule,Shipping Rule Conditions,Condições de Regras de Envio
 DocType: BOM Replace Tool,The new BOM after replacement,A LDM nova após substituição
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Ponto de Venda
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Ponto de Venda
 DocType: Payment Entry,Received Amount,Montante Recebido
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurar o sistema de nomeação de funcionários em recursos humanos&gt; Configurações de RH
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurar o sistema de nomeação de funcionários em recursos humanos&gt; Configurações de RH
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Criar para a quantidade total, ignorando a quantidade já pedida"
 DocType: Account,Tax,Imposto
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,Não Marcado
 DocType: Production Planning Tool,Production Planning Tool,Ferramenta de Planeamento de Produção
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de estoque, em vez disso, use Entrada de estoque"
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de estoque, em vez disso, use Entrada de estoque"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry","O item em lote {0} não pode ser atualizado usando Reconciliação de stock, em vez disso, use Entrada de stock"
 DocType: Quality Inspection,Report Date,Data de Relatório
 DocType: Student,Middle Name,Nome do Meio
 DocType: C-Form,Invoices,Faturas
 DocType: Batch,Source Document Name,Nome do Documento de Origem
 DocType: Batch,Source Document Name,Nome do Documento de Origem
 DocType: Job Opening,Job Title,Título de Emprego
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Criar utilizadores
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Criar utilizadores
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gramas
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,A Quantidade de Fabrico deve ser superior a 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Relatório de visita para a chamada de manutenção.
 DocType: Stock Entry,Update Rate and Availability,Atualizar Taxa e Disponibilidade
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"A percentagem que está autorizado a receber ou entregar da quantidade pedida. Por ex: Se encomendou 100 unidades e a sua Ajuda de Custo é de 10%, então está autorizado a receber 110 unidades."
@@ -3465,28 +3467,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},É obrigatório ter uma conta de despesas para o item {0}
 DocType: BOM,Website Description,Descrição do Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Variação Líquida na Equidade
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Por favor, cancele a Fatura de Compra {0} primeiro"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","O ID de Email deve ser único, já existe para {0}"
 DocType: Serial No,AMC Expiry Date,Data de Validade do CMA
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Recibo
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Recibo
 ,Sales Register,Registo de Vendas
 DocType: Daily Work Summary Settings Company,Send Emails At,Enviar Emails Em
 DocType: Quotation,Quotation Lost Reason,Motivo de Perda de Cotação
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Escolha o seu Domínio
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transação de referência nr. {0} datada de {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transação de referência nr. {0} datada de {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Não há nada para editar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Nenhum cliente ainda!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Demonstração dos Fluxos de Caixa
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Valor do Empréstimo não pode exceder Máximo Valor do Empréstimo de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licença
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Por favor, remova esta Fatura {0} do Form-C {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Por favor selecione Continuar se também deseja incluir o saldo de licenças do ano fiscal anterior neste ano fiscal
 DocType: GL Entry,Against Voucher Type,No Tipo de Voucher
 DocType: Item,Attributes,Atributos
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Por favor, insira a Conta de Liquidação"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Data do Último Pedido
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},A conta {0} não pertence à empresa {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Os números de série na linha {0} não correspondem à nota de entrega
 DocType: Student,Guardian Details,Dados de Responsável
 DocType: C-Form,C-Form,Form-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcar Presença em vários funcionários
@@ -3511,20 +3515,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',"Linha {0}# A conta deve ser do tipo ""Ativo Fixo"""
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Qtd de Saída
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,As regras para calcular o montante de envio duma venda
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,É obrigatório colocar a Série
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,É obrigatório colocar a Série
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Serviços Financeiros
 DocType: Student Sibling,Student ID,Identidade estudantil
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipos de atividades para Registos de Tempo
 DocType: Tax Rule,Sales,Vendas
 DocType: Stock Entry Detail,Basic Amount,Montante de Base
 DocType: Training Event,Exam,Exame
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Armazém necessário para o Item {0} do stock
 DocType: Leave Allocation,Unused leaves,Licensas não utilizadas
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Estado de Faturamento
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferir
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} não está associado à Conta da Parte {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} não está associado à Conta da Parte {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Trazer LDM expandida (incluindo os subconjuntos)
 DocType: Authorization Rule,Applicable To (Employee),Aplicável Ao/À (Funcionário/a)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,É obrigatório colocar a Data de Vencimento
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,O Aumento do Atributo {0} não pode ser 0
@@ -3535,13 +3539,13 @@
 ,Inactive Customers,Clientes Inativos
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Recibos de Compra
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Como que a Regra de Fixação de Preços é aplicada?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Como que a Regra de Fixação de Preços é aplicada?
 DocType: Stock Entry,Delivery Note No,Nr. da Guia de Remessa
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Se for selecionado, só as solicitações de material de Compra para matérias-primas finais é que serão incluídas nas Solicitações de Material. Caso contrário, serão criadas Solicitações de Material para os itens de origem"
 DocType: Cheque Print Template,Message to show,Mensagem a mostrar
 DocType: Company,Retail,Retalho
 DocType: Attendance,Absent,Ausente
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Pacote de Produtos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Linha {0}: Referência inválida {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Modelo de Impostos e Taxas de Compra
 DocType: Upload Attendance,Download Template,Transferir Modelo
@@ -3551,10 +3555,10 @@
 DocType: Payment Entry,Account Paid From,Conta Paga De
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Código de Item de Matéria-prima
 DocType: Journal Entry,Write Off Based On,Liquidação Baseada Em
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Crie um Potencial Cliente
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Crie um Potencial Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Impressão e artigos de papelaria
 DocType: Stock Settings,Show Barcode Field,Mostrar Campo do Código de Barras
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Enviar Emails de Fornecedores
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Enviar Emails de Fornecedores
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","O salário já foi processado para período entre {0} e {1}, o período de aplicação da Licença não pode estar entre este intervalo de datas."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Registo de Instalação para um Nr. de Série
 DocType: Guardian Interest,Guardian Interest,Interesse do Responsável
@@ -3567,6 +3571,7 @@
 DocType: Offer Letter,Awaiting Response,A aguardar Resposta
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Acima
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Atributo inválido {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Mencionar se a conta a pagar não padrão
 DocType: Salary Slip,Earning & Deduction,Remunerações e Deduções
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opcional. Esta definição será utilizada para filtrar várias transações.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Não são permitidas Percentagens de Avaliação Negativas
@@ -3582,10 +3587,9 @@
 DocType: Production Order Item,Production Order Item,Item da Ordem de Produção
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Não foi encontrado nenhum registo
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Custo do Ativo Descartado
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parcialmente ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: O Centro de Custo é obrigatório para o Item {2}
 DocType: Vehicle,Policy No,Nr. de Política
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obter Itens de Pacote de Produtos
 DocType: Asset,Straight Line,Linha Reta
 DocType: Project User,Project User,Utilizador do Projecto
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dividido
@@ -3603,7 +3607,7 @@
 DocType: Program Enrollment Tool,Get Students From,Obter Estudantes De
 DocType: Hub Settings,Seller Country,País do Vendedor
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicar Itens no Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupo seus alunos em lotes
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupo seus alunos em lotes
 DocType: Authorization Rule,Authorization Rule,Regra de Autorização
 DocType: Sales Invoice,Terms and Conditions Details,Dados de Termos e Condições
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Especificações
@@ -3656,15 +3660,15 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data do Cheque
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},A Conta {0}: da Conta Principal {1} não pertence à empresa: {2}
 DocType: Program Enrollment Tool,Student Applicants,Candidaturas de Estudantes
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Todas as transacções relacionadas com esta empresa foram eliminadas com sucesso!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Todas as transacções relacionadas com esta empresa foram eliminadas com sucesso!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Igual à Data
 DocType: Appraisal,HR,RH
 DocType: Program Enrollment,Enrollment Date,Data de Matrícula
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,À Experiência
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componentes Salariais
 DocType: Program Enrollment Tool,New Academic Year,Novo Ano Letivo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retorno / Nota de Crédito
-DocType: Stock Settings,Auto insert Price List rate if missing,Inserção automática da taxa da Lista de Preços caso a mesma esteja ausente
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retorno / Nota de Crédito
+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 +28,Total Paid Amount,Montante Total Pago
 DocType: Production Order Item,Transferred Qty,Qtd Transferida
 apps/erpnext/erpnext/config/learn.py +11,Navigating,Navegação
@@ -3683,7 +3687,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tipo de licenças como casual, por doença, etc."
 DocType: Email Digest,Send regular summary reports via Email.,Enviar relatórios de resumo periódicos através do Email.
 DocType: Payment Entry,PE-,RP-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Por favor, defina a conta padrão no Tipo de Despesas de Reembolso {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Por favor, defina a conta padrão no Tipo de Despesas de Reembolso {0}"
 DocType: Assessment Result,Student Name,Nome do Aluno
 DocType: Brand,Item Manager,Gestor do Item
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,folha de pagamento Pagar
@@ -3704,6 +3708,7 @@
 ,Sales Funnel,Canal de Vendas
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,É obrigatório colocar uma abreviatura
 DocType: Project,Task Progress,Progresso da Tarefa
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Carrinho
 ,Qty to Transfer,Qtd a Transferir
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Cotações para Potenciais Clientes ou Clientes.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Função Com Permissão para editar o stock congelado
@@ -3731,13 +3736,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Dados de Taxa por Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Abreviação do Instituto
 ,Item-wise Price List Rate,Taxa de Lista de Preço por Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Cotação do Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Cotação do Fornecedor
 DocType: Quotation,In Words will be visible once you save the Quotation.,Por extenso será visível assim que guardar o Orçamento.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Quantidade ({0}) não pode ser uma fração na linha {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Cobrar Taxas
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},O Código de Barras {0} já foi utilizado no Item {1}
 DocType: Lead,Add to calendar on this date,Adicionar ao calendário nesta data
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,As regras para adicionar os custos de envio.
 DocType: Item,Opening Stock,Stock Inicial
@@ -3755,8 +3760,8 @@
 Atualizado através do ""Registo de Tempo"""
 DocType: Customer,From Lead,Do Potencial Cliente
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Pedidos lançados para a produção.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selecione o Ano Fiscal...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selecione o Ano Fiscal...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,É necessário colocar o Perfil POS para efetuar um Registo POS
 DocType: Program Enrollment Tool,Enroll Students,Matricular Estudantes
 DocType: Hub Settings,Name Token,Nome do Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Venda Padrão
@@ -3767,7 +3772,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} nas Faturas de Vendas {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Nome do Projeto
-DocType: Supplier,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
+DocType: Customer,Mention if non-standard receivable account,Mencione se é uma conta a receber não padrão
 DocType: Journal Entry Account,If Income or Expense,Se forem Rendimentos ou Despesas
 DocType: Production Order,Required Items,Itens Obrigatórios
 DocType: Stock Ledger Entry,Stock Value Difference,Diferença de Valor de Stock
@@ -3788,7 +3793,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Estabelecer Item Alvo por Grupo para este Vendedor/a.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Suspender Stocks Mais Antigos Que [Dias]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Linha #{0}: É obrigatória colocar o Ativo para a compra/venda do ativo fixo
-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.","Se forem encontradas duas ou mais Regras de Fixação de Preços baseadas nas condições acima, é aplicada a Prioridade. A Prioridade é um número entre 0 a 20, enquanto que o valor padrão é zero (em branco). Um número maior significa que terá prioridade se houver várias Regras de Fixação de Preços com as mesmas condições."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Se forem encontradas duas ou mais Regras de Fixação de Preços baseadas nas condições acima, é aplicada a Prioridade. A Prioridade é um número entre 0 a 20, enquanto que o valor padrão é zero (em branco). Um número maior significa que terá prioridade se houver várias Regras de Fixação de Preços com as mesmas condições."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,O Ano Fiscal: {0} não existe
 DocType: Currency Exchange,To Currency,A Moeda
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permitir que os seguintes utilizadores aprovem Pedidos de Licenças para dias bloqueados.
@@ -3814,7 +3819,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,O Item {0} foi ignorado pois não é um item de stock
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Submeta este Pedido de Produção para posterior processamento.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços numa determinada transação, todas as regras de preços aplicáveis devem ser desativadas."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Para não aplicar regra de preços numa determinada transação, todas as regras de preços aplicáveis devem ser desativadas."
 DocType: Assessment Group,Parent Assessment Group,Grupo de Avaliação pai
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Empregos
 ,Sales Order Trends,Tendências de Ordens de Venda
@@ -3825,7 +3830,7 @@
 DocType: Stock Entry Detail,Additional Cost,Custo Adicional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data de Encerramento do Ano Fiscal
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Não pode filtrar com base no Nr. de Voucher, se estiver agrupado por Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Efetuar Cotação de Fornecedor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Efetuar Cotação de Fornecedor
 DocType: Quality Inspection,Incoming,Entrada
 DocType: BOM,Materials Required (Exploded),Materiais Necessários (Expandidos)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Adiciona utilizadores à sua organização, para além de si"
@@ -3836,7 +3841,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +380,Note: {0},Nota: {0}
 ,Delivery Note Trends,Tendências das Guias de Remessa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,Resumo da Semana
-,In Stock Qty,Em estoque Quantidade
+,In Stock Qty,Quantidade em stock
 apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,A Conta: {0} só pode ser atualizada através das Transações de Stock
 DocType: Program Enrollment,Get Courses,Obter Cursos
 DocType: GL Entry,Party,Parte
@@ -3848,11 +3853,12 @@
 DocType: Material Request,% Ordered,% Pedida
 DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",Insira o Endereço de Email separado por vírgulas. A fatura será enviada automaticamente numa determinada data
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,Trabalho à Peça
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Taxa de Compra Méd.
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,Preço de compra médio
 DocType: Task,Actual Time (in Hours),Tempo Real (em Horas)
 DocType: Employee,History In Company,Historial na Empresa
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newsletters
 DocType: Stock Ledger Entry,Stock Ledger Entry,Registo do Livro de Stock
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Cliente&gt; Grupo de Clientes&gt; Território
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Mesmo item foi inserido várias vezes
 DocType: Department,Leave Block List,Lista de Bloqueio de Licenças
 DocType: Sales Invoice,Tax ID,NIF/NIPC
@@ -3862,7 +3868,7 @@
 DocType: Customer,Sales Partner and Commission,Parceiro e Comissão de Vendas
 DocType: Employee Loan,Rate of Interest (%) / Year,Taxa de juro (%) / Ano
 ,Project Quantity,Quantidade de Projeto
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total de {0} para todos os itens é zero, pode ser que você deve mudar &#39;Distribuir taxas sobre&#39;"
 DocType: Opportunity,To Discuss,Para Discutir
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,São necessárias {0} unidades de {1} em {2} para concluir esta transação.
 DocType: Loan Type,Rate of Interest (%) Yearly,Taxa de juro (%) Anual
@@ -3877,19 +3883,19 @@
 DocType: Purchase Invoice,Return,Devolver
 DocType: Production Order Operation,Production Order Operation,Operação de Pedido de Produção
 DocType: Pricing Rule,Disable,Desativar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Modo de pagamento é necessário para fazer um pagamento
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Modo de pagamento é necessário para fazer um pagamento
 DocType: Project Task,Pending Review,Revisão Pendente
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","O ativo {0} não pode ser eliminado, uma vez que já é um/a {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Reivindicação de Despesa Total (através de Reembolso de Despesas)
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,Id de Cliente
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Marcar Ausência
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Linha {0}: A Moeda da LDM # {1} deve ser igual à moeda selecionada {2}
-DocType: Journal Entry Account,Exchange Rate,Taxa de Câmbio
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
+DocType: Journal Entry Account,Exchange Rate,Valor de Câmbio
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,A Ordem de Vendas {0} não foi enviada
 DocType: Homepage,Tag Line,Linha de tag
 DocType: Fee Component,Fee Component,Componente de Propina
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Gestão de Frotas
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Adicionar itens de
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Adicionar itens de
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Armazém {0}: A Conta principal {1} não pertence à empresa {2}
 DocType: Cheque Print Template,Regular,Regular
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage total de todos os Critérios de Avaliação deve ser 100%
@@ -3902,7 +3908,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,O Armazém {0} não existe
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inscreva-se na Plataforma ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Percentagens de Distribuição Mensal
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,O item selecionado não pode ter um Lote
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,O item selecionado não pode ter um Lote
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","taxa de valorização não encontrado para o item {0}, que é necessário para fazer lançamentos contábeis para {1} {2}. Se o item for negociado como um item de amostra no {1}, por favor mencione que na tabela do item do {1}. Caso contrário, crie uma transação de ações de entrada para a taxa de valorização item ou menção no registro de item e, em seguida, tentar submeter / cancelar esta entrada"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiais entregues desta Guia de Remessa
 DocType: Project,Customer Details,Dados do Cliente
@@ -3911,15 +3917,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Insira o parâmetro de url para os números de recetores
 DocType: Payment Entry,Paid Amount,Montante Pago
 DocType: Assessment Plan,Supervisor,Supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Stock Disponível para Items Embalados
 DocType: Item Variant,Item Variant,Variante do Item
 DocType: Assessment Result Tool,Assessment Result Tool,Avaliação Resultado Ferramenta
 DocType: BOM Scrap Item,BOM Scrap Item,Item de Sucata da LDM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ordens enviadas não pode ser excluído
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","O saldo da conta já está em débito, não tem permissão para definir o ""Saldo Deve Ser"" como ""Crédito"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Gestão da Qualidade
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,O Item {0} foi desativado
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,O Item {0} foi desativado
 DocType: Employee Loan,Repay Fixed Amount per Period,Pagar quantia fixa por Período
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Por favor, insira a quantidade para o Item {0}"
 DocType: Employee External Work History,Employee External Work History,Historial de Trabalho Externo do Funcionário
@@ -3946,7 +3952,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E-mail ID
 DocType: Employee,Notice (days),Aviso (dias)
 DocType: Tax Rule,Sales Tax Template,Modelo do Imposto sobre Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selecione os itens para guardar a fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Selecione os itens para guardar a fatura
 DocType: Employee,Encashment Date,Data de Pagamento
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajuste de Stock
@@ -3976,7 +3982,7 @@
 DocType: Item Variant Attribute,Attribute,Atributo
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Por favor, especifique a variação de/para"
 DocType: Serial No,Under AMC,Abaixo do CMA
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,A taxa de valorização do item é recalculada considerando o montante do voucher do custo de entrega
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,A taxa de valorização do item é recalculada considerando o montante do voucher do custo de entrega
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,As definições padrão para as transações de vendas.
 DocType: Guardian,Guardian Of ,guardião
 DocType: Grading Scale Interval,Threshold,Limite
@@ -3986,6 +3992,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Nota de Débito Emitida
 DocType: Production Order,Warehouses,Armazéns
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,O ativo {0} não pode ser transferido
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Este Item é uma Variante de {0} (Modelo).
 DocType: Workstation,per hour,por hora
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Aquisição
 DocType: Announcement,Announcement,Anúncio
@@ -4001,8 +4008,8 @@
 DocType: Account,Receivable,A receber
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Linha {0}: Não é permitido alterar o Fornecedor pois já existe uma Ordem de Compra
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,A função para a qual é permitida enviar transações que excedam os limites de crédito estabelecidos.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selecione os itens para Fabricação
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Selecione os itens para Fabricação
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Os dados do definidor estão a sincronizar, isto pode demorar algum tempo"
 DocType: Item,Material Issue,Saída de Material
 DocType: Hub Settings,Seller Description,Descrição do Vendedor
 DocType: Employee Education,Qualification,Qualificação
@@ -4014,7 +4021,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Pedido
 DocType: Salary Detail,Component,Componente
 DocType: Assessment Criteria,Assessment Criteria Group,Critérios de Avaliação Grupo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},A Depreciação Acumulada Inicial deve ser menor ou igual a {0}
 DocType: Warehouse,Warehouse Name,Nome dp Armazém
 DocType: Naming Series,Select Transaction,Selecionar Transação
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Por favor, insira a Função Aprovadora ou o Utilizador Aprovador"
@@ -4027,7 +4034,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},A Data Para deve estar dentro do Ano Fiscal. Assumindo que a Data Para = {0}
 DocType: Employee,"Here you can maintain height, weight, allergies, medical concerns etc","Aqui pode colocar a altura, o peso, as alergias, problemas médicos, etc."
 DocType: Leave Block List,Applies to Company,Aplica-se à Empresa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar porque o Registo de Stock {0} existe
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Não pode cancelar porque o Registo de Stock {0} existe
 DocType: Employee Loan,Disbursement Date,Data de desembolso
 DocType: Vehicle,Vehicle,Veículo
 DocType: Purchase Invoice,In Words,Por Extenso
@@ -4042,14 +4049,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,SOLMAT-
 ,Asset Depreciations and Balances,Depreciações e Saldos de Ativo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Montante {0} {1} transferido de {2} para {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Montante {0} {1} transferido de {2} para {3}
 DocType: Sales Invoice,Get Advances Received,Obter Adiantamentos Recebidos
 DocType: Email Digest,Add/Remove Recipients,Adicionar/Remover Destinatários
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transação não permitida na Ordem de Produção {0} parada
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Para definir este Ano Fiscal como Padrão, clique em ""Definir como Padrão"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Inscrição
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Qtd de Escassez
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,A variante do Item {0} já existe com mesmos atributos
 DocType: Employee Loan,Repay from Salary,Reembolsar a partir de Salário
 DocType: Leave Application,LAP/,APL/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitando o pagamento contra {0} {1} para montante {2}
@@ -4067,7 +4074,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Avaliação Resultado Detalhe
 DocType: Employee Education,Employee Education,Educação do Funcionário
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Foi encontrado um grupo item duplicado na tabela de grupo de itens
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,É preciso buscar os Dados do Item.
 DocType: Salary Slip,Net Pay,Rem. Líquida
 DocType: Account,Account,Conta
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,O Nr. de Série {0} já foi recebido
@@ -4076,7 +4083,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","O Armazém {0} não está vinculado a nenhuma conta, crie/vincule a conta correspondente (de Ativo) ao armazém."
 DocType: Purchase Invoice,Recurring Id,ID Recorrente
 DocType: Customer,Sales Team Details,Dados de Equipa de Vendas
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Eliminar permanentemente?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Eliminar permanentemente?
 DocType: Expense Claim,Total Claimed Amount,Montante Reclamado Total
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciais oportunidades de venda.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Inválido {0}
@@ -4087,13 +4094,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup sua escola em ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Montante de Modificação Base (Moeda da Empresa)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Não foram encontrados registos contabilísticos para os seguintes armazéns
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Não foram encontrados registos contabilísticos para os seguintes armazéns
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Guarde o documento pela primeira vez.
 DocType: Account,Chargeable,Cobrável
 DocType: Company,Change Abbreviation,Alterar Abreviação
 DocType: Expense Claim Detail,Expense Date,Data da Despesa
 DocType: Item,Max Discount (%),Desconto Máx. (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Montante do Último Pedido
+DocType: Task,Is Milestone,É Milestone
 DocType: Daily Work Summary,Email Sent To,Email Enviado Para
 DocType: Budget,Warn,Aviso
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Quaisquer outras observações, dignas de serem mencionadas, que devem ir para os registos."
@@ -4114,7 +4122,7 @@
 DocType: Item Attribute Value,Attribute Value,Valor do Atributo
 ,Itemwise Recommended Reorder Level,Nível de Reposição Recomendada por Item
 DocType: Salary Detail,Salary Detail,Dados Salariais
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Por favor, seleccione primeiro {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Por favor, seleccione primeiro {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,O Lote {0} do Item {1} expirou.
 DocType: Sales Invoice,Commission,Comissão
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Folha de Presença de fabrico.
@@ -4126,41 +4134,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Congelar Stocks Mais Antigos Que"" deve ser menor que %d dias."
 DocType: Tax Rule,Purchase Tax Template,Modelo de Taxa de Compra
 ,Project wise Stock Tracking,Controlo de Stock por Projeto
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},O Cronograma de Manutenção {0} existe em {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Qtd  Efetiva (na origem/destino)
 DocType: Item Customer Detail,Ref Code,Código de Ref.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Registos de Funcionários.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Por favor, defina a Próximo Data de Depreciação"
 DocType: HR Settings,Payroll Settings,Definições de Folha de Pagamento
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Combinar Faturas e Pagamentos não vinculados.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Efetuar Ordem
 DocType: Email Digest,New Purchase Orders,Novas Ordens de Compra
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,A fonte não pode ter um centro de custos principal
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Selecione a Marca...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Selecione a Marca...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Depreciação Acumulada como em
 DocType: Sales Invoice,C-Form Applicable,Aplicável ao Form-C
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},O Tempo de Operação deve ser superior a 0 para a Operação {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},O Tempo de Operação deve ser superior a 0 para a Operação {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,É obrigatório colocar o Armazém
 DocType: Supplier,Address and Contacts,Endereços e Contactos
 DocType: UOM Conversion Detail,UOM Conversion Detail,Dados de Conversão de UNID
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Manter uma utilização web simples e cómoda de 900px (l) por 100px (a)
 DocType: Program,Program Abbreviation,Abreviação do Programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Não pode ser criado uma Ordem de Produção para um Item Modelo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Os custos de cada item são atualizados no Recibo de Compra
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Não pode ser criado uma Ordem de Produção para um Item Modelo
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Os custos de cada item são atualizados no Recibo de Compra
 DocType: Warranty Claim,Resolved By,Resolvido Por
 DocType: Bank Guarantee,Start Date,Data de Início
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Atribuir licenças para um determinado período.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Os Cheques e Depósitos foram apagados incorretamente
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Conta {0}: Não pode atribuí-la como conta principal
-DocType: Purchase Invoice Item,Price List Rate,Taxa de Lista de Preços
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Criar cotações de clientes
+DocType: Purchase Invoice Item,Price List Rate,PReço na Lista de Preços
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Criar cotações de clientes
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Mostrar ""Em Stock"" ou ""Não Está em Stock"" com base no stock disponível neste armazém."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Lista de Materiais (LDM)
 DocType: Item,Average time taken by the supplier to deliver,Tempo médio necessário para o fornecedor efetuar a entrega
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Resultado da Avaliação
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Horas
 DocType: Project,Expected Start Date,Data de Início Prevista
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Remover item, se os encargos não forem aplicáveis a esse item"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,"Remover item, se os encargos não forem aplicáveis a esse item"
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ex: portaldesms.com/api/enviar_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,O moeda do câmbio deve ser a mesmo da moeda do Portal de Pagamento
 DocType: Payment Entry,Receive,Receber
@@ -4171,19 +4178,19 @@
 DocType: Workstation,Operating Costs,Custos de Funcionamento
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Ação se o Orçamento Mensal Acumulado for Excedido
 DocType: Purchase Invoice,Submit on creation,Enviar na criação
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},A moeda para {0} deve ser {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},A moeda para {0} deve ser {1}
 DocType: Asset,Disposal Date,Data de Eliminação
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Os emails serão enviados para todos os funcionários ativos da empresa na hora estabelecida, se não estiverem de férias. O resumo das respostas será enviado à meia-noite."
 DocType: Employee Leave Approver,Employee Leave Approver,Autorizador de Licenças do Funcionário
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Linha{0}: Já existe um registo de Reencomenda para este armazém {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Não pode declarar como perdido, porque foi efetuada uma Cotação."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback de Formação
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,A Ordem de Produção {0} deve ser enviado
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Por favor, seleccione a Data de Início e a Data de Término do Item {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Por favor, seleccione a Data de Início e a Data de Término do Item {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},O Curso é obrigatório na linha {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,A data a não pode ser anterior à data de
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adicionar / Editar Preços
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adicionar / Editar Preços
 DocType: Batch,Parent Batch,Lote pai
 DocType: Batch,Parent Batch,Lote pai
 DocType: Cheque Print Template,Cheque Print Template,Modelo de Impressão de Cheque
@@ -4197,7 +4204,7 @@
 ,Ordered Items To Be Delivered,Itens Pedidos A Serem Entregues
 DocType: Account,Income,Rendimento
 DocType: Industry Type,Industry Type,Tipo de Setor
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Ocorreu um problema!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ocorreu um problema!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Atenção: A solicitação duma licença contém as seguintes datas bloqueadas
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,A Fatura de Venda {0} já foi enviada
 DocType: Assessment Result Detail,Score,Ponto
@@ -4228,17 +4235,17 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},O peso total atribuído deve ser de 100 %. É {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Seus Fornecedores
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Não pode definir como Oportunidade Perdida pois a Ordem de Venda já foi criado.
 DocType: Request for Quotation Item,Supplier Part No,Peça de Fornecedor Nr.
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Recebido De
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Não pode deduzir quando a categoria é para ""Estimativa"" ou ""Estimativa e Total"""
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Recebido De
 DocType: Lead,Converted,Convertido
 DocType: Item,Has Serial No,Tem Nr. de Série
 DocType: Employee,Date of Issue,Data de Emissão
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: De {0} para {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: De {0} para {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Linha #{0}: Definir Fornecedor para o item {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Linha {0}: O valor por hora deve ser maior que zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Não foi possível encontrar a Imagem do Website {0} anexada ao Item {1}
 DocType: Issue,Content Type,Tipo de Conteúdo
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Computador
 DocType: Item,List this Item in multiple groups on the website.,Listar este item em vários grupos do website.
@@ -4247,20 +4254,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Não está autorizado a definir como valor Congelado
 DocType: Payment Reconciliation,Get Unreconciled Entries,Obter Registos Não Conciliados
 DocType: Payment Reconciliation,From Invoice Date,Data de Fatura De
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,A moeda de faturamento deve ser igual à moeda padrão da empresa ou à moeda padrão da conta da outra parte
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,deixar Cobrança
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,O que faz?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Armazém Para
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Todas as Admissão de Estudantes
 ,Average Commission Rate,Taxa de Comissão Média
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Tem um Nr. de Série"" não pode ser ""Sim"" para um item sem gestão de stock"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,A presença não pode ser registada em datas futuras
 DocType: Pricing Rule,Pricing Rule Help,Ajuda da Regra Fixação de Preços
 DocType: School House,House Name,Nome casa
 DocType: Purchase Taxes and Charges,Account Head,Título de Conta
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Atualize os custos adicionais para calcular o custo de transporte de itens
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elétrico
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adicione o resto da sua organização como seus utilizadores. Você também pode adicionar convidar clientes para o seu portal, adicionando-os a partir de Contactos"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adicione o resto da sua organização como seus utilizadores. Você também pode adicionar convidar clientes para o seu portal, adicionando-os a partir de Contactos"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferença de Valor Total (Saída - Entrada)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,Row {0}: Exchange Rate is mandatory,Linha {0}: É obrigatório colocar a Taxa de Câmbio
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +27,User ID not set for Employee {0},Não está definido a ID do utilizador para o Funcionário {0}
@@ -4269,7 +4276,7 @@
 DocType: Item,Customer Code,Código de Cliente
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Lembrete de Aniversário para o/a {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dias Desde a última Ordem
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,A conta de Débito Para deve ser uma conta de Balanço
 DocType: Buying Settings,Naming Series,Série de Atrib. de Nomes
 DocType: Leave Block List,Leave Block List Name,Nome de Lista de Bloqueio de Licenças
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,A data de Início do Seguro deve ser anterior à data de Término do Seguro
@@ -4284,9 +4291,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},A Folha de Vencimento do funcionário {0} já foi criada para folha de vencimento {1}
 DocType: Vehicle Log,Odometer,Conta-km
 DocType: Sales Order Item,Ordered Qty,Qtd Pedida
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,O Item {0} está desativado
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,O Item {0} está desativado
 DocType: Stock Settings,Stock Frozen Upto,Stock Congelado Até
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,A LDM não contém nenhum item em stock
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,A LDM não contém nenhum item em stock
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},As datas do Período De e Período A são obrigatórias para os recorrentes {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Atividade / tarefa do projeto.
 DocType: Vehicle Log,Refuelling Details,Dados de Reabastecimento
@@ -4296,8 +4303,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Não foi encontrada a taxa da última compra
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Montante de Liquidação (Moeda da Empresa)
 DocType: Sales Invoice Timesheet,Billing Hours,Horas de Faturamento
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Não foi encontrado a LDM Padrão para {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Linha #{0}: Por favor, defina a quantidade de reencomenda"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Toque em itens para adicioná-los aqui
 DocType: Fees,Program Enrollment,Inscrição no Programa
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher de Custo de Entrega
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Por favor, defina {0}"
@@ -4321,7 +4329,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data de Manutenção
 DocType: Purchase Invoice Item,Rejected Serial No,Nr. de Série Rejeitado
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,A data de início do ano ou data de término está em sobreposição com {0}. Para evitar isto defina a empresa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"A data de início deve ser anterior à data final, para o Item {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},"A data de início deve ser anterior à data final, para o Item {0}"
 DocType: Item,"Example: ABCD.#####
 If series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.","Exemplo: ABCD ##### Se a série está configurada e o Nr. de Série não é mencionado nas transações, então será criado um número de série automático com base nesta série. Se sempre quis mencionar explicitamente os Números de Série para este item, deixe isto em branco."
 DocType: Upload Attendance,Upload Attendance,Carregar Assiduidade
@@ -4357,8 +4365,8 @@
 apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,As definições padrão para as transações contabilísticas.
 DocType: Maintenance Visit,MV,MV
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,A Data Prevista não pode ser anterior à Data de Solicitação de Materiais
-DocType: Purchase Invoice Item,Stock Qty,Quantidade de estoque
-DocType: Purchase Invoice Item,Stock Qty,Quantidade de estoque
+DocType: Purchase Invoice Item,Stock Qty,Quantidade de stock
+DocType: Purchase Invoice Item,Stock Qty,Quantidade de Stock
 DocType: Production Order,Source Warehouse (for reserving Items),Origem do Warehouse (para reserva de Itens)
 DocType: Employee Loan,Repayment Period in Months,Período de reembolso em meses
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,Erro: Não é uma ID válida?
@@ -4398,7 +4406,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Retalho e Grosso
 DocType: Issue,First Responded On,Primeira Resposta Em
 DocType: Website Item Group,Cross Listing of Item in multiple groups,A Lista Cruzada do Item em vários grupos
-DocType: Grade Interval,Grade Interval,Intervalo de Classe
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},A Data de Início do Ano Fiscal e a Data de Término do Ano Fiscal já está definida no Ano Fiscal de {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Data de Liquidação atualizada
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Lote dividido
@@ -4445,14 +4452,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Deixe desmarcada se você não quiser considerar lote ao fazer cursos com base grupos.
 DocType: Asset,Frequency of Depreciation (Months),Frequência de Depreciação (Meses)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Conta de Crédito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Conta de Crédito
 DocType: Landed Cost Item,Landed Cost Item,Custo de Entrega do Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Mostrar valores de zero
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,A quantidade do item obtido após a fabrico / reembalagem de determinadas quantidades de matérias-primas
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Instalar um website simples para a minha organização
 DocType: Payment Reconciliation,Receivable / Payable Account,Conta A Receber / A Pagar
 DocType: Delivery Note Item,Against Sales Order Item,No Item da Ordem de Venda
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Por favor, especifique um Valor de Atributo para o atributo {0}"
 DocType: Item,Default Warehouse,Armazém Padrão
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},O Orçamento não pode ser atribuído à Conta de Grupo {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Por favor, insira o centro de custos principal"
@@ -4490,13 +4497,13 @@
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,"O Prazo de Data Final não pode ser anterior ao Prazo de Data de Início. Por favor, corrija as datas e tente novamente."
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de quot
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,Contagem de quot
-,BOM Stock Report,BOM Relatório de estoque
+,BOM Stock Report,Relatório de stock da LDM
 DocType: Stock Reconciliation Item,Quantity Difference,Diferença de Quantidade
 apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,A Processar Salários
 DocType: Opportunity Item,Basic Rate,Taxa Básica
 DocType: GL Entry,Credit Amount,Montante de Crédito
 DocType: Cheque Print Template,Signatory Position,Posição do Signatário
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Defenir como Perdido
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Defenir como Perdido
 DocType: Timesheet,Total Billable Hours,Total de Horas Trabalhadas
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Nota de Recibo de Pagamento
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Isto é baseado em operações neste cliente. Veja cronograma abaixo para obter mais detalhes
@@ -4510,11 +4517,11 @@
 ,Items To Be Requested,Items a Serem Solicitados
 DocType: Purchase Order,Get Last Purchase Rate,Obter Última Taxa de Compra
 DocType: Company,Company Info,Informações da Empresa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selecionar ou adicionar novo cliente
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Selecionar ou adicionar novo cliente
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,centro de custo é necessário reservar uma reivindicação de despesa
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicação de Fundos (Ativos)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Esta baseia-se na assiduidade deste Funcionário
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Conta de Débito
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Conta de Débito
 DocType: Fiscal Year,Year Start Date,Data de Início do Ano
 DocType: Attendance,Employee Name,Nome do Funcionário
 DocType: Sales Invoice,Rounded Total (Company Currency),Total Arredondado (Moeda da Empresa)
@@ -4523,13 +4530,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Impeça os utilizadores de efetuar Pedidos de Licença nos dias seguintes.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Montante de Compra
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Cotação de Fornecedor {0} criada
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,O Fim do Ano não pode ser antes do Início do Ano
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Benefícios do Funcionário
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},A quantidade embalada deve ser igual à quantidade do Item {0} na linha {1}
 DocType: Production Order,Manufactured Qty,Qtd Fabricada
 DocType: Purchase Receipt Item,Accepted Quantity,Quantidade Aceite
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Por favor, defina uma Lista de Feriados padrão para o(a) Funcionário(a) {0} ou para a Empresa {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} não existe
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} não existe
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Contas levantadas a Clientes.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ID de Projeto
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Linha Nr. {0}: O valor não pode ser superior ao Montante Pendente no Reembolso de Despesas {1}. O Montante Pendente é {2}
@@ -4538,15 +4545,17 @@
 DocType: Quality Inspection Reading,Reading 3,Leitura 3
 ,Hub,Plataforma
 DocType: GL Entry,Voucher Type,Tipo de Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista de Preços não encontrada ou desativada
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Lista de Preços não encontrada ou desativada
 DocType: Employee Loan Application,Approved,Aprovado
 DocType: Pricing Rule,Price,Preço
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"O Funcionário dispensado em {0} deve ser definido como ""Saiu"""
 DocType: Guardian,Guardian,Responsável
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Foi criada a Avaliação {0} para o Funcionário{1} no intervalo de datas determinado
 DocType: Employee,Education,Educação
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Nome da Campanha Dado Por
 DocType: Employee,Current Address Is,O Endereço Atual É
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Modificado
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opcional. Define a moeda padrão da empresa, se não for especificada."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Registo de Lançamentos Contabilísticos.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qtd Disponível Do Armazém
@@ -4555,7 +4564,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Linha {0}: A Parte / Conta não corresponde a {1} / {2} em {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Por favor, insira a Conta de Despesas"
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Linha {0}: O tipo de documento referênciado deve ser uma Ordem de Compra, uma Fatura de Compra ou um Lançamento Contabilístico"
 DocType: Employee,Current Address,Endereço Atual
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Se o item for uma variante doutro item, então, a descrição, a imagem, os preços, as taxas, etc. serão definidos a partir do modelo, a menos que seja explicitamente especificado o contrário"
 DocType: Serial No,Purchase / Manufacture Details,Dados de Compra / Fabrico
@@ -4583,7 +4592,7 @@
 DocType: Hub Settings,Hub Settings,Definições da Plataforma
 DocType: Project,Gross Margin %,Margem Bruta %
 DocType: BOM,With Operations,Com Operações
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Já foram efetuados lançamentos contabilísticos na moeda {0} para a empresa {1}. Por favor, selecione uma conta a receber ou a pagar com a moeda {0}."
 DocType: Asset,Is Existing Asset,É um Ativo Existente
 DocType: Salary Detail,Statistical Component,Componente estatística
 DocType: Salary Detail,Statistical Component,Componente estatística
@@ -4607,7 +4616,7 @@
 DocType: Assessment Plan,Room,Quarto
 DocType: Purchase Order,Advance Paid,Adiantamento Pago
 DocType: Item,Item Tax,Imposto do Item
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material para o Fornecedor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material para o Fornecedor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Fatura de Imposto Especial
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% aparece mais de uma vez
 DocType: Expense Claim,Employees Email Id,ID de Email de Funcionários
@@ -4636,11 +4645,11 @@
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +6,You must Save the form before proceeding,Deve Guardar o formulário antes de continuar
 DocType: Item Attribute,Numeric Values,Valores Numéricos
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Anexar Logótipo
-apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Os níveis de estoque
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Níveis de stock
 DocType: Customer,Commission Rate,Taxa de Comissão
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Criar Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Criar Variante
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Bloquear pedidos de licença por departamento.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","O Tipo de Pagamento deve ser Receber, Pagar ou Transferência Interna"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","O Tipo de Pagamento deve ser Receber, Pagar ou Transferência Interna"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Análise
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,O Carrinho está Vazio
 DocType: Vehicle,Model,Modelo
@@ -4651,6 +4660,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Permitir Produção nas Férias
 DocType: Sales Order,Customer's Purchase Order Date,Data de Ordem de Compra do Cliente
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Social
+DocType: Shopping Cart Settings,Show Public Attachments,Mostrar anexos públicos
 DocType: Packing Slip,Package Weight Details,Dados de Peso do Pacote
 DocType: Payment Gateway Account,Payment Gateway Account,Conta de Portal de Pagamento
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,"Após o pagamento ter sido efetuado, redireciona o utilizador para a página selecionada."
@@ -4669,15 +4679,15 @@
 DocType: Batch,Expiry Date,Data de Validade
 ,Supplier Addresses and Contacts,Contactos e Endereços de Fornecedores
 ,accounts-browser,navegador-de-contas
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Por favor, selecione primeiro a Categoria"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Por favor, selecione primeiro a Categoria"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Definidor de Projeto.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Para permitir que o excesso de faturamento ou excesso de pedidos, atualize a ""Provisão"" nas Definições de Stock ou do Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Não mostrar qualquer símbolo como $ ao lado das moedas.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Meio Dia)
 DocType: Supplier,Credit Days,Dias de Crédito
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Criar Classe de Estudantes
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Criar Classe de Estudantes
 DocType: Leave Type,Is Carry Forward,É para Continuar
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obter itens da LDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obter itens da LDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dias para Chegar ao Armazém
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Linha #{0}: A Data de Postagem deve ser igual à data de compra {1} do ativo {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Insira as Ordens de Venda na tabela acima
@@ -4694,8 +4704,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Quantidade Sancionada
 DocType: GL Entry,Is Opening,Está a Abrir
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Linha {0}: Um registo de débito não pode ser vinculado a {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Configure as séries de numeração para Atendimento via Configuração&gt; Série de numeração
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,A conta {0} não existe
 DocType: Account,Cash,Numerário
 DocType: Employee,Short biography for website and other publications.,Breve biografia para o website e outras publicações.
diff --git a/erpnext/translations/ro.csv b/erpnext/translations/ro.csv
index e5694eb..38eff73 100644
--- a/erpnext/translations/ro.csv
+++ b/erpnext/translations/ro.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Închiriate
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Aplicabil pentru utilizator
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Oprit comandă de producție nu poate fi anulat, acesta unstop întâi pentru a anula"
 DocType: Vehicle Service,Mileage,distanță parcursă
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Chiar vrei să resturi acest activ?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Selectați Furnizor implicit
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Selectați Furnizor implicit
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Moneda este necesară pentru lista de prețuri {0}
 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
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Restante pentru {0} nu poate fi mai mică decât zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Implicit 10 minute
 DocType: Leave Type,Leave Type Name,Denumire Tip Concediu
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Afișați deschis
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Afișați deschis
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Seria Actualizat cu succes
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Verifică
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Jurnal de intrare Introdus
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Lot Articol Stare de expirare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Ciorna bancară
 DocType: Mode of Payment Account,Mode of Payment Account,Modul de cont de plăți
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Arată Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Arată Variante
 DocType: Academic Term,Academic Term,termen academic
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Cantitate
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Cantitate
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Planul de conturi nu poate fi gol.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Imprumuturi (Raspunderi)
 DocType: Employee Education,Year of Passing,Ani de la promovarea
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referință:% s, Postul Cod:% s și Client:% s"
 DocType: Item,Country of Origin,Tara de origine
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,În Stoc
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Probleme deschise
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Servicii de Sanatate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Întârziere de plată (zile)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Cheltuieli de serviciu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Factură
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numărul de serie: {0} este deja menționat în factura de vânzare: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Factură
 DocType: Maintenance Schedule Item,Periodicity,Periodicitate
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Anul fiscal {0} este necesară
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Data estimată de livrare este înainte de a fi comandă de vânzări Data
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Atașați fișier .csv cu două coloane, una pentru denumirea veche și unul pentru denumirea nouă"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} nu se gaseste in niciun an fiscal activ.
 DocType: Packed Item,Parent Detail docname,Părinte Detaliu docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referință: {0}, Cod articol: {1} și Client: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Buturuga
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Deschidere pentru un loc de muncă.
 DocType: Item Attribute,Increment,Creștere
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Selectați Depozit ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Selectați Depozit ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Publicitate
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Obține elemente din
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nu este permisă {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Obține elemente din
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock nu poate fi actualizat împotriva livrare Nota {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produs {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nu sunt enumerate elemente
 DocType: Payment Reconciliation,Reconcile,Reconcilierea
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Băcănie
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,Asigurați-Bank intrare
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Fondurile de pensii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,În continuare Amortizarea Data nu poate fi înainte Data achiziției
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,În continuare Amortizarea Data nu poate fi înainte Data achiziției
 DocType: SMS Center,All Sales Person,Toate persoanele de vânzăril
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Lunar Distribuție ** vă ajută să distribuie bugetul / Target peste luni dacă aveți sezonier în afacerea dumneavoastră.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nu au fost găsite articole
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nu au fost găsite articole
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Structura de salarizare lipsă
 DocType: Lead,Person Name,Nume persoană
 DocType: Sales Invoice Item,Sales Invoice Item,Factură de vânzări Postul
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","de exemplu, &quot;Școala primară&quot; sau &quot;Universitatea&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Rapoarte de stoc
 DocType: Warehouse,Warehouse Detail,Depozit Detaliu
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Limita de credit a fost trecut de client {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Pe termen Data de încheiere nu poate fi mai târziu de Anul Data de încheiere a anului universitar la care este legat termenul (anului universitar {}). Vă rugăm să corectați datele și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Este activ fix"" nu poate fi debifată deoarece există informații împotriva produsului"
 DocType: Vehicle Service,Brake Oil,Ulei de frână
 DocType: Tax Rule,Tax Type,Tipul de impozitare
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nu sunteți autorizat să adăugați sau să actualizați intrări înainte de {0}
 DocType: BOM,Item Image (if not slideshow),Imagine Articol (dacă nu exista prezentare)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Există un client cu același nume
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Tarif orar / 60) * Timp efectiv de operare
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Selectați BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Selectați BOM
 DocType: SMS Log,SMS Log,SMS Conectare
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Costul de articole livrate
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Vacanta pe {0} nu este între De la data si pana in prezent
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,școli
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nici o înregistrare de concediu găsite pentru angajat {0} pentru {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Va rugam sa introduceti prima companie
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Vă rugăm să selectați Company primul
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Țintă pe
 DocType: BOM,Total Cost,Cost total
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Suma Cerere
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,grup de clienți dublu exemplar găsit în tabelul grupului cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizor Tip / Furnizor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Furnizor Tip / Furnizor
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Consumabile
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,calitate
 DocType: Sales Invoice Item,Delivered By Supplier,Livrate de Furnizor
 DocType: SMS Center,All Contact,Toate contactele
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Comanda de producție deja creat pentru toate elementele cu BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Salariu anual
 DocType: Daily Work Summary,Daily Work Summary,Sumar zilnic de lucru
 DocType: Period Closing Voucher,Closing Fiscal Year,Închiderea Anului Fiscal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} este blocat
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} este blocat
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vă rugăm să selectați Companie pentru crearea Existent Plan de conturi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Cheltuieli stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Selectați Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra intrare
 DocType: Journal Entry Account,Credit in Company Currency,Credit în companie valutar
 DocType: Delivery Note,Installation Status,Starea de instalare
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Doriți să actualizați prezență? <br> Prezent: {0} \ <br> Absent: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Cant acceptată + respinsă trebuie să fie egală cu cantitatea recepționată pentru articolul {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Materii prime de alimentare pentru cumparare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesară pentru POS factură.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Cel puțin un mod de plată este necesară pentru POS factură.
 DocType: Products Settings,Show Products as a List,Afișare produse ca o listă
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Descărcați șablonul, umple de date corespunzătoare și atașați fișierul modificat.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Asigurați-vă Amortizarea Intrare
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Cerere tip
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Asigurați-angajat
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Asigurați-angajat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transminiune
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Executie
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detalii privind operațiunile efectuate.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planul de de vizite de întreținere.
 DocType: SMS Settings,Enter url parameter for message,Introduceți parametru url pentru mesaj
 DocType: POS Profile,Customer Groups,grupurile de clienti
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Situațiile financiare
 DocType: Guardian,Students,Elevi
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Normele de aplicare de stabilire a prețurilor și de scont.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista de prețuri trebuie să fie aplicabilă pentru cumpărarea sau vânzarea de
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Suma avans nu poate fi mai mare decât {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista de serie pentru această tranzacție
 DocType: Company,Default Payroll Payable Account,Implicit Salarizare cont de plati
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Actualizare e-mail Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Actualizare e-mail Group
 DocType: Sales Invoice,Is Opening Entry,Deschiderea este de intrare
 DocType: Customer Group,Mention if non-standard receivable account applicable,Menționa dacă non-standard de cont primit aplicabil
 DocType: Course Schedule,Instructor Name,Nume instructor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Pentru Depozit este necesar înainte de Inregistrare
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Primit la
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Dacă este bifată, va include și non-stoc produse în cererile de materiale."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Comparativ articolului facturii de vânzări
 ,Production Orders in Progress,Comenzile de producție în curs de desfășurare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Numerar net din Finantare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage este plin, nu a salvat"
 DocType: Lead,Address & Contact,Adresă și contact
 DocType: Leave Allocation,Add unused leaves from previous allocations,Adauga frunze neutilizate de alocări anterioare
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Urmatoarea recurent {0} va fi creat pe {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Suma totală de calculație a costurilor (prin timp Sheet)
 DocType: Item Website Specification,Item Website Specification,Specificație Site Articol
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Concediu Blocat
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Intrările bancare
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Articolul {0} a ajuns la sfârșitul cliclului sau de viață in {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Intrările bancare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Anual
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock reconciliere Articol
 DocType: Stock Entry,Sales Invoice No,Factură de vânzări Nu
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Publica in Hub
 DocType: Student Admission,Student Admission,Admiterea studenților
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Articolul {0} este anulat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Cerere de material
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Articolul {0} este anulat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Cecuri restante și pentru a șterge Depozite
 DocType: Item,Synced With Hub,Sincronizat cu Hub
 DocType: Vehicle,Fleet Manager,Manager de flotă
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nu poate fi negativ pentru elementul {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Parola Gresita
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nu poate fi negativ pentru elementul {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Parola Gresita
 DocType: Item,Variant Of,Varianta de
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Finalizat Cantitate nu poate fi mai mare decât ""Cantitate de Fabricare"""
 DocType: Period Closing Voucher,Closing Account Head,Închidere Cont Principal
 DocType: Employee,External Work History,Istoricul lucrului externă
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Eroare de referință Circular
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Notifica prin e-mail la crearea de cerere automată Material
 DocType: Journal Entry,Multi Currency,Multi valutar
 DocType: Payment Reconciliation Invoice,Invoice Type,Factura Tip
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Nota de Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Nota de Livrare
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Configurarea Impozite
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Costul de active vândute
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
-DocType: Grade Interval,Min Score,min Scor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} a fost introdus de două ori în taxa articolului
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Rezumat pentru această săptămână și a activităților în curs
 DocType: Student Applicant,Admitted,A recunoscut că
 DocType: Workstation,Rent Cost,Chirie Cost
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Valoarea comenzii
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,tranzacții bancare / numerar contra partidului sau pentru transfer intern
 DocType: Shipping Rule,Valid for Countries,Valabil pentru țările
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Acest post este un șablon și nu pot fi folosite în tranzacții. Atribute articol vor fi copiate pe în variantele cu excepția cazului în este setat ""Nu Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Comanda total Considerat
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Desemnare angajat (de exemplu, CEO, director, etc)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Va rugam sa introduceti ""Repeat la zi a lunii"" valoare de câmp"
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rând # {0}: Achiziția Factura nu poate fi făcută împotriva unui activ existent {1}
 DocType: Item Tax,Tax Rate,Cota de impozitare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} deja alocate pentru Angajat {1} pentru perioada {2} {3} pentru a
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Selectați articol
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Selectați articol
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Factura de cumpărare {0} este deja depusă
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Lot nr trebuie să fie aceeași ca și {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Converti la non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lotul (lot) unui articol.
 DocType: C-Form Invoice Detail,Invoice Date,Data facturii
 DocType: GL Entry,Debit Amount,Suma debit
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nu poate fi doar un cont per companie în {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Vă rugăm să consultați atașament
 DocType: Purchase Order,% Received,% Primit
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Creați Grupurile de studenți
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Cerere de ofertă
 DocType: Salary Slip Timesheet,Working Hours,Ore de lucru
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Schimbați secventa de numar de inceput / curent a unei serii existente.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Creați un nou client
-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.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Creare comenzi de aprovizionare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Creați un nou client
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","În cazul în care mai multe reguli de stabilire a prețurilor continuă să prevaleze, utilizatorii sunt rugați să setați manual prioritate pentru a rezolva conflictul."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Creare comenzi de aprovizionare
 ,Purchase Register,Cumpărare Inregistrare
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Taxe aplicabile
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) trebuie să dețină rolul ""aprobator concediu"""
 DocType: Purchase Receipt,Vehicle Date,Vehicul Data
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Motiv pentru a pierde
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Motiv pentru a pierde
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Plumb Proprietarul nu poate fi aceeași ca de plumb
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Suma alocată poate nu este mai mare decât valoarea brută
 DocType: Announcement,Receiver,Receptor
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Cantitatea și rata
 DocType: Delivery Note,% Installed,% Instalat
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Classrooms / Laboratoare, etc, unde prelegeri pot fi programate."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Va rugam sa introduceti numele companiei în primul rând
 DocType: Purchase Invoice,Supplier Name,Furnizor Denumire
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Citiți manualul ERPNext
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Domeniu obligatoriu - An universitar
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Domeniu obligatoriu - An universitar
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Particulariza textul introductiv, care merge ca o parte din acel email. Fiecare tranzacție are un text introductiv separat."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Ați setat contul de plată implicit pentru compania {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Setările globale pentru toate procesele de producție.
 DocType: Accounts Settings,Accounts Frozen Upto,Conturile sunt Blocate Până la
 DocType: SMS Log,Sent On,A trimis pe
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} selectat de mai multe ori în tabelul Atribute
 DocType: HR Settings,Employee record is created using selected field. ,Inregistrarea angajatului este realizata prin utilizarea campului selectat.
 DocType: Sales Order,Not Applicable,Nu se aplică
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Maestru de vacanta.
 DocType: Request for Quotation Item,Required Date,Date necesare
 DocType: Delivery Note,Billing Address,Adresa de facturare
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Vă rugăm să introduceți Cod produs.
 DocType: BOM,Costing,Cost
 DocType: Tax Rule,Billing County,Județ facturare
 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"
@@ -508,6 +512,7 @@
 DocType: Packing Slip,From Package No.,Din Pachetul Nr.
 DocType: Item Attribute,To Range,La gama
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Titluri de valoare și depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metoda de evaluare nu poate fi schimbată, deoarece există tranzacții împotriva anumitor elemente care nu au metoda de evaluare proprie"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Total frunze alocate este obligatorie
 DocType: Job Opening,Description of a Job Opening,Descrierea unei slujbe
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Activități în așteptare pentru ziua de azi
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Selectați cursul
 DocType: Timesheet Detail,Hrs,ore
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vă rugăm să selectați Company
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Vă rugăm să selectați Company
 DocType: Stock Entry Detail,Difference Account,Diferența de Cont
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Nu poate sarcină aproape ca misiune dependente {0} nu este închis.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Va rugam sa introduceti Depozit pentru care va fi ridicat Material Cerere
 DocType: Production Order,Additional Operating Cost,Costuri de operare adiţionale
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Cosmetică
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Pentru a îmbina, următoarele proprietăți trebuie să fie aceeași pentru ambele elemente"
 DocType: Shipping Rule,Net Weight,Greutate netă
 DocType: Employee,Emergency Phone,Telefon de Urgență
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,A cumpara
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vă rugăm să definiți gradul pentru pragul 0%
 DocType: Sales Order,To Deliver,A Livra
 DocType: Purchase Invoice Item,Item,Obiect
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial nici un articol nu poate fi o fracție
 DocType: Journal Entry,Difference (Dr - Cr),Diferența (Dr - Cr)
 DocType: Account,Profit and Loss,Profit și pierdere
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Gestionarea Subcontracte
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Creștere nu poate fi 0
 DocType: Production Planning Tool,Material Requirement,Cerința de material
 DocType: Company,Delete Company Transactions,Ștergeți Tranzacții de Firma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,De referință nr și de referință Data este obligatorie pentru tranzacție bancară
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Adaugaţi / editaţi taxe și cheltuieli
 DocType: Purchase Invoice,Supplier Invoice No,Furnizor Factura Nu
 DocType: Territory,For reference,Pentru referință
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,Instalare Notă Postul
 DocType: Production Plan Item,Pending Qty,Așteptare Cantitate
 DocType: Budget,Ignore,Ignora
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nu este activ
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nu este activ
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS expediat la următoarele numere: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensiunile de instalare pentru imprimare de verificare
 DocType: Salary Slip,Salary Slip Timesheet,Salariu alunecare Pontaj
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,Total de Comisie
 DocType: Pricing Rule,Sales Partner,Partener de vânzări
 DocType: Buying Settings,Purchase Receipt Required,Cumpărare de primire Obligatoriu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Evaluarea Rata este obligatorie în cazul în care a intrat Deschiderea stoc
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nu sunt găsite în tabelul de factură înregistrări
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vă rugăm să selectați Company și Partidul Tip primul
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,An financiar / contabil.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Valorile acumulate
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Realizeaza Comandă de Vânzări
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Realizeaza Comandă de Vânzări
 DocType: Project Task,Project Task,Proiect Sarcina
 ,Lead Id,Id Conducere
 DocType: C-Form Invoice Detail,Grand Total,Total general
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,CV-Atașamentul
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Clienții repetate
 DocType: Leave Control Panel,Allocate,Alocaţi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Vânzări de returnare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Vânzări de returnare
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Notă: Totalul frunzelor alocate {0} nu ar trebui să fie mai mică decât frunzele deja aprobate {1} pentru perioada
 DocType: Announcement,Posted By,Postat de
 DocType: Item,Delivered by Supplier (Drop Ship),Livrate de Furnizor (Drop navelor)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,Citat Pentru a
 DocType: Lead,Middle Income,Venituri medii
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Deschidere (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Suma alocată nu poate fi negativă
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stabiliți compania
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Stabiliți compania
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Vânzări factură Pontaj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Nu referință și de referință Data este necesar pentru {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Selectați Cont de plăți pentru a face Banca de intrare
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Crearea de înregistrări angajaților pentru a gestiona frunze, cheltuieli și salarizare creanțe"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Adaugă în Baza de cunoștințe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Propunere de scriere
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plată Deducerea intrare
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nu există în anul fiscal {2}
 DocType: Buying Settings,Settings for Buying Module,Setări pentru cumparare Modulul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Activ {0} nu aparține companiei {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Va rugam sa introduceti Primirea achiziția
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Va rugam sa introduceti Primirea achiziția
 DocType: Buying Settings,Supplier Naming By,Furnizor de denumire prin
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Schimbarea net în inventar
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Managementul de împrumut Angajat
 DocType: Employee,Passport Number,Numărul de pașaport
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relația cu Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plata De la / la
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Interval de date
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Noua limită de credit este mai mică decât valoarea curentă restante pentru client. Limita de credit trebuie să fie atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,In cateva minute
 DocType: Issue,Resolution Date,Data rezoluție
 DocType: Student Batch Name,Batch Name,Nume lot
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pontajul creat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Pontajul creat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Vă rugăm să setați Cash implicit sau cont bancar în modul de plată {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,A se inscrie
 DocType: Selling Settings,Customer Naming By,Numire Client de catre
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Va arăta studentului așa cum sunt prezente Student Raport lunar de prezență
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,Timpul efectiv de începere
 DocType: BOM Operation,Operation Time,Funcționare Ora
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,finalizarea
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Baza
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Baza
 DocType: Timesheet,Total Billed Hours,Numărul total de ore facturate
 DocType: Journal Entry,Write Off Amount,Scrie Off Suma
 DocType: Journal Entry,Bill No,Factură nr.
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,Participarea studenților
 DocType: Sales Invoice Timesheet,Time Sheet,Fișa de timp
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Materii Prime bazat pe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Va rugam sa introduceti detalii element
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Va rugam sa introduceti detalii element
 DocType: Interest,Interest,Interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Vânzări pre
 DocType: Purchase Receipt,Other Details,Alte detalii
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Plata Intrarea este deja creat
 DocType: Purchase Receipt Item Supplied,Current Stock,Stoc curent
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Rând # {0}: {1} activ nu legat de postul {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Previzualizare Salariu alunecare
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Previzualizare Salariu alunecare
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Contul {0} a fost introdus de mai multe ori
 DocType: Account,Expenses Included In Valuation,Cheltuieli Incluse în Evaluare
 DocType: Hub Settings,Seller City,Vânzător oraș
 ,Absent Student Report,Raport de student absent
 DocType: Email Digest,Next email will be sent on:,E-mail viitor va fi trimis la:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Scrisoare Termen
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element are variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Firma {0} nu există
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Arbore Tip
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Arbore Tip
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Cantitate consumata pe unitatea
 DocType: Serial No,Warranty Expiry Date,Garanție Data expirării
 DocType: Material Request Item,Quantity and Warehouse,Cantitatea și Warehouse
 DocType: Sales Invoice,Commission Rate (%),Rata de Comision (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Selectați Program
 DocType: Project,Estimated Cost,Cost estimat
 DocType: Purchase Order,Link to material requests,Link la cererile de materiale
@@ -768,7 +770,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Suma primită (companie Moneda)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Conducerea trebuie să fie setata dacă Oportunitatea este creata din Conducere
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vă rugăm să selectați zi liberă pe săptămână
 DocType: 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
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Oportunitate de la
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Declarația salariu lunar.
 DocType: BOM,Website Specifications,Site-ul Specificații
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: de la {0} de tipul {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rând {0}: Factorul de conversie este obligatorie
@@ -837,6 +840,7 @@
 DocType: Employee,Bank A/C No.,Bancă A/C nr.
 DocType: Bank Guarantee,Project,Proiecte
 DocType: Quality Inspection Reading,Reading 7,Lectură 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Comandat parțial
 DocType: Expense Claim Detail,Expense Claim Type,Tip Revendicare Cheltuieli
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Setările implicite pentru Cosul de cumparaturi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Activ casate prin Jurnal de intrare {0}
@@ -844,14 +848,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologie
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Cheltuieli de întreținere birou
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Configurarea contului de e-mail
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Va rugam sa introduceti Articol primul
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Va rugam sa introduceti Articol primul
 DocType: Account,Liability,Răspundere
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sancționat Suma nu poate fi mai mare decât revendicarea Suma în rândul {0}.
 DocType: Company,Default Cost of Goods Sold Account,Implicit Costul cont bunuri vândute
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Lista de prețuri nu selectat
 DocType: Employee,Family Background,Context familial
 DocType: Request for Quotation Supplier,Send Email,Trimiteți-ne email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Atenție: Attachment invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nici o permisiune
 DocType: Company,Default Bank Account,Cont Bancar Implicit
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Pentru a filtra pe baza Party, selectați Party Tip primul"
@@ -864,8 +868,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nu a fost gasit angajat
 DocType: Supplier Quotation,Stopped,Oprita
 DocType: Item,If subcontracted to a vendor,Dacă subcontractat la un furnizor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupul de studenți este deja actualizat.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupul de studenți este deja actualizat.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupul de studenți este deja actualizat.
 DocType: SMS Center,All Customer Contact,Toate contactele clienților
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Încărcați echilibru stoc prin csv.
 DocType: Warehouse,Tree Details,copac Detalii
@@ -876,8 +880,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Factură cantitate minimă
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Cost Center {2} nu aparține Companiei {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Cont {2} nu poate fi un grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus &quot;{DOCTYPE} &#39;masă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Postul rând {IDX}: {DOCTYPE} {DOCNAME} nu există în sus &quot;{DOCTYPE} &#39;masă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Pontajul {0} este deja finalizată sau anulată
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nu există nicio sarcină
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",
 DocType: Asset,Opening Accumulated Depreciation,Deschidere Amortizarea Acumulate
@@ -893,7 +897,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} comparativ cu factura {1} din data de {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Program de curs de
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Program de curs de
 DocType: Maintenance Visit,Completion Status,Stare Finalizare
 DocType: HR Settings,Enter retirement age in years,Introdu o vârsta de pensionare în anii
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Țintă Warehouse
@@ -901,7 +905,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Permiteți peste livrare sau primire pana la acest procent
 DocType: Stock Entry,STE-,sterilizabile
 DocType: Upload Attendance,Import Attendance,Import Spectatori
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Toate grupurile articolului
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Toate grupurile articolului
 DocType: Process Payroll,Activity Log,Jurnal Activitate
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Profit / pierdere net
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Compune în mod automat un mesaj la introducere de tranzacții.
@@ -912,7 +916,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Comandă de aprovizionare de plata
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Proiectat Cantitate
 DocType: Sales Invoice,Payment Due Date,Data scadentă de plată
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postul Varianta {0} există deja cu aceleași atribute
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Deschiderea&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Deschideți To Do
 DocType: Notification Control,Delivery Note Message,Nota de Livrare Mesaj
@@ -928,7 +932,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-comanda Cantitate
 DocType: Leave Block List Date,Leave Block List Date,Data Lista Concedii Blocate
 DocType: Pricing Rule,Price or Discount,Preț sau Reducere
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Taxe totale aplicabile în tabelul de achiziție Chitanță Elementele trebuie să fie la fel ca total impozite și taxe
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Taxe totale aplicabile în tabelul de achiziție Chitanță Elementele trebuie să fie la fel ca total impozite și taxe
 DocType: Sales Team,Incentives,Stimulente
 DocType: SMS Log,Requested Numbers,Numere solicitate
 DocType: Production Planning Tool,Only Obtain Raw Materials,Se obține numai Materii prime
@@ -957,13 +961,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Este subcontractată
 DocType: Item Attribute,Item Attribute Values,Valori Postul Atribut
 DocType: Examination Result,Examination Result,examinarea Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Primirea de cumpărare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Primirea de cumpărare
 ,Received Items To Be Billed,Articole primite Pentru a fi facturat
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Depuse Alunecările salariale
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Maestru cursului de schimb valutar.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referință Doctype trebuie să fie una dintre {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referință Doctype trebuie să fie una dintre {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Imposibilitatea de a găsi timp Slot în următorii {0} zile pentru Operațiunea {1}
 DocType: Production Order,Plan material for sub-assemblies,Material Plan de subansambluri
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Parteneri de vânzări și teritoriu
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Nu se poate crea în mod automat Contul deoarece există deja sold stoc în cont. Trebuie să creați un cont de potrivire înainte de a putea face o intrare pe acest depozit
@@ -986,10 +990,9 @@
 DocType: Supplier,Default Payable Accounts,Implicit conturi de plătit
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Angajatul {0} nu este activ sau nu există
 DocType: Fee Structure,Components,Componente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postul variante {0} actualizat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vă rugăm să introduceți activ Categorie la postul {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Can not {0} {1} {2} fără nici o factură negativă restante
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Factura de cumpărare în avans
 DocType: Hub Settings,Sync Now,Sincronizare acum
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rând {0}: intrare de credit nu poate fi legat de o {1}
@@ -1003,11 +1006,11 @@
 DocType: Item,Is Purchase Item,Este de cumparare Articol
 DocType: Asset,Purchase Invoice,Factura de cumpărare
 DocType: Stock Ledger Entry,Voucher Detail No,Detaliu voucher Nu
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Noua factură de vânzări
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Noua factură de vânzări
 DocType: Stock Entry,Total Outgoing Value,Valoarea totală de ieșire
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Deschiderea și data inchiderii ar trebui să fie în același an fiscal
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Deschiderea și data inchiderii ar trebui să fie în același an fiscal
 DocType: Lead,Request for Information,Cerere de informații
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sincronizare offline Facturile
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sincronizare offline Facturile
 DocType: Payment Request,Paid,Plătit
 DocType: Program Fee,Program Fee,Taxa de program
 DocType: Salary Slip,Total in words,Total în cuvinte
@@ -1017,7 +1020,7 @@
 DocType: Employee Loan,Sanctioned,consacrat
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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ă."
 DocType: Job Opening,Publish on website,Publica pe site-ul
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Transporturile către clienți.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Furnizor Data facturii nu poate fi mai mare decât postare Data
@@ -1028,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variație
 ,Company Name,Denumire Furnizor
 DocType: SMS Center,Total Message(s),Total mesaj(e)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Selectați Element de Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1039,8 +1042,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default cont bancar / numerar vor fi actualizate automat în Jurnalul de intrare a salariului când este selectat acest mod.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervalele de cod Grad {0} se suprapune cu intervalele de grad pentru alte clase. Vă rugăm să verificați intervalele de {0} și {1} și încercați din nou
 DocType: BOM,Raw Material Cost(Company Currency),Brut Costul materialelor (companie Moneda)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Toate articolele acestei comenzi de producție au fost deja transferate.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Rândul # {0}: Rata nu poate fi mai mare decât rata folosită în {1} {2}
@@ -1053,14 +1054,14 @@
 DocType: BOM Website Item,BOM Website Item,Site-ul BOM Articol
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Încărcați capul scrisoare și logo-ul. (Le puteți edita mai târziu).
 DocType: Timesheet Detail,Bill,Factură
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,În continuare Amortizarea Data este introdusă ca dată rămas singur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,În continuare Amortizarea Data este introdusă ca dată rămas singur
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Alb
 DocType: SMS Center,All Lead (Open),Toate articolele de top (deschise)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rândul {0}: Cant nu este disponibil pentru {4} în depozit {1} în postarea momentul înscrierii ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Obtine Avansurile Achitate
 DocType: Item,Automatically Create New Batch,Crearea automată a lotului nou
 DocType: Item,Automatically Create New Batch,Crearea automată a lotului nou
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Realizare
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Realizare
 DocType: Student Admission,Admission Start Date,Admitere Data de începere
 DocType: Journal Entry,Total Amount in Words,Suma totală în cuvinte
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,A aparut o eroare. Un motiv probabil ar putea fi că nu ați salvat formularul. Vă rugăm să contactați iulianolaru@ollala.ro dacă problema persistă.
@@ -1068,7 +1069,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vă rugăm să introduceți cont pentru Schimbare Sumă
 DocType: Student Batch Name,Student Batch Name,Nume elev Lot
 DocType: Holiday List,Holiday List Name,Denumire Lista de Vacanță
 DocType: Repayment Schedule,Balance Loan Amount,Soldul Suma creditului
@@ -1088,10 +1089,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vă rugăm să specificați un {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Articole eliminate cu nici o schimbare în cantitate sau de valoare.
 DocType: Delivery Note,Delivery To,De Livrare la
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabelul atribut este obligatoriu
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabelul atribut este obligatoriu
 DocType: Production Planning Tool,Get Sales Orders,Obține comenzile de vânzări
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nu poate fi negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Reducere
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Reducere
 DocType: Asset,Total Number of Depreciations,Număr total de Deprecieri
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
 DocType: Sales Invoice Item,Rate With Margin,Rate cu marjă
@@ -1107,7 +1108,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervat Warehouse în Vânzări Ordine / Produse finite Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Vanzarea Suma
 DocType: Repayment Schedule,Interest Amount,Suma Dobânda
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Sunteți aprobator cheltuieli pentru acest record. Vă rugăm Actualizați ""statutul"" și Salvare"
 DocType: Serial No,Creation Document No,Creare Document Nr.
 DocType: Issue,Issue,Problema
 DocType: Asset,Scrapped,dezmembrate
@@ -1115,12 +1116,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributele pentru variante articol. de exemplu  dimensiune, culoare etc."
 DocType: Purchase Invoice,Returns,Se intoarce
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Depozit
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Nu {0} este sub contract de întreținere pana {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Recrutare
 DocType: Lead,Organization Name,Numele organizației
 DocType: Tax Rule,Shipping State,Stat de transport maritim
 ,Projected Quantity as Source,Cantitatea ca sursă proiectată
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Includ elemente non-stoc
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Cheltuieli de vânzare
@@ -1128,12 +1129,12 @@
 DocType: GL Entry,Against,Comparativ
 DocType: Item,Default Selling Cost Center,Centru de Cost Vanzare Implicit
 DocType: Sales Partner,Implementation Partner,Partener de punere în aplicare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Cod postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Cod postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Comandă de vânzări {0} este {1}
 DocType: Opportunity,Contact Info,Informaţii Persoana de Contact
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Efectuarea de stoc Entries
 DocType: Packing Slip,Net Weight UOM,Greutate neta UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Rezultate
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Rezultate
 DocType: Item,Default Supplier,Furnizor Implicit
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Peste producție Reduceri Procentaj
 DocType: Employee Loan,Repayment Schedule,rambursare Program
@@ -1141,7 +1142,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Obtine Perioada Libera Saptamanala
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Data de Incheiere nu poate fi anterioara Datei de Incepere
 DocType: Sales Person,Select company name first.,Selectați numele companiei în primul rând.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Cotatiilor primite de la furnizori.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Pentru a {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Vârstă medie
@@ -1160,7 +1161,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Domeniu de Performanță Cheie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atribut nevalid
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} trebuie să fie introdus
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Cantitatea trebuie sa fie mai mic sau egal cu {0}
 DocType: SMS Center,Total Characters,Total de caractere
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vă rugăm să selectați BOM BOM în domeniu pentru postul {0}
@@ -1171,7 +1172,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 +224,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 +52,Please set 'Apply Additional Discount On',Vă rugăm să setați &quot;Aplicați discount suplimentar pe&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Din Gama trebuie să fie mai mică de la gama
 DocType: Global Defaults,Global Defaults,Valori Implicite Globale
@@ -1181,7 +1182,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Anul de începere
 DocType: Purchase Invoice,Start date of current invoice's period,Data perioadei de factura de curent începem
 DocType: Salary Slip,Leave Without Pay,Concediu Fără Plată
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Capacitate de eroare de planificare
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1196,7 +1197,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Acest lucru va fi adăugat la Codul punctul de varianta. De exemplu, în cazul în care abrevierea este ""SM"", iar codul produs face ""T-SHIRT"", codul punctul de varianta va fi ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Pay net (în cuvinte) vor fi vizibile după ce salvați fluturasul de salariu.
 DocType: Purchase Invoice,Is Return,Este de returnare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Returnare / debit Notă
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Returnare / debit Notă
 DocType: Price List Country,Price List Country,Lista de preturi Țară
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} numere de serie valabile pentru articolul {1}
@@ -1206,11 +1207,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vă rugăm să introduceți codul de articol pentru a obține numărul de lot
 DocType: Stock Settings,Default Item Group,Group Articol Implicit
 DocType: Employee Loan,Partially Disbursed,parţial Se eliberează
-DocType: Grading Structure,Grading System Name,Nume sistem de clasificare a
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Baza de date furnizor.
 DocType: Account,Balance Sheet,Bilant
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Centrul de cost pentru postul cu codul Postul '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Modul de plată nu este configurat. Vă rugăm să verificați, dacă contul a fost setat pe modul de plăți sau la POS Profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Persoană de vânzări va primi un memento la această dată pentru a lua legătura cu clientul
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Același articol nu poate fi introdus de mai multe ori.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Conturile suplimentare pot fi făcute sub Groups, dar intrările pot fi făcute împotriva non-Grupuri"
@@ -1222,7 +1222,7 @@
 ,Purchase Order Items To Be Billed,Cumparare Ordine Articole Pentru a fi facturat
 DocType: Purchase Invoice Item,Net Rate,Rata netă
 DocType: Purchase Invoice Item,Purchase Invoice Item,Factura de cumpărare Postul
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stocul Ledger Înscrieri și GL intrările sunt postate pentru selectate Veniturile achiziție
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stocul Ledger Înscrieri și GL intrările sunt postate pentru selectate Veniturile achiziție
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postul 1
 DocType: Holiday,Holiday,Vacanță
 DocType: Support Settings,Close Issue After Days,Închide Problemă După Zile
@@ -1249,11 +1249,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Activitatea desfășurată
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Vă rugăm să specificați cel puțin un atribut în tabelul Atribute
 DocType: Announcement,All Students,toţi elevii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Postul {0} trebuie să fie un element de bază non-stoc
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Vezi Ledger
 DocType: Grading Scale,Intervals,intervale
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Cel mai devreme
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Există un grup de articole cu aceeaşi denumire, vă rugăm să schimbați denumirea articolului sau să redenumiţi grupul articolului"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Elev mobil Nr
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1292,9 +1292,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Plata salariului de la {0} la {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Nu este autorizat pentru a edita contul congelate {0}
 DocType: Journal Entry,Get Outstanding Invoices,Obtine Facturi Neachitate
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Comandă de vânzări {0} nu este valid
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Comenzile de aprovizionare vă ajuta să planificați și să urmați pe achizițiile dvs.
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Ne pare rău, companiile nu se pot uni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Cantitatea totală de emisie / transfer {0} din solicitarea materialului {1} nu poate fi mai mare decât cantitatea cerută {2} pentru articolul {3}
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
@@ -1317,10 +1317,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Cheltuieli indirecte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rând {0}: Cant este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Agricultură
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sincronizare Date
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sincronizare Date
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Site-ul Image ar trebui să fie un fișier public sau site-ul URL-ul
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Acesta este un grup element rădăcină și nu pot fi editate.
@@ -1337,18 +1337,18 @@
 DocType: Student Group Student,Group Roll Number,Numărul rolurilor de grup
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pentru {0}, numai conturi de credit poate fi legat de o altă intrare în debit"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Totală a tuturor greutăților sarcinii trebuie să fie 1. Ajustați greutățile tuturor sarcinilor de proiect în consecință
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Nota de Livrare {0} nu este introdusa
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Regula de stabilire a prețurilor este selectat în primul rând bazat pe ""Aplicați pe"" teren, care poate fi produs, Grupa de articole sau de brand."
 DocType: Hub Settings,Seller Website,Vânzător Site-ul
 DocType: Item,ITEM-,ARTICOL-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Procentul total alocat pentru echipa de vânzări ar trebui să fie de 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Statutul de producție Ordinul este {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Statutul de producție Ordinul este {0}
 DocType: Appraisal Goal,Goal,Obiectiv
 DocType: Sales Invoice Item,Edit Description,Edit Descriere
 ,Team Updates,echipa Actualizări
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Pentru furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Creați Format imprimare
@@ -1364,7 +1364,7 @@
 DocType: Depreciation Schedule,Journal Entry,Intrare în jurnal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} elemente în curs
 DocType: Workstation,Workstation Name,Stație de lucru Nume
-DocType: Grade Interval,Grade Code,Cod grad
+DocType: Grading Scale Interval,Grade Code,Cod grad
 DocType: POS Item Group,POS Item Group,POS Articol Grupa
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nu aparţine articolului {1}
@@ -1381,7 +1381,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,recurente upto
 DocType: Attendance,HR Manager,Manager Resurse Umane
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vă rugăm să selectați o companie
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vă rugăm să selectați o companie
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege concediu
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizor Data facturii
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Trebuie să activați Cosul de cumparaturi
@@ -1397,7 +1397,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Produse Alimentare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Clasă de uzură 3
 DocType: Maintenance Schedule Item,No of Visits,Nu de vizite
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,marcă de prezență
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,marcă de prezență
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Planul de întreținere {0} există împotriva {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,student inregistrat
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta contului de închidere trebuie să fie {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Suma de puncte pentru toate obiectivele ar trebui să fie 100. este {0}
@@ -1422,7 +1423,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Ieșire zilnică medie
 DocType: POS Profile,Campaign,Campanie
 DocType: Supplier,Name and Type,Numele și tipul
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Statusul aprobării trebuie să fie ""Aprobat"" sau ""Respins"""
 DocType: Purchase Invoice,Contact Person,Persoană de contact
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Data de început preconizatã' nu poate fi dupa data 'Data de sfârșit anticipatã'
 DocType: Course Scheduling Tool,Course End Date,Desigur Data de încheiere
@@ -1445,14 +1446,15 @@
 DocType: Sales Invoice,Shipping Address Name,Transport Adresa Nume
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,nu poate fi mai mare de 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nu poate fi mai mare de 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Articolul{0} nu este un element de stoc
 DocType: Maintenance Visit,Unscheduled,Neprogramat
 DocType: Employee,Owned,Deținut
 DocType: Salary Detail,Depends on Leave Without Pay,Depinde de concediu fără plată
 DocType: Pricing Rule,"Higher the number, higher the priority","Este mai mare numărul, mai mare prioritate"
 ,Purchase Invoice Trends,Cumpărare Tendințe factură
 DocType: Employee,Better Prospects,Perspective îmbunătăţite
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rândul # {0}: lotul {1} are doar {2} qty. Selectați un alt lot care are {3} qty disponibil sau împărți rândul în mai multe rânduri, pentru a livra / emite din mai multe loturi"
 DocType: Vehicle,License Plate,Înmatriculare
 DocType: Appraisal,Goals,Obiective
 DocType: Warranty Claim,Warranty / AMC Status,Garanție / AMC Starea
@@ -1471,7 +1473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Angajat nu pot raporta la sine.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","În cazul în care contul este blocat, intrările sunt permite utilizatorilor restricționati."
 DocType: Email Digest,Bank Balance,Banca Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Contabilitate de intrare pentru {0}: {1} se poate face numai în valută: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profilul postului, calificări necesare, etc"
 DocType: Journal Entry Account,Account Balance,Soldul contului
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Regula de impozit pentru tranzacțiile.
@@ -1482,7 +1484,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Afișați soldurile L P &amp; anul fiscal unclosed lui
 DocType: Shipping Rule,Shipping Account,Contul de transport maritim
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Cont {2} este inactiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Asigurați-vă Comenzi de vânzări pentru a vă ajuta să planificați munca și să livreze la timp
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Asigurați-vă Comenzi de vânzări pentru a vă ajuta să planificați munca și să livreze la timp
 DocType: Quality Inspection,Readings,Lecturi
 DocType: Stock Entry,Total Additional Costs,Costuri totale suplimentare
 DocType: Course Schedule,SH,SH
@@ -1493,7 +1495,7 @@
 DocType: Shipping Rule Condition,To Value,La valoarea
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Slip de ambalare
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Slip de ambalare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Birou inchiriat
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setări de configurare SMS gateway-ul
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import a eșuat!
@@ -1515,11 +1517,11 @@
 DocType: Company,Services,Servicii
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Salariu Slip angajatului
 DocType: Cost Center,Parent Cost Center,Părinte Cost Center
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Selectați Posibil furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Selectați Posibil furnizor
 DocType: Sales Invoice,Source,Sursă
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Afișează închis
 DocType: Leave Type,Is Leave Without Pay,Este concediu fără plată
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Categoria activ este obligatorie pentru postul de activ fix
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nu sunt găsite în tabelul de plăți înregistrări
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Acest {0} conflicte cu {1} pentru {2} {3}
 DocType: Student Attendance Tool,Students HTML,HTML studenții
@@ -1537,7 +1539,7 @@
 DocType: Student,Date of Leaving,Data Părăsirea
 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/utilities/activation.py +64,Create Leads,Creați Oportunitati
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Creați Oportunitati
 DocType: Maintenance Schedule,Schedules,Orarele
 DocType: Purchase Invoice Item,Net Amount,Cantitate netă
 DocType: Purchase Order Item Supplied,BOM Detail No,Detaliu BOM nr.
@@ -1565,9 +1567,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Inscrierile pentru programul
 DocType: Sales Invoice Item,Brand Name,Denumire marcă
 DocType: Purchase Receipt,Transporter Details,Detalii Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,depozitul implicit este necesar pentru elementul selectat
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Cutie
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,posibil furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,posibil furnizor
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizația
 DocType: Budget,Monthly Distribution,Distributie lunar
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Receptor Lista goala. Vă rugăm să creați Receiver Lista
@@ -1575,8 +1577,8 @@
 DocType: Sales Partner,Sales Partner Target,Vânzări Partner țintă
 DocType: Loan Type,Maximum Loan Amount,Suma maximă a împrumutului
 DocType: Pricing Rule,Pricing Rule,Regula de stabilire a prețurilor
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Numărul de rolă duplicat pentru student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Acțiune în cazul în care anual Buget Depășit
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Cerere de material de cumpărare Ordine
 DocType: Shopping Cart Settings,Payment Success URL,Plată de succes URL
@@ -1598,9 +1600,9 @@
 DocType: Employee Loan,Repayment Method,Metoda de rambursare
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Dacă este bifată, pagina de pornire va fi implicit postul Grupului pentru site-ul web"
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM implicit pentru {0} nu a fost găsit pentru Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM implicit pentru {0} nu a fost găsit pentru Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Cererile pentru cheltuieli companie.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studenții sunt în centrul sistemului, adăugați toți elevii"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studenții sunt în centrul sistemului, adăugați toți elevii"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rând # {0}: Data de lichidare {1} nu poate fi înainte de Cheque Data {2}
 DocType: Company,Default Holiday List,Implicit Listă de vacanță
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rândul {0}: De la timp și Ora {1} se suprapune cu {2}
@@ -1612,21 +1614,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,A doua zi (e) pe care se aplica pentru concediu sunt sărbători. Nu trebuie să se aplice pentru concediu.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Retrimite e-mail de plată
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Sarcina noua
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Face ofertă
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Face ofertă
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,alte rapoarte
 DocType: Dependent Task,Dependent Task,Sarcina dependent
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Factor de Conversie pentru Unitatea de Măsură implicita trebuie să fie 1 pentru inregistrarea {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Concediul de tip {0} nu poate dura mai mare de {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Încercați planificarea operațiunilor de X zile în avans.
 DocType: HR Settings,Stop Birthday Reminders,De oprire de naștere Memento
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Vă rugăm să setați Cont Cheltuieli suplimentare salarizare implicit în companie {0}
 DocType: SMS Center,Receiver List,Receptor Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,căutare articol
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,căutare articol
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Consumat Suma
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Schimbarea net în numerar
 DocType: Assessment Plan,Grading Scale,Scala de notare
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,deja finalizat
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Unitate de măsură {0} a fost introdus mai mult de o dată în Factor de conversie Tabelul
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,deja finalizat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Cerere de plată există deja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Costul de articole emise
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Cantitatea nu trebuie să fie mai mare de {0}
@@ -1658,12 +1660,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Asigurați-debursare de intrare
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance împotriva Furnizor trebuie să fie de debit
 DocType: Company,Default Values,Valori implicite
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Total suma rambursată
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Aceasta se bazează pe bușteni împotriva acestui vehicul. A se vedea calendarul de mai jos pentru detalii
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Colectarea
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Comparativ facturii furnizorului {0} din data {1}
 DocType: Customer,Default Price List,Lista de Prețuri Implicita
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Mișcarea de înregistrare a activelor {0} creat
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nu puteți șterge Anul fiscal {0}. Anul fiscal {0} este setat ca implicit în Setări globale
 DocType: Journal Entry,Entry Type,Tipul de intrare
 ,Customer Credit Balance,Balanța Clienți credit
@@ -1683,7 +1686,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nici unul din elementele au nici o schimbare în cantitate sau de valoare.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Câmp obligatoriu - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Câmp obligatoriu - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garanție revendicarea
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garanție revendicarea
 ,Lead Details,Detalii Conducere
 DocType: Salary Slip,Loan repayment,Rambursare a creditului
 DocType: Purchase Invoice,End date of current invoice's period,Data de încheiere a perioadei facturii curente
@@ -1702,12 +1705,10 @@
 DocType: Employee,Permanent Address,Permanent Adresa
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vă rugăm să selectați codul de articol
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Vă rugăm să selectați codul de articol
 DocType: Student Sibling,Studying in Same Institute,Studiind în același Institut
 DocType: Territory,Territory Manager,Teritoriu Director
 DocType: Packed Item,To Warehouse (Optional),Pentru a Depozit (opțional)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Payment Entry,Paid Amount (Company Currency),Plătit Suma (Compania de valuta)
 DocType: Purchase Invoice,Additional Discount,Discount suplimentar
 DocType: Selling Settings,Selling Settings,Vanzarea Setări
@@ -1717,9 +1718,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Vizualizare Coș
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Cheltuieli de marketing
 ,Item Shortage Report,Raport Articole Lipsa
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Cerere de material utilizat pentru a face acest stoc de intrare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,În continuare Amortizarea Data este obligatoriu pentru nou activ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,În continuare Amortizarea Data este obligatoriu pentru nou activ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separați un grup bazat pe cursuri pentru fiecare lot
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Unitate unică a unui articol.
@@ -1736,9 +1737,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Centru de cost este necesară pentru &quot;profit și pierdere&quot; cont de {2}. Vă rugăm să configurați un centru de cost implicit pentru companie.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Contact nou
 DocType: Territory,Parent Territory,Teritoriul părinte
 DocType: Quality Inspection Reading,Reading 2,Reading 2
@@ -1755,7 +1754,7 @@
 ,Item-wise Sales Register,Registru Vanzari Articol-Avizat
 DocType: Asset,Gross Purchase Amount,Sumă brută Cumpărare
 DocType: Asset,Depreciation Method,Metoda de amortizare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Deconectat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Deconectat
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Este acest fiscală inclusă în rata de bază?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Raport țintă
 DocType: Program Course,Required,Necesar
@@ -1765,21 +1764,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Reconciliere JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Prea multe coloane. Exporta raportul și imprima utilizând o aplicație de calcul tabelar.
 DocType: Purchase Invoice Item,Batch No,Lot nr.
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nu se poate găsi rata de schimb pentru {0} la {1} pentru data cheie {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Permite mai multor comenzi de vânzări împotriva Ordinului de Procurare unui client
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 DocType: Student Group Instructor,Student Group Instructor,Student Grup Instructor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 mobil nr
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Principal
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variantă
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Principal
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variantă
 DocType: Naming Series,Set prefix for numbering series on your transactions,Set prefix pentru seria de numerotare pe tranzacțiile dvs.
 DocType: Employee Attendance Tool,Employees HTML,Angajații HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Implicit BOM ({0}) trebuie să fie activ pentru acest element sau șablon de
 DocType: Employee,Leave Encashed?,Concediu Incasat ?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Oportunitatea de la câmp este obligatoriu
 DocType: Email Digest,Annual Expenses,Cheltuielile anuale
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Realizeaza Comanda de Cumparare
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Realizeaza Comanda de Cumparare
 DocType: SMS Center,Send To,Trimite la
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nu există echilibru concediu suficient pentru concediul de tip {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Suma alocată
@@ -1787,7 +1785,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Cod Articol Client
 DocType: Stock Reconciliation,Stock Reconciliation,Stoc Reconciliere
 DocType: Territory,Territory Name,Teritoriului Denumire
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,De lucru-in-Progress Warehouse este necesară înainte Trimite
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Solicitant pentru un loc de muncă.
 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
@@ -1795,11 +1793,10 @@
 DocType: Item,Serial Nos and Batches,Numere și loturi seriale
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupul Forței Studenților
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupul Forței Studenților
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Comparativ intrării {0} în jurnal nu are nici o intrare nepotrivită {1}
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Cotatie
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Intervale de notare
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Te rog intra
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nu se poate overbill pentru postul {0} în rândul {1} mai mult {2}. Pentru a permite supra-facturare, vă rugăm să setați în Setări de cumpărare"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Vă rugăm să setați filtru bazat pe postul sau depozit
@@ -1811,17 +1808,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} trebuie să fie introdus
 DocType: Authorization Control,Authorization Control,Control de autorizare
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Respins Warehouse este obligatorie împotriva postul respins {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plată
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Gestionați comenzile
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Plată
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Gestionați comenzile
 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
 DocType: Course,Course Abbreviation,Abreviere curs de
 DocType: Student Leave Application,Student Leave Application,Aplicație elev Concediul
 DocType: Item,Will also apply for variants,"Va aplică, de asemenea pentru variante"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Activ nu poate fi anulat, deoarece este deja {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Angajat {0} pe jumătate de zi pe {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Numărul total de ore de lucru nu trebuie sa fie mai mare de ore de lucru max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Pornit
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Set de articole în momemntul vânzării.
 DocType: Quotation Item,Actual Qty,Cant efectivă
 DocType: Sales Invoice Item,References,Referințe
@@ -1831,7 +1829,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ați introdus elemente cu dubluri. Vă rugăm să rectifice și să încercați din nou.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Asociaţi
 DocType: Asset Movement,Asset Movement,Mișcarea activelor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,nou Coș
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,nou Coș
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Articolul {0} nu este un articol serializat
 DocType: SMS Center,Create Receiver List,Creare Lista Recipienti
 DocType: Vehicle,Wheels,roţi
@@ -1863,10 +1861,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Dezactivează crearea de busteni de timp împotriva comenzi de producție. Operațiunile nu trebuie să fie urmărite împotriva producției Ordine
 DocType: Student,Student Mobile Number,Elev Număr mobil
 DocType: Item,Has Variants,Are variante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ați selectat deja un produs de la {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Numele de Distributie lunar
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID-ul lotului este obligatoriu
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID-ul lotului este obligatoriu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID-ul lotului este obligatoriu
 DocType: Sales Person,Parent Sales Person,Mamă Sales Person
 DocType: Purchase Invoice,Recurring Invoice,Factura recurent
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Managementul Proiectelor
@@ -1874,11 +1872,11 @@
 DocType: Budget,Fiscal Year,An Fiscal
 DocType: Vehicle Log,Fuel Price,Preț de combustibil
 DocType: Budget,Budget,Buget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fix elementul de activ trebuie să fie un element de bază non-stoc.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bugetul nu pot fi atribuite în {0}, deoarece nu este un cont venituri sau cheltuieli"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Realizat
 DocType: Student Admission,Application Form Route,Forma de aplicare Calea
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Teritoriu / client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Teritoriu / client
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,de exemplu 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Lasă un {0} Tipul nu poate fi alocată, deoarece este în concediu fără plată"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rândul {0}: Suma alocată {1} trebuie să fie mai mic sau egal cu factura suma restanta {2}
@@ -1898,14 +1896,14 @@
 ,Serial No Status,Serial Nu Statut
 DocType: Payment Entry Reference,Outstanding,remarcabil
 ,Daily Timesheet Summary,Rezumat Pontaj zilnic
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rând {0}: Pentru a stabili {1} periodicitate, diferența între de la și până în prezent \ trebuie să fie mai mare sau egal cu {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Aceasta se bazează pe mișcare stoc. A se vedea {0} pentru detalii
 DocType: Pricing Rule,Selling,De vânzare
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Suma {0} {1} dedusă împotriva {2}
 DocType: Employee,Salary Information,Informațiile de salarizare
 DocType: Sales Person,Name and Employee ID,Nume și ID angajat
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Data Limita nu poate fi anterioara Datei de POstare
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Impozite și taxe
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vă rugăm să introduceți data de referință
@@ -1917,14 +1915,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Nu se poate face referire la un număr de inregistare mai mare sau egal cu numărul curent de inregistrare pentru acest tip de Incasare
 DocType: Asset,Sold,Vândut
 ,Item-wise Purchase History,Istoric Achizitii Articol-Avizat
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Vă rugăm să faceți clic pe ""Generate Program"", pentru a aduce ordine adăugat pentru postul {0}"
 DocType: Account,Frozen,Congelat
 ,Open Production Orders,Comenzi deschis de producție
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Suma de bază (Companie Moneda)
 DocType: Payment Reconciliation Payment,Reference Row,rândul de referință
 DocType: Installation Note,Installation Time,Timp de instalare
 DocType: Sales Invoice,Accounting Details,Contabilitate Detalii
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Ștergeți toate tranzacțiile de acest companie
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investiții
 DocType: Issue,Resolution Details,Rezoluția Detalii
@@ -1957,14 +1955,14 @@
 DocType: Discussion,Discussion,Discuţie
 DocType: Payment Entry,Transaction ID,ID-ul de tranzacție
 DocType: Employee,Resignation Letter Date,Scrisoare de demisie Data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Regulile de stabilire a prețurilor sunt filtrate în continuare în funcție de cantitate.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vă rugăm să setați data de îmbarcare pentru angajat {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Suma totală de facturare (prin timp Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repetați Venituri Clienți
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) trebuie să dețină rolul de ""aprobator cheltuieli"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pereche
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Selectați BOM și Cant pentru producție
 DocType: Asset,Depreciation Schedule,Program de amortizare
 DocType: Bank Reconciliation Detail,Against Account,Comparativ contului
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Jumătate Data zi ar trebui să fie între De la data si pana in prezent
@@ -1978,16 +1976,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Vă rugăm să setați &quot;Activ Center Amortizarea Cost&quot; în companie {0}
 ,Maintenance Schedules,Program de Mentenanta
 DocType: Task,Actual End Date (via Time Sheet),Data de încheiere efectivă (prin Ora Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Suma {0} {1} împotriva {2} {3}
 ,Quotation Trends,Cotație Tendințe
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupa de articole care nu sunt menționate la punctul de master pentru element {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,În așteptarea Suma
 DocType: Purchase Invoice Item,Conversion Factor,Factor de conversie
 DocType: Purchase Order,Delivered,Livrat
 ,Vehicle Expenses,Cheltuielile pentru vehicule
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
+DocType: Serial No,Invoice Details,Detaliile facturii
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Valoarea așteptată după viață utilă trebuie să fie mai mare sau egal cu {0}
 DocType: Purchase Receipt,Vehicle Number,Numărul de vehicule
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,La data la care factura recurente vor fi opri
 DocType: Employee Loan,Loan Amount,Sumă împrumutată
@@ -2006,12 +2005,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,pontaje
 DocType: HR Settings,HR Settings,Setări Resurse Umane
 DocType: Salary Slip,net pay info,info net pay
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Cheltuieli noi
 DocType: Purchase Invoice,Additional Discount Amount,Reducere suplimentară Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rând # {0}: Cant trebuie să fie 1, ca element este un activ fix. Vă rugăm să folosiți rând separat pentru cantitati multiple."
 DocType: Leave Block List Allow,Leave Block List Allow,Permite Lista Concedii Blocate
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nu poate fi gol sau spațiu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup non-grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Nume de împrumut
@@ -2023,6 +2022,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Depozit în cazul în care se menține stocul de articole respinse
 DocType: Production Order,Skip Material Transfer,Transmiteți transferul materialului
 DocType: Production Order,Skip Material Transfer,Transmiteți transferul materialului
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Imposibil de găsit rata de schimb pentru {0} până la {1} pentru data cheie {2}. Creați manual un registru de schimb valutar
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Anul dvs. financiar se încheie pe
 DocType: POS Profile,Price List,Lista de prețuri
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} este acum anul fiscal implicit. Vă rugăm să reîmprospătați browser-ul dvs. pentru ca modificarea să aibă efect.
@@ -2039,19 +2039,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Contul {0} nu este valid. Contul valutar trebuie să fie {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Factor UOM de conversie este necesară în rândul {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie una din comandă de vânzări, vânzări factură sau Jurnal de intrare"
 DocType: Salary Component,Deduction,Deducere
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rândul {0}: De la timp și de Ora este obligatorie.
 DocType: Stock Reconciliation Item,Amount Difference,suma diferenţă
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Articol Preț adăugată pentru {0} în lista de prețuri {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vă rugăm să introduceți ID-ul de angajat al acestei persoane de vânzări
 DocType: Territory,Classification of Customers by region,Clasificarea clienți în funcție de regiune
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Diferența Suma trebuie să fie zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Diferența Suma trebuie să fie zero
 DocType: Project,Gross Margin,Marja Brută
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Va rugam sa introduceti de producție Articol întâi
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Calculat Bank echilibru Declaratie
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,utilizator dezactivat
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Citat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Total de deducere
 ,Production Analytics,Google Analytics de producție
@@ -2060,9 +2060,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Atenție: certificat SSL invalid pe atașament {0}
 DocType: Student Admission,Eligibility,Eligibilitate
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Oportunitati de afaceri ajuta să obțineți, adăugați toate contactele și mai mult ca dvs. conduce"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Oportunitati de afaceri ajuta să obțineți, adăugați toate contactele și mai mult ca dvs. conduce"
 DocType: Production Order Operation,Actual Operation Time,Timp efectiv de funcționare
 DocType: Authorization Rule,Applicable To (User),Aplicabil pentru (utilizator)
 DocType: Purchase Taxes and Charges,Deduct,Deduce
@@ -2077,7 +2077,7 @@
 DocType: Guardian,Work Address,Adresa de
 DocType: Appraisal,Calculate Total Score,Calculaţi scor total
 DocType: Request for Quotation,Manufacturing Manager,Manufacturing Manager de
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Nu {0} este în garanție pana {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Împărțit de livrare Notă în pachete.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Transporturile
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Bilanțul contului ({0}) pentru {1} și valoarea stocului ({2}) pentru depozitul {3} trebuie să fie aceleași
@@ -2099,10 +2099,10 @@
 DocType: Leave Application,Total Leave Days,Total de zile de concediu
 DocType: Email Digest,Note: Email will not be sent to disabled users,Notă: Adresa de email nu va fi trimis la utilizatorii cu handicap
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numărul interacțiunii
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Selectați compania ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Selectați compania ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lăsați necompletat dacă se consideră pentru toate departamentele
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Tipuri de locuri de muncă (permanent, contractul, intern etc)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} este obligatoriu pentru articolul {1}
 DocType: Process Payroll,Fortnightly,bilunară
 DocType: Currency Exchange,From Currency,Din moneda
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2111,14 +2111,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Rata de (Compania de valuta)
 DocType: Student Guardian,Others,Altel
 DocType: Payment Entry,Unallocated Amount,Suma nealocată
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nu pot găsi o potrivire articol. Vă rugăm să selectați o altă valoare pentru {0}.
 DocType: POS Profile,Taxes and Charges,Impozite și Taxe
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Un produs sau un serviciu care este cumpărat, vândut sau păstrat în stoc."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nu există mai multe actualizări
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nu se poate selecta tipul de incasare ca 'Suma inregistrare precedenta' sau 'Total inregistrare precedenta' pentru prima inregistrare
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Postul copil nu ar trebui să fie un pachet de produse. Vă rugăm să eliminați elementul `{0}` și de a salva
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bancar
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Adăugați pontaje
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Adăugați pontaje
 DocType: Vehicle Service,Service Item,Postul de servicii
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
 DocType: Bank Guarantee,Bank Guarantee,Garantie bancara
@@ -2144,6 +2144,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Rând # {0}: {1} activ este deja {2}
 DocType: Quotation Item,Stock Balance,Stoc Sold
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Comanda de vânzări la plată
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Setați seria de numire pentru {0} prin Configurare&gt; Setări&gt; Serii de numire
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detaliu Revendicare Cheltuieli
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Vă rugăm să selectați contul corect
@@ -2168,14 +2169,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Prețurile nu vor fi afișate în cazul în care Prețul de listă nu este setat
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Vă rugăm să specificați o țară pentru această regulă Transport sau verificați Expediere
 DocType: Stock Entry,Total Incoming Value,Valoarea totală a sosi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Pentru debit este necesar
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Pentru debit este necesar
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Pontaje ajuta să urmăriți timp, costuri și de facturare pentru activitati efectuate de echipa ta"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Cumparare Lista de preturi
 DocType: Offer Letter Term,Offer Term,Termen oferta
 DocType: Quality Inspection,Quality Manager,Manager de calitate
 DocType: Job Applicant,Job Opening,Loc de munca disponibil
 DocType: Payment Reconciliation,Payment Reconciliation,Reconcilierea plată
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vă rugăm să selectați numele Incharge Persoana
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologia nou-aparuta
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Neremunerat totală: {0}
 DocType: BOM Website Operation,BOM Website Operation,Site-ul BOM Funcționare
@@ -2203,23 +2204,23 @@
 DocType: Opportunity,Lost Reason,Motiv Pierdere
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Toate articolele au fost deja facturate
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vă rugăm să introduceți Document Primirea
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Centre de costuri pot fi realizate în grupuri, dar intrările pot fi făcute împotriva non-Grupuri"
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Utilizatori și permisiuni
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Comenzi de producție Creat: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Comenzi de producție Creat: {0}
 DocType: Branch,Branch,Ramură
 DocType: Guardian,Mobile Number,Numar de mobil
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Imprimarea și Branding
 DocType: Bin,Actual Quantity,Cantitate Efectivă
 DocType: Shipping Rule,example: Next Day Shipping,exemplu: Next Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial nr {0} nu a fost găsit
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial nr {0} nu a fost găsit
 DocType: Scheduling Tool,Student Batch,Lot de student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Clienții dvs.
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Asigurați-Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Asigurați-Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ați fost invitat să colaboreze la proiect: {0}
 DocType: Leave Block List Date,Block Date,Dată blocare
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Aplica acum
@@ -2243,8 +2244,9 @@
 DocType: SMS Log,Sent To,Trimis La
 DocType: Payment Request,Make Sales Invoice,Realizeaza Factura de Vanzare
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,În continuare Contact Data nu poate fi în trecut
 DocType: Company,For Reference Only.,Numai Pentru referință.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Selectați numărul lotului
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Sumă în avans
@@ -2258,7 +2260,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Cazul Nr. nu poate fi 0
 DocType: Item,Show a slideshow at the top of the page,Arata un slideshow din partea de sus a paginii
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Magazine
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Magazine
 DocType: Serial No,Delivery Time,Timp de Livrare
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Uzură bazată pe
 DocType: Item,End of Life,Sfârsitul vieții
@@ -2270,12 +2272,12 @@
 DocType: Rename Tool,Rename Tool,Redenumirea Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Actualizare Cost
 DocType: Item Reorder,Item Reorder,Reordonare Articol
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Afișează Salariu alunecare
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material de transfer
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Afișează Salariu alunecare
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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ă."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Acest document este peste limita de {0} {1} pentru elementul {4}. Faci un alt {3} împotriva aceleași {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Vă rugăm să setați recurente după salvare
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,cont Selectați suma schimbare
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Vă rugăm să setați recurente după salvare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,cont Selectați suma schimbare
 DocType: Purchase Invoice,Price List Currency,Lista de pret Valuta
 DocType: Naming Series,User must always select,Utilizatorul trebuie să selecteze întotdeauna
 DocType: Stock Settings,Allow Negative Stock,Permiteţi stoc negativ
@@ -2286,7 +2288,7 @@
 DocType: Budget Account,Budget Account,Contul bugetar
 DocType: Quality Inspection,Verified By,Verificate de
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nu se poate schimba moneda implicita a companiei, deoarece există tranzacții in desfasurare. Tranzacțiile trebuie să fie anulate pentru a schimba moneda implicita."
-DocType: Grade Interval,Grade Description,grad Descriere
+DocType: Grading Scale Interval,Grade Description,grad Descriere
 DocType: Stock Entry,Purchase Receipt No,Primirea de cumpărare Nu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Banii cei mai castigati
 DocType: Process Payroll,Create Salary Slip,Crea Fluturasul de Salariul
@@ -2324,7 +2326,7 @@
 DocType: Upload Attendance,Attendance To Date,Prezenţa până la data
 DocType: Warranty Claim,Raised By,Ridicate de
 DocType: Payment Gateway Account,Payment Account,Cont de plăți
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vă rugăm să specificați companiei pentru a continua
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,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 +22,Net Change in Accounts Receivable,Schimbarea net în conturile de creanțe
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Fara Masuri Compensatorii
 DocType: Offer Letter,Accepted,Acceptat
@@ -2333,12 +2335,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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ă.
 DocType: Room,Room Number,Numărul de cameră
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referință invalid {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nu poate fi mai mare decât cantitatea planificată ({2}) aferent comenzii de producție {3}
 DocType: Shipping Rule,Shipping Rule Label,Regula de transport maritim Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forum utilizator
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Materii prime nu poate fi gol.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Jurnal de intrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Jurnal de intrare
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2351,7 +2353,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termeni și Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Numele institutului pentru care configurați acest sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Intrare contabilitate blocată până la această dată, nimeni nu poate crea / modifica intrarea cu excepția rolului specificat mai jos."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vă rugăm să salvați documentul înainte de a genera programul de întreținere
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Status Proiect
 DocType: UOM,Check this to disallow fractions. (for Nos),Bifati pentru a nu permite fracțiuni. (Pentru Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Au fost create următoarele comenzi de producție:
@@ -2378,7 +2380,7 @@
 ,Employees working on a holiday,Numar de angajati care lucreaza in vacanta
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Prezent
 DocType: Project,% Complete Method,% Metoda completă
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data de Incepere a Mentenantei nu poate fi anterioara datei de livrare aferent de Nr. de Serie {0}
 DocType: Production Order,Actual End Date,Data efectiva de finalizare
 DocType: BOM,Operating Cost (Company Currency),Costul de operare (Companie Moneda)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2395,7 +2397,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Concediu fără plată nu se potrivește cu înregistrările privind concediul de aplicare aprobat
 DocType: Campaign,Campaign-.####,Campanie-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Pasii urmatori
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Vă rugăm să furnizeze elementele specificate la cele mai bune tarife posibile
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto închidere oportunitate după 15 zile
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Anul de încheiere
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Cota / Plumb%
@@ -2452,7 +2454,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Cantitate
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Taxa de inregistrare Creat - {0}
 DocType: Asset Category Account,Asset Category Account,Cont activ Categorie
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock intrare {0} nu este prezentat
 DocType: Payment Reconciliation,Bank / Cash Account,Cont bancă / numerar
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Următoarea Contact Prin faptul că nu poate fi aceeași cu adresa de e-mail Plumb
@@ -2474,7 +2476,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Data Aprobare nespecificata
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Producţie
 DocType: Guardian,Occupation,Ocupaţie
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rând {0}: Data începerii trebuie să fie înainte de Data de încheiere
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (Cantitate)
 DocType: Sales Invoice,This Document,Acest document de
 DocType: Installation Note Item,Installed Qty,Instalat Cantitate
@@ -2490,15 +2493,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportați o problemă
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Cheltuieli de utilitate
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-si mai mult
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rând # {0}: Jurnal de intrare {1} nu are cont {2} sau deja compensată împotriva unui alt voucher
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rând # {0}: Jurnal de intrare {1} nu are cont {2} sau deja compensată împotriva unui alt voucher
 DocType: Buying Settings,Default Buying Price List,Lista de POrețuri de Cumparare Implicita
 DocType: Process Payroll,Salary Slip Based on Timesheet,Bazat pe salariu Slip Pontaj
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Tip de plată
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Selectați un lot pentru articolul {0}. Nu se poate găsi un singur lot care să îndeplinească această cerință
 DocType: Process Payroll,Select Employees,Selectați angajati
 DocType: Opportunity,Potential Sales Deal,Oferta potențiale Vânzări
 DocType: Payment Entry,Cheque/Reference Date,Cecul / Data de referință
@@ -2515,7 +2518,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},POS Profile Global {0} deja create pentru companie {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Înlocuiți Articol / BOM în toate extraselor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Document primire trebuie să fie depuse
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Document primire trebuie să fie depuse
 DocType: Purchase Invoice Item,Received Qty,Primit Cantitate
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / lot
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nu sunt plătite și nu sunt livrate
@@ -2524,11 +2527,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nu există nicio foaie de timp
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Lasă Tipul {0} nu poate fi transporta-transmise
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Programul de Mentenanta nu este generat pentru toate articolele. Vă rugăm să faceți clic pe 'Generare Program'
 ,To Produce,Pentru a produce
 apps/erpnext/erpnext/config/hr.py +93,Payroll,stat de plată
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pentru rândul {0} în {1}. Pentru a include {2} ratei punctul, randuri {3} De asemenea, trebuie să fie incluse"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Asigurați-vă utilizatorului
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Asigurați-vă utilizatorului
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identificarea pachetului pentru livrare (pentru imprimare)
 DocType: Bin,Reserved Quantity,Rezervat Cantitate
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Introduceți adresa de e-mail validă
@@ -2542,15 +2545,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,șablon cu handicap nu trebuie să fie șablon implicit
 DocType: Account,Income Account,Contul de venit
 DocType: Payment Request,Amount in customer's currency,Suma în moneda clientului
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Livrare
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Livrare
 DocType: Stock Reconciliation Item,Current Qty,Cantitate curentă
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","A se vedea ""Rate de materiale bazate pe"" în Costing Secțiunea"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Anterior
 DocType: Appraisal Goal,Key Responsibility Area,Domeni de Responsabilitate Cheie
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student Sarjele ajută să urmăriți prezență, evaluările și taxele pentru studenți"
 DocType: Payment Entry,Total Allocated Amount,Suma totală alocată
 DocType: Item Reorder,Material Request Type,Material Cerere tip
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Jurnal de intrare pentru salarii din {0} la {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage este plin, nu a salvat"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage este plin, nu a salvat"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Factorul de conversie UOM este obligatorie
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Re
 DocType: Budget,Cost Center,Centrul de cost
@@ -2560,16 +2564,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Ascunde Id-ul fiscal al Clientului din tranzacțiile de vânzare
 DocType: Upload Attendance,Upload HTML,Încărcați HTML
 DocType: Employee,Relieving Date,Alinarea Data
-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.","Regula de stabilire a prețurilor se face pentru a suprascrie Pret / defini procent de reducere, pe baza unor criterii."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Regula de stabilire a prețurilor se face pentru a suprascrie Pret / defini procent de reducere, pe baza unor criterii."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depozit poate fi modificat numai prin Bursa de primire de intrare / livrare Nota / cumparare
 DocType: Employee Education,Class / Percentage,Clasă / Procent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Director de Marketing și Vânzări
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Impozit pe venit
-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.","În cazul în care articolul Prețuri selectat se face pentru ""Pret"", se va suprascrie lista de prețuri. Prețul Articolul Prețuri este prețul final, deci ar trebui să se aplice mai departe reducere. Prin urmare, în cazul tranzacțiilor, cum ar fi comandă de vânzări, Ordinului de Procurare, etc, acesta va fi preluat în câmpul ""Rate"", mai degrabă decât câmpul ""Lista de prețuri Rata""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","În cazul în care articolul Prețuri selectat se face pentru ""Pret"", se va suprascrie lista de prețuri. Prețul Articolul Prețuri este prețul final, deci ar trebui să se aplice mai departe reducere. Prin urmare, în cazul tranzacțiilor, cum ar fi comandă de vânzări, Ordinului de Procurare, etc, acesta va fi preluat în câmpul ""Rate"", mai degrabă decât câmpul ""Lista de prețuri Rata""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track conduce de Industrie tip.
 DocType: Item Supplier,Item Supplier,Furnizor Articol
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,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/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Va rugam sa introduceti codul articol pentru a obține lot nu
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Toate adresele.
 DocType: Company,Stock Settings,Setări stoc
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2579,6 +2583,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Va trimite un e-mail despre eveniment angajaților cu statut &quot;Open&quot;
 DocType: Task,Depends on Tasks,Depinde de Sarcini
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Gestioneaza Ramificatiile de Group a Clientului.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Atașamentele pot fi afișate fără a permite coșul de cumpărături
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Numele noului centru de cost
 DocType: Leave Control Panel,Leave Control Panel,Panou de Control Concediu
@@ -2591,12 +2596,10 @@
 DocType: Sales Invoice,Debit To,Debit Pentru
 DocType: Delivery Note,Required only for sample item.,Necesar numai pentru element de probă.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Cant efectivă după tranzacție
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizor&gt; Tipul furnizorului
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nu slip salariu gasit între {0} și {1}
 ,Pending SO Items For Purchase Request,Până la SO articole pentru cerere de oferta
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Admitere Student
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} este dezactivat
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} este dezactivat
 DocType: Supplier,Billing Currency,Moneda de facturare
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra mare
@@ -2613,9 +2616,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Pagina de intrare de produse recomandate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Toate grupurile de evaluare
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nume nou depozit
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Teritoriu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Vă rugăm să menționați nici de vizite necesare
 DocType: Stock Settings,Default Valuation Method,Metoda de Evaluare Implicită
 DocType: Vehicle Log,Fuel Qty,combustibil Cantitate
 DocType: Production Order Operation,Planned Start Time,Planificate Ora de începere
@@ -2631,7 +2634,7 @@
 DocType: Price List,Price List Master,Lista de preturi Masterat
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Toate tranzacțiile de vânzări pot fi etichetate comparativ mai multor **Persoane de vânzări** pentru ca dvs. sa puteţi configura și monitoriza obiective.
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vă rugăm să creați client de plumb {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Lăsați numai aplicațiile cu statut „Aprobat“ și „Respins“ pot fi depuse
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Grupul studențesc Nume este obligatoriu în rândul {0}
@@ -2675,7 +2678,7 @@
 DocType: Project,Copied From,Copiat de la
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Numele de eroare: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Deficit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nu asociat cu {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nu asociat cu {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Prezenţa pentru angajatul {0} este deja consemnată
 DocType: Packing Slip,If more than one package of the same type (for print),În cazul în care mai mult de un pachet de același tip (pentru imprimare)
 ,Salary Register,Salariu Înregistrare
@@ -2694,7 +2697,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Utilizați pentru Cos de cumparaturi
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Valoarea {0} pentru atributul {1} nu există în lista Item valabile Valorile atributelor pentru postul {2}
 DocType: BOM Item,Scrap %,Resturi%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Taxele vor fi distribuite proporțional în funcție de produs Cantitate sau valoarea, ca pe dvs. de selecție"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Taxele vor fi distribuite proporțional în funcție de produs Cantitate sau valoarea, ca pe dvs. de selecție"
 DocType: Maintenance Visit,Purposes,Scopuri
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operațiunea {0} mai mult decât orice ore de lucru disponibile în stație de lucru {1}, descompun operațiunea în mai multe operațiuni"
@@ -2715,16 +2718,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Gestioneaza Ramificatiile Teritoriule.
 DocType: Journal Entry Account,Sales Invoice,Factură de vânzări
 DocType: Journal Entry Account,Party Balance,Balanța Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Vă rugăm să selectați Aplicați Discount On
 DocType: Company,Default Receivable Account,Implicit cont de încasat
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Creați Banca intrare pentru salariul totală plătită pentru criteriile de mai sus selectate
 DocType: Stock Entry,Material Transfer for Manufacture,Transfer de materii pentru fabricarea
-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.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Procentul de reducere se poate aplica fie pe o listă de prețuri sau pentru toate lista de prețuri.
 DocType: Purchase Invoice,Half-yearly,Semestrial
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Intrare contabilitate pentru stoc
 DocType: Vehicle Service,Engine Oil,Ulei de motor
 DocType: Sales Invoice,Sales Team1,Vânzări TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Articolul {0} nu există
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Articolul {0} nu există
 DocType: Sales Invoice,Customer Address,Adresă clientului
 DocType: Employee Loan,Loan Details,Creditul Detalii
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Rândul {0}: Completat Cant trebuie să fie mai mare decât zero.
@@ -2732,24 +2735,24 @@
 DocType: Account,Root Type,Rădăcină Tip
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nu se pot întoarce mai mult {1} pentru postul {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Parcelarea / Reprezentarea grafică / Trasarea
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Parcelarea / Reprezentarea grafică / Trasarea
 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}
 DocType: Cheque Print Template,Primary Settings,Setări primare
 DocType: Purchase Invoice,Select Supplier Address,Selectați Furnizor Adresă
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,angajărilor
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,angajărilor
 DocType: Purchase Invoice Item,Quality Inspection,Inspecție de calitate
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,Format standard
 DocType: Training Event,Theory,Teorie
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Atenție: Materialul solicitat Cant este mai mică decât minima pentru comanda Cantitate
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Contul {0} este Blocat
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Entitate juridică / Filiala cu o Grafic separat de conturi aparținând Organizației.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Produse Alimentare, Bauturi si Tutun"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Poate face doar plata împotriva facturată {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rata de comision nu poate fi mai mare decat 100
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Va rugam sa introduceti {0} primul
@@ -2789,7 +2792,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Depozite tranzacție existente nu pot fi convertite în grup.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Expira la
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Adăugați studenți
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Adăugați studenți
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vă rugăm să selectați {0}
 DocType: C-Form,C-Form No,Nr. formular-C
 DocType: BOM,Exploded_items,Exploded_items
@@ -2832,7 +2835,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Introduceți numele de campanie dacă sursa de anchetă este campanie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Editorii de ziare
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Selectați anul fiscal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Selectați anul fiscal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reordonare nivel
 DocType: Company,Chart Of Accounts Template,Diagrama de conturi de șabloane
 DocType: Attendance,Attendance Date,Dată prezenţă
@@ -2847,14 +2850,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Inregistrare duplicat
 DocType: Program Enrollment Tool,Get Students,Studenți primi
 DocType: Serial No,Under Warranty,În garanție
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Eroare]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Eroare]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,În cuvinte va fi vizibil după ce a salva comanda de vânzări.
 ,Employee Birthday,Zi de naștere angajat
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Instrumentul de student Lot de prezență
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limita Traversat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Capital de Risc
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Un termen academic cu acest &quot;An universitar&quot; {0} și &quot;Numele Termenul&quot; {1} există deja. Vă rugăm să modificați aceste intrări și încercați din nou.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Deoarece există tranzacții existente la postul {0}, nu puteți modifica valoarea {1}"
 DocType: UOM,Must be Whole Number,Trebuie să fie Număr întreg
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Cereri noi de concediu alocate (în zile)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Nu {0} nu există
@@ -2874,7 +2877,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% de materiale facturate versus comanda aceasta
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Intrarea Perioada de închidere
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Centrul de Cost cu tranzacții existente nu poate fi transformat în grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Suma {0} {1} {2} {3}
 DocType: Account,Depreciation,Depreciere
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizor (e)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Instrumentul Participarea angajat
@@ -2898,7 +2901,7 @@
 DocType: Supplier,Last Day of the Next Month,Ultima zi a lunii următoare
 DocType: Support Settings,Auto close Issue after 7 days,Auto închidere Problemă după 7 zile
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Concediu nu poate fi repartizat înainte {0}, ca echilibru concediu a fost deja carry transmise în viitor înregistrarea alocare concediu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Notă: Datorită / Reference Data depășește de companie zile de credit client de {0} zi (le)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Solicitantul elev
 DocType: Asset Category Account,Accumulated Depreciation Account,Cont Amortizarea cumulată
 DocType: Stock Settings,Freeze Stock Entries,Blocheaza Intrarile in Stoc
@@ -2909,7 +2912,7 @@
 ,Stock Analytics,Analytics stoc
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operații nu poate fi lăsat necompletat
 DocType: Maintenance Visit Purpose,Against Document Detail No,Comparativ detaliilor documentului nr.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Tipul de partid este obligatorie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Tipul de partid este obligatorie
 DocType: Quality Inspection,Outgoing,Trimise
 DocType: Material Request,Requested For,Pentru a solicitat
 DocType: Quotation Item,Against Doctype,Comparativ tipului documentului
@@ -2926,10 +2929,10 @@
 DocType: Asset,Item Code,Cod articol
 DocType: Production Planning Tool,Create Production Orders,Creare Comenzi de Producție
 DocType: Serial No,Warranty / AMC Details,Garanție / AMC Detalii
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Selectați manual elevii pentru grupul bazat pe activități
 DocType: Journal Entry,User Remark,Observație utilizator
 DocType: Lead,Market Segment,Segmentul de piață
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Suma plătită nu poate fi mai mare decât suma totală negativă restante {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Istoric Intern Locuri de Munca Angajat
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),De închidere (Dr)
 DocType: Cheque Print Template,Cheque Size,Dimensiune cecului
@@ -2945,7 +2948,7 @@
 DocType: Production Planning Tool,Create Material Requests,Creare Necesar de Materiale
 DocType: Employee Education,School/University,Școlar / universitar
 DocType: Payment Request,Reference Details,Detalii de referință
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Valoarea așteptată după viață utilă trebuie să fie mai mică Sumă brută Cumpărare
 DocType: Sales Invoice Item,Available Qty at Warehouse,Cantitate disponibilă în depozit
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Sumă facturată
 DocType: Asset,Double Declining Balance,Dublu degresive
@@ -2966,20 +2969,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Diferența cont trebuie să fie un cont de tip activ / pasiv, deoarece acest stoc Reconcilierea este un intrare de deschidere"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Suma debursate nu poate fi mai mare decât Suma creditului {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Număr de comandă de aprovizionare necesare pentru postul {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Comanda de producție nu a fost creat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Comanda de producție nu a fost creat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Din Data' trebuie să fie dupã 'Până în Data'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nu se poate schimba statutul de student ca {0} este legat cu aplicația de student {1}
 DocType: Asset,Fully Depreciated,Depreciata pe deplin
 ,Stock Projected Qty,Stoc proiectată Cantitate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Clientul {0} nu apartine proiectului {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Participarea marcat HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Cotațiile sunt propuneri, sumele licitate le-ați trimis clienților dvs."
 DocType: Sales Order,Customer's Purchase Order,Comandă clientului
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serial și Lot nr
 DocType: Warranty Claim,From Company,De la Compania
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Suma Scorurile de criterii de evaluare trebuie să fie {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Valoare sau Cantitate
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Vă rugăm să setați Numărul de Deprecieri rezervat
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Valoare sau Cantitate
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Comenzile Productions nu pot fi ridicate pentru:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Taxele de cumpărare și Taxe
@@ -2992,7 +2995,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,toate Depozite
 DocType: Sales Partner,Retailer,Vânzător cu amănuntul
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Toate tipurile de furnizor
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Toate tipurile de furnizor
 DocType: Global Defaults,Disable In Words,Nu fi de acord în cuvinte
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Citat {0} nu de tip {1}
@@ -3001,6 +3004,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Descoperire cont bancar
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Realizeaza Fluturas de Salar
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rândul # {0}: Suma alocată nu poate fi mai mare decât suma rămasă.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Navigare BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Împrumuturi garantate
 DocType: Purchase Invoice,Edit Posting Date and Time,Editare postare Data și ora
@@ -3040,7 +3044,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nu este permis să actualizeze tranzacțiile bursiere mai vechi de {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detaliu
 DocType: Sales Order,Fully Billed,Complet Taxat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Vă rugăm să setați implicit cont de plătit în angajatului {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Bani în mână
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Depozit de livrare necesar pentru articol stoc {0}
 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)"
@@ -3051,7 +3054,7 @@
 DocType: Student Group,Group Based On,Grup bazat pe
 DocType: Journal Entry,Bill Date,Dată factură
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Sunt necesare servicii de post, tipul, frecvența și valoarea cheltuielilor"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Chiar dacă există mai multe reguli de stabilire a prețurilor, cu cea mai mare prioritate, se aplică apoi următoarele priorități interne:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Chiar vrei să Transmiteți toate Slip Salariu de la {0} la {1}
 DocType: Cheque Print Template,Cheque Height,Cheque Inaltime
 DocType: Supplier,Supplier Details,Detalii furnizor
@@ -3063,7 +3066,7 @@
 DocType: Vehicle Log,Invoice Ref,factură Ref
 DocType: Purchase Order,Recurring Order,Comanda recurent
 DocType: Company,Default Income Account,Contul Venituri Implicit
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grup Client / Client
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grup Client / Client
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed fiscal Ani de Profit / Pierdere (credit)
 DocType: Sales Invoice,Time Sheets,Foi de timp
 DocType: Payment Gateway Account,Default Payment Request Message,Implicit solicita plata mesaj
@@ -3083,10 +3086,10 @@
 DocType: Notification Control,Quotation Message,Citat Mesaj
 DocType: Employee Loan,Employee Loan Application,Cererea de împrumut Angajat
 DocType: Issue,Opening Date,Data deschiderii
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Prezență a fost marcată cu succes.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Prezență a fost marcată cu succes.
 DocType: Journal Entry,Remark,Remarcă
 DocType: Purchase Receipt Item,Rate and Amount,Rata și volumul
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Tipul de cont pentru {0} trebuie să fie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Tipul de cont pentru {0} trebuie să fie {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Frunze și de vacanță
 DocType: School Settings,Current Academic Term,Termen academic actual
 DocType: School Settings,Current Academic Term,Termen academic actual
@@ -3109,7 +3112,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupul studențesc
 DocType: Shopping Cart Settings,Quotation Series,Ofertă Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Există un articol cu aceeaşi denumire ({0}), vă rugăm să schimbați denumirea grupului articolului sau să redenumiţi articolul"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vă rugăm să selectați Clienți
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Vă rugăm să selectați Clienți
 DocType: C-Form,I,eu
 DocType: Company,Asset Depreciation Cost Center,Amortizarea activului Centru de cost
 DocType: Sales Order Item,Sales Order Date,Comandă de vânzări Data
@@ -3128,20 +3131,20 @@
 DocType: Vehicle,Insurance Details,Detalii de asigurare
 DocType: Account,Payable,Plătibil
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vă rugăm să introduceți perioada de rambursare
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorilor ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorilor ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Clienți noi
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Profit Brut%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Data Aprobare
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Valoarea brută Achiziția este obligatorie
 DocType: Lead,Address Desc,Adresă Desc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party este obligatorie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party este obligatorie
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Nume subiect
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Cel puţin una din opţiunile de vânzare sau cumpărare trebuie să fie selectată
-DocType: Grading Structure,Grade Intervals,Intervale de grad
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Selectați natura afacerii dumneavoastră.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rândul # {0}: intrarea duplicat în referințe {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,În cazul în care operațiunile de fabricație sunt efectuate.
 DocType: Asset Movement,Source Warehouse,Depozit sursă
 DocType: Installation Note,Installation Date,Data de instalare
@@ -3178,7 +3181,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Antete de Scrisoare de Sabloane de Imprimare.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Titluri de șabloane de imprimare, de exemplu proforma Factura."
 DocType: Student Guardian,Student Guardian,student la Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Taxele de tip evaluare nu poate marcate ca Inclusive
 DocType: POS Profile,Update Stock,Actualizare stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Un UOM diferit pentru articole va conduce la o valoare incorecta pentru Greutate Neta (Total). Asigurați-vă că Greutatea Netă a fiecărui articol este în același UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Rată BOM
@@ -3206,7 +3209,7 @@
 DocType: Company,Exchange Gain / Loss Account,Schimb de câștig / pierdere de cont
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Angajaților și prezență
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Scopul trebuie să fie una dintre {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Completați formularul și salvați-l
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Cantitate actuală în stoc
@@ -3222,7 +3225,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reordonare Cantitate
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Locuri de munca disponibile
 DocType: Company,Stock Adjustment Account,Cont Ajustarea stoc
-DocType: Journal Entry,Write Off,Achita
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Achita
 DocType: Timesheet Detail,Operation ID,Operațiunea ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Utilizator de sistem (login) de identitate. Dacă este setat, el va deveni implicit pentru toate formele de resurse umane."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: de la {1}
@@ -3233,27 +3236,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizor livrează la client
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Postul / {0}) este din stoc
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Următoarea dată trebuie să fie mai mare de postare Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Arată impozit break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Arată impozit break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Datorită / Reference Data nu poate fi după {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Datele de import și export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","intrările de stoc există împotriva Warehouse {0}, prin urmare, nu se poate re-atribui sau modifica"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nu există elevi găsit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nu există elevi găsit
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Postarea factură Data
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Vinde
 DocType: Sales Invoice,Rounded Total,Rotunjite total
 DocType: Product Bundle,List items that form the package.,Listeaza articole care formează pachetul.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alocarea procent ar trebui să fie egală cu 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Vă rugăm să selectați Dată postare înainte de a selecta Parte
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Din AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selectați Cotațiile
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Selectați Cotațiile
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Selectați Cotațiile
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numărul de Deprecieri Booked nu poate fi mai mare decât Număr total de Deprecieri
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Realizeaza Vizita de Mentenanta
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vă rugăm să contactați pentru utilizatorul care au Sales Maestru de Management {0} rol
 DocType: Company,Default Cash Account,Cont de Numerar Implicit
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Directorul Companiei(nu al Clientului sau al Furnizorui).
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Aceasta se bazează pe prezența acestui student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nu există studenți în
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Adăugați mai multe elemente sau sub formă deschis complet
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,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 +197,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
@@ -3285,6 +3289,7 @@
 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: Warranty Claim,Item and Warranty Details,Postul și garanție Detalii
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Codul elementului&gt; Element Grup&gt; Brand
 DocType: Sales Team,Contribution (%),Contribuție (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Selectați programul pentru a prelua cursurile obligatorii.
@@ -3300,9 +3305,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Premergător reconcilierii
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Pentru a {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Impozite și Taxe adăugate (Compania de valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Taxa Articol pentru inregistrarea {0} trebuie sa detina un cont de tip Fiscal sau De Venituri sau De Cheltuieli sau Taxabil
 DocType: Sales Order,Partly Billed,Parțial Taxat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Postul {0} trebuie să fie un element activ fix
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Postul {0} trebuie să fie un element activ fix
 DocType: Item,Default BOM,FDM Implicit
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3312,8 +3317,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Autopropulsat
 DocType: Vehicle,Insurance Company,Companie de asigurari
 DocType: Asset Category Account,Fixed Asset Account,Cont activ fix
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabil
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Din Nota de Livrare
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variabil
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Din Nota de Livrare
 DocType: Student,Student Email Address,Adresa de e-mail Student
 DocType: Timesheet Detail,From Time,Din Time
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,In stoc:
@@ -3325,12 +3330,12 @@
 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 +66,Intern,Interna
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Numele adresei
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Numele adresei
 DocType: Stock Entry,From BOM,De la BOM
 DocType: Assessment Code,Assessment Code,Codul de evaluare
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Elementar
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Tranzacțiilor bursiere înainte de {0} sunt înghețate
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Vă rugăm să faceți clic pe ""Generate Program"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","de exemplu, Kg, Unitatea, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,De referință nu este obligatorie în cazul în care ați introdus Reference Data
 DocType: Bank Reconciliation Detail,Payment Document,Documentul de plată
@@ -3338,19 +3343,19 @@
 DocType: Salary Slip,Salary Structure,Structura salariu
 DocType: Account,Bank,Bancă
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linie aeriană
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Eliberarea Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Sunteți în modul offline. Tu nu va fi capabil să reîncărcați până când nu aveți de rețea.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Nu există grupuri create de studenți.
 DocType: Purchase Invoice Item,Serial No,Nr. serie
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Rambursarea lunară Suma nu poate fi mai mare decât Suma creditului
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Va rugam sa introduceti maintaince detaliile prima
 DocType: Purchase Invoice,Print Language,Limba de imprimare
 DocType: Salary Slip,Total Working Hours,Numărul total de ore de lucru
 DocType: Stock Entry,Including items for sub assemblies,Inclusiv articole pentru subansambluri
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Introduceți valoarea trebuie să fie pozitiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Toate teritoriile
 DocType: Purchase Invoice,Items,Articole
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student este deja înscris.
@@ -3370,17 +3375,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Unitatea implicit de măsură pentru Variant &#39;{0} &quot;trebuie să fie la fel ca în Template&quot; {1} &quot;
 DocType: Shipping Rule,Calculate Based On,Calculaţi pe baza
 DocType: Delivery Note Item,From Warehouse,Din depozitul
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nu există niciun articol cu Lista de materiale pentru fabricarea
 DocType: Assessment Plan,Supervisor Name,Nume supervizor
 DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
 DocType: Program Enrollment Course,Program Enrollment Course,Curs de înscriere la curs
-DocType: Grading Structure,Grading Structure,Structura de notare
 DocType: Purchase Taxes and Charges,Valuation and Total,Evaluare și Total
 DocType: Tax Rule,Shipping City,Transport Oraș
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Personalizare Notificare
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash Flow din Operațiuni
 DocType: Sales Invoice,Shipping Rule,Regula de transport maritim
@@ -3401,8 +3404,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Nu există implicit BOM pentru postul {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Vă rugăm să selectați postarea Data primei
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Deschiderea Data ar trebui să fie, înainte de Data inchiderii"
 DocType: Leave Control Panel,Carry Forward,Transmite Inainte
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Centrul de Cost cu tranzacții existente nu poate fi transformat în registru contabil
 DocType: Department,Days for which Holidays are blocked for this department.,Zile pentru care Sărbătorile sunt blocate pentru acest departament.
@@ -3415,7 +3418,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Atașați antet
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicare
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Ultima comunicare
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nu se poate deduce când categoria este de 'Evaluare' sau 'Evaluare și total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lista capetele fiscale (de exemplu, TVA, vamale etc., ei ar trebui să aibă nume unice) și ratele lor standard. Acest lucru va crea un model standard, pe care le puteți edita și adăuga mai târziu."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Plățile se potrivesc cu facturi
@@ -3431,7 +3434,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Divertisment & Relaxare
 DocType: Quality Inspection,Item Serial No,Nr. de Serie Articol
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Crearea angajaților Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Crearea angajaților Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Raport Prezent
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Declarațiile contabile
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Oră
@@ -3444,10 +3447,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Necunoscut
 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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Point of Sale
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Point of Sale
 DocType: Payment Entry,Received Amount,Suma primită
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Configurați sistemul de numire a angajaților în Resurse umane&gt; Setări HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Creați pentru întreaga cantitate, ignorând cantitatea deja la comandă"
 DocType: Account,Tax,Impozite
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,nemarcate
@@ -3460,9 +3461,9 @@
 DocType: Batch,Source Document Name,Numele sursei de document
 DocType: Batch,Source Document Name,Numele sursei de document
 DocType: Job Opening,Job Title,Denumire post
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Creați Utilizatori
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Creați Utilizatori
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Cantitatea să Fabricare trebuie sa fie mai mare decât 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitați raport de apel de întreținere.
 DocType: Stock Entry,Update Rate and Availability,Actualizarea Rata și disponibilitatea
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Procentul vi se permite de a primi sau livra mai mult față de cantitatea comandata. De exemplu: Dacă ați comandat 100 de unități. și alocația este de 10%, atunci vi se permite să primească 110 de unități."
@@ -3472,28 +3473,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Cont de cheltuieli este obligatoriu pentru articolul {0}
 DocType: BOM,Website Description,Site-ul Descriere
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Schimbarea net în capitaluri proprii
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vă rugăm să anulați Achiziționarea factură {0} mai întâi
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa de e-mail trebuie să fie unic, există deja pentru {0}"
 DocType: Serial No,AMC Expiry Date,Dată expirare AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,primire
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,primire
 ,Sales Register,Vânzări Inregistrare
 DocType: Daily Work Summary Settings Company,Send Emails At,Trimite email-uri La
 DocType: Quotation,Quotation Lost Reason,Citat pierdut rațiunea
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Selectați domeniul
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},de referință al tranzacției nu {0} {1} din
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nu este nimic pentru a edita.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Rezumat pentru această lună și activități în așteptarea
 DocType: Customer Group,Customer Group Name,Nume Group Client
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nu există clienți încă!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Situația fluxurilor de trezorerie
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Suma creditului nu poate depăși valoarea maximă a împrumutului de {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licență
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Va rugam sa introduceti Scrie Off cont
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Ultima comandă Data
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Contul {0} nu aparține companiei {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numerele de serie din rândul {0} nu se potrivesc cu Nota de livrare
 DocType: Student,Guardian Details,Detalii tutore
 DocType: C-Form,C-Form,Formular-C
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Marcă Participarea pentru mai mulți angajați
@@ -3518,20 +3521,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rândul {0} # cont trebuie să fie de tip &quot;Activ fix&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Cantitate
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Reguli pentru a calcula suma de transport maritim pentru o vânzare
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria este obligatorie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seria este obligatorie
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Servicii financiare
 DocType: Student Sibling,Student ID,Carnet de student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Tipuri de activități pentru busteni Timp
 DocType: Tax Rule,Sales,Vânzări
 DocType: Stock Entry Detail,Basic Amount,Suma de bază
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Depozit necesar pentru stocul de postul {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Stat de facturare
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nu este asociat cu contul Party {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nu este asociat cu contul Party {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Obtine FDM expandat (inclusiv subansamblurile)
 DocType: Authorization Rule,Applicable To (Employee),Aplicabil pentru (angajat)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date este obligatorie
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Creștere pentru Atribut {0} nu poate fi 0
@@ -3542,13 +3545,13 @@
 ,Inactive Customers,Clienții inactive
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Încasări de cumparare
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Cum se aplică regula pret?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Cum se aplică regula pret?
 DocType: Stock Entry,Delivery Note No,Nr. Nota de Livrare
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Dacă este bifată, numai Cumpărare cereri de materiale pentru materiile prime finale vor fi incluse în Cererile materiale. În caz contrar, va fi creat Cererile materiale pentru elementele părinte"
 DocType: Cheque Print Template,Message to show,Mesaj pentru a arăta
 DocType: Company,Retail,Cu amănuntul
 DocType: Attendance,Absent,Absent
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle produs
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle produs
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Rândul {0}: referință invalid {1}
 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
@@ -3558,10 +3561,10 @@
 DocType: Payment Entry,Account Paid From,Contul plătit De la
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Material brut Articol Cod
 DocType: Journal Entry,Write Off Based On,Scrie Off bazat pe
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Asigurați-vă de plumb
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Asigurați-vă de plumb
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Imprimare și articole de papetărie
 DocType: Stock Settings,Show Barcode Field,Afișează coduri de bare Câmp
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Trimite email-uri Furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Trimite email-uri Furnizor
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Salariu au fost deja procesate pentru perioada între {0} și {1}, Lăsați perioada de aplicare nu poate fi între acest interval de date."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Înregistrare de instalare pentru un nr de serie
 DocType: Guardian Interest,Guardian Interest,Interes tutore
@@ -3574,6 +3577,7 @@
 DocType: Offer Letter,Awaiting Response,Se aşteaptă răspuns
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sus
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut nevalid {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Menționați dacă contul de plată non-standard
 DocType: Salary Slip,Earning & Deduction,Câștig Salarial si Deducere
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Opțional. Această setare va fi utilizat pentru a filtra în diverse tranzacții.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativ Rata de evaluare nu este permis
@@ -3589,10 +3593,9 @@
 DocType: Production Order Item,Production Order Item,Producția comandă Postul
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nu s-au găsit înregistrări
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Costul de active scoase din uz
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,parţial de comandat
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: 아이템 {2} 는 Cost Center가  필수임
 DocType: Vehicle,Policy No,Politica nr
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Obține elemente din Bundle produse
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Obține elemente din Bundle produse
 DocType: Asset,Straight Line,Linie dreapta
 DocType: Project User,Project User,utilizator proiect
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Despică
@@ -3610,7 +3613,7 @@
 DocType: Program Enrollment Tool,Get Students From,Elevii de la a lua
 DocType: Hub Settings,Seller Country,Vânzător Țară
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publica Articole pe site-ul
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupa elevii în loturi
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupa elevii în loturi
 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 +85,Specifications,Specificaţii:
@@ -3663,14 +3666,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Data Cec
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Contul {0}: cont Părinte {1} nu apartine companiei: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student Solicitanții
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Șters cu succes toate tranzacțiile legate de aceasta companie!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Data de inscriere
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Probă
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Componente salariale
 DocType: Program Enrollment Tool,New Academic Year,Anul universitar nou
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Revenire / credit Notă
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Revenire / credit Notă
 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 +28,Total Paid Amount,Total Suma plătită
 DocType: Production Order Item,Transferred Qty,Transferat Cantitate
@@ -3690,7 +3693,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Tip de frunze, cum ar fi casual, bolnavi, etc"
 DocType: Email Digest,Send regular summary reports via Email.,Trimite rapoarte de sinteză periodice prin e-mail.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Vă rugăm să setați contul implicit în cheltuielile de revendicare Tip {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Vă rugăm să setați contul implicit în cheltuielile de revendicare Tip {0}
 DocType: Assessment Result,Student Name,Numele studentului
 DocType: Brand,Item Manager,Postul de manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Salarizare plateste
@@ -3711,6 +3714,7 @@
 ,Sales Funnel,De vânzări pâlnie
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Abreviere este obligatorie
 DocType: Project,Task Progress,Progresul sarcină
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Cart
 ,Qty to Transfer,Cantitate de a transfera
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Citate la Oportunitati sau clienți.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Rol permise pentru a edita stoc congelate
@@ -3738,13 +3742,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Detaliu Taxa Avizata Articol
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institutul Abreviere
 ,Item-wise Price List Rate,Rata Lista de Pret Articol-Avizat
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Furnizor ofertă
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Furnizor ofertă
 DocType: Quotation,In Words will be visible once you save the Quotation.,În cuvinte va fi vizibil după ce salvați citat.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Cantitatea ({0}) nu poate fi o fracțiune în rândul {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Colectarea taxelor
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Cod de bare {0} deja folosit pentru articolul {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Reguli pentru a adăuga costurile de transport maritim.
 DocType: Item,Opening Stock,deschidere stoc
@@ -3762,8 +3766,8 @@
  Actualizat prin ""Ora Log"""
 DocType: Customer,From Lead,Din Conducere
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Comenzi lansat pentru producție.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Selectați anul fiscal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Selectați anul fiscal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil necesare pentru a face POS intrare
 DocType: Program Enrollment Tool,Enroll Students,Studenți Enroll
 DocType: Hub Settings,Name Token,Numele Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Vanzarea Standard
@@ -3774,7 +3778,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} comparativ cu factura de vânzări {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Denumirea proiectului
-DocType: Supplier,Mention if non-standard receivable account,Mentionati daca non-standard cont de primit
+DocType: Customer,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: Production Order,Required Items,Elemente obligatorii
 DocType: Stock Ledger Entry,Stock Value Difference,Valoarea Stock Diferența
@@ -3795,7 +3799,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Stabilească obiective Articol Grupa-înțelept pentru această persoană de vânzări.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Blocheaza Stocurile Mai Vechi De [zile]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rând # {0}: Activ este obligatorie pentru active fixe cumpărare / vânzare
-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.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","În cazul în care două sau mai multe reguli de stabilire a prețurilor sunt găsite bazează pe condițiile de mai sus, se aplică prioritate. Prioritatea este un număr între 0 și 20 în timp ce valoarea implicită este zero (gol). Numărul mai mare înseamnă că va avea prioritate în cazul în care există mai multe norme de stabilire a prețurilor, cu aceleași condiții."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Anul fiscal: {0} nu există
 DocType: Currency Exchange,To Currency,Pentru a valutar
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Permiteţi următorilor utilizatori să aprobe cereri de concediu pentru zile blocate.
@@ -3821,7 +3825,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Element {0} ignorat, deoarece nu este un element de stoc"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Trimiteți acest comandă de producție pentru prelucrarea ulterioară.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","De a nu aplica regula Preturi într-o anumită tranzacție, ar trebui să fie dezactivat toate regulile de tarifare aplicabile."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","De a nu aplica regula Preturi într-o anumită tranzacție, ar trebui să fie dezactivat toate regulile de tarifare aplicabile."
 DocType: Assessment Group,Parent Assessment Group,Grup părinte de evaluare
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Locuri de munca
 ,Sales Order Trends,Vânzări Ordine Tendințe
@@ -3832,7 +3836,7 @@
 DocType: Stock Entry Detail,Additional Cost,Cost aditional
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Data de Incheiere An Financiar
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Realizeaza Ofertă Furnizor
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Realizeaza Ofertă Furnizor
 DocType: Quality Inspection,Incoming,Primite
 DocType: BOM,Materials Required (Exploded),Materiale necesare (explodat)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Adăugați utilizatori la organizația dvs., altele decât tine"
@@ -3860,6 +3864,7 @@
 DocType: Employee,History In Company,Istoric In Companie
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletine
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stoc Ledger intrare
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Client&gt; Grup de clienți&gt; Teritoriu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Același articol a fost introdus de mai multe ori
 DocType: Department,Leave Block List,Lista Concedii Blocate
 DocType: Sales Invoice,Tax ID,ID impozit
@@ -3869,7 +3874,7 @@
 DocType: Customer,Sales Partner and Commission,Partener de vânzări și a Comisiei
 DocType: Employee Loan,Rate of Interest (%) / Year,Rata dobânzii (%) / An
 ,Project Quantity,proiectul Cantitatea
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} pentru toate articolele este zero, poate fi ar trebui să schimbați „Distribuirea cheltuielilor pe baza“"
 DocType: Opportunity,To Discuss,Pentru a discuta
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} unități de {1} necesare în {2} pentru a finaliza această tranzacție.
 DocType: Loan Type,Rate of Interest (%) Yearly,Rata dobânzii (%) anual
@@ -3884,7 +3889,7 @@
 DocType: Purchase Invoice,Return,Întoarcere
 DocType: Production Order Operation,Production Order Operation,Producția Comanda Funcționare
 DocType: Pricing Rule,Disable,Dezactivati
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Modul de plată este necesară pentru a efectua o plată
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Modul de plată este necesară pentru a efectua o plată
 DocType: Project Task,Pending Review,Revizuirea în curs
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Activ {0} nu poate fi scoase din uz, deoarece este deja {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Revendicarea Total cheltuieli (prin cheltuieli revendicarea)
@@ -3892,11 +3897,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rând {0}: Moneda de BOM # {1} ar trebui să fie egal cu moneda selectată {2}
 DocType: Journal Entry Account,Exchange Rate,Rata de schimb
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,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 +555,Sales Order {0} is not submitted,Comandă de vânzări {0} nu este prezentat
 DocType: Homepage,Tag Line,Eticheta linie
 DocType: Fee Component,Fee Component,Taxa de Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Conducerea flotei
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Adauga articole din
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Adauga articole din
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depozit {0}: contul părinte {1} nu apartine  companiei {2}
 DocType: Cheque Print Template,Regular,Regulat
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage totală a tuturor criteriilor de evaluare trebuie să fie 100%
@@ -3909,7 +3914,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Depozitul {0} nu există
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Inregistreaza-te pentru ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Procente de distribuție lunare
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementul selectat nu poate avea Lot
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Rata de evaluare nu a fost găsit pentru elementul {0}, care trebuie să facă înregistrări contabile pentru {1} {2}. În cazul în care elementul este ca un element transacting probă în {1}, vă rugăm să menționați că în {1} tabel element. În caz contrar, vă rugăm să creați o tranzacție stoc de intrare pentru element sau menționează rata de evaluare în înregistrarea element și apoi încercați submiting / anulare această intrare"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% de materiale livrate versus notele livrarii
 DocType: Project,Customer Details,Detalii Client
@@ -3918,15 +3923,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Introduceți parametru url pentru receptor nos
 DocType: Payment Entry,Paid Amount,Suma plătită
 DocType: Assessment Plan,Supervisor,supraveghetor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Pe net
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Pe net
 ,Available Stock for Packing Items,Stoc disponibil pentru articole destinate împachetării
 DocType: Item Variant,Item Variant,Postul Varianta
 DocType: Assessment Result Tool,Assessment Result Tool,Instrumentul de evaluare Rezultat
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Resturi Postul
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,comenzile trimise nu pot fi șterse
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Managementul calității
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Postul {0} a fost dezactivat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Postul {0} a fost dezactivat
 DocType: Employee Loan,Repay Fixed Amount per Period,Rambursa Suma fixă pentru fiecare perioadă
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Va rugam sa introduceti cantitatea pentru postul {0}
 DocType: Employee External Work History,Employee External Work History,Istoric Extern Locuri de Munca Angajat
@@ -3953,7 +3958,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ID-ul de student e-mail
 DocType: Employee,Notice (days),Preaviz (zile)
 DocType: Tax Rule,Sales Tax Template,Format impozitul pe vânzări
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Selectați elemente pentru a salva factura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Selectați elemente pentru a salva factura
 DocType: Employee,Encashment Date,Data plata in Numerar
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Ajustarea stoc
@@ -3976,7 +3981,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Vă rugăm să precizați de la / la gama
 DocType: Serial No,Under AMC,Sub AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Rata de evaluare Articolul este recalculat în vedere aterizat sumă voucher de cost
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Rata de evaluare Articolul este recalculat în vedere aterizat sumă voucher de cost
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Setări implicite pentru tranzacțiile de vânzare.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Prag
@@ -3986,6 +3991,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Notă Eliberat
 DocType: Production Order,Warehouses,Depozite
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} activul nu poate fi transferat
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Acest element este o variantă de {0} (șablon).
 DocType: Workstation,per hour,pe oră
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,cumpărare
 DocType: Announcement,Announcement,Anunţ
@@ -4001,8 +4007,8 @@
 DocType: Account,Receivable,De încasat
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nu este permis să schimbe furnizorul ca Comandă există deja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Rol care i se permite să prezinte tranzacțiile care depășesc limitele de credit stabilite.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Selectați elementele de Fabricare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Selectați elementele de Fabricare
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","datele de bază de sincronizare, ar putea dura ceva timp"
 DocType: Item,Material Issue,Problema de material
 DocType: Hub Settings,Seller Description,Descriere vânzător
 DocType: Employee Education,Qualification,Calificare
@@ -4014,7 +4020,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ordonat
 DocType: Salary Detail,Component,component
 DocType: Assessment Criteria,Assessment Criteria Group,Criterii de evaluare de grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Amortizarea de deschidere trebuie să fie mai mică Acumulate decât egală cu {0}
 DocType: Warehouse,Warehouse Name,Denumire depozit
 DocType: Naming Series,Select Transaction,Selectați Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vă rugăm să introduceți Aprobarea Rolul sau aprobarea de utilizare
@@ -4027,7 +4033,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nu pot anula, deoarece a prezentat Bursa de intrare {0} există"
 DocType: Employee Loan,Disbursement Date,debursare
 DocType: Vehicle,Vehicle,Vehicul
 DocType: Purchase Invoice,In Words,În cuvinte
@@ -4042,14 +4048,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Plumb%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Deprecieri active și echilibrări
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Suma {0} {1} transferat de la {2} la {3}
 DocType: Sales Invoice,Get Advances Received,Obtine Avansurile Primite
 DocType: Email Digest,Add/Remove Recipients,Adăugaţi/Stergeţi Destinatari
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Tranzacție nu este permis împotriva oprit comandă de producție {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Pentru a seta acest an fiscal ca implicit, faceți clic pe ""Set as Default"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,A adera
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Lipsă Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Postul varianta {0} există cu aceleași atribute
 DocType: Employee Loan,Repay from Salary,Rambursa din salariu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Solicitarea de plată contra {0} {1} pentru suma {2}
@@ -4067,7 +4073,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Evaluare Rezultat Detalii
 DocType: Employee Education,Employee Education,Educație Angajat
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Grup de element dublu exemplar găsit în tabelul de grup de elemente
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Este nevoie să-i aducă Detalii despre articol.
 DocType: Salary Slip,Net Pay,Plată netă
 DocType: Account,Account,Cont
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Nu {0} a fost deja primit
@@ -4076,7 +4082,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Depozit {0} nu este legată de nici un cont, vă rugăm să creați / link contul corespunzător (activ) pentru depozit."
 DocType: Purchase Invoice,Recurring Id,Recurent Id
 DocType: Customer,Sales Team Details,Detalii de vânzări Echipa
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Șterge definitiv?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Șterge definitiv?
 DocType: Expense Claim,Total Claimed Amount,Total suma pretinsă
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potențiale oportunități de vânzare.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4087,13 +4093,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup Școala în ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),De schimbare a bazei Suma (Companie Moneda)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nici o intrare contabile pentru următoarele depozite
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Salvați documentul primul.
 DocType: Account,Chargeable,Taxabil/a
 DocType: Company,Change Abbreviation,Schimbarea abreviere
 DocType: Expense Claim Detail,Expense Date,Data cheltuieli
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Ultima cantitate
+DocType: Task,Is Milestone,Este Milestone
 DocType: Daily Work Summary,Email Sent To,Email trimis catre
 DocType: Budget,Warn,Avertiza
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Orice alte observații, efort remarcabil care ar trebui înregistrate."
@@ -4115,7 +4122,7 @@
 DocType: Item Attribute Value,Attribute Value,Valoare Atribut
 ,Itemwise Recommended Reorder Level,Nivel de Reordonare Recomandat al Articolului-Awesome
 DocType: Salary Detail,Salary Detail,Detalii salariu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Vă rugăm selectați 0} {întâi
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Vă rugăm selectați 0} {întâi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Lot {0} din {1} Postul a expirat.
 DocType: Sales Invoice,Commission,Comision
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Fișa de timp pentru fabricație.
@@ -4127,41 +4134,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'Blochează stocuri mai vechi decât' ar trebui să fie mai mic de %d zile.
 DocType: Tax Rule,Purchase Tax Template,Achiziționa Format fiscală
 ,Project wise Stock Tracking,Proiect înțelept Tracking Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Programul de Mentenanta {0} există comparativ cu {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Cant efectivă (la sursă/destinaţie)
 DocType: Item Customer Detail,Ref Code,Cod de Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Înregistrări angajat.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Vă rugăm să setați Următoarea amortizare Data
 DocType: HR Settings,Payroll Settings,Setări de salarizare
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Potrivesc Facturi non-legate și plăți.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Locul de comandă
 DocType: Email Digest,New Purchase Orders,Noi comenzi de aprovizionare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Selectați Marca ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Selectați Marca ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortizarea ca pe acumulat
 DocType: Sales Invoice,C-Form Applicable,Formular-C aplicabil
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Funcționarea timp trebuie să fie mai mare decât 0 pentru funcționare {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse este obligatorie
 DocType: Supplier,Address and Contacts,Adresa si contact
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detaliu UOM de conversie
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Păstrați-l in parametrii web amiabili si anume 900px (w) pe 100px (h)
 DocType: Program,Program Abbreviation,Abreviere de program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Producția Comanda nu poate fi ridicată pe un șablon Postul
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Tarifele sunt actualizate în Primirea cumparare pentru fiecare articol
 DocType: Warranty Claim,Resolved By,Rezolvat prin
 DocType: Bank Guarantee,Start Date,Data începerii
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alocaţi concedii pentru o perioadă.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Cecuri și Depozite respingă incorect
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Creați citate client
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Creați citate client
 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 +38,Bill of Materials (BOM),Factură de materiale (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Timpul mediu luate de către furnizor de a livra
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Rezultatul evaluării
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ore
 DocType: Project,Expected Start Date,Data de Incepere Preconizata
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Eliminați element cazul în care costurile nu se aplică în acest element
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Moneda de tranzacție trebuie să fie aceeași ca și de plată Gateway monedă
 DocType: Payment Entry,Receive,Primi
@@ -4172,19 +4178,19 @@
 DocType: Workstation,Operating Costs,Costuri de operare
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Acțiune în cazul în care Acumulate Buget lunar depășit
 DocType: Purchase Invoice,Submit on creation,Publica cu privire la crearea
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Moneda pentru {0} trebuie să fie {1}
 DocType: Asset,Disposal Date,eliminare Data
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-mailuri vor fi trimise tuturor angajaților activi ai companiei la ora dat, în cazul în care nu au vacanță. Rezumatul răspunsurilor vor fi trimise la miezul nopții."
 DocType: Employee Leave Approver,Employee Leave Approver,Aprobator Concediu Angajat
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rând {0}: O intrare de Comandă există deja pentru acest depozit {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nu se poate declara pierdut, pentru că Oferta a fost realizata."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback formare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Producția de Ordine {0} trebuie să fie prezentate
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vă rugăm să selectați data de început și Data de final pentru postul {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},"Desigur, este obligatorie în rândul {0}"
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Până în prezent nu poate fi înainte de data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Adăugați / editați preturi
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Adăugați / editați preturi
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Batch,Parent Batch,Lotul părinte
 DocType: Cheque Print Template,Cheque Print Template,Format Print cecului
@@ -4198,7 +4204,7 @@
 ,Ordered Items To Be Delivered,Comandat de elemente pentru a fi livrate
 DocType: Account,Income,Venit
 DocType: Industry Type,Industry Type,Industrie Tip
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Ceva a mers prost!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Ceva a mers prost!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Factură de vânzări {0} a fost deja prezentat
 DocType: Assessment Result Detail,Score,Scor
@@ -4229,17 +4235,17 @@
 DocType: Item,Variant Based On,Varianta Bazat pe
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage total alocat este de 100%. Este {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Furnizorii dumneavoastră
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nu se poate seta pierdut deoarece se intocmeste comandă de vânzări.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Furnizor de piesa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primit de la
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nu se poate deduce atunci când este categoria de &quot;evaluare&quot; sau &quot;Vaulation și Total&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Primit de la
 DocType: Lead,Converted,Transformat
 DocType: Item,Has Serial No,Are nr. de serie
 DocType: Employee,Date of Issue,Data Problemei
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: de la {0} pentru {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: de la {0} pentru {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Set Furnizor de produs {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Rândul {0}: Valoarea ore trebuie să fie mai mare decât zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.\
@@ -4248,20 +4254,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"monedă de facturare trebuie să fie egală cu moneda sau contul de partid valută, fie implicit comapany lui"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lasă încasări
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ce face?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Pentru Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Toate Admitere Student
 ,Average Commission Rate,Rată de comision medie
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Prezenţa nu poate fi consemnată pentru date viitoare
 DocType: Pricing Rule,Pricing Rule Help,Regula de stabilire a prețurilor de ajutor
 DocType: School House,House Name,Numele casei
 DocType: Purchase Taxes and Charges,Account Head,Titularul Contului
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Electric
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adăugați restul organizației dvs. ca utilizatorii. Puteți adăuga, de asemenea, invita clienții să portalul prin adăugarea acestora din Contacte"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Adăugați restul organizației dvs. ca utilizatorii. Puteți adăuga, de asemenea, invita clienții să portalul prin adăugarea acestora din Contacte"
 DocType: Stock Entry,Total Value Difference (Out - In),Diferența Valoarea totală (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4270,7 +4276,7 @@
 DocType: Item,Customer Code,Cod client
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Memento dată naştere pentru {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Zile de la ultima comandă
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debit la contul trebuie să fie un cont de bilanț
 DocType: Buying Settings,Naming Series,Naming Series
 DocType: Leave Block List,Leave Block List Name,Denumire Lista Concedii Blocate
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Asigurare Data de pornire ar trebui să fie mai mică de asigurare Data terminării
@@ -4285,9 +4291,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Salariu de alunecare angajat al {0} deja creat pentru foaie de timp {1}
 DocType: Vehicle Log,Odometer,Contorul de kilometraj
 DocType: Sales Order Item,Ordered Qty,Ordonat Cantitate
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postul {0} este dezactivat
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postul {0} este dezactivat
 DocType: Stock Settings,Stock Frozen Upto,Stoc Frozen Până la
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nu conține nici un element de stoc
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nu conține nici un element de stoc
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Activitatea de proiect / sarcină.
 DocType: Vehicle Log,Refuelling Details,Detalii de realimentare
@@ -4297,8 +4303,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Rata Ultima achiziție nu a fost găsit
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Scrie Off Suma (Compania de valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,Ore de facturare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM implicit pentru {0} nu a fost găsit
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Va rugam sa seta cantitatea reordona
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Atingeți elementele pentru a le adăuga aici
 DocType: Fees,Program Enrollment,programul de înscriere
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Cost Landed
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Vă rugăm să setați {0}
@@ -4322,7 +4329,7 @@
 DocType: Maintenance Visit,Maintenance Date,Data Mentenanta
 DocType: Purchase Invoice Item,Rejected Serial No,Respins de ordine
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Anul Data de începere sau de încheiere este suprapunerea cu {0}. Pentru a evita vă rugăm să setați companie
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data de începere trebuie să fie mai mică decât data de sfârșit pentru postul {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.","Exemplu:. ABCD ##### 
  Dacă seria este setat și nu de serie nu este menționat în tranzacții, numărul de atunci automat de serie va fi creat pe baza acestei serii. Dacă întotdeauna doriți să se menționeze explicit Serial nr de acest articol. părăsi acest gol."
@@ -4400,7 +4407,6 @@
 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
-DocType: Grade Interval,Grade Interval,grad Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Data începerii anului fiscal și se termină anul fiscal la data sunt deja stabilite în anul fiscal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance-ul Data actualizat
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Lot
@@ -4446,14 +4452,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lăsați necontrolabil dacă nu doriți să luați în considerare lotul în timp ce faceți grupuri bazate pe curs.
 DocType: Asset,Frequency of Depreciation (Months),Frecventa de amortizare (Luni)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Cont de credit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Cont de credit
 DocType: Landed Cost Item,Landed Cost Item,Cost Final Articol
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Configurarea unui site simplu pentru organizația mea
 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 +666,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 +649,Please specify Attribute Value for attribute {0},Vă rugăm să specificați Atribut Valoare pentru atribut {0}
 DocType: Item,Default Warehouse,Depozit Implicit
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buget nu pot fi atribuite în Grupa Contul {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vă rugăm să introduceți centru de cost părinte
@@ -4498,7 +4504,7 @@
 DocType: Opportunity Item,Basic Rate,Rată elementară
 DocType: GL Entry,Credit Amount,Suma de credit
 DocType: Cheque Print Template,Signatory Position,Poziție semnatar
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Setați ca Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Setați ca Lost
 DocType: Timesheet,Total Billable Hours,Numărul total de ore facturabile
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Plată Primirea Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Aceasta se bazează pe tranzacțiile împotriva acestui client. A se vedea calendarul de mai jos pentru detalii
@@ -4512,11 +4518,11 @@
 ,Items To Be Requested,Articole care vor fi solicitate
 DocType: Purchase Order,Get Last Purchase Rate,Obtine Ultima Rate de Cumparare
 DocType: Company,Company Info,Informatii Companie
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Selectați sau adăugați client nou
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Selectați sau adăugați client nou
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,centru de cost este necesar pentru a rezerva o cerere de cheltuieli
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplicţie a fondurilor (active)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Aceasta se bazează pe prezența a acestui angajat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Contul debit
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4525,13 +4531,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Suma cumpărată
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Furnizor de oferta {0} creat
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Sfârșitul anului nu poate fi înainte de Anul de început
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Beneficiile angajatului
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vă rugăm să setați o valoare implicită Lista de vacanță pentru angajat {0} sau companie {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nu există
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nu există
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rândul nr {0}: Suma nu poate fi mai mare decât așteptarea Suma împotriva revendicării cheltuieli {1}. În așteptarea Suma este {2}
@@ -4540,15 +4546,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,Butuc
 DocType: GL Entry,Voucher Type,Tip Voucher
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Lista de preturi nu a fost găsit sau cu handicap
 DocType: Employee Loan Application,Approved,Aprobat
 DocType: Pricing Rule,Price,Preț
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Angajat eliberat din finctie pe {0} trebuie să fie setat ca 'Plecat'
 DocType: Guardian,Guardian,gardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Expertiza {0} creată pentru angajatul {1} în intervalul de timp dat
 DocType: Employee,Education,Educație
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Campanie denumita de
 DocType: Employee,Current Address Is,Adresa Actuală Este
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modificată
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Opțional. Setează implicit moneda companiei, în cazul în care nu este specificat."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Inregistrari contabile de jurnal.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Cantitate Disponibil la Depozitul
@@ -4557,7 +4565,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rând {0}: Parte / conturi nu se potrivește cu {1} / {2} din {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Va rugam sa introduceti cont de cheltuieli
 DocType: Account,Stock,Stoc
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rând # {0}: Tip document de referință trebuie să fie unul dintre comandă cumparare, factură sau Jurnal de intrare"
 DocType: Employee,Current Address,Adresa actuală
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Dacă elementul este o variantă de un alt element atunci descriere, imagine, de stabilire a prețurilor, impozite etc vor fi stabilite de șablon dacă nu se specifică în mod explicit"
 DocType: Serial No,Purchase / Manufacture Details,Detalii de cumpărare / Fabricarea
@@ -4585,7 +4593,7 @@
 DocType: Hub Settings,Hub Settings,Setări Hub
 DocType: Project,Gross Margin %,Marja Bruta%
 DocType: BOM,With Operations,Cu Operațiuni
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Înregistrări contabile au fost deja efectuate în valută {0} pentru compania {1}. Vă rugăm să selectați un cont de primit sau de plătit cu moneda {0}.
 DocType: Asset,Is Existing Asset,Este activ existent
 DocType: Salary Detail,Statistical Component,Componenta statistică
 DocType: Salary Detail,Statistical Component,Componenta statistică
@@ -4610,7 +4618,7 @@
 DocType: Assessment Plan,Room,Cameră
 DocType: Purchase Order,Advance Paid,Avans plătit
 DocType: Item,Item Tax,Taxa Articol
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material de Furnizor
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material de Furnizor
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Accize factură
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% apare mai mult decât o dată
 DocType: Expense Claim,Employees Email Id,Id Email Angajat
@@ -4641,9 +4649,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Atașați logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Niveluri stoc
 DocType: Customer,Commission Rate,Rata de Comision
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Face Varianta
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Face Varianta
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Blocaţi cereri de concediu pe departamente.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipul de plată trebuie să fie unul dintre Primire, Pay și de transfer intern"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Tipul de plată trebuie să fie unul dintre Primire, Pay și de transfer intern"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Google Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Coșul este gol
 DocType: Vehicle,Model,Model
@@ -4654,6 +4662,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Afișați atașamentele publice
 DocType: Packing Slip,Package Weight Details,Pachetul Greutate Detalii
 DocType: Payment Gateway Account,Payment Gateway Account,Plata cont Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,După finalizarea plății de redirecționare utilizator la pagina selectată.
@@ -4672,15 +4681,15 @@
 DocType: Batch,Expiry Date,Data expirării
 ,Supplier Addresses and Contacts,Adrese furnizorului și de Contacte
 ,accounts-browser,conturi de browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vă rugăm să selectați categoria întâi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vă rugăm să selectați categoria întâi
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Maestru proiect.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Pentru a permite supra-facturare sau supra-ordonare, să actualizeze &quot;alocație&quot; în Setări stoc sau elementul."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Nu afisa nici un simbol de genul $ etc alături de valute.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Jumatate de zi)
 DocType: Supplier,Credit Days,Zile de Credit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Asigurați-Lot Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Asigurați-Lot Student
 DocType: Leave Type,Is Carry Forward,Este Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Obține articole din FDM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Obține articole din FDM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Timpul in Zile Conducere
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rând # {0}: Detașarea Data trebuie să fie aceeași ca dată de achiziție {1} din activ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vă rugăm să introduceți comenzile de vânzări în tabelul de mai sus
@@ -4697,8 +4706,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Rând {0}: debit de intrare nu poate fi legat de o {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vă rugăm să configurați seria de numerotare pentru Participare prin Configurare&gt; Serie de numerotare
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 733f3f4..0c0988f 100644
--- a/erpnext/translations/ru.csv
+++ b/erpnext/translations/ru.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Арендованный
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Применимо для пользователя
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Остановился производственного заказа не может быть отменено, откупоривать сначала отменить"
 DocType: Vehicle Service,Mileage,пробег
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Вы действительно хотите отказаться от этого актива?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Выберите По умолчанию Поставщик
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Выберите По умолчанию Поставщик
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валюта необходима для Прейскурантом {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Будет рассчитана в сделке.
 DocType: Purchase Order,Customer Contact,Контакты с клиентами
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ({1})
 DocType: Manufacturing Settings,Default 10 mins,По умолчанию 10 минут
 DocType: Leave Type,Leave Type Name,Оставьте Тип Название
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Показать открыт
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показать открыт
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,"Проверять, выписываться"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Запись в журнале Опубликовано
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Пакетная Пункт экспирации Статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банковский счет
 DocType: Mode of Payment Account,Mode of Payment Account,Форма оплаты счета
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Показать варианты
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показать варианты
 DocType: Academic Term,Academic Term,академический срок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,материал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количество
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Количество
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Таблица учета не может быть пустой.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Кредиты (обязательства)
 DocType: Employee Education,Year of Passing,Год Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Ссылка:% s, Код товара:% s и клиентов:% s"
 DocType: Item,Country of Origin,Страна происхождения
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,В Наличии
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Открыть вопросы
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Здравоохранение
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Задержка в оплате (дни)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Услуги Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серийный номер: {0} уже указан в счете продаж: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Счет
 DocType: Maintenance Schedule Item,Periodicity,Периодичность
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Финансовый год {0} требуется
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Ожидаемая дата поставки быть перед Sales Order Date
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Прикрепите файл .csv с двумя колоннами, одна для старого имени и одина для нового названия"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не в каком-либо активном финансовом годе.
 DocType: Packed Item,Parent Detail docname,Родитель Деталь DOCNAME
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Ссылка: {0}, Код товара: {1} и Заказчик: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,кг
 DocType: Student Log,Log,Журнал
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Открытие на работу.
 DocType: Item Attribute,Increment,Приращение
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Выберите Склад ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Выберите Склад ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,То же компания вошла более чем один раз
 DocType: Employee,Married,Замужем
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускается для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Получить товары от
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускается для {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Получить товары от
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Нет элементов, перечисленных"
 DocType: Payment Reconciliation,Reconcile,Согласовать
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продуктовый
 DocType: Quality Inspection Reading,Reading 1,Чтение 1
 DocType: Process Payroll,Make Bank Entry,Создать проводку по Банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсионные фонды
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следующая амортизация Дата не может быть перед покупкой Даты
 DocType: SMS Center,All Sales Person,Все менеджеры по продажам
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**Распределение по месяцам** позволяет распределить бюджет/цель по месяцам при наличии сезонности в вашем бизнесе.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Не нашли товар
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Не нашли товар
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Структура заработной платы Отсутствующий
 DocType: Lead,Person Name,Имя лица
 DocType: Sales Invoice Item,Sales Invoice Item,Счет продаж товара
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","например, &quot;Начальная школа&quot; или &quot;Университет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Отчеты по Запасам
 DocType: Warehouse,Warehouse Detail,Склад Подробно
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитный лимит был перейден для клиента {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Срок Дата окончания не может быть позднее, чем за год Дата окончания учебного года, к которому этот термин связан (учебный год {}). Пожалуйста, исправьте дату и попробуйте еще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","Нельзя отменить выбор ""Является основным средством"", поскольку по данному пункту имеется запись по активам"
 DocType: Vehicle Service,Brake Oil,Тормозные масла
 DocType: Tax Rule,Tax Type,Налоги Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы, чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт изображения (если не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существует клиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Часовая Ставка / 60) * Фактическое время работы
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Выберите BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Выберите BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Стоимость доставленных изделий
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Праздник на {0} не между From Date и To Date
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,Школы
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Нет отпуска найденная запись для сотрудника {0} для {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Пожалуйста, введите название первой Компании"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Пожалуйста, выберите КОМПАНИЯ Первый"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Общая стоимость
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Сумма претензии
 DocType: Employee,Mr,Г-н
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Дубликат группа клиентов найти в таблице Cutomer группы
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип Поставщик / Поставщик
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Тип Поставщик / Поставщик
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Потребляемый
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,класс
 DocType: Sales Invoice Item,Delivered By Supplier,Поставленные Поставщиком
 DocType: SMS Center,All Contact,Все Связаться
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производственный заказ уже создан для всех элементов с BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Производственный заказ уже создан для всех элементов с BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годовой оклад
 DocType: Daily Work Summary,Daily Work Summary,Ежедневно Резюме Работа
 DocType: Period Closing Voucher,Closing Fiscal Year,Закрытие финансового года
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} заморожен
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} заморожен
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Пожалуйста, выберите существующую компанию для создания плана счетов"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Расходы по Запасам
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Выберите целевое хранилище
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra запись
 DocType: Journal Entry Account,Credit in Company Currency,Кредит в валюте компании
 DocType: Delivery Note,Installation Status,Состояние установки
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Вы хотите обновить посещаемость? <br> Присутствуют: {0} \ <br> Отсутствовали: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Кол-во Принято + Отклонено должно быть равно полученному количеству по позиции {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Поставка сырья для покупки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,По крайней мере один способ оплаты требуется для POS счета.
 DocType: Products Settings,Show Products as a List,Показать продукты списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Скачать шаблон, заполнить соответствующие данные и приложить измененный файл.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Сделать запись амортизации
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запроса
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Сделать Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Сделать Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Вещание
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Реализация
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Информация о выполненных операциях.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Запланируйте для посещения технического обслуживания.
 DocType: SMS Settings,Enter url parameter for message,Введите параметр URL для сообщения
 DocType: POS Profile,Customer Groups,Группы клиентов
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансовые отчеты
 DocType: Guardian,Students,Студенты
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила применения цен и скидки.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Предварительная сумма не может быть больше, чем {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список Серия для этого сделки
 DocType: Company,Default Payroll Payable Account,По умолчанию Payroll оплаты счетов
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Обновление Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Обновление Email Group
 DocType: Sales Invoice,Is Opening Entry,Открывает запись
 DocType: Customer Group,Mention if non-standard receivable account applicable,Упоминание если нестандартная задолженность счет применимо
 DocType: Course Schedule,Instructor Name,Имя инструктора
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Для Склада является обязательным полем для проведения
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,Торговый посредник
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Если этот флажок установлен, будет включать в себя внебиржевые элементы в материале запросов."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,На накладная Пункт
 ,Production Orders in Progress,Производственные заказы в Прогресс
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чистые денежные средства от финансовой деятельности
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage полон, не спасло"
 DocType: Lead,Address & Contact,Адрес и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Добавить неиспользованные отпуска с прошлых периодов
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следующая Периодическая {0} будет создан на {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Общая калькуляция Сумма (с помощью Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Спецификация
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставьте Заблокированные
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банковские записи
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Банковские записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,За год
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Товар с Сверки Запасов
 DocType: Stock Entry,Sales Invoice No,Номер Счета Продажи
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Опубликовать в Hub
 DocType: Student Admission,Student Admission,приёму студентов
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Заказ материалов
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Заказ материалов
 DocType: Bank Reconciliation,Update Clearance Date,Обновление просвет Дата
 DocType: Item,Purchase Details,Покупка Подробности
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Пункт {0} не найден в &quot;давальческое сырье&quot; таблицы в Заказе {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"Выдающиеся чеки и депозиты, чтобы очистить"
 DocType: Item,Synced With Hub,Синхронизированные со ступицей
 DocType: Vehicle,Fleet Manager,Управляющий флотом
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Строка # {0}: {1} не может быть отрицательным по пункту {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Неправильный Пароль
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Строка # {0}: {1} не может быть отрицательным по пункту {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Неправильный Пароль
 DocType: Item,Variant Of,Вариант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Завершен Кол-во не может быть больше, чем ""Кол-во для изготовления"""
 DocType: Period Closing Voucher,Closing Account Head,Закрытие счета руководитель
 DocType: Employee,External Work History,Внешний Работа История
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклическая ссылка Ошибка
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Сообщите по электронной почте по созданию автоматической запрос материалов
 DocType: Journal Entry,Multi Currency,Мульти валюта
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип счета
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Документы  Отгрузки
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Документы  Отгрузки
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Настройка Налоги
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Себестоимость проданных активов
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата запись была изменена после того, как вытащил его. Пожалуйста, вытащить его снова."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
-DocType: Grade Interval,Min Score,Минимальная Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} введен дважды в налог по позиции
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Резюме на этой неделе и в ожидании деятельности
 DocType: Student Applicant,Admitted,Признался
 DocType: Workstation,Rent Cost,Стоимость аренды
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ценность заказа
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банк / Кассовые операции против партии или для внутренней передачи
 DocType: Shipping Rule,Valid for Countries,Действительно для странам
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Этот пункт является шаблоном и не могут быть использованы в операциях. Атрибуты Деталь будет копироваться в вариантах, если ""не копировать"" не установлен"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Итоговый заказ считается
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например, генеральный директор, директор и т.д.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите 'Repeat на день месяца' значения поля"
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Строка # {0}: Покупка Счет-фактура не может быть сделано в отношении существующего актива {1}
 DocType: Item Tax,Tax Rate,Размер налога
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} уже выделено сотруднику  {1} на период с {2} по {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Выбрать пункт
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Выбрать пункт
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Счет на закупку {0} уже проведен
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Пакетное Нет должно быть таким же, как {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Преобразовать в негрупповой
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партия позиций.
 DocType: C-Form Invoice Detail,Invoice Date,Дата Счета
 DocType: GL Entry,Debit Amount,Дебет Сумма
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Там может быть только 1 аккаунт на компанию в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Пожалуйста, см. приложение"
 DocType: Purchase Order,% Received,% Получено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Создание студенческих групп
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Запрос предложения
 DocType: Salary Slip Timesheet,Working Hours,Часы работы
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Изменение начального / текущий порядковый номер существующей серии.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Создание нового клиента
-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.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Создание заказов на поставку
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Создание нового клиента
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Если несколько правил ценообразования продолжают преобладать, пользователям предлагается установить приоритет вручную разрешить конфликт."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Создание заказов на поставку
 ,Purchase Register,Покупка Становиться на учет
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Взимаемых платежах
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) должен иметь роль ""Согласующий отпуска"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 DocType: Student Log,Medical,Медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина потери
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Причина потери
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,"Ведущий владелец не может быть такой же, как свинец"
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Выделенная сумма не может превышать суммы нерегулируемого
 DocType: Announcement,Receiver,Получатель
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количество и курс
 DocType: Delivery Note,% Installed,% Установлено
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабинеты / лаборатории и т.д., где лекции могут быть запланированы."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Пожалуйста, введите название компании сначала"
 DocType: Purchase Invoice,Supplier Name,Наименование поставщика
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте руководство ERPNext
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обязательное поле - академический год
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обязательное поле - академический год
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Настроить вводный текст, который идет в составе этой электронной почте. Каждая транзакция имеет отдельный вводный текст."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},"Пожалуйста, задайте кредитную карту по умолчанию для компании {0}"
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальные настройки для всех производственных процессов.
 DocType: Accounts Settings,Accounts Frozen Upto,Счета заморожены До
 DocType: SMS Log,Sent On,Направлено на
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} выбран несколько раз в Таблице Атрибутов
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Не применяется
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха.
 DocType: Request for Quotation Item,Required Date,Требуется Дата
 DocType: Delivery Note,Billing Address,Адрес для выставления счетов
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Пожалуйста, введите Код товара."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Пожалуйста, введите Код товара."
 DocType: BOM,Costing,Стоимость
 DocType: Tax Rule,Billing County,Платежный County
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Если флажок установлен, сумма налога будет считаться уже включены в Печать Оценить / Количество печати"
@@ -508,6 +512,7 @@
 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,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Невозможно изменить метод оценки, так как существуют транзакции в отношении некоторых товаров, у которых нет собственного метода оценки"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всего листья, выделенные является обязательным"
 DocType: Job Opening,Description of a Job Opening,Описание работу Открытие
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В ожидании деятельность на сегодняшний день
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Выберите курс
 DocType: Timesheet Detail,Hrs,часов
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Пожалуйста, выберите компанию"
 DocType: Stock Entry Detail,Difference Account,Счет разницы
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Невозможно закрыть задача, как ее зависит задача {0} не закрыт."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Пожалуйста, введите Склад для которых Материал Запрос будет поднят"
 DocType: Production Order,Additional Operating Cost,Дополнительные Эксплуатационные расходы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Чтобы объединить, следующие свойства должны быть одинаковыми для обоих пунктов"
 DocType: Shipping Rule,Net Weight,Вес нетто
 DocType: Employee,Emergency Phone,В случае чрезвычайных ситуаций
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купить
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Пожалуйста, определите оценку для Threshold 0%"
 DocType: Sales Order,To Deliver,Для доставки
 DocType: Purchase Invoice Item,Item,Элемент
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Серийный ни один элемент не может быть дробным
 DocType: Journal Entry,Difference (Dr - Cr),Отличия (д-р - Cr)
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управление субподряда
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Прирост не может быть 0
 DocType: Production Planning Tool,Material Requirement,Потребности в материалах
 DocType: Company,Delete Company Transactions,Удалить Сделки Компания
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Ссылка № и дата Reference является обязательным для операции банка
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Добавить / Изменить Налоги и сборы
 DocType: Purchase Invoice,Supplier Invoice No,Поставщик Счет №
 DocType: Territory,For reference,Для справки
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,Установка Примечание Пункт
 DocType: Production Plan Item,Pending Qty,В ожидании Кол-во
 DocType: Budget,Ignore,Игнорировать
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не активен
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не активен
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS отправлено следующих номеров: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Размеры Проверьте настройки для печати
 DocType: Salary Slip,Salary Slip Timesheet,Зарплата скольжению Timesheet
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,Всего комиссия
 DocType: Pricing Rule,Sales Partner,Партнер по продажам
 DocType: Buying Settings,Purchase Receipt Required,Покупка Получение необходимое
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Оценка Оцените является обязательным, если введен Открытие изображения"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не записи не найдено в таблице счетов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Пожалуйста, выберите компании и партийных первого типа"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансовый / отчетный год.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Накопленные значения
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","К сожалению, серийные номера не могут быть объединены"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Сделать заказ клиента
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Сделать заказ клиента
 DocType: Project Task,Project Task,Проект Задача
 ,Lead Id,ID лида
 DocType: C-Form Invoice Detail,Grand Total,Общий итог
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Приложение
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постоянных клиентов
 DocType: Leave Control Panel,Allocate,Выделить
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Возвраты с продаж
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Возвраты с продаж
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примечание: Суммарное количество выделенных листьев {0} не должно быть меньше, чем уже утвержденных листьев {1} на период"
 DocType: Announcement,Posted By,Сообщение от
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляется Поставщиком (прямая поставка)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,Цитата Для
 DocType: Lead,Middle Income,Средний доход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Начальное сальдо (кредит)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Выделенные сумма не может быть отрицательным
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Укажите компанию
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Укажите компанию
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Накладная Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Выберите Учетная запись Оплата сделать Банк Стажер
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Создание записей сотрудников для управления листьев, расходов и заработной платы претензий"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Добавить в базы знаний
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Предложение Написание
 DocType: Payment Entry Deduction,Payment Entry Deduction,Оплата запись Вычет
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в {2} Финансовом году
 DocType: Buying Settings,Settings for Buying Module,Настройки для покупки модуля
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} не принадлежит компании {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Пожалуйста, введите ТОВАРНЫЙ ЧЕК первый"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тогда ценообразование Правила отфильтровываются на основе Заказчика, Группа клиентов, Территория, поставщиков, Тип Поставщик, Кампания, Партнеры по сбыту и т.д."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Чистое изменение в запасах
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Управление кредитов сотрудников
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Связь с Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / по
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Диапазон дат
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новый кредитный лимит меньше текущей суммы задолженности для клиента. Кредитный лимит должен быть зарегистрировано не менее {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""На основании"" и ""Группировка по"" не могут быть одинаковыми"
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,Через несколько минут
 DocType: Issue,Resolution Date,Разрешение Дата
 DocType: Student Batch Name,Batch Name,Пакетная Имя
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet создано:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet создано:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,зачислять
 DocType: Selling Settings,Customer Naming By,Именование клиентов По
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Покажу студент как присутствующий в студенческой Monthly посещаемости отчета
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,Фактическое начало Время
 DocType: BOM Operation,Operation Time,Время работы
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Завершить
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,База
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,База
 DocType: Timesheet,Total Billed Hours,Всего Оплачиваемые Часы
 DocType: Journal Entry,Write Off Amount,Списание Количество
 DocType: Journal Entry,Bill No,Номер накладной
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Student Участники
 DocType: Sales Invoice Timesheet,Time Sheet,Время Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,На основе обратного отнесения затрат на сырье и материалы
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Пожалуйста, введите детали деталя"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,Интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Предпродажа
 DocType: Purchase Receipt,Other Details,Другие детали
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Оплата запись уже создан
 DocType: Purchase Receipt Item Supplied,Current Stock,Наличие на складе
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Строка # {0}: Asset {1} не связан с п {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Просмотр Зарплата скольжению
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Просмотр Зарплата скольжению
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Счет {0} был введен несколько раз
 DocType: Account,Expenses Included In Valuation,"Затрат, включаемых в оценке"
 DocType: Hub Settings,Seller City,Продавец Город
 ,Absent Student Report,Отсутствует Student Report
 DocType: Email Digest,Next email will be sent on:,Следующее письмо будет отправлено на:
 DocType: Offer Letter Term,Offer Letter Term,Условие письма с предложением
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Пункт имеет варианты.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Пункт имеет варианты.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Стоимость акций
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компания {0} не существует
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Дерево Тип
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Дерево Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,"Кол-во,  потребляемое за единицу"
 DocType: Serial No,Warranty Expiry Date,Гарантия срок действия
 DocType: Material Request Item,Quantity and Warehouse,Количество и Склад
 DocType: Sales Invoice,Commission Rate (%),Комиссия ставка (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Установите серию присвоения имен для {0} с помощью меню «Настройка»&gt; «Настройки»&gt; «Название серии»
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Установите серию присвоения имен для {0} с помощью меню «Настройка»&gt; «Настройки»&gt; «Название серии»
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Выберите программу
 DocType: Project,Estimated Cost,Ориентировочная стоимость
@@ -768,7 +770,7 @@
 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,По умолчанию учетная запись
 DocType: Payment Entry,Received Amount (Company Currency),Полученная сумма (Компания Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен, если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планируемые Время окончания
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Возможность От
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Ежемесячная выписка зарплата.
 DocType: BOM,Website Specifications,Сайт характеристики
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещения через Setup&gt; Numbering Series"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: От {0} типа {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования является обязательным
@@ -837,6 +840,7 @@
 DocType: Employee,Bank A/C No.,Банк Сч/Тек №
 DocType: Bank Guarantee,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Чтение 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Частично Заказанный
 DocType: Expense Claim Detail,Expense Claim Type,Тип Авансового Отчета
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Настройки по умолчанию для корзину
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset слом через журнал запись {0}
@@ -844,14 +848,14 @@
 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 +107,Office Maintenance Expenses,Эксплуатационные расходы на офис
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Настройка учетной записи электронной почты
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Пожалуйста, введите пункт первый"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Пожалуйста, введите пункт первый"
 DocType: Account,Liability,Ответственность сторон
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкционированный сумма не может быть больше, чем претензии Сумма в строке {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Семья Фон
 DocType: Request for Quotation Supplier,Send Email,Отправить e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Внимание: Неверный Приложение {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Нет разрешения
 DocType: Company,Default Bank Account,По умолчанию Банковский счет
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Чтобы отфильтровать на основе партии, выберите партия первого типа"
@@ -864,8 +868,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Сотрудник не найден
 DocType: Supplier Quotation,Stopped,Приостановлено
 DocType: Item,If subcontracted to a vendor,Если по субподряду поставщика
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студенческая группа уже обновлена.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студенческая группа уже обновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студенческая группа уже обновлена.
 DocType: SMS Center,All Customer Contact,Все клиентов Связаться
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Загрузить складские остатки с помощью CSV.
 DocType: Warehouse,Tree Details,Детали Дерево
@@ -876,8 +880,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимальная Сумма счета
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: МВЗ {2} не принадлежит Компании {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Счет {2} не может быть группой
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Строка {IDX}: {доктайп} {DOCNAME} не существует в выше &#39;{доктайп}&#39; таблица
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} уже завершен или отменен
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Нет задачи
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День месяца, в который автоматически счет-фактура будет создан, например, 05, 28 и т.д."
 DocType: Asset,Opening Accumulated Depreciation,Начальная Накопленная амортизация
@@ -893,7 +897,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Выберите товары
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} по Счету {1} от {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Расписание курсов
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Расписание курсов
 DocType: Maintenance Visit,Completion Status,Статус завершения
 DocType: HR Settings,Enter retirement age in years,Введите возраст выхода на пенсию в ближайшие годы
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Целевая Склад
@@ -901,7 +905,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Разрешить доставку на получение или Шифрование до этого процента
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Импорт Посещаемость
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Все группы товаров
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все группы товаров
 DocType: Process Payroll,Activity Log,Журнал активности
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Чистая прибыль / убытки
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок.
@@ -912,7 +916,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Заказ на Оплата
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозируемый Количество
 DocType: Sales Invoice,Payment Due Date,Дата платежа
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Пункт Вариант {0} уже существует же атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Открытие&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Открыть To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примечание сообщение
@@ -928,7 +932,7 @@
 DocType: Item Reorder,Re-Order Qty,Кол-во перезаказа
 DocType: Leave Block List Date,Leave Block List Date,Оставьте Блок-лист Дата
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всего Применимые сборы в таблице Purchase квитанций Элементов должны быть такими же, как все налоги и сборы"
 DocType: Sales Team,Incentives,Стимулы
 DocType: SMS Log,Requested Numbers,Требуемые Номера
 DocType: Production Planning Tool,Only Obtain Raw Materials,Получить только сырье
@@ -957,13 +961,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Является субподряду
 DocType: Item Attribute,Item Attribute Values,Пункт значений атрибутов
 DocType: Examination Result,Examination Result,Экспертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Покупка Получение
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Покупка Получение
 ,Received Items To Be Billed,"Полученные товары, на которые нужно выписать счет"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Отправил Зарплатные Slips
 DocType: Employee,Ms,Госпожа
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Мастер Валютный курс.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Справочник Doctype должен быть одним из {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Не удается найти временной интервал в ближайшие {0} дней для работы {1}
 DocType: Production Order,Plan material for sub-assemblies,План материал для Субсборки
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Партнеры по сбыту и территории
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Не может автоматически создавать счета, поскольку есть уже запас баланса на счете. Вы должны создать соответствующий счет, прежде чем вы можете сделать запись на этом складе"
@@ -986,10 +990,9 @@
 DocType: Supplier,Default Payable Accounts,По умолчанию задолженность Кредиторская
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,Компоненты
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Пункт Варианты {0} обновляются
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Пожалуйста, введите Asset Категория в пункте {0}"
 DocType: Quality Inspection Reading,Reading 6,Чтение 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Может не {0} {1} {2} без какого-либо отрицательного выдающийся счет-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Счета-фактуры Advance
 DocType: Hub Settings,Sync Now,Синхронизировать сейчас
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитная запись не может быть связан с {1}
@@ -1003,12 +1006,12 @@
 DocType: Item,Is Purchase Item,Является Покупка товара
 DocType: Asset,Purchase Invoice,Покупка Счет
 DocType: Stock Ledger Entry,Voucher Detail No,Подробности ваучера №
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Новый счет-фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Новый счет-фактуру
 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,Дата открытия и Дата закрытия должны быть внутри одного финансового года
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Дата открытия и Дата закрытия должны быть внутри одного финансового года
 DocType: Lead,Request for Information,Запрос на предоставление информации
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Синхронизация Offline счетов-фактур
-DocType: Payment Request,Paid,Платный
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Синхронизация Offline счетов-фактур
+DocType: Payment Request,Paid,Оплачено
 DocType: Program Fee,Program Fee,Стоимость программы
 DocType: Salary Slip,Total in words,Всего в словах
 DocType: Material Request Item,Lead Time Date,Время выполнения Дата
@@ -1017,7 +1020,7 @@
 DocType: Employee Loan,Sanctioned,санкционированные
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Для элементов 'Товарный набор', складской номер, серийный номер и номер партии будет подтягиваться из таблицы ""Упаковочный лист"". Если складской номер и номер партии одинаковы для всех пакуемых единиц для каждого наименования ""Товарного набора"", эти номера можно ввести в таблице основного наименования, значения будут скопированы в таблицу ""Упаковочного листа""."
 DocType: Job Opening,Publish on website,Публикация на сайте
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Поставки клиентам.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,"Дата Поставщик Счет не может быть больше, чем Дата публикации"
@@ -1028,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Дисперсия
 ,Company Name,Название компании
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Выбрать пункт трансфера
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,"Выберите учетную запись глава банка, в котором проверка была размещена."
@@ -1039,8 +1042,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Платеж по покупке / продаже порядок должен всегда быть помечены как заранее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Химический
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"По умолчанию банк / Наличный счет будет автоматически обновляться в Зарплатный Запись в журнале, когда выбран этот режим."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Интервалы для кода Grade {0} пересекается с интервалами класса для других классов. Пожалуйста, проверьте интервалы {0} и {1} и попробуйте еще раз"
 DocType: BOM,Raw Material Cost(Company Currency),Стоимость сырья (Компания Валюта)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Все детали уже были переданы для этого производственного заказа.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Строка # {0}: ставка не может быть больше ставки, используемой в {1} {2}"
@@ -1053,14 +1054,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товара
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Загрузить шапку фирменного бланка и логотип. (Вы можете отредактировать их позднее).
 DocType: Timesheet Detail,Bill,Билл
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следующий Износ Дата вводится как дату в прошлом
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Белый
 DocType: SMS Center,All Lead (Open),Все лиды (Открыть)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Строка {0}: Кол-во не доступен для {4} на складе {1} при проводки время вступления ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Получить авансы выданные
 DocType: Item,Automatically Create New Batch,Автоматически создавать новую группу
 DocType: Item,Automatically Create New Batch,Автоматически создавать новую группу
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Сделать
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Сделать
 DocType: Student Admission,Admission Start Date,Прием Начальная дата
 DocType: Journal Entry,Total Amount in Words,Общая сумма в словах
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Был ошибка. Один вероятной причиной может быть то, что вы не сохранили форму. Пожалуйста, свяжитесь с support@erpnext.com если проблема не устранена."
@@ -1068,7 +1069,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,Начальное количество
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Пожалуйста, введите счет для изменения высоты"
 DocType: Student Batch Name,Student Batch Name,Student Пакетное Имя
 DocType: Holiday List,Holiday List Name,Имя Список праздников
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сумма кредита
@@ -1088,10 +1089,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Введите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Удалены пункты без изменения в количестве или стоимости.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Таблица атрибутов является обязательной
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Таблица атрибутов является обязательной
 DocType: Production Planning Tool,Get Sales Orders,Получить заказ клиента
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не может быть отрицательным
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Скидка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Скидка
 DocType: Asset,Total Number of Depreciations,Общее количество отчислений на амортизацию
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
 DocType: Sales Invoice Item,Rate With Margin,Оценить с маржой
@@ -1107,7 +1108,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервировано Склад в заказ клиента / склад готовой продукции
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Продажа Сумма
 DocType: Repayment Schedule,Interest Amount,Проценты Сумма
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Вы Утверждающий Расходы для этой записи. Пожалуйста, Обновите ""Статус"" и Сохраните"
 DocType: Serial No,Creation Document No,Создание документа Нет
 DocType: Issue,Issue,Проблема
 DocType: Asset,Scrapped,Уничтоженный
@@ -1115,12 +1116,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибуты для товара Variant. например, размер, цвет и т.д."
 DocType: Purchase Invoice,Returns,Возвращает
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Склад
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Набор персонала
 DocType: Lead,Organization Name,Название организации
 DocType: Tax Rule,Shipping State,Государственный Доставка
 ,Projected Quantity as Source,Планируемое количество как источник
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Товар должен быть добавлены с помощью ""Получить товары от покупки ПОСТУПЛЕНИЯ кнопку '"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включить внебиржевые пункты
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Расходы на продажи
@@ -1128,12 +1129,12 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Реализация Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Почтовый индекс
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Почтовый индекс
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Заказ клиента {0} {1}
 DocType: Opportunity,Contact Info,Контактная информация
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Создание изображения в дневнике
 DocType: Packing Slip,Net Weight UOM,Вес нетто единица измерения
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Результаты
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Результаты
 DocType: Item,Default Supplier,Поставщик по умолчанию
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на производство Процент
 DocType: Employee Loan,Repayment Schedule,График погашения
@@ -1141,7 +1142,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Получить Weekly Выкл Даты
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше, чем Дата начала"
 DocType: Sales Person,Select company name first.,Выберите название компании в первую очередь.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Доктор
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Котировки полученных от поставщиков.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Средний возраст
@@ -1159,7 +1160,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площадь Производительность
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспортные расходы
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Неправильный атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} должен быть проведен
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} должен быть проведен
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количество должно быть меньше или равно {0}
 DocType: SMS Center,Total Characters,Персонажей
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Пожалуйста, выберите спецификации в спецификации поля для пункта {0}"
@@ -1170,7 +1171,7 @@
 DocType: Sales Partner,Distributor,Дистрибьютор
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корзина Правило Доставка
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Пожалуйста, установите &quot;Применить Дополнительная Скидка On &#39;"
 ,Ordered Items To Be Billed,"Заказал пунктов, которые будут Объявленный"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Диапазон должен быть меньше, чем диапазон"
 DocType: Global Defaults,Global Defaults,Глобальные вводные по умолчанию
@@ -1180,7 +1181,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Год начала
 DocType: Purchase Invoice,Start date of current invoice's period,Дату периода текущего счета-фактуры начнем
 DocType: Salary Slip,Leave Without Pay,Отпуск без сохранения содержания
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Ошибка Планирования Мощностей
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Ошибка Планирования Мощностей
 ,Trial Balance for Party,Пробный баланс для партии
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Прибыль
@@ -1195,7 +1196,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Это будет добавлена в Кодекс пункта варианте. Например, если ваш аббревиатура ""SM"", и код деталь ""Футболка"", код товара из вариантов будет ""T-Shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Чистая Платное (прописью) будут видны, как только вы сохраните Зарплата Слип."
 DocType: Purchase Invoice,Is Return,Является Вернуться
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Возврат / дебетовые Примечание
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Возврат / дебетовые Примечание
 DocType: Price List Country,Price List Country,Цены Страна
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} действительные серийные номера для позиции {1}
@@ -1205,11 +1206,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Пожалуйста, введите код товара, чтобы получить номер партии"
 DocType: Stock Settings,Default Item Group,По умолчанию Пункт Группа
 DocType: Employee Loan,Partially Disbursed,Частично Освоено
-DocType: Grading Structure,Grading System Name,Название системы классификации
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База данных поставщиков.
 DocType: Account,Balance Sheet,Балансовый отчет
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Центр Стоимость для элемента данных с Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплаты не настроен. Пожалуйста, проверьте, имеет ли учетная запись была установлена на режим платежей или на POS Profile."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш продавец получит напоминание в этот день, чтобы связаться с клиентом"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Тот же элемент не может быть введен несколько раз.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Дальнейшие счета могут быть сделаны в соответствии с группами, но Вы можете быть против не-групп"
@@ -1221,7 +1221,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток-Ledger Записи и GL Записи повторно отправил для выбранных Покупка расписок
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток-Ledger Записи и GL Записи повторно отправил для выбранных Покупка расписок
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
 DocType: Holiday,Holiday,Выходной
 DocType: Support Settings,Close Issue After Days,Закрыть Issue После дней
@@ -1247,18 +1247,18 @@
 DocType: Maintenance Visit Purpose,Work Done,Сделано
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Пожалуйста, укажите как минимум один атрибут в таблице атрибутов"
 DocType: Announcement,All Students,Все студенты
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Пункт {0} должен быть не складской товар
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Посмотреть Леджер
 DocType: Grading Scale,Intervals,Интервалы
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Старейшие
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем, пожалуйста, измените имя элемента или переименовать группу товаров"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,Строка {0}: Вид деятельности является обязательным.
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,"Дивиденды, выплачиваемые"
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +164,Dividends Paid,Оплачено дивидендов
 apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,Главная книга
 DocType: Stock Reconciliation,Difference Amount,Разница Сумма
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +170,Retained Earnings,Нераспределенная Прибыль
@@ -1291,9 +1291,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Выплата заработной платы от {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Получить неоплаченных счетов-фактур
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Заказы помогут вам планировать и следить за ваши покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","К сожалению, компании не могут быть объединены"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Общее количество выпуска / передачи {0} в Material Request {1} \ не может быть больше требуемого количества {2} для п {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Небольшой
@@ -1314,10 +1314,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ряд {0}: Кол-во является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сельское хозяйство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синхронизация Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Синхронизация Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваши продукты или услуги
 DocType: Mode of Payment,Mode of Payment,Способ оплаты
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сайт изображение должно быть общественное файл или адрес веб-сайта
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Это корень группу товаров и не могут быть изменены.
@@ -1335,18 +1335,18 @@
 DocType: Student Group Student,Group Roll Number,Номер рулона группы
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, только кредитные счета могут быть связаны с дебетовой записью"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сумма всех весов задача должна быть 1. Пожалуйста, измените веса всех задач проекта, соответственно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Уведомление о доставке {0} не проведено
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цены Правило сначала выбирается на основе ""Применить На"" поле, которое может быть Пункт, Пункт Группа или Марка."
 DocType: Hub Settings,Seller Website,Этого продавца
 DocType: Item,ITEM-,ПУНКТ-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Статус производственного заказа {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Статус производственного заказа {0}
 DocType: Appraisal Goal,Goal,Цель
 DocType: Sales Invoice Item,Edit Description,Редактировать описание
 ,Team Updates,Команда обновления
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Для поставщиков
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Для поставщиков
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Установка Тип аккаунта помогает в выборе этого счет в сделках.
 DocType: Purchase Invoice,Grand Total (Company Currency),Общий итог (Компания Валюта)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Создание Формат печати
@@ -1362,7 +1362,7 @@
 DocType: Depreciation Schedule,Journal Entry,Запись в дневнике
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} элементов в обработке
 DocType: Workstation,Workstation Name,Имя рабочей станции
-DocType: Grade Interval,Grade Code,Код Оценка
+DocType: Grading Scale Interval,Grade Code,Код Оценка
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Электронная почта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} не принадлежит к пункту {1}
@@ -1379,7 +1379,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Оборудование
 DocType: Sales Order,Recurring Upto,Повторяющиеся Upto
 DocType: Attendance,HR Manager,Менеджер по подбору кадров
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Пожалуйста, выберите компанию"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Пожалуйста, выберите компанию"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Дата выставления счета поставщиком
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вам необходимо включить Корзину
@@ -1395,7 +1395,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Продукты питания
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старение Диапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Нет посещений
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},График обслуживания {0} существует против {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,поступив студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закрытии счета должны быть {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сумма баллов за все цели должны быть 100. Это {0}
@@ -1420,7 +1421,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Среднее Daily Исходящие
 DocType: POS Profile,Campaign,Кампания
 DocType: Supplier,Name and Type,Наименование и тип
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или ""Отклонено"""
 DocType: Purchase Invoice,Contact Person,Контактное Лицо
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Ожидаемая Дата начала"" не может быть больше, чем ""Ожидаемая Дата окончания"""
 DocType: Course Scheduling Tool,Course End Date,Курс Дата окончания
@@ -1443,14 +1444,15 @@
 DocType: Sales Invoice,Shipping Address Name,Адрес доставки Имя
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План счетов
 DocType: Material Request,Terms and Conditions Content,Условия Содержимое
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,"не может быть больше, чем 100"
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,"не может быть больше, чем 100"
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Незапланированный
 DocType: Employee,Owned,Присвоено
 DocType: Salary Detail,Depends on Leave Without Pay,Зависит от отпуска без сохранения заработной платы
 DocType: Pricing Rule,"Higher the number, higher the priority","Чем выше число, тем выше приоритет"
 ,Purchase Invoice Trends,Счета-фактуры Тенденции
 DocType: Employee,Better Prospects,Потенциальные покупатели
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Строка # {0}: партия {1} имеет только {2} qty. Выберите другой пакет, в котором имеется {3} qty, или разбейте строку на несколько строк, чтобы доставлять / выпускать из нескольких партий"
 DocType: Vehicle,License Plate,Номерной знак
 DocType: Appraisal,Goals,Цели
 DocType: Warranty Claim,Warranty / AMC Status,Гарантия / АМК Статус
@@ -1469,7 +1471,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Сотрудник не может сообщить себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Если счет замораживается, записи разрешается ограниченных пользователей."
 DocType: Email Digest,Bank Balance,Банковский баланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Бухгалтерская Проводка для {0}: {1} может быть сделана только в валюте: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы, необходимая квалификация и т.д."
 DocType: Journal Entry Account,Account Balance,Остаток на счете
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Налоговый Правило для сделок.
@@ -1480,7 +1482,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показать P &amp; L сальдо Unclosed финансовый год
 DocType: Shipping Rule,Shipping Account,Доставка счета
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Счет {2} неактивен
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Сделать заказы клиентов, чтобы помочь вам спланировать работу и поставить на время"
 DocType: Quality Inspection,Readings,Показания
 DocType: Stock Entry,Total Additional Costs,Всего Дополнительные расходы
 DocType: Course Schedule,SH,SH
@@ -1491,7 +1493,7 @@
 DocType: Shipping Rule Condition,To Value,Произвести оценку
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Упаковочный лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Упаковочный лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Настройки Настройка SMS Gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Ошибка при импортировании!
@@ -1513,11 +1515,11 @@
 DocType: Company,Services,Услуги
 DocType: HR Settings,Email Salary Slip to Employee,E-mail Зарплата скольжению работнику
 DocType: Cost Center,Parent Cost Center,Родитель МВЗ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Выбор возможного поставщика
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Выбор возможного поставщика
 DocType: Sales Invoice,Source,Источник
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показать закрыто
 DocType: Leave Type,Is Leave Without Pay,Является отпуск без
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категория активов является обязательным для фиксированного элемента активов
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Не записи не найдено в таблице оплаты
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Это {0} конфликты с {1} для {2} {3}
 DocType: Student Attendance Tool,Students HTML,Студенты HTML
@@ -1535,7 +1537,7 @@
 DocType: Student,Date of Leaving,Дата Покидая
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,Создание потенциальных
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Создание потенциальных
 DocType: Maintenance Schedule,Schedules,Расписание
 DocType: Purchase Invoice Item,Net Amount,Чистая сумма
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM детали №
@@ -1563,9 +1565,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Программа Учащихся
 DocType: Sales Invoice Item,Brand Name,Имя Бренда
 DocType: Purchase Receipt,Transporter Details,Transporter Детали
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,По умолчанию склад требуется для выбранного элемента
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Рамка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Возможный поставщик
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Возможный поставщик
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организация
 DocType: Budget,Monthly Distribution,Ежемесячно дистрибуция
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Список приемщика пуст. Пожалуйста, создайте Список приемщика"
@@ -1573,7 +1575,7 @@
 DocType: Sales Partner,Sales Partner Target,Цели Партнера по продажам
 DocType: Loan Type,Maximum Loan Amount,Максимальная сумма кредита
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Повторяющийся номер ролика для ученика {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Повторяющийся номер ролика для ученика {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Действие, если годовой бюджет превышено"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материал Заказать орденом
 DocType: Shopping Cart Settings,Payment Success URL,Успех Оплата URL
@@ -1594,9 +1596,9 @@
 DocType: Employee Loan,Repayment Method,Способ погашения
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Если этот флажок установлен, главная страница будет по умолчанию Item Group для веб-сайте"
 DocType: Quality Inspection Reading,Reading 4,Чтение 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},По умолчанию BOM для {0} не найдено для проекта {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},По умолчанию BOM для {0} не найдено для проекта {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Претензии по счет компании.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенты в центре системы, добавьте все студенты"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенты в центре системы, добавьте все студенты"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Строка # {0}: дате зазора {1} не может быть до того Cheque Дата {2}
 DocType: Company,Default Holiday List,По умолчанию Список праздников
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Строка {0}: От времени и времени {1} перекрывается с {2}
@@ -1608,21 +1610,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"На следующий день (с), на которой вы подаете заявление на отпуск праздники. Вам не нужно обратиться за разрешением."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплаты на e-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Новое задание
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Сделать цитаты
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Сделать цитаты
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Другие отчеты
 DocType: Dependent Task,Dependent Task,Зависит Задача
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Попробуйте планировании операций для X дней.
 DocType: HR Settings,Stop Birthday Reminders,Стоп День рождения Напоминания
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Пожалуйста, установите по умолчанию Payroll расчётный счёт в компании {0}"
 DocType: SMS Center,Receiver List,Список приемщика
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Поиск товара
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Поиск товара
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Израсходованное количество
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чистое изменение денежных средств
 DocType: Assessment Plan,Grading Scale,Оценочная шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Уже закончено
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Уже закончено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Оплата Запрос уже существует {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Стоимость эмиссионных пунктов
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Количество должно быть не более {0}
@@ -1654,12 +1656,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Сделать запись выплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Предварительная против Поставщика должны быть дебет
 DocType: Company,Default Values,Значения По Умолчанию
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Дайджест
 DocType: Expense Claim,Total Amount Reimbursed,Общая сумма возмещаются
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Это основано на бревнах против этого транспортного средства. См график ниже для получения подробной информации
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,собирать
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против поставщика счет-фактура {0} от {1}
 DocType: Customer,Default Price List,По умолчанию Прайс-лист
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,запись Движение активов {0} создано
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,запись Движение активов {0} создано
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Вы не можете удалять финансовый год {0}. Финансовый год {0} устанавливается по умолчанию в разделе Глобальные параметры
 DocType: Journal Entry,Entry Type,Тип записи
 ,Customer Credit Balance,Заказчик Кредитный Баланс
@@ -1679,7 +1682,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ни один из пунктов не имеют каких-либо изменений в количестве или стоимости.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обязательное поле - Программа
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обязательное поле - Программа
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Претензия по гарантии
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Претензия по гарантии
 ,Lead Details,Лид Подробности
 DocType: Salary Slip,Loan repayment,погашение займа
 DocType: Purchase Invoice,End date of current invoice's period,Дата и время окончания периода текущего счета-фактуры в
@@ -1698,12 +1701,10 @@
 DocType: Employee,Permanent Address,Постоянный адрес
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Advance платный против {0} {1} не может быть больше \, чем общий итог {2}"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Student Sibling,Studying in Same Institute,Обучение в том же институте
 DocType: Territory,Territory Manager,Territory Manager
 DocType: Packed Item,To Warehouse (Optional),На склад (Необязательно)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа позиций&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа позиций&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Платные Сумма (Компания валют)
 DocType: Purchase Invoice,Additional Discount,Дополнительная скидка
 DocType: Selling Settings,Selling Settings,Продажа Настройки
@@ -1713,9 +1714,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Смотрите в корзину
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Пункт Нехватка Сообщить
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вес упоминается, \n Пожалуйста, укажите ""Вес Единица измерения"" слишком"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Материал Запрос используется, чтобы сделать эту Stock запись"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следующий Износ Дата является обязательным для нового актива
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Отдельная группа на основе курса для каждой партии
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Отдельная группа на основе курса для каждой партии
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Одно устройство элемента.
@@ -1732,9 +1733,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: МВЗ обязателен для счета {2} «Отчет о прибылях и убытках». Укажите МВЗ по умолчанию для Компании.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов с таким именем уже существует. Пожалуйста, измените имя клиента или имя группы клиентов"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1751,7 +1750,7 @@
 ,Item-wise Sales Register,Пункт мудрый Продажи Зарегистрироваться
 DocType: Asset,Gross Purchase Amount,Валовая сумма покупки
 DocType: Asset,Depreciation Method,метод начисления износа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Не в сети
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Не в сети
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Этот налог Входит ли в базовой ставки?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Всего Target
 DocType: Program Course,Required,необходимые
@@ -1761,21 +1760,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирение JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Слишком много столбцов. Экспортируйте отчет и распечатайте его с помощью приложения для электронных таблиц.
 DocType: Purchase Invoice Item,Batch No,№ партии
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Невозможно найти обменный курс {0} до {1} для ключа дату {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Разрешить несколько заказов на продажу от Заказа Клиента
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 DocType: Student Group Instructor,Student Group Instructor,Инструктор по студенческим группам
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Нет
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Основные
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Вариант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Основные
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Вариант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Установить префикс для нумерации серии на ваших сделок
 DocType: Employee Attendance Tool,Employees HTML,Сотрудники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,По умолчанию BOM ({0}) должен быть активным для данного элемента или в шаблоне
 DocType: Employee,Leave Encashed?,Оставьте инкассированы?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Возможность поле От обязательна
 DocType: Email Digest,Annual Expenses,годовые расходы
 DocType: Item,Variants,Варианты
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Сделать Заказ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Сделать Заказ
 DocType: SMS Center,Send To,Отправить
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Выделенная сумма
@@ -1783,7 +1781,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Работа-в-Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Заявитель на работу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад и справочники
 DocType: Supplier,Statutory info and other general information about your Supplier,Уставный информации и другие общие сведения о вашем Поставщик
@@ -1791,11 +1789,10 @@
 DocType: Item,Serial Nos and Batches,Серийные номера и партии
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Сила студенческой группы
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Сила студенческой группы
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Против Запись в журнале {0} не имеет никакого непревзойденную {1} запись
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Аттестации
 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: Grading Structure,Grading Intervals,Интервалы Оценивание
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Пожалуйста входите
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не может overbill для пункта {0} в строке {1} больше, чем {2}. Чтобы разрешить завышенные счета, пожалуйста, установите в покупке Настройки"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Пожалуйста, установите фильтр, основанный на пункте или на складе"
@@ -1807,17 +1804,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} должен быть проведен
 DocType: Authorization Control,Authorization Control,Авторизация управления
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Отклонено Склад является обязательным в отношении отклонил Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Оплата
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Управляйте свои заказы
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Оплата
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Управляйте свои заказы
 DocType: Production Order Operation,Actual Time and Cost,Фактическое время и стоимость
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Обращение
 DocType: Course,Course Abbreviation,Аббревиатура для гольфа
 DocType: Student Leave Application,Student Leave Application,Студент Оставить заявку
 DocType: Item,Will also apply for variants,Будет также применяться для вариантов
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не может быть отменена, так как она уже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Сотрудник {0} на полдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Всего продолжительность рабочего времени не должна быть больше, чем максимальное рабочее время {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Вкл
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle детали на момент продажи.
 DocType: Quotation Item,Actual Qty,Фактический Кол-во
 DocType: Sales Invoice Item,References,Рекомендации
@@ -1827,7 +1825,7 @@
 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 +91,Associate,Помощник
 DocType: Asset Movement,Asset Movement,Движение активов
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Новая корзина
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Новая корзина
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Создание приемника Список
 DocType: Vehicle,Wheels,Колеса
@@ -1859,10 +1857,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,"Отключение создание временных журналов против производственных заказов. Операции, не будет отслеживаться в отношении производственного заказа"
 DocType: Student,Student Mobile Number,Студент Мобильный телефон
 DocType: Item,Has Variants,Имеет Варианты
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Вы уже выбрали элементы из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Название ежемесячное распределение
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификатор партии является обязательным
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Идентификатор партии является обязательным
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Идентификатор партии является обязательным
 DocType: Sales Person,Parent Sales Person,Лицо Родительские продаж
 DocType: Purchase Invoice,Recurring Invoice,Периодический Счет
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управление проектами
@@ -1870,11 +1868,11 @@
 DocType: Budget,Fiscal Year,Отчетный год
 DocType: Vehicle Log,Fuel Price,Топливо Цена
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Элемент основных средств не может быть элементом запасов.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не может быть назначен на {0}, так как это не доход или расход счета"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Достигнутый
 DocType: Student Admission,Application Form Route,Заявка на маршрут
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Область / клиентов
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Область / клиентов
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,"например, 5"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Оставьте Тип {0} не может быть выделена, так как он неоплачиваемый отпуск"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Ряд {0}: суммы, выделенной {1} должен быть меньше или равен счета-фактуры сумма задолженности {2}"
@@ -1894,15 +1892,15 @@
 ,Serial No Status,Серийный номер статус
 DocType: Payment Entry Reference,Outstanding,выдающийся
 ,Daily Timesheet Summary,Ежедневно Timesheet Резюме
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Строка {0}: Для установки {1} периодичности, разница между от и до настоящего времени \
  должно быть больше или равно {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Это основано на фондовом движении. См {0} для получения более подробной
 DocType: Pricing Rule,Selling,Продажа
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Сумма {0} {1} вычтены {2}
 DocType: Employee,Salary Information,Информация о зарплате
 DocType: Sales Person,Name and Employee ID,Имя и ID сотрудника
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Впритык не может быть, прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -1914,14 +1912,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки, превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продан
 ,Item-wise Purchase History,Пункт мудрый История покупок
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку ""Generate Расписание"", чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,замороженные
 ,Open Production Orders,Открыть Производственные заказы
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базовая сумма (Компания Валюта)
 DocType: Payment Reconciliation Payment,Reference Row,Ссылка Row
 DocType: Installation Note,Installation Time,Время установки
 DocType: Sales Invoice,Accounting Details,Подробности ведения учета
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Удалить все транзакции этой компании
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Инвестиции
 DocType: Issue,Resolution Details,Разрешение Подробнее
@@ -1954,14 +1952,14 @@
 DocType: Discussion,Discussion,обсуждение
 DocType: Payment Entry,Transaction ID,ID транзакции
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Цены Правила дополнительно фильтруются на основе количества.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Укажите дату присоединения для сотрудника {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Общая сумма Billing (через табель)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Повторите Выручка клиентов
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Согласующего Расходы"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) должен иметь роль ""Согласующего Расходы"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Носите
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Выберите BOM и Кол-во для производства
 DocType: Asset,Depreciation Schedule,Амортизация Расписание
 DocType: Bank Reconciliation Detail,Against Account,Против Счет
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата должна быть в пределах от даты и до настоящего времени
@@ -1975,16 +1973,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},"Пожалуйста, установите &quot;активов Амортизация затрат по МВЗ&quot; в компании {0}"
 ,Maintenance Schedules,Графики технического обслуживания
 DocType: Task,Actual End Date (via Time Sheet),Фактическая дата окончания (с помощью табеля рабочего времени)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Сумма {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Пункт Группа не упоминается в мастера пункт по пункту {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебету счета должны быть задолженность счет
 DocType: Shipping Rule Condition,Shipping Amount,Доставка Количество
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,В ожидании Сумма
 DocType: Purchase Invoice Item,Conversion Factor,Коэффициент преобразования
 DocType: Purchase Order,Delivered,Доставлено
 ,Vehicle Expenses,Расходы транспортных средств
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
+DocType: Serial No,Invoice Details,Сведения о счете
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Ожидаемое значение после того, как срок полезного использования должно быть больше или равно {0}"
 DocType: Purchase Receipt,Vehicle Number,Количество транспортных средств
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на которую повторяющихся счет будет остановить"
 DocType: Employee Loan,Loan Amount,Сумма кредита
@@ -2003,12 +2002,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Настройки HR
 DocType: Salary Slip,net pay info,Чистая информация платить
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Авансовый Отчет ожидает одобрения. Только Утверждающий Сотрудник может обновлять статус.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Авансовый Отчет ожидает одобрения. Только Утверждающий Сотрудник может обновлять статус.
 DocType: Email Digest,New Expenses,Новые расходы
 DocType: Purchase Invoice,Additional Discount Amount,Дополнительная скидка Сумма
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Строка # {0}: Кол-во должно быть 1, а элемент является фиксированным активом. Пожалуйста, используйте отдельную строку для нескольких Упак."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставьте Черный список Разрешить
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Аббревиатура не может быть пустой или пробелом
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Группа не-группы
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спорт
 DocType: Loan Type,Loan Name,Кредит Имя
@@ -2020,6 +2019,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, где вы работаете запас отклоненных элементов"
 DocType: Production Order,Skip Material Transfer,Пропустить перенос материала
 DocType: Production Order,Skip Material Transfer,Пропустить перенос материала
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Невозможно найти обменный курс {0} до {1} за контрольную дату {2}. Создайте запись обмена валюты вручную.
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваш финансовый год заканчивается
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется как основной Фискальный Год. Пожалуйста, обновите страницу в браузере, чтобы изменения вступили в силу."
@@ -2036,19 +2036,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Счет {0} является недопустимым. Валюта счета должна быть {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа клиента, счет-фактура или продаже журнал Вход"
 DocType: Salary Component,Deduction,Вычет
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Строка {0}: От времени и времени является обязательным.
 DocType: Stock Reconciliation Item,Amount Difference,Сумма разница
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Цена товара добавляется для {0} в Прейскуранте {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Пожалуйста, введите Employee Id этого менеджера по продажам"
 DocType: Territory,Classification of Customers by region,Классификация клиентов по регионам
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Разница Сумма должна быть равна нулю
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разница Сумма должна быть равна нулю
 DocType: Project,Gross Margin,Валовая прибыль
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Пожалуйста, введите выпуска изделия сначала"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Расчетный банк себе баланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,отключенный пользователь
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Расценки
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Расценки
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всего Вычет
 ,Production Analytics,Производство Аналитика
@@ -2057,9 +2057,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Внимание: Неверный сертификат SSL на привязанности {0}
 DocType: Student Admission,Eligibility,приемлемость
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Ведет помочь вам получить бизнес, добавить все ваши контакты и многое другое в ваших потенциальных клиентов"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Ведет помочь вам получить бизнес, добавить все ваши контакты и многое другое в ваших потенциальных клиентов"
 DocType: Production Order Operation,Actual Operation Time,Фактическая Время работы
 DocType: Authorization Rule,Applicable To (User),Применимо к (Пользователь)
 DocType: Purchase Taxes and Charges,Deduct,Вычеты €
@@ -2074,7 +2074,7 @@
 DocType: Guardian,Work Address,Рабочий адрес
 DocType: Appraisal,Calculate Total Score,Рассчитать общую сумму
 DocType: Request for Quotation,Manufacturing Manager,Производство менеджер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит Delivery Note в пакеты.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Поставки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Баланс счета ({0}) для {1} и запаса ({2}) для склада {3} должен быть одинаковым
@@ -2097,10 +2097,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примечание: E-mail не будет отправлен отключенному пользователю
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Количество взаимодействий
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Количество взаимодействий
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Выберите компанию ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Выберите компанию ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Оставьте пустым, если рассматривать для всех отделов"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная, контракт, стажер и т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,раз в две недели
 DocType: Currency Exchange,From Currency,Из валюты
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Пожалуйста, выберите выделенной суммы, счет-фактура Тип и номер счета-фактуры в по крайней мере одном ряду"
@@ -2109,14 +2109,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Тариф (Компания Валюта)
 DocType: Student Guardian,Others,Другое
 DocType: Payment Entry,Unallocated Amount,Нераспределенные Сумма
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Не можете найти соответствующий пункт. Пожалуйста, выберите другое значение для {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Нет больше обновлений
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда, как «О предыдущего ряда Сумма» или «О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Ребенок Пункт не должен быть Bundle продукта. Пожалуйста, удалите пункт `{0}` и сохранить"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банковские операции
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Добавить расписания
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Добавить расписания
 DocType: Vehicle Service,Service Item,Услуги Пункт
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
 DocType: Bank Guarantee,Bank Guarantee,Банковская гарантия
@@ -2142,6 +2142,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Строка # {0}: Asset {1} уже {2}
 DocType: Quotation Item,Stock Balance,Баланс запасов
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Заказ клиента в оплату
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Пожалуйста, установите Naming Series для {0} через Setup&gt; Settings&gt; Naming Series"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Исполнительный директор
 DocType: Expense Claim Detail,Expense Claim Detail,Детали Авансового Отчета
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Пожалуйста, выберите правильный счет"
@@ -2166,14 +2167,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Цены не будут показаны, если прайс-лист не установлен"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Пожалуйста, укажите страну этом правиле судоходства или проверить Доставка по всему миру"
 DocType: Stock Entry,Total Incoming Value,Всего входное значение
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебет требуется
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебет требуется
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets поможет отслеживать время, стоимость и выставление счетов для Активности сделанной вашей команды"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Покупка Прайс-лист
 DocType: Offer Letter Term,Offer Term,Условие предложения
 DocType: Quality Inspection,Quality Manager,Менеджер по качеству
 DocType: Job Applicant,Job Opening,Работа Открытие
 DocType: Payment Reconciliation,Payment Reconciliation,Оплата Примирение
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технология
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Общая сумма невыплаченных: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операция Сайт
@@ -2201,23 +2202,23 @@
 DocType: Opportunity,Lost Reason,Забыли Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Новый адрес
 DocType: Quality Inspection,Sample Size,Размер выборки
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,На все товары уже выписаны счета
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Пожалуйста, введите Квитанция документ"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Дальнейшие МВЗ можно сделать под групп, но записи могут быть сделаны в отношении не-групп"
 DocType: Project,External,Внешний  GPS с RS232
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Пользователи и разрешения
 DocType: Vehicle Log,VLOG.,Видеоблога.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производственные заказы Создано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Производственные заказы Создано: {0}
 DocType: Branch,Branch,Ветвь
 DocType: Guardian,Mobile Number,Мобильный номер
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
 DocType: Bin,Actual Quantity,Фактическое Количество
 DocType: Shipping Rule,example: Next Day Shipping,пример: Следующий день доставка
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серийный номер {0} не найден
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серийный номер {0} не найден
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши клиенты
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Сделать Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Сделать Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Вы были приглашены для совместной работы над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Применить сейчас
@@ -2241,8 +2242,9 @@
 DocType: SMS Log,Sent To,Отправить
 DocType: Payment Request,Make Sales Invoice,Сделать Расходная накладная
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следующая Контактные Дата не может быть в прошлом
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следующая Контактные Дата не может быть в прошлом
 DocType: Company,For Reference Only.,Только для справки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Выберите номер партии
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неверный {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Предварительная сумма
@@ -2256,7 +2258,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Дело № не может быть 0
 DocType: Item,Show a slideshow at the top of the page,Показ слайдов в верхней части страницы
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазины
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазины
 DocType: Serial No,Delivery Time,Время доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Проблемам старения, на основе"
 DocType: Item,End of Life,Конец срока службы
@@ -2268,12 +2270,12 @@
 DocType: Rename Tool,Rename Tool,Переименование файлов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Обновление Стоимость
 DocType: Item Reorder,Item Reorder,Пункт Переупоряд
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Показать Зарплата скольжению
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,О передаче материала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Показать Зарплата скольжению
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,О передаче материала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","не Укажите операции, эксплуатационные расходы и дать уникальную операцию не в вашей деятельности."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Этот документ находится над пределом {0} {1} для элемента {4}. Вы делаете другой {3} против того же {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Сумма счета Выберите изменения
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Пожалуйста, установите повторяющиеся после сохранения"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Сумма счета Выберите изменения
 DocType: Purchase Invoice,Price List Currency,Прайс-лист валют
 DocType: Naming Series,User must always select,Пользователь всегда должен выбирать
 DocType: Stock Settings,Allow Negative Stock,Разрешить негативных складе
@@ -2284,7 +2286,7 @@
 DocType: Budget Account,Budget Account,Бюджет аккаунта
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании, потому что есть существующие операции. Сделки должны быть отменены, чтобы поменять валюту."
-DocType: Grade Interval,Grade Description,Оценка Описание
+DocType: Grading Scale Interval,Grade Description,Оценка Описание
 DocType: Stock Entry,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,Создание Зарплата Слип
@@ -2322,7 +2324,7 @@
 DocType: Upload Attendance,Attendance To Date,Посещаемость To Date
 DocType: Warranty Claim,Raised By,Поднятый По
 DocType: Payment Gateway Account,Payment Account,Оплата счета
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Пожалуйста, сформулируйте Компания приступить"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Чистое изменение дебиторской задолженности
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсационные Выкл
 DocType: Offer Letter,Accepted,Принято
@@ -2331,12 +2333,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Пожалуйста, убедитесь, что вы действительно хотите удалить все транзакции для компании. Ваши основные данные останется, как есть. Это действие не может быть отменено."
 DocType: Room,Room Number,Номер комнаты
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Недопустимая ссылка {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не может быть больше, чем запланированное количество ({2}) в Производственном Заказе {3}"
 DocType: Shipping Rule,Shipping Rule Label,Правило ярлыке
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум пользователей
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сырье не может быть пустым.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Быстрый журнал запись
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не удалось обновить запас, счет-фактура содержит падение пункт доставки."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Быстрый журнал запись
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Вы не можете изменить скорость, если спецификации упоминается agianst любого элемента"
 DocType: Employee,Previous Work Experience,Предыдущий опыт работы
 DocType: Stock Entry,For Quantity,Для Количество
@@ -2349,7 +2351,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Сроки и условиях1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Название института, для которого вы устанавливаете эту систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерская запись заморожена до этой даты, никто не может сделать / изменить запись, кроме роли, указанной ниже."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Пожалуйста, сохраните документ перед генерацией график технического обслуживания"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекта
 DocType: UOM,Check this to disallow fractions. (for Nos),"Проверьте это, чтобы запретить фракции. (Для №)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Были созданы следующие Производственные заказы:
@@ -2376,7 +2378,7 @@
 ,Employees working on a holiday,"Сотрудники, работающие на празднике"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марк Присутствует
 DocType: Project,% Complete Method,% Полный метод
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Фактический Дата окончания
 DocType: BOM,Operating Cost (Company Currency),Эксплуатационные расходы (Компания Валюта)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2393,7 +2395,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Оставьте без оплаты не совпадает с утвержденными записями Оставить заявку
 DocType: Campaign,Campaign-.####,Кампания-.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следующие шаги
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Пожалуйста, предоставьте указанные пункты в наилучших возможных ставок"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близко Возможность через 15 дней
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Конец года
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2450,7 +2452,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,RECD Количество
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Создано записей платы - {0}
 DocType: Asset Category Account,Asset Category Account,Категория активов Счет
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0}, чем количество продаж Заказать {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Складской акт {0} не проведен
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Расчетный счет
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Следующий Контакт К не может быть таким же, как Lead Адрес электронной почты"
@@ -2472,7 +2474,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Производство
 DocType: Guardian,Occupation,Род занятий
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Пожалуйста, настройте систему имен пользователей в человеческих ресурсах&gt; Настройки персонажа"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата начала должна быть раньше даты окончания
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всего (кол-во)
 DocType: Sales Invoice,This Document,Этот документ
 DocType: Installation Note Item,Installed Qty,Установленная Кол-во
@@ -2488,14 +2491,14 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Сообщить о проблеме
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Над
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Строка # {0}: Запись в журнале {1} не имеет учетной записи {2} или уже сопоставляется с другой купон
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Строка # {0}: Запись в журнале {1} не имеет учетной записи {2} или уже сопоставляется с другой купон
 DocType: Buying Settings,Default Buying Price List,По умолчанию Покупка Прайс-лист
 DocType: Process Payroll,Salary Slip Based on Timesheet,Зарплата скольжения на основе Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Ни один сотрудник для выбранных критериев выше или скольжения заработной платы уже не создано
 DocType: Notification Control,Sales Order Message,Заказ клиента Сообщение
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию, как Болгарии, Валюта, текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Вид оплаты
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите пакет для элемента {0}. Не удалось найти единицу, которая удовлетворяет этому требованию."
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Выберите пакет для элемента {0}. Не удалось найти единицу, которая удовлетворяет этому требованию."
 DocType: Process Payroll,Select Employees,Выберите Сотрудников
 DocType: Opportunity,Potential Sales Deal,Сделка потенциальных продаж
 DocType: Payment Entry,Cheque/Reference Date,Чеками / Исходная дата
@@ -2512,20 +2515,20 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобальный профиля POS {0} уже создана для компании {1}
 DocType: Purchase Order,Ref SQ,Ссылка SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Заменить пункт / BOM во всех спецификациях
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Документ о получении должен быть проведен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Документ о получении должен быть проведен
 DocType: Purchase Invoice Item,Received Qty,Поступило Кол-во
 DocType: Stock Entry Detail,Serial No / Batch,Серийный номер / Партия
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачиваются и не доставляется
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачено и не доставлено
 DocType: Product Bundle,Parent Item,Родитель Пункт
 DocType: Account,Account Type,Тип учетной записи
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Нет времени листы
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Оставьте Тип {0} не может быть перенос направлен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов. Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 ,To Produce,Чтобы продукты
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Начисление заработной платы
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряда {0} {1}. Чтобы включить {2} в размере Item ряды также должны быть включены {3}
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Сделать пользователя
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Сделать пользователя
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификация пакета на поставку (для печати)
 DocType: Bin,Reserved Quantity,Зарезервировано Количество
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Пожалуйста, введите действующий адрес электронной почты"
@@ -2539,15 +2542,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Шаблон для инвалидов не должно быть по умолчанию шаблон
 DocType: Account,Income Account,Счет Доходов
 DocType: Payment Request,Amount in customer's currency,Сумма в валюте клиента
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Текущий Кол-во
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","См. ""Оценить материалов на основе"" в калькуляции раздел"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Предыдущая
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Ответственность Площадь
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студенческие Порции помогают отслеживать посещаемость, оценки и сборы для студентов"
 DocType: Payment Entry,Total Allocated Amount,Общая сумма Обозначенная
 DocType: Item Reorder,Material Request Type,Материал Тип запроса
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural журнал запись на зарплату от {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage полна, не спасло"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage полна, не спасло"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коэффициент преобразования Единица измерения является обязательным
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,N
 DocType: Budget,Cost Center,Центр учета затрат
@@ -2557,16 +2561,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Скрыть Налоговый идентификатор клиента от сделки купли-продажи
 DocType: Upload Attendance,Upload HTML,Загрузить HTML
 DocType: Employee,Relieving Date,Освобождение Дата
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Цены Правило состоит перезаписать Прайс-лист / определить скидка процент, на основе некоторых критериев."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад может быть изменен только с помощью со входа / накладной / Покупка получении
 DocType: Employee Education,Class / Percentage,Класс / в процентах
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Начальник отдела маркетинга и продаж
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Если выбран Цены правила делается для ""цена"", это приведет к перезаписи прайс-лист. Цены Правило цена окончательная цена, поэтому никакого скидка не следует применять. Таким образом, в таких сделках, как заказ клиента, Заказ и т.д., это будет выбрано в поле 'Rate', а не поле ""Прайс-лист Rate '."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Если выбран Цены правила делается для ""цена"", это приведет к перезаписи прайс-лист. Цены Правило цена окончательная цена, поэтому никакого скидка не следует применять. Таким образом, в таких сделках, как заказ клиента, Заказ и т.д., это будет выбрано в поле 'Rate', а не поле ""Прайс-лист Rate '."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Трек Ведет по Отрасль Тип.
 DocType: Item Supplier,Item Supplier,Пункт Поставщик
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Пожалуйста, введите Код товара, чтобы получить партию не"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Все адреса.
 DocType: Company,Stock Settings,Настройки Запасов
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Объединение возможно только, если следующие свойства такие же, как в отчетах. Есть группа, корневого типа, компания"
@@ -2576,6 +2580,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Будет ли отправить по электронной почте о событии сотрудникам со статусом &#39;Open&#39;
 DocType: Task,Depends on Tasks,В зависимости от задач
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление групповой клиентов дерево.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Вложения могут быть показаны без включения корзины покупок.
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Новый Центр Стоимость Имя
 DocType: Leave Control Panel,Leave Control Panel,Оставьте панели управления
@@ -2588,12 +2593,10 @@
 DocType: Sales Invoice,Debit To,Дебет Для
 DocType: Delivery Note,Required only for sample item.,Требуется только для образца пункта.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Остаток после проведения
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Поставщик&gt; Тип поставщика
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нет зарплаты скольжения находится между {0} и {1}
 ,Pending SO Items For Purchase Request,В ожидании SO предметы для покупки запрос
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зачисляемых студентов
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} отключен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} отключен
 DocType: Supplier,Billing Currency,Платежная валюта
 DocType: Sales Invoice,SINV-RET-,СИНВ-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Очень Большой
@@ -2610,9 +2613,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Главная Рекомендуемые продукт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Все группы по оценке
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новый склад Имя
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Общая {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Общая {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Территория
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений, необходимых"
 DocType: Stock Settings,Default Valuation Method,Метод по умолчанию Оценка
 DocType: Vehicle Log,Fuel Qty,Топливо Кол-во
 DocType: Production Order Operation,Planned Start Time,Планируемые Время
@@ -2628,7 +2631,7 @@
 DocType: Price List,Price List Master,Прайс-лист Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Все сделок купли-продажи могут быть помечены против нескольких ** продавцы ** так что вы можете устанавливать и контролировать цели.
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Применимо для стран
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Только оставьте приложения со статусом «Одобрено» и «Отклонено» могут быть представлены
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студенческая группа Имя является обязательным в строке {0}
@@ -2672,7 +2675,7 @@
 DocType: Project,Copied From,Скопировано из
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Ошибка Имя: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,недобор
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} не связан с {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} не связан с {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Если более чем один пакет того же типа (для печати)
 ,Salary Register,Доход Регистрация
@@ -2691,7 +2694,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Используйте корзину для
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значение {0} для атрибута {1} не существует в списке действительного пункта значений атрибутов для пункта {2}
 DocType: BOM Item,Scrap %,Лом%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Расходы будут распределены пропорционально на основе Поз или суммы, по Вашему выбору"
 DocType: Maintenance Visit,Purposes,Цели
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Как минимум один товар должен быть введен с отрицательным количеством в возвратном документе
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операция {0} больше, чем каких-либо имеющихся рабочих часов в рабочей станции {1}, сломать операции в несколько операций"
@@ -2712,16 +2715,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Территория дерево.
 DocType: Journal Entry Account,Sales Invoice,Счет Продажи
 DocType: Journal Entry Account,Party Balance,Баланс партия
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Пожалуйста, выберите Применить скидки на"
 DocType: Company,Default Receivable Account,По умолчанию задолженность аккаунт
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Создать банк запись на общую заработной платы, выплачиваемой за над выбранными критериями"
 DocType: Stock Entry,Material Transfer for Manufacture,Материал Передача для производства
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Скидка в процентах можно применять либо против прайс-листа или для всех прайс-листа.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Скидка в процентах можно применять либо против прайс-листа или для всех прайс-листа.
 DocType: Purchase Invoice,Half-yearly,Раз в полгода
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Бухгалтерская Проводка по Запасам
 DocType: Vehicle Service,Engine Oil,Машинное масло
 DocType: Sales Invoice,Sales Team1,Продажи Команда1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Клиент Адрес
 DocType: Employee Loan,Loan Details,Кредит Подробнее
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Строка {0}: Завершенный Кол-во должно быть больше нуля.
@@ -2729,24 +2732,24 @@
 DocType: Account,Root Type,Корневая Тип
 DocType: Item,FIFO,FIFO (ФИФО)
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Невозможно вернуть более {1} для п {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Сюжет
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Сюжет
 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}
 DocType: Cheque Print Template,Primary Settings,Основные настройки
 DocType: Purchase Invoice,Select Supplier Address,Выборите Адрес Поставщика
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Добавить сотрудников
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Добавить сотрудников
 DocType: Purchase Invoice Item,Quality Inspection,Контроль качества
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Очень Маленький
 DocType: Company,Standard Template,Стандартный шаблон
 DocType: Training Event,Theory,теория
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Внимание: Материал просил Кол меньше Минимальное количество заказа
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридическое лицо / Вспомогательный с отдельным Планом счетов бухгалтерского учета, принадлежащего Организации."
 DocType: Payment Request,Mute Email,Отключение E-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукты питания, напитки и табак"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Могу только осуществить платеж против нефактурированных {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Субподряд
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Пожалуйста, введите {0} в первую очередь"
@@ -2786,7 +2789,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Склады с существующей транзакции не может быть преобразована в группу.
 DocType: Assessment Result Tool,Result HTML,Результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Годен до
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Добавить студентов
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Добавить студентов
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,C-образный Нет
 DocType: BOM,Exploded_items,Exploded_items
@@ -2829,7 +2832,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Выберите финансовый год
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Изменить порядок Уровень
 DocType: Company,Chart Of Accounts Template,План счетов бухгалтерского учета шаблона
 DocType: Attendance,Attendance Date,Посещаемость Дата
@@ -2844,14 +2847,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дублировать запись
 DocType: Program Enrollment Tool,Get Students,Получить Студенты
 DocType: Serial No,Under Warranty,Под гарантии
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Ошибка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Ошибка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,По словам будет виден только вы сохраните заказ клиента.
 ,Employee Birthday,Сотрудник День рождения
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Пакетное посещаемость Инструмент
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,предел Скрещенные
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурный капитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академический термин с этим &quot;Академический год&quot; {0} и &#39;Term Name&#39; {1} уже существует. Пожалуйста, измените эти записи и повторите попытку."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Как есть существующие операции против пункта {0}, вы не можете изменить значение {1}"
 DocType: UOM,Must be Whole Number,Должно быть Целое число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Новые листья Выделенные (в днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серийный номер {0} не существует
@@ -2871,7 +2874,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% материалов выставлено по данному Заказу
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Период закрытия входа
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Сумма {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Сумма {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Поставщик (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Сотрудник посещаемости Инструмент
@@ -2895,7 +2898,7 @@
 DocType: Supplier,Last Day of the Next Month,Последний день следующего месяца
 DocType: Support Settings,Auto close Issue after 7 days,Авто близко Issue через 7 дней
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставить не могут быть выделены, прежде чем {0}, а отпуск баланс уже переноса направляются в будущем записи распределения отпуска {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примечание: Из-за / Reference Дата превышает разрешенный лимит клиент дня на {0} сутки (ы)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Студент Абитуриент
 DocType: Asset Category Account,Accumulated Depreciation Account,Начисленной амортизации Счет
 DocType: Stock Settings,Freeze Stock Entries,Замораживание акций Записи
@@ -2906,7 +2909,7 @@
 ,Stock Analytics,Анализ запасов
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,"Операции, не может быть оставлено пустым"
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против деталях документа Нет
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Тип партии является обязательным
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Тип партии является обязательным
 DocType: Quality Inspection,Outgoing,Исходящий
 DocType: Material Request,Requested For,Запрашиваемая Для
 DocType: Quotation Item,Against Doctype,Против Doctype
@@ -2923,11 +2926,11 @@
 DocType: Asset,Item Code,Код элемента
 DocType: Production Planning Tool,Create Production Orders,Создание производственных заказов
 DocType: Serial No,Warranty / AMC Details,Гарантия / АМК Подробнее
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Выберите учащихся вручную для группы на основе действий
 DocType: Journal Entry,User Remark,Примечание Пользователь
 DocType: Lead,Market Segment,Сегмент рынка
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Уплаченная сумма не может быть больше суммарного отрицательного непогашенной {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Сотрудник внутреннего Работа История
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Закрытие (д-р)
 DocType: Cheque Print Template,Cheque Size,Cheque Размер
@@ -2943,7 +2946,7 @@
 DocType: Production Planning Tool,Create Material Requests,Создать запросы Материал
 DocType: Employee Education,School/University,Школа / университет
 DocType: Payment Request,Reference Details,Ссылка Подробнее
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Ожидаемое значение после срока полезного использования должен быть меньше, чем сумма валового Покупка"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступное Кол-во на складе
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Счетов выдано количество
 DocType: Asset,Double Declining Balance,Двойной баланс Отклонение
@@ -2964,20 +2967,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разница аккаунт должен быть тип счета активов / пассивов, так как это со Примирение запись Открытие"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоено Сумма не может быть больше, чем сумма займа {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производственный заказ не создан
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Производственный заказ не создан
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"Поле ""С даты"" должно быть после ""До даты"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Невозможно изменить статус студента {0} связан с приложением студента {1}
 DocType: Asset,Fully Depreciated,Полностью Амортизируется
 ,Stock Projected Qty,Прогнозируемое Кол-во Запасов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Выраженное Посещаемость HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Котировки являются предложениями, предложениями отправленных к своим клиентам"
 DocType: Sales Order,Customer's Purchase Order,Заказ клиента
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серийный номер и пакетная
 DocType: Warranty Claim,From Company,От компании
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сумма десятков критериев оценки должно быть {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Значение или Кол-во
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Пожалуйста, установите Количество отчислений на амортизацию бронирования"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Значение или Кол-во
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продукции Заказы не могут быть подняты для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Минута
 DocType: Purchase Invoice,Purchase Taxes and Charges,Покупка Налоги и сборы
@@ -2989,7 +2992,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Все склады
 DocType: Sales Partner,Retailer,Розничный торговец
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Кредит на счету должен быть баланс счета
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Все типы поставщиков
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Все типы поставщиков
 DocType: Global Defaults,Disable In Words,Отключить в словах
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Цитата {0} не типа {1}
@@ -2998,6 +3001,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Банковский овердрафтовый счет
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Сделать Зарплата Слип
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Строка # {0}: выделенная сумма не может превышать невыплаченную сумму.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Просмотр спецификации
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Обеспеченные кредиты
 DocType: Purchase Invoice,Edit Posting Date and Time,Редактирование проводок Дата и время
@@ -3037,7 +3041,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Не допускается обновление операций перемещений по складу, старше чем {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Подробно
 DocType: Sales Order,Fully Billed,Полностью Объявленный
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Пожалуйста, установите по умолчанию задолженность счета в сотрудника {0}"
 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 +127,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),Общий вес пакета. Обычно вес нетто + вес упаковочного материала. (Для печати)
@@ -3048,7 +3051,7 @@
 DocType: Student Group,Group Based On,Группа основана на
 DocType: Journal Entry,Bill Date,Дата оплаты
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service Элемент, тип, частота и сумма расхода требуется"
-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:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Даже если есть несколько правил ценообразования с наивысшим приоритетом, то следующие внутренние приоритеты применяются:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Вы действительно хотите провести Зарплатную ведомость от {0} до {1}
 DocType: Cheque Print Template,Cheque Height,Cheque Высота
 DocType: Supplier,Supplier Details,Подробная информация о поставщике
@@ -3060,7 +3063,7 @@
 DocType: Vehicle Log,Invoice Ref,Счет-фактура Ссылка
 DocType: Purchase Order,Recurring Order,Периодический Заказ
 DocType: Company,Default Income Account,По умолчанию Счет Доходы
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Группа клиентов / клиентов
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Группа клиентов / клиентов
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed финансовых лет Прибыль / убыток (Кредит)
 DocType: Sales Invoice,Time Sheets,Time Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,По умолчанию Оплата Сообщение запроса
@@ -3080,10 +3083,10 @@
 DocType: Notification Control,Quotation Message,Цитата Сообщение
 DocType: Employee Loan,Employee Loan Application,Служащая заявка на получение кредита
 DocType: Issue,Opening Date,Дата открытия
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Зрители были успешно отмечены.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Зрители были успешно отмечены.
 DocType: Journal Entry,Remark,Примечание
 DocType: Purchase Receipt Item,Rate and Amount,Ставку и сумму
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Тип счета для {0} должен быть {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Тип счета для {0} должен быть {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Отпуска и больничные
 DocType: School Settings,Current Academic Term,Текущий академический семестр
 DocType: School Settings,Current Academic Term,Текущий академический семестр
@@ -3106,7 +3109,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студенческая группа
 DocType: Shopping Cart Settings,Quotation Series,Цитата серии
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0}), пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Пожалуйста, выберите клиента"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Пожалуйста, выберите клиента"
 DocType: C-Form,I,я
 DocType: Company,Asset Depreciation Cost Center,Центр Амортизация Стоимость активов
 DocType: Sales Order Item,Sales Order Date,Дата Заказа клиента
@@ -3125,20 +3128,20 @@
 DocType: Vehicle,Insurance Details,Страхование Подробнее
 DocType: Account,Payable,К оплате
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Пожалуйста, введите сроки погашения"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Должники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Должники ({0})
 DocType: Pricing Rule,Margin,Разница
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Новые клиенты
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Валовая Прибыль%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Клиренс Дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Валовая сумма покупки является обязательным
 DocType: Lead,Address Desc,Адрес по убыванию
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Партия является обязательным
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Партия является обязательным
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Название темы
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,По крайней мере один из продажи или покупки должен быть выбран
-DocType: Grading Structure,Grade Intervals,Интервалы Оценка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Выберите характер вашего бизнеса.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Строка # {0}: Дублирующая запись в ссылках {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где производственные операции проводятся.
 DocType: Asset Movement,Source Warehouse,Источник Склад
 DocType: Installation Note,Installation Date,Дата установки
@@ -3175,7 +3178,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Титулы для шаблонов печати, например, счет-проформа."
 DocType: Student Guardian,Student Guardian,Студент-хранитель
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Обвинения типа Оценка не может отмечен как включено
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Оценить
@@ -3203,7 +3206,7 @@
 DocType: Company,Exchange Gain / Loss Account,Обмен Прибыль / убытках
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Сотрудник и посещаемости
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Заполните и сохранить форму
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Количество штук в наличии
@@ -3219,7 +3222,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Изменить порядок Кол-во
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Текущие вакансии Вакансии
 DocType: Company,Stock Adjustment Account,Регулирование счета запасов
-DocType: Journal Entry,Write Off,Списать
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списать
 DocType: Timesheet Detail,Operation ID,Код операции
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Система Пользователь (Войти) ID. Если установлено, то это станет по умолчанию для всех форм HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: От {1}
@@ -3230,27 +3233,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Поставщик поставляет Покупателю
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# форма / Пункт / {0}) нет в наличии
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Следующая дата должна быть больше, чем Дата публикации"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Показать налог распад
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Показать налог распад
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Из-за / Reference Дата не может быть в течение {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Импорт и экспорт данных
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","записи изображения существуют против Склад {0}, следовательно, вы не можете повторно назначить или изменить его"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Нет студентов не найдено
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Нет студентов не найдено
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Счет Дата размещения
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,продавать
 DocType: Sales Invoice,Rounded Total,Округлые Всего
 DocType: Product Bundle,List items that form the package.,"Список предметов, которые формируют пакет."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Пожалуйста, выберите Дата публикации, прежде чем выбрать партию"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Из КУА
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Выберите Котировки
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Выберите Котировки
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Выберите Котировки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Количество не Забронированный отчислений на амортизацию может быть больше, чем Общее количество отчислений на амортизацию"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Сделать ОБСЛУЖИВАНИЕ Посетите
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Свяжитесь с нами для пользователя, который имеет в продаже Master Менеджер {0} роль"
 DocType: Company,Default Cash Account,Расчетный счет по умолчанию
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компания (не клиента или поставщика) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Это основано на посещаемости этого студента
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Нет
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Добавьте больше деталей или открытую полную форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Пожалуйста, введите 'ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
@@ -3282,6 +3286,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакты с клиентами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет и сведения о гарантии
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товара&gt; Группа товаров&gt; Марка
 DocType: Sales Team,Contribution (%),Вклад (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана, так как ""Наличные или Банковский счет"" не был указан"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Выберите программу для извлечения обязательных курсов.
@@ -3297,9 +3302,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед примирения
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Налоги и сборы Добавил (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Небольшая Объявленный
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Пункт {0} должен быть Fixed Asset Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} должен быть Fixed Asset Item
 DocType: Item,Default BOM,По умолчанию BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Пожалуйста, повторите ввод название компании, чтобы подтвердить"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Общая сумма задолженности по Amt
@@ -3309,8 +3314,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобилестроение
 DocType: Vehicle,Insurance Company,Страховая компания
 DocType: Asset Category Account,Fixed Asset Account,Счет учета основных средств
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,переменная
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из накладной
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,переменная
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Из накладной
 DocType: Student,Student Email Address,Студент E-mail адрес
 DocType: Timesheet Detail,From Time,От времени
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наличии:
@@ -3321,12 +3326,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Прайс-лист валютный курс
 DocType: Purchase Invoice Item,Rate,Оценить
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Стажер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адрес
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Адрес
 DocType: Stock Entry,From BOM,Из спецификации
 DocType: Assessment Code,Assessment Code,Код оценки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Перемещения по складу до {0} заморожены
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку ""Generate Расписание"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","например кг, единицы, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,платежный документ
@@ -3334,19 +3339,19 @@
 DocType: Salary Slip,Salary Structure,Зарплата Структура
 DocType: Account,Bank,Банк:
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авиалиния
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Материал Выпуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Материал Выпуск
 DocType: Material Request Item,For Warehouse,Для Склада
 DocType: Employee,Offer Date,Дата предложения
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитаты
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете перезагрузить пока у вас есть сеть.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Вы находитесь в автономном режиме. Вы не сможете перезагрузить пока у вас есть сеть.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Ни один студент группы не создано.
 DocType: Purchase Invoice Item,Serial No,Серийный номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Ежемесячное погашение Сумма не может быть больше, чем сумма займа"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 DocType: Purchase Invoice,Print Language,Язык печати
 DocType: Salary Slip,Total Working Hours,Всего часов работы
 DocType: Stock Entry,Including items for sub assemblies,В том числе предметы для суб собраний
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Введите значение должно быть положительным
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Введите значение должно быть положительным
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Все Территории
 DocType: Purchase Invoice,Items,Элементы
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент уже поступил.
@@ -3366,17 +3371,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"По умолчанию Единица измерения для варианта &#39;{0}&#39; должно быть такой же, как в шаблоне &#39;{1}&#39;"
 DocType: Shipping Rule,Calculate Based On,Рассчитать на основе
 DocType: Delivery Note Item,From Warehouse,От Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Нет предметов с Биллом материалов не Manufacture
 DocType: Assessment Plan,Supervisor Name,Имя супервизора
 DocType: Program Enrollment Course,Program Enrollment Course,Курсы по зачислению в программу
 DocType: Program Enrollment Course,Program Enrollment Course,Курсы по зачислению в программу
-DocType: Grading Structure,Grading Structure,Градация Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оценка и Всего
 DocType: Tax Rule,Shipping City,Доставка Город
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Этот деталь Вариант {0} (шаблон). Атрибуты будет скопирован из шаблона, если ""не копировать"" не установлен"
 DocType: Notification Control,Customize the Notification,Настроить уведомления
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Поток денежных средств от операций
 DocType: Sales Invoice,Shipping Rule,Правило Доставка
@@ -3397,8 +3400,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Пожалуйста, выберите проводки Дата первого"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Дата открытия должна быть ранее Даты закрытия
 DocType: Leave Control Panel,Carry Forward,Переносить
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,"Дни, для которых Праздники заблокированные для этого отдела."
@@ -3411,7 +3414,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Прикрепить бланк
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последнее сообщение
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последнее сообщение
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть, когда категория для ""Оценка"" или ""Оценка и Всего"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть, когда категория для ""Оценка"" или ""Оценка и Всего"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Соответствие Платежи с счетов-фактур
@@ -3427,7 +3430,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Всего (АМТ)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Развлечения и досуг
 DocType: Quality Inspection,Item Serial No,Пункт Серийный номер
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Создание Employee записей
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Создание Employee записей
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Итого Текущая
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Бухгалтерская отчетность
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Час
@@ -3440,10 +3443,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,неизвестный
 DocType: Shipping Rule,Shipping Rule Conditions,Правило Доставка Условия
 DocType: BOM Replace Tool,The new BOM after replacement,Новая спецификация после замены
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Точки продаж
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Точки продаж
 DocType: Payment Entry,Received Amount,полученная сумма
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Установите систему присвоения имен сотрудникам в разделе «Персонал»&gt; «Настройки персонала».
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Установите систему присвоения имен сотрудникам в разделе «Персонал»&gt; «Настройки персонала».
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Создать для полного количества, игнорируя количество уже на заказ"
 DocType: Account,Tax,Налог
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,без маркировки
@@ -3456,9 +3457,9 @@
 DocType: Batch,Source Document Name,Имя исходного документа
 DocType: Batch,Source Document Name,Имя исходного документа
 DocType: Job Opening,Job Title,Должность
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Создание пользователей
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Создание пользователей
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грамм
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Количество, Изготовление должны быть больше, чем 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите отчет за призыв обслуживания.
 DocType: Stock Entry,Update Rate and Availability,Частота обновления и доступность
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Процент вы имеете право принимать или сдавать более против заказанного количества. Например: Если Вы заказали 100 единиц. и ваш Пособие 10%, то вы имеете право на получение 110 единиц."
@@ -3468,28 +3469,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Описание
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чистое изменение в капитале
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Пожалуйста, отменить счета покупки {0} первым"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адрес электронной почты должен быть уникальным, уже существует для {0}"
 DocType: Serial No,AMC Expiry Date,КУА срок действия
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Квитанция
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Квитанция
 ,Sales Register,Книга продаж
 DocType: Daily Work Summary Settings Company,Send Emails At,Отправить по электронной почте на
 DocType: Quotation,Quotation Lost Reason,Цитата Забыли Причина
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Выберите домен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Референция сделка не {0} от {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,"Там нет ничего, чтобы изменить."
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Резюме для этого месяца и в ожидании деятельности
 DocType: Customer Group,Customer Group Name,Группа Имя клиента
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Клиентов еще нет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,О движении денежных средств
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сумма кредита не может превышать максимальный Сумма кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Лицензия
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Пожалуйста, удалите этот счет {0} из C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последняя дата заказа
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Счет {0} не принадлежит компании {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серийные номера в строке {0} не совпадают с полем «Поставка»
 DocType: Student,Guardian Details,Подробнее Гардиан
 DocType: C-Form,C-Form,C-образный
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк посещаемости для нескольких сотрудников
@@ -3514,20 +3517,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Строка {0} # Счет должен быть типа &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Из Кол-во
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила для расчета количества груза для продажи
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансовые услуги
 DocType: Student Sibling,Student ID,Студенческий билет
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Виды деятельности для Время Журналы
 DocType: Tax Rule,Sales,Продажи
 DocType: Stock Entry Detail,Basic Amount,Основное количество
 DocType: Training Event,Exam,Экзамен
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Требуется Склад для Запаса {0}
 DocType: Leave Allocation,Unused leaves,Неиспользованные листья
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Государственный счетов
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Переложить
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} не связан с Party Account {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} не связан с Party Account {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch разобранном BOM (в том числе узлов)
 DocType: Authorization Rule,Applicable To (Employee),Применимо к (Сотрудник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Благодаря Дата является обязательным
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Прирост за атрибут {0} не может быть 0
@@ -3538,13 +3541,13 @@
 ,Inactive Customers,Неактивные Клиенты
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Покупка Поступления
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Как Ценообразование Правило применяется?
 DocType: Stock Entry,Delivery Note No,Документ  Отгрузки №
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Если этот флажок установлен, только запросы о покупке материалов для конечных сырья будут включены в материале запросов. В противном случае будет создан материал Запросы на родительских элементов"
 DocType: Cheque Print Template,Message to show,"Сообщение, чтобы показать"
 DocType: Company,Retail,Розничная торговля
 DocType: Attendance,Absent,Отсутствует
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Связка товаров
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Связка товаров
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ряд {0}: Недопустимая ссылка {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купить налоги и сборы шаблон
 DocType: Upload Attendance,Download Template,Скачать шаблон
@@ -3554,10 +3557,10 @@
 DocType: Payment Entry,Account Paid From,Счет Оплачено из
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сырье Код товара
 DocType: Journal Entry,Write Off Based On,Списание на основе
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Сделать Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Сделать Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Печать и канцелярские
 DocType: Stock Settings,Show Barcode Field,Показать поле Штрих-код
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Отправить Поставщик электронных писем
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Отправить Поставщик электронных писем
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата уже обработали за период между {0} и {1}, Оставьте период применения не может быть в пределах этого диапазона дат."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Установка рекорд для серийный номер
 DocType: Guardian Interest,Guardian Interest,Опекун Проценты
@@ -3570,6 +3573,7 @@
 DocType: Offer Letter,Awaiting Response,В ожидании ответа
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Выше
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Недопустимый атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Упомяните, если нестандартный подлежащий оплате счет"
 DocType: Salary Slip,Earning & Deduction,Заработок & Вычет
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Факультативно. Эта установка будет использоваться для фильтрации в различных сделок.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Отрицательный Оценка курс не допускается
@@ -3585,10 +3589,9 @@
 DocType: Production Order Item,Production Order Item,Производственный заказ товара
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Не запись не найдено
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Стоимость списанных активов
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Частично ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: МВЗ является обязательным для позиции {2}
 DocType: Vehicle,Policy No,Политика Нет
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Получить элементов из комплекта продукта
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Получить элементов из комплекта продукта
 DocType: Asset,Straight Line,Прямая линия
 DocType: Project User,Project User,Проект Пользователь
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Трещина
@@ -3605,7 +3608,7 @@
 DocType: Program Enrollment Tool,Get Students From,Получить студентов из
 DocType: Hub Settings,Seller Country,Продавец Страна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опубликовать товары на сайте
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Группа ваших студентов в партиях
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Группа ваших студентов в партиях
 DocType: Authorization Rule,Authorization Rule,Правило Авторизации
 DocType: Sales Invoice,Terms and Conditions Details,Условия Подробности
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Спецификации
@@ -3658,14 +3661,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Дата
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Счет {0}: Родитель счета {1} не принадлежит компании: {2}
 DocType: Program Enrollment Tool,Student Applicants,Студенческие Кандидаты
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Успешно удален все сделки, связанные с этой компанией!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,По состоянию на Дату
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Дата поступления на работу
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Испытательный срок
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатные Компоненты
 DocType: Program Enrollment Tool,New Academic Year,Новый учебный год
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Возвращение / Кредит Примечание
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Возвращение / Кредит Примечание
 DocType: Stock Settings,Auto insert Price List rate if missing,"Авто вставка Скорость Цены, если не хватает"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Всего уплаченной суммы
 DocType: Production Order Item,Transferred Qty,Переведен Кол-во
@@ -3685,7 +3688,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листьев, как случайный, больным и т.д."
 DocType: Email Digest,Send regular summary reports via Email.,Отправить регулярные сводные отчеты по электронной почте.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию для Типа Авансового Отчета {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Пожалуйста, установите учетную запись по умолчанию для Типа Авансового Отчета {0}"
 DocType: Assessment Result,Student Name,Имя ученика
 DocType: Brand,Item Manager,Состояние менеджер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Расчет заработной платы оплачивается
@@ -3706,6 +3709,7 @@
 ,Sales Funnel,Воронка продаж
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Аббревиатура является обязательной
 DocType: Project,Task Progress,Задача о ходе работы
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Тележка
 ,Qty to Transfer,Кол-во для передачи
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Котировки в снабжении или клиентов.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль разрешено редактировать Замороженный исходный
@@ -3733,13 +3737,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,институт Аббревиатура
 ,Item-wise Price List Rate,Пункт мудрый Прайс-лист Оценить
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Ценовое предложение поставщика
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Ценовое предложение поставщика
 DocType: Quotation,In Words will be visible once you save the Quotation.,По словам будет виден только вы сохраните цитаты.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количество ({0}) не может быть дробью в строке {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,взимать сборы
 DocType: Attendance,ATT-,попыт-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрихкод {0} уже используется в позиции {1}
 DocType: Lead,Add to calendar on this date,Добавить в календарь в этот день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки.
 DocType: Item,Opening Stock,Начальный запас
@@ -3757,8 +3761,8 @@
  Обновлено помощью ""Time Вход"""
 DocType: Customer,From Lead,От Ведущий
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,"Заказы, выпущенные для производства."
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Выберите финансовый год ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Выберите финансовый год ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS-профиля требуется, чтобы сделать запись POS"
 DocType: Program Enrollment Tool,Enroll Students,зачислить студентов
 DocType: Hub Settings,Name Token,Имя маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартный Продажа
@@ -3769,7 +3773,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} против чека {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Название проекта
-DocType: Supplier,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
+DocType: Customer,Mention if non-standard receivable account,Упоминание если нестандартная задолженность счет
 DocType: Journal Entry Account,If Income or Expense,Если доходов или расходов
 DocType: Production Order,Required Items,Требуемые товары
 DocType: Stock Ledger Entry,Stock Value Difference,Расхождение Стоимости Запасов
@@ -3790,7 +3794,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Установить целевые Пункт Группа стрелке для этого менеджера по продажам.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [дней]"
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Строка # {0}: Актив является обязательным для фиксированного актива покупки / продажи
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Если два или более Ценообразование правила содержатся на основании указанных выше условиях, приоритет применяется. Приоритет номер от 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.,Разрешить следующие пользователи утвердить Leave приложений для блочных дней.
@@ -3816,7 +3820,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","Чтобы не применяются Цены правило в конкретной сделки, все применимые правила ценообразования должны быть отключены."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Чтобы не применяются Цены правило в конкретной сделки, все применимые правила ценообразования должны быть отключены."
 DocType: Assessment Group,Parent Assessment Group,Родитель группа по оценке
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,работы
 ,Sales Order Trends,Продажи Заказать Тенденции
@@ -3827,7 +3831,7 @@
 DocType: Stock Entry Detail,Additional Cost,Дополнительная стоимость
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Окончание финансового года
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете фильтровать на основе ваучером Нет, если сгруппированы по ваучером"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Сделать Поставщик цитаты
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Сделать Поставщик цитаты
 DocType: Quality Inspection,Incoming,Входящий
 DocType: BOM,Materials Required (Exploded),Необходимые материалы (в разобранном)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Добавить других пользователей в Вашу организация, не считая Вас."
@@ -3855,6 +3859,7 @@
 DocType: Employee,History In Company,История В компании
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Рассылка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Фото со Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клиент&gt; Группа клиентов&gt; Территория
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Тот же пункт был введен несколько раз
 DocType: Department,Leave Block List,Оставьте список есть
 DocType: Sales Invoice,Tax ID,ИНН
@@ -3864,7 +3869,7 @@
 DocType: Customer,Sales Partner and Commission,Партнеры по продажам и комиссия
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентная ставка (%) / год
 ,Project Quantity,Проект Количество
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всего {0} для всех элементов равно нулю, может быть, вы должны изменить «Распределить плату на основе»"
 DocType: Opportunity,To Discuss,Для обсуждения
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} единиц {1} требуется в {2} для завершения этой транзакции..
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентная ставка (%) Годовой
@@ -3879,7 +3884,7 @@
 DocType: Purchase Invoice,Return,Возвращение
 DocType: Production Order Operation,Production Order Operation,Производство Порядок работы
 DocType: Pricing Rule,Disable,Отключить
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Способ оплаты требуется произвести оплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Способ оплаты требуется произвести оплату
 DocType: Project Task,Pending Review,В ожидании отзыв
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не может быть утилизированы, как это уже {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Итоговая сумма аванса (через Авансовый Отчет)
@@ -3887,11 +3892,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Отметка отсутствует
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Строка {0}: Валюта BOM # {1} должен быть равен выбранной валюте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс обмена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Заказ на продажу {0} не проведен
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,Компонент платы
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управление флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Добавить элементы из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Добавить элементы из
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Родитель счета {1} не Bolong компании {2}
 DocType: Cheque Print Template,Regular,регулярное
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Всего Weightage всех критериев оценки должны быть 100%
@@ -3904,24 +3909,24 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не существует
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зарегистрироваться на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Ежемесячные Проценты распределения
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Выбранный элемент не может быть Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Выбранный элемент не может быть Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Скорость оценки не найдено для пункта {0}, которое требуется делать бухгалтерские записи для {1} {2}. Если элемент сделок как элемент образца в {1}, пожалуйста, отметить, что в {1} таблицы Item. В противном случае, пожалуйста, создать входящие акции сделку по ст или упоминания ставки оценки в записи товара, а затем попытаться завершением заполнения / отменой этой записи"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% материалов доставлено по данной Накладной
 DocType: Project,Customer Details,Данные клиента
 DocType: Employee,Reports to,Доклады
 ,Unpaid Expense Claim,Неоплаченные Авансовые Отчеты
 DocType: SMS Settings,Enter url parameter for receiver nos,Введите параметр URL для приемника NOS
-DocType: Payment Entry,Paid Amount,Выплаченная сумма
+DocType: Payment Entry,Paid Amount,Оплаченная сумма
 DocType: Assessment Plan,Supervisor,Руководитель
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,В сети
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,В сети
 ,Available Stock for Packing Items,Доступные Stock для упаковки товаров
 DocType: Item Variant,Item Variant,Пункт Вариант
 DocType: Assessment Result Tool,Assessment Result Tool,Оценка результата инструмент
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Отправил заказы не могут быть удалены
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Управление качеством
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Пункт {0} отключена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} отключена
 DocType: Employee Loan,Repay Fixed Amount per Period,Погашать фиксированную сумму за период
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Сотрудник Внешний Работа История
@@ -3948,7 +3953,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Уведомление (дней)
 DocType: Tax Rule,Sales Tax Template,Шаблон Налога с продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Выберите элементы для сохранения счета-фактуры
 DocType: Employee,Encashment Date,Инкассация Дата
 DocType: Training Event,Internet,интернет
 DocType: Account,Stock Adjustment,Регулирование запасов
@@ -3972,7 +3977,7 @@
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Пожалуйста, сформулируйте из / в диапазоне"
 DocType: Serial No,Under AMC,Под КУА
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оценка пересчитывается с учетом приземлился затрат количество ваучеров
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Пункт ставка оценка пересчитывается с учетом приземлился затрат количество ваучеров
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок.
 DocType: Guardian,Guardian Of ,Хранитель
 DocType: Grading Scale Interval,Threshold,порог
@@ -3982,6 +3987,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примечание Выпущенный
 DocType: Production Order,Warehouses,Склады
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не может быть перемещён
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Этот элемент является Вариантом {0} (Шаблон).
 DocType: Workstation,per hour,в час
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,покупка
 DocType: Announcement,Announcement,Объявление
@@ -3997,8 +4003,8 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не разрешено изменять Поставщик как уже существует заказа
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, позволяющая проводить операции, превышающие кредитный лимит, установлена."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Выбор элементов для изготовления
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Выбор элементов для изготовления
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Мастер синхронизации данных, это может занять некоторое время"
 DocType: Item,Material Issue,Материал выпуск
 DocType: Hub Settings,Seller Description,Продавец Описание
 DocType: Employee Education,Qualification,Квалификаци
@@ -4010,7 +4016,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,В обработке
 DocType: Salary Detail,Component,Компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерии оценки Группа
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Начальная Накопленная амортизация должна быть меньше или равна {0}
 DocType: Warehouse,Warehouse Name,Название склада
 DocType: Naming Series,Select Transaction,Выберите операцию
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
@@ -4023,7 +4029,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, так как проведена учетная запись по Запасам {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить, так как проведена учетная запись по Запасам {0}"
 DocType: Employee Loan,Disbursement Date,Расходование Дата
 DocType: Vehicle,Vehicle,Средство передвижения
 DocType: Purchase Invoice,In Words,Прописью
@@ -4038,14 +4044,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Активов Амортизация и противовесов
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Сумма {0} {1} переведен из {2} до {3}
 DocType: Sales Invoice,Get Advances Received,Получить авансы полученные
 DocType: Email Digest,Add/Remove Recipients,Добавить / Удалить получателей
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Для установки в этом финансовом году, как по умолчанию, нажмите на кнопку ""Установить по умолчанию"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Присоединиться
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Нехватка Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Состояние вариант {0} существует с теми же атрибутами
 DocType: Employee Loan,Repay from Salary,Погашать из заработной платы
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Запрос платеж против {0} {1} на сумму {2}
@@ -4063,7 +4069,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оценка результата Detail
 DocType: Employee Education,Employee Education,Сотрудник Образование
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Повторяющаяся группа находке в таблице группы товаров
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Он необходим для извлечения Подробности Элемента.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} уже существует
@@ -4072,7 +4078,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не связан с какой-либо учетной записи, пожалуйста, создайте / связать соответствующий счет (актив) для склада."
 DocType: Purchase Invoice,Recurring Id,Периодическое Id
 DocType: Customer,Sales Team Details,Описание отдела продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Удалить навсегда?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Удалить навсегда?
 DocType: Expense Claim,Total Claimed Amount,Всего заявленной суммы
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенциальные возможности для продажи.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неверный {0}
@@ -4083,13 +4089,14 @@
 DocType: Warehouse,PIN,ШТЫРЬ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Настройка вашей школы в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базовая Изменение Сумма (Компания Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,Последняя сумма заказа
+DocType: Task,Is Milestone,Это этап
 DocType: Daily Work Summary,Email Sent To,Е-мейл отправлен
 DocType: Budget,Warn,Warn
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Любые другие замечания, отметить усилия, которые должны идти в записях."
@@ -4110,7 +4117,7 @@
 DocType: Item Attribute Value,Attribute Value,Значение атрибута
 ,Itemwise Recommended Reorder Level,Itemwise Рекомендуем изменить порядок Уровень
 DocType: Salary Detail,Salary Detail,Заработная плата: Подробности
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Пожалуйста, выберите {0} первый"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Пожалуйста, выберите {0} первый"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Партия {0} позиций {1} просрочена
 DocType: Sales Invoice,Commission,Комиссионный сбор
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Время Лист для изготовления.
@@ -4122,41 +4129,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Заморозить остатки старше чем"" должны быть меньше %d дней."
 DocType: Tax Rule,Purchase Tax Template,Налог на покупку шаблон
 ,Project wise Stock Tracking,Проект мудрый слежения со
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактический Кол-во (в источнике / цели)
 DocType: Item Customer Detail,Ref Code,Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Сотрудник записей.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Пожалуйста, следующий набор амортизации Дата"
 DocType: HR Settings,Payroll Settings,Настройки по заработной плате
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,"Подходим, не связанных Счета и платежи."
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Разместить заказ
 DocType: Email Digest,New Purchase Orders,Новые заказы
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Корневая не может иметь родителей МВЗ
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Выберите бренд ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Выберите бренд ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Накопленная амортизация на
 DocType: Sales Invoice,C-Form Applicable,C-образный Применимо
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Время работы должно быть больше, чем 0 для операции {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Склад является обязательным
 DocType: Supplier,Address and Contacts,Адрес и контакты
 DocType: UOM Conversion Detail,UOM Conversion Detail,Единица измерения Преобразование Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Соблюдайте размеры 900px (ш) на 100px (в)
 DocType: Program,Program Abbreviation,Программа Аббревиатура
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производственный заказ не может быть поднят против Item Шаблон
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Расходы обновляются в приобретении получение против каждого пункта
 DocType: Warranty Claim,Resolved By,Решили По
 DocType: Bank Guarantee,Start Date,Дата Начала
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Распределить отпуска на определенный срок.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чеки и депозиты неправильно очищена
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Счет {0}: Вы не можете назначить себя как родительским счетом
 DocType: Purchase Invoice Item,Price List Rate,Прайс-лист Оценить
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Создание котировки клиентов
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Создание котировки клиентов
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показать ""На складе"" или ""нет на складе"", основанный на складе имеющейся в этом складе."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Ведомость материалов (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Среднее время поставки
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Оценка результата
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часов
 DocType: Project,Expected Start Date,Ожидаемая дата начала
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Удалить элемент, если обвинения не относится к этому пункту"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,"Валюта сделки должна быть такой же, как платежный шлюз валюты"
 DocType: Payment Entry,Receive,Получать
@@ -4167,19 +4173,19 @@
 DocType: Workstation,Operating Costs,Операционные расходы
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Действие, если накопилось Превышен Ежемесячный бюджет"
 DocType: Purchase Invoice,Submit on creation,Провести по создании
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Валюта для {0} должно быть {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Валюта для {0} должно быть {1}
 DocType: Asset,Disposal Date,Утилизация Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Электронные письма будут отправлены во все активные работники компании на данный час, если у них нет отпуска. Резюме ответов будет отправлен в полночь."
 DocType: Employee Leave Approver,Employee Leave Approver,Сотрудник Оставить утверждающий
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: запись Изменить порядок уже существует для этого склада {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не можете объявить как потерял, потому что цитаты было сделано."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Обучение Обратная связь
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производственный заказ {0} должен быть проведен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс является обязательным в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сегодняшний день не может быть раньше от даты
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Добавить / Изменить цены
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Добавить / Изменить цены
 DocType: Batch,Parent Batch,Родительская партия
 DocType: Cheque Print Template,Cheque Print Template,Чеками печати шаблона
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,План МВЗ
@@ -4192,7 +4198,7 @@
 ,Ordered Items To Be Delivered,Заказал детали быть поставленным
 DocType: Account,Income,Доход
 DocType: Industry Type,Industry Type,Промышленность Тип
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Что-то пошло не так!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Что-то пошло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Предупреждение: Оставьте приложение содержит следующие даты блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Счет на продажу {0} уже проведен
 DocType: Assessment Result Detail,Score,Гол
@@ -4223,17 +4229,17 @@
 DocType: Item,Variant Based On,Вариант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100%. Это {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваши Поставщики
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Невозможно установить, как Остаться в живых, как заказ клиента производится."
 DocType: Request for Quotation Item,Supplier Part No,Деталь поставщика №
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Получено от
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Не можете вычесть, когда категория для &quot;Оценка&quot; или &quot;Vaulation и Total &#39;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Получено от
 DocType: Lead,Converted,Переделанный
 DocType: Item,Has Serial No,Имеет Серийный номер
 DocType: Employee,Date of Issue,Дата выдачи
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: От {0} для {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: От {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ряд # {0}: Установить Поставщик по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Строка {0}: значение часов должно быть больше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Сайт изображения {0} прикреплен к пункту {1} не может быть найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Перечислите этот пункт в нескольких группах на веб-сайте.
@@ -4242,20 +4248,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Ваши настройки доступа не позволяют замораживать значения
 DocType: Payment Reconciliation,Get Unreconciled Entries,Получить несверенные записи
 DocType: Payment Reconciliation,From Invoice Date,От Дата Счета
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Платежная валюта должна быть равна либо по умолчанию comapany в валюте или партии валюты счета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставьте Инкассацию
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Что оно делает?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Для Склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Поступающим Student
 ,Average Commission Rate,Средний Уровень Комиссии
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Имеет Серийный номер"" не может быть ""Да"" для не складской позиции"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Посещаемость не могут быть отмечены для будущих дат
 DocType: Pricing Rule,Pricing Rule Help,Цены Правило Помощь
 DocType: School House,House Name,Название дома
 DocType: Purchase Taxes and Charges,Account Head,Основной счет
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Обновление дополнительных затрат для расчета приземлился стоимость товаров
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Электрический
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавьте остальную часть вашей организации в качестве пользователей. Вы можете также добавить приглашать клиентов на ваш портал, добавив их из списка контактов"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Добавьте остальную часть вашей организации в качестве пользователей. Вы можете также добавить приглашать клиентов на ваш портал, добавив их из списка контактов"
 DocType: Stock Entry,Total Value Difference (Out - In),Общая стоимость Разница (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4264,7 +4270,7 @@
 DocType: Item,Customer Code,Код клиента
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Напоминание о дне рождения для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дни с последнего Заказать
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебету счета должны быть баланс счета
 DocType: Buying Settings,Naming Series,Наименование серии
 DocType: Leave Block List,Leave Block List Name,Оставьте Имя Блок-лист
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхование начала должна быть меньше, чем дата страхование End"
@@ -4279,9 +4285,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Зарплата Скольжение работника {0} уже создан для табеля {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Заказал Кол-во
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Пункт {0} отключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Пункт {0} отключена
 DocType: Stock Settings,Stock Frozen Upto,Фото Замороженные До
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM не содержит какой-либо элемент запаса
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период с Период и датам обязательных для повторяющихся {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектная деятельность / задачи.
 DocType: Vehicle Log,Refuelling Details,Заправочные Подробнее
@@ -4291,8 +4297,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Последний курс покупки не найден
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списание Сумма (Компания валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Платежная часы
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,По умолчанию BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Ряд # {0}: Пожалуйста, установите количество тональный"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Нажмите элементы, чтобы добавить их сюда."
 DocType: Fees,Program Enrollment,Программа подачи заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Земельные стоимости путевки
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
@@ -4316,7 +4323,7 @@
 DocType: Maintenance Visit,Maintenance Date,Техническое обслуживание Дата
 DocType: Purchase Invoice Item,Rejected Serial No,Отклонен Серийный номер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Год дата начала или дата окончания перекрывается с {0}. Чтобы избежать пожалуйста, установите компанию"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### 
  Если серия установлен и Серийный номер не упоминается в сделках, то автоматическая серийный номер будет создан на основе этой серии. Если вы хотите всегда явно упомянуть заводским номером для этого элемента. оставить это поле пустым,."
@@ -4394,7 +4401,6 @@
 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,Крест Листинг пункта в нескольких группах
-DocType: Grade Interval,Grade Interval,Интервал Оценка
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата начала и Дата окончания Финансового года уже установлены в финансовом году {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Зазор Дата обновления
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Сплит-пакет
@@ -4441,14 +4447,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Оставьте непроверенным, если вы не хотите рассматривать пакет, создавая группы на основе курса."
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизации (месяцев)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитный счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Кредитный счет
 DocType: Landed Cost Item,Landed Cost Item,Посадка Статьи затрат
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показать нулевые значения
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количество пункта получены после изготовления / переупаковка от заданных величин сырья
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Настройка простой веб-сайт для моей организации
 DocType: Payment Reconciliation,Receivable / Payable Account,Счет Дебиторской / Кредиторской задолженности
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Пожалуйста, сформулируйте Значение атрибута для атрибута {0}"
 DocType: Item,Default Warehouse,По умолчанию Склад
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не может быть назначен на учетную запись группы {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -4493,7 +4499,7 @@
 DocType: Opportunity Item,Basic Rate,Основная ставка
 DocType: GL Entry,Credit Amount,Сумма кредита
 DocType: Cheque Print Template,Signatory Position,подписавшая Позиция
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Установить как Остаться в живых
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Установить как Остаться в живых
 DocType: Timesheet,Total Billable Hours,Всего человеко-часов
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Получение Примечание
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Это основано на операциях против этого клиента. См график ниже для получения подробной информации
@@ -4507,11 +4513,11 @@
 ,Items To Be Requested,"Предметы, будет предложено"
 DocType: Purchase Order,Get Last Purchase Rate,Получить последнюю покупку Оценить
 DocType: Company,Company Info,Информация о компании
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Выберите или добавить новый клиент
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Выберите или добавить новый клиент
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,МВЗ требуется заказать требование о расходах
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств (активов)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Это основано на посещаемости этого сотрудника
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебетовый счет
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Дебетовый счет
 DocType: Fiscal Year,Year Start Date,Дата начала года
 DocType: Attendance,Employee Name,Имя Сотрудника
 DocType: Sales Invoice,Rounded Total (Company Currency),Округлые Всего (Компания Валюта)
@@ -4520,13 +4526,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Остановить пользователям вносить Leave приложений на последующие дни.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Сумма покупки
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Ценовое предложение поставщика {0} создано
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Год окончания не может быть раньше начала года
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Вознаграждения работникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Пожалуйста, установите по умолчанию список праздников для Employee {0} или Компания {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не существует
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не существует
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Платежи Заказчиков
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Ряд № {0}: Сумма не может быть больше, чем указанная в Авансовом Отчете {1}. Указанная сумма {2}"
@@ -4535,15 +4541,17 @@
 DocType: Quality Inspection Reading,Reading 3,Чтение 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Ваучер Тип
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Прайс-лист не найден или отключен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Прайс-лист не найден или отключен
 DocType: Employee Loan Application,Approved,Утверждено
 DocType: Pricing Rule,Price,Цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как ""левые"""
 DocType: Guardian,Guardian,блюститель
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,Образование
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Текущий адрес
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифицированный
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необязательный. Устанавливает по умолчанию валюту компании, если не указано."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Журнал бухгалтерских записей.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно Кол-во на со склада
@@ -4552,7 +4560,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партия / счета не соответствует {1} / {2} в {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Пожалуйста, введите Expense счет"
 DocType: Account,Stock,Склад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Строка # {0}: Ссылка Тип документа должен быть одним из заказа на поставку, счета-фактуры Покупка или журнал запись"
 DocType: Employee,Current Address,Текущий адрес
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Если деталь вариант другого элемента, то описание, изображение, ценообразование, налоги и т.д., будет установлен из шаблона, если явно не указано"
 DocType: Serial No,Purchase / Manufacture Details,Покупка / Производство Подробнее
@@ -4580,7 +4588,7 @@
 DocType: Hub Settings,Hub Settings,Настройки Hub
 DocType: Project,Gross Margin %,Валовая маржа %
 DocType: BOM,With Operations,С операций
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерские проводки для компании {1}, уже были сделаны в валюте {0} . Пожалуйста, выберите счет дебиторской или кредиторской задолженности в валютой {0}."
 DocType: Asset,Is Existing Asset,Является ли существующего актива
 DocType: Salary Detail,Statistical Component,Статистический компонент
 DocType: Salary Detail,Statistical Component,Статистический компонент
@@ -4605,7 +4613,7 @@
 DocType: Assessment Plan,Room,Комната
 DocType: Purchase Order,Advance Paid,Авансовая выплата
 DocType: Item,Item Tax,Пункт Налоговый
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Материал Поставщику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Материал Поставщику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Акцизный Счет
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% появляется более одного раза
 DocType: Expense Claim,Employees Email Id,Сотрудники Email ID
@@ -4636,9 +4644,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепить логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Уровни
 DocType: Customer,Commission Rate,Комиссия
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Сделать Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Сделать Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок отпуска приложений отделом.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплаты должен быть одним из Присылать, Pay и внутренний перевод"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корзина Пусто
 DocType: Vehicle,Model,Модель
@@ -4649,6 +4657,7 @@
 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 +161,Capital Stock,Капитал
+DocType: Shopping Cart Settings,Show Public Attachments,Показать общедоступные приложения
 DocType: Packing Slip,Package Weight Details,Вес упаковки Подробнее
 DocType: Payment Gateway Account,Payment Gateway Account,Платежный шлюз аккаунт
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,После завершения оплаты перенаправить пользователя на выбранную страницу.
@@ -4667,15 +4676,15 @@
 DocType: Batch,Expiry Date,Срок годности:
 ,Supplier Addresses and Contacts,Адреса и контакты поставщика
 ,accounts-browser,счета-браузер
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Пожалуйста, выберите категорию первый"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Пожалуйста, выберите категорию первый"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Мастер проекта.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Чтобы разрешить более-биллинга или по-заказа, обновление &quot;льгота&quot; в настройках изображения или предмет."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показывать любой символ вроде $ и т.д. рядом с валютами.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Полдня)
 DocType: Supplier,Credit Days,Кредитных дней
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Является ли переносить
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Получить элементы из спецификации
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Получить элементы из спецификации
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Время выполнения дни
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Строка # {0}: Дата размещения должна быть такой же, как даты покупки {1} актива {2}"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Пожалуйста, введите Заказы в приведенной выше таблице"
@@ -4692,8 +4701,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционированный Количество
 DocType: GL Entry,Is Opening,Открывает
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запись не может быть связан с {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещаемости через Setup&gt; Numbering Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Пожалуйста, настройте серию нумерации для посещаемости через Setup&gt; Numbering Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Аккаунт {0} не существует
 DocType: Account,Cash,Наличные
 DocType: Employee,Short biography for website and other publications.,Краткая биография для веб-сайта и других изданий.
diff --git a/erpnext/translations/si.csv b/erpnext/translations/si.csv
index 6a3cc1e..6e8fc91 100644
--- a/erpnext/translations/si.csv
+++ b/erpnext/translations/si.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,කුලියට ගත්
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,සඳහා පරිශීලක අදාළ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","නතර අවලංගු කිරීමට ප්රථම එය Unstop නිෂ්පාදන සාමය, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","නතර අවලංගු කිරීමට ප්රථම එය Unstop නිෂ්පාදන සාමය, අවලංගු කල නොහැක"
 DocType: Vehicle Service,Mileage,ධාවනය කර ඇති දුර
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,ඔබට නිසැකවම මෙම වත්කම් ඡන්ද දායකයා කිරීමට අවශ්යද?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,පෙරනිමි සැපයුම්කරු තෝරන්න
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,පෙරනිමි සැපයුම්කරු තෝරන්න
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},ව්යවහාර මුදල් මිල ලැයිස්තුව {0} සඳහා අවශ්ය
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ගනුදෙනුව ගණනය කරනු ඇත.
 DocType: Purchase Order,Customer Contact,පාරිභෝගික ඇමතුම්
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} ශුන්ය ({1}) ට වඩා අඩු විය නොහැක විශිෂ්ට සඳහා
 DocType: Manufacturing Settings,Default 10 mins,මිනිත්තු 10 Default
 DocType: Leave Type,Leave Type Name,"අවසරය, වර්ගය නම"
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,විවෘත පෙන්වන්න
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,විවෘත පෙන්වන්න
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,මාලාවක් සාර්ථකව යාවත්කාලීන කිරීම
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,පරීක්ෂාකාරී වන්න
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,ඉදිරිපත් Accural ජර්නල් සටහන්
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,කණ්ඩායම අයිතමය කල් ඉකුත් වීමේ තත්ත්වය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,බැංකු අණකරයකින් ෙගවිය
 DocType: Mode of Payment Account,Mode of Payment Account,ගෙවීම් ගිණුම වන ආකාරය
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,ප්රභේද පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,ප්රභේද පෙන්වන්න
 DocType: Academic Term,Academic Term,අධ්යයන කාලීන
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,ද්රව්ය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,ප්රමාණය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,ප්රමාණය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,මේසය හිස් විය නොහැක ගිණුම්.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),ණය (වගකීම්)
 DocType: Employee Education,Year of Passing,විසිර වර්ෂය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","විමර්ශන:% s, විෂය සංකේතය:% s සහ පාරිභෝගික:% s"
 DocType: Item,Country of Origin,මුල් රට
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ගබඩාවේ ඇත
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,විවෘත ගැටළු
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,සෞඛ්ය සත්කාර
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ෙගවීම පමාද (දින)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,සේවා වියදම්
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},අනුක්රමික අංකය: {0} දැනටමත් විකුණුම් ඉන්වොයිසිය දී නමෙන්ම ඇත: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ඉන්වොයිසිය
 DocType: Maintenance Schedule Item,Periodicity,ආවර්තයක්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,මුදල් වර්ෂය {0} අවශ්ය වේ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,අපේක්ෂා භාර දීම දිනය විකුණුම් ඇණවුම් දිනය පෙර කළ ය
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","කුළුණු දෙක, පැරණි නම සඳහා එක හා නව නාමය සඳහා එක් .csv ගොනුව අමුණන්න"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ඕනෑම ක්රියාශීලී මුදල් වර්ෂය තුළ නැත.
 DocType: Packed Item,Parent Detail docname,මව් විස්තර docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","මූලාශ්ර: {0}, අයිතමය සංකේතය: {1} සහ පාරිභෝගික: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,ලඝු
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,රැකියාවක් සඳහා විවෘත.
 DocType: Item Attribute,Increment,වර්ධකය
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,ගබඩා තෝරන්න ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,ගබඩා තෝරන්න ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,වෙළඳ ප්රචාරණ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,එම සමාගම එක් වරකට වඩා ඇතුලත් කර
 DocType: Employee,Married,විවාහක
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},{0} සඳහා අවසර නැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,සිට භාණ්ඩ ලබා ගන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},{0} සඳහා අවසර නැත
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,සිට භාණ්ඩ ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},කොටස් බෙදීම සටහන {0} එරෙහිව යාවත්කාලීන කල නොහැක
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},නිෂ්පාදන {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ලැයිස්තුගත අයිතමයන් කිසිවක් නොමැත
 DocType: Payment Reconciliation,Reconcile,සංහිඳියාවකට
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,සිල්ලර බඩු
 DocType: Quality Inspection Reading,Reading 1,කියවීම 1
 DocType: Process Payroll,Make Bank Entry,බැංකුව සටහන් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,විශ්රාම වැටුප් අරමුදල්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ඊළඟ ක්ෂය වීම දිනය මිල දී ගත් දිනය පෙර විය නොහැකි
 DocType: SMS Center,All Sales Person,සියලු විකුණුම් පුද්ගලයෙක්
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** මාසික බෙදාහැරීම් ** ඔබගේ ව්යාපාරය තුළ යමක සෘතුමය බලපෑම ඇති නම්, ඔබ මාස හරහා අයවැය / ඉලක්ක, බෙදා හැරීමට උපකාරී වේ."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,හමු වූ භාණ්ඩ නොවේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,හමු වූ භාණ්ඩ නොවේ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,වැටුප් ව්යුහය අතුරුදන්
 DocType: Lead,Person Name,පුද්ගලයා නම
 DocType: Sales Invoice Item,Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",උදා: &quot;ප්රාථමික පාසල්&quot; හෝ &quot;&quot; විශ්වවිද්යාල
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,කොටස් වාර්තා
 DocType: Warehouse,Warehouse Detail,පොත් ගබඩාව විස්තර
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},ණය සීමාව {0} සඳහා ගනුදෙනුකරුවන්ගේ එතෙර කර ඇත {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,හදුන්වන අවසානය දිනය පසුව කාලීන සම්බන්ධකම් කිරීමට (අධ්යයන වර්ෂය {}) අධ්යයන වසරේ වසර අවසාන දිනය වඩා විය නොහැකිය. දින වකවානු නිවැරදි කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;ස්ථාවර වත්කම් ද&quot; වත්කම් වාර්තාවක් අයිතමය එරෙහිව පවතී ලෙස, අපරීක්ෂා විය නොහැකි"
 DocType: Vehicle Service,Brake Oil,බ්රේක් ඔයිල්
 DocType: Tax Rule,Tax Type,බදු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},ඔබ {0} පෙර සටහන් ඇතුළත් කිරීම් එකතු කිරීම හෝ යාවත්කාලීන කිරීම කිරීමට තමන්ට අවසර නොමැති
 DocType: BOM,Item Image (if not slideshow),අයිතමය අනුරුව (Slideshow නොවේ නම්)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ක පාරිභෝගික එකම නමින් පවතී
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(පැය අනුපාතිකය / 60) * සත මෙහෙයුම කාල
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,ද්රව්ය ලේඛණය තෝරන්න
 DocType: SMS Log,SMS Log,කෙටි පණිවුඩ ලොග්
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,භාර අයිතම පිරිවැය
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} මත වන නිවාඩු අතර දිනය සිට මේ දක්වා නැත
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,පාසල්
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},{1} සඳහා කිසිදු නිවාඩු වාර්තා සේවකයා සඳහා සොයා {0}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,පළමු සමාගම ඇතුලත් කරන්න
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,කරුණාකර සමාගම පළමු තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,මුළු වියදම
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,හිමිකම් ප්රමාණය
 DocType: Employee,Mr,මහතා
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,මෙම cutomer පිරිසක් වගුව සොයා ගෙන අනුපිටපත් පාරිභෝගික පිරිසක්
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,සැපයුම්කරු වර්ගය / සැපයුම්කරු
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,සැපයුම්කරු වර්ගය / සැපයුම්කරු
 DocType: Naming Series,Prefix,උපසර්ගය
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,පාරිෙභෝජන
 DocType: Employee,B-,බී-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,ශ්රේණියේ
 DocType: Sales Invoice Item,Delivered By Supplier,සැපයුම්කරු විසින් ඉදිරිපත්
 DocType: SMS Center,All Contact,සියලු විමසීම්
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ද්රව්ය ලේඛණය සමග සියලු භාණ්ඩ සඳහා දැනටමත් නිර්මාණය නිෂ්පාදනය සාමය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,වාර්ෂික වැටුප
 DocType: Daily Work Summary,Daily Work Summary,ඩේලි වැඩ සාරාංශය
 DocType: Period Closing Voucher,Closing Fiscal Year,වසා මුදල් වර්ෂය
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,"{0} {1}, ශීත කළ ය"
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,කරුණාකර ගිණුම් සටහන නිර්මාණය කිරීම සඳහා පවතින සමාගම තෝරා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,කොටස් වෙළඳ වියදම්
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,ඉලක්ක ගබඩාව තෝරා
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,කොන්ට්රා සටහන්
 DocType: Journal Entry Account,Credit in Company Currency,"සමාගම ව්යවහාර මුදල්, නය"
 DocType: Delivery Note,Installation Status,ස්ථාපනය තත්ත්වය
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",ඔබ පැමිණීම යාවත්කාලීන කිරීමට අවශ්යද? <br> වර්තමාන: {0} \ <br> නැති කල: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},පිළිගත් + යවන ලද අයිතමය {0} සඳහා ලැබී ප්රමාණය සමාන විය යුතුය ප්රතික්ෂේප
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,"මිලදී ගැනීම සඳහා සම්පාදන, අමු ද්රව්ය"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ගෙවීම් අවම වශයෙන් එක් මාදිලිය POS ඉන්වොයිසිය සඳහා අවශ්ය වේ.
 DocType: Products Settings,Show Products as a List,ලැයිස්තුවක් ලෙස නිෂ්පාදන පෙන්වන්න
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","මෙම සැකිල්ල බාගත නිසි දත්ත පුරවා විකරිත ගොනුව අමුණන්න. තෝරාගත් කාලය තුළ සියලු දිනයන් හා සේවක එකතුවක් පවත්නා පැමිණීම වාර්තා සමග, සැකිල්ල පැමිණ ඇත"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ක්ෂය සටහන් කරන්න
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,ඉල්ලීම වර්ගය
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,සේවක කරන්න
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,සේවක කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ගුවන් විදුලි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ක්රියාකරවීම
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,මෙහෙයුම් පිළිබඳ විස්තර සිදු කරන ලදී.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,නඩත්තු සංචාර සඳහා සැලැස්ම.
 DocType: SMS Settings,Enter url parameter for message,පණිවිඩය සඳහා url එක පරාමිතිය ඇතුලත් කරන්න
 DocType: POS Profile,Customer Groups,පාරිභෝගික කණ්ඩායම්
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,මුල්ය ප්රකාශනය
 DocType: Guardian,Students,සිසු
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,මිල ගණන් හා වට්ටම් අයදුම් කිරීම සඳහා නීති.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,මිල ලැයිස්තුව මිලදී ගැනීම හෝ විකිණීම සඳහා අදාළ විය යුතුය
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},{0} {1} වඩා වැඩි උසස් ප්රමාණය විය නොහැකි
 DocType: Naming Series,Series List for this Transaction,මෙම ගනුදෙනු සඳහා මාලාවක් ලැයිස්තුව
 DocType: Company,Default Payroll Payable Account,පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,යාවත්කාලීන විද්යුත් සමූහ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,යාවත්කාලීන විද්යුත් සමූහ
 DocType: Sales Invoice,Is Opening Entry,විවෘත වේ සටහන්
 DocType: Customer Group,Mention if non-standard receivable account applicable,සම්මතයට අයත් නොවන ලැබිය අදාළ නම් සඳහන්
 DocType: Course Schedule,Instructor Name,උපදේශක නම
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,ගබඩාව අවශ්ය වේ සඳහා පෙර ඉදිරිපත්
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,දේශීය වෙළඳ සහකරුවන්
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","පරීක්ෂා නම්, ද්රව්ය ඉල්ලීම් නොවන වස්තු භාණ්ඩ ඇතුළත් වේ."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,විකුණුම් ඉන්වොයිසිය අයිතමය එරෙහිව
 ,Production Orders in Progress,ප්රගති නිෂ්පාදනය නියෝග
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,මූල්ය පහසුකම් ශුද්ධ මුදල්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
 DocType: Lead,Address & Contact,ලිපිනය සහ ඇමතුම්
 DocType: Leave Allocation,Add unused leaves from previous allocations,පෙර ප්රතිපාදනවලින් භාවිතා නොකරන කොළ එකතු කරන්න
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ඊළඟට නැවත නැවත {0} {1} මත නිර්මාණය කරනු ඇත
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු සැඳුම්ලත් මුදල
 DocType: Item Website Specification,Item Website Specification,අයිතමය වෙබ් අඩවිය පිරිවිතර
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,අවසරය ඇහිරීම
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,බැංකු අයැදුම්පත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},අයිතමය {0} {1} මත ජීවය එහි අවසානය කරා එළඹ ඇති
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,බැංකු අයැදුම්පත්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,වාර්ෂික
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,කොටස් ප්රතිසන්ධාන අයිතමය
 DocType: Stock Entry,Sales Invoice No,විකුණුම් ඉන්වොයිසිය නොමැත
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Hub දී ප්රකාශයට පත් කරනු ලබයි
 DocType: Student Admission,Student Admission,ශිෂ්ය ඇතුළත් කිරීම
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,"ද්රව්ය, ඉල්ලීම්"
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,අයිතමය {0} අවලංගුයි
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,"ද්රව්ය, ඉල්ලීම්"
 DocType: Bank Reconciliation,Update Clearance Date,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 DocType: Item,Purchase Details,මිලදී විස්තර
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"අයිතමය {0} මිලදී ගැනීමේ නියෝගයක් {1} තුළ &#39;, අමු ද්රව්ය සැපයූ&#39; වගුව තුල සොයාගත නොහැකි"
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,පැහැදිලි කිරීමට කැපී පෙනෙන චෙක්පත් සහ තැන්පතු
 DocType: Item,Synced With Hub,Hub සමඟ සමමුහුර්ත
 DocType: Vehicle,Fleet Manager,ඇණිය කළමනාකරු
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},පේළියේ # {0}: {1} අයිතමය {2} සඳහා සෘණ විය නොහැකි
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,වැරදි මුරපදය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},පේළියේ # {0}: {1} අයිතමය {2} සඳහා සෘණ විය නොහැකි
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,වැරදි මුරපදය
 DocType: Item,Variant Of,අතරින් ප්රභේද්යයක්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',අවසන් යවන ලද &#39;යවන ලද නිෂ්පාදනය සඳහා&#39; ට වඩා වැඩි විය නොහැක
 DocType: Period Closing Voucher,Closing Account Head,වසා ගිණුම ප්රධානී
 DocType: Employee,External Work History,විදේශ රැකියා ඉතිහාසය
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,වටරවුම් විමර්ශන දෝෂ
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ස්වයංක්රීය ද්රව්ය ඉල්ලීම් නිර්මානය කිරීම මත ඊ-මේල් මගින් දැනුම් දෙන්න
 DocType: Journal Entry,Multi Currency,බහු ව්යවහාර මුදල්
 DocType: Payment Reconciliation Invoice,Invoice Type,ඉන්වොයිසිය වර්ගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,සැපයුම් සටහන
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,බදු සකස් කිරීම
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,අලෙවි වත්කම් පිරිවැය
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,ඔබ එය ඇද පසු ගෙවීම් සටහන් වෙනස් කර ඇත. කරුණාකර එය නැවත නැවත අදින්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
-DocType: Grade Interval,Min Score,විනාඩි ලකුණු
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} අයිතමය බදු දී දෙවරක් ඇතුළත්
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,මේ සතියේ හා ෙ කටයුතු සඳහා සාරාංශය
 DocType: Student Applicant,Admitted,ඇතුළත්
 DocType: Workstation,Rent Cost,කුලියට වියදම
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,සඳහා අගය
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,පක්ෂයට එරෙහිව හෝ අභ්යන්තර ස්ථාන මාරු සඳහා බැංකුව / මුදල් ගනුෙදනු
 DocType: Shipping Rule,Valid for Countries,රටවල් සඳහා වලංගු
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,මෙම අයිතමය මඟින් සැකිල්ල වන අතර ගනුදෙනු භාවිතා කළ නොහැකි වනු ඇත. &#39;කිසිම පිටපත්&#39; නියම නොකරන්නේ නම් අයිතමය ගුණාංග එම ප්රභේද තුලට පිටපත් කරනු ඇත
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,මුළු සාමය සලකා බලන
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","සේවක තනතුර (උදා: ප්රධාන විධායක නිලධාරී, අධ්යක්ෂ ආදිය)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,ක්ෂේත්රයේ අගය දිනය මාසික මත නැවත නැවත &#39;ඇතුලත් කරන්න
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ෙරෝ # {0}: ගැනුම් දැනට පවතින වත්කම් {1} එරෙහිව කළ නොහැකි
 DocType: Item Tax,Tax Rate,බදු අනුපාතය
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} කාලයක් සඳහා සේවක {1} සඳහා වන විටත් වෙන් {2} {3} වෙත
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,විෂය තෝරා
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,විෂය තෝරා
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,මිලදී ගැනීම ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත්
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ෙරෝ # {0}: කණ්ඩායම කිසිදු {1} {2} ලෙස සමාන විය යුතුයි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,නොවන සමූහ පරිවර්තනය
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,කණ්ඩායම (ගොඩක්) යනු විෂය ය.
 DocType: C-Form Invoice Detail,Invoice Date,ඉන්වොයිසිය දිනය
 DocType: GL Entry,Debit Amount,ඩෙබිට් මුදල
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},එහි එකම {0} {1} තුළ සමාගම අනුව 1 ගිණුම විය හැක
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,කරුණාකර ඇමුණුම බලන්න
 DocType: Purchase Order,% Received,% ලැබී
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,ශිෂ්ය කණ්ඩායම් නිර්මාණය කරන්න
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,උද්ධෘත සඳහා ඉල්ලුම්
 DocType: Salary Slip Timesheet,Working Hours,වැඩ කරන පැය
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,දැනට පවතින මාලාවේ ආරම්භක / වත්මන් අනුක්රමය අංකය වෙනස් කරන්න.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,නව පාරිභෝගික නිර්මාණය
-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.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,නව පාරිභෝගික නිර්මාණය
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","බහු මිල නියම රීති පවතින දිගටම සිදු වන්නේ නම්, පරිශීලකයන් ගැටුම විසඳීමට අතින් ප්රමුඛ සකස් කරන ලෙස ඉල්ලා ඇත."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,මිලදී ගැනීම නියෝග නිර්මාණය
 ,Purchase Register,මිලදී රෙජිස්ටර්
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,අදාළ ගාස්තු
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) භූමිකාව &#39;නිවාඩු Approver&#39; තිබිය යුතුය
 DocType: Purchase Receipt,Vehicle Date,වාහන දිනය
 DocType: Student Log,Medical,වෛද්ය
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,අහිමි හේතුව
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,අහිමි හේතුව
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,ඊයම් න පෙරමුණ ලෙස සමාන විය නොහැකි
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,unadjusted ප්රමාණය ට වඩා වැඩි මුදලක් වෙන් කර ගත යුතු නොවේ
 DocType: Announcement,Receiver,ලබන්නා
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,ප්රමාණය හා වේගය
 DocType: Delivery Note,% Installed,% ප්රාප්ත
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,පන්ති කාමර / රසායනාගාර ආදිය දේශන නියමිත කළ හැකි.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,සමාගමේ නම පළමු ඇතුලත් කරන්න
 DocType: Purchase Invoice,Supplier Name,සපයන්නාගේ නම
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,මෙම ERPNext අත්පොත කියවන්න
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,අනිවාර්ය ක්ෂේත්රයේ - අධ්යයන වර්ෂය
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,අනිවාර්ය ක්ෂේත්රයේ - අධ්යයන වර්ෂය
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,එම ඊමේල් කොටසක් ලෙස බෙදීයන හඳුන්වාදීමේ පෙළ වෙනස් කරගන්න. එක් එක් ගනුදෙනුව වෙනම හඳුන්වාදීමේ පෙළ ඇත.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},සමාගම {0} සඳහා පෙරනිමි ගෙවිය යුතු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,සියලු නිෂ්පාදන ක්රියාවලීන් සඳහා වන ගෝලීය සැකසුම්.
 DocType: Accounts Settings,Accounts Frozen Upto,ගිණුම් ශීත කළ තුරුත්
 DocType: SMS Log,Sent On,දා යවන
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,ගති ලක්ෂණය {0} දන්ත ධාතුන් වගුව කිහිපවතාවක් තෝරාගත්
 DocType: HR Settings,Employee record is created using selected field. ,සේවක වාර්තාවක් තෝරාගත් ක්ෂේත්ර භාවිතා කිරීමෙන්ය.
 DocType: Sales Order,Not Applicable,අදාළ නොවේ
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,නිවාඩු ස්වාමියා.
 DocType: Request for Quotation Item,Required Date,අවශ්ය දිනය
 DocType: Delivery Note,Billing Address,බිල්පත් ලිපිනය
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,විෂය සංග්රහයේ ඇතුලත් කරන්න.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,විෂය සංග්රහයේ ඇතුලත් කරන්න.
 DocType: BOM,Costing,ක වියදමින්
 DocType: Tax Rule,Billing County,බිල්පත් කවුන්ටි
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","පරීක්ෂා නම්, මේ වන විටත් මුද්රණය අනුපාතිකය / මුද්රණය මුදල ඇතුළත් ලෙස බදු මුදල සලකා බලනු ලැබේ"
@@ -506,6 +510,7 @@
 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,සුරැකුම්පත් හා තැන්පතු
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","එය ම ඇගයීමේ ක්රමය නැති අතර සමහර භාණ්ඩ එරෙහිව ගනුදෙනු ඇත ලෙස, ඇගයීමේ ක්රමය වෙනස් කළ නොහැක"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,වෙන් මුළු කොළ අනිවාර්ය වේ
 DocType: Job Opening,Description of a Job Opening,රැකියාවක් ආරම්භ කිරීම පිළිබඳ විස්තරය
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,අද විභාග කටයුතු
@@ -527,13 +532,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,තෝරා පාඨමාලාව කරුණාකර
 DocType: Timesheet Detail,Hrs,ට
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,කරුණාකර සමාගම තෝරා
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,කරුණාකර සමාගම තෝරා
 DocType: Stock Entry Detail,Difference Account,වෙනස ගිණුම
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,එහි රඳා කාර්ය {0} වසා නොවේ ලෙස සමීප කාර්ය කළ නොහැකි ය.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,ද්රව්ය ඉල්ලීම් උත්ථාන කරනු ලබන සඳහා ගබඩා ඇතුලත් කරන්න
 DocType: Production Order,Additional Operating Cost,අතිරේක මෙහෙයුම් පිරිවැය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,අලංකාර ආලේපන
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ඒකාබද්ධ කිරීමට, පහත සඳහන් ලක්ෂණ භාණ්ඩ යන දෙකම සඳහා එකම විය යුතු"
 DocType: Shipping Rule,Net Weight,ශුද්ධ බර
 DocType: Employee,Emergency Phone,හදිසි දුරකථන
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,මිලට ගන්න
@@ -543,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,සීමකය 0% සඳහා ශ්රේණියේ නිර්වචනය කරන්න
 DocType: Sales Order,To Deliver,ගලවාගනියි
 DocType: Purchase Invoice Item,Item,අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,අනු කිසිදු අයිතමය අල්පයක් විය නොහැකි
 DocType: Journal Entry,Difference (Dr - Cr),වෙනස (ආචාර්ය - Cr)
 DocType: Account,Profit and Loss,ලාභ සහ අලාභ
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,කළමනාකාර උප කොන්ත්රාත්
@@ -558,7 +563,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,වර්ධකය 0 වෙන්න බෑ
 DocType: Production Planning Tool,Material Requirement,ද්රව්ය අවශ්යතාවලින් බැහැර වන
 DocType: Company,Delete Company Transactions,සමාගම ගනුදෙනු Delete
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,ෙයොමු අංකය හා විමර්ශන දිනය බැංකුවේ ගනුදෙනුව සඳහා අනිවාර්ය වේ
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ සංස්කරණය කරන්න බදු හා ගාස්තු එකතු කරන්න
 DocType: Purchase Invoice,Supplier Invoice No,සැපයුම්කරු ගෙවීම් නොමැත
 DocType: Territory,For reference,පරිශීලනය සඳහා
@@ -569,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,ස්ථාපන සටහන අයිතමය
 DocType: Production Plan Item,Pending Qty,විභාග යවන ලද
 DocType: Budget,Ignore,නොසලකා හරිනවා
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} සක්රීය නොවන
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} සක්රීය නොවන
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},පහත දුරකථන අංක වෙත යොමු කෙටි පණිවුඩ: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,මුද්රණය සඳහා පිහිටුවීම් චෙක්පත මාන
 DocType: Salary Slip,Salary Slip Timesheet,වැටුප් පුරවා Timesheet
@@ -578,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,මුළු කොමිෂන් සභාව
 DocType: Pricing Rule,Sales Partner,විකුණුම් සහයෝගිතාකරු
 DocType: Buying Settings,Purchase Receipt Required,මිලදී ගැනීම කුවිතාන්සිය අවශ්ය
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"ආරම්භක තොගය තිබේ නම්, තක්සේරු අනුපාත අනිවාර්ය වේ"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,වාර්තා ඉන්ෙවොයිසිය වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,කරුණාකර ප්රථම සමාගම හා පක්ෂ වර්ගය තෝරා
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,මූල්ය / ගිණුම් වර්ෂය.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,සමුච්චිත අගයන්
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","සමාවන්න, අනු අංක ඒකාබද්ධ කළ නොහැකි"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,විකුණුම් සාමය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,විකුණුම් සාමය කරන්න
 DocType: Project Task,Project Task,ව්යාපෘති කාර්ය සාධක
 ,Lead Id,ඊයම් අංකය
 DocType: C-Form Invoice Detail,Grand Total,මුලු එකතුව
@@ -601,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,නැවත ආරම්භ ඇමුණුම්
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,නැවත ගනුදෙනුකරුවන්
 DocType: Leave Control Panel,Allocate,වෙන්
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,විකුණුම් ප්රතිලාභ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,විකුණුම් ප්රතිලාභ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,සටහන: මුළු වෙන් කොළ {0} කාලය සඳහා දැනටමත් අනුමැතිය කොළ {1} ට අඩු නොවිය යුතු ය
 DocType: Announcement,Posted By,පලකරන්නා
 DocType: Item,Delivered by Supplier (Drop Ship),සැපයුම්කරුවන් (Drop නෞකාව) විසින් පවත්වන
@@ -611,7 +616,7 @@
 DocType: Quotation,Quotation To,උද්ධෘත කිරීම
 DocType: Lead,Middle Income,මැදි ආදායම්
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),විවෘත කිරීමේ (බැර)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,වෙන් කල මුදල සෘණ විය නොහැකි
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,සමාගම සකස් කරන්න
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,සමාගම සකස් කරන්න
@@ -623,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,විකුණුම් ඉන්වොයිසිය Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ෙයොමු අංකය සහ විමර්ශන දිනය {0} සඳහා අවශ්ය
 DocType: Process Payroll,Select Payment Account to make Bank Entry,බැංකුව සටහන් කිරීමට ගෙවීම් ගිණුම තෝරන්න
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","කොළ, වියදම් හිමිකම් සහ වැටුප් කළමනාකරණය සේවක වාර්තා නිර්මාණය"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,දැනුම මූලික එකතු කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,යෝජනාව ලේඛන
 DocType: Payment Entry Deduction,Payment Entry Deduction,ගෙවීම් සටහන් අඩු
@@ -653,19 +658,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; මුදල් වර්ෂය {2} නොවේ
 DocType: Buying Settings,Settings for Buying Module,මිලට ගැනීම මොඩියුලය සඳහා සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},වත්කම් {0} සමාගම අයිති නැත {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,මිලදී ගැනීම රිසිට්පත පළමු ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","එවිට මිල ගණන් රීති පාරිභෝගික, පාරිභෝගික සමූහය, ප්රදේශය සැපයුම්කරු සැපයුම්කරුවන් වර්ගය, ව්යාපාරය, විකුණුම් සහකරු ආදිය මත පදනම් අතරින් ප්රේරණය වේ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,බඩු තොග ශුද්ධ වෙනස්
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,සේවක ණය කළමනාකරණ
 DocType: Employee,Passport Number,විදේශ ගමන් බලපත්ර අංකය
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 සමඟ සම්බන්ධය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,කළමනාකරු
 DocType: Payment Entry,Payment From / To,/ සිට දක්වා ගෙවීම්
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,දිනය රංගේ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},නව ණය සීමාව පාරිභෝගික වත්මන් හිඟ මුදල වඩා අඩු වේ. ණය සීමාව බෙ {0} විය යුතුය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; සමාන විය නොහැකි
@@ -674,8 +678,8 @@
 DocType: Production Order Operation,In minutes,විනාඩි
 DocType: Issue,Resolution Date,යෝජනාව දිනය
 DocType: Student Batch Name,Batch Name,කණ්ඩායම නම
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet නිර්මාණය:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet නිර්මාණය:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ගෙවීම් ප්රකාරය {0} පැහැර මුදල් හෝ බැංකු ගිණුම් සකස් කරන්න
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ලියාපදිංචි
 DocType: Selling Settings,Customer Naming By,පාරිභෝගික නම් කිරීම මගින්
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,ශිෂ්ය මාසික පැමිණීම වාර්තා තුළ වර්තමාන ලෙස ශිෂ්ය පෙන්වයි
@@ -703,7 +707,7 @@
 DocType: Production Order Operation,Actual Start Time,සැබෑ ආරම්භය කාල
 DocType: BOM Operation,Operation Time,මෙහෙයුම කාල
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,අවසානයි
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,පදනම
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,පදනම
 DocType: Timesheet,Total Billed Hours,මුළු අසූහත පැය
 DocType: Journal Entry,Write Off Amount,මුදල කපා
 DocType: Journal Entry,Bill No,පනත් කෙටුම්පත මෙයට
@@ -719,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,ශිෂ්ය පැමිණීම
 DocType: Sales Invoice Timesheet,Time Sheet,කාලය පත්රය
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush, අමු ද්රව්ය මත පදනම් වන දින"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,අයිතමය විස්තර ඇතුලත් කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,අයිතමය විස්තර ඇතුලත් කරන්න
 DocType: Interest,Interest,පොලී
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,පෙර විකුණුම්
 DocType: Purchase Receipt,Other Details,වෙනත් විස්තර
@@ -730,24 +734,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ගෙවීම් සටහන් දැනටමත් නිර්මාණය
 DocType: Purchase Receipt Item Supplied,Current Stock,වත්මන් කොටස්
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},ෙරෝ # {0}: වත්කම් {1} අයිතමය {2} සම්බන්ධ නැහැ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,පෙරදසුන වැටුප කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ගිණුම {0} වාර කිහිපයක් ඇතුලත් කර ඇත
 DocType: Account,Expenses Included In Valuation,ඇතුලත් තක්සේරු දී වියදම්
 DocType: Hub Settings,Seller City,විකුණන්නා සිටි
 ,Absent Student Report,නැති කල ශිෂ්ය වාර්තාව
 DocType: Email Digest,Next email will be sent on:,ඊළඟ ඊ-තැපැල් යවා වනු ඇත:
 DocType: Offer Letter Term,Offer Letter Term,ලිපිය කාලීන ඉදිරිපත්
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,අයිතමය ප්රභේද ඇත.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,අයිතමය ප්රභේද ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,අයිතමය {0} සොයාගත නොහැකි
 DocType: Bin,Stock Value,කොටස් අගය
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,සමාගම {0} නොපවතියි
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,රුක් වර්ගය
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,රුක් වර්ගය
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ඒකකය එක් පරිභෝජනය යවන ලද
 DocType: Serial No,Warranty Expiry Date,"වගකීම්, කල් ඉකුත්වන දිනය,"
 DocType: Material Request Item,Quantity and Warehouse,ප්රමාණය හා ගබඩා
 DocType: Sales Invoice,Commission Rate (%),කොමිසම අනුපාතිකය (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,කරුණාකර වැඩසටහන තෝරා
 DocType: Project,Estimated Cost,තක්සේරු කළ පිරිවැය
@@ -766,7 +768,7 @@
 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,පෙරනිමි ගිණුම
 DocType: Payment Entry,Received Amount (Company Currency),ලැබී ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"අවස්ථා පෙරමුණ සිදු කෙරේ නම්, ඊයම් තබා ගත යුතුය"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,කරුණාකර සතිපතා ලකුණු දින තෝරා
 DocType: Production Order Operation,Planned End Time,සැලසුම්ගත අවසන් වන වේලාව
 ,Sales Person Target Variance Item Group-Wise,විකුණුම් පුද්ගලයා ඉලක්ක විචලතාව අයිතමය සමූහ ප්රාඥ
@@ -782,6 +784,7 @@
 DocType: Opportunity,Opportunity From,සිට අවස්ථාව
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,මාසික වැටුප ප්රකාශයක්.
 DocType: BOM,Website Specifications,වෙබ් අඩවිය පිරිවිතර
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: {0} වර්ගයේ {1} සිට
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ෙරෝ {0}: පරිවර්තන සාධකය අනිවාර්ය වේ
@@ -816,6 +819,7 @@
 DocType: Employee,Bank A/C No.,බැංකු A / C අංක
 DocType: Bank Guarantee,Project,ව්යාපෘති
 DocType: Quality Inspection Reading,Reading 7,7 කියවීම
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,අර්ධ වශයෙන් අනුපිළිවලින්
 DocType: Expense Claim Detail,Expense Claim Type,වියදම් හිමිකම් වර්ගය
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,සාප්පු සවාරි කරත්ත සඳහා පෙරනිමි සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ජර්නල් සටහන් {0} හරහා ඒම වත්කම්
@@ -823,14 +827,14 @@
 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 +107,Office Maintenance Expenses,කාර්යාලය නඩත්තු වියදම්
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ඊ-තැපැල් ගිණුම සකස් කිරීම
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,පළමු අයිතමය ඇතුලත් කරන්න
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,පළමු අයිතමය ඇතුලත් කරන්න
 DocType: Account,Liability,වගකීම්
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,අනුමැතිය ලත් මුදල ෙරෝ {0} තුළ හිමිකම් ප්රමාණය ට වඩා වැඩි විය නොහැක.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,මිල ලැයිස්තුව තෝරා ගෙන නොමැති
 DocType: Employee,Family Background,පවුල් පසුබිම
 DocType: Request for Quotation Supplier,Send Email,යවන්න විද්යුත්
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},අවවාදයයි: වලංගු නොවන ඇමුණුම් {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,කිසිදු අවසරය
 DocType: Company,Default Bank Account,පෙරනිමි බැංකු ගිණුම්
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","පක්ෂය මත පදනම් පෙරහන් කිරීමට ප්රථම, පක්ෂය වර්ගය තෝරා"
@@ -843,8 +847,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,සොයා ගත් සේවකයෙකු කිසිදු
 DocType: Supplier Quotation,Stopped,නතර
 DocType: Item,If subcontracted to a vendor,එය ඔබම කිරීමට උප කොන්ත්රාත්තු නම්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,ශිෂ්ය කණ්ඩායම් මේ වන විටත් යාවත්කාලීන කෙරේ.
 DocType: SMS Center,All Customer Contact,සියලු පාරිභෝගික ඇමතුම්
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV හරහා කොටස් ඉතිරි උඩුගත කරන්න.
 DocType: Warehouse,Tree Details,රුක් විස්තර
@@ -855,8 +859,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,අවම ඉන්වොයිසි මුදල
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: පිරිවැය මධ්යස්ථානය {2} සමාගම {3} අයත් නොවේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ගිණුම් {2} සහිත සමූහය විය නොහැකි
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,අයිතමය ෙරෝ {idx}: {doctype} {docname} ඉහත &#39;{doctype}&#39; වගුවේ නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} වන විට අවසන් කර හෝ අවලංගු වේ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,කිසිදු කාර්යයන්
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","මෝටර් රථ ඉන්වොයිස් 05, 28 ආදී උදා ජනනය කරන මාසික දවස"
 DocType: Asset,Opening Accumulated Depreciation,සමුච්චිත ක්ෂය විවෘත
@@ -872,7 +876,7 @@
 DocType: Bin,Moving Average Rate,වෙනස්වන සාමාන්යය අනුපාතිකය
 DocType: Production Planning Tool,Select Items,අයිතම තෝරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} පනත් කෙටුම්පත {1} එරෙහිව දිනැති {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,පාඨමාලා කාලසටහන
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,පාඨමාලා කාලසටහන
 DocType: Maintenance Visit,Completion Status,අවසන් වූ තත්ත්වය
 DocType: HR Settings,Enter retirement age in years,වසර විශ්රාම ගන්නා වයස අවුරුදු ඇතුලත් කරන්න
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ඉලක්ක ගබඩාව
@@ -880,7 +884,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,මෙම සියයට දක්වා බෙදා හැරීමේ හෝ රිසිට් කට ඉඩ දෙන්න
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,ආනයන පැමිණීම
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,සියලු විෂයාංක කණ්ඩායම්
 DocType: Process Payroll,Activity Log,ක්රියාකාරකම් ලොග්
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,ශුද්ධ ලාභය / අඞු කිරීමට
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,ස්වයංක්රීයව ගනුදෙනු ඉදිරිපත් කරන පණිවිඩය රචනා.
@@ -891,7 +895,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ගෙවීම සාමය මිලදී
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ප්රක්ෂේපිත යවන ලද
 DocType: Sales Invoice,Payment Due Date,ගෙවීම් නියමිත දිනය
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,අයිතමය ප්රභේද්යයක් {0} දැනටමත් එම ලක්ෂණ සහිත පවතී
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;විවෘත&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,විවෘත එක්කෙනාගේ
 DocType: Notification Control,Delivery Note Message,සැපයුම් සටහන පණිවුඩය
@@ -907,7 +911,7 @@
 DocType: Item Reorder,Re-Order Qty,නැවත සාමය යවන ලද
 DocType: Leave Block List Date,Leave Block List Date,වාරණ ලැයිස්තුව දිනය නිවාඩු
 DocType: Pricing Rule,Price or Discount,මිල හෝ වට්ටම්
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,මිලදී ගැනීම රිසිට්පත අයිතම වගුවේ මුළු අදාළ ගාස්තු මුළු බදු හා ගාස්තු ලෙස එම විය යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,මිලදී ගැනීම රිසිට්පත අයිතම වගුවේ මුළු අදාළ ගාස්තු මුළු බදු හා ගාස්තු ලෙස එම විය යුතුය
 DocType: Sales Team,Incentives,සහන
 DocType: SMS Log,Requested Numbers,ඉල්ලන ගණන්
 DocType: Production Planning Tool,Only Obtain Raw Materials,", අමු ද්රව්ය පමණක් ලබා"
@@ -936,13 +940,13 @@
 DocType: Supplier Quotation,Is Subcontracted,උප කොන්ත්රාත්තුවක් ඇත
 DocType: Item Attribute,Item Attribute Values,අයිතමය Attribute වටිනාකම්
 DocType: Examination Result,Examination Result,විභාග ප්රතිඵල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,මිලදී ගැනීම කුවිතාන්සිය
 ,Received Items To Be Billed,ලැබී අයිතම බිල්පතක්
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ඉදිරිපත් වැටුප් ශ්රී ලංකා අන්තර් බැංකු ගෙවීම් පද්ධතිය
 DocType: Employee,Ms,මෙනෙවිය
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,මුදල් හුවමාරු අනුපාතය ස්වාමියා.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},විමර්ශන Doctype {0} එකක් විය යුතුය
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},විමර්ශන Doctype {0} එකක් විය යුතුය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},මෙහෙයුම {1} සඳහා ඉදිරි {0} දින තුළ කාල Slot සොයා ගැනීමට නොහැකි
 DocType: Production Order,Plan material for sub-assemblies,උප-එකලස්කිරීම් සඳහා සැලසුම් ද්රව්ය
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,විකුණුම් හවුල්කරුවන් සහ ප්රාට්රද්ීයය
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,එහි ගිණුමේ කොටස් ඉතිරි දැනටමත් ලෙස ස්වයංක්රීයව ගිණුම් තැනීම සිදු කල නොහැකිව ඇත. ඔබ මෙම ගබඩා මත ප්රවේශය කළ හැකි පෙර ඔබ ගැලපෙන ගිණුමක් නිර්මාණය කර ගත යුතුය
@@ -965,10 +969,9 @@
 DocType: Supplier,Default Payable Accounts,පෙරනිමි ගෙවිය යුතු ගිණුම්
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,සේවක {0} සක්රීය නොවන නැත්නම් ස්ථානීකව නොපවතියි
 DocType: Fee Structure,Components,සංරචක
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,අයිතමය ප්රභේද {0} යාවත්කාලීන
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},විෂය {0} තුළ වත්කම් ප්රවර්ගය ඇතුලත් කරන්න
 DocType: Quality Inspection Reading,Reading 6,කියවීම 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,{0} නොහැකි {1} {2} සෘණාත්මක කැපී පෙනෙන ඉන්වොයිස් තොරව
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,මිලදී ගැනීම ඉන්වොයිසිය අත්තිකාරම්
 DocType: Hub Settings,Sync Now,දැන් සමමුහුර්ත කරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ෙරෝ {0}: ක්රෙඩිට් විසයක් {1} සමග සම්බන්ධ විය නොහැකි
@@ -982,11 +985,11 @@
 DocType: Item,Is Purchase Item,මිලදී ගැනීම අයිතමය වේ
 DocType: Asset,Purchase Invoice,මිලදී ගැනීම ඉන්වොයිසිය
 DocType: Stock Ledger Entry,Voucher Detail No,වවුචරය විස්තර නොමැත
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,නව විකුණුම් ඉන්වොයිසිය
 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,දිනය හා අවසාන දිනය විවෘත එම මුදල් වර්ෂය තුළ විය යුතු
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,දිනය හා අවසාන දිනය විවෘත එම මුදල් වර්ෂය තුළ විය යුතු
 DocType: Lead,Request for Information,තොරතුරු සඳහා වන ඉල්ලීම
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,සමමුහුර්ත කරන්න Offline දින ඉන්වොයිසි
 DocType: Payment Request,Paid,ගෙවුම්
 DocType: Program Fee,Program Fee,වැඩසටහන ගාස්තු
 DocType: Salary Slip,Total in words,වචන මුළු
@@ -996,7 +999,7 @@
 DocType: Employee Loan,Sanctioned,අනුමත
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; වගුව වෙත පිටපත් කිරීමට නියමිතය."
 DocType: Job Opening,Publish on website,වෙබ් අඩවිය ප්රකාශයට පත් කරනු ලබයි
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,පාරිභෝගිකයන්ට භාණ්ඩ නිකුත් කිරීම්.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,"සැපයුම්කරු ගෙවීම් දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය නොහැකි"
@@ -1007,7 +1010,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,විචලතාව
 ,Company Name,සමාගම් නාමය
 DocType: SMS Center,Total Message(s),මුළු පණිවුඩය (ව)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,හුවමාරුව සඳහා විෂය තෝරා
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,චෙක්පත තැන්පත් කර එහිදී බැංකුවේ ගිණුමක් හිස තෝරන්න.
@@ -1018,8 +1021,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ෙරෝ {0}: විකුණුම් / මිලදී ගැනීමේ නියෝගයක් සෑම විටම අත්තිකාරම් වශයෙන් සටහන් කළ යුතුය එරෙහිව ගෙවීම්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,රසායනික
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,මෙම ප්රකාරයේදී තෝරාගත් විට ප්රකෘති බැංකුව / මුදල් ගිණුම ස්වංක්රීයව වැටුප ජර්නල් සටහන් දී යාවත්කාලීන වේ.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","ශ්රේණියේ සංග්රහයේ {0} සඳහා කාල අන්තරයන් අනෙකුත් ශ්රේණි සඳහා ශ්රේණියේ පරාසය සමඟ ගැටේ,. කාල අන්තරයන් {0} සහ {1} පරීක්ෂා කර නැවත උත්සාහ කරන්න"
 DocType: BOM,Raw Material Cost(Company Currency),අමු ද්රව්ය වියදම (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,සියලු අයිතම දැනටමත් මෙම නිෂ්පාදන නියෝග සඳහා ස්ථාන මාරුවීම් ලබාදී තිබේ.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},පේළියේ # {0}: අනුපාත {1} {2} භාවිතා අනුපාතය ට වඩා වැඩි විය නොහැක
@@ -1032,14 +1033,14 @@
 DocType: BOM Website Item,BOM Website Item,ද්රව්ය ලේඛණය වෙබ් අඩවිය අයිතමය
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,ඔබේ ලිපිය හිස සහ ලාංඡනය උඩුගත කරන්න. (ඔබ ඔවුන්ට පසුව සංස්කරණය කළ හැකි).
 DocType: Timesheet Detail,Bill,පනත් කෙටුම්පත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ඊළඟ ක්ෂය දිනය පසුගිය දිනය ලෙස ඇතුලත් කර
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,සුදු
 DocType: SMS Center,All Lead (Open),සියලු ඊයම් (විවෘත)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ෙරෝ {0}: පිවිසුම් කාලය පළකිරීම ගුදම් තුළ යවන ලද {4} සඳහා ලබා ගත හැකි {1} ({2} {3}) නොවේ
 DocType: Purchase Invoice,Get Advances Paid,අත්තිකාරම් ගෙවීම්
 DocType: Item,Automatically Create New Batch,නව කණ්ඩායම ස්වයංක්රීයව නිර්මාණය
 DocType: Item,Automatically Create New Batch,නව කණ්ඩායම ස්වයංක්රීයව නිර්මාණය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,කරන්න
 DocType: Student Admission,Admission Start Date,ඇතුල් වීමේ ආරම්භය දිනය
 DocType: Journal Entry,Total Amount in Words,වචන මුළු මුදල
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"දෝශයක් ඇති විය. එක් අනුමාන හේතුව ඔබ එම ආකෘති පත්රය සුරක්ෂිත නොවන බව විය හැක. ගැටලුව පවතී නම්, support@erpnext.com අමතන්න."
@@ -1047,7 +1048,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,විවෘත යවන ලද
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,වෙනස් මුදල සඳහා ගිණුම් ඇතුලත් කරන්න
 DocType: Student Batch Name,Student Batch Name,ශිෂ්ය කණ්ඩායම නම
 DocType: Holiday List,Holiday List Name,නිවාඩු ලැයිස්තු නම
 DocType: Repayment Schedule,Balance Loan Amount,ඉතිරි ණය මුදල
@@ -1067,10 +1068,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},ඇති {0} කරුණාකර සඳහන් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,ප්රමාණය සහ වටිනාකම කිසිදු වෙනසක් සමග භාණ්ඩ ඉවත් කර ඇත.
 DocType: Delivery Note,Delivery To,වෙත බෙදා හැරීමේ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ගති ලක්ෂණය වගුව අනිවාර්ය වේ
 DocType: Production Planning Tool,Get Sales Orders,විකුණුම් නියෝග ලබා ගන්න
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} සෘණ විය නොහැකි
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,වට්ටමක්
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,වට්ටමක්
 DocType: Asset,Total Number of Depreciations,අගය පහත මුළු සංඛ්යාව
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
 DocType: Sales Invoice Item,Rate With Margin,ආන්තිකය සමග අනුපාතය
@@ -1086,7 +1087,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,විකුණුම් න්යාය / නිමි භාණ්ඩ ගබඩා තුළ ඇවිරිනි ගබඩාව
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,මුදල විකිණීම
 DocType: Repayment Schedule,Interest Amount,පොලී මුදල
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,ඔබ මෙම වාර්තාව සඳහා වියදම් Approver වේ. මෙම &#39;තත්ත්වය&#39; හා සුරකින්න යාවත්කාලීන කරන්න
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,ඔබ මෙම වාර්තාව සඳහා වියදම් Approver වේ. මෙම &#39;තත්ත්වය&#39; හා සුරකින්න යාවත්කාලීන කරන්න
 DocType: Serial No,Creation Document No,නිර්මාණය ලේඛන නොමැත
 DocType: Issue,Issue,නිකුත් කිරීම
 DocType: Asset,Scrapped,කටුගා දමා
@@ -1094,12 +1095,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","විෂය ප්රභේද සඳහා ගුණාංග. උදා: තරම, වර්ණ ආදිය"
 DocType: Purchase Invoice,Returns,ප්රතිලාභ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP ගබඩාව
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},අනු අංකය {0} {1} දක්වා නඩත්තු ගිවිසුම් යටතේ ය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},අනු අංකය {0} {1} දක්වා නඩත්තු ගිවිසුම් යටතේ ය
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,බඳවා ගැනීම
 DocType: Lead,Organization Name,සංවිධානයේ නම
 DocType: Tax Rule,Shipping State,නැව් රාජ්ය
 ,Projected Quantity as Source,මූලාශ්රය ලෙස ප්රක්ෂේපණය ප්රමාණ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,අයිතමය බොත්තම &#39;මිලදී ගැනීම ලැබීම් සිට අයිතම ලබා ගන්න&#39; භාවිතා එකතු කල යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,අයිතමය බොත්තම &#39;මිලදී ගැනීම ලැබීම් සිට අයිතම ලබා ගන්න&#39; භාවිතා එකතු කල යුතුය
 DocType: Employee,A-,ඒ-
 DocType: Production Planning Tool,Include non-stock items,නොවන කොටස් භාණ්ඩ ඇතුළත්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,විකුණුම් වියදම්
@@ -1107,12 +1108,12 @@
 DocType: GL Entry,Against,එරෙහි
 DocType: Item,Default Selling Cost Center,පෙරනිමි විකිණීම පිරිවැය මධ්යස්ථානය
 DocType: Sales Partner,Implementation Partner,ක්රියාත්මක කිරීම සහකරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,කලාප කේතය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,කලාප කේතය
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},විකුණුම් සාමය {0} වේ {1}
 DocType: Opportunity,Contact Info,සම්බන්ධ වීම
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,කොටස් අයැදුම්පත් කිරීම
 DocType: Packing Slip,Net Weight UOM,ශුද්ධ බර UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ප්රතිඵල
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ප්රතිඵල
 DocType: Item,Default Supplier,පෙරනිමි සැපයුම්කරු
 DocType: Manufacturing Settings,Over Production Allowance Percentage,නිෂ්පාදන වියදම් දීමනාව ප්රතිශතය කට අධික
 DocType: Employee Loan,Repayment Schedule,ණය ආපසු ගෙවීමේ කාලසටහන
@@ -1120,7 +1121,7 @@
 DocType: Holiday List,Get Weekly Off Dates,සතිපතා Off ලබා ගන්න දිනයන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,අවසන් දිනය ඇරඹුම් දිනය ඊට වඩා අඩු විය නොහැක
 DocType: Sales Person,Select company name first.,පළමු සමාගම නම තෝරන්න.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ආචාර්ය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ආචාර්ය
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,සැපයුම්කරුවන් ලැබෙන මිල ගණන්.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} වෙත | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,සාමාන්ය වයස අවුරුදු
@@ -1139,7 +1140,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,ප්රධාන කාර්ය සාධන ප්රදේශය
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,ප්රවාහන
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,වලංගු නොවන Attribute
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} ඉදිරිපත් කළ යුතුය
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ප්රමාණය අඩු හෝ {0} වෙත සමාන විය යුතුයි
 DocType: SMS Center,Total Characters,මුළු අක්ෂර
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},කරුණාකර විෂය සඳහා ද ෙව් ක්ෂේත්රයේ ද්රව්ය ලේඛණය තෝරා {0}
@@ -1150,7 +1151,7 @@
 DocType: Sales Partner,Distributor,බෙදාහැරීමේ
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,සාප්පු සවාරි කරත්ත නැව් පාලනය
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,නිෂ්පාදන න්යාය {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',&#39;යොමු කරන්න අතිරේක වට්ටම් මත&#39; සකස් කරන්න
 ,Ordered Items To Be Billed,නියෝග අයිතම බිල්පතක්
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,රංගේ සිට රංගේ කිරීම වඩා අඩු විය යුතුය
 DocType: Global Defaults,Global Defaults,ගෝලීය Defaults
@@ -1160,7 +1161,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ආරම්භක වර්ෂය
 DocType: Purchase Invoice,Start date of current invoice's period,ආරම්භ කරන්න වත්මන් ඉන්වොයිස් කාලයේ දිනය
 DocType: Salary Slip,Leave Without Pay,වැටුප් නැතිව තබන්න
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ධාරිතාව සැලසුම් දෝෂ
 ,Trial Balance for Party,පක්ෂය වෙනුවෙන් මාසික බැංකු සැසඳුම්
 DocType: Lead,Consultant,උපදේශක
 DocType: Salary Slip,Earnings,ඉපැයීම්
@@ -1175,7 +1176,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","මෙය ප්රභේද්යයක් යන විෂය සංග්රහයේ ඇත්තා වූ ද, ඇත. උදාහරණයක් ලෙස, ඔබේ වචන සහ &quot;එස් එම්&quot; වන අතර, අයිතමය කේතය &quot;T-shirt&quot; වේ නම්, ප්රභේද්යයක් ක අයිතමය කේතය &quot;T-shirt-එස්.එම්&quot; වනු"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,ඔබ වැටුප් පුරවා ඉතිරි වරක් (වචන) ශුද්ධ වැටුප් දෘශ්යමාන වනු ඇත.
 DocType: Purchase Invoice,Is Return,ප්රතිලාභ වේ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ආපසු / ඩෙබිට් සටහන
 DocType: Price List Country,Price List Country,මිල ලැයිස්තුව රට
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},විෂය {1} සඳහා {0} වලංගු අනුක්රමික අංක
@@ -1185,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,කණ්ඩායම අංකය ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
 DocType: Stock Settings,Default Item Group,පෙරනිමි අයිතමය සමූහ
 DocType: Employee Loan,Partially Disbursed,අර්ධ වශයෙන් මුදාහැරේ
-DocType: Grading Structure,Grading System Name,උප්පාදනය පද්ධතිය නම
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,සැපයුම්කරු දත්ත සමුදාය.
 DocType: Account,Balance Sheet,ශේෂ පත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',විෂය සංග්රහයේ සමග අයිතමය සඳහා පිරිවැය මධ්යස්ථානය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","ගෙවීම් ක්රමය වින්යාස කර නොමැත. ගිණුමක් ගෙවීම් වන ආකාරය මත හෝ POS නරඹන්න තබා තිබේද, කරුණාකර පරීක්ෂා කරන්න."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,ඔබේ විකිණුම් පුද්ගලයා පාරිභෝගික සම්බන්ධ කර ගැනීමට මෙම දිනට මතක් ලැබෙනු ඇත
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,එම අයිතමය වාර කිහිපයක් ඇතුළත් කළ නොහැක.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","කණ්ඩායම් යටතේ තව දුරටත් ගිණුම් කළ හැකි නමුත්, ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි"
@@ -1201,7 +1201,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,කොටස් ලේජර අයැදුම්පත් සහ ජී.එල් අයැදුම්පත් තෝරාගත් මිලදී ගැනීම ලැබීම් සඳහා reposted ඇත
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,කොටස් ලේජර අයැදුම්පත් සහ ජී.එල් අයැදුම්පත් තෝරාගත් මිලදී ගැනීම ලැබීම් සඳහා reposted ඇත
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,අයිතම අංක 1
 DocType: Holiday,Holiday,නිවාඩු
 DocType: Support Settings,Close Issue After Days,නිකුත් දින පසු සමීප
@@ -1228,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,කළ වැඩ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,මෙම දන්ත ධාතුන් වගුවේ අවම වශයෙන් එක් විශේෂණය සඳහන් කරන්න
 DocType: Announcement,All Students,සියලු ශිෂ්ය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} අයිතමය නොවන කොටස් අයිතමය විය යුතුය
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,දැක්ම ලේජර
 DocType: Grading Scale,Intervals,කාල අන්තරයන්
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ආදිතම
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ක අයිතමය සමූහ එකම නමින් පවතී, අයිතමය නම වෙනස් කිරීම හෝ අයිතමය පිරිසක් නැවත නම් කරුණාකර"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,ශිෂ්ය ජංගම අංක
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ලෝකයේ සෙසු
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,අයිතමය {0} කණ්ඩායම ලබා ගත නොහැකි
@@ -1272,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} සිට {1} වැටුප් ගෙවීම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ශීත කළ ගිණුම් {0} සංස්කරණය කිරීමට අවසර නැත
 DocType: Journal Entry,Get Outstanding Invoices,විශිෂ්ට ඉන්වොයිසි ලබා ගන්න
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,විකුණුම් සාමය {0} වලංගු නොවේ
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,මිලදී ගැනීමේ නියෝග ඔබ ඔබේ මිලදී ගැනීම සැලසුම් සහ පසුවිපරම් උදව්
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","සමාවන්න, සමාගම් ඒකාබද්ධ කළ නොහැකි"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",මුළු නිකුත් / ස්ථාන මාරු ප්රමාණය {0} ද්රව්ය ඉල්ලීම ගැන {1} \ ඉල්ලා ප්රමාණය {2} අයිතමය {3} සඳහා වඩා වැඩි විය නොහැකි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,කුඩා
@@ -1295,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,වක්ර වියදම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ෙරෝ {0}: යවන ලද අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,කෘෂිකර්ම
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,සමමුහුර්ත කරන්න මාස්ටර් දත්ත
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,ඔබගේ නිෂ්පාදන හෝ සේවා
 DocType: Mode of Payment,Mode of Payment,ගෙවීම් ක්රමය
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,වෙබ් අඩවිය රූප ප්රසිද්ධ ගොනුව හෝ වෙබ් අඩවි URL විය යුතුය
 DocType: Student Applicant,AP,පුද්ගල නාශක
 DocType: Purchase Invoice Item,BOM,ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"මෙය මූල අයිතමය පිරිසක් වන අතර, සංස්කරණය කළ නොහැක."
@@ -1316,18 +1316,18 @@
 DocType: Student Group Student,Group Roll Number,සමූහ Roll අංකය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} සඳහා පමණක් ණය ගිණුම් තවත් හර සටහන හා සම්බන්ධ කර ගත හැකි
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,සියලු කාර්ය බර මුළු 1. ඒ අනුව සියලු ව්යාපෘති කාර්යයන් ෙහොන්ඩර වෙනස් කළ යුතු කරුණාකර
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,සැපයුම් සටහන {0} ඉදිරිපත් කර නැත
 apps/erpnext/erpnext/stock/get_item_details.py +141,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; මත පදනම් වූ තෝරා ගනු ලැබේ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","මිල ගණන් පාලනය පළමු අයිතමය, විෂය සමූහය හෝ වෙළඳ නාමය විය හැකි ක්ෂේත්ර, &#39;මත යොමු කරන්න&#39; මත පදනම් වූ තෝරා ගනු ලැබේ."
 DocType: Hub Settings,Seller Website,විකුණන්නා වෙබ් අඩවිය
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,විකුණුම් කණ්ඩායමේ මුළු වෙන් ප්රතිශතය 100 විය යුතුයි
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},නිෂ්පාදන න්යාය තත්ත්වය {0} වේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},නිෂ්පාදන න්යාය තත්ත්වය {0} වේ
 DocType: Appraisal Goal,Goal,ඉලක්කය
 DocType: Sales Invoice Item,Edit Description,සංස්කරණය කරන්න විස්තරය
 ,Team Updates,කණ්ඩායම යාවත්කාලීන
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,සැපයුම්කරු සඳහා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,සැපයුම්කරු සඳහා
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ගිණුම් වර්ගය කිරීම ගනුදෙනු මෙම ගිණුම තෝරා උපකාරී වේ.
 DocType: Purchase Invoice,Grand Total (Company Currency),මුළු එකතුව (සමාගම ව්යවහාර මුදල්)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,මුද්රණය ආකෘතිය නිර්මාණය
@@ -1343,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ප්රගතිය භාණ්ඩ
 DocType: Workstation,Workstation Name,සේවා පරිගණකයක් නම
-DocType: Grade Interval,Grade Code,ශ්රේණියේ සංග්රහයේ
+DocType: Grading Scale Interval,Grade Code,ශ්රේණියේ සංග්රහයේ
 DocType: POS Item Group,POS Item Group,POS අයිතමය සමූහ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,විද්යුත් Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},ද්රව්ය ලේඛණය {0} අයිතමය අයිති නැත {1}
@@ -1360,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,දෘඩාංග
 DocType: Sales Order,Recurring Upto,තුරුත් නැවත නැවත
 DocType: Attendance,HR Manager,මානව සම්පත් කළමනාකාර
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,කරුණාකර සමාගම තෝරා
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,කරුණාකර සමාගම තෝරා
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,වරප්රසාද සහිත
 DocType: Purchase Invoice,Supplier Invoice Date,සැපයුම්කරු ගෙවීම් දිනය
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,ඔබ සාප්පු සවාරි කරත්ත සක්රිය කර ගැනීමට අවශ්ය
@@ -1376,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ආහාර
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,වයස්ගතවීම රංගේ 3
 DocType: Maintenance Schedule Item,No of Visits,සංචාර අංක
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,මාක් පැමිණීම්
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,මාක් පැමිණීම්
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1} එරෙහිව නඩත්තු උපෙල්ඛනෙය් {0} පවතී
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,ඇතුළත් ශිෂ්ය
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},සමාප්ති ගිණුම ව්යවහාර මුදල් විය යුතුය {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},සියලු අරමුණු සඳහා ලකුණු මුදල 100. විය යුතුය එය {0} වේ
@@ -1401,7 +1402,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,සාමාන්යය ඩේලි ඇමතුම්
 DocType: POS Profile,Campaign,ව්යාපාරය
 DocType: Supplier,Name and Type,නම සහ වර්ගය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',අනුමැතිය තත්ත්වය &#39;අනුමත&#39; කළ යුතුය හෝ &#39;ප්රතික්ෂේප&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',අනුමැතිය තත්ත්වය &#39;අනුමත&#39; කළ යුතුය හෝ &#39;ප්රතික්ෂේප&#39;
 DocType: Purchase Invoice,Contact Person,අදාළ පුද්ගලයා
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;අපේක්ෂිත ඇරඹුම් දිනය&#39; &#39;අපේක්ෂිත අවසානය දිනය&#39; ට වඩා වැඩි විය නොහැක
 DocType: Course Scheduling Tool,Course End Date,පාඨමාලා අවසානය දිනය
@@ -1424,14 +1425,15 @@
 DocType: Sales Invoice,Shipping Address Name,නැව් ලිපිනය නම
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ගිණුම් සටහන
 DocType: Material Request,Terms and Conditions Content,නියමයන් හා කොන්දේසි අන්තර්ගත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,අයිතමය {0} කොටස් අයිතමය නොවේ
 DocType: Maintenance Visit,Unscheduled,කලින් නොදන්වා
 DocType: Employee,Owned,අයත්
 DocType: Salary Detail,Depends on Leave Without Pay,වැටුප් නැතිව නිවාඩු මත රඳා පවතී
 DocType: Pricing Rule,"Higher the number, higher the priority",උසස් සංඛ්යාව ඉහළ ප්රමුඛත්වය
 ,Purchase Invoice Trends,මිලදී ගැනීම ඉන්වොයිසිය ප්රවණතා
 DocType: Employee,Better Prospects,වඩා හොඳ අපේක්ෂා
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","පේළියේ # {0}: මෙම කණ්ඩායම {1} පමණක් {2} යවන ලද ඇත. කරුණාකර {3} ලබා ගත යවන ලද ඇති තවත් කණ්ඩායම තෝරා ගැනීමට හෝ බහු කාණ්ඩ සිට / ප්රශ්නය ඉදිරිපත් කිරීමට, බහු පේළි බවට පේළිය බෙදී"
 DocType: Vehicle,License Plate,බලපත්ර පළඟ
 DocType: Appraisal,Goals,ඉලක්ක
 DocType: Warranty Claim,Warranty / AMC Status,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් තත්ත්වය
@@ -1449,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,සේවක තමා වෙත වාර්තා කළ නොහැක.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","ගිණුම කැටි නම්, ඇතුළත් කිරීම් සීමා පරිශීලකයන්ට ඉඩ දෙනු ලැබේ."
 DocType: Email Digest,Bank Balance,බැංකු ශේෂ
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{0} සඳහා මුල්ය සටහන්: {1} පමණක් මුදල් කළ හැකි: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","රැකියා පැතිකඩ, සුදුසුකම් අවශ්ය ආදිය"
 DocType: Journal Entry Account,Account Balance,ගිණුම් ශේෂය
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,ගනුදෙනු සඳහා බදු පාලනය.
@@ -1460,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,unclosed රාජ්ය මූල්ය වසරේ P &amp; L ශේෂයන් පෙන්වන්න
 DocType: Shipping Rule,Shipping Account,නැව් ගිණුම
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ගිණුම් {2} අක්රීය
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ඔබ ඔබේ වැඩ කටයුතු සැලසුම් උදව් සහ නිසි වේලාවට ලබාදීමට විකුණුම් නියෝග කරන්න
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ඔබ ඔබේ වැඩ කටයුතු සැලසුම් උදව් සහ නිසි වේලාවට ලබාදීමට විකුණුම් නියෝග කරන්න
 DocType: Quality Inspection,Readings,කියවීම්
 DocType: Stock Entry,Total Additional Costs,මුළු අතිරේක පිරිවැය
 DocType: Course Schedule,SH,එච්
@@ -1471,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,අගය කිරීමට
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ඇසුරුම් කුවිතාන්සියක්
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,කාර්යාලය කුලියට
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup කෙටි පණ්වුඩ සැකසුම්
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,ආනයන අසාර්ථක විය!
@@ -1493,11 +1495,11 @@
 DocType: Company,Services,සේවා
 DocType: HR Settings,Email Salary Slip to Employee,සේවකයෙකුට ලබා විද්යුත් වැටුප කුවිතාන්සියක්
 DocType: Cost Center,Parent Cost Center,මව් පිරිවැය මධ්යස්ථානය
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,හැකි සැපයුම්කරු තෝරා
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,හැකි සැපයුම්කරු තෝරා
 DocType: Sales Invoice,Source,මූලාශ්රය
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,පෙන්වන්න වසා
 DocType: Leave Type,Is Leave Without Pay,වැටුප් නැතිව නිවාඩු
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,වත්කම් ප්රවර්ගය ස්ථාවර වත්කම් භාණ්ඩයක් සඳහා අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,වාර්තා ගෙවීම් වගුව සොයාගැනීමට නොමැත
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},මෙම {0} {2} {3} සඳහා {1} සමග ගැටුම්
 DocType: Student Attendance Tool,Students HTML,සිසුන් සඳහා HTML
@@ -1515,7 +1517,7 @@
 DocType: Student,Date of Leaving,බැහැරවීම දිනය
 DocType: Pricing Rule,For Price List,මිල ලැයිස්තුව සඳහා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,විධායක පිරික්සුම්
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,ආදර්ශ නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,ආදර්ශ නිර්මාණය
 DocType: Maintenance Schedule,Schedules,කාලසටහන්
 DocType: Purchase Invoice Item,Net Amount,ශුද්ධ මුදල
 DocType: Purchase Order Item Supplied,BOM Detail No,ද්රව්ය ලේඛණය විස්තර නොමැත
@@ -1543,9 +1545,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,වැඩසටහන බදවා ගැනීම්
 DocType: Sales Invoice Item,Brand Name,වෙළඳ නාමය නම
 DocType: Purchase Receipt,Transporter Details,ප්රවාහනය විස්තර
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,පෙරනිමි ගබඩා සංකීර්ණය තෝරාගත් අයිතමය සඳහා අවශ්ය වේ
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,කොටුව
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,හැකි සැපයුම්කරු
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,හැකි සැපයුම්කරු
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,එම සංවිධානය
 DocType: Budget,Monthly Distribution,මාසික බෙදාහැරීම්
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,ලබන්නා ලැයිස්තුව හිස්ය. Receiver ලැයිස්තුව නිර්මාණය කරන්න
@@ -1553,8 +1555,8 @@
 DocType: Sales Partner,Sales Partner Target,විකුණුම් සහකරු ඉලක්ක
 DocType: Loan Type,Maximum Loan Amount,උපරිම ණය මුදල
 DocType: Pricing Rule,Pricing Rule,මිල ගණන් පාලනය
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},ශිෂ්ය {0} සඳහා රෝල් අංකය අනුපිටපත්
 DocType: Budget,Action if Annual Budget Exceeded,ක්රියාකාරී වාර්ෂික අයවැය ඉක්මවා නම්
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,සාමය ලබා දීමට ද්රව්ය ඉල්ලීම්
 DocType: Shopping Cart Settings,Payment Success URL,ගෙවීම් සාර්ථකත්වය URL එක
@@ -1575,9 +1577,9 @@
 DocType: Employee Loan,Repayment Method,ණය ආපසු ගෙවීමේ ක්රමය
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","පරීක්ෂා නම්, මුල් පිටුව වෙබ් අඩවිය සඳහා පෙරනිමි අයිතමය සමූහ වනු ඇත"
 DocType: Quality Inspection Reading,Reading 4,කියවීම 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} ව්යාපෘතිය {1} සඳහා සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} ව්යාපෘතිය {1} සඳහා සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,සමාගම වියදම් සඳහා හිමිකම්.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","සිසුන් පද්ධතියේ හදවත වන අතර, ඔබගේ සියලු සිසුන් එකතු"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","සිසුන් පද්ධතියේ හදවත වන අතර, ඔබගේ සියලු සිසුන් එකතු"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ෙරෝ # {0}: නිශ්කාෂණ දිනය {1} {2} චෙක්පත් දිනය පෙර විය නොහැකි
 DocType: Company,Default Holiday List,පෙරනිමි නිවාඩු ලැයිස්තුව
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ෙරෝ {0}: කාලය හා සිට දක්වා {1} ගතවන කාලය {2} සමග අතිච්ඡාදනය වේ
@@ -1589,21 +1591,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,ඔබ නිවාඩු සඳහා අයදුම් කරන්නේ කරන දින (ව) නිවාඩු දින වේ. ඔබ නිවාඩු සඳහා අයදුම් අවශ්ය නැහැ.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,නැවත භාරදුන් ගෙවීම් විද්යුත්
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,නව කාර්ය
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,උද්ධෘත කරන්න
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,උද්ධෘත කරන්න
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,වෙනත් වාර්තා
 DocType: Dependent Task,Dependent Task,රඳා කාර්ය සාධක
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},නු පෙරනිමි ඒකකය සඳහා පරිවර්තන සාධකය පේළිය 1 {0} විය යුතුය
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"වර්ගයේ අවසරය, {0} තවදුරටත් {1} වඩා කෙටි විය හැකි"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,කල්තියා X දින සඳහා මෙහෙයුම් සැලසුම් උත්සාහ කරන්න.
 DocType: HR Settings,Stop Birthday Reminders,උපන්දින මතක් නතර
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},සමාගම {0} හි පෙරනිමි වැටුප් ගෙවිය යුතු ගිණුම් සකස් කරන්න
 DocType: SMS Center,Receiver List,ලබන්නා ලැයිස්තුව
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,සොයන්න අයිතමය
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,සොයන්න අයිතමය
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,පරිභෝජනය ප්රමාණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,මුදල් ශුද්ධ වෙනස්
 DocType: Assessment Plan,Grading Scale,ශ්රේණිගත පරිමාණ
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,මේ වන විටත් අවසන්
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,නු {0} ඒකකය වරක් පරිවර්තන සාධකය වගුව වඩා ඇතුලත් කර ඇත
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,මේ වන විටත් අවසන්
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ගෙවීම් ඉල්ලීම් මේ වන විටත් {0} පවතී
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,නිකුත් කර ඇත්තේ අයිතම පිරිවැය
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},ප්රමාණ {0} වඩා වැඩි නොවිය යුතුය
@@ -1635,12 +1637,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ටහිර සටහන් කරන්න
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ෙරෝ {0}: සැපයුම්කරු එරෙහිව උසස් හර කළ යුතුය
 DocType: Company,Default Values,පෙරනිමි අගයන්
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{සංඛ්යාත} ඩයිජස්ට්
 DocType: Expense Claim,Total Amount Reimbursed,මුළු මුදල පතිපූරණය
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,මෙය මේ වාහන එරෙහිව ලඝු-සටහන් මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,එකතු
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},සැපයුම්කරු ඉන්වොයිසිය {0} එරෙහිව දිනැති {1}
 DocType: Customer,Default Price List,පෙරනිමි මිල ලැයිස්තුව
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,වත්කම් ව්යාපාරය වාර්තා {0} නිර්මාණය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,ඔබ මුදල් වර්ෂය {0} මකා දැමිය නොහැකි. මුදල් වර්ෂය {0} ගෝලීය සැකසුම් සුපුරුදු ලෙස සකසා ඇත
 DocType: Journal Entry,Entry Type,ප්රවේශය වර්ගය
 ,Customer Credit Balance,පාරිභෝගික ණය ශේෂ
@@ -1659,7 +1662,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,භාණ්ඩ කිසිවක් ප්රමාණය සහ වටිනාකම යම් වෙනසක් තිබෙනවා.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,අනිවාර්ය ක්ෂේත්රයේ - වැඩසටහන
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,අනිවාර්ය ක්ෂේත්රයේ - වැඩසටහන
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,වගකීම් ප්රකාශය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,වගකීම් ප්රකාශය
 ,Lead Details,ඊයම් විස්තර
 DocType: Salary Slip,Loan repayment,ණය ආපසු ගෙවීමේ
 DocType: Purchase Invoice,End date of current invoice's period,වත්මන් ඉන්වොයිස් ගේ කාලය අවසන් දිනය
@@ -1678,12 +1681,10 @@
 DocType: Employee,Permanent Address,ස්ථිර ලිපිනය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",{0} {1} මුළු එකතුව {2} වඩා වැඩි \ විය නොහැකි ගෙවා උසස්
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,කරුණාකර අයිතමය කේතය තෝරා
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,කරුණාකර අයිතමය කේතය තෝරා
 DocType: Student Sibling,Studying in Same Institute,එකම ආයතනය අධ්යාපනය ලැබීම
 DocType: Territory,Territory Manager,කළාපීය කළමනාකාර
 DocType: Packed Item,To Warehouse (Optional),ගබඩාව (විකල්ප) වෙත
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 DocType: Payment Entry,Paid Amount (Company Currency),ගෙවුම් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Invoice,Additional Discount,අතිරේක වට්ටම්
 DocType: Selling Settings,Selling Settings,සැකසුම් විකිණීම
@@ -1693,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,කරත්ත තුළ බලන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,අලෙවි වියදම්
 ,Item Shortage Report,අයිතමය හිඟය වාර්තාව
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","සිරුරේ බර සඳහන් වන්නේ, \ n කරුණාකර &quot;සිරුරේ බර UOM&quot; ගැන සඳහන් ද"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,මෙම කොටස් සටහන් කිරීමට භාවිතා කෙරෙන ද්රව්ය ඉල්ලීම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ඊළඟ ක්ෂය දිනය නව වත්කම් සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ඊළඟ ක්ෂය දිනය නව වත්කම් සඳහා අනිවාර්ය වේ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,සෑම කණ්ඩායම සඳහා පදනම් සමූහ වෙනම පාඨමාලාව
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,සෑම කණ්ඩායම සඳහා පදනම් සමූහ වෙනම පාඨමාලාව
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ක අයිතමය තනි ඒකකය.
@@ -1712,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: පිරිවැය මධ්යස්ථානය ලාභ සහ අලාභ ගිණුම {2} සඳහා අවශ්ය වේ. එම සමාගමේ පෙරනිමි වියදම මධ්යස්ථානයක් පිහිටුවා කරන්න.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ඒ කස්ටමර් සමූහයේ එකම නමින් පවතී පාරිභෝගික නම වෙනස් හෝ කස්ටමර් සමූහයේ නම වෙනස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1731,7 +1730,7 @@
 ,Item-wise Sales Register,අයිතමය ප්රඥාවන්ත විකුණුම් රෙජිස්ටර්
 DocType: Asset,Gross Purchase Amount,දළ මිලදී ගැනීම මුදල
 DocType: Asset,Depreciation Method,ක්ෂය ක්රමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,නොබැඳි
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,නොබැඳි
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,මූලික අනුපාත ඇතුළත් මෙම බදු ද?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,මුළු ඉලක්ක
 DocType: Program Course,Required,අවශ්ය
@@ -1741,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,ප්රතිසන්ධාන JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,බොහෝ තීරු. එම වාර්තාව අපනයනය සහ පැතුරුම්පත් උපයෝගයක් භාවිතා කරමින් එය මුද්රණය කරන්න.
 DocType: Purchase Invoice Item,Batch No,කණ්ඩායම කිසිදු
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},"{1} ප්රධාන දිනය සඳහා {2} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි"
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,හැකි පාරිභෝගික ගේ මිලදී ගැනීමේ නියෝගයක් එරෙහිව බහු විකුණුම් නියෝග ඉඩ දෙන්න
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 DocType: Student Group Instructor,Student Group Instructor,ශිෂ්ය කණ්ඩායම් උපදේශක
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 ජංගම නොමැත
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ප්රධාන
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ප්රභේද්යයක්
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ප්රධාන
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ප්රභේද්යයක්
 DocType: Naming Series,Set prefix for numbering series on your transactions,ඔබගේ ගනුදෙනු මාලාවක් සංඛ්යාවක් සඳහා උපසර්ගය සකසන්න
 DocType: Employee Attendance Tool,Employees HTML,සේවක HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,පෙරනිමි ද්රව්ය ලේඛණය ({0}) මෙම අයිතමය ශ්රේණිගත කරන්න හෝ එහි සැකිල්ල සඳහා ක්රියාකාරී විය යුතුය
 DocType: Employee,Leave Encashed?,Encashed ගියාද?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ක්ෂේත්රයේ සිට අවස්ථාව අනිවාර්ය වේ
 DocType: Email Digest,Annual Expenses,වාර්ෂික වියදම්
 DocType: Item,Variants,ප්රභේද
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,මිලදී ගැනීමේ නියෝගයක් කරන්න
 DocType: SMS Center,Send To,කිරීම යවන්න
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},නිවාඩු වර්ගය {0} සඳහා ප්රමාණවත් නිවාඩු ශේෂ එහි නොවන
 DocType: Payment Reconciliation Payment,Allocated amount,වෙන් කල මුදල
@@ -1763,7 +1761,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,සිදු වෙමින් පවතින වැඩ ගබඩාව පෙර ඉදිරිපත් අවශ්ය වේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,සිදු වෙමින් පවතින වැඩ ගබඩාව පෙර ඉදිරිපත් අවශ්ය වේ
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,රැකියාවක් සඳහා අයදුම්කරු.
 DocType: Purchase Order Item,Warehouse and Reference,ගබඩාවක් සහ විමර්ශන
 DocType: Supplier,Statutory info and other general information about your Supplier,ව්යවස්ථාපිත තොරතුරු හා ඔබගේ සැපයුම්කරු ගැන අනෙක් සාමාන්ය තොරතුරු
@@ -1771,11 +1769,10 @@
 DocType: Item,Serial Nos and Batches,අනුක්රමික අංක සහ කාණ්ඩ
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ශිෂ්ය කණ්ඩායම් ශක්තිය
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ශිෂ්ය කණ්ඩායම් ශක්තිය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ජර්නල් සටහන් {0} එරෙහිව කිසිදු අසමසම {1} ප්රවේශය නොමැති
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ජර්නල් සටහන් {0} එරෙහිව කිසිදු අසමසම {1} ප්රවේශය නොමැති
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ඇගයීම්
 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: Grading Structure,Grading Intervals,උප්පාදනය ප්රාන්තර
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,කරුණාකර ඇතුලත් කරන්න
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","{0} පේළියේ {1} {2} වඩා වැඩි අයිතමය සඳහා overbill නොහැක. කට-බිල් ඉඩ, කරුණාකර සැකසුම් මිලට ගැනීම පිහිටුවා"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,විෂය හෝ ගබඩා මත පදනම් පෙරහන සකස් කරන්න
@@ -1787,17 +1784,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,ද්රව්ය ලේඛණය {0} ඉදිරිපත් කළ යුතුය
 DocType: Authorization Control,Authorization Control,බලය පැවරීමේ පාලන
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ෙරෝ # {0}: ප්රතික්ෂේප ගබඩාව ප්රතික්ෂේප අයිතමය {1} එරෙහිව අනිවාර්ය වේ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ගෙවීම
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,ඔබේ ඇණවුම් කළමනාකරණය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ගෙවීම
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,ඔබේ ඇණවුම් කළමනාකරණය
 DocType: Production Order Operation,Actual Time and Cost,සැබෑ කාලය හා වියදම
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},උපරිම ද්රව්ය ඉල්ලීම් {0} විකුණුම් සාමය {2} එරෙහිව අයිතමය {1} සඳහා කළ හැකි
 DocType: Employee,Salutation,ආචාර
 DocType: Course,Course Abbreviation,පාඨමාලා කෙටි යෙදුම්
 DocType: Student Leave Application,Student Leave Application,ශිෂ්ය නිවාඩු ඉල්ලුම්
 DocType: Item,Will also apply for variants,ද ප්රභේද සඳහා අයදුම් කරනු ඇත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","එය {0} දැනටමත් ලෙස වත්කම්, අවලංගු කල නොහැක"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},{1} මත සේවක {0} අඩක් දින
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},මුළු කම්කරු පැය වැඩ කරන පැය {0} උපරිම වඩා වැඩි විය යුතු නැහැ
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,මත
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,පාවිච්චි කරන කාලය වන භාණ්ඩ ලැබුනු.
 DocType: Quotation Item,Actual Qty,සැබෑ යවන ලද
 DocType: Sales Invoice Item,References,ආශ්රිත
@@ -1807,7 +1805,7 @@
 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 +91,Associate,ආශ්රිත
 DocType: Asset Movement,Asset Movement,වත්කම් ව්යාපාරය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,නව කරත්ත
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,නව කරත්ත
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,අයිතමය {0} ක් serialized අයිතමය නොවේ
 DocType: SMS Center,Create Receiver List,Receiver ලැයිස්තුව නිර්මාණය
 DocType: Vehicle,Wheels,රෝද
@@ -1839,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,නිෂ්පාදන නියෝග එරෙහිව කාලය ලඝු-සටහන් හි නිර්මාණය අක්රීය කරයි. මෙහෙයුම් නිෂ්පාදන න්යාය එරෙහිව දම්වැල් මත ධාවනය වන නොලැබේ
 DocType: Student,Student Mobile Number,ශිෂ්ය ජංගම දුරකතන අංකය
 DocType: Item,Has Variants,ප්රභේද ඇත
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},ඔබ මේ වන විටත් {0} {1} සිට භාණ්ඩ තෝරාගෙන ඇති
 DocType: Monthly Distribution,Name of the Monthly Distribution,මාසික බෙදාහැරීම් නම
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,කණ්ඩායම හැඳුනුම්පත අනිවාර්ය වේ
 DocType: Sales Person,Parent Sales Person,මව් විකුණුම් පුද්ගලයෙක්
 DocType: Purchase Invoice,Recurring Invoice,පුනරාවර්තනය ඉන්වොයිසිය
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,කළමනාකාර ව්යාපෘති
@@ -1850,11 +1848,11 @@
 DocType: Budget,Fiscal Year,මුදල් වර්ෂය
 DocType: Vehicle Log,Fuel Price,ඉන්ධන මිල
 DocType: Budget,Budget,අයවැය
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,ස්ථාවර වත්කම් අයිතමය නොවන කොටස් අයිතමය විය යුතුය.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","එය ආදායම් හෝ වියදම් ගිණුම නෑ ලෙස අයවැය, {0} එරෙහිව පවරා ගත නොහැකි"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,අත්පත් කර
 DocType: Student Admission,Application Form Route,ඉල්ලූම්පත් ආකෘතිය මාර්ගය
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,භූමි ප්රදේශය / පාරිභෝගික
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,භූමි ප්රදේශය / පාරිභෝගික
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,උදා: 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"අවසරය, වර්ගය {0} එය වැටුප් නැතිව යන්න නිසා වෙන් කළ නොහැකි"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ෙරෝ {0}: වෙන් කළ මුදල {1} වඩා අඩු හෝ හිඟ මුදල {2} පියවිය හා සමාන විය යුතුය
@@ -1874,14 +1872,14 @@
 ,Serial No Status,අනු අංකය තත්ත්වය
 DocType: Payment Entry Reference,Outstanding,විශිෂ්ට
 ,Daily Timesheet Summary,ඩේලි Timesheet සාරාංශය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",ෙරෝ {0}: {1} ආවර්තයක් සකස් කිරීම දිනය \ හා ත් අතර වෙනස වඩා වැඩි හෝ {2} සමාන විය යුතුයි
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,මෙම කොටස් ව්යාපාරය මත පදනම් වේ. බලන්න {0} විස්තර සඳහා
 DocType: Pricing Rule,Selling,විකිණීම
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},මුදල {0} {1} {2} එරෙහිව අඩු
 DocType: Employee,Salary Information,වැටුප් තොරතුරු
 DocType: Sales Person,Name and Employee ID,නම සහ සේවක හැඳුනුම්පත
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"නියමිත දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල පෙර විය නොහැකි"
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,තීරු බදු හා බදු
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,විමර්ශන දිනය ඇතුලත් කරන්න
@@ -1893,14 +1891,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,මෙම ගාස්තු වර්ගය සඳහා විශාල හෝ වත්මන් පේළිය සංඛ්යාවට සමාන පේළිය අංකය යොමු නො හැකි
 DocType: Asset,Sold,අලෙවි
 ,Item-wise Purchase History,අයිතමය ප්රඥාවන්ත මිලදී ගැනීම ඉතිහාසය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},අනු අංකය බැරිතැන &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න අයිතමය {0} වෙනුවෙන් එකතු
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},අනු අංකය බැරිතැන &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න අයිතමය {0} වෙනුවෙන් එකතු
 DocType: Account,Frozen,ශීත කළ
 ,Open Production Orders,විවෘත නිෂ්පාදන නියෝග
 DocType: Sales Invoice Payment,Base Amount (Company Currency),මූලික මුදල (සමාගම ව්යවහාර මුදල්)
 DocType: Payment Reconciliation Payment,Reference Row,විමර්ශන ෙරෝ
 DocType: Installation Note,Installation Time,ස්ථාපන කාල
 DocType: Sales Invoice,Accounting Details,මුල්ය විස්තර
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,මෙම සමාගම වෙනුවෙන් සියලු ගනුදෙනු Delete
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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,ෙරෝ # {0}: මෙහෙයුම {1} {2} නිෂ්පාදන න්යාය # {3} තුළ නිමි භාණ්ඩ යවන ලද සඳහා අවසන් නැත. වේලාව ලඝු-සටහන් හරහා ක්රියාත්මක තත්වය යාවත් කාලීන කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ආයෝජන
 DocType: Issue,Resolution Details,යෝජනාව විස්තර
@@ -1933,14 +1931,14 @@
 DocType: Discussion,Discussion,සාකච්ඡා
 DocType: Payment Entry,Transaction ID,ගනුදෙනු හැඳුනුම්පත
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ප්රමාණය මත පදනම් මිල ගණන් රීති තවදුරටත් පෙරනු ලබයි.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},සේවක {0} සඳහා එක්වීමට දිනය සකස් කරන්න
 DocType: Task,Total Billing Amount (via Time Sheet),(කාල පත්රය හරහා) මුළු බිල්පත් ප්රමාණය
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,නැවත පාරිභෝගික ආදායම්
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) භූමිකාව &#39;වියදම් Approver&#39; තිබිය යුතුය
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) භූමිකාව &#39;වියදම් Approver&#39; තිබිය යුතුය
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pair
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,නිෂ්පාදන සඳහා ද ෙව් හා යවන ලද තෝරන්න
 DocType: Asset,Depreciation Schedule,ක්ෂය උපෙල්ඛනෙය්
 DocType: Bank Reconciliation Detail,Against Account,ගිණුම එරෙහිව
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,අර්ධ දින දිනය දිනය සිට මේ දක්වා අතර විය යුතුය
@@ -1954,16 +1952,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},සමාගම {0} තුළ &#39;වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය පිහිටුවා කරුණාකර
 ,Maintenance Schedules,නඩත්තු කාලසටහන
 DocType: Task,Actual End Date (via Time Sheet),(කාල පත්රය හරහා) සැබෑ අවසානය දිනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},මුදල {0} {1} {2} {3} එරෙහිව
 ,Quotation Trends,උද්ධෘත ප්රවණතා
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},අයිතමය {0} සඳහා අයිතමය ස්වාමියා සඳහන් කර නැත අයිතමය සමූහ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ගිණුමක් සඳහා ඩෙබිට් වූ ලැබිය යුතු ගිණුම් විය යුතුය
 DocType: Shipping Rule Condition,Shipping Amount,නැව් ප්රමාණය
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,විභාග මුදල
 DocType: Purchase Invoice Item,Conversion Factor,පරිවර්තන සාධකය
 DocType: Purchase Order,Delivered,පාවා
 ,Vehicle Expenses,වාහන වියදම්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
+DocType: Serial No,Invoice Details,ඉන්වොයිසිය විස්තර
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ප්රයෝජනවත් ආයු පසු අපේක්ෂිත අගයට වඩා විශාල හෝ {0} වෙත සමාන විය යුතුයි
 DocType: Purchase Receipt,Vehicle Number,වාහන අංක
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,පුනරාවර්තනය ඉන්වොයිස් මත නැවතුම් වනු ඇත දිනය
 DocType: Employee Loan,Loan Amount,ණය මුදල
@@ -1982,12 +1981,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,මානව සම්පත් සැකසුම්
 DocType: Salary Slip,net pay info,ශුද්ධ වැටුප් තොරතුරු
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,වියදම් හිමිකම් අනුමැතිය විභාග වෙමින් පවතී. මෙම වියදම් Approver පමණක් තත්ත්වය යාවත්කාලීන කළ හැකිය.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,වියදම් හිමිකම් අනුමැතිය විභාග වෙමින් පවතී. මෙම වියදම් Approver පමණක් තත්ත්වය යාවත්කාලීන කළ හැකිය.
 DocType: Email Digest,New Expenses,නව වියදම්
 DocType: Purchase Invoice,Additional Discount Amount,අතිරේක වට්ටම් මුදල
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ෙරෝ # {0}: යවන ලද 1, අයිතමය ස්ථාවර වත්කම්වල පරිදි විය යුතුය. බහු යවන ලද සඳහා වෙනම පේළි භාවිතා කරන්න."
 DocType: Leave Block List Allow,Leave Block List Allow,වාරණ ලැයිස්තුව තබන්න ඉඩ දෙන්න
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr හිස් හෝ ඉඩක් බව අප වටහා ගත නො හැකි
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,නොවන සමූහ සමූහ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,ක්රීඩා
 DocType: Loan Type,Loan Name,ණය නම
@@ -1998,6 +1997,7 @@
 ,Customer Acquisition and Loyalty,පාරිභෝගික අත්කරගැනීම සහ සහෘද
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,ඔබ ප්රතික්ෂේප භාණ්ඩ තොගය පවත්වා කොහෙද පොත් ගබඩාව
 DocType: Production Order,Skip Material Transfer,ද්රව්ය හුවමාරු සිංහල
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"ප්රධාන දිනය {2} සඳහා {1} කර ගැනීම සඳහා, {0} සඳහා විනිමය අනුපාතය සොයා ගැනීමට නොහැකි විය. මුදල් හුවමාරු වාර්තා අතින් නිර්මාණය කරන්න"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ඔබේ මූල්ය වසර අවසන්
 DocType: POS Profile,Price List,මිල දර්ශකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} දැන් ප්රකෘති මුදල් වර්ෂය වේ. බලපැවැත් වීමට වෙනසක් සඳහා ඔබේ බ්රවුසරය නැවුම් කරන්න.
@@ -2014,19 +2014,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},ගිණුම {0} වලංගු නැත. ගිණුම ව්යවහාර මුදල් විය යුතුය {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM පරිවර්තනය සාධකය පේළිය {0} අවශ්ය කරන්නේ
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය විකුණුම් සාමය, විකුණුම් ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Salary Component,Deduction,අඩු කිරීම්
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ෙරෝ {0}: කාලය හා කලට අනිවාර්ය වේ.
 DocType: Stock Reconciliation Item,Amount Difference,මුදල වෙනස
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},අයිතමය මිල මිල ලැයිස්තුව {1} තුළ {0} වෙනුවෙන් එකතු
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,මෙම අලෙවි පුද්ගලයා සේවක අංකය ඇතුල් කරන්න
 DocType: Territory,Classification of Customers by region,කලාපය අනුව ගනුදෙනුකරුවන් වර්ගීකරණය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,වෙනස ප්රමාණය ශුන්ය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,වෙනස ප්රමාණය ශුන්ය විය යුතුය
 DocType: Project,Gross Margin,දළ ආන්තිකය
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,නිෂ්පාදන අයිතමය පළමු ඇතුලත් කරන්න
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ගණනය බැංකු ප්රකාශය ඉතිරි
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ආබාධිත පරිශීලක
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,උද්ධෘත
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,මුළු අඩු
 ,Production Analytics,නිෂ්පාදනය විශ්ලේෂණ
@@ -2035,9 +2035,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},අවවාදයයි: ඇමුණුමක් {0} මත වලංගු නොවන SSL සහතිකය
 DocType: Student Admission,Eligibility,සුදුසුකම්
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","ආදර්ශ ඔබේ නායකත්වය ලෙස ඔබගේ සියලු සම්බන්ධතා සහ තවත් එකතු කරන්න, ඔබ ව්යාපාරය ලබා ගැනීමට උදව්"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","ආදර්ශ ඔබේ නායකත්වය ලෙස ඔබගේ සියලු සම්බන්ධතා සහ තවත් එකතු කරන්න, ඔබ ව්යාපාරය ලබා ගැනීමට උදව්"
 DocType: Production Order Operation,Actual Operation Time,සැබෑ මෙහෙයුම කාල
 DocType: Authorization Rule,Applicable To (User),(පරිශීලක) අදාළ
 DocType: Purchase Taxes and Charges,Deduct,අඩු
@@ -2052,7 +2052,7 @@
 DocType: Guardian,Work Address,වැඩ ලිපිනය
 DocType: Appraisal,Calculate Total Score,මුළු ලකුණු ගණනය
 DocType: Request for Quotation,Manufacturing Manager,නිෂ්පාදන කළමනාකරු
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},අනු අංකය {0} {1} දක්වා වගකීමක් යටතේ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},අනු අංකය {0} {1} දක්වා වගකීමක් යටතේ
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ඇසුරුම් සැපයුම් සටහන බෙදී ගියේ ය.
 apps/erpnext/erpnext/hooks.py +87,Shipments,භාණ්ඩ නිකුත් කිරීම්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ගිණුම් ශේෂය ({0}) {1} සඳහා සහ කොටස් අගය ({2}) ගබඩා සඳහා {3} සමාන විය යුතුය
@@ -2074,10 +2074,10 @@
 DocType: Leave Application,Total Leave Days,මුළු නිවාඩු දින
 DocType: Email Digest,Note: Email will not be sent to disabled users,සටහන: විද්යුත් තැපෑල ආබාධිත පරිශීලකයන් වෙත යවනු නොලැබේ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,අන්තර් ක්රියාකාරිත්වය සංඛ්යාව
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,සමාගම තෝරන්න ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,සමාගම තෝරන්න ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,සියළුම දෙපාර්තමේන්තු සඳහා සලකා නම් හිස්ව තබන්න
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","රැකියා ආකාර (ස්ථිර, කොන්ත්රාත්, සීමාවාසික ආදිය)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} අයිතමය {1} සඳහා අනිවාර්ය වේ
 DocType: Process Payroll,Fortnightly,දෙසතියකට වරක්
 DocType: Currency Exchange,From Currency,ව්යවහාර මුදල් වලින්
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",කරුණාකර බෙ එක් පේළිය වෙන් කළ මුදල ඉන්වොයිසිය වර්ගය හා ඉන්වොයිසිය අංකය තෝරා
@@ -2086,14 +2086,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),අනුපාතිකය (සමාගම ව්යවහාර මුදල්)
 DocType: Student Guardian,Others,අන් අය
 DocType: Payment Entry,Unallocated Amount,වෙළුමේ ප්රමාණය
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ගැලපෙන විෂය සොයා ගැනීමට නොහැක. කරුණාකර {0} සඳහා තවත් අගය තෝරන්න.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,තවත් යාවත්කාලීන
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,පළමු පේළි සඳහා &#39;පෙර ෙරෝ මුදල මත&#39; හෝ &#39;පෙර ෙරෝ මුළු දා&#39; ලෙස භාර වර්ගය තෝරන්න බැහැ
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,ළමා අයිතමය නිෂ්පාදනයක් පැකේජය විය යුතු නොවේ. අයිතමය ඉවත් කරන්න &#39;{0}&#39; හා බේරා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,බැංකු
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets එකතු
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets එකතු
 DocType: Vehicle Service,Service Item,සේවා විෂය
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
 DocType: Bank Guarantee,Bank Guarantee,බැංකු ඇපකරයක්
@@ -2119,6 +2119,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},ෙරෝ # {0}: වත්කම් {1} දැනටමත් {2}
 DocType: Quotation Item,Stock Balance,කොටස් වෙළඳ ශේෂ
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ගෙවීම විකුණුම් න්යාය
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,සැකසුම&gt; සැකසීම්&gt; කිරීම අනුප්රාප්තිකයා නම් කිරීම ශ්රේණි හරහා {0} සඳහා ශ්රේණි කිරීම අනුප්රාප්තිකයා නම් කිරීම සකස් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,විධායක නිලධාරී
 DocType: Expense Claim Detail,Expense Claim Detail,වියදම් හිමිකම් විස්තර
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,කරුණාකර නිවැරදි ගිණුම තෝරා
@@ -2143,14 +2144,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,මිල ලැයිස්තුව සකස් වී නොමැති නම් මිල ගණන් පෙන්වා ඇත කළ නොහැකි වනු ඇත
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"මෙම නැව්, නීතියේ ආධිපත්යය සඳහා වන රට සඳහන් හෝ ලෝක ව්යාප්ත නැව් කරුණාකර පරීක්ෂා කරන්න"
 DocType: Stock Entry,Total Incoming Value,මුළු එන අගය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ඩෙබිට් කිරීම අවශ්ය වේ
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ඔබගේ කණ්ඩායම විසින් සිදු කළ කටයුතුවලදී සඳහා කාලය, පිරිවැය සහ බිල්පත් පිළිබඳ වාර්තාවක් තබා ගැනීමට උදව්"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,මිලදී ගැනීම මිල ලැයිස්තුව
 DocType: Offer Letter Term,Offer Term,ඉල්ලුමට කාලීන
 DocType: Quality Inspection,Quality Manager,තත්ත්ව කළමනාකාර
 DocType: Job Applicant,Job Opening,රැකියා විවෘත
 DocType: Payment Reconciliation,Payment Reconciliation,ගෙවීම් ප්රතිසන්ධාන
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,කරුණාකර අංශය භාර පුද්ගලයා නම තෝරා
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,කරුණාකර අංශය භාර පුද්ගලයා නම තෝරා
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,තාක්ෂණ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},මුළු නොගෙවූ: {0}
 DocType: BOM Website Operation,BOM Website Operation,ද්රව්ය ලේඛණය වෙබ් අඩවිය මෙහෙයුම
@@ -2177,23 +2178,23 @@
 DocType: Opportunity,Lost Reason,අහිමි හේතුව
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,නව ලිපිනය
 DocType: Quality Inspection,Sample Size,නියැදියේ ප්රමාණය
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,සියලු අයිතම දැනටමත් ඉන්වොයිස් කර ඇත
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,රිසිට්පත ලේඛන ඇතුලත් කරන්න
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,තව දුරටත් වියදම් මධ්යස්ථාන කණ්ඩායම් යටතේ ඉදිරිපත් කළ හැකි නමුත් සටහන් ඇතුළත් කිරීම්-කණ්ඩායම් නොවන එරෙහිව කළ හැකි
 DocType: Project,External,බාහිර
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,පරිශීලකයන් හා අවසර
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},නිර්මාණය කරන ලද්දේ නිෂ්පාදනය නියෝග: {0}
 DocType: Branch,Branch,ශාඛාව
 DocType: Guardian,Mobile Number,ජංගම දූරකථන අංකය
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,මුද්රණ හා ෙවළඳ නාමකරණ
 DocType: Bin,Actual Quantity,සැබෑ ප්රමාණය
 DocType: Shipping Rule,example: Next Day Shipping,උදාහරණයක් ලෙස: ඊළඟ දින නැව්
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,{0} සොයාගත නොහැකි අනු අංකය
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,{0} සොයාගත නොහැකි අනු අංකය
 DocType: Scheduling Tool,Student Batch,ශිෂ්ය කණ්ඩායම
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ඔබගේ ගනුදෙනුකරුවන්
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ශිෂ්ය කරන්න
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ශිෂ්ය කරන්න
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},ඔබ මෙම ව්යාපෘතිය පිළිබඳව සහයෝගයෙන් කටයුතු කිරීමට ආරාධනා කර ඇත: {0}
 DocType: Leave Block List Date,Block Date,වාරණ දිනය
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,දැන් ඉල්ලුම් කරන්න
@@ -2217,8 +2218,9 @@
 DocType: SMS Log,Sent To,කිරීම සඳහා යවා
 DocType: Payment Request,Make Sales Invoice,විකුණුම් ඉන්වොයිසිය කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,මෘදුකාංග
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ඊළඟට අප අමතන්න දිනය අතීතයේ දී කළ නොහැකි
 DocType: Company,For Reference Only.,විමර්ශන පමණක් සඳහා.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,කණ්ඩායම තේරීම් නොමැත
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},වලංගු නොවන {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,උසස් මුදල
@@ -2232,7 +2234,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,නඩු අංක 0 වෙන්න බෑ
 DocType: Item,Show a slideshow at the top of the page,පිටුවේ ඉහළ ඇති වූ අතිබහුතරයකගේ පෙන්වන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ස්ටෝර්ස්
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ස්ටෝර්ස්
 DocType: Serial No,Delivery Time,භාරදීමේ වේලාව
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,වයස්ගතවීම ආශ්රිත දා
 DocType: Item,End of Life,ජීවිතයේ අවසානය
@@ -2244,12 +2246,12 @@
 DocType: Rename Tool,Rename Tool,මෙවලම නැවත නම් කරන්න
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,යාවත්කාලීන වියදම
 DocType: Item Reorder,Item Reorder,අයිතමය සීරුමාරු කිරීමේ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ද්රව්ය මාරු
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,වැටුප පුරවා පෙන්වන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ද්රව්ය මාරු
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",", මෙහෙයුම් විශේෂයෙන් සඳහන් මෙහෙයුම් පිරිවැය සහ අද්විතීය මෙහෙයුම ඔබේ ක්රියාකාරිත්වය සඳහා කිසිදු දෙන්න."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,මෙම ලේඛනය අයිතමය {4} සඳහා {0} {1} විසින් සීමාව ඉක්මවා ඇත. ඔබ එකම {2} එරෙහිව තවත් {3} ගන්නවාද?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,ඉතිරි පසු නැවත නැවත සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,වෙනස් මුදල ගිණුම තෝරන්න
 DocType: Purchase Invoice,Price List Currency,මිල ලැයිස්තුව ව්යවහාර මුදල්
 DocType: Naming Series,User must always select,පරිශීලක සෑම විටම තෝරාගත යුතුය
 DocType: Stock Settings,Allow Negative Stock,ඍණ කොටස් ඉඩ දෙන්න
@@ -2260,7 +2262,7 @@
 DocType: Budget Account,Budget Account,අයවැය ගිණුම්
 DocType: Quality Inspection,Verified By,වන විට තහවුරු කර
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","දැනට පවතින ගනුදෙනු නැති නිසා, සමාගම පෙරනිමි මුදල් වෙනස් කළ නොහැක. ගනුදෙනු පෙරනිමි මුදල් වෙනස් කිරීමට අවලංගු කළ යුතුය."
-DocType: Grade Interval,Grade Description,ශ්රේණියේ විස්තරය
+DocType: Grading Scale Interval,Grade Description,ශ්රේණියේ විස්තරය
 DocType: Stock Entry,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,වැටුප පුරවා නිර්මාණය
@@ -2298,7 +2300,7 @@
 DocType: Upload Attendance,Attendance To Date,දිනය සඳහා සහභාගී
 DocType: Warranty Claim,Raised By,විසින් මතු
 DocType: Payment Gateway Account,Payment Account,ගෙවීම් ගිණුම
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,ඉදිරියට සමාගම සඳහන් කරන්න
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,ලැබිය යුතු ගිණුම් ශුද්ධ වෙනස්
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Off වන්දි
 DocType: Offer Letter,Accepted,පිළිගත්තා
@@ -2308,12 +2310,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,ඔබට නිසැකවම මෙම සමාගම සඳහා වන සියළුම ගනුදෙනු මැකීමට අවශ්ය බවට තහවුරු කරගන්න. එය ඔබගේ ස්වාමියා දත්ත පවතිනු ඇත. මෙම ක්රියාව නැති කළ නොහැක.
 DocType: Room,Room Number,කාමර අංකය
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},වලංගු නොවන සමුද්දේශ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) නිෂ්පාදන න්යාය {3} සැලසුම් quanitity ({2}) ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) නිෂ්පාදන න්යාය {3} සැලසුම් quanitity ({2}) ට වඩා වැඩි විය නොහැක
 DocType: Shipping Rule,Shipping Rule Label,නැව් පාලනය ලේබල්
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,පරිශීලක සංසදය
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,", අමු ද්රව්ය, හිස් විය නොහැක."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",", කොටස් යාවත්කාලීන නොවන ඉන්වොයිස් පහත නාවික අයිතමය අඩංගු විය."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,ඉක්මන් ජර්නල් සටහන්
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,ඔබ අනුපාතය වෙනස් කළ නොහැක ද්රව්ය ලේඛණය යම් භාණ්ඩයක agianst සඳහන් නම්
 DocType: Employee,Previous Work Experience,පසුගිය සේවා පළපුරුද්ද
 DocType: Stock Entry,For Quantity,ප්රමාණ සඳහා
@@ -2326,7 +2328,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,නියමයන් හා Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ඔබ මෙම පද්ධතිය සකස්කර සඳහා ආයතනයේ නම.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","මෙම දිනය දක්වා කැටි මුල්ය ප්රවේශය, කිසිවෙක් කරන්න පුළුවන් / පහත සඳහන් නියමිත කාර්යභාරය හැර ප්රවේශය වෙනස් කරගත හැක."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,නඩත්තු කාලසටහන ජනනය පෙර ලිපිය සුරැකීම කරුණාකර
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ව්යාපෘති තත්ත්වය
 DocType: UOM,Check this to disallow fractions. (for Nos),භාග බලය පැවරෙන මෙම පරීක්ෂා කරන්න. (අංක සඳහා)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,පහත සඳහන් නිෂ්පාදන නියෝග නිර්මාණය කරන ලදී:
@@ -2353,7 +2355,7 @@
 ,Employees working on a holiday,නිවාඩු මත සේවය කරන සේවක
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,මාක් වර්තමාන
 DocType: Project,% Complete Method,% සම්පූර්ණ ක්රමය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},නඩත්තු ආරම්භක දිනය අනු අංකය {0} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},නඩත්තු ආරම්භක දිනය අනු අංකය {0} සඳහා බෙදාහැරීමේ දිනට පෙර විය නොහැකි
 DocType: Production Order,Actual End Date,සැබෑ අවසානය දිනය
 DocType: BOM,Operating Cost (Company Currency),මෙහෙයුම් වියදම (සමාගම ව්යවහාර මුදල්)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2370,7 +2372,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,වැටුප් නැතිව නිවාඩු අනුමත නිවාඩු ඉල්ලුම් වාර්තා සමග නොගැලපේ
 DocType: Campaign,Campaign-.####,ව්යාපාරය -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ඊළඟ පියවර
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,හැකි හොඳම මිලකට නිශ්චිතව දක්වා ඇති අයිතම සැපයීමට කරුණාකර
 DocType: Selling Settings,Auto close Opportunity after 15 days,දින 15 කට පසු වාහන සමීප අවස්ථා
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,අවසන් වසර
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2408,7 +2410,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd ප්රමාණ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},නිර්මාණය කරන ලද්දේ ගාස්තු වාර්තා - {0}
 DocType: Asset Category Account,Asset Category Account,වත්කම් ප්රවර්ගය ගිණුම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},විකුණුම් සාමය ප්රමාණය {1} වඩා වැඩි අයිතමය {0} බිහි කිරීමට නොහැක
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,කොටස් Entry {0} ඉදිරිපත් කර නැත
 DocType: Payment Reconciliation,Bank / Cash Account,බැංකුව / මුදල් ගිණුම්
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,ඊළඟ අමතන්න වන විට පෙරමුණ විද්යුත් තැපැල් ලිපිනය ලෙස සමාන විය නොහැකි
@@ -2430,7 +2432,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,නිශ්කාශනෙය් දිනය සඳහන් නොවීම
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,නිෂ්පාදනය
 DocType: Guardian,Occupation,රැකියාව
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ෙරෝ {0}: ඇරඹුම් දිනය අවසානය දිනය පෙර විය යුතුය
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),එකතුව (යවන ලද)
 DocType: Sales Invoice,This Document,මෙම ලේඛන
 DocType: Installation Note Item,Installed Qty,ස්ථාපනය යවන ලද
@@ -2446,15 +2449,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ක නිකුත් වාර්තා
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,උපයෝගීතා වියදම්
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ඉහත
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ෙරෝ # {0}: ජර්නල් සටහන් {1} ගිණුම {2} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ෙරෝ # {0}: ජර්නල් සටහන් {1} ගිණුම {2} හෝ දැනටමත් වෙනත් වවුචරය ගැලපීම නැත
 DocType: Buying Settings,Default Buying Price List,පෙරනිමි මිලට ගැනීම මිල ලැයිස්තුව
 DocType: Process Payroll,Salary Slip Based on Timesheet,වැටුප් පුරවා Timesheet මත පදනම්ව
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ඉහත තෝරාගත් නිර්ණායක හෝ වැටුප් ස්ලිප් සඳහා කිසිදු සේවකයෙකුට දැනටමත් නිර්මාණය
 DocType: Notification Control,Sales Order Message,විකුණුම් සාමය පණිවුඩය
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","සමාගම, මුදල්, මුදල් වර්ෂය ආදිය සකස් පෙරනිමි අගයන්"
 DocType: Payment Entry,Payment Type,ගෙවීම් වර්ගය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,කරුණාකර අයිතමය {0} සඳහා කණ්ඩායම තෝරන්න. මෙම අවශ්යතාව ඉටු කරන බව එක් කණ්ඩායම සොයා ගත නොහැකි විය
 DocType: Process Payroll,Select Employees,සේවක තෝරන්න
 DocType: Opportunity,Potential Sales Deal,අනාගත විකුණුම් ගනුදෙනුව
 DocType: Payment Entry,Cheque/Reference Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් / යොමුව දිනය"
@@ -2471,7 +2474,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},{0} දැනටමත් සමාගම {1} සඳහා නිර්මාණය ගෝලීය POS නරඹන්න
 DocType: Purchase Order,Ref SQ,ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,අයිතමය / ද්රව්ය ලේඛණය සියලු BOMs තුළ ආදේශ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,රිසිට්පත ලියවිලි ඉදිරිපත් කළ යුතුය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,රිසිට්පත ලියවිලි ඉදිරිපත් කළ යුතුය
 DocType: Purchase Invoice Item,Received Qty,යවන ලද ලැබී
 DocType: Stock Entry Detail,Serial No / Batch,අනු අංකය / කණ්ඩායම
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,ගෙවුම් හා නැති කතාව නොවේ
@@ -2480,11 +2483,11 @@
 DocType: Delivery Note,DN-RET-,ඩී.එන්-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,කිසිදු කාල සටහන්
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"වර්ගය අවසරය, {0} ගෙන-ඉදිරිපත් කළ නොහැකි"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',නඩත්තු උපෙල්ඛනෙය් සියලු භාණ්ඩ සඳහා ජනනය කර නැත. &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',නඩත්තු උපෙල්ඛනෙය් සියලු භාණ්ඩ සඳහා ජනනය කර නැත. &#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
 ,To Produce,නිර්මාණය කිරීම සඳහා
 apps/erpnext/erpnext/config/hr.py +93,Payroll,වැටුප්
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","{0} පේළියේ සඳහා {1} දී. {2} අයිතමය අනුපාතය, පේළි {3} ද ඇතුළත් විය යුතු අතර ඇතුළත් කිරීමට"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,පරිශීලක කරන්න
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,පරිශීලක කරන්න
 DocType: Packing Slip,Identification of the package for the delivery (for print),ප්රසූතියට සඳහා පැකේජය හඳුනා ගැනීම (මුද්රිත)
 DocType: Bin,Reserved Quantity,ඇවිරිණි ප්රමාණ
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,වලංගු ඊ-තැපැල් ලිපිනයක් ඇතුලත් කරන්න
@@ -2498,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,ආබාධිත සැකිල්ල පෙරනිමි සැකිලි නොවිය යුතුයි
 DocType: Account,Income Account,ආදායම් ගිණුම
 DocType: Payment Request,Amount in customer's currency,පාරිභෝගික මුදල් ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,සැපයුම්
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,සැපයුම්
 DocType: Stock Reconciliation Item,Current Qty,වත්මන් යවන ලද
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",වගන්තිය සැඳුම්ලත් දී &quot;ද්රව්ය මත පදනම් මත අනුපාතිකය&quot; බලන්න
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,පෙර
 DocType: Appraisal Goal,Key Responsibility Area,ප්රධාන වගකීම් ප්රදේශය
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","ශිෂ්ය කාණ්ඩ ඔබ සිසුන් සඳහා පැමිණීම, ඇගයීම හා ගාස්තු නිරීක්ෂණය උදව්"
 DocType: Payment Entry,Total Allocated Amount,මුළු වෙන් කළ මුදල
 DocType: Item Reorder,Material Request Type,ද්රව්ය ඉල්ලීම් වර්ගය
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} {1} දක්වා වැටුප් සඳහා Accural ජර්නල් සටහන්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage පිරී ඇත, ඉතිරි වුණේ නැහැ"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ෙරෝ {0}: UOM පරිවර්තන සාධකය අනිවාර්ය වේ
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,ref
 DocType: Budget,Cost Center,පිරිවැය මධ්යස්ථානය
@@ -2516,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,විකුණුම් ගනුදෙනු වලින් පාරිභෝගික බදු අංකය සඟවන්න
 DocType: Upload Attendance,Upload HTML,HTML උඩුගත
 DocType: Employee,Relieving Date,ලිහිල් දිනය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","මිල ගණන් පාලනය සමහර නිර්ණායක මත පදනම් වූ, මිල ලැයිස්තු මඟින් නැවත ලියවෙනු / වට්ටම් ප්රතිශතය නිර්වචනය කිරීමට සිදු වේ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","මිල ගණන් පාලනය සමහර නිර්ණායක මත පදනම් වූ, මිල ලැයිස්තු මඟින් නැවත ලියවෙනු / වට්ටම් ප්රතිශතය නිර්වචනය කිරීමට සිදු වේ."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,පොත් ගබඩාව පමණක් හරහා කොටස් Entry / ප්රවාහනය සටහන / මිලදී ගැනීම රිසිට්පත වෙනස් කළ හැකි
 DocType: Employee Education,Class / Percentage,පන්තියේ / ප්රතිශතය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,අලෙවි සහ විකුණුම් අංශ ප්රධානී
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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; ක්ෂේත්රය වඩා ඉහළම අගය කරනු ඇත."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","තෝරාගත් මිල නියම පාලනය මිල &#39;සඳහා ඉදිරිපත් වන්නේ නම්, එය මිල ලැයිස්තුව මඟින් නැවත ලියවෙනු ඇත. මිල ගණන් පාලනය මිල අවසන් මිල, ඒ නිසා තවදුරටත් වට්ටමක් යෙදිය යුතුය. මේ නිසා, විකුණුම් සාමය, මිලදී ගැනීමේ නියෝගයක් ආදිය වැනි ගනුදෙනු, එය &#39;අනුපාතිකය&#39; ක්ෂේත්රය තුළ, &#39;මිල ලැයිස්තුව අනුපාතිකය&#39; ක්ෂේත්රය වඩා ඉහළම අගය කරනු ඇත."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ධාවන කර්මාන්ත ස්වභාවය අනුව මඟ පෙන්වන.
 DocType: Item Supplier,Item Supplier,අයිතමය සැපයුම්කරු
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,කිසිදු කණ්ඩායම ලබා ගැනීමට අයිතමය සංග්රහයේ ඇතුලත් කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},කරුණාකර {0} සඳහා අගය තෝරා quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,සියළු ලිපිනයන්.
 DocType: Company,Stock Settings,කොටස් සැකසුම්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","පහත සඳහන් ලක්ෂණ වාර්තා දෙකම එකම නම් යනවාත් පමණි. සමූහය, රූට් වර්ගය, සමාගම,"
@@ -2535,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',තත්වය සමග සේවකයින්ට සිදුවීම පිළිබඳ ඊමේල් එකක් එවන්නෙමු &#39;විවෘත&#39;
 DocType: Task,Depends on Tasks,කාර්යයන් මත රඳා පවතී
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,කස්ටමර් සමූහයේ රුක් කළමනාකරණය කරන්න.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,ඇමුණුම් කරත්තයක් හැකියාව තොරව පෙන්විය හැක
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,නව පිරිවැය මධ්යස්ථානය නම
 DocType: Leave Control Panel,Leave Control Panel,පාලක පැනලය තබන්න
@@ -2547,12 +2552,10 @@
 DocType: Sales Invoice,Debit To,ඩෙබිට් කිරීම
 DocType: Delivery Note,Required only for sample item.,නියැදි අයිතමය සඳහා පමණක් අවශ්ය විය.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ගනුදෙනු කිරීමෙන් පසු සැබෑ යවන ලද
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,සැපයුම්කරු&gt; සැපයුම්කරු වර්ගය
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},{0} සහ {1} අතර සොයා කිසිම වැටුප් ස්ලිප්
 ,Pending SO Items For Purchase Request,විභාග SO අයිතම මිලදී ගැනීම ඉල්ලීම් සඳහා
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,ශිෂ්ය ප්රවේශ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} අක්රීය
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} අක්රීය
 DocType: Supplier,Billing Currency,බිල්පත් ව්යවහාර මුදල්
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,මහා පරිමාණ
@@ -2569,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,මුල් පිටුව Featured නිෂ්පාදන
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,සියලු තක්සේරු කණ්ඩායම්
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,නව ගබඩා නම
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),මුළු {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),මුළු {0} ({1})
 DocType: C-Form Invoice Detail,Territory,භූමි ප්රදේශය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,අවශ්ය සංචාර ගැන කිසිදු සඳහනක් කරන්න
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,අවශ්ය සංචාර ගැන කිසිදු සඳහනක් කරන්න
 DocType: Stock Settings,Default Valuation Method,පෙරනිමි තක්සේරු ක්රමය
 DocType: Vehicle Log,Fuel Qty,ඉන්ධන යවන ලද
 DocType: Production Order Operation,Planned Start Time,සැලසුම් අරඹන්න කාල
@@ -2587,7 +2590,7 @@
 DocType: Price List,Price List Master,මිල ලැයිස්තුව මාස්ටර්
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,සියලු විකුණුම් ගනුදෙනු බහු ** විකුණුම් පුද්ගලයින් එරෙහිව tagged කළ හැකි ** ඔබ ඉලක්ක තබා නිරීක්ෂණය කළ හැකි බව එසේ.
 ,S.O. No.,SO අංක
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},ඊයම් සිට පාරිභෝගික {0} නිර්මාණය කරන්න
 DocType: Price List,Applicable for Countries,රටවල් සඳහා අදාළ වන
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,&#39;අනුමත&#39; සහ &#39;ප්රතික්ෂේප&#39; ඉදිරිපත් කළ හැකි එකම තත්ත්වය සහිත යෙදුම් තබන්න
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},ශිෂ්ය සමූහය නම පේළිය {0} අනිවාර්ය වේ
@@ -2619,7 +2622,7 @@
 DocType: Project,Copied From,සිට පිටපත්
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},නම දෝෂය: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,හිඟයක්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} සමග සම්බන්ධ නැති
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} {2} {3} සමග සම්බන්ධ නැති
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,සේවක {0} සඳහා සහභාගි වන විටත් ලකුණු කර ඇත
 DocType: Packing Slip,If more than one package of the same type (for print),එකම වර්ගයේ (මුද්රිත) එකකට වඩා වැඩි පැකේජය නම්
 ,Salary Register,වැටුප් රෙජිස්ටර්
@@ -2638,7 +2641,7 @@
 DocType: Tax Rule,Use for Shopping Cart,සාප්පු සවාරි කරත්ත සඳහා භාවිතා
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},අගය {0} උපලක්ෂණ සඳහා {1} වලංගු අයිතමය ලැයිස්තුවේ නොපවතියි අයිතමය {2} සඳහා වටිනාකම් ආරෝපණය
 DocType: BOM Item,Scrap %,පරණ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ගාස්තු ඔබේ තෝරාගැනීම අනුව, අයිතමය යවන ලද හෝ මුදල මත පදනම් වන අතර සමානුපාතික බෙදා දීමට නියමිතය"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ගාස්තු ඔබේ තෝරාගැනීම අනුව, අයිතමය යවන ලද හෝ මුදල මත පදනම් වන අතර සමානුපාතික බෙදා දීමට නියමිතය"
 DocType: Maintenance Visit,Purposes,අරමුණු
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,හිතුව එක් භාණ්ඩයක් ආපසු ලියවිල්ල තුල සෘණාත්මක ප්රමාණය සමඟ ඇතුළත් කළ යුතුය
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","මෙහෙයුම {0} තවදුරටත් පරිගණකය තුල {1} ඕනෑම ලබා ගත හැකි වැඩ කරන පැය වඩා, බහු මෙහෙයුම් බවට මෙහෙයුම බිඳ"
@@ -2659,16 +2662,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,දේශසීමාවේ රුක් කළමනාකරණය කරන්න.
 DocType: Journal Entry Account,Sales Invoice,විකුණුම් ඉන්වොයිසිය
 DocType: Journal Entry Account,Party Balance,පක්ෂය ශේෂ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,වට්ටම් මත ඉල්ලුම් කරන්න තෝරා
 DocType: Company,Default Receivable Account,පෙරනිමි ලැබිය ගිණුම
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,ඉහත තෝරාගත් නිර්ණායකයන් සඳහා ගෙවා ඇති මුළු වැටුප් සඳහා බැංකු සටහන් නිර්මාණය
 DocType: Stock Entry,Material Transfer for Manufacture,නිෂ්පාදනය සඳහා ද්රව්ය හුවමාරු
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,වට්ටමක් ප්රතිශතය ඉතා මිල ලැයිස්තුව එරෙහිව හෝ සියලුම මිල ලැයිස්තුව සඳහා එක්කෝ ඉල්ලුම් කළ හැක.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,වට්ටමක් ප්රතිශතය ඉතා මිල ලැයිස්තුව එරෙහිව හෝ සියලුම මිල ලැයිස්තුව සඳහා එක්කෝ ඉල්ලුම් කළ හැක.
 DocType: Purchase Invoice,Half-yearly,අර්ධ වාර්ෂික
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,කොටස් සඳහා මුල්ය සටහන්
 DocType: Vehicle Service,Engine Oil,එන්ජින් ඔයිල්
 DocType: Sales Invoice,Sales Team1,විකුණුම් Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,අයිතමය {0} නොපවතියි
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,අයිතමය {0} නොපවතියි
 DocType: Sales Invoice,Customer Address,පාරිභෝගික ලිපිනය
 DocType: Employee Loan,Loan Details,ණය තොරතුරු
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ෙරෝ {0}: සම්පූර්ණ කරන යවන ලද බිංදුවට වඩා වැඩි විය යුතුය.
@@ -2676,24 +2679,24 @@
 DocType: Account,Root Type,මූල වර්ගය
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ෙරෝ # {0}: {1} අයිතමය සඳහා {2} වඩා වැඩි ආපසු නොහැක
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ෙෂඩ්
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},ඉලක්ක ගබඩා සංකීර්ණය පේළිය {0} සඳහා අනිවාර්ය වේ
 DocType: Cheque Print Template,Primary Settings,ප්රාථමික සැකසීම්
 DocType: Purchase Invoice,Select Supplier Address,සැපයුම්කරු ලිපිනය තෝරන්න
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,සේවක එකතු කරන්න
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,සේවක එකතු කරන්න
 DocType: Purchase Invoice Item,Quality Inspection,තත්ත්ව පරීක්ෂක
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,අමතර කුඩා
 DocType: Company,Standard Template,සම්මත සැකිල්ල
 DocType: Training Event,Theory,න්යාය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,අවවාදයයි: යවන ලද ඉල්ලන ද්රව්ය අවම සාමය යවන ලද වඩා අඩු වේ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ගිණුම {0} කැටි වේ
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,සංවිධානය සතු ගිණුම් වෙනම සටහන සමග නීතිමය ආයතනයක් / පාලිත.
 DocType: Payment Request,Mute Email,ගොළු විද්යුත්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ආහාර, බීම වර්ග සහ දුම්කොළ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},එකම unbilled {0} එරෙහිව ගෙවීම් කරන්න පුළුවන්
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,කොමිසම අනුපාතය 100 ට වඩා වැඩි විය නොහැක
 DocType: Stock Entry,Subcontract,උප කොන්ත්රාත්තුව
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,{0} ඇතුලත් කරන්න පළමු
@@ -2733,7 +2736,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,පවත්නා ගනුදෙනුව සමග බඞු ගබඞාව පිරිසක් බවට පරිවර්තනය කළ නොහැක.
 DocType: Assessment Result Tool,Result HTML,ප්රතිඵල සඳහා HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,දින අවසන් වීමට නියමිතය
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,සිසුන් එක් කරන්න
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,සිසුන් එක් කරන්න
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},කරුණාකර {0} තෝරා
 DocType: C-Form,C-Form No,C-අයදුම්පත් නොමැත
 DocType: BOM,Exploded_items,Exploded_items
@@ -2776,7 +2779,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ඒඑම්ටී
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,රාජ්ය මූල්ය වර්ෂය තෝරන්න
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,සීරුමාරු කිරීමේ පෙළ
 DocType: Company,Chart Of Accounts Template,ගිණුම් සැකිල්ල සටහන
 DocType: Attendance,Attendance Date,පැමිණීම දිනය
@@ -2791,14 +2794,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ප්රවේශය අනුපිටපත්
 DocType: Program Enrollment Tool,Get Students,ශිෂ්ය ලබා ගන්න
 DocType: Serial No,Under Warranty,වගකීම් යටතේ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[දෝෂය]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[දෝෂය]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ඔබ විකුණුම් සාමය සුරැකීමට වරක් වචන දෘශ්යමාන වනු ඇත.
 ,Employee Birthday,සේවක ජන්ම දිනය
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,ශිෂ්ය කණ්ඩායම පැමිණීම මෙවලම
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,සීමාව ඉක්මවා ගොස්
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,ෙවන්චර් කැපිටල්
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,මෙම &#39;අධ්යයන වර්ෂය&#39; {0} සහ {1} දැනටමත් පවතී &#39;කාලීන නම&#39; සමග ශාස්ත්රීය පදය. මෙම ඇතුළත් කිරීම් වෙනස් කර නැවත උත්සාහ කරන්න.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","අයිතමය {0} එරෙහිව දැනට පවතින ගනුදෙනු ඇත ලෙස, ඔබ {1} වටිනාකම වෙනස් කළ නොහැක"
 DocType: UOM,Must be Whole Number,මුළු අංකය විය යුතුය
 DocType: Leave Control Panel,New Leaves Allocated (In Days),වෙන් අලුත් කොළ (දින දී)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,අනු අංකය {0} නොපවතියි
@@ -2818,7 +2821,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,මෙම වෙළෙඳ න්යාය එරෙහිව ගොඩනගන ද්රව්ය%
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,කාලය අවසාන සටහන්
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය පිරිසක් බවට පරිවර්තනය කළ නොහැකි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},මුදල {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},මුදල {0} {1} {2} {3}
 DocType: Account,Depreciation,ක්ෂය
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),සැපයුම්කරුවන් (ව)
 DocType: Employee Attendance Tool,Employee Attendance Tool,සේවක පැමිණීම මෙවලම
@@ -2842,7 +2845,7 @@
 DocType: Supplier,Last Day of the Next Month,ඊළඟ මාසය අවසන් දිනය
 DocType: Support Settings,Auto close Issue after 7 days,7 දින පසු වාහන සමීප නිකුත්
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","නිවාඩු ඉතිරි දැනටමත් අනාගත නිවාඩු වෙන් වාර්තා {1} තුළ රැගෙන යන ඉදිරිපත් කර ඇති පරිදි අවසරය, {0} පෙර වෙන් කළ නොහැකි"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),සටහන: හේතුවෙන් / යොමුව දිනය {0} දවස (s) අවසර පාරිභෝගික ණය දින ඉක්මවා
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,ශිෂ්ය අයදුම්කරු
 DocType: Asset Category Account,Accumulated Depreciation Account,සමුච්චිත ක්ෂය ගිණුම
 DocType: Stock Settings,Freeze Stock Entries,කැටි කොටස් අයැදුම්පත්
@@ -2853,7 +2856,7 @@
 ,Stock Analytics,කොටස් විශ්ලේෂණ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,මෙහෙයුම් හිස්ව තැබිය නොහැක
 DocType: Maintenance Visit Purpose,Against Document Detail No,මත ලේඛන විස්තර නොමැත
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,පක්ෂය වර්ගය අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,පක්ෂය වර්ගය අනිවාර්ය වේ
 DocType: Quality Inspection,Outgoing,ධූරයෙන් ඉවත්ව යන
 DocType: Material Request,Requested For,සඳහා ඉල්ලා
 DocType: Quotation Item,Against Doctype,Doctype එරෙහිව
@@ -2870,11 +2873,11 @@
 DocType: Asset,Item Code,අයිතමය සංග්රහයේ
 DocType: Production Planning Tool,Create Production Orders,නිෂ්පාදන නියෝග නිර්මාණය
 DocType: Serial No,Warranty / AMC Details,වගකීම් / විදේශ මුදල් හුවමාරු කරන්නන් විස්තර
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,සිසුන් ක්රියාකාරකම් පදනම් කණ්ඩායම සඳහා තෝරා
 DocType: Journal Entry,User Remark,පරිශීලක අදහස් දැක්වීම්
 DocType: Lead,Market Segment,වෙළෙඳපොළ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ු ර් මුළු සෘණ හිඟ මුදල {0} වඩා වැඩි විය නොහැකි
 DocType: Employee Internal Work History,Employee Internal Work History,සේවක අභ්යන්තර රැකියා ඉතිහාසය
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),වැසීම (ආචාර්ය)
 DocType: Cheque Print Template,Cheque Size,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් තරම"
@@ -2890,7 +2893,7 @@
 DocType: Production Planning Tool,Create Material Requests,ද්රව්ය ඉල්ලීම් නිර්මාණය
 DocType: Employee Education,School/University,පාසල් / විශ්ව
 DocType: Payment Request,Reference Details,විමර්ශන විස්තර
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ප්රයෝජනවත් ලයිෆ් පසු අපේක්ෂිත අගය දළ මිලදී ගැනීම මුදල වඩා අඩු විය යුතුය
 DocType: Sales Invoice Item,Available Qty at Warehouse,ගබඩා ලබා ගත හැක යවන ලද
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,බිල්පතක් මුදල
 DocType: Asset,Double Declining Balance,ද්විත්ව පහත වැටෙන ශේෂ
@@ -2911,20 +2914,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","මෙම කොටස් ප්රතිසන්ධාන ක විවෘත කිරීම සටහන් වන බැවින්, වෙනසක් ගිණුම, එය වත්කම් / වගකීම් වර්ගය ගිණුමක් විය යුතුය"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},උපෙයෝජන ණය මුදල {0} ට වඩා වැඩි විය නොහැක
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},විෂය {0} සඳහා අවශ්ය මිලදී ගැනීමේ නියෝගයක් අංකය
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,නිෂ්පාදනය සාමය නිර්මාණය නොවන
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;දිනය සිට&#39; &#39;මේ දක්වා&#39; &#39;පසුව විය යුතුය
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ශිෂ්ය {0} ශිෂ්ය අයදුම් {1} සම්බන්ධ වන ලෙස තත්ත්වය වෙනස් කළ නොහැක
 DocType: Asset,Fully Depreciated,සම්පූර්ණෙයන් ක්ෂය
 ,Stock Projected Qty,කොටස් යවන ලද ප්රක්ෂේපිත
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},පාරිභෝගික {0} ව්යාපෘති {1} අයිති නැති
 DocType: Employee Attendance Tool,Marked Attendance HTML,කැපී පෙනෙන පැමිණීම HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","මිල ගණන් යෝජනා, ඔබගේ පාරිභෝගිකයන් වෙත යවා ඇති ලංසු"
 DocType: Sales Order,Customer's Purchase Order,පාරිභෝගික මිලදී ගැනීමේ නියෝගයක්
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,අනු අංකය හා කණ්ඩායම
 DocType: Warranty Claim,From Company,සමාගම වෙතින්
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,තක්සේරු නිර්ණායකයන් ලකුණු මුදලක් {0} විය යුතුය.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,හෝ වටිනාකම යවන ලද
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,වෙන් කරවා අගය පහත සංඛ්යාව සකස් කරන්න
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,හෝ වටිනාකම යවන ලද
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,නිෂ්පාදන නියෝග මතු කල නොහැකි ය:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,ව්යවස්ථාව
 DocType: Purchase Invoice,Purchase Taxes and Charges,මිලදී බදු හා ගාස්තු
@@ -2937,7 +2940,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,සියලු බඞු ගබඞාව
 DocType: Sales Partner,Retailer,සිල්ලර වෙළෙන්දා
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,ගිණුමක් සඳහා ක්රෙඩිට් ශේෂ පත්රය ගිණුමක් විය යුතුය
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,සියලු සැපයුම්කරු වර්ග
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,සියලු සැපයුම්කරු වර්ග
 DocType: Global Defaults,Disable In Words,වචන දී අක්රීය
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,අයිතමය සංග්රහයේ අනිවාර්ය වේ අයිතමය ස්වයංක්රීයව අංකනය නැති නිසා
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},උද්ධෘත {0} නොවේ වර්ගයේ {1}
@@ -2946,6 +2949,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,බැංකු අයිරා ගිණුමක්
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,වැටුප පුරවා ගන්න
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,පේළියේ # {0}: වෙන් කළ මුදල ගෙවීමට ඇති මුදල වඩා වැඩි විය නොහැක.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ගවේශක ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,ආරක්ෂිත ණය
 DocType: Purchase Invoice,Edit Posting Date and Time,"සංස්කරණය කරන්න ගිය තැන, දිනය හා වේලාව"
@@ -2985,7 +2989,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} කට වඩා පැරණි කොටස් ගනුදෙනු යාවත්කාලීන කිරීමට අවසර නැත
 DocType: Purchase Invoice Item,PR Detail,මහජන සම්බන්ධතා විස්තර
 DocType: Sales Order,Fully Billed,පූර්ණ අසූහත
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},සේවකයා {0} හි පෙරනිමි ගෙවිය යුතු ගිණුම් සකස් කරන්න
 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 +127,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),ඇසුරුම් දළ බර. ශුද්ධ බර + ඇසුරුම් ද්රව්ය බර සාමාන්යයෙන්. (මුද්රිත)
@@ -2996,7 +2999,7 @@
 DocType: Student Group,Group Based On,සමූහ පදනම් මත
 DocType: Journal Entry,Bill Date,පනත් කෙටුම්පත දිනය
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","සේවා අයිතමය, වර්ගය, සංඛ්යාත සහ වියදම් ප්රමාණය අවශ්ය වේ"
-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:","ඉහළම ප්රමුඛත්වය සමග බහු මිල නියම රීති තිබිය දී පවා, නම්, පහත සඳහන් අභ්යන්තර ප්රමුඛතා අයදුම් කර ඇත:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","ඉහළම ප්රමුඛත්වය සමග බහු මිල නියම රීති තිබිය දී පවා, නම්, පහත සඳහන් අභ්යන්තර ප්රමුඛතා අයදුම් කර ඇත:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},ඔබ ඇත්තටම {0} සිට {1} වෙත වැටුප පුරවා ඉදිරිපත් කිරීමට අවශ්යද
 DocType: Cheque Print Template,Cheque Height,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් උස"
 DocType: Supplier,Supplier Details,සැපයුම්කරු විස්තර
@@ -3008,7 +3011,7 @@
 DocType: Vehicle Log,Invoice Ref,ඉන්වොයිසිය අංකය
 DocType: Purchase Order,Recurring Order,පුනරාවර්තනය න්යාය
 DocType: Company,Default Income Account,පෙරනිමි ආදායම් ගිණුම
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,පාරිභෝගික කණ්ඩායම් / පාරිභෝගික
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,පාරිභෝගික කණ්ඩායම් / පාරිභෝගික
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed රාජ්ය මූල්ය වසර ලාභය / අලාභය (ක්රෙඩිට්)
 DocType: Sales Invoice,Time Sheets,කාලය පත්ර
 DocType: Payment Gateway Account,Default Payment Request Message,පෙරනිමි ගෙවීම් ඉල්ලීම් පණිවුඩය
@@ -3028,10 +3031,10 @@
 DocType: Notification Control,Quotation Message,උද්ධෘත පණිවුඩය
 DocType: Employee Loan,Employee Loan Application,සේවක ණය ඉල්ලුම්
 DocType: Issue,Opening Date,විවෘත දිනය
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,පැමිණීම සාර්ථකව සලකුණු කර ඇත.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,පැමිණීම සාර්ථකව සලකුණු කර ඇත.
 DocType: Journal Entry,Remark,ප්රකාශය
 DocType: Purchase Receipt Item,Rate and Amount,වේගය හා ප්රමාණය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},{0} සඳහා ගිණුම වර්ගය විය යුතුය {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},{0} සඳහා ගිණුම වර්ගය විය යුතුය {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,කොළ සහ නිවාඩු
 DocType: School Settings,Current Academic Term,වත්මන් අධ්යයන කාලීන
 DocType: School Settings,Current Academic Term,වත්මන් අධ්යයන කාලීන
@@ -3054,7 +3057,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,ශිෂ්ය සමූහය
 DocType: Shopping Cart Settings,Quotation Series,උද්ධෘත ශ්රේණි
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","අයිතමයක් ම නම ({0}) සමග පවතී, අයිතමය කණ්ඩායමේ නම වෙනස් කිරීම හෝ අයිතමය නැවත නම් කරුණාකර"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,කරුණාකර පාරිභෝගික තෝරා
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,කරුණාකර පාරිභෝගික තෝරා
 DocType: C-Form,I,මම
 DocType: Company,Asset Depreciation Cost Center,වත්කම් ක්ෂය පිරිවැය මධ්යස්ථානය
 DocType: Sales Order Item,Sales Order Date,විකුණුම් සාමය දිනය
@@ -3073,20 +3076,20 @@
 DocType: Vehicle,Insurance Details,රක්ෂණ විස්තර
 DocType: Account,Payable,ගෙවිය යුතු
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,ණය ආපසු ගෙවීමේ කාල සීමාවක් ඇතුල් කරන්න
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ණය ගැතියන් ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ණය ගැතියන් ({0})
 DocType: Pricing Rule,Margin,ආන්තිකය
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,නව ගනුදෙනුකරුවන්
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,දළ ලාභය %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,නිශ්කාශනෙය් දිනය
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,දළ මිලදී ගැනීම මුදල අනිවාර්ය වේ
 DocType: Lead,Address Desc,ෙමරට ලිපිනය DESC
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,පක්ෂය අනිවාර්ය වේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,පක්ෂය අනිවාර්ය වේ
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,මාතෘකාව නම
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,මෙම විකිණීම හෝ මිලදී ගැනීමේ ආයෝජිත තෝරාගත් කළ යුතුය
-DocType: Grading Structure,Grade Intervals,ශ්රේණියේ ප්රාන්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,ඔබේ ව්යාපාරයේ ස්වභාවය තෝරන්න.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},පේළියේ # {0}: ආශ්රිත {1} {2} හි දෙවන පිටපත ප්රවේශය
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,නිෂ්පාදන මෙහෙයුම් සිදු කරනු ලැබේ කොහෙද.
 DocType: Asset Movement,Source Warehouse,මූලාශ්රය ගබඩාව
 DocType: Installation Note,Installation Date,ස්ථාපනය දිනය
@@ -3123,7 +3126,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,මුද්රණය සැකිලි සඳහා ලිපිය ධා.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,මුද්රණය සැකිලි සඳහා මාතෘකා Proforma ඉන්වොයිසිය වර්ග උදා.
 DocType: Student Guardian,Student Guardian,ශිෂ්ය ගාඩියන්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,තක්සේරු වර්ගය චෝදනා සියල්ල ඇතුළත් ලෙස සලකුණු නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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,ද්රව්ය ලේඛණය අනුපාතිකය
@@ -3151,7 +3154,7 @@
 DocType: Company,Exchange Gain / Loss Account,විනිමය ලාභ / අලාභ ගිණුම්
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,සේවකයෙකුට සහ පැමිණීෙම්
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},අරමුණ {0} එකක් විය යුතුය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,පෝරමය පුරවා එය රැක
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,ප්රජා සංසදය
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,කොටස් සැබෑ යවන ලද
@@ -3167,7 +3170,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,සීරුමාරු කිරීමේ යවන ලද
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,වත්මන් රැකියා අවස්ථා
 DocType: Company,Stock Adjustment Account,කොටස් ගැලපුම් ගිණුම
-DocType: Journal Entry,Write Off,ලියා හරින්න
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ලියා හරින්න
 DocType: Timesheet Detail,Operation 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} සිට
@@ -3178,27 +3181,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,සැපයුම්කරු පාරිභෝගික බාර
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ආකෘතිය / අයිතමය / {0}) කොටස් ඉවත් වේ
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"ඊළඟ දිනය දිනය ගිය තැන, ශ්රී ලංකා තැපෑල වඩා වැඩි විය යුතුය"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,බදු බිඳී පෙන්වන්න
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,බදු බිඳී පෙන්වන්න
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},නිසා / යොමුව දිනය {0} පසු විය නොහැකි
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,දත්ත ආනයන හා අපනයන
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","කොටස් ඇතුළත් කිරීම්, ගබඩා {0} එරෙහිව පවතින නිසා ඔබ නැවත භාර කිරීමට හෝ වෙනස් කිරීම කළ හැක"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,සිසුන් හමු කිසිදු
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,සිසුන් හමු කිසිදු
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,"ඉන්වොයිසිය ගිය තැන, දිනය"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,විකිණීමට
 DocType: Sales Invoice,Rounded Total,වටකුරු මුළු
 DocType: Product Bundle,List items that form the package.,මෙම පැකේජය පිහිටුවීමට බව අයිතම ලැයිස්තුගත කරන්න.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ප්රතිශතයක් වෙන් කිරීම 100% ක් සමාන විය යුතුයි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"කරුණාකර පක්ෂය තෝරා ගැනීමට පෙර ගිය තැන, දිනය තෝරා"
 DocType: Program Enrollment,School House,ස්කූල් හවුස්
 DocType: Serial No,Out of AMC,විදේශ මුදල් හුවමාරු කරන්නන් අතරින්
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,මිල ගණන් තෝරන්න
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,මිල ගණන් තෝරන්න
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,මිල ගණන් තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,වෙන් කරවා අගය පහත සංඛ්යාව අගය පහත සමස්ත සංඛ්යාව ට වඩා වැඩි විය නොහැක
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,නඩත්තු සංචාරය කරන්න
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,විකුණුම් මාස්ටර් කළමනාකරු {0} කාර්යභාරයක් ඇති කරන පරිශීලකයා වෙත සම්බන්ධ වන්න
 DocType: Company,Default Cash Account,පෙරනිමි මුදල් ගිණුම්
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,සමාගම (නැති පාරිභෝගික හෝ සැපයුම්කරු) ස්වාමියා.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,මෙය මේ ශිෂ්ය ඊට සහභාගී මත පදනම් වේ
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,කිසිදු ශිෂ්ය
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,වැඩිපුර භාණ්ඩ ෙහෝ විවෘත පූර්ණ ආකෘති පත්රය එක් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;අපේක්ෂිත භාර දීම දිනය&#39; ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,සැපයුම් සටහන් {0} මෙම වෙළෙඳ න්යාය අවලංගු කිරීම පෙර අවලංගු කළ යුතුය
@@ -3230,6 +3234,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,අයිතමය 3
 DocType: Purchase Order,Customer Contact Email,පාරිභෝගික ඇමතුම් විද්යුත්
 DocType: Warranty Claim,Item and Warranty Details,භාණ්ඩය හා Warranty විස්තර
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,අයිතමය සංග්රහයේ&gt; අයිතමය සමූහ&gt; වෙළඳ නාමය
 DocType: Sales Team,Contribution (%),දායකත්වය (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,සටහන: &#39;මුදල් හෝ බැංකු ගිණුම්&#39; දක්වන නොවීම නිසා ගෙවීම් සටහන් නිර්මාණය කළ නොහැකි වනු ඇත
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,අනිවාර්ය පාඨමාලා ලබා ගැනීමට මෙම වැඩසටහන තෝරන්න.
@@ -3245,9 +3250,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,සංහිඳියාව පෙර
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0} වෙත
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),එකතු කරන බදු හා ගාස්තු (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"අයිතමය බදු ෙරෝ {0} වර්ගය බදු හෝ ආදායම් හෝ වියදම් හෝ අයකරනු ලබන ගාස්තු, ක ගිණුමක් තිබිය යුතු"
 DocType: Sales Order,Partly Billed,අර්ධ වශයෙන් අසූහත
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,අයිතමය {0} ස්ථාවර වත්කම් අයිතමය විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,අයිතමය {0} ස්ථාවර වත්කම් අයිතමය විය යුතුය
 DocType: Item,Default BOM,පෙරනිමි ද්රව්ය ලේඛණය
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,තහවුරු කිරීමට සමාගමේ නම වර්ගයේ නැවත කරුණාකර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,මුළු විශිෂ්ට ඒඑම්ටී
@@ -3257,8 +3262,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,රථ
 DocType: Vehicle,Insurance Company,රක්ෂණ සමාගම
 DocType: Asset Category Account,Fixed Asset Account,ස්ථාවර වත්කම් ගිණුම්
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,විචල්ය
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,සැපයුම් සටහන
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,විචල්ය
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,සැපයුම් සටහන
 DocType: Student,Student Email Address,ශිෂ්ය විද්යුත් තැපැල් ලිපිනය
 DocType: Timesheet Detail,From Time,වේලාව සිට
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,ගබඩාවේ ඇත:
@@ -3270,12 +3275,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,මිල ලැයිස්තුව විනිමය අනුපාත
 DocType: Purchase Invoice Item,Rate,අනුපාතය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ආධුනිකයා
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ලිපිනය නම
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ලිපිනය නම
 DocType: Stock Entry,From BOM,ද්රව්ය ලේඛණය සිට
 DocType: Assessment Code,Assessment Code,තක්සේරු සංග්රහයේ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,මූලික
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} කැටි වේ කොටස් ගනුදෙනු පෙර
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;උත්පාදනය උපෙල්ඛනෙය්&#39; මත ක්ලික් කරන්න
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","උදා: කිලෝ ග්රෑම්, ඒකක, අංක, මීටර්"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ධව ඔබ විමර්ශන දිනය ඇතුළු නම් කිසිම අනිවාර්ය වේ
 DocType: Bank Reconciliation Detail,Payment Document,ගෙවීම් ලේඛන
@@ -3283,19 +3288,19 @@
 DocType: Salary Slip,Salary Structure,වැටුප් ව්යුහය
 DocType: Account,Bank,බැංකුව
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ගුවන්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,නිකුත් ද්රව්ය
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,නිකුත් ද්රව්ය
 DocType: Material Request Item,For Warehouse,ගබඩා සඳහා
 DocType: Employee,Offer Date,ඉල්ලුමට දිනය
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,උපුටා දැක්වීම්
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,ඔබ නොබැඳිව වේ. ඔබ ජාලයක් තියෙනවා තෙක් ඔබට රීලෝඩ් කිරීමට නොහැකි වනු ඇත.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,කිසිදු ශිෂ්ය කණ්ඩායම් නිර්මාණය.
 DocType: Purchase Invoice Item,Serial No,අනුක්රමික අංකය
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,මාසික නැවත ගෙවීමේ ප්රමාණය ණය මුදල වඩා වැඩි විය නොහැකි
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince විස්තර පළමු ඇතුලත් කරන්න
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince විස්තර පළමු ඇතුලත් කරන්න
 DocType: Purchase Invoice,Print Language,මුද්රණය භාෂා
 DocType: Salary Slip,Total Working Hours,මුළු වැඩ කරන වේලාවන්
 DocType: Stock Entry,Including items for sub assemblies,උප එකලස්කිරීම් සඳහා ද්රව්ය ඇතුළු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,අගය ධනාත්මක විය යුතුය ඇතුලත් කරන්න
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,සියලු ප්රදේශ
 DocType: Purchase Invoice,Items,අයිතම
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,ශිෂ්ය දැනටමත් ලියාපදිංචි කර ඇත.
@@ -3315,17 +3320,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',ප්රභේද්යයක් සඳහා නු පෙරනිමි ඒකකය &#39;{0}&#39; සැකිල්ල මෙන් ම විය යුතුයි &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,පදනම් කරගත් දින ගණනය
 DocType: Delivery Note Item,From Warehouse,ගබඩාව සිට
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,නිෂ්පාදනය කිරීමට ද්රව්ය පනත් ෙකටුම්පත අයිතම කිසිදු
 DocType: Assessment Plan,Supervisor Name,සුපරීක්ෂක නම
 DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
 DocType: Program Enrollment Course,Program Enrollment Course,වැඩසටහන ඇතුලත් පාඨමාලා
-DocType: Grading Structure,Grading Structure,ශ්රේණිගත කිරීම ව්යුහය
 DocType: Purchase Taxes and Charges,Valuation and Total,වටිනාකම හා මුළු
 DocType: Tax Rule,Shipping City,නැව් නගරය
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,මෙම නිවේදනය රිසිකරණය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,මෙහෙයුම් වලින් මුදල් ප්රවාහ
 DocType: Sales Invoice,Shipping Rule,නැව් පාලනය
@@ -3346,8 +3349,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},ද්රව්ය ලේඛණය අයිතමය {0} සඳහා පවතී පෙරනිමි කිසිදු
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"කරුණාකර ගිය තැන, දිනය පළමු තෝරා"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,විවෘත දිනය දිනය අවසන් පෙර විය යුතුය
 DocType: Leave Control Panel,Carry Forward,ඉදිරියට ගෙන
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,පවත්නා ගනුදෙනු වියදම මධ්යස්ථානය ලෙජර් බවට පරිවර්තනය කළ නොහැකි
 DocType: Department,Days for which Holidays are blocked for this department.,නිවාඩු මෙම දෙපාර්තමේන්තුව සඳහා අවහිර කර ඇත ඒ සඳහා දින.
@@ -3360,7 +3363,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,ලිපි අමුණන්න
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,පසුගිය සන්නිවේදන
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,පසුගිය සන්නිවේදන
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; තක්සේරු හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; තක්සේරු හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},Serialized අයිතමය {0} සඳහා අනු අංක අවශ්ය
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,ඉන්වොයිසි සමග සසදන්න ගෙවීම්
@@ -3376,7 +3379,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),එකතුව (ඒඑම්ටී)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,විනෝදාස්වාදය සහ විනෝද
 DocType: Quality Inspection,Item Serial No,අයිතමය අනු අංකය
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,සේවක වාර්තා නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,සේවක වාර්තා නිර්මාණය
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,මුළු වර්තමාන
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,මුල්ය ප්රකාශන
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,පැය
@@ -3389,10 +3392,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,නොදන්නා
 DocType: Shipping Rule,Shipping Rule Conditions,නැව් පාලනය කොන්දේසි
 DocType: BOM Replace Tool,The new BOM after replacement,වෙනුවට පසු නව ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,", විකුණුම් පේදුරු"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,", විකුණුම් පේදුරු"
 DocType: Payment Entry,Received Amount,ලැබී මුදල
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,මානව සම්පත් පද්ධතිය අනුප්රාප්තිකයා නම් කිරීම කරුණාකර පිහිටුවීම් සේවක&gt; මානව සම්පත් සැකසුම්
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","නියෝගයක් මත මේ වන විටත් ප්රමාණය නොසලකා හරිමින්, සම්පූර්ණ ප්රමාණයක් මේ සඳහා නිර්මාණය"
 DocType: Account,Tax,බද්ද
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,සලකුණු කළ නොහැකි
@@ -3405,9 +3406,9 @@
 DocType: Batch,Source Document Name,මූලාශ්රය ලේඛන නම
 DocType: Batch,Source Document Name,මූලාශ්රය ලේඛන නම
 DocType: Job Opening,Job Title,රැකියා තනතුර
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,පරිශීලකයන් නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,පරිශීලකයන් නිර්මාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,ඇට
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,නිෂ්පාදනය කිරීමට ප්රමාණය 0 ට වඩා වැඩි විය යුතුය.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,නඩත්තු ඇමතුම් සඳහා වාර්තාව පිවිසෙන්න.
 DocType: Stock Entry,Update Rate and Availability,වේගය හා උපකාර ලැබිය හැකි යාවත්කාලීන
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,ප්රතිශතයක් ඔබට අණ ප්රමාණය වැඩි වැඩියෙන් ලබා හෝ ඉදිරිපත් කිරීමට අවසර ඇත. උදාහරණයක් ලෙස: ඔබට ඒකක 100 නියෝග කර තිබේ නම්. ඔබේ දීමනාව 10% ක් නම් ඔබ ඒකක 110 ලබා ගැනීමට අවසර ලැබේ වේ.
@@ -3417,28 +3418,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},වියදම් ගිණුම අයිතමය {0} සඳහා අනිවාර්ය වේ
 DocType: BOM,Website Description,වෙබ් අඩවිය විස්තරය
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,කොටස් ශුද්ධ වෙනස්
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,මිලදී ගැනීම ඉන්වොයිසිය {0} පළමු අවලංගු කරන්න
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","විද්යුත් තැපැල් ලිපිනය අනන්ය විය යුතුය, දැනටමත් {0} සඳහා පවතී"
 DocType: Serial No,AMC Expiry Date,"විදේශ මුදල් හුවමාරු කරන්නන්, කල් ඉකුත්වන දිනය,"
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,රිසිට්පත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,රිසිට්පත
 ,Sales Register,විකුණුම් රෙජිස්ටර්
 DocType: Daily Work Summary Settings Company,Send Emails At,දී විද්යුත් තැපැල් පණිවුඩ යවන්න
 DocType: Quotation,Quotation Lost Reason,උද්ධෘත ලොස්ට් හේතුව
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,ඔබගේ වසම් තෝරා
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ගනුදෙනු සඳහනක් වත් {0} දිනැති {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,සංස්කරණය කරන්න කිසිම දෙයක් නැහැ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,මේ මාසය සඳහා සාරාංශය හා ෙ කටයුතු
 DocType: Customer Group,Customer Group Name,කස්ටමර් සමූහයේ නම
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,තවමත් ගනුදෙනුකරුවන් නැත!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,මුදල් ප්රවාහ ප්රකාශය
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},ණය මුදල {0} උපරිම ණය මුදල ඉක්මවා නො හැකි
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,බලපත්රය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},C-ආකෘතිය {1} සිට මෙම ඉන්වොයිසිය {0} ඉවත් කරන්න
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,ගිණුම අක්රිය ලියන්න ඇතුලත් කරන්න
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,පසුගිය සාමය දිනය
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ගිණුම {0} සමාගම {1} අයත් නොවේ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,පිට පිට අනු ගණන් {0} සැපයුම් සටහන සමග නොගැලපේ
 DocType: Student,Guardian Details,ගාඩියන් විස්තර
 DocType: C-Form,C-Form,C-ආකෘතිය
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,බහු සේවකයන් සඳහා ලකුණ පැමිණීම
@@ -3463,20 +3466,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ෙරෝ {0} # ගිණුම් වර්ගය විය යුතුයි &#39;ස්ථාවර වත්කම්&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,යවන ලද අතරින්
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,විකිණීම සඳහා නාවික මුදල ගණනය කිරීමට නීති රීති
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,මාලාවක් අනිවාර්ය වේ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,මාලාවක් අනිවාර්ය වේ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,මූල්යමය සේවා
 DocType: Student Sibling,Student ID,ශිෂ්ය හැඳුනුම්පතක්
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,වේලාව ලඝු-සටහන් සඳහා ක්රියාකාරකම් වර්ග
 DocType: Tax Rule,Sales,විකුණුම්
 DocType: Stock Entry Detail,Basic Amount,මූලික මුදල
 DocType: Training Event,Exam,විභාග
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},කොටස් අයිතමය {0} සඳහා අවශ්ය පොත් ගබඩාව
 DocType: Leave Allocation,Unused leaves,භාවිතයට නොගත් කොළ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,බිල්පත් රාජ්ය
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,මාරු
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} පක්ෂය ගිණුම {2} සමග සම්බන්ධ නැති
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} පක්ෂය ගිණුම {2} සමග සම්බන්ධ නැති
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(උප-එකලස්කිරීම් ඇතුළුව) පුපුරා ද්රව්ය ලේඛණය බෝගයන්ගේ
 DocType: Authorization Rule,Applicable To (Employee),(සේවක) කිරීම සඳහා අදාළ
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,නියමිත දිනය අනිවාර්ය වේ
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute {0} 0 වෙන්න බෑ සඳහා වර්ධකය
@@ -3487,13 +3490,13 @@
 ,Inactive Customers,අක්රීය ගනුදෙනුකරුවන්
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,මිලදී ගැනීම ලැබීම්
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,කොහොමද මිල නියම පාලනය ආලේප කරයි?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,කොහොමද මිල නියම පාලනය ආලේප කරයි?
 DocType: Stock Entry,Delivery Note No,සැපයුම් සටහන නොමැත
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","පරීක්ෂා නම්, එකම මිලට ගැනීම අවසන් අමුද්රව්ය සඳහා ද්රව්යමය ඉල්ලීම් ද්රව්ය ඉල්ලීම් ඇතුලත් කෙරෙනු ඇත. එසේ නැත්නම්, මව් භාණ්ඩ සඳහා ද්රව්ය ඉල්ලීම් නිර්මාණය කරනු ඇත"
 DocType: Cheque Print Template,Message to show,පෙන්වන්න පණිවුඩය
 DocType: Company,Retail,සිල්ලර
 DocType: Attendance,Absent,නැති කල
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,නිෂ්පාදන පැකේජය
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,නිෂ්පාදන පැකේජය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ෙරෝ {0}: වලංගු නොවන සමුද්දේශ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,බදු හා ගාස්තු මිලදී සැකිල්ල
 DocType: Upload Attendance,Download Template,බාගත සැකිල්ල
@@ -3503,10 +3506,10 @@
 DocType: Payment Entry,Account Paid From,සිට ගෙවුම් ගිණුම
 DocType: Purchase Order Item Supplied,Raw Material Item Code,අමු ද්රව්ය අයිතමය සංග්රහයේ
 DocType: Journal Entry,Write Off Based On,පදනම් කරගත් දින Off ලියන්න
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ඊයම් කරන්න
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ඊයම් කරන්න
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,මුද්රිත හා ලිපි ද්රව්ය
 DocType: Stock Settings,Show Barcode Field,Barcode ක්ෂේත්ර පෙන්වන්න
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,සැපයුම්කරු විද්යුත් තැපැල් පණිවුඩ යවන්න
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","වැටුප් දැනටමත් {0} අතර කාල සීමාව සඳහා සකස් සහ {1}, අයදුම්පත් කාලය Leave මෙම දින පරාසයක් අතර විය නොහැක."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,එය අනු අංකය සඳහා ස්ථාපන සටහන්
 DocType: Guardian Interest,Guardian Interest,ගාඩියන් පොලී
@@ -3519,6 +3522,7 @@
 DocType: Offer Letter,Awaiting Response,බලා සිටින ප්රතිචාර
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,ඉහත
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},වලංගු නොවන විශේෂණය {0} {1}
+DocType: Supplier,Mention if non-standard payable account,සම්මත නොවන ගෙවිය යුතු ගිණුම් නම් සඳහන්
 DocType: Salary Slip,Earning & Deduction,උපයන සහ අඩු කිරීම්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,විකල්ප. මෙම සිටුවම විවිධ ගනුදෙනු පෙරහන් කිරීමට භාවිතා කරනු ඇත.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ඍණ තක්සේරු අනුපාත ඉඩ නැත
@@ -3534,10 +3538,9 @@
 DocType: Production Order Item,Production Order Item,නිෂ්පාදන න්යාය අයිතමය
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,වාර්තා සොයාගත්තේ නැත
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,කටුගා දමා වත්කම් පිරිවැය
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,අර්ධ වශයෙන් ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: පිරිවැය මධ්යස්ථානය අයිතමය {2} සඳහා අනිවාර්ය වේ
 DocType: Vehicle,Policy No,ප්රතිපත්ති නැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,නිෂ්පාදන පැකේජය සිට අයිතම ලබා ගන්න
 DocType: Asset,Straight Line,සරල රේඛාව
 DocType: Project User,Project User,ව්යාපෘති පරිශීලක
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,බෙදුණු
@@ -3555,7 +3558,7 @@
 DocType: Program Enrollment Tool,Get Students From,සිට ශිෂ්ය ලබා ගන්න
 DocType: Hub Settings,Seller Country,විකුණන්නා රට
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,වෙබ් අඩවිය මත අයිතම ප්රකාශයට පත් කරනු ලබයි
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,කාණ්ඩ සමූහය ඔබේ සිසුන්
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,කාණ්ඩ සමූහය ඔබේ සිසුන්
 DocType: Authorization Rule,Authorization Rule,බලය පැවරීමේ පාලනය
 DocType: Sales Invoice,Terms and Conditions Details,නියමයන් හා කොන්දේසි විස්තර
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,පිරිවිතර
@@ -3608,14 +3611,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් දිනය"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},ගිණුම {0}: මාපිය ගිණුමක් {1} සමාගම අයිති නැත: {2}
 DocType: Program Enrollment Tool,Student Applicants,ශිෂ්ය අයදුම්කරුවන්
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,මෙම සමාගම අදාළ සියලු ගනුදෙනු සාර්ථකව මකා!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,මෙම සමාගම අදාළ සියලු ගනුදෙනු සාර්ථකව මකා!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,දිනය මත ලෙස
 DocType: Appraisal,HR,මානව සම්පත්
 DocType: Program Enrollment,Enrollment Date,සිසුන් බඳවා ගැනීම දිනය
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,පරිවාස
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,වැටුප් සංරචක
 DocType: Program Enrollment Tool,New Academic Year,නව අධ්යයන වර්ෂය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,ආපසු / ක්රෙඩිට් සටහන
 DocType: Stock Settings,Auto insert Price List rate if missing,වාහන ළ මිල ලැයිස්තුව අනුපාතය අතුරුදහන් නම්
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,මුළු ු ර්
 DocType: Production Order Item,Transferred Qty,මාරු යවන ලද
@@ -3635,7 +3638,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","අනියම්, ලෙඩ ආදිය කොළ වර්ගය"
 DocType: Email Digest,Send regular summary reports via Email.,විද්යුත් හරහා නිතිපතා සාරාංශයක් වාර්තා යවන්න.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},වියදම් හිමිකම් වර්ගය {0} පැහැර ගිණුමක් සකස් කරන්න
 DocType: Assessment Result,Student Name,ශිෂ්ය නම
 DocType: Brand,Item Manager,අයිතමය කළමනාකරු
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,පඩි නඩි ගෙවිය යුතු
@@ -3656,6 +3659,7 @@
 ,Sales Funnel,විකුණුම් පොම්ප
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,කෙටි යෙදුම් අනිවාර්ය වේ
 DocType: Project,Task Progress,කාර්ය සාධක ප්රගති
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,කරත්ත
 ,Qty to Transfer,ස්ථාන මාරු කිරීමට යවන ලද
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ආදර්ශ හෝ ගනුදෙනුකරුවන් වෙත උපුටා දක්වයි.
 DocType: Stock Settings,Role Allowed to edit frozen stock,ශීත කළ කොටස් සංස්කරණය කිරීමට අවසර කාර්යභාරය
@@ -3683,13 +3687,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,අයිතමය ප්රඥාවන්ත බදු විස්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ආයතනය කෙටි යෙදුම්
 ,Item-wise Price List Rate,අයිතමය ප්රඥාවන්ත මිල ලැයිස්තුව අනුපාතිකය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,සැපයුම්කරු උද්ධෘත
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,සැපයුම්කරු උද්ධෘත
 DocType: Quotation,In Words will be visible once you save the Quotation.,ඔබ උද්ධෘත බේරා වරක් වචන දෘශ්යමාන වනු ඇත.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},ප්රමාණය ({0}) පේළියේ {1} තුළ භාගය විය නොහැකි
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ගාස්තු එකතු
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Barcode {0} දැනටමත් අයිතමය {1} භාවිතා
 DocType: Lead,Add to calendar on this date,මෙම දිනට දින දර්ශනය එක් කරන්න
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,නාවික වියදම් එකතු කිරීම සඳහා වන නීති.
 DocType: Item,Opening Stock,ආරම්භක තොගය
@@ -3706,8 +3710,8 @@
 Updated via 'Time Log'",&#39;කාලය පිළිබඳ ලඝු-සටහන&#39; හරහා යාවත්කාලීන කිරීම ව්යවස්ථා සංග්රහයේ
 DocType: Customer,From Lead,ඊයම් සිට
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,නිෂ්පාදනය සඳහා නිකුත් නියෝග.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,රාජ්ය මූල්ය වර්ෂය තෝරන්න ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS සටහන් කිරීමට අවශ්ය POS නරඹන්න
 DocType: Program Enrollment Tool,Enroll Students,ශිෂ්ය ලියාපදිංචි
 DocType: Hub Settings,Name Token,නම ටෝකනය
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,සම්මත විකිණීම
@@ -3718,7 +3722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} විකුණුම් ඉන්වොයිසිය {1} එරෙහිව
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ව්යාපෘතියේ නම
-DocType: Supplier,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
+DocType: Customer,Mention if non-standard receivable account,සම්මත නොවන ලැබිය නම් සඳහන්
 DocType: Journal Entry Account,If Income or Expense,ආදායම් හෝ වියදම් නම්
 DocType: Production Order,Required Items,අවශ්ය අයිතම
 DocType: Stock Ledger Entry,Stock Value Difference,කොටස් අගය වෙනස
@@ -3739,7 +3743,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,මෙම වෙළෙඳ පුද්ගලයෙක් සඳහා ඉලක්ක අයිතමය සමූහ ප්රඥාවන්ත Set.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[දින] වඩා පැරණි කොටස් කැටි
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ෙරෝ # {0}: වත්කම් ස්ථාවර වත්කම් මිලදී ගැනීම / විකිණීම සඳහා අනිවාර්ය වේ
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","මිල නියම කිරීම නීති දෙකක් හෝ ඊට වැඩි ඉහත තත්වයන් මත පදනම්ව දක්නට ලැබේ නම්, ප්රමුඛ ආලේප කරයි. අතර පෙරනිමි අගය ශුන්ය (හිස්ව තබන්න) වේ ප්රමුඛ 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.,පහත සඳහන් භාවිතා කරන්නන් අවහිර දින නිවාඩු ඉල්ලුම් අනුමත කිරීමට ඉඩ දෙන්න.
@@ -3765,7 +3769,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,අයිතමය {0} නොසලකා එය කොටස් භාණ්ඩයක් නොවන නිසා
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","යම් ගනුදෙනුවක දී, මිල නියම කිරීම පාලනය අදාළ නොවේ කිරීම සඳහා, සියලු අදාල මිල ගණන් රීති අක්රිය කළ යුතුය."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","යම් ගනුදෙනුවක දී, මිල නියම කිරීම පාලනය අදාළ නොවේ කිරීම සඳහා, සියලු අදාල මිල ගණන් රීති අක්රිය කළ යුතුය."
 DocType: Assessment Group,Parent Assessment Group,මව් තක්සේරු කණ්ඩායම
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,රැකියා
 ,Sales Order Trends,විකුණුම් සාමය ප්රවණතා
@@ -3776,7 +3780,7 @@
 DocType: Stock Entry Detail,Additional Cost,අමතර පිරිවැය
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,මූල්ය වසර අවසාන දිනය
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","වවුචරයක් වර්ගීකරණය නම්, වවුචරයක් නොමැත මත පදනම් පෙරීමට නොහැකි"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,සැපයුම්කරු උද්ධෘත කරන්න
 DocType: Quality Inspection,Incoming,ලැබෙන
 DocType: BOM,Materials Required (Exploded),අවශ්ය ද්රව්ය (පුපුරා)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","ඔබ හැර, ඔබේ ආයතනය සඳහා භාවිතා කරන්නන් එකතු කරන්න"
@@ -3804,6 +3808,7 @@
 DocType: Employee,History In Company,සමාගම දී ඉතිහාසය
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,පුවත් ලිපි
 DocType: Stock Ledger Entry,Stock Ledger Entry,කොටස් ලේජර සටහන්
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,පාරිභෝගික&gt; කස්ටමර් සමූහයේ&gt; දේශසීමාවේ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,එම අයිතමය වාර කිහිපයක් ඇතුළු කර ඇත
 DocType: Department,Leave Block List,වාරණ ලැයිස්තුව තබන්න
 DocType: Sales Invoice,Tax ID,බදු හැඳුනුම්පත
@@ -3813,7 +3818,7 @@
 DocType: Customer,Sales Partner and Commission,විකුණුම් සහකරු හා කොමිෂන් සභාව
 DocType: Employee Loan,Rate of Interest (%) / Year,පොලී අනුපාතය (%) / අවුරුද්ද
 ,Project Quantity,ව්යාපෘති ප්රමාණය
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",මුළු {0} සියළුම ශුන්ය වේ ඔබ &#39;මත පදනම් වූ ගාස්තු බෙදා හරින්න&#39; වෙනස් කළ යුතු ය විය හැකිය
 DocType: Opportunity,To Discuss,සාකච්චා කිරීමට
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} මෙම ගනුදෙනුව සම්පූර්ණ කර ගැනීම සඳහා, {2} අවශ්ය {1} ඒකක."
 DocType: Loan Type,Rate of Interest (%) Yearly,පොලී අනුපාතය (%) වාර්ෂික
@@ -3828,7 +3833,7 @@
 DocType: Purchase Invoice,Return,ආපසු
 DocType: Production Order Operation,Production Order Operation,නිෂ්පාදන න්යාය මෙහෙයුම
 DocType: Pricing Rule,Disable,අක්රීය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ගෙවීම් ක්රමය ගෙවීම් කිරීමට අවශ්ය වේ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ගෙවීම් ක්රමය ගෙවීම් කිරීමට අවශ්ය වේ
 DocType: Project Task,Pending Review,විභාග සමාලෝචන
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","එය දැනටමත් {1} පරිදි වත්කම්, {0} කටුගා දමා ගත නොහැකි"
 DocType: Task,Total Expense Claim (via Expense Claim),(වියදම් හිමිකම් හරහා) මුළු වියදම් හිමිකම්
@@ -3836,11 +3841,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,මාක් නැති කල
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ෙරෝ {0}: සිටිමට # ව්යවහාර මුදල් {1} තෝරාගත් මුදල් {2} සමාන විය යුතුයි
 DocType: Journal Entry Account,Exchange Rate,විනිමය අනුපාතය
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,විකුණුම් සාමය {0} ඉදිරිපත් කර නැත
 DocType: Homepage,Tag Line,ටැග ලයින්
 DocType: Fee Component,Fee Component,ගාස්තු සංරචක
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,රථ වාහන කළමනාකරණය
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,සිට අයිතම එකතු කරන්න
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,සිට අයිතම එකතු කරන්න
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},පොත් ගබඩාව {0}: මාපිය ගිණුමක් {1} සමාගම {2} වෙත bolong නැත
 DocType: Cheque Print Template,Regular,සාමාන්ය
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,සියලු තක්සේරු නිර්ණායක මුළු Weightage 100% ක් විය යුතුය
@@ -3853,7 +3858,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,පොත් ගබඩාව {0} නොපවතියි
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub සඳහා ලියාපදිංචි
 DocType: Monthly Distribution,Monthly Distribution Percentages,මාසික බෙදාහැරීම් ප්රතිශත
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,තෝරාගත් අයිතමය කණ්ඩායම ලබා ගත නොහැකි
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","{1} {2} සඳහා ගිණුම් සටහන් කරන්න අවශ අයිතමය {0}, තක්සේරු අනුපාතය සොයාගත නොහැකි විය. මෙම අයිතමය {1} නිදසුන් අයිතමයක් ලෙස ගනුදෙනු කරන්නේ නම්, එම {1} අයිතමය වගුවේ බව සඳහන් කරන්න. එසේ නැත්නම්, අයිතමය වාර්තාගත තක්සේරු අනුපාතය අයිතමය සඳහා ලැබෙන කොටස් ගනුදෙනුව නිර්මාණය කරන්න හෝ සඳහන්, පසුව submiting / මෙම ප්රවේශය අවලංගු කරන්න"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,මෙම බෙදීම සටහන එරෙහිව පවත්වන ද්රව්ය%
 DocType: Project,Customer Details,පාරිභෝගික විස්තර
@@ -3862,15 +3867,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ලබන්නා අංක සඳහා url එක පරාමිතිය ඇතුලත් කරන්න
 DocType: Payment Entry,Paid Amount,ු ර්
 DocType: Assessment Plan,Supervisor,සුපරීක්ෂක
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,සමඟ අමුත්තන්
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,සමඟ අමුත්තන්
 ,Available Stock for Packing Items,ඇසුරුම් අයිතම සඳහා ලබා ගත හැකි කොටස්
 DocType: Item Variant,Item Variant,අයිතමය ප්රභේද්යයක්
 DocType: Assessment Result Tool,Assessment Result Tool,තක්සේරු ප්රතිඵල මෙවලම
 DocType: BOM Scrap Item,BOM Scrap Item,ද්රව්ය ලේඛණය ලාංකික අයිතමය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,ඉදිරිපත් නියෝග ඉවත් කල නොහැක
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,තත්ත්ව කළමනාකරණ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,අයිතමය {0} අක්රීය කොට ඇත
 DocType: Employee Loan,Repay Fixed Amount per Period,කාලය අනුව ස්ථාවර මුදල ආපසු ගෙවීම
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},විෂය {0} සඳහා ප්රමාණය ඇතුලත් කරන්න
 DocType: Employee External Work History,Employee External Work History,සේවක විදේශ රැකියා ඉතිහාසය
@@ -3897,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,ශිෂ්ය විද්යුත් හැඳුනුම්පත
 DocType: Employee,Notice (days),නිවේදනය (දින)
 DocType: Tax Rule,Sales Tax Template,විකුණුම් බදු සැකිල්ල
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ඉන්වොයිස් බේරා ගැනීමට භාණ්ඩ තෝරන්න
 DocType: Employee,Encashment Date,හැකි ඥාතීන් නොවන දිනය
 DocType: Training Event,Internet,අන්තර්ජාල
 DocType: Account,Stock Adjustment,කොටස් ගැලපුම්
@@ -3921,7 +3926,7 @@
 DocType: Item Variant Attribute,Attribute,ගති ලක්ෂණය
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,පරාසයක / සිට සඳහන් කරන්න
 DocType: Serial No,Under AMC,විදේශ මුදල් හුවමාරු කරන්නන් යටතේ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,අයිතමය තක්සේරු අනුපාතය ගොඩ බස්වන ලදී පිරිවැය වවුචරය ප්රමාණය සලකා දැන් සිදු වේ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,අයිතමය තක්සේරු අනුපාතය ගොඩ බස්වන ලදී පිරිවැය වවුචරය ප්රමාණය සලකා දැන් සිදු වේ
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ගනුදෙනු විකිණීම සඳහා පෙරනිමි සැකසුම්.
 DocType: Guardian,Guardian Of ,ආරක්ෂකයා
 DocType: Grading Scale Interval,Threshold,සීමකය
@@ -3931,6 +3936,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ඩෙබිට් සටහන නිකුත් කර ඇත්තේ
 DocType: Production Order,Warehouses,බඞු ගබඞාව
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} වත්කම් මාරු කල නොහැක
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,මෙම අයිතමය {0} (සැකිල්ල) ක ප්රභේද්යයක් වේ.
 DocType: Workstation,per hour,පැයකට
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,මිලදී ගැනීම
 DocType: Announcement,Announcement,නිවේදනය
@@ -3946,8 +3952,8 @@
 DocType: Account,Receivable,ලැබිය යුතු
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ෙරෝ # {0}: මිලදී ගැනීමේ නියෝගයක් දැනටමත් පවතී ලෙස සැපයුම්කරුවන් වෙනස් කිරීමට අවසර නැත
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,සකස් ණය සීමා ඉක්මවා යන ගනුදෙනු ඉදිරිපත් කිරීමට අවසර තිබේ එම භූමිකාව.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,නිෂ්පාදනය කිරීමට අයිතම තෝරන්න
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","මාස්ටර් දත්ත සමමුහුර්ත, එය යම් කාලයක් ගත විය හැකියි"
 DocType: Item,Material Issue,ද්රව්ය නිකුත්
 DocType: Hub Settings,Seller Description,විකුණන්නා විස්තරය
 DocType: Employee Education,Qualification,සුදුසුකම්
@@ -3959,7 +3965,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,නියෝග
 DocType: Salary Detail,Component,සංරචකය
 DocType: Assessment Criteria,Assessment Criteria Group,තක්සේරු නිර්ණායක සමූහ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},සමුච්චිත ක්ෂය විවෘත {0} සමාන වඩා අඩු විය යුතුය
 DocType: Warehouse,Warehouse Name,පොත් ගබඩාව නම
 DocType: Naming Series,Select Transaction,ගනුදෙනු තෝරන්න
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,කාර්යභාරය අනුමත හෝ පරිශීලක අනුමත ඇතුලත් කරන්න
@@ -3972,7 +3978,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,අවලංගු කළ නොහැකි ඉදිරිපත් කොටස් Entry {0} පවතින බැවිනි
 DocType: Employee Loan,Disbursement Date,ටහිර දිනය
 DocType: Vehicle,Vehicle,වාහන
 DocType: Purchase Invoice,In Words,වචන ගැන
@@ -3987,14 +3993,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,විපක්ෂ / ඊයම්%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,වත්කම් අගය පහත හා තුලනය
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},"මුදල {0} {1} {3} කර ගැනීම සඳහා, {2} මාරු"
 DocType: Sales Invoice,Get Advances Received,අත්තිකාරම් ලද කරන්න
 DocType: Email Digest,Add/Remove Recipients,එකතු කරන්න / ලබන්නන් ඉවත් කරන්න
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},නතර නිෂ්පාදන න්යාය {0} එරෙහිව ගනුදෙනු අවසර නැත
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","මෙම මුදල් වර්ෂය පෙරනිමි ලෙස සැකසීම සඳහා, &#39;&#39; පෙරනිමි ලෙස සකසන්න &#39;මත ක්ලික් කරන්න"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,එක්වන්න
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,හිඟය යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,අයිතමය ප්රභේද්යයක් {0} එම ලක්ෂණ සහිත පවතී
 DocType: Employee Loan,Repay from Salary,වැටුප් සිට ආපසු ගෙවීම
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},මුදල සඳහා {0} {1} එරෙහිව ගෙවීම් ඉල්ලා {2}
@@ -4012,7 +4018,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,තක්සේරු ප්රතිඵල විස්තර
 DocType: Employee Education,Employee Education,සේවක අධ්යාපන
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,අයිතමය පිරිසක් වගුව සොයා ගෙන අනුපිටපත් අයිතමය පිරිසක්
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,එය අයිතමය විස්තර බැරිතැන අවශ්ය වේ.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} දැනටමත් ලැබී ඇත
@@ -4021,7 +4027,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","පොත් ගබඩාව {0} ඕනෑම ගිණුමක් සම්බන්ධ නොවේ, කරුණාකර නිර්මාණ / අනුරූප (වත්කම්) ගිණුම් ගබඩාව සඳහා සබැඳී නොමැත."
 DocType: Purchase Invoice,Recurring Id,පුනරාවර්තනය අංකය
 DocType: Customer,Sales Team Details,විකුණුම් කණ්ඩායම විස්තර
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ස්ථිර මකන්නද?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,ස්ථිර මකන්නද?
 DocType: Expense Claim,Total Claimed Amount,මුළු හිමිකම් කියන අය මුදල
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,විකිණීම සඳහා ලබාදිය හැකි අවස්ථා.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},වලංගු නොවන {0}
@@ -4032,13 +4038,14 @@
 DocType: Warehouse,PIN,PIN අංකය
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,සැකසුම ERPNext ඔබේ පාසල්
 DocType: Sales Invoice,Base Change Amount (Company Currency),මූලික වෙනස් ප්රමාණය (සමාගම ව්යවහාර මුදල්)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,පහත සඳහන් ගබඩා වෙනුවෙන් කිසිදු වගකීමක් සටහන් ඇතුළත් කිරීම්
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,පසුගිය සාමය මුදල
+DocType: Task,Is Milestone,සංධිස්ථානයක් වන
 DocType: Daily Work Summary,Email Sent To,ඊ-තැපැල් වෙත යවන
 DocType: Budget,Warn,බිය ගන්වා අනතුරු අඟවනු
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","වෙනත් ඕනෑම ප්රකාශ, වාර්තාවන් යා යුතු බව විශේෂයෙන් සඳහන් කළ යුතු උත්සාහයක්."
@@ -4059,7 +4066,7 @@
 DocType: Item Attribute Value,Attribute Value,ගති ලක්ෂණය අගය
 ,Itemwise Recommended Reorder Level,Itemwise සීරුමාරු කිරීමේ පෙළ නිර්දේශිත
 DocType: Salary Detail,Salary Detail,වැටුප් විස්තර
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,කරුණාකර පළමු {0} තෝරා
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,කරුණාකර පළමු {0} තෝරා
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,කණ්ඩායම {0} අයිතමය ක {1} කල් ඉකුත් වී ඇත.
 DocType: Sales Invoice,Commission,කොමිසම
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,නිෂ්පාදන සඳහා කාලය පත්රය.
@@ -4071,41 +4078,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,&#39;&#39; කණ්ඩරාව කොටස් පැරණි Than` දින% d ට වඩා කුඩා විය යුතුය.
 DocType: Tax Rule,Purchase Tax Template,මිලදී ගැනීම බදු සැකිල්ල
 ,Project wise Stock Tracking,ව්යාපෘති ප්රඥාවන්ත කොටස් ට්රැකින්
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},{0} එරෙහිව නඩත්තු උපෙල්ඛනෙය් {0} පවතී
 DocType: Stock Entry Detail,Actual Qty (at source/target),සැබෑ යවන ලද (මූල / ඉලක්ක දී)
 DocType: Item Customer Detail,Ref Code,ref සංග්රහයේ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,සේවක වාර්තා.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,ඊළඟට ක්ෂය දිනය සකස් කරන්න
 DocType: HR Settings,Payroll Settings,වැටුප් සැකසුම්
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,නොවන සම්බන්ධ ඉන්වොයිසි හා ගෙවීම් නොගැලපේ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ඇනවුම කරන්න
 DocType: Email Digest,New Purchase Orders,නව මිලදී ගැනීමේ නියෝග
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,මූල දෙමාපියන් වියදම් මධ්යස්ථානය ලබා ගත නොහැකි
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,වෙළඳ නාමය තෝරන්න ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,වෙළඳ නාමය තෝරන්න ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,මත ලෙස සමුච්චිත ක්ෂය
 DocType: Sales Invoice,C-Form Applicable,C-ආකෘතිය අදාල
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"වේලාව මෙහෙයුම මෙහෙයුම {0} සඳහා, 0 ට වඩා වැඩි විය යුතුය"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,පොත් ගබඩාව අනිවාර්ය වේ
 DocType: Supplier,Address and Contacts,ලිපිනය සහ අප අමතන්න
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM පරිවර්තනය විස්තර
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px (ඌ) විසින් වෙබ් හිතකාමී 900px (w) එය තබා ගන්න
 DocType: Program,Program Abbreviation,වැඩසටහන කෙටි යෙදුම්
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,නිෂ්පාදන සාමය සඳහා අයිතමය සැකිල්ල එරෙහිව මතු කළ හැකි නොවේ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,නිෂ්පාදන සාමය සඳහා අයිතමය සැකිල්ල එරෙහිව මතු කළ හැකි නොවේ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ගාස්තු එක් එක් අයිතමය එරෙහිව මිලදී ගැනීම රිසිට්පත යාවත්කාලීන වේ
 DocType: Warranty Claim,Resolved By,විසින් විසඳා
 DocType: Bank Guarantee,Start Date,ආරම්භක දිනය
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,කාලයක් සඳහා කොළ වෙන් කරමි.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,වැරදි ලෙස එළි පෙහෙළි චෙක්පත් සහ තැන්පතු
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ගිණුම {0}: ඔබ මව් ගිණුම ලෙස ම යෙදිය නොහැක
 DocType: Purchase Invoice Item,Price List Rate,මිල ලැයිස්තුව අනුපාතිකය
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,පාරිභෝගික මිල කැඳවීම් නිර්මාණය
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,පාරිභෝගික මිල කැඳවීම් නිර්මාණය
 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 +38,Bill of Materials (BOM),ද්රව්ය පනත් කෙටුම්පත (ලේඛණය)
 DocType: Item,Average time taken by the supplier to deliver,ඉදිරිපත් කිරීමට සැපයුම්කරු විසින් ගන්නා සාමාන්ය කාලය
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,තක්සේරු ප්රතිඵල
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,පැය
 DocType: Project,Expected Start Date,අපේක්ෂිත ඇරඹුම් දිනය
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,චෝදනා අයිතමය අදාළ නොවේ නම් අයිතමය ඉවත් කරන්න
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ගනුදෙනු මුදල් ගෙවීම් ගේට්වේ මුදල් ලෙස සමාන විය යුතුයි
 DocType: Payment Entry,Receive,ලබා
@@ -4116,19 +4122,19 @@
 DocType: Workstation,Operating Costs,මෙහෙයුම් පිරිවැය
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,සමුච්චිත මාසික අයවැය කටයුතු කර ඉක්මවා
 DocType: Purchase Invoice,Submit on creation,නිර්මානය කිරීම මත ඉදිරිපත්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},{0} {1} විය යුතුය සඳහා ව්යවහාර මුදල්
 DocType: Asset,Disposal Date,බැහැර කිරීමේ දිනය
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","විද්යුත් තැපැල් පණිවුඩ ඔවුන් නිවාඩු නැති නම්, ලබා දී ඇති පැයක දී සමාගමේ සියළු ක්රියාකාරී සේවක වෙත යවනු ලැබේ. ප්රතිචාර සාරාංශය මධ්යම රාත්රියේ යවනු ඇත."
 DocType: Employee Leave Approver,Employee Leave Approver,සේවක නිවාඩු Approver
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ෙරෝ {0}: ඇන් සීරුමාරු කිරීමේ ප්රවේශය දැනටමත් මෙම ගබඩා සංකීර්ණය {1} සඳහා පවතී
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","උද්ධෘත කර ඇති නිසා, අහිමි ලෙස ප්රකාශයට පත් කළ නොහැක."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,පුහුණු ඔබෙන් ලැබෙන ප්රයෝජනාත්මක ප්රතිචාරය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,නිෂ්පාදන න්යාය {0} ඉදිරිපත් කළ යුතුය
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},කරුණාකර විෂය {0} සඳහා ආරම්භය දිනය හා අවසාන දිනය තෝරා
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},කරුණාකර විෂය {0} සඳහා ආරම්භය දිනය හා අවසාන දිනය තෝරා
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},පාඨමාලා පේළිය {0} අනිවාර්ය වේ
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,මේ දක්වා දින සිට පෙර විය නොහැකි
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ එක් කරන්න සංස්කරණය කරන්න මිල ගණන්
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Batch,Parent Batch,මව් කණ්ඩායම
 DocType: Cheque Print Template,Cheque Print Template,"එම ගාස්තුව මුදලින්, ෙචක්පතකින් මුද්රණය සැකිල්ල"
@@ -4142,7 +4148,7 @@
 ,Ordered Items To Be Delivered,නියෝග අයිතම බාර දීමට
 DocType: Account,Income,ආදායම්
 DocType: Industry Type,Industry Type,කර්මාන්ත වර්ගය
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,මොකක්හරි වැරද්දක් වෙලා!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,මොකක්හරි වැරද්දක් වෙලා!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,"අවවාදයයි: අවසරය, අයදුම් පහත වාරණ දින අඩංගු"
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,විකුණුම් ඉන්වොයිසිය {0} දැනටමත් ඉදිරිපත් කර ඇති
 DocType: Assessment Result Detail,Score,ලකුණු
@@ -4173,17 +4179,17 @@
 DocType: Item,Variant Based On,ප්රභේද්යයක් පදනම් මත
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},පවරා මුළු weightage 100% ක් විය යුතුය. එය {0} වේ
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ඔබේ සැපයුම්කරුවන්
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,විකුණුම් සාමය සෑදී ලෙස ලොස්ට් ලෙස සිටුවම් කල නොහැක.
 DocType: Request for Quotation Item,Supplier Part No,සැපයුම්කරු අඩ නොමැත
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,සිට ලැබුණු
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',කාණ්ඩය තක්සේරු &#39;හෝ&#39; Vaulation හා පූර්ණ &#39;සඳහා වන විට අඩු කර නොහැකි
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,සිට ලැබුණු
 DocType: Lead,Converted,පරිවර්තනය කරන
 DocType: Item,Has Serial No,අනු අංකය ඇත
 DocType: Employee,Date of Issue,නිකුත් කරන දිනය
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: {0} {1} සඳහා සිට
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: {0} {1} සඳහා සිට
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ෙරෝ # {0}: අයිතමය සඳහා සැපයුම්කරු සකසන්න {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ෙරෝ {0}: පැය අගය බිංදුවට වඩා වැඩි විය යුතුය.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,වෙබ් අඩවිය රූප {0} අයිතමය අනුයුක්ත {1} සොයාගත නොහැකි
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,එම වෙබ් අඩවිය බහු කණ්ඩායම් ෙමම අයිතමය ලැයිස්තුගත කරන්න.
@@ -4192,20 +4198,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,ඔබ ශීත කළ අගය නියම කිරීමට අවසර නැත
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled අයැදුම්පත් ලබා ගන්න
 DocType: Payment Reconciliation,From Invoice Date,ඉන්වොයිසිය දිනය
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,බිල්පත් මුදල් එක්කෝ පෙරනිමි comapany ගේ මුදල් පක්ෂයක් හෝ ගිණුමක් මුදල සමාන විය යුතුයි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,හැකි ඥාතීන් නොවන තබන්න
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,එය කරන්නේ කුමක්ද?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ගබඩා කිරීමට
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,සියලු ශිෂ්ය ප්රවේශ
 ,Average Commission Rate,සාමාන්ය කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;තිබෙනවාද අනු අංකය&#39; නොවන කොටස් අයිතමය සඳහා &#39;ඔව්&#39; විය නොහැකිය
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,පැමිණීම අනාගත දිනයන් සඳහා සලකුණු කල නොහැක
 DocType: Pricing Rule,Pricing Rule Help,මිල ගණන් පාලනය උදවු
 DocType: School House,House Name,හවුස් නම
 DocType: Purchase Taxes and Charges,Account Head,ගිණුම් අංශයේ ප්රධානී
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,භාණ්ඩ ගොඩ බස්වන ලදී පිරිවැය ගණනය කිරීමට අතිරේක වියදම් යාවත්කාලීන
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,විදුලි
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ඔබේ පරිශීලකයන් ලෙස ඔබගේ සංවිධානය සෙසු එකතු කරන්න. ඔබ ද අප අමතන්න ඔවුන් එකතු කිරීම මඟින් ඔබගේ භාව්ත කිරීමට ගනුදෙනුකරුවන් ආරාධනා එකතු කල හැක
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,ඔබේ පරිශීලකයන් ලෙස ඔබගේ සංවිධානය සෙසු එකතු කරන්න. ඔබ ද අප අමතන්න ඔවුන් එකතු කිරීම මඟින් ඔබගේ භාව්ත කිරීමට ගනුදෙනුකරුවන් ආරාධනා එකතු කල හැක
 DocType: Stock Entry,Total Value Difference (Out - In),(- දී අතරින්) මුළු අගය වෙනස
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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} සඳහා පරිශීලක අනන්යාංකය පිහිටුවා නැත
@@ -4214,7 +4220,7 @@
 DocType: Item,Customer Code,පාරිභෝගික සංග්රහයේ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0} සඳහා උපන් දිනය මතක්
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,පසුගිය සාමය නිසා දින
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ගිණුමක් සඳහා ඩෙබිට් වූ ශේෂ පත්රය ගිණුමක් විය යුතුය
 DocType: Buying Settings,Naming Series,ශ්රේණි අනුප්රාප්තිකයා නම් කිරීම
 DocType: Leave Block List,Leave Block List Name,"අවසරය, වාරණ ලැයිස්තුව නම"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,රක්ෂණ අරඹන්න දිනය රක්ෂණ අවසාන දිනය වඩා අඩු විය යුතුය
@@ -4229,9 +4235,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},සේවක වැටුප් පුරවා {0} දැනටමත් කාල පත්රය {1} සඳහා නිර්මාණය
 DocType: Vehicle Log,Odometer,Odometer
 DocType: Sales Order Item,Ordered Qty,නියෝග යවන ලද
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,අයිතමය {0} අක්රීය කර ඇත
 DocType: Stock Settings,Stock Frozen Upto,කොටස් ශීත කළ තුරුත්
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,ද්රව්ය ලේඛණය ඕනෑම කොටස් අයිතමය අඩංගු නොවේ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},සිට හා කාලය {0} නැවත නැවත අනිවාර්ය දින සඳහා කාලය
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ව්යාපෘති ක්රියාකාරකම් / කටයුත්තක්.
 DocType: Vehicle Log,Refuelling Details,Refuelling විස්තර
@@ -4241,8 +4247,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,පසුගිය මිලදී අනුපාතය සොයාගත නොහැකි
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Off ලියන්න ප්රමාණය (සමාගම ව්යවහාර මුදල්)
 DocType: Sales Invoice Timesheet,Billing Hours,බිල්පත් පැය
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} සොයාගත නොහැකි සඳහා පෙරනිමි ද්රව්ය ලේඛණය
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ෙරෝ # {0}: කරුණාකර සකස් මොහොත ප්රමාණය
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,භාණ්ඩ ඒවා මෙහි එකතු කරන්න තට්ටු කරන්න
 DocType: Fees,Program Enrollment,වැඩසටහන ඇතුළත්
 DocType: Landed Cost Voucher,Landed Cost Voucher,වියදම වවුචරයක් ගොඩ බස්වන ලදී
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},කරුණාකර {0} සකස්
@@ -4266,7 +4273,7 @@
 DocType: Maintenance Visit,Maintenance Date,නඩත්තු දිනය
 DocType: Purchase Invoice Item,Rejected Serial No,ප්රතික්ෂේප අනු අංකය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,වසරේ ආරම්භක දිනය හෝ අවසන් දිනය {0} සමග අතිච්ඡාදනය වේ. වැළකී සමාගම පිහිටුවා කරුණාකර
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},දිනය අයිතමය {0} සඳහා අවසාන දිනය වඩා අඩු විය යුතුය ආරම්භ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,පැමිණීම උඩුගත
@@ -4342,7 +4349,6 @@
 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,බහු කණ්ඩායම් අයිතමය හරස් ලැයිස්තුගත
-DocType: Grade Interval,Grade Interval,ශ්රේණියේ පරතරය
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},"මුදල් වර්ෂය ආරම්භය දිනය හා රාජ්ය මූල්ය, වසර අවසාන දිනය වන විටත් මුදල් වර්ෂය {0} තුළ සකසා ඇත"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,යාවත්කාලීන නිශ්කාශනෙය් දිනය
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,භේදය කණ්ඩායම
@@ -4389,14 +4395,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ඔබ මත පාඨමාලා කණ්ඩායම් ඇති කරමින් කණ්ඩායම සලකා බැලීමට අවශ්ය නැති නම් පරීක්ෂාවෙන් තොරව තබන්න.
 DocType: Asset,Frequency of Depreciation (Months),ක්ෂය වාර ගණන (මාස)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,ක්රෙඩිට් ගිණුම්
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,ක්රෙඩිට් ගිණුම්
 DocType: Landed Cost Item,Landed Cost Item,ඉඩම් හිමි වියදම අයිතමය
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,ශුන්ය අගයන් පෙන්වන්න
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,නිෂ්පාදන / අමු ද්රව්ය ලබා රාශි වෙතින් නැවත ඇසුරුම්කර පසු ලබා අයිතමය ප්රමාණය
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup මගේ සංවිධානය කිරීම සඳහා සරල වෙබ් අඩවිය
 DocType: Payment Reconciliation,Receivable / Payable Account,ලැබිය යුතු / ගෙවිය යුතු ගිණුම්
 DocType: Delivery Note Item,Against Sales Order Item,විකුණුම් සාමය අයිතමය එරෙහිව
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},විශේෂණය {0} සඳහා අගය ආරෝපණය සඳහන් කරන්න
 DocType: Item,Default Warehouse,පෙරනිමි ගබඩාව
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},අයවැය සමූහ ගිණුම {0} එරෙහිව පවරා ගත නොහැකි
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,මව් වියදම් මධ්යස්ථානය ඇතුලත් කරන්න
@@ -4442,7 +4448,7 @@
 DocType: Opportunity Item,Basic Rate,මූලික අනුපාත
 DocType: GL Entry,Credit Amount,ක්රෙඩිට් මුදල
 DocType: Cheque Print Template,Signatory Position,අත්සන් තත්ත්වය
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ලොස්ට් ලෙස සකසන්න
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ලොස්ට් ලෙස සකසන්න
 DocType: Timesheet,Total Billable Hours,මුළු බිල්ගත කළ හැකි පැය
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ගෙවීම් ලදුපත සටහන
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,මෙය මේ පාරිභෝගික එරෙහිව ගනුදෙනු මත පදනම් වේ. විස්තර සඳහා පහත කාල සටහනකට බලන්න
@@ -4456,11 +4462,11 @@
 ,Items To Be Requested,අයිතම ඉල්ලන කිරීමට
 DocType: Purchase Order,Get Last Purchase Rate,ලබා ගන්න අවසන් මිලදී ගැනීම අනුපාත
 DocType: Company,Company Info,සමාගම තොරතුරු
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,නව පාරිභෝගික තෝරා ගැනීමට හෝ එකතු
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,වියදම් මධ්යස්ථානය ක වියදමක් ප්රකාශය වෙන්කර ගැනීමට අවශ්ය වේ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),අරමුදල් ඉල්ලුම් පත්රය (වත්කම්)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,මෙය මේ සේවක පැමිණීම මත පදනම් වේ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ඩෙබිට් ගිණුම
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ඩෙබිට් ගිණුම
 DocType: Fiscal Year,Year Start Date,වසරේ ආරම්භක දිනය
 DocType: Attendance,Employee Name,සේවක නම
 DocType: Sales Invoice,Rounded Total (Company Currency),වටකුරු එකතුව (සමාගම ව්යවහාර මුදල්)
@@ -4469,13 +4475,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,පහත සඳහන් දිනවල නිවාඩු ඉල්ලුම් කිරීමෙන් පරිශීලකයන් එක නතර කරන්න.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,මිලදී ගැනීම මුදල
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,සැපයුම්කරු උද්ධෘත {0} නිර්මාණය
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,අවසන් වසර ආරම්භය අවුරුද්දට පෙර විය නොහැකි
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,සේවක ප්රතිලාභ
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},සේවක {0} හෝ සමාගම සඳහා පෙරනිමි නිවාඩු ලැයිස්තු සකස් කරුණාකර {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} පවතී නැත
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} පවතී නැත
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ගනුදෙනුකරුවන් වෙත මතු බිල්පත්.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ව්යාපෘති අංකය
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ෙරෝ නැත {0}: ප්රමාණය වියදම් හිමිකම් {1} එරෙහිව මුදල තෙක් ට වඩා වැඩි විය නොහැක. විභාග මුදල වේ {2}
@@ -4484,15 +4490,17 @@
 DocType: Quality Inspection Reading,Reading 3,කියවීම 3
 ,Hub,මධ්යස්ථානයක්
 DocType: GL Entry,Voucher Type,වවුචරය වර්ගය
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,මිල ලැයිස්තුව සොයා හෝ ආබාධිත නොවන
 DocType: Employee Loan Application,Approved,අනුමත
 DocType: Pricing Rule,Price,මිල
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} &#39;වමේ&#39; ලෙස සකස් කළ යුතු ය මත මුදා සේවක
 DocType: Guardian,Guardian,ගාඩියන්
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ඇගයීෙම් {0} ලබා දී දින පරාසයක් තුළ සේවක {1} සඳහා නිර්මාණය
 DocType: Employee,Education,අධ්යාපන
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ඩෙල්
 DocType: Selling Settings,Campaign Naming By,ව්යාපාරය විසින් නම් කිරීම
 DocType: Employee,Current Address Is,දැනට පදිංචි ලිපිනය
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,වෙනස්
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","විකල්ප. සමාගමේ පෙරනිමි මුදල්, නිශ්චිතව දක්වා නැති නම් සකසනු ලබයි."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,මුල්ය සඟරාව සටහන් ඇතුළත් කිරීම්.
 DocType: Delivery Note Item,Available Qty at From Warehouse,ලබා ගත හැකි යවන ලද පොත් ගබඩාව සිට දී
@@ -4501,7 +4509,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ෙරෝ {0}: පක්ෂය / ගිණුම් {3} {4} තුළ {1} / {2} සමග නොගැලපේ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ගෙවීමේ ගිණුම් ඇතුලත් කරන්න
 DocType: Account,Stock,කොටස්
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ෙරෝ # {0}: විමර්ශන ලේඛන වර්ගය මිලදී ගැනීමේ නියෝගයක්, මිලදී ගැනීම ඉන්වොයිසිය හෝ ජර්නල් Entry එකක් විය යුතුය"
 DocType: Employee,Current Address,වර්තමාන ලිපිනය
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","නිශ්චිත ලෙස නම් අයිතමය තවත් අයිතමය ක ප්රභේද්යයක් කරනවා නම් විස්තර, ප්රතිරූපය, මිල ගණන්, බදු ආදිය සැකිල්ල සිට ස්ථාපනය කරනු ලබන"
 DocType: Serial No,Purchase / Manufacture Details,මිලදී ගැනීම / නිෂ්පාදනය විස්තර
@@ -4529,7 +4537,7 @@
 DocType: Hub Settings,Hub Settings,මධ්යස්ථානයක් සැකසුම්
 DocType: Project,Gross Margin %,දළ ආන්තිකය%
 DocType: BOM,With Operations,මෙහෙයුම් සමග
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,මුල්ය සටහන් ඇතුළත් කිරීම් මේ වන විටත් සමාගම {1} සඳහා මුදල් {0} තුළ සිදු කර ඇත. මුදල් {0} සමග කරුණාකර ලැබිය හෝ ගෙවිය යුතු ගිණුම් තෝරන්න.
 DocType: Asset,Is Existing Asset,දැනට පවතින වත්කම් වේ
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
 DocType: Salary Detail,Statistical Component,සංඛ්යාන සංරචක
@@ -4554,7 +4562,7 @@
 DocType: Assessment Plan,Room,කාමරය
 DocType: Purchase Order,Advance Paid,උසස් ගෙවුම්
 DocType: Item,Item Tax,අයිතමය බදු
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,සැපයුම්කරු ද්රව්යමය
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,සැපයුම්කරු ද්රව්යමය
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,සුරාබදු ඉන්වොයිසිය
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% වරකට වඩා පෙනී
 DocType: Expense Claim,Employees Email Id,සේවක විද්යුත් අංකය
@@ -4585,9 +4593,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,ලාංඡනය අමුණන්න
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,කොටස් පෙළ
 DocType: Customer,Commission Rate,කොමිසම අනුපාතිකය
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ප්රභේද්යයක් කරන්න
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ප්රභේද්යයක් කරන්න
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,දෙපාර්තමේන්තුව විසින් නිවාඩු අයදුම්පත් අවහිර කරයි.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","ගෙවීම් වර්ගය පිළිගන්න එකක් විය යුතුය, වැටුප් හා අභ තර ස්ථ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,විශ්ලේෂණ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,කරත්ත හිස් වේ
 DocType: Vehicle,Model,ආදර්ශ
@@ -4598,6 +4606,7 @@
 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 +161,Capital Stock,කැපිටල් කොටස්
+DocType: Shopping Cart Settings,Show Public Attachments,රාජ්ය ඇමුණුම් පෙන්වන්න
 DocType: Packing Slip,Package Weight Details,පැකේජය සිරුරේ බර විස්තර
 DocType: Payment Gateway Account,Payment Gateway Account,ගෙවීම් ගේට්වේ ගිණුම
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ගෙවීම් අවසන් කිරීමෙන් පසු තෝරාගත් පිටුවට පරිශීලක වි.
@@ -4616,15 +4625,15 @@
 DocType: Batch,Expiry Date,කල්පිරෙන දිනය
 ,Supplier Addresses and Contacts,සැපයුම්කරු ලිපිනයන් සහ අප අමතන්න
 ,accounts-browser,ගිණුම්-බ්රවුසරය
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,කරුණාකර පළමු ප්රවර්ගය තෝරන්න
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,කරුණාකර පළමු ප්රවර්ගය තෝරන්න
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ව්යාපෘති ස්වාමියා.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","අධික ලෙස බිල් ෙහෝ අධික ලෙස ඇනවුම් කිරීම කොටස් සැකසුම් හෝ විෂය තුළ, යාවත්කාලීන &quot;දීමනාව&quot; ඉඩ."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,මුදල් ලබන $ ආදිය මෙන් කිසිදු සංකේතයක් පෙන්වන්න එපා.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(අඩක් දිනය)
 DocType: Supplier,Credit Days,ක්රෙඩිට් දින
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,ශිෂ්ය කණ්ඩායම කරන්න
 DocType: Leave Type,Is Carry Forward,ඉදිරියට ගෙන ඇත
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,ද්රව්ය ලේඛණය සිට අයිතම ලබා ගන්න
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,ඉදිරියට ඇති කාලය දින
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"ෙරෝ # {0}: ගිය තැන, ශ්රී ලංකා තැපෑල දිනය මිලදී දිනය ලෙස සමාන විය යුතුය {1} වත්කම් {2}"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,ඉහත වගුවේ විකුණුම් නියෝග ඇතුලත් කරන්න
@@ -4641,8 +4650,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,අනුමැතිය ලත් මුදල
 DocType: GL Entry,Is Opening,විවෘත වේ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ෙරෝ {0}: හර සටහන ඇති {1} සමග සම්බන්ධ විය නොහැකි
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,කරුණාකර Setup&gt; අංක ශ්රේණි හරහා පැමිණීම සඳහා පිහිටුවීම් අංක මාලාවක්
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 cc19f7c..e9ddf9b 100644
--- a/erpnext/translations/sk.csv
+++ b/erpnext/translations/sk.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Pronajato
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Použiteľné pre Užívateľa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Zastavil výrobu Objednať nemožno zrušiť, uvoľniť ho najprv zrušiť"
 DocType: Vehicle Service,Mileage,Najazdené
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Naozaj chcete zrušiť túto pohľadávku?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Vybrať Predvolené Dodávateľ
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Vybrať Predvolené Dodávateľ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Měna je vyžadováno pro Ceníku {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bude vypočítané v transakcii.
 DocType: Purchase Order,Customer Contact,Zákaznícky kontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Vynikající pro {0} nemůže být nižší než nula ({1})
 DocType: Manufacturing Settings,Default 10 mins,Predvolené 10 min
 DocType: Leave Type,Leave Type Name,Nechte Typ Jméno
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ukázať otvorené
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ukázať otvorené
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Řada Aktualizováno Úspěšně
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Odhlásiť sa
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Vložené
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Item Zánik Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Návrh
 DocType: Mode of Payment Account,Mode of Payment Account,Způsob platby účtu
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Zobraziť Varianty
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Zobraziť Varianty
 DocType: Academic Term,Academic Term,akademický Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Materiál
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Množstvo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Množstvo
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Účty tabuľka nemôže byť prázdne.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Úvěry (závazky)
 DocType: Employee Education,Year of Passing,Rok Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Odkaz:% s, Kód Item:% s a Zákazník:% s"
 DocType: Item,Country of Origin,Krajina pôvodu
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Na skladě
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,otvorené problémy
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Péče o zdraví
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Oneskorenie s platbou (dni)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktúra
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Sériové číslo: {0} už je uvedené vo faktúre predaja: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktúra
 DocType: Maintenance Schedule Item,Periodicity,Periodicita
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Fiškálny rok {0} je vyžadovaná
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Očakáva dátum dodania je byť pred Sales poradí Dátum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripojiť CSV súbor s dvomi stĺpci, jeden pre starý názov a jeden pre nový názov"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} žiadnym aktívnym fiškálny rok.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Odkaz: {0}, Kód položky: {1} a zákazník: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,log
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Otevření o zaměstnání.
 DocType: Item Attribute,Increment,Prírastok
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Vyberte Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Vyberte Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklama
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Rovnaký Spoločnosť je zapísaná viac ako raz
 DocType: Employee,Married,Ženatý
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Nepovolené pre {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Získať predmety z
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nepovolené pre {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Získať predmety z
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Sklad nelze aktualizovat na dodací list {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkt {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nie sú uvedené žiadne položky
 DocType: Payment Reconciliation,Reconcile,Srovnat
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Potraviny
 DocType: Quality Inspection Reading,Reading 1,Čtení 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Vedľa Odpisy dátum nemôže byť pred nákupom Dátum
 DocType: SMS Center,All Sales Person,Všichni obchodní zástupci
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesačný Distribúcia ** umožňuje distribuovať Rozpočet / Target celé mesiace, ak máte sezónnosti vo vašej firme."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,nenájdený položiek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,nenájdený položiek
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plat Štruktúra Chýbajúce
 DocType: Lead,Person Name,Osoba Meno
 DocType: Sales Invoice Item,Sales Invoice Item,Prodejní faktuře položka
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",napríklad &quot;Základná škola&quot; alebo &quot;univerzita&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,stock Reports
 DocType: Warehouse,Warehouse Detail,Sklad Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Úvěrový limit byla překročena o zákazníka {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Termínovaný Dátum ukončenia nemôže byť neskôr ako v roku Dátum ukončenia akademického roka, ku ktorému termín je spojená (akademický rok {}). Opravte dáta a skúste to znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Je Fixed Asset&quot; nemôže byť bez povšimnutia, pretože existuje Asset záznam proti položke"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Typ dane
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nejste oprávněni přidávat nebo aktualizovat údaje před {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (ne-li slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Zákazník existuje se stejným názvem
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hodina Rate / 60) * Skutočná Prevádzková doba
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,select BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,select BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Náklady na dodávaných výrobků
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Dovolenka na {0} nie je medzi Dátum od a do dnešného dňa
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,školy
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Žiadny záznam dovolenka nájdené pre zamestnancov {0} na {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosím, nejprave zadejte společnost"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Prosím, vyberte první firma"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target On
 DocType: BOM,Total Cost,Celkové náklady
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Nárok Částka
 DocType: Employee,Mr,Pan
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicitné skupinu zákazníkov uvedené v tabuľke na knihy zákazníkov skupiny
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dodavatel Typ / dovozce
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Dodavatel Typ / dovozce
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Spotrebný materiál
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,stupeň
 DocType: Sales Invoice Item,Delivered By Supplier,Dodáva sa podľa dodávateľa
 DocType: SMS Center,All Contact,Vše Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Zákazková výroba už vytvorili u všetkých položiek s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Ročné Plat
 DocType: Daily Work Summary,Daily Work Summary,Denná práca Súhrn
 DocType: Period Closing Voucher,Closing Fiscal Year,Uzavření fiskálního roku
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zmrazený
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zmrazený
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vyberte existujúci spoločnosti pre vytváranie účtový rozvrh
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Náklady
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Vyberte položku Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Entry
 DocType: Journal Entry Account,Credit in Company Currency,Úverové spoločnosti v mene
 DocType: Delivery Note,Installation Status,Stav instalace
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Chcete aktualizovať dochádzku? <br> Súčasná: {0} \ <br> Prítomných {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Schválené + Zamietnuté množstvo sa musí rovnať Prijatému množstvu pre položku {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dodávky suroviny pre nákup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,pre POS faktúru je nutná aspoň jeden spôsob platby.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,pre POS faktúru je nutná aspoň jeden spôsob platby.
 DocType: Products Settings,Show Products as a List,Zobraziť produkty ako zoznam
 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.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Urobiť Odpisy Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ požadavku
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,urobiť zamestnanca
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,urobiť zamestnanca
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Vysílání
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Provedení
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o prováděných operací.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plán pro návštěvy údržby.
 DocType: SMS Settings,Enter url parameter for message,Zadejte url parametr zprávy
 DocType: POS Profile,Customer Groups,skupiny zákazníkov
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finančné výkazy
 DocType: Guardian,Students,študenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravidla pro používání cen a slevy.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Ceník musí být použitelný pro nákup nebo prodej
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Množstvo vopred nemôže byť väčšia ako {0} {1}
 DocType: Naming Series,Series List for this Transaction,Řada seznam pro tuto transakci
 DocType: Company,Default Payroll Payable Account,"Predvolené mzdy, splatnú Account"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Aktualizácia e-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Aktualizácia e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstupní otvor
 DocType: Customer Group,Mention if non-standard receivable account applicable,Zmienka v prípade neštandardnej pohľadávky účet použiteľná
 DocType: Course Schedule,Instructor Name,inštruktor Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Pro Sklad je povinné před Odesláním
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prijaté On
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ak je zaškrtnuté, bude zahŕňať non-skladových položiek v materiáli požiadavky."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti položce vydané faktury
 ,Production Orders in Progress,Zakázka na výrobu v Progress
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Čistý peňažný tok z financovania
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Miestne úložisko je plná, nezachránil"
 DocType: Lead,Address & Contact,Adresa a kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Pridať nevyužité listy z predchádzajúcich prídelov
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Další Opakující {0} bude vytvořen na {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Celková kalkulácie Čiastka (cez Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Položka webových stránek Specifikace
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Nechte Blokováno
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankový Príspevky
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Položka {0} dosáhla konce své životnosti na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,bankový Príspevky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Roční
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Reklamní Odsouhlasení Item
 DocType: Stock Entry,Sales Invoice No,Prodejní faktuře č
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Publikovat v Hub
 DocType: Student Admission,Student Admission,študent Vstupné
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Položka {0} je zrušená
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Požadavek na materiál
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Položka {0} je zrušená
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Vynikajúci Šeky a vklady s jasnými
 DocType: Item,Synced With Hub,Synchronizovány Hub
 DocType: Vehicle,Fleet Manager,fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Riadok # {0}: {1} nemôže byť negatívne na {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Zlé Heslo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Riadok # {0}: {1} nemôže byť negatívne na {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Zlé Heslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Dokončené množství nemůže být větší než ""Množství do výroby"""
 DocType: Period Closing Voucher,Closing Account Head,Závěrečný účet hlava
 DocType: Employee,External Work History,Vnější práce History
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Kruhové Referenčné Chyba
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Upozornit e-mailem na tvorbu automatických Materiál Poptávka
 DocType: Journal Entry,Multi Currency,Viac mien
 DocType: Payment Reconciliation Invoice,Invoice Type,Typ faktúry
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Dodací list
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Dodací list
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Nastavenie Dane
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Náklady predaných aktív
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} vložené dvakrát v Daňovej Položke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Zhrnutie pre tento týždeň a prebiehajúcim činnostiam
 DocType: Student Applicant,Admitted,"pripustil,"
 DocType: Workstation,Rent Cost,Rent Cost
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Hodnota objednávky
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Banka / Hotovostné operácie proti osobe alebo pre interný prevod
 DocType: Shipping Rule,Valid for Countries,"Platí pre krajiny,"
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Tento bod je šablona a nemůže být použit v transakcích. Atributy položky budou zkopírovány do variant, pokud je nastaveno ""No Copy"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Celková objednávka Zvážil
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Označení zaměstnanců (např CEO, ředitel atd.)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosím, zadejte ""Opakujte dne měsíce"" hodnoty pole"
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Riadok # {0}: faktúry nemožno vykonať voči existujúcemu aktívu {1}
 DocType: Item Tax,Tax Rate,Sadzba dane
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} už pridelené pre zamestnancov {1} na dobu {2} až {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Select Položka
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Select Položka
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Přijatá faktura {0} je již odeslána
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Row # {0}: Batch No musí byť rovnaké, ako {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Previesť na non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (lot) položky.
 DocType: C-Form Invoice Detail,Invoice Date,Dátum fakturácie
 DocType: GL Entry,Debit Amount,Debetné Suma
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Tam môže byť len 1 účet na spoločnosti v {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Prosím, viz příloha"
 DocType: Purchase Order,% Received,% Prijaté
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Vytvorenie skupiny študentov
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Žiadosť o cenovú ponuku
 DocType: Salary Slip Timesheet,Working Hours,Pracovní doba
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Změnit výchozí / aktuální pořadové číslo existujícího série.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Vytvoriť nový zákazník
-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.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,vytvorenie objednávok
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Vytvoriť nový zákazník
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Je-li více pravidla pro tvorbu cen i nadále přednost, jsou uživatelé vyzváni k nastavení priority pro vyřešení konfliktu."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,vytvorenie objednávok
 ,Purchase Register,Nákup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Použitelné Poplatky
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ voľna"""
 DocType: Purchase Receipt,Vehicle Date,Dátum Vehicle
 DocType: Student Log,Medical,Lékařský
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Důvod ztráty
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Důvod ztráty
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Olovo Majiteľ nemôže byť rovnaký ako olovo
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Pridelená suma nemôže väčšie ako množstvo neupravené
 DocType: Announcement,Receiver,prijímač
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Množstvo a Sadzba
 DocType: Delivery Note,% Installed,% Inštalovaných
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učebne / etc laboratória, kde môžu byť naplánované prednášky."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosím, zadajte najprv názov spoločnosti"
 DocType: Purchase Invoice,Supplier Name,Dodavatel Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Prečítajte si ERPNext Manuál
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Povinná oblasť - akademický rok
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Povinná oblasť - akademický rok
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Přizpůsobte si úvodní text, který jede jako součást tohoto e-mailu. Každá transakce je samostatný úvodní text."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Nastavte predvolený splatný účet pre spoločnosť {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globální nastavení pro všechny výrobní procesy.
 DocType: Accounts Settings,Accounts Frozen Upto,Účty Frozen aľ
 DocType: SMS Log,Sent On,Poslán na
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,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 +70,Holiday master.,Holiday master.
 DocType: Request for Quotation Item,Required Date,Požadovaná data
 DocType: Delivery Note,Billing Address,Fakturační adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Prosím, zadejte kód položky."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Prosím, zadejte kód položky."
 DocType: BOM,Costing,Rozpočet
 DocType: Tax Rule,Billing County,fakturácia County
 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"
@@ -508,6 +512,7 @@
 DocType: Packing Slip,From Package No.,Od č balíčku
 DocType: Item Attribute,To Range,K Rozsah
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Cenné papíry a vklady
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Metódu oceňovania nemožno zmeniť, pretože existujú transakcie proti niektorým položkám, ktoré nemajú vlastnú metódu oceňovania"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Celkom listy pridelené je povinné
 DocType: Job Opening,Description of a Job Opening,Popis jednoho volných pozic
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Nevybavené aktivity pre dnešok
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vyberte možnosť Kurz
 DocType: Timesheet Detail,Hrs,hod
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Prosím, vyberte Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Prosím, vyberte Company"
 DocType: Stock Entry Detail,Difference Account,Rozdíl účtu
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Nedá zatvoriť úloha, ako jeho závislý úloha {0} nie je uzavretý."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Prosím, zadejte sklad, který bude materiál žádosti předložené"
 DocType: Production Order,Additional Operating Cost,Další provozní náklady
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Chcete-li sloučit, tyto vlastnosti musí být stejné pro obě položky"
 DocType: Shipping Rule,Net Weight,Hmotnost
 DocType: Employee,Emergency Phone,Nouzový telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,kúpiť
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Definujte stupeň pre prah 0%
 DocType: Sales Order,To Deliver,Dodať
 DocType: Purchase Invoice Item,Item,Položka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Sériovej žiadna položka nemôže byť zlomkom
 DocType: Journal Entry,Difference (Dr - Cr),Rozdíl (Dr - Cr)
 DocType: Account,Profit and Loss,Zisky a ztráty
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Správa Subdodávky
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prírastok nemôže byť 0
 DocType: Production Planning Tool,Material Requirement,Materiál Požadavek
 DocType: Company,Delete Company Transactions,Zmazať transakcií Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referenčné číslo a referenčný dátum je povinný pre bankové transakcie
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Přidat / Upravit daní a poplatků
 DocType: Purchase Invoice,Supplier Invoice No,Dodávateľská faktúra č
 DocType: Territory,For reference,Pro srovnání
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,Poznámka k instalaci bod
 DocType: Production Plan Item,Pending Qty,Čakajúci Množstvo
 DocType: Budget,Ignore,Ignorovat
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nie je aktívny
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nie je aktívny
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslal do nasledujúcich čísel: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Skontrolujte nastavenie rozmery pre tlač
 DocType: Salary Slip,Salary Slip Timesheet,Plat Slip časový rozvrh
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,Celkem Komise
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Příjmka je vyžadována
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Ocenenie Rate je povinné, ak zadaná počiatočným stavom zásob"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nalezené v tabulce faktury Žádné záznamy
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Vyberte první společnost a Party Typ
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finanční / Účetní rok.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,neuhradená Hodnoty
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Ujistěte se prodejní objednávky
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Ujistěte se prodejní objednávky
 DocType: Project Task,Project Task,Úloha Project
 ,Lead Id,Id Obchodnej iniciatívy
 DocType: C-Form Invoice Detail,Grand Total,Celkem
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Verní zákazníci
 DocType: Leave Control Panel,Allocate,Přidělit
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Poznámka: Celkový počet alokovaných listy {0} by nemala byť menšia ako ktoré už boli schválené listy {1} pre obdobie
 DocType: Announcement,Posted By,Pridané
 DocType: Item,Delivered by Supplier (Drop Ship),Dodáva Dodávateľom (Drop Ship)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,Ponuka k
 DocType: Lead,Middle Income,Středními příjmy
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Otvor (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Přidělená částka nemůže být záporná
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte spoločnosť
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavte spoločnosť
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Predajná faktúry časový rozvrh
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenční číslo a referenční datum je nutné pro {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Vybrať Platobný účet, aby Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Vytvoriť Zamestnanecké záznamy pre správu listy, vyhlásenia o výdavkoch a miezd"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Pridať do Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Návrh Psaní
 DocType: Payment Entry Deduction,Payment Entry Deduction,Platba Vstup dedukcie
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' nie je vo fiškálnom roku {2}
 DocType: Buying Settings,Settings for Buying Module,Nastavenie pre modul Nákupy
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Aktíva {0} nepatrí do spoločnosti {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Prosím, zadejte první doklad o zakoupení"
 DocType: Buying Settings,Supplier Naming By,Pomenovanie dodávateľa podľa
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Čistá Zmena stavu zásob
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Zamestnanec úveru Vedenie
 DocType: Employee,Passport Number,Číslo pasu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Súvislosť s Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manažér
 DocType: Payment Entry,Payment From / To,Platba od / do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,časové obdobie
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nový úverový limit je nižšia ako aktuálna dlžnej čiastky za zákazníka. Úverový limit musí byť aspoň {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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é"
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,V minútach
 DocType: Issue,Resolution Date,Rozlišení Datum
 DocType: Student Batch Name,Batch Name,Batch Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Harmonogramu vytvorenia:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Harmonogramu vytvorenia:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Prosím nastavte výchozí v hotovosti nebo bankovním účtu v způsob platby {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,zapísať
 DocType: Selling Settings,Customer Naming By,Zákazník Pojmenování By
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ukáže na študenta bol prítomný v Student mesačnú návštevnosť Správa
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,Skutečný čas začátku
 DocType: BOM Operation,Operation Time,Provozní doba
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Skončiť
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,základňa
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,základňa
 DocType: Timesheet,Total Billed Hours,Celkom Predpísané Hodiny
 DocType: Journal Entry,Write Off Amount,Odepsat Částka
 DocType: Journal Entry,Bill No,Bill No
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,študent Účasť
 DocType: Sales Invoice Timesheet,Time Sheet,Time Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,So spätným suroviny na základe
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosím, zadejte podrobnosti položky"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosím, zadejte podrobnosti položky"
 DocType: Interest,Interest,záujem
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Predpredaj
 DocType: Purchase Receipt,Other Details,Ďalšie podrobnosti
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Vstup Platba je už vytvorili
 DocType: Purchase Receipt Item Supplied,Current Stock,Current skladem
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Riadok # {0}: Asset {1} nie je spojená s item {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview výplatnej páske
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview výplatnej páske
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Účet {0} bol zadaný viackrát
 DocType: Account,Expenses Included In Valuation,Náklady ceně oceňování
 DocType: Hub Settings,Seller City,Prodejce City
 ,Absent Student Report,Absent Študent Report
 DocType: Email Digest,Next email will be sent on:,Další e-mail bude odeslán dne:
 DocType: Offer Letter Term,Offer Letter Term,Ponuka Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Položka má varianty.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Spoločnosť {0} neexistuje
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Množství spotřebované na jednotku
 DocType: Serial No,Warranty Expiry Date,Záruka Datum vypršení platnosti
 DocType: Material Request Item,Quantity and Warehouse,Množstvo a sklad
 DocType: Sales Invoice,Commission Rate (%),Výška provízie (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vyberte program
 DocType: Project,Estimated Cost,odhadované náklady
 DocType: Purchase Order,Link to material requests,Odkaz na materiálnych požiadaviek
@@ -768,7 +770,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Prijaté Suma (Company mena)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Vedoucí musí být nastavena pokud Opportunity je vyrobena z olova
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,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 +29,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
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Příležitost Z
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Měsíční plat prohlášení.
 DocType: BOM,Website Specifications,Webových stránek Specifikace
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} typu {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Konverzní faktor je povinné
@@ -837,6 +840,7 @@
 DocType: Employee,Bank A/C No.,"Č, bank. účtu"
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Čtení 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,čiastočne usporiadané
 DocType: Expense Claim Detail,Expense Claim Type,Náklady na pojistná Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Výchozí nastavení Košík
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset vyhodený cez položka denníka {0}
@@ -844,14 +848,14 @@
 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 +107,Office Maintenance Expenses,Náklady Office údržby
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavenie e-mailového konta
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Prosím, nejdřív zadejte položku"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosím, nejdřív zadejte položku"
 DocType: Account,Liability,Odpovědnost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionovaná Čiastka nemôže byť väčšia ako reklamácia Suma v riadku {0}.
 DocType: Company,Default Cost of Goods Sold Account,Východiskové Náklady na predaný tovar účte
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Ceník není zvolen
 DocType: Employee,Family Background,Rodinné poměry
 DocType: Request for Quotation Supplier,Send Email,Odeslat email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varovanie: Neplatná Príloha {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nemáte oprávnenie
 DocType: Company,Default Bank Account,Prednastavený Bankový účet
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Ak chcete filtrovať na základe Party, vyberte typ Party prvý"
@@ -864,8 +868,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Nenájdený žiadny zamestnanec
 DocType: Supplier Quotation,Stopped,Zastaveno
 DocType: Item,If subcontracted to a vendor,Ak sa subdodávky na dodávateľa
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Skupina študentov je už aktualizovaná.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Skupina študentov je už aktualizovaná.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Skupina študentov je už aktualizovaná.
 DocType: SMS Center,All Customer Contact,Všetky Kontakty Zákazníka
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Nahrát nutnosti rovnováhy prostřednictvím CSV.
 DocType: Warehouse,Tree Details,Tree Podrobnosti
@@ -876,8 +880,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimálna suma faktúry
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: náklady Center {2} nepatrí do spoločnosti {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Účet {2} nemôže byť skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom &#39;{typ_dokumentu}&#39; tabuľka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Položka Row {idx}: {typ_dokumentu} {} DOCNAME neexistuje v predchádzajúcom &#39;{typ_dokumentu}&#39; tabuľka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Harmonogramu {0} je už dokončená alebo zrušená
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,žiadne úlohy
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den měsíce, ve kterém auto faktura bude generován například 05, 28 atd"
 DocType: Asset,Opening Accumulated Depreciation,otvorenie Oprávky
@@ -893,7 +897,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} proti účtu {1} z dňa {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,rozvrh
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,rozvrh
 DocType: Maintenance Visit,Completion Status,Dokončení Status
 DocType: HR Settings,Enter retirement age in years,Zadajte vek odchodu do dôchodku v rokoch
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Warehouse
@@ -901,7 +905,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Nechajte cez dodávku alebo príjem aľ tohto percenta
 DocType: Stock Entry,STE-,ste-
 DocType: Upload Attendance,Import Attendance,Importovat Docházku
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Všechny skupiny položek
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Všechny skupiny položek
 DocType: Process Payroll,Activity Log,Aktivita Log
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čistý zisk / strata
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automaticky napsat vzkaz na předkládání transakcí.
@@ -912,7 +916,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Objednávka na platobné
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Předpokládané množství
 DocType: Sales Invoice,Payment Due Date,Splatno dne
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Variant Položky {0} už existuje s rovnakými vlastnosťami
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Otváranie"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,otvorená robiť
 DocType: Notification Control,Delivery Note Message,Delivery Note Message
@@ -928,7 +932,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Order Množství
 DocType: Leave Block List Date,Leave Block List Date,Nechte Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena nebo Sleva
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkom Použiteľné Poplatky v doklade o kúpe tovaru, ktorý tabuľky musí byť rovnaká ako celkom daní a poplatkov"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Celkom Použiteľné Poplatky v doklade o kúpe tovaru, ktorý tabuľky musí byť rovnaká ako celkom daní a poplatkov"
 DocType: Sales Team,Incentives,Pobídky
 DocType: SMS Log,Requested Numbers,Požadované Čísla
 DocType: Production Planning Tool,Only Obtain Raw Materials,Získať iba suroviny
@@ -957,13 +961,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Subdodavatelům
 DocType: Item Attribute,Item Attribute Values,Položka Hodnoty atributů
 DocType: Examination Result,Examination Result,vyšetrenie Výsledok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Příjemka
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Příjemka
 ,Received Items To Be Billed,"Přijaté položek, které mají být účtovány"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Predložené výplatných páskach
 DocType: Employee,Ms,Paní
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Devizový kurz master.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referenčná DOCTYPE musí byť jedným z {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referenčná DOCTYPE musí byť jedným z {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Nemožno nájsť časový úsek v najbližších {0} dní na prevádzku {1}
 DocType: Production Order,Plan material for sub-assemblies,Plán materiál pro podsestavy
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Obchodní partneri a teritória
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Nie je možné automaticky vytvoriť účet ako už existuje stock zostatok na účte. Je potrebné vytvoriť zodpovedajúce účet, než budete môcť vykonať zápis o tomto sklade"
@@ -986,10 +990,9 @@
 DocType: Supplier,Default Payable Accounts,Výchozí úplatu účty
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Zaměstnanec {0} není aktivní nebo neexistuje
 DocType: Fee Structure,Components,komponenty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Varianty Položky {0} aktualizované
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Prosím, zadajte Kategória majetku v položke {0}"
 DocType: Quality Inspection Reading,Reading 6,Čtení 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Nemožno {0} {1} {2} bez negatívnych vynikajúce faktúra
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Záloha přijaté faktury
 DocType: Hub Settings,Sync Now,Sync teď
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Credit záznam nemůže být spojována s {1}
@@ -1003,11 +1006,11 @@
 DocType: Item,Is Purchase Item,je Nákupní Položka
 DocType: Asset,Purchase Invoice,Přijatá faktura
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail No
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nová predajná faktúra
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nová predajná faktúra
 DocType: Stock Entry,Total Outgoing Value,Celková hodnota Odchozí
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Dátum začatia a dátumom ukončenia by malo byť v rámci rovnakého fiškálny rok
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Dátum začatia a dátumom ukončenia by malo byť v rámci rovnakého fiškálny rok
 DocType: Lead,Request for Information,Žádost o informace
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Faktúry
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Faktúry
 DocType: Payment Request,Paid,Placený
 DocType: Program Fee,Program Fee,program Fee
 DocType: Salary Slip,Total in words,Celkem slovy
@@ -1017,7 +1020,7 @@
 DocType: Employee Loan,Sanctioned,schválený
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Publikovať na webových stránkach
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Zásilky zákazníkům.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Dodávateľ Dátum faktúry nemôže byť väčšia ako Dátum zverejnenia
@@ -1028,7 +1031,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Odchylka
 ,Company Name,Názov spoločnosti
 DocType: SMS Center,Total Message(s),Celkem zpráv (y)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Vybrať položku pre prevod
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Vybrať položku pre prevod
 DocType: Purchase Invoice,Additional Discount Percentage,Ďalšie zľavy Percento
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Zobraziť zoznam všetkých videí nápovedy
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Vyberte účet šéf banky, kde byla uložena kontrola."
@@ -1039,8 +1042,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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ý
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Východisková banka / Peňažný účet budú automaticky aktualizované v plat položka denníku ak je zvolený tento režim.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervaly pre platové triedy zákonníka {0} prekrýva s stupeň intervaly pre ostatných tried. Prosím skontrolujte intervaly {0} a {1} a skúste to znova
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Cost (Company mena)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Riadok # {0}: Sadzba nesmie byť vyššia ako sadzba použitá v {1} {2}
@@ -1053,13 +1054,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Nahrajte svoju hlavičku a logo pre dokumenty. (Môžete ich upravovať neskôr.)
 DocType: Timesheet Detail,Bill,účet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Vedľa Odpisy Dátum sa zadáva ako uplynulom dni
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Biela
 DocType: SMS Center,All Lead (Open),Všetky Iniciatívy (Otvorené)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Riadok {0}: Množstvo nie je k dispozícii pre {4} v sklade {1} pri účtovaní čas zápisu ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Získejte zaplacené zálohy
 DocType: Item,Automatically Create New Batch,Automaticky vytvoriť novú dávku
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Urobiť
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Urobiť
 DocType: Student Admission,Admission Start Date,Vstupné Dátum začatia
 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á."
@@ -1067,7 +1068,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Prosím, zadajte účet pre zmenu Suma"
 DocType: Student Batch Name,Student Batch Name,Študent Batch Name
 DocType: Holiday List,Holiday List Name,Názov zoznamu sviatkov
 DocType: Repayment Schedule,Balance Loan Amount,Bilancia Výška úveru
@@ -1087,10 +1088,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Zadajte {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstránené položky bez zmeny množstva alebo hodnoty.
 DocType: Delivery Note,Delivery To,Doručení do
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Atribút tabuľka je povinné
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Atribút tabuľka je povinné
 DocType: Production Planning Tool,Get Sales Orders,Získat Prodejní objednávky
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nemôže byť záporné
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Sleva
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Sleva
 DocType: Asset,Total Number of Depreciations,Celkový počet Odpisy
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
 DocType: Sales Invoice Item,Rate With Margin,Sadzba s maržou
@@ -1106,7 +1107,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Vyhrazeno Warehouse v prodejní objednávky / hotových výrobků Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Prodejní Částka
 DocType: Repayment Schedule,Interest Amount,záujem Suma
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,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"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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
 DocType: Asset,Scrapped,zošrotovaný
@@ -1114,12 +1115,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributy pro položky varianty. například velikost, barva atd."
 DocType: Purchase Invoice,Returns,výnos
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Warehouse
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Pořadové číslo {0} je na základě smlouvy o údržbě aľ {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,nábor
 DocType: Lead,Organization Name,Názov organizácie
 DocType: Tax Rule,Shipping State,Prepravné State
 ,Projected Quantity as Source,Množstvo projekciou as Zdroj
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Zahŕňajú non-skladových položiek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodejní náklady
@@ -1127,12 +1128,12 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Výchozí Center Prodejní cena
 DocType: Sales Partner,Implementation Partner,Implementačního partnera
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,PSČ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,PSČ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Predajné objednávky {0} {1}
 DocType: Opportunity,Contact Info,Kontaktní informace
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Tvorba prírastkov zásob
 DocType: Packing Slip,Net Weight UOM,Čistá hmotnosť MJ
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} výsledkov
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} výsledkov
 DocType: Item,Default Supplier,Výchozí Dodavatel
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad výrobou Percento príspevkoch
 DocType: Employee Loan,Repayment Schedule,splátkový kalendár
@@ -1140,7 +1141,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Získejte týdenní Off termíny
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Datum ukončení nesmí být menší než data zahájení
 DocType: Sales Person,Select company name first.,"Prosím, vyberte najprv názov spoločnosti"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Ponuky od Dodávateľov.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Chcete-li {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Průměrný věk
@@ -1160,7 +1161,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Doprava
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,neplatný Atribút
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} musí být odeslaný
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} musí být odeslaný
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Množstvo musí byť menší ako alebo rovný {0}
 DocType: SMS Center,Total Characters,Celkový počet znaků
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Vyberte kusovník Bom oblasti k bodu {0}
@@ -1171,7 +1172,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 +224,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 +52,Please set 'Apply Additional Discount On',Prosím nastavte na &quot;Použiť dodatočnú zľavu On&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,"Z rozsahu, musí byť nižšia ako na Range"
 DocType: Global Defaults,Global Defaults,Globální Výchozí
@@ -1181,7 +1182,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začiatok Rok
 DocType: Purchase Invoice,Start date of current invoice's period,Datum období současného faktury je Začátek
 DocType: Salary Slip,Leave Without Pay,Nechat bez nároku na mzdu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Plánovanie kapacít Chyba
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1196,7 +1197,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bude připojen na položku zákoníku varianty. Například, pokud vaše zkratka je ""SM"", a položka je kód ""T-SHIRT"", položka kód varianty bude ""T-SHIRT-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Čistá Pay (slovy) budou viditelné, jakmile uložíte výplatní pásce."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / ťarchopis
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / ťarchopis
 DocType: Price List Country,Price List Country,Cenník Krajina
 DocType: Item,UOMs,Merné Jednotky
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} platné sériové čísla pre položky {1}
@@ -1206,11 +1207,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Prosím, zadajte kód položky sa dostať číslo šarže"
 DocType: Stock Settings,Default Item Group,Výchozí bod Group
 DocType: Employee Loan,Partially Disbursed,čiastočne Vyplatené
-DocType: Grading Structure,Grading System Name,Meno systém triedenia
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Databáze dodavatelů.
 DocType: Account,Balance Sheet,Rozvaha
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',"Nákladové středisko u položky s Kód položky """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Režim platba nie je nakonfigurovaný. Prosím skontrolujte, či je účet bol nastavený na režim platieb alebo na POS Profilu."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Váš obchodní zástupce dostane upomínku na tento den, aby kontaktoval zákazníka"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Rovnakú položku nemožno zadávať viackrát.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ďalšie účty môžu byť vyrobené v rámci skupiny, ale údaje je možné proti non-skupín"
@@ -1222,7 +1222,7 @@
 ,Purchase Order Items To Be Billed,Položky vydané objednávky k fakturaci
 DocType: Purchase Invoice Item,Net Rate,Čistá miera
 DocType: Purchase Invoice Item,Purchase Invoice Item,Položka přijaté faktury
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Sériové Ledger Přihlášky a GL položky jsou zveřejňována pro vybrané Nákupní Příjmy
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Položka 1
 DocType: Holiday,Holiday,Dovolená
 DocType: Support Settings,Close Issue After Days,Close Issue po niekoľkých dňoch
@@ -1249,11 +1249,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Odvedenou práci
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Uveďte aspoň jeden atribút v tabuľke atribúty
 DocType: Announcement,All Students,všetci študenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Item {0} musí byť non-skladová položka
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,View Ledger
 DocType: Grading Scale,Intervals,intervaly
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Nejstarší
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Položka Group existuje se stejným názvem, prosím, změnit název položky nebo přejmenovat skupinu položek"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Študent Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1293,9 +1293,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Výplata platu od {0} do {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Prodejní objednávky {0} není platný
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Objednávky pomôžu pri plánovaní a sledovaní na vaše nákupy
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Je nám líto, společnosti nemohou být sloučeny"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Celkové emisie / prenosu množstvo {0} v hmotnej Request {1} \ nemôže byť väčšie než množstvo {2} pre položku {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Malý
@@ -1316,10 +1316,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Nepřímé náklady
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Množství je povinný
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Poľnohospodárstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Vaše Produkty alebo Služby
 DocType: Mode of Payment,Mode of Payment,Způsob platby
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,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 +180,Website Image should be a public file or website URL,Webové stránky Image by mala byť verejná súboru alebo webovej stránky URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Jedná se o skupinu kořen položky a nelze upravovat.
@@ -1337,18 +1337,18 @@
 DocType: Student Group Student,Group Roll Number,Číslo skupiny rollov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Pro {0}, tak úvěrové účty mohou být propojeny na jinou položku debetní"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Súčet všetkých váh úloha by mal byť 1. Upravte váhy všetkých úloh projektu v súlade
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Delivery Note {0} není předložena
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Ceny Pravidlo je nejprve vybrána na základě ""Použít na"" oblasti, které mohou být položky, položky skupiny nebo značky."
 DocType: Hub Settings,Seller Website,Prodejce Website
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Celkové přidělené procento prodejní tým by měl být 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Stav výrobní zakázka je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Stav výrobní zakázka je {0}
 DocType: Appraisal Goal,Goal,Cieľ
 DocType: Sales Invoice Item,Edit Description,Upraviť popis
 ,Team Updates,tím Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Pro Dodavatele
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Vytvoriť formát tlače
@@ -1364,7 +1364,7 @@
 DocType: Depreciation Schedule,Journal Entry,Zápis do deníku
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} položky v prebiehajúcej
 DocType: Workstation,Workstation Name,Meno pracovnej stanice
-DocType: Grade Interval,Grade Code,grade Code
+DocType: Grading Scale Interval,Grade Code,grade Code
 DocType: POS Item Group,POS Item Group,POS položky Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-mail Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nepatří k bodu {1}
@@ -1381,7 +1381,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Technické vybavení
 DocType: Sales Order,Recurring Upto,opakujúce Až
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Vyberte spoločnosť
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Vyberte spoločnosť
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Dátum dodávateľskej faktúry
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Musíte povolit Nákupní košík
@@ -1397,7 +1397,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Jídlo
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Stárnutí Rozsah 3
 DocType: Maintenance Schedule Item,No of Visits,Počet návštěv
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Plán údržby {0} existuje v porovnaní s {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,učiaci študenta
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},"Mena záverečného účtu, musí byť {0}"
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Súčet bodov za všetkých cieľov by malo byť 100. Je {0}
@@ -1422,7 +1423,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odchozí
 DocType: POS Profile,Campaign,Kampaň
 DocType: Supplier,Name and Type,Názov a typ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Stav schválení musí být ""schváleno"" nebo ""Zamítnuto"""
 DocType: Purchase Invoice,Contact Person,Kontaktná osoba
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Očakávaný Dátum Začiatku"" nemôže byť väčší ako ""Očakávaný Dátum Ukončenia"""
 DocType: Course Scheduling Tool,Course End Date,Koniec Samozrejme Dátum
@@ -1445,14 +1446,15 @@
 DocType: Sales Invoice,Shipping Address Name,Přepravní Adresa Název
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,nemôže byť väčšie ako 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Položka {0} není skladem
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nemôže byť väčšie ako 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Položka {0} není skladem
 DocType: Maintenance Visit,Unscheduled,Neplánovaná
 DocType: Employee,Owned,Vlastník
 DocType: Salary Detail,Depends on Leave Without Pay,Závisí na dovolenke bez nároku na mzdu
 DocType: Pricing Rule,"Higher the number, higher the priority","Vyšší číslo, vyšší priorita"
 ,Purchase Invoice Trends,Trendy přijatách faktur
 DocType: Employee,Better Prospects,Lepší vyhlídky
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Riadok # {0}: Dávka {1} má iba {2} qty. Vyberte inú dávku, ktorá má {3} k dispozícii, alebo rozdeľte riadok do viacerých riadkov a doručte / vydávajte z viacerých šarží"
 DocType: Vehicle,License Plate,Poznávacia značka
 DocType: Appraisal,Goals,Ciele
 DocType: Warranty Claim,Warranty / AMC Status,Záruka / AMC Status
@@ -1471,7 +1473,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Zaměstnanec nemůže odpovídat sám sobě.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","V případě, že účet je zamrzlý, položky mohou omezeným uživatelům."
 DocType: Email Digest,Bank Balance,Bank Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Účtovný záznam pre {0}: {1} môžu vykonávať len v mene: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil Job, požadované kvalifikace atd."
 DocType: Journal Entry Account,Account Balance,Zůstatek na účtu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Daňové Pravidlo pre transakcie.
@@ -1482,7 +1484,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Ukázať P &amp; L zostatky neuzavretý fiškálny rok je
 DocType: Shipping Rule,Shipping Account,Přepravní účtu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Účet {2} je neaktívny
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Urobiť Predajné objednávky, ktoré vám pomôžu plánovať svoju prácu a doručiť na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Urobiť Predajné objednávky, ktoré vám pomôžu plánovať svoju prácu a doručiť na čas"
 DocType: Quality Inspection,Readings,Čtení
 DocType: Stock Entry,Total Additional Costs,Celkom Dodatočné náklady
 DocType: Course Schedule,SH,SH
@@ -1493,7 +1495,7 @@
 DocType: Shipping Rule Condition,To Value,Chcete-li hodnota
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Balení Slip
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Balení Slip
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Pronájem kanceláře
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavenie SMS brány
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import se nezdařil!
@@ -1515,11 +1517,11 @@
 DocType: Company,Services,Služby
 DocType: HR Settings,Email Salary Slip to Employee,Email výplatnej páske pre zamestnancov
 DocType: Cost Center,Parent Cost Center,Nadřazené Nákladové středisko
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Zvoľte Možné dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Zvoľte Možné dodávateľa
 DocType: Sales Invoice,Source,Zdroj
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show uzavretý
 DocType: Leave Type,Is Leave Without Pay,Je odísť bez Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset kategória je povinný pre položku investičného majetku
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nalezené v tabulce platby Žádné záznamy
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Táto {0} je v rozpore s {1} o {2} {3}
 DocType: Student Attendance Tool,Students HTML,študenti HTML
@@ -1537,7 +1539,7 @@
 DocType: Student,Date of Leaving,Dátum Odchádzanie
 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/utilities/activation.py +64,Create Leads,Vytvoriť vedie
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Vytvoriť vedie
 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
@@ -1565,9 +1567,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Prihlášky
 DocType: Sales Invoice Item,Brand Name,Jméno značky
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Predvolené sklad je vyžadované pre vybraná položka
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Krabica
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,možné Dodávateľ
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,možné Dodávateľ
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizácia
 DocType: Budget,Monthly Distribution,Měsíční Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Přijímač Seznam je prázdný. Prosím vytvořte přijímače Seznam
@@ -1575,8 +1577,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximálna výška úveru
 DocType: Pricing Rule,Pricing Rule,Ceny Pravidlo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicitné číslo rolky pre študenta {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Duplicitné číslo rolky pre študentov {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicitné číslo rolky pre študenta {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Duplicitné číslo rolky pre študentov {0}
 DocType: Budget,Action if Annual Budget Exceeded,Akčný Pokiaľ ide o ročný rozpočet prekročený
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Materiál Žiadosť o príkaze k nákupu
 DocType: Shopping Cart Settings,Payment Success URL,Platba Úspech URL
@@ -1597,9 +1599,9 @@
 DocType: Employee Loan,Repayment Method,splácanie Method
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ak je zaškrtnuté, domovská stránka bude východiskový bod skupina pre webové stránky"
 DocType: Quality Inspection Reading,Reading 4,Čtení 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Predvolené BOM pre {0} nenašiel Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Predvolené BOM pre {0} nenašiel Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Nároky na náklady firmy.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Študenti sú v centre systému, pridajte všetky svoje študentov"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Študenti sú v centre systému, pridajte všetky svoje študentov"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Riadok # {0}: dátum Svetlá {1} nemôže byť pred Cheque Dátum {2}
 DocType: Company,Default Holiday List,Výchozí Holiday Seznam
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Riadok {0}: čas od času aj na čas z {1} sa prekrýva s {2}
@@ -1611,21 +1613,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"V deň, keď (y), na ktoré žiadate o povolenie sú prázdniny. Nemusíte požiadať o voľno."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Znovu poslať e-mail Payment
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,novú úlohu
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Značka Citácia
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Značka Citácia
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Ostatné správy
 DocType: Dependent Task,Dependent Task,Závislý Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Konverzní faktor pro výchozí měrnou jednotku, musí být 1 v řádku {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Leave typu {0} nemůže být delší než {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Skúste plánovanie operácií pre X dní vopred.
 DocType: HR Settings,Stop Birthday Reminders,Zastavit připomenutí narozenin
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosím nastaviť predvolený účet mzdy, splatnú v spoločnosti {0}"
 DocType: SMS Center,Receiver List,Přijímač Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,hľadanie položky
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,hľadanie položky
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Spotřebovaném množství
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Čistá zmena v hotovosti
 DocType: Assessment Plan,Grading Scale,stupnica
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,už boli dokončené
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Měrná jednotka {0} byl zadán více než jednou v konverzním faktorem tabulce
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,už boli dokončené
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Platba Dopyt už existuje {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Náklady na vydaných položek
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Množství nesmí být větší než {0}
@@ -1657,12 +1659,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Urobiť vyplácanie Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Riadok {0}: Advance proti dodávateľom musí byť odpísať
 DocType: Company,Default Values,Predvolené hodnoty
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvencia} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Celkovej sumy vyplatenej
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,To je založené na protokoloch proti tomuto vozidlu. Pozri časovú os nižšie podrobnosti
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zbierať
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Proti faktuře dodavatele {0} ze dne {1}
 DocType: Customer,Default Price List,Výchozí Ceník
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Záznam Asset Pohyb {0} vytvoril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Nemožno odstrániť fiškálny rok {0}. Fiškálny rok {0} je nastavený ako predvolený v globálnom nastavení
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Zákazník Credit Balance
@@ -1682,7 +1685,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Žiadna z týchto položiek nemá zmenu v množstve alebo hodnote.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Povinné pole - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Povinné pole - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Záruční reklamace
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Záruční reklamace
 ,Lead Details,Podrobnosti Obchodnej iniciatívy
 DocType: Salary Slip,Loan repayment,splácania úveru
 DocType: Purchase Invoice,End date of current invoice's period,Datum ukončení doby aktuální faktury je
@@ -1701,12 +1704,10 @@
 DocType: Employee,Permanent Address,Trvalé bydliště
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosím, vyberte položku kód"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Prosím, vyberte položku kód"
 DocType: Student Sibling,Studying in Same Institute,Štúdium v Same ústave
 DocType: Territory,Territory Manager,Oblastní manažer
 DocType: Packed Item,To Warehouse (Optional),Warehouse (voliteľné)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Payment Entry,Paid Amount (Company Currency),Zaplatená suma (Company meny)
 DocType: Purchase Invoice,Additional Discount,Ďalšie zľavy
 DocType: Selling Settings,Selling Settings,Nastavenia pre Predaj
@@ -1716,9 +1717,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Zobraziť Košík
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketingové náklady
 ,Item Shortage Report,Položka Nedostatek Report
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Hmotnosť je uvedená, \n uveďte prosím aj ""váhu MJ"""
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Materiál Žádost používá k výrobě této populace Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Vedľa Odpisy Dátum je povinné pre nové aktívum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Vedľa Odpisy Dátum je povinné pre nové aktívum
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina kurzov pre každú dávku
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Samostatná skupina kurzov pre každú dávku
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Single jednotka položky.
@@ -1735,9 +1736,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Je potrebné nákladového strediska pre &#39;zisku a straty &quot;účtu {2}. Prosím nastaviť predvolené nákladového strediska pre spoločnosť.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nový kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Čtení 2
@@ -1754,7 +1753,7 @@
 ,Item-wise Sales Register,Item-moudrý Sales Register
 DocType: Asset,Gross Purchase Amount,Gross Suma nákupu
 DocType: Asset,Depreciation Method,odpisy Metóda
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to poplatek v ceně základní sazbě?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Celkem Target
 DocType: Program Course,Required,Požadovaný
@@ -1764,21 +1763,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Odsouhlasení JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Příliš mnoho sloupců. Export zprávu a vytiskněte jej pomocí aplikace tabulky.
 DocType: Purchase Invoice Item,Batch No,Č. šarže
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Nepodarilo sa nájsť kurz pre {0} až {1} pre kľúčové dátum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Povoliť viac Predajné objednávky proti Zákazníka Objednávky
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor skupiny študentov
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Žiadne
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Hlavné
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varianta
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Hlavné
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varianta
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavit prefix pro číslování série na vašich transakcí
 DocType: Employee Attendance Tool,Employees HTML,Zamestnanci HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Predvolené BOM ({0}) musí byť aktívna pre túto položku alebo jeho šablóny
 DocType: Employee,Leave Encashed?,Ponechte zpeněžení?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Ze hřiště je povinné
 DocType: Email Digest,Annual Expenses,ročné náklady
 DocType: Item,Variants,Varianty
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Proveďte objednávky
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Proveďte objednávky
 DocType: SMS Center,Send To,Odeslat
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Není dost bilance dovolenou na vstup typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Přidělené sumy
@@ -1786,7 +1784,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Zákazníka Kód položky
 DocType: Stock Reconciliation,Stock Reconciliation,Reklamní Odsouhlasení
 DocType: Territory,Territory Name,Území Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Work-in-Progress sklad je zapotřebí před Odeslat
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Žadatel o zaměstnání.
 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
@@ -1794,11 +1792,10 @@
 DocType: Item,Serial Nos and Batches,Sériové čísla a dávky
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sila študentskej skupiny
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sila študentskej skupiny
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Proti věstníku Vstup {0} nemá bezkonkurenční {1} vstupu
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,ocenenie
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,triedenie Intervaly
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Prosím Vlož
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Nemožno overbill k bodu {0} v rade {1} viac ako {2}. Aby bolo možné cez-fakturácie, je potrebné nastaviť pri nákupe Nastavenie"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Prosím nastaviť filter na základe výtlačku alebo v sklade
@@ -1810,17 +1807,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} musí být předloženy
 DocType: Authorization Control,Authorization Control,Autorizace Control
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Riadok # {0}: zamietnutie Warehouse je povinná proti zamietnutej bodu {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Splátka
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Spravovať svoje objednávky
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Splátka
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Spravovať svoje objednávky
 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í
 DocType: Course,Course Abbreviation,skratka ihrisko
 DocType: Student Leave Application,Student Leave Application,Študent nechať aplikáciu
 DocType: Item,Will also apply for variants,Bude platiť aj pre varianty
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nemožno zrušiť, pretože je už {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zamestnancov {0} o pol dňa na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Celkom pracovná doba by nemala byť väčšia ako maximálna pracovnej doby {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Kdy
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle položky v okamžiku prodeje.
 DocType: Quotation Item,Actual Qty,Skutečné Množství
 DocType: Sales Invoice Item,References,Referencie
@@ -1830,7 +1828,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Zadali jste duplicitní položky. Prosím, opravu a zkuste to znovu."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Spolupracovník
 DocType: Asset Movement,Asset Movement,asset Movement
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,new košík
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,new košík
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Položka {0} není serializovat položky
 DocType: SMS Center,Create Receiver List,Vytvořit přijímače seznam
 DocType: Vehicle,Wheels,kolesá
@@ -1862,10 +1860,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Zakáže vytváranie časových protokolov proti výrobnej zákazky. Transakcie nesmú byť sledované proti výrobnej zákazky
 DocType: Student,Student Mobile Number,Študent Číslo mobilného telefónu
 DocType: Item,Has Variants,Má varianty
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Už ste vybrané položky z {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Název měsíční výplatou
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Číslo šarže je povinné
 DocType: Sales Person,Parent Sales Person,Parent obchodník
 DocType: Purchase Invoice,Recurring Invoice,Opakující se faktury
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Správa projektov
@@ -1873,11 +1871,11 @@
 DocType: Budget,Fiscal Year,Fiskální rok
 DocType: Vehicle Log,Fuel Price,palivo Cena
 DocType: Budget,Budget,Rozpočet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset položky musia byť non-skladová položka.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Rozpočet nemožno priradiť proti {0}, pretože to nie je výnos alebo náklad účet"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Dosažená
 DocType: Student Admission,Application Form Route,prihláška Trasa
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territory / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territory / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,napríklad 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Nechať Typ {0} nemôže byť pridelená, pretože sa odísť bez zaplatenia"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Přidělená částka {1} musí být menší než nebo se rovná fakturovat dlužné částky {2}
@@ -1897,15 +1895,15 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,vynikajúci
 ,Daily Timesheet Summary,Denný časový rozvrh Súhrn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Řádek {0}: Pro nastavení {1} periodicita, rozdíl mezi z a aktuální \
  musí být větší než nebo rovno {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,To je založené na akciovom pohybu. Pozri {0} Podrobnosti
 DocType: Pricing Rule,Selling,Predaj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Množstvo {0} {1} odpočítať proti {2}
 DocType: Employee,Salary Information,Vyjednávání o platu
 DocType: Sales Person,Name and Employee ID,Meno a ID zamestnanca
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Datum splatnosti nesmí být před odesláním Datum
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Odvody a dane
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Prosím, zadejte Referenční den"
@@ -1917,14 +1915,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Nelze odkazovat číslo řádku větší nebo rovnou aktuální číslo řádku pro tento typ Charge
 DocType: Asset,Sold,Predané
 ,Item-wise Purchase History,Item-moudrý Historie nákupů
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosím, klikněte na ""Generovat Schedule"", aby přinesla Pořadové číslo přidán k bodu {0}"
 DocType: Account,Frozen,Zmražený
 ,Open Production Orders,Otevřené výrobní zakázky
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Základňa Suma (Company mena)
 DocType: Payment Reconciliation Payment,Reference Row,referenčnej Row
 DocType: Installation Note,Installation Time,Instalace Time
 DocType: Sales Invoice,Accounting Details,Účtovné Podrobnosti
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Odstráňte všetky transakcie pre túto spoločnosť
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investice
 DocType: Issue,Resolution Details,Rozlišení Podrobnosti
@@ -1957,14 +1955,14 @@
 DocType: Discussion,Discussion,diskusia
 DocType: Payment Entry,Transaction ID,ID transakcie
 DocType: Employee,Resignation Letter Date,Rezignace Letter Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Pravidla pro stanovení sazeb jsou dále filtrována na základě množství.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Nastavte dátum založenia pre zamestnanca {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Celková suma Billing (cez Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Repeat Customer Příjmy
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}), musí mať úlohu ""Schvalovateľ výdajov"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Pár
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Vyberte BOM a Množstvo na výrobu
 DocType: Asset,Depreciation Schedule,plán odpisy
 DocType: Bank Reconciliation Detail,Against Account,Proti účet
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Day Date by mala byť v rozmedzí od dátumu a do dnešného dňa
@@ -1978,16 +1976,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Prosím nastavte &quot;odpisy majetku nákladové stredisko&quot; vo firme {0}
 ,Maintenance Schedules,Plány údržby
 DocType: Task,Actual End Date (via Time Sheet),Skutočný dátum ukončenia (cez Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Množstvo {0} {1} na {2} {3}
 ,Quotation Trends,Vývoje ponúk
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Položka Group není uvedeno v položce mistra na položku {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Čeká Částka
 DocType: Purchase Invoice Item,Conversion Factor,Konverzní faktor
 DocType: Purchase Order,Delivered,Dodává
 ,Vehicle Expenses,Náklady pre autá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
+DocType: Serial No,Invoice Details,Podrobnosti faktúry
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Očakávané hodnoty po celú dobu životnosti, musí byť väčšia ako alebo rovná {0}"
 DocType: Purchase Receipt,Vehicle Number,Číslo vozidla
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, kdy opakující se faktura bude zastaví"
 DocType: Employee Loan,Loan Amount,Výška pôžičky
@@ -2006,12 +2005,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,Nastavení HR
 DocType: Salary Slip,net pay info,Čistá mzda info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,nové výdavky
 DocType: Purchase Invoice,Additional Discount Amount,Dodatočná zľava Suma
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Riadok # {0}: Množstvo musí byť 1, keď je položka investičného majetku. Prosím použiť samostatný riadok pre viacnásobné Mn."
 DocType: Leave Block List Allow,Leave Block List Allow,Nechte Block List Povolit
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Skrátená nemôže byť prázdne alebo priestor
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina na Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportovní
 DocType: Loan Type,Loan Name,pôžička Name
@@ -2023,6 +2022,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Sklad, kde se udržují zásoby odmítnutých položek"
 DocType: Production Order,Skip Material Transfer,Preskočiť prenos materiálu
 DocType: Production Order,Skip Material Transfer,Preskočiť prenos materiálu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Nepodarilo sa nájsť kurz {0} až {1} pre kľúčový dátum {2}. Ručne vytvorte záznam o menovej karte
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,"Dátum, kedy váš finančný rok končí"
 DocType: POS Profile,Price List,Ceník
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je teraz predvolený Fiškálny rok. Prosím aktualizujte svoj prehliadač, aby sa prejavili zmeny."
@@ -2039,19 +2039,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Účet {0} je neplatná. Mena účtu musí byť {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM Konverzní faktor je nutné v řadě {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným zo zákazky odberateľa, predajné faktúry alebo Journal Entry"
 DocType: Salary Component,Deduction,Dedukce
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Riadok {0}: From Time a na čas je povinná.
 DocType: Stock Reconciliation Item,Amount Difference,vyššie Rozdiel
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Položka Cena pridaný pre {0} v Cenníku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Prosím, zadajte ID zamestnanca z tohto predaja osoby"
 DocType: Territory,Classification of Customers by region,Rozdělení zákazníků podle krajů
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Rozdiel Suma musí byť nula
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Rozdiel Suma musí byť nula
 DocType: Project,Gross Margin,Hrubá marža
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Prosím, zadejte první výrobní položku"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Vypočítaná výpis z bankového účtu zostatok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,zakázané uživatelské
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Ponuka
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Ponuka
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Celkem Odpočet
 ,Production Analytics,výrobné Analytics
@@ -2060,9 +2060,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varovanie: Neplatný certifikát SSL na prílohu {0}
 DocType: Student Admission,Eligibility,spôsobilosť
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Vedie vám pomôžu podnikanie, pridajte všetky svoje kontakty a viac ako vaše vývody"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Vedie vám pomôžu podnikanie, pridajte všetky svoje kontakty a viac ako vaše vývody"
 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
@@ -2077,7 +2077,7 @@
 DocType: Guardian,Work Address,pracovná adresa
 DocType: Appraisal,Calculate Total Score,Vypočítať celkové skóre
 DocType: Request for Quotation,Manufacturing Manager,Výrobný riaditeľ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Pořadové číslo {0} je v záruce aľ {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Rozdělit dodací list do balíčků.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Zásielky
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Zostatok na účte ({0}) pre {1} a hodnota zásob ({2}) pre sklad {3} musia byť rovnaké
@@ -2100,10 +2100,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Poznámka: E-mail nebude odoslaný neaktívnym používateľom
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Počet interakcií
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Počet interakcií
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Vyberte společnost ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Vyberte společnost ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Ponechte prázdné, pokud se to považuje za všechna oddělení"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Druhy pracovního poměru (trvalý, smluv, stážista atd.)"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je povinná k položke {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je povinná k položke {1}
 DocType: Process Payroll,Fortnightly,dvojtýždňové
 DocType: Currency Exchange,From Currency,Od Měny
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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ě"
@@ -2112,14 +2112,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Cena (Měna Společnosti)
 DocType: Student Guardian,Others,Ostatní
 DocType: Payment Entry,Unallocated Amount,nepridelené Suma
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nemožno nájsť zodpovedajúce položku. Vyberte nejakú inú hodnotu pre {0}.
 DocType: POS Profile,Taxes and Charges,Daně a poplatky
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Produkt nebo služba, která se Nakupuje, Prodává nebo Skladuje."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Žiadne ďalšie aktualizácie
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Nelze vybrat druh náboje jako ""On předchozí řady Částka"" nebo ""On předchozí řady Celkem"" pro první řadu"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Dieťa Položka by nemala byť produkt Bundle. Odstráňte položku `{0}` a uložiť
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankovnictví
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Pridať Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Pridať Timesheets
 DocType: Vehicle Service,Service Item,servis Položka
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
 DocType: Bank Guarantee,Bank Guarantee,Banková záruka
@@ -2145,6 +2145,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Riadok # {0}: Asset {1} je už {2}
 DocType: Quotation Item,Stock Balance,Reklamní Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Predajné objednávky na platby
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavte pomenovanie série {0} cez Nastavenie&gt; Nastavenia&gt; Pomenovanie série
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Detail úhrady výdajů
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Prosím, vyberte správny účet"
@@ -2169,14 +2170,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ceny sa nebudú zobrazovať, pokiaľ Cenník nie je nastavený"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Uveďte prosím krajinu, k tomuto Shipping pravidlá alebo skontrolovať Celosvetová doprava"
 DocType: Stock Entry,Total Incoming Value,Celková hodnota Příchozí
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debetné K je vyžadované
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debetné K je vyžadované
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomôže udržať prehľad o času, nákladov a účtovania pre aktivít hotový svojho tímu"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nákupní Ceník
 DocType: Offer Letter Term,Offer Term,Ponuka Term
 DocType: Quality Inspection,Quality Manager,Manažér kvality
 DocType: Job Applicant,Job Opening,Job Zahájení
 DocType: Payment Reconciliation,Payment Reconciliation,Platba Odsouhlasení
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosím, vyberte incharge jméno osoby"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Technologie
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Celkové nezaplatené: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operation
@@ -2204,23 +2205,23 @@
 DocType: Opportunity,Lost Reason,Ztracené Důvod
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Všechny položky již byly fakturovány
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Prosím, zadajte prevzatia dokumentu"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Ďalšie nákladové strediská môžu byť vyrobené v rámci skupiny, ale položky môžu byť vykonané proti non-skupín"
 DocType: Project,External,Externí
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uživatelé a oprávnění
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Výrobné zákazky Vytvorené: {0}
 DocType: Branch,Branch,Větev
 DocType: Guardian,Mobile Number,Telefónne číslo
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tisk a identita
 DocType: Bin,Actual Quantity,Skutočné Množstvo
 DocType: Shipping Rule,example: Next Day Shipping,Příklad: Next Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Pořadové číslo {0} nebyl nalezen
 DocType: Scheduling Tool,Student Batch,študent Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaši Zákazníci
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,urobiť Študent
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,urobiť Študent
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Boli ste pozvaní k spolupráci na projekte: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Nainštalovať teraz
@@ -2244,8 +2245,9 @@
 DocType: SMS Log,Sent To,Odoslaná
 DocType: Payment Request,Make Sales Invoice,Vytvoriť faktúru
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,programy
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Nasledujúce Kontakt dátum nemôže byť v minulosti
 DocType: Company,For Reference Only.,Pouze orientační.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Vyberte položku šarže
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neplatný {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PInv-RET-
 DocType: Sales Invoice Advance,Advance Amount,Záloha ve výši
@@ -2259,7 +2261,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Případ č nemůže být 0
 DocType: Item,Show a slideshow at the top of the page,Ukazují prezentaci v horní části stránky
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,kusovníky
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Obchody
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Obchody
 DocType: Serial No,Delivery Time,Dodací lhůta
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Stárnutí dle
 DocType: Item,End of Life,Konec životnosti
@@ -2271,12 +2273,12 @@
 DocType: Rename Tool,Rename Tool,Nástroj na premenovanie
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Aktualizace Cost
 DocType: Item Reorder,Item Reorder,Položka Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Show výplatnej páske
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Přenos materiálu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Show výplatnej páske
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tento dokument je nad hranicou {0} {1} pre položku {4}. Robíte si iný {3} proti rovnakej {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Vybrať zmena výšky účet
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Prosím nastavte opakujúce sa po uložení
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Vybrať zmena výšky účet
 DocType: Purchase Invoice,Price List Currency,Ceník Měna
 DocType: Naming Series,User must always select,Uživatel musí vždy vybrat
 DocType: Stock Settings,Allow Negative Stock,Povolit Negativní Sklad
@@ -2287,7 +2289,7 @@
 DocType: Budget Account,Budget Account,rozpočet účtu
 DocType: Quality Inspection,Verified By,Verified By
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nelze změnit výchozí měně společnosti, protože tam jsou stávající transakce. Transakce musí být zrušena, aby změnit výchozí měnu."
-DocType: Grade Interval,Grade Description,grade Popis
+DocType: Grading Scale Interval,Grade Description,grade Popis
 DocType: Stock Entry,Purchase Receipt No,Číslo příjmky
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Earnest Money
 DocType: Process Payroll,Create Salary Slip,Vytvořit výplatní pásce
@@ -2325,7 +2327,7 @@
 DocType: Upload Attendance,Attendance To Date,Účast na data
 DocType: Warranty Claim,Raised By,Vznesené
 DocType: Payment Gateway Account,Payment Account,Platební účet
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Uveďte prosím společnost pokračovat
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Uveďte prosím společnost pokračovat
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Čistá zmena objemu pohľadávok
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Vyrovnávací Off
 DocType: Offer Letter,Accepted,Přijato
@@ -2335,12 +2337,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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äť."
 DocType: Room,Room Number,Číslo izby
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Neplatná referencie {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) nemôže byť väčšie, ako plánované množstvo ({2}), vo Výrobnej Objednávke {3}"
 DocType: Shipping Rule,Shipping Rule Label,Přepravní Pravidlo Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,user Forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Suroviny nemůže být prázdný.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Rýchly vstup Journal
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Rýchly vstup Journal
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2353,7 +2355,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Podmínky a podmínek1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Názov inštitútu pre ktorý nastavujete tento systém.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Účetní záznam zmrazeny až do tohoto data, nikdo nemůže dělat / upravit položku kromě role uvedeno níže."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosím, uložit dokument před generováním plán údržby"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stav projektu
 DocType: UOM,Check this to disallow fractions. (for Nos),"Zkontrolujte, zda to zakázat frakce. (U č)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Nasledujúce Výrobné zákazky boli vytvorené:
@@ -2380,7 +2382,7 @@
 ,Employees working on a holiday,Zamestnanci pracujúci na dovolenku
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,mark Present
 DocType: Project,% Complete Method,Dokončené% Method
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum zahájení údržby nemůže být před datem dodání pro pořadové číslo {0}
 DocType: Production Order,Actual End Date,Skutečné datum ukončení
 DocType: BOM,Operating Cost (Company Currency),Prevádzkové náklady (Company mena)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2397,7 +2399,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Nechať bez nároku na odmenu nesúhlasí so schválenými záznamov nechať aplikáciu
 DocType: Campaign,Campaign-.####,Kampaň-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Ďalšie kroky
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Prosím dodávať uvedené položky na najlepšie možné ceny
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto zavrieť Opportunity po 15 dňoch
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,koniec roka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Olovo%
@@ -2455,7 +2457,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Množství
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Vytvoril - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategórie Account
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Nie je možné vyrobiť viac Položiek {0} ako je množstvo na predajnej objednávke {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Nie je možné vyrobiť viac Položiek {0} ako je množstvo na predajnej objednávke {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Sklad Entry {0} nie je predložená
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Peněžní účet
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Nasledujúce Kontakt Tým nemôže byť rovnaký ako hlavný e-mailovú adresu
@@ -2477,7 +2479,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Výprodej Datum není uvedeno
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Výroba
 DocType: Guardian,Occupation,povolania
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,"Row {0}: datum zahájení, musí být před koncem roku Datum"
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Total (ks)
 DocType: Sales Invoice,This Document,tento dokument
 DocType: Installation Note Item,Installed Qty,Instalované množství
@@ -2493,15 +2496,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Nahlásiť problém
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Náklady
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Riadok # {0}: Journal Entry {1} nemá účet {2} alebo už uzavreté proti inému poukazu
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Riadok # {0}: Journal Entry {1} nemá účet {2} alebo už uzavreté proti inému poukazu
 DocType: Buying Settings,Default Buying Price List,Výchozí Nákup Ceník
 DocType: Process Payroll,Salary Slip Based on Timesheet,Plat Slip na základe časového rozvrhu
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Typ platby
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Vyberte položku Dávka pre položku {0}. Nie je možné nájsť jednu dávku, ktorá spĺňa túto požiadavku"
 DocType: Process Payroll,Select Employees,Vybrať Zamestnanci
 DocType: Opportunity,Potential Sales Deal,Potenciální prodej
 DocType: Payment Entry,Cheque/Reference Date,Šek / Referenčný dátum
@@ -2518,7 +2521,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profile {0} už vytvorili pre firmu {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Nahradit položky / kusovníky ve všech kusovníků
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Príjem a musí byť predložený
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Príjem a musí byť predložený
 DocType: Purchase Invoice Item,Received Qty,Přijaté Množství
 DocType: Stock Entry Detail,Serial No / Batch,Výrobní číslo / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nezaplatené a nedoručené
@@ -2527,11 +2530,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Žiadne časové listy
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Nechajte typ {0} nemožno vykonávať odovzdávané
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Plán údržby není generován pro všechny položky. Prosím, klikněte na ""Generovat Schedule"""
 ,To Produce,K výrobě
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Mzda
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Pre riadok {0} v {1}. Ak chcete v rýchlosti položku sú {2}, riadky {3} musí byť tiež zahrnuté"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,aby užívateľ
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,aby užívateľ
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikace balíčku pro dodávky (pro tisk)
 DocType: Bin,Reserved Quantity,Vyhrazeno Množství
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Zadajte platnú e-mailovú adresu
@@ -2544,15 +2547,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Bezbariérový šablóna nesmie byť predvolenú šablónu
 DocType: Account,Income Account,Účet příjmů
 DocType: Payment Request,Amount in customer's currency,Čiastka v mene zákazníka
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dodávka
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Dodávka
 DocType: Stock Reconciliation Item,Current Qty,Aktuálne Množstvo
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Viz ""Hodnotit materiálů na bázi"" v kapitole Costing"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Predchádzajúce
 DocType: Appraisal Goal,Key Responsibility Area,Key Odpovědnost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Študent Šarže pomôže sledovať dochádzku, hodnotenia a poplatky pre študentov"
 DocType: Payment Entry,Total Allocated Amount,Celková alokovaná suma
 DocType: Item Reorder,Material Request Type,Materiál Typ požadavku
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal vstup na platy z {0} až {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Miestne úložisko je plné, nezachránil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Miestne úložisko je plné, nezachránil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Riadok {0}: Konverzný faktor MJ je povinný
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Nákladové středisko
@@ -2562,16 +2566,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Inkognito dane zákazníka z predajných transakcií
 DocType: Upload Attendance,Upload HTML,Nahrát HTML
 DocType: Employee,Relieving Date,Uvolnění Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Ceny Pravidlo je vyrobena přepsat Ceník / definovat slevy procenta, na základě určitých kritérií."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Sklad je možné provést pouze prostřednictvím Burzy Entry / dodací list / doklad o zakoupení
 DocType: Employee Education,Class / Percentage,Třída / Procento
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Vedoucí marketingu a prodeje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Daň z příjmů
-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.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Je-li zvolena Ceny pravidlo je určen pro ""Cena"", přepíše ceníku. Ceny Pravidlo cena je konečná cena, a proto by měla být použita žádná další sleva. Proto, v transakcích, jako odběratele, objednávky atd, bude stažen v oboru ""sazbou"", spíše než poli ""Ceník sazby""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Trasa vede od průmyslu typu.
 DocType: Item Supplier,Item Supplier,Položka Dodavatel
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Prosím, zadejte kód položky se dostat dávku no"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},Vyberte prosím hodnotu pro {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Všechny adresy.
 DocType: Company,Stock Settings,Nastavenie Skladu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2581,6 +2585,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',"Pošle e-mail o tejto udalosti, aby zamestnanci so statusom &quot;otvorený&quot;"
 DocType: Task,Depends on Tasks,Závisí na Úlohy
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Správa zákazníků skupiny Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Prílohy je možné zobraziť bez povolenia nákupného košíka
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Názov nového nákladového strediska
 DocType: Leave Control Panel,Leave Control Panel,Nechte Ovládací panely
@@ -2593,12 +2598,10 @@
 DocType: Sales Invoice,Debit To,Debetní K
 DocType: Delivery Note,Required only for sample item.,Požadováno pouze pro položku vzorku.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Skutečné Množství Po transakci
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dodávateľ&gt; Typ dodávateľa
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Č plat sklzu nájdený medzi {0} a {1}
 ,Pending SO Items For Purchase Request,"Do doby, než SO položky k nákupu Poptávka"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,študent Prijímacie
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je zakázaný
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je zakázaný
 DocType: Supplier,Billing Currency,Mena fakturácie
 DocType: Sales Invoice,SINV-RET-,Sinv-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Veľké
@@ -2615,9 +2618,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Úvodná Odporúčané tovar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Všetky skupiny Assessment
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Nový sklad Name
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Celkom {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Celkom {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Území
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Prosím, uveďte počet požadovaných návštěv"
 DocType: Stock Settings,Default Valuation Method,Výchozí metoda ocenění
 DocType: Vehicle Log,Fuel Qty,palivo Množstvo
 DocType: Production Order Operation,Planned Start Time,Plánované Start Time
@@ -2633,7 +2636,7 @@
 DocType: Price List,Price List Master,Ceník Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Všechny prodejní transakce mohou být označeny proti více ** prodejcům **, takže si můžete nastavit a sledovat cíle."
 ,S.O. No.,SO Ne.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Prosím vytvorte Zákazníka z Obchodnej iniciatívy {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,"Nechajte len aplikácie, ktoré majú status, schválené &#39;i, Zamietnuté&#39; môžu byť predložené"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Študent Názov skupiny je povinné v rade {0}
@@ -2677,7 +2680,7 @@
 DocType: Project,Copied From,Skopírované z
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Názov chyba: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,nedostatok
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nie je spojené s {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nie je spojené s {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Účast na zaměstnance {0} je již označen
 DocType: Packing Slip,If more than one package of the same type (for print),Pokud je více než jeden balík stejného typu (pro tisk)
 ,Salary Register,plat Register
@@ -2696,7 +2699,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Použitie pre Košík
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Hodnota {0} atribútu {1} neexistuje v zozname platného bodu Hodnoty atribútov pre položky {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Poplatky budou rozděleny úměrně na základě položky Množství nebo částkou, dle Vašeho výběru"
 DocType: Maintenance Visit,Purposes,Cíle
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Aspoň jedna položka by mala byť zadaná s negatívnym množstvom vo vratnom dokumente
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Prevádzka {0} dlhšie, než všetkých dostupných pracovných hodín v pracovnej stanici {1}, rozložiť prevádzku do niekoľkých operácií"
@@ -2717,16 +2720,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Správa Territory strom.
 DocType: Journal Entry Account,Sales Invoice,Prodejní faktury
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Prosím, vyberte Použiť Zľava na"
 DocType: Company,Default Receivable Account,Výchozí pohledávek účtu
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Vytvoření bankovní položka pro celkové vyplacené mzdy za výše zvolených kritérií
 DocType: Stock Entry,Material Transfer for Manufacture,Materiál Přenos: Výroba
-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.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Sleva v procentech lze použít buď proti Ceníku nebo pro všechny Ceníku.
 DocType: Purchase Invoice,Half-yearly,Pololetní
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Účetní položka na skladě
 DocType: Vehicle Service,Engine Oil,Motorový olej
 DocType: Sales Invoice,Sales Team1,Sales Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Bod {0} neexistuje
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Bod {0} neexistuje
 DocType: Sales Invoice,Customer Address,Zákazník Address
 DocType: Employee Loan,Loan Details,pôžička Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Riadok {0}: Dokončené množstvo musí byť väčšia ako nula.
@@ -2734,24 +2737,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Riadok # {0}: Nemožno vrátiť viac ako {1} pre bodu {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Spiknutí
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Spiknutí
 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}
 DocType: Cheque Print Template,Primary Settings,primárnej Nastavenie
 DocType: Purchase Invoice,Select Supplier Address,Vybrať Dodávateľ Address
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Pridajte Zamestnanci
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Pridajte Zamestnanci
 DocType: Purchase Invoice Item,Quality Inspection,Kontrola kvality
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Malé
 DocType: Company,Standard Template,štandardná šablóna
 DocType: Training Event,Theory,teória
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Upozornění: Materiál Požadované množství je menší než minimální objednávka Množství
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Účet {0} je zmrazen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Právní subjekt / dceřiná společnost s oddělenou Graf účtů, které patří do organizace."
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Potraviny, nápoje a tabák"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Možno vykonať len platbu proti nevyfakturované {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Rychlost Komise nemůže být větší než 100
 DocType: Stock Entry,Subcontract,Subdodávka
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Prosím, zadajte {0} ako prvý"
@@ -2791,7 +2794,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Sklady s existujúcimi transakcie nemožno previesť na skupinu.
 DocType: Assessment Result Tool,Result HTML,výsledok HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Vyprší
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Pridajte študentov
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Pridajte študentov
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosím, vyberte {0}"
 DocType: C-Form,C-Form No,C-Form No
 DocType: BOM,Exploded_items,Exploded_items
@@ -2834,7 +2837,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Zadejte název kampaně, pokud zdroj šetření je kampaň"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Vydavatelia novín
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Vyberte Fiskální rok
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Vyberte Fiskální rok
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Změna pořadí Level
 DocType: Company,Chart Of Accounts Template,Účtový rozvrh šablóny
 DocType: Attendance,Attendance Date,Účast Datum
@@ -2849,14 +2852,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicitní záznam
 DocType: Program Enrollment Tool,Get Students,získať študentov
 DocType: Serial No,Under Warranty,V rámci záruky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Chyba]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Chyba]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Ve slovech budou viditelné, jakmile uložíte prodejní objednávky."
 ,Employee Birthday,Narozeniny zaměstnance
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Študent Batch Účasť Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,limit skríženými
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Akademický termín s týmto &quot;akademický rok &#39;{0} a&quot; Meno Termín&#39; {1} už existuje. Upravte tieto položky a skúste to znova.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Pretože existujú nejaké transakcie voči položke {0} nemožno zmeniť hodnotu {1}
 DocType: UOM,Must be Whole Number,Musí být celé číslo
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nové Listy Přidělené (ve dnech)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Pořadové číslo {0} neexistuje
@@ -2876,7 +2879,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 +49,Period Closing Entry,Období Uzávěrka Entry
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Nákladové středisko se stávajícími transakcemi nelze převést do skupiny
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Množstvo {0} {1} {2} {3}
 DocType: Account,Depreciation,Znehodnocení
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dodavatel (é)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Účasť zamestnancov Tool
@@ -2900,7 +2903,7 @@
 DocType: Supplier,Last Day of the Next Month,Posledný deň nasledujúceho mesiaca
 DocType: Support Settings,Auto close Issue after 7 days,Auto zavrieť Issue po 7 dňoch
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dovolenka nemôže byť pridelené pred {0}, pretože rovnováha dovolenky už bolo carry-odovzdávané v budúcej pridelenie dovolenku záznamu {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Poznámka: Z důvodu / Referenční datum překračuje povolené zákazníků úvěrové dní od {0} den (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Žiadateľ
 DocType: Asset Category Account,Accumulated Depreciation Account,účet oprávok
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Příspěvky
@@ -2911,7 +2914,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operácia nemôže byť prázdne
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Detail dokumentu č
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Typ strana je povinná
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Typ strana je povinná
 DocType: Quality Inspection,Outgoing,Vycházející
 DocType: Material Request,Requested For,Požadovaných pro
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
@@ -2928,11 +2931,11 @@
 DocType: Asset,Item Code,Kód položky
 DocType: Production Planning Tool,Create Production Orders,Vytvoření výrobní zakázky
 DocType: Serial No,Warranty / AMC Details,Záruka / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Vyberte manuálne študentov pre skupinu založenú na aktivitách
 DocType: Journal Entry,User Remark,Uživatel Poznámka
 DocType: Lead,Market Segment,Segment trhu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Zaplatená suma nemôže byť vyšší ako celkový negatívny dlžnej čiastky {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Interní historie práce zaměstnance
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Uzavření (Dr)
 DocType: Cheque Print Template,Cheque Size,šek Veľkosť
@@ -2948,7 +2951,7 @@
 DocType: Production Planning Tool,Create Material Requests,Vytvořit Žádosti materiálu
 DocType: Employee Education,School/University,Škola / University
 DocType: Payment Request,Reference Details,Odkaz Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Očakávaná hodnota Po celú dobu životnosti musí byť menšie ako Gross sumy nákupu
 DocType: Sales Invoice Item,Available Qty at Warehouse,Množství k dispozici na skladu
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturovaná částka
 DocType: Asset,Double Declining Balance,double degresívne
@@ -2969,20 +2972,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Rozdiel účet musí byť typu aktív / Zodpovednosť účet, pretože to Reklamná Zmierenie je Entry Otvorenie"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Zaplatené čiastky nemôže byť väčšia ako Výška úveru {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Číslo vydané objednávky je potřebné k položce {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Zákazková výroba nevytvorili
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Zákazková výroba nevytvorili
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Dátum DO"" musí byť po ""Dátum OD"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nemôže zmeniť štatút študenta {0} je prepojený s aplikáciou študentské {1}
 DocType: Asset,Fully Depreciated,plne odpísaný
 ,Stock Projected Qty,Reklamní Plánovaná POČET
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Zákazník {0} nepatří k projektu {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Výrazná Účasť HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citácie sú návrhy, ponuky ste svojim zákazníkom odoslanej"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citácie sú návrhy, ponuky ste svojim zákazníkom odoslanej"
 DocType: Sales Order,Customer's Purchase Order,Zákazníka Objednávka
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Poradové číslo a Batch
 DocType: Warranty Claim,From Company,Od Společnosti
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Súčet skóre hodnotiacich kritérií musí byť {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Hodnota nebo Množství
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Prosím nastavte Počet Odpisy rezervované
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Hodnota nebo Množství
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Objednávky nemôže byť zvýšená pre:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minúta
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nákup Daně a poplatky
@@ -2995,7 +2998,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,všetky Sklady
 DocType: Sales Partner,Retailer,Maloobchodník
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Všechny typy Dodavatele
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Všechny typy Dodavatele
 DocType: Global Defaults,Disable In Words,Zakázať v slovách
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Ponuka {0} nie je typu {1}
@@ -3004,6 +3007,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Kontokorentní úvěr na účtu
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Proveďte výplatní pásce
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Riadok # {0}: Pridelená čiastka nemôže byť vyššia ako dlžná suma.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Prechádzať BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Zajištěné úvěry
 DocType: Purchase Invoice,Edit Posting Date and Time,Úpravy účtovania Dátum a čas
@@ -3043,7 +3047,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Není dovoleno měnit obchodů s akciemi starší než {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Plně Fakturovaný
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Prosím nastaviť predvolený splatné účet zamestnanca {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Pokladní hotovost
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Dodávka sklad potrebný pre živočíšnu položku {0}
 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)
@@ -3054,7 +3057,7 @@
 DocType: Student Group,Group Based On,Skupina založená na
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","je nutný servisný položky, typ, frekvencia a množstvo náklady"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","I když existuje více pravidla pro tvorbu cen s nejvyšší prioritou, pak následující interní priority jsou použity:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},"Naozaj chcete, aby predložili všetky výplatnej páske z {0} až {1}"
 DocType: Cheque Print Template,Cheque Height,šek Výška
 DocType: Supplier,Supplier Details,Dodavatele Podrobnosti
@@ -3066,7 +3069,7 @@
 DocType: Vehicle Log,Invoice Ref,faktúra Ref
 DocType: Purchase Order,Recurring Order,Opakující se objednávky
 DocType: Company,Default Income Account,Účet Default příjmů
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Zákazník Group / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Zákazník Group / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Neuzavretý fiškálnych rokov Zisk / strata (Credit)
 DocType: Sales Invoice,Time Sheets,čas listy
 DocType: Payment Gateway Account,Default Payment Request Message,Východzí Platba Request Message
@@ -3086,10 +3089,10 @@
 DocType: Notification Control,Quotation Message,Správa k ponuke
 DocType: Employee Loan,Employee Loan Application,Zamestnanec žiadosť o úver
 DocType: Issue,Opening Date,Datum otevření
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Účasť bola úspešne označená.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Účasť bola úspešne označená.
 DocType: Journal Entry,Remark,Poznámka
 DocType: Purchase Receipt Item,Rate and Amount,Sadzba a množstvo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Typ účtu pre {0} musí byť {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Typ účtu pre {0} musí byť {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Listy a Holiday
 DocType: School Settings,Current Academic Term,Aktuálny akademický výraz
 DocType: School Settings,Current Academic Term,Aktuálny akademický výraz
@@ -3112,7 +3115,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,študent Group
 DocType: Shopping Cart Settings,Quotation Series,Číselná rada ponúk
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Položka s rovnakým názvom už existuje ({0}), prosím, zmente názov skupiny položiek alebo premenujte položku"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,vyberte zákazníka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,vyberte zákazníka
 DocType: C-Form,I,ja
 DocType: Company,Asset Depreciation Cost Center,Asset Odpisy nákladového strediska
 DocType: Sales Order Item,Sales Order Date,Prodejní objednávky Datum
@@ -3131,20 +3134,20 @@
 DocType: Vehicle,Insurance Details,poistenie Podrobnosti
 DocType: Account,Payable,Splatný
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Prosím, zadajte dobu splácania"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dlžníci ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dlžníci ({0})
 DocType: Pricing Rule,Margin,Marže
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Noví zákazníci
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Hrubý Zisk %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Výprodej Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Suma nákupu je povinná
 DocType: Lead,Address Desc,Popis adresy
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je povinná
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party je povinná
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Názov témy
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Aspoň jeden z prodeje nebo koupě musí být zvolena
-DocType: Grading Structure,Grade Intervals,grade Intervaly
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Vyberte podstatu svojho podnikania.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Riadok # {0}: Duplicitný záznam v referenciách {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,"Tam, kde jsou výrobní operace prováděny."
 DocType: Asset Movement,Source Warehouse,Zdroj Warehouse
 DocType: Installation Note,Installation Date,Datum instalace
@@ -3181,7 +3184,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Dopis hlavy na tiskových šablon.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tituly na tiskových šablon, např zálohové faktury."
 DocType: Student Guardian,Student Guardian,študent Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Poplatky typu ocenenie môže nie je označený ako Inclusive
 DocType: POS Profile,Update Stock,Aktualizace skladem
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Různé UOM položky povede k nesprávné (celkem) Čistá hmotnost hodnoty. Ujistěte se, že čistá hmotnost každé položky je ve stejném nerozpuštěných."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3209,7 +3212,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Zisk / straty
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zamestnancov a dochádzky
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,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 +117,Fill the form and save it,Vyplňte formulář a uložte jej
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Navštívte komunitné fórum
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Aktuálne množstvo na sklade
@@ -3225,7 +3228,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Změna pořadí Množství
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Aktuálne pracovné príležitosti
 DocType: Company,Stock Adjustment Account,Reklamní Nastavení účtu
-DocType: Journal Entry,Write Off,Odpísať
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpísať
 DocType: Timesheet Detail,Operation ID,Prevádzka ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","System User (login) ID. Pokud je nastaveno, stane se výchozí pro všechny formy HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Z {1}
@@ -3236,27 +3239,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dodávateľ doručí zákazníkovi
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Položka / {0}) nie je na sklade
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Ďalšie Dátum musí byť väčšia ako Dátum zverejnenia
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Show daň break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Show daň break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Vzhledem / Referenční datum nemůže být po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Import dát a export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Prírastky zásob existujú proti skladu {0}, a preto nie je možné preradiť alebo upravovať"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Žiadni študenti Nájdené
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Žiadni študenti Nájdené
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Faktúra Dátum zverejnenia
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Predať
 DocType: Sales Invoice,Rounded Total,Zaoblený Total
 DocType: Product Bundle,List items that form the package.,"Seznam položek, které tvoří balíček."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Podíl alokace by měla být ve výši 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Prosím, vyberte Dátum zverejnenia pred výberom Party"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Out of AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citácie
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vyberte prosím citácie
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Proveďte návštěv údržby
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citácie
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vyberte prosím citácie
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Počet Odpisy rezervované nemôže byť väčšia ako celkový počet Odpisy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Proveďte návštěv údržby
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosím, kontaktujte pro uživatele, kteří mají obchodní manažer ve skupině Master {0} roli"
 DocType: Company,Default Cash Account,Výchozí Peněžní účet
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (nikoliv zákazník nebo dodavatel) master.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,To je založené na účasti tohto študenta
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Žiadni študenti v
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Pridať ďalšie položky alebo otvorené plnej forme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosím, zadejte ""Očekávaná Datum dodání"""
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,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
@@ -3288,6 +3292,7 @@
 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: Warranty Claim,Item and Warranty Details,Položka a Záruka Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Kód položky&gt; Skupina položiek&gt; Značka
 DocType: Sales Team,Contribution (%),Příspěvek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Vyberte program na získanie povinných kurzov.
@@ -3303,9 +3308,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred zmierenie
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Chcete-li {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Daně a poplatky Přidal (Company měna)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,"Položka Tax Row {0} musí mít účet typu daní či výnosů nebo nákladů, nebo Vyměřovací"
 DocType: Sales Order,Partly Billed,Částečně Účtovaný
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} musí byť dlhodobý majetok položka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} musí byť dlhodobý majetok položka
 DocType: Item,Default BOM,Výchozí BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3315,8 +3320,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilový
 DocType: Vehicle,Insurance Company,Poisťovňa
 DocType: Asset Category Account,Fixed Asset Account,Fixed Asset Account
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,premenlivý
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Z Dodacího Listu
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,premenlivý
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Z Dodacího Listu
 DocType: Student,Student Email Address,Študent E-mailová adresa
 DocType: Timesheet Detail,From Time,Času od
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na sklade:
@@ -3328,12 +3333,12 @@
 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 +66,Intern,Internovat
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Meno adresy
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Meno adresy
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,kód Assessment
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Základní
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Fotky transakce před {0} jsou zmrazeny
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Prosím, klikněte na ""Generovat Schedule"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","napríklad Kg, ks, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenční číslo je povinné, pokud jste zadali k rozhodnému dni"
 DocType: Bank Reconciliation Detail,Payment Document,platba Document
@@ -3341,19 +3346,19 @@
 DocType: Salary Slip,Salary Structure,Plat struktura
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Letecká linka
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Vydání Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Ste v režime offline. Nebudete môcť znovu, kým nebudete mať sieť."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Žiadne študentské skupiny vytvorený.
 DocType: Purchase Invoice Item,Serial No,Výrobní číslo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesačné splátky suma nemôže byť vyššia ako suma úveru
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosím, zadejte první maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,tlač Language
 DocType: Salary Slip,Total Working Hours,Celkovej pracovnej doby
 DocType: Stock Entry,Including items for sub assemblies,Vrátane položiek pre montážnych podskupín
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Zadajte hodnota musí byť kladná
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Zadajte hodnota musí byť kladná
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Všetky územia
 DocType: Purchase Invoice,Items,Položky
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je už zapísané.
@@ -3373,17 +3378,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Východzí merná jednotka varianty &#39;{0}&#39; musí byť rovnaký ako v Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Vypočítať na základe
 DocType: Delivery Note Item,From Warehouse,Zo skladu
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Žiadne položky s Bill of Materials Výroba
 DocType: Assessment Plan,Supervisor Name,Meno Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
 DocType: Program Enrollment Course,Program Enrollment Course,Program na zápis do programu
-DocType: Grading Structure,Grading Structure,triedenie Štruktúra
 DocType: Purchase Taxes and Charges,Valuation and Total,Oceňování a Total
 DocType: Tax Rule,Shipping City,Prepravné City
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Přizpůsobit oznámení
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash flow z prevádzkových činností
 DocType: Sales Invoice,Shipping Rule,Přepravní Pravidlo
@@ -3404,8 +3407,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},No default BOM existuje pro bod {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Prosím, vyberte najprv Dátum zverejnenia"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Dátum začatia by mala byť pred uzávierky
 DocType: Leave Control Panel,Carry Forward,Převádět
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Nákladové středisko se stávajícími transakcemi nelze převést na hlavní účetní knihy
 DocType: Department,Days for which Holidays are blocked for this department.,"Dnů, po které Prázdniny jsou blokovány pro toto oddělení."
@@ -3418,7 +3421,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Pripojiť Hlavičku
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posledné oznámenie
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Posledné oznámenie
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Nelze odečíst, pokud kategorie je určena pro ""ocenění"" nebo ""oceňování a celkový"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Vypíšte vaše používané dane (napr DPH, Clo atď; mali by mať jedinečné názvy) a ich štandardné sadzby. Týmto sa vytvorí štandardná šablóna, ktorú môžete upraviť a pridať ďalšie neskôr."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Zápas platby faktúrami
@@ -3434,7 +3437,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Total (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment & Leisure
 DocType: Quality Inspection,Item Serial No,Položka Výrobní číslo
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Vytvoriť Zamestnanecké záznamov
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Vytvoriť Zamestnanecké záznamov
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Celkem Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,účtovná závierka
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Hodina
@@ -3447,10 +3450,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,nevedno
 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ě
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Místo Prodeje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Místo Prodeje
 DocType: Payment Entry,Received Amount,prijatej Suma
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti ľudských zdrojov&gt; Nastavenia personálu"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Prosím, nastavte systém pomenovania zamestnancov v oblasti Ľudské zdroje&gt; Osobné nastavenie"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Vytvorte pre celkové množstvo, ignorujte množstvo už na objednávke"
 DocType: Account,Tax,Daň
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,neoznačený
@@ -3463,9 +3464,9 @@
 DocType: Batch,Source Document Name,Názov zdrojového dokumentu
 DocType: Batch,Source Document Name,Názov zdrojového dokumentu
 DocType: Job Opening,Job Title,Název pozice
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,vytvoriť užívateľa
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,vytvoriť užívateľa
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Množstvo, ktoré má výroba musí byť väčšia ako 0 ° C."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Navštivte zprávu pro volání údržby.
 DocType: Stock Entry,Update Rate and Availability,Obnovovaciu rýchlosť a dostupnosť
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Percento, ktoré máte možnosť prijať alebo dodať naviac oproti objednanému množstvu. Napríklad: Keď ste si objednali 100 kusov a váša tolerancia je 10%, tak máte možnosť prijať 110 kusov."
@@ -3475,28 +3476,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Účtet nákladů je povinný pro položku {0}
 DocType: BOM,Website Description,Popis webu
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Čistá zmena vo vlastnom imaní
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Zrušte faktúre {0} prvý
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-mailová adresa musí byť jedinečná, už existuje pre {0}"
 DocType: Serial No,AMC Expiry Date,AMC Datum vypršení platnosti
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,príjem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,príjem
 ,Sales Register,Sales Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Posielať e-maily At
 DocType: Quotation,Quotation Lost Reason,Dôvod neúspešnej ponuky
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Vyberte si doménu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referenčné transakcie no {0} z {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Není nic upravovat.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Zatiaľ žiadni zákazníci!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Prehľad o peňažných tokoch
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Výška úveru nesmie prekročiť maximálnu úveru Suma {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licencie
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,"Prosím, zadejte odepsat účet"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Posledná Dátum objednávky
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Účet {0} nie je patria spoločnosti {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Sériové čísla v riadku {0} sa nezhodujú s dodacím listom
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark dochádzky pre viac zamestnancov
@@ -3521,20 +3524,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Riadok {0} # účet musí byť typu &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Množství
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravidla pro výpočet výše přepravní na prodej
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Série je povinné
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Série je povinné
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finanční služby
 DocType: Student Sibling,Student ID,Študentská karta
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Typy činností pre Time Záznamy
 DocType: Tax Rule,Sales,Predaj
 DocType: Stock Entry Detail,Basic Amount,Základná čiastka
 DocType: Training Event,Exam,skúška
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Sklad je vyžadován pro skladovou položku {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Fakturácia State
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Převod
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nie je spojený s účtom Party {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nie je spojený s účtom Party {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch explodovala kusovníku (včetně montážních podskupin)
 DocType: Authorization Rule,Applicable To (Employee),Vztahující se na (Employee)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Dátum splatnosti je povinný
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prírastok pre atribút {0} nemôže byť 0
@@ -3545,13 +3548,13 @@
 ,Inactive Customers,Neaktívni zákazníci
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Příjmky
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Jak Ceny pravidlo platí?
 DocType: Stock Entry,Delivery Note No,Dodacího listu
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ak je zaškrtnuté, je možné zakúpiť len materiálne Žiadosti o konečné surovín budú zahrnuté v materiáli požiadavky. V opačnom prípade bude vytvorený Materiál Žiadosti o materskej kusov"
 DocType: Cheque Print Template,Message to show,správa ukázať
 DocType: Company,Retail,Maloobchod
 DocType: Attendance,Absent,Nepřítomný
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle Product
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3561,10 +3564,10 @@
 DocType: Payment Entry,Account Paid From,Účet sú platení z prostriedkov
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Surovina Kód položky
 DocType: Journal Entry,Write Off Based On,Odepsat založené na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,urobiť Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,urobiť Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tlač a papiernictva
 DocType: Stock Settings,Show Barcode Field,Show čiarového kódu Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Poslať Dodávateľ e-maily
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Poslať Dodávateľ e-maily
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plat už spracované pre obdobie medzi {0} a {1}, ponechajte dobu použiteľnosti nemôže byť medzi tomto časovom období."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Instalace rekord pro sériové číslo
 DocType: Guardian Interest,Guardian Interest,Guardian Záujem
@@ -3577,6 +3580,7 @@
 DocType: Offer Letter,Awaiting Response,Čaká odpoveď
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Vyššie
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neplatný atribút {0} {1}
+DocType: Supplier,Mention if non-standard payable account,"Uveďte, či je neštandardný splatný účet"
 DocType: Salary Slip,Earning & Deduction,Výdělek a dedukce
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Volitelné. Toto nastavení bude použito k filtrování v různých transakcí.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativní ocenění Rate není povoleno
@@ -3592,10 +3596,9 @@
 DocType: Production Order Item,Production Order Item,Výroba objednávku Položka
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nebyl nalezen žádný záznam
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Náklady na vyradenie aktív
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,čiastočne ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Nákladové stredisko je povinné pre položku {2}
 DocType: Vehicle,Policy No,nie politika
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Získať predmety z Bundle Product
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Získať predmety z Bundle Product
 DocType: Asset,Straight Line,Priamka
 DocType: Project User,Project User,projekt Užívateľ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Rozdeliť
@@ -3613,7 +3616,7 @@
 DocType: Program Enrollment Tool,Get Students From,Získať študentov z
 DocType: Hub Settings,Seller Country,Prodejce Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikovať položky na webových stránkach
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina vaši študenti v dávkach
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina vaši študenti v dávkach
 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 +85,Specifications,Specifikace
@@ -3665,14 +3668,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Šek Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Účet {0}: Nadřazený účet {1} nepatří ke společnosti: {2}
 DocType: Program Enrollment Tool,Student Applicants,študent Žiadatelia
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,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/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,zápis Dátum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Zkouška
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,mzdové Components
 DocType: Program Enrollment Tool,New Academic Year,Nový akademický rok
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / dobropis
 DocType: Stock Settings,Auto insert Price List rate if missing,Automaticky vložiť cenníkovú cenu ak neexistuje
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Celkem uhrazené částky
 DocType: Production Order Item,Transferred Qty,Přenesená Množství
@@ -3692,7 +3695,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ ponechává jako neformální, nevolnosti atd."
 DocType: Email Digest,Send regular summary reports via Email.,Zasílat pravidelné souhrnné zprávy e-mailem.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Prosím nastaviť predvolený účet v Expense reklamačný typu {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Prosím nastaviť predvolený účet v Expense reklamačný typu {0}
 DocType: Assessment Result,Student Name,Meno študenta
 DocType: Brand,Item Manager,Manažér položiek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,mzdové Splatné
@@ -3713,6 +3716,7 @@
 ,Sales Funnel,Prodej Nálevka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Skratka je povinná
 DocType: Project,Task Progress,pokrok úloha
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Vozík
 ,Qty to Transfer,Množství pro přenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponuka z Obchodnej Iniciatívy alebo pre Zákazníka
 DocType: Stock Settings,Role Allowed to edit frozen stock,Role povoleno upravovat zmrazené zásoby
@@ -3740,13 +3744,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Položka Wise Tax Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,inštitút Skratka
 ,Item-wise Price List Rate,Item-moudrý Ceník Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Dodávateľská ponuka
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Dodávateľská ponuka
 DocType: Quotation,In Words will be visible once you save the Quotation.,"Ve slovech budou viditelné, jakmile uložíte nabídku."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Množstvo ({0}) nemôže byť zlomkom v riadku {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,vyberať poplatky
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Čárový kód {0} již použit u položky {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Pravidla pro přidávání náklady na dopravu.
 DocType: Item,Opening Stock,otvorenie Sklad
@@ -3764,8 +3768,8 @@
  aktualizované pomocou ""Time Log"""
 DocType: Customer,From Lead,Od Obchodnej iniciatívy
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Objednávky uvolněna pro výrobu.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Vyberte fiskálního roku ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Vyberte fiskálního roku ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profile požadované, aby POS Vstup"
 DocType: Program Enrollment Tool,Enroll Students,zapísať študenti
 DocType: Hub Settings,Name Token,Názov Tokenu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardní prodejní
@@ -3776,7 +3780,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} proti Predajnej Faktúre {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation 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: Customer,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: Production Order,Required Items,povinné predmety
 DocType: Stock Ledger Entry,Stock Value Difference,Reklamní Value Rozdíl
@@ -3797,7 +3801,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Nastavit cíle Item Group-moudrý pro tento prodeje osobě.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zásoby Starší než [dny]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Riadok # {0}: Prostriedok je povinné pre dlhodobého majetku nákup / predaj
-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.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Pokud dva nebo více pravidla pro tvorbu cen se nacházejí na základě výše uvedených podmínek, priorita je aplikována. Priorita je číslo od 0 do 20, zatímco výchozí hodnota je nula (prázdný). Vyšší číslo znamená, že bude mít přednost, pokud existuje více pravidla pro tvorbu cen se za stejných podmínek."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Fiškálny rok: {0} neexistuje
 DocType: Currency Exchange,To Currency,Chcete-li měny
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Nechte následující uživatelé schválit Žádost o dovolenou.
@@ -3823,7 +3827,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Položka {0} ignorována, protože to není skladem"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Odeslat tento výrobní zakázka pro další zpracování.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Nechcete-li použít Ceník článek v dané transakce, by měly být všechny platné pravidla pro tvorbu cen zakázáno."
 DocType: Assessment Group,Parent Assessment Group,Materská skupina Assessment
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobs
 ,Sales Order Trends,Prodejní objednávky Trendy
@@ -3834,7 +3838,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatočné náklady
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Dátum ukončenia finančného roku
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Vytvoriť ponuku od dodávateľa
 DocType: Quality Inspection,Incoming,Přicházející
 DocType: BOM,Materials Required (Exploded),Potřebný materiál (Rozložený)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Pridanie ďalších používateľov do vašej organizácie okrem Vás
@@ -3862,6 +3866,7 @@
 DocType: Employee,History In Company,Historie ve Společnosti
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Newslettery
 DocType: Stock Ledger Entry,Stock Ledger Entry,Reklamní Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Zákazník&gt; Zákaznícka skupina&gt; Územie
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Rovnaký bod bol zadaný viackrát
 DocType: Department,Leave Block List,Nechte Block List
 DocType: Sales Invoice,Tax ID,DIČ
@@ -3871,7 +3876,7 @@
 DocType: Customer,Sales Partner and Commission,Predaj Partner a Komisie
 DocType: Employee Loan,Rate of Interest (%) / Year,Úroková sadzba (%) / rok
 ,Project Quantity,projekt Množstvo
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} u všetkých položiek je nulová, môže byť by ste mali zmeniť, Distribuovať poplatkov na základe &#39;"
 DocType: Opportunity,To Discuss,K projednání
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} jednotiek {1} potrebná {2} pre dokončenie tejto transakcie.
 DocType: Loan Type,Rate of Interest (%) Yearly,Úroková sadzba (%) Ročné
@@ -3886,7 +3891,7 @@
 DocType: Purchase Invoice,Return,Spiatočná
 DocType: Production Order Operation,Production Order Operation,Výrobní zakázka Operace
 DocType: Pricing Rule,Disable,Zakázat
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Spôsob platby je povinný vykonať platbu
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Spôsob platby je povinný vykonať platbu
 DocType: Project Task,Pending Review,Čeká Review
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Aktíva {0} nemôže byť vyhodený, ako je to už {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense Claim (via Expense nároku)
@@ -3894,11 +3899,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,mark Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Riadok {0}: Mena BOM # {1} by sa mala rovnať vybranej mene {2}
 DocType: Journal Entry Account,Exchange Rate,Výmenný kurz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Prodejní objednávky {0} není předložena
 DocType: Homepage,Tag Line,tag linka
 DocType: Fee Component,Fee Component,poplatok Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Pridať položky z
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Pridať položky z
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Sklad {0}: Nadřazený účet {1} napatří společnosti {2}
 DocType: Cheque Print Template,Regular,pravidelný
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Celkový weightage všetkých hodnotiacich kritérií musí byť 100%
@@ -3911,7 +3916,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Sklad {0} neexistuje
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrace pro ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Měsíční Distribuční Procenta
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Vybraná položka nemůže mít dávku
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Ocenenie rýchlosť nebola nájdená pre výtlačku {0}, ktorý je na to účtovné položky pre požadované {1} {2}. Ak je položka vybavovať ako položka vzorky v {1}, prosím spomenúť, že v {1} tabuľky položky. V opačnom prípade vytvorte prichádzajúce legálne transakciu za položku alebo zmienka rýchlosťou ocenenie v zázname položky a skúste odovzdanie / zrušenie tejto položky"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% materiálov dodaných proti tomuto dodaciemu listu
 DocType: Project,Customer Details,Podrobnosti zákazníků
@@ -3920,15 +3925,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Zadejte url parametr pro přijímače nos
 DocType: Payment Entry,Paid Amount,Uhrazené částky
 DocType: Assessment Plan,Supervisor,vedúci
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,online
 ,Available Stock for Packing Items,K dispozici skladem pro balení položek
 DocType: Item Variant,Item Variant,Variant Položky
 DocType: Assessment Result Tool,Assessment Result Tool,Assessment Tool Výsledok
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Predložené objednávky nemožno zmazať
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Řízení kvality
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Item {0} bol zakázaný
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Item {0} bol zakázaný
 DocType: Employee Loan,Repay Fixed Amount per Period,Splácať paušálna čiastka za obdobie
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Zadajte prosím množstvo pre Položku {0}
 DocType: Employee External Work History,Employee External Work History,Zaměstnanec vnější práce History
@@ -3955,7 +3960,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Študent ID e-mailu
 DocType: Employee,Notice (days),Oznámenie (dni)
 DocType: Tax Rule,Sales Tax Template,Daň z predaja Template
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Vyberte položky, ktoré chcete uložiť faktúru"
 DocType: Employee,Encashment Date,Inkaso Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Úprava skladových zásob
@@ -3979,7 +3984,7 @@
 DocType: Item Variant Attribute,Attribute,Atribút
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Uveďte z / do rozmedzie
 DocType: Serial No,Under AMC,Podle AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Bod míra ocenění je přepočítána zvažuje přistál nákladů částku poukazu
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Výchozí nastavení pro prodejní transakce.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,Prah
@@ -3989,6 +3994,7 @@
 DocType: Purchase Invoice,Debit Note Issued,vydanie dlhopisu
 DocType: Production Order,Warehouses,Sklady
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} pohľadávku nemôže byť prevedená
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Táto položka je variantom {0} (šablóna).
 DocType: Workstation,per hour,za hodinu
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,nákup
 DocType: Announcement,Announcement,oznámenia
@@ -4004,8 +4010,8 @@
 DocType: Account,Receivable,Pohledávky
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,"Riadok # {0}: Nie je povolené meniť dodávateľa, objednávky už existuje"
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Role, která se nechá podat transakcí, které přesahují úvěrové limity."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Vyberte položky do Výroba
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Vyberte položky do Výroba
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Kmeňové dáta synchronizácia, môže to trvať nejaký čas"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodejce Popis
 DocType: Employee Education,Qualification,Kvalifikace
@@ -4017,7 +4023,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Objednáno
 DocType: Salary Detail,Component,komponentov
 DocType: Assessment Criteria,Assessment Criteria Group,Hodnotiace kritériá Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Otvorenie Oprávky musí byť menšia ako rovná {0}
 DocType: Warehouse,Warehouse Name,Název Skladu
 DocType: Naming Series,Select Transaction,Vybrat Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Zadejte Schvalování role nebo Schvalování Uživatel
@@ -4030,7 +4036,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nelze zrušit, protože předložena Reklamní Entry {0} existuje"
 DocType: Employee Loan,Disbursement Date,vyplatenie Date
 DocType: Vehicle,Vehicle,vozidlo
 DocType: Purchase Invoice,In Words,Slovy
@@ -4045,14 +4051,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Olovo%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Odpisy a zostatkov
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Množstvo {0} {1} prevedená z {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Získat přijaté zálohy
 DocType: Email Digest,Add/Remove Recipients,Přidat / Odebrat příjemce
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transakce není povoleno proti zastavila výrobu Objednat {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Chcete-li nastavit tento fiskální rok jako výchozí, klikněte na tlačítko ""Nastavit jako výchozí"""
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pripojiť
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Nedostatek Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,Item variant {0} exists with same attributes,Variant Položky {0} existuje s rovnakými vlastnosťami
 DocType: Employee Loan,Repay from Salary,Splatiť z platu
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Požiadavka na platbu proti {0} {1} na sumu {2}
@@ -4070,7 +4076,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Posúdenie Detail Výsledok
 DocType: Employee Education,Employee Education,Vzdelávanie zamestnancov
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Duplicitné skupinu položiek uvedené v tabuľke na položku v skupine
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"Je potrebné, aby priniesla Detaily položky."
 DocType: Salary Slip,Net Pay,Net Pay
 DocType: Account,Account,Účet
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Pořadové číslo {0} již obdržel
@@ -4079,7 +4085,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Sklad {0} nie je viazané na žiadny účet, vytvorte / odkazujú na príslušnom účte (aktív) na sklade."
 DocType: Purchase Invoice,Recurring Id,Opakující se Id
 DocType: Customer,Sales Team Details,Podrobnosti prodejní tým
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Zmazať trvalo?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Zmazať trvalo?
 DocType: Expense Claim,Total Claimed Amount,Celkem žalované částky
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potenciální příležitosti pro prodej.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neplatný {0}
@@ -4090,13 +4096,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Nastavte si škola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Základňa Zmena Suma (Company mena)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Žádné účetní záznamy pro následující sklady
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Uložte dokument ako prvý.
 DocType: Account,Chargeable,Vyměřovací
 DocType: Company,Change Abbreviation,Zmeniť skratku
 DocType: Expense Claim Detail,Expense Date,Datum výdaje
 DocType: Item,Max Discount (%),Max sleva (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Poslední částka objednávky
+DocType: Task,Is Milestone,Je míľnikom
 DocType: Daily Work Summary,Email Sent To,E-mailom odoslaným
 DocType: Budget,Warn,Varovat
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Akékoľvek iné poznámky, pozoruhodné úsilie, ktoré by mali ísť v záznamoch."
@@ -4117,7 +4124,7 @@
 DocType: Item Attribute Value,Attribute Value,Hodnota atributu
 ,Itemwise Recommended Reorder Level,Itemwise Doporučené Změna pořadí Level
 DocType: Salary Detail,Salary Detail,plat Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Prosím, nejprve vyberte {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Prosím, nejprve vyberte {0}"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} z {1} bodu vypršala.
 DocType: Sales Invoice,Commission,Provize
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas list pre výrobu.
@@ -4129,41 +4136,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zmraziť zásoby staršie ako` malo by byť menšie než %d dní.
 DocType: Tax Rule,Purchase Tax Template,Spotrebná daň šablóny
 ,Project wise Stock Tracking,Sledování zboží dle projektu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Plán údržby {0} existuje na {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Skutečné množství (u zdroje/cíle)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Zaměstnanecké záznamy.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosím, stojí vedľa odpisov Dátum"
 DocType: HR Settings,Payroll Settings,Nastavení Mzdové
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Zápas Nepropojený fakturách a platbách.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Objednať
 DocType: Email Digest,New Purchase Orders,Nové vydané objednávky
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Select Brand ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Select Brand ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Oprávky aj na
 DocType: Sales Invoice,C-Form Applicable,C-Form Použitelné
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Prevádzková doba musí byť väčšia ako 0 pre prevádzku {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Sklad je povinné
 DocType: Supplier,Address and Contacts,Adresa a kontakty
 DocType: UOM Conversion Detail,UOM Conversion Detail,Detail konverzie MJ
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Snažte sa o rozmer vhodný na web: 900px šírka a 100px výška
 DocType: Program,Program Abbreviation,program Skratka
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Výrobná zákazka nemôže byť vznesená proti šablóny položky
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Poplatky jsou aktualizovány v dokladu o koupi na každou položku
 DocType: Warranty Claim,Resolved By,Vyřešena
 DocType: Bank Guarantee,Start Date,Datum zahájení
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Přidělit listy dobu.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Šeky a Vklady nesprávne vymazané
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Vytvoriť citácie zákazníkov
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Vytvoriť citácie zákazníkov
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Priemerná doba zhotovená dodávateľom dodať
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,hodnotenie výsledkov
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Hodiny
 DocType: Project,Expected Start Date,Očekávané datum zahájení
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Odebrat pokud poplatků není pro tuto položku
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Mena transakcie musí byť rovnaká ako platobná brána menu
 DocType: Payment Entry,Receive,Príjem
@@ -4174,19 +4180,19 @@
 DocType: Workstation,Operating Costs,Provozní náklady
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Akčný ak súhrnné mesačný rozpočet prekročený
 DocType: Purchase Invoice,Submit on creation,Predloženie návrhu na vytvorenie
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Mena pre {0} musí byť {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Mena pre {0} musí byť {1}
 DocType: Asset,Disposal Date,Likvidácia Dátum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-maily budú zaslané všetkým aktívnym zamestnancom spoločnosti v danú hodinu, ak nemajú dovolenku. Zhrnutie odpovedí budú zaslané do polnoci."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaměstnanec Leave schvalovač
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Položka Změna pořadí již pro tento sklad existuje {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nelze prohlásit za ztracený, protože citace byla provedena."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,tréning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Výrobní zakázka {0} musí být předloženy
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosím, vyberte Počáteční datum a koncové datum pro položku {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Samozrejme je povinné v rade {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,K dnešnímu dni nemůže být dříve od data
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Pridať / Upraviť ceny
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Pridať / Upraviť ceny
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Batch,Parent Batch,Rodičovská dávka
 DocType: Cheque Print Template,Cheque Print Template,Šek šablóny tlače
@@ -4200,7 +4206,7 @@
 ,Ordered Items To Be Delivered,"Objednané zboží, které mají být dodány"
 DocType: Account,Income,Příjem
 DocType: Industry Type,Industry Type,Typ Průmyslu
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Něco se pokazilo!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Něco se pokazilo!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Prodejní faktury {0} již byla odeslána
 DocType: Assessment Result Detail,Score,skóre
@@ -4231,17 +4237,17 @@
 DocType: Item,Variant Based On,Variant založená na
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Celková weightage přiřazen by měla být 100%. Je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaši Dodávatelia
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Nelze nastavit jako Ztraceno, protože je přijata objednávka."
+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."
 DocType: Request for Quotation Item,Supplier Part No,Žiadny dodávateľ Part
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Prijaté Od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Nemôže odpočítať, ak kategória je pre &quot;ocenenie&quot; alebo &quot;Vaulation a Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Prijaté Od
 DocType: Lead,Converted,Převedené
 DocType: Item,Has Serial No,Má Sériové číslo
 DocType: Employee,Date of Issue,Datum vydání
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} do {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Od {0} do {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Riadok # {0}: Nastavte Dodávateľ pre položku {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Riadok {0}: doba hodnota musí byť väčšia ako nula.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4250,20 +4256,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturačná mena sa musí rovnať meny alebo účtu strana peňazí buď predvoleného comapany je
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,nechať inkasa
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Čím sa zaoberá?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Do skladu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Všetky Študent Prijímacie
 ,Average Commission Rate,Průměrná cena Komise
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Účast nemůže být označen pro budoucí data
 DocType: Pricing Rule,Pricing Rule Help,Ceny Pravidlo Help
 DocType: School House,House Name,Meno dom
 DocType: Purchase Taxes and Charges,Account Head,Účet Head
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrický
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridajte zvyšok vašej organizácie ako používateľa. Môžete tiež pridať pozvať zákazníkov na portáli ich pridaním zo zoznamu kontaktov
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Pridajte zvyšok vašej organizácie ako používateľa. Môžete tiež pridať pozvať zákazníkov na portáli ich pridaním zo zoznamu kontaktov
 DocType: Stock Entry,Total Value Difference (Out - In),Celková hodnota Rozdíl (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4272,7 +4278,7 @@
 DocType: Item,Customer Code,Code zákazníků
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Narozeninová připomínka pro {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Počet dnů od poslední objednávky
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debetné Na účet musí byť účtu Súvaha
 DocType: Buying Settings,Naming Series,Číselné rady
 DocType: Leave Block List,Leave Block List Name,Nechte Jméno Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Dátum poistenie štarte by mala byť menšia ako poistenie koncovým dátumom
@@ -4287,9 +4293,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Výplatnej páske zamestnanca {0} už vytvorili pre časové list {1}
 DocType: Vehicle Log,Odometer,Počítadlo najazdených kilometrov
 DocType: Sales Order Item,Ordered Qty,Objednáno Množství
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Položka {0} je zakázaná
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Položka {0} je zakázaná
 DocType: Stock Settings,Stock Frozen Upto,Reklamní Frozen aľ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM neobsahuje žiadnu skladovú položku
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projektová činnost / úkol.
 DocType: Vehicle Log,Refuelling Details,tankovacie Podrobnosti
@@ -4299,8 +4305,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Posledná cena pri platbe nebol nájdený
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Odpísať Suma (Company meny)
 DocType: Sales Invoice Timesheet,Billing Hours,billing Hodiny
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Predvolené BOM pre {0} nebol nájdený
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Riadok # {0}: Prosím nastavte množstvo objednávacie
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Poklepte na položky a pridajte ich sem
 DocType: Fees,Program Enrollment,Registrácia do programu
 DocType: Landed Cost Voucher,Landed Cost Voucher,Přistálo Náklady Voucher
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Prosím nastavte {0}
@@ -4324,7 +4331,7 @@
 DocType: Maintenance Visit,Maintenance Date,Datum údržby
 DocType: Purchase Invoice Item,Rejected Serial No,Zamítnuto Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Rok dátum začatia alebo ukončenia sa prekrýva s {0}. Aby sa zabránilo nastavte firmu
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Datum zahájení by měla být menší než konečné datum pro bod {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.","Příklad:. ABCD ##### 
  Je-li série nastavuje a pořadové číslo není uvedeno v transakcích, bude vytvořen poté automaticky sériové číslo na základě této série. Pokud chcete vždy výslovně uvést pořadová čísla pro tuto položku. ponechte prázdné."
@@ -4402,7 +4409,6 @@
 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
-DocType: Grade Interval,Grade Interval,trieda Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Datum zahájení a  Datum ukončení Fiskálního roku jsou již stanoveny ve fiskálním roce {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Svetlá Dátum aktualizované
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4449,14 +4455,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Ponechajte nezačiarknuté, ak nechcete zohľadňovať dávku pri zaradení do skupín."
 DocType: Asset,Frequency of Depreciation (Months),Frekvencia odpisy (mesiace)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Úverový účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Úverový účet
 DocType: Landed Cost Item,Landed Cost Item,Přistálo nákladovou položkou
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavenie jednoduché webové stránky pre moju organizáciu
 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 +666,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Uveďte atribútu Hodnota atribútu {0}
 DocType: Item,Default Warehouse,Výchozí Warehouse
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Rozpočet nemôže byť priradená na skupinový účet {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Prosím, zadejte nákladové středisko mateřský"
@@ -4501,7 +4507,7 @@
 DocType: Opportunity Item,Basic Rate,Základná sadzba
 DocType: GL Entry,Credit Amount,Výška úveru
 DocType: Cheque Print Template,Signatory Position,signatár Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Nastaviť ako Nezískané
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Nastaviť ako Nezískané
 DocType: Timesheet,Total Billable Hours,Celkom zúčtovateľnej hodiny
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Doklad o zaplatení Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,To je založené na transakciách proti tomuto zákazníkovi. Pozri časovú os nižšie podrobnosti
@@ -4515,11 +4521,11 @@
 ,Items To Be Requested,Položky se budou vyžadovat
 DocType: Purchase Order,Get Last Purchase Rate,Získejte posledního nákupu Cena
 DocType: Company,Company Info,Informácie o spoločnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Vyberte alebo pridanie nového zákazníka
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Vyberte alebo pridanie nového zákazníka
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Nákladové stredisko je nutné rezervovať výdavkov nárok
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikace fondů (aktiv)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,To je založené na účasti základu tohto zamestnanca
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetné účet
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Debetné účet
 DocType: Fiscal Year,Year Start Date,Dátom začiatku roka
 DocType: Attendance,Employee Name,Meno zamestnanca
 DocType: Sales Invoice,Rounded Total (Company Currency),Zaoblený Total (Company Měna)
@@ -4528,13 +4534,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,suma nákupu
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dodávateľ Cien {0} vytvoril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Koniec roka nemôže byť pred uvedením do prevádzky roku
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zamestnanecké benefity
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,Packed quantity must equal quantity for Item {0} in row {1},Balené množstvo se musí rovnať množstvu pre položku {0} v riadku {1}
 DocType: Production Order,Manufactured Qty,Vyrobeno Množství
 DocType: Purchase Receipt Item,Accepted Quantity,Schválené Množstvo
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Prosím nastaviť predvolené Holiday List pre zamestnancov {0} alebo {1} Company
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} neexistuje
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} neexistuje
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},"Riadok č {0}: Čiastka nemôže byť väčšia ako Čakajúci Suma proti Expense nároku {1}. Do doby, než množstvo je {2}"
@@ -4543,15 +4549,17 @@
 DocType: Quality Inspection Reading,Reading 3,Čtení 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Ceník nebyl nalezen nebo zakázán
 DocType: Employee Loan Application,Approved,Schválený
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Zaměstnanec úlevu na {0} musí být nastaven jako ""Left"""
 DocType: Guardian,Guardian,poručník
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Posouzení {0} vytvořil pro zaměstnance {1} v daném časovém období
 DocType: Employee,Education,Vzdelanie
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampaň Pojmenování By
 DocType: Employee,Current Address Is,Aktuální adresa je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifikovaný
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Voliteľné. Nastaví východiskovej mene spoločnosti, ak nie je uvedené."
 apps/erpnext/erpnext/config/accounts.py +61,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
@@ -4560,7 +4568,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Riadok {0}: Party / Account nezhoduje s {1} / {2} do {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Prosím, zadejte výdajového účtu"
 DocType: Account,Stock,Sklad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Riadok # {0}: Reference Document Type musí byť jedným z objednávky, faktúry alebo Journal Entry"
 DocType: Employee,Current Address,Aktuální adresa
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Je-li položka je varianta další položku pak popis, obraz, oceňování, daní atd bude stanoven ze šablony, pokud není výslovně uvedeno"
 DocType: Serial No,Purchase / Manufacture Details,Nákup / Výroba Podrobnosti
@@ -4588,7 +4596,7 @@
 DocType: Hub Settings,Hub Settings,Nastavení Hub
 DocType: Project,Gross Margin %,Hrubá Marža %
 DocType: BOM,With Operations,S operacemi
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Položky účtovníctva už boli vykonané v mene, {0} pre firmu {1}. Vyberte pohľadávky a záväzku účet s menou {0}."
 DocType: Asset,Is Existing Asset,Je existujúcemu aktívu
 DocType: Salary Detail,Statistical Component,Štatistická zložka
 ,Monthly Salary Register,Měsíční plat Register
@@ -4612,7 +4620,7 @@
 DocType: Assessment Plan,Room,izbu
 DocType: Purchase Order,Advance Paid,Vyplacené zálohy
 DocType: Item,Item Tax,Daň Položky
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiál Dodávateľovi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiál Dodávateľovi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Spotrebný Faktúra
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Prah {0}% sa objaví viac ako raz
 DocType: Expense Claim,Employees Email Id,Zaměstnanci Email Id
@@ -4643,9 +4651,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Pripojiť Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,sklad Levels
 DocType: Customer,Commission Rate,Výška provízie
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Vytvoriť Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Vytvoriť Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikace Block dovolené podle oddělení.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí byť jedným z príjem Pay a interný prevod
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",Typ platby musí byť jedným z príjem Pay a interný prevod
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analytika
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košík je prázdny
 DocType: Vehicle,Model,Modelka
@@ -4656,6 +4664,7 @@
 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
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Základný kapitál
+DocType: Shopping Cart Settings,Show Public Attachments,Zobraziť verejné prílohy
 DocType: Packing Slip,Package Weight Details,Hmotnost balení Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Platobná brána účet
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po dokončení platby presmerovať užívateľa na vybrané stránky.
@@ -4674,15 +4683,15 @@
 DocType: Batch,Expiry Date,Datum vypršení platnosti
 ,Supplier Addresses and Contacts,Dodavatel Adresy a kontakty
 ,accounts-browser,Účty-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Nejdřív vyberte kategorii
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Nejdřív vyberte kategorii
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master Project.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Ak chcete povoliť over-fakturáciu alebo over-objednávanie, aktualizujte &quot;príspevok&quot; v Nastavenie sklade, alebo výtlačku."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Neukazovať žiadny symbol ako $ atď vedľa meny.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Pól dňa)
 DocType: Supplier,Credit Days,Úvěrové dny
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Urobiť Študent Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Urobiť Študent Batch
 DocType: Leave Type,Is Carry Forward,Je převádět
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Získat předměty z BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,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/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Riadok # {0}: Vysielanie dátum musí byť rovnaké ako dátum nákupu {1} aktíva {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Prosím, zadajte Predajné objednávky v tabuľke vyššie"
@@ -4699,8 +4708,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Prosím, nastavte číselnú sériu pre účasť cez Setup&gt; Numbering Series"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 68ee525..0e07bf3 100644
--- a/erpnext/translations/sl.csv
+++ b/erpnext/translations/sl.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Najemu
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Velja za člane
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ustavljen Proizvodnja naročite ni mogoče preklicati, ga najprej Odčepiti preklicati"
 DocType: Vehicle Service,Mileage,Kilometrina
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,"Ali res želite, da ostanki ta sredstva?"
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Izberite Privzeta Dobavitelj
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Izberite Privzeta Dobavitelj
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta je potrebna za tečajnico {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Bo izračunana v transakciji.
 DocType: Purchase Order,Customer Contact,Stranka Kontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Izjemna za {0} ne more biti manjša od nič ({1})
 DocType: Manufacturing Settings,Default 10 mins,Privzeto 10 minut
 DocType: Leave Type,Leave Type Name,Pustite Tip Ime
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Prikaži odprte
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Prikaži odprte
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Zaporedje uspešno posodobljeno
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Naročilo
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural list Začetek Objavil
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Serija Točka preteka Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Osnutek
 DocType: Mode of Payment Account,Mode of Payment Account,Način plačilnega računa
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Prikaži Variante
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Prikaži Variante
 DocType: Academic Term,Academic Term,Academic Term
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Količina
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Količina
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Predstavlja tabela ne more biti prazno.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Posojili (obveznosti)
 DocType: Employee Education,Year of Passing,"Leto, ki poteka"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Reference:% s, Oznaka:% s in stranke:% s"
 DocType: Item,Country of Origin,Država izvora
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Na zalogi
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,odprta vprašanja
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Skrb za zdravje
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Zamuda pri plačilu (dnevi)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Service Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Račun
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serijska številka: {0} že naveden v prodajne fakture: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Račun
 DocType: Maintenance Schedule Item,Periodicity,Periodičnost
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Poslovno leto {0} je potrebno
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,"Pričakovana Dobavni rok je treba, preden prodaje Datum naročila"
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Pripni datoteko .csv z dvema stolpcema, eno za staro ime in enega za novim imenom"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne na delujočem poslovnega leta.
 DocType: Packed Item,Parent Detail docname,Parent Detail docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Oznaka: {1} in stranke: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,dnevnik
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Odpiranje za službo.
 DocType: Item Attribute,Increment,Prirastek
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Izberite Skladišče ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Izberite Skladišče ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Oglaševanje
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Pridobi artikle iz
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ni dovoljeno za {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Pridobi artikle iz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock ni mogoče posodobiti proti dobavnica {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Izdelek {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,"Ni elementov, navedenih"
 DocType: Payment Reconciliation,Reconcile,Uskladitev
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Trgovina z živili
 DocType: Quality Inspection Reading,Reading 1,Branje 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Naslednja Amortizacija datum ne more biti pred Nakup Datum
 DocType: SMS Center,All Sales Person,Vse Sales oseba
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"** Mesečni Distribution ** vam pomaga razširjati proračuna / Target po mesecih, če imate sezonske v vašem podjetju."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Ni najdenih predmetov
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Ni najdenih predmetov
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Plača Struktura Missing
 DocType: Lead,Person Name,Ime oseba
 DocType: Sales Invoice Item,Sales Invoice Item,Artikel na računu
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",npr &quot;Osnovna šola&quot; ali &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Poročila o zalogi
 DocType: Warehouse,Warehouse Detail,Skladišče Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditni limit je prečkal za stranko {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Izraz Končni datum ne more biti najpozneje do leta End Datum študijskem letu, v katerem je izraz povezan (študijsko leto {}). Popravite datum in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Ali je osnovno sredstvo&quot; ne more biti brez nadzora, saj obstaja evidenca sredstev proti postavki"
 DocType: Vehicle Service,Brake Oil,Zavorna olja
 DocType: Tax Rule,Tax Type,Davčna Type
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Nimate dovoljenja za dodajanje ali posodobitev vnose pred {0}
 DocType: BOM,Item Image (if not slideshow),Postavka Image (če ne slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Obstaja Stranka z istim imenom
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Urne / 60) * Dejanska  čas operacije
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Izberite BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Izberite BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Nabavna vrednost dobavljenega predmeta
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Praznik na {0} ni med Od datuma, do sedaj"
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,šole
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Št odsotnost zapisa dalo za delavca {0} za {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Prosimo, da najprej vnesete podjetje"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Prosimo, izberite Company najprej"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Ciljna Na
 DocType: BOM,Total Cost,Skupni stroški
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Trditev Znesek
 DocType: Employee,Mr,gospod
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Dvojnik skupina kupcev so v tabeli cutomer skupine
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Dobavitelj Vrsta / dobavitelj
 DocType: Naming Series,Prefix,Predpona
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Potrošni
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,razred
 DocType: Sales Invoice Item,Delivered By Supplier,Delivered dobavitelj
 DocType: SMS Center,All Contact,Vse Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Proizvodnja naročite že ustvarili za vse postavke s BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Letne plače
 DocType: Daily Work Summary,Daily Work Summary,Dnevni Delo Povzetek
 DocType: Period Closing Voucher,Closing Fiscal Year,Zapiranje poslovno leto
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} je zamrznjeno
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} je zamrznjeno
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Izberite obstoječo družbo za ustvarjanje kontnem načrtu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Zaloga Stroški
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Izberite Target Skladišče
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Začetek
 DocType: Journal Entry Account,Credit in Company Currency,Kredit v podjetju valuti
 DocType: Delivery Note,Installation Status,Namestitev Status
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ali želite posodobiti prisotnost? <br> Sedanje: {0} \ <br> Odsoten: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Sprejeta + Zavrnjeno Količina mora biti enaka Prejeto količini za postavko {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Dobava surovine za nakup
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,za POS računa je potreben vsaj en način plačila.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,za POS računa je potreben vsaj en način plačila.
 DocType: Products Settings,Show Products as a List,Prikaži izdelke na seznamu
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Naj Amortizacija Začetek
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Zahteva Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Naj Zaposleni
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Naj Zaposleni
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Broadcasting
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Izvedba
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Podrobnosti o poslovanju izvajajo.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Načrt za vzdrževanje obiskov.
 DocType: SMS Settings,Enter url parameter for message,Vnesite url parameter za sporočila
 DocType: POS Profile,Customer Groups,Skupine uporabnikov
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finančne izjave
 DocType: Guardian,Students,študenti
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Pravila za uporabo cene in popust.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Cenik mora biti primerno za nakup ali prodajo
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance znesek ne sme biti večja od {0} {1}
 DocType: Naming Series,Series List for this Transaction,Seznam zaporedij za to transakcijo
 DocType: Company,Default Payroll Payable Account,Privzeto Plače plačljivo račun
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Posodobitev e-Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Posodobitev e-Group
 DocType: Sales Invoice,Is Opening Entry,Je vstopna odprtina
 DocType: Customer Group,Mention if non-standard receivable account applicable,"Omemba če nestandardni terjatve račun, ki se uporablja"
 DocType: Course Schedule,Instructor Name,inštruktor Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Za skladišče je pred potreben Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Za skladišče je pred potreben Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Prejetih Na
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Če je omogočeno, bo vključeval non-parkom v materialu zaprosil."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Proti Sales računa Postavka
 ,Production Orders in Progress,Proizvodna naročila v teku
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Neto denarni tokovi pri financiranju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Lokalno shrambo je polna, ni shranil"
 DocType: Lead,Address & Contact,Naslov in kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Dodaj neuporabljene liste iz prejšnjih dodelitev
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Naslednja Ponavljajoči {0} se bo ustvaril na {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Skupaj Costing Znesek (preko Čas lista)
 DocType: Item Website Specification,Item Website Specification,Element Spletna stran Specifikacija
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Pustite blokiranih
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bančni vnosi
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Postavka {0} je konec življenja na {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,bančni vnosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Letno
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Sprava Postavka
 DocType: Stock Entry,Sales Invoice No,Prodaja Račun Ne
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Objavite v Hub
 DocType: Student Admission,Student Admission,študent Sprejem
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Postavka {0} je odpovedan
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Zahteva za material
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Postavka {0} je odpovedan
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Zahteva za material
 DocType: Bank Reconciliation,Update Clearance Date,Posodobitev Potrditev Datum
 DocType: Item,Purchase Details,Nakup Podrobnosti
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,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}"
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Neporavnani čeki in depoziti želite počistiti
 DocType: Item,Synced With Hub,Sinhronizirano Z Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Vrstica # {0} {1} ne more biti negativna za element {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Napačno geslo
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Vrstica # {0} {1} ne more biti negativna za element {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Napačno geslo
 DocType: Item,Variant Of,Varianta
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Dopolnil Količina ne sme biti večja od &quot;Kol za Izdelava&quot;
 DocType: Period Closing Voucher,Closing Account Head,Zapiranje računa Head
 DocType: Employee,External Work History,Zunanji Delo Zgodovina
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Krožna Reference Error
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Obvesti po e-pošti na ustvarjanje avtomatičnega Material dogovoru
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Račun Type
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Poročilo o dostavi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Poročilo o dostavi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Postavitev Davki
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Stroški Prodano sredstvi
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
-DocType: Grade Interval,Min Score,min Ocena
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} dvakrat vpisana v postavki davku
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Povzetek za ta teden in ki potekajo dejavnosti
 DocType: Student Applicant,Admitted,priznal
 DocType: Workstation,Rent Cost,Najem Stroški
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vrednost naročila
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / denarni posli proti osebi ali za notranjo prerazporeditvijo
 DocType: Shipping Rule,Valid for Countries,Velja za države
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Ta postavka je Predloga in je ni mogoče uporabiti v transakcijah. Atributi postavka bodo kopirali več kot v različicah, razen če je nastavljeno &quot;Ne Kopiraj«"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Skupaj naročite Upoštevani
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Oznaka zaposleni (npr CEO, direktor itd.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Prosimo, vpišite &quot;Ponovi na dan v mesecu&quot; vrednosti polja"
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Nakup računa ni mogoče sklepati na podlagi obstoječega sredstva {1}
 DocType: Item Tax,Tax Rate,Davčna stopnja
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} že dodeljenih za Employee {1} za obdobje {2} do {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Izberite Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Izberite Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Nakup Račun {0} je že predložila
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Vrstica # {0}: mora Serija Ne biti enaka kot {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,"Pretvarjanje, da non-Group"
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Serija (lot) postavke.
 DocType: C-Form Invoice Detail,Invoice Date,Datum računa
 DocType: GL Entry,Debit Amount,Debetni Znesek
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},"Ne more biti samo 1 račun na podjetje, v {0} {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Glej prilogo
 DocType: Purchase Order,% Received,% Prejeto
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Ustvarjanje skupin študentov
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Zahteva za ponudbo
 DocType: Salary Slip Timesheet,Working Hours,Delovni čas
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Spremenite izhodiščno / trenutno zaporedno številko obstoječega zaporedja.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Ustvari novo stranko
-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.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Ustvari naročilnice
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Ustvari novo stranko
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Če je več Rules Cenik še naprej prevladovala, so pozvane, da nastavite Priority ročno za reševanje morebitnih sporov."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Ustvari naročilnice
 ,Purchase Register,Nakup Register
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Veljavnih cenah
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) mora imeti vlogo &quot;Leave odobritelj&quot;
 DocType: Purchase Receipt,Vehicle Date,Datum vozilo
 DocType: Student Log,Medical,Medical
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Razlog za izgubo
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Razlog za izgubo
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Svinec Lastnik ne more biti isto kot vodilni
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Dodeljen znesek ne more večja od neprilagojene zneska
 DocType: Announcement,Receiver,sprejemnik
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Količina in stopnja
 DocType: Delivery Note,% Installed,% Nameščeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Učilnice / Laboratories itd, kjer se lahko načrtovana predavanja."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Prosimo, da najprej vpišete ime podjetja"
 DocType: Purchase Invoice,Supplier Name,Dobavitelj Name
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Preberite priročnik ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obvezno polje - študijsko leto
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obvezno polje - študijsko leto
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Prilagodite uvodno besedilo, ki gre kot del te e-pošte. Vsaka transakcija ima ločeno uvodno besedilo."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},"Prosimo, nastavite privzeto se plača račun za podjetje {0}"
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globalne nastavitve za vseh proizvodnih procesov.
 DocType: Accounts Settings,Accounts Frozen Upto,Računi Zamrznjena Stanuje
 DocType: SMS Log,Sent On,Pošlje On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Lastnost {0} izbrana večkrat v atributih tabeli
 DocType: HR Settings,Employee record is created using selected field. ,Evidenco o zaposlenih delavcih je ustvarjena s pomočjo izbrano polje.
 DocType: Sales Order,Not Applicable,Se ne uporablja
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Holiday gospodar.
 DocType: Request for Quotation 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 +877,Please enter Item Code.,Vnesite Koda.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Vnesite Koda.
 DocType: BOM,Costing,Stanejo
 DocType: Tax Rule,Billing County,County obračun
 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"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Od paketa No.
 DocType: Item Attribute,To Range,Da Domet
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Vrednostne papirje in depozite
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","ne more spremeniti metode vrednotenja, kot so transakcije pred nekaj elementov, ki ga ne imeti svojo lastno metodo vrednotenja"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Skupaj listi dodeljena je obvezna
 DocType: Job Opening,Description of a Job Opening,Opis službo Otvoritev
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,V čakanju na aktivnosti za danes
@@ -527,13 +532,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,Upravni uradnik
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Izberite tečaj
 DocType: Timesheet Detail,Hrs,hrs
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Prosimo, izberite Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Prosimo, izberite Company"
 DocType: Stock Entry Detail,Difference Account,Razlika račun
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Ne more blizu naloga, saj je njena odvisna Naloga {0} ni zaprt."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Vnesite skladišče, za katere se bo dvignjeno Material Zahteva"
 DocType: Production Order,Additional Operating Cost,Dodatne operacijski stroškov
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Za pripojitev, mora naslednje lastnosti biti enaka za oba predmetov"
 DocType: Shipping Rule,Net Weight,Neto teža
 DocType: Employee,Emergency Phone,Zasilna Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Nakup
@@ -543,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Prosimo, določite stopnjo za praga 0%"
 DocType: Sales Order,To Deliver,Dostaviti
 DocType: Purchase Invoice Item,Item,Postavka
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serijska št postavka ne more biti del
 DocType: Journal Entry,Difference (Dr - Cr),Razlika (Dr - Cr)
 DocType: Account,Profit and Loss,Dobiček in izguba
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Upravljanje Podizvajalci
@@ -558,7 +563,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Prirastek ne more biti 0
 DocType: Production Planning Tool,Material Requirement,Material Zahteva
 DocType: Company,Delete Company Transactions,Izbriši transakcije družbe
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referenčna številka in referenčni datum je obvezna za banke transakcijo
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Dodaj / Uredi davkov in dajatev
 DocType: Purchase Invoice,Supplier Invoice No,Dobavitelj Račun Ne
 DocType: Territory,For reference,Za sklic
@@ -569,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Namestitev Opomba Postavka
 DocType: Production Plan Item,Pending Qty,Pending Kol
 DocType: Budget,Ignore,Ignoriraj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ni aktiven
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ni aktiven
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS poslan na naslednjih številkah: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Preverite nastavitve za dimenzije za tiskanje
 DocType: Salary Slip,Salary Slip Timesheet,Plača Slip Timesheet
@@ -578,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Skupaj Komisija
 DocType: Pricing Rule,Sales Partner,Prodaja Partner
 DocType: Buying Settings,Purchase Receipt Required,Potrdilo o nakupu Obvezno
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,"Oceni Vrednotenje je obvezna, če je začel Odpiranje Stock"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Ni najdenih v tabeli računa zapisov
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Izberite podjetja in Zabava Vrsta najprej
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Finančni / računovodstvo leto.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,nakopičene Vrednosti
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Naredite Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Naredite Sales Order
 DocType: Project Task,Project Task,Project Task
 ,Lead Id,ID Ponudbe
 DocType: C-Form Invoice Detail,Grand Total,Skupna vsota
@@ -601,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,Nadaljuj Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Ponovite Stranke
 DocType: Leave Control Panel,Allocate,Dodeli
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Prodaja Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Prodaja Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Opomba: Skupna dodeljena listi {0} ne sme biti manjši od že odobrene listov {1} za obdobje
 DocType: Announcement,Posted By,Avtor
 DocType: Item,Delivered by Supplier (Drop Ship),Dostavi dobavitelja (Drop Ship)
@@ -611,7 +616,7 @@
 DocType: Quotation,Quotation To,Ponudba za
 DocType: Lead,Middle Income,Bližnji Prihodki
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Odprtino (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Dodeljen znesek ne more biti negativna
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavite Company
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Nastavite Company
@@ -623,7 +628,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Prodaja Račun Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenčna št &amp; Referenčni datum je potrebna za {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,"Izberite Plačilo računa, da bo Bank Entry"
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Ustvarjanje zapisov zaposlencev za upravljanje listje, odhodkov terjatev in na izplačane plače"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Dodaj zbirke znanja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Predlog Pisanje
 DocType: Payment Entry Deduction,Payment Entry Deduction,Plačilo Začetek odštevanja
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;ni v proračunskem letu {2}
 DocType: Buying Settings,Settings for Buying Module,Nastavitve za modul nabava
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Sredstvo {0} ne pripada družbi {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Prosimo, da najprej vnesete Potrdilo o nakupu"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,"Prosimo, da najprej vnesete Potrdilo o nakupu"
 DocType: Buying Settings,Supplier Naming By,Dobavitelj Imenovanje Z
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Neto sprememba v popisu
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Posojilo Employee Management
 DocType: Employee,Passport Number,Številka potnega lista
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Povezava z skrbnika2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Manager
 DocType: Payment Entry,Payment From / To,Plačilo Od / Do
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Časovno obdobje
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nova kreditna meja je nižja od trenutne neporavnani znesek za stranko. Kreditno linijo mora biti atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""Na podlagi"" in ""Združi po"" ne more biti enaka"
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,V minutah
 DocType: Issue,Resolution Date,Resolucija Datum
 DocType: Student Batch Name,Batch Name,serija Ime
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet ustvaril:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet ustvaril:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Prosim, nastavite privzeto gotovinski ali bančni račun v načinu plačevanja {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,včlanite se
 DocType: Selling Settings,Customer Naming By,Stranka Imenovanje Z
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,"Bo pokazal študenta, kot so v Študentski Mesečno poročilo navzočih"
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Actual Start Time
 DocType: BOM Operation,Operation Time,Operacija čas
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Finish
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Osnovna
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Osnovna
 DocType: Timesheet,Total Billed Hours,Skupaj Obračunane ure
 DocType: Journal Entry,Write Off Amount,Napišite enkratnem znesku
 DocType: Journal Entry,Bill No,Bill Ne
@@ -720,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,študent Udeležba
 DocType: Sales Invoice Timesheet,Time Sheet,čas Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,"Backflush Surovine, ki temelji na"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Prosimo, vnesite podatke točko"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Prosimo, vnesite podatke točko"
 DocType: Interest,Interest,Obresti
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Drugi podatki
@@ -731,24 +735,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Začetek Plačilo je že ustvarjena
 DocType: Purchase Receipt Item Supplied,Current Stock,Trenutna zaloga
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} ni povezana s postavko {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Predogled Plača listek
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Predogled Plača listek
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Račun {0} je bil vpisan večkrat
 DocType: Account,Expenses Included In Valuation,Stroški Vključeno v vrednotenju
 DocType: Hub Settings,Seller City,Prodajalec Mesto
 ,Absent Student Report,Odsoten Student Report
 DocType: Email Digest,Next email will be sent on:,Naslednje sporočilo bo poslano na:
 DocType: Offer Letter Term,Offer Letter Term,Pisna ponudba Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Element ima variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Podjetje {0} ne obstaja
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Količina porabljene na enoto
 DocType: Serial No,Warranty Expiry Date,Garancija Datum preteka
 DocType: Material Request Item,Quantity and Warehouse,Količina in skladišča
 DocType: Sales Invoice,Commission Rate (%),Komisija Stopnja (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Izberite program
 DocType: Project,Estimated Cost,Ocenjeni strošek
@@ -767,7 +769,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} ni zaloge artikla
 DocType: Mode of Payment Account,Default Account,Privzeti račun
 DocType: Payment Entry,Received Amount (Company Currency),Prejela znesek (družba Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Svinec je treba določiti, če je priložnost narejen iz svinca"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Prosimo, izberite tedensko off dan"
 DocType: 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
@@ -783,6 +785,7 @@
 DocType: Opportunity,Opportunity From,Priložnost Od
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Mesečno poročilo o izplačanih plačah.
 DocType: BOM,Website Specifications,Spletna Specifikacije
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Od {0} tipa {1}
 DocType: Warranty Claim,CI-,Ci
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Vrstica {0}: Factor Pretvorba je obvezna
@@ -817,6 +820,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C No.
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Branje 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,delno Ž
 DocType: Expense Claim Detail,Expense Claim Type,Expense Zahtevek Type
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Privzete nastavitve za Košarica
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Sredstvo izločeni preko Journal Entry {0}
@@ -824,14 +828,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotehnologija
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Pisarniška Vzdrževanje Stroški
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Nastavitev e-poštnega računa
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Prosimo, da najprej vnesete artikel"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Prosimo, da najprej vnesete artikel"
 DocType: Account,Liability,Odgovornost
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sankcionirano Znesek ne sme biti večja od škodnega Znesek v vrstici {0}.
 DocType: Company,Default Cost of Goods Sold Account,Privzeto Nabavna vrednost prodanega blaga račun
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Cenik ni izbrana
 DocType: Employee,Family Background,Družina Ozadje
 DocType: Request for Quotation Supplier,Send Email,Pošlji e-pošto
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Opozorilo: Invalid Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Ne Dovoljenje
 DocType: Company,Default Bank Account,Privzeti bančni račun
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Za filtriranje, ki temelji na stranke, da izberete Party Vnesite prvi"
@@ -844,8 +848,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Najdenih ni delavec
 DocType: Supplier Quotation,Stopped,Ustavljen
 DocType: Item,If subcontracted to a vendor,Če podizvajanje prodajalca
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Študent Skupina je že posodobljen.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Študent Skupina je že posodobljen.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Študent Skupina je že posodobljen.
 DocType: SMS Center,All Customer Contact,Vse Customer Contact
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Naloži zaloge ravnovesje preko CSV.
 DocType: Warehouse,Tree Details,drevo Podrobnosti
@@ -856,8 +860,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimalna Znesek računa
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Stroški Center {2} ne pripada družbi {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: računa {2} ne more biti skupina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj &#39;{DOCTYPE} &quot;tabela
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Točka Row {idx} {DOCTYPE} {DOCNAME} ne obstaja v zgoraj &#39;{DOCTYPE} &quot;tabela
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,"Timesheet {0}, je že končana ali preklicana"
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ni opravil
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Dan v mesecu, v katerem se bo samodejno Račun ustvarjen na primer 05, 28, itd"
 DocType: Asset,Opening Accumulated Depreciation,Odpiranje nabrano amortizacijo
@@ -873,7 +877,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} proti Bill {1} dne {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Razpored za golf
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Razpored za golf
 DocType: Maintenance Visit,Completion Status,Zaključek Status
 DocType: HR Settings,Enter retirement age in years,Vnesite upokojitveno starost v letih
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Ciljna Skladišče
@@ -881,7 +885,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Dovoli nad dostavo ali prejem upto tem odstotkov
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Uvoz Udeležba
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Vse Postavka Skupine
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Vse Postavka Skupine
 DocType: Process Payroll,Activity Log,Dnevnik aktivnosti
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Čisti dobiček / izguba
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Samodejno sestavite sporočilo o predložitvi transakcij.
@@ -892,7 +896,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Nakup naročila do plačila
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Predvidoma Kol
 DocType: Sales Invoice,Payment Due Date,Datum zapadlosti
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Postavka Variant {0} že obstaja z enakimi atributi
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Odpiranje&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Odpri storiti
 DocType: Notification Control,Delivery Note Message,Dostava Opomba Sporočilo
@@ -908,7 +912,7 @@
 DocType: Item Reorder,Re-Order Qty,Ponovno naročila Kol
 DocType: Leave Block List Date,Leave Block List Date,Pustite Block List Datum
 DocType: Pricing Rule,Price or Discount,Cena ali Popust
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Skupaj veljavnih cenah na Potrdilo o nakupu postavke tabele mora biti enaka kot Skupaj davkov in dajatev
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Skupaj veljavnih cenah na Potrdilo o nakupu postavke tabele mora biti enaka kot Skupaj davkov in dajatev
 DocType: Sales Team,Incentives,Spodbude
 DocType: SMS Log,Requested Numbers,Zahtevane številke
 DocType: Production Planning Tool,Only Obtain Raw Materials,Pridobite le surovine
@@ -937,13 +941,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Je v podizvajanje
 DocType: Item Attribute,Item Attribute Values,Postavka Lastnost Vrednote
 DocType: Examination Result,Examination Result,Preizkus Rezultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Potrdilo o nakupu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Potrdilo o nakupu
 ,Received Items To Be Billed,Prejete Postavke placevali
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Predložene plačilne liste
 DocType: Employee,Ms,gospa
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Menjalnega tečaja valute gospodar.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referenčna DOCTYPE mora biti eden od {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referenčna DOCTYPE mora biti eden od {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Ni mogoče najti terminu v naslednjih {0} dni za delovanje {1}
 DocType: Production Order,Plan material for sub-assemblies,Plan material za sklope
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Prodajni partnerji in ozemelj
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"ne more samodejno ustvariti račun, saj je že stock stanje na računu. Morate ustvariti ujemanje račun, preden boste lahko podatek o tem skladišču"
@@ -966,10 +970,9 @@
 DocType: Supplier,Default Payable Accounts,Privzete plačuje računov
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Employee {0} ni aktiven ali pa ne obstaja
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Postavka Variante {0} posodobljen
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vnesite Asset Kategorija točke {0}
 DocType: Quality Inspection Reading,Reading 6,Branje 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,"Ne more {0} {1} {2}, brez kakršne koli negativne izjemno račun"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Nakup računa Advance
 DocType: Hub Settings,Sync Now,Sync Now
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Vrstica {0}: Credit vnos ni mogoče povezati z {1}
@@ -983,11 +986,11 @@
 DocType: Item,Is Purchase Item,Je Nakup Postavka
 DocType: Asset,Purchase Invoice,Nakup Račun
 DocType: Stock Ledger Entry,Voucher Detail No,Bon Detail Ne
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Nov račun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Nov račun
 DocType: Stock Entry,Total Outgoing Value,Skupaj Odhodni Vrednost
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Pričetek in rok bi moral biti v istem proračunskem letu
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Pričetek in rok bi moral biti v istem proračunskem letu
 DocType: Lead,Request for Information,Zahteva za informacije
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sinhronizacija Offline Računi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sinhronizacija Offline Računi
 DocType: Payment Request,Paid,Plačan
 DocType: Program Fee,Program Fee,Cena programa
 DocType: Salary Slip,Total in words,Skupaj z besedami
@@ -997,7 +1000,7 @@
 DocType: Employee Loan,Sanctioned,sankcionirano
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, is mandatory. Maybe Currency Exchange record is not created for ,je obvezna. Mogoče 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Objavi na spletni strani
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Pošiljke strankam.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Datum dobavitelj na računu ne sme biti večja od Napotitev Datum
@@ -1008,7 +1011,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Variance
 ,Company Name,ime podjetja
 DocType: SMS Center,Total Message(s),Skupaj sporočil (-i)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Izberite Postavka za prenos
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1019,8 +1022,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"Privzeti Bank / Cash račun bo samodejno posodobljen plač Journal Entry, ko je izbrana ta način."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Intervali za naziv zakonika {0} prekriva z razreda intervalih za druge razrede. Prosimo, preverite intervali {0} in {1} in poskusite znova"
 DocType: BOM,Raw Material Cost(Company Currency),Stroškov surovin (družba Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Vsi artikli so se že prenesli na to Proizvodno naročilo.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Vrstica # {0}: stopnja ne more biti večji od stopnje, ki se uporablja pri {1} {2}"
@@ -1032,14 +1033,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Spletna stran Element
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Naložite svoje pismo glavo in logotip. (lahko jih uredite kasneje).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Naslednja Amortizacija Datum je vpisana kot preteklem dnevu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Bela
 DocType: SMS Center,All Lead (Open),Vse ponudbe (Odprte)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Vrstica {0}: Kol ni na voljo za {4} v skladišču {1} na objavo čas začetka ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Get plačanih predplačil
 DocType: Item,Automatically Create New Batch,Samodejno Ustvari novo serijo
 DocType: Item,Automatically Create New Batch,Samodejno Ustvari novo serijo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Poskrbite
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Poskrbite
 DocType: Student Admission,Admission Start Date,Vstop Datum začetka
 DocType: Journal Entry,Total Amount in Words,Skupni znesek z besedo
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Prišlo je do napake. Eden verjeten razlog je lahko, da niste shranili obrazec. Obrnite support@erpnext.com če je težava odpravljena."
@@ -1047,7 +1048,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Prosim vnesite račun za znesek spremembe
 DocType: Student Batch Name,Student Batch Name,Student Serija Ime
 DocType: Holiday List,Holiday List Name,Ime Holiday Seznam
 DocType: Repayment Schedule,Balance Loan Amount,Bilanca Znesek posojila
@@ -1067,10 +1068,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Navedite {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Odstranjeni deli brez spremembe količine ali vrednosti.
 DocType: Delivery Note,Delivery To,Dostava
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Lastnost miza je obvezna
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Lastnost miza je obvezna
 DocType: Production Planning Tool,Get Sales Orders,Pridobite prodajnih nalogov
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ne more biti negativna
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Popust
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Popust
 DocType: Asset,Total Number of Depreciations,Skupno število amortizacije
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
 DocType: Sales Invoice Item,Rate With Margin,Oceni z mejo
@@ -1086,7 +1087,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervirano Warehouse v Sales Order / dokončanih proizvodov Warehouse
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Prodajni Znesek
 DocType: Repayment Schedule,Interest Amount,Obresti Znesek
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite &quot;status&quot; in Shrani
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ste Expense odobritelj za ta zapis. Prosimo Posodobite &quot;status&quot; in Shrani
 DocType: Serial No,Creation Document No,Za ustvarjanje dokumentov ni
 DocType: Issue,Issue,Težava
 DocType: Asset,Scrapped,izločeni
@@ -1094,12 +1095,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributi za postavko variant. primer velikost, barvo itd"
 DocType: Purchase Invoice,Returns,vrne
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Skladišče
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serijska št {0} je pod vzdrževalne pogodbe stanuje {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,zaposlovanje
 DocType: Lead,Organization Name,Organization Name
 DocType: Tax Rule,Shipping State,Dostava država
 ,Projected Quantity as Source,Predvidena količina kot vir
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Postavka je treba dodati uporabo &quot;dobili predmetov iz nakupu prejemki&quot; gumb
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Vključi non-parkom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Prodajna Stroški
@@ -1107,12 +1108,12 @@
 DocType: GL Entry,Against,Proti
 DocType: Item,Default Selling Cost Center,Privzet stroškovni center prodaje
 DocType: Sales Partner,Implementation Partner,Izvajanje Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Poštna številka
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Poštna številka
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Naročilo {0} je {1}
 DocType: Opportunity,Contact Info,Kontaktni podatki
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Izdelava Zaloga Entries
 DocType: Packing Slip,Net Weight UOM,Neto teža UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} rezultatov
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} rezultatov
 DocType: Item,Default Supplier,Privzeto Dobavitelj
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Nad proizvodnjo dodatku Odstotek
 DocType: Employee Loan,Repayment Schedule,Povračilo Urnik
@@ -1120,7 +1121,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Get Tedenski datumov
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Končni datum ne sme biti manjši kot začetni datum
 DocType: Sales Person,Select company name first.,Izberite ime podjetja prvič.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Prejete ponudbe
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Za {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Povprečna starost
@@ -1139,7 +1140,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Uspešnost Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Prevoz
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Neveljavna Lastnost
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} je treba predložiti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} je treba predložiti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Količina mora biti manjša ali enaka {0}
 DocType: SMS Center,Total Characters,Skupaj Znaki
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Prosimo, izberite BOM BOM v polju za postavko {0}"
@@ -1150,7 +1151,7 @@
 DocType: Sales Partner,Distributor,Distributer
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Pravilo za dostavo za košaro
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,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 +52,Please set 'Apply Additional Discount On',Prosim nastavite &quot;Uporabi dodatni popust na &#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Od mora biti manj Razpon kot gibala
 DocType: Global Defaults,Global Defaults,Globalni Privzeto
@@ -1160,7 +1161,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Začetek Leto
 DocType: Purchase Invoice,Start date of current invoice's period,Datum začetka obdobja sedanje faktura je
 DocType: Salary Slip,Leave Without Pay,Leave brez plačila
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapaciteta Napaka Načrtovanje
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1175,7 +1176,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","To bo dodan Točka Kodeksa variante. Na primer, če je vaša kratica je &quot;SM&quot;, in oznaka postavka je &quot;T-shirt&quot;, postavka koda varianto bo &quot;T-SHIRT-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Neto Pay (z besedami), bo viden, ko boste shranite plačilnega lista."
 DocType: Purchase Invoice,Is Return,Je Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Nazaj / opominu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Nazaj / opominu
 DocType: Price List Country,Price List Country,Cenik Država
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} veljavna serijski nos za postavko {1}
@@ -1185,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vnesite Koda priti Serija Število
 DocType: Stock Settings,Default Item Group,Privzeto Element Group
 DocType: Employee Loan,Partially Disbursed,delno črpanju
-DocType: Grading Structure,Grading System Name,Ime Grading sistem
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Dobavitelj baze podatkov.
 DocType: Account,Balance Sheet,Bilanca stanja
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Stalo Center za postavko s točko zakonika &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Način plačila ni nastavljen. Prosimo, preverite, ali je bil račun nastavljen na načinu plačila ali na POS profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Vaš prodajni oseba bo dobil opomin na ta dan, da se obrnete na stranko"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Isti element ni mogoče vnesti večkrat.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Nadaljnje računi se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
@@ -1201,7 +1201,7 @@
 ,Purchase Order Items To Be Billed,Naročilnica Postavke placevali
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Nakup računa item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zaloga Glavna knjiga Prijave in GL Vnosi se oglaša za izbrane Nakup Prejemki
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Zaloga Glavna knjiga Prijave in GL Vnosi se oglaša za izbrane Nakup Prejemki
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Postavka 1
 DocType: Holiday,Holiday,Počitnice
 DocType: Support Settings,Close Issue After Days,Zapri Težava Po dnevih
@@ -1228,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Delo končano
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Prosimo navedite vsaj en atribut v tabeli Atributi
 DocType: Announcement,All Students,Vse Študenti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,"Točka {0} mora biti postavka, non-stock"
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Ogled Ledger
 DocType: Grading Scale,Intervals,intervali
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Najzgodnejša
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Element, skupina obstaja z istim imenom, vas prosimo, spremenite ime elementa ali preimenovati skupino element"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Študent Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1272,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Izplačilo plače iz {0} na {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Naročilo {0} ni veljavno
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Naročilo {0} ni veljavno
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Naročilnice vam pomaga načrtovati in spremljati svoje nakupe
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Oprostite, podjetja ne morejo biti združeni"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Skupna količina Vprašanje / Transfer {0} v dogovoru Material {1} \ ne sme biti večja od zahtevane količine {2} za postavko {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Majhno
@@ -1295,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Posredni stroški
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Vrstica {0}: Kol je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Kmetijstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Spletna stran Slika bi morala biti javna datoteka ali spletna stran URL
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,"To je skupina, root element in ga ni mogoče urejati."
@@ -1316,18 +1316,18 @@
 DocType: Student Group Student,Group Roll Number,Skupina Roll Število
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Za {0}, lahko le kreditne račune povezati proti drugemu vstop trajnika"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Vsota vseh uteži nalog bi moral biti 1. Prosimo, da ustrezno prilagodi uteži za vse naloge v projektu"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Dobavnica {0} ni predložila
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Cen Pravilo je najprej treba izbrati glede na &quot;Uporabi On &#39;polju, ki je lahko točka, točka Group ali Brand."
 DocType: Hub Settings,Seller Website,Prodajalec Spletna stran
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Skupna dodeljena odstotek za prodajne ekipe mora biti 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Status proizvodnja Sklep je {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Status proizvodnja Sklep je {0}
 DocType: Appraisal Goal,Goal,Cilj
 DocType: Sales Invoice Item,Edit Description,Uredi Opis
 ,Team Updates,ekipa Posodobitve
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Za dobavitelja
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Za dobavitelja
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Nastavitev vrste računa pomaga pri izbiri računa v transakcijah.
 DocType: Purchase Invoice,Grand Total (Company Currency),Grand Total (družba Valuta)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Ustvari Print Format
@@ -1343,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Vnos v dnevnik
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} izdelkov v teku
 DocType: Workstation,Workstation Name,Workstation Name
-DocType: Grade Interval,Grade Code,razred Code
+DocType: Grading Scale Interval,Grade Code,razred Code
 DocType: POS Item Group,POS Item Group,POS Element Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ne pripada postavki {1}
@@ -1360,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Strojna oprema
 DocType: Sales Order,Recurring Upto,Ponavljajoči Upto
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Prosimo izberite Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Prosimo izberite Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege Zapusti
 DocType: Purchase Invoice,Supplier Invoice Date,Dobavitelj Datum računa
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Morate omogočiti Košarica
@@ -1376,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Hrana
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Staranje Območje 3
 DocType: Maintenance Schedule Item,No of Visits,Število obiskov
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},obstaja Vzdrževanje Razpored {0} proti {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Vpisovanje študentov
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta zaključni račun mora biti {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Seštevek točk za vseh ciljev bi morala biti 100. To je {0}
@@ -1401,7 +1402,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Odhodni
 DocType: POS Profile,Campaign,Kampanja
 DocType: Supplier,Name and Type,Ime in Type
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Stanje odobritve mora biti &quot;Approved&quot; ali &quot;Zavrnjeno&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Stanje odobritve mora biti &quot;Approved&quot; ali &quot;Zavrnjeno&quot;
 DocType: Purchase Invoice,Contact Person,Kontaktna oseba
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','Pričakovani datum začetka' ne more biti večji od 'Pričakovan datum zaključka'
 DocType: Course Scheduling Tool,Course End Date,Seveda Končni datum
@@ -1424,14 +1425,15 @@
 DocType: Sales Invoice,Shipping Address Name,Naslov dostave
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontni načrt
 DocType: Material Request,Terms and Conditions Content,Pogoji in vsebina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ne more biti večja kot 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ne more biti večja kot 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Postavka {0} ni zaloge Item
 DocType: Maintenance Visit,Unscheduled,Nenačrtovana
 DocType: Employee,Owned,Lasti
 DocType: Salary Detail,Depends on Leave Without Pay,Odvisno od dopusta brez plačila
 DocType: Pricing Rule,"Higher the number, higher the priority","Višja kot je številka, višja je prioriteta"
 ,Purchase Invoice Trends,Račun za nakup Trendi
 DocType: Employee,Better Prospects,Boljši obeti
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Vrstica # {0}: Serija {1} ima le {2} kol. Izberite drugo serijo, ki ima {3} kol na voljo ali razdeli vrstico v več vrstic, da poda / vprašanja iz različnih serij"
 DocType: Vehicle,License Plate,Registrska tablica
 DocType: Appraisal,Goals,Cilji
 DocType: Warranty Claim,Warranty / AMC Status,Garancija / AMC Status
@@ -1449,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Delavec ne more poročati zase.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Če računa je zamrznjeno, so vpisi dovoljeni omejenih uporabnikov."
 DocType: Email Digest,Bank Balance,Banka Balance
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},"Računovodstvo Vstop za {0}: lahko {1}, se izvede le v valuti: {2}"
 DocType: Job Opening,"Job profile, qualifications required etc.","Profil delovnega mesta, potrebna usposobljenost itd"
 DocType: Journal Entry Account,Account Balance,Stanje na računu
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Davčna pravilo za transakcije.
@@ -1460,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Prikaži nezaprt poslovno leto je P &amp; L bilanc
 DocType: Shipping Rule,Shipping Account,Dostava račun
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Račun {2} je neaktiven
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Naredite Prodajni nalogi, ki vam pomaga načrtovati svoje delo in poda na čas"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Naredite Prodajni nalogi, ki vam pomaga načrtovati svoje delo in poda na čas"
 DocType: Quality Inspection,Readings,Readings
 DocType: Stock Entry,Total Additional Costs,Skupaj Dodatni stroški
 DocType: Course Schedule,SH,SH
@@ -1471,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,Do vrednosti
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Pakiranje listek
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Pakiranje listek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Urad za najem
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Nastavitve Setup SMS gateway
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Uvoz uspelo!
@@ -1493,11 +1495,11 @@
 DocType: Company,Services,Storitve
 DocType: HR Settings,Email Salary Slip to Employee,Email Plača Slip na zaposlenega
 DocType: Cost Center,Parent Cost Center,Parent Center Stroški
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Izberite Možni Dobavitelj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Izberite Možni Dobavitelj
 DocType: Sales Invoice,Source,Vir
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Prikaži zaprto
 DocType: Leave Type,Is Leave Without Pay,Se Leave brez plačila
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Sredstvo kategorije je obvezna za fiksno postavko sredstev
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ni najdenih v tabeli plačil zapisov
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ta {0} ni v nasprotju s {1} za {2} {3}
 DocType: Student Attendance Tool,Students HTML,študenti HTML
@@ -1515,7 +1517,7 @@
 DocType: Student,Date of Leaving,Datum Leaving
 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/utilities/activation.py +64,Create Leads,Ustvari Interesenti
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Ustvari Interesenti
 DocType: Maintenance Schedule,Schedules,Urniki
 DocType: Purchase Invoice Item,Net Amount,Neto znesek
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detail Ne
@@ -1543,9 +1545,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Vpisi
 DocType: Sales Invoice Item,Brand Name,Blagovna znamka
 DocType: Purchase Receipt,Transporter Details,Transporter Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Privzeto skladišče je potrebna za izbrano postavko
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Škatla
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Možni Dobavitelj
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Možni Dobavitelj
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizacija
 DocType: Budget,Monthly Distribution,Mesečni Distribution
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Sprejemnik Seznam je prazen. Prosimo, da ustvarite sprejemnik seznam"
@@ -1553,8 +1555,8 @@
 DocType: Sales Partner,Sales Partner Target,Prodaja Partner Target
 DocType: Loan Type,Maximum Loan Amount,Največja Znesek posojila
 DocType: Pricing Rule,Pricing Rule,Cen Pravilo
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Podvojena številka rola študent {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Podvojena številka rola študent {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Podvojena številka rola študent {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Podvojena številka rola študent {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Ukrep, če letni proračun Prekoračitev"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Material Zahteva za narocilo
 DocType: Shopping Cart Settings,Payment Success URL,Plačilo Uspeh URL
@@ -1575,9 +1577,9 @@
 DocType: Employee Loan,Repayment Method,Povračilo Metoda
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Če je omogočeno, bo Naslovna stran je skupina privzeta točka za spletno stran"
 DocType: Quality Inspection Reading,Reading 4,Branje 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Privzeti BOM za {0} nismo našli za projekt {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Privzeti BOM za {0} nismo našli za projekt {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Terjatve za račun družbe.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Študenti so v središču sistema, dodamo vse svoje učence"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Študenti so v središču sistema, dodamo vse svoje učence"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: Datum Potrditev {1} ne more biti pred Ček Datum {2}
 DocType: Company,Default Holiday List,Privzeti seznam praznikov
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Vrstica {0}: V času in času {1} se prekrivajo z {2}
@@ -1589,21 +1591,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"Dan (s), na kateri se prijavljate za dopust, so prazniki. Vam ni treba zaprositi za dopust."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ponovno pošlji plačila Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nova naloga
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Naredite predračun
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Naredite predračun
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Druga poročila
 DocType: Dependent Task,Dependent Task,Odvisna Task
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},"Faktor pretvorbe za privzeto mersko enoto, mora biti 1 v vrstici {0}"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Dopust tipa {0} ne more biti daljši od {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Poskusite načrtovanju operacij za X dni vnaprej.
 DocType: HR Settings,Stop Birthday Reminders,Stop Birthday opomniki
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Prosimo, nastavite privzetega izplačane plače je treba plačati račun v družbi {0}"
 DocType: SMS Center,Receiver List,Sprejemnik Seznam
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Iskanje Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Iskanje Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Porabljeni znesek
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Neto sprememba v gotovini
 DocType: Assessment Plan,Grading Scale,Ocenjevalna lestvica
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,že končana
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Merska enota {0} je v pretvorbeni faktor tabeli vpisana več kot enkrat
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,že končana
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Plačilni Nalog že obstaja {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Strošek izdanih postavk
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Količina ne sme biti več kot {0}
@@ -1635,12 +1637,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Naredite izplačilu vnos
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Vrstica {0}: Advance zoper dobavitelja mora biti v breme
 DocType: Company,Default Values,Privzete vrednosti
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvenca} izvleček
 DocType: Expense Claim,Total Amount Reimbursed,"Skupnega zneska, povrnjenega"
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ta temelji na dnevnikih glede na ta vozila. Oglejte si časovnico spodaj za podrobnosti
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Zberite
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Zoper dobavitelja Račun {0} dne {1}
 DocType: Customer,Default Price List,Privzeto Cenik
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,zapis Gibanje sredstvo {0} ustvaril
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,"Ne, ne moreš brisati poslovnega leta {0}. Poslovno leto {0} je privzet v globalnih nastavitvah"
 DocType: Journal Entry,Entry Type,Začetek Type
 ,Customer Credit Balance,Stranka Credit Balance
@@ -1660,7 +1663,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Nobena od postavk imate kakršne koli spremembe v količini ali vrednosti.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obvezno polje - program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obvezno polje - program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garancija zahtevek
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garancija zahtevek
 ,Lead Details,Podrobnosti ponudbe
 DocType: Salary Slip,Loan repayment,vračila posojila
 DocType: Purchase Invoice,End date of current invoice's period,Končni datum obdobja tekočega faktura je
@@ -1679,11 +1682,10 @@
 DocType: Employee,Permanent Address,stalni naslov
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Prosimo, izberite postavko kodo"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Prosimo, izberite postavko kodo"
 DocType: Student Sibling,Studying in Same Institute,Študij v istem inštitutu
 DocType: Territory,Territory Manager,Ozemlje Manager
 DocType: Packed Item,To Warehouse (Optional),Da Warehouse (po želji)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 DocType: Payment Entry,Paid Amount (Company Currency),Plačan znesek (družba Valuta)
 DocType: Purchase Invoice,Additional Discount,Dodatni popust
 DocType: Selling Settings,Selling Settings,Prodaja Nastavitve
@@ -1693,9 +1695,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Poglej v košarico
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marketing Stroški
 ,Item Shortage Report,Postavka Pomanjkanje Poročilo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Teža je omenjeno, \ nProsim omenja &quot;Teža UOM&quot; preveč"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Zahteva se uporablja za izdelavo tega staleža Entry
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Naslednja Amortizacija Datum je obvezna za nove investicije
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Naslednja Amortizacija Datum je obvezna za nove investicije
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ločeno Group s sedežem tečaj za vsako serijo
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Ločeno Group s sedežem tečaj za vsako serijo
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enotni enota točke.
@@ -1712,9 +1714,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: je Center Stroški potrebna za &quot;izkaz poslovnega izida&quot; računa {2}. Nastavite privzeto stroškovno Center za družbo.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Nov kontakt
 DocType: Territory,Parent Territory,Parent Territory
 DocType: Quality Inspection Reading,Reading 2,Branje 2
@@ -1731,7 +1731,7 @@
 ,Item-wise Sales Register,Element-pametno Sales Registriraj se
 DocType: Asset,Gross Purchase Amount,Bruto znesek nakupa
 DocType: Asset,Depreciation Method,Metoda amortiziranja
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Je to DDV vključen v osnovni stopnji?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Skupaj Target
 DocType: Program Course,Required,Zahtevana
@@ -1741,21 +1741,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Uskladitev JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Preveč stolpcev. Izvoziti poročilo in ga natisnete s pomočjo aplikacije za preglednice.
 DocType: Purchase Invoice Item,Batch No,Serija Ne
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},"Ni mogoče, da bi našli menjalni tečaj za {0} na {1} za ključni datum {2}"
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Dovoli več prodajnih nalogov zoper naročnikovo narocilo
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 DocType: Student Group Instructor,Student Group Instructor,Inštruktor Študent Skupina
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Skrbnika2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Main
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Main
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Nastavite predpona za številčenje serij na vaše transakcije
 DocType: Employee Attendance Tool,Employees HTML,zaposleni HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Privzeto BOM ({0}) mora biti aktiven za to postavko ali njeno predlogo
 DocType: Employee,Leave Encashed?,Dopusta unovčijo?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Priložnost Iz polja je obvezno
 DocType: Email Digest,Annual Expenses,letni stroški
 DocType: Item,Variants,Variante
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Naredite narocilo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Naredite narocilo
 DocType: SMS Center,Send To,Pošlji
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Ni dovolj bilanca dopust za dopust tipa {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Dodeljen znesek
@@ -1763,7 +1762,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Koda artikla stranke
 DocType: Stock Reconciliation,Stock Reconciliation,Uskladitev zalog
 DocType: Territory,Territory Name,Territory Name
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Work-in-Progress Warehouse je pred potreben Submit
 apps/erpnext/erpnext/config/hr.py +40,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
@@ -1771,11 +1770,10 @@
 DocType: Item,Serial Nos and Batches,Serijska št in Serije
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Študent Skupina moč
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Študent Skupina moč
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Proti listu Začetek {0} nima neprimerljivo {1} vnos
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,cenitve
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,razvrščanje intervali
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,vnesite
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","ni mogoče overbill za postavko {0} v vrstici {1} več kot {2}. Če želite, da nad-obračun, prosim, da pri nakupu Nastavitve"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Prosim, nastavite filter, ki temelji na postavki ali skladišče"
@@ -1787,17 +1785,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} je treba predložiti
 DocType: Authorization Control,Authorization Control,Pooblastilo za nadzor
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Vrstica # {0}: zavrnitev Skladišče je obvezno proti zavrnil postavki {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Plačilo
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Upravljajte naročila
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Plačilo
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Upravljajte naročila
 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
 DocType: Course,Course Abbreviation,Kratica za tečaj
 DocType: Student Leave Application,Student Leave Application,Študent Zapusti Uporaba
 DocType: Item,Will also apply for variants,Bo veljalo tudi za variante
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Sredstvo ni mogoče preklicati, saj je že {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Zaposlenih {0} v pol dneva na {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Skupaj delovni čas ne sme biti večja od max delovnih ur {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,na
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundle predmeti v času prodaje.
 DocType: Quotation Item,Actual Qty,Dejanska Količina
 DocType: Sales Invoice Item,References,Reference
@@ -1807,7 +1806,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,"Vnesli ste podvojene elemente. Prosimo, popravite in poskusite znova."
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Sodelavec
 DocType: Asset Movement,Asset Movement,Gibanje sredstvo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Nova košarico
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Nova košarico
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Postavka {0} ni serialized postavka
 DocType: SMS Center,Create Receiver List,Ustvarite sprejemnik seznam
 DocType: Vehicle,Wheels,kolesa
@@ -1839,10 +1838,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Onemogoči oblikovanje časovnih dnevnikov proti proizvodnji naročil. Operacije se ne gosenicami proti Production reda
 DocType: Student,Student Mobile Number,Študent mobilno številko
 DocType: Item,Has Variants,Ima Variante
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ste že izbrane postavke iz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Ime mesečnim izplačilom
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID je obvezen
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Serija ID je obvezen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Serija ID je obvezen
 DocType: Sales Person,Parent Sales Person,Nadrejena Sales oseba
 DocType: Purchase Invoice,Recurring Invoice,Ponavljajoči Račun
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Upravljanje projektov
@@ -1850,11 +1849,11 @@
 DocType: Budget,Fiscal Year,Poslovno leto
 DocType: Vehicle Log,Fuel Price,gorivo Cena
 DocType: Budget,Budget,Proračun
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Osnovno sredstvo točka mora biti postavka ne-stock.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Proračun ne more biti dodeljena pred {0}, ker to ni prihodek ali odhodek račun"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Doseženi
 DocType: Student Admission,Application Form Route,Prijavnica pot
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territory / Stranka
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territory / Stranka
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,na primer 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Pusti tipa {0} ni mogoče dodeliti, ker je zapustil brez plačila"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},"Vrstica {0}: Dodeljena količina {1}, mora biti manjša ali enaka zaračunati neodplačanega {2}"
@@ -1874,14 +1873,14 @@
 ,Serial No Status,Serijska Status Ne
 DocType: Payment Entry Reference,Outstanding,Izjemna
 ,Daily Timesheet Summary,Dnevni Timesheet Povzetek
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Vrstica {0}: nastavi {1} periodičnost, razlika med od do sedaj \ mora biti večja od ali enaka {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ta temelji na gibanju zalog. Glej {0} za podrobnosti
 DocType: Pricing Rule,Selling,Prodaja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Znesek {0} {1} odšteti pred {2}
 DocType: Employee,Salary Information,Plača Informacije
 DocType: Sales Person,Name and Employee ID,Ime in zaposlenih ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Rok ne more biti pred datumom knjiženja
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Dajatve in davki
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vnesite Referenčni datum
@@ -1893,14 +1892,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Ne more sklicevati številko vrstice večja ali enaka do trenutne številke vrstice za to vrsto Charge
 DocType: Asset,Sold,Prodano
 ,Item-wise Purchase History,Element-pametno Zgodovina nakupov
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot; puščati Serijska št dodal za postavko {0}"
 DocType: Account,Frozen,Frozen
 ,Open Production Orders,Odprte Proizvodne Naročila
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Osnovna Znesek (družba Valuta)
 DocType: Payment Reconciliation Payment,Reference Row,referenčna Row
 DocType: Installation Note,Installation Time,Namestitev čas
 DocType: Sales Invoice,Accounting Details,Računovodstvo Podrobnosti
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Izbriši vse transakcije za to družbo
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Naložbe
 DocType: Issue,Resolution Details,Resolucija Podrobnosti
@@ -1932,14 +1931,14 @@
 DocType: Discussion,Discussion,Diskusija
 DocType: Payment Entry,Transaction ID,Transaction ID
 DocType: Employee,Resignation Letter Date,Odstop pismo Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Cenovne Pravila so dodatno filtriran temelji na količini.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Prosimo, da določi datum Vstop za zaposlenega {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Skupni znesek plačevanja (preko Čas lista)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Ponovite Customer Prihodki
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) mora imeti vlogo &quot;Expense odobritelju&quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Izberite BOM in Količina za proizvodnjo
 DocType: Asset,Depreciation Schedule,Amortizacija Razpored
 DocType: Bank Reconciliation Detail,Against Account,Proti račun
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Polovica Dan Datum mora biti med Od datuma in do danes
@@ -1953,16 +1952,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Prosim nastavite &quot;Asset Center Amortizacija stroškov&quot; v družbi {0}
 ,Maintenance Schedules,Vzdrževanje Urniki
 DocType: Task,Actual End Date (via Time Sheet),Dejanski končni datum (preko Čas lista)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Znesek {0} {1} proti {2} {3}
 ,Quotation Trends,Trendi ponudb
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"Element Group, ki niso navedeni v točki mojster za postavko {0}"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,Bremenitev računa mora biti Terjatve račun
 DocType: Shipping Rule Condition,Shipping Amount,Znesek Dostave
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Dokler Znesek
 DocType: Purchase Invoice Item,Conversion Factor,Faktor pretvorbe
 DocType: Purchase Order,Delivered,Dostavljeno
 ,Vehicle Expenses,Stroški vozil
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
+DocType: Serial No,Invoice Details,Podrobnosti na računu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Pričakovana vrednost po življenjski dobi, mora biti večja ali enaka {0}"
 DocType: Purchase Receipt,Vehicle Number,Število vozil
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Datum, na katerega se bodo ponavljajoče račun stop"
 DocType: Employee Loan,Loan Amount,Znesek posojila
@@ -1981,12 +1981,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Evidence prisotnosti
 DocType: HR Settings,HR Settings,Nastavitve HR
 DocType: Salary Slip,net pay info,net info plačilo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Expense Terjatev čaka na odobritev. Samo Expense odobritelj lahko posodobite stanje.
 DocType: Email Digest,New Expenses,Novi stroški
 DocType: Purchase Invoice,Additional Discount Amount,Dodatni popust Količina
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Kol mora biti 1, kot točka je osnovno sredstvo. Prosimo, uporabite ločeno vrstico za večkratno Kol."
 DocType: Leave Block List Allow,Leave Block List Allow,Pustite Block List Dovoli
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ne more biti prazna ali presledek
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Skupina Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Šport
 DocType: Loan Type,Loan Name,posojilo Ime
@@ -1998,6 +1998,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Skladišče, kjer ste vzdrževanje zalog zavrnjenih predmetov"
 DocType: Production Order,Skip Material Transfer,Preskoči Material Transfer
 DocType: Production Order,Skip Material Transfer,Preskoči Material Transfer
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Mogoče najti menjalni tečaj za {0} in {1} za ključ datumu {2}. Prosimo ustvariti zapis Valuta Exchange ročno
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vaš proračunsko leto konča na
 DocType: POS Profile,Price List,Cenik
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} je zdaj privzeta poslovno leto. Prosimo, osvežite brskalnik za spremembe začele veljati."
@@ -2014,19 +2015,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Račun {0} ni veljaven. Valuta računa mora biti {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktor UOM Pretvorba je potrebno v vrstici {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od prodajnega naloga, prodaje računa ali Journal Entry"
 DocType: Salary Component,Deduction,Odbitek
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Vrstica {0}: Od časa in do časa je obvezna.
 DocType: Stock Reconciliation Item,Amount Difference,znesek Razlika
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Postavka Cena dodana za {0} v Ceniku {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vnesite ID Employee te prodaje oseba
 DocType: Territory,Classification of Customers by region,Razvrstitev stranke po regijah
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Razlika Znesek mora biti nič
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Razlika Znesek mora biti nič
 DocType: Project,Gross Margin,Gross Margin
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Prosimo, da najprej vnesete Production artikel"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Izračunan Izjava bilance banke
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,onemogočena uporabnik
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Ponudba
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Ponudba
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Skupaj Odbitek
 ,Production Analytics,proizvodne Analytics
@@ -2035,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,Item {0} has already been returned,Postavka {0} je bil že vrnjen
 DocType: Fiscal Year,**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.,** Fiskalno leto ** predstavlja poslovno leto. Vse vknjižbe in druge velike transakcije so povezane  z izidi ** poslovnega leta **.
 DocType: Opportunity,Customer / Lead Address,Stranka / Naslov ponudbe
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Opozorilo: Neveljavno potrdilo SSL za pritrditev {0}
 DocType: Student Admission,Eligibility,Upravičenost
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Interesenti vam pomaga dobiti posel, dodamo vse svoje stike in več kot vaše vodi"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Interesenti vam pomaga dobiti posel, dodamo vse svoje stike in več kot vaše vodi"
 DocType: Production Order Operation,Actual Operation Time,Dejanska Operacija čas
 DocType: Authorization Rule,Applicable To (User),Ki se uporabljajo za (Uporabnik)
 DocType: Purchase Taxes and Charges,Deduct,Odbitka
@@ -2052,7 +2053,7 @@
 DocType: Guardian,Work Address,Delovni naslov
 DocType: Appraisal,Calculate Total Score,Izračunaj skupni rezultat
 DocType: Request for Quotation,Manufacturing Manager,Proizvodnja Manager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serijska št {0} je pod garancijo stanuje {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split Dostava Opomba v pakete.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Pošiljke
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Stanje na računu ({0}) za {1} in vrednost zalog ({2}) za skladišče {3} mora biti enaka
@@ -2075,10 +2076,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Opomba: E-mail ne bo poslano uporabnike invalide
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Število interakcij
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Število interakcij
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Izberite Company ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Izberite Company ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Pustite prazno, če velja za vse oddelke"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Vrste zaposlitve (trajna, pogodbeni, intern itd)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} je obvezna za postavko {1}
 DocType: Process Payroll,Fortnightly,vsakih štirinajst dni
 DocType: Currency Exchange,From Currency,Iz valute
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2087,14 +2088,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Oceni (družba Valuta)
 DocType: Student Guardian,Others,Drugi
 DocType: Payment Entry,Unallocated Amount,nerazporejena Znesek
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,"Ne morete najti ujemanja artikel. Prosimo, izberite kakšno drugo vrednost za {0}."
 DocType: POS Profile,Taxes and Charges,Davki in dajatve
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Izdelek ali storitev, ki je kupil, prodal ali jih hranijo na zalogi."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nič več posodobitve
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Ne morete izbrati vrsto naboja kot &quot;On prejšnje vrstice Znesek&quot; ali &quot;Na prejšnje vrstice Total&quot; za prvi vrsti
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Otrok točka ne bi smela biti izdelka Bundle. Odstranite element &#39;{0}&#39; in shranite
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bančništvo
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Dodaj časovnice
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Dodaj časovnice
 DocType: Vehicle Service,Service Item,Service Element
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
 DocType: Bank Guarantee,Bank Guarantee,Bančna garancija
@@ -2120,6 +2121,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} je že {2}
 DocType: Quotation Item,Stock Balance,Stock Balance
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Sales Order do plačila
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Nastavite Poimenovanje serijsko {0} preko Nastavitev&gt; Nastavitve&gt; za poimenovanje Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,direktor
 DocType: Expense Claim Detail,Expense Claim Detail,Expense Zahtevek Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Prosimo, izberite ustrezen račun"
@@ -2144,14 +2146,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Cene se ne bodo pokazale, če Cenik ni nastavljen"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Prosimo, navedite državo ta prevoz pravilu ali preverite Dostava po celem svetu"
 DocType: Stock Entry,Total Incoming Value,Skupaj Dohodni Vrednost
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Bremenitev je potrebno
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Bremenitev je potrebno
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets pomaga slediti časa, stroškov in zaračunavanje za aktivnostmi s svojo ekipo, podpisan"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Nakup Cenik
 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,Uskladitev plačil
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Prosimo, izberite ime zadolžen osebe"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Tehnologija
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Skupaj neplačano: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Spletna stran Operacija
@@ -2179,23 +2181,23 @@
 DocType: Opportunity,Lost Reason,Lost Razlog
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vnesite Prejem dokumenta
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Vsi predmeti so bili že obračunano
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vnesite Prejem dokumenta
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Nadaljnje stroškovna mesta se lahko izvede v skupinah, vendar vnosi lahko zoper niso skupin"
 DocType: Project,External,Zunanji
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Uporabniki in dovoljenja
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Naročila za proizvodnjo Ustvarjen: {0}
 DocType: Branch,Branch,Branch
 DocType: Guardian,Mobile Number,Mobilna številka
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tiskanje in Branding
 DocType: Bin,Actual Quantity,Dejanska količina
 DocType: Shipping Rule,example: Next Day Shipping,Primer: Next Day Shipping
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serijska št {0} ni bilo mogoče najti
 DocType: Scheduling Tool,Student Batch,študent serije
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Vaše stranke
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Naredite Študent
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Naredite Študent
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ti so bili povabljeni k sodelovanju na projektu: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Prijavi se zdaj
@@ -2219,8 +2221,9 @@
 DocType: SMS Log,Sent To,Poslano
 DocType: Payment Request,Make Sales Invoice,Naredi račun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programska oprema
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Naslednja Stik datum ne more biti v preteklosti
 DocType: Company,For Reference Only.,Samo za referenco.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Izberite Serija št
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Neveljavna {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Znesek
@@ -2234,7 +2237,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Primer št ne more biti 0
 DocType: Item,Show a slideshow at the top of the page,Prikaži diaprojekcijo na vrhu strani
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Trgovine
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Trgovine
 DocType: Serial No,Delivery Time,Čas dostave
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,"Staranje, ki temelji na"
 DocType: Item,End of Life,End of Life
@@ -2246,12 +2249,12 @@
 DocType: Rename Tool,Rename Tool,Preimenovanje orodje
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Posodobitev Stroški
 DocType: Item Reorder,Item Reorder,Postavka Preureditev
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Prikaži Plača listek
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Prenos Material
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Prikaži Plača listek
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,"Ta dokument je nad mejo, ki jo {0} {1} za postavko {4}. Delaš drugo {3} zoper isto {2}?"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,znesek računa Izberite sprememba
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Prosim, nastavite ponavljajočih se po shranjevanju"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,znesek računa Izberite sprememba
 DocType: Purchase Invoice,Price List Currency,Cenik Valuta
 DocType: Naming Series,User must always select,Uporabnik mora vedno izbrati
 DocType: Stock Settings,Allow Negative Stock,Dovoli Negative Stock
@@ -2262,7 +2265,7 @@
 DocType: Budget Account,Budget Account,proračun računa
 DocType: Quality Inspection,Verified By,Verified by
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Ne more spremeniti privzeto valuto družbe, saj so obstoječi posli. Transakcije se treba odpovedati, da spremenite privzeto valuto."
-DocType: Grade Interval,Grade Description,razred Opis
+DocType: Grading Scale Interval,Grade Description,razred Opis
 DocType: Stock Entry,Purchase Receipt No,Potrdilo o nakupu Ne
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kapara
 DocType: Process Payroll,Create Salary Slip,Ustvarite plačilnega lista
@@ -2300,7 +2303,7 @@
 DocType: Upload Attendance,Attendance To Date,Udeležba na tekočem
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Plačilo računa
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Prosimo, navedite Company nadaljevati"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Neto sprememba terjatev do kupcev
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompenzacijske Off
 DocType: Offer Letter,Accepted,Sprejeto
@@ -2310,12 +2313,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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."
 DocType: Room,Room Number,Številka sobe
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Neveljavna referenčna {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ne more biti večji od načrtovanih quanitity ({2}) v proizvodnji naročite {3}
 DocType: Shipping Rule,Shipping Rule Label,Oznaka dostavnega pravila
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Uporabniški forum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Surovine ne more biti prazno.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hitro Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Ni mogel posodobiti vozni park, faktura vsebuje padec element ladijskega prometa."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Hitro Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2328,7 +2331,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Pogoji in razmer1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Ime zavoda, za katerega vzpostavitev tega sistema."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Vknjižba zamrzniti do tega datuma, nihče ne more narediti / spremeniti vnos razen vlogi določeno spodaj."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Prosimo, shranite dokument pred ustvarjanjem razpored vzdrževanja"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Stanje projekta
 DocType: UOM,Check this to disallow fractions. (for Nos),"Preverite, da je to prepoveste frakcij. (za številkami)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,so bile oblikovane naslednje naročila za proizvodnjo:
@@ -2355,7 +2358,7 @@
 ,Employees working on a holiday,Zaposleni na počitnice
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Present
 DocType: Project,% Complete Method,% Complete Metoda
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Datum začetka vzdrževanje ne more biti pred datumom dostave za serijsko št {0}
 DocType: Production Order,Actual End Date,Dejanski končni datum
 DocType: BOM,Operating Cost (Company Currency),Obratovalni stroški (družba Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2372,7 +2375,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Pusti brez plačila ne ujema z odobrenimi evidence Leave aplikacij
 DocType: Campaign,Campaign-.####,Akcija -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Naslednji koraki
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Prosimo, da določene elemente na najboljših možnih cenah"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto blizu Priložnost po 15 dneh
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Leto zaključka
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / svinec%
@@ -2410,7 +2413,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Količina
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Fee Records Created - {0}
 DocType: Asset Category Account,Asset Category Account,Sredstvo Kategorija račun
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Ne more proizvajati več item {0} od prodaje kol {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Začetek {0} ni predložila
 DocType: Payment Reconciliation,Bank / Cash Account,Banka / Gotovinski račun
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Naslednja Kontakt Po ne more biti enaka kot vodilni e-poštni naslov
@@ -2432,7 +2435,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Potrditev Datum ni omenjena
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Proizvodnja
 DocType: Guardian,Occupation,poklic
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Vrstica {0}: Začetni datum mora biti pred končnim datumom
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Skupaj (Kol)
 DocType: Sales Invoice,This Document,Ta dokument
 DocType: Installation Note Item,Installed Qty,Nameščen Kol
@@ -2448,15 +2452,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Prijavi težavo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Pomožni Stroški
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Nad
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nima računa {2} ali pa so že primerjali z drugo kupona
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Journal Entry {1} nima računa {2} ali pa so že primerjali z drugo kupona
 DocType: Buying Settings,Default Buying Price List,Privzet nabavni cenik
 DocType: Process Payroll,Salary Slip Based on Timesheet,Plača Slip Na Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Način plačila
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Izberite Serija za postavko {0}. Ni mogoče, da bi našli eno serijo, ki izpolnjuje te zahteve"
 DocType: Process Payroll,Select Employees,Izberite Zaposleni
 DocType: Opportunity,Potential Sales Deal,Potencialni Sales Deal
 DocType: Payment Entry,Cheque/Reference Date,Ček / Referenčni datum
@@ -2473,7 +2477,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Globalno POS Profil {0} že ustvarili za družbo {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Zamenjaj artikel / BOM v vseh BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Potrdilo dokument je treba predložiti
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Potrdilo dokument je treba predložiti
 DocType: Purchase Invoice Item,Received Qty,Prejela Kol
 DocType: Stock Entry Detail,Serial No / Batch,Zaporedna številka / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Ne plača in ne Delivered
@@ -2482,11 +2486,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Ni listami
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"Pustite Type {0} ni mogoče izvajati, posredovati"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Vzdrževanje Urnik se ne ustvari za vse postavke. Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 ,To Produce,Za izdelavo
 apps/erpnext/erpnext/config/hr.py +93,Payroll,izplačane plače
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Za vrstico {0} v {1}. Če želite vključiti {2} v stopnji Element, {3}, mora biti vključena tudi vrstice"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Naredite uporabnika
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Naredite uporabnika
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikacija paketu za dostavo (za tisk)
 DocType: Bin,Reserved Quantity,Rezervirano Količina
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vnesite veljaven e-poštni naslov
@@ -2500,15 +2504,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Onemogočeno predloga ne sme biti kot privzeto
 DocType: Account,Income Account,Prihodki račun
 DocType: Payment Request,Amount in customer's currency,Znesek v valuti stranke
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Dostava
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Dostava
 DocType: Stock Reconciliation Item,Current Qty,Trenutni Kol
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Glejte &quot;Oceni materialov na osnovi&quot; v stanejo oddelku
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prejšnja
 DocType: Appraisal Goal,Key Responsibility Area,Key Odgovornost Area
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Študentski Paketi vam pomaga slediti sejnin, ocene in pristojbine za študente"
 DocType: Payment Entry,Total Allocated Amount,Skupaj Dodeljena Znesek
 DocType: Item Reorder,Material Request Type,Material Zahteva Type
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural list Vstop za pla iz {0} in {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Lokalno shrambo je polna, ni rešil"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Lokalno shrambo je polna, ni rešil"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Vrstica {0}: UOM Conversion Factor je obvezna
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Stroškovno Center
@@ -2518,16 +2523,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Skrij ID davčne naročnika od prodajnih transakcij
 DocType: Upload Attendance,Upload HTML,Naloži HTML
 DocType: Employee,Relieving Date,Lajšanje Datum
-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.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Cen Pravilo je narejen prepisati Cenik / določiti diskontno odstotek, na podlagi nekaterih kriterijev."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Skladišče je mogoče spremeniti samo prek borze Vstop / Delivery Note / Potrdilo o nakupu
 DocType: Employee Education,Class / Percentage,Razred / Odstotek
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Vodja marketinga in prodaje
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Davek na prihodek
-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.","Če je izbrana Cene pravilo narejen za &quot;cena&quot;, bo prepisalo Cenik. Cen Pravilo cena je končna cena, zato je treba uporabiti pravšnji za popust. Zato v transakcijah, kot Sales Order, narocilo itd, da bodo nerealne v polje &quot;obrestna mera&quot;, namesto da polje »Cenik rate&quot;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Če je izbrana Cene pravilo narejen za &quot;cena&quot;, bo prepisalo Cenik. Cen Pravilo cena je končna cena, zato je treba uporabiti pravšnji za popust. Zato v transakcijah, kot Sales Order, narocilo itd, da bodo nerealne v polje &quot;obrestna mera&quot;, namesto da polje »Cenik rate&quot;."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track Interesenti ga Industry Type.
 DocType: Item Supplier,Item Supplier,Postavka Dobavitelj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Vnesite Koda dobiti serijo no
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Prosimo, izberite vrednost za {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Vsi naslovi.
 DocType: Company,Stock Settings,Nastavitve Stock
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2537,6 +2542,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Bomo poslali e-poštno sporočilo o dogodku na zaposlene s statusom &#39;Odpri&#39;
 DocType: Task,Depends on Tasks,Odvisno od Opravila
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Upravljanje drevesa skupine kupcev.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,"Priključki se lahko dokaže, ne da bi omogočili nakupovalni voziček"
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,New Stroški Center Ime
 DocType: Leave Control Panel,Leave Control Panel,Pustite Nadzorna plošča
@@ -2549,12 +2555,10 @@
 DocType: Sales Invoice,Debit To,Bremenitev
 DocType: Delivery Note,Required only for sample item.,Zahteva le za točko vzorca.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Dejanska Kol Po Transaction
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Dobavitelj&gt; Vrsta dobavitelj
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Št plačilni list dalo med {0} in {1}
 ,Pending SO Items For Purchase Request,Dokler SO Točke za nakup dogovoru
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Študentski Sprejemi
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} je onemogočeno
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} je onemogočeno
 DocType: Supplier,Billing Currency,Zaračunavanje Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Large
@@ -2571,9 +2575,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Domača stran Izbrani izdelka
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Vse skupine za ocenjevanje
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Novo skladišče Ime
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Skupno {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Skupno {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Ozemlje
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Navedite ni obiskov zahtevanih
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Navedite ni obiskov zahtevanih
 DocType: Stock Settings,Default Valuation Method,Način Privzeto Vrednotenje
 DocType: Vehicle Log,Fuel Qty,gorivo Kol
 DocType: Production Order Operation,Planned Start Time,Načrtovano Start Time
@@ -2589,7 +2593,7 @@
 DocType: Price List,Price List Master,Cenik Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Vse prodajne transakcije je lahko označena pred številnimi ** Prodajni Osebe **, tako da lahko nastavite in spremljanje ciljev."
 ,S.O. No.,SO No.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Prosimo, da ustvarite strank iz svinca {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Pustite samo aplikacije s statusom &quot;Approved&quot; in &quot;Zavrnjeno&quot; se lahko predloži
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Študent Group Ime je obvezno v vrsti {0}
@@ -2621,7 +2625,7 @@
 DocType: Project,Copied From,Kopirano iz
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Ime napaka: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,pomanjkanje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ni povezan z {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ni povezan z {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Udeležba na zaposlenega {0} je že označeno
 DocType: Packing Slip,If more than one package of the same type (for print),Če več paketov istega tipa (v tisku)
 ,Salary Register,plača Registracija
@@ -2640,7 +2644,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Uporabite za Košarica
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vrednost {0} za Attribute {1} ne obstaja na seznamu veljavnega točke Lastnost Vrednosti za postavko {2}
 DocType: BOM Item,Scrap %,Ostanki%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Dajatve bodo razdeljeni sorazmerno na podlagi postavka Kol ali znesek, glede na vašo izbiro"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Dajatve bodo razdeljeni sorazmerno na podlagi postavka Kol ali znesek, glede na vašo izbiro"
 DocType: Maintenance Visit,Purposes,Nameni
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacija {0} dlje od vseh razpoložljivih delovnih ur v delovni postaji {1}, razčleniti operacijo na več operacij"
@@ -2661,16 +2665,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Upravljanje Territory drevo.
 DocType: Journal Entry Account,Sales Invoice,Račun
 DocType: Journal Entry Account,Party Balance,Balance Party
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Prosimo, izberite Uporabi popust na"
 DocType: Company,Default Receivable Account,Privzeto Terjatve račun
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Ustvarite Bank vnos za celotno plačo za zgoraj izbranih kriterijih
 DocType: Stock Entry,Material Transfer for Manufacture,Prenos materialov za proizvodnjo
-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.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Popust Odstotek se lahko uporablja bodisi proti ceniku ali za vse cenik.
 DocType: Purchase Invoice,Half-yearly,Polletna
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Računovodstvo Vstop za zalogi
 DocType: Vehicle Service,Engine Oil,Motorno olje
 DocType: Sales Invoice,Sales Team1,Prodaja TEAM1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Element {0} ne obstaja
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Element {0} ne obstaja
 DocType: Sales Invoice,Customer Address,Naslov stranke
 DocType: Employee Loan,Loan Details,posojilo Podrobnosti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Vrstica {0}: Zaključen Kol mora biti večji od nič.
@@ -2678,24 +2682,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Vrstica # {0}: ne more vrniti več kot {1} za postavko {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Plot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Plot
 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}
 DocType: Cheque Print Template,Primary Settings,primarni Nastavitve
 DocType: Purchase Invoice,Select Supplier Address,Izberite Dobavitelj naslov
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Dodaj Zaposleni
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Dodaj Zaposleni
 DocType: Purchase Invoice Item,Quality Inspection,Quality Inspection
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,standard Template
 DocType: Training Event,Theory,teorija
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,"Opozorilo: Material Zahtevana Količina je manj kot minimalna, da Kol"
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Račun {0} je zamrznjen
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pravna oseba / Hčerinska družba z ločenim računom ki pripada organizaciji.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Hrana, pijača, tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Lahko le plačilo proti neobračunano {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Stopnja Komisija ne more biti večja od 100
 DocType: Stock Entry,Subcontract,Podizvajalska pogodba
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vnesite {0} najprej
@@ -2735,7 +2739,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Skladišča z obstoječim poslom ni mogoče pretvoriti v skupino.
 DocType: Assessment Result Tool,Result HTML,rezultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Poteče
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Dodaj Študenti
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Dodaj Študenti
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Prosimo, izberite {0}"
 DocType: C-Form,C-Form No,C-forma
 DocType: BOM,Exploded_items,Exploded_items
@@ -2778,7 +2782,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,"Vnesite ime oglaševalske akcije, če je vir preiskovalne akcije"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Newspaper Publishers
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Izberite Fiscal Year
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Izberite Fiscal Year
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Preureditev Raven
 DocType: Company,Chart Of Accounts Template,Graf Of predlogo računov
 DocType: Attendance,Attendance Date,Udeležba Datum
@@ -2793,14 +2797,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Dvojnik vnos
 DocType: Program Enrollment Tool,Get Students,Get Študenti
 DocType: Serial No,Under Warranty,Pod garancijo
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Error]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Error]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"V besedi bo viden, ko boste shranite Sales Order."
 ,Employee Birthday,Zaposleni Rojstni dan
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Študent Serija Udeležba orodje
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit navzkrižnim
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tveganega kapitala
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Akademski izraz s tem &quot;študijskem letu &#39;{0} in&quot; Trajanje Ime&#39; {1} že obstaja. Prosimo, spremenite te vnose in poskusite znova."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Kot že obstajajo transakcije proti zapisu {0}, ki jih ne more spremeniti vrednosti {1}"
 DocType: UOM,Must be Whole Number,Mora biti celo število
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nove Listi Dodeljena (v dnevih)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serijska št {0} ne obstaja
@@ -2820,7 +2824,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 +49,Period Closing Entry,Obdobje Closing Začetek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v skupini
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Znesek {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizacija
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Dobavitelj (-i)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Zaposleni Udeležba Tool
@@ -2844,7 +2848,7 @@
 DocType: Supplier,Last Day of the Next Month,Zadnji dan v naslednjem mesecu
 DocType: Support Settings,Auto close Issue after 7 days,Auto blizu Izdaja po 7 dneh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Dopusta ni mogoče dodeliti pred {0}, saj je bilanca dopust že-carry posredujejo v evidenco dodeljevanja dopust prihodnji {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Opomba: Zaradi / Referenčni datum presega dovoljene kreditnih stranka dni s {0} dan (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,študent Prijavitelj
 DocType: Asset Category Account,Accumulated Depreciation Account,Bilančni Amortizacija račun
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Vnosi
@@ -2855,7 +2859,7 @@
 ,Stock Analytics,Analiza zaloge
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operacije se ne sme ostati prazno
 DocType: Maintenance Visit Purpose,Against Document Detail No,Proti Podrobnosti dokumenta št
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Vrsta Party je obvezen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Vrsta Party je obvezen
 DocType: Quality Inspection,Outgoing,Odhodni
 DocType: Material Request,Requested For,Zaprosila za
 DocType: Quotation Item,Against Doctype,Proti DOCTYPE
@@ -2872,10 +2876,10 @@
 DocType: Asset,Item Code,Oznaka
 DocType: Production Planning Tool,Create Production Orders,Ustvarjanje naročila za proizvodnjo
 DocType: Serial No,Warranty / AMC Details,Garancija / AMC Podrobnosti
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,"Izberite študentov ročno za skupine dejavnosti, ki temelji"
 DocType: Journal Entry,User Remark,Uporabnik Pripomba
 DocType: Lead,Market Segment,Tržni segment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Plačani znesek ne sme biti večja od celotnega negativnega neplačanega zneska {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Zaposleni Notranji Delo Zgodovina
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Zapiranje (Dr)
 DocType: Cheque Print Template,Cheque Size,Ček Velikost
@@ -2890,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Ustvarite Material Zahteve
 DocType: Employee Education,School/University,Šola / univerza
 DocType: Payment Request,Reference Details,Referenčna Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Pričakovana vrednost Po Življenjska doba sme biti manjša od bruto zneska nakupa
 DocType: Sales Invoice Item,Available Qty at Warehouse,Na voljo Količina na Warehouse
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Zaračunavajo Znesek
 DocType: Asset,Double Declining Balance,Double Upadanje Balance
@@ -2911,20 +2915,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Razlika računa mora biti tip Asset / Liability račun, saj je ta Stock Sprava je Entry Otvoritev"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Plačanega zneska ne sme biti večja od zneska kredita {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Naročilnica zahtevanega števila za postavko {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Proizvodnja Sklep ni bil ustvarjen
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Od datuma' mora biti za 'Do datuma '
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},"status študenta, ne more spremeniti {0} je povezana z uporabo študentskega {1}"
 DocType: Asset,Fully Depreciated,celoti amortizirana
 ,Stock Projected Qty,Stock Predvidena Količina
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},"Stranka {0} ne pripada, da projekt {1}"
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markirana Udeležba HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citati so predlogi, ponudbe, ki ste jih poslali svojim strankam"
 DocType: Sales Order,Customer's Purchase Order,Stranke Naročilo
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Serijska številka in serije
 DocType: Warranty Claim,From Company,Od družbe
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Vsota ocen ocenjevalnih meril mora biti {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vrednost ali Kol
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Prosim, nastavite Število amortizacije Rezervirano"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vrednost ali Kol
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produkcije Naročila ni mogoče povečati za:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minute
 DocType: Purchase Invoice,Purchase Taxes and Charges,Nakup davki in dajatve
@@ -2937,7 +2941,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Vse Skladišča
 DocType: Sales Partner,Retailer,Retailer
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Vse vrste Dobavitelj
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Vse vrste Dobavitelj
 DocType: Global Defaults,Disable In Words,"Onemogoči ""z besedami"""
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Ponudba {0} ni tipa {1}
@@ -2946,6 +2950,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Bančnem računu računa
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Naredite plačilnega lista
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Vrstica # {0}: Razporejeni vrednosti ne sme biti večja od neplačanega zneska.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Prebrskaj BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Secured Posojila
 DocType: Purchase Invoice,Edit Posting Date and Time,Uredi datum in uro vnosa
@@ -2985,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},"Ni dovoljeno, da posodobite transakcije zalog starejši od {0}"
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Popolnoma zaračunavajo
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Prosimo, nastavite privzeto se plača račun v zaposlenega {0}"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Denarna sredstva v blagajni
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Dostava skladišče potreben za postavko parka {0}
 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)
@@ -2995,7 +2999,7 @@
 DocType: Student Group,Group Based On,"Skupina, ki temelji na"
 DocType: Journal Entry,Bill Date,Bill Datum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","morajo Service Element, tip, pogostost in odhodki znesek"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Tudi če obstaja več cenovnih Pravila z najvišjo prioriteto, se uporabljajo nato naslednji notranje prednostne naloge:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},"Ali res želite, da predložijo vse plačilni list iz {0} na {1}"
 DocType: Cheque Print Template,Cheque Height,Ček Višina
 DocType: Supplier,Supplier Details,Dobavitelj Podrobnosti
@@ -3007,7 +3011,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref na računu
 DocType: Purchase Order,Recurring Order,Ponavljajoči naročilo
 DocType: Company,Default Income Account,Privzeto Prihodki račun
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Skupina kupec / stranka
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Skupina kupec / stranka
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Nezaprt proračunskih let dobiček / izguba (Credit)
 DocType: Sales Invoice,Time Sheets,čas listi
 DocType: Payment Gateway Account,Default Payment Request Message,Privzeto Sporočilo Plačilnega Naloga
@@ -3027,10 +3031,10 @@
 DocType: Notification Control,Quotation Message,Kotacija Sporočilo
 DocType: Employee Loan,Employee Loan Application,Zaposlenih Loan Application
 DocType: Issue,Opening Date,Otvoritev Datum
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Udeležba je bila uspešno označena.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Udeležba je bila uspešno označena.
 DocType: Journal Entry,Remark,Pripomba
 DocType: Purchase Receipt Item,Rate and Amount,Stopnja in znesek
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Vrsta računa za {0} mora biti {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Listi in Holiday
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
 DocType: School Settings,Current Academic Term,Trenutni Academic Term
@@ -3053,7 +3057,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Študentska skupina
 DocType: Shopping Cart Settings,Quotation Series,Zaporedje ponudb
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Element obstaja z istim imenom ({0}), prosimo, spremenite ime postavka skupine ali preimenovanje postavke"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Izberite stranko
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Izberite stranko
 DocType: C-Form,I,jaz
 DocType: Company,Asset Depreciation Cost Center,Asset Center Amortizacija Stroški
 DocType: Sales Order Item,Sales Order Date,Datum Naročila Kupca
@@ -3072,20 +3076,20 @@
 DocType: Vehicle,Insurance Details,zavarovanje Podrobnosti
 DocType: Account,Payable,Plačljivo
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vnesite roki odplačevanja
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Dolžniki ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Dolžniki ({0})
 DocType: Pricing Rule,Margin,Margin
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nove stranke
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto dobiček %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Potrditev Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruto znesek nakupa je obvezna
 DocType: Lead,Address Desc,Naslov opis izdelka
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party je obvezen
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party je obvezen
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Ime temo
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Mora biti izbran Atleast eden prodaji ali nakupu
-DocType: Grading Structure,Grade Intervals,grade intervali
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Izberite naravo vašega podjetja.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Vrstica # {0}: Duplikat vnos v Referenčni {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Kjer so proizvodni postopki.
 DocType: Asset Movement,Source Warehouse,Vir Skladišče
 DocType: Installation Note,Installation Date,Datum vgradnje
@@ -3122,7 +3126,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Letter Glave za tiskane predloge.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Naslovi za tiskane predloge, npr predračunu."
 DocType: Student Guardian,Student Guardian,študent Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Stroški Tip vrednotenje ni mogoče označiti kot Inclusive
 DocType: POS Profile,Update Stock,Posodobi zalogo
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,"Drugačna UOM za artikle bo privedlo do napačne (skupno) Neto teža vrednosti. Prepričajte se, da je neto teža vsake postavke v istem UOM."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3150,7 +3154,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / izida
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Zaposlenih in postrežbo
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Cilj mora biti eden od {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Izpolnite obrazec in ga shranite
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Dejanska kol v zalogi
@@ -3166,7 +3170,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Preureditev Kol
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Razpisana delovna
 DocType: Company,Stock Adjustment Account,Račun prilagoditev zaloge
-DocType: Journal Entry,Write Off,Odpisati
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Odpisati
 DocType: Timesheet Detail,Operation ID,Operacija ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem uporabniku (login) ID. Če je nastavljeno, bo postala privzeta za vse oblike HR."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Od {1}
@@ -3177,27 +3181,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Dobavitelj zagotavlja naročniku
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Item / {0}) ni na zalogi
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Naslednji datum mora biti večja od Napotitev Datum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Prikaži davek break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Prikaži davek break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Zaradi / Referenčni datum ne more biti po {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Uvoz in izvoz podatkov
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","vpisi zaloge obstajajo proti Warehouse {0}, zato ga ne more ponovno dodeliti ali jo spremeni"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Najdeno študenti
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Najdeno študenti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Račun Napotitev Datum
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Prodaja
 DocType: Sales Invoice,Rounded Total,Zaokroženo skupaj
 DocType: Product Bundle,List items that form the package.,"Seznam predmetov, ki tvorijo paket."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Odstotek dodelitve mora biti enaka 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Izberite datum objave pred izbiro stranko
 DocType: Program Enrollment,School House,šola House
 DocType: Serial No,Out of AMC,Od AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Izberite Citati
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Izberite Citati
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Naredite Maintenance obisk
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Izberite Citati
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Število amortizacije naročene ne sme biti večja od skupnega št amortizacije
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Naredite Maintenance obisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Prosimo, obrnite se na uporabnika, ki imajo Sales Master Manager {0} vlogo"
 DocType: Company,Default Cash Account,Privzeti gotovinski račun
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Company (ne stranka ali dobavitelj) gospodar.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ta temelji na prisotnosti tega Študent
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Ni Študenti
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Dodajte več predmetov ali odprto popolno obliko
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Prosimo, vpišite &quot;Pričakovana Dostava Date&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Dobavnic {0} je treba preklicati pred preklicem te Sales Order
@@ -3229,6 +3234,7 @@
 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: Warranty Claim,Item and Warranty Details,Točka in Garancija Podrobnosti
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Oznaka&gt; Element Group&gt; Znamka
 DocType: Sales Team,Contribution (%),Prispevek (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Izberite program za puščati obvezne tečaje.
@@ -3244,9 +3250,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Pred uskladitvijo
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Za {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Davki in dajatve na dodano vrednost (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Postavka Davčna Row {0} morajo upoštevati vrste davka ali prihodek ali odhodek ali Obdavčljivi
 DocType: Sales Order,Partly Billed,Delno zaračunavajo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Točka {0} mora biti osnovno sredstvo postavka
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Točka {0} mora biti osnovno sredstvo postavka
 DocType: Item,Default BOM,Privzeto BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3256,8 +3262,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Avtomobilizem
 DocType: Vehicle,Insurance Company,Zavarovalnica
 DocType: Asset Category Account,Fixed Asset Account,Fiksna račun premoženja
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,spremenljivka
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Od dobavnica
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,spremenljivka
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Od dobavnica
 DocType: Student,Student Email Address,Študent e-poštni naslov
 DocType: Timesheet Detail,From Time,Od časa
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Na zalogi:
@@ -3269,12 +3275,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Cenik Exchange Rate
 DocType: Purchase Invoice Item,Rate,Vrednost
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,naslov Ime
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,naslov Ime
 DocType: Stock Entry,From BOM,Od BOM
 DocType: Assessment Code,Assessment Code,Koda ocena
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Osnovni
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Zaloga transakcije pred {0} so zamrznjeni
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Prosimo, kliknite na &quot;ustvarjajo Seznamu&quot;"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","npr Kg, Unit, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenčna številka je obvezna, če ste vnesli Referenčni datum"
 DocType: Bank Reconciliation Detail,Payment Document,plačilo dokumentov
@@ -3282,19 +3288,19 @@
 DocType: Salary Slip,Salary Structure,Struktura Plače
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Airline
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Vprašanje Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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,Ponudbe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,"Ste v načinu brez povezave. Ne boste mogli naložiti, dokler imate omrežje."
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ustvaril nobene skupine študentov.
 DocType: Purchase Invoice Item,Serial No,Zaporedna številka
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Mesečni Povračilo Znesek ne sme biti večja od zneska kredita
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Prosimo, da najprej vnesete Maintaince Podrobnosti"
 DocType: Purchase Invoice,Print Language,Jezik tiskanja
 DocType: Salary Slip,Total Working Hours,Skupaj Delovni čas
 DocType: Stock Entry,Including items for sub assemblies,"Vključno s postavkami, za sklope"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Vnesite vrednost mora biti pozitivna
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Vnesite vrednost mora biti pozitivna
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Vse Territories
 DocType: Purchase Invoice,Items,Predmeti
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Študent je že vpisan.
@@ -3314,17 +3320,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Privzeto mersko enoto za Variant &#39;{0}&#39; mora biti enaka kot v predlogo &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Izračun temelji na
 DocType: Delivery Note Item,From Warehouse,Iz skladišča
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Ni Postavke z Bill materialov za Izdelava
 DocType: Assessment Plan,Supervisor Name,Ime nadzornik
 DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
 DocType: Program Enrollment Course,Program Enrollment Course,Program Vpis tečaj
-DocType: Grading Structure,Grading Structure,razvrščanje Struktura
 DocType: Purchase Taxes and Charges,Valuation and Total,Vrednotenje in Total
 DocType: Tax Rule,Shipping City,Dostava Mesto
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Prilagodite Obvestilo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Denarni tok iz poslovanja
 DocType: Sales Invoice,Shipping Rule,Pravilo za dostavo
@@ -3345,8 +3349,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Ne obstaja privzeta BOM za postavko {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Prosimo, izberite datumom knjiženja najprej"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Pričetek mora biti pred Zapiranje Datum
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Stroškovno Center z obstoječimi transakcij ni mogoče pretvoriti v knjigo terjatev
 DocType: Department,Days for which Holidays are blocked for this department.,"Dni, za katere so Holidays blokirana za ta oddelek."
@@ -3359,7 +3363,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Priložite pisemski
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje sporočilo
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Zadnje sporočilo
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vrednotenje in Total&quot;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Seznam vaših davčnih glave (npr DDV, carine itd, morajo imeti edinstvena imena) in njihovi standardni normativi. To bo ustvarilo standardno predlogo, ki jo lahko urediti in dodati več kasneje."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match plačila z računov
@@ -3375,7 +3379,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Skupaj (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Zabava &amp; prosti čas
 DocType: Quality Inspection,Item Serial No,Postavka Zaporedna številka
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Ustvari zaposlencev zapisov
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Ustvari zaposlencev zapisov
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Skupaj Present
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,računovodski izkazi
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Ura
@@ -3388,10 +3392,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Neznan
 DocType: Shipping Rule,Shipping Rule Conditions,Pogoji dostavnega pravila
 DocType: BOM Replace Tool,The new BOM after replacement,Novi BOM po zamenjavi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Prodajno mesto
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Prodajno mesto
 DocType: Payment Entry,Received Amount,prejela znesek
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Prosimo nastavitev zaposlenih Poimenovanje sistema v kadrovsko&gt; HR Nastavitve
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Ustvarjanje za polno količino, ignoriranje količino že po naročilu"
 DocType: Account,Tax,Davčna
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ne Označeno
@@ -3404,9 +3406,9 @@
 DocType: Batch,Source Document Name,Vir Ime dokumenta
 DocType: Batch,Source Document Name,Vir Ime dokumenta
 DocType: Job Opening,Job Title,Job Naslov
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Ustvari uporabnike
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Ustvari uporabnike
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Količina na Izdelava mora biti večja od 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Obiščite poročilo za vzdrževalna klic.
 DocType: Stock Entry,Update Rate and Availability,Posodobitev Oceni in razpoložljivost
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Odstotek ste dovoljeno prejemati ali dostaviti bolj proti količine naročenega. Na primer: Če ste naročili 100 enot. in vaš dodatek za 10%, potem ste lahko prejeli 110 enot."
@@ -3415,28 +3417,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Expense račun je obvezna za postavko {0}
 DocType: BOM,Website Description,Spletna stran Opis
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Neto sprememba v kapitalu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Prosim za prekinitev računu o nakupu {0} najprej
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-poštni naslov mora biti edinstven, že obstaja za {0}"
 DocType: Serial No,AMC Expiry Date,AMC preteka Datum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,prejem
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,prejem
 ,Sales Register,Prodaja Register
 DocType: Daily Work Summary Settings Company,Send Emails At,Pošlji e-pošte na
 DocType: Quotation,Quotation Lost Reason,Kotacija Lost Razlog
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Izberite svojo domeno
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Referenčna transakcija ni {0} dne {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nič ni za urejanje.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Ni še nobene stranke!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Izkaz denarnih tokov
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredita vrednosti ne sme preseči najvišji možen kredit znesku {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,licenca
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Vnesite račun za odpis
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Zadnja Datum naročila
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Račun {0} ne pripada podjetju {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Številke v vrstici {0} se ne ujema z dobavnice
 DocType: Student,Guardian Details,Guardian Podrobnosti
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Udeležba za več zaposlenih
@@ -3461,20 +3465,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Vrstica {0} # računa mora biti tipa &quot;osnovno sredstvo&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Out Kol
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Pravila za izračun zneska ladijskega za prodajo
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serija je obvezna
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serija je obvezna
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finančne storitve
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Vrste dejavnosti za Čas Dnevniki
 DocType: Tax Rule,Sales,Prodaja
 DocType: Stock Entry Detail,Basic Amount,Osnovni znesek
 DocType: Training Event,Exam,Izpit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Skladišče je potrebna za borzo postavki {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Država za zaračunavanje
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Prenos
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ni povezana z računom stranke {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ni povezana z računom stranke {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch eksplodiral BOM (vključno podsklopov)
 DocType: Authorization Rule,Applicable To (Employee),Ki se uporabljajo za (zaposlenih)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Datum zapadlosti je obvezno
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Prirastek za Attribute {0} ne more biti 0
@@ -3485,13 +3489,13 @@
 ,Inactive Customers,neaktivne stranke
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Odkupne Prejemki
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Kako Pricing pravilo se uporablja?
 DocType: Stock Entry,Delivery Note No,Dostava Opomba Ne
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Če je omogočeno, le Nakup materialne zahteve za končne surovin bodo vključeni v materialu Prošnje. V nasprotnem primeru bo nastala Material Zahteve za nadrejene postavke"
 DocType: Cheque Print Template,Message to show,Sporočilo za prikaz
 DocType: Company,Retail,Maloprodaja
 DocType: Attendance,Absent,Odsoten
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle izdelek
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle izdelek
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3501,10 +3505,10 @@
 DocType: Payment Entry,Account Paid From,Račun se plača iz
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Oznaka
 DocType: Journal Entry,Write Off Based On,Odpisuje temelji na
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Naredite Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Naredite Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Tiskanje in Pisalne
 DocType: Stock Settings,Show Barcode Field,Prikaži Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Pošlji Dobavitelj e-pošte
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Pošlji Dobavitelj e-pošte
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Plača je že pripravljena za obdobje med {0} in {1}, Pusti obdobje uporabe ne more biti med tem časovnem obdobju."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Namestitev rekord Serial No.
 DocType: Guardian Interest,Guardian Interest,Guardian Obresti
@@ -3517,6 +3521,7 @@
 DocType: Offer Letter,Awaiting Response,Čakanje na odgovor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Nad
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Neveljaven atribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Omemba če nestandardni plača račun
 DocType: Salary Slip,Earning & Deduction,Zaslužek &amp; Odbitek
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Neobvezno. Ta nastavitev bo uporabljena za filtriranje v različnih poslih.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativno Oceni Vrednotenje ni dovoljeno
@@ -3532,10 +3537,9 @@
 DocType: Production Order Item,Production Order Item,Proizvodnja nakup Izdelek
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nobenega zapisa najdenih
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Stroški izločeni sredstvi
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,delno ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Stroški Center je obvezen za postavko {2}
 DocType: Vehicle,Policy No,Pravilnik št
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Dobili predmetov iz Bundle izdelkov
 DocType: Asset,Straight Line,Ravna črta
 DocType: Project User,Project User,projekt Uporabnik
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Split
@@ -3553,7 +3557,7 @@
 DocType: Program Enrollment Tool,Get Students From,Dobili študenti iz
 DocType: Hub Settings,Seller Country,Prodajalec Država
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Objavite elementov na spletni strani
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Skupina učenci v serijah
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Skupina učenci v serijah
 DocType: Authorization Rule,Authorization Rule,Dovoljenje Pravilo
 DocType: Sales Invoice,Terms and Conditions Details,Pogoji in Podrobnosti
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Tehnični podatki
@@ -3606,14 +3610,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Ček Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Račun {0}: Matični račun {1} ne pripada podjetju: {2}
 DocType: Program Enrollment Tool,Student Applicants,Študentski Vlagatelji
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Uspešno izbrisana vse transakcije v zvezi s to družbo!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Datum včlanitve
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Poskusno delo
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,komponente plače
 DocType: Program Enrollment Tool,New Academic Year,Novo študijsko leto
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Nazaj / dobropis
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Nazaj / dobropis
 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 +28,Total Paid Amount,Skupaj Plačan znesek
 DocType: Production Order Item,Transferred Qty,Prenese Kol
@@ -3633,7 +3637,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Vrsta listov kot priložnostno, bolni itd"
 DocType: Email Digest,Send regular summary reports via Email.,Pošlji redna zbirna poročila preko e-maila.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Prosim, nastavite privzetega računa v Tip Expense Terjatve {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Prosim, nastavite privzetega računa v Tip Expense Terjatve {0}"
 DocType: Assessment Result,Student Name,Student Ime
 DocType: Brand,Item Manager,Element Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Plače plačljivo
@@ -3654,6 +3658,7 @@
 ,Sales Funnel,Prodaja toka
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Kratica je obvezna
 DocType: Project,Task Progress,naloga Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Košarica
 ,Qty to Transfer,Količina Prenos
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Ponudbe za interesente ali stranke.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vloga Dovoljeno urediti zamrznjeno zalog
@@ -3681,13 +3686,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Postavka Wise Davčna Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Kratica inštituta
 ,Item-wise Price List Rate,Element-pametno Cenik Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Dobavitelj za predračun
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Dobavitelj za predračun
 DocType: Quotation,In Words will be visible once you save the Quotation.,"V besedi bo viden, ko boste prihranili citata."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Količina ({0}) ne more biti komponenta v vrstici {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,zbiranje pristojbine
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barcode {0} že uporabljajo v postavki {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Pravila za dodajanje stroškov dostave.
 DocType: Item,Opening Stock,Začetna zaloga
@@ -3704,8 +3709,8 @@
 Updated via 'Time Log'",v minutah Posodobljeno preko &quot;Čas Logu&quot;
 DocType: Customer,From Lead,Iz ponudbe
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Naročila sprosti za proizvodnjo.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Izberite poslovno leto ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Izberite poslovno leto ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"POS Profil zahteva, da POS Entry"
 DocType: Program Enrollment Tool,Enroll Students,včlanite Študenti
 DocType: Hub Settings,Name Token,Ime Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardna Prodaja
@@ -3716,7 +3721,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} za račun {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Ime projekta
-DocType: Supplier,Mention if non-standard receivable account,Omemba če nestandardno terjatve račun
+DocType: Customer,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: Production Order,Required Items,Zahtevani Točke
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Value Razlika
@@ -3737,7 +3742,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Določiti cilje Postavka Group-pametno za te prodaje oseba.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Zaloge Older Than [dni]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Sredstvo je obvezna za osnovno sredstvo nakupu / prodaji
-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.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Če dva ali več Cenik Pravilnik ugotovila na podlagi zgoraj navedenih pogojev, se uporablja Prioriteta. Prednostno je število med 0 do 20, medtem ko privzeta vrednost nič (prazno). Višja številka pomeni, da bo prednost, če obstaja več cenovnih Pravila z enakimi pogoji."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Poslovno leto: {0} ne obstaja
 DocType: Currency Exchange,To Currency,Valutnemu
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,"Pustimo, da se naslednji uporabniki za odobritev dopusta Aplikacije za blok dni."
@@ -3763,7 +3768,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Postavka {0} prezrta, ker ne gre za element parka"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Predloži ta proizvodnja red za nadaljnjo predelavo.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da ne uporabljajo Cenovno pravilo v posameznem poslu, bi morali vsi, ki se uporabljajo pravila za oblikovanje cen so onemogočeni."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Da ne uporabljajo Cenovno pravilo v posameznem poslu, bi morali vsi, ki se uporabljajo pravila za oblikovanje cen so onemogočeni."
 DocType: Assessment Group,Parent Assessment Group,Skupina Ocena Parent
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Order Trendi
@@ -3774,7 +3779,7 @@
 DocType: Stock Entry Detail,Additional Cost,Dodatne Stroški
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Proračunsko leto End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Naredite Dobavitelj predračun
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Naredite Dobavitelj predračun
 DocType: Quality Inspection,Incoming,Dohodni
 DocType: BOM,Materials Required (Exploded),Potreben materiali (eksplodirala)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Dodati uporabnike za vašo organizacijo, razen sebe"
@@ -3802,6 +3807,7 @@
 DocType: Employee,History In Company,Zgodovina V družbi
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Glasila
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Stranka&gt; Skupina kupcev&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Enako postavka je bila vpisana večkrat
 DocType: Department,Leave Block List,Pustite Block List
 DocType: Sales Invoice,Tax ID,Davčna številka
@@ -3811,7 +3817,7 @@
 DocType: Customer,Sales Partner and Commission,Prodaja Partner in Komisija
 DocType: Employee Loan,Rate of Interest (%) / Year,Obrestna mera (%) / leto
 ,Project Quantity,projekt Količina
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Skupno {0} za vse postavke je nič, morda bi morali spremeniti &quot;Razdeli stroškov na osnovi&quot;"
 DocType: Opportunity,To Discuss,Razpravljati
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enote {1} potrebno {2} za dokončanje te transakcije.
 DocType: Loan Type,Rate of Interest (%) Yearly,Obrestna mera (%) Letna
@@ -3826,7 +3832,7 @@
 DocType: Purchase Invoice,Return,Return
 DocType: Production Order Operation,Production Order Operation,Proizvodnja naročite Delovanje
 DocType: Pricing Rule,Disable,Onemogoči
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,"Način plačila je potrebno, da bi plačilo"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,"Način plačila je potrebno, da bi plačilo"
 DocType: Project Task,Pending Review,Dokler Pregled
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Sredstvo {0} ne more biti izločeni, saj je že {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Total Expense zahtevek (preko Expense zahtevka)
@@ -3834,11 +3840,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Odsoten
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Vrstica {0}: Valuta BOM # {1} mora biti enaka izbrani valuti {2}
 DocType: Journal Entry Account,Exchange Rate,Menjalni tečaj
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Naročilo {0} ni predloženo
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Fee Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Dodaj artikle iz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Dodaj artikle iz
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,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: Cheque Print Template,Regular,redno
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Skupaj weightage vseh ocenjevalnih meril mora biti 100%
@@ -3851,7 +3857,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Skladišče {0} ne obstaja
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registracija Za ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Mesečni Distribucijski Odstotki
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Izbrana postavka ne more imeti Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Stopnja Vrednotenje nismo našli v postavki {0}, ki mora opraviti vknjižbe besede {1} {2}. Če je element transakcijah kot element vzorca v {1}, se omenja, da v {1} Element tabeli. V nasprotnem primeru, ustvarite dohodni transakcijo zaloge za postavko ali omembe stopnji vrednotenja v evidenco Element, nato poskusite submiting / preklic ta vnos"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Materialov podal proti tej dobavnici
 DocType: Project,Customer Details,Podrobnosti strank
@@ -3860,15 +3866,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Vnesite url parameter za sprejemnik nos
 DocType: Payment Entry,Paid Amount,Znesek Plačila
 DocType: Assessment Plan,Supervisor,nadzornik
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Na zalogi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Na zalogi
 ,Available Stock for Packing Items,Zaloga za embalirane izdelke
 DocType: Item Variant,Item Variant,Postavka Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Ocena Rezultat orodje
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Odpadno Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Predložene naročila ni mogoče izbrisati
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Stanje na računu je že ""bremenitev"", ni dovoljeno nastaviti ""Stanje mora biti"" kot ""kredit"""
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Upravljanje kakovosti
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Točka {0} je bila onemogočena
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Točka {0} je bila onemogočena
 DocType: Employee Loan,Repay Fixed Amount per Period,Povrne fiksni znesek na obdobje
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vnesite količino za postavko {0}
 DocType: Employee External Work History,Employee External Work History,Delavec Zunanji Delo Zgodovina
@@ -3895,7 +3901,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Študent Email ID
 DocType: Employee,Notice (days),Obvestilo (dni)
 DocType: Tax Rule,Sales Tax Template,Sales Tax Predloga
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,"Izberite predmete, da shranite račun"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,"Izberite predmete, da shranite račun"
 DocType: Employee,Encashment Date,Vnovčevanje Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Prilagoditev zaloge
@@ -3919,7 +3925,7 @@
 DocType: Item Variant Attribute,Attribute,Lastnost
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Prosimo, navedite iz / v razponu"
 DocType: Serial No,Under AMC,Pod AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Stopnja vrednotenje sredstev se preračuna razmišlja pristali stroškovno vrednost kupona
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Stopnja vrednotenje sredstev se preračuna razmišlja pristali stroškovno vrednost kupona
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Privzete nastavitve za prodajne transakcije.
 DocType: Guardian,Guardian Of ,Guardian Of
 DocType: Grading Scale Interval,Threshold,prag
@@ -3929,6 +3935,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Opomin Izdano
 DocType: Production Order,Warehouses,Skladišča
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} sredstev ni mogoče prenesti
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ta element je različica {0} (predloga).
 DocType: Workstation,per hour,na uro
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Purchasing
 DocType: Announcement,Announcement,Obvestilo
@@ -3944,8 +3951,8 @@
 DocType: Account,Receivable,Terjatev
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Vrstica # {0}: ni dovoljeno spreminjati Dobavitelj kot Naročilo že obstaja
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Vloga, ki jo je dovoljeno vložiti transakcije, ki presegajo omejitve posojil zastavili."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Izberite artikel v Izdelava
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Izberite artikel v Izdelava
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master podatkov sinhronizacijo, lahko traja nekaj časa"
 DocType: Item,Material Issue,Material Issue
 DocType: Hub Settings,Seller Description,Prodajalec Opis
 DocType: Employee Education,Qualification,Kvalifikacije
@@ -3957,7 +3964,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Naročeno
 DocType: Salary Detail,Component,Komponenta
 DocType: Assessment Criteria,Assessment Criteria Group,Skupina Merila ocenjevanja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Odpiranje nabrano amortizacijo sme biti manjša od enako {0}
 DocType: Warehouse,Warehouse Name,Skladišče Name
 DocType: Naming Series,Select Transaction,Izberite Transaction
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vnesite Odobritev vloge ali Potrditev uporabnika
@@ -3970,7 +3977,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Ni mogoče preklicati, ker je predložila Stock Začetek {0} obstaja"
 DocType: Employee Loan,Disbursement Date,izplačilo Datum
 DocType: Vehicle,Vehicle,vozila
 DocType: Purchase Invoice,In Words,V besedi
@@ -3985,14 +3992,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,OPP / svinec%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Premoženjem amortizacije in Stanja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Znesek {0} {1} je preselil iz {2} na {3}
 DocType: Sales Invoice,Get Advances Received,Get prejeti predujmi
 DocType: Email Digest,Add/Remove Recipients,Dodaj / Odstrani prejemnike
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transakcija ni dovoljena zoper ustavili proizvodnjo naročite {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Če želite nastaviti to poslovno leto kot privzeto, kliknite na &quot;Set as Default&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,pridruži se
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Pomanjkanje Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Obstaja postavka varianta {0} z enakimi atributi
 DocType: Employee Loan,Repay from Salary,Poplačilo iz Plača
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Zahteva plačilo pred {0} {1} za znesek {2}
@@ -4010,7 +4017,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Ocena Rezultat Podrobnosti
 DocType: Employee Education,Employee Education,Izobraževanje delavec
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dvojnik postavka skupina je našla v tabeli točka skupine
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,"To je potrebno, da prinese Element Podrobnosti."
 DocType: Salary Slip,Net Pay,Neto plača
 DocType: Account,Account,Račun
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serijska št {0} je že prejela
@@ -4019,7 +4026,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Skladišče {0} ni povezano z nobenim računom, ustvarite / povezati ustrezne račun (sredstev) za skladišče."
 DocType: Purchase Invoice,Recurring Id,Ponavljajoči Id
 DocType: Customer,Sales Team Details,Sales Team Podrobnosti
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Izbriši trajno?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Izbriši trajno?
 DocType: Expense Claim,Total Claimed Amount,Skupaj zahtevani znesek
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potencialne možnosti za prodajo.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Neveljavna {0}
@@ -4030,13 +4037,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup vaš šola v ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Osnovna Sprememba Znesek (družba Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Ni vknjižbe za naslednjih skladiščih
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Shranite dokument na prvem mestu.
 DocType: Account,Chargeable,Obračuna
 DocType: Company,Change Abbreviation,Spremeni kratico
 DocType: Expense Claim Detail,Expense Date,Expense Datum
 DocType: Item,Max Discount (%),Max Popust (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Zadnja naročite Znesek
+DocType: Task,Is Milestone,je Milestone
 DocType: Daily Work Summary,Email Sent To,E-pošta poslana
 DocType: Budget,Warn,Opozori
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Kakršne koli druge pripombe, omembe vredna napora, da bi moral iti v evidencah."
@@ -4057,7 +4065,7 @@
 DocType: Item Attribute Value,Attribute Value,Vrednosti atributa
 ,Itemwise Recommended Reorder Level,Itemwise Priporočena Preureditev Raven
 DocType: Salary Detail,Salary Detail,plača Podrobnosti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Prosimo, izberite {0} najprej"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Prosimo, izberite {0} najprej"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Serija {0} od Postavka {1} je potekla.
 DocType: Sales Invoice,Commission,Komisija
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Čas List za proizvodnjo.
@@ -4069,41 +4077,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Zamrzni zaloge starejše od` mora biti manjša od %d dni.
 DocType: Tax Rule,Purchase Tax Template,Nakup Davčna Template
 ,Project wise Stock Tracking,Projekt pametno Stock Tracking
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Obstaja vzdrževanje Urnik {0} proti {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Dejanska Količina (pri viru / cilju)
 DocType: Item Customer Detail,Ref Code,Ref Code
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Evidence zaposlenih.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Prosim, nastavite Naslednja Amortizacija Datum"
 DocType: HR Settings,Payroll Settings,Nastavitve plače
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Match nepovezane računov in plačil.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Naročiti
 DocType: Email Digest,New Purchase Orders,Nova naročila
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Izberi znamko ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Izberi znamko ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,"Nabrano amortizacijo, na"
 DocType: Sales Invoice,C-Form Applicable,"C-obliki, ki velja"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Delovanje Čas mora biti večja od 0, za obratovanje {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Skladišče je obvezna
 DocType: Supplier,Address and Contacts,Naslov in kontakti
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Conversion Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),"Imejte to spletno prijazno 900px (w), ki ga 100px (h)"
 DocType: Program,Program Abbreviation,Kratica programa
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Proizvodnja naročilo ne more biti postavljeno pred Predloga Postavka
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Dajatve so posodobljeni v Potrdilo o nakupu ob vsaki postavki
 DocType: Warranty Claim,Resolved By,Rešujejo s
 DocType: Bank Guarantee,Start Date,Datum začetka
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Dodeli liste za obdobje.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Čeki in depoziti nepravilno izbil
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Račun {0}: ne moreš dodeliti samega sebe kot matični račun
 DocType: Purchase Invoice Item,Price List Rate,Cenik Rate
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Ustvari ponudbe kupcev
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Ustvari ponudbe kupcev
 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 +38,Bill of Materials (BOM),Kosovnica (BOM)
 DocType: Item,Average time taken by the supplier to deliver,"Povprečen čas, ki ga dobavitelj dostaviti"
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,ocena Rezultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Ur
 DocType: Project,Expected Start Date,Pričakovani datum začetka
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Odstranite element, če stroški ne nanaša na to postavko"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transakcijski valuta mora biti enaka kot vplačilo valuto
 DocType: Payment Entry,Receive,Prejeti
@@ -4114,19 +4121,19 @@
 DocType: Workstation,Operating Costs,Obratovalni stroški
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Ukrep, če skupna mesečna Proračun Prekoračitev"
 DocType: Purchase Invoice,Submit on creation,Predloži na ustvarjanje
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta za {0} mora biti {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta za {0} mora biti {1}
 DocType: Asset,Disposal Date,odstranjevanje Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-pošta bo poslana vsem aktivnih zaposlenih v družbi na določeni uri, če nimajo počitnic. Povzetek odgovorov bo poslano ob polnoči."
 DocType: Employee Leave Approver,Employee Leave Approver,Zaposleni Leave odobritelj
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Vrstica {0}: Vpis Preureditev že obstaja za to skladišče {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Ne more razglasiti kot izgubljena, ker je bil predračun postavil."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Predlogi za usposabljanje
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Proizvodnja naročite {0} je treba predložiti
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Prosimo, izberite Start in končni datum za postavko {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Seveda je obvezna v vrsti {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Do danes ne more biti pred od datuma
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Dodaj / Uredi Cene
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Dodaj / Uredi Cene
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Batch,Parent Batch,nadrejena Serija
 DocType: Cheque Print Template,Cheque Print Template,Ček Print Predloga
@@ -4140,7 +4147,7 @@
 ,Ordered Items To Be Delivered,Naročeno Točke je treba dostaviti
 DocType: Account,Income,Prihodki
 DocType: Industry Type,Industry Type,Industrija Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Nekaj je šlo narobe!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Nekaj je šlo narobe!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Opozorilo: Pustite prijava vsebuje naslednje datume blok
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Račun {0} je že bil predložen
 DocType: Assessment Result Detail,Score,ocena
@@ -4171,17 +4178,17 @@
 DocType: Item,Variant Based On,"Varianta, ki temelji na"
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Skupaj weightage dodeljena mora biti 100%. To je {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Vaše Dobavitelji
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Ni mogoče nastaviti kot izgubili, kot je narejena Sales Order."
+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."
 DocType: Request for Quotation Item,Supplier Part No,Šifra dela dobavitelj
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Prejela od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"ne more odbiti, če je kategorija za &quot;vrednotenje&quot; ali &quot;Vaulation in Total&quot;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Prejela od
 DocType: Lead,Converted,Pretvorjena
 DocType: Item,Has Serial No,Ima Serijska št
 DocType: Employee,Date of Issue,Datum izdaje
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Od {0} za {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Od {0} za {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Vrstica # {0}: Nastavite Dobavitelj za postavko {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Vrstica {0}: Ure vrednost mora biti večja od nič.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4190,20 +4197,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,valuta za zaračunavanje mora biti enaka bodisi privzeti comapany v valuti ali stranka računa valuto
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,pustite Vnovčevanje
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Kaj to naredi?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Za skladišča
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Vse Študentski Sprejemi
 ,Average Commission Rate,Povprečen Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Udeležba ni mogoče označiti za prihodnje datume
 DocType: Pricing Rule,Pricing Rule Help,Cen Pravilo Pomoč
 DocType: School House,House Name,Ime House
 DocType: Purchase Taxes and Charges,Account Head,Račun Head
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Električno
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte preostanek organizacije kot uporabnike. Dodate lahko tudi povabi stranke na vašem portalu jih dodate iz imenika
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Dodajte preostanek organizacije kot uporabnike. Dodate lahko tudi povabi stranke na vašem portalu jih dodate iz imenika
 DocType: Stock Entry,Total Value Difference (Out - In),Skupna vrednost Razlika (Out - IN)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4212,7 +4219,7 @@
 DocType: Item,Customer Code,Koda za stranke
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},"Opomnik za rojstni dan, za {0}"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dni od zadnjega naročila
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Bremenitev računa mora biti bilanca računa
 DocType: Buying Settings,Naming Series,Poimenovanje zaporedja
 DocType: Leave Block List,Leave Block List Name,Pustite Ime Block List
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Datum zavarovanje Začetek sme biti manjša od datuma zavarovanje End
@@ -4227,9 +4234,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Plača Slip delavca {0} že ustvarili za časa stanja {1}
 DocType: Vehicle Log,Odometer,števec kilometrov
 DocType: Sales Order Item,Ordered Qty,Naročeno Kol
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Postavka {0} je onemogočena
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Postavka {0} je onemogočena
 DocType: Stock Settings,Stock Frozen Upto,Stock Zamrznjena Stanuje
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ne vsebuje nobenega elementa zaloge
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projektna dejavnost / naloga.
 DocType: Vehicle Log,Refuelling Details,Oskrba z gorivom Podrobnosti
@@ -4239,8 +4246,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Zadnja stopnja nakup ni bilo mogoče najti
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Napišite enkratni znesek (družba Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,zaračunavanje storitev ure
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Privzeti BOM za {0} ni bilo mogoče najti
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Vrstica # {0}: Prosim nastavite naročniško količino
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Dotaknite predmete, da jih dodate tukaj"
 DocType: Fees,Program Enrollment,Program Vpis
 DocType: Landed Cost Voucher,Landed Cost Voucher,Pristali Stroški bon
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Prosim, nastavite {0}"
@@ -4264,7 +4272,7 @@
 DocType: Maintenance Visit,Maintenance Date,Vzdrževanje Datum
 DocType: Purchase Invoice Item,Rejected Serial No,Zavrnjeno Zaporedna številka
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Leto datum začetka oziroma prenehanja se prekrivajo z {0}. Da bi se izognili prosim, da podjetje"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Začetni datum mora biti manjša od končnega datuma za postavko {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.","Primer:. ABCD ##### Če je serija nastavljen in serijska številka ni navedena v transakcijah, se bo ustvaril nato samodejno serijska številka, ki temelji na tej seriji. Če ste si vedno želeli izrecno omeniti Serial številk za to postavko. pustite prazno."
 DocType: Upload Attendance,Upload Attendance,Naloži Udeležba
@@ -4341,7 +4349,6 @@
 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
-DocType: Grade Interval,Grade Interval,razred Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Fiskalna Leto Start Date in fiskalno leto End Date so že določeni v proračunskem letu {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Potrditev Datum posodobljeni
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Serija
@@ -4387,14 +4394,14 @@
 DocType: Bin,Reserved Qty for Production,Rezervirano Količina za proizvodnjo
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Pustite neoznačeno, če ne želite, da razmisli serije, hkrati pa seveda temelji skupin."
 DocType: Asset,Frequency of Depreciation (Months),Pogostost amortizacijo (meseci)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Credit račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Credit račun
 DocType: Landed Cost Item,Landed Cost Item,Pristali Stroški Postavka
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Nastavitev preprosto spletno stran za svojo organizacijo
 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 +666,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Prosimo, navedite Lastnost vrednost za atribut {0}"
 DocType: Item,Default Warehouse,Privzeto Skladišče
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Proračun ne more biti dodeljena pred Group račun {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vnesite stroškovno mesto matično
@@ -4439,7 +4446,7 @@
 DocType: Opportunity Item,Basic Rate,Osnovni tečaj
 DocType: GL Entry,Credit Amount,Credit Znesek
 DocType: Cheque Print Template,Signatory Position,podpisnik Položaj
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Nastavi kot Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Nastavi kot Lost
 DocType: Timesheet,Total Billable Hours,Skupaj plačljivih ur
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Prejem plačilnih Note
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ta temelji na transakcijah zoper to stranko. Oglejte si časovnico spodaj za podrobnosti
@@ -4453,11 +4460,11 @@
 ,Items To Be Requested,"Predmeti, ki bodo zahtevana"
 DocType: Purchase Order,Get Last Purchase Rate,Get zadnjega nakupa Rate
 DocType: Company,Company Info,Informacije o podjetju
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Izberite ali dodati novo stranko
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Izberite ali dodati novo stranko
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Stroškovno mesto je potrebno rezervirati odhodek zahtevek
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Uporaba sredstev (sredstva)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ta temelji na prisotnosti tega zaposlenega
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Debetni račun
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4466,13 +4473,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Znesek nakupa
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Dobavitelj za predračun {0} ustvaril
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Konec leta ne more biti pred začetkom leta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Zaslužki zaposlencev
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Nastavite privzeto Hiša List za zaposlenega {0} ali podjetja {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} ne obstaja
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} ne obstaja
 apps/erpnext/erpnext/config/accounts.py +12,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 Projekta
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Vrstica št {0}: količina ne more biti večja od Dokler Znesek proti Expense zahtevka {1}. Dokler Znesek je {2}
@@ -4481,15 +4488,17 @@
 DocType: Quality Inspection Reading,Reading 3,Branje 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Bon Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Cenik ni mogoče najti ali onemogočena
 DocType: Employee Loan Application,Approved,Odobreno
 DocType: Pricing Rule,Price,Cena
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Zaposleni razrešen na {0} mora biti nastavljen kot &quot;levo&quot;
 DocType: Guardian,Guardian,Guardian
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Cenitev {0} ustvarjena za Employee {1} v določenem časovnem obdobju
 DocType: Employee,Education,Izobraževanje
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Imenovanje akcija Z
 DocType: Employee,Current Address Is,Trenutni Naslov je
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,spremenjene
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Neobvezno. Nastavi privzeto valuto družbe, če ni določeno."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Vpisi računovodstvo lista.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Na voljo Količina na IZ SKLADIŠČA
@@ -4498,7 +4507,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Vrstica {0}: Party / račun se ne ujema z {1} / {2} v {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vnesite Expense račun
 DocType: Account,Stock,Zaloga
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Vrsta dokumenta mora biti eden od narocilo, Nakup računa ali Journal Entry"
 DocType: Employee,Current Address,Trenutni naslov
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Če postavka je varianta drug element, potem opis, slike, cene, davki, itd bo določil iz predloge, razen če je izrecno določeno"
 DocType: Serial No,Purchase / Manufacture Details,Nakup / Izdelava Podrobnosti
@@ -4526,7 +4535,7 @@
 DocType: Hub Settings,Hub Settings,Nastavitve Hub
 DocType: Project,Gross Margin %,Gross Margin%
 DocType: BOM,With Operations,Pri poslovanju
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Vknjižbe so že bili sprejeti v valuti {0} za družbo {1}. Izberite terjatve ali obveznosti račun z valuto {0}.
 DocType: Asset,Is Existing Asset,Je obstoječemu sredstvu
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
 DocType: Salary Detail,Statistical Component,Statistični Komponenta
@@ -4551,7 +4560,7 @@
 DocType: Assessment Plan,Room,soba
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Postavka Tax
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material za dobavitelja
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material za dobavitelja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Trošarina Račun
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Praga {0}% pojavi več kot enkrat
 DocType: Expense Claim,Employees Email Id,Zaposleni Email Id
@@ -4582,9 +4591,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Priložite Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Zaloga Ravni
 DocType: Customer,Commission Rate,Komisija Rate
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Naredite Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Naredite Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacije blok dopustu oddelka.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Plačilo Tip mora biti eden od Prejemanje, plačati in notranji prenos"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Plačilo Tip mora biti eden od Prejemanje, plačati in notranji prenos"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Košarica je Prazna
 DocType: Vehicle,Model,Model
@@ -4595,6 +4604,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Dovoli Proizvodnja na počitnicah
 DocType: Sales Order,Customer's Purchase Order Date,Stranke Naročilo Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Osnovni kapital
+DocType: Shopping Cart Settings,Show Public Attachments,Prikaži Javna Priključki
 DocType: Packing Slip,Package Weight Details,Paket Teža Podrobnosti
 DocType: Payment Gateway Account,Payment Gateway Account,Plačilo Gateway račun
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Po zaključku plačila preusmeri uporabnika na izbrano stran.
@@ -4613,15 +4623,15 @@
 DocType: Batch,Expiry Date,Rok uporabnosti
 ,Supplier Addresses and Contacts,Dobavitelj Naslovi
 ,accounts-browser,računi brskalnik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Prosimo, izberite kategorijo najprej"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Prosimo, izberite kategorijo najprej"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Master projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Če želite, da pretirano zaračunavanje ali over-naročanje, posodobi &quot;dodatku&quot; v delniških nastavitvah ali točko."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Ne kažejo vsak simbol, kot $ itd zraven valute."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Poldnevni)
 DocType: Supplier,Credit Days,Kreditne dnevi
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Naj Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Naj Student Batch
 DocType: Leave Type,Is Carry Forward,Se Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Pridobi artikle iz BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Pridobi artikle iz BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Dobavni rok dni
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Napotitev Datum mora biti enak datumu nakupa {1} od sredstva {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vnesite Prodajne nalogov v zgornji tabeli
@@ -4638,8 +4648,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Vrstica {0}: debetna vnos ne more biti povezano z {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Prosimo nastavitev številčenja vrsto za udeležbi preko Nastavitve&gt; oštevilčevanje Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 7d38d89..7140d11 100644
--- a/erpnext/translations/sq.csv
+++ b/erpnext/translations/sq.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Me qira
 DocType: Purchase Order,PO-,poli-
 DocType: POS Profile,Applicable for User,E aplikueshme për anëtarët
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ndaloi Rendit prodhimit nuk mund të anulohet, tapën atë më parë për të anulluar"
 DocType: Vehicle Service,Mileage,Largësi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,A jeni të vërtetë doni për të hequr këtë pasuri?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Zgjidh Default Furnizuesi
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Zgjidh Default Furnizuesi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta është e nevojshme për Lista Çmimi {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Do të llogaritet në transaksion.
 DocType: Purchase Order,Customer Contact,Customer Contact
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Shquar për {0} nuk mund të jetë më pak se zero ({1})
 DocType: Manufacturing Settings,Default 10 mins,Default 10 minuta
 DocType: Leave Type,Leave Type Name,Lini Lloji Emri
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Trego të hapur
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Trego të hapur
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Seria Përditësuar sukses
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,arkë
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Hyrja Dërguar
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Item Status skadimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Draft Bank
 DocType: Mode of Payment Account,Mode of Payment Account,Mënyra e Llogarisë Pagesave
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Shfaq Variantet
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Shfaq Variantet
 DocType: Academic Term,Academic Term,Term akademik
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Sasi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Sasi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Llogaritë tabelë nuk mund të jetë bosh.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Kredi (obligimeve)
 DocType: Employee Education,Year of Passing,Viti i kalimit
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referenca:% s, Item Kodi:% s dhe klientit:% s"
 DocType: Item,Country of Origin,Vendi i origjinës
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Në magazinë
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Çështjet e hapura
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Kujdes shëndetësor
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Vonesa në pagesa (ditë)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,shpenzimeve të shërbimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faturë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Numri Serial: {0} është referuar tashmë në shitje Faturë: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faturë
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Viti Fiskal {0} është e nevojshme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Pritet Data e dorëzimit është jetë para Sales Rendit Data
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bashkangjit CSV fotografi me dy kolona, njëra për emrin e vjetër dhe një për emrin e ri"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ne asnje vitit aktiv Fiskal.
 DocType: Packed Item,Parent Detail docname,Docname prind Detail
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",Referenca: {0} Artikull Code: {1} dhe klientit: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Identifikohu
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Hapja për një punë.
 DocType: Item Attribute,Increment,Rritje
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Zgjidh Magazina ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Zgjidh Magazina ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamat
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Të marrë sendet nga
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Nuk lejohet për {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Të marrë sendet nga
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock nuk mund të rifreskohet kundër dorëzimit Shënim {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Product {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Nuk ka artikuj të listuara
 DocType: Payment Reconciliation,Reconcile,Pajtojë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Ushqimore
 DocType: Quality Inspection Reading,Reading 1,Leximi 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Zhvlerësimi Date tjetër nuk mund të jetë më parë data e blerjes
 DocType: SMS Center,All Sales Person,Të gjitha Person Sales
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Shpërndarja mujore ** ju ndihmon të shpërndani Buxhetore / Target gjithë muaj nëse keni sezonalitetit në biznesin tuaj.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Nuk sende gjetur
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Nuk sende gjetur
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Struktura Paga Missing
 DocType: Lead,Person Name,Emri personi
 DocType: Sales Invoice Item,Sales Invoice Item,Item Shitjet Faturë
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",p.sh. &quot;Shkolla fillore&quot; ose &quot;University&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stock Raportet
 DocType: Warehouse,Warehouse Detail,Magazina Detail
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kufiri i kreditit ka kaluar për konsumator {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Term End Date nuk mund të jetë më vonë se Data Year fund të vitit akademik në të cilin termi është i lidhur (Viti Akademik {}). Ju lutem, Korrigjo datat dhe provoni përsëri."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;A është e aseteve fikse&quot; nuk mund të jetë e pakontrolluar, pasi ekziston rekord Pasurive ndaj artikullit"
 DocType: Vehicle Service,Brake Oil,Brake Oil
 DocType: Tax Rule,Tax Type,Lloji Tatimore
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Ju nuk jeni i autorizuar për të shtuar ose shënimet e para përditësim {0}
 DocType: BOM,Item Image (if not slideshow),Item Image (nëse nuk Slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Ekziston një klient me të njëjtin emër
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Ore Rate / 60) * aktuale Operacioni Koha
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Zgjidh BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Zgjidh BOM
 DocType: SMS Log,SMS Log,SMS Identifikohu
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostoja e Artikujve dorëzohet
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Festa në {0} nuk është në mes Nga Data dhe To Date
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,shkollat
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Nuk ka rekord leje gjetur për punonjës {0} për {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ju lutemi shkruani kompani parë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Ju lutemi zgjidhni kompania e parë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Target Në
 DocType: BOM,Total Cost,Kostoja Totale
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Shuma Claim
 DocType: Employee,Mr,Mr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Grupi i konsumatorëve Duplicate gjenden në tabelën e grupit cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Furnizuesi Lloji / Furnizuesi
 DocType: Naming Series,Prefix,Parashtesë
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Harxhuese
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Gradë
 DocType: Sales Invoice Item,Delivered By Supplier,Dorëzuar nga furnizuesi
 DocType: SMS Center,All Contact,Të gjitha Kontakt
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Rendit prodhimi krijuar tashmë për të gjitha sendet me bom
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Paga vjetore
 DocType: Daily Work Summary,Daily Work Summary,Daily Përmbledhje Work
 DocType: Period Closing Voucher,Closing Fiscal Year,Mbyllja e Vitit Fiskal
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} është e ngrirë
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} është e ngrirë
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Ju lutem, përzgjidhni kompanie ekzistuese për krijimin Skemën e Kontabilitetit"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Shpenzimet
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Zgjidhni Target Magazina
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra Hyrja
 DocType: Journal Entry Account,Credit in Company Currency,Kreditit në kompanisë Valuta
 DocType: Delivery Note,Installation Status,Instalimi Statusi
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",A doni për të rinovuar pjesëmarrjen? <br> Prezent: {0} \ <br> Mungon: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Pranuar + Refuzuar Qty duhet të jetë e barabartë me sasinë e pranuara për Item {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Furnizimit të lëndëve të para për Blerje
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Të paktën një mënyra e pagesës është e nevojshme për POS faturë.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Të paktën një mënyra e pagesës është e nevojshme për POS faturë.
 DocType: Products Settings,Show Products as a List,Shfaq Produkte si një Lista
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Bëni Amortizimi Hyrja
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Kërkesë Type
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,bëni punonjës
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,bëni punonjës
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Transmetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Ekzekutim
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detajet e operacioneve të kryera.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Plani për vizita të mirëmbajtjes.
 DocType: SMS Settings,Enter url parameter for message,Shkruani parametër url per mesazhin
 DocType: POS Profile,Customer Groups,Grupet e konsumatorëve
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Pasqyrat financiare
 DocType: Guardian,Students,studentët
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Rregullat për aplikimin e çmimeve dhe zbritje.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Lista çmimi duhet të jetë i zbatueshëm për blerjen ose shitjen e
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},shuma paraprakisht nuk mund të jetë më i madh se {0} {1}
 DocType: Naming Series,Series List for this Transaction,Lista Seria për këtë transaksion
 DocType: Company,Default Payroll Payable Account,Default Payroll Llogaria e pagueshme
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Update Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Update Email Group
 DocType: Sales Invoice,Is Opening Entry,Është Hapja Hyrja
 DocType: Customer Group,Mention if non-standard receivable account applicable,Përmend në qoftë se jo-standarde llogari të arkëtueshme të zbatueshme
 DocType: Course Schedule,Instructor Name,instruktor Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Për Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Për Magazina është e nevojshme para se të Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Marrë më
 DocType: Sales Partner,Reseller,Reseller
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Nëse zgjidhet, do të përfshijë çështje jo-aksioneve në kërkesat materiale."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Kundër Item Shitjet Faturë
 ,Production Orders in Progress,Urdhërat e prodhimit në Progres
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Paraja neto nga Financimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage është e plotë, nuk ka shpëtuar"
 DocType: Lead,Address & Contact,Adresa &amp; Kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Shtoni gjethe të papërdorura nga alokimet e mëparshme
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Tjetër Periodik {0} do të krijohet në {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Total Kostoja Shuma (via Koha Sheet)
 DocType: Item Website Specification,Item Website Specification,Item Faqja Specifikimi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lini Blocked
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banka Entries
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Item {0} ka arritur në fund të saj të jetës në {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Banka Entries
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Vjetor
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stock Pajtimi Item
 DocType: Stock Entry,Sales Invoice No,Shitjet Faturë Asnjë
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Publikojë në Hub
 DocType: Student Admission,Student Admission,Pranimi Student
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Item {0} është anuluar
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Kërkesë materiale
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Item {0} është anuluar
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Çeqet e papaguara dhe Depozitat për të pastruar
 DocType: Item,Synced With Hub,Synced Me Hub
 DocType: Vehicle,Fleet Manager,Fleet Menaxher
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nuk mund të jetë negative për artikull {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Gabuar Fjalëkalimi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} nuk mund të jetë negative për artikull {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Gabuar Fjalëkalimi
 DocType: Item,Variant Of,Variant i
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Kompletuar Qty nuk mund të jetë më i madh se &quot;Qty për Prodhimi&quot;
 DocType: Period Closing Voucher,Closing Account Head,Mbyllja Shef Llogaria
 DocType: Employee,External Work History,Historia e jashtme
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Qarkorja Referenca Gabim
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Njoftojë me email për krijimin e kërkesës automatike materiale
 DocType: Journal Entry,Multi Currency,Multi Valuta
 DocType: Payment Reconciliation Invoice,Invoice Type,Lloji Faturë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Ofrimit Shënim
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Ofrimit Shënim
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ngritja Tatimet
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostoja e asetit të shitur
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
-DocType: Grade Interval,Min Score,Min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} hyrë dy herë në Tatimin Item
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Përmbledhje për këtë javë dhe aktivitete në pritje
 DocType: Student Applicant,Admitted,pranuar
 DocType: Workstation,Rent Cost,Qira Kosto
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Vlera Order
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaksionet kundër partisë apo për transferimin e brendshëm
 DocType: Shipping Rule,Valid for Countries,I vlefshëm për vendet
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ky artikull është një Template dhe nuk mund të përdoret në transaksionet. Atribute pika do të kopjohet gjatë në variantet nëse nuk është vendosur &quot;Jo Copy &#39;
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Rendit Gjithsej konsideruar
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Përcaktimi Punonjës (p.sh. CEO, drejtor etj)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ju lutemi shkruani &#39;Përsëriteni në Ditën e Muajit &quot;në terren vlerë
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Blerje Fatura nuk mund të bëhet kundër një aktiv ekzistues {1}
 DocType: Item Tax,Tax Rate,Shkalla e tatimit
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ndarë tashmë për punonjësit {1} për periudhën {2} në {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Zgjidh Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Zgjidh Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Blerje Fatura {0} është dorëzuar tashmë
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Row # {0}: Batch Nuk duhet të jetë i njëjtë si {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Convert për të jo-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (shumë) e një artikulli.
 DocType: C-Form Invoice Detail,Invoice Date,Data e faturës
 DocType: GL Entry,Debit Amount,Shuma Debi
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Nuk mund të jetë vetëm 1 Llogaria për Kompaninë në {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Ju lutem shikoni shtojcën
 DocType: Purchase Order,% Received,% Marra
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Krijo Grupet Student
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Kërkesa për kuotim
 DocType: Salary Slip Timesheet,Working Hours,Orari i punës
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ndryshimi filluar / numrin e tanishëm sekuencë e një serie ekzistuese.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Krijo një klient i ri
-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.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Krijo urdhëron Blerje
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Krijo një klient i ri
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nëse Rregullat shumta Çmimeve të vazhdojë të mbizotërojë, përdoruesit janë të kërkohet për të vendosur përparësi dorë për të zgjidhur konfliktin."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Krijo urdhëron Blerje
 ,Purchase Register,Blerje Regjistrohu
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Akuzat e aplikueshme
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) duhet të ketë rol &#39;Leave aprovuesi&#39;
 DocType: Purchase Receipt,Vehicle Date,Data e Automjeteve
 DocType: Student Log,Medical,Mjekësor
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Arsyeja për humbjen
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Arsyeja për humbjen
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Owner Lead nuk mund të jetë i njëjtë si Lead
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Shuma e ndarë nuk mund të më e madhe se shuma e parregulluara
 DocType: Announcement,Receiver,marrës
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Sasia dhe Rate
 DocType: Delivery Note,% Installed,% Installed
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Klasat / laboratore etj, ku mësimi mund të jenë të planifikuara."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ju lutem shkruani emrin e kompanisë e parë
 DocType: Purchase Invoice,Supplier Name,Furnizuesi Emri
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Lexoni Manualin ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Fushë e detyrueshme - Viti akademik
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Fushë e detyrueshme - Viti akademik
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Rregulloje tekstin hyrës që shkon si një pjesë e asaj email. Secili transaksion ka një tekst të veçantë hyrëse.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Ju lutemi të vendosur llogari parazgjedhur pagueshëm për kompaninë {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Konfigurimet Global për të gjitha proceset e prodhimit.
 DocType: Accounts Settings,Accounts Frozen Upto,Llogaritë ngrira Upto
 DocType: SMS Log,Sent On,Dërguar në
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Atribut {0} zgjedhur disa herë në atributet Tabelën
 DocType: HR Settings,Employee record is created using selected field. ,Rekord punonjës është krijuar duke përdorur fushën e zgjedhur.
 DocType: Sales Order,Not Applicable,Nuk aplikohet
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Mjeshtër pushime.
 DocType: Request for Quotation Item,Required Date,Data e nevojshme
 DocType: Delivery Note,Billing Address,Faturimi Adresa
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ju lutemi shkruani kodin artikull.
 DocType: BOM,Costing,Kushton
 DocType: Tax Rule,Billing County,County Billing
 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"
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Nga Paketa nr
 DocType: Item Attribute,To Range,Në rang
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Të letrave me vlerë dhe depozita
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Nuk mund të ndryshojë metodën e vlerësimit, pasi ka transaksione kundër disa artikuj që nuk kanë se është metodë e vlerësimit"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Gjithsej lë alokuara është i detyrueshëm
 DocType: Job Opening,Description of a Job Opening,Përshkrimi i një Hapja Job
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Aktivitetet në pritje për sot
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Ju lutem, përzgjidhni Course"
 DocType: Timesheet Detail,Hrs,orë
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Ju lutem, përzgjidhni Company"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Ju lutem, përzgjidhni Company"
 DocType: Stock Entry Detail,Difference Account,Llogaria Diferenca
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Nuk mund detyrë afër sa detyra e saj të varur {0} nuk është e mbyllur.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ju lutem shkruani Magazina për të cilat do të ngrihen materiale Kërkesë
 DocType: Production Order,Additional Operating Cost,Shtesë Kosto Operative
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kozmetikë
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","Të bashkojë, pronat e mëposhtme duhet të jenë të njëjta për të dy artikujve"
 DocType: Shipping Rule,Net Weight,Net Weight
 DocType: Employee,Emergency Phone,Urgjencës Telefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,blej
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ju lutemi të përcaktuar klasën për Prag 0%
 DocType: Sales Order,To Deliver,Për të ofruar
 DocType: Purchase Invoice Item,Item,Artikull
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serial asnjë artikull nuk mund të jetë një pjesë
 DocType: Journal Entry,Difference (Dr - Cr),Diferenca (Dr - Cr)
 DocType: Account,Profit and Loss,Fitimi dhe Humbja
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Menaxhimi Nënkontraktimi
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Rritja nuk mund të jetë 0
 DocType: Production Planning Tool,Material Requirement,Kërkesa materiale
 DocType: Company,Delete Company Transactions,Fshij Transaksionet Company
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,I Referencës dhe Referenca Date është e detyrueshme për transaksion Bank
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Add / Edit taksat dhe tatimet
 DocType: Purchase Invoice,Supplier Invoice No,Furnizuesi Fatura Asnjë
 DocType: Territory,For reference,Për referencë
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Instalimi Shënim Item
 DocType: Production Plan Item,Pending Qty,Në pritje Qty
 DocType: Budget,Ignore,Injoroj
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} nuk është aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} nuk është aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS dërguar në numrat e mëposhtëm: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Dimensionet kontrolloni Setup për printim
 DocType: Salary Slip,Salary Slip Timesheet,Paga Slip pasqyrë e mungesave
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Komisioni i përgjithshëm
 DocType: Pricing Rule,Sales Partner,Sales Partner
 DocType: Buying Settings,Purchase Receipt Required,Pranimi Blerje kërkuar
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Vlerësimi Vlerësoni është i detyrueshëm në qoftë Hapja Stock hyrë
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Nuk u gjetën në tabelën Faturë të dhënat
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Ju lutem, përzgjidhni kompanisë dhe Partisë Lloji i parë"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Financiare / vit kontabilitetit.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Vlerat e akumuluara
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Bëni Sales Order
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Bëni Sales Order
 DocType: Project Task,Project Task,Projekti Task
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Grand Total
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Resume Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Konsumatorët të përsëritur
 DocType: Leave Control Panel,Allocate,Alokimi
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Shitjet Kthehu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Shitjet Kthehu
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Shënim: gjethet total alokuara {0} nuk duhet të jetë më pak se gjethet e miratuara tashmë {1} për periudhën
 DocType: Announcement,Posted By,postuar Nga
 DocType: Item,Delivered by Supplier (Drop Ship),Dorëzuar nga Furnizuesi (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Citat Për
 DocType: Lead,Middle Income,Të ardhurat e Mesme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Hapja (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Shuma e ndarë nuk mund të jetë negative
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ju lutemi të vendosur Kompaninë
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Ju lutemi të vendosur Kompaninë
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Fatura pasqyrë e mungesave
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referenca Nuk &amp; Referenca Data është e nevojshme për {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Zgjidhni Pagesa Llogaria për të bërë Banka Hyrja
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Krijo dhënat e punonjësve për të menaxhuar gjethe, pretendimet e shpenzimeve dhe pagave"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Shtoje te Knowledge Base
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Propozimi Shkrimi
 DocType: Payment Entry Deduction,Payment Entry Deduction,Pagesa Zbritja Hyrja
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; nuk është në Vitin Fiskal {2}
 DocType: Buying Settings,Settings for Buying Module,Cilësimet për Blerja Module
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} nuk i përkasin kompanisë {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Ju lutemi shkruani vërtetim Blerje parë
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Ju lutemi shkruani vërtetim Blerje parë
 DocType: Buying Settings,Supplier Naming By,Furnizuesi Emërtimi By
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Ndryshimi neto në Inventarin
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Menaxhimi Loan punonjës
 DocType: Employee,Passport Number,Pasaporta Numri
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Raporti me Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Menaxher
 DocType: Payment Entry,Payment From / To,Pagesa nga /
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Data Gama
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Kufiri i ri i kredisë është më pak se shuma aktuale të papaguar për konsumatorin. kufiri i kreditit duhet të jetë atleast {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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ë
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,Në minuta
 DocType: Issue,Resolution Date,Rezoluta Data
 DocType: Student Batch Name,Batch Name,Batch Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Pasqyrë e mungesave krijuar:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Pasqyrë e mungesave krijuar:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ju lutemi të vendosur Cash parazgjedhur apo llogari bankare në mënyra e pagesës {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,regjistroj
 DocType: Selling Settings,Customer Naming By,Emërtimi Customer Nga
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Do të tregojë nxënësin si të pranishme në Student Raporti mujor Pjesëmarrja
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Aktuale Koha e fillimit
 DocType: BOM Operation,Operation Time,Operacioni Koha
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,fund
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,bazë
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,bazë
 DocType: Timesheet,Total Billed Hours,Orët totale faturuara
 DocType: Journal Entry,Write Off Amount,Shkruani Off Shuma
 DocType: Journal Entry,Bill No,Bill Asnjë
@@ -720,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,Pjesëmarrja Student
 DocType: Sales Invoice Timesheet,Time Sheet,Koha Sheet
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush të lëndëve të para në bazë të
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ju lutem shkruani të dhënat pika
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ju lutem shkruani të dhënat pika
 DocType: Interest,Interest,interes
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Sales para
 DocType: Purchase Receipt,Other Details,Detaje të tjera
@@ -731,24 +735,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Pagesa Hyrja është krijuar tashmë
 DocType: Purchase Receipt Item Supplied,Current Stock,Stock tanishme
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Row # {0}: Asset {1} nuk lidhet me pikën {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Preview Paga Shqip
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Preview Paga Shqip
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Llogaria {0} ka hyrë disa herë
 DocType: Account,Expenses Included In Valuation,Shpenzimet e përfshira në Vlerësimit
 DocType: Hub Settings,Seller City,Shitës qytetit
 ,Absent Student Report,Mungon Raporti Student
 DocType: Email Digest,Next email will be sent on:,Email ardhshëm do të dërgohet në:
 DocType: Offer Letter Term,Offer Letter Term,Oferta Letër Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Item ka variante.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,Kompania {0} nuk ekziston
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Type
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Type
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Qty konsumuar për njësi
 DocType: Serial No,Warranty Expiry Date,Garanci Data e skadimit
 DocType: Material Request Item,Quantity and Warehouse,Sasia dhe Magazina
 DocType: Sales Invoice,Commission Rate (%),Vlerësoni komision (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Ju lutem, përzgjidhni Program"
 DocType: Project,Estimated Cost,Kostoja e vlerësuar
 DocType: Purchase Order,Link to material requests,Link të kërkesave materiale
@@ -766,7 +768,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Shuma e marrë (Company Valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Lead duhet të vendosen, nëse Opportunity është bërë nga Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Ju lutem, përzgjidhni ditë javore jashtë"
 DocType: 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
@@ -782,6 +784,7 @@
 DocType: Opportunity,Opportunity From,Opportunity Nga
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Deklarata mujore e pagave.
 DocType: BOM,Website Specifications,Specifikimet Website
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi Setup numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Nga {0} nga lloji {1}
 DocType: Warranty Claim,CI-,Pri-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Row {0}: Konvertimi Faktori është e detyrueshme
@@ -816,6 +819,7 @@
 DocType: Employee,Bank A/C No.,Banka A / C Nr
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Leximi 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Urdhërohet pjesërisht
 DocType: Expense Claim Detail,Expense Claim Type,Shpenzimet e kërkesës Lloji
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Default settings për Shportë
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset braktiset via Journal Hyrja {0}
@@ -823,14 +827,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Bioteknologji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Shpenzimet Zyra Mirëmbajtja
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ngritja llogari PE
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ju lutemi shkruani pika e parë
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ju lutemi shkruani pika e parë
 DocType: Account,Liability,Detyrim
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Shuma e sanksionuar nuk mund të jetë më e madhe se shuma e kërkesës në Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Gabim Kostoja e mallrave të shitura Llogaria
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Lista e Çmimeve nuk zgjidhet
 DocType: Employee,Family Background,Historiku i familjes
 DocType: Request for Quotation Supplier,Send Email,Dërgo Email
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Warning: Attachment Invalid {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Nuk ka leje
 DocType: Company,Default Bank Account,Gabim Llogarisë Bankare
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Për të filtruar në bazë të Partisë, Partia zgjidhni llojin e parë"
@@ -843,7 +847,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Asnjë punonjës gjetur
 DocType: Supplier Quotation,Stopped,U ndal
 DocType: Item,If subcontracted to a vendor,Në qoftë se nënkontraktuar për një shitës
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Grupi Student është përditësuar tashmë.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Grupi Student është përditësuar tashmë.
 DocType: SMS Center,All Customer Contact,Të gjitha Customer Kontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ngarko ekuilibër aksioneve nëpërmjet CSV.
 DocType: Warehouse,Tree Details,Tree Details
@@ -854,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Shuma minimale Faturë
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Qendra Kosto {2} nuk i përkasin kompanisë {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Llogaria {2} nuk mund të jetë një grup
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër &#39;{DOCTYPE}&#39; tabelë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Item Row {IDX}: {} {DOCTYPE docname} nuk ekziston në më sipër &#39;{DOCTYPE}&#39; tabelë
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Pasqyrë e mungesave {0} është përfunduar tashmë ose anuluar
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Nuk ka detyrat
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Ditë të muajit në të cilin fatura auto do të gjenerohet p.sh. 05, 28 etj"
 DocType: Asset,Opening Accumulated Depreciation,Hapja amortizimi i akumuluar
@@ -871,7 +875,7 @@
 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 +372,{0} against Bill {1} dated {2},"{0} kundër Bill {1} {2}, datë"
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Orari i kursit
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Orari i kursit
 DocType: Maintenance Visit,Completion Status,Përfundimi Statusi
 DocType: HR Settings,Enter retirement age in years,Shkruani moshën e pensionit në vitet
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Magazina
@@ -879,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Lejo mbi ofrimin ose pranimin upto këtë qind
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Pjesëmarrja e importit
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Të gjitha Item Grupet
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Të gjitha Item Grupet
 DocType: Process Payroll,Activity Log,Aktiviteti Identifikohu
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Fitimi neto / Humbja
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Automatikisht shkruaj mesazh për dorëzimin e transaksioneve.
@@ -890,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Blerje Rendit për Pagesa
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projektuar Qty
 DocType: Sales Invoice,Payment Due Date,Afati i pageses
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Item Varianti {0} tashmë ekziston me atributet e njëjta
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Hapja&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Hapur për të bërë
 DocType: Notification Control,Delivery Note Message,Ofrimit Shënim Mesazh
@@ -906,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-Rendit Qty
 DocType: Leave Block List Date,Leave Block List Date,Dërgo Block Lista Data
 DocType: Pricing Rule,Price or Discount,Çmimi ose Discount
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Akuzat totale të zbatueshme në Blerje tryezë Receipt artikujt duhet të jetë i njëjtë si Total taksat dhe tarifat
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Akuzat totale të zbatueshme në Blerje tryezë Receipt artikujt duhet të jetë i njëjtë si Total taksat dhe tarifat
 DocType: Sales Team,Incentives,Nxitjet
 DocType: SMS Log,Requested Numbers,Numrat kërkuara
 DocType: Production Planning Tool,Only Obtain Raw Materials,Vetëm Merrni lëndëve të para
@@ -935,13 +939,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Është nënkontraktuar
 DocType: Item Attribute,Item Attribute Values,Vlerat Item ia atribuojnë
 DocType: Examination Result,Examination Result,Ekzaminimi Result
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Pranimi Blerje
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Pranimi Blerje
 ,Received Items To Be Billed,Items marra Për të faturohet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Dërguar pagave rrëshqet
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Kursi i këmbimit të monedhës mjeshtër.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referenca DOCTYPE duhet të jetë një nga {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referenca DOCTYPE duhet të jetë një nga {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Në pamundësi për të gjetur vend i caktuar kohë në {0} ditëve të ardhshme për funksionimin {1}
 DocType: Production Order,Plan material for sub-assemblies,Materiali plan për nën-kuvendet
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Sales Partners dhe Territori
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Nuk mund të krijohet automatikisht llogari si ka tashmë bilanci aksioneve në Llogarinë. Ju duhet të krijoni një llogari të përputhen para se ju mund të bëni një hyrje në këtë depo
@@ -964,10 +968,9 @@
 DocType: Supplier,Default Payable Accounts,Default Llogaritë e pagueshme
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Punonjës {0} nuk është aktiv apo nuk ekziston
 DocType: Fee Structure,Components,komponentet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Item Variantet {0} përditësuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ju lutem shkruani Pasurive Kategoria në pikën {0}
 DocType: Quality Inspection Reading,Reading 6,Leximi 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,"Nuk mund {0} {1} {2}, pa asnjë faturë negative shquar"
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Blerje Faturë Advance
 DocType: Hub Settings,Sync Now,Sync Tani
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: Hyrja e kredisë nuk mund të jetë i lidhur me një {1}
@@ -981,11 +984,11 @@
 DocType: Item,Is Purchase Item,Është Blerje Item
 DocType: Asset,Purchase Invoice,Blerje Faturë
 DocType: Stock Ledger Entry,Voucher Detail No,Voucher Detail Asnjë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Sales New Fatura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Sales New Fatura
 DocType: Stock Entry,Total Outgoing Value,Vlera Totale largohet
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Hapja Data dhe Data e mbylljes duhet të jetë brenda të njëjtit vit fiskal
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Hapja Data dhe Data e mbylljes duhet të jetë brenda të njëjtit vit fiskal
 DocType: Lead,Request for Information,Kërkesë për Informacion
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Sync Offline Faturat
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Sync Offline Faturat
 DocType: Payment Request,Paid,I paguar
 DocType: Program Fee,Program Fee,Tarifa program
 DocType: Salary Slip,Total in words,Gjithsej në fjalë
@@ -995,7 +998,7 @@
 DocType: Employee Loan,Sanctioned,sanksionuar
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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ë."
 DocType: Job Opening,Publish on website,Publikojë në faqen e internetit
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Dërgesat për klientët.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Furnizuesi Data e faturës nuk mund të jetë më i madh se mbi postimet Data
@@ -1006,7 +1009,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Grindje
 ,Company Name,Emri i kompanisë
 DocType: SMS Center,Total Message(s),Përgjithshme mesazh (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Përzgjidh Item për transferimin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1017,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Default Llogaria bankare / Cash do të rifreskohet automatikisht në Paga Journal hyrjes kur ky modalitet zgjidhet.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervalet për Kodi klasës {0} përputhet me intervale të klasës për klasat e tjera. Ju lutem kontrolloni intervale {0} dhe {1} dhe provoni përsëri
 DocType: BOM,Raw Material Cost(Company Currency),Raw Material Kosto (Company Valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: norma nuk mund të jetë më e madhe se norma e përdorur në {1} {2}
@@ -1031,14 +1032,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Item
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ngarko kokën tuaj letër dhe logo. (Ju mund të modifikoni ato më vonë).
 DocType: Timesheet Detail,Bill,Fature
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Zhvlerësimi Date tjetër është futur si datë të fundit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,E bardhë
 DocType: SMS Center,All Lead (Open),Të gjitha Lead (Open)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Qty nuk është në dispozicion për {4} në depo {1} të postimi kohën e hyrjes ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Get Paid Përparimet
 DocType: Item,Automatically Create New Batch,Automatikisht Krijo grumbull të ri
 DocType: Item,Automatically Create New Batch,Automatikisht Krijo grumbull të ri
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Bëj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Bëj
 DocType: Student Admission,Admission Start Date,Pranimi Data e fillimit
 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.
@@ -1046,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Ju lutem, jepni llogari për Ndryshim Shuma"
 DocType: Student Batch Name,Student Batch Name,Student Batch Emri
 DocType: Holiday List,Holiday List Name,Festa Lista Emri
 DocType: Repayment Schedule,Balance Loan Amount,Bilanci Shuma e Kredisë
@@ -1066,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Ju lutem specifikoni një {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Artikuj hequr me asnjë ndryshim në sasi ose në vlerë.
 DocType: Delivery Note,Delivery To,Ofrimit të
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Tabela atribut është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Tabela atribut është i detyrueshëm
 DocType: Production Planning Tool,Get Sales Orders,Get Sales urdhëron
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} nuk mund të jetë negative
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Zbritje
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Zbritje
 DocType: Asset,Total Number of Depreciations,Numri i përgjithshëm i nënçmime
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
 DocType: Sales Invoice Item,Rate With Margin,Shkalla me diferencë
@@ -1085,7 +1086,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Rezervuar Magazina në Sales Order / Finished mallrave Magazina
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Shuma Shitja
 DocType: Repayment Schedule,Interest Amount,Shuma e interesit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update &#39;Status&#39; dhe për të shpëtuar
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ju jeni aprovuesi Shpenzimet për këtë rekord. Ju lutem Update &#39;Status&#39; dhe për të shpëtuar
 DocType: Serial No,Creation Document No,Krijimi Dokumenti Asnjë
 DocType: Issue,Issue,Çështje
 DocType: Asset,Scrapped,braktiset
@@ -1093,12 +1094,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Atributet për Item variante. p.sh. madhësia, ngjyra etj"
 DocType: Purchase Invoice,Returns,Kthim
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Magazina
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Serial Asnjë {0} është nën kontratë të mirëmbajtjes upto {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,rekrutim
 DocType: Lead,Organization Name,Emri i Organizatës
 DocType: Tax Rule,Shipping State,Shteti Shipping
 ,Projected Quantity as Source,Sasia e parashikuar si Burimi
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Përfshijnë zëra jo-aksioneve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Shitjet Shpenzimet
@@ -1106,12 +1107,12 @@
 DocType: GL Entry,Against,Kundër
 DocType: Item,Default Selling Cost Center,Gabim Qendra Shitja Kosto
 DocType: Sales Partner,Implementation Partner,Partner Zbatimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Kodi Postal
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Kodi Postal
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Sales Order {0} është {1}
 DocType: Opportunity,Contact Info,Informacionet Kontakt
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Marrja e aksioneve Entries
 DocType: Packing Slip,Net Weight UOM,Net Weight UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Results
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Results
 DocType: Item,Default Supplier,Gabim Furnizuesi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Mbi prodhimin Allowance Përqindja
 DocType: Employee Loan,Repayment Schedule,sHLYERJES
@@ -1119,7 +1120,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Merr e pushimit javor Datat
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,End Date nuk mund të jetë më pak se Data e fillimit
 DocType: Sales Person,Select company name first.,Përzgjidh kompani emri i parë.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Kuotimet e marra nga furnizuesit.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Për {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Mesatare Moshë
@@ -1139,7 +1140,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Zona Performance
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transport
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Atributi i pavlefshëm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} duhet të dorëzohet
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Sasia duhet të jetë më e vogël se ose e barabartë me {0}
 DocType: SMS Center,Total Characters,Totali Figurë
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Ju lutem, përzgjidhni bom në fushën BOM për Item {0}"
@@ -1150,7 +1151,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 +224,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 +52,Please set 'Apply Additional Discount On',Ju lutemi të vendosur &#39;Aplikoni Discount shtesë në&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Nga një distancë duhet të jetë më pak se në rang
 DocType: Global Defaults,Global Defaults,Defaults Global
@@ -1160,7 +1161,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,fillimi Year
 DocType: Purchase Invoice,Start date of current invoice's period,Data e fillimit të periudhës së fatura aktual
 DocType: Salary Slip,Leave Without Pay,Lini pa pagesë
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapaciteti Planifikimi Gabim
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapaciteti Planifikimi Gabim
 ,Trial Balance for Party,Bilanci gjyqi për Partinë
 DocType: Lead,Consultant,Konsulent
 DocType: Salary Slip,Earnings,Fitim
@@ -1175,7 +1176,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Kjo do t&#39;i bashkëngjitet Kodit Pika e variant. Për shembull, në qoftë se shkurtim juaj është &quot;SM&quot;, dhe kodin pika është &quot;T-shirt&quot;, kodi pika e variantit do të jetë &quot;T-shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Neto Pay (me fjalë) do të jetë i dukshëm një herë ju ruani gabim pagave.
 DocType: Purchase Invoice,Is Return,Është Kthimi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Kthimi / Debiti Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Kthimi / Debiti Note
 DocType: Price List Country,Price List Country,Lista e Çmimeve Vendi
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} nos vlefshme serik për Item {1}
@@ -1185,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ju lutemi shkruani kodin Item për të marrë Numri i Serisë
 DocType: Stock Settings,Default Item Group,Gabim Item Grupi
 DocType: Employee Loan,Partially Disbursed,lëvrohet pjesërisht
-DocType: Grading Structure,Grading System Name,Emri Nota Sistemit
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Bazës së të dhënave Furnizuesi.
 DocType: Account,Balance Sheet,Bilanci i gjendjes
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Qendra Kosto Per Item me Kodin Item &quot;
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Mode pagesa nuk është i konfiguruar. Ju lutem kontrolloni, nëse llogaria është vendosur në Mode të pagesave ose në POS Profilin."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Personi i shitjes juaj do të merrni një kujtesë në këtë datë të kontaktoni klientin
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Same artikull nuk mund të futen shumë herë.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Llogaritë e mëtejshme mund të bëhen në bazë të grupeve, por hyra mund të bëhet kundër jo-grupeve"
@@ -1201,7 +1201,7 @@
 ,Purchase Order Items To Be Billed,Items Rendit Blerje Për të faturohet
 DocType: Purchase Invoice Item,Net Rate,Net Rate
 DocType: Purchase Invoice Item,Purchase Invoice Item,Blerje Item Faturë
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Hyrje dhe GL Entries janë reposted për Pranimeve zgjedhura Blerje
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger Hyrje dhe GL Entries janë reposted për Pranimeve zgjedhura Blerje
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Pika 1
 DocType: Holiday,Holiday,Festë
 DocType: Support Settings,Close Issue After Days,Mbylle Issue pas ditë
@@ -1228,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Punën e bërë
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ju lutem specifikoni të paktën një atribut në tabelë Atributet
 DocType: Announcement,All Students,Të gjitha Studentët
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} artikull duhet të jetë një element jo-aksioneve
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Shiko Ledger
 DocType: Grading Scale,Intervals,intervalet
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Hershme
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Një Grup Item ekziston me të njëjtin emër, ju lutemi të ndryshojë emrin pika ose riemërtoj grupin pika"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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ë
@@ -1272,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Pagesa e pagës nga {0} në {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t&#39;ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Sales Order {0} nuk është e vlefshme
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,urdhrat e blerjes t&#39;ju ndihmuar të planit dhe të ndjekin deri në blerjet tuaja
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Na vjen keq, kompanitë nuk mund të bashkohen"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",totale sasia Çështja / Transfer {0} në materiale Kërkesë {1} \ nuk mund të jetë më e madhe se sasia e kërkuar {2} për pikën {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,I vogël
@@ -1295,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Shpenzimet indirekte
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Row {0}: Qty është e detyrueshme
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Bujqësi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync Master Data
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync Master Data
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Faqja Image duhet të jetë një file publik ose URL website
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Ky është një grup artikull rrënjë dhe nuk mund të redaktohen.
@@ -1316,18 +1316,18 @@
 DocType: Student Group Student,Group Roll Number,Grupi Roll Number
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Për {0}, vetëm llogaritë e kreditit mund të jetë i lidhur kundër një tjetër hyrje debiti"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Total i të gjitha peshave duhet të jetë detyrë 1. Ju lutemi të rregulluar peshat e të gjitha detyrave të Projektit në përputhje me rrethanat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Ofrimit Shënim {0} nuk është dorëzuar
 apps/erpnext/erpnext/stock/get_item_details.py +141,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ë."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Rregulla e Çmimeve është zgjedhur për herë të parë në bazë të &quot;Apliko në &#39;fushë, të cilat mund të jenë të artikullit, Grupi i artikullit ose markë."
 DocType: Hub Settings,Seller Website,Shitës Faqja
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Gjithsej përqindje ndarë për shitjet e ekipit duhet të jetë 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Statusi Rendit Prodhimi është {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Statusi Rendit Prodhimi është {0}
 DocType: Appraisal Goal,Goal,Qëllim
 DocType: Sales Invoice Item,Edit Description,Ndrysho Përshkrimi
 ,Team Updates,Ekipi Updates
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Krijo Print Format
@@ -1343,7 +1343,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} artikuj në progres
 DocType: Workstation,Workstation Name,Workstation Emri
-DocType: Grade Interval,Grade Code,Kodi Grade
+DocType: Grading Scale Interval,Grade Code,Kodi Grade
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} nuk i përket Item {1}
@@ -1360,7 +1360,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hardware
 DocType: Sales Order,Recurring Upto,përsëritur upto
 DocType: Attendance,HR Manager,Menaxher HR
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Ju lutem zgjidhni një Company
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Ju lutem zgjidhni një Company
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilegj Leave
 DocType: Purchase Invoice,Supplier Invoice Date,Furnizuesi Data e faturës
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Ju duhet të mundësojnë Shporta
@@ -1376,7 +1376,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Ushqim
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Gama plakjen 3
 DocType: Maintenance Schedule Item,No of Visits,Nr i vizitave
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark FREKUENTIMI
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark FREKUENTIMI
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Mirëmbajtja Shtojca {0} ekziston kundër {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,studenti regjistrimit
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Monedhën e llogarisë Mbyllja duhet të jetë {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Shuma e pikëve për të gjitha qëllimet duhet të jetë 100. Kjo është {0}
@@ -1401,7 +1402,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily largohet
 DocType: POS Profile,Campaign,Fushatë
 DocType: Supplier,Name and Type,Emri dhe lloji i
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Miratimi Statusi duhet të jetë &quot;miratuar&quot; ose &quot;Refuzuar &#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Miratimi Statusi duhet të jetë &quot;miratuar&quot; ose &quot;Refuzuar &#39;
 DocType: Purchase Invoice,Contact Person,Personi kontaktues
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&quot;Pritet Data e Fillimit &#39;nuk mund të jetë më i madh se&quot; Data e Përfundimit e pritshme&#39;
 DocType: Course Scheduling Tool,Course End Date,Sigurisht End Date
@@ -1424,14 +1425,15 @@
 DocType: Sales Invoice,Shipping Address Name,Transporti Adresa Emri
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,nuk mund të jetë më i madh se 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,nuk mund të jetë më i madh se 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Item {0} nuk është një gjendje Item
 DocType: Maintenance Visit,Unscheduled,Paplanifikuar
 DocType: Employee,Owned,Pronësi
 DocType: Salary Detail,Depends on Leave Without Pay,Varet në pushim pa pagesë
 DocType: Pricing Rule,"Higher the number, higher the priority","Më i lartë numri, më i lartë prioriteti"
 ,Purchase Invoice Trends,Blerje Trendet Faturë
 DocType: Employee,Better Prospects,Perspektivë më të mirë
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Rresht # {0}: The batch {1} ka vetëm {2} Qty. Ju lutem zgjidhni një tjetër grumbull cila ka {3} Qty në dispozicion ose ndarë rresht në rreshta të shumta, për të ofruar / çështje nga tufa të shumta"
 DocType: Vehicle,License Plate,Targë
 DocType: Appraisal,Goals,Qëllimet
 DocType: Warranty Claim,Warranty / AMC Status,Garanci / AMC Statusi
@@ -1449,7 +1451,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Punonjësi nuk mund të raportojnë për veten e tij.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Në qoftë se llogaria është e ngrirë, shënimet janë të lejuar për përdoruesit të kufizuara."
 DocType: Email Digest,Bank Balance,Bilanci bankë
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Hyrja Kontabiliteti për {0}: {1} mund të bëhen vetëm në monedhën: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Profili i punës, kualifikimet e nevojshme etj"
 DocType: Journal Entry Account,Account Balance,Bilanci i llogarisë
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rregulla taksë për transaksionet.
@@ -1460,7 +1462,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Trego P &amp; L bilancet pambyllur vitit fiskal
 DocType: Shipping Rule,Shipping Account,Llogaria anijeve
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Llogaria {2} është joaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Bëni Sales urdhëron për të ndihmuar ju planifikoni punën tuaj dhe të japë në kohë
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Bëni Sales urdhëron për të ndihmuar ju planifikoni punën tuaj dhe të japë në kohë
 DocType: Quality Inspection,Readings,Lexime
 DocType: Stock Entry,Total Additional Costs,Gjithsej kosto shtesë
 DocType: Course Schedule,SH,SH
@@ -1471,7 +1473,7 @@
 DocType: Shipping Rule Condition,To Value,Të vlerës
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Shqip Paketimi
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Shqip Paketimi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Zyra Qira
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS settings portë
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import dështoi!
@@ -1493,11 +1495,11 @@
 DocType: Company,Services,Sherbime
 DocType: HR Settings,Email Salary Slip to Employee,Email Paga Slip për të punësuarit
 DocType: Cost Center,Parent Cost Center,Qendra prind Kosto
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Zgjidhni mundshëm Furnizuesi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Zgjidhni mundshëm Furnizuesi
 DocType: Sales Invoice,Source,Burim
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Shfaq të mbyllura
 DocType: Leave Type,Is Leave Without Pay,Lini është pa pagesë
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategoria është i detyrueshëm për artikull Aseteve Fikse
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Nuk u gjetën në tabelën e Pagesave të dhënat
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Kjo {0} konfliktet me {1} për {2} {3}
 DocType: Student Attendance Tool,Students HTML,studentët HTML
@@ -1515,7 +1517,7 @@
 DocType: Student,Date of Leaving,Datën e largimit
 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/utilities/activation.py +64,Create Leads,Krijo kryeson
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Krijo kryeson
 DocType: Maintenance Schedule,Schedules,Oraret
 DocType: Purchase Invoice Item,Net Amount,Shuma neto
 DocType: Purchase Order Item Supplied,BOM Detail No,Bom Detail Asnjë
@@ -1543,9 +1545,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,Program Regjistrimet
 DocType: Sales Invoice Item,Brand Name,Brand Name
 DocType: Purchase Receipt,Transporter Details,Detajet Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,depo Default është e nevojshme për pika të zgjedhura
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kuti
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,mundur Furnizuesi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,mundur Furnizuesi
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizata
 DocType: Budget,Monthly Distribution,Shpërndarja mujore
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Marresit Lista është e zbrazët. Ju lutem krijoni Marresit Lista
@@ -1553,8 +1555,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Shuma maksimale e kredisë
 DocType: Pricing Rule,Pricing Rule,Rregulla e Çmimeve
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Numri Duplicate roll për nxënës {0}
 DocType: Budget,Action if Annual Budget Exceeded,Veprimi në qoftë Buxheti vjetor Tejkaluar
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Kërkesë materiale për të blerë Radhit
 DocType: Shopping Cart Settings,Payment Success URL,Pagesa Suksesi URL
@@ -1575,9 +1577,9 @@
 DocType: Employee Loan,Repayment Method,Metoda Ripagimi
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Nëse zgjidhet, faqja Faqja do të jetë paracaktuar Item Grupi për faqen e internetit"
 DocType: Quality Inspection Reading,Reading 4,Leximi 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM Default për {0} nuk u gjet për Projektin {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM Default për {0} nuk u gjet për Projektin {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Kërkesat për shpenzimet e kompanisë.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Studentët janë në zemër të sistemit, shtoni të gjithë studentët tuaj"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Studentët janë në zemër të sistemit, shtoni të gjithë studentët tuaj"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: date Pastrimi {1} nuk mund të jetë para datës çek {2}
 DocType: Company,Default Holiday List,Default Festa Lista
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Nga kohë dhe për kohën e {1} është mbivendosje me {2}
@@ -1589,21 +1591,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dita (s) në të cilin ju po aplikoni për leje janë festa. Ju nuk duhet të aplikoni për leje.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ridergo Pagesa Email
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Detyra e re
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Bëni Kuotim
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Bëni Kuotim
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Raportet tjera
 DocType: Dependent Task,Dependent Task,Detyra e varur
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Faktori i konvertimit për Njësinë e parazgjedhur të Masës duhet të jetë 1 në rreshtin e {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Pushimi i tipit {0} nuk mund të jetë më i gjatë se {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Provoni planifikimin e operacioneve për ditë X paraprakisht.
 DocType: HR Settings,Stop Birthday Reminders,Stop Ditëlindja Harroni
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ju lutemi të vendosur Default Payroll Llogaria e pagueshme në Kompaninë {0}
 DocType: SMS Center,Receiver List,Marresit Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Kërko Item
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Kërko Item
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Shuma konsumuar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Ndryshimi neto në para të gatshme
 DocType: Assessment Plan,Grading Scale,Scale Nota
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,përfunduar tashmë
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Njësia e masës {0} ka hyrë më shumë se një herë në Konvertimi Faktori Tabelën
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,përfunduar tashmë
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Kërkesa pagesa tashmë ekziston {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostoja e Artikujve emetuara
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Sasia nuk duhet të jetë më shumë se {0}
@@ -1635,12 +1637,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Bëni disbursimi Hyrja
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Row {0}: Advance kundër Furnizuesit duhet të debiti
 DocType: Company,Default Values,Vlerat Default
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekuencë} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Shuma totale rimbursohen
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Kjo është e bazuar në shkrimet kundër këtij automjeteve. Shih afat kohor më poshtë për detaje
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,mbledh
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Kundër Furnizuesin Fatura {0} datë {1}
 DocType: Customer,Default Price List,E albumit Lista e Çmimeve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Rekord Lëvizja Asset {0} krijuar
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ju nuk mund të fshini Viti Fiskal {0}. Viti Fiskal {0} është vendosur si default në Settings Global
 DocType: Journal Entry,Entry Type,Hyrja Lloji
 ,Customer Credit Balance,Bilanci Customer Credit
@@ -1660,7 +1663,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Asnjë nga pikat ketë ndonjë ndryshim në sasi ose vlerë.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Fushë e detyrueshme - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Fushë e detyrueshme - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garanci Claim
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garanci Claim
 ,Lead Details,Detajet Lead
 DocType: Salary Slip,Loan repayment,shlyerjen e kredisë
 DocType: Purchase Invoice,End date of current invoice's period,Data e fundit e periudhës së fatura aktual
@@ -1679,12 +1682,10 @@
 DocType: Employee,Permanent Address,Adresa e përhershme
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ju lutemi zgjidhni kodin pika
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Ju lutemi zgjidhni kodin pika
 DocType: Student Sibling,Studying in Same Institute,Studimi në njëjtën Institutin
 DocType: Territory,Territory Manager,Territori Menaxher
 DocType: Packed Item,To Warehouse (Optional),Për Magazina (Fakultativ)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 DocType: Payment Entry,Paid Amount (Company Currency),Paid Shuma (Kompania Valuta)
 DocType: Purchase Invoice,Additional Discount,Discount shtesë
 DocType: Selling Settings,Selling Settings,Shitja Settings
@@ -1694,9 +1695,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Shiko në Shportë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Shpenzimet e marketingut
 ,Item Shortage Report,Item Mungesa Raport
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Pesha është përmendur, \ nJu lutemi të përmendim &quot;Weight UOM&quot; shumë"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Kërkesa material përdoret për të bërë këtë Stock Hyrja
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Zhvlerësimi Data Next është i detyrueshëm për pasuri të re
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Zhvlerësimi Data Next është i detyrueshëm për pasuri të re
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Sigurisht veçantë bazuar Grupi për çdo Batch
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Sigurisht veçantë bazuar Grupi për çdo Batch
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Njësi e vetme e një artikulli.
@@ -1713,9 +1714,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Qendra Kosto është e nevojshme për &quot;Fitimi dhe Humbja &#39;llogarisë {2}. Ju lutemi të ngritur një qendër me kosto të paracaktuar për kompaninë.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/templates/contact_list.html +2,New Contact,Kontakti i ri
 DocType: Territory,Parent Territory,Territori prind
 DocType: Quality Inspection Reading,Reading 2,Leximi 2
@@ -1732,7 +1731,7 @@
 ,Item-wise Sales Register,Pika-mençur Sales Regjistrohu
 DocType: Asset,Gross Purchase Amount,Shuma Blerje Gross
 DocType: Asset,Depreciation Method,Metoda e amortizimit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,në linjë
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,në linjë
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,A është kjo Tatimore të përfshira në normën bazë?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Target Total
 DocType: Program Course,Required,i nevojshëm
@@ -1742,21 +1741,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Pajtimi JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Shumë kolona. Eksportit raportin dhe të shtypura duke përdorur një aplikim spreadsheet.
 DocType: Purchase Invoice Item,Batch No,Batch Asnjë
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Në pamundësi për të gjetur kursin e këmbimit për {0} në {1} për datën kyçe {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Lejo Sales shumta urdhra kundër Rendit Blerje një konsumatorit
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 DocType: Student Group Instructor,Student Group Instructor,Grupi Student Instruktor
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Kryesor
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Kryesor
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Prefiksi vendosur për numëron seri mbi transaksionet tuaja
 DocType: Employee Attendance Tool,Employees HTML,punonjësit HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Gabim BOM ({0}) duhet të jetë aktiv për këtë artikull ose template saj
 DocType: Employee,Leave Encashed?,Dërgo arkëtuar?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Opportunity Nga fushë është e detyrueshme
 DocType: Email Digest,Annual Expenses,Shpenzimet vjetore
 DocType: Item,Variants,Variantet
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Bëni Rendit Blerje
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Bëni Rendit Blerje
 DocType: SMS Center,Send To,Send To
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Nuk ka bilanc mjaft leje për pushim Lloji {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Shuma e ndarë
@@ -1764,18 +1762,17 @@
 DocType: Sales Invoice Item,Customer's Item Code,Item Kodi konsumatorit
 DocType: Stock Reconciliation,Stock Reconciliation,Stock Pajtimit
 DocType: Territory,Territory Name,Territori Emri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Puna në progres Magazina është e nevojshme para se të Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Aplikuesi për një punë.
 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
 DocType: Item,Serial Nos and Batches,Serial Nr dhe Batches
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupi Student Forca
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Grupi Student Forca
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Kundër Fletoren Hyrja {0} nuk ka asnjë pashoq {1} hyrje
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,vlerësime
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Intervalet e notimit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Ju lutemi shkruani
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","nuk mund overbill për artikullit {0} në rradhë {1} më shumë se {2}. Për të lejuar mbi-faturimit, ju lutemi të vendosur në Blerja Settings"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ju lutemi të vendosur filtër në bazë të artikullit ose Magazina
@@ -1787,17 +1784,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} duhet të dorëzohet
 DocType: Authorization Control,Authorization Control,Kontrolli Autorizimi
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Row # {0}: Rejected Magazina është e detyrueshme kundër Item refuzuar {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Pagesa
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Menaxho urdhërat tuaj
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Pagesa
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Menaxho urdhërat tuaj
 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
 DocType: Course,Course Abbreviation,Shkurtesa Course
 DocType: Student Leave Application,Student Leave Application,Student Leave Aplikimi
 DocType: Item,Will also apply for variants,Gjithashtu do të aplikojë për variantet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset nuk mund të anulohet, pasi ajo tashmë është {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},I punësuar {0} në gjysmë ditë në {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Orët totale të punës nuk duhet të jetë më e madhe se sa orë pune max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Në
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Artikuj Bundle në kohën e shitjes.
 DocType: Quotation Item,Actual Qty,Aktuale Qty
 DocType: Sales Invoice Item,References,Referencat
@@ -1807,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Ju keni hyrë artikuj kopjuar. Ju lutemi të ndrequr dhe provoni përsëri.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Koleg
 DocType: Asset Movement,Asset Movement,Lëvizja e aseteve
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Shporta e re
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Shporta e re
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Item {0} nuk është një Item serialized
 DocType: SMS Center,Create Receiver List,Krijo Marresit Lista
 DocType: Vehicle,Wheels,rrota
@@ -1839,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Pamundëson krijimin e kohës shkrimet kundër urdhërat e prodhimit. Operacionet nuk do të gjurmuar kundër Rendit Production
 DocType: Student,Student Mobile Number,Student Mobile Number
 DocType: Item,Has Variants,Ka Variantet
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ju keni zgjedhur tashmë artikuj nga {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Emri i Shpërndarjes Mujore
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Grumbull ID është i detyrueshëm
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Grumbull ID është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Grumbull ID është i detyrueshëm
 DocType: Sales Person,Parent Sales Person,Shitjet prind Person
 DocType: Purchase Invoice,Recurring Invoice,Fatura përsëritur
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Menaxhimi i Projekteve
@@ -1850,11 +1848,11 @@
 DocType: Budget,Fiscal Year,Viti Fiskal
 DocType: Vehicle Log,Fuel Price,Fuel Price
 DocType: Budget,Budget,Buxhet
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Item Aseteve duhet të jetë një element jo-aksioneve.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Buxheti nuk mund të caktohet {0} kundër, pasi kjo nuk është një llogari të ardhura ose shpenzime"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arritur
 DocType: Student Admission,Application Form Route,Formular Aplikimi Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territori / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territori / Customer
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,p.sh. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Dërgo Lloji {0} nuk mund të ndahen pasi ajo është lënë pa paguar
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Row {0}: Shuma e ndarë {1} duhet të jetë më pak se ose e barabartë me shumën e faturës papaguar {2}
@@ -1874,14 +1872,14 @@
 ,Serial No Status,Serial Asnjë Statusi
 DocType: Payment Entry Reference,Outstanding,i shquar
 ,Daily Timesheet Summary,Daily Përmbledhje pasqyrë e mungesave
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Row {0}: Për të vendosur {1} periodiciteti, dallimi në mes të dhe në datën \ duhet të jetë më e madhe se ose e barabartë me {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Kjo është e bazuar në lëvizjen e aksioneve. Shih {0} për detaje
 DocType: Pricing Rule,Selling,Shitja
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Shuma {0} {1} zbritur kundër {2}
 DocType: Employee,Salary Information,Informacione paga
 DocType: Sales Person,Name and Employee ID,Emri dhe punonjës ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Për shkak Data nuk mund të jetë para se të postimi Data
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Detyrat dhe Taksat
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ju lutem shkruani datën Reference
@@ -1893,14 +1891,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Nuk mund t&#39;i referohet numrit rresht më të madhe se, ose të barabartë me numrin e tanishëm rresht për këtë lloj Ngarkesa"
 DocType: Asset,Sold,i shitur
 ,Item-wise Purchase History,Historia Blerje pika-mençur
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ju lutem klikoni në &quot;Generate&quot; Listën për të shkoj të marr Serial Asnjë shtuar për Item {0}
 DocType: Account,Frozen,I ngrirë
 ,Open Production Orders,Urdhërat e hapur e prodhimit
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Base Shuma (Company Valuta)
 DocType: Payment Reconciliation Payment,Reference Row,Reference Row
 DocType: Installation Note,Installation Time,Instalimi Koha
 DocType: Sales Invoice,Accounting Details,Detajet Kontabilitet
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Fshij gjitha transaksionet për këtë kompani
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investimet
 DocType: Issue,Resolution Details,Rezoluta Detajet
@@ -1933,14 +1931,14 @@
 DocType: Discussion,Discussion,diskutim
 DocType: Payment Entry,Transaction ID,ID Transaction
 DocType: Employee,Resignation Letter Date,Dorëheqja Letër Data
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Rregullat e Çmimeve të filtruar më tej në bazë të sasisë.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Ju lutemi të vendosur datën e bashkuar për të punësuar {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Total Shuma Faturimi (via Koha Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Përsëriteni ardhurat Klientit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) duhet të ketë rol &#39;aprovuesi kurriz&#39;
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Palë
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Zgjidhni bom dhe Qty për Prodhimin
 DocType: Asset,Depreciation Schedule,Zhvlerësimi Orari
 DocType: Bank Reconciliation Detail,Against Account,Kundër Llogaria
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Half Data Day duhet të jetë midis Nga Data dhe deri më sot
@@ -1954,16 +1952,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ju lutemi të vendosur &#39;të mjeteve Qendra Amortizimi Kosto&#39; në Kompaninë {0}
 ,Maintenance Schedules,Mirëmbajtja Oraret
 DocType: Task,Actual End Date (via Time Sheet),Aktuale End Date (via Koha Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Shuma {0} {1} kundër {2} {3}
 ,Quotation Trends,Kuotimit Trendet
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Grupi pika nuk përmendet në pikën për të zotëruar pikën {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Në pritje Shuma
 DocType: Purchase Invoice Item,Conversion Factor,Konvertimi Faktori
 DocType: Purchase Order,Delivered,Dorëzuar
 ,Vehicle Expenses,Shpenzimet automjeteve
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
+DocType: Serial No,Invoice Details,detajet e faturës
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Vlera e pritshme pas jetës së dobishme duhet të jetë më e madhe se ose e barabartë me {0}
 DocType: Purchase Receipt,Vehicle Number,Numri i Automjeteve
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Data në të cilën përsëritura fatura do të ndalet
 DocType: Employee Loan,Loan Amount,Shuma e kredisë
@@ -1982,12 +1981,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,HR Cilësimet
 DocType: Salary Slip,net pay info,info net pay
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,Shpenzimet e reja
 DocType: Purchase Invoice,Additional Discount Amount,Shtesë Shuma Discount
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Qty duhet të jetë 1, pasi pika është një pasuri fikse. Ju lutem përdorni rresht të veçantë për Qty shumëfishtë."
 DocType: Leave Block List Allow,Leave Block List Allow,Dërgo Block Lista Lejoni
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr nuk mund të jetë bosh ose hapësirë
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grup për jo-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sportiv
 DocType: Loan Type,Loan Name,kredi Emri
@@ -1998,6 +1997,7 @@
 ,Customer Acquisition and Loyalty,Customer Blerja dhe Besnik
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Magazina ku ju jeni mbajtjen e aksioneve të artikujve refuzuar
 DocType: Production Order,Skip Material Transfer,Kalo Material Transferimi
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Në pamundësi për të gjetur kursin e këmbimit për {0} në {1} për datën kyçe {2}. Ju lutem të krijuar një rekord Currency Exchange dorë
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Vitin e juaj financiare përfundon në
 DocType: POS Profile,Price List,Tarifë
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} është tani default Viti Fiskal. Ju lutemi të rifreskoni shfletuesin tuaj për ndryshim të hyjnë në fuqi.
@@ -2014,19 +2014,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Llogari {0} është i pavlefshëm. Llogaria Valuta duhet të jetë {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Faktori UOM Konvertimi është e nevojshme në rresht {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një nga Sales Rendit, Sales Fatura ose Journal Entry"
 DocType: Salary Component,Deduction,Zbritje
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Nga koha dhe në kohë është i detyrueshëm.
 DocType: Stock Reconciliation Item,Amount Difference,shuma Diferenca
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Item Çmimi shtuar për {0} në çmim Lista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ju lutemi shkruani punonjës Id i këtij personi të shitjes
 DocType: Territory,Classification of Customers by region,Klasifikimi i Konsumatorëve sipas rajonit
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Dallimi Shuma duhet të jetë zero
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Dallimi Shuma duhet të jetë zero
 DocType: Project,Gross Margin,Marzhi bruto
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Ju lutemi shkruani Prodhimi pikën e parë
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Llogaritur Banka bilanci Deklarata
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,përdorues me aftësi të kufizuara
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Citat
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Citat
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Zbritje Total
 ,Production Analytics,Analytics prodhimit
@@ -2035,9 +2035,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Warning: certifikatë SSL Invalid në shtojcën {0}
 DocType: Student Admission,Eligibility,pranueshmëri
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Çon ju ndihmojë të merrni të biznesit, shtoni të gjitha kontaktet tuaja dhe më shumë si çon tuaj"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Çon ju ndihmojë të merrni të biznesit, shtoni të gjitha kontaktet tuaja dhe më shumë si çon tuaj"
 DocType: Production Order Operation,Actual Operation Time,Aktuale Operacioni Koha
 DocType: Authorization Rule,Applicable To (User),Për të zbatueshme (User)
 DocType: Purchase Taxes and Charges,Deduct,Zbres
@@ -2052,7 +2052,7 @@
 DocType: Guardian,Work Address,puna Adresa
 DocType: Appraisal,Calculate Total Score,Llogaritur Gjithsej Vota
 DocType: Request for Quotation,Manufacturing Manager,Prodhim Menaxher
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Serial Asnjë {0} është nën garanci upto {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Shënim Split dorëzimit në pako.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Dërgesat
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Llogaria ({0}) për {1} dhe vlerës modelet ({2}) për depoja {3} duhet të jetë i njëjtë
@@ -2075,10 +2075,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Shënim: Email nuk do të dërgohet për përdoruesit me aftësi të kufizuara
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numri i bashkëveprimit
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Numri i bashkëveprimit
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Zgjidh kompanisë ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Zgjidh kompanisë ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lini bosh nëse konsiderohet për të gjitha departamentet
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Llojet e punësimit (, kontratë të përhershme, etj intern)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} është e detyrueshme për Item {1}
 DocType: Process Payroll,Fortnightly,dyjavor
 DocType: Currency Exchange,From Currency,Nga Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2087,14 +2087,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Shkalla (Kompania Valuta)
 DocType: Student Guardian,Others,Të tjerët
 DocType: Payment Entry,Unallocated Amount,Shuma pashpërndarë
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Nuk mund të gjeni një përputhen Item. Ju lutem zgjidhni një vlerë tjetër {0} për.
 DocType: POS Profile,Taxes and Charges,Taksat dhe Tarifat
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Një produkt apo një shërbim që është blerë, shitur apo mbajtur në magazinë."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Nuk ka përditësime më shumë
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Nuk mund të zgjidhni llojin e ngarkuar si &quot;Për Shuma Previous Row &#39;ose&#39; Në Previous Row Total&quot; për rreshtin e parë
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Child Item nuk duhet të jetë një Bundle Product. Ju lutemi të heq arikullin &#39;{0}&#39; dhe për të shpëtuar
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankar
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Shto timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Shto timesheets
 DocType: Vehicle Service,Service Item,Shërbimi Item
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
 DocType: Bank Guarantee,Bank Guarantee,garanci bankare
@@ -2120,6 +2120,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: Asset {1} është tashmë {2}
 DocType: Quotation Item,Stock Balance,Stock Bilanci
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Rendit Shitjet për Pagesa
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ju lutemi të vendosur Emërtimi Seria për {0} nëpërmjet Setup&gt; Cilësimet&gt; Emërtimi Seria
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Shpenzim Kërkesa Detail
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Ju lutem, përzgjidhni llogarinë e saktë"
@@ -2144,14 +2145,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Çmimet nuk do të shfaqet në qoftë Lista Çmimi nuk është vendosur
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ju lutem specifikoni një vend për këtë Rregull Shipping ose kontrolloni anijeve në botë
 DocType: Stock Entry,Total Incoming Value,Vlera Totale hyrëse
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debi Për të është e nevojshme
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debi Për të është e nevojshme
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets ndihmojë për të mbajtur gjurmët e kohës, kostos dhe faturimit për Aktivitetet e kryera nga ekipi juaj"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Blerje Lista e Çmimeve
 DocType: Offer Letter Term,Offer Term,Term Oferta
 DocType: Quality Inspection,Quality Manager,Menaxheri Cilësia
 DocType: Job Applicant,Job Opening,Hapja Job
 DocType: Payment Reconciliation,Payment Reconciliation,Pajtimi Pagesa
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Ju lutem, përzgjidhni emrin incharge personi"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknologji
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Total papaguar: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Website Operacioni
@@ -2179,23 +2180,23 @@
 DocType: Opportunity,Lost Reason,Humbur Arsyeja
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Të gjitha sendet janë tashmë faturohen
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ju lutemi shkruani Dokumenti Marrjes
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Qendrat e mëtejshme e kostos mund të bëhet në bazë të Grupeve por hyra mund të bëhet kundër jo-grupeve
 DocType: Project,External,I jashtëm
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Përdoruesit dhe Lejet
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Urdhërat e prodhimit Krijuar: {0}
 DocType: Branch,Branch,Degë
 DocType: Guardian,Mobile Number,Numri Mobile
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Printime dhe quajtur
 DocType: Bin,Actual Quantity,Sasia aktuale
 DocType: Shipping Rule,example: Next Day Shipping,shembull: Transporti Dita e ardhshme
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Serial Asnjë {0} nuk u gjet
 DocType: Scheduling Tool,Student Batch,Batch Student
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Konsumatorët tuaj
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,bëni Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,bëni Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ju keni qenë të ftuar për të bashkëpunuar në këtë projekt: {0}
 DocType: Leave Block List Date,Block Date,Data bllok
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Apliko tani
@@ -2219,8 +2220,9 @@
 DocType: SMS Log,Sent To,Dërguar në
 DocType: Payment Request,Make Sales Invoice,Bëni Sales Faturë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Programe
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Data nuk mund të jetë në të kaluarën
 DocType: Company,For Reference Only.,Vetëm për referencë.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Zgjidh Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Invalid {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Advance Shuma
@@ -2234,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Rast No. nuk mund të jetë 0
 DocType: Item,Show a slideshow at the top of the page,Tregojnë një Slideshow në krye të faqes
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Dyqane
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Dyqane
 DocType: Serial No,Delivery Time,Koha e dorëzimit
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Plakjen Bazuar Në
 DocType: Item,End of Life,Fundi i jetës
@@ -2246,12 +2248,12 @@
 DocType: Rename Tool,Rename Tool,Rename Tool
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Update Kosto
 DocType: Item Reorder,Item Reorder,Item reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Trego Paga Shqip
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Material Transferimi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Trego Paga Shqip
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Ky dokument është mbi kufirin nga {0} {1} për pika {4}. A jeni duke bërë një tjetër {3} kundër të njëjtit {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Llogaria Shuma Zgjidh ndryshim
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Ju lutemi të vendosur përsëritur pas kursimit
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Llogaria Shuma Zgjidh ndryshim
 DocType: Purchase Invoice,Price List Currency,Lista e Çmimeve Valuta
 DocType: Naming Series,User must always select,Përdoruesi duhet të zgjidhni gjithmonë
 DocType: Stock Settings,Allow Negative Stock,Lejo Negativ Stock
@@ -2262,7 +2264,7 @@
 DocType: Budget Account,Budget Account,Llogaria buxheti
 DocType: Quality Inspection,Verified By,Verifikuar nga
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Nuk mund të ndryshojë monedhën parazgjedhje kompanisë, sepse ka transaksione ekzistuese. Transaksionet duhet të anulohet për të ndryshuar monedhën default."
-DocType: Grade Interval,Grade Description,Grade Përshkrimi
+DocType: Grading Scale Interval,Grade Description,Grade Përshkrimi
 DocType: Stock Entry,Purchase Receipt No,Pranimi Blerje Asnjë
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparosje
 DocType: Process Payroll,Create Salary Slip,Krijo Kuponi pagave
@@ -2300,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Pjesëmarrja në datën
 DocType: Warranty Claim,Raised By,Ngritur nga
 DocType: Payment Gateway Account,Payment Account,Llogaria e pagesës
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Ju lutemi specifikoni kompanisë për të vazhduar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Ndryshimi neto në llogarive të arkëtueshme
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensues Off
 DocType: Offer Letter,Accepted,Pranuar
@@ -2310,12 +2312,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Numri Room
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Referenca e pavlefshme {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) nuk mund të jetë më i madh se quanitity planifikuar ({2}) në Prodhimi i rendit {3}
 DocType: Shipping Rule,Shipping Rule Label,Rregulla Transporti Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Forumi User
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,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 +460,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Hyrja
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Nuk mund të rinovuar aksioneve, fatura përmban anijeve rënie artikull."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Journal Hyrja
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2328,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Termat dhe Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Emri i institutit për të cilat ju jeni të vendosur deri këtë sistem.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Rregjistrimi kontabël ngrirë deri në këtë datë, askush nuk mund të bëjë / modifikoj hyrjen përveç rolit të specifikuar më poshtë."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Ju lutemi ruani dokumentin para se të gjeneruar orar të mirëmbajtjes
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Statusi i Projektit
 DocType: UOM,Check this to disallow fractions. (for Nos),Kontrolloni këtë për të moslejuar fraksionet. (Për Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,janë krijuar Urdhërat e mëposhtme prodhimit:
@@ -2355,7 +2357,7 @@
 ,Employees working on a holiday,Punonjës që punojnë në një festë
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark pranishëm
 DocType: Project,% Complete Method,% Complete Metoda
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Data e fillimit të mirëmbajtjes nuk mund të jetë para datës së dorëzimit për Serial Nr {0}
 DocType: Production Order,Actual End Date,Aktuale End Date
 DocType: BOM,Operating Cost (Company Currency),Kosto Operative (Company Valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2372,7 +2374,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Dërgo Pa Paguhet nuk përputhet me të dhënat Leave Aplikimi miratuara
 DocType: Campaign,Campaign-.####,Fushata -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Hapat e ardhshëm
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Ju lutemi të furnizimit me artikuj të specifikuara në normat më të mirë të mundshme
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Opportunity afër pas 15 ditësh
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,Fundi Viti
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot /% Lead
@@ -2410,7 +2412,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Sasia
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Records tarifë Krijuar - {0}
 DocType: Asset Category Account,Asset Category Account,Asset Kategoria Llogaria
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Hyrja {0} nuk është dorëzuar
 DocType: Payment Reconciliation,Bank / Cash Account,Llogarisë Bankare / Cash
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Next kontaktoni me nuk mund të jetë i njëjtë si adresë Lead Email
@@ -2432,7 +2434,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Pastrimi Data nuk përmendet
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Prodhim
 DocType: Guardian,Occupation,profesion
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi Setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Row {0}: Filloni Data duhet të jetë përpara End Date
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Gjithsej (Qty)
 DocType: Sales Invoice,This Document,Ky dokument
 DocType: Installation Note Item,Installed Qty,Instaluar Qty
@@ -2448,15 +2451,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Raportoni një çështje
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Shpenzimet komunale
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Mbi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Ditari Hyrja {1} nuk ka llogari {2} ose tashmë krahasohen kundër një kupon
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Ditari Hyrja {1} nuk ka llogari {2} ose tashmë krahasohen kundër një kupon
 DocType: Buying Settings,Default Buying Price List,E albumit Lista Blerja Çmimi
 DocType: Process Payroll,Salary Slip Based on Timesheet,Slip Paga Bazuar në pasqyrë e mungesave
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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"
 DocType: Payment Entry,Payment Type,Lloji Pagesa
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Ju lutem, përzgjidhni një grumbull për pika {0}. Në pamundësi për të gjetur një grumbull të vetme që përmbush këtë kërkesë"
 DocType: Process Payroll,Select Employees,Zgjidhni Punonjësit
 DocType: Opportunity,Potential Sales Deal,Shitjet e mundshme marrëveshjen
 DocType: Payment Entry,Cheque/Reference Date,Çek / Reference Data
@@ -2473,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profilin {0} krijuar tashmë për kompaninë {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Replace Item / bom në të gjitha BOM-in
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Dokumenti Pranimi duhet të dorëzohet
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Dokumenti Pranimi duhet të dorëzohet
 DocType: Purchase Invoice Item,Received Qty,Marrë Qty
 DocType: Stock Entry Detail,Serial No / Batch,Serial No / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Nuk është paguar dhe nuk dorëzohet
@@ -2482,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Nuk ka fletë kohë
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,"Dërgo Type {0} nuk mund të kryejë, përcillet"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Mirëmbajtja Orari nuk është krijuar për të gjitha sendet. Ju lutem klikoni në &quot;Generate Listën &#39;
 ,To Produce,Për të prodhuar
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Payroll
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Për rresht {0} në {1}. Të përfshijnë {2} në shkallën Item, {3} duhet të përfshihen edhe rreshtave"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,bëni përdoruesin
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,bëni përdoruesin
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifikimi i paketës për shpërndarjen (për shtyp)
 DocType: Bin,Reserved Quantity,Sasia e rezervuara
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ju lutemi shkruani adresën vlefshme email
@@ -2500,15 +2503,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,template me aftësi të kufizuara nuk duhet të jetë template parazgjedhur
 DocType: Account,Income Account,Llogaria ardhurat
 DocType: Payment Request,Amount in customer's currency,Shuma në monedhë të klientit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Ofrimit të
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Ofrimit të
 DocType: Stock Reconciliation Item,Current Qty,Qty tanishme
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Shih &quot;Shkalla e materialeve në bazë të&quot; në nenin kushton
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,prev
 DocType: Appraisal Goal,Key Responsibility Area,Key Zona Përgjegjësia
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Mallrat e studentëve të ju ndihmojë të gjetur frekuentimit, vlerësimet dhe tarifat për studentët"
 DocType: Payment Entry,Total Allocated Amount,Shuma totale e alokuar
 DocType: Item Reorder,Material Request Type,Material Type Kërkesë
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Gazeta hyrjes pagave nga {0} në {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage është e plotë, nuk ka shpëtuar"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage është e plotë, nuk ka shpëtuar"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: UOM Konvertimi Faktori është i detyrueshëm
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Qendra Kosto
@@ -2518,16 +2522,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Fshih Id Tatimore e konsumatorit nga transaksionet e shitjeve
 DocType: Upload Attendance,Upload HTML,Ngarko HTML
 DocType: Employee,Relieving Date,Lehtësimin Data
-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.","Rregulla e Çmimeve është bërë për të prishësh LISTA E ÇMIMEVE / definojnë përqindje zbritje, në bazë të disa kritereve."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Rregulla e Çmimeve është bërë për të prishësh LISTA E ÇMIMEVE / definojnë përqindje zbritje, në bazë të disa kritereve."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Magazina mund të ndryshohet vetëm përmes Stock Hyrja / dorëzimit Shënim / Pranimi Blerje
 DocType: Employee Education,Class / Percentage,Klasa / Përqindja
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Shef i Marketingut dhe Shitjes
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Tatimi mbi të ardhurat
-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.","Nëse Rregulla zgjedhur Çmimeve është bërë për &#39;Çmimi&#39;, ajo do të prishësh listën e çmimeve. Çmimi Rregulla e Çmimeve është çmimi përfundimtar, kështu që nuk ka zbritje të mëtejshme duhet të zbatohet. Për këtë arsye, në transaksione si Sales Rendit, Rendit Blerje etj, ajo do të sjellë në fushën e &#39;norma&#39;, në vend se të fushës &quot;listën e çmimeve normë &#39;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nëse Rregulla zgjedhur Çmimeve është bërë për &#39;Çmimi&#39;, ajo do të prishësh listën e çmimeve. Çmimi Rregulla e Çmimeve është çmimi përfundimtar, kështu që nuk ka zbritje të mëtejshme duhet të zbatohet. Për këtë arsye, në transaksione si Sales Rendit, Rendit Blerje etj, ajo do të sjellë në fushën e &#39;norma&#39;, në vend se të fushës &quot;listën e çmimeve normë &#39;."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Track kryeson nga Industrisë Type.
 DocType: Item Supplier,Item Supplier,Item Furnizuesi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Ju lutem, përzgjidhni një vlerë për {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Ju lutemi shkruani Kodin artikull për të marrë grumbull asnjë
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Të gjitha adresat.
 DocType: Company,Stock Settings,Stock Cilësimet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2537,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Do të dërgoni një email në lidhje me ngjarjen për të punësuarit me statusin e &#39;hapur&#39;
 DocType: Task,Depends on Tasks,Varet Detyrat
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Manage grup të konsumatorëve Tree.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Attachments mund të tregohet pa mundësuar karrocat
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Qendra Kosto New Emri
 DocType: Leave Control Panel,Leave Control Panel,Lini Control Panel
@@ -2549,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,Debi Për
 DocType: Delivery Note,Required only for sample item.,Kërkohet vetëm për pika të mostrës.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Qty aktual Pas Transaksionit
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Furnizuesi&gt; Furnizuesi lloji
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Nuk ka paga shqip gjetur mes {0} dhe {1}
 ,Pending SO Items For Purchase Request,Në pritje SO artikuj për Kërkesë Blerje
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Pranimet e studentëve
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} është me aftësi të kufizuara
 DocType: Supplier,Billing Currency,Faturimi Valuta
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Shumë i madh
@@ -2571,9 +2574,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Homepage Featured Product
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Të gjitha grupet e vlerësimit
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,New Magazina Emri
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Total {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Total {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territor
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ju lutemi përmendni i vizitave të kërkuara
 DocType: Stock Settings,Default Valuation Method,Gabim Vlerësimi Metoda
 DocType: Vehicle Log,Fuel Qty,Fuel Qty
 DocType: Production Order Operation,Planned Start Time,Planifikuar Koha e fillimit
@@ -2589,7 +2592,7 @@
 DocType: Price List,Price List Master,Lista e Çmimeve Master
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Gjitha Shitjet Transaksionet mund të tagged kundër shumta ** Personat Sales ** në mënyrë që ju mund të vendosni dhe monitoruar objektivat.
 ,S.O. No.,SO Nr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Ju lutem të krijuar Customer nga Lead {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Vetëm Dërgo Aplikacione me status &#39;miratuar&#39; dhe &#39;refuzuar&#39; mund të dorëzohet
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student Group Emri është i detyrueshëm në rresht {0}
@@ -2621,7 +2624,7 @@
 DocType: Project,Copied From,kopjuar nga
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Emri error: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,mungesa
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} nuk lidhet me {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} nuk lidhet me {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Pjesëmarrja për punonjës {0} është shënuar tashmë
 DocType: Packing Slip,If more than one package of the same type (for print),Nëse më shumë se një paketë të të njëjtit lloj (për shtyp)
 ,Salary Register,Paga Regjistrohu
@@ -2640,7 +2643,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Përdorni për Shopping Cart
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Vlera {0} për atribut {1} nuk ekziston në listën e artikullit vlefshme atribut Vlerat për Item {2}
 DocType: BOM Item,Scrap %,Scrap%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Akuzat do të shpërndahen në mënyrë proporcionale në bazë të Qty pika ose sasi, si për zgjedhjen tuaj"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Akuzat do të shpërndahen në mënyrë proporcionale në bazë të Qty pika ose sasi, si për zgjedhjen tuaj"
 DocType: Maintenance Visit,Purposes,Qëllimet
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operacioni {0} gjatë se çdo orë në dispozicion të punës në workstation {1}, prishen operacionin në operacione të shumta"
@@ -2661,16 +2664,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Manage Territorit Tree.
 DocType: Journal Entry Account,Sales Invoice,Shitjet Faturë
 DocType: Journal Entry Account,Party Balance,Bilanci i Partisë
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Ju lutem, përzgjidhni Aplikoni zbritje në"
 DocType: Company,Default Receivable Account,Gabim Llogaria Arkëtueshme
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Krijo Banka e hyrjes për pagën totale e paguar për kriteret e përzgjedhura më sipër
 DocType: Stock Entry,Material Transfer for Manufacture,Transferimi materiale për Prodhimin
-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.,Përqindja zbritje mund të aplikohet ose ndaj një listë të çmimeve apo për të gjithë listën e çmimeve.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Përqindja zbritje mund të aplikohet ose ndaj një listë të çmimeve apo për të gjithë listën e çmimeve.
 DocType: Purchase Invoice,Half-yearly,Gjashtëmujor
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Hyrja kontabilitetit për magazinë
 DocType: Vehicle Service,Engine Oil,Vaj makine
 DocType: Sales Invoice,Sales Team1,Shitjet Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Item {0} nuk ekziston
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Item {0} nuk ekziston
 DocType: Sales Invoice,Customer Address,Customer Adresa
 DocType: Employee Loan,Loan Details,kredi Details
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Kompletuar Qty duhet të jetë më e madhe se zero.
@@ -2678,24 +2681,24 @@
 DocType: Account,Root Type,Root Type
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: nuk mund të kthehet më shumë se {1} për Item {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Komplot
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Komplot
 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}
 DocType: Cheque Print Template,Primary Settings,Parametrat kryesore
 DocType: Purchase Invoice,Select Supplier Address,Zgjidh Furnizuesi Adresa
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Shto Punonjës
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Shto Punonjës
 DocType: Purchase Invoice Item,Quality Inspection,Cilësia Inspektimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Vogla
 DocType: Company,Standard Template,Template standard
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Warning: Materiali kërkuar Qty është më pak se minimale Rendit Qty
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Llogaria {0} është ngrirë
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Personit juridik / subsidiare me një tabelë të veçantë e llogarive i përkasin Organizatës.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Ushqim, Pije &amp; Duhani"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Vetëm mund të bëni pagesën kundër pafaturuar {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,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 +127,Commission rate cannot be greater than 100,Shkalla e Komisionit nuk mund të jetë më e madhe se 100
 DocType: Stock Entry,Subcontract,Nënkontratë
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ju lutem shkruani {0} parë
@@ -2735,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Depot me transaksion ekzistues nuk mund të konvertohet në grup.
 DocType: Assessment Result Tool,Result HTML,Rezultati HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Skadon ne
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Shto Studentët
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Shto Studentët
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Ju lutem, përzgjidhni {0}"
 DocType: C-Form,C-Form No,C-Forma Nuk ka
 DocType: BOM,Exploded_items,Exploded_items
@@ -2778,7 +2781,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Sasia
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Shkruani emrin e fushatës nëse burimi i hetimit është fushatë
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazeta Botuesit
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Zgjidh Viti Fiskal
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Zgjidh Viti Fiskal
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Reorder Niveli
 DocType: Company,Chart Of Accounts Template,Chart e Llogarive Stampa
 DocType: Attendance,Attendance Date,Pjesëmarrja Data
@@ -2793,14 +2796,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Hyrja Duplicate
 DocType: Program Enrollment Tool,Get Students,Get Studentët
 DocType: Serial No,Under Warranty,Nën garanci
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Gabim]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Gabim]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Me fjalë do të jetë i dukshëm një herë ju ruani Rendit Sales.
 ,Employee Birthday,Punonjës Ditëlindja
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Batch Pjesëmarrja Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Limit Kaloi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Venture Capital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Një term akademike me këtë &#39;vitin akademik&#39; {0} dhe &#39;Term Emri&#39; {1} ekziston. Ju lutemi të modifikojë këto të hyra dhe të provoni përsëri.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Si ka transaksione ekzistuese kundër artikull {0}, ju nuk mund të ndryshojë vlerën e {1}"
 DocType: UOM,Must be Whole Number,Duhet të jetë numër i plotë
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lë të reja alokuara (në ditë)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serial Asnjë {0} nuk ekziston
@@ -2820,7 +2823,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 +49,Period Closing Entry,Periudha Mbyllja Hyrja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në grup
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Shuma {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortizim
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Furnizuesi (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Punonjës Pjesëmarrja Tool
@@ -2844,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Dita e fundit e muajit të ardhshëm
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue ngushtë pas 7 ditësh
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lënë nuk mund të ndahen përpara {0}, si bilanci leja ka qenë tashmë copë dërgohet në regjistrin e ardhshëm alokimit Pushimi {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Shënim: Për shkak / Data Referenca kalon lejuar ditët e kreditit të konsumatorëve nga {0} ditë (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Aplikuesi
 DocType: Asset Category Account,Accumulated Depreciation Account,Llogaria akumuluar Zhvlerësimi
 DocType: Stock Settings,Freeze Stock Entries,Freeze Stock Entries
@@ -2855,7 +2858,7 @@
 ,Stock Analytics,Stock Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operacionet nuk mund të lihet bosh
 DocType: Maintenance Visit Purpose,Against Document Detail No,Kundër Document Detail Jo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Lloji Party është e detyrueshme
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Lloji Party është e detyrueshme
 DocType: Quality Inspection,Outgoing,Largohet
 DocType: Material Request,Requested For,Kërkuar Për
 DocType: Quotation Item,Against Doctype,Kundër DOCTYPE
@@ -2872,11 +2875,11 @@
 DocType: Asset,Item Code,Kodi i artikullit
 DocType: Production Planning Tool,Create Production Orders,Krijo urdhërat e prodhimit
 DocType: Serial No,Warranty / AMC Details,Garanci / AMC Detajet
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Zgjidh studentët me dorë për aktivitetin bazuar Grupit
 DocType: Journal Entry,User Remark,Përdoruesi Vërejtje
 DocType: Lead,Market Segment,Segmenti i Tregut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Shuma e paguar nuk mund të jetë më e madhe se shuma totale negative papaguar {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Punonjës historia e Brendshme
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Mbyllja (Dr)
 DocType: Cheque Print Template,Cheque Size,Çek Size
@@ -2891,7 +2894,7 @@
 DocType: Production Planning Tool,Create Material Requests,Krijo Kërkesat materiale
 DocType: Employee Education,School/University,Shkolla / Universiteti
 DocType: Payment Request,Reference Details,Referenca Detajet
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Vlera e pritshme Pas së dobishme duhet të jetë më pak se bruto Blerje Shuma
 DocType: Sales Invoice Item,Available Qty at Warehouse,Qty në dispozicion në magazinë
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Shuma e faturuar
 DocType: Asset,Double Declining Balance,Dyfishtë rënie Balance
@@ -2912,20 +2915,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Llogaria ndryshim duhet të jetë një llogari lloj Aseteve / Detyrimeve, pasi kjo Stock Pajtimi është një Hyrja Hapja"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Shuma e disbursuar nuk mund të jetë më e madhe se: Kredia {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Blerje numrin urdhër që nevojitet për artikullit {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Rendit prodhimit jo krijuar
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Rendit prodhimit jo krijuar
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;Nga Data &quot;duhet të jetë pas&quot; deri më sot &quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Nuk mund të ndryshojë statusin si nxënës {0} është e lidhur me aplikimin e studentëve {1}
 DocType: Asset,Fully Depreciated,amortizuar plotësisht
 ,Stock Projected Qty,Stock Projektuar Qty
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Customer {0} nuk i përket projektit {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Pjesëmarrja e shënuar HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citate janë propozimet, ofertat keni dërguar për klientët tuaj"
 DocType: Sales Order,Customer's Purchase Order,Rendit Blerje konsumatorit
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Pa serial dhe Batch
 DocType: Warranty Claim,From Company,Nga kompanisë
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Shuma e pikëve të kritereve të vlerësimit të nevojave të jetë {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Vlera ose Qty
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ju lutemi të vendosur Numri i nënçmime rezervuar
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Vlera ose Qty
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Urdhërat Productions nuk mund të ngrihen për:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minutë
 DocType: Purchase Invoice,Purchase Taxes and Charges,Blerje taksat dhe tatimet
@@ -2938,7 +2941,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Të gjitha Depot
 DocType: Sales Partner,Retailer,Shitës me pakicë
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Gjitha llojet Furnizuesi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Gjitha llojet Furnizuesi
 DocType: Global Defaults,Disable In Words,Disable Në fjalë
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Citat {0} nuk e tipit {1}
@@ -2947,6 +2950,7 @@
 DocType: Production Order,PRO-,PRO
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Llogaria Overdraft Banka
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Bëni Kuponi pagave
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Row # {0}: Shuma e ndarë nuk mund të jetë më e madhe se shuma e papaguar.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Shfleto bom
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Kredi të siguruara
 DocType: Purchase Invoice,Edit Posting Date and Time,Edit Posting Data dhe Koha
@@ -2986,7 +2990,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Nuk lejohet të përtërini transaksioneve të aksioneve të vjetër se {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detail
 DocType: Sales Order,Fully Billed,Faturuar plotësisht
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Ju lutemi të vendosur llogarinë e paracaktuar për t&#39;u paguar në punonjës {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Para në dorë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Depo ofrimit të nevojshme për pikën e aksioneve {0}
 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)
@@ -2997,7 +3000,7 @@
 DocType: Student Group,Group Based On,Grupi i bazuar në
 DocType: Journal Entry,Bill Date,Bill Data
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Shërbimi Item, Lloji, frekuenca dhe sasia shpenzimet janë të nevojshme"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Edhe në qoftë se ka rregulla të shumta çmimeve me prioritet më të lartë, prioritetet e brendshme atëherë në vijim aplikohen:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},A jeni të vërtetë dëshironi të paraqesë të gjitha kuotat e duhura Rroga nga {0} në {1}
 DocType: Cheque Print Template,Cheque Height,Çek Lartësia
 DocType: Supplier,Supplier Details,Detajet Furnizuesi
@@ -3009,7 +3012,7 @@
 DocType: Vehicle Log,Invoice Ref,faturë Ref
 DocType: Purchase Order,Recurring Order,Rendit përsëritur
 DocType: Company,Default Income Account,Llogaria e albumit ardhurat
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Grupi Customer / Customer
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Grupi Customer / Customer
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Pambyllur fiskale Years Fitimi / Humbja (Credit)
 DocType: Sales Invoice,Time Sheets,Sheets Koha
 DocType: Payment Gateway Account,Default Payment Request Message,Default kërkojë pagesën mesazh
@@ -3029,10 +3032,10 @@
 DocType: Notification Control,Quotation Message,Citat Mesazh
 DocType: Employee Loan,Employee Loan Application,Punonjës Loan Application
 DocType: Issue,Opening Date,Hapja Data
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Pjesëmarrja është shënuar sukses.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Pjesëmarrja është shënuar sukses.
 DocType: Journal Entry,Remark,Vërejtje
 DocType: Purchase Receipt Item,Rate and Amount,Shkalla dhe Shuma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Lloji i llogarisë për {0} duhet të jetë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Lloji i llogarisë për {0} duhet të jetë {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lë dhe Festa
 DocType: School Settings,Current Academic Term,Term aktual akademik
 DocType: School Settings,Current Academic Term,Term aktual akademik
@@ -3055,7 +3058,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Grupi Student
 DocType: Shopping Cart Settings,Quotation Series,Citat Series
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Një artikull ekziston me të njëjtin emër ({0}), ju lutemi të ndryshojë emrin e grupit pika ose riemërtoj pika"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Ju lutemi zgjidhni klientit
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Ju lutemi zgjidhni klientit
 DocType: C-Form,I,unë
 DocType: Company,Asset Depreciation Cost Center,Asset Center Zhvlerësimi Kostoja
 DocType: Sales Order Item,Sales Order Date,Sales Order Data
@@ -3074,20 +3077,20 @@
 DocType: Vehicle,Insurance Details,Details Insurance
 DocType: Account,Payable,Për t&#39;u paguar
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ju lutemi shkruani Periudhat Ripagimi
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Debitorët ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Debitorët ({0})
 DocType: Pricing Rule,Margin,diferencë
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Klientët e Rinj
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruto% Fitimi
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Pastrimi Data
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Gross Shuma Blerje është i detyrueshëm
 DocType: Lead,Address Desc,Adresuar Përshkrimi
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Partia është e detyrueshme
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Partia është e detyrueshme
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Topic Emri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Atleast një nga shitjen apo blerjen duhet të zgjidhen
-DocType: Grading Structure,Grade Intervals,Intervalet klasës
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Zgjidhni natyrën e biznesit tuaj.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rresht # {0}: Dublikoje hyrja në Referencat {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Ku operacionet prodhuese janë kryer.
 DocType: Asset Movement,Source Warehouse,Burimi Magazina
 DocType: Installation Note,Installation Date,Instalimi Data
@@ -3124,7 +3127,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Kryetarët letër për të shtypura templates.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titujt për shtypura templates p.sh. ProFORMA faturë.
 DocType: Student Guardian,Student Guardian,Guardian Student
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Akuzat lloj vlerësimi nuk mund të shënuar si gjithëpërfshirës
 DocType: POS Profile,Update Stock,Update Stock
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM ndryshme për sendet do të çojë në të gabuar (Total) vlerën neto Pesha. Sigurohuni që pesha neto e çdo send është në të njëjtën UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Bom Rate
@@ -3152,7 +3155,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange Gain / Humbja e llogarisë
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Punonjës dhe Pjesëmarrja
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Qëllimi duhet të jetë një nga {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Plotësoni formularin dhe për të shpëtuar atë
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Qty aktuale në magazinë
@@ -3168,7 +3171,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Reorder Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hapje e tanishme e punës
 DocType: Company,Stock Adjustment Account,Llogaria aksioneve Rregullimit
-DocType: Journal Entry,Write Off,Shkruani Off
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Shkruani Off
 DocType: Timesheet Detail,Operation ID,Operacioni ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Përdoruesi i Sistemit (login) ID. Nëse vendosur, ajo do të bëhet e parazgjedhur për të gjitha format e burimeve njerëzore."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Nga {1}
@@ -3179,26 +3182,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Furnizuesi jep Klientit
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Forma / Item / {0}) është nga të aksioneve
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Data e ardhshme duhet të jetë më i madh se mbi postimet Data
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Trego taksave break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Trego taksave break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Për shkak / Referenca Data nuk mund të jetë pas {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Importi dhe Eksporti i të dhënave
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","entries Stock ekzistojnë kundër Magazina {0}, kështu që ju nuk mund të ri-caktojë ose modifikojë atë"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Nuk studentët Found
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Nuk studentët Found
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fatura Posting Data
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,shes
 DocType: Sales Invoice,Rounded Total,Rrumbullakuar Total
 DocType: Product Bundle,List items that form the package.,Artikuj lista që formojnë paketë.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Alokimi përqindje duhet të jetë e barabartë me 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Ju lutem, përzgjidhni datën e postimit para se të zgjedhur Partinë"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Nga AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Ju lutem, përzgjidhni Citate"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Ju lutem, përzgjidhni Citate"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Numri i nënçmime rezervuar nuk mund të jetë më e madhe se Total Numri i nënçmime
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bëni Mirëmbajtja vizitë
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Ju lutem kontaktoni për përdoruesit të cilët kanë Sales Master Menaxher {0} rol
 DocType: Company,Default Cash Account,Gabim Llogaria Cash
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Kompani (jo Customer ose Furnizuesi) mjeshtër.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Kjo është e bazuar në pjesëmarrjen e këtij Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Nuk ka Studentët në
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Shto artikuj më shumë apo formë të hapur të plotë
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,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 +197,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
@@ -3230,6 +3234,7 @@
 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: Warranty Claim,Item and Warranty Details,Pika dhe Garanci Details
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Item Code&gt; Item Group&gt; Markë
 DocType: Sales Team,Contribution (%),Kontributi (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Zgjidhni programin për të shkoj të marr kurse të detyrueshme.
@@ -3244,9 +3249,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Para se të pajtimit
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Për {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Taksat dhe Tarifat Shtuar (Kompania Valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Row Tatimore pika {0} duhet të keni një llogari te tipit Tatimit ose e ardhur ose shpenzim ose ngarkimit
 DocType: Sales Order,Partly Billed,Faturuar Pjesërisht
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Item {0} duhet të jetë një artikull Fixed Asset
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Item {0} duhet të jetë një artikull Fixed Asset
 DocType: Item,Default BOM,Gabim bom
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3256,8 +3261,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Automobilistik
 DocType: Vehicle,Insurance Company,Kompania e sigurimeve
 DocType: Asset Category Account,Fixed Asset Account,Llogaria Fixed Asset
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,variabël
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Nga dorëzim Shënim
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,variabël
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Nga dorëzim Shënim
 DocType: Student,Student Email Address,Student Email Adresa
 DocType: Timesheet Detail,From Time,Nga koha
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Në magazinë:
@@ -3268,12 +3273,12 @@
 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 +66,Intern,Mjek praktikant
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,adresa Emri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,adresa Emri
 DocType: Stock Entry,From BOM,Nga bom
 DocType: Assessment Code,Assessment Code,Kodi i vlerësimit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Themelor
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Transaksionet e aksioneve para {0} janë të ngrira
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Ju lutem klikoni në &quot;Generate Listën &#39;
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","p.sh. Kg, Njësia, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Referenca Nuk është e detyrueshme, nëse keni hyrë Reference Data"
 DocType: Bank Reconciliation Detail,Payment Document,Dokumenti pagesa
@@ -3281,19 +3286,19 @@
 DocType: Salary Slip,Salary Structure,Struktura e pagave
 DocType: Account,Bank,Banka
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Linjë ajrore
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Materiali çështje
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Ju jeni në offline mode. Ju nuk do të jetë në gjendje për të rifreskoni deri sa të ketë rrjet.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Nuk Grupet Student krijuar.
 DocType: Purchase Invoice Item,Serial No,Serial Asnjë
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Shuma mujore e pagesës nuk mund të jetë më e madhe se Shuma e Kredisë
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ju lutemi shkruani maintaince Detaje parë
 DocType: Purchase Invoice,Print Language,Print Gjuha
 DocType: Salary Slip,Total Working Hours,Gjithsej Orari i punës
 DocType: Stock Entry,Including items for sub assemblies,Duke përfshirë edhe artikuj për nën kuvendet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Shkruani Vlera duhet të jetë pozitiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Të gjitha Territoret
 DocType: Purchase Invoice,Items,Artikuj
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Studenti është regjistruar tashmë.
@@ -3312,16 +3317,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Default njësinë e matjes për Varianti &#39;{0}&#39; duhet të jetë i njëjtë si në Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Llogaritur bazuar në
 DocType: Delivery Note Item,From Warehouse,Nga Magazina
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Nuk Items me faturën e materialeve të Prodhimi
 DocType: Assessment Plan,Supervisor Name,Emri Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Program Regjistrimi Kursi
-DocType: Grading Structure,Grading Structure,Struktura Nota
 DocType: Purchase Taxes and Charges,Valuation and Total,Vlerësimi dhe Total
 DocType: Tax Rule,Shipping City,Shipping Qyteti
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Customize Njoftimin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Cash Flow nga operacionet
 DocType: Sales Invoice,Shipping Rule,Rregulla anijeve
@@ -3342,8 +3345,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Ju lutem, përzgjidhni datën e postimit parë"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Hapja Data duhet të jetë para datës së mbylljes
 DocType: Leave Control Panel,Carry Forward,Bart
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Qendra Kosto me transaksionet ekzistuese nuk mund të konvertohet në Ledger
 DocType: Department,Days for which Holidays are blocked for this department.,Ditë për të cilat Festat janë bllokuar për këtë departament.
@@ -3355,7 +3358,7 @@
 DocType: Mode of Payment,General,I përgjithshëm
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Bashkangjit letër me kokë
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Komunikimi i fundit
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimit&#39; ose &#39;Vlerësimit dhe Total &quot;
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lista kokat tuaja tatimore (p.sh. TVSH, doganore etj, ata duhet të kenë emra të veçantë) dhe normat e tyre standarde. Kjo do të krijojë një template standarde, të cilat ju mund të redaktoni dhe shtoni më vonë."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Pagesat ndeshje me faturat
@@ -3371,7 +3374,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Gjithsej (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Entertainment &amp; Leisure
 DocType: Quality Inspection,Item Serial No,Item Nr Serial
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Krijo Records punonjësve
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Krijo Records punonjësve
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,I pranishëm Total
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Deklaratat e kontabilitetit
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Orë
@@ -3384,9 +3387,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,I panjohur
 DocType: Shipping Rule,Shipping Rule Conditions,Shipping Rregulla Kushte
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ri pas zëvendësimit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Pika e Shitjes
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Pika e Shitjes
 DocType: Payment Entry,Received Amount,Shuma e marrë
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Ju lutemi Setup punonjës Emërtimi Sistemit në Burimeve Njerëzore&gt; Cilësimet HR
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Krijo për sasinë e plotë, duke injoruar sasi tashmë në mënyrë"
 DocType: Account,Tax,Tatim
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,i pashënuar
@@ -3397,9 +3399,9 @@
 DocType: C-Form,Invoices,Faturat
 DocType: Batch,Source Document Name,Dokumenti Burimi Emri
 DocType: Job Opening,Job Title,Titulli Job
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Krijo Përdoruesit
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Krijo Përdoruesit
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Sasi të Prodhimi duhet të jetë më e madhe se 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Vizitoni raport për thirrjen e mirëmbajtjes.
 DocType: Stock Entry,Update Rate and Availability,Update Vlerësoni dhe Disponueshmëria
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Përqindja ju keni të drejtë për të marrë ose të japë më shumë kundër sasi të urdhëruar. Për shembull: Nëse ju keni urdhëruar 100 njësi. dhe Allowance juaj është 10%, atëherë ju keni të drejtë për të marrë 110 njësi."
@@ -3408,28 +3410,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Llogari shpenzim është i detyrueshëm për pikën {0}
 DocType: BOM,Website Description,Website Përshkrim
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Ndryshimi neto në ekuitetit
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Ju lutemi anuloni Blerje Faturën {0} parë
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Adresa Email duhet të jetë unike, tashmë ekziston për {0}"
 DocType: Serial No,AMC Expiry Date,AMC Data e Mbarimit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Faturë
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Faturë
 ,Sales Register,Shitjet Regjistrohu
 DocType: Daily Work Summary Settings Company,Send Emails At,Dërgo email Në
 DocType: Quotation,Quotation Lost Reason,Citat Humbur Arsyeja
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Zgjidh Domain tuaj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},reference Transaction asnjë {0} datë {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Nuk ka asgjë për të redaktuar.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Përmbledhje për këtë muaj dhe aktivitetet në pritje
 DocType: Customer Group,Customer Group Name,Emri Grupi Klientit
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Nuk ka Konsumatorët akoma!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Pasqyra Cash Flow
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Sasia huaja nuk mund të kalojë sasi maksimale huazimin e {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Liçensë
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,"Ju lutem, jepini të anullojë Llogari"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Rendit fundit Date
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Llogaria {0} nuk i takon kompanisë {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Numrat serial në rresht {0} nuk përputhet me shpërndarjen Note
 DocType: Student,Guardian Details,Guardian Details
 DocType: C-Form,C-Form,C-Forma
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Pjesëmarrja për të punësuarit të shumta
@@ -3454,20 +3458,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Llogaria duhet të jenë të tipit &quot;Asset fikse &#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Nga Qty
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Rregullat për të llogaritur shumën e anijeve për një shitje
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seria është i detyrueshëm
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seria është i detyrueshëm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Shërbimet Financiare
 DocType: Student Sibling,Student ID,ID Student
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Llojet e aktiviteteve për Koha Shkrime
 DocType: Tax Rule,Sales,Shitjet
 DocType: Stock Entry Detail,Basic Amount,Shuma bazë
 DocType: Training Event,Exam,Provimi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Magazina e nevojshme për aksioneve Item {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Shteti Faturimi
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transferim
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} nuk lidhen me llogarinë Partisë {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} nuk lidhen me llogarinë Partisë {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch bom shpërtheu (përfshirë nën-kuvendet)
 DocType: Authorization Rule,Applicable To (Employee),Për të zbatueshme (punonjës)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Për shkak Data është e detyrueshme
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Rritja për Atributit {0} nuk mund të jetë 0
@@ -3478,13 +3482,13 @@
 ,Inactive Customers,Konsumatorët jo aktive
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Pranimet Blerje
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Si Rregulla e Çmimeve aplikohet?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Si Rregulla e Çmimeve aplikohet?
 DocType: Stock Entry,Delivery Note No,Ofrimit Shënim Asnjë
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Nëse zgjidhet, vetëm Blerje kërkesat materiale për lëndën e parë finale do të përfshihen në Kërkesave materiale. Përndryshe, do të krijohen Kërkesat materiale për artikuj prind"
 DocType: Cheque Print Template,Message to show,Mesazhi për të treguar
 DocType: Company,Retail,Me pakicë
 DocType: Attendance,Absent,Që mungon
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle produkt
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle produkt
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3494,10 +3498,10 @@
 DocType: Payment Entry,Account Paid From,Llogaria e paguar nga
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Raw Material Item Code
 DocType: Journal Entry,Write Off Based On,Shkruani Off bazuar në
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,bëni Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,bëni Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print dhe Stationery
 DocType: Stock Settings,Show Barcode Field,Trego Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Dërgo email furnizuesi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Dërgo email furnizuesi
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Paga përpunuar tashmë për periudhën ndërmjet {0} dhe {1}, Lini periudha e aplikimit nuk mund të jetë në mes të këtyre datave."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Rekord Instalimi për një Nr Serial
 DocType: Guardian Interest,Guardian Interest,Guardian Interesi
@@ -3509,6 +3513,7 @@
 DocType: Offer Letter,Awaiting Response,Në pritje të përgjigjes
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Sipër
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},atribut i pavlefshëm {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Përmend në qoftë se llogaria jo-standarde pagueshme
 DocType: Salary Slip,Earning & Deduction,Fituar dhe Zbritje
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Fakultative. Ky rregullim do të përdoret për të filtruar në transaksionet e ndryshme.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativ Rate Vlerësimi nuk është e lejuar
@@ -3524,10 +3529,9 @@
 DocType: Production Order Item,Production Order Item,Prodhimi Order Item
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Nuk ka Record gjetur
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kostoja e asetit braktiset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred pjesërisht
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Qendra Kosto është e detyrueshme për Item {2}
 DocType: Vehicle,Policy No,Politika No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Të marrë sendet nga Bundle produktit
 DocType: Asset,Straight Line,Vijë e drejtë
 DocType: Project User,Project User,User Project
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,ndarje
@@ -3543,7 +3547,7 @@
 DocType: Program Enrollment Tool,Get Students From,Get Studentët nga
 DocType: Hub Settings,Seller Country,Shitës Vendi
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publikojnë artikuj në faqen
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupi nxënësit tuaj në tufa
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupi nxënësit tuaj në tufa
 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 +85,Specifications,Specifikimet
@@ -3595,14 +3599,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Data
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Llogaria {0}: llogari Parent {1} nuk i përkasin kompanisë: {2}
 DocType: Program Enrollment Tool,Student Applicants,Aplikantët Student
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Sukses të fshihen të gjitha transaksionet që lidhen me këtë kompani!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,regjistrimi Date
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Provë
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Komponentet e pagave
 DocType: Program Enrollment Tool,New Academic Year,New Year akademik
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Kthimi / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Kthimi / Credit Note
 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 +28,Total Paid Amount,Gjithsej shuma e paguar
 DocType: Production Order Item,Transferred Qty,Transferuar Qty
@@ -3622,7 +3626,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Lloji i lë si rastësor, të sëmurë etj"
 DocType: Email Digest,Send regular summary reports via Email.,Dërgo raporte të rregullta përmbledhje nëpërmjet Email.
 DocType: Payment Entry,PE-,pe-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Ju lutemi të vendosur llogarinë e paracaktuar në Expense kërkesën Lloji {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Ju lutemi të vendosur llogarinë e paracaktuar në Expense kërkesën Lloji {0}
 DocType: Assessment Result,Student Name,Emri i studentit
 DocType: Brand,Item Manager,Item Menaxher
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Payroll pagueshme
@@ -3643,6 +3647,7 @@
 ,Sales Funnel,Gyp Sales
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Shkurtim është i detyrueshëm
 DocType: Project,Task Progress,Task Progress
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Qerre
 ,Qty to Transfer,Qty të transferojë
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Kuotat për kryeson apo klientët.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roli i lejuar për të redaktuar aksioneve të ngrirë
@@ -3670,12 +3675,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Item Tatimore urti Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Shkurtesa Institute
 ,Item-wise Price List Rate,Pika-mençur Lista e Çmimeve Rate
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Furnizuesi Citat
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Furnizuesi Citat
 DocType: Quotation,In Words will be visible once you save the Quotation.,Me fjalë do të jetë i dukshëm një herë ju ruani Kuotim.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Sasi ({0}) nuk mund të jetë një pjesë në rradhë {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Mblidhni Taksat
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkodi {0} përdorur tashmë në pikën {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Rregullat për të shtuar shpenzimet e transportit detar.
 DocType: Item,Opening Stock,hapja Stock
@@ -3692,8 +3697,8 @@
 Updated via 'Time Log'",në minuta Përditësuar nëpërmjet &#39;Koha Identifikohu &quot;
 DocType: Customer,From Lead,Nga Lead
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Urdhërat lëshuar për prodhim.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Zgjidh Vitin Fiskal ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profilin nevojshme për të bërë POS Hyrja
 DocType: Program Enrollment Tool,Enroll Students,regjistrohen Studentët
 DocType: Hub Settings,Name Token,Emri Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Shitja Standard
@@ -3704,7 +3709,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} kundër Shitjeve Faturës {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation 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: Customer,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: Production Order,Required Items,Items kërkuara
 DocType: Stock Ledger Entry,Stock Value Difference,Vlera e aksioneve Diferenca
@@ -3725,7 +3730,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Caqet e përcaktuara Item Grupi-mençur për këtë person të shitjes.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Stoqet Freeze vjetër se [Ditët]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: Asset është e detyrueshme për të aseteve fikse blerje / shitje
-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.","Nëse dy ose më shumë Rregullat e Çmimeve janë gjetur në bazë të kushteve të mësipërme, Prioritet është aplikuar. Prioritet është një numër mes 0 deri ne 20, ndërsa vlera e parazgjedhur është zero (bosh). Numri më i lartë do të thotë se do të marrë përparësi nëse ka rregulla të shumta çmimeve me kushte të njëjta."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nëse dy ose më shumë Rregullat e Çmimeve janë gjetur në bazë të kushteve të mësipërme, Prioritet është aplikuar. Prioritet është një numër mes 0 deri ne 20, ndërsa vlera e parazgjedhur është zero (bosh). Numri më i lartë do të thotë se do të marrë përparësi nëse ka rregulla të shumta çmimeve me kushte të njëjta."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Viti Fiskal: {0} nuk ekziston
 DocType: Currency Exchange,To Currency,Për të Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Lejo përdoruesit e mëposhtme të miratojë Dërgo Aplikacione për ditë bllok.
@@ -3750,7 +3755,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Item {0} injoruar pasi ajo nuk është një artikull të aksioneve
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Submit Kjo mënyrë e prodhimit për përpunim të mëtejshëm.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Për të nuk zbatohet Rregulla e Çmimeve në një transaksion të caktuar, të gjitha rregullat e aplikueshme çmimeve duhet të jetë me aftësi të kufizuara."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Për të nuk zbatohet Rregulla e Çmimeve në një transaksion të caktuar, të gjitha rregullat e aplikueshme çmimeve duhet të jetë me aftësi të kufizuara."
 DocType: Assessment Group,Parent Assessment Group,Parent Group Vlerësimit
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Jobs
 ,Sales Order Trends,Sales Rendit Trendet
@@ -3761,7 +3766,7 @@
 DocType: Stock Entry Detail,Additional Cost,Kosto shtesë
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Viti Financiar End Date
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Bëjnë Furnizuesi Kuotim
 DocType: Quality Inspection,Incoming,Hyrje
 DocType: BOM,Materials Required (Exploded),Materialet e nevojshme (Shpërtheu)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Shto përdoruesve për organizatën tuaj, përveç vetes"
@@ -3789,6 +3794,7 @@
 DocType: Employee,History In Company,Historia Në kompanisë
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Buletinet
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stock Ledger Hyrja
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Customer&gt; Group Customer&gt; Territory
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Same artikull është futur disa herë
 DocType: Department,Leave Block List,Lini Blloko Lista
 DocType: Sales Invoice,Tax ID,ID e taksave
@@ -3798,7 +3804,7 @@
 DocType: Customer,Sales Partner and Commission,Sales Partner dhe Komisioni
 DocType: Employee Loan,Rate of Interest (%) / Year,Norma e interesit (%) / Viti
 ,Project Quantity,Sasia Project
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Total {0} për të gjitha sendet është zero, mund të jetë që ju duhet të ndryshojë &quot;Shpërndani akuzat Bazuar On &#39;"
 DocType: Opportunity,To Discuss,Për të diskutuar
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} njësitë e {1} nevojshme në {2} për të përfunduar këtë transaksion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Norma e interesit (%) vjetore
@@ -3813,7 +3819,7 @@
 DocType: Purchase Invoice,Return,Kthimi
 DocType: Production Order Operation,Production Order Operation,Prodhimit Rendit Operacioni
 DocType: Pricing Rule,Disable,Disable
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Mënyra e pagesës është e nevojshme për të bërë një pagesë
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Mënyra e pagesës është e nevojshme për të bërë një pagesë
 DocType: Project Task,Pending Review,Në pritje Rishikimi
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} nuk mund të braktiset, pasi ajo është tashmë {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Gjithsej Kërkesa shpenzimeve (nëpërmjet shpenzimeve Kërkesës)
@@ -3821,11 +3827,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Mungon
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Valuta e BOM # {1} duhet të jetë e barabartë me monedhën e zgjedhur {2}
 DocType: Journal Entry Account,Exchange Rate,Exchange Rate
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Sales Order {0} nuk është dorëzuar
 DocType: Homepage,Tag Line,tag Line
 DocType: Fee Component,Fee Component,Komponenti Fee
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Menaxhimi Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Shto artikuj nga
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Shto artikuj nga
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Magazina {0}: llogari Parent {1} nuk Bolong të kompanisë {2}
 DocType: Cheque Print Template,Regular,i rregullt
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Weightage i përgjithshëm i të gjitha kriteret e vlerësimit duhet të jetë 100%
@@ -3838,7 +3844,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Magazina {0} nuk ekziston
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Regjistrohu Për Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Përqindjet mujore Shpërndarjes
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Elementi i përzgjedhur nuk mund të ketë Serisë
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Shkalla e vlerësimit nuk u gjet për pika {0}, e cila është e nevojshme për të bërë shënimet e kontabilitetit për {1} {2}. Nëse artikulli është transacting si një artikull mostër në {1}, ju lutemi të përmendim se në {1} tryezë artikull. Përndryshe, ju lutem të krijuar një transaksion hyrje aksioneve për artikull ose përmend normën e vlerësimit në të dhënat artikull, dhe pastaj të përpiqet dërgimi / anulimit këtë term"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% E materialeve dorëzuar kundër këtij notën shpërndarëse
 DocType: Project,Customer Details,Detajet e klientit
@@ -3847,15 +3853,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Shkruani parametër url për pranuesit nos
 DocType: Payment Entry,Paid Amount,Paid Shuma
 DocType: Assessment Plan,Supervisor,mbikëqyrës
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,online
 ,Available Stock for Packing Items,Stock dispozicion për Items Paketimi
 DocType: Item Variant,Item Variant,Item Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Vlerësimi Rezultati Tool
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Item
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,urdhërat e dorëzuara nuk mund të fshihet
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Menaxhimit të Cilësisë
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} artikull ka qenë me aftësi të kufizuara
 DocType: Employee Loan,Repay Fixed Amount per Period,Paguaj shuma fikse për një periudhë
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Ju lutemi shkruani sasine e artikullit {0}
 DocType: Employee External Work History,Employee External Work History,Punonjës historia e jashtme
@@ -3881,7 +3887,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Njoftim (ditë)
 DocType: Tax Rule,Sales Tax Template,Template Sales Tax
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Zgjidhni artikuj për të shpëtuar faturën
 DocType: Employee,Encashment Date,Arkëtim Data
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Stock Rregullimit
@@ -3904,7 +3910,7 @@
 DocType: Item Variant Attribute,Attribute,Atribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Ju lutemi specifikoni nga / në varg
 DocType: Serial No,Under AMC,Sipas AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Shkalla e vlerësimit Item rillogaritet duke marrë parasysh ul sasinë kuponave kosto
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Shkalla e vlerësimit Item rillogaritet duke marrë parasysh ul sasinë kuponave kosto
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Default settings për shitjen e transaksioneve.
 DocType: Guardian,Guardian Of ,kujdestar i
 DocType: Grading Scale Interval,Threshold,prag
@@ -3914,6 +3920,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Hedhur në qarkullim
 DocType: Production Order,Warehouses,Depot
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} aktiv nuk mund të transferohet
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ky Artikull është një variant i {0} (Shabllon).
 DocType: Workstation,per hour,në orë
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,blerje
 DocType: Announcement,Announcement,njoftim
@@ -3929,8 +3936,8 @@
 DocType: Account,Receivable,Arkëtueshme
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Nuk lejohet të ndryshojë Furnizuesit si Urdhër Blerje tashmë ekziston
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roli që i lejohet të paraqesë transaksionet që tejkalojnë limitet e kreditit përcaktuara.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Zgjidhni Items të Prodhimi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Zgjidhni Items të Prodhimi
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Master dhënat syncing, ajo mund të marrë disa kohë"
 DocType: Item,Material Issue,Materiali Issue
 DocType: Hub Settings,Seller Description,Shitës Përshkrim
 DocType: Employee Education,Qualification,Kualifikim
@@ -3942,7 +3949,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Urdhërohet
 DocType: Salary Detail,Component,komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Kriteret e vlerësimit Group
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Hapja amortizimi i akumuluar duhet të jetë më pak se e barabartë me {0}
 DocType: Warehouse,Warehouse Name,Magazina Emri
 DocType: Naming Series,Select Transaction,Përzgjedhjen e transaksioneve
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ju lutemi shkruani Miratimi Roli ose Miratimi përdoruesin
@@ -3955,7 +3962,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Nuk mund të anulojë, sepse paraqitet Stock Hyrja {0} ekziston"
 DocType: Employee Loan,Disbursement Date,disbursimi Date
 DocType: Vehicle,Vehicle,automjet
 DocType: Purchase Invoice,In Words,Me fjalë të
@@ -3969,14 +3976,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Nënçmime aseteve dhe Bilancet
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Shuma {0} {1} transferuar nga {2} të {3}
 DocType: Sales Invoice,Get Advances Received,Get Përparimet marra
 DocType: Email Digest,Add/Remove Recipients,Add / Remove Recipients
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaksioni nuk lejohet kundër Prodhimit ndalur Rendit {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Për të vendosur këtë vit fiskal si default, klikoni mbi &#39;Bëje si Default&#39;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,bashkohem
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Mungesa Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Item variant {0} ekziston me atributet e njëjta
 DocType: Employee Loan,Repay from Salary,Paguajë nga paga
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Kerkuar pagesën kundër {0} {1} për sasi {2}
@@ -3994,7 +4001,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Vlerësimi Rezultati Detail
 DocType: Employee Education,Employee Education,Arsimimi punonjës
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Grupi Duplicate artikull gjenden në tabelën e grupit artikull
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Është e nevojshme për të shkoj të marr dhëna të artikullit.
 DocType: Salary Slip,Net Pay,Pay Net
 DocType: Account,Account,Llogari
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serial Asnjë {0} tashmë është marrë
@@ -4003,7 +4010,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Magazina {0} nuk është e lidhur me ndonjë llogari, ju lutem të krijuar / lidhin përkatëse llogarinë (aktiv) për depo."
 DocType: Purchase Invoice,Recurring Id,Përsëritur Id
 DocType: Customer,Sales Team Details,Detajet shitjet e ekipit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Fshini përgjithmonë?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Fshini përgjithmonë?
 DocType: Expense Claim,Total Claimed Amount,Shuma totale Pohoi
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Mundësi potenciale për të shitur.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Invalid {0}
@@ -4014,13 +4021,14 @@
 DocType: Warehouse,PIN,GJILPËRË
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup shkolla juaj në ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Base Ndryshimi Shuma (Company Valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Nuk ka hyrje të kontabilitetit për magazinat e mëposhtme
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Ruaj dokumentin e parë.
 DocType: Account,Chargeable,I dënueshëm
 DocType: Company,Change Abbreviation,Ndryshimi Shkurtesa
 DocType: Expense Claim Detail,Expense Date,Shpenzim Data
 DocType: Item,Max Discount (%),Max Discount (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Shuma Rendit Fundit
+DocType: Task,Is Milestone,A Milestone
 DocType: Daily Work Summary,Email Sent To,Email Sent To
 DocType: Budget,Warn,Paralajmëroj
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Çdo vërejtje të tjera, përpjekje të përmendet se duhet të shkoni në të dhënat."
@@ -4041,7 +4049,7 @@
 DocType: Item Attribute Value,Attribute Value,Atribut Vlera
 ,Itemwise Recommended Reorder Level,Itemwise Recommended reorder Niveli
 DocType: Salary Detail,Salary Detail,Paga Detail
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Ju lutem, përzgjidhni {0} parë"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} i artikullit {1} ka skaduar.
 DocType: Sales Invoice,Commission,Komision
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Sheet Koha për prodhimin.
@@ -4053,41 +4061,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Ngrij Stoqet me te vjetra se` duhet të jetë më e vogël se% d ditë.
 DocType: Tax Rule,Purchase Tax Template,Blerje Template Tatimore
 ,Project wise Stock Tracking,Projekti Ndjekja mençur Stock
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Mirëmbajtja Orari {0} ekziston kundër {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Sasia aktuale (në burim / objektiv)
 DocType: Item Customer Detail,Ref Code,Kodi ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Të dhënat punonjës.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ju lutemi të vendosur Date Amortizimi tjetër
 DocType: HR Settings,Payroll Settings,Listën e pagave Cilësimet
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Përputhje për Faturat jo-lidhura dhe pagesat.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Vendi Renditja
 DocType: Email Digest,New Purchase Orders,Blerje porositë e reja
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,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 +58,Select Brand...,Zgjidh Markë ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Zgjidh Markë ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Amortizimin e akumuluar si në
 DocType: Sales Invoice,C-Form Applicable,C-Formulari i zbatueshëm
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operacioni Koha duhet të jetë më e madhe se 0 për Operacionin {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Magazina është e detyrueshme
 DocType: Supplier,Address and Contacts,Adresa dhe Kontakte
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Konvertimi Detail
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Keep it web 900px miqësore (w) nga 100px (h)
 DocType: Program,Program Abbreviation,Shkurtesa program
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Rendit prodhimi nuk mund të ngrihet kundër një Template Item
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Akuzat janë përditësuar në pranimin Blerje kundër çdo send
 DocType: Warranty Claim,Resolved By,Zgjidhen nga
 DocType: Bank Guarantee,Start Date,Data e Fillimit
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Alokimi i lë për një periudhë.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Çeqet dhe Depozitat pastruar gabimisht
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Krijo kuotat konsumatorëve
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Krijo kuotat konsumatorëve
 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 +38,Bill of Materials (BOM),Bill e materialeve (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Koha mesatare e marra nga furnizuesi për të ofruar
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Rezultati i vlerësimit
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Orë
 DocType: Project,Expected Start Date,Pritet Data e Fillimit
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,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
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Monedha transaksion duhet të jetë i njëjtë si pagesë Gateway valutë
 DocType: Payment Entry,Receive,Merre
@@ -4098,19 +4105,19 @@
 DocType: Workstation,Operating Costs,Shpenzimet Operative
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Veprimi në qoftë akumuluar tejkaluar buxhetin mujor
 DocType: Purchase Invoice,Submit on creation,Submit në krijimin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Monedhë për {0} duhet të jetë {1}
 DocType: Asset,Disposal Date,Shkatërrimi Date
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email do të dërgohet të gjithë të punësuarve aktive e shoqërisë në orë të caktuar, në qoftë se ata nuk kanë pushim. Përmbledhje e përgjigjeve do të dërgohet në mesnatë."
 DocType: Employee Leave Approver,Employee Leave Approver,Punonjës Pushimi aprovuesi
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Row {0}: Një hyrje Reorder tashmë ekziston për këtë depo {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Nuk mund të deklarojë si të humbur, sepse Kuotim i është bërë."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Feedback Training
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Prodhimi Rendit {0} duhet të dorëzohet
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Ju lutem, përzgjidhni Data e Fillimit Data e Përfundimit Kohëzgjatja për Item {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursi është i detyrueshëm në rresht {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Deri më sot nuk mund të jetë e para nga data e
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Add / Edit Çmimet
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Add / Edit Çmimet
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Çek Print Template
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Grafiku i Qendrave te Kostos
@@ -4123,7 +4130,7 @@
 ,Ordered Items To Be Delivered,Items urdhëroi që do të dërgohen
 DocType: Account,Income,Të ardhura
 DocType: Industry Type,Industry Type,Industria Type
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Diçka shkoi keq!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Diçka shkoi keq!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Shitjet Faturë {0} tashmë është dorëzuar
 DocType: Assessment Result Detail,Score,rezultat
@@ -4154,17 +4161,17 @@
 DocType: Item,Variant Based On,Variant i bazuar në
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Weightage Gjithsej caktuar duhet të jetë 100%. Kjo është {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Furnizuesit tuaj
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Nuk mund të vendosur si Humbur si Sales Order është bërë.
+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ë.
 DocType: Request for Quotation Item,Supplier Part No,Furnizuesi Part No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Marrë nga
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Nuk mund të zbres kur kategori është për &#39;vlerësimin&#39; ose &#39;Vaulation dhe Total &quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Marrë nga
 DocType: Lead,Converted,Konvertuar
 DocType: Item,Has Serial No,Nuk ka Serial
 DocType: Employee,Date of Issue,Data e lëshimit
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Nga {0} për {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Nga {0} për {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Row # {0}: Furnizuesi Set për pika {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Hours Vlera duhet të jetë më e madhe se zero.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4173,20 +4180,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,monedhë faturimit duhet të jetë e barabartë me monedhën ose llogarinë pala e secilës parazgjedhur comapany e monedhës
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lini arkëtim
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Çfarë do të bëni?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Për Magazina
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Të gjitha Pranimet e studentëve
 ,Average Commission Rate,Mesatare Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Pjesëmarrja nuk mund të shënohet për datat e ardhshme
 DocType: Pricing Rule,Pricing Rule Help,Rregulla e Çmimeve Ndihmë
 DocType: School House,House Name,Emri House
 DocType: Purchase Taxes and Charges,Account Head,Shef llogari
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Shto pjesën tjetër të organizatës suaj si përdoruesit e juaj. Ju gjithashtu mund të shtoni ftojë konsumatorët për portalin tuaj duke shtuar ato nga Kontaktet
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Shto pjesën tjetër të organizatës suaj si përdoruesit e juaj. Ju gjithashtu mund të shtoni ftojë konsumatorët për portalin tuaj duke shtuar ato nga Kontaktet
 DocType: Stock Entry,Total Value Difference (Out - In),Gjithsej Diferenca Vlera (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4195,7 +4202,7 @@
 DocType: Item,Customer Code,Kodi Klientit
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Vërejtje ditëlindjen për {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Ditët Që Rendit Fundit
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debi Për shkak duhet të jetë një llogari Bilanci i Gjendjes
 DocType: Buying Settings,Naming Series,Emërtimi Series
 DocType: Leave Block List,Leave Block List Name,Dërgo Block Lista Emri
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,date Insurance Fillimi duhet të jetë më pak se data Insurance Fund
@@ -4210,9 +4217,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Paga Slip nga punonjësi {0} krijuar tashmë për fletë kohë {1}
 DocType: Vehicle Log,Odometer,rrugëmatës
 DocType: Sales Order Item,Ordered Qty,Urdhërohet Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Item {0} është me aftësi të kufizuara
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Item {0} është me aftësi të kufizuara
 DocType: Stock Settings,Stock Frozen Upto,Stock ngrira Upto
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM nuk përmban ndonjë artikull aksioneve
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Aktiviteti i projekt / detyra.
 DocType: Vehicle Log,Refuelling Details,Details Rimbushja
@@ -4222,8 +4229,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Shkalla e fundit e blerjes nuk u gjet
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Shkruaj Off Shuma (Kompania Valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,faturimit Hours
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM Default për {0} nuk u gjet
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Ju lutemi të vendosur sasinë Reorder
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Prekni për të shtuar artikuj tyre këtu
 DocType: Fees,Program Enrollment,program Regjistrimi
 DocType: Landed Cost Voucher,Landed Cost Voucher,Zbarkoi Voucher Kosto
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ju lutemi të vendosur {0}
@@ -4247,7 +4255,7 @@
 DocType: Maintenance Visit,Maintenance Date,Mirëmbajtja Data
 DocType: Purchase Invoice Item,Rejected Serial No,Refuzuar Nuk Serial
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Viti data e fillimit ose data fundi mbivendosje me {0}. Për të shmangur ju lutem kompaninë vendosur
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Data e fillimit duhet të jetë më pak se data përfundimtare e artikullit {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.","Shembull:. ABCD ##### Nëse seri është vendosur dhe nuk Serial nuk është përmendur në transaksione, numri atëherë automatike serial do të krijohet në bazë të kësaj serie. Nëse ju gjithmonë doni të në mënyrë eksplicite përmend Serial Nos për këtë artikull. lënë bosh këtë."
 DocType: Upload Attendance,Upload Attendance,Ngarko Pjesëmarrja
@@ -4324,7 +4332,6 @@
 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
-DocType: Grade Interval,Grade Interval,Grade Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Viti Fiskal Data e Fillimit dhe Viti Fiskal Fundi Data e janë vendosur tashmë në vitin fiskal {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Pastrimi Date updated
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Batch Split
@@ -4370,14 +4377,14 @@
 DocType: Bin,Reserved Qty for Production,Rezervuar Qty për Prodhimin
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Dërgo pakontrolluar në qoftë se ju nuk doni të marrin në konsideratë duke bërë grumbull grupet kurs të bazuar.
 DocType: Asset,Frequency of Depreciation (Months),Frekuenca e Zhvlerësimit (Muaj)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Llogaria e Kredisë
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Llogaria e Kredisë
 DocType: Landed Cost Item,Landed Cost Item,Kosto zbarkoi Item
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup një website të thjeshtë për organizatën time
 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 +666,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ju lutem specifikoni atribut Vlera për atribut {0}
 DocType: Item,Default Warehouse,Gabim Magazina
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Buxheti nuk mund të caktohet kundër Llogaria Grupit {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ju lutemi shkruani qendra kosto prind
@@ -4422,7 +4429,7 @@
 DocType: Opportunity Item,Basic Rate,Norma bazë
 DocType: GL Entry,Credit Amount,Shuma e kreditit
 DocType: Cheque Print Template,Signatory Position,Pozita nënshkruese
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Bëje si Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Bëje si Lost
 DocType: Timesheet,Total Billable Hours,Gjithsej orëve billable
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Pagesa Pranimi Shënim
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Kjo është e bazuar në transaksionet kundër këtij Klientit. Shih afat kohor më poshtë për detaje
@@ -4436,11 +4443,11 @@
 ,Items To Be Requested,Items të kërkohet
 DocType: Purchase Order,Get Last Purchase Rate,Get fundit Blerje Vlerësoni
 DocType: Company,Company Info,Company Info
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Zgjidhni ose shtoni klient të ri
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Zgjidhni ose shtoni klient të ri
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Qendra Kosto është e nevojshme për të librit një kërkesë shpenzimeve
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Aplikimi i mjeteve (aktiveve)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Kjo është e bazuar në pjesëmarrjen e këtij punonjësi
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Llogaria Debiti
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4449,13 +4456,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Shuma Blerje
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Furnizuesi Citat {0} krijuar
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Fundi Viti nuk mund të jetë para se të fillojë Vitit
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Përfitimet e Punonjësve
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Ju lutemi të vendosur një default Holiday Lista për punonjësit {0} ose Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} nuk ekziston
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} nuk ekziston
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Row Asnjë {0}: Shuma nuk mund të jetë më e madhe se pritje Shuma kundër shpenzimeve sipas Pretendimit {1}. Në pritje Shuma është {2}
@@ -4464,15 +4471,17 @@
 DocType: Quality Inspection Reading,Reading 3,Leximi 3
 ,Hub,Qendër
 DocType: GL Entry,Voucher Type,Voucher Type
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Lista e Çmimeve nuk u gjet ose me aftësi të kufizuara
 DocType: Employee Loan Application,Approved,I miratuar
 DocType: Pricing Rule,Price,Çmim
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Punonjës lirohet për {0} duhet të jetë vendosur si &#39;majtë&#39;
 DocType: Guardian,Guardian,kujdestar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Vlerësimi {0} krijuar për punonjësit {1} në datën e caktuar varg
 DocType: Employee,Education,Arsim
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Emërtimi Fushata By
 DocType: Employee,Current Address Is,Adresa e tanishme është
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,modifikuar
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Fakultative. Vë monedhë default kompanisë, nëse nuk është specifikuar."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Rregjistrimet në ditar të kontabilitetit.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Qty në dispozicion në nga depo
@@ -4481,7 +4490,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Partia / Llogaria nuk përputhet me {1} / {2} në {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ju lutemi shkruani Llogari kurriz
 DocType: Account,Stock,Stock
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Reference Lloji i dokumentit duhet të jetë një e Rendit Blerje, Blerje Faturë ose Journal Entry"
 DocType: Employee,Current Address,Adresa e tanishme
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nëse pika është një variant i një tjetër çështje pastaj përshkrimin, imazhi, çmimi, taksat, etj do të vendoset nga template përveç nëse specifikohet shprehimisht"
 DocType: Serial No,Purchase / Manufacture Details,Blerje / Detajet Prodhimi
@@ -4509,7 +4518,7 @@
 DocType: Hub Settings,Hub Settings,Hub Cilësimet
 DocType: Project,Gross Margin %,Marzhi bruto%
 DocType: BOM,With Operations,Me Operacioneve
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Regjistrimet kontabël tashmë janë bërë në monedhën {0} për kompaninë {1}. Ju lutem, përzgjidhni një llogari arkëtueshëm ose të pagueshëm me monedhën {0}."
 DocType: Asset,Is Existing Asset,Është Asetin ekzistuese
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
 DocType: Salary Detail,Statistical Component,Komponenti statistikore
@@ -4534,7 +4543,7 @@
 DocType: Assessment Plan,Room,dhomë
 DocType: Purchase Order,Advance Paid,Advance Paid
 DocType: Item,Item Tax,Tatimi i artikullit
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Materiale për Furnizuesin
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Materiale për Furnizuesin
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Akciza Faturë
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Pragun {0}% shfaqet më shumë se një herë
 DocType: Expense Claim,Employees Email Id,Punonjësit Email Id
@@ -4565,9 +4574,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Bashkangjit Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Nivelet e aksioneve
 DocType: Customer,Commission Rate,Rate Komisioni
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Bëni Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Bëni Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Aplikacionet pushimit bllok nga departamenti.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Pagesa Lloji duhet të jetë një nga Merre, të paguajë dhe Transfer të Brendshme"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Pagesa Lloji duhet të jetë një nga Merre, të paguajë dhe Transfer të Brendshme"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,analitikë
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Shporta është bosh
 DocType: Vehicle,Model,Model
@@ -4578,6 +4587,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Lejo Prodhimi në pushime
 DocType: Sales Order,Customer's Purchase Order Date,Konsumatorit Rendit Blerje Data
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Capital Stock
+DocType: Shopping Cart Settings,Show Public Attachments,Trego Attachments publike
 DocType: Packing Slip,Package Weight Details,Paketa Peshë Detajet
 DocType: Payment Gateway Account,Payment Gateway Account,Pagesa Llogaria Gateway
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Pas përfundimit të pagesës përcjellëse përdorues në faqen e zgjedhur.
@@ -4596,15 +4606,15 @@
 DocType: Batch,Expiry Date,Data e Mbarimit
 ,Supplier Addresses and Contacts,Adresat Furnizues dhe Kontaktet
 ,accounts-browser,Llogaritë-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Ju lutemi zgjidhni kategorinë e parë
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Mjeshtër projekt.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Për të lejuar mbi-faturimit ose mbi-urdhërimin, të rinovuar &quot;Allowance&quot; në Stock Settings ose Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,A nuk tregojnë ndonjë simbol si $ etj ardhshëm të valutave.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Gjysme Dite)
 DocType: Supplier,Credit Days,Ditët e kreditit
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Bëni Serisë Student
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Bëni Serisë Student
 DocType: Leave Type,Is Carry Forward,Është Mbaj Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Të marrë sendet nga bom
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Të marrë sendet nga bom
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Lead ditësh
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Posting Data duhet të jetë i njëjtë si data e blerjes {1} e aseteve {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ju lutem shkruani urdhëron Sales në tabelën e mësipërme
@@ -4621,7 +4631,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Row {0}: debiti hyrja nuk mund të jetë i lidhur me një {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Ju lutemi Setup numëron seri për Pjesëmarrja nëpërmjet Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 ae36e46..b479298 100644
--- a/erpnext/translations/sr.csv
+++ b/erpnext/translations/sr.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Изнајмљени
 DocType: Purchase Order,PO-,po-
 DocType: POS Profile,Applicable for User,Важи за кориснике
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Стоппед Производња поредак не може бити поништен, то Унстоп прво да откажете"
 DocType: Vehicle Service,Mileage,километража
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Да ли заиста желите да укине ову имовину?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Изаберите Примарни добављач
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Изаберите Примарни добављач
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валута је потребан за ценовнику {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Биће обрачунато у овој трансакцији.
 DocType: Purchase Order,Customer Contact,Кориснички Контакт
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Выдающийся для {0} не может быть меньше нуля ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,Уобичајено 10 минс
 DocType: Leave Type,Leave Type Name,Оставите Име Вид
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,схов отворен
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,схов отворен
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Серия Обновлено Успешно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Провери
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Аццурал Часопис Ступање Субмиттед
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Батцх артикла истека статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банка Нацрт
 DocType: Mode of Payment Account,Mode of Payment Account,Начин плаћања налог
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Схов Варијанте
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Схов Варијанте
 DocType: Academic Term,Academic Term,akademski Рок
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Материјал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Количина
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Количина
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Рачуни сто не мозе бити празна.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Кредиты ( обязательства)
 DocType: Employee Education,Year of Passing,Година Пассинг
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",Референце:% с Код товара:% с и клијента:% с
 DocType: Item,Country of Origin,Земља порекла
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,На складишту
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Отворених питања
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,здравство
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Кашњење у плаћању (Дани)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,сервис Трошкови
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серијски број: {0} је већ наведено у продаји фактуре: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Фактура
 DocType: Maintenance Schedule Item,Periodicity,Периодичност
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фискална година {0} је потребно
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Очекивани Датум испоруке је био пре продаје по дата
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Причврстите .цсв датотеку са две колоне, једна за старим именом и један за ново име"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ни у ком активном фискалној години.
 DocType: Packed Item,Parent Detail docname,Родитељ Детаљ доцнаме
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Референца: {0}, Код товара: {1} Цустомер: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,кг
 DocType: Student Log,Log,Пријава
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Отварање за посао.
 DocType: Item Attribute,Increment,Повећање
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Изабери Варехоусе ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Изабери Варехоусе ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,оглашавање
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Иста компанија је ушла у више наврата
 DocType: Employee,Married,Ожењен
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Није дозвољено за {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Гет ставке из
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Није дозвољено за {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Гет ставке из
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Фото не могут быть обновлены против накладной {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Производ {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Но итемс листед
 DocType: Payment Reconciliation,Reconcile,помирити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,бакалница
 DocType: Quality Inspection Reading,Reading 1,Читање 1
 DocType: Process Payroll,Make Bank Entry,Маке Банк Ентри
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пензиони фондови
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Следећа Амортизација Датум не може бити пре купуваве
 DocType: SMS Center,All Sales Person,Све продаје Особа
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Месечни Дистрибуција ** помаже да дистрибуирате буџет / Таргет преко месеци ако имате сезонски у свом послу.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Није пронађено ставки
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Није пронађено ставки
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Плата Структура Недостаје
 DocType: Lead,Person Name,Особа Име
 DocType: Sales Invoice Item,Sales Invoice Item,Продаја Рачун шифра
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",нпр &quot;Основна школа&quot; или &quot;Универзитет&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,stock Извештаји
 DocType: Warehouse,Warehouse Detail,Магацин Детаљ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Пређена кредитни лимит за купца {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Рок Датум завршетка не може бити касније од годину завршити Датум школске године у којој је термин везан (академска година {}). Молимо исправите датуме и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Да ли је основних средстава&quot; не може бити неконтролисано, као средствима запис постоји у односу на ставке"
 DocType: Vehicle Service,Brake Oil,кочница уље
 DocType: Tax Rule,Tax Type,Пореска Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"Вы не авторизованы , чтобы добавить или обновить записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Артикал слика (ако не слидесхов)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Существуетклиентов с одноименным названием
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Час курс / 60) * Пуна Операција време
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Избор БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Избор БОМ
 DocType: SMS Log,SMS Log,СМС Пријава
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Трошкови уручене пошиљке
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Празник на {0} није између Од датума и до сада
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,škole
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Но одсуство запис фоунд фор запосленом {0} за {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Молимо унесите прва компанија
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Одредите прво Компанија
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Укупни трошкови
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Захтев Износ
 DocType: Employee,Mr,Господин
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Дупликат група купаца наћи у табели Клиентам групе
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Добављач Тип / Добављач
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Добављач Тип / Добављач
 DocType: Naming Series,Prefix,Префикс
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,потребляемый
 DocType: Employee,B-,Б-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,разред
 DocType: Sales Invoice Item,Delivered By Supplier,Деливеред добављач
 DocType: SMS Center,All Contact,Све Контакт
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Производња заказа већ створена за све ставке са БОМ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Годишња плата
 DocType: Daily Work Summary,Daily Work Summary,Дневни Рад Преглед
 DocType: Period Closing Voucher,Closing Fiscal Year,Затварање Фискална година
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} је замрзнут
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} је замрзнут
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Молимо одаберите постојећу компанију за израду контни
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Акции Расходы
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Селецт Таргет Варехоусе
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Цонтра Ступање
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валути Компанија
 DocType: Delivery Note,Installation Status,Инсталација статус
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Да ли желите да ажурирате присуство? <br> Пресент: {0} \ <br> Одсутни: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Принято + Отклоненные Кол-во должно быть равно полученного количества по пункту {0}
 DocType: Request for Quotation,RFQ-,РФК-
 DocType: Item,Supply Raw Materials for Purchase,Набавка сировина за куповину
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Најмање један начин плаћања је потребно за ПОС рачуна.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Најмање један начин плаћања је потребно за ПОС рачуна.
 DocType: Products Settings,Show Products as a List,Схов Производи као Лист
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Преузмите шаблон, попуните одговарајуће податке и приложите измењену датотеку.
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Маке Трошкови Ентри
 DocType: Appraisal Template Goal,KRA,Гром
 DocType: Lead,Request Type,Захтев Тип
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Маке Емплоиее
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Маке Емплоиее
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,радиодифузија
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,извршење
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детаљи о пословању спроведена.
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План одржавања посете.
 DocType: SMS Settings,Enter url parameter for message,Унесите УРЛ параметар за поруке
 DocType: POS Profile,Customer Groups,Цустомер Групе
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Финансијски извештаји
 DocType: Guardian,Students,Студенти
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила применения цен и скидки .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист должен быть применим для покупки или продажи
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Унапред износ не може бити већи од {0} {1}
 DocType: Naming Series,Series List for this Transaction,Серија Листа за ову трансакције
 DocType: Company,Default Payroll Payable Account,Уобичајено Плате плаћају рачун
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Упдате-маил Група
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Упдате-маил Група
 DocType: Sales Invoice,Is Opening Entry,Отвара Ентри
 DocType: Customer Group,Mention if non-standard receivable account applicable,Спомените ако нестандардни потраживања рачуна примењује
 DocType: Course Schedule,Instructor Name,инструктор Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Для требуется Склад перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,Продавац
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Ако је означено, ће укључивати не-залихама у материјалу захтевима."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Против продаје Фактура тачком
 ,Production Orders in Progress,Производни Поруџбине у напретку
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Нето готовина из финансирања
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Локалну меморију је пуна, није сачувао"
 DocType: Lead,Address & Contact,Адреса и контакт
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додај неискоришћене листове из претходних алокација
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Следећа Поновни {0} ће бити креирана на {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Укупно Обрачун трошкова Износ (преко Тиме Схеет)
 DocType: Item Website Specification,Item Website Specification,Ставка Сајт Спецификација
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Оставите Блокирани
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банк unosi
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Пункт {0} достигла своей жизни на {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Банк unosi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,годовой
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Стоцк Помирење артикла
 DocType: Stock Entry,Sales Invoice No,Продаја Рачун Нема
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Објављивање у Хуб
 DocType: Student Admission,Student Admission,студент Улаз
 ,Terretory,Терретори
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} отменяется
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Материјал Захтев
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} отменяется
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Материјал Захтев
 DocType: Bank Reconciliation,Update Clearance Date,Упдате Дате клиренс
 DocType: Item,Purchase Details,Куповина Детаљи
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},Ставка {0} није пронађен у &quot;сировине Испоручује се &#39;сто у нарудзбенице {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Изузетне чекова и депозити до знања
 DocType: Item,Synced With Hub,Синхронизују са Хуб
 DocType: Vehicle,Fleet Manager,флота директор
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може бити негативна за ставку {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Погрешна Лозинка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Ред # {0}: {1} не може бити негативна за ставку {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Погрешна Лозинка
 DocType: Item,Variant Of,Варијанта
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Завршен ком не може бити већи од 'Количина за производњу'
 DocType: Period Closing Voucher,Closing Account Head,Затварање рачуна Хеад
 DocType: Employee,External Work History,Спољни власници
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циркуларне референце Грешка
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Обавестити путем емаила на стварању аутоматског материјала захтеву
 DocType: Journal Entry,Multi Currency,Тема Валута
 DocType: Payment Reconciliation Invoice,Invoice Type,Фактура Тип
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Обавештење о пријему пошиљке
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Обавештење о пријему пошиљке
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Подешавање Порези
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Набавна вредност продате Ассет
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,Плаћање Ступање је модификована након што га извукао. Молимо вас да га опет повуците.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
-DocType: Grade Interval,Min Score,мин Резултат
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} вводится дважды в пункт налоге
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Преглед за ову недељу и чекају активности
 DocType: Student Applicant,Admitted,Признао
 DocType: Workstation,Rent Cost,Издавање Трошкови
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,вредност поруџбине
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банка / Новчане трансакције против странке или за интерни трансфер
 DocType: Shipping Rule,Valid for Countries,Важи за земље
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Ово је тачка шаблона и не може се користити у трансакцијама. Атрибути јединица ће бити копирани у варијанти осим 'Нема Копирање' постављено
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Укупно Ордер Сматра
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Сотрудник обозначение (например генеральный директор , директор и т.д.) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Пожалуйста, введите ' Repeat на день месяца ' значения поля"
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Ред # {0}: фактури не може се против постојеће имовине {1}
 DocType: Item Tax,Tax Rate,Пореска стопа
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} већ издвојила за запосленог {1} за период {2} {3} у
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Избор артикла
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Избор артикла
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Покупка Счет {0} уже подано
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Ред # {0}: Серијски бр морају бити исти као {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Претвори у не-Гроуп
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Групно (много) од стране јединице.
 DocType: C-Form Invoice Detail,Invoice Date,Фактуре
 DocType: GL Entry,Debit Amount,Износ задужења
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Може постојати само 1 налог за предузеће у {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Молимо погледајте прилог
 DocType: Purchase Order,% Received,% Примљено
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створити студентских група
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,Захтев за понуду
 DocType: Salary Slip Timesheet,Working Hours,Радно време
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Промена стартовања / струја број редни постојеће серије.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Креирајте нови клијента
-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.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Створити куповини Ордерс
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Креирајте нови клијента
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Ако више Цене Правила наставити да превлада, корисници су упитани да подесите приоритет ручно да реши конфликт."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Створити куповини Ордерс
 ,Purchase Register,Куповина Регистрација
 DocType: Course Scheduling Tool,Rechedule,Рецхедуле
 DocType: Landed Cost Item,Applicable Charges,Накнаде применљиво
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) мора имати улогу 'Напусти Аппровер
 DocType: Purchase Receipt,Vehicle Date,Датум возила
 DocType: Student Log,Medical,медицинский
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Разлог за губљење
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Разлог за губљење
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Олово Власник не може бити исти као и олова
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Издвојила износ не може већи од износа неприлагонене
 DocType: Announcement,Receiver,пријемник
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Количина и Оцените
 DocType: Delivery Note,% Installed,Инсталирано %
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Учионице / Лабораторије итд, где може да се планира предавања."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Молимо унесите прво име компаније
 DocType: Purchase Invoice,Supplier Name,Снабдевач Име
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитајте ЕРПНект Мануал
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обавезно поље - школска година
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обавезно поље - школска година
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Прилагодите уводни текст који иде као део тог поште. Свака трансакција има посебан уводном тексту.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Молимо поставите подразумевани се плаћају рачун за предузећа {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобална подешавања за свим производним процесима.
 DocType: Accounts Settings,Accounts Frozen Upto,Рачуни Фрозен Упто
 DocType: SMS Log,Sent On,Послата
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} изабран више пута у атрибутима табели
 DocType: HR Settings,Employee record is created using selected field. ,Запослени Запис се креира коришћењем изабрано поље.
 DocType: Sales Order,Not Applicable,Није применљиво
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Мастер отдыха .
 DocType: Request for Quotation Item,Required Date,Потребан датум
 DocType: Delivery Note,Billing Address,Адреса за наплату
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Унесите Шифра .
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Унесите Шифра .
 DocType: BOM,Costing,Коштање
 DocType: Tax Rule,Billing County,Обрачун жупанија
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Ако је проверен, порески износ ће се сматрати као што је већ укључена у Принт Рате / Штампа Износ"
@@ -507,6 +511,7 @@
 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,Ценные бумаги и депозиты
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Не могу променити метод процене, јер постоје трансакције против неких ставки које га нема сопствену метод вредновања"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Укупно лишће издвојена обавезна
 DocType: Job Opening,Description of a Job Opening,Опис посао Отварање
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Пендинг активности за данас
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Молимо одаберите Цоурсе
 DocType: Timesheet Detail,Hrs,хрс
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Молимо изаберите Цомпани
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Молимо изаберите Цомпани
 DocType: Stock Entry Detail,Difference Account,Разлика налог
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Не можете да затворите задатак као њен задатак зависи {0} није затворен.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Унесите складиште за које Материјал Захтев ће бити подигнута
 DocType: Production Order,Additional Operating Cost,Додатни Оперативни трошкови
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,козметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Да бисте објединили , следеће особине морају бити исти за обе ставке"
 DocType: Shipping Rule,Net Weight,Нето тежина
 DocType: Employee,Emergency Phone,Хитна Телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,купити
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Молимо Вас да дефинише оцену за праг 0%
 DocType: Sales Order,To Deliver,Да Испоручи
 DocType: Purchase Invoice Item,Item,ставка
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Серијски број Ставка не може да буде део
 DocType: Journal Entry,Difference (Dr - Cr),Разлика ( др - Кр )
 DocType: Account,Profit and Loss,Прибыль и убытки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управљање Подуговарање
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Повећање не може бити 0
 DocType: Production Planning Tool,Material Requirement,Материјал Захтев
 DocType: Company,Delete Company Transactions,Делете Цомпани трансакције
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Референца број и референце Датум је обавезна за банке трансакције
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Адд / Едит порези и таксе
 DocType: Purchase Invoice,Supplier Invoice No,Снабдевач фактура бр
 DocType: Territory,For reference,За референце
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Инсталација Напомена Ставка
 DocType: Production Plan Item,Pending Qty,Кол чекању
 DocType: Budget,Ignore,Игнорисати
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} није активан
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} није активан
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},СМС порука на следеће бројеве телефона: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,цхецк сетуп димензије за штампање
 DocType: Salary Slip,Salary Slip Timesheet,Плата Слип Тимесхеет
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Укупно Комисија
 DocType: Pricing Rule,Sales Partner,Продаја Партнер
 DocType: Buying Settings,Purchase Receipt Required,Куповина Потврда Обавезно
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Процена курс је обавезна ако Отварање Сток ушла
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Нема резултата у фактури табели записи
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Молимо Вас да изаберете Цомпани и Партије Типе прво
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Финансовый / отчетного года .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,акумулиране вредности
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Извини , Серијски Нос не може да се споје"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Маке Продаја Наручите
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Маке Продаја Наручите
 DocType: Project Task,Project Task,Пројектни задатак
 ,Lead Id,Олово Ид
 DocType: C-Form Invoice Detail,Grand Total,Свеукупно
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,ресуме Прилог
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Репеат Купци
 DocType: Leave Control Panel,Allocate,Доделити
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продаја Ретурн
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Продаја Ретурн
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Напомена: Укупно издвојена лишће {0} не сме бити мањи од већ одобрених лишћа {1} за период
 DocType: Announcement,Posted By,Поставио
 DocType: Item,Delivered by Supplier (Drop Ship),Деливеред би добављача (Дроп Схип)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Цитат
 DocType: Lead,Middle Income,Средњи приход
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Открытие (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Додељена сума не може бити негативан
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Подесите Цомпани
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Подесите Цомпани
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Продаја Фактура Тимесхеет
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Ссылка № & Ссылка Дата необходим для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Избор Плаћање рачуна да банке Ентри
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Створити запослених евиденције за управљање лишће, трошковима тврдње и плате"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додај у бази знања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Писање предлога
 DocType: Payment Entry Deduction,Payment Entry Deduction,Плаћање Ступање дедукције
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} ' {1}' не в финансовом году {2}
 DocType: Buying Settings,Settings for Buying Module,Подешавања за Буиинг Модуле
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Средство {0} не припада компанији {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Молимо вас да унесете први оригинални рачун
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Онда Ценовник Правила се филтрирају на основу клијента, корисника услуга Група, Територија, добављача, добављач Тип, кампање, продаја партнер итд"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Нето промена у инвентару
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Запослени Менаџмент кредита
 DocType: Employee,Passport Number,Пасош Број
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Однос са Гуардиан2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,менаџер
 DocType: Payment Entry,Payment From / To,Плаћање Фром /
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Датум опсег
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Нови кредитни лимит је мање од тренутног преосталог износа за купца. Кредитни лимит мора да садржи најмање {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""На основу"" и ""Групиши по"" не могу бити идентични"
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,У минута
 DocType: Issue,Resolution Date,Резолуција Датум
 DocType: Student Batch Name,Batch Name,батцх Име
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Тимесхеет цреатед:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Тимесхеет цреатед:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Пожалуйста, установите Cash умолчанию или банковский счет в режим оплаты {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,уписати
 DocType: Selling Settings,Customer Naming By,Кориснички назив под
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Ће показати ученика као присутна у Студентском Месечно Аттенданце Репорт
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Стварна Почетак Време
 DocType: BOM Operation,Operation Time,Операција време
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,завршити
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,база
 DocType: Timesheet,Total Billed Hours,Укупно Обрачунате сат
 DocType: Journal Entry,Write Off Amount,Отпис Износ
 DocType: Journal Entry,Bill No,Бил Нема
@@ -720,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,студент Присуство
 DocType: Sales Invoice Timesheet,Time Sheet,Распоред
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Бацкфлусх сировине на основу
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Пожалуйста, введите детали деталя"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Пожалуйста, введите детали деталя"
 DocType: Interest,Interest,интерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Пре продаје
 DocType: Purchase Receipt,Other Details,Остали детаљи
@@ -731,24 +735,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Плаћање Ступање је већ направљена
 DocType: Purchase Receipt Item Supplied,Current Stock,Тренутне залихе
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Ред # {0}: имовине {1} не повезано са тачком {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Преглед плата Слип
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Преглед плата Слип
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рачун {0} је ушла више пута
 DocType: Account,Expenses Included In Valuation,Трошкови укључени у процене
 DocType: Hub Settings,Seller City,Продавац Град
 ,Absent Student Report,Абсент Студентски Извештај
 DocType: Email Digest,Next email will be sent on:,Следећа порука ће бити послата на:
 DocType: Offer Letter Term,Offer Letter Term,Понуда Леттер Терм
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Тачка има варијанте.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Тачка има варијанте.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} не найден
 DocType: Bin,Stock Value,Вредност акције
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Фирма {0} не постоји
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Дрво Тип
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Дрво Тип
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кол Потрошено по јединици
 DocType: Serial No,Warranty Expiry Date,Гаранција Датум истека
 DocType: Material Request Item,Quantity and Warehouse,Количина и Магацин
 DocType: Sales Invoice,Commission Rate (%),Комисија Стопа (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Молимо одаберите програм
 DocType: Project,Estimated Cost,Процењени трошкови
@@ -767,7 +769,7 @@
 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,Уобичајено Рачун
 DocType: Payment Entry,Received Amount (Company Currency),Примљени износ (Фирма валута)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Ведущий должен быть установлен , если Возможность сделан из свинца"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Пожалуйста, выберите в неделю выходной"
 DocType: Production Order Operation,Planned End Time,Планирано време завршетка
 ,Sales Person Target Variance Item Group-Wise,Лицо продаж Целевая Разница Пункт Группа Мудрого
@@ -783,6 +785,7 @@
 DocType: Opportunity,Opportunity From,Прилика Од
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Месечна плата изјава.
 DocType: BOM,Website Specifications,Сајт Спецификације
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Од {0} типа {1}
 DocType: Warranty Claim,CI-,ЦИ-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ред {0}: Фактор конверзије је обавезно
@@ -836,6 +839,7 @@
 DocType: Employee,Bank A/C No.,Банка / Ц бр
 DocType: Bank Guarantee,Project,Пројекат
 DocType: Quality Inspection Reading,Reading 7,Читање 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Делимично Ж
 DocType: Expense Claim Detail,Expense Claim Type,Расходи потраживање Тип
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Дефаулт сеттингс фор Корпа
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Средство укинуо преко књижење {0}
@@ -843,14 +847,14 @@
 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 +107,Office Maintenance Expenses,Офис эксплуатационные расходы
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Подешавање Емаил налога
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Молимо унесите прва тачка
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Молимо унесите прва тачка
 DocType: Account,Liability,одговорност
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Санкционисани износ не може бити већи од износ потраживања у низу {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,Прайс-лист не выбран
 DocType: Employee,Family Background,Породица Позадина
 DocType: Request for Quotation Supplier,Send Email,Сенд Емаил
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Упозорење: Неважећи Прилог {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Без дозвола
 DocType: Company,Default Bank Account,Уобичајено банковног рачуна
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Филтрирање на основу партије, изаберите партија Типе први"
@@ -863,8 +867,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Не работник не найдено
 DocType: Supplier Quotation,Stopped,Заустављен
 DocType: Item,If subcontracted to a vendor,Ако подизвођење на продавца
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студент Група је већ ажуриран.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студент Група је већ ажуриран.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студент Група је већ ажуриран.
 DocType: SMS Center,All Customer Contact,Све Кориснички Контакт
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Уплоад равнотежу берзе преко ЦСВ.
 DocType: Warehouse,Tree Details,трее Детаљи
@@ -875,8 +879,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Минимални износ фактуре
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Цена центар {2} не припада компанији {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: налог {2} не може бити група
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Итем Ред {идк}: {ДОЦТИПЕ} {ДОЦНАМЕ} не постоји у горе &#39;{ДОЦТИПЕ}&#39; сто
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Тимесхеет {0} је већ завршен или отказан
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Но задаци
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Дан у месецу на којем друмски фактура ће бити генерисан нпр 05, 28 итд"
 DocType: Asset,Opening Accumulated Depreciation,Отварање акумулирана амортизација
@@ -892,7 +896,7 @@
 DocType: Bin,Moving Average Rate,Мовинг Авераге рате
 DocType: Production Planning Tool,Select Items,Изаберите ставке
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} против Предлога закона {1} {2} од
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Распоред курс
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Распоред курс
 DocType: Maintenance Visit,Completion Status,Завршетак статус
 DocType: HR Settings,Enter retirement age in years,Унесите старосну границу за пензионисање у годинама
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Циљна Магацин
@@ -900,7 +904,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволите преко испоруку или пријем упто овом одсто
 DocType: Stock Entry,STE-,аортна
 DocType: Upload Attendance,Import Attendance,Увоз Гледалаца
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Все Группы товаров
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Все Группы товаров
 DocType: Process Payroll,Activity Log,Активност Пријава
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Нето добит / губитак
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматически создавать сообщение о подаче сделок .
@@ -911,7 +915,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Налог за куповину на исплату
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Пројектовани Кол
 DocType: Sales Invoice,Payment Due Date,Плаћање Дуе Дате
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Тачка Варијанта {0} већ постоји са истим атрибутима
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Отварање&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Опен То До
 DocType: Notification Control,Delivery Note Message,Испорука Напомена порука
@@ -927,7 +931,7 @@
 DocType: Item Reorder,Re-Order Qty,Поново поручивање
 DocType: Leave Block List Date,Leave Block List Date,Оставите Датум листу блокираних
 DocType: Pricing Rule,Price or Discount,Цена или Скидка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Укупно Важећи Оптужбе у куповини потврда за ставке табели мора бити исти као и укупних пореза и накнада
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Укупно Важећи Оптужбе у куповини потврда за ставке табели мора бити исти као и укупних пореза и накнада
 DocType: Sales Team,Incentives,Подстицаји
 DocType: SMS Log,Requested Numbers,Тражени Бројеви
 DocType: Production Planning Tool,Only Obtain Raw Materials,Само Добијање Сировине
@@ -956,13 +960,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Да ли подизвођење
 DocType: Item Attribute,Item Attribute Values,Итем Особина Вредности
 DocType: Examination Result,Examination Result,преглед резултата
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Куповина Пријем
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Куповина Пријем
 ,Received Items To Be Billed,Примљени артикала буду наплаћени
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Поставио плата Слипс
 DocType: Employee,Ms,Мс
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Мастер Валютный курс .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Референце Тип документа мора бити један од {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Референце Тип документа мора бити један од {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Није могуће пронаћи време за наредних {0} дана за рад {1}
 DocType: Production Order,Plan material for sub-assemblies,План материјал за подсклопови
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Продајних партнера и Регија
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Не могу аутоматски направити налог као што је већ ту је акционарско на рачуну. Морате креирати подударање налог да бисте могли да ставку о овом складишту
@@ -985,10 +989,9 @@
 DocType: Supplier,Default Payable Accounts,Уобичајено се плаћају рачуни
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Сотрудник {0} не активен или не существует
 DocType: Fee Structure,Components,komponente
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Ставка Варијанте {0} ажурирани
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Молимо унесите Ассет Категорија тачке {0}
 DocType: Quality Inspection Reading,Reading 6,Читање 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Цан нот {0} {1} {2} без негативних изузетан фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Фактури Адванце
 DocType: Hub Settings,Sync Now,Синц Сада
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ров {0}: Кредит Унос се не може повезати са {1}
@@ -1002,11 +1005,11 @@
 DocType: Item,Is Purchase Item,Да ли је куповина артикла
 DocType: Asset,Purchase Invoice,Фактури
 DocType: Stock Ledger Entry,Voucher Detail No,Ваучер Детаљ Бр.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Нови продаје Фактура
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Нови продаје Фактура
 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,Датум отварања и затварања Дате треба да буде у истој фискалној години
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Датум отварања и затварања Дате треба да буде у истој фискалној години
 DocType: Lead,Request for Information,Захтев за информације
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Синц Оффлине Рачуни
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Синц Оффлине Рачуни
 DocType: Payment Request,Paid,Плаћен
 DocType: Program Fee,Program Fee,naknada програм
 DocType: Salary Slip,Total in words,Укупно у речима
@@ -1016,7 +1019,7 @@
 DocType: Employee Loan,Sanctioned,санкционисан
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; сто."
 DocType: Job Opening,Publish on website,Објави на сајту
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Испоруке купцима.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Добављач Фактура Датум не може бити већи од датума када је послата
@@ -1027,7 +1030,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Варијација
 ,Company Name,Име компаније
 DocType: SMS Center,Total Message(s),Всего сообщений (ы)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Избор тачка за трансфер
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,Изаберите главу рачуна банке у којој је депонован чек.
@@ -1038,8 +1041,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ров {0}: Плаћање по куповном / продајном Реда треба увек бити означен као унапред
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,хемијски
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Дефаулт Банка / Готовина налог ће аутоматски бити ажуриран у плате књижење када је изабран овај режим.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Интервали за оцену Код {0} преклапа са интервалима разреда за остале разреде. Молимо вас да проверите интервали {0} и {1} и покушајте поново
 DocType: BOM,Raw Material Cost(Company Currency),Сировина трошкова (Фирма валута)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Сви артикли су већ пребачени за ову производњу Реда.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Ред # {0}: курс не може бити већа од стопе која се користи у {1} {2}
@@ -1052,14 +1053,14 @@
 DocType: BOM Website Item,BOM Website Item,БОМ Сајт артикла
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Уплоад главу писмо и лого. (Можете их уредити касније).
 DocType: Timesheet Detail,Bill,рачун
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Следећа Амортизација Датум је ушао као прошле дана
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Бео
 DocType: SMS Center,All Lead (Open),Све Олово (Опен)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Ред {0}: Количина није доступан за {4} у складишту {1} на објављивање време ступања ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Гет аванси
 DocType: Item,Automatically Create New Batch,Аутоматски Направи нови Батцх
 DocType: Item,Automatically Create New Batch,Аутоматски Направи нови Батцх
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Правити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Правити
 DocType: Student Admission,Admission Start Date,Улаз Датум почетка
 DocType: Journal Entry,Total Amount in Words,Укупан износ у речи
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Дошло је до грешке . Један могући разлог би могао бити да нисте сачували форму . Молимо контактирајте суппорт@ерпнект.цом акопроблем и даље постоји .
@@ -1067,7 +1068,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,Отварање Кол
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Молимо Вас да унесете налог за промене Износ
 DocType: Student Batch Name,Student Batch Name,Студент Серија Име
 DocType: Holiday List,Holiday List Name,Холидаи Листа Име
 DocType: Repayment Schedule,Balance Loan Amount,Биланс Износ кредита
@@ -1087,10 +1088,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Наведите {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Уклоњене ствари без промене у количини или вриједности.
 DocType: Delivery Note,Delivery To,Достава Да
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут сто је обавезно
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут сто је обавезно
 DocType: Production Planning Tool,Get Sales Orders,Гет продајних налога
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бити негативан
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Попуст
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Попуст
 DocType: Asset,Total Number of Depreciations,Укупан број Амортизација
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
 DocType: Sales Invoice Item,Rate With Margin,Стопа Са маргина
@@ -1106,7 +1107,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Резервисано Магацин у Продаја Наручите / складиште готове робе
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Продаја Износ
 DocType: Repayment Schedule,Interest Amount,Износ камате
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви стеТрошак одобраватељ за овај запис . Молимо Ажурирајте 'статус' и Саве
 DocType: Serial No,Creation Document No,Стварање документ №
 DocType: Issue,Issue,Емисија
 DocType: Asset,Scrapped,одбачен
@@ -1114,12 +1115,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути за тачка варијанти. нпр Величина, Боја итд"
 DocType: Purchase Invoice,Returns,повраћај
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,ВИП Магацин
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серийный номер {0} находится под контрактом на техническое обслуживание ДО {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,регрутовање
 DocType: Lead,Organization Name,Име организације
 DocType: Tax Rule,Shipping State,Достава Држава
 ,Projected Quantity as Source,Пројектована Количина као извор
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,Ставка мора се додати користећи 'Гет ставки из пурцхасе примитака' дугме
 DocType: Employee,A-,А-
 DocType: Production Planning Tool,Include non-stock items,Укључују не-залихама
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Коммерческие расходы
@@ -1127,12 +1128,12 @@
 DocType: GL Entry,Against,Против
 DocType: Item,Default Selling Cost Center,По умолчанию Продажа Стоимость центр
 DocType: Sales Partner,Implementation Partner,Имплементација Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Поштански број
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Поштански број
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Салес Ордер {0} је {1}
 DocType: Opportunity,Contact Info,Контакт Инфо
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Макинг Стоцк записи
 DocType: Packing Slip,Net Weight UOM,Тежина УОМ
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} резултата
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} резултата
 DocType: Item,Default Supplier,Уобичајено Снабдевач
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Над производњом Исправка Проценат
 DocType: Employee Loan,Repayment Schedule,отплате
@@ -1140,7 +1141,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Гет Офф Недељно Датуми
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата окончания не может быть меньше , чем Дата начала"
 DocType: Sales Person,Select company name first.,Изаберите прво име компаније.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Др
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Др
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Цитати од добављача.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Да {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Просек година
@@ -1160,7 +1161,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Кључна Перформансе Област
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,неважећи Атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} должны быть представлены
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} должны быть представлены
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Количина мора бити мањи од или једнак {0}
 DocType: SMS Center,Total Characters,Укупно Карактери
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Молимо Вас да изаберете БОМ БОМ у пољу за ставку {0}
@@ -1171,7 +1172,7 @@
 DocType: Sales Partner,Distributor,Дистрибутер
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,Корпа Достава Правило
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,Производственный заказ {0} должно быть отменено до отмены этого заказ клиента
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',Молимо поставите &#39;Аппли додатни попуст на&#39;
 ,Ordered Items To Be Billed,Ж артикала буду наплаћени
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,Од Опсег мора да буде мањи од у распону
 DocType: Global Defaults,Global Defaults,Глобални Дефаултс
@@ -1181,7 +1182,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,старт Година
 DocType: Purchase Invoice,Start date of current invoice's period,Почетак датум периода текуће фактуре за
 DocType: Salary Slip,Leave Without Pay,Оставите Без плате
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Капацитет Планирање Грешка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Капацитет Планирање Грешка
 ,Trial Balance for Party,Претресно Разлика за странке
 DocType: Lead,Consultant,Консултант
 DocType: Salary Slip,Earnings,Зарада
@@ -1196,7 +1197,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Ово ће бити прикључена на Кодекса тачка на варијанте. На пример, ако је ваш скраћеница је ""СМ"", а код ставка је ""МАЈИЦА"", ставка код варијанте ће бити ""МАЈИЦА-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Нето плата (у речи) ће бити видљив када сачувате Слип плату.
 DocType: Purchase Invoice,Is Return,Да ли је Повратак
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Повратак / задужењу
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Повратак / задужењу
 DocType: Price List Country,Price List Country,Ценовник Земља
 DocType: Item,UOMs,УОМс
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} действительные серийные NOS для Пункт {1}
@@ -1206,11 +1207,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Молимо Вас да унесете Код товара да се број серије
 DocType: Stock Settings,Default Item Group,Уобичајено тачка Група
 DocType: Employee Loan,Partially Disbursed,Делимично Додељено
-DocType: Grading Structure,Grading System Name,Градинг систем Име
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Снабдевач базе података.
 DocType: Account,Balance Sheet,баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Цост Центер За ставку са Код товара '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим плаћања није подешен. Молимо вас да проверите, да ли налог је постављен на начину плаћања или на ПОС профил."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Ваша особа продаја ће добити подсетник на овај датум да се контактира купца
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Исто ставка не може се уписати више пута.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Даље рачуни могу бити у групама, али уноса можете извршити над несрпским групама"
@@ -1222,7 +1222,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ледгер уноси и ГЛ Пријаве се постављати за одабране куповине Примања
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Сток Ледгер уноси и ГЛ Пријаве се постављати за одабране куповине Примања
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Тачка 1
 DocType: Holiday,Holiday,Празник
 DocType: Support Settings,Close Issue After Days,Близу Издање Након неколико дана
@@ -1249,11 +1249,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Рад Доне
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Наведите бар један атрибут у табели Атрибутима
 DocType: Announcement,All Students,Сви студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Итем {0} мора бити нон-лагеру предмета
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Погледај Леџер
 DocType: Grading Scale,Intervals,интервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Најраније
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Пункт Группа существует с тем же именем , пожалуйста, измените имя элемента или переименовать группу товаров"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Студент Мобилни број
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Остальной мир
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Ставка {0} не може имати Батцх
@@ -1293,9 +1293,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Исплата зараде из {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не разрешается редактировать замороженный счет {0}
 DocType: Journal Entry,Get Outstanding Invoices,Гет неплаћене рачуне
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Заказ на продажу {0} не является допустимым
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Наруџбенице помоћи да планирате и праћење куповина
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Жао нам је , компаније не могу да се споје"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Укупна количина Издање / трансфер {0} у Индустријска Захтев {1} \ не може бити већа од тражене количине {2} за тачка {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Мали
@@ -1316,10 +1316,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,косвенные расходы
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ред {0}: Кол је обавезно
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,пољопривреда
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Синц мастер података
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Синц мастер података
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваши производи или услуге
 DocType: Mode of Payment,Mode of Payment,Начин плаћања
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Сајт Слика треба да буде јавни фајл или УРЛ веб-сајта
 DocType: Student Applicant,AP,АП
 DocType: Purchase Invoice Item,BOM,БОМ
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,То јекорен ставка група и не може се мењати .
@@ -1336,18 +1336,18 @@
 DocType: Student Group Student,Group Roll Number,"Група Ролл, број"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","За {0}, само кредитне рачуни могу бити повезани против неке друге ставке дебитне"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Збир свих радних тегова треба да буде 1. Подесите тежине свих задатака пројекта у складу са тим
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Доставка Примечание {0} не представлено
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Правилник о ценама је први изабран на основу 'Примени на ""терену, који могу бити артикла, шифра групе или Марка."
 DocType: Hub Settings,Seller Website,Продавац Сајт
 DocType: Item,ITEM-,Артикл-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всего выделено процент для отдела продаж должен быть 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Статус производственного заказа {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Статус производственного заказа {0}
 DocType: Appraisal Goal,Goal,Циљ
 DocType: Sales Invoice Item,Edit Description,Измени опис
 ,Team Updates,тим ажурирања
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,За добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,За добављача
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Подешавање Тип налога помаже у одабиру овог рачуна у трансакцијама.
 DocType: Purchase Invoice,Grand Total (Company Currency),Гранд Укупно (Друштво валута)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Створити Принт Формат
@@ -1363,7 +1363,7 @@
 DocType: Depreciation Schedule,Journal Entry,Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ставки у току
 DocType: Workstation,Workstation Name,Воркстатион Име
-DocType: Grade Interval,Grade Code,граде код
+DocType: Grading Scale Interval,Grade Code,граде код
 DocType: POS Item Group,POS Item Group,ПОС Тачка Група
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Емаил Дигест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},БОМ {0} не припада тачком {1}
@@ -1380,7 +1380,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,аппаратные средства
 DocType: Sales Order,Recurring Upto,понављајући Упто
 DocType: Attendance,HR Manager,ХР Менаџер
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Изаберите Цомпани
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Изаберите Цомпани
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привилегированный Оставить
 DocType: Purchase Invoice,Supplier Invoice Date,Датум фактуре добављача
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Потребно је да омогућите Корпа
@@ -1396,7 +1396,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,еда
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старење Опсег 3
 DocType: Maintenance Schedule Item,No of Visits,Број посета
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,марк Похађани
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,марк Похађани
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Распоред одржавања {0} постоји од {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Уписивање student
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валута затварања рачуна мора да буде {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Збир бодова за све циљеве би требало да буде 100. То је {0}
@@ -1421,7 +1422,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Просек Дневни Одлазећи
 DocType: POS Profile,Campaign,Кампања
 DocType: Supplier,Name and Type,Име и тип
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Состояние утверждения должны быть ""Одобрено"" или "" Отклонено """
 DocType: Purchase Invoice,Contact Person,Контакт особа
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Очекивани датум почетка"" не може бити већи од ""Очекивани датум завршетка"""
 DocType: Course Scheduling Tool,Course End Date,Наравно Датум завршетка
@@ -1444,14 +1445,15 @@
 DocType: Sales Invoice,Shipping Address Name,Достава Адреса Име
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Контни
 DocType: Material Request,Terms and Conditions Content,Услови коришћења садржаја
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може бити већи од 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,не може бити већи од 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Пункт {0} не является акционерным Пункт
 DocType: Maintenance Visit,Unscheduled,Неплански
 DocType: Employee,Owned,Овнед
 DocType: Salary Detail,Depends on Leave Without Pay,Зависи оставити без Паи
 DocType: Pricing Rule,"Higher the number, higher the priority","Виши број, већи приоритет"
 ,Purchase Invoice Trends,Фактури Трендови
 DocType: Employee,Better Prospects,Бољи изгледи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Ред # {0}: Шаржа {1} има само {2} Кти. Молимо одаберите другу групу која има {3} Кти Аваилабле или поделити ред у више редова, да испоручи / проблема из више серија"
 DocType: Vehicle,License Plate,Регистарске таблице
 DocType: Appraisal,Goals,Циљеви
 DocType: Warranty Claim,Warranty / AMC Status,Гаранција / АМЦ статус
@@ -1470,7 +1472,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Запослени не може пријавити за себе.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Аконалог је замрзнут , уноси могу да ограничене корисницима ."
 DocType: Email Digest,Bank Balance,Стање на рачуну
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Књиговодство Ступање на {0}: {1} може се вршити само у валути: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профиль работы , квалификация , необходимые т.д."
 DocType: Journal Entry Account,Account Balance,Рачун Биланс
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Пореска Правило за трансакције.
@@ -1481,7 +1483,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Схов П &amp; Л стања унцлосед фискалну годину
 DocType: Shipping Rule,Shipping Account,Достава рачуна
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: налог {2} је неактиван
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Маке Салес Ордерс ће вам помоћи да планирате свој рад и доставити на време
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Маке Салес Ордерс ће вам помоћи да планирате свој рад и доставити на време
 DocType: Quality Inspection,Readings,Читања
 DocType: Stock Entry,Total Additional Costs,Укупно Додатни трошкови
 DocType: Course Schedule,SH,СХ
@@ -1492,7 +1494,7 @@
 DocType: Shipping Rule Condition,To Value,Да вредност
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Паковање Слип
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Паковање Слип
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,аренда площади для офиса
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Подешавање Подешавања СМС Гатеваи
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Увоз није успело !
@@ -1514,11 +1516,11 @@
 DocType: Company,Services,Услуге
 DocType: HR Settings,Email Salary Slip to Employee,Емаил плата Слип да запосленом
 DocType: Cost Center,Parent Cost Center,Родитељ Трошкови центар
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Изабери Могући Супплиер
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Изабери Могући Супплиер
 DocType: Sales Invoice,Source,Извор
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,схов затворено
 DocType: Leave Type,Is Leave Without Pay,Да ли је Оставите без плате
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Средство Категорија је обавезна за фиксне тачке средстава
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Нема резултата у табели плаћања записи
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Ова {0} је у супротности са {1} за {2} {3}
 DocType: Student Attendance Tool,Students HTML,Студенти ХТМЛ-
@@ -1536,7 +1538,7 @@
 DocType: Student,Date of Leaving,Датум Леавинг
 DocType: Pricing Rule,For Price List,Для Прейскурантом
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Екецутиве Сеарцх
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,створити Леадс
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,створити Леадс
 DocType: Maintenance Schedule,Schedules,Распореди
 DocType: Purchase Invoice Item,Net Amount,Нето износ
 DocType: Purchase Order Item Supplied,BOM Detail No,БОМ Детаљ Нема
@@ -1564,9 +1566,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Упис
 DocType: Sales Invoice Item,Brand Name,Бранд Наме
 DocType: Purchase Receipt,Transporter Details,Транспортер Детаљи
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Уобичајено складиште је потребан за одабране ставке
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,коробка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,могуће добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,могуће добављача
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Организација
 DocType: Budget,Monthly Distribution,Месечни Дистрибуција
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"Приемник Список пуст . Пожалуйста, создайте приемник Список"
@@ -1574,8 +1576,8 @@
 DocType: Sales Partner,Sales Partner Target,Продаја Партнер Циљна
 DocType: Loan Type,Maximum Loan Amount,Максимални износ кредита
 DocType: Pricing Rule,Pricing Rule,Цены Правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Дупликат Д број за студента {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Дупликат Д број за студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Дупликат Д број за студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Дупликат Д број за студента {0}
 DocType: Budget,Action if Annual Budget Exceeded,Акција ако Годишњи буџет Екцеедед
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Материјал захтјев за откуп Ордер
 DocType: Shopping Cart Settings,Payment Success URL,Плаћање Успех УРЛ адреса
@@ -1596,9 +1598,9 @@
 DocType: Employee Loan,Repayment Method,Начин отплате
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Ако је означено, Почетна страница ће бити подразумевани тачка група за сајт"
 DocType: Quality Inspection Reading,Reading 4,Читање 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Стандардно БОМ за {0} није пронађен за пројекат {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Стандардно БОМ за {0} није пронађен за пројекат {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Захтеви за рачун предузећа.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенти су у срцу система, додати све студенте"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенти су у срцу система, додати све студенте"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Ред # {0}: Датум Одобрење {1} не може бити пре Чек Дате {2}
 DocType: Company,Default Holiday List,Уобичајено Холидаи Лист
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Ред {0}: Од времена и доба {1} преклапа са {2}
@@ -1610,21 +1612,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Дан (и) на коју се пријављујете за дозволу су празници. Не морате пријавити за одмор.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Поново плаћања Емаил
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нови задатак
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Направи понуду
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Направи понуду
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Остали извештаји
 DocType: Dependent Task,Dependent Task,Зависна Задатак
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коэффициент пересчета для дефолтного Единица измерения должна быть 1 в строке {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},"Оставить типа {0} не может быть больше, чем {1}"
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Покушајте планирање операција за Кс дана унапред.
 DocType: HR Settings,Stop Birthday Reminders,Стани Рођендан Подсетници
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Молимо поставите Дефаулт Паиролл Паиабле рачун у компанији {0}
 DocType: SMS Center,Receiver List,Пријемник Листа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Тражи артикла
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Тражи артикла
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Цонсумед Износ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Нето промена на пари
 DocType: Assessment Plan,Grading Scale,скала оцењивања
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,већ завршено
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Единица измерения {0} был введен более чем один раз в таблицу преобразования Factor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,већ завршено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Плаћање Захтјев већ постоји {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Трошкови издатих ставки
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Количина не сме бити више од {0}
@@ -1656,12 +1658,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Маке исплата Ентри
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ред {0}: Унапред против добављач мора да се задужи
 DocType: Company,Default Values,Уобичајено Вредности
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Фрекуенци} Дигест
 DocType: Expense Claim,Total Amount Reimbursed,Укупан износ рефундирају
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Ово је засновано на трупаца против овог возила. Погледајте рок доле за детаље
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,прикупити
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Против добављача Фактура {0} {1} од
 DocType: Customer,Default Price List,Уобичајено Ценовник
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Кретање средство запис {0} је направљена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Кретање средство запис {0} је направљена
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете брисати Фискална година {0}. Фискална {0} Година је постављен као подразумевани у глобалним поставкама
 DocType: Journal Entry,Entry Type,Ступање Тип
 ,Customer Credit Balance,Кориснички кредитни биланс
@@ -1681,7 +1684,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Ниједан од ставки имају било какву промену у количини или вриједности.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обавезно поље - програм
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обавезно поље - програм
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Гаранција Цлаим
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Гаранција Цлаим
 ,Lead Details,Олово Детаљи
 DocType: Salary Slip,Loan repayment,Отплата кредита
 DocType: Purchase Invoice,End date of current invoice's period,Крајњи датум периода актуелне фактуре за
@@ -1700,12 +1703,10 @@
 DocType: Employee,Permanent Address,Стална адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",Унапред платио против {0} {1} не може бити већи \ од ГРАНД Укупно {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Пожалуйста, выберите элемент кода"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Пожалуйста, выберите элемент кода"
 DocType: Student Sibling,Studying in Same Institute,Студирање у истом институту
 DocType: Territory,Territory Manager,Територија Менаџер
 DocType: Packed Item,To Warehouse (Optional),До складишта (опционо)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 DocType: Payment Entry,Paid Amount (Company Currency),Уплаћеног износа (Фирма валута)
 DocType: Purchase Invoice,Additional Discount,Додатни попуст
 DocType: Selling Settings,Selling Settings,Продаја Сеттингс
@@ -1715,9 +1716,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Погледај у корпу
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетинговые расходы
 ,Item Shortage Report,Ставка о несташици извештај
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Тежина се спомиње, \n Молимо вас да се позовете на ""Тежина УОМ"" превише"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Материјал Захтев се користи да би овај унос Стоцк
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Следећа Амортизација Датум је обавезан за инвестицију
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Следећа Амортизација Датум је обавезан за инвестицију
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Одвојени базирана Група наравно за сваку серију
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Једна јединица једне тачке.
 DocType: Fee Category,Fee Category,naknada Категорија
@@ -1733,8 +1734,7 @@
 DocType: Course Assessment Criteria,Weightage,Веигхтаге
 DocType: Packing Slip,PS-,ПС-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Трошкови Центар је потребно за &quot;добит и губитак&quot; налога {2}. Молимо Вас да оснује центар трошкова подразумевани за компаније.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Группа клиентов существует с тем же именем , пожалуйста изменить имя клиентов или переименовать группу клиентов"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Кориснички&gt; Кориснички Група&gt; Територија
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1751,7 +1751,7 @@
 ,Item-wise Sales Register,Предмет продаје-мудре Регистрација
 DocType: Asset,Gross Purchase Amount,Бруто Куповина Количина
 DocType: Asset,Depreciation Method,Амортизација Метод
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,оффлине
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,оффлине
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Да ли је то такса у Основном Рате?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Укупно Циљна
 DocType: Program Course,Required,потребан
@@ -1761,21 +1761,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Помирење ЈСОН
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Превише колоне. Извоз извештај и одштампајте га помоћу тих апликација.
 DocType: Purchase Invoice Item,Batch No,Групно Нема
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Није могуће пронаћи курс за {0} до {1} за кључне дана {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволите више продајних налога против нарудзбенице купац је
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 DocType: Student Group Instructor,Student Group Instructor,Студент Група Инструктор
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Гуардиан2 Мобилни број
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,основной
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варијанта
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,основной
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варијанта
 DocType: Naming Series,Set prefix for numbering series on your transactions,Сет префикс за нумерисање серију на својим трансакцијама
 DocType: Employee Attendance Tool,Employees HTML,zaposleni ХТМЛ
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Уобичајено БОМ ({0}) мора бити активан за ову ставку или његовог шаблон
 DocType: Employee,Leave Encashed?,Оставите Енцасхед?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Прилика Од пољу је обавезна
 DocType: Email Digest,Annual Expenses,Годишњи трошкови
 DocType: Item,Variants,Варијанте
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Маке наруџбенице
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Маке наруџбенице
 DocType: SMS Center,Send To,Пошаљи
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Существует не хватает отпуск баланс для отпуске Тип {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Додијељени износ
@@ -1783,7 +1782,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Работа -в- Прогресс Склад требуется перед Отправить
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Подносилац захтева за посао.
 DocType: Purchase Order Item,Warehouse and Reference,Магацини и Референца
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутарна инфо и друге опште информације о вашем добављачу
@@ -1791,11 +1790,10 @@
 DocType: Item,Serial Nos and Batches,Сериал Нос анд Пакети
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студент Група Снага
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студент Група Снага
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Против часопису Ступање {0} нема никакву премца {1} улазак
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,аппраисалс
 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: Grading Structure,Grading Intervals,норматив Интервали
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Унесите
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не могу да овербилл за тачком {0} у реду {1} више од {2}. Да би се омогућило над-наплате, молимо вас да поставите у Буиинг Сеттингс"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Молимо поставите филтер на основу тачке или Варехоусе
@@ -1807,17 +1805,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,БОМ {0} мора да се поднесе
 DocType: Authorization Control,Authorization Control,Овлашћење за контролу
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ред # {0}: Одбијен Складиште је обавезна против одбијен тачком {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Плаћање
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Организујте своје налоге
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Плаћање
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Организујте своје налоге
 DocType: Production Order Operation,Actual Time and Cost,Тренутно време и трошак
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Материал Запрос максимума {0} могут быть сделаны для Пункт {1} против Заказ на продажу {2}
 DocType: Employee,Salutation,Поздрав
 DocType: Course,Course Abbreviation,Наравно држава
 DocType: Student Leave Application,Student Leave Application,Студент одсуство примене
 DocType: Item,Will also apply for variants,Ће конкурисати и за варијанте
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Средство не може бити поништена, као што је већ {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Запослени {0} на пола дана на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Укупно радно време не би требало да буде већи од мак радних сати {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,На
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Бундле ставке у време продаје.
 DocType: Quotation Item,Actual Qty,Стварна Кол
 DocType: Sales Invoice Item,References,Референце
@@ -1827,7 +1826,7 @@
 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 +91,Associate,помоћник
 DocType: Asset Movement,Asset Movement,средство покрет
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова корпа
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Нова корпа
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} не сериализованным Пункт
 DocType: SMS Center,Create Receiver List,Направите листу пријемника
 DocType: Vehicle,Wheels,Точкови
@@ -1859,10 +1858,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Онемогућава стварање временских трупаца против производних налога. Операције неће бити праћени против Продуцтион Ордер
 DocType: Student,Student Mobile Number,Студент Број мобилног телефона
 DocType: Item,Has Variants,Хас Варијанте
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Који сте изабрали ставке из {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назив мјесечни
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Батцх ИД је обавезна
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Батцх ИД је обавезна
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Батцх ИД је обавезна
 DocType: Sales Person,Parent Sales Person,Продаја Родитељ Особа
 DocType: Purchase Invoice,Recurring Invoice,Понављајући Рачун
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управљање пројектима
@@ -1870,11 +1869,11 @@
 DocType: Budget,Fiscal Year,Фискална година
 DocType: Vehicle Log,Fuel Price,Гориво Цена
 DocType: Budget,Budget,Буџет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Основних средстава тачка мора бити нон-лагеру предмета.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Буџет не може се одредити према {0}, јер то није прихода или расхода рачун"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Постигнута
 DocType: Student Admission,Application Form Route,Образац за пријаву Рута
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Територија / Кориснички
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Територија / Кориснички
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,например 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Оставите Тип {0} не може бити додељена јер је оставити без плате
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Ред {0}: Додељени износ {1} мора бити мања или једнака фактурише изузетну количину {2}
@@ -1894,14 +1893,14 @@
 ,Serial No Status,Серијски број статус
 DocType: Payment Entry Reference,Outstanding,Изванредан
 ,Daily Timesheet Summary,Дневни Тимесхеет Преглед
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Ров {0}: За подешавање {1} периодичност, разлика између од и до данас \ мора бити већи или једнак {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Ово је засновано на складе кретању. Погледајте {0} за детаље
 DocType: Pricing Rule,Selling,Продаја
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Износ {0} {1} одузима од {2}
 DocType: Employee,Salary Information,Плата Информација
 DocType: Sales Person,Name and Employee ID,Име и број запослених
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Впритык не может быть , прежде чем отправлять Дата"
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Пошлины и налоги
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Пожалуйста, введите дату Ссылка"
@@ -1913,14 +1912,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можете обратиться номер строки , превышающую или равную текущему номеру строки для этого типа зарядки"
 DocType: Asset,Sold,Продат
 ,Item-wise Purchase History,Тачка-мудар Историја куповине
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Пожалуйста, нажмите на кнопку "" Generate Расписание "" , чтобы принести Серийный номер добавлен для Пункт {0}"
 DocType: Account,Frozen,Фрозен
 ,Open Production Orders,Отворена Продуцтион Поруџбине
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Основица (Фирма валута)
 DocType: Payment Reconciliation Payment,Reference Row,референце Ред
 DocType: Installation Note,Installation Time,Инсталација време
 DocType: Sales Invoice,Accounting Details,Књиговодство Детаљи
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Обриши све трансакције за ову компанију
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,инвестиции
 DocType: Issue,Resolution Details,Резолуција Детаљи
@@ -1953,14 +1952,14 @@
 DocType: Discussion,Discussion,дискусија
 DocType: Payment Entry,Transaction ID,ИД трансакције
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Цене Правила се даље филтрира на основу количине.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Подесите датум приступања за запосленог {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Укупно Износ обрачуна (преко Тиме Схеет)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Поновите Кориснички Приход
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) мора имати улогу 'Екпенсе одобраватељ'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Изабери БОМ и Кти за производњу
 DocType: Asset,Depreciation Schedule,Амортизација Распоред
 DocType: Bank Reconciliation Detail,Against Account,Против налога
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Пола Дан Датум треба да буде између Од датума и до данас
@@ -1974,16 +1973,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Молимо поставите &#39;Ассет Амортизација Набавна центар &quot;у компанији {0}
 ,Maintenance Schedules,Планове одржавања
 DocType: Task,Actual End Date (via Time Sheet),Стварна Датум завршетка (преко Тиме Схеет)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Износ {0} {1} против {2} {3}
 ,Quotation Trends,Котировочные тенденции
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ставка група не помиње у тачки мајстор за ставку {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебитна Да рачуну мора бити потраживања рачун
 DocType: Shipping Rule Condition,Shipping Amount,Достава Износ
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Чека Износ
 DocType: Purchase Invoice Item,Conversion Factor,Конверзија Фактор
 DocType: Purchase Order,Delivered,Испоручено
 ,Vehicle Expenses,Трошкови возила
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
+DocType: Serial No,Invoice Details,Детаљи рачуна
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Очекивана вредност после корисног века трајања мора бити већи или једнак {0}
 DocType: Purchase Receipt,Vehicle Number,Број возила
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Датум на који се понавља фактура ће бити зауставити
 DocType: Employee Loan,Loan Amount,Износ позајмице
@@ -2002,12 +2002,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,тимесхеетс
 DocType: HR Settings,HR Settings,ХР Подешавања
 DocType: Salary Slip,net pay info,Нето плата Информације о
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Расходи Тужба се чека на одобрење . СамоРасходи одобраватељ да ажурирате статус .
 DocType: Email Digest,New Expenses,Нове Трошкови
 DocType: Purchase Invoice,Additional Discount Amount,Додатне Износ попуста
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Ред # {0}: Кол-во мора бити 1, као тачка је основна средства. Молимо вас да користите посебан ред за вишеструко Кол."
 DocType: Leave Block List Allow,Leave Block List Allow,Оставите листу блокираних Аллов
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Аббр не може бити празно или простор
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Аббр не може бити празно или простор
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група не-Гроуп
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,спортски
 DocType: Loan Type,Loan Name,kredit Име
@@ -2019,6 +2019,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Магацин где се одржава залихе одбачених предмета
 DocType: Production Order,Skip Material Transfer,Скип Материал Трансфер
 DocType: Production Order,Skip Material Transfer,Скип Материал Трансфер
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Није могуће пронаћи курс за {0} до {1} за кључне дана {2}. Направите валута Екцханге рекорд ручно
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваша финансијска година се завршава
 DocType: POS Profile,Price List,Ценовник
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} теперь используется по умолчанию финансовый год . Пожалуйста, обновите страницу в браузере , чтобы изменения вступили в силу."
@@ -2035,19 +2036,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Рачун {0} је неважећа. Рачун валута мора да буде {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Фактор Единица измерения преобразования требуется в строке {0}
 DocType: Production Plan Item,material_request_item,материал_рекуест_итем
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од продаје реда, продаје Фактура или Јоурнал Ентри"
 DocType: Salary Component,Deduction,Одузимање
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Ред {0}: Од времена и времена је обавезно.
 DocType: Stock Reconciliation Item,Amount Difference,iznos Разлика
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Ставка Цена додат за {0} у ценовнику {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Молимо Вас да унесете Ид радник ове продаје особе
 DocType: Territory,Classification of Customers by region,Класификација купаца по региону
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Разлика Износ мора бити нула
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Разлика Износ мора бити нула
 DocType: Project,Gross Margin,Бруто маржа
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Молимо унесите прво Производња пункт
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Обрачуната банка Биланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,искључени корисник
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Понуда
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Понуда
 DocType: Quotation,QTN-,КТН-
 DocType: Salary Slip,Total Deduction,Укупно Одбитак
 ,Production Analytics,Продуцтион analitika
@@ -2056,9 +2057,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Упозорење: Неважећи сертификат ССЛ на везаности {0}
 DocType: Student Admission,Eligibility,квалификованост
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Леадс вам помоћи да посао, додати све своје контакте и још као своје трагове"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Леадс вам помоћи да посао, додати све своје контакте и још као своје трагове"
 DocType: Production Order Operation,Actual Operation Time,Стварна Операција време
 DocType: Authorization Rule,Applicable To (User),Важећи Да (Корисник)
 DocType: Purchase Taxes and Charges,Deduct,Одбити
@@ -2073,7 +2074,7 @@
 DocType: Guardian,Work Address,rad Адреса
 DocType: Appraisal,Calculate Total Score,Израчунајте Укупна оцена
 DocType: Request for Quotation,Manufacturing Manager,Производња директор
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серийный номер {0} находится на гарантии ДО {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Сплит Напомена Испорука у пакетима.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Пошиљке
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Стање на рачуну ({0}) за {1} анд трговина вриједности ({2}) фор складиште {3} Мора бити исти
@@ -2096,10 +2097,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Напомена: Е-маил неће бити послат са инвалидитетом корисницима
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број Интерацтион
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Број Интерацтион
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Изаберите фирму ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Изаберите фирму ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Оставите празно ако се сматра за сва одељења
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Виды занятости (постоянная , контракт, стажер и т.д. ) ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} является обязательным для п. {1}
 DocType: Process Payroll,Fortnightly,четрнаестодневни
 DocType: Currency Exchange,From Currency,Од валутног
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Молимо Вас да изаберете издвајају, Тип фактуре и број фактуре у атлеаст једном реду"
@@ -2108,14 +2109,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Стопа (Друштво валута)
 DocType: Student Guardian,Others,другие
 DocType: Payment Entry,Unallocated Amount,Неалоцирано Износ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Не могу да нађем ставку која се подудара. Молимо Вас да одаберете неку другу вредност за {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Нема више ажурирања
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Невозможно выбрать тип заряда , как «О предыдущего ряда Сумма » или « О предыдущего ряда Всего 'для первой строки"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Дете артикла не би требало да буде Бундле производа. Молимо Вас да уклоните ставку `{0} &#39;и сачувати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,банкарство
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додај тимесхеетс
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додај тимесхеетс
 DocType: Vehicle Service,Service Item,сервис артикла
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
 DocType: Bank Guarantee,Bank Guarantee,Банкарска гаранција
@@ -2141,6 +2142,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Ред # {0}: имовине {1} је већ {2}
 DocType: Quotation Item,Stock Balance,Берза Биланс
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Продаја Налог за плаћања
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Молимо поставите Именовање Сериес за {0} подешавањем&gt; Сеттингс&gt; Именовање Сериес
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,Директор
 DocType: Expense Claim Detail,Expense Claim Detail,Расходи потраживање Детаљ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Молимо изаберите исправан рачун
@@ -2165,14 +2167,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Цене неће бити приказан ако Ценовник није подешен
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Наведите земљу за ову Схиппинг правило или проверите ворлдвиде схиппинг
 DocType: Stock Entry,Total Incoming Value,Укупна вредност Долазни
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебитна Да је потребно
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебитна Да је потребно
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Тимесхеетс лакше пратили времена, трошкова и рачуна за АКТИВНОСТИ урадио ваш тим"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Куповина Ценовник
 DocType: Offer Letter Term,Offer Term,Понуда Рок
 DocType: Quality Inspection,Quality Manager,Руководилац квалитета
 DocType: Job Applicant,Job Opening,Посао Отварање
 DocType: Payment Reconciliation,Payment Reconciliation,Плаћање Помирење
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Пожалуйста, выберите имя InCharge Лица"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,технологија
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Укупно Неплаћени: {0}
 DocType: BOM Website Operation,BOM Website Operation,БОМ Сајт Операција
@@ -2200,23 +2202,23 @@
 DocType: Opportunity,Lost Reason,Лост Разлог
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Величина узорка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Молимо унесите документ о пријему
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Све ставке су већ фактурисано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Молимо унесите документ о пријему
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Даље трошкова центри могу да буду под групама, али уноса можете извршити над несрпским групама"
 DocType: Project,External,Спољни
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Корисници и дозволе
 DocType: Vehicle Log,VLOG.,ВЛОГ.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Производни Поруџбине Креирано: {0}
 DocType: Branch,Branch,Филијала
 DocType: Guardian,Mobile Number,Број мобилног телефона
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Печать и брендинг
 DocType: Bin,Actual Quantity,Стварна Количина
 DocType: Shipping Rule,example: Next Day Shipping,Пример: Нект Даи Схиппинг
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серијски број {0} није пронађен
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серијски број {0} није пронађен
 DocType: Scheduling Tool,Student Batch,студент партије
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваши Купци
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Маке Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Маке Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Позвани сте да сарађују на пројекту: {0}
 DocType: Leave Block List Date,Block Date,Блоцк Дате
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Пријавите се
@@ -2240,8 +2242,9 @@
 DocType: SMS Log,Sent To,Послат
 DocType: Payment Request,Make Sales Invoice,Маке Салес фактура
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Програми
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Следећа контакт Датум не могу бити у прошлости
 DocType: Company,For Reference Only.,За справки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Избор серијски бр
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Неважећи {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,ПИНВ-РЕТ-
 DocType: Sales Invoice Advance,Advance Amount,Унапред Износ
@@ -2255,7 +2258,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Предмет бр не може бити 0
 DocType: Item,Show a slideshow at the top of the page,Приказивање слајдова на врху странице
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,БОМ
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазины
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазины
 DocType: Serial No,Delivery Time,Време испоруке
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Старење Басед Он
 DocType: Item,End of Life,Крај живота
@@ -2267,12 +2270,12 @@
 DocType: Rename Tool,Rename Tool,Преименовање Тоол
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Ажурирање Трошкови
 DocType: Item Reorder,Item Reorder,Предмет Реордер
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Схов плата Слип
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Пренос материјала
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Схов плата Слип
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Пренос материјала
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Наведите операције , оперативне трошкове и дају јединствену операцију без своје пословање ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Овај документ је преко границе од {0} {1} за ставку {4}. Правиш други {3} против исте {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Молимо поставите понављају након снимања
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Избор промена износ рачуна
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Молимо поставите понављају након снимања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Избор промена износ рачуна
 DocType: Purchase Invoice,Price List Currency,Ценовник валута
 DocType: Naming Series,User must always select,Корисник мора увек изабрати
 DocType: Stock Settings,Allow Negative Stock,Дозволи Негативно Стоцк
@@ -2283,7 +2286,7 @@
 DocType: Budget Account,Budget Account,буџета рачуна
 DocType: Quality Inspection,Verified By,Верифиед би
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Невозможно изменить Базовая валюта компании , потому что есть существующие операции . Сделки должны быть отменены , чтобы поменять валюту ."
-DocType: Grade Interval,Grade Description,граде Опис
+DocType: Grading Scale Interval,Grade Description,граде Опис
 DocType: Stock Entry,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,Направи Слип платама
@@ -2321,7 +2324,7 @@
 DocType: Upload Attendance,Attendance To Date,Присуство Дате
 DocType: Warranty Claim,Raised By,Подигао
 DocType: Payment Gateway Account,Payment Account,Плаћање рачуна
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Наведите компанија наставити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Наведите компанија наставити
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Нето Промена Потраживања
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсационные Выкл
 DocType: Offer Letter,Accepted,Примљен
@@ -2330,12 +2333,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Молимо проверите да ли сте заиста желите да избришете све трансакције за ову компанију. Ваши основни подаци ће остати како јесте. Ова акција се не може поништити.
 DocType: Room,Room Number,Број собе
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Неважећи референца {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може бити већи од планираног куанитити ({2}) у производњи Низ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) не може бити већи од планираног куанитити ({2}) у производњи Низ {3}
 DocType: Shipping Rule,Shipping Rule Label,Достава Правило Лабел
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Корисник форум
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировине не може бити празан.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Брзо Јоурнал Ентри
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Није могуће ажурирати залихе, фактура садржи испоруку ставку дроп."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Брзо Јоурнал Ентри
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Не можете променити стопу ако бом помиње агианст било које ставке
 DocType: Employee,Previous Work Experience,Претходно радно искуство
 DocType: Stock Entry,For Quantity,За Количина
@@ -2348,7 +2351,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Услови и Цондитионс1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Име института за коју се постављање овог система.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Рачуноводствени унос замрзнуте до овог датума, нико не може / изменити унос осим улоге доле наведеном."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Сачувајте документ пре генерисања план одржавања
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус пројекта
 DocType: UOM,Check this to disallow fractions. (for Nos),Проверите то тако да одбаци фракција. (За НОС)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Следећи производних налога су створени:
@@ -2375,7 +2378,7 @@
 ,Employees working on a holiday,Запослени који раде на одмор
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Марко Садашња
 DocType: Project,% Complete Method,% Комплетна Метод
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Техническое обслуживание дата не может быть до даты доставки для Serial No {0}
 DocType: Production Order,Actual End Date,Сунце Датум завршетка
 DocType: BOM,Operating Cost (Company Currency),Оперативни трошкови (Фирма валута)
 DocType: Purchase Invoice,PINV-,ПИНВ-
@@ -2392,7 +2395,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Оставите без плате се не слаже са одобреним подацима одсуство примене
 DocType: Campaign,Campaign-.####,Кампания - . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Следећи кораци
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Молимо вас да доставите одређене ставке на најбољи могући стопама
 DocType: Selling Settings,Auto close Opportunity after 15 days,Ауто затварање Могућност након 15 дана
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,До краја године
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Куот / Олово%
@@ -2450,7 +2453,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Рецд Количина
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Накнада Записи Цреатед - {0}
 DocType: Asset Category Account,Asset Category Account,Средство Категорија налог
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете производить больше элемент {0} , чем количество продаж Заказать {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Сток Ступање {0} не поднесе
 DocType: Payment Reconciliation,Bank / Cash Account,Банка / готовински рачун
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Следећа контактирати путем не може бити исто као водећи Емаил Аддресс
@@ -2472,7 +2475,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Клиренс Дата не упоминается
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,производња
 DocType: Guardian,Occupation,занимање
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ред {0} : Датум почетка мора да буде пре крајњег датума
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Укупно (ком)
 DocType: Sales Invoice,This Document,Овај документ
 DocType: Installation Note Item,Installed Qty,Инсталирани Кол
@@ -2488,15 +2492,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Пријави грешку
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Коммунальные расходы
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Изнад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: Јоурнал Ентри {1} нема налог {2} или већ упарен против другог ваучера
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Ред # {0}: Јоурнал Ентри {1} нема налог {2} или већ упарен против другог ваучера
 DocType: Buying Settings,Default Buying Price List,Уобичајено Куповина Ценовник
 DocType: Process Payroll,Salary Slip Based on Timesheet,Плата Слип основу ТимеСхеет
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Ни један запослени за горе одабране критеријуме или листић плата већ креирана
 DocType: Notification Control,Sales Order Message,Продаја Наручите порука
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Установить значения по умолчанию , как Болгарии, Валюта , текущий финансовый год и т.д."
 DocType: Payment Entry,Payment Type,Плаћање Тип
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Изаберите Батцх за тачке {0}. Није могуће пронаћи једну групу која испуњава овај услов
 DocType: Process Payroll,Select Employees,Изаберите Запослени
 DocType: Opportunity,Potential Sales Deal,Потенцијални Продаја Деал
 DocType: Payment Entry,Cheque/Reference Date,Чек / Референтни датум
@@ -2513,7 +2517,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобална ПОС Профил {0} Већ је направљена за компанију {1}
 DocType: Purchase Order,Ref SQ,Реф СК
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Замените Итем / бом у свим БОМс
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Потврда мора бити достављен
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Потврда мора бити достављен
 DocType: Purchase Invoice Item,Received Qty,Примљени Кол
 DocType: Stock Entry Detail,Serial No / Batch,Серијски бр / Серије
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не Паид и није испоручена
@@ -2522,11 +2526,11 @@
 DocType: Delivery Note,DN-RET-,ДН-РЕТ-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Но Тиме листова
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Оставите Типе {0} не може носити-прослеђен
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"График обслуживания не генерируется для всех элементов . Пожалуйста, нажмите на кнопку "" Generate Расписание """
 ,To Produce,за производњу
 apps/erpnext/erpnext/config/hr.py +93,Payroll,платни списак
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","За редом {0} у {1}. Да бисте укључили {2} У тачки стопе, редови {3} морају бити укључени"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Маке корисника
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Маке корисника
 DocType: Packing Slip,Identification of the package for the delivery (for print),Идентификација пакета за испоруку (за штампу)
 DocType: Bin,Reserved Quantity,Резервисани Количина
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Унесите исправну е-маил адресу
@@ -2540,15 +2544,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Онемогућен шаблон не мора да буде подразумевани шаблон
 DocType: Account,Income Account,Приходи рачуна
 DocType: Payment Request,Amount in customer's currency,Износ у валути купца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Испорука
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Испорука
 DocType: Stock Reconciliation Item,Current Qty,Тренутни ком
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Погледајте &quot;стопа материјала на бази&quot; у Цостинг одељак
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,прев
 DocType: Appraisal Goal,Key Responsibility Area,Кључна Одговорност Површина
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студент Пакети помоћи да пратите посећеност, процене и накнаде за студенте"
 DocType: Payment Entry,Total Allocated Amount,Укупно издвајају
 DocType: Item Reorder,Material Request Type,Материјал Врста Захтева
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Аццурал Јоурнал Ентри за плате од {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Локалну меморију је пуна, није сачувао"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Локалну меморију је пуна, није сачувао"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ред {0}: УОМ фактор конверзије је обавезна
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Реф
 DocType: Budget,Cost Center,Трошкови центар
@@ -2558,16 +2563,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Хиде Так ИД клијента је од продајне трансакције
 DocType: Upload Attendance,Upload HTML,Уплоад ХТМЛ
 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.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Правилник о ценама је направљен да замени Ценовник / дефинисати попуст проценат, на основу неких критеријума."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Складиште може да се промени само преко Сток Улаз / Испорука Напомена / рачуном
 DocType: Employee Education,Class / Percentage,Класа / Проценат
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Шеф маркетинга и продаје
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Ако изабрана Правилник о ценама је направљен за '' Прице, он ће преписати Ценовник. Правилник о ценама цена је коначна цена, тако да би требало да се примени даље попуст. Стога, у трансакцијама као што продаје Реда, наруџбину итд, то ће бити продата у ""рате"" терену, а не области 'Ценовник рате'."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Ако изабрана Правилник о ценама је направљен за '' Прице, он ће преписати Ценовник. Правилник о ценама цена је коначна цена, тако да би требало да се примени даље попуст. Стога, у трансакцијама као што продаје Реда, наруџбину итд, то ће бити продата у ""рате"" терену, а не области 'Ценовник рате'."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Стаза води од индустрије Типе .
 DocType: Item Supplier,Item Supplier,Ставка Снабдевач
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Унесите Шифра добити пакет не
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Пожалуйста, выберите значение для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Све адресе.
 DocType: Company,Stock Settings,Стоцк Подешавања
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Спајање је могуће само ако следеће особине су исти у оба записа. Да ли је група, корен тип, Компанија"
@@ -2577,6 +2582,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Ће послати е-маил о догађају запосленима са статусом &quot;Отворени&quot;
 DocType: Task,Depends on Tasks,Зависи од Задаци
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управление групповой клиентов дерево .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Прилози могу бити приказана без омогућавање колица
 DocType: Supplier Quotation,SQTN-,СКТН-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Нови Трошкови Центар Име
 DocType: Leave Control Panel,Leave Control Panel,Оставите Цонтрол Панел
@@ -2589,12 +2595,10 @@
 DocType: Sales Invoice,Debit To,Дебитна Да
 DocType: Delivery Note,Required only for sample item.,Потребно само за узорак ставку.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Стварна Кол Након трансакције
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Добављач&gt; добављач Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Нема плата клизање налази између {0} и {1}
 ,Pending SO Items For Purchase Request,Чекању СО Артикли за куповину захтеву
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Студент Пријемни
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} је онемогућен
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} је онемогућен
 DocType: Supplier,Billing Currency,Обрачун Валута
 DocType: Sales Invoice,SINV-RET-,СИНВ-РЕТ-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Екстра велики
@@ -2611,9 +2615,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Страница Представљамо производа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Све процене Групе
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Нови Магацин Име
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Укупно {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Укупно {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територија
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Пожалуйста, укажите кол-во посещений , необходимых"
 DocType: Stock Settings,Default Valuation Method,Уобичајено Процена Метод
 DocType: Vehicle Log,Fuel Qty,Гориво ком
 DocType: Production Order Operation,Planned Start Time,Планирано Почетак Време
@@ -2629,7 +2633,7 @@
 DocType: Price List,Price List Master,Ценовник Мастер
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Све продаје Трансакције се могу означена против више лица ** ** Продаја тако да можете подесити и пратити циљеве.
 ,S.O. No.,С.О. Не.
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Пожалуйста, создайте Клиента от свинца {0}"
 DocType: Price List,Applicable for Countries,Важи за земље
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Остави само Апликације које имају статус &quot;Одобрено&quot; и &quot;Одбијен&quot; могу се доставити
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студент Име групе је обавезно у реду {0}
@@ -2673,7 +2677,7 @@
 DocType: Project,Copied From,копиран из
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Име грешка: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,мањак
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} није повезана са {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} није повезана са {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Посещаемость за работника {0} уже отмечен
 DocType: Packing Slip,If more than one package of the same type (for print),Ако више од једног пакета истог типа (за штампу)
 ,Salary Register,плата Регистрација
@@ -2692,7 +2696,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Користи се за Корпа
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Вредност {0} за атрибут {1} не постоји у листи важећег тачке вредности атрибута за тачком {2}
 DocType: BOM Item,Scrap %,Отпад%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Оптужбе ће бити дистрибуиран пропорционално на основу тачка Количина или износа, по вашем избору"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Оптужбе ће бити дистрибуиран пропорционално на основу тачка Количина или износа, по вашем избору"
 DocType: Maintenance Visit,Purposes,Сврхе
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Барем једна ставка треба унети у негативном количином у повратном документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операција {0} дуже него што је било на располагању радног времена у станици {1}, разбити операцију у више операција"
@@ -2713,16 +2717,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управление Территория дерево .
 DocType: Journal Entry Account,Sales Invoice,Продаја Рачун
 DocType: Journal Entry Account,Party Balance,Парти Стање
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Молимо одаберите Аппли попуста на
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Молимо одаберите Аппли попуста на
 DocType: Company,Default Receivable Account,Уобичајено потраживања рачуна
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Направи Банк, улаз за укупне плате исплаћене за горе изабране критеријуме"
 DocType: Stock Entry,Material Transfer for Manufacture,Пренос материјала за Производња
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Проценат може да се примени било против ценовнику или за све Ценовником.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Попуст Проценат може да се примени било против ценовнику или за све Ценовником.
 DocType: Purchase Invoice,Half-yearly,Полугодишње
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Рачуноводство Ентри за Деонице
 DocType: Vehicle Service,Engine Oil,Моторно уље
 DocType: Sales Invoice,Sales Team1,Продаја Теам1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не существует
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не существует
 DocType: Sales Invoice,Customer Address,Кориснички Адреса
 DocType: Employee Loan,Loan Details,kredit Детаљи
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Ред {0}: Завршен количина мора бити већа од нуле.
@@ -2730,24 +2734,24 @@
 DocType: Account,Root Type,Корен Тип
 DocType: Item,FIFO,"ФИФО,"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Ред # {0}: Не могу да се врате више од {1} за тачком {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,заплет
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,заплет
 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}
 DocType: Cheque Print Template,Primary Settings,primarni Подешавања
 DocType: Purchase Invoice,Select Supplier Address,Избор добављача Адреса
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Додај Запослени
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Додај Запослени
 DocType: Purchase Invoice Item,Quality Inspection,Провера квалитета
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Ектра Смалл
 DocType: Company,Standard Template,стандард Шаблон
 DocType: Training Event,Theory,теорија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Упозорење : Материјал Тражени Кол је мање од Минимална количина за поручивање
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Счет {0} заморожен
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Правно лице / Подружница са посебном контном припада организацији.
 DocType: Payment Request,Mute Email,Муте-маил
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Храна , пиће и дуван"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Може само извршити уплату против ненаплаћене {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Скорость Комиссия не может быть больше, чем 100"
 DocType: Stock Entry,Subcontract,Подуговор
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Молимо Вас да унесете {0} прво
@@ -2787,7 +2791,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Складишта са постојећим трансакцији не може бити конвертована у групу.
 DocType: Assessment Result Tool,Result HTML,rezultat ХТМЛ-
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Истиче
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додај Студенти
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додај Студенти
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Пожалуйста, выберите {0}"
 DocType: C-Form,C-Form No,Ц-Образац бр
 DocType: BOM,Exploded_items,Екплодед_итемс
@@ -2830,7 +2834,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Амт
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Изаберите Фискална година
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Реордер Ниво
 DocType: Company,Chart Of Accounts Template,Контни план Темплате
 DocType: Attendance,Attendance Date,Гледалаца Датум
@@ -2845,14 +2849,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дупликат унос
 DocType: Program Enrollment Tool,Get Students,Гет Студенти
 DocType: Serial No,Under Warranty,Под гаранцијом
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Грешка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Грешка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,У речи ће бити видљив када сачувате продајних налога.
 ,Employee Birthday,Запослени Рођендан
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Студент партије Присуство Алат
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,лимит Цроссед
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Вентуре Цапитал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Академски назив са овим &#39;школској&#39; {0} и &#39;Рок име&#39; {1} већ постоји. Молимо Вас да измените ове ставке и покушајте поново.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Као што постоје постоје трансакције против ставку {0}, не може да промени вредност {1}"
 DocType: UOM,Must be Whole Number,Мора да буде цео број
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нове Лишће Издвојена (у данима)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серийный номер {0} не существует
@@ -2872,7 +2876,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% Материјала наплаћени против овог налога за продају
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Затварање период Ступање
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,МВЗ с существующими сделок не могут быть преобразованы в группе
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Износ {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Износ {0} {1} {2} {3}
 DocType: Account,Depreciation,амортизация
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Супплиер (с)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Запослени Присуство Алат
@@ -2896,7 +2900,7 @@
 DocType: Supplier,Last Day of the Next Month,Последњи дан наредног мјесеца
 DocType: Support Settings,Auto close Issue after 7 days,Ауто затварање издање након 7 дана
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Оставите не може се доделити пре {0}, као одсуство стање је већ Царри-прослеђен у будућем расподеле одсуство записника {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Напомена: Због / Референтни Датум прелази дозвољене кредитним купац дана од {0} дана (и)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Подносилац
 DocType: Asset Category Account,Accumulated Depreciation Account,Исправка вриједности рачуна
 DocType: Stock Settings,Freeze Stock Entries,Фреезе уносе берза
@@ -2907,7 +2911,7 @@
 ,Stock Analytics,Стоцк Аналитика
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Операције не може остати празно
 DocType: Maintenance Visit Purpose,Against Document Detail No,Против докумената детаља Нема
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Парти Тип је обавезно
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Парти Тип је обавезно
 DocType: Quality Inspection,Outgoing,Друштвен
 DocType: Material Request,Requested For,Тражени За
 DocType: Quotation Item,Against Doctype,Против ДОЦТИПЕ
@@ -2924,11 +2928,11 @@
 DocType: Asset,Item Code,Шифра
 DocType: Production Planning Tool,Create Production Orders,Креирање налога Производне
 DocType: Serial No,Warranty / AMC Details,Гаранција / АМЦ Детаљи
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Изаберите студенти ручно активности заснива Групе
 DocType: Journal Entry,User Remark,Корисник Напомена
 DocType: Lead,Market Segment,Сегмент тржишта
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Плаћени износ не може бити већи од укупног негативног преостали износ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Запослени Интерна Рад Историја
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Затварање (др)
 DocType: Cheque Print Template,Cheque Size,Чек величина
@@ -2944,7 +2948,7 @@
 DocType: Production Planning Tool,Create Material Requests,Креирате захтеве Материјал
 DocType: Employee Education,School/University,Школа / Универзитет
 DocType: Payment Request,Reference Details,Референтна Детаљи
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очекује Вредност Након користан живот мора бити мања од бруто набавне Износ
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступно Кол у складишту
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Изграђена Износ
 DocType: Asset,Double Declining Balance,Доубле дегресивне
@@ -2965,20 +2969,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Разлика Рачун мора бити тип активом / одговорношћу рачуна, јер Сток Помирење је отварање Ступање"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Исплаћено износ не може бити већи од кредита Износ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Число Заказ требуется для Пункт {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Производња Поруџбина није направљена
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Производња Поруџбина није направљена
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Од датума"" мора бити након ""До датума"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Не могу да променим статус студента {0} је повезан са применом студентског {1}
 DocType: Asset,Fully Depreciated,потпуно отписаних
 ,Stock Projected Qty,Пројектовани Стоцк Кти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Клиент {0} не принадлежит к проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Приметан Присуство ХТМЛ
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Цитати су предлози, понуде које сте послали да својим клијентима"
 DocType: Sales Order,Customer's Purchase Order,Куповина нарудзбини
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серијски број и партије
 DocType: Warranty Claim,From Company,Из компаније
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Збир Сцорес мерила за оцењивање треба да буде {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Вредност или Кол
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Молимо поставите Број Амортизација Жути картони
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Вредност или Кол
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продуцтионс Налози не може да се подигне за:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,минут
 DocType: Purchase Invoice,Purchase Taxes and Charges,Куповина Порези и накнаде
@@ -2991,7 +2995,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,sve складишта
 DocType: Sales Partner,Retailer,Продавац на мало
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Кредит на рачун мора да буде биланса стања
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Сви Типови добављача
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Сви Типови добављача
 DocType: Global Defaults,Disable In Words,Онемогућити У Вордс
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Код товара является обязательным, поскольку Деталь не автоматически нумеруются"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Цитата {0} не типа {1}
@@ -3000,6 +3004,7 @@
 DocType: Production Order,PRO-,ПРО-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Банк Овердрафт счета
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Маке плата Слип
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Ред # {0}: Додељени износ не може бити већи од преостали износ.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Бровсе БОМ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Обеспеченные кредиты
 DocType: Purchase Invoice,Edit Posting Date and Time,Едит Књижење Датум и време
@@ -3039,7 +3044,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Није дозвољено да ажурирате акција трансакције старије од {0}
 DocType: Purchase Invoice Item,PR Detail,ПР Детаљ
 DocType: Sales Order,Fully Billed,Потпуно Изграђена
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Молимо поставите подразумевани се плаћа рачун у запосленом {0}
 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 +127,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),Бруто тежина пакета. Обично нето тежина + амбалаже тежина. (За штампу)
@@ -3050,7 +3054,7 @@
 DocType: Student Group,Group Based On,Групу на основу
 DocType: Journal Entry,Bill Date,Бил Датум
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Сервис артикла, тип, учесталост и износ трошак су потребни"
-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:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Чак и ако постоји више Цене правила са највишим приоритетом, онда следећи интерни приоритети се примењују:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Да ли заиста желите да доставе све понуди испасти из {0} до {1}
 DocType: Cheque Print Template,Cheque Height,Чек Висина
 DocType: Supplier,Supplier Details,Добављачи Детаљи
@@ -3062,7 +3066,7 @@
 DocType: Vehicle Log,Invoice Ref,фактура Реф
 DocType: Purchase Order,Recurring Order,Понављало Ордер
 DocType: Company,Default Income Account,Уобичајено прихода Рачун
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Кориснички Група / Кориснички
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Кориснички Група / Кориснички
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Унцлосед фискалне године Добитак / Губитак (кредит)
 DocType: Sales Invoice,Time Sheets,Тиме листови
 DocType: Payment Gateway Account,Default Payment Request Message,Уобичајено Плаћање Упит Порука
@@ -3082,10 +3086,10 @@
 DocType: Notification Control,Quotation Message,Цитат Порука
 DocType: Employee Loan,Employee Loan Application,Запослени Захтев за кредит
 DocType: Issue,Opening Date,Датум отварања
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Присуство је успешно обележен.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Присуство је успешно обележен.
 DocType: Journal Entry,Remark,Примедба
 DocType: Purchase Receipt Item,Rate and Amount,Стопа и износ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Тип рачун за {0} мора бити {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Тип рачун за {0} мора бити {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Лишће и одмор
 DocType: School Settings,Current Academic Term,Тренутни академски Рок
 DocType: Sales Order,Not Billed,Није Изграђена
@@ -3107,7 +3111,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,студент Група
 DocType: Shopping Cart Settings,Quotation Series,Цитат Серија
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Элемент существует с тем же именем ({0} ) , пожалуйста, измените название группы или переименовать пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Молимо одаберите клијента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Молимо одаберите клијента
 DocType: C-Form,I,ја
 DocType: Company,Asset Depreciation Cost Center,Средство Амортизација Трошкови центар
 DocType: Sales Order Item,Sales Order Date,Продаја Датум поруџбине
@@ -3126,20 +3130,20 @@
 DocType: Vehicle,Insurance Details,осигурање Детаљи
 DocType: Account,Payable,к оплате
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Молимо Вас да унесете отплате Периоди
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Дужници ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Дужници ({0})
 DocType: Pricing Rule,Margin,Маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нове Купци
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Бруто добит%
 DocType: Appraisal Goal,Weightage (%),Веигхтаге (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Чишћење Датум
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Бруто Куповина Износ је обавезан
 DocType: Lead,Address Desc,Адреса Десц
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Парти је обавезно
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Парти је обавезно
 DocType: Journal Entry,JV-,ЈВ-
 DocType: Topic,Topic Name,Назив теме
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Барем један од продајете или купујете морају бити изабрани
-DocType: Grading Structure,Grade Intervals,Граде Интервали
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Изаберите природу вашег посла.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Ред # {0}: Дуплицате ентри референци {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Где се обавља производњу операције.
 DocType: Asset Movement,Source Warehouse,Извор Магацин
 DocType: Installation Note,Installation Date,Инсталација Датум
@@ -3176,7 +3180,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Письмо главы для шаблонов печати .
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Титулы для шаблонов печатных например Фактуры Proforma .
 DocType: Student Guardian,Student Guardian,студент Гардијан
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Тип Процена трошкови не могу означити као инцлусиве
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 ."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,БОМ курс
@@ -3204,7 +3208,7 @@
 DocType: Company,Exchange Gain / Loss Account,Курсне / успеха
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Запослени и Присуство
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Цель должна быть одна из {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Попуните формулар и да га сачувате
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Стварна количина на лагеру
@@ -3220,7 +3224,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Реордер ком
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Цуррент Јоб Опенингс
 DocType: Company,Stock Adjustment Account,Стоцк Подешавање налога
-DocType: Journal Entry,Write Off,Отписати
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Отписати
 DocType: Timesheet Detail,Operation 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}
@@ -3231,27 +3235,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Добављач доставља клијенту
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Облик / тачка / {0}) није у складишту
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Следећа Датум мора бити већи од датума када је послата
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Покажи пореза распада
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Покажи пореза распада
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Због / Референтна Датум не може бити после {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Подаци Увоз и извоз
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Сток уноса постоје против Варехоусе {0}, стога не можете поново доделити или модификовати"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Ниједан студент Фоунд
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Ниједан студент Фоунд
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Фактура датум постања
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,продати
 DocType: Sales Invoice,Rounded Total,Роундед Укупно
 DocType: Product Bundle,List items that form the package.,Листа ствари које чине пакет.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Процент Распределение должно быть равно 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Молимо одаберите датум постања пре избора Парти
 DocType: Program Enrollment,School House,Школа Кућа
 DocType: Serial No,Out of AMC,Од АМЦ
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Молимо одаберите Куотатионс
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Молимо одаберите Куотатионс
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Маке одржавање Посетите
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Молимо одаберите Куотатионс
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,"Број Амортизација жути картон, не може бити већи од Укупан број Амортизација"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Маке одржавање Посетите
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Молимо контактирајте кориснику који је продаја Мастер менаџер {0} улогу
 DocType: Company,Default Cash Account,Уобичајено готовински рачун
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компания ( не клиента или поставщика ) хозяин.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Ово је засновано на похађања овог Студент
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Но Ученици у
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додали још ставки или Опен пуној форми
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Пожалуйста, введите ' ожидаемой даты поставки """
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Примечания Доставка {0} должно быть отменено до отмены этого заказ клиента
@@ -3283,6 +3288,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Тачка 3
 DocType: Purchase Order,Customer Contact Email,Кориснички Контакт Е-маил
 DocType: Warranty Claim,Item and Warranty Details,Ставка и гаранције Детаљи
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код итем&gt; итем Група&gt; Бренд
 DocType: Sales Team,Contribution (%),Учешће (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примечание: Оплата Вступление не будет создана , так как "" Наличные или Банковский счет "" не был указан"
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Изаберите програм да преузима обавезне курсеве.
@@ -3298,9 +3304,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Пре помирења
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Да {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Порези и накнаде додавања (Друштво валута)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Налоговый ряд {0} должен иметь учетную запись типа налога или доходов или расходов или платная
 DocType: Sales Order,Partly Billed,Делимично Изграђена
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Итем {0} мора бити основних средстава итем
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Итем {0} мора бити основних средстава итем
 DocType: Item,Default BOM,Уобичајено БОМ
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Молимо Вас да поново тип цомпани наме да потврди
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Укупно Изванредна Амт
@@ -3310,8 +3316,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,аутомобилски
 DocType: Vehicle,Insurance Company,Осигурање
 DocType: Asset Category Account,Fixed Asset Account,Основних средстава налог
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,варијабла
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Из доставница
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,варијабла
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Из доставница
 DocType: Student,Student Email Address,Студент-маил адреса
 DocType: Timesheet Detail,From Time,Од времена
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,На лагеру:
@@ -3323,12 +3329,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Цена курсној листи
 DocType: Purchase Invoice Item,Rate,Стопа
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,стажиста
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адреса Име
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Адреса Име
 DocType: Stock Entry,From BOM,Од БОМ
 DocType: Assessment Code,Assessment Code,Процена код
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,основной
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Сток трансакције пре {0} су замрзнути
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Пожалуйста, нажмите на кнопку "" Generate Расписание """
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","нпр Кг, Јединица, Нос, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Ссылка № является обязательным, если вы ввели Исходной дате"
 DocType: Bank Reconciliation Detail,Payment Document,dokument плаћање
@@ -3336,19 +3342,19 @@
 DocType: Salary Slip,Salary Structure,Плата Структура
 DocType: Account,Bank,Банка
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ваздушна линија
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Питање Материјал
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Питање Материјал
 DocType: Material Request Item,For Warehouse,За Варехоусе
 DocType: Employee,Offer Date,Понуда Датум
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Цитати
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Ви сте у оффлине моду. Нећете моћи да поново све док имате мрежу.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Нема Студент Групе створио.
 DocType: Purchase Invoice Item,Serial No,Серијски број
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Месечна отплата износ не може бити већи од кредита Износ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Пожалуйста, введите Maintaince Подробности"
 DocType: Purchase Invoice,Print Language,принт Језик
 DocType: Salary Slip,Total Working Hours,Укупно Радно време
 DocType: Stock Entry,Including items for sub assemblies,Укључујући ставке за под скупштине
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Унесите вредност мора бити позитивна
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Унесите вредност мора бити позитивна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Все территории
 DocType: Purchase Invoice,Items,Артикли
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент је већ уписано.
@@ -3368,17 +3374,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Уобичајено Јединица мере за варијанту &#39;{0}&#39; мора бити исти као у темплате &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Израчунајте Басед Он
 DocType: Delivery Note Item,From Warehouse,Од Варехоусе
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Но Предмети са саставница у Производња
 DocType: Assessment Plan,Supervisor Name,Супервизор Име
 DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
 DocType: Program Enrollment Course,Program Enrollment Course,Програм Упис предмета
-DocType: Grading Structure,Grading Structure,градинг Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Вредновање и Тотал
 DocType: Tax Rule,Shipping City,Достава Град
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,Ово артикла је варијанта {0} (Темплате). Атрибути ће бити копирани са шаблона осим 'Нема Копирање' постављено
 DocType: Notification Control,Customize the Notification,Прилагођавање обавештења
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Новчани ток из пословања
 DocType: Sales Invoice,Shipping Rule,Достава Правило
@@ -3399,8 +3403,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Нет умолчанию спецификации не существует Пункт {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Молимо Вас да изаберете датум постања први
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Молимо Вас да изаберете датум постања први
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Датум отварања треба да буде пре затварања Дате
 DocType: Leave Control Panel,Carry Forward,Пренети
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,МВЗ с существующими сделок не могут быть преобразованы в книге
 DocType: Department,Days for which Holidays are blocked for this department.,Дани за које Празници су блокирани овом одељењу.
@@ -3413,7 +3417,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Прикрепите бланке
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последњи Комуникација
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Последњи Комуникација
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете вычесть , когда категория для "" Оценка "" или "" Оценка и Всего"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Утакмица плаћања са фактурама
@@ -3429,7 +3433,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Укупно (Амт)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Забава и слободно време
 DocType: Quality Inspection,Item Serial No,Ставка Сериал но
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Створити запослених Рецордс
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Створити запослених Рецордс
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Укупно Поклон
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,рачуноводствених исказа
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,час
@@ -3442,10 +3446,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Непознат
 DocType: Shipping Rule,Shipping Rule Conditions,Правило услови испоруке
 DocType: BOM Replace Tool,The new BOM after replacement,Нови БОМ након замене
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Поинт оф Сале
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Поинт оф Сале
 DocType: Payment Entry,Received Amount,примљени износ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Молим вас запослених подешавање Именовање систем у људских ресурса&gt; људских ресурса Сеттингс
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Створити за пуну количину, игноришући количину већ би"
 DocType: Account,Tax,Порез
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,необележен
@@ -3458,9 +3460,9 @@
 DocType: Batch,Source Document Name,Извор Име документа
 DocType: Batch,Source Document Name,Извор Име документа
 DocType: Job Opening,Job Title,Звање
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,створити корисника
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,створити корисника
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Количина да Производња мора бити већи од 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Посетите извештаја за одржавање разговора.
 DocType: Stock Entry,Update Rate and Availability,Ажурирање курс и доступност
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Проценат вам је дозвољено да примају или испоручи више од количине наредио. На пример: Ако сте наредили 100 јединица. и ваш додатак је 10% онда вам је дозвољено да примају 110 јединица.
@@ -3470,28 +3472,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Расходов счета является обязательным для пункта {0}
 DocType: BOM,Website Description,Вебсајт Опис
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Нето промена у капиталу
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Откажите фактури {0} први
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Е-маил адреса мора бити јединствена, већ постоји за {0}"
 DocType: Serial No,AMC Expiry Date,АМЦ Датум истека
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Признаница
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Признаница
 ,Sales Register,Продаја Регистрација
 DocType: Daily Work Summary Settings Company,Send Emails At,Шаљу мејлове на
 DocType: Quotation,Quotation Lost Reason,Понуда Лост разлог
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Изаберите Ваш домен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Трансакција референца не {0} од {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Не постоји ништа да измените .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Преглед за овај месец и чекају активности
 DocType: Customer Group,Customer Group Name,Кориснички Назив групе
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Но Купци иет!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Извештај о токовима готовине
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Износ кредита не може бити већи од максимални износ кредита {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,лиценца
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},Молимо вас да уклоните ову фактуру {0} од Ц-Форм {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,"Пожалуйста, введите списать счет"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Последњи Низ Датум
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рачун {0} не припада компанији {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серијски бројеви у низу {0} не поклапа са Деливери Ноте
 DocType: Student,Guardian Details,гуардиан Детаљи
 DocType: C-Form,C-Form,Ц-Форм
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк Присуство за више радника
@@ -3516,20 +3520,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Ред {0} # Рачун мора бити типа &#39;основним средствима&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Од Кол
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила за израчунавање износа испоруке за продају
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серия является обязательным
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серия является обязательным
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Финансијске услуге
 DocType: Student Sibling,Student ID,студентска
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Врсте активности за време Логс
 DocType: Tax Rule,Sales,Продајни
 DocType: Stock Entry Detail,Basic Amount,Основни Износ
 DocType: Training Event,Exam,испит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Склад требуется для складе Пункт {0}
 DocType: Leave Allocation,Unused leaves,Неискоришћени листови
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Кр
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Кр
 DocType: Tax Rule,Billing State,Тецх Стате
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Пренос
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} није повезана са Парти налог {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} није повезана са Парти налог {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Фетцх експлодирала бом ( укључујући подсклопова )
 DocType: Authorization Rule,Applicable To (Employee),Важећи Да (запослених)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Дуе Дате обавезна
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Повећање за Аттрибуте {0} не може бити 0
@@ -3540,13 +3544,13 @@
 ,Inactive Customers,неактивни Купци
 DocType: Landed Cost Voucher,LCV,ЛЦВ
 DocType: Landed Cost Voucher,Purchase Receipts,Куповина Примици
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Како се примењује Правилник о ценама?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Како се примењује Правилник о ценама?
 DocType: Stock Entry,Delivery Note No,Испорука Напомена Не
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Ако је означено, само куповину материјала захтева за коначних сировине ће бити укључени у материјалу захтевима. У супротном, створиће се Материјал Захтеви за матичне ставке"
 DocType: Cheque Print Template,Message to show,Порука схов
 DocType: Company,Retail,Малопродаја
 DocType: Attendance,Absent,Одсутан
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Производ Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Производ Бундле
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ред {0}: Погрешна референца {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Купите порези и таксе Темплате
 DocType: Upload Attendance,Download Template,Преузмите шаблон
@@ -3556,10 +3560,10 @@
 DocType: Payment Entry,Account Paid From,Рачун Паид Од
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Сировина Шифра
 DocType: Journal Entry,Write Off Based On,Отпис Басед Он
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Маке Леад
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Маке Леад
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Принт и Папирна
 DocType: Stock Settings,Show Barcode Field,Схов Баркод Поље
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Пошаљи Супплиер Емаилс
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Пошаљи Супплиер Емаилс
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Плата већ обрађени за период од {0} и {1}, Оставите период апликација не може бити између овај период."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Инсталација рекорд за серијским бр
 DocType: Guardian Interest,Guardian Interest,гуардиан камата
@@ -3572,6 +3576,7 @@
 DocType: Offer Letter,Awaiting Response,Очекујем одговор
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Горе
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Неважећи атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Поменули да нестандардни плаћа рачун
 DocType: Salary Slip,Earning & Deduction,Зарада и дедукције
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Опционо . Ова поставка ће се користити за филтрирање у различитим трансакцијама .
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Негативно Вредновање курс није дозвољен
@@ -3587,10 +3592,9 @@
 DocType: Production Order Item,Production Order Item,Производња наруџбини купца
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Нема података фоунд
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Трошкови укинуо Ассет
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Делимично ордред
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Трошкови Центар је обавезан за пункт {2}
 DocType: Vehicle,Policy No,politika Нема
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Гет ставки из производа Бундле
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Гет ставки из производа Бундле
 DocType: Asset,Straight Line,Права линија
 DocType: Project User,Project User,projekat Корисник
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Разделити
@@ -3608,7 +3612,7 @@
 DocType: Program Enrollment Tool,Get Students From,Гет студенти из
 DocType: Hub Settings,Seller Country,Продавац Земља
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Објављивање ставке на сајту
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група ваши ученици у серијама
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група ваши ученици у серијама
 DocType: Authorization Rule,Authorization Rule,Овлашћење Правило
 DocType: Sales Invoice,Terms and Conditions Details,Услови Детаљи
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,технические условия
@@ -3661,14 +3665,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Чек Датум
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Рачун {0}: {1 Родитељ рачун} не припада компанији: {2}
 DocType: Program Enrollment Tool,Student Applicants,Студент Кандидати
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,Успешно избрисали све трансакције везане за ову компанију!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Као и на датум
 DocType: Appraisal,HR,ХР
 DocType: Program Enrollment,Enrollment Date,upis Датум
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,пробни рад
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,плата компоненте
 DocType: Program Enrollment Tool,New Academic Year,Нова школска година
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Повратак / одобрењу кредита
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Повратак / одобрењу кредита
 DocType: Stock Settings,Auto insert Price List rate if missing,Аутоматско уметак Ценовник стопа ако недостаје
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Укупно Плаћени износ
 DocType: Production Order Item,Transferred Qty,Пренето Кти
@@ -3688,7 +3692,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип листова као што су повремене, болесне итд"
 DocType: Email Digest,Send regular summary reports via Email.,Пошаљи редовне збирне извештаје путем е-маил.
 DocType: Payment Entry,PE-,ПЕ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Молимо поставите подразумевани рачун у Расходи Цлаим тип {0}
 DocType: Assessment Result,Student Name,Име студента
 DocType: Brand,Item Manager,Тачка директор
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,паиролл оплате
@@ -3709,6 +3713,7 @@
 ,Sales Funnel,Продаја Левак
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Држава је обавезна
 DocType: Project,Task Progress,zadatak Напредак
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Колица
 ,Qty to Transfer,Количина за трансфер
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Цитати на води или клијената.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Улога дозвољено да мењате замрзнуте залихе
@@ -3736,13 +3741,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрый Налоговый Подробно
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Институт држава
 ,Item-wise Price List Rate,Ставка - мудар Ценовник курс
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Снабдевач Понуда
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Снабдевач Понуда
 DocType: Quotation,In Words will be visible once you save the Quotation.,У речи ће бити видљив када сачувате цитат.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Количина ({0}) не може бити део у низу {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,таксе
 DocType: Attendance,ATT-,АТТ-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрих {0} уже используется в пункте {1}
 DocType: Lead,Add to calendar on this date,Додај у календар овог датума
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для добавления стоимости доставки .
 DocType: Item,Opening Stock,otvaranje Сток
@@ -3760,8 +3765,8 @@
  ажурирано преко 'Време Приступи'"
 DocType: Customer,From Lead,Од Леад
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Поруџбине пуштен за производњу.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Изаберите Фискална година ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Изаберите Фискална година ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,ПОС Профил потребно да ПОС Ентри
 DocType: Program Enrollment Tool,Enroll Students,упис студената
 DocType: Hub Settings,Name Token,Име токен
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандардна Продаја
@@ -3772,7 +3777,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} против продаје фактуре {1}
 DocType: Sales Invoice,SINV-,СИНВ-
 DocType: Request for Quotation Item,Project Name,Назив пројекта
-DocType: Supplier,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
+DocType: Customer,Mention if non-standard receivable account,Спомените ако нестандардни потраживања рачуна
 DocType: Journal Entry Account,If Income or Expense,Ако прихода или расхода
 DocType: Production Order,Required Items,тражених ставки
 DocType: Stock Ledger Entry,Stock Value Difference,Вредност акције Разлика
@@ -3793,7 +3798,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Поставите циљеве ставку Групе мудро ову особу продаје.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],"Морозильники Акции старше, чем [ дней ]"
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Ред # {0}: имовине је обавезан за фиксни средстава куповине / продаје
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Ако два или више Цене Правила су пронадјени на основу горе наведеним условима, Приоритет се примењује. Приоритет је број између 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.,Дозволи следеће корисницима да одобри Апликације оставити за блок дана.
@@ -3819,7 +3824,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Пункт {0} игнорируется, так как это не складские позиции"
 DocType: Appraisal,APRSL,АПРСЛ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","Да не примењује Правилник о ценама у одређеном трансакцијом, све важеће Цене Правила би требало да буде онемогућен."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Да не примењује Правилник о ценама у одређеном трансакцијом, све важеће Цене Правила би требало да буде онемогућен."
 DocType: Assessment Group,Parent Assessment Group,Родитељ Процена Група
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,Послови
 ,Sales Order Trends,Продажи Заказать Тенденции
@@ -3830,7 +3835,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додатни трошак
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Финансовый год Дата окончания
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Не можете да филтрирате на основу ваучер Не , ако груписани по ваучер"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Направи понуду добављача
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Направи понуду добављача
 DocType: Quality Inspection,Incoming,Долазни
 DocType: BOM,Materials Required (Exploded),Материјали Обавезно (Екплодед)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додај корисника у вашој организацији, осим себе"
@@ -3858,6 +3863,7 @@
 DocType: Employee,History In Company,Историја У друштву
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Билтен
 DocType: Stock Ledger Entry,Stock Ledger Entry,Берза Леџер Ентри
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Кориснички&gt; Кориснички Група&gt; Територија
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Исто ставка је ушла више пута
 DocType: Department,Leave Block List,Оставите Блоцк Лист
 DocType: Sales Invoice,Tax ID,ПИБ
@@ -3867,7 +3873,7 @@
 DocType: Customer,Sales Partner and Commission,Продаја партнера и Комисија
 DocType: Employee Loan,Rate of Interest (%) / Year,Каматна стопа (%) / Иеар
 ,Project Quantity,projekat Количина
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Укупно {0} за све ставке је нула, може бити требало би да промените &#39;Распоредите пријава по&#39;"
 DocType: Opportunity,To Discuss,Да Дисцусс
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} јединице {1} потребна {2} довршите ову трансакцију.
 DocType: Loan Type,Rate of Interest (%) Yearly,Каматна стопа (%) Годишња
@@ -3882,7 +3888,7 @@
 DocType: Purchase Invoice,Return,Повратак
 DocType: Production Order Operation,Production Order Operation,Производња Ордер Операција
 DocType: Pricing Rule,Disable,запрещать
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Начин плаћања је обавезан да изврши уплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Начин плаћања је обавезан да изврши уплату
 DocType: Project Task,Pending Review,Чека критику
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Средство {0} не може бити укинута, јер је већ {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Укупни расходи Цлаим (преко Екпенсе потраживања)
@@ -3890,11 +3896,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,марк Одсутан
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Ред {0}: Валута у БОМ # {1} треба да буде једнака изабране валуте {2}
 DocType: Journal Entry Account,Exchange Rate,Курс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Заказ на продажу {0} не представлено
 DocType: Homepage,Tag Line,таг линија
 DocType: Fee Component,Fee Component,naknada Компонента
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управљање возним парком
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Адд ставке из
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Адд ставке из
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Магацин {0}: {1 Родитељ рачун} не Болонг предузећу {2}
 DocType: Cheque Print Template,Regular,редован
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Укупно Веигхтаге свих критеријума процене мора бити 100%
@@ -3907,7 +3913,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Магацин {0} не постоји
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Регистер За ЕРПНект Хуб
 DocType: Monthly Distribution,Monthly Distribution Percentages,Месечни Дистрибуција Проценти
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Изабрана опција не може имати Батцх
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Изабрана опција не може имати Батцх
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Процена стопа није пронађен за тачком {0}, која је потребна да уради рачуноводствене ставке за {1} {2}. Ако је ставка трансакцијама као ставка узорка у {1}, молимо вас да поменете да је у {1} табели тачка. У супротном, молимо вас да створи долазни стоцк трансакцију за стопу процене тачка или поменути у записнику јединице, а затим покушајте достављање / отказивања тхис ентри"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% испоручених материјала на основу ове Отпремнице
 DocType: Project,Customer Details,Кориснички Детаљи
@@ -3916,15 +3922,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Унесите УРЛ параметар за пријемник бр
 DocType: Payment Entry,Paid Amount,Плаћени Износ
 DocType: Assessment Plan,Supervisor,надзорник
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,мрежи
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,мрежи
 ,Available Stock for Packing Items,На располагању лагер за паковање ставке
 DocType: Item Variant,Item Variant,Итем Варијанта
 DocType: Assessment Result Tool,Assessment Result Tool,Алат Резултат процена
 DocType: BOM Scrap Item,BOM Scrap Item,БОМ отпад артикла
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Достављени налози се не могу избрисати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Достављени налози се не могу избрисати
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Управљање квалитетом
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Итем {0} је онемогућен
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Итем {0} је онемогућен
 DocType: Employee Loan,Repay Fixed Amount per Period,Отплатити фиксан износ по периоду
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Пожалуйста, введите количество для Пункт {0}"
 DocType: Employee External Work History,Employee External Work History,Запослени Спољни Рад Историја
@@ -3950,7 +3956,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Студент-маил ИД
 DocType: Employee,Notice (days),Обавештење ( дана )
 DocType: Tax Rule,Sales Tax Template,Порез на промет Шаблон
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Изабрали ставке да спасе фактуру
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Изабрали ставке да спасе фактуру
 DocType: Employee,Encashment Date,Датум Енцасхмент
 DocType: Training Event,Internet,Интернет
 DocType: Account,Stock Adjustment,Фото со Регулировка
@@ -3973,7 +3979,7 @@
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Наведите из / у распону
 DocType: Serial No,Under AMC,Под АМЦ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Ставка вредновање стопа израчунава обзиром слетео трошкова ваучера износ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Ставка вредновање стопа израчунава обзиром слетео трошкова ваучера износ
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Настройки по умолчанию для продажи сделок .
 DocType: Guardian,Guardian Of ,čuvar
 DocType: Grading Scale Interval,Threshold,праг
@@ -3983,6 +3989,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Задужењу Издато
 DocType: Production Order,Warehouses,Складишта
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} имовина не може се пренети
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Ова ставка је варијанта {0} (Темплате).
 DocType: Workstation,per hour,на сат
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Куповина
 DocType: Announcement,Announcement,објава
@@ -3998,8 +4005,8 @@
 DocType: Account,Receivable,Дебиторская задолженность
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ред # {0}: Није дозвољено да промени снабдевача као Пурцхасе Ордер већ постоји
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Улога која је дозвољено да поднесе трансакције које превазилазе кредитне лимите.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Изабери ставке у Производња
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Изабери ставке у Производња
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Основни подаци синхронизације, то би могло да потраје"
 DocType: Item,Material Issue,Материјал Издање
 DocType: Hub Settings,Seller Description,Продавац Опис
 DocType: Employee Education,Qualification,Квалификација
@@ -4011,7 +4018,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ж
 DocType: Salary Detail,Component,Саставни део
 DocType: Assessment Criteria,Assessment Criteria Group,Критеријуми за процену Група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Отварање акумулирана амортизација мора бити мањи од једнак {0}
 DocType: Warehouse,Warehouse Name,Магацин Име
 DocType: Naming Series,Select Transaction,Изаберите трансакцију
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Пожалуйста, введите утверждении роли или утверждении Пользователь"
@@ -4024,7 +4031,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Нельзя отменить , потому что представляется со Вступление {0} существует"
 DocType: Employee Loan,Disbursement Date,isplata Датум
 DocType: Vehicle,Vehicle,Возило
 DocType: Purchase Invoice,In Words,У Вордс
@@ -4039,14 +4046,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Опп / Олово%
 DocType: Material Request,MREQ-,МРЕК-
 ,Asset Depreciations and Balances,Средстава Амортизација и ваге
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Износ {0} {1} је прешао из {2} у {3}
 DocType: Sales Invoice,Get Advances Received,Гет аванси
 DocType: Email Digest,Add/Remove Recipients,Адд / Ремове прималаца
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Сделка не допускается в отношении остановил производство ордена {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Да бисте подесили ову фискалну годину , као подразумевајуће , кликните на "" Сет ас Дефаулт '"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Придружити
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Мањак Количина
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Тачка варијанта {0} постоји са истим атрибутима
 DocType: Employee Loan,Repay from Salary,Отплатити од плате
 DocType: Leave Application,LAP/,ЛАП /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Тражећи исплату од {0} {1} за износ {2}
@@ -4064,7 +4071,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Процена резултата Детаљ
 DocType: Employee Education,Employee Education,Запослени Образовање
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Дупликат ставка група наћи у табели тачка групе
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Потребно је да се донесе Сведениа.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} уже получил
@@ -4073,7 +4080,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Магацин {0} није повезан на било који рачун, креирајте / Линк одговарајући (актива) налог за складиште."
 DocType: Purchase Invoice,Recurring Id,Понављајући Ид
 DocType: Customer,Sales Team Details,Продајни тим Детаљи
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Обриши трајно?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Обриши трајно?
 DocType: Expense Claim,Total Claimed Amount,Укупан износ полаже
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенцијалне могућности за продају.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Неважећи {0}
@@ -4084,13 +4091,14 @@
 DocType: Warehouse,PIN,ПИН-
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Подесите школа у ЕРПНект
 DocType: Sales Invoice,Base Change Amount (Company Currency),База Промена Износ (Фирма валута)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Нет учетной записи для следующих складов
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,Последњи Наручи Количина
+DocType: Task,Is Milestone,Да ли је МОТО
 DocType: Daily Work Summary,Email Sent To,Емаил Сент То
 DocType: Budget,Warn,Упозорити
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Било који други примедбе, напоменути напор који треба да иде у евиденцији."
@@ -4111,7 +4119,7 @@
 DocType: Item Attribute Value,Attribute Value,Вредност атрибута
 ,Itemwise Recommended Reorder Level,Препоручени ниво Итемвисе Реордер
 DocType: Salary Detail,Salary Detail,плата Детаљ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Изаберите {0} први
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Изаберите {0} први
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Батцх {0} од тачке {1} је истекао.
 DocType: Sales Invoice,Commission,комисија
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Време лист за производњу.
@@ -4123,41 +4131,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"""Замрзни акције старије од"" треба да буде мање од %d дана."
 DocType: Tax Rule,Purchase Tax Template,Порез на промет Темплате
 ,Project wise Stock Tracking,Пројекат мудар Праћење залиха
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},График обслуживания {0} существует против {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Стварни Кол (на извору / циљне)
 DocType: Item Customer Detail,Ref Code,Реф Код
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Запослених евиденција.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Молимо поставите Нект амортизације од
 DocType: HR Settings,Payroll Settings,Платне Подешавања
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Матцх нису повезане фактурама и уплатама.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Извршите поруџбину
 DocType: Email Digest,New Purchase Orders,Нове наруџбеницама
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Корен не може имати центар родитеља трошкова
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Изабери Марка ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Изабери Марка ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Акумулирана амортизација као на
 DocType: Sales Invoice,C-Form Applicable,Ц-примењује
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Операција време мора бити већи од 0 за операцију {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Складиште је обавезно
 DocType: Supplier,Address and Contacts,Адреса и контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,УОМ Конверзија Детаљ
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Држите га веб пријатељски 900пк ( В ) од 100пк ( х )
 DocType: Program,Program Abbreviation,програм држава
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Производња поредак не може бити подигнута против тачка Темплате
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Оптужбе се ажурирају у рачуном против сваке ставке
 DocType: Warranty Claim,Resolved By,Решен
 DocType: Bank Guarantee,Start Date,Датум почетка
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Выделите листья на определенный срок.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Чекови и депозити погрешно ситуацију
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Рачун {0}: Не може да се доделити као родитељ налог
 DocType: Purchase Invoice Item,Price List Rate,Ценовник Оцени
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Створити цитате купаца
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Створити цитате купаца
 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 +38,Bill of Materials (BOM),Саставнице (БОМ)
 DocType: Item,Average time taken by the supplier to deliver,Просечно време које је добављач за испоруку
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Процена резултата
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Радно време
 DocType: Project,Expected Start Date,Очекивани датум почетка
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Уклоните ставку ако оптужбе се не примењује на ту ставку
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Нпр. смсгатеваи.цом / апи / сенд_смс.цги
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Трансакција валуте мора бити исти као паимент гатеваи валуте
 DocType: Payment Entry,Receive,Пријем
@@ -4168,19 +4175,19 @@
 DocType: Workstation,Operating Costs,Оперативни трошкови
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Акција ако целокупна месечна буџет Екцеедед
 DocType: Purchase Invoice,Submit on creation,Пошаљи на стварању
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Валута за {0} мора бити {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Валута за {0} мора бити {1}
 DocType: Asset,Disposal Date,odlaganje Датум
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Емаилс ће бити послат свим активних радника компаније у датом сат времена, ако немају одмора. Сажетак одговора ће бити послат у поноћ."
 DocType: Employee Leave Approver,Employee Leave Approver,Запослени одсуство одобраватељ
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ров {0}: Унос Прераспоређивање већ постоји у овој магацин {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не могу прогласити као изгубљен , јер Понуда је учињен ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,обука Контакт
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Производственный заказ {0} должны быть представлены
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Пожалуйста, выберите дату начала и дату окончания Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Наравно обавезна је у реду {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,До данас не може бити раније од датума
 DocType: Supplier Quotation Item,Prevdoc DocType,Превдоц ДОЦТИПЕ
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додај / измени Прицес
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додај / измени Прицес
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Batch,Parent Batch,родитељ Серија
 DocType: Cheque Print Template,Cheque Print Template,Чек Штампа Шаблон
@@ -4194,7 +4201,7 @@
 ,Ordered Items To Be Delivered,Ж Ставке да буде испоручена
 DocType: Account,Income,доход
 DocType: Industry Type,Industry Type,Индустрија Тип
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Нешто није у реду!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Нешто није у реду!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Упозорење: Оставите пријава садржи следеће датуме блок
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Счет Продажи {0} уже представлен
 DocType: Assessment Result Detail,Score,скор
@@ -4225,17 +4232,17 @@
 DocType: Item,Variant Based On,Варијанту засновану на
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всего Weightage назначен должна быть 100% . Это {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваши Добављачи
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Не можете поставити као Лост као Продаја Наручите је направљен .
 DocType: Request for Quotation Item,Supplier Part No,Добављач Део Бр
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Primio od
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',не могу одбити када категорија је за &quot;процену вредности&quot; или &quot;Ваулатион и Тотал &#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Primio od
 DocType: Lead,Converted,Претворено
 DocType: Item,Has Serial No,Има Серијски број
 DocType: Employee,Date of Issue,Датум издавања
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Од {0} {1} за
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Од {0} {1} за
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ред # {0}: Сет добављача за ставку {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Ред {0}: Сати вредност мора бити већа од нуле.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Сајт Слика {0} везани са тачком {1} не могу наћи
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Наведи ову ставку у више група на сајту.
@@ -4244,20 +4251,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Нисте овлашћени да подесите вредност Фрозен
 DocType: Payment Reconciliation,Get Unreconciled Entries,Гет неусаглашених уносе
 DocType: Payment Reconciliation,From Invoice Date,Од Датум рачуна
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,"валута наплате мора бити једнака валути или странка рачуна валути било једног, било дефаулт цомапани је"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Оставите уновчења
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Шта он ради ?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Да Варехоусе
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Све Студент Пријемни
 ,Average Commission Rate,Просечан курс Комисија
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Има серијски број"" не може бити ""Да"" за артикл који није на залихама"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Гледалаца не може бити означен за будуће датуме
 DocType: Pricing Rule,Pricing Rule Help,Правилник о ценама Помоћ
 DocType: School House,House Name,хоусе Име
 DocType: Purchase Taxes and Charges,Account Head,Рачун шеф
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Упдате додатне трошкове да израчуна слетео трошак ставке
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,электрический
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Додајте остатак свог организације као своје кориснике. Такође можете да додате позвати купце да вашем порталу тако да их додају из контаката
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Додајте остатак свог организације као своје кориснике. Такође можете да додате позвати купце да вашем порталу тако да их додају из контаката
 DocType: Stock Entry,Total Value Difference (Out - In),Укупна вредност Разлика (Оут - Ин)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4266,7 +4273,7 @@
 DocType: Item,Customer Code,Кориснички Код
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Подсетник за рођендан за {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дана Од Последња Наручи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебитна на рачун мора да буде биланса стања
 DocType: Buying Settings,Naming Series,Именовање Сериес
 DocType: Leave Block List,Leave Block List Name,Оставите Име листу блокираних
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Осигурање Датум почетка треба да буде мања од осигурања Енд дате
@@ -4281,9 +4288,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Плата Слип запосленог {0} већ креиран за време стања {1}
 DocType: Vehicle Log,Odometer,мерач за пређени пут
 DocType: Sales Order Item,Ordered Qty,Ж Кол
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Ставка {0} је онемогућен
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Ставка {0} је онемогућен
 DocType: Stock Settings,Stock Frozen Upto,Берза Фрозен Упто
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,БОМ не садржи никакву стоцк итем
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Период од периода до датума и обавезних се понављају {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Пројекат активност / задатак.
 DocType: Vehicle Log,Refuelling Details,Рефуеллинг Детаљи
@@ -4293,8 +4300,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Последња куповина стопа није пронађен
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Отпис Износ (Фирма валута)
 DocType: Sales Invoice Timesheet,Billing Hours,обрачун сат
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Уобичајено БОМ за {0} није пронађен
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Ред # {0}: Молим вас сет количину преусмеравање
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Додирните ставке да их додати
 DocType: Fees,Program Enrollment,програм Упис
 DocType: Landed Cost Voucher,Landed Cost Voucher,Слетео Трошкови Ваучер
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Пожалуйста, установите {0}"
@@ -4318,7 +4326,7 @@
 DocType: Maintenance Visit,Maintenance Date,Одржавање Датум
 DocType: Purchase Invoice Item,Rejected Serial No,Одбијен Серијски број
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Године датум почетка или датум завршетка се преклапа са {0}. Да бисте избегли молим поставили компанију
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Дата начала должна быть меньше даты окончания для Пункт {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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.","Пример:. АБЦД ##### 
  Ако Радња је смештена и серијски број се не помиње у трансакцијама, онда аутоматски серијски број ће бити креирана на основу ове серије. Ако сте одувек желели да помиње експлицитно Сериал Нос за ову ставку. оставите празно."
@@ -4395,7 +4403,6 @@
 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,Оглас крст од предмета на више група
-DocType: Grade Interval,Grade Interval,граде интервал
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Фискална година Датум почетка и фискалну годину Датум завршетка су већ постављена у фискалној {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Цлеаранце Датум ажуриран
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,подела Серија
@@ -4441,14 +4448,14 @@
 DocType: Bin,Reserved Qty for Production,Резервисан Кти за производњу
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Остави неконтролисано ако не желите да размотри серије правећи курса на бази групе.
 DocType: Asset,Frequency of Depreciation (Months),Учесталост амортизације (месеци)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Кредитни рачун
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Кредитни рачун
 DocType: Landed Cost Item,Landed Cost Item,Слетео Цена артикла
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Схов нула вредности
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Количина тачке добија након производњи / препакивање од датих количине сировина
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Подешавање једноставан сајт за своју организацију
 DocType: Payment Reconciliation,Receivable / Payable Account,Примања / обавезе налог
 DocType: Delivery Note Item,Against Sales Order Item,Против продаје Ордер тачком
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Наведите Вредност атрибута за атрибут {0}
 DocType: Item,Default Warehouse,Уобичајено Магацин
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Буџет не може бити додељен против групе рачуна {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Пожалуйста, введите МВЗ родительский"
@@ -4493,7 +4500,7 @@
 DocType: Opportunity Item,Basic Rate,Основна стопа
 DocType: GL Entry,Credit Amount,Износ кредита
 DocType: Cheque Print Template,Signatory Position,potpisnik Позиција
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Постави као Лост
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Постави као Лост
 DocType: Timesheet,Total Billable Hours,Укупно наплативе сат
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Плаћање Пријем Напомена
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Ово је засновано на трансакције против овог клијента. Погледајте рок доле за детаље
@@ -4507,11 +4514,11 @@
 ,Items To Be Requested,Артикли бити затражено
 DocType: Purchase Order,Get Last Purchase Rate,Гет Ласт Рате Куповина
 DocType: Company,Company Info,Подаци фирме
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Изабрати или додати новог купца
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Изабрати или додати новог купца
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Трошка је обавезан да резервишете трошковима захтев
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Применение средств ( активов )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Ово је засновано на похађања овог запосленог
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Текући рачуни
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Текући рачуни
 DocType: Fiscal Year,Year Start Date,Датум почетка године
 DocType: Attendance,Employee Name,Запослени Име
 DocType: Sales Invoice,Rounded Total (Company Currency),Заобљени Укупно (Друштво валута)
@@ -4520,13 +4527,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Стоп кориснике од доношења Леаве апликација на наредним данима.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Куповина Количина
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Добављач Понуда {0} је направљена
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,До краја године не може бити пре почетка године
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,До краја године не може бити пре почетка године
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Примања запослених
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Молимо подесите подразумевани Хамптон Лист за запосленог {0} или Фирма {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не постоји
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не постоји
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Рачуни подигао купцима.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Ид пројецт
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Ред Не {0}: Износ не може бити већи од очекивању износ од трошковником потраживања {1}. У очекивању Износ је {2}
@@ -4535,15 +4542,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читање 3
 ,Hub,Средиште
 DocType: GL Entry,Voucher Type,Тип ваучера
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Ценовник није пронађен или онемогућен
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Ценовник није пронађен или онемогућен
 DocType: Employee Loan Application,Approved,Одобрено
 DocType: Pricing Rule,Price,цена
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Сотрудник освобожден от {0} должен быть установлен как "" левые"""
 DocType: Guardian,Guardian,старатељ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оценка {0} создан Требуются {1} в указанный диапазон дат
 DocType: Employee,Education,образовање
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,дел
 DocType: Selling Settings,Campaign Naming By,Кампания Именование По
 DocType: Employee,Current Address Is,Тренутна Адреса Је
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модификовани
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Опција. Поставља подразумевану валуту компаније, ако није наведено."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Рачуноводствене ставке дневника.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступно на ком Од Варехоусе
@@ -4552,7 +4561,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ред {0}: Партија / налог не подудара са {1} / {2} {3} у {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Унесите налог Екпенсе
 DocType: Account,Stock,Залиха
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Ред # {0}: Референца Тип документа мора бити један од нарудзбенице, фактури или Јоурнал Ентри"
 DocType: Employee,Current Address,Тренутна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Ако ставка је варијанта неким другим онда опис, слике, цене, порези итд ће бити постављен из шаблона, осим ако изричито наведено"
 DocType: Serial No,Purchase / Manufacture Details,Куповина / Производња Детаљи
@@ -4580,7 +4589,7 @@
 DocType: Hub Settings,Hub Settings,Хуб Подешавања
 DocType: Project,Gross Margin %,Бруто маржа%
 DocType: BOM,With Operations,Са операције
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Рачуноводствене ставке су већ учињени у валути {0} за компанију {1}. Изаберите обавеза или примања рачун са валутом {0}.
 DocType: Asset,Is Existing Asset,Да ли је постојеће имовине
 DocType: Salary Detail,Statistical Component,Статистички Компонента
 DocType: Salary Detail,Statistical Component,Статистички Компонента
@@ -4605,7 +4614,7 @@
 DocType: Assessment Plan,Room,соба
 DocType: Purchase Order,Advance Paid,Адванце Паид
 DocType: Item,Item Tax,Ставка Пореска
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Материјал за добављача
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Материјал за добављача
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Акцизе фактура
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Тресхолд {0}% појављује више пута
 DocType: Expense Claim,Employees Email Id,Запослени Емаил ИД
@@ -4636,9 +4645,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Прикрепите логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,stock Нивои
 DocType: Customer,Commission Rate,Комисија Оцени
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Маке Вариант
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Маке Вариант
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блок оставите апликације по одељењу.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип уплата мора бити један од Примите, Паи и интерни трансфер"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,аналитика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Корпа је празна
 DocType: Vehicle,Model,модел
@@ -4649,6 +4658,7 @@
 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 +161,Capital Stock,Капитал Сток
+DocType: Shopping Cart Settings,Show Public Attachments,Схов Публиц Прилози
 DocType: Packing Slip,Package Weight Details,Пакет Тежина Детаљи
 DocType: Payment Gateway Account,Payment Gateway Account,Паимент Гатеваи налог
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Након завршетка уплате преусмерава корисника на одабране стране.
@@ -4667,15 +4677,15 @@
 DocType: Batch,Expiry Date,Датум истека
 ,Supplier Addresses and Contacts,Добављач Адресе и контакти
 ,accounts-browser,рачуни-претраживач
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Прво изаберите категорију
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Прво изаберите категорију
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Пројекат господар.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Како би се омогућило над-наплате или преко-наручивања, упдате &quot;Исправка&quot; на лагеру подешавања или тачке."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Не показују као симбол $ итд поред валутама.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Пола дана)
 DocType: Supplier,Credit Days,Кредитни Дана
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Маке Студент Батцх
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Маке Студент Батцх
 DocType: Leave Type,Is Carry Forward,Је напред Царри
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Се ставке из БОМ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Се ставке из БОМ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Олово Дани Тиме
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Ред # {0}: Постављање Дате мора бити исти као и датуму куповине {1} из средстава {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Молимо унесите продајних налога у горњој табели
@@ -4692,8 +4702,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкционисани Износ
 DocType: GL Entry,Is Opening,Да ли Отварање
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ров {0}: Дебит Унос се не може повезати са {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Молимо Вас да подешавање бројева серије за похађање преко Сетуп&gt; нумерисање серија
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 e89fef9..79aec58 100644
--- a/erpnext/translations/sv.csv
+++ b/erpnext/translations/sv.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Hyrda
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Tillämplig för Användare
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Stoppad produktionsorder kan inte återkallas, unstop det första att avbryta"
 DocType: Vehicle Service,Mileage,Miltal
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Vill du verkligen att skrota denna tillgång?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Välj Standard Leverantör
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Välj Standard Leverantör
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Valuta krävs för prislista {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Kommer att beräknas i transaktionen.
 DocType: Purchase Order,Customer Contact,Kundkontakt
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Utstående för {0} kan inte vara mindre än noll ({1})
 DocType: Manufacturing Settings,Default 10 mins,Standard 10 minuter
 DocType: Leave Type,Leave Type Name,Ledighetstyp namn
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Visa öppna
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Visa öppna
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Serie uppdaterats
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Checka ut
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal Entry Inlagd
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch Punkt Utgångs Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bankväxel
 DocType: Mode of Payment Account,Mode of Payment Account,Betalningssätt konto
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Visar varianter
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Visar varianter
 DocType: Academic Term,Academic Term,Akademisk termin
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Material
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Kvantitet
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Kvantitet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Konton tabell kan inte vara tomt.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Lån (skulder)
 DocType: Employee Education,Year of Passing,Passerande År
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referens:% s, punkt kod:% s och Kund:% s"
 DocType: Item,Country of Origin,Ursprungsland
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,I Lager
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,öppna frågor
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sjukvård
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Försenad betalning (dagar)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,tjänsten Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Faktura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Serienummer: {0} är redan refererad i försäljningsfaktura: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Faktura
 DocType: Maintenance Schedule Item,Periodicity,Periodicitet
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Räkenskapsårets {0} krävs
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Förväntat leveransdatum är att innan kundorder Datum
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Bifoga CSV-fil med två kolumner, en för det gamla namnet och en för det nya namnet"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} inte i någon aktiv räkenskapsår.
 DocType: Packed Item,Parent Detail docname,Överordnat Detalj doknamn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referens: {0}, Artikelnummer: {1} och Kund: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Logga
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Öppning för ett jobb.
 DocType: Item Attribute,Increment,Inkrement
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Välj Warehouse ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Välj Warehouse ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklam
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Få objekt från
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Ej tillåtet för {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Få objekt från
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stock kan inte uppdateras mot följesedel {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Produkten {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Inga föremål listade
 DocType: Payment Reconciliation,Reconcile,Avstämma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Matvaror
 DocType: Quality Inspection Reading,Reading 1,Avläsning 1
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Nästa avskrivning Datum kan inte vara före Inköpsdatum
 DocType: SMS Center,All Sales Person,Alla försäljningspersonal
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Månatlig Distribution ** hjälper du distribuerar budgeten / Mål över månader om du har säsongs i din verksamhet.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Inte artiklar hittade
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Inte artiklar hittade
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Lönestruktur saknas
 DocType: Lead,Person Name,Namn
 DocType: Sales Invoice Item,Sales Invoice Item,Fakturan Punkt
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",t.ex. &quot;Primary School&quot; eller &quot;universitet&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,lagerrapporter
 DocType: Warehouse,Warehouse Detail,Lagerdetalj
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kreditgräns har överskridits för kund {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Termen Slutdatum kan inte vara senare än slutet av året Datum för läsåret som termen är kopplad (läsåret {}). Rätta datum och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;Är Fast Asset&quot; kan inte vara okontrollerat, som Asset rekord existerar mot objektet"
 DocType: Vehicle Service,Brake Oil,bromsolja
 DocType: Tax Rule,Tax Type,Skatte Typ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Du har inte behörighet att lägga till eller uppdatera poster före {0}
 DocType: BOM,Item Image (if not slideshow),Produktbild (om inte bildspel)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,En kund finns med samma namn
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Timmar / 60) * Faktisk produktionstid
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Välj BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Välj BOM
 DocType: SMS Log,SMS Log,SMS-logg
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Kostnad levererat gods
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Semester på {0} är inte mellan Från datum och Till datum
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,skolor
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Ingen ledighet rekord hittades för arbetstagare {0} för {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Ange företaget först
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,Välj Företaget först
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Mål på
 DocType: BOM,Total Cost,Total Kostnad
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Fordringsbelopp
 DocType: Employee,Mr,Herr
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Duplicate kundgrupp finns i cutomer grupptabellen
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Leverantör Typ / leverantör
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Leverantör Typ / leverantör
 DocType: Naming Series,Prefix,Prefix
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Förbrukningsartiklar
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Kvalitet
 DocType: Sales Invoice Item,Delivered By Supplier,Levereras av Supplier
 DocType: SMS Center,All Contact,Alla Kontakter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Produktionsorder redan skapats för alla objekt med BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Årslön
 DocType: Daily Work Summary,Daily Work Summary,Dagliga Work Sammandrag
 DocType: Period Closing Voucher,Closing Fiscal Year,Stänger Räkenskapsårets
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} är fryst
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} är fryst
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Välj befintligt företag för att skapa konto
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stock Kostnader
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Välj Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Konteringsanteckning
 DocType: Journal Entry Account,Credit in Company Currency,Kredit i bolaget Valuta
 DocType: Delivery Note,Installation Status,Installationsstatus
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Vill du uppdatera närvaro? <br> Föreliggande: {0} \ <br> Frånvarande: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Godkända + Avvisad Antal måste vara lika med mottagna kvantiteten för punkt {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Leverera råvaror för köp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Minst ett läge av betalning krävs för POS faktura.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Minst ett läge av betalning krävs för POS faktura.
 DocType: Products Settings,Show Products as a List,Visa produkter som en lista
 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"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Göra Av- Entry
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Typ av förfrågan
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,göra Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,göra Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Sändning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Exekvering
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Detaljer om de åtgärder som genomförs.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Planer för underhållsbesök.
 DocType: SMS Settings,Enter url parameter for message,Ange url parameter för meddelande
 DocType: POS Profile,Customer Groups,kundgrupper
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Bokslut
 DocType: Guardian,Students,studenter
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Regler för tillämpning av prissättning och rabatt.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Prislista måste gälla för att köpa eller sälja
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},Advance beloppet kan inte vara större än {0} {1}
 DocType: Naming Series,Series List for this Transaction,Serie Lista för denna transaktion
 DocType: Company,Default Payroll Payable Account,Standard Lön Betal konto
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Uppdatera E-postgrupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Uppdatera E-postgrupp
 DocType: Sales Invoice,Is Opening Entry,Är öppen anteckning
 DocType: Customer Group,Mention if non-standard receivable account applicable,Nämn om icke-standard mottagningskonto tillämpat
 DocType: Course Schedule,Instructor Name,instruktör Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,För Lagerkrävs innan du kan skicka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,För Lagerkrävs innan du kan skicka
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Mottog den
 DocType: Sales Partner,Reseller,Återförsäljare
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Om markerad, kommer att innehålla icke-lager i materialet begäran."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Mot fakturaprodukt
 ,Production Orders in Progress,Aktiva Produktionsordrar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Nettokassaflöde från finansiering
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Localstorage är full, inte spara"
 DocType: Lead,Address & Contact,Adress och kontakt
 DocType: Leave Allocation,Add unused leaves from previous allocations,Lägg oanvända blad från tidigare tilldelningar
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Nästa Återkommande {0} kommer att skapas på {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Totalt Costing Belopp (via Tidrapportering)
 DocType: Item Website Specification,Item Website Specification,Produkt hemsidespecifikation
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lämna Blockerad
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,bankAnteckningar
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Punkt {0} har nått slutet av sin livslängd på {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,bankAnteckningar
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Årlig
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Lager Avstämning Punkt
 DocType: Stock Entry,Sales Invoice No,Försäljning Faktura nr
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Publicera i Hub
 DocType: Student Admission,Student Admission,Student Antagning
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Punkt {0} avbryts
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Materialförfrågan
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Punkt {0} avbryts
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}"
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Utestående checkar och insättningar för att rensa
 DocType: Item,Synced With Hub,Synkroniserad med Hub
 DocType: Vehicle,Fleet Manager,Fleet manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} kan inte vara negativt för produkten {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Fel Lösenord
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Rad # {0}: {1} kan inte vara negativt för produkten {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Fel Lösenord
 DocType: Item,Variant Of,Variant av
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Avslutade Antal kan inte vara större än ""antal för Tillverkning '"
 DocType: Period Closing Voucher,Closing Account Head,Stänger Konto Huvud
 DocType: Employee,External Work History,Extern Arbetserfarenhet
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Cirkelreferens fel
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Meddela via e-post om skapandet av automatisk Material Begäran
 DocType: Journal Entry,Multi Currency,Flera valutor
 DocType: Payment Reconciliation Invoice,Invoice Type,Faktura Typ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Följesedel
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Följesedel
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Ställa in skatter
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Kostnader för sålda Asset
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
-DocType: Grade Interval,Min Score,min Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} inlagd två gånger under punkten Skatt
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Sammanfattning för denna vecka och pågående aktiviteter
 DocType: Student Applicant,Admitted,medgav
 DocType: Workstation,Rent Cost,Hyr Kostnad
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Ordervärde
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Bank / Cash transaktioner mot partiet eller för intern överföring
 DocType: Shipping Rule,Valid for Countries,Gäller för länder
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Denna punkt är en mall och kan inte användas i transaktioner. Punkt attribut kommer att kopieras över till varianterna inte &quot;Nej Kopiera&quot; ställs in
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Den totala order Anses
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Anställd beteckning (t.ex. VD, direktör osv)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ange &quot;Upprepa på Dag i månaden&quot; fältvärde
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Rad # {0}: Inköp Faktura kan inte göras mot en befintlig tillgång {1}
 DocType: Item Tax,Tax Rate,Skattesats
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} som redan tilldelats för anställd {1} för perioden {2} till {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Välj Punkt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Välj Punkt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Inköpsfakturan {0} är redan lämnad
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Rad # {0}: Batch nr måste vara samma som {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Konvertera till icke-gruppen
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Batch (parti) i en punkt.
 DocType: C-Form Invoice Detail,Invoice Date,Fakturadatum
 DocType: GL Entry,Debit Amount,Debit Belopp
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Det kan bara finnas ett konto per Company i {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Se bifogad fil
 DocType: Purchase Order,% Received,% Emot
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Skapa studentgrupper
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Offertförfrågan
 DocType: Salary Slip Timesheet,Working Hours,Arbetstimmar
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Ändra start / aktuella sekvensnumret av en befintlig serie.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Skapa en ny kund
-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.","Om flera prissättningsregler fortsätta att gälla, kan användarna uppmanas att ställa Prioritet manuellt för att lösa konflikten."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Skapa inköpsorder
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Skapa en ny kund
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Om flera prissättningsregler fortsätta att gälla, kan användarna uppmanas att ställa Prioritet manuellt för att lösa konflikten."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Skapa inköpsorder
 ,Purchase Register,Inköpsregistret
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Tillämpliga avgifter
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) måste ha rollen ""Ledighetsgodkännare"""
 DocType: Purchase Receipt,Vehicle Date,Fordons Datum
 DocType: Student Log,Medical,Medicinsk
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Anledning till att förlora
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Anledning till att förlora
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Bly Ägaren kan inte vara densamma som den ledande
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Tilldelade mängden kan inte större än ojusterad belopp
 DocType: Announcement,Receiver,Mottagare
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Kvantitet och betyg
 DocType: Delivery Note,% Installed,% Installerad
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Klassrum / Laboratorier etc där föreläsningar kan schemaläggas.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Ange företagetsnamn först
 DocType: Purchase Invoice,Supplier Name,Leverantörsnamn
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Läs ERPNext Manual
@@ -481,16 +484,17 @@
 DocType: Account,Old Parent,Gammalt mål
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Obligatoriskt fält - Academic Year
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Anpassa inledande text som går som en del av e-postmeddelandet. Varje transaktion har en separat introduktionstext.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Vänligen ange det betalda kontot för företaget {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Globala inställningar för alla tillverkningsprocesser.
 DocType: Accounts Settings,Accounts Frozen Upto,Konton frysta upp till
 DocType: SMS Log,Sent On,Skickas på
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Attribut {0} valda flera gånger i attribut Tabell
 DocType: HR Settings,Employee record is created using selected field. ,Personal register skapas med hjälp av valda fältet.
 DocType: Sales Order,Not Applicable,Inte Tillämpbar
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Semester topp.
 DocType: Request for Quotation Item,Required Date,Obligatorisk Datum
 DocType: Delivery Note,Billing Address,Fakturaadress
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ange Artikelkod.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ange Artikelkod.
 DocType: BOM,Costing,Kostar
 DocType: Tax Rule,Billing County,Billings County
 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"
@@ -506,6 +510,7 @@
 DocType: Packing Slip,From Package No.,Från Paket No.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Värdepapper och inlåning
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Kan inte ändra värderingsmetoden, eftersom det finns transaktioner mot vissa poster som inte har egen värderingsmetod"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Totalt blad tilldelats är obligatorisk
 DocType: Job Opening,Description of a Job Opening,Beskrivning av ett jobb
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,I avvaktan på aktiviteter för dag
@@ -527,13 +532,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Var god välj Kurs
 DocType: Timesheet Detail,Hrs,H
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Välj Företag
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Välj Företag
 DocType: Stock Entry Detail,Difference Account,Differenskonto
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Det går inte att stänga uppgiften då dess huvuduppgift {0} inte är stängd.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Ange vilket lager som Material Begäran kommer att anges mot
 DocType: Production Order,Additional Operating Cost,Ytterligare driftkostnader
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Kosmetika
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"To merge, following properties must be same for both items","För att sammanfoga, måste följande egenskaper vara samma för båda objekten"
 DocType: Shipping Rule,Net Weight,Nettovikt
 DocType: Employee,Emergency Phone,Nödtelefon
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Köpa
@@ -543,7 +548,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Ange grad för tröskelvärdet 0%
 DocType: Sales Order,To Deliver,Att Leverera
 DocType: Purchase Invoice Item,Item,Objekt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Serienummer objekt kan inte vara en bråkdel
 DocType: Journal Entry,Difference (Dr - Cr),Skillnad (Dr - Cr)
 DocType: Account,Profit and Loss,Resultaträkning
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Hantera Underleverantörer
@@ -558,7 +563,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Inkrement kan inte vara 0
 DocType: Production Planning Tool,Material Requirement,Material Krav
 DocType: Company,Delete Company Transactions,Radera Företagstransactions
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referensnummer och referens Datum är obligatorisk för Bank transaktion
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Lägg till / redigera skatter och avgifter
 DocType: Purchase Invoice,Supplier Invoice No,Leverantörsfaktura Nej
 DocType: Territory,For reference,Som referens
@@ -569,7 +574,7 @@
 DocType: Installation Note Item,Installation Note Item,Installeringsnotis objekt
 DocType: Production Plan Item,Pending Qty,Väntar Antal
 DocType: Budget,Ignore,Ignorera
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} är inte aktiv
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} är inte aktiv
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS skickas till följande nummer: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,kryss Setup dimensioner för utskrift
 DocType: Salary Slip,Salary Slip Timesheet,Lön Slip Tidrapport
@@ -578,13 +583,13 @@
 DocType: Sales Invoice,Total Commission,Totalt kommissionen
 DocType: Pricing Rule,Sales Partner,Försäljnings Partner
 DocType: Buying Settings,Purchase Receipt Required,Inköpskvitto Krävs
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Värderings Rate är obligatoriskt om ingående lager in
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Inga träffar i Faktura tabellen
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,Välj Företag och parti typ först
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Budget / räkenskapsåret.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ackumulerade värden
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Skapa kundorder
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Skapa kundorder
 DocType: Project Task,Project Task,Projektuppgift
 ,Lead Id,Prospekt Id
 DocType: C-Form Invoice Detail,Grand Total,Totalsumma
@@ -601,7 +606,7 @@
 DocType: Job Applicant,Resume Attachment,CV Attachment
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Återkommande kunder
 DocType: Leave Control Panel,Allocate,Fördela
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Sales Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Sales Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Obs: Totala antalet allokerade blad {0} inte bör vara mindre än vad som redan har godkänts blad {1} för perioden
 DocType: Announcement,Posted By,Postat av
 DocType: Item,Delivered by Supplier (Drop Ship),Levereras av leverantören (Drop Ship)
@@ -611,7 +616,7 @@
 DocType: Quotation,Quotation To,Offert Till
 DocType: Lead,Middle Income,Medelinkomst
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Öppning (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Avsatt belopp kan inte vara negativ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Vänligen ställ in företaget
 DocType: Purchase Order Item,Billed Amt,Fakturerat ant.
@@ -622,7 +627,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Fakturan Tidrapport
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referensnummer och referens Datum krävs för {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Välj Betalkonto att Bank Entry
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Skapa anställda register för att hantera löv, räkningar och löner"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Lägg till kunskapsbasen
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Förslagsskrivning
 DocType: Payment Entry Deduction,Payment Entry Deduction,Betalning Entry Avdrag
@@ -653,19 +658,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} &quot;inte under räkenskapsåret {2}
 DocType: Buying Settings,Settings for Buying Module,Inställningar för att köpa Modul
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} inte tillhör företaget {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Ange inköpskvitto först
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Ange inköpskvitto först
 DocType: Buying Settings,Supplier Naming By,Leverantör Naming Genom
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +24,Net Change in Inventory,Nettoförändring i Inventory
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Anställd lånehantering
 DocType: Employee,Passport Number,Passnummer
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Relation med Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chef
 DocType: Payment Entry,Payment From / To,Betalning från / till
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Datumintervall
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Nya kreditgränsen är mindre än nuvarande utestående beloppet för kunden. Kreditgräns måste vara minst {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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"
@@ -674,8 +678,8 @@
 DocType: Production Order Operation,In minutes,På några minuter
 DocType: Issue,Resolution Date,Åtgärds Datum
 DocType: Student Batch Name,Batch Name,batch Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Tidrapport skapat:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Tidrapport skapat:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Ställ in standard Kontant eller bankkonto i betalningssätt {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Skriva in
 DocType: Selling Settings,Customer Naming By,Kundnamn på
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Visar eleven som närvarande i Student Monthly Närvaro Rapport
@@ -703,7 +707,7 @@
 DocType: Production Order Operation,Actual Start Time,Faktisk starttid
 DocType: BOM Operation,Operation Time,Drifttid
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Yta
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Bas
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Bas
 DocType: Timesheet,Total Billed Hours,Totalt Fakturerade Timmar
 DocType: Journal Entry,Write Off Amount,Avskrivningsbelopp
 DocType: Journal Entry,Bill No,Fakturanr
@@ -719,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,Student Närvaro
 DocType: Sales Invoice Timesheet,Time Sheet,Tidrapportering
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Återrapportering Råvaror Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Ange produktdetaljer
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Ange produktdetaljer
 DocType: Interest,Interest,Intressera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,pre Sales
 DocType: Purchase Receipt,Other Details,Övriga detaljer
@@ -730,24 +734,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Betalning Entry redan har skapats
 DocType: Purchase Receipt Item Supplied,Current Stock,Nuvarande lager
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Rad # {0}: Asset {1} inte kopplad till punkt {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Förhandsvisning lönebesked
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Förhandsvisning lönebesked
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Konto {0} har angetts flera gånger
 DocType: Account,Expenses Included In Valuation,Kostnader ingår i rapporten
 DocType: Hub Settings,Seller City,Säljaren stad
 ,Absent Student Report,Frånvarorapport Student
 DocType: Email Digest,Next email will be sent on:,Nästa e-post kommer att skickas på:
 DocType: Offer Letter Term,Offer Letter Term,Erbjudande Brev Villkor
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Produkten har varianter.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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/accounts/doctype/account/account.py +26,Company {0} does not exist,existerar inte företag {0}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Tree Typ
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Tree Typ
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Antal konsumeras per Enhet
 DocType: Serial No,Warranty Expiry Date,Garanti Förfallodatum
 DocType: Material Request Item,Quantity and Warehouse,Kvantitet och Lager
 DocType: Sales Invoice,Commission Rate (%),Provisionsandel (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Var god välj Program
 DocType: Project,Estimated Cost,Beräknad kostnad
@@ -766,7 +768,7 @@
 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
 DocType: Payment Entry,Received Amount (Company Currency),Erhållet belopp (Company valuta)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Prospekt måste ställas in om Möjligheten är skapad av Prospekt
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Välj helgdagar
 DocType: 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
@@ -782,6 +784,7 @@
 DocType: Opportunity,Opportunity From,Möjlighet Från
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Månadslön uttalande.
 DocType: BOM,Website Specifications,Webbplats Specifikationer
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Från {0} av typen {1}
 DocType: Warranty Claim,CI-,Cl
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Rad {0}: Omvandlingsfaktor är obligatoriskt
@@ -816,6 +819,7 @@
 DocType: Employee,Bank A/C No.,Bank A / C nr
 DocType: Bank Guarantee,Project,Projekt
 DocType: Quality Inspection Reading,Reading 7,Avläsning 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,delvis Beställde
 DocType: Expense Claim Detail,Expense Claim Type,Räknings Typ
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Standardinställningarna för Varukorgen
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Asset skrotas via Journal Entry {0}
@@ -823,14 +827,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biotechnology
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Kontor underhållskostnader
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Ställa in e-postkonto
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ange Artikel först
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ange Artikel först
 DocType: Account,Liability,Ansvar
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Sanktionerade Belopp kan inte vara större än fordringsbelopp i raden {0}.
 DocType: Company,Default Cost of Goods Sold Account,Standardkostnad Konto Sålda Varor
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Prislista inte valt
 DocType: Employee,Family Background,Familjebakgrund
 DocType: Request for Quotation Supplier,Send Email,Skicka Epost
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Varning: Ogiltig Attachment {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Inget Tillstånd
 DocType: Company,Default Bank Account,Standard bankkonto
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","För att filtrera baserat på partiet, väljer Party Typ först"
@@ -843,7 +847,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Ingen anställd hittades
 DocType: Supplier Quotation,Stopped,Stoppad
 DocType: Item,If subcontracted to a vendor,Om underleverantörer till en leverantör
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Studentgruppen är redan uppdaterad.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Studentgruppen är redan uppdaterad.
 DocType: SMS Center,All Customer Contact,Alla Kundkontakt
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Ladda lagersaldo via csv.
 DocType: Warehouse,Tree Details,Tree Detaljerad information
@@ -854,8 +858,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Minimifakturabelopp
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Kostnadsställe {2} inte tillhör bolaget {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: konto {2} inte kan vara en grupp
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående &quot;{doctype} tabellen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Punkt Row {idx}: {doctype} {doknamn} existerar inte i ovanstående &quot;{doctype} tabellen
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Tidrapport {0} är redan slutförts eller avbrutits
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,Inga uppgifter
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Den dagen i den månad som auto faktura kommer att genereras t.ex. 05, 28 etc"
 DocType: Asset,Opening Accumulated Depreciation,Ingående ackumulerade avskrivningar
@@ -871,7 +875,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} mot räkning {1} daterad {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kursschema
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kursschema
 DocType: Maintenance Visit,Completion Status,Slutförande Status
 DocType: HR Settings,Enter retirement age in years,Ange pensionsåldern i år
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Target Lager
@@ -879,7 +883,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Tillåt överleverans eller mottagande upp till denna procent
 DocType: Stock Entry,STE-,Stefan
 DocType: Upload Attendance,Import Attendance,Import Närvaro
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Alla artikelgrupper
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Alla artikelgrupper
 DocType: Process Payroll,Activity Log,Aktivitets Logg
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Netto Vinst / Förlust
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Komponera meddelandet automatiskt mot uppvisande av transaktioner.
@@ -890,7 +894,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Inköpsorder till betalning
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Projicerad Antal
 DocType: Sales Invoice,Payment Due Date,Förfallodag
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Punkt Variant {0} finns redan med samma attribut
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&quot;Öppna&quot;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Öppna för att göra
 DocType: Notification Control,Delivery Note Message,Följesedel Meddelande
@@ -906,7 +910,7 @@
 DocType: Item Reorder,Re-Order Qty,Återuppta Antal
 DocType: Leave Block List Date,Leave Block List Date,Lämna Blockeringslista Datum
 DocType: Pricing Rule,Price or Discount,Pris eller rabatt
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt tillämpliga avgifter i inköpskvittot Items tabellen måste vara densamma som den totala skatter och avgifter
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Totalt tillämpliga avgifter i inköpskvittot Items tabellen måste vara densamma som den totala skatter och avgifter
 DocType: Sales Team,Incentives,Sporen
 DocType: SMS Log,Requested Numbers,Begärda nummer
 DocType: Production Planning Tool,Only Obtain Raw Materials,Endast Skaffa Råvaror
@@ -935,13 +939,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Är utlagt
 DocType: Item Attribute,Item Attribute Values,Produkt Attribut Värden
 DocType: Examination Result,Examination Result,Examination Resultat
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Inköpskvitto
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Inköpskvitto
 ,Received Items To Be Billed,Mottagna objekt som ska faktureras
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Inlämnade lönebesked
 DocType: Employee,Ms,Fröken
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Valutakurs mästare.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referens Doctype måste vara en av {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referens Doctype måste vara en av {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Det går inte att hitta tidslucka i de närmaste {0} dagar för Operation {1}
 DocType: Production Order,Plan material for sub-assemblies,Planera material för underenheter
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Säljpartners och Territory
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Det går inte att automatiskt skapa konto eftersom det redan finns lagersaldo på kontot. Du måste skapa en matchande konto innan du kan göra en post på det här lagret
@@ -964,10 +968,9 @@
 DocType: Supplier,Default Payable Accounts,Standard avgiftskonton
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Medarbetare {0} är inte aktiv eller existerar inte
 DocType: Fee Structure,Components,Komponenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Produkt Varianter {0} uppdaterad
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ange tillgångsslag i punkt {0}
 DocType: Quality Inspection Reading,Reading 6,Avläsning 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Kan inte {0} {1} {2} utan någon negativ enastående faktura
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Inköpsfakturan Advancerat
 DocType: Hub Settings,Sync Now,Synkronisera nu
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Rad {0}: kreditering kan inte kopplas till en {1}
@@ -981,11 +984,11 @@
 DocType: Item,Is Purchase Item,Är beställningsobjekt
 DocType: Asset,Purchase Invoice,Inköpsfaktura
 DocType: Stock Ledger Entry,Voucher Detail No,Rabatt Detalj nr
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Ny försäljningsfaktura
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Ny försäljningsfaktura
 DocType: Stock Entry,Total Outgoing Value,Totalt Utgående Värde
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Öppningsdatum och Slutdatum bör ligga inom samma räkenskapsår
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Öppningsdatum och Slutdatum bör ligga inom samma räkenskapsår
 DocType: Lead,Request for Information,Begäran om upplysningar
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Synkroniserings Offline fakturor
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Synkroniserings Offline fakturor
 DocType: Payment Request,Paid,Betalats
 DocType: Program Fee,Program Fee,Kurskostnad
 DocType: Salary Slip,Total in words,Totalt i ord
@@ -995,7 +998,7 @@
 DocType: Employee Loan,Sanctioned,sanktionerade
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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""."
 DocType: Job Opening,Publish on website,Publicera på webbplats
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Transporter till kunder.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Leverantörsfakturor Datum kan inte vara större än Publiceringsdatum
@@ -1006,7 +1009,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Varians
 ,Company Name,Företagsnamn
 DocType: SMS Center,Total Message(s),Totalt Meddelande (er)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Välj föremål för Transfer
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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."
@@ -1017,8 +1020,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Standard Bank / Cash konto kommer att uppdateras automatiskt i Lön Journal Entry när detta läge är valt.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Intervallen för Grade kod {0} lappar med betyget intervallen för andra kvaliteter. Vänligen kontrollera intervall {0} och {1} och försök igen
 DocType: BOM,Raw Material Cost(Company Currency),Råvarukostnaden (Företaget valuta)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Alla objekt har redan överförts till denna produktionsorder.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Row # {0}: Priset kan inte vara större än den som används i {1} {2}
@@ -1031,14 +1032,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Website Post
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Ladda upp din brevhuvud och logotyp. (Du kan redigera dem senare).
 DocType: Timesheet Detail,Bill,Räkningen
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Nästa Avskrivningar Datum anges som tidigare datum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Vit
 DocType: SMS Center,All Lead (Open),Alla Ledare (Öppna)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Rad {0}: Antal inte tillgängligt för {4} i lager {1} vid utstationering tidpunkt för angivelsen ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Få utbetalda förskott
 DocType: Item,Automatically Create New Batch,Skapa automatiskt nytt parti
 DocType: Item,Automatically Create New Batch,Skapa automatiskt nytt parti
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Göra
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Göra
 DocType: Student Admission,Admission Start Date,Antagning startdatum
 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.
@@ -1046,7 +1047,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Ange konto för förändring Belopp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Ange konto för förändring Belopp
 DocType: Student Batch Name,Student Batch Name,Elev batchnamn
 DocType: Holiday List,Holiday List Name,Semester Listnamn
 DocType: Repayment Schedule,Balance Loan Amount,Balans Lånebelopp
@@ -1066,10 +1067,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Specificera en {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Borttagna objekt med någon förändring i kvantitet eller värde.
 DocType: Delivery Note,Delivery To,Leverans till
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Attributtabell är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Attributtabell är obligatoriskt
 DocType: Production Planning Tool,Get Sales Orders,Hämta kundorder
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} kan inte vara negativ
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Rabatt
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Rabatt
 DocType: Asset,Total Number of Depreciations,Totalt Antal Avskrivningar
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
 DocType: Sales Invoice Item,Rate With Margin,Betygsätt med marginal
@@ -1085,7 +1086,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Reserverat lager i kundorder / färdigvarulagret
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Försäljningsbelopp
 DocType: Repayment Schedule,Interest Amount,räntebelopp
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Du har ansvar för utgifterna för denna post. Vänligen Uppdatera ""Status"" och spara"
 DocType: Serial No,Creation Document No,Skapande Dokument nr
 DocType: Issue,Issue,Problem
 DocType: Asset,Scrapped,skrotas
@@ -1093,12 +1094,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Egenskaper för produktvarianter. t.ex. storlek, färg etc."
 DocType: Purchase Invoice,Returns,avkastning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Lager
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Löpnummer {0} är under underhållsavtal upp {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,Rekrytering
 DocType: Lead,Organization Name,Organisationsnamn
 DocType: Tax Rule,Shipping State,Frakt State
 ,Projected Quantity as Source,Projicerade Kvantitet som källa
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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"
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Inkludera icke-lager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Försäljnings Kostnader
@@ -1106,12 +1107,12 @@
 DocType: GL Entry,Against,Mot
 DocType: Item,Default Selling Cost Center,Standard Kostnadsställe Försäljning
 DocType: Sales Partner,Implementation Partner,Genomförande Partner
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Postnummer
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Postnummer
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Kundorder {0} är {1}
 DocType: Opportunity,Contact Info,Kontaktinformation
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Göra Stock Inlägg
 DocType: Packing Slip,Net Weight UOM,Nettovikt UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} resultat
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} resultat
 DocType: Item,Default Supplier,Standard Leverantör
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Överproduktion Tillåter Procent
 DocType: Employee Loan,Repayment Schedule,återbetalningsplan
@@ -1119,7 +1120,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Hämta Veckodagar
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Slutdatum kan inte vara mindre än Startdatum
 DocType: Sales Person,Select company name first.,Välj företagsnamn först.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Offerter mottaget från leverantörer.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Till {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Medelålder
@@ -1139,7 +1140,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Nyckelperformance Områden
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Transportfordon
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Ogiltig Attribut
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} måste lämnas in
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} måste lämnas in
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Kvantitet måste vara mindre än eller lika med {0}
 DocType: SMS Center,Total Characters,Totalt Tecken
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},Välj BOM i BOM fältet för produkt{0}
@@ -1150,7 +1151,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 +224,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 +52,Please set 'Apply Additional Discount On',Ställ in &quot;tillämpa ytterligare rabatt på&quot;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Från Range måste vara mindre än ligga
 DocType: Global Defaults,Global Defaults,Globala standardinställningar
@@ -1160,7 +1161,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Start Year
 DocType: Purchase Invoice,Start date of current invoice's period,Startdatum för aktuell faktura period
 DocType: Salary Slip,Leave Without Pay,Lämna utan lön
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapacitetsplanering Error
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Kapacitetsplanering Error
 ,Trial Balance for Party,Trial Balance för Party
 DocType: Lead,Consultant,Konsult
 DocType: Salary Slip,Earnings,Vinster
@@ -1175,7 +1176,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Detta kommer att läggas till den punkt koden varianten. Till exempel, om din förkortning är &quot;SM&quot;, och försändelsekoden är &quot;T-TRÖJA&quot;, posten kod varianten kommer att vara &quot;T-Shirt-SM&quot;"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Nettolön (i ord) kommer att vara synliga när du sparar lönebeskedet.
 DocType: Purchase Invoice,Is Return,Är Returnerad
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Retur / debetnota
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Retur / debetnota
 DocType: Price List Country,Price List Country,Prislista Land
 DocType: Item,UOMs,UOM
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} giltigt serienummer för punkt {1}
@@ -1185,11 +1186,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Ange Post kod för att få Batch nummer
 DocType: Stock Settings,Default Item Group,Standard Varugrupp
 DocType: Employee Loan,Partially Disbursed,delvis Utbetalt
-DocType: Grading Structure,Grading System Name,Betygsskala Namn
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Leverantörsdatabas.
 DocType: Account,Balance Sheet,Balansräkning
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',"Kostnadcenter för artikel med artikelkod """
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Betalning läget är inte konfigurerad. Kontrollera, om kontot har satts på läge av betalningar eller på POS profil."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Din säljare kommer att få en påminnelse om detta datum att kontakta kunden
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Samma post kan inte anges flera gånger.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ytterligare konton kan göras inom ramen för grupper, men poster kan göras mot icke-grupper"
@@ -1201,7 +1201,7 @@
 ,Purchase Order Items To Be Billed,Inköpsorder Artiklar att faktureras
 DocType: Purchase Invoice Item,Net Rate,Netto kostnad
 DocType: Purchase Invoice Item,Purchase Invoice Item,Inköpsfaktura Artiklar
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger inlägg och GL Posterna reposted för valda kvitton
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stock Ledger inlägg och GL Posterna reposted för valda kvitton
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Produkt  1
 DocType: Holiday,Holiday,Sommar
 DocType: Support Settings,Close Issue After Days,Nära Problem Efter dagar
@@ -1228,11 +1228,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Arbete Gjort
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Ange minst ett attribut i tabellen attribut
 DocType: Announcement,All Students,Alla studenter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Objektet {0} måste vara en icke-lagervara
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Objektet {0} måste vara en icke-lagervara
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Se journal
 DocType: Grading Scale,Intervals,intervaller
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Tidigast
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Ett varugrupp finns med samma namn, ändra objektets namn eller byta namn på varugrupp"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1272,9 +1272,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Utbetalning av lön från {0} till {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Kundorder {0} är inte giltig
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Kundorder {0} är inte giltig
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Inköpsorder hjälpa dig att planera och följa upp dina inköp
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Tyvärr, kan företagen inte slås samman"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Den totala emissions / Transfer mängd {0} i Material Begäran {1} \ inte kan vara större än efterfrågat antal {2} till punkt {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Liten
@@ -1295,10 +1295,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Indirekta kostnader
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Rad {0}: Antal är obligatoriskt
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Jordbruk
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Sync basdata
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Sync basdata
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Website Bild bör vara en offentlig fil eller webbadress
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Detta är en rot varugrupp och kan inte ändras.
@@ -1315,18 +1315,18 @@
 DocType: Student Group Student,Group Roll Number,Grupprullnummer
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",För {0} kan endast kreditkonton länkas mot en annan debitering
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Summan av alla uppgift vikter bör vara 1. Justera vikter av alla projektuppgifter i enlighet
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Följesedel {0} är inte lämnad
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Prissättning regel baseras först på ""Lägg till på' fälten, som kan vara artikel, artikelgrupp eller Märke."
 DocType: Hub Settings,Seller Website,Säljare Webbplatsen
 DocType: Item,ITEM-,PUNKT-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Totala fördelade procentsats för säljteam bör vara 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Produktionsorderstatus är {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Produktionsorderstatus är {0}
 DocType: Appraisal Goal,Goal,Mål
 DocType: Sales Invoice Item,Edit Description,Redigera Beskrivning
 ,Team Updates,team Uppdateringar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,För Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Skapa utskriftsformat
@@ -1342,7 +1342,7 @@
 DocType: Depreciation Schedule,Journal Entry,Journalanteckning
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} objekt pågår
 DocType: Workstation,Workstation Name,Arbetsstation Namn
-DocType: Grade Interval,Grade Code,grade kod
+DocType: Grading Scale Interval,Grade Code,grade kod
 DocType: POS Item Group,POS Item Group,POS Artikelgrupp
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,E-postutskick:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} tillhör inte föremål {1}
@@ -1359,7 +1359,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Hårdvara
 DocType: Sales Order,Recurring Upto,Återkommande kommande~~POS=HEADCOMP Upp
 DocType: Attendance,HR Manager,HR-chef
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Välj ett företag
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Välj ett företag
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Enskild ledighet
 DocType: Purchase Invoice,Supplier Invoice Date,Leverantörsfakturadatum
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Du måste aktivera Varukorgen
@@ -1375,7 +1375,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Mat
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Åldringsräckvidd 3
 DocType: Maintenance Schedule Item,No of Visits,Antal besök
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Närvaro
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Närvaro
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Underhållschema {0} existerar mot {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,Inlärning elev
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Valuta avslutnings Hänsyn måste vara {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Summan av poäng för alla mål bör vara 100. Det är {0}
@@ -1400,7 +1401,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daglig Utgång
 DocType: POS Profile,Campaign,Kampanj
 DocType: Supplier,Name and Type,Namn och typ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',"Godkännandestatus måste vara ""Godkänd"" eller ""Avvisad"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',"Godkännandestatus måste vara ""Godkänd"" eller ""Avvisad"""
 DocType: Purchase Invoice,Contact Person,Kontaktperson
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Förväntat startdatum"" kan inte vara större än ""Förväntat slutdatum"""
 DocType: Course Scheduling Tool,Course End Date,Kurs Slutdatum
@@ -1423,14 +1424,15 @@
 DocType: Sales Invoice,Shipping Address Name,Leveransadress Namn
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Kontoplan
 DocType: Material Request,Terms and Conditions Content,Villkor Innehåll
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,kan inte vara större än 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,kan inte vara större än 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Produkt  {0} är inte en lagervara
 DocType: Maintenance Visit,Unscheduled,Ledig
 DocType: Employee,Owned,Ägs
 DocType: Salary Detail,Depends on Leave Without Pay,Beror på avgång utan lön
 DocType: Pricing Rule,"Higher the number, higher the priority","Högre nummer, högre prioritet"
 ,Purchase Invoice Trends,Inköpsfaktura Trender
 DocType: Employee,Better Prospects,Bättre prospekt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Rad # {0}: Batch {1} har endast {2} qty. Var god välj en annan sats som har {3} antal tillgängliga eller dela raden i flera rader för att leverera / utgå från flera satser
 DocType: Vehicle,License Plate,Registreringsskylt
 DocType: Appraisal,Goals,Mål
 DocType: Warranty Claim,Warranty / AMC Status,Garanti / AMC Status
@@ -1448,7 +1450,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Anställd kan inte anmäla sig själv.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Om kontot är fruset, är poster endast tillgängligt för begränsade användare."
 DocType: Email Digest,Bank Balance,BANKTILLGODOHAVANDE
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Kontering för {0}: {1} kan endast göras i valuta: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Jobb profil, kvalifikationer som krävs osv"
 DocType: Journal Entry Account,Account Balance,Balanskonto
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Skatte Regel för transaktioner.
@@ -1459,7 +1461,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Visa ej avslutad skatteårets P &amp; L balanser
 DocType: Shipping Rule,Shipping Account,Frakt konto
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Account {2} är inaktiv
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Gör kundorder för att hjälpa dig att planera ditt arbete och leverera i tid
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Gör kundorder för att hjälpa dig att planera ditt arbete och leverera i tid
 DocType: Quality Inspection,Readings,Avläsningar
 DocType: Stock Entry,Total Additional Costs,Totalt Merkostnader
 DocType: Course Schedule,SH,SH
@@ -1470,7 +1472,7 @@
 DocType: Shipping Rule Condition,To Value,Att Värdera
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Följesedel
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Följesedel
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Kontorshyra
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Setup SMS-gateway-inställningar
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Import misslyckades!
@@ -1492,11 +1494,11 @@
 DocType: Company,Services,Tjänster
 DocType: HR Settings,Email Salary Slip to Employee,E-lönebesked till anställd
 DocType: Cost Center,Parent Cost Center,Överordnat kostnadsställe
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Välj Möjliga Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Välj Möjliga Leverantör
 DocType: Sales Invoice,Source,Källa
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,show stängd
 DocType: Leave Type,Is Leave Without Pay,Är ledighet utan lön
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset Kategori är obligatorisk för fast tillgångsposten
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Inga träffar i betalningstabellen
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Detta {0} konflikter med {1} för {2} {3}
 DocType: Student Attendance Tool,Students HTML,studenter HTML
@@ -1514,7 +1516,7 @@
 DocType: Student,Date of Leaving,Datum för att lämna
 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/utilities/activation.py +64,Create Leads,Skapa Leads
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,Skapa Leads
 DocType: Maintenance Schedule,Schedules,Scheman
 DocType: Purchase Invoice Item,Net Amount,Nettobelopp
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detalj nr
@@ -1542,9 +1544,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,program Inskrivningar
 DocType: Sales Invoice Item,Brand Name,Varumärke
 DocType: Purchase Receipt,Transporter Details,Transporter Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standardlager krävs för vald post
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standardlager krävs för vald post
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Låda
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,möjlig Leverantör
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,möjlig Leverantör
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organisationen
 DocType: Budget,Monthly Distribution,Månads Fördelning
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Mottagare Lista är tom. Skapa Mottagare Lista
@@ -1552,8 +1554,8 @@
 DocType: Sales Partner,Sales Partner Target,Sales Partner Target
 DocType: Loan Type,Maximum Loan Amount,Maximala lånebeloppet
 DocType: Pricing Rule,Pricing Rule,Prissättning Regel
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dubbelnummer för student {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Dubbelnummer för student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dubbelnummer för student {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Dubbelnummer för student {0}
 DocType: Budget,Action if Annual Budget Exceeded,Åtgärd om årsbudgeten överskriden
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Material begäran om att inköpsorder
 DocType: Shopping Cart Settings,Payment Success URL,Betalning Framgång URL
@@ -1574,9 +1576,9 @@
 DocType: Employee Loan,Repayment Method,återbetalning Metod
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",Om markerad startsidan vara standardArtikelGrupp för webbplatsen
 DocType: Quality Inspection Reading,Reading 4,Avläsning 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},Standard BOM för {0} hittades inte för Project {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},Standard BOM för {0} hittades inte för Project {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Anspråk på företagets bekostnad.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Eleverna i hjärtat i systemet, lägga till alla dina elever"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Eleverna i hjärtat i systemet, lägga till alla dina elever"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Rad # {0}: Clearance datum {1} kan inte vara före check Datum {2}
 DocType: Company,Default Holiday List,Standard kalender
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Rad {0}: Från tid och att tiden på {1} överlappar med {2}
@@ -1588,21 +1590,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Dagen (s) som du ansöker om ledighet är helgdagar. Du behöver inte ansöka om tjänstledighet.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Skicka om Betalning E
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Ny uppgift
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Skapa offert
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Skapa offert
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,andra rapporter
 DocType: Dependent Task,Dependent Task,Beroende Uppgift
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Omvandlingsfaktor för standardmåttenhet måste vara en i raden {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Ledighet av typen {0} inte kan vara längre än {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Försök att planera verksamheten för X dagar i förväg.
 DocType: HR Settings,Stop Birthday Reminders,Stop födelsedag Påminnelser
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Ställ Default Lön betalas konto i bolaget {0}
 DocType: SMS Center,Receiver List,Mottagare Lista
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Sök Produkt
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Sök Produkt
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Förbrukad mängd
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nettoförändring i Cash
 DocType: Assessment Plan,Grading Scale,Betygsskala
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,redan avslutat
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Mätenhet {0} har angetts mer än en gång i Omvandlingsfaktor Tabell
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,redan avslutat
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Betalning förfrågan finns redan {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Kostnad för utfärdade artiklar
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Antal får inte vara mer än {0}
@@ -1634,12 +1636,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Gör utbetalning Entry
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Rad {0}: Advance mot Leverantören måste debitera
 DocType: Company,Default Values,Standardvärden
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frekvens} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Totala belopp som ersatts
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Detta grundar sig på stockar mot detta fordon. Se tidslinje nedan för mer information
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Samla
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Mot leverantörsfakturor {0} den {1}
 DocType: Customer,Default Price List,Standard Prislista
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Asset Rörelse rekord {0} skapades
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Du kan inte ta bort Räkenskapsårets {0}. Räkenskapsårets {0} är satt som standard i Globala inställningar
 DocType: Journal Entry,Entry Type,Entry Type
 ,Customer Credit Balance,Kund tillgodohavande
@@ -1659,7 +1662,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Inget av objekten har någon förändring i kvantitet eller värde.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligatoriskt fält - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Obligatoriskt fält - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garantianspråk
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garantianspråk
 ,Lead Details,Prospekt Detaljer
 DocType: Salary Slip,Loan repayment,Låneåterbetalning
 DocType: Purchase Invoice,End date of current invoice's period,Slutdatum för aktuell faktura period
@@ -1678,11 +1681,10 @@
 DocType: Employee,Permanent Address,Permanent Adress
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Välj artikelkod
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Välj artikelkod
 DocType: Student Sibling,Studying in Same Institute,Studera i samma institut
 DocType: Territory,Territory Manager,Territorium manager
 DocType: Packed Item,To Warehouse (Optional),Till Warehouse (tillval)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Payment Entry,Paid Amount (Company Currency),Betald Belopp (Company valuta)
 DocType: Purchase Invoice,Additional Discount,Ytterligare rabatt
 DocType: Selling Settings,Selling Settings,Försälja Inställningar
@@ -1692,9 +1694,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Visa i varukorgen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Marknadsföringskostnader
 ,Item Shortage Report,Produkt Brist Rapportera
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Vikt nämns \ Vänligen ange ""Vikt UOM"" också"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Material Begäran används för att göra detta Lagerinlägg
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Nästa Avskrivningar Datum är obligatoriskt för ny tillgång
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Nästa Avskrivningar Datum är obligatoriskt för ny tillgång
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbaserad grupp för varje grupp
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Separat kursbaserad grupp för varje grupp
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Enda enhet av ett objekt.
@@ -1711,9 +1713,7 @@
 DocType: Course Assessment Criteria,Weightage,Vikt
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kostnadsställe krävs för &quot;Resultaträkning&quot; konto {2}. Ställ upp en standardkostnadsställe för bolaget.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En Kundgrupp finns med samma namn, vänligen ändra Kundens namn eller döp om Kundgruppen"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"En Kundgrupp finns med samma namn, vänligen ändra Kundens namn eller döp om Kundgruppen"
 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
@@ -1730,7 +1730,7 @@
 ,Item-wise Sales Register,Produktvis säljregister
 DocType: Asset,Gross Purchase Amount,Bruttoköpesumma
 DocType: Asset,Depreciation Method,avskrivnings Metod
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Off-line
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Off-line
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Är denna skatt inkluderar i Basic kursen?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Totalt Target
 DocType: Program Course,Required,Nödvändig
@@ -1740,21 +1740,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Avstämning JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Alltför många kolumner. Exportera rapporten och skriva ut det med hjälp av ett kalkylprogram.
 DocType: Purchase Invoice Item,Batch No,Batch nr
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Det går inte att hitta växelkursen för {0} till {1} för nyckeldatum {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Tillåt flera kundorder mot Kundens beställning
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 DocType: Student Group Instructor,Student Group Instructor,Studentgruppsinstruktör
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile No
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Huvud
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Variant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Huvud
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Variant
 DocType: Naming Series,Set prefix for numbering series on your transactions,Ställ prefix för nummerserie på dina transaktioner
 DocType: Employee Attendance Tool,Employees HTML,Anställda HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Standard BOM ({0}) måste vara aktiv för denna artikel eller dess mall
 DocType: Employee,Leave Encashed?,Lämna inlösen?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Möjlighet Från fältet är obligatoriskt
 DocType: Email Digest,Annual Expenses,årliga kostnader
 DocType: Item,Variants,Varianter
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Skapa beställning
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Skapa beställning
 DocType: SMS Center,Send To,Skicka Till
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Det finns inte tillräckligt ledighet balans för Lämna typ {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Avsatt mängd
@@ -1762,7 +1761,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Kundens Artikelkod
 DocType: Stock Reconciliation,Stock Reconciliation,Lager Avstämning
 DocType: Territory,Territory Name,Territorium Namn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Pågående Arbete - Lager krävs innan du kan Skicka
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Sökande av ett jobb.
 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
@@ -1770,11 +1769,10 @@
 DocType: Item,Serial Nos and Batches,Serienummer och partier
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppsstyrkan
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Studentgruppsstyrkan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Mot Journal anteckning {0} inte har någon matchat {1} inlägg
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,bedömningar
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,klassificerings Intervaller
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Stig på
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Det går inte att overbill för Punkt {0} i rad {1} mer än {2}. För att möjliggöra överfakturering, ställ in köpa Inställningar"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Ställ filter baserat på punkt eller Warehouse
@@ -1786,17 +1784,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} måste lämnas in
 DocType: Authorization Control,Authorization Control,Behörighetskontroll
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Rad # {0}: Avslag Warehouse är obligatoriskt mot förkastade Punkt {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Betalning
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Hantera order
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Betalning
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Hantera order
 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
 DocType: Course,Course Abbreviation,Naturligtvis Förkortning
 DocType: Student Leave Application,Student Leave Application,Student Lämna Application
 DocType: Item,Will also apply for variants,Kommer också att ansöka om varianter
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset kan inte avbrytas, eftersom det redan är {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Anställd {0} på Halvdag på {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Totalt arbetstid bör inte vara större än max arbetstid {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,På
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Bundlade poster vid tidpunkten för försäljning.
 DocType: Quotation Item,Actual Qty,Faktiska Antal
 DocType: Sales Invoice Item,References,Referenser
@@ -1806,7 +1805,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Du har angett dubbletter. Vänligen rätta och försök igen.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Associate
 DocType: Asset Movement,Asset Movement,Asset Rörelse
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,ny vagn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,ny vagn
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Produktt {0} är inte en serialiserad Produkt
 DocType: SMS Center,Create Receiver List,Skapa Mottagare Lista
 DocType: Vehicle,Wheels,hjul
@@ -1838,10 +1837,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Inaktiverar skapandet av tids stockar mot produktionsorder. Verksamheten får inte spåras mot produktionsorder
 DocType: Student,Student Mobile Number,Student Mobilnummer
 DocType: Item,Has Variants,Har Varianter
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Du har redan valt objekt från {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Namn på månadens distribution
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID är obligatoriskt
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch-ID är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch-ID är obligatoriskt
 DocType: Sales Person,Parent Sales Person,Överordnad Försäljningsperson
 DocType: Purchase Invoice,Recurring Invoice,Återkommande Faktura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Hantera projekt
@@ -1849,11 +1848,11 @@
 DocType: Budget,Fiscal Year,Räkenskapsår
 DocType: Vehicle Log,Fuel Price,bränsle~~POS=TRUNC Pris
 DocType: Budget,Budget,Budget
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fast Asset Objektet måste vara en icke-lagervara.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Budget kan inte tilldelas mot {0}, eftersom det inte är en intäkt eller kostnad konto"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Uppnått
 DocType: Student Admission,Application Form Route,Ansökningsblankett Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Territorium / Kund
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Territorium / Kund
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,t.ex. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Lämna typ {0} kan inte tilldelas eftersom det lämnar utan lön
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Rad {0}: Tilldelad mängd {1} måste vara mindre än eller lika med att fakturerat utestående belopp {2}
@@ -1873,14 +1872,14 @@
 ,Serial No Status,Serial No Status
 DocType: Payment Entry Reference,Outstanding,Utestående
 ,Daily Timesheet Summary,Daglig Tidrapport Sammandrag
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Rad {0}: Om du vill ställa {1} periodicitet, tidsskillnad mellan från och till dags datum \ måste vara större än eller lika med {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Detta är baserat på aktie rörelse. Se {0} för mer information
 DocType: Pricing Rule,Selling,Försäljnings
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Belopp {0} {1} avräknas mot {2}
 DocType: Employee,Salary Information,Lön Information
 DocType: Sales Person,Name and Employee ID,Namn och Anställnings ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Förfallodatum kan inte vara före Publiceringsdatum
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Tullar och skatter
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Ange Referensdatum
@@ -1892,14 +1891,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Det går inte att hänvisa till radnr större än eller lika med aktuell rad nummer för denna avgiftstyp
 DocType: Asset,Sold,Såld
 ,Item-wise Purchase History,Produktvis Köphistorik
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Klicka på ""Skapa schema"" för att hämta Löpnummer inlagt för artikel {0}"
 DocType: Account,Frozen,Fryst
 ,Open Production Orders,Öppna produktionsorder
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Basbelopp (Company valuta)
 DocType: Payment Reconciliation Payment,Reference Row,referens Row
 DocType: Installation Note,Installation Time,Installationstid
 DocType: Sales Invoice,Accounting Details,Redovisning Detaljer
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Ta bort alla transaktioner för detta företag
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Investeringarna
 DocType: Issue,Resolution Details,Åtgärds Detaljer
@@ -1931,14 +1930,14 @@
 DocType: Discussion,Discussion,Diskussion
 DocType: Payment Entry,Transaction ID,Transaktions ID
 DocType: Employee,Resignation Letter Date,Avskedsbrev Datum
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Prissättning Regler ytterligare filtreras baserat på kvantitet.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Ange datum för anslutning till anställd {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Totalt Billing Belopp (via Tidrapportering)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Upprepa kund Intäkter
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) måste ha rollen ""Utgiftsgodkännare"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Par
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Välj BOM och Antal för produktion
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Välj BOM och Antal för produktion
 DocType: Asset,Depreciation Schedule,avskrivningsplanen
 DocType: Bank Reconciliation Detail,Against Account,Mot Konto
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Halv Dag Datum bör vara mellan Från datum och hittills
@@ -1952,16 +1951,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Ställ &quot;Asset Avskrivningar kostnadsställe&quot; i bolaget {0}
 ,Maintenance Schedules,Underhålls scheman
 DocType: Task,Actual End Date (via Time Sheet),Faktisk Slutdatum (via Tidrapportering)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Belopp {0} {1} mot {2} {3}
 ,Quotation Trends,Offert Trender
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Produktgruppen nämns inte i huvudprodukten för objektet {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,Debit To account must be a Receivable account,Debitering av konto måste vara ett mottagarkonto
 DocType: Shipping Rule Condition,Shipping Amount,Fraktbelopp
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Väntande antal
 DocType: Purchase Invoice Item,Conversion Factor,Omvandlingsfaktor
 DocType: Purchase Order,Delivered,Levereras
 ,Vehicle Expenses,fordons Kostnader
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
+DocType: Serial No,Invoice Details,Faktura detaljer
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},Förväntat värde efter livslängd måste vara större än eller lika med {0}
 DocType: Purchase Receipt,Vehicle Number,Fordonsnummer
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Den dag då återkommande faktura kommer att stoppa
 DocType: Employee Loan,Loan Amount,Lånebelopp
@@ -1980,12 +1980,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,tidrapporter
 DocType: HR Settings,HR Settings,HR Inställningar
 DocType: Salary Slip,net pay info,nettolön info
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,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.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,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: Email Digest,New Expenses,nya kostnader
 DocType: Purchase Invoice,Additional Discount Amount,Ytterligare rabatt Belopp
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Rad # {0}: Antal måste vara en, som objektet är en anläggningstillgång. Använd separat rad för flera st."
 DocType: Leave Block List Allow,Leave Block List Allow,Lämna Block List Tillåt
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Förkortning kan inte vara tomt
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Förkortning kan inte vara tomt
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Grupp till icke-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Sport
 DocType: Loan Type,Loan Name,Loan Namn
@@ -1997,6 +1997,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Lager där du hanterar lager av avvisade föremål
 DocType: Production Order,Skip Material Transfer,Hoppa över materialöverföring
 DocType: Production Order,Skip Material Transfer,Hoppa över materialöverföring
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Det gick inte att hitta växelkursen för {0} till {1} för nyckeldatum {2}. Var god skapa en valutautbyteslista manuellt
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Din räkenskapsår slutar
 DocType: POS Profile,Price List,Prislista
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} är nu standard räkenskapsår. Vänligen uppdatera din webbläsare för att ändringen ska träda i kraft.
@@ -2013,19 +2014,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Konto {0} är ogiltig. Konto Valuta måste vara {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM omräkningsfaktor i rad {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av kundorder, försäljningsfakturan eller journalanteckning"
 DocType: Salary Component,Deduction,Avdrag
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Rad {0}: Från tid och till tid är obligatorisk.
 DocType: Stock Reconciliation Item,Amount Difference,mängd Skillnad
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Artikel Pris till för {0} i prislista {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Ange anställnings Id för denna säljare
 DocType: Territory,Classification of Customers by region,Klassificering av kunder per region
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Skillnad Belopp måste vara noll
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Skillnad Belopp måste vara noll
 DocType: Project,Gross Margin,Bruttomarginal
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Ange Produktionsartikel först
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Beräknat Kontoutdrag balans
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,inaktiverad användare
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Offert
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Offert
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Totalt Avdrag
 ,Production Analytics,produktions~~POS=TRUNC Analytics
@@ -2034,9 +2035,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Varning: Ogiltig SSL-certifikat på fäst {0}
 DocType: Student Admission,Eligibility,Behörighet
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Leads hjälpa dig att få verksamheten, lägga till alla dina kontakter och mer som dina leder"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Leads hjälpa dig att få verksamheten, lägga till alla dina kontakter och mer som dina leder"
 DocType: Production Order Operation,Actual Operation Time,Faktisk driftstid
 DocType: Authorization Rule,Applicable To (User),Är tillämpligt för (Användare)
 DocType: Purchase Taxes and Charges,Deduct,Dra av
@@ -2051,7 +2052,7 @@
 DocType: Guardian,Work Address,arbete Adress
 DocType: Appraisal,Calculate Total Score,Beräkna Totalsumma
 DocType: Request for Quotation,Manufacturing Manager,Tillverkningsansvarig
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Löpnummer {0} är under garanti upp till {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Split följesedel i paket.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Transporter
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Kontosaldo ({0}) för {1} och lagervärde ({2}) för lager {3} måste vara samma
@@ -2074,10 +2075,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Obs: E-post kommer inte att skickas till inaktiverade användare
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Antal interaktioner
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Välj Företaget ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Välj Företaget ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Lämna tomt om det anses vara för alla avdelningar
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Typer av anställning (permanent, kontrakts, praktikant osv)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} är obligatoriskt för punkt {1}
 DocType: Process Payroll,Fortnightly,Var fjortonde dag
 DocType: Currency Exchange,From Currency,Från Valuta
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2086,14 +2087,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Andel (Företagsvaluta)
 DocType: Student Guardian,Others,Annat
 DocType: Payment Entry,Unallocated Amount,oallokerad Mängd
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Det går inte att hitta en matchande objekt. Välj något annat värde för {0}.
 DocType: POS Profile,Taxes and Charges,Skatter och avgifter
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","En produkt eller en tjänst som köps, säljs eller hålls i lager."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Inga fler uppdateringar
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,"Det går inte att välja avgiftstyp som ""På föregående v Belopp"" eller ""På föregående v Total"" för första raden"
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Barn Objekt bör inte vara en produkt Bundle. Ta bort objektet `{0}` och spara
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bank
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Lägg tidrapporter
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Lägg tidrapporter
 DocType: Vehicle Service,Service Item,sERVICE
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
 DocType: Bank Guarantee,Bank Guarantee,Bankgaranti
@@ -2119,6 +2120,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Rad # {0}: Asset {1} är redan {2}
 DocType: Quotation Item,Stock Balance,Lagersaldo
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Kundorder till betalning
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Ange Naming Series för {0} via Setup&gt; Settings&gt; Naming Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,vd
 DocType: Expense Claim Detail,Expense Claim Detail,Räkningen Detalj
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Välj rätt konto
@@ -2143,14 +2145,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Priserna kommer inte att visas om prislista inte är inställd
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Ange ett land för frakt regel eller kontrollera Världsomspännande sändnings
 DocType: Stock Entry,Total Incoming Value,Totalt Inkommande Värde
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Debitering krävs
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Debitering krävs
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Tidrapporter hjälpa till att hålla reda på tid, kostnad och fakturering för aktiviteter som utförts av ditt team"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Inköps Prislista
 DocType: Offer Letter Term,Offer Term,Erbjudandet Villkor
 DocType: Quality Inspection,Quality Manager,Kvalitetsansvarig
 DocType: Job Applicant,Job Opening,Arbetsöppning
 DocType: Payment Reconciliation,Payment Reconciliation,Betalning Avstämning
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Välj Ansvariges namn
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Välj Ansvariges namn
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknik
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Totalt Obetalda: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Webbplats Operation
@@ -2178,23 +2180,23 @@
 DocType: Opportunity,Lost Reason,Förlorad Anledning
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Ange Kvitto Dokument
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Alla objekt har redan fakturerats
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Ange Kvitto Dokument
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Ytterligare kostnadsställen kan göras i grupperna men poster kan göras mot icke-grupper
 DocType: Project,External,Extern
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Användare och behörigheter
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Produktionsorder Skapad: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Produktionsorder Skapad: {0}
 DocType: Branch,Branch,Bransch
 DocType: Guardian,Mobile Number,Mobilnummer
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Tryckning och Branding
 DocType: Bin,Actual Quantity,Verklig Kvantitet
 DocType: Shipping Rule,example: Next Day Shipping,exempel: Nästa dag Leverans
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Löpnummer {0} hittades inte
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Löpnummer {0} hittades inte
 DocType: Scheduling Tool,Student Batch,elev Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Dina kunder
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,gör Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,gör Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Du har blivit inbjuden att samarbeta i projektet: {0}
 DocType: Leave Block List Date,Block Date,Block Datum
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Ansök nu
@@ -2218,8 +2220,9 @@
 DocType: SMS Log,Sent To,Skickat Till
 DocType: Payment Request,Make Sales Invoice,Skapa fakturan
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Mjukvara
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Next Kontakt Datum kan inte vara i det förflutna
 DocType: Company,For Reference Only.,För referens.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Välj batchnummer
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Ogiltigt {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-retro
 DocType: Sales Invoice Advance,Advance Amount,Förskottsmängd
@@ -2233,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Ärendenr kan inte vara 0
 DocType: Item,Show a slideshow at the top of the page,Visa ett bildspel på toppen av sidan
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,stycklistor
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Butiker
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Butiker
 DocType: Serial No,Delivery Time,Leveranstid
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Åldring Baserad på
 DocType: Item,End of Life,Uttjänta
@@ -2245,12 +2248,12 @@
 DocType: Rename Tool,Rename Tool,Ändrings Verktyget
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Uppdatera Kostnad
 DocType: Item Reorder,Item Reorder,Produkt Ändra ordning
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Visa lönebesked
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfermaterial
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Visa lönebesked
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Detta dokument är över gränsen med {0} {1} för posten {4}. Är du göra en annan {3} mot samma {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Ställ återkommande efter att ha sparat
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Välj förändringsbelopp konto
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Ställ återkommande efter att ha sparat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Välj förändringsbelopp konto
 DocType: Purchase Invoice,Price List Currency,Prislista Valuta
 DocType: Naming Series,User must always select,Användaren måste alltid välja
 DocType: Stock Settings,Allow Negative Stock,Tillåt Negativ lager
@@ -2261,7 +2264,7 @@
 DocType: Budget Account,Budget Account,budget-konto
 DocType: Quality Inspection,Verified By,Verifierad Av
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Det går inte att ändra bolagets standardvaluta, eftersom det redan finns transaktioner. Transaktioner måste avbokas att ändra valuta."
-DocType: Grade Interval,Grade Description,grade Beskrivning
+DocType: Grading Scale Interval,Grade Description,grade Beskrivning
 DocType: Stock Entry,Purchase Receipt No,Inköpskvitto Nr
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Handpenning
 DocType: Process Payroll,Create Salary Slip,Skapa lönebeskedet
@@ -2299,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,Närvaro Till Datum
 DocType: Warranty Claim,Raised By,Höjt av
 DocType: Payment Gateway Account,Payment Account,Betalningskonto
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Ange vilket bolag för att fortsätta
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Ange vilket bolag för att fortsätta
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Nettoförändring av kundfordringar
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Kompensations Av
 DocType: Offer Letter,Accepted,Godkända
@@ -2309,12 +2312,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Rumsnummer
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Ogiltig referens {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) kan inte vara större än planerad kvantitet ({2}) i produktionsorder {3}
 DocType: Shipping Rule,Shipping Rule Label,Frakt Regel Etikett
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Användarforum
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Råvaror kan inte vara tomt.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"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/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Quick Journal Entry
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"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/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Quick Journal Entry
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2327,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Villkor och Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Namnet på institutet som du installerar systemet.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Kontering frysta fram till detta datum, ingen kan göra / ändra posten förutom ange roll nedan."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Vänligen spara dokumentet innan du skapar underhållsschema
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Projektstatus
 DocType: UOM,Check this to disallow fractions. (for Nos),Markera att tillåta bråkdelar. (För NOS)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Följande produktionsorder skapades:
@@ -2354,7 +2357,7 @@
 ,Employees working on a holiday,Anställda som arbetar på en semester
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mark Närvarande
 DocType: Project,% Complete Method,% Komplett metod
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Underhåll startdatum kan inte vara före leveransdatum för Löpnummer {0}
 DocType: Production Order,Actual End Date,Faktiskt Slutdatum
 DocType: BOM,Operating Cost (Company Currency),Driftskostnad (Company valuta)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2371,7 +2374,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Lämna utan lön inte stämmer överens med godkända Lämna ansökan registrerar
 DocType: Campaign,Campaign-.####,Kampanj -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Nästa steg
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Ange de specificerade poster till bästa möjliga pris
 DocType: Selling Settings,Auto close Opportunity after 15 days,Stäng automatiskt Affärsmöjlighet efter 15 dagar
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,slut År
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Bly%
@@ -2409,7 +2412,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Kvantitet
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Arvodes Records Skapad - {0}
 DocType: Asset Category Account,Asset Category Account,Tillgångsslag konto
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,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/manufacturing/doctype/production_order/production_order.py +106,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 +539,Stock Entry {0} is not submitted,Stock Entry {0} är inte lämnat
 DocType: Payment Reconciliation,Bank / Cash Account,Bank / Konto
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Nästa Kontakta Vid kan inte vara densamma som den ledande e-postadress
@@ -2431,7 +2434,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Utförsäljningsdatum inte nämnt
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Produktion
 DocType: Guardian,Occupation,Ockupation
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Rad {0}: Startdatum måste vara före slutdatum
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Totalt (Antal)
 DocType: Sales Invoice,This Document,Det här dokumentet
 DocType: Installation Note Item,Installed Qty,Installerat antal
@@ -2447,15 +2451,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Rapportera ett problem
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Utility Kostnader
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-Ovan
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rad # {0}: Journal Entry {1} har inte hänsyn {2} eller redan matchas mot en annan kupong
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Rad # {0}: Journal Entry {1} har inte hänsyn {2} eller redan matchas mot en annan kupong
 DocType: Buying Settings,Default Buying Price List,Standard Inköpslista
 DocType: Process Payroll,Salary Slip Based on Timesheet,Lön Slip Baserat på Tidrapport
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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."
 DocType: Payment Entry,Payment Type,Betalning Typ
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Var god välj en sats för objekt {0}. Det går inte att hitta en enda sats som uppfyller detta krav
 DocType: Process Payroll,Select Employees,Välj Anställda
 DocType: Opportunity,Potential Sales Deal,Potentiella säljmöjligheter
 DocType: Payment Entry,Cheque/Reference Date,Check / Referens Datum
@@ -2472,7 +2476,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Global POS Profil {0} redan skapats för företag {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Byt Punkt / BOM i alla stycklistor
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Kvitto dokument måste lämnas in
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Kvitto dokument måste lämnas in
 DocType: Purchase Invoice Item,Received Qty,Mottagna Antal
 DocType: Stock Entry Detail,Serial No / Batch,Löpnummer / Batch
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Inte betalda och inte levereras
@@ -2481,11 +2485,11 @@
 DocType: Delivery Note,DN-RET-,DN-retro
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Inga tidrapporter
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Lämna typ {0} kan inte bära vidarebefordrade
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Underhållsschema genereras inte för alla objekt. Klicka på ""Generera Schema '"
 ,To Produce,Att Producera
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Löner
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","För rad {0} i {1}. Om du vill inkludera {2} i punkt hastighet, rader {3} måste också inkluderas"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,gör Användare
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,gör Användare
 DocType: Packing Slip,Identification of the package for the delivery (for print),Identifiering av paketet för leverans (för utskrift)
 DocType: Bin,Reserved Quantity,Reserverad Kvantitet
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Ange giltig e-postadress
@@ -2499,15 +2503,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Funktionshindrade mall får inte vara standardmall
 DocType: Account,Income Account,Inkomst konto
 DocType: Payment Request,Amount in customer's currency,Belopp i kundens valuta
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Leverans
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Leverans
 DocType: Stock Reconciliation Item,Current Qty,Aktuellt Antal
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",Se &quot;Rate of Materials Based On&quot; i kalkyl avsnitt
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Föregående
 DocType: Appraisal Goal,Key Responsibility Area,Nyckelansvar Områden
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Student partier hjälpa dig att spåra närvaro, bedömningar och avgifter för studenter"
 DocType: Payment Entry,Total Allocated Amount,Sammanlagda anslaget
 DocType: Item Reorder,Material Request Type,Typ av Materialbegäran
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry för löner från {0} till {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Localstorage är full, inte spara"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Localstorage är full, inte spara"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Rad {0}: UOM Omvandlingsfaktor är obligatorisk
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,Kostnadscenter
@@ -2517,16 +2522,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Kundens Tax Id från Försäljningstransaktioner
 DocType: Upload Attendance,Upload HTML,Ladda upp HTML
 DocType: Employee,Relieving Date,Avgångs Datum
-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.",Prissättning regel görs för att skriva Prislista / definiera rabatt procentsats baserad på vissa kriterier.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Prissättning regel görs för att skriva Prislista / definiera rabatt procentsats baserad på vissa kriterier.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Lager kan endast ändras via lagerposter / följesedel / inköpskvitto
 DocType: Employee Education,Class / Percentage,Klass / Procent
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Chef för Marknad och Försäljning
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Inkomstskatt
-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.","Om du väljer prissättningsregel för ""Pris"", kommer det att överskriva Prislistas. Prissättningsregel priset är det slutliga priset, så ingen ytterligare rabatt bör tillämpas. Därför, i de transaktioner som kundorder, inköpsorder mm, kommer det att hämtas i ""Betygsätt fältet, snarare än"" Prislistavärde fältet."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Om du väljer prissättningsregel för ""Pris"", kommer det att överskriva Prislistas. Prissättningsregel priset är det slutliga priset, så ingen ytterligare rabatt bör tillämpas. Därför, i de transaktioner som kundorder, inköpsorder mm, kommer det att hämtas i ""Betygsätt fältet, snarare än"" Prislistavärde fältet."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Spår leder med Industry Type.
 DocType: Item Supplier,Item Supplier,Produkt Leverantör
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},Välj ett värde för {0} offert_till {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Ange Artikelkod att få batchnr
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Alla adresser.
 DocType: Company,Stock Settings,Stock Inställningar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
@@ -2536,6 +2541,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Kommer att skicka ett e-postmeddelande om händelsen till anställda med status &quot;Open&quot;
 DocType: Task,Depends on Tasks,Beror på Uppgifter
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Hantera Kundgruppsträd.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Bilagor kan visas utan att aktivera kundvagnen
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Nytt kostnadsställe Namn
 DocType: Leave Control Panel,Leave Control Panel,Lämna Kontrollpanelen
@@ -2548,12 +2554,10 @@
 DocType: Sales Invoice,Debit To,Debitering
 DocType: Delivery Note,Required only for sample item.,Krävs endast för provobjekt.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Faktiska Antal Efter transaktion
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Leverantör&gt; Leverantörstyp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Ingen lön slip hittades mellan {0} och {1}
 ,Pending SO Items For Purchase Request,I avvaktan på SO Artiklar till inköpsanmodan
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Student Antagning
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} är inaktiverad
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} är inaktiverad
 DocType: Supplier,Billing Currency,Faktureringsvaluta
 DocType: Sales Invoice,SINV-RET-,SINV-retro
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Extra Stor
@@ -2570,9 +2574,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Hemsida Aktuell produkt
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Alla bedömningsgrupper
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Ny Lager Namn
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Totalt {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Totalt {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Territorium
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Ange antal besökare (krävs)
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Ange antal besökare (krävs)
 DocType: Stock Settings,Default Valuation Method,Standardvärderingsmetod
 DocType: Vehicle Log,Fuel Qty,bränsle Antal
 DocType: Production Order Operation,Planned Start Time,Planerad starttid
@@ -2588,7 +2592,7 @@
 DocType: Price List,Price List Master,Huvudprislista
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Alla försäljningstransaktioner kan märkas mot flera ** säljare ** så att du kan ställa in och övervaka mål.
 ,S.O. No.,SÅ Nej
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Skapa Kunden från Prospekt {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Endast Lämna applikationer med status &#39;Godkänd&#39; och &#39;Avvisad&#39; kan lämnas in
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Student gruppnamn är obligatorisk i rad {0}
@@ -2620,7 +2624,7 @@
 DocType: Project,Copied From,Kopierad från
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Namn fel: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Brist
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} inte förknippas med {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} inte förknippas med {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Närvaro för anställd {0} är redan märkt
 DocType: Packing Slip,If more than one package of the same type (for print),Om mer än ett paket av samma typ (för utskrift)
 ,Salary Register,lön Register
@@ -2639,7 +2643,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Används för Varukorgen
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Värde {0} för Attribut {1} finns inte i listan över giltiga Punkt attributvärden för punkt {2}
 DocType: BOM Item,Scrap %,Skrot%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Avgifter kommer att fördelas proportionellt baserad på produktantal eller belopp, enligt ditt val"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Avgifter kommer att fördelas proportionellt baserad på produktantal eller belopp, enligt ditt val"
 DocType: Maintenance Visit,Purposes,Ändamål
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Operation {0} längre än alla tillgängliga arbetstiden i arbetsstation {1}, bryta ner verksamheten i flera operationer"
@@ -2660,16 +2664,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Hantera Områden.
 DocType: Journal Entry Account,Sales Invoice,Försäljning Faktura
 DocType: Journal Entry Account,Party Balance,Parti Balans
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Välj Verkställ rabatt på
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Välj Verkställ rabatt på
 DocType: Company,Default Receivable Account,Standard Mottagarkonto
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Skapa Bankinlägg för den totala lönen för de ovan valda kriterier
 DocType: Stock Entry,Material Transfer for Manufacture,Material Transfer för Tillverkning
-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.,Rabatt Procent kan appliceras antingen mot en prislista eller för alla prislistor.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Rabatt Procent kan appliceras antingen mot en prislista eller för alla prislistor.
 DocType: Purchase Invoice,Half-yearly,Halvårs
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Kontering för lager
 DocType: Vehicle Service,Engine Oil,Motorolja
 DocType: Sales Invoice,Sales Team1,Försäljnings Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Punkt {0} inte existerar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Punkt {0} inte existerar
 DocType: Sales Invoice,Customer Address,Kundadress
 DocType: Employee Loan,Loan Details,Loan Detaljer
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,V {0}: Genomförd Antal måste vara större än noll.
@@ -2677,24 +2681,24 @@
 DocType: Account,Root Type,Root Typ
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Rad # {0}: Det går inte att returnera mer än {1} till artikel {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Tomt
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Tomt
 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}
 DocType: Cheque Print Template,Primary Settings,primära inställningar
 DocType: Purchase Invoice,Select Supplier Address,Välj Leverantör Adress
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Lägg till anställda
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Lägg till anställda
 DocType: Purchase Invoice Item,Quality Inspection,Kvalitetskontroll
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Liten
 DocType: Company,Standard Template,standardmall
 DocType: Training Event,Theory,Teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Varning: Material Begärt Antal är mindre än Minimum Antal
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Kontot {0} är fruset
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Juridisk person / Dotterbolag med en separat kontoplan som tillhör organisationen.
 DocType: Payment Request,Mute Email,Mute E
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Mat, dryck och tobak"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Kan bara göra betalning mot ofakturerade {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Provisionshastighet kan inte vara större än 100
 DocType: Stock Entry,Subcontract,Subkontrakt
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Ange {0} först
@@ -2734,7 +2738,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Lager med befintlig transaktion kan inte konverteras till gruppen.
 DocType: Assessment Result Tool,Result HTML,resultat HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Går ut den
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Lägg till elever
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Lägg till elever
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Välj {0}
 DocType: C-Form,C-Form No,C-form Nr
 DocType: BOM,Exploded_items,Vidgade_artiklar
@@ -2777,7 +2781,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Ant
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Ange namnet på kampanjen om källförfrågan är kampanjen
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Tidningsutgivarna
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Välj Räkenskapsårets
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Välj Räkenskapsårets
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Ombeställningsnivå
 DocType: Company,Chart Of Accounts Template,Konto Mall
 DocType: Attendance,Attendance Date,Närvaro Datum
@@ -2792,14 +2796,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Duplicera post
 DocType: Program Enrollment Tool,Get Students,Få studenter
 DocType: Serial No,Under Warranty,Under garanti
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Fel]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Fel]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,I Ord kommer att synas när du sparar kundorder.
 ,Employee Birthday,Anställd Födelsedag
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Elev Batch Närvaro Tool
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,gräns Korsade
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Tilldelningskapital
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,En termin med detta &quot;Academic Year &#39;{0} och&quot; Term Name &quot;{1} finns redan. Ändra dessa poster och försök igen.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",Eftersom det finns transaktioner mot produkten {0} så kan du inte ändra värdet av {1}
 DocType: UOM,Must be Whole Number,Måste vara heltal
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Nya Ledigheter Tilldelade (i dagar)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Serienummer {0} inte existerar
@@ -2819,7 +2823,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 +49,Period Closing Entry,Period Utgående Post
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Kostnadsställe med befintliga transaktioner kan inte omvandlas till grupp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Mängden {0} {1} {2} {3}
 DocType: Account,Depreciation,Avskrivningar
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Leverantör (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Anställd närvaro Tool
@@ -2843,7 +2847,7 @@
 DocType: Supplier,Last Day of the Next Month,Sista dagen i nästa månad
 DocType: Support Settings,Auto close Issue after 7 days,Stäng automatiskt Problem efter 7 dagar
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Lämna inte kan fördelas före {0}, som ledighet balans redan har carry-vidarebefordras i framtiden ledighet tilldelningspost {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),OBS: På grund / Referens Datum överstiger tillåtna kundkreditdagar från {0} dag (ar)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Student Sökande
 DocType: Asset Category Account,Accumulated Depreciation Account,Ackumulerade avskrivningar konto
 DocType: Stock Settings,Freeze Stock Entries,Frys Lager Inlägg
@@ -2854,7 +2858,7 @@
 ,Stock Analytics,Arkiv Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Verksamheten kan inte lämnas tomt
 DocType: Maintenance Visit Purpose,Against Document Detail No,Mot Dokument Detalj nr
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Party Type är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Party Type är obligatorisk
 DocType: Quality Inspection,Outgoing,Utgående
 DocType: Material Request,Requested For,Begärd För
 DocType: Quotation Item,Against Doctype,Mot Doctype
@@ -2871,11 +2875,11 @@
 DocType: Asset,Item Code,Produktkod
 DocType: Production Planning Tool,Create Production Orders,Skapa produktionsorder
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detaljer
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Välj studenter manuellt för aktivitetsbaserad grupp
 DocType: Journal Entry,User Remark,Användar Anmärkning
 DocType: Lead,Market Segment,Marknadssegment
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Utbetalda beloppet kan inte vara större än den totala negativa utestående beloppet {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Anställd interna arbetshistoria
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Closing (Dr)
 DocType: Cheque Print Template,Cheque Size,Check Storlek
@@ -2891,7 +2895,7 @@
 DocType: Production Planning Tool,Create Material Requests,Skapa Materialförfrågan
 DocType: Employee Education,School/University,Skola / Universitet
 DocType: Payment Request,Reference Details,Referens Detaljer
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Förväntat värde eller återanvändas måste vara mindre än Gross köpesumman
 DocType: Sales Invoice Item,Available Qty at Warehouse,Tillgång Antal vid Lager
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Fakturerat antal
 DocType: Asset,Double Declining Balance,Dubbel degressiv
@@ -2912,20 +2916,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Differenskonto måste vara en tillgång / skuld kontotyp, eftersom denna lageravstämning är en öppnings post"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Betalats Beloppet får inte vara större än Loan Mängd {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Inköpsordernr som krävs för punkt {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Produktionsorder inte skapat
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Produktionsorder inte skapat
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&quot;Från datum&quot; måste vara efter &quot;Till datum&quot;
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Det går inte att ändra status som studerande {0} är kopplad med student ansökan {1}
 DocType: Asset,Fully Depreciated,helt avskriven
 ,Stock Projected Qty,Lager Projicerad Antal
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Kund {0} tillhör inte projektet {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Markerad Närvaro HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Citat är förslag, bud som du har skickat till dina kunder"
 DocType: Sales Order,Customer's Purchase Order,Kundens beställning
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Löpnummer och Batch
 DocType: Warranty Claim,From Company,Från Företag
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Summan av Mängder av bedömningskriterier måste vara {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Värde eller Antal
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Ställ in Antal Avskrivningar bokat
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Värde eller Antal
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Produktioner Beställningar kan inte höjas för:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Minut
 DocType: Purchase Invoice,Purchase Taxes and Charges,Inköp skatter och avgifter
@@ -2938,7 +2942,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,alla Lager
 DocType: Sales Partner,Retailer,Återförsäljare
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Alla Leverantörs Typer
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Alla Leverantörs Typer
 DocType: Global Defaults,Disable In Words,Inaktivera uttrycker in
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Offert {0} inte av typen {1}
@@ -2947,6 +2951,7 @@
 DocType: Production Order,PRO-,PROFFS-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Checkräknings konto
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Skapa lönebeskedet
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Rad # {0}: Tilldelad mängd kan inte vara större än utestående belopp.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Bläddra BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Säkrade lån
 DocType: Purchase Invoice,Edit Posting Date and Time,Redigera Publiceringsdatum och tid
@@ -2986,7 +2991,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Ej tillåtet att uppdatera lagertransaktioner äldre än {0}
 DocType: Purchase Invoice Item,PR Detail,PR Detalj
 DocType: Sales Order,Fully Billed,Fullt fakturerad
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Ställ in standard betalas konto i anställde {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Kontant i hand
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Leverans lager som krävs för Beställningsvara {0}
 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)
@@ -2997,7 +3001,7 @@
 DocType: Student Group,Group Based On,Grupp baserad på
 DocType: Journal Entry,Bill Date,Faktureringsdatum
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","SERVICE, typ, frekvens och omkostnadsbelopp krävs"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Även om det finns flera prissättningsregler med högsta prioritet, kommer följande interna prioriteringar tillämpas:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Vill du verkligen vill in alla lönebesked från {0} till {1}
 DocType: Cheque Print Template,Cheque Height,Check Höjd
 DocType: Supplier,Supplier Details,Leverantör Detaljer
@@ -3009,7 +3013,7 @@
 DocType: Vehicle Log,Invoice Ref,faktura Ref
 DocType: Purchase Order,Recurring Order,Återkommande Order
 DocType: Company,Default Income Account,Standard Inkomstkonto
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Kundgrupp / Kunder
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Kundgrupp / Kunder
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Oavslutade räkenskapsår Vinst / Förlust (Credit)
 DocType: Sales Invoice,Time Sheets,tidrapporter
 DocType: Payment Gateway Account,Default Payment Request Message,Standardbetalnings Request Message
@@ -3029,10 +3033,10 @@
 DocType: Notification Control,Quotation Message,Offert Meddelande
 DocType: Employee Loan,Employee Loan Application,Employee låneansökan
 DocType: Issue,Opening Date,Öppningsdatum
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Närvaro har markerats med framgång.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Närvaro har markerats med framgång.
 DocType: Journal Entry,Remark,Anmärkning
 DocType: Purchase Receipt Item,Rate and Amount,Andel och Belopp
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Kontotyp för {0} måste vara {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Kontotyp för {0} måste vara {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Blad och Holiday
 DocType: School Settings,Current Academic Term,Nuvarande akademisk term
 DocType: School Settings,Current Academic Term,Nuvarande akademisk term
@@ -3055,7 +3059,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Student-gruppen
 DocType: Shopping Cart Settings,Quotation Series,Offert Serie
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Ett objekt finns med samma namn ({0}), ändra objektets varugrupp eller byt namn på objektet"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Välj kund
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Välj kund
 DocType: C-Form,I,jag
 DocType: Company,Asset Depreciation Cost Center,Avskrivning kostnadsställe
 DocType: Sales Order Item,Sales Order Date,Kundorder Datum
@@ -3074,20 +3078,20 @@
 DocType: Vehicle,Insurance Details,Insurance Information
 DocType: Account,Payable,Betalning sker
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Ange återbetalningstider
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Gäldenär ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Gäldenär ({0})
 DocType: Pricing Rule,Margin,Marginal
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Nya kunder
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Bruttovinst%
 DocType: Appraisal Goal,Weightage (%),Vikt (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance Datum
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Bruttoköpesumma är obligatorisk
 DocType: Lead,Address Desc,Adress fallande
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Party är obligatoriskt
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Party är obligatoriskt
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ämnet Namn
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Minst en av de sålda eller köpta måste väljas
-DocType: Grading Structure,Grade Intervals,grade Intervaller
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Välj typ av ditt företag.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Rad # {0}: Duplikat post i referenser {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Där tillverkningsprocesser genomförs.
 DocType: Asset Movement,Source Warehouse,Källa Lager
 DocType: Installation Note,Installation Date,Installations Datum
@@ -3124,7 +3128,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Brevhuvuden för utskriftsmallar.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,Titlar för utskriftsmallar t.ex. Proforma faktura.
 DocType: Student Guardian,Student Guardian,Student Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Värderingsavgifter kan inte markerats som inklusive
 DocType: POS Profile,Update Stock,Uppdatera lager
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Olika UOM för produkter kommer att leda till felaktiga (Total) Nettovikts värden. Se till att Nettovikt för varje post är i samma UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM betyg
@@ -3152,7 +3156,7 @@
 DocType: Company,Exchange Gain / Loss Account,Exchange vinst / förlust konto
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Anställd och närvaro
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Syfte måste vara en av {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Fyll i formuläret och spara det
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Faktisk antal i lager
@@ -3168,7 +3172,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Ombeställningskvantitet
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Nuvarande jobb Öppningar
 DocType: Company,Stock Adjustment Account,Lager Justering Konto
-DocType: Journal Entry,Write Off,Avskrivning
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Avskrivning
 DocType: Timesheet Detail,Operation ID,Drift-ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Systemanvändare (inloggning) ID. Om inställt, kommer det att bli standard för alla HR former."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Från {1}
@@ -3179,27 +3183,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Leverantören levererar till kunden
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# Form / Föremål / {0}) är slut
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Nästa datum måste vara större än Publiceringsdatum
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Visa skatte uppbrott
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Visa skatte uppbrott
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},På grund / Referens Datum kan inte vara efter {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Data Import och export
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Aktieposter existerar mot Warehouse {0}, alltså du kan inte åter tilldela eller ändra det"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Inga studenter Funnet
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Inga studenter Funnet
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fakturabokningsdatum
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Sälja
 DocType: Sales Invoice,Rounded Total,Avrundat Totalt
 DocType: Product Bundle,List items that form the package.,Lista objekt som bildar paketet.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Procentuell Fördelning bör vara lika med 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Välj bokningsdatum innan du väljer Party
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Slut på AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Var god välj Citat
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Var god välj Citat
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Skapa Servicebesök
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Var god välj Citat
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Antal Avskrivningar bokat kan inte vara större än Totalt antal Avskrivningar
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Skapa Servicebesök
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vänligen kontakta för användaren som har roll försäljningschef {0}
 DocType: Company,Default Cash Account,Standard Konto
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Företag (inte kund eller leverantör) ledare.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Detta grundar sig på närvaron av denna Student
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Inga studenter i
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Lägga till fler objekt eller öppna fullständiga formen
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Ange &quot;Förväntat leveransdatum&quot;
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Följesedelsnoteringar {0} måste avbrytas innan du kan avbryta denna kundorder
@@ -3231,6 +3236,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Produkt 3
 DocType: Purchase Order,Customer Contact Email,Kundkontakt Email
 DocType: Warranty Claim,Item and Warranty Details,Punkt och garantiinformation
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Artikelnummer&gt; Varugrupp&gt; Varumärke
 DocType: Sales Team,Contribution (%),Bidrag (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Välj Programmet för att hämta obligatoriska kurser.
@@ -3245,9 +3251,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Innan avstämning
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Till {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Skatter och avgifter Added (Company valuta)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Produkt Skatte Rad {0} måste ha typen Skatt eller intäkt eller kostnad eller Avgiftsbelagd
 DocType: Sales Order,Partly Billed,Delvis Faktuerard
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Punkt {0} måste vara en fast tillgångspost
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Punkt {0} måste vara en fast tillgångspost
 DocType: Item,Default BOM,Standard BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3257,8 +3263,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Fordon
 DocType: Vehicle,Insurance Company,Försäkringsbolag
 DocType: Asset Category Account,Fixed Asset Account,Fast tillgångskonto
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Variabel
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Från Följesedel
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Variabel
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Från Följesedel
 DocType: Student,Student Email Address,Student E-postadress
 DocType: Timesheet Detail,From Time,Från Tid
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,I lager:
@@ -3270,12 +3276,12 @@
 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 +66,Intern,Intern
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adressnamn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adressnamn
 DocType: Stock Entry,From BOM,Från BOM
 DocType: Assessment Code,Assessment Code,bedömning kod
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Grundläggande
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Arkiv transaktioner före {0} är frysta
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Klicka på ""Skapa schema '"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","t.ex. Kg, enhet, nr, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referensnummer är obligatoriskt om du har angett referens Datum
 DocType: Bank Reconciliation Detail,Payment Document,betalning Dokument
@@ -3283,19 +3289,19 @@
 DocType: Salary Slip,Salary Structure,Lönestruktur
 DocType: Account,Bank,Bank
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Flygbolag
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Problem Material
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Du befinner dig i offline-läge. Du kommer inte att kunna ladda tills du har nätverket.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Inga studentgrupper skapas.
 DocType: Purchase Invoice Item,Serial No,Serienummer
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Månatliga återbetalningen belopp kan inte vara större än Lånebelopp
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Ange servicedetaljer först
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Ange servicedetaljer först
 DocType: Purchase Invoice,Print Language,print Språk
 DocType: Salary Slip,Total Working Hours,Totala arbetstiden
 DocType: Stock Entry,Including items for sub assemblies,Inklusive poster för underheter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Ange värde måste vara positiv
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Ange värde måste vara positiv
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Alla territorierna
 DocType: Purchase Invoice,Items,Produkter
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Student är redan inskriven.
@@ -3315,16 +3321,14 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Standard mätenhet för Variant &quot;{0}&quot; måste vara samma som i Mall &quot;{1}&quot;
 DocType: Shipping Rule,Calculate Based On,Beräkna baserad på
 DocType: Delivery Note Item,From Warehouse,Från Warehouse
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Inga objekt med Bill of Materials att tillverka
 DocType: Assessment Plan,Supervisor Name,Supervisor Namn
 DocType: Program Enrollment Course,Program Enrollment Course,Program Inskrivningskurs
-DocType: Grading Structure,Grading Structure,betygs struktur
 DocType: Purchase Taxes and Charges,Valuation and Total,Värdering och Total
 DocType: Tax Rule,Shipping City,Shipping stad
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Anpassa Anmälan
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Kassaflöde från rörelsen
 DocType: Sales Invoice,Shipping Rule,Frakt Regel
@@ -3345,8 +3349,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Ingen standard BOM finns till punkt {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,Välj Publiceringsdatum först
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Välj Publiceringsdatum först
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Öppningsdatum ska vara innan Slutdatum
 DocType: Leave Control Panel,Carry Forward,Skicka Vidare
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Kostnadsställe med befintliga transaktioner kan inte omvandlas till liggaren
 DocType: Department,Days for which Holidays are blocked for this department.,Dagar då helgdagar är blockerade för denna avdelning.
@@ -3359,7 +3363,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Fäst Brev
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Senaste kommunikationen
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Senaste kommunikationen
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Det går inte att dra bort när kategorin är angedd ""Värdering"" eller ""Värdering och Total"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Lista dina skattehuvuden (t.ex. moms, tull etc, de bör ha unika namn) och deras standardpriser. Detta kommer att skapa en standardmall som du kan redigera och lägga till fler senare."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Match Betalningar med fakturor
@@ -3375,7 +3379,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Totalt (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Underhållning &amp; Fritid
 DocType: Quality Inspection,Item Serial No,Produkt Löpnummer
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Skapa anställda Records
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Skapa anställda Records
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Totalt Närvarande
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,räkenskaper
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Timme
@@ -3388,10 +3392,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,Okänd
 DocType: Shipping Rule,Shipping Rule Conditions,Frakt härskar Villkor
 DocType: BOM Replace Tool,The new BOM after replacement,Den nya BOM efter byte
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Butiksförsäljning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Butiksförsäljning
 DocType: Payment Entry,Received Amount,erhållet belopp
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vänligen uppsättning Anställd Namn System i Mänskliga Resurser&gt; HR Inställningar
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Skapa för hela kvantiteten, ignorera mängd redan på beställning"
 DocType: Account,Tax,Skatt
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,MÄRKLÖS
@@ -3404,9 +3406,9 @@
 DocType: Batch,Source Document Name,Källdokumentnamn
 DocType: Batch,Source Document Name,Källdokumentnamn
 DocType: Job Opening,Job Title,Jobbtitel
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Skapa användare
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Skapa användare
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Kvantitet som Tillverkning måste vara större än 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Besöksrapport för service samtal.
 DocType: Stock Entry,Update Rate and Availability,Uppdateringsfrekvens och tillgänglighet
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,Andel som är tillåtet att ta emot eller leverera mer mot beställt antal. Till exempel: Om du har beställt 100 enheter. och din ersättning är 10% då du får ta emot 110 enheter.
@@ -3416,28 +3418,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Utgiftskonto är obligatorisk för produkten {0}
 DocType: BOM,Website Description,Webbplats Beskrivning
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Nettoförändringen i eget kapital
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Vänligen avbryta inköpsfaktura {0} först
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-postadress måste vara unikt, redan för {0}"
 DocType: Serial No,AMC Expiry Date,AMC Förfallodatum
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Mottagande
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Mottagande
 ,Sales Register,Försäljningsregistret
 DocType: Daily Work Summary Settings Company,Send Emails At,Skicka e-post Vid
 DocType: Quotation,Quotation Lost Reason,Anledning förlorad Offert
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Välj din domän
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Transaktions referensnummer {0} daterad {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Det finns inget att redigera.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Sammanfattning för denna månad och pågående aktiviteter
 DocType: Customer Group,Customer Group Name,Kundgruppnamn
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Inga kunder än!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Kassaflödesanalys
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Lånebeloppet kan inte överstiga Maximal låne Mängd {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Licens
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Ange avskrivningskonto
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Sista beställningsdatum
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Kontot {0} till inte företaget {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Serienumren i rad {0} matchar inte med leveransnotering
 DocType: Student,Guardian Details,Guardian Detaljer
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Mark Närvaro för flera anställda
@@ -3462,20 +3466,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Rad {0} # Hänsyn måste vara av typen &quot;Fast Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Ut Antal
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Regler för att beräkna fraktbeloppet för en försäljning
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Serien är obligatorisk
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Serien är obligatorisk
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansiella Tjänster
 DocType: Student Sibling,Student ID,Student-ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Olika typer av aktiviteter för Time Loggar
 DocType: Tax Rule,Sales,Försäljning
 DocType: Stock Entry Detail,Basic Amount,BASBELOPP
 DocType: Training Event,Exam,Examen
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Lager krävs för Lagervara {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Faktureringsstaten
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Överföring
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} inte förknippas med Party-konto {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} inte förknippas med Party-konto {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Fetch expanderande BOM (inklusive underenheter)
 DocType: Authorization Rule,Applicable To (Employee),Är tillämpligt för (anställd)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Förfallodatum är obligatorisk
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Påslag för Attribut {0} inte kan vara 0
@@ -3486,13 +3490,13 @@
 ,Inactive Customers,inaktiva kunder
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Kvitton
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Hur prissättning tillämpas?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Hur prissättning tillämpas?
 DocType: Stock Entry,Delivery Note No,Följesedel nr
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Om markerad, bara köpa material begäran om slut råmaterial kommer att ingå i materialet begäran. Annars kommer Material Begäran om föräldra objekt skapas"
 DocType: Cheque Print Template,Message to show,Meddelande för att visa
 DocType: Company,Retail,Detaljhandeln
 DocType: Attendance,Absent,Frånvarande
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Produktpaket
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Produktpaket
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -3502,10 +3506,10 @@
 DocType: Payment Entry,Account Paid From,Konto betalas från
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Råvaru Artikelkod
 DocType: Journal Entry,Write Off Based On,Avskrivning Baseras på
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,gör Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,gör Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Print och brevpapper
 DocType: Stock Settings,Show Barcode Field,Show Barcode Field
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Skicka e-post Leverantörs
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Skicka e-post Leverantörs
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",Lön redan behandlas för perioden mellan {0} och {1} Lämna ansökningstiden kan inte vara mellan detta datumintervall.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Installationsinfo för ett serienummer
 DocType: Guardian Interest,Guardian Interest,Guardian intresse
@@ -3518,6 +3522,7 @@
 DocType: Offer Letter,Awaiting Response,Väntar på svar
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ovan
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Ogiltig attribut {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Nämn om inte-standard betalnings konto
 DocType: Salary Slip,Earning & Deduction,Vinst &amp; Avdrag
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Tillval. Denna inställning kommer att användas för att filtrera i olika transaktioner.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negativt Värderingsvärde är inte tillåtet
@@ -3533,10 +3538,9 @@
 DocType: Production Order Item,Production Order Item,Produktion Beställningsvara
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Ingen post hittades
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Kostnad för skrotas Asset
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,delvis ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Kostnadsställe är obligatorisk för punkt {2}
 DocType: Vehicle,Policy No,policy Nej
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Få artiklar från produkt Bundle
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Få artiklar från produkt Bundle
 DocType: Asset,Straight Line,Rak linje
 DocType: Project User,Project User,projektAnvändar
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Dela
@@ -3554,7 +3558,7 @@
 DocType: Program Enrollment Tool,Get Students From,Få studenter från
 DocType: Hub Settings,Seller Country,Säljare Land
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Publicera artiklar på webbplatsen
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Grupp dina elever i omgångar
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Grupp dina elever i omgångar
 DocType: Authorization Rule,Authorization Rule,Auktoriseringsregel
 DocType: Sales Invoice,Terms and Conditions Details,Villkor Detaljer
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Specifikationer
@@ -3607,14 +3611,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Check Datum
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Konto {0}: Förälder konto {1} tillhör inte företaget: {2}
 DocType: Program Enrollment Tool,Student Applicants,elev Sökande
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Framgångsrikt bort alla transaktioner i samband med detta företag!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Inskrivningsdatum
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Skyddstillsyn
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,lönedelar
 DocType: Program Enrollment Tool,New Academic Year,Nytt läsår
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Retur / kreditnota
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Retur / kreditnota
 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 +28,Total Paid Amount,Sammanlagda belopp som betalats
 DocType: Production Order Item,Transferred Qty,Överfört Antal
@@ -3634,7 +3638,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Typ av löv som tillfällig, sjuka etc."
 DocType: Email Digest,Send regular summary reports via Email.,Skicka regelbundna sammanfattande rapporter via e-post.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Ställ in standardkonto i räkningen typ {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Ställ in standardkonto i räkningen typ {0}
 DocType: Assessment Result,Student Name,Elevs namn
 DocType: Brand,Item Manager,Produktansvarig
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Lön Betalning
@@ -3655,6 +3659,7 @@
 ,Sales Funnel,Försäljning tratt
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Förkortning är obligatorisk
 DocType: Project,Task Progress,Task framsteg
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Kundvagn
 ,Qty to Transfer,Antal Transfer
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Offerter till prospekt eller kunder
 DocType: Stock Settings,Role Allowed to edit frozen stock,Roll tillåtet att redigera fryst lager
@@ -3682,13 +3687,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Produktvis Skatte Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Institute Förkortning
 ,Item-wise Price List Rate,Produktvis Prislistavärde
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Leverantör Offert
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Leverantör Offert
 DocType: Quotation,In Words will be visible once you save the Quotation.,I Ord kommer att synas när du sparar offerten.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Kvantitet ({0}) kan inte vara en fraktion i rad {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ta ut avgifter
 DocType: Attendance,ATT-,attrak-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Streckkod {0} används redan i punkt {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Regler för att lägga fraktkostnader.
 DocType: Item,Opening Stock,ingående lager
@@ -3705,8 +3710,8 @@
 Updated via 'Time Log'","i protokollet Uppdaterad via ""Tidslog"""
 DocType: Customer,From Lead,Från Prospekt
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Order släppts för produktion.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Välj räkenskapsår ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Välj räkenskapsår ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS profil som krävs för att göra POS inlägg
 DocType: Program Enrollment Tool,Enroll Students,registrera studenter
 DocType: Hub Settings,Name Token,Namn token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standardförsäljnings
@@ -3717,7 +3722,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} mot faktura {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Projektnamn
-DocType: Supplier,Mention if non-standard receivable account,Nämn om icke-standardiserade fordran konto
+DocType: Customer,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: Production Order,Required Items,nödvändiga objekt
 DocType: Stock Ledger Entry,Stock Value Difference,Stock Värde Skillnad
@@ -3738,7 +3743,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Uppsatta mål Punkt Gruppvis för säljare.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Freeze Lager Äldre än [dagar]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Rad # {0}: Asset är obligatoriskt för anläggningstillgång köp / försäljning
-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.","Om två eller flera Prissättningsregler hittas baserat på ovanstående villkor, tillämpas prioritet . Prioritet är ett tal mellan 0 till 20, medan standardvärdet är noll (tom). Högre siffra innebär det kommer att ha företräde om det finns flera prissättningsregler med samma villkor."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Om två eller flera Prissättningsregler hittas baserat på ovanstående villkor, tillämpas prioritet . Prioritet är ett tal mellan 0 till 20, medan standardvärdet är noll (tom). Högre siffra innebär det kommer att ha företräde om det finns flera prissättningsregler med samma villkor."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Räkenskapsårets: {0} inte existerar
 DocType: Currency Exchange,To Currency,Till Valuta
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Tillåt följande användarna att godkänna ledighetsansökningar för grupp dagar.
@@ -3764,7 +3769,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Punkt {0} ignoreras eftersom det inte är en lagervara
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Skicka det här produktionsorder för ytterligare behandling.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","För att inte tillämpa prissättning regel i en viss transaktion, bör alla tillämpliga prissättning regler inaktiveras."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","För att inte tillämpa prissättning regel i en viss transaktion, bör alla tillämpliga prissättning regler inaktiveras."
 DocType: Assessment Group,Parent Assessment Group,Parent Assessment Group
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,jobb
 ,Sales Order Trends,Försäljningsorder Trender
@@ -3775,7 +3780,7 @@
 DocType: Stock Entry Detail,Additional Cost,Extra kostnad
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Budgetåret Slutdatum
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Skapa Leverantörsoffert
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Skapa Leverantörsoffert
 DocType: Quality Inspection,Incoming,Inkommande
 DocType: BOM,Materials Required (Exploded),Material som krävs (Expanderad)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Lägg till användare till din organisation, annan än dig själv"
@@ -3803,6 +3808,7 @@
 DocType: Employee,History In Company,Historia Företaget
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Nyhetsbrev
 DocType: Stock Ledger Entry,Stock Ledger Entry,Lager Ledger Entry
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Kund&gt; Kundgrupp&gt; Territorium
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Samma objekt har angetts flera gånger
 DocType: Department,Leave Block List,Lämna Block List
 DocType: Sales Invoice,Tax ID,Skatte ID
@@ -3812,7 +3818,7 @@
 DocType: Customer,Sales Partner and Commission,Försäljningen Partner och kommissionen
 DocType: Employee Loan,Rate of Interest (%) / Year,Hastighet av intresse (%) / år
 ,Project Quantity,projekt Kvantitet
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Totalt {0} för alla objekt är noll kan vara du bör ändra &#39;Fördela avgifter bygger på&#39;
 DocType: Opportunity,To Discuss,Att Diskutera
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} enheter av {1} behövs i {2} för att slutföra denna transaktion.
 DocType: Loan Type,Rate of Interest (%) Yearly,Hastighet av intresse (%) Årlig
@@ -3827,7 +3833,7 @@
 DocType: Purchase Invoice,Return,Återgå
 DocType: Production Order Operation,Production Order Operation,Produktionsorder Drift
 DocType: Pricing Rule,Disable,Inaktivera
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Verk betalning krävs för att göra en betalning
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Verk betalning krävs för att göra en betalning
 DocType: Project Task,Pending Review,Väntar På Granskning
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Tillgångs {0} kan inte skrotas, eftersom det redan är {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Totalkostnadskrav (via utgiftsräkning)
@@ -3835,11 +3841,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Mark Frånvarande
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Rad {0}: Valuta för BOM # {1} bör vara lika med den valda valutan {2}
 DocType: Journal Entry Account,Exchange Rate,Växelkurs
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Kundorder {0} är inte lämnat
 DocType: Homepage,Tag Line,Tag Linje
 DocType: Fee Component,Fee Component,avgift Komponent
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Fleet Management
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Lägga till objekt från
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Lägga till objekt från
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Lager {0}: Moderbolaget konto {1} tillhör inte företaget {2}
 DocType: Cheque Print Template,Regular,Regelbunden
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Total weightage av alla kriterier för bedömning måste vara 100%
@@ -3852,7 +3858,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Lager {0} existerar inte
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Registrera För ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Månadsdistributions Procentsatser
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Det valda alternativet kan inte ha Batch
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Värdering hastighet hittades inte för föremål {0}, vilket krävs för att göra bokföringsposter för {1} {2}. Om objektet är transaktions som prov objekt i {1}, nämn det i {1} Punkt tabellen. Annars kan du skapa ett inkommande lagertransaktion för objektet eller omnämnande värderingstakten i post och försök sedan inlämning / avbryta denna post"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Av material som levereras mot detta följesedel
 DocType: Project,Customer Details,Kunduppgifter
@@ -3861,15 +3867,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Ange url parameter för mottagaren
 DocType: Payment Entry,Paid Amount,Betalt belopp
 DocType: Assessment Plan,Supervisor,Handledare
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Uppkopplad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Uppkopplad
 ,Available Stock for Packing Items,Tillgängligt lager för förpackningsprodukter
 DocType: Item Variant,Item Variant,Produkt Variant
 DocType: Assessment Result Tool,Assessment Result Tool,Bedömningsresultatverktyg
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Scrap Punkt
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Inlämnade order kan inte tas bort
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Kvalitetshantering
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Punkt {0} har inaktiverats
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Punkt {0} har inaktiverats
 DocType: Employee Loan,Repay Fixed Amount per Period,Återbetala fast belopp per period
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vänligen ange antal förpackningar för artikel {0}
 DocType: Employee External Work History,Employee External Work History,Anställd Extern Arbetserfarenhet
@@ -3896,7 +3902,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student E ID
 DocType: Employee,Notice (days),Observera (dagar)
 DocType: Tax Rule,Sales Tax Template,Moms Mall
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Välj objekt för att spara fakturan
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Välj objekt för att spara fakturan
 DocType: Employee,Encashment Date,Inlösnings Datum
 DocType: Training Event,Internet,internet
 DocType: Account,Stock Adjustment,Lager för justering
@@ -3919,7 +3925,7 @@
 DocType: Item Variant Attribute,Attribute,Attribut
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Ange från / till intervallet
 DocType: Serial No,Under AMC,Enligt AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Produkt värderingsvärdet omräknas pga angett rabattvärde
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Produkt värderingsvärdet omräknas pga angett rabattvärde
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Standardinställningar för att försäljnings transaktioner.
 DocType: Guardian,Guardian Of ,väktare
 DocType: Grading Scale Interval,Threshold,Tröskel
@@ -3929,6 +3935,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Debetnota utfärdad
 DocType: Production Order,Warehouses,Lager
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tillgång kan inte överföras
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Denna artikel är en variant av {0} (mall).
 DocType: Workstation,per hour,per timme
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Köp av
 DocType: Announcement,Announcement,Meddelande
@@ -3944,8 +3951,8 @@
 DocType: Account,Receivable,Fordran
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Rad # {0}: Inte tillåtet att byta leverantör som beställning redan existerar
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Roll som får godkänna transaktioner som överstiger kreditgränser.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Välj produkter i Tillverkning
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Välj produkter i Tillverkning
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Basdata synkronisering, kan det ta lite tid"
 DocType: Item,Material Issue,Materialproblem
 DocType: Hub Settings,Seller Description,Säljare Beskrivning
 DocType: Employee Education,Qualification,Kvalifikation
@@ -3957,7 +3964,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Beställde
 DocType: Salary Detail,Component,Komponent
 DocType: Assessment Criteria,Assessment Criteria Group,Bedömningskriteriegrupp
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Ingående ackumulerade avskrivningar måste vara mindre än lika med {0}
 DocType: Warehouse,Warehouse Name,Lager Namn
 DocType: Naming Series,Select Transaction,Välj transaktion
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Ange Godkännande roll eller godkänna Användare
@@ -3970,7 +3977,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Det går inte att avbryta eftersom lämnad Lagernotering {0} existerar
 DocType: Employee Loan,Disbursement Date,utbetalning Datum
 DocType: Vehicle,Vehicle,Fordon
 DocType: Purchase Invoice,In Words,I Ord
@@ -3984,14 +3991,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Asset Avskrivningar och saldon
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Belopp {0} {1} överförs från {2} till {3}
 DocType: Sales Invoice,Get Advances Received,Få erhållna förskott
 DocType: Email Digest,Add/Remove Recipients,Lägg till / ta bort mottagare
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Transaktion inte tillåtet mot stoppad produktionsorder {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","För att ställa denna verksamhetsåret som standard, klicka på &quot;Ange som standard&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Ansluta sig
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Brist Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Punkt variant {0} finns med samma attribut
 DocType: Employee Loan,Repay from Salary,Repay från Lön
 DocType: Leave Application,LAP/,KNÄ/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Begärande betalning mot {0} {1} för mängden {2}
@@ -4009,7 +4016,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Detaljer Bedömningsresultat
 DocType: Employee Education,Employee Education,Anställd Utbildning
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Dubblett grupp finns i posten grupptabellen
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Det behövs för att hämta produktdetaljer.
 DocType: Salary Slip,Net Pay,Nettolön
 DocType: Account,Account,Konto
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Serienummer {0} redan har mottagits
@@ -4018,7 +4025,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Lager {0} är inte kopplat till något konto, vänligen skapa / koppla motsvarande (Asset) står för lagret."
 DocType: Purchase Invoice,Recurring Id,Återkommande Id
 DocType: Customer,Sales Team Details,Försäljnings Team Detaljer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Ta bort permanent?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Ta bort permanent?
 DocType: Expense Claim,Total Claimed Amount,Totalt yrkade beloppet
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Potentiella möjligheter för att sälja.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Ogiltigt {0}
@@ -4029,13 +4036,14 @@
 DocType: Warehouse,PIN,STIFT
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Setup din skola i ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Basförändring Belopp (Company valuta)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Inga bokföringsposter för följande lager
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Spara dokumentet först.
 DocType: Account,Chargeable,Avgift
 DocType: Company,Change Abbreviation,Ändra Förkortning
 DocType: Expense Claim Detail,Expense Date,Utgiftsdatum
 DocType: Item,Max Discount (%),Max rabatt (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Sista beställningsmängd
+DocType: Task,Is Milestone,Är Milestone
 DocType: Daily Work Summary,Email Sent To,Email skickat till
 DocType: Budget,Warn,Varna
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Alla andra anmärkningar, anmärkningsvärt ansträngning som ska gå i registren."
@@ -4056,7 +4064,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribut Värde
 ,Itemwise Recommended Reorder Level,Produktvis Rekommenderad Ombeställningsnivå
 DocType: Salary Detail,Salary Detail,lön Detalj
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Välj {0} först
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Välj {0} först
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Batch {0} av Punkt {1} har löpt ut.
 DocType: Sales Invoice,Commission,Kommissionen
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Tidrapportering för tillverkning.
@@ -4068,41 +4076,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Frys lager äldre än` bör vara mindre än% d dagar.
 DocType: Tax Rule,Purchase Tax Template,Köp Tax Mall
 ,Project wise Stock Tracking,Projektvis lager Spårning
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Underhållsschema {0} finns mot {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Faktiska Antal (vid källa/mål)
 DocType: Item Customer Detail,Ref Code,Referenskod
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Personaldokument.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Ställ Nästa Avskrivningar Datum
 DocType: HR Settings,Payroll Settings,Sociala Inställningar
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Matcha ej bundna fakturor och betalningar.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Beställa
 DocType: Email Digest,New Purchase Orders,Nya beställningar
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Root kan inte ha en överordnat kostnadsställe
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Välj märke ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Välj märke ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Ackumulerade avskrivningar som på
 DocType: Sales Invoice,C-Form Applicable,C-Form Tillämplig
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Operation Time måste vara större än 0 för drift {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Warehouse är obligatoriskt
 DocType: Supplier,Address and Contacts,Adress och kontakter
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM Omvandlings Detalj
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Håll det webb vänligt 900px (w) med 100px (h)
 DocType: Program,Program Abbreviation,program Förkortning
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Produktionsorder kan inte skickas till en objektmall
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Avgifter uppdateras i inköpskvitto för varje post
 DocType: Warranty Claim,Resolved By,Åtgärdad av
 DocType: Bank Guarantee,Start Date,Start Datum
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Tilldela avgångar under en period.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Checkar och Insättningar rensas felaktigt
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Skapa kund citat
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Skapa kund citat
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Genomsnittlig tid det tar för leverantören att leverera
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,bedömning Resultat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Timmar
 DocType: Project,Expected Start Date,Förväntat startdatum
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Ta bort alternativ om avgifter inte är tillämpade för denna post
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Transaktions valutan måste vara samma som Payment Gateway valuta
 DocType: Payment Entry,Receive,Receive
@@ -4113,19 +4120,19 @@
 DocType: Workstation,Operating Costs,Operations Kostnader
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Åtgärder om sammanlagda månadsbudgeten överskrids
 DocType: Purchase Invoice,Submit on creation,Lämna in en skapelse
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Valuta för {0} måste vara {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Valuta för {0} måste vara {1}
 DocType: Asset,Disposal Date,bortskaffande Datum
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","E-post kommer att skickas till alla aktiva anställda i bolaget vid en given timme, om de inte har semester. Sammanfattning av svaren kommer att sändas vid midnatt."
 DocType: Employee Leave Approver,Employee Leave Approver,Anställd Lämna godkännare
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Rad {0}: En Beställnings post finns redan för detta lager {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Det går inte att ange som förlorad, eftersom Offert har gjorts."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,utbildning Feedback
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Produktionsorder {0} måste lämnas in
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Välj startdatum och slutdatum för punkt {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Kursen är obligatorisk i rad {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Hittills inte kan vara före startdatum
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Lägg till / redigera priser
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Lägg till / redigera priser
 DocType: Batch,Parent Batch,Föräldragrupp
 DocType: Cheque Print Template,Cheque Print Template,Check utskriftsmall
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,Kontoplan på Kostnadsställen
@@ -4138,7 +4145,7 @@
 ,Ordered Items To Be Delivered,Beställda varor som skall levereras
 DocType: Account,Income,Inkomst
 DocType: Industry Type,Industry Type,Industrityp
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Något gick snett!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Något gick snett!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Fakturan {0} har redan lämnats in
 DocType: Assessment Result Detail,Score,Göra
@@ -4169,17 +4176,17 @@
 DocType: Item,Variant Based On,Variant Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Totalt weightage delas ska vara 100%. Det är {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Dina Leverantörer
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Kan inte ställa in då Förlorad kundorder är gjord.
+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.
 DocType: Request for Quotation Item,Supplier Part No,Leverantör varunummer
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Mottagen från
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',Det går inte att dra när kategori är för &quot;Värdering&quot; eller &quot;Vaulation och Total&quot;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Mottagen från
 DocType: Lead,Converted,Konverterad
 DocType: Item,Has Serial No,Har Löpnummer
 DocType: Employee,Date of Issue,Utgivningsdatum
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Från {0} för {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Från {0} för {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Rad # {0}: Ställ Leverantör för punkt {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,V {0}: Timmar Värdet måste vara större än noll.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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.
@@ -4188,20 +4195,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,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
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fakturerings valutan måste vara lika med antingen standard comapany valuta eller partikontovaluta
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Lämna inlösen
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Vad gör den?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,Till Warehouse
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Alla Student Antagning
 ,Average Commission Rate,Genomsnittligt commisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,Närvaro kan inte markeras för framtida datum
 DocType: Pricing Rule,Pricing Rule Help,Prissättning Regel Hjälp
 DocType: School House,House Name,Hus-namn
 DocType: Purchase Taxes and Charges,Account Head,Kontohuvud
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Elektrisk
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lägg till resten av din organisation som dina användare. Du kan också bjuda in Kunder till din portal genom att lägga till dem från Kontakter
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Lägg till resten av din organisation som dina användare. Du kan också bjuda in Kunder till din portal genom att lägga till dem från Kontakter
 DocType: Stock Entry,Total Value Difference (Out - In),Total Value Skillnad (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4210,7 +4217,7 @@
 DocType: Item,Customer Code,Kund kod
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Påminnelse födelsedag för {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Dagar sedan senast Order
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Debitering av kontot måste vara ett balanskonto
 DocType: Buying Settings,Naming Series,Namge Serien
 DocType: Leave Block List,Leave Block List Name,Lämna Blocklistnamn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Insurance Startdatum bör vara mindre än försäkring Slutdatum
@@ -4225,9 +4232,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Lönebesked av personal {0} redan skapats för tidrapporten {1}
 DocType: Vehicle Log,Odometer,Vägmätare
 DocType: Sales Order Item,Ordered Qty,Beställde Antal
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Punkt {0} är inaktiverad
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Punkt {0} är inaktiverad
 DocType: Stock Settings,Stock Frozen Upto,Lager Fryst Upp
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM inte innehåller någon lagervara
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM inte innehåller någon lagervara
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Projektverksamhet / uppgift.
 DocType: Vehicle Log,Refuelling Details,Tanknings Detaljer
@@ -4237,8 +4244,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Sista köpkurs hittades inte
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Skriv engångsavgift (Company valuta)
 DocType: Sales Invoice Timesheet,Billing Hours,fakturerings Timmar
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,Standard BOM för {0} hittades inte
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,Standard BOM för {0} hittades inte
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Rad # {0}: Ställ in beställningsmängd
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Tryck på objekt för att lägga till dem här
 DocType: Fees,Program Enrollment,programmet Inskrivning
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landad Kostnad rabatt
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Ställ in {0}
@@ -4262,7 +4270,7 @@
 DocType: Maintenance Visit,Maintenance Date,Underhållsdatum
 DocType: Purchase Invoice Item,Rejected Serial No,Avvisat Serienummer
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,År startdatum eller slutdatum överlappar med {0}. För att undvika ställ företag
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Startdatum bör vara mindre än slutdatumet för punkt {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.","Exempel:. ABCD ##### Om serien är inställd och Löpnummer inte nämns i transaktioner, skapas automatiska serienummer  utifrån denna serie. Om du alltid vill ange serienumren för denna artikel. lämna det tomt."
 DocType: Upload Attendance,Upload Attendance,Ladda upp Närvaro
@@ -4339,7 +4347,6 @@
 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
-DocType: Grade Interval,Grade Interval,grade Intervall
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Räkenskapsårets Startdatum och Räkenskapsårets Slutdatum är redan inställd under räkenskapsåret {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Datum uppdateras
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4386,14 +4393,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Lämna avmarkerad om du inte vill överväga batch medan du gör kursbaserade grupper.
 DocType: Asset,Frequency of Depreciation (Months),Frekvens av avskrivningar (månader)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,KUNDKONTO
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,KUNDKONTO
 DocType: Landed Cost Item,Landed Cost Item,Landad kostnadspost
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Setup en enkel hemsida för min organisation
 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 +666,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Ange Attribut Värde för attribut {0}
 DocType: Item,Default Warehouse,Standard Lager
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Budget kan inte tilldelas mot gruppkonto {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Ange huvud kostnadsställe
@@ -4439,7 +4446,7 @@
 DocType: Opportunity Item,Basic Rate,Baskurs
 DocType: GL Entry,Credit Amount,Kreditbelopp
 DocType: Cheque Print Template,Signatory Position,tecknaren Position
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Ange som förlorade
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Ange som förlorade
 DocType: Timesheet,Total Billable Hours,Totalt debiterbara timmar
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Kvitto Notera
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Detta grundar sig på transaktioner mot denna kund. Se tidslinje nedan för mer information
@@ -4453,11 +4460,11 @@
 ,Items To Be Requested,Produkter att begäras
 DocType: Purchase Order,Get Last Purchase Rate,Hämta Senaste Beställningsvärdet
 DocType: Company,Company Info,Företagsinfo
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Välj eller lägga till en ny kund
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Välj eller lägga till en ny kund
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Kostnadsställe krävs för att boka en räkningen
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Tillämpning av medel (tillgångar)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Detta är baserat på närvaron av detta till anställda
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Bankkortkonto
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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)
@@ -4466,13 +4473,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Köpesumma
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Leverantör Offert {0} skapades
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,End år kan inte vara före startåret
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,End år kan inte vara före startåret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Ersättningar till anställda
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Vänligen ange ett standardkalender för anställd {0} eller Company {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} existerar inte
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} existerar inte
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Rad nr {0}: Beloppet kan inte vara större än utestående beloppet mot utgiftsräkning {1}. I avvaktan på Beloppet är {2}
@@ -4481,15 +4488,17 @@
 DocType: Quality Inspection Reading,Reading 3,Avläsning 3
 ,Hub,Nav
 DocType: GL Entry,Voucher Type,Rabatt Typ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Prislista hittades inte eller avaktiverad
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Prislista hittades inte eller avaktiverad
 DocType: Employee Loan Application,Approved,Godkänd
 DocType: Pricing Rule,Price,Pris
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',"Anställd sparkades på {0} måste ställas in som ""lämnat"""
 DocType: Guardian,Guardian,väktare
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Bedömning {0} skapades för anställd {1} på visst datumintervall
 DocType: Employee,Education,Utbildning
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,Kampanj namnges av
 DocType: Employee,Current Address Is,Nuvarande adress är
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,ändrad
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Tillval. Ställer företagets standardvaluta, om inte annat anges."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Redovisning journalanteckningar.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Tillgång Antal på From Warehouse
@@ -4498,7 +4507,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Rad {0}: Party / konto stämmer inte med {1} / {2} i {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Ange utgiftskonto
 DocType: Account,Stock,Lager
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Rad # {0}: Referensdokument Type måste vara en av inköpsorder, inköpsfaktura eller journalanteckning"
 DocType: Employee,Current Address,Nuvarande Adress
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Om artikeln är en variant av ett annat objekt kommer beskrivning, bild, prissättning, skatter etc att ställas från mallen om inte annat uttryckligen anges"
 DocType: Serial No,Purchase / Manufacture Details,Inköp / Tillverknings Detaljer
@@ -4526,7 +4535,7 @@
 DocType: Hub Settings,Hub Settings,Nav Inställningar
 DocType: Project,Gross Margin %,Bruttomarginal%
 DocType: BOM,With Operations,Med verksamhet
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Bokföringsposter har redan gjorts i valuta {0} för företag {1}. Välj en fordran eller skuld konto med valuta {0}.
 DocType: Asset,Is Existing Asset,Är befintlig tillgång
 DocType: Salary Detail,Statistical Component,Statistisk komponent
 DocType: Salary Detail,Statistical Component,Statistisk komponent
@@ -4551,7 +4560,7 @@
 DocType: Assessment Plan,Room,Rum
 DocType: Purchase Order,Advance Paid,Förskottsbetalning
 DocType: Item,Item Tax,Produkt Skatt
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Material till leverantören
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Material till leverantören
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Punkt Faktura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Tröskel {0}% visas mer än en gång
 DocType: Expense Claim,Employees Email Id,Anställdas E-post Id
@@ -4582,9 +4591,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Fäst Logo
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,lager~~POS=TRUNC
 DocType: Customer,Commission Rate,Provisionbetyg
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Gör Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Gör Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block ledighet applikationer avdelningsvis.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",Betalning Type måste vara en av mottagning Betala och intern överföring
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",Betalning Type måste vara en av mottagning Betala och intern överföring
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Kundvagnen är tom
 DocType: Vehicle,Model,Modell
@@ -4595,6 +4604,7 @@
 DocType: Manufacturing Settings,Allow Production on Holidays,Tillåt Produktion på helgdagar
 DocType: Sales Order,Customer's Purchase Order Date,Kundens inköpsorder Datum
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Kapital Lager
+DocType: Shopping Cart Settings,Show Public Attachments,Visa offentliga bilagor
 DocType: Packing Slip,Package Weight Details,Paket Vikt Detaljer
 DocType: Payment Gateway Account,Payment Gateway Account,Betalning Gateway konto
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Efter betalning avslutad omdirigera användare till valda sidan.
@@ -4613,15 +4623,15 @@
 DocType: Batch,Expiry Date,Utgångsdatum
 ,Supplier Addresses and Contacts,Leverantör adresser och kontakter
 ,accounts-browser,konton-browser
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vänligen välj kategori först
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vänligen välj kategori först
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Projektchef.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","För att möjliggöra överfakturering eller över beställning, uppdatera &quot;ersättning&quot; i lager inställningar eller objekt."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Visa inte någon symbol som $ etc bredvid valutor.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Halv Dag)
 DocType: Supplier,Credit Days,Kreditdagar
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Göra Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Göra Student Batch
 DocType: Leave Type,Is Carry Forward,Är Överförd
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Hämta artiklar från BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Hämta artiklar från BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Ledtid dagar
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Rad # {0}: Publiceringsdatum måste vara densamma som inköpsdatum {1} av tillgångar {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Ange kundorder i tabellen ovan
@@ -4638,8 +4648,6 @@
 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 +196,Row {0}: Debit entry can not be linked with a {1},Rad {0}: debitering kan inte kopplas till en {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Vänligen uppsätt nummerserien för deltagande via Setup&gt; Numbers Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 eab4ea9..e4209fe 100644
--- a/erpnext/translations/ta.csv
+++ b/erpnext/translations/ta.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,வாடகைக்கு
 DocType: Purchase Order,PO-,இம்
 DocType: POS Profile,Applicable for User,பயனர் பொருந்தும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","நிறுத்தி உற்பத்தி ஆணை ரத்து செய்ய முடியாது, ரத்து செய்ய முதலில் அதை தடை இல்லாத"
 DocType: Vehicle Service,Mileage,மைலேஜ்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,நீங்கள் உண்மையில் இந்த சொத்து கைவிட்டால் செய்ய விரும்புகிறீர்களா?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,இயல்புநிலை சப்ளையர் தேர்வு
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,இயல்புநிலை சப்ளையர் தேர்வு
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},நாணய விலை பட்டியல் தேவையான {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* பரிமாற்றத்தில் கணக்கிடப்படுகிறது.
 DocType: Purchase Order,Customer Contact,வாடிக்கையாளர் தொடர்பு
@@ -42,7 +42,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),சிறந்த {0} பூஜ்யம் விட குறைவாக இருக்க முடியாது ( {1} )
 DocType: Manufacturing Settings,Default 10 mins,10 நிமிடங்கள் இயல்புநிலை
 DocType: Leave Type,Leave Type Name,வகை பெயர் விட்டு
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,திறந்த காட்டு
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,திறந்த காட்டு
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,தொடர் வெற்றிகரமாக புதுப்பிக்கப்பட்டது
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,வெளியேறுதல்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural ஜர்னல் நுழைவு சமர்ப்பிக்கப்பட்டது
@@ -58,14 +58,13 @@
 ,Batch Item Expiry Status,தொகுதி பொருள் காலாவதியாகும் நிலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,வங்கி உண்டியல்
 DocType: Mode of Payment Account,Mode of Payment Account,கொடுப்பனவு கணக்கு முறை
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,காட்டு மாறிகள்
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,காட்டு மாறிகள்
 DocType: Academic Term,Academic Term,கல்வி கால
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,பொருள்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,அளவு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,அளவு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,கணக்குகள் அட்டவணை காலியாக இருக்க முடியாது.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),கடன்கள் ( கடன்)
 DocType: Employee Education,Year of Passing,தேர்ச்சி பெறுவதற்கான ஆண்டு
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","குறிப்பு:% கள், பொருள் குறியீடு:% s மற்றும் வாடிக்கையாளர்% s:"
 DocType: Item,Country of Origin,உருவான நாடு
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,பங்கு
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,திறந்த சிக்கல்கள்
@@ -74,7 +73,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,உடல்நலம்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),கட்டணம் தாமதம் (நாட்கள்)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,சேவை செலவு
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},வரிசை எண்: {0} ஏற்கனவே விற்பனை விலைப்பட்டியல் குறிக்கப்படுகிறது உள்ளது: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,விலைப்பட்டியல்
 DocType: Maintenance Schedule Item,Periodicity,வட்டம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,நிதியாண்டு {0} தேவையான
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,எதிர்பார்த்த வழங்குதல் தேதி விற்பனை ஆர்டர் தேதி முன் இருக்க உள்ளது
@@ -109,27 +109,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","இரண்டு பத்திகள், பழைய பெயர் ஒரு புதிய பெயர் ஒன்று CSV கோப்பு இணைக்கவும்"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} எந்த செயலில் நிதியாண்டு இல்லை.
 DocType: Packed Item,Parent Detail docname,பெற்றோர் விரிவாக docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",குறிப்பு: {0} பொருள் குறியீடு: {1} மற்றும் வாடிக்கையாளர்: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,கிலோ
 DocType: Student Log,Log,புகுபதிகை
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ஒரு வேலை திறப்பு.
 DocType: Item Attribute,Increment,சம்பள உயர்வு
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,கிடங்கு தேர்ந்தெடுக்கவும் ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,விளம்பரம்
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,அதே நிறுவனம் ஒன்றுக்கு மேற்பட்ட முறை உள்ளிட்ட
 DocType: Employee,Married,திருமணம்
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},அனுமதி இல்லை {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,இருந்து பொருட்களை பெற
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},அனுமதி இல்லை {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},பங்கு விநியோக குறிப்பு எதிராக மேம்படுத்தப்பட்டது முடியாது {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},தயாரிப்பு {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,உருப்படிகள் எதுவும் பட்டியலிடப்படவில்லை
 DocType: Payment Reconciliation,Reconcile,சமரசம்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,மளிகை
 DocType: Quality Inspection Reading,Reading 1,1 படித்தல்
 DocType: Process Payroll,Make Bank Entry,வங்கி நுழைவு செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,ஓய்வூதிய நிதி
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,அடுத்து தேய்மானம் தேதி கொள்முதல் தேதி முன்பாக இருக்கக் கூடாது
 DocType: SMS Center,All Sales Person,அனைத்து விற்பனை நபர்
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** மாதாந்திர விநியோகம் ** நீங்கள் உங்கள் வணிக பருவகால இருந்தால் நீங்கள் மாதங்கள் முழுவதும் பட்ஜெட் / இலக்கு விநியோகிக்க உதவுகிறது.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,பொருட்களை காணவில்லை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,பொருட்களை காணவில்லை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,சம்பளத் திட்டத்தை காணாமல்
 DocType: Lead,Person Name,நபர் பெயர்
 DocType: Sales Invoice Item,Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள்
@@ -138,16 +140,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",எ.கா. &quot;முதன்மை பள்ளி&quot; அல்லது &quot;பல்கலைக்கழகம்&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,பங்கு அறிக்கைகள்
 DocType: Warehouse,Warehouse Detail,சேமிப்பு கிடங்கு விரிவாக
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},கடன் எல்லை வாடிக்கையாளர் கடந்து {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,கால முடிவு தேதி பின்னர் கால இணைக்கப்பட்ட செய்ய கல்வியாண்டின் ஆண்டு முடிவு தேதி விட முடியாது (கல்வி ஆண்டு {}). தேதிகள் சரிசெய்து மீண்டும் முயற்சிக்கவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;நிலையான சொத்து உள்ளது&quot; சொத்து சாதனை உருப்படியை எதிராக உள்ளது என, நீக்கம் செய்ய முடியாது"
 DocType: Vehicle Service,Brake Oil,பிரேக் ஆயில்
 DocType: Tax Rule,Tax Type,வரி வகை
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},நீங்கள் முன் உள்ளீடுகளை சேர்க்க அல்லது மேம்படுத்தல் அங்கீகாரம் இல்லை {0}
 DocType: BOM,Item Image (if not slideshow),பொருள் படம் (இல்லையென்றால் ஸ்லைடுஷோ)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,"ஒரு வாடிக்கையாளர் , அதே பெயரில்"
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(அவ்வேளை விகிதம் / 60) * உண்மையான நடவடிக்கையை நேரம்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM தேர்வு
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM தேர்வு
 DocType: SMS Log,SMS Log,எஸ்எம்எஸ் புகுபதிகை
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,வழங்கப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} விடுமுறை வரம்பு தேதி தேதி இடையே அல்ல
@@ -168,7 +170,7 @@
 DocType: Academic Term,Schools,பள்ளிகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ஊழியர் காணப்படவில்லை விடுப்பு குறிப்பிடும் வார்த்தைகளோ {0} க்கான {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,முதல் நிறுவனம் உள்ளிடவும்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,முதல் நிறுவனம் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,மொத்த செலவு
@@ -183,7 +185,7 @@
 DocType: Expense Claim Detail,Claim Amount,உரிமை தொகை
 DocType: Employee,Mr,திரு
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer குழு அட்டவணையில் பிரதி வாடிக்கையாளர் குழு
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,வழங்குபவர் வகை / வழங்குபவர்
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,வழங்குபவர் வகை / வழங்குபவர்
 DocType: Naming Series,Prefix,முற்சேர்க்கை
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,நுகர்வோர்
 DocType: Employee,B-,பி-
@@ -192,11 +194,11 @@
 DocType: Training Result Employee,Grade,தரம்
 DocType: Sales Invoice Item,Delivered By Supplier,சப்ளையர் மூலம் வழங்கப்படுகிறது
 DocType: SMS Center,All Contact,அனைத்து தொடர்பு
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,உற்பத்தி ஆணை ஏற்கனவே BOM அனைத்து பொருட்கள் உருவாக்கப்பட்ட
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,ஆண்டு சம்பளம்
 DocType: Daily Work Summary,Daily Work Summary,தினசரி வேலை சுருக்கம்
 DocType: Period Closing Voucher,Closing Fiscal Year,நிதியாண்டு மூடுவதற்கு
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} உறைந்து
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} உறைந்து
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,கணக்கு வரைபடம் உருவாக்க இருக்கும் நிறுவனத்தை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,பங்கு செலவுகள்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,இலக்கு கிடங்கு தேர்ந்தெடுக்கவும்
@@ -205,12 +207,12 @@
 DocType: Journal Entry,Contra Entry,கான்ட்ரா நுழைவு
 DocType: Journal Entry Account,Credit in Company Currency,நிறுவனத்தின் நாணய கடன்
 DocType: Delivery Note,Installation Status,நிறுவல் நிலைமை
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",நீங்கள் வருகை புதுப்பிக்க விரும்புகிறீர்களா? <br> தற்போதைய: {0} \ <br> இருக்காது: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ஏற்கப்பட்டது + நிராகரிக்கப்பட்டது அளவு பொருள் பெறப்பட்டது அளவு சமமாக இருக்க வேண்டும் {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,வழங்கல் மூலப்பொருட்கள் வாங்க
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,கட்டணம் குறைந்தது ஒரு முறை பிஓஎஸ் விலைப்பட்டியல் தேவைப்படுகிறது.
 DocType: Products Settings,Show Products as a List,நிகழ்ச்சி பொருட்கள் ஒரு பட்டியல்
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", டெம்ப்ளேட் பதிவிறக்கம் பொருத்தமான தரவு நிரப்ப செய்தது கோப்பு இணைக்கவும்.
@@ -225,7 +227,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,தேய்மானம் நுழைவு செய்ய
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,கோரிக்கை வகை
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,பணியாளர் செய்ய
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,பணியாளர் செய்ய
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,ஒலிபரப்புதல்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,நிர்வாகத்தினருக்கு
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,குலையை மூடுதல் மேற்கொள்ளப்படும்.
@@ -241,6 +243,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,பராமரிப்பு வருகைகள் திட்டம்.
 DocType: SMS Settings,Enter url parameter for message,செய்தி இணைய அளவுரு உள்ளிடவும்
 DocType: POS Profile,Customer Groups,வாடிக்கையாளர் குழுக்கள்
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,நிதி அறிக்கைகள்
 DocType: Guardian,Students,மாணவர்கள்
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,விலை மற்றும் தள்ளுபடி விண்ணப்பம் செய்வதற்கான விதிமுறைகள் .
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,விலை பட்டியல் கொள்முதல் அல்லது விற்பனை பொருந்தும் வேண்டும்
@@ -266,11 +269,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},அட்வான்ஸ் தொகை விட அதிகமாக இருக்க முடியாது {0} {1}
 DocType: Naming Series,Series List for this Transaction,இந்த பரிவர்த்தனை தொடர் பட்டியல்
 DocType: Company,Default Payroll Payable Account,இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,புதுப்பிக்கப்பட்டது மின்னஞ்சல் குழு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,புதுப்பிக்கப்பட்டது மின்னஞ்சல் குழு
 DocType: Sales Invoice,Is Opening Entry,நுழைவு திறக்கிறது
 DocType: Customer Group,Mention if non-standard receivable account applicable,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு பொருந்தினால்
 DocType: Course Schedule,Instructor Name,பயிற்றுவிப்பாளர் பெயர்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,கிடங்கு தேவையாக முன் சமர்ப்பிக்க
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,மறுவிற்பனையாளர்
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","தேர்ந்தெடுக்கப்பட்டால், பொருள் கோரிக்கைகளில் பங்கற்ற பொருட்களை அடங்கும்."
@@ -278,7 +281,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,விற்பனை விலைப்பட்டியல் பொருள் எதிராக
 ,Production Orders in Progress,முன்னேற்றம் உற்பத்தி ஆணைகள்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,கடன் இருந்து நிகர பண
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage முழு உள்ளது, காப்பாற்ற முடியவில்லை"
 DocType: Lead,Address & Contact,முகவரி மற்றும் தொடர்பு கொள்ள
 DocType: Leave Allocation,Add unused leaves from previous allocations,முந்தைய ஒதுக்கீடுகளை இருந்து பயன்படுத்தப்படாத இலைகள் சேர்க்கவும்
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},அடுத்த தொடர் {0} ம் உருவாக்கப்பட்ட {1}
@@ -304,8 +307,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),மொத்த செலவுவகை தொகை (நேரம் தாள் வழியாக)
 DocType: Item Website Specification,Item Website Specification,பொருள் வலைத்தளம் குறிப்புகள்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,தடுக்கப்பட்ட விட்டு
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,வங்கி பதிவுகள்
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},பொருள் {0} வாழ்க்கை அதன் இறுதியில் அடைந்துவிட்டது {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,வங்கி பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,வருடாந்திர
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,பங்கு நல்லிணக்க பொருள்
 DocType: Stock Entry,Sales Invoice No,விற்பனை விலைப்பட்டியல் இல்லை
@@ -323,8 +326,8 @@
 DocType: Item,Publish in Hub,மையம் உள்ள வெளியிடு
 DocType: Student Admission,Student Admission,மாணவர் சேர்க்கை
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,பொருள் {0} ரத்து
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,பொருள் கோரிக்கை
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,பொருள் {0} ரத்து
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,பொருள் கோரிக்கை
 DocType: Bank Reconciliation,Update Clearance Date,இசைவு தேதி புதுப்பிக்க
 DocType: Item,Purchase Details,கொள்முதல் விவரம்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},கொள்முதல் ஆணை உள்ள &#39;மூலப்பொருட்கள் சப்ளை&#39; அட்டவணை காணப்படவில்லை பொருள் {0} {1}
@@ -360,10 +363,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,மிகச்சிறந்த காசோலைகள் மற்றும் அழிக்க வைப்பு
 DocType: Item,Synced With Hub,ஹப் ஒத்திசைய
 DocType: Vehicle,Fleet Manager,கடற்படை மேலாளர்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},ரோ # {0}: {1} உருப்படியை எதிர்மறையாக இருக்க முடியாது {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,தவறான கடவுச்சொல்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},ரோ # {0}: {1} உருப்படியை எதிர்மறையாக இருக்க முடியாது {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,தவறான கடவுச்சொல்
 DocType: Item,Variant Of,மாறுபாடு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',அது 'அளவு உற்பத்தி செய்ய' நிறைவு அளவு அதிகமாக இருக்க முடியாது
 DocType: Period Closing Voucher,Closing Account Head,கணக்கு தலைமை மூடுவதற்கு
 DocType: Employee,External Work History,வெளி வேலை வரலாறு
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,வட்ட குறிப்பு பிழை
@@ -377,12 +380,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,தானியங்கி பொருள் கோரிக்கை உருவாக்கம் மின்னஞ்சல் மூலம் தெரிவிக்க
 DocType: Journal Entry,Multi Currency,பல நாணய
 DocType: Payment Reconciliation Invoice,Invoice Type,விலைப்பட்டியல் வகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,டெலிவரி குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,டெலிவரி குறிப்பு
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,வரி அமைத்தல்
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,விற்கப்பட்டது சொத்து செலவு
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,நீங்கள் அதை இழுத்து பின்னர் கொடுப்பனவு நுழைவு மாற்றப்பட்டுள்ளது. மீண்டும் அதை இழுக்க கொள்ளவும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
-DocType: Grade Interval,Min Score,min மதிப்பெண்
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} பொருள் வரி இரண்டு முறை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,இந்த வாரம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Student Applicant,Admitted,ஒப்பு
 DocType: Workstation,Rent Cost,வாடகை செலவு
@@ -395,7 +397,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ஆணை மதிப்பு
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,வங்கி / பண கட்சிக்கு எதிராக அல்லது உள் பரிமாற்ற பரிவர்த்தனைகள்
 DocType: Shipping Rule,Valid for Countries,நாடுகள் செல்லுபடியாகும்
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,இந்த உருப்படி ஒரு டெம்ப்ளேட் உள்ளது பரிமாற்றங்களை பயன்படுத்த முடியாது. 'இல்லை நகல் அமைக்க வரை பொருள் பண்புகளை மாறிகள் மீது நகல்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,அது கருதப்பட்டு மொத்த ஆணை
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","பணியாளர் பதவி ( எ.கா., தலைமை நிர்வாக அதிகாரி , இயக்குனர் முதலியன) ."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,துறையில் மதிப்பு ' மாதம் நாளில் பூசை ' உள்ளிடவும்
@@ -404,14 +406,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},ரோ # {0}: கொள்முதல் விலைப்பட்டியல் இருக்கும் சொத்துடன் எதிராகவும் முடியாது {1}
 DocType: Item Tax,Tax Rate,வரி விகிதம்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ஏற்கனவே பணியாளர் ஒதுக்கப்பட்ட {1} காலம் {2} க்கான {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,உருப்படி தேர்வுசெய்க
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,கொள்முதல் விலைப்பட்டியல் {0} ஏற்கனவே சமர்ப்பிக்கப்பட்ட
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},ரோ # {0}: கூறு எண் அதே இருக்க வேண்டும் {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,அல்லாத குழு மாற்றுக
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ஒரு பொருள் ஒரு தொகுதி (நிறைய).
 DocType: C-Form Invoice Detail,Invoice Date,விலைப்பட்டியல் தேதி
 DocType: GL Entry,Debit Amount,பற்று தொகை
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},மட்டுமே கம்பெனி ஒன்றுக்கு 1 கணக்கு இருக்க முடியாது {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,இணைப்பு பார்க்கவும்
 DocType: Purchase Order,% Received,% பெறப்பட்டது
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,மாணவர் குழுக்கள் உருவாக்க
@@ -442,9 +444,9 @@
 DocType: Request for Quotation,Request for Quotation,விலைப்பட்டியலுக்கான கோரிக்கை
 DocType: Salary Slip Timesheet,Working Hours,வேலை நேரங்கள்
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ஏற்கனவே தொடரில் தற்போதைய / தொடக்க வரிசை எண் மாற்ற.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
-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.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ஒரு புதிய வாடிக்கையாளர் உருவாக்கவும்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","பல விலை விதிகள் நிலவும் தொடர்ந்து இருந்தால், பயனர்கள் முரண்பாட்டை தீர்க்க கைமுறையாக முன்னுரிமை அமைக்க கேட்கப்பட்டது."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,கொள்முதல் ஆணைகள் உருவாக்க
 ,Purchase Register,பதிவு வாங்குவதற்கு
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,பிரயோகிக்கப்படும் கட்டணங்கள்
@@ -452,7 +454,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) பங்கு வேண்டும் 'விடுப்பு தரப்பில் சாட்சி'
 DocType: Purchase Receipt,Vehicle Date,வாகன தேதி
 DocType: Student Log,Medical,மருத்துவம்
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,இழந்து காரணம்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,இழந்து காரணம்
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,முன்னணி உரிமையாளர் முன்னணி அதே இருக்க முடியாது
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,ஒதுக்கப்பட்ட தொகை சரிசெய்யப்படாத  அளவு பெரியவனல்லவென்று முடியும்
 DocType: Announcement,Receiver,பெறுநர்
@@ -469,6 +471,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,அளவு மற்றும் விகிதம்
 DocType: Delivery Note,% Installed,% நிறுவப்பட்ட
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,வகுப்பறைகள் / ஆய்வுக்கூடங்கள் போன்றவை அங்கு விரிவுரைகள் திட்டமிடப்பட்டுள்ளது.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,முதல் நிறுவனத்தின் பெயரை உள்ளிடுக
 DocType: Purchase Invoice,Supplier Name,வழங்குபவர் பெயர்
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext கையேட்டை வாசிக்க
@@ -485,16 +488,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,கட்டாய துறையில் - கல்வி ஆண்டு
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,கட்டாய துறையில் - கல்வி ஆண்டு
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,அந்த மின்னஞ்சல் ஒரு பகுதியாக சென்று அந்த அறிமுக உரை தனிப்பயனாக்கலாம். ஒவ்வொரு நடவடிக்கைக்கும் ஒரு தனி அறிமுக உரை உள்ளது.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},நிறுவனம் இயல்புநிலை செலுத்தப்பட கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,அனைத்து உற்பத்தி செயல்முறைகள் உலக அமைப்புகள்.
 DocType: Accounts Settings,Accounts Frozen Upto,உறைந்த வரை கணக்குகள்
 DocType: SMS Log,Sent On,அன்று அனுப்பப்பட்டது
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,கற்பிதம் {0} காரணிகள் அட்டவணை பல முறை தேர்வு
 DocType: HR Settings,Employee record is created using selected field. ,பணியாளர் பதிவு தேர்ந்தெடுக்கப்பட்ட துறையில் பயன்படுத்தி உருவாக்கப்பட்டது.
 DocType: Sales Order,Not Applicable,பொருந்தாது
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,விடுமுறை மாஸ்டர் .
 DocType: Request for Quotation Item,Required Date,தேவையான தேதி
 DocType: Delivery Note,Billing Address,பில்லிங் முகவரி
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,பொருள் கோட் உள்ளிடவும்.
 DocType: BOM,Costing,செலவு
 DocType: Tax Rule,Billing County,பில்லிங் உள்ளூரில்
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","தேர்ந்தெடுக்கப்பட்டால், ஏற்கனவே அச்சிடுக விகிதம் / அச்சிடுக தொகை சேர்க்கப்பட்டுள்ளது என, வரி தொகை"
@@ -510,6 +514,7 @@
 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,பத்திரங்கள் மற்றும் வைப்பு
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","அது இல்லை இது சில பொருட்களை எதிராக பரிமாற்றங்கள் உள்ளன, மதிப்பீடு முறை மாற்ற முடியாது சொந்த மதிப்பீட்டு முறை தான்"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ஒதுக்கப்பட்ட மொத்த இலைகள் கட்டாயமாகும்
 DocType: Job Opening,Description of a Job Opening,ஒரு வேலை ஆரம்பிப்பு விளக்கம்
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,இன்று நிலுவையில் நடவடிக்கைகள்
@@ -531,13 +536,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,கோர்ஸ் தேர்ந்தெடுக்கவும்
 DocType: Timesheet Detail,Hrs,மணி
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 DocType: Stock Entry Detail,Difference Account,வித்தியாசம் கணக்கு
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,அதன் சார்ந்து பணி {0} மூடவில்லை நெருக்கமாக பணி அல்ல முடியும்.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,பொருள் கோரிக்கை எழுப்பப்படும் எந்த கிடங்கு உள்ளிடவும்
 DocType: Production Order,Additional Operating Cost,கூடுதல் இயக்க செலவு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,ஒப்பனை
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","ஒன்றாக்க , பின்வரும் பண்புகளை இரு பொருட்களை சமமாக இருக்க வேண்டும்"
 DocType: Shipping Rule,Net Weight,நிகர எடை
 DocType: Employee,Emergency Phone,அவசர தொலைபேசி
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,வாங்க
@@ -547,7 +552,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,ஆரம்பம் 0% அளவீட்டைக் வரையறுக்க கொள்ளவும்
 DocType: Sales Order,To Deliver,வழங்க
 DocType: Purchase Invoice Item,Item,பொருள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,சீரியல் எந்த உருப்படியை ஒரு பகுதியை இருக்க முடியாது
 DocType: Journal Entry,Difference (Dr - Cr),வேறுபாடு ( டாக்டர் - CR)
 DocType: Account,Profit and Loss,இலாப நட்ட
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,நிர்வாக உப ஒப்பந்தமிடல்
@@ -562,7 +567,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,சம்பள உயர்வு 0 இருக்க முடியாது
 DocType: Production Planning Tool,Material Requirement,பொருள் தேவை
 DocType: Company,Delete Company Transactions,நிறுவனத்தின் பரிவர்த்தனைகள் நீக்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,குறிப்பு இல்லை மற்றும் பரிந்துரை தேதி வங்கி பரிவர்த்தனை அத்தியாவசியமானதாகும்
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,வரிகள் மற்றும் கட்டணங்கள் சேர்க்க / திருத்தவும்
 DocType: Purchase Invoice,Supplier Invoice No,வழங்குபவர் விலைப்பட்டியல் இல்லை
 DocType: Territory,For reference,குறிப்பிற்கு
@@ -573,7 +578,7 @@
 DocType: Installation Note Item,Installation Note Item,நிறுவல் குறிப்பு பொருள்
 DocType: Production Plan Item,Pending Qty,நிலுவையில் அளவு
 DocType: Budget,Ignore,புறக்கணி
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} செயலில் இல்லை
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} செயலில் இல்லை
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},எஸ்எம்எஸ் எண்களில் அனுப்பப்பட்டது: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,அச்சிடும் அமைப்பு காசோலை பரிமாணங்களை
 DocType: Salary Slip,Salary Slip Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட்
@@ -582,13 +587,13 @@
 DocType: Sales Invoice,Total Commission,மொத்த ஆணையம்
 DocType: Pricing Rule,Sales Partner,விற்பனை வரன்வாழ்க்கை துணை
 DocType: Buying Settings,Purchase Receipt Required,கொள்முதல் ரசீது தேவை
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,ஆரம்ப இருப்பு உள்ளிட்ட மதிப்பீட்டு மதிப்பீடு அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,விலைப்பட்டியல் அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,முதல் நிறுவனம் மற்றும் கட்சி வகை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,நிதி / கணக்கு ஆண்டு .
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,திரட்டப்பட்ட கலாச்சாரம்
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","மன்னிக்கவும், சீரியல் இலக்கங்கள் ஒன்றாக்க முடியாது"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,விற்பனை ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,விற்பனை ஆணை செய்ய
 DocType: Project Task,Project Task,திட்ட பணி
 ,Lead Id,முன்னணி ஐடி
 DocType: C-Form Invoice Detail,Grand Total,ஆக மொத்தம்
@@ -605,7 +610,7 @@
 DocType: Job Applicant,Resume Attachment,துவைக்கும் இயந்திரம் இணைப்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,மீண்டும் வாடிக்கையாளர்கள்
 DocType: Leave Control Panel,Allocate,நிர்ணயி
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,விற்பனை Return
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,விற்பனை Return
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,குறிப்பு: மொத்த ஒதுக்கீடு இலைகள் {0} ஏற்கனவே ஒப்புதல் இலைகள் குறைவாக இருக்க கூடாது {1} காலம்
 DocType: Announcement,Posted By,பதிவிட்டவர்
 DocType: Item,Delivered by Supplier (Drop Ship),சப்ளையர் மூலம் வழங்கப்படுகிறது (டிராப் கப்பல்)
@@ -615,7 +620,7 @@
 DocType: Quotation,Quotation To,என்று மேற்கோள்
 DocType: Lead,Middle Income,நடுத்தர வருமானம்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),திறப்பு (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,ஒதுக்கப்பட்ட தொகை எதிர்மறை இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,நிறுவனத்தின் அமைக்கவும்
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,நிறுவனத்தின் அமைக்கவும்
@@ -627,7 +632,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,விற்பனை விலைப்பட்டியல் டைம் ஷீட்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},குறிப்பு இல்லை & பரிந்துரை தேதி தேவைப்படுகிறது {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,வங்கி நுழைவு செய்ய கொடுப்பனவு கணக்கு தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","இலைகள், இழப்பில் கூற்றுக்கள் மற்றும் சம்பள நிர்வகிக்க பணியாளர் பதிவுகளை உருவாக்க"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,அறிவு தளம் சேர்க்க
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,மானசாவுடன்
 DocType: Payment Entry Deduction,Payment Entry Deduction,கொடுப்பனவு நுழைவு விலக்கு
@@ -658,19 +663,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},"{0} ' {1} ' இல்லை ,இந்த நிதி ஆண்டில் {2}"
 DocType: Buying Settings,Settings for Buying Module,தொகுதி வாங்குதல் அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},சொத்து {0} நிறுவனம் சொந்தமானது இல்லை {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,முதல் கொள்முதல் ரசீது உள்ளிடவும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","பின்னர் விலை விதிகள் வாடிக்கையாளர் அடிப்படையில் வடிகட்டப்பட்ட, வாடிக்கையாளர் குழு, மண்டலம், சப்ளையர், வழங்குபவர் வகை, இயக்கம், விற்பனை பங்குதாரரான முதலியன"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,சரக்கு நிகர மாற்றம்
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,பணியாளர் கடன் மேலாண்மை
 DocType: Employee,Passport Number,பாஸ்போர்ட் எண்
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 அரசுடன் உறவு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,மேலாளர்
 DocType: Payment Entry,Payment From / To,/ இருந்து பணம்
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,தேதி வரம்பு
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},புதிய கடன் வரம்பை வாடிக்கையாளர் தற்போதைய கடன் தொகையை விட குறைவாக உள்ளது. கடன் வரம்பு குறைந்தது இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'அடிப்படையாக கொண்டு ' மற்றும் ' குழு மூலம் ' அதே இருக்க முடியாது
@@ -679,8 +683,8 @@
 DocType: Production Order Operation,In minutes,நிமிடங்களில்
 DocType: Issue,Resolution Date,தீர்மானம் தேதி
 DocType: Student Batch Name,Batch Name,தொகுதி பெயர்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,டைம் ஷீட் உருவாக்கப்பட்ட:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},கொடுப்பனவு முறையில் இயல்புநிலை பண அல்லது வங்கி கணக்கு அமைக்கவும் {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,பதிவுசெய்யவும்
 DocType: Selling Settings,Customer Naming By,மூலம் பெயரிடுதல் வாடிக்கையாளர்
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,மாணவர் மாதாந்திர வருகை அறிக்கையில் போன்ற தற்போதைய மாணவர் காண்பிக்கும்
@@ -708,7 +712,7 @@
 DocType: Production Order Operation,Actual Start Time,உண்மையான தொடக்க நேரம்
 DocType: BOM Operation,Operation Time,ஆபரேஷன் நேரம்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,முடிந்தது
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,அடித்தளம்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,அடித்தளம்
 DocType: Timesheet,Total Billed Hours,மொத்த பில் மணி
 DocType: Journal Entry,Write Off Amount,மொத்த தொகை இனிய எழுத
 DocType: Journal Entry,Bill No,பில் இல்லை
@@ -724,7 +728,7 @@
 DocType: Student Attendance,Student Attendance,மாணவர் வருகை
 DocType: Sales Invoice Timesheet,Time Sheet,நேரம் தாள்
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush மூலப்பொருட்கள் அடித்தளமாகக்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,உருப்படியை விவரங்கள் உள்ளிடவும்
 DocType: Interest,Interest,ஆர்வம்
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,முன் விற்பனை
 DocType: Purchase Receipt,Other Details,மற்ற விவரங்கள்
@@ -735,23 +739,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,கொடுப்பனவு நுழைவு ஏற்கனவே உருவாக்கப்பட்ட
 DocType: Purchase Receipt Item Supplied,Current Stock,தற்போதைய பங்கு
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},ரோ # {0}: சொத்து {1} பொருள் இணைக்கப்பட்ட இல்லை {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,முன்னோட்டம் சம்பளம் ஸ்லிப்
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,கணக்கு {0} பல முறை உள்ளிட்ட வருகிறது
 DocType: Account,Expenses Included In Valuation,செலவுகள் மதிப்பீட்டு சேர்க்கப்பட்டுள்ளது
 DocType: Hub Settings,Seller City,விற்பனையாளர் நகரத்தை
 ,Absent Student Report,இல்லாத மாணவர் அறிக்கை
 DocType: Email Digest,Next email will be sent on:,அடுத்த மின்னஞ்சலில் அனுப்பி வைக்கப்படும்:
 DocType: Offer Letter Term,Offer Letter Term,கடிதம் கால சலுகை
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,பொருள் வகைகள் உண்டு.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,பொருள் வகைகள் உண்டு.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,பொருள் {0} இல்லை
 DocType: Bin,Stock Value,பங்கு மதிப்பு
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,நிறுவனத்தின் {0} இல்லை
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,மரம் வகை
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,மரம் வகை
 DocType: BOM Explosion Item,Qty Consumed Per Unit,அளவு அலகு ஒவ்வொரு உட்கொள்ளப்படுகிறது
 DocType: Serial No,Warranty Expiry Date,உத்தரவாதத்தை காலாவதியாகும் தேதி
 DocType: Material Request Item,Quantity and Warehouse,அளவு மற்றும் சேமிப்பு கிடங்கு
 DocType: Sales Invoice,Commission Rate (%),கமிஷன் விகிதம் (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடுதல் தொடருக்கான தொடர் பெயரிடுதல் அமைக்கவும்
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,தேர்ந்தெடுக்கவும் திட்டம்
 DocType: Project,Estimated Cost,விலை மதிப்பீடு
@@ -770,7 +773,7 @@
 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,முன்னிருப்பு கணக்கு
 DocType: Payment Entry,Received Amount (Company Currency),பெறப்பட்ட தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,வாய்ப்பு முன்னணி தயாரிக்கப்படுகிறது என்றால் முன்னணி அமைக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,வாராந்திர ஆஃப் நாள் தேர்வு செய்க
 DocType: Production Order Operation,Planned End Time,திட்டமிட்ட நேரம்
 ,Sales Person Target Variance Item Group-Wise,விற்பனை நபர் இலக்கு வேறுபாடு பொருள் குழு வாரியாக
@@ -786,6 +789,7 @@
 DocType: Opportunity,Opportunity From,வாய்ப்பு வரம்பு
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,மாத சம்பளம் அறிக்கை.
 DocType: BOM,Website Specifications,இணையத்தளம் விருப்பம்
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0} இருந்து: {0} வகை {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,ரோ {0}: மாற்று காரணி கட்டாய ஆகிறது
@@ -839,6 +843,7 @@
 DocType: Employee,Bank A/C No.,வங்கி A / C இல்லை
 DocType: Bank Guarantee,Project,திட்டம்
 DocType: Quality Inspection Reading,Reading 7,7 படித்தல்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,ஓரளவு உத்தரவிட்டார்
 DocType: Expense Claim Detail,Expense Claim Type,செலவு  கோரிக்கை வகை
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,வண்டியில் இயல்புநிலை அமைப்புகளை
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},பத்திரிகை நுழைவு வழியாக முறித்துள்ளது சொத்து {0}
@@ -846,14 +851,14 @@
 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 +107,Office Maintenance Expenses,அலுவலகம் பராமரிப்பு செலவுகள்
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,மின்னஞ்சல் கணக்கை அமைத்ததற்கு
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,முதல் பொருள் உள்ளிடவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,முதல் பொருள் உள்ளிடவும்
 DocType: Account,Liability,பொறுப்பு
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ஒப்புதல் தொகை ரோ கூறுகின்றனர் காட்டிலும் அதிகமாக இருக்க முடியாது {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,விலை பட்டியல் தேர்வு
 DocType: Employee,Family Background,குடும்ப பின்னணி
 DocType: Request for Quotation Supplier,Send Email,மின்னஞ்சல் அனுப்ப
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},எச்சரிக்கை: தவறான இணைப்பு {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,அனுமதி இல்லை
 DocType: Company,Default Bank Account,முன்னிருப்பு வங்கி கணக்கு
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",கட்சி அடிப்படையில் வடிகட்ட தேர்ந்தெடுக்கவும் கட்சி முதல் வகை
@@ -866,7 +871,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ஊழியர்   இல்லை
 DocType: Supplier Quotation,Stopped,நிறுத்தி
 DocType: Item,If subcontracted to a vendor,ஒரு விற்பனையாளர் ஒப்பந்தக்காரர்களுக்கு என்றால்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,மாணவர் குழு ஏற்கனவே புதுப்பிக்கப்பட்டது.
 DocType: SMS Center,All Customer Contact,அனைத்து வாடிக்கையாளர் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv வழியாக பங்கு சமநிலை பதிவேற்றலாம்.
 DocType: Warehouse,Tree Details,மரம் விபரங்கள்
@@ -877,8 +882,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,குறைந்தபட்ச விலைப்பட்டியல் அளவு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: செலவு மையம் {2} நிறுவனத்தின் சொந்தம் இல்லை {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: கணக்கு {2} ஒரு குழுவாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,பொருள் வரிசையில் {அச்சுக்கோப்புகளை வாசிக்க}: {டாக்டைப்பானது} {docName} மேலே இல்லை '{டாக்டைப்பானது}' அட்டவணை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,டைம் ஷீட் {0} ஏற்கனவே நிறைவு அல்லது ரத்து செய்யப்பட்டது
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,பணிகள் எதுவும் இல்லை
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","கார் விலைப்பட்டியல் 05, 28 எ.கா. உருவாக்கப்படும் மாதத்தின் நாள்"
 DocType: Asset,Opening Accumulated Depreciation,குவிக்கப்பட்ட தேய்மானம் திறந்து
@@ -894,7 +899,7 @@
 DocType: Bin,Moving Average Rate,சராசரி விகிதம் நகரும்
 DocType: Production Planning Tool,Select Items,தேர்ந்தெடு
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} பில் எதிராக {1} தேதியிட்ட {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,பாடநெறி அட்டவணை
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,பாடநெறி அட்டவணை
 DocType: Maintenance Visit,Completion Status,நிறைவு நிலைமை
 DocType: HR Settings,Enter retirement age in years,ஆண்டுகளில் ஓய்வு பெறும் வயதை உள்ளிடவும்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,இலக்கு கிடங்கு
@@ -902,7 +907,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,இந்த சதவிகிதம் வரை விநியோக அல்லது ரசீது மீது அனுமதிக்கவும்
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,இறக்குமதி வருகை
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,அனைத்து பொருள் குழுக்கள்
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,அனைத்து பொருள் குழுக்கள்
 DocType: Process Payroll,Activity Log,நடவடிக்கை பதிவு
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,நிகர லாபம் / இழப்பு
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,தானாக நடவடிக்கைகள் சமர்ப்பிப்பு செய்தி உருவாக்கும் .
@@ -913,7 +918,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,கொடுப்பனவு ஆணை வாங்க
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,திட்டமிட்டிருந்தது அளவு
 DocType: Sales Invoice,Payment Due Date,கொடுப்பனவு காரணமாக தேதி
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,பொருள் மாற்று {0} ஏற்கனவே அதே பண்புகளை கொண்ட உள்ளது
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;திறந்து&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,செய்ய திறந்த
 DocType: Notification Control,Delivery Note Message,டெலிவரி குறிப்பு செய்தி
@@ -929,7 +934,7 @@
 DocType: Item Reorder,Re-Order Qty,மீண்டும் ஒழுங்கு அளவு
 DocType: Leave Block List Date,Leave Block List Date,பிளாக் பட்டியல் தேதி விட்டு
 DocType: Pricing Rule,Price or Discount,விலை அல்லது தள்ளுபடி
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,கொள்முதல் ரசீது பொருட்கள் அட்டவணையில் மொத்த பொருந்தும் கட்டணங்கள் மொத்த வரி மற்றும் கட்டணங்கள் அதே இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,கொள்முதல் ரசீது பொருட்கள் அட்டவணையில் மொத்த பொருந்தும் கட்டணங்கள் மொத்த வரி மற்றும் கட்டணங்கள் அதே இருக்க வேண்டும்
 DocType: Sales Team,Incentives,செயல் தூண்டுதல்
 DocType: SMS Log,Requested Numbers,கோரப்பட்ட எண்கள்
 DocType: Production Planning Tool,Only Obtain Raw Materials,ஒரே மூலப்பொருட்கள் பெறுதல்
@@ -958,13 +963,13 @@
 DocType: Supplier Quotation,Is Subcontracted,துணை ஒப்பந்தம்
 DocType: Item Attribute,Item Attribute Values,பொருள் பண்புக்கூறு கலாச்சாரம்
 DocType: Examination Result,Examination Result,தேர்வு முடிவு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ரசீது வாங்க
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ரசீது வாங்க
 ,Received Items To Be Billed,கட்டணம் பெறப்படும் பொருட்கள்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,சமர்ப்பிக்கப்பட்டது சம்பளம் துண்டுகளைக்
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,நாணய மாற்று வீதம் மாஸ்டர் .
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},குறிப்பு டாக்டைப் ஒன்றாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},குறிப்பு டாக்டைப் ஒன்றாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ஆபரேஷன் அடுத்த {0} நாட்கள் நேரத்தில் கண்டுபிடிக்க முடியவில்லை {1}
 DocType: Production Order,Plan material for sub-assemblies,துணை கூட்டங்கள் திட்டம் பொருள்
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,விற்பனை பங்குதாரர்கள் மற்றும் பிரதேச
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,ஏற்கனவே கணக்கில் பங்கு சமநிலை உள்ளது தானாக கணக்கு உருவாக்க முடியவில்லை. இந்த கிடங்கில் ஒரு நுழைவு செய்வதற்கு முன் ஒரு பொருத்தமான கணக்கு உருவாக்க வேண்டும்
@@ -988,10 +993,9 @@
 DocType: Supplier,Default Payable Accounts,இயல்புநிலை செலுத்தத்தக்க கணக்குகள்
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,பணியாளர் {0} செயலில் இல்லை அல்லது இல்லை
 DocType: Fee Structure,Components,கூறுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,பொருள் மாறிகள் {0} மேம்படுத்தப்பட்டது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},தயவு செய்து பொருள் உள்ள சொத்து வகை நுழைய {0}
 DocType: Quality Inspection Reading,Reading 6,6 படித்தல்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,இல்லை {0} {1} {2} இல்லாமல் எந்த எதிர்மறை நிலுவையில் விலைப்பட்டியல் Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,விலைப்பட்டியல் அட்வான்ஸ் வாங்குவதற்கு
 DocType: Hub Settings,Sync Now,இப்போது ஒத்திசை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},ரோ {0}: கடன் நுழைவு இணைத்தே ஒரு {1}
@@ -1005,11 +1009,11 @@
 DocType: Item,Is Purchase Item,கொள்முதல் பொருள்
 DocType: Asset,Purchase Invoice,விலைப்பட்டியல் கொள்வனவு
 DocType: Stock Ledger Entry,Voucher Detail No,ரசீது விரிவாக இல்லை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,புதிய விற்பனை விலைப்பட்டியல்
 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,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,தேதி மற்றும் முடிவுத் திகதி திறந்து அதே நிதியாண்டு க்குள் இருக்க வேண்டும்
 DocType: Lead,Request for Information,தகவல் கோரிக்கை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,ஒத்திசைவு ஆஃப்லைன் பொருள்
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,திட்டம் கட்டணம்
 DocType: Salary Slip,Total in words,வார்த்தைகளில் மொத்த
@@ -1019,7 +1023,7 @@
 DocType: Employee Loan,Sanctioned,ஒப்புதல்
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;நகலெடுக்கப்படும்."
 DocType: Job Opening,Publish on website,வலைத்தளத்தில் வெளியிடு
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,வாடிக்கையாளர்களுக்கு ஏற்றுமதி.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,சப்ளையர் விவரப்பட்டியல் தேதி பதிவுசெய்ய தேதி விட அதிகமாக இருக்க முடியாது
@@ -1030,7 +1034,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,மாறுபாடு
 ,Company Name,நிறுவனத்தின் பெயர்
 DocType: SMS Center,Total Message(s),மொத்த செய்தி (கள்)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,மாற்றம் உருப்படி தேர்வுசெய்க
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,காசோலை டெபாசிட் அங்கு வங்கி கணக்கு தலைவர் தேர்வு.
@@ -1041,8 +1045,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,ரோ {0}: விற்பனை / கொள்முதல் ஆணை எதிரான கொடுப்பனவு எப்போதும் முன்கூட்டியே குறித்தது வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,இரசாயன
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,இந்த முறையில் தேர்ந்தெடுக்கப்பட்ட போது இயல்புநிலை வங்கி / பண கணக்கு தானாக சம்பளம் ஜர்னல் நுழைவு புதுப்பிக்கப்படும்.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",தர குறியீடு இடைவெளியை {0} மற்ற தரங்களாக தர இடைவெளியில் மேலெழுகிறது. இடைவெளியில் சரிபார்க்கவும் {0} மற்றும் {1} மீண்டும் முயற்சி
 DocType: BOM,Raw Material Cost(Company Currency),மூலப்பொருட்களின் விலை (நிறுவனத்தின் நாணய)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,அனைத்து பொருட்களும் ஏற்கனவே இந்த உத்தரவு க்கு மாற்றப்பட்டது.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},ரோ # {0}: விகிதம் பயன்படுத்தப்படும் விகிதத்தை விட அதிகமாக இருக்க முடியாது {1} {2}
@@ -1055,14 +1057,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM இணையத்தளம் பொருள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,உங்கள் கடிதம் தலை மற்றும் சின்னம் பதிவேற்ற. (நீங்கள் பின்னர் அவர்களை திருத்த முடியும்).
 DocType: Timesheet Detail,Bill,ரசீது
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,அடுத்த தேய்மானம் தேதி கடந்த தேதி உள்ளிட்ட வருகிறது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,வெள்ளை
 DocType: SMS Center,All Lead (Open),அனைத்து முன்னணி (திறந்த)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),ரோ {0}: அளவு கிடைக்கவில்லை {4} கிடங்கில் {1} நுழைவு நேரம் வெளியிடும் ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,கட்டண முன்னேற்றங்கள் கிடைக்கும்
 DocType: Item,Automatically Create New Batch,தானாகவே புதிய தொகுதி உருவாக்கவும்
 DocType: Item,Automatically Create New Batch,தானாகவே புதிய தொகுதி உருவாக்கவும்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,செய்ய
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,செய்ய
 DocType: Student Admission,Admission Start Date,சேர்க்கை தொடக்க தேதி
 DocType: Journal Entry,Total Amount in Words,சொற்கள் மொத்த தொகை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ஒரு பிழை ஏற்பட்டது . ஒரு சாத்தியமான காரணம் நீங்கள் வடிவம் காப்பாற்ற முடியாது என்று இருக்க முடியும் . சிக்கல் தொடர்ந்தால் support@erpnext.com தொடர்பு கொள்ளவும்.
@@ -1070,7 +1072,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,திறந்து அளவு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,தயவு செய்து தொகை மாற்றத்தைக் கணக்கில் நுழைய
 DocType: Student Batch Name,Student Batch Name,மாணவர் தொகுதி பெயர்
 DocType: Holiday List,Holiday List Name,விடுமுறை பட்டியல் பெயர்
 DocType: Repayment Schedule,Balance Loan Amount,இருப்பு கடன் தொகை
@@ -1090,10 +1092,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},தயவு செய்து குறிப்பிட ஒரு {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,அளவு அல்லது மதிப்பு எந்த மாற்றமும் நீக்கப்பட்ட விடயங்கள்.
 DocType: Delivery Note,Delivery To,வழங்கும்
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,கற்பிதம் அட்டவணையின் கட்டாயமாகும்
 DocType: Production Planning Tool,Get Sales Orders,விற்பனை ஆணைகள் கிடைக்கும்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} எதிர்மறை இருக்க முடியாது
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,தள்ளுபடி
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,தள்ளுபடி
 DocType: Asset,Total Number of Depreciations,Depreciations எண்ணிக்கை
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
 DocType: Sales Invoice Item,Rate With Margin,மார்ஜின் உடன் விகிதம்
@@ -1109,7 +1111,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,விற்பனை ஆணை / இறுதிப்பொருட்களாக்கும் கிடங்கில் ஒதுக்கப்பட்ட கிடங்கு
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,விற்பனை தொகை
 DocType: Repayment Schedule,Interest Amount,வட்டி தொகை
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,இந்த பதிவு செலவு அப்ரூவரான இருக்கிறீர்கள் . 'தகுதி' புதுப்பி இரட்சியும்
 DocType: Serial No,Creation Document No,உருவாக்கம் ஆவண இல்லை
 DocType: Issue,Issue,சிக்கல்
 DocType: Asset,Scrapped,முறித்துள்ளது
@@ -1117,12 +1119,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","பொருள் வகைகளையும் காரணிகள். எ.கா. அளவு, நிறம், முதலியன"
 DocType: Purchase Invoice,Returns,ரிட்டர்ன்ஸ்
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,காதல் களம் கிடங்கு
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},தொடர் இல {0} வரை பராமரிப்பு ஒப்பந்தத்தின் கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,ஆட்சேர்ப்பு
 DocType: Lead,Organization Name,நிறுவன பெயர்
 DocType: Tax Rule,Shipping State,கப்பல் மாநிலம்
 ,Projected Quantity as Source,மூல திட்டமிடப்பட்ட அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,பொருள் பொத்தானை 'வாங்குதல் ரசீதுகள் இருந்து விடயங்கள் பெறவும்' பயன்படுத்தி சேர்க்க
 DocType: Employee,A-,ஏ
 DocType: Production Planning Tool,Include non-stock items,பங்கற்ற பொருட்களை சேர்க்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,விற்பனை செலவு
@@ -1130,12 +1132,12 @@
 DocType: GL Entry,Against,எதிராக
 DocType: Item,Default Selling Cost Center,இயல்புநிலை விற்பனை செலவு மையம்
 DocType: Sales Partner,Implementation Partner,செயல்படுத்தல் வரன்வாழ்க்கை துணை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ஜிப் குறியீடு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,ஜிப் குறியீடு
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},விற்பனை ஆணை {0} {1}
 DocType: Opportunity,Contact Info,தகவல் தொடர்பு
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,பங்கு பதிவுகள் செய்தல்
 DocType: Packing Slip,Net Weight UOM,நிகர எடை UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} முடிவுகள்
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} முடிவுகள்
 DocType: Item,Default Supplier,இயல்புநிலை சப்ளையர்
 DocType: Manufacturing Settings,Over Production Allowance Percentage,உற்பத்தி கொடுப்பனவான சதவீதம் ஓவர்
 DocType: Employee Loan,Repayment Schedule,திரும்பச் செலுத்துதல் அட்டவணை
@@ -1143,7 +1145,7 @@
 DocType: Holiday List,Get Weekly Off Dates,வாராந்திர இனிய தினங்கள் கிடைக்கும்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,முடிவு தேதி தொடங்கும் நாள் விட குறைவாக இருக்க முடியாது
 DocType: Sales Person,Select company name first.,முதல் நிறுவனத்தின் பெயரை தேர்ந்தெடுக்கவும்.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,டாக்டர்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,டாக்டர்
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,மேற்கோள்கள் சப்ளையர்கள் இருந்து பெற்றார்.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},எப்படி {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,சராசரி வயது
@@ -1163,7 +1165,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,முக்கிய செயல்திறன் பகுதி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,போக்குவரத்து
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,தவறான கற்பிதம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} சமர்ப்பிக்க வேண்டும்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},அளவு குறைவாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: SMS Center,Total Characters,மொத்த எழுத்துகள்
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},பொருள் BOM துறையில் BOM தேர்ந்தெடுக்கவும் {0}
@@ -1174,7 +1176,7 @@
 DocType: Sales Partner,Distributor,பகிர்கருவி
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,வண்டியில் கப்பல் விதி
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,உத்தரவு {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',அமைக்க மேலும் கூடுதல் தள்ளுபடி விண்ணப்பிக்கவும் &#39;தயவு செய்து
 ,Ordered Items To Be Billed,கணக்கில் வேண்டும் உத்தரவிட்டது உருப்படிகள்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,ரேஞ்ச் குறைவாக இருக்க வேண்டும் இருந்து விட வரையறைக்கு
 DocType: Global Defaults,Global Defaults,உலக இயல்புநிலைகளுக்கு
@@ -1184,7 +1186,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,தொடக்க ஆண்டு
 DocType: Purchase Invoice,Start date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் தேதி தொடங்கும்
 DocType: Salary Slip,Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,கொள்ளளவு திட்டமிடுதல் பிழை
 ,Trial Balance for Party,கட்சி சோதனை இருப்பு
 DocType: Lead,Consultant,பிறர் அறிவுரை வேண்டுபவர்
 DocType: Salary Slip,Earnings,வருவாய்
@@ -1199,7 +1201,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","இந்த மாற்று பொருள் குறியீடு இணைக்கப்படும். உங்கள் சுருக்கம் ""எஸ்.எம்"", மற்றும் என்றால் உதாரணமாக, இந்த உருப்படியை குறியீடு ""சட்டை"", ""டி-சட்டை-எஸ்.எம்"" இருக்கும் மாறுபாடு உருப்படியை குறியீடு ஆகிறது"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,நீங்கள் சம்பள விபரம் சேமிக்க முறை நிகர வருவாய் (வார்த்தைகளில்) காண முடியும்.
 DocType: Purchase Invoice,Is Return,திரும்ப
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,திரும்ப / டெபிட் குறிப்பு
 DocType: Price List Country,Price List Country,விலை பட்டியல் நாடு
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},பொருட்களை {0} செல்லுபடியாகும் தொடர் இலக்கங்கள் {1}
@@ -1209,11 +1211,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,தொகுதி எண் பெற கொள்ளவும் பொருள் குறியீடு நுழைய
 DocType: Stock Settings,Default Item Group,இயல்புநிலை பொருள் குழு
 DocType: Employee Loan,Partially Disbursed,பகுதியளவு செலவிட்டு
-DocType: Grading Structure,Grading System Name,தர அமைப்பு பெயர்
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,வழங்குபவர் தரவுத்தள.
 DocType: Account,Balance Sheet,இருப்பு தாள்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ','பொருள் கோட் பொருள் சென்டர் செலவாகும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","பணம் செலுத்தும் முறை உள்ளமைக்கப்படவில்லை. கணக்கு கொடுப்பனவு முறை அல்லது பிஓஎஸ் பதிவு செய்தது பற்றி அமைக்க என்பதையும், சரிபார்க்கவும்."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,உங்கள் விற்பனை நபர் வாடிக்கையாளர் தொடர்பு கொள்ள இந்த தேதியில் ஒரு நினைவூட்டல் வரும்
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,அதே பொருளைப் பலமுறை உள்ளிட முடியாது.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","மேலும் கணக்குகளை குழுக்கள் கீழ் செய்யப்பட்ட, ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்"
@@ -1225,7 +1226,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,பங்கு லெட்ஜர் பதிவுகள் மற்றும் GL பதிவுகள் தேர்வு கொள்முதல் ரசீதுகள் இடுகையிட்டார்கள்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,பங்கு லெட்ஜர் பதிவுகள் மற்றும் GL பதிவுகள் தேர்வு கொள்முதல் ரசீதுகள் இடுகையிட்டார்கள்
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,பொருள் 1
 DocType: Holiday,Holiday,விடுமுறை
 DocType: Support Settings,Close Issue After Days,நாட்கள் பிறகு மூடு வெளியீடு
@@ -1252,11 +1253,11 @@
 DocType: Maintenance Visit Purpose,Work Done,வேலை
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,காரணிகள் அட்டவணை குறைந்தது ஒரு கற்பிதம் குறிப்பிட தயவு செய்து
 DocType: Announcement,All Students,அனைத்து மாணவர்கள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,பொருள் {0} ஒரு பங்கற்ற பொருளாக இருக்க வேண்டும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,காட்சி லெட்ஜர்
 DocType: Grading Scale,Intervals,இடைவெளிகள்
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,முந்தைய
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ஒரு உருப்படி குழு அதே பெயரில் , உருப்படி பெயர் மாற்ற அல்லது உருப்படியை குழு பெயர்மாற்றம் செய்க"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,மாணவர் மொபைல் எண்
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,உலகம் முழுவதும்
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,பொருள் {0} பணி முடியாது
@@ -1296,9 +1297,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} இருந்து சம்பளம் கொடுப்பனவு {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},உறைந்த கணக்கு திருத்த அதிகாரம் இல்லை {0}
 DocType: Journal Entry,Get Outstanding Invoices,சிறந்த பற்றுச்சீட்டுகள் கிடைக்கும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,விற்பனை ஆணை {0} தவறானது
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,கொள்முதல் ஆணைகள் நீ திட்டமிட உதவும் உங்கள் கொள்முதல் சரி வர
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","மன்னிக்கவும், நிறுவனங்கள் ஒன்றாக்க முடியாது"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",மொத்த வெளியீடு மாற்றம் / அளவு {0} பொருள் கோரிக்கை {1} \ பொருள் {2} கோரிய அளவு அதிகமாக இருக்கக் கூடாது முடியும் {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,சிறிய
@@ -1319,10 +1320,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,மறைமுக செலவுகள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,ரோ {0}: அளவு கட்டாய ஆகிறது
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,விவசாயம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,ஒத்திசைவு முதன்மை தரவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,உங்கள் தயாரிப்புகள் அல்லது சேவைகள்
 DocType: Mode of Payment,Mode of Payment,கட்டணம் செலுத்தும் முறை
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,இணைய பட ஒரு பொது கோப்பு அல்லது வலைத்தளத்தின் URL இருக்க வேண்டும்
 DocType: Student Applicant,AP,ஆந்திர
 DocType: Purchase Invoice Item,BOM,பொருட்களின் அளவுக்கான ரசீது(BOM)
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,இந்த ஒரு ரூட் உருப்படியை குழு மற்றும் திருத்த முடியாது .
@@ -1340,18 +1341,18 @@
 DocType: Student Group Student,Group Roll Number,குழு ரோல் எண்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0} மட்டுமே கடன் கணக்குகள் மற்றொரு பற்று நுழைவு எதிராக இணைக்கப்பட்ட ஐந்து
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,அனைத்து பணி எடைகள் மொத்த இருக்க வேண்டும் 1. அதன்படி அனைத்து திட்ட பணிகளை எடைகள் சரிசெய்யவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,விநியோக  குறிப்பு {0} சமர்ப்பிக்கவில்லை
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","விலை விதி முதல் பொருள், பொருள் பிரிவு அல்லது பிராண்ட் முடியும், துறையில் 'விண்ணப்பிக்க' அடிப்படையில் தேர்வு செய்யப்படுகிறது."
 DocType: Hub Settings,Seller Website,விற்பனையாளர் வலைத்தளம்
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,விற்பனை குழு மொத்த ஒதுக்கீடு சதவீதம் 100 இருக்க வேண்டும்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},உற்பத்தி ஒழுங்கு நிலை ஆகிறது {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},உற்பத்தி ஒழுங்கு நிலை ஆகிறது {0}
 DocType: Appraisal Goal,Goal,இலக்கு
 DocType: Sales Invoice Item,Edit Description,விளக்கம் திருத்த
 ,Team Updates,குழு மேம்படுத்தல்கள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,சப்ளையர்
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,அமைத்தல் கணக்கு வகை பரிமாற்றங்கள் இந்த கணக்கு தேர்வு உதவுகிறது.
 DocType: Purchase Invoice,Grand Total (Company Currency),கிராண்ட் மொத்த (நிறுவனத்தின் கரன்சி)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,அச்சு வடிவம் உருவாக்கு
@@ -1367,7 +1368,7 @@
 DocType: Depreciation Schedule,Journal Entry,பத்திரிகை நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} முன்னேற்றம் பொருட்களை
 DocType: Workstation,Workstation Name,பணிநிலைய பெயர்
-DocType: Grade Interval,Grade Code,தர குறியீடு
+DocType: Grading Scale Interval,Grade Code,தர குறியீடு
 DocType: POS Item Group,POS Item Group,பிஓஎஸ் பொருள் குழு
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,மின்னஞ்சல் தொகுப்பு:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} பொருள் சேர்ந்தவர்கள் இல்லை {1}
@@ -1384,7 +1385,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,வன்பொருள்
 DocType: Sales Order,Recurring Upto,தொடர் வரை
 DocType: Attendance,HR Manager,அலுவலக மேலாளர்
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ஒரு நிறுவனத்தின் தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,தனிச்சலுகை விடுப்பு
 DocType: Purchase Invoice,Supplier Invoice Date,வழங்குபவர் விலைப்பட்டியல் தேதி
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,வண்டியில் செயல்படுத்த வேண்டும்
@@ -1401,7 +1402,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,உணவு
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,வயதான ரேஞ்ச் 3
 DocType: Maintenance Schedule Item,No of Visits,வருகைகள் எண்ணிக்கை
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,மார்க் Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,மார்க் Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},பராமரிப்பு அட்டவணை {0} எதிராக உள்ளது {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,பதிவுசெய்யும் மாணவர்
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},கணக்கை மூடுவதற்கான நாணயம் இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},அனைத்து இலக்குகளை புள்ளிகள் தொகை இது 100 இருக்க வேண்டும் {0}
@@ -1426,7 +1428,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,சராசரியாக தினமும் வெளிச்செல்லும்
 DocType: POS Profile,Campaign,பிரச்சாரம்
 DocType: Supplier,Name and Type,பெயர் மற்றும் வகை
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',அங்கீகாரநிலையை அங்கீகரிக்கப்பட்ட 'அல்லது' நிராகரிக்கப்பட்டது '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',அங்கீகாரநிலையை அங்கீகரிக்கப்பட்ட 'அல்லது' நிராகரிக்கப்பட்டது '
 DocType: Purchase Invoice,Contact Person,நபர் தொடர்பு
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',' எதிர்பார்த்த தொடக்க தேதி ' 'எதிர்பார்த்த முடிவு தேதி ' ஐ விட அதிகமாக இருக்க முடியாது
 DocType: Course Scheduling Tool,Course End Date,நிச்சயமாக முடிவு தேதி
@@ -1449,14 +1451,15 @@
 DocType: Sales Invoice,Shipping Address Name,ஷிப்பிங் முகவரி பெயர்
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,கணக்கு விளக்கப்படம்
 DocType: Material Request,Terms and Conditions Content,நிபந்தனைகள் உள்ளடக்கம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 க்கும் அதிகமாக இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,பொருள் {0} ஒரு பங்கு பொருள் அல்ல
 DocType: Maintenance Visit,Unscheduled,திட்டமிடப்படாத
 DocType: Employee,Owned,சொந்தமானது
 DocType: Salary Detail,Depends on Leave Without Pay,சம்பளமில்லா விடுப்பு பொறுத்தது
 DocType: Pricing Rule,"Higher the number, higher the priority","உயர் எண், அதிக முன்னுரிமை"
 ,Purchase Invoice Trends,விலைப்பட்டியல் போக்குகள் வாங்குவதற்கு
 DocType: Employee,Better Prospects,நல்ல வாய்ப்புகள்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","ரோ # {0}: தொகுதி {1} மட்டுமே {2} கொத்தமல்லி உள்ளது. கிடைக்க கொண்ட {3} கொத்தமல்லி மற்றொரு தொகுதி தேர்ந்தெடுக்கவும் அல்லது / பல தொகுப்புகளும் இருந்து பிரச்சினை வழங்க, பல வரிசைகள் ஒரு வரிசையில் பிரிக்கவும்"
 DocType: Vehicle,License Plate,உரிமம் தகடு
 DocType: Appraisal,Goals,இலக்குகளை
 DocType: Warranty Claim,Warranty / AMC Status,உத்தரவாதத்தை / AMC நிலைமை
@@ -1475,7 +1478,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,பணியாளர் தன்னை தெரிவிக்க முடியாது.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","கணக்கு முடக்கப்படும் என்றால், உள்ளீடுகளை தடை செய்த அனுமதிக்கப்படுகிறது ."
 DocType: Email Digest,Bank Balance,வங்கி மீதி
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} மட்டுமே நாணய முடியும்: {0} பைனான்ஸ் நுழைவு {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","வேலை சுயவிவரத்தை, தகுதிகள் தேவை முதலியன"
 DocType: Journal Entry Account,Account Balance,கணக்கு இருப்பு
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,பரிவர்த்தனைகள் வரி விதி.
@@ -1486,7 +1489,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,மூடப்படாத நிதி ஆண்டில் பி &amp; எல் நிலுவைகளை காட்டு
 DocType: Shipping Rule,Shipping Account,கப்பல் கணக்கு
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: கணக்கு {2} செயலற்று உள்ளது
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,விற்பனை ஆணைகள் நீங்கள் உங்கள் வேலை திட்டமிட உதவும் மற்றும் சரியான நேரத்தில் வழங்க செய்ய
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,விற்பனை ஆணைகள் நீங்கள் உங்கள் வேலை திட்டமிட உதவும் மற்றும் சரியான நேரத்தில் வழங்க செய்ய
 DocType: Quality Inspection,Readings,அளவீடுகளும்
 DocType: Stock Entry,Total Additional Costs,மொத்த கூடுதல் செலவுகள்
 DocType: Course Schedule,SH,எஸ்.எச்
@@ -1497,7 +1500,7 @@
 DocType: Shipping Rule Condition,To Value,மதிப்பு
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ஸ்லிப் பொதி
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ஸ்லிப் பொதி
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,அலுவலகத்திற்கு வாடகைக்கு
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,அமைப்பு எஸ்எம்எஸ் வாயில் அமைப்புகள்
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,இறக்குமதி தோல்வி!
@@ -1519,11 +1522,11 @@
 DocType: Company,Services,சேவைகள்
 DocType: HR Settings,Email Salary Slip to Employee,ஊழியர் மின்னஞ்சல் சம்பள விபரம்
 DocType: Cost Center,Parent Cost Center,பெற்றோர் செலவு மையம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,சாத்தியமான சப்ளையர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,சாத்தியமான சப்ளையர் தேர்ந்தெடுக்கவும்
 DocType: Sales Invoice,Source,மூல
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,மூடப்பட்டது காட்டு
 DocType: Leave Type,Is Leave Without Pay,சம்பளமில்லா விடுப்பு
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,சொத்து வகை நிலையான சொத்து உருப்படியை அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,கொடுப்பனவு அட்டவணை காணப்படவில்லை பதிவுகள்
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},இந்த {0} கொண்டு மோதல்கள் {1} க்கான {2} {3}
 DocType: Student Attendance Tool,Students HTML,"மாணவர்கள், HTML"
@@ -1541,7 +1544,7 @@
 DocType: Student,Date of Leaving,விட்டு தேதி
 DocType: Pricing Rule,For Price List,விலை பட்டியல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,நிறைவேற்று தேடல்
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,லீட்ஸ் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,லீட்ஸ் உருவாக்கவும்
 DocType: Maintenance Schedule,Schedules,கால அட்டவணைகள்
 DocType: Purchase Invoice Item,Net Amount,நிகர விலை
 DocType: Purchase Order Item Supplied,BOM Detail No,"BOM 
@@ -1570,9 +1573,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,திட்டம் சேர்வதில்
 DocType: Sales Invoice Item,Brand Name,குறியீட்டு பெயர்
 DocType: Purchase Receipt,Transporter Details,இடமாற்றி விபரங்கள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,இயல்புநிலை கிடங்கில் தேர்ந்தெடுத்தவையை தேவை
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,பெட்டி
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,சாத்தியமான சப்ளையர்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,சாத்தியமான சப்ளையர்
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,அமைப்பு
 DocType: Budget,Monthly Distribution,மாதாந்திர விநியோகம்
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,"ரிசீவர் பட்டியல் காலியாக உள்ளது . பெறுநர் பட்டியலை உருவாக்க , தயவு செய்து"
@@ -1580,8 +1583,8 @@
 DocType: Sales Partner,Sales Partner Target,விற்பனை வரன்வாழ்க்கை துணை இலக்கு
 DocType: Loan Type,Maximum Loan Amount,அதிகபட்ச கடன் தொகை
 DocType: Pricing Rule,Pricing Rule,விலை விதி
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},மாணவர் க்கான பிரதி ரோல் எண்ணை {0}
 DocType: Budget,Action if Annual Budget Exceeded,அதிரடி ஆண்டு வரவு-செலவுத் மீறிவிட்டது
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ஆணை வாங்க பொருள் வேண்டுதல்
 DocType: Shopping Cart Settings,Payment Success URL,கட்டணம் வெற்றி URL ஐ
@@ -1602,9 +1605,9 @@
 DocType: Employee Loan,Repayment Method,திரும்பச் செலுத்துதல் முறை
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","தேர்ந்தெடுக்கப்பட்டால், முகப்பு பக்கம் வலைத்தளத்தில் இயல்புநிலை பொருள் குழு இருக்கும்"
 DocType: Quality Inspection Reading,Reading 4,4 படித்தல்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} திட்ட காணப்படவில்லை இல்லை இயல்புநிலை BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} திட்ட காணப்படவில்லை இல்லை இயல்புநிலை BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,நிறுவனத்தின் செலவினம் கூற்றுக்கள்.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","மாணவர்கள் அமைப்பின் மையத்தில் உள்ள உள்ளன, உங்கள் மாணவர்கள் சேர்க்க"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","மாணவர்கள் அமைப்பின் மையத்தில் உள்ள உள்ளன, உங்கள் மாணவர்கள் சேர்க்க"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},ரோ # {0}: இசைவு தேதி {1} காசோலை தேதி முன் இருக்க முடியாது {2}
 DocType: Company,Default Holiday List,விடுமுறை பட்டியல் இயல்புநிலை
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},ரோ {0}: நேரம் மற்றும் நேரம் {1} கொண்டு மேலெழும் {2}
@@ -1616,21 +1619,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,நீங்கள் விடுப்பு விண்ணப்பிக்கும் எந்த நாள் (கள்) விடுமுறை. நீங்கள் விடுப்பு விண்ணப்பிக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,கொடுப்பனவு மின்னஞ்சலை மீண்டும் அனுப்புக
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,புதிய பணி
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,மேற்கோள் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,மேற்கோள் செய்ய
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,பிற அறிக்கைகள்
 DocType: Dependent Task,Dependent Task,தங்கிவாழும் பணி
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},நடவடிக்கை இயல்புநிலை பிரிவு மாற்ற காரணி வரிசையில் 1 வேண்டும் {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},வகை விடுப்பு {0} மேலாக இருக்க முடியாது {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,முன்கூட்டியே எக்ஸ் நாட்கள் நடவடிக்கைகளுக்குத் திட்டமிட்டுள்ளது முயற்சி.
 DocType: HR Settings,Stop Birthday Reminders,நிறுத்து நினைவூட்டல்கள்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},நிறுவனத்தின் இயல்புநிலை சம்பளப்பட்டியல் செலுத்த வேண்டிய கணக்கு அமைக்கவும் {0}
 DocType: SMS Center,Receiver List,ரிசீவர் பட்டியல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,தேடல் பொருள்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,தேடல் பொருள்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,உட்கொள்ளுகிறது தொகை
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,பண நிகர மாற்றம்
 DocType: Assessment Plan,Grading Scale,தரம் பிரித்தல் ஸ்கேல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ஏற்கனவே நிறைவு
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,நடவடிக்கை அலகு {0} மேலும் மாற்று காரணி அட்டவணை முறை விட உள்ளிட்ட
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ஏற்கனவே நிறைவு
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},பணம் கோரிக்கை ஏற்கனவே உள்ளது {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,வெளியிடப்படுகிறது பொருட்களை செலவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},அளவு அதிகமாக இருக்க கூடாது {0}
@@ -1662,12 +1665,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,இரு வாரங்கள் முடிவதற்குள் நுழைவு செய்ய
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,ரோ {0}: சப்ளையர் எதிராக அட்வான்ஸ் பற்று
 DocType: Company,Default Values,இயல்புநிலை மதிப்புகள்
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{அதிர்வெண்} டைஜஸ்ட்
 DocType: Expense Claim,Total Amount Reimbursed,மொத்த அளவு திரும்ப
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,இந்த வாகன எதிராக பதிவுகள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,சேகரிக்க
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},வழங்குபவர் எதிராக விலைப்பட்டியல் {0} தேதியிட்ட {1}
 DocType: Customer,Default Price List,முன்னிருப்பு விலை பட்டியல்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,சொத்து இயக்கம் சாதனை {0} உருவாக்கப்பட்ட
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,நீங்கள் நீக்க முடியாது நிதியாண்டு {0}. நிதியாண்டு {0} உலகளாவிய அமைப்புகள் முன்னிருப்பாக அமைக்க உள்ளது
 DocType: Journal Entry,Entry Type,நுழைவு வகை
 ,Customer Credit Balance,வாடிக்கையாளர் கடன் இருப்பு
@@ -1686,7 +1690,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,பொருட்களை எதுவும் அளவு அல்லது பெறுமதியில் எந்த மாற்று வேண்டும்.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,கட்டாய துறையில் - திட்டம்
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,கட்டாய துறையில் - திட்டம்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,உத்தரவாதத்தை கூறுகின்றனர்
 ,Lead Details,முன்னணி விவரங்கள்
 DocType: Salary Slip,Loan repayment,கடனை திறம்பசெலுத்து
 DocType: Purchase Invoice,End date of current invoice's period,தற்போதைய விலைப்பட்டியல் நேரத்தில் முடிவு தேதி
@@ -1705,12 +1709,10 @@
 DocType: Employee,Permanent Address,நிரந்தர முகவரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",மொத்தம் விட \ {0} {1} அதிகமாக இருக்க முடியும் எதிராக பணம் முன்கூட்டியே {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,உருப்படியை குறியீடு தேர்வு செய்க
 DocType: Student Sibling,Studying in Same Institute,அதே நிறுவனம் படிக்கும்
 DocType: Territory,Territory Manager,மண்டலம் மேலாளர்
 DocType: Packed Item,To Warehouse (Optional),கிடங்கில் (கட்டாயமில்லை)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Payment Entry,Paid Amount (Company Currency),செலுத்தப்பட்ட தொகை எவ்வளவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,Additional Discount,கூடுதல் தள்ளுபடி
 DocType: Selling Settings,Selling Settings,அமைப்புகள் விற்பனை
@@ -1720,9 +1722,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,வண்டியில் காண்க
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,மார்க்கெட்டிங் செலவுகள்
 ,Item Shortage Report,பொருள் பற்றாக்குறை அறிக்கை
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","எடை கூட ""எடை UOM"" குறிப்பிட தயவு செய்து \n குறிப்பிடப்பட்டுள்ளது"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,இந்த பங்கு நுழைவு செய்ய பயன்படுத்தப்படும் பொருள் கோரிக்கை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,அடுத்த தேய்மானம் தேதி புதிய சொத்து அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,அடுத்த தேய்மானம் தேதி புதிய சொத்து அத்தியாவசியமானதாகும்
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ஒவ்வொரு தொகுதி தனி நிச்சயமாக பொறுத்தே குழு
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ஒவ்வொரு தொகுதி தனி நிச்சயமாக பொறுத்தே குழு
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ஒரு பொருள் ஒரே யூனிட்.
@@ -1739,9 +1741,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: செலவு மையம் &#39;இலாப நட்ட கணக்கு தேவை {2}. நிறுவனத்தின் ஒரு இயல்பான செலவு மையம் அமைக்க கொள்ளவும்.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ஒரு வாடிக்கையாளர் குழு அதே பெயரில் வாடிக்கையாளர் பெயர் மாற்ற அல்லது வாடிக்கையாளர் குழு பெயர்மாற்றம் செய்க
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 படித்தல்
@@ -1758,7 +1758,7 @@
 ,Item-wise Sales Register,பொருள் வாரியான விற்பனை பதிவு
 DocType: Asset,Gross Purchase Amount,மொத்த கொள்முதல் அளவு
 DocType: Asset,Depreciation Method,தேய்மானம் முறை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ஆஃப்லைன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ஆஃப்லைன்
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,இந்த வரி அடிப்படை விகிதம் சேர்க்கப்பட்டுள்ளது?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,மொத்த இலக்கு
 DocType: Program Course,Required,தேவையான
@@ -1768,21 +1768,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,சமரசம் JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,பல பத்திகள். அறிக்கை ஏற்றுமதி மற்றும் ஒரு விரிதாள் பயன்பாட்டை பயன்படுத்தி அச்சிட.
 DocType: Purchase Invoice Item,Batch No,தொகுதி இல்லை
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ஒரு வாடிக்கையாளர் கொள்முதல் ஆணை எதிராக பல விற்பனை ஆணைகள் அனுமதி
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 DocType: Student Group Instructor,Student Group Instructor,மாணவர் குழு பயிற்றுவிப்பாளர்
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 கைப்பேசி
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,முதன்மை
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,மாற்று
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,முதன்மை
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,மாற்று
 DocType: Naming Series,Set prefix for numbering series on your transactions,உங்கள் நடவடிக்கைகள் மீது தொடர் எண்ணுவதற்கான முன்னொட்டு அமைக்க
 DocType: Employee Attendance Tool,Employees HTML,"ஊழியர், HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,"இயல்புநிலை BOM, ({0}) இந்த உருப்படியை அல்லது அதன் டெம்ப்ளேட் தீவிரமாக இருக்க வேண்டும்"
 DocType: Employee,Leave Encashed?,காசாக்கப்பட்டால் விட்டு?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,துறையில் இருந்து வாய்ப்பு கட்டாய ஆகிறது
 DocType: Email Digest,Annual Expenses,வருடாந்த செலவுகள்
 DocType: Item,Variants,மாறிகள்
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,கொள்முதல் ஆணை செய்ய
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,கொள்முதல் ஆணை செய்ய
 DocType: SMS Center,Send To,அனுப்பு
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},விடுப்பு வகை போதுமான விடுப்பு சமநிலை இல்லை {0}
 DocType: Payment Reconciliation Payment,Allocated amount,ஒதுக்கப்பட்டுள்ள தொகை
@@ -1790,18 +1789,17 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,"வேலை, முன்னேற்றம் கிடங்கு சமர்ப்பிக்க முன் தேவை"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ஒரு வேலை விண்ணப்பதாரர்.
 DocType: Purchase Order Item,Warehouse and Reference,கிடங்கு மற்றும் குறிப்பு
 DocType: Supplier,Statutory info and other general information about your Supplier,சட்டப்பூர்வ தகவல் மற்றும் உங்கள் சப்ளையர் பற்றி மற்ற பொது தகவல்
 DocType: Item,Serial Nos and Batches,சீரியல் எண்கள் மற்றும் தொகுப்புகளும்
 DocType: Item,Serial Nos and Batches,சீரியல் எண்கள் மற்றும் தொகுப்புகளும்
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,மாணவர் குழு வலிமை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,ஜர்னல் எதிராக நுழைவு {0} எந்த வேறொன்றும் {1} நுழைவு இல்லை
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,மதிப்பீடுகளில்
 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: Grading Structure,Grading Intervals,தரம் பிரித்தல் இடைவெளிகள்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,தயவுசெய்து உள்ளீடவும்
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","வரிசையில் பொருள் {0} க்கான overbill முடியாது {1} விட {2}. அமைப்புகள் வாங்குவதில் அதிகமாக பில்லிங் அனுமதிக்க, அமைக்கவும்"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,பொருள் அல்லது கிடங்கில் அடிப்படையில் வடிகட்டி அமைக்கவும்
@@ -1813,17 +1811,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} சமர்ப்பிக்க வேண்டும்
 DocType: Authorization Control,Authorization Control,அங்கீகாரம் கட்டுப்பாடு
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},ரோ # {0}: கிடங்கு நிராகரிக்கப்பட்டது நிராகரித்தது பொருள் எதிராக கட்டாயமாகும் {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,கொடுப்பனவு
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,உங்கள் ஆர்டர்களை நிர்வகிக்கவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,கொடுப்பனவு
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,உங்கள் ஆர்டர்களை நிர்வகிக்கவும்
 DocType: Production Order Operation,Actual Time and Cost,உண்மையான நேரம் மற்றும் செலவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},அதிகபட்ச பொருள் கோரிக்கை {0} உருப்படி {1} எதிராகவிற்பனை ஆணை {2}
 DocType: Employee,Salutation,வணக்கம் தெரிவித்தல்
 DocType: Course,Course Abbreviation,பாடநெறி சுருக்கமான
 DocType: Student Leave Application,Student Leave Application,மாணவர் விடுப்பு விண்ணப்பம்
 DocType: Item,Will also apply for variants,கூட வகைகளில் விண்ணப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","அது ஏற்கனவே உள்ளது என, சொத்து இரத்து செய்ய முடியாது {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},பணியாளர் {0} அன்று அரை நாளில் {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},மொத்த வேலை மணி நேரம் அதிகபட்சம் வேலை நேரம் விட அதிகமாக இருக்க கூடாது {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,மீது
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,விற்பனை நேரத்தில் பொருட்களை மூட்டை.
 DocType: Quotation Item,Actual Qty,உண்மையான அளவு
 DocType: Sales Invoice Item,References,குறிப்புகள்
@@ -1833,7 +1832,7 @@
 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 +91,Associate,இணை
 DocType: Asset Movement,Asset Movement,சொத்து இயக்கம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,புதிய வண்டி
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,புதிய வண்டி
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,பொருள் {0} ஒரு தொடர் பொருள் அல்ல
 DocType: SMS Center,Create Receiver List,பெறுநர் பட்டியல் உருவாக்க
 DocType: Vehicle,Wheels,வீல்ஸ்
@@ -1865,10 +1864,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,உற்பத்தி ஆணைகள் எதிராக நேரத்தில் பதிவுகள் உருவாக்கம் முடக்குகிறது. ஆபரேஷன்ஸ் உற்பத்தி ஒழுங்குக்கு எதிரான கண்காணிக்கப்படும்
 DocType: Student,Student Mobile Number,மாணவர் மொபைல் எண்
 DocType: Item,Has Variants,வகைகள் உண்டு
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},நீங்கள் ஏற்கனவே இருந்து பொருட்களை தேர்ந்தெடுத்த {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,மாதாந்திர விநியோகம் பெயர்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,தொகுப்பு ஐடி கட்டாயமாகும்
 DocType: Sales Person,Parent Sales Person,பெற்றோர் விற்பனை நபர்
 DocType: Purchase Invoice,Recurring Invoice,மீண்டும் விலைப்பட்டியல்
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,திட்டங்கள் நிர்வாக
@@ -1876,11 +1875,11 @@
 DocType: Budget,Fiscal Year,நிதியாண்டு
 DocType: Vehicle Log,Fuel Price,எரிபொருள் விலை
 DocType: Budget,Budget,வரவு செலவு திட்டம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,நிலையான சொத்து பொருள் அல்லாத பங்கு உருப்படியை இருக்க வேண்டும்.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",அது ஒரு வருமான அல்லது செலவு கணக்கு அல்ல என பட்ஜெட் எதிராக {0} ஒதுக்கப்படும் முடியாது
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,அடைய
 DocType: Student Admission,Application Form Route,விண்ணப்ப படிவம் வழி
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,மண்டலம் / வாடிக்கையாளர்
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,மண்டலம் / வாடிக்கையாளர்
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,எ.கா. 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,விட்டு வகை {0} அது சம்பளமில்லா விடுப்பு என்பதால் ஒதுக்கீடு முடியாது
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},ரோ {0}: ஒதுக்கப்பட்டுள்ள தொகை {1} குறைவாக இருக்க வேண்டும் அல்லது நிலுவை தொகை விலைப்பட்டியல் சமம் வேண்டும் {2}
@@ -1900,15 +1899,15 @@
 ,Serial No Status,தொடர் இல்லை நிலைமை
 DocType: Payment Entry Reference,Outstanding,சிறந்த
 ,Daily Timesheet Summary,டெய்லி டைம் ஷீட் சுருக்கம்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","ரோ {0}: அமைக்க {1} காலகட்டம், இருந்து மற்றும் தேதி \
  இடையே வேறுபாடு அதிகமாக அல்லது சமமாக இருக்க வேண்டும், {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,இந்த பங்கு இயக்கத்தை அடிப்படையாக கொண்டது. பார்க்க {0} விவரங்களுக்கு
 DocType: Pricing Rule,Selling,விற்பனை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},அளவு {0} {1} எதிராக கழிக்கப்படும் {2}
 DocType: Employee,Salary Information,சம்பளம் தகவல்
 DocType: Sales Person,Name and Employee ID,பெயர் மற்றும் பணியாளர் ஐடி
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,காரணம் தேதி தேதி தகவல்களுக்கு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,கடமைகள் மற்றும் வரி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,குறிப்பு தேதியை உள்ளிடவும்
@@ -1920,14 +1919,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,இந்த குற்றச்சாட்டை வகை விட அல்லது தற்போதைய வரிசையில் எண்ணிக்கை சமமாக வரிசை எண் பார்க்கவும் முடியாது
 DocType: Asset,Sold,விற்கப்பட்டது
 ,Item-wise Purchase History,பொருள் வாரியான கொள்முதல் வரலாறு
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"சீரியல் இல்லை பொருள் சேர்க்க எடுக்க ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து, {0}"
 DocType: Account,Frozen,நிலையாக்கப்பட்டன
 ,Open Production Orders,திறந்த உற்பத்தி ஆணைகள்
 DocType: Sales Invoice Payment,Base Amount (Company Currency),அடிப்படை அளவு (நிறுவனத்தின் நாணய)
 DocType: Payment Reconciliation Payment,Reference Row,குறிப்பு ரோ
 DocType: Installation Note,Installation Time,நிறுவல் நேரம்
 DocType: Sales Invoice,Accounting Details,கணக்கு விவரங்கள்
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்கு
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,முதலீடுகள்
 DocType: Issue,Resolution Details,தீர்மானம் விவரம்
@@ -1959,14 +1958,14 @@
 DocType: Discussion,Discussion,கலந்துரையாடல்
 DocType: Payment Entry,Transaction ID,நடவடிக்கை ஐடி
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,விலை விதிமுறைகள் மேலும் அளவு அடிப்படையில் வடிகட்டப்பட்டு.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},பணியாளரின் சேர தேதி அமைக்கவும் {0}
 DocType: Task,Total Billing Amount (via Time Sheet),மொத்த பில்லிங் அளவு (நேரம் தாள் வழியாக)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,மீண்டும் வாடிக்கையாளர் வருவாய்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})பங்கு 'செலவு ஒப்புதல்' வேண்டும்
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1})பங்கு 'செலவு ஒப்புதல்' வேண்டும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,இணை
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ஆக்கத்துக்கான BOM மற்றும் அளவு தேர்ந்தெடுக்கவும்
 DocType: Asset,Depreciation Schedule,தேய்மானம் அட்டவணை
 DocType: Bank Reconciliation Detail,Against Account,கணக்கு எதிராக
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,அரை நாள் தேதி வரம்பு தேதி தேதி இடையே இருக்க வேண்டும்
@@ -1980,17 +1979,18 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},நிறுவனத்தின் &#39;சொத்து தேய்மானம் செலவு மையம்&#39; அமைக்கவும் {0}
 ,Maintenance Schedules,பராமரிப்பு அட்டவணை
 DocType: Task,Actual End Date (via Time Sheet),உண்மையான முடிவு தேதி (நேரம் தாள் வழியாக)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},அளவு {0} {1} எதிராக {2} {3}
 ,Quotation Trends,மேற்கோள் போக்குகள்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},"பொருள் குழு குறிப்பிடப்படவில்லை
 உருப்படியை {0} ல் உருப்படியை மாஸ்டர்"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,கணக்கில் பற்று ஒரு பெறத்தக்க கணக்கு இருக்க வேண்டும்
 DocType: Shipping Rule Condition,Shipping Amount,கப்பல் தொகை
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,நிலுவையில் தொகை
 DocType: Purchase Invoice Item,Conversion Factor,மாற்ற காரணி
 DocType: Purchase Order,Delivered,வழங்கினார்
 ,Vehicle Expenses,வாகன செலவுகள்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
+DocType: Serial No,Invoice Details,விவரப்பட்டியல் விவரங்கள்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்க்கப்பட்ட மதிப்பு அதிகமாக அல்லது சமமாக இருக்க வேண்டும் {0}
 DocType: Purchase Receipt,Vehicle Number,வாகன எண்
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,மீண்டும் விலைப்பட்டியல் நிறுத்த வேண்டும் எந்த தேதி
 DocType: Employee Loan,Loan Amount,கடன்தொகை
@@ -2009,12 +2009,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,அலுவலக அமைப்புகள்
 DocType: Salary Slip,net pay info,நிகர ஊதியம் தகவல்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,செலவு கோரும் அனுமதிக்காக நிலுவையில் உள்ளது . மட்டுமே செலவு அப்ரூவரான நிலையை மேம்படுத்த முடியும் .
 DocType: Email Digest,New Expenses,புதிய செலவுகள்
 DocType: Purchase Invoice,Additional Discount Amount,கூடுதல் தள்ளுபடி தொகை
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","ரோ # {0}: அளவு 1, உருப்படி ஒரு நிலையான சொத்தாக இருக்கிறது இருக்க வேண்டும். பல கொத்தமல்லி தனி வரிசையில் பயன்படுத்தவும்."
 DocType: Leave Block List Allow,Leave Block List Allow,பிளாக் பட்டியல் அனுமதி விட்டு
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,சுருக்கம் வெற்று அல்லது இடைவெளி  இருக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,அல்லாத குழு குழு
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,விளையாட்டு
 DocType: Loan Type,Loan Name,கடன் பெயர்
@@ -2026,6 +2026,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,நீங்கள் நிராகரித்து பொருட்களை பங்கு வைத்து எங்கே கிடங்கு
 DocType: Production Order,Skip Material Transfer,பொருள் பரிமாற்ற செல்க
 DocType: Production Order,Skip Material Transfer,பொருள் பரிமாற்ற செல்க
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ஈடாக விகிதம் கண்டுபிடிக்க முடியவில்லை {0} {1} முக்கிய தேதி {2}. கைமுறையாக ஒரு செலாவணி பதிவை உருவாக்க கொள்ளவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,உங்கள் நிதி ஆண்டில் முடிவடைகிறது
 DocType: POS Profile,Price List,விலை பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} இப்போது இயல்புநிலை நிதியாண்டு ஆகிறது . விளைவு எடுக்க மாற்றம் உங்களது உலாவி புதுப்பிக்கவும் .
@@ -2042,19 +2043,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},கணக்கு {0} தவறானது. கணக்கு நாணய இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},மொறட்டுவ பல்கலைகழகம் மாற்ற காரணி வரிசையில் தேவைப்படுகிறது {0}
 DocType: Production Plan Item,material_request_item,பொருள் கோரிக்கை உருப்படியை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை விற்பனை ஆணை ஒன்று, விற்பனை விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Salary Component,Deduction,கழித்தல்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,ரோ {0}: நேரம் இருந்து மற்றும் நேரம் கட்டாயமாகும்.
 DocType: Stock Reconciliation Item,Amount Difference,தொகை  வேறுபாடு
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},பொருள் விலை சேர்க்கப்பட்டது {0} விலை பட்டியல்  {1} ல்
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,இந்த வியாபாரி பணியாளர் Id உள்ளிடவும்
 DocType: Territory,Classification of Customers by region,பிராந்தியம் மூலம் வாடிக்கையாளர்கள் பிரிவுகள்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,வேறுபாடு தொகை பூஜ்ஜியமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,வேறுபாடு தொகை பூஜ்ஜியமாக இருக்க வேண்டும்
 DocType: Project,Gross Margin,மொத்த அளவு
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,முதல் உற்பத்தி பொருள் உள்ளிடவும்
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,கணக்கிடப்படுகிறது வங்கி அறிக்கை சமநிலை
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ஊனமுற்ற பயனர்
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,மேற்கோள்
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,மேற்கோள்
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,மொத்த பொருத்தியறிதல்
 ,Production Analytics,உற்பத்தி அனலிட்டிக்ஸ்
@@ -2063,9 +2064,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},எச்சரிக்கை: இணைப்பு தவறான SSL சான்றிதழ் {0}
 DocType: Student Admission,Eligibility,தகுதி
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",தடங்கள் நீங்கள் வணிக உங்கள் தடங்கள் போன்ற உங்கள் தொடர்புகள் மற்றும் மேலும் சேர்க்க உதவ
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",தடங்கள் நீங்கள் வணிக உங்கள் தடங்கள் போன்ற உங்கள் தொடர்புகள் மற்றும் மேலும் சேர்க்க உதவ
 DocType: Production Order Operation,Actual Operation Time,உண்மையான நடவடிக்கையை நேரம்
 DocType: Authorization Rule,Applicable To (User),பொருந்தும் (பயனர்)
 DocType: Purchase Taxes and Charges,Deduct,கழித்து
@@ -2080,7 +2081,7 @@
 DocType: Guardian,Work Address,பணியிட முகவரி
 DocType: Appraisal,Calculate Total Score,மொத்த மதிப்பெண் கணக்கிட
 DocType: Request for Quotation,Manufacturing Manager,தயாரிப்பு மேலாளர்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},தொடர் இல {0} வரை உத்தரவாதத்தை கீழ் உள்ளது {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,தொகுப்புகளை கொண்டு டெலிவரி குறிப்பு பிரிந்தது.
 apps/erpnext/erpnext/hooks.py +87,Shipments,படுவதற்கு
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,கணக்கு இருப்பு ({0}) {1} மற்றும் பங்கு மதிப்பு ({2}) கிடங்குக்குமான {3} அதே இருக்க வேண்டும்
@@ -2103,10 +2104,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,குறிப்பு: மின்னஞ்சல் ஊனமுற்ற செய்த அனுப்ப முடியாது
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,பரஸ்பர எண்ணிக்கை
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,பரஸ்பர எண்ணிக்கை
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,நிறுவனத்தின் தேர்ந்தெடுக்கவும் ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,அனைத்து துறைகளில் கருதப்படுகிறது என்றால் வெறுமையாக
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","வேலைவாய்ப்பு ( நிரந்தர , ஒப்பந்த , பயிற்சி முதலியன) வகைகள் ."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} பொருள் கட்டாய {1}
 DocType: Process Payroll,Fortnightly,இரண்டு வாரங்களுக்கு ஒரு முறை
 DocType: Currency Exchange,From Currency,நாணய இருந்து
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","குறைந்தது ஒரு வரிசையில் ஒதுக்கப்பட்டுள்ள தொகை, விலைப்பட்டியல் வகை மற்றும் விலைப்பட்டியல் எண் தேர்ந்தெடுக்கவும்"
@@ -2115,14 +2116,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),விகிதம் (நிறுவனத்தின் கரன்சி)
 DocType: Student Guardian,Others,மற்றவை
 DocType: Payment Entry,Unallocated Amount,ஒதுக்கப்படாத தொகை
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ஒரு பொருத்தமான பொருள் கண்டுபிடிக்க முடியவில்லை. ஐந்து {0} வேறு சில மதிப்பு தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,மேலும் புதுப்பிப்புகளை இல்லை
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,முதல் வரிசையில் ' முந்தைய வரிசை மொத்த ' முந்தைய வரிசையில் தொகை 'அல்லது குற்றச்சாட்டுக்கள் வகை தேர்ந்தெடுக்க முடியாது
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,குழந்தை பொருள் ஒரு தயாரிப்பு மூட்டை இருக்க கூடாது. உருப்படியை நீக்க: {0}: மற்றும் காப்பாற்றுங்கள்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,வங்கி
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets சேர்
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets சேர்
 DocType: Vehicle Service,Service Item,சேவை பொருள்
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
 DocType: Bank Guarantee,Bank Guarantee,வங்கி உத்தரவாதம்
@@ -2148,6 +2149,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},ரோ # {0}: சொத்து {1} ஏற்கனவே {2}
 DocType: Quotation Item,Stock Balance,பங்கு இருப்பு
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,செலுத்துதல் விற்பனை ஆணை
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} அமைப்பு&gt; அமைப்புகள் வழியாக&gt; பெயரிடுதல் தொடருக்கான தொடர் பெயரிடுதல் அமைக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,தலைமை நிர்வாக அதிகாரி
 DocType: Expense Claim Detail,Expense Claim Detail,செலவு  கோரிக்கை  விவரம்
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,சரியான கணக்கில் தேர்ந்தெடுக்கவும்
@@ -2172,14 +2174,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,விலை பட்டியல் அமைக்கப்படவில்லை எனில் காண்பிக்கப்படும் விலைகளில் முடியாது
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,இந்த கப்பல் விதி ஒரு நாடு குறிப்பிட அல்லது உலகம் முழுவதும் கப்பல் சரிபார்க்கவும்
 DocType: Stock Entry,Total Incoming Value,மொத்த உள்வரும் மதிப்பு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,பற்று தேவைப்படுகிறது
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,பற்று தேவைப்படுகிறது
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets உங்கள் அணி செய்யப்படுகிறது செயல்பாடுகளுக்கு நேரம், செலவு மற்றும் பில்லிங் கண்காணிக்க உதவும்"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,கொள்முதல் விலை பட்டியல்
 DocType: Offer Letter Term,Offer Term,சலுகை  கால
 DocType: Quality Inspection,Quality Manager,தர மேலாளர்
 DocType: Job Applicant,Job Opening,வேலை வாய்ப்பிற்கும்
 DocType: Payment Reconciliation,Payment Reconciliation,கொடுப்பனவு நல்லிணக்க
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,பொறுப்பாளர் நபரின் பெயர் தேர்வு செய்க
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,தொழில்நுட்ப
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},மொத்த செலுத்தப்படாத: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM இணையத்தளம் ஆபரேஷன்
@@ -2207,23 +2209,23 @@
 DocType: Opportunity,Lost Reason,இழந்த காரணம்
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,புதிய முகவரி
 DocType: Quality Inspection,Sample Size,மாதிரி அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,அனைத்து பொருட்களும் ஏற்கனவே விலை விவரம்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,தயவு செய்து ரசீது ஆவண நுழைய
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,மேலும் செலவு மையங்கள் குழுக்கள் கீழ் செய்யப்பட்ட ஆனால் உள்ளீடுகளை அல்லாத குழுக்கள் எதிராகவும் முடியும்
 DocType: Project,External,வெளி
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,பயனர்கள் மற்றும் அனுமதிகள்
 DocType: Vehicle Log,VLOG.,பதிவின்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},உற்பத்தி ஆணைகள் உருவாக்கப்பட்டது: {0}
 DocType: Branch,Branch,கிளை
 DocType: Guardian,Mobile Number,மொபைல் எண்
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,அச்சிடுதல் மற்றும் பிராண்டிங்
 DocType: Bin,Actual Quantity,உண்மையான அளவு
 DocType: Shipping Rule,example: Next Day Shipping,உதாரணமாக: அடுத்த நாள் கப்பல்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,இல்லை தொ.இல. {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,இல்லை தொ.இல. {0}
 DocType: Scheduling Tool,Student Batch,மாணவர் தொகுதி
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,உங்கள் வாடிக்கையாளர்கள்
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,மாணவர் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,மாணவர் செய்ய
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},நீங்கள் திட்டம் இணைந்து அழைக்கப்பட்டுள்ளனர்: {0}
 DocType: Leave Block List Date,Block Date,தேதி தடை
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,இப்பொழுது விண்ணப்பியுங்கள்
@@ -2248,8 +2250,9 @@
 DocType: SMS Log,Sent To,அனுப்பப்படும்
 DocType: Payment Request,Make Sales Invoice,விற்பனை விலைப்பட்டியல் செய்ய
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,மென்பொருள்கள்
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,அடுத்த தொடர்பு தேதி கடந்த காலத்தில் இருக்க முடியாது
 DocType: Company,For Reference Only.,குறிப்பு மட்டும்.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,தொகுதி தேர்வு இல்லை
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},தவறான {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,முன்கூட்டியே தொகை
@@ -2263,7 +2266,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,வழக்கு எண் 0 இருக்க முடியாது
 DocType: Item,Show a slideshow at the top of the page,பக்கம் மேலே ஒரு ஸ்லைடு ஷோ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ஸ்டோர்கள்
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ஸ்டோர்கள்
 DocType: Serial No,Delivery Time,விநியோக நேரம்
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,அடிப்படையில் மூப்படைதலுக்கான
 DocType: Item,End of Life,வாழ்க்கை முடிவுக்கு
@@ -2275,12 +2278,12 @@
 DocType: Rename Tool,Rename Tool,கருவி மறுபெயரிடு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,மேம்படுத்தல்
 DocType: Item Reorder,Item Reorder,உருப்படியை மறுவரிசைப்படுத்துக
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,மாற்றம் பொருள்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,சம்பளம் ஷோ ஸ்லிப்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,மாற்றம் பொருள்
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","நடவடிக்கைகள் , இயக்க செலவு குறிப்பிட உங்கள் நடவடிக்கைகள் ஒரு தனிப்பட்ட நடவடிக்கை இல்லை கொடுக்க ."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,இந்த ஆவணம் மூலம் எல்லை மீறிவிட்டது {0} {1} உருப்படியை {4}. நீங்கள் கவனிக்கிறீர்களா மற்றொரு {3} அதே எதிராக {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,சேமிப்பு பிறகு மீண்டும் அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,மாற்றம் தேர்வு அளவு கணக்கு
 DocType: Purchase Invoice,Price List Currency,விலை பட்டியல் நாணயத்தின்
 DocType: Naming Series,User must always select,பயனர் எப்போதும் தேர்ந்தெடுக்க வேண்டும்
 DocType: Stock Settings,Allow Negative Stock,எதிர்மறை பங்கு அனுமதிக்கும்
@@ -2291,7 +2294,7 @@
 DocType: Budget Account,Budget Account,பட்ஜெட் கணக்கு
 DocType: Quality Inspection,Verified By,மூலம் சரிபார்க்கப்பட்ட
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ஏற்கனவே நடவடிக்கைகள் உள்ளன, ஏனெனில் , நிறுவனத்தின் இயல்புநிலை நாணய மாற்ற முடியாது. நடவடிக்கைகள் இயல்புநிலை நாணய மாற்ற இரத்து செய்யப்பட வேண்டும்."
-DocType: Grade Interval,Grade Description,தரம் விளக்கம்
+DocType: Grading Scale Interval,Grade Description,தரம் விளக்கம்
 DocType: Stock Entry,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,சம்பளம் சீட்டு  உருவாக்க
@@ -2329,7 +2332,7 @@
 DocType: Upload Attendance,Attendance To Date,தேதி வருகை
 DocType: Warranty Claim,Raised By,எழுப்பப்பட்ட
 DocType: Payment Gateway Account,Payment Account,கொடுப்பனவு கணக்கு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,நிறுவனத்தின் தொடர குறிப்பிடவும்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,கணக்குகள் நிகர மாற்றம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,இழப்பீட்டு இனிய
 DocType: Offer Letter,Accepted,ஏற்கப்பட்டது
@@ -2339,12 +2342,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,நீங்கள் உண்மையில் இந்த நிறுவனத்தின் அனைத்து பரிமாற்றங்கள் நீக்க வேண்டும் என்பதை உறுதி செய்யுங்கள். இது போன்ற உங்கள் மாஸ்டர் தரவு இருக்கும். இந்தச் செயலைச் செயல்.
 DocType: Room,Room Number,அறை எண்
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},தவறான குறிப்பு {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) திட்டமிட்ட அளவை விட அதிகமாக இருக்க முடியாது ({2}) உற்பத்தி ஆணை {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) திட்டமிட்ட அளவை விட அதிகமாக இருக்க முடியாது ({2}) உற்பத்தி ஆணை {3}
 DocType: Shipping Rule,Shipping Rule Label,கப்பல் விதி லேபிள்
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,பயனர் கருத்துக்களம்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,மூலப்பொருட்கள் காலியாக இருக்க முடியாது.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","பங்கு புதுப்பிக்க முடியவில்லை, விலைப்பட்டியல் துளி கப்பல் உருப்படி உள்ளது."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,விரைவு ஜர்னல் நுழைவு
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM எந்த பொருளை agianst குறிப்பிட்டுள்ள நீங்கள் வீதம் மாற்ற முடியாது
 DocType: Employee,Previous Work Experience,முந்தைய பணி அனுபவம்
 DocType: Stock Entry,For Quantity,அளவு
@@ -2357,7 +2360,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,விதிமுறைகள் மற்றும் Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,சபையின் பெயரால் இது நீங்கள் இந்த அமைப்பை அமைக்க வேண்டும்.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","இந்த தேதி வரை உறைநிலையில் பைனான்ஸ் நுழைவு, யாரும் / கீழே குறிப்பிட்ட பங்கை தவிர நுழைவு மாற்ற முடியும்."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"பராமரிப்பு அட்டவணை உருவாக்கும் முன் ஆவணத்தை சேமிக்க , தயவு செய்து"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,திட்டம் நிலை
 DocType: UOM,Check this to disallow fractions. (for Nos),அனுமதிப்பதில்லை உராய்வுகள் இந்த சரிபார்க்கவும். (இலக்கங்கள் ஐந்து)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,பின்வரும் உற்பத்தித் தேவைகளை உருவாக்கப்பட்ட:
@@ -2384,7 +2387,7 @@
 ,Employees working on a holiday,ஒரு விடுமுறை வேலை ஊழியர்
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,மார்க் தற்போதைய
 DocType: Project,% Complete Method,% முழுமையான முறை
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},பராமரிப்பு தொடக்க தேதி வரிசை எண்{0} விநியோகம் தேதி முன் இருக்க முடியாது
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},பராமரிப்பு தொடக்க தேதி வரிசை எண்{0} விநியோகம் தேதி முன் இருக்க முடியாது
 DocType: Production Order,Actual End Date,உண்மையான முடிவு தேதி
 DocType: BOM,Operating Cost (Company Currency),இயக்க செலவு (நிறுவனத்தின் நாணய)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2401,7 +2404,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,சம்பளமில்லா விடுப்பு ஒப்புதல் விடுப்பு விண்ணப்பம் பதிவுகள் பொருந்தவில்லை
 DocType: Campaign,Campaign-.####,பிரச்சாரத்தின் . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,அடுத்த படிகள்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,சிறந்த சாத்தியமுள்ள விகிதங்களில் குறிப்பிட்ட பொருட்களை வழங்கவும்
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 நாட்களுக்கு பிறகு ஆட்டோ நெருங்கிய வாய்ப்பு
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,இறுதி ஆண்டு
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / முன்னணி%
@@ -2459,7 +2462,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd அளவு
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},கட்டணம் பதிவுகள்   உருவாக்கப்பட்டது - {0}
 DocType: Asset Category Account,Asset Category Account,சொத்து வகை கணக்கு
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},மேலும் பொருள் தயாரிக்க முடியாது {0} விட விற்பனை ஆணை அளவு {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,பங்கு நுழைவு {0} சமர்ப்பிக்க
 DocType: Payment Reconciliation,Bank / Cash Account,வங்கி / பண கணக்கு
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,அடுத்து தொடர்பு மூலம் முன்னணி மின்னஞ்சல் முகவரி அதே இருக்க முடியாது
@@ -2481,7 +2484,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,இசைவு தேதி குறிப்பிடப்படவில்லை
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,உற்பத்தி
 DocType: Guardian,Occupation,தொழில்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,ரோ {0} : தொடங்கும் நாள் நிறைவு நாள் முன்னதாக இருக்க வேண்டும்
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),மொத்தம் (அளவு)
 DocType: Sales Invoice,This Document,இந்த ஆவண
 DocType: Installation Note Item,Installed Qty,நிறுவப்பட்ட அளவு
@@ -2497,15 +2501,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,சிக்கலை புகார்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,பயன்பாட்டு செலவுகள்
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 மேலே
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ரோ # {0}: மற்றொரு ரசீது எதிராக பத்திரிகை நுழைவு {1} கணக்கு இல்லை {2} அல்லது ஏற்கனவே பொருந்தியது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,ரோ # {0}: மற்றொரு ரசீது எதிராக பத்திரிகை நுழைவு {1} கணக்கு இல்லை {2} அல்லது ஏற்கனவே பொருந்தியது
 DocType: Buying Settings,Default Buying Price List,இயல்புநிலை கொள்முதல் விலை பட்டியல்
 DocType: Process Payroll,Salary Slip Based on Timesheet,சம்பளம் ஸ்லிப் டைம் ஷீட் அடிப்படையில்
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,மேலே தேர்ந்தெடுக்கப்பட்ட வரையறையில் அல்லது சம்பளம் சீட்டு இல்லை ஊழியர் ஏற்கனவே உருவாக்கப்பட்ட
 DocType: Notification Control,Sales Order Message,விற்பனை ஆர்டர் செய்தி
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","முதலியன கம்பெனி, நாணய , நடப்பு நிதியாண்டில் , போன்ற அமை கலாச்சாரம்"
 DocType: Payment Entry,Payment Type,கொடுப்பனவு வகை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,பொருள் ஒரு தொகுதி தேர்ந்தெடுக்கவும் {0}. இந்த தேவையை நிறைவேற்றும் என்று ஒரு ஒற்றை தொகுதி கண்டுபிடிக்க முடியவில்லை
 DocType: Process Payroll,Select Employees,தேர்வு ஊழியர்
 DocType: Opportunity,Potential Sales Deal,சாத்தியமான விற்பனை ஒப்பந்தம்
 DocType: Payment Entry,Cheque/Reference Date,காசோலை / பரிந்துரை தேதி
@@ -2522,7 +2526,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ஏற்கனவே நிறுவனம் உருவாக்கப்பட்டது GLOBAL பிஓஎஸ் சுயவிவரம் {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,அனைத்து BOM கள் உள்ள பொருள் / BOM பதிலாக
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,ரசீது ஆவணம் சமர்ப்பிக்க வேண்டும்
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,ரசீது ஆவணம் சமர்ப்பிக்க வேண்டும்
 DocType: Purchase Invoice Item,Received Qty,பெற்றார் அளவு
 DocType: Stock Entry Detail,Serial No / Batch,சீரியல் இல்லை / தொகுப்பு
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,அவர்களுக்கு ஊதியம் இல்லை மற்றும் பெறாதபோது
@@ -2531,11 +2535,11 @@
 DocType: Delivery Note,DN-RET-,டி.என்-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,நேரமில் தாள்கள்
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} செயல்படுத்த-முன்னோக்கி இருக்க முடியாது வகை விடவும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"பராமரிப்பு அட்டவணை அனைத்து பொருட்களின் உருவாக்கப்பட்ட உள்ளது . ' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 ,To Produce,தயாரிப்பாளர்கள்
 apps/erpnext/erpnext/config/hr.py +93,Payroll,சம்பளப்பட்டியல்
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","வரிசையில் {0} உள்ள {1}. பொருள் விகிதம் {2} சேர்க்க, வரிசைகள் {3} சேர்த்துக்கொள்ள வேண்டும்"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,பயனர் செய்ய
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,பயனர் செய்ய
 DocType: Packing Slip,Identification of the package for the delivery (for print),பிரசவத்திற்கு தொகுப்பின் அடையாள (அச்சுக்கு)
 DocType: Bin,Reserved Quantity,ஒதுக்கப்பட்ட அளவு
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,சரியான மின்னஞ்சல் முகவரியை உள்ளிடவும்
@@ -2548,15 +2552,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,முடக்கப்பட்டது டெம்ப்ளேட் இயல்புநிலை டெம்ப்ளேட் இருக்க கூடாது
 DocType: Account,Income Account,வருமான கணக்கு
 DocType: Payment Request,Amount in customer's currency,வாடிக்கையாளர் நாட்டின் நாணய தொகை
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,விநியோகம்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,விநியோகம்
 DocType: Stock Reconciliation Item,Current Qty,தற்போதைய அளவு
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",பகுதி செயற் கைக்கோள் நிலாவிலிருந்து உள்ள &quot;அடிப்படையில் பொருட்களின் விகிதம்&quot; பார்க்க
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,முன்
 DocType: Appraisal Goal,Key Responsibility Area,முக்கிய பொறுப்பு பகுதி
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","மாணவர் தொகுப்புகளும் நீங்கள் வருகை, மாணவர்களுக்கு மதிப்பீடுகளை மற்றும் கட்டணங்கள் கண்காணிக்க உதவும்"
 DocType: Payment Entry,Total Allocated Amount,மொத்த ஒதுக்கப்பட்ட தொகை
 DocType: Item Reorder,Material Request Type,பொருள் கோரிக்கை வகை
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} இலிருந்து சம்பளம் க்கான Accural ஜர்னல் நுழைவு {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",LocalStorage நிரம்பி விட்டதால் காப்பாற்ற முடியவில்லை
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",LocalStorage நிரம்பி விட்டதால் காப்பாற்ற முடியவில்லை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,ரோ {0}: UOM மாற்றக் காரணி கட்டாயமாகும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,குறிப்
 DocType: Budget,Cost Center,செலவு மையம்
@@ -2566,16 +2571,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,விற்பனை பரிவர்த்தனைகள் இருந்து வாடிக்கையாளரின் வரி ஐடி மறை
 DocType: Upload Attendance,Upload HTML,HTML பதிவேற்று
 DocType: Employee,Relieving Date,தேதி நிவாரணத்தில்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","விலை விதி சில அடிப்படை அடிப்படையில், விலை பட்டியல் / தள்ளுபடி சதவீதம் வரையறுக்க மேலெழுத செய்யப்படுகிறது."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,கிடங்கு மட்டுமே பங்கு நுழைவு / டெலிவரி குறிப்பு / கொள்முதல் ரசீது மூலம் மாற்ற முடியும்
 DocType: Employee Education,Class / Percentage,வர்க்கம் / சதவீதம்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,சந்தைப்படுத்தல் மற்றும் விற்பனை தலைவர்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","தேர்ந்தெடுக்கப்பட்ட விலை விதி 'விலை' செய்யப்படுகிறது என்றால், அது விலை பட்டியல் மேலெழுதும். விலை விதி விலை இறுதி விலை ஆகிறது, அதனால் எந்த மேலும் தள்ளுபடி பயன்படுத்த வேண்டும். எனவே, போன்றவை விற்பனை ஆணை, கொள்முதல் ஆணை போன்ற நடவடிக்கைகளில், அதை விட 'விலை பட்டியல் விகிதம்' துறையில் விட, 'விலை' துறையில் தந்தது."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","தேர்ந்தெடுக்கப்பட்ட விலை விதி 'விலை' செய்யப்படுகிறது என்றால், அது விலை பட்டியல் மேலெழுதும். விலை விதி விலை இறுதி விலை ஆகிறது, அதனால் எந்த மேலும் தள்ளுபடி பயன்படுத்த வேண்டும். எனவே, போன்றவை விற்பனை ஆணை, கொள்முதல் ஆணை போன்ற நடவடிக்கைகளில், அதை விட 'விலை பட்டியல் விகிதம்' துறையில் விட, 'விலை' துறையில் தந்தது."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ட்ராக் தொழில் வகை செல்கிறது.
 DocType: Item Supplier,Item Supplier,பொருள் சப்ளையர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,எந்த தொகுதி கிடைக்கும் பொருள் கோட் உள்ளிடவும்
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},ஒரு மதிப்பை தேர்ந்தெடுக்கவும் {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,அனைத்து முகவரிகள்.
 DocType: Company,Stock Settings,பங்கு அமைப்புகள்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","பின்வரும் பண்புகளைக் சாதனைகளை அதே இருந்தால் அதை இணைத்தல் மட்டுமே சாத்தியம். குழு, ரூட் வகை, நிறுவனம்"
@@ -2585,6 +2590,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',நிலையை கொண்டு ஊழியர்களுக்கு நிகழ்வை பற்றி ஒரு மின்னஞ்சல் அனுப்ப வேண்டும் &#39;திறந்த&#39;
 DocType: Task,Depends on Tasks,பணிகளைப் பொறுத்தது
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,வாடிக்கையாளர் குழு மரம் நிர்வகி .
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,இணைப்புகள் ஷாப்பிங் வண்டி இயக்காமல் காட்ட முடியும்
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,புதிய செலவு மையம் பெயர்
 DocType: Leave Control Panel,Leave Control Panel,கண்ட்ரோல் பேனல் விட்டு
@@ -2597,12 +2603,10 @@
 DocType: Sales Invoice,Debit To,செய்ய பற்று
 DocType: Delivery Note,Required only for sample item.,ஒரே மாதிரி உருப்படியை தேவைப்படுகிறது.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,பரிவர்த்தனை பிறகு உண்மையான அளவு
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,சப்ளையர்&gt; சப்ளையர் வகை
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},சம்பளம் சீட்டு இல்லை ஆகியவற்றுக்கிடையில் காணப்படுகிறது {0} மற்றும் {1}
 ,Pending SO Items For Purchase Request,கொள்முதல் கோரிக்கை நிலுவையில் எனவே விடயங்கள்
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,மாணவர் சேர்க்கை
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} முடக்கப்பட்டுள்ளது
 DocType: Supplier,Billing Currency,பில்லிங் நாணய
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,மிகப் பெரியது
@@ -2619,9 +2623,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,முகப்பு இடம்பெற்றிருந்தது தயாரிப்பு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,அனைத்து மதிப்பீடு குழுக்கள்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,புதிய கிடங்கு பெயர்
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),மொத்த {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),மொத்த {0} ({1})
 DocType: C-Form Invoice Detail,Territory,மண்டலம்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,குறிப்பிட தயவுசெய்து தேவையான வருகைகள் எந்த
 DocType: Stock Settings,Default Valuation Method,முன்னிருப்பு மதிப்பீட்டு முறை
 DocType: Vehicle Log,Fuel Qty,எரிபொருள் அளவு
 DocType: Production Order Operation,Planned Start Time,திட்டமிட்ட தொடக்க நேரம்
@@ -2637,7 +2641,7 @@
 DocType: Price List,Price List Master,விலை பட்டியல் மாஸ்டர்
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,நீங்கள் அமைக்க மற்றும் இலக்குகள் கண்காணிக்க முடியும் என்று அனைத்து விற்பனை நடவடிக்கைகள் பல ** விற்பனை நபர்கள் ** எதிரான குறித்துள்ளார்.
 ,S.O. No.,S.O. இல்லை
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},முன்னணி இருந்து வாடிக்கையாளர் உருவாக்க தயவுசெய்து {0}
 DocType: Price List,Applicable for Countries,நாடுகள் பொருந்தும்
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ஒரே நிலையை கொண்ட பயன்பாடுகள் &#39;நிராகரிக்கப்பட்டது&#39; &#39;அனுமதிபெற்ற&#39; மற்றும் விடவும் சமர்ப்பிக்க முடியும்
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},மாணவர் குழு பெயர் வரிசையில் கட்டாய {0}
@@ -2681,7 +2685,7 @@
 DocType: Project,Copied From,இருந்து நகலெடுத்து
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},பெயர் பிழை: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,பற்றாக்குறை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{2} {3}உடன் {0} {1} தொடர்புடையது இல்லை
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{2} {3}உடன் {0} {1} தொடர்புடையது இல்லை
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ஊழியர் வருகை {0} ஏற்கனவே குறிக்கப்பட்டுள்ளது
 DocType: Packing Slip,If more than one package of the same type (for print),அதே வகை மேற்பட்ட தொகுப்பு (அச்சுக்கு)
 ,Salary Register,சம்பளம் பதிவு
@@ -2700,7 +2704,7 @@
 DocType: Tax Rule,Use for Shopping Cart,வண்டியில் பயன்படுத்தவும்
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},மதிப்பு {0} பண்பு {1} செல்லுபடியாகும் பொருள் பட்டியலில் இல்லை பொருள் பண்புக்கூறு மதிப்புகள் இல்லை {2}
 DocType: BOM Item,Scrap %,% கைவிட்டால்
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","கட்டணங்கள் விகிதாசாரத்தில் தேர்வு படி, உருப்படி கொத்தமல்லி அல்லது அளவு அடிப்படையில்"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","கட்டணங்கள் விகிதாசாரத்தில் தேர்வு படி, உருப்படி கொத்தமல்லி அல்லது அளவு அடிப்படையில்"
 DocType: Maintenance Visit,Purposes,நோக்கங்கள்
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,குறைந்தபட்சம் ஒரு பொருளை திருப்பி ஆவணம் எதிர்மறை அளவு உள்ளிட்ட
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ஆபரேஷன் {0} பணிநிலையம் உள்ள எந்த கிடைக்க வேலை மணி நேரத்திற்கு {1}, பல நடவடிக்கைகளில் அறுவை சிகிச்சை உடைந்து"
@@ -2721,16 +2725,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,மண்டலம் மரம் நிர்வகி .
 DocType: Journal Entry Account,Sales Invoice,விற்பனை விலை விவரம்
 DocType: Journal Entry Account,Party Balance,கட்சி இருப்பு
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,தள்ளுபடி விண்ணப்பிக்க தேர்ந்தெடுக்கவும்
 DocType: Company,Default Receivable Account,இயல்புநிலை பெறத்தக்க கணக்கு
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,மேலே தேர்ந்தெடுக்கப்பட்ட தகுதி சம்பளம் மொத்த சம்பளம் வங்கி நுழைவு உருவாக்கவும்
 DocType: Stock Entry,Material Transfer for Manufacture,உற்பத்தி பொருள் மாற்றம்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,தள்ளுபடி சதவீதம் விலை பட்டியலை எதிராக அல்லது அனைத்து விலை பட்டியல் ஒன்று பயன்படுத்த முடியும்.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,தள்ளுபடி சதவீதம் விலை பட்டியலை எதிராக அல்லது அனைத்து விலை பட்டியல் ஒன்று பயன்படுத்த முடியும்.
 DocType: Purchase Invoice,Half-yearly,அரை ஆண்டு
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,பங்கு பைனான்ஸ் நுழைவு
 DocType: Vehicle Service,Engine Oil,இயந்திர எண்ணெய்
 DocType: Sales Invoice,Sales Team1,விற்பனை Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,பொருள் {0} இல்லை
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,பொருள் {0} இல்லை
 DocType: Sales Invoice,Customer Address,வாடிக்கையாளர் முகவரி
 DocType: Employee Loan,Loan Details,கடன் விவரங்கள்
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,ரோ {0}: பூர்த்தி அளவு சுழியை விட பெரியதாக இருக்க வேண்டும்.
@@ -2738,24 +2742,24 @@
 DocType: Account,Root Type,ரூட் வகை
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},ரோ # {0}: விட திரும்ப முடியாது {1} பொருள் {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,சதி
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},இலக்கு கிடங்கில் வரிசையில் கட்டாய {0}
 DocType: Cheque Print Template,Primary Settings,முதன்மை அமைப்புகள்
 DocType: Purchase Invoice,Select Supplier Address,சப்ளையர் முகவரி தேர்வு
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ஊழியர் சேர்
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ஊழியர் சேர்
 DocType: Purchase Invoice Item,Quality Inspection,தரமான ஆய்வு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,மிகச்சிறியது
 DocType: Company,Standard Template,ஸ்டாண்டர்ட் வார்ப்புரு
 DocType: Training Event,Theory,தியரி
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,எச்சரிக்கை : அளவு கோரப்பட்ட பொருள் குறைந்தபட்ச ஆணை அளவு குறைவாக உள்ளது
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,கணக்கு {0} உறைந்திருக்கும்
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,நிறுவனத்திற்கு சொந்தமான கணக்குகள் ஒரு தனி விளக்கப்படம் சட்ட நிறுவனம் / துணைநிறுவனத்திற்கு.
 DocType: Payment Request,Mute Email,முடக்கு மின்னஞ்சல்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","உணவு , குளிர்பானங்கள் & புகையிலை"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},மட்டுமே எதிரான கட்டணம் செய்யலாம் unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,கமிஷன் விகிதம் அதிகமாக 100 இருக்க முடியாது
 DocType: Stock Entry,Subcontract,உள் ஒப்பந்தம்
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,முதல் {0} உள்ளிடவும்
@@ -2794,7 +2798,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,தற்போதுள்ள பரிவர்த்தனை கிடங்குகள் குழு மாற்றப்பட முடியாது.
 DocType: Assessment Result Tool,Result HTML,விளைவாக HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,அன்று காலாவதியாகிறது
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,மாணவர்கள் சேர்
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,மாணவர்கள் சேர்
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},தேர்வு செய்க {0}
 DocType: C-Form,C-Form No,சி படிவம் எண்
 DocType: BOM,Exploded_items,Exploded_items
@@ -2837,7 +2841,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,விவரங்கள்
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,நிதியாண்டு வாய்ப்புகள்
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,மறுவரிசைப்படுத்துக நிலை
 DocType: Company,Chart Of Accounts Template,கணக்குகள் டெம்ப்ளேட் வரைவு
 DocType: Attendance,Attendance Date,வருகை தேதி
@@ -2852,14 +2856,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,நுழைவு நகல்
 DocType: Program Enrollment Tool,Get Students,மாணவர்கள் பெற
 DocType: Serial No,Under Warranty,உத்தரவாதத்தின் கீழ்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[பிழை]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[பிழை]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,நீங்கள் விற்பனை ஆணை சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 ,Employee Birthday,பணியாளர் பிறந்தநாள்
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,மாணவர் தொகுதி வருகை கருவி
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,எல்லை குறுக்கு கோடிட்ட
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,துணிகர முதலீடு
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"இந்த &#39;கல்வி ஆண்டு&#39; கொண்ட ஒரு கல்விசார் கால {0} மற்றும் &#39;கால பெயர்&#39; {1} ஏற்கனவே உள்ளது. இந்த உள்ளீடுகளை மாற்ற, மீண்டும் முயற்சிக்கவும்."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","உருப்படியை {0} எதிராக இருக்கும் பரிமாற்றங்கள் உள்ளன, நீங்கள் மதிப்பு மாற்ற முடியாது {1}"
 DocType: UOM,Must be Whole Number,முழு எண் இருக்க வேண்டும்
 DocType: Leave Control Panel,New Leaves Allocated (In Days),புதிய விடுப்பு (நாட்களில்) ஒதுக்கப்பட்ட
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,தொடர் இல {0} இல்லை
@@ -2879,7 +2883,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,பொருட்கள்% இந்த விற்பனை ஆணை எதிராக வசூலிக்கப்படும்
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,காலம் நிறைவு நுழைவு
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் குழு மாற்றப்பட முடியாது
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},தொகை {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},தொகை {0} {1} {2} {3}
 DocType: Account,Depreciation,மதிப்பிறக்கம் தேய்மானம்
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),வழங்குபவர் (கள்)
 DocType: Employee Attendance Tool,Employee Attendance Tool,பணியாளர் வருகை கருவி
@@ -2903,7 +2907,7 @@
 DocType: Supplier,Last Day of the Next Month,அடுத்த மாதத்தின் கடைசி நாளில்
 DocType: Support Settings,Auto close Issue after 7 days,7 நாட்களுக்குப் பிறகு ஆட்டோ நெருங்கிய வெளியீடு
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","முன் ஒதுக்கீடு செய்யப்படும் {0}, விடுப்பு சமநிலை ஏற்கனவே கேரி-அனுப்பி எதிர்கால விடுப்பு ஒதுக்கீடு பதிவில் இருந்து வருகிறது {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),குறிப்பு: / குறிப்பு தேதி {0} நாள் அனுமதிக்கப்பட்ட வாடிக்கையாளர் கடன் அதிகமாகவும் (கள்)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,மாணவர் விண்ணப்பதாரர்
 DocType: Asset Category Account,Accumulated Depreciation Account,திரண்ட தேய்மானம் கணக்கு
 DocType: Stock Settings,Freeze Stock Entries,பங்கு பதிவுகள் நிறுத்தப்படலாம்
@@ -2914,7 +2918,7 @@
 ,Stock Analytics,பங்கு அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ஆபரேஷன்ஸ் வெறுமையாக முடியும்
 DocType: Maintenance Visit Purpose,Against Document Detail No,ஆவண விபரம் எண் எதிராக
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,கட்சி வகை அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,கட்சி வகை அத்தியாவசியமானதாகும்
 DocType: Quality Inspection,Outgoing,வெளிச்செல்லும்
 DocType: Material Request,Requested For,கோரப்பட்ட
 DocType: Quotation Item,Against Doctype,ஆவண வகை எதிராக
@@ -2931,11 +2935,11 @@
 DocType: Asset,Item Code,பொருள்  குறியீடு
 DocType: Production Planning Tool,Create Production Orders,உற்பத்தி ஆணைகள் உருவாக்க
 DocType: Serial No,Warranty / AMC Details,உத்தரவாதத்தை / AMC விவரம்
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,நடவடிக்கை பொறுத்தே குழு கைமுறையாகச் மாணவர்கள் தேர்வு
 DocType: Journal Entry,User Remark,பயனர் குறிப்பு
 DocType: Lead,Market Segment,சந்தை பிரிவு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},செலுத்திய தொகை மொத்த எதிர்மறை கடன் தொகையை விட அதிகமாக இருக்க முடியாது {0}
 DocType: Employee Internal Work History,Employee Internal Work History,பணியாளர் உள் வேலை வரலாறு
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),நிறைவு (டாக்டர்)
 DocType: Cheque Print Template,Cheque Size,காசோலை அளவு
@@ -2951,7 +2955,7 @@
 DocType: Production Planning Tool,Create Material Requests,பொருள் கோரிக்கைகள் உருவாக்க
 DocType: Employee Education,School/University,பள்ளி / பல்கலைக்கழகம்
 DocType: Payment Request,Reference Details,குறிப்பு விவரம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,பயனுள்ள வாழ்க்கை பிறகு எதிர்பார்த்த மதிப்பு மொத்த கொள்முதல் தொகையை விடக் குறைவாக இருக்க வேண்டும்
 DocType: Sales Invoice Item,Available Qty at Warehouse,சேமிப்பு கிடங்கு கிடைக்கும் அளவு
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,பில் செய்த தொகை
 DocType: Asset,Double Declining Balance,இரட்டை குறைவு சமநிலை
@@ -2972,20 +2976,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",இந்த பங்கு நல்லிணக்க ஒரு தொடக்க நுழைவு என்பதால் வேறுபாடு அக்கவுண்ட் சொத்து / பொறுப்பு வகை கணக்கு இருக்க வேண்டும்
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},செலவிட்டு தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது கொள்ளலாம் {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},கொள்முதல் ஆணை எண் பொருள் தேவை {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,உற்பத்தி ஆர்டர் உருவாக்கப்பட்டது இல்லை
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',' வரம்பு தேதி ' தேதி ' பிறகு இருக்க வேண்டும்
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},மாணவர் என நிலையை மாற்ற முடியாது {0} மாணவர் பயன்பாடு இணைந்தவர் {1}
 DocType: Asset,Fully Depreciated,முழுமையாக தணியாக
 ,Stock Projected Qty,பங்கு அளவு திட்டமிடப்பட்ட
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},வாடிக்கையாளர் {0} திட்டம் அல்ல {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,"அடையாளமிட்ட வருகை, HTML"
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",மேற்கோள்கள் முன்மொழிவுகள் நீங்கள் உங்கள் வாடிக்கையாளர்களுக்கு அனுப்பியுள்ளோம் ஏலம் உள்ளன
 DocType: Sales Order,Customer's Purchase Order,வாடிக்கையாளர் கொள்முதல் ஆணை
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,தொ.எ. மற்றும் தொகுதி
 DocType: Warranty Claim,From Company,நிறுவனத்தின் இருந்து
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,மதிப்பீடு அடிப்படியின் மதிப்பெண்கள் கூட்டுத்தொகை {0} இருக்க வேண்டும்.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,மதிப்பு அல்லது அளவு
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations எண்ணிக்கை பதிவுசெய்தீர்கள் அமைக்கவும்
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,மதிப்பு அல்லது அளவு
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,புரொடக்சன்ஸ் ஆணைகள் எழுப்பியது முடியாது:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,நிமிஷம்
 DocType: Purchase Invoice,Purchase Taxes and Charges,கொள்முதல் வரி மற்றும் கட்டணங்கள்
@@ -2998,7 +3002,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,அனைத்து கிடங்குகள்
 DocType: Sales Partner,Retailer,சில்லறை
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,கணக்கில் பணம் வரவு ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,அனைத்து வழங்குபவர் வகைகள்
 DocType: Global Defaults,Disable In Words,சொற்கள் முடக்கு
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,பொருள் தானாக எண் ஏனெனில் பொருள் கோட் கட்டாய ஆகிறது
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},மேற்கோள் {0} அல்ல வகை {1}
@@ -3007,6 +3011,7 @@
 DocType: Production Order,PRO-,சார்பு
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,வங்கி மிகைஎடுப்பு கணக்கு
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,சம்பள விபரம்  செய்ய
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,ரோ # {0}: ஒதுக்கப்பட்டவை தொகை நிலுவையில் தொகையை விட அதிகமாக இருக்க முடியாது.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,"உலவ BOM,"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,பிணை கடன்கள்
 DocType: Purchase Invoice,Edit Posting Date and Time,இடுகையிடுதலுக்கான தேதி மற்றும் நேரம் திருத்த
@@ -3046,7 +3051,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},விட பங்கு பரிவர்த்தனைகள் பழைய இற்றைப்படுத்த முடியாது {0}
 DocType: Purchase Invoice Item,PR Detail,PR விரிவாக
 DocType: Sales Order,Fully Billed,முழுமையாக வசூலிக்கப்படும்
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ஊழியர் இயல்புநிலை செலுத்தப்பட கணக்கு அமைக்கவும் {0}
 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 +127,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),தொகுப்பின் மொத்த எடை. பொதுவாக நிகர எடை + பேக்கேஜிங் பொருட்கள் எடை. (அச்சுக்கு)
@@ -3057,7 +3061,7 @@
 DocType: Student Group,Group Based On,குழு அடிப்படையிலான அன்று
 DocType: Journal Entry,Bill Date,பில் தேதி
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","சேவை பொருள், வகை, அதிர்வெண் மற்றும் செலவு தொகை தேவைப்படுகிறது"
-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:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","அதிகபட்ச முன்னுரிமை கொண்ட பல விலை விதிகள் உள்ளன என்றால், பின் பின்வரும் உள் முன்னுரிமைகள் பயன்படுத்தப்படும்:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},நீங்கள் உண்மையில் {0} இருந்து அனைத்து சம்பளம் ஸ்லிப் சமர்ப்பிக்க விரும்புகிறீர்களா {1}
 DocType: Cheque Print Template,Cheque Height,காசோலை உயரம்
 DocType: Supplier,Supplier Details,வழங்குபவர் விவரம்
@@ -3069,7 +3073,7 @@
 DocType: Vehicle Log,Invoice Ref,விலைப்பட்டியல் குறிப்பு
 DocType: Purchase Order,Recurring Order,வழக்கமாகத் தோன்றும் ஆணை
 DocType: Company,Default Income Account,இயல்புநிலை வருமான கணக்கு
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,வாடிக்கையாளர் குழு / வாடிக்கையாளர்
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),மூடப்படாத வரி ஆண்டுக்கான லாபம் / இழப்பு (கடன்)
 DocType: Sales Invoice,Time Sheets,நேரம் தாள்கள்
 DocType: Payment Gateway Account,Default Payment Request Message,இயல்புநிலை பணம் கோரிக்கை செய்தி
@@ -3089,10 +3093,10 @@
 DocType: Notification Control,Quotation Message,மேற்கோள் செய்தி
 DocType: Employee Loan,Employee Loan Application,பணியாளர் கடன் விண்ணப்ப
 DocType: Issue,Opening Date,தேதி திறப்பு
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,வருகை வெற்றிகரமாக குறிக்கப்பட்டுள்ளது.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,வருகை வெற்றிகரமாக குறிக்கப்பட்டுள்ளது.
 DocType: Journal Entry,Remark,குறிப்பு
 DocType: Purchase Receipt Item,Rate and Amount,விகிதம் மற்றும் தொகை
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},கணக்கு வகை {0} இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},கணக்கு வகை {0} இருக்க வேண்டும் {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,விடுப்பு மற்றும் விடுமுறை
 DocType: School Settings,Current Academic Term,தற்போதைய கல்வி கால
 DocType: School Settings,Current Academic Term,தற்போதைய கல்வி கால
@@ -3115,7 +3119,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,மாணவர் குழு
 DocType: Shopping Cart Settings,Quotation Series,மேற்கோள் தொடர்
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ஒரு பொருளை ( {0} ) , உருப்படி குழு பெயர் மாற்ற அல்லது மறுபெயரிட தயவு செய்து அதே பெயரில்"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,வாடிக்கையாளர் தேர்ந்தெடுக்கவும்
 DocType: C-Form,I,நான்
 DocType: Company,Asset Depreciation Cost Center,சொத்து தேய்மானம் செலவு மையம்
 DocType: Sales Order Item,Sales Order Date,விற்பனை ஆர்டர் தேதி
@@ -3134,20 +3138,20 @@
 DocType: Vehicle,Insurance Details,காப்புறுதி விபரங்கள்
 DocType: Account,Payable,செலுத்த வேண்டிய
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,தயவு செய்து திரும்பச் செலுத்துதல் பீரியட்ஸ் நுழைய
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),"இருப்பினும், கடனாளிகள் ({0})"
 DocType: Pricing Rule,Margin,விளிம்பு
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,புதிய வாடிக்கையாளர்கள்
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,மொத்த லாபம்%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,அனுமதி தேதி
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,மொத்த கொள்முதல் அளவு அத்தியாவசியமானதாகும்
 DocType: Lead,Address Desc,இறங்குமுக முகவரி
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,கட்சி அத்தியாவசியமானதாகும்
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,கட்சி அத்தியாவசியமானதாகும்
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,தலைப்பு பெயர்
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,விற்பனை அல்லது வாங்கும் குறைந்தபட்சம் ஒரு தேர்வு வேண்டும்
-DocType: Grading Structure,Grade Intervals,தரம் இடைவெளிகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,உங்கள் வணிக தன்மை தேர்ந்தெடுக்கவும்.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},ரோ # {0}: ஆதாரங்கள் நுழைவதற்கான நகல் {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,உற்பத்தி இயக்கங்களை எங்கே கொண்டுவரப்படுகின்றன.
 DocType: Asset Movement,Source Warehouse,மூல கிடங்கு
 DocType: Installation Note,Installation Date,நிறுவல் தேதி
@@ -3184,7 +3188,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,அச்சு வார்ப்புருக்கள் தலைமை பெயர்.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"அச்சு வார்ப்புருக்கள் தலைப்புகள் , எ.கா. செய்யறதுன்னு ."
 DocType: Student Guardian,Student Guardian,மாணவர் கார்டியன்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,மதிப்பீட்டு வகை குற்றச்சாட்டுக்கள் உள்ளீடான என குறிக்கப்பட்டுள்ளன
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,பொருட்களை பல்வேறு மொறட்டுவ பல்கலைகழகம் தவறான ( மொத்த ) நிகர எடை மதிப்பு வழிவகுக்கும். ஒவ்வொரு பொருளின் நிகர எடை அதே மொறட்டுவ பல்கலைகழகம் உள்ளது என்று உறுதி.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM விகிதம்
@@ -3212,7 +3216,7 @@
 DocType: Company,Exchange Gain / Loss Account,செலாவணி லாபம் / நஷ்டம் கணக்கு
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,பணியாளர் மற்றும் வருகை
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},நோக்கம் ஒன்றாக இருக்க வேண்டும் {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,"படிவத்தை பூர்த்தி செய்து, அதை சேமிக்க"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,கருத்துக்களம்
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,பங்கு உண்மையான கொத்தமல்லி
@@ -3228,7 +3232,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,மறுவரிசைப்படுத்துக அளவு
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,தற்போதைய வேலை வாய்ப்புகள்
 DocType: Company,Stock Adjustment Account,பங்கு சரிசெய்தல் கணக்கு
-DocType: Journal Entry,Write Off,இனிய எழுதவும்
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,இனிய எழுதவும்
 DocType: Timesheet Detail,Operation 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}
@@ -3239,27 +3243,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,சப்ளையர் வாடிக்கையாளர் வழங்குகிறது
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# படிவம் / பொருள் / {0}) பங்கு வெளியே
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,அடுத்த நாள் பதிவுசெய்ய தேதி விட அதிகமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,காட்டு வரி இடைவெளிக்கு அப்
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},காரணமாக / குறிப்பு தேதி பின்னர் இருக்க முடியாது {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,தரவு இறக்குமதி மற்றும் ஏற்றுமதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","பங்கு உள்ளீடுகளை, கிடங்கு {0} எதிராக உள்ளன எனவே நீங்கள் மீண்டும் ஒதுக்க அல்லது அதை மாற்ற முடியாது"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,மாணவர்கள் காணப்படவில்லை.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,மாணவர்கள் காணப்படவில்லை.
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,விலைப்பட்டியல் பதிவுசெய்ய தேதி
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,விற்க
 DocType: Sales Invoice,Rounded Total,வட்டமான மொத்த
 DocType: Product Bundle,List items that form the package.,தொகுப்பு அமைக்க என்று பட்டியல் உருப்படிகள்.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,சதவீதம் ஒதுக்கீடு 100% சமமாக இருக்க வேண்டும்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"கட்சி தேர்வு செய்யும் முன், பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்"
 DocType: Program Enrollment,School House,பள்ளி ஹவுஸ்
 DocType: Serial No,Out of AMC,AMC வெளியே
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,மேற்கோள்கள் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,முன்பதிவு செய்யப்பட்டது தேய்மானம்  எண்ணிக்கையை விட அதிகமாக இருக்க முடியும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,பராமரிப்பு விஜயம் செய்ய
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,விற்பனை மாஸ்டர் மேலாளர் {0} பங்கு கொண்ட பயனர் தொடர்பு கொள்ளவும்
 DocType: Company,Default Cash Account,இயல்புநிலை பண கணக்கு
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,நிறுவனத்தின் ( இல்லை வாடிக்கையாளருக்கு அல்லது வழங்குநருக்கு ) மாஸ்டர் .
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,இந்த மாணவர் வருகை அடிப்படையாக கொண்டது
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,எந்த மாணவர்
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,மேலும் பொருட்களை அல்லது திறந்த முழு வடிவம் சேர்க்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',' எதிர்பார்த்த டெலிவரி தேதி ' உள்ளிடவும்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,டெலிவரி குறிப்புகள் {0} இந்த விற்பனை ஆணை ரத்து முன் ரத்து செய்யப்பட வேண்டும்
@@ -3291,6 +3296,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,பொருள் 3
 DocType: Purchase Order,Customer Contact Email,வாடிக்கையாளர் தொடர்பு மின்னஞ்சல்
 DocType: Warranty Claim,Item and Warranty Details,பொருள் மற்றும் உத்தரவாதத்தை விபரங்கள்
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,பொருள் குறியீடு&gt; பொருள் குழு&gt; பிராண்ட்
 DocType: Sales Team,Contribution (%),பங்களிப்பு (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,குறிப்பு: கொடுப்பனவு நுழைவு ' பண அல்லது வங்கி கணக்கு ' குறிப்பிடப்படவில்லை என்பதால் உருவாக்கப்பட்டது முடியாது
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,கட்டாய படிப்புகள் எடுக்க திட்டம் தேர்ந்தெடுக்கவும்.
@@ -3306,9 +3312,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,சமரசம் முன்
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},எப்படி {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),வரிகள் மற்றும் கட்டணங்கள் சேர்க்கப்பட்டது (நிறுவனத்தின் கரன்சி)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,பொருள் வரி வரிசையில் {0} வகை வரி அல்லது வருமான அல்லது செலவு அல்லது வசூலிக்கப்படும் கணக்கு இருக்க வேண்டும்
 DocType: Sales Order,Partly Billed,இதற்கு கட்டணம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,பொருள் {0} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,பொருள் {0} ஒரு நிலையான சொத்தின் பொருள் இருக்க வேண்டும்
 DocType: Item,Default BOM,முன்னிருப்பு BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,மீண்டும் தட்டச்சு நிறுவனத்தின் பெயர் உறுதிப்படுத்த தயவு செய்து
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,மொத்த மிகச்சிறந்த விவரங்கள்
@@ -3318,8 +3324,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,வாகன
 DocType: Vehicle,Insurance Company,காப்பீட்டு நிறுவனம்
 DocType: Asset Category Account,Fixed Asset Account,நிலையான சொத்து கணக்கு
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,மாறி
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,டெலிவரி குறிப்பு இருந்து
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,மாறி
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,டெலிவரி குறிப்பு இருந்து
 DocType: Student,Student Email Address,மாணவர் மின்னஞ்சல் முகவரி
 DocType: Timesheet Detail,From Time,நேரம் இருந்து
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,கையிருப்பில்:
@@ -3331,12 +3337,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,விலை பட்டியல் செலாவணி விகிதம்
 DocType: Purchase Invoice Item,Rate,விலை
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,நடமாட்டத்தை கட்டுபடுத்து
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,முகவரி பெயர்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,முகவரி பெயர்
 DocType: Stock Entry,From BOM,"BOM, இருந்து"
 DocType: Assessment Code,Assessment Code,மதிப்பீடு குறியீடு
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,அடிப்படையான
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} முன் பங்கு பரிவர்த்தனைகள் உறைந்திருக்கும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"' உருவாக்குதல் அட்டவணை ' கிளிக் செய்து,"
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","எ.கா. கிலோ, அலகு, இலக்கங்கள், மீ"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,நீங்கள் பரிந்துரை தேதி உள்ளிட்ட குறிப்பு இல்லை கட்டாயமாகும்
 DocType: Bank Reconciliation Detail,Payment Document,கொடுப்பனவு ஆவண
@@ -3344,19 +3350,19 @@
 DocType: Salary Slip,Salary Structure,சம்பளம் அமைப்பு
 DocType: Account,Bank,வங்கி
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,விமானத்துறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,பிரச்சினை பொருள்
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,பிரச்சினை பொருள்
 DocType: Material Request Item,For Warehouse,கிடங்கு
 DocType: Employee,Offer Date,சலுகை  தேதி
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,மேற்கோள்கள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,நீங்கள் ஆஃப்லைனில் உள்ளன. நீங்கள் பிணைய வேண்டும் வரை ஏற்றவும் முடியாது.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,மாணவர் குழுக்கள் உருவாக்கப்படவில்லை.
 DocType: Purchase Invoice Item,Serial No,இல்லை தொடர்
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,மாதாந்திர கட்டுந்தொகை கடன் தொகை அதிகமாக இருக்கக் கூடாது முடியும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Maintaince விவரம் முதல் உள்ளிடவும்
 DocType: Purchase Invoice,Print Language,அச்சு மொழி
 DocType: Salary Slip,Total Working Hours,மொத்த வேலை நேரங்கள்
 DocType: Stock Entry,Including items for sub assemblies,துணை தொகுதிகளுக்கான உருப்படிகள் உட்பட
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,உள்ளிடவும் மதிப்பு நேர்மறையாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,அனைத்து பிரதேசங்களையும்
 DocType: Purchase Invoice,Items,பொருட்கள்
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,மாணவர் ஏற்கனவே பதிவு செய்யப்பட்டது.
@@ -3376,17 +3382,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',மாற்று அளவீடு இயல்புநிலை யூனிட் &#39;{0}&#39; டெம்ப்ளேட் அதே இருக்க வேண்டும் &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,ஆனால் அடிப்படையில் கணக்கிட
 DocType: Delivery Note Item,From Warehouse,கிடங்கில் இருந்து
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,பொருட்களை பில் கொண்டு உருப்படிகள் இல்லை தயாரிப்பதற்கான
 DocType: Assessment Plan,Supervisor Name,மேற்பார்வையாளர் பெயர்
 DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
 DocType: Program Enrollment Course,Program Enrollment Course,திட்டம் பதிவு கோர்ஸ்
-DocType: Grading Structure,Grading Structure,தரம் பிரித்தல் அமைப்பு
 DocType: Purchase Taxes and Charges,Valuation and Total,மதிப்பீடு மற்றும் மொத்த
 DocType: Tax Rule,Shipping City,கப்பல் நகரம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாறுபாடு உள்ளது. 'இல்லை நகல் அமைக்க வரை காரணிகள் டெம்ப்ளேட் இருந்து நகல்
 DocType: Notification Control,Customize the Notification,அறிவிப்பு தனிப்பயனாக்கு
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,செயல்பாடுகள் இருந்து பண பரிமாற்ற
 DocType: Sales Invoice,Shipping Rule,கப்பல் விதி
@@ -3407,8 +3411,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},"இயல்புநிலை BOM, பொருள் உள்ளது {0}"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,முதல் பதிவுசெய்ய தேதி தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,தேதி திறந்து தேதி மூடுவதற்கு முன் இருக்க வேண்டும்
 DocType: Leave Control Panel,Carry Forward,முன்னெடுத்து செல்
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ஏற்கனவே பரிவர்த்தனைகள் செலவு மையம் லெட்ஜரிடம் மாற்ற முடியாது
 DocType: Department,Days for which Holidays are blocked for this department.,இது விடுமுறை நாட்கள் இந்த துறை தடுக்கப்பட்டது.
@@ -3421,7 +3425,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,லெட்டர் இணைக்கவும்
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,கடைசியாக தொடர்பாடல்
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,கடைசியாக தொடர்பாடல்
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',வகை ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' உள்ளது போது கழித்து முடியாது
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',வகை ' மதிப்பீட்டு ' அல்லது ' மதிப்பீடு மற்றும் மொத்த ' உள்ளது போது கழித்து முடியாது
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,பொருள் கொண்ட போட்டி கொடுப்பனவு
@@ -3437,7 +3441,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),மொத்தம் (விவரங்கள்)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,பொழுதுபோக்கு & ஓய்வு
 DocType: Quality Inspection,Item Serial No,பொருள் தொடர் எண்
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,பணியாளர் ரெக்கார்ட்ஸ் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,பணியாளர் ரெக்கார்ட்ஸ் உருவாக்கவும்
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,மொத்த தற்போதைய
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,கணக்கு அறிக்கைகள்
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,மணி
@@ -3450,10 +3454,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,தெரியாத
 DocType: Shipping Rule,Shipping Rule Conditions,கப்பல் விதி நிபந்தனைகள்
 DocType: BOM Replace Tool,The new BOM after replacement,மாற்று பின்னர் புதிய BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,விற்பனை செய்யுமிடம்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,விற்பனை செய்யுமிடம்
 DocType: Payment Entry,Received Amount,பெறப்பட்ட தொகை
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,அமைவு பணியாளர் மனித வள சிஸ்டம் பெயரிடுதல்&gt; மனிதவள அமைப்புகள்
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",", முழு அளவு உருவாக்க பொருட்டு ஏற்கனவே அளவு புறக்கணித்து"
 DocType: Account,Tax,வரி
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,குறிக்கப்பட்டுள்ளது இல்லை
@@ -3466,9 +3468,9 @@
 DocType: Batch,Source Document Name,மூல ஆவண பெயர்
 DocType: Batch,Source Document Name,மூல ஆவண பெயர்
 DocType: Job Opening,Job Title,வேலை தலைப்பு
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,பயனர்கள் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,பயனர்கள் உருவாக்கவும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,கிராம
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,உற்பத்தி செய்ய அளவு 0 அதிகமாக இருக்க வேண்டும்.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,பராமரிப்பு அழைப்பு அறிக்கையை பார்க்க.
 DocType: Stock Entry,Update Rate and Availability,மேம்படுத்தல் விகிதம் மற்றும் கிடைக்கும்
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,நீங்கள் அளவு எதிராக இன்னும் பெற அல்லது வழங்க அனுமதிக்கப்படுகிறது சதவீதம் உத்தரவிட்டது. எடுத்துக்காட்டாக: நீங்கள் 100 அலகுகள் உத்தரவிட்டார் என்றால். உங்கள் அலவன்ஸ் 10% நீங்கள் 110 அலகுகள் பெற அனுமதிக்கப்படும்.
@@ -3478,28 +3480,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},செலவு கணக்கு உருப்படியை கட்டாய {0}
 DocType: BOM,Website Description,இணையதளத்தில் விளக்கம்
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ஈக்விட்டி நிகர மாற்றம்
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,கொள்முதல் விலைப்பட்டியல் {0} ரத்து செய்க முதல்
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","மின்னஞ்சல் முகவரி, தனித்துவமானதாக இருக்க வேண்டும் ஏற்கனவே உள்ளது {0}"
 DocType: Serial No,AMC Expiry Date,AMC காலாவதியாகும் தேதி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ரசீது
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ரசீது
 ,Sales Register,விற்பனை பதிவு
 DocType: Daily Work Summary Settings Company,Send Emails At,மின்னஞ்சல்களை அனுப்பவும்
 DocType: Quotation,Quotation Lost Reason,மேற்கோள் காரணம் லாஸ்ட்
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,உங்கள் டொமைன் தேர்வு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},பரிவர்த்தனை குறிப்பு இல்லை {0} தேதியிட்ட {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,திருத்த எதுவும் இல்லை .
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,இந்த மாதம் மற்றும் நிலுவையில் நடவடிக்கைகள் சுருக்கம்
 DocType: Customer Group,Customer Group Name,வாடிக்கையாளர் குழு பெயர்
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,இதுவரை இல்லை வாடிக்கையாளர்கள்!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,பணப்பாய்வு அறிக்கை
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},கடன் தொகை அதிகபட்ச கடன் தொகை தாண்ட முடியாது {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,உரிமம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},சி-படிவம் இந்த விலைப்பட்டியல் {0} நீக்கவும் {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,கணக்கு எழுத உள்ளிடவும்
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,கடைசி ஆர்டர் தேதி
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},கணக்கு {0} செய்கிறது நிறுவனம் சொந்தமானது {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,வரிசையில் {0} இல் சீரியல் எண்கள் டெலிவரி குறிப்பு உடன் பொருந்தவில்லை
 DocType: Student,Guardian Details,பாதுகாவலர்  விபரங்கள்
 DocType: C-Form,C-Form,சி படிவம்
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,பல ஊழியர்கள் மார்க் வருகை
@@ -3524,21 +3528,21 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',ரோ {0} # கணக்கு வகை இருக்க வேண்டும் &#39;நிலையான சொத்து&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,அளவு அவுட்
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,ஒரு விற்பனை கப்பல் அளவு கணக்கிட விதிகள்
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,தொடர் கட்டாயமாகும்
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,தொடர் கட்டாயமாகும்
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,நிதி சேவைகள்
 DocType: Student Sibling,Student ID,மாணவர் அடையாளம்
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,நேரம் பதிவேடுகளுக்கு நடவடிக்கைகள் வகைகள்
 DocType: Tax Rule,Sales,விற்பனை
 DocType: Stock Entry Detail,Basic Amount,அடிப்படை தொகை
 DocType: Training Event,Exam,தேர்வு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},பங்கு பொருள் தேவை கிடங்கு {0}
 DocType: Leave Allocation,Unused leaves,பயன்படுத்தப்படாத இலைகள்
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,பில்லிங் மாநிலம்
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,பரிமாற்றம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},"{0} {1} கட்சி கணக்கு {2} 
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},"{0} {1} கட்சி கணக்கு {2} 
 உடன் தொடர்புடைய இல்லை"
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),( துணை கூட்டங்கள் உட்பட ) வெடித்தது BOM எடு
 DocType: Authorization Rule,Applicable To (Employee),பொருந்தும் (பணியாளர்)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,தேதி அத்தியாவசியமானதாகும்
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,பண்பு உயர்வு {0} 0 இருக்க முடியாது
@@ -3549,13 +3553,13 @@
 ,Inactive Customers,செயல்பாடற்ற வாடிக்கையாளர்கள்
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,கொள்முதல் ரசீதுகள்
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,எப்படி விலை பயன்படுத்தப்படும் விதி என்ன?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,எப்படி விலை பயன்படுத்தப்படும் விதி என்ன?
 DocType: Stock Entry,Delivery Note No,விநியோக குறிப்பு இல்லை
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","தேர்ந்தெடுக்கப்பட்டால், மட்டுமே கொள்முதல் இறுதி மூலப்பொருட்கள் பொருள் கோரிக்கைகளை பொருள் கோரிக்கைகள் சேர்க்கப்படும். இல்லையெனில், பெற்றோர் பொருட்கள் பொருள் கோரிக்கைகள் உருவாக்கப்பட்ட வேண்டும்"
 DocType: Cheque Print Template,Message to show,செய்தி காட்ட
 DocType: Company,Retail,சில்லறை
 DocType: Attendance,Absent,வராதிரு
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,தயாரிப்பு மூட்டை
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,தயாரிப்பு மூட்டை
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},ரோ {0}: தவறான குறிப்பு {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,வரி மற்றும் கட்டணங்கள் வார்ப்புரு வாங்க
 DocType: Upload Attendance,Download Template,வார்ப்புரு பதிவிறக்க
@@ -3565,10 +3569,10 @@
 DocType: Payment Entry,Account Paid From,கணக்கு இருந்து பணம்
 DocType: Purchase Order Item Supplied,Raw Material Item Code,மூலப்பொருட்களின் பொருள் குறியீடு
 DocType: Journal Entry,Write Off Based On,ஆனால் அடிப்படையில் இனிய எழுத
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,முன்னணி செய்ய
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,முன்னணி செய்ய
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,அச்சு மற்றும் ஸ்டேஷனரி
 DocType: Stock Settings,Show Barcode Field,காட்டு பார்கோடு களம்
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,சப்ளையர் மின்னஞ்சல்கள் அனுப்ப
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","சம்பளம் ஏற்கனவே இடையே {0} மற்றும் {1}, விட்டு பயன்பாடு காலத்தில் இந்த தேதி வரம்பில் இடையே இருக்க முடியாது காலத்தில் பதப்படுத்தப்பட்ட."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ஒரு சீரியல் எண் நிறுவல் பதிவு
 DocType: Guardian Interest,Guardian Interest,பாதுகாவலர்  வட்டி
@@ -3581,6 +3585,7 @@
 DocType: Offer Letter,Awaiting Response,பதிலை எதிர்பார்த்திருப்பதாகவும்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,மேலே
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},தவறான கற்பிதம் {0} {1}
+DocType: Supplier,Mention if non-standard payable account,குறிப்பிட தரமற்ற செலுத்தப்பட கணக்கு என்றால்
 DocType: Salary Slip,Earning & Deduction,சம்பாதிக்கும் & விலக்கு
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,விருப்ப . இந்த அமைப்பு பல்வேறு நடவடிக்கைகளில் வடிகட்ட பயன்படும்.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,எதிர்மறை மதிப்பீட்டு விகிதம் அனுமதி இல்லை
@@ -3596,10 +3601,9 @@
 DocType: Production Order Item,Production Order Item,உத்தரவு பொருள்
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,எந்த பதிவும் இல்லை
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,முறித்துள்ளது சொத்து செலவு
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,பகுதியளவு ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: செலவு மையம் பொருள் அத்தியாவசியமானதாகும் {2}
 DocType: Vehicle,Policy No,கொள்கை இல்லை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,தயாரிப்பு மூட்டை இருந்து பொருட்களை பெற
 DocType: Asset,Straight Line,நேர் கோடு
 DocType: Project User,Project User,திட்ட பயனர்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,பிரி
@@ -3617,7 +3621,7 @@
 DocType: Program Enrollment Tool,Get Students From,இருந்து மாணவர்கள் பெற
 DocType: Hub Settings,Seller Country,விற்பனையாளர் நாடு
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,இணையத்தளம் வெளியிடு
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,தொகுப்புகளும் குழு உங்கள் மாணவர்கள்
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,தொகுப்புகளும் குழு உங்கள் மாணவர்கள்
 DocType: Authorization Rule,Authorization Rule,அங்கீகார விதி
 DocType: Sales Invoice,Terms and Conditions Details,நிபந்தனைகள் விவரம்
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,விருப்பம்
@@ -3670,14 +3674,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,காசோலை தேதி
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},கணக்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனத்திற்கு சொந்தமானது இல்லை: {2}
 DocType: Program Enrollment Tool,Student Applicants,மாணவர் விண்ணப்பதாரர்கள்
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,வெற்றிகரமாக இந்த நிறுவனம் தொடர்பான அனைத்து நடவடிக்கைகளில் நீக்கப்பட்டது!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,தேதி வரை
 DocType: Appraisal,HR,மனிதவள
 DocType: Program Enrollment,Enrollment Date,பதிவு தேதி
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,சோதனை காலம்
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,சம்பளம் கூறுகள்
 DocType: Program Enrollment Tool,New Academic Year,புதிய கல்வி ஆண்டு
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,திரும்ப / கடன் குறிப்பு
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,திரும்ப / கடன் குறிப்பு
 DocType: Stock Settings,Auto insert Price List rate if missing,வாகன நுழைவு விலை பட்டியல் விகிதம் காணாமல் என்றால்
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,மொத்த கட்டண தொகை
 DocType: Production Order Item,Transferred Qty,அளவு மாற்றம்
@@ -3697,7 +3701,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","சாதாரண, உடம்பு போன்ற இலைகள் வகை"
 DocType: Email Digest,Send regular summary reports via Email.,மின்னஞ்சல் வழியாக வழக்கமான சுருக்கம் அறிக்கைகள் அனுப்பவும்.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},செலவு கூறுகின்றனர் வகை இயல்புநிலை கணக்கு அமைக்கவும் {0}
 DocType: Assessment Result,Student Name,மாணவன் பெயர்
 DocType: Brand,Item Manager,பொருள் மேலாளர்
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,செலுத்த வேண்டிய சம்பளப்பட்டியல்
@@ -3718,6 +3722,7 @@
 ,Sales Funnel,விற்பனை நீக்க
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,சுருக்கம் கட்டாயமாகும்
 DocType: Project,Task Progress,டாஸ்க் முன்னேற்றம்
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,வண்டியில்
 ,Qty to Transfer,இடமாற்றம் அளவு
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,தாங்கியவர்கள் விளைவாக அல்லது வாடிக்கையாளர்களுக்கு மேற்கோள்.
 DocType: Stock Settings,Role Allowed to edit frozen stock,உறைந்த பங்கு திருத்த அனுமதி பங்கு
@@ -3745,12 +3750,12 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,பொருள் வாரியாக வரி விவரம்
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,நிறுவனம் சுருக்கமான
 ,Item-wise Price List Rate,பொருள் வாரியான விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,வழங்குபவர் விலைப்பட்டியல்
 DocType: Quotation,In Words will be visible once you save the Quotation.,நீங்கள் மேற்கோள் சேமிக்க முறை சொற்கள் காணக்கூடியதாக இருக்கும்.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},அளவு ({0}) வரிசையில் ஒரு பகுதியை இருக்க முடியாது {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,கட்டணம் சேகரிக்க
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},பார்கோடு {0} ஏற்கனவே பொருள் பயன்படுத்தப்படுகிறது {1}
 DocType: Lead,Add to calendar on this date,இந்த தேதி நாள்காட்டியில் சேர்க்கவும்
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,கப்பல் செலவுகள் சேர்த்து விதிகள் .
 DocType: Item,Opening Stock,ஆரம்ப இருப்பு
@@ -3768,8 +3773,8 @@
  'நேரம் பதிவு' வழியாக புதுப்பிக்கப்பட்டது"
 DocType: Customer,From Lead,முன்னணி இருந்து
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ஆணைகள் உற்பத்தி வெளியிடப்பட்டது.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,நிதியாண்டு தேர்ந்தெடுக்கவும் ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,பிஓஎஸ் செய்தது பிஓஎஸ் நுழைவு செய்ய வேண்டும்
 DocType: Program Enrollment Tool,Enroll Students,மாணவர்கள் பதிவுசெய்யவும்
 DocType: Hub Settings,Name Token,பெயர் டோக்கன்
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ஸ்டாண்டர்ட் விற்பனை
@@ -3780,7 +3785,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} விற்பனை விலைப்பட்டியல்க்கு எதிரான {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,திட்டம் பெயர்
-DocType: Supplier,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
+DocType: Customer,Mention if non-standard receivable account,குறிப்பிட தரமற்ற பெறத்தக்க கணக்கு என்றால்
 DocType: Journal Entry Account,If Income or Expense,என்றால் வருமானம் அல்லது செலவு
 DocType: Production Order,Required Items,தேவையான பொருட்கள்
 DocType: Stock Ledger Entry,Stock Value Difference,பங்கு மதிப்பு வேறுபாடு
@@ -3801,7 +3806,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,தொகுப்பு இந்த விற்பனை நபர் குழு வாரியான பொருள் குறிவைக்கிறது.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],உறைதல் பங்குகள் பழைய [days]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,ரோ # {0}: சொத்துக்கான நிலையான சொத்து வாங்க / விற்க அத்தியாவசியமானதாகும்
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","இரண்டு அல்லது அதற்கு மேற்பட்ட விலை விதிகள் மேலே நிபந்தனைகளை அடிப்படையாகக் காணப்படுகின்றன என்றால், முன்னுரிமை பயன்படுத்தப்படுகிறது. இயல்புநிலை மதிப்பு பூஜ்யம் (வெற்று) இருக்கும் போது முன்னுரிமை 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.,பின்வரும் பயனர்கள் தொகுதி நாட்கள் விடுப்பு விண்ணப்பங்கள் ஏற்று கொள்ள அனுமதிக்கும்.
@@ -3826,7 +3831,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,அது ஒரு பங்கு உருப்படியை இல்லை என்பதால் பொருள் {0} அலட்சியம்
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ஒரு குறிப்பிட்ட பரிமாற்றத்தில் விலை விதி பொருந்தும் இல்லை, அனைத்து பொருந்தும் விலை விதிகள் முடக்கப்பட்டுள்ளது."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ஒரு குறிப்பிட்ட பரிமாற்றத்தில் விலை விதி பொருந்தும் இல்லை, அனைத்து பொருந்தும் விலை விதிகள் முடக்கப்பட்டுள்ளது."
 DocType: Assessment Group,Parent Assessment Group,பெற்றோர் மதிப்பீடு குழு
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,வேலைகள்
 ,Sales Order Trends,விற்பனை ஆணை போக்குகள்
@@ -3837,7 +3842,7 @@
 DocType: Stock Entry Detail,Additional Cost,கூடுதல் செலவு
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,நிதி ஆண்டு முடிவு தேதி
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","வவுச்சர் அடிப்படையில் வடிகட்ட முடியாது இல்லை , ரசீது மூலம் தொகுக்கப்பட்டுள்ளது என்றால்"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,வழங்குபவர் மேற்கோள் செய்ய
 DocType: Quality Inspection,Incoming,உள்வரும்
 DocType: BOM,Materials Required (Exploded),பொருட்கள் தேவை (விரிவான)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","உன்னை தவிர, உங்கள் நிறுவனத்தின் பயனர் சேர்க்க"
@@ -3865,6 +3870,7 @@
 DocType: Employee,History In Company,நிறுவனத்தின் ஆண்டு வரலாறு
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,செய்தி மடல்
 DocType: Stock Ledger Entry,Stock Ledger Entry,பங்கு லெட்ஜர் நுழைவு
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,வாடிக்கையாளர்&gt; வாடிக்கையாளர் குழு&gt; பிரதேசம்
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,அதே பொருளைப் பலமுறை நுழைந்தது வருகிறது
 DocType: Department,Leave Block List,பிளாக் பட்டியல் விட்டு
 DocType: Sales Invoice,Tax ID,வரி ஐடி
@@ -3874,7 +3880,7 @@
 DocType: Customer,Sales Partner and Commission,விற்பனை பார்ட்னர் மற்றும் கமிஷன்
 DocType: Employee Loan,Rate of Interest (%) / Year,வட்டி (%) / ஆண்டின் விகிதம்
 ,Project Quantity,திட்ட அளவு
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","மொத்த {0} எல்லா கோப்புகளையும் பூஜ்யம், நீங்கள் &#39;அடிப்படையாகக் கொண்டு விநியோகிக்கவும் கட்டணங்கள்&#39; மாற்ற வேண்டும் இருக்கலாம்"
 DocType: Opportunity,To Discuss,ஆலோசிக்க வேண்டும்
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} அலகுகள் {1} {2} இந்த பரிவர்த்தனையை நிறைவு செய்ய தேவை.
 DocType: Loan Type,Rate of Interest (%) Yearly,வட்டி விகிதம் (%) வருடாந்திரம்
@@ -3889,7 +3895,7 @@
 DocType: Purchase Invoice,Return,திரும்ப
 DocType: Production Order Operation,Production Order Operation,உத்தரவு ஆபரேஷன்
 DocType: Pricing Rule,Disable,முடக்கு
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,கட்டணம் செலுத்தும் முறை கட்டணம் செலுத்துவதற்கு தேவைப்படுகிறது
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,கட்டணம் செலுத்தும் முறை கட்டணம் செலுத்துவதற்கு தேவைப்படுகிறது
 DocType: Project Task,Pending Review,விமர்சனம் நிலுவையில்
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",அது ஏற்கனவே உள்ளது என சொத்து {0} குறைத்து முடியாது {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(செலவு கூறுகின்றனர் வழியாக) மொத்த செலவு கூறுகின்றனர்
@@ -3897,11 +3903,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,குறி இல்லாமல்
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},ரோ {0}: டெலி # கரன்சி {1} தேர்வு நாணய சமமாக இருக்க வேண்டும் {2}
 DocType: Journal Entry Account,Exchange Rate,அயல்நாட்டு நாணய பரிமாற்ற விகிதம் வீதம்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,விற்பனை ஆணை {0} சமர்ப்பிக்க
 DocType: Homepage,Tag Line,டேக் லைன்
 DocType: Fee Component,Fee Component,கட்டண பகுதியிலேயே
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,கடற்படை  மேலாண்மை
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,இருந்து பொருட்களை சேர்க்கவும்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,இருந்து பொருட்களை சேர்க்கவும்
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},கிடங்கு {0}: பெற்றோர் கணக்கு {1} நிறுவனம் bolong இல்லை {2}
 DocType: Cheque Print Template,Regular,வழக்கமான
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,அனைத்து மதிப்பீடு அடிப்படியின் மொத்த முக்கியத்துவத்தைச் 100% இருக்க வேண்டும்
@@ -3914,7 +3920,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,தேர்ந்தெடுக்கப்பட்ட உருப்படியை தொகுதி முடியாது
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","மதிப்பீடு விகிதம் பொருள் {0} கணக்கு உள்ளீடுகளை செய்ய நேர்ந்தால் எந்த காணப்படவில்லை {1} {2}. உருப்படி ஒரு மாதிரி உருப்படியாக transacting என்றால் {1}, {1} பொருள் அட்டவணையில் என்று குறிப்பிடவும். இல்லையெனில், பொருள் பதிவில் உருப்படியை அல்லது குறிப்பிடவும் மதிப்பீட்டு விகிதம் ஒரு உள்வரும் பங்கு பரிவர்த்தனை உருவாக்க செய்யவும், பின் இந்த நுழைவு ரத்து / அள்ளிப்பதற்கு முயற்சி"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,இந்த டெலிவரி குறிப்பு எதிராக அளிக்கப்பட்ட பொருட்களை%
 DocType: Project,Customer Details,வாடிக்கையாளர் விவரம்
@@ -3923,15 +3929,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ரிசீவர் இலக்கங்கள் URL ஐ அளவுரு உள்ளிடவும்
 DocType: Payment Entry,Paid Amount,பணம் தொகை
 DocType: Assessment Plan,Supervisor,மேற்பார்வையாளர்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ஆன்லைன்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ஆன்லைன்
 ,Available Stock for Packing Items,பொருட்கள் பொதி கிடைக்கும் பங்கு
 DocType: Item Variant,Item Variant,பொருள் மாற்று
 DocType: Assessment Result Tool,Assessment Result Tool,மதிப்பீடு முடிவு கருவி
 DocType: BOM Scrap Item,BOM Scrap Item,டெலி ஸ்க்ராப் பொருள்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,சமர்ப்பிக்கப்பட்ட ஆர்டர்களைப் நீக்க முடியாது
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,தர மேலாண்மை
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Employee Loan,Repay Fixed Amount per Period,காலம் ஒன்றுக்கு நிலையான தொகை திருப்பி
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},பொருள் எண்ணிக்கையை உள்ளிடவும் {0}
 DocType: Employee External Work History,Employee External Work History,பணியாளர் வெளி வேலை வரலாறு
@@ -3959,7 +3965,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,மாணவர் மின்னஞ்சல் ஐடி
 DocType: Employee,Notice (days),அறிவிப்பு ( நாட்கள்)
 DocType: Tax Rule,Sales Tax Template,விற்பனை வரி டெம்ப்ளேட்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,விலைப்பட்டியல் காப்பாற்ற பொருட்களை தேர்வு
 DocType: Employee,Encashment Date,பணமாக்கல் தேதி
 DocType: Training Event,Internet,இணைய
 DocType: Account,Stock Adjustment,பங்கு சீரமைப்பு
@@ -3983,7 +3989,7 @@
 DocType: Item Variant Attribute,Attribute,கற்பிதம்
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,வரை / இருந்து குறிப்பிடவும்
 DocType: Serial No,Under AMC,AMC கீழ்
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,பொருள் மதிப்பீட்டு விகிதம் தரையிறங்கியது செலவு ரசீது அளவு கருத்தில் கணக்கீடு செய்யப்பட்டது
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,பொருள் மதிப்பீட்டு விகிதம் தரையிறங்கியது செலவு ரசீது அளவு கருத்தில் கணக்கீடு செய்யப்பட்டது
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,பரிவர்த்தனைகள் விற்பனை இயல்புநிலை அமைப்புகளை.
 DocType: Guardian,Guardian Of ,ஆனால் கார்டியன்
 DocType: Grading Scale Interval,Threshold,ஆரம்பம்
@@ -3993,6 +3999,7 @@
 DocType: Purchase Invoice,Debit Note Issued,டெபிட் குறிப்பை வெளியிட்டு
 DocType: Production Order,Warehouses,கிடங்குகள்
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} சொத்து இடமாற்றம் செய்ய முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,இந்த பொருள் {0} (டெம்பிளேட்) ஒரு மாற்று உள்ளது.
 DocType: Workstation,per hour,ஒரு மணி நேரத்திற்கு
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,வாங்கும்
 DocType: Announcement,Announcement,அறிவிப்பு
@@ -4008,8 +4015,8 @@
 DocType: Account,Receivable,பெறத்தக்க
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,ரோ # {0}: கொள்முதல் ஆணை ஏற்கனவே உள்ளது என சப்ளையர் மாற்ற அனுமதி
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,அமைக்க கடன் எல்லை மீறிய நடவடிக்கைகளை சமர்ப்பிக்க அனுமதி என்று பாத்திரம்.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,உற்பத்தி உருப்படிகளைத் தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","மாஸ்டர் தரவு ஒத்திசைவை, அது சில நேரம் ஆகலாம்"
 DocType: Item,Material Issue,பொருள் வழங்கல்
 DocType: Hub Settings,Seller Description,விற்பனையாளர் விளக்கம்
 DocType: Employee Education,Qualification,தகுதி
@@ -4021,7 +4028,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ஆணையிட்டார்
 DocType: Salary Detail,Component,கூறு
 DocType: Assessment Criteria,Assessment Criteria Group,மதிப்பீடு செய்க மதீப்பீட்டு குழு
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},குவிக்கப்பட்ட தேய்மானம் திறந்து சமமாக விட குறைவாக இருக்க வேண்டும் {0}
 DocType: Warehouse,Warehouse Name,சேமிப்பு கிடங்கு பெயர்
 DocType: Naming Series,Select Transaction,பரிவர்த்தனை தேர்வு
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,பங்கு அங்கீகரிக்கிறது அல்லது பயனர் அனுமதி உள்ளிடவும்
@@ -4034,7 +4041,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"சமர்ப்பிக்கப்பட்ட பங்கு நுழைவு {0} ஏனெனில், ரத்து செய்ய முடியாது"
 DocType: Employee Loan,Disbursement Date,இரு வாரங்கள் முடிவதற்குள் தேதி
 DocType: Vehicle,Vehicle,வாகன
 DocType: Purchase Invoice,In Words,சொற்கள்
@@ -4049,14 +4056,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,எதிரில் / முன்னணி%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,சொத்து Depreciations மற்றும் சமநிலைகள்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},அளவு {0} {1} இருந்து இடமாற்றம் {2} க்கு {3}
 DocType: Sales Invoice,Get Advances Received,முன்னேற்றம் பெற்ற கிடைக்கும்
 DocType: Email Digest,Add/Remove Recipients,சேர்க்க / பெற்றவர்கள் அகற்று
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},பரிவர்த்தனை நிறுத்தி உத்தரவு எதிரான அனுமதி இல்லை {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","இயல்புநிலை என இந்த நிதியாண்டில் அமைக்க, ' இயல்புநிலை அமை ' கிளிக்"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,சேர
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,பற்றாக்குறைவே அளவு
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,பொருள் மாறுபாடு {0} அதே பண்புகளை கொண்ட உள்ளது
 DocType: Employee Loan,Repay from Salary,சம்பளம் இருந்து திருப்பி
 DocType: Leave Application,LAP/,மடியில் /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},எதிராக கட்டணம் கோருகிறது {0} {1} அளவு {2}
@@ -4074,7 +4081,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,மதிப்பீடு முடிவு விவரம்
 DocType: Employee Education,Employee Education,பணியாளர் கல்வி
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,உருப்படியை குழு அட்டவணையில் பிரதி உருப்படியை குழு
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,அது பொருள் விவரம் எடுக்க தேவை.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ஏற்கனவே பெற்றுள்ளது
@@ -4083,7 +4090,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","கிடங்கு {0} எந்த கணக்கில் இணைக்கப்பட்ட இல்லை, / கிடங்கு இணைக்க தொடர்புடைய (சொத்து) கணக்கை உருவாக்க தயவு செய்து."
 DocType: Purchase Invoice,Recurring Id,மீண்டும் அடையாளம்
 DocType: Customer,Sales Team Details,விற்பனை குழு விவரம்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,நிரந்தரமாக நீக்கு?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,நிரந்தரமாக நீக்கு?
 DocType: Expense Claim,Total Claimed Amount,மொத்த கோரப்பட்ட தொகை
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,விற்பனை திறன் வாய்ப்புகள்.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},தவறான {0}
@@ -4094,13 +4101,14 @@
 DocType: Warehouse,PIN,PIN ஐ
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext உங்கள் பள்ளி அமைப்பு
 DocType: Sales Invoice,Base Change Amount (Company Currency),மாற்றம் அடிப்படை தொகை (நிறுவனத்தின் நாணய)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,பின்வரும் கிடங்குகள் இல்லை கணக்கியல் உள்ளீடுகள்
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,கடைசி ஆர்டர் தொகை
+DocType: Task,Is Milestone,மைல்கல் ஆகும்
 DocType: Daily Work Summary,Email Sent To,மின்னஞ்சல் அனுப்பப்படும்
 DocType: Budget,Warn,எச்சரிக்கை
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","வேறு எந்த கருத்துக்கள், பதிவுகள் செல்ல வேண்டும் என்று குறிப்பிடத்தக்கது முயற்சியாகும்."
@@ -4121,7 +4129,7 @@
 DocType: Item Attribute Value,Attribute Value,மதிப்பு பண்பு
 ,Itemwise Recommended Reorder Level,இனவாரியாக மறுவரிசைப்படுத்துக நிலை பரிந்துரைக்கப்படுகிறது
 DocType: Salary Detail,Salary Detail,சம்பளம் விபரம்
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,முதல் {0} தேர்வு செய்க
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,முதல் {0} தேர்வு செய்க
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,பொருள் ஒரு தொகுதி {0} {1} காலாவதியாகிவிட்டது.
 DocType: Sales Invoice,Commission,தரகு
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,உற்பத்தி நேரம் தாள்.
@@ -4133,41 +4141,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,` விட பழைய உறைந்து பங்குகள் ` % d நாட்கள் குறைவாக இருக்க வேண்டும் .
 DocType: Tax Rule,Purchase Tax Template,வரி வார்ப்புரு வாங்க
 ,Project wise Stock Tracking,திட்டத்தின் வாரியாக ஸ்டாக் தடமறிதல்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},பராமரிப்பு அட்டவணை {0} எதிராக இருக்கிறது {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),உண்மையான அளவு (ஆதாரம் / இலக்கு)
 DocType: Item Customer Detail,Ref Code,Ref கோட்
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ஊழியர் பதிவுகள்.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,அடுத்த தேய்மானம் தேதி அமைக்கவும்
 DocType: HR Settings,Payroll Settings,சம்பளப்பட்டியல் அமைப்புகள்
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,அல்லாத தொடர்புடைய பற்றுச்சீட்டுகள் மற்றும் கட்டணங்கள் போட்டி.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ஸ்நாக்ஸ்
 DocType: Email Digest,New Purchase Orders,புதிய கொள்முதல் ஆணை
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,ரூட் ஒரு பெற்றோர் செலவு சென்டர் முடியாது
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,தேர்வு பிராண்ட் ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,தேர்வு பிராண்ட் ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,என தேய்மானம் திரட்டப்பட்ட
 DocType: Sales Invoice,C-Form Applicable,பொருந்தாது சி படிவம்
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ஆபரேஷன் நேரம் ஆபரேஷன் 0 விட இருக்க வேண்டும் {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,கிடங்கு கட்டாயமாகும்
 DocType: Supplier,Address and Contacts,முகவரி மற்றும் தொடர்புகள்
 DocType: UOM Conversion Detail,UOM Conversion Detail,மொறட்டுவ பல்கலைகழகம் மாற்றம் விரிவாக
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),அதை வலை நட்பு வைத்து 900px (w) by 100px (h)
 DocType: Program,Program Abbreviation,திட்டம் சுருக்கமான
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,உத்தரவு ஒரு பொருள் டெம்ப்ளேட் எதிராக எழுப்பப்பட்ட
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,கட்டணங்கள் ஒவ்வொரு உருப்படியை எதிரான வாங்கும் ரசீது இல் புதுப்பிக்கப்பட்டது
 DocType: Warranty Claim,Resolved By,மூலம் தீர்க்கப்பட
 DocType: Bank Guarantee,Start Date,தொடக்க தேதி
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ஒரு காலத்தில் இலைகள் ஒதுக்க.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,காசோலைகள் மற்றும் வைப்பு தவறாக அகற்றப்படும்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,கணக்கு {0}: நீங்கள் பெற்றோர் கணக்கு தன்னை ஒதுக்க முடியாது
 DocType: Purchase Invoice Item,Price List Rate,விலை பட்டியல் விகிதம்
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,வாடிக்கையாளர் மேற்கோள் உருவாக்கவும்
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,வாடிக்கையாளர் மேற்கோள் உருவாக்கவும்
 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 +38,Bill of Materials (BOM),பொருட்களின் அளவுக்கான ரசீது (BOM)
 DocType: Item,Average time taken by the supplier to deliver,சப்ளையர் எடுக்கப்படும் சராசரி நேரம் வழங்க
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,மதிப்பீடு முடிவு
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,மணி
 DocType: Project,Expected Start Date,எதிர்பார்க்கப்படுகிறது தொடக்க தேதி
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,குற்றச்சாட்டுக்கள் அந்த பொருளை பொருந்தாது என்றால் உருப்படியை அகற்று
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,பரிவர்த்தனை நாணய பணம் நுழைவாயில் நாணய அதே இருக்க வேண்டும்
 DocType: Payment Entry,Receive,பெறவும்
@@ -4178,19 +4185,19 @@
 DocType: Workstation,Operating Costs,செலவுகள்
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,அதிரடி என்றால் திரட்டப்பட்ட மாதாந்திர பட்ஜெட்டை மீறய
 DocType: Purchase Invoice,Submit on creation,உருவாக்கம் சமர்ப்பிக்க
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},நாணய {0} இருக்க வேண்டும் {1}
 DocType: Asset,Disposal Date,நீக்கம் தேதி
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","மின்னஞ்சல்கள் அவர்கள் விடுமுறை இல்லை என்றால், கொடுக்கப்பட்ட நேரத்தில் நிறுவனத்தின் அனைத்து செயலில் ஊழியர் அனுப்பி வைக்கப்படும். மறுமொழிகளின் சுருக்கம் நள்ளிரவில் அனுப்பப்படும்."
 DocType: Employee Leave Approver,Employee Leave Approver,பணியாளர் விடுப்பு ஒப்புதல்
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},ரோ {0}: ஒரு மறுவரிசைப்படுத்துக நுழைவு ஏற்கனவே இந்த கிடங்கு உள்ளது {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","இழந்தது மேற்கோள் செய்யப்பட்டது ஏனெனில் , அறிவிக்க முடியாது ."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,பயிற்சி மதிப்பீட்டு
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,உத்தரவு {0} சமர்ப்பிக்க வேண்டும்
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},தொடக்க தேதி மற்றும் பொருள் முடிவு தேதி தேர்வு செய்க {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},பாடநெறி வரிசையில் கட்டாய {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,தேதி தேதி முதல் முன் இருக்க முடியாது
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc டாக்டைப்பின்
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,திருத்த/ விலை சேர்க்கவும்
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Batch,Parent Batch,பெற்றோர் தொகுதி
 DocType: Cheque Print Template,Cheque Print Template,காசோலை அச்சு வார்ப்புரு
@@ -4204,7 +4211,7 @@
 ,Ordered Items To Be Delivered,விநியோகிப்பதற்காக உத்தரவிட்டார் உருப்படிகள்
 DocType: Account,Income,வருமானம்
 DocType: Industry Type,Industry Type,தொழில் வகை
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,ஏதோ தவறு நடந்து!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ஏதோ தவறு நடந்து!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,எச்சரிக்கை: விடுப்பு பயன்பாடு பின்வரும் தொகுதி தேதிகள் உள்ளன
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,கவிஞருக்கு {0} ஏற்கனவே சமர்ப்பித்த
 DocType: Assessment Result Detail,Score,மதிப்பெண்
@@ -4235,17 +4242,17 @@
 DocType: Item,Variant Based On,மாற்று சார்ந்த அன்று
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},ஒதுக்கப்படும் மொத்த தாக்கத்தில் 100 % இருக்க வேண்டும். இது {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,உங்கள் சப்ளையர்கள்
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,விற்பனை ஆணை உள்ளது என இழந்தது அமைக்க முடியாது.
 DocType: Request for Quotation Item,Supplier Part No,சப்ளையர் பகுதி இல்லை
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,பெறப்படும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',வகை &#39;மதிப்பீட்டு&#39; அல்லது &#39;Vaulation மற்றும் மொத்த&#39; க்கான போது கழித்து முடியாது
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,பெறப்படும்
 DocType: Lead,Converted,மாற்றப்படுகிறது
 DocType: Item,Has Serial No,வரிசை எண்  உள்ளது
 DocType: Employee,Date of Issue,இந்த தேதி
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: இருந்து {0} க்கான {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: இருந்து {0} க்கான {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},ரோ # {0}: உருப்படியை அமைக்க சப்ளையர் {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,ரோ {0}: மணி மதிப்பு பூஜ்யம் விட அதிகமாக இருக்க வேண்டும்.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,பொருள் {1} இணைக்கப்பட்ட வலைத்தளம் பட {0} காணலாம்
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,வலைத்தளத்தில் பல குழுக்கள் இந்த உருப்படி பட்டியல்.
@@ -4254,20 +4261,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,நீங்கள் உறைந்த மதிப்பை அமைக்க அதிகாரம் இல்லை
 DocType: Payment Reconciliation,Get Unreconciled Entries,ஒப்புரவாகவேயில்லை பதிவுகள் பெற
 DocType: Payment Reconciliation,From Invoice Date,விலைப்பட்டியல் வரம்பு தேதி
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,பில்லிங் நாணய இயல்புநிலை comapany நாணய அல்லது கட்சி கணக்கு நாணயம் சமமாக இருக்க வேண்டும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,விடுப்பிற்கீடான பணம் பெறுதல்
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,அது என்ன?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,சேமிப்பு கிடங்கு வேண்டும்
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,அனைத்து மாணவர் சேர்க்கை
 ,Average Commission Rate,சராசரி கமிஷன் விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,' சீரியல் இல்லை உள்ளது ' அல்லாத பங்கு உருப்படியை 'ஆம்' இருக்க முடியாது
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,வருகை எதிர்கால நாட்களுக்கு குறித்தது முடியாது
 DocType: Pricing Rule,Pricing Rule Help,விலை விதி உதவி
 DocType: School House,House Name,ஹவுஸ் பெயர்
 DocType: Purchase Taxes and Charges,Account Head,கணக்கு ஒதுக்கும் தலைப்பு - பிரிவு
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,பொருட்களை தரையிறங்கியது செலவு கணக்கிட கூடுதல் செலவுகள் புதுப்பிக்கவும்
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,மின்
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,உங்கள் பயனர்கள் உங்கள் நிறுவனத்தில் மீதமுள்ள சேர்க்கவும். நீங்கள் தொடர்புகளிலிருந்து சேர்த்து அவற்றை உங்கள் போர்டல் வாடிக்கையாளர்கள் அழைக்க சேர்க்க முடியும்
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,உங்கள் பயனர்கள் உங்கள் நிறுவனத்தில் மீதமுள்ள சேர்க்கவும். நீங்கள் தொடர்புகளிலிருந்து சேர்த்து அவற்றை உங்கள் போர்டல் வாடிக்கையாளர்கள் அழைக்க சேர்க்க முடியும்
 DocType: Stock Entry,Total Value Difference (Out - In),மொத்த மதிப்பு வேறுபாடு (அவுட் - ல்)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4276,7 +4283,7 @@
 DocType: Item,Customer Code,வாடிக்கையாளர் கோட்
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},பிறந்த நாள் நினைவூட்டல் {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,கடந்த சில நாட்களாக கடைசி ஆர்டர்
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,கணக்கில் பற்று ஒரு ஐந்தொகை கணக்கில் இருக்க வேண்டும்
 DocType: Buying Settings,Naming Series,தொடர் பெயரிடும்
 DocType: Leave Block List,Leave Block List Name,பிளாக் பட்டியல் பெயர் விட்டு
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,காப்புறுதி தொடக்க தேதி காப்புறுதி முடிவு தேதி விட குறைவாக இருக்க வேண்டும்
@@ -4291,9 +4298,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ஊழியர் சம்பளம் ஸ்லிப் {0} ஏற்கனவே நேரம் தாள் உருவாக்கப்பட்ட {1}
 DocType: Vehicle Log,Odometer,ஓடோமீட்டர்
 DocType: Sales Order Item,Ordered Qty,அளவு உத்தரவிட்டார்
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,பொருள் {0} முடக்கப்பட்டுள்ளது
 DocType: Stock Settings,Stock Frozen Upto,பங்கு வரை உறை
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,டெலி எந்த பங்கு உருப்படியை கொண்டிருக்கும் இல்லை
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},வரம்பு மற்றும் காலம் மீண்டும் மீண்டும் கட்டாய தேதிகள் காலம் {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,திட்ட செயல்பாடு / பணி.
 DocType: Vehicle Log,Refuelling Details,Refuelling விபரங்கள்
@@ -4303,8 +4310,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,கடைசியாக கொள்முதல் விகிதம் இல்லை
 DocType: Purchase Invoice,Write Off Amount (Company Currency),தொகை ஆஃப் எழுத (நிறுவனத்தின் நாணய)
 DocType: Sales Invoice Timesheet,Billing Hours,பில்லிங் மணி
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,"{0} இல்லை இயல்புநிலை BOM,"
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,ரோ # {0}: மீள் கட்டளை அளவு அமைக்க கொள்ளவும்
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,அவர்களை இங்கே சேர்க்கலாம் உருப்படிகளை தட்டவும்
 DocType: Fees,Program Enrollment,திட்டம் பதிவு
 DocType: Landed Cost Voucher,Landed Cost Voucher,Landed செலவு வவுச்சர்
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},அமைக்கவும் {0}
@@ -4327,7 +4335,7 @@
 DocType: Maintenance Visit,Maintenance Date,பராமரிப்பு தேதி
 DocType: Purchase Invoice Item,Rejected Serial No,நிராகரிக்கப்பட்டது சீரியல் இல்லை
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"ஆண்டு தொடக்க தேதி அல்லது முடிவு தேதி {0} கொண்டு மேலெழும். நிறுவனம் அமைக்கவும், தயவு செய்து தவிர்க்க"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},தொடக்க தேதி பொருள் முடிவு தேதி விட குறைவாக இருக்க வேண்டும் {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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, ##### 
 , பின்னர் தானாக வரிசை எண் இந்த தொடரை அடிப்படையாக கொண்டு உருவாக்கப்பட்டது. நீங்கள் எப்போதும் வெளிப்படையாக இந்த உருப்படியை தொடர் இல குறிப்பிட வேண்டும் என்றால். இதை நிரப்புவதில்லை."
@@ -4405,7 +4413,6 @@
 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,பல குழுக்கள் பொருள் கிராஸ் பட்டியல்
-DocType: Grade Interval,Grade Interval,தரம் இடைவேளை
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},நிதியாண்டு தொடக்க தேதி மற்றும் நிதி ஆண்டு இறுதியில் தேதி ஏற்கனவே நிதி ஆண்டில் அமைக்க {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,மேம்படுத்தப்பட்டது இசைவு தேதி
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,பிரி தொகுதி
@@ -4452,14 +4459,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,நீங்கள் நிச்சயமாக அடிப்படையிலான குழுக்களைக் செய்யும் போது தொகுதி கருத்தில் கொள்ள விரும்பவில்லை என்றால் தேர்வுசெய்யாமல் விடவும்.
 DocType: Asset,Frequency of Depreciation (Months),தேய்மானம் அதிர்வெண் (மாதங்கள்)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,கடன் கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,கடன் கணக்கு
 DocType: Landed Cost Item,Landed Cost Item,இறங்கினார் செலவு பொருள்
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,பூஜ்ய மதிப்புகள் காட்டு
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,உருப்படி அளவு மூலப்பொருட்களை கொடுக்கப்பட்ட அளவு இருந்து உற்பத்தி / repacking பின்னர் பெறப்படும்
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,அமைப்பு என் அமைப்பு ஒரு எளிய வலைத்தளம்
 DocType: Payment Reconciliation,Receivable / Payable Account,பெறத்தக்க / செலுத்த வேண்டிய கணக்கு
 DocType: Delivery Note Item,Against Sales Order Item,விற்பனை ஆணை பொருள் எதிராக
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},பண்பு மதிப்பு பண்பு குறிப்பிடவும் {0}
 DocType: Item,Default Warehouse,இயல்புநிலை சேமிப்பு கிடங்கு
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},பட்ஜெட் குழு கணக்கை எதிராக ஒதுக்கப்படும் முடியாது {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,பெற்றோர் செலவு சென்டர் உள்ளிடவும்
@@ -4504,7 +4511,7 @@
 DocType: Opportunity Item,Basic Rate,அடிப்படை விகிதம்
 DocType: GL Entry,Credit Amount,கடன் தொகை
 DocType: Cheque Print Template,Signatory Position,கையொப்பமிட தலைப்பு
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,லாஸ்ட் அமை
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,லாஸ்ட் அமை
 DocType: Timesheet,Total Billable Hours,மொத்த பில்லிடக்கூடியது மணி
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,கட்டணம் ரசீது குறிப்பு
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,இந்த வாடிக்கையாளர் எதிராக பரிமாற்றங்கள் அடிப்படையாக கொண்டது. விவரங்கள் கீழே காலவரிசை பார்க்க
@@ -4518,11 +4525,11 @@
 ,Items To Be Requested,கோரப்பட்ட பொருட்களை
 DocType: Purchase Order,Get Last Purchase Rate,கடைசியாக கொள்முதல் விலை கிடைக்கும்
 DocType: Company,Company Info,நிறுவன தகவல்
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,தேர்ந்தெடுக்கவும் அல்லது புதிய வாடிக்கையாளர் சேர்க்க
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,செலவு மையம் ஒரு செலவினமாக கூற்றை பதிவு செய்ய தேவைப்படுகிறது
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),நிதி பயன்பாடு ( சொத்துக்கள் )
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,இந்த பணியாளர் வருகை அடிப்படையாக கொண்டது
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,பற்று கணக்கு
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,பற்று கணக்கு
 DocType: Fiscal Year,Year Start Date,ஆண்டு தொடக்க தேதி
 DocType: Attendance,Employee Name,பணியாளர் பெயர்
 DocType: Sales Invoice,Rounded Total (Company Currency),வட்டமான மொத்த (நிறுவனத்தின் கரன்சி)
@@ -4531,13 +4538,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,பின்வரும் நாட்களில் விடுப்பு விண்ணப்பங்கள் செய்து பயனர்களை நிறுத்த.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,கொள்முதல் அளவு
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,சப்ளையர் மேற்கோள் {0} உருவாக்கப்பட்ட
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,இறுதி ஆண்டு தொடக்க ஆண்டு முன் இருக்க முடியாது
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,பணியாளர் நன்மைகள்
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ஒரு இயல்பான விடுமுறை பட்டியல் பணியாளர் அமைக்க தயவு செய்து {0} அல்லது நிறுவனத்தின் {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} இல்லை
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} இல்லை
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,பில்கள் வாடிக்கையாளர்கள் உயர்த்தப்பட்டுள்ளது.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,திட்ட ஐடி
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},ரோ இல்லை {0}: தொகை செலவு கூறுகின்றனர் {1} எதிராக தொகை நிலுவையில் விட அதிகமாக இருக்க முடியாது. நிலுவையில் அளவு {2}
@@ -4546,15 +4553,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 படித்தல்
 ,Hub,மையம்
 DocType: GL Entry,Voucher Type,ரசீது வகை
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,விலை பட்டியல் காணப்படும் அல்லது ஊனமுற்ற
 DocType: Employee Loan Application,Approved,ஏற்பளிக்கப்பட்ட
 DocType: Pricing Rule,Price,விலை
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ம் நிம்மதியாக பணியாளர் 'இடது' அமைக்க வேண்டும்
 DocType: Guardian,Guardian,பாதுகாவலர்
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,மதிப்பீடு {0} {1} தேதியில் வரம்பில் பணியாளர் உருவாக்கப்பட்டது
 DocType: Employee,Education,கல்வி
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,டெல்
 DocType: Selling Settings,Campaign Naming By,பிரச்சாரம் பெயரிடும் மூலம்
 DocType: Employee,Current Address Is,தற்போதைய முகவரி
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,மாற்றம்
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","விருப்ப. குறிப்பிடப்படவில்லை என்றால், நிறுவனத்தின் இயல்புநிலை நாணய அமைக்கிறது."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,கணக்கு ஜர்னல் பதிவுகள்.
 DocType: Delivery Note Item,Available Qty at From Warehouse,கிடங்கில் இருந்து கிடைக்கும் அளவு
@@ -4563,7 +4572,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},ரோ {0}: கட்சி / கணக்கு பொருந்தவில்லை {1} / {2} உள்ள {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,செலவு கணக்கு உள்ளிடவும்
 DocType: Account,Stock,பங்கு
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","ரோ # {0}: குறிப்பு ஆவண வகை கொள்முதல் ஆணை ஒன்று, கொள்முதல் விலைப்பட்டியல் அல்லது பத்திரிகை நுழைவு இருக்க வேண்டும்"
 DocType: Employee,Current Address,தற்போதைய முகவரி
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","வெளிப்படையாக குறிப்பிட்ட வரை பின்னர் உருப்படியை விளக்கம், படம், விலை, வரி டெம்ப்ளேட் இருந்து அமைக்க வேண்டும் போன்றவை மற்றொரு உருப்படியை ஒரு மாறுபாடு இருக்கிறது என்றால்"
 DocType: Serial No,Purchase / Manufacture Details,கொள்முதல் / உற்பத்தி விவரம்
@@ -4591,7 +4600,7 @@
 DocType: Hub Settings,Hub Settings,மையம்  அமைப்புகள்
 DocType: Project,Gross Margin %,மொத்த அளவு%
 DocType: BOM,With Operations,செயல்பாடுகள் மூலம்
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,கணக்கு உள்ளீடுகளை ஏற்கனவே நாணய செய்யப்பட்டுள்ளது {0} நிறுவனம் {1}. நாணயத்துடன் ஒரு பெறத்தக்க செலுத்தவேண்டிய கணக்கைத் தேர்ந்தெடுக்கவும் {0}.
 DocType: Asset,Is Existing Asset,இருக்கும் சொத்து
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
 DocType: Salary Detail,Statistical Component,புள்ளி உபகரண
@@ -4616,7 +4625,7 @@
 DocType: Assessment Plan,Room,அறை
 DocType: Purchase Order,Advance Paid,முன்பணம்
 DocType: Item,Item Tax,பொருள் வரி
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,சப்ளையர் பொருள்
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,சப்ளையர் பொருள்
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,கலால் விலைப்பட்டியல்
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,உயர் அளவு {0}% முறை மேல் காட்சிக்கு
 DocType: Expense Claim,Employees Email Id,ஊழியர்கள் மின்னஞ்சல் விலாசம்
@@ -4647,9 +4656,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,லோகோ இணைக்கவும்
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,பங்கு நிலைகள்
 DocType: Customer,Commission Rate,தரகு விகிதம்
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,மாற்று செய்ய
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,மாற்று செய்ய
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,துறை மூலம் பயன்பாடுகள் விட்டு தடுக்கும்.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","கொடுப்பனவு வகை ஏற்றுக்கொண்டு ஒன்று இருக்க செலுத்த, உள்நாட் மாற்றம் வேண்டும்"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,அனலிட்டிக்ஸ்
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,கார்ட் காலியாக உள்ளது
 DocType: Vehicle,Model,மாதிரி
@@ -4660,6 +4669,7 @@
 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 +161,Capital Stock,மூலதன கையிருப்பு
+DocType: Shopping Cart Settings,Show Public Attachments,பொது இணைப்புகள் காட்டு
 DocType: Packing Slip,Package Weight Details,தொகுப்பு எடை விவரம்
 DocType: Payment Gateway Account,Payment Gateway Account,பணம் நுழைவாயில் கணக்கு
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,கட்டணம் முடிந்த பிறகு தேர்ந்தெடுக்கப்பட்ட பக்கம் பயனர் திருப்பி.
@@ -4678,15 +4688,15 @@
 DocType: Batch,Expiry Date,காலாவதியாகும் தேதி
 ,Supplier Addresses and Contacts,வழங்குபவர் முகவரிகள் மற்றும் தொடர்புகள்
 ,accounts-browser,கணக்குகள் உலாவி
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,முதல் வகையை தேர்ந்தெடுக்கவும்
 apps/erpnext/erpnext/config/projects.py +13,Project master.,திட்டம் மாஸ்டர்.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","பங்கு அமைப்புகள் அல்லது பொருள் உள்ள &quot;அலவன்ஸ்&quot; புதுப்பிக்க, மேல்-பில்லிங் அல்லது மேல்-வரிசைப்படுத்தும் அனுமதிக்க."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,நாணயங்கள் அடுத்த $ ஹிப்ரு போன்றவை எந்த சின்னம் காட்டாதே.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(அரை நாள்)
 DocType: Supplier,Credit Days,கடன் நாட்கள்
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,மாணவர் தொகுதி செய்ய
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,மாணவர் தொகுதி செய்ய
 DocType: Leave Type,Is Carry Forward,முன்னோக்கி எடுத்துச்செல்
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM இருந்து பொருட்களை பெற
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM இருந்து பொருட்களை பெற
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,நேரம் நாட்கள் வழிவகுக்கும்
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},ரோ # {0}: தேதி பதிவுசெய்ய கொள்முதல் தேதி அதே இருக்க வேண்டும் {1} சொத்தின் {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,தயவு செய்து மேலே உள்ள அட்டவணையில் விற்பனை ஆணைகள் நுழைய
@@ -4703,8 +4713,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,ஒப்புதல் தொகை
 DocType: GL Entry,Is Opening,திறக்கிறது
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},ரோ {0}: ஒப்புதல் நுழைவு இணைத்தே ஒரு {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,அமைவு அமைப்பு வழியாக வருகை தொடரின் எண்ணிக்கையில்&gt; எண் தொடர்
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,கணக்கு {0} இல்லை
 DocType: Account,Cash,பணம்
 DocType: Employee,Short biography for website and other publications.,இணையதளம் மற்றும் பிற வெளியீடுகள் குறுகிய வாழ்க்கை.
diff --git a/erpnext/translations/te.csv b/erpnext/translations/te.csv
index b91b93c..54f64a2 100644
--- a/erpnext/translations/te.csv
+++ b/erpnext/translations/te.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,అద్దెకు
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,వాడుకరి వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",ఆగిపోయింది ఉత్పత్తి ఆర్డర్ రద్దు చేయలేము రద్దు మొదటి అది Unstop
 DocType: Vehicle Service,Mileage,మైలేజ్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,మీరు నిజంగా ఈ ఆస్తి ను అనుకుంటున్నారు?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,డిఫాల్ట్ సరఫరాదారు ఎంచుకోండి
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,డిఫాల్ట్ సరఫరాదారు ఎంచుకోండి
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},కరెన్సీ ధర జాబితా కోసం అవసరం {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* లావాదేవీ లెక్కించబడతాయి.
 DocType: Purchase Order,Customer Contact,కస్టమర్ సంప్రదించండి
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),అత్యుత్తమ {0} ఉండకూడదు కంటే తక్కువ సున్నా ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 నిమిషాలు డిఫాల్ట్
 DocType: Leave Type,Leave Type Name,టైప్ వదిలి పేరు
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,ఓపెన్ చూపించు
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,ఓపెన్ చూపించు
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,సిరీస్ విజయవంతంగా నవీకరించబడింది
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,హోటల్ నుంచి బయటకు వెళ్లడం
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural జర్నల్ ఎంట్రీ సమర్పించిన
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,బ్యాచ్ అంశం గడువు హోదా
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,బ్యాంక్ డ్రాఫ్ట్
 DocType: Mode of Payment Account,Mode of Payment Account,చెల్లింపు ఖాతా మోడ్
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,షో రకరకాలు
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,షో రకరకాలు
 DocType: Academic Term,Academic Term,అకడమిక్ టర్మ్
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,మెటీరియల్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,పరిమాణం
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,పరిమాణం
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,అకౌంట్స్ పట్టిక ఖాళీగా ఉండరాదు.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),రుణాలు (లయబిలిటీస్)
 DocType: Employee Education,Year of Passing,తరలింపు ఇయర్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","సూచన:% s, Item కోడ్:% s మరియు కస్టమర్:% s"
 DocType: Item,Country of Origin,మూలం యొక్క దేశం
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,అందుబాటులో ఉంది
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,ఓపెన్ ఇష్యూస్
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,ఆరోగ్య సంరక్షణ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),చెల్లింపు లో ఆలస్యం (రోజులు)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,సర్వీస్ ఖర్చుల
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,వాయిస్
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},క్రమ సంఖ్య: {0} ఇప్పటికే సేల్స్ వాయిస్ లో రిఫరెన్సుగా ఉంటుంది: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,వాయిస్
 DocType: Maintenance Schedule Item,Periodicity,ఆవర్తకత
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ఫిస్కల్ ఇయర్ {0} అవసరం
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,ఊహించినది డెలివరీ తేదీ ముందు అమ్మకాల ఉత్తర్వు తేదీ ఉంది
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","రెండు నిలువు, పాత పేరు ఒక మరియు కొత్త పేరు కోసం ఒక csv ఫైల్ అటాచ్"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ఏ క్రియాశీల ఫిస్కల్ ఇయర్ లో.
 DocType: Packed Item,Parent Detail docname,మాతృ వివరాలు docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","సూచన: {0}, Item కోడ్: {1} మరియు కస్టమర్: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,కిలొగ్రామ్
 DocType: Student Log,Log,లోనికి ప్రవేశించండి
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ఒక Job కొరకు తెరవడం.
 DocType: Item Attribute,Increment,పెంపు
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,వేర్హౌస్ ఎంచుకోండి ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,వేర్హౌస్ ఎంచుకోండి ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ప్రకటనలు
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,అదే కంపెనీ ఒకసారి కంటే ఎక్కువ ఎంటర్ ఉంది
 DocType: Employee,Married,వివాహితులు
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},కోసం అనుమతి లేదు {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,నుండి అంశాలను పొందండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},కోసం అనుమతి లేదు {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,నుండి అంశాలను పొందండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},స్టాక్ డెలివరీ గమనిక వ్యతిరేకంగా నవీకరించబడింది సాధ్యం కాదు {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},ఉత్పత్తి {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,జాబితా అంశాలను తోబుట్టువుల
 DocType: Payment Reconciliation,Reconcile,పునరుద్దరించటానికి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,కిరాణా
 DocType: Quality Inspection Reading,Reading 1,1 పఠనం
 DocType: Process Payroll,Make Bank Entry,బ్యాంక్ ఎంట్రీ చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,పెన్షన్ ఫండ్స్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,తదుపరి అరుగుదల తేదీ కొనుగోలు తేదీ ముందు ఉండకూడదు
 DocType: SMS Center,All Sales Person,అన్ని సేల్స్ పర్సన్
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** మంత్లీ పంపిణీ ** మీరు నెలల అంతటా బడ్జెట్ / టార్గెట్ పంపిణీ మీరు మీ వ్యాపారంలో seasonality కలిగి ఉంటే సహాయపడుతుంది.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,వస్తువులను కనుగొన్నారు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,వస్తువులను కనుగొన్నారు
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,జీతం నిర్మాణం మిస్సింగ్
 DocType: Lead,Person Name,వ్యక్తి పేరు
 DocType: Sales Invoice Item,Sales Invoice Item,సేల్స్ వాయిస్ అంశం
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ఉదా &quot;ప్రాథమిక స్కూల్&quot; లేదా &quot;విశ్వవిద్యాలయం&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,స్టాక్ నివేదికలు
 DocType: Warehouse,Warehouse Detail,వేర్హౌస్ వివరాలు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},క్రెడిట్ పరిమితి కస్టమర్ కోసం దాటింది చేయబడింది {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,టర్మ్ ముగింపు తేదీ తర్వాత అకడమిక్ ఇయర్ ఇయర్ ఎండ్ తేదీ పదం సంబంధమున్న కంటే ఉండకూడదు (అకాడమిక్ ఇయర్ {}). దయచేసి తేదీలు సరిచేసి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","&quot;స్థిర ఆస్తిగా&quot;, అనియంత్రిత ఉండకూడదు అసెట్ రికార్డు అంశం వ్యతిరేకంగా కాలమే"
 DocType: Vehicle Service,Brake Oil,బ్రేక్ ఆయిల్
 DocType: Tax Rule,Tax Type,పన్ను టైప్
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},మీరు ముందు ఎంట్రీలు జోడించడానికి లేదా నవీకరణ అధికారం లేదు {0}
 DocType: BOM,Item Image (if not slideshow),అంశం చిత్రం (స్లైడ్ లేకపోతే)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ఒక కస్టమర్ అదే పేరుతో
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(గంట రేట్ / 60) * అసలు ఆపరేషన్ సమయం
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,బిఒఎం ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,బిఒఎం ఎంచుకోండి
 DocType: SMS Log,SMS Log,SMS లోనికి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,పంపిణీ వస్తువుల ధర
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} లో సెలవు తేదీ నుండి నేటివరకు మధ్య జరిగేది కాదు
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,పాఠశాలలు
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},తోబుట్టువుల సెలవు రికార్డు ఉద్యోగికి దొరకలేదు {0} కోసం {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,మొదటి కంపెనీ నమోదు చేయండి
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,మొదటి కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,మొత్తం వ్యయం
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,క్లెయిమ్ సొమ్ము
 DocType: Employee,Mr,శ్రీ
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer సమూహం పట్టిక కనిపించే నకిలీ కస్టమర్ సమూహం
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,సరఫరాదారు పద్ధతి / సరఫరాదారు
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,సరఫరాదారు పద్ధతి / సరఫరాదారు
 DocType: Naming Series,Prefix,ఆదిపదం
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,వినిమయ
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,గ్రేడ్
 DocType: Sales Invoice Item,Delivered By Supplier,సరఫరాదారు ద్వారా పంపిణీ
 DocType: SMS Center,All Contact,అన్ని సంప్రదించండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ఉత్పత్తి ఆర్డర్ ఇప్పటికే BOM అన్ని అంశాలను రూపొందించినవారు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,వార్షిక జీతం
 DocType: Daily Work Summary,Daily Work Summary,డైలీ వర్క్ సారాంశం
 DocType: Period Closing Voucher,Closing Fiscal Year,ఫిస్కల్ ఇయర్ మూసివేయడం
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ఘనీభవించిన
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ఘనీభవించిన
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,దయచేసి ఖాతాల చార్ట్ సృష్టించడానికి ఉన్న కంపెనీ ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,స్టాక్ ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,టార్గెట్ వేర్హౌస్ ఎంచుకోండి
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,పద్దు
 DocType: Journal Entry Account,Credit in Company Currency,కంపెనీ కరెన్సీ లో క్రెడిట్
 DocType: Delivery Note,Installation Status,సంస్థాపన స్థితి
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",మీరు హాజరు అప్డేట్ అనుకుంటున్నారు? <br> ప్రస్తుతం: {0} \ <br> ఆబ్సెంట్: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},ప్యాక్ చేసిన అంశాల తిరస్కరించబడిన అంగీకరించిన + అంశం అందుకున్నారు పరిమాణం సమానంగా ఉండాలి {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,సప్లై రా మెటీరియల్స్ కొనుగోలు కోసం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,చెల్లింపు మోడ్ అయినా POS వాయిస్ అవసరం.
 DocType: Products Settings,Show Products as a List,షో ఉత్పత్తులు జాబితా
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",", మూస తగిన డేటా నింపి ఆ మారిన ఫైలులో అటాచ్. ఎంపిక కాలంలో అన్ని తేదీలు మరియు ఉద్యోగి కలయిక ఉన్న హాజరు రికార్డుల తో, టెంప్లేట్ వస్తాయి"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,అరుగుదల ఎంట్రీ చేయండి
 DocType: Appraisal Template Goal,KRA,Kra
 DocType: Lead,Request Type,అభ్యర్థన పద్ధతి
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ఉద్యోగి చేయండి
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ఉద్యోగి చేయండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,బ్రాడ్కాస్టింగ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,ఎగ్జిక్యూషన్
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,కార్యకలాపాల వివరాలను చేపట్టారు.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,నిర్వహణ సందర్శనలకు ప్రణాళిక.
 DocType: SMS Settings,Enter url parameter for message,సందేశం కోసం URL పరామితి ఎంటర్
 DocType: POS Profile,Customer Groups,కస్టమర్ సమూహాలు
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,ఆర్థిక నివేదికల
 DocType: Guardian,Students,స్టూడెంట్స్
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,ధర మరియు రాయితీ దరఖాస్తు కోసం రూల్స్.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,ధర జాబితా కొనడం లేదా అమ్మడం కోసం వర్తించే ఉండాలి
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},అడ్వాన్స్ మొత్తాన్ని కంటే ఎక్కువ ఉండకూడదు {0} {1}
 DocType: Naming Series,Series List for this Transaction,ఈ లావాదేవీ కోసం సిరీస్ జాబితా
 DocType: Company,Default Payroll Payable Account,డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ఇమెయిల్ అప్డేట్ గ్రూప్
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ఇమెయిల్ అప్డేట్ గ్రూప్
 DocType: Sales Invoice,Is Opening Entry,ఎంట్రీ ప్రారంభ ఉంది
 DocType: Customer Group,Mention if non-standard receivable account applicable,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా వర్తిస్తే
 DocType: Course Schedule,Instructor Name,బోధకుడు పేరు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,వేర్హౌస్ కోసం సమర్పించు ముందు అవసరం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,పునఃవిక్రేత
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","తనిఖీ చేస్తే, మెటీరియల్ రిక్వెస్ట్ కాని స్టాక్ అంశాలను కలిగి ఉంటుంది."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,సేల్స్ వాయిస్ అంశం వ్యతిరేకంగా
 ,Production Orders in Progress,ప్రోగ్రెస్ లో ఉత్పత్తి ఆర్డర్స్
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,ఫైనాన్సింగ్ నుండి నికర నగదు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage పూర్తి, సేవ్ లేదు"
 DocType: Lead,Address & Contact,చిరునామా &amp; సంప్రదింపు
 DocType: Leave Allocation,Add unused leaves from previous allocations,మునుపటి కేటాయింపులు నుండి ఉపయోగించని ఆకులు జోడించండి
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},తదుపరి పునరావృత {0} లో రూపొందే {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),మొత్తం ఖర్చు మొత్తం (సమయం షీట్ ద్వారా)
 DocType: Item Website Specification,Item Website Specification,అంశం వెబ్సైట్ స్పెసిఫికేషన్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Leave నిరోధిత
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,బ్యాంక్ ఎంట్రీలు
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},అంశం {0} జీవితం యొక్క దాని ముగింపు చేరుకుంది {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,బ్యాంక్ ఎంట్రీలు
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,వార్షిక
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,స్టాక్ సయోధ్య అంశం
 DocType: Stock Entry,Sales Invoice No,సేల్స్ వాయిస్ లేవు
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,హబ్ లో ప్రచురించండి
 DocType: Student Admission,Student Admission,విద్యార్థి అడ్మిషన్
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} అంశం రద్దు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,మెటీరియల్ అభ్యర్థన
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} అంశం రద్దు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,మెటీరియల్ అభ్యర్థన
 DocType: Bank Reconciliation,Update Clearance Date,నవీకరణ క్లియరెన్స్ తేదీ
 DocType: Item,Purchase Details,కొనుగోలు వివరాలు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},కొనుగోలు ఆర్డర్ లో &#39;రా మెటీరియల్స్ పంపినవి&#39; పట్టికలో దొరకలేదు అంశం {0} {1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,అత్యుత్తమ చెక్కుల మరియు క్లియర్ డిపాజిట్లు
 DocType: Item,Synced With Hub,హబ్ సమకాలీకరించబడింది
 DocType: Vehicle,Fleet Manager,విమానాల మేనేజర్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},రో # {0}: {1} అంశం కోసం ప్రతికూల ఉండకూడదు {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,సరియినది కాని రహస్య పదము
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},రో # {0}: {1} అంశం కోసం ప్రతికూల ఉండకూడదు {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,సరియినది కాని రహస్య పదము
 DocType: Item,Variant Of,వేరియంట్
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',కంటే &#39;ప్యాక్ చేసిన అంశాల తయారీకి&#39; పూర్తి ప్యాక్ చేసిన అంశాల ఎక్కువ ఉండకూడదు
 DocType: Period Closing Voucher,Closing Account Head,ఖాతా తల ముగింపు
 DocType: Employee,External Work History,బాహ్య వర్క్ చరిత్ర
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,సర్క్యులర్ సూచన లోపం
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,ఆటోమేటిక్ మెటీరియల్ అభ్యర్థన సృష్టి పై ఇమెయిల్ ద్వారా తెలియజేయి
 DocType: Journal Entry,Multi Currency,మల్టీ కరెన్సీ
 DocType: Payment Reconciliation Invoice,Invoice Type,వాయిస్ పద్ధతి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,డెలివరీ గమనిక
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,పన్నులు ఏర్పాటు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,సోల్డ్ ఆస్తి యొక్క ధర
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,మీరు వైదొలగిన తర్వాత చెల్లింపు ఎంట్రీ మారిస్తే. మళ్ళీ తీసి దయచేసి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
-DocType: Grade Interval,Min Score,min స్కోరు
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} అంశం పన్ను రెండుసార్లు ఎంటర్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,ఈ వారం పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Student Applicant,Admitted,చేరినవారి
 DocType: Workstation,Rent Cost,రెంట్ ఖర్చు
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,ఆర్డర్ విలువ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,బ్యాంకు / క్యాష్ పార్టీకి వ్యతిరేకంగా లేదా అంతర్గత బదిలీ లావాదేవీల
 DocType: Shipping Rule,Valid for Countries,దేశములలో చెలామణి
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,ఈ అంశాన్ని ఒక మూస మరియు లావాదేవీలలో ఉపయోగించబడదు. &#39;నో కాపీ&#39; సెట్ చేయబడితే తప్ప అంశం గుణాలను భేదకాలలోకి పైగా కాపీ అవుతుంది
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,భావించబడుతున్నది మొత్తం ఆర్డర్
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Employee హోదా (ఉదా CEO, డైరెక్టర్ మొదలైనవి)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,నమోదు రంగంలో విలువ &#39;డే ఆఫ్ ది మంత్ రిపీట్&#39; దయచేసి
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},రో # {0}: కొనుగోలు వాయిస్ ఇప్పటికే ఉన్న ఆస్తి వ్యతిరేకంగా చేయలేము {1}
 DocType: Item Tax,Tax Rate,పన్ను శాతమ్
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} ఇప్పటికే ఉద్యోగి కోసం కేటాయించిన {1} కాలానికి {2} కోసం {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,అంశాన్ని ఎంచుకోండి
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,వాయిస్ {0} ఇప్పటికే సమర్పించిన కొనుగోలు
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},రో # {0}: బ్యాచ్ లేవు అదే ఉండాలి {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,కాని గ్రూప్ మార్చు
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ఒక అంశం యొక్క బ్యాచ్ (చాలా).
 DocType: C-Form Invoice Detail,Invoice Date,వాయిస్ తేదీ
 DocType: GL Entry,Debit Amount,డెబిట్ మొత్తం
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},మాత్రమే కంపెనీవారి ప్రతి 1 ఖాతా ఉండగలడు {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,అటాచ్మెంట్ చూడండి
 DocType: Purchase Order,% Received,% పొందింది
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,విద్యార్థి సమూహాలు సృష్టించండి
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,కొటేషన్ కోసం అభ్యర్థన
 DocType: Salary Slip Timesheet,Working Hours,పని గంటలు
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,అప్పటికే ఉన్న సిరీస్ ప్రారంభం / ప్రస్తుత క్రమ సంఖ్య మార్చండి.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
-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.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ఒక కొత్త కస్టమర్ సృష్టించు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","బహుళ ధర రూల్స్ వ్యాప్తి చెందడం కొనసాగుతుంది, వినియోగదారులు పరిష్కరించవచ్చు మానవీయంగా ప్రాధాన్యత సెట్ కోరతారు."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,కొనుగోలు ఉత్తర్వులు సృష్టించు
 ,Purchase Register,కొనుగోలు నమోదు
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,వర్తించే ఛార్జీలు
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) పాత్ర కలిగి ఉండాలి &#39;లీవ్ అప్రూవర్గా&#39;
 DocType: Purchase Receipt,Vehicle Date,వాహనం తేదీ
 DocType: Student Log,Medical,మెడికల్
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,కోల్పోయినందుకు కారణము
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,కోల్పోయినందుకు కారణము
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,లీడ్ యజమాని లీడ్ అదే ఉండకూడదు
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,కేటాయించిన మొత్తాన్ని అన్ఏడ్జస్టెడ్ మొత్తానికన్నా ఎక్కువ కాదు
 DocType: Announcement,Receiver,స్వీకర్త
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,పరిమాణ మరియు రేటు
 DocType: Delivery Note,% Installed,% వ్యవస్థాపించిన
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,తరగతి / లాబొరేటరీస్ తదితర ఉపన్యాసాలు షెడ్యూల్ చేసుకోవచ్చు.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,మొదటి కంపెనీ పేరును నమోదు చేయండి
 DocType: Purchase Invoice,Supplier Name,సరఫరా చేయువాని పేరు
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext మాన్యువల్ చదువు
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,తప్పనిసరి రంగంలో - అకాడెమిక్ ఇయర్
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,తప్పనిసరి రంగంలో - అకాడెమిక్ ఇయర్
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ఆ ఈమెయిల్ భాగంగా వెళ్ళే పరిచయ టెక్స్ట్ అనుకూలీకరించండి. ప్రతి లావాదేవీ ఒక ప్రత్యేక పరిచయ టెక్స్ట్ ఉంది.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},కంపెనీ కోసం డిఫాల్ట్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,అన్ని తయారీ ప్రక్రియలకు గ్లోబల్ సెట్టింగులు.
 DocType: Accounts Settings,Accounts Frozen Upto,ఘనీభవించిన వరకు అకౌంట్స్
 DocType: SMS Log,Sent On,న పంపిన
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,లక్షణం {0} గుణాలు పట్టిక పలుమార్లు ఎంపిక
 DocType: HR Settings,Employee record is created using selected field. ,Employee రికార్డు ఎంపిక రంగంలో ఉపయోగించి రూపొందించినవారు ఉంది.
 DocType: Sales Order,Not Applicable,వర్తించదు
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,హాలిడే మాస్టర్.
 DocType: Request for Quotation Item,Required Date,అవసరం తేదీ
 DocType: Delivery Note,Billing Address,రశీదు చిరునామా
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,అంశం కోడ్ను నమోదు చేయండి.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,అంశం కోడ్ను నమోదు చేయండి.
 DocType: BOM,Costing,ఖరీదు
 DocType: Tax Rule,Billing County,బిల్లింగ్ కౌంటీ
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","తనిఖీ ఉంటే ఇప్పటికే ప్రింట్ రేటు / ప్రింట్ మొత్తం చేర్చబడుతుంది వంటి, పన్ను మొత్తాన్ని పరిగణించబడుతుంది"
@@ -507,6 +511,7 @@
 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,సెక్యూరిటీస్ అండ్ డిపాజిట్లు
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",", మదింపు విధానంగా మార్చలేము కొన్ని అంశాలను వ్యతిరేకంగా లావాదేవీలు కలిగి లేని ఉన్నాయి సొంత మదింపు పద్ధతి వార్తలు"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,కేటాయించింది మొత్తం ఆకులు తప్పనిసరి
 DocType: Job Opening,Description of a Job Opening,ఒక ఉద్యోగ అవకాశాల వివరణ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,నేడు పెండింగ్లో కార్యకలాపాలు
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,దయచేసి కోర్సు ఎంచుకోండి
 DocType: Timesheet Detail,Hrs,గంటలు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,కంపెనీ దయచేసి ఎంచుకోండి
 DocType: Stock Entry Detail,Difference Account,తేడా ఖాతా
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,దాని ఆధారపడి పని {0} సంవృతం కాదు దగ్గరగా పని కాదు.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,మెటీరియల్ అభ్యర్థన పెంచింది చేయబడే గిడ్డంగి నమోదు చేయండి
 DocType: Production Order,Additional Operating Cost,అదనపు నిర్వహణ ఖర్చు
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,కాస్మటిక్స్
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","విలీనం, క్రింది రెండు లక్షణాలతో అంశాలను అదే ఉండాలి"
 DocType: Shipping Rule,Net Weight,నికర బరువు
 DocType: Employee,Emergency Phone,అత్యవసర ఫోన్
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,కొనుగోలు
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,దయచేసి త్రెష్ 0% గ్రేడ్ నిర్వచించే
 DocType: Sales Order,To Deliver,రక్షిం
 DocType: Purchase Invoice Item,Item,అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,సీరియల్ ఏ అంశం ఒక భిన్నం ఉండకూడదు
 DocType: Journal Entry,Difference (Dr - Cr),తేడా (డాక్టర్ - CR)
 DocType: Account,Profit and Loss,లాభం మరియు నష్టం
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,మేనేజింగ్ ఉప
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,పెంపు 0 ఉండకూడదు
 DocType: Production Planning Tool,Material Requirement,వస్తు అవసరాల
 DocType: Company,Delete Company Transactions,కంపెనీ లావాదేవీలు తొలగించు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,రిఫరెన్స్ ఇక లేవు ప్రస్తావన తేదీ బ్యాంక్ లావాదేవీల తప్పనిసరి
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ మార్చు పన్నులు మరియు ఆరోపణలు జోడించండి
 DocType: Purchase Invoice,Supplier Invoice No,సరఫరాదారు వాయిస్ లేవు
 DocType: Territory,For reference,సూచన కోసం
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,సంస్థాపన సూచన అంశం
 DocType: Production Plan Item,Pending Qty,పెండింగ్ ప్యాక్ చేసిన అంశాల
 DocType: Budget,Ignore,విస్మరించు
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} సక్రియ కాదు
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} సక్రియ కాదు
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS క్రింది సంఖ్యలను పంపిన: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ముద్రణా సెటప్ చెక్ కొలతలు
 DocType: Salary Slip,Salary Slip Timesheet,జీతం స్లిప్ TIMESHEET
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,మొత్తం కమిషన్
 DocType: Pricing Rule,Sales Partner,సేల్స్ భాగస్వామి
 DocType: Buying Settings,Purchase Receipt Required,కొనుగోలు రసీదులు అవసరం
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,తెరవడం స్టాక్ ఎంటర్ చేస్తే వాల్యువేషన్ రేటు తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,వాయిస్ పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,మొదటి కంపెనీ మరియు పార్టీ రకాన్ని ఎంచుకోండి
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,ఫైనాన్షియల్ / అకౌంటింగ్ సంవత్సరం.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,పోగుచేసిన విలువలు
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","క్షమించండి, సీరియల్ సంఖ్యలు విలీనం సాధ్యం కాదు"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,సేల్స్ ఆర్డర్ చేయండి
 DocType: Project Task,Project Task,ప్రాజెక్ట్ టాస్క్
 ,Lead Id,లీడ్ ID
 DocType: C-Form Invoice Detail,Grand Total,సంపూర్ణ మొత్తము
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,పునఃప్రారంభం జోడింపు
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,పునరావృత
 DocType: Leave Control Panel,Allocate,కేటాయించాల్సిన
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,సేల్స్ చూపించు
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,సేల్స్ చూపించు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,గమనిక: మొత్తం కేటాయించింది ఆకులు {0} ఇప్పటికే ఆమోదం ఆకులు కంటే తక్కువ ఉండకూడదు {1} కాలానికి
 DocType: Announcement,Posted By,ద్వారా పోస్ట్
 DocType: Item,Delivered by Supplier (Drop Ship),సరఫరాదారు ద్వారా పంపిణీ (డ్రాప్ షిప్)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,.కొటేషన్
 DocType: Lead,Middle Income,మధ్య ఆదాయ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),ప్రారంభ (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,కేటాయించింది మొత్తం ప్రతికూల ఉండకూడదు
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,కంపెనీ సెట్ దయచేసి
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,కంపెనీ సెట్ దయచేసి
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,సేల్స్ వాయిస్ TIMESHEET
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ప్రస్తావన &amp; సూచన తేదీ అవసరం {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,బ్యాంక్ ఎంట్రీ చేయడానికి చెల్లింపు ఖాతా ఎంచుకోండి
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","ఆకులు, వ్యయం వాదనలు మరియు పేరోల్ నిర్వహించడానికి ఉద్యోగి రికార్డులు సృష్టించు"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,నాలెడ్జ్ బేస్ జోడించండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,ప్రతిపాదన రాయడం
 DocType: Payment Entry Deduction,Payment Entry Deduction,చెల్లింపు ఎంట్రీ తీసివేత
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} &#39;{1}&#39; లేదు ఫిస్కల్ ఇయర్ లో {2}
 DocType: Buying Settings,Settings for Buying Module,మాడ్యూల్ కొనుగోలు కోసం సెట్టింగులు
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},ఆస్తి {0} కంపెనీకి చెందినది కాదు {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,మొదటి కొనుగోలు రసీదులు నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","అప్పుడు ధర నిబంధనలకు మొదలైనవి కస్టమర్, కస్టమర్ గ్రూప్, భూభాగం, సరఫరాదారు, సరఫరాదారు పద్ధతి, ప్రచారం, అమ్మకపు భాగస్వామిగా ఆధారంగా వడకట్టేస్తుంది"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,ఇన్వెంటరీ నికర మార్పును
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ఉద్యోగి లోన్ మేనేజ్మెంట్
 DocType: Employee,Passport Number,పాస్పోర్ట్ సంఖ్య
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 తో రిలేషన్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,మేనేజర్
 DocType: Payment Entry,Payment From / To,చెల్లింపు / నుండి
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,తేదీ పరిధి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},క్రొత్త క్రెడిట్ పరిమితి కస్టమర్ ప్రస్తుత అసాధారణ మొత్తం కంటే తక్కువగా ఉంటుంది. క్రెడిట్ పరిమితి కనీసం ఉండాలి {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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; అదే ఉండకూడదు
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,నిమిషాల్లో
 DocType: Issue,Resolution Date,రిజల్యూషన్ తేదీ
 DocType: Student Batch Name,Batch Name,బ్యాచ్ పేరు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet రూపొందించినవారు:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet రూపొందించినవారు:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},చెల్లింపు విధానం లో డిఫాల్ట్ నగదు లేదా బ్యాంక్ ఖాతా సెట్ దయచేసి {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,నమోదు
 DocType: Selling Settings,Customer Naming By,ద్వారా కస్టమర్ నేమింగ్
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,స్టూడెంట్ మంత్లీ హాజరు రిపోర్ట్ లో విధంగా ప్రస్తుతం విద్యార్థి చూపిస్తుంది
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,వాస్తవ ప్రారంభ సమయం
 DocType: BOM Operation,Operation Time,ఆపరేషన్ సమయం
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,ముగించు
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,బేస్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,బేస్
 DocType: Timesheet,Total Billed Hours,మొత్తం కస్టమర్లకు గంటలు
 DocType: Journal Entry,Write Off Amount,మొత్తం ఆఫ్ వ్రాయండి
 DocType: Journal Entry,Bill No,బిల్ లేవు
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,విద్యార్థి హాజరు
 DocType: Sales Invoice Timesheet,Time Sheet,సమయ పట్టిక
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush రా మెటీరియల్స్ బేస్డ్ న
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,అంశం వివరాలు నమోదు చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,అంశం వివరాలు నమోదు చేయండి
 DocType: Interest,Interest,వడ్డీ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ప్రీ సేల్స్
 DocType: Purchase Receipt,Other Details,ఇతర వివరాలు
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,చెల్లింపు ఎంట్రీ ఇప్పటికే రూపొందించినవారు ఉంటుంది
 DocType: Purchase Receipt Item Supplied,Current Stock,ప్రస్తుత స్టాక్
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},రో # {0}: ఆస్తి {1} అంశం ముడిపడి లేదు {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ప్రివ్యూ వేతనం స్లిప్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,ఖాతా {0} అనేకసార్లు నమోదు చేసిన
 DocType: Account,Expenses Included In Valuation,ఖర్చులు విలువలో
 DocType: Hub Settings,Seller City,అమ్మకాల సిటీ
 ,Absent Student Report,కరువవడంతో విద్యార్థి నివేదిక
 DocType: Email Digest,Next email will be sent on:,తదుపరి ఇమెయిల్ పంపబడుతుంది:
 DocType: Offer Letter Term,Offer Letter Term,లెటర్ టర్మ్ ఆఫర్
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,అంశం రకాల్లో.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,అంశం రకాల్లో.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,అంశం {0} దొరకలేదు
 DocType: Bin,Stock Value,స్టాక్ విలువ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,కంపెనీ {0} ఉనికిలో లేదు
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ట్రీ టైప్
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,ట్రీ టైప్
 DocType: BOM Explosion Item,Qty Consumed Per Unit,ప్యాక్ చేసిన అంశాల యూనిట్కు సేవించాలి
 DocType: Serial No,Warranty Expiry Date,వారంటీ గడువు తేదీ
 DocType: Material Request Item,Quantity and Warehouse,పరిమాణ మరియు వేర్హౌస్
 DocType: Sales Invoice,Commission Rate (%),కమిషన్ రేటు (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,దయచేసి ఎంచుకోండి ప్రోగ్రామ్
 DocType: Project,Estimated Cost,అంచనా వ్యయం
@@ -768,7 +770,7 @@
 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,డిఫాల్ట్ ఖాతా
 DocType: Payment Entry,Received Amount (Company Currency),అందుకున్న మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,అవకాశం లీడ్ నుండి తయారు చేస్తారు ఉంటే లీడ్ ఏర్పాటు చేయాలి
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,వీక్లీ ఆఫ్ రోజును ఎంచుకోండి
 DocType: Production Order Operation,Planned End Time,అనుకున్న ముగింపు సమయం
 ,Sales Person Target Variance Item Group-Wise,సేల్స్ పర్సన్ టార్గెట్ విస్తృతి అంశం గ్రూప్-వైజ్
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,నుండి అవకాశం
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,మంత్లీ జీతం ప్రకటన.
 DocType: BOM,Website Specifications,వెబ్సైట్ లక్షణాలు
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: నుండి {0} రకం {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,రో {0}: మార్పిడి ఫాక్టర్ తప్పనిసరి
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,బ్యాంక్ A / C నం
 DocType: Bank Guarantee,Project,ప్రాజెక్టు
 DocType: Quality Inspection Reading,Reading 7,7 పఠనం
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,పాక్షికంగా క్రమ
 DocType: Expense Claim Detail,Expense Claim Type,ఖర్చుల దావా రకం
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,షాపింగ్ కార్ట్ డిఫాల్ట్ సెట్టింగులను
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},ఆస్తి జర్నల్ ఎంట్రీ ద్వారా చిత్తు {0}
@@ -825,14 +829,14 @@
 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 +107,Office Maintenance Expenses,ఆఫీసు నిర్వహణ ఖర్చులు
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ఇమెయిల్ ఖాతా ఏర్పాటు
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,మొదటి అంశం నమోదు చేయండి
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,మొదటి అంశం నమోదు చేయండి
 DocType: Account,Liability,బాధ్యత
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,మంజూరు మొత్తం రో లో క్లెయిమ్ సొమ్ము కంటే ఎక్కువ ఉండకూడదు {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,ధర జాబితా ఎంచుకోలేదు
 DocType: Employee,Family Background,కుటుంబ నేపథ్యం
 DocType: Request for Quotation Supplier,Send Email,ఇమెయిల్ పంపండి
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},హెచ్చరిక: చెల్లని జోడింపు {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,అనుమతి లేదు
 DocType: Company,Default Bank Account,డిఫాల్ట్ బ్యాంక్ ఖాతా
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",పార్టీ ఆధారంగా ఫిల్టర్ ఎన్నుకోండి పార్టీ మొదటి రకం
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,ఏ ఉద్యోగి దొరకలేదు
 DocType: Supplier Quotation,Stopped,ఆగిపోయింది
 DocType: Item,If subcontracted to a vendor,"ఒక వ్యాపారికి బహుకరించింది, మరలా ఉంటే"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,స్టూడెంట్ గ్రూప్ ఇప్పటికే నవీకరించబడింది.
 DocType: SMS Center,All Customer Contact,అన్ని కస్టమర్ సంప్రదించండి
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv ద్వారా స్టాక్ సంతులనం అప్లోడ్.
 DocType: Warehouse,Tree Details,ట్రీ వివరాలు
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,కనీస ఇన్వాయిస్ మొత్తం
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: వ్యయ కేంద్రం {2} కంపెనీ చెందదు {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: ఖాతా {2} ఒక గ్రూప్ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,అంశం రో {IDX}: {doctype} {DOCNAME} లేదు పైన ఉనికిలో లేదు &#39;{doctype}&#39; పట్టిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} ఇప్పటికే పూర్తి లేదా రద్దు
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,విధులు లేవు
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","ఆటో ఇన్వాయిస్ 05, 28 etc ఉదా ఉత్పత్తి అవుతుంది ఇది నెల రోజు"
 DocType: Asset,Opening Accumulated Depreciation,పోగుచేసిన తరుగుదల తెరవడం
@@ -874,7 +878,7 @@
 DocType: Bin,Moving Average Rate,సగటు రేటు మూవింగ్
 DocType: Production Planning Tool,Select Items,ఐటమ్లను ఎంచుకోండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} బిల్లుకు వ్యతిరేకంగా {1} నాటి {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,కోర్సు షెడ్యూల్
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,కోర్సు షెడ్యూల్
 DocType: Maintenance Visit,Completion Status,పూర్తి స్థితి
 DocType: HR Settings,Enter retirement age in years,సంవత్సరాలలో విరమణ వయసు ఎంటర్
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,టార్గెట్ వేర్హౌస్
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,ఈ శాతం వరకు డెలివరీ లేదా రసీదులు పైగా అనుమతించు
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,దిగుమతి హాజరు
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,అన్ని అంశం గుంపులు
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,అన్ని అంశం గుంపులు
 DocType: Process Payroll,Activity Log,కార్యాచరణ లాగ్
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,నికర లాభం / నష్టం
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,స్వయంచాలకంగా లావాదేవీల సమర్పణ సందేశాన్ని కంపోజ్.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,చెల్లింపు కు ఆర్డర్ కొనుగోలు
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,ప్రొజెక్టెడ్ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,Payment Due Date,చెల్లింపు గడువు తేదీ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,అంశం వేరియంట్ {0} ఇప్పటికే అదే గుణ ఉంది
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;ప్రారంభిస్తున్నాడు&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,డు ఓపెన్
 DocType: Notification Control,Delivery Note Message,డెలివరీ గమనిక సందేశం
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,రీ-ఆర్డర్ ప్యాక్ చేసిన అంశాల
 DocType: Leave Block List Date,Leave Block List Date,బ్లాక్ జాబితా తేది వదిలి
 DocType: Pricing Rule,Price or Discount,ధర లేదా డిస్కౌంట్
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,కొనుగోలు స్వీకరణపై అంశాలు పట్టికలో మొత్తం వర్తించే ఛార్జీలు మొత్తం పన్నులు మరియు ఆరోపణలు అదే ఉండాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,కొనుగోలు స్వీకరణపై అంశాలు పట్టికలో మొత్తం వర్తించే ఛార్జీలు మొత్తం పన్నులు మరియు ఆరోపణలు అదే ఉండాలి
 DocType: Sales Team,Incentives,ఇన్సెంటివ్స్
 DocType: SMS Log,Requested Numbers,అభ్యర్థించిన సంఖ్యలు
 DocType: Production Planning Tool,Only Obtain Raw Materials,కేవలం రా మెటీరియల్స్ పొందుము
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,"బహుకరించింది, మరలా ఉంది"
 DocType: Item Attribute,Item Attribute Values,అంశం లక్షణం విలువలు
 DocType: Examination Result,Examination Result,పరీక్ష ఫలితం
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,కొనుగోలు రసీదులు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,కొనుగోలు రసీదులు
 ,Received Items To Be Billed,స్వీకరించిన అంశాలు బిల్ టు
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Submitted జీతం స్లిప్స్
 DocType: Employee,Ms,కుమారి
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,కరెన్సీ మార్పిడి రేటు మాస్టర్.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},రిఫరెన్స్ doctype యొక్క ఒక ఉండాలి {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},రిఫరెన్స్ doctype యొక్క ఒక ఉండాలి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ఆపరేషన్ కోసం తదుపరి {0} రోజుల్లో టైమ్ స్లాట్ దొరక్కపోతే {1}
 DocType: Production Order,Plan material for sub-assemblies,ఉప శాసనసభలకు ప్రణాళిక పదార్థం
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,సేల్స్ భాగస్వాములు అండ్ టెరిటరీ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,ఖాతాలో స్టాక్ సంతులనం ఇప్పటికే ఉంది గా స్వయంచాలకంగా ఖాతా సృష్టించలేను. మీరు ఈ గిడ్డంగి ఒక ఎంట్రీ చేయడానికి ముందు మీరు ఒక సరిపోలే ఖాతా సృష్టించాలి
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,డిఫాల్ట్ చెల్లించవలసిన అకౌంట్స్
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ఉద్యోగి చురుకుగా కాదు లేదా ఉనికిలో లేదు
 DocType: Fee Structure,Components,భాగాలు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,అంశం రకరకాలు {0} నవీకరించబడింది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Item లో అసెట్ వర్గం నమోదు చేయండి {0}
 DocType: Quality Inspection Reading,Reading 6,6 పఠనం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,కాదు {0} {1} {2} లేకుండా ఏ ప్రతికూల అత్యుత్తమ వాయిస్ కెన్
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,వాయిస్ అడ్వాన్స్ కొనుగోలు
 DocType: Hub Settings,Sync Now,ఇప్పుడు సమకాలీకరించు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},రో {0}: క్రెడిట్ ఎంట్రీ తో జతచేయవచ్చు ఒక {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,కొనుగోలు అంశం
 DocType: Asset,Purchase Invoice,కొనుగోలు వాయిస్
 DocType: Stock Ledger Entry,Voucher Detail No,ఓచర్ వివరాలు లేవు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,న్యూ సేల్స్ వాయిస్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,న్యూ సేల్స్ వాయిస్
 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,తేదీ మరియు ముగింపు తేదీ తెరవడం అదే ఫిస్కల్ ఇయర్ లోపల ఉండాలి
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,తేదీ మరియు ముగింపు తేదీ తెరవడం అదే ఫిస్కల్ ఇయర్ లోపల ఉండాలి
 DocType: Lead,Request for Information,సమాచారం కోసం అభ్యర్థన
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,సమకాలీకరణ ఆఫ్లైన్ రసీదులు
 DocType: Payment Request,Paid,చెల్లింపు
 DocType: Program Fee,Program Fee,ప్రోగ్రామ్ రుసుము
 DocType: Salary Slip,Total in words,పదాలు లో మొత్తం
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,మంజూరు
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; కాపీ అవుతుంది."
 DocType: Job Opening,Publish on website,వెబ్ సైట్ ప్రచురించు
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,వినియోగదారులకు ప్యాకేజీల.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,సరఫరాదారు ఇన్వాయిస్ తేదీ వ్యాఖ్యలు తేదీ కన్నా ఎక్కువ ఉండకూడదు
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,అంతర్భేధం
 ,Company Name,కంపెనీ పేరు
 DocType: SMS Center,Total Message(s),మొత్తం సందేశం (లు)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,బదిలీ కోసం అంశాన్ని ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,చెక్ జమ జరిగినది ఎక్కడ బ్యాంకు ఖాతాను ఎంచుకోండి తల.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,రో {0}: సేల్స్ / కొనుగోలు ఆర్డర్ వ్యతిరేకంగా చెల్లింపు ఎల్లప్పుడూ అడ్వాన్సుగా మార్క్ చేయాలి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,కెమికల్
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,ఈ మోడ్ ఎంపిక ఉన్నప్పుడు డిఫాల్ట్ బ్యాంక్ / నగదు ఖాతా స్వయంచాలకంగా జీతం జర్నల్ ఎంట్రీ లో అప్డేట్ అవుతుంది.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","గ్రేడ్ కోడ్ ఫర్ వ్యవధిలో {0} ఇతర తరగతులు ఏవిధమైన తరగతి వ్యవధిలో భర్తీ చేస్తుంది. తనిఖీ చేయండి వ్యవధిలో {0} మరియు {1}, మళ్ళీ ప్రయత్నించండి"
 DocType: BOM,Raw Material Cost(Company Currency),రా మెటీరియల్ ఖర్చు (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,అన్ని అంశాలను ఇప్పటికే ఈ ఉత్పత్తి ఆర్డర్ కోసం బదిలీ చేశారు.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},రో # {0}: రేటు ఉపయోగిస్తారు రేటు కంటే ఎక్కువ ఉండకూడదు {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,బిఒఎం వెబ్సైట్ అంశం
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,మీ లేఖ తల మరియు లోగో అప్లోడ్. (మీరు తర్వాత వాటిని సవరించవచ్చు).
 DocType: Timesheet Detail,Bill,బిల్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,తదుపరి అరుగుదల తేదీ గత తేదీగా ఎంటర్ ఉంది
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,వైట్
 DocType: SMS Center,All Lead (Open),అన్ని లీడ్ (ఓపెన్)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),రో {0}: కోసం ప్యాక్ చేసిన అంశాల అందుబాటులో లేదు {4} గిడ్డంగిలో {1} ప్రవేశం సమయం పోస్ట్ చేయడంలో ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,అడ్వాన్సెస్ పొందుతారు
 DocType: Item,Automatically Create New Batch,ఆటోమేటిక్గా కొత్త బ్యాచ్ సృష్టించు
 DocType: Item,Automatically Create New Batch,ఆటోమేటిక్గా కొత్త బ్యాచ్ సృష్టించు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,చేయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,చేయండి
 DocType: Student Admission,Admission Start Date,అడ్మిషన్ ప్రారంభ తేదీ
 DocType: Journal Entry,Total Amount in Words,పదాలు లో మొత్తం పరిమాణం
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,ఒక లోపం ఉంది. వన్ మూడింటిని కారణం మీరు రూపం సేవ్ చేయలేదు అని కావచ్చు. సమస్య కొనసాగితే support@erpnext.com సంప్రదించండి.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,ప్యాక్ చేసిన అంశాల తెరవడం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,మొత్తం చేంజ్ ఖాతాను నమోదు చేయండి
 DocType: Student Batch Name,Student Batch Name,స్టూడెంట్ బ్యాచ్ పేరు
 DocType: Holiday List,Holiday List Name,హాలిడే జాబితా పేరు
 DocType: Repayment Schedule,Balance Loan Amount,సంతులనం రుణ మొత్తం
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},దయచేసి పేర్కొనండి ఒక {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,పరిమాణం లేదా విలువ ఎటువంటి మార్పు తొలగించబడిన అంశాలు.
 DocType: Delivery Note,Delivery To,డెలివరీ
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,లక్షణం పట్టిక తప్పనిసరి
 DocType: Production Planning Tool,Get Sales Orders,సేల్స్ ఆర్డర్స్ పొందండి
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ప్రతికూల ఉండకూడదు
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,డిస్కౌంట్
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,డిస్కౌంట్
 DocType: Asset,Total Number of Depreciations,Depreciations మొత్తం సంఖ్య
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
 DocType: Sales Invoice Item,Rate With Margin,మార్జిన్ తో రేటు
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,సేల్స్ ఆర్డర్ / తయారైన వస్తువులు గిడ్డంగిలో రిసర్వ్డ్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,సెల్లింగ్ మొత్తం
 DocType: Repayment Schedule,Interest Amount,వడ్డీ మొత్తం
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,మీరు ఈ రికార్డ్ కోసం ఖర్చుల అప్రూవర్గా ఉన్నాయి. &#39;హోదా&#39; మరియు సేవ్ అప్డేట్ దయచేసి
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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,సమస్య
 DocType: Asset,Scrapped,రద్దు
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","అంశం రకరకాలు గుణాలు. ఉదా సైజు, రంగు మొదలైనవి"
 DocType: Purchase Invoice,Returns,రిటర్న్స్
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP వేర్హౌస్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},సీరియల్ లేవు {0} వరకు నిర్వహణ ఒప్పందం కింద {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,నియామక
 DocType: Lead,Organization Name,సంస్థ పేరు
 DocType: Tax Rule,Shipping State,షిప్పింగ్ రాష్ట్రం
 ,Projected Quantity as Source,మూల ప్రొజెక్టెడ్ పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,అంశం బటన్ &#39;కొనుగోలు రసీదులు నుండి అంశాలు పొందండి&#39; ఉపయోగించి జత చేయాలి
 DocType: Employee,A-,ఒక-
 DocType: Production Planning Tool,Include non-stock items,కాని స్టాక్ అంశాలను చేర్చండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,సేల్స్ ఖర్చులు
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,ఎగైనెస్ట్
 DocType: Item,Default Selling Cost Center,డిఫాల్ట్ సెల్లింగ్ ఖర్చు సెంటర్
 DocType: Sales Partner,Implementation Partner,అమలు భాగస్వామి
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,జిప్ కోడ్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,జిప్ కోడ్
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},అమ్మకాల ఆర్డర్ {0} ఉంది {1}
 DocType: Opportunity,Contact Info,సంప్రదింపు సమాచారం
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,స్టాక్ ఎంట్రీలు మేకింగ్
 DocType: Packing Slip,Net Weight UOM,నికర బరువు UoM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ఫలితాలు
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ఫలితాలు
 DocType: Item,Default Supplier,డిఫాల్ట్ సరఫరాదారు
 DocType: Manufacturing Settings,Over Production Allowance Percentage,ఉత్పత్తి అలవెన్స్ శాతం పైగా
 DocType: Employee Loan,Repayment Schedule,తిరిగి చెల్లించే షెడ్యూల్
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,వీక్లీ ఆఫ్ తేదీలు పొందండి
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ముగింపు తేదీ ప్రారంభ తేదీ కంటే తక్కువ ఉండకూడదు
 DocType: Sales Person,Select company name first.,మొదటిది ఎంచుకోండి కంపెనీ పేరు.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,డాక్టర్
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,డాక్టర్
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,కొటేషన్స్ పంపిణీదారుల నుండి పొందింది.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},కు {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,సగటు వయసు
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,కీ పనితీరు ఏరియా
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,రవాణా
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,చెల్లని లక్షణం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} సమర్పించాలి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} సమర్పించాలి
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},పరిమాణం కంటే తక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: SMS Center,Total Characters,మొత్తం అక్షరాలు
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},అంశం కోసం BOM రంగంలో BOM దయచేసి ఎంచుకోండి {0}
@@ -1153,7 +1154,7 @@
 DocType: Sales Partner,Distributor,పంపిణీదారు
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,షాపింగ్ కార్ట్ షిప్పింగ్ రూల్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,ఉత్పత్తి ఆర్డర్ {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',సెట్ &#39;న అదనపు డిస్కౌంట్ వర్తించు&#39; దయచేసి
 ,Ordered Items To Be Billed,క్రమ అంశాలు బిల్ టు
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,రేంజ్ తక్కువ ఉండాలి కంటే పరిధి
 DocType: Global Defaults,Global Defaults,గ్లోబల్ డిఫాల్ట్
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ప్రారంభ సంవత్సరం
 DocType: Purchase Invoice,Start date of current invoice's period,ప్రస్తుత వాయిస్ యొక్క కాలం తేదీ ప్రారంభించండి
 DocType: Salary Slip,Leave Without Pay,పే లేకుండా వదిలి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,పరిమాణ ప్రణాళికా లోపం
 ,Trial Balance for Party,పార్టీ కోసం ట్రయల్ బ్యాలెన్స్
 DocType: Lead,Consultant,కన్సల్టెంట్
 DocType: Salary Slip,Earnings,సంపాదన
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","ఈ శ్రేణి Item కోడ్ చేర్చవలసి ఉంటుంది. మీ సంక్షిప్త &quot;SM&quot; మరియు ఉదాహరణకు, అంశం కోడ్ &quot;T- షర్టు&quot;, &quot;T- షర్టు-SM&quot; ఉంటుంది వేరియంట్ అంశం కోడ్"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,మీరు వేతనం స్లిప్ సేవ్ ఒకసారి (మాటలలో) నికర పే కనిపిస్తుంది.
 DocType: Purchase Invoice,Is Return,రాబడి
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,రిటర్న్ / డెబిట్ గమనిక
 DocType: Price List Country,Price List Country,ధర జాబితా దేశం
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} అంశం చెల్లుబాటు సీరియల్ nos {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,బ్యాచ్ సంఖ్య పొందడానికి అంశం కోడ్ను నమోదు చేయండి
 DocType: Stock Settings,Default Item Group,డిఫాల్ట్ అంశం గ్రూప్
 DocType: Employee Loan,Partially Disbursed,పాక్షికంగా పంపించబడతాయి
-DocType: Grading Structure,Grading System Name,గ్రేడింగ్ వ్యవస్థ పేరు
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,సరఫరాదారు డేటాబేస్.
 DocType: Account,Balance Sheet,బ్యాలెన్స్ షీట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',&#39;అంశం కోడ్ అంశం సెంటర్ ఖర్చు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",చెల్లింపు రకం కన్ఫిగర్ చేయబడలేదు. ఖాతా చెల్లింపులు మోడ్ మీద లేదా POS ప్రొఫైల్ సెట్ చేయబడ్డాయి వచ్చారో లేదో తనిఖీ చేయండి.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,మీ అమ్మకాలు వ్యక్తి కస్టమర్ సంప్రదించండి తేదీన ఒక రిమైండర్ పొందుతారు
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,అదే అంశం అనేకసార్లు ఎంటర్ చేయలేరు.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","మరింత ఖాతాల గుంపులు కింద తయారు చేయవచ్చు, కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు"
@@ -1204,7 +1204,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,స్టాక్ లెడ్జర్ ఎంట్రీలు మరియు GL ఎంట్రీలు ఎన్నుకున్నారు కొనుగోలు రసీదులు కోసం మళ్ళీ పోస్ట్ చేసారు ఉంటాయి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,స్టాక్ లెడ్జర్ ఎంట్రీలు మరియు GL ఎంట్రీలు ఎన్నుకున్నారు కొనుగోలు రసీదులు కోసం మళ్ళీ పోస్ట్ చేసారు ఉంటాయి
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,అంశం 1
 DocType: Holiday,Holiday,హాలిడే
 DocType: Support Settings,Close Issue After Days,ఇష్యూ డేస్ తర్వాత దగ్గరి
@@ -1230,11 +1230,11 @@
 DocType: Maintenance Visit Purpose,Work Done,పని చేసారు
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,గుణాలు పట్టిక లో కనీసం ఒక లక్షణం రాయండి
 DocType: Announcement,All Students,అన్ని స్టూడెంట్స్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,అంశం {0} ఒక కాని స్టాక్ అంశం ఉండాలి
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,చూడండి లెడ్జర్
 DocType: Grading Scale,Intervals,విరామాలు
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,తొట్టతొలి
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","ఒక అంశం గ్రూప్ అదే పేరుతో, అంశం పేరు మార్చడానికి లేదా అంశం సమూహం పేరు దయచేసి"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,స్టూడెంట్ మొబైల్ నెంబరు
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ప్రపంచంలోని మిగిలిన
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,అంశం {0} బ్యాచ్ ఉండకూడదు
@@ -1273,9 +1273,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} నుండి జీతం చెల్లింపు {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ఘనీభవించిన ఖాతా సవరించడానికి మీకు అధికారం లేదు {0}
 DocType: Journal Entry,Get Outstanding Invoices,అసాధారణ ఇన్వాయిస్లు పొందండి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,అమ్మకాల ఆర్డర్ {0} చెల్లదు
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,కొనుగోలు ఆర్డర్లు మీరు ప్లాన్ సహాయం మరియు మీ కొనుగోళ్లపై అనుసరించాల్సి
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","క్షమించండి, కంపెనీలు విలీనం సాధ్యం కాదు"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",మొత్తం ఇష్యూ / ట్రాన్స్ఫర్ పరిమాణం {0} మెటీరియల్ అభ్యర్థన {1} \ అంశం కోసం అభ్యర్థించిన పరిమాణం {2} కంటే ఎక్కువ ఉండకూడదు {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,చిన్న
@@ -1296,10 +1296,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,పరోక్ష ఖర్చులు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,రో {0}: Qty తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,వ్యవసాయం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,సమకాలీకరణ మాస్టర్ డేటా
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,మీ ఉత్పత్తులు లేదా సేవల
 DocType: Mode of Payment,Mode of Payment,చెల్లింపు విధానం
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,వెబ్సైట్ చిత్రం పబ్లిక్ ఫైలు లేదా వెబ్సైట్ URL అయి ఉండాలి
 DocType: Student Applicant,AP,ఏపీ
 DocType: Purchase Invoice Item,BOM,బిఒఎం
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,ఈ రూట్ అంశం సమూహం ఉంది మరియు సవరించడం సాధ్యం కాదు.
@@ -1317,18 +1317,18 @@
 DocType: Student Group Student,Group Roll Number,గ్రూప్ రోల్ సంఖ్య
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, కేవలం క్రెడిట్ ఖాతాల మరొక డెబిట్ ప్రవేశం వ్యతిరేకంగా లింక్ చేయవచ్చు కోసం"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,అన్ని పని బరువులు మొత్తం 1 ఉండాలి తదనుగుణంగా ప్రణాళిక పనులు బరువులు సర్దుబాటు చేయండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,డెలివరీ గమనిక {0} సమర్పించిన లేదు
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","ధర రూల్ మొదటి ఆధారంగా ఎంపిక ఉంటుంది అంశం, అంశం గ్రూప్ లేదా బ్రాండ్ కావచ్చు, ఫీల్డ్ &#39;న వర్తించు&#39;."
 DocType: Hub Settings,Seller Website,అమ్మకాల వెబ్సైట్
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,అమ్మకాలు జట్టు మొత్తం కేటాయించింది శాతం 100 ఉండాలి
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},ఉత్పత్తి ఆర్డర్ స్థితి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},ఉత్పత్తి ఆర్డర్ స్థితి {0}
 DocType: Appraisal Goal,Goal,గోల్
 DocType: Sales Invoice Item,Edit Description,ఎడిట్ వివరణ
 ,Team Updates,టీమ్ నవీకరణలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,సరఫరాదారు కోసం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,సరఫరాదారు కోసం
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ఖాతా రకం చేస్తోంది లావాదేవీలు ఈ ఖాతా ఎంచుకోవడం లో సహాయపడుతుంది.
 DocType: Purchase Invoice,Grand Total (Company Currency),గ్రాండ్ మొత్తం (కంపెనీ కరెన్సీ)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,ప్రింట్ ఫార్మాట్ సృష్టించు
@@ -1344,7 +1344,7 @@
 DocType: Depreciation Schedule,Journal Entry,జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} పురోగతి అంశాలను
 DocType: Workstation,Workstation Name,కార్యక్షేత్ర పేరు
-DocType: Grade Interval,Grade Code,గ్రేడ్ కోడ్
+DocType: Grading Scale Interval,Grade Code,గ్రేడ్ కోడ్
 DocType: POS Item Group,POS Item Group,POS అంశం గ్రూప్
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,సారాంశ ఇమెయిల్:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},బిఒఎం {0} అంశం చెందినది కాదు {1}
@@ -1361,7 +1361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,హార్డ్వేర్
 DocType: Sales Order,Recurring Upto,పునరావృత వరకు
 DocType: Attendance,HR Manager,HR మేనేజర్
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ఒక కంపెనీ దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,ప్రివిలేజ్ లీవ్
 DocType: Purchase Invoice,Supplier Invoice Date,సరఫరాదారు వాయిస్ తేదీ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,మీరు షాపింగ్ కార్ట్ ఎనేబుల్ చెయ్యాలి
@@ -1377,7 +1377,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,ఆహార
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ఏజింగ్ రేంజ్ 3
 DocType: Maintenance Schedule Item,No of Visits,సందర్శనల సంఖ్య
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,మార్క్ Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,మార్క్ Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,నమోదు అవుతున్న విద్యార్ధి
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},మూసివేయబడిన ఖాతా కరెన్సీ ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},అన్ని గోల్స్ కోసం పాయింట్లు మొత్తానికి ఇది 100 ఉండాలి {0}
@@ -1402,7 +1403,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,కనీస డైలీ అవుట్గోయింగ్
 DocType: POS Profile,Campaign,ప్రచారం
 DocType: Supplier,Name and Type,పేరు మరియు టైప్
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',ఆమోద స్థితి &#39;అప్రూవ్డ్ లేదా&#39; తిరస్కరించింది &#39;తప్పక
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',ఆమోద స్థితి &#39;అప్రూవ్డ్ లేదా&#39; తిరస్కరించింది &#39;తప్పక
 DocType: Purchase Invoice,Contact Person,పర్సన్ సంప్రదించండి
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',&#39;ఊహించిన ప్రారంభం తేది&#39; కంటే ఎక్కువ &#39;ఊహించినది ముగింపు తేదీ&#39; ఉండకూడదు
 DocType: Course Scheduling Tool,Course End Date,కోర్సు ముగింపు తేదీ
@@ -1425,14 +1426,15 @@
 DocType: Sales Invoice,Shipping Address Name,షిప్పింగ్ చిరునామా పేరు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ఖాతాల చార్ట్
 DocType: Material Request,Terms and Conditions Content,నియమాలు మరియు నిబంధనలు కంటెంట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} అంశం స్టాక్ అంశం కాదు
 DocType: Maintenance Visit,Unscheduled,అనుకోని
 DocType: Employee,Owned,ఆధ్వర్యంలోని
 DocType: Salary Detail,Depends on Leave Without Pay,పే లేకుండా వదిలి ఆధారపడి
 DocType: Pricing Rule,"Higher the number, higher the priority","అధిక సంఖ్య, ఎక్కువ ప్రాధాన్యత"
 ,Purchase Invoice Trends,వాయిస్ ట్రెండ్లులో కొనుగోలు
 DocType: Employee,Better Prospects,మెరుగైన అవకాశాలు
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","రో # {0}: బ్యాచ్ {1} కేవలం {2} అంశాల ఉంది. దయచేసి {3} అంశాల అందుబాటులో ఉంది మరొక బ్యాచ్ ఎంచుకోండి లేదా బహుళ బ్యాచ్లు నుండి బట్వాడా / సమస్య, బహుళ వరుసలు లోకి వరుసగా విడిపోయి"
 DocType: Vehicle,License Plate,లైసెన్స్ ప్లేట్
 DocType: Appraisal,Goals,లక్ష్యాలు
 DocType: Warranty Claim,Warranty / AMC Status,వారంటీ / AMC స్థితి
@@ -1450,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Employee తనను రిపోర్ట్ చేయలేరు.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",ఖాతా ఘనీభవించిన ఉంటే ప్రవేశాలు పరిమితం వినియోగదారులు అనుమతించబడతాయి.
 DocType: Email Digest,Bank Balance,బ్యాంకు బ్యాలెన్స్
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} ఏకైక కరెన్సీగా తయారు చేయవచ్చు: {0} కోసం అకౌంటింగ్ ఎంట్రీ {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","జాబ్ ప్రొఫైల్, అర్హతలు అవసరం మొదలైనవి"
 DocType: Journal Entry Account,Account Balance,ఖాతా నిలువ
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,లావాదేవీలకు పన్ను రూల్.
@@ -1461,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,మూసివేయబడని ఆర్థిక సంవత్సరం పి &amp; L నిల్వలను చూపించు
 DocType: Shipping Rule,Shipping Account,షిప్పింగ్ ఖాతా
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: ఖాతా {2} నిష్క్రియంగా
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,సేల్స్ ఆర్డర్స్ మీరు మీ పని ప్లాన్ సహాయం మరియు సమయం బట్వాడా చేయండి
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,సేల్స్ ఆర్డర్స్ మీరు మీ పని ప్లాన్ సహాయం మరియు సమయం బట్వాడా చేయండి
 DocType: Quality Inspection,Readings,రీడింగ్స్
 DocType: Stock Entry,Total Additional Costs,మొత్తం అదనపు వ్యయాలు
 DocType: Course Schedule,SH,ఎస్హెచ్
@@ -1472,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,విలువ
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,ప్యాకింగ్ స్లిప్
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,ప్యాకింగ్ స్లిప్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,ఆఫీసు రెంట్
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,సెటప్ SMS గేట్వే సెట్టింగులు
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,దిగుమతి విఫలమైంది!
@@ -1494,11 +1496,11 @@
 DocType: Company,Services,సర్వీసులు
 DocType: HR Settings,Email Salary Slip to Employee,ఉద్యోగి ఇమెయిల్ వేతనం స్లిప్
 DocType: Cost Center,Parent Cost Center,మాతృ ఖర్చు సెంటర్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,సాధ్యమైన సరఫరాదారు ఎంచుకోండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,సాధ్యమైన సరఫరాదారు ఎంచుకోండి
 DocType: Sales Invoice,Source,మూల
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,మూసి షో
 DocType: Leave Type,Is Leave Without Pay,పే లేకుండా వదిలి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ఆస్తి వర్గం స్థిర ఆస్తి అంశం తప్పనిసరి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,చెల్లింపు పట్టిక కనుగొనబడలేదు రికార్డులు
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},ఈ {0} తో విభేదాలు {1} కోసం {2} {3}
 DocType: Student Attendance Tool,Students HTML,స్టూడెంట్స్ HTML
@@ -1516,7 +1518,7 @@
 DocType: Student,Date of Leaving,లీవింగ్ తేదీ
 DocType: Pricing Rule,For Price List,ధర జాబితా కోసం
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ఎగ్జిక్యూటివ్ శోధన
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,లీడ్స్ సృష్టించు
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,లీడ్స్ సృష్టించు
 DocType: Maintenance Schedule,Schedules,షెడ్యూల్స్
 DocType: Purchase Invoice Item,Net Amount,నికర మొత్తం
 DocType: Purchase Order Item Supplied,BOM Detail No,బిఒఎం వివరాలు లేవు
@@ -1544,9 +1546,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,ప్రోగ్రామ్ నమోదు
 DocType: Sales Invoice Item,Brand Name,బ్రాండ్ పేరు
 DocType: Purchase Receipt,Transporter Details,ట్రాన్స్పోర్టర్ వివరాలు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,డిఫాల్ట్ గిడ్డంగిలో ఎంచుకున్న అంశం కోసం అవసరం
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,బాక్స్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,సాధ్యమైన సరఫరాదారు
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,సాధ్యమైన సరఫరాదారు
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,సంస్థ
 DocType: Budget,Monthly Distribution,మంత్లీ పంపిణీ
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,స్వీకర్త జాబితా ఖాళీగా ఉంది. స్వీకర్త జాబితా సృష్టించడానికి దయచేసి
@@ -1554,8 +1556,8 @@
 DocType: Sales Partner,Sales Partner Target,సేల్స్ భాగస్వామిలో టార్గెట్
 DocType: Loan Type,Maximum Loan Amount,గరిష్ఠ రుణ మొత్తం
 DocType: Pricing Rule,Pricing Rule,ధర రూల్
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},విద్యార్థి కోసం నకిలీ రోల్ నంబర్ {0}
 DocType: Budget,Action if Annual Budget Exceeded,యాక్షన్ వార్షిక బడ్జెట్ మించింది ఉంటే
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,ఆర్డర్ కొనుగోలు మెటీరియల్ అభ్యర్థన
 DocType: Shopping Cart Settings,Payment Success URL,చెల్లింపు విజయవంతం URL
@@ -1576,9 +1578,9 @@
 DocType: Employee Loan,Repayment Method,తిరిగి చెల్లించే విధానం
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","తనిఖీ, హోమ్ పేజీ వెబ్సైట్ కోసం డిఫాల్ట్ అంశం గ్రూప్ ఉంటుంది"
 DocType: Quality Inspection Reading,Reading 4,4 పఠనం
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},కోసం {0} ప్రాజెక్ట్ కోసం దొరకలేదు డిఫాల్ట్ BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},కోసం {0} ప్రాజెక్ట్ కోసం దొరకలేదు డిఫాల్ట్ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,కంపెనీ వ్యయం కోసం దావాలు.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","స్టూడెంట్స్ వ్యవస్థ యొక్క గుండె వద్ద ఉంటాయి, అన్ని మీ విద్యార్థులు జోడించండి"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","స్టూడెంట్స్ వ్యవస్థ యొక్క గుండె వద్ద ఉంటాయి, అన్ని మీ విద్యార్థులు జోడించండి"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},రో # {0}: క్లియరెన్స్ తేదీ {1} ప్రిపే తేదీ ముందు ఉండకూడదు {2}
 DocType: Company,Default Holiday List,హాలిడే జాబితా డిఫాల్ట్
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},రో {0}: నుండి సమయం మరియు సమయం {1} తో కలిసిపోయే ఉంది {2}
@@ -1590,21 +1592,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,మీరు సెలవు కోసం దరఖాస్తు ఇది రోజు (లు) పండుగలు. మీరు సెలవు కోసం దరఖాస్తు అవసరం లేదు.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,చెల్లింపు ఇమెయిల్ను మళ్లీ పంపండి
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,క్రొత్త విధిని
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,కొటేషన్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,కొటేషన్ చేయండి
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,ఇతర నివేదికలు
 DocType: Dependent Task,Dependent Task,అస్వతంత్ర టాస్క్
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},మెజర్ యొక్క డిఫాల్ట్ యూనిట్ మార్పిడి అంశం వరుసగా 1 ఉండాలి {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},రకం లీవ్ {0} కంటే ఎక్కువ ఉండరాదు {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ముందుగానే X రోజులు కార్యకలాపాలు ప్రణాళిక ప్రయత్నించండి.
 DocType: HR Settings,Stop Birthday Reminders,ఆపు జన్మదిన రిమైండర్లు
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},కంపెనీ డిఫాల్ట్ పేరోల్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 DocType: SMS Center,Receiver List,స్వీకర్త జాబితా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,శోధన అంశం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,శోధన అంశం
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,వినియోగించిన మొత్తం
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,నగదు నికర మార్పు
 DocType: Assessment Plan,Grading Scale,గ్రేడింగ్ స్కేల్
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,ఇప్పటికే పూర్తి
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,మెజర్ {0} యొక్క యూనిట్ మార్పిడి ఫాక్టర్ టేబుల్ లో ఒకసారి కంటే ఎక్కువ నమోదు చేయబడింది
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,ఇప్పటికే పూర్తి
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},చెల్లింపు అభ్యర్థన ఇప్పటికే ఉంది {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,జారీచేయబడింది వస్తువుల ధర
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},పరిమాణం కంటే ఎక్కువ ఉండకూడదు {0}
@@ -1636,12 +1638,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,చెల్లించుట ఎంట్రీ చేయండి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,రో {0}: సరఫరాదారు వ్యతిరేకంగా అడ్వాన్స్ డెబిట్ తప్పక
 DocType: Company,Default Values,డిఫాల్ట్ విలువలు
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{ఫ్రీక్వెన్సీ} డైజెస్ట్
 DocType: Expense Claim,Total Amount Reimbursed,మొత్తం మొత్తం డబ్బులు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,ఈ ఈ వాహనం వ్యతిరేకంగా లాగ్లను ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,సేకరించండి
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},సరఫరాదారు వ్యతిరేకంగా వాయిస్ {0} నాటి {1}
 DocType: Customer,Default Price List,డిఫాల్ట్ ధర జాబితా
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,ఆస్తి ఉద్యమం రికార్డు {0} రూపొందించారు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,మీరు తొలగించలేరు ఫిస్కల్ ఇయర్ {0}. ఫిస్కల్ ఇయర్ {0} గ్లోబల్ సెట్టింగ్స్ లో డిఫాల్ట్ గా సెట్
 DocType: Journal Entry,Entry Type,ఎంట్రీ రకం
 ,Customer Credit Balance,కస్టమర్ క్రెడిట్ సంతులనం
@@ -1660,7 +1663,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,అంశాలను ఎవరూ పరిమాణం లేదా విలువ ఏ మార్పు ఉండదు.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,తప్పనిసరి రంగంలో - ప్రోగ్రామ్
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,తప్పనిసరి రంగంలో - ప్రోగ్రామ్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,వారంటీ దావా
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,వారంటీ దావా
 ,Lead Details,లీడ్ వివరాలు
 DocType: Salary Slip,Loan repayment,రుణాన్ని తిరిగి చెల్లించే
 DocType: Purchase Invoice,End date of current invoice's period,ప్రస్తుత ఇన్వాయిస్ పిరియడ్ ముగింపు తేదీ
@@ -1679,12 +1682,10 @@
 DocType: Employee,Permanent Address,శాశ్వత చిరునామా
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",గ్రాండ్ మొత్తం కంటే \ {0} {1} ఎక్కువ ఉండకూడదు వ్యతిరేకంగా చెల్లించిన అడ్వాన్స్ {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,అంశం కోడ్ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,అంశం కోడ్ దయచేసి ఎంచుకోండి
 DocType: Student Sibling,Studying in Same Institute,అదే ఇన్స్టిట్యూట్ అధ్యయనం
 DocType: Territory,Territory Manager,భూభాగం మేనేజర్
 DocType: Packed Item,To Warehouse (Optional),గిడ్డంగి (ఆప్షనల్)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
 DocType: Payment Entry,Paid Amount (Company Currency),మొత్తం చెల్లించారు (కంపెనీ కరెన్సీ)
 DocType: Purchase Invoice,Additional Discount,అదనపు డిస్కౌంట్
 DocType: Selling Settings,Selling Settings,సెట్టింగులు సెల్లింగ్
@@ -1694,9 +1695,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,కార్ట్ లో చూడండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,మార్కెటింగ్ ఖర్చులు
 ,Item Shortage Report,అంశం కొరత రిపోర్ట్
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","బరువు \ n దయచేసి చాలా &quot;బరువు UoM&quot; చెప్పలేదు, ప్రస్తావించబడింది"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,మెటీరియల్ అభ్యర్థన ఈ స్టాక్ ఎంట్రీ చేయడానికి ఉపయోగిస్తారు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,తదుపరి అరుగుదల తేదీ నూతన ఆస్తి తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,తదుపరి అరుగుదల తేదీ నూతన ఆస్తి తప్పనిసరి
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ప్రతి బ్యాచ్ కోసం ప్రత్యేక కోర్సు ఆధారంగా గ్రూప్
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ప్రతి బ్యాచ్ కోసం ప్రత్యేక కోర్సు ఆధారంగా గ్రూప్
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ఒక అంశం యొక్క సింగిల్ యూనిట్.
@@ -1713,9 +1714,7 @@
 DocType: Course Assessment Criteria,Weightage,వెయిటేజీ
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: వ్యయ కేంద్రం &#39;లాభం మరియు నష్టం&#39; ఖాతా కోసం అవసరం {2}. కంపెనీ కోసం ఒక డిఫాల్ట్ వ్యయ కేంద్రం ఏర్పాటు చేయండి.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ఒక కస్టమర్ గ్రూప్ అదే పేరుతో కస్టమర్ పేరును లేదా కస్టమర్ గ్రూప్ పేరు దయచేసి
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 చదివే
@@ -1732,7 +1731,7 @@
 ,Item-wise Sales Register,అంశం వారీగా సేల్స్ నమోదు
 DocType: Asset,Gross Purchase Amount,స్థూల కొనుగోలు మొత్తాన్ని
 DocType: Asset,Depreciation Method,అరుగుదల విధానం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ఆఫ్లైన్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ఆఫ్లైన్
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,ప్రాథమిక రేటు లో కూడా ఈ పన్ను?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,మొత్తం టార్గెట్
 DocType: Program Course,Required,లు గుర్తించబడతాయి
@@ -1742,21 +1741,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,సయోధ్య JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,చాలా కాలమ్. నివేదిక ఎగుమతి చేయండి మరియు స్ప్రెడ్షీట్ అనువర్తనం ఉపయోగించి ప్రింట్.
 DocType: Purchase Invoice Item,Batch No,బ్యాచ్ లేవు
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},మారక రేటు దొరక్కపోతే {0} కు {1} కీలక తేదీ కోసం {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,ఒక కస్టమర్ యొక్క కొనుగోలు ఆర్డర్ వ్యతిరేకంగా బహుళ సేల్స్ ఆర్డర్స్ అనుమతించు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 DocType: Student Group Instructor,Student Group Instructor,స్టూడెంట్ గ్రూప్ బోధకుడు
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 మొబైల్ లేవు
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,ప్రధాన
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,వేరియంట్
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,ప్రధాన
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,వేరియంట్
 DocType: Naming Series,Set prefix for numbering series on your transactions,మీ లావాదేవీలపై సిరీస్ నంబరింగ్ కోసం సెట్ ఉపసర్గ
 DocType: Employee Attendance Tool,Employees HTML,ఉద్యోగులు HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,డిఫాల్ట్ BOM ({0}) ఈ అంశం లేదా దాని టెంప్లేట్ కోసం చురుకుగా ఉండాలి
 DocType: Employee,Leave Encashed?,Encashed వదిలి?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,ఫీల్డ్ నుండి అవకాశం తప్పనిసరి
 DocType: Email Digest,Annual Expenses,వార్షిక ఖర్చులు
 DocType: Item,Variants,రకరకాలు
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,కొనుగోలు ఆర్డర్ చేయండి
 DocType: SMS Center,Send To,పంపే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},లీవ్ పద్ధతి కోసం తగినంత సెలవు సంతులనం లేదు {0}
 DocType: Payment Reconciliation Payment,Allocated amount,కేటాయించింది మొత్తం
@@ -1764,7 +1762,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,కస్టమర్ యొక్క Item కోడ్
 DocType: Stock Reconciliation,Stock Reconciliation,స్టాక్ సయోధ్య
 DocType: Territory,Territory Name,భూభాగం పేరు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,పని లో ప్రోగ్రెస్ వేర్హౌస్ సమర్పించండి ముందు అవసరం
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ఒక Job కొరకు అభ్యర్ధించే.
 DocType: Purchase Order Item,Warehouse and Reference,వేర్హౌస్ మరియు సూచన
 DocType: Supplier,Statutory info and other general information about your Supplier,మీ సరఫరాదారు గురించి స్టాట్యుటరీ సమాచారం మరియు ఇతర సాధారణ సమాచారం
@@ -1772,11 +1770,10 @@
 DocType: Item,Serial Nos and Batches,సీరియల్ Nos మరియు ఇస్తున్న
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,స్టూడెంట్ గ్రూప్ శక్తి
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,స్టూడెంట్ గ్రూప్ శక్తి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,జర్నల్ వ్యతిరేకంగా ఎంట్రీ {0} ఏదైనా సరిపోలని {1} ఎంట్రీ లేదు
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,అంచనాలు
 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: Grading Structure,Grading Intervals,గ్రేడింగ్ విరామాలు
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,దయచేసి నమోదు చెయ్యండి
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","అంశం {0} కోసం overbill కాదు వరుసగా {1} కంటే ఎక్కువ {2}. ఓవర్ బిల్లింగ్ అనుమతించేందుకు, సెట్టింగులు కొనుగోలు లో సెట్ చెయ్యండి"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,అంశం లేదా వేర్హౌస్ ఆధారంగా వడపోత సెట్ చెయ్యండి
@@ -1788,17 +1785,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,బిఒఎం {0} సమర్పించాలి
 DocType: Authorization Control,Authorization Control,అధికార కంట్రోల్
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},రో # {0}: వేర్హౌస్ తిరస్కరించబడిన తిరస్కరించిన వస్తువు వ్యతిరేకంగా తప్పనిసరి {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,చెల్లింపు
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,మీ ఆర్డర్లను నిర్వహించండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,చెల్లింపు
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,మీ ఆర్డర్లను నిర్వహించండి
 DocType: Production Order Operation,Actual Time and Cost,అసలు సమయం మరియు ఖర్చు
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},గరిష్ట {0} యొక్క పదార్థం అభ్యర్థన {1} అమ్మకాల ఆర్డర్ వ్యతిరేకంగా అంశం కోసం తయారు చేయవచ్చు {2}
 DocType: Employee,Salutation,సెల్యుటేషన్
 DocType: Course,Course Abbreviation,కోర్సు సంక్షిప్తీకరణ
 DocType: Student Leave Application,Student Leave Application,స్టూడెంట్ లీవ్ అప్లికేషన్
 DocType: Item,Will also apply for variants,కూడా రూపాంతరాలు వర్తిస్తాయని
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","అది ఇప్పటికే ఉంది గా ఆస్తి, రద్దు చేయబడదు {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ఉద్యోగి {0} లో హాఫ్ రోజున {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},మొత్తం పని గంటల గరిష్టంగా పని గంటల కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,పై
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,అమ్మకం జరిగే సమయంలో కట్ట అంశాలు.
 DocType: Quotation Item,Actual Qty,వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice Item,References,సూచనలు
@@ -1808,7 +1806,7 @@
 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 +91,Associate,అసోసియేట్
 DocType: Asset Movement,Asset Movement,ఆస్తి ఉద్యమం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,న్యూ కార్ట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,న్యూ కార్ట్
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} అంశం సీరియల్ అంశం కాదు
 DocType: SMS Center,Create Receiver List,స్వీకర్త జాబితా సృష్టించు
 DocType: Vehicle,Wheels,వీల్స్
@@ -1840,10 +1838,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ఉత్పత్తి ఆర్డర్స్ వ్యతిరేకంగా సమయం చిట్టాల యొక్క సృష్టి ఆపివేస్తుంది. ఆపరేషన్స్ ఉత్పత్తి ఉత్తర్వు మీద ట్రాక్ ఉండదు
 DocType: Student,Student Mobile Number,స్టూడెంట్ మొబైల్ నంబర్
 DocType: Item,Has Variants,రకాల్లో
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},మీరు ఇప్పటికే ఎంపిక నుండి అంశాలను రోజులో {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,మంత్లీ పంపిణీ పేరు
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,బ్యాచ్ ID తప్పనిసరి
 DocType: Sales Person,Parent Sales Person,మాతృ సేల్స్ పర్సన్
 DocType: Purchase Invoice,Recurring Invoice,పునరావృత వాయిస్
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,ప్రాజెక్ట్స్ మేనేజింగ్
@@ -1851,11 +1849,11 @@
 DocType: Budget,Fiscal Year,ఆర్థిక సంవత్సరం
 DocType: Vehicle Log,Fuel Price,ఇంధన ధర
 DocType: Budget,Budget,బడ్జెట్
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,స్థిర ఆస్తి అంశం కాని స్టాక్ అంశం ఉండాలి.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",అది ఒక ఆదాయం వ్యయం ఖాతా కాదు బడ్జెట్ వ్యతిరేకంగా {0} కేటాయించిన సాధ్యం కాదు
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ఆర్జిత
 DocType: Student Admission,Application Form Route,అప్లికేషన్ ఫారం రూట్
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,భూభాగం / కస్టమర్
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,భూభాగం / కస్టమర్
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ఉదా 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,టైప్ {0} పే లేకుండా వదిలి ఉంటుంది నుండి కేటాయించబడతాయి కాదు వదిలి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},రో {0}: కేటాయించిన మొత్తాన్ని {1} కంటే తక్కువ ఉండాలి లేదా అసాధారణ మొత్తాన్ని ఇన్వాయిస్ సమానం తప్పనిసరిగా {2}
@@ -1875,14 +1873,14 @@
 ,Serial No Status,సీరియల్ ఏ స్థితి
 DocType: Payment Entry Reference,Outstanding,అసాధారణ
 ,Daily Timesheet Summary,డైలీ TIMESHEET సారాంశం
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",రో {0}: సెట్ చేసేందుకు {1} ఆవర్తకత నుండి మరియు తేదీ \ మధ్య తేడా కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {2}
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,ఈ స్టాక్ ఉద్యమం ఆధారంగా. చూడండి {0} వివరాలకు
 DocType: Pricing Rule,Selling,సెల్లింగ్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},మొత్తం {0} {1} వ్యతిరేకంగా తీసివేయబడుతుంది {2}
 DocType: Employee,Salary Information,జీతం ఇన్ఫర్మేషన్
 DocType: Sales Person,Name and Employee ID,పేరు మరియు Employee ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,గడువు తేదీ తేదీ చేసినది ముందు ఉండరాదు
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,సుంకాలు మరియు పన్నుల
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,సూచన తేదీని ఎంటర్ చేయండి
@@ -1894,14 +1892,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ఈ ఛార్జ్ రకం కోసం ప్రస్తుత వరుస సంఖ్య కంటే ఎక్కువ లేదా సమాన వరుస సంఖ్య చూడండి కాదు
 DocType: Asset,Sold,సోల్డ్
 ,Item-wise Purchase History,అంశం వారీగా కొనుగోలు చరిత్ర
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},సీరియల్ లేవు అంశం కోసం జోడించిన పొందడంలో &#39;రూపొందించండి షెడ్యూల్&#39; పై క్లిక్ చేయండి {0}
 DocType: Account,Frozen,ఘనీభవించిన
 ,Open Production Orders,ఓపెన్ ఉత్పత్తి ఆర్డర్స్
 DocType: Sales Invoice Payment,Base Amount (Company Currency),బేస్ మొత్తం (కంపెనీ కరెన్సీ)
 DocType: Payment Reconciliation Payment,Reference Row,రిఫరెన్స్ రో
 DocType: Installation Note,Installation Time,సంస్థాపన సమయం
 DocType: Sales Invoice,Accounting Details,అకౌంటింగ్ వివరాలు
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ఈ కంపెనీ కోసం అన్ని లావాదేవీలు తొలగించు
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,ఇన్వెస్ట్మెంట్స్
 DocType: Issue,Resolution Details,రిజల్యూషన్ వివరాలు
@@ -1934,14 +1932,14 @@
 DocType: Discussion,Discussion,చర్చా
 DocType: Payment Entry,Transaction ID,లావాదేవి ఐడి
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,ధర నిబంధనలకు మరింత పరిమాణం ఆధారంగా ఫిల్టర్.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ఉద్యోగికి తీసుకొన్న తేదీ సెట్ దయచేసి {0}
 DocType: Task,Total Billing Amount (via Time Sheet),మొత్తం బిల్లింగ్ మొత్తం (సమయం షీట్ ద్వారా)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,తిరిగి కస్టమర్ రెవెన్యూ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) పాత్ర &#39;ఖర్చుల అప్రూవర్గా&#39; కలిగి ఉండాలి
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) పాత్ర &#39;ఖర్చుల అప్రూవర్గా&#39; కలిగి ఉండాలి
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,పెయిర్
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,ఉత్పత్తి కోసం BOM మరియు ప్యాక్ చేసిన అంశాల ఎంచుకోండి
 DocType: Asset,Depreciation Schedule,అరుగుదల షెడ్యూల్
 DocType: Bank Reconciliation Detail,Against Account,ఖాతా వ్యతిరేకంగా
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,హాఫ్ డే తేదీ తేదీ నుండి నేటివరకు మధ్య ఉండాలి
@@ -1955,16 +1953,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},&#39;ఆస్తి అరుగుదల వ్యయ కేంద్రం&#39; కంపెనీవారి సెట్ దయచేసి {0}
 ,Maintenance Schedules,నిర్వహణ షెడ్యూల్స్
 DocType: Task,Actual End Date (via Time Sheet),ముగింపు తేదీ (సమయం షీట్ ద్వారా)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},మొత్తం {0} {1} వ్యతిరేకంగా {2} {3}
 ,Quotation Trends,కొటేషన్ ట్రెండ్లులో
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},అంశం గ్రూప్ అంశం కోసం అంశాన్ని మాస్టర్ ప్రస్తావించలేదు {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,ఖాతాకు డెబిట్ ఒక స్వీకరించదగిన ఖాతా ఉండాలి
 DocType: Shipping Rule Condition,Shipping Amount,షిప్పింగ్ మొత్తం
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,పెండింగ్ మొత్తం
 DocType: Purchase Invoice Item,Conversion Factor,మార్పిడి ఫాక్టర్
 DocType: Purchase Order,Delivered,పంపిణీ
 ,Vehicle Expenses,వాహనం ఖర్చులు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
+DocType: Serial No,Invoice Details,ఇన్వాయిస్ వివరాలు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},వినియోగ జీవితం అయిపోయిన తరువాత ఊహించిన విలువ కంటే ఎక్కువ లేదా సమానంగా ఉండాలి {0}
 DocType: Purchase Receipt,Vehicle Number,వాహనం సంఖ్య
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,పునరావృత ఇన్వాయిస్ ఆపడానికి చేయబడే తేదీ
 DocType: Employee Loan,Loan Amount,అప్పు మొత్తం
@@ -1983,12 +1982,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,ఆర్ సెట్టింగ్స్
 DocType: Salary Slip,net pay info,నికర పే సమాచారం
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ఖర్చు చెప్పడం ఆమోదం లభించవలసి ఉంది. మాత్రమే ఖర్చుల అప్రూవర్గా డేట్ చేయవచ్చు.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ఖర్చు చెప్పడం ఆమోదం లభించవలసి ఉంది. మాత్రమే ఖర్చుల అప్రూవర్గా డేట్ చేయవచ్చు.
 DocType: Email Digest,New Expenses,న్యూ ఖర్చులు
 DocType: Purchase Invoice,Additional Discount Amount,అదనపు డిస్కౌంట్ మొత్తం
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","రో # {0}: ప్యాక్ చేసిన అంశాల 1, అంశం ఒక స్థిర ఆస్తి ఉంది ఉండాలి. దయచేసి బహుళ అంశాల కోసం ప్రత్యేక వరుస ఉపయోగించడానికి."
 DocType: Leave Block List Allow,Leave Block List Allow,బ్లాక్ జాబితా అనుమతించు వదిలి
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr ఖాళీ లేదా ఖాళీ ఉండరాదు
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,కాని గ్రూప్ గ్రూప్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,క్రీడలు
 DocType: Loan Type,Loan Name,లోన్ పేరు
@@ -1999,6 +1998,7 @@
 ,Customer Acquisition and Loyalty,కస్టమర్ అక్విజిషన్ అండ్ లాయల్టీ
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,మీరు తిరస్కరించారు అంశాల స్టాక్ కలిగివున్నాయి గిడ్డంగిలో
 DocType: Production Order,Skip Material Transfer,మెటీరియల్ ట్రాన్స్ఫర్ దాటవేయి
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,మారక రేటు దొరక్కపోతే {0} కు {1} కీ తేదీ కోసం {2}. దయచేసి కరెన్సీ ఎక్స్ఛేంజ్ రికార్డు మానవీయంగా సృష్టించడానికి
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,మీ ఆర్థిక సంవత్సరం ముగుస్తుంది
 DocType: POS Profile,Price List,కొనుగోలు ధర
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} డిఫాల్ట్ ఫిస్కల్ ఇయర్ ఇప్పుడు. మార్పు ప్రభావితం కావడానికి మీ బ్రౌజర్ రిఫ్రెష్ చెయ్యండి.
@@ -2015,19 +2015,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},ఖాతా {0} చెల్లదు. ఖాతా కరెన్సీ ఉండాలి {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UoM మార్పిడి అంశం వరుసగా అవసరం {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ అమ్మకాల ఉత్తర్వు ఒకటి, సేల్స్ వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Salary Component,Deduction,తీసివేత
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,రో {0}: టైమ్ నుండి మరియు సమయం తప్పనిసరి.
 DocType: Stock Reconciliation Item,Amount Difference,మొత్తం తక్షణ
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},అంశం ధర కోసం జోడించిన {0} ధర జాబితా లో {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,ఈ విక్రయాల వ్యక్తి యొక్క ఉద్యోగి ID నమోదు చేయండి
 DocType: Territory,Classification of Customers by region,ప్రాంతం ద్వారా వినియోగదారుడు వర్గీకరణ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,తేడా సొమ్ము సున్నా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,తేడా సొమ్ము సున్నా ఉండాలి
 DocType: Project,Gross Margin,స్థూల సరిహద్దు
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,మొదటి ఉత్పత్తి అంశం నమోదు చేయండి
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,గణించిన బ్యాంక్ స్టేట్మెంట్ సంతులనం
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,వికలాంగ యూజర్
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,కొటేషన్
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,కొటేషన్
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,మొత్తం తీసివేత
 ,Production Analytics,ఉత్పత్తి Analytics
@@ -2036,9 +2036,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},హెచ్చరిక: అటాచ్మెంట్ చెల్లని SSL సర్టిఫికెట్ {0}
 DocType: Student Admission,Eligibility,అర్హత
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","లీడ్స్ మీరు వ్యాపార, అన్ని మీ పరిచయాలను మరియు మరింత మీ లీడ్స్ జోడించడానికి పొందడానికి సహాయంగా"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","లీడ్స్ మీరు వ్యాపార, అన్ని మీ పరిచయాలను మరియు మరింత మీ లీడ్స్ జోడించడానికి పొందడానికి సహాయంగా"
 DocType: Production Order Operation,Actual Operation Time,అసలు ఆపరేషన్ సమయం
 DocType: Authorization Rule,Applicable To (User),వర్తించదగిన (వాడుకరి)
 DocType: Purchase Taxes and Charges,Deduct,తీసివేయు
@@ -2053,7 +2053,7 @@
 DocType: Guardian,Work Address,కార్య చిరునామా
 DocType: Appraisal,Calculate Total Score,మొత్తం స్కోరు లెక్కించు
 DocType: Request for Quotation,Manufacturing Manager,తయారీ మేనేజర్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},సీరియల్ లేవు {0} వరకు వారంటీ కింద {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,ప్యాకేజీలు స్ప్లిట్ డెలివరీ గమనించండి.
 apps/erpnext/erpnext/hooks.py +87,Shipments,ప్యాకేజీల
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ఖాతా సంతులనం ({0}) {1} మరియు స్టాక్ విలువ ({2}) గిడ్డంగి కోసం {3} అదే ఉండాలి
@@ -2076,10 +2076,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,గమనిక: ఇమెయిల్ వికలాంగ వినియోగదారులకు పంపబడదు
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ఇంటరాక్షన్ సంఖ్య
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,ఇంటరాక్షన్ సంఖ్య
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,కంపెనీ ఎంచుకోండి ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,కంపెనీ ఎంచుకోండి ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,అన్ని శాఖల కోసం భావిస్తారు ఉంటే ఖాళీ వదిలి
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","ఉపాధి రకాలు (శాశ్వత, కాంట్రాక్టు ఇంటర్న్ మొదలైనవి)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} అంశం తప్పనిసరి {1}
 DocType: Process Payroll,Fortnightly,పక్ష
 DocType: Currency Exchange,From Currency,కరెన్సీ నుండి
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","కనీసం ఒక వరుసలో కేటాయించిన మొత్తం, వాయిస్ పద్ధతి మరియు వాయిస్ సంఖ్య దయచేసి ఎంచుకోండి"
@@ -2088,14 +2088,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),రేటు (కంపెనీ కరెన్సీ)
 DocType: Student Guardian,Others,ఇతరత్రా
 DocType: Payment Entry,Unallocated Amount,unallocated మొత్తం
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ఒక సరిపోలే అంశం దొరకదు. కోసం {0} కొన్ని ఇతర విలువ దయచేసి ఎంచుకోండి.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,మరింత నవీకరణలు
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,మొదటి వరుసలో కోసం &#39;మునుపటి రో మొత్తం న&#39; &#39;మునుపటి రో మొత్తం మీద&#39; బాధ్యతలు రకం ఎంచుకోండి లేదా కాదు
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,చైల్డ్ అంశం ఉత్పత్తి కట్ట ఉండకూడదు. దయచేసి అంశాన్ని తీసివేసి `{0}` మరియు సేవ్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,బ్యాంకింగ్
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets జోడించండి
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Timesheets జోడించండి
 DocType: Vehicle Service,Service Item,సర్వీస్ అంశం
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
 DocType: Bank Guarantee,Bank Guarantee,బ్యాంకు హామీ
@@ -2121,6 +2121,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},రో # {0}: ఆస్తి {1} ఇప్పటికే ఉంది {2}
 DocType: Quotation Item,Stock Balance,స్టాక్ సంతులనం
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,చెల్లింపు కు అమ్మకాల ఆర్డర్
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} సెటప్&gt; సెట్టింగ్స్ ద్వారా&gt; నామకరణ సిరీస్ నామకరణ సెట్ దయచేసి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,సియిఒ
 DocType: Expense Claim Detail,Expense Claim Detail,ఖర్చు చెప్పడం వివరాలు
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,సరైన ఖాతాను ఎంచుకోండి
@@ -2145,14 +2146,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ధర జాబితా సెట్ చెయ్యకపోతే ధరలు చూపబడవు
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,ఈ షిప్పింగ్ రూల్ ఒక దేశం పేర్కొనండి లేదా ప్రపంచవ్యాప్తం షిప్పింగ్ తనిఖీ చేయండి
 DocType: Stock Entry,Total Incoming Value,మొత్తం ఇన్కమింగ్ విలువ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,డెబిట్ అవసరం ఉంది
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,డెబిట్ అవసరం ఉంది
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets మీ జట్టు చేసిన కృత్యాలు కోసం సమయం, ఖర్చు మరియు బిల్లింగ్ ట్రాక్ సహాయం"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,కొనుగోలు ధర జాబితా
 DocType: Offer Letter Term,Offer Term,ఆఫర్ టర్మ్
 DocType: Quality Inspection,Quality Manager,క్వాలిటీ మేనేజర్
 DocType: Job Applicant,Job Opening,ఉద్యోగ అవకాశాల
 DocType: Payment Reconciliation,Payment Reconciliation,చెల్లింపు సయోధ్య
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,ఏసిపి వ్యక్తి యొక్క పేరు ఎంచుకోండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,ఏసిపి వ్యక్తి యొక్క పేరు ఎంచుకోండి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,టెక్నాలజీ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},మొత్తం చెల్లించని: {0}
 DocType: BOM Website Operation,BOM Website Operation,బిఒఎం వెబ్సైట్ ఆపరేషన్
@@ -2180,23 +2181,23 @@
 DocType: Opportunity,Lost Reason,లాస్ట్ కారణము
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,క్రొత్త చిరునామా
 DocType: Quality Inspection,Sample Size,నమూనా పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,అన్ని అంశాలను ఇప్పటికే ఇన్వాయిస్ చేశారు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,స్వీకరణపై డాక్యుమెంట్ నమోదు చేయండి
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,మరింత ఖర్చు కేంద్రాలు గుంపులు కింద తయారు చేయవచ్చు కానీ ఎంట్రీలు కాని గుంపులు వ్యతిరేకంగా తయారు చేయవచ్చు
 DocType: Project,External,బాహ్య
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,వినియోగదారులు మరియు అనుమతులు
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ఉత్పత్తి ఆర్డర్స్ రూపొందించబడింది: {0}
 DocType: Branch,Branch,బ్రాంచ్
 DocType: Guardian,Mobile Number,మొబైల్ నంబర్
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,ముద్రణ మరియు బ్రాండింగ్
 DocType: Bin,Actual Quantity,వాస్తవ పరిమాణం
 DocType: Shipping Rule,example: Next Day Shipping,ఉదాహరణకు: తదుపరి డే షిప్పింగ్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,దొరకలేదు సీరియల్ లేవు {0}
 DocType: Scheduling Tool,Student Batch,స్టూడెంట్ బ్యాచ్
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,మీ కస్టమర్స్
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,స్టూడెంట్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,స్టూడెంట్ చేయండి
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},మీరు ప్రాజెక్ట్ సహకరించడానికి ఆహ్వానించబడ్డారు: {0}
 DocType: Leave Block List Date,Block Date,బ్లాక్ తేదీ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ఇప్పుడు వర్తించు
@@ -2219,8 +2220,9 @@
 DocType: SMS Log,Sent To,పంపిన
 DocType: Payment Request,Make Sales Invoice,సేల్స్ వాయిస్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,సాఫ్ట్వేర్పై
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,తదుపరి సంప్రదించండి తేదీ గతంలో ఉండకూడదు
 DocType: Company,For Reference Only.,సూచన ఓన్లి.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,బ్యాచ్ ఎంచుకోండి లేవు
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},చెల్లని {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,అడ్వాన్స్ మొత్తం
@@ -2234,7 +2236,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,కేస్ నం 0 ఉండకూడదు
 DocType: Item,Show a slideshow at the top of the page,పేజీ ఎగువన ఒక స్లైడ్ చూపించు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,దుకాణాలు
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,దుకాణాలు
 DocType: Serial No,Delivery Time,డెలివరీ సమయం
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,ఆధారంగా ఏజింగ్
 DocType: Item,End of Life,లైఫ్ ఎండ్
@@ -2246,12 +2248,12 @@
 DocType: Rename Tool,Rename Tool,టూల్ పేరుమార్చు
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,నవీకరణ ఖర్చు
 DocType: Item Reorder,Item Reorder,అంశం క్రమాన్ని మార్చు
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,జీతం షో స్లిప్
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,జీతం షో స్లిప్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,ట్రాన్స్ఫర్ మెటీరియల్
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","కార్యకలాపాలు, నిర్వహణ ఖర్చు పేర్కొనండి మరియు మీ కార్యకలాపాలను ఎలాంటి ఒక ఏకైక ఆపరేషన్ ఇస్తాయి."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,ఈ పత్రం పరిమితి {0} {1} అంశం {4}. మీరు తయారు మరొక {3} అదే వ్యతిరేకంగా {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,గండం పునరావృత సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,మార్పు ఎంచుకోండి మొత్తం ఖాతా
 DocType: Purchase Invoice,Price List Currency,ధర జాబితా కరెన్సీ
 DocType: Naming Series,User must always select,వినియోగదారు ఎల్లప్పుడూ ఎంచుకోవాలి
 DocType: Stock Settings,Allow Negative Stock,ప్రతికూల స్టాక్ అనుమతించు
@@ -2262,7 +2264,7 @@
 DocType: Budget Account,Budget Account,బడ్జెట్ ఖాతా
 DocType: Quality Inspection,Verified By,ద్వారా ధృవీకరించబడిన
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","ఇప్పటికే లావాదేవీలు ఉన్నాయి ఎందుకంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ మార్చలేరు. ట్రాన్సాక్షన్స్ డిఫాల్ట్ కరెన్సీ మార్చడానికి రద్దు చేయాలి."
-DocType: Grade Interval,Grade Description,గ్రేడ్ వివరణ
+DocType: Grading Scale Interval,Grade Description,గ్రేడ్ వివరణ
 DocType: Stock Entry,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,వేతనం స్లిప్ సృష్టించు
@@ -2300,7 +2302,7 @@
 DocType: Upload Attendance,Attendance To Date,తేదీ హాజరు
 DocType: Warranty Claim,Raised By,లేవనెత్తారు
 DocType: Payment Gateway Account,Payment Account,చెల్లింపు ఖాతా
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,కొనసాగాలని కంపెనీ రాయండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,స్వీకరించదగిన ఖాతాలు నికర మార్పును
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,పరిహార ఆఫ్
 DocType: Offer Letter,Accepted,Accepted
@@ -2310,12 +2312,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,మీరు నిజంగా ఈ సంస్థ కోసం అన్ని లావాదేవీలు తొలగించాలనుకుంటున్నారా నిర్ధారించుకోండి. ఇది వంటి మీ మాస్టర్ డేటా అలాగే ఉంటుంది. ఈ చర్య రద్దు సాధ్యం కాదు.
 DocType: Room,Room Number,గది సంఖ్య
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},చెల్లని సూచన {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ప్రణాళిక quanitity కంటే ఎక్కువ ఉండకూడదు ({2}) ఉత్పత్తి ఆర్డర్ {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ప్రణాళిక quanitity కంటే ఎక్కువ ఉండకూడదు ({2}) ఉత్పత్తి ఆర్డర్ {3}
 DocType: Shipping Rule,Shipping Rule Label,షిప్పింగ్ రూల్ లేబుల్
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,వాడుకరి ఫోరం
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,రా మెటీరియల్స్ ఖాళీ ఉండకూడదు.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","స్టాక్ అప్డేట్ కాలేదు, ఇన్వాయిస్ డ్రాప్ షిప్పింగ్ అంశం కలిగి."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,త్వరిత జర్నల్ ఎంట్రీ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,బిఒఎం ఏ అంశం agianst పేర్కొన్నారు ఉంటే మీరు రేటు మార్చలేరు
 DocType: Employee,Previous Work Experience,మునుపటి పని అనుభవం
 DocType: Stock Entry,For Quantity,పరిమాణం
@@ -2328,7 +2330,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,నిబంధనలు మరియు Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ఇన్స్టిట్యూట్ యొక్క పేరు ఇది కోసం మీరు ఈ వ్యవస్థ ఏర్పాటు చేస్తారు.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",ఈ తేదీ వరకు స్తంభింప అకౌంటింగ్ ఎంట్రీ ఎవరూ / అలా క్రింద పేర్కొన్న పాత్ర తప్ప ఎంట్రీ సవరించవచ్చు.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,నిర్వహణ షెడ్యూల్ రూపొందించడానికి ముందు పత్రం సేవ్ దయచేసి
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,ప్రాజెక్టు హోదా
 DocType: UOM,Check this to disallow fractions. (for Nos),భిన్నాలు నిరాకరించేందుకు ఈ తనిఖీ. (NOS కోసం)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,క్రింది ఉత్పత్తి ఆర్డర్స్ ఏర్పరచారు:
@@ -2355,7 +2357,7 @@
 ,Employees working on a holiday,ఒక సెలవు ఉద్యోగులు
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,మార్క్ ప్రెజెంట్
 DocType: Project,% Complete Method,% పూర్తి విధానం
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},నిర్వహణ ప్రారంభ తేదీ సీరియల్ నో డెలివరీ తేదీ ముందు ఉండరాదు {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},నిర్వహణ ప్రారంభ తేదీ సీరియల్ నో డెలివరీ తేదీ ముందు ఉండరాదు {0}
 DocType: Production Order,Actual End Date,వాస్తవిక ముగింపు తేదీ
 DocType: BOM,Operating Cost (Company Currency),ఆపరేటింగ్ వ్యయం (కంపెనీ కరెన్సీ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2372,7 +2374,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,పే లేకుండా వదిలి లేదు ఆమోదం అప్లికేషన్ లీవ్ రికార్డులు సరిపోలడం లేదు
 DocType: Campaign,Campaign-.####,ప్రచారం -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,తదుపరి దశలు
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,ఉత్తమమైన రేట్లు వద్ద పేర్కొన్న అంశాలను అందించండి
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 రోజుల తర్వాత ఆటో దగ్గరగా అవకాశం
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ముగింపు సంవత్సరం
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,QUOT / లీడ్%
@@ -2409,7 +2411,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd పరిమాణం
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ఫీజు రికార్డ్స్ రూపొందించబడింది - {0}
 DocType: Asset Category Account,Asset Category Account,ఆస్తి వర్గం ఖాతా
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},అమ్మకాల ఆర్డర్ పరిమాణం కంటే ఎక్కువ అంశం {0} ఉత్పత్తి కాదు {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,స్టాక్ ఎంట్రీ {0} సమర్పించిన లేదు
 DocType: Payment Reconciliation,Bank / Cash Account,బ్యాంకు / క్యాష్ ఖాతా
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,తదుపరి సంప్రదించండి ద్వారా లీడ్ ఇమెయిల్ అడ్రస్ అదే ఉండకూడదు
@@ -2431,7 +2433,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,క్లియరెన్స్ తేదీ ప్రస్తావించలేదు
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,ఉత్పత్తి
 DocType: Guardian,Occupation,వృత్తి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,రో {0}: ప్రారంభ తేదీ ముగింపు తేదీ ముందు ఉండాలి
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),మొత్తం () ప్యాక్ చేసిన అంశాల
 DocType: Sales Invoice,This Document,ఈ డాక్యుమెంట్
 DocType: Installation Note Item,Installed Qty,ఇన్స్టాల్ ప్యాక్ చేసిన అంశాల
@@ -2447,15 +2450,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ఒక సమస్యను నివేదించండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,యుటిలిటీ ఖర్చులు
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ఉపరితలం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,రో # {0}: జర్నల్ ఎంట్రీ {1} లేదు ఖాతా లేదు {2} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,రో # {0}: జర్నల్ ఎంట్రీ {1} లేదు ఖాతా లేదు {2} లేదా ఇప్పటికే మరొక రసీదును జతచేసేందుకు
 DocType: Buying Settings,Default Buying Price List,డిఫాల్ట్ కొనుగోలు ధర జాబితా
 DocType: Process Payroll,Salary Slip Based on Timesheet,జీతం స్లిప్ TIMESHEET ఆధారంగా
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,పైన ఎంచుకున్న విధానం లేదా జీతం స్లిప్ కోసం ఏ ఉద్యోగి ఇప్పటికే రూపొందించినవారు
 DocType: Notification Control,Sales Order Message,అమ్మకాల ఆర్డర్ సందేశం
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","మొదలైనవి కంపెనీ, కరెన్సీ, ప్రస్తుత ఆర్థిక సంవత్సరంలో వంటి సెట్ డిఫాల్ట్ విలువలు"
 DocType: Payment Entry,Payment Type,చెల్లింపు పద్ధతి
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,దయచేసి అంశం కోసం ఒక బ్యాచ్ ఎంచుకోండి {0}. ఈ అవసరాన్ని తీర్చగల ఒకే బ్యాచ్ దొరక్కపోతే
 DocType: Process Payroll,Select Employees,Select ఉద్యోగులు
 DocType: Opportunity,Potential Sales Deal,సంభావ్య సేల్స్ డీల్
 DocType: Payment Entry,Cheque/Reference Date,ప్రిపే / ప్రస్తావన తేదీ
@@ -2472,7 +2475,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},ఇప్పటికే కంపెనీ కోసం సృష్టించబడింది గ్లోబల్ POS ప్రొఫైల్ {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,అన్ని BOMs లో అంశం / BOM పునఃస్థాపించుము
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,స్వీకరణపై పత్రం సమర్పించాలి
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,స్వీకరణపై పత్రం సమర్పించాలి
 DocType: Purchase Invoice Item,Received Qty,స్వీకరించిన ప్యాక్ చేసిన అంశాల
 DocType: Stock Entry Detail,Serial No / Batch,సీరియల్ లేవు / బ్యాచ్
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,చెల్లించిన మరియు పంపిణీ లేదు
@@ -2481,11 +2484,11 @@
 DocType: Delivery Note,DN-RET-,డిఎన్-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ఏ సమయంలో షీట్లు
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} క్యారీ-ఫార్వార్డ్ కాదు టైప్ వదిలి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',నిర్వహణ షెడ్యూల్ అన్ని అంశాలను ఉత్పత్తి లేదు. &#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 ,To Produce,ఉత్పత్తి
 apps/erpnext/erpnext/config/hr.py +93,Payroll,పేరోల్
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","వరుస కోసం {0} లో {1}. అంశం రేటు {2} చేర్చడానికి, వరుసలు {3} కూడా చేర్చారు తప్పక"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,వాడుకరి చేయండి
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,వాడుకరి చేయండి
 DocType: Packing Slip,Identification of the package for the delivery (for print),డెలివరీ కోసం ప్యాకేజీ గుర్తింపు (ముద్రణ కోసం)
 DocType: Bin,Reserved Quantity,రిసర్వ్డ్ పరిమాణం
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,చెల్లుబాటు అయ్యే ఇమెయిల్ చిరునామాను నమోదు చేయండి
@@ -2498,15 +2501,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,వికలాంగుల టెంప్లేట్ డిఫాల్ట్ టెంప్లేట్ ఉండకూడదు
 DocType: Account,Income Account,ఆదాయపు ఖాతా
 DocType: Payment Request,Amount in customer's currency,కస్టమర్ యొక్క కరెన్సీ లో మొత్తం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,డెలివరీ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,డెలివరీ
 DocType: Stock Reconciliation Item,Current Qty,ప్రస్తుత ప్యాక్ చేసిన అంశాల
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",చూడండి వ్యయంతో విభాగం లో &quot;Materials బేస్డ్ న రేటు&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,మునుపటి
 DocType: Appraisal Goal,Key Responsibility Area,కీ బాధ్యత ఏరియా
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","స్టూడెంట్ ఇస్తున్న మీరు విద్యార్థులకు హాజరు, లెక్కింపులు మరియు ఫీజు ట్రాక్ సహాయం"
 DocType: Payment Entry,Total Allocated Amount,మొత్తం కేటాయించిన సొమ్ము
 DocType: Item Reorder,Material Request Type,మెటీరియల్ అభ్యర్థన పద్ధతి
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},నుండి {0} కు వేతనాల కోసం Accural జర్నల్ ఎంట్రీ {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage పూర్తి, సేవ్ లేదు"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage పూర్తి, సేవ్ లేదు"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,రో {0}: UoM మార్పిడి ఫాక్టర్ తప్పనిసరి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 DocType: Budget,Cost Center,వ్యయ కేంద్రం
@@ -2516,16 +2520,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,సేల్స్ లావాదేవీలు నుండి కస్టమర్ యొక్క పన్ను ఐడి దాచు
 DocType: Upload Attendance,Upload HTML,అప్లోడ్ HTML
 DocType: Employee,Relieving Date,ఉపశమనం తేదీ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ధర నియమం కొన్ని ప్రమాణాల ఆధారంగా, / ధర జాబితా తిరిగి రాస్తుంది డిస్కౌంట్ శాతం నిర్వచించడానికి తయారు చేస్తారు."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","ధర నియమం కొన్ని ప్రమాణాల ఆధారంగా, / ధర జాబితా తిరిగి రాస్తుంది డిస్కౌంట్ శాతం నిర్వచించడానికి తయారు చేస్తారు."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,వేర్హౌస్ మాత్రమే స్టాక్ ఎంట్రీ ద్వారా మార్చవచ్చు / డెలివరీ గమనిక / కొనుగోలు రసీదులు
 DocType: Employee Education,Class / Percentage,క్లాస్ / శాతం
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,మార్కెటింగ్ మరియు సేల్స్ హెడ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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; కోసం చేసిన ఉంటే, అది ధర జాబితా తిరిగి రాస్తుంది. ధర రూల్ ధర తుది ధర ఇది, కాబట్టి ఎటువంటి తగ్గింపు పూయాలి. అందుకే, etc అమ్మకాల ఉత్తర్వు, పర్చేజ్ ఆర్డర్ వంటి లావాదేవీలు, అది కాకుండా &#39;ధర జాబితా రేటు&#39; రంగంగా కాకుండా, &#39;రేటు&#39; ఫీల్డ్లో సందేశం పొందబడుతుంది."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","ఎంపిక ధర రూల్ &#39;ధర&#39; కోసం చేసిన ఉంటే, అది ధర జాబితా తిరిగి రాస్తుంది. ధర రూల్ ధర తుది ధర ఇది, కాబట్టి ఎటువంటి తగ్గింపు పూయాలి. అందుకే, etc అమ్మకాల ఉత్తర్వు, పర్చేజ్ ఆర్డర్ వంటి లావాదేవీలు, అది కాకుండా &#39;ధర జాబితా రేటు&#39; రంగంగా కాకుండా, &#39;రేటు&#39; ఫీల్డ్లో సందేశం పొందబడుతుంది."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ట్రాక్ పరిశ్రమ రకం ద్వారా నడిపించును.
 DocType: Item Supplier,Item Supplier,అంశం సరఫరాదారు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,బ్యాచ్ ఏ పొందడానికి అంశం కోడ్ను నమోదు చేయండి
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to కోసం ఒక విలువను ఎంచుకోండి దయచేసి {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,అన్ని చిరునామాలు.
 DocType: Company,Stock Settings,స్టాక్ సెట్టింగ్స్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","క్రింది రెండు లక్షణాలతో రికార్డులలో అదే ఉంటే విలీనం మాత్రమే సాధ్యమవుతుంది. గ్రూప్ రూట్ రకం, కంపెనీ"
@@ -2535,6 +2539,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',హోదాతో ఉద్యోగులకు ఈవెంట్ గురించి ఒక ఇమెయిల్ పంపుతుంది &#39;ఓపెన్&#39;
 DocType: Task,Depends on Tasks,విధులు ఆధారపడి
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,కస్టమర్ గ్రూప్ ట్రీ నిర్వహించండి.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,జోడింపులను షాపింగ్ కార్ట్ చేతనము చేయకుండా చూడవచ్చు
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,కొత్త ఖర్చు సెంటర్ పేరు
 DocType: Leave Control Panel,Leave Control Panel,కంట్రోల్ ప్యానెల్ వదిలి
@@ -2547,11 +2552,10 @@
 DocType: Sales Invoice,Debit To,డెబిట్
 DocType: Delivery Note,Required only for sample item.,నమూనా మాత్రమే అంశం కోసం అవసరం.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,లావాదేవీ తరువాత వాస్తవంగా ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,సరఫరాదారు&gt; సరఫరాదారు టైప్
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},తోబుట్టువుల జీతం స్లిప్ మధ్య దొరకలేదు {0} మరియు {1}
 ,Pending SO Items For Purchase Request,కొనుగోలు అభ్యర్థన SO పెండింగ్లో ఉన్న అంశాలు
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,స్టూడెంట్ అడ్మిషన్స్
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} నిలిపివేయబడింది
 DocType: Supplier,Billing Currency,బిల్లింగ్ కరెన్సీ
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ఎక్స్ ట్రా లార్జ్
@@ -2568,9 +2572,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,హోమ్పేజీ ఫీచర్ ఉత్పత్తి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,అన్ని అసెస్మెంట్ గుంపులు
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,న్యూ వేర్హౌస్ పేరు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),మొత్తం {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),మొత్తం {0} ({1})
 DocType: C-Form Invoice Detail,Territory,భూభాగం
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,అవసరం సందర్శనల సంఖ్య చెప్పలేదు దయచేసి
 DocType: Stock Settings,Default Valuation Method,డిఫాల్ట్ లెక్కింపు విధానం
 DocType: Vehicle Log,Fuel Qty,ఇంధన ప్యాక్ చేసిన అంశాల
 DocType: Production Order Operation,Planned Start Time,అనుకున్న ప్రారంభ సమయం
@@ -2586,7 +2590,7 @@
 DocType: Price List,Price List Master,ధర జాబితా మాస్టర్
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,మీరు సెట్ మరియు లక్ష్యాలు మానిటర్ విధంగా అన్ని సేల్స్ లావాదేవీలు బహుళ ** సేల్స్ పర్సన్స్ ** వ్యతిరేకంగా ట్యాగ్ చేయవచ్చు.
 ,S.O. No.,SO నం
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},లీడ్ నుండి కస్టమర్ సృష్టించడానికి దయచేసి {0}
 DocType: Price List,Applicable for Countries,దేశాలు వర్తించే
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,మాత్రమే స్థితి కూడిన దరఖాస్తులను లీవ్ &#39;ఆమోదించబడింది&#39; మరియు &#39;&#39; తిరస్కరించింది సమర్పించిన చేయవచ్చు
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},స్టూడెంట్ గ్రూప్ పేరు వరుసగా తప్పనిసరి {0}
@@ -2617,7 +2621,7 @@
 DocType: Project,Copied From,నుండి కాపీ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},దోషం: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,కొరత
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} సంబంధం లేదు {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} సంబంధం లేదు {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ఉద్యోగి {0} కోసం హాజరు ఇప్పటికే గుర్తించబడింది
 DocType: Packing Slip,If more than one package of the same type (for print),ఉంటే ఒకే రకమైన ఒకటి కంటే ఎక్కువ ప్యాకేజీ (ముద్రణ కోసం)
 ,Salary Register,జీతం నమోదు
@@ -2636,7 +2640,7 @@
 DocType: Tax Rule,Use for Shopping Cart,షాపింగ్ కార్ట్ ఉపయోగించండి
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},విలువ {0} లక్షణం కోసం {1} లేదు చెల్లదు అంశం జాబితాలో ఉనికిలో అంశం లక్షణం విలువలు {2}
 DocType: BOM Item,Scrap %,స్క్రాప్%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ఆరోపణలు ఎంత మీ ఎంపిక ప్రకారం, అంశం అంశాల లేదా మొత్తం ఆధారంగా పంపిణీ చేయబడుతుంది"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","ఆరోపణలు ఎంత మీ ఎంపిక ప్రకారం, అంశం అంశాల లేదా మొత్తం ఆధారంగా పంపిణీ చేయబడుతుంది"
 DocType: Maintenance Visit,Purposes,ప్రయోజనాల
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,కనీసం ఒక అంశం తిరిగి పత్రంలో ప్రతికూల పరిమాణం తో నమోదు చేయాలి
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","ఆపరేషన్ {0} వర్క్స్టేషన్ ఏ అందుబాటులో పని గంటల కంటే ఎక్కువ {1}, బహుళ కార్యకలాపాలు లోకి ఆపరేషన్ విచ్ఛిన్నం"
@@ -2657,16 +2661,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,భూభాగం ట్రీ నిర్వహించండి.
 DocType: Journal Entry Account,Sales Invoice,సేల్స్ వాయిస్
 DocType: Journal Entry Account,Party Balance,పార్టీ సంతులనం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,డిస్కౌంట్ న వర్తించు దయచేసి ఎంచుకోండి
 DocType: Company,Default Receivable Account,డిఫాల్ట్ స్వీకరించదగిన ఖాతా
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,పైన ఎంచుకున్న ప్రమాణం కోసం చెల్లించే మొత్తం జీతం కోసం బ్యాంక్ ఎంట్రీ సృష్టించు
 DocType: Stock Entry,Material Transfer for Manufacture,తయారీ కోసం మెటీరియల్ ట్రాన్స్ఫర్
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,డిస్కౌంట్ శాతం ఒక ధర జాబితా వ్యతిరేకంగా లేదా అన్ని ధర జాబితా కోసం గాని అన్వయించవచ్చు.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,డిస్కౌంట్ శాతం ఒక ధర జాబితా వ్యతిరేకంగా లేదా అన్ని ధర జాబితా కోసం గాని అన్వయించవచ్చు.
 DocType: Purchase Invoice,Half-yearly,సగం వార్షిక
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,స్టాక్ కోసం అకౌంటింగ్ ఎంట్రీ
 DocType: Vehicle Service,Engine Oil,ఇంజన్ ఆయిల్
 DocType: Sales Invoice,Sales Team1,సేల్స్ team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,అంశం {0} ఉనికిలో లేదు
 DocType: Sales Invoice,Customer Address,కస్టమర్ చిరునామా
 DocType: Employee Loan,Loan Details,లోన్ వివరాలు
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,రో {0}: పూర్తి ప్యాక్ చేసిన అంశాల సున్నా కంటే ఎక్కువ ఉండాలి.
@@ -2674,24 +2678,24 @@
 DocType: Account,Root Type,రూట్ రకం
 DocType: Item,FIFO,ఎఫ్ఐఎఫ్ఓ
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},రో # {0}: కంటే తిరిగి కాంట్ {1} అంశం కోసం {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,ప్లాట్
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},టార్గెట్ గిడ్డంగి వరుసగా తప్పనిసరి {0}
 DocType: Cheque Print Template,Primary Settings,ప్రాథమిక సెట్టింగులు
 DocType: Purchase Invoice,Select Supplier Address,సరఫరాదారు అడ్రస్ ఎంచుకోండి
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ఉద్యోగులను జోడించు
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ఉద్యోగులను జోడించు
 DocType: Purchase Invoice Item,Quality Inspection,నాణ్యత తనిఖీ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,అదనపు చిన్న
 DocType: Company,Standard Template,ప్రామాణిక మూస
 DocType: Training Event,Theory,థియరీ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,హెచ్చరిక: Qty అభ్యర్థించిన మెటీరియల్ కనీస ఆర్డర్ ప్యాక్ చేసిన అంశాల కంటే తక్కువ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,ఖాతా {0} ఘనీభవించిన
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,సంస్థ చెందిన ఖాతాల ప్రత్యేక చార్ట్ తో లీగల్ సంస్థ / అనుబంధ.
 DocType: Payment Request,Mute Email,మ్యూట్ ఇమెయిల్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","ఫుడ్, బేవరేజ్ పొగాకు"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},మాత్రమే వ్యతిరేకంగా చెల్లింపు చేయవచ్చు unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,కమిషన్ రేటు కంటే ఎక్కువ 100 ఉండకూడదు
 DocType: Stock Entry,Subcontract,Subcontract
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,ముందుగా {0} నమోదు చేయండి
@@ -2730,7 +2734,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,ఉన్న లావాదేవీతో గిడ్డంగులు సమూహం మార్చబడతాయి కాదు.
 DocType: Assessment Result Tool,Result HTML,ఫలితం HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,గడువు ముగిసేది
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,స్టూడెంట్స్ జోడించండి
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,స్టూడెంట్స్ జోడించండి
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},దయచేసి ఎంచుకోండి {0}
 DocType: C-Form,C-Form No,సి ఫారం లేవు
 DocType: BOM,Exploded_items,Exploded_items
@@ -2772,7 +2776,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,ఆంట్
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,ఫిస్కల్ ఇయర్ ఎంచుకోండి
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,క్రమాన్ని మార్చు స్థాయి
 DocType: Company,Chart Of Accounts Template,అకౌంట్స్ మూస చార్ట్
 DocType: Attendance,Attendance Date,హాజరు తేదీ
@@ -2787,14 +2791,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,నకిలీ ఎంట్రీ
 DocType: Program Enrollment Tool,Get Students,స్టూడెంట్స్ పొందండి
 DocType: Serial No,Under Warranty,వారంటీ కింద
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[లోపం]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[లోపం]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,మీరు అమ్మకాల ఉత్తర్వు సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 ,Employee Birthday,Employee పుట్టినరోజు
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,స్టూడెంట్ బ్యాచ్ హాజరు టూల్
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,పరిమితి దాటి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,వెంచర్ కాపిటల్
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ఈ &#39;విద్యా సంవత్సరం&#39; ఒక విద్యాపరమైన పదం {0} మరియు &#39;టర్మ్ పేరు&#39; {1} ఇప్పటికే ఉంది. ఈ ప్రవేశాలు మార్చి మళ్ళీ ప్రయత్నించండి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","అంశం {0} వ్యతిరేకంగా ఇప్పటికే లావాదేవీలు ఉన్నాయి, మీరు విలువ మార్చలేరు {1}"
 DocType: UOM,Must be Whole Number,మొత్తం సంఖ్య ఉండాలి
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(రోజుల్లో) కేటాయించిన కొత్త ఆకులు
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,సీరియల్ లేవు {0} ఉనికిలో లేదు
@@ -2814,7 +2818,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,పదార్థాల% ఈ అమ్మకాల ఆర్డర్ వ్యతిరేకంగా బిల్
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,కాలం ముగింపు ఎంట్రీ
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ సమూహం మార్చబడతాయి కాదు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},మొత్తం {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},మొత్తం {0} {1} {2} {3}
 DocType: Account,Depreciation,అరుగుదల
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),సరఫరాదారు (లు)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ఉద్యోగి హాజరు టూల్
@@ -2837,7 +2841,7 @@
 DocType: Supplier,Last Day of the Next Month,వచ్చే నెల చివరి డే
 DocType: Support Settings,Auto close Issue after 7 days,7 రోజుల తరువాత ఆటో దగ్గరగా ఇష్యూ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","ముందు కేటాయించబడతాయి కాదు వదిలేయండి {0}, సెలవు సంతులనం ఇప్పటికే క్యారీ-ఫార్వార్డ్ భవిష్యత్తులో సెలవు కేటాయింపు రికార్డు ఉన్నాడు, {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),గమనిక: కారణంగా / సూచన తేదీ {0} రోజు ద్వారా అనుమతి కస్టమర్ క్రెడిట్ రోజుల మించి (లు)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,స్టూడెంట్ దరఖాస్తుదారు
 DocType: Asset Category Account,Accumulated Depreciation Account,పోగుచేసిన తరుగుదల ఖాతా
 DocType: Stock Settings,Freeze Stock Entries,ఫ్రీజ్ స్టాక్ ఎంట్రీలు
@@ -2848,7 +2852,7 @@
 ,Stock Analytics,స్టాక్ Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,ఆపరేషన్స్ ఖాళీగా కాదు
 DocType: Maintenance Visit Purpose,Against Document Detail No,డాక్యుమెంట్ వివరాలు వ్యతిరేకంగా ఏ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,పార్టీ టైప్ తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,పార్టీ టైప్ తప్పనిసరి
 DocType: Quality Inspection,Outgoing,అవుట్గోయింగ్
 DocType: Material Request,Requested For,కోసం అభ్యర్థించిన
 DocType: Quotation Item,Against Doctype,Doctype వ్యతిరేకంగా
@@ -2865,10 +2869,10 @@
 DocType: Asset,Item Code,Item కోడ్
 DocType: Production Planning Tool,Create Production Orders,ఉత్పత్తి ఆర్డర్స్ సృష్టించు
 DocType: Serial No,Warranty / AMC Details,వారంటీ / AMC వివరాలు
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,కార్యాచరణ ఆధారంగా గ్రూప్ కోసం మానవీయంగా విద్యార్థులు ఎంచుకోండి
 DocType: Journal Entry,User Remark,వాడుకరి వ్యాఖ్య
 DocType: Lead,Market Segment,మార్కెట్ విభాగానికీ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},మొత్తం చెల్లించారు మొత్తం ప్రతికూల అసాధారణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Employee అంతర్గత వర్క్ చరిత్ర
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),మూసివేయడం (డాక్టర్)
 DocType: Cheque Print Template,Cheque Size,ప్రిపే సైజు
@@ -2883,7 +2887,7 @@
 DocType: Production Planning Tool,Create Material Requests,మెటీరియల్ అభ్యర్థనలు సృష్టించు
 DocType: Employee Education,School/University,స్కూల్ / విశ్వవిద్యాలయం
 DocType: Payment Request,Reference Details,రిఫరెన్స్ వివరాలు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ఆశిస్తున్న విలువ ఉపయోగకరమైన లైఫ్ తరువాత స్థూల కొనుగోలు మొత్తం కంటే తక్కువ ఉండాలి
 DocType: Sales Invoice Item,Available Qty at Warehouse,Warehouse వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,బిల్ మొత్తం
 DocType: Asset,Double Declining Balance,డబుల్ తగ్గుతున్న సంతులనం
@@ -2904,20 +2908,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","ఈ స్టాక్ సయోధ్య ఒక ప్రారంభ ఎంట్రీ నుండి తేడా ఖాతా, ఒక ఆస్తి / బాధ్యత రకం ఖాతా ఉండాలి"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},పంపించబడతాయి మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},అంశం అవసరం ఆర్డర్ సంఖ్య కొనుగోలు {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ఉత్పత్తి ఆర్డర్ సృష్టించలేదు
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;తేదీ నుండి&#39; తర్వాత &#39;తేదీ&#39; ఉండాలి
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},విద్యార్థిగా స్థితిని మార్చలేరు {0} విద్యార్ధి అప్లికేషన్ ముడిపడి ఉంటుంది {1}
 DocType: Asset,Fully Depreciated,పూర్తిగా విలువ తగ్గుతున్న
 ,Stock Projected Qty,స్టాక్ ప్యాక్ చేసిన అంశాల ప్రొజెక్టెడ్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},చెందదు {0} కస్టమర్ ప్రొజెక్ట్ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,గుర్తించ హాజరు HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","సుభాషితాలు, ప్రతిపాదనలు ఉన్నాయి మీరు మీ వినియోగదారులకు పంపారు వేలం"
 DocType: Sales Order,Customer's Purchase Order,కస్టమర్ యొక్క కొనుగోలు ఆర్డర్
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,సీరియల్ లేవు మరియు బ్యాచ్
 DocType: Warranty Claim,From Company,కంపెనీ నుండి
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,అంచనా ప్రమాణం స్కోర్లు మొత్తం {0} ఉండాలి.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,దయచేసి Depreciations సంఖ్య బుక్ సెట్
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,విలువ లేదా ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,ప్రొడక్షన్స్ ఆర్డర్స్ పెంచుతాడు సాధ్యం కాదు:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,నిమిషం
 DocType: Purchase Invoice,Purchase Taxes and Charges,పన్నులు మరియు ఆరోపణలు కొనుగోలు
@@ -2929,7 +2933,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,అన్ని గిడ్డంగులు
 DocType: Sales Partner,Retailer,రీటైలర్
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,ఖాతాకు క్రెడిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,అన్ని సరఫరాదారు రకాలు
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,అన్ని సరఫరాదారు రకాలు
 DocType: Global Defaults,Disable In Words,వర్డ్స్ ఆపివేయి
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,వస్తువు దానంతటదే లెక్కించబడ్డాయి లేదు ఎందుకంటే Item కోడ్ తప్పనిసరి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},కొటేషన్ {0} కాదు రకం {1}
@@ -2938,6 +2942,7 @@
 DocType: Production Order,PRO-,ప్రో-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,బ్యాంక్ ఓవర్డ్రాఫ్ట్ ఖాతా
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,వేతనం స్లిప్ చేయండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,రో # {0}: కేటాయించిన సొమ్ము బాకీ మొత్తం కంటే ఎక్కువ ఉండకూడదు.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,బ్రౌజ్ BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,సెక్యూర్డ్ లోన్స్
 DocType: Purchase Invoice,Edit Posting Date and Time,పోస్ట్ చేసిన తేదీ మరియు సమయం మార్చు
@@ -2977,7 +2982,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},లేదు కంటే పాత స్టాక్ లావాదేవీలు అప్డేట్ అనుమతి {0}
 DocType: Purchase Invoice Item,PR Detail,పిఆర్ వివరాలు
 DocType: Sales Order,Fully Billed,పూర్తిగా కస్టమర్లకు
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ఉద్యోగి లో డిఫాల్ట్ చెల్లించవలసిన ఖాతా సెట్ దయచేసి {0}
 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 +127,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),ప్యాకేజీ యొక్క స్థూల బరువు. సాధారణంగా నికర బరువు + ప్యాకేజింగ్ పదార్థం బరువు. (ముద్రణ కోసం)
@@ -2987,7 +2991,7 @@
 DocType: Student Group,Group Based On,గ్రూప్ బేస్డ్ న
 DocType: Journal Entry,Bill Date,బిల్ తేదీ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","సర్వీస్ అంశం, పద్ధతి, ఫ్రీక్వెన్సీ మరియు ఖర్చు మొత్తాన్ని అవసరం"
-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:","అధిక ప్రాధాన్యతతో బహుళ ధర రూల్స్ ఉన్నాయి ఒకవేళ, అప్పుడు క్రింది అంతర్గత ప్రాధాన్యతలను అమలవుతాయి:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","అధిక ప్రాధాన్యతతో బహుళ ధర రూల్స్ ఉన్నాయి ఒకవేళ, అప్పుడు క్రింది అంతర్గత ప్రాధాన్యతలను అమలవుతాయి:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},మీరు నిజంగా నుండి {0} అన్ని వేతనం స్లిప్ సమర్పించండి అనుకుంటున్నారా {1}
 DocType: Cheque Print Template,Cheque Height,ప్రిపే ఎత్తు
 DocType: Supplier,Supplier Details,సరఫరాదారు వివరాలు
@@ -2999,7 +3003,7 @@
 DocType: Vehicle Log,Invoice Ref,వాయిస్ Ref
 DocType: Purchase Order,Recurring Order,పునరావృత ఆర్డర్
 DocType: Company,Default Income Account,డిఫాల్ట్ ఆదాయం ఖాతా
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,కస్టమర్ గ్రూప్ / కస్టమర్
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,కస్టమర్ గ్రూప్ / కస్టమర్
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),మూసివేయని ఫిస్కల్ సంవత్సరాల లాభం / నష్టం (క్రెడిట్)
 DocType: Sales Invoice,Time Sheets,షీట్లుగా
 DocType: Payment Gateway Account,Default Payment Request Message,డిఫాల్ట్ చెల్లింపు అభ్యర్థన సందేశం
@@ -3019,10 +3023,10 @@
 DocType: Notification Control,Quotation Message,కొటేషన్ సందేశం
 DocType: Employee Loan,Employee Loan Application,ఉద్యోగి లోన్ అప్లికేషన్
 DocType: Issue,Opening Date,ప్రారంభ తేదీ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,హాజరు విజయవంతంగా మార్క్ చెయ్యబడింది.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,హాజరు విజయవంతంగా మార్క్ చెయ్యబడింది.
 DocType: Journal Entry,Remark,వ్యాఖ్యలపై
 DocType: Purchase Receipt Item,Rate and Amount,రేటు మరియు పరిమాణం
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ఖాతా రకం కోసం {0} ఉండాలి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ఖాతా రకం కోసం {0} ఉండాలి {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ఆకులు మరియు హాలిడే
 DocType: School Settings,Current Academic Term,ప్రస్తుత విద్యా టర్మ్
 DocType: Sales Order,Not Billed,బిల్ చేయబడలేదు
@@ -3044,7 +3048,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,స్టూడెంట్ గ్రూప్
 DocType: Shopping Cart Settings,Quotation Series,కొటేషన్ సిరీస్
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","ఒక అంశం అదే పేరుతో ({0}), అంశం గుంపు పేరు మార్చడానికి లేదా అంశం పేరు దయచేసి"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,దయచేసి కస్టమర్ ఎంచుకోండి
 DocType: C-Form,I,నేను
 DocType: Company,Asset Depreciation Cost Center,ఆస్తి అరుగుదల వ్యయ కేంద్రం
 DocType: Sales Order Item,Sales Order Date,సేల్స్ ఆర్డర్ తేదీ
@@ -3063,20 +3067,20 @@
 DocType: Vehicle,Insurance Details,భీమా వివరాలు
 DocType: Account,Payable,చెల్లించవలసిన
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,తిరిగి చెల్లించే కాలాలు నమోదు చేయండి
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),రుణగ్రస్తులు ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),రుణగ్రస్తులు ({0})
 DocType: Pricing Rule,Margin,మార్జిన్
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,కొత్త వినియోగదారులు
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,స్థూల లాభం%
 DocType: Appraisal Goal,Weightage (%),వెయిటేజీ (%)
 DocType: Bank Reconciliation Detail,Clearance Date,క్లియరెన్స్ తేదీ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,స్థూల కొనుగోలు మొత్తాన్ని తప్పనిసరి
 DocType: Lead,Address Desc,Desc పరిష్కరించేందుకు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,పార్టీ తప్పనిసరి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,పార్టీ తప్పనిసరి
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,టాపిక్ పేరు
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,సెల్లింగ్ లేదా కొనుగోలు కనీసం ఒక ఎంపిక చేయాలి
-DocType: Grading Structure,Grade Intervals,గ్రేడ్ విరామాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,మీ వ్యాపార స్వభావం ఎంచుకోండి.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},రో # {0}: సూచనలు లో ఎంట్రీ నకిలీ {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,ఉత్పాదక కార్యకలాపాల ఎక్కడ నిర్వహిస్తున్నారు.
 DocType: Asset Movement,Source Warehouse,మూల వేర్హౌస్
 DocType: Installation Note,Installation Date,సంస్థాపన తేదీ
@@ -3113,7 +3117,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,ముద్రణ టెంప్లేట్లు లెటర్ హెడ్స్.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ముద్రణ టెంప్లేట్లు కోసం శీర్షికలు ప్రొఫార్మా ఇన్వాయిస్ ఉదా.
 DocType: Student Guardian,Student Guardian,స్టూడెంట్ గార్డియన్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,వాల్యువేషన్ రకం ఆరోపణలు ఇన్క్లుసివ్ వంటి గుర్తించబడిన చేయవచ్చు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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,బిఒఎం రేటు
@@ -3140,7 +3144,7 @@
 DocType: Company,Exchange Gain / Loss Account,ఎక్స్చేంజ్ పెరుగుట / నష్టం ఖాతాకు
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ఉద్యోగి మరియు హాజరు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},ప్రయోజనం ఒకటి ఉండాలి {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,రూపం నింపి దాన్ని సేవ్
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,కమ్యూనిటీ ఫోరమ్
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,స్టాక్ యాక్చువల్ అంశాల
@@ -3155,7 +3159,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,క్రమాన్ని మార్చు ప్యాక్ చేసిన అంశాల
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,ప్రస్తుత Job ఖాళీలు
 DocType: Company,Stock Adjustment Account,స్టాక్ అడ్జస్ట్మెంట్ ఖాతా
-DocType: Journal Entry,Write Off,ఆఫ్ వ్రాయండి
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,ఆఫ్ వ్రాయండి
 DocType: Timesheet Detail,Operation ID,ఆపరేషన్ ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","వ్యవస్థ యూజర్ (లాగిన్) ID. సెట్ చేస్తే, అది అన్ని హెచ్ ఆర్ రూపాలు కోసం డిఫాల్ట్ అవుతుంది."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: నుండి {1}
@@ -3166,26 +3170,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,సరఫరాదారు కస్టమర్ కు అందిస్తాడు
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (# ఫారం / అంశం / {0}) స్టాక్ ముగిసింది
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,తదుపరి తేదీ వ్యాఖ్యలు తేదీ కంటే ఎక్కువ ఉండాలి
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,షో పన్ను విడిపోవడానికి
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,షో పన్ను విడిపోవడానికి
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},కారణంగా / సూచన తేదీ తర్వాత ఉండకూడదు {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,డేటా దిగుమతి మరియు ఎగుమతి
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","స్టాక్ ఎంట్రీలు అందుకే మీరు తిరిగి కేటాయించి లేదా సవరించడానికి కాదు, వేర్హౌస్ {0} వ్యతిరేకంగా ఉనికిలో"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,తోబుట్టువుల విద్యార్థులు దొరకలేదు
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,తోబుట్టువుల విద్యార్థులు దొరకలేదు
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,వాయిస్ పోస్టింగ్ తేదీ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,సెల్
 DocType: Sales Invoice,Rounded Total,నున్నటి మొత్తం
 DocType: Product Bundle,List items that form the package.,ప్యాకేజీ రూపొందించే జాబితా అంశాలను.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,శాతం కేటాయింపు 100% సమానంగా ఉండాలి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,దయచేసి పార్టీ ఎంచుకోవడం ముందు పోస్టింగ్ తేదిని ఎంచుకోండి
 DocType: Program Enrollment,School House,స్కూల్ హౌస్
 DocType: Serial No,Out of AMC,AMC యొక్క అవుట్
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,దయచేసి కొటేషన్స్ ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,బుక్ Depreciations సంఖ్య Depreciations మొత్తం సంఖ్య కంటే ఎక్కువ ఉండకూడదు
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,నిర్వహణ సందర్శించండి చేయండి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,సేల్స్ మాస్టర్ మేనేజర్ {0} పాత్ర కలిగిన వినియోగదారుకు సంప్రదించండి
 DocType: Company,Default Cash Account,డిఫాల్ట్ నగదు ఖాతా
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,కంపెనీ (కాదు కస్టమర్ లేదా సరఫరాదారు) మాస్టర్.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,ఈ ఈ విద్యార్థి హాజరు ఆధారంగా
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,స్టూడెంట్స్ లో లేవు
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,మరింత అంశాలు లేదా ఓపెన్ పూర్తి రూపం జోడించండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;ఊహించినది డెలివరీ తేదీ&#39; నమోదు చేయండి
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,డెలివరీ గమనికలు {0} ఈ అమ్మకాల ఆర్డర్ రద్దు ముందే రద్దు చేయాలి
@@ -3217,6 +3222,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,ఐటమ్ 3
 DocType: Purchase Order,Customer Contact Email,కస్టమర్ సంప్రదించండి ఇమెయిల్
 DocType: Warranty Claim,Item and Warranty Details,అంశం మరియు వారంటీ వివరాలు
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,అంశం code&gt; అంశం గ్రూప్&gt; బ్రాండ్
 DocType: Sales Team,Contribution (%),కాంట్రిబ్యూషన్ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,గమనిక: చెల్లింపు ఎంట్రీ నుండి రూపొందించినవారు కాదు &#39;నగదు లేదా బ్యాంక్ ఖాతా&#39; పేర్కొనబడలేదు
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,తప్పనిసరి కోర్సులు పొందడంలో ప్రోగ్రామ్ ఎంచుకోండి.
@@ -3232,9 +3238,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,సయోధ్య ముందు
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},కు {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),పన్నులు మరియు ఆరోపణలు చేర్చబడింది (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,అంశం పన్ను రో {0} రకం పన్ను లేదా ఆదాయం వ్యయం లేదా విధింపదగిన యొక్క ఖాతా ఉండాలి
 DocType: Sales Order,Partly Billed,పాక్షికంగా గుర్తింపు పొందిన
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,అంశం {0} ఒక స్థిర ఆస్తి అంశం ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,అంశం {0} ఒక స్థిర ఆస్తి అంశం ఉండాలి
 DocType: Item,Default BOM,డిఫాల్ట్ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,తిరిగి రకం కంపెనీ పేరు నిర్ధారించడానికి దయచేసి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,మొత్తం అద్భుతమైన ఆంట్
@@ -3244,8 +3250,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ఆటోమోటివ్
 DocType: Vehicle,Insurance Company,ఇన్సూరెన్స్ కంపెనీ
 DocType: Asset Category Account,Fixed Asset Account,స్థిర ఆస్తి ఖాతా
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,వేరియబుల్
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,డెలివరీ గమనిక
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,వేరియబుల్
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,డెలివరీ గమనిక
 DocType: Student,Student Email Address,స్టూడెంట్ ఇమెయిల్ అడ్రస్
 DocType: Timesheet Detail,From Time,సమయం నుండి
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,అందుబాటులో ఉంది:
@@ -3257,12 +3263,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ధర జాబితా ఎక్స్చేంజ్ రేట్
 DocType: Purchase Invoice Item,Rate,రేటు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,ఇంటర్న్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,చిరునామా పేరు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,చిరునామా పేరు
 DocType: Stock Entry,From BOM,బిఒఎం నుండి
 DocType: Assessment Code,Assessment Code,అసెస్మెంట్ కోడ్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ప్రాథమిక
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} స్తంభింప ముందు స్టాక్ లావాదేవీలు
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;రూపొందించండి షెడ్యూల్&#39; క్లిక్ చేయండి
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ఉదా కిలోల యూనిట్, నాస్, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,మీరు ప్రస్తావన తేదీ ఎంటర్ చేస్తే ప్రస్తావన తప్పనిసరి
 DocType: Bank Reconciliation Detail,Payment Document,చెల్లింపు డాక్యుమెంట్
@@ -3270,19 +3276,19 @@
 DocType: Salary Slip,Salary Structure,జీతం నిర్మాణం
 DocType: Account,Bank,బ్యాంక్
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,వైనానిక
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ఇష్యూ మెటీరియల్
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ఇష్యూ మెటీరియల్
 DocType: Material Request Item,For Warehouse,వేర్హౌస్ కోసం
 DocType: Employee,Offer Date,ఆఫర్ తేదీ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,కొటేషన్స్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,మీరు ఆఫ్లైన్ మోడ్లో ఉన్నాయి. మీరు నెట్వర్కు వరకు రీలోడ్ చేయలేరు.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,తోబుట్టువుల స్టూడెంట్ గ్రూప్స్ రూపొందించినవారు.
 DocType: Purchase Invoice Item,Serial No,సీరియల్ లేవు
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,మంత్లీ నంతవరకు మొత్తాన్ని రుణ మొత్తం కంటే ఎక్కువ ఉండకూడదు
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,మొదటి Maintaince వివరాలు నమోదు చేయండి
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,మొదటి Maintaince వివరాలు నమోదు చేయండి
 DocType: Purchase Invoice,Print Language,ప్రింట్ భాషా
 DocType: Salary Slip,Total Working Hours,మొత్తం వర్కింగ్ అవర్స్
 DocType: Stock Entry,Including items for sub assemblies,ఉప శాసనసభలకు అంశాలు సహా
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,ఎంటర్ విలువ సానుకూల ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,అన్ని ప్రాంతాలు
 DocType: Purchase Invoice,Items,అంశాలు
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,విద్యార్థిని అప్పటికే చేరతాడు.
@@ -3302,17 +3308,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',వేరియంట్ కోసం మెజర్ అప్రమేయ యూనిట్ &#39;{0}&#39; మూస లో అదే ఉండాలి &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,బేస్డ్ న లెక్కించు
 DocType: Delivery Note Item,From Warehouse,గిడ్డంగి నుండి
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,మెటీరియల్స్ బిల్ తో ఏ ఐటంలు తయారీకి
 DocType: Assessment Plan,Supervisor Name,సూపర్వైజర్ పేరు
 DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
 DocType: Program Enrollment Course,Program Enrollment Course,ప్రోగ్రామ్ ఎన్రోల్మెంట్ కోర్సు
-DocType: Grading Structure,Grading Structure,గ్రేడింగ్ నిర్మాణం
 DocType: Purchase Taxes and Charges,Valuation and Total,వాల్యుయేషన్ మరియు మొత్తం
 DocType: Tax Rule,Shipping City,షిప్పింగ్ సిటీ
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,నోటిఫికేషన్ అనుకూలీకరించండి
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,ఆపరేషన్స్ నుండి నగదు ప్రవాహ
 DocType: Sales Invoice,Shipping Rule,షిప్పింగ్ రూల్
@@ -3333,8 +3337,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},డిఫాల్ట్ BOM అంశం కోసం ఉంది {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,మొదటి పోస్టింగ్ తేదీ దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,తేదీ తెరవడం తేదీ మూసివేయడం ముందు ఉండాలి
 DocType: Leave Control Panel,Carry Forward,కుంటున్న
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ఉన్న లావాదేవీలతో ఖర్చు సెంటర్ లెడ్జర్ మార్చబడతాయి కాదు
 DocType: Department,Days for which Holidays are blocked for this department.,రోజులు సెలవులు ఈ విభాగం కోసం బ్లాక్ చేయబడతాయి.
@@ -3347,7 +3351,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,లెటర్హెడ్ అటాచ్
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,చివరి కమ్యూనికేషన్
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,చివరి కమ్యూనికేషన్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',వర్గం &#39;వాల్యువేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',వర్గం &#39;వాల్యువేషన్&#39; లేదా &#39;వాల్యుయేషన్ మరియు సంపూర్ణమైనది&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","మీ పన్ను తలలు జాబితా (ఉదా వ్యాట్ కస్టమ్స్ etc; వారు ఏకైక పేర్లు ఉండాలి) మరియు వారి ప్రామాణిక రేట్లు. ఈ మీరు సవరించవచ్చు మరియు తరువాత జోడించవచ్చు ఇది ఒక ప్రామాణిక టెంప్లేట్, సృష్టిస్తుంది."
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +230,Serial Nos Required for Serialized Item {0},సీరియల్ అంశం కోసం సీరియల్ మేము అవసరం {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,రసీదులు చెల్లింపుల మ్యాచ్
@@ -3363,7 +3367,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),మొత్తం (ఆంట్)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,వినోదం &amp; లీజర్
 DocType: Quality Inspection,Item Serial No,అంశం సీరియల్ లేవు
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ఉద్యోగి రికార్డ్స్ సృష్టించండి
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ఉద్యోగి రికార్డ్స్ సృష్టించండి
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,మొత్తం ప్రెజెంట్
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,అకౌంటింగ్ ప్రకటనలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,అవర్
@@ -3376,10 +3380,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,తెలియని
 DocType: Shipping Rule,Shipping Rule Conditions,షిప్పింగ్ రూల్ పరిస్థితులు
 DocType: BOM Replace Tool,The new BOM after replacement,భర్తీ తర్వాత కొత్త BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,అమ్మకానికి పాయింట్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,అమ్మకానికి పాయింట్
 DocType: Payment Entry,Received Amount,అందుకున్న మొత్తం
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,దయచేసి సెటప్ను ఉద్యోగి మానవ వనరుల వ్యవస్థ నామకరణ&gt; ఆర్ సెట్టింగులు
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","ఆర్డర్ మీద ఇప్పటికే పరిమాణం విస్మరించి, పూర్తి పరిమాణం సృష్టించండి"
 DocType: Account,Tax,పన్ను
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,గుర్తించబడిన
@@ -3392,9 +3394,9 @@
 DocType: Batch,Source Document Name,మూల డాక్యుమెంట్ పేరు
 DocType: Batch,Source Document Name,మూల డాక్యుమెంట్ పేరు
 DocType: Job Opening,Job Title,ఉద్యోగ శీర్షిక
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,యూజర్లను సృష్టించండి
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,యూజర్లను సృష్టించండి
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,గ్రామ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,తయారీకి పరిమాణం 0 కన్నా ఎక్కువ ఉండాలి.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,నిర్వహణ కాల్ కోసం నివేదిక సందర్శించండి.
 DocType: Stock Entry,Update Rate and Availability,నవీకరణ రేటు మరియు అందుబాటు
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,శాతం మీరు అందుకుంటారు లేదా ఆదేశించింది పరిమాణం వ్యతిరేకంగా మరింత బట్వాడా అనుమతించబడతాయి. ఉదాహరణకు: మీరు 100 యూనిట్ల పురమాయించారు ఉంటే. మరియు మీ భత్యం అప్పుడు మీరు 110 యూనిట్ల అందుకోవడానికి అనుమతించబడతాయి 10% ఉంది.
@@ -3404,28 +3406,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},ఖర్చు ఖాతా అంశం తప్పనిసరి {0}
 DocType: BOM,Website Description,వెబ్సైట్ వివరణ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ఈక్విటీ నికర మార్పు
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,మొదటి కొనుగోలు వాయిస్ {0} రద్దు చేయండి
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","ఇమెయిల్ అడ్రస్ కోసం ఇప్పటికే ఉనికిలో ఉంది, ప్రత్యేకంగా ఉండాలి {0}"
 DocType: Serial No,AMC Expiry Date,ఎఎంసి గడువు తేదీ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,స్వీకరణపై
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,స్వీకరణపై
 ,Sales Register,సేల్స్ నమోదు
 DocType: Daily Work Summary Settings Company,Send Emails At,వద్ద ఇమెయిల్స్ పంపడం
 DocType: Quotation,Quotation Lost Reason,కొటేషన్ లాస్ట్ కారణము
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,మీ డొమైన్ ఎంచుకోండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},లావాదేవీ ప్రస్తావన {0} నాటి {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,సవరించడానికి ఉంది ఏమీ.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,ఈ నెల పెండింగ్ కార్యకలాపాలకు సారాంశం
 DocType: Customer Group,Customer Group Name,కస్టమర్ గ్రూప్ పేరు
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ఇంకా వినియోగదారుడు లేవు!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,లావాదేవి నివేదిక
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},రుణ మొత్తం గరిష్ట రుణ మొత్తం మించకూడదు {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,లైసెన్సు
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},సి ఫారం నుండి ఈ వాయిస్ {0} తొలగించడానికి దయచేసి {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,ఖాతా ఆఫ్ వ్రాయండి నమోదు చేయండి
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,చివరి ఆర్డర్ తేదీ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},ఖాతా {0} చేస్తుంది కంపెనీ చెందినవి కాదు {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,వరుసగా {0} లో సీరియల్ సంఖ్యలు డెలివరీ గమనిక సరిపోలడం లేదు
 DocType: Student,Guardian Details,గార్డియన్ వివరాలు
 DocType: C-Form,C-Form,సి ఫారం
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,బహుళ ఉద్యోగులకు మార్క్ హాజరు
@@ -3450,20 +3454,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',రో {0} # ఖాతా రకం ఉండాలి &#39;స్థిర ఆస్తి&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ప్యాక్ చేసిన అంశాల అవుట్
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,నిబంధనలు అమ్మకానికి షిప్పింగ్ మొత్తం లెక్కించేందుకు
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,సిరీస్ తప్పనిసరి
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,సిరీస్ తప్పనిసరి
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,ఫైనాన్షియల్ సర్వీసెస్
 DocType: Student Sibling,Student ID,విద్యార్థి ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,సమయం చిట్టాలు చర్యలు రకాలు
 DocType: Tax Rule,Sales,సేల్స్
 DocType: Stock Entry Detail,Basic Amount,ప్రాథమిక సొమ్ము
 DocType: Training Event,Exam,పరీక్షా
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},వేర్హౌస్ స్టాక్ అంశం అవసరం {0}
 DocType: Leave Allocation,Unused leaves,ఉపయోగించని ఆకులు
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,బిల్లింగ్ రాష్ట్రం
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,ట్రాన్స్ఫర్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} పార్టీ ఖాతాతో అనుబంధితమైన లేదు {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} పార్టీ ఖాతాతో అనుబంధితమైన లేదు {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(ఉప అసెంబ్లీలను సహా) పేలింది BOM పొందు
 DocType: Authorization Rule,Applicable To (Employee),వర్తించదగిన (ఉద్యోగి)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,గడువు తేదీ తప్పనిసరి
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,గుణానికి పెంపు {0} 0 ఉండకూడదు
@@ -3474,13 +3478,13 @@
 ,Inactive Customers,క్రియారహిత వినియోగదారుడు
 DocType: Landed Cost Voucher,LCV,ఎల్సీవీ
 DocType: Landed Cost Voucher,Purchase Receipts,కొనుగోలు రసీదులు
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,ఎలా ధర రూల్ వర్తించబడుతుంది?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,ఎలా ధర రూల్ వర్తించబడుతుంది?
 DocType: Stock Entry,Delivery Note No,డెలివరీ గమనిక లేవు
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","తనిఖీ ఉంటే, కేవలం కొనుగోలు చివరి ముడి పదార్థాలకు పదార్థం అభ్యర్థనలు మెటీరియల్ రిక్వెస్ట్ చేర్చబడుతుంది. లేకపోతే, తల్లిదండ్రుల అంశాలను మెటీరియల్ అభ్యర్థనలు సృష్టించబడుతుంది"
 DocType: Cheque Print Template,Message to show,చూపించడానికి సందేశాన్ని
 DocType: Company,Retail,రిటైల్
 DocType: Attendance,Absent,ఆబ్సెంట్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,ఉత్పత్తి కట్ట
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,ఉత్పత్తి కట్ట
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},రో {0}: చెల్లని సూచన {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,పన్నులు మరియు ఆరోపణలు మూస కొనుగోలు
 DocType: Upload Attendance,Download Template,డౌన్లోడ్ మూస
@@ -3490,10 +3494,10 @@
 DocType: Payment Entry,Account Paid From,ఖాతా నుండి చెల్లింపు
 DocType: Purchase Order Item Supplied,Raw Material Item Code,రా మెటీరియల్ Item కోడ్
 DocType: Journal Entry,Write Off Based On,బేస్డ్ న ఆఫ్ వ్రాయండి
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,లీడ్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,లీడ్ చేయండి
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,ముద్రణ మరియు స్టేషనరీ
 DocType: Stock Settings,Show Barcode Field,షో బార్కోడ్ ఫీల్డ్
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,సరఫరాదారు ఇమెయిల్స్ పంపడం
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","జీతం ఇప్పటికే మధ్య {0} మరియు {1}, అప్లికేషన్ కాలం వదిలి ఈ తేదీ పరిధి మధ్య ఉండకూడదు కాలానికి ప్రాసెస్."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ఒక సీరియల్ నం సంస్థాపన రికార్డు
 DocType: Guardian Interest,Guardian Interest,గార్డియన్ వడ్డీ
@@ -3506,6 +3510,7 @@
 DocType: Offer Letter,Awaiting Response,రెస్పాన్స్ వేచిఉండి
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,పైన
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},చెల్లని లక్షణం {0} {1}
+DocType: Supplier,Mention if non-standard payable account,చెప్పలేదు ప్రామాణికం కాని చెల్లించవలసిన ఖాతా ఉంటే
 DocType: Salary Slip,Earning & Deduction,ఎర్నింగ్ &amp; తీసివేత
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ఐచ్ఛికము. ఈ సెట్టింగ్ వివిధ లావాదేవీలలో ఫిల్టర్ ఉపయోగించబడుతుంది.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,ప్రతికూల వాల్యువేషన్ రేటు అనుమతి లేదు
@@ -3521,10 +3526,9 @@
 DocType: Production Order Item,Production Order Item,ఉత్పత్తి ఆర్డర్ అంశం
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,నగరాలు ఏవీ లేవు రికార్డు
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,చిత్తు ఆస్తి యొక్క ధర
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,పాక్షికంగా ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: కాస్ట్ సెంటర్ అంశం తప్పనిసరి {2}
 DocType: Vehicle,Policy No,విధానం లేవు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,ఉత్పత్తి కట్ట నుండి అంశాలు పొందండి
 DocType: Asset,Straight Line,సరళ రేఖ
 DocType: Project User,Project User,ప్రాజెక్ట్ యూజర్
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,స్ప్లిట్
@@ -3542,7 +3546,7 @@
 DocType: Program Enrollment Tool,Get Students From,నుండి స్టూడెంట్స్ పొందండి
 DocType: Hub Settings,Seller Country,అమ్మకాల దేశం
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,వెబ్ సైట్ లో అంశాలను ప్రచురించు
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,వంతులవారీగా మీ విద్యార్థులు గ్రూప్
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,వంతులవారీగా మీ విద్యార్థులు గ్రూప్
 DocType: Authorization Rule,Authorization Rule,అధికార రూల్
 DocType: Sales Invoice,Terms and Conditions Details,నియమాలు మరియు నిబంధనలు వివరాలు
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,లక్షణాలు
@@ -3595,14 +3599,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,ప్రిపే తేదీ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},ఖాతా {0}: మాతృ ఖాతా {1} సంస్థ చెందదు: {2}
 DocType: Program Enrollment Tool,Student Applicants,స్టూడెంట్ దరఖాస్తుదారులు
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,విజయవంతంగా ఈ కంపెనీకి సంబంధించిన అన్ని లావాదేవీలు తొలగించబడింది!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,విజయవంతంగా ఈ కంపెనీకి సంబంధించిన అన్ని లావాదేవీలు తొలగించబడింది!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,తేదీ నాటికి
 DocType: Appraisal,HR,ఆర్
 DocType: Program Enrollment,Enrollment Date,నమోదు తేదీ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,పరిశీలన
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,జీతం భాగాలు
 DocType: Program Enrollment Tool,New Academic Year,కొత్త విద్యా సంవత్సరం
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,రిటర్న్ / క్రెడిట్ గమనిక
 DocType: Stock Settings,Auto insert Price List rate if missing,ఆటో చొప్పించు ధర జాబితా రేటు లేదు ఉంటే
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,మొత్తం చెల్లించిన మొత్తాన్ని
 DocType: Production Order Item,Transferred Qty,బదిలీ ప్యాక్ చేసిన అంశాల
@@ -3622,7 +3626,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","సాధారణం వంటి ఆకులు రకం, జబ్బుపడిన మొదలైనవి"
 DocType: Email Digest,Send regular summary reports via Email.,ఇమెయిల్ ద్వారా సాధారణ సారాంశం నివేదికలు పంపండి.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},ఖర్చుల దావా రకం లో డిఫాల్ట్ ఖాతా సెట్ దయచేసి {0}
 DocType: Assessment Result,Student Name,విద్యార్థి పేరు
 DocType: Brand,Item Manager,అంశం మేనేజర్
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,పేరోల్ చెల్లించవలసిన
@@ -3643,6 +3647,7 @@
 ,Sales Funnel,అమ్మకాల గరాటు
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,సంక్షిప్త తప్పనిసరి
 DocType: Project,Task Progress,టాస్క్ ప్రోగ్రెస్
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,కార్ట్
 ,Qty to Transfer,బదిలీ చేసిన అంశాల
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,లీడ్స్ లేదా వినియోగదారుడు కోట్స్.
 DocType: Stock Settings,Role Allowed to edit frozen stock,పాత్ర ఘనీభవించిన స్టాక్ సవరించడానికి అనుమతించబడినవి
@@ -3670,13 +3675,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,అంశం వైజ్ పన్ను వివరాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,ఇన్స్టిట్యూట్ సంక్షిప్తీకరణ
 ,Item-wise Price List Rate,అంశం వారీగా ధర జాబితా రేటు
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,సరఫరాదారు కొటేషన్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,సరఫరాదారు కొటేషన్
 DocType: Quotation,In Words will be visible once you save the Quotation.,మీరు కొటేషన్ సేవ్ ఒకసారి వర్డ్స్ కనిపిస్తుంది.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},మొత్తము ({0}) వరుసలో ఒక భిన్నం ఉండకూడదు {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,ఫీజు సేకరించండి
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},బార్కోడ్ {0} ఇప్పటికే అంశం ఉపయోగిస్తారు {1}
 DocType: Lead,Add to calendar on this date,ఈ తేదీ క్యాలెండర్ జోడించండి
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,షిప్పింగ్ ఖర్చులు జోడించడం కోసం రూల్స్.
 DocType: Item,Opening Stock,తెరవడం స్టాక్
@@ -3693,8 +3698,8 @@
 Updated via 'Time Log'",మినిట్స్ లో &#39;టైం లోగ్&#39; ద్వారా నవీకరించబడింది
 DocType: Customer,From Lead,లీడ్ నుండి
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,ఆర్డర్స్ ఉత్పత్తి కోసం విడుదల చేసింది.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,ఫిస్కల్ ఇయర్ ఎంచుకోండి ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS ప్రొఫైల్ POS ఎంట్రీ చేయడానికి అవసరం
 DocType: Program Enrollment Tool,Enroll Students,విద్యార్ధులను నమోదు
 DocType: Hub Settings,Name Token,పేరు టోకెన్
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ప్రామాణిక సెల్లింగ్
@@ -3705,7 +3710,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} సేల్స్ వాయిస్ వ్యతిరేకంగా {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ప్రాజెక్ట్ పేరు
-DocType: Supplier,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
+DocType: Customer,Mention if non-standard receivable account,మెన్షన్ ప్రామాణికం కాని స్వీకరించదగిన ఖాతా ఉంటే
 DocType: Journal Entry Account,If Income or Expense,ఆదాయం వ్యయం ఉంటే
 DocType: Production Order,Required Items,అవసరమైన అంశాలు
 DocType: Stock Ledger Entry,Stock Value Difference,స్టాక్ విలువ తేడా
@@ -3726,7 +3731,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,సెట్ లక్ష్యాలను అంశం గ్రూప్ వారీగా ఈ సేల్స్ పర్సన్ కోసం.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ఫ్రీజ్ స్టాక్స్ కంటే పాత [డేస్]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,రో # {0}: ఆస్తి స్థిర ఆస్తి కొనుగోలు / అమ్మకాలు తప్పనిసరి
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","రెండు లేదా అంతకంటే ఎక్కువ ధర రూల్స్ పై నిబంధనలకు ఆధారంగా కనబడక పోతే, ప్రాధాన్య వర్తించబడుతుంది. డిఫాల్ట్ విలువ సున్నా (ఖాళీ) కు చేరుకుంది ప్రాధాన్యత 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.,క్రింది వినియోగదారులకు బ్లాక్ రోజులు లీవ్ అప్లికేషన్స్ ఆమోదించడానికి అనుమతించు.
@@ -3752,7 +3757,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,అది నుంచి నిర్లక్ష్యం అంశం {0} స్టాక్ అంశాన్ని కాదు
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","ఒక నిర్దిష్ట లావాదేవీ ధర రూల్ వర్తించదు, అన్ని వర్తించే ధర రూల్స్ డిసేబుల్ చేయాలి."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","ఒక నిర్దిష్ట లావాదేవీ ధర రూల్ వర్తించదు, అన్ని వర్తించే ధర రూల్స్ డిసేబుల్ చేయాలి."
 DocType: Assessment Group,Parent Assessment Group,మాతృ అసెస్మెంట్ గ్రూప్
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,ఉద్యోగాలు
 ,Sales Order Trends,అమ్మకాల ఆర్డర్ ట్రెండ్లులో
@@ -3763,7 +3768,7 @@
 DocType: Stock Entry Detail,Additional Cost,అదనపు ఖర్చు
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ఆర్థిక సంవత్సరం ముగింపు తేదీ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","ఓచర్ లేవు ఆధారంగా వడపోత కాదు, ఓచర్ ద్వారా సమూహం ఉంటే"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,సరఫరాదారు కొటేషన్ చేయండి
 DocType: Quality Inspection,Incoming,ఇన్కమింగ్
 DocType: BOM,Materials Required (Exploded),మెటీరియల్స్ (పేలుతున్న) అవసరం
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","మీరే కంటే ఇతర, మీ సంస్థకు వినియోగదారులను జోడించు"
@@ -3791,6 +3796,7 @@
 DocType: Employee,History In Company,కంపెనీ చరిత్ర
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,వార్తాలేఖలు
 DocType: Stock Ledger Entry,Stock Ledger Entry,స్టాక్ లెడ్జర్ ఎంట్రీ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,కస్టమర్&gt; కస్టమర్ గ్రూప్&gt; భూభాగం
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,అదే అంశం అనేకసార్లు నమోదయ్యేలా
 DocType: Department,Leave Block List,బ్లాక్ జాబితా వదిలి
 DocType: Sales Invoice,Tax ID,పన్ను ID
@@ -3800,7 +3806,7 @@
 DocType: Customer,Sales Partner and Commission,సేల్స్ భాగస్వామిలో మరియు కమిషన్
 DocType: Employee Loan,Rate of Interest (%) / Year,ఆసక్తి రేటు (%) / ఆఫ్ ది ఇయర్
 ,Project Quantity,ప్రాజెక్టు పరిమాణం
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","మొత్తం {0} అన్ని అంశాలను, సున్నా మీరు &#39;ఆధారంగా ఛార్జీలు పంపిణీ&#39; మార్చాలి ఉండవచ్చు"
 DocType: Opportunity,To Discuss,చర్చించడానికి
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} యొక్క యూనిట్లలో {1} {2} ఈ లావాదేవీని పూర్తి చేయడానికి అవసరమవుతారు.
 DocType: Loan Type,Rate of Interest (%) Yearly,ఆసక్తి రేటు (%) సుడి
@@ -3815,7 +3821,7 @@
 DocType: Purchase Invoice,Return,రిటర్న్
 DocType: Production Order Operation,Production Order Operation,ఉత్పత్తి ఆర్డర్ ఆపరేషన్
 DocType: Pricing Rule,Disable,ఆపివేయి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,చెల్లింపు విధానం ఒక చెల్లింపు చేయడానికి అవసరం
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,చెల్లింపు విధానం ఒక చెల్లింపు చేయడానికి అవసరం
 DocType: Project Task,Pending Review,సమీక్ష పెండింగ్లో
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",అది ఇప్పటికే ఉంది ఆస్తుల {0} బహిష్కరించాలని కాదు {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(ఖర్చు చెప్పడం ద్వారా) మొత్తం ఖర్చు చెప్పడం
@@ -3823,11 +3829,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,మార్క్ కరువవడంతో
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},రో {0}: పాఠశాల బిఒఎం # కరెన్సీ {1} ఎంపిక కరెన్సీ సమానంగా ఉండాలి {2}
 DocType: Journal Entry Account,Exchange Rate,ఎక్స్చేంజ్ రేట్
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,అమ్మకాల ఆర్డర్ {0} సమర్పించిన లేదు
 DocType: Homepage,Tag Line,ట్యాగ్ లైన్
 DocType: Fee Component,Fee Component,ఫీజు భాగం
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,ఫ్లీట్ మేనేజ్మెంట్
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,నుండి అంశాలను జోడించండి
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,నుండి అంశాలను జోడించండి
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},వేర్హౌస్ {0}: మాతృ ఖాతా {1} సంస్థ bolong లేదు {2}
 DocType: Cheque Print Template,Regular,రెగ్యులర్
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,అన్ని అసెస్మెంట్ ప్రమాణ మొత్తం వెయిటేజీ 100% ఉండాలి
@@ -3840,7 +3846,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,ఎంచుకున్న అంశం బ్యాచ్ ఉండకూడదు
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","వాల్యువేషన్ రేటు అంశం {0} కోసం అకౌంటింగ్ ఎంట్రీలు చేయాల్సి ఉంది ఇది కోసం దొరకలేదు {1} {2}. అంశం లో ఒక నమూనా అంశం వంటి లావాదేవీ ఉంటే {1}, {1} అంశం పట్టికలో పేర్కొన్నాయి దయచేసి. లేకపోతే, అంశం రికార్డు అంశం లేదా ప్రస్తావన మదింపు రేటు ఇన్కమింగ్ స్టాక్ లావాదేవీ సృష్టించండి, తరువాత submiting ప్రయత్నించండి / ఈ ఎంట్రీ రద్దు దయచేసి"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,పదార్థాల% ఈ డెలివరీ గమనిక వ్యతిరేకంగా పంపిణీ
 DocType: Project,Customer Details,కస్టమర్ వివరాలు
@@ -3849,15 +3855,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,రిసీవర్ nos కోసం URL పరామితి ఎంటర్
 DocType: Payment Entry,Paid Amount,మొత్తం చెల్లించారు
 DocType: Assessment Plan,Supervisor,సూపర్వైజర్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ఆన్లైన్
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ఆన్లైన్
 ,Available Stock for Packing Items,ప్యాకింగ్ అంశాలను అందుబాటులో స్టాక్
 DocType: Item Variant,Item Variant,అంశం వేరియంట్
 DocType: Assessment Result Tool,Assessment Result Tool,అసెస్మెంట్ ఫలితం టూల్
 DocType: BOM Scrap Item,BOM Scrap Item,బిఒఎం స్క్రాప్ అంశం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,సమర్పించిన ఆర్డర్లను తొలగించలేరని
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,క్వాలిటీ మేనేజ్మెంట్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,అంశం {0} ఆపివేయబడింది
 DocType: Employee Loan,Repay Fixed Amount per Period,ఒక్కో వ్యవధి స్థిర మొత్తం చెల్లింపులో
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},అంశం పరిమాణం నమోదు చేయండి {0}
 DocType: Employee External Work History,Employee External Work History,Employee బాహ్య వర్క్ చరిత్ర
@@ -3884,7 +3890,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,స్టూడెంట్ అడ్రెస్
 DocType: Employee,Notice (days),నోటీసు (రోజులు)
 DocType: Tax Rule,Sales Tax Template,సేల్స్ టాక్స్ మూస
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,ఇన్వాయిస్ సేవ్ చెయ్యడానికి ఐటమ్లను ఎంచుకోండి
 DocType: Employee,Encashment Date,ఎన్క్యాష్మెంట్ తేదీ
 DocType: Training Event,Internet,ఇంటర్నెట్
 DocType: Account,Stock Adjustment,స్టాక్ అడ్జస్ట్మెంట్
@@ -3908,7 +3914,7 @@
 DocType: Item Variant Attribute,Attribute,లక్షణం
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,మొదలుకుని / నుండి రాయండి
 DocType: Serial No,Under AMC,ఎఎంసి కింద
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,అంశం వాల్యుయేషన్ రేటు దిగిన ఖర్చు రసీదును మొత్తం పరిగణనలోకి recalculated ఉంటుంది
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,అంశం వాల్యుయేషన్ రేటు దిగిన ఖర్చు రసీదును మొత్తం పరిగణనలోకి recalculated ఉంటుంది
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,లావాదేవీలు అమ్మకం కోసం డిఫాల్ట్ సెట్టింగులను.
 DocType: Guardian,Guardian Of ,ది గార్డియన్
 DocType: Grading Scale Interval,Threshold,త్రెష్
@@ -3918,6 +3924,7 @@
 DocType: Purchase Invoice,Debit Note Issued,డెబిట్ గమనిక జారీచేయబడింది
 DocType: Production Order,Warehouses,గిడ్డంగులు
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} ఆస్తి బదిలీ సాధ్యం కాదు
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,ఈ అంశం {0} (మూస) యొక్క రూపాంతరం.
 DocType: Workstation,per hour,గంటకు
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,కొనుగోలు
 DocType: Announcement,Announcement,ప్రకటన
@@ -3933,8 +3940,8 @@
 DocType: Account,Receivable,స్వీకరించదగిన
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,రో # {0}: కొనుగోలు ఆర్డర్ ఇప్పటికే ఉనికిలో సరఫరాదారు మార్చడానికి అనుమతి లేదు
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,సెట్ క్రెడిట్ పరిధులకు మించిన లావాదేవీలు submit అనుమతి పాత్ర.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,తయారీ ఐటెమ్లను ఎంచుకోండి
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","మాస్టర్ డేటా సమకాలీకరించడాన్ని, కొంత సమయం పడుతుంది"
 DocType: Item,Material Issue,మెటీరియల్ ఇష్యూ
 DocType: Hub Settings,Seller Description,అమ్మకాల వివరణ
 DocType: Employee Education,Qualification,అర్హతలు
@@ -3946,7 +3953,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,క్రమ
 DocType: Salary Detail,Component,కాంపోనెంట్
 DocType: Assessment Criteria,Assessment Criteria Group,అంచనా ప్రమాణం గ్రూప్
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},పోగుచేసిన తరుగుదల తెరవడం సమానంగా కంటే తక్కువ ఉండాలి {0}
 DocType: Warehouse,Warehouse Name,వేర్హౌస్ పేరు
 DocType: Naming Series,Select Transaction,Select లావాదేవీ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,రోల్ ఆమోదిస్తోంది లేదా వాడుకరి ఆమోదిస్తోంది నమోదు చేయండి
@@ -3959,7 +3966,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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","ఇక్కడ మీరు etc ఎత్తు, బరువు, అలెర్జీలు, వైద్య ఆందోళనలు అందుకోగలదు"
 DocType: Leave Block List,Applies to Company,కంపెనీకి వర్తిస్తుంది
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +199,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,సమర్పించిన స్టాక్ ఎంట్రీ {0} ఉంది ఎందుకంటే రద్దు కాదు
 DocType: Employee Loan,Disbursement Date,చెల్లించుట తేదీ
 DocType: Vehicle,Vehicle,వాహనం
 DocType: Purchase Invoice,In Words,వర్డ్స్
@@ -3974,14 +3981,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / లీడ్%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ఆస్తి Depreciations మరియు నిల్వలను
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},మొత్తం {0} {1} నుంచి బదిలీ {2} నుండి {3}
 DocType: Sales Invoice,Get Advances Received,అడ్వాన్సెస్ స్వీకరించిన గెట్
 DocType: Email Digest,Add/Remove Recipients,గ్రహీతలు జోడించు / తొలగించు
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},లావాదేవీ ఆగిపోయింది ఉత్పత్తి వ్యతిరేకంగా అనుమతి లేదు ఆర్డర్ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",డిఫాల్ట్ గా ఈ ఆర్థిక సంవత్సరం సెట్ &#39;డిఫాల్ట్ గా సెట్&#39; పై క్లిక్
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,చేరండి
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,కొరత ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,అంశం వేరియంట్ {0} అదే లక్షణాలు తో ఉంది
 DocType: Employee Loan,Repay from Salary,జీతం నుండి తిరిగి
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},వ్యతిరేకంగా చెల్లింపు అభ్యర్థించడం {0} {1} మొత్తం {2}
@@ -3999,7 +4006,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,అసెస్మెంట్ ఫలితం వివరాలు
 DocType: Employee Education,Employee Education,Employee ఎడ్యుకేషన్
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,అంశం సమూహం పట్టిక కనిపించే నకిలీ అంశం సమూహం
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,ఇది అంశం వివరాలు పొందడం అవసరమవుతుంది.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ఇప్పటికే అందింది
@@ -4008,7 +4015,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","వేర్హౌస్ {0} ఏదైనా ఖాతాకు అనుసంధానం లేదు, సృష్టించండి / గిడ్డంగి కోసం లింకున్న సంబంధిత (అసెట్) ఖాతా."
 DocType: Purchase Invoice,Recurring Id,పునరావృత Id
 DocType: Customer,Sales Team Details,సేల్స్ టీం వివరాలు
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,శాశ్వతంగా తొలగించాలా?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,శాశ్వతంగా తొలగించాలా?
 DocType: Expense Claim,Total Claimed Amount,మొత్తం క్లెయిమ్ చేసిన మొత్తం
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,అమ్మకం కోసం సమర్థవంతమైన అవకాశాలు.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},చెల్లని {0}
@@ -4019,13 +4026,14 @@
 DocType: Warehouse,PIN,పిన్
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,లో ERPNext మీ స్కూల్ సెటప్
 DocType: Sales Invoice,Base Change Amount (Company Currency),బేస్ మార్చు మొత్తం (కంపెనీ కరెన్సీ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,క్రింది గిడ్డంగులు కోసం అకౌంటింగ్ ఎంట్రీలు
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,చివరి ఆర్డర్ పరిమాణం
+DocType: Task,Is Milestone,మైల్స్టోన్ ఉంది
 DocType: Daily Work Summary,Email Sent To,ఇమెయిల్ పంపబడింది
 DocType: Budget,Warn,హెచ్చరించు
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ఏ ఇతర స్టర్ రికార్డులలో వెళ్ళాలి అని చెప్పుకోదగిన ప్రయత్నం.
@@ -4046,7 +4054,7 @@
 DocType: Item Attribute Value,Attribute Value,విలువ లక్షణం
 ,Itemwise Recommended Reorder Level,Itemwise క్రమాన్ని స్థాయి సిఫార్సు
 DocType: Salary Detail,Salary Detail,జీతం వివరాలు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,ముందుగా {0} దయచేసి ఎంచుకోండి
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,అంశం బ్యాచ్ {0} {1} గడువు ముగిసింది.
 DocType: Sales Invoice,Commission,కమిషన్
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,తయారీ కోసం సమయం షీట్.
@@ -4058,41 +4066,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`ఫ్రీజ్ స్టాక్స్ పాత Than`% d రోజుల కంటే తక్కువగా ఉండాలి.
 DocType: Tax Rule,Purchase Tax Template,పన్ను మూస కొనుగోలు
 ,Project wise Stock Tracking,ప్రాజెక్టు వారీగా స్టాక్ ట్రాకింగ్
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},నిర్వహణ షెడ్యూల్ {0} వ్యతిరేకంగా ఉంది {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(మూలం / లక్ష్యం వద్ద) వాస్తవ ప్యాక్ చేసిన అంశాల
 DocType: Item Customer Detail,Ref Code,Ref కోడ్
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Employee రికార్డులు.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,తదుపరి అరుగుదల తేదీ సెట్ చెయ్యండి
 DocType: HR Settings,Payroll Settings,పేరోల్ సెట్టింగ్స్
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,కాని లింక్డ్ రసీదులు మరియు చెల్లింపులు ఫలితం.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,ప్లేస్ ఆర్డర్
 DocType: Email Digest,New Purchase Orders,న్యూ కొనుగోలు ఉత్తర్వులు
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,రూట్ ఒక పేరెంట్ ఖర్చు సెంటర్ ఉండకూడదు
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Select బ్రాండ్ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Select బ్రాండ్ ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,గా అరుగుదల పోగుచేసిన
 DocType: Sales Invoice,C-Form Applicable,సి ఫారం వర్తించే
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},ఆపరేషన్ సమయం ఆపరేషన్ కోసం 0 కంటే ఎక్కువ ఉండాలి {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,వేర్హౌస్ తప్పనిసరి
 DocType: Supplier,Address and Contacts,చిరునామా మరియు కాంటాక్ట్స్
 DocType: UOM Conversion Detail,UOM Conversion Detail,UoM మార్పిడి వివరాలు
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100 px ద్వారా అది (w) వెబ్ స్నేహపూర్వక 900px ఉంచండి (h)
 DocType: Program,Program Abbreviation,ప్రోగ్రామ్ సంక్షిప్తీకరణ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ఉత్పత్తి ఆర్డర్ ఒక అంశం మూస వ్యతిరేకంగా లేవనెత్తిన సాధ్యం కాదు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ఆరోపణలు ప్రతి అంశం వ్యతిరేకంగా కొనుగోలు రసీదులు లో నవీకరించబడింది ఉంటాయి
 DocType: Warranty Claim,Resolved By,ద్వారా పరిష్కరించిన
 DocType: Bank Guarantee,Start Date,ప్రారంబపు తేది
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ఒక కాలానికి ఆకులు కేటాయించుటకు.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,చెక్కుల మరియు డిపాజిట్లు తప్పుగా క్లియర్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,ఖాతా {0}: మీరు పేరెంట్ ఖాతా గా కేటాయించలేరు
 DocType: Purchase Invoice Item,Price List Rate,ధర జాబితా రేటు
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,కస్టమర్ కోట్స్ సృష్టించు
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,కస్టమర్ కోట్స్ సృష్టించు
 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 +38,Bill of Materials (BOM),వస్తువుల యొక్క జామా ఖర్చు (BOM)
 DocType: Item,Average time taken by the supplier to deliver,సరఫరాదారు తీసుకున్న సగటు సమయం బట్వాడా
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,అసెస్మెంట్ ఫలితం
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,గంటలు
 DocType: Project,Expected Start Date,ఊహించిన ప్రారంభం తేదీ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ఆరోపణలు ఆ అంశం వర్తించదు ఉంటే అంశాన్ని తొలగించు
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,లావాదేవీ కరెన్సీ చెల్లింపు గేట్వే కరెన్సీ అదే ఉండాలి
 DocType: Payment Entry,Receive,స్వీకరించండి
@@ -4103,19 +4110,19 @@
 DocType: Workstation,Operating Costs,నిర్వహణ వ్యయాలు
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,యాక్షన్ సేకరించారు మంత్లీ బడ్జెట్ మించింది ఉంటే
 DocType: Purchase Invoice,Submit on creation,సృష్టి సమర్పించండి
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},కరెన్సీ కోసం {0} ఉండాలి {1}
 DocType: Asset,Disposal Date,తొలగింపు తేదీ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","ఇమెయిళ్ళు వారు సెలవు లేకపోతే, ఇచ్చిన గంట వద్ద కంపెనీ అన్ని యాక్టివ్ ఉద్యోగులు పంపబడును. ప్రతిస్పందనల సారాంశం అర్ధరాత్రి పంపబడుతుంది."
 DocType: Employee Leave Approver,Employee Leave Approver,ఉద్యోగి సెలవు అప్రూవర్గా
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},రో {0}: ఒక క్రమాన్ని ఎంట్రీ ఇప్పటికే ఈ గిడ్డంగి కోసం ఉంది {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","కొటేషన్ చేయబడింది ఎందుకంటే, కోల్పోయిన డిక్లేర్ కాదు."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,శిక్షణ అభిప్రాయం
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,ఆర్డర్ {0} సమర్పించాలి ఉత్పత్తి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},అంశం కోసం ప్రారంభ తేదీ మరియు ముగింపు తేదీ దయచేసి ఎంచుకోండి {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},కోర్సు వరుసగా తప్పనిసరి {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,తేదీ తేదీ నుండి ముందు ఉండరాదు
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ మార్చు ధరలు జోడించండి
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Batch,Parent Batch,మాతృ బ్యాచ్
 DocType: Cheque Print Template,Cheque Print Template,ప్రిపే ప్రింట్ మూస
@@ -4129,7 +4136,7 @@
 ,Ordered Items To Be Delivered,క్రమ అంశాలు పంపిణీ చేయాలి
 DocType: Account,Income,ఆదాయపు
 DocType: Industry Type,Industry Type,పరిశ్రమ రకం
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,ఎక్కడో తేడ జరిగింది!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,ఎక్కడో తేడ జరిగింది!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,హెచ్చరిక: వదిలి అప్లికేషన్ క్రింది బ్లాక్ తేదీలను
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,వాయిస్ {0} ఇప్పటికే సమర్పించబడింది సేల్స్
 DocType: Assessment Result Detail,Score,స్కోరు
@@ -4160,17 +4167,17 @@
 DocType: Item,Variant Based On,వేరియంట్ బేస్డ్ న
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100% ఉండాలి కేటాయించిన మొత్తం వెయిటేజీ. ఇది {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,మీ సరఫరాదారులు
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,అమ్మకాల ఆర్డర్ చేసిన ఓడిపోయింది సెట్ చెయ్యబడదు.
 DocType: Request for Quotation Item,Supplier Part No,సరఫరాదారు పార్ట్ లేవు
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,నుండి అందుకున్న
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',వర్గం &#39;మదింపు&#39; లేదా &#39;Vaulation మరియు మొత్తం&#39; కోసం ఉన్నప్పుడు తీసివేయు కాదు
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,నుండి అందుకున్న
 DocType: Lead,Converted,కన్వర్టెడ్
 DocType: Item,Has Serial No,సీరియల్ లేవు ఉంది
 DocType: Employee,Date of Issue,జారీ చేసిన తేది
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: నుండి {0} కోసం {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: నుండి {0} కోసం {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},రో # {0}: అంశాన్ని సెట్ సరఫరాదారు {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,రో {0}: గంటలు విలువ సున్నా కంటే ఎక్కువ ఉండాలి.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,అంశం {1} జత వెబ్సైట్ చిత్రం {0} కనుగొనబడలేదు
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,వెబ్ సైట్ బహుళ సమూహాలు ఈ అంశం జాబితా.
@@ -4179,20 +4186,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,మీరు స్తంభింపచేసిన విలువ సెట్ అధికారం లేదు
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled ఎంట్రీలు పొందండి
 DocType: Payment Reconciliation,From Invoice Date,వాయిస్ తేదీ నుండి
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,బిల్లింగ్ కరెన్సీ డిఫాల్ట్ comapany యొక్క గాని కరెన్సీ లేదా పార్టీ ఖాతా కరెన్సీ సమానంగా ఉండాలి
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ఎన్క్యాష్మెంట్ వదిలి
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,ఇది ఏమి చేస్తుంది?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,గిడ్డంగి
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,అన్ని విద్యార్థి అడ్మిషన్స్
 ,Average Commission Rate,సగటు కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;అవును&#39; ఉంటుంది కాని స్టాక్ అంశం కోసం కాదు &#39;సీరియల్ చెప్పడం&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,హాజరు భవిష్యత్తులో తేదీలు కోసం గుర్తించబడవు
 DocType: Pricing Rule,Pricing Rule Help,ధర రూల్ సహాయం
 DocType: School House,House Name,హౌస్ పేరు
 DocType: Purchase Taxes and Charges,Account Head,ఖాతా హెడ్
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,అంశాల దిగిన ఖర్చు లెక్కించేందుకు అదనపు ఖర్చులు అప్డేట్
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ఎలక్ట్రికల్
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,మీ వినియోగదారులు మీ సంస్థ యొక్క మిగిలిన జోడించండి. మీరు కూడా కాంటాక్ట్స్ నుండి వారిని జోడించడం ద్వారా మీ పోర్టల్ వినియోగదారుడు ఆహ్వానించండి జోడించవచ్చు
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,మీ వినియోగదారులు మీ సంస్థ యొక్క మిగిలిన జోడించండి. మీరు కూడా కాంటాక్ట్స్ నుండి వారిని జోడించడం ద్వారా మీ పోర్టల్ వినియోగదారుడు ఆహ్వానించండి జోడించవచ్చు
 DocType: Stock Entry,Total Value Difference (Out - In),మొత్తం విలువ తేడా (అవుట్ - ఇన్)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4201,7 +4208,7 @@
 DocType: Item,Customer Code,కస్టమర్ కోడ్
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},పుట్టినరోజు రిమైండర్ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,చివరి ఆర్డర్ నుండి రోజుల్లో
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,ఖాతాకు డెబిట్ బాలన్స్ షీట్ ఖాతా ఉండాలి
 DocType: Buying Settings,Naming Series,నామకరణ సిరీస్
 DocType: Leave Block List,Leave Block List Name,బ్లాక్ జాబితా వదిలి పేరు
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,భీమా తేదీ ప్రారంభించండి భీమా ముగింపు తేదీ కంటే తక్కువ ఉండాలి
@@ -4216,9 +4223,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ఉద్యోగి వేతనం స్లిప్ {0} ఇప్పటికే సమయం షీట్ కోసం సృష్టించబడింది {1}
 DocType: Vehicle Log,Odometer,ఓడోమీటార్
 DocType: Sales Order Item,Ordered Qty,క్రమ ప్యాక్ చేసిన అంశాల
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,అంశం {0} నిలిపివేయబడింది
 DocType: Stock Settings,Stock Frozen Upto,స్టాక్ ఘనీభవించిన వరకు
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,బిఒఎం ఏ స్టాక్ అంశం కలిగి లేదు
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},నుండి మరియు కాలం పునరావృత తప్పనిసరి తేదీలు కాలం {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,ప్రాజెక్టు చర్య / పని.
 DocType: Vehicle Log,Refuelling Details,Refuelling వివరాలు
@@ -4228,8 +4235,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,గత కొనుగోలు రేటు దొరకలేదు
 DocType: Purchase Invoice,Write Off Amount (Company Currency),మొత్తం ఆఫ్ వ్రాయండి (కంపెనీ కరెన్సీ)
 DocType: Sales Invoice Timesheet,Billing Hours,బిల్లింగ్ గంటలు
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,కోసం {0} దొరకలేదు డిఫాల్ట్ బిఒఎం
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,రో # {0}: క్రమాన్ని పరిమాణం సెట్ చెయ్యండి
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,వాటిని ఇక్కడ జోడించడానికి అంశాలను నొక్కండి
 DocType: Fees,Program Enrollment,ప్రోగ్రామ్ నమోదు
 DocType: Landed Cost Voucher,Landed Cost Voucher,అడుగుపెట్టాయి ఖర్చు ఓచర్
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},సెట్ దయచేసి {0}
@@ -4253,7 +4261,7 @@
 DocType: Maintenance Visit,Maintenance Date,నిర్వహణ తేదీ
 DocType: Purchase Invoice Item,Rejected Serial No,తిరస్కరించబడిన సీరియల్ లేవు
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,ఇయర్ ప్రారంభ తేదీ లేదా ముగింపు తేదీ {0} ఓవర్ల్యాప్ ఉంది. నివారించేందుకు కంపెనీని స్థాపించారు దయచేసి
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},అంశం కోసం ముగింపు తేదీ కంటే తక్కువ ఉండాలి తేదీ ప్రారంభించండి {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,అప్లోడ్ హాజరు
@@ -4330,7 +4338,6 @@
 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,బహుళ సమూహాలు అంశం యొక్క క్రాస్ జాబితా
-DocType: Grade Interval,Grade Interval,గ్రేడ్ ఇంటర్వెల్
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},ఫిస్కల్ ఇయర్ ప్రారంభ తేదీ మరియు ఫిస్కల్ ఇయర్ ఎండ్ తేదీ ఇప్పటికే ఫిస్కల్ ఇయర్ నిర్మితమయ్యాయి {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,క్లియరెన్స్ తేదీ నవీకరించబడింది
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,స్ప్లిట్ బ్యాచ్
@@ -4377,14 +4384,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,మీరు కోర్సు ఆధారంగా సమూహాలు చేస్తున్నప్పుటికీ బ్యాచ్ పరిగణలోకి అనుకుంటే ఎంచుకోవద్దు.
 DocType: Asset,Frequency of Depreciation (Months),అరుగుదల పౌనఃపున్యం (నెలలు)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,క్రెడిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,క్రెడిట్ ఖాతా
 DocType: Landed Cost Item,Landed Cost Item,అడుగుపెట్టాయి ఖర్చు అంశం
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,సున్నా విలువలు చూపించు
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,అంశం యొక్క మొత్తము ముడి పదార్థాల ఇచ్చిన పరిమాణంలో నుండి repacking / తయారీ తర్వాత పొందిన
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,సెటప్ నా సంస్థ కోసం ఒక సాధారణ వెబ్సైట్
 DocType: Payment Reconciliation,Receivable / Payable Account,స్వీకరించదగిన / చెల్లించవలసిన ఖాతా
 DocType: Delivery Note Item,Against Sales Order Item,అమ్మకాల ఆర్డర్ అంశం వ్యతిరేకంగా
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},గుణానికి విలువ లక్షణం రాయండి {0}
 DocType: Item,Default Warehouse,డిఫాల్ట్ వేర్హౌస్
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},బడ్జెట్ గ్రూప్ ఖాతా వ్యతిరేకంగా కేటాయించిన సాధ్యం కాదు {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,మాతృ ఖర్చు సెంటర్ నమోదు చేయండి
@@ -4429,7 +4436,7 @@
 DocType: Opportunity Item,Basic Rate,ప్రాథమిక రేటు
 DocType: GL Entry,Credit Amount,క్రెడిట్ మొత్తం
 DocType: Cheque Print Template,Signatory Position,సంతకం చేసే స్థానం
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,లాస్ట్ గా సెట్
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,లాస్ట్ గా సెట్
 DocType: Timesheet,Total Billable Hours,మొత్తం బిల్ చేయగలరు గంటలు
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,చెల్లింపు రసీదు గమనిక
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,ఈ ఈ కస్టమర్ వ్యతిరేకంగా లావాదేవీలు ఆధారంగా. వివరాల కోసం ఈ క్రింది కాలక్రమం చూడండి
@@ -4443,11 +4450,11 @@
 ,Items To Be Requested,అంశాలు అభ్యర్థించిన టు
 DocType: Purchase Order,Get Last Purchase Rate,గత కొనుగోలు రేటు పొందండి
 DocType: Company,Company Info,కంపెనీ సమాచారం
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,ఎంచుకోండి లేదా కొత్త కస్టమర్ జోడించడానికి
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,వ్యయ కేంద్రం ఒక వ్యయం దావా బుక్ అవసరం
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),ఫండ్స్ (ఆస్తులు) యొక్క అప్లికేషన్
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,ఈ ఈ ఉద్యోగి హాజరు ఆధారంగా
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,డెబిట్ ఖాతా
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,డెబిట్ ఖాతా
 DocType: Fiscal Year,Year Start Date,సంవత్సరం ప్రారంభం తేదీ
 DocType: Attendance,Employee Name,ఉద్యోగి పేరు
 DocType: Sales Invoice,Rounded Total (Company Currency),నున్నటి మొత్తం (కంపెనీ కరెన్సీ)
@@ -4456,13 +4463,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,కింది రోజులలో లీవ్ అప్లికేషన్స్ తయారీ నుండి వినియోగదారులు ఆపు.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,కొనుగోలు మొత్తాన్ని
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,సరఫరాదారు కొటేషన్ {0} రూపొందించారు
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ముగింపు సంవత్సరం ప్రారంభ సంవత్సరం కంటే ముందు ఉండకూడదు
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ఉద్యోగుల లాభాల
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},ఒక డిఫాల్ట్ ఉద్యోగి కోసం హాలిడే జాబితా సెట్ దయచేసి {0} లేదా కంపెనీ {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} చేస్తుంది ఉందో
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,వినియోగదారుడు ఎదిగింది బిల్లులు.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,ప్రాజెక్ట్ ఐడి
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},రో లేవు {0}: మొత్తం ఖర్చు చెప్పడం {1} వ్యతిరేకంగా మొత్తం పెండింగ్ కంటే ఎక్కువ ఉండకూడదు. పెండింగ్ మొత్తంలో {2}
@@ -4471,15 +4478,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 పఠనం
 ,Hub,హబ్
 DocType: GL Entry,Voucher Type,ఓచర్ టైప్
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,ధర జాబితా దొరకలేదు లేదా డిసేబుల్ లేదు
 DocType: Employee Loan Application,Approved,ఆమోదించబడింది
 DocType: Pricing Rule,Price,ధర
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} ఏర్పాటు చేయాలి మీద ఉపశమనం ఉద్యోగి &#39;Left&#39; గా
 DocType: Guardian,Guardian,సంరక్షకుడు
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,అప్రైసల్ {0} {1} ఇవ్వబడిన తేదీ పరిధిలో ఉద్యోగి కోసం సృష్టించబడింది
 DocType: Employee,Education,ఎడ్యుకేషన్
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,del
 DocType: Selling Settings,Campaign Naming By,ద్వారా ప్రచారం నేమింగ్
 DocType: Employee,Current Address Is,ప్రస్తుత చిరునామా
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,చివరి మార్పు
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","ఐచ్ఛికము. పేర్కొనబడలేదు ఉంటే, కంపెనీ యొక్క డిఫాల్ట్ కరెన్సీ అమర్చుతుంది."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,అకౌంటింగ్ జర్నల్ ఎంట్రీలు.
 DocType: Delivery Note Item,Available Qty at From Warehouse,గిడ్డంగి నుండి వద్ద అందుబాటులో ప్యాక్ చేసిన అంశాల
@@ -4488,7 +4497,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},రో {0}: పార్టీ / ఖాతాతో సరిపోలడం లేదు {1} / {2} లో {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ఖర్చుల ఖాతాను నమోదు చేయండి
 DocType: Account,Stock,స్టాక్
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","రో # {0}: రిఫరెన్స్ డాక్యుమెంట్ టైప్ కొనుగోలు ఆర్డర్ ఒకటి, కొనుగోలు వాయిస్ లేదా జర్నల్ ఎంట్రీ ఉండాలి"
 DocType: Employee,Current Address,ప్రస్తుత చిరునామా
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","స్పష్టంగా పేర్కొన్న తప్ప తరువాత అంశం వివరణ, చిత్రం, ధర, పన్నులు టెంప్లేట్ నుండి సెట్ చేయబడతాయి etc మరొక అంశం యొక్క ఒక వైవిధ్యం ఉంటే"
 DocType: Serial No,Purchase / Manufacture Details,కొనుగోలు / తయారీ వివరాలు
@@ -4516,7 +4525,7 @@
 DocType: Hub Settings,Hub Settings,హబ్ సెట్టింగ్స్
 DocType: Project,Gross Margin %,స్థూల సరిహద్దు %
 DocType: BOM,With Operations,ఆపరేషన్స్ తో
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,అకౌంటింగ్ ఎంట్రీలు ఇప్పటికే కరెన్సీ చేసారు {0} సంస్థ కోసం {1}. కరెన్సీతో గానీ స్వీకరించదగిన లేదా చెల్లించవలసిన ఖాతాను ఎంచుకోండి {0}.
 DocType: Asset,Is Existing Asset,ఆస్తి ఉన్న ఈజ్
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
 DocType: Salary Detail,Statistical Component,స్టాటిస్టికల్ భాగం
@@ -4540,7 +4549,7 @@
 DocType: Assessment Plan,Room,గది
 DocType: Purchase Order,Advance Paid,అడ్వాన్స్ చెల్లింపు
 DocType: Item,Item Tax,అంశం పన్ను
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,సరఫరాదారు మెటీరియల్
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,సరఫరాదారు మెటీరియల్
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ఎక్సైజ్ వాయిస్
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,ప్రభావసీమ {0}% ఒకసారి కంటే ఎక్కువ కనిపిస్తుంది
 DocType: Expense Claim,Employees Email Id,ఉద్యోగులు ఇమెయిల్ ఐడి
@@ -4571,9 +4580,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,లోగో అటాచ్
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,స్టాక్ స్థాయిలు
 DocType: Customer,Commission Rate,కమిషన్ రేటు
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,వేరియంట్ చేయండి
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,వేరియంట్ చేయండి
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,శాఖ బ్లాక్ సెలవు అప్లికేషన్లు.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","చెల్లింపు పద్ధతి, స్వీకరించండి ఒకటి ఉండాలి చెల్లించండి మరియు అంతర్గత బదిలీ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,విశ్లేషణలు
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,కార్ట్ ఖాళీగా ఉంది
 DocType: Vehicle,Model,మోడల్
@@ -4584,6 +4593,7 @@
 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 +161,Capital Stock,మూలధన నిల్వలను
+DocType: Shopping Cart Settings,Show Public Attachments,పబ్లిక్ అటాచ్మెంట్లు చూపించు
 DocType: Packing Slip,Package Weight Details,ప్యాకేజీ బరువు వివరాలు
 DocType: Payment Gateway Account,Payment Gateway Account,చెల్లింపు గేట్వే ఖాతా
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,చెల్లింపు పూర్తయిన తర్వాత ఎంపిక పేజీకి వినియోగదారు మళ్ళింపు.
@@ -4602,15 +4612,15 @@
 DocType: Batch,Expiry Date,గడువు తీరు తేదీ
 ,Supplier Addresses and Contacts,సరఫరాదారు చిరునామాలు మరియు కాంటాక్ట్స్
 ,accounts-browser,ఖాతాల బ్రౌజర్
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,మొదటి వర్గం ఎంచుకోండి దయచేసి
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,మొదటి వర్గం ఎంచుకోండి దయచేసి
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ప్రాజెక్టు మాస్టర్.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","స్టాక్ సెట్టింగులు లేదా Item లో &quot;అనుమతి&quot; అప్డేట్, ఓవర్ బిల్లింగ్ లేదా ఓవర్ ఆర్దరింగ్ అనుమతించుటకు."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,కరెన్సీ etc $ వంటి ఏ చిహ్నం తదుపరి చూపవద్దు.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(హాఫ్ డే)
 DocType: Supplier,Credit Days,క్రెడిట్ డేస్
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,స్టూడెంట్ బ్యాచ్ చేయండి
 DocType: Leave Type,Is Carry Forward,ఫార్వర్డ్ కారి ఉంటుంది
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,బిఒఎం నుండి అంశాలు పొందండి
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,సమయం రోజులు లీడ్
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},రో # {0}: తేదీ పోస్టింగ్ కొనుగోలు తేదీని అదే ఉండాలి {1} ఆస్తి యొక్క {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,పైన ఇచ్చిన పట్టికలో సేల్స్ ఆర్డర్స్ నమోదు చేయండి
@@ -4627,7 +4637,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,మంజూరు సొమ్ము
 DocType: GL Entry,Is Opening,ప్రారంభమని
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},రో {0}: డెబిట్ ప్రవేశం తో జతచేయవచ్చు ఒక {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,దయచేసి సెటప్ను&gt; సెటప్ ద్వారా హాజరు ధారావాహిక సంఖ్యలో నంబరింగ్ సిరీస్
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 10b4662..f2b3872 100644
--- a/erpnext/translations/th.csv
+++ b/erpnext/translations/th.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,เช่า
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,ใช้งานได้สำหรับผู้ใช้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",หยุดใบสั่งผลิตไม่สามารถยกเลิกจุกมันเป็นครั้งแรกที่จะยกเลิก
 DocType: Vehicle Service,Mileage,ระยะทาง
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,คุณไม่อยากที่จะทิ้งสินทรัพย์นี้?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,เลือกผู้ผลิตเริ่มต้น
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,เลือกผู้ผลิตเริ่มต้น
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},สกุลเงินเป็นสิ่งจำเป็นสำหรับราคา {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* จะถูกคำนวณในขณะทำรายการ
 DocType: Purchase Order,Customer Contact,ติดต่อลูกค้า
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),ที่โดดเด่นสำหรับ {0} ไม่ สามารถน้อยกว่า ศูนย์ ( {1})
 DocType: Manufacturing Settings,Default 10 mins,เริ่มต้น 10 นาที
 DocType: Leave Type,Leave Type Name,ฝากชื่อประเภท
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,แสดงเปิด
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,แสดงเปิด
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,ชุด ล่าสุด ที่ประสบความสำเร็จ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,เช็คเอาท์
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural วารสารรายการ Submitted
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Batch รายการสถานะหมดอายุ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,ตั๋วแลกเงิน
 DocType: Mode of Payment Account,Mode of Payment Account,โหมดของการบัญชีการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,แสดงหลากหลายรูปแบบ
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,แสดงหลากหลายรูปแบบ
 DocType: Academic Term,Academic Term,ระยะทางวิชาการ
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,วัสดุ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,จำนวน
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,จำนวน
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,ตารางบัญชีต้องไม่ว่างเปล่า
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),เงินให้กู้ยืม ( หนี้สิน )
 DocType: Employee Education,Year of Passing,ปีที่ผ่าน
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","อ้างอิง:% S, รหัสสินค้า:% s และลูกค้า:% s"
 DocType: Item,Country of Origin,ประเทศแหล่งกำเนิดสินค้า
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,ในสต็อก
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,เปิดประเด็น
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,การดูแลสุขภาพ
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ความล่าช้าในการชำระเงิน (วัน)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,ค่าใช้จ่ายในการให้บริการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,ใบกำกับสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},หมายเลขซีเรียล: {0} มีการอ้างถึงในใบแจ้งหนี้การขายแล้ว: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,ใบกำกับสินค้า
 DocType: Maintenance Schedule Item,Periodicity,การเป็นช่วง ๆ
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,ปีงบประมาณ {0} จะต้อง
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,คาดว่าวันที่จัดส่งสินค้าก่อนสั่งซื้อการขายวันที่
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",แนบไฟล์ csv ที่มีสองคอลัมน์หนึ่งชื่อเก่าและหนึ่งสำหรับชื่อใหม่
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} ไม่ได้อยู่ในปีงบประมาณใดๆ
 DocType: Packed Item,Parent Detail docname,docname รายละเอียดผู้ปกครอง
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",ข้อมูลอ้างอิง: {0} รหัสรายการ: {1} และลูกค้า: {2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,กิโลกรัม
 DocType: Student Log,Log,เข้าสู่ระบบ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,เปิดงาน
 DocType: Item Attribute,Increment,การเพิ่มขึ้น
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,เลือกคลังสินค้า ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,เลือกคลังสินค้า ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,การโฆษณา
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,บริษัท เดียวกันจะเข้ามามากกว่าหนึ่งครั้ง
 DocType: Employee,Married,แต่งงาน
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,รับรายการจาก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},ไม่อนุญาตสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,รับรายการจาก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},หุ้น ไม่สามารถปรับปรุง กับ การจัดส่งสินค้า หมายเหตุ {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},สินค้า {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,ไม่มีรายการที่ระบุไว้
 DocType: Payment Reconciliation,Reconcile,คืนดี
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,ร้านขายของชำ
 DocType: Quality Inspection Reading,Reading 1,Reading 1
 DocType: Process Payroll,Make Bank Entry,บันทึกรายการทางธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,กองทุน บำเหน็จบำนาญ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,ถัดไปวันที่ค่าเสื่อมราคาที่ไม่สามารถจะซื้อก่อนวันที่
 DocType: SMS Center,All Sales Person,คนขายทั้งหมด
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** การกระจายรายเดือน ** จะช่วยให้คุณแจกจ่ายงบประมาณ / เป้าหมายข้ามเดือนถ้าคุณมีฤดูกาลในธุรกิจของคุณ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ไม่พบรายการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,ไม่พบรายการ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,โครงสร้างเงินเดือนที่ขาดหายไป
 DocType: Lead,Person Name,คนที่ชื่อ
 DocType: Sales Invoice Item,Sales Invoice Item,รายการใบแจ้งหนี้การขาย
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",เช่น &quot;โรงเรียนประถม&quot; หรือ &quot;มหาวิทยาลัย&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,รายงานสต็อกสินค้า
 DocType: Warehouse,Warehouse Detail,รายละเอียดคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},วงเงินสินเชื่อที่ได้รับการข้ามสำหรับลูกค้า {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,วันที่สิ้นสุดระยะเวลาที่ไม่สามารถจะช้ากว่าปีวันที่สิ้นสุดปีการศึกษาที่คำว่ามีการเชื่อมโยง (ปีการศึกษา {}) โปรดแก้ไขวันและลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","ไม่สามารถเพิกถอน ""คือสินทรัพย์ถาวร"" ได้เพราะมีบันทึกสินทรัพย์ที่อยู่กับรายการ"
 DocType: Vehicle Service,Brake Oil,น้ำมันเบรค
 DocType: Tax Rule,Tax Type,ประเภทภาษี
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},คุณยังไม่ได้ รับอนุญาตให้ เพิ่มหรือปรับปรุง รายการ ก่อนที่ {0}
 DocType: BOM,Item Image (if not slideshow),รูปภาพสินค้า (ถ้าไม่สไลด์โชว์)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(อัตราค่าแรง / 60) * เวลาที่ดำเนินงานจริง
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,เลือก BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,เลือก BOM
 DocType: SMS Log,SMS Log,เข้าสู่ระบบ SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ค่าใช้จ่ายในการจัดส่งสินค้า
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,วันหยุดในวันที่ {0} ไม่ได้ระหว่างนับจากวันและวันที่
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,โรงเรียน
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ไม่มีประวัติการลาพบพนักงาน {0} สำหรับ {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,กรุณากรอก บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,กรุณาเลือก บริษัท แรก
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,ค่าใช้จ่ายรวม
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,จำนวนการเรียกร้อง
 DocType: Employee,Mr,นาย
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,กลุ่มลูกค้าซ้ำที่พบในตารางกลุ่มปัก
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,ประเภท ผู้ผลิต / ผู้จัดจำหน่าย
 DocType: Naming Series,Prefix,อุปสรรค
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,วัสดุสิ้นเปลือง
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,เกรด
 DocType: Sales Invoice Item,Delivered By Supplier,จัดส่งโดยผู้ผลิต
 DocType: SMS Center,All Contact,ติดต่อทั้งหมด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,ใบสั่งผลิตสร้างไว้แล้วสำหรับรายการทั้งหมดที่มี BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,เงินเดือนประจำปี
 DocType: Daily Work Summary,Daily Work Summary,สรุปการทำงานประจำวัน
 DocType: Period Closing Voucher,Closing Fiscal Year,ปิดปีงบประมาณ
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} ถูกระงับการใช้งานชั่วคราว
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,กรุณาเลือก บริษัท ที่มีอยู่สำหรับการสร้างผังบัญชี
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,ค่าใช้จ่ายใน สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,เลือกคลังข้อมูลเป้าหมาย
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,ในทางตรงกันข้ามการเข้า
 DocType: Journal Entry Account,Credit in Company Currency,เครดิตสกุลเงินใน บริษัท
 DocType: Delivery Note,Installation Status,สถานะการติดตั้ง
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",คุณต้องการที่จะปรับปรุงการเข้าร่วม? <br> ปัจจุบัน: {0} \ <br> ขาด: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},จำนวนสินค้าที่ผ่านการตรวจรับ + จำนวนสินค้าที่ไม่ผ่านการตรวจรับ จะต้องมีปริมาณเท่ากับ  จำนวน สืนค้าที่ได้รับ สำหรับ รายการ {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,วัตถุดิบสำหรับการซื้อวัสดุสิ้นเปลือง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ จุดขาย
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,อย่างน้อยหนึ่งโหมดการชำระเงินเป็นสิ่งจำเป็นสำหรับใบแจ้งหนี้ จุดขาย
 DocType: Products Settings,Show Products as a List,แสดงผลิตภัณฑ์ที่เป็นรายการ
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","ดาวน์โหลดแม่แบบกรอกข้อมูลที่เหมาะสมและแนบไฟล์ที่ถูกแก้ไข
@@ -224,7 +226,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,บันทึกรายการค่าเสื่อมราคา
 DocType: Appraisal Template Goal,KRA,กระ
 DocType: Lead,Request Type,ชนิดของการร้องขอ
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,สร้างพนักงาน
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,สร้างพนักงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,บรอดคาสติ้ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,การปฏิบัติ
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,รายละเอียดของการดำเนินการดำเนินการ
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,แผนสำหรับการเข้าชมการบำรุงรักษา
 DocType: SMS Settings,Enter url parameter for message,ป้อนพารามิเตอร์ URL สำหรับข้อความ
 DocType: POS Profile,Customer Groups,กลุ่มลูกค้า
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,งบการเงิน
 DocType: Guardian,Students,นักเรียน
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,กฎระเบียบ สำหรับการใช้ การกำหนดราคาและ ส่วนลด
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,รายการราคา จะต้องใช้ได้กับ การซื้อ หรือการขาย
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},จำนวนเงินล่วงหน้าไม่สามารถจะสูงกว่า {0} {1}
 DocType: Naming Series,Series List for this Transaction,รายชื่อชุดสำหรับการทำธุรกรรมนี้
 DocType: Company,Default Payroll Payable Account,เริ่มต้นเงินเดือนบัญชีเจ้าหนี้
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,อีเมลกลุ่มปรับปรุง
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,อีเมลกลุ่มปรับปรุง
 DocType: Sales Invoice,Is Opening Entry,จะเปิดรายการ
 DocType: Customer Group,Mention if non-standard receivable account applicable,ถ้าพูดถึงไม่ได้มาตรฐานลูกหนี้บังคับ
 DocType: Course Schedule,Instructor Name,ชื่ออาจารย์ผู้สอน
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,สำหรับ คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,ผู้ค้าปลีก
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",หากการตรวจสอบจะรวมถึงรายการที่ไม่ใช่หุ้นในคำขอวัสดุ
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,กับใบแจ้งหนี้การขายสินค้า
 ,Production Orders in Progress,สั่งซื้อ การผลิตใน ความคืบหน้า
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,เงินสดสุทธิจากการจัดหาเงินทุน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",LocalStorage เต็มไม่ได้บันทึก
 DocType: Lead,Address & Contact,ที่อยู่และการติดต่อ
 DocType: Leave Allocation,Add unused leaves from previous allocations,เพิ่มใบไม่ได้ใช้จากการจัดสรรก่อนหน้า
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},ที่เกิดขึ้นต่อไป {0} จะถูกสร้างขึ้นบน {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),รวมคำนวณต้นทุนจำนวนเงิน (ผ่านใบบันทึกเวลา)
 DocType: Item Website Specification,Item Website Specification,สเปกเว็บไซต์รายการ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,ฝากที่ถูกบล็อก
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,รายการธนาคาร
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},รายการ {0} ได้ ถึงจุดสิ้นสุด ของ ชีวิตบน {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,รายการธนาคาร
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,ประจำปี
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,สต็อกสินค้าสมานฉันท์
 DocType: Stock Entry,Sales Invoice No,ขายใบแจ้งหนี้ไม่มี
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,เผยแพร่ใน Hub
 DocType: Student Admission,Student Admission,การรับสมัครนักศึกษา
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,ขอวัสดุ
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,รายการ {0} จะถูกยกเลิก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,ขอวัสดุ
 DocType: Bank Reconciliation,Update Clearance Date,อัพเดทวันที่ Clearance
 DocType: Item,Purchase Details,รายละเอียดการซื้อ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},รายการ {0} ไม่พบใน &#39;วัตถุดิบมา&#39; ตารางในการสั่งซื้อ {1}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,เช็คที่โดดเด่นและเงินฝากที่จะล้าง
 DocType: Item,Synced With Hub,ซิงค์กับฮับ
 DocType: Vehicle,Fleet Manager,ผู้จัดการกอง
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},แถว # {0}: {1} ไม่สามารถลบสำหรับรายการ {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,รหัสผ่านไม่ถูกต้อง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},แถว # {0}: {1} ไม่สามารถลบสำหรับรายการ {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,รหัสผ่านไม่ถูกต้อง
 DocType: Item,Variant Of,แตกต่างจาก
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',เสร็จสมบูรณ์จำนวนไม่สามารถจะสูงกว่า 'จำนวนการผลิต'
 DocType: Period Closing Voucher,Closing Account Head,ปิดหัวบัญชี
 DocType: Employee,External Work History,ประวัติการทำงานภายนอก
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,ข้อผิดพลาดในการอ้างอิงแบบวงกลม
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,แจ้งทางอีเมล์เมื่อการสร้างการร้องขอวัสดุโดยอัตโนมัติ
 DocType: Journal Entry,Multi Currency,หลายสกุลเงิน
 DocType: Payment Reconciliation Invoice,Invoice Type,ประเภทใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,หมายเหตุจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,หมายเหตุจัดส่งสินค้า
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,การตั้งค่าภาษี
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,ต้นทุนของทรัพย์สินที่ขาย
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,เข้าชำระเงินได้รับการแก้ไขหลังจากที่คุณดึงมัน กรุณาดึงมันอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
-DocType: Grade Interval,Min Score,คะแนนต่ำสุด
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} ได้บันทึกเป็นครั้งที่สองใน รายการ ภาษี
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,สรุปในสัปดาห์นี้และกิจกรรมที่ค้างอยู่
 DocType: Student Applicant,Admitted,ที่ยอมรับ
 DocType: Workstation,Rent Cost,ต้นทุนการ ให้เช่า
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,มูลค่าคำสั่งซื้อ
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,การทำธุรกรรมธนาคาร / เงินสดกับบุคคลหรือสำหรับการถ่ายโอนภายใน
 DocType: Shipping Rule,Valid for Countries,ที่ถูกต้องสำหรับประเทศ
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,รายการนี้เป็นแม่แบบและไม่สามารถนำมาใช้ในการทำธุรกรรม คุณลักษณะสินค้าจะถูกคัดลอกไปสู่สายพันธุ์เว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,ยอดสั่งซื้อรวมถือว่า
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",การแต่งตั้ง พนักงาน ของคุณ (เช่น ซีอีโอ ผู้อำนวยการ ฯลฯ )
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,กรุณากรอก ' ทำซ้ำ ในวัน เดือน ' ค่าของฟิลด์
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},แถว # {0}: ซื้อใบแจ้งหนี้ไม่สามารถทำกับเนื้อหาที่มีอยู่ {1}
 DocType: Item Tax,Tax Rate,อัตราภาษี
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} จัดสรรสำหรับพนักงาน {1} แล้วสำหรับรอบระยะเวลา {2} ถึง {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,เลือกรายการ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,เลือกรายการ
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,ซื้อ ใบแจ้งหนี้ {0} มีการส่ง แล้ว
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},แถว # {0}: รุ่นที่ไม่มีจะต้องเป็นเช่นเดียวกับ {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,แปลงที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,แบทช์ (มาก) ของรายการ
 DocType: C-Form Invoice Detail,Invoice Date,วันที่ออกใบแจ้งหนี้
 DocType: GL Entry,Debit Amount,จำนวนเงินเดบิต
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},มีเพียงสามารถเป็น 1 บัญชีต่อ บริษัท {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,โปรดดูสิ่งที่แนบมา
 DocType: Purchase Order,% Received,% ที่ได้รับแล้ว
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,สร้างกลุ่มนักศึกษา
@@ -440,9 +442,9 @@
 DocType: Request for Quotation,Request for Quotation,ขอใบเสนอราคา
 DocType: Salary Slip Timesheet,Working Hours,เวลาทำการ
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,เปลี่ยนหมายเลขลำดับเริ่มต้น / ปัจจุบันของชุดที่มีอยู่
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,สร้างลูกค้าใหม่
-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.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,สร้างลูกค้าใหม่
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ถ้ากฎการกำหนดราคาหลายยังคงเหนือกว่าผู้ใช้จะขอให้ตั้งลำดับความสำคัญด้วยตนเองเพื่อแก้ไขความขัดแย้ง
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,สร้างใบสั่งซื้อ
 ,Purchase Register,สั่งซื้อสมัครสมาชิก
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,ค่าใช้จ่าย
@@ -450,7 +452,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) ต้องมีสิทธิ์เป็น 'ผู้อนุมัติการลา'
 DocType: Purchase Receipt,Vehicle Date,วันที่ยานพาหนะ
 DocType: Student Log,Medical,การแพทย์
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,เหตุผล สำหรับการสูญเสีย
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,เหตุผล สำหรับการสูญเสีย
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,เจ้าของตะกั่วไม่สามารถเช่นเดียวกับตะกั่ว
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,จำนวนเงินที่จัดสรรไม่สามารถมากกว่าจำนวนเท็มเพลต
 DocType: Announcement,Receiver,ผู้รับ
@@ -467,6 +469,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,จำนวนและอัตรา
 DocType: Delivery Note,% Installed,% ที่ติดตั้งแล้ว
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,ห้องเรียน / ห้องปฏิบัติการอื่น ๆ ที่บรรยายสามารถกำหนด
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,กรุณาใส่ ชื่อของ บริษัท เป็นครั้งแรก
 DocType: Purchase Invoice,Supplier Name,ชื่อผู้จัดจำหน่าย
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,อ่านคู่มือ ERPNext
@@ -483,16 +486,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ฟิลด์บังคับ - Academic Year
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,ฟิลด์บังคับ - ปีการศึกษา
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,ปรับแต่งข้อความเกริ่นนำที่จะไปเป็นส่วนหนึ่งของอีเมลที่ แต่ละรายการมีข้อความเกริ่นนำแยก
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},โปรดตั้งค่าบัญชีค่าตั้งต้นสำหรับ บริษัท {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,การตั้งค่าโดยรวม สำหรับกระบวนการผลิตทั้งหมด
 DocType: Accounts Settings,Accounts Frozen Upto,บัญชีถูกแช่แข็งจนถึง
 DocType: SMS Log,Sent On,ส่ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,แอตทริบิวต์ {0} เลือกหลายครั้งในคุณสมบัติตาราง
 DocType: HR Settings,Employee record is created using selected field. ,ระเบียนของพนักงานจะถูกสร้างขึ้นโดยใช้เขตข้อมูลที่เลือก
 DocType: Sales Order,Not Applicable,ไม่สามารถใช้งาน
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,นาย ฮอลิเดย์
 DocType: Request for Quotation Item,Required Date,วันที่ที่ต้องการ
 DocType: Delivery Note,Billing Address,ที่อยู่ในการเรียกเก็บเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,กรุณากรอก รหัสสินค้า
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,กรุณากรอก รหัสสินค้า
 DocType: BOM,Costing,ต้นทุน
 DocType: Tax Rule,Billing County,การเรียกเก็บเงินเคาน์ตี้
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",หากการตรวจสอบจำนวนเงินภาษีจะถือว่าเป็นรวมอยู่ในอัตราพิมพ์ / จำนวนพิมพ์
@@ -508,6 +512,7 @@
 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,หลักทรัพย์และ เงินฝาก
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",ไม่สามารถเปลี่ยนแปลงวิธีการประเมินเนื่องจากมีธุรกรรมบางอย่างที่ไม่ได้เป็นวิธีการประเมินของตนเอง
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,ใบรวมจัดสรรมีผลบังคับใช้
 DocType: Job Opening,Description of a Job Opening,คำอธิบายของการเปิดงาน
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,ที่รอดำเนินการกิจกรรมสำหรับวันนี้
@@ -529,13 +534,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,กรุณาเลือกหลักสูตร
 DocType: Timesheet Detail,Hrs,ชั่วโมง
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,กรุณาเลือก บริษัท
 DocType: Stock Entry Detail,Difference Account,บัญชี ที่แตกต่างกัน
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,ไม่สามารถปิดงานเป็นงานขึ้นอยู่กับ {0} ไม่ได้ปิด
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,กรุณากรอก คลังสินค้า ที่ ขอ วัสดุ จะ ได้รับการเลี้ยงดู
 DocType: Production Order,Additional Operating Cost,เพิ่มเติมต้นทุนการดำเนินงาน
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,เครื่องสำอาง
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ที่จะ ผสาน คุณสมบัติต่อไปนี้ จะต้อง เหมือนกันสำหรับ ทั้งสองรายการ
 DocType: Shipping Rule,Net Weight,ปริมาณสุทธิ
 DocType: Employee,Emergency Phone,โทรศัพท์ ฉุกเฉิน
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,ซื้อ
@@ -545,7 +550,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,โปรดกำหนดระดับสำหรับเกณฑ์ 0%
 DocType: Sales Order,To Deliver,ที่จะส่งมอบ
 DocType: Purchase Invoice Item,Item,สินค้า
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,อนุกรมไม่มีรายการไม่สามารถเป็นเศษส่วน
 DocType: Journal Entry,Difference (Dr - Cr),แตกต่าง ( ดร. - Cr )
 DocType: Account,Profit and Loss,กำไรและ ขาดทุน
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,รับเหมาช่วงการจัดการ
@@ -560,7 +565,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,ไม่สามารถเพิ่มเป็น 0
 DocType: Production Planning Tool,Material Requirement,ความต้องการวัสดุ
 DocType: Company,Delete Company Transactions,ลบรายการที่ บริษัท
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,อ้างอิงและการอ้างอิงวันที่มีผลบังคับใช้สำหรับการทำธุรกรรมธนาคาร
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,เพิ่ม / แก้ไข ภาษีและค่าธรรมเนียม
 DocType: Purchase Invoice,Supplier Invoice No,ใบแจ้งหนี้ที่ผู้ผลิตไม่มี
 DocType: Territory,For reference,สำหรับการอ้างอิง
@@ -571,7 +576,7 @@
 DocType: Installation Note Item,Installation Note Item,รายการหมายเหตุการติดตั้ง
 DocType: Production Plan Item,Pending Qty,รอดำเนินการจำนวน
 DocType: Budget,Ignore,ไม่สนใจ
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} ไม่ได้ใช้งาน
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS ที่ส่งไปยังหมายเลขดังต่อไปนี้: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,ขนาดการตั้งค่าการตรวจสอบสำหรับการพิมพ์
 DocType: Salary Slip,Salary Slip Timesheet,Timesheet สลิปเงินเดือน
@@ -580,13 +585,13 @@
 DocType: Sales Invoice,Total Commission,คณะกรรมการรวม
 DocType: Pricing Rule,Sales Partner,พันธมิตรการขาย
 DocType: Buying Settings,Purchase Receipt Required,รับซื้อที่จำเป็น
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,อัตราการประเมินมีผลบังคับใช้หากเปิดการแจ้งเข้ามา
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,ไม่พบใบแจ้งหนี้ในตารางบันทึก
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,กรุณาเลือก บริษัท และประเภทพรรคแรก
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,การเงิน รอบปีบัญชี /
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,ค่าสะสม
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",ขออภัย อนุกรม Nos ไม่สามารถ รวม
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,สร้างการขายสินค้า
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,สร้างการขายสินค้า
 DocType: Project Task,Project Task,โครงการงาน
 ,Lead Id,รหัสช่องทาง
 DocType: C-Form Invoice Detail,Grand Total,รวมทั้งสิ้น
@@ -603,7 +608,7 @@
 DocType: Job Applicant,Resume Attachment,Resume สิ่งที่แนบมา
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,ทำซ้ำลูกค้า
 DocType: Leave Control Panel,Allocate,จัดสรร
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,ขายกลับ
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,ขายกลับ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,หมายเหตุ: ใบที่จัดสรรทั้งหมด {0} ไม่ควรจะน้อยกว่าใบอนุมัติแล้ว {1} สําหรับงวด
 DocType: Announcement,Posted By,โพสโดย
 DocType: Item,Delivered by Supplier (Drop Ship),จัดส่งโดยผู้ผลิต (Drop Ship)
@@ -613,7 +618,7 @@
 DocType: Quotation,Quotation To,ใบเสนอราคาเพื่อ
 DocType: Lead,Middle Income,มีรายได้ปานกลาง
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),เปิด ( Cr )
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,จำนวนเงินที่จัดสรร ไม่สามารถ ลบ
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,โปรดตั้ง บริษัท
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,โปรดตั้ง บริษัท
@@ -625,7 +630,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,ขายใบแจ้งหนี้ Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},ไม่มี การอ้างอิง และการอ้างอิง วันที่ เป็นสิ่งจำเป็นสำหรับ {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,เลือกบัญชีการชำระเงินเพื่อเข้าธนาคาร
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",สร้างระเบียนของพนักงานในการจัดการใบเรียกร้องค่าใช้จ่ายและเงินเดือน
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,เพิ่มในฐานความรู้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,การเขียน ข้อเสนอ
 DocType: Payment Entry Deduction,Payment Entry Deduction,หักรายการชำระเงิน
@@ -656,19 +661,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} ' {1} ' ไม่ได้อยู่ใน ปีงบประมาณ {2}
 DocType: Buying Settings,Settings for Buying Module,การตั้งค่าสำหรับโมดุลการซื้อ
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},สินทรัพย์ {0} ไม่ได้เป็นของ บริษัท {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,กรุณาใส่ใบเสร็จรับเงินครั้งแรก
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","แล้วกฎราคาจะถูกกรองออกขึ้นอยู่กับลูกค้ากลุ่มลูกค้า, มณฑล, ผู้ผลิต, ผู้ผลิตประเภทแคมเปญพันธมิตรการขายอื่น ๆ"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,เปลี่ยนสุทธิในสินค้าคงคลัง
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,การบริหารจัดการเงินกู้พนักงาน
 DocType: Employee,Passport Number,หมายเลขหนังสือเดินทาง
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,ความสัมพันธ์กับ Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,ผู้จัดการ
 DocType: Payment Entry,Payment From / To,การชำระเงินจาก / ถึง
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,ช่วงวันที่
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},วงเงินสินเชื่อใหม่น้อยกว่าจำนวนเงินที่ค้างในปัจจุบันสำหรับลูกค้า วงเงินสินเชื่อจะต้องมีอย่างน้อย {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,'ขึ้นอยู่กับ' และ 'จัดกลุ่มโดย' ต้องไม่เหมือนกัน
@@ -677,8 +681,8 @@
 DocType: Production Order Operation,In minutes,ในไม่กี่นาที
 DocType: Issue,Resolution Date,วันที่ความละเอียด
 DocType: Student Batch Name,Batch Name,ชื่อแบทช์
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet สร้าง:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet สร้าง:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},กรุณาตั้ง ค่าเริ่มต้น เงินสด หรือ บัญชีเงินฝากธนาคาร ใน โหมด ของ การชำระเงิน {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,ลงทะเบียน
 DocType: Selling Settings,Customer Naming By,การตั้งชื่อตามลูกค้า
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,จะแสดงให้นักเรียนเป็นปัจจุบันในรายงานผลการเข้าร่วมประชุมรายเดือนนักศึกษา
@@ -706,7 +710,7 @@
 DocType: Production Order Operation,Actual Start Time,เวลาเริ่มต้นที่เกิดขึ้นจริง
 DocType: BOM Operation,Operation Time,เปิดบริการเวลา
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,เสร็จสิ้น
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,ฐาน
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,ฐาน
 DocType: Timesheet,Total Billed Hours,รวมชั่วโมงการเรียกเก็บเงิน
 DocType: Journal Entry,Write Off Amount,เขียนทันทีจำนวน
 DocType: Journal Entry,Bill No,หมายเลขบิล
@@ -722,7 +726,7 @@
 DocType: Student Attendance,Student Attendance,นักศึกษาเข้าร่วม
 DocType: Sales Invoice Timesheet,Time Sheet,ใบบันทึกเวลา
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush วัตถุดิบที่ใช้ใน
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,กรุณากรอก รายละเอียดของรายการ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,กรุณากรอก รายละเอียดของรายการ
 DocType: Interest,Interest,ดอกเบี้ย
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,ขายก่อน
 DocType: Purchase Receipt,Other Details,รายละเอียดอื่น ๆ
@@ -733,24 +737,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,รายการชำระเงินที่สร้างไว้แล้ว
 DocType: Purchase Receipt Item Supplied,Current Stock,สต็อกปัจจุบัน
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},แถว # {0}: สินทรัพย์ {1} ไม่เชื่อมโยงกับรายการ {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,ดูตัวอย่างสลิปเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,บัญชี {0} ได้รับการป้อนหลายครั้ง
 DocType: Account,Expenses Included In Valuation,ค่าใช้จ่ายรวมอยู่ในการประเมินมูลค่า
 DocType: Hub Settings,Seller City,ผู้ขายเมือง
 ,Absent Student Report,รายงานนักศึกษาขาด
 DocType: Email Digest,Next email will be sent on:,อีเมล์ถัดไปจะถูกส่งเมื่อ:
 DocType: Offer Letter Term,Offer Letter Term,เสนอระยะจดหมาย
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,รายการที่มีสายพันธุ์
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,รายการที่มีสายพันธุ์
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,รายการที่ {0} ไม่พบ
 DocType: Bin,Stock Value,มูลค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,บริษัท {0} ไม่อยู่
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,ประเภท ต้นไม้
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,ประเภท ต้นไม้
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Consumed จำนวนต่อหน่วย
 DocType: Serial No,Warranty Expiry Date,วันหมดอายุการรับประกัน
 DocType: Material Request Item,Quantity and Warehouse,ปริมาณและคลังสินค้า
 DocType: Sales Invoice,Commission Rate (%),อัตราค่าคอมมิชชั่น (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,โปรดเลือกโปรแกรม
 DocType: Project,Estimated Cost,ค่าใช้จ่ายประมาณ
@@ -769,7 +771,7 @@
 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,บัญชีเริ่มต้น
 DocType: Payment Entry,Received Amount (Company Currency),ได้รับจำนวนเงิน ( บริษัท สกุล)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,ต้องตั้งช่องทาง ถ้า โอกาสถูกสร้างมาจากช่องทาง
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,กรุณาเลือก วันหยุด ประจำสัปดาห์
 DocType: Production Order Operation,Planned End Time,เวลาสิ้นสุดการวางแผน
 ,Sales Person Target Variance Item Group-Wise,คน ขาย เป้าหมาย แปรปรวน กลุ่มสินค้า - ฉลาด
@@ -785,6 +787,7 @@
 DocType: Opportunity,Opportunity From,โอกาสจาก
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,งบเงินเดือน
 DocType: BOM,Website Specifications,ข้อมูลจำเพาะเว็บไซต์
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: จาก {0} ประเภท {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,แถว {0}: ปัจจัยการแปลงมีผลบังคับใช้
@@ -838,6 +841,7 @@
 DocType: Employee,Bank A/C No.,เลขที่บัญชีธนาคาร
 DocType: Bank Guarantee,Project,โครงการ
 DocType: Quality Inspection Reading,Reading 7,อ่าน 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,สั่งซื้อบางส่วน
 DocType: Expense Claim Detail,Expense Claim Type,เรียกร้องประเภทค่าใช้จ่าย
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,การตั้งค่าเริ่มต้นสำหรับรถเข็น
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},สินทรัพย์ทิ้งผ่านทางวารสารรายการ {0}
@@ -845,14 +849,14 @@
 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 +107,Office Maintenance Expenses,ค่าใช้จ่ายใน การบำรุงรักษา สำนักงาน
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,การตั้งค่าบัญชีอีเมล
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,กรุณากรอก รายการ แรก
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,กรุณากรอก รายการ แรก
 DocType: Account,Liability,ความรับผิดชอบ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,ตามทำนองคลองธรรมจำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่เรียกร้องในแถว {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,ราคา ไม่ได้เลือก
 DocType: Employee,Family Background,ภูมิหลังของครอบครัว
 DocType: Request for Quotation Supplier,Send Email,ส่งอีเมล์
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},คำเตือน: สิ่งที่แนบมาไม่ถูกต้อง {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,ไม่ได้รับอนุญาต
 DocType: Company,Default Bank Account,บัญชีธนาคารเริ่มต้น
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",ในการกรองขึ้นอยู่กับพรรคเลือกพรรคพิมพ์ครั้งแรก
@@ -865,8 +869,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,พบว่า พนักงานที่ ไม่มี
 DocType: Supplier Quotation,Stopped,หยุด
 DocType: Item,If subcontracted to a vendor,ถ้าเหมาไปยังผู้ขาย
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,มีการอัปเดตกลุ่มนักเรียนแล้ว
 DocType: SMS Center,All Customer Contact,ติดต่อลูกค้าทั้งหมด
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,อัพโหลดสมดุลหุ้นผ่าน CSV
 DocType: Warehouse,Tree Details,รายละเอียดต้นไม้
@@ -877,8 +881,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,จำนวนใบแจ้งหนี้ขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: ศูนย์ต้นทุน {2} ไม่ได้เป็นของ บริษัท {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: บัญชี {2} ไม่สามารถเป็นกลุ่ม
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,รายการแถว {IDX}: {DOCTYPE} {} DOCNAME ไม่อยู่ในข้างต้น &#39;{} DOCTYPE&#39; ตาราง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} เสร็จสมบูรณ์แล้วหรือยกเลิก
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,ไม่มีงาน
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","วันของเดือนที่ใบแจ้งหนี้อัตโนมัติจะถูกสร้างขึ้นเช่น 05, 28 ฯลฯ"
 DocType: Asset,Opening Accumulated Depreciation,เปิดค่าเสื่อมราคาสะสม
@@ -894,7 +898,7 @@
 DocType: Bin,Moving Average Rate,ย้ายอัตราเฉลี่ย
 DocType: Production Planning Tool,Select Items,เลือกรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} กับบิล {1} ลงวันที่ {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,ตารางเรียน
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,ตารางเรียน
 DocType: Maintenance Visit,Completion Status,สถานะเสร็จ
 DocType: HR Settings,Enter retirement age in years,ใส่อายุเกษียณในปีที่ผ่าน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,คลังสินค้าเป้าหมาย
@@ -902,7 +906,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,อนุญาตให้ส่งมอบหรือใบเสร็จรับเงินได้ไม่เกินร้อยละนี้
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,การเข้าร่วมประชุมและนำเข้า
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,ทั้งหมด รายการ กลุ่ม
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,ทั้งหมด รายการ กลุ่ม
 DocType: Process Payroll,Activity Log,บันทึกกิจกรรม
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,กำไร / ขาดทุน
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,เขียนข้อความ โดยอัตโนมัติใน การส่ง ของ การทำธุรกรรม
@@ -913,7 +917,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,การสั่งซื้อที่จะชำระเงิน
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,จำนวนที่คาดการณ์ไว้
 DocType: Sales Invoice,Payment Due Date,วันที่ครบกำหนด ชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,รายการตัวแปร {0} อยู่แล้วที่มีลักษณะเดียวกัน
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening','กำลังเปิด'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,เปิดให้ทำ
 DocType: Notification Control,Delivery Note Message,ข้อความหมายเหตุจัดส่งสินค้า
@@ -929,7 +933,7 @@
 DocType: Item Reorder,Re-Order Qty,Re สั่งซื้อจำนวน
 DocType: Leave Block List Date,Leave Block List Date,ฝากวันที่รายการบล็อก
 DocType: Pricing Rule,Price or Discount,ราคา หรือ ส่วนลด
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ค่าใช้จ่ายรวมในการซื้อโต๊ะใบเสร็จรับเงินรายการที่จะต้องเป็นเช่นเดียวกับภาษีและค่าใช้จ่ายรวม
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,ค่าใช้จ่ายรวมในการซื้อโต๊ะใบเสร็จรับเงินรายการที่จะต้องเป็นเช่นเดียวกับภาษีและค่าใช้จ่ายรวม
 DocType: Sales Team,Incentives,แรงจูงใจ
 DocType: SMS Log,Requested Numbers,ตัวเลขการขอ
 DocType: Production Planning Tool,Only Obtain Raw Materials,ขอรับเฉพาะวัตถุดิบ
@@ -958,13 +962,13 @@
 DocType: Supplier Quotation,Is Subcontracted,เหมา
 DocType: Item Attribute,Item Attribute Values,รายการค่าแอตทริบิวต์
 DocType: Examination Result,Examination Result,ผลการตรวจสอบ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,ใบเสร็จรับเงินการสั่งซื้อ
 ,Received Items To Be Billed,รายการที่ได้รับจะถูกเรียกเก็บเงิน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,ส่งสลิปเงินเดือน
 DocType: Employee,Ms,นางสาว / นาง
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,นาย อัตรา แลกเปลี่ยนเงินตราต่างประเทศ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},อ้างอิง Doctype ต้องเป็นหนึ่งใน {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},อ้างอิง Doctype ต้องเป็นหนึ่งใน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},ไม่สามารถหาช่วงเวลาใน {0} วันถัดไปสำหรับการปฏิบัติงาน {1}
 DocType: Production Order,Plan material for sub-assemblies,วัสดุแผนประกอบย่อย
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,พันธมิตรการขายและดินแดน
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,โดยอัตโนมัติไม่สามารถสร้างบัญชีที่มีอยู่แล้วความสมดุลหุ้นในบัญชี คุณต้องสร้างบัญชีการจับคู่ก่อนที่คุณจะสามารถทำรายการในคลังสินค้านี้
@@ -987,10 +991,9 @@
 DocType: Supplier,Default Payable Accounts,บัญชีเจ้าหนี้เริ่มต้น
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,พนักงาน {0} ไม่ได้ ใช้งานอยู่หรือ ไม่อยู่
 DocType: Fee Structure,Components,ส่วนประกอบ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,สินค้าหลากหลายรูปแบบ {0} ปรับปรุง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},กรุณากรอกประเภทสินทรัพย์ในข้อ {0}
 DocType: Quality Inspection Reading,Reading 6,Reading 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,ไม่สามารถ {0} {1} {2} โดยไม่ต้องมีใบแจ้งหนี้ที่โดดเด่นในเชิงลบ
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,ใบแจ้งหนี้การซื้อล่วงหน้า
 DocType: Hub Settings,Sync Now,ซิงค์เดี๋ยวนี้
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},แถว {0}: รายการเครดิตไม่สามารถเชื่อมโยงกับ {1}
@@ -1004,11 +1007,11 @@
 DocType: Item,Is Purchase Item,รายการซื้อเป็น
 DocType: Asset,Purchase Invoice,ซื้อใบแจ้งหนี้
 DocType: Stock Ledger Entry,Voucher Detail No,รายละเอียดบัตรกำนัลไม่มี
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,ใบแจ้งหนี้การขายใหม่
 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,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,เปิดวันที่และวันปิดควรจะอยู่ในปีงบประมาณเดียวกัน
 DocType: Lead,Request for Information,การร้องขอข้อมูล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,ซิงค์ออฟไลน์ใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,ซิงค์ออฟไลน์ใบแจ้งหนี้
 DocType: Payment Request,Paid,ชำระ
 DocType: Program Fee,Program Fee,ค่าธรรมเนียมโครงการ
 DocType: Salary Slip,Total in words,รวมอยู่ในคำพูด
@@ -1018,7 +1021,7 @@
 DocType: Employee Loan,Sanctioned,ตามทำนองคลองธรรม
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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;ตาราง"
 DocType: Job Opening,Publish on website,เผยแพร่บนเว็บไซต์
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,จัดส่งให้กับลูกค้า
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,วันที่จัดจำหน่ายใบแจ้งหนี้ไม่สามารถมีค่ามากกว่าการโพสต์วันที่
@@ -1029,7 +1032,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,ความแปรปรวน
 ,Company Name,ชื่อ บริษัท
 DocType: SMS Center,Total Message(s),ข้อความ รวม (s)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,เลือกรายการสำหรับการโอนเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,เลือกหัวที่บัญชีของธนาคารที่ตรวจสอบถูกวาง
@@ -1040,8 +1043,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,แถว {0}: การชำระเงินกับการขาย / การสั่งซื้อควรจะทำเครื่องหมายเป็นล่วงหน้า
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,สารเคมี
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,เริ่มต้นของบัญชีธนาคาร / เงินสดจะได้รับการปรับปรุงโดยอัตโนมัติในเงินเดือนวารสารรายการเมื่อโหมดนี้จะถูกเลือก
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",ช่วงเวลาสำหรับรหัสเกรด {0} คาบเกี่ยวกับช่วงคะแนนสำหรับเกรดอื่น ๆ กรุณาตรวจสอบช่วงเวลา {0} และ {1} และลองอีกครั้ง
 DocType: BOM,Raw Material Cost(Company Currency),ต้นทุนวัตถุดิบ ( บริษัท สกุล)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,รายการทั้งหมดที่ได้รับการโอนใบสั่งผลิตนี้
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},แถว # {0}: อัตราไม่สามารถสูงกว่าอัตราที่ใช้ใน {1} {2}
@@ -1054,13 +1055,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM รายการเว็บไซต์
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,อัปโหลดหัวจดหมายของคุณและโลโก้ (คุณสามารถแก้ไขได้ในภายหลัง)
 DocType: Timesheet Detail,Bill,บิล
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,ถัดไปวันที่มีการป้อนค่าเสื่อมราคาเป็นวันที่ผ่านมา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,ขาว
 DocType: SMS Center,All Lead (Open),ช่องทางทั้งหมด (เปิด)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),แถว {0}: จำนวนไม่สามารถใช้ได้สำหรับ {4} ในคลังสินค้า {1} ที่โพสต์เวลาของรายการ ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,รับเงินทดรองจ่าย
 DocType: Item,Automatically Create New Batch,สร้างชุดงานใหม่โดยอัตโนมัติ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,สร้าง
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,สร้าง
 DocType: Student Admission,Admission Start Date,การรับสมัครวันที่เริ่มต้น
 DocType: Journal Entry,Total Amount in Words,จำนวนเงินทั้งหมดในคำ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,เกิดข้อผิดพลาด น่าจะเป็น เหตุผลหนึ่งที่ อาจ เป็นไปได้ว่า คุณ ยังไม่ได้บันทึก ในรูปแบบ โปรดติดต่อ support@erpnext.com ถ้า ปัญหายังคงอยู่
@@ -1068,7 +1069,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,เปิด จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,กรุณากรอกบัญชีเพื่อการเปลี่ยนแปลงจำนวน
 DocType: Student Batch Name,Student Batch Name,นักศึกษาชื่อชุด
 DocType: Holiday List,Holiday List Name,ชื่อรายการวันหยุด
 DocType: Repayment Schedule,Balance Loan Amount,ยอดคงเหลือวงเงินกู้
@@ -1088,10 +1089,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},โปรดระบุ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,รายการที่ลบออกด้วยการเปลี่ยนแปลงในปริมาณหรือไม่มีค่า
 DocType: Delivery Note,Delivery To,เพื่อจัดส่งสินค้า
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,ตาราง Attribute มีผลบังคับใช้
 DocType: Production Planning Tool,Get Sales Orders,รับการสั่งซื้อการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} ไม่สามารถเป็นจำนวนลบได้
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ส่วนลด
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ส่วนลด
 DocType: Asset,Total Number of Depreciations,จำนวนรวมของค่าเสื่อมราคา
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
 DocType: Sales Invoice Item,Rate With Margin,อัตรากับ Margin
@@ -1107,7 +1108,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,คลังสินค้าสำรองในการขายการสั่งซื้อ / โกดังสินค้าสำเร็จรูป
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,ปริมาณการขาย
 DocType: Repayment Schedule,Interest Amount,จำนวนเงินที่น่าสนใจ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ บันทึก
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,คุณเป็น ผู้อนุมัติ ค่าใช้จ่าย สำหรับการ บันทึก นี้ กรุณา อัปเดต 'สถานะ ' และ บันทึก
 DocType: Serial No,Creation Document No,การสร้าง เอกสาร ไม่มี
 DocType: Issue,Issue,ปัญหา
 DocType: Asset,Scrapped,ทะเลาะวิวาท
@@ -1115,12 +1116,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","คุณสมบัติสำหรับความหลากหลายของสินค้า เช่นขนาด, สี ฯลฯ"
 DocType: Purchase Invoice,Returns,ผลตอบแทน
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP คลังสินค้า
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้สัญญา การบำรุงรักษา ไม่เกิน {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,รับสมัครงาน
 DocType: Lead,Organization Name,ชื่อองค์กร
 DocType: Tax Rule,Shipping State,การจัดส่งสินค้าของรัฐ
 ,Projected Quantity as Source,คาดการณ์ปริมาณเป็นแหล่ง
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,รายการจะต้องมีการเพิ่มการใช้ 'รับรายการสั่งซื้อจากใบเสร็จรับเงิน' ปุ่ม
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,รวมถึงรายการที่ไม่สต็อก
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,ค่าใช้จ่ายในการขาย
@@ -1128,12 +1129,12 @@
 DocType: GL Entry,Against,กับ
 DocType: Item,Default Selling Cost Center,ขาย เริ่มต้นที่ ศูนย์ต้นทุน
 DocType: Sales Partner,Implementation Partner,พันธมิตรการดำเนินงาน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,รหัสไปรษณีย์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,รหัสไปรษณีย์
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},ใบสั่งขาย {0} เป็น {1}
 DocType: Opportunity,Contact Info,ข้อมูลการติดต่อ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,ทำรายการสต็อก
 DocType: Packing Slip,Net Weight UOM,UOM น้ำหนักสุทธิ
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} ผลการค้นหา
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} ผลการค้นหา
 DocType: Item,Default Supplier,ผู้ผลิตเริ่มต้น
 DocType: Manufacturing Settings,Over Production Allowance Percentage,การผลิตกว่าร้อยละค่าเผื่อ
 DocType: Employee Loan,Repayment Schedule,กำหนดชำระคืน
@@ -1141,7 +1142,7 @@
 DocType: Holiday List,Get Weekly Off Dates,รับวันปิดสัปดาห์
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,วันที่สิ้นสุด ไม่สามารถ จะน้อยกว่า วันเริ่มต้น
 DocType: Sales Person,Select company name first.,เลือกชื่อ บริษัท แรก
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ดร
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ดร
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,ใบเสนอราคาที่ได้รับจากผู้จัดจำหน่าย
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},เพื่อ {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,อายุเฉลี่ย
@@ -1161,7 +1162,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,พื้นที่การดำเนินงานหลัก
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,การขนส่ง
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,แอตทริบิวต์ไม่ถูกต้อง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} จำเป็นต้องส่ง
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} จำเป็นต้องส่ง
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},ปริมาณต้องน้อยกว่าหรือเท่ากับ {0}
 DocType: SMS Center,Total Characters,ตัวอักษรรวม
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},กรุณาเลือก BOM BOM ในด้านการพิจารณาวาระที่ {0}
@@ -1172,7 +1173,7 @@
 DocType: Sales Partner,Distributor,ผู้จัดจำหน่าย
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,รถเข็นกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,สั่งผลิต {0} ต้อง ถูกยกเลิก ก่อนที่จะ ยกเลิกการ สั่งซื้อการขาย นี้
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',โปรดตั้ง &#39;ใช้ส่วนลดเพิ่มเติมใน&#39;
 ,Ordered Items To Be Billed,รายการที่สั่งซื้อจะเรียกเก็บเงิน
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,จากช่วงจะต้องมีน้อยกว่าในช่วง
 DocType: Global Defaults,Global Defaults,เริ่มต้นทั่วโลก
@@ -1182,7 +1183,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,ปีวันเริ่มต้น
 DocType: Purchase Invoice,Start date of current invoice's period,วันที่เริ่มต้นของระยะเวลาการออกใบแจ้งหนี้ปัจจุบัน
 DocType: Salary Slip,Leave Without Pay,ฝากโดยไม่ต้องจ่าย
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,ข้อผิดพลาดการวางแผนกำลังการผลิต
 ,Trial Balance for Party,งบทดลองสำหรับพรรค
 DocType: Lead,Consultant,ผู้ให้คำปรึกษา
 DocType: Salary Slip,Earnings,ผลกำไร
@@ -1197,7 +1198,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","นี้จะถูกผนวกเข้ากับรหัสสินค้าของตัวแปร ตัวอย่างเช่นถ้าย่อของคุณคือ ""เอสเอ็ม"" และรหัสรายการคือ ""เสื้อยืด"" รหัสรายการของตัวแปรจะเป็น ""เสื้อ-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,จ่ายสุทธิ (คำ) จะสามารถมองเห็นได้เมื่อคุณบันทึกสลิปเงินเดือน
 DocType: Purchase Invoice,Is Return,คือการกลับมา
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,ย้อนกลับ / เดบิตหมายเหตุ
 DocType: Price List Country,Price List Country,ราคาประเทศ
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} หมายเลขประจำเครื่องที่ถูกต้องสำหรับรายการ {1}
@@ -1207,11 +1208,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,กรุณากรอกรหัสสินค้าที่จะได้รับหมายเลข Batch
 DocType: Stock Settings,Default Item Group,กลุ่มสินค้าเริ่มต้น
 DocType: Employee Loan,Partially Disbursed,การเบิกจ่ายบางส่วน
-DocType: Grading Structure,Grading System Name,ชื่อวัดผลระบบ
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,ฐานข้อมูลผู้ผลิต
 DocType: Account,Balance Sheet,รายงานงบดุล
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',ศูนย์ต้นทุนสำหรับสินค้าที่มีรหัสสินค้า '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",วิธีการชำระเงินไม่ได้กำหนดค่า กรุณาตรวจสอบไม่ว่าจะเป็นบัญชีที่ได้รับการตั้งค่าในโหมดของการชำระเงินหรือบนโปรไฟล์ POS
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,คนขายของคุณจะรับการแจ้งเตือนในวันนี้ที่จะติดต่อลูกค้า
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,รายการเดียวกันไม่สามารถเข้ามาหลายครั้ง
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",บัญชีเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
@@ -1223,7 +1223,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,รายการบัญชีแยกประเภทหุ้นและ GL รายการที่ reposted สำหรับซื้อรายรับที่เลือก
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,รายการบัญชีแยกประเภทหุ้นและ GL รายการที่ reposted สำหรับซื้อรายรับที่เลือก
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,รายการที่ 1
 DocType: Holiday,Holiday,วันหยุด
 DocType: Support Settings,Close Issue After Days,ปิดฉบับหลังจากวัน
@@ -1250,11 +1250,11 @@
 DocType: Maintenance Visit Purpose,Work Done,งานที่ทำ
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,โปรดระบุอย่างน้อยหนึ่งแอตทริบิวต์ในตารางคุณสมบัติ
 DocType: Announcement,All Students,นักเรียนทุกคน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,รายการ {0} จะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,ดู บัญชีแยกประเภท
 DocType: Grading Scale,Intervals,ช่วงเวลา
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,ที่เก่าแก่ที่สุด
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",รายการกลุ่ม ที่มีอยู่ ที่มีชื่อเดียวกัน กรุณาเปลี่ยน ชื่อรายการหรือเปลี่ยนชื่อ กลุ่ม รายการ
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,หมายเลขโทรศัพท์มือถือของนักเรียน
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,ส่วนที่เหลือ ของโลก
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,รายการ {0} ไม่สามารถมีแบทช์
@@ -1294,9 +1294,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},การชำระเงินของเงินเดือนจาก {0} เป็น {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},ได้รับอนุญาตให้ แก้ไข บัญชี แช่แข็ง {0}
 DocType: Journal Entry,Get Outstanding Invoices,รับใบแจ้งหนี้ค้าง
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,การขายสินค้า {0} ไม่ถูกต้อง
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,คำสั่งซื้อที่ช่วยให้คุณวางแผนและติดตามในการซื้อสินค้าของคุณ
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",ขออภัย บริษัท ไม่สามารถ รวม
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",ปริมาณการเบิก / โอนทั้งหมด {0} วัสดุในการจอง {1} \ ไม่สามารถจะสูงกว่าปริมาณการร้องขอ {2} สำหรับรายการ {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,เล็ก
@@ -1317,10 +1317,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,ค่าใช้จ่าย ทางอ้อม
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,แถว {0}: จำนวนมีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,การเกษตร
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,ซิงค์ข้อมูลหลัก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,ซิงค์ข้อมูลหลัก
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,สินค้า หรือ บริการของคุณ
 DocType: Mode of Payment,Mode of Payment,โหมดของการชำระเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ภาพ Website ควรจะเป็นไฟล์สาธารณะหรือ URL ของเว็บไซต์
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,กลุ่มนี้เป็นกลุ่ม รายการที่ ราก และ ไม่สามารถแก้ไขได้
@@ -1338,18 +1338,18 @@
 DocType: Student Group Student,Group Roll Number,หมายเลขกลุ่ม
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",มีบัญชีประเภทเครดิตเท่านั้น ที่สามารถเชื่อมโยงกับรายการประเภทเดบิต สำหรับ {0}
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,รวมทุกน้ำหนักงานควรจะ 1. โปรดปรับน้ำหนักของงานโครงการทั้งหมดตาม
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,หมายเหตุ การจัดส่ง {0} ไม่ได้ ส่ง
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",กฎข้อแรกคือการกำหนดราคาเลือกตาม 'สมัครในสนามซึ่งจะมีรายการกลุ่มสินค้าหรือยี่ห้อ
 DocType: Hub Settings,Seller Website,เว็บไซต์ขาย
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,ร้อยละ จัดสรร รวม สำหรับทีม ขายควร เป็น 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},สถานะการผลิต การสั่งซื้อ เป็น {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},สถานะการผลิต การสั่งซื้อ เป็น {0}
 DocType: Appraisal Goal,Goal,เป้าหมาย
 DocType: Sales Invoice Item,Edit Description,แก้ไขรายละเอียด
 ,Team Updates,การปรับปรุงทีม
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,สำหรับ ผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,สำหรับ ผู้ผลิต
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,ประเภทบัญชีการตั้งค่าช่วยในการเลือกบัญชีนี้ในการทำธุรกรรม
 DocType: Purchase Invoice,Grand Total (Company Currency),รวมทั้งสิ้น (สกุลเงิน บริษัท)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,สร้างรูปแบบการพิมพ์
@@ -1365,7 +1365,7 @@
 DocType: Depreciation Schedule,Journal Entry,รายการบันทึก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} รายการ อยู่ระหว่างดำเนินการ
 DocType: Workstation,Workstation Name,ชื่อเวิร์กสเตชัน
-DocType: Grade Interval,Grade Code,รหัสเกรด
+DocType: Grading Scale Interval,Grade Code,รหัสเกรด
 DocType: POS Item Group,POS Item Group,กลุ่มสินค้า จุดขาย
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ส่งอีเมล์หัวข้อสำคัญ:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} ไม่ได้อยู่ในรายการ {1}
@@ -1382,7 +1382,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ฮาร์ดแวร์
 DocType: Sales Order,Recurring Upto,ที่เกิดขึ้นไม่เกิน
 DocType: Attendance,HR Manager,HR Manager
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,กรุณาเลือก บริษัท
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,กรุณาเลือก บริษัท
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,สิทธิ ออก
 DocType: Purchase Invoice,Supplier Invoice Date,วันที่ใบแจ้งหนี้ผู้จัดจำหน่าย
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,คุณจำเป็นต้องเปิดการใช้งานรถเข็น
@@ -1398,7 +1398,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,อาหาร
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,ช่วงสูงอายุ 3
 DocType: Maintenance Schedule Item,No of Visits,ไม่มีการเข้าชม
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,มาร์ค Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,มาร์ค Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},กำหนดการซ่อมบำรุง {0} อยู่กับ {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,นักเรียนเข้าศึกษา
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},สกุลเงินของบัญชีจะต้องปิด {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},ผลรวมของคะแนนสำหรับเป้าหมายทั้งหมดควรจะเป็น 100 มันเป็น {0}
@@ -1423,7 +1424,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,เฉลี่ยวันขาออก
 DocType: POS Profile,Campaign,รณรงค์
 DocType: Supplier,Name and Type,ชื่อและประเภท
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',สถานะการอนุมัติ ต้อง 'อนุมัติ ' หรือ ' ปฏิเสธ '
 DocType: Purchase Invoice,Contact Person,Contact Person
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date','วันที่คาดว่าจะเริ่มต้น' ไม่สามารถ จะมากกว่า 'วันที่คาดว่าจะจบ'
 DocType: Course Scheduling Tool,Course End Date,แน่นอนวันที่สิ้นสุด
@@ -1446,14 +1447,15 @@
 DocType: Sales Invoice,Shipping Address Name,การจัดส่งสินค้าที่อยู่ชื่อ
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,ผังบัญชี
 DocType: Material Request,Terms and Conditions Content,ข้อตกลงและเงื่อนไขเนื้อหา
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,ไม่สามารถมีค่ามากกว่า 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,รายการที่ {0} ไม่ได้เป็น รายการ สต็อก
 DocType: Maintenance Visit,Unscheduled,ไม่ได้หมายกำหนดการ
 DocType: Employee,Owned,เจ้าของ
 DocType: Salary Detail,Depends on Leave Without Pay,ขึ้นอยู่กับการออกโดยไม่จ่ายเงิน
 DocType: Pricing Rule,"Higher the number, higher the priority",สูงกว่าจำนวนที่สูงขึ้นมีความสำคัญ
 ,Purchase Invoice Trends,แนวโน้มการซื้อใบแจ้งหนี้
 DocType: Employee,Better Prospects,อนาคตที่ดีกว่า
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",แถว # {0}: กลุ่ม {1} มีเพียง {2} จำนวน โปรดเลือกชุดที่มีจำนวน {3} จำนวนที่มีอยู่หรือแบ่งแถวเป็นหลายแถวเพื่อส่งมอบ / ออกจากแบทช์หลายรายการ
 DocType: Vehicle,License Plate,ป้ายทะเบียนรถ
 DocType: Appraisal,Goals,เป้าหมาย
 DocType: Warranty Claim,Warranty / AMC Status,สถานะการรับประกัน / AMC
@@ -1472,7 +1474,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,พนักงานไม่สามารถรายงานให้กับตัวเอง
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",หากบัญชีถูกแช่แข็ง รายการ จะได้รับอนุญาต ให้กับผู้ใช้ ที่ จำกัด
 DocType: Email Digest,Bank Balance,ยอดเงินในธนาคาร
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},บัญชีรายการสำหรับ {0}: {1} สามารถทำได้ในสกุลเงิน: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",รายละเอียด งาน คุณสมบัติ ที่จำเป็น อื่น ๆ
 DocType: Journal Entry Account,Account Balance,ยอดเงินในบัญชี
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,กฎภาษีสำหรับการทำธุรกรรม
@@ -1483,7 +1485,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,แสดงยอดคงเหลือ P &amp; L ปีงบประมาณ unclosed ของ
 DocType: Shipping Rule,Shipping Account,บัญชีการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: บัญชี {2} ไม่ได้ใช้งาน
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,ทำให้คำสั่งซื้อยอดขายที่จะช่วยให้คุณวางแผนการทำงานของคุณและส่งมอบตรงเวลา
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,ทำให้คำสั่งซื้อยอดขายที่จะช่วยให้คุณวางแผนการทำงานของคุณและส่งมอบตรงเวลา
 DocType: Quality Inspection,Readings,อ่าน
 DocType: Stock Entry,Total Additional Costs,รวมค่าใช้จ่ายเพิ่มเติม
 DocType: Course Schedule,SH,SH
@@ -1494,7 +1496,7 @@
 DocType: Shipping Rule Condition,To Value,เพื่อให้มีค่า
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,สลิป
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,สลิป
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,สำนักงาน ให้เช่า
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,การตั้งค่าการติดตั้งเกตเวย์ SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,นำเข้า ล้มเหลว
@@ -1516,11 +1518,11 @@
 DocType: Company,Services,การบริการ
 DocType: HR Settings,Email Salary Slip to Employee,อีเมล์สลิปเงินเดือนให้กับพนักงาน
 DocType: Cost Center,Parent Cost Center,ศูนย์ต้นทุนผู้ปกครอง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,เลือกผู้ผลิตที่เป็นไปได้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,เลือกผู้ผลิตที่เป็นไปได้
 DocType: Sales Invoice,Source,แหล่ง
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,แสดงปิด
 DocType: Leave Type,Is Leave Without Pay,ถูกทิ้งไว้โดยไม่ต้องจ่ายเงิน
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ประเภทสินทรัพย์ที่มีผลบังคับใช้สำหรับรายการสินทรัพย์ถาวร
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ไม่พบในตารางการชำระเงินบันทึก
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},นี้ {0} ขัดแย้งกับ {1} สำหรับ {2} {3}
 DocType: Student Attendance Tool,Students HTML,นักเรียน HTML
@@ -1538,7 +1540,7 @@
 DocType: Student,Date of Leaving,วันที่ออก
 DocType: Pricing Rule,For Price List,สำหรับราคาตามรายการ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,การค้นหา ผู้บริหาร
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,สร้างโอกาสในการขาย
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,สร้างโอกาสในการขาย
 DocType: Maintenance Schedule,Schedules,ตารางเวลา
 DocType: Purchase Invoice Item,Net Amount,ปริมาณสุทธิ
 DocType: Purchase Order Item Supplied,BOM Detail No,รายละเอียด BOM ไม่มี
@@ -1566,9 +1568,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,การลงทะเบียนโปรแกรม
 DocType: Sales Invoice Item,Brand Name,ชื่อยี่ห้อ
 DocType: Purchase Receipt,Transporter Details,รายละเอียด Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,คลังสินค้าเริ่มต้นเป็นสิ่งจำเป็นสำหรับรายการที่เลือก
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,กล่อง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ผู้ผลิตที่เป็นไปได้
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ผู้ผลิตที่เป็นไปได้
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,องค์การ
 DocType: Budget,Monthly Distribution,การกระจายรายเดือน
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,รายชื่อ ผู้รับ ว่างเปล่า กรุณาสร้าง รายชื่อ รับ
@@ -1576,8 +1578,8 @@
 DocType: Sales Partner,Sales Partner Target,เป้าหมายยอดขายพันธมิตร
 DocType: Loan Type,Maximum Loan Amount,จำนวนเงินกู้สูงสุด
 DocType: Pricing Rule,Pricing Rule,กฎ การกำหนดราคา
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},หมายเลขม้วนซ้ำสำหรับนักเรียน {0}
 DocType: Budget,Action if Annual Budget Exceeded,ดำเนินการหากเกินงบประมาณรายจ่ายประจำปี
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,สร้างคำขอวัสดุไปเป็นใบสั่งซื้อ
 DocType: Shopping Cart Settings,Payment Success URL,URL ที่ประสบความสำเร็จการชำระเงิน
@@ -1598,9 +1600,9 @@
 DocType: Employee Loan,Repayment Method,วิธีการชำระหนี้
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",หากตรวจสอบหน้าแรกจะเป็นกลุ่มสินค้าเริ่มต้นสำหรับเว็บไซต์
 DocType: Quality Inspection Reading,Reading 4,Reading 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM เริ่มต้นสำหรับ {0} ไม่พบโครงการ {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM เริ่มต้นสำหรับ {0} ไม่พบโครงการ {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,การเรียกร้องค่าใช้จ่ายของ บริษัท
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",นักเรียนจะได้หัวใจของระบบเพิ่มนักเรียนของคุณทั้งหมด
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",นักเรียนจะได้หัวใจของระบบเพิ่มนักเรียนของคุณทั้งหมด
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},แถว # {0}: วัน Clearance {1} ไม่สามารถจะก่อนวันที่เช็ค {2}
 DocType: Company,Default Holiday List,เริ่มต้นรายการที่ฮอลิเดย์
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},แถว {0}: จากเวลาและเวลาของ {1} มีการทับซ้อนกันด้วย {2}
@@ -1612,21 +1614,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,วันที่ (s) ที่คุณจะใช้สำหรับการลาวันหยุด คุณไม่จำเป็นต้องใช้สำหรับการลา
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ส่งอีเมล์การชำระเงิน
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,งานใหม่
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,ทำให้ใบเสนอราคา
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,ทำให้ใบเสนอราคา
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,รายงานอื่น ๆ
 DocType: Dependent Task,Dependent Task,ขึ้นอยู่กับงาน
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},ปัจจัย การแปลง หน่วย เริ่มต้น ของการวัด จะต้อง อยู่ในแถว ที่ 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},การลา ประเภท {0} ไม่สามารถ จะยาวกว่า {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,ลองวางแผน X วันล่วงหน้า
 DocType: HR Settings,Stop Birthday Reminders,หยุด วันเกิด การแจ้งเตือน
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},กรุณาตั้งค่าเริ่มต้นเงินเดือนบัญชีเจ้าหนี้ บริษัท {0}
 DocType: SMS Center,Receiver List,รายชื่อผู้รับ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,ค้นหาค้นหาสินค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,ค้นหาค้นหาสินค้า
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,บริโภคจํานวนเงิน
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,เปลี่ยนเป็นเงินสดสุทธิ
 DocType: Assessment Plan,Grading Scale,ระดับคะแนน
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,เสร็จสิ้นแล้ว
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,หน่วย ของการวัด {0} ได้รับการป้อน มากกว่าหนึ่งครั้งใน การแปลง ปัจจัย ตาราง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,เสร็จสิ้นแล้ว
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},รวมเข้ากับการชำระเงินที่มีอยู่แล้ว {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,ค่าใช้จ่ายของรายการที่ออก
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},จำนวนต้องไม่เกิน {0}
@@ -1658,12 +1660,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,ทำให้การเบิกจ่ายรายการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,แถว {0}: ล่วงหน้ากับต้องมีการหักเงินจากผู้ผลิต
 DocType: Company,Default Values,เริ่มต้นค่า
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,รวมจำนวนเงินชดเชย
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,แห่งนี้ตั้งอยู่บนพื้นฐานของบันทึกกับรถคันนี้ ดูระยะเวลารายละเอียดด้านล่าง
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,เก็บ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},กับผู้ผลิตใบแจ้งหนี้ {0} วัน {1}
 DocType: Customer,Default Price List,รายการราคาเริ่มต้น
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,บันทึกการเคลื่อนไหวของสินทรัพย์ {0} สร้าง
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,คุณไม่สามารถลบปีงบประมาณ {0} ปีงบประมาณ {0} ตั้งเป็นค่าเริ่มต้นในการตั้งค่าส่วนกลาง
 DocType: Journal Entry,Entry Type,ประเภทรายการ
 ,Customer Credit Balance,เครดิตบาลานซ์ลูกค้า
@@ -1683,7 +1686,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,ไม่มีรายการมีการเปลี่ยนแปลงใด ๆ ในปริมาณหรือมูลค่า
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ฟิลด์บังคับ - หลักสูตร
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,ฟิลด์บังคับ - หลักสูตร
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,รับประกันเรียกร้อง
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,รับประกันเรียกร้อง
 ,Lead Details,รายละเอียดของช่องทาง
 DocType: Salary Slip,Loan repayment,การชำระคืนเงินกู้
 DocType: Purchase Invoice,End date of current invoice's period,วันที่สิ้นสุดของรอบระยะเวลาใบแจ้งหนี้ปัจจุบัน
@@ -1702,12 +1705,10 @@
 DocType: Employee,Permanent Address,ที่อยู่ถาวร
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",จ่ายเงินล่วงหน้ากับ {0} {1} ไม่สามารถมากขึ้น \ กว่าแกรนด์รวม {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,กรุณา เลือกรหัส สินค้า
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,กรุณา เลือกรหัส สินค้า
 DocType: Student Sibling,Studying in Same Institute,กำลังศึกษาอยู่ในสถาบันเดียวกัน
 DocType: Territory,Territory Manager,ผู้จัดการดินแดน
 DocType: Packed Item,To Warehouse (Optional),คลังสินค้า (อุปกรณ์เสริม)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Payment Entry,Paid Amount (Company Currency),จำนวนเงินที่จ่าย (บริษัท สกุล)
 DocType: Purchase Invoice,Additional Discount,ส่วนลดเพิ่มเติม
 DocType: Selling Settings,Selling Settings,ตั้งค่าระบบการขาย
@@ -1717,9 +1718,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ดูในรถเข็น
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,ค่าใช้จ่ายใน การตลาด
 ,Item Shortage Report,รายงานสินค้าไม่เพียงพอ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","น้ำหนักที่ถูกกล่าวถึง, \n กรุณาระบุ ""น้ำหนัก UOM"" เกินไป"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,ขอวัสดุที่ใช้เพื่อให้รายการสินค้านี้
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,ถัดไปวันที่มีผลบังคับใช้ค่าเสื่อมราคาของสินทรัพย์ใหม่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,ถัดไปวันที่มีผลบังคับใช้ค่าเสื่อมราคาของสินทรัพย์ใหม่
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,แยกกลุ่มตามหลักสูตรสำหรับทุกกลุ่ม
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,แยกกลุ่มตามหลักสูตรสำหรับทุกกลุ่ม
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,หน่วยเดียวของรายการ
@@ -1736,9 +1737,7 @@
 DocType: Course Assessment Criteria,Weightage,weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: 'ศูนย์ต้นทุน' เป็นสิ่งจำเป็นสำหรับบัญชี 'กำไรขาดทุน ' {2} โปรดตั้งค่าเริ่มต้นสำหรับศูนย์ต้นทุนของบริษัท
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,กลุ่ม ลูกค้าที่มีอยู่ ที่มีชื่อเดียวกัน โปรด เปลี่ยนชื่อ ลูกค้าหรือเปลี่ยนชื่อ กลุ่ม ลูกค้า
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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,Reading 2
@@ -1755,7 +1754,7 @@
 ,Item-wise Sales Register,การขายสินค้าที่ชาญฉลาดสมัครสมาชิก
 DocType: Asset,Gross Purchase Amount,จำนวนการสั่งซื้อขั้นต้น
 DocType: Asset,Depreciation Method,วิธีการคิดค่าเสื่อมราคา
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ออฟไลน์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ออฟไลน์
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,คือภาษีนี้รวมอยู่ในอัตราขั้นพื้นฐาน?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,เป้าหมายรวม
 DocType: Program Course,Required,จำเป็นต้องใช้
@@ -1765,21 +1764,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,JSON สมานฉันท์
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,คอลัมน์มากเกินไป ส่งออกรายงานและพิมพ์โดยใช้โปรแกรมสเปรดชีต
 DocType: Purchase Invoice Item,Batch No,หมายเลขชุด
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},ไม่พบอัตราแลกเปลี่ยนสำหรับ {0} เป็น {1} วันสำคัญ {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,อนุญาตให้หลายคำสั่งขายกับการสั่งซื้อของลูกค้า
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 DocType: Student Group Instructor,Student Group Instructor,ผู้สอนกลุ่มนักเรียน
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 มือถือไม่มี
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,หลัก
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ตัวแปร
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,หลัก
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ตัวแปร
 DocType: Naming Series,Set prefix for numbering series on your transactions,กำหนดคำนำหน้าสำหรับหมายเลขชุดทำธุรกรรมของคุณ
 DocType: Employee Attendance Tool,Employees HTML,พนักงาน HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,BOM ค่าเริ่มต้น ({0}) จะต้องใช้งานสำหรับรายการนี้หรือแม่แบบของมัน
 DocType: Employee,Leave Encashed?,ฝาก Encashed?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,โอกาสจากข้อมูลมีผลบังคับใช้
 DocType: Email Digest,Annual Expenses,ค่าใช้จ่ายประจำปี
 DocType: Item,Variants,สายพันธุ์
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,สร้างใบสั่งซื้อ
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,สร้างใบสั่งซื้อ
 DocType: SMS Center,Send To,ส่งให้
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},ที่มีอยู่ไม่ สมดุล เพียงพอสำหรับ การลา ออกจาก ประเภท {0}
 DocType: Payment Reconciliation Payment,Allocated amount,จำนวนเงินที่จัดสรร
@@ -1787,7 +1785,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,ทำงาน ความคืบหน้าใน คลังสินค้า จะต้อง ก่อนที่จะ ส่ง
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ผู้สมัครงาน
 DocType: Purchase Order Item,Warehouse and Reference,คลังสินค้าและการอ้างอิง
 DocType: Supplier,Statutory info and other general information about your Supplier,ข้อมูลตามกฎหมายและข้อมูลทั่วไปอื่น ๆ เกี่ยวกับผู้จำหน่ายของคุณ
@@ -1795,11 +1793,10 @@
 DocType: Item,Serial Nos and Batches,หมายเลขและชุดเลขที่ผลิตภัณฑ์
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ความแรงของกลุ่มนักศึกษา
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,ความแรงของกลุ่มนักศึกษา
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,กับอนุทิน {0} ไม่ได้มีที่ไม่มีใครเทียบ {1} รายการ
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,การประเมินผล
 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: Grading Structure,Grading Intervals,ช่วงการวัดผลการศึกษา
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,กรุณากรอก
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",ไม่สามารถ overbill สำหรับรายการ {0} ในแถว {1} มากกว่า {2} ในการอนุญาตให้มากกว่าการเรียกเก็บเงินโปรดตั้งค่าในการซื้อการตั้งค่า
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,กรุณาตั้งค่าตัวกรองขึ้นอยู่กับสินค้าหรือคลังสินค้า
@@ -1811,17 +1808,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} จะต้องส่ง
 DocType: Authorization Control,Authorization Control,ควบคุมการอนุมัติ
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},แถว # {0}: ปฏิเสธคลังสินค้ามีผลบังคับใช้กับปฏิเสธรายการ {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,วิธีการชำระเงิน
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,จัดการคำสั่งซื้อของคุณ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,วิธีการชำระเงิน
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,จัดการคำสั่งซื้อของคุณ
 DocType: Production Order Operation,Actual Time and Cost,เวลาที่เกิดขึ้นจริงและค่าใช้จ่าย
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},ขอ วัสดุ สูงสุด {0} สามารถทำ รายการ {1} กับ การขายสินค้า {2}
 DocType: Employee,Salutation,ประณม
 DocType: Course,Course Abbreviation,ชื่อย่อแน่นอน
 DocType: Student Leave Application,Student Leave Application,แอพลิเคชันออกจากนักศึกษา
 DocType: Item,Will also apply for variants,นอกจากนี้ยังจะใช้สำหรับสายพันธุ์
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",สินทรัพย์ที่ไม่สามารถยกเลิกขณะที่มันมีอยู่แล้ว {0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},พนักงาน {0} ในครึ่งวันในวันที่ {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},ชั่วโมงการทำงานรวมไม่ควรมากกว่าชั่วโมงการทำงานสูงสุด {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,บน
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,กำรายการในเวลาของการขาย
 DocType: Quotation Item,Actual Qty,จำนวนจริง
 DocType: Sales Invoice Item,References,อ้างอิง
@@ -1831,7 +1829,7 @@
 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 +91,Associate,ภาคี
 DocType: Asset Movement,Asset Movement,การเคลื่อนไหวของสินทรัพย์
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,รถเข็นใหม่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,รถเข็นใหม่
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,รายการที่ {0} ไม่ได้เป็นรายการ ต่อเนื่อง
 DocType: SMS Center,Create Receiver List,สร้างรายการรับ
 DocType: Vehicle,Wheels,ล้อ
@@ -1863,10 +1861,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,ปิดการใช้งานการสร้างบันทึกเวลากับการสั่งซื้อการผลิต การดำเนินงานจะไม่ได้รับการติดตามกับใบสั่งผลิต
 DocType: Student,Student Mobile Number,หมายเลขโทรศัพท์มือถือของนักเรียน
 DocType: Item,Has Variants,มีหลากหลายรูปแบบ
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},คุณได้เลือกแล้วรายการจาก {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ชื่อของการกระจายรายเดือน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ต้องใช้รหัสแบทช์
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ต้องใช้รหัสแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ต้องใช้รหัสแบทช์
 DocType: Sales Person,Parent Sales Person,ผู้ปกครองคนขาย
 DocType: Purchase Invoice,Recurring Invoice,ใบแจ้งหนี้ที่เกิดขึ้นประจำ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,จัดการโครงการ
@@ -1874,11 +1872,11 @@
 DocType: Budget,Fiscal Year,ปีงบประมาณ
 DocType: Vehicle Log,Fuel Price,ราคาน้ำมัน
 DocType: Budget,Budget,งบประมาณ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,รายการสินทรัพย์ถาวรจะต้องเป็นรายการที่ไม่สต็อก
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",งบประมาณไม่สามารถกำหนดกับ {0} เป็นมันไม่ได้เป็นบัญชีรายได้หรือค่าใช้จ่าย
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,ที่ประสบความสำเร็จ
 DocType: Student Admission,Application Form Route,แบบฟอร์มใบสมัครเส้นทาง
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,มณฑล / ลูกค้า
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,มณฑล / ลูกค้า
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,เช่น 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,การออกจากชนิด {0} ไม่สามารถได้รับการจัดสรรตั้งแต่มันถูกทิ้งไว้โดยไม่ต้องจ่าย
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},แถว {0}: จำนวนจัดสรร {1} ต้องน้อยกว่าหรือเท่ากับใบแจ้งหนี้ยอดคงค้าง {2}
@@ -1898,15 +1896,15 @@
 ,Serial No Status,สถานะหมายเลขเครื่อง
 DocType: Payment Entry Reference,Outstanding,โดดเด่น
 ,Daily Timesheet Summary,ข้อมูลอย่างย่อ Timesheet ประจำวัน
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","แถว {0}: การตั้งค่า {1} ช่วงความแตกต่างระหว่างจากและไปยังวันที่ \
  ต้องมากกว่าหรือเท่ากับ {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,นี้ขึ้นอยู่กับการเคลื่อนไหวของหุ้น ดู {0} สำหรับรายละเอียด
 DocType: Pricing Rule,Selling,การขาย
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},จำนวน {0} {1} หักกับ {2}
 DocType: Employee,Salary Information,ข้อมูลเงินเดือน
 DocType: Sales Person,Name and Employee ID,ชื่อและลูกจ้าง ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,วันที่ครบกำหนด ไม่สามารถ ก่อน วันที่ประกาศ
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,หน้าที่ และภาษี
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,กรุณากรอก วันที่ อ้างอิง
@@ -1918,14 +1916,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,ไม่ สามารถดู จำนวน แถว มากกว่าหรือ เท่ากับจำนวน แถวปัจจุบัน ค่าใช้จ่าย สำหรับประเภท นี้
 DocType: Asset,Sold,ขาย
 ,Item-wise Purchase History,ประวัติการซื้อสินค้าที่ชาญฉลาด
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},กรุณา คลิกที่ 'สร้าง ตาราง ' เพื่อ เรียก หมายเลขเครื่อง เพิ่มสำหรับ รายการ {0}
 DocType: Account,Frozen,แช่แข็ง
 ,Open Production Orders,สั่ง เปิด การผลิต
 DocType: Sales Invoice Payment,Base Amount (Company Currency),จํานวนพื้นฐาน ( สกุลเงินบริษัท)
 DocType: Payment Reconciliation Payment,Reference Row,แถวอ้างอิง
 DocType: Installation Note,Installation Time,เวลาติดตั้ง
 DocType: Sales Invoice,Accounting Details,รายละเอียดบัญชี
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,ลบการทำธุรกรรมทั้งหมดของ บริษัท นี้
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,เงินลงทุน
 DocType: Issue,Resolution Details,รายละเอียดความละเอียด
@@ -1958,14 +1956,14 @@
 DocType: Discussion,Discussion,การสนทนา
 DocType: Payment Entry,Transaction ID,รหัสธุรกรรม
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,กฎการกำหนดราคาจะถูกกรองต่อไปขึ้นอยู่กับปริมาณ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},โปรดกำหนดวันที่เข้าร่วมสำหรับพนักงาน {0}
 DocType: Task,Total Billing Amount (via Time Sheet),จำนวนเงินที่เรียกเก็บเงินรวม (ผ่านใบบันทึกเวลา)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,ซ้ำรายได้ของลูกค้า
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ต้องมีสิทธิ์เป็น 'ผู้อนุมัติค่าใช้จ่าย'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) ต้องมีสิทธิ์เป็น 'ผู้อนุมัติค่าใช้จ่าย'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,คู่
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,เลือก BOM และจำนวนการผลิต
 DocType: Asset,Depreciation Schedule,กำหนดการค่าเสื่อมราคา
 DocType: Bank Reconciliation Detail,Against Account,กับบัญชี
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,ครึ่งวันวันควรอยู่ระหว่างนับจากวันและวันที่
@@ -1979,16 +1977,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},โปรดตั้ง &#39;ศูนย์สินทรัพย์ค่าเสื่อมราคาค่าใช้จ่ายใน บริษัท {0}
 ,Maintenance Schedules,กำหนดการบำรุงรักษา
 DocType: Task,Actual End Date (via Time Sheet),ที่เกิดขึ้นจริงวันที่สิ้นสุด (ผ่านใบบันทึกเวลา)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},จำนวน {0} {1} กับ {2} {3}
 ,Quotation Trends,ใบเสนอราคา แนวโน้ม
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},กลุ่มสินค้าไม่ได้กล่าวถึงในหลักรายการสำหรับรายการที่ {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,เดบิตในการบัญชีจะต้องเป็นบัญชีลูกหนี้
 DocType: Shipping Rule Condition,Shipping Amount,จำนวนการจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,จำนวนเงินที่ รอดำเนินการ
 DocType: Purchase Invoice Item,Conversion Factor,ปัจจัยการเปลี่ยนแปลง
 DocType: Purchase Order,Delivered,ส่ง
 ,Vehicle Expenses,ค่าใช้จ่ายในยานพาหนะ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
+DocType: Serial No,Invoice Details,รายละเอียดใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},ค่าที่คาดหวังหลังจากที่อายุการใช้งานจะต้องมากกว่าหรือเท่ากับ {0}
 DocType: Purchase Receipt,Vehicle Number,จำนวนยานพาหนะ
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,วันที่ใบแจ้งหนี้ที่เกิดขึ้นจะถูกหยุด
 DocType: Employee Loan,Loan Amount,การกู้ยืมเงิน
@@ -2006,12 +2005,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Timesheets
 DocType: HR Settings,HR Settings,การตั้งค่าทรัพยากรบุคคล
 DocType: Salary Slip,net pay info,ข้อมูลค่าใช้จ่ายสุทธิ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,ค่าใช้จ่ายที่ เรียกร้อง คือการ รอการอนุมัติ เพียง แต่ผู้อนุมัติ ค่าใช้จ่าย สามารถอัปเดต สถานะ
 DocType: Email Digest,New Expenses,ค่าใช้จ่ายใหม่
 DocType: Purchase Invoice,Additional Discount Amount,จำนวนส่วนลดเพิ่มเติม
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",แถว # {0}: จำนวนต้องเป็น 1 เป็นรายการที่เป็นสินทรัพย์ถาวร โปรดใช้แถวแยกต่างหากสำหรับจำนวนหลาย
 DocType: Leave Block List Allow,Leave Block List Allow,ฝากรายการบล็อกอนุญาตให้
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,เงื่อนไขที่ไม่สามารถเป็นที่ว่างเปล่าหรือพื้นที่
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,กลุ่มที่ไม่ใช่กลุ่ม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,กีฬา
 DocType: Loan Type,Loan Name,ชื่อเงินกู้
@@ -2023,6 +2022,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,คลังสินค้าที่คุณจะรักษาสต็อกของรายการปฏิเสธ
 DocType: Production Order,Skip Material Transfer,ข้ามการถ่ายโอนวัสดุ
 DocType: Production Order,Skip Material Transfer,ข้ามการถ่ายโอนวัสดุ
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,ไม่สามารถหาอัตราแลกเปลี่ยนสำหรับ {0} ถึง {1} สำหรับวันสำคัญ {2} โปรดสร้างบันทึกการแลกเปลี่ยนสกุลเงินด้วยตนเอง
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,ปี การเงินของคุณ จะสิ้นสุดลงใน
 DocType: POS Profile,Price List,บัญชีแจ้งราคาสินค้า
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} ตอนนี้เป็นปีงบประมาณเริ่มต้น กรุณารีเฟรชเบราว์เซอร์ ของคุณ สำหรับการเปลี่ยนแปลงที่จะมีผลบังคับใช้
@@ -2039,19 +2039,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},บัญชี {0} ไม่ถูกต้อง สกุลเงินในบัญชีจะต้องเป็น {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},ปัจจัย UOM แปลง จะต้อง อยู่ในแถว {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อสินค้าขาย, การขายใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Salary Component,Deduction,การหัก
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,แถว {0}: จากเวลาและต้องการเวลามีผลบังคับใช้
 DocType: Stock Reconciliation Item,Amount Difference,จำนวนเงินที่แตกต่าง
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},รายการสินค้าเพิ่มสำหรับ {0} ในราคา {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,กรุณากรอกพนักงาน Id นี้คนขาย
 DocType: Territory,Classification of Customers by region,การจำแนกประเภทของลูกค้าตามภูมิภาค
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,ความแตกต่างจำนวนเงินต้องเป็นศูนย์
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,ความแตกต่างจำนวนเงินต้องเป็นศูนย์
 DocType: Project,Gross Margin,กำไรขั้นต้น
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,กรุณากรอก ผลิต รายการ แรก
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,ธนาคารคำนวณยอดเงินงบ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,ผู้ใช้ที่ถูกปิดการใช้งาน
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,ใบเสนอราคา
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,ใบเสนอราคา
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,หักรวม
 ,Production Analytics,Analytics ผลิต
@@ -2060,9 +2060,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},คำเตือน: ใบรับรอง SSL ที่ไม่ถูกต้องในสิ่งที่แนบมา {0}
 DocType: Student Admission,Eligibility,เหมาะ
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",นำไปสู่การช่วยให้คุณได้รับธุรกิจเพิ่มรายชื่อทั้งหมดของคุณและมากขึ้นเป็นผู้นำของคุณ
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",นำไปสู่การช่วยให้คุณได้รับธุรกิจเพิ่มรายชื่อทั้งหมดของคุณและมากขึ้นเป็นผู้นำของคุณ
 DocType: Production Order Operation,Actual Operation Time,เวลาการดำเนินงานที่เกิดขึ้นจริง
 DocType: Authorization Rule,Applicable To (User),ที่ใช้บังคับกับ (User)
 DocType: Purchase Taxes and Charges,Deduct,หัก
@@ -2077,7 +2077,7 @@
 DocType: Guardian,Work Address,ที่อยู่ที่ทำงาน
 DocType: Appraisal,Calculate Total Score,คำนวณคะแนนรวม
 DocType: Request for Quotation,Manufacturing Manager,ผู้จัดการฝ่ายผลิต
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},อนุกรม ไม่มี {0} อยู่ภายใต้การ รับประกัน ไม่เกิน {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,แยกหมายเหตุจัดส่งสินค้าเข้าไปในแพคเกจ
 apps/erpnext/erpnext/hooks.py +87,Shipments,การจัดส่ง
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,ยอดบัญชี ({0}) สำหรับ {1} และมูลค่าหุ้น ({2}) สำหรับคลังสินค้า {3} ต้องเหมือนกัน
@@ -2100,10 +2100,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,หมายเหตุ: อีเมล์ของคุณจะไม่ถูกส่งไปยังผู้ใช้คนพิการ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,จำนวนการโต้ตอบ
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,จำนวนการโต้ตอบ
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,เลือก บริษัท ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,เลือก บริษัท ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,เว้นไว้หากพิจารณาให้หน่วยงานทั้งหมด
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ประเภท ของการจ้างงาน ( ถาวร สัญญา ฝึกงาน ฯลฯ )
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} ต้องระบุสำหรับ รายการ {1}
 DocType: Process Payroll,Fortnightly,รายปักษ์
 DocType: Currency Exchange,From Currency,จากสกุลเงิน
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",กรุณาเลือกจำนวนเงินที่จัดสรรประเภทใบแจ้งหนี้และจำนวนใบแจ้งหนี้ในอย่างน้อยหนึ่งแถว
@@ -2112,14 +2112,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),อัตรา (สกุลเงิน บริษัท )
 DocType: Student Guardian,Others,คนอื่น ๆ
 DocType: Payment Entry,Unallocated Amount,จํานวนเงินที่ไม่ได้ปันส่วน
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ไม่พบรายการที่ตรงกัน กรุณาเลือกบางค่าอื่น ๆ สำหรับ {0}
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,ไม่มีการปรับปรุงเพิ่มเติม
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,ไม่สามารถเลือก ประเภท ค่าใช้จ่าย เป็น ' ใน แถว หน้า จำนวน ' หรือ ' ใน แถว หน้า รวม สำหรับ แถวแรก
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,เด็กรายการไม่ควรจะเป็น Bundle สินค้า โปรดลบรายการ `{0}` และบันทึก
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,การธนาคาร
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,เพิ่ม Timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,เพิ่ม Timesheets
 DocType: Vehicle Service,Service Item,รายการบริการ
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
 DocType: Bank Guarantee,Bank Guarantee,การรับประกันธนาคาร
@@ -2145,6 +2145,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},แถว # {0}: สินทรัพย์ {1} อยู่แล้ว {2}
 DocType: Quotation Item,Stock Balance,ยอดคงเหลือสต็อก
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ใบสั่งขายถึงการชำระเงิน
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,โปรดตั้งค่าชุดการตั้งชื่อสำหรับ {0} ผ่านการตั้งค่า&gt; การตั้งค่า&gt; การตั้งชื่อซีรี่ส์
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,ผู้บริหารสูงสุด
 DocType: Expense Claim Detail,Expense Claim Detail,รายละเอียดค่าใช้จ่ายสินไหม
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,กรุณาเลือกบัญชีที่ถูกต้อง
@@ -2169,14 +2170,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,ราคาจะไม่แสดงถ้าราคาไม่ได้ตั้งค่า
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,โปรดระบุประเทศสำหรับกฎการจัดส่งสินค้านี้หรือตรวจสอบการจัดส่งสินค้าทั่วโลก
 DocType: Stock Entry,Total Incoming Value,ค่าเข้ามาทั้งหมด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,เดบิตในการที่จะต้อง
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,เดบิตในการที่จะต้อง
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",Timesheets ช่วยให้การติดตามของเวลาค่าใช้จ่ายและการเรียกเก็บเงินสำหรับกิจกรรมที่ทำโดยทีมงานของคุณ
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,ซื้อราคา
 DocType: Offer Letter Term,Offer Term,ระยะเวลาเสนอ
 DocType: Quality Inspection,Quality Manager,ผู้จัดการคุณภาพ
 DocType: Job Applicant,Job Opening,เปิดงาน
 DocType: Payment Reconciliation,Payment Reconciliation,กระทบยอดการชำระเงิน
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,กรุณา เลือกชื่อ Incharge บุคคล
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,เทคโนโลยี
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},รวมค้างชำระ: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM การดำเนินงานเว็บไซต์
@@ -2204,23 +2205,23 @@
 DocType: Opportunity,Lost Reason,เหตุผลที่สูญหาย
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,ที่อยู่ใหม่
 DocType: Quality Inspection,Sample Size,ขนาดของกลุ่มตัวอย่าง
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,รายการทั้งหมดที่ ได้รับการ ออกใบแจ้งหนี้ แล้ว
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,กรุณากรอกเอกสารใบเสร็จรับเงิน
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,ศูนย์ต้นทุนเพิ่มเติมสามารถทำภายใต้กลุ่ม แต่รายการที่สามารถทำกับกลุ่มที่ไม่
 DocType: Project,External,ภายนอก
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,ผู้ใช้และสิทธิ์
 DocType: Vehicle Log,VLOG.,VLOG
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},ใบสั่งผลิตที่สร้างไว้: {0}
 DocType: Branch,Branch,สาขา
 DocType: Guardian,Mobile Number,เบอร์มือถือ
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,การพิมพ์และ การสร้างแบรนด์
 DocType: Bin,Actual Quantity,จำนวนที่เกิดขึ้นจริง
 DocType: Shipping Rule,example: Next Day Shipping,ตัวอย่างเช่นการจัดส่งสินค้าวันถัดไป
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,ไม่มี Serial {0} ไม่พบ
 DocType: Scheduling Tool,Student Batch,ชุดนักศึกษา
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,ลูกค้าของคุณ
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,ทำให้นักศึกษา
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,ทำให้นักศึกษา
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},คุณได้รับเชิญที่จะทำงานร่วมกันในโครงการ: {0}
 DocType: Leave Block List Date,Block Date,บล็อกวันที่
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,ลงทะเบียนเลย
@@ -2244,8 +2245,9 @@
 DocType: SMS Log,Sent To,ส่งไปยัง
 DocType: Payment Request,Make Sales Invoice,สร้างใบแจ้งหนี้
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,โปรแกรม
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,ถัดไปติดต่อวันที่ไม่สามารถอยู่ในอดีตที่ผ่านมา
 DocType: Company,For Reference Only.,สำหรับการอ้างอิงเท่านั้น
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,เลือกแบทช์
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},ไม่ถูกต้อง {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,จำนวนล่วงหน้า
@@ -2259,7 +2261,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,คดีหมายเลข ไม่สามารถ เป็น 0
 DocType: Item,Show a slideshow at the top of the page,สไลด์โชว์ที่ด้านบนของหน้า
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,ร้านค้า
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,ร้านค้า
 DocType: Serial No,Delivery Time,เวลาจัดส่งสินค้า
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,เอจจิ้ง อยู่ ที่
 DocType: Item,End of Life,ในตอนท้ายของชีวิต
@@ -2271,12 +2273,12 @@
 DocType: Rename Tool,Rename Tool,เปลี่ยนชื่อเครื่องมือ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,ปรับปรุง ค่าใช้จ่าย
 DocType: Item Reorder,Item Reorder,รายการ Reorder
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,โอน วัสดุ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,สลิปเงินเดือนที่ต้องการแสดง
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,โอน วัสดุ
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",ระบุการดำเนินการ ค่าใช้จ่าย ในการดำเนินงาน และให้การดำเนินการ ที่ไม่ซ้ำกัน ในการ ดำเนินงานของคุณ
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,เอกสารนี้เป็นเกินขีด จำกัด โดย {0} {1} สำหรับรายการ {4} คุณกำลังทำอีก {3} กับเดียวกัน {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,กรุณาตั้งค่าที่เกิดขึ้นหลังจากการบันทึก
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,บัญชีจำนวนเงินที่เลือกเปลี่ยน
 DocType: Purchase Invoice,Price List Currency,สกุลเงินรายการราคา
 DocType: Naming Series,User must always select,ผู้ใช้จะต้องเลือก
 DocType: Stock Settings,Allow Negative Stock,อนุญาตให้สต็อกเชิงลบ
@@ -2287,7 +2289,7 @@
 DocType: Budget Account,Budget Account,งบประมาณของบัญชี
 DocType: Quality Inspection,Verified By,ตรวจสอบโดย
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",ไม่สามารถเปลี่ยน สกุลเงินเริ่มต้น ของ บริษัท เนื่องจากมี การทำธุรกรรม ที่มีอยู่ รายการที่ จะต้อง ยกเลิก การเปลี่ยน สกุลเงินเริ่มต้น
-DocType: Grade Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
+DocType: Grading Scale Interval,Grade Description,ชั้นประถมศึกษาปีคำอธิบาย
 DocType: Stock Entry,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,สร้างสลิปเงินเดือน
@@ -2325,7 +2327,7 @@
 DocType: Upload Attendance,Attendance To Date,วันที่เข้าร่วมประชุมเพื่อ
 DocType: Warranty Claim,Raised By,โดยยก
 DocType: Payment Gateway Account,Payment Account,บัญชีการชำระเงิน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,โปรดระบุ บริษัท ที่จะดำเนินการ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,เปลี่ยนสุทธิในบัญชีลูกหนี้
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,ชดเชย ปิด
 DocType: Offer Letter,Accepted,ได้รับการยอมรับแล้ว
@@ -2335,12 +2337,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,โปรดตรวจสอบว่าคุณต้องการที่จะลบการทำธุรกรรมทั้งหมดของ บริษัท นี้ ข้อมูลหลักของคุณจะยังคงอยู่อย่างที่มันเป็น การดำเนินการนี้ไม่สามารถยกเลิกได้
 DocType: Room,Room Number,หมายเลขห้อง
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},การอ้างอิงที่ไม่ถูกต้อง {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ไม่สามารถกำหนดให้สูงกว่าปริมาณที่วางแผนไว้ ({2}) ในการสั่งผลิต {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) ไม่สามารถกำหนดให้สูงกว่าปริมาณที่วางแผนไว้ ({2}) ในการสั่งผลิต {3}
 DocType: Shipping Rule,Shipping Rule Label,ป้ายกฎการจัดส่งสินค้า
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,ผู้ใช้งานฟอรั่ม
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,วัตถุดิบไม่สามารถมีช่องว่าง
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,วารสารรายการด่วน
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","ไม่สามารถอัปเดสต็อก, ใบแจ้งหนี้ที่มีรายการการขนส่งลดลง"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,วารสารรายการด่วน
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,คุณไม่สามารถเปลี่ยน อัตรา ถ้า BOM กล่าว agianst รายการใด ๆ
 DocType: Employee,Previous Work Experience,ประสบการณ์การทำงานก่อนหน้า
 DocType: Stock Entry,For Quantity,สำหรับจำนวน
@@ -2353,7 +2355,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,ข้อตกลงและ Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,ชื่อของสถาบันที่คุณมีการตั้งค่าระบบนี้
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",รายการบัญชีแช่แข็งถึงวันนี้ไม่มีใครสามารถทำ / แก้ไขรายการยกเว้นบทบาทที่ระบุไว้ด้านล่าง
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,กรุณา บันทึกเอกสารก่อนที่จะ สร้าง ตารางการบำรุงรักษา
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,สถานะโครงการ
 DocType: UOM,Check this to disallow fractions. (for Nos),ตรวจสอบนี้จะไม่อนุญาตให้เศษส่วน (สำหรับ Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,คำสั่งซื้อการผลิตต่อไปนี้ถูกสร้าง:
@@ -2380,7 +2382,7 @@
 ,Employees working on a holiday,พนักงานที่ทำงานในวันหยุด
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,กำหนดให้เป็นปัจจุบัน
 DocType: Project,% Complete Method,% วิธีการที่สมบูรณ์แบบ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},วันที่เริ่มต้น การบำรุงรักษา ไม่สามารถ ก่อนวัน ส่งสำหรับ อนุกรม ไม่มี {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},วันที่เริ่มต้น การบำรุงรักษา ไม่สามารถ ก่อนวัน ส่งสำหรับ อนุกรม ไม่มี {0}
 DocType: Production Order,Actual End Date,วันที่สิ้นสุดจริง
 DocType: BOM,Operating Cost (Company Currency),ต้นทุนการดำเนินงาน ( บริษัท สกุล)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2397,7 +2399,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,ทิ้งไว้โดยไม่ต้องจ่ายไม่ตรงกับที่ได้รับอนุมัติบันทึกออกจากแอพลิเคชัน
 DocType: Campaign,Campaign-.####,แคมเปญ . # # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,ขั้นตอนถัดไป
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,กรุณาจัดหารายการที่ระบุในอัตราที่ดีที่สุด
 DocType: Selling Settings,Auto close Opportunity after 15 days,รถยนต์ใกล้โอกาสหลังจาก 15 วัน
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,ปีที่จบ
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Lead%
@@ -2455,7 +2457,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,จำนวน Recd
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},ค่าธรรมเนียมระเบียนที่สร้าง - {0}
 DocType: Asset Category Account,Asset Category Account,บัญชีสินทรัพย์ประเภท
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},ไม่สามารถผลิต สินค้า ได้มากขึ้น {0} กว่าปริมาณ การขายสินค้า {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,หุ้นรายการ {0} ไม่ได้ส่ง
 DocType: Payment Reconciliation,Bank / Cash Account,บัญชีเงินสด / ธนาคาร
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,ถัดไปติดต่อโดยไม่สามารถเช่นเดียวกับที่อยู่อีเมลตะกั่ว
@@ -2477,7 +2479,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,โปรโมชั่น วันที่ ไม่ได้กล่าวถึง
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,การผลิต
 DocType: Guardian,Occupation,อาชีพ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,แถว {0}: วันที่ เริ่มต้น ต้องอยู่ก่อน วันที่สิ้นสุด
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),รวม (จำนวน)
 DocType: Sales Invoice,This Document,เอกสารฉบับนี้
 DocType: Installation Note Item,Installed Qty,จำนวนการติดตั้ง
@@ -2493,15 +2496,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,รายงาน ฉบับ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,ค่าใช้จ่ายใน ยูทิลิตี้
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90-ขึ้นไป
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,แถว # {0}: วารสารรายการ {1} ไม่มีบัญชี {2} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,แถว # {0}: วารสารรายการ {1} ไม่มีบัญชี {2} หรือมีอยู่แล้วจับคู่กับบัตรกำนัลอื่น
 DocType: Buying Settings,Default Buying Price List,รายการราคาซื้อเริ่มต้น
 DocType: Process Payroll,Salary Slip Based on Timesheet,สลิปเงินเดือนจาก Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,ไม่มีพนักงานสำหรับเกณฑ์ที่เลือกข้างต้นหรือสลิปเงินเดือนที่สร้างไว้แล้ว
 DocType: Notification Control,Sales Order Message,ข้อความสั่งซื้อขาย
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",การตั้ง ค่าเริ่มต้น เช่น บริษัท สกุลเงิน ปัจจุบัน ปีงบประมาณ ฯลฯ
 DocType: Payment Entry,Payment Type,ประเภท การชำระเงิน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,โปรดเลือกแบทช์สำหรับรายการ {0} ไม่สามารถหาชุดงานเดี่ยวที่ตอบสนองความต้องการนี้ได้
 DocType: Process Payroll,Select Employees,เลือกพนักงาน
 DocType: Opportunity,Potential Sales Deal,ที่อาจเกิดขึ้น Deal ขาย
 DocType: Payment Entry,Cheque/Reference Date,เช็ค / วันที่อ้างอิง
@@ -2518,7 +2521,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},รายละเอียด จุดขาย ทั้งหมด {0} สร้างไว้แล้วสำหรับ บริษัท {1}
 DocType: Purchase Order,Ref SQ,SQ Ref
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,แทนที่รายการ / BOM ใน BOMs ทั้งหมด
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,เอกสารใบเสร็จรับเงินจะต้องส่ง
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,เอกสารใบเสร็จรับเงินจะต้องส่ง
 DocType: Purchase Invoice Item,Received Qty,จำนวนที่ได้รับ
 DocType: Stock Entry Detail,Serial No / Batch,หมายเลขเครื่อง / ชุด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,การชำระเงินไม่ได้และไม่ได้ส่งมอบ
@@ -2527,11 +2530,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,ไม่มีแผ่นเวลา
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,ฝากประเภท {0} ไม่สามารถดำเนินการส่งต่อ-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',ตาราง การบำรุงรักษา ที่ไม่ได้ สร้างขึ้นสำหรับ รายการทั้งหมด กรุณา คลิกที่ 'สร้าง ตาราง '
 ,To Produce,ในการ ผลิต
 apps/erpnext/erpnext/config/hr.py +93,Payroll,บัญชีเงินเดือน
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",แถว {0} ใน {1} ที่จะรวม {2} ในอัตรารายการแถว {3} จะต้องรวม
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,ทำให้ผู้ใช้
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,ทำให้ผู้ใช้
 DocType: Packing Slip,Identification of the package for the delivery (for print),บัตรประจำตัวของแพคเกจสำหรับการส่งมอบ (สำหรับพิมพ์)
 DocType: Bin,Reserved Quantity,จำนวนสงวน
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,โปรดป้อนที่อยู่อีเมลที่ถูกต้อง
@@ -2545,15 +2548,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,แม่แบบสำหรับผู้พิการจะต้องไม่เป็นแม่แบบเริ่มต้น
 DocType: Account,Income Account,บัญชีรายได้
 DocType: Payment Request,Amount in customer's currency,จำนวนเงินในสกุลเงินของลูกค้า
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,การจัดส่งสินค้า
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,การจัดส่งสินค้า
 DocType: Stock Reconciliation Item,Current Qty,จำนวนปัจจุบัน
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",โปรดดูที่ &quot;ค่าของวัสดุบนพื้นฐานของ&quot; ต้นทุนในมาตรา
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,ก่อนหน้า
 DocType: Appraisal Goal,Key Responsibility Area,พื้นที่ความรับผิดชอบหลัก
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",ชุดนักศึกษาช่วยให้คุณติดตามการเข้าร่วมการประเมินและค่าธรรมเนียมสำหรับนักเรียน
 DocType: Payment Entry,Total Allocated Amount,จำนวนเงินที่ได้รับจัดสรร
 DocType: Item Reorder,Material Request Type,ประเภทของการขอวัสดุ
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural วารสารรายการสำหรับเงินเดือนจาก {0} เป็น {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",LocalStorage เต็มไม่ได้บันทึก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",LocalStorage เต็มไม่ได้บันทึก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,แถว {0}: UOM ปัจจัยการแปลงมีผลบังคับใช้
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,อ้าง
 DocType: Budget,Cost Center,ศูนย์ต้นทุน
@@ -2563,16 +2567,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,ซ่อนประจำตัวผู้เสียภาษีของลูกค้าจากการทำธุรกรรมการขาย
 DocType: Upload Attendance,Upload HTML,อัพโหลด HTML
 DocType: Employee,Relieving Date,บรรเทาวันที่
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",กฎการกำหนดราคาจะทำเพื่อแทนที่ราคาตามรายการ / กำหนดเปอร์เซ็นต์ส่วนลดขึ้นอยู่กับเงื่อนไขบางอย่าง
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,คลังสินค้า สามารถเปลี่ยนผ่านทาง  รายการสต๊อก / บันทึกการส่งมอบ / ใบสั่งซื้อ
 DocType: Employee Education,Class / Percentage,ระดับ / ร้อยละ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,หัวหน้าฝ่ายการตลาด และการขาย
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.",ถ้ากฎการกำหนดราคาที่เลือกจะทำเพื่อ 'ราคา' มันจะเขียนทับราคา กำหนดราคากฎเป็นราคาสุดท้ายจึงไม่มีส่วนลดต่อไปควรจะนำมาใช้ ดังนั้นในการทำธุรกรรมเช่นสั่งซื้อการขาย ฯลฯ สั่งซื้อจะถูกเรียกในสาขา 'อัตรา' มากกว่าข้อมูล 'ราคาอัตรา'
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",ถ้ากฎการกำหนดราคาที่เลือกจะทำเพื่อ 'ราคา' มันจะเขียนทับราคา กำหนดราคากฎเป็นราคาสุดท้ายจึงไม่มีส่วนลดต่อไปควรจะนำมาใช้ ดังนั้นในการทำธุรกรรมเช่นสั่งซื้อการขาย ฯลฯ สั่งซื้อจะถูกเรียกในสาขา 'อัตรา' มากกว่าข้อมูล 'ราคาอัตรา'
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ติดตาม ช่องทาง ตามประเภทอุตสาหกรรม
 DocType: Item Supplier,Item Supplier,ผู้ผลิตรายการ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,กรุณากรอก รหัสสินค้า ที่จะได้รับ ชุด ไม่
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},กรุณาเลือก ค่าสำหรับ {0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,ที่อยู่ทั้งหมด
 DocType: Company,Stock Settings,การตั้งค่าหุ้น
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",การควบรวมจะเป็นไปได้ถ้าคุณสมบัติต่อไปนี้จะเหมือนกันทั้งในบันทึก เป็นกลุ่มประเภทราก บริษัท
@@ -2582,6 +2586,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',จะส่งอีเมลเกี่ยวกับเหตุการณ์ที่ให้กับพนักงานที่มีสถานะ &#39;เปิด&#39;
 DocType: Task,Depends on Tasks,ขึ้นอยู่กับงาน
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,จัดการ กลุ่ม ลูกค้า ต้นไม้
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,สามารถแนบไฟล์แนบได้โดยไม่ต้องเปิดใช้งานรถเข็นช็อปปิ้ง
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,ใหม่ ชื่อ ศูนย์ต้นทุน
 DocType: Leave Control Panel,Leave Control Panel,ฝากแผงควบคุม
@@ -2594,12 +2599,10 @@
 DocType: Sales Invoice,Debit To,เดบิตเพื่อ
 DocType: Delivery Note,Required only for sample item.,ที่จำเป็นสำหรับรายการตัวอย่าง
 DocType: Stock Ledger Entry,Actual Qty After Transaction,จำนวนที่เกิดขึ้นจริงหลังทำรายการ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,ผู้จัดจำหน่าย&gt; ประเภทผู้จัดจำหน่าย
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},ไม่มีสลิปเงินเดือนพบกันระหว่าง {0} และ {1}
 ,Pending SO Items For Purchase Request,รายการที่รอดำเนินการเพื่อให้ใบขอซื้อ
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,การรับสมัครนักศึกษา
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} ถูกปิดใช้งาน
 DocType: Supplier,Billing Currency,สกุลเงินการเรียกเก็บเงิน
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,ขนาดใหญ่พิเศษ
@@ -2616,9 +2619,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,โฮมเพจสินค้าแนะนำ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,ทุกกลุ่มการประเมิน
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,ชื่อคลังสินค้าใหม่
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),รวม {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),รวม {0} ({1})
 DocType: C-Form Invoice Detail,Territory,อาณาเขต
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,กรุณาระบุ ไม่ จำเป็นต้องมี การเข้าชม
 DocType: Stock Settings,Default Valuation Method,วิธีการประเมินค่าเริ่มต้น
 DocType: Vehicle Log,Fuel Qty,น้ำมันเชื้อเพลิงจำนวน
 DocType: Production Order Operation,Planned Start Time,เวลาเริ่มต้นการวางแผน
@@ -2634,7 +2637,7 @@
 DocType: Price List,Price List Master,ราคาโท
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,ขายทำธุรกรรมทั้งหมดสามารถติดแท็กกับหลายบุคคลที่ขาย ** ** เพื่อให้คุณสามารถตั้งค่าและตรวจสอบเป้าหมาย
 ,S.O. No.,เลขที่ใบสั่งขาย
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},กรุณาสร้าง ลูกค้า จากช่องทาง {0}
 DocType: Price List,Applicable for Countries,ใช้งานได้สำหรับประเทศ
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,ทิ้งไว้เพียงการประยุกต์ใช้งานที่มีสถานะ &#39;อนุมัติ&#39; และ &#39;ปฏิเสธ&#39; สามารถส่ง
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},นักศึกษาชื่อกลุ่มมีผลบังคับใช้ในแถว {0}
@@ -2678,7 +2681,7 @@
 DocType: Project,Copied From,คัดลอกจาก
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},ข้อผิดพลาดชื่อ: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,ความขาดแคลน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} ไม่เชื่อมโยงกับ {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} ไม่เชื่อมโยงกับ {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,เข้าร่วม สำหรับพนักงาน {0} จะถูกทำเครื่องหมาย แล้ว
 DocType: Packing Slip,If more than one package of the same type (for print),หากมีมากกว่าหนึ่งแพคเกจประเภทเดียวกัน (พิมพ์)
 ,Salary Register,เงินเดือนที่ต้องการสมัครสมาชิก
@@ -2697,7 +2700,7 @@
 DocType: Tax Rule,Use for Shopping Cart,ใช้สำหรับรถเข็น
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ราคา {0} สำหรับแอตทริบิวต์ {1} ไม่อยู่ในรายชื่อของรายการที่ถูกต้องแอตทริบิวต์ค่าสำหรับรายการ {2}
 DocType: BOM Item,Scrap %,เศษ%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",ค่าใช้จ่ายจะถูกกระจายไปตามสัดส่วนในปริมาณรายการหรือจำนวนเงินตามที่คุณเลือก
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",ค่าใช้จ่ายจะถูกกระจายไปตามสัดส่วนในปริมาณรายการหรือจำนวนเงินตามที่คุณเลือก
 DocType: Maintenance Visit,Purposes,วัตถุประสงค์
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,อย่างน้อยหนึ่งรายการที่ควรจะใส่ที่มีปริมาณเชิงลบในเอกสารกลับมา
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",การดำเนินงาน {0} นานกว่าชั่วโมงการทำงานใด ๆ ที่มีอยู่ในเวิร์กสเตชัน {1} ทำลายลงการดำเนินงานในการดำเนินงานหลาย
@@ -2718,16 +2721,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,จัดการ ต้นไม้ มณฑล
 DocType: Journal Entry Account,Sales Invoice,ขายใบแจ้งหนี้
 DocType: Journal Entry Account,Party Balance,ยอดคงเหลือพรรค
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,กรุณาเลือกใช้ส่วนลด
 DocType: Company,Default Receivable Account,บัญชีเริ่มต้นลูกหนี้
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,สร้างธนาคารรับสมัครสำหรับเงินเดือนทั้งหมดที่จ่ายสำหรับเกณฑ์ที่เลือกข้างต้น
 DocType: Stock Entry,Material Transfer for Manufacture,โอนวัสดุสำหรับการผลิต
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ร้อยละส่วนลดสามารถนำไปใช้อย่างใดอย่างหนึ่งกับราคาหรือราคาตามรายการทั้งหมด
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ร้อยละส่วนลดสามารถนำไปใช้อย่างใดอย่างหนึ่งกับราคาหรือราคาตามรายการทั้งหมด
 DocType: Purchase Invoice,Half-yearly,รายหกเดือน
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,เข้าบัญชีสำหรับสต็อก
 DocType: Vehicle Service,Engine Oil,น้ำมันเครื่อง
 DocType: Sales Invoice,Sales Team1,ขาย Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,รายการที่ {0} ไม่อยู่
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,รายการที่ {0} ไม่อยู่
 DocType: Sales Invoice,Customer Address,ที่อยู่ของลูกค้า
 DocType: Employee Loan,Loan Details,รายละเอียดเงินกู้
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,แถว {0}: เสร็จสมบูรณ์จำนวนจะต้องมากกว่าศูนย์
@@ -2735,24 +2738,24 @@
 DocType: Account,Root Type,ประเภท ราก
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},แถว # {0}: ไม่สามารถกลับมามากกว่า {1} สำหรับรายการ {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,พล็อต
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},คลังสินค้า เป้าหมาย จำเป็นสำหรับ แถว {0}
 DocType: Cheque Print Template,Primary Settings,การตั้งค่าหลัก
 DocType: Purchase Invoice,Select Supplier Address,เลือกที่อยู่ผู้ผลิต
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,เพิ่มพนักงาน
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,เพิ่มพนักงาน
 DocType: Purchase Invoice Item,Quality Inspection,การตรวจสอบคุณภาพ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,ขนาดเล็กเป็นพิเศษ
 DocType: Company,Standard Template,แม่แบบมาตรฐาน
 DocType: Training Event,Theory,ทฤษฎี
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,คำเตือน: ขอ วัสดุ จำนวน น้อยกว่า จำนวน สั่งซื้อขั้นต่ำ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,บัญชี {0} จะถูก แช่แข็ง
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,นิติบุคคล / สาขา ที่มีผังบัญชีแยกกัน ภายใต้องค์กร
 DocType: Payment Request,Mute Email,ปิดเสียงอีเมล์
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","อาหาร, เครื่องดื่ม และ ยาสูบ"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},สามารถชำระเงินยังไม่เรียกเก็บกับ {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,อัตราค่านายหน้า ไม่สามารถ จะมากกว่า 100
 DocType: Stock Entry,Subcontract,สัญญารับช่วง
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,กรุณากรอก {0} แรก
@@ -2792,7 +2795,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,โกดังกับการทำธุรกรรมที่มีอยู่ไม่สามารถแปลงไปยังกลุ่ม
 DocType: Assessment Result Tool,Result HTML,ผล HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,หมดอายุเมื่อวันที่
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,เพิ่มนักเรียน
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,เพิ่มนักเรียน
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},กรุณาเลือก {0}
 DocType: C-Form,C-Form No,C-Form ไม่มี
 DocType: BOM,Exploded_items,Exploded_items
@@ -2835,7 +2838,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,amt
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,เลือกปีงบประมาณ
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,สั่งซื้อใหม่ระดับ
 DocType: Company,Chart Of Accounts Template,ผังบัญชีแม่แบบ
 DocType: Attendance,Attendance Date,วันที่เข้าร่วม
@@ -2850,14 +2853,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,รายการ ที่ซ้ำกัน
 DocType: Program Enrollment Tool,Get Students,การรับนักเรียน
 DocType: Serial No,Under Warranty,อยู่ภายในการรับประกัน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[ข้อผิดพลาด]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[ข้อผิดพลาด]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกการสั่งซื้อการขาย
 ,Employee Birthday,วันเกิดของพนักงาน
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,นักศึกษาเข้าร่วมชุดเครื่องมือ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,จำกัด การข้าม
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,บริษัท ร่วมทุน
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,ระยะทางวิชาการกับเรื่องนี้ &#39;ปีการศึกษา&#39; {0} และ &#39;ระยะชื่อ&#39; {1} อยู่แล้ว โปรดแก้ไขรายการเหล่านี้และลองอีกครั้ง
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",เนื่องจากมีการทำธุรกรรมที่มีอยู่กับรายการ {0} คุณไม่สามารถเปลี่ยนค่าของ {1}
 DocType: UOM,Must be Whole Number,ต้องเป็นจำนวนเต็ม
 DocType: Leave Control Panel,New Leaves Allocated (In Days),ใบใหม่ที่จัดสรร (ในวัน)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,อนุกรม ไม่มี {0} ไม่อยู่
@@ -2877,7 +2880,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% ของวัสดุที่เรียกเก็บเงินเทียบกับคำสั่งขายนี้
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,ระยะเวลาการเข้าปิดบัญชี
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น กลุ่ม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},จำนวน {0} {1} {2} {3}
 DocType: Account,Depreciation,ค่าเสื่อมราคา
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),ผู้ผลิต (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,เครื่องมือเข้าร่วมประชุมพนักงาน
@@ -2901,7 +2904,7 @@
 DocType: Supplier,Last Day of the Next Month,วันสุดท้ายของเดือนถัดไป
 DocType: Support Settings,Auto close Issue after 7 days,รถยนต์ใกล้ฉบับหลังจาก 7 วัน
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",ออกจากไม่สามารถได้รับการจัดสรรก่อน {0} เป็นสมดุลลาได้รับแล้วนำติดตัวส่งต่อไปในอนาคตอันลาบันทึกจัดสรร {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),หมายเหตุ: เนื่องจาก / วันอ้างอิงเกินวันที่ได้รับอนุญาตให้เครดิตของลูกค้าโดย {0} วัน (s)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,สมัครนักศึกษา
 DocType: Asset Category Account,Accumulated Depreciation Account,บัญชีค่าเสื่อมราคาสะสม
 DocType: Stock Settings,Freeze Stock Entries,ตรึงคอมเมนต์สินค้า
@@ -2912,7 +2915,7 @@
 ,Stock Analytics,สต็อก Analytics
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,การดำเนินงานไม่สามารถเว้นว่าง
 DocType: Maintenance Visit Purpose,Against Document Detail No,กับรายละเอียดของเอกสารเลขที่
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,ประเภทของบุคคลที่มีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,ประเภทของบุคคลที่มีผลบังคับใช้
 DocType: Quality Inspection,Outgoing,ขาออก
 DocType: Material Request,Requested For,สำหรับ การร้องขอ
 DocType: Quotation Item,Against Doctype,กับ ประเภทเอกสาร
@@ -2929,11 +2932,11 @@
 DocType: Asset,Item Code,รหัสสินค้า
 DocType: Production Planning Tool,Create Production Orders,สร้างคำสั่งซื้อการผลิต
 DocType: Serial No,Warranty / AMC Details,รายละเอียดการรับประกัน / AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,เลือกนักเรียนด้วยตนเองสำหรับกลุ่มกิจกรรม
 DocType: Journal Entry,User Remark,หมายเหตุผู้ใช้
 DocType: Lead,Market Segment,ส่วนตลาด
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},ที่เรียกชำระแล้วจำนวนเงินที่ไม่สามารถจะสูงกว่ายอดรวมที่โดดเด่นในเชิงลบ {0}
 DocType: Employee Internal Work History,Employee Internal Work History,ประวัติการทำงานของพนักงานภายใน
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),ปิด (Dr)
 DocType: Cheque Print Template,Cheque Size,ขนาดเช็ค
@@ -2949,7 +2952,7 @@
 DocType: Production Planning Tool,Create Material Requests,ขอสร้างวัสดุ
 DocType: Employee Education,School/University,โรงเรียน / มหาวิทยาลัย
 DocType: Payment Request,Reference Details,รายละเอียดอ้างอิง
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,ค่าที่คาดหวังหลังจากที่มีชีวิตที่มีประโยชน์จะต้องน้อยกว่ามวลรวมสั่งซื้อ
 DocType: Sales Invoice Item,Available Qty at Warehouse,จำนวนที่คลังสินค้า
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,จำนวนเงินที่ เรียกเก็บเงิน
 DocType: Asset,Double Declining Balance,ยอดลดลงสองครั้ง
@@ -2970,20 +2973,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",บัญชีที่แตกต่างจะต้องเป็นสินทรัพย์ / รับผิดบัญชีประเภทตั้งแต่นี้กระทบยอดสต็อกเป็นรายการเปิด
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},การเบิกจ่ายจำนวนเงินที่ไม่สามารถจะสูงกว่าจำนวนเงินกู้ {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},จำนวน การสั่งซื้อ สินค้า ที่จำเป็นสำหรับ {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,ใบสั่งผลิตไม่ได้สร้าง
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','จาก วันที่ ' ต้อง เป็นหลังจากที่ ' นัด '
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},ไม่สามารถเปลี่ยนสถานะเป็นนักเรียน {0} มีการเชื่อมโยงกับโปรแกรมนักเรียน {1}
 DocType: Asset,Fully Depreciated,ค่าเสื่อมราคาหมด
 ,Stock Projected Qty,หุ้น ที่คาดการณ์ จำนวน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},ลูกค้า {0} ไม่ได้อยู่ใน โครงการ {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,ผู้เข้าร่วมการทำเครื่องหมาย HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",ใบเสนอราคาข้อเสนอการเสนอราคาที่คุณส่งให้กับลูกค้าของคุณ
 DocType: Sales Order,Customer's Purchase Order,การสั่งซื้อของลูกค้า
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,ไม่มี Serial และแบทช์
 DocType: Warranty Claim,From Company,จาก บริษัท
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,ผลรวมของคะแนนของเกณฑ์การประเมินจะต้อง {0}
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,ค่าหรือ จำนวน
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,กรุณาตั้งค่าจำนวนค่าเสื่อมราคาจอง
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,ค่าหรือ จำนวน
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,สั่งซื้อโปรดักชั่นไม่สามารถยกขึ้นเพื่อ:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,นาที
 DocType: Purchase Invoice,Purchase Taxes and Charges,ภาษีซื้อและค่าบริการ
@@ -2996,7 +2999,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,โกดังทั้งหมด
 DocType: Sales Partner,Retailer,พ่อค้าปลีก
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,เครดิตไปยังบัญชีจะต้องเป็นบัญชีงบดุล
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,ทุก ประเภท ของผู้ผลิต
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,ทุก ประเภท ของผู้ผลิต
 DocType: Global Defaults,Disable In Words,ปิดการใช้งานในคำพูด
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,รหัสสินค้า ที่จำเป็น เพราะ สินค้า ไม่ เลขโดยอัตโนมัติ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},ไม่ได้ ชนิดของ ใบเสนอราคา {0} {1}
@@ -3005,6 +3008,7 @@
 DocType: Production Order,PRO-,มือโปร-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,บัญชี เงินเบิกเกินบัญชี ธนาคาร
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,สร้างสลิปเงินเดือน
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,แถว # {0}: จำนวนที่จัดสรรไว้ต้องไม่เกินยอดค้างชำระ
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,ดู BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,เงินให้กู้ยืม ที่มีหลักประกัน
 DocType: Purchase Invoice,Edit Posting Date and Time,แก้ไขวันที่โพสต์และเวลา
@@ -3044,7 +3048,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},ไม่ได้รับอนุญาตในการปรับปรุงการทำธุรกรรมหุ้นเก่ากว่า {0}
 DocType: Purchase Invoice Item,PR Detail,รายละเอียดประชาสัมพันธ์
 DocType: Sales Order,Fully Billed,ในจำนวนอย่างเต็มที่
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},กรุณาตั้งค่าบัญชีเจ้าหนี้ค่าเริ่มต้นในการทำงานของพนักงาน {0}
 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 +127,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),น้ำหนักรวมของแพคเกจ น้ำหนักสุทธิปกติ + น้ำหนักวัสดุบรรจุภัณฑ์ (สำหรับพิมพ์)
@@ -3055,7 +3058,7 @@
 DocType: Student Group,Group Based On,กลุ่มตาม
 DocType: Journal Entry,Bill Date,วันที่บิล
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",บริการรายการประเภทความถี่และจำนวนเงินค่าใช้จ่ายที่จะต้อง
-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:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",แม้ว่าจะมีกฎการกำหนดราคาหลายกับความสำคัญสูงสุดแล้วจัดลำดับความสำคัญดังต่อไปนี้ภายในจะใช้:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},คุณต้องการจริงๆที่จะส่งทุกสลิปเงินเดือนจาก {0} เป็น {1}
 DocType: Cheque Print Template,Cheque Height,เช็คความสูง
 DocType: Supplier,Supplier Details,รายละเอียดผู้จัดจำหน่าย
@@ -3067,7 +3070,7 @@
 DocType: Vehicle Log,Invoice Ref,Ref ใบแจ้งหนี้
 DocType: Purchase Order,Recurring Order,การสั่งซื้อที่เกิดขึ้น
 DocType: Company,Default Income Account,บัญชีรายได้เริ่มต้น
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,กลุ่ม ลูกค้า / ลูกค้า
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed ปีงบประมาณกำไร / ขาดทุน (เครดิต)
 DocType: Sales Invoice,Time Sheets,แผ่น Time
 DocType: Payment Gateway Account,Default Payment Request Message,เริ่มต้นการชำระเงินรวมเข้าข้อความ
@@ -3087,10 +3090,10 @@
 DocType: Notification Control,Quotation Message,ข้อความใบเสนอราคา
 DocType: Employee Loan,Employee Loan Application,ขอกู้เงินของพนักงาน
 DocType: Issue,Opening Date,เปิดวันที่
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,ผู้เข้าร่วมได้รับการประสบความสำเร็จในการทำเครื่องหมาย
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,ผู้เข้าร่วมได้รับการประสบความสำเร็จในการทำเครื่องหมาย
 DocType: Journal Entry,Remark,คำพูด
 DocType: Purchase Receipt Item,Rate and Amount,อัตราและปริมาณ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},ประเภทบัญชีสำหรับ {0} &#39;จะต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},ประเภทบัญชีสำหรับ {0} &#39;จะต้อง {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,ใบและวันหยุด
 DocType: School Settings,Current Academic Term,ระยะเวลาการศึกษาปัจจุบัน
 DocType: School Settings,Current Academic Term,ระยะเวลาการศึกษาปัจจุบัน
@@ -3113,7 +3116,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,กลุ่มนักศึกษา
 DocType: Shopping Cart Settings,Quotation Series,ชุดใบเสนอราคา
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",รายการที่มีอยู่ ที่มีชื่อเดียวกัน ({0}) กรุณาเปลี่ยนชื่อกลุ่ม รายการ หรือเปลี่ยนชื่อ รายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,กรุณาเลือกลูกค้า
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,กรุณาเลือกลูกค้า
 DocType: C-Form,I,ผม
 DocType: Company,Asset Depreciation Cost Center,สินทรัพย์ศูนย์ต้นทุนค่าเสื่อมราคา
 DocType: Sales Order Item,Sales Order Date,วันที่สั่งซื้อขาย
@@ -3132,20 +3135,20 @@
 DocType: Vehicle,Insurance Details,รายละเอียดการประกันภัย
 DocType: Account,Payable,ที่ต้องชำระ
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,กรุณากรอกระยะเวลาการชำระคืน
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),ลูกหนี้ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),ลูกหนี้ ({0})
 DocType: Pricing Rule,Margin,ขอบ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,ลูกค้าใหม่
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,% กำไรขั้นต้น
 DocType: Appraisal Goal,Weightage (%),weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,วันที่กวาดล้าง
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,จำนวนการสั่งซื้อขั้นต้นมีผลบังคับใช้
 DocType: Lead,Address Desc,ลักษณะ ของ ที่อยู่
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,พรรคมีผลบังคับใช้
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,พรรคมีผลบังคับใช้
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,ชื่อกระทู้
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,อย่างน้อยต้องเลือกหนึ่งในการขาย หรือการซื้อ
-DocType: Grading Structure,Grade Intervals,ช่วงชั้นประถมศึกษา
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,เลือกลักษณะของธุรกิจของคุณ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},แถว # {0}: รายการซ้ำในเอกสารอ้างอิง {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,สถานที่ที่ดำเนินการผลิต
 DocType: Asset Movement,Source Warehouse,คลังสินค้าที่มา
 DocType: Installation Note,Installation Date,วันที่ติดตั้ง
@@ -3182,7 +3185,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,หัว จดหมาย สำหรับการพิมพ์ แม่แบบ
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,ชื่อ แม่แบบ สำหรับการพิมพ์ เช่นผู้ Proforma Invoice
 DocType: Student Guardian,Student Guardian,เดอะการ์เดียนักศึกษา
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,ค่าใช้จ่ายประเภทการประเมินไม่สามารถทำเครื่องหมายเป็น 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
@@ -3210,7 +3213,7 @@
 DocType: Company,Exchange Gain / Loss Account,กำไรจากอัตราแลกเปลี่ยน / บัญชีการสูญเสีย
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,พนักงานและพนักงาน
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},จุดประสงค์ ต้องเป็นหนึ่งใน {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,กรอกแบบฟอร์ม และบันทึกไว้
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,ฟอรั่มชุมชน
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,จำนวนจริงในสต็อก
@@ -3226,7 +3229,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,สั่งซื้อใหม่จำนวน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,เปิดงานปัจจุบัน
 DocType: Company,Stock Adjustment Account,การปรับบัญชีสินค้า
-DocType: Journal Entry,Write Off,เขียนปิด
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,เขียนปิด
 DocType: Timesheet Detail,Operation ID,รหัสการดำเนินงาน
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",ผู้ใช้ระบบ (login) ID ถ้าชุดก็จะกลายเป็นค่าเริ่มต้นสำหรับทุกรูปแบบทรัพยากรบุคคล
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: จาก {1}
@@ -3237,27 +3240,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,ผู้ผลิตมอบให้กับลูกค้า
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}] (แบบ # รายการ / / {0}) ไม่มีในสต๊อก
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,วันถัดไปจะต้องมากกว่าการโพสต์วันที่
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,แสดงภาษีผิดขึ้น
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,แสดงภาษีผิดขึ้น
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},เนื่องจาก / วันอ้างอิงต้องไม่อยู่หลัง {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ข้อมูลนำเข้าและส่งออก
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",รายการสต็อกที่มีอยู่กับคลังสินค้า {0} ดังนั้นคุณจะไม่สามารถกำหนดหรือปรับเปลี่ยน
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,ไม่พบนักเรียน
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,ไม่พบนักเรียน
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,ใบแจ้งหนี้วันที่โพสต์
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,ขาย
 DocType: Sales Invoice,Rounded Total,รวมกลม
 DocType: Product Bundle,List items that form the package.,รายการที่สร้างแพคเกจ
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,ร้อยละ จัดสรร ควรจะเท่ากับ 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,กรุณาเลือกวันที่โพสต์ก่อนที่จะเลือกพรรค
 DocType: Program Enrollment,School House,โรงเรียนบ้าน
 DocType: Serial No,Out of AMC,ออกของ AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,โปรดเลือกใบเสนอราคา
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,โปรดเลือกใบเสนอราคา
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,โปรดเลือกใบเสนอราคา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,จำนวนค่าเสื่อมราคาจองไม่สามารถจะสูงกว่าจำนวนค่าเสื่อมราคา
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,ทำให้ การบำรุงรักษา เยี่ยมชม
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,กรุณาติดต่อผู้ใช้ที่มีผู้จัดการฝ่ายขายโท {0} บทบาท
 DocType: Company,Default Cash Account,บัญชีเงินสดเริ่มต้น
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,บริษัท (ไม่ใช่ ลูกค้า หรือ ซัพพลายเออร์ ) เจ้านาย
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,นี้ขึ้นอยู่กับการเข้าร่วมประชุมของนักศึกษานี้
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,ไม่มีนักเรียนเข้ามา
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,เพิ่มรายการมากขึ้นหรือเต็มรูปแบบเปิด
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"โปรดป้อน "" วันที่ส่ง ที่คาดหวัง '"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ใบนำส่งสินค้า {0} ต้องถูกยกเลิก ก่อนยกเลิกคำสั่งขายนี้
@@ -3289,6 +3293,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,วาระที่ 3
 DocType: Purchase Order,Customer Contact Email,อีเมล์ที่ใช้ติดต่อลูกค้า
 DocType: Warranty Claim,Item and Warranty Details,รายการและรายละเอียดการรับประกัน
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,รหัสรายการ&gt; กลุ่มสินค้า&gt; แบรนด์
 DocType: Sales Team,Contribution (%),สมทบ (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,หมายเหตุ : รายการ การชำระเงินจะ ไม่ได้รับการ สร้างขึ้นตั้งแต่ ' เงินสด หรือ บัญชี ธนาคาร ไม่ได้ระบุ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,เลือกโปรแกรมเพื่อดึงข้อมูลหลักสูตรที่บังคับ
@@ -3304,9 +3309,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,ก่อนที่จะกลับไปคืนดี
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},ไปที่ {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ภาษีและค่าใช้จ่ายเพิ่ม (สกุลเงิน บริษัท )
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,รายการ แถว ภาษี {0} ต้องมีบัญชี ภาษี ประเภท หรือ รายได้ หรือ ค่าใช้จ่าย หรือ คิดค่าบริการได้
 DocType: Sales Order,Partly Billed,จำนวนมากที่สุดเป็นส่วนใหญ่
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,รายการ {0} จะต้องเป็นรายการสินทรัพย์ถาวร
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,รายการ {0} จะต้องเป็นรายการสินทรัพย์ถาวร
 DocType: Item,Default BOM,BOM เริ่มต้น
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,กรุณาชื่อ บริษัท อีกครั้งเพื่อยืนยันชนิด
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,รวมที่โดดเด่น Amt
@@ -3316,8 +3321,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,ยานยนต์
 DocType: Vehicle,Insurance Company,บริษัท ประกันภัย
 DocType: Asset Category Account,Fixed Asset Account,บัญชีสินทรัพย์ถาวร
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,ตัวแปร
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,ตัวแปร
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,จากหมายเหตุการจัดส่งสินค้า
 DocType: Student,Student Email Address,อีเมล์ของนักศึกษา
 DocType: Timesheet Detail,From Time,ตั้งแต่เวลา
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,มีสินค้า:
@@ -3329,12 +3334,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,ราคาอัตราแลกเปลี่ยนรายชื่อ
 DocType: Purchase Invoice Item,Rate,อัตรา
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,แพทย์ฝึกหัด
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ชื่อที่อยู่
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ชื่อที่อยู่
 DocType: Stock Entry,From BOM,จาก BOM
 DocType: Assessment Code,Assessment Code,รหัสการประเมิน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,ขั้นพื้นฐาน
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,ก่อนที่จะทำธุรกรรมหุ้น {0} ถูกแช่แข็ง
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',กรุณา คลิกที่ 'สร้าง ตาราง '
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","เช่น กิโลกรัม, หน่วย, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,ไม่มี การอ้างอิง มีผลบังคับใช้ ถ้า คุณป้อน วันที่ อ้างอิง
 DocType: Bank Reconciliation Detail,Payment Document,เอกสารการชำระเงิน
@@ -3342,19 +3347,19 @@
 DocType: Salary Slip,Salary Structure,โครงสร้างเงินเดือน
 DocType: Account,Bank,ธนาคาร
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,สายการบิน
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,ฉบับวัสดุ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,ฉบับวัสดุ
 DocType: Material Request Item,For Warehouse,สำหรับโกดัง
 DocType: Employee,Offer Date,ข้อเสนอ วันที่
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,ใบเสนอราคา
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,คุณกำลังอยู่ในโหมดออฟไลน์ คุณจะไม่สามารถที่จะโหลดจนกว่าคุณจะมีเครือข่าย
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,ไม่มีกลุ่มนักศึกษาสร้าง
 DocType: Purchase Invoice Item,Serial No,อนุกรมไม่มี
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,จำนวนเงินที่ชำระหนี้รายเดือนไม่สามารถจะสูงกว่าจำนวนเงินกู้
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,กรุณากรอก รายละเอียด Maintaince แรก
 DocType: Purchase Invoice,Print Language,พิมพ์ภาษา
 DocType: Salary Slip,Total Working Hours,รวมชั่วโมงทำงาน
 DocType: Stock Entry,Including items for sub assemblies,รวมทั้งรายการสำหรับส่วนประกอบย่อย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,ค่าใส่ต้องเป็นบวก
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,ค่าใส่ต้องเป็นบวก
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,ดินแดน ทั้งหมด
 DocType: Purchase Invoice,Items,รายการ
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,นักศึกษาลงทะเบียนเรียนแล้ว
@@ -3374,17 +3379,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',เริ่มต้นหน่วยวัดสำหรับตัวแปร &#39;{0}&#39; จะต้องเป็นเช่นเดียวกับในแม่แบบ &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,การคำนวณพื้นฐานตาม
 DocType: Delivery Note Item,From Warehouse,จากคลังสินค้า
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,ไม่มีรายการที่มี Bill of Materials การผลิต
 DocType: Assessment Plan,Supervisor Name,ชื่อผู้บังคับบัญชา
 DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
 DocType: Program Enrollment Course,Program Enrollment Course,หลักสูตรการลงทะเบียนเรียน
-DocType: Grading Structure,Grading Structure,โครงสร้างการวัดผลการศึกษา
 DocType: Purchase Taxes and Charges,Valuation and Total,การประเมินและรวม
 DocType: Tax Rule,Shipping City,การจัดส่งสินค้าเมือง
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,รายการนี้เป็นตัวแปรของ {0} (Template) คุณสมบัติจะถูกคัดลอกมาจากแม่แบบเว้นแต่ 'ไม่คัดลอก' ถูกตั้งค่า
 DocType: Notification Control,Customize the Notification,กำหนดประกาศ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,กระแสเงินสดจากการดำเนินงาน
 DocType: Sales Invoice,Shipping Rule,กฎการจัดส่งสินค้า
@@ -3405,8 +3408,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},ไม่มี BOM เริ่มต้น แล้วสำหรับ รายการ {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,กรุณาเลือกวันที่โพสต์แรก
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,เปิดวันที่ควรเป็นก่อนที่จะปิดวันที่
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,ศูนย์ต้นทุน กับการทำธุรกรรม ที่มีอยู่ ไม่สามารถ แปลงเป็น บัญชีแยกประเภท
 DocType: Department,Days for which Holidays are blocked for this department.,วันที่วันหยุดจะถูกบล็อกสำหรับแผนกนี้
@@ -3418,7 +3421,7 @@
 DocType: Mode of Payment,General,ทั่วไป
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,แนบ จดหมาย
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,การสื่อสารครั้งล่าสุด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ไม่ สามารถหัก เมื่อ เป็น หมวดหมู่ สำหรับ ' ประเมิน ' หรือ ' การประเมิน และการ รวม
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',ไม่ สามารถหัก เมื่อ เป็น หมวดหมู่ สำหรับ ' ประเมิน ' หรือ ' การประเมิน และการ รวม
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},อนุกรม Nos จำเป็นสำหรับ รายการ เนื่อง {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,การชำระเงินการแข่งขันกับใบแจ้งหนี้
@@ -3434,7 +3437,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),รวม (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,บันเทิงและ การพักผ่อน
 DocType: Quality Inspection,Item Serial No,รายการ Serial No.
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,สร้างประวัติพนักงาน
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,สร้างประวัติพนักงาน
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,ปัจจุบันทั้งหมด
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,รายการบัญชี
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,ชั่วโมง
@@ -3447,10 +3450,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,ไม่ทราบ
 DocType: Shipping Rule,Shipping Rule Conditions,เงื่อนไขกฎการจัดส่งสินค้า
 DocType: BOM Replace Tool,The new BOM after replacement,BOM ใหม่หลังจากเปลี่ยน
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,จุดขาย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,จุดขาย
 DocType: Payment Entry,Received Amount,จำนวนเงินที่ได้รับ
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,โปรดตั้งค่าระบบการตั้งชื่อพนักงานในทรัพยากรบุคคล&gt; การตั้งค่าทรัพยากรบุคคล
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",สร้างปริมาณเต็มรูปแบบโดยไม่คำนึงถึงปริมาณที่มีอยู่แล้วในการสั่งซื้อ
 DocType: Account,Tax,ภาษี
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,ไม่ได้ทำเครื่องหมาย
@@ -3463,9 +3464,9 @@
 DocType: Batch,Source Document Name,ชื่อเอกสารต้นทาง
 DocType: Batch,Source Document Name,ชื่อเอกสารต้นทาง
 DocType: Job Opening,Job Title,ตำแหน่งงาน
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,สร้างผู้ใช้
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,สร้างผู้ใช้
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,กรัม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,ปริมาณการผลิตจะต้องมากกว่า 0
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,เยี่ยมชมรายงานสำหรับการบำรุงรักษาโทร
 DocType: Stock Entry,Update Rate and Availability,ปรับปรุงอัตราและความพร้อมใช้งาน
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,เปอร์เซ็นต์ที่คุณได้รับอนุญาตให้ได้รับหรือส่งมอบมากขึ้นกับปริมาณที่สั่งซื้อ ตัวอย่างเช่นหากคุณได้สั่งซื้อ 100 หน่วย และค่าเผื่อของคุณจะ 10% แล้วคุณจะได้รับอนุญาตจะได้รับ 110 หน่วย
@@ -3475,28 +3476,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},บัญชีค่าใช้จ่าย ที่จำเป็น สำหรับรายการที่ {0}
 DocType: BOM,Website Description,คำอธิบายเว็บไซต์
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,เปลี่ยนสุทธิในส่วนของ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,กรุณายกเลิกการซื้อใบแจ้งหนี้ {0} แรก
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",อีเมล์ต้องไม่ซ้ำกันอยู่แล้วสำหรับ {0}
 DocType: Serial No,AMC Expiry Date,วันที่หมดอายุ AMC
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,ใบเสร็จรับเงิน
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,ใบเสร็จรับเงิน
 ,Sales Register,ขายสมัครสมาชิก
 DocType: Daily Work Summary Settings Company,Send Emails At,ส่งอีเมล์ที่
 DocType: Quotation,Quotation Lost Reason,ใบเสนอราคา Lost เหตุผล
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,เลือกโดเมนของคุณ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},การอ้างอิงการทำธุรกรรมไม่มี {0} วันที่ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ไม่มีอะไรที่จะ แก้ไข คือ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,สรุปในเดือนนี้และกิจกรรมที่อยู่ระหว่างดำเนินการ
 DocType: Customer Group,Customer Group Name,ชื่อกลุ่มลูกค้า
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ยังไม่มีลูกค้า!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,งบกระแสเงินสด
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},วงเงินกู้ไม่เกินจำนวนเงินกู้สูงสุดของ {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,การอนุญาต
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},กรุณาลบนี้ใบแจ้งหนี้ {0} จาก C-แบบฟอร์ม {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,กรุณากรอกตัวอักษร เขียน ปิด บัญชี
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,วันที่สั่งซื้อล่าสุด
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},บัญชี {0} ไม่ได้เป็นของ บริษัท {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,หมายเลขซีเรียลในแถว {0} ไม่ตรงกับหมายเหตุการจัดส่ง
 DocType: Student,Guardian Details,รายละเอียดผู้ปกครอง
 DocType: C-Form,C-Form,C-Form
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,มาร์คเข้าร่วมสำหรับพนักงานหลาย
@@ -3521,20 +3524,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',แถว {0} # บัญชีต้องเป็นชนิด &#39;สินทรัพย์ถาวร&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,ออก จำนวน
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,กฎระเบียบในการคำนวณปริมาณการขนส่งสินค้าสำหรับการขาย
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,ชุด มีผลบังคับใช้
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,ชุด มีผลบังคับใช้
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,บริการทางการเงิน
 DocType: Student Sibling,Student ID,รหัสนักศึกษา
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,ประเภทของกิจกรรมสำหรับบันทึกเวลา
 DocType: Tax Rule,Sales,ขาย
 DocType: Stock Entry Detail,Basic Amount,จํานวนเงินขั้นพื้นฐาน
 DocType: Training Event,Exam,การสอบ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},คลังสินค้า ที่จำเป็นสำหรับ รายการ หุ้น {0}
 DocType: Leave Allocation,Unused leaves,ใบที่ไม่ได้ใช้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,รัฐเรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,โอน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} ไม่ได้เชื่อมโยงกับบัญชี {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} ไม่ได้เชื่อมโยงกับบัญชี {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),เรียก BOM ระเบิด (รวมถึงการ ประกอบย่อย )
 DocType: Authorization Rule,Applicable To (Employee),ที่ใช้บังคับกับ (พนักงาน)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,วันที่ครบกำหนดมีผลบังคับใช้
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,เพิ่มสำหรับแอตทริบิวต์ {0} ไม่สามารถเป็น 0
@@ -3545,13 +3548,13 @@
 ,Inactive Customers,ลูกค้าที่ไม่ได้ใช้งาน
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,ซื้อรายรับ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,วิธีกฎการกำหนดราคาจะใช้?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,วิธีกฎการกำหนดราคาจะใช้?
 DocType: Stock Entry,Delivery Note No,หมายเหตุจัดส่งสินค้าไม่มี
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",หากการตรวจสอบเพียงซื้อวัสดุสำหรับการร้องขอวัตถุดิบสุดท้ายจะถูกรวมอยู่ในการร้องขอวัสดุ มิฉะนั้นการร้องขอวัสดุสำหรับรายการที่ผู้ปกครองจะถูกสร้างขึ้น
 DocType: Cheque Print Template,Message to show,ข้อความที่จะแสดง
 DocType: Company,Retail,ค้าปลีก
 DocType: Attendance,Absent,ขาด
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Bundle สินค้า
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},แถว {0}: การอ้างอิงที่ไม่ถูกต้อง {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ซื้อภาษีและค่าใช้จ่ายแม่แบบ
 DocType: Upload Attendance,Download Template,ดาวน์โหลดแม่แบบ
@@ -3561,10 +3564,10 @@
 DocType: Payment Entry,Account Paid From,บัญชีจ่ายจาก
 DocType: Purchase Order Item Supplied,Raw Material Item Code,วัสดุดิบรหัสสินค้า
 DocType: Journal Entry,Write Off Based On,เขียนปิดขึ้นอยู่กับ
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,ทำให้ตะกั่ว
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,ทำให้ตะกั่ว
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,พิมพ์และเครื่องเขียน
 DocType: Stock Settings,Show Barcode Field,แสดงฟิลด์บาร์โค้ด
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,ส่งอีเมลผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,ส่งอีเมลผู้ผลิต
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",เงินเดือนที่ต้องการการประมวลผลแล้วสำหรับรอบระยะเวลาระหว่าง {0} และ {1} ฝากรับสมัครไม่สามารถอยู่ระหว่างช่วงวันที่นี้
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,บันทึกการติดตั้งสำหรับหมายเลขเครื่อง
 DocType: Guardian Interest,Guardian Interest,ผู้ปกครองที่น่าสนใจ
@@ -3577,6 +3580,7 @@
 DocType: Offer Letter,Awaiting Response,รอการตอบสนอง
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,สูงกว่า
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},แอตทริบิวต์ไม่ถูกต้อง {0} {1}
+DocType: Supplier,Mention if non-standard payable account,พูดถึงบัญชีที่ต้องชำระเงินที่ไม่ได้มาตรฐาน
 DocType: Salary Slip,Earning & Deduction,รายได้และการหัก
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,ไม่จำเป็น การตั้งค่านี้ จะถูก ใช้ในการกรอง ในการทำธุรกรรม ต่างๆ
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,อัตรา การประเมิน เชิงลบ ไม่ได้รับอนุญาต
@@ -3592,10 +3596,9 @@
 DocType: Production Order Item,Production Order Item,การผลิตรายการสั่งซื้อ
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,บันทึกไม่พบ
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,ราคาทุนของสินทรัพย์ทะเลาะวิวาท
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,ordred บางส่วน
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: จำเป็นต้องระบุศูนย์ต้นทุนสำหรับรายการ {2}
 DocType: Vehicle,Policy No,ไม่มีนโยบาย
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,รับรายการจาก Bundle สินค้า
 DocType: Asset,Straight Line,เส้นตรง
 DocType: Project User,Project User,ผู้ใช้โครงการ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,แยก
@@ -3613,7 +3616,7 @@
 DocType: Program Enrollment Tool,Get Students From,รับนักเรียนจาก
 DocType: Hub Settings,Seller Country,ผู้ขายประเทศ
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,รายการเผยแพร่บนเว็บไซต์
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,กลุ่มนักเรียนของคุณใน batches
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,กลุ่มนักเรียนของคุณใน batches
 DocType: Authorization Rule,Authorization Rule,กฎการอนุญาต
 DocType: Sales Invoice,Terms and Conditions Details,ข้อตกลงและเงื่อนไขรายละเอียด
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,ข้อมูลจำเพาะของ
@@ -3666,14 +3669,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,วันที่เช็ค
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},บัญชี {0}: บัญชีผู้ปกครอง {1} ไม่ได้เป็นของ บริษัท : {2}
 DocType: Program Enrollment Tool,Student Applicants,สมัครนักศึกษา
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,ประสบความสำเร็จในการทำธุรกรรมที่ถูกลบทั้งหมดที่เกี่ยวข้องกับ บริษัท นี้!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,ขณะที่ในวันที่
 DocType: Appraisal,HR,ทรัพยากรบุคคล
 DocType: Program Enrollment,Enrollment Date,วันที่ลงทะเบียน
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,การทดลอง
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,ส่วนประกอบเงินเดือน
 DocType: Program Enrollment Tool,New Academic Year,ปีการศึกษาใหม่
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,กลับมา / หมายเหตุเครดิต
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,กลับมา / หมายเหตุเครดิต
 DocType: Stock Settings,Auto insert Price List rate if missing,แทรกอัตโนมัติราคาอัตรารายชื่อถ้าขาดหายไป
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,รวมจำนวนเงินที่จ่าย
 DocType: Production Order Item,Transferred Qty,โอน จำนวน
@@ -3693,7 +3696,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",ประเภทของใบเช่นลำลอง ฯลฯ ป่วย
 DocType: Email Digest,Send regular summary reports via Email.,ส่งรายงานสรุปปกติผ่านทางอีเมล์
 DocType: Payment Entry,PE-,วิชาพลศึกษา-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},กรุณาตั้งค่าบัญชีเริ่มต้นในการเรียกร้องค่าใช้จ่ายประเภท {0}
 DocType: Assessment Result,Student Name,ชื่อนักเรียน
 DocType: Brand,Item Manager,ผู้จัดการฝ่ายรายการ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,เงินเดือนเจ้าหนี้
@@ -3714,6 +3717,7 @@
 ,Sales Funnel,ช่องทาง ขาย
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,ชื่อย่อมีผลบังคับใช้
 DocType: Project,Task Progress,ความคืบหน้าของงาน
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,เกวียน
 ,Qty to Transfer,จำนวน การโอน
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,ใบเสนอราคาไปยังช่องทาง หรือลูกค้า
 DocType: Stock Settings,Role Allowed to edit frozen stock,บทบาทอนุญาตให้แก้ไขหุ้นแช่แข็ง
@@ -3741,13 +3745,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,รายการ ฉลาด รายละเอียด ภาษี
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,สถาบันชื่อย่อ
 ,Item-wise Price List Rate,รายการ ฉลาด อัตรา ราคาตามรายการ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,ใบเสนอราคาของผู้ผลิต
 DocType: Quotation,In Words will be visible once you save the Quotation.,ในคำพูดของจะสามารถมองเห็นได้เมื่อคุณบันทึกใบเสนอราคา
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษส่วนในแถว {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},จำนวน ({0}) ไม่สามารถเป็นเศษเล็กเศษน้อยในแถว {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,เก็บค่าธรรมเนียม
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},บาร์โค้ด {0} ได้ใช้แล้วในรายการ {1}
 DocType: Lead,Add to calendar on this date,เพิ่มไปยังปฏิทินของวันนี้
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,กฎระเบียบ สำหรับการเพิ่ม ค่าใช้จ่ายใน การจัดส่งสินค้า
 DocType: Item,Opening Stock,เปิดการแจ้ง
@@ -3764,8 +3768,8 @@
 Updated via 'Time Log'",เป็นนาที ปรับปรุงผ่านทาง 'บันทึกเวลา'
 DocType: Customer,From Lead,จากช่องทาง
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,คำสั่งปล่อยให้การผลิต
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,เลือกปีงบประมาณ ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,เลือกปีงบประมาณ ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,รายละเอียด จุดขาย จำเป็นต้องทำให้ จุดขาย บันทึกได้
 DocType: Program Enrollment Tool,Enroll Students,รับสมัครนักเรียน
 DocType: Hub Settings,Name Token,ชื่อ Token
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,ขาย มาตรฐาน
@@ -3776,7 +3780,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} กับการขายใบแจ้งหนี้ {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,ชื่อโครงการ
-DocType: Supplier,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
+DocType: Customer,Mention if non-standard receivable account,ถ้าพูดถึงไม่ได้มาตรฐานบัญชีลูกหนี้
 DocType: Journal Entry Account,If Income or Expense,ถ้ารายได้หรือค่าใช้จ่าย
 DocType: Production Order,Required Items,รายการที่ต้องการ
 DocType: Stock Ledger Entry,Stock Value Difference,ความแตกต่างมูลค่าหุ้น
@@ -3797,7 +3801,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,ตั้งเป้ากลุ่มสินค้าที่ชาญฉลาดสำหรับการนี้คนขาย
 DocType: Stock Settings,Freeze Stocks Older Than [Days],ตรึง หุ้น เก่า กว่า [ วัน ]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,แถว # {0}: สินทรัพย์เป็นข้อบังคับสำหรับสินทรัพย์ถาวรซื้อ / ขาย
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",ถ้าสองคนหรือมากกว่ากฎการกำหนดราคาจะพบตามเงื่อนไขข้างต้นลำดับความสำคัญถูกนำไปใช้ ลำดับความสำคัญเป็นจำนวนระหว่าง 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.,อนุญาตให้ผู้ใช้ต่อไปเพื่อขออนุมัติการใช้งานออกวันบล็อก
@@ -3823,7 +3827,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,รายการที่ {0} ไม่สนใจ เพราะมัน ไม่ได้เป็น รายการที่ สต็อก
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",ที่จะไม่ใช้กฎการกำหนดราคาในการทำธุรกรรมโดยเฉพาะอย่างยิ่งกฎการกำหนดราคาทั้งหมดสามารถใช้งานควรจะปิดการใช้งาน
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ที่จะไม่ใช้กฎการกำหนดราคาในการทำธุรกรรมโดยเฉพาะอย่างยิ่งกฎการกำหนดราคาทั้งหมดสามารถใช้งานควรจะปิดการใช้งาน
 DocType: Assessment Group,Parent Assessment Group,ผู้ปกครองกลุ่มประเมิน
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,งาน
 ,Sales Order Trends,แนวโน้ม การขายสินค้า
@@ -3834,7 +3838,7 @@
 DocType: Stock Entry Detail,Additional Cost,ค่าใช้จ่ายเพิ่มเติม
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,ปี การเงิน สิ้นสุด วันที่
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",ไม่สามารถกรอง ตาม คูปอง ไม่ ถ้า จัดกลุ่มตาม คูปอง
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,ทำ ใบเสนอราคา ของผู้ผลิต
 DocType: Quality Inspection,Incoming,ขาเข้า
 DocType: BOM,Materials Required (Exploded),วัสดุบังคับ (ระเบิด)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",เพิ่มผู้ใช้องค์กรของคุณอื่นที่ไม่ใช่ตัวเอง
@@ -3862,6 +3866,7 @@
 DocType: Employee,History In Company,ประวัติใน บริษัท
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,จดหมายข่าว
 DocType: Stock Ledger Entry,Stock Ledger Entry,รายการสินค้าบัญชีแยกประเภท
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,ลูกค้า&gt; กลุ่มลูกค้า&gt; เขตแดน
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,รายการเดียวกันได้รับการป้อนหลายครั้ง
 DocType: Department,Leave Block List,ฝากรายการบล็อก
 DocType: Sales Invoice,Tax ID,ประจำตัวผู้เสียภาษี
@@ -3871,7 +3876,7 @@
 DocType: Customer,Sales Partner and Commission,พันธมิตรการขายและสำนักงานคณะกรรมการกำกับ
 DocType: Employee Loan,Rate of Interest (%) / Year,อัตราดอกเบี้ย (%) / ปี
 ,Project Quantity,จำนวนโครงการ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",รวม {0} สำหรับรายการทั้งหมดเป็นศูนย์อาจจะเป็นคุณควรเปลี่ยน &#39;กระจายค่าใช้จ่ายขึ้นอยู่กับ&#39;
 DocType: Opportunity,To Discuss,เพื่อหารือเกี่ยวกับ
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,ต้องการ {1} อย่างน้อย {0} หน่วย ใน {2} เพื่อที่จะทำธุรกรรมนี้
 DocType: Loan Type,Rate of Interest (%) Yearly,อัตราดอกเบี้ย (%) ประจำปี
@@ -3886,7 +3891,7 @@
 DocType: Purchase Invoice,Return,กลับ
 DocType: Production Order Operation,Production Order Operation,การดำเนินงานการผลิตการสั่งซื้อ
 DocType: Pricing Rule,Disable,ปิดการใช้งาน
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,โหมดการชำระเงินจะต้องชำระเงิน
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,โหมดการชำระเงินจะต้องชำระเงิน
 DocType: Project Task,Pending Review,รอตรวจทาน
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",สินทรัพย์ {0} ไม่สามารถทิ้งขณะที่มันมีอยู่แล้ว {1}
 DocType: Task,Total Expense Claim (via Expense Claim),การเรียกร้องค่าใช้จ่ายรวม (ผ่านการเรียกร้องค่าใช้จ่าย)
@@ -3894,11 +3899,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,มาร์คขาด
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},แถว {0}: สกุลเงินของ BOM # {1} ควรจะเท่ากับสกุลเงินที่เลือก {2}
 DocType: Journal Entry Account,Exchange Rate,อัตราแลกเปลี่ยน
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,การขายสินค้า {0} ไม่ได้ ส่ง
 DocType: Homepage,Tag Line,สายแท็ก
 DocType: Fee Component,Fee Component,ค่าบริการตัวแทน
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,การจัดการ Fleet
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,เพิ่มรายการจาก
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,เพิ่มรายการจาก
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},คลังสินค้า {0}: บัญชีหลัก {1} ไม่อยู่ใน บริษัท {2}
 DocType: Cheque Print Template,Regular,ปกติ
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,weightage รวมทุกเกณฑ์การประเมินจะต้อง 100%
@@ -3911,7 +3916,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,ไม่พบคลังสินค้า {0} ในระบบ
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ลงทะเบียนสำหรับ ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,เปอร์เซ็นต์การกระจายรายเดือน
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,รายการที่เลือกไม่สามารถมีแบทช์
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",อัตราการประเมินไม่พบรายการ {0} ซึ่งเป็นสิ่งจำเป็นที่ต้องทำรายการบัญชีสำหรับ {1} {2} หากรายการที่จะทำธุรกรรมเป็นรายการตัวอย่างใน {1} กรุณาพูดถึงว่าใน {1} ตารางรายการ มิฉะนั้นโปรดสร้างธุรกรรมหุ้นขาเข้าสำหรับสินค้าหรือการกล่าวถึงอัตราการประเมินมูลค่าในรายการบันทึกแล้วลอง submiting / ยกเลิกรายการนี้
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% ของวัสดุที่ส่งมอบเทียบกับหมายเหตุการจัดส่งนี้
 DocType: Project,Customer Details,รายละเอียดลูกค้า
@@ -3920,15 +3925,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,ป้อนพารามิเตอร์ URL สำหรับ Nos รับ
 DocType: Payment Entry,Paid Amount,จำนวนเงินที่ชำระ
 DocType: Assessment Plan,Supervisor,ผู้ดูแล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,ออนไลน์
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,ออนไลน์
 ,Available Stock for Packing Items,สต็อกสำหรับการบรรจุรายการ
 DocType: Item Variant,Item Variant,รายการตัวแปร
 DocType: Assessment Result Tool,Assessment Result Tool,เครื่องมือการประเมินผล
 DocType: BOM Scrap Item,BOM Scrap Item,BOM เศษรายการ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,คำสั่งที่ส่งมาไม่สามารถลบได้
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,การบริหารจัดการคุณภาพ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Employee Loan,Repay Fixed Amount per Period,ชำระคืนจำนวนคงที่ต่อปีระยะเวลา
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},กรุณากรอก ปริมาณ รายการ {0}
 DocType: Employee External Work History,Employee External Work History,ประวัติการทำงานของพนักงานภายนอก
@@ -3955,7 +3960,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,อีเมล์ ID นักศึกษา
 DocType: Employee,Notice (days),แจ้งให้ทราบล่วงหน้า (วัน)
 DocType: Tax Rule,Sales Tax Template,แม่แบบภาษีการขาย
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,เลือกรายการที่จะบันทึกในใบแจ้งหนี้
 DocType: Employee,Encashment Date,วันที่การได้เป็นเงินสด
 DocType: Training Event,Internet,อินเทอร์เน็ต
 DocType: Account,Stock Adjustment,การปรับ สต็อก
@@ -3979,7 +3984,7 @@
 DocType: Item Variant Attribute,Attribute,คุณลักษณะ
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,โปรดระบุจาก / ไปยังช่วง
 DocType: Serial No,Under AMC,ภายใต้ AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,รายการอัตราการประเมินราคาจะคำนวณพิจารณาจำนวนเงินค่าใช้จ่ายบัตรกำนัลที่ดิน
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,รายการอัตราการประเมินราคาจะคำนวณพิจารณาจำนวนเงินค่าใช้จ่ายบัตรกำนัลที่ดิน
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,ตั้งค่าเริ่มต้น สำหรับการขาย ในการทำธุรกรรม
 DocType: Guardian,Guardian Of ,ผู้ปกครองของ
 DocType: Grading Scale Interval,Threshold,ธรณีประตู
@@ -3989,6 +3994,7 @@
 DocType: Purchase Invoice,Debit Note Issued,หมายเหตุเดบิตที่ออก
 DocType: Production Order,Warehouses,โกดัง
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} สินทรัพย์ ไม่สามารถโอนได้
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,รายการนี้เป็น Variant ของ {0} (เทมเพลต)
 DocType: Workstation,per hour,ต่อชั่วโมง
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,การจัดซื้อ
 DocType: Announcement,Announcement,การประกาศ
@@ -4004,8 +4010,8 @@
 DocType: Account,Receivable,ลูกหนี้
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,แถว # {0}: ไม่อนุญาตให้ผู้ผลิตที่จะเปลี่ยนเป็นใบสั่งซื้ออยู่แล้ว
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,บทบาทที่ได้รับอนุญาตให้ส่งการทำธุรกรรมที่เกินวงเงินที่กำหนด
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,เลือกรายการที่จะผลิต
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,เลือกรายการที่จะผลิต
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","การซิงค์ข้อมูลหลัก, อาจทำงานบางช่วงเวลา"
 DocType: Item,Material Issue,บันทึกการใช้วัสดุ
 DocType: Hub Settings,Seller Description,รายละเอียดผู้ขาย
 DocType: Employee Education,Qualification,คุณสมบัติ
@@ -4017,7 +4023,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,ได้รับคำสั่ง
 DocType: Salary Detail,Component,ตัวแทน
 DocType: Assessment Criteria,Assessment Criteria Group,กลุ่มเกณฑ์การประเมิน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},เปิดค่าเสื่อมราคาสะสมต้องน้อยกว่าเท่ากับ {0}
 DocType: Warehouse,Warehouse Name,ชื่อคลังสินค้า
 DocType: Naming Series,Select Transaction,เลือกรายการ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,กรุณากรอก บทบาท การอนุมัติ หรือ ให้ความเห็นชอบ ผู้ใช้
@@ -4030,7 +4036,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,ไม่สามารถยกเลิก ได้เพราะ ส่ง สินค้า เข้า {0} มีอยู่
 DocType: Employee Loan,Disbursement Date,วันที่เบิกจ่าย
 DocType: Vehicle,Vehicle,พาหนะ
 DocType: Purchase Invoice,In Words,จำนวนเงิน (ตัวอักษร)
@@ -4045,14 +4051,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ค่าเสื่อมราคาสินทรัพย์และยอดคงเหลือ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},จำนวน {0} {1} โอนจาก {2} เป็น {3}
 DocType: Sales Invoice,Get Advances Received,รับเงินรับล่วงหน้า
 DocType: Email Digest,Add/Remove Recipients,เพิ่ม / ลบ ชื่อผู้รับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},การทำธุรกรรมที่ ไม่ได้รับอนุญาต กับ หยุด การผลิต สั่งซื้อ {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",การตั้งค่า นี้ ปีงบประมาณ เป็นค่าเริ่มต้น ให้คลิกที่ 'ตั้ง เป็นค่าเริ่มต้น '
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,ร่วม
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,ปัญหาการขาดแคลนจำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,ตัวแปรรายการ {0} อยู่ที่มีลักษณะเดียวกัน
 DocType: Employee Loan,Repay from Salary,ชำระคืนจากเงินเดือน
 DocType: Leave Application,LAP/,ตัก/
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},ร้องขอการชำระเงินจาก {0} {1} สำหรับจำนวนเงิน {2}
@@ -4070,7 +4076,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,การประเมินผลรายละเอียด
 DocType: Employee Education,Employee Education,การศึกษาการทำงานของพนักงาน
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,กลุ่มรายการที่ซ้ำกันที่พบในตารางกลุ่มรายการ
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,มันเป็นสิ่งจำเป็นที่จะดึงรายละเอียดสินค้า
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} ได้รับ อยู่แล้ว
@@ -4079,7 +4085,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",คลังสินค้า {0} ไม่เชื่อมโยงกับบัญชีใด ๆ โปรดสร้าง / เชื่อมโยงที่สอดคล้องกัน (สินทรัพย์) บัญชีคลังสินค้า
 DocType: Purchase Invoice,Recurring Id,รหัสที่เกิดขึ้น
 DocType: Customer,Sales Team Details,ขายรายละเอียดทีม
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,ลบอย่างถาวร?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,ลบอย่างถาวร?
 DocType: Expense Claim,Total Claimed Amount,จำนวนรวมอ้าง
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,โอกาสที่มีศักยภาพสำหรับการขาย
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},ไม่ถูกต้อง {0}
@@ -4090,13 +4096,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,การติดตั้งของโรงเรียนใน ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),ฐานจำนวนเปลี่ยน (สกุลเงินบริษัท)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,ไม่มี รายการบัญชี สำหรับคลังสินค้า ดังต่อไปนี้
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,คำสั่งสุดท้ายจำนวนเงิน
+DocType: Task,Is Milestone,เป็น Milestone
 DocType: Daily Work Summary,Email Sent To,อีเมลที่ส่งไป
 DocType: Budget,Warn,เตือน
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",ใด ๆ ข้อสังเกตอื่น ๆ ความพยายามที่น่าสังเกตว่าควรจะไปในบันทึก
@@ -4117,7 +4124,7 @@
 DocType: Item Attribute Value,Attribute Value,ค่าแอตทริบิวต์
 ,Itemwise Recommended Reorder Level,แนะนำ Itemwise Reorder ระดับ
 DocType: Salary Detail,Salary Detail,รายละเอียดเงินเดือน
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,กรุณาเลือก {0} ครั้งแรก
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,รุ่นที่ {0} ของรายการ {1} หมดอายุ
 DocType: Sales Invoice,Commission,ค่านายหน้า
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,ใบบันทึกเวลาการผลิต
@@ -4129,41 +4136,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,ค่าของ `อายัด (freeze) Stock ที่เก่ากว่า ` ควรจะ มีขนาดเล็กกว่า % d วัน
 DocType: Tax Rule,Purchase Tax Template,ซื้อแม่แบบภาษี
 ,Project wise Stock Tracking,หุ้นติดตามโครงการที่ชาญฉลาด
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},ตาราง การบำรุงรักษา {0} อยู่ กับ {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),จำนวนที่เกิดขึ้นจริง (ที่มา / เป้าหมาย)
 DocType: Item Customer Detail,Ref Code,รหัส Ref
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ระเบียนพนักงาน
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,กรุณาตั้งค่าถัดไปวันที่ค่าเสื่อมราคา
 DocType: HR Settings,Payroll Settings,การตั้งค่า บัญชีเงินเดือน
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,ตรงกับใบแจ้งหนี้ไม่ได้เชื่อมโยงและการชำระเงิน
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,สถานที่การสั่งซื้อ
 DocType: Email Digest,New Purchase Orders,สั่งซื้อใหม่
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,รากไม่สามารถมีศูนย์ต้นทุนผู้ปกครอง
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,เลือกยี่ห้อ ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,เลือกยี่ห้อ ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,ค่าเสื่อมราคาสะสม ณ วันที่
 DocType: Sales Invoice,C-Form Applicable,C-Form สามารถนำไปใช้ได้
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},เวลาการดำเนินงานจะต้องมากกว่า 0 สำหรับการปฏิบัติงาน {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,ต้องระบุคลังสินค้า
 DocType: Supplier,Address and Contacts,ที่อยู่และที่ติดต่อ
 DocType: UOM Conversion Detail,UOM Conversion Detail,รายละเอียดการแปลง UOM
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),ให้มัน เว็บ 900px มิตร (กว้าง ) โดย 100px (ซ)
 DocType: Program,Program Abbreviation,ชื่อย่อโปรแกรม
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,ใบสั่งผลิตไม่สามารถขึ้นกับแม่แบบรายการ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,ค่าใช้จ่ายที่มีการปรับปรุงในใบเสร็จรับเงินกับแต่ละรายการ
 DocType: Warranty Claim,Resolved By,แก้ไขได้โดยการ
 DocType: Bank Guarantee,Start Date,วันที่เริ่มต้น
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,จัดสรร ใบ เป็นระยะเวลา
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,เช็คและเงินฝากล้างไม่ถูกต้อง
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,บัญชี {0}: คุณไม่สามารถกำหนดตัวเองเป็นบัญชีผู้ปกครอง
 DocType: Purchase Invoice Item,Price List Rate,อัตราราคาตามรายการ
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,สร้างคำพูดของลูกค้า
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,สร้างคำพูดของลูกค้า
 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 +38,Bill of Materials (BOM),บิลวัสดุ (BOM)
 DocType: Item,Average time taken by the supplier to deliver,เวลาเฉลี่ยที่ถ่ายโดยผู้ผลิตเพื่อส่งมอบ
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,สรุปผลการประเมิน
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,ชั่วโมง
 DocType: Project,Expected Start Date,วันที่เริ่มต้นคาดว่า
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,ลบรายการค่าใช้จ่ายถ้าไม่สามารถใช้ได้กับรายการที่
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,สกุลเงินการทำธุรกรรมจะต้องเป็นเช่นเดียวกับการชำระเงินสกุลเงินเกตเวย์
 DocType: Payment Entry,Receive,รับ
@@ -4174,19 +4180,19 @@
 DocType: Workstation,Operating Costs,ค่าใช้จ่ายในการดำเนินงาน
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,ดำเนินการหากสะสมเกินงบประมาณรายเดือน
 DocType: Purchase Invoice,Submit on creation,ส่งในการสร้าง
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},สกุลเงินสำหรับ {0} &#39;จะต้อง {1}
 DocType: Asset,Disposal Date,วันที่จำหน่าย
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",อีเมลจะถูกส่งไปยังพนักงานที่ใช้งานทั้งหมดของ บริษัท ในเวลาที่กำหนดหากพวกเขาไม่ได้มีวันหยุด บทสรุปของการตอบสนองจะถูกส่งในเวลาเที่ยงคืน
 DocType: Employee Leave Approver,Employee Leave Approver,อนุมัติพนักงานออก
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},แถว {0}: รายการสั่งซื้อใหม่อยู่แล้วสำหรับคลังสินค้านี้ {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",ไม่ สามารถประกาศ เป็น หายไป เพราะ ใบเสนอราคา ได้รับการทำ
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,การฝึกอบรมผลตอบรับ
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,สั่งผลิต {0} จะต้องส่ง
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},กรุณาเลือก วันเริ่มต้น และ วันที่สิ้นสุด สำหรับรายการที่ {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},แน่นอนมีผลบังคับใช้ในแถว {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,วันที่ ไม่สามารถ ก่อนที่จะ นับจากวันที่
 DocType: Supplier Quotation Item,Prevdoc DocType,DocType Prevdoc
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,เพิ่ม / แก้ไขราคา
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,เพิ่ม / แก้ไขราคา
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Batch,Parent Batch,กลุ่มผู้ปกครอง
 DocType: Cheque Print Template,Cheque Print Template,แม่แบบการพิมพ์เช็ค
@@ -4200,7 +4206,7 @@
 ,Ordered Items To Be Delivered,รายการที่สั่งซื้อจะถูกส่ง
 DocType: Account,Income,เงินได้
 DocType: Industry Type,Industry Type,ประเภทอุตสาหกรรม
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,สิ่งที่ผิดพลาด!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,สิ่งที่ผิดพลาด!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,คำเตือน: โปรแกรมออกมีวันที่บล็อกต่อไปนี้
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,ใบแจ้งหนี้ การขาย {0} ได้ ถูกส่งมา อยู่แล้ว
 DocType: Assessment Result Detail,Score,คะแนน
@@ -4231,17 +4237,17 @@
 DocType: Item,Variant Based On,ตัวแปรอยู่บนพื้นฐานของ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},weightage รวม ที่ได้รับมอบหมาย ควรจะ 100% มันเป็น {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,ซัพพลายเออร์ ของคุณ
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,ไม่สามารถตั้งค่า ที่ หายไป ในขณะที่ การขายสินค้า ที่ทำ
 DocType: Request for Quotation Item,Supplier Part No,ผู้ผลิตชิ้นส่วน
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,ที่ได้รับจาก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',ไม่สามารถหักค่าใช้จ่ายเมื่อเป็นหมวดหมู่สำหรับ &#39;การประเมินค่า&#39; หรือ &#39;Vaulation และรวม
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,ที่ได้รับจาก
 DocType: Lead,Converted,แปลง
 DocType: Item,Has Serial No,มีซีเรียลไม่มี
 DocType: Employee,Date of Issue,วันที่ออก
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: จาก {0} สำหรับ {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},แถว # {0}: ตั้งผู้ผลิตสำหรับรายการ {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,แถว {0}: ค่าเวลาทำการต้องมีค่ามากกว่าศูนย์
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ภาพ Website {0} แนบไปกับรายการ {1} ไม่สามารถพบได้
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,รายการนี้ในหลายกลุ่มในเว็บไซต์
@@ -4250,20 +4256,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,คุณยังไม่ได้ รับอนุญาตให้ กำหนดค่า แช่แข็ง
 DocType: Payment Reconciliation,Get Unreconciled Entries,คอมเมนต์ได้รับ Unreconciled
 DocType: Payment Reconciliation,From Invoice Date,จากวันที่ใบแจ้งหนี้
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,สกุลเงินที่เรียกเก็บเงินจะต้องเท่ากับสกุลเงินของบริษัทเริ่มต้นหรือหรือสกุลเงินของบัญชีฝ่ายใดฝ่ายหนึ่ง
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,ปล่อยให้เป็นเงินสด
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,มัน ทำอะไรได้บ้าง
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,ไปที่โกดัง
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,ทั้งหมดเป็นนักศึกษา
 ,Average Commission Rate,อัตราเฉลี่ยของค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'มีเลขซีเรียล' ไม่สามารถเป็น 'ใช่' สำหรับรายการที่ไม่ใช่สต็อก
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,ผู้เข้าร่วมไม่สามารถทำเครื่องหมายสำหรับวันที่ในอนาคต
 DocType: Pricing Rule,Pricing Rule Help,กฎการกำหนดราคาช่วยเหลือ
 DocType: School House,House Name,ชื่อบ้าน
 DocType: Purchase Taxes and Charges,Account Head,หัวบัญชี
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,ปรับปรุงค่าใช้จ่ายเพิ่มเติมในการคำนวณค่าใช้จ่ายในที่ดินของรายการ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,ไฟฟ้า
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,เพิ่มส่วนที่เหลือขององค์กรของคุณเป็นผู้ใช้ของคุณ นอกจากนี้คุณยังสามารถเพิ่มเชิญลูกค้าพอร์ทัลของคุณด้วยการเพิ่มจากรายชื่อ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,เพิ่มส่วนที่เหลือขององค์กรของคุณเป็นผู้ใช้ของคุณ นอกจากนี้คุณยังสามารถเพิ่มเชิญลูกค้าพอร์ทัลของคุณด้วยการเพิ่มจากรายชื่อ
 DocType: Stock Entry,Total Value Difference (Out - In),ความแตกต่างมูลค่ารวม (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4272,7 +4278,7 @@
 DocType: Item,Customer Code,รหัสลูกค้า
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},เตือนวันเกิดสำหรับ {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,ตั้งแต่ วันที่ สั่งซื้อ ล่าสุด
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,เพื่อเดบิตบัญชีจะต้องเป็นบัญชีงบดุล
 DocType: Buying Settings,Naming Series,การตั้งชื่อซีรีส์
 DocType: Leave Block List,Leave Block List Name,ฝากชื่อรายการที่ถูกบล็อก
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,วันประกันเริ่มต้นควรจะน้อยกว่าวันประกันสิ้นสุด
@@ -4287,9 +4293,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},สลิปเงินเดือนของพนักงาน {0} สร้างไว้แล้วสำหรับแผ่นเวลา {1}
 DocType: Vehicle Log,Odometer,วัดระยะทาง
 DocType: Sales Order Item,Ordered Qty,สั่งซื้อ จำนวน
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,รายการ {0} ถูกปิดใช้งาน
 DocType: Stock Settings,Stock Frozen Upto,สต็อกไม่เกิน Frozen
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM ไม่ได้มีรายการสินค้าใด ๆ
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},ระยะเวลาเริ่มต้นและระยะเวลาในการบังคับใช้สำหรับวันที่เกิดขึ้น {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,กิจกรรมของโครงการ / งาน
 DocType: Vehicle Log,Refuelling Details,รายละเอียดเชื้อเพลิง
@@ -4299,8 +4305,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,ไม่พบอัตราการซื้อล่าสุด
 DocType: Purchase Invoice,Write Off Amount (Company Currency),เขียนปิดจำนวนเงิน (บริษัท สกุล)
 DocType: Sales Invoice Timesheet,Billing Hours,ชั่วโมงทำการเรียกเก็บเงิน
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM เริ่มต้นสำหรับ {0} ไม่พบ
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,แถว # {0}: กรุณาตั้งค่าปริมาณการสั่งซื้อ
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,แตะรายการเพื่อเพิ่มที่นี่
 DocType: Fees,Program Enrollment,การลงทะเบียนโปรแกรม
 DocType: Landed Cost Voucher,Landed Cost Voucher,ที่ดินคูปองต้นทุน
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},กรุณาตั้ง {0}
@@ -4324,7 +4331,7 @@
 DocType: Maintenance Visit,Maintenance Date,วันที่ทำการบำรุงรักษา
 DocType: Purchase Invoice Item,Rejected Serial No,หมายเลขเครื่องปฏิเสธ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,ปีวันเริ่มต้นหรือวันที่สิ้นสุดอยู่ที่ทับซ้อนกันด้วย {0} เพื่อหลีกเลี่ยงการโปรดตั้ง บริษัท
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},วันที่เริ่มต้น ควรจะน้อยกว่า วันที่ สิ้นสุดสำหรับ รายการ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### 
  ถ้าชุดคือชุดและที่เก็บไม่ได้กล่าวถึงในการทำธุรกรรมแล้วหมายเลขประจำเครื่องอัตโนมัติจะถูกสร้างขึ้นบนพื้นฐานของซีรีส์นี้ หากคุณเคยต้องการที่จะพูดถึงอย่างชัดเจนเลขที่ผลิตภัณฑ์สำหรับรายการนี้ ปล่อยให้ว่างนี้"
@@ -4402,7 +4409,6 @@
 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,รายชื่อครอสของรายการในหลายกลุ่ม
-DocType: Grade Interval,Grade Interval,ชั้นประถมศึกษาปีช่วงเวลา
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},วันเริ่มต้นปีงบประมาณและปีงบประมาณสิ้นสุดวันที่มีการตั้งค่าอยู่แล้วในปีงบประมาณ {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,โปรโมชั่นวันที่มีการปรับปรุง
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,แบ่งแบทช์
@@ -4449,14 +4455,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,ปล่อยให้ไม่ทำเครื่องหมายหากคุณไม่ต้องการพิจารณาชุดในขณะที่สร้างกลุ่มตามหลักสูตร
 DocType: Asset,Frequency of Depreciation (Months),ความถี่ของค่าเสื่อมราคา (เดือน)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,บัญชีเครดิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,บัญชีเครดิต
 DocType: Landed Cost Item,Landed Cost Item,รายการค่าใช้จ่ายลง
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,แสดงค่าศูนย์
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,จำนวนสินค้าที่ได้หลังการผลิต / บรรจุใหม่จากจำนวนวัตถุดิบที่มี
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,การตั้งค่าเว็บไซต์ที่ง่ายสำหรับองค์กรของฉัน
 DocType: Payment Reconciliation,Receivable / Payable Account,ลูกหนี้ / เจ้าหนี้การค้า
 DocType: Delivery Note Item,Against Sales Order Item,กับการขายรายการสั่งซื้อ
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},โปรดระบุคุณสมบัติราคาแอตทริบิวต์ {0}
 DocType: Item,Default Warehouse,คลังสินค้าเริ่มต้น
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},งบประมาณไม่สามารถกำหนดกลุ่มกับบัญชี {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,กรุณาใส่ ศูนย์ ค่าใช้จ่าย ของผู้ปกครอง
@@ -4502,7 +4508,7 @@
 DocType: Opportunity Item,Basic Rate,อัตราขั้นพื้นฐาน
 DocType: GL Entry,Credit Amount,จำนวนเครดิต
 DocType: Cheque Print Template,Signatory Position,ตำแหน่งลงนาม
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,ตั้งเป็น ที่หายไป
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,ตั้งเป็น ที่หายไป
 DocType: Timesheet,Total Billable Hours,รวมเวลาที่เรียกเก็บเงิน
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ใบเสร็จรับเงินการชำระเงินหมายเหตุ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,นี้ขึ้นอยู่กับการทำธุรกรรมกับลูกค้านี้ ดูระยะเวลารายละเอียดด้านล่าง
@@ -4516,11 +4522,11 @@
 ,Items To Be Requested,รายการที่จะ ได้รับการร้องขอ
 DocType: Purchase Order,Get Last Purchase Rate,รับซื้อให้ล่าสุด
 DocType: Company,Company Info,ข้อมูล บริษัท
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,เลือกหรือเพิ่มลูกค้าใหม่
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,ศูนย์ต้นทุนจะต้องสำรองการเรียกร้องค่าใช้จ่าย
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),การใช้ประโยชน์กองทุน (สินทรัพย์)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,นี้ขึ้นอยู่กับการเข้าร่วมของพนักงานนี้
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,บัญชีเดบิต
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,บัญชีเดบิต
 DocType: Fiscal Year,Year Start Date,วันที่เริ่มต้นปี
 DocType: Attendance,Employee Name,ชื่อของพนักงาน
 DocType: Sales Invoice,Rounded Total (Company Currency),รวมกลม (สกุลเงิน บริษัท )
@@ -4529,13 +4535,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,หยุดผู้ใช้จากการทำแอพพลิเคที่เดินทางในวันที่ดังต่อไปนี้
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,ปริมาณการซื้อ
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,ใบเสนอราคาผู้ผลิต {0} สร้าง
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,ปีที่จบการไม่สามารถก่อนที่จะเริ่มปี
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ผลประโยชน์ของพนักงาน
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},กรุณาตั้งค่าเริ่มต้นรายการวันหยุดสำหรับพนักงาน {0} หรือ บริษัท {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: ไม่พบ {1}
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: ไม่พบ {1}
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,ตั๋วเงินยกให้กับลูกค้า
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Id โครงการ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},แถวไม่มี {0}: จำนวนเงินไม่สามารถจะสูงกว่าจำนวนเงินที่ค้างอยู่กับค่าใช้จ่ายในการเรียกร้อง {1} ที่รอดำเนินการเป็นจำนวน {2}
@@ -4544,15 +4550,17 @@
 DocType: Quality Inspection Reading,Reading 3,Reading 3
 ,Hub,ดุม
 DocType: GL Entry,Voucher Type,ประเภทบัตรกำนัล
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,ราคาไม่พบหรือคนพิการ
 DocType: Employee Loan Application,Approved,ได้รับการอนุมัติ
 DocType: Pricing Rule,Price,ราคา
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',พนักงาน โล่งใจ ที่ {0} จะต้องตั้งค่า เป็น ' ซ้าย '
 DocType: Guardian,Guardian,ผู้ปกครอง
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,ประเมิน {0} สร้างขึ้นสำหรับ พนักงาน {1} ใน ช่วงวันที่ ที่กำหนด
 DocType: Employee,Education,การศึกษา
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,ตั้งชื่อ ตาม แคมเปญ
 DocType: Employee,Current Address Is,ที่อยู่ ปัจจุบัน เป็น
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,การแก้ไข
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",ตัวเลือก ตั้งสกุลเงินเริ่มต้นของ บริษัท ฯ หากไม่ได้ระบุไว้
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,รายการบันทึกบัญชี
 DocType: Delivery Note Item,Available Qty at From Warehouse,จำนวนที่จำหน่ายจากคลังสินค้า
@@ -4561,7 +4569,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},แถว {0}: ปาร์ตี้ / บัญชีไม่ตรงกับ {1} / {2} ใน {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,กรุณากรอกบัญชีค่าใช้จ่าย
 DocType: Account,Stock,คลังสินค้า
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","แถว # {0}: การอ้างอิงเอกสารชนิดต้องเป็นหนึ่งในการสั่งซื้อ, ซื้อใบแจ้งหนี้หรือวารสารรายการ"
 DocType: Employee,Current Address,ที่อยู่ปัจจุบัน
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","หากรายการเป็นตัวแปรของรายการอื่นแล้วคำอธิบายภาพ, การกำหนดราคาภาษี ฯลฯ จะถูกตั้งค่าจากแม่นอกจากที่ระบุไว้อย่างชัดเจน"
 DocType: Serial No,Purchase / Manufacture Details,รายละเอียด การซื้อ / การผลิต
@@ -4589,7 +4597,7 @@
 DocType: Hub Settings,Hub Settings,การตั้งค่า Hub
 DocType: Project,Gross Margin %,กำไรขั้นต้น %
 DocType: BOM,With Operations,กับการดำเนินงาน
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,รายการบัญชีที่ได้รับการทำในสกุลเงิน {0} สำหรับ บริษัท {1} กรุณาเลือกบัญชีลูกหนี้หรือเจ้าหนี้กับสกุลเงิน {0}
 DocType: Asset,Is Existing Asset,เป็นสินทรัพย์ที่มีอยู่
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
 DocType: Salary Detail,Statistical Component,ส่วนประกอบทางสถิติ
@@ -4614,7 +4622,7 @@
 DocType: Assessment Plan,Room,ห้อง
 DocType: Purchase Order,Advance Paid,จ่ายล่วงหน้า
 DocType: Item,Item Tax,ภาษีสินค้า
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,วัสดุในการจัดจำหน่าย
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,วัสดุในการจัดจำหน่าย
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,สรรพสามิตใบแจ้งหนี้
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,treshold {0}% ปรากฏมากกว่าหนึ่งครั้ง
 DocType: Expense Claim,Employees Email Id,Email รหัสพนักงาน
@@ -4645,9 +4653,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,แนบ โลโก้
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,ระดับสต็อก
 DocType: Customer,Commission Rate,อัตราค่าคอมมิชชั่น
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,ทำให้ตัวแปร
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,ทำให้ตัวแปร
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,ปิดกั้นการใช้งานออกโดยกรม
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",ประเภทการชำระเงินต้องเป็นหนึ่งในการรับชำระเงินและการโอนเงินภายใน
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,รถเข็นที่ว่างเปล่า
 DocType: Vehicle,Model,แบบ
@@ -4658,6 +4666,7 @@
 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 +161,Capital Stock,ทุนหลักทรัพย์
+DocType: Shopping Cart Settings,Show Public Attachments,แสดงเอกสารแนบสาธารณะ
 DocType: Packing Slip,Package Weight Details,รายละเอียดแพคเกจน้ำหนัก
 DocType: Payment Gateway Account,Payment Gateway Account,บัญชี Gateway การชำระเงิน
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,หลังจากเสร็จสิ้นการชำระเงินเปลี่ยนเส้นทางผู้ใช้ไปยังหน้าเลือก
@@ -4676,15 +4685,15 @@
 DocType: Batch,Expiry Date,วันหมดอายุ
 ,Supplier Addresses and Contacts,ที่อยู่ ของผู้ผลิต และผู้ติดต่อ
 ,accounts-browser,บัญชีเบราว์เซอร์
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,กรุณาเลือก หมวดหมู่ แรก
 apps/erpnext/erpnext/config/projects.py +13,Project master.,ต้นแบบโครงการ
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",ในการอนุญาตให้มากกว่าการเรียกเก็บเงินหรือการสั่งซื้ออัปเดต &quot;ค่าเผื่อ&quot; ในการตั้งค่าการแจ้งหรือรายการ
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,ไม่แสดงสัญลักษณ์ใด ๆ เช่น ฯลฯ $ ต่อไปกับเงินสกุล
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(ครึ่งวัน)
 DocType: Supplier,Credit Days,วันเครดิต
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,สร้างกลุ่มนักศึกษา
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,สร้างกลุ่มนักศึกษา
 DocType: Leave Type,Is Carry Forward,เป็น Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,รับสินค้า จาก BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,รับสินค้า จาก BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,นำวันเวลา
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},แถว # {0}: โพสต์วันที่ต้องเป็นเช่นเดียวกับวันที่ซื้อ {1} สินทรัพย์ {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,โปรดป้อนคำสั่งขายในตารางข้างต้น
@@ -4701,8 +4710,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,จำนวนตามทำนองคลองธรรม
 DocType: GL Entry,Is Opening,คือการเปิด
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},แถว {0}: รายการเดบิตไม่สามารถเชื่อมโยงกับ {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,กรุณาตั้งหมายเลขชุดสำหรับการเข้าร่วมประชุมผ่านทาง Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 33bb643..e7c6690 100644
--- a/erpnext/translations/tr.csv
+++ b/erpnext/translations/tr.csv
@@ -22,10 +22,10 @@
 DocType: Employee,Rented,Kiralanmış
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Kullanıcı için geçerlidir
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Durduruldu Üretim Sipariş iptal edilemez, iptal etmek için ilk önce unstop"
 DocType: Vehicle Service,Mileage,Kilometre
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Bu varlığı gerçekten hurda etmek istiyor musunuz?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Seç Varsayılan Tedarikçi
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Seç Varsayılan Tedarikçi
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Döviz Fiyat Listesi için gereklidir {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* İşlemde hesaplanacaktır.
 DocType: Purchase Order,Customer Contact,Müşteri İletişim
@@ -49,7 +49,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),{0} için bekleyen sıfırdan az olamaz ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 dakika Standart
 DocType: Leave Type,Leave Type Name,İzin Tipi Adı
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Açık olanları göster
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Açık olanları göster
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Seri Başarıyla güncellendi
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Çıkış yapmak
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural günlük girdisi Ekleyen
@@ -57,7 +57,7 @@
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
 DocType: Item Price,Multiple Item prices.,Çoklu Ürün fiyatları.
 ,Purchase Order Items To Be Received,AlınacakSatınalma Siparişi Kalemleri
-DocType: SMS Center,All Supplier Contact,Bütün Tedarikçi Kişiler
+DocType: SMS Center,All Supplier Contact,Bütün Tedarikçiler
 DocType: Support Settings,Support Settings,Destek Ayarları
 DocType: SMS Parameter,Parameter,Parametre
 DocType: SMS Parameter,Parameter,Parametre
@@ -68,16 +68,15 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka Havalesi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Banka poliçesi
 DocType: Mode of Payment Account,Mode of Payment Account,Ödeme Şekli Hesabı
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Göster Varyantlar
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Göster Varyantlar
 DocType: Academic Term,Academic Term,Akademik Dönem
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Malzeme
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Miktar
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Miktar
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Miktar
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Hesap Tablosu boş olamaz.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Krediler (Yükümlülükler)
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Krediler (Yükümlülükler)
 DocType: Employee Education,Year of Passing,Geçiş Yılı
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Referans:% s, Ürün Kodu:% s ve Müşteri:% s"
 DocType: Item,Country of Origin,Menşei ülke
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Stokta Var
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Açık sorunlar
@@ -87,7 +86,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Sağlık hizmeti
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Ödeme Gecikme (Gün)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,hizmet Gideri
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Fatura
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},"Seri Numarası: {0}, Satış Faturasında zaten atıfta bulunuldu: {1}"
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Fatura
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 DocType: Maintenance Schedule Item,Periodicity,Periyodik olarak tekrarlanma
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Mali yıl {0} gereklidir
@@ -130,21 +130,23 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Iki sütun, eski adı diğeri yeni isim biriyle .csv dosya eklemek"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} Aktif mali dönem içinde değil.
 DocType: Packed Item,Parent Detail docname,Ana Detay belgesi adı
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Referans: {0}, Ürün Kodu: {1} ve Müşteri: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogram
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kilogram
 DocType: Student Log,Log,Giriş
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,İş Açılışı.
 DocType: Item Attribute,Increment,Artım
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Warehouse Seçiniz ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Warehouse Seçiniz ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Reklamcılık
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Aynı şirket birden fazla girilir
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Öğeleri alın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Izin verilmez {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Stok İrsaliye {0} karşısı güncellenmez
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Ürün {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Listelenen öğe yok
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 DocType: Payment Reconciliation,Reconcile,Uzlaştırmak
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Bakkal
@@ -153,10 +155,10 @@
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Sonraki Amortisman Tarihi Satın Alma Tarihinden önce olamaz
 DocType: SMS Center,All Sales Person,Bütün Satış Kişileri
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,İşinizde sezonluk değişkenlik varsa **Aylık Dağılım** Bütçe/Hedef'i aylara dağıtmanıza yardımcı olur.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,ürün bulunamadı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,ürün bulunamadı
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Maaş Yapısı Eksik
 DocType: Lead,Person Name,Kişi Adı
 DocType: Sales Invoice Item,Sales Invoice Item,Satış Faturası Ürünü
@@ -165,16 +167,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","örneğin, &quot;İlköğretim Okulu&quot; ya da &quot;Üniversite&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Stok Raporları
 DocType: Warehouse,Warehouse Detail,Depo Detayı
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Kredi limiti müşteri için aşıldı {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Dönem Bitiş Tarihi sonradan terim bağlantılı olduğu için Akademik Yılı Yıl Sonu tarihi daha olamaz (Akademik Yılı {}). tarihleri düzeltmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","'Sabit Varlıktır' seçimi kaldırılamaz, çünkü Varlık kayıtları bulunuyor"
 DocType: Vehicle Service,Brake Oil,fren Yağı
 DocType: Tax Rule,Tax Type,Vergi Türü
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},{0} dan önceki girdileri ekleme veya güncelleme yetkiniz yok
 DocType: BOM,Item Image (if not slideshow),Ürün Görüntü (yoksa slayt)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Aynı isimle bulunan bir müşteri
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Saat Hızı / 60) * Gerçek Çalışma Süresi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,seç BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,seç BOM
 DocType: SMS Log,SMS Log,SMS Kayıtları
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Teslim Öğeler Maliyeti
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} üzerinde tatil Tarihten itibaren ve Tarihi arasında değil
@@ -196,7 +198,7 @@
 DocType: Academic Term,Schools,Okullar
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},çalışan için bulunamadı izin rekor {0} için {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,Lütfen ilk önce şirketi girin
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,İlk Şirket seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Hedefi
 DocType: BOM,Total Cost,Toplam Maliyet
@@ -216,8 +218,8 @@
 DocType: Employee,Mr,Bay
 DocType: Employee,Mr,Bay
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer grubu tablosunda bulunan yinelenen müşteri grubu
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Tedarikçi Türü / Tedarikçi
 DocType: Naming Series,Prefix,Önek
 DocType: Naming Series,Prefix,Önek
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tüketilir
@@ -227,11 +229,11 @@
 DocType: Training Result Employee,Grade,sınıf
 DocType: Sales Invoice Item,Delivered By Supplier,Tedarikçi Tarafından Teslim
 DocType: SMS Center,All Contact,Tüm İrtibatlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Üretim Sipariş zaten BOM ile tüm öğeler için yaratılmış
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Yıllık Gelir
 DocType: Daily Work Summary,Daily Work Summary,Günlük Çalışma Özeti
 DocType: Period Closing Voucher,Closing Fiscal Year,Mali Yılı Kapanış
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} donduruldu
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} donduruldu
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Hesap tablosu oluşturmak için Varolan Firma seçiniz
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stok Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Stok Giderleri
@@ -241,12 +243,12 @@
 DocType: Journal Entry,Contra Entry,Hesaba Alacak Girişi
 DocType: Journal Entry Account,Credit in Company Currency,Şirket Para Kredi
 DocType: Delivery Note,Installation Status,Kurulum Durumu
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Eğer yoklama güncellemek istiyor musunuz? <br> Mevcut: {0} \ <br> Yok: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Onaylanan ve reddedilen miktarların toplamı alınan ürün miktarına eşit olmak zorundadır. {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Tedarik Hammadde Satın Alma için
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ödeme en az bir mod POS fatura için gereklidir.
 DocType: Products Settings,Show Products as a List,Ürünlerine bir liste olarak
 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.
@@ -264,7 +266,7 @@
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,İstek Türü
 DocType: Lead,Request Type,İstek Türü
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,Çalışan Girişi Yap
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,Çalışan Girişi Yap
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Yayın
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Yerine Getirme
@@ -283,6 +285,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Bakım ziyaretleri planı
 DocType: SMS Settings,Enter url parameter for message,Mesaj için url parametresi girin
 DocType: POS Profile,Customer Groups,Müşteri Grupları
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Finansal Tablolar
 DocType: Guardian,Students,Öğrenciler
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Fiyatlandırma ve indirim uygulanması için kurallar.
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Fiyatlandırma ve indirim uygulanması için kurallar.
@@ -314,11 +317,11 @@
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Naming Series,Series List for this Transaction,Bu İşlem için Seri Listesi
 DocType: Company,Default Payroll Payable Account,Standart Bordro Ödenecek Hesap
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Güncelleme E-posta Grubu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Güncelleme E-posta Grubu
 DocType: Sales Invoice,Is Opening Entry,Açılış Girdisi
 DocType: Customer Group,Mention if non-standard receivable account applicable,Mansiyon standart dışı alacak hesabı varsa
 DocType: Course Schedule,Instructor Name,Öğretim Elemanının Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Sunulmadan önce gerekli depo için
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Sunulmadan önce gerekli depo için
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Açık Alınan
 DocType: Sales Partner,Reseller,Bayi
 DocType: Sales Partner,Reseller,Bayi
@@ -327,7 +330,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Satış Faturası Ürün Karşılığı
 ,Production Orders in Progress,Devam eden Üretim Siparişleri
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Finansman Sağlanan Net Nakit
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","YerelDepolama dolu, tasarruf etmedi"
 DocType: Lead,Address & Contact,Adres ve İrtibat
 DocType: Leave Allocation,Add unused leaves from previous allocations,Önceki tahsisleri kullanılmayan yaprakları ekleyin
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Sonraki Dönüşümlü {0} üzerinde oluşturulur {1}
@@ -354,8 +357,8 @@
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 DocType: Item Website Specification,Item Website Specification,Ürün Web Sitesi Özellikleri
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,İzin engellendi
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Banka Girişler
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Ürün {0} {1}de kullanım ömrünün sonuna gelmiştir.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Banka Girişler
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Yıllık
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Stok Uzlaşma Öğe
@@ -376,9 +379,9 @@
 DocType: Item,Publish in Hub,Hub Yayınla
 DocType: Student Admission,Student Admission,Öğrenci Kabulü
 ,Terretory,Bölge
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Ürün {0} iptal edildi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Malzeme Talebi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Ürün {0} iptal edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Malzeme Talebi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -419,10 +422,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Üstün Çekler ve temizlemek için Mevduat
 DocType: Item,Synced With Hub,Hub ile Senkronize
 DocType: Vehicle,Fleet Manager,Filo Yöneticisi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Satır # {0}: {1} öğe için negatif olamaz {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Yanlış Şifre
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Satır # {0}: {1} öğe için negatif olamaz {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Yanlış Şifre
 DocType: Item,Variant Of,Of Varyant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Daha 'Miktar imalatı için' Tamamlandı Adet büyük olamaz
 DocType: Period Closing Voucher,Closing Account Head,Kapanış Hesap Başkanı
 DocType: Employee,External Work History,Dış Çalışma Geçmişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Dairesel Referans Hatası
@@ -437,12 +440,11 @@
 DocType: Journal Entry,Multi Currency,Çoklu Para Birimi
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
 DocType: Payment Reconciliation Invoice,Invoice Type,Fatura Türü
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,İrsaliye
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Vergiler kurma
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Satılan Varlığın Maliyeti
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
-DocType: Grade Interval,Min Score,Min Skor
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} iki kere ürün vergisi girildi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Bu hafta ve bekleyen aktiviteler için Özet
 DocType: Student Applicant,Admitted,Başvuruldu
 DocType: Workstation,Rent Cost,Kira Bedeli
@@ -456,7 +458,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Sipariş Değeri
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,partiye karşı veya dahili transfer için Banka / Para Çekme işlemleri
 DocType: Shipping Rule,Valid for Countries,Ülkeler için geçerli
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Bu Ürün Şablon ve işlemlerde kullanılamaz. 'Hayır Kopyala' ayarlanmadığı sürece Öğe özellikleri varyantları içine üzerinden kopyalanır
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Dikkat Toplam Sipariş
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Çalışan görevi (ör. CEO, Müdür vb.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,Ayın 'Belli Gününde Tekrarla' alanına değer giriniz
@@ -465,15 +467,15 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Satır # {0}: Alış Fatura varolan varlık karşı yapılamaz {1}
 DocType: Item Tax,Tax Rate,Vergi Oranı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} zaten Çalışan tahsis {1} dönem {2} için {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Öğe Seç
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Öğe Seç
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Satın alma Faturası {0} zaten teslim edildi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},Satır # {0}: Toplu Hayır aynı olmalıdır {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Olmayan gruba dönüştürme
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Bir Öğe toplu (lot).
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: C-Form Invoice Detail,Invoice Date,Fatura Tarihi
 DocType: GL Entry,Debit Amount,Borç Tutarı
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Sadece Şirket&#39;in başına 1 Hesap olabilir {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Eke bakın
 DocType: Purchase Order,% Received,% Alındı
 DocType: Purchase Order,% Received,% Alındı
@@ -511,9 +513,9 @@
 DocType: Request for Quotation,Request for Quotation,Fiyat Teklif Talebi
 DocType: Salary Slip Timesheet,Working Hours,Iş saatleri
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Varolan bir serinin başlangıç / geçerli sıra numarasını değiştirin.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Yeni müşteri oluştur
-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.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Satınalma Siparişleri oluşturun
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Yeni müşteri oluştur
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Birden fazla fiyatlandırma Kuralo hakimse, kullanıcılardan zorunu çözmek için Önceliği elle ayarlamaları istenir"
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Satınalma Siparişleri oluşturun
 ,Purchase Register,Satın alma kaydı
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Uygulanabilir Ücretler
@@ -523,8 +525,8 @@
 DocType: Purchase Receipt,Vehicle Date,Araç Tarihi
 DocType: Student Log,Medical,Tıbbi
 DocType: Student Log,Medical,Tıbbi
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Kaybetme nedeni
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Kaybetme nedeni
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Kaybetme nedeni
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Kurşun Sahibi Kurşun gibi aynı olamaz
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,"Ayrılmış miktar, ayarlanmamış miktardan büyük olamaz."
 DocType: Announcement,Receiver,Alıcı
@@ -545,6 +547,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Miktarı ve Oranı
 DocType: Delivery Note,% Installed,% Montajlanan
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Derslik / dersler planlanmış olabilir Laboratuvarlar vb.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Lütfen ilk önce şirket adını girin
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
 DocType: Purchase Invoice,Supplier Name,Tedarikçi Adı
@@ -563,10 +566,11 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Zorunlu alan - Akademik Yıl
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Zorunlu alan - Akademik Yıl
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"E-postanın bir parçası olarak giden giriş metnini özelleştirin, her işlemin ayrı giriş metni vardır"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Lütfen {0} şirketi için varsayılan ödenebilir hesabı ayarlayın.
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Tüm üretim süreçleri için genel ayarlar.
 DocType: Accounts Settings,Accounts Frozen Upto,Dondurulmuş hesaplar
 DocType: SMS Log,Sent On,Gönderim Zamanı
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,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
@@ -574,8 +578,8 @@
 DocType: Request for Quotation Item,Required Date,Gerekli Tarih
 DocType: Request for Quotation Item,Required Date,Gerekli Tarih
 DocType: Delivery Note,Billing Address,Faturalama  Adresi
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ürün Kodu girin.
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ürün Kodu girin.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Ürün Kodu girin.
 DocType: BOM,Costing,Maliyetlendirme
 DocType: BOM,Costing,Maliyetlendirme
 DocType: Tax Rule,Billing County,fatura İlçe
@@ -593,6 +597,7 @@
 DocType: Packing Slip,From Package No.,Ambalaj Numarasından.
 DocType: Item Attribute,To Range,Range
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Teminatlar ve Mevduatlar
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Kendi değerleme yöntemine sahip olmayan bazı ürünlere karşı işlemler olduğu için değerleme yöntemini değiştiremezsiniz
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tahsis edilen toplam yaprakları zorunludur
 DocType: Job Opening,Description of a Job Opening,İş Açılış Açıklaması
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Bugün için Bekleyen faaliyetler
@@ -617,14 +622,14 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Lütfen Kursu seçin
 DocType: Timesheet Detail,Hrs,saat
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Firma seçiniz
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Firma seçiniz
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 DocType: Stock Entry Detail,Difference Account,Fark Hesabı
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Bağımlı görevi {0} kapalı değil yakın bir iş değildir Can.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Malzeme Talebinin yapılacağı Depoyu girin
 DocType: Production Order,Additional Operating Cost,Ek İşletme Maliyeti
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Bakım ürünleri
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"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
@@ -636,7 +641,7 @@
 DocType: Sales Order,To Deliver,Teslim edilecek
 DocType: Purchase Invoice Item,Item,Ürün
 DocType: Purchase Invoice Item,Item,Ürün
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Seri hiçbir öğe bir kısmını olamaz
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Journal Entry,Difference (Dr - Cr),Fark (Dr - Cr)
 DocType: Account,Profit and Loss,Kar ve Zarar
@@ -654,7 +659,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Artım 0 olamaz
 DocType: Production Planning Tool,Material Requirement,Malzeme İhtiyacı
 DocType: Company,Delete Company Transactions,Şirket İşlemleri sil
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Referans No ve Referans Tarih Banka işlem için zorunludur
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Ekle / Düzenle Vergi ve Harçlar
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
 DocType: Purchase Invoice,Supplier Invoice No,Tedarikçi Fatura No
@@ -669,7 +674,7 @@
 DocType: Production Plan Item,Pending Qty,Bekleyen Adet
 DocType: Budget,Ignore,Yoksay
 DocType: Budget,Ignore,Yoksay
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} aktif değil
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} aktif değil
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS aşağıdaki numaralardan gönderilen: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Baskı için Kurulum onay boyutları
 DocType: Salary Slip,Salary Slip Timesheet,Maaş Kayma Zaman Çizelgesi
@@ -681,14 +686,14 @@
 DocType: Pricing Rule,Sales Partner,Satış Ortağı
 DocType: Pricing Rule,Sales Partner,Satış Ortağı
 DocType: Buying Settings,Purchase Receipt Required,Gerekli Satın alma makbuzu
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Açılış Stok girdiyseniz Değerleme Oranı zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Fatura tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,İlk Şirket ve Parti Tipi seçiniz
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Mali / Muhasebe yılı.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Birikmiş Değerler
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","Üzgünüz, seri numaraları birleştirilemiyor"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Satış Emri verin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Satış Emri verin
 DocType: Project Task,Project Task,Proje Görevi
 ,Lead Id,Talep Yaratma  Kimliği
 DocType: C-Form Invoice Detail,Grand Total,Genel Toplam
@@ -707,7 +712,7 @@
 DocType: Job Applicant,Resume Attachment,Devam Eklenti
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Tekrar Müşteriler
 DocType: Leave Control Panel,Allocate,Tahsis
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Satış İade
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Satış İade
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Not: Toplam tahsis edilen yaprakları {0} zaten onaylanmış yaprakları daha az olmamalıdır {1} dönem için
 DocType: Announcement,Posted By,Tarafından gönderildi
 DocType: Item,Delivered by Supplier (Drop Ship),Yüklenici tarafından teslim (Bırak Gemi)
@@ -720,7 +725,7 @@
 DocType: Lead,Middle Income,Orta Gelir
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Açılış (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Tahsis edilen miktar negatif olamaz
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lütfen şirketi ayarlayın.
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Lütfen şirketi ayarlayın.
@@ -732,7 +737,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Satış Faturası Çizelgesi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Referans No ve Referans Tarihi gereklidir {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Seç Ödeme Hesabı Banka girişi yapmak için
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Yaprakları, harcama talepleri ve bordro yönetmek için Çalışan kaydı oluşturma"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Bilgi Bankası'na ekle
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Teklifi Yazma
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Teklifi Yazma
@@ -766,13 +771,13 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' mali yıl {2} içinde değil
 DocType: Buying Settings,Settings for Buying Module,Modülü satın almak için Ayarlar
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},"Varlık {0}, {1} firmasına ait değil"
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,İlk Satınalma Faturası giriniz
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,İlk Satınalma Faturası giriniz
 DocType: Buying Settings,Supplier Naming By,Tedarikçi İsimlendirme
 DocType: Activity Type,Default Costing Rate,Standart Maliyetlendirme Oranı
 DocType: Maintenance Schedule,Maintenance Schedule,Bakım Programı
 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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","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 +36,"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 +24,Net Change in Inventory,Envanter Net Değişim
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Çalışan Kredi Yönetimi
 DocType: Employee,Passport Number,Pasaport Numarası
@@ -781,8 +786,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Yönetici
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Yönetici
 DocType: Payment Entry,Payment From / To,From / To Ödeme
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Tarih aralığı
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Yeni kredi limiti müşteri için geçerli kalan miktar daha azdır. Kredi limiti en az olmak zorundadır {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -793,8 +797,8 @@
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Issue,Resolution Date,Karar Tarihi
 DocType: Student Batch Name,Batch Name,toplu Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Zaman Çizelgesi oluşturuldu:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Zaman Çizelgesi oluşturuldu:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},{0} Ödeme şeklinde varsayılan nakit veya banka hesabı ayarlayınız
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,kaydetmek
 DocType: Selling Settings,Customer Naming By,Müşterinin Bilinen Adı
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Öğrenci Aylık Seyirci Raporunda olarak Şimdiki öğrenci gösterecek
@@ -827,7 +831,7 @@
 DocType: Production Order Operation,Actual Start Time,Gerçek Başlangıç Zamanı
 DocType: BOM Operation,Operation Time,Çalışma Süresi
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Bitiş
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,baz
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,baz
 DocType: Timesheet,Total Billed Hours,Toplam Faturalı Saat
 DocType: Journal Entry,Write Off Amount,Borç Silme Miktarı
 DocType: Journal Entry,Bill No,Fatura No
@@ -845,7 +849,7 @@
 DocType: Student Attendance,Student Attendance,Öğrenci Seyirci
 DocType: Sales Invoice Timesheet,Time Sheet,Kartela
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Hammaddeleri Dayalı
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Lütfen ayrıntıları girin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Lütfen ayrıntıları girin
 DocType: Interest,Interest,Faiz
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Ön satış
 DocType: Purchase Receipt,Other Details,Diğer Detaylar
@@ -860,19 +864,19 @@
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 DocType: Purchase Receipt Item Supplied,Current Stock,Güncel Stok
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},"Satır {0}: Sabit Varlık {1}, {2} kalemiyle ilişkilendirilmiş değil"
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Önizleme Maaş Kayma
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Önizleme Maaş Kayma
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Hesap {0} birden çok kez girilmiş
 DocType: Account,Expenses Included In Valuation,Değerlemeye dahil giderler
 DocType: Hub Settings,Seller City,Satıcı Şehri
-,Absent Student Report,Yok Öğrenci Raporu
+,Absent Student Report,Olmayan Öğrenci Raporu
 DocType: Email Digest,Next email will be sent on:,Sonraki e-posta gönderilecek:
 DocType: Offer Letter Term,Offer Letter Term,Mektubu Dönem Teklif
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Öğe varyantları vardır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Şirket {0} yok
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Ağaç Tipi
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Ağaç Tipi
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Birim Başına Tüketilen Miktar
 DocType: Serial No,Warranty Expiry Date,Garanti Son Kullanma Tarihi
 DocType: Serial No,Warranty Expiry Date,Garanti Son Kullanma Tarihi
@@ -880,7 +884,6 @@
 DocType: Material Request Item,Quantity and Warehouse,Miktar ve Depo
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
 DocType: Sales Invoice,Commission Rate (%),Komisyon Oranı (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Naming Series&#39;i ayarlayın.
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Lütfen Program Seçiniz
 DocType: Project,Estimated Cost,Tahmini maliyeti
 DocType: Purchase Order,Link to material requests,materyal isteklere Bağlantı
@@ -901,7 +904,7 @@
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Mode of Payment Account,Default Account,Varsayılan Hesap
 DocType: Payment Entry,Received Amount (Company Currency),Alınan Tutar (Şirket Para Birimi)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Talepten fırsat oluşturuldu ise talep ayarlanmalıdır
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Haftalık izin gününü seçiniz
 DocType: Production Order Operation,Planned End Time,Planlanan Bitiş Zamanı
 ,Sales Person Target Variance Item Group-Wise,Satış Personeli Hedef Varyans Ürün Grup Bilgisi
@@ -920,6 +923,7 @@
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Aylık maaş beyanı.
 DocType: BOM,Website Specifications,Web Sitesi Özellikleri
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: gönderen {0} çeşidi {1}
 DocType: Warranty Claim,CI-,CI
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Satır {0}: Dönüşüm katsayısı zorunludur
@@ -975,6 +979,7 @@
 DocType: Bank Guarantee,Project,Proje
 DocType: Bank Guarantee,Project,Proje
 DocType: Quality Inspection Reading,Reading 7,7 Okuma
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,kısmen Sıralı
 DocType: Expense Claim Detail,Expense Claim Type,Gideri Talebi Türü
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Alışveriş Sepeti Varsayılan ayarları
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},"Varlık, Kayıt Girdisi {0} ile hurda edildi"
@@ -983,16 +988,16 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Biyoteknoloji
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Ofis Bakım Giderleri
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,E-posta Hesabı Oluşturma
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Ürün Kodu girin
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Ürün Kodu girin
 DocType: Account,Liability,Borç
 DocType: Account,Liability,Borç
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Yaptırıma Tutar Satır talep miktarı daha büyük olamaz {0}.
 DocType: Company,Default Cost of Goods Sold Account,Ürünler Satılan Hesabı Varsayılan Maliyeti
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Fiyat Listesi seçilmemiş
 DocType: Employee,Family Background,Aile Geçmişi
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
 DocType: Request for Quotation Supplier,Send Email,E-posta Gönder
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Uyarı: Geçersiz Eklenti {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,İzin yok
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
 DocType: Company,Default Bank Account,Varsayılan Banka Hesabı
@@ -1008,8 +1013,8 @@
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Supplier Quotation,Stopped,Durduruldu
 DocType: Item,If subcontracted to a vendor,Bir satıcıya taşeron durumunda
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Öğrenci Grubu zaten güncellendi.
 DocType: SMS Center,All Customer Contact,Bütün Müşteri İrtibatları
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Csv üzerinden stok bakiyesini yükle.
 DocType: Warehouse,Tree Details,ağaç Detayları
@@ -1020,8 +1025,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Asgari Fatura Tutarı
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Maliyet Merkezi {2} Şirket&#39;e ait olmayan {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Hesap {2} Grup olamaz
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir &#39;{doctype}&#39; tablosu
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Zaman Çizelgesi {0} tamamlanmış veya iptal edilir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Ürün Satır {idx}: {doctype} {docname} Yukarıdaki mevcut değildir &#39;{doctype}&#39; tablosu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Zaman Çizelgesi {0} tamamlanmış veya iptal edilir
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,görev yok
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Otomatik fatura 05, 28 vb gibi oluşturulur hangi ayın günü"
 DocType: Asset,Opening Accumulated Depreciation,Birikmiş Amortisman Açılış
@@ -1038,7 +1043,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} Bill karşı {1} tarihli {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Kurs programı
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Kurs programı
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: Maintenance Visit,Completion Status,Tamamlanma Durumu
 DocType: HR Settings,Enter retirement age in years,yıllarda emeklilik yaşı girin
@@ -1047,7 +1052,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Bu kadar yüzde teslimatı veya makbuz üzerinde izin ver
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,İthalat Katılımı
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Bütün Ürün Grupları
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Bütün Ürün Grupları
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 DocType: Process Payroll,Activity Log,Etkinlik Günlüğü
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Net Kar / Zarar
@@ -1060,7 +1065,7 @@
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Öngörülen Tutar
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
 DocType: Sales Invoice,Payment Due Date,Son Ödeme Tarihi
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Öğe Variant {0} zaten aynı özelliklere sahip bulunmaktadır
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',&#39;Açılış&#39;
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,To Do Aç
 DocType: Notification Control,Delivery Note Message,İrsaliye Mesajı
@@ -1080,7 +1085,7 @@
 DocType: Leave Block List Date,Leave Block List Date,İzin engel listesi tarihi
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
 DocType: Pricing Rule,Price or Discount,Fiyat veya İndirim
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Satın Alma Makbuzu Öğeler tablosundaki toplam Uygulanabilir Masraflar Toplam Vergi ve Masraflar aynı olmalıdır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Satın Alma Makbuzu Öğeler tablosundaki toplam Uygulanabilir Masraflar Toplam Vergi ve Masraflar aynı olmalıdır
 DocType: Sales Team,Incentives,Teşvikler
 DocType: Sales Team,Incentives,Teşvikler
 DocType: SMS Log,Requested Numbers,Talep Sayılar
@@ -1114,14 +1119,14 @@
 DocType: Supplier Quotation,Is Subcontracted,Taşerona verilmiş
 DocType: Item Attribute,Item Attribute Values,Ürün Özellik Değerler
 DocType: Examination Result,Examination Result,Sınav Sonucu
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Satın Alma İrsaliyesi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Satın Alma İrsaliyesi
 ,Received Items To Be Billed,Faturalanacak  Alınan Malzemeler
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Ekleyen Maaş Fiş
 DocType: Employee,Ms,Bayan
 DocType: Employee,Ms,Bayan
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Ana Döviz Kuru.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Referans Doctype biri olmalı {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Referans Doctype biri olmalı {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Çalışma için bir sonraki {0} günlerde Zaman Slot bulamayan {1}
 DocType: Production Order,Plan material for sub-assemblies,Alt-montajlar Plan malzeme
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Satış Ortakları ve Bölge
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Zaten Hesaptaki stok bakiyesi olmadığı için otomatik Hesabı oluşturulamaz. Deponun üzerinde bir girdi yapabilmek için bir eşleştirme hesabı oluşturmalısınız
@@ -1147,10 +1152,9 @@
 DocType: Supplier,Default Payable Accounts,Standart Borç Hesapları
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Çalışan {0} aktif değil veya yok.
 DocType: Fee Structure,Components,Bileşenler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Öğe Türevleri {0} güncellendi
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Ürün Varlık Kategori giriniz {0}
 DocType: Quality Inspection Reading,Reading 6,6 Okuma
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,değil {0} {1} {2} olmadan herhangi bir olumsuz ödenmemiş fatura Can
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Fatura peşin alım
 DocType: Hub Settings,Sync Now,Sync Şimdi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Satır {0}: Kredi giriş ile bağlantılı edilemez bir {1}
@@ -1165,12 +1169,12 @@
 DocType: Asset,Purchase Invoice,Satınalma Faturası
 DocType: Asset,Purchase Invoice,Satınalma Faturası
 DocType: Stock Ledger Entry,Voucher Detail No,Föy Detay no
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Yeni Satış Faturası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Yeni Satış Faturası
 DocType: Stock Entry,Total Outgoing Value,Toplam Giden Değeri
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Tarih ve Kapanış Tarihi Açılış aynı Mali Yılı içinde olmalıdır
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Tarih ve Kapanış Tarihi Açılış aynı Mali Yılı içinde olmalıdır
 DocType: Lead,Request for Information,Bilgi İsteği
 DocType: Lead,Request for Information,Bilgi İsteği
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Senkronizasyon Çevrimdışı Faturalar
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Senkronizasyon Çevrimdışı Faturalar
 DocType: Payment Request,Paid,Ücretli
 DocType: Program Fee,Program Fee,Program Ücreti
 DocType: Salary Slip,Total in words,Sözlü Toplam
@@ -1180,7 +1184,7 @@
 DocType: Employee Loan,Sanctioned,onaylanmış
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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 +111,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 +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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."
 DocType: Job Opening,Publish on website,Web sitesinde yayımlamak
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Müşterilere yapılan sevkiyatlar.
@@ -1195,7 +1199,7 @@
 ,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 +843,Select Item for Transfer,Transferi için seçin Öğe
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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
@@ -1207,8 +1211,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Kimyasal
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Bu mod seçildiğinde varsayılan Banka / Kasa hesabı otomatik Maaş Dergisi girdisi güncellenecektir.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Sınıf Kodu için aralıkları {0} diğer sınıflar için sınıf aralıklarla çakışıyor. kontrol edin aralıkları {0} ve {1} ve yeniden deneyin
 DocType: BOM,Raw Material Cost(Company Currency),Hammadde Maliyeti (Şirket Para Birimi)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Tüm öğeler zaten bu üretim Sipariş devredilmiştir.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Sıra # {0}: Oran, {1} {2} &#39;de kullanılan hızdan daha büyük olamaz"
@@ -1222,14 +1224,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Sitesi Öğe
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Mektup baş ve logosu yükleyin. (Daha sonra bunları düzenleyebilirsiniz).
 DocType: Timesheet Detail,Bill,fatura
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Sonraki Amortisman Tarihi geçmiş tarih olarak girilir
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Beyaz
 DocType: SMS Center,All Lead (Open),Bütün Başlıklar (Açık)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Satır {0}: için Adet mevcut değil {4} depoda {1} giriş saati gönderme de ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Avansları Öde
 DocType: Item,Automatically Create New Batch,Otomatik olarak Yeni Toplu Oluştur
 DocType: Item,Automatically Create New Batch,Otomatik olarak Yeni Toplu Oluştur
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Oluştur
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Oluştur
 DocType: Student Admission,Admission Start Date,Kabul Başlangıç Tarihi
 DocType: Journal Entry,Total Amount in Words,Sözlü Toplam Tutar
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,Hata oluştu. Bunun sebebi formu kaydetmemeniz olabilir. Sorun devam ederse support@erpnext.com adresi ile iltişime geçiniz
@@ -1237,7 +1239,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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ı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Değişim Miktarı Hesabı giriniz
 DocType: Student Batch Name,Student Batch Name,Öğrenci Toplu Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
 DocType: Holiday List,Holiday List Name,Tatil Listesi Adı
@@ -1260,11 +1262,11 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Lütfen belirtin a {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Miktar veya değer hiçbir değişiklik ile kaldırıldı öğeler.
 DocType: Delivery Note,Delivery To,Teslim
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Özellik tablosu zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Özellik tablosu zorunludur
 DocType: Production Planning Tool,Get Sales Orders,Satış Şiparişlerini alın
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} negatif olamaz
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Indirim
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Indirim
 DocType: Asset,Total Number of Depreciations,Amortismanlar Sayısı
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
 DocType: Sales Invoice Item,Rate With Margin,Marjla Oran
@@ -1281,7 +1283,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Satış Sipariş / Satış Emrinde ayrılan Depo/ Mamül Deposu
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Satış Tutarı
 DocType: Repayment Schedule,Interest Amount,Faiz Tutarı
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Bu Kayıt için Gider Onaylayıcısınız. Lütfen 'durumu' güncelleyip kaydedin.
 DocType: Serial No,Creation Document No,Oluşturulan Belge Tarihi
 DocType: Issue,Issue,Sayı
 DocType: Asset,Scrapped,Hurda edilmiş
@@ -1289,13 +1291,13 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Öğe Variantların için bağlıyor. Örneğin Boyut, Renk vb"
 DocType: Purchase Invoice,Returns,İade
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP Depo
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Seri No {0} Bakım sözleşmesi {1} uyarınca bakımda
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,İşe Alım
 DocType: Lead,Organization Name,Kuruluş Adı
 DocType: Lead,Organization Name,Kuruluş Adı
 DocType: Tax Rule,Shipping State,Nakliye Devlet
 ,Projected Quantity as Source,Kaynak olarak Öngörülen Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Stokta olmayan öğeleri içerir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Satış Giderleri
@@ -1307,12 +1309,12 @@
 DocType: Item,Default Selling Cost Center,Standart Satış Maliyet Merkezi
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
 DocType: Sales Partner,Implementation Partner,Uygulama Ortağı
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Posta Kodu
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Posta Kodu
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Satış Sipariş {0} {1}
 DocType: Opportunity,Contact Info,İletişim Bilgileri
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Stok Girişleri Yapımı
 DocType: Packing Slip,Net Weight UOM,Net Ağırlık Ölçü Birimi
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Sonuç
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Sonuç
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Item,Default Supplier,Standart Tedarikçi
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Üretim Ödeneği Yüzde üzerinde
@@ -1321,7 +1323,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Haftalık Hesap Kesim tarihlerini alın
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Bitiş Tarihi, Başlangıç Tarihinden daha az olamaz"
 DocType: Sales Person,Select company name first.,Önce şirket adı seçiniz
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Dr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Dr
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Tedarikçilerden alınan teklifler.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Şu kişi(lere) {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Ortalama Yaş
@@ -1343,7 +1345,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Taşıma
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,geçersiz Özellik
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} teslim edilmelidir
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} teslim edilmelidir
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Miktara göre daha az veya ona eşit olmalıdır {0}
 DocType: SMS Center,Total Characters,Toplam Karakterler
 DocType: SMS Center,Total Characters,Toplam Karakterler
@@ -1355,7 +1357,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 +224,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 +52,Please set 'Apply Additional Discount On',Set &#39;On İlave İndirim Uygula&#39; Lütfen
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Menzil az olmak zorundadır Kimden daha Range için
 DocType: Global Defaults,Global Defaults,Küresel Varsayılanlar
@@ -1366,7 +1368,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Başlangıç yılı
 DocType: Purchase Invoice,Start date of current invoice's period,Cari fatura döneminin Başlangıç tarihi
 DocType: Salary Slip,Leave Without Pay,Ücretsiz İzin
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Kapasite Planlama Hatası
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1384,7 +1386,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Bu varyant Ürün Kodu eklenecektir. Senin kısaltması ""SM"", ve eğer, örneğin, ürün kodu ""T-Shirt"", ""T-Shirt-SM"" olacak varyantın madde kodu"
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net Ödeme (sözlü) Maaş Makbuzunu kaydettiğinizde görünecektir
 DocType: Purchase Invoice,Is Return,İade mi
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,İade / Borç Dekontu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,İade / Borç Dekontu
 DocType: Price List Country,Price List Country,Fiyat Listesi Ülke
 DocType: Item,UOMs,Ölçü Birimleri
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},Ürün {1} için {0} geçerli bir seri numarası
@@ -1395,12 +1397,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Toplu Numarası almak için Ürün Kodu giriniz
 DocType: Stock Settings,Default Item Group,Standart Ürün Grubu
 DocType: Employee Loan,Partially Disbursed,Kısmen dönemlerde toplanan
-DocType: Grading Structure,Grading System Name,Not Sistemi Adı
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Tedarikçi Veritabanı.
 DocType: Account,Balance Sheet,Bilanço
 DocType: Account,Balance Sheet,Bilanço
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ','Ürün Kodu Ürün için Merkezi'ni Maliyet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",Ödeme Modu yapılandırılmamış. Hesap Ödemeler Modu veya POS Profili ayarlanmış olup olmadığını kontrol edin.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Satış kişiniz bu tarihte müşteriyle irtibata geçmek için bir hatırlama alacaktır
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Aynı madde birden çok kez girilemez.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Ek hesaplar Gruplar altında yapılabilir, ancak girişler olmayan Gruplar karşı yapılabilir"
@@ -1413,7 +1414,7 @@
 ,Purchase Order Items To Be Billed,Faturalanacak Satınalma Siparişi Kalemleri
 DocType: Purchase Invoice Item,Net Rate,Net Hızı
 DocType: Purchase Invoice Item,Purchase Invoice Item,Satın alma Faturası Ürünleri
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stok Ledger Girişler ve GL Girişler seçilen Satınalma Makbuzlar için yayınlanırsa edilir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Stok Ledger Girişler ve GL Girişler seçilen Satınalma Makbuzlar için yayınlanırsa edilir
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Madde 1
 DocType: Holiday,Holiday,Tatil
 DocType: Holiday,Holiday,Tatil
@@ -1445,12 +1446,12 @@
 DocType: Maintenance Visit Purpose,Work Done,Yapılan İş
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Nitelikler masada en az bir özellik belirtin
 DocType: Announcement,All Students,Tüm Öğrenciler
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} stok korunmayan ürün olmalıdır
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} stok korunmayan ürün olmalıdır
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Değerlendirme Defteri
 DocType: Grading Scale,Intervals,Aralıklar
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,En erken
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Bir Ürün grubu aynı isimle bulunuyorsa, lütfen Ürün veya Ürün grubu adını değiştirin"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Öğrenci Mobil No
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1492,9 +1493,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},için {0} maaş ödeme {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Satış Sipariş {0} geçerli değildir
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Satın alma siparişleri planı ve alışverişlerinizi takip
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Üzgünüz, şirketler birleştirilemiyor"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Malzeme Talebi toplam Sayı / Aktarım miktarı {0} {1} \ Ürün için istenen miktar {2} daha büyük olamaz {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Küçük
@@ -1519,11 +1520,11 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Satır {0}: Miktar zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Tarım
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Senkronizasyon Ana Veri
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Senkronizasyon Ana Veri
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,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 +180,Website Image should be a public file or website URL,Web Sitesi Resim kamu dosya veya web sitesi URL olmalıdır
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Ürün Ağacı
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Bu bir kök Ürün grubudur ve düzenlenemez.
@@ -1543,22 +1544,22 @@
 DocType: Student Group Student,Group Roll Number,Grup Rulosu Numarası
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","{0}, sadece kredi hesapları başka bir ödeme girişine karşı bağlantılı olabilir için"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,tüm görev ağırlıkları toplamı 1. buna göre tüm proje görevleri ağırlıkları ayarlayın olmalıdır
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,İrsaliye {0} teslim edilmedi
 apps/erpnext/erpnext/stock/get_item_details.py +141,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ı
-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.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Fiyatlandırma Kuralı ilk olarak 'Uygula' alanı üzerinde seçilir, bu bir Ürün, Grup veya Marka olabilir."
 DocType: Hub Settings,Seller Website,Satıcı Sitesi
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Satış ekibi için ayrılan toplam yüzde 100 olmalıdır
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Üretim Sipariş durumu {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Üretim Sipariş durumu {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Üretim Sipariş durumu {0}
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Appraisal Goal,Goal,Hedef
 DocType: Sales Invoice Item,Edit Description,Edit Açıklama
 ,Team Updates,Takım Güncellemeler
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Tedarikçi İçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Baskı Biçimi oluştur
@@ -1577,7 +1578,7 @@
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} ürün işlemde
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
 DocType: Workstation,Workstation Name,İş İstasyonu Adı
-DocType: Grade Interval,Grade Code,sınıf Kodu
+DocType: Grading Scale Interval,Grade Code,sınıf Kodu
 DocType: POS Item Group,POS Item Group,POS Ürün Grubu
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Digest e-posta:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} Öğe ait değil {1}
@@ -1597,7 +1598,7 @@
 DocType: Sales Order,Recurring Upto,Tekrarlanan Kadar
 DocType: Attendance,HR Manager,İK Yöneticisi
 DocType: Attendance,HR Manager,İK Yöneticisi
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Bir Şirket seçiniz
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Bir Şirket seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege bırak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Privilege bırak
 DocType: Purchase Invoice,Supplier Invoice Date,Tedarikçi Fatura Tarihi
@@ -1616,7 +1617,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Yiyecek Grupları
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Yaşlanma Aralığı 3
 DocType: Maintenance Schedule Item,No of Visits,Ziyaret sayısı
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Mark Devam
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Mark Devam
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},{1} ile ilgili Bakım Çizelgesi {0} var
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,kaydolunan öğrenci
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Kapanış Hesap Para olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Tüm hedefler için puan toplamı It is 100. olmalıdır {0}
@@ -1647,7 +1649,7 @@
 DocType: POS Profile,Campaign,Kampanya
 DocType: POS Profile,Campaign,Kampanya
 DocType: Supplier,Name and Type,Adı ve Türü
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Onay Durumu 'Onaylandı' veya 'Reddedildi' olmalıdır
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Onay Durumu 'Onaylandı' veya 'Reddedildi' olmalıdır
 DocType: Purchase Invoice,Contact Person,İrtibat Kişi
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"'Beklenen Başlangıç Tarihi', 'Beklenen Bitiş Tarihi' den büyük olamaz"
@@ -1676,14 +1678,15 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,Hesap Tablosu
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,100 'den daha büyük olamaz
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,100 'den daha büyük olamaz
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Ürün {0} bir stok ürünü değildir
 DocType: Maintenance Visit,Unscheduled,Plânlanmamış
 DocType: Employee,Owned,Hisseli
 DocType: Salary Detail,Depends on Leave Without Pay,Pay olmadan İzni bağlıdır
 DocType: Pricing Rule,"Higher the number, higher the priority","Yüksek sayı, yüksek öncelikli"
 ,Purchase Invoice Trends,Satın alma fatura eğilimleri
 DocType: Employee,Better Prospects,Iyi Beklentiler
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",Sıra # {0}: Toplu işlem {1} yalnızca {2} adetlik bir miktara sahip. Lütfen {3} adet mevcut olan başka bir partiyi seçin veya satırı birden çok partiye dağıtmak / yayınlamak için satırı birden çok satıra bölün.
 DocType: Vehicle,License Plate,Plaka
 DocType: Appraisal,Goals,Hedefler
 DocType: Appraisal,Goals,Hedefler
@@ -1706,7 +1709,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Çalışan kendi kendine rapor olamaz.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Hesap dondurulmuş ise, girdiler kısıtlı kullanıcılara açıktır."
 DocType: Email Digest,Bank Balance,Banka hesap bakiyesi
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} sadece para yapılabilir: {0} Muhasebe Kayıt {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","İş Profili, gerekli nitelikler vb"
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
 DocType: Journal Entry Account,Account Balance,Hesap Bakiyesi
@@ -1719,7 +1722,7 @@
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 DocType: Shipping Rule,Shipping Account,Nakliye Hesap
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Hesap {2} etkin değil
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Satış Siparişleri işinizi planlamak ve zamanında teslim etmek olun
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Satış Siparişleri işinizi planlamak ve zamanında teslim etmek olun
 DocType: Quality Inspection,Readings,Okumalar
 DocType: Stock Entry,Total Additional Costs,Toplam Ek Maliyetler
 DocType: Course Schedule,SH,SH
@@ -1732,7 +1735,7 @@
 DocType: Shipping Rule Condition,To Value,Değer Vermek
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Ambalaj Makbuzu
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Ambalaj Makbuzu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Ofis Kiraları
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Kurulum SMS ağ geçidi ayarları
@@ -1759,12 +1762,12 @@
 DocType: Company,Services,Servisler
 DocType: HR Settings,Email Salary Slip to Employee,Çalışan e-posta Maaş Kayma
 DocType: Cost Center,Parent Cost Center,Ana Maliyet Merkezi
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Olası Tedarikçi seçin
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Olası Tedarikçi seçin
 DocType: Sales Invoice,Source,Kaynak
 DocType: Sales Invoice,Source,Kaynak
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Kapalı olanları göster
 DocType: Leave Type,Is Leave Without Pay,Pay Yapmadan mı
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Sabit Varlık için Varlık Kategorisi zorunludur
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Ödeme tablosunda kayıt bulunamadı
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Bu {0} çatışmalar {1} için {2} {3}
@@ -1785,7 +1788,7 @@
 DocType: Student,Date of Leaving,Ayrılış tarihi
 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/utilities/activation.py +64,Create Leads,İlanlar oluştur
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,İlanlar oluştur
 DocType: Maintenance Schedule,Schedules,Programlar
 DocType: Purchase Invoice Item,Net Amount,Net Miktar
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM Detay yok
@@ -1815,10 +1818,10 @@
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Sales Invoice Item,Brand Name,Marka Adı
 DocType: Purchase Receipt,Transporter Details,Taşıyıcı Detayları
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Standart depo seçilen öğe için gereklidir
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutu
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Kutu
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Olası Tedarikçi
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Olası Tedarikçi
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizasyon
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Organizasyon
 DocType: Budget,Monthly Distribution,Aylık Dağılımı
@@ -1828,8 +1831,8 @@
 DocType: Sales Partner,Sales Partner Target,Satış Ortağı Hedefi
 DocType: Loan Type,Maximum Loan Amount,Maksimum Kredi Miktarı
 DocType: Pricing Rule,Pricing Rule,Fiyatlandırma Kuralı
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},{0} öğrencisi için yinelenen rulo numarası
 DocType: Budget,Action if Annual Budget Exceeded,Yıllık Bütçe aşıldıysa yapılacak işlem
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Satınalma Siparişi Malzeme Talebi
 DocType: Shopping Cart Settings,Payment Success URL,Ödeme Başarı URL
@@ -1853,9 +1856,9 @@
 DocType: Employee Loan,Repayment Method,Geri Ödeme Yöntemi
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Seçili ise, Ana sayfa web sitesi için varsayılan Ürün Grubu olacak"
 DocType: Quality Inspection Reading,Reading 4,4 Okuma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} Proje için bulunamadı için varsayılan BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} Proje için bulunamadı için varsayılan BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Şirket Gideri Talepleri.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Öğrenciler sisteminin kalbi, tüm öğrenci ekleyebilir edilir"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Öğrenciler sisteminin kalbi, tüm öğrenci ekleyebilir edilir"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Satır # {0}: Boşluk tarihi {1} Çek tarihinden önce olamaz {2}
 DocType: Company,Default Holiday List,Tatil Listesini Standart
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Satır {0}: Zaman ve zaman {1} ile örtüşen {2}
@@ -1868,22 +1871,22 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Eğer izin için başvuruda edildiği gün (ler) tatildir. Sen izin talebinde gerekmez.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Ödeme E-posta tekrar gönder
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Yeni görev
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Teklifi Yap
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Teklifi Yap
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,diğer Raporlar
 DocType: Dependent Task,Dependent Task,Bağımlı Görev
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Tedbir varsayılan Birimi için dönüşüm faktörü satırda 1 olmalıdır {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Tip{0} izin  {1}'den uzun olamaz
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Peşin X gün için operasyonlar planlama deneyin.
 DocType: HR Settings,Stop Birthday Reminders,Doğum günü hatırlatıcılarını durdur
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Şirket Standart Bordro Ödenecek Hesap ayarlayın {0}
 DocType: SMS Center,Receiver List,Alıcı Listesi
 DocType: SMS Center,Receiver List,Alıcı Listesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Arama Öğe
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Arama Öğe
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Tüketilen Tutar
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Nakit Net Değişim
 DocType: Assessment Plan,Grading Scale,Notlandırma ölçeği
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Zaten tamamlandı
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Ölçü Birimi {0} Dönüşüm katsayısı tablosunda birden fazla kez girildi.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Zaten tamamlandı
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Ödeme Talebi zaten var {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,İhraç Öğeler Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Miktar fazla olmamalıdır {0}
@@ -1919,13 +1922,14 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Ödeme Girişi yapın
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Satır {0}: Tedarikçi karşı Advance debit gerekir
 DocType: Company,Default Values,Varsayılan Değerler
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Frequency} Digest
 DocType: Expense Claim,Total Amount Reimbursed,Toplam Tutar Geri ödenen
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,"Bu, bu Araç karşı günlükleri dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın"
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Toplamak
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,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
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Varlık Hareket kaydı {0} oluşturuldu
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Silemezsiniz Mali Yılı {0}. Mali yıl {0} Genel ayarlar varsayılan olarak ayarlanır
 DocType: Journal Entry,Entry Type,Girdi Türü
 ,Customer Credit Balance,Müşteri Kredi Bakiyesi
@@ -1946,7 +1950,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Öğelerin hiçbiri miktar veya değer bir değişiklik var.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Zorunlu alan - Program
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Zorunlu alan - Program
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Garanti Talebi
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Garanti Talebi
 ,Lead Details,Talep Yaratma Detayları
 DocType: Salary Slip,Loan repayment,Kredi geri ödeme
 DocType: Purchase Invoice,End date of current invoice's period,Cari fatura döneminin bitiş tarihi
@@ -1966,14 +1970,12 @@
 DocType: Employee,Permanent Address,Daimi Adres
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Ürün kodu seçiniz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Ürün kodu seçiniz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Ürün kodu seçiniz
 DocType: Student Sibling,Studying in Same Institute,Aynı Enstitüsü incelenmesi
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Territory,Territory Manager,Bölge Müdürü
 DocType: Packed Item,To Warehouse (Optional),Depo (İsteğe bağlı)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Payment Entry,Paid Amount (Company Currency),Ücretli Tutar (Şirket Para)
 DocType: Purchase Invoice,Additional Discount,Ek İndirim
 DocType: Selling Settings,Selling Settings,Satış Ayarları
@@ -1986,9 +1988,9 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Pazarlama Giderleri
 ,Item Shortage Report,Ürün yetersizliği Raporu
 ,Item Shortage Report,Ürün yetersizliği Raporu
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Ağırlık çok ""Ağırlık Ölçü Birimi"" belirtiniz \n, söz edilmektedir"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,Bu stok girdisini yapmak için kullanılan Malzeme Talebi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Sonraki Amortisman Tarihi yeni varlık için zorunludur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Sonraki Amortisman Tarihi yeni varlık için zorunludur
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Her Toplu İş için Ayrılmış Kurs Tabanlı Grup
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Her Toplu İş için Ayrılmış Kurs Tabanlı Grup
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Bir Ürünün tek birimi
@@ -2006,9 +2008,7 @@
 DocType: Course Assessment Criteria,Weightage,Ağırlık
 DocType: Packing Slip,PS-,ps
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Kar/zarar hesabı {2} için Masraf Merkezi tanımlanmalıdır. Lütfen aktif şirket için varsayılan bir Masraf Merkezi tanımlayın.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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/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
@@ -2028,7 +2028,7 @@
 ,Item-wise Sales Register,Ürün bilgisi Satış Kaydı
 DocType: Asset,Gross Purchase Amount,Brüt sipariş tutarı
 DocType: Asset,Depreciation Method,Amortisman Yöntemi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Çevrimdışı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Çevrimdışı
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Bu Vergi Temel Br.Fiyata dahil mi?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Toplam Hedef
 DocType: Program Course,Required,gereklidir
@@ -2040,22 +2040,21 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Çok fazla sütun. Raporu çıkarın ve spreadsheet uygulaması kullanarak yazdırın.
 DocType: Purchase Invoice Item,Batch No,Parti No
 DocType: Purchase Invoice Item,Batch No,Parti No
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},için döviz kurunu bulunamıyor {0} için {1} tuşuna tarih {2}
 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
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 DocType: Student Group Instructor,Student Group Instructor,Öğrenci Grubu Eğitmeni
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobil yok
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ana
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Ana
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Varyant
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ana
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Ana
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Varyant
 DocType: Naming Series,Set prefix for numbering series on your transactions,İşlemlerinizde seri numaralandırma için ön ek ayarlayın
 DocType: Employee Attendance Tool,Employees HTML,"Çalışanlar, HTML"
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,Default BOM ({0}) must be active for this item or its template,Standart BOM ({0}) Bu öğe veya şablon için aktif olmalıdır
 DocType: Employee,Leave Encashed?,İzin Tahsil Edilmiş mi?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,Kimden alanında Fırsat zorunludur
 DocType: Email Digest,Annual Expenses,yıllık giderler
 DocType: Item,Variants,Varyantlar
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Satın Alma Emri verin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Satın Alma Emri verin
 DocType: SMS Center,Send To,Gönder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},İzin tipi{0} için yeterli izin bakiyesi yok
 DocType: Payment Reconciliation Payment,Allocated amount,Ayrılan miktarı
@@ -2065,7 +2064,7 @@
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Stock Reconciliation,Stock Reconciliation,Stok Uzlaşma
 DocType: Territory,Territory Name,Bölge Adı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Devam eden depo işi teslimden önce gereklidir
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,İş için aday
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
 DocType: Purchase Order Item,Warehouse and Reference,Depo ve Referans
@@ -2073,12 +2072,11 @@
 DocType: Item,Serial Nos and Batches,Seri No ve Katlar
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Öğrenci Grubu Gücü
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Öğrenci Grubu Gücü
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Journal Karşı giriş {0} herhangi eşsiz {1} girişi yok
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,Appraisals
 apps/erpnext/erpnext/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
-DocType: Grading Structure,Grading Intervals,Notlandırma aralıkları
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Girin lütfen
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Arka arkaya Item {0} için Overbill olamaz {1} daha {2}. aşırı faturalama sağlamak için, Ayarlar Alış belirlenen lütfen"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Madde veya Depo dayalı filtre ayarlayın
@@ -2091,8 +2089,8 @@
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 DocType: Authorization Control,Authorization Control,Yetki Kontrolü
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Satır # {0}: Depo Reddedildi reddedilen Öğe karşı zorunludur {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Tahsilat
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,siparişlerinizi yönetin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Tahsilat
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,siparişlerinizi yönetin
 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
@@ -2100,9 +2098,10 @@
 DocType: Course,Course Abbreviation,Ders Kısaltma
 DocType: Student Leave Application,Student Leave Application,Öğrenci bırak Uygulaması
 DocType: Item,Will also apply for variants,Ayrıca varyantları için geçerli olacaktır
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Varlık iptal edilemez, hala  {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},"Yarım günde Çalışan {0}, {1}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Toplam çalışma süresi maksimum çalışma saatleri fazla olmamalıdır {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Üzerinde
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Satış zamanı toplam Ürünler.
 DocType: Quotation Item,Actual Qty,Gerçek Adet
 DocType: Sales Invoice Item,References,Kaynaklar
@@ -2113,7 +2112,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Ortak
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Ortak
 DocType: Asset Movement,Asset Movement,Varlık Hareketi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Yeni Sepet
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Yeni Sepet
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Ürün {0} bir seri Ürün değildir
 DocType: SMS Center,Create Receiver List,Alıcı listesi oluşturma
 DocType: Vehicle,Wheels,Tekerlekler
@@ -2148,9 +2147,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Üretim Siparişleri karşı gerçek zamanlı günlükleri oluşturulmasını devre dışı bırakır. Operasyonlar Üretim Emri karşı izlenen edilmeyecektir
 DocType: Student,Student Mobile Number,Öğrenci Cep Numarası
 DocType: Item,Has Variants,Varyasyoları var
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Aylık Dağıtım Adı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Toplu İşlem Kimliği zorunludur
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Toplu İşlem Kimliği zorunludur
 DocType: Sales Person,Parent Sales Person,Ana Satış Elemanı
 DocType: Purchase Invoice,Recurring Invoice,Mükerrer Fatura
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Projeleri yönetme
@@ -2159,11 +2158,11 @@
 DocType: Vehicle Log,Fuel Price,yakıt Fiyatı
 DocType: Budget,Budget,Bütçe
 DocType: Budget,Budget,Bütçe
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Sabit Kıymet Öğe olmayan bir stok kalemi olmalıdır.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Bir gelir ya da gider hesabı değil gibi Bütçe, karşı {0} atanamaz"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Arşivlendi
 DocType: Student Admission,Application Form Route,Başvuru Formu Rota
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Bölge / Müşteri
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Bölge / Müşteri
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,örneğin 5
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,örneğin 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,o ödeme olmadan terk beri Türü {0} tahsis edilemez bırakın
@@ -2189,16 +2188,16 @@
 ,Serial No Status,Seri No Durumu
 DocType: Payment Entry Reference,Outstanding,ödenmemiş
 ,Daily Timesheet Summary,Günlük Zaman Çizelgesi Özeti
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Bu stok hareketi dayanmaktadır. Bkz {0} ayrıntılar için
 DocType: Pricing Rule,Selling,Satış
 DocType: Pricing Rule,Selling,Satış
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},"{0} {1} miktarı, {2}'ye karşılık düşürülecek"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},"{0} {1} miktarı, {2}'ye karşılık düşürülecek"
 DocType: Employee,Salary Information,Maaş Bilgisi
 DocType: Sales Person,Name and Employee ID,İsim ve Çalışan Kimliği
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Bitiş Tarihi gönderim tarihinden önce olamaz
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 DocType: Website Item Group,Website Item Group,Web Sitesi Ürün Grubu
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Harç ve Vergiler
@@ -2211,7 +2210,7 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Kolon numarası bu Ücret tipi için kolon numarasından büyük veya eşit olamaz
 DocType: Asset,Sold,Satıldı
 ,Item-wise Purchase History,Ürün bilgisi Satın Alma Geçmişi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Ürün {0} seri numarası eklemek için 'Program Ekle' ye tıklayınız
 DocType: Account,Frozen,Dondurulmuş
 ,Open Production Orders,Üretim Siparişlerini Aç
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Esas Tutar (Şirket Para Birimi)
@@ -2219,7 +2218,7 @@
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Installation Note,Installation Time,Kurulum Zaman
 DocType: Sales Invoice,Accounting Details,Muhasebe Detayları
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Bu şirket için bütün İşlemleri sil
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Yatırımlar
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Yatırımlar
@@ -2257,15 +2256,15 @@
 DocType: Payment Entry,Transaction ID,İşlem Kimliği
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
 DocType: Employee,Resignation Letter Date,İstifa Mektubu Tarihi
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Fiyatlandırma Kuralları miktara dayalı olarak tekrar filtrelenir.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Lütfen çalışan {0} için Katılma Tarihi&#39;ni ayarlayın.
 DocType: Task,Total Billing Amount (via Time Sheet),Toplam Fatura Tutarı (Zaman Sheet yoluyla)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Tekrar Müşteri Gelir
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) rolü 'Gider onaylayansanız' olmalıdır
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Çift
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Çift
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Üretim için BOM ve Miktar seçin
 DocType: Asset,Depreciation Schedule,Amortisman Programı
 DocType: Bank Reconciliation Detail,Against Account,Hesap karşılığı
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Yarım Gün Tarih Tarihinden ve Tarihi arasında olmalıdır
@@ -2280,10 +2279,10 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Lütfen firma {0} için 'Varlık Değer Kaybı Maliyet Merkezi' tanımlayın
 ,Maintenance Schedules,Bakım Programları
 DocType: Task,Actual End Date (via Time Sheet),Gerçek tamamlanma tarihi (Zaman Tablosu'ndan)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},{0} {1} Miktarları {2} {3}'e karşılık
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},{0} {1} Miktarları {2} {3}'e karşılık
 ,Quotation Trends,Teklif Trendleri
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Ürün {0} içim Ürün alanında Ürün grubu belirtilmemiş
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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ı
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Bekleyen Tutar
@@ -2291,7 +2290,8 @@
 DocType: Purchase Invoice Item,Conversion Factor,Katsayı
 DocType: Purchase Order,Delivered,Teslim Edildi
 ,Vehicle Expenses,araç Giderleri
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
+DocType: Serial No,Invoice Details,Fatura detayları
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},kullanım ömrünün sonunda beklenen değer daha büyük ya da eşit olmalıdır {0}
 DocType: Purchase Receipt,Vehicle Number,Araç Sayısı
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Yinelenen faturanın durdurulacağı tarih
 DocType: Employee Loan,Loan Amount,Kredi miktarı
@@ -2312,12 +2312,12 @@
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: HR Settings,HR Settings,İK Ayarları
 DocType: Salary Slip,net pay info,net ücret bilgisi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Gider Talebi onay bekliyor. Yalnızca Gider yetkilisi durumu güncelleyebilir.
 DocType: Email Digest,New Expenses,yeni giderler
 DocType: Purchase Invoice,Additional Discount Amount,Ek İndirim Tutarı
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Satır # {0}: öğe sabit kıymet olarak Adet, 1 olmalıdır. Birden fazla qty için ayrı bir satır kullanın."
 DocType: Leave Block List Allow,Leave Block List Allow,İzin engel listesi müsaade eder
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Kısaltma boş veya boşluktan oluşamaz
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Sigara Grup Grup
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Spor
@@ -2333,6 +2333,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,Reddedilen Ürün stoklarını muhafaza ettiğiniz depo
 DocType: Production Order,Skip Material Transfer,Malzeme Transferini Atla
 DocType: Production Order,Skip Material Transfer,Malzeme Transferini Atla
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Anahtar tarih {2} için {0} ila {1} arası döviz kuru bulunamadı. Lütfen bir Döviz Değiştirme kaydı el ile oluşturun
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Mali yılınız şu tarihte sona eriyor:
 DocType: POS Profile,Price List,Fiyat listesi
 DocType: POS Profile,Price List,Fiyat listesi
@@ -2351,7 +2352,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Hesap {0} geçersiz. Hesap Para olmalıdır {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Ölçü Birimi Dönüşüm katsayısı satır {0} da gereklidir
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",Satır # {0}: Referans Doküman Türü Satış Sipariş biri Satış Fatura veya günlük girdisi olmalıdır
 DocType: Salary Component,Deduction,Kesinti
 DocType: Salary Component,Deduction,Kesinti
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Satır {0}: From Time ve Zaman için zorunludur.
@@ -2359,12 +2360,12 @@
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Ürün Fiyatı için katma {0} Fiyat Listesi {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Bu satış kişinin Çalışan Kimliği giriniz
 DocType: Territory,Classification of Customers by region,Bölgelere göre Müşteriler sınıflandırılması
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Fark Tutar sıfır olmalıdır
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Fark Tutar sıfır olmalıdır
 DocType: Project,Gross Margin,Brüt Marj
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Önce Üretim Ürününü giriniz
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Hesaplanan Banka Hesap bakiyesi
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,Engelli kullanıcı
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Fiyat Teklifi
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Fiyat Teklifi
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
 DocType: Salary Slip,Total Deduction,Toplam Kesinti
@@ -2375,9 +2376,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 Adresi
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Uyarı: eki Geçersiz SSL sertifikası {0}
 DocType: Student Admission,Eligibility,uygunluk
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","İlanlar iş, tüm kişileri ve daha fazla potansiyel müşteri olarak eklemek yardımcı"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","İlanlar iş, tüm kişileri ve daha fazla potansiyel müşteri olarak eklemek yardımcı"
 DocType: Production Order Operation,Actual Operation Time,Gerçek Çalışma Süresi
 DocType: Authorization Rule,Applicable To (User),(Kullanıcıya) Uygulanabilir
 DocType: Purchase Taxes and Charges,Deduct,Düşmek
@@ -2395,7 +2396,7 @@
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Appraisal,Calculate Total Score,Toplam Puan Hesapla
 DocType: Request for Quotation,Manufacturing Manager,Üretim Müdürü
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Seri No {0} {1} uyarınca garantide
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,İrsaliyeyi ambalajlara böl.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Gönderiler
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Depo {3} için {1} için hesap bakiyesi ({0}) ve stokta değeri ({2}) aynı olmalıdır
@@ -2422,10 +2423,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Not: E-posta engelli kullanıcılara gönderilmeyecektir
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Etkileşim Sayısı
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Etkileşim Sayısı
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Firma Seçin ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Firma Seçin ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Tüm bölümler için kabul ise boş bırakın
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","İstihdam (daimi, sözleşmeli, stajyer vb) Türleri."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} Ürün {1} için zorunludur
 DocType: Process Payroll,Fortnightly,iki haftada bir
 DocType: Currency Exchange,From Currency,Para biriminden
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2436,7 +2437,7 @@
 DocType: Student Guardian,Others,Diğer
 DocType: Student Guardian,Others,Diğer
 DocType: Payment Entry,Unallocated Amount,ayrılmamış Tutar
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Eşleşen bir öğe bulunamıyor. Için {0} diğer bazı değer seçiniz.
 DocType: POS Profile,Taxes and Charges,Vergi ve Harçlar
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Bir Ürün veya satın alınan, satılan veya stokta tutulan bir hizmet."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Artık güncelleme
@@ -2444,7 +2445,7 @@
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Çocuk Ürün Ürün Paketi olmamalıdır. öğeyi kaldırmak `{0}` ve saklayın
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Bankacılık
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Timesheets ekle
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Zaman Çizelgesi ekle
 DocType: Vehicle Service,Service Item,servis Öğe
 DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
 DocType: Bank Guarantee,Bank Guarantee,Banka garantisi
@@ -2470,6 +2471,7 @@
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 DocType: Quotation Item,Stock Balance,Stok Bakiye
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Ödeme Satış Sipariş
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Lütfen Kurulum&gt; Ayarlar&gt; Adlandırma Serisi aracılığıyla {0} için Naming Series&#39;i ayarlayın.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Gideri Talebi Detayı
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Doğru hesabı seçin
@@ -2497,14 +2499,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Fiyat Listesi ayarlı değilse fiyatları gösterilmeyecektir
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Bu Nakliye Kural için bir ülke belirtin ya da Dünya Denizcilik&#39;in kontrol edin
 DocType: Stock Entry,Total Incoming Value,Toplam Gelen Değeri
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Bankamatik To gereklidir
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Bankamatik To gereklidir
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Zaman çizelgeleri ekip tarafından yapılan aktiviteler için zaman, maliyet ve fatura izlemenize yardımcı"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Satınalma Fiyat Listesi
 DocType: Offer Letter Term,Offer Term,Teklif Dönem
 DocType: Quality Inspection,Quality Manager,Kalite Müdürü
 DocType: Job Applicant,Job Opening,İş Açılışı
 DocType: Payment Reconciliation,Payment Reconciliation,Ödeme Mutabakat
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Sorumlu kişinin adını seçiniz
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Teknoloji
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Toplam Ödenmemiş: {0}
@@ -2537,25 +2539,25 @@
 DocType: Opportunity,Lost Reason,Kayıp Nedeni
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Yeni Adres
 DocType: Quality Inspection,Sample Size,Numune Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Makbuz Belge giriniz
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Bütün Ürünler zaten faturalandırılmıştır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Makbuz Belge giriniz
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Daha fazla masraf Gruplar altında yapılabilir, ancak girişleri olmayan Gruplar karşı yapılabilir"
 DocType: Project,External,Harici
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Kullanıcılar ve İzinler
 DocType: Vehicle Log,VLOG.,VLOG.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Üretim Siparişleri düzenlendi: {0}
 DocType: Branch,Branch,Şube
 DocType: Guardian,Mobile Number,Cep numarası
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Baskı ve Markalaşma
 DocType: Bin,Actual Quantity,Gerçek Miktar
 DocType: Shipping Rule,example: Next Day Shipping,Örnek: Bir sonraki gün sevkiyat
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Bulunamadı Seri No {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Bulunamadı Seri No {0}
 DocType: Scheduling Tool,Student Batch,Öğrenci Toplu
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Müşterileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Müşterileriniz
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Öğrenci olun
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Öğrenci olun
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz
 DocType: Leave Block List Date,Block Date,Blok Tarih
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Şimdi Başvur
@@ -2582,8 +2584,9 @@
 DocType: SMS Log,Sent To,Gönderildiği Kişi
 DocType: Payment Request,Make Sales Invoice,Satış Faturası Oluştur
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Yazılımlar
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Sonraki İletişim Tarih geçmişte olamaz
 DocType: Company,For Reference Only.,Başvuru için sadece.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Toplu İş Numarayı Seç
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Geçersiz {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-ret
 DocType: Sales Invoice Advance,Advance Amount,Avans miktarı
@@ -2600,8 +2603,8 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Durum No 0 olamaz
 DocType: Item,Show a slideshow at the top of the page,Sayfanın üstünde bir slayt gösterisi göster
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOM&#39;ları
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Mağazalar
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Mağazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Mağazalar
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Mağazalar
 DocType: Serial No,Delivery Time,İrsaliye Zamanı
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Yaşlanma Temeli
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Dayalı Yaşlanma
@@ -2616,12 +2619,12 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Güncelleme Maliyeti
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Güncelleme Maliyeti
 DocType: Item Reorder,Item Reorder,Ürün Yeniden Sipariş
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Göster Maaş Kayma
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Transfer Malzemesi
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Göster Maaş Kayma
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Bu belge ile sınırı üzerinde {0} {1} öğe için {4}. yapıyoruz aynı karşı başka {3} {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Seç değişim miktarı hesabı
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,kaydettikten sonra yinelenen ayarlayın
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Seç değişim miktarı hesabı
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Purchase Invoice,Price List Currency,Fiyat Listesi Para Birimi
 DocType: Naming Series,User must always select,Kullanıcı her zaman seçmelidir
@@ -2635,7 +2638,7 @@
 DocType: Budget Account,Budget Account,Bütçe Hesabı
 DocType: Quality Inspection,Verified By,Onaylayan Kişi
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Mevcut işlemler olduğundan, şirketin varsayılan para birimini değiştiremezsiniz. İşlemler Varsayılan para birimini değiştirmek için iptal edilmelidir."
-DocType: Grade Interval,Grade Description,sınıf Açıklama
+DocType: Grading Scale Interval,Grade Description,sınıf Açıklama
 DocType: Stock Entry,Purchase Receipt No,Satın alma makbuzu numarası
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Kaparo
@@ -2678,8 +2681,8 @@
 DocType: Upload Attendance,Attendance To Date,Tarihine kadar katılım
 DocType: Warranty Claim,Raised By,Talep eden
 DocType: Payment Gateway Account,Payment Account,Ödeme Hesabı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Devam etmek için Firma belirtin
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Devam etmek için Firma belirtin
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,Devam etmek için Firma belirtin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Alacak Hesapları Net Değişim
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Telafi İzni
 DocType: Offer Letter,Accepted,Onaylanmış
@@ -2689,12 +2692,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,Bu şirkete ait bütün işlemleri silmek istediğinizden emin olun. Ana veriler olduğu gibi kalacaktır. Bu işlem geri alınamaz.
 DocType: Room,Room Number,Oda numarası
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Geçersiz referans {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{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}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) planlanan quanitity daha büyük olamaz ({2}) Üretim Sipariş {3}
 DocType: Shipping Rule,Shipping Rule Label,Kargo Kural Etiketi
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,kullanıcı Forumu
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Hammaddeler boş olamaz.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Hızlı Kayıt Girdisi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Stok güncelleme olamazdı, fatura damla nakliye öğe içeriyor."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Hızlı Kayıt Girdisi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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
@@ -2708,7 +2711,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Şartlar ve Koşullar 1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Enstitünün adı kendisi için bu sistemi kuruyoruz.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Muhasebe entry bu tarihe kadar dondurulmuş, kimse / aşağıda belirtilen rolü dışında girdisini değiştirin yapabilirsiniz."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Bakım programı oluşturmadan önce belgeyi kaydedin
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Proje Durumu
 DocType: UOM,Check this to disallow fractions. (for Nos),Kesirlere izin vermemek için işaretleyin (Numaralar için)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Aşağıdaki Üretim Siparişleri yaratıldı:
@@ -2739,7 +2742,7 @@
 ,Employees working on a holiday,tatil çalışanlar
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Mevcut İşaretle
 DocType: Project,% Complete Method,% Tamamlandı Yöntem
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Seri No {0} için bakım başlangıç tarihi teslim tarihinden önce olamaz
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: Production Order,Actual End Date,Fiili Bitiş Tarihi
 DocType: BOM,Operating Cost (Company Currency),İşletme Maliyeti (Şirket Para Birimi)
@@ -2760,7 +2763,7 @@
 DocType: Campaign,Campaign-.####,Kampanya-.####
 DocType: Campaign,Campaign-.####,Kampanya-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Sonraki adımlar
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Lütfen belirtilen ürünleri mümkün olan en rekabetçi fiyatlarla sununuz
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 gün sonra otomatik yakın Fırsat
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,bitiş yılı
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Tırnak / Kurşun%
@@ -2818,7 +2821,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Alınan Miktar
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Ücret Kayıtları düzenlendi - {0}
 DocType: Asset Category Account,Asset Category Account,Varlık Tipi Hesabı
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Satış Sipariş Miktarı {1} den fazla Ürün {0} üretilemez
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,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 +539,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ı
@@ -2845,7 +2848,8 @@
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Üretim
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Üretim
 DocType: Guardian,Occupation,Meslek
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Satır {0}: Başlangıç tarihi bitiş tarihinden önce olmalıdır
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Toplam (Adet)
 DocType: Sales Invoice,This Document,Bu belge
 DocType: Installation Note Item,Installed Qty,Kurulan Miktar
@@ -2864,7 +2868,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Yardımcı Giderleri
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90 üzerinde
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Satır # {0}: günlük girdisi {1} hesabı yok {2} ya da zaten başka bir çeki karşı eşleşti
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Buying Settings,Default Buying Price List,Standart Alış Fiyat Listesi
 DocType: Process Payroll,Salary Slip Based on Timesheet,Çizelgesi dayanarak maaş Kayma
@@ -2873,8 +2877,8 @@
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Şirket, Para Birimi, Mali yıl vb gibi standart değerleri ayarlayın"
 DocType: Payment Entry,Payment Type,Ödeme Şekli
 DocType: Payment Entry,Payment Type,Ödeme Şekli
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Lütfen {0} Öğe için bir Toplu İşareti seçin. Bu gereksinimi karşılayan tek bir toplu bulunamadı
 DocType: Process Payroll,Select Employees,Seçin Çalışanlar
 DocType: Opportunity,Potential Sales Deal,Potansiyel Satış Fırsat
 DocType: Payment Entry,Cheque/Reference Date,Çek / Referans Tarihi
@@ -2893,7 +2897,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Zaten şirket için oluşturulan küresel POS Profili {0} {1}
 DocType: Purchase Order,Ref SQ,Ref SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Bütün BOMlarla Ürün/BOM değiştir
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Makbuz belge teslim edilmelidir
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Makbuz belge teslim edilmelidir
 DocType: Purchase Invoice Item,Received Qty,Alınan Miktar
 DocType: Purchase Invoice Item,Received Qty,Alınan Miktar
 DocType: Stock Entry Detail,Serial No / Batch,Seri No / Parti
@@ -2903,11 +2907,11 @@
 DocType: Delivery Note,DN-RET-,DN-ret
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Hiçbir zaman çarşaf
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} carry-iletilmesine olamaz Type bırakın
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Bakım Programı bütün Ürünler için oluşturulmamıştır. Lütfen 'Program Oluştura' tıklayın
 ,To Produce,Üretilecek
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bordro
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Satırdaki {0} içinde {1}. Ürün fiyatına {2} eklemek için, satır {3} de dahil edilmelidir"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Kullanıcı Yap
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Kullanıcı Yap
 DocType: Packing Slip,Identification of the package for the delivery (for print),(Baskı için) teslimat için ambalajın tanımlanması
 DocType: Bin,Reserved Quantity,Ayrılan Miktar
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Lütfen geçerli e-posta adresini girin
@@ -2922,16 +2926,17 @@
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Account,Income Account,Gelir Hesabı
 DocType: Payment Request,Amount in customer's currency,Müşterinin para miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,İrsaliye
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,İrsaliye
 DocType: Stock Reconciliation Item,Current Qty,Güncel Adet
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Maliyetlendirme Bölümünde ""Dayalı Ürünler Br.Fiyatına"" bakınız"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Önceki
 DocType: Appraisal Goal,Key Responsibility Area,Kilit Sorumluluk Alanı
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Öğrenci Partileri Eğer öğrenciler için katılım, değerlendirme ve ücretler izlemenize yardımcı"
 DocType: Payment Entry,Total Allocated Amount,Toplam Ayrılan Tutar
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 DocType: Item Reorder,Material Request Type,Malzeme İstek Türü
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},{0} olarak maaş Accural günlük girdisi {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",YerelDepolama dolu kurtarmadı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",YerelDepolama dolu kurtarmadı
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Satır {0}: Ölçü Birimi Dönüşüm Faktörü zorunludur
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Ref
@@ -2943,19 +2948,19 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Satış İşlemler gelen Müşterinin Vergi Kimliği gizleme
 DocType: Upload Attendance,Upload HTML,HTML Yükle
 DocType: Employee,Relieving Date,Ayrılma Tarihi
-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.",Fiyatlandırma Kuralı Fiyat Listesini/belirtilen indirim yüzdesini belli kriterlere dayalı olarak geçersiz kılmak için yapılmıştır.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Fiyatlandırma Kuralı Fiyat Listesini/belirtilen indirim yüzdesini belli kriterlere dayalı olarak geçersiz kılmak için yapılmıştır.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Depo yalnızca Stok Girdisi / İrsaliye / Satın Alım Makbuzu üzerinden değiştirilebilir
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
 DocType: Employee Education,Class / Percentage,Sınıf / Yüzde
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Satış ve Pazarlama Müdürü
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Gelir vergisi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Gelir vergisi
-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çilen Fiyatlandırma Kural 'Fiyat' için yapılırsa, bu fiyat listesi üzerine yazılır. Fiyatlandırma Kural fiyat nihai fiyat, bu yüzden başka indirim uygulanmalıdır. Dolayısıyla, vb Satış Siparişi, Satınalma Siparişi gibi işlemlerde, oldukça 'Fiyat Listesi Oranı' alanına daha, 'Oranı' alanına getirilen edilecektir."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Seçilen Fiyatlandırma Kural 'Fiyat' için yapılırsa, bu fiyat listesi üzerine yazılır. Fiyatlandırma Kural fiyat nihai fiyat, bu yüzden başka indirim uygulanmalıdır. Dolayısıyla, vb Satış Siparişi, Satınalma Siparişi gibi işlemlerde, oldukça 'Fiyat Listesi Oranı' alanına daha, 'Oranı' alanına getirilen edilecektir."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Sanayi Tipine Göre izleme talebi.
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
 DocType: Item Supplier,Item Supplier,Ürün Tedarikçisi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Toplu almak için Ürün Kodu girin
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} - {1} teklifi için bir değer seçiniz
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Tüm adresler.
 DocType: Company,Stock Settings,Stok Ayarları
@@ -2967,6 +2972,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',durumu ile çalışanlara etkinlikle ilgili bir e-posta göndereceğiz &#39;Aç&#39;
 DocType: Task,Depends on Tasks,Görevler bağlıdır
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Müşteri Grupbu Ağacını Yönetin.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Ekler alışveriş sepetini etkinleştirmeden gösterilebilir
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Yeni Maliyet Merkezi Adı
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Yeni Maliyet Merkezi Adı
@@ -2980,12 +2986,10 @@
 DocType: Sales Invoice,Debit To,Borç
 DocType: Delivery Note,Required only for sample item.,Sadece örnek Ürün için gereklidir.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,İşlem sonrası gerçek Adet
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Tedarikçi&gt; Tedarikçi Türü
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},arasında bulunamadı maaş kayma {0} ve {1}
 ,Pending SO Items For Purchase Request,Satın Alma Talebi bekleyen PO Ürünleri
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Öğrenci Kabulleri
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} devre dışı
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} devre dışı
 DocType: Supplier,Billing Currency,Fatura Döviz
 DocType: Sales Invoice,SINV-RET-,SINV-ret
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Ekstra Büyük
@@ -3006,10 +3010,10 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Anasayfa Özel Ürün
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Bütün Değerlendirme Grupları
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Yeni Depo Adı
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Toplam {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Toplam {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Bölge
 DocType: C-Form Invoice Detail,Territory,Bölge
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Lütfen gerekli ziyaretlerin sayısını belirtin
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Stock Settings,Default Valuation Method,Standart Değerleme Yöntemi
 DocType: Vehicle Log,Fuel Qty,yakıt Adet
@@ -3027,7 +3031,7 @@
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Ayarlamak ve hedefleri izleyebilirsiniz böylece tüm satış işlemleri birden ** Satış Kişilerin ** karşı etiketlenmiş olabilir.
 ,S.O. No.,Satış Emri No
 ,S.O. No.,Satış Emri No
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Lütfen alan {0}'dan Müşteri oluşturunuz
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,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/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Sadece sunulabilir &#39;Reddedildi&#39; &#39;Onaylandı&#39; ve statülü Uygulamaları bırakın
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Öğrenci Grubu Adı satırda zorunludur {0}
@@ -3071,7 +3075,7 @@
 DocType: Project,Copied From,Kopyalanacak
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Adı hatası: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Kıtlık
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} şunlarla ilintili değil: {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} şunlarla ilintili değil: {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Çalışan {0} için devam zaten işaretlenmiştir
 DocType: Packing Slip,If more than one package of the same type (for print),(Baskı için) aynı ambalajdan birden fazla varsa
 ,Salary Register,Maaş Kayıt
@@ -3091,7 +3095,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Alışveriş Sepeti kullanın
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Değer {0} özniteliği için {1} Öğe için Özellik Değerleri geçerli Öğe listesinde bulunmayan {2}
 DocType: BOM Item,Scrap %,Hurda %
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Masraflar orantılı seçiminize göre, madde qty veya miktarına göre dağıtılmış olacak"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Masraflar orantılı seçiminize göre, madde qty veya miktarına göre dağıtılmış olacak"
 DocType: Maintenance Visit,Purposes,Amaçları
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,En az bir öğe dönüş belgesinde negatif miktar ile girilmelidir
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Çalışma {0} iş istasyonunda herhangi bir mevcut çalışma saatleri daha uzun {1}, birden operasyonlarına operasyon yıkmak"
@@ -3115,17 +3119,17 @@
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Sales Invoice,Satış Faturası
 DocType: Journal Entry Account,Party Balance,Parti Dengesi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,İndirim Açık Uygula seçiniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,İndirim Açık Uygula seçiniz
 DocType: Company,Default Receivable Account,Standart Alacak Hesabı
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,Yukarıda seçilen kriterler için ödenen toplam maaş için banka girdisi oluşturun
 DocType: Stock Entry,Material Transfer for Manufacture,Üretim için Materyal Transfer
-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.,İndirim Yüzdesi bir Fiyat listesine veya bütün fiyat listelerine karşı uygulanabilir.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,İndirim Yüzdesi bir Fiyat listesine veya bütün fiyat listelerine karşı uygulanabilir.
 DocType: Purchase Invoice,Half-yearly,Yarı Yıllık
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Stokta Muhasebe Giriş
 DocType: Vehicle Service,Engine Oil,Motor yağı
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
 DocType: Sales Invoice,Sales Team1,Satış Ekibi1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Ürün {0} yoktur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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: Employee Loan,Loan Details,kredi Detayları
@@ -3135,28 +3139,28 @@
 DocType: Account,Root Type,Kök Tipi
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Satır # {0}: daha geri olamaz {1} Öğe için {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Konu
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Konu
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Konu
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Konu
 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
 DocType: Cheque Print Template,Primary Settings,İlköğretim Ayarlar
 DocType: Purchase Invoice,Select Supplier Address,Seç Tedarikçi Adresi
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Çalışan ekle
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Çalışan ekle
 DocType: Purchase Invoice Item,Quality Inspection,Kalite Kontrol
 DocType: Purchase Invoice Item,Quality Inspection,Kalite Kontrol
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Extra Small
 DocType: Company,Standard Template,standart Şablon
 DocType: Training Event,Theory,teori
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,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 +761,Warning: Material Requested Qty is less than Minimum Order Qty,Uyarı: İstenen Ürün Miktarı Minimum Sipariş Miktarından az
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} dondurulmuş
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Hesap {0} donduruldu
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Örgüte ait Hesap ayrı Planı Tüzel Kişilik / Yardımcı.
 DocType: Payment Request,Mute Email,Sessiz E-posta
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Gıda, İçecek ve Tütün"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Sadece karşı ödeme yapabilirsiniz faturalanmamış {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Komisyon oranı 100'den fazla olamaz
 DocType: Stock Entry,Subcontract,Alt sözleşme
 DocType: Stock Entry,Subcontract,Alt sözleşme
@@ -3202,7 +3206,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Mevcut işlem ile depolar grubuna dönüştürülemez.
 DocType: Assessment Result Tool,Result HTML,Sonuç HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Tarihinde sona eriyor
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Öğrenciler ekle
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Öğrenci ekle
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Lütfen  {0} seçiniz
 DocType: C-Form,C-Form No,C-Form No
 DocType: C-Form,C-Form No,C-Form No
@@ -3252,7 +3256,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Sorgu kaynağı kampanya ise kampanya adı girin
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Gazete Yayıncıları
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Mali Yıl Seçin
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Mali Yıl Seçin
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Yeniden Sipariş Seviyesi
 DocType: Company,Chart Of Accounts Template,Hesaplar Şablon Grafik
 DocType: Attendance,Attendance Date,Katılım Tarihi
@@ -3272,8 +3276,8 @@
 DocType: Program Enrollment Tool,Get Students,Öğrenciler alın
 DocType: Serial No,Under Warranty,Garanti Altında
 DocType: Serial No,Under Warranty,Garanti Altında
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Hata]
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Hata]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Hata]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,Satış emrini kaydettiğinizde görünür olacaktır.
 ,Employee Birthday,Çalışan Doğum Günü
 ,Employee Birthday,Çalışan Doğum Günü
@@ -3282,7 +3286,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Girişim Sermayesi
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Bu &#39;Akademik Yılı&#39; ile akademik bir terim {0} ve &#39;Vadeli Adı&#39; {1} zaten var. Bu girişleri değiştirmek ve tekrar deneyin.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","öğe {0} karşı varolan işlemler vardır gibi, değerini değiştiremezsiniz {1}"
 DocType: UOM,Must be Whole Number,Tam Numara olmalı
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Tahsis Edilen Yeni İzinler (Günler)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Seri No {0} yok
@@ -3305,7 +3309,7 @@
 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 +49,Period Closing Entry,Dönem Kapanış Girişi
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Maliyet Merkezi mevcut işlemlere gruba dönüştürülemez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Miktar {0} {1} {2} {3}
 DocType: Account,Depreciation,Amortisman
 DocType: Account,Depreciation,Amortisman
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Tedarikçi (ler)
@@ -3330,7 +3334,7 @@
 DocType: Supplier,Last Day of the Next Month,Sonraki Ay Son Gün
 DocType: Support Settings,Auto close Issue after 7 days,7 gün sonra otomatik yakın Sayı
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Önce tahsis edilemez bırakın {0}, izin dengesi zaten carry iletilen gelecek izin tahsisi kayıtlarında olduğu gibi {1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Not: nedeniyle / Referans Tarihi {0} gün izin müşteri kredi günü aştığı (ler)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,Öğrenci Başvuru
 DocType: Asset Category Account,Accumulated Depreciation Account,Birikmiş Amortisman Hesabı
 DocType: Stock Settings,Freeze Stock Entries,Donmuş Stok Girdileri
@@ -3341,7 +3345,7 @@
 ,Stock Analytics,Stok Analizi
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Operasyon boş bırakılamaz
 DocType: Maintenance Visit Purpose,Against Document Detail No,Belge Detay No Karşılığı
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Parti Tipi zorunludur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Parti Tipi zorunludur
 DocType: Quality Inspection,Outgoing,Giden
 DocType: Quality Inspection,Outgoing,Giden
 DocType: Material Request,Requested For,Için talep
@@ -3363,10 +3367,10 @@
 DocType: Production Planning Tool,Create Production Orders,Üretim Emirleri Oluştur
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
 DocType: Serial No,Warranty / AMC Details,Garanti / AMC Detayları
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Etkinliğe Dayalı Grup için öğrencileri manuel olarak seçin
 DocType: Journal Entry,User Remark,Kullanıcı Açıklaması
 DocType: Lead,Market Segment,Pazar Segmenti
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},"Ödenen tutar, toplam negatif ödenmemiş miktardan daha fazla olamaz {0}"
 DocType: Employee Internal Work History,Employee Internal Work History,Çalışan Dahili İş Geçmişi
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Kapanış (Dr)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Kapanış (Dr)
@@ -3383,7 +3387,7 @@
 DocType: Production Planning Tool,Create Material Requests,Malzeme İstekleri Oluştur
 DocType: Employee Education,School/University,Okul / Üniversite
 DocType: Payment Request,Reference Details,Referans Detayları
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,"Kullanım süresi sonunda beklenen değer, brüt alım maliyetinden düşük olmalıdır"
 DocType: Sales Invoice Item,Available Qty at Warehouse,Depoda mevcut miktar
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Faturalı Tutar
 DocType: Asset,Double Declining Balance,Çift Azalan Bakiye
@@ -3406,20 +3410,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Bu Stok Uzlaşma bir Açılış Giriş olduğundan fark Hesabı, bir Aktif / Pasif tipi hesabı olmalıdır"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Bir Kullanım Tutarı Kredi Miktarı daha büyük olamaz {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Ürüni {0} için Satınalma Siparişi numarası gerekli
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Üretim Sipariş oluşturulmadı
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Üretim Sipariş oluşturulmadı
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Tarihten itibaren ' Tarihine Kadar' dan sonra olmalıdır
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},öğrenci olarak durumunu değiştirmek olamaz {0} öğrenci uygulaması ile bağlantılı {1}
 DocType: Asset,Fully Depreciated,Değer kaybı tamamlanmış
 ,Stock Projected Qty,Öngörülen Stok Miktarı
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Müşteri {0} projeye ait değil {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,İşaretlenmiş Devamlılık HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Alıntılar, müşterilerinize gönderilen adres teklifler önerileri şunlardır"
 DocType: Sales Order,Customer's Purchase Order,Müşterinin Sipariş
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Seri No ve Toplu
 DocType: Warranty Claim,From Company,Şirketten
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Değerlendirme Kriterleri Puanlarının Toplamı {0} olması gerekir.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Değer veya Miktar
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Amortisman Sayısı rezervasyonu ayarlayın
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Değer veya Miktar
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Productions Siparişler için yükseltilmiş olamaz:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Dakika
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Dakika
@@ -3434,7 +3438,7 @@
 DocType: Sales Partner,Retailer,Perakendeci
 DocType: Sales Partner,Retailer,Perakendeci
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Bütün Tedarikçi Tipleri
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Bütün Tedarikçi Tipleri
 DocType: Global Defaults,Disable In Words,Words devre dışı bırak
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Teklif {0} {1} türünde
@@ -3444,6 +3448,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Banka Kredili Mevduat Hesabı
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Maaş Makbuzu Oluştur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,"Sıra # {0}: Tahsis Edilen Miktar, ödenmemiş tutardan büyük olamaz."
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,BOM Araştır
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Teminatlı Krediler
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Teminatlı Krediler
@@ -3488,7 +3493,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},{0} dan eski stok işlemlerini güncellemeye izin yok
 DocType: Purchase Invoice Item,PR Detail,PR Detayı
 DocType: Sales Order,Fully Billed,Tam Faturalı
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},çalışanın varsayılan ödenecek hesap ayarlayın {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Eldeki Nakit
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Teslim depo stok kalemi için gerekli {0}
 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)
@@ -3499,7 +3503,7 @@
 DocType: Student Group,Group Based On,Ona Dayalı Grup
 DocType: Journal Entry,Bill Date,Fatura tarihi
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Servis Öğe, Tür, frekans ve harcama miktarı gereklidir"
-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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Eğer yüksek öncelikli birden çok Fiyatlandırma Kuralı varsa, şu iç öncelikler geçerli olacaktır."
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Gerçekten {0} için tüm Maaş Kayma Gönder istiyor musunuz {1}
 DocType: Cheque Print Template,Cheque Height,Çek Yükseklik
 DocType: Supplier,Supplier Details,Tedarikçi Ayrıntıları
@@ -3513,8 +3517,8 @@
 DocType: Vehicle Log,Invoice Ref,fatura Ref
 DocType: Purchase Order,Recurring Order,Tekrarlayan Sipariş
 DocType: Company,Default Income Account,Standart Gelir Hesabı
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Müşteri Grup / Müşteri
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Müşteri Grup / Müşteri
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Müşteri Grup / Müşteri
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Kapanmamış Mali Yıl Kâr / Zarar (Kredi)
 DocType: Sales Invoice,Time Sheets,Zaman Levhalar
 DocType: Payment Gateway Account,Default Payment Request Message,Standart Ödeme Talebi Mesajı
@@ -3537,10 +3541,10 @@
 DocType: Employee Loan,Employee Loan Application,Çalışan Kredi Başvurusu
 DocType: Issue,Opening Date,Açılış Tarihi
 DocType: Issue,Opening Date,Açılış Tarihi
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Mevcudiyet başarıyla işaretlendi
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Mevcudiyet başarıyla işaretlendi
 DocType: Journal Entry,Remark,Dikkat
 DocType: Purchase Receipt Item,Rate and Amount,Oran ve Miktar
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},{0} için hesap türü {1} olmalı
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},{0} için hesap türü {1} olmalı
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Yapraklar ve Tatil
 DocType: School Settings,Current Academic Term,Mevcut Akademik Dönem
 DocType: School Settings,Current Academic Term,Mevcut Akademik Dönem
@@ -3564,7 +3568,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Öğrenci Grubu
 DocType: Shopping Cart Settings,Quotation Series,Teklif Serisi
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Bir Ürün aynı isimle bulunuyorsa ({0}), lütfen madde grubunun veya maddenin adını değiştirin"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,müşteri seçiniz
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,müşteri seçiniz
 DocType: C-Form,I,ben
 DocType: Company,Asset Depreciation Cost Center,Varlık Değer Kaybı Maliyet Merkezi
 DocType: Sales Order Item,Sales Order Date,Satış Sipariş Tarihi
@@ -3585,20 +3589,20 @@
 DocType: Vehicle,Insurance Details,Sigorta Detayları
 DocType: Account,Payable,Borç
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Geri Ödeme Süreleri giriniz
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Borçlular ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Borçlular ({0})
 DocType: Pricing Rule,Margin,Kar Marjı
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Yeni Müşteriler
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Brüt Kazanç%
 DocType: Appraisal Goal,Weightage (%),Ağırlık (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Gümrükleme Tarih
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Brüt sipariş tutarı zorunludur
 DocType: Lead,Address Desc,Azalan Adres
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Parti zorunludur
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Parti zorunludur
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Konu Adı
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Satış veya Alıştan en az biri seçilmelidir
-DocType: Grading Structure,Grade Intervals,sınıf aralıkları
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,işinizin doğası seçin.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Satır # {0}: Referanslarda çoğaltılmış girdi {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Üretim operasyonları nerede yapılmaktadır.
 DocType: Asset Movement,Source Warehouse,Kaynak Depo
 DocType: Asset Movement,Source Warehouse,Kaynak Depo
@@ -3641,7 +3645,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Baskı şablonları için antetli kağıtlar
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Baskı Şablonları için başlıklar, örneğin Proforma Fatura"
 DocType: Student Guardian,Student Guardian,Öğrenci Guardian
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Değerleme tipi ücretleri dahil olarak işaretlenmiş olamaz
 DocType: POS Profile,Update Stock,Stok güncelle
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,Ürünler için farklı Ölçü Birimi yanlış (Toplam) net ağırlıklı değere yol açacaktır. Net ağırlıklı değerin aynı olduğundan emin olun.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Oranı
@@ -3670,11 +3674,11 @@
 DocType: Company,Exchange Gain / Loss Account,Değişim Kâr / Zarar Hesabı
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Çalışan ve Seyirci
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Amaç şunlardan biri olmalıdır: {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Formu doldurun ve kaydedin
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Gerçek adet
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Gerçek adet
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stokdaki gerçek adet
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Stoktaki Gerçek adet
 DocType: Homepage,"URL for ""All Products""",&quot;Tüm Ürünler&quot; URL
 DocType: Leave Application,Leave Balance Before Application,Uygulamadan Önce Kalan İzin
 DocType: SMS Center,Send SMS,SMS Gönder
@@ -3687,7 +3691,7 @@
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Güncel İş Olanakları
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
 DocType: Company,Stock Adjustment Account,Stok Düzeltme Hesabı
-DocType: Journal Entry,Write Off,Silmek
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Silmek
 DocType: Timesheet Detail,Operation ID,Operasyon Kimliği
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Sistem kullanıcı (giriş) kimliği, bütün İK formları için varsayılan olacaktır"
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: gönderen {1}
@@ -3698,28 +3702,29 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Tedarikçi Müşteriye teslim
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) stokta yok
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Sonraki Tarih Gönderme Tarihi daha büyük olmalıdır
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Göster vergi break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Göster vergi break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Due / Referans Tarihi sonra olamaz {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,İçeri/Dışarı Aktar
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","Stok girişleri dolayısıyla yeniden atamak veya değiştiremez, {0} Warehouse karşı mevcut"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Hiçbir öğrenci Bulundu
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Hiçbir öğrenci Bulundu
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Fatura Gönderme Tarihi
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Satmak
 DocType: Sales Invoice,Rounded Total,Yuvarlanmış Toplam
 DocType: Product Bundle,List items that form the package.,Ambalajı oluşturan Ürünleri listeleyin
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Yüzde Tahsisi % 100'e eşit olmalıdır
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Partiyi seçmeden önce Gönderme Tarihi seçiniz
 DocType: Program Enrollment,School House,Okul Evi
 DocType: Serial No,Out of AMC,Çıkış AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Lütfen Teklifler&#39;i seçin
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Lütfen Teklifler&#39;i seçin
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Bakım Ziyareti Yapın
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Lütfen Teklifler&#39;i seçin
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Rezervasyon amortismanları sayısı amortismanlar Toplam Sayısı fazla olamaz
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Bakım Ziyareti Yapın
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Satış Usta Müdürü {0} role sahip kullanıcıya irtibata geçiniz
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 DocType: Company,Default Cash Account,Standart Kasa Hesabı
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Şirket (değil Müşteri veya alanı) usta.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,"Bu, bu Öğrencinin katılımıyla dayanmaktadır"
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Içinde öğrenci yok
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Daha fazla ürün ekle veya Tam formu aç
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date','Beklenen Teslim Tarihi' girin
@@ -3754,6 +3759,7 @@
 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: Warranty Claim,Item and Warranty Details,Ürün ve Garanti Detayları
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Ürün Kodu&gt; Ürün Grubu&gt; Marka
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 DocType: Sales Team,Contribution (%),Katkı Payı (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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"
@@ -3771,9 +3777,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Uzlaşma önce
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Şu kişiye {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Eklenen Vergi ve Harçlar (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Ürün Vergi Satırı {0} Vergi Gelir Gider veya Ödenebilir türde hesabı olmalıdır.
 DocType: Sales Order,Partly Billed,Kısmen Faturalandı
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Öğe {0} Sabit Kıymet Öğe olmalı
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Öğe {0} Sabit Kıymet Öğe olmalı
 DocType: Item,Default BOM,Standart BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,Re-tipi şirket ismi onaylamak için lütfen
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Toplam Alacakların Tutarı
@@ -3784,8 +3790,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Otomotiv
 DocType: Vehicle,Insurance Company,Sigorta şirketi
 DocType: Asset Category Account,Fixed Asset Account,Sabit Varlık Hesabı
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,Değişken
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,İrsaliyeden
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,Değişken
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,İrsaliyeden
 DocType: Student,Student Email Address,Öğrenci E-Posta Adresi
 DocType: Timesheet Detail,From Time,Zamandan
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Stokta var:
@@ -3800,13 +3806,13 @@
 DocType: Purchase Invoice Item,Rate,Birim Fiyat
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Stajyer
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Adres adı
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Adres Adı
 DocType: Stock Entry,From BOM,BOM Gönderen
 DocType: Assessment Code,Assessment Code,Değerlendirme Kodu
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Temel
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Temel
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} dan önceki stok işlemleri dondurulmuştur
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule','Takvim Oluştura' tıklayınız
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","Örneğin Kg, Birimi, No, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Referans Tarihi girdiyseniz Referans No zorunludur
 DocType: Bank Reconciliation Detail,Payment Document,Ödeme Belgesi
@@ -3817,22 +3823,22 @@
 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 +790,Issue Material,Sayı Malzeme
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı moddasınız. Bağlantıyı sağlayıncaya kadar yenileneme yapamayacaksınız.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Çevrimdışı moddasınız. Bağlantıyı sağlayıncaya kadar yenileneme yapamayacaksınız.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Hiçbir Öğrenci Grupları oluşturuldu.
 DocType: Purchase Invoice Item,Serial No,Seri No
 DocType: Purchase Invoice Item,Serial No,Seri No
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Aylık Geri Ödeme Tutarı Kredi Miktarı daha büyük olamaz
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,Lütfen ilk önce Bakım Detayını girin
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Lütfen ilk önce Bakım Detayını girin
 DocType: Purchase Invoice,Print Language,baskı Dili
 DocType: Salary Slip,Total Working Hours,Toplam Çalışma Saatleri
 DocType: Stock Entry,Including items for sub assemblies,Alt montajlar için öğeleri içeren
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Enter değeri pozitif olmalıdır
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Enter değeri pozitif olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Bütün Bölgeler
 DocType: Purchase Invoice,Items,Ürünler
 DocType: Purchase Invoice,Items,Ürünler
@@ -3855,18 +3861,16 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Variant için Ölçü Varsayılan Birim &#39;{0}&#39; Şablon aynı olmalıdır &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tabanlı hesaplayın
 DocType: Delivery Note Item,From Warehouse,Atölyesi&#39;nden
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Malzeme Listesine Öğe Yok İmalat için
 DocType: Assessment Plan,Supervisor Name,Süpervizör Adı
 DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
 DocType: Program Enrollment Course,Program Enrollment Course,Program Kayıt Kursu
-DocType: Grading Structure,Grading Structure,Notlandırma Yapısı
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Purchase Taxes and Charges,Valuation and Total,Değerleme ve Toplam
 DocType: Tax Rule,Shipping City,Nakliye Şehri
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Bildirim özelleştirin
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Faaliyetlerden Nakit Akışı
 DocType: Sales Invoice,Shipping Rule,Kargo Kuralı
@@ -3890,8 +3894,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,İlk Gönderme Tarihi seçiniz
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Tarih Açılış Tarihi Kapanış önce olmalıdır
 DocType: Leave Control Panel,Carry Forward,Nakletmek
 DocType: Leave Control Panel,Carry Forward,Nakletmek
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Maliyet Merkezi mevcut işlemlere ana deftere dönüştürülemez
@@ -3907,7 +3911,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Antetli Kağıt Ekleyin
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Son İletişim
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Son İletişim
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Kategori 'Değerleme' veya 'Toplam ve Değerleme' olduğu zaman çıkarılamaz
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Vergi kafaları Liste (örn KDV, gümrük vb; onlar benzersiz adlara sahip olmalıdır) ve bunların standart oranları. Bu düzenlemek ve daha sonra ekleyebilirsiniz standart bir şablon oluşturmak olacaktır."
 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
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Faturalar ile maç Ödemeleri
@@ -3927,7 +3931,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Eğlence ve Boş Zaman
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
 DocType: Quality Inspection,Item Serial No,Ürün Seri No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Çalışan Kayıtları Oluşturma
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Çalışan Kayıtları Oluşturma
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Toplam Mevcut
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Muhasebe Tabloları
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Saat
@@ -3941,10 +3945,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,bilinmeyen
 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
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Satış Noktası
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Satış Noktası
 DocType: Payment Entry,Received Amount,alınan Tutar
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Lütfen İnsan Kaynağında Çalışan Adlandırma Sistemini kurun&gt; HR Ayarları
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",Tam miktar oluşturma amacıyla zaten miktar göz ardı
 DocType: Account,Tax,Vergi
 DocType: Account,Tax,Vergi
@@ -3960,9 +3962,9 @@
 DocType: Batch,Source Document Name,Kaynak Belge Adı
 DocType: Batch,Source Document Name,Kaynak Belge Adı
 DocType: Job Opening,Job Title,İş Unvanı
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,Kullanıcılar oluştur
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,Kullanıcılar oluştur
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Üretim Miktar 0&#39;dan büyük olmalıdır.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Bakım araması için ziyaret raporu.
 DocType: Stock Entry,Update Rate and Availability,Güncelleme Oranı ve Kullanılabilirlik
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Sipariş edilen miktara karşı alabileceğiniz veya teslim edebileceğiniz daha fazla miktar. Örneğin, 100 birim sipariş verdiyseniz,izniniz %10'dur, bu durumda 110 birim almaya izniniz vardır."
@@ -3973,30 +3975,32 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Ürün {0} için gider hesabı zorunludur
 DocType: BOM,Website Description,Web Sitesi Açıklaması
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Özkaynak Net Değişim
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Lütfen önce iptal edin: Satınalma Faturası {0}
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","E-posta adresi zaten var, benzersiz olmalıdır {0}"
 DocType: Serial No,AMC Expiry Date,AMC Bitiş Tarihi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Makbuz
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Makbuz
 ,Sales Register,Satış Kayıt
 ,Sales Register,Satış Kayıt
 DocType: Daily Work Summary Settings Company,Send Emails At,At e-postalar gönderin
 DocType: Quotation,Quotation Lost Reason,Teklif Kayıp Nedeni
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Domain seçin
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},İşlem referans yok {0} tarihli {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Düzenlenecek bir şey yok
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,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/public/js/pos/pos.html +100,No Customers yet!,Henüz müşteri yok!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Nakit Akım Tablosu
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Kredi Miktarı Maksimum Kredi Tutarı geçemez {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,Lisans
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Borç Silme Hesabı Girin
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Son Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Hesap {0} yapan şirkete ait değil {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} satırındaki Seri Numaraları Teslimat Notu ile eşleşmiyor
 DocType: Student,Guardian Details,Guardian Detayları
 DocType: C-Form,C-Form,C-Formu
 DocType: C-Form,C-Form,C-Formu
@@ -4026,7 +4030,7 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Satır {0}: Hesap türü 'Sabit Varlık' olmalıdır
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Çıkış Miktarı
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Bir Satış için nakliye miktarı hesaplama için kuralları
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Seri zorunludur
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Seri zorunludur
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Finansal Hizmetler
 DocType: Student Sibling,Student ID,Öğrenci Kimliği
@@ -4034,14 +4038,14 @@
 DocType: Tax Rule,Sales,Satışlar
 DocType: Stock Entry Detail,Basic Amount,Temel Tutar
 DocType: Training Event,Exam,sınav
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Stok Ürünü {0} için depo gereklidir
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,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 +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Fatura Kamu
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Transfer
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} şu Parti Hesabıyla ilintili değil: {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} şu Parti Hesabıyla ilintili değil: {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(Alt-montajlar dahil) patlamış BOM'ları getir
 DocType: Authorization Rule,Applicable To (Employee),(Çalışana) uygulanabilir
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Due Date zorunludur
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Attribute için Artım {0} 0 olamaz
@@ -4053,14 +4057,14 @@
 ,Inactive Customers,Etkin olmayan müşteriler
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Satın Alma İrsaliyeleri
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Fiyatlandırma Kuralı Nasıl Uygulanır?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Fiyatlandırma Kuralı Nasıl Uygulanır?
 DocType: Stock Entry,Delivery Note No,İrsaliye No
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Seçili ise, sadece son hammadde malzeme talepleri Malzeme İstekler dahil edilecektir satın alın. Aksi takdirde, ana öğeleri Malzeme talepleri oluşturulacak"
 DocType: Cheque Print Template,Message to show,Mesaj göstermek
 DocType: Company,Retail,Perakende
 DocType: Company,Retail,Perakende
 DocType: Attendance,Absent,Eksik
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Ürün Paketi
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Ürün Paketi
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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
@@ -4071,10 +4075,10 @@
 DocType: Payment Entry,Account Paid From,Hesap şuradan ödenmiş
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Hammadde Malzeme Kodu
 DocType: Journal Entry,Write Off Based On,Dayalı Borç Silme
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Kurşun olun
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Kurşun olun
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Baskı ve Kırtasiye
 DocType: Stock Settings,Show Barcode Field,Göster Barkod Alanı
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Tedarikçi E-postalarını Gönder
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Tedarikçi E-postalarını Gönder
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Maaş zaten {0} ve {1}, bu tarih aralığında olamaz başvuru süresini bırakın arasındaki dönem için işlenmiş."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Bir Seri No için kurulum kaydı.
 DocType: Guardian Interest,Guardian Interest,Guardian İlgi
@@ -4087,6 +4091,7 @@
 DocType: Offer Letter,Awaiting Response,Tepki bekliyor
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Yukarıdaki
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Geçersiz özellik {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Standart dışı borç hesabı ise
 DocType: Salary Slip,Earning & Deduction,Kazanma & Kesintisi
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,İsteğe bağlı. Bu ayar çeşitli işlemlerde filtreleme yapmak için kullanılacaktır
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Negatif Değerleme Br.Fiyatına izin verilmez
@@ -4105,10 +4110,9 @@
 DocType: Production Order Item,Production Order Item,Üretim Sipariş Öğe
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,Kayıt bulunamAdı
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Hurdaya Varlığın Maliyeti
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,Kısmen ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},Ürün{2} için {0} {1}: Maliyert Merkezi zorunludur
 DocType: Vehicle,Policy No,Politika yok
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Ürün Bundle Öğeleri alın
 DocType: Asset,Straight Line,Düz Çizgi
 DocType: Project User,Project User,Proje Kullanıcısı
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Bölünmüş
@@ -4124,7 +4128,7 @@
 DocType: Program Enrollment Tool,Get Students From,Gönderen Öğrenciler alın
 DocType: Hub Settings,Seller Country,Satıcı Ülke
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Web sitesinde Ürünleri yayınlayın
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,gruplar halinde Grup öğrencilerinizin
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,gruplar halinde Grup öğrencilerinizin
 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ı
@@ -4190,7 +4194,7 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Çek Tarih
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Hesap {0}: Ana hesap {1} şirkete ait değil: {2}
 DocType: Program Enrollment Tool,Student Applicants,Öğrenci Başvuru sahipleri
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,Başarıyla bu şirket ile ilgili tüm işlemleri silindi!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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
 DocType: Appraisal,HR,İK
 DocType: Program Enrollment,Enrollment Date,başvuru tarihi
@@ -4198,7 +4202,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Deneme Süresi
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Maaş Bileşenleri
 DocType: Program Enrollment Tool,New Academic Year,Yeni Akademik Yıl
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,İade / Kredi Notu
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,İade / Kredi Notu
 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 +28,Total Paid Amount,Toplam Ödenen Tutar
 DocType: Production Order Item,Transferred Qty,Transfer Edilen Miktar
@@ -4219,7 +4223,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Normal, hastalık vb izin tipleri"
 DocType: Email Digest,Send regular summary reports via Email.,E-posta yoluyla düzenli özet raporlar gönder.
 DocType: Payment Entry,PE-,PE
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Gider Talep Tip varsayılan hesap ayarlayın {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Gider Talep Tip varsayılan hesap ayarlayın {0}
 DocType: Assessment Result,Student Name,Öğrenci adı
 DocType: Brand,Item Manager,Ürün Yöneticisi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Ödenecek Bordro
@@ -4243,6 +4247,7 @@
 ,Sales Funnel,Satış Yolu
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Kısaltma zorunludur
 DocType: Project,Task Progress,görev İlerleme
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Araba
 ,Qty to Transfer,Transfer edilecek Miktar
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Müşterilere veya Taleplere verilen fiyatlar.
 DocType: Stock Settings,Role Allowed to edit frozen stock,dondurulmuş stok düzenlemeye İzinli rol
@@ -4273,13 +4278,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Ürün Vergi Detayları
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Enstitü Kısaltma
 ,Item-wise Price List Rate,Ürün bilgisi Fiyat Listesi Oranı
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Tedarikçi Teklifi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Tedarikçi Teklifi
 DocType: Quotation,In Words will be visible once you save the Quotation.,fiyat teklifini kaydettiğinizde görünür olacaktır
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Miktar ({0}) {1} sırasındaki kesir olamaz
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,Ücretleri toplayın
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Barkod {0} zaten Ürün {1} de kullanılmış
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 +86,Rules for adding shipping costs.,Nakliye maliyetleri ekleme  Kuralları.
 DocType: Item,Opening Stock,Açılış Stok
@@ -4300,9 +4305,9 @@
  'Zaman Log' aracılığıyla Güncelleme"
 DocType: Customer,From Lead,Baştan
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Üretim için verilen emirler.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Mali Yıl Seçin ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Mali Yıl Seçin ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS Profil POS Girişi yapmak için gerekli
 DocType: Program Enrollment Tool,Enroll Students,Öğrenciler kayıt
 DocType: Hub Settings,Name Token,İsim Jetonu
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Standart Satış
@@ -4317,7 +4322,7 @@
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,Proje Adı
 DocType: Request for Quotation Item,Project Name,Proje Adı
-DocType: Supplier,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
+DocType: Customer,Mention if non-standard receivable account,Mansiyon standart dışı alacak hesabı varsa
 DocType: Journal Entry Account,If Income or Expense,Gelir veya Gider ise
 DocType: Production Order,Required Items,gerekli Öğeler
 DocType: Stock Ledger Entry,Stock Value Difference,Stok Değer Farkı
@@ -4341,7 +4346,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Bu Satış Kişisi için Ürün Grubu hedefleri ayarlayın
 DocType: Stock Settings,Freeze Stocks Older Than [Days],[Days] daha eski donmuş stoklar
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Satır # {0}: Varlık sabit kıymet alım / satım için zorunludur
-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.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","İki ya da daha fazla Fiyatlandırma Kuralları yukarıdaki koşullara dayalı bulundu ise, Öncelik uygulanır. Varsayılan değer sıfır (boş) ise Öncelik 0 ile 20 arasında bir sayıdır. Yüksek numarası aynı koşullarda birden Fiyatlandırma Kuralları varsa o öncelik alacak demektir."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Mali Yılı: {0} does not var
 DocType: Currency Exchange,To Currency,Para Birimi
 DocType: Currency Exchange,To Currency,Para Birimi
@@ -4372,7 +4377,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Stok ürünü olmadığından Ürün {0} yok sayıldı
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Daha fazla işlem için bu Üretim Siparişini Gönderin.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Belli bir işlemde Fiyatlandırma kuralını uygulamamak için bütün mevcut Fiyatlandırma Kuralları devre dışı bırakılmalıdır.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",Belli bir işlemde Fiyatlandırma kuralını uygulamamak için bütün mevcut Fiyatlandırma Kuralları devre dışı bırakılmalıdır.
 DocType: Assessment Group,Parent Assessment Group,Veli Değerlendirme Grubu
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,İşler
 ,Sales Order Trends,Satış Sipariş Trendler
@@ -4386,7 +4391,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Mali Yıl Bitiş Tarihi
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"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/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Tedarikçi Teklifi Oluştur
 DocType: Quality Inspection,Incoming,Alınan
 DocType: BOM,Materials Required (Exploded),Gerekli Malzemeler (patlamış)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",Kendiniz dışında kuruluşunuz kullanıcıları ekle
@@ -4416,6 +4421,7 @@
 DocType: Employee,History In Company,Şirketteki Geçmişi
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Haber Bültenleri
 DocType: Stock Ledger Entry,Stock Ledger Entry,Stok Defter Girdisi
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Müşteri&gt; Müşteri Grubu&gt; Bölge
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Aynı madde birden çok kez girildi
 DocType: Department,Leave Block List,İzin engel listesi
 DocType: Sales Invoice,Tax ID,Vergi numarası
@@ -4425,7 +4431,7 @@
 DocType: Customer,Sales Partner and Commission,Satış Ortağı ve Komisyon
 DocType: Employee Loan,Rate of Interest (%) / Year,İlgi (%) / Yılın Oranı
 ,Project Quantity,Proje Miktarı
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",Toplam {0} tüm öğeler için size &#39;Dayalı Suçlamaları dağıtın&#39; değişmelidir olabilir sıfırdır
 DocType: Opportunity,To Discuss,Görüşülecek
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,Bu işlemi tamamlamak için {2} içinde {0} birim {1} gerekli.
 DocType: Loan Type,Rate of Interest (%) Yearly,İlgi Oranı (%) Yıllık
@@ -4441,7 +4447,7 @@
 DocType: Purchase Invoice,Return,Dönüş
 DocType: Production Order Operation,Production Order Operation,Üretim Sipariş Operasyonu
 DocType: Pricing Rule,Disable,Devre Dışı Bırak
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Ödeme Modu ödeme yapmak için gereklidir
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Ödeme Modu ödeme yapmak için gereklidir
 DocType: Project Task,Pending Review,Bekleyen İnceleme
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","{0} varlığı hurda edilemez, {1} da var olarak gözüküyor"
 DocType: Task,Total Expense Claim (via Expense Claim),(Gider İstem aracılığıyla) Toplam Gider İddiası
@@ -4449,11 +4455,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Gelmedi işaretle
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Satır {0}: BOM # Döviz {1} seçilen para birimi eşit olmalıdır {2}
 DocType: Journal Entry Account,Exchange Rate,Döviz Kuru
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Satış Sipariş {0} teslim edilmedi
 DocType: Homepage,Tag Line,Etiket Hattı
 DocType: Fee Component,Fee Component,ücret Bileşeni
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Filo yönetimi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Öğe ekleme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Öğe ekleme
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Depo {0}: Ana hesap {1} Şirket {2} ye ait değildir
 DocType: Cheque Print Template,Regular,Düzenli
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Bütün Değerlendirme Kriterleri Toplam weightage% 100 olmalıdır
@@ -4467,7 +4473,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Depo {0} yoktur
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,ERPNext Hub için Kayıt
 DocType: Monthly Distribution,Monthly Distribution Percentages,Aylık Dağılımı Yüzdeler
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Seçilen öğe Toplu olamaz
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Değerleme oranı için muhasebe kayıtlarını yapmasını gerektiren durumlar Madde {0} için bulunamadı {1} {2}. öğesi örnek bir öğe olarak işlem yapan ise {1}, {1} Öğe tabloda bu belirtin. Aksi takdirde, / submiting deneyin bu girişi iptal sonra Öğe kaydındaki madde veya söz değerleme oranı için gelen stok hareket oluşturmak ve lütfen"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% malzeme bu İrsaliye karşılığında teslim edildi
 DocType: Project,Customer Details,Müşteri Detayları
@@ -4479,16 +4485,16 @@
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 DocType: Payment Entry,Paid Amount,Ödenen Tutar
 DocType: Assessment Plan,Supervisor,supervisor
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,İnternet üzerinden
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,İnternet üzerinden
 ,Available Stock for Packing Items,Ambalajlama Ürünleri için mevcut stok
 DocType: Item Variant,Item Variant,Öğe Varyant
 DocType: Assessment Result Tool,Assessment Result Tool,Değerlendirme Sonucu Aracı
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Hurda Öğe
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Gönderilen emir silinemez
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Gönderilen emir silinemez
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Kalite Yönetimi
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Kalite Yönetimi
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} devredışı bırakılmış
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} devredışı bırakılmış
 DocType: Employee Loan,Repay Fixed Amount per Period,Dönem başına Sabit Tutar Repay
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Lütfen Ürün {0} için miktar giriniz
 DocType: Employee External Work History,Employee External Work History,Çalışan Harici İş Geçmişi
@@ -4518,7 +4524,7 @@
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Employee,Notice (days),Bildirimi (gün)
 DocType: Tax Rule,Sales Tax Template,Satış Vergisi Şablon
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,fatura kaydetmek için öğeleri seçin
 DocType: Employee,Encashment Date,Nakit Çekim Tarihi
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Stok Ayarı
@@ -4544,7 +4550,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Menzil / dan belirtiniz
 DocType: Serial No,Under AMC,AMC altında
 DocType: Serial No,Under AMC,AMC altında
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Ürün değerleme oranı indi maliyet çeki miktarı dikkate hesaplanır
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Ürün değerleme oranı indi maliyet çeki miktarı dikkate hesaplanır
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Satış İşlemleri için  varsayılan ayarlar.
 DocType: Guardian,Guardian Of ,Of The Guardian
 DocType: Grading Scale Interval,Threshold,eşik
@@ -4557,6 +4563,7 @@
 DocType: Production Order,Warehouses,Depolar
 DocType: Production Order,Warehouses,Depolar
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} varlığı transfer edilemez
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,"Bu Öğe, {0} (Şablon) değişkenidir."
 DocType: Workstation,per hour,saat başına
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,satın alma
 DocType: Announcement,Announcement,Duyuru
@@ -4576,8 +4583,8 @@
 DocType: Account,Receivable,Alacak
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Satır # {0}: Sipariş zaten var olduğu Tedarikçi değiştirmek için izin verilmez
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Kredi limiti ayarlarını geçen işlemleri teslim etmeye izinli rol
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,İmalat Öğe seç
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,İmalat Öğe seç
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Ana veri senkronizasyonu, bu biraz zaman alabilir"
 DocType: Item,Material Issue,Malzeme Verilişi
 DocType: Hub Settings,Seller Description,Satıcı Açıklaması
 DocType: Employee Education,Qualification,{0}Yeterlilik{/0} {1} {/1}
@@ -4593,7 +4600,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Sipariş Edildi
 DocType: Salary Detail,Component,Bileşen
 DocType: Assessment Criteria,Assessment Criteria Group,Değerlendirme Ölçütleri Grup
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Birikmiş Amortisman Açılış eşit az olmalıdır {0}
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Warehouse,Warehouse Name,Depo Adı
 DocType: Naming Series,Select Transaction,İşlem Seçin
@@ -4609,7 +4616,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Sunulan Stok Giriş {0} varolduğundan iptal edilemiyor
 DocType: Employee Loan,Disbursement Date,Ödeme tarihi
 DocType: Vehicle,Vehicle,araç
 DocType: Purchase Invoice,In Words,Kelimelerle
@@ -4626,7 +4633,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Kurşun%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Varlık Değer Kayıpları ve Hesapları
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e transfer edilecek
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},{0} {1} miktarı {2}'den {3}'e transfer edilecek
 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 +460,Transaction not allowed against stopped Production Order {0},Durdurulmuş Üretim Emrine {0} karşı işleme izin verilmez
@@ -4634,7 +4641,7 @@
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Varsayılan olarak bu Mali Yılı ayarlamak için, 'Varsayılan olarak ayarla' seçeneğini tıklayın"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,Birleştir
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Yetersizlik adeti
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,Item variant {0} exists with same attributes,Ürün çeşidi {0} aynı özelliklere sahip bulunmaktadır
 DocType: Employee Loan,Repay from Salary,Maaş dan ödemek
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},"karşı ödeme talep {0}, {1} miktarda {2}"
@@ -4653,7 +4660,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Değerlendirme Sonuçlarının Ayrıntıları
 DocType: Employee Education,Employee Education,Çalışan Eğitimi
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,öğe grubu tablosunda bulunan yinelenen öğe grubu
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Bu Ürün Detayları getirmesi için gereklidir.
 DocType: Salary Slip,Net Pay,Net Ödeme
 DocType: Account,Account,Hesap
 DocType: Account,Account,Hesap
@@ -4664,7 +4671,7 @@
 DocType: Purchase Invoice,Recurring Id,Tekrarlanan Kimlik
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
 DocType: Customer,Sales Team Details,Satış Ekibi Ayrıntıları
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Kalıcı olarak silinsin mi?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Kalıcı olarak silinsin mi?
 DocType: Expense Claim,Total Claimed Amount,Toplam İade edilen Tutar
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Satış için potansiyel Fırsatlar.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Geçersiz {0}
@@ -4677,7 +4684,7 @@
 DocType: Warehouse,PIN,TOPLU İĞNE
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext ayarlarını yap Okul
 DocType: Sales Invoice,Base Change Amount (Company Currency),Baz Değişim Miktarı (Şirket Para Birimi)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Şu depolar için muhasebe girdisi yok
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,İlk belgeyi kaydedin.
 DocType: Account,Chargeable,Ücretli
 DocType: Account,Chargeable,Ücretli
@@ -4685,6 +4692,7 @@
 DocType: Expense Claim Detail,Expense Date,Gider Tarih
 DocType: Item,Max Discount (%),En fazla İndirim (%
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Son Sipariş Miktarı
+DocType: Task,Is Milestone,Milestone mu?
 DocType: Daily Work Summary,Email Sent To,E-posta Gönderilen
 DocType: Budget,Warn,Uyarmak
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Başka bir konuşmasında, kayıtlarda gitmeli kayda değer çaba."
@@ -4708,7 +4716,7 @@
 DocType: Item Attribute Value,Attribute Value,Değer Özellik
 ,Itemwise Recommended Reorder Level,Ürünnin Önerilen Yeniden Sipariş Düzeyi
 DocType: Salary Detail,Salary Detail,Maaş Detay
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Önce {0} seçiniz
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Önce {0} seçiniz
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Öğe Toplu {0} {1} süresi doldu.
 DocType: Sales Invoice,Commission,Komisyon
 DocType: Sales Invoice,Commission,Komisyon
@@ -4723,32 +4731,31 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`Freeze Stocks Older Than` %d günden daha kısa olmalıdır.
 DocType: Tax Rule,Purchase Tax Template,Vergi Şablon Satınalma
 ,Project wise Stock Tracking,Proje bilgisi Stok Takibi
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Bakım Programı {0} {0} karşılığında mevcuttur
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Stock Entry Detail,Actual Qty (at source/target),Fiili Miktar (kaynak / hedef)
 DocType: Item Customer Detail,Ref Code,Referans Kodu
 DocType: Item Customer Detail,Ref Code,Referans Kodu
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Çalışan kayıtları.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Sonraki Amortisman tarihi ayarlayın
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 DocType: HR Settings,Payroll Settings,Bordro Ayarları
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Bağlantısız Faturaları ve Ödemeleri eşleştirin.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Sipariş
 DocType: Email Digest,New Purchase Orders,Yeni Satın alma Siparişleri
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Kökün ana maliyet merkezi olamaz
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Marka Seçiniz ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Marka Seçiniz ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Şundaki gibi birikimli değer kaybı
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
 DocType: Sales Invoice,C-Form Applicable,Uygulanabilir C-Formu
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Çalışma Süresi Çalışma için 0&#39;dan büyük olmalıdır {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Depo zorunludur
 DocType: Supplier,Address and Contacts,Adresler ve Kontaklar
 DocType: UOM Conversion Detail,UOM Conversion Detail,Ölçü Birimi Dönüşüm Detayı
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px (yukseklik) ile 900 px (genislik) web dostu tutun
 DocType: Program,Program Abbreviation,Program Kısaltma
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Üretim siparişi Ürün Şablon karşı yükseltilmiş edilemez
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Ücretler her öğenin karşı Satınalma Fiş güncellenir
 DocType: Warranty Claim,Resolved By,Tarafından Çözülmüştür
 DocType: Bank Guarantee,Start Date,Başlangıç Tarihi
 DocType: Bank Guarantee,Start Date,Başlangıç Tarihi
@@ -4757,7 +4764,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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ı
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Müşteri tırnak oluşturun
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Müşteri tırnak oluşturun
 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"
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),Malzeme Listesi (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Tedarikçinin ortalama teslim süresi
@@ -4765,7 +4772,7 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Saat
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Saat
 DocType: Project,Expected Start Date,Beklenen BaşlangıçTarihi
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Ücretleri bu öğeye geçerli değilse öğeyi çıkar
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,İşlem birimi Ödeme Gateway para birimi olarak aynı olmalıdır
 DocType: Payment Entry,Receive,Alma
@@ -4776,20 +4783,20 @@
 DocType: Workstation,Operating Costs,İşletim Maliyetleri
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Birikimli Aylık Bütçe aşıldıysa yapılacak işlem
 DocType: Purchase Invoice,Submit on creation,oluşturma Gönder
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Döviz {0} olmalıdır için {1}
 DocType: Asset,Disposal Date,Bertaraf tarihi
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Onlar tatil yoksa e-postalar, verilen saatte şirketin tüm Aktif Çalışanların gönderilecektir. Yanıtların Özeti gece yarısı gönderilecektir."
 DocType: Employee Leave Approver,Employee Leave Approver,Çalışan izin Onayı
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Satır {0}: Bir Yeniden Sipariş girişi zaten bu depo için var {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Kayıp olarak Kotasyon yapılmış çünkü, ilan edemez."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Eğitim Görüşleri
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Üretim Siparişi {0} verilmelidir
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Ürün {0} için Başlangıç ve Bitiş tarihi seçiniz
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Ders satırda zorunludur {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Tarihine kadar kısmı tarihinden itibaren kısmından önce olamaz
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc Doctype
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Fiyatları Ekle / Düzenle
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Fiyatları Ekle / Düzenle
 DocType: Batch,Parent Batch,Ana Batch
 DocType: Batch,Parent Batch,Ana Batch
 DocType: Cheque Print Template,Cheque Print Template,Çek Baskı Şablon
@@ -4807,7 +4814,7 @@
 DocType: Account,Income,Gelir
 DocType: Account,Income,Gelir
 DocType: Industry Type,Industry Type,Sanayi Tipi
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Bir şeyler yanlış gitti!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Bir şeyler yanlış gitti!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,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 +263,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Satış Faturası {0} zaten gönderildi
@@ -4844,18 +4851,18 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Atanan toplam ağırlık % 100 olmalıdır. Bu {0} dır
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Tedarikçileriniz
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Tedarikçileriniz
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,Satış Emri yapıldığında Kayıp olarak ayarlanamaz.
 DocType: Request for Quotation Item,Supplier Part No,Tedarikçi Parça No
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Dan alındı
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',kategori &#39;Değerleme&#39; veya &#39;Vaulation ve Toplam&#39; için ne zaman tenzil edemez
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Dan alındı
 DocType: Lead,Converted,Dönüştürülmüş
 DocType: Item,Has Serial No,Seri no Var
 DocType: Employee,Date of Issue,Veriliş tarihi
 DocType: Employee,Date of Issue,Veriliş tarihi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Tarafından {0} {1} için
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Satır # {0}: öğe için Set Tedarikçi {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Satır {0}: Saat değeri sıfırdan büyük olmalıdır.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,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 +173,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
@@ -4866,7 +4873,7 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Donmuş değeri ayarlama yetkiniz yok
 DocType: Payment Reconciliation,Get Unreconciled Entries,Mutabık olmayan girdileri alın
 DocType: Payment Reconciliation,From Invoice Date,Fatura Tarihinden İtibaren
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Fatura para ya varsayılan comapany para birimi ya da parti hesap para eşit olmalıdır
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Fatura para ya varsayılan comapany para birimi ya da parti hesap para eşit olmalıdır
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Tahsil bırakın
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ne yapar?
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Ne yapar?
@@ -4874,7 +4881,7 @@
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tüm Öğrenci Kabulleri
 ,Average Commission Rate,Ortalama Komisyon Oranı
 ,Average Commission Rate,Ortalama Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'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 +411,'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 +41,Attendance can not be marked for future dates,İlerideki tarihler için katılım işaretlenemez
 DocType: Pricing Rule,Pricing Rule Help,Fiyatlandırma Kuralı Yardım
 DocType: School House,House Name,Evin adı
@@ -4883,7 +4890,7 @@
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Öğelerin indi maliyetini hesaplamak için ek maliyetler güncelleyin
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Elektrik
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,kullanıcılarınıza olarak kuruluşunuz geri kalanını ekleyin. Ayrıca Rehber onları ekleyerek portalına Müşteriler davet ekleyebilir
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,kullanıcılarınıza olarak kuruluşunuz geri kalanını ekleyin. Ayrıca Rehber onları ekleyerek portalına Müşteriler davet ekleyebilir
 DocType: Stock Entry,Total Value Difference (Out - In),Toplam Değer Farkı (Out - In)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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ış
@@ -4894,7 +4901,7 @@
 DocType: Item,Customer Code,Müşteri Kodu
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Için Doğum Günü Hatırlatıcı {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Son siparişten bu yana geçen günler
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,Debit To account must be a Balance Sheet account,Hesabın için Bankamatik bir bilanço hesabı olmalıdır
 DocType: Buying Settings,Naming Series,Seri Adlandırma
 DocType: Leave Block List,Leave Block List Name,İzin engel listesi adı
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,Sigorta Başlangıç tarihi Bitiş tarihi Sigortası daha az olmalıdır
@@ -4912,9 +4919,9 @@
 DocType: Vehicle Log,Odometer,Kilometre sayacı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
 DocType: Sales Order Item,Ordered Qty,Sipariş Miktarı
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Öğe {0} devre dışı
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Öğe {0} devre dışı
 DocType: Stock Settings,Stock Frozen Upto,Stok Dondurulmuş
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Ürün Ağacı hiç Stok Ürünü içermiyor
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Ürün Ağacı hiç Stok Ürünü içermiyor
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Proje faaliyeti / görev.
 DocType: Vehicle Log,Refuelling Details,Yakıt Detayları
@@ -4924,8 +4931,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Son satın alma oranı bulunamadı
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Tutar Off yazın (Şirket Para)
 DocType: Sales Invoice Timesheet,Billing Hours,fatura Saatleri
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} bulunamadı için varsayılan BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Satır # {0}: yeniden sipariş miktarını ayarlamak Lütfen
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Buraya eklemek için öğelere dokunun
 DocType: Fees,Program Enrollment,programı Kaydı
 DocType: Landed Cost Voucher,Landed Cost Voucher,Indi Maliyet Çeki
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Lütfen {0} ayarlayınız
@@ -4953,7 +4961,7 @@
 DocType: Maintenance Visit,Maintenance Date,Bakım Tarih
 DocType: Purchase Invoice Item,Rejected Serial No,Seri No Reddedildi
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Yılın başlangıç ve bitiş tarihi {0} ile çakışıyor. Engellemek için lütfen firma seçin.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Başlangıç tarihi Ürün {0} için bitiş tarihinden daha az olmalıdır
 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.","Örnek:. Serisi ayarlanır ve Seri No işlemlerinde belirtilen değilse ABCD ##### 
 , daha sonra otomatik seri numarası bu serisine dayanan oluşturulur. Her zaman açıkça bu öğe için seri No. bahsetmek istiyorum. Bu boş bırakın."
@@ -5049,7 +5057,6 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +45,Retail & Wholesale,Toptan ve Perakende Satış
 DocType: Issue,First Responded On,İlk cevap verilen
 DocType: Website Item Group,Cross Listing of Item in multiple groups,Çoklu gruplarda Ürün Cross İlanı
-DocType: Grade Interval,Grade Interval,sınıf Aralığı
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Mali Yıl {0} da Mali Yıl Başlangıç Tarihi ve Mali Yıl Bitiş Tarihi zaten ayarlanmış
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Gümrükleme Tarihi güncellendi
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Bölme Bölmesi
@@ -5100,14 +5107,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Kurs temelli gruplar yaparken toplu düşünmeyi istemiyorsanız, işaretlemeyin."
 DocType: Asset,Frequency of Depreciation (Months),Amortisman Frekans (Ay)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Kredi hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Kredi hesabı
 DocType: Landed Cost Item,Landed Cost Item,İnen Maliyet Kalemi
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Kur benim organizasyon için basit bir web sitesi
 DocType: Payment Reconciliation,Receivable / Payable Account,Alacak / Borç Hesap
 DocType: Delivery Note Item,Against Sales Order Item,Satış Siparişi Ürün Karşılığı
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},Öznitelik için değeri Özellik belirtiniz {0}
 DocType: Item,Default Warehouse,Standart Depo
 DocType: Item,Default Warehouse,Standart Depo
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Bütçe Grubu Hesabı karşı atanamayan {0}
@@ -5156,8 +5163,8 @@
 DocType: Opportunity Item,Basic Rate,Temel Oran
 DocType: GL Entry,Credit Amount,Kredi miktarı
 DocType: Cheque Print Template,Signatory Position,İmzacı pozisyonu
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Kayıp olarak ayarla
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Kayıp olarak ayarla
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Kayıp olarak ayarla
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Kayıp olarak ayarla
 DocType: Timesheet,Total Billable Hours,Toplam Faturalanabilir Saat
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Ödeme Makbuzu Not
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,"Bu, bu Müşteriye karşı işlemlere dayanmaktadır. Ayrıntılar için aşağıdaki zaman çizelgesini bakın"
@@ -5172,11 +5179,11 @@
 DocType: Purchase Order,Get Last Purchase Rate,Son Alım Br.Fİyatını alın
 DocType: Company,Company Info,Şirket Bilgisi
 DocType: Company,Company Info,Şirket Bilgisi
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Seçmek veya yeni müşteri eklemek
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Seçmek veya yeni müşteri eklemek
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,Maliyet merkezi gider iddiayı kitaba gereklidir
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Fon (varlık) başvurusu
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,"Bu, bu Çalışan katılımı esas alır"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Borç Hesabı
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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ı
@@ -5187,14 +5194,14 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Satın alma miktarı
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Tedarikçi Fiyat Teklifi {0} oluşturuldu
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Yıl Sonu Başlangıç Yıl önce olamaz
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Çalışanlara Sağlanan Faydalar
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Çalışan bir varsayılan Tatil Listesi set Lütfen {0} veya Şirket {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} mevcut değil
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} mevcut değil
 apps/erpnext/erpnext/config/accounts.py +12,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Sıra Hayır {0}: Tutar Gider İstem {1} karşı Tutar Bekleyen daha büyük olamaz. Bekleyen Tutar {2}
@@ -5204,7 +5211,7 @@
 DocType: Quality Inspection Reading,Reading 3,3 Okuma
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Föy Türü
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Fiyat Listesi bulunamadı veya devre dışı değil
 DocType: Employee Loan Application,Approved,Onaylandı
 DocType: Pricing Rule,Price,Fiyat
 DocType: Pricing Rule,Price,Fiyat
@@ -5213,8 +5220,10 @@
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Verilen aralıkta Çalışan {1} için oluşturulan değerlendirme {0}
 DocType: Employee,Education,Eğitim
 DocType: Employee,Education,Eğitim
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Kampanya İsimlendirmesini yapan
 DocType: Employee,Current Address Is,Güncel Adresi
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,değiştirilmiş
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","İsteğe bağlı. Eğer belirtilmemişse, şirketin varsayılan para birimini belirler."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Muhasebe günlük girişleri.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Depo itibaren Boş Adet
@@ -5225,7 +5234,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Gider Hesabı girin
 DocType: Account,Stock,Stok
 DocType: Account,Stock,Stok
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Satır # {0}: Referans Doküman Tipi Satın Alma Emri biri, Satın Alma Fatura veya günlük girdisi olmalıdır"
 DocType: Employee,Current Address,Mevcut Adresi
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Açıkça belirtilmediği sürece madde daha sonra açıklama, resim, fiyatlandırma, vergiler şablondan kurulacak vb başka bir öğe bir varyantı ise"
 DocType: Serial No,Purchase / Manufacture Details,Satın alma / Üretim Detayları
@@ -5260,7 +5269,7 @@
 DocType: Project,Gross Margin %,Brüt Kar Marjı%
 DocType: BOM,With Operations,Operasyon ile
 DocType: BOM,With Operations,Operasyon ile
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Muhasebe kayıtları zaten para yapılmış {0} şirket için {1}. Para ile bir alacak ya da borç hesabı seçin {0}.
 DocType: Asset,Is Existing Asset,Varlık Mevcut mı
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
 DocType: Salary Detail,Statistical Component,İstatistiksel Bileşen
@@ -5287,7 +5296,7 @@
 DocType: Purchase Order,Advance Paid,Peşin Ödenen
 DocType: Item,Item Tax,Ürün Vergisi
 DocType: Item,Item Tax,Ürün Vergisi
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Tedarikçi Malzeme
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Tedarikçi Malzeme
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Tüketim Fatura
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,"Eşik {0},% kereden fazla görünür"
 DocType: Expense Claim,Employees Email Id,Çalışanların e-posta adresleri
@@ -5318,9 +5327,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo Ekleyin
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Stok Seviyeleri
 DocType: Customer,Commission Rate,Komisyon Oranı
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Variant oluştur
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Variant oluştur
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Departman tarafından blok aralığı uygulamaları.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Ödeme Şekli, Alma biri Öde ve İç Transferi gerekir"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Ödeme Şekli, Alma biri Öde ve İç Transferi gerekir"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Sepet Boş
 DocType: Vehicle,Model,model
@@ -5333,6 +5342,7 @@
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 DocType: Sales Order,Customer's Purchase Order Date,Müşterinin Sipariş Tarihi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Öz sermaye
+DocType: Shopping Cart Settings,Show Public Attachments,Genel Ekleri Göster
 DocType: Packing Slip,Package Weight Details,Ambalaj Ağırlığı Detayları
 DocType: Payment Gateway Account,Payment Gateway Account,Ödeme Gateway Hesabı
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Ödeme tamamlandıktan sonra seçilen sayfaya yönlendirmek.
@@ -5353,16 +5363,16 @@
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,Supplier Addresses and Contacts,Tedarikçi Adresler ve İletişim
 ,accounts-browser,hesap-tarayıcısı
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,İlk Kategori seçiniz
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,İlk Kategori seçiniz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,İlk Kategori seçiniz
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,İlk Kategori seçiniz
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Proje alanı.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Stok Ayarları veya maddesinde &quot;Ödeneği&quot; güncelleme, faturalama veya aşırı-sipariş izin vermek için."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Para birimlerinin yanında $ vb semboller kullanmayın.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Yarım Gün)
 DocType: Supplier,Credit Days,Kredi Günleri
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Öğrenci Toplu yapın
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Öğrenci Toplu yapın
 DocType: Leave Type,Is Carry Forward,İleri taşınmış
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM dan Ürünleri alın
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM dan Ürünleri alın
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Teslim zamanı Günü
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Satır # {0}: Tarihi Gönderme satın alma tarihi olarak aynı olmalıdır {1} varlığın {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Yukarıdaki tabloda Satış Siparişleri giriniz
@@ -5380,8 +5390,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Lütfen Kurulum aracılığıyla Katılım için numaralandırma serisini ayarlayın&gt; Serileri Numaralandırma
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Hesap {0} yok
 DocType: Account,Cash,Nakit
 DocType: Account,Cash,Nakit
diff --git a/erpnext/translations/uk.csv b/erpnext/translations/uk.csv
index f2f770d..dca5751 100644
--- a/erpnext/translations/uk.csv
+++ b/erpnext/translations/uk.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Орендовані
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,Стосується користувача
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Призупинене виробниче замовлення не може бути скасоване, зніміть призупинку спочатку"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Призупинене виробниче замовлення не може бути скасоване, зніміть призупинку спочатку"
 DocType: Vehicle Service,Mileage,пробіг
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Ви дійсно хочете відмовитися від цього активу?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Виберіть постачальника за замовчуванням
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Виберіть постачальника за замовчуванням
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Валюта необхідна для Прайс-листа {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Розраховуватиметься у операції
 DocType: Purchase Order,Customer Contact,Контакти з клієнтами
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Видатний {0} не може бути менше нуля ({1})
 DocType: Manufacturing Settings,Default 10 mins,За замовчуванням 10 хвилин
 DocType: Leave Type,Leave Type Name,Назва типу відпустки
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Показати відкритий
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Показати відкритий
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Серії оновлені успішно
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Перевірити
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Запис в журналі Опубліковано
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Пакетна Пункт експірації Статус
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Банківський чек
 DocType: Mode of Payment Account,Mode of Payment Account,Режим розрахунковий рахунок
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,Показати варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Показати варіанти
 DocType: Academic Term,Academic Term,академічний термін
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,матеріал
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Кількість
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Облікові записи таблиці не може бути порожнім.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Кредити (зобов&#39;язання)
-DocType: Employee Education,Year of Passing,Рік Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Посилання:% s, Код товару:% s і клієнтів:% s"
+DocType: Employee Education,Year of Passing,Рік проходження
 DocType: Item,Country of Origin,Країна народження
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,В наявності
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,відкриті питання
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Охорона здоров&#39;я
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Затримка в оплаті (дні)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,послуги Expense
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Рахунок-фактура
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Серійний номер: {0} вже згадується в продажу рахунку: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Рахунок-фактура
 DocType: Maintenance Schedule Item,Periodicity,Періодичність
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Фінансовий рік {0} вимагається
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Очікувана дата поставки бути перед Sales Order Date
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Долучіть файл .csv з двома колонками, одна для старої назви і одна для нової назви"
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} не існує в жодному активному Фіскальному Році
 DocType: Packed Item,Parent Detail docname,Батько Подробиці DOCNAME
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Посилання: {0}, Код товару: {1} і клієнта: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Кг
 DocType: Student Log,Log,Ввійти
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Вакансія
 DocType: Item Attribute,Increment,Приріст
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Виберіть Склад ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Виберіть Склад ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Реклама
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,Те ж компанія увійшла більш ніж один раз
 DocType: Employee,Married,Одружений
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},Не допускається для {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,Отримати елементи з
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Не допускається для {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Отримати елементи з
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Запаси не можуть оновитися Накладною {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Продукт {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,немає Перелічене
 DocType: Payment Reconciliation,Reconcile,Узгодити
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,Продукти
 DocType: Quality Inspection Reading,Reading 1,Читання 1
 DocType: Process Payroll,Make Bank Entry,Зробити запис банку
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,Пенсійні фонди
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Наступна амортизація Дата не може бути перед покупкою Дати
 DocType: SMS Center,All Sales Person,Всі Відповідальні з продажу
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,"**Щомісячний розподіл** дозволяє розподілити Бюджет/Мету по місяцях, якщо у вашому бізнесі є сезонність."
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Чи не знайшли товар
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Чи не знайшли товар
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Відсутня Структура зарплати
 DocType: Lead,Person Name,Ім&#39;я особи
 DocType: Sales Invoice Item,Sales Invoice Item,Позиція вихідного рахунку
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""","наприклад, &quot;Початкова школа&quot; або &quot;Університет&quot;"
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Складські звіти
 DocType: Warehouse,Warehouse Detail,Детальна інформація по складу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Кредитний ліміт було перейдено для клієнта {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,"Термін Дата закінчення не може бути пізніше, ніж за рік Дата закінчення навчального року, до якого цей термін пов&#39;язаний (навчальний рік {}). Будь ласка, виправте дату і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Є основним засобом"" не може бути знято, оскільки існує запис засобу відносно об’єкту"
 DocType: Vehicle Service,Brake Oil,гальмівні масла
 DocType: Tax Rule,Tax Type,Податки Тип
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},"У Вас немає прав, щоб додавати або оновлювати записи до {0}"
 DocType: BOM,Item Image (if not slideshow),Пункт зображення (якщо не слайд-шоу)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,Уразливість існує клієнтів з тим же ім&#39;ям
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Тарифна ставка / 60) * Фактичний Час роботи
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Виберіть BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Виберіть BOM
 DocType: SMS Log,SMS Log,SMS Log
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Вартість комплектності
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,"Вихідні {0} не між ""Дата з"" та ""Дата По"""
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,школи
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Немає відпустки знайдена запис для співробітника {0} для {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,"Будь ласка, введіть компанія вперше"
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,"Будь ласка, виберіть компанію спочатку"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,Загальна вартість
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Сума претензії
 DocType: Employee,Mr,Містер
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,Дублікат група клієнтів знайти в таблиці Cutomer групи
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Тип постачальника / Постачальник
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Тип постачальника / Постачальник
 DocType: Naming Series,Prefix,Префікс
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Витратні
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,клас
 DocType: Sales Invoice Item,Delivered By Supplier,Доставлено постачальником
 DocType: SMS Center,All Contact,Всі контактні
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Виробничий замовлення вже створений для всіх елементів з BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Річна заробітна плата
 DocType: Daily Work Summary,Daily Work Summary,Щодня Резюме Робота
 DocType: Period Closing Voucher,Closing Fiscal Year,Закриття фінансового року
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} заблоковано
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} заблоковано
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,"Будь ласка, виберіть існуючу компанію для створення плану рахунків"
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Витрати на запаси
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Виберіть Target Warehouse
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Виправна запис
 DocType: Journal Entry Account,Credit in Company Currency,Кредит у валюті компанії
 DocType: Delivery Note,Installation Status,Стан установки
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Ви хочете оновити відвідуваність? <br> Присутні: {0} \ <br> Були відсутні: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Прийнята+Відхилена к-сть має дорівнювати кількостіЮ що надійшла для позиції {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Постачання сировини для покупки
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Принаймні один спосіб оплати потрібно для POS рахунку.
 DocType: Products Settings,Show Products as a List,Показувати продукцію списком
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Завантажте шаблон, заповніть відповідні дані і долучіть змінений файл. Усі поєднання дат і співробітників в обраному періоді потраплять у шаблон разом з існуючими записами відвідуваності"
@@ -223,7 +225,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Створити операцію амортизації
 DocType: Appraisal Template Goal,KRA,КРА
 DocType: Lead,Request Type,Тип запиту
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,зробити Employee
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,зробити Employee
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Радіомовлення
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Виконання
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Детальна інформація про виконані операції.
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,План візитів для тех. обслуговування.
 DocType: SMS Settings,Enter url parameter for message,Введіть URL параметр для повідомлення
 DocType: POS Profile,Customer Groups,Групи клієнтів
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Фінансова звітність
 DocType: Guardian,Students,студенти
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Правила застосування цін і знижки.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Прайс-лист має застосовуватисьі для купівлі або продажу
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},"Сума авансу не може бути більше, ніж {0} {1}"
 DocType: Naming Series,Series List for this Transaction,Список серій для даної транзакції
 DocType: Company,Default Payroll Payable Account,За замовчуванням Payroll оплати рахунків
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Оновлення Email Group
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Оновлення Email Group
 DocType: Sales Invoice,Is Opening Entry,Введення залишків
 DocType: Customer Group,Mention if non-standard receivable account applicable,Вказати якщо застосовано нестандартний рахунок заборгованості
 DocType: Course Schedule,Instructor Name,ім&#39;я інструктора
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Для складу потрібно перед проведенням
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,Торговий посередник
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Якщо цей прапорець встановлений, буде включати в себе позабіржові елементи в матеріалі запитів."
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,По позиціях вхідного рахунку-фактури
 ,Production Orders in Progress,Виробничі замовлення у роботі
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Чисті грошові кошти від фінансової
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","LocalStorage сповнений, не врятувало"
 DocType: Lead,Address & Contact,Адреса та контакти
 DocType: Leave Allocation,Add unused leaves from previous allocations,Додати невикористані дні відпустки від попередніх призначень
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Наступна Періодичні {0} буде створений на {1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Загальна калькуляція Сума (за допомогою Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Пункт Сайт Специфікація
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Залишити Заблоковані
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Банківські записи
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Товар {0} досяг кінцевої дати роботи з ним {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Банківські записи
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Річний
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Позиція Інвентаризації
 DocType: Stock Entry,Sales Invoice No,Номер вихідного рахунку-фактури
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,Опублікувати в Hub
 DocType: Student Admission,Student Admission,прийому студентів
 ,Terretory,Територія
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Пункт {0} скасовується
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Замовлення матеріалів
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Пункт {0} скасовується
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,Замовлення матеріалів
 DocType: Bank Reconciliation,Update Clearance Date,Оновити Clearance дату
 DocType: Item,Purchase Details,Закупівля детальніше
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},"Товар {0} не знайдений у таблиці ""поставлена давальницька сировина"" у Замовленні на придбання {1}"
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,"""Неочищені"" чеки та депозити"
 DocType: Item,Synced With Hub,Синхронізуються з Hub
 DocType: Vehicle,Fleet Manager,Fleet Manager
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Рядок # {0}: {1} не може бути негативним по пункту {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Невірний пароль
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Рядок # {0}: {1} не може бути негативним по пункту {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Невірний пароль
 DocType: Item,Variant Of,Варіант
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва"""
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',"Завершена к-сть не може бути більше, ніж ""к-сть для виробництва"""
 DocType: Period Closing Voucher,Closing Account Head,Рахунок закриття
 DocType: Employee,External Work History,Зовнішній роботи Історія
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Циклічна посилання Помилка
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Повідомляти електронною поштою про створення автоматичних Замовлень матеріалів
 DocType: Journal Entry,Multi Currency,Мультивалютна
 DocType: Payment Reconciliation Invoice,Invoice Type,Тип рахунку-фактури
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Накладна
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Накладна
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Налаштування податків
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Собівартість проданих активів
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,"Оплата була змінена після pull. Ласка, pull it знову."
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
-DocType: Grade Interval,Min Score,мінімальна Score
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,"{0} введений двічі в ""Податки"""
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Результати для цього тижня та незакінчена діяльність
 DocType: Student Applicant,Admitted,зізнався
 DocType: Workstation,Rent Cost,Вартість оренди
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,вартість замовлення
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Банк / Касові операції проти партії або для внутрішньої передачі
 DocType: Shipping Rule,Valid for Countries,Дійсно для країн
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,"Цей об’єкт є шаблоном і не може бути використаний в операціях. Атрибути цієї позиції будуть копіюватися у варіанти, якщо не встановлено: ""Не копіювати"""
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Всього Замовити вважається
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Посада працівника (як-от, генеральний директор, директор тощо)."
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Будь ласка, введіть &quot;Повторіть День Місяць&quot; значення поля"
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Рядок # {0}: Вхідний рахунок-фактура не може бути зроблений щодо існуючого активу {1}
 DocType: Item Tax,Tax Rate,Ставка податку
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} вже виділено Робітника {1} для періоду {2} в {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Вибрати пункт
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Вибрати пункт
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Вхідний рахунок-фактура {0} вже проведений
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},"Ряд # {0}: Номер партії має бути таким же, як {1} {2}"
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,Перетворити в негрупповой
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Партія (багато) номенклатурних позицій.
 DocType: C-Form Invoice Detail,Invoice Date,Дата рахунку-фактури
 DocType: GL Entry,Debit Amount,Дебет Сума
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Там може бути тільки 1 аккаунт на компанію в {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,"Будь ласка, див вкладення"
 DocType: Purchase Order,% Received,% Отримано
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Створення студентських груп
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Запит пропозиції
 DocType: Salary Slip Timesheet,Working Hours,Робочі години
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Змінити стартову / поточний порядковий номер існуючого ряду.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Створення нового клієнта
-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.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну та вирішити конфлікт."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Створення замовлень на поставку
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Створення нового клієнта
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Якщо кілька правил ціноутворення продовжують переважати, користувачам пропонується встановити пріоритет вручну та вирішити конфлікт."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Створення замовлень на поставку
 ,Purchase Register,Реєстр закупівель
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Застосовувані Збори
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) повинен мати роль ""Погоджувач  відпусток"""
 DocType: Purchase Receipt,Vehicle Date,Дата
 DocType: Student Log,Medical,Медична
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Причина втрати
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Причина втрати
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,"Ведучий власник не може бути такою ж, як свинець"
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,Розподілена сума не може перевищувати неврегульовану
 DocType: Announcement,Receiver,приймач
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Кількість та ціна
 DocType: Delivery Note,% Installed,% Встановлено
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,"Кабінети / лабораторії і т.д., де лекції можуть бути заплановані."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,"Будь ласка, введіть назву компанії в першу чергу"
 DocType: Purchase Invoice,Supplier Name,Назва постачальника
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Прочитайте керівництво ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обов&#39;язкове поле - Академічний рік
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Обов&#39;язкове поле - Академічний рік
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,"Налаштуйте вступний текст, який йде як частина цього e-mail. Кожна операція має окремий вступний текст."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},"Будь ласка, встановіть за замовчуванням заборгованості рахунки для компанії {0}"
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Глобальні налаштування для всіх виробничих процесів.
 DocType: Accounts Settings,Accounts Frozen Upto,Рахунки заблоковано по
 DocType: SMS Log,Sent On,Відправлено На
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,Атрибут {0} вибрано кілька разів в таблиці атрибутів
 DocType: HR Settings,Employee record is created using selected field. ,Співробітник запис створено за допомогою обраного поля.
 DocType: Sales Order,Not Applicable,Не застосовується
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Майстер вихідних.
 DocType: Request for Quotation Item,Required Date,Потрібно на дату
 DocType: Delivery Note,Billing Address,Адреса для рахунків
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,"Будь ласка, введіть код предмета."
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,"Будь ласка, введіть код предмета."
 DocType: BOM,Costing,Калькуляція
 DocType: Tax Rule,Billing County,Область (оплата)
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount","Якщо позначено, то сума податку буде вважатися вже включеною у ціну друку / суму друку"
@@ -507,6 +511,7 @@
 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,Цінні папери та депозити
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method","Неможливо змінити метод оцінки, так як є угоди щодо деяких пунктів, які не мають його власний метод оцінки"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,"Всього листя, виділені є обов&#39;язковим"
 DocType: Job Opening,Description of a Job Opening,Опис роботу Відкриття
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,В очікуванні діяльність на сьогоднішній день
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,"Будь ласка, виберіть курс"
 DocType: Timesheet Detail,Hrs,годин
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,"Будь ласка, виберіть компанію"
 DocType: Stock Entry Detail,Difference Account,Рахунок різниці
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,"Неможливо закрити завдання, як її залежить завдання {0} не закрите."
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,"Будь ласка, введіть Склад для якого буде створено Замовлення матеріалів"
 DocType: Production Order,Additional Operating Cost,Додаткова Експлуатаційні витрати
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Косметика
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items","Щоб об&#39;єднати, наступні властивості повинні бути однаковими для обох пунктів"
 DocType: Shipping Rule,Net Weight,Вага нетто
 DocType: Employee,Emergency Phone,Аварійний телефон
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Купівля
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,"Будь ласка, визначте клас для Threshold 0%"
 DocType: Sales Order,To Deliver,Доставити
 DocType: Purchase Invoice Item,Item,Номенклатура
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Серійний номер не може бути дробовим
 DocType: Journal Entry,Difference (Dr - Cr),Різниця (Д - Cr)
 DocType: Account,Profit and Loss,Про прибутки та збитки
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Управління субпідрядом
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Приріст не може бути 0
 DocType: Production Planning Tool,Material Requirement,Вимога Матеріал
 DocType: Company,Delete Company Transactions,Видалити операції компанії
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Посилання № та дата Reference є обов&#39;язковим для операції банку
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Додати / редагувати податки та збори
 DocType: Purchase Invoice,Supplier Invoice No,Номер рахунку постачальника
 DocType: Territory,For reference,Для довідки
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Номенклатура відмітки про встановлення
 DocType: Production Plan Item,Pending Qty,К-сть в очікуванні
 DocType: Budget,Ignore,Ігнорувати
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} не активний
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} не активний
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS відправлено наступних номерів: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,Встановіть розміри чеку для друку
 DocType: Salary Slip,Salary Slip Timesheet,Табель зарплатного розрахунку
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Всього комісія
 DocType: Pricing Rule,Sales Partner,Торговий партнер
 DocType: Buying Settings,Purchase Receipt Required,Потрібна прихідна накладна
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Собівартість обов'язкова при введенні залишків
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,Не знайдено записів у таблиці рахунку-фактури
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,"Будь ласка, виберіть компанію та контрагента спершу"
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Фінансова / звітний рік.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,накопичені значення
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged","На жаль, серійні номери не можуть бути об'єднані"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Зробити замовлення на продаж
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Зробити замовлення на продаж
 DocType: Project Task,Project Task,Проект Завдання
 ,Lead Id,Lead Id
 DocType: C-Form Invoice Detail,Grand Total,Загальний підсумок
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,резюме Додаток
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,Постійні клієнти
 DocType: Leave Control Panel,Allocate,Виділяти
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Продажі Повернутися
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Продажі Повернутися
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,"Примітка: Сумарна кількість виділених листя {0} не повинно бути менше, ніж вже затверджених листя {1} на період"
 DocType: Announcement,Posted By,Автор
 DocType: Item,Delivered by Supplier (Drop Ship),Поставляється Постачальником (Пряма доставка)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Пропозиція для
 DocType: Lead,Middle Income,Середній дохід
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),На початок (Кт)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Розподілена сума не може бути негативною
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Будь ласка, встановіть компанії"
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,"Будь ласка, встановіть компанії"
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Розклад вихідних рахунків-фактур
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Підстава:Номер та Підстава:Дата необхідні для {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Виберіть Обліковий запис Оплата зробити Банк Стажер
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Створення записів співробітників для управління листя, витрат і заробітної плати претензій"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Додати в бази знань
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Пропозиція Написання
 DocType: Payment Entry Deduction,Payment Entry Deduction,Відрахування з Оплати
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' не в межах фінансового року {2}
 DocType: Buying Settings,Settings for Buying Module,Налаштування модуля закупівель
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} не належить компанії {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,"Будь ласка, введіть прихідну накладну спершу"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Тоді Цінові правила фільтруються на основі Замовника, Групи покупця, Території, Постачальника, Типу постачальника, Кампанії, Торгового партнера і т.д."
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Чиста зміна в інвентаризації
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Управління кредитів співробітників
 DocType: Employee,Passport Number,Номер паспорта
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Зв&#39;язок з Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Менеджер
 DocType: Payment Entry,Payment From / To,Оплата с / з
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Проміжок часу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},Новий кредитний ліміт менше поточної суми заборгованості для клієнта. Кредитний ліміт повинен бути зареєстровано не менше {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,"""Базується на"" і ""Згруповано за"" не можуть бути однаковими"
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,У хвилини
 DocType: Issue,Resolution Date,Дозвіл Дата
 DocType: Student Batch Name,Batch Name,пакетна Ім&#39;я
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Табель робочого часу створено:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Табель робочого часу створено:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},"Будь ласка, встановіть Cash замовчуванням або банківського рахунку в режимі з оплати {0}"
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,зараховувати
 DocType: Selling Settings,Customer Naming By,Називати клієнтів по
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Покажу студент як присутній в студентській Monthly відвідуваності звіту
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,Фактичний початок Час
 DocType: BOM Operation,Operation Time,Час роботи
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,обробка
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,база
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,база
 DocType: Timesheet,Total Billed Hours,Всього Оплачувані Годинник
 DocType: Journal Entry,Write Off Amount,Списання Сума
 DocType: Journal Entry,Bill No,Bill №
@@ -719,7 +723,7 @@
 DocType: Student Attendance,Student Attendance,Student Учасники
 DocType: Sales Invoice Timesheet,Time Sheet,Розклад
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,З зворотним промиванням Сировина матеріали на основі
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,"Будь ласка, введіть дані товаром"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,"Будь ласка, введіть дані товаром"
 DocType: Interest,Interest,інтерес
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Препродаж
 DocType: Purchase Receipt,Other Details,Інші подробиці
@@ -730,24 +734,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Оплату вже створено
 DocType: Purchase Receipt Item Supplied,Current Stock,Наявність на складі
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Рядок # {0}: Asset {1} не пов&#39;язаний з п {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Попередній перегляд Зарплатного розрахунку
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Рахунок {0} був введений кілька разів
 DocType: Account,Expenses Included In Valuation,"Витрати, що включаються в оцінку"
 DocType: Hub Settings,Seller City,Продавець Місто
 ,Absent Student Report,Відсутня Student Report
 DocType: Email Digest,Next email will be sent on:,Наступна буде відправлено листа на:
 DocType: Offer Letter Term,Offer Letter Term,Пропозиція Лист термін
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Номенклатурна позиція має варіанти.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,Номенклатурна позиція має варіанти.
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,Пункт {0} знайдений
 DocType: Bin,Stock Value,Значення запасів
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Компанія {0} не існує
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Тип Дерева
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Тип Дерева
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Кількість Споживана за одиницю
 DocType: Serial No,Warranty Expiry Date,Термін дії гарантії
 DocType: Material Request Item,Quantity and Warehouse,Кількість і Склад
 DocType: Sales Invoice,Commission Rate (%),Ставка комісії (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,"Будь ласка, виберіть Програми"
 DocType: Project,Estimated Cost,орієнтовна вартість
@@ -766,7 +768,7 @@
 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,Рахунок/обліковий запис за замовчуванням
 DocType: Payment Entry,Received Amount (Company Currency),Отримана сума (Компанія Валюта)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,"Lead повинен бути встановлений, якщо Нагода зроблена з Lead"
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,"Будь ласка, виберіть щотижневий вихідний день"
 DocType: Production Order Operation,Planned End Time,Плановані Час закінчення
 ,Sales Person Target Variance Item Group-Wise,Розбіжності цілей Відповідальних з продажу (по групах товарів)
@@ -782,6 +784,7 @@
 DocType: Opportunity,Opportunity From,Нагода від
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Щомісячна виписка зарплата.
 DocType: BOM,Website Specifications,Характеристики веб-сайту
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: З {0} типу {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення є обов&#39;язковим
@@ -816,6 +819,7 @@
 DocType: Employee,Bank A/C No.,Номер банк. рахунку
 DocType: Bank Guarantee,Project,Проект
 DocType: Quality Inspection Reading,Reading 7,Читання 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,частково Замовлений
 DocType: Expense Claim Detail,Expense Claim Type,Тип Авансового звіту
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Налаштування за замовчуванням для кошик
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Зіпсовані активи згідно проводки{0}
@@ -823,14 +827,14 @@
 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 +107,Office Maintenance Expenses,Витрати утримання офісу
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Налаштування облікового запису електронної пошти
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,"Будь ласка, введіть перший пункт"
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,"Будь ласка, введіть перший пункт"
 DocType: Account,Liability,Відповідальність
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,"Санкціонований сума не може бути більше, ніж претензії Сума в рядку {0}."
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,Прайс-лист не вибраний
 DocType: Employee,Family Background,Сімейні обставини
 DocType: Request for Quotation Supplier,Send Email,Відправити e-mail
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Увага: Невірне долучення {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,Немає доступу
 DocType: Company,Default Bank Account,Банківський рахунок за замовчуванням
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first","Щоб відфільтрувати на основі партії, виберіть партія першого типу"
@@ -843,8 +847,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Жоден працівник не знайдено
 DocType: Supplier Quotation,Stopped,Зупинився
 DocType: Item,If subcontracted to a vendor,Якщо підряджено постачальникові
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентська група вже була поновлена.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентська група вже була поновлена.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Студентська група вже була поновлена.
 DocType: SMS Center,All Customer Contact,Всі Контакти клієнта
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Завантажити складські залишки з CSV.
 DocType: Warehouse,Tree Details,деталі Дерева
@@ -855,8 +859,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Мінімальна Сума рахунку
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Центр витрат {2} не належить Компанії {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Рахунок {2} не може бути групою
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Пункт Рядок {IDX}: {доктайпів} {DOCNAME} не існує в вище &#39;{доктайпів}&#39; таблиця
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Табель {0} вже завершено або скасовано
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,немає завдання
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","День місяця, в який авто-рахунок-фактура буде створений, наприклад, 05, 28 і т.д."
 DocType: Asset,Opening Accumulated Depreciation,Накопичений знос на момент відкриття
@@ -872,7 +876,7 @@
 DocType: Bin,Moving Average Rate,Moving Average Rate
 DocType: Production Planning Tool,Select Items,Оберіть товари
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} проти рахунку {1} від {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Розклад курсу
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Розклад курсу
 DocType: Maintenance Visit,Completion Status,Статус завершення
 DocType: HR Settings,Enter retirement age in years,Введіть вік виходу на пенсію в роках
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Склад призначення
@@ -880,7 +884,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Дозволити перевищення доставки або накладної до цього відсотка
 DocType: Stock Entry,STE-,стереотипами
 DocType: Upload Attendance,Import Attendance,Імпорт Відвідуваності
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Всі Групи товарів
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Всі Групи товарів
 DocType: Process Payroll,Activity Log,Журнал активності
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Чистий прибуток / збиток
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Автоматично написати повідомлення за поданням угод.
@@ -891,7 +895,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Замовлення на придбання у Оплату
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,Прогнозована к-сть
 DocType: Sales Invoice,Payment Due Date,Дата платежу
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',"""Відкривається"""
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Відкрити To Do
 DocType: Notification Control,Delivery Note Message,Доставка Примітка Повідомлення
@@ -907,7 +911,7 @@
 DocType: Item Reorder,Re-Order Qty,Кількість Дозамовлення
 DocType: Leave Block List Date,Leave Block List Date,Дата списку блокування відпусток
 DocType: Pricing Rule,Price or Discount,Ціна зі знижкою або
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всього Застосовуються збори в таблиці Purchase квитанцій Елементів повинні бути такими ж, як всі податки і збори"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,"Всього Застосовуються збори в таблиці Purchase квитанцій Елементів повинні бути такими ж, як всі податки і збори"
 DocType: Sales Team,Incentives,Стимули
 DocType: SMS Log,Requested Numbers,Необхідні Номери
 DocType: Production Planning Tool,Only Obtain Raw Materials,Отримати тільки сировину
@@ -936,13 +940,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Субпідряджено
 DocType: Item Attribute,Item Attribute Values,Пункт значень атрибутів
 DocType: Examination Result,Examination Result,експертиза Результат
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Прихідна накладна
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Прихідна накладна
 ,Received Items To Be Billed,"Отримані позиції, на які не виставлені рахунки"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Відправив Зарплатні Slips
 DocType: Employee,Ms,Місс
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Майстер курсів валют.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Довідник Doctype повинен бути одним з {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Довідник Doctype повинен бути одним з {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},Неможливо знайти часовий інтервал в найближчі {0} днів для роботи {1}
 DocType: Production Order,Plan material for sub-assemblies,План матеріал для суб-вузлів
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,Торгові партнери та території
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,"Не може автоматично створювати рахунки, оскільки є вже запас балансу на рахунку. Ви повинні створити відповідний рахунок, перш ніж ви можете зробити запис на цьому складі"
@@ -965,10 +969,9 @@
 DocType: Supplier,Default Payable Accounts,За замовчуванням заборгованість Кредиторська
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Працівник {0} не є активним або не існує
 DocType: Fee Structure,Components,компоненти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Варіанти позиції {0} оновлено
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},"Будь ласка, введіть Asset Категорія в пункті {0}"
 DocType: Quality Inspection Reading,Reading 6,Читання 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Може не {0} {1} {2} без будь-якого негативного видатний рахунок-фактура
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Передоплата по вхідному рахунку
 DocType: Hub Settings,Sync Now,Синхронізувати зараз
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Ряд {0}: Кредитна запис не може бути пов&#39;язаний з {1}
@@ -982,11 +985,11 @@
 DocType: Item,Is Purchase Item,Покупний товар
 DocType: Asset,Purchase Invoice,Вхідний рахунок-фактура
 DocType: Stock Ledger Entry,Voucher Detail No,Документ номер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Новий вихідний рахунок
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Новий вихідний рахунок
 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,Дата відкриття та дата закриття повинні бути в межах одного фінансового року
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Дата відкриття та дата закриття повинні бути в межах одного фінансового року
 DocType: Lead,Request for Information,Запит інформації
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Синхронізація Offline рахунків-фактур
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Синхронізація Offline рахунків-фактур
 DocType: Payment Request,Paid,Оплачений
 DocType: Program Fee,Program Fee,вартість програми
 DocType: Salary Slip,Total in words,Разом прописом
@@ -996,7 +999,7 @@
 DocType: Employee Loan,Sanctioned,санкціоновані
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.","Для елементів ""комплекту"" , склад, серійний номер та № пакету будуть братися з таблиці ""комплектації"". Якщо склад та партія є однаковими для всіх пакувальних компонентів для будь-якого ""комплекту"", ці значення можуть бути введені в основній таблиці позицій, значення будуть скопійовані в таблицю ""комлектації""."
 DocType: Job Opening,Publish on website,Опублікувати на веб-сайті
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Поставки клієнтам.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Дата рахунку постачальника не може бути більше за дату створення
@@ -1007,7 +1010,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,Розбіжність
 ,Company Name,Назва компанії
 DocType: SMS Center,Total Message(s),Загалом повідомлень
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,Вибрати пункт трансферу
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,Select Item for Transfer,Вибрати пункт трансферу
 DocType: Purchase Invoice,Additional Discount Percentage,Додаткова знижка у відсотках
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +24,View a list of all the help videos,Переглянути перелік усіх довідкових відео
 DocType: Bank Reconciliation,Select account head of the bank where cheque was deposited.,"Виберіть account head банку, в якому був розміщений чек."
@@ -1018,8 +1021,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,Ряд {0}: Оплати згідно Замовлення клієнта/Замовлення на  придбання повинні бути завжди відмічені як аванси
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,Хімічна
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,"За замовчуванням банк / Готівковий рахунок буде автоматично оновлюватися в Зарплатний Запис в журналі, коли обраний цей режим."
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again","Інтервали для коду Grade {0} перетинається з інтервалами класу для інших класів. Будь ласка, перевірте інтервали {0} і {1} і спробуйте ще раз"
 DocType: BOM,Raw Material Cost(Company Currency),Вартість сировини (Компанія Валюта)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,Всі деталі вже були передані для цього виробничого замовлення.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},"Рядок # {0}: Оцінити не може бути більше, ніж швидкість використовуваної в {1} {2}"
@@ -1032,14 +1033,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Сайт товару
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Відвантажити ваш фірмовий заголовок та логотип. (Ви зможете відредагувати їх пізніше).
 DocType: Timesheet Detail,Bill,Bill
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Введена дата наступної амортизації - у минулому
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Білий
 DocType: SMS Center,All Lead (Open),Всі Lead (відкрито)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Рядок {0}: К-сть недоступна для {4} на складі {1} на час проведення ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Взяти видані аванси
 DocType: Item,Automatically Create New Batch,Автоматичне створення нового пакета
 DocType: Item,Automatically Create New Batch,Автоматичне створення нового пакета
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Зробити
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Зробити
 DocType: Student Admission,Admission Start Date,Прийом Початкова дата
 DocType: Journal Entry,Total Amount in Words,Загальна сума прописом
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,"Був помилка. Одна з можливих причин може бути те, що ви не зберегли форму. Будь ласка, зв&#39;яжіться з support@erpnext.com якщо проблема не усунена."
@@ -1047,7 +1048,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,К-сть на початок роботи
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,"Будь ласка, введіть рахунок для суми змін"
 DocType: Student Batch Name,Student Batch Name,Student Пакетне Ім&#39;я
 DocType: Holiday List,Holiday List Name,Ім'я списку вихідних
 DocType: Repayment Schedule,Balance Loan Amount,Баланс Сума кредиту
@@ -1067,10 +1068,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Введіть {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Вилучені пункти без зміни в кількості або вартості.
 DocType: Delivery Note,Delivery To,Доставка Для
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Атрибут стіл є обов&#39;язковим
 DocType: Production Planning Tool,Get Sales Orders,Отримати Замовлення клієнта
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} не може бути від’ємним
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Знижка
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Знижка
 DocType: Asset,Total Number of Depreciations,Загальна кількість амортизацій
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
 DocType: Sales Invoice Item,Rate With Margin,Швидкість З полями
@@ -1086,7 +1087,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,Зарезервовано Склад в замовлення клієнта / Склад готової продукції
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Продаж Сума
 DocType: Repayment Schedule,Interest Amount,відсотки Сума
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви - погоджувач витрат для цього запису. Оновіть 'Стан' і збережіть
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,Ви - погоджувач витрат для цього запису. Оновіть 'Стан' і збережіть
 DocType: Serial No,Creation Document No,Створення документа Немає
 DocType: Issue,Issue,Проблема
 DocType: Asset,Scrapped,знищений
@@ -1094,12 +1095,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Атрибути для варіантного товара. наприклад, розмір, колір і т.д."
 DocType: Purchase Invoice,Returns,Повернення
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,"Склад ""В роботі"""
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} на контракті обслуговування  до {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Серійний номер {0} на контракті обслуговування  до {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,вербування
 DocType: Lead,Organization Name,Назва організації
 DocType: Tax Rule,Shipping State,Штат доставки
 ,Projected Quantity as Source,Запланована кількість як джерело
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,"Позиція повинна додаватися за допомогою кнопки ""Отримати позиції з прихідної накладної"""
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Включити позабіржові пункти
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Витрати на збут
@@ -1107,12 +1108,12 @@
 DocType: GL Entry,Against,Проти
 DocType: Item,Default Selling Cost Center,Центр витрат продажу за замовчуванням
 DocType: Sales Partner,Implementation Partner,Реалізація Партнер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,ЗІП код
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Поштовий індекс
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Замовлення клієнта {0} {1}
 DocType: Opportunity,Contact Info,Контактна інформація
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Створення Руху ТМЦ
 DocType: Packing Slip,Net Weight UOM,Вага нетто Одиниця виміру
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Результати
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Результати
 DocType: Item,Default Supplier,Постачальник за замовчуванням
 DocType: Manufacturing Settings,Over Production Allowance Percentage,За квота на виробництво Відсоток
 DocType: Employee Loan,Repayment Schedule,погашення Розклад
@@ -1120,7 +1121,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Отримати щотижневі вихідні
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,"Дата закінчення не може бути менше, ніж Дата початку"
 DocType: Sales Person,Select company name first.,Виберіть назву компанії в першу чергу.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,доктор
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,доктор
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Пропозиції отримані від постачальників
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Для {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Середній вік
@@ -1140,7 +1141,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Ключ Площа Продуктивність
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Транспорт
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,неправильний атрибут
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} повинен бути проведений
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} повинен бути проведений
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Кількість повинна бути менше або дорівнює {0}
 DocType: SMS Center,Total Characters,Загалом символів
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},"Будь ласка, виберіть Норми в полі Норми витрат для позиції {0}"
@@ -1151,7 +1152,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 +224,Production Order {0} must be cancelled before cancelling this Sales Order,Виробниче замовлення {0} має бути скасоване до скасування цього замовлення клієнта
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',"Будь ласка, встановіть &quot;Застосувати Додаткова Знижка On &#39;"
 ,Ordered Items To Be Billed,"Замовлені товари, на які не виставлені рахунки"
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,"С Діапазон повинен бути менше, ніж діапазон"
 DocType: Global Defaults,Global Defaults,Глобальні значення за замовчуванням
@@ -1161,7 +1162,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,рік початку
 DocType: Purchase Invoice,Start date of current invoice's period,Початкова дата поточного періоду виставлення рахунків
 DocType: Salary Slip,Leave Without Pay,Відпустка без збереження заробітної
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Планування потужностей Помилка
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,Планування потужностей Помилка
 ,Trial Balance for Party,Оборотно-сальдова відомість для контрагента
 DocType: Lead,Consultant,Консультант
 DocType: Salary Slip,Earnings,Доходи
@@ -1176,7 +1177,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Це буде додано до коду варіанту. Наприклад, якщо ваша абревіатура ""СМ"", і код товару ""Футболки"", тоді код варіанту буде ""Футболки-СМ"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,"Сума ""на руки"" (прописом) буде видно, як тільки ви збережете Зарплатний розрахунок."
 DocType: Purchase Invoice,Is Return,Повернення
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Повернення / дебетові Примітка
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Повернення / дебетові Примітка
 DocType: Price List Country,Price List Country,Ціни Країна
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} дійсні серійні номери для позиції {1}
@@ -1186,11 +1187,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,"Будь ласка, введіть код товару, щоб отримати номер партії"
 DocType: Stock Settings,Default Item Group,Група за замовчуванням
 DocType: Employee Loan,Partially Disbursed,частково Освоєно
-DocType: Grading Structure,Grading System Name,Назва системи класифікації
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,База даних постачальника
 DocType: Account,Balance Sheet,Бухгалтерський баланс
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Центр витрат для позиції з кодом
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Режим оплати не налаштований. Будь ласка, перевірте, чи вибрний рахунок у Режимі Оплати або у POS-профілі."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,"Ваш відповідальний з продажу отримає нагадування в цей день, щоб зв'язатися з клієнтом"
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Той же елемент не може бути введений кілька разів.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Подальші рахунки можуть бути зроблені відповідно до груп, але Ви можете бути проти НЕ-груп"
@@ -1202,7 +1202,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Складська книга та Бухгалтерська книга поновлені за вибраною прихідною накладною
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Складська книга та Бухгалтерська книга поновлені за вибраною прихідною накладною
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Пункт 1
 DocType: Holiday,Holiday,Вихідний
 DocType: Support Settings,Close Issue After Days,Закрити Issue Після днів
@@ -1229,11 +1229,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Зроблено
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,"Будь ласка, вкажіть як мінімум один атрибут в таблиці атрибутів"
 DocType: Announcement,All Students,всі студенти
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Номенклатурна позиція {0} має бути неінвентарною
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Подивитися Леджер
 DocType: Grading Scale,Intervals,інтервали
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Найперша
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Існує група з такою самою назвою, будь ласка, змініть назву елементу або перейменуйте групу"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Student Mobile No.
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,Решта світу
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,Позиція {0} не може мати партій
@@ -1273,9 +1273,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Виплата заробітної плати від {0} до {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},Не дозволено редагувати заблокований рахунок {0}
 DocType: Journal Entry,Get Outstanding Invoices,Отримати неоплачені рахунки-фактури
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Замовлення клієнта {0} не є допустимим
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,Замовлення допоможуть вам планувати і стежити за ваші покупки
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","На жаль, компанії не можуть бути об&#39;єднані"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Загальна кількість  / Переміщена кількість {0} у Замовленні матеріалів {1} \ не може бути більше необхідної кількості {2} для позиції {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Невеликий
@@ -1296,10 +1296,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Непрямі витрати
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Ряд {0}: Кількість обов&#39;язково
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Сільське господарство
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Дані майстра синхронізації
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Дані майстра синхронізації
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,Ваші продукти або послуги
 DocType: Mode of Payment,Mode of Payment,Спосіб платежу
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Зображення для веб-сайту має бути загальнодоступним файлом або адресою веб-сайту
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,Норми
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Це кореневий елемент групи і не можуть бути змінені.
@@ -1317,18 +1317,18 @@
 DocType: Student Group Student,Group Roll Number,Група Ролл Кількість
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Для {0}, тільки кредитні рахунки можуть бути пов&#39;язані з іншою дебету"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,"Сума всіх ваг завдання повинна бути 1. Будь ласка, поміняйте ваги всіх завдань проекту, відповідно,"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Накладна {0} не проведена
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Накладна {0} не проведена
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","Цінове правило базується на полі ""Застосовується до"", у якому можуть бути: номенклатурна позиція, група або бренд."
 DocType: Hub Settings,Seller Website,Веб-сайт продавця
 DocType: Item,ITEM-,item-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Всього виділено відсоток для відділу продажів повинна бути 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Статус виробничого замовлення {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Статус виробничого замовлення {0}
 DocType: Appraisal Goal,Goal,Мета
 DocType: Sales Invoice Item,Edit Description,Редагувати опис
 ,Team Updates,команда поновлення
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Для Постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,Для Постачальника
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,Встановлення типу рахунку допомагає у виборі цього рахунку в операціях.
 DocType: Purchase Invoice,Grand Total (Company Currency),Загальний підсумок (валюта компанії)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Створення Формат друку
@@ -1344,7 +1344,7 @@
 DocType: Depreciation Schedule,Journal Entry,Проводка
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} виготовляються товари
 DocType: Workstation,Workstation Name,Назва робочої станції
-DocType: Grade Interval,Grade Code,код Оцінка
+DocType: Grading Scale Interval,Grade Code,код Оцінка
 DocType: POS Item Group,POS Item Group,POS Item Group
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Електронна пошта Дайджест:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},Норми {0} не належать до позиції {1}
@@ -1361,7 +1361,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Апаратний
 DocType: Sales Order,Recurring Upto,повторювані Upto
 DocType: Attendance,HR Manager,менеджер з персоналу
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,"Будь ласка, виберіть компанію"
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,"Будь ласка, виберіть компанію"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Привілейований Залишити
 DocType: Purchase Invoice,Supplier Invoice Date,Дата рахунку постачальника
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Вам необхідно включити Кошик
@@ -1377,7 +1377,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Їжа
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Старіння Діапазон 3
 DocType: Maintenance Schedule Item,No of Visits,Кількість відвідувань
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Марк Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Графік обслуговування {0} існує проти {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,поступово студент
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Валюта закритті рахунку повинні бути {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Сума балів за всі цілі повинні бути 100. Зараз {0}
@@ -1402,7 +1403,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Середньоденний розхід
 DocType: POS Profile,Campaign,Кампанія
 DocType: Supplier,Name and Type,Найменування і тип
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',Статус офіційного затвердження повинні бути «Схвалено&quot; або &quot;Відхилено&quot;
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',Статус офіційного затвердження повинні бути «Схвалено&quot; або &quot;Відхилено&quot;
 DocType: Purchase Invoice,Contact Person,Контактна особа
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',"""Дата очікуваного початку"" не може бути пізніше, ніж ""Дата очікуваного закінчення"""
 DocType: Course Scheduling Tool,Course End Date,Курс Дата закінчення
@@ -1425,14 +1426,15 @@
 DocType: Sales Invoice,Shipping Address Name,Ім'я адреси доставки
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,План рахунків
 DocType: Material Request,Terms and Conditions Content,Зміст положень та умов
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,не може бути більше ніж 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,не може бути більше ніж 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Номенклатурна позиція {0} не є інвентарною
 DocType: Maintenance Visit,Unscheduled,Позапланові
 DocType: Employee,Owned,Бувший
 DocType: Salary Detail,Depends on Leave Without Pay,Залежить у відпустці без
 DocType: Pricing Rule,"Higher the number, higher the priority","Чим вище число, тим вище пріоритет"
 ,Purchase Invoice Trends,Динаміка вхідних рахунків
 DocType: Employee,Better Prospects,Кращі перспективи
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Рядок # {0}: Завантаження {1} має тільки {2} Кількість. Будь ласка, виберіть іншу партію, яка має {3} Кількість доступні або розділити рядок на кілька рядків, щоб доставити / випуск з декількох партій"
 DocType: Vehicle,License Plate,Номерний знак
 DocType: Appraisal,Goals,Мети
 DocType: Warranty Claim,Warranty / AMC Status,Гарантія / Статус річного обслуговування
@@ -1450,7 +1452,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Співробітник не може повідомити собі.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Якщо обліковий запис заморожується, записи дозволяється заборонених користувачів."
 DocType: Email Digest,Bank Balance,Банківський баланс
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Облік Вхід для {0}: {1} можуть бути зроблені тільки у валюті: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Профіль роботи, потрібна кваліфікація і т.д."
 DocType: Journal Entry Account,Account Balance,Баланс
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Податкове правило для операцій
@@ -1461,7 +1463,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Показати сальдо прибутків/збитків незакритого фіскального року
 DocType: Shipping Rule,Shipping Account,Рахунок доставки
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Рахунок {2} неактивний
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,"Зробити замовлення клієнтів, щоб допомогти вам спланувати роботу і поставити на час"
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,"Зробити замовлення клієнтів, щоб допомогти вам спланувати роботу і поставити на час"
 DocType: Quality Inspection,Readings,Показання
 DocType: Stock Entry,Total Additional Costs,Всього Додаткові витрати
 DocType: Course Schedule,SH,SH
@@ -1472,7 +1474,7 @@
 DocType: Shipping Rule Condition,To Value,До вартості
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,Пакувальний лист
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Пакувальний лист
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Оренда площі для офісу
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Встановіть налаштування шлюзу SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Імпорт вдалося!
@@ -1494,11 +1496,11 @@
 DocType: Company,Services,Послуги
 DocType: HR Settings,Email Salary Slip to Employee,Відправити Зарплатний розрахунок працівнику e-mail-ом
 DocType: Cost Center,Parent Cost Center,Батьківський центр витрат
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Вибір можливого постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Вибір можливого постачальника
 DocType: Sales Invoice,Source,Джерело
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Показати закрито
 DocType: Leave Type,Is Leave Without Pay,Є відпустці без
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Категорія активів є обов&#39;язковим для фіксованого елемента активів
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,Записи не знайдені в таблиці Оплата
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Це {0} конфлікти з {1} для {2} {3}
 DocType: Student Attendance Tool,Students HTML,студенти HTML
@@ -1516,7 +1518,7 @@
 DocType: Student,Date of Leaving,Дата Залишаючи
 DocType: Pricing Rule,For Price List,Для Прайс-листу
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Executive Search
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,створення потенційних
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,створення потенційних
 DocType: Maintenance Schedule,Schedules,Розклади
 DocType: Purchase Invoice Item,Net Amount,Чиста сума
 DocType: Purchase Order Item Supplied,BOM Detail No,Номер деталі у нормах
@@ -1544,9 +1546,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,програма Учнів
 DocType: Sales Invoice Item,Brand Name,Назва бренду
 DocType: Purchase Receipt,Transporter Details,Transporter Деталі
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,За замовчуванням склад потрібно для обраного елемента
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Коробка
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,можливий постачальник
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,можливий постачальник
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Організація
 DocType: Budget,Monthly Distribution,Місячний розподіл
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Список отримувачів порожній. Створіть його будь-ласка
@@ -1554,8 +1556,8 @@
 DocType: Sales Partner,Sales Partner Target,Цілі торгового партнеру
 DocType: Loan Type,Maximum Loan Amount,Максимальна сума кредиту
 DocType: Pricing Rule,Pricing Rule,Цінове правило
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Дублікат номер рулону для студента {0}
 DocType: Budget,Action if Annual Budget Exceeded,"Дія, якщо річний бюджет перевищено"
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Замовлення матеріалів у Замовлення на придбання
 DocType: Shopping Cart Settings,Payment Success URL,Успіх Оплата URL
@@ -1576,9 +1578,9 @@
 DocType: Employee Loan,Repayment Method,спосіб погашення
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Якщо позначено, то головною сторінкою веб-сайту буде ""Група об’єктів"" за замовчуванням"
 DocType: Quality Inspection Reading,Reading 4,Читання 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},За замовчуванням BOM для {0} не знайдено для проекту {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},За замовчуванням BOM для {0} не знайдено для проекту {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Претензії рахунок компанії.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Студенти в центрі системи, додайте всі студенти"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Студенти в центрі системи, додайте всі студенти"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Рядок # {0}: clearence дата {1} не може бути менша дати чеку {2}
 DocType: Company,Default Holiday List,Список вихідних за замовчуванням
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Рядок {0}: Від часу і часу {1} перекривається з {2}
@@ -1590,21 +1592,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,"День(дні), на якій ви подаєте заяву на відпустку - вихідні. Вам не потрібно подавати заяву."
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Повторно оплати на e-mail
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Нове завдання
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Зробіть цитати
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Зробіть цитати
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Інші звіти
 DocType: Dependent Task,Dependent Task,Залежить Завдання
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},Коефіцієнт для замовчуванням Одиниця виміру повинні бути 1 в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},Відпустка типу {0} не може бути довше ніж {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,Спробуйте планувати операції X днів вперед.
 DocType: HR Settings,Stop Birthday Reminders,Стоп нагадування про дні народження
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},"Будь ласка, встановіть за замовчуванням Payroll розрахунковий рахунок в компанії {0}"
 DocType: SMS Center,Receiver List,Список отримувачів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Пошук товару
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Пошук товару
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Споживана Сума
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Чиста зміна грошових коштів
 DocType: Assessment Plan,Grading Scale,оціночна шкала
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,Вже завершено
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,Одиниця виміру {0} був введений більш ніж один раз в таблицю перетворення фактора
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,Вже завершено
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Запит про оплату {0} вже існує
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Вартість виданих предметів
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},"Кількість не повинна бути більше, ніж {0}"
@@ -1636,12 +1638,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Зробити запис виплат
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,Ряд {0}: Аванси по постачальнику повинні бути у дебеті
 DocType: Company,Default Values,Значення за замовчуванням
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{} Частоти Дайджест
 DocType: Expense Claim,Total Amount Reimbursed,Загальна сума відшкодовуються
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Це засновано на колодах проти цього транспортного засобу. Див графік нижче для отримання докладної інформації
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,збирати
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Згідно вхідного рахунку-фактури {0} від {1}
 DocType: Customer,Default Price List,Прайс-лист за замовчуванням
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,Рух активів {0} створено
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,Рух активів {0} створено
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Ви не можете видаляти фінансовий рік {0}. Фінансовий рік {0} встановлено за замовчанням в розділі Глобальні параметри
 DocType: Journal Entry,Entry Type,Тип запису
 ,Customer Credit Balance,Кредитний Баланс клієнтів
@@ -1661,7 +1664,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Жоден з пунктів не мають яких-небудь змін в кількості або вартості.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обов&#39;язкове поле - Програма
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Обов&#39;язкове поле - Програма
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Претензія по гарантії
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Претензія по гарантії
 ,Lead Details,Деталі Lead-а
 DocType: Salary Slip,Loan repayment,погашення позики
 DocType: Purchase Invoice,End date of current invoice's period,Кінцева дата періоду виставлення рахунків
@@ -1680,12 +1683,10 @@
 DocType: Employee,Permanent Address,Постійна адреса
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}","Сума авансу по {0} {1} не може бути більше \, ніж загальний підсумок {2}"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,"Будь ласка, виберіть пункт код"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,"Будь ласка, виберіть пункт код"
 DocType: Student Sibling,Studying in Same Institute,Навчання в тому ж інституті
 DocType: Territory,Territory Manager,Регіональний менеджер
 DocType: Packed Item,To Warehouse (Optional),На склад (Необов&#39;язково)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
 DocType: Payment Entry,Paid Amount (Company Currency),Платні Сума (Компанія валют)
 DocType: Purchase Invoice,Additional Discount,Додаткова знижка
 DocType: Selling Settings,Selling Settings,Налаштування продаж
@@ -1695,9 +1696,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Дивіться в кошик
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Маркетингові витрати
 ,Item Shortage Report,Повідомлення про нестачу номенклатурних позицій
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Вагу вказано, \ nБудь ласка, вкажіть ""Одиницю виміру ваги"" теж"
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,"Замовлення матеріалів, що зробило цей Рух ТМЦ"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Наступна дата амортизації є обов'язковою для нового активу
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Наступна дата амортизації є обов'язковою для нового активу
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Окремий курс на основі групи для кожної партії
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Окремий курс на основі групи для кожної партії
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Одномісний блок елемента.
@@ -1714,8 +1715,7 @@
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Центр доходів/витрат необхідний для рахунку  прибутків/збитків {2}. Налаштуйте центр витрат за замовчуванням для Компанії.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,"Група клієнтів з таким ім'ям вже існує. Будь ласка, змініть Ім'я клієнта або перейменуйте Групу клієнтів"
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1732,7 +1732,7 @@
 ,Item-wise Sales Register,Попозиційний реєстр продаж
 DocType: Asset,Gross Purchase Amount,Загальна вартість придбання
 DocType: Asset,Depreciation Method,Метод нарахування зносу
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,Offline
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,Offline
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Це податок Включено в базовій ставці?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Всього Цільовий
 DocType: Program Course,Required,вимагається
@@ -1742,21 +1742,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Примирення JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Забагато стовбців. Експорт звіту і роздрукувати його за допомогою програми електронної таблиці.
 DocType: Purchase Invoice Item,Batch No,Партія №
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Неможливо знайти обмінний курс {0} до {1} для ключа дату {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Дозволити кілька замовлень клієнта на один оригінал замовлення клієнта
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 DocType: Student Group Instructor,Student Group Instructor,Студентська група інструкторів
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Немає
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Головна
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Варіант
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Головна
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Варіант
 DocType: Naming Series,Set prefix for numbering series on your transactions,Встановіть префікс нумерації серії ваших операцій
 DocType: Employee Attendance Tool,Employees HTML,співробітники HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,Норми за замовчуванням ({0}) мають бути активними для даного елемента або його шаблону
 DocType: Employee,Leave Encashed?,Оплачуване звільнення?
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,"Поле ""З"" у Нагоді є обов'язковим"
 DocType: Email Digest,Annual Expenses,річні витрати
 DocType: Item,Variants,Варіанти
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Зробіть Замовлення на придбання
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,Зробіть Замовлення на придбання
 DocType: SMS Center,Send To,Відправити
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},Недостатньо днів залишилося для типу відпусток {0}
 DocType: Payment Reconciliation Payment,Allocated amount,Розподілена сума
@@ -1764,7 +1763,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Клієнтам Код товара
 DocType: Stock Reconciliation,Stock Reconciliation,Інвентаризація
 DocType: Territory,Territory Name,Територія Ім&#39;я
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,"Склад ""в роботі"" необхідний щоб провести"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,"Склад ""в роботі"" необхідний щоб провести"
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Претендент на роботу.
 DocType: Purchase Order Item,Warehouse and Reference,Склад і довідники
 DocType: Supplier,Statutory info and other general information about your Supplier,Статутна інформація та інша загальна інформація про вашого постачальника
@@ -1772,11 +1771,10 @@
 DocType: Item,Serial Nos and Batches,Серійні номери і Порції
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студентська група Strength
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Студентська група Strength
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,"За проводкою {0} не має ніякого невідповідного {1}, запису"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,"За проводкою {0} не має ніякого невідповідного {1}, запису"
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,атестації
 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: Grading Structure,Grading Intervals,інтервали Оцінювання
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Будь ласка введіть
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Не може overbill для пункту {0} в рядку {1} більше, ніж {2}. Щоб дозволити завищені рахунки, будь ласка, встановіть в покупці Налаштування"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,"Будь ласка, встановіть фільтр, заснований на пункті або на складі"
@@ -1788,17 +1786,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,Норми витрат {0} потрібно провести
 DocType: Authorization Control,Authorization Control,Контроль Авторизація
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},Ряд # {0}: Відхилено Склад є обов&#39;язковим відносно відхилив Пункт {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Оплата
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Керуйте свої замовлення
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Оплата
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Керуйте свої замовлення
 DocType: Production Order Operation,Actual Time and Cost,Фактичний час і вартість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},Замовлення матеріалів на максимум {0} можуть бути зроблено для позиції {1} за Замовленням клієнта {2}
 DocType: Employee,Salutation,Привітання
 DocType: Course,Course Abbreviation,Абревіатура курсу
 DocType: Student Leave Application,Student Leave Application,Студент Залишити заявку
 DocType: Item,Will also apply for variants,Буде також застосовуватися для варіантів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Asset не може бути скасована, так як вона вже {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Співробітник {0} на півдня на {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},"Всього тривалість робочого часу не повинна бути більше, ніж максимальний робочий час {0}"
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,на
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Комплектувати у момент продажу.
 DocType: Quotation Item,Actual Qty,Фактична к-сть
 DocType: Sales Invoice Item,References,Посилання
@@ -1808,7 +1807,7 @@
 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 +91,Associate,Асоціювати
 DocType: Asset Movement,Asset Movement,Рух активів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Нова кошик
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Нова кошик
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Пункт {0} серіалізовані товару
 DocType: SMS Center,Create Receiver List,Створити список отримувачів
 DocType: Vehicle,Wheels,колеса
@@ -1840,10 +1839,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,"Відключення створення журналів по Виробничих замовленнях. Операції, не повинні відслідковуватись по виробничих замовленнях"
 DocType: Student,Student Mobile Number,Студент Мобільний телефон
 DocType: Item,Has Variants,Має Варіанти
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Ви вже вибрали елементи з {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Назва помісячного розподілу
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID є обов&#39;язковим
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,Batch ID є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,Batch ID є обов&#39;язковим
 DocType: Sales Person,Parent Sales Person,Батьківський Відповідальний з продажу
 DocType: Purchase Invoice,Recurring Invoice,Періодичний рахунок
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Управління проектами
@@ -1851,11 +1850,11 @@
 DocType: Budget,Fiscal Year,Звітний рік
 DocType: Vehicle Log,Fuel Price,паливо Ціна
 DocType: Budget,Budget,Бюджет
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Основний засіб повинен бути нескладським .
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Бюджет не може бути призначений на {0}, так як це не доход або витрата рахунки"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Досягнутий
 DocType: Student Admission,Application Form Route,Заявка на маршрут
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Територія / клієнтів
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Територія / клієнтів
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,"наприклад, 5"
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,"Залиште Тип {0} не може бути виділена, так як він неоплачувану відпустку"
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},Рядок {0}: Розподілена сума {1} повинна бути менше або дорівнювати сумі до оплати у рахунку {2}
@@ -1875,14 +1874,14 @@
 ,Serial No Status,Статус Серійного номеру
 DocType: Payment Entry Reference,Outstanding,Неоплачено
 ,Daily Timesheet Summary,Щоденний підсумок за табелем
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","Рядок {0}: Для установки {1} періодичності, різниця між від і до теперішнього часу \ повинно бути більше, ніж або дорівнює {2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Базується на складському русі. Див {0} для отримання більш докладної інформації
 DocType: Pricing Rule,Selling,Продаж
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Сума {0} {1} відняті {2}
 DocType: Employee,Salary Information,Інформація по зарплаті
 DocType: Sales Person,Name and Employee ID,Ім'я та ідентифікатор працівника
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,"Дата ""До"" не може бути менша за дату створення"
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,Мита і податки
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,"Будь ласка, введіть дату Reference"
@@ -1894,14 +1893,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,"Не можна посилатися на номер рядка, що перевищує або рівний поточному для цього типу стягнення"
 DocType: Asset,Sold,проданий
 ,Item-wise Purchase History,Попозиційна історія закупівель
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку ""Згенерувати розклад"" щоб отримати серійний номер позиції {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},"Будь ласка, натисніть на кнопку ""Згенерувати розклад"" щоб отримати серійний номер позиції {0}"
 DocType: Account,Frozen,Заблоковано
 ,Open Production Orders,Відкриті Виробничі замовлення
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Базова сума (Компанія Валюта)
 DocType: Payment Reconciliation Payment,Reference Row,посилання Row
 DocType: Installation Note,Installation Time,Час встановлення
 DocType: Sales Invoice,Accounting Details,Бухгалтеський облік. Детальніше
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,Видалити всі транзакції цієї компанії
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Інвестиції
 DocType: Issue,Resolution Details,Дозвіл Подробиці
@@ -1934,14 +1933,14 @@
 DocType: Discussion,Discussion,обговорення
 DocType: Payment Entry,Transaction ID,ID транзакції
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Ціни Правила далі фільтруються на основі кількості.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},"Будь ласка, встановіть дати приєднання для працівника {0}"
 DocType: Task,Total Billing Amount (via Time Sheet),Загальна сума оплат (через табель)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Виручка від постійних клієнтів
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) повинен мати роль ""Підтверджувач витрат"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',"{0} ({1}) повинен мати роль ""Підтверджувач витрат"""
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Пара
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Виберіть BOM і Кількість для виробництва
 DocType: Asset,Depreciation Schedule,Запланована амортизація
 DocType: Bank Reconciliation Detail,Against Account,Кор.рахунок
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Поаяся Дата повинна бути в межах від дати і до теперішнього часу
@@ -1955,16 +1954,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},"Будь ласка, вкажіть ""Центр витрат амортизації"" в компанії {0}"
 ,Maintenance Schedules,Розклад запланованих обслуговувань
 DocType: Task,Actual End Date (via Time Sheet),Фактична дата закінчення (за допомогою табеля робочого часу)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Сума {0} {1} проти {2} {3}
 ,Quotation Trends,Тренд пропозицій
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Група елемента не згадується у майстрі для елементу {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,Дебетом рахунка повинні бути заборгованість рахунок
 DocType: Shipping Rule Condition,Shipping Amount,Сума доставки
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,До Сума
 DocType: Purchase Invoice Item,Conversion Factor,Коефіцієнт перетворення
 DocType: Purchase Order,Delivered,Доставлено
 ,Vehicle Expenses,Витрати транспортних засобів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
+DocType: Serial No,Invoice Details,Інформація про рахунки
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},"Очікуване значення після того, як строк корисного використання повинно бути більше або дорівнює {0}"
 DocType: Purchase Receipt,Vehicle Number,Кількість транспортних засобів
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,"Дата, на яку періодичний рахунок перестане створюватись"
 DocType: Employee Loan,Loan Amount,Розмір позики
@@ -1983,12 +1983,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,Табелі робочого часу
 DocType: HR Settings,HR Settings,Налаштування HR
 DocType: Salary Slip,net pay info,Чистий інформація платити
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Витрати Заявити очікує схвалення. Тільки за рахунок затверджує можете оновити статус.
 DocType: Email Digest,New Expenses,нові витрати
 DocType: Purchase Invoice,Additional Discount Amount,Додаткова знижка Сума
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Рядок # {0}: Кількість повинна бути 1, оскільки елемент є основним засобом. Будь ласка, створюйте декілька рядків, якщо кількість більше 1."
 DocType: Leave Block List Allow,Leave Block List Allow,Список блокування відпусток дозволяє
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Абревіатура не може бути пропущена або заповнена пробілами
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Група не-групи
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Спортивний
 DocType: Loan Type,Loan Name,кредит Ім&#39;я
@@ -2000,6 +2000,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Склад, де зберігаються неприйняті товари"
 DocType: Production Order,Skip Material Transfer,Пропустити перенесення матеріалу
 DocType: Production Order,Skip Material Transfer,Пропустити перенесення матеріалу
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,"Неможливо знайти обмінний курс {0} до {1} для ключа дати {2}. Будь ласка, створіть запис Обмін валюти вручну"
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Ваш фінансовий рік закінчується
 DocType: POS Profile,Price List,Прайс-лист
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,"{0} тепер є фінансовим роком за замовчуванням. Будь ласка, оновіть сторінку у вашому переглядачі, щоб зміни вступили в силу."
@@ -2016,19 +2017,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Рахунок {0} є неприпустимим. Валюта рахунку повинні бути {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Коефіцієнт перетворення Одиниця виміру потрібно в рядку {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: замовлення клієнта, вихідний рахунок-фактура або запис журналу"
 DocType: Salary Component,Deduction,Відрахування
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Рядок {0}: Від часу і часу є обов&#39;язковим.
 DocType: Stock Reconciliation Item,Amount Difference,сума різниця
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Ціна товару додається для {0} у прайс-листі {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,"Будь ласка, введіть ідентифікатор працівника для цього Відповідального з продажу"
 DocType: Territory,Classification of Customers by region,Класифікація клієнтів по регіонах
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Сума різниці повинна дорівнювати нулю
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Сума різниці повинна дорівнювати нулю
 DocType: Project,Gross Margin,Валовий дохід
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,"Будь ласка, введіть Продукція перший пункт"
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Розрахунковий банк собі баланс
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,відключений користувач
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Пропозиція
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Пропозиція
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Всього відрахування
 ,Production Analytics,виробництво Аналітика
@@ -2037,9 +2038,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Увага: Невірний сертифікат SSL на прихильності {0}
 DocType: Student Admission,Eligibility,прийнятність
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Веде допомогти вам отримати бізнес, додати всі ваші контакти і багато іншого в ваших потенційних клієнтів"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Веде допомогти вам отримати бізнес, додати всі ваші контакти і багато іншого в ваших потенційних клієнтів"
 DocType: Production Order Operation,Actual Operation Time,Фактична Час роботи
 DocType: Authorization Rule,Applicable To (User),Застосовується до (Користувач)
 DocType: Purchase Taxes and Charges,Deduct,Відняти
@@ -2054,7 +2055,7 @@
 DocType: Guardian,Work Address,Адреса місця роботи
 DocType: Appraisal,Calculate Total Score,Розрахувати загальну кількість балів
 DocType: Request for Quotation,Manufacturing Manager,Виробництво менеджер
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії до {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Серійний номер {0} знаходиться на гарантії до {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,Розбити накладну на пакети.
 apps/erpnext/erpnext/hooks.py +87,Shipments,Поставки
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Баланс рахунку ({0}) для {1} і вартості акцій ({2}) для складу {3} повинні бути однаковими
@@ -2077,10 +2078,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Примітка: E-mail НЕ буде відправлено користувачів з обмеженими можливостями
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,кількість взаємодії
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,кількість взаємодії
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Виберіть компанію ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Виберіть компанію ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,"Залиште порожнім, якщо розглядати для всіх відділів"
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Види зайнятості (постійна, за контрактом, стажист і т.д.)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} є обов'язковим для товару {1}
 DocType: Process Payroll,Fortnightly,раз на два тижні
 DocType: Currency Exchange,From Currency,З валюти
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row","Будь ласка, виберіть суму розподілу, тип та номер рахунку-фактури в принаймні одному рядку"
@@ -2089,14 +2090,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Ціна (у валюті компанії)
 DocType: Student Guardian,Others,Інші
 DocType: Payment Entry,Unallocated Amount,Нерозподілена сума
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,"Не можете знайти відповідний пункт. Будь ласка, виберіть інше значення для {0}."
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,Немає більше оновлень
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Не можна обрати тип стягнення «На суму попереднього рядка» або «На Загальну суму попереднього рядка 'для першого рядка
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,"Підпорядкована позиція не повинна бути комплектом. Будь ласка, видаліть позицію `{0}` та збережіть"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Банківські
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Додати розкладу
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Додати розкладу
 DocType: Vehicle Service,Service Item,послуги Пункт
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
 DocType: Bank Guarantee,Bank Guarantee,Банківська гарантія
@@ -2122,6 +2123,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Рядок # {0}: Asset {1} вже {2}
 DocType: Quotation Item,Stock Balance,Залишки на складах
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Замовлення клієнта в Оплату
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,"Будь ласка, встановіть Іменування Series для {0} через Setup&gt; Установки&gt; Naming Series"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,генеральний директор
 DocType: Expense Claim Detail,Expense Claim Detail,Деталі Авансового звіту
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,"Будь ласка, виберіть правильний рахунок"
@@ -2146,14 +2148,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,"Ціни не будуть показані, якщо прайс-лист не встановлено"
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,"Будь ласка, вкажіть країну цьому правилі судноплавства або перевірити Доставка по всьому світу"
 DocType: Stock Entry,Total Incoming Value,Загальна суму приходу
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Дебет вимагається
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Дебет вимагається
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets допоможе відстежувати час, вартість і виставлення рахунків для Активності зробленої вашої команди"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Прайс-лист закупівлі
 DocType: Offer Letter Term,Offer Term,Пропозиція термін
 DocType: Quality Inspection,Quality Manager,Менеджер з якості
 DocType: Job Applicant,Job Opening,Вакансія
 DocType: Payment Reconciliation,Payment Reconciliation,Узгодження оплат з рахунками
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,"Будь-ласка, виберіть ім'я відповідальної особи"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,"Будь-ласка, виберіть ім'я відповідальної особи"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Технологія
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Загальна сума невиплачених: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Операція Сайт
@@ -2181,23 +2183,23 @@
 DocType: Opportunity,Lost Reason,Забули Причина
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,Нова адреса
 DocType: Quality Inspection,Sample Size,Обсяг вибірки
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Всі деталі вже виставлений
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,"Будь ласка, введіть Квитанція документ"
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,"Наступні центри витрат можна створювати під групами, але у проводках використовуються не-групи"
 DocType: Project,External,Зовнішній
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Люди і дозволу
 DocType: Vehicle Log,VLOG.,Відеоблогу.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Виробничі замовлення Створено: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Виробничі замовлення Створено: {0}
 DocType: Branch,Branch,Філія
 DocType: Guardian,Mobile Number,Номер мобільного
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,Друк і брендинг
 DocType: Bin,Actual Quantity,Фактична кількість
 DocType: Shipping Rule,example: Next Day Shipping,Приклад: Відправка наступного дня
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Серійний номер {0} не знайдений
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Серійний номер {0} не знайдений
 DocType: Scheduling Tool,Student Batch,Student Batch
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Ваші клієнти
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,зробити Студент
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,зробити Студент
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Ви були запрошені для спільної роботи над проектом: {0}
 DocType: Leave Block List Date,Block Date,Блок Дата
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Подати заявку
@@ -2221,8 +2223,9 @@
 DocType: SMS Log,Sent To,Відправлено
 DocType: Payment Request,Make Sales Invoice,Зробити вихідний рахунок
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,Softwares
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Наступна контактна дата не може бути у минулому
 DocType: Company,For Reference Only.,Для довідки тільки.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Виберіть Batch Немає
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Невірний {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Сума авансу
@@ -2236,7 +2239,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Справа № не може бути 0
 DocType: Item,Show a slideshow at the top of the page,Показати слайд-шоу у верхній частині сторінки
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Магазини
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Магазини
 DocType: Serial No,Delivery Time,Час доставки
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,На підставі проблем старіння
 DocType: Item,End of Life,End of Life (дата завершення роботи з товаром)
@@ -2248,12 +2251,12 @@
 DocType: Rename Tool,Rename Tool,Перейменувати інструмент
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Оновлення Вартість
 DocType: Item Reorder,Item Reorder,Пункт Змінити порядок
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Показати Зарплатний розрахунок
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Передача матеріалів
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Показати Зарплатний розрахунок
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,Передача матеріалів
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.","Вкажіть операцій, операційні витрати та дають унікальну операцію не в Ваших операцій."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Цей документ знаходиться над межею {0} {1} для елемента {4}. Ви робите інший {3} проти того ж {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,Вибрати рахунок для суми змін
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,"Будь ласка, встановіть повторювані після збереження"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,Вибрати рахунок для суми змін
 DocType: Purchase Invoice,Price List Currency,Валюта прайс-листа
 DocType: Naming Series,User must always select,Користувач завжди повинен вибрати
 DocType: Stock Settings,Allow Negative Stock,Дозволити від'ємні залишки
@@ -2264,7 +2267,7 @@
 DocType: Budget Account,Budget Account,бюджет аккаунта
 DocType: Quality Inspection,Verified By,Перевірено
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Неможливо змінити валюту за замовчуванням компанії, тому що є існуючі угоди. Угоди повинні бути скасовані, щоб поміняти валюту за замовчуванням."
-DocType: Grade Interval,Grade Description,оцінка Опис
+DocType: Grading Scale Interval,Grade Description,оцінка Опис
 DocType: Stock Entry,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,Створити Зарплатний розрахунок
@@ -2302,7 +2305,7 @@
 DocType: Upload Attendance,Attendance To Date,Відвідуваність по дату
 DocType: Warranty Claim,Raised By,Raised By
 DocType: Payment Gateway Account,Payment Account,Рахунок оплати
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,"Будь ласка, сформулюйте компанії, щоб продовжити"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,Чиста зміна дебіторської заборгованості
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,Компенсаційні Викл
 DocType: Offer Letter,Accepted,Прийняті
@@ -2312,12 +2315,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,"Будь ласка, переконайтеся, що ви дійсно хочете видалити всі транзакції для компанії. Ваші основні дані залишиться, як є. Ця дія не може бути скасовано."
 DocType: Room,Room Number,Номер кімнати
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Неприпустима посилання {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не може бути більше, ніж запланована кількість ({2}) у Виробничому замовленні {3}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1}) не може бути більше, ніж запланована кількість ({2}) у Виробничому замовленні {3}"
 DocType: Shipping Rule,Shipping Rule Label,Ярлик правил доставки
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Форум користувачів
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,Сировина не може бути порожнім.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Швидка проводка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Не вдалося оновити запаси, рахунок-фактура містить позиції прямої доставки."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Швидка проводка
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,"Ви не можете змінити вартість, якщо для елементу вказані Норми"
 DocType: Employee,Previous Work Experience,Попередній досвід роботи
 DocType: Stock Entry,For Quantity,Для Кількість
@@ -2330,7 +2333,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,Умови та положення1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,"Назва інституту, для якого ви встановлюєте цю систему."
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Бухгалтерські проводки заблоковано до цієї дати, ніхто не зможе зробити або змінити проводки крім ролі вказаної нижче."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,"Будь ласка, збережіть документ, перш ніж генерувати розклад технічного обслуговування"
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Статус проекту
 DocType: UOM,Check this to disallow fractions. (for Nos),"Перевірте це, щоб заборонити фракції. (для №)"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Були створені такі Виробничі замовлення:
@@ -2357,7 +2360,7 @@
 ,Employees working on a holiday,"Співробітники, що працюють у вихідні"
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Відзначити даний
 DocType: Project,% Complete Method,% Повний метод
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Дата початку обслуговування не може бути до дати доставки для серійного номеру {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Дата початку обслуговування не може бути до дати доставки для серійного номеру {0}
 DocType: Production Order,Actual End Date,Фактична Дата закінчення
 DocType: BOM,Operating Cost (Company Currency),Експлуатаційні витрати (Компанія Валюта)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2374,7 +2377,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Відпустка за свій рахунок не відповідає затвердженим записам заяв на відпустку
 DocType: Campaign,Campaign-.####,Кампанія -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Наступні кроки
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,"Будь ласка, надайте зазначені пункти в найкращих можливих ставок"
 DocType: Selling Settings,Auto close Opportunity after 15 days,Авто близько Можливість через 15 днів
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,кінець року
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Свинець%
@@ -2412,7 +2415,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Кількість RECD
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Плата записи Створено - {0}
 DocType: Asset Category Account,Asset Category Account,Категорія активів Рахунок
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},"Не можете виробляти більше Пункт {0}, ніж кількість продажів Замовити {1}"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,Рух ТМЦ {0} не проведено
 DocType: Payment Reconciliation,Bank / Cash Account,Банк / Готівковий рахунок
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,"Наступний Контакт До не може бути таким же, як Lead Адреса електронної пошти"
@@ -2434,7 +2437,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Clearance дата не вказано
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Виробництво
 DocType: Guardian,Occupation,рід занять
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Ряд {0}: Дата початку повинна бути раніше дати закінчення
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Всього (Кількість)
 DocType: Sales Invoice,This Document,цей документ
 DocType: Installation Note Item,Installed Qty,Встановлена к-сть
@@ -2450,15 +2454,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Повідомити про проблему
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,Комунальні витрати
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,Понад 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Рядок # {0}: Проводка {1} не має рахунку {2} або вже прив'язана до іншого документу
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Рядок # {0}: Проводка {1} не має рахунку {2} або вже прив'язана до іншого документу
 DocType: Buying Settings,Default Buying Price List,Прайс-лист закупівлі за замовчуванням
 DocType: Process Payroll,Salary Slip Based on Timesheet,"Зарплатний розрахунок, на основі табелю-часу"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,Жоден співробітник для обраних критеріїв вище або зарплатного розрахунку ще не створено
 DocType: Notification Control,Sales Order Message,Повідомлення замовлення клієнта
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Встановити значення за замовчуванням, як-от компанія, валюта, поточний фінансовий рік і т.д."
 DocType: Payment Entry,Payment Type,Тип оплати
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,"Будь ласка, виберіть Batch для пункту {0}. Не вдалося знайти жодної партії, яка задовольняє цій вимозі"
 DocType: Process Payroll,Select Employees,Виберіть Співробітники
 DocType: Opportunity,Potential Sales Deal,Угода потенційних продажів
 DocType: Payment Entry,Cheque/Reference Date,Дата Чеку / Посилання
@@ -2475,7 +2479,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Глобальний POS-профіль {0} вже створено для компанії {1}
 DocType: Purchase Order,Ref SQ,Посилання SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Замінити позицію / Норми у всіх Нормах витрат
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,Квитанція документ повинен бути представлений
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,Квитанція документ повинен бути представлений
 DocType: Purchase Invoice Item,Received Qty,Отримана к-сть
 DocType: Stock Entry Detail,Serial No / Batch,Серійний номер / партія
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Не оплачуються і не доставляється
@@ -2484,11 +2488,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Немає часу листи
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Тип відпустки {0} не може бути перенесеним
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Не для всіх позицій згенероване Заплановане тех. обслуговування. Натисніть ""Згенерувати розклад"" будь-ласка"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',"Не для всіх позицій згенероване Заплановане тех. обслуговування. Натисніть ""Згенерувати розклад"" будь-ласка"
 ,To Produce,Виробляти
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Платіжна відомість
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",Для ряду {0} в {1}. Щоб включити {2} у розмірі Item ряди також повинні бути включені {3}
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,зробити користувача
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,зробити користувача
 DocType: Packing Slip,Identification of the package for the delivery (for print),Ідентифікація пакета для доставки (для друку)
 DocType: Bin,Reserved Quantity,Зарезервовано Кількість
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,"Будь ласка, введіть адресу електронної пошти"
@@ -2501,15 +2505,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,Відключений шаблон не може бути шаблоном за замовчуванням
 DocType: Account,Income Account,Рахунок доходів
 DocType: Payment Request,Amount in customer's currency,Сума в валюті клієнта
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Доставка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Доставка
 DocType: Stock Reconciliation Item,Current Qty,Поточна к-сть
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section","Див ""Вартість матеріалів базується на"" в розділі калькуляції"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Попередня
 DocType: Appraisal Goal,Key Responsibility Area,Ключ Відповідальність Площа
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Студентські Порції допомагають відслідковувати відвідуваність, оцінки та збори для студентів"
 DocType: Payment Entry,Total Allocated Amount,Загальна розподілена сума
 DocType: Item Reorder,Material Request Type,Тип Замовлення матеріалів
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural журнал запис на зарплату від {0} до {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","LocalStorage повна, не врятувало"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","LocalStorage повна, не врятувало"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Ряд {0}: Коефіцієнт перетворення Одиниця виміру є обов&#39;язковим
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Посилання
 DocType: Budget,Cost Center,Центр витрат
@@ -2519,16 +2524,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Приховати Податковий ідентифікатор клієнта від угоди купівлі-продажу
 DocType: Upload Attendance,Upload HTML,Завантажити HTML-
 DocType: Employee,Relieving Date,Дата звільнення
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Цінові правила робляться для перезапису Прайс-листів або встановлення відсотку знижки на основі певних критеріїв.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",Цінові правила робляться для перезапису Прайс-листів або встановлення відсотку знижки на основі певних критеріїв.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Склад може бути змінений тільки через Рух ТМЦ / Накладну / Прихідну накладну
 DocType: Employee Education,Class / Percentage,Клас / у відсотках
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Начальник відділу маркетингу та продажів
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.","Якщо обране Цінове правило зроблено для ""Ціни"", то воно перезапише Прайс-лист. Ціна Цінового правила - остаточна ціна, тому жодна знижка вже не може надаватися. Отже, у таких операціях, як замовлення клієнта, Замовлення на придбання і т.д., Значення буде попадати у поле ""Ціна"", а не у поле ""Ціна згідно прайс-листа""."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Якщо обране Цінове правило зроблено для ""Ціни"", то воно перезапише Прайс-лист. Ціна Цінового правила - остаточна ціна, тому жодна знижка вже не може надаватися. Отже, у таких операціях, як замовлення клієнта, Замовлення на придбання і т.д., Значення буде попадати у поле ""Ціна"", а не у поле ""Ціна згідно прайс-листа""."
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Відслідковувати Lead-и за галуззю.
 DocType: Item Supplier,Item Supplier,Пункт Постачальник
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,"Будь ласка, введіть код позиції, щоб отримати номер партії"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},"Будь ласка, виберіть значення для {0} quotation_to {1}"
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,Всі адреси.
 DocType: Company,Stock Settings,Налаштування інвентаря
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company","Об&#39;єднання можливе тільки, якщо такі властивості однакові в обох звітах. Є група, кореневої тип, компанія"
@@ -2538,6 +2543,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Чи буде надіслати електронною поштою про подію співробітникам зі статусом &#39;Open&#39;
 DocType: Task,Depends on Tasks,Залежно від завдань
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Управління груповою клієнтів дерево.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Додатки можуть бути показані без включення кошика
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Назва нового центру витрат
 DocType: Leave Control Panel,Leave Control Panel,Залишити Панель управління
@@ -2550,12 +2556,10 @@
 DocType: Sales Invoice,Debit To,Дебет
 DocType: Delivery Note,Required only for sample item.,Потрібно лише для зразка пункту.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Фактична к-сть після операції
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Постачальник&gt; Постачальник Тип
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Немає зарплати ковзання знаходиться між {0} і {1}
 ,Pending SO Items For Purchase Request,"Замовлені товари, які очікують закупки"
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,зараховуються студентів
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} відключений
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} відключений
 DocType: Supplier,Billing Currency,Валюта оплати
 DocType: Sales Invoice,SINV-RET-,Вих_Рах-Пов-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Дуже великий
@@ -2572,9 +2576,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Головна Рекомендовані продукт
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Всі групи по оцінці
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Новий склад Ім&#39;я
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Підсумок {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Підсумок {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Територія
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,"Не кажучи вже про НЕ ласка відвідувань, необхідних"
 DocType: Stock Settings,Default Valuation Method,Метод оцінка за замовчуванням
 DocType: Vehicle Log,Fuel Qty,Паливо Кількість
 DocType: Production Order Operation,Planned Start Time,Плановані Час
@@ -2590,7 +2594,7 @@
 DocType: Price List,Price List Master,Майстер Прайс-листа
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,"Для всіх операцій продажу можна вказувати декількох ""Відповідальних з продажу"", так що ви можете встановлювати та контролювати цілі."
 ,S.O. No.,КО №
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},"Будь ласка, створіть клієнта з Lead {0}"
 DocType: Price List,Applicable for Countries,Стосується для країн
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Тільки залиште додатки зі статусом «Схвалено» і «Відхилено» можуть бути представлені
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Студентська група Ім&#39;я є обов&#39;язковим в рядку {0}
@@ -2622,7 +2626,7 @@
 DocType: Project,Copied From,скопійовано з
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Помилка Ім&#39;я: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Нестача
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} не пов&#39;язаний з {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Відвідуваність працівника {0} вже внесена
 DocType: Packing Slip,If more than one package of the same type (for print),Якщо більш ніж один пакет того ж типу (для друку)
 ,Salary Register,дохід Реєстрація
@@ -2641,7 +2645,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Застосовувати для кошику
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Значення {0} атрибуту {1} не існує в списку дійсного пункту значень атрибутів для пункту {2}
 DocType: BOM Item,Scrap %,Лом%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі к-сті або суми, за Вашим вибором"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Збори будуть розподілені пропорційно на основі к-сті або суми, за Вашим вибором"
 DocType: Maintenance Visit,Purposes,Мети
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,Принаймні один елемент повинен бути введений з негативним кількістю у зворотному документа
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations","Операція {0} більше, ніж будь-яких наявних робочих годин на робочої станції {1}, зламати операції в кілька операцій"
@@ -2662,16 +2666,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Управління Територія дерево.
 DocType: Journal Entry Account,Sales Invoice,Вихідний рахунок-фактура
 DocType: Journal Entry Account,Party Balance,Баланс контрагента
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,"Будь ласка, виберіть Застосувати знижки на"
 DocType: Company,Default Receivable Account,Рахунок дебеторської заборгованості за замовчуванням
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,"Створити банківську проводку на загальну суму заробітної плати, що виплачується за обраними вище критеріями"
 DocType: Stock Entry,Material Transfer for Manufacture,Матеріал для виробництва передачі
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,Знижка у відсотках можна застосовувати або стосовно прайс-листа або для всіх прайс-лист.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Знижка у відсотках можна застосовувати або стосовно прайс-листа або для всіх прайс-лист.
 DocType: Purchase Invoice,Half-yearly,Піврічний
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Проводки по запасах
 DocType: Vehicle Service,Engine Oil,Машинне мастило
 DocType: Sales Invoice,Sales Team1,Команда1 продажів
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Пункт {0} не існує
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,Пункт {0} не існує
 DocType: Sales Invoice,Customer Address,Адреса клієнта
 DocType: Employee Loan,Loan Details,кредит Детальніше
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Рядок {0}: Завершена кількість має бути більше нуля.
@@ -2679,24 +2683,24 @@
 DocType: Account,Root Type,Корінь Тип
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Ряд # {0}: Чи не можете повернути понад {1} для п {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Промалювати
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Промалювати
 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}
 DocType: Cheque Print Template,Primary Settings,Основні налаштування
 DocType: Purchase Invoice,Select Supplier Address,Виберіть адресу постачальника
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Додати співробітників
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Додати співробітників
 DocType: Purchase Invoice Item,Quality Inspection,Сертифікат якості
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Дуже невеликий
 DocType: Company,Standard Template,Стандартний шаблон
 DocType: Training Event,Theory,теорія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Увага: Кількість замовленого матеріалу менша за мінімально допустиму
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Рахунок {0} заблоковано
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,"Юридична особа / Допоміжний з окремим Плану рахунків, що належать Організації."
 DocType: Payment Request,Mute Email,Відключення E-mail
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Продукти харчування, напої і тютюнові вироби"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Може здійснити платіж тільки по невиставлених {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Може здійснити платіж тільки по невиставлених {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,"Ставка комісії не може бути більше, ніж 100"
 DocType: Stock Entry,Subcontract,Субпідряд
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,"Будь ласка, введіть {0} в першу чергу"
@@ -2736,7 +2740,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Склади з існуючої транзакцією не можуть бути перетворені у групу.
 DocType: Assessment Result Tool,Result HTML,результат HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Діє до
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Додати студентів
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Додати студентів
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},"Будь ласка, виберіть {0}"
 DocType: C-Form,C-Form No,С-Форма Немає
 DocType: BOM,Exploded_items,Exploded_items
@@ -2779,7 +2783,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Сум
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Виберіть фінансовий рік
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Рівень перезамовлення
 DocType: Company,Chart Of Accounts Template,План рахунків бухгалтерського обліку шаблону
 DocType: Attendance,Attendance Date,Дата
@@ -2794,14 +2798,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Дублікат запис
 DocType: Program Enrollment Tool,Get Students,отримати Студенти
 DocType: Serial No,Under Warranty,Під гарантії
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Помилка]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Помилка]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,"Прописом буде видно, як тільки ви збережете замовлення клієнта."
 ,Employee Birthday,Співробітник народження
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student Пакетне відвідуваність Інструмент
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,межа Схрещені
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Венчурний капітал
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,"Академічний термін з цим &quot;Академічний рік&quot; {0} і &#39;Term Name &quot;{1} вже існує. Будь ласка, поміняйте ці записи і спробуйте ще раз."
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Як є існуючі операції проти пункту {0}, ви не можете змінити значення {1}"
 DocType: UOM,Must be Whole Number,Повинно бути ціле число
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Нові листя Виділені (у днях)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Серійний номер {0} не існує
@@ -2821,7 +2825,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% матеріалів у виставлених рахунках згідно Замовлення клієнта
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Операції закриття періоду
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,"Центр витрат з існуючими операціями, не може бути перетворений у групу"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Сума {0} {1} {2} {3}
 DocType: Account,Depreciation,Амортизація
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Постачальник (и)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Інструмент роботи з відвідуваннями
@@ -2845,7 +2849,7 @@
 DocType: Supplier,Last Day of the Next Month,Останній день наступного місяця
 DocType: Support Settings,Auto close Issue after 7 days,Авто близько Issue через 7 днів
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Відпустка не може бути призначена до{0}, оскільки залишок днів вже перенесений у наступний документ Призначення відпусток{1}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Примітка: Через / Вихідна дата перевищує дозволений кредит клієнт дня {0} день (їй)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,студент Абітурієнт
 DocType: Asset Category Account,Accumulated Depreciation Account,Рахунок накопиченого зносу
 DocType: Stock Settings,Freeze Stock Entries,Заморозити Рухи ТМЦ
@@ -2856,7 +2860,7 @@
 ,Stock Analytics,Аналіз складських залишків
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,"Операції, що не може бути залишено порожнім"
 DocType: Maintenance Visit Purpose,Against Document Detail No,На деталях документа немає
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Тип контрагента є обов'язковим
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Тип контрагента є обов'язковим
 DocType: Quality Inspection,Outgoing,Вихідний
 DocType: Material Request,Requested For,Замовляється для
 DocType: Quotation Item,Against Doctype,На DOCTYPE
@@ -2873,11 +2877,11 @@
 DocType: Asset,Item Code,Код товару
 DocType: Production Planning Tool,Create Production Orders,Створити виробничі замовлення
 DocType: Serial No,Warranty / AMC Details,Гарантія / Деталі контракту на річне обслуговування
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Вибір студентів вручну для діяльності на основі групи
 DocType: Journal Entry,User Remark,Зауваження користувача
 DocType: Lead,Market Segment,Сегмент ринку
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Сплачена сума не може бути більше сумарного негативного непогашеної {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Співробітник внутрішньої історії роботи
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),На кінець (Дт)
 DocType: Cheque Print Template,Cheque Size,Розмір чеку
@@ -2893,7 +2897,7 @@
 DocType: Production Planning Tool,Create Material Requests,Створити Замовлення матеріалів
 DocType: Employee Education,School/University,Школа / університет
 DocType: Payment Request,Reference Details,Посилання Детальніше
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Очікувана вартість після терміну використання ма бути менша за повну вартість придбання.
 DocType: Sales Invoice Item,Available Qty at Warehouse,Доступна к-сть на складі
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Сума виставлених рахунків
 DocType: Asset,Double Declining Balance,Double Declining Balance
@@ -2914,20 +2918,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Рахунок різниці повинен бути типу актив / зобов'язання, оскільки ця Інвентаризація - це введення залишків"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},"Освоєно Сума не може бути більше, ніж сума позики {0}"
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},"Номер Замовлення на придбання, необхідний для {0}"
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Виробничий замовлення не створено
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Виробничий замовлення не створено
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',"""Від дати"" має бути раніше ""До дати"""
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Неможливо змінити статус студента {0} пов&#39;язаний з додатком студента {1}
 DocType: Asset,Fully Depreciated,повністю амортизується
 ,Stock Projected Qty,Прогнозований складський залишок
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Замовник {0} не належить до проекту {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Внесена відвідуваність HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Котирування є пропозиціями, пропозиціями відправлених до своїх клієнтів"
 DocType: Sales Order,Customer's Purchase Order,Оригінал замовлення клієнта
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Серійний номер та партія
 DocType: Warranty Claim,From Company,Від компанії
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Сума десятків критеріїв оцінки має бути {0}.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Значення або Кількість
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,"Будь ласка, встановіть кількість зарезервованих амортизацій"
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Значення або Кількість
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Продукції Замовлення не можуть бути підняті для:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Хвилин
 DocType: Purchase Invoice,Purchase Taxes and Charges,Податки та збори закупівлі
@@ -2940,7 +2944,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,всі склади
 DocType: Sales Partner,Retailer,Роздрібний торговець
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,Кредит на рахунку повинен бути баланс рахунку
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,Всі типи постачальників
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Всі типи постачальників
 DocType: Global Defaults,Disable In Words,"Відключити ""прописом"""
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,"Код товару є обов&#39;язковим, оскільки товар не автоматично нумеруються"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},Пропозиція {0} НЕ типу {1}
@@ -2949,6 +2953,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Овердрафт рахунок
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Зробити Зарплатний розрахунок
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Рядок # {0}: Виділена сума не може бути більше суми заборгованості.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Переглянути норми
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Забезпечені кредити
 DocType: Purchase Invoice,Edit Posting Date and Time,Редагування проводок Дата і час
@@ -2988,7 +2993,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Не допускається оновлення складських операцій старше {0}
 DocType: Purchase Invoice Item,PR Detail,PR-Деталь
 DocType: Sales Order,Fully Billed,Повністю включено у рахунки
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},"Будь ласка, встановіть за замовчуванням заборгованість рахунки в співробітника {0}"
 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 +127,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),Вага брутто упаковки. Зазвичай вага нетто + пакувальний матеріал вагу. (для друку)
@@ -2999,7 +3003,7 @@
 DocType: Student Group,Group Based On,Група Based On
 DocType: Journal Entry,Bill Date,Bill Дата
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Service Елемент, тип, частота і сума витрат потрібно"
-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:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","Навіть якщо є кілька правил ціноутворення з найвищим пріоритетом, то наступні внутрішні пріоритети застосовуються:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},"Ви дійсно хочете, щоб представити всю зарплату вислизнути з {0} до {1}"
 DocType: Cheque Print Template,Cheque Height,Висота чеку
 DocType: Supplier,Supplier Details,Постачальник: Подробиці
@@ -3011,7 +3015,7 @@
 DocType: Vehicle Log,Invoice Ref,Рахунок-фактура Посилання
 DocType: Purchase Order,Recurring Order,Періодичне замовлення
 DocType: Company,Default Income Account,Рахунок доходів за замовчуванням
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Група клієнтів / клієнтів
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Група клієнтів / клієнтів
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Unclosed фінансових років Прибуток / збиток (Кредит)
 DocType: Sales Invoice,Time Sheets,Time Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Повідомлення за замовчуванням у запиті про оплату
@@ -3031,10 +3035,10 @@
 DocType: Notification Control,Quotation Message,Повідомлення пропозиції
 DocType: Employee Loan,Employee Loan Application,Служить заявка на отримання кредиту
 DocType: Issue,Opening Date,Дата розкриття
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Глядачі були успішно відзначені.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Глядачі були успішно відзначені.
 DocType: Journal Entry,Remark,Зауваження
 DocType: Purchase Receipt Item,Rate and Amount,Ціна та сума
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Тип рахунку для {0} повинен бути {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Тип рахунку для {0} повинен бути {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Відустки та вихідні
 DocType: School Settings,Current Academic Term,Поточний Academic термін
 DocType: School Settings,Current Academic Term,Поточний Academic термін
@@ -3057,7 +3061,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Студентська група
 DocType: Shopping Cart Settings,Quotation Series,Серії пропозицій
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Пункт існує з таким же ім&#39;ям ({0}), будь ласка, змініть назву групи товарів або перейменувати пункт"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,"Будь ласка, виберіть клієнта"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,"Будь ласка, виберіть клієнта"
 DocType: C-Form,I,Я
 DocType: Company,Asset Depreciation Cost Center,Центр витрат амортизації
 DocType: Sales Order Item,Sales Order Date,Дата Замовлення клієнта
@@ -3076,20 +3080,20 @@
 DocType: Vehicle,Insurance Details,Страхування Детальніше
 DocType: Account,Payable,До оплати
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,"Будь ласка, введіть терміни погашення"
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Боржники ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Боржники ({0})
 DocType: Pricing Rule,Margin,маржа
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Нові клієнти
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Загальний прибуток %
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Clearance дата
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Загальна вартість придбання є обов'язковою
 DocType: Lead,Address Desc,Опис адреси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Контрагент є обов'язковим
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Контрагент є обов'язковим
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Назва теми
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Принаймні один з продажу або покупки повинен бути обраний
-DocType: Grading Structure,Grade Intervals,інтервали Оцінка
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Виберіть характер вашого бізнесу.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Рядок # {0}: повторювані записи в посиланнях {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Де проводяться виробничі операції.
 DocType: Asset Movement,Source Warehouse,Вихідний склад
 DocType: Installation Note,Installation Date,Дата встановлення
@@ -3126,7 +3130,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Фірмові заголовки для шаблонів друку.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Назви для шаблонів друку, наприклад рахунок-проформа."
 DocType: Student Guardian,Student Guardian,Студент-хранитель
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Звинувачення типу Оцінка не може відзначений як включено
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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."
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,Вартість згідно норми
@@ -3154,7 +3158,7 @@
 DocType: Company,Exchange Gain / Loss Account,Прибутки/збитки від курсової різниці
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Працівник та відвідування
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},Мета повинна бути одним з {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,Заповніть форму і зберегти його
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,Форум
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Фактичне кількість на складі
@@ -3170,7 +3174,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Кількість перезамовлення
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Поточні вакансії Вакансії
 DocType: Company,Stock Adjustment Account,Рахунок підлаштування інвентаря
-DocType: Journal Entry,Write Off,Списувати
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Списувати
 DocType: Timesheet Detail,Operation 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}
@@ -3181,27 +3185,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Постачальник доставляє клієнтові
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Форма/Об’єкт/{0}) немає в наявності
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,"Наступна дата повинна бути більше, ніж Дата публікації / створення"
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Показати податок розпад
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Показати податок розпад
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Через / Довідник Дата не може бути після {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Імпорт та експорт даних
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","На Складі {0} вже є Рухи ТМЦ, отже, ви не можете повторно призначити або змінити його"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,"Немає студентів, не знайдено"
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,"Немає студентів, не знайдено"
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Дата створення рахунку-фактури
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Продаж
 DocType: Sales Invoice,Rounded Total,Заокруглений підсумок
 DocType: Product Bundle,List items that form the package.,"Список предметів, які утворюють пакет."
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Розподіл відсотків має дорівнювати 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,"Будь ласка, виберіть дату запису, перш ніж вибрати контрагента"
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,З Контракту на річне обслуговування
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Будь ласка, виберіть Витяги"
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,"Будь ласка, виберіть Витяги"
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Зробити Візит тех. обслуговування
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,"Будь ласка, виберіть Витяги"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Кількість проведених амортизацій не може бути більше за загальну кількість амортизацій
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Зробити Візит тех. обслуговування
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,"Будь ласка, зв&#39;яжіться з користувачем, які мають по продажах Майстер диспетчера {0} роль"
 DocType: Company,Default Cash Account,Грошовий рахунок за замовчуванням
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Компанії (не клієнтів або постачальників) господар.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Це засновано на відвідуваності цього студента
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,немає Студенти
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Додайте більше деталей або відкриту повну форму
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',"Будь ласка, введіть &quot;Очікувана дата доставки&quot;"
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Доставка Примітки {0} має бути скасований до скасування цього замовлення клієнта
@@ -3234,6 +3239,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Пункт 3
 DocType: Purchase Order,Customer Contact Email,Контакти з клієнтами E-mail
 DocType: Warranty Claim,Item and Warranty Details,Предмет і відомості про гарантії
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Код товару&gt; Пункт Group&gt; Марка
 DocType: Sales Team,Contribution (%),Внесок (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,"Примітка: Оплата не буде створена, оскільки не зазаначено ""Готівковий або банківський рахунок"""
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Виберіть програму для вилучення обов&#39;язкових курсів.
@@ -3249,9 +3255,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Перед інвентаризацією
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Для {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Податки та збори додано (Валюта компанії)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,Пункт Податковий ряд {0} повинен мати обліковий запис типу податку або доходів або витрат або платно
 DocType: Sales Order,Partly Billed,Частково є у виставлених рахунках
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Пункт {0} повинен бути Fixed Asset Item
 DocType: Item,Default BOM,Норми за замовчуванням
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,"Будь ласка, повторіть введення назви компанії, щоб підтвердити"
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,Загальна неоплачена сума
@@ -3261,8 +3267,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Автомобільний
 DocType: Vehicle,Insurance Company,Страхова компанія
 DocType: Asset Category Account,Fixed Asset Account,Рахунок основних засобів
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,змінна
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,З накладної
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,змінна
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,З накладної
 DocType: Student,Student Email Address,Студент E-mail адреса
 DocType: Timesheet Detail,From Time,Від часу
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,В наявності:
@@ -3274,12 +3280,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Обмінний курс прайс-листа
 DocType: Purchase Invoice Item,Rate,Ціна
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Інтерн
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Адреса Ім&#39;я
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Адреса Ім&#39;я
 DocType: Stock Entry,From BOM,З норм
 DocType: Assessment Code,Assessment Code,код оцінки
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Основний
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Складські операції до {0} заблоковано
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку ""Згенерувати розклад"""
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',"Будь ласка, натисніть на кнопку ""Згенерувати розклад"""
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","наприклад, кг, Розділ, Ніс, м"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,"Посилання № є обов&#39;язковим, якщо ви увійшли Reference Дата"
 DocType: Bank Reconciliation Detail,Payment Document,платіжний документ
@@ -3287,19 +3293,19 @@
 DocType: Salary Slip,Salary Structure,Структура зарплати
 DocType: Account,Bank,Банк
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Авіакомпанія
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Матеріал Випуск
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Матеріал Випуск
 DocType: Material Request Item,For Warehouse,Для складу
 DocType: Employee,Offer Date,Дата пропозиції
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Пропозиції
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Ви перебуваєте в автономному режимі. Ви не зможете оновити доки не відновите зв’язок.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Жоден студент групи не створено.
 DocType: Purchase Invoice Item,Serial No,Серійний номер
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,"Щомісячне погашення Сума не може бути більше, ніж сума позики"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,"Будь ласка, введіть деталі тех. обслуговування"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,"Будь ласка, введіть деталі тех. обслуговування"
 DocType: Purchase Invoice,Print Language,Мова друку
 DocType: Salary Slip,Total Working Hours,Всього годин роботи
 DocType: Stock Entry,Including items for sub assemblies,Включаючи позиції для наівфабрикатів
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Значення має бути позитивним
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Значення має бути позитивним
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Всі території
 DocType: Purchase Invoice,Items,Номенклатура
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Студент вже надійшов.
@@ -3319,17 +3325,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',"За од.вим. за замовчуванням для варіанту '{0}' має бути такою ж, як в шаблоні ""{1} '"
 DocType: Shipping Rule,Calculate Based On,"Розрахувати, засновані на"
 DocType: Delivery Note Item,From Warehouse,Від Склад
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Ні предметів з Біллом матеріалів не повинна Manufacture
 DocType: Assessment Plan,Supervisor Name,Ім'я супервайзера
 DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
 DocType: Program Enrollment Course,Program Enrollment Course,Програма Зарахування курс
-DocType: Grading Structure,Grading Structure,градація Структура
 DocType: Purchase Taxes and Charges,Valuation and Total,Оцінка і Загальна
 DocType: Tax Rule,Shipping City,Місто доставки
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,"Цей пункт є Варіантом {0} (шаблон). Атрибути будуть перезаписані з шаблону, хіба що встановлене ""Не копіювати"""
 DocType: Notification Control,Customize the Notification,Налаштувати повідомлення
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Рух грошових коштів від операцій
 DocType: Sales Invoice,Shipping Rule,Правило доставки
@@ -3350,8 +3354,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},Немає Норм за замовчуванням для елемента {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,"Будь ласка, виберіть спочатку дату запису"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,"Відкриття Дата повинна бути, перш ніж Дата закриття"
 DocType: Leave Control Panel,Carry Forward,Переносити
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,"Центр витрат з існуючими операціями, не може бути перетворений у книгу"
 DocType: Department,Days for which Holidays are blocked for this department.,"Дні, для яких вихідні заблоковані для цього відділу."
@@ -3364,7 +3368,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Долучити фірмовий заголовок
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Останній зв&#39;язок
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Останній зв&#39;язок
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',"Не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Оцінка і Total &#39;"
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Зв'язати платежі з рахунками-фактурами
@@ -3380,7 +3384,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Разом (Сум)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Розваги і дозвілля
 DocType: Quality Inspection,Item Serial No,Серійний номер номенклатурної позиції
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Створення Employee записів
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Створення Employee записів
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Разом Поточна
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Бухгалтерська звітність
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Година
@@ -3393,10 +3397,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,невідомий
 DocType: Shipping Rule,Shipping Rule Conditions,Умови правил доставки
 DocType: BOM Replace Tool,The new BOM after replacement,Нові Норми після заміни
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,POS
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,POS
 DocType: Payment Entry,Received Amount,отримана сума
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,"Будь ласка, встановіть службовців систему імен в людських ресурсах&gt; HR Налаштування"
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Створити для повного кількості, ігноруючи кількість вже на замовлення"
 DocType: Account,Tax,Податок
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,без маркування
@@ -3409,9 +3411,9 @@
 DocType: Batch,Source Document Name,Джерело Назва документа
 DocType: Batch,Source Document Name,Джерело Назва документа
 DocType: Job Opening,Job Title,Професія
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,створення користувачів
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,створення користувачів
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,грам
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,"Кількість, Виготовлення повинні бути більше, ніж 0."
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Звіт по візиту на виклик по тех. обслуговуванню.
 DocType: Stock Entry,Update Rate and Availability,Частота оновлення і доступність
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,"Відсоток, на який вам дозволено отримати або доставити більше порівняно з замовленої кількістю. Наприклад: Якщо ви замовили 100 одиниць, а Ваш Дозволений відсоток перевищення складає 10%, то ви маєте право отримати 110 одиниць."
@@ -3421,28 +3423,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Витрати рахунку є обов&#39;язковим для пункту {0}
 DocType: BOM,Website Description,Опис веб-сайту
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Чиста зміна в капіталі
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,"Будь ласка, відмініть спочатку вхідний рахунок {0}"
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Адреса електронної пошти повинен бути унікальним, вже існує для {0}"
 DocType: Serial No,AMC Expiry Date,Дата закінчення річного обслуговування
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,розписка
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,розписка
 ,Sales Register,Реєстр продаж
 DocType: Daily Work Summary Settings Company,Send Emails At,Електронна пошта на
 DocType: Quotation,Quotation Lost Reason,Причина втрати пропозиції
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Виберіть домен
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},Посилання на операцію № {0} від {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},Посилання на операцію № {0} від {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Там немає нічого для редагування
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Результати для цього місяця та незакінчена діяльність
 DocType: Customer Group,Customer Group Name,Група Ім&#39;я клієнта
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Немає клієнтів ще!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Звіт про рух грошових коштів
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Сума кредиту не може перевищувати максимальний Сума кредиту {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,ліцензія
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,Please remove this Invoice {0} from C-Form {1},"Будь ласка, видаліть цю фактуру {0} з C-Form {1}"
 DocType: Leave Control Panel,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year,Please select Carry Forward if you also want to include previous fiscal year's balance leaves to this fiscal year
 DocType: GL Entry,Against Voucher Type,Згідно док-ту типу
 DocType: Item,Attributes,Атрибути
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,"Будь ласка, введіть рахунок списання"
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Остання дата замовлення
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Рахунок {0} не належить компанії {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Серійні номери в рядку {0} не збігається з накладною
 DocType: Student,Guardian Details,Детальніше Гардіан
 DocType: C-Form,C-Form,С-форма
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Марк відвідуваності для декількох співробітників
@@ -3467,20 +3471,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Рядок {0} # Рахунок повинен бути типу &quot;Fixed Asset&quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Розхід у к-сті
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Правила для розрахунку кількості вантажу для продажу
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Серії є обов'язковими
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Серії є обов'язковими
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Фінансові послуги
 DocType: Student Sibling,Student ID,Student ID
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Види діяльності для Час Журнали
 DocType: Tax Rule,Sales,Продаж
 DocType: Stock Entry Detail,Basic Amount,Основна кількість
 DocType: Training Event,Exam,іспит
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},Необхідно вказати склад для номенклатури {0}
 DocType: Leave Allocation,Unused leaves,Невикористані дні відпустки
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Штат (оплата)
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Переклад
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} не пов&#39;язаний з аккаунтом партії {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} не пов&#39;язаний з аккаунтом партії {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Зібрати розібрані норми (у тому числі вузлів)
 DocType: Authorization Rule,Applicable To (Employee),Застосовується до (Співробітник)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Завдяки Дата є обов&#39;язковим
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Приріст за атрибут {0} не може бути 0
@@ -3491,13 +3495,13 @@
 ,Inactive Customers,Неактивні Клієнти
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Прихідні накладні
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Як застосовується цінове правило?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Як застосовується цінове правило?
 DocType: Stock Entry,Delivery Note No,Доставка Примітка Немає
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Якщо позначено, тільки Запити матеріалів на купівлю для кінцевої сировини будуть включені у ""Замовлення матеріалів"". В іншому випадку буде створено ""Замовлення матеріалів"" для материнських об’єктів"
 DocType: Cheque Print Template,Message to show,Повідомлення
 DocType: Company,Retail,Роздрібна торгівля
 DocType: Attendance,Absent,Відсутній
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Комплект
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Комплект
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},Ряд {0}: Неприпустима посилання {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,Шаблон податків та зборів на закупку
 DocType: Upload Attendance,Download Template,Звантажити шаблон
@@ -3507,10 +3511,10 @@
 DocType: Payment Entry,Account Paid From,Рахунок Оплачено з
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Номенклатура давальної сировини
 DocType: Journal Entry,Write Off Based On,Списання заснований на
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,зробити Lead
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,зробити Lead
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,Друк та канцелярські
 DocType: Stock Settings,Show Barcode Field,Показати поле штрих-коду
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Надіслати Постачальник електронних листів
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Надіслати Постачальник електронних листів
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Зарплата вже оброблена за період між {0} і {1}, Період відпустки не може бути в межах цього діапазону дат."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Установка рекорд для серійним номером
 DocType: Guardian Interest,Guardian Interest,опікун Відсотки
@@ -3523,6 +3527,7 @@
 DocType: Offer Letter,Awaiting Response,В очікуванні відповіді
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Вище
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},Неприпустимий атрибут {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Згадка якщо нестандартні до оплати рахунків
 DocType: Salary Slip,Earning & Deduction,Нарахування та відрахування
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Необов'язково. Цей параметр буде використовуватися для фільтрації в різних операціях.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Від'ємна собівартість не допускається
@@ -3538,10 +3543,9 @@
 DocType: Production Order Item,Production Order Item,Позиція Виробничого замовлення
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,"Чи не запис, не знайдено"
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Вартість списаних активів
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,частково ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Центр витрат є обов'язковим для елементу {2}
 DocType: Vehicle,Policy No,політика Ні
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Отримати елементи з комплекту
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Отримати елементи з комплекту
 DocType: Asset,Straight Line,Лінійний
 DocType: Project User,Project User,проект Користувач
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,розщеплений
@@ -3558,7 +3562,7 @@
 DocType: Program Enrollment Tool,Get Students From,Отримати студентів з
 DocType: Hub Settings,Seller Country,Продавець Країна
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Опублікувати об’єкти на веб-сайті
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Група ваших студентів в партіях
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Група ваших студентів в партіях
 DocType: Authorization Rule,Authorization Rule,Авторизація Правило
 DocType: Sales Invoice,Terms and Conditions Details,Деталі положень та умов
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,Специфікації
@@ -3611,14 +3615,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Дата чеку
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Рахунок {0}: Батьківський рахунок {1} не належить компанії: {2}
 DocType: Program Enrollment Tool,Student Applicants,студентські Кандидати
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,"Всі операції, пов'язані з цією компанією успішно видалено!"
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,"Всі операції, пов'язані з цією компанією успішно видалено!"
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,Станом на Дата
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,Дата подачі заявок
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Випробувальний термін
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Зарплатні Компоненти
 DocType: Program Enrollment Tool,New Academic Year,Новий навчальний рік
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Повернення / Кредит Примітка
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Повернення / Кредит Примітка
 DocType: Stock Settings,Auto insert Price List rate if missing,Відсутня прайс-лист ціна для автовставки
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,Всього сплачена сума
 DocType: Production Order Item,Transferred Qty,Переведений Кількість
@@ -3638,7 +3642,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Тип відсутності, як-от випадкова, хвороба і т.д."
 DocType: Email Digest,Send regular summary reports via Email.,Відправити регулярні зведені звіти по електронній пошті.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},"Будь-ласка, встановіть рахунок за замовчуванням у Авансових звітах типу {0}"
 DocType: Assessment Result,Student Name,Ім&#39;я студента
 DocType: Brand,Item Manager,Стан менеджер
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,Розрахунок заробітної плати оплачується
@@ -3659,6 +3663,7 @@
 ,Sales Funnel,Воронка продажів
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Скорочення є обов'язковим
 DocType: Project,Task Progress,Завдання про хід роботи
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Візок
 ,Qty to Transfer,К-сть для передачі
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Квоти для Lead-ів або клієнтів.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Роль з дозволом редагувати заблоковані складські рухи
@@ -3686,13 +3691,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Пункт Мудрий Податковий Подробиці
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Абревіатура інституту
 ,Item-wise Price List Rate,Ціни прайс-листів по-товарно
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Пропозиція постачальника
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Пропозиція постачальника
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Прописом"" буде видно, як тільки ви збережете пропозицію."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Кількість ({0}) не може бути фракцією в рядку {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,стягувати збори
 DocType: Attendance,ATT-,попит-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},Штрихкод {0} вже використовується у номенклатурній позиції {1}
 DocType: Lead,Add to calendar on this date,Додати в календар в цей день
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Правила для додавання транспортні витрати.
 DocType: Item,Opening Stock,Початкові залишки
@@ -3709,8 +3714,8 @@
 Updated via 'Time Log'",у хвилинах Оновлене допомогою &#39;Час Вхід &quot;
 DocType: Customer,From Lead,З Lead-а
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Замовлення випущений у виробництво.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Виберіть фінансовий рік ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Виберіть фінансовий рік ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,"Необхідний POS-профіль, щоб зробити POS-операцію"
 DocType: Program Enrollment Tool,Enroll Students,зарахувати студентів
 DocType: Hub Settings,Name Token,Ім&#39;я маркера
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Стандартний Продаж
@@ -3721,7 +3726,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} по вихідних рахунках-фактурах {1}
 DocType: Sales Invoice,SINV-,Вих_Рах-
 DocType: Request for Quotation Item,Project Name,Назва проекту
-DocType: Supplier,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
+DocType: Customer,Mention if non-standard receivable account,Вказати якщо нестандартний рахунок заборгованості
 DocType: Journal Entry Account,If Income or Expense,Якщо доходи або витрати
 DocType: Production Order,Required Items,необхідні товари
 DocType: Stock Ledger Entry,Stock Value Difference,Різниця значень запасів
@@ -3742,7 +3747,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Встановити цілі по групах для цього Відповідального з продажу.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Заморожувати запаси старше ніж [днiв]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Рядок # {0}: Актив є обов&#39;язковим для фіксованого активу покупки / продажу
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Якщо є два або більше Правил на основі зазначених вище умов, застосовується пріоритет. Пріоритет являє собою число від 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.,Дозволити наступним користувачам погоджувати відпустки на заблоковані дні.
@@ -3768,7 +3773,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,"Пункт {0} ігноруються, так як це не інвентар"
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.","Для того, щоб не застосовувати цінове правило у певній операції всі правила, які могли би застосуватися мають бути відключені ."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Для того, щоб не застосовувати цінове правило у певній операції всі правила, які могли би застосуватися мають бути відключені ."
 DocType: Assessment Group,Parent Assessment Group,Батько група по оцінці
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,роботи
 ,Sales Order Trends,Динаміка Замовлень клієнта
@@ -3779,7 +3784,7 @@
 DocType: Stock Entry Detail,Additional Cost,Додаткова вартість
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Дата закінчення фінансового року
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",Неможливо фільтрувати по номеру документу якщо згруповано по документах
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Зробити пропозицію постачальника
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Зробити пропозицію постачальника
 DocType: Quality Inspection,Incoming,Вхідний
 DocType: BOM,Materials Required (Exploded),"Матеріалів, необхідних (в розібраному)"
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Додайте користувачів у вашій організації, крім себе"
@@ -3807,6 +3812,7 @@
 DocType: Employee,History In Company,Історія У Компанії
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Розсилка
 DocType: Stock Ledger Entry,Stock Ledger Entry,Запис складської книги
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Клієнт&gt; Група клієнтів&gt; Територія
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Той же пункт був введений кілька разів
 DocType: Department,Leave Block List,Список блокування відпусток
 DocType: Sales Invoice,Tax ID,ІПН
@@ -3816,7 +3822,7 @@
 DocType: Customer,Sales Partner and Commission,Торговий партнер та комісія
 DocType: Employee Loan,Rate of Interest (%) / Year,Процентна ставка (%) / рік
 ,Project Quantity,проект Кількість
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Всього {0} для всіх елементів дорівнює нулю, може бути, ви повинні змінити «Розподілити плату на основі»"
 DocType: Opportunity,To Discuss,Обговорити
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,"{0} одиниць {1} необхідні {2}, щоб завершити цю угоду."
 DocType: Loan Type,Rate of Interest (%) Yearly,Процентна ставка (%) Річний
@@ -3831,7 +3837,7 @@
 DocType: Purchase Invoice,Return,Повернення
 DocType: Production Order Operation,Production Order Operation,Виробництво Порядок роботи
 DocType: Pricing Rule,Disable,Відключити
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Спосіб оплати потрібно здійснити оплату
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Спосіб оплати потрібно здійснити оплату
 DocType: Project Task,Pending Review,В очікуванні відгук
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Asset {0} не може бути утилізовані, як це вже {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Всього витрат (за Авансовим звітом)
@@ -3839,11 +3845,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Марк Відсутня
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Рядок {0}: Валюта BOM # {1} має дорівнювати вибрану валюту {2}
 DocType: Journal Entry Account,Exchange Rate,Курс валюти
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Замовлення клієнта {0} не проведено
 DocType: Homepage,Tag Line,Tag Line
 DocType: Fee Component,Fee Component,плата компонентів
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Управління флотом
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Додати елементи з
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Додати елементи з
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Склад {0}: Батьківський рахунок {1} не належить компанії {2}
 DocType: Cheque Print Template,Regular,регулярне
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Всього Weightage всіх критеріїв оцінки повинні бути 100%
@@ -3856,7 +3862,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Склад {0} не існує
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Зареєструватися на Hub ERPNext
 DocType: Monthly Distribution,Monthly Distribution Percentages,Щомісячні Відсотки розподілу
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Обрана номенклатурна позиція не може мати партій
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Швидкість оцінки не знайдено для пункту {0}, яке потрібно робити бухгалтерські записи для {1} {2}. Якщо елемент угод як елемент зразка в {1}, будь ласка, відзначити, що в {1} таблиці Item. В іншому випадку, будь ласка, створити входять акції угоду по ст або згадки ставки оцінки в запису товару, а потім спробувати завершенням заповнення / скасуванням цього запису"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% Матеріалів доставляється по цій накладній
 DocType: Project,Customer Details,Реквізити клієнта
@@ -3865,15 +3871,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Enter url parameter for receiver nos
 DocType: Payment Entry,Paid Amount,Виплачена сума
 DocType: Assessment Plan,Supervisor,Супервайзер
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Online
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Online
 ,Available Stock for Packing Items,Доступно для пакування
 DocType: Item Variant,Item Variant,Варіант номенклатурної позиції
 DocType: Assessment Result Tool,Assessment Result Tool,Оцінка результату інструмент
 DocType: BOM Scrap Item,BOM Scrap Item,BOM Лом Пункт
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,Відправив замовлення не можуть бути видалені
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,Управління якістю
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Пункт {0} відключена
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Пункт {0} відключена
 DocType: Employee Loan,Repay Fixed Amount per Period,Погашати фіксовану суму за період
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},"Будь ласка, введіть кількість для {0}"
 DocType: Employee External Work History,Employee External Work History,Співробітник зовнішньої роботи Історія
@@ -3900,7 +3906,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student Email ID
 DocType: Employee,Notice (days),Попередження (днів)
 DocType: Tax Rule,Sales Tax Template,Шаблон податків на продаж
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Виберіть елементи для збереження рахунку-фактури
 DocType: Employee,Encashment Date,Дата виплати
 DocType: Training Event,Internet,інтернет
 DocType: Account,Stock Adjustment,Підлаштування інвентаря
@@ -3924,7 +3930,7 @@
 DocType: Item Variant Attribute,Attribute,Атрибут
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,"Будь ласка, сформулюйте з / в діапазоні"
 DocType: Serial No,Under AMC,Під річним обслуговуванням
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Собівартість товару перераховується з урахуванням документа кінцевої вартості
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Собівартість товару перераховується з урахуванням документа кінцевої вартості
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Налаштування за замовчуванням для операцій продаж.
 DocType: Guardian,Guardian Of ,хранитель
 DocType: Grading Scale Interval,Threshold,поріг
@@ -3934,6 +3940,7 @@
 DocType: Purchase Invoice,Debit Note Issued,Дебет Примітка Випущений
 DocType: Production Order,Warehouses,Склади
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} актив не може бути передано
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Цей пункт є Варіант {0} (шаблон).
 DocType: Workstation,per hour,в годину
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Закупівля
 DocType: Announcement,Announcement,Оголошення
@@ -3949,8 +3956,8 @@
 DocType: Account,Receivable,Дебіторська заборгованість
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Ряд # {0}: Не дозволено змінювати Постачальника оскільки вже існує Замовлення на придбання
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,"Роль, що дозволяє проводити операції, які перевищують ліміти кредитів."
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Вибір елементів для виготовлення
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Вибір елементів для виготовлення
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Майстер синхронізації даних, це може зайняти деякий час"
 DocType: Item,Material Issue,Матеріал Випуск
 DocType: Hub Settings,Seller Description,Продавець Опис
 DocType: Employee Education,Qualification,Кваліфікація
@@ -3962,7 +3969,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Замовлено
 DocType: Salary Detail,Component,компонент
 DocType: Assessment Criteria,Assessment Criteria Group,Критерії оцінки Група
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Накопичений знос на момент відкриття має бути менше або дорівнювати {0}
 DocType: Warehouse,Warehouse Name,Назва складу
 DocType: Naming Series,Select Transaction,Виберіть операцію
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,"Будь ласка, введіть затвердження роль або затвердження Користувач"
@@ -3975,7 +3982,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що проведений Рух ТМЦ {0} існує"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,"Не можна скасувати, тому що проведений Рух ТМЦ {0} існує"
 DocType: Employee Loan,Disbursement Date,витрачання Дата
 DocType: Vehicle,Vehicle,транспортний засіб
 DocType: Purchase Invoice,In Words,Прописом
@@ -3990,14 +3997,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,ОПП / Свинець%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Амортизація та баланси
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Сума {0} {1} переведений з {2} кілька разів {3}
 DocType: Sales Invoice,Get Advances Received,Взяти отримані аванси
 DocType: Email Digest,Add/Remove Recipients,Додати / Видалити Одержувачів
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},Угода не має проти зупинив виробництво Замовити {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'","Щоб встановити цей фінансовий рік, за замовчуванням, натисніть на кнопку &quot;Встановити за замовчуванням&quot;"
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,приєднатися
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Брак к-сті
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,Вже існує варіант позиції {0} з такими атрибутами
 DocType: Employee Loan,Repay from Salary,Погашати із заробітної плати
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Запит платіж проти {0} {1} на суму {2}
@@ -4015,7 +4022,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Оцінка результату Detail
 DocType: Employee Education,Employee Education,Співробітник Освіта
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,Повторювана група знахідку в таблиці групи товарів
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Він необхідний для вилучення Подробиці Елементу.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} вже отриманий
@@ -4024,7 +4031,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Склад {0} не пов&#39;язаний з якою-небудь облікового запису, будь ласка, створіть / зв&#39;язати відповідний рахунок (актив) для складу."
 DocType: Purchase Invoice,Recurring Id,Ідентифікатор періодичності
 DocType: Customer,Sales Team Details,Продажі команд Детальніше
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Видалити назавжди?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Видалити назавжди?
 DocType: Expense Claim,Total Claimed Amount,Усього сума претензії
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Потенційні можливості для продажу.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Невірний {0}
@@ -4035,13 +4042,14 @@
 DocType: Warehouse,PIN,PIN-код
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Визначення своєї школи в ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Базова Зміна Сума (Компанія Валюта)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Немає бухгалтерських записів для наступних складів
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,Останнє Сума замовлення
+DocType: Task,Is Milestone,Чи є Milestone
 DocType: Daily Work Summary,Email Sent To,E-mail Надіслати
 DocType: Budget,Warn,Попереджати
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Будь-які інші зауваження, відзначити зусилля, які повинні йти в записах."
@@ -4062,7 +4070,7 @@
 DocType: Item Attribute Value,Attribute Value,Значення атрибуту
 ,Itemwise Recommended Reorder Level,Рекомендовані рівні перезамовлення по товарах
 DocType: Salary Detail,Salary Detail,Заробітна плата: Подробиці
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,"Будь ласка, виберіть {0} в першу чергу"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Партія {0} номенклатурної позиції {1} протермінована.
 DocType: Sales Invoice,Commission,Комісія
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Час Лист для виготовлення.
@@ -4074,41 +4082,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,"Значення `Заморозити активи старіші ніж` повинно бути менше, ніж %d днів."
 DocType: Tax Rule,Purchase Tax Template,Шаблон податку на закупку
 ,Project wise Stock Tracking,Стеження за запасами у рамках проекту
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Заплановане обслуговування {0} існує по {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Фактична к-сть (в джерелі / цілі)
 DocType: Item Customer Detail,Ref Code,Код посилання
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Співробітник записів.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,"Будь ласка, встановіть наступну дату амортизації"
 DocType: HR Settings,Payroll Settings,Налаштування платіжної відомості
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,Зв'язати рахунки-фактури з платежами.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,Зробити замовлення
 DocType: Email Digest,New Purchase Orders,Нові Замовлення на придбання
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Корінь не може бути батьківським елементом для центру витрат
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Виберіть бренд ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Виберіть бренд ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Накопичений знос на
 DocType: Sales Invoice,C-Form Applicable,"С-формі, застосовної"
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},"Час роботи повинно бути більше, ніж 0 для операції {0}"
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Склад є обов&#39;язковим
 DocType: Supplier,Address and Contacts,Адреса та контакти
 DocType: UOM Conversion Detail,UOM Conversion Detail,Одиниця виміру Перетворення Деталь
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Підтримуйте web friendly : 900px (ширина) на 100px (висота)
 DocType: Program,Program Abbreviation,Абревіатура програми
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Виробниче замовлення не може бути зроблене на шаблон номенклатурної позиції
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Збори у прихідній накладній оновлюються по кожній позиції
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Виробниче замовлення не може бути зроблене на шаблон номенклатурної позиції
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Збори у прихідній накладній оновлюються по кожній позиції
 DocType: Warranty Claim,Resolved By,Вирішили За
 DocType: Bank Guarantee,Start Date,Дата початку
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Виділяють листя протягом.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,"Чеки та депозити неправильно ""очищені"""
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,Рахунок {0}: Ви не можете призначити рахунок як батьківський до себе
 DocType: Purchase Invoice Item,Price List Rate,Ціна з прайс-листа
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Створення котирування клієнтів
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Створення котирування клієнтів
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.","Показати ""На складі"" або ""немає на складі"", базуючись на наявності на цьому складі."
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),"Норми витрат (НВ),"
 DocType: Item,Average time taken by the supplier to deliver,Середній час потрібний постачальникові для поставки
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,оцінка результату
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Часів
 DocType: Project,Expected Start Date,Очікувана дата початку
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,"Видалити елемент, якщо стяхгнення не застосовуються до нього"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,"Валюта операції повинна бути такою ж, як валюта платіжного шлюзу"
 DocType: Payment Entry,Receive,Отримати
@@ -4119,19 +4126,19 @@
 DocType: Workstation,Operating Costs,Експлуатаційні витрати
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,"Дія, якщо накопичений місячний бюджет перевищено"
 DocType: Purchase Invoice,Submit on creation,Провести по створенню
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Валюта для {0} має бути {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Валюта для {0} має бути {1}
 DocType: Asset,Disposal Date,Утилізація Дата
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Електронні листи будуть відправлені до всіх активні працівники компанії на даний час, якщо у них немає відпустки. Резюме відповідей буде відправлений опівночі."
 DocType: Employee Leave Approver,Employee Leave Approver,Погоджувач відпустки працівника
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},Ряд {0}: Перезамовлення вже існує для цього складу {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.","Не можете бути оголошений як втрачений, бо вже зроблена пропозиція."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Навчання Зворотній зв&#39;язок
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Виробниче замовлення {0} повинно бути проведеним
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},"Будь ласка, виберіть дату початку та дату закінчення Пункт {0}"
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Курс є обов&#39;язковим в рядку {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,На сьогоднішній день не може бути раніше від дати
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Додати / Редагувати Ціни
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Додати / Редагувати Ціни
 DocType: Batch,Parent Batch,батько Batch
 DocType: Batch,Parent Batch,батько Batch
 DocType: Cheque Print Template,Cheque Print Template,Шаблон друку чеків
@@ -4145,7 +4152,7 @@
 ,Ordered Items To Be Delivered,Замовлені недоставлені товари
 DocType: Account,Income,Дохід
 DocType: Industry Type,Industry Type,Галузь
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Щось пішло не так!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Щось пішло не так!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Увага: Заяви на відпустки містять такі заблоковані дати
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Вихідний рахунок {0} вже проведений
 DocType: Assessment Result Detail,Score,рахунок
@@ -4176,17 +4183,17 @@
 DocType: Item,Variant Based On,Варіант Based On
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Всього weightage призначений повинна бути 100%. Це {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Ваші Постачальники
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,"Неможливо встановити, як втратив у продажу замовлення провадиться."
 DocType: Request for Quotation Item,Supplier Part No,Номер деталі постачальника
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Отримано від
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',"Чи не можете відняти, коли категорія для &quot;Оцінка&quot; або &quot;Vaulation і Total &#39;"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Отримано від
 DocType: Lead,Converted,Перероблений
 DocType: Item,Has Serial No,Має серійний номер
 DocType: Employee,Date of Issue,Дата випуску
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: З {0} для {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: З {0} для {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},Ряд # {0}: Встановити Постачальник по пункту {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Рядок {0}: значення годин має бути більше нуля.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,"Зображення для веб-сайту {0}, долучене до об’єкту {1} не може бути знайдене"
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,Включити цей товар у декілька груп на веб сайті.
@@ -4195,20 +4202,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Вам не дозволено встановлювати блокування
 DocType: Payment Reconciliation,Get Unreconciled Entries,Отримати Неузгоджені Записи
 DocType: Payment Reconciliation,From Invoice Date,Рахунки-фактури з датою від
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,Валюта оплати має співпадати з валютою компанії або валютою рахунку контрагента
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Залиште Інкасацію
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Що це робить?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,На склад
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Все Вступникам Student
 ,Average Commission Rate,Середня ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,"""Має серійний номер"" не може бути ""Так"" для неінвентарного об’єкту"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Відвідуваність не можна вносити для майбутніх дат
 DocType: Pricing Rule,Pricing Rule Help,Довідка з цінових правил
 DocType: School House,House Name,Назва будинку
 DocType: Purchase Taxes and Charges,Account Head,Рахунок
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,Оновіть додаткові витрат для розрахунку кінцевої вартості товарів
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,Електричний
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додайте решту вашої організації в якості користувачів. Ви можете також додати запрошувати клієнтів на ваш портал, додавши їх зі списку контактів"
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,"Додайте решту вашої організації в якості користувачів. Ви можете також додати запрошувати клієнтів на ваш портал, додавши їх зі списку контактів"
 DocType: Stock Entry,Total Value Difference (Out - In),Загальна різниця (Розх - Прих)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4217,7 +4224,7 @@
 DocType: Item,Customer Code,Код клієнта
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Нагадування про день народження для {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Дні з останнього ордена
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,Дебетом рахунка повинні бути баланс рахунку
 DocType: Buying Settings,Naming Series,Іменування серії
 DocType: Leave Block List,Leave Block List Name,Назва списку блокування відпусток
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,"Дата страхування початку повинна бути менше, ніж дата страхування End"
@@ -4232,9 +4239,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Зарплатний розрахунок для працівника {0} вже створений на основі табелю {1}
 DocType: Vehicle Log,Odometer,одометр
 DocType: Sales Order Item,Ordered Qty,Замовлена (ordered) к-сть
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Пункт {0} відключена
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,Пункт {0} відключена
 DocType: Stock Settings,Stock Frozen Upto,Рухи ТМЦ заблоковано по
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,Норми не містять жодного елементу запасів
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,Норми не містять жодного елементу запасів
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},Період з Період і датам обов&#39;язкових для повторюваних {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,Проектна діяльність / завдання.
 DocType: Vehicle Log,Refuelling Details,заправні Детальніше
@@ -4244,8 +4251,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,Останню ціну закупівлі не знайдено
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Списання Сума (Компанія валют)
 DocType: Sales Invoice Timesheet,Billing Hours,Оплачувані години
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,За замовчуванням BOM для {0} не найден
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,"Ряд # {0}: Будь ласка, встановіть кількість перезамовлення"
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,"Натисніть пункти, щоб додати їх тут"
 DocType: Fees,Program Enrollment,Програма подачі заявок
 DocType: Landed Cost Voucher,Landed Cost Voucher,Документ кінцевої вартості
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},"Будь ласка, встановіть {0}"
@@ -4269,7 +4277,7 @@
 DocType: Maintenance Visit,Maintenance Date,Дата технічного обслуговування
 DocType: Purchase Invoice Item,Rejected Serial No,Відхилено Серійний номер
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,"Дата початку року або дата закінчення перекривається з {0}. Щоб уникнути будь ласка, встановіть компанію"
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},"Дата початку повинна бути менше, ніж дата закінчення Пункт {0}"
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,Завантажити Відвідуваність
@@ -4346,7 +4354,6 @@
 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,Хрест Лістинг Пункт в декількох групах
-DocType: Grade Interval,Grade Interval,інтервал Оцінка
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Дата початку та закінчення вже встановлені для фінансового року {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance дату оновлено
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Split Batch
@@ -4392,14 +4399,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,"Залиште прапорець, якщо ви не хочете, щоб розглянути партію, роблячи групу курсів на основі."
 DocType: Asset,Frequency of Depreciation (Months),Частота амортизації (місяців)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Рахунок з кредитовим сальдо
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,Рахунок з кредитовим сальдо
 DocType: Landed Cost Item,Landed Cost Item,Приземлився Вартість товару
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,Показати нульові значення
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,Кількість пункту отримані після виготовлення / перепакування із заданих кількостях сировини
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Налаштувати простий веб-сайт для моєї організації
 DocType: Payment Reconciliation,Receivable / Payable Account,Рахунок Кредиторської / Дебіторської заборгованості
 DocType: Delivery Note Item,Against Sales Order Item,На Sales Order Пункт
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},"Будь ласка, сформулюйте Значення атрибуту для атрибуту {0}"
 DocType: Item,Default Warehouse,Склад за замовчуванням
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Бюджет не може бути призначений на обліковий запис групи {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,"Будь ласка, введіть батьківський центр витрат"
@@ -4445,7 +4452,7 @@
 DocType: Opportunity Item,Basic Rate,Базова ціна
 DocType: GL Entry,Credit Amount,Сума кредиту
 DocType: Cheque Print Template,Signatory Position,Положення підпису
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Встановити як Втрачений
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Встановити як Втрачений
 DocType: Timesheet,Total Billable Hours,Всього оплачуваних годин
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Оплата Отримання Примітка
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Згідно операцій по цьому клієнту. Див графік нижче для отримання докладної інформації
@@ -4459,11 +4466,11 @@
 ,Items To Be Requested,Товари до відвантаження
 DocType: Purchase Order,Get Last Purchase Rate,Отримати останню ціну закупівлі
 DocType: Company,Company Info,Інформація про компанію
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Вибрати або додати нового клієнта
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Вибрати або додати нового клієнта
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,МВЗ потрібно замовити вимога про витрати
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Застосування засобів (активів)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Це засновано на відвідуваності цього співробітника
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Дебетовий рахунок
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,Дебетовий рахунок
 DocType: Fiscal Year,Year Start Date,Дата початку року
 DocType: Attendance,Employee Name,Ім'я працівника
 DocType: Sales Invoice,Rounded Total (Company Currency),Заокруглений підсумок (Валюта компанії)
@@ -4472,13 +4479,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,Завадити користувачам створювати заяви на відпустки на наступні дні.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Закупівельна сума
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Пропозицію постачальника {0} створено
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Рік закінчення не може бути раніше початку року
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Виплати працівникам
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},"Будь ласка, встановіть список вихідних за замовчуванням для працівника {0} або Компанії {1}"
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} не існує
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} не існує
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,"Законопроекти, підняті клієнтам."
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,Проект Id
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},Рядок № {0}: Сума не може бути більша ніж сума до погодження по Авансовому звіту {1}. Сума до погодження = {2}
@@ -4487,15 +4494,17 @@
 DocType: Quality Inspection Reading,Reading 3,Читання 3
 ,Hub,Концентратор
 DocType: GL Entry,Voucher Type,Тип документа
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Прайс-лист не знайдений або відключений
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,Прайс-лист не знайдений або відключений
 DocType: Employee Loan Application,Approved,Затверджений
 DocType: Pricing Rule,Price,Ціна
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Співробітник звільняється від {0} повинен бути встановлений як &quot;ліві&quot;
 DocType: Guardian,Guardian,охоронець
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Оцінка {0} створений для працівника {1} в зазначений діапазон дат
 DocType: Employee,Education,Освіта
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Називати кампанії за
 DocType: Employee,Current Address Is,Поточна адреса
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,модифікований
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Необов&#39;язково. Встановлює за замовчуванням валюту компанії, якщо не вказано."
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,Бухгалтерських журналів.
 DocType: Delivery Note Item,Available Qty at From Warehouse,Доступна к-сть на вихідному складі
@@ -4504,7 +4513,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Ряд {0}: Партія / рахунку не відповідає {1} / {2} в {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,"Будь ласка, введіть видатковий рахунок"
 DocType: Account,Stock,Інвентар
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Рядок # {0}: тип документу має бути одним з: Замовлення на придбання, Вхідний рахунок-фактура або Запис журналу"
 DocType: Employee,Current Address,Поточна адреса
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Якщо товар є варіантом іншого, то опис, зображення, ціноутворення, податки і т.д. будуть встановлені на основі шаблону, якщо явно не вказано інше"
 DocType: Serial No,Purchase / Manufacture Details,Закупівля / Виробництво: Детальніше
@@ -4532,7 +4541,7 @@
 DocType: Hub Settings,Hub Settings,Налаштування концентратора
 DocType: Project,Gross Margin %,Валовий дохід %
 DocType: BOM,With Operations,З операцій
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,"Бухгалтерські вже були зроблені у валюті {0} для компанії {1}. Будь ласка, виберіть дебіторської або кредиторської заборгованості рахунок з валютою {0}."
 DocType: Asset,Is Existing Asset,Існуючий актив
 DocType: Salary Detail,Statistical Component,Статистичний компонент
 DocType: Salary Detail,Statistical Component,Статистичний компонент
@@ -4557,7 +4566,7 @@
 DocType: Assessment Plan,Room,кімната
 DocType: Purchase Order,Advance Paid,Попередньо оплачено
 DocType: Item,Item Tax,Податки
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Матеріал Постачальнику
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Матеріал Постачальнику
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Акцизний Рахунок
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% з&#39;являється більше одного разу
 DocType: Expense Claim,Employees Email Id,Співробітники Email ID
@@ -4588,9 +4597,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Долучити логотип
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Сток Рівні
 DocType: Customer,Commission Rate,Ставка комісії
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Зробити варіанти
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Зробити варіанти
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Блокувати заяви на відпустки по підрозділу.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Тип оплати повинен бути одним з Надсилати, Pay і внутрішній переказ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Аналітика
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Кошик Пусто
 DocType: Vehicle,Model,модель
@@ -4601,6 +4610,7 @@
 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 +161,Capital Stock,Основний капітал
+DocType: Shopping Cart Settings,Show Public Attachments,Показати Публічні вкладення
 DocType: Packing Slip,Package Weight Details,Вага упаковки Детальніше
 DocType: Payment Gateway Account,Payment Gateway Account,Обліковий запис платіжного шлюзу
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Після завершення оплати перенаправити користувача на обрану сторінку.
@@ -4619,15 +4629,15 @@
 DocType: Batch,Expiry Date,Термін придатності
 ,Supplier Addresses and Contacts,Адреса та контактні дані постачальника
 ,accounts-browser,переглядач рахунків
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,"Ласка, виберіть категорію спершу"
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,"Ласка, виберіть категорію спершу"
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Майстер проекту.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Щоб дозволити over-billing або over-ordering, змініть ""Дозвіл"" в налаштуваннях інвентаря або даної позиції."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,"Не показувати жодних символів на кшталт ""₴"" і подібних поряд з валютами."
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Половина дня)
 DocType: Supplier,Credit Days,Кредитні Дні
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Make Student Batch
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Make Student Batch
 DocType: Leave Type,Is Carry Forward,Є переносити
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Отримати елементи з норм
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Отримати елементи з норм
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Час на поставку в днях
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},"Рядок # {0}: Дата створення повинна бути такою ж, як дата покупки {1} активу {2}"
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,"Будь ласка, введіть Замовлення клієнтів у наведеній вище таблиці"
@@ -4644,8 +4654,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,Санкціонована сума
 DocType: GL Entry,Is Opening,Введення залишків
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},Ряд {0}: Дебет запис не може бути пов&#39;язаний з {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,"Будь ласка, вибір початкового номера серії для відвідуваності через Setup&gt; Нумерація серії"
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,Рахунок {0} не існує
 DocType: Account,Cash,Грошові кошти
 DocType: Employee,Short biography for website and other publications.,Коротка біографія для веб-сайту та інших публікацій.
diff --git a/erpnext/translations/ur.csv b/erpnext/translations/ur.csv
index 5d4af43..5eef02e 100644
--- a/erpnext/translations/ur.csv
+++ b/erpnext/translations/ur.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,کرایے
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,صارف کے لئے قابل اطلاق
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",روک پروڈکشن آرڈر منسوخ نہیں کیا جا سکتا، منسوخ کرنے کے لئے سب سے پہلے اس Unstop
 DocType: Vehicle Service,Mileage,میلانہ
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,اگر تم واقعی اس اثاثہ کو ختم کرنا چاہتے ہیں؟
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,طے شدہ پردایک
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,طے شدہ پردایک
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},کرنسی قیمت کی فہرست کے لئے ضروری ہے {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* ٹرانزیکشن میں حساب کیا جائے گا.
 DocType: Purchase Order,Customer Contact,اپرنٹسشپس
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),بقایا {0} نہیں ہو سکتا کے لئے صفر سے بھی کم ({1})
 DocType: Manufacturing Settings,Default 10 mins,10 منٹس پہلے سے طے شدہ
 DocType: Leave Type,Leave Type Name,قسم کا نام چھوڑ دو
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,کھلی دکھائیں
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,کھلی دکھائیں
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,سیریز کو کامیابی سے حالیہ
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,اس کو دیکھو
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural جرنل اندراج پیش
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,بیچ آئٹم ختم ہونے کی حیثیت
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,بینک ڈرافٹ
 DocType: Mode of Payment Account,Mode of Payment Account,ادائیگی اکاؤنٹ کے موڈ
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,دکھائیں متغیرات
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,دکھائیں متغیرات
 DocType: Academic Term,Academic Term,تعلیمی مدت
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,مواد
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,مقدار
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,مقدار
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,میز اکاؤنٹس خالی نہیں رہ سکتی.
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),قرضے (واجبات)
 DocType: Employee Education,Year of Passing,پاسنگ کا سال
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",حوالہ:٪ s ہے، آئٹم کے کوڈ:٪ s اور کسٹمر:٪ s ہے
 DocType: Item,Country of Origin,پیدائشی ملک
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,اسٹاک میں
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,کھولیں مسائل
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,صحت کی دیکھ بھال
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),ادائیگی میں تاخیر (دن)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,سروس کے اخراجات
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,انوائس
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},سیریل نمبر: {0} نے پہلے ہی فروخت انوائس میں محولہ ہے: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,انوائس
 DocType: Maintenance Schedule Item,Periodicity,مدت
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,مالی سال {0} کی ضرورت ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,متوقع تاریخ کی ترسیل سے پہلے سیلز آرڈر تاریخ ہونا ہے
@@ -112,22 +112,23 @@
 DocType: Student Log,Log,لاگ
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,ایک کام کے لئے کھولنے.
 DocType: Item Attribute,Increment,اضافہ
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,گودام منتخب کریں ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,گودام منتخب کریں ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,ایڈورٹائزنگ
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,ایک ہی کمپنی ایک سے زیادہ بار داخل کیا جاتا ہے
 DocType: Employee,Married,شادی
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},کی اجازت نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,سے اشیاء حاصل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},کی اجازت نہیں {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},اسٹاک ترسیل کے نوٹ کے خلاف اپ ڈیٹ نہیں کیا جا سکتا {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,کوئی آئٹم مندرج
 DocType: Payment Reconciliation,Reconcile,مصالحت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,گروسری
 DocType: Quality Inspection Reading,Reading 1,1 پڑھنا
 DocType: Process Payroll,Make Bank Entry,بینک اندراج
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,پنشن فنڈز
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,اگلا ہراس تاریخ تاریخ کی خریداری سے پہلے نہیں ہو سکتا
 DocType: SMS Center,All Sales Person,تمام فروخت شخص
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** ماہانہ ڈسٹریبیوش ** آپ کو مہینوں بھر بجٹ / نشانے کی تقسیم سے آپ کو آپ کے کاروبار میں seasonality کے ہو تو میں مدد ملتی ہے.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,آئٹم نہیں ملا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,آئٹم نہیں ملا
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,تنخواہ ساخت لاپتہ
 DocType: Lead,Person Name,شخص کا نام
 DocType: Sales Invoice Item,Sales Invoice Item,فروخت انوائس آئٹم
@@ -136,16 +137,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",مثلا &quot;پرائمری سکول&quot; یا &quot;یونیورسٹی&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,اسٹاک کی رپورٹ
 DocType: Warehouse,Warehouse Detail,گودام تفصیل
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},کریڈٹ کی حد گاہک کے لئے تجاوز کر گئی ہے {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,اصطلاح آخر تاریخ بعد میں جس چیز کی اصطلاح منسلک ہے کے تعلیمی سال کے سال آخر تاریخ سے زیادہ نہیں ہو سکتا ہے (تعلیمی سال {}). تاریخوں درست کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",&quot;فکسڈ اثاثہ ہے&quot; اثاثہ ریکارڈ کی شے کے خلاف موجود نہیں کے طور پر، انینترت ہو سکتا ہے
 DocType: Vehicle Service,Brake Oil,وقفے تیل
 DocType: Tax Rule,Tax Type,ٹیکس کی قسم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},تم سے پہلے اندراجات شامل کرنے یا اپ ڈیٹ کرنے کی اجازت نہیں ہے {0}
 DocType: BOM,Item Image (if not slideshow),آئٹم تصویر (سلائڈ شو نہیں تو)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,ایک کسٹمر کو ایک ہی نام کے ساتھ موجود
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,ڰنٹےکی شرح / 60) * اصل آپریشن کے وقت)
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,BOM منتخب
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,BOM منتخب
 DocType: SMS Log,SMS Log,ایس ایم ایس لاگ ان
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,ہونے والا اشیا کی لاگت
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,{0} پر چھٹی تاریخ سے اور تاریخ کے درمیان نہیں ہے
@@ -166,7 +167,7 @@
 DocType: Academic Term,Schools,اسکولوں
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},ملازم کیلئے کوئی چھٹی ریکارڈ {0} کے لئے {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,پہلی کمپنی داخل کریں
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,پہلی کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,کل لاگت
@@ -181,7 +182,7 @@
 DocType: Expense Claim Detail,Claim Amount,دعوے کی رقم
 DocType: Employee,Mr,جناب
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,cutomer گروپ کے ٹیبل میں پایا ڈوپلیکیٹ گاہک گروپ
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,پردایک قسم / سپلائر
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,پردایک قسم / سپلائر
 DocType: Naming Series,Prefix,اپسرگ
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,فراہمی
 DocType: Employee,B-,B-
@@ -190,11 +191,11 @@
 DocType: Training Result Employee,Grade,گریڈ
 DocType: Sales Invoice Item,Delivered By Supplier,سپلائر کی طرف سے نجات بخشی
 DocType: SMS Center,All Contact,تمام رابطہ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,پروڈکشن آرڈر پہلے سے ہی BOM کے ساتھ تمام اشیاء کے لئے پیدا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,سالانہ تنخواہ
 DocType: Daily Work Summary,Daily Work Summary,روز مرہ کے کام کا خلاصہ
 DocType: Period Closing Voucher,Closing Fiscal Year,مالی سال بند
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1} منجمد ھو گیا ھے
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,اکاؤنٹس کا چارٹ بنانے کے لئے موجودہ کمپنی براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,اسٹاک اخراجات
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,کے ھدف گودام کریں
@@ -203,12 +204,12 @@
 DocType: Journal Entry,Contra Entry,برعکس انٹری
 DocType: Journal Entry Account,Credit in Company Currency,کمپنی کرنسی میں کریڈٹ
 DocType: Delivery Note,Installation Status,تنصیب کی حیثیت
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",آپ کی حاضری کو اپ ڈیٹ کرنا چاہتے ہیں؟ <br> موجودہ: {0} \ <br> غائب: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},مقدار مسترد منظور + شے کے لئے موصول مقدار کے برابر ہونا چاہیے {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,خام مال کی سپلائی کی خریداری کے لئے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,ادائیگی کی کم از کم ایک موڈ POS انوائس کے لئے ضروری ہے.
 DocType: Products Settings,Show Products as a List,شو کی مصنوعات ایک فہرست کے طور
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",، سانچہ ڈاؤن لوڈ مناسب اعداد و شمار کو بھرنے کے اور نظر ثانی شدہ فائل منسلک. منتخب مدت میں تمام تاریخوں اور ملازم مجموعہ موجودہ حاضری کے ریکارڈز کے ساتھ، سانچے میں آ جائے گا
@@ -222,7 +223,7 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,ہراس اندراج
 DocType: Appraisal Template Goal,KRA,سے Kra
 DocType: Lead,Request Type,درخواست کی قسم
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,ملازم بنائیں
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,ملازم بنائیں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,نشریات
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,پھانسی
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,آپریشن کی تفصیلات سے کئے گئے.
@@ -236,6 +237,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,بحالی کے دوروں کے لئے منصوبہ بندی.
 DocType: SMS Settings,Enter url parameter for message,پیغام کے لئے یو آر ایل پیرامیٹر درج
 DocType: POS Profile,Customer Groups,کسٹمر گروپوں
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,مالیاتی گوشوارے
 DocType: Guardian,Students,طلباء
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,قیمتوں کا تعین اور رعایت کا اطلاق کے لئے قوانین.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,قیمت کی فہرست خرید یا فروخت کے لئے قابل ہونا چاہئے
@@ -261,11 +263,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},ایڈوانس رقم سے زیادہ نہیں ہو سکتا {0} {1}
 DocType: Naming Series,Series List for this Transaction,اس ٹرانزیکشن کے لئے سیریز
 DocType: Company,Default Payroll Payable Account,پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,ای میل تازہ کاری گروپ
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,ای میل تازہ کاری گروپ
 DocType: Sales Invoice,Is Opening Entry,انٹری افتتاح ہے
 DocType: Customer Group,Mention if non-standard receivable account applicable,ذکر غیر معیاری وصولی اکاؤنٹ اگر قابل اطلاق ہو
 DocType: Course Schedule,Instructor Name,انسٹرکٹر نام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,گودام کے لئے جمع کرانے سے پہلے کی ضرورت ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,ری سیلر
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",جانچ پڑتال کی تو مواد کی درخواستوں میں غیر اسٹاک اشیاء میں شامل ہوں گے.
@@ -273,7 +275,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,فروخت انوائس آئٹم خلاف
 ,Production Orders in Progress,پیش رفت میں پیداوار کے احکامات
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,فنانسنگ کی طرف سے نیٹ کیش
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
 DocType: Lead,Address & Contact,ایڈریس اور رابطہ
 DocType: Leave Allocation,Add unused leaves from previous allocations,گزشتہ آونٹن سے غیر استعمال شدہ پتے شامل
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},اگلا مکرر {0} پر پیدا کیا جائے گا {1}
@@ -299,8 +301,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),کل لاگت کی رقم (وقت شیٹ کے ذریعے)
 DocType: Item Website Specification,Item Website Specification,شے کی ویب سائٹ کی تفصیلات
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,چھوڑ کریں
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,بینک لکھے
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},آئٹم {0} پر زندگی کے اس کے آخر تک پہنچ گیا ہے {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,بینک لکھے
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,سالانہ
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,اسٹاک مصالحتی آئٹم
 DocType: Stock Entry,Sales Invoice No,فروخت انوائس کوئی
@@ -318,8 +320,8 @@
 DocType: Item,Publish in Hub,حب میں شائع
 DocType: Student Admission,Student Admission,طالب علم داخلہ
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,مواد کی درخواست
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,{0} آئٹم منسوخ کر دیا ہے
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,مواد کی درخواست
 DocType: Bank Reconciliation,Update Clearance Date,اپ ڈیٹ کی کلیئرنس تاریخ
 DocType: Item,Purchase Details,خریداری کی تفصیلات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},خریداری کے آرڈر میں خام مال کی فراہمی &#39;کے ٹیبل میں شے نہیں مل سکا {0} {1}
@@ -354,9 +356,9 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,بقایا چیک اور صاف کرنے کے لئے جمع
 DocType: Item,Synced With Hub,حب کے ساتھ موافقت پذیر
 DocType: Vehicle,Fleet Manager,فلیٹ مینیجر
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,غلط شناختی لفظ
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,غلط شناختی لفظ
 DocType: Item,Variant Of,کے مختلف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',کے مقابلے میں &#39;مقدار تعمیر کرنے&#39; مکمل مقدار زیادہ نہیں ہو سکتا
 DocType: Period Closing Voucher,Closing Account Head,اکاؤنٹ ہیڈ بند
 DocType: Employee,External Work History,بیرونی کام کی تاریخ
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,سرکلر حوالہ خرابی
@@ -368,12 +370,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,خود کار طریقے سے مواد کی درخواست کی تخلیق پر ای میل کے ذریعے مطلع کریں
 DocType: Journal Entry,Multi Currency,ملٹی کرنسی
 DocType: Payment Reconciliation Invoice,Invoice Type,انوائس کی قسم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,ترسیل کے نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,ترسیل کے نوٹ
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,ٹیکس قائم
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,فروخت اثاثہ کی قیمت
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,آپ اسے نکالا بعد ادائیگی انٹری پر نظر ثانی کر دیا گیا ہے. اسے دوبارہ ھیںچو براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
-DocType: Grade Interval,Min Score,کم سے کم اسکور
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} آئٹم ٹیکس میں دو بار میں داخل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,اس ہفتے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Student Applicant,Admitted,اعتراف کیا
 DocType: Workstation,Rent Cost,کرایہ لاگت
@@ -386,7 +387,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,آرڈر ویلیو
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,بینک / کیش پارٹی کے خلاف یا اندرونی منتقلی کے لئے لین دین
 DocType: Shipping Rule,Valid for Countries,ممالک کے لئے درست
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,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/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,یہ آئٹم ایک ٹیمپلیٹ ہے اور لین دین میں استعمال نہیں کیا جا سکتا. &#39;کوئی کاپی&#39; مقرر کیا گیا ہے جب تک آئٹم صفات مختلف حالتوں میں سے زیادہ کاپی کیا جائے گا
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,سمجھا کل آرڈر
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",ملازم عہدہ (مثلا سی ای او، ڈائریکٹر وغیرہ).
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,درج میدان قیمت &#39;دن ماہ پر دہرائیں براہ مہربانی
@@ -395,14 +396,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},صف # {0}: خریداری کی رسید ایک موجودہ اثاثہ کے خلاف بنایا نہیں جا سکتا {1}
 DocType: Item Tax,Tax Rate,ٹیکس کی شرح
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} پہلے ہی ملازم کے لئے مختص {1} کی مدت {2} کے لئے {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,منتخب آئٹم
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,منتخب آئٹم
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,انوائس {0} پہلے ہی پیش کیا جاتا ہے کی خریداری
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},صف # {0}: بیچ کوئی طور پر ایک ہی ہونا ضروری ہے {1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,غیر گروپ میں تبدیل
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,ایک آئٹم کے بیچ (بہت).
 DocType: C-Form Invoice Detail,Invoice Date,انوائس کی تاریخ
 DocType: GL Entry,Debit Amount,ڈیبٹ رقم
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},صرف فی کمپنی 1 اکاؤنٹ نہیں ہو سکتا {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,منسلکہ ملاحظہ کریں
 DocType: Purchase Order,% Received,٪ موصول
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,طلبہ تنظیموں بنائیں
@@ -431,9 +432,9 @@
 DocType: Request for Quotation,Request for Quotation,کوٹیشن کے لئے درخواست
 DocType: Salary Slip Timesheet,Working Hours,کام کے اوقات
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,ایک موجودہ سیریز کے شروع / موجودہ ترتیب تعداد کو تبدیل کریں.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,ایک نئے گاہک بنائیں
-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.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,ایک نئے گاہک بنائیں
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",ایک سے زیادہ قیمتوں کا تعین قواعد غالب کرنے کے لئے جاری ہے، صارفین تنازعہ کو حل کرنے دستی طور پر ترجیح مقرر کرنے کو کہا جاتا.
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,خریداری کے آرڈر بنائیں
 ,Purchase Register,خریداری رجسٹر
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,لاگو چارجز
@@ -441,7 +442,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1})  کردارکےلیے 'رخصت کی منظوری دینے والا"" کردار ہونا ضروری ہے'"
 DocType: Purchase Receipt,Vehicle Date,گاڑی تاریخ
 DocType: Student Log,Medical,میڈیکل
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,کھونے کے لئے کی وجہ سے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,کھونے کے لئے کی وجہ سے
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,لیڈ مالک لیڈ کے طور پر ہی نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,مختص رقم اسایڈجت رقم سے زیادہ نہیں کر سکتے ہیں
 DocType: Announcement,Receiver,وصول
@@ -458,6 +459,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,مقدار اور شرح
 DocType: Delivery Note,% Installed,٪ نصب
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,کلاس روم / لیبارٹریز وغیرہ جہاں لیکچر شیڈول کر سکتے ہیں.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,پہلی کمپنی کا نام درج کریں
 DocType: Purchase Invoice,Supplier Name,سپلائر کے نام
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,ERPNext دستی پڑھیں
@@ -474,16 +476,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,لازمی فیلڈ - تعلیمی سال
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,لازمی فیلڈ - تعلیمی سال
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,اس ای میل کا ایک حصہ کے طور پر چلا جاتا ہے کہ تعارفی متن کی تخصیص کریں. ہر ٹرانزیکشن ایک علیحدہ تعارفی متن ہے.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},کمپنی کے لیے ڈیفالٹ قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,تمام مینوفیکچرنگ کے عمل کے لئے عالمی ترتیبات.
 DocType: Accounts Settings,Accounts Frozen Upto,منجمد تک اکاؤنٹس
 DocType: SMS Log,Sent On,پر بھیجا
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,خاصیت {0} صفات ٹیبل میں ایک سے زیادہ مرتبہ منتخب
 DocType: HR Settings,Employee record is created using selected field. ,ملازم ریکارڈ منتخب کردہ میدان کا استعمال کرتے ہوئے تخلیق کیا جاتا ہے.
 DocType: Sales Order,Not Applicable,قابل اطلاق نہیں
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,چھٹیوں ماسٹر.
 DocType: Request for Quotation Item,Required Date,مطلوبہ تاریخ
 DocType: Delivery Note,Billing Address,بل کا پتہ
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,آئٹم کوڈ داخل کریں.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,آئٹم کوڈ داخل کریں.
 DocType: BOM,Costing,لاگت
 DocType: Tax Rule,Billing County,بلنگ کاؤنٹی
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",جانچ پڑتال کی تو پہلے سے ہی پرنٹ ریٹ / پرنٹ رقم میں شامل ہیں، ٹیکس کی رقم غور کیا جائے گا
@@ -499,6 +502,7 @@
 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,سیکورٹیز اور جمع
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",کچھ آئٹمز کے خلاف لین دین جو نہیں ہے جس سے ہیں کے طور پر، تشخیص کا طریقہ تبدیل نہیں ہوسکتی کی اپنی تشخیص کا طریقہ ہے
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,مختص کل پتے لازمی ہے
 DocType: Job Opening,Description of a Job Opening,ایک کام افتتاحی تفصیل
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,آج کے لئے زیر غور سرگرمیوں
@@ -520,13 +524,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,کورس کا انتخاب کریں
 DocType: Timesheet Detail,Hrs,بجے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,کمپنی کا انتخاب کریں
 DocType: Stock Entry Detail,Difference Account,فرق اکاؤنٹ
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,اس کا انحصار کام {0} بند نہیں ہے کے طور پر قریب کام نہیں کر سکتے ہیں.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,مواد درخواست اٹھایا جائے گا جس کے لئے گودام میں داخل کریں
 DocType: Production Order,Additional Operating Cost,اضافی آپریٹنگ لاگت
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,کاسمیٹک
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",ضم کرنے کے لئے، مندرجہ ذیل خصوصیات دونوں اشیاء کے لئے ایک ہی ہونا چاہیے
 DocType: Shipping Rule,Net Weight,سارا وزن
 DocType: Employee,Emergency Phone,ایمرجنسی فون
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,خریدنے
@@ -536,7 +540,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,حد 0 فیصد گریڈ کی وضاحت براہ مہربانی
 DocType: Sales Order,To Deliver,نجات کے لئے
 DocType: Purchase Invoice Item,Item,آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,سیریل کوئی شے ایک حصہ نہیں ہو سکتا
 DocType: Journal Entry,Difference (Dr - Cr),فرق (ڈاکٹر - CR)
 DocType: Account,Profit and Loss,نفع اور نقصان
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,منیجنگ ذیلی سمجھوتے
@@ -551,7 +555,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,اضافہ 0 نہیں ہو سکتا
 DocType: Production Planning Tool,Material Requirement,مواد ضرورت
 DocType: Company,Delete Company Transactions,کمپنی معاملات حذف
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,حوالہ نمبر اور ریفرنس تاریخ بینک ٹرانزیکشن کے لئے لازمی ہے
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,/ ترمیم ٹیکس اور الزامات شامل
 DocType: Purchase Invoice,Supplier Invoice No,سپلائر انوائس کوئی
 DocType: Territory,For reference,حوالے کے لیے
@@ -562,7 +566,7 @@
 DocType: Installation Note Item,Installation Note Item,تنصیب نوٹ آئٹم
 DocType: Production Plan Item,Pending Qty,زیر مقدار
 DocType: Budget,Ignore,نظر انداز
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} فعال نہیں ہے
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} فعال نہیں ہے
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},ایس ایم ایس مندرجہ ذیل نمبروں کے لئے بھیجا: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,پرنٹنگ کے لئے سیٹ اپ کے چیک جہتوں
 DocType: Salary Slip,Salary Slip Timesheet,تنخواہ کی پرچی Timesheet
@@ -571,13 +575,13 @@
 DocType: Sales Invoice,Total Commission,کل کمیشن
 DocType: Pricing Rule,Sales Partner,سیلز پارٹنر
 DocType: Buying Settings,Purchase Receipt Required,خریداری کی رسید کی ضرورت ہے
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,اسٹاک کھولنے میں داخل ہوئے تو اندازہ شرح لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,انوائس ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,پہلی کمپنی اور پارٹی کی قسم منتخب کریں
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,مالی / اکاؤنٹنگ سال.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,جمع اقدار
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",معذرت، سیریل نمبر ضم نہیں کیا جا سکتا
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,سیلز آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,سیلز آرڈر بنائیں
 DocType: Project Task,Project Task,پراجیکٹ ٹاسک
 ,Lead Id,لیڈ کی شناخت
 DocType: C-Form Invoice Detail,Grand Total,مجموعی عدد
@@ -594,7 +598,7 @@
 DocType: Job Applicant,Resume Attachment,پھر جاری منسلکہ
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,دوبارہ گاہکوں
 DocType: Leave Control Panel,Allocate,مختص
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,سیلز واپس
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,سیلز واپس
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,نوٹ: کل روانہ مختص {0} پہلے ہی منظور پتیوں سے کم نہیں ہونا چاہئے {1} مدت کے لئے
 DocType: Announcement,Posted By,کی طرف سے پوسٹ
 DocType: Item,Delivered by Supplier (Drop Ship),سپلائر کی طرف سے نجات بخشی (ڈراپ جہاز)
@@ -604,7 +608,7 @@
 DocType: Quotation,Quotation To,کے لئے کوٹیشن
 DocType: Lead,Middle Income,درمیانی آمدنی
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),افتتاحی (CR)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,مختص رقم منفی نہیں ہو سکتا
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,کمپنی قائم کی مہربانی
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,کمپنی قائم کی مہربانی
@@ -616,7 +620,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,فروخت انوائس Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},حوالہ کوئی اور حوالہ تاریخ کے لئے ضروری ہے {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,بینک اندراج کرنے کے لئے منتخب ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",پتیوں، اخراجات دعووں اور پے رول انتظام کرنے کے لئے ملازم ریکارڈز تخلیق کریں
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,سویدی میں شامل کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,تجویز تحریری طور پر
 DocType: Payment Entry Deduction,Payment Entry Deduction,ادائیگی انٹری کٹوتی
@@ -647,18 +651,17 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} {1} نہ مالی سال میں {2}
 DocType: Buying Settings,Settings for Buying Module,ماڈیول کی خریداری کے لئے ترتیبات
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},ایسیٹ {0} کی کمپنی سے تعلق نہیں ہے {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,پہلی خریداری کی رسید درج کریں
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",پھر قیمتوں کا تعین قواعد وغیرہ کسٹمر، کسٹمر گروپ، علاقہ، سپلائر، سپلائر کی قسم، مہم، سیلز پارٹنر کی بنیاد پر فلٹر کر رہے ہیں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,انوینٹری میں خالص تبدیلی
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,ملازم قرض کے انتظام
 DocType: Employee,Passport Number,پاسپورٹ نمبر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Guardian2 ساتھ تعلق
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,مینیجر
 DocType: Payment Entry,Payment From / To,/ سے ادائیگی
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,تاریخ کی حد
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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;ہی نہیں ہو سکتا
@@ -667,8 +670,8 @@
 DocType: Production Order Operation,In minutes,منٹوں میں
 DocType: Issue,Resolution Date,قرارداد تاریخ
 DocType: Student Batch Name,Batch Name,بیچ کا نام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet پیدا کیا:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet پیدا کیا:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},ادائیگی کے موڈ میں پہلے سے طے شدہ نقد یا بینک اکاؤنٹ مقرر کریں {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,اندراج کریں
 DocType: Selling Settings,Customer Naming By,کی طرف سے گاہک نام دینے
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,میں طالب علم ماہانہ حاضری کی رپورٹ کے طور پر موجود طالب علم کو دکھائے گا
@@ -696,7 +699,7 @@
 DocType: Production Order Operation,Actual Start Time,اصل وقت آغاز
 DocType: BOM Operation,Operation Time,آپریشن کے وقت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,ختم
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,بنیاد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,بنیاد
 DocType: Timesheet,Total Billed Hours,کل بل گھنٹے
 DocType: Journal Entry,Write Off Amount,رقم لکھیں
 DocType: Journal Entry,Bill No,بل نہیں
@@ -712,7 +715,7 @@
 DocType: Student Attendance,Student Attendance,طلبا کی حاضری
 DocType: Sales Invoice Timesheet,Time Sheet,وقت شیٹ
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush خام مال کی بنیاد پر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,شے کی تفصیلات درج کریں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,شے کی تفصیلات درج کریں
 DocType: Interest,Interest,دلچسپی
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,پہلی فروخت
 DocType: Purchase Receipt,Other Details,دیگر تفصیلات
@@ -723,23 +726,21 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,ادائیگی انٹری پہلے ہی تخلیق کیا جاتا ہے
 DocType: Purchase Receipt Item Supplied,Current Stock,موجودہ اسٹاک
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},صف # {0}: {1} اثاثہ آئٹم سے منسلک نہیں کرتا {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,پیش نظارہ تنخواہ کی پرچی
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,اکاؤنٹ {0} کئی بار داخل کیا گیا ہے
 DocType: Account,Expenses Included In Valuation,اخراجات تشخیص میں شامل
 DocType: Hub Settings,Seller City,فروش شہر
 ,Absent Student Report,غائب Student کی رپورٹ
 DocType: Email Digest,Next email will be sent on:,پیچھے اگلا، دوسرا ای میل پر بھیجا جائے گا:
 DocType: Offer Letter Term,Offer Letter Term,خط مدتی پیشکش
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,آئٹم مختلف حالتوں ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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 +84,Tree Type,درخت کی قسم
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,درخت کی قسم
 DocType: BOM Explosion Item,Qty Consumed Per Unit,مقدار فی یونٹ بسم
 DocType: Serial No,Warranty Expiry Date,وارنٹی ختم ہونے کی تاریخ
 DocType: Material Request Item,Quantity and Warehouse,مقدار اور گودام
 DocType: Sales Invoice,Commission Rate (%),کمیشن کی شرح (٪)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,براہ مہربانی منتخب کریں پروگرام
 DocType: Project,Estimated Cost,تخمینی لاگت
 DocType: Purchase Order,Link to material requests,مواد درخواستوں کا لنک
@@ -757,7 +758,7 @@
 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,پہلے سے طے شدہ اکاؤنٹ
 DocType: Payment Entry,Received Amount (Company Currency),موصولہ رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,مواقع لیڈ سے بنایا گیا ہے تو قیادت مرتب کیا جانا چاہئے
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,ہفتہ وار چھٹی کا دن منتخب کریں
 DocType: Production Order Operation,Planned End Time,منصوبہ بندی اختتام وقت
 ,Sales Person Target Variance Item Group-Wise,فروخت شخص ہدف تغیر آئٹم گروپ حکیم
@@ -773,6 +774,7 @@
 DocType: Opportunity,Opportunity From,سے مواقع
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,ماہانہ تنخواہ بیان.
 DocType: BOM,Website Specifications,ویب سائٹ نردجیکرن
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: سے {0} قسم کا {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,صف {0}: تبادلوں فیکٹر لازمی ہے
@@ -806,20 +808,21 @@
 DocType: Employee,Bank A/C No.,بینک A / C نمبر
 DocType: Bank Guarantee,Project,پروجیکٹ
 DocType: Quality Inspection Reading,Reading 7,7 پڑھنا
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,جزوی طور پر حکم دیا
 DocType: Expense Claim Detail,Expense Claim Type,اخراجات دعوی کی قسم
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,خریداری کی ٹوکری کے لئے پہلے سے طے شدہ ترتیبات
 DocType: Employee Loan,Interest Income Account,سودی آمدنی اکاؤنٹ
 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 +107,Office Maintenance Expenses,آفس دیکھ بھال کے اخراجات
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,ای میل اکاؤنٹ سیٹ اپ کیا
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,پہلی شے داخل کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,پہلی شے داخل کریں
 DocType: Account,Liability,ذمہ داری
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,منظور رقم صف میں دعوے کی رقم سے زیادہ نہیں ہو سکتا {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,قیمت کی فہرست منتخب نہیں
 DocType: Employee,Family Background,خاندانی پس منظر
 DocType: Request for Quotation Supplier,Send Email,ای میل بھیجیں
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},انتباہ: غلط لف دستاویز {0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,کوئی اجازت
 DocType: Company,Default Bank Account,پہلے سے طے شدہ بینک اکاؤنٹ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",پارٹی کی بنیاد پر فلٹر کرنے کے لئے، منتخب پارٹی پہلی قسم
@@ -832,8 +835,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,کوئی ملازم پایا
 DocType: Supplier Quotation,Stopped,روک
 DocType: Item,If subcontracted to a vendor,ایک وینڈر کے ٹھیکے تو
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,طالب علم گروپ پہلے سے ہی اپ ڈیٹ کیا جاتا ہے.
 DocType: SMS Center,All Customer Contact,تمام کسٹمر رابطہ
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,CSV کے ذریعے اسٹاک توازن کو اپ لوڈ کریں.
 DocType: Warehouse,Tree Details,درخت کی تفصیلات دیکھیں
@@ -844,8 +847,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,کم از کم انوائس کی رقم
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: لاگت مرکز {2} کمپنی سے تعلق نہیں ہے {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: اکاؤنٹ {2} ایک گروپ نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,آئٹم صف {IDX): (DOCTYPE} {} DOCNAME مندرجہ بالا میں موجود نہیں ہے &#39;{DOCTYPE}&#39; کے ٹیبل
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} پہلے ہی مکمل یا منسوخ کر دیا ہے
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,کوئی کاموں
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",آٹو رسید 05، 28 وغیرہ مثال کے طور پر پیدا کیا جائے گا جس پر مہینے کا دن
 DocType: Asset,Opening Accumulated Depreciation,جمع ہراس کھولنے
@@ -861,7 +864,7 @@
 DocType: Bin,Moving Average Rate,اوسط شرح منتقل
 DocType: Production Planning Tool,Select Items,منتخب شدہ اشیاء
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0} بل کے خلاف {1} ء {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,کورس شیڈول
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,کورس شیڈول
 DocType: Maintenance Visit,Completion Status,تکمیل کی حیثیت
 DocType: HR Settings,Enter retirement age in years,سال میں ریٹائرمنٹ کی عمر درج کریں
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,ہدف گودام
@@ -869,7 +872,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,اس فی صد تک کی ترسیل یا رسید سے زیادہ کرنے کی اجازت دیں
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,درآمد حاضری
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,تمام آئٹم گروپس
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,تمام آئٹم گروپس
 DocType: Process Payroll,Activity Log,سرگرمی لاگ ان
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,خالص منافع / خسارہ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,خود کار طریقے سے لین دین کی جمع کرانے پر پیغام لکھیں.
@@ -880,7 +883,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,ادائیگی آرڈر خریدیں
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,متوقع مقدار
 DocType: Sales Invoice,Payment Due Date,ادائیگی کی وجہ سے تاریخ
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,آئٹم مختلف {0} پہلے ہی صفات کے ساتھ موجود
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',افتتاحی'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,ایسا کرنے کے لئے کھلے
 DocType: Notification Control,Delivery Note Message,ترسیل کے نوٹ پیغام
@@ -896,7 +899,7 @@
 DocType: Item Reorder,Re-Order Qty,دوبارہ آرڈر کی مقدار
 DocType: Leave Block List Date,Leave Block List Date,بلاک فہرست تاریخ چھوڑ دو
 DocType: Pricing Rule,Price or Discount,قیمت یا ڈسکاؤنٹ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,خریداری کی رسید اشیا ٹیبل میں تمام قابل اطلاق چارجز کل ٹیکس اور الزامات طور پر ایک ہی ہونا چاہیے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,خریداری کی رسید اشیا ٹیبل میں تمام قابل اطلاق چارجز کل ٹیکس اور الزامات طور پر ایک ہی ہونا چاہیے
 DocType: Sales Team,Incentives,ترغیبات
 DocType: SMS Log,Requested Numbers,درخواست نمبر
 DocType: Production Planning Tool,Only Obtain Raw Materials,صرف خام مال حاصل
@@ -925,12 +928,12 @@
 DocType: Supplier Quotation,Is Subcontracted,ٹھیکے ہے
 DocType: Item Attribute,Item Attribute Values,آئٹم خاصیت فہرست
 DocType: Examination Result,Examination Result,امتحان کے نتائج
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,خریداری کی رسید
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,خریداری کی رسید
 ,Received Items To Be Billed,موصول ہونے والی اشیاء بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,پیش تنخواہ تخم
 DocType: Employee,Ms,محترمہ
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,کرنسی کی شرح تبادلہ ماسٹر.
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},آپریشن کے لئے اگلے {0} دنوں میں وقت سلاٹ تلاش کرنے سے قاصر {1}
 DocType: Production Order,Plan material for sub-assemblies,ذیلی اسمبلیوں کے لئے منصوبہ مواد
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,سیلز شراکت دار اور علاقہ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,پہلے سے ہی اکاؤنٹ میں اسٹاک بقایاجات ہیں کے طور پر نہیں خود کار طریقے سے اکاؤنٹ بنا سکتے ہیں. آپ کو اس گودام پر ایک اندراج بنا سکتے ہیں اس سے پہلے کہ آپ کو ایک کے ملاپ کے اکاؤنٹ تشکیل دینا لازمی ہے
@@ -953,9 +956,8 @@
 DocType: Supplier,Default Payable Accounts,پہلے سے طے شدہ قابل ادائیگی اکاؤنٹس
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,{0} ملازم فعال نہیں ہے یا موجود نہیں ہے
 DocType: Fee Structure,Components,اجزاء
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,آئٹم متغیرات {0} اپ ڈیٹ
 DocType: Quality Inspection Reading,Reading 6,6 پڑھنا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,نہ {0} {1} {2} بھی منفی بقایا انوائس کے بغیر کر سکتے ہیں
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,انوائس پیشگی خریداری
 DocType: Hub Settings,Sync Now,ہم آہنگی اب
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},صف {0}: کریڈٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
@@ -969,11 +971,11 @@
 DocType: Item,Is Purchase Item,خریداری آئٹم
 DocType: Asset,Purchase Invoice,خریداری کی رسید
 DocType: Stock Ledger Entry,Voucher Detail No,واؤچر تفصیل کوئی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,نئے فروخت انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,نئے فروخت انوائس
 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,تاریخ اور آخری تاریخ کھولنے اسی مالی سال کے اندر اندر ہونا چاہئے
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,تاریخ اور آخری تاریخ کھولنے اسی مالی سال کے اندر اندر ہونا چاہئے
 DocType: Lead,Request for Information,معلومات کے لئے درخواست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,مطابقت پذیری حاضر انوائس
 DocType: Payment Request,Paid,ادائیگی
 DocType: Program Fee,Program Fee,پروگرام کی فیس
 DocType: Salary Slip,Total in words,الفاظ میں کل
@@ -983,7 +985,7 @@
 DocType: Employee Loan,Sanctioned,منظور
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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; کے لئے کاپی کیا جائے گا.
 DocType: Job Opening,Publish on website,ویب سائٹ پر شائع کریں
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,صارفین کو ترسیل.
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,سپلائر انوائس تاریخ پوسٹنگ کی تاریخ سے زیادہ نہیں ہو سکتا
@@ -994,7 +996,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,بادبانی
 ,Company Name,کمپنی کا نام
 DocType: SMS Center,Total Message(s),کل پیغام (ے)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,منتقلی کے لئے منتخب آئٹم
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,چیک جمع کیا گیا تھا جہاں بینک کے اکاؤنٹ منتخب کریں سر.
@@ -1005,8 +1007,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,صف {0}: سیلز / خریداری کے آرڈر کے خلاف ادائیگی ہمیشہ پیشگی کے طور پر نشان لگا دیا جائے چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,کیمیکل
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,پہلے سے طے شدہ بینک / کیش اکاؤنٹ خود کار طریقے تنخواہ جرنل اندراج میں اپ ڈیٹ کیا جائے گا جب اس موڈ کو منتخب کیا گیا.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",گریڈ کوڈ کے وقفے {0} دوسرے گریڈ کے لئے گریڈ وقفے چھو رہی ہے. وقفے براہ مہربانی چیک کریں {0} اور {1} اور دوبارہ کوشش کریں
 DocType: BOM,Raw Material Cost(Company Currency),خام مواد کی لاگت (کمپنی کرنسی)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,تمام اشیاء پہلے ہی اس پروڈکشن آرڈر کے لئے منتقل کر دیا گیا ہے.
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},صف # {0}: شرح میں استعمال کی شرح سے زیادہ نہیں ہو سکتا {1} {2}
@@ -1019,14 +1019,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM ویب آئٹم
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,اپنے خط سر اور علامت (لوگو). (آپ کو بعد ان میں ترمیم کر سکتے ہیں).
 DocType: Timesheet Detail,Bill,بل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,اگلا ہراس کی تاریخ ماضی تاریخ کے طور پر درج کیا جاتا ہے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,وائٹ
 DocType: SMS Center,All Lead (Open),تمام لیڈ (کھولیں) تیار
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),صف {0}: کے لئے مقدار دستیاب نہیں {4} گودام میں {1} اندراج کے وقت پوسٹنگ میں ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,پیشگی ادا کرنے
 DocType: Item,Automatically Create New Batch,خود کار طریقے سے نئی کھیپ بنائیں
 DocType: Item,Automatically Create New Batch,خود کار طریقے سے نئی کھیپ بنائیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,بنائیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,بنائیں
 DocType: Student Admission,Admission Start Date,داخلے شروع کرنے کی تاریخ
 DocType: Journal Entry,Total Amount in Words,الفاظ میں کل رقم
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,میں ایک خامی تھی. ایک ممکنہ وجہ آپ کو فارم محفوظ نہیں ہے کہ ہو سکتا ہے. اگر مسئلہ برقرار رہے support@erpnext.com سے رابطہ کریں.
@@ -1034,7 +1034,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,مقدار کھولنے
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,تبدیلی کی رقم کے اکاؤنٹ درج کریں
 DocType: Student Batch Name,Student Batch Name,Student کی بیچ کا نام
 DocType: Holiday List,Holiday List Name,چھٹیوں فہرست کا نام
 DocType: Repayment Schedule,Balance Loan Amount,بیلنس قرض کی رقم
@@ -1054,10 +1054,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},وضاحت کریں ایک {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,مقدار یا قدر میں کوئی تبدیلی نہیں کے ساتھ ختم اشیاء.
 DocType: Delivery Note,Delivery To,کی ترسیل کے
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,وصف میز لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,وصف میز لازمی ہے
 DocType: Production Planning Tool,Get Sales Orders,سیلز احکامات حاصل
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} منفی نہیں ہو سکتا
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,ڈسکاؤنٹ
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,ڈسکاؤنٹ
 DocType: Asset,Total Number of Depreciations,Depreciations کی کل تعداد
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
 DocType: Sales Invoice Item,Rate With Margin,مارجن کے ساتھ کی شرح
@@ -1073,7 +1073,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,سیلز آرڈر / ختم سامان گودام میں محفوظ گودام
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,فروخت رقم
 DocType: Repayment Schedule,Interest Amount,سود کی رقم
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,آپ کو اس ریکارڈ کے لئے اخراجات کی منظوری دینے والا ہو. &#39;حیثیت&#39; اور محفوظ کو اپ ڈیٹ کریں
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,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,مسئلہ
 DocType: Asset,Scrapped,ختم کر دیا
@@ -1081,12 +1081,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",آئٹم متغیرات لئے اوصاف. مثال کے طور پر سائز، رنگ وغیرہ
 DocType: Purchase Invoice,Returns,واپسی
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP گودام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},سیریل نمبر {0} تک بحالی کے معاہدہ کے تحت ہے {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,نوکری کے لئے
 DocType: Lead,Organization Name,تنظیم کا نام
 DocType: Tax Rule,Shipping State,شپنگ ریاست
 ,Projected Quantity as Source,ماخذ کے طور پر پیش مقدار
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,آئٹم بٹن &#39;خریداری رسیدیں سے اشیاء حاصل کا استعمال کرتے ہوئے شامل کیا جانا چاہیے
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,غیر اسٹاک اشیاء شامل ہیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,فروخت کے اخراجات
@@ -1094,12 +1094,12 @@
 DocType: GL Entry,Against,کے خلاف
 DocType: Item,Default Selling Cost Center,پہلے سے طے شدہ فروخت لاگت مرکز
 DocType: Sales Partner,Implementation Partner,نفاذ ساتھی
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,زپ کوڈ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,زپ کوڈ
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},سیلز آرڈر {0} ہے {1}
 DocType: Opportunity,Contact Info,رابطے کی معلومات
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,اسٹاک اندراجات کر رہے ہیں
 DocType: Packing Slip,Net Weight UOM,نیٹ وزن UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} نتائج
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} نتائج
 DocType: Item,Default Supplier,پہلے سے طے شدہ پردایک
 DocType: Manufacturing Settings,Over Production Allowance Percentage,پیداوار الاؤنس فی صد سے زائد
 DocType: Employee Loan,Repayment Schedule,واپسی کے شیڈول
@@ -1107,7 +1107,7 @@
 DocType: Holiday List,Get Weekly Off Dates,ویکلی آف تاریخوں کو حاصل
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,ختم ہونے کی تاریخ شروع کرنے کی تاریخ کے مقابلے میں کم نہیں ہو سکتا
 DocType: Sales Person,Select company name first.,پہلے منتخب کمپنی کا نام.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,ڈاکٹر
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,ڈاکٹر
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,کوٹیشن سپلائر کی طرف سے موصول.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},کرنے کے لئے {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,اوسط عمر
@@ -1127,7 +1127,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,کلیدی کارکردگی کے علاقے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,نقل و حمل
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,غلط خاصیت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} پیش کرنا ضروری ہے
 DocType: SMS Center,Total Characters,کل کردار
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},آئٹم کے لئے BOM میدان میں BOM منتخب کریں {0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,سی فارم انوائس تفصیل
@@ -1137,7 +1137,7 @@
 DocType: Sales Partner,Distributor,ڈسٹریبیوٹر
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,خریداری کی ٹوکری شپنگ حکمرانی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,پروڈکشن آرڈر {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',سیٹ &#39;پر اضافی رعایت کا اطلاق کریں براہ مہربانی
 ,Ordered Items To Be Billed,کو حکم دیا اشیاء بل بھیجا جائے کرنے کے لئے
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,رینج کم ہونا ضروری ہے کے مقابلے میں رینج کے لئے
 DocType: Global Defaults,Global Defaults,گلوبل ڈیفالٹس
@@ -1147,7 +1147,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,شروع سال
 DocType: Purchase Invoice,Start date of current invoice's period,موجودہ انوائس کی مدت کے شروع کرنے کی تاریخ
 DocType: Salary Slip,Leave Without Pay,بغیر تنخواہ چھٹی
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,صلاحیت کی منصوبہ بندی کرنے میں خامی
 ,Trial Balance for Party,پارٹی کے لئے مقدمے کی سماعت توازن
 DocType: Lead,Consultant,کنسلٹنٹ
 DocType: Salary Slip,Earnings,آمدنی
@@ -1162,7 +1162,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",یہ مختلف کی آئٹم کوڈ منسلک کیا جائے گا. آپ مخفف &quot;ایس ایم&quot; ہے، اور اگر مثال کے طور پر، شے کے کوڈ &quot;ٹی شرٹ&quot;، &quot;ٹی شرٹ-ایس ایم&quot; ہو جائے گا ویرینٹ کی شے کوڈ آن ہے
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,آپ کو تنخواہ پرچی بچانے بار (الفاظ میں) نیٹ پے نظر آئے گا.
 DocType: Purchase Invoice,Is Return,واپسی ہے
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,واپس / ڈیبٹ نوٹ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,واپس / ڈیبٹ نوٹ
 DocType: Price List Country,Price List Country,قیمت کی فہرست ملک
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} شے کے لئے درست سیریل نمبر {1}
@@ -1172,11 +1172,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,بیچ نمبر حاصل کرنے آئٹم کوڈ داخل کریں
 DocType: Stock Settings,Default Item Group,پہلے سے طے شدہ آئٹم گروپ
 DocType: Employee Loan,Partially Disbursed,جزوی طور پر زرعی قرضوں کی فراہمی
-DocType: Grading Structure,Grading System Name,گریڈنگ سسٹم کا نام
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,پردایک ڈیٹا بیس.
 DocType: Account,Balance Sheet,بیلنس شیٹ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',&#39;آئٹم کوڈ شے کے لئے مرکز لاگت
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",ادائیگی موڈ تشکیل نہیں ہے. چاہے اکاؤنٹ ادائیگیاں کے موڈ پر یا POS پروفائل پر قائم کیا گیا ہے، براہ مہربانی چیک کریں.
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,آپ کی فروخت کے شخص گاہک سے رابطہ کرنے اس تاریخ پر ایک یاد دہانی حاصل کریں گے
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,ایک ہی شے کے کئی بار داخل نہیں کیا جا سکتا.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",مزید اکاؤنٹس گروپوں کے تحت بنایا جا سکتا ہے، لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
@@ -1188,7 +1187,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,اسٹاک لیجر لکھے اور GL لکھے منتخب خریداری رسیدیں کے لئے دوبارہ شائع کر رہے ہیں
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,اسٹاک لیجر لکھے اور GL لکھے منتخب خریداری رسیدیں کے لئے دوبارہ شائع کر رہے ہیں
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,آئٹم کے 1
 DocType: Holiday,Holiday,چھٹیوں
 DocType: Support Settings,Close Issue After Days,دن کے بعد مسئلہ بند کریں
@@ -1214,11 +1213,11 @@
 DocType: Maintenance Visit Purpose,Work Done,کام ہو گیا
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,صفات ٹیبل میں کم از کم ایک وصف کی وضاحت کریں
 DocType: Announcement,All Students,تمام طلباء
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,{0} آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,{0} آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,لنک لیجر
 DocType: Grading Scale,Intervals,وقفے
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,قدیم ترین
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",ایک آئٹم گروپ ایک ہی نام کے ساتھ موجود ہے، شے کے نام کو تبدیل کرنے یا شے کے گروپ کو دوسرا نام کریں
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,طالب علم کے موبائل نمبر
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,باقی دنیا کے
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,آئٹم {0} بیچ نہیں کر سکتے ہیں
@@ -1256,9 +1255,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},{0} سے تنخواہ کی ادائیگی {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},منجمد اکاؤنٹ میں ترمیم کرنے کی اجازت نہیں {0}
 DocType: Journal Entry,Get Outstanding Invoices,بقایا انوائس حاصل
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,سیلز آرڈر {0} درست نہیں ہے
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,خریداری کے احکامات کو آپ کی منصوبہ بندی کی مدد کرنے اور آپ کی خریداری پر عمل
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",معذرت، کمپنیوں ضم نہیں کیا جا سکتا
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",کل مسئلہ / ٹرانسفر کی مقدار {0} مواد کی درخواست میں {1} \ {2} کی درخواست کی مقدار آئٹم کے لئے سے زیادہ نہیں ہو سکتا {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,چھوٹے
@@ -1279,10 +1278,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,بالواسطہ اخراجات
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,صف {0}: مقدار لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,زراعت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,مطابقت پذیری ماسٹر ڈیٹا
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,اپنی مصنوعات یا خدمات
 DocType: Mode of Payment,Mode of Payment,ادائیگی کا طریقہ
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,ویب سائٹ تصویری ایک عوامی فائل یا ویب سائٹ یو آر ایل ہونا چاہئے
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,یہ ایک جڑ شے گروپ ہے اور میں ترمیم نہیں کیا جا سکتا.
@@ -1300,18 +1299,18 @@
 DocType: Student Group Student,Group Roll Number,گروپ رول نمبر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}، صرف کریڈٹ اکاؤنٹس ایک ڈیبٹ داخلے کے خلاف منسلک کیا جا سکتا ہے
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,تمام کام وزن کی کل ہونا چاہئے 1. اس کے مطابق تمام منصوبے کے کاموں کے وزن کو ایڈجسٹ کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,ترسیل کے نوٹ {0} پیش نہیں ہے
 apps/erpnext/erpnext/stock/get_item_details.py +141,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;.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",قیمتوں کا تعین اصول سب سے پہلے کی بنیاد پر منتخب کیا جاتا ہے آئٹم آئٹم گروپ یا برانڈ ہو سکتا ہے، میدان &#39;پر لگائیں&#39;.
 DocType: Hub Settings,Seller Website,فروش ویب سائٹ
 DocType: Item,ITEM-,ITEM-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,فروخت کی ٹیم کے لئے مختص کل فی صد 100 ہونا چاہئے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},پروڈکشن آرڈر حیثیت ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},پروڈکشن آرڈر حیثیت ہے {0}
 DocType: Appraisal Goal,Goal,گول
 DocType: Sales Invoice Item,Edit Description,ترمیم تفصیل
 ,Team Updates,ٹیم کی تازہ ترین معلومات
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,سپلائر کے لئے
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,سپلائر کے لئے
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,اکاؤنٹ کی قسم مقرر لین دین میں اس اکاؤنٹ کو منتخب کرنے میں مدد ملتی ہے.
 DocType: Purchase Invoice,Grand Total (Company Currency),گرینڈ کل (کمپنی کرنسی)
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,پرنٹ کی شکل بنائیں
@@ -1326,7 +1325,7 @@
 DocType: Depreciation Schedule,Journal Entry,جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} رفت میں اشیاء
 DocType: Workstation,Workstation Name,کارگاہ نام
-DocType: Grade Interval,Grade Code,گریڈ کوڈ
+DocType: Grading Scale Interval,Grade Code,گریڈ کوڈ
 DocType: POS Item Group,POS Item Group,POS آئٹم گروپ
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,ڈائجسٹ ای میل کریں:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} آئٹم سے تعلق نہیں ہے {1}
@@ -1342,7 +1341,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,ہارڈ ویئر
 DocType: Sales Order,Recurring Upto,مکرر تک
 DocType: Attendance,HR Manager,HR مینیجر
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,ایک کمپنی کا انتخاب کریں
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,ایک کمپنی کا انتخاب کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,استحقاق رخصت
 DocType: Purchase Invoice,Supplier Invoice Date,سپلائر انوائس تاریخ
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,آپ کی خریداری کی ٹوکری کو چالو کرنے کی ضرورت ہے
@@ -1358,7 +1357,7 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,خوراک
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,خستہ رینج 3
 DocType: Maintenance Schedule Item,No of Visits,دوروں کی کوئی
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,مارک Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,مارک Attendence
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,اندراج کے طالب علم
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},بند اکاؤنٹ کی کرنسی ہونا ضروری ہے {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},تمام مقاصد کے لئے پوائنٹس کی رقم یہ ہے 100. ہونا چاہئے {0}
@@ -1382,7 +1381,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,اوسط یومیہ سبکدوش ہونے والے
 DocType: POS Profile,Campaign,مہم
 DocType: Supplier,Name and Type,نام اور قسم
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',منظوری کی حیثیت &#39;منظور&#39; یا &#39;مسترد&#39; ہونا ضروری ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',منظوری کی حیثیت &#39;منظور&#39; یا &#39;مسترد&#39; ہونا ضروری ہے
 DocType: Purchase Invoice,Contact Person,رابطے کا بندہ
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',کی متوقع شروع کرنے کی تاریخ &#39;سے زیادہ&#39; متوقع تاریخ اختتام &#39;نہیں ہو سکتا
 DocType: Course Scheduling Tool,Course End Date,کورس کی آخری تاریخ
@@ -1405,14 +1404,15 @@
 DocType: Sales Invoice,Shipping Address Name,شپنگ ایڈریس کا نام
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,اکاؤنٹس کا چارٹ
 DocType: Material Request,Terms and Conditions Content,شرائط و ضوابط مواد
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,زیادہ سے زیادہ 100 سے زائد نہیں ہو سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,{0} آئٹم اسٹاک شے نہیں ہے
 DocType: Maintenance Visit,Unscheduled,شیڈول کا اعلان
 DocType: Employee,Owned,ملکیت
 DocType: Salary Detail,Depends on Leave Without Pay,بغیر تنخواہ چھٹی پر منحصر ہے
 DocType: Pricing Rule,"Higher the number, higher the priority",زیادہ تعداد، اعلی ترجیح
 ,Purchase Invoice Trends,انوائس رجحانات خریدیں
 DocType: Employee,Better Prospects,بہتر امکانات
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",صف # {0}: بیچ {1} صرف {2} قی ہے. ایک اور بیچ دستیاب ہے جس {3} قی منتخب کریں یا / مسئلہ ایک سے زیادہ بیچوں سے فراہم کرنے کے لئے، ایک سے زیادہ قطاروں میں صف تقسیم مہربانی
 DocType: Vehicle,License Plate,لائسنس پلیٹ
 DocType: Appraisal,Goals,اہداف
 DocType: Warranty Claim,Warranty / AMC Status,وارنٹی / AMC رتبہ
@@ -1430,7 +1430,7 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,ملازم خود کو رپورٹ نہیں دے سکتے.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",اکاؤنٹ منجمد ہے، اندراجات محدود صارفین کو اجازت دی جاتی ہے.
 DocType: Email Digest,Bank Balance,بینک کی بیلنس
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},{1} صرف کرنسی میں بنایا جا سکتا ہے: {0} کے لئے اکاؤنٹنگ انٹری {2}
 DocType: Job Opening,"Job profile, qualifications required etc.",ایوب پروفائل، قابلیت کی ضرورت وغیرہ
 DocType: Journal Entry Account,Account Balance,اکاؤنٹ بیلنس
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,لین دین کے لئے ٹیکس اصول.
@@ -1440,7 +1440,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,نا بند کردہ مالی سال کی P &amp; L بیلنس دکھائیں
 DocType: Shipping Rule,Shipping Account,شپنگ اکاؤنٹ
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: اکاؤنٹ {2} غیر فعال ہے
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,آپ کو آپ کے کام کی منصوبہ بندی اور مدد کرنے کے لئے سیلز آرڈر پر وقت بچا بنائیں
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,آپ کو آپ کے کام کی منصوبہ بندی اور مدد کرنے کے لئے سیلز آرڈر پر وقت بچا بنائیں
 DocType: Quality Inspection,Readings,ریڈنگ
 DocType: Stock Entry,Total Additional Costs,کل اضافی اخراجات
 DocType: Course Schedule,SH,ایسیچ
@@ -1451,7 +1451,7 @@
 DocType: Shipping Rule Condition,To Value,قدر میں
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,پیکنگ پرچی
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,پیکنگ پرچی
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,دفتر کرایہ پر دستیاب
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,سیٹ اپ SMS گیٹ وے کی ترتیبات
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,درآمد میں ناکام!
@@ -1472,11 +1472,11 @@
 DocType: Company,Services,خدمات
 DocType: HR Settings,Email Salary Slip to Employee,ملازم کو ای میل تنخواہ کی پرچی
 DocType: Cost Center,Parent Cost Center,والدین لاگت مرکز
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,ممکنہ سپلائر کریں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,ممکنہ سپلائر کریں
 DocType: Sales Invoice,Source,ماخذ
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,بند کر کے دکھائیں
 DocType: Leave Type,Is Leave Without Pay,تنخواہ کے بغیر چھوڑ
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,ایسیٹ قسم فکسڈ اثاثہ شے کے لئے لازمی ہے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,ادائیگی ٹیبل میں پایا کوئی ریکارڈ
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},اس {0} کے ساتھ تنازعات {1} کو {2} {3}
 DocType: Student Attendance Tool,Students HTML,طلباء HTML
@@ -1494,7 +1494,7 @@
 DocType: Student,Date of Leaving,چھوڑنا کی تاریخ
 DocType: Pricing Rule,For Price List,قیمت کی فہرست کے لئے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,ایگزیکٹو تلاش کریں
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,لیڈز بنائیں
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,لیڈز بنائیں
 DocType: Maintenance Schedule,Schedules,شیڈول
 DocType: Purchase Invoice Item,Net Amount,اصل رقم
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM تفصیل کوئی
@@ -1522,9 +1522,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,پروگرام کا اندراج
 DocType: Sales Invoice Item,Brand Name,برانڈ کا نام
 DocType: Purchase Receipt,Transporter Details,ٹرانسپورٹر تفصیلات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,پہلے سے طے شدہ گودام منتخب شے کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,باکس
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,ممکنہ سپلائر
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,ممکنہ سپلائر
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,تنظیم
 DocType: Budget,Monthly Distribution,ماہانہ تقسیم
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,وصول فہرست خالی ہے. وصول فہرست تشکیل دے براہ مہربانی
@@ -1532,8 +1532,8 @@
 DocType: Sales Partner,Sales Partner Target,سیلز پارٹنر ہدف
 DocType: Loan Type,Maximum Loan Amount,زیادہ سے زیادہ قرض کی رقم
 DocType: Pricing Rule,Pricing Rule,قیمتوں کا تعین اصول
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},طالب علم کے لئے ڈوپلیکیٹ رول نمبر {0}
 DocType: Budget,Action if Annual Budget Exceeded,ایکشن سالانہ بجٹ سے تجاوز تو
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,آرڈر خریداری کے لئے مواد کی درخواست
 DocType: Shopping Cart Settings,Payment Success URL,ادائیگی کی کامیابی کے یو آر ایل
@@ -1554,9 +1554,9 @@
 DocType: Employee Loan,Repayment Method,باز ادائیگی کا طریقہ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",جانچ پڑتال کی تو، گھر کے صفحے ویب سائٹ کے لئے پہلے سے طے شدہ آئٹم گروپ ہو جائے گا
 DocType: Quality Inspection Reading,Reading 4,4 پڑھنا
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},{0} پروجیکٹ کے لئے نہیں پایا کیلئے ڈیفالٹ BOM {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},{0} پروجیکٹ کے لئے نہیں پایا کیلئے ڈیفالٹ BOM {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,کمپنی اخراجات کے دعوے.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",طلباء کے نظام کے دل میں ہیں، آپ کے تمام طالب علموں کو شامل
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",طلباء کے نظام کے دل میں ہیں، آپ کے تمام طالب علموں کو شامل
 DocType: Company,Default Holiday List,چھٹیوں فہرست پہلے سے طے شدہ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},صف {0}: وقت اور کرنے کے وقت سے {1} ساتھ اتیویاپی ہے {2}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,اسٹاک واجبات
@@ -1567,21 +1567,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,آپ کی چھٹی کے لئے درخواست دے رہے ہیں جس دن (ے) تعطیلات ہیں. آپ کو چھوڑ کے لئے درخواست دینے کی ضرورت نہیں ہے.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,ادائیگی ای میل بھیج
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,نیا کام
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,کوٹیشن بنائیں
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,کوٹیشن بنائیں
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,دیگر رپورٹوں
 DocType: Dependent Task,Dependent Task,منحصر ٹاسک
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},پیمائش کی یونٹ کے لئے پہلے سے طے شدہ تبادلوں عنصر قطار میں ہونا چاہیے 1 {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},قسم کے حکم {0} سے زیادہ نہیں ہو سکتا {1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,پیشگی ایکس دنوں کے لئے کی منصوبہ بندی کرنے کی کوشش کریں.
 DocType: HR Settings,Stop Birthday Reminders,سٹاپ سالگرہ تخسمارک
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},کمپنی میں پہلے سے طے شدہ پے رول قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 DocType: SMS Center,Receiver List,وصول کی فہرست
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,تلاش آئٹم
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,تلاش آئٹم
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,بسم رقم
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,کیش میں خالص تبدیلی
 DocType: Assessment Plan,Grading Scale,گریڈنگ پیمانے
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,پہلے ہی مکمل
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,پیمائش {0} کے یونٹ تبادلوں فیکٹر ٹیبل میں ایک سے زائد بار میں داخل کر دیا گیا ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,پہلے ہی مکمل
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},ادائیگی کی درخواست پہلے سے موجود ہے {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,تاریخ اجراء اشیا کی لاگت
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},مقدار سے زیادہ نہیں ہونا چاہئے {0}
@@ -1613,12 +1613,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,فراہمی انٹری بنائیں
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,صف {0}: سپلائر کے خلاف ایڈوانس ڈیبٹ ہونا ضروری ہے
 DocType: Company,Default Values,طے شدہ اقدار
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{تعدد} ڈائجسٹ
 DocType: Expense Claim,Total Amount Reimbursed,کل رقم آفسیٹ
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,یہ اس گاڑی کے خلاف نوشتہ پر مبنی ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,جمع کریں
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},پردایک خلاف انوائس {0} ء {1}
 DocType: Customer,Default Price List,پہلے سے طے شدہ قیمت کی فہرست
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,اثاثہ تحریک ریکارڈ {0} پیدا
 DocType: Journal Entry,Entry Type,اندراج کی قسم
 ,Customer Credit Balance,کسٹمر کے کریڈٹ بیلنس
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,قابل ادائیگی اکاؤنٹس میں خالص تبدیلی
@@ -1636,7 +1637,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,حصولی کے
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,اشیاء میں سے کوئی بھی مقدار یا قدر میں کوئی تبدیلی ہے.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,لازمی فیلڈ - پروگرام
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,وارنٹی دعوی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,وارنٹی دعوی
 ,Lead Details,لیڈ تفصیلات
 DocType: Salary Slip,Loan repayment,قرض کی واپسی
 DocType: Purchase Invoice,End date of current invoice's period,موجودہ انوائس کی مدت کے ختم ہونے کی تاریخ
@@ -1654,12 +1655,10 @@
 DocType: Employee,Permanent Address,مستقل پتہ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",گرینڈ کل کے مقابلے میں \ {0} {1} زیادہ نہیں ہو سکتا کے خلاف ادا پیشگی {2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,شے کے کوڈ کا انتخاب کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,شے کے کوڈ کا انتخاب کریں
 DocType: Student Sibling,Studying in Same Institute,اسی انسٹیٹیوٹ میں زیر تعلیم
 DocType: Territory,Territory Manager,علاقہ مینیجر
 DocType: Packed Item,To Warehouse (Optional),گودام میں (اختیاری)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Payment Entry,Paid Amount (Company Currency),ادائیگی کی رقم (کمپنی کرنسی)
 DocType: Purchase Invoice,Additional Discount,اضافی رعایت
 DocType: Selling Settings,Selling Settings,ترتیبات فروخت
@@ -1669,9 +1668,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,ٹوکری میں دیکھیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,مارکیٹنگ کے اخراجات
 ,Item Shortage Report,آئٹم کمی رپورٹ
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",وزن \ n براہ مہربانی بھی &quot;وزن UOM&quot; کا ذکر، ذکر کیا جاتا ہے
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,مواد کی درخواست یہ اسٹاک اندراج کرنے کے لئے استعمال کیا جاتا ہے
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,اگلا ہراس تاریخ نیا اثاثہ کے لئے لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,اگلا ہراس تاریخ نیا اثاثہ کے لئے لازمی ہے
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ہر بیچ کے لئے الگ الگ کورس مبنی گروپ
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,ہر بیچ کے لئے الگ الگ کورس مبنی گروپ
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,ایک آئٹم کی سنگل یونٹ.
@@ -1687,9 +1686,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext سیٹ اپ مکمل!
 DocType: Course Assessment Criteria,Weightage,اہمیت
 DocType: Packing Slip,PS-,PS-
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,ایک گاہک گروپ ایک ہی نام کے ساتھ موجود ہے کسٹمر کا نام تبدیل کرنے یا گاہک گروپ کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 پڑھنا
@@ -1706,7 +1703,7 @@
 ,Item-wise Sales Register,آئٹم وار سیلز رجسٹر
 DocType: Asset,Gross Purchase Amount,مجموعی خریداری کی رقم
 DocType: Asset,Depreciation Method,ہراس کا طریقہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,آف لائن
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,آف لائن
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,بنیادی شرح میں شامل اس ٹیکس ہے؟
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,کل ہدف
 DocType: Program Course,Required,مطلوب
@@ -1720,16 +1717,16 @@
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 DocType: Student Group Instructor,Student Group Instructor,طالب علم گروپ انسٹرکٹر
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 موبائل نمبر
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,مین
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,ویرینٹ
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,مین
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,ویرینٹ
 DocType: Naming Series,Set prefix for numbering series on your transactions,آپ کے لین دین پر سیریز تعداد کے لئے مقرر اپسرگ
 DocType: Employee Attendance Tool,Employees HTML,ملازمین ایچ ٹی ایم ایل
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,پہلے سے طے شدہ BOM ({0}) یہ آئٹم یا اس سانچے کے لئے فعال ہونا ضروری ہے
 DocType: Employee,Leave Encashed?,Encashed چھوڑ دیں؟
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,میدان سے مواقع لازمی ہے
 DocType: Email Digest,Annual Expenses,سالانہ اخراجات
 DocType: Item,Variants,متغیرات
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,خریداری کے آرڈر بنائیں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,خریداری کے آرڈر بنائیں
 DocType: SMS Center,Send To,کے لئے بھیج
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},رخصت قسم کافی چھوڑ توازن نہیں ہے {0}
 DocType: Payment Reconciliation Payment,Allocated amount,مختص رقم
@@ -1737,17 +1734,16 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,کام میں پیش رفت گودام جمع کرانے سے پہلے کی ضرورت ہے
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,ایک کام کے لئے درخواست.
 DocType: Purchase Order Item,Warehouse and Reference,گودام اور حوالہ
 DocType: Supplier,Statutory info and other general information about your Supplier,اپنے سپلائر کے بارے میں قانونی معلومات اور دیگر عمومی معلومات
 DocType: Item,Serial Nos and Batches,سیریل نمبر اور بیچوں
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,طالب علم گروپ طاقت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,جرنل کے خلاف اندراج {0} کسی بھی بے مثال {1} اندراج نہیں ہے
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,تشخیص
 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: Grading Structure,Grading Intervals,گریڈنگ وقفے
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,درج کریں
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",قطار میں آئٹم {0} کے لئے overbill نہیں کر سکتے ہیں {1} سے زیادہ {2}. زیادہ بلنگ کی اجازت دینے کے لئے، ترتیبات خریدنے میں قائم کریں
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,شے یا گودام کی بنیاد پر فلٹر مقرر کریں
@@ -1758,8 +1754,8 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} پیش کرنا ضروری ہے
 DocType: Authorization Control,Authorization Control,اجازت کنٹرول
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},صف # {0}: گودام مسترد مسترد آئٹم خلاف لازمی ہے {1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,ادائیگی
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,آپ کے احکامات کو منظم کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,ادائیگی
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,آپ کے احکامات کو منظم کریں
 DocType: Production Order Operation,Actual Time and Cost,اصل وقت اور لاگت
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},زیادہ سے زیادہ {0} کے مواد کی درخواست {1} سیلز آرڈر کے خلاف شے کے لئے بنایا جا سکتا ہے {2}
 DocType: Employee,Salutation,آداب
@@ -1767,6 +1763,7 @@
 DocType: Student Leave Application,Student Leave Application,Student کی رخصت کی درخواست
 DocType: Item,Will also apply for variants,بھی مختلف حالتوں کے لئے لاگو ہوں گے
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},ملازم {0} پر نصف دن پر {1}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,پر
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,فروخت کے وقت بنڈل اشیاء.
 DocType: Quotation Item,Actual Qty,اصل مقدار
 DocType: Sales Invoice Item,References,حوالہ جات
@@ -1776,7 +1773,7 @@
 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 +91,Associate,ایسوسی ایٹ
 DocType: Asset Movement,Asset Movement,ایسیٹ موومنٹ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,نیا ٹوکری
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,نیا ٹوکری
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,{0} آئٹم وجہ سے serialized شے نہیں ہے
 DocType: SMS Center,Create Receiver List,وصول فہرست بنائیں
 DocType: Vehicle,Wheels,پہیے
@@ -1808,9 +1805,9 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,پیداوار کے احکامات کے خلاف وقت نوشتہ کی تخلیق غیر فعال. آپریشنز پروڈکشن آرڈر کے خلاف ٹریک نہیں کیا جائے گا
 DocType: Student,Student Mobile Number,طالب علم کے موبائل نمبر
 DocType: Item,Has Variants,مختلف حالتوں ہے
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},آپ نے پہلے ہی سے اشیاء کو منتخب کیا ہے {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,ماہانہ تقسیم کے نام
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,بیچ ID لازمی ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,بیچ ID لازمی ہے
 DocType: Sales Person,Parent Sales Person,والدین فروخت شخص
 DocType: Purchase Invoice,Recurring Invoice,مکرر انوائس
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,منصوبوں کو منظم کرنے
@@ -1818,11 +1815,11 @@
 DocType: Budget,Fiscal Year,مالی سال
 DocType: Vehicle Log,Fuel Price,ایندھن کی قیمت
 DocType: Budget,Budget,بجٹ
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,فکسڈ اثاثہ آئٹم ایک غیر اسٹاک شے ہونا ضروری ہے.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",یہ ایک آمدنی یا اخراجات کے اکاؤنٹ نہیں ہے کے طور پر بجٹ کے خلاف {0} تفویض نہیں کیا جا سکتا
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,حاصل کیا
 DocType: Student Admission,Application Form Route,درخواست فارم روٹ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,علاقہ / کسٹمر
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,علاقہ / کسٹمر
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,مثال کے طور پر 5
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},صف {0}: مختص رقم {1} سے کم ہونا یا بقایا رقم انوائس کے برابر کرنا چاہئے {2}
 DocType: Sales Invoice,In Words will be visible once you save the Sales Invoice.,آپ کی فروخت انوائس کو بچانے بار الفاظ میں نظر آئے گا.
@@ -1840,13 +1837,13 @@
 ,Serial No Status,سیریل کوئی حیثیت
 DocType: Payment Entry Reference,Outstanding,شاندار
 ,Daily Timesheet Summary,ڈیلی Timesheet خلاصہ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}",صف {0}: قائم کرنے {1} مدت، اور تاریخ \ کے درمیان فرق کرنے کے لئے یا اس سے زیادہ کے برابر ہونا چاہیے {2}
 DocType: Pricing Rule,Selling,فروخت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},رقم {0} {1} خلاف کٹوتی {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},رقم {0} {1} خلاف کٹوتی {2}
 DocType: Employee,Salary Information,تنخواہ معلومات
 DocType: Sales Person,Name and Employee ID,نام اور ملازم ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,کی وجہ سے تاریخ تاریخ پوسٹنگ سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,ڈیوٹی اور ٹیکس
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,حوالہ کوڈ داخل کریں.
@@ -1858,14 +1855,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,اس چارج کی قسم کے لئے موجودہ صفیں سے زیادہ یا برابر صفیں رجوع نہیں کر سکتے ہیں
 DocType: Asset,Sold,فروخت
 ,Item-wise Purchase History,آئٹم وار خریداری کی تاریخ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},سیریل کوئی آئٹم کے لئے شامل کی بازیافت کرنے کے لئے &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی {0}
 DocType: Account,Frozen,منجمد
 ,Open Production Orders,کھولیں پیداوار کے احکامات
 DocType: Sales Invoice Payment,Base Amount (Company Currency),بنیادی مقدار (کمپنی کرنسی)
 DocType: Payment Reconciliation Payment,Reference Row,حوالہ صف
 DocType: Installation Note,Installation Time,کی تنصیب کا وقت
 DocType: Sales Invoice,Accounting Details,اکاؤنٹنگ تفصیلات
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,اس کمپنی کے لئے تمام معاملات حذف
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,سرمایہ کاری
 DocType: Issue,Resolution Details,قرارداد کی تفصیلات
@@ -1898,13 +1895,13 @@
 DocType: Discussion,Discussion,بحث
 DocType: Payment Entry,Transaction ID,ٹرانزیکشن کی شناخت
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,قیمتوں کا تعین کے قواعد مزید مقدار کی بنیاد پر فلٹر کر رہے ہیں.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},ملازم کے لئے شامل ہونے کے تاریخ مقرر مہربانی {0}
 DocType: Task,Total Billing Amount (via Time Sheet),کل بلنگ کی رقم (وقت شیٹ کے ذریعے)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,گاہک ریونیو
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1})کردارکے لیے 'اخراجات کی منظوری دینے والا' کردار ضروری ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1})کردارکے لیے 'اخراجات کی منظوری دینے والا' کردار ضروری ہے
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,جوڑی
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,پیداوار کے لئے BOM اور قی کریں
 DocType: Asset,Depreciation Schedule,ہراس کا شیڈول
 DocType: Bank Reconciliation Detail,Against Account,کے اکاؤنٹ کے خلاف
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,آدھا دن تاریخ تاریخ سے اور تاریخ کے درمیان ہونا چاہئے
@@ -1917,15 +1914,16 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},کمپنی میں &#39;اثاثہ ہراس لاگت سینٹر&#39; مقرر مہربانی {0}
 ,Maintenance Schedules,بحالی شیڈول
 DocType: Task,Actual End Date (via Time Sheet),اصل تاریخ اختتام (وقت شیٹ کے ذریعے)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},رقم {0} {1} خلاف {2} {3}
 ,Quotation Trends,کوٹیشن رجحانات
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},آئٹم گروپ شے کے لئے شے ماسٹر میں ذکر نہیں {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,اکاؤنٹ ڈیبٹ ایک وصولی اکاؤنٹ ہونا ضروری ہے
 DocType: Shipping Rule Condition,Shipping Amount,شپنگ رقم
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,زیر التواء رقم
 DocType: Purchase Invoice Item,Conversion Factor,تبادلوں فیکٹر
 DocType: Purchase Order,Delivered,ہونے والا
 ,Vehicle Expenses,گاڑیوں کے اخراجات
+DocType: Serial No,Invoice Details,انوائس کی تفصیلات دیکھیں
 DocType: Purchase Receipt,Vehicle Number,گاڑی نمبر
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,بار بار چلنے والی انوائس بند کیا جائے گا جس کی تاریخ
 DocType: Employee Loan,Loan Amount,قرضے کی رقم
@@ -1944,12 +1942,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets کو
 DocType: HR Settings,HR Settings,HR ترتیبات
 DocType: Salary Slip,net pay info,نیٹ تنخواہ کی معلومات
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجات دعوی منظوری زیر التواء ہے. صرف اخراجات کی منظوری دینے والا حیثیت کو اپ ڈیٹ کر سکتے ہیں.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,اخراجات دعوی منظوری زیر التواء ہے. صرف اخراجات کی منظوری دینے والا حیثیت کو اپ ڈیٹ کر سکتے ہیں.
 DocType: Email Digest,New Expenses,نیا اخراجات
 DocType: Purchase Invoice,Additional Discount Amount,اضافی ڈسکاؤنٹ رقم
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",صف # {0}: قی، 1 ہونا ضروری شے ایک مقررہ اثاثہ ہے کے طور پر. ایک سے زیادہ مقدار کے لئے علیحدہ صف استعمال کریں.
 DocType: Leave Block List Allow,Leave Block List Allow,بلاک فہرست اجازت دیں چھوڑ دو
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Abbr خالی یا جگہ نہیں ہو سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,غیر گروپ سے گروپ
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,کھیل
 DocType: Loan Type,Loan Name,قرض نام
@@ -1977,19 +1975,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},اکاؤنٹ {0} باطل ہے. اکاؤنٹ کی کرنسی ہونا ضروری ہے {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},UOM تبادلوں عنصر قطار میں کی ضرورت ہے {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم سیلز آرڈر میں سے ایک، فروخت انوائس یا جرنل اندراج ہونا ضروری ہے
 DocType: Salary Component,Deduction,کٹوتی
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,صف {0}: وقت سے اور وقت کے لئے لازمی ہے.
 DocType: Stock Reconciliation Item,Amount Difference,رقم فرق
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},شے کی قیمت کے لئے شامل {0} قیمت کی فہرست میں {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,اس کی فروخت کے شخص کے ملازم کی شناخت درج کریں
 DocType: Territory,Classification of Customers by region,خطے کی طرف سے صارفین کی درجہ بندی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,فرق رقم صفر ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,فرق رقم صفر ہونا ضروری ہے
 DocType: Project,Gross Margin,مجموعی مارجن
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,پہلی پیداوار آئٹم کوڈ داخل کریں
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,محسوب بینک کا گوشوارہ توازن
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,معذور صارف
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,کوٹیشن
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,کوٹیشن
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,کل کٹوتی
 ,Production Analytics,پیداوار کے تجزیات
@@ -1998,9 +1996,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},انتباہ: منسلکہ پر غلط SSL سرٹیفکیٹ {0}
 DocType: Student Admission,Eligibility,اہلیت
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",لیڈز آپ کو ملتا کاروبار، آپ لیڈز کے طور پر آپ کے تمام رابطوں اور مزید شامل کی مدد
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",لیڈز آپ کو ملتا کاروبار، آپ لیڈز کے طور پر آپ کے تمام رابطوں اور مزید شامل کی مدد
 DocType: Production Order Operation,Actual Operation Time,اصل آپریشن کے وقت
 DocType: Authorization Rule,Applicable To (User),لاگو (صارف)
 DocType: Purchase Taxes and Charges,Deduct,منہا
@@ -2015,7 +2013,7 @@
 DocType: Guardian,Work Address,دفتر کا پتہ
 DocType: Appraisal,Calculate Total Score,کل اسکور کا حساب لگائیں
 DocType: Request for Quotation,Manufacturing Manager,مینوفیکچرنگ کے مینیجر
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},سیریل نمبر {0} تک وارنٹی کے تحت ہے {1}
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,پیکجوں کے میں تقسیم ترسیل کے نوٹ.
 apps/erpnext/erpnext/hooks.py +87,Shipments,ترسیل
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,اکاؤنٹ کا بیلنس ({0}) {1} اور اسٹاک قیمت کے لئے ({2}) گودام کے لئے {3} ایک ہی ہونا چاہیے
@@ -2038,10 +2036,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,نوٹ: ای میل معذور صارفین کو نہیں بھیجی جائے گی
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,تعامل کی تعداد
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,تعامل کی تعداد
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,کمپنی کو منتخب کریں ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,کمپنی کو منتخب کریں ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,تمام محکموں کے لئے تصور کیا جاتا ہے تو خالی چھوڑ دیں
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",ملازمت کی اقسام (مستقل، کنٹریکٹ، انٹرن وغیرہ).
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0} شے کے لئے لازمی ہے {1}
 DocType: Process Payroll,Fortnightly,پندرہ روزہ
 DocType: Currency Exchange,From Currency,کرنسی سے
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",کم سے کم ایک قطار میں مختص رقم، انوائس کی قسم اور انوائس تعداد کو منتخب کریں
@@ -2050,14 +2048,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),شرح (کمپنی کرنسی)
 DocType: Student Guardian,Others,دیگر
 DocType: Payment Entry,Unallocated Amount,Unallocated رقم
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,ایک کے ملاپ شے نہیں مل سکتی. کے لئے {0} کسی دوسرے قدر منتخب کریں.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,مزید کوئی بھی اپ ڈیٹ
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,پہلی صف کے لئے &#39;پچھلے صف کل پر&#39; &#39;پچھلے صف کی رقم پر&#39; کے طور پر چارج کی قسم منتخب کریں یا نہیں کر سکتے ہیں
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,چائلڈ آئٹم ایک پروڈکٹ بنڈل نہیں ہونا چاہئے. براہ مہربانی شے کو دور `{0}` اور محفوظ کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,بینکنگ
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,timesheets کو شامل کریں
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,timesheets کو شامل کریں
 DocType: Vehicle Service,Service Item,سروس شے
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
 DocType: Bank Guarantee,Bank Guarantee,بینک گارنٹی
@@ -2081,6 +2079,7 @@
 apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,وصولی اکاؤنٹ
 DocType: Quotation Item,Stock Balance,اسٹاک توازن
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,ادائیگی سیلز آرڈر
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,{0} سیٹ اپ&gt; ترتیبات کے ذریعے&gt; نام دینے سیریز کیلئے نام دینے سیریز مقرر مہربانی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,سی ای او
 DocType: Expense Claim Detail,Expense Claim Detail,اخراجات دعوی تفصیل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,درست اکاؤنٹ منتخب کریں
@@ -2105,14 +2104,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,قیمت کی فہرست مقرر نہیں ہے تو قیمتیں نہیں دکھایا جائے گا
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,یہ شپنگ حکمرانی کے لئے ایک ملک کی وضاحت یا دنیا بھر میں شپنگ براہ مہربانی چیک کریں
 DocType: Stock Entry,Total Incoming Value,کل موصولہ ویلیو
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,ڈیبٹ کرنے کی ضرورت ہے
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",timesheets کو آپ کی ٹیم کی طرف سے کیا سرگرمیوں کے لئے وقت، لاگت اور بلنگ کا ٹریک رکھنے میں مدد
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,قیمت خرید کی فہرست
 DocType: Offer Letter Term,Offer Term,پیشکش ٹرم
 DocType: Quality Inspection,Quality Manager,کوالٹی منیجر
 DocType: Job Applicant,Job Opening,کام افتتاحی
 DocType: Payment Reconciliation,Payment Reconciliation,ادائیگی مصالحتی
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,انچارج شخص کا نام منتخب کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,انچارج شخص کا نام منتخب کریں
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,ٹیکنالوجی
 DocType: BOM Website Operation,BOM Website Operation,BOM ویب سائٹ آپریشن
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,خط پیش کرتے ہیں
@@ -2138,8 +2137,8 @@
 DocType: Opportunity,Lost Reason,کھو وجہ
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,نیا ایڈریس
 DocType: Quality Inspection,Sample Size,نمونہ سائز
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,رسید دستاویز درج کریں
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,تمام اشیاء پہلے ہی انوائس کیا گیا ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,رسید دستاویز درج کریں
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,مزید لاگت کے مراکز گروپوں کے تحت بنایا جا سکتا ہے لیکن اندراجات غیر گروپوں کے خلاف بنایا جا سکتا ہے
 DocType: Project,External,بیرونی
@@ -2150,10 +2149,10 @@
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,طباعت اور برانڈنگ
 DocType: Bin,Actual Quantity,اصل مقدار
 DocType: Shipping Rule,example: Next Day Shipping,مثال: اگلے دن شپنگ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,نہیں ملا سیریل کوئی {0}
 DocType: Scheduling Tool,Student Batch,Student کی بیچ
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,آپ کے گاہکوں کو
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,طالب علم بنائیں
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,طالب علم بنائیں
 DocType: Leave Block List Date,Block Date,بلاک تاریخ
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,اب لگائیں
 apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},اصل مقدار {0} / انتظار قی {1}
@@ -2176,8 +2175,9 @@
 DocType: SMS Log,Sent To,کو بھیجا
 DocType: Payment Request,Make Sales Invoice,فروخت انوائس بنائیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,سافٹ ویئر
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,اگلی تاریخ سے رابطہ ماضی میں نہیں ہو سکتا
 DocType: Company,For Reference Only.,صرف ریفرنس کے لئے.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,بیچ منتخب نہیں
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},غلط {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,ایڈوانس رقم
@@ -2191,7 +2191,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,کیس نمبر 0 نہیں ہو سکتا
 DocType: Item,Show a slideshow at the top of the page,صفحے کے سب سے اوپر ایک سلائڈ شو دکھانے کے
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,Boms
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,سٹورز
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,سٹورز
 DocType: Serial No,Delivery Time,ڈیلیوری کا وقت
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,کی بنیاد پر خستہ
 DocType: Item,End of Life,زندگی کے اختتام
@@ -2203,12 +2203,12 @@
 DocType: Rename Tool,Rename Tool,آلہ کا نام تبدیل کریں
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,اپ ڈیٹ لاگت
 DocType: Item Reorder,Item Reorder,آئٹم ترتیب
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,دکھائیں تنخواہ کی پرچی
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,منتقلی مواد
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,دکھائیں تنخواہ کی پرچی
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,منتقلی مواد
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",آپریشن، آپریٹنگ لاگت کی وضاحت کریں اور اپنے آپریشن کی کوئی ایک منفرد آپریشن دے.
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,یہ دستاویز کی طرف سے حد سے زیادہ ہے {0} {1} شے کے لئے {4}. آپ کر رہے ہیں ایک اور {3} اسی کے خلاف {2}؟
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,کو بچانے کے بعد بار بار چلنے والی مقرر کریں
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,تبدیلی منتخب رقم اکاؤنٹ
 DocType: Purchase Invoice,Price List Currency,قیمت کی فہرست کرنسی
 DocType: Naming Series,User must always select,صارف نے ہمیشہ منتخب کرنا ضروری ہے
 DocType: Stock Settings,Allow Negative Stock,منفی اسٹاک کی اجازت دیں
@@ -2219,7 +2219,7 @@
 DocType: Budget Account,Budget Account,بجٹ اکاؤنٹ
 DocType: Quality Inspection,Verified By,کی طرف سے تصدیق
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",موجودہ لین دین موجود ہیں کیونکہ، کمپنی کی پہلے سے طے شدہ کرنسی تبدیل نہیں کر سکتے. معاملات پہلے سے طے شدہ کرنسی تبدیل کرنے منسوخ کر دیا جائے ضروری ہے.
-DocType: Grade Interval,Grade Description,گریڈ تفصیل
+DocType: Grading Scale Interval,Grade Description,گریڈ تفصیل
 DocType: Stock Entry,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,تنخواہ پرچی بنائیں
@@ -2256,7 +2256,7 @@
 DocType: Upload Attendance,Attendance To Date,تاریخ کرنے کے لئے حاضری
 DocType: Warranty Claim,Raised By,طرف سے اٹھائے گئے
 DocType: Payment Gateway Account,Payment Account,ادائیگی اکاؤنٹ
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,آگے بڑھنے کے لئے کمپنی کی وضاحت کریں
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,اکاؤنٹس وصولی میں خالص تبدیلی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,مائکر آف
 DocType: Offer Letter,Accepted,قبول کر لیا
@@ -2266,12 +2266,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,تم واقعی میں اس کمپنی کے لئے تمام لین دین کو حذف کرنا چاہتے براہ کرم یقینی بنائیں. یہ ہے کے طور پر آپ ماسٹر ڈیٹا رہیں گے. اس کارروائی کو رد نہیں کیا جا سکتا.
 DocType: Room,Room Number,کمرہ نمبر
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},غلط حوالہ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) منصوبہ بندی quanitity سے زیادہ نہیں ہو سکتا ({2}) پیداوار میں آرڈر {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) منصوبہ بندی quanitity سے زیادہ نہیں ہو سکتا ({2}) پیداوار میں آرڈر {3}
 DocType: Shipping Rule,Shipping Rule Label,شپنگ حکمرانی لیبل
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,صارف فورم
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,خام مال خالی نہیں ہو سکتا.
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,فوری جرنل اندراج
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",اسٹاک کو اپ ڈیٹ نہیں کیا جا سکا، انوائس ڈراپ شپنگ آئٹم پر مشتمل ہے.
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,فوری جرنل اندراج
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,BOM کسی بھی شے agianst ذکر اگر آپ کی شرح کو تبدیل نہیں کر سکتے ہیں
 DocType: Employee,Previous Work Experience,گزشتہ کام کا تجربہ
 DocType: Stock Entry,For Quantity,مقدار کے لئے
@@ -2284,7 +2284,7 @@
 DocType: Purchase Invoice,Terms and Conditions1,شرائط و Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,انسٹی ٹیوٹ کے نام جس کے لئے آپ کو اس نظام قائم کر رہے ہیں.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",اس تاریخ تک منجمد اکاؤنٹنگ اندراج، کوئی / کرتے ذیل کے متعین کردہ کردار سوائے اندراج میں ترمیم کرسکتے ہیں.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,بحالی کے شیڈول پیدا کرنے سے پہلے دستاویز کو بچانے کے کریں
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,منصوبے کی حیثیت
 DocType: UOM,Check this to disallow fractions. (for Nos),کسور کو رد کرنا اس کی جانچ پڑتال. (نمبر کے لئے)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,مندرجہ ذیل پیداوار کے احکامات کو پیدا کیا گیا تھا:
@@ -2311,7 +2311,7 @@
 ,Employees working on a holiday,چھٹی پر کام کرنے والے ملازمین
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,مارک موجودہ
 DocType: Project,% Complete Method,٪ مکمل طریقہ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},بحالی کے آغاز کی تاریخ سیریل نمبر کے لئے ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},بحالی کے آغاز کی تاریخ سیریل نمبر کے لئے ترسیل کی تاریخ سے پہلے نہیں ہو سکتا {0}
 DocType: Production Order,Actual End Date,اصل تاریخ اختتام
 DocType: BOM,Operating Cost (Company Currency),آپریٹنگ لاگت (کمپنی کرنسی)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2328,7 +2328,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,بغیر تنخواہ چھٹی منظور شدہ رخصت کی درخواست ریکارڈ کے ساتھ میل نہیں کھاتا
 DocType: Campaign,Campaign-.####,مہم -. ####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,اگلے مراحل
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,بہترین ممکنہ شرح پر بیان کردہ اشیاء فراہم مہربانی
 DocType: Selling Settings,Auto close Opportunity after 15 days,15 دنوں کے بعد آٹو بند مواقع
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,اختتام سال
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,عمومی quot / لیڈ٪
@@ -2365,7 +2365,7 @@
 DocType: Homepage,Homepage,مرکزی صفحہ
 DocType: Purchase Receipt Item,Recd Quantity,Recd مقدار
 DocType: Asset Category Account,Asset Category Account,ایسیٹ زمرہ اکاؤنٹ
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},سیلز آرڈر کی مقدار سے زیادہ آئٹم {0} پیدا نہیں کر سکتے ہیں {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,اسٹاک انٹری {0} پیش نہیں ہے
 DocType: Payment Reconciliation,Bank / Cash Account,بینک / کیش اکاؤنٹ
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,اگلا رابطے کی طرف سے لیڈ ای میل ایڈریس کے طور پر ایک ہی نہیں ہو سکتا
@@ -2387,7 +2387,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,کلیئرنس تاریخ کا ذکر نہیں
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,پیداوار
 DocType: Guardian,Occupation,کاروبار
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,صف {0}: شروع کرنے کی تاریخ تاریخ اختتام سے پہلے ہونا ضروری ہے
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),کل (مقدار)
 DocType: Sales Invoice,This Document,یہ دستاویز
 DocType: Installation Note Item,Installed Qty,نصب مقدار
@@ -2403,15 +2404,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,ایک مسئلہ کی اطلاع دیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,یوٹیلٹی اخراجات
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,۹۰ سے بڑھ کر
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,صف # {0}: جرنل اندراج {1} اکاؤنٹ نہیں ہے {2} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,صف # {0}: جرنل اندراج {1} اکاؤنٹ نہیں ہے {2} یا پہلے سے ہی ایک اور واؤچر کے خلاف میچ نہیں کرتے
 DocType: Buying Settings,Default Buying Price List,پہلے سے طے شدہ خرید قیمت کی فہرست
 DocType: Process Payroll,Salary Slip Based on Timesheet,تنخواہ کی پرچی Timesheet کی بنیاد پر
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,اوپر منتخب شدہ معیار یا تنخواہ پرچی کے لئے کوئی ملازم پہلے ہی پیدا
 DocType: Notification Control,Sales Order Message,سیلز آرڈر پیغام
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",وغیرہ کمپنی، کرنسی، رواں مالی سال کی طرح پہلے سے طے شدہ اقدار
 DocType: Payment Entry,Payment Type,ادائیگی کی قسم
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,آئٹم کے لئے ایک بیچ براہ مہربانی منتخب کریں {0}. اس ضرورت کو پورا کرتا ہے کہ ایک بیچ کو تلاش کرنے سے قاصر ہے
 DocType: Process Payroll,Select Employees,منتخب ملازمین
 DocType: Opportunity,Potential Sales Deal,ممکنہ فروخت ڈیل
 DocType: Payment Entry,Cheque/Reference Date,چیک / حوالہ تاریخ
@@ -2428,7 +2429,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},پہلے ہی کمپنی کے لئے پیدا گلوبل پوزیشن پروفائل {0} {1}
 DocType: Purchase Order,Ref SQ,ممبران SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,تمام BOMs میں آئٹم / BOM بدل
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,رسید دستاویز پیش کرنا ضروری ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,رسید دستاویز پیش کرنا ضروری ہے
 DocType: Purchase Invoice Item,Received Qty,موصولہ مقدار
 DocType: Stock Entry Detail,Serial No / Batch,سیریل نمبر / بیچ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,نہیں ادا کی اور نجات نہیں
@@ -2437,11 +2438,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,کوئی وقت شیٹس
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,{0} لے بھیج دیا جائے نہیں کر سکتے ہیں کی قسم چھوڑ دو
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',بحالی کے شیڈول تمام اشیاء کے لئے پیدا نہیں کر رہا. &#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 ,To Produce,پیدا کرنے کے لئے
 apps/erpnext/erpnext/config/hr.py +93,Payroll,پے رول
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",صف کے لئے {0} میں {1}. شے کی درجہ بندی میں {2} شامل کرنے کے لئے، قطار {3} بھی شامل کیا جانا چاہئے
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,یوزر بنائیں
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,یوزر بنائیں
 DocType: Packing Slip,Identification of the package for the delivery (for print),کی ترسیل کے لئے پیکج کی شناخت (پرنٹ کے لئے)
 DocType: Bin,Reserved Quantity,محفوظ مقدار
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,درست ای میل ایڈریس درج کریں
@@ -2453,15 +2454,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,معذور کے سانچے ڈیفالٹ ٹیمپلیٹ نہیں ہونا چاہئے
 DocType: Account,Income Account,انکم اکاؤنٹ
 DocType: Payment Request,Amount in customer's currency,کسٹمر کی کرنسی میں رقم
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,ڈلیوری
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,ڈلیوری
 DocType: Stock Reconciliation Item,Current Qty,موجودہ مقدار
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",ملاحظہ کریں لاگت سیکشن میں &quot;مواد کی بنیاد پر کی شرح&quot;
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,پچھلا
 DocType: Appraisal Goal,Key Responsibility Area,کلیدی ذمہ داری کے علاقے
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",طالب علم بیچوں آپ کے طالب علموں کے لئے حاضری، جائزوں اور فیس کو ٹریک میں مدد
 DocType: Payment Entry,Total Allocated Amount,کل مختص رقم
 DocType: Item Reorder,Material Request Type,مواد درخواست کی قسم
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},سے {0} کو تنخواہوں کے لئے Accural جرنل اندراج {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",لئے LocalStorage بھرا ہوا ہے، نہیں بچا تھا
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,صف {0}: UOM تبادلوں فیکٹر لازمی ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,ممبران
 DocType: Budget,Cost Center,لاگت مرکز
@@ -2471,16 +2473,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,سیلز معاملات سے گاہک کی ٹیکس ID چھپائیں
 DocType: Upload Attendance,Upload HTML,اپ لوڈ کریں ایچ ٹی ایم ایل
 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.",قیمتوں کا تعین اصول کچھ معیار کی بنیاد پر، / قیمت کی فہرست ادلیکھت ڈسکاؤنٹ فی صد کی وضاحت کرنے کے لئے بنایا ہے.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",قیمتوں کا تعین اصول کچھ معیار کی بنیاد پر، / قیمت کی فہرست ادلیکھت ڈسکاؤنٹ فی صد کی وضاحت کرنے کے لئے بنایا ہے.
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,گودام صرف اسٹاک انٹری کے ذریعے تبدیل کیا جا سکتا / ڈلیوری نوٹ / خریداری کی رسید
 DocType: Employee Education,Class / Percentage,کلاس / فیصد
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,مارکیٹنگ اور سیلز کے سربراہ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",منتخب قیمتوں کا تعین اصول &#39;قیمت&#39; کے لئے بنایا جاتا ہے تو، اس کی قیمت کی فہرست ادلیکھت ہو جائے گا. قیمتوں کا تعین اصول قیمت حتمی قیمت ہے، تو کوئی مزید رعایت کا اطلاق ہونا چاہئے. لہذا، وغیرہ سیلز آرڈر، خریداری کے آرڈر کی طرح کے لین دین میں، اس کی بجائے &#39;قیمت کی فہرست شرح&#39; فیلڈ کے مقابلے میں، &#39;شرح&#39; میدان میں دلوایا جائے گا.
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,ٹریک صنعت کی قسم کی طرف جاتا ہے.
 DocType: Item Supplier,Item Supplier,آئٹم پردایک
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,بیچ کوئی حاصل کرنے کے لئے آئٹم کوڈ درج کریں
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},{0} quotation_to کے لئے ایک قیمت منتخب کریں {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,تمام پتے.
 DocType: Company,Stock Settings,اسٹاک ترتیبات
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",مندرجہ ذیل خصوصیات دونوں کے ریکارڈ میں ایک ہی ہیں تو ولی ہی ممکن ہے. گروپ، جڑ کی قسم، کمپنی ہے
@@ -2490,6 +2492,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',حیثیت کے ساتھ ملازمین کو واقعہ کے بارے میں ایک ای میل بھیجیں گے &#39;کھولیں&#39;
 DocType: Task,Depends on Tasks,ٹاسکس پر انحصار کرتا ہے
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,گاہک گروپ درخت کا انتظام کریں.
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,آئٹم کے ساتھ منسلک کی خریداری کی ٹوکری کو چالو کرنے کے بغیر دکھایا جا سکتا ہے
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,نیا لاگت مرکز نام
 DocType: Leave Control Panel,Leave Control Panel,کنٹرول پینل چھوڑنا
@@ -2502,12 +2505,10 @@
 DocType: Sales Invoice,Debit To,ڈیبٹ
 DocType: Delivery Note,Required only for sample item.,صرف نمونے شے کے لئے کی ضرورت ہے.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,ٹرانزیکشن کے بعد اصل مقدار
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,سپلائر&gt; سپلائر کی قسم
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},کوئی تنخواہ کی پرچی کے درمیان پایا {0} اور {1}
 ,Pending SO Items For Purchase Request,خریداری کی درخواست کے لئے بہت اشیا زیر التواء
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,طالب علم داخلہ
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,ترک ھو گیا ھے{0} {1}
 DocType: Supplier,Billing Currency,بلنگ کی کرنسی
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,اضافی بڑا
@@ -2524,9 +2525,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,مرکزی صفحہ نمایاں مصنوعات کی
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,تمام تعین گروپ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,نیا گودام نام
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),کل {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),کل {0} ({1})
 DocType: C-Form Invoice Detail,Territory,علاقہ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,ضرورت دوروں کا کوئی ذکر کریں
 DocType: Stock Settings,Default Valuation Method,پہلے سے طے شدہ تشخیص کا طریقہ
 DocType: Vehicle Log,Fuel Qty,ایندھن کی مقدار
 DocType: Production Order Operation,Planned Start Time,منصوبہ بندی کے آغاز کا وقت
@@ -2542,7 +2543,7 @@
 DocType: Price List,Price List Master,قیمت کی فہرست ماسٹر
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,آپ کی مقرر کردہ اور اہداف کی نگرانی کر سکتے ہیں تاکہ تمام سیلز معاملات سے زیادہ ** سیلز افراد ** خلاف ٹیگ کیا جا سکتا.
 ,S.O. No.,تو نمبر
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},لیڈ سے گاہک بنانے کے براہ مہربانی {0}
 DocType: Price List,Applicable for Countries,ممالک کے لئے قابل اطلاق
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,صرف حیثیت کے ساتھ درخواستیں چھوڑ دو &#39;منظور&#39; اور &#39;مسترد&#39; جمع کی جا سکتی
 DocType: Homepage,Products to be shown on website homepage,مصنوعات کی ویب سائٹ کے ہوم پیج پر دکھایا جائے گا
@@ -2572,7 +2573,7 @@
 DocType: Project,Copied From,سے کاپی
 DocType: Project,Copied From,سے کاپی
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,قلت
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} سے وابستہ نہیں کرتا {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} سے وابستہ نہیں کرتا {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,ملازم {0} کے لئے حاضری پہلے سے نشان لگا دیا گیا
 DocType: Packing Slip,If more than one package of the same type (for print),تو اسی قسم کی ایک سے زیادہ پیکج (پرنٹ کے لئے)
 ,Salary Register,تنخواہ رجسٹر
@@ -2591,7 +2592,7 @@
 DocType: Tax Rule,Use for Shopping Cart,خریداری کی ٹوکری کے لئے استعمال کریں
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},ویلیو {0} وصف کے لئے {1} درست شے کی فہرست میں آئٹم کے لئے اقدار خاصیت موجود نہیں ہے {2}
 DocType: BOM Item,Scrap %,سکریپ٪
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",چارجز تناسب اپنے انتخاب کے مطابق، شے کی مقدار یا رقم کی بنیاد پر تقسیم کیا جائے گا
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",چارجز تناسب اپنے انتخاب کے مطابق، شے کی مقدار یا رقم کی بنیاد پر تقسیم کیا جائے گا
 DocType: Maintenance Visit,Purposes,مقاصد
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,کم سے کم ایک شے کی واپسی دستاویز میں منفی مقدار کے ساتھ درج کیا جانا چاہیے
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",آپریشن {0} کارگاہ میں کسی بھی دستیاب کام کے گھنٹوں سے زیادہ وقت {1}، ایک سے زیادہ کی کارروائیوں میں آپریشن کو توڑنے
@@ -2612,16 +2613,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,علاقہ درخت کا انتظام کریں.
 DocType: Journal Entry Account,Sales Invoice,فروخت انوائس
 DocType: Journal Entry Account,Party Balance,پارٹی بیلنس
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,ڈسکاؤنٹ پر لاگو براہ مہربانی منتخب کریں
 DocType: Company,Default Receivable Account,پہلے سے طے شدہ وصولی اکاؤنٹ
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,اوپر منتخب شدہ معیار کے لئے ادا کی مجموعی تنخواہ کے لئے بینک اندراج تشکیل
 DocType: Stock Entry,Material Transfer for Manufacture,تیاری کے لئے مواد کی منتقلی
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,ڈسکاؤنٹ فی صد قیمت کی فہرست کے خلاف یا تمام قیمت کی فہرست کے لئے یا تو لاگو کیا جا سکتا.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,ڈسکاؤنٹ فی صد قیمت کی فہرست کے خلاف یا تمام قیمت کی فہرست کے لئے یا تو لاگو کیا جا سکتا.
 DocType: Purchase Invoice,Half-yearly,چھماہی
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,اسٹاک کے لئے اکاؤنٹنگ انٹری
 DocType: Vehicle Service,Engine Oil,انجن کا تیل
 DocType: Sales Invoice,Sales Team1,سیلز Team1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,آئٹم {0} موجود نہیں ہے
 DocType: Sales Invoice,Customer Address,گاہک پتہ
 DocType: Employee Loan,Loan Details,قرض کی تفصیلات
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,صف {0}: مکمل مقدار صفر سے زیادہ ہونا چاہیے.
@@ -2629,24 +2630,24 @@
 DocType: Account,Root Type,جڑ کی قسم
 DocType: Item,FIFO,فیفو
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},صف # {0}: سے زیادہ واپس نہیں کر سکتے ہیں {1} شے کے لئے {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,پلاٹ
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,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 +149,Target warehouse is mandatory for row {0},ہدف گودام صف کے لئے لازمی ہے {0}
 DocType: Cheque Print Template,Primary Settings,بنیادی ترتیبات
 DocType: Purchase Invoice,Select Supplier Address,منتخب سپلائر ایڈریس
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,ملازمین شامل کریں
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,ملازمین شامل کریں
 DocType: Purchase Invoice Item,Quality Inspection,معیار معائنہ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,اضافی چھوٹے
 DocType: Company,Standard Template,سٹینڈرڈ سانچہ
 DocType: Training Event,Theory,نظریہ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,انتباہ: مقدار درخواست مواد کم از کم آرڈر کی مقدار سے کم ہے
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,اکاؤنٹ {0} منجمد ہے
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,تنظیم سے تعلق رکھنے والے اکاؤنٹس کی ایک علیحدہ چارٹ کے ساتھ قانونی / ماتحت.
 DocType: Payment Request,Mute Email,گونگا ای میل
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",کھانا، مشروب اور تمباکو
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},صرف خلاف ادائیگی کر سکتے ہیں unbilled {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,کمیشن کی شرح زیادہ سے زیادہ 100 نہیں ہو سکتا
 DocType: Stock Entry,Subcontract,اپپٹا
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,پہلے {0} درج کریں
@@ -2686,7 +2687,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,موجودہ منتقلی کے ساتھ گوداموں گروپ کو تبدیل نہیں کیا جا سکتا.
 DocType: Assessment Result Tool,Result HTML,نتیجہ HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,اختتامی میعاد
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,طلباء شامل کریں
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,طلباء شامل کریں
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},براہ مہربانی منتخب کریں {0}
 DocType: C-Form,C-Form No,سی فارم نہیں
 DocType: BOM,Exploded_items,Exploded_items
@@ -2727,7 +2728,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,مالی سال کو منتخب کریں
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,ترتیب لیول
 DocType: Company,Chart Of Accounts Template,اکاؤنٹس سانچے کا چارٹ
 DocType: Attendance,Attendance Date,حاضری تاریخ
@@ -2742,14 +2743,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,ڈوپلیکیٹ اندراج
 DocType: Program Enrollment Tool,Get Students,طلبا حاصل کریں
 DocType: Serial No,Under Warranty,وارنٹی کے تحت
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[خرابی]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[خرابی]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,آپ کی فروخت کے آرڈر کو بچانے کے ایک بار الفاظ میں نظر آئے گا.
 ,Employee Birthday,ملازم سالگرہ
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Student کی بیچ حاضری کا آلہ
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,حد
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,وینچر کیپیٹل کی
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,اس &#39;تعلیمی سال&#39; کے ساتھ ایک تعلیمی اصطلاح {0} اور &#39;کی اصطلاح کا نام&#39; {1} پہلے سے موجود ہے. ان اندراجات پر نظر ثانی کریں اور دوبارہ کوشش کریں براہ مہربانی.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",شے {0} خلاف موجودہ ٹرانزیکشنز ہیں کے طور پر، آپ کی قدر کو تبدیل نہیں کر سکتے {1}
 DocType: UOM,Must be Whole Number,پورے نمبر ہونا لازمی ہے
 DocType: Leave Control Panel,New Leaves Allocated (In Days),(دنوں میں) مختص نئے پتے
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,سیریل نمبر {0} موجود نہیں ہے
@@ -2769,7 +2770,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,مواد کی٪ اس کی فروخت کے خلاف بل
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,مدت بند انٹری
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,موجودہ لین دین کے ساتھ لاگت مرکز گروپ کو تبدیل نہیں کیا جا سکتا
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},رقم {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},رقم {0} {1} {2} {3}
 DocType: Account,Depreciation,فرسودگی
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),پردایک (ے)
 DocType: Employee Attendance Tool,Employee Attendance Tool,ملازم حاضری کا آلہ
@@ -2792,7 +2793,7 @@
 DocType: Supplier,Last Day of the Next Month,اگلے ماہ کے آخری دن
 DocType: Support Settings,Auto close Issue after 7 days,7 دن کے بعد آٹو بند مسئلہ
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",پہلے مختص نہیں کیا جا سکتا چھوڑ {0}، چھٹی توازن پہلے ہی کیری فارورڈ مستقبل چھٹی مختص ریکارڈ میں کیا گیا ہے کے طور پر {1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),نوٹ: کی وجہ / حوالہ تاریخ {0} دن کی طرف سے کی اجازت کسٹمر کے کریڈٹ دن سے زیادہ (ے)
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,طالب علم کی درخواست گزار
 DocType: Asset Category Account,Accumulated Depreciation Account,جمع ہراس اکاؤنٹ
 DocType: Stock Settings,Freeze Stock Entries,جھروکے اسٹاک میں لکھے
@@ -2803,7 +2804,7 @@
 ,Stock Analytics,اسٹاک تجزیات
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,آپریشنز خالی نہیں چھوڑا جا سکتا
 DocType: Maintenance Visit Purpose,Against Document Detail No,دستاویز تفصیل کے خلاف کوئی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,پارٹی قسم لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,پارٹی قسم لازمی ہے
 DocType: Quality Inspection,Outgoing,سبکدوش ہونے والے
 DocType: Material Request,Requested For,کے لئے درخواست
 DocType: Quotation Item,Against Doctype,DOCTYPE خلاف
@@ -2820,8 +2821,8 @@
 DocType: Asset,Item Code,آئٹم کوڈ
 DocType: Production Planning Tool,Create Production Orders,پیداوار کے احکامات بنائیں
 DocType: Serial No,Warranty / AMC Details,وارنٹی / AMC تفصیلات
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,سرگرمی کی بنیاد پر گروپ کے لئے دستی طور پر طالب علموں منتخب
 DocType: Journal Entry,User Remark,صارف تبصرہ
 DocType: Lead,Market Segment,مارکیٹ کے علاقے
 DocType: Employee Internal Work History,Employee Internal Work History,ملازم اندرونی کام تاریخ
@@ -2838,7 +2839,7 @@
 DocType: Production Planning Tool,Create Material Requests,مواد درخواست پیدا
 DocType: Employee Education,School/University,سکول / یونیورسٹی
 DocType: Payment Request,Reference Details,حوالہ تفصیلات
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,مفید زندگی کے بعد کی متوقع قدر مجموعی خریداری کی رقم سے کم ہونا چاہیے
 DocType: Sales Invoice Item,Available Qty at Warehouse,گودام میں دستیاب مقدار
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,بل کی گئی رقم
 DocType: Asset,Double Declining Balance,ڈبل کمی توازن
@@ -2858,18 +2859,18 @@
 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_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",یہ اسٹاک مصالحتی ایک افتتاحی انٹری ہے کے بعد سے فرق اکاؤنٹ، ایک اثاثہ / ذمہ داری قسم اکاؤنٹ ہونا ضروری ہے
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},آئٹم کے لئے ضروری آرڈر نمبر خریداری {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,پروڈکشن آرڈر نہیں بنائی
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,پروڈکشن آرڈر نہیں بنائی
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',&#39;تاریخ سے&#39; کے بعد &#39;تاریخ کے لئے&#39; ہونا ضروری ہے
 DocType: Asset,Fully Depreciated,مکمل طور پر فرسودگی
 ,Stock Projected Qty,اسٹاک مقدار متوقع
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},تعلق نہیں ہے {0} کسٹمر منصوبے کی {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,نشان حاضری ایچ ٹی ایم ایل
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",کوٹیشن، تجاویز ہیں بولیاں آپ اپنے گاہکوں کو بھیجا ہے
 DocType: Sales Order,Customer's Purchase Order,گاہک کی خریداری کے آرڈر
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,سیریل نمبر اور بیچ
 DocType: Warranty Claim,From Company,کمپنی کی طرف سے
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,قیمت یا مقدار
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Depreciations کی تعداد بک مقرر کریں
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,قیمت یا مقدار
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,پروڈکشنز احکامات کو نہیں اٹھایا جا سکتا ہے:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,منٹ
 DocType: Purchase Invoice,Purchase Taxes and Charges,ٹیکس اور الزامات کی خریداری
@@ -2881,7 +2882,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,تمام گوداموں
 DocType: Sales Partner,Retailer,خوردہ فروش
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,اکاؤنٹ کریڈٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,تمام پردایک اقسام
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,تمام پردایک اقسام
 DocType: Global Defaults,Disable In Words,الفاظ میں غیر فعال کریں
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,آئٹم خود کار طریقے سے شمار نہیں ہے کیونکہ آئٹم کوڈ لازمی ہے
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},کوٹیشن {0} نہیں قسم کی {1}
@@ -2890,6 +2891,7 @@
 DocType: Production Order,PRO-,بند کریں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,بینک وورڈرافٹ اکاؤنٹ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,تنخواہ پرچی بنائیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,صف # {0}: مختص رقم بقایا رقم سے زیادہ نہیں ہو سکتا.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,براؤز BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,محفوظ قرضوں
 DocType: Purchase Invoice,Edit Posting Date and Time,ترمیم پوسٹنگ کی تاریخ اور وقت
@@ -2928,7 +2930,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},نہیں کے مقابلے میں بڑی عمر کے اسٹاک لین دین کو اپ ڈیٹ کرنے کی اجازت دی {0}
 DocType: Purchase Invoice Item,PR Detail,پی آر تفصیل
 DocType: Sales Order,Fully Billed,مکمل طور پر بل
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},ملازم میں ڈیفالٹ قابل ادائیگی اکاؤنٹ سیٹ مہربانی {0}
 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 +127,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),پیکج کی مجموعی وزن. عام طور پر نیٹ وزن پیکیجنگ مواد وزن. (پرنٹ کے لئے)
@@ -2938,7 +2939,7 @@
 DocType: Student Group,Group Based On,گروپ کی بنیاد پر
 DocType: Journal Entry,Bill Date,بل تاریخ
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",سروس شے، قسم، تعدد اور اخراجات کی رقم کے لئے ضروری ہیں
-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:",سب سے زیادہ ترجیح کے ساتھ ایک سے زیادہ قیمتوں کا تعین قوانین موجود ہیں یہاں تک کہ اگر، تو مندرجہ ذیل اندرونی ترجیحات لاگو ہوتے ہیں:
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",سب سے زیادہ ترجیح کے ساتھ ایک سے زیادہ قیمتوں کا تعین قوانین موجود ہیں یہاں تک کہ اگر، تو مندرجہ ذیل اندرونی ترجیحات لاگو ہوتے ہیں:
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},تم واقعی میں سے {0} کے لئے تمام تنخواہ پرچی جمع کرانا چاہتے ہیں {1}
 DocType: Cheque Print Template,Cheque Height,چیک اونچائی
 DocType: Supplier,Supplier Details,پردایک تفصیلات
@@ -2950,7 +2951,7 @@
 DocType: Vehicle Log,Invoice Ref,انوائس کے ممبران
 DocType: Purchase Order,Recurring Order,مکرر آرڈر
 DocType: Company,Default Income Account,پہلے سے طے شدہ آمدنی اکاؤنٹ
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,گاہک گروپ / کسٹمر
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,گاہک گروپ / کسٹمر
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),نا بند کردہ مالی سال منافع / خسارہ (کریڈٹ)
 DocType: Sales Invoice,Time Sheets,وقت کی چادریں
 DocType: Payment Gateway Account,Default Payment Request Message,پہلے سے طے شدہ ادائیگی کی درخواست پیغام
@@ -2970,7 +2971,7 @@
 DocType: Notification Control,Quotation Message,کوٹیشن پیغام
 DocType: Employee Loan,Employee Loan Application,ملازم کے قرض کی درخواست
 DocType: Issue,Opening Date,افتتاحی تاریخ
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,حاضری کامیابی سے نشان لگا دیا گیا ہے.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,حاضری کامیابی سے نشان لگا دیا گیا ہے.
 DocType: Journal Entry,Remark,تبصرہ
 DocType: Purchase Receipt Item,Rate and Amount,شرح اور رقم
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,پتے اور چھٹیوں
@@ -2994,7 +2995,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,طالب علم گروپ
 DocType: Shopping Cart Settings,Quotation Series,کوٹیشن سیریز
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",ایک شے کے اسی نام کے ساتھ موجود ({0})، شے گروپ کا نام تبدیل یا شے کا نام تبدیل کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,کسٹمر براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,کسٹمر براہ مہربانی منتخب کریں
 DocType: C-Form,I,میں
 DocType: Company,Asset Depreciation Cost Center,اثاثہ ہراس لاگت سینٹر
 DocType: Sales Order Item,Sales Order Date,سیلز آرڈر کی تاریخ
@@ -3013,20 +3014,20 @@
 DocType: Vehicle,Insurance Details,انشورنس کی تفصیلات دیکھیں
 DocType: Account,Payable,قابل ادائیگی
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,واپسی کا دورانیہ درج کریں
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),دیندار ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),دیندار ({0})
 DocType: Pricing Rule,Margin,مارجن
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,نئے گاہکوں
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,کل منافع ٪
 DocType: Appraisal Goal,Weightage (%),اہمیت (٪)
 DocType: Bank Reconciliation Detail,Clearance Date,کلیئرنس تاریخ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,مجموعی خریداری کی رقم لازمی ہے
 DocType: Lead,Address Desc,DESC ایڈریس
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,پارٹی لازمی ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,پارٹی لازمی ہے
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,موضوع کا نام
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,فروخت یا خرید کی کم سے کم ایک منتخب ہونا ضروری ہے
-DocType: Grading Structure,Grade Intervals,گریڈ وقفے
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,آپ کے کاروبار کی نوعیت کو منتخب کریں.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},صف # {0}: حوالہ جات میں داخلے نقل {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,مینوفیکچرنگ آپریشنز کہاں کئے جاتے ہیں.
 DocType: Asset Movement,Source Warehouse,ماخذ گودام
 DocType: Installation Note,Installation Date,تنصیب کی تاریخ
@@ -3062,7 +3063,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,پرنٹ کے سانچوں کے لئے خط سر.
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,پرنٹ کے سانچوں کے لئے عنوانات پروفارما انوائس مثلا.
 DocType: Student Guardian,Student Guardian,طالب علم گارڈین
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,تشخیص قسم کے الزامات شامل کے طور پر نشان نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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 کی شرح
@@ -3090,7 +3091,7 @@
 DocType: Company,Exchange Gain / Loss Account,ایکسچینج حاصل / نقصان کے اکاؤنٹ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,ملازم اور حاضری
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},مقصد میں سے ایک ہونا ضروری ہے {0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,فارم بھریں اور اس کو بچانے کے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,فورم
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,اسٹاک میں اصل قی
@@ -3105,7 +3106,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,ترتیب مقدار
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,موجودہ کام سوراخ
 DocType: Company,Stock Adjustment Account,اسٹاک ایڈجسٹمنٹ بلنگ
-DocType: Journal Entry,Write Off,لکھ دینا
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,لکھ دینا
 DocType: Timesheet Detail,Operation ID,آپریشن ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",نظام صارف (لاگ ان) کی شناخت. مقرر کیا ہے تو، یہ سب HR فارم کے لئے پہلے سے طے شدہ ہو جائے گا.
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: سے {1}
@@ -3116,26 +3117,27 @@
 DocType: Sales Order Item,Supplier delivers to Customer,پردایک کسٹمر کو فراہم
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0})موجود نھی ھے
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,اگلی تاریخ پوسٹنگ کی تاریخ سے زیادہ ہونا چاہیے
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,دکھائیں ٹیکس بریک اپ
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,دکھائیں ٹیکس بریک اپ
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},وجہ / حوالہ تاریخ کے بعد نہیں ہو سکتا {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,ڈیٹا کی درآمد اور برآمد
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,کوئی طالب علم نہیں ملا
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,کوئی طالب علم نہیں ملا
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,انوائس پوسٹنگ کی تاریخ
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,فروخت
 DocType: Sales Invoice,Rounded Total,مدور کل
 DocType: Product Bundle,List items that form the package.,پیکیج کی تشکیل کہ فہرست اشیاء.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,فیصدی ایلوکیشن 100٪ کے برابر ہونا چاہئے
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,پارٹی منتخب کرنے سے پہلے پوسٹنگ کی تاریخ براہ مہربانی منتخب کریں
 DocType: Program Enrollment,School House,سکول ہاؤس
 DocType: Serial No,Out of AMC,اے ایم سی کے باہر
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,بحالی دورہ
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,کوٹیشن براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,بک Depreciations کی تعداد کل Depreciations کی تعداد سے زیادہ نہیں ہو سکتی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,بحالی دورہ
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,سیلز ماسٹر مینیجر {0} کردار ہے جو صارف سے رابطہ کریں
 DocType: Company,Default Cash Account,پہلے سے طے شدہ کیش اکاؤنٹ
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,کمپنی (نہیں مستقل خریدار یا سپلائر) ماسٹر.
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,یہ اس طالب علم کی حاضری پر مبنی ہے
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,کوئی طلبا میں
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,مزید آئٹمز یا کھلی مکمل فارم شامل کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',&#39;متوقع تاریخ کی ترسیل&#39; درج کریں
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,ترسیل نوٹوں {0} اس سیلز آرڈر منسوخ کرنے سے پہلے منسوخ کر دیا جائے ضروری ہے
@@ -3166,6 +3168,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,آئٹم کے 3
 DocType: Purchase Order,Customer Contact Email,کسٹمر رابطہ ای میل
 DocType: Warranty Claim,Item and Warranty Details,آئٹم اور وارنٹی تفصیلات دیکھیں
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,آئٹم کوڈ&gt; آئٹم گروپ&gt; برانڈ
 DocType: Sales Team,Contribution (%),شراکت (٪)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,نوٹ: ادائیگی کے اندراج کے بعد پیدا ہو گا &#39;نقد یا بینک اکاؤنٹ&#39; وضاحت نہیں کی گئی
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,لازمی کورس بازیافت کرنے کے پروگرام کو منتخب کریں.
@@ -3181,9 +3184,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,مفاہمت پہلے
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},کرنے کے لئے {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),ٹیکس اور الزامات شامل کر دیا گیا (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,آئٹم ٹیکس صف {0} قسم ٹیکس یا آمدنی یا اخراجات یا ادائیگی کے اکاؤنٹ ہونا لازمی ہے
 DocType: Sales Order,Partly Billed,جزوی طور پر بل
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,آئٹم {0} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,آئٹم {0} ایک فکسڈ اثاثہ آئٹم ہونا ضروری ہے
 DocType: Item,Default BOM,پہلے سے طے شدہ BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,دوبارہ ٹائپ کمپنی کا نام کی توثیق کے لئے براہ کرم
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,کل بقایا AMT
@@ -3193,8 +3196,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,آٹوموٹو
 DocType: Vehicle,Insurance Company,انشورنس کمپنی
 DocType: Asset Category Account,Fixed Asset Account,فکسڈ اثاثہ اکاؤنٹ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,رکن کی
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,ترسیل کے نوٹ سے
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,رکن کی
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,ترسیل کے نوٹ سے
 DocType: Student,Student Email Address,طالب علم کا ای میل ایڈریس
 DocType: Timesheet Detail,From Time,وقت سے
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,اسٹاک میں:
@@ -3206,12 +3209,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,قیمت کی فہرست زر مبادلہ کی شرح
 DocType: Purchase Invoice Item,Rate,شرح
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,انٹرن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,ایڈریس نام
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,ایڈریس نام
 DocType: Stock Entry,From BOM,BOM سے
 DocType: Assessment Code,Assessment Code,تشخیص کے کوڈ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,بنیادی
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0} منجمد کر رہے ہیں سے پہلے اسٹاک لین دین
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',&#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',&#39;پیدا شیڈول&#39; پر کلک کریں براہ مہربانی
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",مثال کے طور پر کلو، یونٹ، نمبر، میٹر
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,آپ کے ریفرنس کے تاریخ میں داخل ہوئے تو حوالہ کوئی لازمی ہے
 DocType: Bank Reconciliation Detail,Payment Document,ادائیگی دستاویز
@@ -3219,19 +3222,19 @@
 DocType: Salary Slip,Salary Structure,تنخواہ ساخت
 DocType: Account,Bank,بینک
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,ایئرلائن
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,مسئلہ مواد
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,مسئلہ مواد
 DocType: Material Request Item,For Warehouse,گودام کے لئے
 DocType: Employee,Offer Date,پیشکش تاریخ
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,کوٹیشن
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,آپ آف لائن موڈ میں ہیں. آپ آپ کو نیٹ ورک ہے جب تک دوبارہ لوڈ کرنے کے قابل نہیں ہو گا.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,کوئی بھی طالب علم گروپ بنائے.
 DocType: Purchase Invoice Item,Serial No,سیریل نمبر
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,ماہانہ واپسی کی رقم قرض کی رقم سے زیادہ نہیں ہو سکتا
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,پہلے Maintaince تفصیلات درج کریں
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,پہلے Maintaince تفصیلات درج کریں
 DocType: Purchase Invoice,Print Language,پرنٹ کریں زبان
 DocType: Salary Slip,Total Working Hours,کل کام کے گھنٹے
 DocType: Stock Entry,Including items for sub assemblies,ذیلی اسمبلیوں کے لئے اشیاء سمیت
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,درج قدر مثبت ہونا چاہئے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,درج قدر مثبت ہونا چاہئے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,تمام علاقوں
 DocType: Purchase Invoice,Items,اشیا
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,طالب علم پہلے سے ہی مندرج ہے.
@@ -3251,17 +3254,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',مختلف کے لئے پیمائش کی پہلے سے طے شدہ یونٹ &#39;{0}&#39; سانچے میں کے طور پر ایک ہی ہونا چاہیے &#39;{1}
 DocType: Shipping Rule,Calculate Based On,کی بنیاد پر حساب
 DocType: Delivery Note Item,From Warehouse,گودام سے
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,تیار کرنے کی مواد کے بل کے ساتھ کوئی شے
 DocType: Assessment Plan,Supervisor Name,سپروائزر کا نام
 DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
 DocType: Program Enrollment Course,Program Enrollment Course,پروگرام اندراج کورس
-DocType: Grading Structure,Grading Structure,گریڈنگ کی ساخت
 DocType: Purchase Taxes and Charges,Valuation and Total,تشخیص اور کل
 DocType: Tax Rule,Shipping City,شپنگ شہر
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,اطلاع کو حسب ضرورت
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,آپریشنز سے کیش فلو
 DocType: Sales Invoice,Shipping Rule,شپنگ حکمرانی
@@ -3282,8 +3283,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},کوئی پہلے سے طے شدہ BOM شے کے لئے موجود {0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,پہلے پوسٹنگ کی تاریخ منتخب کریں
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,تاریخ افتتاحی تاریخ بند کرنے سے پہلے ہونا چاہئے
 DocType: Leave Control Panel,Carry Forward,آگے لے جانے
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,موجودہ لین دین کے ساتھ سرمایہ کاری سینٹر اکاؤنٹ میں تبدیل نہیں کیا جا سکتا
 DocType: Department,Days for which Holidays are blocked for this department.,دن جس کے لئے چھٹیاں اس سیکشن کے لئے بلاک کر رہے ہیں.
@@ -3296,7 +3297,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,سرنامہ منسلک
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخری مواصلات
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,آخری مواصلات
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; کے لئے ہے جب کٹوتی نہیں کر سکتے ہیں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',زمرہ &#39;تشخیص&#39; یا &#39;تشخیص اور کل&#39; کے لئے ہے جب کٹوتی نہیں کر سکتے ہیں
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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},serialized کی شے کے لئے سیریل نمبر مطلوب {0}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,انوائس کے ساتھ ملائیں ادائیگیاں
@@ -3312,7 +3313,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),کل (AMT)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,تفریح اور تفریح
 DocType: Quality Inspection,Item Serial No,آئٹم سیریل نمبر
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,ملازم ریکارڈز تخلیق کریں
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,ملازم ریکارڈز تخلیق کریں
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,کل موجودہ
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,اکاؤنٹنگ بیانات
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,قیامت
@@ -3325,10 +3326,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,نامعلوم
 DocType: Shipping Rule,Shipping Rule Conditions,شپنگ حکمرانی ضوابط
 DocType: BOM Replace Tool,The new BOM after replacement,تبدیل کرنے کے بعد نئے BOM
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,فروخت پوائنٹ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,فروخت پوائنٹ
 DocType: Payment Entry,Received Amount,موصولہ رقم
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,براہ مہربانی سیٹ اپ ملازم انسانی وسائل میں سسٹم کا نام دینے&gt; HR ترتیبات
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",، مکمل مقدار کے لئے بنائیں حکم پر پہلے سے ہی مقدار کو نظر انداز
 DocType: Account,Tax,ٹیکس
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,نشان نہیں
@@ -3341,9 +3340,9 @@
 DocType: Batch,Source Document Name,ماخذ دستاویز کا نام
 DocType: Batch,Source Document Name,ماخذ دستاویز کا نام
 DocType: Job Opening,Job Title,ملازمت کا عنوان
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,صارفین تخلیق
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,صارفین تخلیق
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,گرام
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,تیار کرنے کی مقدار 0 سے زیادہ ہونا چاہیے.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,بحالی کال کے لئے رپورٹ ملاحظہ کریں.
 DocType: Stock Entry,Update Rate and Availability,اپ ڈیٹ کی شرح اور دستیابی
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,فی صد آپ کو موصول ہونے یا حکم دیا مقدار کے خلاف زیادہ فراہم کرنے کے لئے اجازت دی جاتی ہے. مثال کے طور پر: آپ کو 100 یونٹس کا حکم دیا ہے تو. اور آپ الاؤنس تو آپ کو 110 یونٹس حاصل کرنے کے لئے اجازت دی جاتی ہے 10٪ ہے.
@@ -3353,26 +3352,28 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},اخراجات کے اکاؤنٹ شے کے لئے لازمی ہے {0}
 DocType: BOM,Website Description,ویب سائٹ تفصیل
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,ایکوئٹی میں خالص تبدیلی
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,انوائس خریداری {0} منسوخ مہربانی سب سے پہلے
 DocType: Serial No,AMC Expiry Date,AMC ختم ہونے کی تاریخ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,رسید
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,رسید
 ,Sales Register,سیلز رجسٹر
 DocType: Daily Work Summary Settings Company,Send Emails At,پر ای میلز بھیجیں
 DocType: Quotation,Quotation Lost Reason,کوٹیشن کھو وجہ
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,آپ کے ڈومین منتخب کریں
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},ٹرانزیکشن ریفرنس کوئی {0} بتاریخ {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},ٹرانزیکشن ریفرنس کوئی {0} بتاریخ {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,ترمیم کرنے کے لئے کچھ بھی نہیں ہے.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,اس مہینے اور زیر التواء سرگرمیوں کا خلاصہ
 DocType: Customer Group,Customer Group Name,گاہک گروپ کا نام
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,ابھی تک کوئی گاہک!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,کیش فلو کا بیان
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,لائسنس
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},سی فارم سے اس انوائس {0} کو دور کریں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,اکاؤنٹ لکھنے داخل کریں
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,آخری آرڈر کی تاریخ
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},اکاؤنٹ {0} کرتا کمپنی سے تعلق رکھتا نہیں {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,{0} قطار میں سیریل نمبر ڈلیوری نوٹ کے ساتھ میل نہیں کھاتا
 DocType: Student,Guardian Details,گارڈین کی تفصیلات دیکھیں
 DocType: C-Form,C-Form,سی فارم
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,ایک سے زیادہ ملازمین کے لئے نشان حاضری
@@ -3396,20 +3397,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',صف {0} # اکاؤنٹ کی قسم کا ہونا چاہیے &#39;فکسڈ اثاثہ&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,مقدار باہر
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,قواعد فروخت کے لئے شپنگ رقم کا حساب کرنے
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,سیریز لازمی ہے
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,سیریز لازمی ہے
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,مالیاتی خدمات
 DocType: Student Sibling,Student ID,طالب علم کی شناخت
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,وقت لاگز کے لئے سرگرمیوں کی اقسام
 DocType: Tax Rule,Sales,سیلز
 DocType: Stock Entry Detail,Basic Amount,بنیادی رقم
 DocType: Training Event,Exam,امتحان
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},گودام اسٹاک آئٹم کے لئے ضروری {0}
 DocType: Leave Allocation,Unused leaves,غیر استعمال شدہ پتے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,کروڑ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,کروڑ
 DocType: Tax Rule,Billing State,بلنگ ریاست
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,منتقلی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} پارٹی اکاؤنٹ کے ساتھ وابستہ نہیں کرتا {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} پارٹی اکاؤنٹ کے ساتھ وابستہ نہیں کرتا {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),(ذیلی اسمبلیوں سمیت) پھٹا BOM آوردہ
 DocType: Authorization Rule,Applicable To (Employee),لاگو (ملازم)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,کی وجہ سے تاریخ لازمی ہے
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,وصف کے لئے اضافہ {0} 0 نہیں ہو سکتا
@@ -3420,13 +3421,13 @@
 ,Inactive Customers,غیر فعال کسٹمرز
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,خریداری کی رسیدیں
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,کس طرح کی قیمتوں کا تعین اصول کا اطلاق ہوتا ہے؟
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,کس طرح کی قیمتوں کا تعین اصول کا اطلاق ہوتا ہے؟
 DocType: Stock Entry,Delivery Note No,ترسیل کے نوٹ نہیں
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",جانچ پڑتال کی تو، صرف خریداری حتمی خام مال کے لئے مواد کی درخواستوں مواد درخواستوں میں شامل کیا جائے گا. دوسری صورت میں، والدین کی اشیاء کے لئے مواد کی درخواستوں بنایا جائے گا
 DocType: Cheque Print Template,Message to show,ظاہر کرنے کے لئے پیغام
 DocType: Company,Retail,پرچون
 DocType: Attendance,Absent,غائب
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,پروڈکٹ بنڈل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,پروڈکٹ بنڈل
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},صف {0}: غلط حوالہ {1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,ٹیکسز اور الزامات سانچہ خریداری
 DocType: Upload Attendance,Download Template,لوڈ سانچہ
@@ -3435,10 +3436,10 @@
 DocType: Payment Entry,Account Paid From,اکاؤنٹ سے ادا
 DocType: Purchase Order Item Supplied,Raw Material Item Code,خام مال آئٹم کوڈ
 DocType: Journal Entry,Write Off Based On,کی بنیاد پر لکھنے
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,لیڈ بنائیں
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,لیڈ بنائیں
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,پرنٹ اور سٹیشنری
 DocType: Stock Settings,Show Barcode Field,دکھائیں بارکوڈ فیلڈ
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,پردایک ای میلز بھیجیں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,پردایک ای میلز بھیجیں
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",تنخواہ پہلے سے ہی درمیان {0} اور {1}، درخواست مدت چھوڑیں اس تاریخ کی حد کے درمیان نہیں ہو سکتا مدت کے لئے کارروائی کی.
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,ایک سیریل نمبر کے لئے تنصیب ریکارڈ
 DocType: Guardian Interest,Guardian Interest,گارڈین دلچسپی
@@ -3451,6 +3452,7 @@
 DocType: Offer Letter,Awaiting Response,جواب کا منتظر
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,اوپر
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},غلط وصف {0} {1}
+DocType: Supplier,Mention if non-standard payable account,ذکر غیر معیاری قابل ادائیگی اکاؤنٹ ہے تو
 DocType: Salary Slip,Earning & Deduction,کمائی اور کٹوتی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,اختیاری. یہ ترتیب مختلف لین دین میں فلٹر کیا جائے گا.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,منفی تشخیص کی شرح کی اجازت نہیں ہے
@@ -3466,10 +3468,9 @@
 DocType: Production Order Item,Production Order Item,پروڈکشن آرڈر آئٹم
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,کوئی ریکارڈ نہیں ملا
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,ختم کر دیا اثاثہ کی قیمت
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,جزوی طور ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: لاگت سینٹر شے کے لئے لازمی ہے {2}
 DocType: Vehicle,Policy No,پالیسی نہیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,پروڈکٹ بنڈل سے اشیاء حاصل
 DocType: Asset,Straight Line,سیدھی لکیر
 DocType: Project User,Project User,پروجیکٹ صارف
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,سپلٹ
@@ -3486,7 +3487,7 @@
 DocType: Program Enrollment Tool,Get Students From,سے طالب علموں کو حاصل کریں
 DocType: Hub Settings,Seller Country,فروش ملک
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,ویب سائٹ پر اشیاء شائع
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,بیچوں میں آپ کے طالب علموں کے گروپ
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,بیچوں میں آپ کے طالب علموں کے گروپ
 DocType: Authorization Rule,Authorization Rule,اجازت اصول
 DocType: Sales Invoice,Terms and Conditions Details,شرائط و ضوابط تفصیلات
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,نردجیکرن
@@ -3538,14 +3539,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,چیک تاریخ
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},اکاؤنٹ {0}: والدین اکاؤنٹ {1} کمپنی سے تعلق نہیں ہے: {2}
 DocType: Program Enrollment Tool,Student Applicants,Student کی درخواست گزار
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,کامیابی کے ساتھ اس کمپنی سے متعلق تمام لین دین کو خارج کر دیا!
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,کامیابی کے ساتھ اس کمپنی سے متعلق تمام لین دین کو خارج کر دیا!
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,تاریخ کے طور پر
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,اندراجی تاریخ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,پروبیشن
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,تنخواہ کے اجزاء
 DocType: Program Enrollment Tool,New Academic Year,نئے تعلیمی سال
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,واپسی / کریڈٹ نوٹ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,واپسی / کریڈٹ نوٹ
 DocType: Stock Settings,Auto insert Price List rate if missing,آٹو ڈالیں قیمت کی فہرست شرح لاپتہ ہے
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,کل ادا کی گئی رقم
 DocType: Production Order Item,Transferred Qty,منتقل مقدار
@@ -3565,7 +3566,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",آرام دہ اور پرسکون طرح پتیوں کی قسم، بیمار وغیرہ
 DocType: Email Digest,Send regular summary reports via Email.,ای میل کے ذریعے باقاعدہ سمری رپورٹ بھیجنے.
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},میں اخراجات دعوی کی قسم ڈیفالٹ اکاؤنٹ سیٹ مہربانی {0}
 DocType: Assessment Result,Student Name,طالب علم کا نام
 DocType: Brand,Item Manager,آئٹم مینیجر
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,قابل ادائیگی پے رول
@@ -3586,6 +3587,7 @@
 ,Sales Funnel,سیلز قیف
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,مخفف لازمی ہے
 DocType: Project,Task Progress,ٹاسک پیش رفت
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,ٹوکری
 ,Qty to Transfer,منتقلی کی مقدار
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,لیڈز یا گاہکوں کو قیمت.
 DocType: Stock Settings,Role Allowed to edit frozen stock,کردار منجمد اسٹاک ترمیم کرنے کی اجازت
@@ -3613,13 +3615,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,آئٹم حکمت ٹیکس تفصیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,انسٹی ٹیوٹ مخفف
 ,Item-wise Price List Rate,آئٹم وار قیمت کی فہرست شرح
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,پردایک کوٹیشن
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,پردایک کوٹیشن
 DocType: Quotation,In Words will be visible once you save the Quotation.,آپ کوٹیشن بچانے بار الفاظ میں نظر آئے گا.
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},مقدار ({0}) قطار میں ایک حصہ نہیں ہو سکتا {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,فیس جمع
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},بارکوڈ {0} پہلے ہی آئٹم میں استعمال {1}
 DocType: Lead,Add to calendar on this date,اس تاریخ پر کیلنڈر میں شامل کریں
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,شپنگ کے اخراجات شامل کرنے کے لئے رولز.
 DocType: Item,Opening Stock,اسٹاک کھولنے
@@ -3636,8 +3638,8 @@
 Updated via 'Time Log'",منٹ میں &#39;وقت لاگ ان&#39; کے ذریعے اپ ڈیٹ
 DocType: Customer,From Lead,لیڈ سے
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,احکامات کی پیداوار کے لئے جاری.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,مالی سال منتخب کریں ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,مالی سال منتخب کریں ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,پی او ایس پی او ایس پروفائل اندراج کرنے کے لئے کی ضرورت ہے
 DocType: Program Enrollment Tool,Enroll Students,طلباء اندراج کریں
 DocType: Hub Settings,Name Token,نام ٹوکن
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,سٹینڈرڈ فروخت
@@ -3648,7 +3650,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} فروخت انوائس کے خلاف {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,پراجیکٹ کا نام
-DocType: Supplier,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
+DocType: Customer,Mention if non-standard receivable account,ذکر غیر معیاری وصولی اکاؤنٹ تو
 DocType: Journal Entry Account,If Income or Expense,آمدنی یا اخراجات تو
 DocType: Production Order,Required Items,مطلوبہ اشیاء
 DocType: Stock Ledger Entry,Stock Value Difference,اسٹاک کی قیمت فرق
@@ -3669,7 +3671,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,مقرر مقاصد آئٹم گروپ وار اس کی فروخت کے شخص کے لئے.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],جھروکے سٹاکس بڑی عمر کے مقابلے [دنوں]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,صف # {0}: اثاثہ فکسڈ اثاثہ خرید / فروخت کے لئے لازمی ہے
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",دو یا زیادہ قیمتوں کا تعین قواعد مندرجہ بالا شرائط پر مبنی پایا جاتا ہے تو، ترجیح کا اطلاق ہوتا ہے. ڈیفالٹ قدر صفر (خالی) ہے جبکہ ترجیح 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.,مندرجہ ذیل صارفین بلاک دنوں کے لئے چھوڑ درخواستیں منظور کرنے کی اجازت دیں.
@@ -3692,7 +3694,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,اس کے بعد سے نظر انداز کر دیا آئٹم {0} اسٹاک شے نہیں ہے
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",ایک مخصوص ٹرانزیکشن میں قیمتوں کا تعین اصول لاگو نہیں کرنے کے لئے، تمام قابل اطلاق قیمتوں کا تعین قواعد غیر فعال کیا جانا چاہئے.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",ایک مخصوص ٹرانزیکشن میں قیمتوں کا تعین اصول لاگو نہیں کرنے کے لئے، تمام قابل اطلاق قیمتوں کا تعین قواعد غیر فعال کیا جانا چاہئے.
 DocType: Assessment Group,Parent Assessment Group,والدین کا تعین گروپ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,نوکریاں
 ,Sales Order Trends,سیلز آرڈر رجحانات
@@ -3703,7 +3705,7 @@
 DocType: Stock Entry Detail,Additional Cost,اضافی لاگت
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,مالی سال کی آخری تاریخ
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",واؤچر نمبر کی بنیاد پر فلٹر کر سکتے ہیں، واؤچر کی طرف سے گروپ ہے
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,پردایک کوٹیشن بنائیں
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,پردایک کوٹیشن بنائیں
 DocType: Quality Inspection,Incoming,موصولہ
 DocType: BOM,Materials Required (Exploded),مواد (دھماکے) کی ضرورت
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",اپنے آپ کے علاوہ، آپ کی تنظیم کے صارفین کو شامل کریں
@@ -3731,6 +3733,7 @@
 DocType: Employee,History In Company,کمپنی کی تاریخ
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,خبرنامے
 DocType: Stock Ledger Entry,Stock Ledger Entry,اسٹاک لیجر انٹری
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,کسٹمر&gt; کسٹمر گروپ&gt; علاقہ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,ایک ہی شے کے کئی بار داخل کیا گیا ہے
 DocType: Department,Leave Block List,بلاک فہرست چھوڑ دو
 DocType: Sales Invoice,Tax ID,ٹیکس شناخت
@@ -3753,18 +3756,18 @@
 DocType: Purchase Invoice,Return,واپس
 DocType: Production Order Operation,Production Order Operation,پروڈکشن آرڈر آپریشن
 DocType: Pricing Rule,Disable,غیر فعال کریں
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,ادائیگی کا طریقہ ایک ادائیگی کرنے کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,ادائیگی کا طریقہ ایک ادائیگی کرنے کے لئے کی ضرورت ہے
 DocType: Project Task,Pending Review,زیر جائزہ
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",یہ پہلے سے ہی ہے کے طور پر اثاثہ {0}، ختم نہیں کیا جا سکتا {1}
 DocType: Task,Total Expense Claim (via Expense Claim),(خرچ دعوی ذریعے) کل اخراجات کا دعوی
 apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,کسٹمر کی شناخت
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,مارک غائب
 DocType: Journal Entry Account,Exchange Rate,زر مبادلہ کی شرح
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,سیلز آرڈر {0} پیش نہیں ہے
 DocType: Homepage,Tag Line,ٹیگ لائن
 DocType: Fee Component,Fee Component,فیس اجزاء
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,بیڑے کے انتظام
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,سے اشیاء شامل کریں
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,سے اشیاء شامل کریں
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},گودام {0}: والدین اکاؤنٹ {1} کمپنی کو bolong نہیں ہے {2}
 DocType: Cheque Print Template,Regular,باقاعدگی سے
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,تمام تشخیص کے معیار کے کل اہمیت کا ہونا ضروری ہے 100٪
@@ -3777,7 +3780,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,منتخب شے بیچ نہیں کر سکتے ہیں
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",تشخیص کی شرح کے لئے اکاؤنٹنگ اندراجات کو ایسا کرنے کی ضرورت ہے جس آئٹم {0}، کے لئے نہیں پایا {1} {2}. آئٹم میں ایک نمونہ شے کے طور transacting کر رہا ہے تو {1}، {1} آئٹم ٹیبل میں کہ ذکر کریں. دوسری صورت میں، آئٹم کے ریکارڈ میں شے یا ذکر تشخیص کی شرح کے لئے ایک آنے والے اسٹاک ٹرانزیکشن کی تخلیق، اور پھر submiting کوشش کریں / اس اندراج منسوخ کریں براہ مہربانی
 DocType: Delivery Note,% of materials delivered against this Delivery Note,مواد کی یہ ترسیل کے نوٹ کے خلاف ہونے والا
 DocType: Project,Customer Details,گاہک کی تفصیلات
@@ -3786,15 +3789,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,رسیور تعداد کے لئے یو آر ایل پیرامیٹر درج
 DocType: Payment Entry,Paid Amount,ادائیگی کی رقم
 DocType: Assessment Plan,Supervisor,سپروائزر
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,آن لائن
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,آن لائن
 ,Available Stock for Packing Items,پیکنگ اشیاء کے لئے دستیاب اسٹاک
 DocType: Item Variant,Item Variant,آئٹم مختلف
 DocType: Assessment Result Tool,Assessment Result Tool,تشخیص کے نتائج کا آلہ
 DocType: BOM Scrap Item,BOM Scrap Item,BOM سکریپ آئٹم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,پیش احکامات خارج کر دیا نہیں کیا جا سکتا
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",پہلے سے ڈیبٹ میں اکاؤنٹ بیلنس، آپ کو کریڈٹ &#39;کے طور پر کی بیلنس ہونا چاہئے&#39; قائم کرنے کی اجازت نہیں کر رہے ہیں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,معیار منظم رکھنا
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,{0} آئٹم غیر فعال ہوگئی ہے
 DocType: Employee Loan,Repay Fixed Amount per Period,فی وقفہ مقررہ رقم ادا
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},شے کے لئے مقدار درج کریں {0}
 DocType: Employee External Work History,Employee External Work History,ملازم بیرونی کام کی تاریخ
@@ -3821,7 +3824,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Student کی ای میل آئی ڈی
 DocType: Employee,Notice (days),نوٹس (دن)
 DocType: Tax Rule,Sales Tax Template,سیلز ٹیکس سانچہ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,انوائس کو بچانے کے لئے اشیاء کو منتخب کریں
 DocType: Employee,Encashment Date,معاوضہ تاریخ
 DocType: Training Event,Internet,انٹرنیٹ
 DocType: Account,Stock Adjustment,اسٹاک ایڈجسٹمنٹ
@@ -3845,7 +3848,7 @@
 DocType: Item Variant Attribute,Attribute,خاصیت
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,رینج / سے کی وضاحت کریں
 DocType: Serial No,Under AMC,AMC تحت
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,آئٹم تشخیص شرح اترا لاگت واؤچر رقم پر غور دوبارہ سے حساب لگائی ہے
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,آئٹم تشخیص شرح اترا لاگت واؤچر رقم پر غور دوبارہ سے حساب لگائی ہے
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,لین دین کی فروخت کے لئے پہلے سے طے شدہ ترتیبات.
 DocType: Guardian,Guardian Of ,کے ولی
 DocType: Grading Scale Interval,Threshold,تھریشولڈ
@@ -3855,6 +3858,7 @@
 DocType: Purchase Invoice,Debit Note Issued,ڈیبٹ نوٹ اجراء
 DocType: Production Order,Warehouses,گوداموں
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} اثاثہ منتقل نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,یہ آئٹم {0} (سانچہ) کی ایک مختلف ہے.
 DocType: Workstation,per hour,فی گھنٹہ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,پرچیزنگ
 DocType: Announcement,Announcement,اعلان
@@ -3870,8 +3874,8 @@
 DocType: Account,Receivable,وصولی
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,صف # {0}: خریداری کے آرڈر پہلے سے موجود ہے کے طور پر سپلائر تبدیل کرنے کی اجازت نہیں
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,مقرر کریڈٹ کی حد سے تجاوز ہے کہ لین دین پیش کرنے کی اجازت ہے کہ کردار.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,تیار کرنے کی اشیا منتخب کریں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",ماسٹر ڈیٹا مطابقت پذیری، اس میں کچھ وقت لگ سکتا ہے
 DocType: Item,Material Issue,مواد مسئلہ
 DocType: Hub Settings,Seller Description,فروش تفصیل
 DocType: Employee Education,Qualification,اہلیت
@@ -3895,7 +3899,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,پیش اسٹاک انٹری {0} موجود ہے کیونکہ منسوخ نہیں کر سکتے
 DocType: Employee Loan,Disbursement Date,ادائیگی کی تاریخ
 DocType: Vehicle,Vehicle,وہیکل
 DocType: Purchase Invoice,In Words,الفاظ میں
@@ -3910,14 +3914,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,بالمقابل / لیڈ٪
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,ایسیٹ Depreciations اور توازن
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},رقم {0} {1} سے منتقل کرنے {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},رقم {0} {1} سے منتقل کرنے {2} {3}
 DocType: Sales Invoice,Get Advances Received,پیشگی موصول ہو جاؤ
 DocType: Email Digest,Add/Remove Recipients,وصول کنندگان کو ہٹا دیں شامل کریں /
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},ٹرانزیکشن روک پیداوار کے خلاف کی اجازت نہیں آرڈر {0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",، پہلے سے طے شدہ طور پر اس مالی سال مقرر کرنے کیلئے &#39;پہلے سے طے شدہ طور پر مقرر کریں&#39; پر کلک کریں
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,شامل ہوں
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,کمی کی مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,آئٹم ویرینٹ {0} اسی صفات کے ساتھ موجود
 DocType: Employee Loan,Repay from Salary,تنخواہ سے ادا
 DocType: Leave Application,LAP/,LAP /
 DocType: Salary Slip,Salary Slip,تنخواہ پرچی
@@ -3934,7 +3938,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,تشخیص کے نتائج کا تفصیل
 DocType: Employee Education,Employee Education,ملازم تعلیم
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,مثنی شے گروپ شے گروپ کے ٹیبل میں پایا
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,یہ شے کی تفصیلات بازیافت کرنے کی ضرورت ہے.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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} پہلے سے حاصل کیا گیا ہے
@@ -3943,7 +3947,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",گودام {0} کسی بھی اکاؤنٹ سے منسلک نہیں ہے، / گودام کے لئے اسی (اثاثہ) اکاؤنٹ لنک بنانے کے لئے براہ مہربانی.
 DocType: Purchase Invoice,Recurring Id,مکرر شناخت
 DocType: Customer,Sales Team Details,سیلز ٹیم تفصیلات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,مستقل طور پر خارج کر دیں؟
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,مستقل طور پر خارج کر دیں؟
 DocType: Expense Claim,Total Claimed Amount,کل دعوی رقم
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,فروخت کے لئے ممکنہ مواقع.
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},غلط {0}
@@ -3954,13 +3958,14 @@
 DocType: Warehouse,PIN,PIN
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,ERPNext میں اپنے سکول کا سیٹ اپ
 DocType: Sales Invoice,Base Change Amount (Company Currency),بیس بدلیں رقم (کمپنی کرنسی)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,مندرجہ ذیل گوداموں کے لئے کوئی اکاؤنٹنگ اندراجات
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,آخری آرڈر رقم
+DocType: Task,Is Milestone,سنگ میل ہے
 DocType: Daily Work Summary,Email Sent To,ای میل بھیجا
 DocType: Budget,Warn,انتباہ
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",کسی بھی دوسرے ریمارکس، ریکارڈ میں جانا چاہئے کہ قابل ذکر کوشش.
@@ -3981,7 +3986,7 @@
 DocType: Item Attribute Value,Attribute Value,ویلیو وصف
 ,Itemwise Recommended Reorder Level,Itemwise ترتیب لیول سفارش
 DocType: Salary Detail,Salary Detail,تنخواہ تفصیل
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,پہلے {0} براہ مہربانی منتخب کریں
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,آئٹم کے بیچ {0} {1} ختم ہو گیا ہے.
 DocType: Sales Invoice,Commission,کمیشن
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,مینوفیکچرنگ کے لئے وقت شیٹ.
@@ -3993,41 +3998,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`جھروکے سٹاکس پرانے Than`٪ d دن سے چھوٹا ہونا چاہئے.
 DocType: Tax Rule,Purchase Tax Template,ٹیکس سانچہ خریداری
 ,Project wise Stock Tracking,پروجیکٹ وار اسٹاک ٹریکنگ
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},بحالی کے شیڈول {0} کے خلاف موجود {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),(ماخذ / ہدف میں) اصل مقدار
 DocType: Item Customer Detail,Ref Code,ممبران کوڈ
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,ملازم کے ریکارڈ.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,مقرر مہربانی اگلا ہراس تاریخ
 DocType: HR Settings,Payroll Settings,پے رول کی ترتیبات
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,غیر منسلک انوائس اور ادائیگی ملاپ.
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,حکم صادر کریں
 DocType: Email Digest,New Purchase Orders,نئی خریداری کے آرڈر
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,روٹ والدین لاگت مرکز نہیں کر سکتے ہیں
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,منتخب برانڈ ہے ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,منتخب برانڈ ہے ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,کے طور پر ہراس جمع
 DocType: Sales Invoice,C-Form Applicable,سی فارم لاگو
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},آپریشن کے وقت کے آپریشن کے لئے زیادہ سے زیادہ 0 ہونا ضروری ہے {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,گودام لازمی ہے
 DocType: Supplier,Address and Contacts,ایڈریس اور رابطے
 DocType: UOM Conversion Detail,UOM Conversion Detail,UOM تبادلوں تفصیل
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),100px کی طرف سے (ڈبلیو) ویب چھپنے 900px رکھو (H)
 DocType: Program,Program Abbreviation,پروگرام کا مخفف
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,پروڈکشن آرڈر شے سانچہ خلاف اٹھایا نہیں کیا جا سکتا
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,چارجز ہر شے کے خلاف خریداری کی رسید میں اپ ڈیٹ کیا جاتا ہے
 DocType: Warranty Claim,Resolved By,کی طرف سے حل
 DocType: Bank Guarantee,Start Date,شروع کرنے کی تاریخ
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,ایک مدت کے لئے پتے مختص.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,چیک اور ڈپازٹس غلط کی منظوری دے دی
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,اکاؤنٹ {0}: آپ والدین کے اکاؤنٹ کے طور پر خود کی وضاحت نہیں کر سکتے ہیں
 DocType: Purchase Invoice Item,Price List Rate,قیمت کی فہرست شرح
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,کسٹمر کی قیمت درج بنائیں
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,کسٹمر کی قیمت درج بنائیں
 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 +38,Bill of Materials (BOM),مواد کے بل (BOM)
 DocType: Item,Average time taken by the supplier to deliver,سپلائر کی طرف سے اٹھائے اوسط وقت فراہم کرنے کے لئے
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,تشخیص کے نتائج
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,گھنٹے
 DocType: Project,Expected Start Date,متوقع شروع کرنے کی تاریخ
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,الزامات اس شے پر لاگو نہیں ہے تو ہم شے کو ہٹا دیں
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,ٹرانزیکشن کی کرنسی ادائیگی کے گیٹ وے کرنسی کے طور پر ایک ہی ہونا چاہیے
 DocType: Payment Entry,Receive,وصول
@@ -4041,14 +4045,14 @@
 DocType: Asset,Disposal Date,ڈسپوزل تاریخ
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",ای میلز، دی وقت کمپنی کے تمام فعال ملازمین کو بھیجی جائے گی وہ چھٹی نہیں ہے تو. جوابات کا خلاصہ آدھی رات کو بھیجا جائے گا.
 DocType: Employee Leave Approver,Employee Leave Approver,ملازم کی رخصت کی منظوری دینے والا
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},صف {0}: ایک ترتیب اندراج پہلے ہی اس گودام کے لئے موجود ہے {1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",کوٹیشن بنا دیا گیا ہے کیونکہ، کے طور پر کھو نہیں بتا سکتے.
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,ٹریننگ کی رائے
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,آرڈر {0} پیش کرنا ضروری ہے پیداوار
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},شے کے لئے شروع کرنے کی تاریخ اور اختتام تاریخ کا انتخاب کریں براہ کرم {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,تاریخ کی تاریخ کی طرف سے پہلے نہیں ہو سکتا
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DOCTYPE
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,/ ترمیم قیمتیں شامل
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,/ ترمیم قیمتیں شامل
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Batch,Parent Batch,والدین بیچ
 DocType: Cheque Print Template,Cheque Print Template,چیک پرنٹ سانچہ
@@ -4061,7 +4065,7 @@
 ,Ordered Items To Be Delivered,کو حکم دیا اشیاء فراہم کرنے کے لئے
 DocType: Account,Income,انکم
 DocType: Industry Type,Industry Type,صنعت کی قسم
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,کچھ غلط ہو گیا!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,کچھ غلط ہو گیا!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,انتباہ: چھوڑ درخواست مندرجہ ذیل بلاک تاریخوں پر مشتمل ہے
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,انوائس {0} پہلے ہی پیش کیا گیا ہے فروخت
 DocType: Assessment Result Detail,Score,اسکور
@@ -4091,17 +4095,17 @@
 DocType: Item,Variant Based On,ویرینٹ بنیاد پر
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},100٪ ہونا چاہئے تفویض کل اہمیت. یہ {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,اپنے سپلائرز
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,سیلز آرڈر بنایا گیا ہے کے طور پر کھو کے طور پر مقرر کر سکتے ہیں.
 DocType: Request for Quotation Item,Supplier Part No,پردایک حصہ نہیں
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,کی طرف سے موصول
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',زمرہ &#39;تشخیص&#39; یا &#39;Vaulation اور کل&#39; کے لیے ہے جب کٹوتی نہیں کی جا سکتی
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,کی طرف سے موصول
 DocType: Lead,Converted,تبدیل
 DocType: Item,Has Serial No,سیریل نہیں ہے
 DocType: Employee,Date of Issue,تاریخ اجراء
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: سے {0} کے لئے {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: سے {0} کے لئے {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},صف # {0}: شے کے لئے مقرر پردایک {1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,صف {0}: گھنٹے قدر صفر سے زیادہ ہونا چاہیے.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,ویب سائٹ تصویری {0} آئٹم {1} سے منسلک نہیں مل سکتا
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,ویب سائٹ پر ایک سے زیادہ گروہوں میں اس شے کی فہرست.
@@ -4110,20 +4114,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,آپ منجمد قیمت مقرر کرنے کی اجازت نہیں ہے
 DocType: Payment Reconciliation,Get Unreconciled Entries,Unreconciled لکھے حاصل
 DocType: Payment Reconciliation,From Invoice Date,انوائس کی تاریخ سے
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,بلنگ کی کرنسی comapany کی یا تو ڈیفالٹ کرنسی یا پارٹی کے اکاؤنٹ کی کرنسی کے برابر ہونا چاہیے
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,معاوضہ چھوڑ دو
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,یہ کیا کرتا ہے؟
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,گودام میں
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,تمام طالب علم داخلہ
 ,Average Commission Rate,اوسط کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,&#39;ہاں&#39; ہونا غیر اسٹاک شے کے لئے نہیں کر سکتے ہیں &#39;سیریل نہیں ہے&#39;
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,حاضری مستقبل کی تاریخوں کے لئے نشان لگا دیا گیا نہیں کیا جا سکتا
 DocType: Pricing Rule,Pricing Rule Help,قیمتوں کا تعین حکمرانی کی مدد
 DocType: School House,House Name,ایوان نام
 DocType: Purchase Taxes and Charges,Account Head,اکاؤنٹ ہیڈ
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,اشیاء کی قیمت کا حساب کرنے اترا اضافی اخراجات کو اپ ڈیٹ کریں
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,الیکٹریکل
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,آپ کے صارفین کے طور پر آپ کی تنظیم کے باقی میں شامل کریں. آپ بھی رابطے سے انہیں شامل کر کے اپنے پورٹل پر صارفین کی دعوت دیتے ہیں شامل کر سکتے ہیں
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,آپ کے صارفین کے طور پر آپ کی تنظیم کے باقی میں شامل کریں. آپ بھی رابطے سے انہیں شامل کر کے اپنے پورٹل پر صارفین کی دعوت دیتے ہیں شامل کر سکتے ہیں
 DocType: Stock Entry,Total Value Difference (Out - In),کل قیمت فرق (باہر - میں)
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
@@ -4132,7 +4136,7 @@
 DocType: Item,Customer Code,کسٹمر کوڈ
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},کے لئے سالگرہ کی یاد دہانی {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,آخری آرڈر کے بعد دن
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,اکاؤنٹ ڈیبٹ ایک بیلنس شیٹ اکاؤنٹ ہونا ضروری ہے
 DocType: Buying Settings,Naming Series,نام سیریز
 DocType: Leave Block List,Leave Block List Name,بلاک کریں فہرست کا نام چھوڑ دو
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,انشورنس تاریخ آغاز انشورنس تاریخ اختتام سے کم ہونا چاہئے
@@ -4147,9 +4151,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},ملازم کی تنخواہ کی پرچی {0} کے پاس پہلے وقت شیٹ کے لئے پیدا {1}
 DocType: Vehicle Log,Odometer,مسافت پیما
 DocType: Sales Order Item,Ordered Qty,کا حکم دیا مقدار
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,آئٹم {0} غیر فعال ہے
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,آئٹم {0} غیر فعال ہے
 DocType: Stock Settings,Stock Frozen Upto,اسٹاک منجمد تک
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM کسی بھی اسٹاک شے پر مشتمل نہیں ہے
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},سے اور مدت بار بار چلنے والی کے لئے لازمی تاریخوں کی مدت {0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,پروجیکٹ سرگرمی / کام.
 DocType: Vehicle Log,Refuelling Details,Refuelling تفصیلات
@@ -4159,8 +4163,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,آخری خریداری کی شرح نہ پایا
 DocType: Purchase Invoice,Write Off Amount (Company Currency),رقم لکھیں (کمپنی کرنسی)
 DocType: Sales Invoice Timesheet,Billing Hours,بلنگ کے اوقات
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,{0} نہیں پایا کیلئے ڈیفالٹ BOM
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,{0} نہیں پایا کیلئے ڈیفالٹ BOM
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,صف # {0}: ترتیب مقدار مقرر کریں
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,انہیں یہاں شامل کرنے کے لئے اشیاء کو تھپتھپائیں
 DocType: Fees,Program Enrollment,پروگرام کا اندراج
 DocType: Landed Cost Voucher,Landed Cost Voucher,لینڈڈ لاگت واؤچر
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},مقرر کریں {0}
@@ -4183,7 +4188,7 @@
 DocType: Maintenance Visit,Maintenance Date,بحالی کی تاریخ
 DocType: Purchase Invoice Item,Rejected Serial No,مسترد سیریل نمبر
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,سال کے آغاز کی تاریخ یا تاریخ انتہاء {0} کے ساتھ اتیویاپی ہے. سے بچنے کے لئے مقرر کی کمپنی کے لئے براہ مہربانی
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},شے کے لئے ختم ہونے کی تاریخ سے کم ہونا چاہئے شروع کرنے کی تاریخ {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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,اپ لوڈ کریں حاضری
@@ -4258,7 +4263,6 @@
 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,ایک سے زیادہ گروہوں میں شے کی کراس لسٹنگ
-DocType: Grade Interval,Grade Interval,گریڈ وقفہ
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},مالی سال شروع کرنے کی تاریخ اور مالی سال کے اختتام تاریخ پہلے ہی مالی سال میں مقرر کیا جاتا ہے {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,کلیئرنس کی تاریخ اپ ڈیٹ
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,سپلٹ بیچ
@@ -4303,14 +4307,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,انینترت چھوڑ دو آپ کو کورس کی بنیاد پر گروہوں بنانے کے دوران بیچ میں غور کرنے کے لئے نہیں کرنا چاہتے تو.
 DocType: Asset,Frequency of Depreciation (Months),فرسودگی کے تعدد (مہینے)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,کریڈٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,کریڈٹ اکاؤنٹ
 DocType: Landed Cost Item,Landed Cost Item,لینڈڈ شے کی قیمت
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,صفر اقدار دکھائیں
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,شے کی مقدار خام مال کی دی گئی مقدار سے repacking / مینوفیکچرنگ کے بعد حاصل
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,سیٹ اپ میری تنظیم کے لئے ایک سادہ ویب سائٹ
 DocType: Payment Reconciliation,Receivable / Payable Account,وصولی / قابل ادائیگی اکاؤنٹ
 DocType: Delivery Note Item,Against Sales Order Item,سیلز آرڈر آئٹم خلاف
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},وصف کے لئے قدر وصف کی وضاحت کریں {0}
 DocType: Item,Default Warehouse,پہلے سے طے شدہ گودام
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},بجٹ گروپ کے اکاؤنٹ کے خلاف مقرر نہیں کیا جا سکتا {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,والدین لاگت مرکز درج کریں
@@ -4356,7 +4360,7 @@
 DocType: Opportunity Item,Basic Rate,بنیادی شرح
 DocType: GL Entry,Credit Amount,کریڈٹ کی رقم
 DocType: Cheque Print Template,Signatory Position,دستخط پوزیشن
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,رکن کی نمائندہ تصویر کے طور پر مقرر
 DocType: Timesheet,Total Billable Hours,کل بل قابل گھنٹے
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,ادائیگی کی رسید نوٹ
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,یہ کسٹمر کے خلاف لین دین کی بنیاد پر ہے. تفصیلات کے لئے نیچے ٹائم لائن ملاحظہ کریں
@@ -4369,11 +4373,11 @@
 ,Items To Be Requested,اشیا درخواست کی جائے
 DocType: Purchase Order,Get Last Purchase Rate,آخری خریداری کی شرح حاصل
 DocType: Company,Company Info,کمپنی کی معلومات
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,منتخب یا نئے گاہک شامل
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,منتخب یا نئے گاہک شامل
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,لاگت مرکز ایک اخراجات کے دعوی کی بکنگ کے لئے کی ضرورت ہے
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),فنڈز (اثاثے) کی درخواست
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,یہ اس ملازم کی حاضری پر مبنی ہے
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,ڈیبٹ اکاؤنٹ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,ڈیبٹ اکاؤنٹ
 DocType: Fiscal Year,Year Start Date,سال شروع کرنے کی تاریخ
 DocType: Attendance,Employee Name,ملازم کا نام
 DocType: Sales Invoice,Rounded Total (Company Currency),مدور کل (کمپنی کرنسی)
@@ -4381,12 +4385,12 @@
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{0} {1} has been modified. Please refresh.,{0} {1} نظر ثانی کی گئی ہے. ریفریش کریں.
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,مندرجہ ذیل دنوں میں رخصت کی درخواستیں کرنے سے صارفین کو روکنے کے.
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,خریداری کی رقم
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,اختتام سال شروع سال سے پہلے نہیں ہو سکتا
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,ملازم فوائد
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} نہیں موجود
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,گاہکوں کو اٹھایا بل.
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,پروجیکٹ کی شناخت
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},صف کوئی {0}: رقم خرچ دعوی {1} کے خلاف زیر التواء رقم سے زیادہ نہیں ہو سکتا. زیر التواء رقم ہے {2}
@@ -4395,15 +4399,17 @@
 DocType: Quality Inspection Reading,Reading 3,3 پڑھنا
 ,Hub,حب
 DocType: GL Entry,Voucher Type,واؤچر کی قسم
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,قیمت کی فہرست پایا یا معذور نہیں
 DocType: Employee Loan Application,Approved,منظور
 DocType: Pricing Rule,Price,قیمت
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0} مقرر کیا جانا چاہئے پر فارغ ملازم &#39;بائیں&#39; کے طور پر
 DocType: Guardian,Guardian,گارڈین
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,تشخیص {0} {1} مقررہ تاریخ کی حد میں ملازم کے لئے پیدا
 DocType: Employee,Education,تعلیم
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,ڈیل
 DocType: Selling Settings,Campaign Naming By,مہم کا نام دینے
 DocType: Employee,Current Address Is,موجودہ پتہ ہے
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,نظر ثانی کی
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",اختیاری. کی وضاحت نہیں کی ہے تو، کمپنی کے پہلے سے طے شدہ کرنسی سیٹ.
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,اکاؤنٹنگ جرنل اندراج.
 DocType: Delivery Note Item,Available Qty at From Warehouse,گودام سے پر دستیاب مقدار
@@ -4412,7 +4418,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},صف {0}: پارٹی / اکاؤنٹ کے ساتھ میل نہیں کھاتا {1} / {2} میں {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,ایکسپینس اکاؤنٹ درج کریں
 DocType: Account,Stock,اسٹاک
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",صف # {0}: حوالہ دستاویز کی قسم خریداری کے آرڈر میں سے ایک، انوائس خریداری یا جرنل اندراج ہونا ضروری ہے
 DocType: Employee,Current Address,موجودہ پتہ
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",واضح طور پر مخصوص جب تک شے تو وضاحت، تصویر، قیمتوں کا تعین، ٹیکس سانچے سے مقرر کیا جائے گا وغیرہ کسی اور شے کی ایک مختلف ہے تو
 DocType: Serial No,Purchase / Manufacture Details,خریداری / تیاری تفصیلات
@@ -4440,7 +4446,7 @@
 DocType: Hub Settings,Hub Settings,حب ترتیبات
 DocType: Project,Gross Margin %,مجموعی مارجن٪
 DocType: BOM,With Operations,آپریشن کے ساتھ
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,اکاؤنٹنگ اندراجات پہلے ہی کرنسی میں بنایا گیا ہے {0} کمپنی کے لئے {1}. کرنسی کے ساتھ ایک وصولی یا قابل ادائیگی اکاؤنٹ منتخب کریں {0}.
 DocType: Asset,Is Existing Asset,اثاثہ موجود ہے
 DocType: Salary Detail,Statistical Component,شماریاتی اجزاء
 ,Monthly Salary Register,ماہانہ تنخواہ رجسٹر
@@ -4463,7 +4469,7 @@
 DocType: Assessment Plan,Room,کمرہ
 DocType: Purchase Order,Advance Paid,ایڈوانس ادا
 DocType: Item,Item Tax,آئٹم ٹیکس
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,سپلائر مواد
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,سپلائر مواد
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,ایکسائز انوائس
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}٪ ایک بار سے زیادہ ظاہر ہوتا ہے
 DocType: Expense Claim,Employees Email Id,ملازمین ای میل کی شناخت
@@ -4494,9 +4500,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,علامت (لوگو) منسلک کریں
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,اسٹاک کی سطح
 DocType: Customer,Commission Rate,کمیشن کی شرح
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,مختلف بنائیں
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,مختلف بنائیں
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,محکمہ کی طرف سے بلاک چھٹی ایپلی کیشنز.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",ادائیگی کی قسم، وصول میں سے ایک ہو تنخواہ اور اندرونی منتقلی ضروری ہے
 apps/erpnext/erpnext/config/selling.py +179,Analytics,تجزیات
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,ٹوکری خالی ہے
 DocType: Vehicle,Model,ماڈل
@@ -4507,6 +4513,7 @@
 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 +161,Capital Stock,دارالحکومت اسٹاک
+DocType: Shopping Cart Settings,Show Public Attachments,پبلک منسلک دکھائیں
 DocType: Packing Slip,Package Weight Details,پیکیج وزن تفصیلات
 DocType: Payment Gateway Account,Payment Gateway Account,ادائیگی کے گیٹ وے اکاؤنٹ
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,ادائیگی مکمل ہونے کے بعد منتخب صفحے پر صارف ری.
@@ -4525,15 +4532,15 @@
 DocType: Batch,Expiry Date,خاتمے کی تاریخ
 ,Supplier Addresses and Contacts,پردایک پتے اور رابطے
 ,accounts-browser,اکاؤنٹس براؤزر
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,پہلے زمرہ منتخب کریں
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,پہلے زمرہ منتخب کریں
 apps/erpnext/erpnext/config/projects.py +13,Project master.,پروجیکٹ ماسٹر.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",زیادہ بلنگ یا زیادہ حکم دینے کی اجازت دیتے ہیں کے لئے، سٹاک ترتیبات یا آئٹم میں اپ ڈیٹ &quot;بھتہ&quot;.
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,کرنسیاں وغیرہ $ طرح کسی بھی علامت اگلے ظاہر نہیں کیا.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),آدھا دن
 DocType: Supplier,Credit Days,کریڈٹ دنوں
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Student کی بیچ بنائیں
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Student کی بیچ بنائیں
 DocType: Leave Type,Is Carry Forward,فارورڈ لے
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,BOM سے اشیاء حاصل
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,BOM سے اشیاء حاصل
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,وقت دن کی قیادت
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},صف # {0}: تاریخ پوسٹنگ خریداری کی تاریخ کے طور پر ایک ہی ہونا چاہیے {1} اثاثہ کی {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,مندرجہ بالا جدول میں سیلز آرڈر درج کریں
@@ -4550,8 +4557,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,منظور رقم
 DocType: GL Entry,Is Opening,افتتاحی ہے
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},صف {0}: ڈیبٹ اندراج کے ساتھ منسلک نہیں کیا جا سکتا ہے {1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,سیٹ اپ&gt; سیٹ اپ کے ذریعے حاضری کے لئے سیریز کی تعداد مہربانی نمبر سیریز
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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 7930125..0905397 100644
--- a/erpnext/translations/vi.csv
+++ b/erpnext/translations/vi.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,Thuê
 DocType: Purchase Order,PO-,tiềm
 DocType: POS Profile,Applicable for User,Áp dụng cho User
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel","Ngưng tự sản xuất không thể được hủy bỏ, rút nút nó đầu tiên để hủy bỏ"
 DocType: Vehicle Service,Mileage,Mileage
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,Bạn có thực sự muốn tháo dỡ tài sản này?
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,Chọn Mặc định Nhà cung cấp
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,Chọn Mặc định Nhà cung cấp
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},Tiền tệ là cần thiết cho Danh sách Price {0}
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,* Sẽ được tính toán trong giao dịch.
 DocType: Purchase Order,Customer Contact,Liên hệ Khách hàng
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),Xuất sắc cho {0} không thể nhỏ hơn không ({1})
 DocType: Manufacturing Settings,Default 10 mins,Mặc định 10 phút
 DocType: Leave Type,Leave Type Name,Loại bỏ Tên
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,Hiện mở
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,Hiện mở
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,Loạt Cập nhật thành công
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,Kiểm tra
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural Journal nhập Đăng
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,Đợt hàng hết hạn Status
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,Bank Draft
 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 +58,Show Variants,Hiện biến thể
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,Hiện biến thể
 DocType: Academic Term,Academic Term,Thời hạn học tập
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,Vật chất
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,Số lượng
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,Số lượng
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,Bảng tài khoản không được bỏ trống
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),Các khoản vay (Nợ phải trả)
 DocType: Employee Education,Year of Passing,Year of Passing
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s","Tham khảo:% s, mục Code:% s và khách hàng:% s"
 DocType: Item,Country of Origin,Nước sản xuất
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,Trong tồn kho
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,Các vấn đề mở
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,Chăm sóc sức khỏe
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),Chậm trễ trong thanh toán (Ngày)
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,Chi phí dịch vụ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,Hóa đơn
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},Số sê-ri: {0} đã được tham chiếu trong Hóa đơn bán hàng: {1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,Hóa đơn
 DocType: Maintenance Schedule Item,Periodicity,Tính tuần hoàn
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,Năm tài chính {0} là cần thiết
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,Dự kiến giao hàng ngày là được trước khi bán hàng đặt hàng ngày
@@ -106,29 +106,31 @@
 DocType: BOM,Operations,Tác vụ
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},Không thể thiết lập ủy quyền trên cơ sở giảm giá cho {0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name","Đính kèm tập tin .csv với hai cột, một cho tên tuổi và một cho tên mới"
-apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} không trong bất kỳ năm tài chính hoạt động.
+apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} không trong bất kỳ năm tài chính đang hoạt động.
 DocType: Packed Item,Parent Detail docname,Cha mẹ chi tiết docname
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}","Tham khảo: {0}, Mã hàng: {1} và Khách hàng: {2}"
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,Kg
 DocType: Student Log,Log,Đăng nhập
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,Mở đầu cho một công việc.
 DocType: Item Attribute,Increment,Tăng
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,Chọn nhà kho ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,Chọn nhà kho ...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,Quảng cáo
 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/purchase_invoice/purchase_invoice.js +556,Get items from,Lấy dữ liệu từ
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},Không được phép cho {0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,Lấy dữ liệu từ
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},Hàng tồn kho không thể được cập nhật gắn với giấy giao hàng {0}
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},Sản phẩm {0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,Không có mục nào được liệt kê
 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
 DocType: Process Payroll,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/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,Tiếp Khấu hao ngày không được trước ngày mua hàng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,Tiếp Khấu hao ngày không được trước ngày mua hàng
 DocType: SMS Center,All Sales Person,Tất cả nhân viên kd
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,** Phân phối hàng tháng ** giúp bạn phân phối Ngân sách/Mục tiêu hàngtháng nếu việc kinh doanh của bạn có tính thời vụ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,Không tìm thấy mặt hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,Không tìm thấy mặt hàng
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,Cơ cấu tiền lương Thiếu
 DocType: Lead,Person Name,Tên người
 DocType: Sales Invoice Item,Sales Invoice Item,Hóa đơn bán hàng hàng
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",ví dụ: &quot;Trường Tiểu học&quot; hay &quot;Đại học&quot;
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,Báo cáo hàng tồn kho
 DocType: Warehouse,Warehouse Detail,Chi tiết kho
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},Hạn mức tín dụng đã được thông qua cho khách hàng {0} {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,Những ngày cuối kỳ không thể muộn hơn so với ngày cuối năm của năm học mà thuật ngữ này được liên kết (Academic Year {}). Xin vui lòng sửa ngày và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại cùng hạng mục"
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item","""Là Tài Sản Cố Định"" không thể bỏ đánh dấu, vì bản ghi Tài Sản tồn tại cùng hạng mục"
 DocType: Vehicle Service,Brake Oil,dầu phanh
 DocType: Tax Rule,Tax Type,Loại thuế
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},Bạn không được phép thêm hoặc cập nhật bút toán trước ngày {0}
 DocType: BOM,Item Image (if not slideshow),Mục Hình ảnh (nếu không slideshow)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,tên khách hàng đã tồn tại
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,(Hour Rate / 60) * Thời gian hoạt động thực tế
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,Chọn BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,Chọn BOM
 DocType: SMS Log,SMS Log,Đăng nhập tin nhắn SMS
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,Chi phí của mục Delivered
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,Các kỳ nghỉ trên {0} không phải là giữa Từ ngày và Đến ngày
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,trường học
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},Không có hồ sơ nghỉ tìm thấy cho nhân viên {0} cho {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,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 +333,Please select Company first,Vui lòng chọn Công ty đầu tiên
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +27,Target On,Mục tiêu trên
 DocType: BOM,Total Cost,Tổng chi phí
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,Số tiền yêu cầu bồi thường
 DocType: Employee,Mr,Ông
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,nhóm khách hàng trùng lặp được tìm thấy trong bảng nhóm cutomer
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,Loại nhà cung cấp / Nhà cung cấp
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,Loại nhà cung cấp / Nhà cung cấp
 DocType: Naming Series,Prefix,Tiền tố
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,Tiêu hao
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,Cấp
 DocType: Sales Invoice Item,Delivered By Supplier,Giao By Nhà cung cấp
 DocType: SMS Center,All Contact,Tất cả Liên hệ
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,Sản xuất theo thứ tự đã được tạo ra cho tất cả các mục có BOM
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,Mức lương hàng năm
 DocType: Daily Work Summary,Daily Work Summary,Tóm tắt công việc hàng ngày
 DocType: Period Closing Voucher,Closing Fiscal Year,Đóng cửa năm tài chính
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0}{1} bị đóng băng
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0}{1} bị đóng băng
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,Vui lòng chọn Công ty hiện có để tạo biểu đồ của tài khoản
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,Chi phí hàng tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,Chọn Kho mục tiêu
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,Contra nhập
 DocType: Journal Entry Account,Credit in Company Currency,Tín dụng tại Công ty ngoại tệ
 DocType: Delivery Note,Installation Status,Tình trạng cài đặt
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",Bạn có muốn cập nhật tham dự? <br> Trình bày: {0} \ <br> Vắng mặt: {1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},Số lượng chấp nhận + từ chối phải bằng số lượng giao nhận {0}
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,Cung cấp nguyên liệu thô cho Purchase
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,Ít nhất một phương thức thanh toán là cần thiết cho POS hóa đơn.
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,Ít nhất một phương thức thanh toán là cần thiết cho POS hóa đơn.
 DocType: Products Settings,Show Products as a List,Hiện sản phẩm như một List
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","Tải file mẫu, điền dữ liệu thích hợp và đính kèm các tập tin sửa đổi.
@@ -224,12 +226,12 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,Hãy Khấu hao nhập
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,Yêu cầu Loại
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,làm nhân viên
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,làm nhân viên
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,Phát thanh truyền hình
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,Thực hiện
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,Chi tiết về các hoạt động thực hiện.
 DocType: Serial No,Maintenance Status,Tình trạng bảo trì
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Nhà cung cấp là cần thiết cho đối với Khoản phải trả {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}: Cần nhập Nhà cung cấp là đối với Khoản phải trả {2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,Hàng hóa và giá cả
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},Tổng số giờ: {0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,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}
@@ -240,6 +242,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,Lập kế hoạch cho lần bảo trì.
 DocType: SMS Settings,Enter url parameter for message,Nhập tham số url cho tin nhắn
 DocType: POS Profile,Customer Groups,Nhóm khách hàng
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,Báo cáo tài chính
 DocType: Guardian,Students,Sinh viên
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,Quy tắc áp dụng giá và giảm giá.
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,Bảng giá phải được áp dụng cho mua hàng hoặc bán hàng
@@ -265,11 +268,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},số tiền tạm ứng không có thể lớn hơn {0} {1}
 DocType: Naming Series,Series List for this Transaction,Danh sách loạt cho các giao dịch này
 DocType: Company,Default Payroll Payable Account,Mặc định lương Account Payable
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,Cập nhật Email Nhóm
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,Cập nhật Email Nhóm
 DocType: Sales Invoice,Is Opening Entry,Được mở cửa nhập
 DocType: Customer Group,Mention if non-standard receivable account applicable,Đề cập đến nếu tài khoản phải thu phi tiêu chuẩn áp dụng
 DocType: Course Schedule,Instructor Name,Tên giảng viên
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,Kho cho là cần thiết trước khi Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,Kho cho là cần thiết trước khi Submit
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,Nhận được Mở
 DocType: Sales Partner,Reseller,Đại lý bán lẻ
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.","Nếu được chọn, sẽ bao gồm các mặt hàng không cổ phần trong các yêu cầu vật liệu."
@@ -277,7 +280,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,Theo hàng hóa có hóa đơn
 ,Production Orders in Progress,Đơn đặt hàng sản xuất trong tiến độ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,Tiền thuần từ tài chính
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save","Cục bộ là đầy đủ, không lưu"
 DocType: Lead,Address & Contact,Địa chỉ & Liên hệ
 DocType: Leave Allocation,Add unused leaves from previous allocations,Thêm lá không sử dụng từ phân bổ trước
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},Tiếp theo định kỳ {0} sẽ được tạo ra trên {1}
@@ -303,8 +306,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),Tổng số Costing Số tiền (thông qua Time Sheet)
 DocType: Item Website Specification,Item Website Specification,Mục Trang Thông số kỹ thuật
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,Lại bị chặn
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,Bút toán Ngân hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},Mục {0} đã đạt đến kết thúc của sự sống trên {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,Bút toán Ngân hàng
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,Hàng năm
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,Cổ hòa giải hàng
 DocType: Stock Entry,Sales Invoice No,Hóa đơn bán hàng không
@@ -322,8 +325,8 @@
 DocType: Item,Publish in Hub,Xuất bản trong Hub
 DocType: Student Admission,Student Admission,Nhập học sinh viên
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,Mục {0} bị hủy bỏ
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,Yêu cầu tài liệu
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,Mục {0} bị hủy bỏ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,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 +356,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}
@@ -359,10 +362,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,Séc xuất sắc và tiền gửi để xóa
 DocType: Item,Synced With Hub,Đồng bộ hóa Với Hub
 DocType: Vehicle,Fleet Manager,Hạm đội quản lý
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} không thể phủ định cho mặt hàng {2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,Sai Mật Khẩu
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},Row # {0}: {1} không thể phủ định cho mặt hàng {2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,Sai Mật Khẩu
 DocType: Item,Variant Of,Trong Variant
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',Đã hoàn thành Số lượng không có thể lớn hơn 'SL đặt Sản xuất'
 DocType: Period Closing Voucher,Closing Account Head,Đóng Trưởng Tài khoản
 DocType: Employee,External Work History,Bên ngoài Quá trình công tác
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,Thông tư tham khảo Lỗi
@@ -375,12 +378,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,Thông báo qua email trên tạo ra các yêu cầu vật liệu tự động
 DocType: Journal Entry,Multi Currency,Đa ngoại tệ
 DocType: Payment Reconciliation Invoice,Invoice Type,Loại hóa đơn
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,Giao hàng Ghi
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,Giao hàng Ghi
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,Thiết lập Thuế
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,Chi phí của tài sản bán
 apps/erpnext/erpnext/accounts/utils.py +348,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 +443,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào chỉ tiêu Thuế của khoản mục
-DocType: Grade Interval,Min Score,min Điểm
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0} Đã nhập hai lần vào chỉ tiêu Thuế của khoản mục
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,Tóm tắt cho tuần này và các hoạt động cấp phát
 DocType: Student Applicant,Admitted,Thừa nhận
 DocType: Workstation,Rent Cost,Chi phí thuê
@@ -393,7 +395,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,Giá trị đặt hàng
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,Ngân hàng / Tiền giao dịch với bên hoặc chuyển giao nội bộ
 DocType: Shipping Rule,Valid for Countries,Hợp lệ cho các nước
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,Mục này là một Template và không thể được sử dụng trong các giao dịch. Thuộc tính item sẽ được sao chép vào các biến thể trừ 'Không Copy' được thiết lập
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,Tổng số thứ tự coi
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).","Chỉ định nhân viên (ví dụ: Giám đốc điều hành, Giám đốc vv.)"
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,"Vui lòng nhập 'Lặp lại vào ngày của tháng ""giá trị trường"
@@ -402,14 +404,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},Row # {0}: Mua hóa đơn không thể được thực hiện đối với một tài sản hiện có {1}
 DocType: Item Tax,Tax Rate,Thuế suất
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0} đã được phân bổ cho nhân viên {1} cho kỳ {2} đến {3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,Chọn nhiều Item
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,Chọn nhiều Item
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,Mua hóa đơn {0} đã gửi
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,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/cost_center/cost_center.js +52,Convert to non-Group,Chuyển đổi sang non-Group
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,Lô của mục.
 DocType: C-Form Invoice Detail,Invoice Date,Hóa đơn ngày
 DocType: GL Entry,Debit Amount,Số tiền ghi nợ
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},Chỉ có thể có 1 tài khoản cho mỗi công ty trong {0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,Xin vui lòng xem file đính kèm
 DocType: Purchase Order,% Received,% Nhận Hàng
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,Tạo Sinh viên nhóm
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,Yêu cầu báo giá
 DocType: Salary Slip Timesheet,Working Hours,Giờ làm việc
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,Thay đổi bắt đầu / hiện số thứ tự của một loạt hiện có.
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,Tạo một khách hàng mới
-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.","Nếu nhiều quy giá tiếp tục chiếm ưu thế, người dùng được yêu cầu để thiết lập ưu tiên bằng tay để giải quyết xung đột."
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,Tạo đơn đặt hàng mua
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,Tạo một khách hàng mới
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.","Nếu nhiều quy giá tiếp tục chiếm ưu thế, người dùng được yêu cầu để thiết lập ưu tiên bằng tay để giải quyết xung đột."
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,Tạo đơn đặt hàng mua
 ,Purchase Register,Đăng ký mua
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,Phí áp dụng
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} ({1}) phải có vai trò 'Người duyệt chấm công nghỉ'
 DocType: Purchase Receipt,Vehicle Date,Xe ngày
 DocType: Student Log,Medical,Y khoa
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,Lý do mất
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,Lý do mất
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,Người sở hữu Tiềm năng không thể trùng với Tiềm năng
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,số lượng phân bổ có thể không lớn hơn số tiền không điều chỉnh
 DocType: Announcement,Receiver,Người nhận
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,Số lượng và giá cả
 DocType: Delivery Note,% Installed,Cài đặt%
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,Phòng học / phòng thí nghiệm vv nơi bài giảng có thể được sắp xếp.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,Vui lòng nhập tên công ty đầu tiên
 DocType: Purchase Invoice,Supplier Name,Tên nhà cung cấp
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,Đọc hướng dẫn ERPNext
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Trường Bắt buộc - Năm Học
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,Trường Bắt buộc - Năm Học
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,Tùy chỉnh văn bản giới thiệu mà đi như một phần của email đó. Mỗi giao dịch có văn bản giới thiệu riêng biệt.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},Vui lòng đặt tài khoản phải trả mặc định cho công ty {0}
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,Thiết lập chung cho tất cả quá trình sản xuất.
 DocType: Accounts Settings,Accounts Frozen Upto,Đóng băng tài khoản đến ngày
 DocType: SMS Log,Sent On,Gửi On
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,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 +640,Attribute {0} selected multiple times in Attributes Table,Thuộc tính {0} được chọn nhiều lần trong Thuộc tính Bảng
 DocType: HR Settings,Employee record is created using selected field. ,
 DocType: Sales Order,Not Applicable,Không áp dụng
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,Chủ lễ.
 DocType: Request for Quotation 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 +877,Please enter Item Code.,Vui lòng nhập Item Code.
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,Vui lòng nhập Item Code.
 DocType: BOM,Costing,Chi phí
 DocType: Tax Rule,Billing County,Quận Thanh toán
 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 giá/thành tiền khi in ra."
@@ -507,6 +511,7 @@
 DocType: Packing Slip,From Package No.,Từ gói thầu số
 DocType: Item Attribute,To Range,Thành vùng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +29,Securities and Deposits,Chứng khoán và tiền gửi
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",Không thể thay đổi phương pháp định giá vì có các giao dịch đối với một số mặt hàng không có phương pháp định giá riêng
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,Tổng số lá được giao là bắt buộc
 DocType: Job Opening,Description of a Job Opening,Mô tả công việc một Opening
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,Hoạt động cấp phát cho ngày hôm nay
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,Vui lòng chọn Khoá học
 DocType: Timesheet Detail,Hrs,giờ
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,Vui lòng chọn Công ty
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,Vui lòng chọn Công ty
 DocType: Stock Entry Detail,Difference Account,Tài khoản chênh lệch
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,Không thể nhiệm vụ gần như là nhiệm vụ của nó phụ thuộc {0} là không đóng cửa.
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,Vui lòng nhập kho mà Chất liệu Yêu cầu sẽ được nâng lên
 DocType: Production Order,Additional Operating Cost,Chi phí điều hành khác
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,Mỹ phẩm
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"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 +536,"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
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,Mua
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,Vui lòng xác định mức cho ngưỡng 0%
 DocType: Sales Order,To Deliver,Giao Hàng
 DocType: Purchase Invoice Item,Item,Hạng mục
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,Nối tiếp không có mục không thể là một phần
 DocType: Journal Entry,Difference (Dr - Cr),Sự khác biệt (Tiến sĩ - Cr)
 DocType: Account,Profit and Loss,Báo cáo kết quả hoạt động kinh doanh
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,Quản lý Hợp đồng phụ
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,Tăng không thể là 0
 DocType: Production Planning Tool,Material Requirement,Yêu cầu tài liệu
 DocType: Company,Delete Company Transactions,Xóa Giao dịch Công ty
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,Reference No và Ngày tham chiếu là bắt buộc đối với giao dịch ngân hàng
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,Reference No và Ngày tham chiếu là bắt buộc đối với giao dịch ngân hàng
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,Thêm / Sửa Thuế và phí
 DocType: Purchase Invoice,Supplier Invoice No,Nhà cung cấp hóa đơn Không
 DocType: Territory,For reference,Để tham khảo
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,Lưu ý cài đặt hàng
 DocType: Production Plan Item,Pending Qty,Pending Qty
 DocType: Budget,Ignore,Bỏ qua
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} không hoạt động
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} không hoạt động
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},SMS gửi đến số điện thoại sau: {0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,kích thước thiết lập kiểm tra cho in ấn
 DocType: Salary Slip,Salary Slip Timesheet,Mức lương trượt Timesheet
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,Tổng tiền Hoa hồng
 DocType: Pricing Rule,Sales Partner,Đại lý bán hàng
 DocType: Buying Settings,Purchase Receipt Required,Hóa đơn mua hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu mở cửa bước vào Cổ
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,Tỷ lệ đánh giá là bắt buộc nếu mở cửa bước vào Cổ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,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 +17,Please select Company and Party Type first,Vui lòng chọn Công ty và Đảng Loại đầu tiên
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,Năm tài chính / kế toán.
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,Giá trị lũy kế
 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"
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,Thực hiện bán hàng đặt hàng
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,Thực hiện bán hàng đặt hàng
 DocType: Project Task,Project Task,Dự án công tác
 ,Lead Id,Id Tiềm năng
 DocType: C-Form Invoice Detail,Grand Total,Tổng cộng
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,Resume đính kèm
 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
 DocType: Leave Control Panel,Allocate,Phân bổ
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,Bán hàng trở lại
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,Bán hàng trở lại
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,Lưu ý: Tổng lá phân bổ {0} không được nhỏ hơn lá đã được phê duyệt {1} cho giai đoạn
 DocType: Announcement,Posted By,Gửi bởi
 DocType: Item,Delivered by Supplier (Drop Ship),Cung cấp bởi Nhà cung cấp (Drop Ship)
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,Báo giá cho
 DocType: Lead,Middle Income,Thu nhập trung bình
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),Mở (Cr)
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,Số lượng phân bổ không thể phủ định
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Hãy đặt Công ty
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,Hãy đặt Công ty
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,Sales Invoice Timesheet
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},Không tham khảo và tham khảo ngày là cần thiết cho {0}
 DocType: Process Payroll,Select Payment Account to make Bank Entry,Chọn tài khoản thanh toán để làm cho Ngân hàng nhập
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll","Tạo hồ sơ nhân viên để quản lý lá, tuyên bố chi phí và biên chế"
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,Thêm vào kiến thức cơ sở
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,Đề nghị Viết
 DocType: Payment Entry Deduction,Payment Entry Deduction,Thanh toán nhập khấu trừ
@@ -655,19 +660,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0} '{1}' không thuộc năm tài chính {2}
 DocType: Buying Settings,Settings for Buying Module,Thiết lập cho module Mua hàng
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},Asset {0} không thuộc về công ty {1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,Vui lòng nhập Purchase Receipt đầu tiên
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,Please enter Purchase Receipt first,Vui lòng nhập Purchase Receipt đầu tiên
 DocType: Buying Settings,Supplier Naming By,Nhà cung cấp đặt tên By
 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.","Và các quy tắc báo giá được lọc xem dựa trên khách hàng, nhóm khách hàng, địa bàn, NCC, loại NCC, Chiến dịch, đối tác bán hàng .v..v"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.","Và các quy tắc báo giá được lọc xem dựa trên khách hàng, nhóm khách hàng, địa bàn, NCC, loại NCC, Chiến dịch, đối tác bán hàng .v..v"
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,Thay đổi ròng trong kho
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,Quản lý nhân viên vay
 DocType: Employee,Passport Number,Số hộ chiếu
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,Mối quan hệ với Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,Chi cục trưởng
 DocType: Payment Entry,Payment From / To,Thanh toán Từ / Để
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,Phạm vi ngày
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số dư hiện tại cho khách hàng. Hạn mức tín dụng phải có ít nhất {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},hạn mức tín dụng mới thấp hơn số dư hiện tại cho khách hàng. Hạn mức tín dụng phải có ít nhất {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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
@@ -676,8 +680,8 @@
 DocType: Production Order Operation,In minutes,Trong phút
 DocType: Issue,Resolution Date,Độ phân giải ngày
 DocType: Student Batch Name,Batch Name,Tên hàng loạt
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,Timesheet tạo:
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,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/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,Timesheet tạo:
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},Xin vui lòng thiết lập mặc định hoặc tiền trong tài khoản ngân hàng Phương thức thanh toán {0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,Ghi danh
 DocType: Selling Settings,Customer Naming By,đặt tên khách hàng theo
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,Sẽ hiển thị các sinh viên như hiện tại trong Student Report Attendance tháng
@@ -705,7 +709,7 @@
 DocType: Production Order Operation,Actual Start Time,Thời điểm bắt đầu thực tế
 DocType: BOM Operation,Operation Time,Thời gian hoạt động
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,Hoàn thành
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,Căn cứ
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,Căn cứ
 DocType: Timesheet,Total Billed Hours,Tổng số giờ Được xem
 DocType: Journal Entry,Write Off Amount,Viết Tắt Số tiền
 DocType: Journal Entry,Bill No,số Bill
@@ -721,7 +725,7 @@
 DocType: Student Attendance,Student Attendance,Tham dự sinh
 DocType: Sales Invoice Timesheet,Time Sheet,Thời gian biểu
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,Backflush Raw Materials Based On
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,Xin vui lòng nhập các chi tiết sản phẩm
 DocType: Interest,Interest,Quan tâm
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,Pre Sales
 DocType: Purchase Receipt,Other Details,Các chi tiết khác
@@ -732,24 +736,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,Nhập thanh toán đã được tạo ra
 DocType: Purchase Receipt Item Supplied,Current Stock,Tồn kho hiện tại
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},Dòng #{0}: Tài sản {1} không liên kết với mục {2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,Xem trước trượt Mức lương
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,Xem trước trượt Mức lương
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,Tài khoản {0} đã được nhập nhiều lần
 DocType: Account,Expenses Included In Valuation,Chi phí bao gồm trong định giá
 DocType: Hub Settings,Seller City,Người bán Thành phố
 ,Absent Student Report,Báo cáo Sinh viên vắng mặt
 DocType: Email Digest,Next email will be sent on:,Email tiếp theo sẽ được gửi về:
 DocType: Offer Letter Term,Offer Letter Term,Offer Letter Term
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,Mục có các biến thể.
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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ị tồn
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,Công ty {0} không tồn tại
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,Loại cây
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,Loại cây
 DocType: BOM Explosion Item,Qty Consumed Per Unit,Số lượng tiêu thụ trung bình mỗi đơn vị
 DocType: Serial No,Warranty Expiry Date,Ngày Bảo hành hết hạn
 DocType: Material Request Item,Quantity and Warehouse,Số lượng và kho
 DocType: Sales Invoice,Commission Rate (%),Hoa hồng Tỷ lệ (%)
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,Vui lòng chọn Chương trình
 DocType: Project,Estimated Cost,Chi phí ước tính
@@ -768,7 +770,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +93,{0} is not a stock Item,{0} không phải là 1 vật tư hàng hóa
 DocType: Mode of Payment Account,Default Account,Tài khoản mặc định
 DocType: Payment Entry,Received Amount (Company Currency),Số tiền nhận được (Công ty ngoại tệ)
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,Tiềm năng phải được thiết lập nếu Cơ hội được tạo từ Tiềm năng
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,Tiềm năng phải được thiết lập nếu Cơ hội được tạo từ Tiềm năng
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,Vui lòng chọn ngày nghỉ hàng tuần
 DocType: 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
@@ -784,6 +786,7 @@
 DocType: Opportunity,Opportunity From,Từ cơ hội
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,Báo cáo tiền lương hàng tháng.
 DocType: BOM,Website Specifications,Thông số kỹ thuật website
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}: Từ {0} của loại {1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,Hàng {0}: Chuyển đổi Factor là bắt buộc
@@ -818,6 +821,7 @@
 DocType: Employee,Bank A/C No.,Số TK Ngân hàng
 DocType: Bank Guarantee,Project,Dự án
 DocType: Quality Inspection Reading,Reading 7,Đọc 7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,Nhiều thứ tự
 DocType: Expense Claim Detail,Expense Claim Type,Loại chi phí yêu cầu bồi thường
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,Các thiết lập mặc định cho Giỏ hàng
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},Tài sản bị tháo dỡ qua Journal nhập {0}
@@ -825,14 +829,14 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +13,Biotechnology,Công nghệ sinh học
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +107,Office Maintenance Expenses,Chi phí bảo trì văn phòng
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,Thiết lập tài khoản email
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,Vui lòng nhập mục đầu tiên
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,Vui lòng nhập mục đầu tiên
 DocType: Account,Liability,Trách nhiệm
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,Số tiền bị xử phạt không thể lớn hơn so với yêu cầu bồi thường Số tiền trong Row {0}.
 DocType: Company,Default Cost of Goods Sold Account,Mặc định Chi phí tài khoản hàng bán
 apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,Danh sách giá không được chọn
 DocType: Employee,Family Background,Gia đình nền
 DocType: Request for Quotation Supplier,Send Email,Gởi thư
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},Cảnh báo: Tập tin đính kèm {0} ko hợp lệ
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,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 +50,"To filter based on Party, select Party Type first","Để lọc dựa vào Đảng, Đảng chọn Gõ đầu tiên"
@@ -845,8 +849,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,Không có nhân viên tìm thấy
 DocType: Supplier Quotation,Stopped,Đã ngưng
 DocType: Item,If subcontracted to a vendor,Nếu hợp đồng phụ với một nhà cung cấp
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,Nhóm sinh viên đã được cập nhật.
 DocType: SMS Center,All Customer Contact,Tất cả Liên hệ Khách hàng
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,Tải lên số tồn kho thông qua file csv.
 DocType: Warehouse,Tree Details,Chi tiết Tree
@@ -857,8 +861,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,Số tiền Hoá đơn tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}: Trung tâm Chi phí {2} không thuộc về Công ty {3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}: Tài khoản {2} không thể là một Nhóm
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mục Row {idx}: {DOCTYPE} {} DOCNAME không tồn tại trên &#39;{} DOCTYPE&#39; bảng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,Timesheet {0} đã được hoàn thành hoặc bị hủy bỏ
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,Mục Row {idx}: {DOCTYPE} {} DOCNAME không tồn tại trên &#39;{} DOCTYPE&#39; bảng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,Timesheet {0} đã được hoàn thành hoặc bị hủy bỏ
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,không nhiệm vụ
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc","Các ngày trong tháng mà tự động hóa đơn sẽ được tạo ra ví dụ như 05, 28 vv"
 DocType: Asset,Opening Accumulated Depreciation,Mở Khấu hao lũy kế
@@ -874,7 +878,7 @@
 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 +372,{0} against Bill {1} dated {2},{0} gắn với phiếu t.toán {1} ngày {2}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,Lịch khóa học
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,Lịch khóa học
 DocType: Maintenance Visit,Completion Status,Tình trạng hoàn thành
 DocType: HR Settings,Enter retirement age in years,Nhập tuổi nghỉ hưu trong năm
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,Mục tiêu kho
@@ -882,7 +886,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,Cho phép trên giao nhận tối đa tỷ lệ này
 DocType: Stock Entry,STE-,STE-
 DocType: Upload Attendance,Import Attendance,Nhập khẩu tham dự
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,Tất cả các nhóm hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,Tất cả các nhóm hàng
 DocType: Process Payroll,Activity Log,Nhật ký công việc
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,Lợi nhuận ròng / lỗ
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,Tự động soạn tin nhắn trên trình giao dịch.
@@ -893,7 +897,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,Mua hàng để thanh toán
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,SL của Dự án
 DocType: Sales Invoice,Payment Due Date,Thanh toán Due Date
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,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/doctype/item/item.js +341,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 +97,'Opening','Đang mở'
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,Mở để làm
 DocType: Notification Control,Delivery Note Message,Giao hàng tận nơi Lưu ý tin nhắn
@@ -909,7 +913,7 @@
 DocType: Item Reorder,Re-Order Qty,Re-trật tự Qty
 DocType: Leave Block List Date,Leave Block List Date,Để lại Danh sách Chặn ngày
 DocType: Pricing Rule,Price or Discount,Giá hoặc giảm giá
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Tổng số phí áp dụng tại Purchase bảng Receipt mục phải giống như Tổng Thuế và Phí
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,Tổng số phí áp dụng tại Purchase bảng Receipt mục phải giống như Tổng Thuế và Phí
 DocType: Sales Team,Incentives,Ưu đãi
 DocType: SMS Log,Requested Numbers,Số yêu cầu
 DocType: Production Planning Tool,Only Obtain Raw Materials,Chỉ Lấy Nguyên liệu thô
@@ -938,13 +942,13 @@
 DocType: Supplier Quotation,Is Subcontracted,Được ký hợp đồng phụ
 DocType: Item Attribute,Item Attribute Values,Giá trị mục Attribute
 DocType: Examination Result,Examination Result,Kết quả kiểm tra
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,Mua hóa đơn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,Mua hóa đơn
 ,Received Items To Be Billed,Mục nhận được lập hoá đơn
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,Trượt chân Mức lương nộp
 DocType: Employee,Ms,Ms
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,Tổng tỷ giá hối đoái.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},Tham khảo DOCTYPE phải là một trong {0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},Không thể tìm Time Khe cắm trong {0} ngày tới cho Chiến {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},Tham khảo DOCTYPE phải là một trong {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,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/config/selling.py +97,Sales Partners and Territory,Đại lý bán hàng và địa bàn
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,Có thể không tự động tạo tài khoản như đã có là số dư chứng khoán trong tài khoản. Bạn phải tạo một tài khoản phù hợp trước khi bạn có thể tạo một entry trên kho này
@@ -967,10 +971,9 @@
 DocType: Supplier,Default Payable Accounts,Mặc định Accounts Payable
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,Nhân viên {0} không hoạt động hoặc không tồn tại
 DocType: Fee Structure,Components,Các thành phần
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},Vui lòng nhập tài sản Thể loại trong mục {0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,Các biến thể mục {0} cập nhật
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},Vui lòng nhập tài sản Thể loại trong mục {0}
 DocType: Quality Inspection Reading,Reading 6,Đọc 6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,Không thể {0} {1} {2} không có bất kỳ hóa đơn xuất sắc tiêu cực
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,Mua hóa đơn trước
 DocType: Hub Settings,Sync Now,Bây giờ Sync
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},Row {0}: lối vào tín dụng không thể được liên kết với một {1}
@@ -984,11 +987,11 @@
 DocType: Item,Is Purchase Item,Là mua hàng
 DocType: Asset,Purchase Invoice,Mua hóa đơn
 DocType: Stock Ledger Entry,Voucher Detail No,Chứng từ chi tiết Không
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,Hóa đơn bán hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,Hóa đơn bán hàng mới
 DocType: Stock Entry,Total Outgoing Value,Tổng giá trị Outgoing
-apps/erpnext/erpnext/public/js/account_tree_grid.js +225,Opening Date and Closing Date should be within same Fiscal Year,Khai mạc Ngày và ngày kết thúc nên trong năm tài chính tương tự
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,Khai mạc Ngày và ngày kết thúc nên trong năm tài chính tương tự
 DocType: Lead,Request for Information,Yêu cầu thông tin
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,Đồng bộ hóa offline Hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,Đồng bộ hóa offline Hoá đơn
 DocType: Payment Request,Paid,Paid
 DocType: Program Fee,Program Fee,Phí chương trình
 DocType: Salary Slip,Total in words,Tổng số nói cách
@@ -998,7 +1001,7 @@
 DocType: Employee Loan,Sanctioned,xử phạt
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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 +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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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  'sản phẩm lô', Kho Hàng, Số Seri và Số Lô sẽ được xem xét từ bảng 'Danh sách đóng gói'. Nếu kho và số Lô giống nhau cho tất cả các mặt hàng đóng gói cho bất kỳ mặt hàng 'Hàng hóa theo lô', những giá trị có thể được nhập vào bảng hàng hóa chính, giá trị này sẽ được sao chép vào bảng 'Danh sách đóng gói'."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +643,"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  'sản phẩm lô', Kho Hàng, Số Seri và Số Lô sẽ được xem xét từ bảng 'Danh sách đóng gói'. Nếu kho và số Lô giống nhau cho tất cả các mặt hàng đóng gói cho bất kỳ mặt hàng 'Hàng hóa theo lô', những giá trị có thể được nhập vào bảng hàng hóa chính, giá trị này sẽ được sao chép vào bảng 'Danh sách đóng gói'."
 DocType: Job Opening,Publish on website,Xuất bản trên trang web
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,Chuyển hàng cho khách
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,Ngày trên h.đơn mua hàng không thể lớn hơn ngày hạch toán
@@ -1009,7 +1012,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,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 +843,Select Item for Transfer,Chọn mục Chuyển giao
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.
@@ -1020,8 +1023,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,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
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,Mặc định tài khoản Ngân hàng / Tiền sẽ được tự động cập nhật trong Lương Journal nhập khi chế độ này được chọn.
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",Khoảng Mã Lớp {0} trùng với khoảng thời gian lớp cho các lớp khác. Vui lòng kiểm tra khoảng {0} và {1} và thử lại
 DocType: BOM,Raw Material Cost(Company Currency),Nguyên liệu Chi phí (Công ty ngoại tệ)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,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/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},Hàng # {0}: Tỷ lệ không được lớn hơn tỷ lệ được sử dụng trong {1} {2}
@@ -1034,14 +1035,14 @@
 DocType: BOM Website Item,BOM Website Item,BOM Trang web mục
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,Tải lên tiêu đề trang và logo. (Bạn có thể chỉnh sửa chúng sau này).
 DocType: Timesheet Detail,Bill,Hóa đơn
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,Tiếp Khấu hao ngày được nhập như ngày trong quá khứ
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,Tiếp Khấu hao ngày được nhập như ngày trong quá khứ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,Trắng
 DocType: SMS Center,All Lead (Open),Tất cả Tiềm năng (Mở)
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),Row {0}: Số lượng không có sẵn cho {4} trong kho {1} tại đăng thời gian nhập cảnh ({2} {3})
 DocType: Purchase Invoice,Get Advances Paid,Được trả tiền trước
 DocType: Item,Automatically Create New Batch,Tự động tạo hàng loạt
 DocType: Item,Automatically Create New Batch,Tự động tạo hàng loạt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,Làm
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,Làm
 DocType: Student Admission,Admission Start Date,Ngày bắt đầu nhập học
 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 là bạn đã không lưu mẫu đơn. Vui lòng liên hệ support@erpnext.com nếu vấn đề vẫn tồn tại.
@@ -1049,7 +1050,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,Order Type must be one of {0},Loại thứ tự phải là một trong {0}
 DocType: Lead,Next Contact Date,Ngày Liên hệ Tiếp theo
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +35,Opening Qty,Mở Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,Vui lòng nhập tài khoản để thay đổi Số tiền
 DocType: Student Batch Name,Student Batch Name,Tên sinh viên hàng loạt
 DocType: Holiday List,Holiday List Name,Kỳ nghỉ Danh sách Tên
 DocType: Repayment Schedule,Balance Loan Amount,Dư nợ cho vay Số tiền
@@ -1069,10 +1070,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},Vui lòng ghi rõ {0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,Các mục gỡ bỏ không có thay đổi về số lượng hoặc giá trị.
 DocType: Delivery Note,Delivery To,Để giao hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,Bảng thuộc tính là bắt buộc
 DocType: Production Planning Tool,Get Sales Orders,Chọn đơn đặt hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không thể bị âm
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,Giảm giá
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0} không được phép âm
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,Giảm giá
 DocType: Asset,Total Number of Depreciations,Tổng Số khấu hao
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
 DocType: Sales Invoice Item,Rate With Margin,Tỷ lệ Giãn
@@ -1088,7 +1089,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,tồn kho dự trữ cho đơn hàng / SP hoàn thành
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,Số tiền bán
 DocType: Repayment Schedule,Interest Amount,Số tiền lãi
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Bạn là người phê duyệt chi phí cho hồ sơ này. Hãy cập nhật mục 'Tình trạng' và ""Lưu"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,"Bạn là người phê duyệt chi phí cho hồ sơ này. Hãy cập nhật mục 'Tình trạng' và ""Lưu"""
 DocType: Serial No,Creation Document No,Tạo ra văn bản số
 DocType: Issue,Issue,Nội dung:
 DocType: Asset,Scrapped,Loại bỏ
@@ -1096,12 +1097,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.","Các thuộc tính cho khoản biến thể. ví dụ như kích cỡ, màu sắc, vv"
 DocType: Purchase Invoice,Returns,Returns
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP kho
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},Không nối tiếp {0} là theo hợp đồng bảo trì tối đa {1}
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,tuyển dụng
 DocType: Lead,Organization Name,Tên tổ chức
 DocType: Tax Rule,Shipping State,Vận Chuyển Nhà nước
 ,Projected Quantity as Source,Số lượng dự kiến là nguồn
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,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/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,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
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,Bao gồm các mặt hàng không cổ
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,Chi phí bán hàng
@@ -1109,12 +1110,12 @@
 DocType: GL Entry,Against,Chống lại
 DocType: Item,Default Selling Cost Center,Bộ phận chi phí bán hàng mặc định
 DocType: Sales Partner,Implementation Partner,Đối tác thực hiện
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,Mã Bưu Chính
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,Mã Bưu Chính
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},Đơn hàng {0} là {1}
 DocType: Opportunity,Contact Info,Thông tin Liên hệ
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,Làm Cổ Entries
 DocType: Packing Slip,Net Weight UOM,Trọng lượng UOM
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0} Kết quả
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0} Kết quả
 DocType: Item,Default Supplier,Nhà cung cấp mặc định
 DocType: Manufacturing Settings,Over Production Allowance Percentage,Trong sản xuất Allowance Tỷ
 DocType: Employee Loan,Repayment Schedule,Kế hoạch trả nợ
@@ -1122,7 +1123,7 @@
 DocType: Holiday List,Get Weekly Off Dates,Nhận Tuần Tắt Ngày
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,Ngày kết thúc không thể nhỏ hơn Bắt đầu ngày
 DocType: Sales Person,Select company name first.,Chọn tên công ty đầu tiên.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,Tiến sĩ
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,Tiến sĩ
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,Trích dẫn nhận được từ nhà cung cấp.
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},Để {0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,Tuổi trung bình
@@ -1142,7 +1143,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,Key Performance Area
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,Vận chuyển
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,Thuộc tính không hợp lệ
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1} phải được đệ trình
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1} phải được đệ trình
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},Số lượng phải nhỏ hơn hoặc bằng {0}
 DocType: SMS Center,Total Characters,Tổng số nhân vật
 apps/erpnext/erpnext/controllers/buying_controller.py +154,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}
@@ -1153,7 +1154,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 +224,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 +52,Please set 'Apply Additional Discount On',Xin hãy đặt &#39;Áp dụng giảm giá bổ sung On&#39;
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,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 +46,From Range has to be less than To Range,Từ Phạm vi có thể ít hơn Để Phạm vi
 DocType: Global Defaults,Global Defaults,Mặc định toàn cầu
@@ -1163,7 +1164,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,Bắt đầu năm
 DocType: Purchase Invoice,Start date of current invoice's period,Ngày của thời kỳ hóa đơn hiện tại bắt đầu
 DocType: Salary Slip,Leave Without Pay,Nếu không phải trả tiền lại
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,Công suất Lỗi Kế hoạch
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,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
@@ -1178,7 +1179,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""","Điều này sẽ được nối thêm vào các mã hàng của các biến thể. Ví dụ, nếu bạn viết tắt là ""SM"", và các mã hàng là ""T-shirt"", các mã hàng của các biến thể sẽ là ""T-shirt-SM"""
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,Net phải trả tiền (bằng chữ) sẽ được hiển thị khi bạn lưu Phiếu lương.
 DocType: Purchase Invoice,Is Return,Là Return
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,Return / Debit Note
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,Return / Debit Note
 DocType: Price List Country,Price List Country,Giá Danh sách Country
 DocType: Item,UOMs,UOMs
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},{0} Các số seri hợp lệ cho mục {1}
@@ -1188,11 +1189,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,Vui lòng nhập Item Code để có được Số lô
 DocType: Stock Settings,Default Item Group,Mặc định mục Nhóm
 DocType: Employee Loan,Partially Disbursed,phần giải ngân
-DocType: Grading Structure,Grading System Name,Hệ thống tên phân loại
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,Cơ sở dữ liệu nhà cung cấp.
 DocType: Account,Balance Sheet,Cân đối kế toán
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không được cấu hình. Vui lòng kiểm tra, cho dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên POS hồ sơ."
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',Cost Center For Item with Item Code '
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.","Chế độ thanh toán không được cấu hình. Vui lòng kiểm tra, cho dù tài khoản đã được thiết lập trên chế độ thanh toán hoặc trên POS hồ sơ."
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,Nhân viên kinh doanh của bạn sẽ nhận được một lời nhắc vào ngày này để liên hệ với khách hàng
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,Cùng mục không thể được nhập nhiều lần.
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups","Tài khoản 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"
@@ -1204,7 +1204,7 @@
 ,Purchase Order Items To Be Billed,Tìm mua hàng được lập hoá đơn
 DocType: Purchase Invoice Item,Net Rate,Tỷ Net
 DocType: Purchase Invoice Item,Purchase Invoice Item,Hóa đơn mua hàng
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Cổ Ledger Entries và GL Entries được đăng lại cho các biên nhận mua hàng lựa chọn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,Cổ Ledger Entries và GL Entries được đăng lại cho các biên nhận mua hàng lựa chọn
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,Khoản 1
 DocType: Holiday,Holiday,Kỳ nghỉ
 DocType: Support Settings,Close Issue After Days,Đóng Issue Sau ngày
@@ -1231,11 +1231,11 @@
 DocType: Maintenance Visit Purpose,Work Done,Xong công việc
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,Xin vui lòng ghi rõ ít nhất một thuộc tính trong bảng thuộc tính
 DocType: Announcement,All Students,Tất cả học sinh
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,Mục {0} phải là mục Không-Tồn kho
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,Mục {0} phải là mục Không-Tồn kho
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,Xem Ledger
 DocType: Grading Scale,Intervals,khoảng thời gian
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,Sớm nhất
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group","Một mục Nhóm tồn tại với cùng một tên, hãy thay đổi tên mục hoặc đổi tên nhóm mặt hàng"
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,Sinh viên Điện thoại di động số
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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
@@ -1275,9 +1275,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},Trả lương từ {0} đến {1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,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 +64,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,Đơn đặt hàng {0} không hợp lệ
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,đơn đặt hàng giúp bạn lập kế hoạch và theo dõi mua hàng của bạn
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged","Xin lỗi, công ty không thể được sáp nhập"
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",Tổng khối lượng phát hành / Chuyển {0} trong Chất liệu Yêu cầu {1} \ không thể nhiều hơn số lượng yêu cầu {2} cho mục {3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,Nhỏ
@@ -1298,10 +1298,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,Chi phí gián tiếp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,Hàng {0}: Số lượng là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,Nông nghiệp
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,Dữ liệu Sync Thạc sĩ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,Dữ liệu Sync Thạc sĩ
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,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 +182,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin publice hoặc URL của trang web
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,Hình ảnh website phải là một tập tin publice hoặc URL của trang web
 DocType: Student Applicant,AP,AP
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,Đây là một nhóm mục gốc và không thể được chỉnh sửa.
@@ -1319,18 +1319,18 @@
 DocType: Student Group Student,Group Roll Number,Số cuộn nhóm
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry","Đối với {0}, tài khoản tín dụng chỉ có thể được liên kết chống lại mục nợ khác"
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,Tổng số các trọng số nhiệm vụ cần được 1. Vui lòng điều chỉnh trọng lượng của tất cả các công việc của dự án phù hợp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,Giao hàng Ghi {0} không nộp
 apps/erpnext/erpnext/stock/get_item_details.py +141,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."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.","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."
 DocType: Hub Settings,Seller Website,Người bán website
 DocType: Item,ITEM-,MỤC-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,Tổng tỷ lệ phần trăm phân bổ cho đội ngũ bán hàng nên được 100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},Tình trạng tự sản xuất là {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},Tình trạng tự sản xuất là {0}
 DocType: Appraisal Goal,Goal,Mục tiêu
 DocType: Sales Invoice Item,Edit Description,Chỉnh sửa Mô tả
 ,Team Updates,đội cập nhật
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,Cho Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,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/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,Tạo Format In
@@ -1346,7 +1346,7 @@
 DocType: Depreciation Schedule,Journal Entry,Tạp chí nhập
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0} mục trong tiến trình
 DocType: Workstation,Workstation Name,Tên máy trạm
-DocType: Grade Interval,Grade Code,Mã lớp
+DocType: Grading Scale Interval,Grade Code,Mã lớp
 DocType: POS Item Group,POS Item Group,POS mục Nhóm
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,Email Digest:
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM {0} không thuộc mục {1}
@@ -1363,7 +1363,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,Phần cứng
 DocType: Sales Order,Recurring Upto,Định kỳ Upto
 DocType: Attendance,HR Manager,Trưởng phòng Nhân sự
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,Hãy lựa chọn một công ty
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,Hãy lựa chọn một công ty
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,Để lại đặc quyền
 DocType: Purchase Invoice,Supplier Invoice Date,Nhà cung cấp hóa đơn ngày
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,Bạn cần phải kích hoạt module Giỏ hàng
@@ -1379,7 +1379,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,Thực phẩm
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,Phạm vi Ageing 3
 DocType: Maintenance Schedule Item,No of Visits,Không có các chuyến thăm
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,Đánh dấu Attendence
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,Đánh dấu Attendence
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},Lịch bảo trì {0} tồn tại chống lại {1}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,sinh viên ghi danh
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},Đồng tiền của tài khoản bế phải là {0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},Sum điểm cho tất cả các mục tiêu phải 100. Nó là {0}
@@ -1404,7 +1405,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,Avg Daily Outgoing
 DocType: POS Profile,Campaign,Chiến dịch
 DocType: Supplier,Name and Type,Tên và Loại
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,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"""
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,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 +37,'Expected Start Date' can not be greater than 'Expected End Date','Ngày Bắt đầu Dự kiến' không thể sau 'Ngày Kết thúc Dự kiến'
 DocType: Course Scheduling Tool,Course End Date,Khóa học Ngày kết thúc
@@ -1427,14 +1428,15 @@
 DocType: Sales Invoice,Shipping Address Name,Địa chỉ Shipping Name
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,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 +575,cannot be greater than 100,không có thể lớn hơn 100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,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/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,không có thể lớn hơn 100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,Mục {0} không phải là một cổ phiếu hàng
 DocType: Maintenance Visit,Unscheduled,Đột xuất
 DocType: Employee,Owned,Sở hữu
 DocType: Salary Detail,Depends on Leave Without Pay,Phụ thuộc vào Leave Nếu không phải trả tiền
 DocType: Pricing Rule,"Higher the number, higher the priority","Số càng cao, càng cao thì ưu tiên"
 ,Purchase Invoice Trends,Mua hóa đơn Xu hướng
 DocType: Employee,Better Prospects,Viễn cảnh tốt hơn
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches","Hàng # {0}: Hàng {1} chỉ có {2} qty. Vui lòng chọn một lô khác có {3} có sẵn hoặc phân chia hàng thành nhiều hàng, để phân phối / xuất phát từ nhiều đợt"
 DocType: Vehicle,License Plate,Giấy phép mảng
 DocType: Appraisal,Goals,Mục tiêu
 DocType: Warranty Claim,Warranty / AMC Status,Bảo hành /tình trạng AMC
@@ -1453,18 +1455,18 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,Nhân viên không thể báo cáo với chính mình.
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.","Nếu tài khoản bị đóng băng, các mục được phép sử dụng hạn chế."
 DocType: Email Digest,Bank Balance,số dư Ngân hàng
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},Hạch toán kế toán cho {0}: {1} chỉ có thể được thực hiện bằng loại tiền tệ: {2}
 DocType: Job Opening,"Job profile, qualifications required etc.","Hồ sơ công việc, trình độ chuyên môn cần thiết vv"
 DocType: Journal Entry Account,Account Balance,Số dư Tài khoản
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,Rule thuế cho các giao dịch.
 DocType: Rename Tool,Type of document to rename.,Loại tài liệu để đổi tên.
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,Chúng tôi mua vật tư HH này
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Khách hàng là cần thiết đối với Khoản phải thu {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}: Cần nhập Khách hàng đối với Khoản phải thu {2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),Tổng số thuế và lệ phí (Công ty tiền tệ)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,Hiện P &amp; L số dư năm tài chính không khép kín
 DocType: Shipping Rule,Shipping Account,Tài khoản vận chuyển
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: Tài khoản {2} không hoạt động
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,Hãy Đơn đặt hàng bán hàng để giúp bạn có kế hoạch làm việc của bạn và cung cấp đúng thời hạn
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,Hãy Đơn đặt hàng bán hàng để giúp bạn có kế hoạch làm việc của bạn và cung cấp đúng thời hạn
 DocType: Quality Inspection,Readings,Đọc
 DocType: Stock Entry,Total Additional Costs,Tổng chi phí bổ sung
 DocType: Course Schedule,SH,SH
@@ -1475,7 +1477,7 @@
 DocType: Shipping Rule Condition,To Value,Để giá trị gia tăng
 DocType: Asset Movement,Stock Manager,Quản lý kho hàng
 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/delivery_note/delivery_note.js +814,Packing Slip,Đóng gói trượt
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,Đóng gói trượt
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,Thuê văn phòng
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,Cài đặt thiết lập cổng SMS
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,Nhập khẩu thất bại!
@@ -1497,11 +1499,11 @@
 DocType: Company,Services,Dịch vụ
 DocType: HR Settings,Email Salary Slip to Employee,Email Mức lương trượt để nhân viên
 DocType: Cost Center,Parent Cost Center,Bộ phận Chi phí cấp trên
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,Chọn thể Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,Chọn thể Nhà cung cấp
 DocType: Sales Invoice,Source,Nguồn
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,Hiện đã đóng
 DocType: Leave Type,Is Leave Without Pay,Nếu không có được Leave Pay
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,Asset loại là bắt buộc cho mục tài sản cố định
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,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/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},Đây {0} xung đột với {1} cho {2} {3}
 DocType: Student Attendance Tool,Students HTML,Học sinh HTML
@@ -1519,7 +1521,7 @@
 DocType: Student,Date of Leaving,Ngày Rời
 DocType: Pricing Rule,For Price List,Đối với Bảng giá
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,Điều hành Tìm kiếm
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,tạo Chào
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,tạo Chào
 DocType: Maintenance Schedule,Schedules,Lịch
 DocType: Purchase Invoice Item,Net Amount,Số tiền Net
 DocType: Purchase Order Item Supplied,BOM Detail No,số hiệu BOM chi tiết
@@ -1547,9 +1549,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,chương trình tuyển sinh
 DocType: Sales Invoice Item,Brand Name,Tên Thương hiệu
 DocType: Purchase Receipt,Transporter Details,Chi tiết Transporter
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,Mặc định kho là cần thiết cho mục đã chọn
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,Box
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,Nhà cung cấp có thể
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,Nhà cung cấp có thể
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,Tổ chức
 DocType: Budget,Monthly Distribution,Phân phối hàng tháng
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,Danh sách người nhận có sản phẩm nào. Hãy tạo nhận Danh sách
@@ -1557,8 +1559,8 @@
 DocType: Sales Partner,Sales Partner Target,Mục tiêu DT của Đại lý
 DocType: Loan Type,Maximum Loan Amount,Số tiền cho vay tối đa
 DocType: Pricing Rule,Pricing Rule,Quy tắc định giá
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},Số cuộn trùng nhau cho sinh viên {0}
 DocType: Budget,Action if Annual Budget Exceeded,Hành động nếu ngân sách hàng năm vượt quá
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,Yêu cầu vật chất để mua hàng
 DocType: Shopping Cart Settings,Payment Success URL,Thanh toán thành công URL
@@ -1570,7 +1572,7 @@
 ,POS,POS
 DocType: C-Form,III,III
 apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,Số dư tồn kho đầu kỳ
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} phải chỉ xuất hiện một lần
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0} phải xuất hiện một lần
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,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 +59,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
@@ -1579,9 +1581,9 @@
 DocType: Employee Loan,Repayment Method,Phương pháp trả nợ
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website","Nếu được chọn, trang chủ sẽ là mặc định mục Nhóm cho trang web"
 DocType: Quality Inspection Reading,Reading 4,Đọc 4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},BOM mặc định cho {0} không tìm thấy cho dự án {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},BOM mặc định cho {0} không tìm thấy cho dự án {1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,Tuyên bố cho chi phí công ty.
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students","Học sinh được ở trung tâm của hệ thống, thêm tất cả học sinh của bạn"
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students","Học sinh được ở trung tâm của hệ thống, thêm tất cả học sinh của bạn"
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},Row # {0}: ngày giải phóng mặt bằng {1} không được trước ngày Séc {2}
 DocType: Company,Default Holiday List,Mặc định Danh sách khách sạn Holiday
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},Row {0}: Từ Thời gian và To Time {1} là chồng chéo với {2}
@@ -1593,21 +1595,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,Ngày (s) mà bạn đang nộp đơn xin nghỉ phép là ngày nghỉ. Bạn không cần phải nộp đơn xin nghỉ phép.
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,Gửi lại Email Thanh toán
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,Nhiệm vụ mới
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,Hãy báo giá
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,Hãy báo giá
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,Báo cáo khác
 DocType: Dependent Task,Dependent Task,Nhiệm vụ phụ thuộc
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,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 +407,Conversion factor for default Unit of Measure must be 1 in row {0},Yếu tố chuyển đổi cho Đơn vị đo mặc định phải là 1 trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},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ở
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},Hãy thiết lập mặc định Account Payable lương tại Công ty {0}
 DocType: SMS Center,Receiver List,Danh sách người nhận
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,Tìm hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,Tìm hàng
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,Số tiền được tiêu thụ
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,Thay đổi ròng trong Cash
 DocType: Assessment Plan,Grading Scale,Quy mô phân loại
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,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/manufacturing/doctype/production_order/production_order.py +600,Already completed,Đã hoàn thành
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,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/manufacturing/doctype/production_order/production_order.py +601,Already completed,Đã hoàn thành
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},Yêu cầu thanh toán đã tồn tại {0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,Chi phí của Items Ban hành
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},Số lượng không phải lớn hơn {0}
@@ -1639,12 +1641,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,Hãy giải ngân nhập
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,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/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{Tần suất} Tiêu đề
 DocType: Expense Claim,Total Amount Reimbursed,Tổng số tiền bồi hoàn
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,Điều này được dựa trên các bản ghi với xe này. Xem thời gian dưới đây để biết chi tiết
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,Sưu tầm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},Gắn với hóa đơn NCC {0} ngày {1}
 DocType: Customer,Default Price List,Mặc định Giá liệt kê
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,kỷ lục Phong trào Asset {0} đã tạo
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,Bạn không thể xóa năm tài chính {0}. Năm tài chính {0} được thiết lập mặc định như trong Global Settings
 DocType: Journal Entry,Entry Type,Loại mục
 ,Customer Credit Balance,số dư tín dụng của khách hàng
@@ -1664,7 +1667,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,Không ai trong số các mặt hàng có bất kỳ sự thay đổi về số lượng hoặc giá trị.
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Trường bắt buộc - Chương trình
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,Trường bắt buộc - Chương trình
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,Yêu cầu bảo hành
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,Yêu cầu bảo hành
 ,Lead Details,Tiềm năng Chi tiết
 DocType: Salary Slip,Loan repayment,Trả nợ
 DocType: Purchase Invoice,End date of current invoice's period,Ngày kết thúc của thời kỳ hóa đơn hiện tại của
@@ -1683,12 +1686,10 @@
 DocType: Employee,Permanent Address,Địa chỉ thường trú
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,Vui lòng chọn mã hàng
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,Vui lòng chọn mã hàng
 DocType: Student Sibling,Studying in Same Institute,Học tập tại Cùng Viện
 DocType: Territory,Territory Manager,Quản lý địa bàn
 DocType: Packed Item,To Warehouse (Optional),đến Kho (Tùy chọn)
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 DocType: Payment Entry,Paid Amount (Company Currency),Số tiền thanh toán (Công ty tiền tệ)
 DocType: Purchase Invoice,Additional Discount,Chiết khấu giảm giá
 DocType: Selling Settings,Selling Settings,thiết lập thông số bán hàng
@@ -1698,9 +1699,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,Xem Giỏ hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,Chi phí tiếp thị
 ,Item Shortage Report,Thiếu mục Báo cáo
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too","Trọng lượng được đề cập, \n Xin đề cập đến ""Weight Ươm"" quá"
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"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,Phiếu NVL sử dụng để làm chứng từ nhập kho
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,Tiếp Khấu hao ngày là bắt buộc đối với tài sản mới
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,Tiếp Khấu hao ngày là bắt buộc đối với tài sản mới
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Khóa học riêng biệt cho từng nhóm
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,Khóa học riêng biệt cho từng nhóm
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,Đơn vị duy nhất của một Item.
@@ -1716,10 +1717,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext Hoàn tất thiết lập!
 DocType: Course Assessment Criteria,Weightage,Weightage
 DocType: Packing Slip,PS-,PS
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Trung tâm Chi phí là cần thiết đối với tài khoản 'Lãi và Lỗ' {2}. Vui lòng thiết lập một Trung tâm Chi phí mặc định cho Công ty.
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,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 cùng tên đã tồn tại. Hãy thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}: Trung tâm Chi phí là yêu cầu bắt buộc đối với tài khoản 'Lãi và Lỗ' {2}. Vui lòng thiết lập một Trung tâm Chi phí mặc định cho Công ty.
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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 cùng tên đã tồn tại. Hãy thay đổi tên khách hàng hoặc đổi tên nhóm khách hàng
 apps/erpnext/erpnext/public/js/templates/contact_list.html +2,New Contact,Liên hệ Mới
 DocType: Territory,Parent Territory,địa bàn cấp trên
 DocType: Quality Inspection Reading,Reading 2,Đọc 2
@@ -1736,7 +1735,7 @@
 ,Item-wise Sales Register,Item-khôn ngoan doanh Đăng ký
 DocType: Asset,Gross Purchase Amount,Tổng Chi phí mua hàng
 DocType: Asset,Depreciation Method,Phương pháp Khấu hao
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,ẩn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,ẩn
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,Thuế này đã gồm trong giá gốc?
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,Tổng số mục tiêu
 DocType: Program Course,Required,Cần thiết
@@ -1746,21 +1745,20 @@
 DocType: Stock Reconciliation,Reconciliation JSON,Hòa giải JSON
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,Quá nhiều cột. Xuất báo cáo và in nó sử dụng một ứng dụng bảng tính.
 DocType: Purchase Invoice Item,Batch No,Số hiệu lô
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},Không thể tìm thấy tỷ giá hối đoái cho {0} đến {1} cho ngày trọng {2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,Cho phép nhiều đơn bán cùng trên 1 đơn mua hàng của khách
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 DocType: Student Group Instructor,Student Group Instructor,Hướng dẫn nhóm sinh viên
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2 Mobile Không
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,Chính
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,Biến thể
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,Chính
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,Biến thể
 DocType: Naming Series,Set prefix for numbering series on your transactions,Thiết lập tiền tố cho đánh số hàng loạt các giao dịch của bạn
 DocType: Employee Attendance Tool,Employees HTML,Nhân viên HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,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 +421,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: Email Digest,Annual Expenses,Chi phí hàng năm
 DocType: Item,Variants,Biến thể
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,Từ mua hóa đơn
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,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 +152,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ổ
@@ -1768,7 +1766,7 @@
 DocType: Sales Invoice Item,Customer's Item Code,Mã hàng của khách hàng
 DocType: Stock Reconciliation,Stock Reconciliation,"Kiểm kê, chốt kho"
 DocType: Territory,Territory Name,Tên địa bàn
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +174,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,Làm việc-trong-Tiến kho là cần thiết trước khi Submit
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,Nộp đơn xin việc.
 DocType: Purchase Order Item,Warehouse and Reference,Kho hàng và tham chiếu
 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
@@ -1776,11 +1774,10 @@
 DocType: Item,Serial Nos and Batches,Số hàng loạt và hàng loạt
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sức mạnh Nhóm Sinh viên
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,Sức mạnh Nhóm Sinh viên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,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/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,Chống Journal nhập {0} không có bất kỳ chưa từng có {1} nhập
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,đánh giá
 apps/erpnext/erpnext/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,1 điều kiện cho quy tắc giao hàng
-DocType: Grading Structure,Grading Intervals,Khoảng phân loại
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,Vui lòng nhập
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings","Không thể overbill cho {0} mục trong hàng {1} hơn {2}. Để cho phép quá thanh toán, hãy đặt trong Mua Cài đặt"
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,Xin hãy thiết lập bộ lọc dựa trên Item hoặc kho
@@ -1792,17 +1789,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0} phải được đệ trình
 DocType: Authorization Control,Authorization Control,Cho phép điều khiển
 apps/erpnext/erpnext/controllers/buying_controller.py +301,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/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,Thanh toán
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,Quản lý đơn đặt hàng của bạn
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,Thanh toán
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,Quản lý đơn đặt hàng của bạ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},Phiếu đặt NVL  {0} có thể được thực hiện cho mục {1} đối với đơn đặt hàng {2}
 DocType: Employee,Salutation,Sự chào
 DocType: Course,Course Abbreviation,Tên viết tắt khóa học
 DocType: Student Leave Application,Student Leave Application,Ứng dụng Để lại Sinh viên
 DocType: Item,Will also apply for variants,Cũng sẽ được áp dụng cho các biến thể
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}","Tài sản không thể được hủy bỏ, vì nó đã được {0}"
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},Employee {0} vào ngày nửa trên {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},Tổng số giờ làm việc không nên lớn hơn so với giờ làm việc max {0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,Bật
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,Lô (Bundle) hàng tại thời điểm bán.
 DocType: Quotation Item,Actual Qty,Số lượng thực tế
 DocType: Sales Invoice Item,References,Tài liệu tham khảo
@@ -1812,7 +1810,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +78,You have entered duplicate items. Please rectify and try again.,Bạn đã nhập các mục trùng lặp. Xin khắc phục và thử lại.
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,Liên kết
 DocType: Asset Movement,Asset Movement,Phong trào Asset
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,Giỏ hàng mới
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,Giỏ hàng mới
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,Mục {0} không phải là một khoản đăng
 DocType: SMS Center,Create Receiver List,Tạo ra nhận Danh sách
 DocType: Vehicle,Wheels,Wheels
@@ -1844,10 +1842,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,Vô hiệu hóa việc tạo ra các bản ghi thời gian so với đơn đặt hàng sản xuất. Hoạt động sẽ không được theo dõi chống sản xuất hàng
 DocType: Student,Student Mobile Number,Số di động Sinh viên
 DocType: Item,Has Variants,Có biến thể
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},Bạn đã chọn các mục từ {0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,Tên của phân phối hàng tháng
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID hàng loạt là bắt buộc
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,ID hàng loạt là bắt buộc
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,ID hàng loạt là bắt buộc
 DocType: Sales Person,Parent Sales Person,Người bán hàng mẹ
 DocType: Purchase Invoice,Recurring Invoice,Hóa đơn định kỳ
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,Quản lý dự án
@@ -1855,11 +1853,11 @@
 DocType: Budget,Fiscal Year,Năm tài chính
 DocType: Vehicle Log,Fuel Price,nhiên liệu Giá
 DocType: Budget,Budget,Ngân sách
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,Fixed Asset mục phải là một mục không cổ.
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,Fixed Asset mục phải là một mục không cổ.
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account","Ngân sách không thể được chỉ định đối với {0}, vì nó không phải là một tài khoản thu nhập hoặc chi phí"
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,Đạt được
 DocType: Student Admission,Application Form Route,Mẫu đơn Route
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,Địa bàn / khách hàng
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,Địa bàn / khách hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,ví dụ như 5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,Để lại Loại {0} không thể giao kể từ khi nó được nghỉ không lương
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},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}
@@ -1879,15 +1877,15 @@
 ,Serial No Status,Serial No Tình trạng
 DocType: Payment Entry Reference,Outstanding,Nổi bật
 ,Daily Timesheet Summary,Tóm tắt Timesheet hàng ngày
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","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}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,Điều này được dựa trên chuyển động chứng khoán. Xem {0} để biết chi tiết
 DocType: Pricing Rule,Selling,Bán hàng
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},Số tiền {0} {1} giảm trừ {2}
 DocType: Employee,Salary Information,Thông tin tiền lương
 DocType: Sales Person,Name and Employee ID,Tên và nhân viên ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
+apps/erpnext/erpnext/accounts/party.py +289,Due Date cannot be before Posting Date,Ngày đến hạn không thể trước ngày ghi sổ
 DocType: Website Item Group,Website Item Group,Nhóm các mục Website
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,Nhiệm vụ và thuế
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,Vui lòng nhập ngày tham khảo
@@ -1899,14 +1897,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,Không có thể tham khảo số lượng hàng lớn hơn hoặc bằng số lượng hàng hiện tại cho loại phí này
 DocType: Asset,Sold,Đã bán
 ,Item-wise Purchase History,Item-khôn ngoan Lịch sử mua hàng
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},Vui lòng click vào 'Tạo Lịch trình' để lấy Serial No bổ sung cho hàng {0}
 DocType: Account,Frozen,Đông lạnh
 ,Open Production Orders,Đơn đặt hàng mở sản xuất
 DocType: Sales Invoice Payment,Base Amount (Company Currency),Cơ sở Số tiền (Công ty ngoại tệ)
 DocType: Payment Reconciliation Payment,Reference Row,Tham khảo Row
 DocType: Installation Note,Installation Time,Thời gian cài đặt
 DocType: Sales Invoice,Accounting Details,Chi tiết hạch toán
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,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/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,Các khoản đầu tư
 DocType: Issue,Resolution Details,Độ phân giải chi tiết
@@ -1939,14 +1937,14 @@
 DocType: Discussion,Discussion,Thảo luận
 DocType: Payment Entry,Transaction ID,ID giao dịch
 DocType: Employee,Resignation Letter Date,Ngày viết đơn nghỉ hưu
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +37,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,Nội quy định giá được tiếp tục lọc dựa trên số lượng.
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},Vui lòng đặt Ngày Tham gia cho nhân viên {0}
 DocType: Task,Total Billing Amount (via Time Sheet),Tổng số tiền thanh toán (thông qua Time Sheet)
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,Lặp lại Doanh thu khách hàng
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} ({1}) phải có vai trò 'Người duyệt b.kê chi phí'
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) phải có vai trò 'Người duyệt b.kê chi phí'
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,Đôi
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,Chọn BOM và Số lượng cho sản xuất
 DocType: Asset,Depreciation Schedule,Kế hoạch khấu hao
 DocType: Bank Reconciliation Detail,Against Account,Đối với tài khoản
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,Nửa ngày ngày phải là giữa Từ ngày và Đến ngày
@@ -1960,16 +1958,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},Hãy thiết lập &#39;Trung tâm Lưu Khấu hao chi phí trong doanh nghiệp {0}
 ,Maintenance Schedules,Lịch bảo trì
 DocType: Task,Actual End Date (via Time Sheet),Thực tế End Date (thông qua Time Sheet)
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},Số tiền {0} {1} với {2} {3}
 ,Quotation Trends,Các Xu hướng của báo giá
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},Nhóm mục không được đề cập trong mục tổng thể cho mục {0}
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,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 +339,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
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,Số tiền cấp phát
 DocType: Purchase Invoice Item,Conversion Factor,Yếu tố chuyển đổi
 DocType: Purchase Order,Delivered,"Nếu được chỉ định, gửi các bản tin sử dụng địa chỉ email này"
 ,Vehicle Expenses,Chi phí xe
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
+DocType: Serial No,Invoice Details,Chi tiết hóa đơn
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},giá trị dự kiến sau khi cuộc sống hữu ích phải lớn hơn hoặc bằng {0}
 DocType: Purchase Receipt,Vehicle Number,Số xe
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,Ngày mà hóa đơn định kỳ sẽ được dừng lại
 DocType: Employee Loan,Loan Amount,Số tiền vay
@@ -1988,12 +1987,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,timesheets
 DocType: HR Settings,HR Settings,Thiết lập nhân sự
 DocType: Salary Slip,net pay info,Thông tin lương net
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,Bảng kê Chi phí đang chờ phê duyệt. Chỉ Người duyệt chi mới có thể cập nhật trạng thái.
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,Bảng kê Chi phí đang chờ phê duyệt. Chỉ Người duyệt chi mới có thể cập nhật trạng thái.
 DocType: Email Digest,New Expenses,Chi phí mới
 DocType: Purchase Invoice,Additional Discount Amount,Thêm GIẢM Số tiền
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.","Row # {0}: Số lượng phải là 1, mục là một tài sản cố định. Vui lòng sử dụng hàng riêng biệt cho nhiều qty."
 DocType: Leave Block List Allow,Leave Block List Allow,Để lại Block List phép
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,Viết tắt ko được để trống
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,Viết tắt ko được để trống
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,Nhóm Non-Group
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,Thể thao
 DocType: Loan Type,Loan Name,Tên vay
@@ -2005,6 +2004,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,"Kho, nơi bạn cất giữ hàng bảo hành của hàng bị từ chối"
 DocType: Production Order,Skip Material Transfer,Bỏ qua chuyển giao vật liệu
 DocType: Production Order,Skip Material Transfer,Bỏ qua chuyển giao vật liệu
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,Không thể tìm thấy tỷ giá cho {0} đến {1} cho ngày chính {2}. Vui lòng tạo một bản ghi tiền tệ bằng tay
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,Năm tài chính kết thúc vào ngày của bạn
 DocType: POS Profile,Price List,Bảng giá
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0} bây giờ là năm tài chính mặc định. Xin vui lòng làm mới trình duyệt của bạn để các thay đổi có hiệu lực.
@@ -2021,19 +2021,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},Tài khoản của {0} là không hợp lệ. Tài khoản ngắn hạn phải là {1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},Yếu tố UOM chuyển đổi là cần thiết trong hàng {0}
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong bán hàng đặt hàng, bán hàng hóa đơn hoặc Journal nhập"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry","Row # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong bán hàng đặt hàng, bán hàng hóa đơn hoặc Journal nhập"
 DocType: Salary Component,Deduction,Khấu trừ
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,Row {0}: Từ Thời gian và To Time là bắt buộc.
 DocType: Stock Reconciliation Item,Amount Difference,Số tiền khác biệt
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},Item Giá tăng cho {0} trong Giá liệt {1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,Vui lòng nhập Id nhân viên của người bán hàng này
 DocType: Territory,Classification of Customers by region,Phân loại khách hàng theo vùng
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,Chênh lệch Số tiền phải bằng không
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,Chênh lệch Số tiền phải bằng không
 DocType: Project,Gross Margin,Margin Gross
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,Vui lòng nhập sản xuất hàng đầu tiên
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,Số dư trên bảng kê Ngân hàng tính ra
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,sử dụng người khuyết tật
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,Báo giá
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,Báo giá
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,Tổng số trích
 ,Production Analytics,Analytics sản xuất
@@ -2042,9 +2042,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 chủ yếu khác được theo dõi gắn với **năm tài chính **.
 DocType: Opportunity,Customer / Lead Address,Địa chỉ Khách hàng / Tiềm năng
-apps/erpnext/erpnext/stock/doctype/item/item.py +212,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},Cảnh báo: Chứng nhận SSL không hợp lệ đối với đính kèm {0}
 DocType: Student Admission,Eligibility,Đủ điều kiện
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads","Dẫn giúp bạn có được kinh doanh, thêm tất cả các địa chỉ liên lạc của bạn và nhiều hơn nữa như tiềm năng của bạn"
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads","Dẫn giúp bạn có được kinh doanh, thêm tất cả các địa chỉ liên lạc của bạn và nhiều hơn nữa như tiềm năng của bạn"
 DocType: Production Order Operation,Actual Operation Time,Thời gian hoạt động thực tế
 DocType: Authorization Rule,Applicable To (User),Để áp dụng (Thành viên)
 DocType: Purchase Taxes and Charges,Deduct,Trích
@@ -2059,7 +2059,7 @@
 DocType: Guardian,Work Address,Địa chỉ làm việc
 DocType: Appraisal,Calculate Total Score,Tổng điểm tính toán
 DocType: Request for Quotation,Manufacturing Manager,Sản xuất Quản lý
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},Không nối tiếp {0} được bảo hành tối đa {1}
 apps/erpnext/erpnext/config/stock.py +158,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 +87,Shipments,Lô hàng
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,Số dư tài khoản ({0}) cho {1} và giá trị cổ phiếu ({2}) cho kho hàng {3} phải giống nhau
@@ -2082,10 +2082,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,Lưu ý: Email sẽ không được gửi đến người khuyết tật
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Số lần tương tác
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,Số lần tương tác
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,Chọn Công ty ...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,Chọn Công ty ...
 DocType: Leave Control Panel,Leave blank if considered for all departments,Để trống nếu xem xét tất cả các phòng ban
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).","Loại lao động (thường xuyên, hợp đồng, vv tập)."
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{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 +405,{0} is mandatory for Item {1},{0} là bắt buộc đối với mục {1}
 DocType: Process Payroll,Fortnightly,mổi tháng hai lần
 DocType: Currency Exchange,From Currency,Từ tệ
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"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"
@@ -2094,14 +2094,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),Đơn giá (Công ty tiền tệ)
 DocType: Student Guardian,Others,Các thông tin khác
 DocType: Payment Entry,Unallocated Amount,Số tiền chưa được phân bổ
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
+apps/erpnext/erpnext/templates/includes/product_page.js +71,Cannot find a matching Item. Please select some other value for {0}.,Không thể tìm thấy một kết hợp Item. Hãy chọn một vài giá trị khác cho {0}.
 DocType: POS Profile,Taxes and Charges,Thuế và phí
 DocType: Item,"A Product or a Service that is bought, sold or kept in stock.","Một sản phẩm hay một dịch vụ được mua, bán hoặc lưu giữ trong kho."
 apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,Không có cập nhật hơn
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,Không có thể chọn loại phí như 'Mở hàng trước Số tiền' hoặc 'On Trước Row Tổng số' cho hàng đầu tiên
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,Con hàng không phải là một gói sản phẩm. Hãy loại bỏ mục &#39;{0} `và tiết kiệm
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,Banking
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,Thêm timesheets
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,Thêm timesheets
 DocType: Vehicle Service,Service Item,dịch vụ hàng
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
 DocType: Bank Guarantee,Bank Guarantee,Bảo lãnh ngân hàng
@@ -2110,7 +2110,7 @@
 DocType: Bin,Ordered Quantity,Số lượng đặt hàng
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""","ví dụ như ""Xây dựng các công cụ cho các nhà xây dựng """
 DocType: Grading Scale,Grading Scale Intervals,Khoảng phân loại Scale
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán cho {2} chỉ có thể được tạo với tiền tệ: {3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}: Bút Toán cho {2} chỉ có thể được tạo với loại tiền tệ: {3}
 DocType: Production Order,In Process,Trong quá trình
 DocType: Authorization Rule,Itemwise Discount,Itemwise Giảm giá
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,Cây tài khoản tài chính.
@@ -2127,6 +2127,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},Row # {0}: {1} Asset đã {2}
 DocType: Quotation Item,Stock Balance,Số tồn kho
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,Đặt hàng bán hàng để thanh toán
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,Vui lòng đặt Naming Series cho {0} qua Cài đặt&gt; Cài đặt&gt; Đặt tên Series
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,Chi phí bồi thường chi tiết
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,Vui lòng chọn đúng tài khoản
@@ -2151,14 +2152,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,Giá sẽ không được hiển thị nếu thực Giá liệt kê không được thiết lập
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,Hãy xác định một quốc gia cho Rule Shipping này hoặc kiểm tra vận chuyển trên toàn thế giới
 DocType: Stock Entry,Total Incoming Value,Tổng giá trị Incoming
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,Nợ Để được yêu cầu
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,Nợ Để được yêu cầu
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team","Timesheets giúp theo dõi thời gian, chi phí và thanh toán cho các hoạt động được thực hiện bởi nhóm của bạn"
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,Danh sách mua Giá
 DocType: Offer Letter Term,Offer Term,Offer hạn
 DocType: Quality Inspection,Quality Manager,Quản lý chất lượng
 DocType: Job Applicant,Job Opening,Cơ hội nghề nghiệp
 DocType: Payment Reconciliation,Payment Reconciliation,Hòa giải thanh toán
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,Vui lòng chọn tên incharge của Người
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,Công nghệ
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},Tổng số chưa được thanh toán: {0}
 DocType: BOM Website Operation,BOM Website Operation,BOM Trang web hoạt động
@@ -2186,23 +2187,23 @@
 DocType: Opportunity,Lost Reason,Lý do bị mất
 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/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,Vui lòng nhập Document Receipt
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,Tất cả các mục đã được lập hoá đơn
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,Vui lòng nhập Document Receipt
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,Further cost centers can be made under Groups but entries can be made against non-Groups
 DocType: Project,External,Bên ngoài
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,Người sử dụng và Quyền
 DocType: Vehicle Log,VLOG.,Vlog.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},Đơn đặt hàng sản xuất đã tạo: {0}
 DocType: Branch,Branch,Chi Nhánh
 DocType: Guardian,Mobile Number,Số điện thoại
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,In ấn và xây dựng thương hiệu
 DocType: Bin,Actual Quantity,Số lượng thực tế
 DocType: Shipping Rule,example: Next Day Shipping,Ví dụ: Ngày hôm sau Vận chuyển
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,Số thứ tự {0} không tìm thấy
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,Số thứ tự {0} không tìm thấy
 DocType: Scheduling Tool,Student Batch,hàng loạt sinh viên
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,Khách hàng của bạn
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,Hãy Student
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,Hãy Student
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},Bạn được lời mời cộng tác trong dự án: {0}
 DocType: Leave Block List Date,Block Date,Block Date
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,Áp dụng ngay bây giờ
@@ -2226,8 +2227,9 @@
 DocType: SMS Log,Sent To,Gửi Đến
 DocType: Payment Request,Make Sales Invoice,Làm Mua hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,phần mềm
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể trong quá khứ
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,Ngày Liên hệ Tiếp theo không thể trong quá khứ
 DocType: Company,For Reference Only.,Chỉ để tham khảo.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,Chọn Batch No
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},Không hợp lệ {0}: {1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,Số tiền ứng trước
@@ -2241,7 +2243,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,Trường hợp số không thể là 0
 DocType: Item,Show a slideshow at the top of the page,Hiển thị một slideshow ở trên cùng của trang
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,BOMs
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,Cửa hàng
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,Cửa hàng
 DocType: Serial No,Delivery Time,Thời gian giao hàng
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,Người cao tuổi Dựa trên
 DocType: Item,End of Life,Kết thúc của cuộc sống
@@ -2253,12 +2255,12 @@
 DocType: Rename Tool,Rename Tool,Công cụ đổi tên
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,Cập nhật giá
 DocType: Item Reorder,Item Reorder,Mục Sắp xếp lại
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,Trượt Hiện Lương
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,Vật liệu chuyển
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,Trượt Hiện Lương
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,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."
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,Tài liệu này là qua giới hạn bởi {0} {1} cho mục {4}. bạn đang làm cho một {3} so với cùng {2}?
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,tài khoản số lượng Chọn thay đổi
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,Xin hãy thiết lập định kỳ sau khi tiết kiệm
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,tài khoản số lượng Chọn thay đổi
 DocType: Purchase Invoice,Price List Currency,Danh sách giá ngoại tệ
 DocType: Naming Series,User must always select,Người sử dụng phải luôn luôn chọn
 DocType: Stock Settings,Allow Negative Stock,Cho phép tồn kho âm
@@ -2269,7 +2271,7 @@
 DocType: Budget Account,Budget Account,Tài khoản ngân sách
 DocType: Quality Inspection,Verified By,Xác nhận bởi
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.","Không thể thay đổi tiền tệ mặc định của công ty, bởi vì có giao dịch hiện có. Giao dịch phải được hủy bỏ để thay đổi tiền tệ mặc định."
-DocType: Grade Interval,Grade Description,lớp Mô tả
+DocType: Grading Scale Interval,Grade Description,lớp Mô tả
 DocType: Stock Entry,Purchase Receipt No,Mua hóa đơn Không
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +30,Earnest Money,Tiền một cách nghiêm túc
 DocType: Process Payroll,Create Salary Slip,Tạo Mức lương trượt
@@ -2307,7 +2309,7 @@
 DocType: Upload Attendance,Attendance To Date,Có mặt đến ngày
 DocType: Warranty Claim,Raised By,Nâng By
 DocType: Payment Gateway Account,Payment Account,Tài khoản thanh toán
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,Vui lòng ghi rõ Công ty để tiến hành
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,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 +22,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 +50,Compensatory Off,Đền bù Tắt
 DocType: Offer Letter,Accepted,Chấp nhận
@@ -2317,12 +2319,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,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.
 DocType: Room,Room Number,Số phòng
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},Tham chiếu không hợp lệ {0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn số lượng kế hoạch ({2}) trong lệnh sản xuất {3}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} ({1}) không được lớn hơn số lượng kế hoạch ({2}) trong lệnh sản xuất {3}
 DocType: Shipping Rule,Shipping Rule Label,Quy tắc vận chuyển Label
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,Diễn đàn người dùng
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,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 +460,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,Tạp chí nhanh chóng nhập
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.","Không thể cập nhật tồn kho, hóa đơn chứa vật tư vận chuyển tận nơi."
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,Tạp chí nhanh chóng nhập
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,Bạn không thể thay đổi tỷ lệ nếu BOM đã được đối ứng với vật tư bất kỳ.
 DocType: Employee,Previous Work Experience,Kinh nghiệm làm việc trước đây
 DocType: Stock Entry,For Quantity,Đối với lượng
@@ -2330,12 +2332,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1} chưa được đệ trình
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,Yêu cầu cho các hạng mục.
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,Để sản xuất riêng biệt sẽ được tạo ra cho mỗi mục tốt đã hoàn thành.
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} phải được tiêu cực trong tài liệu trở lại
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0} phải được tiêu cực trong tài liệu trả về
 ,Minutes to First Response for Issues,Phút để đáp ứng đầu tiên cho vấn đề
 DocType: Purchase Invoice,Terms and Conditions1,Điều khoản và Conditions1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,Tên của viện mà bạn đang thiết lập hệ thống này.
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.","Bút toán hạch toán đã đóng băng đến ngày này, không ai có thể làm / sửa đổi nào ngoại trừ người có vai trò xác định dưới đây."
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,Xin vui lòng lưu các tài liệu trước khi tạo ra lịch trình bảo trì
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,Tình trạng dự án
 DocType: UOM,Check this to disallow fractions. (for Nos),Kiểm tra này để không cho phép các phần phân đoạn. (Cho Nos)
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,Các đơn đặt hàng sản xuất sau đây được tạo ra:
@@ -2361,8 +2363,8 @@
 DocType: Student,Joining Date,Tham gia ngày
 ,Employees working on a holiday,Nhân viên làm việc trên một kỳ nghỉ
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,Đánh dấu hiện tại
-DocType: Project,% Complete Method,Phương pháp% Hoàn thành
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
+DocType: Project,% Complete Method,% Phương pháp Hoàn thành
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},Bảo trì ngày bắt đầu không thể trước ngày giao hàng cho Serial No {0}
 DocType: Production Order,Actual End Date,Ngày kết thúc thực tế
 DocType: BOM,Operating Cost (Company Currency),Chi phí điều hành (Công ty ngoại tệ)
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2379,7 +2381,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,Để lại Nếu không phải trả tiền không phù hợp với hồ sơ Để lại ứng dụng đã được phê duyệt
 DocType: Campaign,Campaign-.####,Chiến dịch.# # # #
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,Bước tiếp theo
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,Vui lòng cung cấp mục cụ thể với mức giá tốt nhất có thể
 DocType: Selling Settings,Auto close Opportunity after 15 days,Auto Cơ hội gần thi hành sau 15 ngày
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,cuối Năm
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,Quot / Chì%
@@ -2417,7 +2419,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,Recd Số lượng
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},Hồ sơ Phí Tạo - {0}
 DocType: Asset Category Account,Asset Category Account,Loại tài khoản tài sản
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất {0} nhiều hơn số lượng trên đơn đặt hàng {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},Không thể sản xuất {0} nhiều hơn số lượng trên đơn đặt hàng {1}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,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
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,Tiếp theo Liên Bằng không thể giống như Địa chỉ Email Chì
@@ -2439,7 +2441,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,Ngày chốt sổ không được đề cập
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,Sản xuất
 DocType: Guardian,Occupation,nghề
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,Hàng {0}: Ngày bắt đầu phải trước khi kết thúc ngày
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),Tổng số (SL)
 DocType: Sales Invoice,This Document,Tài liệu này
 DocType: Installation Note Item,Installed Qty,Số lượng cài đặt
@@ -2455,15 +2458,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,Báo lỗi
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,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 +64,90-Above,Trên - 90
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Tạp chí nhập {1} không có tài khoản {2} hoặc đã xuất hiện chống lại chứng từ khác
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,Row # {0}: Tạp chí nhập {1} không có tài khoản {2} hoặc đã xuất hiện chống lại chứng từ khác
 DocType: Buying Settings,Default Buying Price List,Bảng giá mua hàng mặc định
 DocType: Process Payroll,Salary Slip Based on Timesheet,Phiếu lương Dựa trên Timesheet
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,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 đơn đặt hàng
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.","Thiết lập giá trị mặc định như Công ty, tiền tệ, năm tài chính hiện tại, vv"
 DocType: Payment Entry,Payment Type,Loại thanh toán
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,Vui lòng chọn một Batch for Item {0}. Không thể tìm thấy một lô duy nhất đáp ứng yêu cầu này
 DocType: Process Payroll,Select Employees,Chọn nhân viên
 DocType: Opportunity,Potential Sales Deal,Sales tiềm năng Deal
 DocType: Payment Entry,Cheque/Reference Date,Séc / Ngày tham chiếu
@@ -2480,7 +2483,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},Hồ sơ điểm bán hàng tiêu chuẩn {0} đã được tạo ra cho công ty {1}
 DocType: Purchase Order,Ref SQ,Tài liệu tham khảo SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,Thay thế tiết / BOM trong tất cả BOMs
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,tài liệu nhận phải nộp
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,tài liệu nhận phải nộp
 DocType: Purchase Invoice Item,Received Qty,Nhận được lượng
 DocType: Stock Entry Detail,Serial No / Batch,Không nối tiếp / hàng loạt
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,Không trả tiền và không Delivered
@@ -2489,11 +2492,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,Không tờ thời gian
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,Để lại Loại {0} có thể không được thực hiện chuyển tiếp-
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',Lịch trình bảo trì không được tạo ra cho tất cả các mục. Vui lòng click vào 'Tạo lịch'
 ,To Produce,Để sản xuất
 apps/erpnext/erpnext/config/hr.py +93,Payroll,Bảng lương
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included","Đối với hàng {0} trong {1}. Để bao gồm {2} tỷ lệ Item, hàng {3} cũng phải được bao gồm"
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,Tạo người dùng
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,Tạo người dùng
 DocType: Packing Slip,Identification of the package for the delivery (for print),Xác định các gói cho việc cung cấp (đối với in)
 DocType: Bin,Reserved Quantity,Ltd Số lượng
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,Vui lòng nhập địa chỉ email hợp lệ
@@ -2507,15 +2510,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,mẫu khuyết tật không phải là mẫu mặc định
 DocType: Account,Income Account,Tài khoản thu nhập
 DocType: Payment Request,Amount in customer's currency,Tiền quy đổi theo ngoại tệ của khách
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,Giao hàng
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,Giao hàng
 DocType: Stock Reconciliation Item,Current Qty,Số lượng hiện tại
 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í"
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,Trước đó
 DocType: Appraisal Goal,Key Responsibility Area,Diện tích Trách nhiệm chính
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students","Lô Student giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students","Lô Student giúp bạn theo dõi chuyên cần, đánh giá và lệ phí cho sinh viên"
 DocType: Payment Entry,Total Allocated Amount,Tổng số tiền phân bổ
 DocType: Item Reorder,Material Request Type,Tài liệu theo yêu cầu Loại
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural Journal Entry for lương từ {0} đến {1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save","Lưu trữ Cục bộ là đầy đủ, không lưu"
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save","Lưu trữ Cục bộ là đầy đủ, không lưu"
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,Row {0}: Ươm Conversion Factor là bắt buộc
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,Tài liệu tham khảo
 DocType: Budget,Cost Center,Bộ phận chi phí
@@ -2525,25 +2529,26 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,Hide Id thuế của khách hàng từ giao dịch bán hàng
 DocType: Upload Attendance,Upload HTML,Tải lên HTML
 DocType: Employee,Relieving Date,Giảm ngày
-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.","Quy tắc định giá được thực hiện để ghi đè lên Giá liệt kê / xác định tỷ lệ phần trăm giảm giá, dựa trên một số tiêu chí."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.","Quy tắc định giá được thực hiện để ghi đè lên Giá liệt kê / xác định tỷ lệ phần trăm giảm giá, dựa trên một số tiêu chí."
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,Kho chỉ có thể biến động phát sinh thông qua chứng từ nhập kho / BB giao hàng (bán) / BB nhận hàng (mua)
 DocType: Employee Education,Class / Percentage,Lớp / Tỷ lệ phần trăm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,Trưởng phòng Marketing và Bán hàng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,Thuế thu nhập
-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.","Nếu quy tắc báo giá được tạo cho 'Giá', nó sẽ ghi đè lên 'Bảng giá', Quy tắc giá là giá hiệu lực cuối cùng. Vì vậy không nên có thêm chiết khấu nào được áp dụng. Do vậy, một giao dịch như Đơn đặt hàng, Đơn mua hàng v..v sẽ được lấy từ trường 'Giá' thay vì trường 'Bảng giá'"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.","Nếu quy tắc báo giá được tạo cho 'Giá', nó sẽ ghi đè lên 'Bảng giá', Quy tắc giá là giá hiệu lực cuối cùng. Vì vậy không nên có thêm chiết khấu nào được áp dụng. Do vậy, một giao dịch như Đơn đặt hàng, Đơn mua hàng v..v sẽ được lấy từ trường 'Giá' thay vì trường 'Bảng giá'"
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,Theo dõi Tiềm năng theo Loại Ngành.
 DocType: Item Supplier,Item Supplier,Mục Nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,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/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,Vui lòng nhập Item Code để có được hàng loạt không
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,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 +46,All Addresses.,Tất cả các địa chỉ.
 DocType: Company,Stock Settings,Thiết lập thông số hàng tồn kho
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"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"
 DocType: Vehicle,Electric,Điện
-DocType: Task,% Progress,% Tiến bộ
+DocType: Task,% Progress,% Tiến triển
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,Lãi / lỗ trên rác Asset
 DocType: Training Event,Will send an email about the event to employees with status 'Open',Sẽ gửi một email về các sự kiện để nhân viên có tư cách &#39;mở&#39;
 DocType: Task,Depends on Tasks,Phụ thuộc vào nhiệm vụ
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,Cây thư mục Quản lý Nhóm khách hàng
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,Các tệp đính kèm có thể được hiển thị mà không cần bật giỏ hàng
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,Tên Bộ phận Chi phí mới
 DocType: Leave Control Panel,Leave Control Panel,Để lại Control Panel
@@ -2556,12 +2561,10 @@
 DocType: Sales Invoice,Debit To,Để ghi nợ
 DocType: Delivery Note,Required only for sample item.,Yêu cầu chỉ cho mục mẫu.
 DocType: Stock Ledger Entry,Actual Qty After Transaction,Số lượng thực tế Sau khi giao dịch
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,Nhà cung cấp&gt; Loại nhà cung cấp
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},Không trượt lương tìm thấy giữa {0} và {1}
 ,Pending SO Items For Purchase Request,Trong khi chờ SO mục Đối với mua Yêu cầu
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,Tuyển sinh
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1} bị vô hiệu
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1} bị vô hiệu
 DocType: Supplier,Billing Currency,Ngoại tệ thanh toán
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,Cực lớn
@@ -2578,9 +2581,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,Sản phẩm nổi bật trang chủ
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,Tất cả đánh giá Groups
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,Mới Tên kho
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),Tổng số {0} ({1})
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),Tổng số {0} ({1})
 DocType: C-Form Invoice Detail,Territory,Địa bàn
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,Xin đề cập không có các yêu cầu thăm
 DocType: Stock Settings,Default Valuation Method,Phương pháp mặc định Định giá
 DocType: Vehicle Log,Fuel Qty,nhiên liệu Số lượng
 DocType: Production Order Operation,Planned Start Time,Planned Start Time
@@ -2596,7 +2599,7 @@
 DocType: Price List,Price List Master,Giá Danh sách Thầy
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,Tất cả các giao dịch bán hàng đều được gắn tag với nhiều **Nhân viên kd **  vì thế bạn có thể thiết lập và giám sát các mục tiêu kinh doanh
 ,S.O. No.,SO số
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Tiềm năng {0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},Vui lòng tạo Khách hàng từ Tiềm năng {0}
 DocType: Price List,Applicable for Countries,Áp dụng đối với các nước
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,Chỉ Rời khỏi ứng dụng với tình trạng &#39;Chấp Nhận&#39; và &#39;từ chối&#39; có thể được gửi
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},Tên sinh viên Group là bắt buộc trong hàng {0}
@@ -2640,7 +2643,7 @@
 DocType: Project,Copied From,Sao chép từ
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},Tên lỗi: {0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,Sự thiếu
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} không liên quan đến {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} không liên quan đến {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,Tại nhà cho nhân viên {0} đã được đánh dấu
 DocType: Packing Slip,If more than one package of the same type (for print),Nếu có nhiều hơn một gói cùng loại (đối với in)
 ,Salary Register,Mức lương Đăng ký
@@ -2659,7 +2662,7 @@
 DocType: Tax Rule,Use for Shopping Cart,Sử dụng cho Giỏ hàng
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},Giá trị {0} cho thuộc tính {1} không tồn tại trong danh sách các giá trị mục Giá trị thuộc tính cho mục {2}
 DocType: BOM Item,Scrap %,Phế liệu%
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Phí sẽ được phân phối không cân xứng dựa trên mục qty hoặc số tiền, theo lựa chọn của bạn"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection","Phí sẽ được phân phối không cân xứng dựa trên mục qty hoặc số tiền, theo lựa chọn của bạn"
 DocType: Maintenance Visit,Purposes,Mục đích
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,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 +71,"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"
@@ -2680,16 +2683,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,Quản lý Cây thư mục địa bàn
 DocType: Journal Entry Account,Sales Invoice,Hóa đơn bán hàng
 DocType: Journal Entry Account,Party Balance,Balance Đảng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,Vui lòng chọn Apply Giảm Ngày
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,Vui lòng chọn Apply Giảm Ngày
 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
-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.,Tỷ lệ phần trăm giảm giá có thể được áp dụng hoặc chống lại một danh sách giá hay cho tất cả Bảng giá.
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,Tỷ lệ phần trăm giảm giá có thể được áp dụng hoặc chống lại một danh sách giá hay cho tất cả Bảng giá.
 DocType: Purchase Invoice,Half-yearly,Nửa năm
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,Hạch toán kế toán cho hàng tồn kho
 DocType: Vehicle Service,Engine Oil,Dầu động cơ
 DocType: Sales Invoice,Sales Team1,Team1 bán hàng
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,Mục {0} không tồn tại
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,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: Employee Loan,Loan Details,Chi tiết vay
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,Row {0}: Đã hoàn thành Số lượng phải lớn hơn không.
@@ -2697,24 +2700,24 @@
 DocType: Account,Root Type,Loại gốc
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},Row # {0}: Không thể trả về nhiều hơn {1} cho khoản {2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,Âm mưu
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,Âm mưu
 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,Đơn vị tính cho mục
 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}
 DocType: Cheque Print Template,Primary Settings,Cài đặt tiểu học
 DocType: Purchase Invoice,Select Supplier Address,Chọn nhà cung cấp Địa chỉ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,Thêm nhân viên
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,Thêm nhân viên
 DocType: Purchase Invoice Item,Quality Inspection,Kiểm tra chất lượng
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,Tắm nhỏ
 DocType: Company,Standard Template,Mẫu chuẩn
 DocType: Training Event,Theory,Lý thuyết
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,Cảnh báo: vật tư yêu cầu có số lượng ít hơn mức tối thiểu
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,Tài khoản {0} bị đóng băng
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,Pháp nhân / Công ty con với một biểu đồ riêng của tài khoản thuộc Tổ chức.
 DocType: Payment Request,Mute Email,Mute Email
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco","Thực phẩm, đồ uống và thuốc lá"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán cho các phiếu chưa thanh toán {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},Chỉ có thể thực hiện thanh toán cho các phiếu chưa thanh toán {0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,Tỷ lệ hoa hồng không có thể lớn hơn 100
 DocType: Stock Entry,Subcontract,Cho thầu lại
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,Vui lòng nhập {0} đầu tiên
@@ -2754,7 +2757,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,Các kho hàng với giao dịch hiện tại không thể được chuyển đổi sang nhóm.
 DocType: Assessment Result Tool,Result HTML,kết quả HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,Hết hạn vào
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,Thêm sinh viên
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,Thêm sinh viên
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},Vui lòng chọn {0}
 DocType: C-Form,C-Form No,C-Mẫu Không
 DocType: BOM,Exploded_items,Exploded_items
@@ -2797,7 +2800,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,Amt
 DocType: Opportunity,Enter name of campaign if source of enquiry is campaign,Nhập tên của chiến dịch nếu nguồn gốc của cuộc điều tra là chiến dịch
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +38,Newspaper Publishers,Các nhà xuất bản báo
-apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +31,Select Fiscal Year,Chọn năm tài chính
+apps/erpnext/erpnext/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,Chọn năm tài chính
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,Sắp xếp lại Cấp
 DocType: Company,Chart Of Accounts Template,Chart of Accounts Template
 DocType: Attendance,Attendance Date,Ngày có mặt
@@ -2812,14 +2815,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,Trùng lặp mục
 DocType: Program Enrollment Tool,Get Students,Nhận học sinh
 DocType: Serial No,Under Warranty,Theo Bảo hành
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[Lỗi]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[Lỗi]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,'Bằng chữ' sẽ được hiển thị khi bạn lưu đơn bán hàng.
 ,Employee Birthday,Nhân viên sinh nhật
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,Sinh viên Công cụ hàng loạt Attendance
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,Giới hạn Crossed
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,Vốn đầu tư mạo hiểm
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,Một học kỳ với điều này &quot;Academic Year &#39;{0} và&#39; Tên hạn &#39;{1} đã tồn tại. Hãy thay đổi những mục này và thử lại.
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}","Như có những giao dịch hiện tại chống lại {0} mục, bạn không thể thay đổi giá trị của {1}"
 DocType: UOM,Must be Whole Number,Phải có nguyên số
 DocType: Leave Control Panel,New Leaves Allocated (In Days),Lá mới phân bổ (Trong ngày)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,Không nối tiếp {0} không tồn tại
@@ -2839,7 +2842,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,% của NVL đã có hoá đơn gắn với đơn đặt hàng này
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,Thời gian đóng cửa nhập
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,Chi phí bộ phận với các phát sinh đang có không thể chuyển đổi sang nhóm
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},Số tiền {0} {1} {2} {3}
 DocType: Account,Depreciation,Khấu hao
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),Nhà cung cấp (s)
 DocType: Employee Attendance Tool,Employee Attendance Tool,Nhân viên Công cụ Attendance
@@ -2863,7 +2866,7 @@
 DocType: Supplier,Last Day of the Next Month,Ngày cuối cùng của tháng kế tiếp
 DocType: Support Settings,Auto close Issue after 7 days,Auto Issue gần sau 7 ngày
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}","Để lại không thể được phân 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}"
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),Lưu ý:  ngày tham chiếu/đến hạn vượt quá số ngày được phép của khách hàng là {0} ngày
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,sinh viên nộp đơn
 DocType: Asset Category Account,Accumulated Depreciation Account,Tài khoản khấu hao lũy kế
 DocType: Stock Settings,Freeze Stock Entries,Đóng băng Cổ Entries
@@ -2874,7 +2877,7 @@
 ,Stock Analytics,Phân tích hàng tồn kho
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,Hoạt động không thể để trống
 DocType: Maintenance Visit Purpose,Against Document Detail No,Đối với tài liệu chi tiết Không
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,Loại Đảng là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,Loại Đảng là bắt buộc
 DocType: Quality Inspection,Outgoing,Đi
 DocType: Material Request,Requested For,Đối với yêu cầu
 DocType: Quotation Item,Against Doctype,Chống lại DOCTYPE
@@ -2891,11 +2894,11 @@
 DocType: Asset,Item Code,Mã hàng
 DocType: Production Planning Tool,Create Production Orders,Tạo đơn đặt hàng sản xuất
 DocType: Serial No,Warranty / AMC Details,Bảo hành /chi tiết AMC
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho nhóm dựa trên hoạt động
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,Chọn sinh viên theo cách thủ công cho Nhóm dựa trên hoạt động
 DocType: Journal Entry,User Remark,Người sử dụng Ghi chú
 DocType: Lead,Market Segment,Phân khúc thị trường
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},Số tiền trả không có thể lớn hơn tổng số dư âm {0}
 DocType: Employee Internal Work History,Employee Internal Work History,Lịch sử nhân viên nội bộ làm việc
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),Đóng cửa (Tiến sĩ)
 DocType: Cheque Print Template,Cheque Size,Kích Séc
@@ -2911,7 +2914,7 @@
 DocType: Production Planning Tool,Create Material Requests,Các yêu cầu tạo ra vật liệu
 DocType: Employee Education,School/University,Học / Đại học
 DocType: Payment Request,Reference Details,Chi tiết tham khảo
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,Giá trị dự kiến After Life viết phải nhỏ hơn tổng tiền mua hàng
 DocType: Sales Invoice Item,Available Qty at Warehouse,Số lượng có sẵn tại kho
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,Số tiền trên Bill
 DocType: Asset,Double Declining Balance,Đôi Balance sụt giảm
@@ -2932,20 +2935,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry","Tài khoản chênh lệch phải là một loại tài khoản tài sản / trách nhiệm pháp lý, kể từ khi hòa giải cổ này là một Entry Mở"
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},Số tiền giải ngân không thể lớn hơn Số tiền vay {0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},Số mua hàng cần thiết cho mục {0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,Sản xuất theo thứ tự không được tạo ra
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,Sản xuất theo thứ tự không được tạo ra
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date','Từ Ngày' phải sau 'Đến Ngày'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},Không thể thay đổi tình trạng như sinh viên {0} được liên kết với các ứng dụng sinh viên {1}
 DocType: Asset,Fully Depreciated,khấu hao hết
 ,Stock Projected Qty,Dự kiến cổ phiếu Số lượng
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},Khách hàng {0} không thuộc về dự án {1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,Attendance đánh dấu HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề nghị, giá thầu bạn đã gửi cho khách hàng của bạn"
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers","Báo giá là đề nghị, giá thầu bạn đã gửi cho khách hàng của bạn"
 DocType: Sales Order,Customer's Purchase Order,Đơn Mua hàng của khách hàng
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,Số thứ tự và hàng loạt
 DocType: Warranty Claim,From Company,Từ Công ty
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,Sum của Điểm của tiêu chí đánh giá cần {0} được.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,Giá trị hoặc lượng
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,Hãy thiết lập Số khấu hao Thẻ vàng
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,Giá trị hoặc lượng
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,Đơn đặt hàng sản xuất không thể được nâng lên cho:
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,Phút
 DocType: Purchase Invoice,Purchase Taxes and Charges,Thuế mua và lệ phí
@@ -2958,7 +2961,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,Tất cả các kho hàng
 DocType: Sales Partner,Retailer,Cửa hàng bán lẻ
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,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 +124,All Supplier Types,Nhà cung cấp tất cả các loại
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,Nhà cung cấp tất cả các loại
 DocType: Global Defaults,Disable In Words,"Vô hiệu hóa ""Số tiền bằng chữ"""
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,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 +101,Quotation {0} not of type {1},Báo giá {0} không thuộc loại {1}
@@ -2967,6 +2970,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,Tài khoản thấu chi ngân hàng
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,Làm cho lương trượt
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,Hàng # {0}: Khoản tiền phân bổ không thể lớn hơn số tiền chưa thanh toán.
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,Xem BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,Các khoản cho vay được bảo đảm
 DocType: Purchase Invoice,Edit Posting Date and Time,Sửa viết bài Date and Time
@@ -3006,7 +3010,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},Không được phép cập nhật lớn hơn giao dịch cổ phiếu {0}
 DocType: Purchase Invoice Item,PR Detail,PR chi tiết
 DocType: Sales Order,Fully Billed,Được quảng cáo đầy đủ
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},Hãy thiết lập tài khoản thanh toán mặc định trong nhân viên {0}
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +20,Cash In Hand,Tiền mặt trong tay
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,Delivery warehouse required for stock item {0},Kho giao hàng yêu cầu cho mục cổ phiếu {0}
 DocType: Packing Slip,The gross weight of the package. Usually net weight + packaging material weight. (for print),Tổng trọng lượng của gói. Thường net trọng lượng đóng gói + trọng lượng vật liệu. (Đối với in)
@@ -3017,7 +3020,7 @@
 DocType: Student Group,Group Based On,Dựa trên nhóm
 DocType: Journal Entry,Bill Date,Phiếu TT ngày
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required","Dịch vụ Item, Type, tần số và mức chi phí được yêu cầu"
-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:"
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:","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:"
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},Bạn có thực sự muốn Nộp tất cả trượt Mức lương từ {0} đến {1}
 DocType: Cheque Print Template,Cheque Height,Chiều cao Séc
 DocType: Supplier,Supplier Details,Thông tin chi tiết nhà cung cấp
@@ -3029,7 +3032,7 @@
 DocType: Vehicle Log,Invoice Ref,Hóa đơn Ref
 DocType: Purchase Order,Recurring Order,Đặt hàng theo định kỳ
 DocType: Company,Default Income Account,Tài khoản thu nhập mặc định
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,Nhóm khách hàng / khách hàng
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,Nhóm khách hàng / khách hàng
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),Khép kín tài chính năm Lợi nhuận / Lỗ (Credit)
 DocType: Sales Invoice,Time Sheets,thời gian Sheets
 DocType: Payment Gateway Account,Default Payment Request Message,Yêu cầu thanh toán mặc định tin nhắn
@@ -3049,10 +3052,10 @@
 DocType: Notification Control,Quotation Message,thông tin báo giá
 DocType: Employee Loan,Employee Loan Application,Ứng dụng lao động cho vay
 DocType: Issue,Opening Date,Mở ngày
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,Tham dự đã được đánh dấu thành công.
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,Tham dự đã được đánh dấu thành công.
 DocType: Journal Entry,Remark,Nhận xét
 DocType: Purchase Receipt Item,Rate and Amount,Đơn giá và Thành tiền
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},Loại Tài khoản cho {0} phải là {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},Loại Tài khoản cho {0} phải là {1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,Lá và Holiday
 DocType: School Settings,Current Academic Term,Học thuật hiện tại
 DocType: School Settings,Current Academic Term,Học thuật hiện tại
@@ -3075,7 +3078,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,Nhóm sinh viên
 DocType: Shopping Cart Settings,Quotation Series,Báo giá seri
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item","Một mục tồn tại với cùng một tên ({0}), hãy thay đổi tên nhóm mục hoặc đổi tên mục"
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,Vui lòng chọn của khách hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,Vui lòng chọn của khách hàng
 DocType: C-Form,I,tôi
 DocType: Company,Asset Depreciation Cost Center,Chi phí bộ phận - khấu hao tài sản
 DocType: Sales Order Item,Sales Order Date,Ngày đơn đặt hàng
@@ -3094,20 +3097,20 @@
 DocType: Vehicle,Insurance Details,Chi tiết bảo hiểm
 DocType: Account,Payable,Phải nộp
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,Vui lòng nhập kỳ hạn trả nợ
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),Con nợ ({0})
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),Con nợ ({0})
 DocType: Pricing Rule,Margin,Biên
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,Khách hàng mới
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,Lợi nhuận gộp%
 DocType: Appraisal Goal,Weightage (%),Weightage (%)
 DocType: Bank Reconciliation Detail,Clearance Date,Ngày chốt sổ
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,Tổng tiền mua hàng là bắt buộc
 DocType: Lead,Address Desc,Giải quyết quyết định
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,Đảng là bắt buộc
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,Đảng là bắt buộc
 DocType: Journal Entry,JV-,JV-
 DocType: Topic,Topic Name,Tên chủ đề
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,Ít nhất bán hàng hoặc mua hàng phải được lựa chọn
-DocType: Grading Structure,Grade Intervals,Khoảng lớp
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,Chọn bản chất của doanh nghiệp của bạn.
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},Hàng # {0}: Mục nhập trùng lặp trong Tài liệu tham khảo {1} {2}
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,Trường hợp hoạt động sản xuất được thực hiện.
 DocType: Asset Movement,Source Warehouse,Kho nguồn
 DocType: Installation Note,Installation Date,Cài đặt ngày
@@ -3144,7 +3147,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,Tiêu đề trang cho các mẫu tài liệu in
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"Tiêu đề cho các mẫu in, ví dụ như hóa đơn chiếu lệ."
 DocType: Student Guardian,Student Guardian,Người giám hộ sinh viên
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là Inclusive
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,Valuation type charges can not marked as Inclusive,Phí kiểu định giá không thể đánh dấu là Inclusive
 DocType: POS Profile,Update Stock,Cập nhật hàng tồn kho
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +100,Different UOM for items will lead to incorrect (Total) Net Weight value. Make sure that Net Weight of each item is in the same UOM.,UOM khác nhau cho các hạng mục sẽ dẫn đến (Tổng) giá trị Trọng lượng Tịnh không chính xác. Hãy chắc chắn rằng Trọng lượng Tịnh của mỗi hạng mục là trong cùng một UOM.
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM Rate
@@ -3172,7 +3175,7 @@
 DocType: Company,Exchange Gain / Loss Account,Trao đổi Gain / Tài khoản lỗ
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,Nhân viên và chấm công
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,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 +117,Fill the form and save it,Điền vào mẫu và lưu nó
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,Số lượng thực tế trong kho
@@ -3188,7 +3191,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,Sắp xếp lại Qty
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,Hiện tại Hở Job
 DocType: Company,Stock Adjustment Account,Tài khoản Điều chỉnh Hàng tồn kho
-DocType: Journal Entry,Write Off,Viết một bài báo
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,Viết một bài báo
 DocType: Timesheet Detail,Operation ID,Operation ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.","Hệ thống người dùng (đăng nhập) ID. Nếu được thiết lập, nó sẽ trở thành mặc định cho tất cả các hình thức nhân sự."
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}: Từ {1}
@@ -3199,27 +3202,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,Nhà cung cấp mang đến cho khách hàng
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/vật tư/{0}) đã hết
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,Ngày tiếp theo phải lớn hơn gửi bài ngày
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,Hiện thuế break-up
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,Hiện thuế break-up
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},Ngày đến hạn /ngày tham chiếu không được sau {0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,Số liệu nhập khẩu và xuất khẩu
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it","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 nó"
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,Không có học sinh Tìm thấy
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,Không có học sinh Tìm thấy
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,Hóa đơn viết bài ngày
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,Bán
 DocType: Sales Invoice,Rounded Total,Tròn số
 DocType: Product Bundle,List items that form the package.,Danh sách vật phẩm tạo thành các gói.
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,Tỷ lệ phần trăm phân bổ phải bằng 100%
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,Vui lòng chọn viết bài ngày trước khi lựa chọn Đảng
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,Vui lòng chọn viết bài ngày trước khi lựa chọn Đảng
 DocType: Program Enrollment,School House,School House
 DocType: Serial No,Out of AMC,Của AMC
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vui lòng chọn Báo giá
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,Vui lòng chọn Báo giá
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người có vai trò Quản lý Bán hàng Chính {0}
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,Vui lòng chọn Báo giá
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,Số khấu hao Thẻ vàng không thể lớn hơn Tổng số khấu hao
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,Thực hiện bảo trì đăng nhập
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,Vui lòng liên hệ với người có vai trò Quản lý Bán hàng Chính {0}
 DocType: Company,Default Cash Account,Tài khoản mặc định tiền
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,Quản trị Công ty (không phải khách hàng hoặc nhà cung cấp)
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,Điều này được dựa trên sự tham gia của sinh viên này
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,Không có Sinh viên trong
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,Thêm nhiều mặt hàng hoặc hình thức mở đầy đủ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',Vui lòng nhập 'ngày dự kiến giao hàng'
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,Phiếu giao hàng {0} phải được hủy bỏ trước khi hủy bỏ đơn đặt hàng này
@@ -3251,6 +3255,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,Khoản 3
 DocType: Purchase Order,Customer Contact Email,Email Liên hệ Khách hàng
 DocType: Warranty Claim,Item and Warranty Details,Hàng và bảo hành chi tiết
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,Mã hàng&gt; Nhóm mặt hàng&gt; Thương hiệu
 DocType: Sales Team,Contribution (%),Đóng góp (%)
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,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/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,Chọn Chương trình để tìm các khóa học bắt buộc.
@@ -3266,9 +3271,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,Trước khi reconciliation
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},Để {0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),Thuế và Phí bổ xung (tiền tệ công ty)
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,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
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,Mục {0} phải là một tài sản cố định mục
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,Mục {0} phải là một tài sản cố định mục
 DocType: Item,Default BOM,Mặc định HĐQT
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,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
@@ -3278,8 +3283,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,Ô tô
 DocType: Vehicle,Insurance Company,Công ty bảo hiểm
 DocType: Asset Category Account,Fixed Asset Account,Tài khoản TSCĐ
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,biến số
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,Giao hàng tận nơi từ Lưu ý
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,biến số
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,Giao hàng tận nơi từ Lưu ý
 DocType: Student,Student Email Address,Địa chỉ Email Sinh viên
 DocType: Timesheet Detail,From Time,Thời gian từ
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,Trong kho:
@@ -3291,12 +3296,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,Danh sách Tỷ giá
 DocType: Purchase Invoice Item,Rate,Đơn giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,Tập
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,Tên địa chỉ
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,Tên địa chỉ
 DocType: Stock Entry,From BOM,Từ BOM
 DocType: Assessment Code,Assessment Code,Mã Đánh giá
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,Cơ bản
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,Giao dịch hàng tồn kho trước ngày {0} được đóng băng
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',Vui lòng click vào 'Tạo lịch'
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m","ví dụ như Kg, đơn vị, Nos, m"
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,Không tham khảo là bắt buộc nếu bạn bước vào tham khảo ngày
 DocType: Bank Reconciliation Detail,Payment Document,Tài liệu Thanh toán
@@ -3304,19 +3309,19 @@
 DocType: Salary Slip,Salary Structure,Cơ cấu tiền lương
 DocType: Account,Bank,Ngân hàng
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,Hãng hàng không
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,Vấn đề liệu
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,Vấn đề liệu
 DocType: Material Request Item,For Warehouse,Cho kho hàng
 DocType: Employee,Offer Date,Phục vụ ngày
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,Các Báo giá
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,Bạn đang ở chế độ offline. Bạn sẽ không thể để lại cho đến khi bạn có mạng.
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,Không có nhóm sinh viên tạo ra.
 DocType: Purchase Invoice Item,Serial No,Không nối tiếp
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,Hàng tháng trả nợ Số tiền không thể lớn hơn Số tiền vay
-apps/erpnext/erpnext/maintenance/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
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,Thông tin chi tiết vui lòng nhập Maintaince đầu tiên
 DocType: Purchase Invoice,Print Language,In Ngôn ngữ
 DocType: Salary Slip,Total Working Hours,Tổng số giờ làm việc
 DocType: Stock Entry,Including items for sub assemblies,Bao gồm các mặt hàng cho các tiểu hội
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,Nhập giá trị phải được tích cực
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,Nhập giá trị phải được tích cực
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,Tất cả các vùng lãnh thổ
 DocType: Purchase Invoice,Items,Khoản mục
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,Sinh viên đã được ghi danh.
@@ -3336,17 +3341,15 @@
 DocType: Issue,Opening Time,Thời gian mở
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,"""Từ ngày đến ngày"" phải có"
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,Chứng khoán và Sở Giao dịch hàng hóa
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',Mặc định Đơn vị đo lường cho Variant &#39;{0}&#39; phải giống như trong Template &#39;{1}&#39;
 DocType: Shipping Rule,Calculate Based On,Tính toán dựa trên
 DocType: Delivery Note Item,From Warehouse,Từ kho
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,Không Items với Tuyên ngôn Nhân Vật liệu để sản xuất
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,Không Items với Tuyên ngôn Nhân Vật liệu để sản xuất
 DocType: Assessment Plan,Supervisor Name,Tên Supervisor
 DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
 DocType: Program Enrollment Course,Program Enrollment Course,Khóa học ghi danh chương trình
-DocType: Grading Structure,Grading Structure,cấu trúc phân loại
 DocType: Purchase Taxes and Charges,Valuation and Total,Định giá và Tổng
 DocType: Tax Rule,Shipping City,Vận Chuyển Thành phố
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,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: Notification Control,Customize the Notification,Tùy chỉnh thông báo
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,Lưu chuyển tiền tệ từ hoạt động
 DocType: Sales Invoice,Shipping Rule,Quy tắc giao hàng
@@ -3367,8 +3370,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,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 +334,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,Khai mạc ngày nên trước ngày kết thúc
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,Vui lòng chọn ngày đầu tiên viết bài
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,Khai mạc ngày nên trước ngày kết thúc
 DocType: Leave Control Panel,Carry Forward,Carry Forward
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,Chi phí bộ phận với các phát sinh hiện có không thể được chuyển đổi sang sổ cái
 DocType: Department,Days for which Holidays are blocked for this department.,Ngày mà ngày lễ sẽ bị chặn cho bộ phận này.
@@ -3381,7 +3384,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,Đính kèm tiêu đề trang
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Lần cuối cùng
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,Lần cuối cùng
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',Không thể khấu trừ khi loại là 'định giá' hoặc 'Định giá và Total'
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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.","Danh sách đầu thuế của bạn (ví dụ như thuế GTGT, Hải vv; họ cần phải có tên duy nhất) và tỷ lệ tiêu chuẩn của họ. Điều này sẽ tạo ra một mẫu tiêu chuẩn, trong đó bạn có thể chỉnh sửa và thêm nhiều hơn sau này."
 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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,Thanh toán phù hợp với hoá đơn
@@ -3397,7 +3400,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),Tổng số (Amt)
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,Giải trí & Giải trí
 DocType: Quality Inspection,Item Serial No,Mục Serial No
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,Tạo nhân viên ghi
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,Tạo nhân viên ghi
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,Tổng số hiện tại
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,Báo cáo kế toán
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,Giờ
@@ -3410,10 +3413,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,không xác định
 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ế
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,Điểm bán hàng
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,Điểm bán hàng
 DocType: Payment Entry,Received Amount,Số tiền nhận được
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,Vui lòng cài đặt Hệ thống Đặt tên Nhân viên trong Nguồn nhân lực&gt; Cài đặt Nhân sự
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order","Tạo cho số lượng đầy đủ, bỏ qua số lượng đã đặt hàng"
 DocType: Account,Tax,Thuế
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,không đánh dấu
@@ -3426,9 +3427,9 @@
 DocType: Batch,Source Document Name,Tên tài liệu nguồn
 DocType: Batch,Source Document Name,Tên tài liệu nguồn
 DocType: Job Opening,Job Title,Chức vụ
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,tạo người dùng
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,tạo người dùng
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,Gram
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,Số lượng để sản xuất phải lớn hơn 0.
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,Thăm báo cáo cho các cuộc gọi bảo trì.
 DocType: Stock Entry,Update Rate and Availability,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ị.
@@ -3438,28 +3439,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},Tài khoản chi phí là bắt buộc đối với mục {0}
 DocType: BOM,Website Description,Mô tả Website
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,Thay đổi ròng trong vốn chủ sở hữu
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,Hãy hủy mua hóa đơn {0} đầu tiên
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}","Địa chỉ email phải là duy nhất, đã tồn tại cho {0}"
 DocType: Serial No,AMC Expiry Date,Ngày hết hạn hợp đồng bảo hành (AMC)
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,Biên lai
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,Biên lai
 ,Sales Register,Đăng ký bán hàng
 DocType: Daily Work Summary Settings Company,Send Emails At,Gửi email Tại
 DocType: Quotation,Quotation Lost Reason,lý do báo giá thất bại
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,Chọn tên miền của bạn
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},tham chiếu giao dịch không có {0} ngày {1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,Không có gì phải chỉnh sửa là.
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,Tóm tắt cho tháng này và các hoạt động cấp phát
 DocType: Customer Group,Customer Group Name,Tên Nhóm khách hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,Chưa có Khách!
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,Báo cáo lưu chuyển tiền mặt
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},Số tiền cho vay không thể vượt quá Số tiền cho vay tối đa của {0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,giấy phép
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,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 +462,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.py +218,Please enter Write Off Account,Vui lòng nhập Viết Tắt tài khoản
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,Last Order ngày
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},Tài khoản {0} không thuộc về công ty {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,Số sê-ri trong hàng {0} không khớp với Lưu lượng giao hàng
 DocType: Student,Guardian Details,Chi tiết người giám hộ
 DocType: C-Form,C-Form,C-Mẫu
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,Đánh dấu chấm cho nhiều nhân viên
@@ -3484,20 +3487,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',Row {0} # Tài khoản phải được loại &#39;tài sản cố định &quot;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,Số lượng ra
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,Quy tắc để tính toán tiền vận chuyển để bán
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,Series là bắt buộc
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,Series là bắt buộc
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,Dịch vụ tài chính
 DocType: Student Sibling,Student ID,thẻ học sinh
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,Các loại hoạt động Thời gian Logs
 DocType: Tax Rule,Sales,Bán hàng
 DocType: Stock Entry Detail,Basic Amount,Số tiền cơ bản
 DocType: Training Event,Exam,Thi
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},phải có kho cho vật tư {0}
 DocType: Leave Allocation,Unused leaves,Lá chưa sử dụng
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,Cr
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,Cr
 DocType: Tax Rule,Billing State,Bang thanh toán
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,Truyền
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1} không liên quan đến Tài khoản Đối tác {2}
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1} không liên quan đến Tài khoản Đối tác {2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),Lấy BOM nổ (bao gồm các cụm chi tiết)
 DocType: Authorization Rule,Applicable To (Employee),Để áp dụng (nhân viên)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,Ngày đến hạn là bắt buộc
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,Tăng cho Attribute {0} không thể là 0
@@ -3508,26 +3511,26 @@
 ,Inactive Customers,Khách hàng không được kích hoạt
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,Hóa đơn mua hàng
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,Làm thế nào giá Quy tắc được áp dụng?
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,Làm thế nào giá Quy tắc được áp dụng?
 DocType: Stock Entry,Delivery Note No,Giao hàng tận nơi Lưu ý Không
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created","Nếu được chọn, chỉ mua yêu cầu nguyên liệu cho nguyên liệu cuối cùng sẽ được đưa vào các yêu cầu vật liệu. Nếu không, yêu cầu vật liệu cho các hạng mục phụ huynh sẽ được tạo ra"
 DocType: Cheque Print Template,Message to show,Tin nhắn để hiển thị
 DocType: Company,Retail,Lĩnh vực bán lẻ
 DocType: Attendance,Absent,Vắng mặt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,Sản phẩm lô
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,Sản phẩm lô
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,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: Timesheet,TS-,TS-
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Hoặc là ghi nợ hoặc số tiền tín dụng là cần thiết cho {2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}: Ghi nợ hoặc Tín dụng là yêu cầu bắt buộc với {2}
 DocType: GL Entry,Remarks,Ghi chú
 DocType: Payment Entry,Account Paid From,Tài khoản Trích nợ
 DocType: Purchase Order Item Supplied,Raw Material Item Code,Nguyên liệu Item Code
 DocType: Journal Entry,Write Off Based On,Viết Tắt Dựa trên
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,Hãy Chì
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,Hãy Chì
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,In và Văn phòng phẩm
 DocType: Stock Settings,Show Barcode Field,Hiện Dòng mã vạch
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,Gửi email Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,Gửi email Nhà cung cấp
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.","Mức lương đã được xử lý cho giai đoạn từ {0} và {1}, Để lại khoảng thời gian ứng dụng không thể được giữa phạm vi ngày này."
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,Bản ghi cài đặt cho một Số sản
 DocType: Guardian Interest,Guardian Interest,người giám hộ lãi
@@ -3540,6 +3543,7 @@
 DocType: Offer Letter,Awaiting Response,Đang chờ Response
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,Ở trên
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},thuộc tính không hợp lệ {0} {1}
+DocType: Supplier,Mention if non-standard payable account,Đề cập đến tài khoản phải trả phi tiêu chuẩn
 DocType: Salary Slip,Earning & Deduction,Thu nhập và khoản giảm trừ
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,Tùy chọn. Thiết lập này sẽ được sử dụng để lọc xem các giao dịch khác nhau.
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,Tỷ lệ tiêu cực Định giá không được phép
@@ -3555,10 +3559,9 @@
 DocType: Production Order Item,Production Order Item,Sản xuất theo thứ tự hàng
 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/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,Chi phí của tài sản Loại bỏ
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,phần ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}: Bộ phận chi phí là bắt buộc đối với vật tư hàng hóa {2}
 DocType: Vehicle,Policy No,chính sách Không
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,Chọn mục từ Sản phẩm theo lô
 DocType: Asset,Straight Line,Đường thẳng
 DocType: Project User,Project User,Dự án tài
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,Chia
@@ -3576,7 +3579,7 @@
 DocType: Program Enrollment Tool,Get Students From,Nhận Sinh viên Từ
 DocType: Hub Settings,Seller Country,Người bán Country
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,Xuất bản mục trên Website
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,Nhóm sinh viên của bạn theo lô
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,Nhóm sinh viên của bạn theo lô
 DocType: Authorization Rule,Authorization Rule,Quy tắc ủy quyền
 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 +85,Specifications,Thông số kỹ thuật
@@ -3628,14 +3631,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,Séc ngày
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},Tài khoản {0}: tài khoản mẹ {1} không thuộc về công ty: {2}
 DocType: Program Enrollment Tool,Student Applicants,Ứng sinh viên
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,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/setup/doctype/company/company.js +65,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,vào ngày
 DocType: Appraisal,HR,nhân sự
 DocType: Program Enrollment,Enrollment Date,ngày đăng ký
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,Quản chế
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,Linh kiện lương
 DocType: Program Enrollment Tool,New Academic Year,Năm mới học
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,Return / Credit Note
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,Return / Credit Note
 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 +28,Total Paid Amount,Tổng số tiền trả
 DocType: Production Order Item,Transferred Qty,Số lượng chuyển giao
@@ -3655,7 +3658,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.","Loại lá như bình thường, bệnh vv"
 DocType: Email Digest,Send regular summary reports via Email.,Gửi báo cáo tóm tắt thường xuyên qua Email.
 DocType: Payment Entry,PE-,pe-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},Hãy thiết lập tài khoản mặc định trong Loại Chi phí bồi thường {0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},Hãy thiết lập tài khoản mặc định trong Loại Chi phí bồi thường {0}
 DocType: Assessment Result,Student Name,Tên học sinh
 DocType: Brand,Item Manager,Mã Manager
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,bảng lương phải trả
@@ -3676,6 +3679,7 @@
 ,Sales Funnel,Kênh bán hàng
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,Tên viết tắt là bắt buộc
 DocType: Project,Task Progress,Tiến độ công việc
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,Xe đẩy
 ,Qty to Transfer,Số lượng để chuyển
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,Báo giá cho Tiềm năng hoặc Khách hàng.
 DocType: Stock Settings,Role Allowed to edit frozen stock,Vai trò được phép chỉnh sửa cổ đông lạnh
@@ -3703,13 +3707,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,Mục khôn ngoan chi tiết thuế
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,Viện Tên viết tắt
 ,Item-wise Price List Rate,Item-khôn ngoan Giá liệt kê Tỷ giá
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,Báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,Báo giá của NCC
 DocType: Quotation,In Words will be visible once you save the Quotation.,"""Bằng chữ"" sẽ được hiển thị ngay khi bạn lưu các báo giá."
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},Số lượng ({0}) không thể là một phân số trong hàng {1}
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,thu thập Phí
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},Mã vạch {0} đã được sử dụng trong mục {1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,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 ngày này vào lịch công tác
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,Quy tắc để thêm chi phí vận chuyển.
 DocType: Item,Opening Stock,mở Cổ
@@ -3727,8 +3731,8 @@
  Cập nhật qua 'Giờ'"
 DocType: Customer,From Lead,Từ Tiềm năng
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,Đơn đặt hàng phát hành để sản xuất.
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,Chọn năm tài chính ...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,Chọn năm tài chính ...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,POS hồ sơ cần thiết để làm cho POS nhập
 DocType: Program Enrollment Tool,Enroll Students,Ghi danh học sinh
 DocType: Hub Settings,Name Token,Tên Mã
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,Tiêu chuẩn bán hàng
@@ -3739,7 +3743,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0} gắn với Hóa đơn bán hàng {1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation 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: Customer,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: Production Order,Required Items,mục bắt buộc
 DocType: Stock Ledger Entry,Stock Value Difference,Giá trị cổ phiếu khác biệt
@@ -3760,7 +3764,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,Mục tiêu đề ra mục Nhóm-khôn ngoan cho người bán hàng này.
 DocType: Stock Settings,Freeze Stocks Older Than [Days],Cổ phiếu đóng băng cũ hơn [Ngày]
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,Row # {0}: tài sản là bắt buộc đối với tài sản cố định mua / bán
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +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.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.","Nếu hai hoặc nhiều Rules giá được tìm thấy dựa trên các điều kiện trên, ưu tiên được áp dụng. Ưu tiên là một số từ 0 đến 20, trong khi giá trị mặc định là số không (trống). Số cao hơn có nghĩa là nó sẽ được ưu tiên nếu có nhiều Rules giá với điều kiện tương tự."
 apps/erpnext/erpnext/controllers/trends.py +36,Fiscal Year: {0} does not exists,Năm tài chính: {0} không tồn tại
 DocType: Currency Exchange,To Currency,Để tệ
 DocType: Leave Block List,Allow the following users to approve Leave Applications for block days.,Cho phép người sử dụng sau phê duyệt ứng dụng Để lại cho khối ngày.
@@ -3786,7 +3790,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,Mục {0} bỏ qua vì nó không phải là một mục kho
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,Trình tự sản xuất này để chế biến tiếp.
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +21,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Không áp dụng giá quy tắc trong giao dịch cụ thể, tất cả các quy giá áp dụng phải được vô hiệu hóa."
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.","Không áp dụng giá quy tắc trong giao dịch cụ thể, tất cả các quy giá áp dụng phải được vô hiệu hóa."
 DocType: Assessment Group,Parent Assessment Group,Nhóm đánh giá cha mẹ
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,việc làm
 ,Sales Order Trends,các xu hướng đặt hàng
@@ -3797,7 +3801,7 @@
 DocType: Stock Entry Detail,Additional Cost,Chi phí bổ sung
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,Ngày Kết thúc Năm tài chính
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher","Không thể lọc dựa trên số hiệu Voucher, nếu nhóm theo Voucher"
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,Tạo báo giá của NCC
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,Tạo báo giá của NCC
 DocType: Quality Inspection,Incoming,Đến
 DocType: BOM,Materials Required (Exploded),Vật liệu bắt buộc (phát nổ)
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself","Thêm người dùng để tổ chức của bạn, trừ chính mình"
@@ -3825,6 +3829,7 @@
 DocType: Employee,History In Company,Trong lịch sử Công ty
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,Bản tin
 DocType: Stock Ledger Entry,Stock Ledger Entry,Chứng từ sổ cái hàng tồn kho
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,Khách hàng&gt; Nhóm Khách hàng&gt; Lãnh thổ
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,Cùng mục đã được nhập nhiều lần
 DocType: Department,Leave Block List,Để lại Block List
 DocType: Sales Invoice,Tax ID,Mã số thuế
@@ -3834,7 +3839,7 @@
 DocType: Customer,Sales Partner and Commission,Đại lý bán hàng và hoa hồng
 DocType: Employee Loan,Rate of Interest (%) / Year,Tỷ lệ lãi (%) / năm
 ,Project Quantity,Dự án Số lượng
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Distribute Phí Dựa On&#39;"
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'","Tổng số {0} cho tất cả các mặt hàng là số không, có thể bạn nên thay đổi &#39;Distribute Phí Dựa On&#39;"
 DocType: Opportunity,To Discuss,Để thảo luận
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0} đơn vị của {1} cần thiết trong {2} để hoàn thành giao dịch này.
 DocType: Loan Type,Rate of Interest (%) Yearly,Tỷ lệ lãi (%) hàng năm
@@ -3849,7 +3854,7 @@
 DocType: Purchase Invoice,Return,Trở về
 DocType: Production Order Operation,Production Order Operation,Sản xuất tự Operation
 DocType: Pricing Rule,Disable,Vô hiệu hóa
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,Phương thức thanh toán là cần thiết để thực hiện thanh toán
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,Phương thức thanh toán là cần thiết để thực hiện thanh toán
 DocType: Project Task,Pending Review,Đang chờ xem xét
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}","Tài sản {0} không thể được loại bỏ, vì nó đã được {1}"
 DocType: Task,Total Expense Claim (via Expense Claim),Tổng số yêu cầu bồi thường chi phí (thông qua Chi Claim)
@@ -3857,11 +3862,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,Đánh dấu Absent
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},Row {0}: Tiền tệ của BOM # {1} phải bằng tiền mà bạn chọn {2}
 DocType: Journal Entry Account,Exchange Rate,Tỷ giá
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,Đơn đặt hàng {0} chưa duyệt
 DocType: Homepage,Tag Line,Dòng Tag
 DocType: Fee Component,Fee Component,phí Component
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,Quản lý đội tàu
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,Thêm các mục từ
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,Thêm các mục từ
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},Kho {0}: Tài khoản mẹ {1} không thuộc công ty {2}
 DocType: Cheque Print Template,Regular,Đều đặn
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,Tổng weightage của tất cả các tiêu chí đánh giá phải là 100%
@@ -3874,7 +3879,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Warehouse {0} does not exist,Kho {0} không tồn tại
 apps/erpnext/erpnext/hub_node/page/hub/register_in_hub.html +2,Register For ERPNext Hub,Đăng ký các ERPNext Hub
 DocType: Monthly Distribution,Monthly Distribution Percentages,Tỷ lệ phân phối hàng tháng
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +36,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,Các sản phẩm được chọn không thể có hàng loạt
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry","Tỷ lệ đánh giá không tìm thấy cho {0} Item, được yêu cầu để làm bút toán cho {1} {2}. Nếu mục được giao dịch như là một mục mẫu trong {1}, hãy đề cập rằng trong {1} mục bảng. Nếu không, hãy tạo ra một giao dịch chứng khoán đến cho tỷ lệ định giá mục hoặc đề cập trong hồ sơ Item, và sau đó thử submiting / hủy mục này"
 DocType: Delivery Note,% of materials delivered against this Delivery Note,% của NVL đã được giao gắn với BB Giao hàng này
 DocType: Project,Customer Details,Chi tiết khách hàng
@@ -3883,15 +3888,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,Nhập tham số url cho người nhận nos
 DocType: Payment Entry,Paid Amount,Số tiền thanh toán
 DocType: Assessment Plan,Supervisor,Giám sát viên
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,Trực tuyến
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,Trực tuyến
 ,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
 DocType: Assessment Result Tool,Assessment Result Tool,Công cụ đánh giá kết quả
 DocType: BOM Scrap Item,BOM Scrap Item,BOM phế liệu mục
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,đơn đặt hàng gửi không thể bị xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'","Tài khoản đang dư Nợ, bạn không được phép thiết lập 'Số Dư TK phải' là 'Có'"
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Quality Management,Quản lý chất lượng
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,Mục {0} đã bị vô hiệu hóa
 DocType: Employee Loan,Repay Fixed Amount per Period,Trả cố định Số tiền cho mỗi thời kỳ
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},Vui lòng nhập số lượng cho hàng {0}
 DocType: Employee External Work History,Employee External Work History,Nhân viên làm việc ngoài Lịch sử
@@ -3918,7 +3923,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,Email ID Sinh viên
 DocType: Employee,Notice (days),Thông báo (ngày)
 DocType: Tax Rule,Sales Tax Template,Template Thuế bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,Chọn mục để lưu các hoá đơn
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,Chọn mục để lưu các hoá đơn
 DocType: Employee,Encashment Date,Encashment Date
 DocType: Training Event,Internet,Internet
 DocType: Account,Stock Adjustment,Điều chỉnh hàng tồn kho
@@ -3942,7 +3947,7 @@
 DocType: Item Variant Attribute,Attribute,Đặc tính
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,Hãy xác định từ / dao
 DocType: Serial No,Under AMC,Theo AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,Tỷ lệ định giá mục được tính toán lại xem xét số lượng chứng từ chi phí hạ cánh
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,Tỷ lệ định giá mục được tính toán lại xem xét số lượng chứng từ chi phí hạ cánh
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,Thiết lập mặc định cho giao dịch bán hàng
 DocType: Guardian,Guardian Of ,người giám hộ của
 DocType: Grading Scale Interval,Threshold,ngưỡng
@@ -3951,7 +3956,8 @@
 apps/erpnext/erpnext/config/support.py +22,Warranty,Bảo hành
 DocType: Purchase Invoice,Debit Note Issued,Debit Note Ban hành
 DocType: Production Order,Warehouses,Kho
-apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể được chuyển giao
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0} tài sản không thể chuyển giao
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,Mục này là một biến thể của {0} (Bản mẫu).
 DocType: Workstation,per hour,mỗi giờ
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,Thu mua
 DocType: Announcement,Announcement,Thông báo
@@ -3967,8 +3973,8 @@
 DocType: Account,Receivable,Thu
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,Row # {0}: Không được phép thay đổi Supplier Mua hàng đã tồn tại
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,Vai trò được phép trình giao dịch vượt quá hạn mức tín dụng được thiết lập.
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,Chọn mục để Sản xuất
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,Chọn mục để Sản xuất
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time","Thạc sĩ dữ liệu đồng bộ, nó có thể mất một thời gian"
 DocType: Item,Material Issue,Phát hành tài liệu
 DocType: Hub Settings,Seller Description,Người bán Mô tả
 DocType: Employee Education,Qualification,Trình độ chuyên môn
@@ -3980,7 +3986,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,Ra lệnh
 DocType: Salary Detail,Component,Hợp phần
 DocType: Assessment Criteria,Assessment Criteria Group,Các tiêu chí đánh giá Nhóm
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},Mở Khấu hao lũy kế phải nhỏ hơn bằng {0}
 DocType: Warehouse,Warehouse Name,Tên kho
 DocType: Naming Series,Select Transaction,Chọn giao dịch
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,Vui lòng nhập Phê duyệt hoặc phê duyệt Vai trò tài
@@ -3993,7 +3999,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,Không thể hủy bỏ vì chứng từ hàng tôn kho gửi duyệt{0} đã  tồn tại
 DocType: Employee Loan,Disbursement Date,ngày giải ngân
 DocType: Vehicle,Vehicle,xe cộ
 DocType: Purchase Invoice,In Words,Trong từ
@@ -4008,14 +4014,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead%
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,Khấu hao và dư tài sản
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},Số tiền {0} {1} chuyển từ {2} để {3}
 DocType: Sales Invoice,Get Advances Received,Được nhận trước
 DocType: Email Digest,Add/Remove Recipients,Thêm/Xóa người nhận
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,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/projects/doctype/project/project.py +192,Join,Tham gia
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,Thiếu Qty
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,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 +654,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: Employee Loan,Repay from Salary,Trả nợ từ lương
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},Yêu cầu thanh toán đối với {0} {1} cho số tiền {2}
@@ -4033,7 +4039,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,Đánh giá kết quả chi tiết
 DocType: Employee Education,Employee Education,Giáo dục nhân viên
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,nhóm mục trùng lặp được tìm thấy trong bảng nhóm mục
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,It is needed to fetch Item Details.,Nó là cần thiết để lấy hàng Chi tiết.
 DocType: Salary Slip,Net Pay,Net phải trả tiền
 DocType: Account,Account,Tài khoản
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +213,Serial No {0} has already been received,Không nối tiếp {0} đã được nhận
@@ -4042,7 +4048,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.","Kho {0} không liên kết với bất kỳ tài khoản, xin vui lòng tạo / liên kết các tài khoản tương ứng (tài sản) cho các kho hàng."
 DocType: Purchase Invoice,Recurring Id,Id định kỳ
 DocType: Customer,Sales Team Details,Thông tin chi tiết Nhóm bán hàng
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,Xóa vĩnh viễn?
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,Xóa vĩnh viễn?
 DocType: Expense Claim,Total Claimed Amount,Tổng số tiền tuyên bố chủ quyền
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,Cơ hội tiềm năng bán hàng
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},Không hợp lệ {0}
@@ -4053,13 +4059,14 @@
 DocType: Warehouse,PIN,GHIM
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,Thiết lập trường của mình trong ERPNext
 DocType: Sales Invoice,Base Change Amount (Company Currency),Thay đổi Số tiền cơ sở (Công ty ngoại tệ)
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,Không ghi sổ kế toán cho các kho sau
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,Save the document first.,Lưu tài liệu đầu tiên.
 DocType: Account,Chargeable,Buộc tội
 DocType: Company,Change Abbreviation,Thay đổi Tên viết tắt
 DocType: Expense Claim Detail,Expense Date,Ngày Chi phí
 DocType: Item,Max Discount (%),Giảm giá tối đa (%)
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +70,Last Order Amount,Số tiền Last Order
+DocType: Task,Is Milestone,Là Milestone
 DocType: Daily Work Summary,Email Sent To,Thư điện tử đã được gửi đến
 DocType: Budget,Warn,Cảnh báo
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.","Bất kỳ nhận xét khác, nỗ lực đáng chú ý mà nên đi vào biên bản."
@@ -4080,7 +4087,7 @@
 DocType: Item Attribute Value,Attribute Value,Attribute Value
 ,Itemwise Recommended Reorder Level,Itemwise Đê Sắp xếp lại Cấp
 DocType: Salary Detail,Salary Detail,Chi tiết lương
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,Vui lòng chọn {0} đầu tiên
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,Vui lòng chọn {0} đầu tiên
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,Lô {0} của mục {1} đã hết hạn.
 DocType: Sales Invoice,Commission,Hoa hồng bán hàng
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,Time Sheet cho sản xuất.
@@ -4092,41 +4099,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,'đóng băng hàng tồn kho muộn hơn' nên nhỏ hơn %d ngày
 DocType: Tax Rule,Purchase Tax Template,Mua Template Thuế
 ,Project wise Stock Tracking,Theo dõi biến động vật tư theo dự án
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},Lịch trình bảo trì {0} tồn tại đối với {0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),Số lượng thực tế (at source/target)
 DocType: Item Customer Detail,Ref Code,Tài liệu tham khảo Mã
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,Hồ sơ nhân viên.
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,Hãy đặt Tiếp Khấu hao ngày
 DocType: HR Settings,Payroll Settings,Thiết lập bảng lương
 apps/erpnext/erpnext/config/accounts.py +148,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 +16,Place Order,Đặt hàng
 DocType: Email Digest,New Purchase Orders,Đơn đặt hàng mua mới
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,Tại Gốc không thể có bộ phận chi phí cấp trên
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,Chọn thương hiệu ...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,Chọn thương hiệu ...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,Lũy kế khấu hao như trên
 DocType: Sales Invoice,C-Form Applicable,C-Mẫu áp dụng
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},Thời gian hoạt động phải lớn hơn 0 cho hoạt động {0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,Kho là bắt buộc
 DocType: Supplier,Address and Contacts,Địa chỉ và Liên hệ
 DocType: UOM Conversion Detail,UOM Conversion Detail,Xem chi tiết UOM Chuyển đổi
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),Giữ cho nó thân thiện với web 900px (w) bởi 100px (h)
 DocType: Program,Program Abbreviation,Tên viết tắt chương trình
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,Đặt hàng sản xuất không thể được đưa ra chống lại một khoản Template
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật trên Phiếu nhận hàng gắn với từng vật tư
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,Đặt hàng sản xuất không thể được đưa ra chống lại một khoản Template
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,Cước phí được cập nhật trên Phiếu nhận hàng gắn với từng vật tư
 DocType: Warranty Claim,Resolved By,Giải quyết bởi
 DocType: Bank Guarantee,Start Date,Ngày bắt đầu
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,Phân bổ lá trong một thời gian.
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,Chi phiếu và tiền gửi không đúng xóa
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,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ó làm tài khoản mẹ
 DocType: Purchase Invoice Item,Price List Rate,bảng báo giá
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,Tạo dấu ngoặc kép của khách hàng
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,Tạo dấu ngoặc kép của khách hàng
 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 +38,Bill of Materials (BOM),Bill of Materials (BOM)
 DocType: Item,Average time taken by the supplier to deliver,Thời gian trung bình thực hiện bởi các nhà cung cấp để cung cấp
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,Kết quả đánh giá
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,Giờ
 DocType: Project,Expected Start Date,Ngày Dự kiến sẽ bắt đầu
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,Xóa VTHH nếu chi phí là không áp dụng đối với VTHH đó
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,Remove item if charges is not applicable to that item,Xóa VTHH nếu chi phí là không áp dụng đối với VTHH đó
 DocType: SMS Settings,Eg. smsgateway.com/api/send_sms.cgi,Ví dụ. smsgateway.com / api / send_sms.cgi
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,Đồng tiền giao dịch phải được giống như thanh toán tiền tệ Cổng
 DocType: Payment Entry,Receive,Nhận
@@ -4137,19 +4143,19 @@
 DocType: Workstation,Operating Costs,Chi phí điều hành
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,Hành động nếu tích lũy ngân sách hàng tháng vượt quá
 DocType: Purchase Invoice,Submit on creation,Gửi về sáng tạo
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},Đồng tiền cho {0} phải là {1}
 DocType: Asset,Disposal Date,Xử ngày
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.","Email sẽ được gửi đến tất cả các nhân viên tích cực của công ty tại các giờ nhất định, nếu họ không có ngày nghỉ. Tóm tắt phản hồi sẽ được gửi vào lúc nửa đêm."
 DocType: Employee Leave Approver,Employee Leave Approver,Nhân viên Để lại phê duyệt
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,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 +82,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo mất, bởi vì báo giá đã được thực hiện."
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,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 +81,"Cannot declare as lost, because Quotation has been made.","Không thể khai báo mất, bởi vì báo giá đã được thực hiện."
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,Đào tạo phản hồi
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,Đặt hàng sản xuất {0} phải được gửi
-apps/erpnext/erpnext/maintenance/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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},Vui lòng chọn ngày bắt đầu và ngày kết thúc cho hàng {0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},Tất nhiên là bắt buộc trong hàng {0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,Cho đến nay không có thể trước khi từ ngày
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,Thêm / Sửa giá
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,Thêm / Sửa giá
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Batch,Parent Batch,Batch Parent
 DocType: Cheque Print Template,Cheque Print Template,Mẫu In Séc
@@ -4163,7 +4169,7 @@
 ,Ordered Items To Be Delivered,Ra lệnh tiêu được giao
 DocType: Account,Income,Thu nhập
 DocType: Industry Type,Industry Type,Loại ngành
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,Một cái gì đó đã đi sai!
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,Một cái gì đó đã đi sai!
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,Cảnh báo: ứng dụng gỡ bỏ có chứa khoảng ngày sau
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,Hóa đơn bán hàng {0} đã được gửi
 DocType: Assessment Result Detail,Score,Ghi bàn
@@ -4194,17 +4200,17 @@
 DocType: Item,Variant Based On,Ngôn ngữ địa phương dựa trên
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},Tổng số weightage giao nên được 100%. Nó là {0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,Các nhà cung cấp của bạn
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,"Không thể thiết lập là ""thất bại"" vì đơn đặt hàng đã được tạo"
+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 là ""thất bại"" vì đơn đặt hàng đã được tạo"
 DocType: Request for Quotation Item,Supplier Part No,Nhà cung cấp Phần Không
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,Nhận được từ
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',không thể trừ khi mục là cho &#39;định giá&#39; hoặc &#39;Vaulation và Total&#39;
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,Nhận được từ
 DocType: Lead,Converted,Chuyển đổi
 DocType: Item,Has Serial No,Có Serial No
 DocType: Employee,Date of Issue,Ngày phát hành
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}: Từ {0} cho {1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}: Từ {0} cho {1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,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/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,Row {0}: Giờ giá trị phải lớn hơn không.
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,Website Image {0} attached to Item {1} cannot be found,Hình ảnh website {0} đính kèm vào mục {1} không tìm thấy
 DocType: Issue,Content Type,Loại nội dung
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +17,Computer,Máy tính
 DocType: Item,List this Item in multiple groups on the website.,Danh sách sản phẩm này trong nhiều nhóm trên trang web.
@@ -4213,20 +4219,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,Bạn không được phép để thiết lập giá trị đóng băng
 DocType: Payment Reconciliation,Get Unreconciled Entries,Nhận Unreconciled Entries
 DocType: Payment Reconciliation,From Invoice Date,Từ Invoice ngày
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ hoặc tài khoản bên tệ hoặc là mặc định của comapany
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,tiền tệ thanh toán phải bằng tiền tệ hoặc tài khoản bên tệ hoặc là mặc định của comapany
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,Nhận chi phiếu
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,Nó làm gì?
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,đến kho
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,Tất cả Tuyển sinh Sinh viên
 ,Average Commission Rate,Ủy ban trung bình Tỷ giá
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,'Có Số Serial' không thể là 'Có' cho hàng hóa không nhập kho
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,'Có Số Serial' không thể là 'Có' cho hàng hóa không nhập kho
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,Không thể Chấm công cho những ngày tương lai
 DocType: Pricing Rule,Pricing Rule Help,Quy tắc định giá giúp
 DocType: School House,House Name,Tên nhà
 DocType: Purchase Taxes and Charges,Account Head,Tài khoản chính
 apps/erpnext/erpnext/config/stock.py +168,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 +115,Electrical,Hệ thống điện
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Thêm phần còn lại của tổ chức của bạn như người dùng của bạn. Bạn cũng có thể thêm mời khách hàng đến cổng thông tin của bạn bằng cách thêm chúng từ Danh bạ
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,Thêm phần còn lại của tổ chức của bạn như người dùng của bạn. Bạn cũng có thể thêm mời khách hàng đến cổng thông tin của bạn bằng cách thêm chúng từ Danh bạ
 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 +348,Row {0}: Exchange Rate is mandatory,Hàng {0}: Tỷ giá 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}
@@ -4235,7 +4241,7 @@
 DocType: Item,Customer Code,Mã số khách hàng
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},Nhắc ngày sinh nhật cho {0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,Kể từ ngày thứ tự cuối
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,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 +336,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/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,ngày Bảo hiểm bắt đầu phải ít hơn ngày Bảo hiểm End
@@ -4250,9 +4256,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},Mức lương Slip của nhân viên {0} đã được tạo ra cho bảng thời gian {1}
 DocType: Vehicle Log,Odometer,odometer
 DocType: Sales Order Item,Ordered Qty,Số lượng đặt hàng
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,Mục {0} bị vô hiệu hóa
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,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/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM không chứa bất kỳ mục chứng khoán
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM không chứa bất kỳ mục chứng khoán
 apps/erpnext/erpnext/controllers/recurring_document.py +172,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 +18,Project activity / task.,Hoạt động dự án / nhiệm vụ.
 DocType: Vehicle Log,Refuelling Details,Chi tiết Nạp nhiên liệu
@@ -4262,8 +4268,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,không tìm thấy tỷ lệ mua sắm cuối
 DocType: Purchase Invoice,Write Off Amount (Company Currency),Viết Tắt Số tiền (Công ty tiền tệ)
 DocType: Sales Invoice Timesheet,Billing Hours,Giờ Thanh toán
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,BOM mặc định cho {0} không tìm thấy
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,Row # {0}: Hãy thiết lập số lượng đặt hàng
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,Chạm vào mục để thêm chúng vào đây
 DocType: Fees,Program Enrollment,chương trình tuyển sinh
 DocType: Landed Cost Voucher,Landed Cost Voucher,Voucher Chi phí hạ cánh
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},Hãy đặt {0}
@@ -4287,7 +4294,7 @@
 DocType: Maintenance Visit,Maintenance Date,Bảo trì ngày
 DocType: Purchase Invoice Item,Rejected Serial No,Từ chối Serial No
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,Ngày bắt đầu và kết thúc năm bị chồng lấn với {0}. Để tránh nó hãy thiết lập công ty.
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho hàng {0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,Start date should be less than end date for Item {0},Ngày bắt đầu phải nhỏ hơn ngày kết thúc cho hàng {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.","Ví dụ:. ABCD ##### 
  Nếu series được thiết lập và Serial No không được đề cập trong các giao dịch, số serial sau đó tự động sẽ được tạo ra dựa trên series này. Nếu bạn luôn muốn đề cập đến một cách rõ ràng nối tiếp Nos cho mặt hàng này. để trống này."
@@ -4365,7 +4372,6 @@
 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
-DocType: Grade Interval,Grade Interval,lớp Interval
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},Ngày bắt đầu năm tài chính và ngày kết thúc năm tài chính đã được thiết lập trong năm tài chính {0}
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,Clearance Ngày cập nhật
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,Phân chia
@@ -4412,14 +4418,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,Hãy bỏ chọn nếu bạn không muốn xem xét lô trong khi làm cho các nhóm dựa trên khóa học.
 DocType: Asset,Frequency of Depreciation (Months),Tần số của Khấu hao (Tháng)
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,Tài khoản tín dụng
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,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/profitability_analysis/profitability_analysis.js +57,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
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,Thiết lập một trang web đơn giản cho tổ chức của tôi
 DocType: Payment Reconciliation,Receivable / Payable Account,Thu / Account Payable
 DocType: Delivery Note Item,Against Sales Order Item,Theo hàng hóa được đặt mua
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,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 +649,Please specify Attribute Value for attribute {0},Hãy xác định thuộc tính Giá trị thuộc tính {0}
 DocType: Item,Default Warehouse,Kho mặc định
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},Ngân sách không thể được chỉ định đối với tài khoản Nhóm {0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,Vui lòng nhập trung tâm chi phí cha mẹ
@@ -4465,7 +4471,7 @@
 DocType: Opportunity Item,Basic Rate,Basic Rate
 DocType: GL Entry,Credit Amount,Số tiền tín dụng
 DocType: Cheque Print Template,Signatory Position,Chức vụ ký
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,Thiết lập như Lost
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,Thiết lập như Lost
 DocType: Timesheet,Total Billable Hours,Tổng số giờ được Lập hoá đơn
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,Thanh toán Phiếu tiếp nhận
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,Điều này được dựa trên các giao dịch với khách hàng này. Xem thời gian dưới đây để biết chi tiết
@@ -4479,11 +4485,11 @@
 ,Items To Be Requested,Các mục được yêu cầu
 DocType: Purchase Order,Get Last Purchase Rate,Nhận cuối Rate
 DocType: Company,Company Info,Thông tin công ty
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,Chọn hoặc thêm khách hàng mới
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,Chọn hoặc thêm khách hàng mới
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,trung tâm chi phí là cần thiết để đặt yêu cầu bồi thường chi phí
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),Ứng dụng của Quỹ (tài sản)
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,Điều này được dựa trên sự tham gia của nhân viên này
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,Nợ TK
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,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),Tròn số (quy đổi theo tiền tệ của công ty )
@@ -4492,13 +4498,13 @@
 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/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,Chi phí mua hàng
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,Nhà cung cấp bảng báo giá {0} đã tạo
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,Cuối năm không thể được trước khi bắt đầu năm
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,Lợi ích của nhân viên
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},Hãy thiết lập mặc định Tốt Danh sách nhân viên với {0} hoặc Công ty {1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}: {1} không tồn tại
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}: {1} không tồn tại
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,Hóa đơn đã đưa 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 +534,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}
@@ -4507,15 +4513,17 @@
 DocType: Quality Inspection Reading,Reading 3,Đọc 3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,Loại chứng từ
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,Danh sách giá không tìm thấy hoặc bị vô hiệu hóa
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,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: Employee Loan Application,Approved,Đã được phê duyệt
 DocType: Pricing Rule,Price,Giá
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',Nhân viên bớt căng thẳng trên {0} phải được thiết lập như là 'trái'
 DocType: Guardian,Guardian,người bảo vệ
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,Đánh giá {0} được tạo ra cho nhân viên {1} trong phạm vi ngày nhất định
 DocType: Employee,Education,Đào tạo
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,Del
 DocType: Selling Settings,Campaign Naming By,Đặt tên chiến dịch theo
 DocType: Employee,Current Address Is,Địa chỉ hiện tại là
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,Sửa đổi
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.","Không bắt buộc. Thiết lập tiền tệ mặc định của công ty, nếu không quy định."
 apps/erpnext/erpnext/config/accounts.py +61,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
@@ -4524,7 +4532,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},Row {0}: Đảng / tài khoản không khớp với {1} / {2} trong {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,Vui lòng nhập tài khoản chi phí
 DocType: Account,Stock,Kho
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc Journal nhập"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry","Row # {0}: Tài liệu tham khảo Tài liệu Loại phải là một trong mua hàng đặt hàng, mua hóa đơn hoặc Journal nhập"
 DocType: Employee,Current Address,Địa chỉ hiện tại
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified","Nếu tài liệu là một biến thể của một item sau đó mô tả, hình ảnh, giá cả, thuế vv sẽ được thiết lập từ các mẫu trừ khi được quy định một cách rõ ràng"
 DocType: Serial No,Purchase / Manufacture Details,Thông tin chi tiết mua / Sản xuất
@@ -4552,7 +4560,7 @@
 DocType: Hub Settings,Hub Settings,Thiết lập Hub
 DocType: Project,Gross Margin %,Lợi nhuận gộp%
 DocType: BOM,With Operations,Với hoạt động
-apps/erpnext/erpnext/accounts/party.py +243,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
+apps/erpnext/erpnext/accounts/party.py +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,Ghi sổ kế toán đã được thực hiện bằng loại tiền tệ {0} cho công ty {1}. Hãy lựa chọn một tài khoản phải thu hoặc phải trả với loại tiền tệ{0}.
 DocType: Asset,Is Existing Asset,Là hiện tại tài sản
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
 DocType: Salary Detail,Statistical Component,Hợp phần Thống kê
@@ -4577,7 +4585,7 @@
 DocType: Assessment Plan,Room,Phòng
 DocType: Purchase Order,Advance Paid,Trước Paid
 DocType: Item,Item Tax,Mục thuế
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,Chất liệu để Nhà cung cấp
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,Chất liệu để Nhà cung cấp
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,Tiêu thụ đặc biệt Invoice
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}% xuất hiện nhiều lần
 DocType: Expense Claim,Employees Email Id,Nhân viên Email Id
@@ -4608,9 +4616,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,Logo đính kèm
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,Mức cổ phiếu
 DocType: Customer,Commission Rate,Tỷ lệ hoa hồng
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,Hãy Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,Hãy Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,Block leave applications by department.
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer","Loại thanh toán phải là một trong những nhận, phải trả tiền và chuyển giao nội bộ"
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer","Loại thanh toán phải là một trong những nhận, phải trả tiền và chuyển giao nội bộ"
 apps/erpnext/erpnext/config/selling.py +179,Analytics,phân tích
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,Giỏ hàng rỗng
 DocType: Vehicle,Model,Mô hình
@@ -4621,6 +4629,7 @@
 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,Ngày của đơn mua hàng
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +161,Capital Stock,Tồn kho ban đầu
+DocType: Shopping Cart Settings,Show Public Attachments,Hiển thị các tệp đính kèm công khai
 DocType: Packing Slip,Package Weight Details,Gói Trọng lượng chi tiết
 DocType: Payment Gateway Account,Payment Gateway Account,Tài khoản của Cổng thanh toán
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,Sau khi hoàn thành thanh toán chuyển hướng người dùng đến trang lựa chọn.
@@ -4639,15 +4648,15 @@
 DocType: Batch,Expiry Date,Ngày hết hiệu lực
 ,Supplier Addresses and Contacts,Địa chỉ và Liên hệ Nhà cung cấp
 ,accounts-browser,tài khoản trình duyệt
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,Vui lòng chọn mục đầu tiên
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,Vui lòng chọn mục đầu tiên
 apps/erpnext/erpnext/config/projects.py +13,Project master.,Chủ dự án.
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.","Để cho phép qua thanh toán hoặc qua đặt hàng, cập nhật &quot;Trợ cấp&quot; trong kho Cài đặt hoặc Item."
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,Không hiển thị bất kỳ biểu tượng như $ vv bên cạnh tiền tệ.
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),(Nửa ngày)
 DocType: Supplier,Credit Days,Ngày tín dụng
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,Hãy học sinh hàng loạt
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,Hãy học sinh hàng loạt
 DocType: Leave Type,Is Carry Forward,Được Carry Forward
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,Được mục từ BOM
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,Được mục từ BOM
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,Các ngày Thời gian Tiềm năng
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},Row # {0}: Đăng ngày phải giống như ngày mua {1} tài sản {2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,Vui lòng nhập hàng đơn đặt hàng trong bảng trên
@@ -4664,8 +4673,6 @@
 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 +196,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/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,Xin vui lòng thiết lập số cho loạt bài tham dự thông qua Setup&gt; Numbering Series
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,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-TW.csv b/erpnext/translations/zh-TW.csv
index f65956e..d9cb209 100644
--- a/erpnext/translations/zh-TW.csv
+++ b/erpnext/translations/zh-TW.csv
@@ -1,177 +1,226 @@
-DocType: Employee,Salary Mode,薪酬模式
 DocType: Employee,Divorced,離婚
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +84,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,客戶項目
 DocType: Project,Costing and Billing,成本核算和計費
-apps/erpnext/erpnext/accounts/doctype/account/account.py +52,Account {0}: Parent account {1} can not be a ledger,帳戶{0}：父帳戶{1}不能是總帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +53,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 +88,Email Notifications,電子郵件通知
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +22,Evaluation,評估
 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 +191,"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}需填入貨幣種類
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生產訂單無法取消，首先Unstop它取消
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,難道你真的想放棄這項資產？
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,選擇默認供應商
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},價格表{0}需填入貨幣種類
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*將被計算在該交易。
 DocType: Purchase Order,Customer Contact,客戶聯絡
 DocType: Job Applicant,Job Applicant,求職者
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +6,This is based on transactions against this Supplier. See timeline below for details,這是基於對這種供應商的交易。詳情請參閱以下時間表
 apps/erpnext/erpnext/hub_node/page/hub/hub_body.html +18,No more results.,沒有更多的結果。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +34,Legal,法律
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +158,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
-DocType: C-Form,Customer,客戶
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +166,Actual type tax cannot be included in Item rate in row {0},實際類型稅不能被包含在商品率排{0}
+DocType: Bank Guarantee,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,客戶名稱
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +126,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
+DocType: Vehicle,Natural Gas,天然氣
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +130,Bank account cannot be named as {0},銀行賬戶不能命名為{0}
 DocType: Account,Heads (or groups) against which Accounting Entries are made and balances are maintained.,頭（或組）針對其會計分錄是由和平衡得以維持。
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +180,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),傑出的{0}不能小於零（ {1} ）
 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,系列已成功更新
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公開顯示
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural日記帳分錄提交
 DocType: Pricing Rule,Apply On,適用於
 DocType: Item Price,Multiple Item prices.,多個項目的價格。
 ,Purchase Order Items To Be Received,未到貨的採購訂單項目
 DocType: SMS Center,All Supplier Contact,所有供應商聯絡
-DocType: Quality Inspection Reading,Parameter,參數
-apps/erpnext/erpnext/projects/doctype/project/project.py +54,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}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +239,New Leave Application,新假期申請
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +140,Bank Draft,銀行匯票
+DocType: Support Settings,Support Settings,支持設置
+DocType: SMS Parameter,Parameter,參數
+apps/erpnext/erpnext/projects/doctype/project/project.py +62,Expected End Date can not be less than Expected Start Date,預計結束日期不能小於預期開始日期
+apps/erpnext/erpnext/utilities/transaction_base.py +110,Row #{0}: Rate must be same as {1}: {2} ({3} / {4}) ,行＃{0}：速率必須與{1}：{2}（{3} / {4}）
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +282,New Leave Application,新假期申請
+,Batch Item Expiry Status,批處理項到期狀態
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,銀行匯票
 DocType: Mode of Payment Account,Mode of Payment Account,支付帳戶模式
-apps/erpnext/erpnext/stock/doctype/item/item.js +52,Show Variants,顯示變體
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +637,Quantity,數量
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +151,Loans (Liabilities),借款（負債）
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,顯示變體
+DocType: Academic Term,Academic Term,學期
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,數量
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,賬表不能為空。
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,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: Item,Country of Origin,出生國家
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,庫存
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,開放式問題
 DocType: Production Plan Item,Production Plan Item,生產計劃項目
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +142,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +144,User {0} is already assigned to Employee {1},用戶{0}已經被分配給員工{1}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,保健
-DocType: Purchase Invoice,Monthly,每月一次
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延遲支付（天）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +771,Invoice,發票
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服務費用
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},序號：{0}已在銷售發票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,發票
 DocType: Maintenance Schedule Item,Periodicity,週期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,會計年度{0}是必需的
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,預計交貨日期是之前銷售訂單日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +21,Defense,防禦
 DocType: Salary Component,Abbr,縮寫
-DocType: Appraisal Goal,Score (0-5),得分（0-5）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +198,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: Timesheet,Total Costing Amount,總成本計算金額
 DocType: Delivery Note,Vehicle No,車輛牌照號碼
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +127,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +150,Please select Price List,請選擇價格表
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +78,Row #{0}: Payment document is required to complete the trasaction,列＃{0}：付款單據才能完成trasaction
 DocType: Production Order Operation,Work In Progress,在製品
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +13,Please select date,請選擇日期
 DocType: Employee,Holiday List,假日列表
-apps/erpnext/erpnext/public/js/setup_wizard.js +205,Accountant,會計人員
+apps/erpnext/erpnext/public/js/setup_wizard.js +210,Accountant,會計人員
 DocType: Cost Center,Stock User,庫存用戶
 DocType: Company,Phone No,電話號碼
-apps/erpnext/erpnext/controllers/recurring_document.py +132,New {0}: #{1},新{0}：＃{1}
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +50,Course Schedules created:,課程表創建：
+apps/erpnext/erpnext/controllers/recurring_document.py +135,New {0}: #{1},新{0}：＃{1}
 ,Sales Partners Commission,銷售合作夥伴佣金
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +22,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
+apps/erpnext/erpnext/setup/doctype/company/company.py +44,Abbreviation cannot have more than 5 characters,縮寫不能有超過5個字符
 DocType: Payment Request,Payment Request,付錢請求
+DocType: Asset,Value After Depreciation,折舊後
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py +17,Related,有關
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +43,Attendance date can not be less than employee's joining date,考勤日期不得少於員工的加盟日期
+DocType: Grading Scale,Grading Scale Name,分級標準名稱
 apps/erpnext/erpnext/accounts/doctype/account/account.js +26,This is a root account and cannot be edited.,這是一個 root 帳戶，不能被編輯。
 DocType: BOM,Operations,作業
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +38,Cannot set authorization on basis of Discount for {0},不能在折扣的基礎上設置授權{0}
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有兩列，一為舊名稱，一個用於新名稱
+apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1}不以任何活性會計年度。
 DocType: Packed Item,Parent Detail docname,家長可採用DocName細節
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Kg,公斤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",參考：{0}，商品編號：{1}和顧客：{2}
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,公斤
+DocType: Student Log,Log,日誌
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,開放的工作。
-DocType: Item Attribute,Increment,增量
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,選擇倉庫...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,選擇倉庫...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,廣告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司進入不止一次
-DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允許{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +589,Get items from,取得項目來源
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +382,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允許{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,取得項目來源
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},送貨單{0}不能更新庫存
+apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},產品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,沒有列出項目
 DocType: Payment Reconciliation,Reconcile,調和
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,雜貨
 DocType: Quality Inspection Reading,Reading 1,閱讀1
 DocType: Process Payroll,Make Bank Entry,使銀行進入
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,養老基金
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下來折舊日期不能購買日期之前
 DocType: SMS Center,All Sales Person,所有的銷售人員
-DocType: Lead,Person Name,人姓名
+DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**幫助你分配預算/目標跨越幾個月，如果你在你的業務有季節性。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,未找到項目
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬結構缺失
 DocType: Sales Invoice Item,Sales Invoice Item,銷售發票項目
 DocType: Account,Credit,信用
 DocType: POS Profile,Write Off Cost Center,沖銷成本中心
+apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小學”或“大學”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,庫存報告
 DocType: Warehouse,Warehouse Detail,倉庫的詳細資訊
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +156,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},信用額度已經越過了客戶{0} {1} / {2}
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,該期限結束日期不能晚於學年年終日期到這個詞聯繫在一起（學年{}）。請更正日期，然後再試一次。
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",“是固定的資產”不能選中，作為資產記錄存在對項目
+DocType: Vehicle Service,Brake Oil,剎車油
 DocType: Tax Rule,Tax Type,稅收類型
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +144,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
-DocType: Item,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你無權添加或更新{0}之前的條目
+DocType: BOM,Item Image (if not slideshow),產品圖片（如果不是幻燈片）
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,一個客戶存在具有相同名稱
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（工時率/ 60）*實際操作時間
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,選擇BOM
 DocType: SMS Log,SMS Log,短信日誌
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付項目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}這個節日之間沒有從日期和結束日期
+DocType: Student Log,Student Log,學生登錄
 DocType: Quality Inspection,Get Specification Details,獲取詳細規格
 DocType: Lead,Interested,有興趣
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +165,Opening,開盤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +27,From {0} to {1},從{0} {1}
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +171,Opening,開盤
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +28,From {0} to {1},從{0} {1}
 DocType: Item,Copy From Item Group,從項目群組複製
 DocType: Journal Entry,Opening Entry,開放報名
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +25,Account Pay Only,賬戶只需支付
+DocType: Employee Loan,Repay Over Number of Periods,償還期的超過數
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0}  -  {1}不會在給定的{2}中註冊
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +37,{0} - {1} is not enrolled in the given {2},{0}  -  {1}不會在給定的{2}中註冊
 DocType: Stock Entry,Additional Costs,額外費用
-apps/erpnext/erpnext/accounts/doctype/account/account.py +141,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +142,Account with existing transaction can not be converted to group.,帳戶與現有的交易不能被轉換到群組。
 DocType: Lead,Product Enquiry,產品查詢
+DocType: Academic Term,Schools,學校
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到員工的假期記錄{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,請先輸入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +335,Please select Company first,請首先選擇公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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 +204,Item {0} does not exist in the system or has expired,項目{0}不存在於系統中或已過期
+DocType: Journal Entry Account,Employee Loan,員工貸款
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +89,Activity Log:,活動日誌：
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,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/accounts/report/general_ledger/general_ledger.html +7,Statement of Account,帳戶狀態
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +41,Pharmaceuticals,製藥
+DocType: Purchase Invoice Item,Is Fixed Asset,是固定的資產
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +233,"Available qty is {0}, you need {1}",可用數量是{0}，則需要{1}
 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 +295,Consumable,耗材
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER組表中找到重複的客戶群
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,供應商類型/供應商
 DocType: Upload Attendance,Import Log,導入日誌
 DocType: Production Planning Tool,Pull Material Request of type Manufacture based on the above criteria,拉根據上述標準型的製造材料要求
+DocType: Training Result Employee,Grade,年級
 DocType: Sales Invoice Item,Delivered By Supplier,交付供應商
 DocType: SMS Center,All Contact,所有聯絡
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +171,Annual Salary,年薪
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,生產訂單已經與BOM的所有項目創建
+DocType: Daily Work Summary,Daily Work Summary,每日工作總結
 DocType: Period Closing Voucher,Closing Fiscal Year,截止會計年度
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1}被凍結
+apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,請選擇現有的公司創建會計科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,庫存費用
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,選擇目標倉庫
+apps/erpnext/erpnext/hr/doctype/employee/employee.js +80,Please enter Preferred Contact Email,請輸入首選電子郵件聯繫
 DocType: Journal Entry,Contra Entry,魂斗羅進入
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司貨幣
 DocType: Delivery Note,Installation Status,安裝狀態
-apps/erpnext/erpnext/controllers/buying_controller.py +316,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
+					<br>Absent: {1}",你想更新考勤？ <br>現任：{0} \ <br>缺席：{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},品項{0}的允收＋批退的數量必須等於收到量
 DocType: Item,Supply Raw Materials for Purchase,供應原料採購
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,付款中的至少一個模式需要POS發票。
+DocType: Products Settings,Show Products as a List,產品展示作為一個列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records","下載模板，填寫相應的數據，並附加了修改過的文件。
 在選定時間段內所有時間和員工的組合會在模板中，與現有的考勤記錄"
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +451,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
-apps/erpnext/erpnext/controllers/accounts_controller.py +614,"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 +166,Settings for HR Module,設定人力資源模塊
-DocType: SMS Center,SMS Center,短信中心
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +481,Item {0} is not active or end of life has been reached,項目{0}不活躍或生命的盡頭已經達到
+apps/erpnext/erpnext/public/js/setup_wizard.js +346,Example: Basic Mathematics,例如：基礎數學
+apps/erpnext/erpnext/controllers/accounts_controller.py +667,"To include tax in row {0} in Item rate, taxes in rows {1} must also be included",要包括稅款，行{0}項率，稅收行{1}也必須包括在內
+apps/erpnext/erpnext/config/hr.py +214,Settings for HR Module,設定人力資源模塊
+DocType: Sales Invoice,Change Amount,漲跌額
 DocType: BOM Replace Tool,New BOM,新的物料清單
-DocType: Timesheet,Batch Time Logs for billing.,批處理的時間記錄進行計費。
+DocType: Depreciation Schedule,Make Depreciation Entry,計提折舊進入
 DocType: Lead,Request Type,請求類型
-DocType: Leave Application,Reason,原因
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使員工
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使員工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,廣播
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +147,Execution,執行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,執行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,進行的作業細節。
 DocType: Serial No,Maintenance Status,維修狀態
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要對供應商應付賬款{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,項目和定價
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},總時間：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},從日期應該是在財政年度內。假設起始日期＝{0}
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +97,Cost Center {0} does not belong to Company {1},成本中心{0}不屬於公司{1}
 DocType: Customer,Individual,個人
+DocType: Interest,Academics User,學術界用戶
+DocType: Cheque Print Template,Amount In Figure,量圖
+DocType: Employee Loan Application,Loan Info,貸款信息
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,規劃維護訪問。
 DocType: SMS Settings,Enter url parameter for message,輸入url參數的訊息
+DocType: POS Profile,Customer Groups,客戶群
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,財務報表
+DocType: Guardian,Students,學生們
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,規則適用的定價和折扣。
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,價格表必須適用於購買或出售
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +79,Installation date cannot be before delivery date for Item {0},品項{0}的安裝日期不能早於交貨日期
@@ -181,397 +230,508 @@
 DocType: Production Planning Tool,Sales Orders,銷售訂單
 DocType: Purchase Taxes and Charges,Valuation,計價
 ,Purchase Order Trends,採購訂單趨勢
+apps/erpnext/erpnext/templates/emails/request_for_quotation.html +7,The request for quotation can be accessed by clicking on the following link,報價請求可以通過點擊以下鏈接進行訪問
 apps/erpnext/erpnext/config/hr.py +81,Allocate leaves for the year.,離開一年。
+DocType: SG Creation Tool Course,SG Creation Tool Course,SG創建工具課程
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +235,Insufficient Stock,庫存不足
 DocType: Manufacturing Settings,Disable Capacity Planning and Time Tracking,禁用產能規劃和時間跟踪
-DocType: Bank Reconciliation,Bank Account,銀行帳戶
+DocType: Email Digest,New Sales Orders,新的銷售訂單
+DocType: Bank Guarantee,Bank Account,銀行帳戶
 DocType: Leave Type,Allow Negative Balance,允許負平衡
+DocType: Employee,Create User,創建用戶
 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 +83,Account {0} does not belong to Company {1},帳戶{0}不屬於公司{1}
-apps/erpnext/erpnext/controllers/taxes_and_totals.py +413,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
+apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},提前量不能大於{0} {1}
 DocType: Naming Series,Series List for this Transaction,本交易系列表
+DocType: Company,Default Payroll Payable Account,默認情況下，應付職工薪酬帳戶
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新電子郵件組
 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 +174,For Warehouse is required before Submit,對於倉庫之前，需要提交
-apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +8,Received On,收到的
+DocType: Course Schedule,Instructor Name,導師姓名
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,For Warehouse is required before Submit,對於倉庫之前，需要提交
 DocType: Sales Partner,Reseller,經銷商
+DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果選中，將包括材料要求非庫存物品。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +24,Please enter Company,請輸入公司名稱
 DocType: Delivery Note Item,Against Sales Invoice Item,對銷售發票項目
 ,Production Orders in Progress,進行中生產訂單
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +38,Net Cash from Financing,從融資淨現金
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,從融資淨現金
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",localStorage的滿了，沒救
 DocType: Lead,Address & Contact,地址及聯絡方式
-DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的葉子從以前的分配
-apps/erpnext/erpnext/controllers/recurring_document.py +227,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+DocType: Leave Allocation,Add unused leaves from previous allocations,從以前的分配添加未使用的休假
+apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},下一循環{0}將上創建{1}
+DocType: Sales Partner,Partner website,合作夥伴網站
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Add Item,新增項目
 ,Contact Name,聯絡人姓名
+DocType: Course Assessment Criteria,Course Assessment Criteria,課程評價標準
 DocType: Process Payroll,Creates salary slip for above mentioned criteria.,建立工資單上面提到的標準。
-apps/erpnext/erpnext/templates/generators/item.html +78,No description given,未提供描述
+DocType: POS Customer Group,POS Customer Group,POS客戶群
+DocType: Vehicle,Additional Details,額外細節
 apps/erpnext/erpnext/config/buying.py +13,Request for purchase.,請求您的報價。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +206,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 +179,Leaves per Year,每年葉
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
-apps/erpnext/erpnext/stock/utils.py +188,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +6,This is based on the Time Sheets created against this project,這是基於對這個項目產生的考勤表
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +375,Net Pay cannot be less than 0,淨工資不能低於0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +224,Only the selected Leave Approver can submit this Leave Application,只有選擇的休假審批者可以提交此請假
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +116,Relieving Date must be greater than Date of Joining,解除日期必須大於加入的日期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +190,Leaves per Year,每年葉
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +130,Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry.,行{0}：請檢查'是推進'對帳戶{1}，如果這是一個進步條目。
+apps/erpnext/erpnext/stock/utils.py +189,Warehouse {0} does not belong to company {1},倉庫{0}不屬於公司{1}
+DocType: Email Digest,Profit & Loss,利潤損失
+DocType: Task,Total Costing Amount (via Time Sheet),總成本計算量（通過時間表）
 DocType: Item Website Specification,Item Website Specification,項目網站規格
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +435,Leave Blocked,禁假的
-apps/erpnext/erpnext/stock/doctype/item/item.py +669,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +95,Bank Entries,銀行條目
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +83,Annual,全年
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,禁假的
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},項{0}已達到其壽命結束於{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,銀行條目
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,庫存調整項目
 DocType: Stock Entry,Sales Invoice No,銷售發票號碼
 DocType: Material Request Item,Min Order Qty,最小訂貨量
+DocType: Student Group Creation Tool Course,Student Group Creation Tool Course,學生組創建工具課程
 DocType: Lead,Do Not Contact,不要聯絡
+apps/erpnext/erpnext/public/js/setup_wizard.js +365,People who teach at your organisation,誰在您的組織教人
 DocType: Purchase Invoice,The unique id for tracking all recurring invoices. It is generated on submit.,唯一ID來跟踪所有的經常性發票。它是在提交生成的。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Software Developer,軟件開發人員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +97,Software Developer,軟件開發人員
 DocType: Item,Minimum Order Qty,最低起訂量
 DocType: Pricing Rule,Supplier Type,供應商類型
+DocType: Course Scheduling Tool,Course Start Date,課程開始日期
+,Student Batch-Wise Attendance,學生分批出席
+DocType: POS Profile,Allow user to edit Rate,允許用戶編輯率
 DocType: Item,Publish in Hub,在發布中心
+DocType: Student Admission,Student Admission,學生入學
 ,Terretory,Terretory
-apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is cancelled,項{0}將被取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +844,Material Request,物料需求
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,項{0}將被取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,物料需求
 DocType: Bank Reconciliation,Update Clearance Date,更新日期間隙
 DocType: Item,Purchase Details,採購詳情
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +328,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 +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},項目{0}未發現“原材料提供&#39;表中的採購訂單{1}
 DocType: Employee,Relation,關係
 DocType: Shipping Rule,Worldwide Shipping,全球航運
+DocType: Student Guardian,Mother,母親
 apps/erpnext/erpnext/config/selling.py +18,Confirmed orders from Customers.,確認客戶的訂單。
 DocType: Purchase Receipt Item,Rejected Quantity,拒絕數量
 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/accounts/doctype/journal_entry/journal_entry.py +249,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
-DocType: Supplier,Address HTML,地址HTML
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +276,Payment against {0} {1} cannot be greater than Outstanding Amount {2},對支付{0} {1}不能大於未償還{2}
 DocType: Lead,Mobile No.,手機號碼
 DocType: Maintenance Schedule,Generate Schedule,生成時間表
 DocType: Purchase Invoice Item,Expense Head,總支出
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +130,Please select Charge Type first,請先選擇付款類別
-apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Latest,最新
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +138,Please select Charge Type first,請先選擇付款類別
+DocType: Student Group Student,Student Group Student,學生組學生
+DocType: Vehicle Service,Inspection,檢查
+DocType: Email Digest,New Quotations,新報價
+DocType: HR Settings,Emails salary slip to employee based on preferred email selected in Employee,電子郵件工資單員工根據員工選擇首選的電子郵件
 DocType: Employee,The first Leave Approver in the list will be set as the default Leave Approver,該列表中的第一個請假審核將被設定為預設請假審核
+DocType: Tax Rule,Shipping County,航運縣
 apps/erpnext/erpnext/config/desktop.py +158,Learn,學習
+DocType: Asset,Next Depreciation Date,接下來折舊日期
 apps/erpnext/erpnext/projects/doctype/activity_type/activity_type.js +3,Activity Cost per Employee,每個員工活動費用
 DocType: Accounts Settings,Settings for Accounts,設置帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +644,Supplier Invoice No exists in Purchase Invoice {0},供應商發票不存在採購發票{0}
 apps/erpnext/erpnext/config/selling.py +118,Manage Sales Person Tree.,管理銷售人員樹。
 DocType: Job Applicant,Cover Letter,求職信
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,傑出的支票及存款清除
 DocType: Item,Synced With Hub,同步轂
-apps/erpnext/erpnext/setup/doctype/company/company.js +63,Wrong Password,密碼錯誤
+DocType: Vehicle,Fleet Manager,車隊經理
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能為負值對項{2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,密碼錯誤
 DocType: Item,Variant Of,變種
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +348,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',完成數量不能大於“數量來製造”
 DocType: Period Closing Voucher,Closing Account Head,關閉帳戶頭
 DocType: Employee,External Work History,外部工作經歷
-apps/erpnext/erpnext/projects/doctype/task/task.py +86,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循環引用錯誤
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +53,Guardian1 Name,Guardian1名稱
 DocType: Delivery Note,In Words (Export) will be visible once you save the Delivery Note.,送貨單一被儲存，(Export)就會顯示出來。
+DocType: Cheque Print Template,Distance from left edge,從左側邊緣的距離
+apps/erpnext/erpnext/utilities/bot.py +29,{0} units of [{1}](#Form/Item/{1}) found in [{2}](#Form/Warehouse/{2}),{0} [{1}]的單位（＃窗體/項目/ {1}）在[{2}]研究發現（＃窗體/倉儲/ {2}）
 DocType: Lead,Industry,行業
 DocType: Employee,Job Profile,工作簡介
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,在建立自動材料需求時以電子郵件通知
 DocType: Journal Entry,Multi Currency,多幣種
 DocType: Payment Reconciliation Invoice,Invoice Type,發票類型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +806,Delivery Note,送貨單
-apps/erpnext/erpnext/config/learn.py +87,Setting up Taxes,建立稅
-apps/erpnext/erpnext/accounts/utils.py +233,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +445,{0} entered twice in Item Tax,{0}輸入兩次項目稅
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +104,Summary for this week and pending activities,本週和待活動總結
-DocType: Workstation,Rent Cost,租金成本
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +73,Please select month and year,請選擇年份和月份
-DocType: Purchase Invoice,"Enter email id separated by commas, invoice will be mailed automatically on particular date",輸入電子郵件ID用逗號隔開，發票會自動在特定的日期郵寄
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,送貨單
+apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立稅
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售資產的成本
+apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,付款項被修改，你把它之後。請重新拉。
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}輸入兩次項目稅
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本週和待活動總結
+DocType: Student Applicant,Admitted,錄取
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +81,Amount After Depreciation,折舊金額後
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +97,Upcoming Calendar Events,即將到來的日曆事件
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +75,Please select month and year,請選擇年份和月份
 DocType: Employee,Company Email,企業郵箱
 DocType: GL Entry,Debit Amount in Account Currency,在賬戶幣種借記金額
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,訂單價值
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,訂單價值
+apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,銀行/現金對一方或內部轉讓交易
 DocType: Shipping Rule,Valid for Countries,有效的國家
-apps/erpnext/erpnext/stock/doctype/item/item.js +51,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,這個項目是一個模板，並且可以在交易不能使用。項目的屬性將被複製到變型，除非“不複製”設置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,總訂貨考慮
-apps/erpnext/erpnext/config/hr.py +186,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
-apps/erpnext/erpnext/controllers/recurring_document.py +220,Please enter 'Repeat on Day of Month' field value,請輸入「重複月內的一天」欄位值
+apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",員工指定（例如總裁，總監等） 。
+apps/erpnext/erpnext/controllers/recurring_document.py +223,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: Course Scheduling Tool,Course Scheduling Tool,排課工具
+apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：採購發票不能對現有資產進行{1}
 DocType: Item Tax,Tax Rate,稅率
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +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 +812,Select Item,選擇項目
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Item: {0} managed batch-wise, can not be reconciled using \
-					Stock Reconciliation, instead use Stock Entry","項目：{0}管理分批，不能使用\
-庫存調整，而是使用庫存分錄。"
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配給員工{1}週期為{2}到{3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,選擇項目
 apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,採購發票{0}已經提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批號必須與{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,轉換為非集團
-apps/erpnext/erpnext/config/stock.py +117,Batch (lot) of an Item.,一批該產品的（很多）。
+apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,一批該產品的（很多）。
 DocType: C-Form Invoice Detail,Invoice Date,發票日期
 DocType: GL Entry,Debit Amount,借方金額
-apps/erpnext/erpnext/accounts/party.py +242,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +4,Your email address,您的電子郵件地址
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +342,Please see attachment,請參閱附件
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},只能有每公司1帳戶{0} {1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,請參閱附件
 DocType: Purchase Order,% Received,％ 已收
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +19,Setup Already Complete!!,安裝已經完成！
-,Finished Goods,成品
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,創建挺起胸
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +21,Setup Already Complete!!,安裝已經完成！
 DocType: Delivery Note,Instructions,說明
 DocType: Quality Inspection,Inspected By,視察
 DocType: Maintenance Visit,Maintenance Type,維護類型
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +59,Serial No {0} does not belong to Delivery Note {1},序列號{0}不屬於送貨單{1}
+apps/erpnext/erpnext/public/js/utils/item_selector.js +12,Add Items,添加項目
 DocType: Item Quality Inspection Parameter,Item Quality Inspection Parameter,產品質量檢驗參數
 DocType: Leave Application,Leave Approver Name,離開批准人姓名
 DocType: Depreciation Schedule,Schedule Date,排定日期
+apps/erpnext/erpnext/config/hr.py +116,"Earnings, Deductions and other Salary components",收入，扣減等工資組成部分
 DocType: Packed Item,Packed Item,盒裝產品
 apps/erpnext/erpnext/config/buying.py +65,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/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,強制性領域 - 獲得學生
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +14,Mandatory field - Get Students From,強制性領域 - 獲得學生
+DocType: Program Enrollment,Enrolled courses,入學課程
+DocType: Program Enrollment,Enrolled courses,入學課程
 DocType: Currency Exchange,Currency Exchange,外幣兌換
-DocType: Purchase Invoice Item,Item Name,項目名稱
+DocType: Asset,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: Email Digest,Credit Balance,貸方餘額
 DocType: Employee,Widowed,寡
+DocType: Request for Quotation,Request for Quotation,詢價
 DocType: Salary Slip Timesheet,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.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +736,Purchase Return,採購退貨
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,創建一個新的客戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果有多個定價規則繼續有效，用戶將被要求手動設定優先順序來解決衝突。
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,創建採購訂單
 ,Purchase Register,購買註冊
 DocType: Landed Cost Item,Applicable Charges,相關費用
-DocType: Workstation,Consumable Cost,耗材成本
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +202,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',"{0} ({1}) 必須有""假期審批“權限"
 DocType: Purchase Receipt,Vehicle Date,車日期
 DocType: Student Log,Medical,醫療
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +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/crm/doctype/opportunity/opportunity.js +177,Reason for losing,原因丟失
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,鉛所有者不能等同於鉛
+apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,分配的金額不能超過未調整的量更大
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +83,Workstation is closed on the following dates as per Holiday List: {0},工作站在以下日期關閉按假日列表：{0}
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +32,Opportunities,機會
 DocType: Employee,Single,單
+DocType: Salary Slip,Total Loan Repayment,總貸款還款
 DocType: Account,Cost of Goods Sold,銷貨成本
-DocType: Purchase Invoice,Yearly,每年
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +225,Please enter Cost Center,請輸入成本中心
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +228,Please enter Cost Center,請輸入成本中心
 DocType: Journal Entry Account,Sales Order,銷售訂單
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +68,Avg. Selling Rate,平均。賣出價
-apps/erpnext/erpnext/utilities/transaction_base.py +149,Quantity cannot be a fraction in row {0},於{0}列的數量不能是分數
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Avg. Selling Rate,平均。賣出價
+DocType: Assessment Plan,Examiner Name,考官名稱
 DocType: Purchase Invoice Item,Quantity and Rate,數量和速率
 DocType: Delivery Note,% Installed,％已安裝
+apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供應商&gt;供應商類型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,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,是集團
+DocType: Email Digest,Pending Purchase Orders,待採購訂單
 DocType: Stock Settings,Automatically Set Serial Nos based on FIFO,自動設置序列號的基礎上FIFO
 DocType: Accounts Settings,Check Supplier Invoice Number Uniqueness,檢查供應商發票編號唯一性
+DocType: Vehicle Service,Oil Change,換油
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.',“至案件編號”不能少於'從案件編號“
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,Non Profit,非營利
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +108,Non Profit,非營利
 DocType: Production Order,Not Started,未啟動
 DocType: Lead,Channel Partner,渠道合作夥伴
 DocType: Account,Old Parent,老家長
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修課 - 學年
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定義去作為郵件的一部分的介紹文字。每筆交易都有一個單獨的介紹性文字。
-DocType: Stock Reconciliation Item,Do not include symbols (ex. $),不包括符號（例如$）
-DocType: Sales Taxes and Charges Template,Sales Master Manager,銷售主檔經理
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},請為公司{0}設置預設應付賬款
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有製造過程中的全域設定。
 DocType: Accounts Settings,Accounts Frozen Upto,帳戶被凍結到
 DocType: SMS Log,Sent On,發送於
-apps/erpnext/erpnext/stock/doctype/item/item.py +638,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,屬性{0}多次選擇在屬性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所選欄位創建員工記錄。
 DocType: Sales Order,Not Applicable,不適用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假日高手。
 DocType: Request for Quotation Item,Required Date,所需時間
 DocType: Delivery Note,Billing Address,帳單地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +862,Please enter Item Code.,請輸入產品編號。
-DocType: BOM,Costing,成本核算
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,請輸入產品編號。
+DocType: Tax Rule,Billing County,開票縣
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果選中，稅額將被視為已包含在列印速率/列印數量
+DocType: Request for Quotation,Message for Supplier,消息供應商
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +48,Total Qty,總數量
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2電子郵件ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +60,Guardian2 Email ID,Guardian2電子郵件ID
+DocType: Item,Show in Website (Variant),展網站（變體）
 DocType: Employee,Health Concerns,健康問題
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +15,Unpaid,未付
+DocType: Process Payroll,Select Payroll Period,選擇工資期
 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,證券及存款
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +77,Total leaves allocated is mandatory,總葉分配是必須的
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改變估值方法，因為有一些項目沒有自己的估值方法的交易
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,總葉分配是必須的
 DocType: Job Opening,Description of a Job Opening,一個空缺職位的說明
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +101,Pending activities for today,今天待定活動
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活動
 apps/erpnext/erpnext/config/hr.py +24,Attendance record.,考勤記錄。
+DocType: Salary Structure,Salary Component for timesheet based payroll.,薪酬部分基於時間表工資。
 DocType: Sales Order Item,Used for Production Plan,用於生產計劃
+DocType: Employee Loan,Total Payment,總付款
 DocType: Manufacturing Settings,Time Between Operations (in mins),作業間隔時間（以分鐘計）
 DocType: Customer,Buyer of Goods and Services.,買家商品和服務。
 DocType: Journal Entry,Accounts Payable,應付帳款
 apps/erpnext/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.py +29,The selected BOMs are not for the same item,所選的材料清單並不同樣項目
 DocType: Pricing Rule,Valid Upto,到...為止有效
-apps/erpnext/erpnext/public/js/setup_wizard.js +238,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +243,List a few of your customers. They could be organizations or individuals.,列出一些你的客戶。他們可以是組織或個人。
+,Enough Parts to Build,足夠的配件組裝
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +126,Direct Income,直接收入
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +36,"Can not filter based on Account, if grouped by Account",7 。總計：累積總數達到了這一點。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Administrative Officer,政務主任
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +319,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 +398,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Administrative Officer,政務主任
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,請選擇課程
+DocType: Timesheet Detail,Hrs,小時
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,請選擇公司
+DocType: Stock Entry Detail,Difference Account,差異帳戶
+apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因為其依賴的任務{0}沒有關閉關閉任務。
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,請輸入物料需求欲增加的倉庫
 DocType: Production Order,Additional Operating Cost,額外的運營成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妝品
-apps/erpnext/erpnext/stock/doctype/item/item.py +530,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",若要合併，以下屬性必須為這兩個項目是相同的
 DocType: Shipping Rule,Net Weight,淨重
 DocType: Employee,Emergency Phone,緊急電話
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,購買
 ,Serial No Warranty Expiry,序列號保修到期
+DocType: Sales Invoice,Offline POS Name,離線POS名稱
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,請定義等級為閾值0％
 DocType: Sales Order,To Deliver,為了提供
 DocType: Purchase Invoice Item,Item,項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,序號項目不能是一個分數
 DocType: Journal Entry,Difference (Dr - Cr),差異（Dr - Cr）
 DocType: Account,Profit and Loss,損益
-apps/erpnext/erpnext/config/stock.py +314,Managing Subcontracting,管理轉包
+apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理轉包
+DocType: Project,Project will be accessible on the website to these users,項目將在網站向這些用戶上訪問
 DocType: Quotation,Rate at which Price list currency is converted to company's base currency,價目表貨幣被換算成公司基礎貨幣的匯率
-apps/erpnext/erpnext/setup/doctype/company/company.py +56,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
-apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation already used for another company,縮寫已用在另一家公司
+apps/erpnext/erpnext/setup/doctype/company/company.py +59,Account {0} does not belong to company: {1},帳戶{0}不屬於公司：{1}
+apps/erpnext/erpnext/setup/doctype/company/company.py +50,Abbreviation already used for another company,縮寫已用在另一家公司
 DocType: Selling Settings,Default Customer Group,預設客戶群組
 DocType: Global Defaults,"If disable, 'Rounded Total' field will not be visible in any transaction",如果禁用，“圓角總計”字段將不可見的任何交易
 DocType: BOM,Operating Cost,營業成本
-DocType: Sales Order Item,Gross Profit,毛利
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +42,Increment cannot be 0,增量不能為0
-DocType: Production Planning Tool,Material Requirement,物料需求
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能為0
 DocType: Company,Delete Company Transactions,刪除公司事務
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,參考編號和參考日期是強制性的銀行交易
 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 +240,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +246,Closing (Cr),關閉（Cr）
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +105,Move Item,移動項目
 DocType: Serial No,Warranty Period (Days),保修期限（天數）
 DocType: Installation Note Item,Installation Note Item,安裝注意項
 DocType: Production Plan Item,Pending Qty,待定數量
-DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +86,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
-apps/erpnext/erpnext/controllers/buying_controller.py +152,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
-DocType: Pricing Rule,Valid From,有效期自
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1}是不活動
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},短信發送至以下號碼：{0}
+apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,設置檢查尺寸打印
+DocType: Salary Slip,Salary Slip Timesheet,工資單時間表
+apps/erpnext/erpnext/controllers/buying_controller.py +150,Supplier Warehouse mandatory for sub-contracted Purchase Receipt,對於轉包的採購入庫單，供應商倉庫是強制性輸入的。
 DocType: Sales Invoice,Total Commission,佣金總計
 DocType: Pricing Rule,Sales Partner,銷售合作夥伴
 DocType: Buying Settings,Purchase Receipt Required,需要採購入庫單
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,估價費用是強制性的，如果打開股票進入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,沒有在發票表中找到記錄
-apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +28,Please select Company and Party Type first,請選擇公司和黨的第一型
-apps/erpnext/erpnext/config/accounts.py +257,Financial / accounting year.,財務／會計年度。
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.js +10,Accumulated Values,累積值
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,請選擇公司和黨的第一型
+apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,財務／會計年度。
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累積值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",對不起，序列號無法合併
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +707,Make Sales Order,製作銷售訂單
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,製作銷售訂單
 DocType: Project Task,Project Task,項目任務
 ,Lead Id,潛在客戶標識
 DocType: C-Form Invoice Detail,Grand Total,累計
+DocType: Training Event,Course,課程
+DocType: Timesheet,Payslip,工資單
+apps/erpnext/erpnext/public/js/pos/pos.html +4,Item Cart,項目車
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +38,Fiscal Year Start Date should not be greater than Fiscal Year End Date,會計年度開始日期應不大於財政年度結束日期
 DocType: Issue,Resolution,決議
 apps/erpnext/erpnext/templates/pages/order.html +53,Delivered: {0},交貨：{0}
-apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +69,Payable Account,應付帳款
+DocType: Expense Claim,Payable Account,應付帳款
+DocType: Payment Entry,Type of Payment,付款類型
 DocType: Sales Order,Billing and Delivery Status,結算和交貨狀態
 DocType: Job Applicant,Resume Attachment,簡歷附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回頭客
 DocType: Leave Control Panel,Allocate,分配
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +734,Sales Return,銷貨退回
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,銷貨退回
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：總分配葉{0}應不低於已核定葉{1}期間
+DocType: Announcement,Posted By,發布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供應商交貨（直接發運）
 apps/erpnext/erpnext/config/crm.py +12,Database of potential customers.,數據庫的潛在客戶。
 DocType: Authorization Rule,Customer or Item,客戶或項目
 apps/erpnext/erpnext/config/selling.py +28,Customer database.,客戶數據庫。
 DocType: Quotation,Quotation To,報價到
-DocType: Lead,Middle Income,中等收入
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +212,Opening (Cr),開啟（Cr ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +795,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 +237,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),開啟（Cr ）
+apps/erpnext/erpnext/stock/doctype/item/item.py +804,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 +352,Allocated amount can not be negative,分配金額不能為負
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,請設定公司
 DocType: Purchase Order Item,Billed Amt,已結算額
+DocType: Training Result Employee,Training Result Employee,訓練結果員工
 DocType: Warehouse,A logical Warehouse against which stock entries are made.,對這些庫存分錄帳進行的邏輯倉庫。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +91,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
-DocType: Sales Invoice,Customer's Vendor,客戶的供應商
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Proposal Writing,提案寫作
+DocType: Employee Loan Application,Total Payable Interest,合計應付利息
+DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,銷售發票時間表
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},參考號與參考日期須為{0}
+DocType: Process Payroll,Select Payment Account to make Bank Entry,選擇付款賬戶，使銀行進入
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",建立員工檔案管理葉，報銷和工資
+apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知識庫
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案寫作
+DocType: Payment Entry Deduction,Payment Entry Deduction,輸入付款扣除
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +35,Another Sales Person {0} exists with the same Employee id,另外銷售人員{0}存在具有相同員工ID
+DocType: Production Planning Tool,"If checked, raw materials for items that are sub-contracted will be included in the Material Requests",如果選中，原料是分包的將被納入材料要求項
 apps/erpnext/erpnext/config/accounts.py +80,Masters,資料主檔
+DocType: Assessment Plan,Maximum Assessment Score,最大考核評分
 apps/erpnext/erpnext/config/accounts.py +140,Update Bank Transaction Dates,更新銀行交易日期
 apps/erpnext/erpnext/config/projects.py +30,Time Tracking,時間跟踪
 DocType: Fiscal Year Company,Fiscal Year Company,會計年度公司
 DocType: Packing Slip Item,DN Detail,DN詳細
+DocType: Training Event,Conference,會議
 DocType: Timesheet,Billed,計費
 DocType: Batch,Batch Description,批次說明
-DocType: Delivery Note,Time at which items were delivered from warehouse,時間在哪個項目是從倉庫運送
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +12,Creating student groups,創建學生組
+apps/erpnext/erpnext/accounts/utils.py +720,"Payment Gateway Account not created, please create one manually.",支付網關帳戶沒有創建，請手動創建一個。
 DocType: Sales Invoice,Sales Taxes and Charges,銷售稅金及費用
 DocType: Employee,Organization Profile,組織簡介
+DocType: Student,Sibling Details,兄弟姐妹詳情
+DocType: Vehicle Service,Vehicle Service,汽車服務
+apps/erpnext/erpnext/config/setup.py +101,Automatically triggers the feedback request based on conditions.,自動觸發基於條件的反饋請求。
 DocType: Employee,Reason for Resignation,辭退原因
 apps/erpnext/erpnext/config/hr.py +147,Template for performance appraisals.,模板的績效考核。
+DocType: Sales Invoice,Credit Note Issued,信用票據發行
 DocType: Payment Reconciliation,Invoice/Journal Entry Details,發票/日記帳分錄詳細資訊
-apps/erpnext/erpnext/accounts/utils.py +53,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
+apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不在財政年度{2}
 DocType: Buying Settings,Settings for Buying Module,設置購買模塊
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,請先輸入採購入庫單
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},資產{0}不屬於公司{1}
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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 +23,Net Change in Inventory,在庫存淨變動
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然後定價規則將被過濾掉基於客戶，客戶群組，領地，供應商，供應商類型，活動，銷售合作夥伴等。
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在庫存淨變動
+apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,員工貸款管理
 DocType: Employee,Passport Number,護照號碼
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +80,Manager,經理
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +227,Same item has been entered multiple times.,相同的項目已被輸入多次。
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,與關係Guardian2
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,經理
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用額度小於當前餘額為客戶著想。信用額度是ATLEAST {0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,銷售人員目標
-apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter email address,請輸入您的電子郵件地址
 DocType: Production Order Operation,In minutes,在幾分鐘內
 DocType: Issue,Resolution Date,決議日期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +715,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,創建時間表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},請設定現金或銀行帳戶的預設付款方式{0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,註冊
 DocType: Selling Settings,Customer Naming By,客戶命名由
+DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,將顯示學生每月學生出勤記錄報告為存在
+DocType: Depreciation Schedule,Depreciation Amount,折舊額
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +56,Convert to Group,轉換為集團
 DocType: Activity Cost,Activity Type,活動類型
+DocType: Request for Quotation,For individual supplier,對於個別供應商
+DocType: BOM Operation,Base Hour Rate(Company Currency),基數小時率（公司貨幣）
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +47,Delivered Amount,交付金額
-DocType: Supplier,Fixed Days,固定天
 DocType: Quotation Item,Item Balance,項目平衡
 DocType: Sales Invoice,Packing List,包裝清單
 apps/erpnext/erpnext/config/buying.py +28,Purchase Orders given to Suppliers.,購買給供應商的訂單。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +43,Publishing,出版
 DocType: Activity Cost,Projects User,項目用戶
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Consumed,消費
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +157,{0}: {1} not found in Invoice Details table,{0}：在發票明細表中找不到{1}
 DocType: Company,Round Off Cost Center,四捨五入成本中心
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,Maintenance Visit {0} must be cancelled before cancelling this Sales Order,維護訪問{0}必須取消這個銷售訂單之前被取消
 DocType: Item,Material Transfer,物料轉倉
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +205,Opening (Dr),開啟（Dr）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +211,Opening (Dr),開啟（Dr）
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +39,Posting timestamp must be after {0},登錄時間戳記必須晚於{0}
+DocType: Employee Loan,Total Interest Payable,合計應付利息
 DocType: Landed Cost Taxes and Charges,Landed Cost Taxes and Charges,到岸成本稅費
 DocType: Production Order Operation,Actual Start Time,實際開始時間
 DocType: BOM Operation,Operation Time,操作時間
-DocType: Pricing Rule,Sales Manager,銷售經理
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,基礎
+DocType: Timesheet,Total Billed Hours,帳單總時間
 DocType: Journal Entry,Write Off Amount,核銷金額
 DocType: Journal Entry,Bill No,帳單號碼
+DocType: Company,Gain/Loss Account on Asset Disposal,在資產處置收益/損失帳戶
+DocType: Vehicle Log,Service Details,服務細節
+DocType: Vehicle Log,Service Details,服務細節
 DocType: Purchase Invoice,Quarterly,每季
 DocType: Selling Settings,Delivery Note Required,要求送貨單
-DocType: Sales Order Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
+DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
+DocType: Bank Guarantee,Bank Guarantee Number,銀行擔保編號
+DocType: Assessment Criteria,Assessment Criteria,評估標準
+DocType: BOM Item,Basic Rate (Company Currency),基礎匯率（公司貨幣）
+DocType: Student Attendance,Student Attendance,學生出勤
+DocType: Sales Invoice Timesheet,Time Sheet,時間表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,倒沖原物料基於
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +53,Please enter item details,請輸入項目細節
+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 +65,Marketing,市場營銷
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +227,Payment Entry is already created,已創建付款輸入
+DocType: Vehicle,Odometer Value (Last),里程表值（最後）
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Marketing,市場營銷
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,已創建付款輸入
 DocType: Purchase Receipt Item Supplied,Current Stock,當前庫存
+apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：資產{1}不掛項目{2}
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,預覽工資單
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帳戶{0}已多次輸入
 DocType: Account,Expenses Included In Valuation,支出計入估值
-DocType: Employee,Provide email id registered in company,提供在公司註冊的電子郵件ID
 DocType: Hub Settings,Seller City,賣家市
+,Absent Student Report,缺席學生報告
 DocType: Email Digest,Next email will be sent on:,接下來的電子郵件將被發送：
 DocType: Offer Letter Term,Offer Letter Term,報價函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +617,Item has variants.,項目已變種。
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +68,Item {0} not found,項{0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,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,樹類型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,樹類型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,數量消耗每單位
 DocType: Serial No,Warranty Expiry Date,保證期到期日
 DocType: Material Request Item,Quantity and Warehouse,數量和倉庫
 DocType: Sales Invoice,Commission Rate (%),佣金比率（％）
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,請選擇程序
 DocType: Project,Estimated Cost,估計成本
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +7,Aerospace,航天
+DocType: Purchase Order,Link to material requests,鏈接到材料請求
 DocType: Journal Entry,Credit Card Entry,信用卡進入
 apps/erpnext/erpnext/config/accounts.py +51,Company and Accounts,公司與賬戶
 apps/erpnext/erpnext/config/stock.py +22,Goods received from Suppliers.,從供應商收貨。
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +49,In Value,在數值
 DocType: Lead,Campaign Name,活動名稱
-,Reserved,保留的
+DocType: Selling Settings,Close Opportunity After Days,關閉機會後日
 DocType: Purchase Order,Supply Raw Materials,供應原料
 DocType: Purchase Invoice,The date on which next invoice will be generated. It is generated on submit.,在這接下來的發票將生成的日期。它在提交生成。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +10,Current Assets,流動資產
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +90,{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 +169,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
+DocType: Payment Entry,Received Amount (Company Currency),收到的款項（公司幣種）
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,如果機會是由前導而來，前導必須被設定
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,請選擇每週休息日
 DocType: Production Order Operation,Planned End Time,計劃結束時間
 ,Sales Person Target Variance Item Group-Wise,銷售人員跨項目群組間的目標差異
-apps/erpnext/erpnext/accounts/doctype/account/account.py +96,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +97,Account with existing transaction cannot be converted to ledger,帳戶與現有的交易不能被轉換為總賬
 DocType: Delivery Note,Customer's Purchase Order No,客戶的採購訂單編號
+DocType: Budget,Budget Against,反對財政預算案
 DocType: Employee,Cell Number,手機號碼
 apps/erpnext/erpnext/stock/reorder_item.py +177,Auto Material Requests Generated,汽車材料的要求生成
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +7,Lost,丟失
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +125,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +25,Energy,能源
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +152,You can not enter current voucher in 'Against Journal Entry' column,在您不能輸入電流券“對日記帳分錄”專欄
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +50,Reserved for manufacturing,預留製造
 DocType: Opportunity,Opportunity From,機會從
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月薪聲明。
-DocType: Item Group,Website Specifications,網站規格
-apps/erpnext/erpnext/utilities/doctype/address/address.py +104,There is an error in your Address Template {0},有一個在你的地址模板錯誤{0}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +23,{0}: From {0} of type {1},{0}：從{0}類型{1}
-apps/erpnext/erpnext/controllers/buying_controller.py +283,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +274,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +369,Cannot deactivate or cancel BOM as it is linked with other BOMs,無法關閉或取消BOM，因為它是與其他材料明細表鏈接
+DocType: BOM,Website Specifications,網站規格
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,請通過設置&gt;編號系列設置出勤編號系列
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：從{0}類型{1}
+apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,列#{0}：轉換係數是強制性的
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +325,"Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}",海報價格規則，同樣的標準存在，請通過分配優先解決衝突。價格規則：{0}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +434,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 +206,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +214,Purchase Receipt number required for Item {0},物品{0}所需交易收據號碼
 DocType: Item Attribute Value,Item Attribute Value,項目屬性值
-apps/erpnext/erpnext/config/selling.py +148,Sales campaigns.,銷售活動。
+apps/erpnext/erpnext/config/selling.py +158,Sales campaigns.,銷售活動。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +48,Make Timesheet,製作時間表
 DocType: Sales Taxes and Charges Template,"Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like ""Shipping"", ""Insurance"", ""Handling"" etc.
 
 #### Note
@@ -612,109 +772,135 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。這是含稅的基本速率？：如果你檢查這一點，就意味著這個稅不會顯示在項目表中，但在你的主項表將被納入基本速率。你想要給一個單位的價格（包括所有稅費）的價格為顧客這是非常有用的。"
 DocType: Employee,Bank A/C No.,銀行A/C No.
-DocType: GL Entry,Project,專案
+DocType: Bank Guarantee,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/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},通過資產日記帳分錄報廢{0}
+DocType: Employee Loan,Interest Income Account,利息收入賬戶
 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 +107,Office Maintenance Expenses,Office維護費用
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,請先輸入品項
+apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,設置電子郵件帳戶
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,請先輸入品項
 DocType: Account,Liability,責任
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +61,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金額不能大於索賠額行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +275,Price List not selected,未選擇價格列表
-DocType: Employee,Family Background,家庭背景
+apps/erpnext/erpnext/stock/get_item_details.py +299,Price List not selected,未選擇價格列表
 DocType: Request for Quotation Supplier,Send Email,發送電子郵件
-apps/erpnext/erpnext/stock/doctype/item/item.py +204,Warning: Invalid Attachment {0},警告：無效的附件{0}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +709,No Permission,無權限
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},警告：無效的附件{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,無權限
 DocType: Company,Default Bank Account,預設銀行帳戶
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根據黨的篩選，選擇黨第一類型
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +48,'Update Stock' can not be checked because items are not delivered via {0},不能勾選`更新庫存'，因為項目未交付{0}
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Nos,NOS
+DocType: Vehicle,Acquisition Date,採集日期
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Nos,NOS
 DocType: Item,Items with higher weightage will be shown higher,具有較高權重的項目將顯示更高的可
 DocType: Bank Reconciliation Detail,Bank Reconciliation Detail,銀行對帳詳細
+apps/erpnext/erpnext/controllers/accounts_controller.py +559,Row #{0}: Asset {1} must be submitted,行＃{0}：資產{1}必須提交
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,無發現任何員工
 DocType: Supplier Quotation,Stopped,停止
 DocType: Item,If subcontracted to a vendor,如果分包給供應商
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,學生組已經更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,學生組已經更新。
 DocType: SMS Center,All Customer Contact,所有的客戶聯絡
-apps/erpnext/erpnext/config/stock.py +148,Upload stock balance via csv.,通過CSV上傳庫存餘額。
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +27,Send Now,立即發送
+apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通過CSV上傳庫存餘額。
+DocType: Warehouse,Tree Details,樹詳細信息
+DocType: Training Event,Event Status,事件狀態
 ,Support Analytics,支援分析
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +344,"If you have any questions, please get back to us.",如果您有任何疑問，請再次與我們聯繫。
 DocType: Item,Website Warehouse,網站倉庫
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小發票金額
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不屬於公司{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帳戶{2}不能是一個組
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,項目行的{idx} {文檔類型} {} DOCNAME上面不存在&#39;{}的文檔類型“表
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,時間表{0}已完成或取消
+apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,沒有任務
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",該月的一天，在這汽車的發票將產生如05，28等
+DocType: Asset,Opening Accumulated Depreciation,打開累計折舊
 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 +294,C-Form records,C-往績紀錄
-apps/erpnext/erpnext/config/selling.py +297,Customer and Supplier,客戶和供應商
+DocType: Program Enrollment Tool,Program Enrollment Tool,計劃註冊工具
+apps/erpnext/erpnext/config/accounts.py +299,C-Form records,C-往績紀錄
+apps/erpnext/erpnext/config/selling.py +311,Customer and Supplier,客戶和供應商
 DocType: Email Digest,Email Digest Settings,電子郵件摘要設定
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +346,Thank you for your business!,感謝您的業務！
 apps/erpnext/erpnext/config/support.py +12,Support queries from customers.,客戶支持查詢。
+,Production Order Stock Report,生產訂單庫存報告
+DocType: HR Settings,Retirement Age,退休年齡
 DocType: Bin,Moving Average Rate,移動平均房價
 DocType: Production Planning Tool,Select Items,選擇項目
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +342,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0}針對帳單{1}日期{2}
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,課程表
 DocType: Maintenance Visit,Completion Status,完成狀態
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +229,Target Warehouse,目標倉庫
+DocType: HR Settings,Enter retirement age in years,在年內進入退休年齡
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目標倉庫
+DocType: Cheque Print Template,Starting location from left edge,從左邊起始位置
 DocType: Item,Allow over delivery or receipt upto this percent,允許在交付或接收高達百分之這
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +53,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,所有項目群組
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有項目群組
 DocType: Process Payroll,Activity Log,活動日誌
-apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +36,Net Profit / Loss,淨利／虧損
+apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,淨利／虧損
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,自動編寫郵件在提交交易。
 DocType: Production Order,Item To Manufacture,產品製造
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +82,{0} {1} status is {2},{0} {1}的狀態為{2}
+apps/erpnext/erpnext/buying/utils.py +80,{0} {1} status is {2},{0} {1}的狀態為{2}
+DocType: Employee,Provide Email Address registered in company,提供公司註冊郵箱地址
 DocType: Shopping Cart Settings,Enable Checkout,啟用結帳
-apps/erpnext/erpnext/config/learn.py +207,Purchase Order to Payment,採購訂單到付款
-apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +37,Projected Qty,預計數量
-DocType: Sales Invoice,Payment Due Date,付款到期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +278,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
-apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +95,'Opening',“開放”
+apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,採購訂單到付款
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,預計數量
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,項目變種{0}已經具有相同屬性的存在
+apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',“開放”
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,開做
 DocType: Notification Control,Delivery Note Message,送貨單留言
 DocType: Expense Claim,Expenses,開支
 DocType: Item Variant Attribute,Item Variant Attribute,產品規格屬性
 ,Purchase Receipt Trends,採購入庫趨勢
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +75,Research & Development,研究與發展
-,Amount to Bill,帳單數額
+DocType: Vehicle Service,Brake Pad,剎車片
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +81,Research & Development,研究與發展
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +20,Amount to Bill,帳單數額
 DocType: Company,Registration Details,註冊細節
+DocType: Timesheet,Total Billed Amount,總開單金額
 DocType: Item Reorder,Re-Order Qty,重新排序數量
 DocType: Leave Block List Date,Leave Block List Date,休假區塊清單日期表
 DocType: Pricing Rule,Price or Discount,價格或折扣
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外購入庫單項目表總的相關費用必須是相同的總稅費
 DocType: Sales Team,Incentives,獎勵
 DocType: SMS Log,Requested Numbers,請求號碼
 apps/erpnext/erpnext/config/hr.py +142,Performance appraisal.,績效考核。
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +95,"Enabling 'Use for Shopping Cart', as Shopping Cart is enabled and there should be at least one Tax Rule for Shopping Cart",作為啟用的購物車已啟用“使用購物車”，而應該有購物車至少有一個稅務規則
+apps/erpnext/erpnext/controllers/accounts_controller.py +357,"Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice.",付款輸入{0}對訂單{1}，檢查它是否應該被拉到作為預先在該發票聯。
 DocType: Sales Invoice Item,Stock Details,庫存詳細訊息
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +29,Project Value,專案值
-apps/erpnext/erpnext/config/selling.py +307,Point-of-Sale,銷售點
-apps/erpnext/erpnext/accounts/doctype/account/account.py +119,"Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'",帳戶餘額已歸為信用帳戶，不允許設為借方帳戶
+apps/erpnext/erpnext/config/selling.py +321,Point-of-Sale,銷售點
+DocType: Vehicle Log,Odometer Reading,里程表讀數
+apps/erpnext/erpnext/accounts/doctype/account/account.py +120,"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,可用數量
 DocType: Purchase Taxes and Charges,On Previous Row Total,在上一行共
-DocType: Salary Slip,Working Days,工作日
+DocType: Purchase Invoice Item,Rejected Qty,被拒絕的數量
 DocType: Serial No,Incoming Rate,傳入速率
-DocType: Packing Slip,Gross Weight,毛重
 apps/erpnext/erpnext/public/js/setup_wizard.js +67,The name of your company for which you are setting up this system.,您的公司要為其設立這個系統的名稱。
 DocType: HR Settings,Include holidays in Total no. of Working Days,包括節假日的總數。工作日
-DocType: Job Applicant,Hold,持有
 DocType: Employee,Date of Joining,加入日期
-DocType: Naming Series,Update Series,更新系列
 DocType: Supplier Quotation,Is Subcontracted,轉包
 DocType: Item Attribute,Item Attribute Values,項目屬性值
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +756,Purchase Receipt,採購入庫單
+DocType: Examination Result,Examination Result,考試成績
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,採購入庫單
 ,Received Items To Be Billed,待付款的收受品項
-DocType: Employee,Ms,女士
-apps/erpnext/erpnext/config/accounts.py +267,Currency exchange rate master.,貨幣匯率的主人。
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +282,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工資單
+apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,貨幣匯率的主人。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},參考文檔類型必須是一個{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},找不到時隙在未來{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,計劃材料為子組件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,銷售合作夥伴和地區
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +439,BOM {0} must be active,BOM {0}必須是積極的
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,由於已有庫存餘額的帳戶無法自動創建帳戶。您必須創建一個匹配的帳戶，然後才能在這個倉庫中的條目
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +510,BOM {0} must be active,BOM {0}必須是積極的
+DocType: Journal Entry,Depreciation Entry,折舊分錄
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +36,Please select the document type first,請先選擇文檔類型
-apps/erpnext/erpnext/templates/generators/item.html +68,Goto Cart,轉到車
 apps/erpnext/erpnext/maintenance/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,所需數量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +223,Warehouses with existing transaction can not be converted to ledger.,與現有的交易倉庫不能轉換到總帳。
 DocType: Bank Reconciliation,Total Amount,總金額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +32,Internet Publishing,互聯網出版
 DocType: Production Planning Tool,Production Orders,生產訂單
@@ -722,71 +908,91 @@
 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 +137,Please mention Round Off Account in Company,請註明舍入賬戶的公司
+apps/erpnext/erpnext/accounts/general_ledger.py +142,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}不活躍或不存在
-apps/erpnext/erpnext/stock/doctype/item/item.py +612,Item Variants {0} updated,項目變種{0}更新
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,員工{0}不活躍或不存在
+DocType: Fee Structure,Components,組件
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},請輸入項目資產類別{0}
 DocType: Quality Inspection Reading,Reading 6,6閱讀
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,無法{0} {1} {2}沒有任何負面的優秀發票
 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 +172,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用記錄無法被鏈接的{1}
+apps/erpnext/erpnext/config/accounts.py +215,Define budget for a financial year.,定義預算財政年度。
 DocType: Mode of Payment Account,Default Bank / Cash account will be automatically updated in POS Invoice when this mode is selected.,預設銀行/現金帳戶將被在POS機開發票，且選擇此模式時自動更新。
-DocType: Employee,Permanent Address Is,永久地址
-DocType: Production Order Operation,Operation completed for how many finished goods?,操作完成多少成品？
-apps/erpnext/erpnext/public/js/setup_wizard.js +162,The Brand,品牌
+DocType: Lead,LEAD-,鉛-
+apps/erpnext/erpnext/public/js/setup_wizard.js +167,The Brand,品牌
 DocType: Employee,Exit Interview Details,退出面試細節
 DocType: Item,Is Purchase Item,是購買項目
 DocType: Asset,Purchase Invoice,採購發票
 DocType: Stock Ledger Entry,Voucher Detail No,券詳細說明暫無
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,新的銷售發票
 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,開幕日期和截止日期應在同一會計年度
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,開幕日期和截止日期應在同一會計年度
 DocType: Lead,Request for Information,索取資料
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,同步離線發票
 DocType: Payment Request,Paid,付費
+DocType: Program Fee,Program Fee,課程費用
 DocType: Salary Slip,Total in words,總計大寫
 DocType: Material Request Item,Lead Time Date,交貨時間日期
-apps/erpnext/erpnext/accounts/page/pos/pos.js +86, is mandatory. Maybe Currency Exchange record is not created for ,是強制性的。也許外幣兌換記錄沒有創建
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +109,Row #{0}: Please specify Serial No for Item {1},列#{0}：請為項目{1}指定序號
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +619,"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.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
+DocType: Guardian,Guardian Name,監護人姓名
+DocType: Cheque Print Template,Has Print Format,擁有打印格式
+apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.",對於“產品包”的物品，倉庫，序列號和批號將被從“裝箱單”表考慮。如果倉庫和批次號是相同的任何“產品包”項目的所有包裝物品，這些值可以在主項表中輸入，值將被複製到“裝箱單”表。
 DocType: Job Opening,Publish on website,發布在網站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,發貨給客戶。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,供應商發票的日期不能超過過帳日期更大
 DocType: Purchase Invoice Item,Purchase Order Item,採購訂單項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +130,Indirect Income,間接收入
-apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
+DocType: Student Attendance Tool,Student Attendance Tool,學生考勤工具
+DocType: Cheque Print Template,Date Settings,日期設定
 ,Company Name,公司名稱
 DocType: SMS Center,Total Message(s),訊息總和（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +810,Select Item for Transfer,對於轉讓項目選擇
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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 +105,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +30,"Row {0}: Invoice {1} is invalid, it might be cancelled / does not exist. \
+						Please enter a valid Invoice",行{0}：發票{1}是無效的，它可能會被取消/不存在。 \請輸入有效的發票
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式對銷售/採購訂單應始終被標記為提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化學藥品
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +686,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
-DocType: Process Payroll,Select Payroll Year and Month,選擇薪資年和月
+DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默認銀行/現金帳戶時，會選擇此模式可以自動在工資日記條目更新。
+DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司貨幣）
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,所有項目都已經被轉移為這個生產訂單。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大於{1} {2}中使用的速率
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Meter,儀表
 DocType: Workstation,Electricity Cost,電力成本
 DocType: HR Settings,Don't send Employee Birthday Reminders,不要送員工生日提醒
-DocType: Opportunity,Walk In,走在
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +113,Stock Entries,Stock條目
 DocType: Item,Inspection Criteria,檢驗標準
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +12,Transfered,轉移
-apps/erpnext/erpnext/public/js/setup_wizard.js +163,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +163,White,白
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Transfered,轉移
+DocType: BOM Website Item,BOM Website Item,BOM網站項目
+apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,上傳你的信頭和標誌。 （您可以在以後對其進行編輯）。
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下來折舊日期輸入為過去的日期
 DocType: SMS Center,All Lead (Open),所有鉛（開放）
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：數量不適用於{4}在倉庫{1}在發布條目的時間（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,獲取有償進展
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Make ,使
+DocType: Item,Automatically Create New Batch,自動創建新批
+DocType: Item,Automatically Create New Batch,自動創建新批
+DocType: Student Admission,Admission Start Date,入學開始日期
 DocType: Journal Entry,Total Amount in Words,總金額大寫
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,有一個錯誤。一個可能的原因可能是因為您沒有保存的形式。請聯繫support@erpnext.com如果問題仍然存在。
 apps/erpnext/erpnext/templates/pages/cart.html +5,My Cart,我的購物車
-apps/erpnext/erpnext/controllers/selling_controller.py +154,Order Type must be one of {0},訂單類型必須是一個{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +155,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,開放數量
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,對於漲跌額請輸入帳號
+DocType: Student Batch Name,Student Batch Name,學生批名
 DocType: Holiday List,Holiday List Name,假日列表名稱
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +175,Stock Options,股票期權
+DocType: Repayment Schedule,Balance Loan Amount,平衡貸款額
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js +13,Schedule Course,課程時間表
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +186,Stock Options,股票期權
 DocType: Journal Entry Account,Expense Claim,報銷
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +237,Qty for {0},數量為{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +245,Do you really want to restore this scrapped asset?,難道你真的想恢復這個報廢的資產？
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +259,Qty for {0},數量為{0}
 DocType: Leave Application,Leave Application,休假申請
 apps/erpnext/erpnext/config/hr.py +80,Leave Allocation Tool,排假工具
 DocType: Leave Block List,Leave Block List Dates,休假區塊清單日期表
@@ -795,413 +1001,503 @@
 DocType: Company,Default Terms,默認條款
 DocType: Packing Slip Item,Packing Slip Item,包裝單項目
 DocType: Purchase Invoice,Cash/Bank Account,現金／銀行帳戶
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +70,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
+apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},請指定{0}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,刪除的項目在數量或價值沒有變化。
 DocType: Delivery Note,Delivery To,交貨給
-apps/erpnext/erpnext/stock/doctype/item/item.py +635,Attribute table is mandatory,屬性表是強制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,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 +29,Discount,折扣
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能為負數
+DocType: Asset,Total Number of Depreciations,折舊總數
+DocType: Sales Invoice Item,Rate With Margin,利率保證金
+DocType: Sales Invoice Item,Rate With Margin,利率保證金
 DocType: Workstation,Wages,工資
 DocType: Project,Internal,內部
 DocType: Task,Urgent,緊急
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +141,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +149,Please specify a valid Row ID for row {0} in table {1},請指定行{0}在表中的有效行ID {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: POS Profile,Sales Invoice Payment,銷售發票付款
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在銷售訂單/成品倉庫保留倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +70,Selling Amount,銷售金額
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +115,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,銷售金額
+DocType: Repayment Schedule,Interest Amount,利息金額
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是這條記錄的費用批審人，請更新“狀態”並儲存
 DocType: Serial No,Creation Document No,文檔創建編號
 DocType: Issue,Issue,問題
+DocType: Asset,Scrapped,報廢
 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 +190,"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/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +194,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
-apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
-DocType: BOM Operation,Operation,作業
+apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",屬性的項目變體。如大小，顏色等。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,WIP倉庫
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列號{0}在維護合約期間內直到{1}
 DocType: Lead,Organization Name,組織名稱
 DocType: Tax Rule,Shipping State,運輸狀態
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +62,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+,Projected Quantity as Source,預計庫存量的來源
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,項目必須使用'從採購入庫“按鈕進行新增
+DocType: Employee,A-,一個-
+DocType: Production Planning Tool,Include non-stock items,包括非股票項目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,銷售費用
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +18,Standard Buying,標準採購
 DocType: GL Entry,Against,針對
 DocType: Item,Default Selling Cost Center,預設銷售成本中心
 DocType: Sales Partner,Implementation Partner,實施合作夥伴
-apps/erpnext/erpnext/controllers/selling_controller.py +231,Sales Order {0} is {1},銷售訂單{0} {1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,郵政編碼
+apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},銷售訂單{0} {1}
 DocType: Opportunity,Contact Info,聯絡方式
-apps/erpnext/erpnext/config/stock.py +299,Making Stock Entries,製作Stock條目
+apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,製作Stock條目
 DocType: Packing Slip,Net Weight UOM,淨重計量單位
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0}結果
 DocType: Item,Default Supplier,預設的供應商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,過度生產容許比例
+DocType: Employee Loan,Repayment Schedule,還款計劃
 DocType: Shipping Rule Condition,Shipping Rule Condition,送貨規則條件
 DocType: Holiday List,Get Weekly Off Dates,獲取每週關閉日期
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +30,End Date can not be less than Start Date,結束日期不能小於開始日期
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,結束日期不能小於開始日期
 DocType: Sales Person,Select company name first.,先選擇公司名稱。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Dr,博士
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,博士
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,從供應商收到的報價。
-apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年齡
+DocType: School Settings,Attendance Freeze Date,出勤凍結日期
+DocType: School Settings,Attendance Freeze Date,出勤凍結日期
 DocType: Opportunity,Your sales person who will contact the customer in future,你的銷售人員會在未來聯絡客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +261,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/public/js/setup_wizard.js +266,List a few of your suppliers. They could be organizations or individuals.,列出一些你的供應商。他們可以是組織或個人。
+apps/erpnext/erpnext/templates/pages/home.html +31,View All Products,查看所有產品
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +20,Minimum Lead Age (Days),最低鉛年齡（天）
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +59,All BOMs,所有的材料明細表
 DocType: Company,Default Currency,預設貨幣
-DocType: Contact,Enter designation of this Contact,輸入指定聯絡人
 DocType: Expense Claim,From Employee,從員工
-apps/erpnext/erpnext/controllers/accounts_controller.py +400,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
+apps/erpnext/erpnext/controllers/accounts_controller.py +417,Warning: System will not check overbilling since amount for Item {0} in {1} is zero,警告： {0} {1}為零，系統將不檢查超收因為金額項目
 DocType: Journal Entry,Make Difference Entry,使不同入口
-DocType: Upload Attendance,Attendance From Date,考勤起始日期
 DocType: Appraisal Template Goal,Key Performance Area,關鍵績效區
 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: ,和年份：
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +191,{0} {1} must be submitted,{0} {1}必須提交
-DocType: Email Digest,Annual Expense,年費用
+apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,無效屬性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1}必須提交
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必須小於或等於{0}
 DocType: SMS Center,Total Characters,總字元數
-apps/erpnext/erpnext/controllers/buying_controller.py +156,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
+apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},請BOM字段中選擇BOM的項目{0}
 DocType: C-Form Invoice Detail,C-Form Invoice Detail,C-表 發票詳細資訊
 DocType: Payment Reconciliation Invoice,Payment Reconciliation Invoice,付款發票對帳
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +42,Contribution %,貢獻％
 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 +211,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +62,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,{0}生產單必須早於售貨單前取消
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',請設置“收取額外折扣”
 ,Ordered Items To Be Billed,預付款的訂購物品
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +39,From Range has to be less than To Range,從範圍必須小於要範圍
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,從範圍必須小於要範圍
 DocType: Global Defaults,Global Defaults,全域預設值
+apps/erpnext/erpnext/projects/doctype/project/project.py +202,Project Collaboration Invitation,項目合作邀請
 DocType: Salary Slip,Deductions,扣除
+apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,開始年份
 DocType: Purchase Invoice,Start date of current invoice's period,當前發票期間內的開始日期
 DocType: Salary Slip,Leave Without Pay,無薪假
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +327,Capacity Planning Error,產能規劃錯誤
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,產能規劃錯誤
 ,Trial Balance for Party,試算表的派對
 DocType: Lead,Consultant,顧問
 DocType: Salary Slip,Earnings,收益
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +362,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
-apps/erpnext/erpnext/config/learn.py +92,Opening Accounting Balance,打開會計平衡
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +390,Finished Item {0} must be entered for Manufacture type entry,完成項目{0}必須為製造類條目進入
+apps/erpnext/erpnext/config/learn.py +87,Opening Accounting Balance,打開會計平衡
 DocType: Sales Invoice Advance,Sales Invoice Advance,銷售發票提前
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +499,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 +73,Management,管理
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +52,Either debit or credit amount is required for {0},無論是借方或貸方金額是必需的{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +548,Nothing to request,無需求
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +34,Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3},另一個預算記錄“{0}”已存在對{1}“{2}”為年度{3}
+apps/erpnext/erpnext/projects/doctype/task/task.py +40,'Actual Start Date' can not be greater than 'Actual End Date',“實際開始日期”不能大於“實際結束日期'
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +79,Management,管理
+DocType: Cheque Print Template,Payer Settings,付款人設置
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",這將追加到變異的項目代碼。例如，如果你的英文縮寫為“SM”，而該項目的代碼是“T-SHIRT”，該變種的項目代碼將是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,薪資單一被儲存，淨付款就會被顯示出來。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +161,Blue,藍色
 DocType: Purchase Invoice,Is Return,退貨
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,返回/借記注
 DocType: Price List Country,Price List Country,價目表國家
-apps/erpnext/erpnext/utilities/doctype/contact/contact.py +69,Please set Email ID,請設定電子郵件ID
 DocType: Item,UOMs,計量單位
-apps/erpnext/erpnext/stock/utils.py +181,{0} valid serial nos for Item {1},{0}項目{1}的有效的序號
+apps/erpnext/erpnext/stock/utils.py +182,{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 +23,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
-DocType: Purchase Order Item,UOM Conversion Factor,計量單位換算係數
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +24,POS Profile {0} already created for user: {1} and company {2},POS簡介{0}已經為用戶創建：{1}和公司{2}
+DocType: Sales Invoice Item,UOM Conversion Factor,計量單位換算係數
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,請輸入產品代碼來獲得批號
 DocType: Stock Settings,Default Item Group,預設項目群組
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供應商數據庫。
 DocType: Account,Balance Sheet,資產負債表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +685,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',成本中心與項目代碼“項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。請檢查是否帳戶已就付款方式或POS機配置文件中設置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的銷售人員將在此日期被提醒去聯絡客戶
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
+apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一項目不能輸入多次。
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",進一步帳戶可以根據組進行，但條目可針對非組進行
 DocType: Lead,Lead,潛在客戶
 DocType: Email Digest,Payables,應付賬款
-DocType: Account,Warehouse,倉庫
-apps/erpnext/erpnext/controllers/buying_controller.py +289,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
+DocType: Course,Course Intro,課程介紹
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +85,Stock Entry {0} created,股票輸入{0}創建
+apps/erpnext/erpnext/controllers/buying_controller.py +290,Row #{0}: Rejected Qty can not be entered in Purchase Return,行＃{0}：駁回採購退貨數量不能進入
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,針對所選的採購入庫單，存貨帳分錄和總帳分錄已經重新登錄。
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,項目1
 DocType: Holiday,Holiday,節日
+DocType: Support Settings,Close Issue After Days,關閉問題天后
 DocType: Leave Control Panel,Leave blank if considered for all branches,保持空白如果考慮到全部分支機構
+DocType: Bank Guarantee,Validity in Days,天數有效
+DocType: Bank Guarantee,Validity in Days,天數有效
+apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +21,C-form is not applicable for Invoice: {0},C-形式不適用發票：{0}
 DocType: Payment Reconciliation,Unreconciled Payment Details,未核銷付款明細
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +20,Order Count,訂單數量
 DocType: Global Defaults,Current Fiscal Year,當前會計年度
+DocType: Purchase Order,Group same items,組相同的項目
 DocType: Global Defaults,Disable Rounded Total,禁用圓角總
-DocType: Lead,Call,通話
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +417,'Entries' cannot be empty,“分錄”不能是空的
-apps/erpnext/erpnext/utilities/transaction_base.py +78,Duplicate row {0} with same {1},重複的行{0}同{1}
+DocType: Employee Loan Application,Repayment Info,還款信息
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +448,'Entries' cannot be empty,“分錄”不能是空的
+apps/erpnext/erpnext/utilities/transaction_base.py +81,Duplicate row {0} with same {1},重複的行{0}同{1}
 ,Trial Balance,試算表
-apps/erpnext/erpnext/config/hr.py +238,Setting up Employees,建立職工
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +150,Please select prefix first,請先選擇前綴稱號
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +145,Research,研究
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +416,Fiscal Year {0} not found,會計年度{0}未找到
+apps/erpnext/erpnext/config/hr.py +296,Setting up Employees,建立職工
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +157,Please select prefix first,請先選擇前綴稱號
 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/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +504,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +437,Rest Of The World,世界其他地區
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +84,The Item {0} cannot have Batch,該項目{0}不能有批
+apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,請指定屬性表中的至少一個屬性
+DocType: Announcement,All Students,所有學生
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,項{0}必須是一個非庫存項目
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看總帳
+DocType: Grading Scale,Intervals,間隔
+apps/erpnext/erpnext/stock/doctype/item/item.py +510,"An Item Group exists with same name, please change the item name or rename the item group",具有具有相同名稱的項目群組存在，請更改項目名稱或重新命名該項目群組
+apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,學生手機號碼
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,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 +163,Dividends Paid,股利支付
-apps/erpnext/erpnext/public/js/controllers/stock_controller.js +40,Accounting Ledger,會計總帳
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +115,Row {0}: Activity Type is mandatory.,行{0}：活動類型是強制性的。
+apps/erpnext/erpnext/buying/doctype/supplier/supplier.js +36,Accounting Ledger,會計總帳
 DocType: Stock Reconciliation,Difference Amount,差額
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +169,Retained Earnings,留存收益
-DocType: BOM Item,Item Description,項目說明
+DocType: Vehicle Log,Service Detail,服務細節
+DocType: BOM,Item Description,項目說明
+DocType: Student Sibling,Student Sibling,學生兄弟
 DocType: Purchase Invoice,Is Recurring,是經常性
 DocType: Purchase Invoice,Supplied Items,提供的物品
 DocType: Production Order,Qty To Manufacture,製造數量
+DocType: School Settings,School Settings,學校設置
+DocType: School Settings,School Settings,學校設置
 DocType: Buying Settings,Maintain same rate throughout purchase cycle,在整個採購週期價格保持一致
 DocType: Opportunity Item,Opportunity Item,項目的機會
+,Student and Guardian Contact Details,學生和監護人聯繫方式
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +39,Row {0}: For supplier {0} Email Address is required to send email,行{0}：對於供應商{0}的電郵地址發送電子郵件
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +70,Temporary Opening,臨時開通
 ,Employee Leave Balance,員工休假餘額
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +131,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +175,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
-DocType: Address,Address Type,地址類型
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +147,Balance for Account {0} must always be {1},帳戶{0}的餘額必須始終為{1}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +178,Valuation Rate required for Item in row {0},行對項目所需的估值速率{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +328,Example: Masters in Computer Science,舉例：碩士計算機科學
 DocType: Purchase Invoice,Rejected Warehouse,拒絕倉庫
 DocType: GL Entry,Against Voucher,對傳票
 DocType: Item,Default Buying Cost Center,預設採購成本中心
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +6,"To get the best out of ERPNext, we recommend that you take some time and watch these help videos.",為得到最好的 ERPNext 教學，我們建議您花一些時間和觀看這些說明影片。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +87, to ,到
+apps/erpnext/erpnext/accounts/page/pos/pos.js +73, to ,到
 DocType: Item,Lead Time in days,在天交貨期
-,Accounts Payable Summary,應付帳款摘要
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
+apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +58,Accounts Payable Summary,應付帳款摘要
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},從{0}工資支付{1}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},無權修改凍結帳戶{0}
 DocType: Journal Entry,Get Outstanding Invoices,獲取未付發票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +62,Sales Order {0} is not valid,銷售訂單{0}無效
-apps/erpnext/erpnext/setup/doctype/company/company.py +185,"Sorry, companies cannot be merged",對不起，企業不能合併
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +139,"The total Issue / Transfer quantity {0} in Material Request {1}  \
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,銷售訂單{0}無效
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,採購訂單幫助您規劃和跟進您的購買
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",對不起，企業不能合併
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材質要求總發行/傳輸量{0} {1} \不能超過請求的數量{2}的項目更大的{3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,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}
+DocType: Project,% Completed,％已完成
 ,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 +77,Account head {0} created,帳戶頭{0}創建
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +160,Green,綠
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +79,Account head {0} created,帳戶頭{0}創建
+DocType: Training Event,Training Event,培訓活動
 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 +57,Contract,合同
 DocType: Email Digest,Add Quote,添加報價
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +498,UOM coversion factor required for UOM: {0} in Item: {1},所需的計量單位計量單位：丁文因素：{0}項：{1}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +860,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 +90,Indirect Expenses,間接費用
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +80,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,列#{0}：數量是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,農業
-apps/erpnext/erpnext/public/js/setup_wizard.js +283,Your Products or Services,您的產品或服務
-DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +178,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.,這是個根項目群組，且無法被編輯。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,同步主數據
+apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的產品或服務
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,網站形象應該是一個公共文件或網站網址
+DocType: Student Applicant,AP,美聯社
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,這是個根項目群組，且無法被編輯。
 DocType: Journal Entry Account,Purchase Order,採購訂單
+DocType: Vehicle,Fuel UOM,燃油計量單位
 DocType: Warehouse,Warehouse Contact Info,倉庫聯絡方式
+DocType: Payment Entry,Write Off Difference Amount,核銷金額差異
 DocType: Purchase Invoice,Recurring Type,經常性類型
-DocType: Address,City/Town,市/鎮
-DocType: Address,Is Your Company Address,是你的公司地址
-DocType: Email Digest,Annual Income,年收入
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +394,"{0}: Employee email not found, hence email not sent",{0}：未發現員工的電子郵件，因此，電子郵件未發
+DocType: Item,Foreign Trade Details,外貿詳細
 DocType: Serial No,Serial No Details,序列號詳細資訊
 DocType: Purchase Invoice Item,Item Tax Rate,項目稅率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +474,Delivery Note {0} is not submitted,送貨單{0}未提交
-apps/erpnext/erpnext/stock/get_item_details.py +133,Item {0} must be a Sub-contracted Item,項{0}必須是一個小項目簽約
+DocType: Student Group Student,Group Roll Number,組卷編號
+DocType: Student Group Student,Group Roll Number,組卷編號
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",{0}，只有貸方帳戶可以連接另一個借方分錄
+apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任務的權重合計應為1。請相應調整的所有項目任務重
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,送貨單{0}未提交
+apps/erpnext/erpnext/stock/get_item_details.py +141,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.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",基於“適用於”欄位是「項目」，「項目群組」或「品牌」，而選擇定價規則。
 DocType: Hub Settings,Seller Website,賣家網站
-apps/erpnext/erpnext/controllers/selling_controller.py +147,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +110,Production Order status is {0},生產訂單狀態為{0}
+DocType: Item,ITEM-,項目-
+apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,對於銷售團隊總分配比例應為100
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},生產訂單狀態為{0}
 DocType: Appraisal Goal,Goal,目標
 DocType: Sales Invoice Item,Edit Description,編輯說明
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +757,For Supplier,對供應商
+,Team Updates,團隊更新
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,對供應商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,設置帳戶類型有助於在交易中選擇該帳戶。
 DocType: Purchase Invoice,Grand Total (Company Currency),總計（公司貨幣）
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,創建打印格式
+apps/erpnext/erpnext/utilities/bot.py +39,Did not find any item called {0},沒有找到所謂的任何項目{0}
 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""",只能有一個運輸規則條件為0或空值“ To值”
-DocType: Authorization Rule,Transaction,交易
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +47,"There can only be one Shipping Rule Condition with 0 or blank value for ""To Value""",只能有一個運輸規則條件為0或空值“ To值”
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +27,Note: This Cost Center is a Group. Cannot make accounting entries against groups.,注：該成本中心是一個集團。不能讓反對團體的會計分錄。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +126,Child warehouse exists for this warehouse. You can not delete this warehouse.,兒童倉庫存在這個倉庫。您不能刪除這個倉庫。
 DocType: Item,Website Item Groups,網站項目群組
 DocType: Purchase Invoice,Total (Company Currency),總計（公司貨幣）
-apps/erpnext/erpnext/stock/utils.py +176,Serial number {0} entered more than once,序號{0}多次輸入
+apps/erpnext/erpnext/stock/utils.py +177,Serial number {0} entered more than once,序號{0}多次輸入
 DocType: Depreciation Schedule,Journal Entry,日記帳分錄
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,正在進行{0}項目
 DocType: Workstation,Workstation Name,工作站名稱
+DocType: Grading Scale Interval,Grade Code,等級代碼
+DocType: POS Item Group,POS Item Group,POS項目組
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,電子郵件摘要：
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +445,BOM {0} does not belong to Item {1},BOM {0}不屬於項目{1}
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,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,這就是以這個前綴的最後一個創建的事務數
 DocType: Quality Inspection Reading,Reading 8,閱讀8
-DocType: Sales Partner,Agent,代理人
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,"Total {0} for all items is zero, may you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能你應該改變“基於分佈式費”
 DocType: Purchase Invoice,Taxes and Charges Calculation,稅費計算
-DocType: BOM Operation,Workstation,工作站
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +110,Hardware,硬件
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+DocType: Accounts Settings,Book Asset Depreciation Entry Automatically,自動存入資產折舊條目
+DocType: Request for Quotation Supplier,Request for Quotation Supplier,詢價供應商
 DocType: Sales Order,Recurring Upto,經常性高達
 DocType: Attendance,HR Manager,人力資源經理
-apps/erpnext/erpnext/accounts/party.py +171,Please select a Company,請選擇一個公司
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +48,Privilege Leave,特權休假
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,請選擇一個公司
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,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 +90,You need to enable Shopping Cart,您需要啟用購物車
+DocType: Payment Entry,Writeoff,註銷
 DocType: Appraisal Template Goal,Appraisal Template Goal,考核目標模板
-DocType: Salary Slip,Earning,盈利
+DocType: Salary Component,Earning,盈利
 DocType: Purchase Invoice,Party Account Currency,黨的賬戶幣種
 ,BOM Browser,BOM瀏覽器
-DocType: Purchase Taxes and Charges,Add or Deduct,添加或扣除
-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 +171,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +80,Overlapping conditions found between:,存在重疊的條件：
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +187,Against Journal Entry {0} is already adjusted against some other voucher,對日記條目{0}已經調整一些其他的優惠券
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +68,Total Order Value,總訂單價值
-apps/erpnext/erpnext/demo/setup_data.py +358,Food,食物
+apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食物
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,老齡範圍3
 DocType: Maintenance Schedule Item,No of Visits,沒有訪問量的
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,馬克考勤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},針對{1}存在維護計劃{0}
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,招生學生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在關閉帳戶的貨幣必須是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},對所有目標點的總和應該是100。{0}
 DocType: Project,Start and End Dates,開始和結束日期
 ,Delivered Items To Be Billed,交付項目要被收取
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +16,Open BOM {0},開放BOM {0}
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +60,Warehouse cannot be changed for Serial No.,倉庫不能改變序列號
-DocType: Authorization Rule,Average Discount,平均折扣
-DocType: Address,Utilities,公用事業
+DocType: Rename Tool,Utilities,公用事業
 DocType: Purchase Invoice Item,Accounting,會計
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +85,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
+DocType: Asset,Depreciation Schedules,折舊計劃
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +89,Application period cannot be outside leave allocation period,申請期間不能請假外分配週期
 DocType: Activity Cost,Projects,專案
 DocType: Payment Request,Transaction Currency,交易貨幣
-apps/erpnext/erpnext/controllers/buying_controller.py +24,From {0} | {1} {2},從{0} | {1} {2}
+apps/erpnext/erpnext/controllers/buying_controller.py +25,From {0} | {1} {2},從{0} | {1} {2}
 DocType: Production Order Operation,Operation Description,操作說明
 DocType: Item,Will also apply to variants,也將適用於變種
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +34,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: POS Profile,Campaign,競賽
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +29,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
+DocType: Supplier,Name and Type,名稱和類型
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',審批狀態必須被“批准”或“拒絕”
 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',“預計開始日期”不能大於“預計結束日期'
-DocType: Holiday List,Holidays,假期
+apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“預計開始日期”不能大於“預計結束日期'
+DocType: Course Scheduling Tool,Course End Date,課程結束日期
 DocType: Sales Order Item,Planned Quantity,計劃數量
 DocType: Purchase Invoice Item,Item Tax Amount,項目稅額
 DocType: Item,Maintain Stock,維護庫存資料
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +209,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +32,Net Change in Fixed Asset,在固定資產淨變動
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +211,Stock Entries already created for Production Order ,生產訂單已創建Stock條目
+DocType: Employee,Prefered Email,首選電子郵件
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +33,Net Change in Fixed Asset,在固定資產淨變動
 DocType: Leave Control Panel,Leave blank if considered for all designations,離開，如果考慮所有指定空白
-apps/erpnext/erpnext/controllers/accounts_controller.py +620,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +238,Max: {0},最大數量：{0}
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +15,From Datetime,從日期時間
+apps/erpnext/erpnext/accounts/doctype/account/account.py +176,Warehouse is mandatory for non group Accounts of type Stock,倉庫是強制性的類型股票的非組帳戶
+apps/erpnext/erpnext/controllers/accounts_controller.py +673,Charge of type 'Actual' in row {0} cannot be included in Item Rate,類型'實際'行{0}的計費，不能被包含在項目單價
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +260,Max: {0},最大數量：{0}
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,From Datetime,從日期時間
 DocType: Email Digest,For Company,對於公司
 apps/erpnext/erpnext/config/support.py +17,Communication log.,通信日誌。
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +71,Buying Amount,購買金額
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +151,"Request for Quotation is disabled to access from portal, for more check portal settings.",詢價被禁止訪問門脈，為更多的檢查門戶設置。
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +74,Buying Amount,購買金額
 DocType: Sales Invoice,Shipping Address Name,送貨地址名稱
-apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,條款及細則內容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +552,cannot be greater than 100,不能大於100
-apps/erpnext/erpnext/stock/doctype/item/item.py +680,Item {0} is not a stock Item,項{0}不是缺貨登記
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,不能大於100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,項{0}不是缺貨登記
 DocType: Maintenance Visit,Unscheduled,計劃外
 DocType: Employee,Owned,擁有的
 DocType: Salary Detail,Depends on Leave Without Pay,依賴於無薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",數字越大，優先級越高
 ,Purchase Invoice Trends,購買發票趨勢
-DocType: Employee,Better Prospects,更好的前景
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}數量。請選擇具有{3}數量的其他批次，或將該行拆分成多個行，以便從多個批次中傳遞/發布
 DocType: Appraisal,Goals,目標
 DocType: Warranty Claim,Warranty / AMC Status,保修/ AMC狀態
 ,Accounts Browser,帳戶瀏覽器
+DocType: Payment Entry Reference,Payment Entry Reference,付款輸入參考
 DocType: GL Entry,GL Entry,GL報名
 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 +61,Apprentice,學徒
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +102,Negative Quantity is not allowed,負數量是不允許
+apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +73,Print settings updated in respective print format,打印設置在相應的打印格式更新
+DocType: Package Code,Package Code,封裝代碼
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +67,Apprentice,學徒
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +103,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 +152,Employee cannot report to himself.,員工不能報告自己。
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,員工不能報告自己。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果帳戶被凍結，條目被允許受限制的用戶。
 DocType: Email Digest,Bank Balance,銀行結餘
-apps/erpnext/erpnext/accounts/party.py +234,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},會計分錄為{0}：{1}只能在貨幣做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",所需的工作概況，學歷等。
 DocType: Journal Entry Account,Account Balance,帳戶餘額
-apps/erpnext/erpnext/config/accounts.py +180,Tax Rule for transactions.,稅收規則進行的交易。
+apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,稅收規則進行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件類型進行重命名。
-apps/erpnext/erpnext/public/js/setup_wizard.js +302,We buy this Item,我們買這個項目
-DocType: Address,Billing,計費
+apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我們買這個項目
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客戶對應收賬款{2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),總稅費和費用（公司貨幣）
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,顯示未關閉的會計年度的盈虧平衡
 DocType: Shipping Rule,Shipping Account,送貨帳戶
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}帳戶{2}無效
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,製作銷售訂單，以幫助你計劃你的工作和按時交付
 DocType: Quality Inspection,Readings,閱讀
 DocType: Stock Entry,Total Additional Costs,總額外費用
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Sub Assemblies,子組件
-DocType: Shipping Rule Condition,To Value,To值
+DocType: BOM,Scrap Material Cost(Company Currency),廢料成本（公司貨幣）
+apps/erpnext/erpnext/public/js/setup_wizard.js +300,Sub Assemblies,子組件
+DocType: Asset,Asset Name,資產名稱
+DocType: Project,Task Weight,任務重
 DocType: Asset Movement,Stock Manager,庫存管理
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +141,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +719,Packing Slip,包裝單
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +143,Source warehouse is mandatory for row {0},列{0}的來源倉是必要的
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,包裝單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,辦公室租金
-apps/erpnext/erpnext/config/setup.py +105,Setup SMS gateway settings,設置短信閘道設置
+apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,設置短信閘道設置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,導入失敗！
 apps/erpnext/erpnext/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 +81,Analyst,分析人士
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +87,Analyst,分析人士
 DocType: Item,Inventory,庫存
 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,在數量
 DocType: Notification Control,Expense Claim Rejected,費用索賠被拒絕
-DocType: Item Attribute,Item Attribute,項目屬性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +103,Government,政府
-apps/erpnext/erpnext/config/stock.py +289,Item Variants,項目變體
+DocType: Item,Item Attribute,項目屬性
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +40,Expense Claim {0} already exists for the Vehicle Log,報銷{0}已經存在車輛日誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +41,Institute Name,學院名稱
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +117,Please enter repayment Amount,請輸入還款金額
+apps/erpnext/erpnext/config/stock.py +300,Item Variants,項目變體
 DocType: Company,Services,服務
-DocType: Cost Center,Parent Cost Center,父成本中心
-DocType: Sales Invoice,Source,源
+DocType: HR Settings,Email Salary Slip to Employee,電子郵件工資單給員工
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,選擇潛在供應商
+apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,顯示關閉
 DocType: Leave Type,Is Leave Without Pay,是無薪休假
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,資產類別是強制性的固定資產項目
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,沒有在支付表中找到記錄
+apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}衝突{1}在{2} {3}
+DocType: Student Attendance Tool,Students HTML,學生HTML
 apps/erpnext/erpnext/public/js/setup_wizard.js +60,Financial Year Start Date,財政年度開始日期
+DocType: POS Profile,Apply Discount,應用折扣
 DocType: Employee External Work History,Total Experience,總經驗
-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 +30,Cash Flow from Investing,從投資現金流
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +70,Open Projects,打開項目
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +283,Packing Slip(s) cancelled,包裝單（ S）已取消
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +31,Cash Flow from Investing,從投資現金流
+DocType: Program Course,Program Course,課程計劃
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +97,Freight and Forwarding Charges,貨運代理費
+DocType: Homepage,Company Tagline for website homepage,公司標語的網站主頁
 DocType: Item Group,Item Group Name,項目群組名稱
 apps/erpnext/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py +27,Taken,拍攝
+DocType: Student,Date of Leaving,離開日期
 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 +426,"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/utilities/activation.py +61,Create Leads,建立潛在客戶
 DocType: Maintenance Schedule,Schedules,時間表
 DocType: Purchase Invoice Item,Net Amount,淨額
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM表詳細編號
+DocType: Landed Cost Voucher,Additional Charges,附加費用
 DocType: Purchase Invoice,Additional Discount Amount (Company Currency),額外的優惠金額（公司貨幣）
 apps/erpnext/erpnext/accounts/doctype/account/account.js +7,Please create new account from Chart of Accounts.,請從科目表建立新帳戶。
 DocType: Maintenance Visit,Maintenance Visit,維護訪問
+DocType: Student,Leaving Certificate Number,畢業證書號碼
 DocType: Sales Invoice Item,Available Batch Qty at Warehouse,可用的批次數量在倉庫
 DocType: Landed Cost Voucher,Landed Cost Help,到岸成本幫助
 DocType: Purchase Invoice,Select Shipping Address,選擇送貨地址
 DocType: Leave Block List,Block Holidays on important days.,重要的日子中封鎖假期。
-,Accounts Receivable Summary,應收賬款匯總
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +185,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +71,Accounts Receivable Summary,應收賬款匯總
+DocType: Employee Loan,Monthly Repayment Amount,每月還款額
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +191,Please set User ID field in an Employee record to set Employee Role,請在員工記錄設定員工角色設置用戶ID字段
 DocType: UOM,UOM Name,計量單位名稱
 apps/erpnext/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py +43,Contribution Amount,貢獻金額
 DocType: Purchase 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 +195,Brand master.,品牌主檔。
+apps/erpnext/erpnext/config/stock.py +200,Brand master.,品牌主檔。
+apps/erpnext/erpnext/schools/utils.py +50,Student {0} - {1} appears Multiple times in row {2} & {3},學生{0}  -  {1}出現連續中多次{2}和{3}
+DocType: Program Enrollment Tool,Program Enrollments,計劃擴招
 DocType: Sales Invoice Item,Brand Name,商標名稱
 DocType: Purchase Receipt,Transporter Details,貨運公司細節
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Box,箱
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,默認倉庫需要選中的項目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,可能的供應商
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,本組織
 DocType: Budget,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 +110,Accounting Entry for {0} can only be made in currency: {1},會計分錄為{0}只能在貨幣進行：{1}
+DocType: Loan Type,Maximum Loan Amount,最高貸款額度
 DocType: Pricing Rule,Pricing Rule,定價規則
-apps/erpnext/erpnext/config/learn.py +202,Material Request to Purchase Order,材料要求採購訂單
-DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +78,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},學生{0}的重複卷號
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},學生{0}的重複卷號
+DocType: Budget,Action if Annual Budget Exceeded,如果行動年度預算超標
+apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求採購訂單
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +80,Row # {0}: Returned Item {1} does not exists in {2} {3},行＃{0}：返回的項目{1}不存在{2} {3}
 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 +294,Opening Stock Balance,期初存貨餘額
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +51,{0} must appear only once,{0}必須只出現一次
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +339,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
+,Lead Name,鉛名稱
+apps/erpnext/erpnext/config/stock.py +305,Opening Stock Balance,期初存貨餘額
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +58,{0} must appear only once,{0}必須只出現一次
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +367,Not allowed to tranfer more {0} than {1} against Purchase Order {2},不允許轉院更多{0}不是{1}對採購訂單{2}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +59,Leaves Allocated Successfully for {0},{0}的排假成功
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +40,No Items to pack,無項目包裝
 DocType: Shipping Rule Condition,From Value,從價值
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +545,Manufacturing Quantity is mandatory,生產數量是必填的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +554,Manufacturing Quantity is mandatory,生產數量是必填的
+DocType: Employee Loan,Repayment Method,還款方式
+DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果選中，主頁將是網站的默認項目組
 DocType: Quality Inspection Reading,Reading 4,4閱讀
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},默認BOM {0}未找到項目{1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,索賠費用由公司負責。
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",學生在系統的心臟，添加所有的學生
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}無法支票日期前{2}
 DocType: Company,Default Holiday List,預設假日表列
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +142,Stock Liabilities,現貨負債
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：從時間和結束時間{1}是具有重疊{2}
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +143,Stock Liabilities,現貨負債
 DocType: Purchase Invoice,Supplier Warehouse,供應商倉庫
 DocType: Opportunity,Contact Mobile No,聯絡手機號碼
 ,Material Requests for which Supplier Quotations are not created,尚未建立供應商報價的材料需求
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +130,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
+DocType: Student Group,Set 0 for no limit,為不限制設為0
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,這一天（S）對你所申請休假的假期。你不需要申請許可。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新發送付款電子郵件
-apps/erpnext/erpnext/config/selling.py +206,Other Reports,其他報告
+apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任務
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,請報價
+apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他報告
 DocType: Dependent Task,Dependent Task,相關任務
-apps/erpnext/erpnext/stock/doctype/item/item.py +411,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 +190,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},預設計量單位的轉換因子必須是1在行{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},請假類型{0}不能長於{1}
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,嘗試提前X天規劃作業。
-DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},請公司設定默認應付職工薪酬帳戶{0}
 DocType: SMS Center,Receiver List,收受方列表
-apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +97,Net Change in Cash,現金淨變動
-apps/erpnext/erpnext/stock/doctype/item/item.py +406,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
-apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +22,Payment Request already exists {0},付款申請已經存在{0}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,搜索項目
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,現金淨變動
+DocType: Assessment Plan,Grading Scale,分級量表
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,計量單位{0}已經進入不止一次在轉換係數表
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,已經完成
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申請已經存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,發布項目成本
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +241,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},數量必須不超過{0}
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +117,Previous Financial Year is not closed,上一財政年度未關閉
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +44,Age (Days),時間（天）
 DocType: Quotation Item,Quotation Item,產品報價
 DocType: Account,Account Name,帳戶名稱
@@ -1209,89 +1505,113 @@
 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 +43,Supplier Type master.,供應商類型高手。
 DocType: Purchase Order Item,Supplier Part Number,供應商零件編號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Conversion rate cannot be 0 or 1,轉化率不能為0或1
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +100,Conversion rate cannot be 0 or 1,轉化率不能為0或1
 DocType: Sales Invoice,Reference Document,參考文獻
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +185,{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 +221,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +229,Purchase Receipt {0} is not submitted,採購入庫單{0}未提交
 DocType: Company,Default Payable Account,預設應付賬款
 apps/erpnext/erpnext/config/website.py +17,"Settings for online shopping cart such as shipping rules, price list etc.",設定線上購物車，如航運規則，價格表等
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +83,{0}% Billed,{0}％已開立帳單
+apps/erpnext/erpnext/controllers/website_list_for_contact.py +86,{0}% Billed,{0}％已開立帳單
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +18,Reserved Qty,保留數量
 DocType: Party Account,Party Account,黨的帳戶
-apps/erpnext/erpnext/config/setup.py +116,Human Resources,人力資源
-DocType: Lead,Upper Income,高收入
+apps/erpnext/erpnext/config/setup.py +122,Human Resources,人力資源
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +13,Reject,拒絕
 DocType: Journal Entry Account,Debit in Company Currency,借記卡在公司貨幣
 DocType: BOM Item,BOM Item,BOM項目
 DocType: Appraisal,For Employee,對於員工
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +111,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,請輸入支付
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：提前對供應商必須扣除
 DocType: Company,Default Values,默認值
 DocType: Expense Claim,Total Amount Reimbursed,報銷金額合計
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +80,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,這是基於對本車輛的日誌。詳情請參閱以下時間表
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,蒐集
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},對供應商發票{0}日期{1}
 DocType: Customer,Default Price List,預設價格表
-DocType: Payment Reconciliation,Payments,付款
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,資產運動記錄{0}創建
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能刪除會計年度{0}。會計年度{0}設置為默認的全局設置
 DocType: Journal Entry,Entry Type,條目類型
 ,Customer Credit Balance,客戶信用平衡
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Payable,應付賬款淨額變化
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +23,Net Change in Accounts Payable,應付賬款淨額變化
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +42,Customer required for 'Customerwise Discount',需要' Customerwise折扣“客戶
 apps/erpnext/erpnext/config/accounts.py +142,Update bank payment dates with journals.,更新與日記帳之銀行付款日期。
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +21,Pricing,價錢
 DocType: Quotation,Term Details,長期詳情
+DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
+DocType: Project,Total Sales Cost (via Sales Order),總銷售成本（通過銷售訂單）
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +30,Cannot enroll more than {0} students for this student group.,不能註冊超過{0}學生該學生群體更多。
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +17,Lead Count,鉛計數
+apps/erpnext/erpnext/accounts/doctype/asset_category/asset_category.py +15,{0} must be greater than 0,{0}必須大於0
 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.,沒有一個項目無論在數量或價值的任何變化。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +32,Warranty Claim,保修索賠
+apps/erpnext/erpnext/buying/doctype/supplier/supplier_dashboard.py +10,Procurement,採購
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,沒有一個項目無論在數量或價值的任何變化。
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,強制性領域 - 計劃
+apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,強制性領域 - 計劃
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保修索賠
 ,Lead Details,潛在客戶詳情
+DocType: Salary Slip,Loan repayment,償還借款
 DocType: Purchase Invoice,End date of current invoice's period,當前發票的期限的最後一天
 DocType: Pricing Rule,Applicable For,適用
-DocType: Bank Reconciliation,From Date,從日期
+DocType: Accounts Settings,Unlink Payment on Cancellation of Invoice,取消鏈接在發票上的取消付款
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +16,Current Odometer reading entered should be greater than initial Vehicle Odometer {0},進入當前的里程表讀數應該比最初的車輛里程表更大的{0}
 DocType: Shipping Rule Country,Shipping Rule Country,航運規則國家
-DocType: Maintenance Visit,Partially Completed,部分完成
-DocType: Leave Type,Include holidays within leaves as leaves,葉葉子中包括節假日
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +10,Leave and Attendance,離開和考勤
+DocType: Leave Type,Include holidays within leaves as leaves,休假中包含節日做休假
 DocType: Sales Invoice,Packed Items,盒裝項目
 apps/erpnext/erpnext/config/support.py +27,Warranty Claim against Serial No.,針對序列號保修索賠
 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",在它使用的所有其他材料明細表替換特定的BOM。它將取代舊的BOM鏈接，更新成本和再生“BOM展開項目”表按照新的BOM
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +59,'Total',&#39;總&#39;
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +62,'Total','總數'
 DocType: Shopping Cart Settings,Enable Shopping Cart,啟用購物車
-DocType: Employee,Permanent Address,永久地址
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +233,"Advance paid against {0} {1} cannot be greater \
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推動打擊{0} {1}不能大於付出\超過總計{2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,請選擇商品代碼
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,請選擇商品代碼
+DocType: Student Sibling,Studying in Same Institute,就讀於同一研究所
 DocType: Territory,Territory Manager,區域經理
 DocType: Packed Item,To Warehouse (Optional),倉庫（可選）
 DocType: Payment Entry,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 +97,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/stock/doctype/stock_reconciliation/stock_reconciliation.py +98,Please specify either Quantity or Valuation Rate or both,請註明無論是數量或估價率或兩者
+apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的購物車
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市場推廣開支
 ,Item Shortage Report,商品短缺報告
-apps/erpnext/erpnext/stock/doctype/item/item.js +232,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，請同時註明“重量計量單位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,做此存貨分錄所需之物料需求
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下來折舊日期是強制性的新資產
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
+DocType: Student Group Creation Tool,Separate course based Group for every Batch,為每個批次分離基於課程的組
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,該產品的一個單元。
+DocType: Fee Category,Fee Category,收費類別
+,Student Fee Collection,學生費徵收
 DocType: Accounts Settings,Make Accounting Entry For Every Stock Movement,為每股份轉移做會計分錄
 DocType: Leave Allocation,Total Leaves Allocated,已安排的休假總計
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +154,Warehouse required at Row No {0},在第{0}行需要倉庫
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +155,Warehouse required at Row No {0},在第{0}行需要倉庫
 apps/erpnext/erpnext/public/js/setup_wizard.js +78,Please enter valid Financial Year Start and End Dates,請輸入有效的財政年度開始和結束日期
 DocType: Employee,Date Of Retirement,退休日
 DocType: Upload Attendance,Get Template,獲取模板
-DocType: Address,Postal,郵政
-apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +198,ERPNext Setup Complete!,ERPNext設定完成！
-DocType: Item,Weightage,權重
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +93,A Customer Group exists with same name please change the Customer name or rename the Customer Group,客戶群組存在相同名稱，請更改客戶名稱或重新命名客戶群組
+DocType: Vehicle,Doors,門
+apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +204,ERPNext Setup Complete!,ERPNext設定完成！
+DocType: Course Assessment Criteria,Weightage,權重
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的損益“賬戶成本中心{2}。請設置為公司默認的成本中心。
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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,收料
 DocType: Homepage,Products,產品
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +48,Party Type and Party is required for Receivable / Payable account {0},黨的類型和黨的需要應收/應付帳戶{0}
+DocType: Announcement,Instructor,講師
 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 +223,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +110,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +254,Quantity required for Item {0} in row {1},列{1}項目{0}必須有數量
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +114,Warehouse {0} can not be deleted as quantity exists for Item {1},倉庫{0} 不能被刪除因為項目{1}還有庫存
 DocType: Quotation,Order Type,訂單類型
 DocType: Purchase Invoice,Notification Email Address,通知電子郵件地址
 ,Item-wise Sales Register,項目明智的銷售登記
+DocType: Asset,Gross Purchase Amount,總購買金額
+DocType: Asset,Depreciation Method,折舊方法
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,離線
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,包括在基本速率此稅？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,總目標
 DocType: Job Applicant,Applicant for a Job,申請人作業
@@ -1301,58 +1621,75 @@
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,過多的列數。請導出報表，並使用試算表程式進行列印。
 DocType: Purchase Invoice Item,Batch No,批號
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允許多個銷售訂單對客戶的採購訂單
-apps/erpnext/erpnext/setup/doctype/company/company.py +164,Main,主頁
-apps/erpnext/erpnext/stock/doctype/item/item.js +56,Variant,變種
+DocType: Student Group Instructor,Student Group Instructor,學生組教練
+DocType: Student Group Instructor,Student Group Instructor,學生組教練
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2手機號碼
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,主頁
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,變種
 DocType: Naming Series,Set prefix for numbering series on your transactions,為你的交易編號序列設置的前綴
 DocType: Employee Attendance Tool,Employees HTML,員工HTML
-apps/erpnext/erpnext/stock/doctype/item/item.py +425,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,預設BOM（{0}）必須是活動的這個項目或者其模板
 DocType: Employee,Leave Encashed?,離開兌現？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,機會從字段是強制性的
 DocType: Item,Variants,變種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +858,Make Purchase Order,製作採購訂單
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,製作採購訂單
 DocType: SMS Center,Send To,發送到
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
-DocType: Payment Reconciliation Payment,Allocated amount,分配量
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},沒有足夠的餘額休假請假類型{0}
 DocType: 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 +172,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,提交之前，需要填入在製品倉庫
 apps/erpnext/erpnext/config/hr.py +40,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/hooks.py +88,Addresses,地址
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +212,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
+DocType: Item,Serial Nos and Batches,序列號和批號
+DocType: Item,Serial Nos and Batches,序列號和批號
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,學生群體力量
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,對日記條目{0}沒有任何無與倫比{1}進入
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估價
 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/stock/report/stock_balance/stock_balance.py +151,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,請輸入
+apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill為項目{0} {1}超過{2}。要允許對帳單，請在購買設置中設置
+apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,根據項目或倉庫請設置過濾器
 DocType: Packing Slip,The net weight of this package. (calculated automatically as sum of net weight of items),淨重這個包。 （當項目的淨重量總和自動計算）
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +82,Please create an Account for this Warehouse and link it. This cannot be done automatically as an account with name {0} already exists,請創建此倉庫的帳戶，並將其鏈接。這不能與名稱的帳戶自動完成{0}已存在
 DocType: Sales Order,To Deliver and Bill,準備交貨及開立發票
+DocType: Student Group,Instructors,教師
 DocType: GL Entry,Credit Amount in Account Currency,在賬戶幣金額
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +442,BOM {0} must be submitted,BOM {0}必須提交
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM {0}必須提交
 DocType: Authorization Control,Authorization Control,授權控制
-apps/erpnext/erpnext/controllers/buying_controller.py +300,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +731,Payment,付款
+apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒絕倉庫是強制性的反對否決項{1}
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,管理您的訂單
 DocType: Production Order Operation,Actual Time and Cost,實際時間和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},針對銷售訂單{2}的項目{1}，最多可以有 {0} 被完成。
 DocType: Employee,Salutation,招呼
-DocType: Pricing Rule,Brand,品牌
+DocType: Course,Course Abbreviation,當然縮寫
+DocType: Student Leave Application,Student Leave Application,學生請假申請
 DocType: Item,Will also apply for variants,同時將申請變種
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",資產不能被取消，因為它已經是{0}
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},員工{0}上半天{1}
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},總的工作時間不應超過最高工時更大{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,開啟
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在銷售時捆綁項目。
 DocType: Quotation Item,Actual Qty,實際數量
 DocType: Sales Invoice Item,References,參考
 DocType: Quality Inspection Reading,Reading 10,閱讀10
-apps/erpnext/erpnext/public/js/setup_wizard.js +284,"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.",列出您售出或購買的產品或服務，並請確認品項群駔、單位與其它屬性。
+apps/erpnext/erpnext/public/js/setup_wizard.js +289,"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/setup/setup_wizard/install_fixtures.py +85,Associate,關聯
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +91,Associate,關聯
+DocType: Asset Movement,Asset Movement,資產運動
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,新的車
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,項{0}不是一個序列化的項目
 DocType: SMS Center,Create Receiver List,創建接收器列表
+DocType: Vehicle,Wheels,車輪
 DocType: Packing Slip,To Package No.,以包號
-DocType: Production Planning Tool,Material Requests,材料要求
 DocType: Warranty Claim,Issue Date,發行日期
 DocType: Activity Cost,Activity Cost,項目成本
+DocType: Sales Invoice Timesheet,Timesheet Detail,詳細時間表
 DocType: Purchase Receipt Item Supplied,Consumed Qty,消耗的數量
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +52,Telecommunications,電信
 DocType: Packing Slip,Indicates that the package is a part of this delivery (Only Draft),表示該包是這個交付的一部分（僅草案）
@@ -1361,418 +1698,526 @@
 ,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/payment_entry/payment_entry.js +134,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +142,Can refer row only if the charge type is 'On Previous Row Amount' or 'Previous Row Total',可以參考的行只有在充電類型是“在上一行量'或'前行總計”
 DocType: Sales Order Item,Delivery Warehouse,交貨倉庫
-DocType: Stock Settings,Allowance Percent,津貼百分比
 DocType: SMS Settings,Message Parameter,訊息參數
-apps/erpnext/erpnext/config/accounts.py +205,Tree of financial Cost Centers.,財務成本中心的樹。
+apps/erpnext/erpnext/config/accounts.py +210,Tree of financial Cost Centers.,財務成本中心的樹。
 DocType: Serial No,Delivery Document No,交貨證明文件號碼
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +184,Please set 'Gain/Loss Account on Asset Disposal' in Company {0},請公司制定“關於資產處置收益/損失帳戶”{0}
 DocType: Landed Cost Voucher,Get Items From Purchase Receipts,從採購入庫單取得項目
 DocType: Serial No,Creation Date,創建日期
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +33,Item {0} appears multiple times in Price List {1},項{0}中多次出現價格表{1}
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +37,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +40,"Selling must be checked, if Applicable For is selected as {0}",銷售必須進行檢查，如果適用於被選擇為{0}
 DocType: Production Plan Material Request,Material Request Date,材料申請日期
 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,禁止建立生產訂單的時間日誌。不得對生產訂單追踪作業
+DocType: Student,Student Mobile Number,學生手機號碼
 DocType: Item,Has Variants,有變種
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},您已經選擇從項目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,每月分配的名稱
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批號是必需的
 DocType: Sales Person,Parent Sales Person,母公司銷售人員
-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/learn.py +268,Managing Projects,項目管理
+apps/erpnext/erpnext/config/learn.py +263,Managing Projects,項目管理
 DocType: Supplier,Supplier of Goods or Services.,供應商的商品或服務。
 DocType: Budget,Fiscal Year,財政年度
+DocType: Vehicle Log,Fuel Price,燃油價格
 DocType: Budget,Budget,預算
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +44,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定資產項目必須是一個非庫存項目。
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",財政預算案不能對{0}指定的，因為它不是一個收入或支出帳戶
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已實現
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +65,Territory / Customer,區域/客戶
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,e.g. 5,例如5
+DocType: Student Admission,Application Form Route,申請表路線
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,區域/客戶
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假類型{0}，因為它是停薪留職無法分配
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必須小於或等於發票餘額{2}
 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 +292,A Product or Service,產品或服務
+apps/erpnext/erpnext/public/js/setup_wizard.js +297,A Product or Service,產品或服務
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +30,The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,這個詞開始日期不能超過哪個術語鏈接學年的開學日期較早（學年{}）。請更正日期，然後再試一次。
+DocType: Guardian,Guardian Interests,守護興趣
 DocType: Naming Series,Current Value,當前值
+apps/erpnext/erpnext/controllers/accounts_controller.py +252,Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year,多個會計年度的日期{0}存在。請設置公司財年
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +233,{0} created,{0}已新增
 DocType: Delivery Note Item,Against Sales Order,對銷售訂單
 ,Serial No Status,序列號狀態
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +458,Item table can not be blank,項目表不能為空
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+DocType: Payment Entry Reference,Outstanding,優秀
+,Daily Timesheet Summary,每日時間表摘要
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：設置{1}的週期性，從和到日期\
 之間差必須大於或等於{2}"
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,這是基於庫存移動。見{0}詳情
 DocType: Pricing Rule,Selling,銷售
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},金額{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪資資訊
 DocType: Sales Person,Name and Employee ID,姓名和僱員ID
-apps/erpnext/erpnext/accounts/party.py +296,Due Date cannot be before Posting Date,到期日不能在寄發日期之前
+apps/erpnext/erpnext/accounts/party.py +289,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 +147,Duties and Taxes,關稅和稅款
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +326,Please enter Reference date,參考日期請輸入
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +148,Duties and Taxes,關稅和稅款
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,參考日期請輸入
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +44,{0} payment entries can not be filtered by {1},{0}付款分錄不能由{1}過濾
 DocType: Item Website Specification,Table for Item that will be shown in Web Site,表項，將在網站顯示出來
 DocType: Purchase Order Item Supplied,Supplied Qty,附送數量
 DocType: Purchase Order Item,Material Request Item,物料需求項目
 apps/erpnext/erpnext/config/selling.py +75,Tree of Item Groups.,項目群組樹。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +144,Cannot refer row number greater than or equal to current row number for this Charge type,不能引用的行號大於或等於當前行號碼提供給充電式
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,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 +159,Red,紅
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +228,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},請點擊“生成表”來獲取序列號增加了對項目{0}
 DocType: Account,Frozen,凍結的
 ,Open Production Orders,開放狀態的生產訂單
+DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金額（公司幣種）
 DocType: Installation Note,Installation Time,安裝時間
 DocType: Sales Invoice,Accounting Details,會計細節
-apps/erpnext/erpnext/setup/doctype/company/company.js +66,Delete all the Transactions for this Company,刪除所有交易本公司
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +187,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/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投資
 DocType: Issue,Resolution Details,詳細解析
-apps/erpnext/erpnext/hr/doctype/leave_type/leave_type.js +3,Allocations,分配
-DocType: Quality Inspection Reading,Acceptance Criteria,驗收標準
+DocType: Item Quality Inspection Parameter,Acceptance Criteria,驗收標準
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +163,Please enter Material Requests in the above table,請輸入在上表請求材料
 DocType: Item Attribute,Attribute Name,屬性名稱
-DocType: Item Group,Show In Website,顯示在網站
-apps/erpnext/erpnext/public/js/setup_wizard.js +293,Group,組
+DocType: BOM,Show In Website,顯示在網站
+DocType: Shopping Cart Settings,Show Quantity in Website,顯示在網站數量
+DocType: Employee Loan Application,Total Payable Amount,合計應付額
 DocType: Task,Expected Time (in hours),預期時間（以小時計）
+DocType: Item Reorder,Check in (group),檢查（組）
 ,Qty to Order,訂購數量
+DocType: Period Closing Voucher,"The account head under Liability or Equity, in which Profit/Loss will be booked",負債或權益下的帳戶頭，其中利潤/虧損將被黃牌警告
 apps/erpnext/erpnext/config/projects.py +25,Gantt chart of all tasks.,所有任務的甘特圖。
+DocType: Opportunity,Mins to First Response,分鐘為第一個反應
+DocType: Pricing Rule,Margin Type,保證金類型
+apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +15,{0} hours,{0}小時
+DocType: Course,Default Grading Scale,默認等級規模
 DocType: Appraisal,For Employee Name,對於員工姓名
-DocType: Holiday List,Clear Table,清除表格
 DocType: C-Form Invoice Detail,Invoice No,發票號碼
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +96,"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,成本率
+DocType: Room,Room Name,房間名稱
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +100,"Leave cannot be applied/cancelled before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",離開不能應用/前{0}取消，因為假平衡已經被搬入轉發在未來休假分配記錄{1}
 ,Customer Addresses And Contacts,客戶的地址和聯絡方式
+,Campaign Efficiency,運動效率
+,Campaign Efficiency,運動效率
+DocType: Discussion,Discussion,討論
+DocType: Payment Entry,Transaction ID,事務ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定價規則進一步過濾基於數量。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},請為員工{0}設置加入日期
+DocType: Task,Total Billing Amount (via Time Sheet),總開票金額（通過時間表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重複客戶收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +50,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Pair,對
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} ({1}) 必須有“支出審批”權限
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,對
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,選擇BOM和數量生產
+DocType: Asset,Depreciation Schedule,折舊計劃
 DocType: Bank Reconciliation Detail,Against Account,針對帳戶
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天時間應該是從之間的日期和終止日期
 DocType: Maintenance Schedule Detail,Actual Date,實際日期
 DocType: Item,Has Batch No,有批號
+apps/erpnext/erpnext/public/js/utils.js +90,Annual Billing: {0},年度結算：{0}
 DocType: Delivery Note,Excise Page Number,消費頁碼
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +138,"Company, From Date and To Date is mandatory",公司，從日期和結束日期是必須
+DocType: Asset,Purchase Date,購買日期
 DocType: Employee,Personal Details,個人資料
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},請設置在公司的資產折舊成本中心“{0}
 ,Maintenance Schedules,保養時間表
+DocType: Task,Actual End Date (via Time Sheet),實際結束日期（通過時間表）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},量{0} {1}對{2} {3}
 ,Quotation Trends,報價趨勢
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +138,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +295,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},項目{0}之項目主檔未提及之項目群組
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,借方帳戶必須是應收帳款帳戶
 DocType: Shipping Rule Condition,Shipping Amount,航運量
-,Pending Amount,待審核金額
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待審核金額
 DocType: Purchase Invoice Item,Conversion Factor,轉換因子
 DocType: Purchase Order,Delivered,交付
+,Vehicle Expenses,車輛費用
+DocType: Serial No,Invoice Details,發票明細
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},使用壽命後預期值必須大於或等於{0}
 DocType: Purchase Receipt,Vehicle Number,車號
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,在其經常性發票將被停止日期
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +90,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
+DocType: Employee Loan,Loan Amount,貸款額度
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +391,Row {0}: Bill of Materials not found for the Item {1},行{0}：材料清單未找到項目{1}
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +98,Total allocated leaves {0} cannot be less than already approved leaves {1} for the period,共分配葉{0}不能小於已經批准葉{1}期間
 DocType: Journal Entry,Accounts Receivable,應收帳款
 ,Supplier-Wise Sales Analytics,供應商相關的銷售分析
-DocType: Address Template,This format is used if country specific format is not found,此格式用於如果找不到特定國家的格式
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Enter Paid Amount,輸入支付的金額
+DocType: Salary Structure,Select employees for current Salary Structure,當前薪酬結構中選擇員工
 DocType: Production Order,Use Multi-Level BOM,採用多級物料清單
 DocType: Bank Reconciliation,Include Reconciled Entries,包括對賬項目
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
+DocType: Course,"Parent Course (Leave blank, if this isn't part of Parent Course)",家長課程（如果不是家長課程的一部分，請留空）
 DocType: Leave Control Panel,Leave blank if considered for all employee types,保持空白如果考慮到所有的員工類型
 DocType: Landed Cost Voucher,Distribute Charges Based On,分銷費基於
+apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,時間表
 DocType: HR Settings,HR Settings,人力資源設置
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
+DocType: Salary Slip,net pay info,淨工資信息
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,使項目所需的質量保證和質量保證在沒有採購入庫單
+DocType: Email Digest,New Expenses,新的費用
 DocType: Purchase Invoice,Additional Discount Amount,額外的折扣金額
+apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：訂購數量必須是1，因為項目是固定資產。請使用單獨的行多數量。
 DocType: Leave Block List Allow,Leave Block List Allow,休假區塊清單准許
-apps/erpnext/erpnext/setup/doctype/company/company.py +249,Abbr can not be blank or space,縮寫不能為空或空間
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,縮寫不能為空或空間
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,集團以非組
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,體育
+DocType: Loan Type,Loan Name,貸款名稱
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Actual,實際總計
-apps/erpnext/erpnext/public/js/setup_wizard.js +298,Unit,單位
-apps/erpnext/erpnext/stock/get_item_details.py +123,Please specify Company,請註明公司
+DocType: Student Siblings,Student Siblings,學生兄弟姐妹
+apps/erpnext/erpnext/public/js/setup_wizard.js +303,Unit,單位
+apps/erpnext/erpnext/stock/get_item_details.py +131,Please specify Company,請註明公司
 ,Customer Acquisition and Loyalty,客戶取得和忠誠度
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,你維護退貨庫存的倉庫
+DocType: Production Order,Skip Material Transfer,跳過材料轉移
+DocType: Production Order,Skip Material Transfer,跳過材料轉移
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,無法為關鍵日期{2}查找{0}到{1}的匯率。請手動創建貨幣兌換記錄
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,您的財政年度結束於
 DocType: POS Profile,Price List,價格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,{0}是現在預設的會計年度。請重新載入您的瀏覽器，以使更改生效。
-apps/erpnext/erpnext/projects/doctype/task/task.js +26,Expense Claims,報銷
-DocType: Issue,Support,支持
-,BOM Search,BOM搜索
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +183,Closing (Opening + Totals),截止（開標+總計）
-apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +26,Please specify currency in Company,請公司指定的貨幣
+apps/erpnext/erpnext/projects/doctype/task/task.js +37,Expense Claims,報銷
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +189,Closing (Opening + Totals),截止（開標+總計）
+DocType: Vehicle,Fuel Type,燃料類型
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +27,Please specify currency in Company,請公司指定的貨幣
 DocType: Workstation,Wages per hour,時薪
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +50,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +47,Stock balance in Batch {0} will become negative {1} for Item {2} at Warehouse {3},在批量庫存餘額{0}將成為負{1}的在倉庫項目{2} {3}
 apps/erpnext/erpnext/templates/emails/reorder_item.html +1,Following Material Requests have been raised automatically based on Item's re-order level,下列資料的要求已自動根據項目的重新排序水平的提高
-apps/erpnext/erpnext/controllers/accounts_controller.py +272,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},計量單位換算係數是必需的行{0}
-DocType: Production Plan Item,material_request_item,material_request_item
-DocType: Salary Slip,Deduction,扣除
-apps/erpnext/erpnext/stock/get_item_details.py +262,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
-DocType: Address Template,Address Template,地址模板
-apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +7,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
+DocType: Email Digest,Pending Sales Orders,待完成銷售訂單
+apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},帳戶{0}是無效的。帳戶貨幣必須是{1}
+apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},計量單位換算係數是必需的行{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：參考文件類型必須是銷售訂單之一，銷售發票或日記帳分錄
+DocType: Salary Component,Deduction,扣除
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：從時間和時間是強制性的。
+DocType: Stock Reconciliation Item,Amount Difference,金額差異
+apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},加入項目價格為{0}價格表{1}
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,請輸入這個銷售人員的員工標識
 DocType: Territory,Classification of Customers by region,客戶按區域分類
-DocType: Project,% Tasks Completed,％ 任務已完成
-DocType: Project,Gross Margin,毛利
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +194,Please enter Production Item first,請先輸入生產項目
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必須是零
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,請先輸入生產項目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,計算的銀行對賬單餘額
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,禁用的用戶
-apps/erpnext/erpnext/crm/doctype/lead/lead.js +32,Quotation,報價
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,報價
 DocType: Salary Slip,Total Deduction,扣除總額
-DocType: Maintenance Visit,Maintenance User,維護用戶
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +149,Cost Updated,成本更新
-DocType: Employee,Date of Birth,出生日期
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +86,Item {0} has already been returned,項{0}已被退回
+,Production Analytics,生產Analytics（分析）
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +208,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},警告：附件無效的SSL證書{0}
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",信息幫助你的業務，你所有的聯繫人和更添加為您的線索
 DocType: Production Order Operation,Actual Operation Time,實際操作時間
 DocType: Authorization Rule,Applicable To (User),適用於（用戶）
 DocType: Purchase Taxes and Charges,Deduct,扣除
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +177,Job Description,職位描述
-DocType: Purchase Order Item,Qty as per Stock UOM,數量按庫存計量單位
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +126,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +188,Job Description,職位描述
+DocType: Student Applicant,Applied,應用的
+DocType: Sales Invoice Item,Qty as per Stock UOM,數量按庫存計量單位
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +57,Guardian2 Name,Guardian2名稱
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +131,"Special Characters except ""-"", ""#"", ""."" and ""/"" not allowed in naming series",特殊字符除了“ - ”，“”，“＃”，和“/”未命名序列允許
 DocType: Campaign,"Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment.",追蹤銷售計劃。追踪訊息，報價，銷售訂單等，從競賽來衡量投資報酬。
 DocType: Expense Claim,Approver,審批人
 ,SO Qty,SO數量
 DocType: Appraisal,Calculate Total Score,計算總分
 DocType: Request for Quotation,Manufacturing Manager,生產經理
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列號{0}在保修期內直到{1}
-apps/erpnext/erpnext/config/stock.py +153,Split Delivery Note into packages.,拆分送貨單成數個包裝。
-apps/erpnext/erpnext/hooks.py +74,Shipments,發貨
+apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,拆分送貨單成數個包裝。
+apps/erpnext/erpnext/hooks.py +87,Shipments,發貨
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,倉庫{3}的{1}和庫存值（{2}）的帳戶餘額（{0}）必須相同
+apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,倉庫{3}的{1}和庫存值（{2}）的帳戶餘額（{0}）必須相同
+DocType: Payment Entry,Total Allocated Amount (Company Currency),總撥款額（公司幣種）
 DocType: Purchase Order Item,To be delivered to customer,要傳送給客戶
+DocType: BOM,Scrap Material Cost,廢料成本
 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 +153,Row # ,行＃
 DocType: Purchase Invoice,In Words (Company Currency),大寫（Company Currency）
 DocType: Asset,Supplier,供應商
-apps/erpnext/erpnext/public/js/utils.js +156,Get From,得到
-DocType: C-Form,Quarter,季
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +104,Miscellaneous Expenses,雜項開支
 DocType: Global Defaults,Default Company,預設公司
-apps/erpnext/erpnext/controllers/stock_controller.py +167,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
-apps/erpnext/erpnext/controllers/accounts_controller.py +416,"Cannot overbill for Item {0} in row {1} more than {2}. To allow overbilling, please set in Stock Settings",無法行overbill的項目{0} {1}超過{2}。要允許超額計費，請在「股票設定」設定
+apps/erpnext/erpnext/controllers/stock_controller.py +229,Expense or Difference account is mandatory for Item {0} as it impacts overall stock value,對項目{0}而言， 費用或差異帳戶是強制必填的，因為它影響整個庫存總值。
 DocType: Cheque Print Template,Bank Name,銀行名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py +27,-Above,-以上
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} is disabled,用戶{0}被禁用
+DocType: Employee Loan,Employee Loan Account,員工貸款賬戶
 DocType: Leave Application,Total Leave Days,總休假天數
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：電子郵件將不會被發送到被禁用的用戶
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +98,Select Company...,選擇公司...
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次數
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,選擇公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,保持空白如果考慮到全部部門
-apps/erpnext/erpnext/config/hr.py +171,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +346,{0} is mandatory for Item {1},{0}是強制性的項目{1}
+apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就業（永久，合同，實習生等）的類型。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}是強制性的項目{1}
 DocType: Currency Exchange,From Currency,從貨幣
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",請ATLEAST一行選擇分配金額，發票類型和發票號碼
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +125,Cost of New Purchase,新的採購成本
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +94,Sales Order required for Item {0},所需的{0}項目銷售訂單
 DocType: Purchase Invoice Item,Rate (Company Currency),率（公司貨幣）
-apps/erpnext/erpnext/demo/setup_data.py +360,Others,他人
-apps/erpnext/erpnext/templates/includes/product_page.js +65,Cannot find a matching Item. Please select some other value for {0}.,無法找到匹配的項目。請選擇其他值{0}。
+DocType: Payment Entry,Unallocated Amount,未分配金額
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/payment_entry/payment_entry.js +138,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
+apps/erpnext/erpnext/hr/page/team_updates/team_updates.js +44,No more updates,沒有更多的更新
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,不能選擇充電式為'在上一行量'或'在上一行總'的第一行
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子項不應該是一個產品包。請刪除項目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,銀行業
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,添加時間表
+DocType: Vehicle Service,Service Item,服務項目
+DocType: Bank Guarantee,Bank Guarantee,銀行擔保
+DocType: Bank Guarantee,Bank Guarantee,銀行擔保
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +39,Please click on 'Generate Schedule' to get schedule,請在“產生排程”點擊以得到排程表
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +56,There were errors while deleting following schedules:,有錯誤，同時刪除以下時間表：
 DocType: Bin,Ordered Quantity,訂購數量
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",例如「建設建設者工具“
-DocType: Quality Inspection,In Process,在過程
+DocType: Grading Scale,Grading Scale Intervals,分級刻度間隔
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}會計分錄只能在貨幣言：{3}
+DocType: Production Order,In Process,在過程
 DocType: Authorization Rule,Itemwise Discount,Itemwise折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,財務賬目的樹。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +334,{0} against Sales Order {1},{0}針對銷售訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +364,{0} against Sales Order {1},{0}針對銷售訂單{1}
 DocType: Account,Fixed Asset,固定資產
-apps/erpnext/erpnext/config/stock.py +304,Serialized Inventory,序列化庫存
+apps/erpnext/erpnext/config/stock.py +315,Serialized Inventory,序列化庫存
+DocType: Employee Loan,Account Info,帳戶信息
 DocType: Activity Type,Default Billing Rate,默認計費率
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0}創建學生組。
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +71,{0} Student Groups created.,{0}創建學生組。
 DocType: Sales Invoice,Total Billing Amount,總結算金額
-apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +54,Receivable Account,應收賬款
+apps/erpnext/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py +17,There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.,必須有這個工作，啟用默認進入的電子郵件帳戶。請設置一個默認的傳入電子郵件帳戶（POP / IMAP），然後再試一次。
+apps/erpnext/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py +59,Receivable Account,應收賬款
+apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},行＃{0}：資產{1}已經是{2}
 DocType: Quotation Item,Stock Balance,庫存餘額
-apps/erpnext/erpnext/config/selling.py +302,Sales Order to Payment,銷售訂單到付款
+apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,銷售訂單到付款
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,請通過設置&gt;設置&gt;命名系列為{0}設置命名系列
 DocType: Expense Claim Detail,Expense Claim Detail,報銷詳情
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +808,Please select correct account,請選擇正確的帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,請選擇正確的帳戶
 DocType: Item,Weight UOM,重量計量單位
-DocType: Employee,Blood Group,血型
-DocType: Purchase Invoice Item,Page Break,分頁符
+DocType: Salary Structure Employee,Salary Structure Employee,薪資結構員工
 DocType: Production Order Operation,Pending,擱置
+DocType: Course,Course Name,課程名
 DocType: Employee Leave Approver,Users who can approve a specific employee's leave applications,用戶可以批准特定員工的休假申請
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +50,Office Equipments,辦公設備
 DocType: Purchase Invoice Item,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/setup/setup_wizard/install_fixtures.py +54,Full-time,全日制
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Full-time,全日制
+DocType: Salary Structure,Employees,僱員
 DocType: Employee,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: BOM Scrap Item,Basic Amount (Company Currency),基本金額（公司幣種）
+DocType: Student,Guardians,守護者
+DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,價格將不會顯示如果沒有設置價格
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,請指定一個國家的這種運輸規則或檢查全世界運輸
 DocType: Stock Entry,Total Incoming Value,總收入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +289,Debit To is required,借方是必填項
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,借方是必填項
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",時間表幫助追踪的時間，費用和結算由你的團隊做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,採購價格表
 DocType: Offer Letter Term,Offer Term,要約期限
 DocType: Quality Inspection,Quality Manager,質量經理
 DocType: Job Applicant,Job Opening,開放職位
 DocType: Payment Reconciliation,Payment Reconciliation,付款對帳
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,請選擇Incharge人的名字
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,請選擇Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技術
+apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},總未付：{0}
+DocType: BOM Website Operation,BOM Website Operation,BOM網站運營
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.js +13,Offer Letter,報價函
 apps/erpnext/erpnext/config/manufacturing.py +18,Generate Material Requests (MRP) and Production Orders.,產生物料需求（MRP）和生產訂單。
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +65,Total Invoiced Amt,總開票金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +68,Total Invoiced Amt,總開票金額
+DocType: BOM,Conversion Rate,兌換率
+apps/erpnext/erpnext/templates/pages/product_search.html +3,Product Search,產品搜索
 DocType: Timesheet Detail,To Time,要時間
 DocType: Authorization Rule,Approving Role (above authorized value),批准角色（上述授權值）
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +108,Credit To account must be a Payable account,信用帳戶必須是應付賬款
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +241,BOM recursion: {0} cannot be parent or child of {2},BOM遞歸： {0}不能父母或兒童{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +110,Credit To account must be a Payable account,信用帳戶必須是應付賬款
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +272,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 +121,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
-apps/erpnext/erpnext/stock/get_item_details.py +273,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +148,"For {0}, only debit accounts can be linked against another credit entry",{0}，只有借方帳戶可以連接另一個貸方分錄
+apps/erpnext/erpnext/stock/doctype/item_price/item_price.py +27,Price List {0} is disabled,價格表{0}被禁用
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +124,Row {0}: Completed Qty cannot be more than {1} for operation {2},行{0}：已完成的數量不能超過{1}操作{2}
 DocType: Manufacturing Settings,Allow Overtime,允許加班
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +146,"Serialized Item {0} cannot be updated using Stock Reconciliation, please use Stock Entry",序列化項目{0}無法使用庫存調節更新，請使用庫存條目
+DocType: Training Event Employee,Training Event Employee,培訓活動的員工
 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,客戶項目代碼
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +120,Exchange Gain/Loss,兌換收益/損失
 DocType: Opportunity,Lost Reason,失落的原因
-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 +378,All items have already been invoiced,所有項目已開具發票
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,請輸入收據憑證
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,進一步的成本中心可以根據組進行，但項可以對非組進行
-DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用戶和權限
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},生產訂單創建：{0}
 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: Guardian,Mobile Number,手機號碼
 DocType: Bin,Actual Quantity,實際數量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日發貨
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列號{0}未找到
-apps/erpnext/erpnext/public/js/setup_wizard.js +237,Your Customers,您的客戶
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列號{0}未找到
+DocType: Scheduling Tool,Student Batch,學生批
+apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客戶
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,使學生
+apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},您已被邀請在項目上進行合作：{0}
 DocType: Leave Block List Date,Block Date,封鎖日期
-apps/erpnext/erpnext/templates/generators/job_opening.html +19,Apply Now,現在申請
-DocType: Sales Order,Not Delivered,未交付
+apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,現在申請
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
+apps/erpnext/erpnext/stock/dashboard/item_dashboard_list.html +25,Actual Qty {0} / Waiting Qty {1},實際數量{0} /等待數量{1}
 ,Bank Clearance Summary,銀行結算摘要
-apps/erpnext/erpnext/config/setup.py +100,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
+apps/erpnext/erpnext/config/setup.py +106,"Create and manage daily, weekly and monthly email digests.",建立和管理每日，每週和每月的電子郵件摘要。
 DocType: Appraisal Goal,Appraisal Goal,考核目標
+DocType: Stock Reconciliation Item,Current Amount,電流量
+DocType: Fee Structure,Fee Structure,費用結構
 DocType: Timesheet Detail,Costing Amount,成本核算金額
+DocType: Student Admission,Application Fee,報名費
 DocType: Process Payroll,Submit Salary Slip,提交工資單
-apps/erpnext/erpnext/controllers/selling_controller.py +161,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
+apps/erpnext/erpnext/controllers/selling_controller.py +162,Maxiumm discount for Item {0} is {1}%,品項{0}的最大折扣：{1}％
 apps/erpnext/erpnext/stock/doctype/item_price/item_price.js +16,Import in Bulk,進口散裝
 DocType: Sales Partner,Address & Contacts,地址及聯絡方式
 DocType: SMS Log,Sender Name,發件人名稱
 DocType: POS Profile,[Select],[選擇]
 DocType: SMS Log,Sent To,發給
 DocType: Payment Request,Make Sales Invoice,做銷售發票
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,軟件
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下來跟日期不能過去
 DocType: Company,For Reference Only.,僅供參考。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,選擇批號
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,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,“起始日期”是必需的
 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 +113,No Item with Barcode {0},沒有條碼{0}的品項
+apps/erpnext/erpnext/stock/get_item_details.py +121,No Item with Barcode {0},沒有條碼{0}的品項
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,案號不能為0
 DocType: Item,Show a slideshow at the top of the page,顯示幻燈片在頁面頂部
-apps/erpnext/erpnext/stock/doctype/item/item.py +134,Stores,商店
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,物料清單
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,商店
 DocType: Serial No,Delivery Time,交貨時間
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,老齡化基於
 DocType: Item,End of Life,壽命結束
-apps/erpnext/erpnext/demo/setup_data.py +361,Travel,旅遊
+apps/erpnext/erpnext/demo/setup/setup_data.py +325,Travel,旅遊
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +177,No active or default Salary Structure found for employee {0} for the given dates,發現員工{0}對於給定的日期沒有活動或默認的薪酬結構
 DocType: Leave Block List,Allow Users,允許用戶
 DocType: Purchase Order,Customer Mobile No,客戶手機號碼
-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 +23,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,項目重新排序
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +748,Transfer Material,轉印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,顯示工資單
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,轉印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",指定作業、作業成本並給予該作業一個專屬的作業編號。
-apps/erpnext/erpnext/public/js/controllers/transaction.js +923,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,這份文件是超過限制，通過{0} {1}項{4}。你在做另一個{3}對同一{2}？
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,請設置保存後復發
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,選擇變化量賬戶
 DocType: Purchase Invoice,Price List Currency,價格表之貨幣
 DocType: Naming Series,User must always select,用戶必須始終選擇
 DocType: Stock Settings,Allow Negative Stock,允許負庫存
 DocType: Installation Note,Installation Note,安裝注意事項
-apps/erpnext/erpnext/public/js/setup_wizard.js +216,Add Taxes,添加稅賦
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Cash Flow from Financing,從融資現金流
+apps/erpnext/erpnext/public/js/setup_wizard.js +221,Add Taxes,添加稅賦
+DocType: Topic,Topic,話題
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +40,Cash Flow from Financing,從融資現金流
+DocType: Budget Account,Budget Account,預算科目
 DocType: Quality Inspection,Verified By,認證機構
-DocType: Address,Subsidiary,副
-apps/erpnext/erpnext/setup/doctype/company/company.py +64,"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/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",不能改變公司的預設貨幣，因為有存在的交易。交易必須取消更改預設貨幣。
+DocType: Grading Scale Interval,Grade Description,等級說明
+DocType: Stock Entry,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/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +135,Source of Funds (Liabilities),資金來源（負債）
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +352,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 +380,Quantity in row {0} ({1}) must be same as manufactured quantity {2},列{0}的數量（{1}）必須與生產量{2}相同
 DocType: Appraisal,Employee,僱員
-apps/erpnext/erpnext/utilities/doctype/contact/contact.js +71,Invite as User,邀請成為用戶
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,{0} {1} is fully billed,{0} {1}}已開票
-DocType: Workstation Working Hour,End Time,結束時間
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +244,{0} {1} is fully billed,{0} {1}}已開票
+DocType: Training Event,End Time,結束時間
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +62,Active Salary Structure {0} found for employee {1} for the given dates,主動薪酬結構找到{0}員工{1}對於給定的日期
+DocType: Payment Entry,Payment Deductions or Loss,付款扣除或損失
 apps/erpnext/erpnext/config/setup.py +42,Standard contract terms for Sales or Purchase.,銷售或採購的標準合同條款。
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +75,Group by Voucher,集團透過券
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +100,Group by Voucher,集團透過券
 apps/erpnext/erpnext/config/crm.py +6,Sales Pipeline,銷售渠道
-DocType: Sales Invoice,Mass Mailing,郵件群發
-DocType: Rename Tool,File to Rename,文件重命名
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +221,Please set default account in Salary Component {0},請薪酬部分設置默認帳戶{0}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +204,Please select BOM for Item in Row {0},請行選擇BOM為項目{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +199,Purchse Order number required for Item {0},項目{0}需要採購訂單號
-apps/erpnext/erpnext/controllers/buying_controller.py +262,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +199,Maintenance Schedule {0} must be cancelled before cancelling this Sales Order,維護時間表{0}必須取消早於取消這個銷售訂單
+apps/erpnext/erpnext/controllers/buying_controller.py +263,Specified BOM {0} does not exist for Item {1},指定BOM {0}的項目不存在{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +212,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 +111,Pharmaceutical,製藥
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +316,Salary Slip of employee {0} already created for this period,員工的工資單{0}已為這一時期創建
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +117,Pharmaceutical,製藥
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Cost of Purchased Items,購買的物品成本
 DocType: Selling Settings,Sales Order Required,銷售訂單需求
 DocType: Purchase Invoice,Credit To,信貸
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +31,Active Leads / Customers,有效訊息/客戶
-DocType: Employee Education,Post Graduate,研究生
 DocType: Maintenance Schedule Detail,Maintenance Schedule Detail,維護計劃細節
 DocType: Quality Inspection Reading,Reading 9,9閱讀
 DocType: Supplier,Is Frozen,就是冰凍
+apps/erpnext/erpnext/stock/utils.py +194,Group node warehouse is not allowed to select for transactions,組節點倉庫不允許選擇用於交易
 DocType: Buying Settings,Buying Settings,採購設定
 DocType: Stock Entry Detail,BOM No. for a Finished Good Item,BOM編號為成品產品
 DocType: Upload Attendance,Attendance To Date,出席會議日期
-DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帳號
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +814,Please specify Company to proceed,請註明公司以處理
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +21,Net Change in Accounts Receivable,應收賬款淨額變化
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +44,Compensatory Off,補假
-DocType: Quality Inspection Reading,Accepted,接受的
-apps/erpnext/erpnext/setup/doctype/company/company.js +46,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}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +161,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},"{0} ({1})不能大於計劃數量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,請註明公司以處理
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,應收賬款淨額變化
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,補假
+DocType: Offer Letter,Accepted,接受的
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +25,Organization,組織
+DocType: SG Creation Tool Course,Student Group Name,學生組名稱
+apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,請確保你真的要刪除這家公司的所有交易。主數據將保持原樣。這個動作不能撤消。
+DocType: Room,Room Number,房間號
+apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},無效的參考{0} {1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{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 +217,Raw Materials cannot be blank.,原材料不能為空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +413,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +460,Quick Journal Entry,快速日記帳分錄
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +111,You can not change rate if BOM mentioned agianst any item,你不能改變速度，如果BOM中提到反對的任何項目
+apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用戶論壇
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能為空。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",無法更新庫存，發票包含下降航運項目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,快速日記帳分錄
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,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 +209,Please enter Planned Qty for Item {0} at row {1},請輸入列{1}的品項{0}的計劃數量
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +214,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,需求的項目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,將對每個成品項目建立獨立的生產訂單。
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}必須返回文檔中負
+,Minutes to First Response for Issues,分鐘的問題第一個反應
 DocType: Purchase Invoice,Terms and Conditions1,條款及條件1
+apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,該機構的名稱要為其建立這個系統。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",會計分錄凍結至該日期，除以下指定職位權限外，他人無法修改。
 apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,請在產生維護計畫前儲存文件
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,項目狀態
 DocType: UOM,Check this to disallow fractions. (for Nos),勾選此選項則禁止分數。 （對於NOS）
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +398,The following Production Orders were created:,創建以下生產訂單：
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,創建以下生產訂單：
+DocType: Student Admission,Naming Series (for Student Applicant),命名系列（面向學生申請人）
 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 +56,Total Absent,共缺席
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +739,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
-apps/erpnext/erpnext/config/stock.py +184,Unit of Measure,計量單位
+DocType: BOM,Show Operations,顯示操作
+,Minutes to First Response for Opportunity,分鐘的機會第一個反應
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +785,Item or Warehouse for row {0} does not match Material Request,行{0}的項目或倉庫不符合物料需求
+apps/erpnext/erpnext/config/stock.py +189,Unit of Measure,計量單位
 DocType: Fiscal Year,Year End Date,年結結束日期
 DocType: Task Depends On,Task Depends On,任務取決於
-DocType: Lead,Opportunity,機會
+DocType: Supplier Quotation,Opportunity,機會
 ,Completed Production Orders,已完成生產訂單
 DocType: Operation,Default Workstation,預設工作站
 DocType: Notification Control,Expense Claim Approved Message,報銷批准的訊息
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +220,{0} {1} is closed,{0} {1}關閉
+DocType: Payment Entry,Deductions or Loss,扣除或損失
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +247,{0} {1} is closed,{0} {1}關閉
 DocType: Email Digest,How frequently?,多久？
 DocType: Purchase Receipt,Get Current Stock,取得當前庫存資料
 apps/erpnext/erpnext/config/manufacturing.py +46,Tree of Bill of Materials,物料清單樹狀圖
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +151,Mark Present,馬克現在
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +198,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
+DocType: Student,Joining Date,入職日期
+,Employees working on a holiday,員工在假期工作
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,馬克現在
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序號{0}的維護開始日期不能早於交貨日期
 DocType: Production Order,Actual End Date,實際結束日期
+DocType: BOM,Operating Cost (Company Currency),營業成本（公司貨幣）
 DocType: Authorization Rule,Applicable To (Role),適用於（角色）
-DocType: Stock Entry,Purpose,目的
+DocType: Company,Fixed Asset Depreciation Settings,固定資產折舊設置
 DocType: Item,Will also apply for variants unless overrridden,同時將申請變種，除非overrridden
 DocType: Purchase Invoice,Advances,進展
 DocType: Production Order,Manufacture against Material Request,對製造材料要求
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +32,Approving User cannot be same as user the rule is Applicable To,批准用戶作為用戶的規則適用於不能相同
 DocType: Stock Entry Detail,Basic Rate (as per Stock UOM),基本速率（按庫存計量單位）
 DocType: SMS Log,No of Requested SMS,無的請求短信
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,停薪留職不批准請假的記錄相匹配
 DocType: Campaign,Campaign-.####,運動 - ＃＃ ＃ ＃
-apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +117,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,請在提供最好的利率規定的項目
+DocType: Selling Settings,Auto close Opportunity after 15 days,15天之後自動關閉商機
+apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,結束年份
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,報價/鉛％
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +119,Contract End Date must be greater than Date of Joining,合同結束日期必須大於加入的日期
 DocType: Sales Partner,A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.,第三方分銷商/經銷商/代理商/分支機構/分銷商誰銷售公司產品的佣金。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +346,{0} against Purchase Order {1},{0}針對採購訂單{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +376,{0} against Purchase Order {1},{0}針對採購訂單{1}
 DocType: 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/portal/doctype/homepage/homepage.py +14,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
+DocType: Task,Actual Start Date (via Time Sheet),實際開始日期（通過時間表）
+apps/erpnext/erpnext/portal/doctype/homepage/homepage.py +15,This is an example website auto-generated from ERPNext,這是一個由 ERPNext 自動產生的範例網站
 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.
 
@@ -1815,142 +2260,188 @@
  8。輸入行：如果基於“前行匯總”，您可以選擇將被視為這種計算基礎（預設值是前行）的行號。
  9。考慮稅收或收費為：在本節中，你可以指定是否稅/費僅用於評估（總不是部分），或只為總（不增加價值的項目），或兩者兼有。
  10。添加或扣除：無論你是想增加或扣除的稅。"
+DocType: Homepage,Homepage,主頁
 DocType: Purchase Receipt Item,Recd Quantity,到貨數量
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +103,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +504,Stock Entry {0} is not submitted,股票輸入{0}不提交
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},費紀錄創造 -  {0}
+DocType: Asset Category Account,Asset Category Account,資產類別的帳戶
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},無法產生更多的項目{0}不是銷售訂單數量{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,股票輸入{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,銀行／現金帳戶
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接著聯繫到不能相同鉛郵箱地址
 DocType: Tax Rule,Billing City,結算城市
+DocType: Asset,Manual,手冊
+DocType: Salary Component Account,Salary Component Account,薪金部分賬戶
 DocType: Global Defaults,Hide Currency Symbol,隱藏貨幣符號
-apps/erpnext/erpnext/config/accounts.py +289,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+apps/erpnext/erpnext/config/accounts.py +294,"e.g. Bank, Cash, Credit Card",例如：銀行，現金，信用卡
+DocType: Lead Source,Source Name,源名稱
 DocType: Journal Entry,Credit Note,信用票據
 DocType: Warranty Claim,Service Address,服務地址
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +47,Furnitures and Fixtures,家具及固定裝置
 DocType: Item,Manufacture,製造
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +13,Please Delivery Note first,請送貨單第一
+DocType: Student Applicant,Application Date,申請日期
+DocType: Salary Detail,Amount based on formula,量基於式
 DocType: Purchase Invoice,Currency and Price List,貨幣和價格表
 DocType: Opportunity,Customer / Lead Name,客戶/鉛名稱
-apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +89,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生產
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +62,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
+DocType: Guardian,Occupation,佔用
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,請在人力資源&gt;人力資源設置中設置員工命名系統
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,列#{0}：開始日期必須早於結束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),總計（數量）
 DocType: Sales Invoice,This Document,本文檔
 DocType: Installation Note Item,Installed Qty,安裝數量
-DocType: Lead,Fax,傳真
-DocType: Purchase Taxes and Charges,Parenttype,Parenttype
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +7,Training Result,訓練結果
 DocType: Salary Structure,Total Earning,總盈利
 DocType: Purchase Receipt,Time at which materials were received,物料收到的時間
 DocType: Stock Ledger Entry,Outgoing Rate,傳出率
-apps/erpnext/erpnext/config/hr.py +176,Organization branch master.,組織分支主檔。
-apps/erpnext/erpnext/controllers/accounts_controller.py +273, or ,或
+apps/erpnext/erpnext/config/hr.py +224,Organization branch master.,組織分支主檔。
 DocType: Sales Order,Billing Status,計費狀態
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,報告問題
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,公用事業費用
-apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日記條目{1}沒有帳戶{2}或已經對另一憑證匹配
 DocType: Buying Settings,Default Buying Price List,預設採購價格表
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +90,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
+DocType: Process Payroll,Salary Slip Based on Timesheet,基於時間表工資單
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,已創建的任何僱員對上述選擇標準或工資單
 DocType: Notification Control,Sales Order Message,銷售訂單訊息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",設定預設值如公司，貨幣，當前財政年度等
 DocType: Payment Entry,Payment Type,付款類型
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,請選擇項目{0}的批次。無法找到滿足此要求的單個批次
 DocType: Process Payroll,Select Employees,選擇僱員
-DocType: Bank Reconciliation,To Date,至今
 DocType: Opportunity,Potential Sales Deal,潛在的銷售交易
+DocType: Payment Entry,Cheque/Reference Date,支票/參考日期
 DocType: Purchase Invoice,Total Taxes and Charges,總營業稅金及費用
 DocType: Employee,Emergency Contact,緊急聯絡人
+DocType: Bank Reconciliation Detail,Payment Entry,付款輸入
 DocType: Item,Quality Parameters,質量參數
+,sales-browser,銷售瀏覽器
 apps/erpnext/erpnext/accounts/doctype/account/account.js +56,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 +26,Global POS Profile {0} already created for company {1},全球POS檔案{0}的公司已經創建{1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},全球POS檔案{0}的公司已經創建{1}
 DocType: Purchase Order,Ref SQ,參考SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更換項目/物料清單中的所有材料明細表
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,收到文件必須提交
 DocType: Purchase Invoice Item,Received Qty,到貨數量
 DocType: Stock Entry Detail,Serial No / Batch,序列號/批次
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +297,Not Paid and Not Delivered,沒有支付，未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,沒有支付，未送達
 DocType: Product Bundle,Parent Item,父項目
 DocType: Account,Account Type,帳戶類型
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +115,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +213,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
+apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,沒有考勤表
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,休假類型{0}不能隨身轉發
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',維護計畫不會為全部品項生成。請點擊“生成表”
 ,To Produce,以生產
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工資表
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +163,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",對於行{0} {1}。以包括{2}中的檔案速率，行{3}也必須包括
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,使用戶
 DocType: Packing Slip,Identification of the package for the delivery (for print),寄送包裹的識別碼（用於列印）
 DocType: Bin,Reserved Quantity,保留數量
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
+apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,請輸入有效的電子郵件地址
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},程序{0}沒有強制性課程
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +67,There is no mandatory course for the program {0},程序{0}沒有強制性課程
 DocType: Landed Cost Voucher,Purchase Receipt Items,採購入庫項目
 apps/erpnext/erpnext/config/learn.py +21,Customizing Forms,自定義表單
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +155,Depreciation Amount during the period,期間折舊額
+apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,殘疾人模板必須不能默認模板
 DocType: Account,Income Account,收入帳戶
 DocType: Payment Request,Amount in customer's currency,量客戶的貨幣
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +748,Delivery,交貨
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,交貨
 DocType: Stock Reconciliation Item,Current Qty,目前數量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",請見“材料成本基於”在成本核算章節
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一頁
 DocType: Appraisal Goal,Key Responsibility Area,關鍵責任區
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",學生批幫助您跟踪學生的出勤，評估和費用
+DocType: Payment Entry,Total Allocated Amount,總撥款額
 DocType: Item Reorder,Material Request Type,材料需求類型
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +82,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +17,Ref,參考
-DocType: Budget,Cost Center,成本中心
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日記條目從{0}薪金{1}
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",localStorage的是滿的，沒救
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：計量單位轉換係數是必需的
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,參考
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +36,Voucher #,憑證＃
 DocType: Notification Control,Purchase Order Message,採購訂單的訊息
 DocType: Tax Rule,Shipping Country,航運國家
+DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,從銷售交易隱藏客戶的稅號
 DocType: Upload Attendance,Upload HTML,上傳HTML
-DocType: Employee,Relieving Date,解除日期
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定價規則是由覆蓋價格表/定義折扣百分比，基於某些條件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,倉庫只能通過存貨分錄/送貨單/採購入庫單來改變
 DocType: Employee Education,Class / Percentage,類／百分比
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,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.",如果選擇的定價規則是由為'價格'，它將覆蓋價目表。定價規則價格是最終價格，所以沒有進一步的折扣應適用。因此，在像銷售訂單，採購訂單等交易，這將是“速度”字段進賬，而不是“價格單率”字段。
-apps/erpnext/erpnext/config/selling.py +164,Track Leads by Industry Type.,以行業類型追蹤訊息。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,營銷和銷售主管
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,Income Tax,所得稅
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果選擇的定價規則是由為'價格'，它將覆蓋價目表。定價規則價格是最終價格，所以沒有進一步的折扣應適用。因此，在像銷售訂單，採購訂單等交易，這將是“速度”字段進賬，而不是“價格單率”字段。
+apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,以行業類型追蹤訊息。
 DocType: Item Supplier,Item Supplier,產品供應商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +403,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +770,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
-apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,請輸入產品編號，以取得批號
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},請選擇一個值{0} quotation_to {1}
 DocType: Company,Stock Settings,庫存設定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +224,"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 +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合併是唯一可能的，如果以下屬性中均有記載相同。是集團，根型，公司
+DocType: Vehicle,Electric,電動
+DocType: Task,% Progress,％進展
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +121,Gain/Loss on Asset Disposal,在資產處置收益/損失
+DocType: Training Event,Will send an email about the event to employees with status 'Open',會發郵件有關該事件員工狀態“打開”
+DocType: Task,Depends on Tasks,取決於任務
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客戶群組樹。
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,可以顯示附件，而不啟用購物車
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新的成本中心名稱
 DocType: Leave Control Panel,Leave Control Panel,休假控制面板
+DocType: Project,Task Completion,任務完成
+apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,Not in Stock,沒存貨
 DocType: Appraisal,HR User,HR用戶
 DocType: Purchase Invoice,Taxes and Charges Deducted,稅收和費用扣除
-apps/erpnext/erpnext/hooks.py +100,Issues,問題
-apps/erpnext/erpnext/controllers/status_updater.py +13,Status must be one of {0},狀態必須是一個{0}
+apps/erpnext/erpnext/hooks.py +116,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,交易後實際數量
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},沒有找到之間的工資單{0}和{1}
 ,Pending SO Items For Purchase Request,待處理的SO項目對於採購申請
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,學生入學
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1}被禁用
 DocType: Supplier,Billing Currency,結算貨幣
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +155,Extra Large,特大號
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大號
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Leaves,葉總
 ,Profit and Loss Statement,損益表
 DocType: Bank Reconciliation Detail,Cheque Number,支票號碼
 ,Sales Browser,銷售瀏覽器
 DocType: Journal Entry,Total Credit,貸方總額
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +507,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Local,當地
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +542,Warning: Another {0} # {1} exists against stock entry {2},警告：另一個{0}＃{1}存在對庫存分錄{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +113,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 +154,Large,大
+DocType: Homepage Featured Product,Homepage Featured Product,首頁推薦產品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,所有評估組
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新倉庫名稱
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),總{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,領土
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,請註明無需訪問
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,請註明無需訪問
 DocType: Stock Settings,Default Valuation Method,預設的估值方法
+DocType: Vehicle Log,Fuel Qty,燃油數量
 DocType: Production Order Operation,Planned Start Time,計劃開始時間
+DocType: Course,Assessment,評定
 DocType: Payment Entry Reference,Allocated,分配
-apps/erpnext/erpnext/config/accounts.py +231,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+apps/erpnext/erpnext/config/accounts.py +236,Close Balance Sheet and book Profit or Loss.,關閉資產負債表和賬面利潤或虧損。
+DocType: Student Applicant,Application Status,應用現狀
+DocType: Fees,Fees,費用
 DocType: Currency Exchange,Specify Exchange Rate to convert one currency into another,指定的匯率將一種貨幣兌換成另一種
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +145,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}休假。不能標記考勤。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +149,Quotation {0} is cancelled,{0}報價被取消
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +29,Total Outstanding Amount,未償還總額
 DocType: Sales Partner,Targets,目標
 DocType: Price List,Price List Master,價格表主檔
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的銷售交易，可以用來標記針對多個**銷售**的人，這樣你可以設置和監控目標。
 ,S.O. No.,SO號
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +150,Please create Customer from Lead {0},請牽頭建立客戶{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},請牽頭建立客戶{0}
 DocType: Price List,Applicable for Countries,適用於國家
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申請“已批准”和“拒絕”，就可以提交
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},學生組名稱是強制性的行{0}
+DocType: Homepage,Products to be shown on website homepage,在網站首頁中顯示的產品
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.js +13,This is a root customer group and cannot be edited.,ERPNext是一個開源的基於Web的ERP系統，通過網路技術，向私人有限公司提供整合的工具，在一個小的組織管理大多數流程。有關Web註釋，或購買託管，想得到更多資訊，請連結
 DocType: POS Profile,Ignore Pricing Rule,忽略定價規則
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +37,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 +66,Warning: Sales Order {0} already exists against Customer's Purchase Order {1},警告：銷售訂單{0}已經存在針對客戶的採購訂單{1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +69,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:
@@ -1977,68 +2468,84 @@
  1。的解決糾紛，賠償，法律責任等
  1的方式。地址和公司聯繫。"
 DocType: Attendance,Leave Type,休假類型
-apps/erpnext/erpnext/controllers/stock_controller.py +173,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
-DocType: Account,Accounts User,會計人員
+DocType: Purchase Invoice,Supplier Invoice Details,供應商發票明細
+apps/erpnext/erpnext/controllers/stock_controller.py +235,Expense / Difference account ({0}) must be a 'Profit or Loss' account,費用/差異帳戶（{0}）必須是一個'溢利或虧損的帳戶
+DocType: Project,Copied From,複製自
+DocType: Project,Copied From,複製自
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},名稱錯誤：{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1}不關聯{2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,員工{0}的考勤已標記
 DocType: Packing Slip,If more than one package of the same type (for print),如果不止一個相同類型的包裹（用於列印）
+,Salary Register,薪酬註冊
+DocType: Warehouse,Parent Warehouse,家長倉庫
 DocType: C-Form Invoice Detail,Net Total,總淨值
-DocType: Bin,FCFS Rate,FCFS率
+apps/erpnext/erpnext/config/hr.py +163,Define various loan types,定義不同的貸款類型
 DocType: Payment Reconciliation Invoice,Outstanding Amount,未償還的金額
+apps/erpnext/erpnext/templates/generators/bom.html +71,Time(in mins),時間（分鐘）
 DocType: Project Task,Working,工作的
 DocType: Stock Ledger Entry,Stock Queue (FIFO),庫存序列（先進先出）
-apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +38,{0} does not belong to Company {1},{0}不屬於公司{1}
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +39,{0} does not belong to Company {1},{0}不屬於公司{1}
 DocType: Account,Round Off,四捨五入
 ,Requested Qty,要求數量
 DocType: Tax Rule,Use for Shopping Cart,使用的購物車
+apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的屬性{1}不在有效的項目列表中存在的屬性值項{2}
 DocType: BOM Item,Scrap %,廢鋼％
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇
-DocType: Maintenance Visit,Purposes,用途
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +109,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 +83,No Remarks,暫無產品說明
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +13,Overdue,過期的
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",費用將被分配比例根據項目數量或金額，按您的選擇
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一個項目應該負數量回報文檔中輸入
+apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作時間更長工作站{1}，分解成運行多個操作
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +85,No Remarks,暫無產品說明
+DocType: Purchase Invoice,Overdue,過期的
 DocType: Account,Stock Received But Not Billed,庫存接收，但不付款
-apps/erpnext/erpnext/accounts/doctype/account/account.py +87,Root Account must be a group,根帳戶必須是一組
-DocType: Salary Slip,Gross Pay + Arrear Amount +Encashment Amount - Total Deduction,工資總額+欠費金額+兌現金額 - 扣除項目金額
+apps/erpnext/erpnext/accounts/doctype/account/account.py +88,Root Account must be a group,根帳戶必須是一組
+DocType: Fees,FEE.,費用。
+DocType: Employee Loan,Repaid/Closed,償還/關閉
+DocType: Item,Total Projected Qty,預計總數量
 DocType: Monthly Distribution,Distribution Name,分配名稱
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +98,Quality Inspection required for Item {0},項目{0}需要品質檢驗
+DocType: Course,Course Code,課程代碼
+apps/erpnext/erpnext/controllers/stock_controller.py +333,Quality Inspection required for Item {0},項目{0}需要品質檢驗
 DocType: Quotation,Rate at which customer's currency is converted to company's base currency,客戶貨幣被換算成公司基礎貨幣的匯率
 DocType: Purchase Invoice Item,Net Rate (Company Currency),淨利率（公司貨幣）
+DocType: Salary Detail,Condition and Formula Help,條件和公式幫助
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理領地樹。
 DocType: Journal Entry Account,Sales Invoice,銷售發票
 DocType: Journal Entry Account,Party Balance,黨平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +475,Please select Apply Discount On,請選擇適用的折扣
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +92,Salary Slip Created,工資單創建
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,請選擇適用的折扣
 DocType: Company,Default Receivable Account,預設應收帳款
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,對支付上述選擇條件的薪資總額新增銀行分錄
 DocType: Stock Entry,Material Transfer for Manufacture,物料轉倉用於製造
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以應用於單一價目表或所有價目表。
 DocType: Purchase Invoice,Half-yearly,每半年一次
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +384,Accounting Entry for Stock,存貨的會計分錄
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,存貨的會計分錄
+DocType: Vehicle Service,Engine Oil,機油
 DocType: Sales Invoice,Sales Team1,銷售團隊1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +37,Item {0} does not exist,項目{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,項目{0}不存在
 DocType: Sales Invoice,Customer Address,客戶地址
+DocType: Employee Loan,Loan Details,貸款詳情
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成數量必須大於零。
 DocType: Purchase Invoice,Apply Additional Discount On,收取額外折扣
 DocType: Account,Root Type,root類型
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +88,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +76,Plot,情節
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：無法返回超過{1}項{2}
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,情節
 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 +147,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +149,Target warehouse is mandatory for row {0},目標倉庫是強制性的行{0}
+DocType: Cheque Print Template,Primary Settings,主要設置
 DocType: Purchase Invoice,Select Supplier Address,選擇供應商地址
-DocType: Quality Inspection,Quality Inspection,品質檢驗
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +151,Extra Small,超小
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +719,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +194,Account {0} is frozen,帳戶{0}被凍結
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,添加員工
+DocType: Purchase Invoice Item,Quality Inspection,品質檢驗
+DocType: Company,Standard Template,標準模板
+DocType: Training Event,Theory,理論
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料需求的數量低於最少訂購量
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,帳戶{0}被凍結
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,法人/子公司與帳戶的獨立走勢屬於該組織。
 DocType: Payment Request,Mute Email,靜音電子郵件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品、飲料＆煙草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +606,Can only make payment against unbilled {0},只能使支付對未付款的{0}
-apps/erpnext/erpnext/controllers/selling_controller.py +126,Commission rate cannot be greater than 100,佣金比率不能大於100
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},只能使支付對未付款的{0}
+apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金比率不能大於100
 DocType: Stock Entry,Subcontract,轉包
-apps/erpnext/erpnext/public/js/utils/party.js +146,Please enter {0} first,請輸入{0}第一
+apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,請輸入{0}第一
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +64,No replies from,從沒有回复
 DocType: Production Order Operation,Actual End Time,實際結束時間
 DocType: Production Planning Tool,Download Materials Required,下載所需材料
 DocType: Item,Manufacturer Part Number,製造商零件編號
@@ -2047,187 +2554,245 @@
 DocType: SMS Log,No of Sent SMS,沒有發送短信
 DocType: Account,Expense Account,費用帳戶
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +49,Software,軟件
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Colour,顏色
-DocType: Maintenance Visit,Scheduled,預定
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +165,Colour,顏色
+DocType: Assessment Plan Criteria,Assessment Plan Criteria,評估計劃標準
+DocType: Training Event,Scheduled,預定
+apps/erpnext/erpnext/config/buying.py +18,Request for quotation.,詢價。
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.js +13,"Please select Item where ""Is Stock Item"" is ""No"" and ""Is Sales Item"" is ""Yes"" and there is no other Product Bundle",請選擇項，其中“正股項”是“否”和“是銷售物品”是“是”，沒有其他產品捆綁
-apps/erpnext/erpnext/controllers/accounts_controller.py +469,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
+DocType: Student Log,Academic,學術的
+apps/erpnext/erpnext/controllers/accounts_controller.py +486,Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2}),總的超前（{0}）對二階{1}不能大於總計（{2}）
 DocType: Sales Partner,Select Monthly Distribution to unevenly distribute targets across months.,選擇按月分佈橫跨幾個月不均勻分佈的目標。
-DocType: Purchase Invoice Item,Valuation Rate,估值率
-apps/erpnext/erpnext/stock/get_item_details.py +294,Price List Currency not selected,尚未選擇價格表之貨幣
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +168,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
+DocType: Vehicle,Diesel,柴油機
+apps/erpnext/erpnext/stock/get_item_details.py +318,Price List Currency not selected,尚未選擇價格表之貨幣
+,Student Monthly Attendance Sheet,學生每月考勤表
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +185,Employee {0} has already applied for {1} between {2} and {3},員工{0}已經申請了{1}的{2}和{3}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +30,Project Start Date,專案開始日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +8,Until,直到
 DocType: Rename Tool,Rename Log,重命名日誌
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +27,Student Group or Course Schedule is mandatory,學生組或課程表是強制性的
+DocType: HR Settings,Maintain Billing Hours and Working Hours Same on Timesheet,維護發票時間和工作時間的時間表相同
 DocType: Maintenance Visit Purpose,Against Document No,對文件編號
+DocType: BOM,Scrap,廢料
 apps/erpnext/erpnext/config/selling.py +110,Manage Sales Partners.,管理銷售合作夥伴。
 DocType: Quality Inspection,Inspection Type,檢驗類型
-apps/erpnext/erpnext/controllers/recurring_document.py +166,Please select {0},請選擇{0}
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,與現有的交易倉庫不能轉換為組。
+DocType: Assessment Result Tool,Result HTML,結果HTML
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,新增學生
+apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},請選擇{0}
 DocType: C-Form,C-Form No,C-表格編號
 DocType: BOM,Exploded_items,Exploded_items
 DocType: Employee Attendance Tool,Unmarked Attendance,無標記考勤
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Researcher,研究員
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,Researcher,研究員
+DocType: Program Enrollment Tool Student,Program Enrollment Tool Student,計劃註冊學生工具
 apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +25,Name or Email is mandatory,姓名或電子郵件是強制性
-apps/erpnext/erpnext/config/stock.py +158,Incoming quality inspection.,進料品質檢驗
+apps/erpnext/erpnext/config/stock.py +163,Incoming quality inspection.,進料品質檢驗
 DocType: Purchase Order Item,Returned Qty,返回的數量
 DocType: Employee,Exit,出口
-apps/erpnext/erpnext/accounts/doctype/account/account.py +159,Root Type is mandatory,root類型是強制性的
+apps/erpnext/erpnext/accounts/doctype/account/account.py +160,Root Type is mandatory,root類型是強制性的
+DocType: BOM,Total Cost(Company Currency),總成本（公司貨幣）
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +295,Serial No {0} created,序列號{0}創建
+DocType: Homepage,Company Description for website homepage,公司介紹了網站的首頁
 DocType: Item Customer Detail,"For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",為方便客戶，這些代碼可以在列印格式，如發票和送貨單使用
+apps/erpnext/erpnext/accounts/report/purchase_order_items_to_be_billed/purchase_order_items_to_be_billed.py +18,Suplier Name,Suplier名稱
+DocType: Sales Invoice,Time Sheet List,時間表列表
 DocType: Employee,You can enter any date manually,您可以手動輸入任何日期
-DocType: Sales Invoice,Advertisement,廣告
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +172,Probationary Period,試用期
+DocType: Asset Category Account,Depreciation Expense Account,折舊費用帳戶
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +183,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 +109,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +136,Row {0}: Advance against Customer must be credit,行{0}：提前對客戶必須是信用
+apps/erpnext/erpnext/accounts/doctype/account/account.js +66,Non-Group to Group,非集團集團
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},在{0}行中必須使用批處理
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +57,Batch is mandatory in row {0},在{0}行中必須使用批處理
 DocType: Purchase Receipt Item Supplied,Purchase Receipt Item Supplied,採購入庫項目供應商
-DocType: Payment Entry,Pay,付
-apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +16,To Datetime,以日期時間
+apps/erpnext/erpnext/projects/report/daily_timesheet_summary/daily_timesheet_summary.py +24,To Datetime,以日期時間
 DocType: SMS Settings,SMS Gateway URL,短信閘道的URL
-apps/erpnext/erpnext/config/selling.py +283,Logs for maintaining sms delivery status,日誌維護短信發送狀態
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +36,Pending Activities,待活動
-DocType: Payment Gateway,Gateway,網關
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +127,Please enter relieving date.,請輸入解除日期。
-apps/erpnext/erpnext/controllers/trends.py +145,Amt,AMT
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +54,Only Leave Applications with status 'Approved' can be submitted,只允許提交狀態為「已批准」的休假申請
-apps/erpnext/erpnext/utilities/doctype/address/address.py +26,Address Title is mandatory.,地址標題是強制性的。
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +54,Course Schedules deleted:,課程表刪除：
+apps/erpnext/erpnext/config/selling.py +297,Logs for maintaining sms delivery status,日誌維護短信發送狀態
+DocType: Accounts Settings,Make Payment via Journal Entry,通過日記帳分錄進行付款
+DocType: Item,Inspection Required before Delivery,分娩前檢查所需
+DocType: Item,Inspection Required before Purchase,購買前檢查所需
+apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +93,Pending Activities,待活動
+DocType: Fee Component,Fees Category,費用類別
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +129,Please enter relieving date.,請輸入解除日期。
+apps/erpnext/erpnext/controllers/trends.py +149,Amt,AMT
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,選擇財政年度
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序級別
-DocType: Attendance,Attendance Date,考勤日期
+DocType: Company,Chart Of Accounts Template,圖表帳戶模板
+apps/erpnext/erpnext/stock/get_item_details.py +282,Item Price updated for {0} in Price List {1},項目價格更新{0}價格表{1}
 DocType: Salary Structure,Salary breakup based on Earning and Deduction.,工資分手基於盈利和演繹。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +131,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
-DocType: Address,Preferred Shipping Address,偏好的送貨地址
+apps/erpnext/erpnext/accounts/doctype/account/account.py +132,Account with child nodes cannot be converted to ledger,有子節點的帳不能轉換到總帳
 DocType: Purchase Invoice Item,Accepted Warehouse,收料倉庫
 DocType: Bank Reconciliation Detail,Posting Date,發布日期
-DocType: Item,Valuation Method,估值方法
-apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1},找不到匯率{0} {1}
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +202,Mark Half Day,馬克半天
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +203,Mark Half Day,馬克半天
 DocType: Sales Invoice,Sales Team,銷售團隊
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +84,Duplicate entry,重複的條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,重複的條目
+DocType: Program Enrollment Tool,Get Students,讓學生
 DocType: Serial No,Under Warranty,在保修期
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +490,[Error],[錯誤]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[錯誤]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,銷售訂單一被儲存，就會顯示出來。
 ,Employee Birthday,員工生日
+DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,學生考勤批處理工具
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,創業投資
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,這個“學年”一個學期{0}和“術語名稱”{1}已經存在。請修改這些條目，然後再試一次。
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",由於有對項目{0}現有的交易，你不能改變的值{1}
 DocType: UOM,Must be Whole Number,必須是整數
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新的排假（天）
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列號{0}不存在
 DocType: Sales Invoice Item,Customer Warehouse (Optional),客戶倉庫（可選）
-DocType: Pricing Rule,Discount Percentage,折扣百分比
 DocType: Payment Reconciliation Invoice,Invoice Number,發票號碼
 DocType: Shopping Cart Settings,Orders,訂單
 DocType: Employee Leave Approver,Leave Approver,休假審批人
+DocType: Assessment Group,Assessment Group Name,評估小組名稱
 DocType: Manufacturing Settings,Material Transferred for Manufacture,轉移至製造的物料
 DocType: Expense Claim,"A user with ""Expense Approver"" role",與“費用審批人”角色的用戶
+DocType: Landed Cost Item,Receipt Document Type,收據憑證類型
+DocType: Daily Work Summary Settings,Select Companies,選擇公司
 ,Issued Items Against Production Order,生產訂單的已發物料
-DocType: Pricing Rule,Purchase Manager,採購經理
 DocType: Target Detail,Target Detail,目標詳細資訊
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +25,All Jobs,所有職位
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +24,All Jobs,所有職位
 DocType: Sales Order,% of materials billed against this Sales Order,針對這張銷售訂單的已開立帳單的百分比(%)
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末進入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,與現有的交易成本中心，不能轉化為組
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},金額{0} {1} {2} {3}
 DocType: Account,Depreciation,折舊
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供應商（S）
 DocType: Employee Attendance Tool,Employee Attendance Tool,員工考勤工具
+DocType: Guardian Student,Guardian Student,學生監護人
 DocType: Supplier,Credit Limit,信用額度
 DocType: Production Plan Sales Order,Salse Order Date,Salse訂單日期
+apps/erpnext/erpnext/accounts/utils.py +493,Payment Entries {0} are un-linked,付款項{0}是聯合國聯
 DocType: GL Entry,Voucher No,憑證編號
+,Lead Owner Efficiency,主導效率
+,Lead Owner Efficiency,主導效率
 DocType: Leave Allocation,Leave Allocation,排假
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +497,Material Requests {0} created,{0}物料需求已建立
-apps/erpnext/erpnext/config/selling.py +154,Template of terms or contract.,模板條款或合同。
+DocType: Payment Request,Recipient Message And Payment Details,收件人郵件和付款細節
+DocType: Training Event,Trainer Email,教練電子郵件
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +546,Material Requests {0} created,{0}物料需求已建立
+apps/erpnext/erpnext/config/selling.py +164,Template of terms or contract.,模板條款或合同。
 DocType: Purchase Invoice,Address and Contact,地址和聯絡方式
+DocType: Cheque Print Template,Is Account Payable,為應付賬款
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +268,Stock cannot be updated against Purchase Receipt {0},股票不能對外購入庫單進行更新{0}
 DocType: Supplier,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 +305,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+DocType: Support Settings,Auto close Issue after 7 days,7天之後自動關閉問題
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因為休假餘額已經結轉轉發在未來的假期分配記錄{1}
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),註：由於/參考日期由{0}天超過了允許客戶的信用天數（S）
+apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,學生申請
+DocType: Asset Category Account,Accumulated Depreciation Account,累計折舊科目
 DocType: Stock Settings,Freeze Stock Entries,凍結庫存項目
+DocType: Asset,Expected Value After Useful Life,期望值使用壽命結束後
 DocType: Item,Reorder level based on Warehouse,根據倉庫訂貨點水平
 DocType: Activity Cost,Billing Rate,結算利率
 ,Qty to Deliver,數量交付
-DocType: Monthly Distribution Percentage,Month,月
 ,Stock Analytics,庫存分析
 DocType: Maintenance Visit Purpose,Against Document Detail No,對文件詳細編號
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,黨的類型是強制性
 DocType: Quality Inspection,Outgoing,發送
 DocType: Material Request,Requested For,要求
 DocType: Quotation Item,Against Doctype,針對文檔類型
-apps/erpnext/erpnext/controllers/buying_controller.py +376,{0} {1} is cancelled or closed,{0} {1}被取消或關閉
+apps/erpnext/erpnext/controllers/buying_controller.py +388,{0} {1} is cancelled or closed,{0} {1}被取消或關閉
 DocType: Delivery Note,Track this Delivery Note against any Project,跟踪此送貨單反對任何項目
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +29,Net Cash from Investing,從投資淨現金
-,Is Primary Address,是主地址
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +30,Net Cash from Investing,從投資淨現金
 DocType: Production Order,Work-in-Progress Warehouse,在製品倉庫
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +324,Reference #{0} dated {1},參考＃ {0}於{1}
-apps/erpnext/erpnext/templates/includes/cart/cart_address.html +15,Manage Addresses,管理地址
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +108,Asset {0} must be submitted,資產{0}必須提交
+apps/erpnext/erpnext/schools/doctype/student_attendance/student_attendance.py +58,Attendance Record {0} exists against Student {1},考勤記錄{0}存在針對學生{1}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +354,Reference #{0} dated {1},參考＃ {0}於{1}
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +161,Depreciation Eliminated due to disposal of assets,折舊淘汰因處置資產
 DocType: Asset,Item Code,產品編號
 DocType: Production Planning Tool,Create Production Orders,建立生產訂單
 DocType: Serial No,Warranty / AMC Details,保修/ AMC詳情
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,為基於活動的組手動選擇學生
 DocType: Journal Entry,User Remark,用戶備註
 DocType: Lead,Market Segment,市場分類
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金額不能超過總負餘額大於{0}
 DocType: Employee Internal Work History,Employee Internal Work History,員工內部工作經歷
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +233,Closing (Dr),關閉（Dr）
-DocType: Contact,Passive,被動
+apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),關閉（Dr）
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +228,Serial No {0} not in stock,序列號{0}無貨
-apps/erpnext/erpnext/config/selling.py +159,Tax template for selling transactions.,稅務模板賣出的交易。
+apps/erpnext/erpnext/config/selling.py +169,Tax template for selling transactions.,稅務模板賣出的交易。
 DocType: Sales Invoice,Write Off Outstanding Amount,核銷額（億元）
-DocType: Account,Accounts Manager,會計經理
+DocType: School Settings,Current Academic Year,當前學年
+DocType: School Settings,Current Academic Year,當前學年
 DocType: Stock Settings,Default Stock UOM,預設庫存計量單位
+DocType: Asset,Number of Depreciations Booked,預訂折舊數
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +32,Against Employee Loan: {0},對員工貸款：{0}
 DocType: Production Planning Tool,Create Material Requests,建立物料需求
 DocType: Employee Education,School/University,學校/大學
 DocType: Payment Request,Reference Details,詳細參考訊息
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用壽命結束後必須小於總消費金額
 DocType: Sales Invoice Item,Available Qty at Warehouse,有貨數量在倉庫
-,Billed Amount,帳單金額
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +166,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,帳單金額
+DocType: Asset,Double Declining Balance,雙倍餘額遞減
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +170,Closed order cannot be cancelled. Unclose to cancel.,關閉的定單不能被取消。 Unclose取消。
+DocType: Student Guardian,Father,父親
+apps/erpnext/erpnext/controllers/accounts_controller.py +572,'Update Stock' cannot be checked for fixed asset sale,“更新股票&#39;不能檢查固定資產出售
 DocType: Bank Reconciliation,Bank Reconciliation,銀行對帳
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +7,Get Updates,獲取更新
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +132,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
-apps/erpnext/erpnext/public/js/setup_wizard.js +313,Add a few sample records,增加了一些樣本記錄
-apps/erpnext/erpnext/config/hr.py +243,Leave Management,離開管理
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +81,Group by Account,以帳戶分群組
-DocType: Sales Order,Fully Delivered,完全交付
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +96,{0} {1}: Account {2} does not belong to Company {3},{0} {1}帳戶{2}不屬於公司{3}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +134,Material Request {0} is cancelled or stopped,材料需求{0}被取消或停止
+apps/erpnext/erpnext/public/js/setup_wizard.js +318,Add a few sample records,增加了一些樣本記錄
+apps/erpnext/erpnext/config/hr.py +301,Leave Management,離開管理
+apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.js +106,Group by Account,以帳戶分群組
 DocType: Lead,Lower Income,較低的收入
-DocType: Period Closing Voucher,"The account head under Liability, in which Profit/Loss will be booked",根據責任帳號頭，其中利潤/虧損將被黃牌警告
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +166,Source and target warehouse cannot be same for row {0},列{0}的來源和目標倉庫不可相同
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,"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 +81,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+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_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差異帳戶必須是資產/負債類型的帳戶，因為此庫存調整是一個開始分錄
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付額不能超過貸款金額較大的{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},所需物品{0}的採購訂單號
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,生產訂單未創建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必須經過'終止日期'
+apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},無法改變地位的學生{0}與學生申請鏈接{1}
+DocType: Asset,Fully Depreciated,已提足折舊
 ,Stock Projected Qty,存貨預計數量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +356,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},客戶{0}不屬於項目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,顯著的考勤HTML
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",語錄是建議，你已經發送到你的客戶提高出價
 DocType: Sales Order,Customer's Purchase Order,客戶採購訂單
-apps/erpnext/erpnext/config/stock.py +107,Serial No and Batch,序列號和批次
+apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列號和批次
 DocType: Warranty Claim,From Company,從公司
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +95,Value or Qty,價值或數量
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +400,Productions Orders cannot be raised for:,製作訂單不能上調：
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Minute,分鐘
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,評估標準的得分之和必須是{0}。
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,請設置折舊數預訂
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,價值或數量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,製作訂單不能上調：
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分鐘
 DocType: Purchase Invoice,Purchase Taxes and Charges,購置稅和費
 ,Qty to Receive,未到貨量
 DocType: Leave Block List,Leave Block List Allowed,准許的休假區塊清單
-DocType: Sales Partner,Retailer,零售商
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +105,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +128,All Supplier Types,所有供應商類型
+DocType: Grading Scale Interval,Grading Scale Interval,分級分度值
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +49,Expense Claim for Vehicle Log {0},報銷車輛登錄{0}
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+DocType: Sales Invoice Item,Discount (%) on Price List Rate with Margin,價格上漲率與貼現率的折扣（％）
+apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,所有倉庫
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,信用帳戶必須是資產負債表科目
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供應商類型
 DocType: Global Defaults,Disable In Words,禁用詞
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,產品編號是強制性的，因為項目沒有自動編號
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +97,Quotation {0} not of type {1},報價{0}非為{1}類型
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,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 +154,Bank Overdraft Account,銀行透支戶口
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,銀行透支戶口
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,製作工資單
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +26,Browse BOM,瀏覽BOM
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Secured Loans,抵押貸款
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +166,Opening Balance Equity,期初餘額權益
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金額不能大於未結算金額。
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,瀏覽BOM
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,抵押貸款
+DocType: Purchase Invoice,Edit Posting Date and Time,編輯投稿時間
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +98,Please set Depreciation related Accounts in Asset Category {0} or Company {1},請設置在資產類別{0}或公司折舊相關帳戶{1}
+DocType: Academic Term,Academic Year,學年
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +167,Opening Balance Equity,期初餘額權益
 DocType: Appraisal,Appraisal,評價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +134,Email sent to supplier {0},電子郵件發送到供應商{0}
 apps/erpnext/erpnext/hr/doctype/leave_block_list/leave_block_list.py +19,Date is repeated,日期重複
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +27,Authorized Signatory,授權簽字人
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +197,Leave approver must be one of {0},休假審批人必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +215,Leave approver must be one of {0},休假審批人必須是一個{0}
 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 +256,Select Quantity,選擇數量
+DocType: Training Event,Start Time,開始時間
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +278,Select Quantity,選擇數量
+DocType: Customs Tariff Number,Customs Tariff Number,海關稅則號
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +34,Approving Role cannot be same as role the rule is Applicable To,審批角色作為角色的規則適用於不能相同
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +65,Unsubscribe from this Email Digest,從該電子郵件摘要退訂
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +28,Message Sent,發送訊息
-apps/erpnext/erpnext/accounts/doctype/account/account.py +101,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
+apps/erpnext/erpnext/accounts/doctype/account/account.py +102,Account with child nodes cannot be set as ledger,帳戶與子節點不能被設置為分類帳
 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: Salary Slip,Hour Rate,小時率
@@ -2238,110 +2803,147 @@
 DocType: Project,Project Type,專案類型
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.py +16,Either target qty or target amount is mandatory.,無論是數量目標或目標量是強制性的。
 apps/erpnext/erpnext/config/projects.py +45,Cost of various activities,各種活動的費用
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +104,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
-DocType: Item,Inspection Required,需要檢驗
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +60,"Setting Events to {0}, since the Employee attached to the below Sales Persons does not have a User ID{1}",設置活動為{0}，因為附連到下面的銷售者的僱員不具有用戶ID {1}
+DocType: Timesheet,Billing Details,結算明細
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +150,Source and target warehouse must be different,源和目標倉庫必須是不同的
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允許更新比{0}舊的庫存交易
 DocType: Purchase Invoice Item,PR Detail,詳細新聞稿
 DocType: Sales Order,Fully Billed,完全開票
 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 +123,Delivery warehouse required for stock item {0},需要的庫存項目交割倉庫{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +127,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,被註銷
+DocType: Student Group,Group Based On,基於組
+DocType: Student Group,Group Based On,基於組
 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:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
+apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服務項目，類型，頻率和消費金額要求
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",即使有更高優先級的多個定價規則，然後按照內部優先級應用：
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},難道你真的想從提交{0}所有的工資單{1}
 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 +138,Wire Transfer,電匯
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +131,Check all,全面檢查
-DocType: Sales Order,Recurring Order,經常訂購
+apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +43,From value must be less than to value in row {0},來源值必須小於列{0}的值
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Wire Transfer,電匯
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +132,Check all,全面檢查
+DocType: Vehicle Log,Invoice Ref,發票編號
+DocType: Purchase Order,Recurring Order,經常訂購
 DocType: Company,Default Income Account,預設之收入帳戶
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客戶群組／客戶
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客戶群組／客戶
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未關閉的財年利潤/損失（信用）
 DocType: Payment Gateway Account,Default Payment Request Message,預設的付款請求訊息
 DocType: Item Group,Check this if you want to show in website,勾選本項以顯示在網頁上
 apps/erpnext/erpnext/config/accounts.py +136,Banking and Payments,銀行和支付
 ,Welcome to ERPNext,歡迎來到ERPNext
-apps/erpnext/erpnext/config/learn.py +107,Lead to Quotation,導致報價
+apps/erpnext/erpnext/config/learn.py +102,Lead to Quotation,導致報價
 DocType: Lead,From Customer,從客戶
-apps/erpnext/erpnext/demo/setup_data.py +357,Calls,電話
+apps/erpnext/erpnext/demo/setup/setup_data.py +321,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 +217,Purchase Order {0} is not submitted,採購訂單{0}未提交
-apps/erpnext/erpnext/stock/doctype/item/item.js +33,Projected,預計
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +225,Purchase Order {0} is not submitted,採購訂單{0}未提交
+DocType: Customs Tariff Number,Tariff Number,稅則號
+apps/erpnext/erpnext/stock/doctype/item/item.js +39,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
+apps/erpnext/erpnext/controllers/status_updater.py +163,Note: System will not check over-delivery and over-booking for Item {0} as quantity or amount is 0,注：系統將不檢查過交付和超額預訂的項目{0}的數量或金額為0
 DocType: Notification Control,Quotation Message,報價訊息
+DocType: Employee Loan,Employee Loan Application,職工貸款申請
 DocType: Issue,Opening Date,開幕日期
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,出席已成功標記。
 DocType: Journal Entry,Remark,備註
 DocType: Purchase Receipt Item,Rate and Amount,率及金額
-apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,葉子度假
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},帳戶類型為{0}必須{1}
+apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,休假及假日
+DocType: School Settings,Current Academic Term,當前學術期限
+DocType: School Settings,Current Academic Term,當前學術期限
 DocType: Sales Order,Not Billed,不發單
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
-apps/erpnext/erpnext/public/js/templates/contact_list.html +31,No contacts added yet.,尚未新增聯絡人。
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +147,Both Warehouse must belong to same Company,這兩個倉庫必須屬於同一個公司
+apps/erpnext/erpnext/public/js/templates/contact_list.html +37,No contacts added yet.,尚未新增聯絡人。
 DocType: Purchase Invoice Item,Landed Cost Voucher Amount,到岸成本憑證金額
 apps/erpnext/erpnext/config/accounts.py +17,Bills raised by Suppliers.,由供應商提出的帳單。
 DocType: POS Profile,Write Off Account,核銷帳戶
 apps/erpnext/erpnext/templates/print_formats/includes/taxes.html +5,Discount Amount,折扣金額
 DocType: Purchase Invoice,Return Against Purchase Invoice,回到對採購發票
 DocType: Item,Warranty Period (in days),保修期限（天數）
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +17,Net Cash from Operations,從運營的淨現金
-apps/erpnext/erpnext/public/js/setup_wizard.js +225,e.g. VAT,例如增值稅
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +54,Relation with Guardian1,與關係Guardian1
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +18,Net Cash from Operations,從運營的淨現金
+apps/erpnext/erpnext/public/js/setup_wizard.js +230,e.g. VAT,例如增值稅
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +26,Item 4,項目4
+DocType: Student Admission,Admission End Date,錄取結束日期
 DocType: Journal Entry Account,Journal Entry Account,日記帳分錄帳號
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,學生組
 DocType: Shopping Cart Settings,Quotation Series,報價系列
-apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +59,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",具有相同名稱的項目存在（ {0} ） ，請更改項目群組名或重新命名該項目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,請選擇客戶
+DocType: C-Form,I,一世
+DocType: Company,Asset Depreciation Cost Center,資產折舊成本中心
 DocType: Sales Order Item,Sales Order Date,銷售訂單日期
 DocType: Sales Invoice Item,Delivered Qty,交付數量
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
+DocType: Production Planning Tool,"If checked, all the children of each production item will be included in the Material Requests.",如果選中，各個生產項目的所有孩子將被列入材料請求。
+DocType: Assessment Plan,Assessment Plan,評估計劃
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +90,Warehouse {0}: Company is mandatory,倉庫{0}：公司是強制性的
 ,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}
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +58,Missing Currency Exchange Rates for {0},缺少貨幣匯率{0}
+DocType: Assessment Plan,Examiner,檢查員
 DocType: Journal Entry,Stock Entry,存貨分錄
-DocType: Account,Payable,支付
-apps/erpnext/erpnext/shopping_cart/cart.py +347,Debtors ({0}),債務人（{0}）
+DocType: Payment Entry,Payment References,付款參考
+DocType: Vehicle,Insurance Details,保險詳情
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,請輸入還款期
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),債務人（{0}）
 DocType: Pricing Rule,Margin,餘量
-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 +73,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),權重（％）
-DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-DocType: Lead,Address 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/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,總消費金額是強制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,黨是強制性
+DocType: Journal Entry,JV-,將N-
+DocType: Topic,Topic Name,主題名稱
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,至少需選擇銷售或購買
+apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,選擇您的業務的性質。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重複條目
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生產作業於此進行。
 DocType: Asset Movement,Source Warehouse,來源倉庫
 DocType: Installation Note,Installation Date,安裝日期
+apps/erpnext/erpnext/controllers/accounts_controller.py +551,Row #{0}: Asset {1} does not belong to company {2},行＃{0}：資產{1}不屬於公司{2}
 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,最小數量不能大於最大數量
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +49,Min Qty can not be greater than Max Qty,最小數量不能大於最大數量
+DocType: Account,Accumulated Depreciation,累計折舊
 DocType: Stock Entry,Customer or Supplier Details,客戶或供應商詳細訊息
 DocType: Lead,Lead Owner,鉛所有者
 DocType: Bin,Requested Quantity,要求的數量
 DocType: Employee,Marital Status,婚姻狀況
 DocType: Stock Settings,Auto Material Request,自動物料需求
 DocType: Delivery Note Item,Available Batch Qty at From Warehouse,在從倉庫可用的批次數量
+DocType: Salary Slip,Gross Pay - Total Deduction - Loan Repayment,工資總額 - 扣除總額 - 貸款還款
 apps/erpnext/erpnext/manufacturing/doctype/bom_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,日期退休必須大於加入的日期
+apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +38,Salary Slip ID,工資單編號
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +113,Date Of Retirement must be greater than Date of Joining,日期退休必須大於加入的日期
+apps/erpnext/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py +52,There were errors while scheduling course on :,有錯誤，同時在調度過程：
 DocType: Sales Invoice,Against Income Account,對收入帳戶
-apps/erpnext/erpnext/controllers/website_list_for_contact.py +87,{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}（項中定義）。
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +81,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,貨運公司資訊
+apps/erpnext/erpnext/accounts/utils.py +500,Please set default {0} in Company {1},請設置在默認情況下公司{0} {1}
+DocType: Cheque Print Template,Starting position from top edge,起價頂邊位置
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +30,Same supplier has been entered multiple times,同一個供應商已多次輸入
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.py +152,Gross Profit / Loss,總利潤/虧損
 DocType: Purchase Order Item Supplied,Purchase Order Item Supplied,採購訂單項目供應商
 apps/erpnext/erpnext/public/js/setup_wizard.js +83,Company Name cannot be Company,公司名稱不能為公司
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,信頭的列印模板。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,"列印模板的標題, 例如 Proforma Invoice。"
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +184,Valuation type charges can not marked as Inclusive,估值類型罪名不能標記為包容性
+DocType: Student Guardian,Student Guardian,學生家長
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,不同計量單位的項目會導致不正確的（總）淨重值。確保每個項目的淨重是在同一個計量單位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM率
+DocType: Asset,Journal Entry for Scrap,日記帳分錄報廢
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +83,Please pull items from Delivery Note,請送貨單拉項目
-apps/erpnext/erpnext/accounts/utils.py +349,Journal Entries {0} are un-linked,日記條目{0}都是非聯
-apps/erpnext/erpnext/config/crm.py +74,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
+apps/erpnext/erpnext/accounts/utils.py +470,Journal Entries {0} are un-linked,日記條目{0}都是非聯
+apps/erpnext/erpnext/config/crm.py +92,"Record of all communications of type email, phone, chat, visit, etc.",類型電子郵件，電話，聊天，訪問等所有通信記錄
 DocType: Manufacturer,Manufacturers used in Items,在項目中使用製造商
-apps/erpnext/erpnext/accounts/general_ledger.py +140,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
+apps/erpnext/erpnext/accounts/general_ledger.py +145,Please mention Round Off Cost Center in Company,請提及公司舍入成本中心
 DocType: Purchase Invoice,Terms,條款
+DocType: Academic Term,Term Name,術語名稱
 DocType: Buying Settings,Purchase Order Required,採購訂單為必要項
 ,Item-wise Sales History,項目明智的銷售歷史
 DocType: Expense Claim,Total Sanctioned Amount,總被制裁金額
@@ -2349,295 +2951,399 @@
 DocType: Sales Invoice Item,Delivery Note Item,送貨單項目
 DocType: Expense Claim,Task,任務
 DocType: Purchase Taxes and Charges,Reference Row #,參考列#
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +79,Batch number is mandatory for Item {0},批號是強制性的項目{0}
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +76,Batch number is mandatory for Item {0},批號是強制性的項目{0}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person.js +13,This is a root sales person and cannot be edited.,您可以通過選擇備份頻率啟動和\
+DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
+DocType: Salary Detail,"If selected, the value specified or calculated in this component will not contribute to the earnings or deductions. However, it's value can be referenced by other components that can be added or deducted. ",如果選擇此項，則在此組件中指定或計算的值不會對收入或扣除貢獻。但是，它的值可以被添加或扣除的其他組件引用。
 ,Stock Ledger,庫存總帳
 apps/erpnext/erpnext/templates/includes/cart/cart_items.html +29,Rate: {0},價格：{0}
+DocType: Company,Exchange Gain / Loss Account,兌換收益/損失帳戶
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,員工考勤
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +72,Purpose must be one of {0},目的必須是一個{0}
-apps/erpnext/erpnext/utilities/doctype/address/address.py +79,"Remove reference of customer, supplier, sales partner and lead, as it is your company address",刪除客戶，供應商，銷售夥伴和鉛的參考，因為它是你的公司地址
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +111,Fill the form and save it,填寫表格，並將其保存
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},目的必須是一個{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,社區論壇
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,實際庫存數量
+apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,實際庫存數量
+DocType: Homepage,"URL for ""All Products""",網址“所有產品”
 DocType: Leave Application,Leave Balance Before Application,離開平衡應用前
 DocType: SMS Center,Send SMS,發送短信
+DocType: Cheque Print Template,Width of amount in word,在字量的寬度
 DocType: Company,Default Letter Head,預設信頭
 DocType: Purchase Order,Get Items from Open Material Requests,從開放狀態的物料需求取得項目
+DocType: Item,Standard Selling Rate,標準銷售率
 DocType: Account,Rate at which this tax is applied,此稅適用的匯率
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再訂購數量
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +29,Current Job Openings,當前職位空缺
+apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,當前職位空缺
 DocType: Company,Stock Adjustment Account,庫存調整帳戶
-DocType: Journal Entry,Write Off,註銷項款
-DocType: Timesheet Detail,Operation ID,操作ID
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,註銷項款
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系統用戶（登錄）的標識。如果設定，這將成為的所有人力資源的預設形式。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：從{1}
-DocType: Task,depends_on,depends_on
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +24,Name of new Account. Note: Please don't create accounts for Customers and Suppliers,新帳戶的名稱。注：請不要創建帳戶的客戶和供應商
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +26,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/controllers/recurring_document.py +174,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +850,Show tax break-up,展會稅分手
-apps/erpnext/erpnext/accounts/party.py +308,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
+apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}]（＃窗體/項目/ {0}）缺貨
+apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一個日期必須大於過帳日期更大
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,展會稅分手
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},由於/參考日期不能後{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,資料輸入和輸出
+apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock條目存在對倉庫{0}，因此你不能重新分配或修改
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,沒有發現學生
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,發票發布日期
+apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,賣
 DocType: Sales Invoice,Rounded Total,整數總計
 DocType: Product Bundle,List items that form the package.,形成包列表項。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配總和應該等於100%
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,在選擇之前，甲方請選擇發布日期
+DocType: Program Enrollment,School House,學校議院
 DocType: Serial No,Out of AMC,出資產管理公司
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +35,Make Maintenance Visit,使維護訪問
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +162,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,請選擇報價
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,預訂折舊數不能超過折舊總數更大
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,使維護訪問
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,請聯絡，誰擁有碩士學位的銷售經理{0}角色的用戶
 DocType: Company,Default Cash Account,預設的現金帳戶
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司（不是客戶或供應商）的主人。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +104,Please enter 'Expected Delivery Date',請輸入「預定交付日」
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +184,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +75,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +138,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,這是基於這名學生出席
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,沒有學生
+apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多項目或全開放形式
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',請輸入「預定交付日」
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,送貨單{0}必須先取消才能取消銷貨訂單
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +77,Paid amount + Write Off Amount can not be greater than Grand Total,支付的金額+寫的抵銷金額不能大於總計
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +78,{0} is not a valid Batch Number for Item {1},{0}不是對項目的有效批號{1}
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +149,Note: There is not enough leave balance for Leave Type {0},注：沒有足夠的休假餘額請假類型{0}
+DocType: Training Event,Seminar,研討會
+DocType: Program Enrollment Fee,Program Enrollment Fee,計劃註冊費
 DocType: Item,Supplier Items,供應商項目
 DocType: Opportunity,Opportunity Type,機會型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +16,New Company,新公司
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +57,Cost Center is required for 'Profit and Loss' account {0},成本中心是必需的“損益”帳戶{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.,不正確的數字總帳條目中找到。你可能會在交易中選擇了錯誤的帳戶。
+DocType: Employee,Prefered Contact Email,首選聯繫郵箱
+DocType: Cheque Print Template,Cheque Width,支票寬度
+DocType: Selling Settings,Validate Selling Price for Item against Purchase Rate or Valuation Rate,驗證售價反對預訂價或估價RATE項目
+DocType: Program,Fee Schedule,收費表
 DocType: Hub Settings,Publish Availability,發布房源
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +105,Date of Birth cannot be greater than today.,出生日期不能大於今天。
+DocType: Company,Create Chart Of Accounts Based On,創建圖表的帳戶根據
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +107,Date of Birth cannot be greater than today.,出生日期不能大於今天。
 ,Stock Ageing,存貨帳齡分析表
-apps/erpnext/erpnext/controllers/accounts_controller.py +228,{0} '{1}' is disabled,{0}“{1}”被禁用
+apps/erpnext/erpnext/schools/doctype/student/student.py +38,Student {0} exist against student applicant {1},學生{0}存在針對學生申請{1}
+apps/erpnext/erpnext/projects/doctype/task/task.js +31,Timesheet,時間表
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity_list.js +13,Set as Open,設置為打開
+DocType: Cheque Print Template,Scanned Cheque,支票掃描
 DocType: Notification Control,Send automatic emails to Contacts on Submitting transactions.,對提交的交易，自動發送電子郵件給聯絡人。
+DocType: Timesheet,Total Billable Amount,總結算金額
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,項目3
 DocType: Purchase Order,Customer Contact Email,客戶聯絡電子郵件
 DocType: Warranty Claim,Item and Warranty Details,項目和保修細節
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品編號&gt;商品組&gt;品牌
 DocType: Sales Team,Contribution (%),貢獻（％）
-apps/erpnext/erpnext/controllers/accounts_controller.py +75,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +178,Responsibilities,職責
-apps/erpnext/erpnext/stock/doctype/item/item_list.js +14,Template,模板
+apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注：付款項將不會被創建因為“現金或銀行帳戶”未指定
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,選擇程序以獲取強制性課程。
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,選擇程序以獲取強制性課程。
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +189,Responsibilities,職責
+DocType: Expense Claim Account,Expense Claim Account,報銷賬戶
 DocType: Sales Person,Sales Person Name,銷售人員的姓名
 apps/erpnext/erpnext/accounts/doctype/c_form/c_form.py +54,Please enter atleast 1 invoice in the table,請在表中輸入至少一筆發票
-apps/erpnext/erpnext/public/js/setup_wizard.js +184,Add Users,添加用戶
-DocType: Pricing Rule,Item Group,項目群組
+apps/erpnext/erpnext/public/js/setup_wizard.js +189,Add Users,添加用戶
+DocType: POS Item Group,Item Group,項目群組
+DocType: Item,Safety Stock,安全庫存
+apps/erpnext/erpnext/projects/doctype/task/task.py +53,Progress % for a task cannot be more than 100.,為任務進度百分比不能超過100個。
 DocType: Stock Reconciliation Item,Before reconciliation,調整前
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),稅收和收費上架（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +442,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,商品稅行{0}必須有帳戶類型稅或收入或支出或課稅的
 DocType: Sales Order,Partly Billed,天色帳單
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,項{0}必須是固定資產項目
 DocType: Item,Default BOM,預設的BOM
-apps/erpnext/erpnext/setup/doctype/company/company.js +44,Please re-type company name to confirm,請確認重新輸入公司名稱
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +67,Total Outstanding Amt,總街貨量金額
-DocType: Timesheet,Total Hours,總時數
+apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,請確認重新輸入公司名稱
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,總街貨量金額
 DocType: Journal Entry,Printing Settings,列印設定
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +265,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +292,Total Debit must be equal to Total Credit. The difference is {0},借方總額必須等於貸方總額。差額為{0}
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽車
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +50,From Delivery Note,從送貨單
+DocType: Vehicle,Insurance Company,保險公司
+DocType: Asset Category Account,Fixed Asset Account,固定資產帳戶
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,變量
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,從送貨單
+DocType: Student,Student Email Address,學生的電子郵件地址
 DocType: Timesheet Detail,From Time,從時間
+apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有現貨：
 DocType: Notification Control,Custom Message,自定義訊息
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +33,Investment Banking,投資銀行業務
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +71,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +73,Cash or Bank Account is mandatory for making payment entry,製作付款分錄時，現金或銀行帳戶是強制性輸入的欄位。
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,學生地址
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +52,Student Address,學生地址
 DocType: Purchase Invoice,Price List Exchange Rate,價目表匯率
 DocType: Purchase Invoice Item,Rate,單價
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +60,Intern,實習生
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,實習生
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,地址名稱
 DocType: Stock Entry,From BOM,從BOM
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +32,Basic,基本的
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +97,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +217,Please click on 'Generate Schedule',請點擊“生成表”
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.js +63,To Date should be same as From Date for Half Day leave,日期應該是一樣的起始日期為半天假
-apps/erpnext/erpnext/config/stock.py +185,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +95,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: Assessment Code,Assessment Code,評估準則
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本的
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,{0}前的庫存交易被凍結
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',請點擊“生成表”
+apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，單位，NOS，M
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果你輸入的參考日期，參考編號是強制性的
+DocType: Bank Reconciliation Detail,Payment Document,付款單據
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +110,Date of Joining must be greater than Date of Birth,加入日期必須大於出生日期
 DocType: Salary Slip,Salary Structure,薪酬結構
 DocType: Account,Bank,銀行
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +752,Issue Material,發行材料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,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
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,您在離線模式。您將無法重新加載，直到你有網絡。
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,沒有學生團體創建的。
 DocType: Purchase Invoice Item,Serial No,序列號
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,請先輸入維護細節
+apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月還款額不能超過貸款金額較大
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,請先輸入維護細節
 DocType: Purchase Invoice,Print Language,打印語言
+DocType: Salary Slip,Total Working Hours,總的工作時間
 DocType: Stock Entry,Including items for sub assemblies,包括子組件項目
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,All Territories,所有的領土
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,輸入值必須為正
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,所有的領土
 DocType: Purchase Invoice,Items,項目
+apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,學生已經註冊。
 DocType: Fiscal Year,Year Name,年結名稱
 DocType: Process Payroll,Process Payroll,處理工資
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +221,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +234,There are more holidays than working days this month.,還有比這個月工作日更多的假期。
 DocType: Product Bundle Item,Product Bundle Item,產品包項目
 DocType: Sales Partner,Sales Partner Name,銷售合作夥伴名稱
+apps/erpnext/erpnext/hooks.py +111,Request for Quotations,索取報價
 DocType: Payment Reconciliation,Maximum Invoice Amount,最大發票額
+DocType: Student Language,Student Language,學生語言
 apps/erpnext/erpnext/config/selling.py +23,Customers,顧客
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +24,Order/Quot %,訂單/報價％
+DocType: Student Sibling,Institution,機構
+DocType: Asset,Partially Depreciated,部分貶抑
 DocType: Issue,Opening Time,開放時間
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +92,From and To dates required,需要起始和到達日期
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +46,Securities & Commodity Exchanges,證券及商品交易所
-apps/erpnext/erpnext/stock/doctype/item/item.py +628,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',測度變異的默認單位“{0}”必須是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,計算的基礎上
 DocType: Delivery Note Item,From Warehouse,從倉庫
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,不與物料清單的項目，以製造
+DocType: Assessment Plan,Supervisor Name,主管名稱
+DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
+DocType: Program Enrollment Course,Program Enrollment Course,課程註冊課程
 DocType: Purchase Taxes and Charges,Valuation and Total,估值與總計
 DocType: Tax Rule,Shipping City,航運市
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,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 +18,Cash Flow from Operations,運營現金流
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +27,Default Address Template cannot be deleted,預設地址模板不能被刪除
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,運營現金流
 DocType: Sales Invoice,Shipping Rule,送貨規則
 DocType: Manufacturer,Limited to 12 characters,限12個字符
 DocType: Journal Entry,Print Heading,列印標題
-DocType: Maintenance Schedule,Maintenance Manager,維護經理
-apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +54,Total cannot be zero,總計不能為零
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +57,Total cannot be zero,總計不能為零
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +16,'Days Since Last Order' must be greater than or equal to zero,“自從最後訂購日”必須大於或等於零
+DocType: Process Payroll,Payroll Frequency,工資頻率
 DocType: Asset,Amended From,從修訂
-apps/erpnext/erpnext/public/js/setup_wizard.js +295,Raw Material,原料
 DocType: Leave Application,Follow via Email,透過電子郵件追蹤
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +53,Plants and Machineries,廠房和機械設備
 DocType: Purchase Taxes and Charges,Tax Amount After Discount Amount,稅額折後金額
-apps/erpnext/erpnext/accounts/doctype/account/account.py +204,Child account exists for this account. You can not delete this account.,此帳戶存在子帳戶。您無法刪除此帳戶。
+DocType: Daily Work Summary Settings,Daily Work Summary Settings,每日工作總結設置
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +240,Currency of the price list {0} is not similar with the selected currency {1},價格表{0}的貨幣不與所選貨幣類似{1}
+DocType: Payment Entry,Internal Transfer,內部轉賬
+apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +485,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +336,Please select Posting Date first,請選擇發布日期第一
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
+apps/erpnext/erpnext/stock/get_item_details.py +516,No default BOM exists for Item {0},項目{0}不存在預設的的BOM
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,請選擇發布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,開業日期應該是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,發揚
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,與現有的交易成本中心，不能轉換為總賬
 DocType: Department,Days for which Holidays are blocked for this department.,天的假期被封鎖這個部門。
 ,Produced,生產
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +121,Created Salary Slips,創建工資單
 DocType: Item,Item Code for Suppliers,對於供應商產品編號
 DocType: Issue,Raised By (Email),由（電子郵件）提出
-DocType: Mode of Payment,General,一般
-apps/erpnext/erpnext/public/js/setup_wizard.js +166,Attach Letterhead,附加信
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +338,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
-apps/erpnext/erpnext/public/js/setup_wizard.js +217,"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: Training Event,Trainer Name,培訓師姓名
+apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,附加信
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最後溝通
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',不能抵扣當類別為“估值”或“估值及總'
+apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款與發票
 DocType: Journal Entry,Bank Entry,銀行分錄
 DocType: Authorization Rule,Applicable To (Designation),適用於（指定）
 apps/erpnext/erpnext/templates/generators/item.html +62,Add to Cart,添加到購物車
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.js +28,Group By,集團通過
-apps/erpnext/erpnext/config/accounts.py +262,Enable / disable currencies.,啟用／禁用的貨幣。
+DocType: Guardian,Interests,興趣
+apps/erpnext/erpnext/config/accounts.py +267,Enable / disable currencies.,啟用／禁用的貨幣。
 DocType: Production Planning Tool,Get Material Request,獲取材質要求
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +109,Postal Expenses,郵政費用
-apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娛樂休閒
 DocType: Quality Inspection,Item Serial No,產品序列號
-apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +56,Total Present,總現
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立員工檔案
+apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,總現
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,會計報表
-apps/erpnext/erpnext/public/js/setup_wizard.js +299,Hour,小時
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +141,"Serialized Item {0} cannot be updated \
-					using Stock Reconciliation","系列化項目{0}不能被更新\
-使用庫存調整"
+apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小時
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +29,New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt,新的序列號不能有倉庫。倉庫必須由存貨分錄或採購入庫單進行設定
 DocType: Lead,Lead Type,引線型
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +122,You are not authorized to approve leaves on Block Dates,您無權批准葉子座日期
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +362,All these items have already been invoiced,所有這些項目已開具發票
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +133,You are not authorized to approve leaves on Block Dates,在限制的日期，您無權批准休假
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +380,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: Item,Default Material Request Type,默認材料請求類型
 DocType: Shipping Rule,Shipping Rule Conditions,送貨規則條件
 DocType: BOM Replace Tool,The new BOM after replacement,更換後的新物料清單
-apps/erpnext/erpnext/accounts/page/pos/pos.js +639,Point of Sale,銷售點
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,銷售點
+DocType: Payment Entry,Received Amount,收金額
+DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",創建全量，訂單已經忽略數量
 DocType: Account,Tax,稅
+apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未標記
 DocType: Production Planning Tool,Production Planning Tool,生產規劃工具
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +150,"Batched Item {0} cannot be updated using Stock Reconciliation, instead use Stock Entry",批量項目{0}無法使用庫存調節更新，而是使用庫存條目
 DocType: Quality Inspection,Report Date,報告日期
+DocType: Student,Middle Name,中間名字
 DocType: C-Form,Invoices,發票
+DocType: Batch,Source Document Name,源文檔名稱
 DocType: Job Opening,Job Title,職位
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +373,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,創建用戶
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生產必須大於0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,訪問報告維修電話。
-DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,相對於訂單量允許接受或交付的變動百分比額度。例如：如果你下定100個單位量，而你的許可額度是10%，那麼你可以收到最多110個單位量。
-DocType: POS Profile,Customer Group,客戶群組
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +185,Expense account is mandatory for item {0},交際費是強制性的項目{0}
-DocType: Item,Website Description,網站簡介
-apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +41,Net Change in Equity,在淨資產收益變化
+DocType: POS Customer Group,Customer Group,客戶群組
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +108,New Batch ID (Optional),新批號（可選）
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},交際費是強制性的項目{0}
+DocType: BOM,Website Description,網站簡介
+apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在淨資產收益變化
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,請取消採購發票{0}第一
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",電子郵件地址必須是唯一的，已經存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期時間
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,收據
 ,Sales Register,銷售登記
+DocType: Daily Work Summary Settings Company,Send Emails At,發送電子郵件在
 DocType: Quotation,Quotation Lost Reason,報價遺失原因
-DocType: Address,Plant,廠
+apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,選擇您的域名
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},交易參考編號{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,無內容可供編輯
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +107,Summary for this month and pending activities,本月和待活動總結
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活動總結
 DocType: Customer Group,Customer Group Name,客戶群組名稱
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Please remove this Invoice {0} from C-Form {1},請刪除此發票{0}從C-表格{1}
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,還沒有客戶！
+apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,現金流量表
+apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},貸款額不能超過最高貸款額度{0}
+apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,執照
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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 +644,Get Items,找項目
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +210,Please enter Write Off Account,請輸入核銷帳戶
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +218,Please enter Write Off Account,請輸入核銷帳戶
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最後訂購日期
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +41,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
-DocType: C-Form,C-Form,C-表
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帳戶{0}不屬於公司{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列號與交貨單不匹配
+DocType: Student,Guardian Details,衛詳細
+apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,馬克出席了多個員工
+DocType: Vehicle,Chassis No,底盤無
 DocType: Payment Request,Initiated,啟動
 DocType: Production Order,Planned Start Date,計劃開始日期
 DocType: Serial No,Creation Document Type,創建文件類型
 DocType: Leave Type,Is Encash,為兌現
-DocType: Purchase Invoice,Mobile No,手機號碼
 DocType: Leave Allocation,New Leaves Allocated,新的排假
-apps/erpnext/erpnext/controllers/trends.py +265,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
+apps/erpnext/erpnext/controllers/trends.py +269,Project-wise data is not available for Quotation,項目明智的數據不適用於報價
 DocType: Project,Expected End Date,預計結束日期
+DocType: Budget Account,Budget Amount,預算額
 DocType: Appraisal Template,Appraisal Template Title,評估模板標題
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +101,Commercial,商業
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +38,From Date {0} for Employee {1} cannot be before employee's joining Date {2},從日期{0}為僱員{1}不能僱員的接合日期之前{2}
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +107,Commercial,商業
+DocType: Payment Entry,Account Paid To,賬戶付至
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +24,Parent Item {0} must not be a Stock Item,父項{0}不能是庫存產品
 apps/erpnext/erpnext/config/selling.py +57,All Products or Services.,所有的產品或服務。
+DocType: Expense Claim,More Details,更多詳情
 DocType: Supplier Quotation,Supplier Address,供應商地址
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +128,{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5},{0}預算帳戶{1}對{2} {3}是{4}。這將超過{5}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃賬戶的類型必須是&#39;固定資產&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,輸出數量
-apps/erpnext/erpnext/config/accounts.py +278,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +30,Series is mandatory,系列是強制性的
+apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,規則用於計算銷售運輸量
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,系列是強制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服務
+DocType: Student Sibling,Student ID,學生卡
+apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,活動類型的時間記錄
 DocType: Tax Rule,Sales,銷售
 DocType: Stock Entry Detail,Basic Amount,基本金額
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +165,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
-DocType: Leave Allocation,Unused leaves,未使用的葉子
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +155,Cr,鉻
+DocType: Training Event,Exam,考試
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},倉庫需要現貨產品{0}
+DocType: Leave Allocation,Unused leaves,未使用的休假
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,鉻
 DocType: Tax Rule,Billing State,計費狀態
-apps/erpnext/erpnext/accounts/doctype/asset/asset.js +250,Transfer,轉讓
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +825,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,轉讓
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1}未連結夥伴帳戶{2}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),取得爆炸BOM（包括子組件）
 DocType: Authorization Rule,Applicable To (Employee),適用於（員工）
-apps/erpnext/erpnext/controllers/accounts_controller.py +115,Due Date is mandatory,截止日期是強制性的
-apps/erpnext/erpnext/controllers/item_variant.py +51,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
+apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,截止日期是強制性的
+apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量屬性{0}不能為0
 DocType: Journal Entry,Pay To / Recd From,支付/ 接收
 DocType: Naming Series,Setup Series,設置系列
 DocType: Payment Reconciliation,To Invoice Date,要發票日期
 DocType: Supplier,Contact HTML,聯繫HTML
 ,Inactive Customers,不活躍的客戶
 DocType: 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 +120,Customer {0} does not exist,客戶{0}不存在
-DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +587,Product Bundle,產品包
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +185,Row {0}: Invalid reference {1},行{0}：無效參考{1}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定價規則被如何應用？
+DocType: Stock Entry,Delivery Note No,送貨單號
+DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",如果選中，只有購買最終的原料材料的請求將被包含在材料的要求。否則，父件材料的要求將被創建
+DocType: Cheque Print Template,Message to show,信息顯示
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,產品包
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}：無效參考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,採購稅負和費用模板
 DocType: Upload Attendance,Download Template,下載模板
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +61,{0} {1}: Either debit or credit amount is required for {2},{0} {1}：無論是借方或貸方金額需要{2}
 DocType: GL Entry,Remarks,備註
+DocType: Payment Entry,Account Paid From,帳戶支付從
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料產品編號
 DocType: Journal Entry,Write Off Based On,核銷的基礎上
-apps/erpnext/erpnext/config/stock.py +122,Installation record for a Serial No.,對於一個序列號安裝記錄
-apps/erpnext/erpnext/controllers/recurring_document.py +187,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
-apps/erpnext/erpnext/public/js/queries.js +39,Please specify a,請指定一個
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使鉛
+DocType: Stock Settings,Show Barcode Field,顯示條形碼域
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,發送電子郵件供應商
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工資已經處理了與{0}和{1}，留下申請期之間不能在此日期範圍內的時期。
+apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,對於一個序列號安裝記錄
+DocType: Guardian Interest,Guardian Interest,衛利息
+apps/erpnext/erpnext/config/hr.py +177,Training,訓練
+DocType: Timesheet,Employee Detail,員工詳細信息
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1電子郵件ID
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +56,Guardian1 Email ID,Guardian1電子郵件ID
+apps/erpnext/erpnext/controllers/recurring_document.py +190,Next Date's day and Repeat on Day of Month must be equal,下一個日期的一天，重複上月的天必須相等
+apps/erpnext/erpnext/config/website.py +11,Settings for website homepage,對網站的主頁設置
 DocType: Offer Letter,Awaiting Response,正在等待回應
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,以上
+apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},無效的屬性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,如果非標準應付賬款提到
 DocType: Salary Slip,Earning & Deduction,收入及扣除
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +77,Account {0} cannot be a Group,帳戶{0}不能為集團
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +31,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +107,Negative Valuation Rate is not allowed,負面評價率是不允許的
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可選。此設置將被應用於過濾各種交易進行。
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,負面評價率是不允許的
 DocType: Holiday List,Weekly Off,每週關閉
 DocType: Fiscal Year,"For e.g. 2012, 2012-13",對於例如2012、2012-13
-apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +39,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +96,Provisional Profit / Loss (Credit),臨時溢利/（虧損）（信用）
 DocType: Sales Invoice,Return Against Sales Invoice,射向銷售發票
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +32,Item 5,項目5
 DocType: Serial No,Creation Time,創作時間
 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,每月考勤表
+DocType: Production Order Item,Production Order Item,生產訂單項目
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,沒有資料
-apps/erpnext/erpnext/controllers/stock_controller.py +176,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +626,Get Items from Product Bundle,從產品包取得項目
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +80,Account {0} is inactive,帳戶{0}為未啟用
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,報廢資產成本
+apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是強制性的項目{2}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,從產品包取得項目
+DocType: Asset,Straight Line,直線
+DocType: Project User,Project User,項目用戶
 DocType: GL Entry,Is Advance,為進
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +21,Attendance From Date and Attendance To Date is mandatory,考勤起始日期和出席的日期，是強制性的
-apps/erpnext/erpnext/controllers/buying_controller.py +148,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/controllers/buying_controller.py +146,Please enter 'Is Subcontracted' as Yes or No,請輸入'轉包' YES或NO
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
+apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +29,Last Communication Date,最後通訊日期
 DocType: Sales Team,Contact No.,聯絡電話
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +68,'Profit and Loss' type account {0} not allowed in Opening Entry,“損益”帳戶類型{0}不開放允許入境
+DocType: Bank Reconciliation,Payment Entries,付款項
+DocType: Production Order,Scrap Warehouse,廢料倉庫
+DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+DocType: Production Order,Check if material transfer entry is not required,檢查是否不需要材料轉移條目
+DocType: Program Enrollment Tool,Get Students From,讓學生從
 DocType: Hub Settings,Seller Country,賣家國家
-apps/erpnext/erpnext/config/learn.py +278,Publish Items on Website,公佈於網頁上的項目
+apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公佈於網頁上的項目
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,一群學生在分批
 DocType: Authorization Rule,Authorization Rule,授權規則
 DocType: Sales Invoice,Terms and Conditions Details,條款及細則詳情
-apps/erpnext/erpnext/templates/generators/item.html +86,Specifications,產品規格
+apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,產品規格
 DocType: Sales Taxes and Charges Template,Sales Taxes and Charges Template,營業稅金及費用套版
+apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +68,Total (Credit),總（信用）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +10,Apparel & Accessories,服裝及配飾
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +67,Number of Order,訂購數量
 DocType: Item Group,HTML / Banner that will show on the top of product list.,HTML／橫幅，將顯示在產品列表的頂部。
@@ -2648,255 +3354,309 @@
 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 +92,Commission on Sales,銷售佣金
 DocType: Offer Letter Term,Value / Description,值/說明
+apps/erpnext/erpnext/controllers/accounts_controller.py +575,"Row #{0}: Asset {1} cannot be submitted, it is already {2}",行＃{0}：資產{1}無法提交，這已經是{2}
 DocType: Tax Rule,Billing Country,結算國家
-DocType: Production Order,Expected Delivery Date,預計交貨日期
-apps/erpnext/erpnext/accounts/general_ledger.py +127,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
+DocType: Purchase Order Item,Expected Delivery Date,預計交貨日期
+apps/erpnext/erpnext/accounts/general_ledger.py +132,Debit and Credit not equal for {0} #{1}. Difference is {2}.,借貸{0}＃不等於{1}。區別是{2}。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +96,Entertainment Expenses,娛樂費用
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +192,Sales Invoice {0} must be cancelled before cancelling this Sales Order,銷售發票{0}必須早於此銷售訂單之前取消
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +47,Make Material Request,製作材料要求
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom_item_preview.html +20,Open Item {0},打開項目{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +205,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 +60,Age,年齡
 DocType: Sales Invoice Timesheet,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 +60,Applications for leave.,申請許可。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +202,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account with existing transaction can not be deleted,帳戶與現有的交易不能被刪除
+DocType: Vehicle,Last Carbon Check,最後檢查炭
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +100,Legal Expenses,法律費用
 DocType: Purchase Invoice,Posting Time,登錄時間
-DocType: Sales Order,% Amount Billed,（％）金額已開立帳單
+DocType: Timesheet,% Amount Billed,（％）金額已開立帳單
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +116,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 +117,No Item with Serial No {0},沒有序號{0}的品項
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +95,Open Notifications,打開通知
+apps/erpnext/erpnext/stock/get_item_details.py +125,No Item with Serial No {0},沒有序號{0}的品項
+DocType: Email Digest,Open Notifications,打開通知
+DocType: Payment Entry,Difference Amount (Company Currency),差異金額（公司幣種）
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +77,Direct Expenses,直接費用
-apps/erpnext/erpnext/controllers/recurring_document.py +210,"{0} is an invalid email address in 'Notification \
+apps/erpnext/erpnext/controllers/recurring_document.py +213,"{0} is an invalid email address in 'Notification \
 						Email Address'",在“通知\電子郵件地址”中，{0}是無效的電子郵件地址
 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 +117,Travel Expenses,差旅費
 DocType: Maintenance Visit,Breakdown,展開
-apps/erpnext/erpnext/controllers/accounts_controller.py +634,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 +54,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +60,Successfully deleted all transactions related to this company!,成功刪除與該公司相關的所有交易！
+apps/erpnext/erpnext/controllers/accounts_controller.py +687,Account: {0} with currency: {1} can not be selected,帳號：{0}幣種：{1}不能選擇
+apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},帳戶{0}：父帳戶{1}不屬於公司：{2}
+DocType: Program Enrollment Tool,Student Applicants,學生申請
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,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 +56,Probation,緩刑
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Payment of salary for the month {0} and year {1},{1}年{0}月的薪資支付
+DocType: Program Enrollment,Enrollment Date,報名日期
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,緩刑
+apps/erpnext/erpnext/config/hr.py +115,Salary Components,工資組件
+DocType: Program Enrollment Tool,New Academic Year,新學年
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,返回/信用票據
 DocType: Stock Settings,Auto insert Price List rate if missing,自動插入價目表率，如果丟失
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +25,Total Paid Amount,總支付金額
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,總支付金額
 DocType: Production Order Item,Transferred Qty,轉讓數量
 apps/erpnext/erpnext/config/learn.py +11,Navigating,導航
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +144,Planning,規劃
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +14,Issued,發行
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +150,Planning,規劃
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +16,Issued,發行
 DocType: Project,Total Billing Amount (via Time Logs),總結算金額（經由時間日誌）
-apps/erpnext/erpnext/public/js/setup_wizard.js +301,We sell this Item,我們賣這種產品
+apps/erpnext/erpnext/public/js/setup_wizard.js +306,We sell this Item,我們賣這種產品
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +68,Supplier Id,供應商編號
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +212,Quantity should be greater than 0,量應大於0
+DocType: Payment Request,Payment Gateway Details,支付網關細節
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +235,Quantity should be greater than 0,量應大於0
 DocType: Journal Entry,Cash Entry,現金分錄
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +17,Child nodes can be only created under 'Group' type nodes,子節點可以在&#39;集團&#39;類型的節點上創建
+DocType: Academic Year,Academic Year Name,學年名稱
 DocType: Sales Partner,Contact Desc,聯絡倒序
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",葉似漫不經心，生病等類型
 DocType: Email Digest,Send regular summary reports via Email.,使用電子郵件發送定期匯總報告。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},請報銷類型設置默認帳戶{0}
+DocType: Assessment Result,Student Name,學生姓名
 DocType: Brand,Item Manager,項目經理
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,應付職工薪酬
 DocType: Buying Settings,Default Supplier Type,預設的供應商類別
 DocType: Production Order,Total Operating Cost,總營運成本
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +150,Note: Item {0} entered multiple times,注：項目{0}多次輸入
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +168,Note: Item {0} entered multiple times,注：項目{0}多次輸入
 apps/erpnext/erpnext/config/selling.py +41,All Contacts.,所有聯絡人。
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Company Abbreviation,公司縮寫
-DocType: GL Entry,Party Type,黨的類型
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +78,Raw material cannot be same as main Item,原料不能同主品相
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +136,User {0} does not exist,用戶{0}不存在
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +92,Raw material cannot be same as main Item,原料不能同主品相
 DocType: Item Attribute Value,Abbreviation,縮寫
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +171,Payment Entry already exists,付款項目已存在
 apps/erpnext/erpnext/setup/doctype/authorization_control/authorization_control.py +36,Not authroized since {0} exceeds limits,不允許因為{0}超出範圍
 apps/erpnext/erpnext/config/hr.py +110,Salary template master.,薪資套版主檔。
 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,購物車稅收規則設定
+apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +63,Set Tax Rule for shopping cart,購物車稅收規則設定
 DocType: Purchase Invoice,Taxes and Charges Added,稅費上架
 ,Sales Funnel,銷售漏斗
-apps/erpnext/erpnext/hr/doctype/salary_component/salary_component.py +25,Abbreviation is mandatory,縮寫是強制性的
+apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,縮寫是強制性的
+DocType: Project,Task Progress,任務進度
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,車
 ,Qty to Transfer,轉移數量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,行情到引線或客戶。
 DocType: Stock Settings,Role Allowed to edit frozen stock,此角色可以編輯凍結的庫存
 ,Territory Target Variance Item Group-Wise,地域內跨項目群組間的目標差異
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +99,All Customer Groups,所有客戶群組
-apps/erpnext/erpnext/controllers/accounts_controller.py +595,{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 +38,Tax Template is mandatory.,稅務模板是強制性的。
-apps/erpnext/erpnext/accounts/doctype/account/account.py +48,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +105,All Customer Groups,所有客戶群組
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +114,Accumulated Monthly,每月累計
+apps/erpnext/erpnext/controllers/accounts_controller.py +648,{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 +39,Tax Template is mandatory.,稅務模板是強制性的。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +49,Account {0}: Parent account {1} does not exist,帳戶{0}：父帳戶{1}不存在
 DocType: Purchase Invoice Item,Price List Rate (Company Currency),價格列表費率（公司貨幣）
+DocType: Products Settings,Products Settings,產品設置
 DocType: Account,Temporary,臨時
-DocType: Address,Preferred Billing Address,偏好的帳單地址
-DocType: Monthly Distribution Percentage,Percentage Allocation,百分比分配
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +84,Secretary,秘書
+DocType: Program,Courses,培訓班
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +90,Secretary,秘書
 DocType: Global Defaults,"If disable, 'In Words' field will not be visible in any transaction",如果禁用“，在詞”字段不會在任何交易可見
 DocType: Serial No,Distinct unit of an Item,一個項目的不同的單元
 DocType: Pricing Rule,Buying,採購
 DocType: HR Settings,Employee Records to be created by,員工紀錄的創造者
 DocType: POS Profile,Apply Discount On,申請折扣
-,Reqd By Date,REQD按日期
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +138,Creditors,債權人
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +95,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
+DocType: Assessment Plan,Assessment Name,評估名稱
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +96,Row # {0}: Serial No is mandatory,行＃{0}：序列號是必需的
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,項目智者稅制明細
+apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,研究所縮寫
 ,Item-wise Price List Rate,全部項目的價格表
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +859,Supplier Quotation,供應商報價
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,供應商報價
 DocType: Quotation,In Words will be visible once you save the Quotation.,報價一被儲存，就會顯示出來。
-apps/erpnext/erpnext/stock/doctype/item/item.py +454,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
+apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},數量（{0}）不能是行{1}中的分數
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收費
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},條碼{0}已經用在項目{1}
 DocType: Lead,Add to calendar on this date,在此日期加到日曆
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,增加運輸成本的規則。
-apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +40,Upcoming Events,活動預告
+DocType: Item,Opening Stock,打開股票
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +20,Customer is required,客戶是必需的
 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 +195,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 +57,Total Variance,總方差
 DocType: Accounts Settings,"If enabled, the system will post accounting entries for inventory automatically.",如果啟用，系統將自動為發布庫存會計分錄。
-apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +15,Brokerage,佣金
-DocType: Address,Postal Code,郵政編碼
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +232,Attendance for employee {0} is already marked for this day,考勤員工{0}已標記為這一天
 DocType: Production Order Operation,"in Minutes
 Updated via 'Time Log'","在分
 經由“時間日誌”更新"
 DocType: Customer,From Lead,從鉛
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,發布生產訂單。
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,選擇會計年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,POS Profile required to make POS Entry,所需的POS資料，使POS進入
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,選擇會計年度...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,所需的POS資料，使POS進入
 DocType: Hub Settings,Name Token,名令牌
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,標準銷售
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +135,Atleast one warehouse is mandatory,至少要有一間倉庫
-DocType: Serial No,Out of Warranty,超出保修期
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +137,Atleast one warehouse is mandatory,至少要有一間倉庫
 DocType: BOM Replace Tool,Replace,更換
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +330,{0} against Sales Invoice {1},{0}針對銷售發票{1}
+DocType: Production Order,Unstopped,通暢了
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}針對銷售發票{1}
 DocType: Request for Quotation Item,Project Name,專案名稱
-DocType: Supplier,Mention if non-standard receivable account,提到如果不規範應收賬款
+DocType: Customer,Mention if non-standard receivable account,提到如果不規範應收賬款
 DocType: Journal Entry Account,If Income or Expense,如果收入或支出
 DocType: Stock Ledger Entry,Stock Value Difference,庫存價值差異
-apps/erpnext/erpnext/config/learn.py +239,Human Resource,人力資源
+apps/erpnext/erpnext/config/learn.py +234,Human Resource,人力資源
 DocType: Payment Reconciliation Payment,Payment Reconciliation Payment,付款方式付款對賬
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +36,Tax Assets,所得稅資產
 DocType: BOM Item,BOM No,BOM No.
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +133,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +160,Journal Entry {0} does not have account {1} or already matched against other voucher,日記條目{0}沒有帳號{1}或已經匹配其他憑證
 DocType: Item,Moving Average,移動平均線
 DocType: BOM 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倍的
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +44,Electronic Equipments,電子設備
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +49,Leaves must be allocated in multiples of 0.5,休假必須安排成0.5倍的
 DocType: Production Order,Operation Cost,運營成本
 apps/erpnext/erpnext/config/hr.py +29,Upload attendance from a .csv file,從。csv文件上傳考勤
 apps/erpnext/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py +39,Outstanding Amt,優秀的金額
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,為此銷售人員設定跨項目群組間的目標。
 DocType: Stock Settings,Freeze Stocks Older Than [Days],凍結早於[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.",如果兩個或更多的定價規則是基於上述條件發現，優先級被應用。優先權是一個介於0到20，而預設值是零（空）。數字越大，意味著其將優先考慮是否有與相同條件下多個定價規則。
+apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：資產是必須的固定資產購買/銷售
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果兩個或更多的定價規則是基於上述條件發現，優先級被應用。優先權是一個介於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.,允許以下用戶批准許可申請的區塊天。
 apps/erpnext/erpnext/config/hr.py +132,Types of Expense Claim.,報銷的類型。
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
+apps/erpnext/erpnext/controllers/selling_controller.py +173,Selling rate for item {0} is lower than its {1}. Selling rate should be atleast {2},項目{0}的銷售價格低於其{1}。售價應至少為{2}
 DocType: Item,Taxes,稅
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +301,Paid and Not Delivered,支付和未送達
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +314,Paid and Not Delivered,支付和未送達
 DocType: Project,Default Cost Center,預設的成本中心
-DocType: Purchase Invoice,End Date,結束日期
+DocType: Bank Guarantee,End Date,結束日期
 apps/erpnext/erpnext/config/stock.py +7,Stock Transactions,庫存交易明細
+DocType: Budget,Budget Accounts,預算科目
 DocType: Employee,Internal Work History,內部工作經歷
+DocType: Depreciation Schedule,Accumulated Depreciation Amount,累計折舊額
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +42,Private Equity,私募股權投資
+DocType: Employee Loan,Fully Disbursed,全額支付
 DocType: Maintenance Visit,Customer Feedback,客戶反饋
 DocType: Account,Expense,費用
-DocType: Sales Invoice,Exhibition,展覽
-apps/erpnext/erpnext/utilities/doctype/address/address.py +77,"Company is mandatory, as it is your company address",公司是強制性的，因為它是你的公司地址
+apps/erpnext/erpnext/schools/doctype/assessment_result/assessment_result.js +34,Score cannot be greater than Maximum Score,分數不能超過最高得分更大
 DocType: Item Attribute,From Range,從範圍
-apps/erpnext/erpnext/stock/utils.py +99,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +34,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,網域
-apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Jobs,工作
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +93,Syntax error in formula or condition: {0},式或條件語法錯誤：{0}
+DocType: Daily Work Summary Settings Company,Daily Work Summary Settings Company,每日工作總結公司的設置
+apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,項目{0}被忽略，因為它不是一個庫存項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,Submit this Production Order for further processing.,提交此生產訂單進行進一步的處理。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一個特定的交易不適用於定價規則，所有適用的定價規則應該被禁用。
+DocType: Assessment Group,Parent Assessment Group,家長評估小組
 ,Sales Order Trends,銷售訂單趨勢
 DocType: Employee,Held On,舉行
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +33,Production Item,生產項目
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +36,Production Item,生產項目
 ,Employee Information,僱員資料
-apps/erpnext/erpnext/public/js/setup_wizard.js +227,Rate (%),率（ ％ ）
 DocType: Stock Entry Detail,Additional Cost,額外費用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,財政年度年結日
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",是冷凍的帳戶。要禁止該帳戶創建/編輯事務，你需要角色
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +763,Make Supplier Quotation,讓供應商報價
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,讓供應商報價
 DocType: Quality Inspection,Incoming,來
 DocType: BOM,Materials Required (Exploded),所需材料（分解）
-apps/erpnext/erpnext/public/js/setup_wizard.js +185,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +100,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +42,Casual Leave,事假
-DocType: Batch,Batch ID,批次ID
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +350,Note: {0},注： {0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",將用戶添加到您的組織，除了自己
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +66,Posting Date cannot be future date,發布日期不能是未來的日期
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +101,Row # {0}: Serial No {1} does not match with {2} {3},行＃{0}：序列號{1}不相匹配{2} {3}
 ,Delivery Note Trends,送貨單趨勢
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +103,This Week's Summary,本週的總結
-apps/erpnext/erpnext/accounts/general_ledger.py +106,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +113,This Week's Summary,本週的總結
+,In Stock Qty,庫存數量
+apps/erpnext/erpnext/accounts/general_ledger.py +111,Account: {0} can only be updated via Stock Transactions,帳號：{0}只能通過股票的交易進行更新
+DocType: Program Enrollment,Get Courses,獲取課程
 DocType: GL Entry,Party,黨
 DocType: Sales Order,Delivery Date,交貨日期
 DocType: Opportunity,Opportunity Date,機會日期
 DocType: Purchase Receipt,Return Against Purchase Receipt,採購入庫的退貨
+DocType: Request for Quotation Item,Request for Quotation Item,詢價項目
 DocType: Purchase Order,To Bill,發票待輸入
 DocType: Material Request,% Ordered,% 已訂購
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +59,Piecework,計件工作
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +69,Avg. Buying Rate,平均。買入價
+DocType: Purchase Invoice,"Enter Email Address separated by commas, invoice will be mailed automatically on particular date",用逗號分隔的輸入電子郵件地址，發票就會自動在特定日期郵寄
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +65,Piecework,計件工作
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +72,Avg. Buying Rate,平均。買入價
 DocType: Task,Actual Time (in Hours),實際時間（小時）
 DocType: Employee,History In Company,公司歷史
-apps/erpnext/erpnext/config/learn.py +112,Newsletters,簡訊
-DocType: Address,Shipping,航運
+apps/erpnext/erpnext/config/learn.py +107,Newsletters,簡訊
 DocType: Stock Ledger Entry,Stock Ledger Entry,庫存總帳條目
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客戶&gt;客戶群&gt;領土
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一項目已進入多次
 DocType: Department,Leave Block List,休假區塊清單
-DocType: Customer,Tax ID,稅號
+DocType: Sales Invoice,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,銷售合作夥伴及佣金
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有項目為零，可能是你應該“基於分佈式費用”改變
 DocType: Opportunity,To Discuss,為了討論
+apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}單位{1}在{2}完成此交易所需。
 DocType: SMS Settings,SMS Settings,簡訊設定
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +69,Temporary Accounts,臨時帳戶
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展開項目
 DocType: Account,Auditor,核數師
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +10,Return,退貨
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,生產{0}項目
+DocType: Cheque Print Template,Distance from top edge,從頂邊的距離
+apps/erpnext/erpnext/stock/get_item_details.py +297,Price List {0} is disabled or does not exist,價格表{0}禁用或不存在
+DocType: Purchase Invoice,Return,退貨
 DocType: Production Order Operation,Production Order Operation,生產訂單操作
 DocType: Pricing Rule,Disable,關閉
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,付款方式需要進行付款
 DocType: Project Task,Pending Review,待審核
+apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",資產{0}不能被廢棄，因為它已經是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),總費用報銷（通過費用報銷）
-apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +69,Customer Id,客戶ID
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +176,Mark Absent,馬克缺席
+apps/erpnext/erpnext/accounts/report/sales_register/sales_register.py +70,Customer Id,客戶ID
+apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,馬克缺席
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的貨幣{1}應等於所選貨幣{2}
 DocType: Journal Entry Account,Exchange Rate,匯率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +471,Sales Order {0} is not submitted,銷售訂單{0}未提交
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +857,Add items from,新增項目從
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +97,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,銷售訂單{0}未提交
+DocType: Homepage,Tag Line,標語
+DocType: Fee Component,Fee Component,收費組件
+apps/erpnext/erpnext/config/hr.py +195,Fleet Management,車隊的管理
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,新增項目從
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},倉庫{0}：父帳戶{1}不屬於該公司{2}
+apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有評估標準的權重總數要達到100％
 DocType: BOM,Last Purchase Rate,最後預訂價
 DocType: Account,Asset,財富
 DocType: Project Task,Task ID,任務ID
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +87,Stock cannot exist for Item {0} since has variants,股票可以為項目不存在{0}，因為有變種
+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 +141,Warehouse {0} does not exist,倉庫{0}不存在
+DocType: Training Event,Contact Number,聯繫電話
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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,所選項目不能批
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所選項目不能批
+apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到項{0}，這是需要做用於記帳條目{1} {2}。如果該項目交易作為樣本項目{1}，請提及的是，在{1}項目表。否則，請創建傳入股票的交易在項目記錄的項目或提估價率，然後嘗試submiting /取消此條
 DocType: Delivery Note,% of materials delivered against this Delivery Note,針對這張送貨單物料已交貨的百分比(%)
 DocType: Project,Customer Details,客戶詳細資訊
 DocType: Employee,Reports to,隸屬於
+,Unpaid Expense Claim,未付費用報銷
 DocType: SMS Settings,Enter url parameter for receiver nos,輸入URL參數的接收器號
 DocType: Payment Entry,Paid Amount,支付的金額
+DocType: Assessment Plan,Supervisor,監
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,線上
 ,Available Stock for Packing Items,可用庫存包裝項目
 DocType: Item Variant,Item Variant,項目變
-apps/erpnext/erpnext/utilities/doctype/address_template/address_template.py +16,Setting this Address Template as default as there is no other default,設置此地址模板為預設當沒有其它的預設值
-apps/erpnext/erpnext/accounts/doctype/account/account.py +117,"Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'",帳戶餘額已歸為借方帳戶，不允許設為信用帳戶
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +74,Quality Management,品質管理
-apps/erpnext/erpnext/buying/doctype/purchase_common/purchase_common.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
+DocType: Assessment Result Tool,Assessment Result Tool,評價結果工具
+DocType: BOM Scrap Item,BOM Scrap Item,BOM項目廢料
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,提交的訂單不能被刪除
+apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,品質管理
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,項{0}已被禁用
+DocType: Employee Loan,Repay Fixed Amount per Period,償還每期固定金額
+apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},請輸入項目{0}的量
 DocType: Employee 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/hr/doctype/appraisal/appraisal.py +20,Goals cannot be empty,目標不能為空
 DocType: Item Group,Parent Item Group,父項目群組
 apps/erpnext/erpnext/projects/doctype/activity_cost/activity_cost.py +21,{0} for {1},{0}for {1}
-apps/erpnext/erpnext/setup/doctype/company/company.js +20,Cost Centers,成本中心
 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: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
+DocType: Purchase Invoice Item,Allow Zero Valuation Rate,允許零估值
+DocType: Training Event Employee,Invited,邀請
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +172,Multiple active Salary Structures found for employee {0} for the given dates,發現員工{0}對於給定的日期多個活動薪金結構
 DocType: Opportunity,Next Contact,下一頁聯絡人
-apps/erpnext/erpnext/config/accounts.py +272,Setup Gateway accounts.,設置網關帳戶。
+apps/erpnext/erpnext/config/accounts.py +277,Setup Gateway accounts.,設置網關帳戶。
 DocType: Employee,Employment Type,就業類型
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +40,Fixed Assets,固定資產
+DocType: Payment Entry,Set Exchange Gain / Loss,設置兌換收益/損失
 ,Cash Flow,現金周轉
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +88,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +92,Application period cannot be across two alocation records,申請期間不能跨兩個alocation記錄
 DocType: Item Group,Default Expense Account,預設費用帳戶
-DocType: Employee,Notice (days),通告（天）
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,學生的電子郵件ID
 DocType: Tax Rule,Sales Tax Template,銷售稅模板
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,選取要保存發票
 DocType: Employee,Encashment Date,兌現日期
+DocType: Training Event,Internet,互聯網
 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/controllers/recurring_document.py +133,Please find attached {0} #{1},隨函附上{0}＃{1}
+DocType: Academic Term,Term Start Date,期限起始日期
+apps/erpnext/erpnext/controllers/recurring_document.py +136,Please find attached {0} #{1},隨函附上{0}＃{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +34,Bank Statement balance as per General Ledger,銀行對賬單餘額按總帳
 DocType: Job Applicant,Applicant Name,申請人名稱
 DocType: Authorization Rule,Customer / Item Name,客戶／品項名稱
@@ -2909,566 +3669,666 @@
 Note: BOM = Bill of Materials",聚合組** **項目到另一個項目** **的。如果你是捆綁了一定**項目你保持股票的包裝**項目的**，而不是聚集**項這是一個有用的**到一個包和**。包** **項目將有“是股票項目”為“否”和“是銷售項目”為“是”。例如：如果你是銷售筆記本電腦和背包分開，並有一個特殊的價格，如果客戶購買兩個，那麼筆記本電腦+背包將是一個新的產品包項目。注：物料BOM =比爾
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +42,Serial No is mandatory for Item {0},項目{0}的序列號是強制性的
 DocType: Item Variant Attribute,Attribute,屬性
-apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +36,Please specify from/to range,請從指定/至範圍
+apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,請從指定/至範圍
 DocType: Serial No,Under AMC,在AMC
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
-apps/erpnext/erpnext/config/selling.py +143,Default settings for selling transactions.,銷售交易的預設設定。
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,物品估價率重新計算考慮到岸成本憑證金額
+apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,銷售交易的預設設定。
+DocType: Guardian,Guardian Of ,守護者
+DocType: Grading Scale Interval,Threshold,閾
 DocType: BOM Replace Tool,Current BOM,當前BOM表
 apps/erpnext/erpnext/public/js/utils.js +39,Add Serial No,添加序列號
 apps/erpnext/erpnext/config/support.py +22,Warranty,保證
+DocType: Purchase Invoice,Debit Note Issued,借記發行說明
 DocType: Production Order,Warehouses,倉庫
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationary,印刷和文具
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}資產不得轉讓
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,此項目是{0}（模板）的變體。
 DocType: Workstation,per hour,每小時
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,購買
 DocType: Warehouse,Account for the warehouse (Perpetual Inventory) will be created under this Account.,帳戶倉庫（永續盤存）將在該帳戶下新增。
-apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +119,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
-DocType: Company,Distribution,分配
-apps/erpnext/erpnext/schools/doctype/fees/fees.js +8,Amount Paid,已支付的款項
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +89,Project Manager,專案經理
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +70,Dispatch,調度
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +70,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +123,Warehouse can not be deleted as stock ledger entry exists for this warehouse.,這個倉庫不能被刪除，因為庫存分錄帳尚存在。
+apps/erpnext/erpnext/schools/doctype/fees/fees.js +27,Amount Paid,已支付的款項
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +95,Project Manager,專案經理
+,Quoted Item Comparison,項目報價比較
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +76,Dispatch,調度
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +73,Max discount allowed for item: {0} is {1}%,{0}允許的最大折扣：{1}％
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +173,Net Asset value as on,淨資產值作為
 DocType: Account,Receivable,應收賬款
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +265,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供應商的採購訂單已經存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,此角色是允許提交超過所設定信用額度的交易。
-DocType: Sales Invoice,Supplier Reference,供應商參考
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,選擇項目，以製造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",主數據同步，這可能需要一些時間
 DocType: Item,Material Issue,發料
 DocType: Hub Settings,Seller Description,賣家描述
 DocType: Employee Education,Qualification,合格
 DocType: Item Price,Item Price,商品價格
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +48,Soap & Detergent,肥皂和洗滌劑
+DocType: BOM,Show Items,顯示項目
+apps/erpnext/erpnext/schools/doctype/course_schedule/course_schedule.py +30,From Time cannot be greater than To Time.,從時間不能超過結束時間大。
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +36,Motion Picture & Video,電影和視頻
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,已訂購
+DocType: Assessment Criteria,Assessment Criteria Group,評估標準組
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打開累計折舊必須小於等於{0}
 DocType: Warehouse,Warehouse Name,倉庫名稱
 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,支援分析
-apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +141,Uncheck all,取消所有
-apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +27,Company is missing in warehouses {0},公司在倉庫缺少{0}
+apps/erpnext/erpnext/accounts/doctype/accounts_settings/accounts_settings.py +28,Company is missing in warehouses {0},公司在倉庫缺少{0}
 DocType: POS Profile,Terms and Conditions,條款和條件
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,To Date should be within the Fiscal Year. Assuming To Date = {0},日期應該是在財政年度內。假設終止日期= {0}
 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 +197,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因為提交股票輸入{0}存在
+DocType: Vehicle,Vehicle,車輛
 DocType: Purchase Invoice,In Words,大寫
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +211,Today is {0}'s birthday!,今天是{0}的生日！
+DocType: POS Profile,Item Groups,項目組
 DocType: Production Planning Tool,Material Request For Warehouse,倉庫材料需求
 DocType: Sales Order Item,For Production,對於生產
-DocType: Payment Request,payment_url,payment_url
 DocType: Project Task,View Task,查看任務
 apps/erpnext/erpnext/public/js/setup_wizard.js +61,Your financial year begins on,您的會計年度自
+,Asset Depreciations and Balances,資產折舊和平衡
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},金額{0} {1}從轉移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,取得預先付款
 DocType: Email Digest,Add/Remove Recipients,添加／刪除收件人
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +432,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},交易不反對停止生產訂單允許{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要設定這個財政年度為預設值，點擊“設為預設”
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +652,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,項目變種{0}存在具有相同屬性
+DocType: Employee Loan,Repay from Salary,從工資償還
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},請求對付款{0} {1}量{2}
 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: Lead,Lost Quotation,失落的報價
+DocType: Pricing Rule,Margin Rate or Amount,保證金稅率或稅額
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +48,'To Date' is required,“至日期”是必需填寫的
 DocType: Packing Slip,"Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.",產生交貨的包裝單。用於通知箱號，內容及重量。
 DocType: Sales Invoice Item,Sales Order Item,銷售訂單項目
 DocType: Salary Slip,Payment Days,付款日
+apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +221,Warehouses with child nodes cannot be converted to ledger,與子節點倉庫不能轉換為分類賬
 DocType: BOM,Manage cost of operations,管理作業成本
 DocType: Notification Control,"When any of the checked transactions are ""Submitted"", an email pop-up automatically opened to send an email to the associated ""Contact"" in that transaction, with the transaction as an attachment. The user may or may not send the email.",當任何選取的交易都是“已提交”時，郵件會自動自動打開，發送電子郵件到相關的“聯絡人”通知相關交易，並用該交易作為附件。用戶可決定是否發送電子郵件。
 apps/erpnext/erpnext/config/setup.py +14,Global Settings,全局設置
+DocType: Assessment Result Detail,Assessment Result Detail,評價結果詳細
 DocType: Employee Education,Employee Education,員工教育
-apps/erpnext/erpnext/public/js/controllers/transaction.js +866,It is needed to fetch Item Details.,需要獲取項目細節。
+apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在項目組表中找到重複的項目組
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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: Expense Claim,Vehicle Log,車輛登錄
+apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",倉庫{0}不會鏈接到任何帳戶，請創建/鏈接對應的（資產）佔倉庫。
 DocType: Purchase Invoice,Recurring Id,經常性標識
 DocType: Customer,Sales Team Details,銷售團隊詳細
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,永久刪除？
 DocType: Expense Claim,Total Claimed Amount,總索賠額
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,潛在的銷售機會。
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +178,Invalid {0},無效的{0}
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +46,Sick Leave,病假
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},無效的{0}
 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/stock/doctype/purchase_receipt/purchase_receipt.py +313,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
-apps/erpnext/erpnext/projects/doctype/project/project.js +102,Save the document first.,首先保存文檔。
+DocType: Warehouse,PIN,銷
+apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,設置你的ERPNext學校
+DocType: Sales Invoice,Base Change Amount (Company Currency),基地漲跌額（公司幣種）
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,沒有以下的倉庫會計分錄
+apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,最後訂單金額
-DocType: Budget,Warn,警告
+DocType: Daily Work Summary,Email Sent To,電子郵件發送給
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言論，值得一提的努力，應該在記錄中。
 DocType: BOM,Manufacturing User,製造業用戶
 DocType: Purchase Invoice,Raw Materials Supplied,提供供應商原物料
 DocType: Purchase Invoice,Recurring Print Format,經常列印格式
-DocType: C-Form,Series,系列
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +58,Expected Delivery Date cannot be before Purchase Order Date,預計交貨日期不能早於採購訂單日期
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +61,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 +87,Business Development Manager,業務發展經理
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +93,Business Development Manager,業務發展經理
 DocType: Maintenance Visit Purpose,Maintenance Visit Purpose,維護訪問目的
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.js +16,Period,期間
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.js +18,General Ledger,總帳
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +33,Employee {0} on Leave on {1},僱員{0}上離開{1}
 apps/erpnext/erpnext/selling/doctype/campaign/campaign.js +10,View Leads,查看訊息
 DocType: Item Attribute Value,Attribute Value,屬性值
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email id must be unique, already exists for {0}",電子郵件ID必須是唯一的，且已經存在於 {0}
 ,Itemwise Recommended Reorder Level,Itemwise推薦級別重新排序
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +940,Please select {0} first,請先選擇{0}
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +749,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/"">模板</A>和地址的所有領域（包括自定義字段如果有的話）將可</ P> 
- <前> <代碼> {{address_line1}}＆LT; BR＆GT; 
- {％，如果address_line2％} {{address_line2}}＆LT; BR＆GT; { ENDIF％ - ％} 
- {{城市}}＆LT; BR＆GT; 
- {％，如果狀態％} {{狀態}}＆LT; BR＆GT; {％ENDIF - ％} {
-％，如果PIN代碼％} PIN：{{PIN碼}}＆LT; BR＆GT; {％ENDIF - ％} 
- {{國家}}＆LT; BR＆GT; 
- {％，如果電話％}電話：{{電話}}＆LT; BR＆GT; { ％ENDIF - ％} 
- {％，如果傳真％}傳真：{{傳真}}＆LT; BR＆GT; {％ENDIF - ％} 
- {％，如果email_id％}電子郵件：{{email_id}}＆LT; BR＆GT {％ENDIF - ％} 
- </代碼> </ PRE>"
+DocType: Salary Detail,Salary Detail,薪酬詳細
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,請先選擇{0}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,一批項目的{0} {1}已過期。
+apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,時間表製造。
+apps/erpnext/erpnext/templates/pages/cart.html +37,Subtotal,小計
 DocType: Salary Detail,Default Amount,違約金額
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +92,Warehouse not found in the system,倉庫系統中未找到
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +106,This Month's Summary,本月摘要
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +93,Warehouse not found in the system,倉庫系統中未找到
 DocType: Quality Inspection Reading,Quality Inspection Reading,質量檢驗閱讀
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`凍結股票早於`應該是少於％d天。
 DocType: Tax Rule,Purchase Tax Template,購置稅模板
 ,Project wise Stock Tracking,項目明智的庫存跟踪
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},維護時間表{0}針對存在{0}
 DocType: Stock Entry Detail,Actual Qty (at source/target),實際的數量（於 來源/目標）
 DocType: Item Customer Detail,Ref Code,參考代碼
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,員工記錄。
-DocType: Payment Gateway,Payment Gateway,支付網關
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,請設置下折舊日期
 DocType: HR Settings,Payroll Settings,薪資設置
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,核對非關聯的發票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下單
+DocType: Email Digest,New Purchase Orders,新的採購訂單
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,root不能有一個父成本中心
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,選擇品牌...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,選擇品牌...
+apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作為累計折舊
 DocType: Sales Invoice,C-Form Applicable,C-表格適用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +378,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
-apps/erpnext/erpnext/accounts/doctype/account/account.py +170,Warehouse is mandatory,倉庫是強制性的
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},運行時間必須大於0的操作{0}
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,倉庫是強制性的
 DocType: Supplier,Address and Contacts,地址和聯絡方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,計量單位換算詳細
-apps/erpnext/erpnext/public/js/setup_wizard.js +167,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
+apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),900px （寬）x 100像素（高）
+DocType: Program,Program Abbreviation,計劃縮寫
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生產訂單不能對一個項目提出的模板
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,費用對在採購入庫單內的每個項目更新
 DocType: Warranty Claim,Resolved By,議決
-DocType: Appraisal,Start Date,開始日期
+DocType: Bank Guarantee,Start Date,開始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,離開一段時間。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正確清除
-apps/erpnext/erpnext/accounts/doctype/account/account.py +50,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
+apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,帳戶{0}：你不能指定自己為父帳戶
 DocType: Purchase Invoice Item,Price List Rate,價格列表費率
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,創建客戶報價
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",基於倉庫內存貨的狀態顯示「有或」或「無貨」。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清單（BOM）
 DocType: Item,Average time taken by the supplier to deliver,採取供應商的平均時間交付
+apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,評價結果
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小時
 DocType: Project,Expected Start Date,預計開始日期
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,刪除項目，如果收費並不適用於該項目
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +27,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
-DocType: Payment Entry,Receive,接受
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,交易貨幣必須與支付網關貨幣
+apps/erpnext/erpnext/templates/pages/rfq.html +75,Quotations: ,語錄：
 DocType: Maintenance Visit,Fully Completed,全面完成
 apps/erpnext/erpnext/projects/doctype/project/project_list.js +6,{0}% Complete,{0}％完成
 DocType: Employee,Educational Qualification,學歷
 DocType: Workstation,Operating Costs,運營成本
+DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果積累了每月預算超出行動
 DocType: Purchase Invoice,Submit on creation,提交關於創建
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},貨幣{0}必須{1}
+DocType: Asset,Disposal Date,處置日期
+DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",電子郵件將在指定的時間發送給公司的所有在職職工，如果他們沒有假期。回复摘要將在午夜被發送。
 DocType: Employee Leave Approver,Employee Leave Approver,員工請假審批
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +79,"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 +429,Production Order {0} must be submitted,生產訂單{0}必須提交
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一個重新排序條目已存在這個倉庫{1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能聲明為丟失，因為報價已經取得進展。
+apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培訓反饋
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,生產訂單{0}必須提交
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},請選擇項目{0}的開始日期和結束日期
+apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},當然是行強制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,無效的主名稱
-DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +225,Add / Edit Prices,新增 / 編輯價格
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,新增 / 編輯價格
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +36,Chart of Cost Centers,成本中心的圖
 ,Requested Items To Be Ordered,將要採購的需求項目
+apps/erpnext/erpnext/accounts/doctype/account/account.py +181,Warehouse company must be same as Account company,倉庫的公司必須同客戶公司
 DocType: Price List,Price List Name,價格列表名稱
-apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +181,Totals,總計
+apps/erpnext/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py +31,Daily Work Summary for {0},每日工作總結{0}
+DocType: Employee Loan,Totals,總計
 DocType: BOM,Manufacturing,製造
 ,Ordered Items To Be Delivered,未交貨的訂購項目
 DocType: Account,Income,收入
 DocType: Industry Type,Industry Type,行業類型
-apps/erpnext/erpnext/templates/includes/cart.js +141,Something went wrong!,出事了！
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +113,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/templates/includes/cart.js +150,Something went wrong!,出事了！
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：離開包含以下日期區塊的應用程式
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,銷售發票{0}已提交
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +25,Fiscal Year {0} does not exist,會計年度{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 +181,Organization unit (department) master.,組織單位（部門）的主人。
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +25,Please enter valid mobile nos,請輸入有效的手機號
+apps/erpnext/erpnext/stock/stock_ledger.py +372,{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.,{0} {1}在需要{2}在{3} {4}：{5}來完成這一交易單位。
+DocType: Fee Structure,Student Category,學生組
+DocType: Announcement,Student,學生
+apps/erpnext/erpnext/config/hr.py +229,Organization unit (department) master.,組織單位（部門）的主人。
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +26,Please enter valid mobile nos,請輸入有效的手機號
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +75,Please enter message before sending,在發送前，請填寫留言
-apps/erpnext/erpnext/config/accounts.py +277,Point-of-Sale Profile,簡介銷售點的
-apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +68,Please Update SMS Settings,請更新簡訊設定
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Unsecured Loans,無抵押貸款
+DocType: Email Digest,Pending Quotations,待語錄
+apps/erpnext/erpnext/config/accounts.py +282,Point-of-Sale Profile,簡介銷售點的
+apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +75,Please Update SMS Settings,請更新簡訊設定
+apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +154,Unsecured Loans,無抵押貸款
 DocType: Cost Center,Cost Center Name,成本中心名稱
+DocType: HR Settings,Max working hours against Timesheet,最大工作時間針對時間表
 DocType: Maintenance Schedule Detail,Scheduled Date,預定日期
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +66,Total Paid Amt,數金額金額
+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/accounts/doctype/journal_entry/journal_entry.py +272,You cannot credit and debit same account at the same time,你無法將貸方與借方在同一時間記在同一帳戶
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +299,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}
-DocType: Address,Name of person or organization that this address belongs to.,此地址所屬的人或組織的名稱。
-apps/erpnext/erpnext/public/js/setup_wizard.js +260,Your Suppliers,您的供應商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +49,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +326,Received From,從......收到
+DocType: Student Group Creation Tool,Student Group Creation Tool,學生組創建工具
+DocType: Item,Variant Based On,基於變異對
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的總權重應為100 ％ 。這是{0}
+apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供應商
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能設置為失落的銷售訂單而成。
+DocType: Request for Quotation Item,Supplier Part No,供應商部件號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',當類是“估值”或“Vaulation和總&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,從......收到
 DocType: Lead,Converted,轉換
 DocType: Item,Has Serial No,有序列號
 DocType: Employee,Date of Issue,發行日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +15,{0}: From {0} for {1},{0}：從{0}給 {1}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +153,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
-apps/erpnext/erpnext/stock/doctype/item/item.py +171,Website Image {0} attached to Item {1} cannot be found,網站圖像{0}附加到物品{1}無法找到
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}：從{0}給 {1}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：設置供應商項目{1}
+apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小時值必須大於零。
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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 +296,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
-apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +72,Item: {0} does not exist in the system,項：{0}不存在於系統中
-apps/erpnext/erpnext/accounts/doctype/account/account.py +109,You are not authorized to set Frozen value,您無權設定值凍結
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +323,Please check Multi Currency option to allow accounts with other currency,請檢查多幣種選項，允許帳戶與其他貨幣
+apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +86,Item: {0} does not exist in the system,項：{0}不存在於系統中
+apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,您無權設定值凍結
 DocType: Payment Reconciliation,Get Unreconciled Entries,獲取未調節項
 DocType: Payment Reconciliation,From Invoice Date,從發票日期
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,結算幣種必須等於要么默認業公司的貨幣或一方賬戶貨幣
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,離開兌現
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,它有什麼作用？
-DocType: Delivery Note,To Warehouse,到倉庫
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到倉庫
+apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有學生入學
 ,Average Commission Rate,平均佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.py +415,'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,考勤不能標記為未來的日期
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,非庫存項目不能有序號
+apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能標記為未來的日期
 DocType: Pricing Rule,Pricing Rule Help,定價規則說明
 DocType: Purchase Taxes and Charges,Account Head,帳戶頭
-apps/erpnext/erpnext/config/stock.py +163,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +109,Electrical,電子的
+apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,更新額外成本來計算項目的到岸成本
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,電子的
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的組織的其餘部分用戶。您還可以添加邀請客戶到您的門戶網站通過從聯繫人中添加它們
 DocType: Stock Entry,Total Value Difference (Out - In),總價值差（輸出 - ）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +318,Row {0}: Exchange Rate is mandatory,行{0}：匯率是必須的
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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}
+DocType: Vehicle,Vehicle Value,汽車衡
 DocType: Stock Entry,Default Source Warehouse,預設來源倉庫
 DocType: Item,Customer Code,客戶代碼
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +210,Birthday Reminder for {0},生日提醒{0}
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},生日提醒{0}
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,天自上次訂購
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +292,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
-DocType: Buying Settings,Naming Series,命名系列
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借方帳戶必須是資產負債表科目
 DocType: Leave Block List,Leave Block List Name,休假區塊清單名稱
+apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保險開始日期應小於保險終止日期
 apps/erpnext/erpnext/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},難道你真的想要提交的所有{1}年{0}月的工資單
+DocType: Timesheet,Production Detail,生產細節
 DocType: Target Detail,Target Qty,目標數量
 DocType: Shopping Cart Settings,Checkout Settings,結帳設定
 DocType: Attendance,Present,現在
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.py +35,Delivery Note {0} must not be submitted,送貨單{0}不能提交
 DocType: Notification Control,Sales Invoice Message,銷售發票訊息
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +27,Closing Account {0} must be of type Liability / Equity,關閉帳戶{0}的類型必須是負債/權益
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},員工的工資單{0}已為時間表創建{1}
 DocType: Sales Order Item,Ordered Qty,訂購數量
-apps/erpnext/erpnext/stock/doctype/item/item.py +673,Item {0} is disabled,項目{0}無效
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,項目{0}無效
 DocType: Stock Settings,Stock Frozen Upto,存貨凍結到...為止
-apps/erpnext/erpnext/controllers/recurring_document.py +169,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM不包含任何庫存項目
+apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期間從和週期要日期強制性的經常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,專案活動／任務。
+DocType: Vehicle Log,Refuelling Details,加油詳情
 apps/erpnext/erpnext/config/hr.py +104,Generate Salary Slips,生成工資條
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +41,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +44,"Buying must be checked, if Applicable For is selected as {0}",採購必須進行檢查，如果適用於被選擇為{0}
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +40,Discount must be less than 100,折扣必須小於100
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最後購買率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核銷金額（公司貨幣）
-apps/erpnext/erpnext/stock/doctype/item/item.py +485,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+DocType: Sales Invoice Timesheet,Billing Hours,結算時間
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默認BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：請設置再訂購數量
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,點擊項目將其添加到此處
+DocType: Fees,Program Enrollment,招生計劃
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本憑證
-apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +62,Please set {0},請設置{0}
+apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},請設置{0}
 DocType: Purchase Invoice,Repeat on Day of Month,在月內的一天重複
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +39,{0} - {1} is inactive student,{0}  -  {1}是非活動學生
 DocType: Employee,Health Details,健康細節
 DocType: Offer Letter,Offer Letter Terms,報價函條款
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +23,To create a Payment Request reference document is required,要創建付款請求參考文檔是必需的
+DocType: Payment Entry,Allocate Payment Amount,分配付款金額
 DocType: Employee External Work History,Salary,薪水
 DocType: Serial No,Delivery Document Type,交付文件類型
 DocType: Process Payroll,Submit all salary slips for the above selected criteria,對上面選擇的條件提交所有工資單
 apps/erpnext/erpnext/hub_node/doctype/hub_settings/hub_settings.py +93,{0} Items synced,{0}項目已同步
-DocType: Sales Order,Partly Delivered,部分交付
-DocType: Sales Invoice,Existing Customer,現有客戶
 DocType: Email Digest,Receivables,應收賬款
+DocType: Lead Source,Lead Source,鉛源
 DocType: Customer,Additional information regarding the customer.,對於客戶的其他訊息。
 DocType: Quality Inspection Reading,Reading 5,閱讀5
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +38,Campaign Name is required,活動名稱是必需的
 DocType: Maintenance Visit,Maintenance Date,維修日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒絕序列號
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},項目{0}的開始日期必須小於結束日期
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的開始日期或結束日期與{0}重疊。為了避免請將公司
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 +129,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +306,BOM and Manufacturing Quantity are required,BOM和生產量是必需的
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +44,Ageing Range 2,老齡範圍2
-DocType: Bank Reconciliation Detail,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 +96,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
+apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +55,Guardian1 Mobile No,Guardian1手機號碼
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +98,Please enter default currency in Company Master,請在公司主檔輸入預設貨幣
 DocType: Stock Entry Detail,Stock Entry Detail,存貨分錄明細
-apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +100,Daily Reminders,每日提醒
 DocType: Products Settings,Home Page is Products,首頁是產品頁
-apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +85,Tax Rule Conflicts with {0},稅收規範衝突{0}
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +23,New Account Name,新帳號名稱
+,Asset Depreciation Ledger,資產減值總帳
+apps/erpnext/erpnext/accounts/doctype/tax_rule/tax_rule.py +86,Tax Rule Conflicts with {0},稅收規範衝突{0}
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +25,New Account Name,新帳號名稱
 DocType: Purchase Invoice Item,Raw Materials Supplied Cost,原料供應成本
 DocType: Selling Settings,Settings for Selling Module,設置銷售模塊
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +71,Customer Service,顧客服務
-DocType: Homepage Featured Product,Thumbnail,縮略圖
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +77,Customer Service,顧客服務
+DocType: BOM,Thumbnail,縮略圖
 DocType: Item Customer Detail,Item Customer Detail,項目客戶詳細
 apps/erpnext/erpnext/config/hr.py +50,Offer candidate a Job.,報價候選作業。
 DocType: Notification Control,Prompt for Email on Submission of,提示電子郵件的提交
-apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +83,Total allocated leaves are more than days in the period,分配的總葉多天的期限
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +73,Item {0} must be a stock Item,項{0}必須是一個缺貨登記
+apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +88,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 +252,Default settings for accounting transactions.,會計交易的預設設定。
+apps/erpnext/erpnext/config/accounts.py +257,Default settings for accounting transactions.,會計交易的預設設定。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +59,Expected Date cannot be before Material Request Date,訊息大於160個字符將會被分成多個訊息
+DocType: Purchase Invoice Item,Stock Qty,庫存數量
+DocType: Purchase Invoice Item,Stock Qty,庫存數量
+DocType: Production Order,Source Warehouse (for reserving Items),源數據倉庫（用於保留項目）
+DocType: Employee Loan,Repayment Period in Months,在月還款期
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +26,Error: Not a valid id?,錯誤：沒有有效的身份證？
 DocType: Naming Series,Update Series Number,更新序列號
 DocType: Account,Equity,公平
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +78,{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry,{0} {1}：“損益”帳戶類型{2}不允許進入開
 DocType: Sales Order,Printing Details,印刷詳情
 DocType: Task,Closing Date,截止日期
 DocType: Sales Order Item,Produced Quantity,生產的產品數量
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +82,Engineer,工程師
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +88,Engineer,工程師
+DocType: Journal Entry,Total Amount Currency,總金額幣種
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +38,Search Sub Assemblies,搜索子組件
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +370,Item Code required at Row No {0},於列{0}需要產品編號
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +163,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折扣
+apps/erpnext/erpnext/config/projects.py +35,Timesheet for tasks.,時間表的任務。
 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}已提交
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +270,Installation Note {0} has already been submitted,安裝注意{0}已提交
+DocType: Bank Reconciliation,Get Payment Entries,獲取付款項
 DocType: Quotation Item,Against Docname,對Docname
 DocType: SMS Center,All Employee (Active),所有員工（活動）
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +9,View Now,立即觀看
 DocType: Purchase Invoice,Select the period when the invoice will be generated automatically,選擇發票會自動生成期間
-DocType: BOM,Raw Material Cost,原材料成本
 DocType: Item Reorder,Re-Order Level,重新排序級別
 DocType: Production Planning Tool,Enter items and planned qty for which you want to raise production orders or download raw materials for analysis.,輸入您想要提高生產訂單或下載的原材料進行分析的項目和計劃數量。
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +55,Part-time,兼任
+apps/erpnext/erpnext/projects/doctype/project/project.js +45,Gantt Chart,甘特圖
 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 +162,Report Type is mandatory,報告類型是強制性的
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +61,Series Updated,系列更新
+apps/erpnext/erpnext/accounts/doctype/account/account.py +163,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/buying/utils.py +68,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/accounts/doctype/fiscal_year/fiscal_year.py +88,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},會計年度開始日期和財政年度結束日期已經在財政年度設置{0}
+apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,間隙更新日期
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +131,Successfully Reconciled,不甘心成功
+DocType: Request for Quotation Supplier,Download PDF,下載PDF
 DocType: Production Order,Planned End Date,計劃的結束日期
-apps/erpnext/erpnext/config/stock.py +179,Where items are stored.,項目的存儲位置。
-DocType: Tax Rule,Validity,有效性
-apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +19,Invoiced Amount,發票金額
+apps/erpnext/erpnext/config/stock.py +184,Where items are stored.,項目的存儲位置。
+DocType: Request for Quotation,Supplier Detail,供應商詳細
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +95,Error in formula or condition: {0},誤差在式或條件：{0}
+apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +22,Invoiced Amount,發票金額
 DocType: Attendance,Attendance,出勤
-DocType: BOM,Materials,物料
+apps/erpnext/erpnext/public/js/pos/pos.html +106,Stock Items,庫存產品
 DocType: Leave Block List,"If not checked, the list will have to be added to each Department where it has to be applied.",如果未選取，則該列表將被加到每個應被應用到的部門。
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +513,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
+apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +28,Source and Target Warehouse cannot be same,源和目標倉庫不能相同
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +534,Posting date and posting time is mandatory,登錄日期和登錄時間是必需的
 apps/erpnext/erpnext/config/buying.py +76,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/selling.py +67,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 +158,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
-apps/erpnext/erpnext/controllers/recurring_document.py +214,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
-apps/erpnext/erpnext/accounts/doctype/account/account.py +127,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+apps/erpnext/erpnext/controllers/item_variant.py +90,Value for Attribute {0} must be within the range of {1} to {2} in the increments of {3} for Item {4},為屬性{0}值必須的範圍內{1}到{2}中的增量{3}為項目{4}
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +160,Target warehouse in row {0} must be same as Production Order,行目標倉庫{0}必須與生產訂單
+apps/erpnext/erpnext/controllers/recurring_document.py +217,'Notification Email Addresses' not specified for recurring %s,重複％的“通知用電子郵件地址”尚未指定
+apps/erpnext/erpnext/accounts/doctype/account/account.py +128,Currency can not be changed after making entries using some other currency,貨幣不能使用其他貨幣進行輸入後更改
+DocType: Vehicle Service,Clutch Plate,離合器壓盤
 DocType: Company,Round Off Account,四捨五入賬戶
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +91,Administrative Expenses,行政開支
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +18,Consulting,諮詢
 DocType: Customer Group,Parent Customer Group,母客戶群組
 DocType: Purchase Invoice,Contact Email,聯絡電郵
 DocType: Appraisal Goal,Score Earned,得分
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +180,Notice Period,通知期
+DocType: Asset Category,Asset Category Name,資產類別名稱
 apps/erpnext/erpnext/setup/doctype/territory/territory.js +13,This is a root territory and cannot be edited.,集團或Ledger ，借方或貸方，是特等帳戶
+apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +5,New Sales Person Name,新銷售人員的姓名
 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 +469,Credit Account,信用賬戶
+DocType: Bin,Reserved Qty for Production,預留數量生產
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在製作基於課程的組時考慮批量，請不要選中。
+DocType: Asset,Frequency of Depreciation (Months),折舊率（月）
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,信用賬戶
 DocType: Landed Cost Item,Landed Cost Item,到岸成本項目
-apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +55,Show zero values,顯示零值
+apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,顯示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,製造/從原材料數量給予重新包裝後獲得的項目數量
+apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,設置一個簡單的網站為我的組織
 DocType: Payment Reconciliation,Receivable / Payable Account,應收/應付賬款
 DocType: Delivery Note Item,Against Sales Order Item,對銷售訂單項目
-apps/erpnext/erpnext/stock/doctype/item/item.py +647,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},請指定屬性值的屬性{0}
 DocType: Item,Default Warehouse,預設倉庫
-apps/erpnext/erpnext/accounts/doctype/budget/budget.py +39,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
+apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},不能指定預算給群組帳目{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,請輸入父成本中心
 DocType: Delivery Note,Print Without Amount,列印表單時不印金額
-apps/erpnext/erpnext/controllers/buying_controller.py +80,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +57,Depreciation Date,折舊日期
+apps/erpnext/erpnext/controllers/buying_controller.py +79,Tax Category can not be 'Valuation' or 'Valuation and Total' as all items are non-stock items,稅務類別不能為'估值'或'估值及總，因為所有的項目都是非庫存產品
 DocType: Issue,Support Team,支持團隊
+apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +36,Expiry (In Days),到期（天數）
 DocType: Appraisal,Total Score (Out of 5),總分（滿分5分）
-DocType: Batch,Batch,批量
-apps/erpnext/erpnext/stock/doctype/item/item.js +21,Balance,餘額
+DocType: Program Enrollment,Batch,批量
+apps/erpnext/erpnext/stock/doctype/item/item.js +27,Balance,餘額
+DocType: Room,Seating Capacity,座位數
 DocType: Project,Total Expense Claim (via Expense Claims),總費用報銷（通過費用報銷）
+DocType: Assessment Result,Total Score,總得分
 DocType: Journal Entry,Debit Note,繳費單
 DocType: Stock Entry,As per Stock UOM,按庫存計量單位
 apps/erpnext/erpnext/stock/doctype/batch/batch_list.js +7,Not Expired,沒有過期
+DocType: Batch,Source Document Type,源文檔類型
+DocType: Batch,Source Document Type,源文檔類型
 DocType: Journal Entry,Total Debit,借方總額
 DocType: Manufacturing Settings,Default Finished Goods Warehouse,預設成品倉庫
-apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +75,Sales Person,銷售人員
-DocType: Sales Invoice,Cold Calling,自薦
+apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +78,Sales Person,銷售人員
 DocType: SMS Parameter,SMS Parameter,短信參數
-apps/erpnext/erpnext/config/accounts.py +197,Budget and Cost Center,預算和成本中心
-DocType: Maintenance Schedule Item,Half Yearly,半年度
+apps/erpnext/erpnext/config/accounts.py +202,Budget and Cost Center,預算和成本中心
 DocType: Lead,Blog Subscriber,網誌訂閱者
+DocType: Guardian,Alternate Number,備用號碼
 apps/erpnext/erpnext/config/setup.py +83,Create rules to restrict transactions based on values.,創建規則來限制基於價值的交易。
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
+DocType: Student Group Creation Tool,Leave blank if you make students groups per year,如果您每年製作學生團體，請留空
 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 +253,Processing Payroll,處理工資單
+apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +23,The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again.,該期限結束日期不能超過期限開始日期。請更正日期，然後再試一次。
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價
+apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +19,Quot Count,報價計數
+,BOM Stock Report,BOM庫存報告
+DocType: Stock Reconciliation Item,Quantity Difference,數量差異
+apps/erpnext/erpnext/config/hr.py +311,Processing Payroll,處理工資單
 DocType: Opportunity Item,Basic Rate,基礎匯率
 DocType: GL Entry,Credit Amount,信貸金額
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +141,Set as Lost,設為失落
+DocType: Cheque Print Template,Signatory Position,簽署的位置
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,設為失落
+DocType: Timesheet,Total Billable Hours,總計費時間
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收貨注意事項
+apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,這是基於對這個顧客的交易。詳情請參閱以下時間表
 DocType: Supplier,Credit Days Based On,信貸天基於
+apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +161,Row {0}: Allocated amount {1} must be less than or equals to Payment Entry amount {2},行{0}：分配金額{1}必須小於或等於輸入付款金額{2}
 DocType: Tax Rule,Tax Rule,稅務規則
 DocType: Selling Settings,Maintain Same Rate Throughout Sales Cycle,保持同樣的速度在整個銷售週期
 DocType: Manufacturing Settings,Plan time logs outside Workstation Working Hours.,在工作站的工作時間以外計畫時間日誌。
+apps/erpnext/erpnext/public/js/pos/pos.html +89,Customers in Queue,在排隊的客戶
+DocType: Student,Nationality,國籍
 ,Items To Be Requested,需求項目
 DocType: Purchase Order,Get Last Purchase Rate,取得最新採購價格
 DocType: Company,Company Info,公司資訊
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,選擇或添加新客戶
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,成本中心需要預訂費用報銷
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),基金中的應用（資產）
-DocType: Sales Invoice,Frequency,頻率
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +463,Debit Account,借方科目
+apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,這是基於該員工的考勤
 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 +99,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
-DocType: Purchase Common,Purchase Common,採購普通
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +218,{0} {1} has been modified. Please refresh.,{0} {1} 已修改。請更新。
+apps/erpnext/erpnext/accounts/doctype/account/account.py +100,Cannot covert to Group because Account Type is selected.,不能隱蔽到組，因為帳戶類型選擇的。
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +231,{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/setup/setup_wizard/install_fixtures.py +173,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},盒裝數量必須等於{1}列品項{0}的數量
+apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,購買金額
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,供應商報價{0}創建
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,結束年份不能啟動年前
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,員工福利
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},請設置一個默認的假日列表為員工{0}或公司{1}
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,客戶提出的賬單。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,項目編號
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +499,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 +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行無{0}：金額不能大於金額之前對報銷{1}。待審核金額為{2}
 DocType: Maintenance Schedule,Schedule,時間表
 DocType: Account,Parent Account,父帳戶
 DocType: Quality Inspection Reading,Reading 3,閱讀3
 ,Hub,樞紐
 DocType: GL Entry,Voucher Type,憑證類型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1007,Price List not found or disabled,價格表未找到或被禁用
-DocType: Expense Claim,Approved,批准
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,價格表未找到或被禁用
+DocType: Employee Loan Application,Approved,批准
 DocType: Pricing Rule,Price,價格
-apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +244,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
-DocType: Item,"Selecting ""Yes"" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",選擇“Yes”將提供一個獨特的身份，以這個項目的每個實體可在序列號主觀看。
-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,教育
+apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',員工解除對{0}必須設定為“左”
+DocType: Guardian,Guardian,監護人
+apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,鑑定{0}為員工在給定日期範圍{1}創建
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,德爾
 DocType: Selling Settings,Campaign Naming By,活動命名由
 DocType: Employee,Current Address Is,當前地址是
-apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +38,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
-DocType: Address,Office,辦公室
+apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可選。設置公司的默認貨幣，如果沒有指定。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,會計日記帳分錄。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用數量從倉庫
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +259,Please select Employee Record first.,請選擇員工記錄第一。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +190,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
-apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +235,Please enter Expense Account,請輸入您的費用帳戶
+apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +295,Please select Employee Record first.,請選擇員工記錄第一。
+DocType: POS Profile,Account for Change Amount,帳戶漲跌額
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客戶不與匹配{1} / {2} {3} {4}
+apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,請輸入您的費用帳戶
 DocType: Account,Stock,庫存
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：參考文件類型必須是採購訂單之一，購買發票或日記帳分錄
 DocType: Employee,Current Address,當前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果項目是另一項目，然後描述，圖像，定價，稅費等會從模板中設定的一個變體，除非明確指定
 DocType: Serial No,Purchase / Manufacture Details,採購／製造詳細資訊
-apps/erpnext/erpnext/config/stock.py +309,Batch Inventory,批量庫存
+DocType: Assessment Group,Assessment Group,評估小組
+apps/erpnext/erpnext/config/stock.py +320,Batch Inventory,批量庫存
 DocType: Employee,Contract End Date,合同結束日期
 DocType: Sales Order,Track this Sales Order against any Project,跟踪對任何項目這個銷售訂單
+DocType: Sales Invoice Item,Discount and Margin,折扣和保證金
 DocType: Production Planning Tool,Pull sales orders (pending to deliver) based on the above criteria,基於上述標準拉銷售訂單（待定提供）
-DocType: Attendance,Half Day,半天
 DocType: Pricing Rule,Min Qty,最小數量
-DocType: Asset Movement,Transaction Date,交易日期
 DocType: Production Plan Item,Planned Qty,計劃數量
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +104,Total Tax,總稅收
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +174,For Quantity (Manufactured Qty) is mandatory,對於數量（製造數量）是強制性的
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +176,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 +78,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
+apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.py +14,The Year End Date cannot be earlier than the Year Start Date. Please correct the dates and try again.,年末日期不能超過年度開始日期。請更正日期，然後再試一次。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +105,Row {0}: Party Type and Party is only applicable against Receivable / Payable account,行{0}：黨的類型和黨的只適用對應收/應付帳戶
 DocType: Notification Control,Purchase Receipt Message,採購入庫單訊息
+DocType: BOM,Scrap Items,廢物品
 DocType: Production Order,Actual Start Date,實際開始日期
 DocType: Sales Order,% of materials delivered against this Sales Order,針對這張銷售訂單的已交貨物料的百分比(%)
 apps/erpnext/erpnext/config/stock.py +12,Record item movement.,記錄項目移動。
 DocType: Hub Settings,Hub Settings,中心設定
-DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,加入作業
-apps/erpnext/erpnext/accounts/party.py +253,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,會計分錄已取得貨幣{0}為公司{1}。請選擇一個應收或應付賬戶幣種{0}。
+DocType: Asset,Is Existing Asset,是對現有資產
+DocType: Salary Detail,Statistical Component,統計組成部分
+DocType: Salary Detail,Statistical Component,統計組成部分
 ,Monthly Salary Register,月薪註冊
 DocType: Warranty Claim,If different than customer address,如果與客戶地址不同
 DocType: BOM Operation,BOM Operation,BOM的操作
+DocType: School Settings,Validate the Student Group from Program Enrollment,從計劃入學驗證學生組
+DocType: School Settings,Validate the Student Group from Program Enrollment,從計劃入學驗證學生組
 DocType: Purchase Taxes and Charges,On Previous Row Amount,在上一行金額
+apps/erpnext/erpnext/accounts/doctype/asset/asset.js +260,Transfer Asset,轉讓資產
 DocType: POS Profile,POS Profile,POS簡介
-apps/erpnext/erpnext/config/accounts.py +221,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
-apps/erpnext/erpnext/stock/get_item_details.py +129,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
-apps/erpnext/erpnext/public/js/setup_wizard.js +202,Purchaser,購買者
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +31,Net pay cannot be negative,淨工資不能為負
+DocType: Training Event,Event Name,事件名稱
+apps/erpnext/erpnext/config/schools.py +39,Admission,入場
+apps/erpnext/erpnext/config/accounts.py +226,"Seasonality for setting budgets, targets etc.",季節性設置預算，目標等。
+apps/erpnext/erpnext/stock/get_item_details.py +137,"Item {0} is a template, please select one of its variants",項目{0}是一個模板，請選擇它的一個變體
+DocType: Asset,Asset Category,資產類別
+apps/erpnext/erpnext/public/js/setup_wizard.js +207,Purchaser,購買者
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.py +30,Net pay cannot be negative,淨工資不能為負
 DocType: SMS Settings,Static Parameters,靜態參數
+DocType: Assessment Plan,Room,房間
 DocType: Purchase Order,Advance Paid,提前支付
 DocType: Item,Item Tax,產品稅
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +765,Material to Supplier,材料到供應商
-apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +189,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,材料到供應商
+apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,消費稅發票
+apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出現％不止一次
 DocType: Expense Claim,Employees Email Id,員工的電子郵件ID
 DocType: Employee Attendance Tool,Marked Attendance,明顯考勤
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +136,Current Liabilities,流動負債
-apps/erpnext/erpnext/config/selling.py +278,Send mass SMS to your contacts,發送群發短信到您的聯絡人
+apps/erpnext/erpnext/config/selling.py +292,Send mass SMS to your contacts,發送群發短信到您的聯絡人
+DocType: Program,Program Name,程序名稱
 DocType: Purchase Taxes and Charges,Consider Tax or Charge for,考慮稅收或收費
-apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +60,Actual Qty is mandatory,實際數量是強制性
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +136,Credit Card,信用卡
+apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +57,Actual Qty is mandatory,實際數量是強制性
+DocType: Employee Loan,Loan Type,貸款類型
+DocType: Scheduling Tool,Scheduling Tool,調度工具
 DocType: BOM,Item to be manufactured or repacked,產品被製造或重新包裝
-apps/erpnext/erpnext/config/stock.py +174,Default settings for stock transactions.,庫存交易的預設設定。
+apps/erpnext/erpnext/config/stock.py +179,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: Training Event,Attendees,與會者
 DocType: Employee,"Here you can maintain family details like name and occupation of parent, spouse and children",在這裡，您可以維護家庭的詳細訊息，如父母，配偶和子女的姓名及職業
+DocType: Academic Term,Term End Date,期限結束日期
 DocType: Hub Settings,Seller Name,賣家名稱
 DocType: Purchase Invoice,Taxes and Charges Deducted (Company Currency),稅收和扣除（公司貨幣）
 DocType: Item Group,General Settings,一般設定
-apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +19,From Currency and To Currency cannot be same,原始貨幣和目標貨幣不能相同
+apps/erpnext/erpnext/setup/doctype/currency_exchange/currency_exchange.py +23,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,在繼續之前，您必須儲存表單
 DocType: Item Attribute,Numeric Values,數字值
-apps/erpnext/erpnext/public/js/setup_wizard.js +172,Attach Logo,附加標誌
+apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,附加標誌
+apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,庫存水平
 DocType: Customer,Commission Rate,佣金比率
-apps/erpnext/erpnext/stock/doctype/item/item.js +261,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部門封鎖請假申請。
-apps/erpnext/erpnext/config/selling.py +169,Analytics,Analytics（分析）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必須是接收之一，收費和內部轉賬
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,車是空的
 DocType: Production Order,Actual Operating Cost,實際運行成本
-apps/erpnext/erpnext/accounts/doctype/account/account.py +84,Root cannot be edited.,root不能被編輯。
+DocType: Payment Entry,Cheque/Reference No,支票/參考編號
+apps/erpnext/erpnext/accounts/doctype/account/account.py +85,Root cannot be edited.,root不能被編輯。
+DocType: Item,Units of Measure,測量的單位
 DocType: Manufacturing Settings,Allow Production on Holidays,允許假日生產
 DocType: Sales Order,Customer's Purchase Order Date,客戶的採購訂單日期
-apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +160,Capital Stock,股本
+DocType: Shopping Cart Settings,Show Public Attachments,顯示公共附件
 DocType: Packing Slip,Package Weight Details,包裝重量詳情
 DocType: Payment Gateway Account,Payment Gateway Account,網路支付閘道帳戶
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成後重定向用戶選擇的頁面。
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +102,Please select a csv file,請選擇一個csv文件
+DocType: Company,Existing Company,現有的公司
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +103,Please select a csv file,請選擇一個csv文件
+DocType: Student Leave Application,Mark as Present,標記為現
 DocType: Purchase Order,To Receive and Bill,準備收料及接收發票
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +92,Designer,設計師
-apps/erpnext/erpnext/config/selling.py +153,Terms and Conditions Template,條款及細則範本
+apps/erpnext/erpnext/templates/pages/home.html +14,Featured Products,特色產品
+apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +98,Designer,設計師
+apps/erpnext/erpnext/config/selling.py +163,Terms and Conditions Template,條款及細則範本
 DocType: Serial No,Delivery Details,交貨細節
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +469,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +483,Cost Center is required in row {0} in Taxes table for type {1},成本中心是必需的行{0}稅表型{1}
+DocType: Program,Program Code,程序代碼
+DocType: Terms and Conditions,Terms and Conditions Help,條款和條件幫助
 ,Item-wise Purchase Register,項目明智的購買登記
 DocType: Batch,Expiry Date,到期時間
 ,Supplier Addresses and Contacts,供應商的地址和聯絡方式
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +334,Please select Category first,請先選擇分類
+,accounts-browser,賬戶瀏覽器
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,請先選擇分類
 apps/erpnext/erpnext/config/projects.py +13,Project master.,專案主持。
+apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允許對賬單或過度訂貨，庫存設置或更新項目“津貼”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要顯示如$等任何貨幣符號。
-apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +417, (Half Day),（半天）
 DocType: Supplier,Credit Days,信貸天
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,讓學生批
 DocType: Leave Type,Is Carry Forward,是弘揚
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +740,Get Items from BOM,從物料清單取得項目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,從物料清單取得項目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交貨期天
+apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：過帳日期必須是相同的購買日期{1}資產的{2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,請在上表中輸入銷售訂單
-apps/erpnext/erpnext/config/learn.py +222,Bill of Materials,材料清單
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +76,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
+apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +186,Not Submitted Salary Slips,未提交工資單
+,Stock Summary,股票摘要
+apps/erpnext/erpnext/config/accounts.py +241,Transfer an asset from one warehouse to another,從一個倉庫轉移資產到另一
+apps/erpnext/erpnext/config/learn.py +217,Bill of Materials,材料清單
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +103,Row {0}: Party Type and Party is required for Receivable / Payable account {1},行{0}：黨的類型和黨的需要應收/應付帳戶{1}
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +94,Ref Date,參考日期
 DocType: Employee,Reason for Leaving,離職原因
+DocType: BOM Operation,Operating Cost(Company Currency),營業成本（公司貨幣）
 DocType: Expense Claim Detail,Sanctioned Amount,制裁金額
 DocType: GL Entry,Is Opening,是開幕
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +169,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
-apps/erpnext/erpnext/accounts/doctype/account/account.py +218,Account {0} does not exist,帳戶{0}不存在
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借方條目不能與{1}連接
+apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,帳戶{0}不存在
 DocType: Account,Cash,現金
 DocType: Employee,Short biography for website and other publications.,網站和其他出版物的短的傳記。
diff --git a/erpnext/translations/zh.csv b/erpnext/translations/zh.csv
index 98315cd..e1d29f7 100644
--- a/erpnext/translations/zh.csv
+++ b/erpnext/translations/zh.csv
@@ -17,10 +17,10 @@
 DocType: Employee,Rented,租
 DocType: Purchase Order,PO-,PO-
 DocType: POS Profile,Applicable for User,适用于用户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +193,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +194,"Stopped Production Order cannot be cancelled, Unstop it first to cancel",停止生产订单无法取消，首先Unstop它取消
 DocType: Vehicle Service,Mileage,里程
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +231,Do you really want to scrap this asset?,难道你真的想放弃这项资产？
-apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +48,Select Default Supplier,选择默认供应商
+apps/erpnext/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js +44,Select Default Supplier,选择默认供应商
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +37,Currency is required for Price List {0},价格表{0}需要制定货币
 DocType: Sales Taxes and Charges Template,* Will be calculated in the transaction.,*将被计算在该交易内。
 DocType: Purchase Order,Customer Contact,客户联系
@@ -41,7 +41,7 @@
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +196,Outstanding for {0} cannot be less than zero ({1}),杰出的{0}不能小于零（ {1} ）
 DocType: Manufacturing Settings,Default 10 mins,默认为10分钟
 DocType: Leave Type,Leave Type Name,假期类型名称
-apps/erpnext/erpnext/templates/pages/projects.js +63,Show open,公开显示
+apps/erpnext/erpnext/templates/pages/projects.js +62,Show open,公开显示
 apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +155,Series Updated Successfully,系列已成功更新
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +18,Checkout,查看
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +179,Accural Journal Entry Submitted,Accural日记帐分录提交
@@ -57,14 +57,13 @@
 ,Batch Item Expiry Status,批处理项到期状态
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +146,Bank Draft,银行汇票
 DocType: Mode of Payment Account,Mode of Payment Account,付款方式账户
-apps/erpnext/erpnext/stock/doctype/item/item.js +58,Show Variants,显示变体
+apps/erpnext/erpnext/stock/doctype/item/item.js +56,Show Variants,显示变体
 DocType: Academic Term,Academic Term,学期
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.py +14,Material,材料
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +665,Quantity,数量
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +669,Quantity,数量
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +546,Accounts table cannot be blank.,账表不能为空。
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +152,Loans (Liabilities),借款（负债）
 DocType: Employee Education,Year of Passing,按年排序
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: %s, Item Code: %s and Customer: %s",参考文献：％S，项目代码：％s和客户：％s的
 DocType: Item,Country of Origin,出生国家
 apps/erpnext/erpnext/templates/form_grid/stock_entry_grid.html +26,In Stock,库存
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +46,Open Issues,开放式问题
@@ -73,7 +72,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +31,Health Care,医疗保健
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +65,Delay in payment (Days),延迟支付（天）
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +26,Service Expense,服务费用
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +804,Invoice,发票
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +839,Serial Number: {0} is already referenced in Sales Invoice: {1},序号：{0}已在销售发票中引用：{1}
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +808,Invoice,发票
 DocType: Maintenance Schedule Item,Periodicity,周期性
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +21,Fiscal Year {0} is required,会计年度{0}是必需的
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +54,Expected Delivery Date is be before Sales Order Date,预计交货日期是之前销售订单日期
@@ -108,27 +108,29 @@
 DocType: Rename Tool,"Attach .csv file with two columns, one for the old name and one for the new name",附加.csv文件有两列，一为旧名称，一个用于新名称
 apps/erpnext/erpnext/accounts/utils.py +73,{0} {1} not in any active Fiscal Year.,{0} {1} 没有在任何活动的财政年度中。
 DocType: Packed Item,Parent Detail docname,家长可采用DocName细节
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +69,"Reference: {0}, Item Code: {1} and Customer: {2}",参考：{0}，商品编号：{1}和顾客：{2}
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Kg,千克
 DocType: Student Log,Log,日志
 apps/erpnext/erpnext/config/hr.py +45,Opening for a Job.,开放的工作。
 DocType: Item Attribute,Increment,增量
-apps/erpnext/erpnext/public/js/stock_analytics.js +62,Select Warehouse...,选择仓库...
+apps/erpnext/erpnext/public/js/stock_analytics.js +61,Select Warehouse...,选择仓库...
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +6,Advertising,广告
 apps/erpnext/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py +22,Same Company is entered more than once,同一家公司进入不止一次
 DocType: Employee,Married,已婚
-apps/erpnext/erpnext/accounts/party.py +38,Not permitted for {0},不允许{0}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +556,Get items from,从获得项目
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +429,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
+apps/erpnext/erpnext/accounts/party.py +41,Not permitted for {0},不允许{0}
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +560,Get items from,从获得项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +438,Stock cannot be updated against Delivery Note {0},送货单{0}不能更新库存
 apps/erpnext/erpnext/templates/pages/home.py +25,Product {0},产品{0}
+apps/erpnext/erpnext/templates/generators/item_group.html +43,No items listed,没有列出项目
 DocType: Payment Reconciliation,Reconcile,对账
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +30,Grocery,杂货
 DocType: Quality Inspection Reading,Reading 1,阅读1
 DocType: Process Payroll,Make Bank Entry,创建银行分录
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +40,Pension Funds,养老基金
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +87,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +88,Next Depreciation Date cannot be before Purchase Date,接下来折旧日期不能购买日期之前
 DocType: SMS Center,All Sales Person,所有的销售人员
 DocType: Monthly Distribution,**Monthly Distribution** helps you distribute the Budget/Target across months if you have seasonality in your business.,**月度分配**帮助你分配预算/目标跨越几个月，如果你在你的业务有季节性。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1626,Not items found,未找到项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1642,Not items found,未找到项目
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +178,Salary Structure Missing,薪酬结构缺失
 DocType: Lead,Person Name,人姓名
 DocType: Sales Invoice Item,Sales Invoice Item,销售发票品目
@@ -137,16 +139,16 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +51,"e.g. ""Primary School"" or ""University""",如“小学”或“大学”
 apps/erpnext/erpnext/config/stock.py +32,Stock Reports,库存报告
 DocType: Warehouse,Warehouse Detail,仓库详细信息
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +171,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +154,Credit limit has been crossed for customer {0} {1}/{2},客户{0} 的信用额度已经越过 {1} / {2}
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +33,The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.,该期限结束日期不能晚于学年年终日期到这个词联系在一起（学年{}）。请更正日期，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +474,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +472,"""Is Fixed Asset"" cannot be unchecked, as Asset record exists against the item",是固定资产不能被反选，因为存在资产记录的项目
 DocType: Vehicle Service,Brake Oil,刹车油
 DocType: Tax Rule,Tax Type,税收类型
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +160,You are not authorized to add or update entries before {0},你没有权限在{0}前添加或更改分录。
 DocType: BOM,Item Image (if not slideshow),项目图片(如果没有指定幻灯片)
 apps/erpnext/erpnext/setup/doctype/customer_group/customer_group.py +20,An Customer exists with same name,同名客户已存在
 DocType: Production Order Operation,(Hour Rate / 60) * Actual Operation Time,（小时率/ 60）*实际操作时间
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +894,Select BOM,选择BOM
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +890,Select BOM,选择BOM
 DocType: SMS Log,SMS Log,短信日志
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Delivered Items,交付品目成本
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +38,The holiday on {0} is not between From Date and To Date,在{0}这个节日之间没有从日期和结束日期
@@ -167,7 +169,7 @@
 DocType: Academic Term,Schools,学校
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +35,No leave record found for employee {0} for {1},未找到员工的假期记录{0} {1}
 apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +23,Please enter company first,请先输入公司
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Company first,请首先选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +332,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,总成本
@@ -182,7 +184,7 @@
 DocType: Expense Claim Detail,Claim Amount,报销金额
 DocType: Employee,Mr,先生
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +49,Duplicate customer group found in the cutomer group table,在CUTOMER组表中找到重复的客户群
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +33,Supplier Type / Supplier,供应商类型/供应商
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +31,Supplier Type / Supplier,供应商类型/供应商
 DocType: Naming Series,Prefix,字首
 apps/erpnext/erpnext/public/js/setup_wizard.js +300,Consumable,耗材
 DocType: Employee,B-,B-
@@ -191,11 +193,11 @@
 DocType: Training Result Employee,Grade,年级
 DocType: Sales Invoice Item,Delivered By Supplier,交付供应商
 DocType: SMS Center,All Contact,所有联系人
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +882,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +878,Production Order already created for all items with BOM,生产订单已经与BOM的所有项目创建
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +182,Annual Salary,年薪
 DocType: Daily Work Summary,Daily Work Summary,每日工作总结
 DocType: Period Closing Voucher,Closing Fiscal Year,结算财年
-apps/erpnext/erpnext/accounts/party.py +340,{0} {1} is frozen,{0} {1}已冻结
+apps/erpnext/erpnext/accounts/party.py +343,{0} {1} is frozen,{0} {1}已冻结
 apps/erpnext/erpnext/setup/doctype/company/company.py +133,Please select Existing Company for creating Chart of Accounts,请选择现有的公司创建会计科目表
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +78,Stock Expenses,库存费用
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +91,Select Target Warehouse,选择目标仓库
@@ -204,12 +206,12 @@
 DocType: Journal Entry,Contra Entry,对销分录
 DocType: Journal Entry Account,Credit in Company Currency,信用在公司货币
 DocType: Delivery Note,Installation Status,安装状态
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +126,"Do you want to update attendance?<br>Present: {0}\
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +125,"Do you want to update attendance?<br>Present: {0}\
 					<br>Absent: {1}",你想更新考勤？ <br>现任：{0} \ <br>缺席：{1}
 apps/erpnext/erpnext/controllers/buying_controller.py +318,Accepted + Rejected Qty must be equal to Received quantity for Item {0},已接受+已拒绝的数量必须等于条目{0}的已接收数量
 DocType: Request for Quotation,RFQ-,RFQ-
 DocType: Item,Supply Raw Materials for Purchase,供应原料采购
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +131,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +139,At least one mode of payment is required for POS invoice.,付款中的至少一个模式需要POS发票。
 DocType: Products Settings,Show Products as a List,产品展示作为一个列表
 DocType: Upload Attendance,"Download the Template, fill appropriate data and attach the modified file.
 All dates and employee combination in the selected period will come in the template, with existing attendance records",下载此模板，填写相应的数据后上传。所有的日期和员工出勤记录将显示在模板里。
@@ -223,12 +225,12 @@
 DocType: Depreciation Schedule,Make Depreciation Entry,计提折旧进入
 DocType: Appraisal Template Goal,KRA,KRA
 DocType: Lead,Request Type,请求类型
-apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +15,Make Employee,使员工
+apps/erpnext/erpnext/hr/doctype/offer_letter/offer_letter.js +17,Make Employee,使员工
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +14,Broadcasting,广播
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +153,Execution,执行
 apps/erpnext/erpnext/config/manufacturing.py +62,Details of the operations carried out.,生产操作详情。
 DocType: Serial No,Maintenance Status,维护状态
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商应付账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +56,{0} {1}: Supplier is required against Payable account {2},{0} {1}：需要对供应商支付的账款{2}
 apps/erpnext/erpnext/config/selling.py +52,Items and Pricing,项目和定价
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +2,Total hours: {0},总时间：{0}
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +43,From Date should be within the Fiscal Year. Assuming From Date = {0},起始日期应该在财年之内。财年起始日是{0}
@@ -239,6 +241,7 @@
 apps/erpnext/erpnext/config/maintenance.py +12,Plan for maintenance visits.,规划维护访问。
 DocType: SMS Settings,Enter url parameter for message,请输入消息的URL参数
 DocType: POS Profile,Customer Groups,客户群
+apps/erpnext/erpnext/public/js/financial_statements.js +51,Financial Statements,财务报表
 DocType: Guardian,Students,学生们
 apps/erpnext/erpnext/config/selling.py +91,Rules for applying pricing and discount.,规则适用的定价和折扣。
 apps/erpnext/erpnext/stock/doctype/price_list/price_list.py +14,Price List must be applicable for Buying or Selling,房产价格必须适用于购买或出售
@@ -264,11 +267,11 @@
 apps/erpnext/erpnext/controllers/taxes_and_totals.py +417,Advance amount cannot be greater than {0} {1},提前量不能大于{0} {1}
 DocType: Naming Series,Series List for this Transaction,此交易的系列列表
 DocType: Company,Default Payroll Payable Account,默认情况下，应付职工薪酬帐户
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +23,Update Email Group,更新电子邮件组
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +35,Update Email Group,更新电子邮件组
 DocType: Sales Invoice,Is Opening Entry,是否期初分录
 DocType: Customer Group,Mention if non-standard receivable account applicable,何况，如果不规范应收账款适用
 DocType: Course Schedule,Instructor Name,导师姓名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +176,For Warehouse is required before Submit,提交前必须选择仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +177,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,经销商
 DocType: Production Planning Tool,"If checked, Will include non-stock items in the Material Requests.",如果选中，将包括材料要求非库存物品。
@@ -276,7 +279,7 @@
 DocType: Delivery Note Item,Against Sales Invoice Item,对销售发票项目
 ,Production Orders in Progress,在建生产订单
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +39,Net Cash from Financing,从融资净现金
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2209,"LocalStorage is full , did not save",localStorage的满了，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2224,"LocalStorage is full , did not save",localStorage的满了，没救
 DocType: Lead,Address & Contact,地址及联系方式
 DocType: Leave Allocation,Add unused leaves from previous allocations,添加未使用的叶子从以前的分配
 apps/erpnext/erpnext/controllers/recurring_document.py +230,Next Recurring {0} will be created on {1},周期{0}下次创建时间为{1}
@@ -302,8 +305,8 @@
 DocType: Task,Total Costing Amount (via Time Sheet),总成本计算量（通过时间表）
 DocType: Item Website Specification,Item Website Specification,项目网站规格
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +477,Leave Blocked,已禁止请假
-apps/erpnext/erpnext/stock/doctype/item/item.py +701,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +101,Bank Entries,银行条目
+apps/erpnext/erpnext/stock/doctype/item/item.py +678,Item {0} has reached its end of life on {1},项目{0}已经到达寿命终止日期{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +103,Bank Entries,银行条目
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +119,Annual,全年
 DocType: Stock Reconciliation Item,Stock Reconciliation Item,库存盘点品目
 DocType: Stock Entry,Sales Invoice No,销售发票编号
@@ -321,8 +324,8 @@
 DocType: Item,Publish in Hub,在发布中心
 DocType: Student Admission,Student Admission,学生入学
 ,Terretory,区域
-apps/erpnext/erpnext/stock/doctype/item/item.py +721,Item {0} is cancelled,项目{0}已取消
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +878,Material Request,物料申请
+apps/erpnext/erpnext/stock/doctype/item/item.py +698,Item {0} is cancelled,项目{0}已取消
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +882,Material Request,物料申请
 DocType: Bank Reconciliation,Update Clearance Date,更新清拆日期
 DocType: Item,Purchase Details,购买详情
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +356,Item {0} not found in 'Raw Materials Supplied' table in Purchase Order {1},项目{0}未发现“原材料提供&#39;表中的采购订单{1}
@@ -358,10 +361,10 @@
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +37,Outstanding Cheques and Deposits to clear,杰出的支票及存款清除
 DocType: Item,Synced With Hub,与Hub同步
 DocType: Vehicle,Fleet Manager,车队经理
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +505,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
-apps/erpnext/erpnext/setup/doctype/company/company.js +67,Wrong Password,密码错误
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +509,Row #{0}: {1} can not be negative for item {2},行＃{0}：{1}不能为负值对项{2}
+apps/erpnext/erpnext/setup/doctype/company/company.js +68,Wrong Password,密码错误
 DocType: Item,Variant Of,变体自
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +367,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +368,Completed Qty can not be greater than 'Qty to Manufacture',完成数量不能大于“生产数量”
 DocType: Period Closing Voucher,Closing Account Head,结算帐户头
 DocType: Employee,External Work History,外部就职经历
 apps/erpnext/erpnext/projects/doctype/task/task.py +99,Circular Reference Error,循环引用错误
@@ -374,12 +377,11 @@
 DocType: Stock Settings,Notify by Email on creation of automatic Material Request,自动创建物料申请时通过邮件通知
 DocType: Journal Entry,Multi Currency,多币种
 DocType: Payment Reconciliation Invoice,Invoice Type,发票类型
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +846,Delivery Note,送货单
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +843,Delivery Note,送货单
 apps/erpnext/erpnext/config/learn.py +82,Setting up Taxes,建立税
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +131,Cost of Sold Asset,出售资产的成本
 apps/erpnext/erpnext/accounts/utils.py +348,Payment Entry has been modified after you pulled it. Please pull it again.,付款项被修改，你把它之后。请重新拉。
-apps/erpnext/erpnext/stock/doctype/item/item.py +443,{0} entered twice in Item Tax,{0}输入了两次税项
-DocType: Grade Interval,Min Score,闵分数
+apps/erpnext/erpnext/stock/doctype/item/item.py +441,{0} entered twice in Item Tax,{0}输入了两次税项
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +114,Summary for this week and pending activities,本周和待活动总结
 DocType: Student Applicant,Admitted,录取
 DocType: Workstation,Rent Cost,租金成本
@@ -392,7 +394,7 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +21,Order Value,订单价值
 apps/erpnext/erpnext/config/accounts.py +27,Bank/Cash transactions against party or for internal transfer,银行/现金对一方或内部转让交易
 DocType: Shipping Rule,Valid for Countries,有效的国家
-apps/erpnext/erpnext/stock/doctype/item/item.js +57,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
+apps/erpnext/erpnext/stock/doctype/item/item.js +55,This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set,这个项目是一个模板，并且可以在交易不能使用。项目的属性将被复制到变型，除非“不复制”设置
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +69,Total Order Considered,总订货考虑
 apps/erpnext/erpnext/config/hr.py +234,"Employee designation (e.g. CEO, Director etc.).",雇员指派(例如总裁，总监等) 。
 apps/erpnext/erpnext/controllers/recurring_document.py +223,Please enter 'Repeat on Day of Month' field value,请输入“重复上月的一天'字段值
@@ -401,14 +403,14 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +568,Row #{0}: Purchase Invoice cannot be made against an existing asset {1},行＃{0}：采购发票不能对现有资产进行{1}
 DocType: Item Tax,Tax Rate,税率
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +59,{0} already allocated for Employee {1} for period {2} to {3},{0}已分配给员工{1}的时期{2}到{3}
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +845,Select Item,选择项目
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +141,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +849,Select Item,选择项目
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +142,Purchase Invoice {0} is already submitted,采购发票{0}已经提交
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +91,Row # {0}: Batch No must be same as {1} {2},行＃{0}：批号必须与{1} {2}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +52,Convert to non-Group,转换为非集团
 apps/erpnext/erpnext/config/stock.py +122,Batch (lot) of an Item.,产品批次(patch)/批(lot)。
 DocType: C-Form Invoice Detail,Invoice Date,发票日期
 DocType: GL Entry,Debit Amount,借方金额
-apps/erpnext/erpnext/accounts/party.py +232,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
+apps/erpnext/erpnext/accounts/party.py +235,There can only be 1 Account per Company in {0} {1},只能有每公司1帐户{0} {1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +391,Please see attachment,请参阅附件
 DocType: Purchase Order,% Received,％已收货
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.js +3,Create Student Groups,创建挺起胸
@@ -439,9 +441,9 @@
 DocType: Request for Quotation,Request for Quotation,询价
 DocType: Salary Slip Timesheet,Working Hours,工作时间
 DocType: Naming Series,Change the starting / current sequence number of an existing series.,更改现有系列的起始/当前序列号。
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1360,Create a new Customer,创建一个新的客户
-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.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
-apps/erpnext/erpnext/utilities/activation.py +91,Create Purchase Orders,创建采购订单
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1376,Create a new Customer,创建一个新的客户
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +59,"If multiple Pricing Rules continue to prevail, users are asked to set Priority manually to resolve conflict.",如果几条价格规则同时使用，系统将提醒用户设置优先级。
+apps/erpnext/erpnext/utilities/activation.py +88,Create Purchase Orders,创建采购订单
 ,Purchase Register,购买注册
 DocType: Course Scheduling Tool,Rechedule,Rechedule
 DocType: Landed Cost Item,Applicable Charges,适用费用
@@ -449,7 +451,7 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +220,{0} ({1}) must have role 'Leave Approver',{0} {1}必须有“假期审批人”的角色
 DocType: Purchase Receipt,Vehicle Date,车日期
 DocType: Student Log,Medical,医药
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +180,Reason for losing,原因丢失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +177,Reason for losing,原因丢失
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +41,Lead Owner cannot be same as the Lead,铅所有者不能等同于铅
 apps/erpnext/erpnext/accounts/utils.py +354,Allocated amount can not greater than unadjusted amount,分配的金额不能超过未调整的量更大
 DocType: Announcement,Receiver,接收器
@@ -466,6 +468,7 @@
 DocType: Purchase Invoice Item,Quantity and Rate,数量和价格
 DocType: Delivery Note,% Installed,％已安装
 apps/erpnext/erpnext/public/js/setup_wizard.js +383,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/实验室等在那里的演讲可以预定。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +54,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,请先输入公司名称
 DocType: Purchase Invoice,Supplier Name,供应商名称
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,阅读ERPNext手册
@@ -482,16 +485,17 @@
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修课 - 学年
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +18,Mandatory field - Academic Year,必修课 - 学年
 DocType: Notification Control,Customize the introductory text that goes as a part of that email. Each transaction has a separate introductory text.,自定义作为邮件一部分的简介文本，每个邮件的简介文本是独立的。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +150,Please set default payable account for the company {0},请为公司{0}设置预设应付账款
 apps/erpnext/erpnext/config/manufacturing.py +84,Global settings for all manufacturing processes.,所有生产流程的全局设置。
 DocType: Accounts Settings,Accounts Frozen Upto,账户被冻结到...为止
 DocType: SMS Log,Sent On,发送日期
-apps/erpnext/erpnext/stock/doctype/item/item.py +657,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
+apps/erpnext/erpnext/stock/doctype/item/item.py +640,Attribute {0} selected multiple times in Attributes Table,属性{0}多次选择在属性表
 DocType: HR Settings,Employee record is created using selected field. ,使用所选字段创建员工记录。
 DocType: Sales Order,Not Applicable,不适用
 apps/erpnext/erpnext/config/hr.py +70,Holiday master.,假期大师
 DocType: Request for Quotation Item,Required Date,所需时间
 DocType: Delivery Note,Billing Address,帐单地址
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +877,Please enter Item Code.,请输入产品编号。
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js +881,Please enter Item Code.,请输入产品编号。
 DocType: BOM,Costing,成本核算
 DocType: Tax Rule,Billing County,开票县
 DocType: Purchase Taxes and Charges,"If checked, the tax amount will be considered as already included in the Print Rate / Print Amount",如果勾选，税金将被当成已包括在打印税率/打印总额内。
@@ -507,6 +511,7 @@
 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,证券及存款
+apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +44,"Can't change valuation method, as there are transactions against some items which does not have it's own valuation method",不能改变估值方法，因为有一些项目没有自己的估值方法的交易
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +82,Total leaves allocated is mandatory,总叶分配是必须的
 DocType: Job Opening,Description of a Job Opening,空缺职位的说明
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +111,Pending activities for today,今天待定活动
@@ -528,13 +533,13 @@
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +22,Please select Course,请选择课程
 DocType: Timesheet Detail,Hrs,小时
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +317,Please select Company,请选择公司
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +316,Please select Company,请选择公司
 DocType: Stock Entry Detail,Difference Account,差异科目
 apps/erpnext/erpnext/projects/doctype/task/task.py +46,Cannot close task as its dependant task {0} is not closed.,不能因为其依赖的任务{0}没有关闭关闭任务。
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +433,Please enter Warehouse for which Material Request will be raised,请重新拉。
 DocType: Production Order,Additional Operating Cost,额外的运营成本
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +20,Cosmetics,化妆品
-apps/erpnext/erpnext/stock/doctype/item/item.py +538,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
+apps/erpnext/erpnext/stock/doctype/item/item.py +536,"To merge, following properties must be same for both items",若要合并，以下属性必须为这两个项目是相同的
 DocType: Shipping Rule,Net Weight,净重
 DocType: Employee,Emergency Phone,紧急电话
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +29,Buy,购买
@@ -544,7 +549,7 @@
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +20,Please define grade for Threshold 0%,请定义等级为阈值0％
 DocType: Sales Order,To Deliver,为了提供
 DocType: Purchase Invoice Item,Item,产品
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2372,Serial no item cannot be a fraction,序号项目不能是一个分数
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2388,Serial no item cannot be a fraction,序号项目不能是一个分数
 DocType: Journal Entry,Difference (Dr - Cr),差异(贷方-借方)
 DocType: Account,Profit and Loss,损益
 apps/erpnext/erpnext/config/stock.py +325,Managing Subcontracting,管理转包
@@ -559,7 +564,7 @@
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +49,Increment cannot be 0,增量不能为0
 DocType: Production Planning Tool,Material Requirement,物料需求
 DocType: Company,Delete Company Transactions,删除公司事务
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +323,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Reference No and Reference Date is mandatory for Bank transaction,参考编号和参考日期是强制性的银行交易
 DocType: Purchase Receipt,Add / Edit Taxes and Charges,添加/编辑税金及费用
 DocType: Purchase Invoice,Supplier Invoice No,供应商发票编号
 DocType: Territory,For reference,供参考
@@ -570,7 +575,7 @@
 DocType: Installation Note Item,Installation Note Item,安装单项目
 DocType: Production Plan Item,Pending Qty,待定数量
 DocType: Budget,Ignore,忽略
-apps/erpnext/erpnext/accounts/party.py +344,{0} {1} is not active,{0} {1} 未激活
+apps/erpnext/erpnext/accounts/party.py +347,{0} {1} is not active,{0} {1} 未激活
 apps/erpnext/erpnext/setup/doctype/sms_settings/sms_settings.py +95,SMS sent to following numbers: {0},短信发送至以下号码：{0}
 apps/erpnext/erpnext/config/accounts.py +246,Setup cheque dimensions for printing,设置检查尺寸打印
 DocType: Salary Slip,Salary Slip Timesheet,工资单时间表
@@ -579,13 +584,13 @@
 DocType: Sales Invoice,Total Commission,总委员会
 DocType: Pricing Rule,Sales Partner,销售合作伙伴
 DocType: Buying Settings,Purchase Receipt Required,外购入库单要求
-apps/erpnext/erpnext/stock/doctype/item/item.py +131,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
+apps/erpnext/erpnext/stock/doctype/item/item.py +129,Valuation Rate is mandatory if Opening Stock entered,估价费用是强制性的，如果打开股票进入
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +142,No records found in the Invoice table,没有在发票表中找到记录
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +17,Please select Company and Party Type first,请选择公司和党的第一型
 apps/erpnext/erpnext/config/accounts.py +262,Financial / accounting year.,财务/会计年度。
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.js +9,Accumulated Values,累积值
 apps/erpnext/erpnext/stock/doctype/serial_no/serial_no.py +158,"Sorry, Serial Nos cannot be merged",抱歉，序列号无法合并
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +740,Make Sales Order,创建销售订单
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +737,Make Sales Order,创建销售订单
 DocType: Project Task,Project Task,项目任务
 ,Lead Id,线索ID
 DocType: C-Form Invoice Detail,Grand Total,总计
@@ -602,7 +607,7 @@
 DocType: Job Applicant,Resume Attachment,简历附
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +58,Repeat Customers,回头客
 DocType: Leave Control Panel,Allocate,调配
-apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +809,Sales Return,销售退货
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +806,Sales Return,销售退货
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +96,Note: Total allocated leaves {0} shouldn't be less than already approved leaves {1} for the period,注：总分配叶{0}应不低于已核定叶{1}期间
 DocType: Announcement,Posted By,发布者
 DocType: Item,Delivered by Supplier (Drop Ship),由供应商交货（直接发运）
@@ -612,7 +617,7 @@
 DocType: Quotation,Quotation To,报价对象
 DocType: Lead,Middle Income,中等收入
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +218,Opening (Cr),开幕（CR ）
-apps/erpnext/erpnext/stock/doctype/item/item.py +827,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 +804,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 +352,Allocated amount can not be negative,调配数量不能为负
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
 apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +25,Please set the Company,请设定公司
@@ -624,7 +629,7 @@
 DocType: Sales Invoice Timesheet,Sales Invoice Timesheet,销售发票时间表
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +118,Reference No & Reference Date is required for {0},{0}需要参考编号与参考日期
 DocType: Process Payroll,Select Payment Account to make Bank Entry,选择付款账户，使银行进入
-apps/erpnext/erpnext/utilities/activation.py +137,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
+apps/erpnext/erpnext/utilities/activation.py +134,"Create Employee records to manage leaves, expense claims and payroll",建立员工档案管理叶，报销和工资
 apps/erpnext/erpnext/support/doctype/issue/issue.js +24,Add to Knowledge Base,添加到知识库
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +152,Proposal Writing,提案写作
 DocType: Payment Entry Deduction,Payment Entry Deduction,输入付款扣除
@@ -654,19 +659,18 @@
 apps/erpnext/erpnext/accounts/utils.py +83,{0} '{1}' not in Fiscal Year {2},{0}“ {1}”不属于{2}财年
 DocType: Buying Settings,Settings for Buying Module,采购模块的设置
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +21,Asset {0} does not belong to company {1},资产{0}不属于公司{1}
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +69,Please enter Purchase Receipt first,请第一次进入购买收据
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +70,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/doctype/pricing_rule/pricing_rule.js +36,"Then Pricing Rules are filtered out based on Customer, Customer Group, Territory, Supplier, Supplier Type, Campaign, Sales Partner etc.",然后定价规则将基于客户，客户组，地区，供应商，供应商类型，活动，销售合作伙伴等条件过滤。
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +24,Net Change in Inventory,在库存净变动
 apps/erpnext/erpnext/config/hr.py +157,Employee Loan Management,员工贷款管理
 DocType: Employee,Passport Number,护照号码
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +58,Relation with Guardian2,与关系Guardian2
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +86,Manager,经理
 DocType: Payment Entry,Payment From / To,支付自/至
-apps/erpnext/erpnext/hr/report/salary_register/salary_register.js +8,Date Range,日期范围
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +134,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +117,New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0},新的信用额度小于当前余额为客户着想。信用额度是ATLEAST {0}
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +258,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,“根据”和“分组依据”不能相同
@@ -675,8 +679,8 @@
 DocType: Production Order Operation,In minutes,已分钟为单位
 DocType: Issue,Resolution Date,决议日期
 DocType: Student Batch Name,Batch Name,批名
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +319,Timesheet created:,创建时间表：
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +795,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +320,Timesheet created:,创建时间表：
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +859,Please set default Cash or Bank account in Mode of Payment {0},请设置默认的现金或银行账户的付款方式{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +20,Enroll,注册
 DocType: Selling Settings,Customer Naming By,客户命名方式
 DocType: Student Leave Application,Will show the student as Present in Student Monthly Attendance Report,将显示学生每月学生出勤记录报告为存在
@@ -704,7 +708,7 @@
 DocType: Production Order Operation,Actual Start Time,实际开始时间
 DocType: BOM Operation,Operation Time,操作时间
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +139,Finish,完
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +386,Base,基础
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +387,Base,基础
 DocType: Timesheet,Total Billed Hours,帐单总时间
 DocType: Journal Entry,Write Off Amount,核销金额
 DocType: Journal Entry,Bill No,账单编号
@@ -720,7 +724,7 @@
 DocType: Student Attendance,Student Attendance,学生出勤
 DocType: Sales Invoice Timesheet,Time Sheet,时间表
 DocType: Manufacturing Settings,Backflush Raw Materials Based On,反吹为原材料的开
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +60,Please enter item details,请输入项目细节
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +62,Please enter item details,请输入项目细节
 DocType: Interest,Interest,利益
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +10,Pre Sales,售前
 DocType: Purchase Receipt,Other Details,其他详细信息
@@ -731,24 +735,22 @@
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +282,Payment Entry is already created,已创建付款输入
 DocType: Purchase Receipt Item Supplied,Current Stock,当前库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +555,Row #{0}: Asset {1} does not linked to Item {2},行＃{0}：资产{1}不挂项目{2}
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +368,Preview Salary Slip,预览工资单
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +369,Preview Salary Slip,预览工资单
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +54,Account {0} has been entered multiple times,帐户{0}已多次输入
 DocType: Account,Expenses Included In Valuation,开支计入估值
 DocType: Hub Settings,Seller City,卖家城市
 ,Absent Student Report,缺席学生报告
 DocType: Email Digest,Next email will be sent on:,下次邮件发送时间：
 DocType: Offer Letter Term,Offer Letter Term,报价函期限
-apps/erpnext/erpnext/stock/doctype/item/item.py +636,Item has variants.,项目有变体。
+apps/erpnext/erpnext/stock/doctype/item/item.py +619,Item has variants.,项目有变体。
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +65,Item {0} not found,项目{0}未找到
 DocType: Bin,Stock Value,库存值
 apps/erpnext/erpnext/accounts/doctype/account/account.py +26,Company {0} does not exist,公司{0}不存在
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +84,Tree Type,树类型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +82,Tree Type,树类型
 DocType: BOM Explosion Item,Qty Consumed Per Unit,每单位消耗数量
 DocType: Serial No,Warranty Expiry Date,保修到期日
 DocType: Material Request Item,Quantity and Warehouse,数量和仓库
 DocType: Sales Invoice,Commission Rate (%),佣金率（％）
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
-apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +24,Please select Program,请选择程序
 DocType: Project,Estimated Cost,估计成本
@@ -767,7 +769,7 @@
 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,默认帐户
 DocType: Payment Entry,Received Amount (Company Currency),收到的款项（公司币种）
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +156,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +166,Lead must be set if Opportunity is made from Lead,如果商机的来源是“线索”的话，必须指定线索
 apps/erpnext/erpnext/hr/doctype/holiday_list/holiday_list.py +29,Please select weekly off day,请选择每周休息日
 DocType: Production Order Operation,Planned End Time,计划结束时间
 ,Sales Person Target Variance Item Group-Wise,品目组特定的销售人员目标差异
@@ -783,6 +785,7 @@
 DocType: Opportunity,Opportunity From,从机会
 apps/erpnext/erpnext/config/hr.py +98,Monthly salary statement.,月度工资结算
 DocType: BOM,Website Specifications,网站规格
+apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +24,{0}: From {0} of type {1},{0}：申请者{0} 假期类型{1}
 DocType: Warranty Claim,CI-,CI-
 apps/erpnext/erpnext/controllers/buying_controller.py +284,Row {0}: Conversion Factor is mandatory,行{0}：转换系数是强制性的
@@ -828,6 +831,7 @@
 DocType: Employee,Bank A/C No.,银行账号
 DocType: Bank Guarantee,Project,项目
 DocType: Quality Inspection Reading,Reading 7,阅读7
+apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially Ordered,偏序
 DocType: Expense Claim Detail,Expense Claim Type,报销类型
 DocType: Shopping Cart Settings,Default settings for Shopping Cart,购物车的默认设置
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +132,Asset scrapped via Journal Entry {0},通过资产日记帐分录报废{0}
@@ -835,14 +839,14 @@
 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 +107,Office Maintenance Expenses,办公维护费用
 apps/erpnext/erpnext/config/learn.py +47,Setting up Email Account,设置电子邮件帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +115,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
+apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.js +114,Please enter Item first,没有客户或供应商帐户发现。账户是根据\确定
 DocType: Account,Liability,负债
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +175,Sanctioned Amount cannot be greater than Claim Amount in Row {0}.,制裁金额不能大于索赔额行{0}。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +176,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 +299,Price List not selected,价格列表没有选择
 DocType: Employee,Family Background,家庭背景
 DocType: Request for Quotation Supplier,Send Email,发送电子邮件
-apps/erpnext/erpnext/stock/doctype/item/item.py +208,Warning: Invalid Attachment {0},警告：无效的附件{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +206,Warning: Invalid Attachment {0},警告：无效的附件{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +756,No Permission,无此权限
 DocType: Company,Default Bank Account,默认银行账户
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +50,"To filter based on Party, select Party Type first",要根据党的筛选，选择党第一类型
@@ -855,8 +859,8 @@
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.py +40,No employee found,未找到任何雇员
 DocType: Supplier Quotation,Stopped,已停止
 DocType: Item,If subcontracted to a vendor,如果分包给供应商
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生组已经更新。
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +80,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生组已经更新。
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +95,Student Group is already updated.,学生组已经更新。
 DocType: SMS Center,All Customer Contact,所有的客户联系人
 apps/erpnext/erpnext/config/stock.py +153,Upload stock balance via csv.,通过CSV文件上传库存余额
 DocType: Warehouse,Tree Details,树详细信息
@@ -867,8 +871,8 @@
 DocType: Payment Reconciliation,Minimum Invoice Amount,最小发票金额
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +111,{0} {1}: Cost Center {2} does not belong to Company {3},{0} {1}：成本中心{2}不属于公司{3}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +88,{0} {1}: Account {2} cannot be a Group,{0} {1}帐户{2}不能是一个组
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +60,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +262,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +61,Item Row {idx}: {doctype} {docname} does not exist in above '{doctype}' table,项目行{idx}: {文档类型}上不存在'{文档类型}'表
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +271,Timesheet {0} is already completed or cancelled,时间表{0}已完成或取消
 apps/erpnext/erpnext/templates/pages/projects.html +42,No tasks,没有任务
 DocType: Purchase Invoice,"The day of the month on which auto invoice will be generated e.g. 05, 28 etc",每月自动生成发票的日期，例如5号，28号等
 DocType: Asset,Opening Accumulated Depreciation,打开累计折旧
@@ -884,7 +888,7 @@
 DocType: Bin,Moving Average Rate,移动平均价格
 DocType: Production Planning Tool,Select Items,选择品目
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +372,{0} against Bill {1} dated {2},{0}对日期为{2}的账单{1}
-apps/erpnext/erpnext/schools/doctype/course/course.js +11,Course Schedule,课程表
+apps/erpnext/erpnext/schools/doctype/course/course.js +17,Course Schedule,课程表
 DocType: Maintenance Visit,Completion Status,完成状态
 DocType: HR Settings,Enter retirement age in years,在年内进入退休年龄
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +263,Target Warehouse,目标仓库
@@ -892,7 +896,7 @@
 DocType: Item,Allow over delivery or receipt upto this percent,允许在交付或接收高达百分之这
 DocType: Stock Entry,STE-,甜菊
 DocType: Upload Attendance,Import Attendance,导入考勤记录
-apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +20,All Item Groups,所有品目群组
+apps/erpnext/erpnext/public/js/pos/pos.html +115,All Item Groups,所有品目群组
 DocType: Process Payroll,Activity Log,活动日志
 apps/erpnext/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +40,Net Profit / Loss,净利润/亏损
 apps/erpnext/erpnext/config/setup.py +89,Automatically compose message on submission of transactions.,在提交交易时自动编写信息。
@@ -903,7 +907,7 @@
 apps/erpnext/erpnext/config/learn.py +202,Purchase Order to Payment,采购订单到付款
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +48,Projected Qty,预计数量
 DocType: Sales Invoice,Payment Due Date,付款到期日
-apps/erpnext/erpnext/stock/doctype/item/item.js +353,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
+apps/erpnext/erpnext/stock/doctype/item/item.js +341,Item Variant {0} already exists with same attributes,项目变体{0}已经具有相同属性的存在
 apps/erpnext/erpnext/stock/report/stock_ledger/stock_ledger.py +97,'Opening',“打开”
 apps/erpnext/erpnext/setup/doctype/email_digest/templates/default.html +130,Open To Do,开做
 DocType: Notification Control,Delivery Note Message,送货单留言
@@ -919,7 +923,7 @@
 DocType: Item Reorder,Re-Order Qty,再次订货数量
 DocType: Leave Block List Date,Leave Block List Date,禁离日日期
 DocType: Pricing Rule,Price or Discount,价格或折扣
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +75,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +86,Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges,在外购入库单项目表总的相关费用必须是相同的总税费
 DocType: Sales Team,Incentives,奖励
 DocType: SMS Log,Requested Numbers,请求号码
 DocType: Production Planning Tool,Only Obtain Raw Materials,只有取得原料
@@ -948,13 +952,13 @@
 DocType: Supplier Quotation,Is Subcontracted,是否外包
 DocType: Item Attribute,Item Attribute Values,项目属性值
 DocType: Examination Result,Examination Result,考试成绩
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +791,Purchase Receipt,外购入库单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +795,Purchase Receipt,外购入库单
 ,Received Items To Be Billed,要支付的已收项目
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +177,Submitted Salary Slips,提交工资单
 DocType: Employee,Ms,女士
 apps/erpnext/erpnext/config/accounts.py +272,Currency exchange rate master.,货币汇率大师
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +177,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +302,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +194,Reference Doctype must be one of {0},参考文档类型必须是一个{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +303,Unable to find Time Slot in the next {0} days for Operation {1},找不到时隙在未来{0}天操作{1}
 DocType: Production Order,Plan material for sub-assemblies,计划材料为子组件
 apps/erpnext/erpnext/config/selling.py +97,Sales Partners and Territory,销售合作伙伴和地区
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +86,Cannot automatically create Account as there is already stock balance in the Account. You must create a matching account before you can make an entry on this warehouse,由于已有库存余额的帐户无法自动创建帐户。您必须创建一个匹配的帐户，然后才能在这个仓库中的条目
@@ -977,10 +981,9 @@
 DocType: Supplier,Default Payable Accounts,默认应付账户(多个)
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +49,Employee {0} is not active or does not exist,雇员{0}非活动或不存在
 DocType: Fee Structure,Components,组件
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +249,Please enter Asset Category in Item {0},请输入项目资产类别{0}
-apps/erpnext/erpnext/stock/doctype/item/item.py +631,Item Variants {0} updated,项目变体{0}已更新
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +250,Please enter Asset Category in Item {0},请输入项目资产类别{0}
 DocType: Quality Inspection Reading,Reading 6,阅读6
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +863,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +869,Cannot {0} {1} {2} without any negative outstanding invoice,无法{0} {1} {2}没有任何负面的优秀发票
 DocType: Purchase Invoice Advance,Purchase Invoice Advance,购买发票提前
 DocType: Hub Settings,Sync Now,立即同步
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +199,Row {0}: Credit entry can not be linked with a {1},行{0}：信用记录无法被链接的{1}
@@ -994,11 +997,11 @@
 DocType: Item,Is Purchase Item,是否采购项目
 DocType: Asset,Purchase Invoice,购买发票
 DocType: Stock Ledger Entry,Voucher Detail No,凭证详情编号
-apps/erpnext/erpnext/accounts/page/pos/pos.js +719,New Sales Invoice,新的销售发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +729,New Sales Invoice,新的销售发票
 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,开幕日期和截止日期应在同一会计年度
+apps/erpnext/erpnext/public/js/account_tree_grid.js +224,Opening Date and Closing Date should be within same Fiscal Year,开幕日期和截止日期应在同一会计年度
 DocType: Lead,Request for Information,索取资料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +733,Sync Offline Invoices,同步离线发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +743,Sync Offline Invoices,同步离线发票
 DocType: Payment Request,Paid,付费
 DocType: Program Fee,Program Fee,课程费用
 DocType: Salary Slip,Total in words,总字
@@ -1008,7 +1011,7 @@
 DocType: Employee Loan,Sanctioned,制裁
 apps/erpnext/erpnext/accounts/page/pos/pos.js +72, 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/accounts/doctype/sales_invoice/sales_invoice.js +642,"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/accounts/doctype/sales_invoice/sales_invoice.js +643,"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.",对于“产品包”的物品，仓库，序列号和批号将被从“装箱单”表考虑。如果仓库和批次号是相同的任何“产品包”项目的所有包装物品，这些值可以在主项表中输入，值将被复制到“装箱单”表。
 DocType: Job Opening,Publish on website,发布在网站上
 apps/erpnext/erpnext/config/stock.py +17,Shipments to customers.,向客户发货。
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +622,Supplier Invoice Date cannot be greater than Posting Date,供应商发票的日期不能超过过帐日期更大
@@ -1019,7 +1022,7 @@
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +48,Variance,方差
 ,Company Name,公司名称
 DocType: SMS Center,Total Message(s),总信息（s ）
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +843,Select Item for Transfer,对于转让项目选择
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +847,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.,请选择支票存入的银行账户头。
@@ -1030,8 +1033,6 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +132,Row {0}: Payment against Sales/Purchase Order should always be marked as advance,行{0}：付款方式对销售/采购订单应始终被标记为提前
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +16,Chemical,化学品
 DocType: Salary Component Account,Default Bank / Cash account will be automatically updated in Salary Journal Entry when this mode is selected.,默认银行/现金帐户时，会选择此模式可以自动在工资日记条目更新。
-apps/erpnext/erpnext/schools/doctype/grading_structure/grading_structure.py +24,"The intervals for Grade Code {0} overlaps with the grade intervals for other grades. 
-                    Please check intervals {0} and {1} and try again",甲级码间隔{0}随着年级的间隔为其他等级重叠。请检查间隔{0}和{1}，然后重试
 DocType: BOM,Raw Material Cost(Company Currency),原料成本（公司货币）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +732,All items have already been transferred for this Production Order.,所有品目都已经转移到这个生产订单。
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +87,Row # {0}: Rate cannot be greater than the rate used in {1} {2},行＃{0}：速率不能大于{1} {2}中使用的速率
@@ -1044,13 +1045,13 @@
 DocType: BOM Website Item,BOM Website Item,BOM网站项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +168,Upload your letter head and logo. (you can edit them later).,上传你的信头和logo。(您可以在以后对其进行编辑）。
 DocType: Timesheet Detail,Bill,法案
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +84,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +85,Next Depreciation Date is entered as past date,接下来折旧日期输入为过去的日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +170,White,白
 DocType: SMS Center,All Lead (Open),所有潜在客户（开放）
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +230,Row {0}: Qty not available for {4} in warehouse {1} at posting time of the entry ({2} {3}),行{0}：数量不适用于{4}在仓库{1}在发布条目的时间（{2} {3}）
 DocType: Purchase Invoice,Get Advances Paid,获取已付预付款
 DocType: Item,Automatically Create New Batch,自动创建新批
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Make ,使
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Make ,使
 DocType: Student Admission,Admission Start Date,入学开始日期
 DocType: Journal Entry,Total Amount in Words,总金额词
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +7,There was an error. One probable reason could be that you haven't saved the form. Please contact support@erpnext.com if the problem persists.,发生了错误，一个可能的原因可能是您没有保存表单。如果问题仍然存在请联系管理员或support@erpnext.com。
@@ -1058,7 +1059,7 @@
 apps/erpnext/erpnext/controllers/selling_controller.py +155,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,开放数量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +440,Please enter Account for Change Amount,对于涨跌额请输入帐号
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +449,Please enter Account for Change Amount,对于涨跌额请输入帐号
 DocType: Student Batch Name,Student Batch Name,学生批名
 DocType: Holiday List,Holiday List Name,假期列表名称
 DocType: Repayment Schedule,Balance Loan Amount,平衡贷款额
@@ -1078,10 +1079,10 @@
 apps/erpnext/erpnext/public/js/queries.js +88,Please specify a {0},请指定{0}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +71,Removed items with no change in quantity or value.,删除的项目在数量或价值没有变化。
 DocType: Delivery Note,Delivery To,交货对象
-apps/erpnext/erpnext/stock/doctype/item/item.py +654,Attribute table is mandatory,属性表是强制性的
+apps/erpnext/erpnext/stock/doctype/item/item.py +637,Attribute table is mandatory,属性表是强制性的
 DocType: Production Planning Tool,Get Sales Orders,获取销售订单
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +67,{0} can not be negative,{0}不能为负
-apps/erpnext/erpnext/public/js/pos/pos.html +13,Discount,折扣
+apps/erpnext/erpnext/public/js/pos/pos_selected_item.html +11,Discount,折扣
 DocType: Asset,Total Number of Depreciations,折旧总数
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
 DocType: Sales Invoice Item,Rate With Margin,利率保证金
@@ -1097,7 +1098,7 @@
 DocType: Production Plan Item,Reserved Warehouse in Sales Order / Finished Goods Warehouse,在销售订单/成品仓库保留仓库
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +73,Selling Amount,销售金额
 DocType: Repayment Schedule,Interest Amount,利息金额
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +121,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +124,You are the Expense Approver for this record. Please Update the 'Status' and Save,你是本记录的费用审批人，请更新‘状态’字段并保存。
 DocType: Serial No,Creation Document No,创建文档编号
 DocType: Issue,Issue,问题
 DocType: Asset,Scrapped,报废
@@ -1105,12 +1106,12 @@
 apps/erpnext/erpnext/config/stock.py +195,"Attributes for Item Variants. e.g Size, Color etc.",品目变体的属性。如大小，颜色等。
 DocType: Purchase Invoice,Returns,返回
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order_calendar.js +42,WIP Warehouse,在制品仓库
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +196,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +195,Serial No {0} is under maintenance contract upto {1},序列号{0}截至至{1}之前在年度保养合同内。
 apps/erpnext/erpnext/config/hr.py +35,Recruitment,招聘
 DocType: Lead,Organization Name,组织名称
 DocType: Tax Rule,Shipping State,运输状态
 ,Projected Quantity as Source,预计库存量的来源
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +58,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +59,Item must be added using 'Get Items from Purchase Receipts' button,项目必须要由“从采购收据获取品目”添加
 DocType: Employee,A-,A-
 DocType: Production Planning Tool,Include non-stock items,包括非股票项目
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +115,Sales Expenses,销售费用
@@ -1118,12 +1119,12 @@
 DocType: GL Entry,Against,针对
 DocType: Item,Default Selling Cost Center,默认销售成本中心
 DocType: Sales Partner,Implementation Partner,实施合作伙伴
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1493,ZIP Code,邮编
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1509,ZIP Code,邮编
 apps/erpnext/erpnext/controllers/selling_controller.py +265,Sales Order {0} is {1},销售订单{0} {1}
 DocType: Opportunity,Contact Info,联系方式
 apps/erpnext/erpnext/config/stock.py +310,Making Stock Entries,制作Stock条目
 DocType: Packing Slip,Net Weight UOM,净重计量单位
-apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +18,{0} Results,{0}结果
+apps/erpnext/erpnext/hr/doctype/training_result/training_result.py +20,{0} Results,{0}结果
 DocType: Item,Default Supplier,默认供应商
 DocType: Manufacturing Settings,Over Production Allowance Percentage,对生产补贴比例
 DocType: Employee Loan,Repayment Schedule,还款计划
@@ -1131,7 +1132,7 @@
 DocType: Holiday List,Get Weekly Off Dates,获取周末日期
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +33,End Date can not be less than Start Date,结束日期不能小于开始日期
 DocType: Sales Person,Select company name first.,请先选择公司名称。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Dr,借方
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Dr,借方
 apps/erpnext/erpnext/config/buying.py +23,Quotations received from Suppliers.,从供应商收到的报价。
 apps/erpnext/erpnext/controllers/selling_controller.py +22,To {0} | {1} {2},{0} | {1} {2}
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +40,Average Age,平均年龄
@@ -1151,7 +1152,7 @@
 DocType: Appraisal Template Goal,Key Performance Area,关键绩效区
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +54,Transportation,运输
 apps/erpnext/erpnext/controllers/item_variant.py +92,Invalid Attribute,无效属性
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +201,{0} {1} must be submitted,{0} {1}必须提交
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +218,{0} {1} must be submitted,{0} {1}必须提交
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +146,Quantity must be less than or equal to {0},量必须小于或等于{0}
 DocType: SMS Center,Total Characters,总字符
 apps/erpnext/erpnext/controllers/buying_controller.py +154,Please select BOM in BOM field for Item {0},请BOM字段中选择BOM的项目{0}
@@ -1162,7 +1163,7 @@
 DocType: Sales Partner,Distributor,经销商
 DocType: Shopping Cart Shipping Rule,Shopping Cart Shipping Rule,购物车配送规则
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +224,Production Order {0} must be cancelled before cancelling this Sales Order,生产订单{0}必须取消这个销售订单之前被取消
-apps/erpnext/erpnext/public/js/controllers/transaction.js +52,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
+apps/erpnext/erpnext/public/js/controllers/transaction.js +71,Please set 'Apply Additional Discount On',请设置“收取额外折扣”
 ,Ordered Items To Be Billed,订购物品被标榜
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +46,From Range has to be less than To Range,从范围必须小于要范围
 DocType: Global Defaults,Global Defaults,全局默认值
@@ -1172,7 +1173,7 @@
 apps/erpnext/erpnext/public/js/financial_statements.js +75,Start Year,开始年份
 DocType: Purchase Invoice,Start date of current invoice's period,当前发票周期的起始日期
 DocType: Salary Slip,Leave Without Pay,无薪假期
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +346,Capacity Planning Error,容量规划错误
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +347,Capacity Planning Error,容量规划错误
 ,Trial Balance for Party,试算表的派对
 DocType: Lead,Consultant,顾问
 DocType: Salary Slip,Earnings,盈余
@@ -1187,7 +1188,7 @@
 DocType: Item Attribute Value,"This will be appended to the Item Code of the variant. For example, if your abbreviation is ""SM"", and the item code is ""T-SHIRT"", the item code of the variant will be ""T-SHIRT-SM""",这将追加到变异的项目代码。例如，如果你的英文缩写为“SM”，而该项目的代码是“T-SHIRT”，该变种的项目代码将是“T-SHIRT-SM”
 DocType: Salary Slip,Net Pay (in words) will be visible once you save the Salary Slip.,保存工资单后会显示净支付金额(大写)。
 DocType: Purchase Invoice,Is Return,再来
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +767,Return / Debit Note,返回/借记注
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +771,Return / Debit Note,返回/借记注
 DocType: Price List Country,Price List Country,价目表国家
 DocType: Item,UOMs,计量单位
 apps/erpnext/erpnext/stock/utils.py +182,{0} valid serial nos for Item {1},品目{1}有{0}个有效序列号
@@ -1197,11 +1198,10 @@
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +24,Please enter Item Code to get Batch Number,请输入产品代码来获得批号
 DocType: Stock Settings,Default Item Group,默认品目群组
 DocType: Employee Loan,Partially Disbursed,部分已支付
-DocType: Grading Structure,Grading System Name,分级系统名称
 apps/erpnext/erpnext/config/buying.py +38,Supplier database.,供应商数据库。
 DocType: Account,Balance Sheet,资产负债表
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +708,Cost Center For Item with Item Code ',成本中心：品目代码‘
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2334,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +705,Cost Center For Item with Item Code ',成本中心：品目代码‘
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2349,"Payment Mode is not configured. Please check, whether account has been set on Mode of Payments or on POS Profile.",付款方式未配置。请检查是否帐户已就付款方式或POS机配置文件中设置。
 DocType: Opportunity,Your sales person will get a reminder on this date to contact the customer,您的销售人员将在此日期收到联系客户的提醒
 apps/erpnext/erpnext/buying/utils.py +74,Same item cannot be entered multiple times.,同一项目不能输入多次。
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +28,"Further accounts can be made under Groups, but entries can be made against non-Groups",进一步帐户可以根据组进行，但条目可针对非组进行
@@ -1213,7 +1213,7 @@
 ,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 +57,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +58,Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts,采购收据不能在存库分类帐分录和日记账分录下重复提交
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +8,Item 1,项目1
 DocType: Holiday,Holiday,假日
 DocType: Support Settings,Close Issue After Days,关闭问题天后
@@ -1240,11 +1240,11 @@
 DocType: Maintenance Visit Purpose,Work Done,已完成工作
 apps/erpnext/erpnext/controllers/item_variant.py +33,Please specify at least one attribute in the Attributes table,请指定属性表中的至少一个属性
 DocType: Announcement,All Students,所有学生
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +44,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +45,Item {0} must be a non-stock item,项目{0}必须是一个非库存项目
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +18,View Ledger,查看总帐
 DocType: Grading Scale,Intervals,间隔
 apps/erpnext/erpnext/stock/report/stock_ageing/stock_ageing.py +41,Earliest,最早
-apps/erpnext/erpnext/stock/doctype/item/item.py +512,"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 +510,"An Item Group exists with same name, please change the item name or rename the item group",同名品目群组已存在，请修改品目名或群组名
 apps/erpnext/erpnext/schools/report/absent_student_report/absent_student_report.py +46,Student Mobile No.,学生手机号码
 apps/erpnext/erpnext/setup/setup_wizard/setup_wizard.py +475,Rest Of The World,世界其他地区
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +81,The Item {0} cannot have Batch,物件{0}不能有批次
@@ -1284,9 +1284,9 @@
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +332,Payment of salary from {0} to {1},从{0}工资支付{1}
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +213,Not authorized to edit frozen Account {0},无权修改冻结帐户{0}
 DocType: Journal Entry,Get Outstanding Invoices,获取未清发票
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +64,Sales Order {0} is not valid,销售订单{0}无效
-apps/erpnext/erpnext/utilities/activation.py +92,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
-apps/erpnext/erpnext/setup/doctype/company/company.py +211,"Sorry, companies cannot be merged",抱歉，公司不能合并
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +65,Sales Order {0} is not valid,销售订单{0}无效
+apps/erpnext/erpnext/utilities/activation.py +89,Purchase orders help you plan and follow up on your purchases,采购订单帮助您规划和跟进您的购买
+apps/erpnext/erpnext/setup/doctype/company/company.py +212,"Sorry, companies cannot be merged",抱歉，公司不能合并
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +134,"The total Issue / Transfer quantity {0} in Material Request {1}  \
 							cannot be greater than requested quantity {2} for Item {3}",在材质要求总发行/传输量{0} {1} \不能超过请求的数量{2}的项目更大的{3}
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +159,Small,小
@@ -1307,10 +1307,10 @@
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +90,Indirect Expenses,间接支出
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +83,Row {0}: Qty is mandatory,行{0}：数量是强制性的
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +8,Agriculture,农业
-apps/erpnext/erpnext/accounts/page/pos/pos.js +724,Sync Master Data,同步主数据
+apps/erpnext/erpnext/accounts/page/pos/pos.js +734,Sync Master Data,同步主数据
 apps/erpnext/erpnext/public/js/setup_wizard.js +288,Your Products or Services,您的产品或服务
 DocType: Mode of Payment,Mode of Payment,付款方式
-apps/erpnext/erpnext/stock/doctype/item/item.py +182,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
+apps/erpnext/erpnext/stock/doctype/item/item.py +180,Website Image should be a public file or website URL,网站形象应该是一个公共文件或网站网址
 DocType: Student Applicant,AP,美联社
 DocType: Purchase Invoice Item,BOM,BOM
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.js +37,This is a root item group and cannot be edited.,这是一个root群组，无法被编辑。
@@ -1328,18 +1328,18 @@
 DocType: Student Group Student,Group Roll Number,组卷编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +145,"For {0}, only credit accounts can be linked against another debit entry",对于{0}，贷方分录只能选择贷方账户
 apps/erpnext/erpnext/projects/doctype/project/project.py +70,Total of all task weights should be 1. Please adjust weights of all Project tasks accordingly,所有任务的权重合计应为1。请相应调整的所有项目任务重
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +549,Delivery Note {0} is not submitted,送货单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +558,Delivery Note {0} is not submitted,送货单{0}未提交
 apps/erpnext/erpnext/stock/get_item_details.py +141,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.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +33,"Pricing Rule is first selected based on 'Apply On' field, which can be Item, Item Group or Brand.",定价规则是第一选择是基于“应用在”字段，可以是项目，项目组或品牌。
 DocType: Hub Settings,Seller Website,卖家网站
 DocType: Item,ITEM-,项目-
 apps/erpnext/erpnext/controllers/selling_controller.py +148,Total allocated percentage for sales team should be 100,对于销售团队总分配比例应为100
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +112,Production Order status is {0},生产订单状态为{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +113,Production Order status is {0},生产订单状态为{0}
 DocType: Appraisal Goal,Goal,目标
 DocType: Sales Invoice Item,Edit Description,编辑说明
 ,Team Updates,团队更新
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +778,For Supplier,对供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +782,For Supplier,对供应商
 DocType: Account,Setting Account Type helps in selecting this Account in transactions.,设置帐户类型有助于在交易中选择该帐户。
 DocType: Purchase Invoice,Grand Total (Company Currency),总计（公司货币）
 apps/erpnext/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.js +9,Create Print Format,创建打印格式
@@ -1355,7 +1355,7 @@
 DocType: Depreciation Schedule,Journal Entry,日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +78,{0} items in progress,{0}操作中的单品
 DocType: Workstation,Workstation Name,工作站名称
-DocType: Grade Interval,Grade Code,等级代码
+DocType: Grading Scale Interval,Grade Code,等级代码
 DocType: POS Item Group,POS Item Group,POS项目组
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +17,Email Digest:,邮件摘要：
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +516,BOM {0} does not belong to Item {1},BOM{0}不属于品目{1}
@@ -1372,7 +1372,7 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +116,Hardware,硬件
 DocType: Sales Order,Recurring Upto,经常性高达
 DocType: Attendance,HR Manager,人力资源经理
-apps/erpnext/erpnext/accounts/party.py +161,Please select a Company,请选择一个公司
+apps/erpnext/erpnext/accounts/party.py +164,Please select a Company,请选择一个公司
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +54,Privilege Leave,特权休假
 DocType: Purchase Invoice,Supplier Invoice Date,供应商发票日期
 apps/erpnext/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py +90,You need to enable Shopping Cart,您需要启用购物车
@@ -1388,7 +1388,8 @@
 apps/erpnext/erpnext/demo/setup/setup_data.py +322,Food,食品
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +51,Ageing Range 3,账龄范围3
 DocType: Maintenance Schedule Item,No of Visits,访问数量
-apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +103,Mark Attendence,马克考勤
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +102,Mark Attendence,马克考勤
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +165,Maintenance Schedule {0} exists against {1},针对{1}存在维护计划{0}
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.js +32,Enrolling student,招生学生
 apps/erpnext/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py +33,Currency of the Closing Account must be {0},在关闭帐户的货币必须是{0}
 apps/erpnext/erpnext/hr/doctype/appraisal_template/appraisal_template.py +21,Sum of points for all goals should be 100. It is {0},对所有目标点的总和应该是100。{0}
@@ -1413,7 +1414,7 @@
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +42,Avg Daily Outgoing,平均每日出货
 DocType: POS Profile,Campaign,活动
 DocType: Supplier,Name and Type,名称和类型
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +56,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +57,Approval Status must be 'Approved' or 'Rejected',审批状态必须被“已批准”或“已拒绝”
 DocType: Purchase Invoice,Contact Person,联络人
 apps/erpnext/erpnext/projects/doctype/task/task.py +37,'Expected Start Date' can not be greater than 'Expected End Date',“预计开始日期”不能大于“预计结束日期'
 DocType: Course Scheduling Tool,Course End Date,课程结束日期
@@ -1436,14 +1437,15 @@
 DocType: Sales Invoice,Shipping Address Name,送货地址姓名
 apps/erpnext/erpnext/accounts/doctype/account/account.js +49,Chart of Accounts,科目表
 DocType: Material Request,Terms and Conditions Content,条款和条件内容
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +575,cannot be greater than 100,不能大于100
-apps/erpnext/erpnext/stock/doctype/item/item.py +712,Item {0} is not a stock Item,项目{0}不是库存项目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +576,cannot be greater than 100,不能大于100
+apps/erpnext/erpnext/stock/doctype/item/item.py +689,Item {0} is not a stock Item,项目{0}不是库存项目
 DocType: Maintenance Visit,Unscheduled,计划外
 DocType: Employee,Owned,资
 DocType: Salary Detail,Depends on Leave Without Pay,依赖于无薪休假
 DocType: Pricing Rule,"Higher the number, higher the priority",数字越大，优先级越高
 ,Purchase Invoice Trends,购买发票趋势
 DocType: Employee,Better Prospects,更好的前景
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +106,"Row #{0}: The batch {1} has only {2} qty. Please select another batch which has {3} qty available or split the row into multiple rows, to deliver/issue from multiple batches",行＃{0}：批次{1}只有{2}数量。请选择具有{3}数量的其他批次，或将该行拆分成多个行，以便从多个批次中传递/发布
 DocType: Vehicle,License Plate,牌照
 DocType: Appraisal,Goals,目标
 DocType: Warranty Claim,Warranty / AMC Status,保修/ 年度保养合同状态
@@ -1461,18 +1463,18 @@
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +154,Employee cannot report to himself.,雇员不能向自己报告。
 DocType: Account,"If the account is frozen, entries are allowed to restricted users.",如果科目被冻结，则只有特定用户才能创建分录。
 DocType: Email Digest,Bank Balance,银行存款余额
-apps/erpnext/erpnext/accounts/party.py +224,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
+apps/erpnext/erpnext/accounts/party.py +227,Accounting Entry for {0}: {1} can only be made in currency: {2},会计分录为{0}：{1}只能在货币做：{2}
 DocType: Job Opening,"Job profile, qualifications required etc.",工作概况，要求的学历等。
 DocType: Journal Entry Account,Account Balance,账户余额
 apps/erpnext/erpnext/config/accounts.py +185,Tax Rule for transactions.,税收规则进行的交易。
 DocType: Rename Tool,Type of document to rename.,的文件类型进行重命名。
 apps/erpnext/erpnext/public/js/setup_wizard.js +307,We buy this Item,我们购买这些物件
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户对应收账款{2}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +53,{0} {1}: Customer is required against Receivable account {2},{0} {1}：需要客户支付的应收账款{2}
 DocType: Purchase Invoice,Total Taxes and Charges (Company Currency),总税费和费用（公司货币）
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +60,Show unclosed fiscal year's P&L balances,显示未关闭的会计年度的盈亏平衡
 DocType: Shipping Rule,Shipping Account,送货账户
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +92,{0} {1}: Account {2} is inactive,{0} {1}: 帐户{2}无效
-apps/erpnext/erpnext/utilities/activation.py +83,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
+apps/erpnext/erpnext/utilities/activation.py +80,Make Sales Orders to help you plan your work and deliver on-time,制作销售订单，以帮助你计划你的工作和按时交付
 DocType: Quality Inspection,Readings,阅读
 DocType: Stock Entry,Total Additional Costs,总额外费用
 DocType: Course Schedule,SH,SH
@@ -1483,7 +1485,7 @@
 DocType: Shipping Rule Condition,To Value,To值
 DocType: Asset Movement,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/delivery_note/delivery_note.js +814,Packing Slip,装箱单
+apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.js +811,Packing Slip,装箱单
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +108,Office Rent,办公室租金
 apps/erpnext/erpnext/config/setup.py +111,Setup SMS gateway settings,短信网关的设置
 apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.js +60,Import Failed!,导入失败！
@@ -1505,11 +1507,11 @@
 DocType: Company,Services,服务
 DocType: HR Settings,Email Salary Slip to Employee,电子邮件工资单给员工
 DocType: Cost Center,Parent Cost Center,父成本中心
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +872,Select Possible Supplier,选择潜在供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +876,Select Possible Supplier,选择潜在供应商
 DocType: Sales Invoice,Source,源
 apps/erpnext/erpnext/templates/pages/projects.html +31,Show closed,显示关闭
 DocType: Leave Type,Is Leave Without Pay,是无薪休假
-apps/erpnext/erpnext/stock/doctype/item/item.py +240,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
+apps/erpnext/erpnext/stock/doctype/item/item.py +238,Asset Category is mandatory for Fixed Asset item,资产类别是强制性的固定资产项目
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +145,No records found in the Payment table,没有在支付表中找到记录
 apps/erpnext/erpnext/schools/utils.py +19,This {0} conflicts with {1} for {2} {3},此{0}冲突{1}在{2} {3}
 DocType: Student Attendance Tool,Students HTML,学生HTML
@@ -1527,7 +1529,7 @@
 DocType: Student,Date of Leaving,离开日期
 DocType: Pricing Rule,For Price List,对价格表
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +27,Executive Search,猎头
-apps/erpnext/erpnext/utilities/activation.py +64,Create Leads,建立潜在客户
+apps/erpnext/erpnext/utilities/activation.py +61,Create Leads,建立潜在客户
 DocType: Maintenance Schedule,Schedules,计划任务
 DocType: Purchase Invoice Item,Net Amount,净额
 DocType: Purchase Order Item Supplied,BOM Detail No,BOM详情编号
@@ -1555,9 +1557,9 @@
 DocType: Program Enrollment Tool,Program Enrollments,计划扩招
 DocType: Sales Invoice Item,Brand Name,品牌名称
 DocType: Purchase Receipt,Transporter Details,转运详细
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2509,Default warehouse is required for selected item,默认仓库需要选中的项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2533,Default warehouse is required for selected item,默认仓库需要选中的项目
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Box,箱
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +869,Possible Supplier,可能的供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +873,Possible Supplier,可能的供应商
 apps/erpnext/erpnext/public/js/setup_wizard.js +36,The Organization,组织机构
 DocType: Budget,Monthly Distribution,月度分布
 apps/erpnext/erpnext/selling/doctype/sms_center/sms_center.py +68,Receiver List is empty. Please create Receiver List,接收人列表为空。请创建接收人列表
@@ -1565,8 +1567,8 @@
 DocType: Sales Partner,Sales Partner Target,销售合作伙伴目标
 DocType: Loan Type,Maximum Loan Amount,最高贷款额度
 DocType: Pricing Rule,Pricing Rule,定价规则
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},学生{0}的重复卷号
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +45,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},学生{0}的重复卷号
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +52,Duplicate roll number for student {0},学生{0}的重复卷号
 DocType: Budget,Action if Annual Budget Exceeded,如果行动年度预算超标
 apps/erpnext/erpnext/config/learn.py +197,Material Request to Purchase Order,材料要求采购订单
 DocType: Shopping Cart Settings,Payment Success URL,付款成功URL
@@ -1587,9 +1589,9 @@
 DocType: Employee Loan,Repayment Method,还款方式
 DocType: Products Settings,"If checked, the Home page will be the default Item Group for the website",如果选中，主页将是网站的默认项目组
 DocType: Quality Inspection Reading,Reading 4,阅读4
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +498,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found for Project {1},默认BOM {0}未找到项目{1}
 apps/erpnext/erpnext/config/hr.py +127,Claims for company expense.,公司开支报销
-apps/erpnext/erpnext/utilities/activation.py +119,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
+apps/erpnext/erpnext/utilities/activation.py +116,"Students are at the heart of the system, add all your students",学生在系统的心脏，添加所有的学生
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +81,Row #{0}: Clearance date {1} cannot be before Cheque Date {2},行＃{0}：清除日期{1}无法支票日期前{2}
 DocType: Company,Default Holiday List,默认假期列表
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +187,Row {0}: From Time and To Time of {1} is overlapping with {2},行{0}：从时间和结束时间{1}是具有重叠{2}
@@ -1601,21 +1603,21 @@
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +141,The day(s) on which you are applying for leave are holidays. You need not apply for leave.,这一天（S）对你所申请休假的假期。你不需要申请许可。
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.js +20,Resend Payment Email,重新发送付款电子邮件
 apps/erpnext/erpnext/templates/pages/projects.html +27,New task,新任务
-apps/erpnext/erpnext/utilities/activation.py +75,Make Quotation,请报价
+apps/erpnext/erpnext/utilities/activation.py +72,Make Quotation,请报价
 apps/erpnext/erpnext/config/selling.py +216,Other Reports,其他报告
 DocType: Dependent Task,Dependent Task,相关任务
-apps/erpnext/erpnext/stock/doctype/item/item.py +409,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
+apps/erpnext/erpnext/stock/doctype/item/item.py +407,Conversion factor for default Unit of Measure must be 1 in row {0},行{0}中默认计量单位的转换系数必须是1
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +208,Leave of type {0} cannot be longer than {1},类型为{0}的假期不能长于{1}天
 DocType: Manufacturing Settings,Try planning operations for X days in advance.,尝试规划X天行动提前。
 DocType: HR Settings,Stop Birthday Reminders,停止生日提醒
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +255,Please set Default Payroll Payable Account in Company {0},请公司设定默认应付职工薪酬帐户{0}
 DocType: SMS Center,Receiver List,接收人列表
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1042,Search Item,搜索项目
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1058,Search Item,搜索项目
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +46,Consumed Amount,消耗量
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +98,Net Change in Cash,现金净变动
 DocType: Assessment Plan,Grading Scale,分级量表
-apps/erpnext/erpnext/stock/doctype/item/item.py +404,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +600,Already completed,已经完成
+apps/erpnext/erpnext/stock/doctype/item/item.py +402,Unit of Measure {0} has been entered more than once in Conversion Factor Table,计量单位{0}已经在换算系数表内
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +601,Already completed,已经完成
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +28,Payment Request already exists {0},付款申请已经存在{0}
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +27,Cost of Issued Items,已发料品目成本
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +263,Quantity must not be more than {0},数量不能超过{0}
@@ -1647,12 +1649,13 @@
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.js +41,Make Disbursement Entry,请输入支付
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +138,Row {0}: Advance against Supplier must be debit,行{0}：提前对供应商必须扣除
 DocType: Company,Default Values,默认值
+apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +61,{frequency} Digest,{frequency}摘要
 DocType: Expense Claim,Total Amount Reimbursed,报销金额合计
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle_dashboard.py +5,This is based on logs against this Vehicle. See timeline below for details,这是基于对本车辆的日志。详情请参阅以下时间表
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +41,Collect,搜集
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +82,Against Supplier Invoice {0} dated {1},对日期为{1}的供应商发票{0}
 DocType: Customer,Default Price List,默认价格表
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +242,Asset Movement record {0} created,资产运动记录{0}创建
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +243,Asset Movement record {0} created,资产运动记录{0}创建
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +51,You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global Settings,您不能删除会计年度{0}。会计年度{0}被设置为默认的全局设置
 DocType: Journal Entry,Entry Type,条目类型
 ,Customer Credit Balance,客户贷方余额
@@ -1671,7 +1674,7 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +64,None of the items have any change in quantity or value.,没有一个项目无论在数量或价值的任何变化。
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,强制性领域 - 计划
 apps/erpnext/erpnext/schools/doctype/program_enrollment_tool/program_enrollment_tool.py +16,Mandatory field - Program,强制性领域 - 计划
-apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +48,Warranty Claim,保修申请
+apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.js +46,Warranty Claim,保修申请
 ,Lead Details,线索详情
 DocType: Salary Slip,Loan repayment,偿还借款
 DocType: Purchase Invoice,End date of current invoice's period,当前发票周期的结束日期
@@ -1690,11 +1693,10 @@
 DocType: Employee,Permanent Address,永久地址
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +260,"Advance paid against {0} {1} cannot be greater \
 						than Grand Total {2}",推动打击{0} {1}不能大于付出\超过总计{2}
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +148,Please select item code,请选择商品代码
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +147,Please select item code,请选择商品代码
 DocType: Student Sibling,Studying in Same Institute,就读于同一研究所
 DocType: Territory,Territory Manager,区域经理
 DocType: Packed Item,To Warehouse (Optional),仓库（可选）
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +46,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Payment Entry,Paid Amount (Company Currency),支付的金额（公司货币）
 DocType: Purchase Invoice,Additional Discount,更多优惠
 DocType: Selling Settings,Selling Settings,销售设置
@@ -1704,9 +1706,9 @@
 apps/erpnext/erpnext/templates/generators/item.html +67,View in Cart,查看你的购物车
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +101,Marketing Expenses,市场营销开支
 ,Item Shortage Report,项目短缺报告
-apps/erpnext/erpnext/stock/doctype/item/item.js +269,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
+apps/erpnext/erpnext/stock/doctype/item/item.js +257,"Weight is mentioned,\nPlease mention ""Weight UOM"" too",重量被提及，\n请注明“重量计量单位”
 DocType: Stock Entry Detail,Material Request used to make this Stock Entry,创建此库存记录的物料申请
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +67,Next Depreciation Date is mandatory for new asset,接下来折旧日期是强制性的新资产
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +68,Next Depreciation Date is mandatory for new asset,接下来折旧日期是强制性的新资产
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
 DocType: Student Group Creation Tool,Separate course based Group for every Batch,为每个批次分离基于课程的组
 apps/erpnext/erpnext/config/support.py +32,Single unit of an Item.,此品目的一件。
@@ -1723,9 +1725,7 @@
 DocType: Course Assessment Criteria,Weightage,权重
 DocType: Packing Slip,PS-,PS-
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +67,{0} {1}: Cost Center is required for 'Profit and Loss' account {2}. Please set up a default Cost Center for the Company.,{0} {1}：需要的损益“账户成本中心{2}。请设置为公司默认的成本中心。
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +125,A Customer Group exists with same name please change the Customer name or rename the Customer Group,同名的客户组已经存在，请更改客户姓名或重命名该客户组
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +49,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +108,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
@@ -1742,7 +1742,7 @@
 ,Item-wise Sales Register,逐项销售登记
 DocType: Asset,Gross Purchase Amount,总购买金额
 DocType: Asset,Depreciation Method,折旧方法
-apps/erpnext/erpnext/accounts/page/pos/pos.js +688,Offline,离线
+apps/erpnext/erpnext/accounts/page/pos/pos.js +698,Offline,离线
 DocType: Purchase Taxes and Charges,Is this Tax included in Basic Rate?,此税项是否包含在基本价格中？
 apps/erpnext/erpnext/accounts/report/budget_variance_report/budget_variance_report.py +56,Total Target,总目标
 DocType: Program Course,Required,需要
@@ -1752,20 +1752,19 @@
 DocType: Stock Reconciliation,Reconciliation JSON,基于JSON格式对账
 apps/erpnext/erpnext/accounts/report/financial_statements.html +3,Too many columns. Export the report and print it using a spreadsheet application.,太多的列。导出报表，并使用电子表格应用程序进行打印。
 DocType: Purchase Invoice Item,Batch No,批号
-apps/erpnext/erpnext/setup/utils.py +97,Unable to find exchange rate for {0} to {1} for key date {2},无法找到汇率{0} {1}的关键日期{2}
 DocType: Selling Settings,Allow multiple Sales Orders against a Customer's Purchase Order,允许多个销售订单对客户的采购订单
 DocType: Student Group Instructor,Student Group Instructor,学生组教练
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +59,Guardian2 Mobile No,Guardian2手机号码
-apps/erpnext/erpnext/setup/doctype/company/company.py +190,Main,主
-apps/erpnext/erpnext/stock/doctype/item/item.js +62,Variant,变体
+apps/erpnext/erpnext/setup/doctype/company/company.py +191,Main,主
+apps/erpnext/erpnext/stock/doctype/item/item.js +60,Variant,变体
 DocType: Naming Series,Set prefix for numbering series on your transactions,为交易设置编号系列的前缀
 DocType: Employee Attendance Tool,Employees HTML,HTML员工
-apps/erpnext/erpnext/stock/doctype/item/item.py +423,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
+apps/erpnext/erpnext/stock/doctype/item/item.py +421,Default BOM ({0}) must be active for this item or its template,默认BOM（{0}）必须是活动的这个项目或者其模板
 DocType: Employee,Leave Encashed?,假期已使用？
 apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +32,Opportunity From field is mandatory,从机会是必选项
 DocType: Email Digest,Annual Expenses,年度支出
 DocType: Item,Variants,变种
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +996,Make Purchase Order,创建采购订单
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +992,Make Purchase Order,创建采购订单
 DocType: SMS Center,Send To,发送到
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +152,There is not enough leave balance for Leave Type {0},假期类型{0}的余额不足了
 DocType: Payment Reconciliation Payment,Allocated amount,分配量
@@ -1773,7 +1772,7 @@
 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 +174,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +175,Work-in-Progress Warehouse is required before Submit,提交前需要指定在制品仓库
 apps/erpnext/erpnext/config/hr.py +40,Applicant for a Job.,求职申请。
 DocType: Purchase Order Item,Warehouse and Reference,仓库及参考
 DocType: Supplier,Statutory info and other general information about your Supplier,供应商的注册信息和其他一般信息
@@ -1781,11 +1780,10 @@
 DocType: Item,Serial Nos and Batches,序列号和批号
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +42,Student Group Strength,学生群体力量
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +222,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +239,Against Journal Entry {0} does not have any unmatched {1} entry,日记帐分录{0}没有不符合的{1}分录
 apps/erpnext/erpnext/config/hr.py +137,Appraisals,估价
 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: Grading Structure,Grading Intervals,分级间隔
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +161,Please enter ,请输入
 apps/erpnext/erpnext/controllers/accounts_controller.py +433,"Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set in Buying Settings",行不能overbill为项目{0} {1}超过{2}。要允许对帐单，请在购买设置中设置
 apps/erpnext/erpnext/stock/report/stock_balance/stock_balance.py +188,Please set filter based on Item or Warehouse,根据项目或仓库请设置过滤器
@@ -1797,17 +1795,18 @@
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +513,BOM {0} must be submitted,BOM{0}未提交
 DocType: Authorization Control,Authorization Control,授权控制
 apps/erpnext/erpnext/controllers/buying_controller.py +301,Row #{0}: Rejected Warehouse is mandatory against rejected Item {1},行＃{0}：拒绝仓库是强制性的反对否决项{1}
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +762,Payment,付款
-apps/erpnext/erpnext/utilities/activation.py +82,Manage your orders,管理您的订单
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +766,Payment,付款
+apps/erpnext/erpnext/utilities/activation.py +79,Manage your orders,管理您的订单
 DocType: Production Order Operation,Actual Time and Cost,实际时间和成本
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +54,Material Request of maximum {0} can be made for Item {1} against Sales Order {2},销售订单{2}中品目{1}的最大物流申请量为{0}
 DocType: Employee,Salutation,称呼
 DocType: Course,Course Abbreviation,当然缩写
 DocType: Student Leave Application,Student Leave Application,学生请假申请
 DocType: Item,Will also apply for variants,会同时应用于变体
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +158,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +159,"Asset cannot be cancelled, as it is already {0}",资产不能被取消，因为它已经是{0}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +29,Employee {0} on Half day on {1},员工{0}上半天{1}
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +41,Total working hours should not be greater than max working hours {0},总的工作时间不应超过最高工时更大{0}
+apps/erpnext/erpnext/templates/pages/task_info.html +90,On,于
 apps/erpnext/erpnext/config/selling.py +62,Bundle items at time of sale.,在销售时捆绑品目。
 DocType: Quotation Item,Actual Qty,实际数量
 DocType: Sales Invoice Item,References,参考
@@ -1817,7 +1816,7 @@
 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 +91,Associate,协理
 DocType: Asset Movement,Asset Movement,资产运动
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2060,New Cart,新的车
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2076,New Cart,新的车
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +44,Item {0} is not a serialized Item,项目{0}不是一个序列项目
 DocType: SMS Center,Create Receiver List,创建接收人列表
 DocType: Vehicle,Wheels,车轮
@@ -1849,10 +1848,10 @@
 DocType: Manufacturing Settings,Disables creation of time logs against Production Orders. Operations shall not be tracked against Production Order,禁止对创作生产订单的时间日志。操作不得对生产订单追踪
 DocType: Student,Student Mobile Number,学生手机号码
 DocType: Item,Has Variants,有变体
-apps/erpnext/erpnext/public/js/utils.js +161,You have already selected items from {0} {1},您已经选择从项目{0} {1}
+apps/erpnext/erpnext/public/js/utils.js +176,You have already selected items from {0} {1},您已经选择从项目{0} {1}
 DocType: Monthly Distribution,Name of the Monthly Distribution,月度分布名称
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,批号是必需的
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +24,Batch ID is mandatory,批号是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +25,Batch ID is mandatory,批号是必需的
 DocType: Sales Person,Parent Sales Person,母公司销售人员
 DocType: Purchase Invoice,Recurring Invoice,常用发票
 apps/erpnext/erpnext/config/learn.py +263,Managing Projects,项目管理
@@ -1860,11 +1859,11 @@
 DocType: Budget,Fiscal Year,财政年度
 DocType: Vehicle Log,Fuel Price,燃油价格
 DocType: Budget,Budget,预算
-apps/erpnext/erpnext/stock/doctype/item/item.py +237,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
+apps/erpnext/erpnext/stock/doctype/item/item.py +235,Fixed Asset Item must be a non-stock item.,固定资产项目必须是一个非库存项目。
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +50,"Budget cannot be assigned against {0}, as it's not an Income or Expense account",财政预算案不能对{0}指定的，因为它不是一个收入或支出帐户
 apps/erpnext/erpnext/selling/report/sales_person_target_variance_item_group_wise/sales_person_target_variance_item_group_wise.py +51,Achieved,已实现
 DocType: Student Admission,Application Form Route,申请表路线
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +67,Territory / Customer,区域/客户
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +66,Territory / Customer,区域/客户
 apps/erpnext/erpnext/public/js/setup_wizard.js +232,e.g. 5,例如5
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +44,Leave Type {0} cannot be allocated since it is leave without pay,休假类型{0}，因为它是停薪留职无法分配
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +166,Row {0}: Allocated amount {1} must be less than or equals to invoice outstanding amount {2},行{0}：已分配量{1}必须小于或等于发票余额{2}
@@ -1884,15 +1883,15 @@
 ,Serial No Status,序列号状态
 DocType: Payment Entry Reference,Outstanding,优秀
 ,Daily Timesheet Summary,每日时间表摘要
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +138,"Row {0}: To set {1} periodicity, difference between from and to date \
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +137,"Row {0}: To set {1} periodicity, difference between from and to date \
 						must be greater than or equal to {2}","行{0}：设置{1}的周期性，从和到日期\
 之间差必须大于或等于{2}"
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +6,This is based on stock movement. See {0} for details,这是基于库存移动。见{0}详情
 DocType: Pricing Rule,Selling,销售
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +351,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +368,Amount {0} {1} deducted against {2},金额{0} {1}抵扣{2}
 DocType: Employee,Salary Information,薪资信息
 DocType: Sales Person,Name and Employee ID,姓名和雇员ID
-apps/erpnext/erpnext/accounts/party.py +286,Due Date cannot be before Posting Date,到期日不能前于过账日期
+apps/erpnext/erpnext/accounts/party.py +289,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 +148,Duties and Taxes,关税与税项
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +356,Please enter Reference date,参考日期请输入
@@ -1904,14 +1903,14 @@
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +152,Cannot refer row number greater than or equal to current row number for this Charge type,此收取类型不能引用大于或等于本行的数据。
 DocType: Asset,Sold,出售
 ,Item-wise Purchase History,逐项采购历史
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +231,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +230,Please click on 'Generate Schedule' to fetch Serial No added for Item {0},请点击“生成表”来获取序列号增加了对项目{0}
 DocType: Account,Frozen,冻结的
 ,Open Production Orders,清生产订单
 DocType: Sales Invoice Payment,Base Amount (Company Currency),基本金额（公司币种）
 DocType: Payment Reconciliation Payment,Reference Row,引用行
 DocType: Installation Note,Installation Time,安装时间
 DocType: Sales Invoice,Accounting Details,会计细节
-apps/erpnext/erpnext/setup/doctype/company/company.js +70,Delete all the Transactions for this Company,删除所有交易本公司
+apps/erpnext/erpnext/setup/doctype/company/company.js +72,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/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +66,Investments,投资
 DocType: Issue,Resolution Details,详细解析
@@ -1944,14 +1943,14 @@
 DocType: Discussion,Discussion,讨论
 DocType: Payment Entry,Transaction ID,事务ID
 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/accounts/doctype/pricing_rule/pricing_rule.js +39,Pricing Rules are further filtered based on quantity.,定价规则进一步过滤基于数量。
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +330,Please set the Date Of Joining for employee {0},请为员工{0}设置加入日期
 DocType: Task,Total Billing Amount (via Time Sheet),总开票金额（通过时间表）
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +61,Repeat Customer Revenue,重复客户收入
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +164,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +165,{0} ({1}) must have role 'Expense Approver',{0} {1}必须有“费用审批人”的角色
 apps/erpnext/erpnext/public/js/setup_wizard.js +303,Pair,对
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +889,Select BOM and Qty for Production,选择BOM和数量生产
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +885,Select BOM and Qty for Production,选择BOM和数量生产
 DocType: Asset,Depreciation Schedule,折旧计划
 DocType: Bank Reconciliation Detail,Against Account,针对科目
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +71,Half Day Date should be between From Date and To Date,半天时间应该是从之间的日期和终止日期
@@ -1965,16 +1964,17 @@
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +186,Please set 'Asset Depreciation Cost Center' in Company {0},请设置在公司的资产折旧成本中心“{0}
 ,Maintenance Schedules,维护计划
 DocType: Task,Actual End Date (via Time Sheet),实际结束日期（通过时间表）
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +363,Amount {0} {1} against {2} {3},数量 {0}{1} 对应 {2}{3}
 ,Quotation Trends,报价趋势
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +159,Item Group not mentioned in item master for item {0},项目{0}的项目群组没有设置
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +330,Debit To account must be a Receivable account,入借帐户必须是应收账科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +339,Debit To account must be a Receivable account,入借帐户必须是应收账科目
 DocType: Shipping Rule Condition,Shipping Amount,发货数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Pending Amount,待审核金额
 DocType: Purchase Invoice Item,Conversion Factor,转换系数
 DocType: Purchase Order,Delivered,已交付
 ,Vehicle Expenses,车辆费用
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +153,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
+DocType: Serial No,Invoice Details,发票明细
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +154,Expected value after useful life must be greater than or equal to {0},使用寿命后预期值必须大于或等于{0}
 DocType: Purchase Receipt,Vehicle Number,车号
 DocType: Purchase Invoice,The date on which recurring invoice will be stop,经常性发票终止日期
 DocType: Employee Loan,Loan Amount,贷款额度
@@ -1993,12 +1993,12 @@
 apps/erpnext/erpnext/templates/pages/projects.html +48,Timesheets,时间表
 DocType: HR Settings,HR Settings,人力资源设置
 DocType: Salary Slip,net pay info,净工资信息
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +123,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +126,Expense Claim is pending approval. Only the Expense Approver can update status.,报销正在等待批准。只有开支审批人才能更改其状态。
 DocType: Email Digest,New Expenses,新的费用
 DocType: Purchase Invoice,Additional Discount Amount,额外的折扣金额
 apps/erpnext/erpnext/controllers/accounts_controller.py +541,"Row #{0}: Qty must be 1, as item is a fixed asset. Please use separate row for multiple qty.",行＃{0}：订购数量必须是1，因为项目是固定资产。请使用单独的行多数量。
 DocType: Leave Block List Allow,Leave Block List Allow,例外用户
-apps/erpnext/erpnext/setup/doctype/company/company.py +275,Abbr can not be blank or space,缩写不能为空或空格
+apps/erpnext/erpnext/setup/doctype/company/company.py +276,Abbr can not be blank or space,缩写不能为空或空格
 apps/erpnext/erpnext/accounts/doctype/account/account.js +53,Group to Non-Group,集团以非组
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +50,Sports,体育
 DocType: Loan Type,Loan Name,贷款名称
@@ -2010,6 +2010,7 @@
 DocType: Purchase Invoice,Warehouse where you are maintaining stock of rejected items,维护拒收物件的仓库
 DocType: Production Order,Skip Material Transfer,跳过材料转移
 DocType: Production Order,Skip Material Transfer,跳过材料转移
+apps/erpnext/erpnext/setup/utils.py +96,Unable to find exchange rate for {0} to {1} for key date {2}. Please create a Currency Exchange record manually,无法为关键日期{2}查找{0}到{1}的汇率。请手动创建货币兑换记录
 apps/erpnext/erpnext/public/js/setup_wizard.js +63,Your financial year ends on,您的会计年度结束于
 DocType: POS Profile,Price List,价格表
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +22,{0} is now the default Fiscal Year. Please refresh your browser for the change to take effect.,默认财政年度已经更新为{0}。请刷新您的浏览器以使更改生效。
@@ -2026,19 +2027,19 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +289,Account {0} is invalid. Account Currency must be {1},帐户{0}是无效的。帐户货币必须是{1}
 apps/erpnext/erpnext/buying/utils.py +34,UOM Conversion factor is required in row {0},行{0}计量单位换算系数是必须项
 DocType: Production Plan Item,material_request_item,material_request_item
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +978,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +988,"Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice or Journal Entry",行＃{0}：参考文件类型必须是销售订单之一，销售发票或日记帐分录
 DocType: Salary Component,Deduction,扣款
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +112,Row {0}: From Time and To Time is mandatory.,行{0}：从时间和时间是强制性的。
 DocType: Stock Reconciliation Item,Amount Difference,金额差异
 apps/erpnext/erpnext/stock/get_item_details.py +286,Item Price added for {0} in Price List {1},加入项目价格为{0}价格表{1}
 apps/erpnext/erpnext/setup/doctype/sales_person/sales_person_tree.js +8,Please enter Employee Id of this sales person,请输入这个销售人员的员工标识
 DocType: Territory,Classification of Customers by region,客户按区域分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +55,Difference Amount must be zero,差量必须是零
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +57,Difference Amount must be zero,差量必须是零
 DocType: Project,Gross Margin,毛利
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +201,Please enter Production Item first,请先输入生产项目
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +45,Calculated Bank Statement balance,计算的银行对账单余额
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.js +64,disabled user,已禁用用户
-apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +744,Quotation,报价
+apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation.js +748,Quotation,报价
 DocType: Quotation,QTN-,QTN-
 DocType: Salary Slip,Total Deduction,扣除总额
 ,Production Analytics,生产Analytics（分析）
@@ -2047,9 +2048,9 @@
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +128,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 +212,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
+apps/erpnext/erpnext/stock/doctype/item/item.py +210,Warning: Invalid SSL certificate on attachment {0},警告：附件{0}中存在无效的SSL证书
 DocType: Student Admission,Eligibility,合格
-apps/erpnext/erpnext/utilities/activation.py +65,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
+apps/erpnext/erpnext/utilities/activation.py +62,"Leads help you get business, add all your contacts and more as your leads",信息帮助你的业务，你所有的联系人和更添加为您的线索
 DocType: Production Order Operation,Actual Operation Time,实际操作时间
 DocType: Authorization Rule,Applicable To (User),适用于(用户)
 DocType: Purchase Taxes and Charges,Deduct,扣款
@@ -2064,7 +2065,7 @@
 DocType: Guardian,Work Address,工作地址
 DocType: Appraisal,Calculate Total Score,计算总分
 DocType: Request for Quotation,Manufacturing Manager,生产经理
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +192,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +191,Serial No {0} is under warranty upto {1},序列号{0}截至至{1}之前在保修内。
 apps/erpnext/erpnext/config/stock.py +158,Split Delivery Note into packages.,分裂送货单成包。
 apps/erpnext/erpnext/hooks.py +87,Shipments,发货
 apps/erpnext/erpnext/accounts/doctype/account/account.py +191,Account balance ({0}) for {1} and stock value ({2}) for warehouse {3} must be same,仓库{3}的{1}和库存值（{2}）的帐户余额（{0}）必须相同
@@ -2087,10 +2088,10 @@
 DocType: Email Digest,Note: Email will not be sent to disabled users,注意：邮件不会发送给已禁用用户
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js +14,Number of Interaction,交互次数
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +41,Select Company...,选择公司...
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +39,Select Company...,选择公司...
 DocType: Leave Control Panel,Leave blank if considered for all departments,如果针对所有部门请留空
 apps/erpnext/erpnext/config/hr.py +219,"Types of employment (permanent, contract, intern etc.).",就业（永久，合同，实习生等）的类型。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +396,{0} is mandatory for Item {1},{0}是{1}的必填项
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +405,{0} is mandatory for Item {1},{0}是{1}的必填项
 DocType: Process Payroll,Fortnightly,半月刊
 DocType: Currency Exchange,From Currency,源货币
 apps/erpnext/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +170,"Please select Allocated Amount, Invoice Type and Invoice Number in atleast one row",请ATLEAST一行选择分配金额，发票类型和发票号码
@@ -2099,14 +2100,14 @@
 DocType: Purchase Invoice Item,Rate (Company Currency),单价（公司货币）
 DocType: Student Guardian,Others,他人
 DocType: Payment Entry,Unallocated Amount,未分配金额
-apps/erpnext/erpnext/templates/includes/product_page.js +69,Cannot find a matching Item. Please select some other value for {0}.,无法找到匹配的项目。请选择其他值{0}。
+apps/erpnext/erpnext/templates/includes/product_page.js +71,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/hr/page/team_updates/team_updates.js +44,No more updates,没有更多的更新
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +146,Cannot select charge type as 'On Previous Row Amount' or 'On Previous Row Total' for first row,第一行的“收取类型”不能是“基于上一行的金额”或者“前一行的总计”
 apps/erpnext/erpnext/selling/doctype/product_bundle/product_bundle.py +29,Child Item should not be a Product Bundle. Please remove item `{0}` and save,子项不应该是一个产品包。请删除项目`{0}`和保存
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +12,Banking,银行业
-apps/erpnext/erpnext/utilities/activation.py +109,Add Timesheets,添加时间表
+apps/erpnext/erpnext/utilities/activation.py +106,Add Timesheets,添加时间表
 DocType: Vehicle Service,Service Item,服务项目
 DocType: Bank Guarantee,Bank Guarantee,银行担保
 DocType: Bank Guarantee,Bank Guarantee,银行担保
@@ -2115,7 +2116,7 @@
 DocType: Bin,Ordered Quantity,订购数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +52,"e.g. ""Build tools for builders""",例如“建筑工人的建筑工具！”
 DocType: Grading Scale,Grading Scale Intervals,分级刻度间隔
-apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能在货币：{3}
+apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +125,{0} {1}: Accounting Entry for {2} can only be made in currency: {3},{0} {1}在{2}会计分录只能用货币单位：{3}
 DocType: Production Order,In Process,进行中
 DocType: Authorization Rule,Itemwise Discount,项目特定的折扣
 apps/erpnext/erpnext/config/accounts.py +69,Tree of financial accounts.,财务账目的树。
@@ -2132,6 +2133,7 @@
 apps/erpnext/erpnext/controllers/accounts_controller.py +563,Row #{0}: Asset {1} is already {2},行＃{0}：资产{1}已经是{2}
 DocType: Quotation Item,Stock Balance,库存余额
 apps/erpnext/erpnext/config/selling.py +316,Sales Order to Payment,销售订单到付款
+apps/erpnext/erpnext/setup/doctype/naming_series/naming_series.py +205,Please set Naming Series for {0} via Setup &gt; Settings &gt; Naming Series,请通过设置&gt;设置&gt;命名系列为{0}设置命名系列
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +85,CEO,CEO
 DocType: Expense Claim Detail,Expense Claim Detail,报销详情
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +860,Please select correct account,请选择正确的帐户
@@ -2156,14 +2158,14 @@
 DocType: Shopping Cart Settings,Prices will not be shown if Price List is not set,价格将不会显示如果没有设置价格
 apps/erpnext/erpnext/accounts/doctype/shipping_rule/shipping_rule.py +28,Please specify a country for this Shipping Rule or check Worldwide Shipping,请指定一个国家的这种运输规则或检查全世界运输
 DocType: Stock Entry,Total Incoming Value,总传入值
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +324,Debit To is required,借记是必需的
-apps/erpnext/erpnext/utilities/activation.py +110,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +333,Debit To is required,借记是必需的
+apps/erpnext/erpnext/utilities/activation.py +107,"Timesheets help keep track of time, cost and billing for activites done by your team",时间表帮助追踪的时间，费用和结算由你的团队做activites
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,Purchase Price List,采购价格表
 DocType: Offer Letter Term,Offer Term,要约期限
 DocType: Quality Inspection,Quality Manager,质量经理
 DocType: Job Applicant,Job Opening,职务空缺
 DocType: Payment Reconciliation,Payment Reconciliation,付款对账
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +154,Please select Incharge Person's name,请选择Incharge人的名字
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +153,Please select Incharge Person's name,请选择Incharge人的名字
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +51,Technology,技术
 apps/erpnext/erpnext/public/js/utils.js +92,Total Unpaid: {0},总未付：{0}
 DocType: BOM Website Operation,BOM Website Operation,BOM网站运营
@@ -2191,23 +2193,23 @@
 DocType: Opportunity,Lost Reason,丧失原因
 apps/erpnext/erpnext/public/js/templates/address_list.html +1,New Address,新地址
 DocType: Quality Inspection,Sample Size,样本大小
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +44,Please enter Receipt Document,请输入收据凭证
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +372,All items have already been invoiced,所有品目已开具发票
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +45,Please enter Receipt Document,请输入收据凭证
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +373,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/doctype/cost_center/cost_center_tree.js +24,Further cost centers can be made under Groups but entries can be made against non-Groups,进一步的成本中心可以根据组进行，但项可以对非组进行
 DocType: Project,External,外部
 apps/erpnext/erpnext/config/setup.py +66,Users and Permissions,用户和权限
 DocType: Vehicle Log,VLOG.,VLOG。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +922,Production Orders Created: {0},生产订单创建：{0}
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +918,Production Orders Created: {0},生产订单创建：{0}
 DocType: Branch,Branch,分支
 DocType: Guardian,Mobile Number,手机号码
 apps/erpnext/erpnext/config/setup.py +61,Printing and Branding,印刷及品牌
 DocType: Bin,Actual Quantity,实际数量
 DocType: Shipping Rule,example: Next Day Shipping,例如：次日发货
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +188,Serial No {0} not found,序列号{0}未找到
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +187,Serial No {0} not found,序列号{0}未找到
 DocType: Scheduling Tool,Student Batch,学生批
 apps/erpnext/erpnext/public/js/setup_wizard.js +242,Your Customers,您的客户
-apps/erpnext/erpnext/utilities/activation.py +120,Make Student,使学生
+apps/erpnext/erpnext/utilities/activation.py +117,Make Student,使学生
 apps/erpnext/erpnext/projects/doctype/project/project.py +190,You have been invited to collaborate on the project: {0},您已被邀请在项目上进行合作：{0}
 DocType: Leave Block List Date,Block Date,禁离日期
 apps/erpnext/erpnext/templates/generators/student_admission.html +23,Apply Now,现在申请
@@ -2231,8 +2233,9 @@
 DocType: SMS Log,Sent To,发给
 DocType: Payment Request,Make Sales Invoice,创建销售发票
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +59,Softwares,软件
-apps/erpnext/erpnext/crm/doctype/lead/lead.py +49,Next Contact Date cannot be in the past,接下来跟日期不能过去
+apps/erpnext/erpnext/crm/doctype/lead/lead.py +50,Next Contact Date cannot be in the past,接下来跟日期不能过去
 DocType: Company,For Reference Only.,仅供参考。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2414,Select Batch No,选择批号
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +52,Invalid {0}: {1},无效的{0}：{1}
 DocType: Purchase Invoice,PINV-RET-,PINV-RET-
 DocType: Sales Invoice Advance,Advance Amount,预付款总额
@@ -2246,7 +2249,7 @@
 apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +51,Case No. cannot be 0,箱号不能为0
 DocType: Item,Show a slideshow at the top of the page,在页面顶部显示幻灯片
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +447,Boms,物料清单
-apps/erpnext/erpnext/stock/doctype/item/item.py +137,Stores,仓库
+apps/erpnext/erpnext/stock/doctype/item/item.py +135,Stores,仓库
 DocType: Serial No,Delivery Time,交货时间
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +27,Ageing Based On,账龄基于
 DocType: Item,End of Life,寿命结束
@@ -2258,12 +2261,12 @@
 DocType: Rename Tool,Rename Tool,重命名工具
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +25,Update Cost,更新成本
 DocType: Item Reorder,Item Reorder,项目重新排序
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +437,Show Salary Slip,显示工资单
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +786,Transfer Material,转印材料
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +438,Show Salary Slip,显示工资单
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +789,Transfer Material,转印材料
 DocType: BOM,"Specify the operations, operating cost and give a unique Operation no to your operations.",设定流程，操作成本及向流程指定唯一的流程编号
 apps/erpnext/erpnext/controllers/status_updater.py +190,This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?,这份文件是超过限制，通过{0} {1}项{4}。你在做另一个{3}对同一{2}？
-apps/erpnext/erpnext/public/js/controllers/transaction.js +1028,Please set recurring after saving,请设置保存后复发
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +726,Select change amount account,选择变化量账户
+apps/erpnext/erpnext/public/js/controllers/transaction.js +1038,Please set recurring after saving,请设置保存后复发
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +735,Select change amount account,选择变化量账户
 DocType: Purchase Invoice,Price List Currency,价格表货币
 DocType: Naming Series,User must always select,用户必须始终选择
 DocType: Stock Settings,Allow Negative Stock,允许负库存
@@ -2274,7 +2277,7 @@
 DocType: Budget Account,Budget Account,预算科目
 DocType: Quality Inspection,Verified By,认证机构
 apps/erpnext/erpnext/setup/doctype/company/company.py +67,"Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency.",因为已有交易不能改变公司的默认货币，请先取消交易。
-DocType: Grade Interval,Grade Description,等级说明
+DocType: Grading Scale Interval,Grade Description,等级说明
 DocType: Stock Entry,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,建立工资单
@@ -2312,7 +2315,7 @@
 DocType: Upload Attendance,Attendance To Date,考勤结束日期
 DocType: Warranty Claim,Raised By,提出
 DocType: Payment Gateway Account,Payment Account,付款帐号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +853,Please specify Company to proceed,请注明公司进行
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +858,Please specify Company to proceed,请注明公司进行
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +22,Net Change in Accounts Receivable,应收账款净额变化
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +50,Compensatory Off,补假
 DocType: Offer Letter,Accepted,已接受
@@ -2321,12 +2324,12 @@
 apps/erpnext/erpnext/setup/doctype/company/company.js +50,Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.,请确保你真的要删除这家公司的所有交易。主数据将保持原样。这个动作不能撤消。
 DocType: Room,Room Number,房间号
 apps/erpnext/erpnext/utilities/transaction_base.py +96,Invalid reference {0} {1},无效的参考{0} {1}
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +163,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +164,{0} ({1}) cannot be greater than planned quanitity ({2}) in Production Order {3},{0} {1}不能大于生产订单{3}的计划数量({2})
 DocType: Shipping Rule,Shipping Rule Label,配送规则标签
 apps/erpnext/erpnext/public/js/conf.js +28,User Forum,用户论坛
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +248,Raw Materials cannot be blank.,原材料不能为空。
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +460,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +459,Quick Journal Entry,快速日记帐分录
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +469,"Could not update stock, invoice contains drop shipping item.",无法更新库存，发票包含下降航运项目。
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +458,Quick Journal Entry,快速日记帐分录
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +140,You can not change rate if BOM mentioned agianst any item,如果任何条目中引用了BOM，你不能更改其税率
 DocType: Employee,Previous Work Experience,以前的工作经验
 DocType: Stock Entry,For Quantity,对于数量
@@ -2334,12 +2337,12 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +241,{0} {1} is not submitted,{0} {1}未提交
 apps/erpnext/erpnext/config/stock.py +27,Requests for items.,请求的项目。
 DocType: Production Planning Tool,Separate production order will be created for each finished good item.,独立的生产订单将每个成品项目被创建。
-apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}必须返回文档中负
+apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +126,{0} must be negative in return document,{0}在返回文档中必须为负
 ,Minutes to First Response for Issues,分钟的问题第一个反应
 DocType: Purchase Invoice,Terms and Conditions1,条款和条件1
 apps/erpnext/erpnext/public/js/setup_wizard.js +66,The name of the institute for which you are setting up this system.,该机构的名称要为其建立这个系统。
 DocType: Accounts Settings,"Accounting entry frozen up to this date, nobody can do / modify entry except role specified below.",会计分录冻结截止至此日期，除了以下角色禁止录入/修改。
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +117,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +116,Please save the document before generating maintenance schedule,9 。考虑税收或支出：在本部分中，您可以指定，如果税务/充电仅适用于估值（总共不一部分） ，或只为总（不增加价值的项目） ，或两者兼有。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +28,Project Status,项目状态
 DocType: UOM,Check this to disallow fractions. (for Nos),要对编号禁止分数，请勾选此项。
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +395,The following Production Orders were created:,创建以下生产订单：
@@ -2366,7 +2369,7 @@
 ,Employees working on a holiday,员工在假期工作
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +152,Mark Present,马克现在
 DocType: Project,% Complete Method,完成百分比法
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +201,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +200,Maintenance start date can not be before delivery date for Serial No {0},序列号为{0}的开始日期不能早于交付日期
 DocType: Production Order,Actual End Date,实际结束日期
 DocType: BOM,Operating Cost (Company Currency),营业成本（公司货币）
 DocType: Purchase Invoice,PINV-,PINV-
@@ -2383,7 +2386,7 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +240,Leave Without Pay does not match with approved Leave Application records,停薪留职不批准请假的记录相匹配
 DocType: Campaign,Campaign-.####,活动-.####
 apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +21,Next Steps,下一步
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +749,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +753,Please supply the specified items at the best possible rates,请在提供最好的利率规定的项目
 DocType: Selling Settings,Auto close Opportunity after 15 days,15天之后自动关闭商机
 apps/erpnext/erpnext/public/js/financial_statements.js +83,End Year,结束年份
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +23,Quot/Lead %,报价/铅％
@@ -2433,7 +2436,7 @@
 DocType: Purchase Receipt Item,Recd Quantity,记录数量
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +57,Fee Records Created - {0},费纪录创造 -  {0}
 DocType: Asset Category Account,Asset Category Account,资产类别的帐户
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +105,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +106,Cannot produce more Item {0} than Sales Order quantity {1},不能生产超过销售订单数量{1}的品目{0}
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +539,Stock Entry {0} is not submitted,库存记录{0}不提交
 DocType: Payment Reconciliation,Bank / Cash Account,银行/现金账户
 apps/erpnext/erpnext/crm/doctype/lead/lead.py +44,Next Contact By cannot be same as the Lead Email Address,接着联系到不能相同铅邮箱地址
@@ -2455,7 +2458,8 @@
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +99,Clearance Date not mentioned,清拆日期未提及
 apps/erpnext/erpnext/config/manufacturing.py +7,Production,生产
 DocType: Guardian,Occupation,占用
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +75,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
+apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +74,Row {0}:Start Date must be before End Date,行{0} ：开始日期必须是之前结束日期
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Qty),总计（数量）
 DocType: Sales Invoice,This Document,本文档
 DocType: Installation Note Item,Installed Qty,已安装数量
@@ -2471,15 +2475,15 @@
 apps/erpnext/erpnext/public/js/conf.js +32,Report an Issue,报告问题
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +118,Utility Expenses,基础设施费用
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +64,90-Above,90以上
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +213,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +230,Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher,行＃{0}：日记条目{1}没有帐户{2}或已经对另一凭证匹配
 DocType: Buying Settings,Default Buying Price List,默认采购价格表
 DocType: Process Payroll,Salary Slip Based on Timesheet,基于时间表工资单
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +116,No employee for the above selected criteria OR salary slip already created,已创建的任何雇员对上述选择标准或工资单
 DocType: Notification Control,Sales Order Message,销售订单信息
 apps/erpnext/erpnext/config/setup.py +15,"Set Default Values like Company, Currency, Current Fiscal Year, etc.",设置例如公司，货币，当前财政年度等的默认值
 DocType: Payment Entry,Payment Type,针对选择您要分配款项的发票。
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
-apps/erpnext/erpnext/stock/doctype/batch/batch.py +118,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +122,Please select a Batch for Item {0}. Unable to find a single batch that fulfills this requirement,请选择项目{0}的批次。无法找到满足此要求的单个批次
 DocType: Process Payroll,Select Employees,选择雇员
 DocType: Opportunity,Potential Sales Deal,潜在的销售交易
 DocType: Payment Entry,Cheque/Reference Date,支票/参考日期
@@ -2496,7 +2500,7 @@
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +27,Global POS Profile {0} already created for company {1},全球POS档案{0}的公司已经创建{1}
 DocType: Purchase Order,Ref SQ,参考SQ
 apps/erpnext/erpnext/config/manufacturing.py +74,Replace Item / BOM in all BOMs,更换项目/物料清单中的所有材料明细表
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +52,Receipt document must be submitted,收到文件必须提交
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +53,Receipt document must be submitted,收到文件必须提交
 DocType: Purchase Invoice Item,Received Qty,收到数量
 DocType: Stock Entry Detail,Serial No / Batch,序列号/批次
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +310,Not Paid and Not Delivered,没有支付，未送达
@@ -2505,11 +2509,11 @@
 DocType: Delivery Note,DN-RET-,DN-RET-
 apps/erpnext/erpnext/templates/pages/projects.html +58,No time sheets,没有考勤表
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +123,Leave Type {0} cannot be carry-forwarded,休假类型{0}不能随身转发
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +216,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +215,Maintenance Schedule is not generated for all the items. Please click on 'Generate Schedule',维护计划没有为所有品目生成，请点击“生产计划”
 ,To Produce,以生产
 apps/erpnext/erpnext/config/hr.py +93,Payroll,工资表
 apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +171,"For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included",对于行{0} {1}。以包括{2}中的档案速率，行{3}也必须包括
-apps/erpnext/erpnext/utilities/activation.py +102,Make User,使用户
+apps/erpnext/erpnext/utilities/activation.py +99,Make User,使用户
 DocType: Packing Slip,Identification of the package for the delivery (for print),打包品目的名称
 DocType: Bin,Reserved Quantity,保留数量
 apps/erpnext/erpnext/templates/includes/footer/footer_extension.html +34,Please enter valid email address,请输入有效的电子邮件地址
@@ -2523,15 +2527,16 @@
 apps/erpnext/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py +38,Disabled template must not be default template,残疾人模板必须不能默认模板
 DocType: Account,Income Account,收益账户
 DocType: Payment Request,Amount in customer's currency,量客户的货币
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +783,Delivery,交货
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +780,Delivery,交货
 DocType: Stock Reconciliation Item,Current Qty,目前数量
 DocType: BOM Item,"See ""Rate Of Materials Based On"" in Costing Section",参见成本部分的“材料价格基于”
+apps/erpnext/erpnext/templates/generators/item_group.html +36,Prev,上一页
 DocType: Appraisal Goal,Key Responsibility Area,关键责任区
-apps/erpnext/erpnext/utilities/activation.py +128,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
+apps/erpnext/erpnext/utilities/activation.py +125,"Student Batches help you track attendance, assessments and fees for students",学生批帮助您跟踪学生的出勤，评估和费用
 DocType: Payment Entry,Total Allocated Amount,总拨款额
 DocType: Item Reorder,Material Request Type,物料申请类型
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.py +273,Accural Journal Entry for salaries from {0} to {1},Accural日记条目从{0}薪金{1}
-apps/erpnext/erpnext/accounts/page/pos/pos.js +778,"LocalStorage is full, did not save",localStorage的是满的，没救
+apps/erpnext/erpnext/accounts/page/pos/pos.js +788,"LocalStorage is full, did not save",localStorage的是满的，没救
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +85,Row {0}: UOM Conversion Factor is mandatory,行{0}：计量单位转换系数是必需的
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +20,Ref,参考
 DocType: Budget,Cost Center,成本中心
@@ -2541,16 +2546,16 @@
 DocType: Selling Settings,Hide Customer's Tax Id from Sales Transactions,从销售交易隐藏客户的税号
 DocType: Upload Attendance,Upload HTML,上传HTML
 DocType: Employee,Relieving Date,解除日期
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +12,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +14,"Pricing Rule is made to overwrite Price List / define discount percentage, based on some criteria.",定价规则是由覆盖价格表/定义折扣百分比，基于某些条件。
 DocType: Serial No,Warehouse can only be changed via Stock Entry / Delivery Note / Purchase Receipt,仓库只能通过仓储记录/送货单/采购收据来修改
 DocType: Employee Education,Class / Percentage,类/百分比
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +96,Head of Marketing and Sales,营销和销售主管
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +34,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.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +17,"If selected Pricing Rule is made for 'Price', it will overwrite Price List. Pricing Rule price is the final price, so no further discount should be applied. Hence, in transactions like Sales Order, Purchase Order etc, it will be fetched in 'Rate' field, rather than 'Price List Rate' field.",如果选择的定价规则是由为'价格'，它将覆盖价目表。定价规则价格是最终价格，所以没有进一步的折扣应适用。因此，在像销售订单，采购订单等交易，这将是“速度”字段进账，而不是“价格单率”字段。
 apps/erpnext/erpnext/config/selling.py +174,Track Leads by Industry Type.,轨道信息通过行业类型。
 DocType: Item Supplier,Item Supplier,项目供应商
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +423,Please enter Item Code to get batch no,请输入产品编号，以获得批号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +806,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +424,Please enter Item Code to get batch no,请输入产品编号，以获得批号
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.js +803,Please select a value for {0} quotation_to {1},请选择一个值{0} quotation_to {1}
 apps/erpnext/erpnext/config/selling.py +46,All Addresses.,所有地址。
 DocType: Company,Stock Settings,库存设置
 apps/erpnext/erpnext/accounts/doctype/account/account.py +240,"Merging is only possible if following properties are same in both records. Is Group, Root Type, Company",合并是唯一可能的，如果以下属性中均有记载相同。是集团，根型，公司
@@ -2560,6 +2565,7 @@
 DocType: Training Event,Will send an email about the event to employees with status 'Open',会发邮件有关该事件员工状态“打开”
 DocType: Task,Depends on Tasks,取决于任务
 apps/erpnext/erpnext/config/selling.py +36,Manage Customer Group Tree.,管理客户群组
+DocType: Shopping Cart Settings,Attachments can be shown without enabling the shopping cart,可以显示附件，而不启用购物车
 DocType: Supplier Quotation,SQTN-,SQTN-
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center_tree.js +22,New Cost Center Name,新建成本中心名称
 DocType: Leave Control Panel,Leave Control Panel,假期控制面板
@@ -2572,12 +2578,10 @@
 DocType: Sales Invoice,Debit To,入借
 DocType: Delivery Note,Required only for sample item.,只对样品项目所需。
 DocType: Stock Ledger Entry,Actual Qty After Transaction,事务后实际数量
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +52,Supplier &gt; Supplier Type,供应商&gt;供应商类型
 apps/erpnext/erpnext/hr/report/salary_register/salary_register.py +65,No salary slip found between {0} and {1},没有找到之间的工资单{0}和{1}
 ,Pending SO Items For Purchase Request,待处理的SO项目对于采购申请
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +29,Student Admissions,学生入学
-apps/erpnext/erpnext/accounts/party.py +336,{0} {1} is disabled,{0} {1}已禁用
+apps/erpnext/erpnext/accounts/party.py +339,{0} {1} is disabled,{0} {1}已禁用
 DocType: Supplier,Billing Currency,结算货币
 DocType: Sales Invoice,SINV-RET-,SINV-RET-
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +162,Extra Large,特大号
@@ -2594,9 +2598,9 @@
 DocType: Homepage Featured Product,Homepage Featured Product,首页推荐产品
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +198,All Assessment Groups,所有评估组
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse_tree.js +15,New Warehouse Name,新仓库名称
-apps/erpnext/erpnext/accounts/report/financial_statements.py +226,Total {0} ({1}),总{0}（{1}）
+apps/erpnext/erpnext/accounts/report/financial_statements.py +227,Total {0} ({1}),总{0}（{1}）
 DocType: C-Form Invoice Detail,Territory,区域
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +152,Please mention no of visits required,请注明无需访问
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +151,Please mention no of visits required,请注明无需访问
 DocType: Stock Settings,Default Valuation Method,默认估值方法
 DocType: Vehicle Log,Fuel Qty,燃油数量
 DocType: Production Order Operation,Planned Start Time,计划开始时间
@@ -2612,7 +2616,7 @@
 DocType: Price List,Price List Master,价格表大师
 DocType: Sales Person,All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.,所有的销售交易都可以标记多个**销售人员**，方便你设置和监控目标。
 ,S.O. No.,销售订单号
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +163,Please create Customer from Lead {0},请牵头建立客户{0}
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +165,Please create Customer from Lead {0},请牵头建立客户{0}
 DocType: Price List,Applicable for Countries,适用于国家
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +52,Only Leave Applications with status 'Approved' and 'Rejected' can be submitted,只留下地位的申请“已批准”和“拒绝”，就可以提交
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +51,Student Group Name is mandatory in row {0},学生组名称是强制性的行{0}
@@ -2644,7 +2648,7 @@
 DocType: Project,Copied From,复制自
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +91,Name error: {0},名称错误：{0}
 apps/erpnext/erpnext/stock/doctype/item/item_list.js +8,Shortage,短缺
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +188,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +205,{0} {1} does not associated with {2} {3},{0} {1} 没有关联 {2} {3}
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +18,Attendance for employee {0} is already marked,雇员{0}的考勤已标记
 DocType: Packing Slip,If more than one package of the same type (for print),如果有多个同样类型的打包（用于打印）
 ,Salary Register,薪酬注册
@@ -2663,7 +2667,7 @@
 DocType: Tax Rule,Use for Shopping Cart,使用的购物车
 apps/erpnext/erpnext/controllers/item_variant.py +96,Value {0} for Attribute {1} does not exist in the list of valid Item Attribute Values for Item {2},值{0}的属性{1}不在有效的项目列表中存在的属性值项{2}
 DocType: BOM Item,Scrap %,折旧％
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +45,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +46,"Charges will be distributed proportionately based on item qty or amount, as per your selection",费用会根据你选择的品目数量和金额按比例分配。
 DocType: Maintenance Visit,Purposes,用途
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +110,Atleast one item should be entered with negative quantity in return document,ATLEAST一个项目应该负数量回报文档中输入
 apps/erpnext/erpnext/manufacturing/doctype/workstation/workstation.py +71,"Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations",操作{0}比任何可用的工作时间更长工作站{1}，分解成运行多个操作
@@ -2684,16 +2688,16 @@
 apps/erpnext/erpnext/config/selling.py +105,Manage Territory Tree.,管理区域
 DocType: Journal Entry Account,Sales Invoice,销售发票
 DocType: Journal Entry Account,Party Balance,党平衡
-apps/erpnext/erpnext/accounts/page/pos/pos.js +461,Please select Apply Discount On,请选择适用的折扣
+apps/erpnext/erpnext/accounts/page/pos/pos.js +463,Please select Apply Discount On,请选择适用的折扣
 DocType: Company,Default Receivable Account,默认应收账户
 DocType: Process Payroll,Create Bank Entry for the total salary paid for the above selected criteria,为上述选择条件支付的工资总计创建银行分录
 DocType: Stock Entry,Material Transfer for Manufacture,用于生产的物料转移
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +18,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +20,Discount Percentage can be applied either against a Price List or for all Price List.,折扣百分比可以应用于一个或所有的价目表。
 DocType: Purchase Invoice,Half-yearly,半年一次
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +398,Accounting Entry for Stock,库存的会计分录
 DocType: Vehicle Service,Engine Oil,机油
 DocType: Sales Invoice,Sales Team1,销售团队1
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +38,Item {0} does not exist,产品{0}不存在
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +39,Item {0} does not exist,产品{0}不存在
 DocType: Sales Invoice,Customer Address,客户地址
 DocType: Employee Loan,Loan Details,贷款详情
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +121,Row {0}: Completed Qty must be greater than zero.,行{0}：已完成数量必须大于零。
@@ -2701,24 +2705,24 @@
 DocType: Account,Root Type,根类型
 DocType: Item,FIFO,FIFO
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +131,Row # {0}: Cannot return more than {1} for Item {2},行＃{0}：无法返回超过{1}项{2}
-apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +31,Plot,情节
+apps/erpnext/erpnext/manufacturing/page/production_analytics/production_analytics.js +29,Plot,情节
 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}必须指定目标仓库
 DocType: Cheque Print Template,Primary Settings,主要设置
 DocType: Purchase Invoice,Select Supplier Address,选择供应商地址
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +371,Add Employees,添加员工
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +372,Add Employees,添加员工
 DocType: Purchase Invoice Item,Quality Inspection,质量检验
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +158,Extra Small,超小
 DocType: Company,Standard Template,标准模板
 DocType: Training Event,Theory,理论
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +757,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +761,Warning: Material Requested Qty is less than Minimum Order Qty,警告：物料请求的数量低于最低起订量
 apps/erpnext/erpnext/accounts/doctype/gl_entry/gl_entry.py +211,Account {0} is frozen,科目{0}已冻结
 DocType: Company,Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.,属于本机构的，带独立科目表的法人/附属机构。
 DocType: Payment Request,Mute Email,静音电子邮件
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +29,"Food, Beverage & Tobacco",食品，饮料与烟草
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +623,Can only make payment against unbilled {0},只能使支付对未付款的{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +640,Can only make payment against unbilled {0},只能使支付对未付款的{0}
 apps/erpnext/erpnext/controllers/selling_controller.py +127,Commission rate cannot be greater than 100,佣金率不能大于100
 DocType: Stock Entry,Subcontract,外包
 apps/erpnext/erpnext/public/js/utils/party.js +161,Please enter {0} first,请输入{0}第一
@@ -2758,7 +2762,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +237,Warehouses with existing transaction can not be converted to group.,与现有的交易仓库不能转换为组。
 DocType: Assessment Result Tool,Result HTML,结果HTML
 apps/erpnext/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py +35,Expires On,到期
-apps/erpnext/erpnext/utilities/activation.py +118,Add Students,新增学生
+apps/erpnext/erpnext/utilities/activation.py +115,Add Students,新增学生
 apps/erpnext/erpnext/controllers/recurring_document.py +169,Please select {0},请选择{0}
 DocType: C-Form,C-Form No,C-表编号
 DocType: BOM,Exploded_items,展开品目
@@ -2801,7 +2805,7 @@
 apps/erpnext/erpnext/controllers/trends.py +149,Amt,金额
 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/support/page/support_analytics/support_analytics.js +30,Select Fiscal Year,选择财政年度
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +43,Reorder Level,重新排序级别
 DocType: Company,Chart Of Accounts Template,图表帐户模板
 DocType: Attendance,Attendance Date,考勤日期
@@ -2816,14 +2820,14 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +85,Duplicate entry,重复的条目
 DocType: Program Enrollment Tool,Get Students,让学生
 DocType: Serial No,Under Warranty,在保修期内
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +511,[Error],[错误]
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +512,[Error],[错误]
 DocType: Sales Order,In Words will be visible once you save the Sales Order.,大写金额将在销售订单保存后显示。
 ,Employee Birthday,雇员生日
 DocType: Student Batch Attendance Tool,Student Batch Attendance Tool,学生考勤批处理工具
 apps/erpnext/erpnext/controllers/status_updater.py +199,Limit Crossed,限制交叉
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +55,Venture Capital,创业投资
 apps/erpnext/erpnext/schools/doctype/academic_term/academic_term.py +40,An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.,这个“学年”一个学期{0}和“术语名称”{1}已经存在。请修改这些条目，然后再试一次。
-apps/erpnext/erpnext/stock/doctype/item/item.py +469,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
+apps/erpnext/erpnext/stock/doctype/item/item.py +467,"As there are existing transactions against item {0}, you can not change the value of {1}",由于有对项目{0}现有的交易，你不能改变的值{1}
 DocType: UOM,Must be Whole Number,必须是整数
 DocType: Leave Control Panel,New Leaves Allocated (In Days),新调配的假期(天数)
 apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.py +49,Serial No {0} does not exist,序列号{0}不存在
@@ -2843,7 +2847,7 @@
 DocType: Sales Order,% of materials billed against this Sales Order,此销售订单% 的材料已记账。
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.js +49,Period Closing Entry,期末进入
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +38,Cost Center with existing transactions can not be converted to group,有交易的成本中心不能转化为组
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +333,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +350,Amount {0} {1} {2} {3},金额{0} {1} {2} {3}
 DocType: Account,Depreciation,折旧
 apps/erpnext/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py +49,Supplier(s),供应商
 DocType: Employee Attendance Tool,Employee Attendance Tool,员工考勤工具
@@ -2867,7 +2871,7 @@
 DocType: Supplier,Last Day of the Next Month,下个月的最后一天
 DocType: Support Settings,Auto close Issue after 7 days,7天之后自动关闭问题
 apps/erpnext/erpnext/hr/doctype/leave_allocation/leave_allocation.py +71,"Leave cannot be allocated before {0}, as leave balance has already been carry-forwarded in the future leave allocation record {1}",假，不是之前分配{0}，因为休假余额已经结转转发在未来的假期分配记录{1}
-apps/erpnext/erpnext/accounts/party.py +295,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
+apps/erpnext/erpnext/accounts/party.py +298,Note: Due / Reference Date exceeds allowed customer credit days by {0} day(s),注意：到期日/计入日已超过客户信用日期{0}天。
 apps/erpnext/erpnext/schools/doctype/program/program.js +8,Student Applicant,学生申请
 DocType: Asset Category Account,Accumulated Depreciation Account,累计折旧科目
 DocType: Stock Settings,Freeze Stock Entries,冻结仓储记录
@@ -2878,7 +2882,7 @@
 ,Stock Analytics,库存分析
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +438,Operations cannot be left blank,操作不能留空
 DocType: Maintenance Visit Purpose,Against Document Detail No,对文档详情编号
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Party Type is mandatory,党的类型是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +96,Party Type is mandatory,党的类型是强制性
 DocType: Quality Inspection,Outgoing,传出
 DocType: Material Request,Requested For,对于要求
 DocType: Quotation Item,Against Doctype,对文档类型
@@ -2895,10 +2899,10 @@
 DocType: Asset,Item Code,项目编号
 DocType: Production Planning Tool,Create Production Orders,创建生产订单
 DocType: Serial No,Warranty / AMC Details,保修/ 年度保养合同详情
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +85,Select students manually for the Activity based Group,为基于活动的组手动选择学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.js +100,Select students manually for the Activity based Group,为基于活动的组手动选择学生
 DocType: Journal Entry,User Remark,用户备注
 DocType: Lead,Market Segment,市场分类
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +868,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +874,Paid Amount cannot be greater than total negative outstanding amount {0},支付的金额不能超过总负余额大于{0}
 DocType: Employee Internal Work History,Employee Internal Work History,雇员内部就职经历
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +239,Closing (Dr),结算(借记)
 DocType: Cheque Print Template,Cheque Size,支票大小
@@ -2913,7 +2917,7 @@
 DocType: Production Planning Tool,Create Material Requests,创建物料需要
 DocType: Employee Education,School/University,学校/大学
 DocType: Payment Request,Reference Details,详细参考信息
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +58,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +59,Expected Value After Useful Life must be less than Gross Purchase Amount,期望值使用寿命结束后必须小于总消费金额
 DocType: Sales Invoice Item,Available Qty at Warehouse,库存可用数量
 apps/erpnext/erpnext/accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py +20,Billed Amount,已开票金额
 DocType: Asset,Double Declining Balance,双倍余额递减
@@ -2934,20 +2938,20 @@
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +241,"Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry",差异帐户必须是资产/负债类型的帐户，因为此库存盘点在期初进行
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +107,Disbursed Amount cannot be greater than Loan Amount {0},支付额不能超过贷款金额较大的{0}
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +207,Purchase Order number required for Item {0},所需物品的采购订单号{0}
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +873,Production Order not created,生产订单未创建
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +869,Production Order not created,生产订单未创建
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +18,'From Date' must be after 'To Date',“起始日期”必须早于'终止日期'
 apps/erpnext/erpnext/schools/doctype/student_applicant/student_applicant.py +29,Cannot change status as student {0} is linked with student application {1},无法改变地位的学生{0}与学生申请链接{1}
 DocType: Asset,Fully Depreciated,已提足折旧
 ,Stock Projected Qty,预计库存量
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +406,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +415,Customer {0} does not belong to project {1},客户{0}不属于项目{1}
 DocType: Employee Attendance Tool,Marked Attendance HTML,显着的考勤HTML
-apps/erpnext/erpnext/utilities/activation.py +74,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
+apps/erpnext/erpnext/utilities/activation.py +71,"Quotations are proposals, bids you have sent to your customers",语录是建议，你已经发送到你的客户提高出价
 DocType: Sales Order,Customer's Purchase Order,客户采购订单
 apps/erpnext/erpnext/config/stock.py +112,Serial No and Batch,序列号和批次
 DocType: Warranty Claim,From Company,源公司
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.py +39,Sum of Scores of Assessment Criteria needs to be {0}.,评估标准的得分之和必须是{0}。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +76,Please set Number of Depreciations Booked,请设置折旧数预订
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +91,Value or Qty,价值或数量
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +77,Please set Number of Depreciations Booked,请设置折旧数预订
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +89,Value or Qty,价值或数量
 apps/erpnext/erpnext/stock/doctype/material_request/material_request.py +397,Productions Orders cannot be raised for:,制作订单不能上调：
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Minute,分钟
 DocType: Purchase Invoice,Purchase Taxes and Charges,购置税和费
@@ -2960,7 +2964,7 @@
 apps/erpnext/erpnext/patches/v7_0/create_warehouse_nestedset.py +58,All Warehouses,所有仓库
 DocType: Sales Partner,Retailer,零售商
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +107,Credit To account must be a Balance Sheet account,信用帐户必须是资产负债表科目
-apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +124,All Supplier Types,所有供应商类型
+apps/erpnext/erpnext/buying/page/purchase_analytics/purchase_analytics.js +122,All Supplier Types,所有供应商类型
 DocType: Global Defaults,Disable In Words,禁用词
 apps/erpnext/erpnext/stock/doctype/item/item.py +45,Item Code is mandatory because Item is not automatically numbered,项目编号是必须项，因为项目没有自动编号
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +101,Quotation {0} not of type {1},报价{0} 不属于{1}类型
@@ -2969,6 +2973,7 @@
 DocType: Production Order,PRO-,PRO-
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +155,Bank Overdraft Account,银行透支账户
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.js +48,Make Salary Slip,创建工资单
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +79,Row #{0}: Allocated Amount cannot be greater than outstanding amount.,行＃{0}：分配金额不能大于未结算金额。
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.js +28,Browse BOM,浏览BOM
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +153,Secured Loans,抵押贷款
 DocType: Purchase Invoice,Edit Posting Date and Time,编辑投稿时间
@@ -3008,7 +3013,6 @@
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +101,Not allowed to update stock transactions older than {0},不允许对早于{0}的库存交易进行更新
 DocType: Purchase Invoice Item,PR Detail,PR详细
 DocType: Sales Order,Fully Billed,完全开票
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +149,Please set default payable account in the employee {0},请员工支付设置的默认帐户{0}
 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 +127,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),包的总重量，通常是净重+包装材料的重量。 （用于打印）
@@ -3019,7 +3023,7 @@
 DocType: Student Group,Group Based On,基于组
 DocType: Journal Entry,Bill Date,账单日期
 apps/erpnext/erpnext/hr/doctype/vehicle_log/vehicle_log.py +20,"Service Item,Type,frequency and expense amount are required",服务项目，类型，频率和消费金额要求
-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:",有多个最高优先级定价规则时使用以下的内部优先级：
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +45,"Even if there are multiple Pricing Rules with highest priority, then following internal priorities are applied:",有多个最高优先级定价规则时使用以下的内部优先级：
 apps/erpnext/erpnext/hr/doctype/process_payroll/process_payroll.js +109,Do you really want to Submit all Salary Slip from {0} to {1},难道你真的想从提交{0}所有的工资单{1}
 DocType: Cheque Print Template,Cheque Height,支票高度
 DocType: Supplier,Supplier Details,供应商详情
@@ -3031,7 +3035,7 @@
 DocType: Vehicle Log,Invoice Ref,发票编号
 DocType: Purchase Order,Recurring Order,周期性订单
 DocType: Company,Default Income Account,默认收益账户
-apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +33,Customer Group / Customer,客户群组/客户
+apps/erpnext/erpnext/selling/page/sales_analytics/sales_analytics.js +32,Customer Group / Customer,客户群组/客户
 apps/erpnext/erpnext/accounts/report/balance_sheet/balance_sheet.py +37,Unclosed Fiscal Years Profit / Loss (Credit),未关闭的财年利润/损失（信用）
 DocType: Sales Invoice,Time Sheets,考勤表
 DocType: Payment Gateway Account,Default Payment Request Message,默认的付款请求消息
@@ -3051,10 +3055,10 @@
 DocType: Notification Control,Quotation Message,报价信息
 DocType: Employee Loan,Employee Loan Application,职工贷款申请
 DocType: Issue,Opening Date,开幕日期
-apps/erpnext/erpnext/schools/api.py +69,Attendance has been marked successfully.,出席已成功标记。
+apps/erpnext/erpnext/schools/api.py +77,Attendance has been marked successfully.,出席已成功标记。
 DocType: Journal Entry,Remark,备注
 DocType: Purchase Receipt Item,Rate and Amount,单价及小计
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +146,Account Type for {0} must be {1},帐户类型为{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +163,Account Type for {0} must be {1},帐户类型为{0}必须{1}
 apps/erpnext/erpnext/config/hr.py +55,Leaves and Holiday,叶子度假
 DocType: School Settings,Current Academic Term,当前学术期限
 DocType: School Settings,Current Academic Term,当前学术期限
@@ -3077,7 +3081,7 @@
 apps/erpnext/erpnext/schools/doctype/academic_year/academic_year.js +3,Student Group,学生组
 DocType: Shopping Cart Settings,Quotation Series,报价系列
 apps/erpnext/erpnext/setup/doctype/item_group/item_group.py +58,"An item exists with same name ({0}), please change the item group name or rename the item",具有名称 {0} 的品目已存在，请更名
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1897,Please select customer,请选择客户
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1913,Please select customer,请选择客户
 DocType: C-Form,I,I
 DocType: Company,Asset Depreciation Cost Center,资产折旧成本中心
 DocType: Sales Order Item,Sales Order Date,销售订单日期
@@ -3096,20 +3100,20 @@
 DocType: Vehicle,Insurance Details,保险详情
 DocType: Account,Payable,支付
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +113,Please enter Repayment Periods,请输入还款期
-apps/erpnext/erpnext/shopping_cart/cart.py +354,Debtors ({0}),债务人（{0}）
+apps/erpnext/erpnext/shopping_cart/cart.py +355,Debtors ({0}),债务人（{0}）
 DocType: Pricing Rule,Margin,利润
 apps/erpnext/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py +57,New Customers,新客户
 apps/erpnext/erpnext/accounts/report/gross_profit/gross_profit.py +76,Gross Profit %,毛利％
 DocType: Appraisal Goal,Weightage (%),权重（％）
 DocType: Bank Reconciliation Detail,Clearance Date,清拆日期
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +61,Gross Purchase Amount is mandatory,总消费金额是强制性
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +62,Gross Purchase Amount is mandatory,总消费金额是强制性
 DocType: Lead,Address Desc,地址倒序
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +82,Party is mandatory,党是强制性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +99,Party is mandatory,党是强制性
 DocType: Journal Entry,JV-,将N-
 DocType: Topic,Topic Name,主题名称
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +36,Atleast one of the Selling or Buying must be selected,必须至少选择'销售'或'采购'其中的一项
-DocType: Grading Structure,Grade Intervals,间隔级
 apps/erpnext/erpnext/public/js/setup_wizard.js +25,Select the nature of your business.,选择您的业务的性质。
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +71,Row #{0}: Duplicate entry in References {1} {2},行＃{0}：引用{1} {2}中的重复条目
 apps/erpnext/erpnext/config/manufacturing.py +57,Where manufacturing operations are carried.,生产流程进行的地方。
 DocType: Asset Movement,Source Warehouse,源仓库
 DocType: Installation Note,Installation Date,安装日期
@@ -3146,7 +3150,7 @@
 apps/erpnext/erpnext/config/setup.py +27,Letter Heads for print templates.,打印模板的信头。
 apps/erpnext/erpnext/config/setup.py +32,Titles for print templates e.g. Proforma Invoice.,标题打印模板例如形式发票。
 DocType: Student Guardian,Student Guardian,学生家长
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +192,Valuation type charges can not marked as Inclusive,估值类型罪名不能标记为包容性
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +193,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.,不同计量单位的项目会导致不正确的（总）净重值。请确保每个品目的净重使用同一个计量单位。
 apps/erpnext/erpnext/stock/report/item_prices/item_prices.py +39,BOM Rate,BOM税率
@@ -3174,7 +3178,7 @@
 DocType: Company,Exchange Gain / Loss Account,兑换收益/损失帐户
 apps/erpnext/erpnext/config/hr.py +7,Employee and Attendance,员工考勤
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +78,Purpose must be one of {0},目的必须是一个{0}
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +117,Fill the form and save it,填写表格并保存
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.js +120,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,社区论坛
 apps/erpnext/erpnext/stock/page/stock_balance/stock_balance.js +51,Actual qty in stock,实际库存数量
@@ -3190,7 +3194,7 @@
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +19,Reorder Qty,再订购数量
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +28,Current Job Openings,当前职位空缺
 DocType: Company,Stock Adjustment Account,库存调整账户
-DocType: Journal Entry,Write Off,抹杀
+apps/erpnext/erpnext/public/js/payment/pos_payment.html +17,Write Off,抹杀
 DocType: Timesheet Detail,Operation ID,操作ID
 DocType: Employee,"System User (login) ID. If set, it will become default for all HR forms.",系统用户的（登录）ID，将作为人力资源表单的默认ID。
 apps/erpnext/erpnext/support/doctype/warranty_claim/warranty_claim.py +16,{0}: From {1},{0}：来自{1}
@@ -3201,27 +3205,28 @@
 DocType: Sales Order Item,Supplier delivers to Customer,供应商提供给客户
 apps/erpnext/erpnext/utilities/bot.py +34,[{0}](#Form/Item/{0}) is out of stock,[{0}](#Form/Item/{0}) 超出了库存
 apps/erpnext/erpnext/controllers/recurring_document.py +177,Next Date must be greater than Posting Date,下一个日期必须大于过帐日期更大
-apps/erpnext/erpnext/public/js/controllers/transaction.js +951,Show tax break-up,展会税分手
-apps/erpnext/erpnext/accounts/party.py +298,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
+apps/erpnext/erpnext/public/js/controllers/transaction.js +969,Show tax break-up,展会税分手
+apps/erpnext/erpnext/accounts/party.py +301,Due / Reference Date cannot be after {0},到期/参照日期不能迟于{0}
 apps/erpnext/erpnext/config/setup.py +51,Data Import and Export,数据导入和导出
 apps/erpnext/erpnext/accounts/doctype/account/account.py +204,"Stock entries exist against Warehouse {0}, hence you cannot re-assign or modify it",Stock条目存在对仓库{0}，因此你不能重新分配或修改
-apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +63,No students Found,没有发现学生
+apps/erpnext/erpnext/schools/doctype/student_group/student_group.py +70,No students Found,没有发现学生
 apps/erpnext/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py +55,Invoice Posting Date,发票发布日期
 apps/erpnext/erpnext/stock/doctype/item/item_dashboard.py +25,Sell,卖
 DocType: Sales Invoice,Rounded Total,总圆角
 DocType: Product Bundle,List items that form the package.,打包的品目列表。
 apps/erpnext/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py +26,Percentage Allocation should be equal to 100%,百分比分配应该等于100 ％
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +531,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +533,Please select Posting Date before selecting Party,在选择之前，甲方请选择发布日期
 DocType: Program Enrollment,School House,学校议院
 DocType: Serial No,Out of AMC,出资产管理公司
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,请选择报价
-apps/erpnext/erpnext/public/js/utils.js +198,Please select Quotations,请选择报价
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +81,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +48,Make Maintenance Visit,创建维护访问
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +177,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,请选择报价
+apps/erpnext/erpnext/public/js/utils.js +213,Please select Quotations,请选择报价
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +82,Number of Depreciations Booked cannot be greater than Total Number of Depreciations,预订折旧数不能超过折旧总数更大
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.js +47,Make Maintenance Visit,创建维护访问
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +160,Please contact to the user who have Sales Master Manager {0} role,请联系，谁拥有硕士学位的销售经理{0}角色的用户
 DocType: Company,Default Cash Account,默认现金账户
 apps/erpnext/erpnext/config/accounts.py +56,Company (not Customer or Supplier) master.,公司(非客户或供应商)大师。
 apps/erpnext/erpnext/schools/doctype/student/student_dashboard.py +6,This is based on the attendance of this Student,这是基于这名学生出席
+apps/erpnext/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js +166,No Students in,没有学生
 apps/erpnext/erpnext/stock/dashboard/item_dashboard.js +166,Add more items or open full form,添加更多项目或全开放形式
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +108,Please enter 'Expected Delivery Date',请输入“预产期”
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +197,Delivery Notes {0} must be cancelled before cancelling this Sales Order,取消这个销售订单之前必须取消送货单{0}
@@ -3253,6 +3258,7 @@
 apps/erpnext/erpnext/stock/report/bom_search/bom_search.js +20,Item 3,项目3
 DocType: Purchase Order,Customer Contact Email,客户联系电子邮件
 DocType: Warranty Claim,Item and Warranty Details,项目和保修细节
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +48,Item Code &gt; Item Group &gt; Brand,商品编号&gt;商品组&gt;品牌
 DocType: Sales Team,Contribution (%),贡献（％）
 apps/erpnext/erpnext/controllers/accounts_controller.py +83,Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified,注意：付款分录不会创建，因为“现金或银行账户”没有指定
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.js +73,Select the Program to fetch mandatory courses.,选择程序以获取强制性课程。
@@ -3268,9 +3274,9 @@
 DocType: Stock Reconciliation Item,Before reconciliation,在对账前
 apps/erpnext/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py +12,To {0},{0}
 DocType: Purchase Invoice,Taxes and Charges Added (Company Currency),已添加的税费（公司货币）
-apps/erpnext/erpnext/stock/doctype/item/item.py +440,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 +438,Item Tax Row {0} must have account of type Tax or Income or Expense or Chargeable,项目税项的行{0}中必须指定类型为税项/收益/支出/应课的账户。
 DocType: Sales Order,Partly Billed,天色帐单
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +42,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +43,Item {0} must be a Fixed Asset Item,项目{0}必须是固定资产项目
 DocType: Item,Default BOM,默认的BOM
 apps/erpnext/erpnext/setup/doctype/company/company.js +48,Please re-type company name to confirm,请确认重新输入公司名称
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +70,Total Outstanding Amt,总街货量金额
@@ -3280,8 +3286,8 @@
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +11,Automotive,汽车
 DocType: Vehicle,Insurance Company,保险公司
 DocType: Asset Category Account,Fixed Asset Account,固定资产帐户
-apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +388,Variable,变量
-apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +47,From Delivery Note,来自送货单
+apps/erpnext/erpnext/hr/doctype/salary_structure/salary_structure.js +389,Variable,变量
+apps/erpnext/erpnext/selling/doctype/installation_note/installation_note.js +51,From Delivery Note,来自送货单
 DocType: Student,Student Email Address,学生的电子邮件地址
 DocType: Timesheet Detail,From Time,起始时间
 apps/erpnext/erpnext/public/js/pos/pos_bill_item.html +12,In Stock: ,有现货
@@ -3293,12 +3299,12 @@
 DocType: Purchase Invoice,Price List Exchange Rate,价目表汇率
 DocType: Purchase Invoice Item,Rate,单价
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +66,Intern,实习生
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1464,Address Name,地址名称
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1480,Address Name,地址名称
 DocType: Stock Entry,From BOM,从BOM
 DocType: Assessment Code,Assessment Code,评估准则
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +35,Basic,基本
 apps/erpnext/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +94,Stock transactions before {0} are frozen,早于{0}的库存事务已冻结
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +220,Please click on 'Generate Schedule',请点击“生成表”
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +219,Please click on 'Generate Schedule',请点击“生成表”
 apps/erpnext/erpnext/config/stock.py +190,"e.g. Kg, Unit, Nos, m",如公斤，单元，号数，米
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +122,Reference No is mandatory if you entered Reference Date,如果输入参考日期，参考编号是强制输入的
 DocType: Bank Reconciliation Detail,Payment Document,付款单据
@@ -3306,19 +3312,19 @@
 DocType: Salary Slip,Salary Structure,薪酬结构
 DocType: Account,Bank,银行
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +9,Airline,航空公司
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +790,Issue Material,发料
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +793,Issue Material,发料
 DocType: Material Request Item,For Warehouse,对仓库
 DocType: Employee,Offer Date,报价有效期
 apps/erpnext/erpnext/selling/page/sales_funnel/sales_funnel.py +33,Quotations,语录
-apps/erpnext/erpnext/accounts/page/pos/pos.js +667,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
+apps/erpnext/erpnext/accounts/page/pos/pos.js +677,You are in offline mode. You will not be able to reload until you have network.,您在离线模式。您将无法重新加载，直到你有网络。
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +46,No Student Groups created.,没有学生团体创建的。
 DocType: Purchase Invoice Item,Serial No,序列号
 apps/erpnext/erpnext/hr/doctype/employee_loan/employee_loan.py +119,Monthly Repayment Amount cannot be greater than Loan Amount,每月还款额不能超过贷款金额较大
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +144,Please enter Maintaince Details first,请输入您的详细维护性第一
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +143,Please enter Maintaince Details first,请输入您的详细维护性第一
 DocType: Purchase Invoice,Print Language,打印语言
 DocType: Salary Slip,Total Working Hours,总的工作时间
 DocType: Stock Entry,Including items for sub assemblies,包括子组件项目
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1826,Enter value must be positive,输入值必须为正
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1842,Enter value must be positive,输入值必须为正
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +102,All Territories,所有的区域
 DocType: Purchase Invoice,Items,项目
 apps/erpnext/erpnext/schools/doctype/program_enrollment/program_enrollment.py +26,Student is already enrolled.,学生已经注册。
@@ -3338,17 +3344,15 @@
 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 +647,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
+apps/erpnext/erpnext/stock/doctype/item/item.py +630,Default Unit of Measure for Variant '{0}' must be same as in Template '{1}',测度变异的默认单位“{0}”必须是相同模板“{1}”
 DocType: Shipping Rule,Calculate Based On,计算基于
 DocType: Delivery Note Item,From Warehouse,从仓库
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +874,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +870,No Items with Bill of Materials to Manufacture,不与物料清单的项目，以制造
 DocType: Assessment Plan,Supervisor Name,主管名称
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
 DocType: Program Enrollment Course,Program Enrollment Course,课程注册课程
-DocType: Grading Structure,Grading Structure,分级结构
 DocType: Purchase Taxes and Charges,Valuation and Total,估值与总计
 DocType: Tax Rule,Shipping City,航运市
-apps/erpnext/erpnext/stock/doctype/item/item.js +68,This Item is a Variant of {0} (Template). Attributes will be copied over from the template unless 'No Copy' is set,该项目是{0}（模板）的变体。属性将被复制的模板，除非“不复制”设置
 DocType: Notification Control,Customize the Notification,自定义通知
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +19,Cash Flow from Operations,运营现金流
 DocType: Sales Invoice,Shipping Rule,配送规则
@@ -3369,8 +3373,8 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +220,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 +516,No default BOM exists for Item {0},品目{0}没有默认的BOM
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +334,Please select Posting Date first,请选择发布日期第一
-apps/erpnext/erpnext/public/js/account_tree_grid.js +211,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +333,Please select Posting Date first,请选择发布日期第一
+apps/erpnext/erpnext/public/js/account_tree_grid.js +210,Opening Date should be before Closing Date,开业日期应该是截止日期之前，
 DocType: Leave Control Panel,Carry Forward,顺延
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +30,Cost Center with existing transactions can not be converted to ledger,有交易的成本中心不能转化为总账
 DocType: Department,Days for which Holidays are blocked for this department.,此部门的禁离日
@@ -3383,7 +3387,7 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +171,Attach Letterhead,附加信头
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
 apps/erpnext/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py +28,Last Communication,最后沟通
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +346,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +347,Cannot deduct when category is for 'Valuation' or 'Valuation and Total',分类是“估值”或“估值和总计”的时候不能扣税。
 apps/erpnext/erpnext/public/js/setup_wizard.js +222,"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}必须指定序列号
 apps/erpnext/erpnext/config/accounts.py +146,Match Payments with Invoices,匹配付款与发票
@@ -3399,7 +3403,7 @@
 apps/erpnext/erpnext/controllers/trends.py +19,Total(Amt),共（AMT）
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +26,Entertainment & Leisure,娱乐休闲
 DocType: Quality Inspection,Item Serial No,项目序列号
-apps/erpnext/erpnext/utilities/activation.py +136,Create Employee Records,建立员工档案
+apps/erpnext/erpnext/utilities/activation.py +133,Create Employee Records,建立员工档案
 apps/erpnext/erpnext/hr/report/monthly_attendance_sheet/monthly_attendance_sheet.py +58,Total Present,总现
 apps/erpnext/erpnext/config/accounts.py +107,Accounting Statements,会计报表
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Hour,小时
@@ -3412,10 +3416,8 @@
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +7,Unknown,未知
 DocType: Shipping Rule,Shipping Rule Conditions,配送规则条件
 DocType: BOM Replace Tool,The new BOM after replacement,更换后的物料清单
-apps/erpnext/erpnext/accounts/page/pos/pos.js +635,Point of Sale,销售点
+apps/erpnext/erpnext/accounts/page/pos/pos.js +645,Point of Sale,销售点
 DocType: Payment Entry,Received Amount,收金额
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
-apps/erpnext/erpnext/hr/doctype/employee/employee.py +23,Please setup Employee Naming System in Human Resource &gt; HR Settings,请在人力资源&gt;人力资源设置中设置员工命名系统
 DocType: Production Planning Tool,"Create for full quantity, ignoring quantity already on order",创建全量，订单已经忽略数量
 DocType: Account,Tax,税项
 apps/erpnext/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py +45,Not Marked,未标记
@@ -3428,9 +3430,9 @@
 DocType: Batch,Source Document Name,源文档名称
 DocType: Batch,Source Document Name,源文档名称
 DocType: Job Opening,Job Title,职位
-apps/erpnext/erpnext/utilities/activation.py +100,Create Users,创建用户
+apps/erpnext/erpnext/utilities/activation.py +97,Create Users,创建用户
 apps/erpnext/erpnext/public/js/setup_wizard.js +304,Gram,公克
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +393,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +394,Quantity to Manufacture must be greater than 0.,量生产必须大于0。
 apps/erpnext/erpnext/config/maintenance.py +17,Visit report for maintenance call.,保养电话的现场报告。
 DocType: Stock Entry,Update Rate and Availability,更新率和可用性
 DocType: Stock Settings,Percentage you are allowed to receive or deliver more against the quantity ordered. For example: If you have ordered 100 units. and your Allowance is 10% then you are allowed to receive 110 units.,百分比你被允许接收或传递更多针对订购的数量。例如：如果您订购100个单位。和你的津贴是10％，那么你被允许接收110个单位。
@@ -3440,28 +3442,30 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +193,Expense account is mandatory for item {0},品目{0}必须指定开支账户
 DocType: BOM,Website Description,网站简介
 apps/erpnext/erpnext/accounts/report/cash_flow/cash_flow.py +42,Net Change in Equity,在净资产收益变化
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +161,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
-apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +42,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +162,Please cancel Purchase Invoice {0} first,请取消采购发票{0}第一
+apps/erpnext/erpnext/hr/doctype/job_applicant/job_applicant.py +43,"Email Address must be unique, already exists for {0}",电子邮件地址必须是唯一的，已经存在了{0}
 DocType: Serial No,AMC Expiry Date,AMC到期时间
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +795,Receipt,收据
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +799,Receipt,收据
 ,Sales Register,销售记录
 DocType: Daily Work Summary Settings Company,Send Emails At,发送电子邮件在
 DocType: Quotation,Quotation Lost Reason,报价丧失原因
 apps/erpnext/erpnext/public/js/setup_wizard.js +14,Select your Domain,选择您的域名
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +340,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +357,Transaction reference no {0} dated {1},交易参考编号{0}日{1}
 apps/erpnext/erpnext/setup/doctype/supplier_type/supplier_type.js +5,There is nothing to edit.,无需编辑。
 apps/erpnext/erpnext/setup/doctype/email_digest/email_digest.py +117,Summary for this month and pending activities,本月和待活动总结
 DocType: Customer Group,Customer Group Name,客户群组名称
+apps/erpnext/erpnext/public/js/pos/pos.html +100,No Customers yet!,还没有客户！
 apps/erpnext/erpnext/public/js/financial_statements.js +56,Cash Flow Statement,现金流量表
 apps/erpnext/erpnext/hr/doctype/employee_loan_application/employee_loan_application.py +23,Loan Amount cannot exceed Maximum Loan Amount of {0},贷款额不能超过最高贷款额度{0}
 apps/erpnext/erpnext/hr/report/vehicle_expenses/vehicle_expenses.py +22,License,执照
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +453,Please remove this Invoice {0} from C-Form {1},请删除此发票{0}从C-表格{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +462,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.py +218,Please enter Write Off Account,请输入核销帐户
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +71,Last Order Date,最后订购日期
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +47,Account {0} does not belongs to company {1},帐户{0}不属于公司{1}
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +828,Serial Numbers in row {0} does not match with Delivery Note,行{0}中的序列号与交货单不匹配
 DocType: Student,Guardian Details,卫详细
 DocType: C-Form,C-Form,C-表
 apps/erpnext/erpnext/config/hr.py +18,Mark Attendance for multiple employees,马克出席了多个员工
@@ -3486,20 +3490,20 @@
 apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +666,Row {0}# Account must be of type 'Fixed Asset',行{0}＃账户的类型必须是&#39;固定资产&#39;
 apps/erpnext/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +36,Out Qty,输出数量
 apps/erpnext/erpnext/config/accounts.py +283,Rules to calculate shipping amount for a sale,用来计算销售运输量的规则
-apps/erpnext/erpnext/selling/doctype/customer/customer.py +51,Series is mandatory,系列是必须项
+apps/erpnext/erpnext/selling/doctype/customer/customer.py +34,Series is mandatory,系列是必须项
 apps/erpnext/erpnext/setup/setup_wizard/industry_type.py +28,Financial Services,金融服务
 DocType: Student Sibling,Student ID,学生卡
 apps/erpnext/erpnext/config/projects.py +40,Types of activities for Time Logs,活动类型的时间记录
 DocType: Tax Rule,Sales,销售
 DocType: Stock Entry Detail,Basic Amount,基本金额
 DocType: Training Event,Exam,考试
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +424,Warehouse required for stock Item {0},物件{0}需要指定仓库
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +433,Warehouse required for stock Item {0},物件{0}需要指定仓库
 DocType: Leave Allocation,Unused leaves,未使用的叶子
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +154,Cr,信用
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +153,Cr,信用
 DocType: Tax Rule,Billing State,计费状态
 apps/erpnext/erpnext/accounts/doctype/asset/asset.js +287,Transfer,转让
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +197,{0} {1} does not associated with Party Account {2},{0} {1}与缔约方帐户{2} 无关联
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +866,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +214,{0} {1} does not associated with Party Account {2},{0} {1}与缔约方帐户{2} 无关联
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +869,Fetch exploded BOM (including sub-assemblies),获取展开BOM（包括子品目）
 DocType: Authorization Rule,Applicable To (Employee),适用于(员工)
 apps/erpnext/erpnext/controllers/accounts_controller.py +123,Due Date is mandatory,截止日期是强制性的
 apps/erpnext/erpnext/controllers/item_variant.py +80,Increment for Attribute {0} cannot be 0,增量属性{0}不能为0
@@ -3510,13 +3514,13 @@
 ,Inactive Customers,不活跃的客户
 DocType: Landed Cost Voucher,LCV,LCV
 DocType: Landed Cost Voucher,Purchase Receipts,购买收据
-apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +27,How Pricing Rule is applied?,定价规则如何被应用？
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +29,How Pricing Rule is applied?,定价规则如何被应用？
 DocType: Stock Entry,Delivery Note No,送货单编号
 DocType: Production Planning Tool,"If checked, only Purchase material requests for final raw materials will be included in the Material Requests. Otherwise, Material Requests for parent items will be created",如果选中，只有购买最终的原料材料的请求将被包含在材料的要求。否则，父件材料的要求将被创建
 DocType: Cheque Print Template,Message to show,信息显示
 DocType: Company,Retail,零售
 DocType: Attendance,Absent,缺席
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +554,Product Bundle,产品包
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +558,Product Bundle,产品包
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +212,Row {0}: Invalid reference {1},行{0}：无效参考{1}
 DocType: Purchase Taxes and Charges Template,Purchase Taxes and Charges Template,购置税和费模板
 DocType: Upload Attendance,Download Template,下载模板
@@ -3526,10 +3530,10 @@
 DocType: Payment Entry,Account Paid From,帐户支付从
 DocType: Purchase Order Item Supplied,Raw Material Item Code,原料产品编号
 DocType: Journal Entry,Write Off Based On,核销基于
-apps/erpnext/erpnext/utilities/activation.py +66,Make Lead,使铅
+apps/erpnext/erpnext/utilities/activation.py +63,Make Lead,使铅
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +110,Print and Stationery,打印和文具
 DocType: Stock Settings,Show Barcode Field,显示条形码域
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +762,Send Supplier Emails,发送电子邮件供应商
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +766,Send Supplier Emails,发送电子邮件供应商
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +115,"Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.",工资已经处理了与{0}和{1}，留下申请期之间不能在此日期范围内的时期。
 apps/erpnext/erpnext/config/stock.py +127,Installation record for a Serial No.,一个序列号的安装记录
 DocType: Guardian Interest,Guardian Interest,卫利息
@@ -3542,6 +3546,7 @@
 DocType: Offer Letter,Awaiting Response,正在等待回应
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +58,Above,以上
 apps/erpnext/erpnext/controllers/item_variant.py +214,Invalid attribute {0} {1},无效的属性{0} {1}
+DocType: Supplier,Mention if non-standard payable account,如果非标准应付账款提到
 DocType: Salary Slip,Earning & Deduction,盈余及扣除
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +36,Optional. This setting will be used to filter in various transactions.,可选。此设置将被应用于各种交易进行过滤。
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +108,Negative Valuation Rate is not allowed,负评估价格是不允许的
@@ -3557,10 +3562,9 @@
 DocType: Production Order Item,Production Order Item,生产订单项目
 apps/erpnext/erpnext/accounts/report/purchase_register/purchase_register.py +16,No record found,未找到记录
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +137,Cost of Scrapped Asset,报废资产成本
-apps/erpnext/erpnext/stock/doctype/material_request/material_request_list.js +9,Partially ordred,部分ordred
 apps/erpnext/erpnext/controllers/stock_controller.py +238,{0} {1}: Cost Center is mandatory for Item {2},{0} {1}：成本中心是品目{2}的必须项
 DocType: Vehicle,Policy No,政策：
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +654,Get Items from Product Bundle,获取从产品捆绑项目
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +658,Get Items from Product Bundle,获取从产品捆绑项目
 DocType: Asset,Straight Line,直线
 DocType: Project User,Project User,项目用户
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +59,Split,分裂
@@ -3577,7 +3581,7 @@
 DocType: Program Enrollment Tool,Get Students From,让学生从
 DocType: Hub Settings,Seller Country,卖家国家
 apps/erpnext/erpnext/config/learn.py +273,Publish Items on Website,公布于网页上的项目
-apps/erpnext/erpnext/utilities/activation.py +127,Group your students in batches,一群学生在分批
+apps/erpnext/erpnext/utilities/activation.py +124,Group your students in batches,一群学生在分批
 DocType: Authorization Rule,Authorization Rule,授权规则
 DocType: Sales Invoice,Terms and Conditions Details,条款和条件详情
 apps/erpnext/erpnext/templates/generators/item.html +85,Specifications,产品规格
@@ -3630,14 +3634,14 @@
 DocType: Bank Reconciliation Detail,Cheque Date,支票日期
 apps/erpnext/erpnext/accounts/doctype/account/account.py +55,Account {0}: Parent account {1} does not belong to company: {2},科目{0}的上级科目{1}不属于公司{2}
 DocType: Program Enrollment Tool,Student Applicants,学生申请
-apps/erpnext/erpnext/setup/doctype/company/company.js +64,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
+apps/erpnext/erpnext/setup/doctype/company/company.js +65,Successfully deleted all transactions related to this company!,成功删除与该公司相关的所有交易！
 apps/erpnext/erpnext/accounts/report/accounts_payable/accounts_payable.js +21,As on Date,随着对日
 DocType: Appraisal,HR,HR
 DocType: Program Enrollment,Enrollment Date,报名日期
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +62,Probation,缓刑
 apps/erpnext/erpnext/config/hr.py +115,Salary Components,工资组件
 DocType: Program Enrollment Tool,New Academic Year,新学年
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +769,Return / Credit Note,返回/信用票据
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +766,Return / Credit Note,返回/信用票据
 DocType: Stock Settings,Auto insert Price List rate if missing,自动插入价目表率，如果丢失
 apps/erpnext/erpnext/accounts/report/accounts_receivable/accounts_receivable.html +28,Total Paid Amount,总支付金额
 DocType: Production Order Item,Transferred Qty,转让数量
@@ -3657,7 +3661,7 @@
 apps/erpnext/erpnext/config/hr.py +65,"Type of leaves like casual, sick etc.",叶似漫不经心，生病等类型
 DocType: Email Digest,Send regular summary reports via Email.,通过电子邮件发送定期汇总报告。
 DocType: Payment Entry,PE-,PE-
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +243,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +244,Please set default account in Expense Claim Type {0},请报销类型设置默认帐户{0}
 DocType: Assessment Result,Student Name,学生姓名
 DocType: Brand,Item Manager,项目经理
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +141,Payroll Payable,应付职工薪酬
@@ -3678,6 +3682,7 @@
 ,Sales Funnel,销售管道
 apps/erpnext/erpnext/setup/doctype/company/company.py +47,Abbreviation is mandatory,缩写是强制性的
 DocType: Project,Task Progress,任务进度
+apps/erpnext/erpnext/templates/includes/navbar/navbar_items.html +7,Cart,车
 ,Qty to Transfer,转移数量
 apps/erpnext/erpnext/config/selling.py +13,Quotes to Leads or Customers.,向潜在客户或客户发出的报价。
 DocType: Stock Settings,Role Allowed to edit frozen stock,角色可以编辑冻结库存
@@ -3705,13 +3710,13 @@
 DocType: Purchase Taxes and Charges,Item Wise Tax Detail,项目特定的税项详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +45,Institute Abbreviation,研究所缩写
 ,Item-wise Price List Rate,逐项价目表率
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +896,Supplier Quotation,供应商报价
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +900,Supplier Quotation,供应商报价
 DocType: Quotation,In Words will be visible once you save the Quotation.,大写金额将在报价单保存后显示。
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 apps/erpnext/erpnext/utilities/transaction_base.py +153,Quantity ({0}) cannot be a fraction in row {1},数量（{0}）不能是行{1}中的分数
 apps/erpnext/erpnext/schools/doctype/fees/fees.js +26,Collect Fees,收费
 DocType: Attendance,ATT-,ATT-
-apps/erpnext/erpnext/stock/doctype/item/item.py +452,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
+apps/erpnext/erpnext/stock/doctype/item/item.py +450,Barcode {0} already used in Item {1},条码{0}已被品目{1}使用
 DocType: Lead,Add to calendar on this date,将此日期添加至日历
 apps/erpnext/erpnext/config/selling.py +86,Rules for adding shipping costs.,规则增加运输成本。
 DocType: Item,Opening Stock,期初库存
@@ -3728,8 +3733,8 @@
 Updated via 'Time Log'",单位为分钟，通过“时间日志”更新
 DocType: Customer,From Lead,来自潜在客户
 apps/erpnext/erpnext/config/manufacturing.py +13,Orders released for production.,发布生产订单。
-apps/erpnext/erpnext/public/js/account_tree_grid.js +67,Select Fiscal Year...,选择财政年度...
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +528,POS Profile required to make POS Entry,需要POS资料，使POS进入
+apps/erpnext/erpnext/public/js/account_tree_grid.js +66,Select Fiscal Year...,选择财政年度...
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +537,POS Profile required to make POS Entry,需要POS资料，使POS进入
 DocType: Program Enrollment Tool,Enroll Students,招生
 DocType: Hub Settings,Name Token,名称令牌
 apps/erpnext/erpnext/patches/v4_0/create_price_list_if_missing.py +21,Standard Selling,标准销售
@@ -3740,7 +3745,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +360,{0} against Sales Invoice {1},{0}不允许销售发票{1}
 DocType: Sales Invoice,SINV-,SINV-
 DocType: Request for Quotation Item,Project Name,项目名称
-DocType: Supplier,Mention if non-standard receivable account,提到如果不规范应收账款
+DocType: Customer,Mention if non-standard receivable account,提到如果不规范应收账款
 DocType: Journal Entry Account,If Income or Expense,收入或支出
 DocType: Production Order,Required Items,所需物品
 DocType: Stock Ledger Entry,Stock Value Difference,库存值差异
@@ -3761,7 +3766,7 @@
 DocType: Sales Person,Set targets Item Group-wise for this Sales Person.,为销售人员设置品次群组特定的目标
 DocType: Stock Settings,Freeze Stocks Older Than [Days],冻结老于此天数的库存
 apps/erpnext/erpnext/controllers/accounts_controller.py +545,Row #{0}: Asset is mandatory for fixed asset purchase/sale,行＃{0}：资产是必须的固定资产购买/销售
-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/accounts/doctype/pricing_rule/pricing_rule.js +42,"If two or more Pricing Rules are found based on the above conditions, Priority is applied. Priority is a number between 0 to 20 while default value is zero (blank). Higher number means it will take precedence if there are multiple Pricing Rules with same conditions.",如果存在多个价格规则，则会应用优先级别。优先权是一个介于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.,允许以下用户批准在禁离日请假的申请。
@@ -3787,7 +3792,7 @@
 apps/erpnext/erpnext/stock/utils.py +100,Item {0} ignored since it is not a stock item,产品{0}不属于库存产品，因此被忽略
 DocType: Appraisal,APRSL,APRSL
 apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +40,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.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +23,"To not apply Pricing Rule in a particular transaction, all applicable Pricing Rules should be disabled.",要在一个特定的交易不适用于定价规则，所有适用的定价规则应该被禁用。
 DocType: Assessment Group,Parent Assessment Group,家长评估小组
 apps/erpnext/erpnext/hr/doctype/job_opening/job_opening.py +27,Jobs,工作
 ,Sales Order Trends,销售订单趋势
@@ -3798,7 +3803,7 @@
 DocType: Stock Entry Detail,Additional Cost,额外费用
 apps/erpnext/erpnext/public/js/setup_wizard.js +62,Financial Year End Date,财政年度结束日期
 apps/erpnext/erpnext/accounts/report/general_ledger/general_ledger.py +39,"Can not filter based on Voucher No, if grouped by Voucher",按凭证分类后不能根据凭证编号过滤
-apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +784,Make Supplier Quotation,创建供应商报价
+apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.js +788,Make Supplier Quotation,创建供应商报价
 DocType: Quality Inspection,Incoming,接收
 DocType: BOM,Materials Required (Exploded),所需物料（正展开）
 apps/erpnext/erpnext/public/js/setup_wizard.js +190,"Add users to your organization, other than yourself",将用户添加到您的组织，除了自己
@@ -3826,6 +3831,7 @@
 DocType: Employee,History In Company,公司内历史
 apps/erpnext/erpnext/config/learn.py +107,Newsletters,简讯
 DocType: Stock Ledger Entry,Stock Ledger Entry,存库分类帐分录
+apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.js +51,Customer &gt; Customer Group &gt; Territory,客户&gt;客户群&gt;领土
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +87,Same item has been entered multiple times,同一项目已进入多次
 DocType: Department,Leave Block List,禁离日列表
 DocType: Sales Invoice,Tax ID,税号
@@ -3835,7 +3841,7 @@
 DocType: Customer,Sales Partner and Commission,销售合作伙伴及佣金
 DocType: Employee Loan,Rate of Interest (%) / Year,利息（％）/年的速率
 ,Project Quantity,工程量
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +72,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py +73,"Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'",共有{0}所有项目为零，可能是你应该“基于分布式费用”改变
 DocType: Opportunity,To Discuss,为了讨论
 apps/erpnext/erpnext/stock/stock_ledger.py +368,{0} units of {1} needed in {2} to complete this transaction.,{0}单位{1}在{2}完成此交易所需。
 DocType: Loan Type,Rate of Interest (%) Yearly,利息率的比例（％）年
@@ -3844,13 +3850,13 @@
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +169,Black,黑
 DocType: BOM Explosion Item,BOM Explosion Item,BOM展开品目
 DocType: Account,Auditor,审计员
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已经产生
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.js +62,{0} items produced,{0}项目已产生
 DocType: Cheque Print Template,Distance from top edge,从顶边的距离
 apps/erpnext/erpnext/stock/get_item_details.py +297,Price List {0} is disabled or does not exist,价格表{0}禁用或不存在
 DocType: Purchase Invoice,Return,回报
 DocType: Production Order Operation,Production Order Operation,生产订单操作
 DocType: Pricing Rule,Disable,禁用
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +153,Mode of payment is required to make a payment,付款方式需要进行付款
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +154,Mode of payment is required to make a payment,付款方式需要进行付款
 DocType: Project Task,Pending Review,待审核
 apps/erpnext/erpnext/accounts/doctype/asset/depreciation.py +110,"Asset {0} cannot be scrapped, as it is already {1}",资产{0}不能被废弃，因为它已经是{1}
 DocType: Task,Total Expense Claim (via Expense Claim),总费用报销（通过费用报销）
@@ -3858,11 +3864,11 @@
 apps/erpnext/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js +177,Mark Absent,马克缺席
 apps/erpnext/erpnext/manufacturing/doctype/bom/bom.py +133,Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2},行{0}：BOM＃的货币{1}应等于所选货币{2}
 DocType: Journal Entry Account,Exchange Rate,汇率
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +546,Sales Order {0} is not submitted,销售订单{0}未提交
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +555,Sales Order {0} is not submitted,销售订单{0}未提交
 DocType: Homepage,Tag Line,标语
 DocType: Fee Component,Fee Component,收费组件
 apps/erpnext/erpnext/config/hr.py +195,Fleet Management,车队的管理
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +894,Add items from,添加的项目
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +898,Add items from,添加的项目
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +101,Warehouse {0}: Parent account {1} does not bolong to the company {2},仓库{0}的上级账户{1}不属于公司{2}
 DocType: Cheque Print Template,Regular,定期
 apps/erpnext/erpnext/schools/doctype/course/course.py +20,Total Weightage of all Assessment Criteria must be 100%,所有评估标准的权重总数要达到100％
@@ -3875,7 +3881,7 @@
 apps/erpnext/erpnext/stock/doctype/warehouse/warehouse.py +144,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 +36,The selected item cannot have Batch,所选项目不能有批次
+apps/erpnext/erpnext/stock/doctype/batch/batch.py +37,The selected item cannot have Batch,所选项目不能有批次
 apps/erpnext/erpnext/stock/stock_ledger.py +456,"Valuation rate not found for the Item {0}, which is required to do accounting entries for {1} {2}. If the item is transacting as a sample item in the {1}, please mention that in the {1} Item table. Otherwise, please create an incoming stock transaction for the item or mention valuation rate in the Item record, and then try submiting/cancelling this entry",估值率未找到项{0}，这是需要做用于记帐条目{1} {2}。如果该项目交易作为样本项目{1}，请提及的是，在{1}项目表。否则，请创建传入股票的交易在项目记录的项目或提估价率，然后尝试submiting /取消此条
 DocType: Delivery Note,% of materials delivered against this Delivery Note,此出货单% 的材料已交货。
 DocType: Project,Customer Details,客户详细信息
@@ -3884,15 +3890,15 @@
 DocType: SMS Settings,Enter url parameter for receiver nos,请输入收件人编号的URL参数
 DocType: Payment Entry,Paid Amount,支付的金额
 DocType: Assessment Plan,Supervisor,监
-apps/erpnext/erpnext/accounts/page/pos/pos.js +694,Online,线上
+apps/erpnext/erpnext/accounts/page/pos/pos.js +704,Online,线上
 ,Available Stock for Packing Items,库存可用打包品目
 DocType: Item Variant,Item Variant,项目变体
 DocType: Assessment Result Tool,Assessment Result Tool,评价结果工具
 DocType: BOM Scrap Item,BOM Scrap Item,BOM项目废料
-apps/erpnext/erpnext/accounts/page/pos/pos.js +855,Submitted orders can not be deleted,提交的订单不能被删除
+apps/erpnext/erpnext/accounts/page/pos/pos.js +865,Submitted orders can not be deleted,提交的订单不能被删除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +118,"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 +80,Quality Management,质量管理
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +40,Item {0} has been disabled,项目{0}已被禁用
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +41,Item {0} has been disabled,项目{0}已被禁用
 DocType: Employee Loan,Repay Fixed Amount per Period,偿还每期固定金额
 apps/erpnext/erpnext/buying/utils.py +47,Please enter quantity for Item {0},请输入量的项目{0}
 DocType: Employee External Work History,Employee External Work History,雇员外部就职经历
@@ -3919,7 +3925,7 @@
 apps/erpnext/erpnext/schools/report/student_and_guardian_contact_details/student_and_guardian_contact_details.py +51,Student Email ID,学生的电子邮件ID
 DocType: Employee,Notice (days),通告（天）
 DocType: Tax Rule,Sales Tax Template,销售税模板
-apps/erpnext/erpnext/accounts/page/pos/pos.js +2328,Select items to save the invoice,选取要保存发票
+apps/erpnext/erpnext/accounts/page/pos/pos.js +2343,Select items to save the invoice,选取要保存发票
 DocType: Employee,Encashment Date,兑现日期
 DocType: Training Event,Internet,互联网
 DocType: Account,Stock Adjustment,库存调整
@@ -3943,7 +3949,7 @@
 DocType: Item Variant Attribute,Attribute,属性
 apps/erpnext/erpnext/stock/doctype/item_attribute/item_attribute.py +43,Please specify from/to range,请从指定/至范围
 DocType: Serial No,Under AMC,在年度保养合同中
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +54,Item valuation rate is recalculated considering landed cost voucher amount,项目的评估价格将基于到岸成本凭证金额重新计算
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +55,Item valuation rate is recalculated considering landed cost voucher amount,项目的评估价格将基于到岸成本凭证金额重新计算
 apps/erpnext/erpnext/config/selling.py +153,Default settings for selling transactions.,销售业务的默认设置。
 DocType: Guardian,Guardian Of ,守护者
 DocType: Grading Scale Interval,Threshold,阈
@@ -3953,6 +3959,7 @@
 DocType: Purchase Invoice,Debit Note Issued,借记发行说明
 DocType: Production Order,Warehouses,仓库
 apps/erpnext/erpnext/accounts/doctype/asset_movement/asset_movement.py +18,{0} asset cannot be transferred,{0}资产不得转让
+apps/erpnext/erpnext/stock/doctype/item/item.js +66,This Item is a Variant of {0} (Template).,此项目是{0}（模板）的变体。
 DocType: Workstation,per hour,每小时
 apps/erpnext/erpnext/config/buying.py +7,Purchasing,购买
 DocType: Announcement,Announcement,公告
@@ -3968,8 +3975,8 @@
 DocType: Account,Receivable,应收账款
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +278,Row #{0}: Not allowed to change Supplier as Purchase Order already exists,行＃{0}：不能更改供应商的采购订单已经存在
 DocType: Accounts Settings,Role that is allowed to submit transactions that exceed credit limits set.,作用是允许提交超过设定信用额度交易的。
-apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +906,Select Items to Manufacture,选择项目，以制造
-apps/erpnext/erpnext/accounts/page/pos/pos.js +919,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
+apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.js +902,Select Items to Manufacture,选择项目，以制造
+apps/erpnext/erpnext/accounts/page/pos/pos.js +929,"Master data syncing, it might take some time",主数据同步，这可能需要一些时间
 DocType: Item,Material Issue,发料
 DocType: Hub Settings,Seller Description,卖家描述
 DocType: Employee Education,Qualification,学历
@@ -3981,7 +3988,7 @@
 apps/erpnext/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +5,Ordered,订购
 DocType: Salary Detail,Component,零件
 DocType: Assessment Criteria,Assessment Criteria Group,评估标准组
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +71,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +72,Opening Accumulated Depreciation must be less than equal to {0},打开累计折旧必须小于等于{0}
 DocType: Warehouse,Warehouse Name,仓库名称
 DocType: Naming Series,Select Transaction,选择交易
 apps/erpnext/erpnext/setup/doctype/authorization_rule/authorization_rule.py +30,Please enter Approving Role or Approving User,请输入角色核准或审批用户
@@ -3994,7 +4001,7 @@
 apps/erpnext/erpnext/accounts/report/trial_balance/trial_balance.py +49,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 +199,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +200,Cannot cancel because submitted Stock Entry {0} exists,不能取消，因为提交的仓储记录{0}已经存在
 DocType: Employee Loan,Disbursement Date,支付日期
 DocType: Vehicle,Vehicle,车辆
 DocType: Purchase Invoice,In Words,大写金额
@@ -4009,14 +4016,14 @@
 apps/erpnext/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py +22,Opp/Lead %,Opp / Lead％
 DocType: Material Request,MREQ-,MREQ-
 ,Asset Depreciations and Balances,资产折旧和平衡
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +329,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +346,Amount {0} {1} transferred from {2} to {3},金额{0} {1}从转移{2}到{3}
 DocType: Sales Invoice,Get Advances Received,获取已收预付款
 DocType: Email Digest,Add/Remove Recipients,添加/删除收件人
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +460,Transaction not allowed against stopped Production Order {0},交易不反对停止生产订单允许{0}
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.js +19,"To set this Fiscal Year as Default, click on 'Set as Default'",要设置这个财政年度为默认值，点击“设为默认”
 apps/erpnext/erpnext/projects/doctype/project/project.py +192,Join,加入
 apps/erpnext/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py +20,Shortage Qty,短缺数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +671,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
+apps/erpnext/erpnext/stock/doctype/item/item.py +654,Item variant {0} exists with same attributes,项目变体{0}存在具有相同属性
 DocType: Employee Loan,Repay from Salary,从工资偿还
 DocType: Leave Application,LAP/,LAP /
 apps/erpnext/erpnext/accounts/doctype/payment_request/payment_request.py +339,Requesting payment against {0} {1} for amount {2},请求对付款{0} {1}量{2}
@@ -4034,7 +4041,7 @@
 DocType: Assessment Result Detail,Assessment Result Detail,评价结果详细
 DocType: Employee Education,Employee Education,雇员教育
 apps/erpnext/erpnext/accounts/doctype/pos_profile/pos_profile.py +46,Duplicate item group found in the item group table,在项目组表中找到重复的项目组
-apps/erpnext/erpnext/public/js/controllers/transaction.js +967,It is needed to fetch Item Details.,这是需要获取项目详细信息。
+apps/erpnext/erpnext/public/js/controllers/transaction.js +985,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}已收到过
@@ -4043,7 +4050,7 @@
 apps/erpnext/erpnext/controllers/stock_controller.py +91,"Warehouse {0} is not linked to any account, please create/link the corresponding (Asset) account for the warehouse.",仓库{0}不会链接到任何帐户，请创建/链接对应的（资产）占仓库。
 DocType: Purchase Invoice,Recurring Id,经常性ID
 DocType: Customer,Sales Team Details,销售团队详情
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1282,Delete permanently?,永久删除？
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1298,Delete permanently?,永久删除？
 DocType: Expense Claim,Total Claimed Amount,总索赔额
 apps/erpnext/erpnext/config/crm.py +17,Potential opportunities for selling.,销售的潜在机会
 apps/erpnext/erpnext/accounts/doctype/pricing_rule/pricing_rule.py +228,Invalid {0},无效的{0}
@@ -4054,13 +4061,14 @@
 DocType: Warehouse,PIN,销
 apps/erpnext/erpnext/setup/setup_wizard/sample_data.py +108,Setup your School in ERPNext,设置你的ERPNext学校
 DocType: Sales Invoice,Base Change Amount (Company Currency),基地涨跌额（公司币种）
-apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +307,No accounting entries for the following warehouses,没有以下仓库的会计分录
+apps/erpnext/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py +308,No accounting entries for the following warehouses,没有以下仓库的会计分录
 apps/erpnext/erpnext/projects/doctype/project/project.js +92,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/inactive_customers/inactive_customers.py +70,Last Order Amount,最后订单金额
+DocType: Task,Is Milestone,是里程碑
 DocType: Daily Work Summary,Email Sent To,电子邮件发送给
 DocType: Budget,Warn,警告
 DocType: Appraisal,"Any other remarks, noteworthy effort that should go in the records.",任何其他言论，值得一提的努力，应该在记录中。
@@ -4081,7 +4089,7 @@
 DocType: Item Attribute Value,Attribute Value,属性值
 ,Itemwise Recommended Reorder Level,项目特定的推荐重订购级别
 DocType: Salary Detail,Salary Detail,薪酬详细
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +962,Please select {0} first,请选择{0}第一
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +971,Please select {0} first,请选择{0}第一
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +795,Batch {0} of Item {1} has expired.,一批项目的{0} {1}已过期。
 DocType: Sales Invoice,Commission,佣金
 apps/erpnext/erpnext/config/manufacturing.py +27,Time Sheet for manufacturing.,时间表制造。
@@ -4093,41 +4101,40 @@
 apps/erpnext/erpnext/stock/doctype/stock_settings/stock_settings.py +24,`Freeze Stocks Older Than` should be smaller than %d days.,`冻结老于此天数的库存`应该比％d天小。
 DocType: Tax Rule,Purchase Tax Template,购置税模板
 ,Project wise Stock Tracking,项目明智的库存跟踪
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +166,Maintenance Schedule {0} exists against {0},维护计划{0}已存在{0}中
 DocType: Stock Entry Detail,Actual Qty (at source/target),实际数量（源/目标）
 DocType: Item Customer Detail,Ref Code,参考代码
 apps/erpnext/erpnext/config/hr.py +12,Employee records.,雇员记录。
-apps/erpnext/erpnext/accounts/doctype/asset/asset.py +91,Please set Next Depreciation Date,请设置下折旧日期
+apps/erpnext/erpnext/accounts/doctype/asset/asset.py +92,Please set Next Depreciation Date,请设置下折旧日期
 DocType: HR Settings,Payroll Settings,薪资设置
 apps/erpnext/erpnext/config/accounts.py +148,Match non-linked Invoices and Payments.,匹配无链接的发票和付款。
 apps/erpnext/erpnext/templates/pages/cart.html +16,Place Order,下订单
 DocType: Email Digest,New Purchase Orders,新建采购订单
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +24,Root cannot have a parent cost center,根本不能有一个父成本中心
-apps/erpnext/erpnext/public/js/stock_analytics.js +58,Select Brand...,选择品牌...
+apps/erpnext/erpnext/public/js/stock_analytics.js +57,Select Brand...,选择品牌...
 apps/erpnext/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py +149,Accumulated Depreciation as on,作为累计折旧
 DocType: Sales Invoice,C-Form Applicable,C-表格适用
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +398,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +399,Operation Time must be greater than 0 for Operation {0},运行时间必须大于0的操作{0}
 apps/erpnext/erpnext/controllers/sales_and_purchase_return.py +105,Warehouse is mandatory,仓库是强制性的
 DocType: Supplier,Address and Contacts,地址和联系方式
 DocType: UOM Conversion Detail,UOM Conversion Detail,计量单位换算详情
 apps/erpnext/erpnext/public/js/setup_wizard.js +172,Keep it web friendly 900px (w) by 100px (h),建议900px宽乘以100px高。
 DocType: Program,Program Abbreviation,计划缩写
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +386,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +51,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +387,Production Order cannot be raised against a Item Template,生产订单不能对一个项目提出的模板
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +52,Charges are updated in Purchase Receipt against each item,费用会在每个品目的采购收据中更新
 DocType: Warranty Claim,Resolved By,议决
 DocType: Bank Guarantee,Start Date,开始日期
 apps/erpnext/erpnext/config/hr.py +75,Allocate leaves for a period.,调配一段时间假期。
 apps/erpnext/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +42,Cheques and Deposits incorrectly cleared,支票及存款不正确清除
 apps/erpnext/erpnext/accounts/doctype/account/account.py +51,Account {0}: You can not assign itself as parent account,科目{0}不能是自己的上级科目
 DocType: Purchase Invoice Item,Price List Rate,价格列表费率
-apps/erpnext/erpnext/utilities/activation.py +73,Create customer quotes,创建客户报价
+apps/erpnext/erpnext/utilities/activation.py +70,Create customer quotes,创建客户报价
 DocType: Item,"Show ""In Stock"" or ""Not in Stock"" based on stock available in this warehouse.",根据此仓库显示“有库存”或“无库存”状态。
 apps/erpnext/erpnext/config/manufacturing.py +38,Bill of Materials (BOM),材料清单(BOM)
 DocType: Item,Average time taken by the supplier to deliver,采取供应商的平均时间交付
 apps/erpnext/erpnext/schools/doctype/assessment_plan/assessment_plan.js +11,Assessment Result,评价结果
 apps/erpnext/erpnext/projects/doctype/project/project_dashboard.html +13,Hours,小时
 DocType: Project,Expected Start Date,预计开始日期
-apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +48,Remove item if charges is not applicable to that item,删除项目，如果收费并不适用于该项目
+apps/erpnext/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js +49,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/accounts/doctype/payment_request/payment_request.py +33,Transaction currency must be same as Payment Gateway currency,交易货币必须与支付网关货币
 DocType: Payment Entry,Receive,接受
@@ -4138,19 +4145,19 @@
 DocType: Workstation,Operating Costs,运营成本
 DocType: Budget,Action if Accumulated Monthly Budget Exceeded,如果积累了每月预算超出行动
 DocType: Purchase Invoice,Submit on creation,提交关于创建
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +442,Currency for {0} must be {1},货币{0}必须{1}
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +459,Currency for {0} must be {1},货币{0}必须{1}
 DocType: Asset,Disposal Date,处置日期
 DocType: Daily Work Summary Settings,"Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",电子邮件将在指定的时间发送给公司的所有在职职工，如果他们没有假期。回复摘要将在午夜被发送。
 DocType: Employee Leave Approver,Employee Leave Approver,雇员假期审批者
-apps/erpnext/erpnext/stock/doctype/item/item.py +501,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +82,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
+apps/erpnext/erpnext/stock/doctype/item/item.py +499,Row {0}: An Reorder entry already exists for this warehouse {1},行{0}：一个重新排序条目已存在这个仓库{1}
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.py +81,"Cannot declare as lost, because Quotation has been made.",不能更改状态为丧失，因为已有报价。
 apps/erpnext/erpnext/hr/doctype/training_event/training_event.js +13,Training Feedback,培训反馈
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.py +457,Production Order {0} must be submitted,生产订单{0}必须提交
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +150,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +149,Please select Start Date and End Date for Item {0},请选择开始日期和结束日期的项目{0}
 apps/erpnext/erpnext/schools/doctype/student_group_creation_tool/student_group_creation_tool.py +54,Course is mandatory in row {0},当然是行强制性{0}
 apps/erpnext/erpnext/hr/doctype/leave_control_panel/leave_control_panel.js +16,To date cannot be before from date,无效的主名称
 DocType: Supplier Quotation Item,Prevdoc DocType,Prevdoc的DocType
-apps/erpnext/erpnext/stock/doctype/item/item.js +262,Add / Edit Prices,添加/编辑价格
+apps/erpnext/erpnext/stock/doctype/item/item.js +250,Add / Edit Prices,添加/编辑价格
 DocType: Batch,Parent Batch,父母批
 DocType: Batch,Parent Batch,父母批
 DocType: Cheque Print Template,Cheque Print Template,支票打印模板
@@ -4164,7 +4171,7 @@
 ,Ordered Items To Be Delivered,订购项目交付
 DocType: Account,Income,收益
 DocType: Industry Type,Industry Type,行业类型
-apps/erpnext/erpnext/templates/includes/cart.js +149,Something went wrong!,发现错误！
+apps/erpnext/erpnext/templates/includes/cart.js +150,Something went wrong!,发现错误！
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +124,Warning: Leave application contains following block dates,警告：申请的假期含有以下的禁离日
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +263,Sales Invoice {0} has already been submitted,销售发票{0}已提交过
 DocType: Assessment Result Detail,Score,得分了
@@ -4195,17 +4202,17 @@
 DocType: Item,Variant Based On,基于变异对
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +53,Total weightage assigned should be 100%. It is {0},分配的总权重应为100 ％ 。这是{0}
 apps/erpnext/erpnext/public/js/setup_wizard.js +265,Your Suppliers,您的供应商
-apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +56,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
+apps/erpnext/erpnext/selling/doctype/quotation/quotation.py +58,Cannot set as Lost as Sales Order is made.,不能更改状态为丧失，因为已有销售订单。
 DocType: Request for Quotation Item,Supplier Part No,供应商部件号
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +356,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +336,Received From,从......收到
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +357,Cannot deduct when category is for 'Valuation' or 'Vaulation and Total',当类是“估值”或“Vaulation和总&#39;不能扣除
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +353,Received From,从......收到
 DocType: Lead,Converted,已转换
 DocType: Item,Has Serial No,有序列号
 DocType: Employee,Date of Issue,签发日期
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +19,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +20,{0}: From {0} for {1},{0}：申请者{0} 金额{1}
 apps/erpnext/erpnext/selling/doctype/sales_order/sales_order.py +157,Row #{0}: Set Supplier for item {1},行＃{0}：设置供应商项目{1}
 apps/erpnext/erpnext/projects/doctype/timesheet/timesheet.py +118,Row {0}: Hours value must be greater than zero.,行{0}：小时值必须大于零。
-apps/erpnext/erpnext/stock/doctype/item/item.py +175,Website Image {0} attached to Item {1} cannot be found,网站图像{0}附加到物品{1}无法找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +173,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.,在网站上的多个组中显示此品目
@@ -4214,20 +4221,20 @@
 apps/erpnext/erpnext/accounts/doctype/account/account.py +110,You are not authorized to set Frozen value,您没有权限设定冻结值
 DocType: Payment Reconciliation,Get Unreconciled Entries,获取未调节分录
 DocType: Payment Reconciliation,From Invoice Date,从发票日期
-apps/erpnext/erpnext/accounts/party.py +247,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
+apps/erpnext/erpnext/accounts/party.py +250,Billing currency must be equal to either default comapany's currency or party account currency,结算币种必须等于要么默认业公司的货币或一方账户货币
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +37,Leave Encashment,离开兑现
 apps/erpnext/erpnext/public/js/setup_wizard.js +48,What does it do?,贵公司的标语
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +70,To Warehouse,到仓库
 apps/erpnext/erpnext/schools/doctype/student_admission/student_admission.py +23,All Student Admissions,所有学生入学
 ,Average Commission Rate,平均佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.py +413,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
+apps/erpnext/erpnext/stock/doctype/item/item.py +411,'Has Serial No' can not be 'Yes' for non-stock item,非库存项目不能勾选'是否有序列号'
 apps/erpnext/erpnext/hr/doctype/attendance/attendance.py +41,Attendance can not be marked for future dates,考勤不能标记为未来的日期
 DocType: Pricing Rule,Pricing Rule Help,定价规则说明
 DocType: School House,House Name,房名
 DocType: Purchase Taxes and Charges,Account Head,账户头
 apps/erpnext/erpnext/config/stock.py +168,Update additional costs to calculate landed cost of items,更新额外费用以计算到岸成本
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +115,Electrical,电气
-apps/erpnext/erpnext/utilities/activation.py +101,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
+apps/erpnext/erpnext/utilities/activation.py +98,Add the rest of your organization as your users. You can also add invite Customers to your portal by adding them from Contacts,添加您的组织的其余部分用户。您还可以添加邀请客户到您的门户网站通过从联系人中添加它们
 DocType: Stock Entry,Total Value Difference (Out - In),总价值差（输出 - ）
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +348,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
@@ -4236,7 +4243,7 @@
 DocType: Item,Customer Code,客户代码
 apps/erpnext/erpnext/hr/doctype/employee/employee.py +216,Birthday Reminder for {0},{0}的生日提醒
 apps/erpnext/erpnext/selling/report/inactive_customers/inactive_customers.py +72,Days Since Last Order,自上次订购天数
-apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +327,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
+apps/erpnext/erpnext/accounts/doctype/sales_invoice/sales_invoice.py +336,Debit To account must be a Balance Sheet account,借记帐户必须是资产负债表科目
 DocType: Buying Settings,Naming Series,命名系列
 DocType: Leave Block List,Leave Block List Name,禁离日列表名称
 apps/erpnext/erpnext/hr/doctype/vehicle/vehicle.py +14,Insurance Start date should be less than Insurance End date,保险开始日期应小于保险终止日期
@@ -4251,9 +4258,9 @@
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +320,Salary Slip of employee {0} already created for time sheet {1},员工的工资单{0}已为时间表创建{1}
 DocType: Vehicle Log,Odometer,里程表
 DocType: Sales Order Item,Ordered Qty,订购数量
-apps/erpnext/erpnext/stock/doctype/item/item.py +705,Item {0} is disabled,项目{0}无效
+apps/erpnext/erpnext/stock/doctype/item/item.py +682,Item {0} is disabled,项目{0}无效
 DocType: Stock Settings,Stock Frozen Upto,库存冻结止
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +879,BOM does not contain any stock item,BOM不包含任何库存项目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +882,BOM does not contain any stock item,BOM不包含任何库存项目
 apps/erpnext/erpnext/controllers/recurring_document.py +172,Period From and Period To dates mandatory for recurring {0},期间从和周期要日期强制性的经常性{0}
 apps/erpnext/erpnext/config/projects.py +18,Project activity / task.,项目活动/任务。
 DocType: Vehicle Log,Refuelling Details,加油详情
@@ -4263,8 +4270,9 @@
 apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.py +108,Last purchase rate not found,最后购买率未找到
 DocType: Purchase Invoice,Write Off Amount (Company Currency),核销金额（公司货币）
 DocType: Sales Invoice Timesheet,Billing Hours,结算时间
-apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +499,Default BOM for {0} not found,默认BOM {0}未找到
-apps/erpnext/erpnext/stock/doctype/item/item.py +493,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/manufacturing/doctype/production_order/production_order.py +500,Default BOM for {0} not found,默认BOM {0}未找到
+apps/erpnext/erpnext/stock/doctype/item/item.py +491,Row #{0}: Please set reorder quantity,行＃{0}：请设置再订购数量
+apps/erpnext/erpnext/public/js/pos/pos.html +20,Tap items to add them here,点击项目将其添加到此处
 DocType: Fees,Program Enrollment,招生计划
 DocType: Landed Cost Voucher,Landed Cost Voucher,到岸成本凭证
 apps/erpnext/erpnext/public/js/queries.js +39,Please set {0},请设置{0}
@@ -4279,7 +4287,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: Email Digest,Receivables,应收款
 DocType: Lead Source,Lead Source,线索来源
@@ -4288,7 +4296,7 @@
 DocType: Maintenance Visit,Maintenance Date,维护日期
 DocType: Purchase Invoice Item,Rejected Serial No,拒绝序列号
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +82,Year start date or end date is overlapping with {0}. To avoid please set company,新年的开始日期或结束日期与{0}重叠。为了避免请将公司
-apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +157,Start date should be less than end date for Item {0},品目{0}的开始日期必须小于结束日期
+apps/erpnext/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py +156,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 ##### 
 如果设置了序列但是没有在交易中输入序列号，那么系统会根据序列自动生产序列号。如果要强制手动输入序列号，请不要勾选此项。"
@@ -4366,7 +4374,6 @@
 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,多个群组品目交叉显示
-DocType: Grade Interval,Grade Interval,间隔级
 apps/erpnext/erpnext/accounts/doctype/fiscal_year/fiscal_year.py +90,Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0},财政年度开始日期和结束日期已经在财年{0}中设置
 apps/erpnext/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py +97,Clearance Date updated,间隙更新日期
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +126,Split Batch,拆分批
@@ -4413,14 +4420,14 @@
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
 DocType: Student Group Creation Tool,Leave unchecked if you don't want to consider batch while making course based groups. ,如果您不想在制作基于课程的组时考虑批量，请不要选中。
 DocType: Asset,Frequency of Depreciation (Months),折旧率（月）
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +468,Credit Account,信用账户
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +467,Credit Account,信用账户
 DocType: Landed Cost Item,Landed Cost Item,到岸成本品目
 apps/erpnext/erpnext/accounts/report/profitability_analysis/profitability_analysis.js +57,Show zero values,显示零值
 DocType: BOM,Quantity of item obtained after manufacturing / repacking from given quantities of raw materials,原材料被生产/重新打包后得到的品目数量
 apps/erpnext/erpnext/public/js/setup_wizard.js +320,Setup a simple website for my organization,设置一个简单的网站为我的组织
 DocType: Payment Reconciliation,Receivable / Payable Account,应收/应付账款
 DocType: Delivery Note Item,Against Sales Order Item,对销售订单项目
-apps/erpnext/erpnext/stock/doctype/item/item.py +666,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
+apps/erpnext/erpnext/stock/doctype/item/item.py +649,Please specify Attribute Value for attribute {0},请指定属性值的属性{0}
 DocType: Item,Default Warehouse,默认仓库
 apps/erpnext/erpnext/accounts/doctype/budget/budget.py +45,Budget cannot be assigned against Group Account {0},财政预算案不能对集团客户分配{0}
 apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.py +22,Please enter parent cost center,请输入父成本中心
@@ -4466,7 +4473,7 @@
 DocType: Opportunity Item,Basic Rate,基础税率
 DocType: GL Entry,Credit Amount,信贷金额
 DocType: Cheque Print Template,Signatory Position,签署的位置
-apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +178,Set as Lost,设置为丧失
+apps/erpnext/erpnext/crm/doctype/opportunity/opportunity.js +175,Set as Lost,设置为丧失
 DocType: Timesheet,Total Billable Hours,总计费时间
 apps/erpnext/erpnext/accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html +4,Payment Receipt Note,付款收货注意事项
 apps/erpnext/erpnext/selling/doctype/customer/customer_dashboard.py +6,This is based on transactions against this Customer. See timeline below for details,这是基于对这个顾客的交易。详情请参阅以下时间表
@@ -4480,11 +4487,11 @@
 ,Items To Be Requested,要申请的项目
 DocType: Purchase Order,Get Last Purchase Rate,获取最新的采购税率
 DocType: Company,Company Info,公司简介
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1314,Select or add new customer,选择或添加新客户
-apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +146,Cost center is required to book an expense claim,成本中心需要预订费用报销
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1330,Select or add new customer,选择或添加新客户
+apps/erpnext/erpnext/hr/doctype/expense_claim/expense_claim.py +147,Cost center is required to book an expense claim,成本中心需要预订费用报销
 apps/erpnext/erpnext/accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py +9,Application of Funds (Assets),资金(资产)申请
 apps/erpnext/erpnext/hr/doctype/employee/employee_dashboard.py +6,This is based on the attendance of this Employee,这是基于该员工的考勤
-apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +462,Debit Account,借方科目
+apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.js +461,Debit Account,借方科目
 DocType: Fiscal Year,Year Start Date,年度起始日期
 DocType: Attendance,Employee Name,雇员姓名
 DocType: Sales Invoice,Rounded Total (Company Currency),圆润的总计（公司货币）
@@ -4493,13 +4500,13 @@
 DocType: Leave Block List,Stop users from making Leave Applications on following days.,禁止用户在以下日期提交假期申请。
 apps/erpnext/erpnext/accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py +63,Purchase Amount,购买金额
 apps/erpnext/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py +212,Supplier Quotation {0} created,供应商报价{0}创建
-apps/erpnext/erpnext/accounts/report/financial_statements.py +96,End Year cannot be before Start Year,结束年份不能启动年前
+apps/erpnext/erpnext/accounts/report/financial_statements.py +97,End Year cannot be before Start Year,结束年份不能启动年前
 apps/erpnext/erpnext/setup/setup_wizard/install_fixtures.py +184,Employee Benefits,员工福利
 apps/erpnext/erpnext/stock/doctype/delivery_note/delivery_note.py +252,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/hr/doctype/employee/employee.py +238,Please set a default Holiday List for Employee {0} or Company {1},请设置一个默认的假日列表为员工{0}或公司{1}
-apps/erpnext/erpnext/accounts/party.py +25,{0}: {1} does not exists,{0}：{1}不存在
+apps/erpnext/erpnext/accounts/party.py +28,{0}: {1} does not exists,{0}：{1}不存在
 apps/erpnext/erpnext/config/accounts.py +12,Bills raised to Customers.,对客户开出的账单。
 apps/erpnext/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py +26,Project Id,项目编号
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +534,Row No {0}: Amount cannot be greater than Pending Amount against Expense Claim {1}. Pending Amount is {2},行无{0}：金额不能大于金额之前对报销{1}。待审核金额为{2}
@@ -4508,15 +4515,17 @@
 DocType: Quality Inspection Reading,Reading 3,阅读3
 ,Hub,Hub
 DocType: GL Entry,Voucher Type,凭证类型
-apps/erpnext/erpnext/accounts/page/pos/pos.js +1590,Price List not found or disabled,价格表未找到或禁用
+apps/erpnext/erpnext/accounts/page/pos/pos.js +1606,Price List not found or disabled,价格表未找到或禁用
 DocType: Employee Loan Application,Approved,已批准
 DocType: Pricing Rule,Price,价格
 apps/erpnext/erpnext/hr/doctype/salary_slip/salary_slip.py +261,Employee relieved on {0} must be set as 'Left',{0}的假期批准后，雇员的状态必须设置为“离开”
 DocType: Guardian,Guardian,监护人
 apps/erpnext/erpnext/hr/doctype/appraisal/appraisal.py +42,Appraisal {0} created for Employee {1} in the given date range,雇员{1}的限期评估{0}已经创建
 DocType: Employee,Education,教育
+apps/erpnext/erpnext/public/js/pos/pos.html +80,Del,德尔
 DocType: Selling Settings,Campaign Naming By,活动命名：
 DocType: Employee,Current Address Is,当前地址是
+apps/erpnext/erpnext/templates/includes/projects/project_tasks.html +9,modified,改性
 apps/erpnext/erpnext/accounts/doctype/account/account_tree.js +51,"Optional. Sets company's default currency, if not specified.",可选。设置公司的默认货币，如果没有指定。
 apps/erpnext/erpnext/config/accounts.py +61,Accounting journal entries.,会计记账分录。
 DocType: Delivery Note Item,Available Qty at From Warehouse,可用数量从仓库
@@ -4525,7 +4534,7 @@
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +217,Row {0}: Party / Account does not match with {1} / {2} in {3} {4},行{0}：甲方/客户不与匹配{1} / {2} {3} {4}
 apps/erpnext/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py +238,Please enter Expense Account,请输入您的费用帐户
 DocType: Account,Stock,库存
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +985,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.js +996,"Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry",行＃{0}：参考文件类型必须是采购订单之一，购买发票或日记帐分录
 DocType: Employee,Current Address,当前地址
 DocType: Item,"If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",如果品目为另一品目的变体，那么它的描述，图片，价格，税率等将从模板自动设置。你也可以手动设置。
 DocType: Serial No,Purchase / Manufacture Details,采购/制造详细信息
@@ -4553,7 +4562,7 @@
 DocType: Hub Settings,Hub Settings,Hub设置
 DocType: Project,Gross Margin %,毛利率％
 DocType: BOM,With Operations,带工艺
-apps/erpnext/erpnext/accounts/party.py +243,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 +246,Accounting entries have already been made in currency {0} for company {1}. Please select a receivable or payable account with currency {0}.,会计分录已取得货币{0}为公司{1}。请选择一个应收或应付账户币种{0}。
 DocType: Asset,Is Existing Asset,是对现有资产
 DocType: Salary Detail,Statistical Component,统计组成部分
 DocType: Salary Detail,Statistical Component,统计组成部分
@@ -4578,7 +4587,7 @@
 DocType: Assessment Plan,Room,房间
 DocType: Purchase Order,Advance Paid,已支付的预付款
 DocType: Item,Item Tax,项目税项
-apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +798,Material to Supplier,材料到供应商
+apps/erpnext/erpnext/buying/doctype/purchase_order/purchase_order.js +802,Material to Supplier,材料到供应商
 apps/erpnext/erpnext/stock/doctype/stock_entry/stock_entry.js +366,Excise Invoice,消费税发票
 apps/erpnext/erpnext/schools/doctype/grading_scale/grading_scale.py +16,Treshold {0}% appears more than once,Treshold {0}出现％不止一次
 DocType: Expense Claim,Employees Email Id,雇员的邮件地址
@@ -4609,9 +4618,9 @@
 apps/erpnext/erpnext/public/js/setup_wizard.js +177,Attach Logo,附加标志
 apps/erpnext/erpnext/stock/doctype/batch/batch.js +38,Stock Levels,库存水平
 DocType: Customer,Commission Rate,佣金率
-apps/erpnext/erpnext/stock/doctype/item/item.js +336,Make Variant,在Variant
+apps/erpnext/erpnext/stock/doctype/item/item.js +324,Make Variant,在Variant
 apps/erpnext/erpnext/config/hr.py +87,Block leave applications by department.,按部门禁止假期申请。
-apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +125,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
+apps/erpnext/erpnext/accounts/doctype/payment_entry/payment_entry.py +142,"Payment Type must be one of Receive, Pay and Internal Transfer",付款方式必须是接收之一，收费和内部转账
 apps/erpnext/erpnext/config/selling.py +179,Analytics,Analytics（分析）
 apps/erpnext/erpnext/templates/includes/cart/cart_dropdown.html +21,Cart is Empty,购物车是空的
 DocType: Vehicle,Model,模型
@@ -4622,6 +4631,7 @@
 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 +161,Capital Stock,股本
+DocType: Shopping Cart Settings,Show Public Attachments,显示公共附件
 DocType: Packing Slip,Package Weight Details,包装重量详情
 DocType: Payment Gateway Account,Payment Gateway Account,支付网关账户
 DocType: Shopping Cart Settings,After payment completion redirect user to selected page.,支付完成后重定向用户选择的页面。
@@ -4640,15 +4650,15 @@
 DocType: Batch,Expiry Date,到期时间
 ,Supplier Addresses and Contacts,供应商的地址和联系方式
 ,accounts-browser,账户浏览器
-apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +342,Please select Category first,属性是相同的两个记录。
+apps/erpnext/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js +343,Please select Category first,属性是相同的两个记录。
 apps/erpnext/erpnext/config/projects.py +13,Project master.,项目主。
 apps/erpnext/erpnext/controllers/status_updater.py +198,"To allow over-billing or over-ordering, update ""Allowance"" in Stock Settings or the Item.",要允许对账单或过度订货，库存设置或更新项目“津贴”。
 DocType: Global Defaults,Do not show any symbol like $ etc next to currencies.,不要在货币旁显示货币代号，例如$等。
 apps/erpnext/erpnext/hr/doctype/leave_application/leave_application.py +459, (Half Day),（半天）
 DocType: Supplier,Credit Days,信用期
-apps/erpnext/erpnext/utilities/activation.py +129,Make Student Batch,让学生批
+apps/erpnext/erpnext/utilities/activation.py +126,Make Student Batch,让学生批
 DocType: Leave Type,Is Carry Forward,是否顺延假期
-apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +778,Get Items from BOM,从物料清单获取品目
+apps/erpnext/erpnext/stock/doctype/material_request/material_request.js +781,Get Items from BOM,从物料清单获取品目
 apps/erpnext/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py +41,Lead Time Days,交货天数
 apps/erpnext/erpnext/controllers/accounts_controller.py +566,Row #{0}: Posting Date must be same as purchase date {1} of asset {2},行＃{0}：过帐日期必须是相同的购买日期{1}资产的{2}
 apps/erpnext/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py +129,Please enter Sales Orders in the above table,请在上表中输入销售订单
@@ -4665,8 +4675,6 @@
 DocType: Expense Claim Detail,Sanctioned Amount,已批准金额
 DocType: GL Entry,Is Opening,是否起始
 apps/erpnext/erpnext/accounts/doctype/journal_entry/journal_entry.py +196,Row {0}: Debit entry can not be linked with a {1},行{0}：借记条目不能与连接的{1}
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
-apps/erpnext/erpnext/hr/doctype/upload_attendance/upload_attendance.py +88,Please setup numbering series for Attendance via Setup &gt; Numbering Series,请通过设置&gt;编号系列设置出勤编号系列
 apps/erpnext/erpnext/accounts/doctype/account/account.py +234,Account {0} does not exist,科目{0}不存在
 DocType: Account,Cash,现金
 DocType: Employee,Short biography for website and other publications.,在网站或其他出版物使用的个人简介。
diff --git a/erpnext/utilities/page/__init__.py b/erpnext/utilities/page/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/utilities/page/__init__.py
diff --git a/erpnext/utilities/page/leaderboard/__init__.py b/erpnext/utilities/page/leaderboard/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/__init__.py
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.css b/erpnext/utilities/page/leaderboard/leaderboard.css
new file mode 100644
index 0000000..1f4fc51
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard.css
@@ -0,0 +1,54 @@
+.list-filters {
+	overflow-y: hidden;
+	padding: 5px
+}
+
+.list-filter-item {
+	min-width: 150px;
+	float: left;
+	margin:5px;
+}
+
+.list-item_content{
+	flex: 1;
+	padding-right: 15px;
+	align-items: center;
+}
+
+.select-time, .select-doctype, .select-filter, .select-sort {
+	background: #f0f4f7;
+}
+
+.select-time:focus, .select-doctype:focus, .select-filter:focus, .select-sort:focus {
+	background: #f0f4f7;
+}
+
+.header-btn-base{
+	border:none;
+	outline:0;
+	vertical-align:middle;
+	overflow:hidden;
+	text-decoration:none;
+	color:inherit;
+	background-color:inherit;
+	cursor:pointer;
+	white-space:nowrap;
+}
+
+.header-btn-grey,.header-btn-grey:hover{
+	color:#000!important;
+	background-color:#bbb!important
+}
+
+.header-btn-round{
+	border-radius:4px
+}
+
+.item-title-bold{
+	font-weight: bold;
+}
+
+/*
+.header-btn-base:hover {
+	box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)
+}*/
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.html b/erpnext/utilities/page/leaderboard/leaderboard.html
new file mode 100644
index 0000000..8df2247
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard.html
@@ -0,0 +1,23 @@
+<div class="frappe-list-area">
+	<div class="frappe-list">
+		<div class="list-filters">
+			<div class="list-filter-item">
+				<select class="form-control select-doctype">
+					{% for (var i=0; i < doctypes.length; i++) { %}
+						<option value="{{doctypes[i]}}">{{ doctypes[i] }}</option>
+					{% } %}
+				</select>
+			</div>
+
+			<div class="list-filter-item">
+				<select class="form-control select-time">
+					{% for (var i=0; i < timelines.length; i++) { %}
+						<option value="{{timelines[i]}}">{{ timelines[i] }}</option>
+					{% } %}
+				</select>
+			</div>
+		</div>
+		<div class="leaderboard">
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.js b/erpnext/utilities/page/leaderboard/leaderboard.js
new file mode 100644
index 0000000..eed9bd1
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard.js
@@ -0,0 +1,248 @@
+
+frappe.Leaderboard = Class.extend({
+
+	init: function (parent) {
+		this.page = frappe.ui.make_app_page({
+			parent: parent,
+			title: "Leaderboard",
+			single_column: true
+		});
+
+		// const list of doctypes
+		this.doctypes = ["Customer", "Item", "Supplier", "Sales Partner"];
+		this.timelines = ["Week", "Month", "Quarter", "Year"];
+		this.desc_fields = ["total_amount", "total_request", "annual_billing", "commission_rate"];
+		this.filters = {
+			"Customer": this.map_array(["title", "total_amount", "total_item_purchased", "modified"]),
+			"Item": this.map_array(["title", "total_request", "total_purchase", "avg_price", "modified"]),
+			"Supplier": this.map_array(["title", "annual_billing", "total_unpaid", "modified"]),
+			"Sales Partner": this.map_array(["title", "commission_rate", "target_qty", "target_amount", "modified"]),
+		};
+
+		// for saving current selected filters
+		const _selected_filter = this.filters[this.doctypes[0]];
+		this.options = {
+			selected_doctype: this.doctypes[0],
+			selected_filter: _selected_filter,
+			selected_filter_item: _selected_filter[1],
+			selected_timeline: this.timelines[0],
+		};
+
+		this.message = null;
+		this.make();
+	},
+
+
+
+	make: function () {
+		var me = this;
+
+		var $leaderboard = $(frappe.render_template("leaderboard", this)).appendTo(this.page.main);
+
+		// events
+		$leaderboard.find(".select-doctype")
+			.on("change", function () {
+				me.options.selected_doctype = this.value;
+				me.options.selected_filter = me.filters[this.value];
+				me.options.selected_filter_item = me.filters[this.value][1];
+				me.make_request($leaderboard);
+			});
+
+		$leaderboard.find(".select-time")
+			.on("change", function () {
+				me.options.selected_timeline = this.value;
+				me.make_request($leaderboard);
+			});
+
+		// now get leaderboard
+		me.make_request($leaderboard);
+	},
+
+	make_request: function ($leaderboard) {
+		var me = this;
+
+		frappe.model.with_doctype(me.options.selected_doctype, function () {
+			me.get_leaderboard(me.get_leaderboard_data, $leaderboard);
+		});
+	},
+
+	get_leaderboard: function (notify, $leaderboard) {
+		var me = this;
+
+		frappe.call({
+			method: "erpnext.utilities.page.leaderboard.leaderboard.get_leaderboard",
+			args: {
+				obj: JSON.stringify(me.options)
+			},
+			callback: function (res) {
+				console.log(res)
+				notify(me, res, $leaderboard);
+			}
+		});
+	},
+
+	get_leaderboard_data: function (me, res, $leaderboard) {
+		if (res && res.message) {
+			me.message = null;
+			$leaderboard.find(".leaderboard").html(me.render_list_view(res.message));
+
+			// event to change arrow
+			$leaderboard.find(".leaderboard-item")
+				.click(function () {
+					const field = this.innerText.trim().toLowerCase().replace(new RegExp(" ", "g"), "_");
+					if (field && field !== "title") {
+						const _selected_filter_item = me.options.selected_filter
+							.filter(i => i.field === field);
+						if (_selected_filter_item.length > 0) {
+							me.options.selected_filter_item = _selected_filter_item[0];
+							me.options.selected_filter_item.value = _selected_filter_item[0].value === "ASC" ? "DESC" : "ASC";
+
+							const new_class_name = `icon-${me.options.selected_filter_item.field} fa fa-chevron-${me.options.selected_filter_item.value === "ASC" ? "up" : "down"}`;
+							$leaderboard.find(`.icon-${me.options.selected_filter_item.field}`)
+								.attr("class", new_class_name);
+
+							// now make request to web
+							me.make_request($leaderboard);
+						}
+					}
+				});
+		} else {
+			me.message = "No items found.";
+			$leaderboard.find(".leaderboard").html(me.render_list_view());
+		}
+	},
+
+	render_list_view: function (items = []) {
+		var me = this;
+
+		var html =
+			`${me.render_message()}
+			 <div class="result" style="${me.message ? "display:none;" : ""}">
+			 	${me.render_result(items)}
+			 </div>`;
+
+		return $(html);
+	},
+
+	render_result: function (items) {
+		var me = this;
+
+		var html =
+			`${me.render_list_header()}
+			 ${me.render_list_result(items)}`;
+
+		return html;
+	},
+
+	render_list_header: function () {
+		var me = this;
+		const _selected_filter = me.options.selected_filter
+			.map(i => me.map_field(i.field)).slice(1);
+
+		const html =
+			`<div class="list-headers">
+				<div class="list-item list-item--head" data-list-renderer="${"List"}">
+					${
+					me.options.selected_filter
+						.map(filter => {
+							const col = me.map_field(filter.field);
+							return (
+								`<div class="leaderboard-item list-item_content ellipsis text-muted list-item__content--flex-2
+									header-btn-base ${(col !== "Title" && col !== "Modified") ? "hidden-xs" : ""}
+									${(col && _selected_filter.indexOf(col) !== -1) ? "text-right" : ""}">
+									<span class="list-col-title ellipsis">
+										${col}
+										<i class="${"icon-" + filter.field} fa ${filter.value === "ASC" ? "fa-chevron-up" : "fa-chevron-down"}"
+											style="${col === "Title" ? "display:none;" : ""}"></i>
+									</span>
+								</div>`);
+						}).join("")
+					}
+				</div>
+			</div>`;
+		return html;
+	},
+
+	render_list_result: function (items) {
+		var me = this;
+
+		let _html = items.map((item) => {
+			const $value = $(me.get_item_html(item));
+			const $item_container = $(`<div class="list-item-container">`).append($value);
+			return $item_container[0].outerHTML;
+		}).join("");
+
+		let html =
+			`<div class="result-list">
+				<div class="list-items">
+					${_html}
+				</div>
+			</div>`;
+
+		return html;
+	},
+
+	render_message: function () {
+		var me = this;
+
+		let html =
+			`<div class="no-result text-center" style="${me.message ? "" : "display:none;"}">   
+				<div class="msg-box no-border">
+					<p>No Item found</p>
+				</div>  
+			</div>`;
+
+		return html;
+	},
+
+	get_item_html: function (item) {
+		var me = this;
+		const _selected_filter = me.options.selected_filter
+			.map(i => me.map_field(i.field)).slice(1);
+
+		const html =
+			`<div class="list-item">
+				${
+			me.options.selected_filter
+				.map(filter => {
+					const col = me.map_field(filter.field);
+					let val = item[filter.field];
+					if (col === "Modified") {
+						val = comment_when(val);
+					}
+					return (
+						`<div class="list-item_content ellipsis list-item__content--flex-2
+							${(col !== "Title" && col !== "Modified") ? "hidden-xs" : ""}
+							${(col && _selected_filter.indexOf(col) !== -1) ? "text-right" : ""}">
+							${
+								col === "Title"	
+									? `<a class="grey list-id ellipsis" href="${item["href"]}"> ${val} </a>` 
+									: `<span class="text-muted ellipsis"> ${val}</span>`
+							}
+						</div>`);
+					}).join("")
+				}
+			</div>`;
+
+		return html;
+	},
+
+	map_field: function (field) {
+		return field.replace(new RegExp("_", "g"), " ").replace(/(^|\s)[a-z]/g, f => f.toUpperCase())
+	},
+
+	map_array: function (_array) {
+		var me = this;
+		return _array.map((str) => {
+			let value = me.desc_fields.indexOf(str) > -1 ? "DESC" : "ASC";
+			return {
+				field: str,
+				value: value
+			};
+		});
+	}
+});
+
+frappe.pages["leaderboard"].on_page_load = function (wrapper) {
+	frappe.leaderboard = new frappe.Leaderboard(wrapper);
+}
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.json b/erpnext/utilities/page/leaderboard/leaderboard.json
new file mode 100644
index 0000000..8cba765
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard.json
@@ -0,0 +1,19 @@
+{
+ "content": null, 
+ "creation": "2017-06-06 02:54:24.785360", 
+ "docstatus": 0, 
+ "doctype": "Page", 
+ "idx": 0, 
+ "modified": "2017-06-06 02:54:27.504048", 
+ "modified_by": "Administrator", 
+ "module": "Utilities", 
+ "name": "leaderboard", 
+ "owner": "Administrator", 
+ "page_name": "leaderboard", 
+ "roles": [], 
+ "script": null, 
+ "standard": "Yes", 
+ "style": null, 
+ "system_page": 0, 
+ "title": "LeaderBoard"
+}
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard.py b/erpnext/utilities/page/leaderboard/leaderboard.py
new file mode 100644
index 0000000..0a75410
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard.py
@@ -0,0 +1,182 @@
+# Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals, print_function
+import frappe
+import json
+from operator import itemgetter
+from frappe.utils import add_to_date
+from erpnext.accounts.party import get_dashboard_info
+from erpnext.accounts.utils import get_currency_precision
+
+@frappe.whitelist()
+def get_leaderboard(obj):
+	"""return top 10 items for that doctype based on conditions"""
+	obj = frappe._dict(json.loads(obj))
+
+	doctype = obj.selected_doctype
+	timeline = obj.selected_timeline
+	filters = {"modified":(">=", get_date_from_string(timeline))}
+	items = []
+	if doctype == "Customer":
+		items = get_all_customers(doctype, filters, [])
+	elif  doctype == "Item":
+		items = get_all_items(doctype, filters, [])
+	elif  doctype == "Supplier":
+		items = get_all_suppliers(doctype, filters, [])
+	elif  doctype == "Sales Partner":
+		items = get_all_sales_partner(doctype, filters, [])
+	
+	if len(items) > 0:
+		return filter_leaderboard_items(obj, items)
+	return []
+
+
+# filters start
+def filter_leaderboard_items(obj, items):
+	"""return items based on seleted filters"""
+	
+	reverse = False if obj.selected_filter_item and obj.selected_filter_item["value"] == "ASC" else True
+	# key : (x[field1], x[field2]) while sorting on 2 values
+	filtered_list = []
+	selected_field = obj.selected_filter_item and obj.selected_filter_item["field"]
+	if selected_field:
+		filtered_list  = sorted(items, key=itemgetter(selected_field), reverse=reverse)
+		value = items[0].get(selected_field)
+
+		allowed = isinstance(value, unicode) or isinstance(value, str)
+		# now sort by length
+		if allowed and '$' in value:
+			filtered_list.sort(key= lambda x: len(x[selected_field]), reverse=reverse)
+	
+	# return only 10 items'
+	return filtered_list[:10]
+
+# filters end
+
+
+# utils start
+def destructure_tuple_of_tuples(tup_of_tup):
+	"""return tuple(tuples) as list"""
+	return [y for x in tup_of_tup for y in x]
+
+def get_date_from_string(seleted_timeline):
+	"""return string for ex:this week as date:string"""
+	days = months = years = 0
+	if "month" == seleted_timeline.lower():
+		months = -1
+	elif "quarter" == seleted_timeline.lower():
+		months = -3
+	elif "year" == seleted_timeline.lower():
+		years = -1
+	else:
+		days = -7
+
+	return add_to_date(None, years=years, months=months, days=days, as_string=True, as_datetime=True)
+
+def get_filter_list(selected_filter):
+	"""return list of keys"""
+	return map((lambda y : y["field"]), filter(lambda x : not (x["field"] == "title" or x["field"] == "modified"), selected_filter))
+
+def get_avg(items):
+	"""return avg of list items"""
+	length = len(items)
+	if length > 0:
+		return sum(items) / length
+	return 0
+
+def get_formatted_value(value, add_symbol=True):
+	"""return formatted value"""
+	currency_precision = get_currency_precision() or 2
+	if not add_symbol:
+		return '{:.{pre}f}'.format(value, pre=currency_precision)
+	
+	company = frappe.db.get_default("company") or frappe.get_all("Company")[0].name
+	currency = frappe.get_doc("Company", company).default_currency or frappe.boot.sysdefaults.currency;
+	currency_symbol = frappe.db.get_value("Currency", currency, "symbol")
+	return  currency_symbol + ' ' + '{:.{pre}f}'.format(value, pre=currency_precision)
+
+# utils end
+
+
+# get data
+def get_all_customers(doctype, filters, items, start=0, limit=100):
+	"""return all customers"""
+
+	x = frappe.get_list(doctype, fields=["name", "modified"], filters=filters, limit_start=start, limit_page_length=limit)
+	
+	for val in x:
+		y = dict(frappe.db.sql('''select name, grand_total from `tabSales Invoice` where customer = %s''', (val.name)))
+		invoice_list = y.keys()
+		if len(invoice_list) > 0:
+			item_count = frappe.db.sql('''select count(name) from `tabSales Invoice Item` where parent in (%s)''' % ", ".join(
+				['%s'] * len(invoice_list)), tuple(invoice_list))
+			items.append({"title": val.name,
+				"total_amount": get_formatted_value(sum(y.values())),
+				"href":"#Form/Customer/" + val.name,
+				"total_item_purchased": sum(destructure_tuple_of_tuples(item_count)),
+				"modified": str(val.modified)})
+	if len(x) > 99:
+		start = start + 1
+		return get_all_customers(doctype, filters, items, start=start)
+	else:
+		return items
+
+def get_all_items(doctype, filters, items, start=0, limit=100):
+	"""return all items"""
+
+	x = frappe.get_list(doctype, fields=["name", "modified"], filters=filters, limit_start=start, limit_page_length=limit)
+	for val in x:
+		data = frappe.db.sql('''select item_code from `tabMaterial Request Item` where item_code = %s''', (val.name), as_list=1)
+		requests = destructure_tuple_of_tuples(data)
+		data = frappe.db.sql('''select price_list_rate from `tabItem Price` where item_code = %s''', (val.name), as_list=1)
+		avg_price = get_avg(destructure_tuple_of_tuples(data))
+		data = frappe.db.sql('''select item_code from `tabPurchase Invoice Item` where item_code = %s''', (val.name), as_list=1)
+		purchases = destructure_tuple_of_tuples(data)
+		
+		items.append({"title": val.name,
+			"total_request":len(requests),
+			"total_purchase": len(purchases), "href":"#Form/Item/" + val.name,
+			"avg_price": get_formatted_value(avg_price),
+			"modified": val.modified})
+	if len(x) > 99:
+		return get_all_items(doctype, filters, items, start=start)
+	else:
+		return items
+
+def get_all_suppliers(doctype, filters, items, start=0, limit=100):
+	"""return all suppliers"""
+
+	x = frappe.get_list(doctype, fields=["name", "modified"], filters=filters, limit_start=start, limit_page_length=limit)
+	
+	for val in x:
+		info = get_dashboard_info(doctype, val.name)
+		items.append({"title": val.name,
+		"annual_billing":  get_formatted_value(info["billing_this_year"]),
+		"total_unpaid": get_formatted_value(abs(info["total_unpaid"])),
+		"href":"#Form/Supplier/" + val.name,
+		"modified": val.modified})
+
+	if len(x) > 99:
+		return get_all_suppliers(doctype, filters, items, start=start)
+	else:
+		return items
+
+def get_all_sales_partner(doctype, filters, items, start=0, limit=100):
+	"""return all sales partner"""
+	
+	x = frappe.get_list(doctype, fields=["name", "commission_rate", "modified"], filters=filters, limit_start=start, limit_page_length=limit)
+	for val in x:
+		y = frappe.db.sql('''select target_qty, target_amount from `tabTarget Detail` where parent = %s''', (val.name), as_dict=1)
+		target_qty = sum([f["target_qty"] for f in y])
+		target_amount = sum([f["target_amount"] for f in y])
+		items.append({"title": val.name,
+			"commission_rate": get_formatted_value(val.commission_rate, False),
+			"target_qty": target_qty,
+			"target_amount": get_formatted_value(target_amount),
+			"href":"#Form/Sales Partner/" + val.name,
+			"modified": val.modified})
+	if len(x) > 99:
+		return get_all_sales_partner(doctype, filters, items, start=start)
+	else:
+		return items
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard_main_head.html b/erpnext/utilities/page/leaderboard/leaderboard_main_head.html
new file mode 100644
index 0000000..257d4ed
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard_main_head.html
@@ -0,0 +1,8 @@
+<div class="list-item__content ellipsis text-muted list-item__content--flex-2
+	{% if(col !== "Title" && col !== "Modified") { %}
+		hidden-xs
+	{% } %}
+	{% if(col && selected_filter.indexOf(col) !== -1) { %}text-right{% } %}">
+	
+	<span class="list-col-title ellipsis">{{col}}</span>
+</div>
\ No newline at end of file
diff --git a/erpnext/utilities/page/leaderboard/leaderboard_row_head.html b/erpnext/utilities/page/leaderboard/leaderboard_row_head.html
new file mode 100644
index 0000000..5a4e1dd
--- /dev/null
+++ b/erpnext/utilities/page/leaderboard/leaderboard_row_head.html
@@ -0,0 +1,3 @@
+<div class="list-item list-item--head" data-list-renderer="{{__(" List ")}}">
+	{{ main }}
+</div>
\ No newline at end of file
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index 7657188..0e3a4f9 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -19,7 +19,7 @@
 
 	def validate_posting_time(self):
 		# set Edit Posting Date and Time to 1 while data import
-		if frappe.flags.in_import:
+		if frappe.flags.in_import and self.posting_date:
 			self.set_posting_time = 1
 
 		if not getattr(self, 'set_posting_time', None):
@@ -149,5 +149,5 @@
 			for f in qty_fields:
 				qty = d.get(f)
 				if qty:
-					if abs(int(qty) - float(qty)) > 0.0000001:
+					if abs(cint(qty) - flt(qty)) > 0.0000001:
 						frappe.throw(_("Quantity ({0}) cannot be a fraction in row {1}").format(qty, d.idx), UOMMustBeIntegerError)